From f83ab319868f270dabb4e388757042321c265854 Mon Sep 17 00:00:00 2001
From: zhaobincai <zhaobincai@webank.com>
Date: Mon, 18 Mar 2024 16:46:58 +0800
Subject: [PATCH 001/302] git Sender add

---
 .../wedatasphere/dss/sender/service/DSSSenderService.java  | 2 ++
 .../dss/sender/service/conf/DSSSenderServiceConf.java      | 3 +++
 .../dss/sender/service/impl/DSSSenderServiceImpl.java      | 7 +++++++
 .../sender/service/impl/DSSServerSenderServiceImpl.java    | 5 +++++
 4 files changed, 17 insertions(+)

diff --git a/dss-commons/dss-sender-service/src/main/java/com/webank/wedatasphere/dss/sender/service/DSSSenderService.java b/dss-commons/dss-sender-service/src/main/java/com/webank/wedatasphere/dss/sender/service/DSSSenderService.java
index 212d631ec..4aec347e1 100644
--- a/dss-commons/dss-sender-service/src/main/java/com/webank/wedatasphere/dss/sender/service/DSSSenderService.java
+++ b/dss-commons/dss-sender-service/src/main/java/com/webank/wedatasphere/dss/sender/service/DSSSenderService.java
@@ -36,5 +36,7 @@ public interface DSSSenderService {
 
     Sender getProjectServerSender();
 
+    Sender getGitSender();
+
 }
 
diff --git a/dss-commons/dss-sender-service/src/main/java/com/webank/wedatasphere/dss/sender/service/conf/DSSSenderServiceConf.java b/dss-commons/dss-sender-service/src/main/java/com/webank/wedatasphere/dss/sender/service/conf/DSSSenderServiceConf.java
index ff33f617c..37fd3a90c 100644
--- a/dss-commons/dss-sender-service/src/main/java/com/webank/wedatasphere/dss/sender/service/conf/DSSSenderServiceConf.java
+++ b/dss-commons/dss-sender-service/src/main/java/com/webank/wedatasphere/dss/sender/service/conf/DSSSenderServiceConf.java
@@ -28,6 +28,9 @@ public class DSSSenderServiceConf {
     public static final CommonVars<String> PROJECT_SERVER_NAME =
             CommonVars.apply("wds.dss.project.sever.name", "dss-framework-project-server");
 
+    public static final CommonVars<String> GIT_SERVER_NAME =
+            CommonVars.apply("wds.dss.git.sever.name", "dss-framework-git-server");
+
     public static final CommonVars<String> DSS_SERVER_NAME =
             CommonVars.apply("wds.dss.sever.name.dev", "dss-server-dev");
 
diff --git a/dss-commons/dss-sender-service/src/main/java/com/webank/wedatasphere/dss/sender/service/impl/DSSSenderServiceImpl.java b/dss-commons/dss-sender-service/src/main/java/com/webank/wedatasphere/dss/sender/service/impl/DSSSenderServiceImpl.java
index ff403f86c..372370571 100644
--- a/dss-commons/dss-sender-service/src/main/java/com/webank/wedatasphere/dss/sender/service/impl/DSSSenderServiceImpl.java
+++ b/dss-commons/dss-sender-service/src/main/java/com/webank/wedatasphere/dss/sender/service/impl/DSSSenderServiceImpl.java
@@ -29,6 +29,8 @@ public class DSSSenderServiceImpl implements DSSSenderService {
     private final Sender workflowSender = Sender.getSender(DSSSenderServiceConf.DSS_WORKFLOW_APPLICATION_NAME_DEV.getValue());
 
     private final Sender projectSender = Sender.getSender(DSSSenderServiceConf.PROJECT_SERVER_NAME.getValue());
+
+    private final Sender gitSender = Sender.getSender(DSSSenderServiceConf.GIT_SERVER_NAME.getValue());
     @Override
     public Sender getOrcSender() {
         return orcSender;
@@ -64,4 +66,9 @@ public Sender getProjectServerSender() {
         return projectSender;
     }
 
+    @Override
+    public Sender getGitSender() {
+        return gitSender;
+    }
+
 }
diff --git a/dss-commons/dss-sender-service/src/main/java/com/webank/wedatasphere/dss/sender/service/impl/DSSServerSenderServiceImpl.java b/dss-commons/dss-sender-service/src/main/java/com/webank/wedatasphere/dss/sender/service/impl/DSSServerSenderServiceImpl.java
index 4ebe11e5f..58046caf8 100644
--- a/dss-commons/dss-sender-service/src/main/java/com/webank/wedatasphere/dss/sender/service/impl/DSSServerSenderServiceImpl.java
+++ b/dss-commons/dss-sender-service/src/main/java/com/webank/wedatasphere/dss/sender/service/impl/DSSServerSenderServiceImpl.java
@@ -44,4 +44,9 @@ public Sender getSchedulerWorkflowSender() {
     public Sender getProjectServerSender() {
         return dssServerSender;
     }
+
+    @Override
+    public Sender getGitSender() {
+        return dssServerSender;
+    }
 }

From 16349b63a09f7a32b42444247e8cf6dfa80f1948 Mon Sep 17 00:00:00 2001
From: ryanlei <ryanlei@webank.com>
Date: Fri, 22 Mar 2024 11:13:25 +0800
Subject: [PATCH 002/302] fix: ::v-deep

---
 .../module/common/tabCard/index.vue           | 124 ++++++-----
 .../dataGovernance/view/fieldInfo/index.vue   | 201 +++++++++---------
 .../dataService/module/common/navMenu.vue     |  30 +--
 .../module/dataManagement/index.vue           |  15 +-
 .../assets/styles/workflow.scss               |  86 ++++----
 .../components/tabList/index.scss             |  90 ++++----
 6 files changed, 289 insertions(+), 257 deletions(-)

diff --git a/web/packages/dataGovernance/module/common/tabCard/index.vue b/web/packages/dataGovernance/module/common/tabCard/index.vue
index 64220e6c5..86ad08b97 100644
--- a/web/packages/dataGovernance/module/common/tabCard/index.vue
+++ b/web/packages/dataGovernance/module/common/tabCard/index.vue
@@ -3,22 +3,32 @@
     <!-- top -->
     <div class="tab-card-t">
       <div class="tab-card-t-l">
-        <SvgIcon icon-class="biao" style="fontSize: 16px;" />
-        <span style="marginLeft: 8px; fontSize: 16px" v-html="model.name "></span>
+        <SvgIcon icon-class="biao" style="fontsize: 16px" />
+        <span
+          style="marginleft: 8px; fontsize: 16px"
+          v-html="model.name"
+        ></span>
       </div>
       <div class="tab-card-t-r">
         <!-- <span>读取次数：{{ model.readCount }}次</span> -->
-        <div>负责人：<span v-html="model.owner" class="content-html"></span></div>
+        <div>
+          负责人：<span v-html="model.owner" class="content-html"></span>
+        </div>
         <div :title="model.createTime">创建时间：{{ model.createTime }}</div>
       </div>
-
     </div>
 
     <!-- bottom -->
     <div class="tab-card-b">
-      <div :title="model.dbName">数据库：<span v-html="model.dbName" class="content-html"></span></div>
-      <div :title="subject">主题域：<span v-html="subject" class="content-html"></span></div>
-      <div :title="layer">分层：<span v-html="layer" class="content-html"></span></div>
+      <div :title="model.dbName">
+        数据库：<span v-html="model.dbName" class="content-html"></span>
+      </div>
+      <div :title="subject">
+        主题域：<span v-html="subject" class="content-html"></span>
+      </div>
+      <div :title="layer">
+        分层：<span v-html="layer" class="content-html"></span>
+      </div>
     </div>
 
     <div class="tab-card-b">
@@ -33,7 +43,12 @@
     <div class="tab-card-b" style="width: 100%">
       <div v-if="model.labels.length > 0">
         <span>标签：</span>
-        <span class="tab-card-b-tag content-html" v-for="(label, idx) in model.labels" :key="idx" v-html="label"></span>
+        <span
+          class="tab-card-b-tag content-html"
+          v-for="(label, idx) in model.labels"
+          :key="idx"
+          v-html="label"
+        ></span>
       </div>
       <div v-else>
         <span>标签：-</span>
@@ -46,57 +61,60 @@
         <span
           v-for="(item, idx) in model.columns"
           :key="idx"
-          v-html="idx + 1 < model.columns.length ? item+'/' : item"
-          class="content-html"></span>
+          v-html="idx + 1 < model.columns.length ? item + '/' : item"
+          class="content-html"
+        ></span>
       </div>
     </div>
   </div>
 </template>
 
 <script>
-import { EventBus } from "../../../module/common/eventBus/event-bus";
+import { EventBus } from '../../../module/common/eventBus/event-bus'
 export default {
-  name: "tabCard",
+  name: 'tabCard',
   props: {
     model: {
       type: Object,
-      default: null
+      default: null,
     },
   },
   data() {
     return {
       modal: [],
-      query: ''
+      query: '',
     }
   },
   mounted() {
-    EventBus.$on("onQueryForHighLight", query => {
+    EventBus.$on('onQueryForHighLight', (query) => {
       this.query = query
-    });
+    })
   },
   destroyed() {
-    EventBus.$off("onQueryForHighLight")
+    EventBus.$off('onQueryForHighLight')
   },
   methods: {
     onChoose() {
-      this.$emit("on-choose", this.model);
-    }
+      this.$emit('on-choose', this.model)
+    },
   },
   computed: {
     subject: function () {
-      let classifications = this.model.classifications;
-      let subject = "";
+      let classifications = this.model.classifications
+      let subject = ''
       if (classifications && classifications.length) {
-        classifications.forEach(classification => {
-          if (classification.superTypeNames &&
-              classification.superTypeNames.length) {
-            if (classification.superTypeNames[0] === "subject") {
-              subject = classification.typeName;
+        classifications.forEach((classification) => {
+          if (
+            classification.superTypeNames &&
+            classification.superTypeNames.length
+          ) {
+            if (classification.superTypeNames[0] === 'subject') {
+              subject = classification.typeName
             }
           }
-        });
+        })
       }
-      if( this.query ) {
+      if (this.query) {
         let reg = new RegExp(this.query, 'g')
         let _query = `<span>${this.query}</span>`
         subject = subject.replace(reg, _query)
@@ -104,32 +122,36 @@ export default {
       return subject
     },
     layer: function () {
-      let classifications = this.model.classifications;
-      let layer = "";
+      let classifications = this.model.classifications
+      let layer = ''
       if (classifications && classifications.length) {
-        classifications.forEach(classification => {
-          if (classification.superTypeNames &&
-              classification.superTypeNames.length) {
-            if (classification.superTypeNames[0] === "layer" ||
-                  classification.superTypeNames[0] === "layer_system") {
-              layer = classification.typeName;
+        classifications.forEach((classification) => {
+          if (
+            classification.superTypeNames &&
+            classification.superTypeNames.length
+          ) {
+            if (
+              classification.superTypeNames[0] === 'layer' ||
+              classification.superTypeNames[0] === 'layer_system'
+            ) {
+              layer = classification.typeName
             }
           }
-        });
+        })
       }
-      if( this.query ) {
+      if (this.query) {
         let reg = new RegExp(this.query, 'g')
         let _query = `<span>${this.query}</span>`
         layer = layer.replace(reg, _query)
       }
-      return layer;
-    }
-  }
-};
+      return layer
+    },
+  },
+}
 </script>
 
 <style lang="scss" scoped>
-@import "@dataspherestudio/shared/common/style/variables.scss";
+@import '@dataspherestudio/shared/common/style/variables.scss';
 .tab-card-wrap {
   min-height: 10.5vh;
   padding-left: 24px;
@@ -151,7 +173,7 @@ export default {
     &-l {
       @include font-color(#3495f7, $dark-text-color);
       &::after {
-        content: "";
+        content: '';
         border-left: 1px solid #dee4ec;
         @include border-color(#dee4ec, $dark-border-color-base);
         width: 0;
@@ -162,7 +184,6 @@ export default {
       }
     }
     &-r {
-
       font-size: 14px;
       @include font-color(rgba(0, 0, 0, 0.85), $dark-text-color);
       text-align: left;
@@ -179,7 +200,7 @@ export default {
     text-align: left;
     line-height: 22px;
     margin-top: 8px;
-    >div {
+    > div {
       text-overflow: ellipsis;
       white-space: nowrap;
       word-break: break-all;
@@ -193,7 +214,7 @@ export default {
     &-field {
       height: 40px;
       line-height: 40px;
-      @include bg-color(#F4F7FB, $dark-border-color-base);
+      @include bg-color(#f4f7fb, $dark-border-color-base);
       padding-left: 12px;
 
       font-size: 14px;
@@ -202,17 +223,16 @@ export default {
     }
 
     &-tag {
-      background: rgba(0,0,0,0.04);
-      border: 1px solid #DEE4EC;
+      background: rgba(0, 0, 0, 0.04);
+      border: 1px solid #dee4ec;
       border-radius: 2px;
       padding: 4px 8px;
     }
   }
 }
 .content-html {
-  /deep/ span {
-    color: #3495F7;
+  ::v-deep span {
+    color: #3495f7;
   }
 }
-
 </style>
diff --git a/web/packages/dataGovernance/view/fieldInfo/index.vue b/web/packages/dataGovernance/view/fieldInfo/index.vue
index 01fb2dbc2..5ea0f1695 100644
--- a/web/packages/dataGovernance/view/fieldInfo/index.vue
+++ b/web/packages/dataGovernance/view/fieldInfo/index.vue
@@ -30,7 +30,7 @@
             <Button
               data-name="select"
               type="primary"
-              @click="e => copy(e, selectSQL)"
+              @click="(e) => copy(e, selectSQL)"
             >复制</Button
             >
           </div>
@@ -48,7 +48,7 @@
               id="copy-button"
               data-clipboard-action="copy"
               data-clipboard-target="#copy-button"
-              @click="e => copy(e, DDLsql)"
+              @click="(e) => copy(e, DDLsql)"
             >复制</Button
             >
           </div>
@@ -76,193 +76,193 @@
 </template>
 
 <script>
-import clipboard from "../../utils/clipboard";
-import { fomatSqlForShow, fomatSqlForCopy } from "../../utils/fomatSQL";
-import { getSelectSql, getSelectDdl, putCommetBulk } from "../../service/api";
+import clipboard from '../../utils/clipboard'
+import { fomatSqlForShow, fomatSqlForCopy } from '../../utils/fomatSQL'
+import { getSelectSql, getSelectDdl, putCommetBulk } from '../../service/api'
 export default {
-  name: "fieldInfo",
+  name: 'fieldInfo',
   props: {
     fieldInfo: {
       type: Array,
-      default: () => []
+      default: () => [],
     },
     rangeFieldInfo: {
       type: Array,
-      default: () => []
-    }
+      default: () => [],
+    },
   },
   data() {
     return {
       isEdit: false,
       fieldColumns: [
-        { title: "序号", key: "id" },
-        { title: "字段名称", key: "name" },
-        { title: "类型", key: "type" },
+        { title: '序号', key: 'id' },
+        { title: '字段名称', key: 'name' },
+        { title: '类型', key: 'type' },
         {
-          title: "描述",
-          key: "comment",
+          title: '描述',
+          key: 'comment',
           render: (h, params) => {
-            let that = this;
+            let that = this
             if (that.isEdit) {
-              return h("input", {
+              return h('input', {
                 domProps: {
-                  value: params.row.comment
+                  value: params.row.comment,
                 },
                 on: {
-                  input: function(event) {
-                    params.row.comment = event.target.value;
+                  input: function (event) {
+                    params.row.comment = event.target.value
                     that.fieldInfoData[params.index].comment =
-                      event.target.value;
-                  }
+                      event.target.value
+                  },
                 },
                 style: {
-                  border: "1px solid #dee4ec",
-                  "border-radius": "4px",
-                  "padding-left": "12px"
-                }
-              });
+                  border: '1px solid #dee4ec',
+                  'border-radius': '4px',
+                  'padding-left': '12px',
+                },
+              })
             } else {
-              return h("span", {}, params.row.comment);
+              return h('span', {}, params.row.comment)
             }
-          }
-        }
+          },
+        },
       ],
       rangeColumns: [
-        { title: "序号", key: "id" },
-        { title: "字段名称", key: "name" },
-        { title: "类型", key: "type" },
+        { title: '序号', key: 'id' },
+        { title: '字段名称', key: 'name' },
+        { title: '类型', key: 'type' },
         {
-          title: "描述",
-          key: "comment",
+          title: '描述',
+          key: 'comment',
           render: (h, params) => {
-            let that = this;
+            let that = this
             if (that.isEdit) {
-              return h("input", {
+              return h('input', {
                 domProps: {
-                  value: params.row.comment
+                  value: params.row.comment,
                 },
                 on: {
-                  input: function(event) {
-                    params.row.comment = event.target.value;
+                  input: function (event) {
+                    params.row.comment = event.target.value
                     that.rangeInfoData[params.index].comment =
-                      event.target.value;
-                  }
+                      event.target.value
+                  },
                 },
                 style: {
-                  border: "1px solid #dee4ec",
-                  "border-radius": "4px",
-                  "padding-left": "12px"
-                }
-              });
+                  border: '1px solid #dee4ec',
+                  'border-radius': '4px',
+                  'padding-left': '12px',
+                },
+              })
             } else {
-              return h("span", {}, params.row.comment);
+              return h('span', {}, params.row.comment)
             }
-          }
-        }
+          },
+        },
       ],
       fieldInfoData: this.fieldInfo,
       rangeInfoData: this.rangeFieldInfo,
       selectFlag: false,
       DDLflag: false,
-      selectSQL: "",
-      DDLsql: ""
-    };
+      selectSQL: '',
+      DDLsql: '',
+    }
   },
   watch: {
     fieldInfo: {
       handler(newVal) {
-        this.fieldInfoData = newVal;
+        this.fieldInfoData = newVal
       },
-      deep: true
+      deep: true,
     },
     rangeFieldInfo: {
       handler(newVal) {
-        this.rangeInfoData = newVal;
+        this.rangeInfoData = newVal
       },
-      deep: true
-    }
+      deep: true,
+    },
   },
   computed: {
     selectSql() {
-      return fomatSqlForShow(this.selectSQL);
+      return fomatSqlForShow(this.selectSQL)
     },
     ddlSql() {
-      return fomatSqlForShow(this.DDLsql);
-    }
+      return fomatSqlForShow(this.DDLsql)
+    },
   },
   methods: {
     edit() {
-      this.isEdit = true;
+      this.isEdit = true
     },
     onCancel() {
-      this.isEdit = false;
+      this.isEdit = false
     },
     onSave() {
-      this.isEdit = false;
-      let that = this;
-      let fieldInfoData = this.fieldInfoData.slice(0);
-      let rangeInfoData = this.rangeFieldInfo.slice(0);
-      let resMap = Object.create(null);
+      this.isEdit = false
+      let that = this
+      let fieldInfoData = this.fieldInfoData.slice(0)
+      let rangeInfoData = this.rangeFieldInfo.slice(0)
+      let resMap = Object.create(null)
       if (fieldInfoData.length) {
-        fieldInfoData.forEach(item => {
-          resMap[item.guid] = item.comment;
-        });
+        fieldInfoData.forEach((item) => {
+          resMap[item.guid] = item.comment
+        })
       }
       if (rangeInfoData.length) {
-        rangeInfoData.forEach(item => {
-          resMap[item.guid] = item.comment;
-        });
+        rangeInfoData.forEach((item) => {
+          resMap[item.guid] = item.comment
+        })
       }
       putCommetBulk(resMap)
-        .then(data => {
+        .then((data) => {
           if (data.result) {
-            that.$Message.success(data.result);
+            that.$Message.success(data.result)
           }
         })
-        .catch(err => {
-          console.log("putCommetBulk", err);
-        });
+        .catch((err) => {
+          console.log('putCommetBulk', err)
+        })
     },
     createSelect() {
-      this.selectFlag = true;
+      this.selectFlag = true
       // 请求 Select语句数据
-      let guid = this.$route.params.guid;
+      let guid = this.$route.params.guid
       getSelectSql(guid)
-        .then(data => {
+        .then((data) => {
           if (data.result) {
-            this.selectSQL = data.result;
+            this.selectSQL = data.result
           }
         })
-        .catch(err => {
-          console.log("getSelectSql", err);
-        });
+        .catch((err) => {
+          console.log('getSelectSql', err)
+        })
     },
     createDDL() {
-      this.DDLflag = true;
+      this.DDLflag = true
       // 请求 DDL语句数据
-      let guid = this.$route.params.guid;
+      let guid = this.$route.params.guid
       getSelectDdl(guid)
-        .then(data => {
+        .then((data) => {
           if (data.result) {
-            this.DDLsql = data.result;
+            this.DDLsql = data.result
           }
         })
-        .catch(err => {
-          console.log("getSelectSql", err);
-        });
+        .catch((err) => {
+          console.log('getSelectSql', err)
+        })
     },
     // 复制
     copy(e, sql) {
-      let str = "";
-      str = fomatSqlForCopy(sql);
-      clipboard(str, e);
-    }
-  }
-};
+      let str = ''
+      str = fomatSqlForCopy(sql)
+      clipboard(str, e)
+    },
+  },
+}
 </script>
 
 <style lang="scss" scoped>
-@import "@dataspherestudio/shared/common/style/variables.scss";
+@import '@dataspherestudio/shared/common/style/variables.scss';
 .field-info-wrap {
   padding-left: 24px;
   padding-right: 24px;
@@ -281,7 +281,6 @@ export default {
   .field-info-b {
     margin-top: 25px;
     &-header {
-
       font-size: 14px;
       @include font-color(rgba(0, 0, 0, 0.85), $dark-text-color);
       line-height: 22px;
@@ -303,7 +302,7 @@ export default {
   overflow-y: auto;
   max-height: 200px;
   div {
-    /deep/ span {
+    ::v-deep span {
       font-weight: bold;
       margin-right: 6px;
     }
diff --git a/web/packages/dataService/module/common/navMenu.vue b/web/packages/dataService/module/common/navMenu.vue
index 2fccb3688..db3c8dd2e 100644
--- a/web/packages/dataService/module/common/navMenu.vue
+++ b/web/packages/dataService/module/common/navMenu.vue
@@ -41,11 +41,11 @@
   </div>
 </template>
 <script>
-import ManageMenu from "./manageMenu.vue";
-import TreeMenu from "./treeMenu.vue";
+import ManageMenu from './manageMenu.vue'
+import TreeMenu from './treeMenu.vue'
 
 export default {
-  name: "navMenu",
+  name: 'navMenu',
   components: {
     ManageMenu,
     TreeMenu,
@@ -66,7 +66,7 @@ export default {
       projectsTree: [],
       searchValue: 123,
       originDatas: [],
-    };
+    }
   },
   mounted() {},
   methods: {
@@ -75,35 +75,35 @@ export default {
         this.$route.path == `/${tab}` ||
         this.$route.path.startsWith(`/${tab}`)
       ) {
-        this.$emit("on-menu-toggle");
+        this.$emit('on-menu-toggle')
       } else {
         this.$router.push({
           name: tab,
           query: this.$route.query,
-        });
+        })
       }
     },
 
     showModal(pyload) {
-      this.$emit("showModal", pyload);
+      this.$emit('showModal', pyload)
     },
     handleApiChoosed(pyload) {
-      this.$emit("handleApiChoosed", pyload);
+      this.$emit('handleApiChoosed', pyload)
     },
 
     treeMethod(name, payload = {}) {
-      if (name === "getApi") {
-        this.$refs.treeMenu.getAllApi("update", payload);
+      if (name === 'getApi') {
+        this.$refs.treeMenu.getAllApi('update', payload)
       } else {
-        const { id, data } = payload;
-        this.$refs.treeMenu.addApi(id, data);
+        const { id, data } = payload
+        this.$refs.treeMenu.addApi(id, data)
       }
     },
   },
-};
+}
 </script>
 <style lang="scss" scoped>
-@import "@dataspherestudio/shared/common/style/variables.scss";
+@import '@dataspherestudio/shared/common/style/variables.scss';
 .ds-nav-menu-wrap {
   z-index: 2;
   display: flex;
@@ -166,7 +166,7 @@ export default {
     width: 50px;
     height: 44px;
   }
-  /deep/.ivu-tooltip-inner {
+  ::v-deep.ivu-tooltip-inner {
     background-color: rgba(70, 76, 91, 1);
   }
 }
diff --git a/web/packages/dataService/module/dataManagement/index.vue b/web/packages/dataService/module/dataManagement/index.vue
index 29373538f..bebe7ee5b 100644
--- a/web/packages/dataService/module/dataManagement/index.vue
+++ b/web/packages/dataService/module/dataManagement/index.vue
@@ -9,7 +9,7 @@
   </div>
 </template>
 <script>
-import navMenu from "../common/navMenu.vue";
+import navMenu from '../common/navMenu.vue'
 export default {
   components: {
     navMenu,
@@ -17,28 +17,28 @@ export default {
   data() {
     return {
       menuFold: false,
-    };
+    }
   },
   methods: {
     handleMenuToggle() {
-      this.menuFold = !this.menuFold;
+      this.menuFold = !this.menuFold
     },
   },
-};
+}
 </script>
 <style lang="scss" scoped>
-@import "@dataspherestudio/shared/common/style/variables.scss";
+@import '@dataspherestudio/shared/common/style/variables.scss';
 .ds-main-content {
   z-index: 1;
   height: 100%;
   margin-left: 304px;
   transition: margin-left 0.3s;
-  /deep/ .monitor-chart-modal {
+  ::v-deep .monitor-chart-modal {
     left: 304px;
   }
   &.ds-main-content-fold {
     margin-left: 54px;
-    /deep/ .monitor-chart-modal {
+    ::v-deep .monitor-chart-modal {
       left: 54px;
     }
   }
@@ -50,4 +50,3 @@ export default {
   }
 }
 </style>
-
diff --git a/web/packages/dolphinScheduler/assets/styles/workflow.scss b/web/packages/dolphinScheduler/assets/styles/workflow.scss
index a44e9eed7..ad468bd2b 100644
--- a/web/packages/dolphinScheduler/assets/styles/workflow.scss
+++ b/web/packages/dolphinScheduler/assets/styles/workflow.scss
@@ -14,7 +14,7 @@
  * limitations under the License.
  *
  */
-@import "@dataspherestudio/shared/common/style/variables.scss";
+@import '@dataspherestudio/shared/common/style/variables.scss';
 .workflow-wrap {
   width: 100%;
   height: 100%;
@@ -89,7 +89,7 @@
         font-weight: 400;
         cursor: pointer;
         &:hover {
-          background-color: #2E92F7;
+          background-color: #2e92f7;
           color: #fff;
         }
       }
@@ -162,7 +162,7 @@
       position: relative;
       flex: 1;
       .tabs-content {
-        /deep/ .ivu-tabs-tab {
+        ::v-deep .ivu-tabs-tab {
           font-size: $font-size-large;
         }
       }
@@ -220,47 +220,51 @@
         @include border-color($border-color-base, $dark-border-color-base);
         padding: 0 5px;
         .workflow-tabs-item {
-            margin: 0;
-            height: 31px;
-            padding: 5px 16px 4px;
-            border-bottom: $border-width-base $border-style-base $border-color-base;
-            @include border-color($border-color-base, $dark-border-color-base);
-            border-radius: 4px 4px 0 0;
-            // background: #f8f8f9;
-            @include bg-color($workflow-body-bg-color, $dark-workflow-body-bg-color);
+          margin: 0;
+          height: 31px;
+          padding: 5px 16px 4px;
+          border-bottom: $border-width-base $border-style-base
+            $border-color-base;
+          @include border-color($border-color-base, $dark-border-color-base);
+          border-radius: 4px 4px 0 0;
+          // background: #f8f8f9;
+          @include bg-color(
+            $workflow-body-bg-color,
+            $dark-workflow-body-bg-color
+          );
+          display: inline-block;
+          cursor: pointer;
+          position: relative;
+          &.active {
+            height: 32px;
+            padding-bottom: 5px;
+            background: #fff;
+            transform: translateZ(0);
+            border: 1px solid #dcdee2;
+            border-bottom: 1px solid #fff;
+            // color: #2d8cf0;
+            @include font-color($primary-color, $dark-primary-color);
+          }
+          .workflow-tabs-name {
             display: inline-block;
-            cursor: pointer;
+          }
+          .workflow-tabs-close {
+            width: 22px;
+            margin-right: -6px;
+            height: 22px;
+            font-size: 22px;
+            color: #999;
+            text-align: right;
+            vertical-align: middle;
+            overflow: hidden;
             position: relative;
-            &.active {
-                height: 32px;
-                padding-bottom: 5px;
-                background: #fff;
-                transform: translateZ(0);
-                border: 1px solid #dcdee2;
-                border-bottom:1px solid #fff;
-                // color: #2d8cf0;
-                @include font-color($primary-color, $dark-primary-color);
-            }
-            .workflow-tabs-name {
-                display: inline-block;
-            }
-            .workflow-tabs-close {
-                width: 22px;
-                margin-right: -6px;
-                height: 22px;
-                font-size: 22px;
-                color: #999;
-                text-align: right;
-                vertical-align: middle;
-                overflow: hidden;
-                position: relative;
-                top: -1px;
-                transform-origin: 100% 50%;
-                transition: all .3s ease-in-out;
-                cursor: pointer;
-            }
+            top: -1px;
+            transform-origin: 100% 50%;
+            transition: all 0.3s ease-in-out;
+            cursor: pointer;
+          }
         }
+      }
     }
   }
-  }
 }
diff --git a/web/packages/dolphinScheduler/components/tabList/index.scss b/web/packages/dolphinScheduler/components/tabList/index.scss
index 390a5676e..adede936b 100644
--- a/web/packages/dolphinScheduler/components/tabList/index.scss
+++ b/web/packages/dolphinScheduler/components/tabList/index.scss
@@ -1,4 +1,4 @@
-@import "@dataspherestudio/shared/common/style/variables.scss";
+@import '@dataspherestudio/shared/common/style/variables.scss';
 .workflowTabContainer {
   margin-left: 250px;
   transition: margin-left 0.3s;
@@ -36,7 +36,7 @@
         min-width: 320px;
         .ivu-breadcrumb {
           font-size: 21px;
-          /deep/.ivu-breadcrumb-item-separator {
+          ::v-deep.ivu-breadcrumb-item-separator {
             // color: rgba(0,0,0,0.65);
             @include font-color($light-text-color, $dark-text-color);
           }
@@ -48,43 +48,53 @@
           font-size: 14px;
         }
         .bottomTapList {
-            padding: 0px $padding-25;
-            border-bottom: $border-width-base $border-style-base $border-color-base;
-            @include border-color($background-color-base, $dark-workspace-body-bg-color);
-            @include font-color($workspace-title-color, $dark-workspace-title-color);
-            margin-top: 12px;
+          padding: 0px $padding-25;
+          border-bottom: $border-width-base $border-style-base
+            $border-color-base;
+          @include border-color(
+            $background-color-base,
+            $dark-workspace-body-bg-color
+          );
+          @include font-color(
+            $workspace-title-color,
+            $dark-workspace-title-color
+          );
+          margin-top: 12px;
+          flex: none;
+          display: flex;
+          align-items: center;
+          font-size: $font-size-large;
+          .bottomLeftText {
+            cursor: pointer;
             flex: none;
-            display: flex;
-            align-items: center;
             font-size: $font-size-large;
-            .bottomLeftText {
-                cursor: pointer;
-                flex: none;
-                font-size: $font-size-large;
-                padding: 0 15px;
-                margin-bottom: -1px;
-                line-height: 40px;
-                position: relative;
-                &::after {
-                    content: "";
-                    border-left: 1px solid #DEE4EC;
-                    @include border-color($border-color-base, $dark-border-color-base);
-                    width: 0;
-                    position: absolute;
-                    right: -15px;
-                    top: 12px;
-                    height: 16px;
-                    margin: 0 15px;
-                }
-            }
-            .active {
-                border-bottom: 2px solid $primary-color;
-                @include border-color($primary-color, $dark-primary-color);
-            }
-            .bottomRightContainer {
-                flex: 1;
-                height: 40px;
+            padding: 0 15px;
+            margin-bottom: -1px;
+            line-height: 40px;
+            position: relative;
+            &::after {
+              content: '';
+              border-left: 1px solid #dee4ec;
+              @include border-color(
+                $border-color-base,
+                $dark-border-color-base
+              );
+              width: 0;
+              position: absolute;
+              right: -15px;
+              top: 12px;
+              height: 16px;
+              margin: 0 15px;
             }
+          }
+          .active {
+            border-bottom: 2px solid $primary-color;
+            @include border-color($primary-color, $dark-primary-color);
+          }
+          .bottomRightContainer {
+            flex: 1;
+            height: 40px;
+          }
         }
       }
     }
@@ -109,7 +119,7 @@
         line-height: 40px;
         position: relative;
         &::after {
-          content: "";
+          content: '';
           border-left: 1px solid #dee4ec;
           @include border-color($border-color-base, $dark-border-color-base);
           width: 0;
@@ -149,13 +159,13 @@
   padding: 0 10px;
   overflow: hidden;
   margin-right: 8px;
-  @include bg-color( #E1E5EA, $dark-workspace-body-bg-color);
+  @include bg-color(#e1e5ea, $dark-workspace-body-bg-color);
   border-radius: 12px;
   &.active {
     height: 24px;
     @include font-color($primary-color, $dark-primary-color);
     line-height: 24px;
-    @include bg-color(#E8EEF4, $dark-workspace-body-bg-color);
+    @include bg-color(#e8eef4, $dark-workspace-body-bg-color);
     border-radius: 12px;
   }
   &:hover {
@@ -163,7 +173,7 @@
     @include font-color($primary-color, $dark-primary-color);
     line-height: 24px;
     border-radius: 12px;
-    @include bg-color(#D1D7DD, $dark-workspace-body-bg-color);
+    @include bg-color(#d1d7dd, $dark-workspace-body-bg-color);
   }
 }
 

From 7655b77e79fc3988ce868c30243d3637a2e5e801 Mon Sep 17 00:00:00 2001
From: yuankang134 <373346037@qq.com>
Date: Tue, 26 Mar 2024 17:03:51 +0800
Subject: [PATCH 003/302] update maven version

---
 assembly/dss-package/pom.xml                                  | 2 +-
 assembly/pom.xml                                              | 2 +-
 dss-appconn/appconns/dss-datachecker-appconn/pom.xml          | 4 ++--
 dss-appconn/appconns/dss-dolphinscheduler-appconn/pom.xml     | 2 +-
 dss-appconn/appconns/dss-eventchecker-appconn/pom.xml         | 2 +-
 dss-appconn/appconns/dss-schedulis-appconn/pom.xml            | 2 +-
 dss-appconn/appconns/dss-scriptis-appconn/pom.xml             | 2 +-
 dss-appconn/appconns/dss-sendemail-appconn/pom.xml            | 2 +-
 .../dss-sendemail-appconn/sendemail-appconn-core/pom.xml      | 2 +-
 dss-appconn/appconns/dss-sso-appconn/pom.xml                  | 2 +-
 dss-appconn/appconns/dss-workflow-appconn/pom.xml             | 2 +-
 dss-appconn/dss-appconn-core/pom.xml                          | 2 +-
 dss-appconn/dss-appconn-loader/pom.xml                        | 2 +-
 .../dss-appconn-manager/dss-appconn-manager-client/pom.xml    | 2 +-
 .../dss-appconn-manager/dss-appconn-manager-core/pom.xml      | 2 +-
 dss-appconn/dss-appconn-manager/pom.xml                       | 2 +-
 dss-appconn/dss-scheduler-appconn/pom.xml                     | 2 +-
 dss-appconn/linkis-appconn-engineplugin/pom.xml               | 2 +-
 dss-appconn/pom.xml                                           | 2 +-
 dss-apps/dss-apiservice-server/pom.xml                        | 2 +-
 dss-apps/dss-apps-server/pom.xml                              | 2 +-
 dss-apps/dss-data-api/dss-api-sql-template/pom.xml            | 2 +-
 dss-apps/dss-data-api/dss-data-api-server/pom.xml             | 2 +-
 dss-apps/dss-data-api/pom.xml                                 | 2 +-
 dss-apps/dss-data-governance/dss-data-asset-server/pom.xml    | 2 +-
 .../dss-data-classification-server/pom.xml                    | 2 +-
 .../dss-data-governance/dss-data-governance-common/pom.xml    | 2 +-
 .../dss-data-governance/dss-data-governance-server/pom.xml    | 2 +-
 dss-apps/dss-data-governance/pom.xml                          | 2 +-
 dss-apps/dss-scriptis-server/pom.xml                          | 2 +-
 dss-apps/dss-user-guide/dss-user-guide-server/pom.xml         | 2 +-
 dss-apps/dss-user-guide/pom.xml                               | 2 +-
 dss-apps/pom.xml                                              | 2 +-
 dss-commons/dss-common/pom.xml                                | 2 +-
 dss-commons/dss-contextservice/pom.xml                        | 2 +-
 dss-commons/dss-sender-service/pom.xml                        | 2 +-
 dss-commons/pom.xml                                           | 2 +-
 dss-framework/dss-appconn-framework/pom.xml                   | 2 +-
 dss-framework/dss-framework-admin-service/pom.xml             | 2 +-
 dss-framework/dss-framework-common/pom.xml                    | 2 +-
 dss-framework/dss-framework-orchestrator-server/pom.xml       | 2 +-
 dss-framework/dss-framework-project-server/pom.xml            | 2 +-
 dss-framework/dss-framework-proxy-user-service/pom.xml        | 2 +-
 dss-framework/dss-framework-workspace-server/pom.xml          | 2 +-
 .../framework-plugins/dss-framework-migrate-server/pom.xml    | 2 +-
 .../dss-framework-orchestrator-publish/pom.xml                | 2 +-
 dss-framework/pom.xml                                         | 2 +-
 dss-orchestrator/dss-orchestrator-common/pom.xml              | 2 +-
 dss-orchestrator/dss-orchestrator-conversion-standard/pom.xml | 2 +-
 dss-orchestrator/dss-orchestrator-core/pom.xml                | 2 +-
 dss-orchestrator/dss-orchestrator-db/pom.xml                  | 2 +-
 dss-orchestrator/dss-orchestrator-loader/pom.xml              | 2 +-
 .../dss-workflow/dss-flow-execution-server/pom.xml            | 2 +-
 .../dss-workflow/dss-linkis-node-execution/pom.xml            | 2 +-
 .../orchestrators/dss-workflow/dss-workflow-common/pom.xml    | 2 +-
 .../dss-workflow/dss-workflow-conversion-standard/pom.xml     | 2 +-
 .../orchestrators/dss-workflow/dss-workflow-sdk/pom.xml       | 2 +-
 .../orchestrators/dss-workflow/dss-workflow-server/pom.xml    | 2 +-
 dss-orchestrator/orchestrators/dss-workflow/pom.xml           | 2 +-
 dss-orchestrator/pom.xml                                      | 2 +-
 dss-server/pom.xml                                            | 2 +-
 .../development-process-standard-execution/pom.xml            | 2 +-
 .../development-standard/development-process-standard/pom.xml | 2 +-
 dss-standard/dss-standard-common/pom.xml                      | 2 +-
 dss-standard/pom.xml                                          | 2 +-
 .../sso-standard/origin-sso-integration-standard/pom.xml      | 2 +-
 .../sso-standard/spring-origin-sso-integration-plugin/pom.xml | 2 +-
 dss-standard/sso-standard/sso-integration-standard/pom.xml    | 2 +-
 dss-standard/structure-standard/dss-project-plugin/pom.xml    | 2 +-
 dss-standard/structure-standard/dss-role-plugin/pom.xml       | 2 +-
 .../dss-structure-integration-standard/pom.xml                | 2 +-
 .../spring-origin-dss-project-plugin/pom.xml                  | 2 +-
 plugins/azkaban/linkis-jobtype/pom.xml                        | 2 +-
 .../dolphinscheduler/dolphinscheduler-prod-metrics/pom.xml    | 2 +-
 plugins/dolphinscheduler/dss-dolphinscheduler-client/pom.xml  | 2 +-
 plugins/dolphinscheduler/dss-dolphinscheduler-token/pom.xml   | 2 +-
 plugins/dolphinscheduler/pom.xml                              | 2 +-
 plugins/linkis/dss-gateway-support/pom.xml                    | 2 +-
 pom.xml                                                       | 4 ++--
 79 files changed, 81 insertions(+), 81 deletions(-)

diff --git a/assembly/dss-package/pom.xml b/assembly/dss-package/pom.xml
index 842307e24..551abaa9f 100644
--- a/assembly/dss-package/pom.xml
+++ b/assembly/dss-package/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.1.0.20-SNAPSHOT</version>
+        <version>1.1.0.21-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/assembly/pom.xml b/assembly/pom.xml
index 0e97116a4..30ea818cb 100644
--- a/assembly/pom.xml
+++ b/assembly/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.1.0.20-SNAPSHOT</version>
+        <version>1.1.0.21-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <packaging>pom</packaging>
diff --git a/dss-appconn/appconns/dss-datachecker-appconn/pom.xml b/dss-appconn/appconns/dss-datachecker-appconn/pom.xml
index 51cf70eaa..96972b007 100644
--- a/dss-appconn/appconns/dss-datachecker-appconn/pom.xml
+++ b/dss-appconn/appconns/dss-datachecker-appconn/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.1.0.20-SNAPSHOT</version>
+        <version>1.1.0.21-SNAPSHOT</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
@@ -54,7 +54,7 @@
         <dependency>
             <groupId>com.webank.wedatasphere.dss</groupId>
             <artifactId>dss-origin-sso-integration-standard</artifactId>
-            <version>1.1.0.20-SNAPSHOT</version>
+            <version>1.1.0.21-SNAPSHOT</version>
             <exclusions>
                 <exclusion>
                     <groupId>org.apache.linkis</groupId>
diff --git a/dss-appconn/appconns/dss-dolphinscheduler-appconn/pom.xml b/dss-appconn/appconns/dss-dolphinscheduler-appconn/pom.xml
index 8543d92a9..9e61911c7 100644
--- a/dss-appconn/appconns/dss-dolphinscheduler-appconn/pom.xml
+++ b/dss-appconn/appconns/dss-dolphinscheduler-appconn/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.1.0.20-SNAPSHOT</version>
+        <version>1.1.0.21-SNAPSHOT</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-appconn/appconns/dss-eventchecker-appconn/pom.xml b/dss-appconn/appconns/dss-eventchecker-appconn/pom.xml
index 7539d9e68..8f05cfa59 100644
--- a/dss-appconn/appconns/dss-eventchecker-appconn/pom.xml
+++ b/dss-appconn/appconns/dss-eventchecker-appconn/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.1.0.20-SNAPSHOT</version>
+        <version>1.1.0.21-SNAPSHOT</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-appconn/appconns/dss-schedulis-appconn/pom.xml b/dss-appconn/appconns/dss-schedulis-appconn/pom.xml
index ae044adb0..a539660a3 100644
--- a/dss-appconn/appconns/dss-schedulis-appconn/pom.xml
+++ b/dss-appconn/appconns/dss-schedulis-appconn/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.1.0.20-SNAPSHOT</version>
+        <version>1.1.0.21-SNAPSHOT</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-appconn/appconns/dss-scriptis-appconn/pom.xml b/dss-appconn/appconns/dss-scriptis-appconn/pom.xml
index 1fbb75e66..1f9c818d0 100644
--- a/dss-appconn/appconns/dss-scriptis-appconn/pom.xml
+++ b/dss-appconn/appconns/dss-scriptis-appconn/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.1.0.20-SNAPSHOT</version>
+        <version>1.1.0.21-SNAPSHOT</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-appconn/appconns/dss-sendemail-appconn/pom.xml b/dss-appconn/appconns/dss-sendemail-appconn/pom.xml
index 792ccf982..3defbf129 100644
--- a/dss-appconn/appconns/dss-sendemail-appconn/pom.xml
+++ b/dss-appconn/appconns/dss-sendemail-appconn/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.1.0.20-SNAPSHOT</version>
+        <version>1.1.0.21-SNAPSHOT</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-appconn/appconns/dss-sendemail-appconn/sendemail-appconn-core/pom.xml b/dss-appconn/appconns/dss-sendemail-appconn/sendemail-appconn-core/pom.xml
index 050c80d84..c51375c78 100644
--- a/dss-appconn/appconns/dss-sendemail-appconn/sendemail-appconn-core/pom.xml
+++ b/dss-appconn/appconns/dss-sendemail-appconn/sendemail-appconn-core/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.1.0.20-SNAPSHOT</version>
+        <version>1.1.0.21-SNAPSHOT</version>
         <relativePath>../../../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-appconn/appconns/dss-sso-appconn/pom.xml b/dss-appconn/appconns/dss-sso-appconn/pom.xml
index 2b4eb6f8a..a993fd35b 100644
--- a/dss-appconn/appconns/dss-sso-appconn/pom.xml
+++ b/dss-appconn/appconns/dss-sso-appconn/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.1.0.20-SNAPSHOT</version>
+        <version>1.1.0.21-SNAPSHOT</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-appconn/appconns/dss-workflow-appconn/pom.xml b/dss-appconn/appconns/dss-workflow-appconn/pom.xml
index 8ec03fe62..cb015df2a 100644
--- a/dss-appconn/appconns/dss-workflow-appconn/pom.xml
+++ b/dss-appconn/appconns/dss-workflow-appconn/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.1.0.20-SNAPSHOT</version>
+        <version>1.1.0.21-SNAPSHOT</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-appconn/dss-appconn-core/pom.xml b/dss-appconn/dss-appconn-core/pom.xml
index 60f42dc4b..742c75908 100644
--- a/dss-appconn/dss-appconn-core/pom.xml
+++ b/dss-appconn/dss-appconn-core/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.1.0.20-SNAPSHOT</version>
+        <version>1.1.0.21-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-appconn/dss-appconn-loader/pom.xml b/dss-appconn/dss-appconn-loader/pom.xml
index 2155e4f32..90a6fa128 100644
--- a/dss-appconn/dss-appconn-loader/pom.xml
+++ b/dss-appconn/dss-appconn-loader/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.1.0.20-SNAPSHOT</version>
+        <version>1.1.0.21-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-appconn/dss-appconn-manager/dss-appconn-manager-client/pom.xml b/dss-appconn/dss-appconn-manager/dss-appconn-manager-client/pom.xml
index f12b02dd2..6a8007104 100644
--- a/dss-appconn/dss-appconn-manager/dss-appconn-manager-client/pom.xml
+++ b/dss-appconn/dss-appconn-manager/dss-appconn-manager-client/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <artifactId>dss</artifactId>
     <groupId>com.webank.wedatasphere.dss</groupId>
-    <version>1.1.0.20-SNAPSHOT</version>
+    <version>1.1.0.21-SNAPSHOT</version>
     <relativePath>../../../pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
diff --git a/dss-appconn/dss-appconn-manager/dss-appconn-manager-core/pom.xml b/dss-appconn/dss-appconn-manager/dss-appconn-manager-core/pom.xml
index a2693bc65..5857216df 100644
--- a/dss-appconn/dss-appconn-manager/dss-appconn-manager-core/pom.xml
+++ b/dss-appconn/dss-appconn-manager/dss-appconn-manager-core/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <artifactId>dss</artifactId>
     <groupId>com.webank.wedatasphere.dss</groupId>
-    <version>1.1.0.20-SNAPSHOT</version>
+    <version>1.1.0.21-SNAPSHOT</version>
     <relativePath>../../../pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
diff --git a/dss-appconn/dss-appconn-manager/pom.xml b/dss-appconn/dss-appconn-manager/pom.xml
index e2b61cf83..71133409f 100644
--- a/dss-appconn/dss-appconn-manager/pom.xml
+++ b/dss-appconn/dss-appconn-manager/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <artifactId>dss</artifactId>
     <groupId>com.webank.wedatasphere.dss</groupId>
-    <version>1.1.0.20-SNAPSHOT</version>
+    <version>1.1.0.21-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
diff --git a/dss-appconn/dss-scheduler-appconn/pom.xml b/dss-appconn/dss-scheduler-appconn/pom.xml
index cc14c6c04..8ce872c9d 100644
--- a/dss-appconn/dss-scheduler-appconn/pom.xml
+++ b/dss-appconn/dss-scheduler-appconn/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.1.0.20-SNAPSHOT</version>
+        <version>1.1.0.21-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-appconn/linkis-appconn-engineplugin/pom.xml b/dss-appconn/linkis-appconn-engineplugin/pom.xml
index 363d409de..c37ffba4d 100644
--- a/dss-appconn/linkis-appconn-engineplugin/pom.xml
+++ b/dss-appconn/linkis-appconn-engineplugin/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.1.0.20-SNAPSHOT</version>
+        <version>1.1.0.21-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-appconn/pom.xml b/dss-appconn/pom.xml
index 616ea2f66..3baf458d4 100644
--- a/dss-appconn/pom.xml
+++ b/dss-appconn/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.1.0.20-SNAPSHOT</version>
+        <version>1.1.0.21-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-apps/dss-apiservice-server/pom.xml b/dss-apps/dss-apiservice-server/pom.xml
index 0c82fbb7e..16bbc1ea0 100644
--- a/dss-apps/dss-apiservice-server/pom.xml
+++ b/dss-apps/dss-apiservice-server/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.1.0.20-SNAPSHOT</version>
+        <version>1.1.0.21-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-apps/dss-apps-server/pom.xml b/dss-apps/dss-apps-server/pom.xml
index 827480e12..138553218 100644
--- a/dss-apps/dss-apps-server/pom.xml
+++ b/dss-apps/dss-apps-server/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.1.0.20-SNAPSHOT</version>
+        <version>1.1.0.21-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-apps/dss-data-api/dss-api-sql-template/pom.xml b/dss-apps/dss-data-api/dss-api-sql-template/pom.xml
index 24a2d57c0..f87fd6f40 100644
--- a/dss-apps/dss-data-api/dss-api-sql-template/pom.xml
+++ b/dss-apps/dss-data-api/dss-api-sql-template/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.1.0.20-SNAPSHOT</version>
+        <version>1.1.0.21-SNAPSHOT</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-apps/dss-data-api/dss-data-api-server/pom.xml b/dss-apps/dss-data-api/dss-data-api-server/pom.xml
index ab98a16c4..93e0a996e 100644
--- a/dss-apps/dss-data-api/dss-data-api-server/pom.xml
+++ b/dss-apps/dss-data-api/dss-data-api-server/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.1.0.20-SNAPSHOT</version>
+        <version>1.1.0.21-SNAPSHOT</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-apps/dss-data-api/pom.xml b/dss-apps/dss-data-api/pom.xml
index 1e1730298..551bf1f12 100644
--- a/dss-apps/dss-data-api/pom.xml
+++ b/dss-apps/dss-data-api/pom.xml
@@ -6,7 +6,7 @@
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
         <relativePath>../../pom.xml</relativePath>
-        <version>1.1.0.20-SNAPSHOT</version>
+        <version>1.1.0.21-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>dss-data-api</artifactId>
diff --git a/dss-apps/dss-data-governance/dss-data-asset-server/pom.xml b/dss-apps/dss-data-governance/dss-data-asset-server/pom.xml
index f0061c59b..5c303b714 100644
--- a/dss-apps/dss-data-governance/dss-data-asset-server/pom.xml
+++ b/dss-apps/dss-data-governance/dss-data-asset-server/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.1.0.20-SNAPSHOT</version>
+        <version>1.1.0.21-SNAPSHOT</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-apps/dss-data-governance/dss-data-classification-server/pom.xml b/dss-apps/dss-data-governance/dss-data-classification-server/pom.xml
index 8e39df352..5b58fed36 100644
--- a/dss-apps/dss-data-governance/dss-data-classification-server/pom.xml
+++ b/dss-apps/dss-data-governance/dss-data-classification-server/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.1.0.20-SNAPSHOT</version>
+        <version>1.1.0.21-SNAPSHOT</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-apps/dss-data-governance/dss-data-governance-common/pom.xml b/dss-apps/dss-data-governance/dss-data-governance-common/pom.xml
index 891faa5f4..38f0171c0 100644
--- a/dss-apps/dss-data-governance/dss-data-governance-common/pom.xml
+++ b/dss-apps/dss-data-governance/dss-data-governance-common/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.1.0.20-SNAPSHOT</version>
+        <version>1.1.0.21-SNAPSHOT</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-apps/dss-data-governance/dss-data-governance-server/pom.xml b/dss-apps/dss-data-governance/dss-data-governance-server/pom.xml
index 25689c268..9e4986ff9 100644
--- a/dss-apps/dss-data-governance/dss-data-governance-server/pom.xml
+++ b/dss-apps/dss-data-governance/dss-data-governance-server/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.1.0.20-SNAPSHOT</version>
+        <version>1.1.0.21-SNAPSHOT</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-apps/dss-data-governance/pom.xml b/dss-apps/dss-data-governance/pom.xml
index 668d5c2c2..0f0f93481 100644
--- a/dss-apps/dss-data-governance/pom.xml
+++ b/dss-apps/dss-data-governance/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.1.0.20-SNAPSHOT</version>
+        <version>1.1.0.21-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-apps/dss-scriptis-server/pom.xml b/dss-apps/dss-scriptis-server/pom.xml
index 74d84e93f..825b74116 100644
--- a/dss-apps/dss-scriptis-server/pom.xml
+++ b/dss-apps/dss-scriptis-server/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.1.0.20-SNAPSHOT</version>
+        <version>1.1.0.21-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/dss-apps/dss-user-guide/dss-user-guide-server/pom.xml b/dss-apps/dss-user-guide/dss-user-guide-server/pom.xml
index e7e6add8d..6a3fe86f6 100644
--- a/dss-apps/dss-user-guide/dss-user-guide-server/pom.xml
+++ b/dss-apps/dss-user-guide/dss-user-guide-server/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>dss-user-guide</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.1.0.20-SNAPSHOT</version>
+        <version>1.1.0.21-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-apps/dss-user-guide/pom.xml b/dss-apps/dss-user-guide/pom.xml
index b506cc4b3..ef8b63465 100644
--- a/dss-apps/dss-user-guide/pom.xml
+++ b/dss-apps/dss-user-guide/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.1.0.20-SNAPSHOT</version>
+        <version>1.1.0.21-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-apps/pom.xml b/dss-apps/pom.xml
index 3731e59ae..67b956fc9 100644
--- a/dss-apps/pom.xml
+++ b/dss-apps/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.1.0.20-SNAPSHOT</version>
+        <version>1.1.0.21-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-commons/dss-common/pom.xml b/dss-commons/dss-common/pom.xml
index 23c2acc60..eebe3f823 100644
--- a/dss-commons/dss-common/pom.xml
+++ b/dss-commons/dss-common/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <artifactId>dss-commons</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.1.0.20-SNAPSHOT</version>
+        <version>1.1.0.21-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>dss-common</artifactId>
diff --git a/dss-commons/dss-contextservice/pom.xml b/dss-commons/dss-contextservice/pom.xml
index e72f0c672..3f81d39c0 100644
--- a/dss-commons/dss-contextservice/pom.xml
+++ b/dss-commons/dss-contextservice/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss-commons</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.1.0.20-SNAPSHOT</version>
+        <version>1.1.0.21-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>dss-contextservice</artifactId>
diff --git a/dss-commons/dss-sender-service/pom.xml b/dss-commons/dss-sender-service/pom.xml
index ba32deb18..b792be80d 100644
--- a/dss-commons/dss-sender-service/pom.xml
+++ b/dss-commons/dss-sender-service/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss-commons</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.1.0.20-SNAPSHOT</version>
+        <version>1.1.0.21-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-commons/pom.xml b/dss-commons/pom.xml
index f719aa12c..5820079c9 100644
--- a/dss-commons/pom.xml
+++ b/dss-commons/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.1.0.20-SNAPSHOT</version>
+        <version>1.1.0.21-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-framework/dss-appconn-framework/pom.xml b/dss-framework/dss-appconn-framework/pom.xml
index be1f80ef5..8aaaadbbd 100644
--- a/dss-framework/dss-appconn-framework/pom.xml
+++ b/dss-framework/dss-appconn-framework/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.1.0.20-SNAPSHOT</version>
+        <version>1.1.0.21-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-framework/dss-framework-admin-service/pom.xml b/dss-framework/dss-framework-admin-service/pom.xml
index 901db373b..5b469e8cc 100644
--- a/dss-framework/dss-framework-admin-service/pom.xml
+++ b/dss-framework/dss-framework-admin-service/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.1.0.20-SNAPSHOT</version>
+        <version>1.1.0.21-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/dss-framework/dss-framework-common/pom.xml b/dss-framework/dss-framework-common/pom.xml
index 942384562..a38484ced 100644
--- a/dss-framework/dss-framework-common/pom.xml
+++ b/dss-framework/dss-framework-common/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.1.0.20-SNAPSHOT</version>
+        <version>1.1.0.21-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-framework/dss-framework-orchestrator-server/pom.xml b/dss-framework/dss-framework-orchestrator-server/pom.xml
index 48b2caf90..0107b01b0 100644
--- a/dss-framework/dss-framework-orchestrator-server/pom.xml
+++ b/dss-framework/dss-framework-orchestrator-server/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.1.0.20-SNAPSHOT</version>
+        <version>1.1.0.21-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-framework/dss-framework-project-server/pom.xml b/dss-framework/dss-framework-project-server/pom.xml
index d8bd3ed2d..fd679ed39 100644
--- a/dss-framework/dss-framework-project-server/pom.xml
+++ b/dss-framework/dss-framework-project-server/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.1.0.20-SNAPSHOT</version>
+        <version>1.1.0.21-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-framework/dss-framework-proxy-user-service/pom.xml b/dss-framework/dss-framework-proxy-user-service/pom.xml
index 7faa50d57..eda1d4513 100644
--- a/dss-framework/dss-framework-proxy-user-service/pom.xml
+++ b/dss-framework/dss-framework-proxy-user-service/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>dss-framework</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.1.0.20-SNAPSHOT</version>
+        <version>1.1.0.21-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/dss-framework/dss-framework-workspace-server/pom.xml b/dss-framework/dss-framework-workspace-server/pom.xml
index 2ff2f0904..22bda9540 100644
--- a/dss-framework/dss-framework-workspace-server/pom.xml
+++ b/dss-framework/dss-framework-workspace-server/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.1.0.20-SNAPSHOT</version>
+        <version>1.1.0.21-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-framework/framework-plugins/dss-framework-migrate-server/pom.xml b/dss-framework/framework-plugins/dss-framework-migrate-server/pom.xml
index 4e6851585..1f70ab62d 100644
--- a/dss-framework/framework-plugins/dss-framework-migrate-server/pom.xml
+++ b/dss-framework/framework-plugins/dss-framework-migrate-server/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.1.0.20-SNAPSHOT</version>
+        <version>1.1.0.21-SNAPSHOT</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-framework/framework-plugins/dss-framework-orchestrator-publish/pom.xml b/dss-framework/framework-plugins/dss-framework-orchestrator-publish/pom.xml
index d7b57582e..fcc5ed67f 100644
--- a/dss-framework/framework-plugins/dss-framework-orchestrator-publish/pom.xml
+++ b/dss-framework/framework-plugins/dss-framework-orchestrator-publish/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.1.0.20-SNAPSHOT</version>
+        <version>1.1.0.21-SNAPSHOT</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-framework/pom.xml b/dss-framework/pom.xml
index 5327fb147..0665a4b92 100644
--- a/dss-framework/pom.xml
+++ b/dss-framework/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.1.0.20-SNAPSHOT</version>
+        <version>1.1.0.21-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-orchestrator/dss-orchestrator-common/pom.xml b/dss-orchestrator/dss-orchestrator-common/pom.xml
index 10b97e09d..40682adb8 100644
--- a/dss-orchestrator/dss-orchestrator-common/pom.xml
+++ b/dss-orchestrator/dss-orchestrator-common/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.1.0.20-SNAPSHOT</version>
+        <version>1.1.0.21-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-orchestrator/dss-orchestrator-conversion-standard/pom.xml b/dss-orchestrator/dss-orchestrator-conversion-standard/pom.xml
index 3335bfbee..1e4ac15f6 100644
--- a/dss-orchestrator/dss-orchestrator-conversion-standard/pom.xml
+++ b/dss-orchestrator/dss-orchestrator-conversion-standard/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <artifactId>dss-orchestrator</artifactId>
     <groupId>com.webank.wedatasphere.dss</groupId>
-    <version>1.1.0.20-SNAPSHOT</version>
+    <version>1.1.0.21-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
diff --git a/dss-orchestrator/dss-orchestrator-core/pom.xml b/dss-orchestrator/dss-orchestrator-core/pom.xml
index 7d2ffcb84..25e7bf860 100644
--- a/dss-orchestrator/dss-orchestrator-core/pom.xml
+++ b/dss-orchestrator/dss-orchestrator-core/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.1.0.20-SNAPSHOT</version>
+        <version>1.1.0.21-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-orchestrator/dss-orchestrator-db/pom.xml b/dss-orchestrator/dss-orchestrator-db/pom.xml
index fd75675ec..abedcc10f 100644
--- a/dss-orchestrator/dss-orchestrator-db/pom.xml
+++ b/dss-orchestrator/dss-orchestrator-db/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.1.0.20-SNAPSHOT</version>
+        <version>1.1.0.21-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-orchestrator/dss-orchestrator-loader/pom.xml b/dss-orchestrator/dss-orchestrator-loader/pom.xml
index 1f4a05191..a757e1a24 100644
--- a/dss-orchestrator/dss-orchestrator-loader/pom.xml
+++ b/dss-orchestrator/dss-orchestrator-loader/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.1.0.20-SNAPSHOT</version>
+        <version>1.1.0.21-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-orchestrator/orchestrators/dss-workflow/dss-flow-execution-server/pom.xml b/dss-orchestrator/orchestrators/dss-workflow/dss-flow-execution-server/pom.xml
index 1ac625b49..ed124d031 100644
--- a/dss-orchestrator/orchestrators/dss-workflow/dss-flow-execution-server/pom.xml
+++ b/dss-orchestrator/orchestrators/dss-workflow/dss-flow-execution-server/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.1.0.20-SNAPSHOT</version>
+        <version>1.1.0.21-SNAPSHOT</version>
         <relativePath>../../../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-orchestrator/orchestrators/dss-workflow/dss-linkis-node-execution/pom.xml b/dss-orchestrator/orchestrators/dss-workflow/dss-linkis-node-execution/pom.xml
index d88e327d6..c0a3c1984 100644
--- a/dss-orchestrator/orchestrators/dss-workflow/dss-linkis-node-execution/pom.xml
+++ b/dss-orchestrator/orchestrators/dss-workflow/dss-linkis-node-execution/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.1.0.20-SNAPSHOT</version>
+        <version>1.1.0.21-SNAPSHOT</version>
         <relativePath>../../../../pom.xml</relativePath>
     </parent>
     
diff --git a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-common/pom.xml b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-common/pom.xml
index e74991312..4b2b6ef17 100644
--- a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-common/pom.xml
+++ b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-common/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.1.0.20-SNAPSHOT</version>
+        <version>1.1.0.21-SNAPSHOT</version>
         <relativePath>../../../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-conversion-standard/pom.xml b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-conversion-standard/pom.xml
index fb2f99ce6..80e5df81d 100644
--- a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-conversion-standard/pom.xml
+++ b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-conversion-standard/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <artifactId>dss-workflow</artifactId>
     <groupId>com.webank.wedatasphere.dss</groupId>
-    <version>1.1.0.20-SNAPSHOT</version>
+    <version>1.1.0.21-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
diff --git a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-sdk/pom.xml b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-sdk/pom.xml
index 7bf055d48..dec539e41 100644
--- a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-sdk/pom.xml
+++ b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-sdk/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss-workflow</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.1.0.20-SNAPSHOT</version>
+        <version>1.1.0.21-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/pom.xml b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/pom.xml
index fd970e1d4..65387ae4e 100644
--- a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/pom.xml
+++ b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.1.0.20-SNAPSHOT</version>
+        <version>1.1.0.21-SNAPSHOT</version>
         <relativePath>../../../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-orchestrator/orchestrators/dss-workflow/pom.xml b/dss-orchestrator/orchestrators/dss-workflow/pom.xml
index f15cbb371..dc863de79 100644
--- a/dss-orchestrator/orchestrators/dss-workflow/pom.xml
+++ b/dss-orchestrator/orchestrators/dss-workflow/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.1.0.20-SNAPSHOT</version>
+        <version>1.1.0.21-SNAPSHOT</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-orchestrator/pom.xml b/dss-orchestrator/pom.xml
index dc9f4c6fa..ef6bea8de 100644
--- a/dss-orchestrator/pom.xml
+++ b/dss-orchestrator/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.1.0.20-SNAPSHOT</version>
+        <version>1.1.0.21-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-server/pom.xml b/dss-server/pom.xml
index ed7e68cf7..acdb1376c 100644
--- a/dss-server/pom.xml
+++ b/dss-server/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.1.0.20-SNAPSHOT</version>
+        <version>1.1.0.21-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-standard/development-standard/development-process-standard-execution/pom.xml b/dss-standard/development-standard/development-process-standard-execution/pom.xml
index 40bb6c080..b3f34474c 100644
--- a/dss-standard/development-standard/development-process-standard-execution/pom.xml
+++ b/dss-standard/development-standard/development-process-standard-execution/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <artifactId>dss</artifactId>
     <groupId>com.webank.wedatasphere.dss</groupId>
-    <version>1.1.0.20-SNAPSHOT</version>
+    <version>1.1.0.21-SNAPSHOT</version>
     <relativePath>../../../pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
diff --git a/dss-standard/development-standard/development-process-standard/pom.xml b/dss-standard/development-standard/development-process-standard/pom.xml
index f9f761d5b..5356f9593 100644
--- a/dss-standard/development-standard/development-process-standard/pom.xml
+++ b/dss-standard/development-standard/development-process-standard/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <artifactId>dss</artifactId>
     <groupId>com.webank.wedatasphere.dss</groupId>
-    <version>1.1.0.20-SNAPSHOT</version>
+    <version>1.1.0.21-SNAPSHOT</version>
     <relativePath>../../../pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
diff --git a/dss-standard/dss-standard-common/pom.xml b/dss-standard/dss-standard-common/pom.xml
index ee9a581af..4e1b12f51 100644
--- a/dss-standard/dss-standard-common/pom.xml
+++ b/dss-standard/dss-standard-common/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <artifactId>dss</artifactId>
     <groupId>com.webank.wedatasphere.dss</groupId>
-    <version>1.1.0.20-SNAPSHOT</version>
+    <version>1.1.0.21-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
diff --git a/dss-standard/pom.xml b/dss-standard/pom.xml
index a136fb2e9..fde1bb513 100644
--- a/dss-standard/pom.xml
+++ b/dss-standard/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <artifactId>dss</artifactId>
     <groupId>com.webank.wedatasphere.dss</groupId>
-    <version>1.1.0.20-SNAPSHOT</version>
+    <version>1.1.0.21-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
diff --git a/dss-standard/sso-standard/origin-sso-integration-standard/pom.xml b/dss-standard/sso-standard/origin-sso-integration-standard/pom.xml
index 592b59d6c..7c65dc338 100644
--- a/dss-standard/sso-standard/origin-sso-integration-standard/pom.xml
+++ b/dss-standard/sso-standard/origin-sso-integration-standard/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <artifactId>dss</artifactId>
     <groupId>com.webank.wedatasphere.dss</groupId>
-    <version>1.1.0.20-SNAPSHOT</version>
+    <version>1.1.0.21-SNAPSHOT</version>
     <relativePath>../../../pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
diff --git a/dss-standard/sso-standard/spring-origin-sso-integration-plugin/pom.xml b/dss-standard/sso-standard/spring-origin-sso-integration-plugin/pom.xml
index 5fdab0942..46ce2475d 100644
--- a/dss-standard/sso-standard/spring-origin-sso-integration-plugin/pom.xml
+++ b/dss-standard/sso-standard/spring-origin-sso-integration-plugin/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <artifactId>dss</artifactId>
     <groupId>com.webank.wedatasphere.dss</groupId>
-    <version>1.1.0.20-SNAPSHOT</version>
+    <version>1.1.0.21-SNAPSHOT</version>
     <relativePath>../../../pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
diff --git a/dss-standard/sso-standard/sso-integration-standard/pom.xml b/dss-standard/sso-standard/sso-integration-standard/pom.xml
index 2ac6ce59e..b5f67caf1 100644
--- a/dss-standard/sso-standard/sso-integration-standard/pom.xml
+++ b/dss-standard/sso-standard/sso-integration-standard/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <artifactId>dss</artifactId>
     <groupId>com.webank.wedatasphere.dss</groupId>
-    <version>1.1.0.20-SNAPSHOT</version>
+    <version>1.1.0.21-SNAPSHOT</version>
     <relativePath>../../../pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
diff --git a/dss-standard/structure-standard/dss-project-plugin/pom.xml b/dss-standard/structure-standard/dss-project-plugin/pom.xml
index 745e6b013..7885208da 100644
--- a/dss-standard/structure-standard/dss-project-plugin/pom.xml
+++ b/dss-standard/structure-standard/dss-project-plugin/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <artifactId>dss</artifactId>
     <groupId>com.webank.wedatasphere.dss</groupId>
-    <version>1.1.0.20-SNAPSHOT</version>
+    <version>1.1.0.21-SNAPSHOT</version>
     <relativePath>../../../pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
diff --git a/dss-standard/structure-standard/dss-role-plugin/pom.xml b/dss-standard/structure-standard/dss-role-plugin/pom.xml
index e5a562694..be0ea18aa 100644
--- a/dss-standard/structure-standard/dss-role-plugin/pom.xml
+++ b/dss-standard/structure-standard/dss-role-plugin/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <artifactId>dss</artifactId>
     <groupId>com.webank.wedatasphere.dss</groupId>
-    <version>1.1.0.20-SNAPSHOT</version>
+    <version>1.1.0.21-SNAPSHOT</version>
     <relativePath>../../../pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
diff --git a/dss-standard/structure-standard/dss-structure-integration-standard/pom.xml b/dss-standard/structure-standard/dss-structure-integration-standard/pom.xml
index 00ce1d53a..33d8b1415 100644
--- a/dss-standard/structure-standard/dss-structure-integration-standard/pom.xml
+++ b/dss-standard/structure-standard/dss-structure-integration-standard/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <artifactId>dss</artifactId>
     <groupId>com.webank.wedatasphere.dss</groupId>
-    <version>1.1.0.20-SNAPSHOT</version>
+    <version>1.1.0.21-SNAPSHOT</version>
     <relativePath>../../../pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
diff --git a/dss-standard/structure-standard/spring-origin-dss-project-plugin/pom.xml b/dss-standard/structure-standard/spring-origin-dss-project-plugin/pom.xml
index 645724e18..8269ab980 100644
--- a/dss-standard/structure-standard/spring-origin-dss-project-plugin/pom.xml
+++ b/dss-standard/structure-standard/spring-origin-dss-project-plugin/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <artifactId>dss</artifactId>
     <groupId>com.webank.wedatasphere.dss</groupId>
-    <version>1.1.0.20-SNAPSHOT</version>
+    <version>1.1.0.21-SNAPSHOT</version>
     <relativePath>../../../pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
diff --git a/plugins/azkaban/linkis-jobtype/pom.xml b/plugins/azkaban/linkis-jobtype/pom.xml
index e2ace7bb3..e0d2c983e 100644
--- a/plugins/azkaban/linkis-jobtype/pom.xml
+++ b/plugins/azkaban/linkis-jobtype/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.1.0.20-SNAPSHOT</version>
+        <version>1.1.0.21-SNAPSHOT</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
     <artifactId>linkis-jobtype</artifactId>
diff --git a/plugins/dolphinscheduler/dolphinscheduler-prod-metrics/pom.xml b/plugins/dolphinscheduler/dolphinscheduler-prod-metrics/pom.xml
index ca0cbacb8..7cad1d645 100644
--- a/plugins/dolphinscheduler/dolphinscheduler-prod-metrics/pom.xml
+++ b/plugins/dolphinscheduler/dolphinscheduler-prod-metrics/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <artifactId>dss-plugin-dolphinscheduler</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.1.0.20-SNAPSHOT</version>
+        <version>1.1.0.21-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/plugins/dolphinscheduler/dss-dolphinscheduler-client/pom.xml b/plugins/dolphinscheduler/dss-dolphinscheduler-client/pom.xml
index 0a01b3df1..894996923 100644
--- a/plugins/dolphinscheduler/dss-dolphinscheduler-client/pom.xml
+++ b/plugins/dolphinscheduler/dss-dolphinscheduler-client/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <artifactId>dss-plugin-dolphinscheduler</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.1.0.20-SNAPSHOT</version>
+        <version>1.1.0.21-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/plugins/dolphinscheduler/dss-dolphinscheduler-token/pom.xml b/plugins/dolphinscheduler/dss-dolphinscheduler-token/pom.xml
index e2d8af4fd..434704ef6 100644
--- a/plugins/dolphinscheduler/dss-dolphinscheduler-token/pom.xml
+++ b/plugins/dolphinscheduler/dss-dolphinscheduler-token/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <artifactId>dss-plugin-dolphinscheduler</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.1.0.20-SNAPSHOT</version>
+        <version>1.1.0.21-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/plugins/dolphinscheduler/pom.xml b/plugins/dolphinscheduler/pom.xml
index c4fc2db6c..b18b53a21 100644
--- a/plugins/dolphinscheduler/pom.xml
+++ b/plugins/dolphinscheduler/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <artifactId>dss</artifactId>
     <groupId>com.webank.wedatasphere.dss</groupId>
-    <version>1.1.0.20-SNAPSHOT</version>
+    <version>1.1.0.21-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
diff --git a/plugins/linkis/dss-gateway-support/pom.xml b/plugins/linkis/dss-gateway-support/pom.xml
index 4d24332da..3e560b4a7 100644
--- a/plugins/linkis/dss-gateway-support/pom.xml
+++ b/plugins/linkis/dss-gateway-support/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.1.0.20-SNAPSHOT</version>
+        <version>1.1.0.21-SNAPSHOT</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/pom.xml b/pom.xml
index b1372a31f..5074eaf02 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
     <packaging>pom</packaging>
     <groupId>com.webank.wedatasphere.dss</groupId>
     <artifactId>dss</artifactId>
-    <version>1.1.0.20-SNAPSHOT</version>
+    <version>1.1.0.21-SNAPSHOT</version>
 
     <modules>
         <module>dss-commons</module>
@@ -40,7 +40,7 @@
     </modules>
 
     <properties>
-        <dss.version>1.1.0.20-SNAPSHOT</dss.version>
+        <dss.version>1.1.0.21-SNAPSHOT</dss.version>
         <linkis.version>1.1.19-wds-SNAPSHOT</linkis.version>
         <scala.version>2.11.12</scala.version>
         <jdk.compile.version>1.8</jdk.compile.version>

From f487e7fcfc16039c319488bc2bf4a087a4abc36e Mon Sep 17 00:00:00 2001
From: xlinliu <arionliu@webank.com>
Date: Wed, 27 Mar 2024 18:00:09 +0800
Subject: [PATCH 004/302] fix bug appconn load failed by AppConnRefreshThread

---
 .../dss/appconn/manager/impl/AbstractAppConnManager.java       | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/dss-appconn/dss-appconn-manager/dss-appconn-manager-core/src/main/java/com/webank/wedatasphere/dss/appconn/manager/impl/AbstractAppConnManager.java b/dss-appconn/dss-appconn-manager/dss-appconn-manager-core/src/main/java/com/webank/wedatasphere/dss/appconn/manager/impl/AbstractAppConnManager.java
index a6d019e7a..45631314a 100644
--- a/dss-appconn/dss-appconn-manager/dss-appconn-manager-core/src/main/java/com/webank/wedatasphere/dss/appconn/manager/impl/AbstractAppConnManager.java
+++ b/dss-appconn/dss-appconn-manager/dss-appconn-manager-core/src/main/java/com/webank/wedatasphere/dss/appconn/manager/impl/AbstractAppConnManager.java
@@ -43,6 +43,7 @@
 import org.slf4j.LoggerFactory;
 
 import java.util.*;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.TimeUnit;
 import java.util.function.Consumer;
 import java.util.stream.Collectors;
@@ -52,7 +53,7 @@ public abstract class AbstractAppConnManager implements AppConnManager {
     private static final Logger LOGGER = LoggerFactory.getLogger(AbstractAppConnManager.class);
     private final AppConnLoader appConnLoader = AppConnLoaderFactory.getAppConnLoader();
 
-    private final Map<String, AppConn> appConns = new HashMap<>();
+    private final Map<String, AppConn> appConns = new ConcurrentHashMap<>();
     private volatile boolean isLoaded = false;
     private List<AppConn> appConnList = null;
     AppConnInfoService appConnInfoService;

From a9feb109f5e52c05c3da38159bd029baac965d83 Mon Sep 17 00:00:00 2001
From: SunpengWan <825559776@qq.com>
Date: Thu, 28 Mar 2024 15:35:50 +0800
Subject: [PATCH 005/302] =?UTF-8?q?=E6=9B=B4=E6=94=B9xlsx-streamer?=
 =?UTF-8?q?=E5=8C=85=E7=89=88=E6=9C=AC,1.2.1=E5=8D=87=E7=BA=A7=E4=B8=BA2.1?=
 =?UTF-8?q?.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 dss-commons/dss-common/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dss-commons/dss-common/pom.xml b/dss-commons/dss-common/pom.xml
index eebe3f823..86f83dbcc 100644
--- a/dss-commons/dss-common/pom.xml
+++ b/dss-commons/dss-common/pom.xml
@@ -109,7 +109,7 @@
         <dependency>
             <groupId>com.monitorjbl</groupId>
             <artifactId>xlsx-streamer</artifactId>
-            <version>1.2.1</version>
+            <version>2.1.0</version>
             <exclusions>
                 <exclusion>
                     <groupId>com.fasterxml.jackson.core</groupId>

From c99bf6f30970a3b92faf7c26efbaca4a71266ac5 Mon Sep 17 00:00:00 2001
From: zhaobincai <zhaobincai@webank.com>
Date: Mon, 1 Apr 2024 20:39:18 +0800
Subject: [PATCH 006/302] git Module add

---
 .../workspace/bean/GitUserEntity.java         |  97 ++++
 .../workspace/dao/DSSWorkspaceGitMapper.java  |  14 +
 .../dao/impl/DSSWorkspaceGitMapper.xml        |  35 ++
 .../restful/DSSWorkspaceRestful.java          |  19 +
 .../service/DSSWorkspaceGitService.java       |  10 +
 .../impl/DSSWorkspaceGitServiceImpl.java      |  31 ++
 dss-git/dss-git-common/pom.xml                |  22 +
 .../protocol/GitTree.java                     |  44 ++
 .../request/GitArchiveProjectRequest.java     |  30 ++
 .../protocol/request/GitBaseRequest.java      |  30 ++
 .../request/GitCheckProjectRequest.java       |  32 ++
 .../protocol/request/GitCommitRequest.java    |  63 +++
 .../request/GitCreateProjectRequest.java      |  45 ++
 .../protocol/request/GitDeleteRequest.java    |  42 ++
 .../protocol/request/GitDiffRequest.java      |  48 ++
 .../request/GitFileContentRequest.java        |  41 ++
 .../protocol/request/GitRemoveRequest.java    |  20 +
 .../protocol/request/GitRevertRequest.java    |  34 ++
 .../protocol/request/GitSearchRequest.java    |  87 +++
 .../protocol/response/GItDiffResponse.java    |  23 +
 .../response/GitArchivePorjectResponse.java   |  21 +
 .../protocol/response/GitBaseResponse.java    |  42 ++
 .../response/GitCheckProjectResponse.java     |  37 ++
 .../protocol/response/GitCommitResponse.java  |  54 ++
 .../response/GitCreateProjectResponse.java    |  32 ++
 .../protocol/response/GitDeleteResponse.java  |  37 ++
 .../response/GitFileContentResponse.java      |  23 +
 .../protocol/response/GitSearchResponse.java  |  34 ++
 dss-git/dss-git-server/pom.xml                | 125 +++++
 .../src/main/assembly/distribution.xml        |  46 ++
 .../dss/git/config/GitServerConfig.java       |  15 +
 .../service/DSSGitProjectManagerService.java  |  16 +
 .../service/DSSGitWorkflowManagerService.java |  19 +
 .../impl/DSSGitProjectManagerServiceImpl.java |  91 ++++
 .../DSSGitWorkflowManagerServiceImpl.java     | 303 +++++++++++
 .../git/thread/GitServerThreadFactory.java    |  12 +
 .../dss/git/thread/GitServerThreadPool.java   |  38 ++
 .../dss/git/utils/DSSGitUtils.java            | 496 ++++++++++++++++++
 .../wedatasphere/dss/git/utils/FileUtils.java | 162 ++++++
 .../receiver/DSSGitChooser.scala              |  53 ++
 .../receiver/DSSGitReceiver.scala             |  53 ++
 dss-git/pom.xml                               |  24 +
 42 files changed, 2500 insertions(+)
 create mode 100644 dss-framework/dss-framework-workspace-server/src/main/java/com/webank/wedatasphere/dss/framework/workspace/bean/GitUserEntity.java
 create mode 100644 dss-framework/dss-framework-workspace-server/src/main/java/com/webank/wedatasphere/dss/framework/workspace/dao/DSSWorkspaceGitMapper.java
 create mode 100644 dss-framework/dss-framework-workspace-server/src/main/java/com/webank/wedatasphere/dss/framework/workspace/dao/impl/DSSWorkspaceGitMapper.xml
 create mode 100644 dss-framework/dss-framework-workspace-server/src/main/java/com/webank/wedatasphere/dss/framework/workspace/service/DSSWorkspaceGitService.java
 create mode 100644 dss-framework/dss-framework-workspace-server/src/main/java/com/webank/wedatasphere/dss/framework/workspace/service/impl/DSSWorkspaceGitServiceImpl.java
 create mode 100644 dss-git/dss-git-common/pom.xml
 create mode 100644 dss-git/dss-git-common/src/main/java/com.webank.wedatasphere.dss.git.common/protocol/GitTree.java
 create mode 100644 dss-git/dss-git-common/src/main/java/com.webank.wedatasphere.dss.git.common/protocol/request/GitArchiveProjectRequest.java
 create mode 100644 dss-git/dss-git-common/src/main/java/com.webank.wedatasphere.dss.git.common/protocol/request/GitBaseRequest.java
 create mode 100644 dss-git/dss-git-common/src/main/java/com.webank.wedatasphere.dss.git.common/protocol/request/GitCheckProjectRequest.java
 create mode 100644 dss-git/dss-git-common/src/main/java/com.webank.wedatasphere.dss.git.common/protocol/request/GitCommitRequest.java
 create mode 100644 dss-git/dss-git-common/src/main/java/com.webank.wedatasphere.dss.git.common/protocol/request/GitCreateProjectRequest.java
 create mode 100644 dss-git/dss-git-common/src/main/java/com.webank.wedatasphere.dss.git.common/protocol/request/GitDeleteRequest.java
 create mode 100644 dss-git/dss-git-common/src/main/java/com.webank.wedatasphere.dss.git.common/protocol/request/GitDiffRequest.java
 create mode 100644 dss-git/dss-git-common/src/main/java/com.webank.wedatasphere.dss.git.common/protocol/request/GitFileContentRequest.java
 create mode 100644 dss-git/dss-git-common/src/main/java/com.webank.wedatasphere.dss.git.common/protocol/request/GitRemoveRequest.java
 create mode 100644 dss-git/dss-git-common/src/main/java/com.webank.wedatasphere.dss.git.common/protocol/request/GitRevertRequest.java
 create mode 100644 dss-git/dss-git-common/src/main/java/com.webank.wedatasphere.dss.git.common/protocol/request/GitSearchRequest.java
 create mode 100644 dss-git/dss-git-common/src/main/java/com.webank.wedatasphere.dss.git.common/protocol/response/GItDiffResponse.java
 create mode 100644 dss-git/dss-git-common/src/main/java/com.webank.wedatasphere.dss.git.common/protocol/response/GitArchivePorjectResponse.java
 create mode 100644 dss-git/dss-git-common/src/main/java/com.webank.wedatasphere.dss.git.common/protocol/response/GitBaseResponse.java
 create mode 100644 dss-git/dss-git-common/src/main/java/com.webank.wedatasphere.dss.git.common/protocol/response/GitCheckProjectResponse.java
 create mode 100644 dss-git/dss-git-common/src/main/java/com.webank.wedatasphere.dss.git.common/protocol/response/GitCommitResponse.java
 create mode 100644 dss-git/dss-git-common/src/main/java/com.webank.wedatasphere.dss.git.common/protocol/response/GitCreateProjectResponse.java
 create mode 100644 dss-git/dss-git-common/src/main/java/com.webank.wedatasphere.dss.git.common/protocol/response/GitDeleteResponse.java
 create mode 100644 dss-git/dss-git-common/src/main/java/com.webank.wedatasphere.dss.git.common/protocol/response/GitFileContentResponse.java
 create mode 100644 dss-git/dss-git-common/src/main/java/com.webank.wedatasphere.dss.git.common/protocol/response/GitSearchResponse.java
 create mode 100644 dss-git/dss-git-server/pom.xml
 create mode 100644 dss-git/dss-git-server/src/main/assembly/distribution.xml
 create mode 100644 dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/config/GitServerConfig.java
 create mode 100644 dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/DSSGitProjectManagerService.java
 create mode 100644 dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/DSSGitWorkflowManagerService.java
 create mode 100644 dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitProjectManagerServiceImpl.java
 create mode 100644 dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitWorkflowManagerServiceImpl.java
 create mode 100644 dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/thread/GitServerThreadFactory.java
 create mode 100644 dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/thread/GitServerThreadPool.java
 create mode 100644 dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/utils/DSSGitUtils.java
 create mode 100644 dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/utils/FileUtils.java
 create mode 100644 dss-git/dss-git-server/src/main/scala/com.webank.wedatasphere.dss.git/receiver/DSSGitChooser.scala
 create mode 100644 dss-git/dss-git-server/src/main/scala/com.webank.wedatasphere.dss.git/receiver/DSSGitReceiver.scala
 create mode 100644 dss-git/pom.xml

diff --git a/dss-framework/dss-framework-workspace-server/src/main/java/com/webank/wedatasphere/dss/framework/workspace/bean/GitUserEntity.java b/dss-framework/dss-framework-workspace-server/src/main/java/com/webank/wedatasphere/dss/framework/workspace/bean/GitUserEntity.java
new file mode 100644
index 000000000..0f5961118
--- /dev/null
+++ b/dss-framework/dss-framework-workspace-server/src/main/java/com/webank/wedatasphere/dss/framework/workspace/bean/GitUserEntity.java
@@ -0,0 +1,97 @@
+package com.webank.wedatasphere.dss.framework.workspace.bean;
+
+
+import java.util.Date;
+
+public class GitUserEntity {
+    private Long id;
+    private Long workspaceId;
+    private String gitUser;
+    private String gitToken;
+    private Date createTime;
+    private Date updateTime;
+    private String createBy;
+    private String updateBy;
+
+    public GitUserEntity() {
+    }
+
+    public GitUserEntity(Long workspaceId, String gitUser, String gitToken, String updateBy) {
+        this.workspaceId = workspaceId;
+        this.gitUser = gitUser;
+        this.gitToken = gitToken;
+        this.updateBy = updateBy;
+    }
+
+    public GitUserEntity(Long workspaceId, String gitUser, String gitToken, String createBy, String updateBy) {
+        this.workspaceId = workspaceId;
+        this.gitUser = gitUser;
+        this.gitToken = gitToken;
+        this.createBy = createBy;
+        this.updateBy = updateBy;
+    }
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public Long getWorkspaceId() {
+        return workspaceId;
+    }
+
+    public void setWorkspaceId(Long workspaceId) {
+        this.workspaceId = workspaceId;
+    }
+
+    public String getGitUser() {
+        return gitUser;
+    }
+
+    public void setGitUser(String gitUser) {
+        this.gitUser = gitUser;
+    }
+
+    public String getGitToken() {
+        return gitToken;
+    }
+
+    public void setGitToken(String gitToken) {
+        this.gitToken = gitToken;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    public String getCreateBy() {
+        return createBy;
+    }
+
+    public void setCreateBy(String createBy) {
+        this.createBy = createBy;
+    }
+
+    public String getUpdateBy() {
+        return updateBy;
+    }
+
+    public void setUpdateBy(String updateBy) {
+        this.updateBy = updateBy;
+    }
+}
diff --git a/dss-framework/dss-framework-workspace-server/src/main/java/com/webank/wedatasphere/dss/framework/workspace/dao/DSSWorkspaceGitMapper.java b/dss-framework/dss-framework-workspace-server/src/main/java/com/webank/wedatasphere/dss/framework/workspace/dao/DSSWorkspaceGitMapper.java
new file mode 100644
index 000000000..ec2ec55cd
--- /dev/null
+++ b/dss-framework/dss-framework-workspace-server/src/main/java/com/webank/wedatasphere/dss/framework/workspace/dao/DSSWorkspaceGitMapper.java
@@ -0,0 +1,14 @@
+package com.webank.wedatasphere.dss.framework.workspace.dao;
+
+import com.webank.wedatasphere.dss.framework.workspace.bean.GitUserEntity;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+@Mapper
+public interface DSSWorkspaceGitMapper {
+    void insert(GitUserEntity gitUserDO);
+
+    void update(GitUserEntity gitUserDO);
+
+    GitUserEntity selectByWorkspaceId(@Param("workspaceId") Long workspaceId);
+}
diff --git a/dss-framework/dss-framework-workspace-server/src/main/java/com/webank/wedatasphere/dss/framework/workspace/dao/impl/DSSWorkspaceGitMapper.xml b/dss-framework/dss-framework-workspace-server/src/main/java/com/webank/wedatasphere/dss/framework/workspace/dao/impl/DSSWorkspaceGitMapper.xml
new file mode 100644
index 000000000..f852192ae
--- /dev/null
+++ b/dss-framework/dss-framework-workspace-server/src/main/java/com/webank/wedatasphere/dss/framework/workspace/dao/impl/DSSWorkspaceGitMapper.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+  ~ Copyright 2019 WeBank
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~ http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ 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.
+  ~
+  -->
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+
+<mapper namespace="com.webank.wedatasphere.dss.framework.workspace.dao.DSSWorkspaceGitMapper">
+    <insert id="insert" parameterType="com.webank.wedatasphere.dss.framework.workspace.bean.GitUserEntity">
+        insert into dss_workspace_associate_git (workspace_id, git_user, git_token, create_time, update_time, create_by, update_by)
+        VALUES (#{workspaceId}, #{gitUser}, #{gitToken}, now(), now(), #{createBy}, #{updateBy})
+    </insert>
+
+    <update id="update" parameterType="com.webank.wedatasphere.dss.framework.workspace.bean.GitUserEntity">
+        update dss_workspace_associate_git set git_user = #{gitUser}, git_token = #{gitToken} , update_time = now(), update_by = #{updateBy}
+        where workspace_id = #{workspaceId}
+    </update>
+
+    <select id="selectByWorkspaceId" resultType="com.webank.wedatasphere.dss.framework.workspace.bean.GitUserEntity">
+        select id, workspace_id, git_user, git_token, create_time, update_time, create_by, update_by
+        from dss_workspace_associate_git
+        where workspace_id = #{workspaceId}
+    </select>
+</mapper>
\ No newline at end of file
diff --git a/dss-framework/dss-framework-workspace-server/src/main/java/com/webank/wedatasphere/dss/framework/workspace/restful/DSSWorkspaceRestful.java b/dss-framework/dss-framework-workspace-server/src/main/java/com/webank/wedatasphere/dss/framework/workspace/restful/DSSWorkspaceRestful.java
index 06fe1e841..62a441d60 100644
--- a/dss-framework/dss-framework-workspace-server/src/main/java/com/webank/wedatasphere/dss/framework/workspace/restful/DSSWorkspaceRestful.java
+++ b/dss-framework/dss-framework-workspace-server/src/main/java/com/webank/wedatasphere/dss/framework/workspace/restful/DSSWorkspaceRestful.java
@@ -23,12 +23,14 @@
 import com.webank.wedatasphere.dss.common.utils.DSSCommonUtils;
 import com.webank.wedatasphere.dss.framework.admin.service.DssAdminUserService;
 import com.webank.wedatasphere.dss.framework.workspace.bean.DSSWorkspace;
+import com.webank.wedatasphere.dss.framework.workspace.bean.GitUserEntity;
 import com.webank.wedatasphere.dss.framework.workspace.bean.dto.response.WorkspaceFavoriteVo;
 import com.webank.wedatasphere.dss.framework.workspace.bean.dto.response.WorkspaceMenuVo;
 import com.webank.wedatasphere.dss.framework.workspace.bean.request.CreateWorkspaceRequest;
 import com.webank.wedatasphere.dss.framework.workspace.bean.vo.DSSWorkspaceHomePageVO;
 import com.webank.wedatasphere.dss.framework.workspace.bean.vo.DSSWorkspaceOverviewVO;
 import com.webank.wedatasphere.dss.framework.workspace.bean.vo.DSSWorkspaceVO;
+import com.webank.wedatasphere.dss.framework.workspace.service.DSSWorkspaceGitService;
 import com.webank.wedatasphere.dss.framework.workspace.service.DSSWorkspaceRoleService;
 import com.webank.wedatasphere.dss.framework.workspace.service.DSSWorkspaceService;
 import com.webank.wedatasphere.dss.framework.workspace.util.WorkspaceDBHelper;
@@ -72,6 +74,9 @@ public class DSSWorkspaceRestful {
     @Autowired
     private HttpServletResponse httpServletResponse;
 
+    @Autowired
+    private DSSWorkspaceGitService dssWorkspaceGitService;
+
     @RequestMapping(path = "createWorkspace", method = RequestMethod.POST)
     public Message createWorkspace(@RequestBody CreateWorkspaceRequest createWorkspaceRequest) throws ErrorException {
         String userName = SecurityFilter.getLoginUsername(httpServletRequest);
@@ -334,6 +339,20 @@ public Message deleteFavorite(@PathVariable("workspaceId") Long workspaceId, @Pa
         return Message.ok().data("favoriteId", favoriteId);
     }
 
+    @RequestMapping(path = "/workspaces/git", method = RequestMethod.POST)
+    public Message associateGit(@RequestBody GitUserEntity gitUser) {
+        String username = SecurityFilter.getLoginUsername(httpServletRequest);
+        dssWorkspaceGitService.associateGit(gitUser, username);
+        return Message.ok();
+    }
+
+    @RequestMapping(path = "/workspaces/git", method = RequestMethod.GET)
+    public Message selectGit(@RequestParam Long workspaceId) {
+        String username = SecurityFilter.getLoginUsername(httpServletRequest);
+        GitUserEntity gitUser = dssWorkspaceGitService.selectGit(workspaceId);
+        return Message.ok().data("gitUser", gitUser);
+    }
+
 
 }
 
diff --git a/dss-framework/dss-framework-workspace-server/src/main/java/com/webank/wedatasphere/dss/framework/workspace/service/DSSWorkspaceGitService.java b/dss-framework/dss-framework-workspace-server/src/main/java/com/webank/wedatasphere/dss/framework/workspace/service/DSSWorkspaceGitService.java
new file mode 100644
index 000000000..8248d79ac
--- /dev/null
+++ b/dss-framework/dss-framework-workspace-server/src/main/java/com/webank/wedatasphere/dss/framework/workspace/service/DSSWorkspaceGitService.java
@@ -0,0 +1,10 @@
+package com.webank.wedatasphere.dss.framework.workspace.service;
+
+import com.webank.wedatasphere.dss.framework.workspace.bean.GitUserEntity;
+
+public interface DSSWorkspaceGitService {
+
+    void associateGit(GitUserEntity gitUser, String userName);
+
+    GitUserEntity selectGit(Long workspaceId);
+}
diff --git a/dss-framework/dss-framework-workspace-server/src/main/java/com/webank/wedatasphere/dss/framework/workspace/service/impl/DSSWorkspaceGitServiceImpl.java b/dss-framework/dss-framework-workspace-server/src/main/java/com/webank/wedatasphere/dss/framework/workspace/service/impl/DSSWorkspaceGitServiceImpl.java
new file mode 100644
index 000000000..8efc8a1a7
--- /dev/null
+++ b/dss-framework/dss-framework-workspace-server/src/main/java/com/webank/wedatasphere/dss/framework/workspace/service/impl/DSSWorkspaceGitServiceImpl.java
@@ -0,0 +1,31 @@
+package com.webank.wedatasphere.dss.framework.workspace.service.impl;
+
+import com.webank.wedatasphere.dss.framework.workspace.bean.GitUserEntity;
+import com.webank.wedatasphere.dss.framework.workspace.dao.DSSWorkspaceGitMapper;
+import com.webank.wedatasphere.dss.framework.workspace.service.DSSWorkspaceGitService;
+import org.springframework.beans.factory.annotation.Autowired;
+
+public class DSSWorkspaceGitServiceImpl implements DSSWorkspaceGitService {
+
+    @Autowired
+    private DSSWorkspaceGitMapper workspaceGitMapper;
+
+
+    @Override
+    public void associateGit(GitUserEntity gitUser, String userName) {
+        // 不存在则更新，存在则新增
+        GitUserEntity oldGitUserDo = selectGit(gitUser.getWorkspaceId());
+        gitUser.setUpdateBy(userName);
+        if (oldGitUserDo == null) {
+            gitUser.setCreateBy(userName);
+            workspaceGitMapper.insert(gitUser);
+        }else {
+            workspaceGitMapper.update(gitUser);
+        }
+    }
+
+    @Override
+    public GitUserEntity selectGit(Long workspaceId) {
+        return workspaceGitMapper.selectByWorkspaceId(workspaceId);
+    }
+}
diff --git a/dss-git/dss-git-common/pom.xml b/dss-git/dss-git-common/pom.xml
new file mode 100644
index 000000000..24b97f2cf
--- /dev/null
+++ b/dss-git/dss-git-common/pom.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>dss-git</artifactId>
+        <groupId>com.webank.wedatasphere.dss</groupId>
+        <version>1.1.0.20-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>dss-git-common</artifactId>
+
+    <dependencies>
+    <dependency>
+        <groupId>com.webank.wedatasphere.dss</groupId>
+        <artifactId>dss-common</artifactId>
+        <version>${dss.version}</version>
+    </dependency>
+    </dependencies>
+
+</project>
\ No newline at end of file
diff --git a/dss-git/dss-git-common/src/main/java/com.webank.wedatasphere.dss.git.common/protocol/GitTree.java b/dss-git/dss-git-common/src/main/java/com.webank.wedatasphere.dss.git.common/protocol/GitTree.java
new file mode 100644
index 000000000..6ef9b0487
--- /dev/null
+++ b/dss-git/dss-git-common/src/main/java/com.webank.wedatasphere.dss.git.common/protocol/GitTree.java
@@ -0,0 +1,44 @@
+package com.webank.wedatasphere.dss.git.common.protocol;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public class GitTree {
+    private String name;
+    private Map<String, GitTree> children = new HashMap<>();
+
+    public GitTree(String name) {
+        this.name = name;
+    }
+
+    // 添加子节点
+    public void addChild(String path) {
+        String[] parts = path.split("/", 2);
+        String currentPart = parts[0];
+        String restPart = parts.length > 1 ? parts[1] : null;
+
+        children.putIfAbsent(currentPart, new GitTree(currentPart));
+        GitTree child = children.get(currentPart);
+
+        if (restPart != null) {
+            child.addChild(restPart);
+        }
+    }
+
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public Map<String, GitTree> getChildren() {
+        return children;
+    }
+
+    public void setChildren(Map<String, GitTree> children) {
+        this.children = children;
+    }
+}
diff --git a/dss-git/dss-git-common/src/main/java/com.webank.wedatasphere.dss.git.common/protocol/request/GitArchiveProjectRequest.java b/dss-git/dss-git-common/src/main/java/com.webank.wedatasphere.dss.git.common/protocol/request/GitArchiveProjectRequest.java
new file mode 100644
index 000000000..07397e777
--- /dev/null
+++ b/dss-git/dss-git-common/src/main/java/com.webank.wedatasphere.dss.git.common/protocol/request/GitArchiveProjectRequest.java
@@ -0,0 +1,30 @@
+package com.webank.wedatasphere.dss.git.common.protocol.request;
+
+
+public class GitArchiveProjectRequest extends GitBaseRequest{
+    /**
+     * DSS用户名
+     */
+    private String username;
+
+    public GitArchiveProjectRequest() {
+    }
+
+    public GitArchiveProjectRequest(String username) {
+        this.username = username;
+    }
+
+    public GitArchiveProjectRequest(Long workspaceId, String projectName, String username) {
+        super(workspaceId, projectName);
+        this.username = username;
+    }
+
+
+    public String getUsername() {
+        return username;
+    }
+
+    public void setUsername(String username) {
+        this.username = username;
+    }
+}
diff --git a/dss-git/dss-git-common/src/main/java/com.webank.wedatasphere.dss.git.common/protocol/request/GitBaseRequest.java b/dss-git/dss-git-common/src/main/java/com.webank.wedatasphere.dss.git.common/protocol/request/GitBaseRequest.java
new file mode 100644
index 000000000..28e9e849c
--- /dev/null
+++ b/dss-git/dss-git-common/src/main/java/com.webank.wedatasphere.dss.git.common/protocol/request/GitBaseRequest.java
@@ -0,0 +1,30 @@
+package com.webank.wedatasphere.dss.git.common.protocol.request;
+
+public class GitBaseRequest{
+    private Long workspaceId;
+    private String projectName;
+
+    public GitBaseRequest() {
+    }
+
+    public GitBaseRequest(Long workspaceId, String projectName) {
+        this.workspaceId = workspaceId;
+        this.projectName = projectName;
+    }
+
+    public Long getWorkspaceId() {
+        return workspaceId;
+    }
+
+    public void setWorkspaceId(Long workspaceId) {
+        this.workspaceId = workspaceId;
+    }
+
+    public String getProjectName() {
+        return projectName;
+    }
+
+    public void setProjectName(String projectName) {
+        this.projectName = projectName;
+    }
+}
diff --git a/dss-git/dss-git-common/src/main/java/com.webank.wedatasphere.dss.git.common/protocol/request/GitCheckProjectRequest.java b/dss-git/dss-git-common/src/main/java/com.webank.wedatasphere.dss.git.common/protocol/request/GitCheckProjectRequest.java
new file mode 100644
index 000000000..203b32d0f
--- /dev/null
+++ b/dss-git/dss-git-common/src/main/java/com.webank.wedatasphere.dss.git.common/protocol/request/GitCheckProjectRequest.java
@@ -0,0 +1,32 @@
+package com.webank.wedatasphere.dss.git.common.protocol.request;
+
+
+public class GitCheckProjectRequest extends GitBaseRequest {
+    /**
+     * DSS用户名
+     */
+    private String username;
+
+
+
+    public GitCheckProjectRequest() {
+    }
+
+    public GitCheckProjectRequest(String username) {
+        this.username = username;
+    }
+
+    public GitCheckProjectRequest(Long workspaceId, String projectName, String username) {
+        super(workspaceId, projectName);
+        this.username = username;
+    }
+
+
+    public String getUsername() {
+        return username;
+    }
+
+    public void setUsername(String username) {
+        this.username = username;
+    }
+}
diff --git a/dss-git/dss-git-common/src/main/java/com.webank.wedatasphere.dss.git.common/protocol/request/GitCommitRequest.java b/dss-git/dss-git-common/src/main/java/com.webank.wedatasphere.dss.git.common/protocol/request/GitCommitRequest.java
new file mode 100644
index 000000000..4ed8cd315
--- /dev/null
+++ b/dss-git/dss-git-common/src/main/java/com.webank.wedatasphere.dss.git.common/protocol/request/GitCommitRequest.java
@@ -0,0 +1,63 @@
+package com.webank.wedatasphere.dss.git.common.protocol.request;
+
+import com.webank.wedatasphere.dss.common.entity.BmlResource;
+
+import java.util.Map;
+
+
+public class GitCommitRequest extends GitBaseRequest{
+    /**
+     * 待修改的文件（key：文件相对路径，value：文件对应BML）
+     */
+    private Map<String, BmlResource> bmlResourceMap;
+    /**
+     * 提交更新时的comment
+     */
+    private String comment;
+    /**
+     * 下载BMLReource使用的用户名
+     */
+    private String username;
+
+
+    public GitCommitRequest() {
+    }
+
+    public GitCommitRequest(Map<String, BmlResource> bmlResourceMap, String comment, String username) {
+        this.bmlResourceMap = bmlResourceMap;
+        this.comment = comment;
+        this.username = username;
+    }
+
+    public GitCommitRequest(Long workspaceId, String projectName, Map<String, BmlResource> bmlResourceMap, String comment, String username) {
+        super(workspaceId, projectName);
+        this.bmlResourceMap = bmlResourceMap;
+        this.comment = comment;
+        this.username = username;
+    }
+
+
+    public Map<String, BmlResource> getBmlResourceMap() {
+        return bmlResourceMap;
+    }
+
+    public void setBmlResourceMap(Map<String, BmlResource> bmlResourceMap) {
+        this.bmlResourceMap = bmlResourceMap;
+    }
+
+    public String getComment() {
+        return comment;
+    }
+
+    public void setComment(String comment) {
+        this.comment = comment;
+    }
+
+    public String getUsername() {
+        return username;
+    }
+
+    public void setUsername(String username) {
+        this.username = username;
+    }
+}
diff --git a/dss-git/dss-git-common/src/main/java/com.webank.wedatasphere.dss.git.common/protocol/request/GitCreateProjectRequest.java b/dss-git/dss-git-common/src/main/java/com.webank.wedatasphere.dss.git.common/protocol/request/GitCreateProjectRequest.java
new file mode 100644
index 000000000..7a76e7471
--- /dev/null
+++ b/dss-git/dss-git-common/src/main/java/com.webank.wedatasphere.dss.git.common/protocol/request/GitCreateProjectRequest.java
@@ -0,0 +1,45 @@
+package com.webank.wedatasphere.dss.git.common.protocol.request;
+
+
+import com.webank.wedatasphere.dss.common.entity.BmlResource;
+
+public class GitCreateProjectRequest extends GitBaseRequest{
+    /**
+     * DSS项目对应的BML
+     */
+    private BmlResource bmlResource;
+    /**
+     * 下载BMLReource使用的用户名
+     */
+    private String username;
+
+    public GitCreateProjectRequest() {
+    }
+
+    public GitCreateProjectRequest(BmlResource bmlResource, String username) {
+        this.bmlResource = bmlResource;
+        this.username = username;
+    }
+
+    public GitCreateProjectRequest(Long workspaceId, String projectName, BmlResource bmlResource, String username) {
+        super(workspaceId, projectName);
+        this.bmlResource = bmlResource;
+        this.username = username;
+    }
+
+    public BmlResource getBmlResource() {
+        return bmlResource;
+    }
+
+    public void setBmlResource(BmlResource bmlResource) {
+        this.bmlResource = bmlResource;
+    }
+
+    public String getUsername() {
+        return username;
+    }
+
+    public void setUsername(String username) {
+        this.username = username;
+    }
+}
diff --git a/dss-git/dss-git-common/src/main/java/com.webank.wedatasphere.dss.git.common/protocol/request/GitDeleteRequest.java b/dss-git/dss-git-common/src/main/java/com.webank.wedatasphere.dss.git.common/protocol/request/GitDeleteRequest.java
new file mode 100644
index 000000000..1b42cb895
--- /dev/null
+++ b/dss-git/dss-git-common/src/main/java/com.webank.wedatasphere.dss.git.common/protocol/request/GitDeleteRequest.java
@@ -0,0 +1,42 @@
+package com.webank.wedatasphere.dss.git.common.protocol.request;
+
+
+import java.util.List;
+
+public class GitDeleteRequest extends GitBaseRequest{
+    /**
+     * 提交更新时的comment
+     */
+    private String comment;
+    /**
+     * 需删除的文件列表
+     */
+    private List<String> deleteFileList;
+
+    public GitDeleteRequest() {
+    }
+
+    public GitDeleteRequest(Long workspaceId, String projectName) {
+        super(workspaceId, projectName);
+    }
+
+    public GitDeleteRequest(String comment, List<String> deleteFileList) {
+        this.comment = comment;
+        this.deleteFileList = deleteFileList;
+    }
+
+    public GitDeleteRequest(Long workspaceId, String projectName, String comment, List<String> deleteFileList) {
+        super(workspaceId, projectName);
+        this.comment = comment;
+        this.deleteFileList = deleteFileList;
+    }
+
+    public List<String> getDeleteFileList() {
+        return deleteFileList;
+    }
+
+    public void setDeleteFileList(List<String> deleteFileList) {
+        this.deleteFileList = deleteFileList;
+    }
+
+}
diff --git a/dss-git/dss-git-common/src/main/java/com.webank.wedatasphere.dss.git.common/protocol/request/GitDiffRequest.java b/dss-git/dss-git-common/src/main/java/com.webank.wedatasphere.dss.git.common/protocol/request/GitDiffRequest.java
new file mode 100644
index 000000000..bb85039f1
--- /dev/null
+++ b/dss-git/dss-git-common/src/main/java/com.webank.wedatasphere.dss.git.common/protocol/request/GitDiffRequest.java
@@ -0,0 +1,48 @@
+package com.webank.wedatasphere.dss.git.common.protocol.request;
+
+import com.webank.wedatasphere.dss.common.entity.BmlResource;
+
+import java.util.Map;
+
+
+public class GitDiffRequest extends GitBaseRequest{
+    /**
+     * 待修改的文件（key：文件相对路径，value：文件对应BML）
+     */
+    private Map<String, BmlResource> bmlResourceMap;
+    /**
+     * 下载BMLReource使用的用户名
+     */
+    private String username;
+
+    public GitDiffRequest() {
+    }
+
+    public GitDiffRequest(Map<String, BmlResource> bmlResourceMap, String username) {
+        this.bmlResourceMap = bmlResourceMap;
+        this.username = username;
+    }
+
+    public GitDiffRequest(Long workspaceId, String projectName, Map<String, BmlResource> bmlResourceMap, String username) {
+        super(workspaceId, projectName);
+        this.bmlResourceMap = bmlResourceMap;
+        this.username = username;
+    }
+
+
+    public Map<String, BmlResource> getBmlResourceMap() {
+        return bmlResourceMap;
+    }
+
+    public void setBmlResourceMap(Map<String, BmlResource> bmlResourceMap) {
+        this.bmlResourceMap = bmlResourceMap;
+    }
+
+    public String getUsername() {
+        return username;
+    }
+
+    public void setUsername(String username) {
+        this.username = username;
+    }
+}
diff --git a/dss-git/dss-git-common/src/main/java/com.webank.wedatasphere.dss.git.common/protocol/request/GitFileContentRequest.java b/dss-git/dss-git-common/src/main/java/com.webank.wedatasphere.dss.git.common/protocol/request/GitFileContentRequest.java
new file mode 100644
index 000000000..b5d6e6c8e
--- /dev/null
+++ b/dss-git/dss-git-common/src/main/java/com.webank.wedatasphere.dss.git.common/protocol/request/GitFileContentRequest.java
@@ -0,0 +1,41 @@
+package com.webank.wedatasphere.dss.git.common.protocol.request;
+
+
+public class GitFileContentRequest extends GitBaseRequest{
+    private String commitId;
+    /**
+     * 需获取内容的文件相对路径
+     */
+    private String filePath;
+
+    public GitFileContentRequest() {
+    }
+
+    public GitFileContentRequest(String commitId, String filePath) {
+        this.commitId = commitId;
+        this.filePath = filePath;
+    }
+
+    public GitFileContentRequest(Long workspaceId, String projectName, String commitId, String filePath) {
+        super(workspaceId, projectName);
+        this.commitId = commitId;
+        this.filePath = filePath;
+    }
+
+    public String getCommitId() {
+        return commitId;
+    }
+
+    public void setCommitId(String commitId) {
+        this.commitId = commitId;
+    }
+
+    public String getFilePath() {
+        return filePath;
+    }
+
+    public void setFilePath(String filePath) {
+        this.filePath = filePath;
+    }
+
+}
diff --git a/dss-git/dss-git-common/src/main/java/com.webank.wedatasphere.dss.git.common/protocol/request/GitRemoveRequest.java b/dss-git/dss-git-common/src/main/java/com.webank.wedatasphere.dss.git.common/protocol/request/GitRemoveRequest.java
new file mode 100644
index 000000000..c2aabb529
--- /dev/null
+++ b/dss-git/dss-git-common/src/main/java/com.webank.wedatasphere.dss.git.common/protocol/request/GitRemoveRequest.java
@@ -0,0 +1,20 @@
+package com.webank.wedatasphere.dss.git.common.protocol.request;
+
+import java.util.List;
+
+public class GitRemoveRequest extends GitBaseRequest{
+    private List<String> path;
+
+    public GitRemoveRequest(Long workspaceId, String projectName, List<String> path) {
+        super(workspaceId, projectName);
+        this.path = path;
+    }
+
+    public List<String> getPath() {
+        return path;
+    }
+
+    public void setPath(List<String> path) {
+        this.path = path;
+    }
+}
diff --git a/dss-git/dss-git-common/src/main/java/com.webank.wedatasphere.dss.git.common/protocol/request/GitRevertRequest.java b/dss-git/dss-git-common/src/main/java/com.webank.wedatasphere.dss.git.common/protocol/request/GitRevertRequest.java
new file mode 100644
index 000000000..8602978c2
--- /dev/null
+++ b/dss-git/dss-git-common/src/main/java/com.webank.wedatasphere.dss.git.common/protocol/request/GitRevertRequest.java
@@ -0,0 +1,34 @@
+package com.webank.wedatasphere.dss.git.common.protocol.request;
+
+
+import java.util.List;
+
+public class GitRevertRequest extends GitBaseRequest{
+    private String commitId;
+    private List<String> path;
+
+    public GitRevertRequest(Long workspaceId, String projectName, String commitId, List<String> path) {
+        super(workspaceId, projectName);
+        this.commitId = commitId;
+        this.path = path;
+    }
+
+    public GitRevertRequest() {
+    }
+
+    public String getCommitId() {
+        return commitId;
+    }
+
+    public void setCommitId(String commitId) {
+        this.commitId = commitId;
+    }
+
+    public List<String> getPath() {
+        return path;
+    }
+
+    public void setPath(List<String> path) {
+        this.path = path;
+    }
+}
diff --git a/dss-git/dss-git-common/src/main/java/com.webank.wedatasphere.dss.git.common/protocol/request/GitSearchRequest.java b/dss-git/dss-git-common/src/main/java/com.webank.wedatasphere.dss.git.common/protocol/request/GitSearchRequest.java
new file mode 100644
index 000000000..8292b7bc5
--- /dev/null
+++ b/dss-git/dss-git-common/src/main/java/com.webank.wedatasphere.dss.git.common/protocol/request/GitSearchRequest.java
@@ -0,0 +1,87 @@
+package com.webank.wedatasphere.dss.git.common.protocol.request;
+
+import java.util.List;
+
+public class GitSearchRequest extends GitBaseRequest{
+    /**
+     * 搜索条件：工作流（相对路径）
+     */
+    private List<String> path;
+    /**
+     * 搜索条件：关键字
+     */
+    private String searchContent;
+    /**
+     * 搜索条件：文件名
+     */
+    private String fileName;
+    /**
+     * 搜索条件：节点类型（后缀）
+     */
+    private List<String> type;
+    /**
+     * 分页条件：第一页无需关心，下一页需携带上一页最后一个文件名
+     */
+    private String currentPageLastFile;
+
+    public GitSearchRequest() {
+    }
+
+    public GitSearchRequest(List<String> path, String searchContent, String fileName, List<String> type, String currentPageLastFile) {
+        this.path = path;
+        this.searchContent = searchContent;
+        this.fileName = fileName;
+        this.type = type;
+        this.currentPageLastFile = currentPageLastFile;
+    }
+
+    public GitSearchRequest(Long workspaceId, String projectName, List<String> path, String searchContent, String fileName, List<String> type, String currentPageLastFile) {
+        super(workspaceId, projectName);
+        this.path = path;
+        this.searchContent = searchContent;
+        this.fileName = fileName;
+        this.type = type;
+        this.currentPageLastFile = currentPageLastFile;
+    }
+
+
+    public List<String> getPath() {
+        return path;
+    }
+
+    public void setPath(List<String> path) {
+        this.path = path;
+    }
+
+    public String getSearchContent() {
+        return searchContent;
+    }
+
+    public void setSearchContent(String searchContent) {
+        this.searchContent = searchContent;
+    }
+
+    public String getFileName() {
+        return fileName;
+    }
+
+    public void setFileName(String fileName) {
+        this.fileName = fileName;
+    }
+
+    public List<String> getType() {
+        return type;
+    }
+
+    public void setType(List<String> type) {
+        this.type = type;
+    }
+
+    public String getCurrentPageLastFile() {
+        return currentPageLastFile;
+    }
+
+    public void setCurrentPageLastFile(String currentPageLastFile) {
+        this.currentPageLastFile = currentPageLastFile;
+    }
+}
diff --git a/dss-git/dss-git-common/src/main/java/com.webank.wedatasphere.dss.git.common/protocol/response/GItDiffResponse.java b/dss-git/dss-git-common/src/main/java/com.webank.wedatasphere.dss.git.common/protocol/response/GItDiffResponse.java
new file mode 100644
index 000000000..7495b05cf
--- /dev/null
+++ b/dss-git/dss-git-common/src/main/java/com.webank.wedatasphere.dss.git.common/protocol/response/GItDiffResponse.java
@@ -0,0 +1,23 @@
+package com.webank.wedatasphere.dss.git.common.protocol.response;
+
+
+import com.webank.wedatasphere.dss.git.common.protocol.GitTree;
+
+public class GItDiffResponse{
+    private GitTree tree;
+
+    public GItDiffResponse(GitTree tree) {
+        this.tree = tree;
+    }
+
+    public GItDiffResponse() {
+    }
+
+    public GitTree getTree() {
+        return tree;
+    }
+
+    public void setTree(GitTree tree) {
+        this.tree = tree;
+    }
+}
diff --git a/dss-git/dss-git-common/src/main/java/com.webank.wedatasphere.dss.git.common/protocol/response/GitArchivePorjectResponse.java b/dss-git/dss-git-common/src/main/java/com.webank.wedatasphere.dss.git.common/protocol/response/GitArchivePorjectResponse.java
new file mode 100644
index 000000000..88884222a
--- /dev/null
+++ b/dss-git/dss-git-common/src/main/java/com.webank.wedatasphere.dss.git.common/protocol/response/GitArchivePorjectResponse.java
@@ -0,0 +1,21 @@
+package com.webank.wedatasphere.dss.git.common.protocol.response;
+
+
+public class GitArchivePorjectResponse{
+    private String projectName;
+
+    public GitArchivePorjectResponse(String projectName) {
+        this.projectName = projectName;
+    }
+
+    public GitArchivePorjectResponse() {
+    }
+
+    public String getProjectName() {
+        return projectName;
+    }
+
+    public void setProjectName(String projectName) {
+        this.projectName = projectName;
+    }
+}
diff --git a/dss-git/dss-git-common/src/main/java/com.webank.wedatasphere.dss.git.common/protocol/response/GitBaseResponse.java b/dss-git/dss-git-common/src/main/java/com.webank.wedatasphere.dss.git.common/protocol/response/GitBaseResponse.java
new file mode 100644
index 000000000..9eeaa6169
--- /dev/null
+++ b/dss-git/dss-git-common/src/main/java/com.webank.wedatasphere.dss.git.common/protocol/response/GitBaseResponse.java
@@ -0,0 +1,42 @@
+package com.webank.wedatasphere.dss.git.common.protocol.response;
+
+
+public class GitBaseResponse {
+    private String status;
+    private int index;
+    private String message;
+
+    public GitBaseResponse(String status, int index, String message) {
+        this.status = status;
+        this.index = index;
+        this.message = message;
+    }
+
+    public GitBaseResponse() {
+    }
+
+
+    public String getStatus() {
+        return status;
+    }
+
+    public void setStatus(String status) {
+        this.status = status;
+    }
+
+    public int getIndex() {
+        return index;
+    }
+
+    public void setIndex(int index) {
+        this.index = index;
+    }
+
+    public String getMessage() {
+        return message;
+    }
+
+    public void setMessage(String message) {
+        this.message = message;
+    }
+}
diff --git a/dss-git/dss-git-common/src/main/java/com.webank.wedatasphere.dss.git.common/protocol/response/GitCheckProjectResponse.java b/dss-git/dss-git-common/src/main/java/com.webank.wedatasphere.dss.git.common/protocol/response/GitCheckProjectResponse.java
new file mode 100644
index 000000000..08bc1d792
--- /dev/null
+++ b/dss-git/dss-git-common/src/main/java/com.webank.wedatasphere.dss.git.common/protocol/response/GitCheckProjectResponse.java
@@ -0,0 +1,37 @@
+package com.webank.wedatasphere.dss.git.common.protocol.response;
+
+/**
+ * @author zhaobincai
+ * @date 2024/3/28 15:06
+ */
+public class GitCheckProjectResponse{
+    private String projectName;
+    /**
+     * true为重复
+     */
+    private Boolean repeat;
+
+    public GitCheckProjectResponse(String projectName, Boolean repeat) {
+        this.projectName = projectName;
+        this.repeat = repeat;
+    }
+
+    public GitCheckProjectResponse() {
+    }
+
+    public String getProjectName() {
+        return projectName;
+    }
+
+    public void setProjectName(String projectName) {
+        this.projectName = projectName;
+    }
+
+    public Boolean getRepeat() {
+        return repeat;
+    }
+
+    public void setRepeat(Boolean repeat) {
+        this.repeat = repeat;
+    }
+}
diff --git a/dss-git/dss-git-common/src/main/java/com.webank.wedatasphere.dss.git.common/protocol/response/GitCommitResponse.java b/dss-git/dss-git-common/src/main/java/com.webank.wedatasphere.dss.git.common/protocol/response/GitCommitResponse.java
new file mode 100644
index 000000000..e366dd3a3
--- /dev/null
+++ b/dss-git/dss-git-common/src/main/java/com.webank.wedatasphere.dss.git.common/protocol/response/GitCommitResponse.java
@@ -0,0 +1,54 @@
+package com.webank.wedatasphere.dss.git.common.protocol.response;
+
+/**
+ * @author zhaobincai
+ * @date 2024/3/25 10:15
+ */
+public class GitCommitResponse{
+    private String commitId;
+    private String commitTime;
+    private String commitUser;
+    private String comment;
+
+    public GitCommitResponse(String commitId, String commitTime, String commitUser, String comment) {
+        this.commitId = commitId;
+        this.commitTime = commitTime;
+        this.commitUser = commitUser;
+        this.comment = comment;
+    }
+
+    public GitCommitResponse() {
+    }
+
+    public String getCommitId() {
+        return commitId;
+    }
+
+    public void setCommitId(String commitId) {
+        this.commitId = commitId;
+    }
+
+    public String getCommitTime() {
+        return commitTime;
+    }
+
+    public void setCommitTime(String commitTime) {
+        this.commitTime = commitTime;
+    }
+
+    public String getCommitUser() {
+        return commitUser;
+    }
+
+    public void setCommitUser(String commitUser) {
+        this.commitUser = commitUser;
+    }
+
+    public String getComment() {
+        return comment;
+    }
+
+    public void setComment(String comment) {
+        this.comment = comment;
+    }
+}
diff --git a/dss-git/dss-git-common/src/main/java/com.webank.wedatasphere.dss.git.common/protocol/response/GitCreateProjectResponse.java b/dss-git/dss-git-common/src/main/java/com.webank.wedatasphere.dss.git.common/protocol/response/GitCreateProjectResponse.java
new file mode 100644
index 000000000..e51403b0e
--- /dev/null
+++ b/dss-git/dss-git-common/src/main/java/com.webank.wedatasphere.dss.git.common/protocol/response/GitCreateProjectResponse.java
@@ -0,0 +1,32 @@
+package com.webank.wedatasphere.dss.git.common.protocol.response;
+
+
+public class GitCreateProjectResponse{
+    private String commitId;
+    private String projectName;
+
+    public GitCreateProjectResponse(String commitId, String projectName) {
+        this.commitId = commitId;
+        this.projectName = projectName;
+    }
+
+    public GitCreateProjectResponse() {
+    }
+
+
+    public String getCommitId() {
+        return commitId;
+    }
+
+    public void setCommitId(String commitId) {
+        this.commitId = commitId;
+    }
+
+    public String getProjectName() {
+        return projectName;
+    }
+
+    public void setProjectName(String projectName) {
+        this.projectName = projectName;
+    }
+}
diff --git a/dss-git/dss-git-common/src/main/java/com.webank.wedatasphere.dss.git.common/protocol/response/GitDeleteResponse.java b/dss-git/dss-git-common/src/main/java/com.webank.wedatasphere.dss.git.common/protocol/response/GitDeleteResponse.java
new file mode 100644
index 000000000..3bbeb0a04
--- /dev/null
+++ b/dss-git/dss-git-common/src/main/java/com.webank.wedatasphere.dss.git.common/protocol/response/GitDeleteResponse.java
@@ -0,0 +1,37 @@
+package com.webank.wedatasphere.dss.git.common.protocol.response;
+
+import java.util.List;
+
+/**
+ * @author zhaobincai
+ * @date 2024/3/28 15:06
+ */
+public class GitDeleteResponse {
+    private String projectName;
+
+    private List<String> path;
+
+    public GitDeleteResponse(String projectName, List<String> path) {
+        this.projectName = projectName;
+        this.path = path;
+    }
+
+    public GitDeleteResponse() {
+    }
+
+    public String getProjectName() {
+        return projectName;
+    }
+
+    public void setProjectName(String projectName) {
+        this.projectName = projectName;
+    }
+
+    public List<String> getPath() {
+        return path;
+    }
+
+    public void setPath(List<String> path) {
+        this.path = path;
+    }
+}
diff --git a/dss-git/dss-git-common/src/main/java/com.webank.wedatasphere.dss.git.common/protocol/response/GitFileContentResponse.java b/dss-git/dss-git-common/src/main/java/com.webank.wedatasphere.dss.git.common/protocol/response/GitFileContentResponse.java
new file mode 100644
index 000000000..8afd7fa7f
--- /dev/null
+++ b/dss-git/dss-git-common/src/main/java/com.webank.wedatasphere.dss.git.common/protocol/response/GitFileContentResponse.java
@@ -0,0 +1,23 @@
+package com.webank.wedatasphere.dss.git.common.protocol.response;
+
+
+import com.webank.wedatasphere.dss.common.entity.BmlResource;
+
+public class GitFileContentResponse{
+    private BmlResource bmlResource;
+
+    public GitFileContentResponse(BmlResource bmlResource) {
+        this.bmlResource = bmlResource;
+    }
+
+    public GitFileContentResponse() {
+    }
+
+    public BmlResource getBmlResource() {
+        return bmlResource;
+    }
+
+    public void setBmlResource(BmlResource bmlResource) {
+        this.bmlResource = bmlResource;
+    }
+}
diff --git a/dss-git/dss-git-common/src/main/java/com.webank.wedatasphere.dss.git.common/protocol/response/GitSearchResponse.java b/dss-git/dss-git-common/src/main/java/com.webank.wedatasphere.dss.git.common/protocol/response/GitSearchResponse.java
new file mode 100644
index 000000000..27165fb69
--- /dev/null
+++ b/dss-git/dss-git-common/src/main/java/com.webank.wedatasphere.dss.git.common/protocol/response/GitSearchResponse.java
@@ -0,0 +1,34 @@
+package com.webank.wedatasphere.dss.git.common.protocol.response;
+
+
+import java.util.List;
+import java.util.Map;
+
+public class GitSearchResponse{
+    private Map<String, List<String>> result;
+    private Integer total;
+
+    public GitSearchResponse(Map<String, List<String>> result, Integer total) {
+        this.result = result;
+        this.total = total;
+    }
+
+    public GitSearchResponse() {
+    }
+
+    public Map<String, List<String>> getResult() {
+        return result;
+    }
+
+    public void setResult(Map<String, List<String>> result) {
+        this.result = result;
+    }
+
+    public Integer getTotal() {
+        return total;
+    }
+
+    public void setTotal(Integer total) {
+        this.total = total;
+    }
+}
diff --git a/dss-git/dss-git-server/pom.xml b/dss-git/dss-git-server/pom.xml
new file mode 100644
index 000000000..2e64ff180
--- /dev/null
+++ b/dss-git/dss-git-server/pom.xml
@@ -0,0 +1,125 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>dss-git</artifactId>
+        <groupId>com.webank.wedatasphere.dss</groupId>
+        <version>1.1.0.20-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>dss-git-server</artifactId>
+
+    <dependencies>
+        <dependency>
+            <groupId>com.webank.wedatasphere.dss</groupId>
+            <artifactId>dss-common</artifactId>
+            <version>1.1.0.20-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>com.webank.wedatasphere.dss</groupId>
+            <artifactId>dss-framework-workspace-server</artifactId>
+            <version>${dss.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.webank.wedatasphere.dss</groupId>
+            <artifactId>dss-git-common</artifactId>
+            <version>1.1.0.20-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>org.eclipse.jgit</groupId>
+            <artifactId>org.eclipse.jgit</artifactId>
+            <version>5.13.0.202109080827-r</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.linkis</groupId>
+            <artifactId>linkis-rpc</artifactId>
+            <version>${linkis.version}</version>
+            <scope>provided</scope>
+            <exclusions>
+                <exclusion>
+                    <artifactId>spring-cloud-starter-netflix-eureka-client</artifactId>
+                    <groupId>org.springframework.cloud</groupId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.springframework.boot</groupId>
+                    <artifactId>spring-boot-starter-log4j2</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>com.vaadin.external.google</groupId>
+            <artifactId>android-json</artifactId>
+            <version>0.0.20131108.vaadin1</version>
+            <scope>compile</scope>
+        </dependency>
+    </dependencies>
+
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-deploy-plugin</artifactId>
+            </plugin>
+
+            <plugin>
+                <groupId>net.alchim31.maven</groupId>
+                <artifactId>scala-maven-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <source>8</source>
+                    <target>8</target>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-assembly-plugin</artifactId>
+                <version>2.3</version>
+                <inherited>false</inherited>
+                <executions>
+                    <execution>
+                        <id>make-assembly</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>single</goal>
+                        </goals>
+                        <configuration>
+                            <descriptors>
+                                <descriptor>src/main/assembly/distribution.xml</descriptor>
+                            </descriptors>
+                        </configuration>
+                    </execution>
+                </executions>
+                <configuration>
+                    <skipAssembly>false</skipAssembly>
+                    <finalName>out</finalName>
+                    <appendAssemblyId>false</appendAssemblyId>
+                    <attach>false</attach>
+                    <descriptors>
+                        <descriptor>src/main/assembly/distribution.xml</descriptor>
+                    </descriptors>
+                </configuration>
+            </plugin>
+        </plugins>
+        <resources>
+            <resource>
+                <directory>src/main/java</directory>
+                <includes>
+                    <include>**/*.xml</include>
+                    <include>**/*.properties</include>
+                    <include>**/*.yml</include>
+                </includes>
+            </resource>
+        </resources>
+    </build>
+
+</project>
\ No newline at end of file
diff --git a/dss-git/dss-git-server/src/main/assembly/distribution.xml b/dss-git/dss-git-server/src/main/assembly/distribution.xml
new file mode 100644
index 000000000..9bcd9d08e
--- /dev/null
+++ b/dss-git/dss-git-server/src/main/assembly/distribution.xml
@@ -0,0 +1,46 @@
+<!--
+  ~ /*
+  ~  * Copyright 2019 WeBank
+  ~  *
+  ~  * Licensed under the Apache License, Version 2.0 (the "License");
+  ~  *  you may not use this file except in compliance with the License.
+  ~  * You may obtain a copy of the License at
+  ~  *
+  ~  * http://www.apache.org/licenses/LICENSE-2.0
+  ~  *
+  ~  * 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.
+  ~  */
+  -->
+
+<assembly
+        xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/2.3"
+        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/2.3 http://maven.apache.org/xsd/assembly-1.1.2.xsd">
+    <id>dss-framework-git-server</id>
+    <formats>
+        <format>dir</format>
+    </formats>
+    <includeBaseDirectory>true</includeBaseDirectory>
+    <baseDirectory>dss-framework-git-server</baseDirectory>
+
+    <dependencySets>
+        <dependencySet>
+            <!-- Enable access to all projects in the current multimodule build! <useAllReactorProjects>true</useAllReactorProjects> -->
+            <!-- Now, select which projects to include in this module-set. -->
+            <outputDirectory>lib</outputDirectory>
+            <useProjectArtifact>true</useProjectArtifact>
+            <useTransitiveDependencies>true</useTransitiveDependencies>
+            <unpack>false</unpack>
+            <useStrictFiltering>true</useStrictFiltering>
+            <useTransitiveFiltering>true</useTransitiveFiltering>
+        </dependencySet>
+    </dependencySets>
+
+
+
+</assembly>
+
diff --git a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/config/GitServerConfig.java b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/config/GitServerConfig.java
new file mode 100644
index 000000000..4edfc36d0
--- /dev/null
+++ b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/config/GitServerConfig.java
@@ -0,0 +1,15 @@
+package com.webank.wedatasphere.dss.git.config;
+
+import org.apache.linkis.common.conf.CommonVars;
+
+public class GitServerConfig {
+    public static final CommonVars<String> GIT_SERVER_PATH = CommonVars.apply("wds.dss.git.server.path", "/data/GitInstall");
+
+    public static final CommonVars<String> GIT_RESTFUL_API_CREATE_PROJECTS = CommonVars.apply("wds.dss.git.server.rest.create.project", "api/v4/projects/");
+
+    public static final CommonVars<String> GIT_URL_PRE = CommonVars.apply("wds.dss.git.url", ***REMOVED***
+
+    public static final CommonVars<Integer> GIT_THREAD_NUM = CommonVars.apply("wds.dss.git.thread.num", 23);
+
+    public static final CommonVars<String> GIT_THREAD_NAME = CommonVars.apply("wds.dss.git.thread.name", "gitServer-Thread-");
+}
diff --git a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/DSSGitProjectManagerService.java b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/DSSGitProjectManagerService.java
new file mode 100644
index 000000000..e46133fff
--- /dev/null
+++ b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/DSSGitProjectManagerService.java
@@ -0,0 +1,16 @@
+package com.webank.wedatasphere.dss.git.service;
+
+import com.webank.wedatasphere.dss.common.exception.DSSErrorException;
+import com.webank.wedatasphere.dss.git.common.protocol.request.*;
+import com.webank.wedatasphere.dss.git.common.protocol.response.*;
+
+import java.util.concurrent.ExecutionException;
+
+public interface DSSGitProjectManagerService {
+    GitCreateProjectResponse create(GitCreateProjectRequest request) throws ExecutionException, InterruptedException;
+
+    GitArchivePorjectResponse archive(GitArchiveProjectRequest request) throws ExecutionException, InterruptedException;
+
+    GitCheckProjectResponse checkProject(GitCheckProjectRequest request) throws DSSErrorException;
+
+}
diff --git a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/DSSGitWorkflowManagerService.java b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/DSSGitWorkflowManagerService.java
new file mode 100644
index 000000000..55c5c7b69
--- /dev/null
+++ b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/DSSGitWorkflowManagerService.java
@@ -0,0 +1,19 @@
+package com.webank.wedatasphere.dss.git.service;
+
+
+import com.webank.wedatasphere.dss.git.common.protocol.request.*;
+import com.webank.wedatasphere.dss.git.common.protocol.response.*;
+
+import java.util.concurrent.ExecutionException;
+
+public interface DSSGitWorkflowManagerService {
+    GItDiffResponse diff(GitDiffRequest request) throws ExecutionException, InterruptedException;
+
+    GitCommitResponse commit(GitCommitRequest request) throws ExecutionException, InterruptedException;
+
+    GitSearchResponse search(GitSearchRequest request);
+
+    GitDeleteResponse delete(GitDeleteRequest request) throws ExecutionException, InterruptedException;
+
+    GitFileContentResponse getFileContent(GitFileContentRequest request);
+}
diff --git a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitProjectManagerServiceImpl.java b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitProjectManagerServiceImpl.java
new file mode 100644
index 000000000..86c854115
--- /dev/null
+++ b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitProjectManagerServiceImpl.java
@@ -0,0 +1,91 @@
+package com.webank.wedatasphere.dss.git.service.impl;
+
+import com.webank.wedatasphere.dss.common.exception.DSSErrorException;
+import com.webank.wedatasphere.dss.common.service.BMLService;
+import com.webank.wedatasphere.dss.framework.workspace.bean.GitUserEntity;
+import com.webank.wedatasphere.dss.framework.workspace.service.DSSWorkspaceGitService;
+import com.webank.wedatasphere.dss.git.common.protocol.request.*;
+import com.webank.wedatasphere.dss.git.common.protocol.response.*;
+import com.webank.wedatasphere.dss.git.config.GitServerConfig;
+import com.webank.wedatasphere.dss.git.service.DSSGitProjectManagerService;
+import com.webank.wedatasphere.dss.git.utils.DSSGitUtils;
+import com.webank.wedatasphere.dss.git.utils.FileUtils;
+import org.eclipse.jgit.lib.Repository;
+import org.eclipse.jgit.storage.file.FileRepositoryBuilder;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.stereotype.Service;
+
+import java.io.File;
+
+@Service
+public class DSSGitProjectManagerServiceImpl  implements DSSGitProjectManagerService {
+    private Logger logger = LoggerFactory.getLogger(this.getClass());
+
+    @Autowired
+    private DSSWorkspaceGitService dssWorkspaceGitService;
+
+    @Autowired
+    @Qualifier("projectBmlService")
+    private BMLService bmlService;
+
+    @Override
+    public GitCreateProjectResponse create(GitCreateProjectRequest request) {
+        logger.info("-------=======================beginning to create testGit1=======================-------");
+        GitUserEntity gitUser = dssWorkspaceGitService.selectGit(request.getWorkspaceId());
+        if (gitUser == null) {
+            logger.error("the workspace : {} don't associate with git", request.getWorkspaceId());
+            return null;
+        }
+        try {
+            // Http请求Git，创建project
+            DSSGitUtils.init(request.getProjectName(), gitUser);
+            // 解压BML文件到本地 todo 对接Server时放开调试
+            FileUtils.removeAndUpdate(bmlService, request.getProjectName(), request.getBmlResource(), request.getUsername());
+            // 本地创建Git项目
+            DSSGitUtils.create(request.getProjectName(), gitUser);
+            // 获取git项目
+            File repoDir = new File(GitServerConfig.GIT_SERVER_PATH.getValue() + "/" + request.getProjectName() + "/.git");
+            Repository repository = new FileRepositoryBuilder().setGitDir(repoDir).build();
+            // 关联远端Git
+            DSSGitUtils.remote(repository, request.getProjectName(), gitUser);
+            // 提交
+            DSSGitUtils.push(repository, request.getProjectName(), gitUser, "init project: " + request.getProjectName());
+            return new GitCreateProjectResponse();
+        } catch (Exception e) {
+            logger.error("create project failed, the reason is: ", e);
+//            throw new DSSErrorException(010001, "create project failed");
+        }
+        return null;
+    }
+
+    @Override
+    public GitArchivePorjectResponse archive(GitArchiveProjectRequest request) {
+        GitUserEntity gitUser = dssWorkspaceGitService.selectGit(request.getWorkspaceId());
+        if (gitUser == null) {
+            logger.error("the workspace : {} don't associate with git", request.getWorkspaceId());
+            return null;
+        }
+        // 远程归档
+        DSSGitUtils.archive(request.getProjectName(), gitUser);
+        // 删除本地项目（todo 多节点）
+        DSSGitUtils.archiveLocal(request.getProjectName());
+        return null;
+    }
+
+    @Override
+    public GitCheckProjectResponse checkProject(GitCheckProjectRequest request) throws DSSErrorException {
+        GitUserEntity gitUser = dssWorkspaceGitService.selectGit(request.getWorkspaceId());
+        if (gitUser == null) {
+            logger.error("the workspace : {} don't associate with git", request.getWorkspaceId());
+            return null;
+        }
+        boolean b = DSSGitUtils.checkProjectName(request.getProjectName(), gitUser);
+        logger.info("checkProjectName result is : {}", b);
+        return new GitCheckProjectResponse(request.getProjectName(), b);
+    }
+
+
+}
diff --git a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitWorkflowManagerServiceImpl.java b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitWorkflowManagerServiceImpl.java
new file mode 100644
index 000000000..063849a9f
--- /dev/null
+++ b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitWorkflowManagerServiceImpl.java
@@ -0,0 +1,303 @@
+package com.webank.wedatasphere.dss.git.service.impl;
+
+import com.webank.wedatasphere.dss.common.entity.BmlResource;
+import com.webank.wedatasphere.dss.common.service.BMLService;
+import com.webank.wedatasphere.dss.framework.workspace.bean.GitUserEntity;
+import com.webank.wedatasphere.dss.framework.workspace.service.DSSWorkspaceGitService;
+import com.webank.wedatasphere.dss.git.common.protocol.request.*;
+import com.webank.wedatasphere.dss.git.common.protocol.response.*;
+import com.webank.wedatasphere.dss.git.config.GitServerConfig;
+import com.webank.wedatasphere.dss.git.service.DSSGitWorkflowManagerService;
+import com.webank.wedatasphere.dss.git.utils.DSSGitUtils;
+import com.webank.wedatasphere.dss.git.utils.FileUtils;
+import org.apache.commons.lang.StringUtils;
+import org.eclipse.jgit.lib.Repository;
+import org.eclipse.jgit.storage.file.FileRepositoryBuilder;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.stereotype.Service;
+
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.util.*;
+import java.util.concurrent.TimeUnit;
+
+@Service
+public class DSSGitWorkflowManagerServiceImpl implements DSSGitWorkflowManagerService {
+    private Logger logger = LoggerFactory.getLogger(this.getClass());
+
+    @Autowired
+    private DSSWorkspaceGitService dssWorkspaceGitService;
+
+    @Autowired
+    @Qualifier("workflowBmlService")
+    private BMLService bmlService;
+    @Override
+    public GItDiffResponse diff(GitDiffRequest request) {
+        GitUserEntity gitUser = dssWorkspaceGitService.selectGit(request.getWorkspaceId());
+        if (gitUser == null) {
+            logger.error("the workspace : {} don't associate with git", request.getWorkspaceId());
+            return null;
+        }
+        GItDiffResponse diff = null;
+        Repository repository = null;
+        try {
+            // Path to the Git repository (.git directory or its parent)
+            File repoDir = new File(GitServerConfig.GIT_SERVER_PATH.getValue() + "/" + request.getProjectName() + "/.git");
+            // 当前机器不存在就新建
+            if (repoDir.exists()) {
+                repository = new FileRepositoryBuilder().setGitDir(repoDir).build();
+            } else {
+                repository = FileRepositoryBuilder.create(new File(String.valueOf(repoDir)));
+                DSSGitUtils.remote(repository, request.getProjectName(), gitUser);
+            }
+            // 本地保持最新状态
+            DSSGitUtils.pull(repository, request.getProjectName(), gitUser);
+            // 解压BML文件到本地 todo 对接Server时放开调试
+            Map<String, BmlResource> bmlResourceMap = request.getBmlResourceMap();
+            for (Map.Entry<String, BmlResource> entry : bmlResourceMap.entrySet()) {
+                FileUtils.removeAndUpdate(bmlService, entry.getKey(), entry.getValue(), request.getUsername());
+            }
+            diff = DSSGitUtils.diff(request.getProjectName());
+            // 重置本地
+            DSSGitUtils.reset(request.getProjectName());
+        } catch (Exception e) {
+            logger.error("pull failed, the reason is ",e);
+        }finally {
+            repository.close();
+        }
+        return diff;
+
+    }
+
+    @Override
+    public GitCommitResponse commit(GitCommitRequest request) {
+        GitUserEntity gitUser = dssWorkspaceGitService.selectGit(request.getWorkspaceId());
+        if (gitUser == null) {
+            logger.error("the workspace : {} don't associate with git", request.getWorkspaceId());
+            return null;
+        }
+        Repository repository = null;
+        GitCommitResponse commitResponse = null;
+        try {
+            // Path to the Git repository (.git directory or its parent)
+            File repoDir = new File(GitServerConfig.GIT_SERVER_PATH.getValue() + "/" + request.getProjectName() + "/.git");
+            // 当前机器不存在就新建
+            if (repoDir.exists()) {
+                repository = new FileRepositoryBuilder().setGitDir(repoDir).build();
+            } else {
+                repository = FileRepositoryBuilder.create(new File(String.valueOf(repoDir)));
+                DSSGitUtils.remote(repository, request.getProjectName(), gitUser);
+            }
+            // 本地保持最新状态
+            DSSGitUtils.pull(repository, request.getProjectName(), gitUser);
+            // 解压BML文件到本地 todo 对接Server时放开调试
+            Map<String, BmlResource> bmlResourceMap = request.getBmlResourceMap();
+            for (Map.Entry<String, BmlResource> entry : bmlResourceMap.entrySet()) {
+                FileUtils.removeAndUpdate(bmlService, entry.getKey(), entry.getValue(), request.getUsername());
+            }
+            // 提交
+            DSSGitUtils.push(repository, request.getProjectName(), gitUser, request.getComment());
+
+            commitResponse = DSSGitUtils.getCurrentCommit(repository);
+
+        } catch (Exception e) {
+            logger.error("pull failed, the reason is ",e);
+        } finally {
+            repository.close();
+        }
+        return commitResponse;
+    }
+
+    @Override
+    public GitSearchResponse search(GitSearchRequest request) {
+        String gitDir = GitServerConfig.GIT_SERVER_PATH.getValue() + "/" + request.getProjectName() + "/.git";
+        String workTree = GitServerConfig.GIT_SERVER_PATH.getValue() + "/" + request.getProjectName() ;
+        List<String> gitCommands = new ArrayList<>(Arrays.asList(
+                "git", "--git-dir=" + gitDir, "--work-tree=" + workTree, "grep", "-l", request.getSearchContent()
+        ));
+        logger.info(gitCommands.toString());
+        List<String> fileList = process(gitCommands);
+        List<String> filePathList = new ArrayList<>();
+        for (String file : fileList) {
+            filePathList.add(GitServerConfig.GIT_SERVER_PATH.getValue()+ "/" + request.getProjectName() + "/" + file);
+        }
+
+        List<String> fileCommands = new ArrayList<>(Arrays.asList(
+                "wc", "-l"
+        ));
+
+        fileCommands.addAll(filePathList);
+
+        List<String> process = process(fileCommands);
+        Map<String, Integer> map =new LinkedHashMap<>();
+        for (String content: process) {
+            String[] split = content.trim().split("\\s+");
+            logger.info("content : {}", content);
+            logger.info("split 0 : {}", split[0]);
+            logger.info("split 1 : {}", split[1]);
+            if (split.length == 2) {
+                int line = Integer.parseInt(split[0]);
+                if (line == 0) {
+                    line ++;
+                }
+                String fileName = split[1];
+                if(fileName.equals("total")) {
+                    continue;
+                }
+                map.put(fileName, line);
+            }
+        }
+        List<String> currentFiles = new ArrayList<>();
+         {
+        int total = 0;
+        boolean flag = StringUtils.isEmpty(request.getCurrentPageLastFile());
+        logger.info("flag before: {}", flag);
+        for(Map.Entry<String, Integer> entry: map.entrySet()) {
+            logger.info("entry key : {}", entry.getKey());
+            logger.info("entry value : {}", entry.getValue());
+            logger.info("flag 1111111: {}", flag);
+            if (total + entry.getValue() >= 1000) {
+                break;
+            }
+            if (!StringUtils.isEmpty(request.getCurrentPageLastFile()) && request.getCurrentPageLastFile().equals(entry.getKey())) {
+                flag = true;
+                continue;
+            }
+            if (flag) {
+                total += entry.getValue();
+                currentFiles.add(entry.getKey());
+            }
+        }
+        }
+
+
+        List<String> gitCurrentCommands = new ArrayList<>(Arrays.asList(
+                "git", "--git-dir=" + gitDir, "--work-tree=" + workTree, "grep", "-n", request.getSearchContent()
+        ));
+        gitCurrentCommands.addAll(currentFiles);
+        logger.info(gitCurrentCommands.toString());
+        List<String> fileCurrentList = process(gitCurrentCommands);
+        Map<String, List<String>> result = new LinkedHashMap<>();
+        for (String fileContent : fileCurrentList) {
+            String[] split = fileContent.split(":", 2);
+
+            String fileName = split[0];
+            String fileSearchContent = split[1];
+            if (result.containsKey(fileName)) {
+                result.get(fileName).add(fileSearchContent);
+            }else {
+                List<String> content = new ArrayList<>();
+                content.add(fileSearchContent);
+                result.put(fileName, content);
+            }
+        }
+        return new GitSearchResponse(result, fileList.size());
+    }
+
+    private List<String> process(List<String> commands) {
+        List<String> result = new ArrayList<>();
+        ProcessBuilder processBuilder = new ProcessBuilder(commands);
+        processBuilder.redirectErrorStream(true); // Merge error stream with the standard output stream
+        Process process = null;
+        try {
+            process = processBuilder.start();
+            BufferedReader reader = new BufferedReader(new InputStreamReader(process.getInputStream()));
+            String line;
+            while ((line = reader.readLine()) != null) {
+                logger.info(line);
+                result.add(line);
+            }
+            boolean b = process.waitFor(5, TimeUnit.SECONDS);
+            if (b) {
+                int exitCode = process.waitFor();
+                logger.info("Exit code: " + exitCode);
+
+            }else {
+                logger.info("search timeout");
+                process.destroy();
+            }
+        } catch (IOException | InterruptedException e) {
+            logger.error("grep failed ,the reason is :", e);
+        } finally {
+            process.destroy();
+        }
+        return result;
+    }
+
+    @Override
+    public GitDeleteResponse delete(GitDeleteRequest request) {
+        GitUserEntity gitUser = dssWorkspaceGitService.selectGit(request.getWorkspaceId());
+        if (gitUser == null) {
+            logger.error("the workspace : {} don't associate with git", request.getWorkspaceId());
+            return null;
+        }
+        Repository repository = null;
+        GitDeleteResponse deleteResponse = null;
+        try {
+            // Path to the Git repository (.git directory or its parent)
+            File repoDir = new File(GitServerConfig.GIT_SERVER_PATH.getValue() + "/" + request.getProjectName() + "/.git");
+            // 当前机器不存在就新建
+            if (repoDir.exists()) {
+                repository = new FileRepositoryBuilder().setGitDir(repoDir).build();
+            } else {
+                repository = FileRepositoryBuilder.create(new File(String.valueOf(repoDir)));
+                DSSGitUtils.remote(repository, request.getProjectName(), gitUser);
+            }
+            // 本地保持最新状态
+            DSSGitUtils.pull(repository, request.getProjectName(), gitUser);
+            List<String> deleteFileList = request.getDeleteFileList();
+            for (String path : deleteFileList) {
+                File file = new File(path);
+                if (file.exists()) {
+                    if (file.isDirectory()) {
+                        FileUtils.removeDirectory(path);
+                    } else {
+                        FileUtils.removeFiles(path);
+                    }
+                }
+            }
+            // 提交
+            DSSGitUtils.push(repository, request.getProjectName(), gitUser,"delete " + request.getDeleteFileList());
+        } catch (Exception e) {
+            logger.error("pull failed, the reason is ",e);
+        } finally {
+            repository.close();
+        }
+        return null;
+    }
+
+    @Override
+    public GitFileContentResponse getFileContent(GitFileContentRequest request) {
+        GitUserEntity gitUser = dssWorkspaceGitService.selectGit(request.getWorkspaceId());
+        if (gitUser == null) {
+            logger.error("the workspace : {} don't associate with git", request.getWorkspaceId());
+            return null;
+        }
+        Repository repository = null;
+        GitCommitResponse commitResponse = null;
+        try {
+            // Path to the Git repository (.git directory or its parent)
+            File repoDir = new File(GitServerConfig.GIT_SERVER_PATH.getValue() + "/" + request.getProjectName() + "/.git");
+            // 当前机器不存在就新建
+            if (repoDir.exists()) {
+                repository = new FileRepositoryBuilder().setGitDir(repoDir).build();
+            } else {
+                repository = FileRepositoryBuilder.create(new File(String.valueOf(repoDir)));
+                DSSGitUtils.remote(repository, request.getProjectName(), gitUser);
+            }
+            DSSGitUtils.pull(repository, request.getProjectName(), gitUser);
+
+            DSSGitUtils.getTargetCommitFileContent(request.getProjectName(), request.getCommitId(), request.getFilePath());
+        } catch (Exception e) {
+            logger.error("pull failed, the reason is ",e);
+        } finally {
+            repository.close();
+        }
+       return null;
+    }
+}
diff --git a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/thread/GitServerThreadFactory.java b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/thread/GitServerThreadFactory.java
new file mode 100644
index 000000000..f70702bf3
--- /dev/null
+++ b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/thread/GitServerThreadFactory.java
@@ -0,0 +1,12 @@
+package com.webank.wedatasphere.dss.git.thread;
+
+import com.webank.wedatasphere.dss.git.config.GitServerConfig;
+
+
+public class GitServerThreadFactory {
+    private static GitServerThreadPool gitServerThreadPool = new GitServerThreadPool(GitServerConfig.GIT_THREAD_NUM.getValue());
+
+    public static GitServerThreadPool getGitServerThreadPool() {
+        return gitServerThreadPool;
+    }
+}
diff --git a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/thread/GitServerThreadPool.java b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/thread/GitServerThreadPool.java
new file mode 100644
index 000000000..8f5d0d67e
--- /dev/null
+++ b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/thread/GitServerThreadPool.java
@@ -0,0 +1,38 @@
+package com.webank.wedatasphere.dss.git.thread;
+
+import com.webank.wedatasphere.dss.git.config.GitServerConfig;
+import org.apache.linkis.common.utils.Utils;
+import org.apache.poi.ss.formula.functions.T;
+import org.springframework.stereotype.Component;
+
+import java.util.HashMap;
+import java.util.LinkedList;
+import java.util.Map;
+import java.util.Queue;
+import java.util.concurrent.*;
+
+public class GitServerThreadPool {
+    private final Map<String, ExecutorService> taskExecutors = new HashMap<>();
+    private final int POOL_SIZE;
+
+    public GitServerThreadPool(int num) {
+        this.POOL_SIZE = num;
+        // 初始化每个任务的ExecutorService
+        for (int i = 0; i < POOL_SIZE; i++) {
+            taskExecutors.put("TaskExecutor_" + i, Executors.newSingleThreadExecutor());
+        }
+    }
+
+    public <T> Future<T> submitTask(String taskName, Callable<T> task) {
+        // 根据任务名称选择对应的ExecutorService，这里简化为根据hashCode选取
+        int index = Math.abs(taskName.hashCode()) % POOL_SIZE;
+        ExecutorService executorService = taskExecutors.get("TaskExecutor_" + index);
+        return executorService.submit(task);
+    }
+
+    public void shutdown() {
+        // 关闭所有ExecutorService
+        taskExecutors.values().forEach(ExecutorService::shutdown);
+    }
+
+}
diff --git a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/utils/DSSGitUtils.java b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/utils/DSSGitUtils.java
new file mode 100644
index 000000000..91c061de0
--- /dev/null
+++ b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/utils/DSSGitUtils.java
@@ -0,0 +1,496 @@
+package com.webank.wedatasphere.dss.git.utils;
+
+import com.webank.wedatasphere.dss.common.exception.DSSErrorException;
+import com.webank.wedatasphere.dss.framework.workspace.bean.GitUserEntity;
+import com.webank.wedatasphere.dss.git.common.protocol.GitTree;
+import com.webank.wedatasphere.dss.git.common.protocol.request.GitBaseRequest;
+import com.webank.wedatasphere.dss.git.common.protocol.request.GitRevertRequest;
+import com.webank.wedatasphere.dss.git.common.protocol.response.GItDiffResponse;
+import com.webank.wedatasphere.dss.git.common.protocol.response.GitCommitResponse;
+import com.webank.wedatasphere.dss.git.config.GitServerConfig;
+import org.apache.http.HttpEntity;
+import org.apache.http.client.methods.CloseableHttpResponse;
+import org.apache.http.client.methods.HttpGet;
+import org.apache.http.impl.client.CloseableHttpClient;
+import org.apache.http.impl.client.HttpClients;
+import org.apache.http.util.EntityUtils;
+import org.eclipse.jgit.api.*;
+import org.eclipse.jgit.api.errors.GitAPIException;
+import org.eclipse.jgit.lib.*;
+import org.eclipse.jgit.revwalk.RevCommit;
+import org.eclipse.jgit.revwalk.RevTree;
+import org.eclipse.jgit.revwalk.RevWalk;
+import org.eclipse.jgit.storage.file.FileRepositoryBuilder;
+import org.eclipse.jgit.transport.URIish;
+import org.eclipse.jgit.transport.UsernamePasswordCredentialsProvider;
+import org.eclipse.jgit.treewalk.TreeWalk;
+import org.eclipse.jgit.treewalk.filter.PathFilter;
+import org.json.JSONArray;
+import org.json.JSONObject;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.*;
+import java.net.HttpURLConnection;
+import java.net.URISyntaxException;
+import java.net.URL;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+
+public class DSSGitUtils {
+    private static final Logger logger = LoggerFactory.getLogger(DSSGitUtils.class);
+
+    public static void init(String projectName, GitUserEntity gitUserDO) throws DSSErrorException {
+        if (checkProjectName(projectName, gitUserDO)) {
+            try {
+                URL url = new URL(GitServerConfig.GIT_URL_PRE.getValue() + GitServerConfig.GIT_RESTFUL_API_CREATE_PROJECTS.getValue());
+                HttpURLConnection connection = (HttpURLConnection) url.openConnection();
+                connection.setRequestMethod("POST");
+                connection.setRequestProperty("PRIVATE-TOKEN", gitUserDO.getGitToken());
+                connection.setRequestProperty("Content-Type", "application/json");
+                connection.setDoOutput(true);
+
+                String jsonInputString = String.format("{\"name\": \"%s\", \"description\": \"%s\"}", projectName, projectName);
+
+                try (OutputStream os = connection.getOutputStream()) {
+                    byte[] input = jsonInputString.getBytes("utf-8");
+                    os.write(input, 0, input.length);
+                }
+
+                int responseCode = connection.getResponseCode();
+                logger.info("Response Code : " + responseCode);
+
+                connection.disconnect();
+                logger.info("init success");
+            } catch (Exception e) {
+               logger.error("init failed by ", e);
+            }
+        } else {
+            logger.info("projectName {} already exists", projectName);
+        }
+    }
+
+    public static void remote(Repository repository, String projectName, GitUserEntity gitUser) {
+        File repoDir = new File(GitServerConfig.GIT_SERVER_PATH.getValue() + "/" + projectName +"/.git");
+
+        try {
+            Git git = new Git(repository);
+
+            // 添加远程仓库引用
+            git.remoteAdd()
+                    .setName("origin")
+                    .setUri(new URIish(GitServerConfig.GIT_URL_PRE.getValue() + gitUser.getGitUser() + "/" + projectName +".git"))
+                    .call();
+
+            logger.info("remote success");
+        } catch (GitAPIException | URISyntaxException e) {
+            logger.error("remote failed by : ", e);
+        }
+
+    }
+
+
+    public static void create(String projectName, GitUserEntity gitUserDO) {
+        logger.info("start success");
+        File repoDir = new File(GitServerConfig.GIT_SERVER_PATH.getValue() + "/" + projectName); // 指定仓库的目录
+        File respo = new File(GitServerConfig.GIT_SERVER_PATH.getValue() + "/" +  projectName +"/.git");
+        if (!respo.exists()) {
+            try {
+                // 初始化仓库
+                Git git = Git.init()
+                        .setDirectory(repoDir)
+                        .call();
+
+                logger.info("Initialized empty Git repository in " + git.getRepository().getDirectory());
+
+                git.close(); // 不再需要时关闭Git对象
+            } catch (GitAPIException e) {
+                logger.error("gitCreate failed by : ", e);
+            }
+        }
+    }
+
+    public static void pull(Repository repository, String projectName, GitUserEntity gitUser) {
+        try {
+            // Opening the repository
+            Git git = new Git(repository);
+
+            // Pulling changes from the remote repository
+            PullCommand pullCmd = git.pull().setCredentialsProvider(new UsernamePasswordCredentialsProvider(gitUser.getGitUser(), gitUser.getGitToken()));
+            PullResult result = pullCmd.call();
+
+            // Checking the pull result
+            if(result.isSuccessful()) {
+                logger.info("Pull successful!");
+            } else {
+                logger.info("Pull failed: " + result.toString());
+            }
+
+        } catch (Exception e) {
+            logger.error("pull failed, the reason is ",e);
+        }
+    }
+
+    public static GItDiffResponse diff(String projectName) {
+
+        Set<String> status = status(projectName);
+        GitTree root = new GitTree("");
+        for (String statu : status) {
+            root.addChild(statu);
+        }
+        // 打印树形结构
+        printTree("", root);
+        return new GItDiffResponse(root);
+    }
+
+    // 打印树结构
+    static void printTree(String prefix, GitTree tree) {
+        logger.info(prefix + tree.getName());
+        for (GitTree child : tree.getChildren().values()) {
+            printTree(prefix + "  ", child);
+        }
+    }
+
+
+
+    public static void push(Repository repository, String projectName, GitUserEntity gitUser, String comment) {
+
+        try {
+            Git git = new Git(repository);
+            // 添加新增、更改到暂存区
+            git.add().addFilepattern(".").call(); // 添加所有更改
+            // 添加删除到暂存区
+            git.add().setUpdate(true).addFilepattern(".").call();
+
+            // 创建新的提交
+            git.commit()
+                    .setMessage(comment)
+                    .call();
+
+            logger.info("Changes committed to local repository.");
+
+            // 推送到远程仓库
+            git.push()
+                    .setCredentialsProvider(new UsernamePasswordCredentialsProvider(gitUser.getGitUser(), gitUser.getGitToken()))
+                    .call();
+
+            logger.info("Changes pushed to remote repository.");
+        } catch (GitAPIException e) {
+            logger.error("push failed, the reeason is ", e);
+        }
+    }
+
+
+    public static void reset(String projectName) {
+        String repoPath = GitServerConfig.GIT_SERVER_PATH.getValue() + "/" + projectName +"/.git"; // 仓库路径
+        try (Repository repository = new FileRepositoryBuilder()
+                .setGitDir(new File(repoPath))
+                .build();
+             Git git = new Git(repository)) {
+
+            git.reset().setMode(ResetCommand.ResetType.HARD).call();
+
+            git.clean().setForce(true).setCleanDirectories(true).call();
+
+            logger.info("File has been unstaged: " + projectName);
+        } catch (GitAPIException | IOException e) {
+            logger.error("reset failed, the reason is ", e);
+        }
+    }
+
+    public static void checkoutTargetCommit(GitRevertRequest request) {
+        File repoDir = new File(GitServerConfig.GIT_SERVER_PATH.getValue() + "/" + request.getProjectName()+  "/.git");
+        String commitId = request.getCommitId(); // 替换为目标commit的完整哈希值
+
+        try (Repository repository = new FileRepositoryBuilder().setGitDir(repoDir).build();
+             Git git = new Git(repository)) {
+
+            // 检出（回滚）指定commit的文件版本
+            git.checkout()
+                    .setStartPoint(commitId)
+                    .addPaths(request.getPath())
+                    .call();
+
+            logger.info("File " + repoDir.getAbsolutePath() + " has been rolled back to the version at commit: " + commitId);
+
+        } catch (GitAPIException | IOException e) {
+            e.printStackTrace();
+        }
+    }
+
+    public static boolean checkProjectName(String name, GitUserEntity gitUser) throws DSSErrorException {
+        int retry = 0;
+        List<String> allProjectName = new ArrayList<>();
+        while (retry < 3) {
+            retry += 1;
+            try {
+                allProjectName = getAllProjectName(gitUser);
+                return !allProjectName.contains(name);
+            } catch (DSSErrorException e) {
+                logger.info("getAllProjectName failed, try again");
+                if (retry >= 3) {
+                    logger.error("getAllProjectName failed, the reason is: ", e);
+                    throw new DSSErrorException(01001, "getAllProjectName failed");
+                }
+            }
+        }
+        return !allProjectName.contains(name);
+
+    }
+
+    public static List<String> getAllProjectName(GitUserEntity gitUserDO) throws DSSErrorException {
+        int page = 1;
+        List<String> allProjectNames = new ArrayList<>();
+
+        List<String> projectNames = new ArrayList<>();
+        do {
+        String gitLabUrl = "***REMOVED***/api/v4/projects?per_page=100&page=" + page; // 修改为你的GitLab实例的URL
+        // 创建HttpClient实例
+        try (CloseableHttpClient httpClient = HttpClients.createDefault()) {
+            // 创建HttpGet请求
+            HttpGet request = new HttpGet(gitLabUrl);
+            // 添加认证头部
+            request.addHeader("PRIVATE-TOKEN", gitUserDO.getGitToken());
+
+            // 执行请求
+            try (CloseableHttpResponse response = httpClient.execute(request)) {
+                // 获取响应实体
+                HttpEntity entity = response.getEntity();
+                // 将响应实体转换为字符串
+                String result = EntityUtils.toString(entity);
+                // 解析项目名称
+                projectNames = parseProjectNames(result);
+                // 打印项目名称
+                logger.info("projectNames is: {}", projectNames.toString());
+                // 添加到总项目列表中
+                allProjectNames.addAll(projectNames);
+            } catch (Exception e) {
+                logger.error("getProjectsName failed, the reason is JSON: ", e);
+                throw new DSSErrorException(010001, "json 解析失败");
+            }
+        } catch (IOException e) {
+            logger.info("getProjectsName failed, the reason is: ", e);
+            throw new DSSErrorException(010001, "Internal error，网络请求失败");
+        }
+            page++;
+        } while (projectNames.size() > 0);
+
+        return allProjectNames;
+    }
+
+    public static List<String> parseProjectNames(String json) throws org.json.JSONException {
+        JSONArray projects = new JSONArray(json);
+        List<String> projectNames = new ArrayList<>();
+
+        for (int i = 0; i < projects.length(); i++) {
+            JSONObject project = projects.getJSONObject(i);
+            projectNames.add(project.getString("name"));
+        }
+
+        return projectNames;
+    }
+
+    public static Set<String> status(String projectName) {
+        File repoDir = new File(GitServerConfig.GIT_SERVER_PATH.getValue() + "/" + projectName +"/.git"); // 修改为你的仓库路径
+
+        try (Repository repository = new FileRepositoryBuilder().setGitDir(repoDir).build()) {
+            Git git = new Git(repository);
+            Status status = git.status().call();
+
+            logger.info("Modified files:");
+            logger.info("Modified files: {} , \nUntracked files: {}, \nAdded to index: {}, \nChanged files: {}, \nRemoved files: {}, \nMissing files: {}, \nConflicting files: {} ",
+                    status.getModified().toString(),
+                    status.getUntracked().toString(),
+                    status.getAdded().toString(),
+                    status.getChanged().toString(),
+                    status.getRemoved().toString(),
+                    status.getMissing().toString(),
+                    status.getConflicting().toString()
+                    );
+
+            Set<String> tree = new HashSet<>();
+            tree.addAll(status.getModified());
+            tree.addAll(status.getUntracked());
+            tree.addAll(status.getAdded());
+            tree.addAll(status.getChanged());
+            tree.addAll(status.getRemoved());
+            tree.addAll(status.getMissing());
+            tree.addAll(status.getConflicting());
+
+            return tree;
+        } catch (IOException | org.eclipse.jgit.api.errors.GitAPIException e) {
+            logger.error("get git status Failed, the reason is : ", e);
+            return new HashSet<>();
+        }
+    }
+
+    public static void archive(String projectName, GitUserEntity gitUserDO) {
+        try {
+            String projectUrlEncoded = java.net.URLEncoder.encode(gitUserDO.getGitUser() + "/" + projectName, "UTF-8");
+            URL url = new URL("***REMOVED***/api/v4/projects/" + projectUrlEncoded + "/archive");
+            HttpURLConnection conn = (HttpURLConnection) url.openConnection();
+            conn.setRequestMethod("POST");
+            conn.setRequestProperty("PRIVATE-TOKEN", gitUserDO.getGitToken());
+
+            int responseCode = conn.getResponseCode();
+            logger.info("Response Code: " + responseCode);
+
+            BufferedReader in = new BufferedReader(new InputStreamReader(conn.getInputStream()));
+            String inputLine;
+            StringBuilder response = new StringBuilder();
+
+            while ((inputLine = in.readLine()) != null) {
+                response.append(inputLine);
+            }
+            in.close();
+
+            // 打印结果
+            logger.info(response.toString());
+
+        } catch (Exception e) {
+            logger.error("archive failed by : ", e);
+        }
+    }
+
+    public static void archiveLocal(String projectName) {
+        File repoDir = new File(GitServerConfig.GIT_SERVER_PATH.getValue() + "/" + projectName +  "/.git");
+        if (!repoDir.exists()) {
+            logger.info("file {} not exists", repoDir.getAbsolutePath());
+            return ;
+        }
+        try (Repository repository = new FileRepositoryBuilder().setGitDir(repoDir).build()) {
+            Git git = new Git(repository);
+            // 删除名为"origin"的远程仓库配置
+            git.remoteRemove().setRemoteName("origin").call();
+            // 删除本地文件
+            FileUtils.removeDirectory(GitServerConfig.GIT_SERVER_PATH.getValue() + "/" + projectName);
+            logger.info("Remote 'origin' removed successfully.");
+        } catch (GitAPIException | IOException e) {
+            logger.error("revert remote failed, the reason is: ",e);
+        }
+    }
+
+    public static void updateLocal(GitBaseRequest request, String filePath) {
+        File repoDir = new File(GitServerConfig.GIT_SERVER_PATH.getValue() + "/" + request.getProjectName() + "/.git");
+        Repository repository = null;
+        try {
+            repository = new FileRepositoryBuilder().setGitDir(repoDir).build();
+        } catch (IOException e) {
+            logger.error("get remote repos Failed, the reason is : ", e);
+        }
+        try (Git git = new Git(repository)) {
+//            git.reset().addPath(filePath).call();
+            git.reset().addPath(filePath).setMode(ResetCommand.ResetType.HARD).setRef("origin/master").call();
+            logger.info("File has been unstaged: " + filePath);
+        } catch (GitAPIException e) {
+            logger.error("updateLocal repos Failed, the reason is : ", e);
+        }
+    }
+
+    public static InputStream getTargetCommitFileContent(String projectName, String commitId, String filePath) {
+        String repoPath = GitServerConfig.GIT_SERVER_PATH.getValue() + "/" + projectName +  "/.git";
+
+        try {
+            FileRepositoryBuilder repositoryBuilder = new FileRepositoryBuilder();
+            try (Repository repository = repositoryBuilder.setGitDir(new File(repoPath))
+                    .readEnvironment()
+                    .findGitDir()
+                    .build()) {
+
+                ObjectId lastCommitId = repository.resolve(commitId);
+
+                // Instantiate a RevWalk to walk over commits based on some criteria
+                try (RevWalk revWalk = new RevWalk(repository)) {
+                    RevCommit commit = revWalk.parseCommit(lastCommitId);
+                    RevTree tree = commit.getTree();
+                    logger.info("Having tree: " + tree);
+
+                    // Now use a TreeWalk to iterate over all files in the Tree recursively
+                    // You can set filters to narrow down the results if needed
+                    try (TreeWalk treeWalk = new TreeWalk(repository)) {
+                        treeWalk.addTree(tree);
+                        treeWalk.setRecursive(true);
+                        treeWalk.setFilter(PathFilter.create(filePath));
+                        if (!treeWalk.next()) {
+                            throw new IllegalStateException("Did not find expected file '" + filePath + "'");
+                        }
+
+                        ObjectId objectId = treeWalk.getObjectId(0);
+                        try {
+                            ObjectLoader loader = repository.open(objectId);
+                            byte[] bytes = loader.getBytes();
+                            logger.info("File content: " + new String(bytes));
+                        } catch (Exception e) {
+                            logger.error("getFileContent Failed, the reason is: ", e);
+                        }
+                    }
+
+                    revWalk.dispose();
+                }
+            }
+        } catch (IOException e) {
+            logger.error("getFileContent Failed, the reason is: ", e);
+        }
+        return null;
+    }
+
+    public static void getCommitId(String projectName, int num) {
+        // 获取当前CommitId，
+        File repoDir = new File(GitServerConfig.GIT_SERVER_PATH.getValue()  + "/" + projectName + "/.git");
+
+        try (Repository repository = new FileRepositoryBuilder().setGitDir(repoDir).build();
+             Git git = new Git(repository)) {
+
+            Iterable<RevCommit> commits = git.log().setMaxCount(num).call();
+            SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+
+            for (RevCommit commit : commits) {
+                PersonIdent authorIdent = commit.getAuthorIdent();
+                String commitHash = commit.getName(); // Commit hash
+                String commitTime = sdf.format(authorIdent.getWhen()); // Commit time
+                String commitMessage = commit.getShortMessage(); // Commit message
+                String commitAuthor = authorIdent.getName(); // Commit author
+
+                logger.info("Commit Hash: " + commitHash);
+                logger.info("Commit Time: " + commitTime);
+                logger.info("Commit Message: " + commitMessage);
+                logger.info("Commit Author: " + commitAuthor);
+                logger.info("-----------------------------------");
+            }
+        } catch (IOException | GitAPIException e) {
+            logger.error("get git log failed, the reason is: ", e);
+        }
+    }
+
+    public static GitCommitResponse getCurrentCommit(Repository repository) {
+        GitCommitResponse commitResponse = new GitCommitResponse();
+        try {
+            // 获取HEAD引用
+            Ref head = repository.exactRef("HEAD");
+            SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+            // 使用RevWalk解析当前的提交
+            try (RevWalk walk = new RevWalk(repository)) {
+                RevCommit commit = walk.parseCommit(head.getObjectId());
+                walk.dispose();
+                commitResponse.setCommitId(commit.getId().getName());
+                commitResponse.setCommitTime(sdf.format(commit.getAuthorIdent().getWhen()));
+                commitResponse.setComment(commit.getShortMessage());
+                commitResponse.setCommitUser(commit.getAuthorIdent().getName());
+                return commitResponse; // 返回commitId字符串
+            }
+        } catch (IOException e) {
+            logger.error("get current commit failed, the reason is : ", e);
+            return null;
+        }
+    }
+
+
+
+
+
+
+}
diff --git a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/utils/FileUtils.java b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/utils/FileUtils.java
new file mode 100644
index 000000000..c4fd8b20a
--- /dev/null
+++ b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/utils/FileUtils.java
@@ -0,0 +1,162 @@
+package com.webank.wedatasphere.dss.git.utils;
+
+
+import com.webank.wedatasphere.dss.common.entity.BmlResource;
+import com.webank.wedatasphere.dss.common.exception.DSSErrorException;
+import com.webank.wedatasphere.dss.common.exception.DSSRuntimeException;
+import com.webank.wedatasphere.dss.common.service.BMLService;
+import com.webank.wedatasphere.dss.common.utils.ZipHelper;
+import com.webank.wedatasphere.dss.git.config.GitServerConfig;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.*;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.nio.file.StandardOpenOption;
+import java.util.*;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipFile;
+
+public class FileUtils {
+    private static final Logger logger = LoggerFactory.getLogger(DSSGitUtils.class);
+
+    public static void addFiles(String projectName) {
+
+        String filePath = GitServerConfig.GIT_SERVER_PATH.getValue() + "/" + projectName +"/file1.txt";
+        List<String> lines = Arrays.asList("The first line", "The second line");
+
+        try {
+            removeFiles(filePath);
+
+            // 确保父目录存在
+            Files.createDirectories(Paths.get(filePath).getParent());
+
+            // 向文件写入内容
+            Files.write(Paths.get(filePath), lines, StandardOpenOption.CREATE);
+        } catch (Exception e) {
+            logger.error("add Files Failed, the reason is: ", e);
+        }
+    }
+
+    public static void removeFiles (String filePath) {
+        try {
+            File file = new File(filePath);
+            if (file.exists()) {
+                file.delete();
+            }
+        } catch (Exception e) {
+            logger.error("remove Files Failed, the reason is: ", e);
+        }
+    }
+
+    public static void addDirectory (String directory) {
+        String filePath = GitServerConfig.GIT_SERVER_PATH.getValue() + "/testGit1/file1.txt";
+        List<String> lines = Arrays.asList("The first line", "The second line");
+
+        try {
+            removeFiles(filePath);
+
+            // 确保父目录存在
+            Files.createDirectories(Paths.get(filePath).getParent());
+
+            // 向文件写入内容
+            Files.write(Paths.get(filePath), lines, StandardOpenOption.CREATE);
+        } catch (Exception e) {
+            logger.error("add Files Failed, the reason is: ", e);
+        }
+    }
+
+    public static void removeDirectory (String removeDirectoryPath) {
+        try {
+            Path dirToBeDeleted = Paths.get(removeDirectoryPath);
+            // 使用Files.walk收集所有路径，然后按照逆序排序，确保文件/子文件夹在其父文件夹之前被删除
+            Files.walk(dirToBeDeleted)
+                    .sorted(Comparator.reverseOrder())
+                    .forEach(path -> {
+                        try {
+                            Files.deleteIfExists(path); // 删除每个路径，如果存在的话
+                            logger.info("{} 删除成功", path);
+                        } catch (IOException e) {
+                            logger.info("无法删除路径: "+ path, e);
+                        }
+                    });
+           logger.info("{} Directory and all its content deleted successfully.", removeDirectoryPath);
+        } catch (IOException e) {
+            logger.error("remove Directory Failed, the reason is: ", e);
+        }
+    }
+
+    public static String unzipFile(String zipFile) {
+        logger.info("-------=======================beginning to uznip testGit1=======================-------{}", zipFile);
+
+        String longZipFilePath = "";
+        try {
+            longZipFilePath = ZipHelper.unzip(zipFile);
+            File file = new File(zipFile);
+            logger.info("开始删除目录 {}", zipFile);
+            if (file.delete()){
+                logger.info("结束删除目录 {} 成功", zipFile);
+            }else{
+                logger.info("删除目录 {} 失败", zipFile);
+            }
+        } catch (Exception e) {
+            logger.error("unzip failed, the reason is ");
+        }
+        return longZipFilePath;
+    }
+
+    public static File newFile(File destinationDir, ZipEntry zipEntry) throws IOException {
+        File destFile = new File(destinationDir, zipEntry.getName());
+
+        String destDirPath = destinationDir.getCanonicalPath();
+        String destFilePath = destFile.getCanonicalPath();
+
+        if (!destFilePath.startsWith(destDirPath + File.separator)) {
+            throw new IOException("Entry is outside of the target dir: " + zipEntry.getName());
+        }
+
+        return destFile;
+    }
+
+    public static void removeAndUpdate (BMLService bmlService, String path,  BmlResource bmlResource, String username) {
+        FileUtils.removeDirectory(GitServerConfig.GIT_SERVER_PATH.getValue() + "/" +path);
+        try {
+            downloadAndUnzipBMLResource(bmlService, path, bmlResource, username, GitServerConfig.GIT_SERVER_PATH.getValue());
+        }catch (DSSErrorException e) {
+            logger.error("unzip BML Resource Failed, the reason is : ", e);
+        }
+    }
+
+    private static void downloadAndUnzipBMLResource(BMLService bmlService, String path,BmlResource bmlResource, String userName, String dirPath) throws DSSErrorException {
+        //下载到本地处理
+        String importFile=dirPath + File.separator + path + ".zip";
+        logger.info("import zip file locate at {}",importFile);
+
+        try{
+            //下载压缩包
+            bmlService.downloadToLocalPath(userName, bmlResource.getResourceId(), bmlResource.getVersion(), importFile);
+        }catch (Exception e){
+            logger.error("download failed, the reason is :", e);
+            throw new DSSRuntimeException("upload file format error(导入包格式错误)");
+        }
+        //解压
+        String unzipImportFile= FileUtils.unzipFile(importFile);
+        logger.info("import unziped file locate at {}",unzipImportFile);
+    }
+
+    private static String readImportZipProjectName(String zipFilePath) throws IOException {
+        try(ZipFile zipFile =new ZipFile(zipFilePath)){
+            Enumeration<? extends ZipEntry> entries =zipFile.entries();
+            if(entries.hasMoreElements()){
+                String projectName=entries.nextElement().getName();
+                while (projectName.endsWith(File.separator)){
+                    projectName = projectName.substring(0, projectName.length() - 1);
+                }
+                return projectName;
+            }
+        }
+        throw new IOException();
+    }
+}
diff --git a/dss-git/dss-git-server/src/main/scala/com.webank.wedatasphere.dss.git/receiver/DSSGitChooser.scala b/dss-git/dss-git-server/src/main/scala/com.webank.wedatasphere.dss.git/receiver/DSSGitChooser.scala
new file mode 100644
index 000000000..975581bac
--- /dev/null
+++ b/dss-git/dss-git-server/src/main/scala/com.webank.wedatasphere.dss.git/receiver/DSSGitChooser.scala
@@ -0,0 +1,53 @@
+/*
+ * Copyright 2019 WeBank
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * 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.
+ *
+ */
+
+package com.webank.wedatasphere.dss.git.server.receiver
+
+import com.webank.wedatasphere.dss.git.common.protocol.request.{GitArchiveProjectRequest, GitBaseRequest, GitCheckProjectRequest, GitCommitRequest, GitCreateProjectRequest, GitDeleteRequest, GitDiffRequest, GitFileContentRequest, GitRemoveRequest, GitRevertRequest, GitSearchRequest}
+import com.webank.wedatasphere.dss.git.service.{DSSGitProjectManagerService, DSSGitWorkflowManagerService}
+
+import javax.annotation.PostConstruct
+import org.apache.linkis.rpc.{RPCMessageEvent, Receiver, ReceiverChooser}
+import org.springframework.beans.factory.annotation.Autowired
+import org.springframework.stereotype.Component
+
+
+@Component
+class DSSGitChooser extends ReceiverChooser {
+
+  @Autowired
+  var gitProjectManagerService: DSSGitProjectManagerService = _
+
+  @Autowired
+  var gitWorkflowManagerService: DSSGitWorkflowManagerService = _
+
+  var receiver: Option[DSSGitReceiver] = _
+
+  @PostConstruct
+  def init(): Unit = receiver = Some(new DSSGitReceiver(gitProjectManagerService, gitWorkflowManagerService))
+
+  override def chooseReceiver(event: RPCMessageEvent): Option[Receiver] = event.message match {
+    case _: GitCreateProjectRequest => receiver
+    case _: GitArchiveProjectRequest => receiver
+    case _: GitCheckProjectRequest => receiver
+    case _: GitCommitRequest => receiver
+    case _: GitDiffRequest => receiver
+    case _: GitSearchRequest => receiver
+    case _: GitFileContentRequest => receiver
+    case _: GitDeleteRequest => receiver
+    case _ => None
+  }
+}
\ No newline at end of file
diff --git a/dss-git/dss-git-server/src/main/scala/com.webank.wedatasphere.dss.git/receiver/DSSGitReceiver.scala b/dss-git/dss-git-server/src/main/scala/com.webank.wedatasphere.dss.git/receiver/DSSGitReceiver.scala
new file mode 100644
index 000000000..179370c4b
--- /dev/null
+++ b/dss-git/dss-git-server/src/main/scala/com.webank.wedatasphere.dss.git/receiver/DSSGitReceiver.scala
@@ -0,0 +1,53 @@
+/*
+ * Copyright 2019 WeBank
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * 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.
+ *
+ */
+
+package com.webank.wedatasphere.dss.git.server.receiver
+
+import com.webank.wedatasphere.dss.git.common.protocol.request.{GitArchiveProjectRequest, GitCheckProjectRequest, GitCommitRequest, GitCreateProjectRequest, GitDeleteRequest, GitDiffRequest, GitFileContentRequest, GitRevertRequest, GitSearchRequest}
+import com.webank.wedatasphere.dss.git.service.{DSSGitProjectManagerService, DSSGitWorkflowManagerService}
+import org.apache.linkis.rpc.{Receiver, Sender}
+import org.slf4j.{Logger, LoggerFactory}
+
+import java.util
+import scala.concurrent.duration.Duration
+
+
+class DSSGitReceiver(gitProjectManagerService: DSSGitProjectManagerService, gitWorkflowManagerService: DSSGitWorkflowManagerService) extends Receiver {
+
+  override def receive(message: Any, sender: Sender): Unit = {}
+
+  override def receiveAndReply(message: Any, sender: Sender): Any  = message match {
+    case gitCreateProjectRequest: GitCreateProjectRequest =>
+      gitProjectManagerService.create(gitCreateProjectRequest)
+    case gitArchiveProjectRequest: GitArchiveProjectRequest =>
+      gitProjectManagerService.archive(gitArchiveProjectRequest)
+    case gitCheckProjectRequest: GitCheckProjectRequest =>
+      gitProjectManagerService.checkProject(gitCheckProjectRequest)
+    case gitDiffRequest: GitDiffRequest =>
+      gitWorkflowManagerService.diff(gitDiffRequest)
+    case gitCommitRequest: GitCommitRequest =>
+      gitWorkflowManagerService.commit(gitCommitRequest)
+    case gitSearchRequest: GitSearchRequest =>
+      gitWorkflowManagerService.search(gitSearchRequest)
+    case gitDeleteRequest: GitDeleteRequest =>
+      gitWorkflowManagerService.delete(gitDeleteRequest)
+    case gitFileContentRequest: GitFileContentRequest =>
+      gitWorkflowManagerService.getFileContent(gitFileContentRequest)
+    case _ => None
+  }
+
+  override def receiveAndReply(message: Any, duration: Duration, sender: Sender): Any = {}
+}
diff --git a/dss-git/pom.xml b/dss-git/pom.xml
new file mode 100644
index 000000000..0d4c9cea8
--- /dev/null
+++ b/dss-git/pom.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>dss</artifactId>
+        <groupId>com.webank.wedatasphere.dss</groupId>
+        <version>1.1.0.20-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>dss-git</artifactId>
+    <packaging>pom</packaging>
+    <modules>
+        <module>dss-git-common</module>
+        <module>dss-git-server</module>
+    </modules>
+
+    <properties>
+        <maven.compiler.source>8</maven.compiler.source>
+        <maven.compiler.target>8</maven.compiler.target>
+    </properties>
+
+</project>
\ No newline at end of file

From f49ef80ccf2fbf2eb980673ecf607031268075fe Mon Sep 17 00:00:00 2001
From: zhaobincai <zhaobincai@webank.com>
Date: Tue, 2 Apr 2024 10:11:31 +0800
Subject: [PATCH 007/302] git Module add

---
 dss-git/pom.xml | 5 -----
 pom.xml         | 1 +
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/dss-git/pom.xml b/dss-git/pom.xml
index 0d4c9cea8..6c88adb7c 100644
--- a/dss-git/pom.xml
+++ b/dss-git/pom.xml
@@ -16,9 +16,4 @@
         <module>dss-git-server</module>
     </modules>
 
-    <properties>
-        <maven.compiler.source>8</maven.compiler.source>
-        <maven.compiler.target>8</maven.compiler.target>
-    </properties>
-
 </project>
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index b1372a31f..9697fe15b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -37,6 +37,7 @@
         <module>plugins/linkis/dss-gateway-support</module>
         <module>assembly</module>
         <module>plugins/dolphinscheduler</module>
+        <module>dss-git</module>
     </modules>
 
     <properties>

From 9765d3bb76bcee59b61555c4d44b83f712aa2d00 Mon Sep 17 00:00:00 2001
From: zhaobincai <zhaobincai@webank.com>
Date: Tue, 2 Apr 2024 11:54:42 +0800
Subject: [PATCH 008/302] git workspace add

---
 .../workspace/service/impl/DSSWorkspaceGitServiceImpl.java      | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/dss-framework/dss-framework-workspace-server/src/main/java/com/webank/wedatasphere/dss/framework/workspace/service/impl/DSSWorkspaceGitServiceImpl.java b/dss-framework/dss-framework-workspace-server/src/main/java/com/webank/wedatasphere/dss/framework/workspace/service/impl/DSSWorkspaceGitServiceImpl.java
index 8efc8a1a7..0ce4e3c4d 100644
--- a/dss-framework/dss-framework-workspace-server/src/main/java/com/webank/wedatasphere/dss/framework/workspace/service/impl/DSSWorkspaceGitServiceImpl.java
+++ b/dss-framework/dss-framework-workspace-server/src/main/java/com/webank/wedatasphere/dss/framework/workspace/service/impl/DSSWorkspaceGitServiceImpl.java
@@ -4,7 +4,9 @@
 import com.webank.wedatasphere.dss.framework.workspace.dao.DSSWorkspaceGitMapper;
 import com.webank.wedatasphere.dss.framework.workspace.service.DSSWorkspaceGitService;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
 
+@Service
 public class DSSWorkspaceGitServiceImpl implements DSSWorkspaceGitService {
 
     @Autowired

From 989211658d5633bc0226cf910b342649fe381146 Mon Sep 17 00:00:00 2001
From: zhaobincai <zhaobincai@webank.com>
Date: Tue, 2 Apr 2024 15:57:19 +0800
Subject: [PATCH 009/302] git module move

---
 .../receiver/DSSGitReceiver.scala                            | 3 ++-
 dss-server/pom.xml                                           | 5 +++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/dss-git/dss-git-server/src/main/scala/com.webank.wedatasphere.dss.git/receiver/DSSGitReceiver.scala b/dss-git/dss-git-server/src/main/scala/com.webank.wedatasphere.dss.git/receiver/DSSGitReceiver.scala
index 179370c4b..b5d0dcf38 100644
--- a/dss-git/dss-git-server/src/main/scala/com.webank.wedatasphere.dss.git/receiver/DSSGitReceiver.scala
+++ b/dss-git/dss-git-server/src/main/scala/com.webank.wedatasphere.dss.git/receiver/DSSGitReceiver.scala
@@ -20,11 +20,12 @@ import com.webank.wedatasphere.dss.git.common.protocol.request.{GitArchiveProjec
 import com.webank.wedatasphere.dss.git.service.{DSSGitProjectManagerService, DSSGitWorkflowManagerService}
 import org.apache.linkis.rpc.{Receiver, Sender}
 import org.slf4j.{Logger, LoggerFactory}
+import org.springframework.stereotype.Component
 
 import java.util
 import scala.concurrent.duration.Duration
 
-
+@Component
 class DSSGitReceiver(gitProjectManagerService: DSSGitProjectManagerService, gitWorkflowManagerService: DSSGitWorkflowManagerService) extends Receiver {
 
   override def receive(message: Any, sender: Sender): Unit = {}
diff --git a/dss-server/pom.xml b/dss-server/pom.xml
index ed7e68cf7..3d3171cb7 100644
--- a/dss-server/pom.xml
+++ b/dss-server/pom.xml
@@ -49,6 +49,11 @@
                 </exclusion>
             </exclusions>
         </dependency>
+        <dependency>
+            <groupId>com.webank.wedatasphere.dss</groupId>
+            <artifactId>dss-git-server</artifactId>
+            <version>${dss.version}</version>
+        </dependency>
         <dependency>
             <groupId>com.webank.wedatasphere.dss</groupId>
             <artifactId>dss-framework-project-server</artifactId>

From 34e0c511ea225792abb37c85bb156aee0772fceb Mon Sep 17 00:00:00 2001
From: zhaobincai <zhaobincai@webank.com>
Date: Wed, 3 Apr 2024 17:12:43 +0800
Subject: [PATCH 010/302] dss-server create/update/delete project associate
 with git

---
 .../dss-framework-project-server/pom.xml      |  5 ++
 .../project/entity/DSSProjectDO.java          | 14 +++++
 .../entity/request/ProjectCreateRequest.java  | 14 +++++
 .../entity/request/ProjectModifyRequest.java  | 14 +++++
 .../impl/DSSFrameworkProjectServiceImpl.java  | 60 +++++++++++++++++++
 .../service/impl/DSSProjectServiceImpl.java   | 22 +++++++
 6 files changed, 129 insertions(+)

diff --git a/dss-framework/dss-framework-project-server/pom.xml b/dss-framework/dss-framework-project-server/pom.xml
index d8bd3ed2d..67f3af93b 100644
--- a/dss-framework/dss-framework-project-server/pom.xml
+++ b/dss-framework/dss-framework-project-server/pom.xml
@@ -29,6 +29,11 @@
     <artifactId>dss-framework-project-server</artifactId>
 
     <dependencies>
+        <dependency>
+            <groupId>com.webank.wedatasphere.dss</groupId>
+            <artifactId>dss-git-common</artifactId>
+            <version>${dss.version}</version>
+        </dependency>
         <dependency>
             <groupId>com.webank.wedatasphere.dss</groupId>
             <artifactId>dss-framework-common</artifactId>
diff --git a/dss-framework/dss-framework-project-server/src/main/java/com/webank/wedatasphere/dss/framework/project/entity/DSSProjectDO.java b/dss-framework/dss-framework-project-server/src/main/java/com/webank/wedatasphere/dss/framework/project/entity/DSSProjectDO.java
index 0b900239d..9f1069ae6 100644
--- a/dss-framework/dss-framework-project-server/src/main/java/com/webank/wedatasphere/dss/framework/project/entity/DSSProjectDO.java
+++ b/dss-framework/dss-framework-project-server/src/main/java/com/webank/wedatasphere/dss/framework/project/entity/DSSProjectDO.java
@@ -104,6 +104,11 @@ public class DSSProjectDO implements Serializable {
 
     private Integer visible;
 
+    /**
+     * 1-接入git 0-不接入（默认）
+     */
+    private Boolean associateGit;
+
     public Long getId() {
         return id;
     }
@@ -350,6 +355,15 @@ public String toString() {
                 ", devProcess='" + devProcess + '\'' +
                 ", orchestratorMode='" + orchestratorMode + '\'' +
                 ", visible=" + visible +
+                ", associateGit=" + associateGit +
                 '}';
     }
+
+    public Boolean getAssociateGit() {
+        return associateGit;
+    }
+
+    public void setAssociateGit(Boolean associateGit) {
+        this.associateGit = associateGit;
+    }
 }
diff --git a/dss-framework/dss-framework-project-server/src/main/java/com/webank/wedatasphere/dss/framework/project/entity/request/ProjectCreateRequest.java b/dss-framework/dss-framework-project-server/src/main/java/com/webank/wedatasphere/dss/framework/project/entity/request/ProjectCreateRequest.java
index 87f90a5b5..27492675a 100644
--- a/dss-framework/dss-framework-project-server/src/main/java/com/webank/wedatasphere/dss/framework/project/entity/request/ProjectCreateRequest.java
+++ b/dss-framework/dss-framework-project-server/src/main/java/com/webank/wedatasphere/dss/framework/project/entity/request/ProjectCreateRequest.java
@@ -61,6 +61,11 @@ public class ProjectCreateRequest {
      */
     private List<String> orchestratorModeList;
 
+    /**
+     * 1-接入git 0-不接入（默认）
+     */
+    private Boolean associateGit;
+
 
     public String getName() {
         return name;
@@ -173,6 +178,15 @@ public String toString() {
                 ", workspaceName='" + workspaceName + '\'' +
                 ", devProcessList=" + devProcessList +
                 ", orchestratorModeList=" + orchestratorModeList +
+                ", associateGit=" + associateGit +
                 '}';
     }
+
+    public Boolean getAssociateGit() {
+        return associateGit;
+    }
+
+    public void setAssociateGit(Boolean associateGit) {
+        this.associateGit = associateGit;
+    }
 }
diff --git a/dss-framework/dss-framework-project-server/src/main/java/com/webank/wedatasphere/dss/framework/project/entity/request/ProjectModifyRequest.java b/dss-framework/dss-framework-project-server/src/main/java/com/webank/wedatasphere/dss/framework/project/entity/request/ProjectModifyRequest.java
index 78b28ab61..c0b2994aa 100644
--- a/dss-framework/dss-framework-project-server/src/main/java/com/webank/wedatasphere/dss/framework/project/entity/request/ProjectModifyRequest.java
+++ b/dss-framework/dss-framework-project-server/src/main/java/com/webank/wedatasphere/dss/framework/project/entity/request/ProjectModifyRequest.java
@@ -78,6 +78,11 @@ public void setWorkspaceName(String workspaceName) {
      */
     private List<String> orchestratorModeList;
 
+    /**
+     * 1-接入git 0-不接入（默认）
+     */
+    private Boolean associateGit;
+
     public String getName() {
         return name;
     }
@@ -189,6 +194,15 @@ public String toString() {
                 ", workspaceId=" + workspaceId +
                 ", devProcessList=" + devProcessList +
                 ", orchestratorModeList=" + orchestratorModeList +
+                ", associateGit=" + associateGit +
                 '}';
     }
+
+    public Boolean getAssociateGit() {
+        return associateGit;
+    }
+
+    public void setAssociateGit(Boolean associateGit) {
+        this.associateGit = associateGit;
+    }
 }
diff --git a/dss-framework/dss-framework-project-server/src/main/java/com/webank/wedatasphere/dss/framework/project/service/impl/DSSFrameworkProjectServiceImpl.java b/dss-framework/dss-framework-project-server/src/main/java/com/webank/wedatasphere/dss/framework/project/service/impl/DSSFrameworkProjectServiceImpl.java
index d9b0ab3b1..9d93f8bc6 100644
--- a/dss-framework/dss-framework-project-server/src/main/java/com/webank/wedatasphere/dss/framework/project/service/impl/DSSFrameworkProjectServiceImpl.java
+++ b/dss-framework/dss-framework-project-server/src/main/java/com/webank/wedatasphere/dss/framework/project/service/impl/DSSFrameworkProjectServiceImpl.java
@@ -18,13 +18,16 @@
 
 import com.webank.wedatasphere.dss.appconn.core.AppConn;
 import com.webank.wedatasphere.dss.appconn.core.ext.OnlyStructureAppConn;
+import com.webank.wedatasphere.dss.common.entity.BmlResource;
 import com.webank.wedatasphere.dss.common.entity.project.DSSProject;
 import com.webank.wedatasphere.dss.common.utils.DSSExceptionUtils;
+import com.webank.wedatasphere.dss.common.utils.RpcAskUtils;
 import com.webank.wedatasphere.dss.framework.project.conf.ProjectConf;
 import com.webank.wedatasphere.dss.framework.project.contant.ProjectServerResponse;
 import com.webank.wedatasphere.dss.framework.project.entity.DSSProjectDO;
 import com.webank.wedatasphere.dss.framework.project.entity.DSSProjectUser;
 import com.webank.wedatasphere.dss.framework.project.entity.request.ProjectCreateRequest;
+import com.webank.wedatasphere.dss.framework.project.entity.request.ProjectDeleteRequest;
 import com.webank.wedatasphere.dss.framework.project.entity.request.ProjectModifyRequest;
 import com.webank.wedatasphere.dss.framework.project.entity.vo.DSSProjectDetailVo;
 import com.webank.wedatasphere.dss.framework.project.entity.vo.DSSProjectVo;
@@ -32,6 +35,13 @@
 import com.webank.wedatasphere.dss.framework.project.service.DSSFrameworkProjectService;
 import com.webank.wedatasphere.dss.framework.project.service.DSSProjectService;
 import com.webank.wedatasphere.dss.framework.project.service.DSSProjectUserService;
+import com.webank.wedatasphere.dss.git.common.protocol.request.GitArchiveProjectRequest;
+import com.webank.wedatasphere.dss.git.common.protocol.request.GitCheckProjectRequest;
+import com.webank.wedatasphere.dss.git.common.protocol.request.GitCreateProjectRequest;
+import com.webank.wedatasphere.dss.git.common.protocol.response.GitArchivePorjectResponse;
+import com.webank.wedatasphere.dss.git.common.protocol.response.GitCheckProjectResponse;
+import com.webank.wedatasphere.dss.git.common.protocol.response.GitCreateProjectResponse;
+import com.webank.wedatasphere.dss.sender.service.DSSSenderServiceFactory;
 import com.webank.wedatasphere.dss.standard.app.sso.Workspace;
 import com.webank.wedatasphere.dss.standard.app.structure.project.*;
 import com.webank.wedatasphere.dss.standard.app.structure.project.ref.DSSProjectContentRequestRef;
@@ -47,6 +57,7 @@
 import org.apache.linkis.common.conf.CommonVars;
 import org.apache.linkis.common.exception.WarnException;
 import org.apache.linkis.protocol.util.ImmutablePair;
+import org.apache.linkis.rpc.Sender;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.BeanUtils;
@@ -98,6 +109,10 @@ public DSSProjectVo createProject(ProjectCreateRequest projectCreateRequest, Str
         }
 
         this.checkProjectName(projectCreateRequest.getName(), workspace, username);
+        // 对于接入git的项目校验项目名称
+        if(projectCreateRequest.getAssociateGit() != null && projectCreateRequest.getAssociateGit()) {
+            checkGitName(projectCreateRequest.getName(), workspace, username);
+        }
 
         Map<AppInstance, Long> projectMap = createAppConnProject(projectCreateRequest, workspace, username);
         //3.保存dss_project
@@ -153,6 +168,11 @@ public void modifyProject(ProjectModifyRequest projectModifyRequest, DSSProjectD
         if (!dbProject.getName().equalsIgnoreCase(projectModifyRequest.getName())) {
             DSSExceptionUtils.dealErrorException(ProjectServerResponse.PROJECT_NOT_EDIT_NAME.getCode(), ProjectServerResponse.PROJECT_NOT_EDIT_NAME.getMsg(), DSSProjectErrorException.class);
         }
+        // 校验接入git
+        if (dbProject.getAssociateGit() != null) {
+            checkAssociateGit(projectModifyRequest, dbProject, username, workspace);
+        }
+
         //调用第三方的工程修改接口
         dbProject.setUsername(username);
         dbProject.setApplicationArea(Integer.valueOf(projectModifyRequest.getApplicationArea()));
@@ -298,4 +318,44 @@ private Map<AppInstance, Long> createAppConnProject(ProjectCreateRequest dssProj
         return projectMap;
     }
 
+    private void checkGitName(String name, Workspace workspace, String username) throws DSSProjectErrorException {
+        Sender gitSender = DSSSenderServiceFactory.getOrCreateServiceInstance().getGitSender();
+        GitCheckProjectRequest request1 = new GitCheckProjectRequest(workspace.getWorkspaceId(), name, username);
+        LOGGER.info("-------=======================begin to check project: {}=======================-------", name);
+        Object ask = gitSender.ask(request1);
+        GitCheckProjectResponse responseWorkflowValidNode = RpcAskUtils.processAskException(ask, GitCheckProjectResponse.class, GitCheckProjectRequest.class);
+        LOGGER.info("-------=======================End to check project: {}=======================-------: {}", name, responseWorkflowValidNode);
+        if (responseWorkflowValidNode == null) {
+            throw new DSSProjectErrorException(71000, "向Git发起检查工程名是否重复失败，请稍后重试 ");
+        } else if (responseWorkflowValidNode.getRepeat()) {
+            throw new DSSProjectErrorException(71000,  "git 已存在相同项目名称，请重新命名!");
+        }
+    }
+
+    private void initGitProject(Long workspaceId, String projectName, String resource, String version, String username) {
+        Sender gitSender = DSSSenderServiceFactory.getOrCreateServiceInstance().getGitSender();
+        Map<String, BmlResource> file = new HashMap<>();
+        // 测试数据 key表示项目名、value为项目BmlResource资源
+        GitCreateProjectRequest request1 = new GitCreateProjectRequest(workspaceId, projectName, new BmlResource(resource, version), username);
+        LOGGER.info("-------=======================begin to create project: {}=======================-------", projectName);
+        Object ask = gitSender.ask(request1);
+        GitCreateProjectResponse responseWorkflowValidNode = RpcAskUtils.processAskException(ask, GitCreateProjectResponse.class, GitCreateProjectRequest.class);
+        LOGGER.info("-------=======================End to create project: {}=======================-------: {}", projectName, responseWorkflowValidNode);
+    }
+
+    private void checkAssociateGit(ProjectModifyRequest projectModifyRequest, DSSProjectDO dbProject, String username, Workspace workspace) throws DSSProjectErrorException {
+        // 对于已经接入git的项目不允许进行取消
+        if (dbProject.getAssociateGit() && !projectModifyRequest.getAssociateGit()) {
+            throw new DSSProjectErrorException(71000, "项目接入git后无法取消");
+        }
+        // 对于首次接入git的项目需要校验项目名称并且进行git初始化
+        if (!dbProject.getAssociateGit() && projectModifyRequest.getAssociateGit() && projectModifyRequest.getAssociateGit()!= null && projectModifyRequest.getAssociateGit()) {
+            checkGitName(projectModifyRequest.getName(), workspace, username);
+            // todo resource version Info
+            // initGitProject(workspace.getWorkspaceId(), projectCreateRequest.getName(),);
+        }
+    }
+
+
+
 }
diff --git a/dss-framework/dss-framework-project-server/src/main/java/com/webank/wedatasphere/dss/framework/project/service/impl/DSSProjectServiceImpl.java b/dss-framework/dss-framework-project-server/src/main/java/com/webank/wedatasphere/dss/framework/project/service/impl/DSSProjectServiceImpl.java
index 804712fb8..057570d65 100644
--- a/dss-framework/dss-framework-project-server/src/main/java/com/webank/wedatasphere/dss/framework/project/service/impl/DSSProjectServiceImpl.java
+++ b/dss-framework/dss-framework-project-server/src/main/java/com/webank/wedatasphere/dss/framework/project/service/impl/DSSProjectServiceImpl.java
@@ -21,9 +21,11 @@
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.webank.wedatasphere.dss.appconn.core.AppConn;
 import com.webank.wedatasphere.dss.appconn.manager.AppConnManager;
+import com.webank.wedatasphere.dss.common.entity.BmlResource;
 import com.webank.wedatasphere.dss.common.exception.DSSErrorException;
 import com.webank.wedatasphere.dss.common.label.DSSLabel;
 import com.webank.wedatasphere.dss.common.utils.DSSExceptionUtils;
+import com.webank.wedatasphere.dss.common.utils.RpcAskUtils;
 import com.webank.wedatasphere.dss.framework.project.conf.ProjectConf;
 import com.webank.wedatasphere.dss.framework.project.contant.ProjectServerResponse;
 import com.webank.wedatasphere.dss.common.constant.project.ProjectUserPrivEnum;
@@ -42,6 +44,10 @@
 import com.webank.wedatasphere.dss.framework.project.service.DSSProjectService;
 import com.webank.wedatasphere.dss.framework.project.service.DSSProjectUserService;
 import com.webank.wedatasphere.dss.framework.project.utils.ProjectStringUtils;
+import com.webank.wedatasphere.dss.git.common.protocol.request.GitArchiveProjectRequest;
+import com.webank.wedatasphere.dss.git.common.protocol.request.GitCreateProjectRequest;
+import com.webank.wedatasphere.dss.git.common.protocol.response.GitArchivePorjectResponse;
+import com.webank.wedatasphere.dss.sender.service.DSSSenderServiceFactory;
 import com.webank.wedatasphere.dss.standard.app.sso.Workspace;
 import com.webank.wedatasphere.dss.standard.app.structure.project.ProjectDeletionOperation;
 import com.webank.wedatasphere.dss.standard.app.structure.project.ProjectService;
@@ -49,6 +55,7 @@
 import com.webank.wedatasphere.dss.standard.common.desc.AppInstance;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang.StringUtils;
+import org.apache.linkis.rpc.Sender;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -275,6 +282,8 @@ public void deleteProject(String username, ProjectDeleteRequest projectDeleteReq
         if(!dssProjectDO.getUsername().equalsIgnoreCase(username)){
             throw new DSSErrorException(600002, "刪除工程失敗，沒有删除权限!" );
         }
+        // 对于DSS项目进行归档
+        archiveGitProject(username, projectDeleteRequest, workspace, dssProjectDO);
         if(projectDeleteRequest.isIfDelOtherSys()) {
             LOGGER.warn("User {} requires to delete all projects with name {} in third-party AppConns.", username, dssProjectDO.getName());
             Map<AppInstance, Long> appInstanceToRefProjectId = new HashMap<>(10);
@@ -299,6 +308,19 @@ public void deleteProject(String username, ProjectDeleteRequest projectDeleteReq
         LOGGER.warn("User {} deleted project {}.", username, dssProjectDO.getName());
     }
 
+    private void archiveGitProject(String username, ProjectDeleteRequest projectDeleteRequest, Workspace workspace, DSSProjectDO dssProjectDO) {
+        if (dssProjectDO.getAssociateGit()) {
+            Sender gitSender = DSSSenderServiceFactory.getOrCreateServiceInstance().getGitSender();
+            Map<String, BmlResource> file = new HashMap<>();
+            // 测试数据 key表示项目名、value为项目BmlResource资源
+            GitArchiveProjectRequest request1 = new GitArchiveProjectRequest(workspace.getWorkspaceId(), dssProjectDO.getName(), username);
+            LOGGER.info("-------=======================begin to archive project: {}=======================-------", dssProjectDO.getName());
+            Object ask = gitSender.ask(request1);
+            GitArchivePorjectResponse responseWorkflowValidNode = RpcAskUtils.processAskException(ask, GitArchivePorjectResponse.class, GitCreateProjectRequest.class);
+            LOGGER.info("-------=======================End to archive project: {}=======================-------: {}", dssProjectDO.getName(), responseWorkflowValidNode);
+        }
+    }
+
     @Override
     public List<String> getProjectAbilities(String username) {
         LOGGER.info("{} begins to get project ability", username);

From 0a1180ffbd2abdfefaa7e43df1b9508a95c33c8f Mon Sep 17 00:00:00 2001
From: xlinliu <arionliu@webank.com>
Date: Sun, 7 Apr 2024 17:03:31 +0800
Subject: [PATCH 011/302] ignore appconn engine reuseEngine param

---
 .../node/execution/service/impl/BuildJobActionImpl.java  | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/dss-orchestrator/orchestrators/dss-workflow/dss-linkis-node-execution/src/main/java/com/webank/wedatasphere/dss/linkis/node/execution/service/impl/BuildJobActionImpl.java b/dss-orchestrator/orchestrators/dss-workflow/dss-linkis-node-execution/src/main/java/com/webank/wedatasphere/dss/linkis/node/execution/service/impl/BuildJobActionImpl.java
index bb6845acb..aad9156b5 100644
--- a/dss-orchestrator/orchestrators/dss-workflow/dss-linkis-node-execution/src/main/java/com/webank/wedatasphere/dss/linkis/node/execution/service/impl/BuildJobActionImpl.java
+++ b/dss-orchestrator/orchestrators/dss-workflow/dss-linkis-node-execution/src/main/java/com/webank/wedatasphere/dss/linkis/node/execution/service/impl/BuildJobActionImpl.java
@@ -140,7 +140,7 @@ public JobSubmitAction getSubmitAction(Job job) throws LinkisJobExecutionErrorEx
 
 
         //是否复用引擎，不复用就为空
-        if(!isReuseEngine(job.getParams())){
+        if(!isAppconnJob(job) && !isReuseEngine(job.getParams())){
             labels.put("executeOnce", "");
         }
         Map<String, Object> paramMapCopy = (HashMap<String, Object>) SerializationUtils.clone(new HashMap<String, Object>(job.getParams()));
@@ -190,6 +190,13 @@ public boolean isReuseEngine(Map<String, Object> params) {
         return true;
     }
 
+    /**
+     * 是否为appconnjob
+     */
+    private boolean isAppconnJob(Job job){
+        return APPCONN.equals(job.getEngineType());
+    }
+
     /**
      * spark自定义参数配置输入，例如spark.sql.shuffle.partitions=10。多个参数使用分号分隔。
      *

From dec94df492d387bae6b50f11d007272bb9bce97b Mon Sep 17 00:00:00 2001
From: SunpengWan <825559776@qq.com>
Date: Tue, 9 Apr 2024 11:33:26 +0800
Subject: [PATCH 012/302] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=A8=A1=E6=9D=BF?=
 =?UTF-8?q?=E8=A6=86=E7=9B=96=E5=8F=82=E6=95=B0map.limit=E5=92=8Creduce.li?=
 =?UTF-8?q?mit?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../linkis/node/execution/service/impl/BuildJobActionImpl.java  | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/dss-orchestrator/orchestrators/dss-workflow/dss-linkis-node-execution/src/main/java/com/webank/wedatasphere/dss/linkis/node/execution/service/impl/BuildJobActionImpl.java b/dss-orchestrator/orchestrators/dss-workflow/dss-linkis-node-execution/src/main/java/com/webank/wedatasphere/dss/linkis/node/execution/service/impl/BuildJobActionImpl.java
index bb6845acb..e4a4253cf 100644
--- a/dss-orchestrator/orchestrators/dss-workflow/dss-linkis-node-execution/src/main/java/com/webank/wedatasphere/dss/linkis/node/execution/service/impl/BuildJobActionImpl.java
+++ b/dss-orchestrator/orchestrators/dss-workflow/dss-linkis-node-execution/src/main/java/com/webank/wedatasphere/dss/linkis/node/execution/service/impl/BuildJobActionImpl.java
@@ -210,6 +210,8 @@ private void replaceSparkConfParams(Map<String, Object> paramMapCopy) throws Lin
             startupMap.remove("spark.executor.cores");
             startupMap.remove("spark.executor.instances");
             startupMap.remove("wds.linkis.engineconn.java.driver.memory");
+            startupMap.remove("mapreduce.job.running.map.limit");
+            startupMap.remove("mapreduce.job.running.reduce.limit");
             startupMap.remove("spark.conf");
             logger.info("after remove startup map:{}",startupMap.keySet());
         }

From 9ec1b096a977c492a824efd77cbd1b752e68d601 Mon Sep 17 00:00:00 2001
From: zhaobincai <zhaobincai@webank.com>
Date: Tue, 9 Apr 2024 11:50:31 +0800
Subject: [PATCH 013/302] pom change SNAPSHOT to gitflow

---
 assembly/dss-package/pom.xml                                | 2 +-
 assembly/pom.xml                                            | 2 +-
 dss-appconn/appconns/dss-datachecker-appconn/pom.xml        | 4 ++--
 dss-appconn/appconns/dss-dolphinscheduler-appconn/pom.xml   | 2 +-
 dss-appconn/appconns/dss-eventchecker-appconn/pom.xml       | 2 +-
 dss-appconn/appconns/dss-schedulis-appconn/pom.xml          | 2 +-
 dss-appconn/appconns/dss-scriptis-appconn/pom.xml           | 2 +-
 dss-appconn/appconns/dss-sendemail-appconn/pom.xml          | 2 +-
 .../dss-sendemail-appconn/sendemail-appconn-core/pom.xml    | 2 +-
 dss-appconn/appconns/dss-sso-appconn/pom.xml                | 2 +-
 dss-appconn/appconns/dss-workflow-appconn/pom.xml           | 2 +-
 dss-appconn/dss-appconn-core/pom.xml                        | 2 +-
 dss-appconn/dss-appconn-loader/pom.xml                      | 2 +-
 .../dss-appconn-manager/dss-appconn-manager-client/pom.xml  | 2 +-
 .../dss-appconn-manager/dss-appconn-manager-core/pom.xml    | 2 +-
 dss-appconn/dss-appconn-manager/pom.xml                     | 2 +-
 dss-appconn/dss-scheduler-appconn/pom.xml                   | 2 +-
 dss-appconn/linkis-appconn-engineplugin/pom.xml             | 2 +-
 dss-appconn/pom.xml                                         | 2 +-
 dss-apps/dss-apiservice-server/pom.xml                      | 2 +-
 dss-apps/dss-apps-server/pom.xml                            | 2 +-
 dss-apps/dss-data-api/dss-api-sql-template/pom.xml          | 2 +-
 dss-apps/dss-data-api/dss-data-api-server/pom.xml           | 2 +-
 dss-apps/dss-data-api/pom.xml                               | 2 +-
 dss-apps/dss-data-governance/dss-data-asset-server/pom.xml  | 2 +-
 .../dss-data-classification-server/pom.xml                  | 2 +-
 .../dss-data-governance/dss-data-governance-common/pom.xml  | 2 +-
 .../dss-data-governance/dss-data-governance-server/pom.xml  | 2 +-
 dss-apps/dss-data-governance/pom.xml                        | 2 +-
 dss-apps/dss-scriptis-server/pom.xml                        | 2 +-
 dss-apps/dss-user-guide/dss-user-guide-server/pom.xml       | 2 +-
 dss-apps/dss-user-guide/pom.xml                             | 2 +-
 dss-apps/pom.xml                                            | 2 +-
 dss-commons/dss-common/pom.xml                              | 2 +-
 dss-commons/dss-contextservice/pom.xml                      | 2 +-
 dss-commons/dss-sender-service/pom.xml                      | 2 +-
 dss-commons/pom.xml                                         | 2 +-
 dss-framework/dss-appconn-framework/pom.xml                 | 2 +-
 dss-framework/dss-framework-admin-service/pom.xml           | 2 +-
 dss-framework/dss-framework-common/pom.xml                  | 2 +-
 dss-framework/dss-framework-orchestrator-server/pom.xml     | 2 +-
 dss-framework/dss-framework-project-server/pom.xml          | 2 +-
 dss-framework/dss-framework-proxy-user-service/pom.xml      | 2 +-
 dss-framework/dss-framework-workspace-server/pom.xml        | 2 +-
 .../framework-plugins/dss-framework-migrate-server/pom.xml  | 2 +-
 .../dss-framework-orchestrator-publish/pom.xml              | 2 +-
 dss-framework/pom.xml                                       | 2 +-
 dss-git/dss-git-common/pom.xml                              | 2 +-
 dss-git/dss-git-server/pom.xml                              | 6 +++---
 dss-git/pom.xml                                             | 2 +-
 dss-orchestrator/dss-orchestrator-common/pom.xml            | 2 +-
 .../dss-orchestrator-conversion-standard/pom.xml            | 2 +-
 dss-orchestrator/dss-orchestrator-core/pom.xml              | 2 +-
 dss-orchestrator/dss-orchestrator-db/pom.xml                | 2 +-
 dss-orchestrator/dss-orchestrator-loader/pom.xml            | 2 +-
 .../dss-workflow/dss-flow-execution-server/pom.xml          | 2 +-
 .../dss-workflow/dss-linkis-node-execution/pom.xml          | 2 +-
 .../orchestrators/dss-workflow/dss-workflow-common/pom.xml  | 2 +-
 .../dss-workflow/dss-workflow-conversion-standard/pom.xml   | 2 +-
 .../orchestrators/dss-workflow/dss-workflow-sdk/pom.xml     | 2 +-
 .../orchestrators/dss-workflow/dss-workflow-server/pom.xml  | 2 +-
 dss-orchestrator/orchestrators/dss-workflow/pom.xml         | 2 +-
 dss-orchestrator/pom.xml                                    | 2 +-
 dss-server/pom.xml                                          | 2 +-
 .../development-process-standard-execution/pom.xml          | 2 +-
 .../development-process-standard/pom.xml                    | 2 +-
 dss-standard/dss-standard-common/pom.xml                    | 2 +-
 dss-standard/pom.xml                                        | 2 +-
 .../sso-standard/origin-sso-integration-standard/pom.xml    | 2 +-
 .../spring-origin-sso-integration-plugin/pom.xml            | 2 +-
 dss-standard/sso-standard/sso-integration-standard/pom.xml  | 2 +-
 dss-standard/structure-standard/dss-project-plugin/pom.xml  | 2 +-
 dss-standard/structure-standard/dss-role-plugin/pom.xml     | 2 +-
 .../dss-structure-integration-standard/pom.xml              | 2 +-
 .../spring-origin-dss-project-plugin/pom.xml                | 2 +-
 plugins/azkaban/linkis-jobtype/pom.xml                      | 2 +-
 .../dolphinscheduler/dolphinscheduler-prod-metrics/pom.xml  | 2 +-
 .../dolphinscheduler/dss-dolphinscheduler-client/pom.xml    | 2 +-
 plugins/dolphinscheduler/dss-dolphinscheduler-token/pom.xml | 2 +-
 plugins/dolphinscheduler/pom.xml                            | 2 +-
 plugins/linkis/dss-gateway-support/pom.xml                  | 2 +-
 pom.xml                                                     | 4 ++--
 82 files changed, 86 insertions(+), 86 deletions(-)

diff --git a/assembly/dss-package/pom.xml b/assembly/dss-package/pom.xml
index 842307e24..6cb3c2907 100644
--- a/assembly/dss-package/pom.xml
+++ b/assembly/dss-package/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.1.0.20-SNAPSHOT</version>
+        <version>1.1.0.20-gitflow</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/assembly/pom.xml b/assembly/pom.xml
index 0e97116a4..36fe79357 100644
--- a/assembly/pom.xml
+++ b/assembly/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.1.0.20-SNAPSHOT</version>
+        <version>1.1.0.20-gitflow</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <packaging>pom</packaging>
diff --git a/dss-appconn/appconns/dss-datachecker-appconn/pom.xml b/dss-appconn/appconns/dss-datachecker-appconn/pom.xml
index 51cf70eaa..a5a43f1ed 100644
--- a/dss-appconn/appconns/dss-datachecker-appconn/pom.xml
+++ b/dss-appconn/appconns/dss-datachecker-appconn/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.1.0.20-SNAPSHOT</version>
+        <version>1.1.0.20-gitflow</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
@@ -54,7 +54,7 @@
         <dependency>
             <groupId>com.webank.wedatasphere.dss</groupId>
             <artifactId>dss-origin-sso-integration-standard</artifactId>
-            <version>1.1.0.20-SNAPSHOT</version>
+            <version>1.1.0.20-gitflow</version>
             <exclusions>
                 <exclusion>
                     <groupId>org.apache.linkis</groupId>
diff --git a/dss-appconn/appconns/dss-dolphinscheduler-appconn/pom.xml b/dss-appconn/appconns/dss-dolphinscheduler-appconn/pom.xml
index 8543d92a9..65af4adf5 100644
--- a/dss-appconn/appconns/dss-dolphinscheduler-appconn/pom.xml
+++ b/dss-appconn/appconns/dss-dolphinscheduler-appconn/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.1.0.20-SNAPSHOT</version>
+        <version>1.1.0.20-gitflow</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-appconn/appconns/dss-eventchecker-appconn/pom.xml b/dss-appconn/appconns/dss-eventchecker-appconn/pom.xml
index 7539d9e68..d6afbe555 100644
--- a/dss-appconn/appconns/dss-eventchecker-appconn/pom.xml
+++ b/dss-appconn/appconns/dss-eventchecker-appconn/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.1.0.20-SNAPSHOT</version>
+        <version>1.1.0.20-gitflow</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-appconn/appconns/dss-schedulis-appconn/pom.xml b/dss-appconn/appconns/dss-schedulis-appconn/pom.xml
index ae044adb0..2b9db0eb8 100644
--- a/dss-appconn/appconns/dss-schedulis-appconn/pom.xml
+++ b/dss-appconn/appconns/dss-schedulis-appconn/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.1.0.20-SNAPSHOT</version>
+        <version>1.1.0.20-gitflow</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-appconn/appconns/dss-scriptis-appconn/pom.xml b/dss-appconn/appconns/dss-scriptis-appconn/pom.xml
index 1fbb75e66..f091d88d8 100644
--- a/dss-appconn/appconns/dss-scriptis-appconn/pom.xml
+++ b/dss-appconn/appconns/dss-scriptis-appconn/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.1.0.20-SNAPSHOT</version>
+        <version>1.1.0.20-gitflow</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-appconn/appconns/dss-sendemail-appconn/pom.xml b/dss-appconn/appconns/dss-sendemail-appconn/pom.xml
index 792ccf982..734217f54 100644
--- a/dss-appconn/appconns/dss-sendemail-appconn/pom.xml
+++ b/dss-appconn/appconns/dss-sendemail-appconn/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.1.0.20-SNAPSHOT</version>
+        <version>1.1.0.20-gitflow</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-appconn/appconns/dss-sendemail-appconn/sendemail-appconn-core/pom.xml b/dss-appconn/appconns/dss-sendemail-appconn/sendemail-appconn-core/pom.xml
index 050c80d84..2ef6b8024 100644
--- a/dss-appconn/appconns/dss-sendemail-appconn/sendemail-appconn-core/pom.xml
+++ b/dss-appconn/appconns/dss-sendemail-appconn/sendemail-appconn-core/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.1.0.20-SNAPSHOT</version>
+        <version>1.1.0.20-gitflow</version>
         <relativePath>../../../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-appconn/appconns/dss-sso-appconn/pom.xml b/dss-appconn/appconns/dss-sso-appconn/pom.xml
index 2b4eb6f8a..61dbc445d 100644
--- a/dss-appconn/appconns/dss-sso-appconn/pom.xml
+++ b/dss-appconn/appconns/dss-sso-appconn/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.1.0.20-SNAPSHOT</version>
+        <version>1.1.0.20-gitflow</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-appconn/appconns/dss-workflow-appconn/pom.xml b/dss-appconn/appconns/dss-workflow-appconn/pom.xml
index 8ec03fe62..b46b588aa 100644
--- a/dss-appconn/appconns/dss-workflow-appconn/pom.xml
+++ b/dss-appconn/appconns/dss-workflow-appconn/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.1.0.20-SNAPSHOT</version>
+        <version>1.1.0.20-gitflow</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-appconn/dss-appconn-core/pom.xml b/dss-appconn/dss-appconn-core/pom.xml
index 60f42dc4b..f4328913c 100644
--- a/dss-appconn/dss-appconn-core/pom.xml
+++ b/dss-appconn/dss-appconn-core/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.1.0.20-SNAPSHOT</version>
+        <version>1.1.0.20-gitflow</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-appconn/dss-appconn-loader/pom.xml b/dss-appconn/dss-appconn-loader/pom.xml
index 2155e4f32..1d66b58f7 100644
--- a/dss-appconn/dss-appconn-loader/pom.xml
+++ b/dss-appconn/dss-appconn-loader/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.1.0.20-SNAPSHOT</version>
+        <version>1.1.0.20-gitflow</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-appconn/dss-appconn-manager/dss-appconn-manager-client/pom.xml b/dss-appconn/dss-appconn-manager/dss-appconn-manager-client/pom.xml
index f12b02dd2..9ad85e38c 100644
--- a/dss-appconn/dss-appconn-manager/dss-appconn-manager-client/pom.xml
+++ b/dss-appconn/dss-appconn-manager/dss-appconn-manager-client/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <artifactId>dss</artifactId>
     <groupId>com.webank.wedatasphere.dss</groupId>
-    <version>1.1.0.20-SNAPSHOT</version>
+    <version>1.1.0.20-gitflow</version>
     <relativePath>../../../pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
diff --git a/dss-appconn/dss-appconn-manager/dss-appconn-manager-core/pom.xml b/dss-appconn/dss-appconn-manager/dss-appconn-manager-core/pom.xml
index a2693bc65..3a9eae97d 100644
--- a/dss-appconn/dss-appconn-manager/dss-appconn-manager-core/pom.xml
+++ b/dss-appconn/dss-appconn-manager/dss-appconn-manager-core/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <artifactId>dss</artifactId>
     <groupId>com.webank.wedatasphere.dss</groupId>
-    <version>1.1.0.20-SNAPSHOT</version>
+    <version>1.1.0.20-gitflow</version>
     <relativePath>../../../pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
diff --git a/dss-appconn/dss-appconn-manager/pom.xml b/dss-appconn/dss-appconn-manager/pom.xml
index e2b61cf83..9a05c4f5b 100644
--- a/dss-appconn/dss-appconn-manager/pom.xml
+++ b/dss-appconn/dss-appconn-manager/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <artifactId>dss</artifactId>
     <groupId>com.webank.wedatasphere.dss</groupId>
-    <version>1.1.0.20-SNAPSHOT</version>
+    <version>1.1.0.20-gitflow</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
diff --git a/dss-appconn/dss-scheduler-appconn/pom.xml b/dss-appconn/dss-scheduler-appconn/pom.xml
index cc14c6c04..6a3feb36b 100644
--- a/dss-appconn/dss-scheduler-appconn/pom.xml
+++ b/dss-appconn/dss-scheduler-appconn/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.1.0.20-SNAPSHOT</version>
+        <version>1.1.0.20-gitflow</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-appconn/linkis-appconn-engineplugin/pom.xml b/dss-appconn/linkis-appconn-engineplugin/pom.xml
index 363d409de..4293c6b3c 100644
--- a/dss-appconn/linkis-appconn-engineplugin/pom.xml
+++ b/dss-appconn/linkis-appconn-engineplugin/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.1.0.20-SNAPSHOT</version>
+        <version>1.1.0.20-gitflow</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-appconn/pom.xml b/dss-appconn/pom.xml
index 616ea2f66..df5cf4be5 100644
--- a/dss-appconn/pom.xml
+++ b/dss-appconn/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.1.0.20-SNAPSHOT</version>
+        <version>1.1.0.20-gitflow</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-apps/dss-apiservice-server/pom.xml b/dss-apps/dss-apiservice-server/pom.xml
index 0c82fbb7e..deed27df2 100644
--- a/dss-apps/dss-apiservice-server/pom.xml
+++ b/dss-apps/dss-apiservice-server/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.1.0.20-SNAPSHOT</version>
+        <version>1.1.0.20-gitflow</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-apps/dss-apps-server/pom.xml b/dss-apps/dss-apps-server/pom.xml
index 827480e12..685a787cf 100644
--- a/dss-apps/dss-apps-server/pom.xml
+++ b/dss-apps/dss-apps-server/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.1.0.20-SNAPSHOT</version>
+        <version>1.1.0.20-gitflow</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-apps/dss-data-api/dss-api-sql-template/pom.xml b/dss-apps/dss-data-api/dss-api-sql-template/pom.xml
index 24a2d57c0..6e55b87f7 100644
--- a/dss-apps/dss-data-api/dss-api-sql-template/pom.xml
+++ b/dss-apps/dss-data-api/dss-api-sql-template/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.1.0.20-SNAPSHOT</version>
+        <version>1.1.0.20-gitflow</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-apps/dss-data-api/dss-data-api-server/pom.xml b/dss-apps/dss-data-api/dss-data-api-server/pom.xml
index ab98a16c4..c68ef8ace 100644
--- a/dss-apps/dss-data-api/dss-data-api-server/pom.xml
+++ b/dss-apps/dss-data-api/dss-data-api-server/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.1.0.20-SNAPSHOT</version>
+        <version>1.1.0.20-gitflow</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-apps/dss-data-api/pom.xml b/dss-apps/dss-data-api/pom.xml
index 1e1730298..3edfc57ac 100644
--- a/dss-apps/dss-data-api/pom.xml
+++ b/dss-apps/dss-data-api/pom.xml
@@ -6,7 +6,7 @@
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
         <relativePath>../../pom.xml</relativePath>
-        <version>1.1.0.20-SNAPSHOT</version>
+        <version>1.1.0.20-gitflow</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>dss-data-api</artifactId>
diff --git a/dss-apps/dss-data-governance/dss-data-asset-server/pom.xml b/dss-apps/dss-data-governance/dss-data-asset-server/pom.xml
index f0061c59b..07cb7f707 100644
--- a/dss-apps/dss-data-governance/dss-data-asset-server/pom.xml
+++ b/dss-apps/dss-data-governance/dss-data-asset-server/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.1.0.20-SNAPSHOT</version>
+        <version>1.1.0.20-gitflow</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-apps/dss-data-governance/dss-data-classification-server/pom.xml b/dss-apps/dss-data-governance/dss-data-classification-server/pom.xml
index 8e39df352..3acdb5294 100644
--- a/dss-apps/dss-data-governance/dss-data-classification-server/pom.xml
+++ b/dss-apps/dss-data-governance/dss-data-classification-server/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.1.0.20-SNAPSHOT</version>
+        <version>1.1.0.20-gitflow</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-apps/dss-data-governance/dss-data-governance-common/pom.xml b/dss-apps/dss-data-governance/dss-data-governance-common/pom.xml
index 891faa5f4..8c647ec8f 100644
--- a/dss-apps/dss-data-governance/dss-data-governance-common/pom.xml
+++ b/dss-apps/dss-data-governance/dss-data-governance-common/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.1.0.20-SNAPSHOT</version>
+        <version>1.1.0.20-gitflow</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-apps/dss-data-governance/dss-data-governance-server/pom.xml b/dss-apps/dss-data-governance/dss-data-governance-server/pom.xml
index 25689c268..4f23fec59 100644
--- a/dss-apps/dss-data-governance/dss-data-governance-server/pom.xml
+++ b/dss-apps/dss-data-governance/dss-data-governance-server/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.1.0.20-SNAPSHOT</version>
+        <version>1.1.0.20-gitflow</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-apps/dss-data-governance/pom.xml b/dss-apps/dss-data-governance/pom.xml
index 668d5c2c2..0b7c329db 100644
--- a/dss-apps/dss-data-governance/pom.xml
+++ b/dss-apps/dss-data-governance/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.1.0.20-SNAPSHOT</version>
+        <version>1.1.0.20-gitflow</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-apps/dss-scriptis-server/pom.xml b/dss-apps/dss-scriptis-server/pom.xml
index 74d84e93f..a80964187 100644
--- a/dss-apps/dss-scriptis-server/pom.xml
+++ b/dss-apps/dss-scriptis-server/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.1.0.20-SNAPSHOT</version>
+        <version>1.1.0.20-gitflow</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/dss-apps/dss-user-guide/dss-user-guide-server/pom.xml b/dss-apps/dss-user-guide/dss-user-guide-server/pom.xml
index e7e6add8d..2027bc57e 100644
--- a/dss-apps/dss-user-guide/dss-user-guide-server/pom.xml
+++ b/dss-apps/dss-user-guide/dss-user-guide-server/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>dss-user-guide</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.1.0.20-SNAPSHOT</version>
+        <version>1.1.0.20-gitflow</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-apps/dss-user-guide/pom.xml b/dss-apps/dss-user-guide/pom.xml
index b506cc4b3..4bcd02625 100644
--- a/dss-apps/dss-user-guide/pom.xml
+++ b/dss-apps/dss-user-guide/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.1.0.20-SNAPSHOT</version>
+        <version>1.1.0.20-gitflow</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-apps/pom.xml b/dss-apps/pom.xml
index 3731e59ae..92aa89b16 100644
--- a/dss-apps/pom.xml
+++ b/dss-apps/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.1.0.20-SNAPSHOT</version>
+        <version>1.1.0.20-gitflow</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-commons/dss-common/pom.xml b/dss-commons/dss-common/pom.xml
index 23c2acc60..eaa3cc495 100644
--- a/dss-commons/dss-common/pom.xml
+++ b/dss-commons/dss-common/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <artifactId>dss-commons</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.1.0.20-SNAPSHOT</version>
+        <version>1.1.0.20-gitflow</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>dss-common</artifactId>
diff --git a/dss-commons/dss-contextservice/pom.xml b/dss-commons/dss-contextservice/pom.xml
index e72f0c672..eca1886cd 100644
--- a/dss-commons/dss-contextservice/pom.xml
+++ b/dss-commons/dss-contextservice/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss-commons</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.1.0.20-SNAPSHOT</version>
+        <version>1.1.0.20-gitflow</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>dss-contextservice</artifactId>
diff --git a/dss-commons/dss-sender-service/pom.xml b/dss-commons/dss-sender-service/pom.xml
index ba32deb18..30ddf14c4 100644
--- a/dss-commons/dss-sender-service/pom.xml
+++ b/dss-commons/dss-sender-service/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss-commons</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.1.0.20-SNAPSHOT</version>
+        <version>1.1.0.20-gitflow</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-commons/pom.xml b/dss-commons/pom.xml
index f719aa12c..1594156cf 100644
--- a/dss-commons/pom.xml
+++ b/dss-commons/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.1.0.20-SNAPSHOT</version>
+        <version>1.1.0.20-gitflow</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-framework/dss-appconn-framework/pom.xml b/dss-framework/dss-appconn-framework/pom.xml
index be1f80ef5..2d942b819 100644
--- a/dss-framework/dss-appconn-framework/pom.xml
+++ b/dss-framework/dss-appconn-framework/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.1.0.20-SNAPSHOT</version>
+        <version>1.1.0.20-gitflow</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-framework/dss-framework-admin-service/pom.xml b/dss-framework/dss-framework-admin-service/pom.xml
index 901db373b..78d894682 100644
--- a/dss-framework/dss-framework-admin-service/pom.xml
+++ b/dss-framework/dss-framework-admin-service/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.1.0.20-SNAPSHOT</version>
+        <version>1.1.0.20-gitflow</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/dss-framework/dss-framework-common/pom.xml b/dss-framework/dss-framework-common/pom.xml
index 942384562..893779971 100644
--- a/dss-framework/dss-framework-common/pom.xml
+++ b/dss-framework/dss-framework-common/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.1.0.20-SNAPSHOT</version>
+        <version>1.1.0.20-gitflow</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-framework/dss-framework-orchestrator-server/pom.xml b/dss-framework/dss-framework-orchestrator-server/pom.xml
index 48b2caf90..a277dddbf 100644
--- a/dss-framework/dss-framework-orchestrator-server/pom.xml
+++ b/dss-framework/dss-framework-orchestrator-server/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.1.0.20-SNAPSHOT</version>
+        <version>1.1.0.20-gitflow</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-framework/dss-framework-project-server/pom.xml b/dss-framework/dss-framework-project-server/pom.xml
index 67f3af93b..277ca4acc 100644
--- a/dss-framework/dss-framework-project-server/pom.xml
+++ b/dss-framework/dss-framework-project-server/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.1.0.20-SNAPSHOT</version>
+        <version>1.1.0.20-gitflow</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-framework/dss-framework-proxy-user-service/pom.xml b/dss-framework/dss-framework-proxy-user-service/pom.xml
index 7faa50d57..694aafaee 100644
--- a/dss-framework/dss-framework-proxy-user-service/pom.xml
+++ b/dss-framework/dss-framework-proxy-user-service/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>dss-framework</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.1.0.20-SNAPSHOT</version>
+        <version>1.1.0.20-gitflow</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/dss-framework/dss-framework-workspace-server/pom.xml b/dss-framework/dss-framework-workspace-server/pom.xml
index 2ff2f0904..4dc237583 100644
--- a/dss-framework/dss-framework-workspace-server/pom.xml
+++ b/dss-framework/dss-framework-workspace-server/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.1.0.20-SNAPSHOT</version>
+        <version>1.1.0.20-gitflow</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-framework/framework-plugins/dss-framework-migrate-server/pom.xml b/dss-framework/framework-plugins/dss-framework-migrate-server/pom.xml
index 4e6851585..cbba44804 100644
--- a/dss-framework/framework-plugins/dss-framework-migrate-server/pom.xml
+++ b/dss-framework/framework-plugins/dss-framework-migrate-server/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.1.0.20-SNAPSHOT</version>
+        <version>1.1.0.20-gitflow</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-framework/framework-plugins/dss-framework-orchestrator-publish/pom.xml b/dss-framework/framework-plugins/dss-framework-orchestrator-publish/pom.xml
index d7b57582e..f353752b2 100644
--- a/dss-framework/framework-plugins/dss-framework-orchestrator-publish/pom.xml
+++ b/dss-framework/framework-plugins/dss-framework-orchestrator-publish/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.1.0.20-SNAPSHOT</version>
+        <version>1.1.0.20-gitflow</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-framework/pom.xml b/dss-framework/pom.xml
index 5327fb147..03d5e141f 100644
--- a/dss-framework/pom.xml
+++ b/dss-framework/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.1.0.20-SNAPSHOT</version>
+        <version>1.1.0.20-gitflow</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-git/dss-git-common/pom.xml b/dss-git/dss-git-common/pom.xml
index 24b97f2cf..1d68d21cd 100644
--- a/dss-git/dss-git-common/pom.xml
+++ b/dss-git/dss-git-common/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>dss-git</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.1.0.20-SNAPSHOT</version>
+        <version>1.1.0.20-gitflow</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/dss-git/dss-git-server/pom.xml b/dss-git/dss-git-server/pom.xml
index 2e64ff180..7415c4676 100644
--- a/dss-git/dss-git-server/pom.xml
+++ b/dss-git/dss-git-server/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>dss-git</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.1.0.20-SNAPSHOT</version>
+        <version>1.1.0.20-gitflow</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -15,7 +15,7 @@
         <dependency>
             <groupId>com.webank.wedatasphere.dss</groupId>
             <artifactId>dss-common</artifactId>
-            <version>1.1.0.20-SNAPSHOT</version>
+            <version>1.1.0.20-gitflow</version>
         </dependency>
         <dependency>
             <groupId>com.webank.wedatasphere.dss</groupId>
@@ -25,7 +25,7 @@
         <dependency>
             <groupId>com.webank.wedatasphere.dss</groupId>
             <artifactId>dss-git-common</artifactId>
-            <version>1.1.0.20-SNAPSHOT</version>
+            <version>1.1.0.20-gitflow</version>
         </dependency>
         <dependency>
             <groupId>org.eclipse.jgit</groupId>
diff --git a/dss-git/pom.xml b/dss-git/pom.xml
index 6c88adb7c..f5bf084f3 100644
--- a/dss-git/pom.xml
+++ b/dss-git/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.1.0.20-SNAPSHOT</version>
+        <version>1.1.0.20-gitflow</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/dss-orchestrator/dss-orchestrator-common/pom.xml b/dss-orchestrator/dss-orchestrator-common/pom.xml
index 10b97e09d..2664da0fb 100644
--- a/dss-orchestrator/dss-orchestrator-common/pom.xml
+++ b/dss-orchestrator/dss-orchestrator-common/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.1.0.20-SNAPSHOT</version>
+        <version>1.1.0.20-gitflow</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-orchestrator/dss-orchestrator-conversion-standard/pom.xml b/dss-orchestrator/dss-orchestrator-conversion-standard/pom.xml
index 3335bfbee..81bc296cd 100644
--- a/dss-orchestrator/dss-orchestrator-conversion-standard/pom.xml
+++ b/dss-orchestrator/dss-orchestrator-conversion-standard/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <artifactId>dss-orchestrator</artifactId>
     <groupId>com.webank.wedatasphere.dss</groupId>
-    <version>1.1.0.20-SNAPSHOT</version>
+    <version>1.1.0.20-gitflow</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
diff --git a/dss-orchestrator/dss-orchestrator-core/pom.xml b/dss-orchestrator/dss-orchestrator-core/pom.xml
index 7d2ffcb84..f4632f8d9 100644
--- a/dss-orchestrator/dss-orchestrator-core/pom.xml
+++ b/dss-orchestrator/dss-orchestrator-core/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.1.0.20-SNAPSHOT</version>
+        <version>1.1.0.20-gitflow</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-orchestrator/dss-orchestrator-db/pom.xml b/dss-orchestrator/dss-orchestrator-db/pom.xml
index fd75675ec..e0ff81661 100644
--- a/dss-orchestrator/dss-orchestrator-db/pom.xml
+++ b/dss-orchestrator/dss-orchestrator-db/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.1.0.20-SNAPSHOT</version>
+        <version>1.1.0.20-gitflow</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-orchestrator/dss-orchestrator-loader/pom.xml b/dss-orchestrator/dss-orchestrator-loader/pom.xml
index 1f4a05191..786b146ed 100644
--- a/dss-orchestrator/dss-orchestrator-loader/pom.xml
+++ b/dss-orchestrator/dss-orchestrator-loader/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.1.0.20-SNAPSHOT</version>
+        <version>1.1.0.20-gitflow</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-orchestrator/orchestrators/dss-workflow/dss-flow-execution-server/pom.xml b/dss-orchestrator/orchestrators/dss-workflow/dss-flow-execution-server/pom.xml
index 1ac625b49..71ebf0533 100644
--- a/dss-orchestrator/orchestrators/dss-workflow/dss-flow-execution-server/pom.xml
+++ b/dss-orchestrator/orchestrators/dss-workflow/dss-flow-execution-server/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.1.0.20-SNAPSHOT</version>
+        <version>1.1.0.20-gitflow</version>
         <relativePath>../../../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-orchestrator/orchestrators/dss-workflow/dss-linkis-node-execution/pom.xml b/dss-orchestrator/orchestrators/dss-workflow/dss-linkis-node-execution/pom.xml
index d88e327d6..267159e48 100644
--- a/dss-orchestrator/orchestrators/dss-workflow/dss-linkis-node-execution/pom.xml
+++ b/dss-orchestrator/orchestrators/dss-workflow/dss-linkis-node-execution/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.1.0.20-SNAPSHOT</version>
+        <version>1.1.0.20-gitflow</version>
         <relativePath>../../../../pom.xml</relativePath>
     </parent>
     
diff --git a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-common/pom.xml b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-common/pom.xml
index e74991312..19ed8ba51 100644
--- a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-common/pom.xml
+++ b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-common/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.1.0.20-SNAPSHOT</version>
+        <version>1.1.0.20-gitflow</version>
         <relativePath>../../../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-conversion-standard/pom.xml b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-conversion-standard/pom.xml
index fb2f99ce6..b04d2f827 100644
--- a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-conversion-standard/pom.xml
+++ b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-conversion-standard/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <artifactId>dss-workflow</artifactId>
     <groupId>com.webank.wedatasphere.dss</groupId>
-    <version>1.1.0.20-SNAPSHOT</version>
+    <version>1.1.0.20-gitflow</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
diff --git a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-sdk/pom.xml b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-sdk/pom.xml
index 7bf055d48..1bb38bd47 100644
--- a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-sdk/pom.xml
+++ b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-sdk/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss-workflow</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.1.0.20-SNAPSHOT</version>
+        <version>1.1.0.20-gitflow</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/pom.xml b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/pom.xml
index fd970e1d4..e64bfa1dc 100644
--- a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/pom.xml
+++ b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.1.0.20-SNAPSHOT</version>
+        <version>1.1.0.20-gitflow</version>
         <relativePath>../../../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-orchestrator/orchestrators/dss-workflow/pom.xml b/dss-orchestrator/orchestrators/dss-workflow/pom.xml
index f15cbb371..dd0332ed0 100644
--- a/dss-orchestrator/orchestrators/dss-workflow/pom.xml
+++ b/dss-orchestrator/orchestrators/dss-workflow/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.1.0.20-SNAPSHOT</version>
+        <version>1.1.0.20-gitflow</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-orchestrator/pom.xml b/dss-orchestrator/pom.xml
index dc9f4c6fa..7db5c88d5 100644
--- a/dss-orchestrator/pom.xml
+++ b/dss-orchestrator/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.1.0.20-SNAPSHOT</version>
+        <version>1.1.0.20-gitflow</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-server/pom.xml b/dss-server/pom.xml
index 3d3171cb7..2a0bea047 100644
--- a/dss-server/pom.xml
+++ b/dss-server/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.1.0.20-SNAPSHOT</version>
+        <version>1.1.0.20-gitflow</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-standard/development-standard/development-process-standard-execution/pom.xml b/dss-standard/development-standard/development-process-standard-execution/pom.xml
index 40bb6c080..73152d53f 100644
--- a/dss-standard/development-standard/development-process-standard-execution/pom.xml
+++ b/dss-standard/development-standard/development-process-standard-execution/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <artifactId>dss</artifactId>
     <groupId>com.webank.wedatasphere.dss</groupId>
-    <version>1.1.0.20-SNAPSHOT</version>
+    <version>1.1.0.20-gitflow</version>
     <relativePath>../../../pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
diff --git a/dss-standard/development-standard/development-process-standard/pom.xml b/dss-standard/development-standard/development-process-standard/pom.xml
index f9f761d5b..9e2eeeddc 100644
--- a/dss-standard/development-standard/development-process-standard/pom.xml
+++ b/dss-standard/development-standard/development-process-standard/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <artifactId>dss</artifactId>
     <groupId>com.webank.wedatasphere.dss</groupId>
-    <version>1.1.0.20-SNAPSHOT</version>
+    <version>1.1.0.20-gitflow</version>
     <relativePath>../../../pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
diff --git a/dss-standard/dss-standard-common/pom.xml b/dss-standard/dss-standard-common/pom.xml
index ee9a581af..0eb04080c 100644
--- a/dss-standard/dss-standard-common/pom.xml
+++ b/dss-standard/dss-standard-common/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <artifactId>dss</artifactId>
     <groupId>com.webank.wedatasphere.dss</groupId>
-    <version>1.1.0.20-SNAPSHOT</version>
+    <version>1.1.0.20-gitflow</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
diff --git a/dss-standard/pom.xml b/dss-standard/pom.xml
index a136fb2e9..407d4b310 100644
--- a/dss-standard/pom.xml
+++ b/dss-standard/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <artifactId>dss</artifactId>
     <groupId>com.webank.wedatasphere.dss</groupId>
-    <version>1.1.0.20-SNAPSHOT</version>
+    <version>1.1.0.20-gitflow</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
diff --git a/dss-standard/sso-standard/origin-sso-integration-standard/pom.xml b/dss-standard/sso-standard/origin-sso-integration-standard/pom.xml
index 592b59d6c..53e3df0c9 100644
--- a/dss-standard/sso-standard/origin-sso-integration-standard/pom.xml
+++ b/dss-standard/sso-standard/origin-sso-integration-standard/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <artifactId>dss</artifactId>
     <groupId>com.webank.wedatasphere.dss</groupId>
-    <version>1.1.0.20-SNAPSHOT</version>
+    <version>1.1.0.20-gitflow</version>
     <relativePath>../../../pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
diff --git a/dss-standard/sso-standard/spring-origin-sso-integration-plugin/pom.xml b/dss-standard/sso-standard/spring-origin-sso-integration-plugin/pom.xml
index 5fdab0942..3d0decf4d 100644
--- a/dss-standard/sso-standard/spring-origin-sso-integration-plugin/pom.xml
+++ b/dss-standard/sso-standard/spring-origin-sso-integration-plugin/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <artifactId>dss</artifactId>
     <groupId>com.webank.wedatasphere.dss</groupId>
-    <version>1.1.0.20-SNAPSHOT</version>
+    <version>1.1.0.20-gitflow</version>
     <relativePath>../../../pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
diff --git a/dss-standard/sso-standard/sso-integration-standard/pom.xml b/dss-standard/sso-standard/sso-integration-standard/pom.xml
index 2ac6ce59e..ae6b0934e 100644
--- a/dss-standard/sso-standard/sso-integration-standard/pom.xml
+++ b/dss-standard/sso-standard/sso-integration-standard/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <artifactId>dss</artifactId>
     <groupId>com.webank.wedatasphere.dss</groupId>
-    <version>1.1.0.20-SNAPSHOT</version>
+    <version>1.1.0.20-gitflow</version>
     <relativePath>../../../pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
diff --git a/dss-standard/structure-standard/dss-project-plugin/pom.xml b/dss-standard/structure-standard/dss-project-plugin/pom.xml
index 745e6b013..201653ce4 100644
--- a/dss-standard/structure-standard/dss-project-plugin/pom.xml
+++ b/dss-standard/structure-standard/dss-project-plugin/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <artifactId>dss</artifactId>
     <groupId>com.webank.wedatasphere.dss</groupId>
-    <version>1.1.0.20-SNAPSHOT</version>
+    <version>1.1.0.20-gitflow</version>
     <relativePath>../../../pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
diff --git a/dss-standard/structure-standard/dss-role-plugin/pom.xml b/dss-standard/structure-standard/dss-role-plugin/pom.xml
index e5a562694..d998d70cf 100644
--- a/dss-standard/structure-standard/dss-role-plugin/pom.xml
+++ b/dss-standard/structure-standard/dss-role-plugin/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <artifactId>dss</artifactId>
     <groupId>com.webank.wedatasphere.dss</groupId>
-    <version>1.1.0.20-SNAPSHOT</version>
+    <version>1.1.0.20-gitflow</version>
     <relativePath>../../../pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
diff --git a/dss-standard/structure-standard/dss-structure-integration-standard/pom.xml b/dss-standard/structure-standard/dss-structure-integration-standard/pom.xml
index 00ce1d53a..c6a8ade84 100644
--- a/dss-standard/structure-standard/dss-structure-integration-standard/pom.xml
+++ b/dss-standard/structure-standard/dss-structure-integration-standard/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <artifactId>dss</artifactId>
     <groupId>com.webank.wedatasphere.dss</groupId>
-    <version>1.1.0.20-SNAPSHOT</version>
+    <version>1.1.0.20-gitflow</version>
     <relativePath>../../../pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
diff --git a/dss-standard/structure-standard/spring-origin-dss-project-plugin/pom.xml b/dss-standard/structure-standard/spring-origin-dss-project-plugin/pom.xml
index 645724e18..f32d4ff68 100644
--- a/dss-standard/structure-standard/spring-origin-dss-project-plugin/pom.xml
+++ b/dss-standard/structure-standard/spring-origin-dss-project-plugin/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <artifactId>dss</artifactId>
     <groupId>com.webank.wedatasphere.dss</groupId>
-    <version>1.1.0.20-SNAPSHOT</version>
+    <version>1.1.0.20-gitflow</version>
     <relativePath>../../../pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
diff --git a/plugins/azkaban/linkis-jobtype/pom.xml b/plugins/azkaban/linkis-jobtype/pom.xml
index e2ace7bb3..1df83160f 100644
--- a/plugins/azkaban/linkis-jobtype/pom.xml
+++ b/plugins/azkaban/linkis-jobtype/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.1.0.20-SNAPSHOT</version>
+        <version>1.1.0.20-gitflow</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
     <artifactId>linkis-jobtype</artifactId>
diff --git a/plugins/dolphinscheduler/dolphinscheduler-prod-metrics/pom.xml b/plugins/dolphinscheduler/dolphinscheduler-prod-metrics/pom.xml
index ca0cbacb8..ba7b8e3f6 100644
--- a/plugins/dolphinscheduler/dolphinscheduler-prod-metrics/pom.xml
+++ b/plugins/dolphinscheduler/dolphinscheduler-prod-metrics/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <artifactId>dss-plugin-dolphinscheduler</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.1.0.20-SNAPSHOT</version>
+        <version>1.1.0.20-gitflow</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/plugins/dolphinscheduler/dss-dolphinscheduler-client/pom.xml b/plugins/dolphinscheduler/dss-dolphinscheduler-client/pom.xml
index 0a01b3df1..4d39d90a5 100644
--- a/plugins/dolphinscheduler/dss-dolphinscheduler-client/pom.xml
+++ b/plugins/dolphinscheduler/dss-dolphinscheduler-client/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <artifactId>dss-plugin-dolphinscheduler</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.1.0.20-SNAPSHOT</version>
+        <version>1.1.0.20-gitflow</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/plugins/dolphinscheduler/dss-dolphinscheduler-token/pom.xml b/plugins/dolphinscheduler/dss-dolphinscheduler-token/pom.xml
index e2d8af4fd..dd082dd2d 100644
--- a/plugins/dolphinscheduler/dss-dolphinscheduler-token/pom.xml
+++ b/plugins/dolphinscheduler/dss-dolphinscheduler-token/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <artifactId>dss-plugin-dolphinscheduler</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.1.0.20-SNAPSHOT</version>
+        <version>1.1.0.20-gitflow</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/plugins/dolphinscheduler/pom.xml b/plugins/dolphinscheduler/pom.xml
index c4fc2db6c..b4ab5b2e6 100644
--- a/plugins/dolphinscheduler/pom.xml
+++ b/plugins/dolphinscheduler/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <artifactId>dss</artifactId>
     <groupId>com.webank.wedatasphere.dss</groupId>
-    <version>1.1.0.20-SNAPSHOT</version>
+    <version>1.1.0.20-gitflow</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
diff --git a/plugins/linkis/dss-gateway-support/pom.xml b/plugins/linkis/dss-gateway-support/pom.xml
index 4d24332da..20214563d 100644
--- a/plugins/linkis/dss-gateway-support/pom.xml
+++ b/plugins/linkis/dss-gateway-support/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.1.0.20-SNAPSHOT</version>
+        <version>1.1.0.20-gitflow</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/pom.xml b/pom.xml
index 9697fe15b..40a361154 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
     <packaging>pom</packaging>
     <groupId>com.webank.wedatasphere.dss</groupId>
     <artifactId>dss</artifactId>
-    <version>1.1.0.20-SNAPSHOT</version>
+    <version>1.1.0.20-gitflow</version>
 
     <modules>
         <module>dss-commons</module>
@@ -41,7 +41,7 @@
     </modules>
 
     <properties>
-        <dss.version>1.1.0.20-SNAPSHOT</dss.version>
+        <dss.version>1.1.0.20-gitflow</dss.version>
         <linkis.version>1.1.19-wds-SNAPSHOT</linkis.version>
         <scala.version>2.11.12</scala.version>
         <jdk.compile.version>1.8</jdk.compile.version>

From 23f27a6e52c0edfda23c8939d7766d89c4b7fdfa Mon Sep 17 00:00:00 2001
From: SunpengWan <825559776@qq.com>
Date: Tue, 9 Apr 2024 11:53:21 +0800
Subject: [PATCH 014/302] add template override params
 mapreduce.job.running.map.limit and mapreduce.job.running.reduce.limit

---
 .../linkis/node/execution/service/impl/BuildJobActionImpl.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dss-orchestrator/orchestrators/dss-workflow/dss-linkis-node-execution/src/main/java/com/webank/wedatasphere/dss/linkis/node/execution/service/impl/BuildJobActionImpl.java b/dss-orchestrator/orchestrators/dss-workflow/dss-linkis-node-execution/src/main/java/com/webank/wedatasphere/dss/linkis/node/execution/service/impl/BuildJobActionImpl.java
index c914503bf..a74ffeefe 100644
--- a/dss-orchestrator/orchestrators/dss-workflow/dss-linkis-node-execution/src/main/java/com/webank/wedatasphere/dss/linkis/node/execution/service/impl/BuildJobActionImpl.java
+++ b/dss-orchestrator/orchestrators/dss-workflow/dss-linkis-node-execution/src/main/java/com/webank/wedatasphere/dss/linkis/node/execution/service/impl/BuildJobActionImpl.java
@@ -217,9 +217,9 @@ private void replaceSparkConfParams(Map<String, Object> paramMapCopy) throws Lin
             startupMap.remove("spark.executor.cores");
             startupMap.remove("spark.executor.instances");
             startupMap.remove("wds.linkis.engineconn.java.driver.memory");
+            startupMap.remove("spark.conf");
             startupMap.remove("mapreduce.job.running.map.limit");
             startupMap.remove("mapreduce.job.running.reduce.limit");
-            startupMap.remove("spark.conf");
             logger.info("after remove startup map:{}",startupMap.keySet());
         }
         Map<String, Object> configurationMap = TaskUtils.getMap(paramMapCopy, TaskConstant.PARAMS_CONFIGURATION);

From ae2dab07fa5ae93b116712f9a68310c709518799 Mon Sep 17 00:00:00 2001
From: zhaobincai <zhaobincai@webank.com>
Date: Tue, 9 Apr 2024 15:06:12 +0800
Subject: [PATCH 015/302] .gitgnore add git

---
 .gitignore | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.gitignore b/.gitignore
index aa5f9b252..983d6454a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -101,6 +101,9 @@ dss-apps/dss-data-governance/dss-data-warehouse-dao/target
 dss-apps/dss-data-governance/dss-data-warehouse-service/target
 dss-apps/dss-data-governance/dss-data-warehouse-server/target
 
+#dss-git
+dss-git/dss-git-common/target
+dss-git/dss-git-server/target
 
 # plugins
 plugins/azkaban/linkis-jobtype/target

From f91386f56d8f2b0c26707a1187dfaba98f473f23 Mon Sep 17 00:00:00 2001
From: xlinliu <arionliu@webank.com>
Date: Tue, 9 Apr 2024 15:13:32 +0800
Subject: [PATCH 016/302] add gitignore

---
 .gitignore | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 983d6454a..3c8d43b13 100644
--- a/.gitignore
+++ b/.gitignore
@@ -115,4 +115,6 @@ logs/*
 *.iml
 /plugins/dolphinscheduler/dss-dolphinscheduler-client/target
 /plugins/dolphinscheduler/dolphinscheduler-prod-metrics/target
-/plugins/dolphinscheduler/dss-dolphinscheduler-token/target
\ No newline at end of file
+/plugins/dolphinscheduler/dss-dolphinscheduler-token/target
+dss-git/dss-git-common/target
+dss-git/dss-git-server/target
\ No newline at end of file

From 83a9df064690558527241909ce32cf7acf38940d Mon Sep 17 00:00:00 2001
From: xlinliu <arionliu@webank.com>
Date: Tue, 9 Apr 2024 15:15:07 +0800
Subject: [PATCH 017/302] add gitignore

---
 .gitignore | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index 3c8d43b13..983d6454a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -115,6 +115,4 @@ logs/*
 *.iml
 /plugins/dolphinscheduler/dss-dolphinscheduler-client/target
 /plugins/dolphinscheduler/dolphinscheduler-prod-metrics/target
-/plugins/dolphinscheduler/dss-dolphinscheduler-token/target
-dss-git/dss-git-common/target
-dss-git/dss-git-server/target
\ No newline at end of file
+/plugins/dolphinscheduler/dss-dolphinscheduler-token/target
\ No newline at end of file

From dea7eb68064502ffa00957fe90f1762df145b798 Mon Sep 17 00:00:00 2001
From: xlinliu <arionliu@webank.com>
Date: Wed, 10 Apr 2024 15:19:00 +0800
Subject: [PATCH 018/302] =?UTF-8?q?=E4=BC=98=E5=8C=96datacheck=E6=97=A5?=
 =?UTF-8?q?=E5=BF=97=EF=BC=8Cdesktop=5Fbdapimport=E4=B8=8D=E5=AD=98?=
 =?UTF-8?q?=E5=9C=A8=E6=97=B6=E4=B8=8D=E6=89=93log?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dss/appconn/datachecker/connector/DataCheckerDao.java        | 1 -
 1 file changed, 1 deletion(-)

diff --git a/dss-appconn/appconns/dss-datachecker-appconn/src/main/java/com/webank/wedatasphere/dss/appconn/datachecker/connector/DataCheckerDao.java b/dss-appconn/appconns/dss-datachecker-appconn/src/main/java/com/webank/wedatasphere/dss/appconn/datachecker/connector/DataCheckerDao.java
index e3bc2ae27..d48abbc91 100644
--- a/dss-appconn/appconns/dss-datachecker-appconn/src/main/java/com/webank/wedatasphere/dss/appconn/datachecker/connector/DataCheckerDao.java
+++ b/dss-appconn/appconns/dss-datachecker-appconn/src/main/java/com/webank/wedatasphere/dss/appconn/datachecker/connector/DataCheckerDao.java
@@ -431,7 +431,6 @@ private long getBdpTotalCount(CheckDataObject dataObject, Connection conn, Logge
             log.info("-------------------------------------- bdp data result:"+ret);
             return ret;
         } catch (SQLException e) {
-            log.error("fetch data from bdp error", e);
             return 0;
         }
     }

From d71a0285c11ac2adde6f3e5352740c5080936d92 Mon Sep 17 00:00:00 2001
From: SunpengWan <825559776@qq.com>
Date: Wed, 10 Apr 2024 15:43:02 +0800
Subject: [PATCH 019/302] update pom dss.version: 1.3.0-SNAPSHOT, update
 linkis.version: 1.3.0-wds

---
 assembly/dss-package/pom.xml                                | 2 +-
 assembly/pom.xml                                            | 2 +-
 dss-appconn/appconns/dss-datachecker-appconn/pom.xml        | 4 ++--
 dss-appconn/appconns/dss-dolphinscheduler-appconn/pom.xml   | 2 +-
 dss-appconn/appconns/dss-eventchecker-appconn/pom.xml       | 2 +-
 dss-appconn/appconns/dss-schedulis-appconn/pom.xml          | 2 +-
 dss-appconn/appconns/dss-scriptis-appconn/pom.xml           | 2 +-
 dss-appconn/appconns/dss-sendemail-appconn/pom.xml          | 2 +-
 .../dss-sendemail-appconn/sendemail-appconn-core/pom.xml    | 2 +-
 dss-appconn/appconns/dss-sso-appconn/pom.xml                | 2 +-
 dss-appconn/appconns/dss-workflow-appconn/pom.xml           | 2 +-
 dss-appconn/dss-appconn-core/pom.xml                        | 2 +-
 dss-appconn/dss-appconn-loader/pom.xml                      | 2 +-
 .../dss-appconn-manager/dss-appconn-manager-client/pom.xml  | 2 +-
 .../dss-appconn-manager/dss-appconn-manager-core/pom.xml    | 2 +-
 dss-appconn/dss-appconn-manager/pom.xml                     | 2 +-
 dss-appconn/dss-scheduler-appconn/pom.xml                   | 2 +-
 dss-appconn/linkis-appconn-engineplugin/pom.xml             | 2 +-
 dss-appconn/pom.xml                                         | 2 +-
 dss-apps/dss-apiservice-server/pom.xml                      | 2 +-
 dss-apps/dss-apps-server/pom.xml                            | 2 +-
 dss-apps/dss-data-api/dss-api-sql-template/pom.xml          | 2 +-
 dss-apps/dss-data-api/dss-data-api-server/pom.xml           | 2 +-
 dss-apps/dss-data-api/pom.xml                               | 2 +-
 dss-apps/dss-data-governance/dss-data-asset-server/pom.xml  | 2 +-
 .../dss-data-classification-server/pom.xml                  | 2 +-
 .../dss-data-governance/dss-data-governance-common/pom.xml  | 2 +-
 .../dss-data-governance/dss-data-governance-server/pom.xml  | 2 +-
 dss-apps/dss-data-governance/pom.xml                        | 2 +-
 dss-apps/dss-scriptis-server/pom.xml                        | 2 +-
 dss-apps/dss-user-guide/dss-user-guide-server/pom.xml       | 2 +-
 dss-apps/dss-user-guide/pom.xml                             | 2 +-
 dss-apps/pom.xml                                            | 2 +-
 dss-commons/dss-common/pom.xml                              | 2 +-
 dss-commons/dss-contextservice/pom.xml                      | 2 +-
 dss-commons/dss-sender-service/pom.xml                      | 2 +-
 dss-commons/pom.xml                                         | 2 +-
 dss-framework/dss-appconn-framework/pom.xml                 | 2 +-
 dss-framework/dss-framework-admin-service/pom.xml           | 2 +-
 dss-framework/dss-framework-common/pom.xml                  | 2 +-
 dss-framework/dss-framework-orchestrator-server/pom.xml     | 2 +-
 dss-framework/dss-framework-project-server/pom.xml          | 2 +-
 dss-framework/dss-framework-proxy-user-service/pom.xml      | 2 +-
 dss-framework/dss-framework-workspace-server/pom.xml        | 2 +-
 .../framework-plugins/dss-framework-migrate-server/pom.xml  | 2 +-
 .../dss-framework-orchestrator-publish/pom.xml              | 2 +-
 dss-framework/pom.xml                                       | 2 +-
 dss-orchestrator/dss-orchestrator-common/pom.xml            | 2 +-
 .../dss-orchestrator-conversion-standard/pom.xml            | 2 +-
 dss-orchestrator/dss-orchestrator-core/pom.xml              | 2 +-
 dss-orchestrator/dss-orchestrator-db/pom.xml                | 2 +-
 dss-orchestrator/dss-orchestrator-loader/pom.xml            | 2 +-
 .../dss-workflow/dss-flow-execution-server/pom.xml          | 2 +-
 .../dss-workflow/dss-linkis-node-execution/pom.xml          | 2 +-
 .../orchestrators/dss-workflow/dss-workflow-common/pom.xml  | 2 +-
 .../dss-workflow/dss-workflow-conversion-standard/pom.xml   | 2 +-
 .../orchestrators/dss-workflow/dss-workflow-sdk/pom.xml     | 2 +-
 .../orchestrators/dss-workflow/dss-workflow-server/pom.xml  | 2 +-
 dss-orchestrator/orchestrators/dss-workflow/pom.xml         | 2 +-
 dss-orchestrator/pom.xml                                    | 2 +-
 dss-server/pom.xml                                          | 2 +-
 .../development-process-standard-execution/pom.xml          | 2 +-
 .../development-process-standard/pom.xml                    | 2 +-
 dss-standard/dss-standard-common/pom.xml                    | 2 +-
 dss-standard/pom.xml                                        | 2 +-
 .../sso-standard/origin-sso-integration-standard/pom.xml    | 2 +-
 .../spring-origin-sso-integration-plugin/pom.xml            | 2 +-
 dss-standard/sso-standard/sso-integration-standard/pom.xml  | 2 +-
 dss-standard/structure-standard/dss-project-plugin/pom.xml  | 2 +-
 dss-standard/structure-standard/dss-role-plugin/pom.xml     | 2 +-
 .../dss-structure-integration-standard/pom.xml              | 2 +-
 .../spring-origin-dss-project-plugin/pom.xml                | 2 +-
 plugins/azkaban/linkis-jobtype/pom.xml                      | 2 +-
 .../dolphinscheduler/dolphinscheduler-prod-metrics/pom.xml  | 2 +-
 .../dolphinscheduler/dss-dolphinscheduler-client/pom.xml    | 2 +-
 plugins/dolphinscheduler/dss-dolphinscheduler-token/pom.xml | 2 +-
 plugins/dolphinscheduler/pom.xml                            | 2 +-
 plugins/linkis/dss-gateway-support/pom.xml                  | 2 +-
 pom.xml                                                     | 6 +++---
 79 files changed, 82 insertions(+), 82 deletions(-)

diff --git a/assembly/dss-package/pom.xml b/assembly/dss-package/pom.xml
index 551abaa9f..6674406cd 100644
--- a/assembly/dss-package/pom.xml
+++ b/assembly/dss-package/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.1.0.21-SNAPSHOT</version>
+        <version>1.3.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/assembly/pom.xml b/assembly/pom.xml
index 30ea818cb..d72a246dd 100644
--- a/assembly/pom.xml
+++ b/assembly/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.1.0.21-SNAPSHOT</version>
+        <version>1.3.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <packaging>pom</packaging>
diff --git a/dss-appconn/appconns/dss-datachecker-appconn/pom.xml b/dss-appconn/appconns/dss-datachecker-appconn/pom.xml
index 96972b007..d01eb0de3 100644
--- a/dss-appconn/appconns/dss-datachecker-appconn/pom.xml
+++ b/dss-appconn/appconns/dss-datachecker-appconn/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.1.0.21-SNAPSHOT</version>
+        <version>1.3.0-SNAPSHOT</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
@@ -54,7 +54,7 @@
         <dependency>
             <groupId>com.webank.wedatasphere.dss</groupId>
             <artifactId>dss-origin-sso-integration-standard</artifactId>
-            <version>1.1.0.21-SNAPSHOT</version>
+            <version>1.3.0-SNAPSHOT</version>
             <exclusions>
                 <exclusion>
                     <groupId>org.apache.linkis</groupId>
diff --git a/dss-appconn/appconns/dss-dolphinscheduler-appconn/pom.xml b/dss-appconn/appconns/dss-dolphinscheduler-appconn/pom.xml
index 9e61911c7..3965bc416 100644
--- a/dss-appconn/appconns/dss-dolphinscheduler-appconn/pom.xml
+++ b/dss-appconn/appconns/dss-dolphinscheduler-appconn/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.1.0.21-SNAPSHOT</version>
+        <version>1.3.0-SNAPSHOT</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-appconn/appconns/dss-eventchecker-appconn/pom.xml b/dss-appconn/appconns/dss-eventchecker-appconn/pom.xml
index 8f05cfa59..2133f507e 100644
--- a/dss-appconn/appconns/dss-eventchecker-appconn/pom.xml
+++ b/dss-appconn/appconns/dss-eventchecker-appconn/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.1.0.21-SNAPSHOT</version>
+        <version>1.3.0-SNAPSHOT</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-appconn/appconns/dss-schedulis-appconn/pom.xml b/dss-appconn/appconns/dss-schedulis-appconn/pom.xml
index a539660a3..7b0f868e2 100644
--- a/dss-appconn/appconns/dss-schedulis-appconn/pom.xml
+++ b/dss-appconn/appconns/dss-schedulis-appconn/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.1.0.21-SNAPSHOT</version>
+        <version>1.3.0-SNAPSHOT</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-appconn/appconns/dss-scriptis-appconn/pom.xml b/dss-appconn/appconns/dss-scriptis-appconn/pom.xml
index 1f9c818d0..e53aab1f8 100644
--- a/dss-appconn/appconns/dss-scriptis-appconn/pom.xml
+++ b/dss-appconn/appconns/dss-scriptis-appconn/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.1.0.21-SNAPSHOT</version>
+        <version>1.3.0-SNAPSHOT</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-appconn/appconns/dss-sendemail-appconn/pom.xml b/dss-appconn/appconns/dss-sendemail-appconn/pom.xml
index 3defbf129..0ebc2ff87 100644
--- a/dss-appconn/appconns/dss-sendemail-appconn/pom.xml
+++ b/dss-appconn/appconns/dss-sendemail-appconn/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.1.0.21-SNAPSHOT</version>
+        <version>1.3.0-SNAPSHOT</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-appconn/appconns/dss-sendemail-appconn/sendemail-appconn-core/pom.xml b/dss-appconn/appconns/dss-sendemail-appconn/sendemail-appconn-core/pom.xml
index c51375c78..d6a285758 100644
--- a/dss-appconn/appconns/dss-sendemail-appconn/sendemail-appconn-core/pom.xml
+++ b/dss-appconn/appconns/dss-sendemail-appconn/sendemail-appconn-core/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.1.0.21-SNAPSHOT</version>
+        <version>1.3.0-SNAPSHOT</version>
         <relativePath>../../../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-appconn/appconns/dss-sso-appconn/pom.xml b/dss-appconn/appconns/dss-sso-appconn/pom.xml
index a993fd35b..1134ea21c 100644
--- a/dss-appconn/appconns/dss-sso-appconn/pom.xml
+++ b/dss-appconn/appconns/dss-sso-appconn/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.1.0.21-SNAPSHOT</version>
+        <version>1.3.0-SNAPSHOT</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-appconn/appconns/dss-workflow-appconn/pom.xml b/dss-appconn/appconns/dss-workflow-appconn/pom.xml
index cb015df2a..2c677dbbc 100644
--- a/dss-appconn/appconns/dss-workflow-appconn/pom.xml
+++ b/dss-appconn/appconns/dss-workflow-appconn/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.1.0.21-SNAPSHOT</version>
+        <version>1.3.0-SNAPSHOT</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-appconn/dss-appconn-core/pom.xml b/dss-appconn/dss-appconn-core/pom.xml
index 742c75908..bf52e5be3 100644
--- a/dss-appconn/dss-appconn-core/pom.xml
+++ b/dss-appconn/dss-appconn-core/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.1.0.21-SNAPSHOT</version>
+        <version>1.3.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-appconn/dss-appconn-loader/pom.xml b/dss-appconn/dss-appconn-loader/pom.xml
index 90a6fa128..c175d6356 100644
--- a/dss-appconn/dss-appconn-loader/pom.xml
+++ b/dss-appconn/dss-appconn-loader/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.1.0.21-SNAPSHOT</version>
+        <version>1.3.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-appconn/dss-appconn-manager/dss-appconn-manager-client/pom.xml b/dss-appconn/dss-appconn-manager/dss-appconn-manager-client/pom.xml
index 6a8007104..1d21c6dd1 100644
--- a/dss-appconn/dss-appconn-manager/dss-appconn-manager-client/pom.xml
+++ b/dss-appconn/dss-appconn-manager/dss-appconn-manager-client/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <artifactId>dss</artifactId>
     <groupId>com.webank.wedatasphere.dss</groupId>
-    <version>1.1.0.21-SNAPSHOT</version>
+    <version>1.3.0-SNAPSHOT</version>
     <relativePath>../../../pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
diff --git a/dss-appconn/dss-appconn-manager/dss-appconn-manager-core/pom.xml b/dss-appconn/dss-appconn-manager/dss-appconn-manager-core/pom.xml
index 5857216df..c3c700044 100644
--- a/dss-appconn/dss-appconn-manager/dss-appconn-manager-core/pom.xml
+++ b/dss-appconn/dss-appconn-manager/dss-appconn-manager-core/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <artifactId>dss</artifactId>
     <groupId>com.webank.wedatasphere.dss</groupId>
-    <version>1.1.0.21-SNAPSHOT</version>
+    <version>1.3.0-SNAPSHOT</version>
     <relativePath>../../../pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
diff --git a/dss-appconn/dss-appconn-manager/pom.xml b/dss-appconn/dss-appconn-manager/pom.xml
index 71133409f..0109b84df 100644
--- a/dss-appconn/dss-appconn-manager/pom.xml
+++ b/dss-appconn/dss-appconn-manager/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <artifactId>dss</artifactId>
     <groupId>com.webank.wedatasphere.dss</groupId>
-    <version>1.1.0.21-SNAPSHOT</version>
+    <version>1.3.0-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
diff --git a/dss-appconn/dss-scheduler-appconn/pom.xml b/dss-appconn/dss-scheduler-appconn/pom.xml
index 8ce872c9d..2b68bdfb1 100644
--- a/dss-appconn/dss-scheduler-appconn/pom.xml
+++ b/dss-appconn/dss-scheduler-appconn/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.1.0.21-SNAPSHOT</version>
+        <version>1.3.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-appconn/linkis-appconn-engineplugin/pom.xml b/dss-appconn/linkis-appconn-engineplugin/pom.xml
index c37ffba4d..5dee47a82 100644
--- a/dss-appconn/linkis-appconn-engineplugin/pom.xml
+++ b/dss-appconn/linkis-appconn-engineplugin/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.1.0.21-SNAPSHOT</version>
+        <version>1.3.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-appconn/pom.xml b/dss-appconn/pom.xml
index 3baf458d4..7263fc63b 100644
--- a/dss-appconn/pom.xml
+++ b/dss-appconn/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.1.0.21-SNAPSHOT</version>
+        <version>1.3.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-apps/dss-apiservice-server/pom.xml b/dss-apps/dss-apiservice-server/pom.xml
index 16bbc1ea0..b677f34f2 100644
--- a/dss-apps/dss-apiservice-server/pom.xml
+++ b/dss-apps/dss-apiservice-server/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.1.0.21-SNAPSHOT</version>
+        <version>1.3.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-apps/dss-apps-server/pom.xml b/dss-apps/dss-apps-server/pom.xml
index 138553218..2b2f7a7e0 100644
--- a/dss-apps/dss-apps-server/pom.xml
+++ b/dss-apps/dss-apps-server/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.1.0.21-SNAPSHOT</version>
+        <version>1.3.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-apps/dss-data-api/dss-api-sql-template/pom.xml b/dss-apps/dss-data-api/dss-api-sql-template/pom.xml
index f87fd6f40..7e11ed57d 100644
--- a/dss-apps/dss-data-api/dss-api-sql-template/pom.xml
+++ b/dss-apps/dss-data-api/dss-api-sql-template/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.1.0.21-SNAPSHOT</version>
+        <version>1.3.0-SNAPSHOT</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-apps/dss-data-api/dss-data-api-server/pom.xml b/dss-apps/dss-data-api/dss-data-api-server/pom.xml
index 93e0a996e..5e750f390 100644
--- a/dss-apps/dss-data-api/dss-data-api-server/pom.xml
+++ b/dss-apps/dss-data-api/dss-data-api-server/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.1.0.21-SNAPSHOT</version>
+        <version>1.3.0-SNAPSHOT</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-apps/dss-data-api/pom.xml b/dss-apps/dss-data-api/pom.xml
index 551bf1f12..495848168 100644
--- a/dss-apps/dss-data-api/pom.xml
+++ b/dss-apps/dss-data-api/pom.xml
@@ -6,7 +6,7 @@
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
         <relativePath>../../pom.xml</relativePath>
-        <version>1.1.0.21-SNAPSHOT</version>
+        <version>1.3.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>dss-data-api</artifactId>
diff --git a/dss-apps/dss-data-governance/dss-data-asset-server/pom.xml b/dss-apps/dss-data-governance/dss-data-asset-server/pom.xml
index 5c303b714..228230a27 100644
--- a/dss-apps/dss-data-governance/dss-data-asset-server/pom.xml
+++ b/dss-apps/dss-data-governance/dss-data-asset-server/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.1.0.21-SNAPSHOT</version>
+        <version>1.3.0-SNAPSHOT</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-apps/dss-data-governance/dss-data-classification-server/pom.xml b/dss-apps/dss-data-governance/dss-data-classification-server/pom.xml
index 5b58fed36..81d514854 100644
--- a/dss-apps/dss-data-governance/dss-data-classification-server/pom.xml
+++ b/dss-apps/dss-data-governance/dss-data-classification-server/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.1.0.21-SNAPSHOT</version>
+        <version>1.3.0-SNAPSHOT</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-apps/dss-data-governance/dss-data-governance-common/pom.xml b/dss-apps/dss-data-governance/dss-data-governance-common/pom.xml
index 38f0171c0..37fc5b070 100644
--- a/dss-apps/dss-data-governance/dss-data-governance-common/pom.xml
+++ b/dss-apps/dss-data-governance/dss-data-governance-common/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.1.0.21-SNAPSHOT</version>
+        <version>1.3.0-SNAPSHOT</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-apps/dss-data-governance/dss-data-governance-server/pom.xml b/dss-apps/dss-data-governance/dss-data-governance-server/pom.xml
index 9e4986ff9..47017b4d4 100644
--- a/dss-apps/dss-data-governance/dss-data-governance-server/pom.xml
+++ b/dss-apps/dss-data-governance/dss-data-governance-server/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.1.0.21-SNAPSHOT</version>
+        <version>1.3.0-SNAPSHOT</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-apps/dss-data-governance/pom.xml b/dss-apps/dss-data-governance/pom.xml
index 0f0f93481..518d5c4b5 100644
--- a/dss-apps/dss-data-governance/pom.xml
+++ b/dss-apps/dss-data-governance/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.1.0.21-SNAPSHOT</version>
+        <version>1.3.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-apps/dss-scriptis-server/pom.xml b/dss-apps/dss-scriptis-server/pom.xml
index 825b74116..a19355c4e 100644
--- a/dss-apps/dss-scriptis-server/pom.xml
+++ b/dss-apps/dss-scriptis-server/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.1.0.21-SNAPSHOT</version>
+        <version>1.3.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/dss-apps/dss-user-guide/dss-user-guide-server/pom.xml b/dss-apps/dss-user-guide/dss-user-guide-server/pom.xml
index 6a3fe86f6..6abe4623b 100644
--- a/dss-apps/dss-user-guide/dss-user-guide-server/pom.xml
+++ b/dss-apps/dss-user-guide/dss-user-guide-server/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>dss-user-guide</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.1.0.21-SNAPSHOT</version>
+        <version>1.3.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-apps/dss-user-guide/pom.xml b/dss-apps/dss-user-guide/pom.xml
index ef8b63465..b846084dc 100644
--- a/dss-apps/dss-user-guide/pom.xml
+++ b/dss-apps/dss-user-guide/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.1.0.21-SNAPSHOT</version>
+        <version>1.3.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-apps/pom.xml b/dss-apps/pom.xml
index 67b956fc9..ba57e2bca 100644
--- a/dss-apps/pom.xml
+++ b/dss-apps/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.1.0.21-SNAPSHOT</version>
+        <version>1.3.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-commons/dss-common/pom.xml b/dss-commons/dss-common/pom.xml
index 86f83dbcc..3af009adc 100644
--- a/dss-commons/dss-common/pom.xml
+++ b/dss-commons/dss-common/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <artifactId>dss-commons</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.1.0.21-SNAPSHOT</version>
+        <version>1.3.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>dss-common</artifactId>
diff --git a/dss-commons/dss-contextservice/pom.xml b/dss-commons/dss-contextservice/pom.xml
index 3f81d39c0..609ca270d 100644
--- a/dss-commons/dss-contextservice/pom.xml
+++ b/dss-commons/dss-contextservice/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss-commons</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.1.0.21-SNAPSHOT</version>
+        <version>1.3.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>dss-contextservice</artifactId>
diff --git a/dss-commons/dss-sender-service/pom.xml b/dss-commons/dss-sender-service/pom.xml
index b792be80d..7da4725fe 100644
--- a/dss-commons/dss-sender-service/pom.xml
+++ b/dss-commons/dss-sender-service/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss-commons</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.1.0.21-SNAPSHOT</version>
+        <version>1.3.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-commons/pom.xml b/dss-commons/pom.xml
index 5820079c9..a80e4fba5 100644
--- a/dss-commons/pom.xml
+++ b/dss-commons/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.1.0.21-SNAPSHOT</version>
+        <version>1.3.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-framework/dss-appconn-framework/pom.xml b/dss-framework/dss-appconn-framework/pom.xml
index 8aaaadbbd..bfb9babb3 100644
--- a/dss-framework/dss-appconn-framework/pom.xml
+++ b/dss-framework/dss-appconn-framework/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.1.0.21-SNAPSHOT</version>
+        <version>1.3.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-framework/dss-framework-admin-service/pom.xml b/dss-framework/dss-framework-admin-service/pom.xml
index 5b469e8cc..a28b224d0 100644
--- a/dss-framework/dss-framework-admin-service/pom.xml
+++ b/dss-framework/dss-framework-admin-service/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.1.0.21-SNAPSHOT</version>
+        <version>1.3.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/dss-framework/dss-framework-common/pom.xml b/dss-framework/dss-framework-common/pom.xml
index a38484ced..1fa4aed33 100644
--- a/dss-framework/dss-framework-common/pom.xml
+++ b/dss-framework/dss-framework-common/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.1.0.21-SNAPSHOT</version>
+        <version>1.3.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-framework/dss-framework-orchestrator-server/pom.xml b/dss-framework/dss-framework-orchestrator-server/pom.xml
index 0107b01b0..cbc2b1fc1 100644
--- a/dss-framework/dss-framework-orchestrator-server/pom.xml
+++ b/dss-framework/dss-framework-orchestrator-server/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.1.0.21-SNAPSHOT</version>
+        <version>1.3.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-framework/dss-framework-project-server/pom.xml b/dss-framework/dss-framework-project-server/pom.xml
index fd679ed39..ec328f17c 100644
--- a/dss-framework/dss-framework-project-server/pom.xml
+++ b/dss-framework/dss-framework-project-server/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.1.0.21-SNAPSHOT</version>
+        <version>1.3.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-framework/dss-framework-proxy-user-service/pom.xml b/dss-framework/dss-framework-proxy-user-service/pom.xml
index eda1d4513..15b287af3 100644
--- a/dss-framework/dss-framework-proxy-user-service/pom.xml
+++ b/dss-framework/dss-framework-proxy-user-service/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>dss-framework</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.1.0.21-SNAPSHOT</version>
+        <version>1.3.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/dss-framework/dss-framework-workspace-server/pom.xml b/dss-framework/dss-framework-workspace-server/pom.xml
index 22bda9540..4fad67608 100644
--- a/dss-framework/dss-framework-workspace-server/pom.xml
+++ b/dss-framework/dss-framework-workspace-server/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.1.0.21-SNAPSHOT</version>
+        <version>1.3.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-framework/framework-plugins/dss-framework-migrate-server/pom.xml b/dss-framework/framework-plugins/dss-framework-migrate-server/pom.xml
index 1f70ab62d..748dd085e 100644
--- a/dss-framework/framework-plugins/dss-framework-migrate-server/pom.xml
+++ b/dss-framework/framework-plugins/dss-framework-migrate-server/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.1.0.21-SNAPSHOT</version>
+        <version>1.3.0-SNAPSHOT</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-framework/framework-plugins/dss-framework-orchestrator-publish/pom.xml b/dss-framework/framework-plugins/dss-framework-orchestrator-publish/pom.xml
index fcc5ed67f..870d2aeb7 100644
--- a/dss-framework/framework-plugins/dss-framework-orchestrator-publish/pom.xml
+++ b/dss-framework/framework-plugins/dss-framework-orchestrator-publish/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.1.0.21-SNAPSHOT</version>
+        <version>1.3.0-SNAPSHOT</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-framework/pom.xml b/dss-framework/pom.xml
index 0665a4b92..ccf70b32c 100644
--- a/dss-framework/pom.xml
+++ b/dss-framework/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.1.0.21-SNAPSHOT</version>
+        <version>1.3.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-orchestrator/dss-orchestrator-common/pom.xml b/dss-orchestrator/dss-orchestrator-common/pom.xml
index 40682adb8..0a1cc58e8 100644
--- a/dss-orchestrator/dss-orchestrator-common/pom.xml
+++ b/dss-orchestrator/dss-orchestrator-common/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.1.0.21-SNAPSHOT</version>
+        <version>1.3.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-orchestrator/dss-orchestrator-conversion-standard/pom.xml b/dss-orchestrator/dss-orchestrator-conversion-standard/pom.xml
index 1e4ac15f6..03b599b76 100644
--- a/dss-orchestrator/dss-orchestrator-conversion-standard/pom.xml
+++ b/dss-orchestrator/dss-orchestrator-conversion-standard/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <artifactId>dss-orchestrator</artifactId>
     <groupId>com.webank.wedatasphere.dss</groupId>
-    <version>1.1.0.21-SNAPSHOT</version>
+    <version>1.3.0-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
diff --git a/dss-orchestrator/dss-orchestrator-core/pom.xml b/dss-orchestrator/dss-orchestrator-core/pom.xml
index 25e7bf860..0800a82b3 100644
--- a/dss-orchestrator/dss-orchestrator-core/pom.xml
+++ b/dss-orchestrator/dss-orchestrator-core/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.1.0.21-SNAPSHOT</version>
+        <version>1.3.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-orchestrator/dss-orchestrator-db/pom.xml b/dss-orchestrator/dss-orchestrator-db/pom.xml
index abedcc10f..c08ab2c26 100644
--- a/dss-orchestrator/dss-orchestrator-db/pom.xml
+++ b/dss-orchestrator/dss-orchestrator-db/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.1.0.21-SNAPSHOT</version>
+        <version>1.3.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-orchestrator/dss-orchestrator-loader/pom.xml b/dss-orchestrator/dss-orchestrator-loader/pom.xml
index a757e1a24..def0b8abf 100644
--- a/dss-orchestrator/dss-orchestrator-loader/pom.xml
+++ b/dss-orchestrator/dss-orchestrator-loader/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.1.0.21-SNAPSHOT</version>
+        <version>1.3.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-orchestrator/orchestrators/dss-workflow/dss-flow-execution-server/pom.xml b/dss-orchestrator/orchestrators/dss-workflow/dss-flow-execution-server/pom.xml
index ed124d031..96b081036 100644
--- a/dss-orchestrator/orchestrators/dss-workflow/dss-flow-execution-server/pom.xml
+++ b/dss-orchestrator/orchestrators/dss-workflow/dss-flow-execution-server/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.1.0.21-SNAPSHOT</version>
+        <version>1.3.0-SNAPSHOT</version>
         <relativePath>../../../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-orchestrator/orchestrators/dss-workflow/dss-linkis-node-execution/pom.xml b/dss-orchestrator/orchestrators/dss-workflow/dss-linkis-node-execution/pom.xml
index c0a3c1984..2ffc52852 100644
--- a/dss-orchestrator/orchestrators/dss-workflow/dss-linkis-node-execution/pom.xml
+++ b/dss-orchestrator/orchestrators/dss-workflow/dss-linkis-node-execution/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.1.0.21-SNAPSHOT</version>
+        <version>1.3.0-SNAPSHOT</version>
         <relativePath>../../../../pom.xml</relativePath>
     </parent>
     
diff --git a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-common/pom.xml b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-common/pom.xml
index 4b2b6ef17..cd49c91df 100644
--- a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-common/pom.xml
+++ b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-common/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.1.0.21-SNAPSHOT</version>
+        <version>1.3.0-SNAPSHOT</version>
         <relativePath>../../../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-conversion-standard/pom.xml b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-conversion-standard/pom.xml
index 80e5df81d..8c42962f9 100644
--- a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-conversion-standard/pom.xml
+++ b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-conversion-standard/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <artifactId>dss-workflow</artifactId>
     <groupId>com.webank.wedatasphere.dss</groupId>
-    <version>1.1.0.21-SNAPSHOT</version>
+    <version>1.3.0-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
diff --git a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-sdk/pom.xml b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-sdk/pom.xml
index dec539e41..0e0cab938 100644
--- a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-sdk/pom.xml
+++ b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-sdk/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss-workflow</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.1.0.21-SNAPSHOT</version>
+        <version>1.3.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/pom.xml b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/pom.xml
index 65387ae4e..e13d9ea48 100644
--- a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/pom.xml
+++ b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.1.0.21-SNAPSHOT</version>
+        <version>1.3.0-SNAPSHOT</version>
         <relativePath>../../../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-orchestrator/orchestrators/dss-workflow/pom.xml b/dss-orchestrator/orchestrators/dss-workflow/pom.xml
index dc863de79..6c2c41c59 100644
--- a/dss-orchestrator/orchestrators/dss-workflow/pom.xml
+++ b/dss-orchestrator/orchestrators/dss-workflow/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.1.0.21-SNAPSHOT</version>
+        <version>1.3.0-SNAPSHOT</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-orchestrator/pom.xml b/dss-orchestrator/pom.xml
index ef6bea8de..d382731d5 100644
--- a/dss-orchestrator/pom.xml
+++ b/dss-orchestrator/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.1.0.21-SNAPSHOT</version>
+        <version>1.3.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-server/pom.xml b/dss-server/pom.xml
index acdb1376c..fd3087ebd 100644
--- a/dss-server/pom.xml
+++ b/dss-server/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.1.0.21-SNAPSHOT</version>
+        <version>1.3.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-standard/development-standard/development-process-standard-execution/pom.xml b/dss-standard/development-standard/development-process-standard-execution/pom.xml
index b3f34474c..bdbdc445c 100644
--- a/dss-standard/development-standard/development-process-standard-execution/pom.xml
+++ b/dss-standard/development-standard/development-process-standard-execution/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <artifactId>dss</artifactId>
     <groupId>com.webank.wedatasphere.dss</groupId>
-    <version>1.1.0.21-SNAPSHOT</version>
+    <version>1.3.0-SNAPSHOT</version>
     <relativePath>../../../pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
diff --git a/dss-standard/development-standard/development-process-standard/pom.xml b/dss-standard/development-standard/development-process-standard/pom.xml
index 5356f9593..e1d9fc919 100644
--- a/dss-standard/development-standard/development-process-standard/pom.xml
+++ b/dss-standard/development-standard/development-process-standard/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <artifactId>dss</artifactId>
     <groupId>com.webank.wedatasphere.dss</groupId>
-    <version>1.1.0.21-SNAPSHOT</version>
+    <version>1.3.0-SNAPSHOT</version>
     <relativePath>../../../pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
diff --git a/dss-standard/dss-standard-common/pom.xml b/dss-standard/dss-standard-common/pom.xml
index 4e1b12f51..d38704d2d 100644
--- a/dss-standard/dss-standard-common/pom.xml
+++ b/dss-standard/dss-standard-common/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <artifactId>dss</artifactId>
     <groupId>com.webank.wedatasphere.dss</groupId>
-    <version>1.1.0.21-SNAPSHOT</version>
+    <version>1.3.0-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
diff --git a/dss-standard/pom.xml b/dss-standard/pom.xml
index fde1bb513..4d9c40b2f 100644
--- a/dss-standard/pom.xml
+++ b/dss-standard/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <artifactId>dss</artifactId>
     <groupId>com.webank.wedatasphere.dss</groupId>
-    <version>1.1.0.21-SNAPSHOT</version>
+    <version>1.3.0-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
diff --git a/dss-standard/sso-standard/origin-sso-integration-standard/pom.xml b/dss-standard/sso-standard/origin-sso-integration-standard/pom.xml
index 7c65dc338..b1de51004 100644
--- a/dss-standard/sso-standard/origin-sso-integration-standard/pom.xml
+++ b/dss-standard/sso-standard/origin-sso-integration-standard/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <artifactId>dss</artifactId>
     <groupId>com.webank.wedatasphere.dss</groupId>
-    <version>1.1.0.21-SNAPSHOT</version>
+    <version>1.3.0-SNAPSHOT</version>
     <relativePath>../../../pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
diff --git a/dss-standard/sso-standard/spring-origin-sso-integration-plugin/pom.xml b/dss-standard/sso-standard/spring-origin-sso-integration-plugin/pom.xml
index 46ce2475d..59a80b2b0 100644
--- a/dss-standard/sso-standard/spring-origin-sso-integration-plugin/pom.xml
+++ b/dss-standard/sso-standard/spring-origin-sso-integration-plugin/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <artifactId>dss</artifactId>
     <groupId>com.webank.wedatasphere.dss</groupId>
-    <version>1.1.0.21-SNAPSHOT</version>
+    <version>1.3.0-SNAPSHOT</version>
     <relativePath>../../../pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
diff --git a/dss-standard/sso-standard/sso-integration-standard/pom.xml b/dss-standard/sso-standard/sso-integration-standard/pom.xml
index b5f67caf1..f2d1da996 100644
--- a/dss-standard/sso-standard/sso-integration-standard/pom.xml
+++ b/dss-standard/sso-standard/sso-integration-standard/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <artifactId>dss</artifactId>
     <groupId>com.webank.wedatasphere.dss</groupId>
-    <version>1.1.0.21-SNAPSHOT</version>
+    <version>1.3.0-SNAPSHOT</version>
     <relativePath>../../../pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
diff --git a/dss-standard/structure-standard/dss-project-plugin/pom.xml b/dss-standard/structure-standard/dss-project-plugin/pom.xml
index 7885208da..70fd9bbaf 100644
--- a/dss-standard/structure-standard/dss-project-plugin/pom.xml
+++ b/dss-standard/structure-standard/dss-project-plugin/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <artifactId>dss</artifactId>
     <groupId>com.webank.wedatasphere.dss</groupId>
-    <version>1.1.0.21-SNAPSHOT</version>
+    <version>1.3.0-SNAPSHOT</version>
     <relativePath>../../../pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
diff --git a/dss-standard/structure-standard/dss-role-plugin/pom.xml b/dss-standard/structure-standard/dss-role-plugin/pom.xml
index be0ea18aa..e89f24515 100644
--- a/dss-standard/structure-standard/dss-role-plugin/pom.xml
+++ b/dss-standard/structure-standard/dss-role-plugin/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <artifactId>dss</artifactId>
     <groupId>com.webank.wedatasphere.dss</groupId>
-    <version>1.1.0.21-SNAPSHOT</version>
+    <version>1.3.0-SNAPSHOT</version>
     <relativePath>../../../pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
diff --git a/dss-standard/structure-standard/dss-structure-integration-standard/pom.xml b/dss-standard/structure-standard/dss-structure-integration-standard/pom.xml
index 33d8b1415..a77589b06 100644
--- a/dss-standard/structure-standard/dss-structure-integration-standard/pom.xml
+++ b/dss-standard/structure-standard/dss-structure-integration-standard/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <artifactId>dss</artifactId>
     <groupId>com.webank.wedatasphere.dss</groupId>
-    <version>1.1.0.21-SNAPSHOT</version>
+    <version>1.3.0-SNAPSHOT</version>
     <relativePath>../../../pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
diff --git a/dss-standard/structure-standard/spring-origin-dss-project-plugin/pom.xml b/dss-standard/structure-standard/spring-origin-dss-project-plugin/pom.xml
index 8269ab980..add113d17 100644
--- a/dss-standard/structure-standard/spring-origin-dss-project-plugin/pom.xml
+++ b/dss-standard/structure-standard/spring-origin-dss-project-plugin/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <artifactId>dss</artifactId>
     <groupId>com.webank.wedatasphere.dss</groupId>
-    <version>1.1.0.21-SNAPSHOT</version>
+    <version>1.3.0-SNAPSHOT</version>
     <relativePath>../../../pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
diff --git a/plugins/azkaban/linkis-jobtype/pom.xml b/plugins/azkaban/linkis-jobtype/pom.xml
index e0d2c983e..4f315b1d5 100644
--- a/plugins/azkaban/linkis-jobtype/pom.xml
+++ b/plugins/azkaban/linkis-jobtype/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.1.0.21-SNAPSHOT</version>
+        <version>1.3.0-SNAPSHOT</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
     <artifactId>linkis-jobtype</artifactId>
diff --git a/plugins/dolphinscheduler/dolphinscheduler-prod-metrics/pom.xml b/plugins/dolphinscheduler/dolphinscheduler-prod-metrics/pom.xml
index 7cad1d645..7ba8ad2ba 100644
--- a/plugins/dolphinscheduler/dolphinscheduler-prod-metrics/pom.xml
+++ b/plugins/dolphinscheduler/dolphinscheduler-prod-metrics/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <artifactId>dss-plugin-dolphinscheduler</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.1.0.21-SNAPSHOT</version>
+        <version>1.3.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/plugins/dolphinscheduler/dss-dolphinscheduler-client/pom.xml b/plugins/dolphinscheduler/dss-dolphinscheduler-client/pom.xml
index 894996923..86efe3cc3 100644
--- a/plugins/dolphinscheduler/dss-dolphinscheduler-client/pom.xml
+++ b/plugins/dolphinscheduler/dss-dolphinscheduler-client/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <artifactId>dss-plugin-dolphinscheduler</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.1.0.21-SNAPSHOT</version>
+        <version>1.3.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/plugins/dolphinscheduler/dss-dolphinscheduler-token/pom.xml b/plugins/dolphinscheduler/dss-dolphinscheduler-token/pom.xml
index 434704ef6..8d01963a3 100644
--- a/plugins/dolphinscheduler/dss-dolphinscheduler-token/pom.xml
+++ b/plugins/dolphinscheduler/dss-dolphinscheduler-token/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <artifactId>dss-plugin-dolphinscheduler</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.1.0.21-SNAPSHOT</version>
+        <version>1.3.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/plugins/dolphinscheduler/pom.xml b/plugins/dolphinscheduler/pom.xml
index b18b53a21..b9e7d6c4d 100644
--- a/plugins/dolphinscheduler/pom.xml
+++ b/plugins/dolphinscheduler/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <artifactId>dss</artifactId>
     <groupId>com.webank.wedatasphere.dss</groupId>
-    <version>1.1.0.21-SNAPSHOT</version>
+    <version>1.3.0-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
diff --git a/plugins/linkis/dss-gateway-support/pom.xml b/plugins/linkis/dss-gateway-support/pom.xml
index 3e560b4a7..a1a55c5e2 100644
--- a/plugins/linkis/dss-gateway-support/pom.xml
+++ b/plugins/linkis/dss-gateway-support/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.1.0.21-SNAPSHOT</version>
+        <version>1.3.0-SNAPSHOT</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/pom.xml b/pom.xml
index 5074eaf02..e8a49e00f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
     <packaging>pom</packaging>
     <groupId>com.webank.wedatasphere.dss</groupId>
     <artifactId>dss</artifactId>
-    <version>1.1.0.21-SNAPSHOT</version>
+    <version>1.3.0-SNAPSHOT</version>
 
     <modules>
         <module>dss-commons</module>
@@ -40,8 +40,8 @@
     </modules>
 
     <properties>
-        <dss.version>1.1.0.21-SNAPSHOT</dss.version>
-        <linkis.version>1.1.19-wds-SNAPSHOT</linkis.version>
+        <dss.version>1.3.0-SNAPSHOT</dss.version>
+        <linkis.version>1.3.0-wds</linkis.version>
         <scala.version>2.11.12</scala.version>
         <jdk.compile.version>1.8</jdk.compile.version>
         <maven.version>3.3.3</maven.version>

From 4bda5c8e3fc412039ccad3b90986a808ee8b689b Mon Sep 17 00:00:00 2001
From: SunpengWan <825559776@qq.com>
Date: Wed, 10 Apr 2024 16:01:35 +0800
Subject: [PATCH 020/302] openfile insterface add enableLimit params

---
 .../dss/apiservice/core/execute/ExecuteCodeHelper.java       | 3 ++-
 .../apiservice/core/restful/ApiServiceExecuteRestfulApi.java | 5 +++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/dss-apps/dss-apiservice-server/src/main/java/com/webank/wedatasphere/dss/apiservice/core/execute/ExecuteCodeHelper.java b/dss-apps/dss-apiservice-server/src/main/java/com/webank/wedatasphere/dss/apiservice/core/execute/ExecuteCodeHelper.java
index 19b030477..8cac07324 100644
--- a/dss-apps/dss-apiservice-server/src/main/java/com/webank/wedatasphere/dss/apiservice/core/execute/ExecuteCodeHelper.java
+++ b/dss-apps/dss-apiservice-server/src/main/java/com/webank/wedatasphere/dss/apiservice/core/execute/ExecuteCodeHelper.java
@@ -195,10 +195,11 @@ public static  String getResultList(JobExecuteResult executeResult,UJESClient cl
 
 
 
-    public static  String getResultContent(String user, String path, int maxSize, UJESClient client) {
+    public static  String getResultContent(String user, String path, int maxSize, UJESClient client, boolean enableLimit) {
         return client.resultSet(ResultSetAction.builder()
                     .setPath(path)
                     .setUser(user)
+                    .setEnableLimit(enableLimit)
                     .setPageSize(maxSize).build()).getResponseBody();
     }
 
diff --git a/dss-apps/dss-apiservice-server/src/main/java/com/webank/wedatasphere/dss/apiservice/core/restful/ApiServiceExecuteRestfulApi.java b/dss-apps/dss-apiservice-server/src/main/java/com/webank/wedatasphere/dss/apiservice/core/restful/ApiServiceExecuteRestfulApi.java
index f6a66fc6e..7a085b2ef 100644
--- a/dss-apps/dss-apiservice-server/src/main/java/com/webank/wedatasphere/dss/apiservice/core/restful/ApiServiceExecuteRestfulApi.java
+++ b/dss-apps/dss-apiservice-server/src/main/java/com/webank/wedatasphere/dss/apiservice/core/restful/ApiServiceExecuteRestfulApi.java
@@ -173,7 +173,8 @@ public Message openFile(HttpServletRequest req,
                              @RequestParam(required = false, name = "taskId") String taskId,
                              @RequestParam(required = false, name = "page", defaultValue = "1") Integer page,
                              @RequestParam(required = false, name = "pageSize", defaultValue = "5000") Integer pageSize,
-                             @RequestParam(required = false, name = "charset", defaultValue = "utf-8") String charset) {
+                             @RequestParam(required = false, name = "charset", defaultValue = "utf-8") String charset,
+                             @RequestParam(required = false, name = "enableLimit", defaultValue = "false") Boolean enableLimit) {
         String userName = SecurityFilter.getLoginUsername(req);
         logger.info("User {} wants to open resultSet file {} in task {}.", userName, path, taskId);
         if (!isNumber(taskId)) {
@@ -191,7 +192,7 @@ public Message openFile(HttpServletRequest req,
         } else if (userName.equals(apiServiceJob.getSubmitUser())) {
             UJESClient client = LinkisJobSubmit.getClient();
             try {
-                String fileContent = ExecuteCodeHelper.getResultContent(apiServiceJob.getProxyUser(), path, pageSize, client);
+                String fileContent = ExecuteCodeHelper.getResultContent(apiServiceJob.getProxyUser(), path, pageSize, client,enableLimit);
                 return DSSCommonUtils.COMMON_GSON.fromJson(fileContent, Message.class);
             } catch (Exception e) {
                 logger.error("User {} fetch resultSet {} failed.", userName, path, e);

From 4e46f1a450273673a7e7a6118480299758c00576 Mon Sep 17 00:00:00 2001
From: SunpengWan <825559776@qq.com>
Date: Wed, 10 Apr 2024 17:06:01 +0800
Subject: [PATCH 021/302] update linkis.version: 1.3.0-wds-SNAPSHOT

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index e8a49e00f..3df428933 100644
--- a/pom.xml
+++ b/pom.xml
@@ -41,7 +41,7 @@
 
     <properties>
         <dss.version>1.3.0-SNAPSHOT</dss.version>
-        <linkis.version>1.3.0-wds</linkis.version>
+        <linkis.version>1.3.0-wds-SNAPSHOT</linkis.version>
         <scala.version>2.11.12</scala.version>
         <jdk.compile.version>1.8</jdk.compile.version>
         <maven.version>3.3.3</maven.version>

From 0c7a7d14d9cfc8e9331a0fe0bc153448190c71fa Mon Sep 17 00:00:00 2001
From: xlinliu <arionliu@webank.com>
Date: Wed, 10 Apr 2024 18:08:05 +0800
Subject: [PATCH 022/302] =?UTF-8?q?=E5=AF=BC=E5=85=A5=E5=AF=BC=E5=87=BA?=
 =?UTF-8?q?=E5=9F=BA=E4=BA=8E=E6=96=B0=E6=A0=BC=E5=BC=8F=E6=96=87=E4=BB=B6?=
 =?UTF-8?q?=E7=BB=93=E6=9E=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dss/common/utils/IoUtils.java             |  62 ++++++-
 .../dss/common/utils/ZipHelper.java           |   9 +-
 .../server/restful/OrchestratorIERestful.java |   4 +-
 .../receiver/DSSOrchestratorReceiver.scala    |   4 +-
 .../publish/ExportDSSOrchestratorPlugin.java  |  13 ++
 .../publish/ImportDSSOrchestratorPlugin.java  |  11 ++
 .../impl/ExportDSSOrchestratorPluginImpl.java |  84 +++++++++
 .../impl/ImportDSSOrchestratorPluginImpl.java | 137 ++++++++++++++
 .../publish/io/export/MetaExportService.java  |   1 +
 .../io/export/impl/MetaExportServiceImpl.java |  37 +++-
 .../publish/io/input/MetaInputService.java    |   1 +
 .../io/input/impl/MetaInputServiceImpl.java   |  20 ++-
 .../workflow/common/parser/NodeParser.java    |   2 +
 .../dss/workflow/DefaultWorkFlowManager.java  |  66 ++++++-
 .../dss/workflow/WorkFlowManager.java         |  23 ++-
 .../workflow/io/export/MetaExportService.java |   1 +
 .../workflow/io/export/NodeExportService.java |   2 +
 .../io/export/WorkFlowExportService.java      |  13 ++
 .../io/export/impl/MetaExportServiceImpl.java |  19 +-
 .../io/export/impl/NodeExportServiceImpl.java |  57 ++++++
 .../impl/WorkFlowExportServiceImpl.java       | 169 +++++++++++++++++-
 .../workflow/io/input/MetaInputService.java   |   2 +
 .../workflow/io/input/NodeInputService.java   |   5 +
 .../io/input/WorkFlowInputService.java        |   4 +
 .../io/input/impl/MetaInputServiceImpl.java   |  27 ++-
 .../io/input/impl/NodeInputServiceImpl.java   |  89 ++++++++-
 .../input/impl/WorkFlowInputServiceImpl.java  | 151 +++++++++++++++-
 .../workflow/parser/DefaultNodeParser.java    |   9 +
 .../receiver/DSSWorkflowReceiver.scala        |   4 +-
 29 files changed, 998 insertions(+), 28 deletions(-)

diff --git a/dss-commons/dss-common/src/main/java/com/webank/wedatasphere/dss/common/utils/IoUtils.java b/dss-commons/dss-common/src/main/java/com/webank/wedatasphere/dss/common/utils/IoUtils.java
index ab0610e61..555972a13 100644
--- a/dss-commons/dss-common/src/main/java/com/webank/wedatasphere/dss/common/utils/IoUtils.java
+++ b/dss-commons/dss-common/src/main/java/com/webank/wedatasphere/dss/common/utils/IoUtils.java
@@ -24,9 +24,7 @@
 
 import java.io.*;
 import java.text.SimpleDateFormat;
-import java.util.Arrays;
-import java.util.Date;
-import java.util.Properties;
+import java.util.*;
 
 /**
  * IO通用类。提供对一次IO操作的临时目录创建、文件创建、IO流创建功能。
@@ -37,6 +35,7 @@ public class IoUtils {
     private static Logger logger = LoggerFactory.getLogger(IoUtils.class);
     private static final String DATE_FORMAT = "yyyyMMddHHmmssSSS";
     private static final String DEFAULT_IO_FILE_NAME = "IO.properties";
+    public static final String FLOW_META_DIRECTORY_NAME = ".metaConf";
 
     /**
      * 生成一个基础目录，这个目录用于某次任务的临时文件目录
@@ -51,7 +50,62 @@ public static String generateIOPath(String userName,String projectName,String su
         return addFileSeparator(baseUrl, dataStr, userName, projectName, subDir);
     }
 
-    private static String addFileSeparator(String... str) {
+    public static List<String> getSubdirectoriesNames(String directoryPath) {
+        File directory = new File(directoryPath);
+        File[] subdirectories = directory.listFiles(File::isDirectory); // 使用文件过滤器获取只有目录的File数组
+
+        List<String> subdirectoriesNames = new ArrayList<>();
+        if (subdirectories != null) {
+            for (File subdirectory : subdirectories) {
+                subdirectoriesNames.add(subdirectory.getName()); // 将目录名称添加到列表中
+            }
+        }
+        return subdirectoriesNames;
+    }
+
+    /**
+     * 生成一个临时目录
+     * @param userName 用户名
+     * @return 临时目录
+     */
+    public static String generateTempIOPath(String userName){
+        String baseUrl = DSSCommonConf.DSS_EXPORT_URL.getValue();
+        String dataStr = new SimpleDateFormat(DATE_FORMAT).format(new Date());
+        return addFileSeparator(baseUrl, dataStr, userName);
+    }
+
+    /**
+     * 生产一个项目文件夹
+     * @param userName
+     * @param projectName
+     * @return
+     */
+    public static String generateProjectIOPath(String userName,String projectName){
+        String baseUrl = DSSCommonConf.DSS_EXPORT_URL.getValue();
+        String dataStr = new SimpleDateFormat(DATE_FORMAT).format(new Date());
+        return addFileSeparator(baseUrl, dataStr, userName, projectName);
+    }
+
+    /**
+     * 生成一个工作流元数据目录，这个目录用于某次任务的临时文件目录
+     */
+    public static String generateFlowMetaIOPath(String projectPath,String flowName) {
+        String baseUrl = DSSCommonConf.DSS_EXPORT_URL.getValue();
+        String dataStr = new SimpleDateFormat(DATE_FORMAT).format(new Date());
+        return addFileSeparator(projectPath, FLOW_META_DIRECTORY_NAME,flowName);
+    }
+
+
+    /**
+     * 生成一个工作流代码目录，这个目录用于某次任务的临时文件目录
+     */
+    public static String generateFlowCodeIOPath(String projectPath,String flowName) {
+        String baseUrl = DSSCommonConf.DSS_EXPORT_URL.getValue();
+        String dataStr = new SimpleDateFormat(DATE_FORMAT).format(new Date());
+        return addFileSeparator(projectPath, flowName);
+    }
+
+    public static String addFileSeparator(String... str) {
         return Arrays.stream(str).reduce((a, b) -> a + File.separator + b).orElse("");
     }
 
diff --git a/dss-commons/dss-common/src/main/java/com/webank/wedatasphere/dss/common/utils/ZipHelper.java b/dss-commons/dss-common/src/main/java/com/webank/wedatasphere/dss/common/utils/ZipHelper.java
index 55652b6fb..75172dc14 100644
--- a/dss-commons/dss-common/src/main/java/com/webank/wedatasphere/dss/common/utils/ZipHelper.java
+++ b/dss-commons/dss-common/src/main/java/com/webank/wedatasphere/dss/common/utils/ZipHelper.java
@@ -127,7 +127,11 @@ public static String zip(String dirPath, boolean deleteOriginDir)throws DSSError
      * @throws DSSErrorException 解压出现异常
      */
 
-    public static String unzip(String dirPath)throws DSSErrorException {
+    public static String unzip(String dirPath)throws DSSErrorException{
+        return unzip(dirPath, false);
+    }
+
+    public static String unzip(String dirPath,boolean deleteOriginZip)throws DSSErrorException {
         File file = new File(dirPath);
         if(!file.exists()){
             logger.error("{} 不存在, 不能解压zip文件", dirPath);
@@ -166,6 +170,9 @@ public static String unzip(String dirPath)throws DSSErrorException {
             if (exitCode != 0){
                 throw new DSSErrorException(90007,errMsg.toString());
             }
+            if(deleteOriginZip){
+                file.delete();
+            }
         }catch(final Exception e){
             logger.error("{} 解压缩 zip 文件失败, reason: ", e);
             DSSErrorException exception = new DSSErrorException(90009,dirPath + " to zip file failed");
diff --git a/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/restful/OrchestratorIERestful.java b/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/restful/OrchestratorIERestful.java
index 29f36fd91..6149bf0e6 100644
--- a/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/restful/OrchestratorIERestful.java
+++ b/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/restful/OrchestratorIERestful.java
@@ -114,7 +114,7 @@ public Message importOrcFile(HttpServletRequest req,
             RequestImportOrchestrator importRequest = new RequestImportOrchestrator(userName, projectName,
                     projectID, resultMap.getResourceId(),
                     resultMap.getVersion(), null, dssLabelList, workspace);
-            dssOrchestratorVersion = orchestratorContext.getDSSOrchestratorPlugin(ImportDSSOrchestratorPlugin.class).importOrchestrator(importRequest);
+            dssOrchestratorVersion = orchestratorContext.getDSSOrchestratorPlugin(ImportDSSOrchestratorPlugin.class).importOrchestratorNew(importRequest);
             AuditLogUtils.printLog(userName, workspace.getWorkspaceId(), workspace.getWorkspaceName(), TargetTypeEnum.ORCHESTRATOR,
                     projectID, projectName, OperateTypeEnum.CREATE, importRequest);
         } catch (Exception e) {
@@ -153,7 +153,7 @@ public void exportOrcFile(HttpServletRequest req,
         OrchestratorFrameworkServiceImpl.validateOperation(orchestratorVo.getDssOrchestratorInfo().getProjectId(), userName);
         logger.info("export orchestrator orchestratorId " + orchestratorId + ",orcVersionId:" + orcVersionId);
         try {
-            res = orchestratorContext.getDSSOrchestratorPlugin(ExportDSSOrchestratorPlugin.class).exportOrchestrator(userName,
+            res = orchestratorContext.getDSSOrchestratorPlugin(ExportDSSOrchestratorPlugin.class).exportOrchestratorNew(userName,
                     orchestratorId, orcVersionId, projectName, dssLabelList, addOrcVersion, workspace).getBmlResource();
             AuditLogUtils.printLog(userName, workspace.getWorkspaceId(), workspace.getWorkspaceName(), TargetTypeEnum.ORCHESTRATOR,
                     orcVersionId, orchestratorVo.getDssOrchestratorInfo().getName(), OperateTypeEnum.UPDATE, orchestratorVo);
diff --git a/dss-framework/dss-framework-orchestrator-server/src/main/scala/com/webank/wedatasphere/dss/orchestrator/server/receiver/DSSOrchestratorReceiver.scala b/dss-framework/dss-framework-orchestrator-server/src/main/scala/com/webank/wedatasphere/dss/orchestrator/server/receiver/DSSOrchestratorReceiver.scala
index 25add1c6e..6044b61da 100644
--- a/dss-framework/dss-framework-orchestrator-server/src/main/scala/com/webank/wedatasphere/dss/orchestrator/server/receiver/DSSOrchestratorReceiver.scala
+++ b/dss-framework/dss-framework-orchestrator-server/src/main/scala/com/webank/wedatasphere/dss/orchestrator/server/receiver/DSSOrchestratorReceiver.scala
@@ -40,7 +40,7 @@ class DSSOrchestratorReceiver(orchestratorService: OrchestratorService, orchestr
   override def receiveAndReply(message: Any, sender: Sender): Any = message match {
 
     case reqExportOrchestrator: RequestExportOrchestrator =>
-      val dssExportOrcResource: OrchestratorExportResult = orchestratorContext.getDSSOrchestratorPlugin(classOf[ExportDSSOrchestratorPlugin]).exportOrchestrator(
+      val dssExportOrcResource: OrchestratorExportResult = orchestratorContext.getDSSOrchestratorPlugin(classOf[ExportDSSOrchestratorPlugin]).exportOrchestratorNew(
         reqExportOrchestrator.getUserName,
         reqExportOrchestrator.getOrchestratorId,
         reqExportOrchestrator.getOrcVersionId,
@@ -53,7 +53,7 @@ class DSSOrchestratorReceiver(orchestratorService: OrchestratorService, orchestr
       )
 
     case requestImportOrchestrator: RequestImportOrchestrator =>
-      val dssOrchestratorVersion = orchestratorContext.getDSSOrchestratorPlugin(classOf[ImportDSSOrchestratorPlugin]).importOrchestrator(requestImportOrchestrator)
+      val dssOrchestratorVersion = orchestratorContext.getDSSOrchestratorPlugin(classOf[ImportDSSOrchestratorPlugin]).importOrchestratorNew(requestImportOrchestrator)
       ResponseImportOrchestrator(dssOrchestratorVersion.getOrchestratorId,dssOrchestratorVersion.getVersion)
 
     case addVersionAfterPublish: RequestAddVersionAfterPublish =>
diff --git a/dss-framework/framework-plugins/dss-framework-orchestrator-publish/src/main/java/com/webank/wedatasphere/dss/orchestrator/publish/ExportDSSOrchestratorPlugin.java b/dss-framework/framework-plugins/dss-framework-orchestrator-publish/src/main/java/com/webank/wedatasphere/dss/orchestrator/publish/ExportDSSOrchestratorPlugin.java
index d2130b45f..ebe3bb967 100644
--- a/dss-framework/framework-plugins/dss-framework-orchestrator-publish/src/main/java/com/webank/wedatasphere/dss/orchestrator/publish/ExportDSSOrchestratorPlugin.java
+++ b/dss-framework/framework-plugins/dss-framework-orchestrator-publish/src/main/java/com/webank/wedatasphere/dss/orchestrator/publish/ExportDSSOrchestratorPlugin.java
@@ -39,6 +39,19 @@ OrchestratorExportResult exportOrchestrator(String userName,
                                                 String projectName,
                                                 List<DSSLabel> dssLabels,
                                                 boolean addOrcVersion, Workspace workspace) throws DSSErrorException;
+
+    /**
+     * 导出Orchestrator基本信息和工作流，并放到BML中。
+     * 注意：导入导出接口只适合于不同环境下，先从A环境导出工作流，再导入到B环境的情况。
+     * 不适合用于在同一环境下的复制。同一环境的复制操作需使用copyOperation。
+     * @param addOrcVersion 导出之后，是否要升级一个版本
+     */
+    OrchestratorExportResult exportOrchestratorNew(String userName,
+                                                Long orchestratorId,
+                                                Long orcVersionId,
+                                                String projectName,
+                                                List<DSSLabel> dssLabels,
+                                                boolean addOrcVersion, Workspace workspace) throws DSSErrorException;
     Long orchestratorVersionIncrease(Long orcId,
                                      String userName,
                                      String comment,
diff --git a/dss-framework/framework-plugins/dss-framework-orchestrator-publish/src/main/java/com/webank/wedatasphere/dss/orchestrator/publish/ImportDSSOrchestratorPlugin.java b/dss-framework/framework-plugins/dss-framework-orchestrator-publish/src/main/java/com/webank/wedatasphere/dss/orchestrator/publish/ImportDSSOrchestratorPlugin.java
index bb09a55cf..455fbc7dd 100644
--- a/dss-framework/framework-plugins/dss-framework-orchestrator-publish/src/main/java/com/webank/wedatasphere/dss/orchestrator/publish/ImportDSSOrchestratorPlugin.java
+++ b/dss-framework/framework-plugins/dss-framework-orchestrator-publish/src/main/java/com/webank/wedatasphere/dss/orchestrator/publish/ImportDSSOrchestratorPlugin.java
@@ -28,6 +28,17 @@
 
 
 public interface ImportDSSOrchestratorPlugin extends DSSOrchestratorPlugin {
+    /**
+     * 导入Orchestrator
+     * 注意：导入导出接口只适合于不同环境下，先从A环境导出工作流，再导入到B环境的情况。
+     * 不适合用于在同一环境下的复制。同一环境的复制操作需使用copyOperation。
+     * @param requestImportOrchestrator
+     * @return
+     * @throws DSSErrorException
+     * @throws IOException
+     * @throws ExternalOperationFailedException
+     */
+    DSSOrchestratorVersion importOrchestratorNew(RequestImportOrchestrator requestImportOrchestrator) throws Exception;
 
     /**
      * 导入Orchestrator
diff --git a/dss-framework/framework-plugins/dss-framework-orchestrator-publish/src/main/java/com/webank/wedatasphere/dss/orchestrator/publish/impl/ExportDSSOrchestratorPluginImpl.java b/dss-framework/framework-plugins/dss-framework-orchestrator-publish/src/main/java/com/webank/wedatasphere/dss/orchestrator/publish/impl/ExportDSSOrchestratorPluginImpl.java
index de33c0cdc..ba3eeebad 100644
--- a/dss-framework/framework-plugins/dss-framework-orchestrator-publish/src/main/java/com/webank/wedatasphere/dss/orchestrator/publish/impl/ExportDSSOrchestratorPluginImpl.java
+++ b/dss-framework/framework-plugins/dss-framework-orchestrator-publish/src/main/java/com/webank/wedatasphere/dss/orchestrator/publish/impl/ExportDSSOrchestratorPluginImpl.java
@@ -64,6 +64,7 @@
 import java.util.function.BiFunction;
 import java.util.function.Consumer;
 
+import static com.webank.wedatasphere.dss.common.utils.ZipHelper.unzip;
 import static com.webank.wedatasphere.dss.common.utils.ZipHelper.zip;
 
 
@@ -87,6 +88,88 @@ public class ExportDSSOrchestratorPluginImpl extends AbstractDSSOrchestratorPlug
     @Autowired
     AddOrchestratorVersionHook addOrchestratorVersionHook;
 
+    @Override
+    public OrchestratorExportResult exportOrchestratorNew(String userName, Long orchestratorId, Long orcVersionId, String projectName,
+                                                          List<DSSLabel> dssLabels, boolean addOrcVersion, Workspace workspace) throws DSSErrorException {
+        //1、导出info信息
+        if (orcVersionId == null || orcVersionId < 0){
+            LOGGER.info("orchestratorVersionId is {}.", orcVersionId);
+            //最简单的就是通过orcId来找到最新的versionId
+            orcVersionId = orchestratorMapper.findLatestOrcVersionId(orchestratorId);
+        }
+        DSSOrchestratorVersion dssOrchestratorVersion = orchestratorMapper.getOrchestratorVersion(orcVersionId);
+        DSSOrchestratorInfo dssOrchestratorInfo = orchestratorMapper.getOrchestrator(dssOrchestratorVersion.getOrchestratorId());
+        String orcName = dssOrchestratorInfo.getName();
+        if (dssOrchestratorInfo != null) {
+
+            LOGGER.info("{} 开始导出Orchestrator: {} 版本ID为: {}.", userName, dssOrchestratorInfo.getName(), orcVersionId);
+
+            //2、导出第三方应用信息，如工作流、Visualis、Qualitis
+            DSSOrchestrator dssOrchestrator = orchestratorManager.getOrCreateOrchestrator(userName, workspace.getWorkspaceName(), dssOrchestratorInfo.getType(),
+                    dssLabels);
+            //定义操作结果处理器
+            BiFunction<DevelopmentOperation, DevelopmentRequestRef, ExportResponseRef> responseRefConsumer = (developmentOperation, developmentRequestRef) -> {
+                RefJobContentRequestRef requestRef = (RefJobContentRequestRef) developmentRequestRef;
+                requestRef.setRefJobContent(MapUtils.newCommonMap(OrchestratorRefConstant.ORCHESTRATION_ID_KEY, dssOrchestratorVersion.getAppId()));
+                return ((RefExportOperation) developmentOperation).exportRef(requestRef);
+            };
+            //定义项目相关的处理器，处着编排的RequestRef的项目相关信息
+            Consumer<ProjectRefRequestRef> projectRefRequestRefConsumer = projectRefRequestRef -> projectRefRequestRef.setProjectName(projectName).setRefProjectId(dssOrchestratorVersion.getProjectId());
+
+            ExportResponseRef responseRef = OrchestrationDevelopmentOperationUtils.tryOrchestrationOperation(
+                    dssOrchestratorInfo,
+                    dssOrchestrator,
+                    userName,
+                    workspace,
+                    dssLabels,
+                    //指明DevelopmentService是RefExportService
+                    DevelopmentIntegrationStandard::getRefExportService,
+                    //指明operation是ExportOperation
+                    developmentService -> ((RefExportService) developmentService).getRefExportOperation(),
+                    null,
+                    projectRefRequestRefConsumer,
+                    responseRefConsumer,
+                    "export");
+            // /appcom/tmp/dss/yyyyMMddHHmmssSSS/arionliu
+            String tmpPath = IoUtils.generateTempIOPath(userName);
+            // /appcom/tmp/dss/yyyyMMddHHmmssSSS/arionliu/projectxxx.zip
+            String flowZipPath = IoUtils.addFileSeparator(tmpPath, projectName + ".zip");
+
+            String resourceId = (String) responseRef.getResourceMap().get(ImportRequestRef.RESOURCE_ID_KEY);
+            String version = (String) responseRef.getResourceMap().get(ImportRequestRef.RESOURCE_VERSION_KEY);
+            bmlService.downloadToLocalPath(userName, resourceId, version, flowZipPath);
+            // /appcom/tmp/dss/yyyyMMddHHmmssSSS/arionliu/projectxxx
+            String projectPath = unzip(flowZipPath,true);
+            // /appcom/tmp/dss/yyyyMMddHHmmssSSS/arionliu/projectxxx/.flowmeta/flow_all_type_node/
+            String flowMetaPath = IoUtils.generateFlowMetaIOPath(projectPath, orcName);
+
+            try {
+                metaExportService.exportNew(dssOrchestratorInfo, flowMetaPath);
+            } catch (IOException e) {
+                LOGGER.error("Failed to export metaInfo in orchestrator server for orc({}) in version {}.", orchestratorId, orcVersionId, e);
+                DSSExceptionUtils.dealErrorException(60099, "Failed to export metaInfo in orchestrator server.", e, DSSOrchestratorErrorException.class);
+            }
+
+            //打包导出工程
+            String exportPath = zip(projectPath);
+
+            //3、打包新的zip包上传BML
+            InputStream inputStream = bmlService.readLocalResourceFile(userName, exportPath);
+            BmlResource uploadResult = bmlService.upload(userName, inputStream,
+                    dssOrchestratorInfo.getName() + ".OrcExport", projectName);
+
+            //4、判断导出后是否改变Orc的版本
+            if (addOrcVersion) {
+                orcVersionId = orchestratorVersionIncrease(dssOrchestratorInfo.getId(),
+                        userName, dssOrchestratorInfo.getComment(),
+                        workspace, dssOrchestratorInfo, projectName, dssLabels);
+            }
+            return new OrchestratorExportResult(uploadResult,String.valueOf(orcVersionId));
+            //4、返回BML存储信息
+        } else {
+            throw new DSSErrorException(90038, "该Orchestrator的版本号不存在，请检查版本号是否正确.");
+        }
+    }
     @Override
     public OrchestratorExportResult exportOrchestrator(String userName, Long orchestratorId, Long orcVersionId, String projectName,
                                                        List<DSSLabel> dssLabels, boolean addOrcVersion, Workspace workspace) throws DSSErrorException {
@@ -99,6 +182,7 @@ public OrchestratorExportResult exportOrchestrator(String userName, Long orchest
         DSSOrchestratorVersion dssOrchestratorVersion = orchestratorMapper.getOrchestratorVersion(orcVersionId);
         DSSOrchestratorInfo dssOrchestratorInfo = orchestratorMapper.getOrchestrator(dssOrchestratorVersion.getOrchestratorId());
         if (dssOrchestratorInfo != null) {
+            // /appcom/tmp/dss/yyyyMMddHHmmssSSS/arionliu/default_orc/
             String orcExportSaveBasePath = IoUtils.generateIOPath(userName, DEFAULT_ORC_NAME, "");
             try {
                 Files.createDirectories(Paths.get(orcExportSaveBasePath).toAbsolutePath().normalize());
diff --git a/dss-framework/framework-plugins/dss-framework-orchestrator-publish/src/main/java/com/webank/wedatasphere/dss/orchestrator/publish/impl/ImportDSSOrchestratorPluginImpl.java b/dss-framework/framework-plugins/dss-framework-orchestrator-publish/src/main/java/com/webank/wedatasphere/dss/orchestrator/publish/impl/ImportDSSOrchestratorPluginImpl.java
index 8531c8312..1551327d0 100644
--- a/dss-framework/framework-plugins/dss-framework-orchestrator-publish/src/main/java/com/webank/wedatasphere/dss/orchestrator/publish/impl/ImportDSSOrchestratorPluginImpl.java
+++ b/dss-framework/framework-plugins/dss-framework-orchestrator-publish/src/main/java/com/webank/wedatasphere/dss/orchestrator/publish/impl/ImportDSSOrchestratorPluginImpl.java
@@ -18,6 +18,7 @@
 
 import com.webank.wedatasphere.dss.common.entity.BmlResource;
 import com.webank.wedatasphere.dss.common.exception.DSSErrorException;
+import com.webank.wedatasphere.dss.common.exception.DSSRuntimeException;
 import com.webank.wedatasphere.dss.common.label.DSSLabel;
 import com.webank.wedatasphere.dss.common.label.DSSLabelUtil;
 import com.webank.wedatasphere.dss.common.utils.*;
@@ -55,6 +56,7 @@
 import java.util.List;
 import java.util.UUID;
 
+import static com.webank.wedatasphere.dss.common.utils.IoUtils.FLOW_META_DIRECTORY_NAME;
 import static com.webank.wedatasphere.dss.orchestrator.publish.impl.ExportDSSOrchestratorPluginImpl.DEFAULT_ORC_NAME;
 
 
@@ -80,6 +82,141 @@ public class ImportDSSOrchestratorPluginImpl extends AbstractDSSOrchestratorPlug
     @Autowired
     private AddOrchestratorVersionHook addOrchestratorVersionHook;
 
+    @Override
+    public DSSOrchestratorVersion importOrchestratorNew(RequestImportOrchestrator requestImportOrchestrator) throws Exception {
+        String userName = requestImportOrchestrator.getUserName();
+        String projectName = requestImportOrchestrator.getProjectName();
+        Long projectId = requestImportOrchestrator.getProjectId();
+        String resourceId = requestImportOrchestrator.getResourceId();
+        String version = requestImportOrchestrator.getBmlVersion();
+        List<DSSLabel> dssLabels = requestImportOrchestrator.getDssLabels();
+        Workspace workspace = requestImportOrchestrator.getWorkspace();
+
+        //1、下载BML的Orchestrator的导入包
+        // /appcom/tmp/dss/yyyyMMddHHmmssSSS/arionliu
+        String tempPath = IoUtils.generateTempIOPath(userName);
+        // /appcom/tmp/dss/yyyyMMddHHmmssSSS/arionliu/projectxxx.zip
+        String inputZipPath = IoUtils.addFileSeparator(tempPath, projectName + ".zip");
+        bmlService.downloadToLocalPath(userName, resourceId, version, inputZipPath);
+        // /appcom/tmp/dss/yyyyMMddHHmmssSSS/arionliu/projectxxx
+        String projectPath = ZipHelper.unzip(inputZipPath,true);
+        String flowName = IoUtils.getSubdirectoriesNames(projectPath).stream().filter(name -> !name.startsWith("."))
+                .findFirst().orElseThrow(() -> new DSSRuntimeException("import package has no flow（未导入任何工作流，请检查导入包格式）"));
+        String flowMetaPath = IoUtils.addFileSeparator(projectPath, FLOW_META_DIRECTORY_NAME, flowName);
+
+        //2、导入Info信息(导入冲突处理)
+        DSSOrchestratorInfo importDssOrchestratorInfo = metaInputService.importOrchestratorNew(flowMetaPath);
+        importDssOrchestratorInfo.setProjectId(projectId);
+        //复制工程，直接使用新的UUID和复制后的工程ID
+        if (requestImportOrchestrator.getCopyProjectId() != null
+                && StringUtils.isNotBlank(requestImportOrchestrator.getCopyProjectName())) {
+            projectId = requestImportOrchestrator.getCopyProjectId();
+            importDssOrchestratorInfo.setProjectId(projectId);
+            importDssOrchestratorInfo.setUUID(UUID.randomUUID().toString());
+        }
+        //根据工程ID和编排名称查询
+        String uuid = orchestratorMapper.getOrcNameByParam(importDssOrchestratorInfo.getProjectId(), importDssOrchestratorInfo.getName());
+        //通过UUID查找是否已经导入过
+        DSSOrchestratorInfo existFlag = orchestratorMapper.getOrchestratorByUUID(importDssOrchestratorInfo.getUUID());
+        //add 和update都需要更新成当前环境id信息，放到新的版本记录中
+        //todo 跨环境必须保证工程ID一样，或者需要更新导入包中的所有工程ID为当前最新ID,不一致的话关系到上下文、第三方工程的映射问题
+        if (null != existFlag) {
+            //判断是否存在相同名称的编排
+            if (StringUtils.isNotBlank(uuid) && !uuid.equals(importDssOrchestratorInfo.getUUID())) {
+                DSSExceptionUtils
+                        .dealErrorException(61002, "The same orchestration name already exists", DSSErrorException.class);
+            }
+            importDssOrchestratorInfo.setId(existFlag.getId());
+        } else {
+            //判断是否存在相同名称的编排
+            if (StringUtils.isNotBlank(uuid)) {
+                DSSExceptionUtils
+                        .dealErrorException(61002, "The same orchestration name already exists", DSSErrorException.class);
+            }
+            //使用生产环境的id
+            importDssOrchestratorInfo.setId(null);
+            importDssOrchestratorInfo.setCreator(userName);
+            importDssOrchestratorInfo.setCreateTime(new Date());
+            //兼容
+            if (importDssOrchestratorInfo.getWorkspaceId() == null) {
+                importDssOrchestratorInfo.setWorkspaceId(workspace.getWorkspaceId());
+            }
+            if (StringUtils.isEmpty(importDssOrchestratorInfo.getOrchestratorMode())) {
+                importDssOrchestratorInfo.setOrchestratorMode("pom_work_flow");
+            }
+            if (StringUtils.isEmpty(importDssOrchestratorInfo.getOrchestratorWay())) {
+                importDssOrchestratorInfo.setOrchestratorWay(",pom_work_flow_DAG,");
+            }
+        }
+
+        //4、导入版本Version信息
+        DSSOrchestratorVersion dssOrchestratorVersion = new DSSOrchestratorVersion();
+        dssOrchestratorVersion.setAppId(null);
+        dssOrchestratorVersion.setComment("orchestrator import");
+        dssOrchestratorVersion.setOrchestratorId(importDssOrchestratorInfo.getId());
+        dssOrchestratorVersion.setContent("");
+        dssOrchestratorVersion.setProjectId(projectId);
+        dssOrchestratorVersion.setSource("Orchestrator create");
+        dssOrchestratorVersion.setUpdater(userName);
+        //生产导入：默认是为无效，除非开启直接有效（在生成环境独立部署的时候，导入和发布是分开的）；开发环境为有效
+        int valid = DSSOrchestratorConf.DSS_IMPORT_VALID_IMMEDIATELY.getValue() || DSSLabelUtil.isDevEnv(dssLabels) ? 1 : 0;
+        dssOrchestratorVersion.setValidFlag(valid);
+
+        DSSOrchestratorVersion oldVersion  = orchestratorMapper.getLatestOrchestratorVersionByIdAndValidFlag(importDssOrchestratorInfo.getId(), 1);
+        if (oldVersion!=null) {
+            dssOrchestratorVersion.setVersion(OrchestratorUtils.increaseVersion(oldVersion.getVersion()));
+        } else {
+            dssOrchestratorVersion.setVersion(OrchestratorUtils.generateNewVersion());
+        }
+
+        //5、生成上下文ContextId
+        String contextId = contextService.createContextID(workspace.getWorkspaceName(), projectName, importDssOrchestratorInfo.getName(), dssOrchestratorVersion.getVersion(), userName);
+        dssOrchestratorVersion.setFormatContextId(contextId);
+        LOGGER.info("Create a new ContextId for import: {} ", contextId);
+
+        //6、导入第三方应用信息，如工作流、Visualis、Qualities
+        DSSOrchestrator dssOrchestrator = orchestratorManager.getOrCreateOrchestrator(userName,
+                workspace.getWorkspaceName(), importDssOrchestratorInfo.getType(), dssLabels);
+        Long finalProjectId = projectId;
+        RefJobContentResponseRef responseRef = OrchestrationDevelopmentOperationUtils.tryOrchestrationOperation(importDssOrchestratorInfo,
+                dssOrchestrator, userName, workspace, dssLabels,
+                DevelopmentIntegrationStandard::getRefImportService,
+                developmentService -> ((RefImportService) developmentService).getRefImportOperation(),
+                dssContextRequestRef -> dssContextRequestRef.setContextId(contextId),
+                projectRefRequestRef -> projectRefRequestRef.setRefProjectId(finalProjectId).setProjectName(projectName),
+                (developmentOperation, developmentRequestRef) -> {
+                    ImportRequestRef requestRef = (ImportRequestRef) developmentRequestRef;
+                    requestRef.setResourceMap(MapUtils.newCommonMap(ImportRequestRef.RESOURCE_ID_KEY, resourceId, ImportRequestRef.RESOURCE_VERSION_KEY, version));
+                    requestRef.setNewVersion(dssOrchestratorVersion.getVersion());
+                    return ((RefImportOperation) developmentOperation).importRef(requestRef);
+                }, "import");
+        long orchestrationId = (Long) responseRef.getRefJobContent().get(OrchestratorRefConstant.ORCHESTRATION_ID_KEY);
+        String orchestrationContent = (String) responseRef.getRefJobContent().get(OrchestratorRefConstant.ORCHESTRATION_CONTENT_KEY);
+        List<String[]> paramConfTemplateIds =  (List<String[]>) responseRef.getRefJobContent().get(OrchestratorRefConstant.ORCHESTRATION_FLOWID_PARAMCONF_TEMPLATEID_TUPLES_KEY);
+        if(null  != existFlag){
+            if(oldVersion!=null) {
+                //如果生产中心的所有orc版本的valid_flag都是0（之前的所有发布都在convert期间失败了），那么oldVersion是为空的。
+                addOrchestratorVersionHook.beforeAdd(oldVersion, Collections.emptyMap());
+            }
+            //如果Orchestrator已经导入过，目前只更新版本信息，并更新基础信息name,其它信息不修改。
+            orchestratorMapper.updateOrchestrator(importDssOrchestratorInfo);
+        }else{
+            orchestratorMapper.addOrchestrator(importDssOrchestratorInfo);
+        }
+
+        //更新返回內容
+        dssOrchestratorVersion.setUpdateTime(new Date());
+        dssOrchestratorVersion.setAppId(orchestrationId);
+        dssOrchestratorVersion.setContent(orchestrationContent);
+        dssOrchestratorVersion.setOrchestratorId(importDssOrchestratorInfo.getId());
+
+        orchestratorMapper.addOrchestratorVersion(dssOrchestratorVersion);
+        addOrchestratorVersionHook.afterAdd(dssOrchestratorVersion, Collections.singletonMap(OrchestratorRefConstant.ORCHESTRATION_FLOWID_PARAMCONF_TEMPLATEID_TUPLES_KEY,paramConfTemplateIds));
+        LOGGER.info("import orchestrator success,orcId:{},appId:{}",importDssOrchestratorInfo.getId(),orchestrationId);
+
+        return dssOrchestratorVersion;
+    }
+
     @Override
     public DSSOrchestratorVersion importOrchestrator(RequestImportOrchestrator requestImportOrchestrator) throws Exception {
         String userName = requestImportOrchestrator.getUserName();
diff --git a/dss-framework/framework-plugins/dss-framework-orchestrator-publish/src/main/java/com/webank/wedatasphere/dss/orchestrator/publish/io/export/MetaExportService.java b/dss-framework/framework-plugins/dss-framework-orchestrator-publish/src/main/java/com/webank/wedatasphere/dss/orchestrator/publish/io/export/MetaExportService.java
index 01afcd2b8..4a34b276d 100644
--- a/dss-framework/framework-plugins/dss-framework-orchestrator-publish/src/main/java/com/webank/wedatasphere/dss/orchestrator/publish/io/export/MetaExportService.java
+++ b/dss-framework/framework-plugins/dss-framework-orchestrator-publish/src/main/java/com/webank/wedatasphere/dss/orchestrator/publish/io/export/MetaExportService.java
@@ -35,6 +35,7 @@ public interface MetaExportService {
      * @throws IOException
      */
     void export(DSSOrchestratorInfo dssOrchestratorInfo, String savePath) throws IOException;
+    void exportNew(DSSOrchestratorInfo dssOrchestratorInfo, String savePath) throws IOException;
 
     void exportFlowBaseInfo(List<DSSFlow> allDSSFlows, List<DSSFlowRelation> allFlowRelations, String savePath) throws IOException;
 
diff --git a/dss-framework/framework-plugins/dss-framework-orchestrator-publish/src/main/java/com/webank/wedatasphere/dss/orchestrator/publish/io/export/impl/MetaExportServiceImpl.java b/dss-framework/framework-plugins/dss-framework-orchestrator-publish/src/main/java/com/webank/wedatasphere/dss/orchestrator/publish/io/export/impl/MetaExportServiceImpl.java
index fc6d20153..4f0092ca0 100644
--- a/dss-framework/framework-plugins/dss-framework-orchestrator-publish/src/main/java/com/webank/wedatasphere/dss/orchestrator/publish/io/export/impl/MetaExportServiceImpl.java
+++ b/dss-framework/framework-plugins/dss-framework-orchestrator-publish/src/main/java/com/webank/wedatasphere/dss/orchestrator/publish/io/export/impl/MetaExportServiceImpl.java
@@ -17,6 +17,9 @@
 package com.webank.wedatasphere.dss.orchestrator.publish.io.export.impl;
 
 
+import com.google.gson.Gson;
+import com.google.gson.JsonObject;
+import com.google.gson.JsonParser;
 import com.webank.wedatasphere.dss.common.utils.IoUtils;
 import com.webank.wedatasphere.dss.orchestrator.common.entity.DSSOrchestratorInfo;
 import com.webank.wedatasphere.dss.orchestrator.publish.io.export.MetaExportService;
@@ -33,12 +36,42 @@
 @Service("orcMetaExportService")
 public class MetaExportServiceImpl implements MetaExportService {
 
+    public static final String ORCHESTRATOR_META_KEY = "dss_orchestrator";
+    public static final String FLOW_META_FILE_NAME = ".flowmeta";
     private Logger logger = LoggerFactory.getLogger(this.getClass());
-
-
     private final String fileName = "meta.txt";
 
 
+    @Override
+    public void exportNew(DSSOrchestratorInfo dssOrchestratorInfo, String flowMetaPath) throws IOException {
+        File flowMetaFile = new File(flowMetaPath + File.separator + FLOW_META_FILE_NAME);
+        Gson gson = new Gson();
+
+        if (flowMetaFile.exists()) {
+            // 初始化JsonObject为null
+            JsonObject jsonObject = null;
+            // 先读取现有内容
+            try (FileReader reader = new FileReader(flowMetaFile)) {
+                jsonObject = new JsonParser().parse(reader).getAsJsonObject();
+            } // try-with-resources会自动关闭reader
+            // 更新JsonObject
+            if (jsonObject != null) {
+                jsonObject.add(ORCHESTRATOR_META_KEY, gson.toJsonTree(dssOrchestratorInfo));
+            }
+
+            // 写回修改后的内容
+            try (FileWriter writer = new FileWriter(flowMetaFile)) {
+                gson.toJson(jsonObject, writer);
+            } // try-with-resources会自动关闭writer
+
+            System.out.println("JSON文件已更新并保存。");
+        } else {
+            // 文件不存在，直接创建并写入orchestratorInfo信息
+            try (FileWriter writer = new FileWriter(flowMetaFile)) {
+                gson.toJson(dssOrchestratorInfo, writer);
+            } // try-with-resources会自动关闭writer
+        }
+    }
     @Override
     public void export(DSSOrchestratorInfo dssOrchestratorInfo, String savePath) throws IOException {
 
diff --git a/dss-framework/framework-plugins/dss-framework-orchestrator-publish/src/main/java/com/webank/wedatasphere/dss/orchestrator/publish/io/input/MetaInputService.java b/dss-framework/framework-plugins/dss-framework-orchestrator-publish/src/main/java/com/webank/wedatasphere/dss/orchestrator/publish/io/input/MetaInputService.java
index a672c6c4f..f8b66af03 100644
--- a/dss-framework/framework-plugins/dss-framework-orchestrator-publish/src/main/java/com/webank/wedatasphere/dss/orchestrator/publish/io/input/MetaInputService.java
+++ b/dss-framework/framework-plugins/dss-framework-orchestrator-publish/src/main/java/com/webank/wedatasphere/dss/orchestrator/publish/io/input/MetaInputService.java
@@ -32,6 +32,7 @@ public interface MetaInputService {
 
 
     List<DSSOrchestratorInfo> importOrchestrator(String basePath) throws IOException;
+    DSSOrchestratorInfo importOrchestratorNew(String flowMetaPath) throws IOException;
 
     List<DSSFlow> inputFlow(String basePath) throws IOException;
 
diff --git a/dss-framework/framework-plugins/dss-framework-orchestrator-publish/src/main/java/com/webank/wedatasphere/dss/orchestrator/publish/io/input/impl/MetaInputServiceImpl.java b/dss-framework/framework-plugins/dss-framework-orchestrator-publish/src/main/java/com/webank/wedatasphere/dss/orchestrator/publish/io/input/impl/MetaInputServiceImpl.java
index 2691959d8..124b00561 100644
--- a/dss-framework/framework-plugins/dss-framework-orchestrator-publish/src/main/java/com/webank/wedatasphere/dss/orchestrator/publish/io/input/impl/MetaInputServiceImpl.java
+++ b/dss-framework/framework-plugins/dss-framework-orchestrator-publish/src/main/java/com/webank/wedatasphere/dss/orchestrator/publish/io/input/impl/MetaInputServiceImpl.java
@@ -17,6 +17,9 @@
 package com.webank.wedatasphere.dss.orchestrator.publish.io.input.impl;
 
 
+import com.google.gson.Gson;
+import com.google.gson.JsonObject;
+import com.google.gson.JsonParser;
 import com.webank.wedatasphere.dss.common.utils.IoUtils;
 import com.webank.wedatasphere.dss.orchestrator.common.entity.DSSOrchestratorInfo;
 import com.webank.wedatasphere.dss.orchestrator.publish.io.input.MetaInputService;
@@ -26,12 +29,11 @@
 import com.webank.wedatasphere.dss.workflow.common.entity.DSSFlowRelation;
 import org.springframework.stereotype.Service;
 
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.InputStream;
+import java.io.*;
 import java.util.List;
 
+import static com.webank.wedatasphere.dss.orchestrator.publish.io.export.impl.MetaExportServiceImpl.*;
+
 
 @Service("orcMetaInputService")
 public class MetaInputServiceImpl implements MetaInputService {
@@ -40,6 +42,16 @@ public class MetaInputServiceImpl implements MetaInputService {
 
     private final String fileName = "meta.txt";
 
+    @Override
+    public DSSOrchestratorInfo importOrchestratorNew( String flowMetaPath) throws IOException {
+        File flowMetaFile = new File(flowMetaPath + File.separator + FLOW_META_FILE_NAME);
+        JsonParser jsonParser = new JsonParser();
+        Gson gson = new Gson();
+        try (FileReader reader = new FileReader(flowMetaFile)) {
+            JsonObject jsonObject = jsonParser.parse(reader).getAsJsonObject();
+            return gson.fromJson(jsonObject.get(ORCHESTRATOR_META_KEY), DSSOrchestratorInfo.class);
+        }
+    }
     @Override
     public List<DSSOrchestratorInfo> importOrchestrator(String basePath) throws IOException {
         try (InputStream inputStream = generateInputstream(basePath)) {
diff --git a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-common/src/main/java/com/webank/wedatasphere/dss/workflow/common/parser/NodeParser.java b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-common/src/main/java/com/webank/wedatasphere/dss/workflow/common/parser/NodeParser.java
index 53721e040..3745b9839 100644
--- a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-common/src/main/java/com/webank/wedatasphere/dss/workflow/common/parser/NodeParser.java
+++ b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-common/src/main/java/com/webank/wedatasphere/dss/workflow/common/parser/NodeParser.java
@@ -30,4 +30,6 @@ public interface NodeParser {
     String updateSubFlowID(String nodeJson, long subflowId) throws IOException;
     String getNodeValue(String key, String nodeJson) throws IOException;
     List<Resource> getNodeResource(String nodeJson);
+
+    Map<String, Object> getNodeJobContent(String nodeJson) throws IOException;
 }
diff --git a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/DefaultWorkFlowManager.java b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/DefaultWorkFlowManager.java
index 29b649069..0629e3444 100644
--- a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/DefaultWorkFlowManager.java
+++ b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/DefaultWorkFlowManager.java
@@ -77,6 +77,7 @@
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipFile;
 
+import static com.webank.wedatasphere.dss.common.utils.IoUtils.FLOW_META_DIRECTORY_NAME;
 import static com.webank.wedatasphere.dss.workflow.constant.DSSWorkFlowConstant.DEFAULT_SCHEDULER_APP_CONN;
 
 @Component
@@ -200,7 +201,17 @@ public ResponseUnlockWorkflow unlockWorkflow(String userName, Long flowId, Boole
         DSSFlowEditLockManager.deleteLock(editLock.getLockContent());
         return new ResponseUnlockWorkflow(ResponseUnlockWorkflow.UNLOCK_SUCCESS, null);
     }
-
+    @Override
+    public BmlResource exportWorkflowNew(String userName, Long flowId, Long dssProjectId,
+                                         String projectName, Workspace workspace,
+                                         List<DSSLabel> dssLabels) throws Exception {
+        DSSFlow dssFlow = flowService.getFlowByID(flowId);
+        String exportPath = workFlowExportService.exportFlowInfoNew(dssProjectId, projectName, flowId, userName, workspace, dssLabels);
+        InputStream inputStream = bmlService.readLocalResourceFile(userName, exportPath);
+        BmlResource bmlResource = bmlService.upload(userName, inputStream, dssFlow.getName() + ".export", projectName);
+        logger.info("export workflow success.  flowId:{},bmlResource:{} .",flowId,bmlResource);
+        return  bmlResource;
+    }
     @Override
     public BmlResource exportWorkflow(String userName, Long flowId, Long dssProjectId,
                                       String projectName, Workspace workspace,
@@ -212,6 +223,59 @@ public BmlResource exportWorkflow(String userName, Long flowId, Long dssProjectI
         logger.info("export workflow success. flowId:{},bmlResource:{} .",flowId,bmlResource);
         return bmlResource;
     }
+    @Override
+    public List<DSSFlow> importWorkflowNew(String userName,
+                                           String resourceId,
+                                           String bmlVersion,
+                                           DSSFlowImportParam dssFlowImportParam,
+                                           List<DSSLabel> dssLabels) throws DSSErrorException, IOException {
+
+        //todo download workflow bml file contains flowInfo and flowRelationInfo
+        String projectName = dssFlowImportParam.getProjectName();
+        // /appcom/tmp/dss/yyyyMMddHHmmssSSS/arionliu
+        String tempPath = IoUtils.generateTempIOPath(userName);
+        // /appcom/tmp/dss/yyyyMMddHHmmssSSS/arionliu/projectxxx.zip
+        String inputZipPath = IoUtils.addFileSeparator(tempPath, projectName + ".zip");
+        bmlService.downloadToLocalPath(userName, resourceId, bmlVersion, inputZipPath);
+        try{
+            String  originProjectName=readImportZipProjectName(inputZipPath);
+            if(!projectName.equals(originProjectName)){
+                String msg=String.format("target project name must be same with origin project name.origin project name:%s,target project name:%s(导入的目标工程名必须与导出时源工程名保持一致。源工程名：%s，目标工程名：%s)"
+                        ,originProjectName,projectName,originProjectName,projectName);
+                throw new DSSRuntimeException(msg);
+            }
+        }catch (IOException e){
+            throw new DSSRuntimeException("upload file format error(导入包格式错误)");
+        }
+        String projectPath = ZipHelper.unzip(inputZipPath,true);
+        String flowName = IoUtils.getSubdirectoriesNames(projectPath).stream().filter(name -> !name.startsWith("."))
+                .findFirst().orElseThrow(() -> new DSSRuntimeException("import package has no flow（未导入任何工作流，请检查导入包格式）"));
+        String flowMetaPath=IoUtils.addFileSeparator(projectPath, FLOW_META_DIRECTORY_NAME, flowName);
+        ImmutablePair<List<DSSFlow>,List<DSSFlowRelation>> meta= metaInputService.inputFlowNew(flowMetaPath);
+        //导入工作流数据库信息
+        List<DSSFlow> dssFlows = meta.getKey();
+        //导入工作流关系信息
+        List<DSSFlowRelation> dwsFlowRelations = meta.getValue();
+
+        List<DSSFlow> dwsFlowRelationList = workFlowInputService.persistenceFlow(dssFlowImportParam.getProjectID(),
+                dssFlowImportParam.getUserName(),
+                dssFlows,
+                dwsFlowRelations);
+        //这里其实只会有1个元素
+        List<DSSFlow> rootFlows = dwsFlowRelationList.stream().filter(DSSFlow::getRootFlow).collect(Collectors.toList());
+        for (DSSFlow rootFlow : rootFlows) {
+            String flowCodePath0=IoUtils.addFileSeparator(projectPath,  rootFlow.getName());
+            String flowMetaPath0=IoUtils.addFileSeparator(projectPath, FLOW_META_DIRECTORY_NAME, rootFlow.getName());
+            workFlowInputService.inputWorkFlowNew(dssFlowImportParam.getUserName(),
+                    rootFlow,
+                    projectName,
+                    flowCodePath0,
+                    flowMetaPath0,null, dssFlowImportParam.getWorkspace(), dssFlowImportParam.getOrcVersion(),
+                    dssFlowImportParam.getContextId(), dssLabels);
+        }
+        logger.info("import workflow success.orcVersion:{},context Id:{}", dssFlowImportParam.getOrcVersion(), dssFlowImportParam.getContextId());
+        return  rootFlows;
+    }
 
     @Override
     public List<DSSFlow> importWorkflow(String userName,
diff --git a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/WorkFlowManager.java b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/WorkFlowManager.java
index 281e3405a..cfae4c644 100644
--- a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/WorkFlowManager.java
+++ b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/WorkFlowManager.java
@@ -96,7 +96,23 @@ void deleteWorkflow(String userName,
                         Long flowID) throws DSSErrorException;
 
     ResponseUnlockWorkflow unlockWorkflow(String userName, Long flowId, Boolean confirmDelete) throws DSSErrorException;
-
+    /**
+     * 导出工作流
+     * @param userName
+     * @param flowID
+     * @param dssProjectId
+     * @param projectName
+     * @param workspace
+     * @param dssLabels
+     * @return 导出的工作流，以Bml资源的形式返回
+     * @throws Exception
+     */
+    BmlResource exportWorkflowNew(String userName,
+                                  Long flowID,
+                                  Long dssProjectId,
+                                  String projectName,
+                                  Workspace workspace,
+                                  List<DSSLabel> dssLabels) throws Exception;
     /**
      * 导出工作流
      * @param userName
@@ -115,6 +131,11 @@ BmlResource exportWorkflow(String userName,
                                Workspace workspace,
                                List<DSSLabel> dssLabels) throws Exception;
 
+    List<DSSFlow> importWorkflowNew(String userName,
+                                    String resourceId,
+                                    String bmlVersion,
+                                    DSSFlowImportParam dssFlowImportParam,
+                                    List<DSSLabel> dssLabels) throws Exception;
     List<DSSFlow> importWorkflow(String userName,
                                  String resourceId,
                                  String bmlVersion,
diff --git a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/io/export/MetaExportService.java b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/io/export/MetaExportService.java
index 87216241d..47a47ff09 100644
--- a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/io/export/MetaExportService.java
+++ b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/io/export/MetaExportService.java
@@ -26,5 +26,6 @@ public interface MetaExportService {
 
 
     void exportFlowBaseInfo(List<DSSFlow> allDSSFlows, List<DSSFlowRelation> allFlowRelations, String savePath) throws IOException;
+    void exportFlowBaseInfoNew(List<DSSFlow> allDSSFlows, List<DSSFlowRelation> allFlowRelations, String savePath) throws IOException;
 
 }
diff --git a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/io/export/NodeExportService.java b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/io/export/NodeExportService.java
index 8aa063b23..f472e96df 100644
--- a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/io/export/NodeExportService.java
+++ b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/io/export/NodeExportService.java
@@ -25,4 +25,6 @@
 public interface NodeExportService {
     void downloadNodeResourceToLocal(String userName, DSSNode dwsNode, String savePath);
     void downloadAppConnResourceToLocal(String userName, Long projectId, String projectName, DSSNode dwsNode, String savePath, Workspace workspace, List<DSSLabel> dssLabels) throws Exception;
+    void downloadNodeResourceToLocalNew(String userName, DSSNode dwsNode, String flowCodePath);
+    void downloadAppConnResourceToLocalNew(String userName, Long projectId, String projectName, DSSNode dwsNode, String flowCodePath, Workspace workspace, List<DSSLabel> dssLabels) throws Exception;
 }
diff --git a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/io/export/WorkFlowExportService.java b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/io/export/WorkFlowExportService.java
index 55eef0064..9a5a7deb1 100644
--- a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/io/export/WorkFlowExportService.java
+++ b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/io/export/WorkFlowExportService.java
@@ -22,6 +22,19 @@
 import java.util.List;
 
 public interface WorkFlowExportService {
+    /**
+     * 将一个工作流导出成压缩包，存放到本地磁盘，并返回压缩包的路径
+     * @param dssProjectId 所属工作空间id
+     * @param projectName 所属项目名称
+     * @param rootFlowId 工作流根节点id
+     * @param userName 用户名
+     * @param workspace 所属工作空间
+     * @param dssLabels label列表
+     * @return 导出的工作流压缩包的文件地址
+     * @throws Exception
+     */
+    String exportFlowInfoNew(Long dssProjectId, String projectName, long rootFlowId, String userName, Workspace workspace, List<DSSLabel> dssLabels) throws Exception;
+
     /**
      * 将一个工作流导出成压缩包，存放到本地磁盘，并返回压缩包的路径
      * @param dssProjectId 所属工作空间id
diff --git a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/io/export/impl/MetaExportServiceImpl.java b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/io/export/impl/MetaExportServiceImpl.java
index 263c2d05d..c6df01590 100644
--- a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/io/export/impl/MetaExportServiceImpl.java
+++ b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/io/export/impl/MetaExportServiceImpl.java
@@ -16,6 +16,7 @@
 
 package com.webank.wedatasphere.dss.workflow.io.export.impl;
 
+import com.webank.wedatasphere.dss.common.utils.DSSCommonUtils;
 import com.webank.wedatasphere.dss.common.utils.IoUtils;
 import com.webank.wedatasphere.dss.workflow.common.entity.DSSFlow;
 import com.webank.wedatasphere.dss.workflow.common.entity.DSSFlowRelation;
@@ -25,17 +26,33 @@
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;
 import java.io.*;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 @Service
 public class MetaExportServiceImpl implements MetaExportService {
 
     private Logger logger = LoggerFactory.getLogger(this.getClass());
-
+    public static final String FLOW_META_FILE_NAME = ".flowmeta";
+    public static final String FLOW_META_KEY = "dss_flow";
+    public static final String FLOW_RELATION_META_KEY = "dss_flow_relation";
 
     private final String fileName = "meta.txt";
 
+    @Override
+    public void exportFlowBaseInfoNew(List<DSSFlow> allDSSFlows, List<DSSFlowRelation> allFlowRelations, String savePath) throws IOException {
 
+        try (
+                OutputStream outputStream = IoUtils.generateExportOutputStream(savePath + File.separator + FLOW_META_FILE_NAME)
+        ) {
+            Map<String, Object> flowMetaMap = new HashMap<>(2);
+            flowMetaMap.put(FLOW_META_KEY, allDSSFlows);
+            flowMetaMap.put(FLOW_RELATION_META_KEY, allFlowRelations);
+            String flowMetaStr = DSSCommonUtils.COMMON_GSON.toJson(flowMetaMap);
+            org.apache.commons.io.IOUtils.write(flowMetaStr,outputStream,"UTF-8");
+        }
+    }
     @Override
     public void exportFlowBaseInfo(List<DSSFlow> allDSSFlows, List<DSSFlowRelation> allFlowRelations, String savePath) throws IOException {
 
diff --git a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/io/export/impl/NodeExportServiceImpl.java b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/io/export/impl/NodeExportServiceImpl.java
index 0e4aca71e..bc9ed04e5 100644
--- a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/io/export/impl/NodeExportServiceImpl.java
+++ b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/io/export/impl/NodeExportServiceImpl.java
@@ -40,11 +40,13 @@
 import java.io.InputStream;
 import java.util.List;
 import java.util.Map;
+import java.util.Optional;
 
 
 @Service
 public class NodeExportServiceImpl implements NodeExportService {
 
+    public static final String APPCONN_FILE_NAME = ".appconnre";
     private final Logger LOGGER = LoggerFactory.getLogger(this.getClass());
 
     @Autowired
@@ -55,6 +57,61 @@ public class NodeExportServiceImpl implements NodeExportService {
     @Autowired
     private WorkflowNodeService workflowNodeService;
 
+    @Override
+    public void downloadNodeResourceToLocalNew(String userName, DSSNode dwsNode, String flowCodePath) {
+        List<Resource> resources = dwsNode.getResources();
+        String scriptName = Optional.ofNullable(dwsNode.getJobContent()).map(jobContent -> jobContent.get("script"))
+                .map(Object::toString).orElse(null);
+        if (resources != null) {
+            resources.forEach(x -> {
+                // TODO: 2020/6/9 防止前台传的 resources：{{}],后期要去掉
+                if (x.getResourceId() != null && x.getFileName() != null && x.getVersion() != null) {
+                    String nodePath = flowCodePath + File.separator + dwsNode.getName();
+                    // 如果是scriptis节点，且资源名和jobContent中的script相同，则下载后的文件名为script名的后缀，如.sql。 否则说明是用户自定义文件，直接用filename
+                    String resourceName = x.getFileName();
+                    if(resourceName.equals(scriptName)){
+                        resourceName = resourceName.substring(resourceName.lastIndexOf('.'));
+                    }
+                    String nodeResourcePath = nodePath + File.separator + resourceName;
+                    bmlService.downloadToLocalPath(userName, x.getResourceId(), x.getVersion(), nodeResourcePath);
+                } else {
+                    LOGGER.warn("Illegal resource information");
+                    LOGGER.warn("username:{},nodeId:{},nodeName:{},fileName:{},version:{},resourceId:{}", userName, dwsNode.getId(), dwsNode.getName(), x.getFileName(), x.getVersion(), x.getResourceId());
+                }
+            });
+        }
+    }
+
+    @Override
+    public void downloadAppConnResourceToLocalNew(String userName, Long projectId, String projectName, DSSNode dwsNode,
+                                                  String flowCodePath, Workspace workspace, List<DSSLabel> dssLabels) throws Exception {
+        CommonAppConnNode node = new CommonAppConnNode();
+        node.setJobContent(dwsNode.getJobContent());
+        node.setProjectId(projectId);
+        node.setWorkspace(workspace);
+        node.setDssLabels(dssLabels);
+        node.setNodeType(dwsNode.getNodeType());
+        node.setName(dwsNode.getName());
+        node.setId(dwsNode.getId());
+        ExportResponseRef responseRef = workflowNodeService.exportNode(userName, node);
+        Map<String, Object> resourceMap = responseRef.getResourceMap();
+        String nodePath = flowCodePath + File.separator + dwsNode.getName();
+        String nodeResourcePath = nodePath + File.separator + APPCONN_FILE_NAME;
+        if(responseRef.isLinkisBMLResources()) {
+            String resourceId = resourceMap.get(ImportRequestRef.RESOURCE_ID_KEY).toString();
+            String version = resourceMap.get(ImportRequestRef.RESOURCE_VERSION_KEY).toString();
+            bmlService.downloadToLocalPath(userName, resourceId, version, nodeResourcePath);
+        } else {
+            InputStream inputStream = (InputStream) resourceMap.get(ImportRequestRef.INPUT_STREAM_KEY);
+            Closeable closeable = (Closeable) resourceMap.get(ImportRequestRef.CLOSEABLE_KEY);
+            try {
+                FileUtils.copyInputStreamToFile(inputStream, new File(nodeResourcePath));
+            } finally {
+                IOUtils.closeQuietly(inputStream);
+                IOUtils.closeQuietly(closeable);
+            }
+        }
+    }
     @Override
     public void downloadNodeResourceToLocal(String userName, DSSNode dwsNode, String savePath) {
         List<Resource> resources = dwsNode.getResources();
diff --git a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/io/export/impl/WorkFlowExportServiceImpl.java b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/io/export/impl/WorkFlowExportServiceImpl.java
index 7417a682f..862432b02 100644
--- a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/io/export/impl/WorkFlowExportServiceImpl.java
+++ b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/io/export/impl/WorkFlowExportServiceImpl.java
@@ -17,6 +17,7 @@
 package com.webank.wedatasphere.dss.workflow.io.export.impl;
 
 
+import com.google.gson.*;
 import com.webank.wedatasphere.dss.common.entity.IOType;
 import com.webank.wedatasphere.dss.common.entity.Resource;
 import com.webank.wedatasphere.dss.common.entity.node.DSSEdge;
@@ -49,6 +50,8 @@
 import org.springframework.stereotype.Service;
 
 import java.io.File;
+import java.io.IOException;
+import java.io.OutputStream;
 import java.util.*;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.FutureTask;
@@ -64,6 +67,9 @@ public class WorkFlowExportServiceImpl implements WorkFlowExportService {
 
     private Logger logger = LoggerFactory.getLogger(this.getClass());
 
+    public static final String FLOW_FILE_NAME = ".flow";
+    public static final String NODE_PARAMS_FILE_NAME = ".properties";
+
     @Autowired
     @Qualifier("workflowBmlService")
     private BMLService bmlService;
@@ -87,6 +93,57 @@ public class WorkFlowExportServiceImpl implements WorkFlowExportService {
     private DSSFlowService flowService;
 
 
+
+    @Override
+    public String exportFlowInfoNew(Long dssProjectId, String projectName, long rootFlowId, String userName, Workspace workspace, List<DSSLabel> dssLabels) throws Exception {
+        //获取rootFlow,和所有子Flow
+        DSSFlow rootFlow = flowMapper.selectFlowByID(rootFlowId);
+        List<DSSFlow> dssFlowList = new ArrayList<>();
+        //生成rootflow及所有子flow
+        dssFlowList.add(rootFlow);
+        getAllDssFlowsByRootflowId(rootFlow, dssFlowList);
+        //生成rootflow及所有子flow的Relations
+        List<Long> flowIds = dssFlowList.stream().map(DSSFlow::getId).collect(Collectors.toList());
+        List<DSSFlowRelation> flowRelations = flowIds.isEmpty() ? new ArrayList<>() : flowMapper.listFlowRelation(flowIds);
+        // /appcom/tmp/dss/yyyyMMddHHmmssSSS/projectxxx
+        String projectPath = IoUtils.generateProjectIOPath(userName, projectName);
+        // /appcom/tmp/dss/yyyyMMddHHmmssSSS/projectxxx/.flowmeta/flow_all_type_node/
+        String flowMetaPath = IoUtils.generateFlowMetaIOPath(projectPath, rootFlow.getName());
+        metaExportService.exportFlowBaseInfoNew(dssFlowList, flowRelations, flowMetaPath);
+        logger.info(userName + "-开始导出Flow：" + rootFlow.getName());
+        List<DSSFlow> dssFlows = new ArrayList<>();
+        for (DSSFlow dssFlow : dssFlowList) {
+            if (dssFlow.getRootFlow()) {
+                String flowMetaFilePath = IoUtils.addFileSeparator(flowMetaPath, FLOW_FILE_NAME);
+                //导出工作流json文件
+                String flowJson = bmlService.readTextFromBML(userName, dssFlow.getResourceId(), dssFlow.getBmlVersion());
+                if (!dssFlow.getHasSaved()) {
+                    logger.info("工作流{}从未保存过，忽略", dssFlow.getName());
+                } else if (StringUtils.isNotBlank(flowJson)) {
+                    // /appcom/tmp/dss/yyyyMMddHHmmssSSS/projectxxx/flow_all_type_node/
+                    String flowCodePath = IoUtils.generateFlowCodeIOPath(projectPath, rootFlow.getName());
+                    exportFlowResourcesNew(userName, dssProjectId, projectName, flowCodePath, flowJson, dssFlow.getName(), workspace, dssLabels);
+                    exportAllSubFlowsNew(userName, dssFlow, dssProjectId, projectName, flowCodePath,flowMetaPath, workspace, dssLabels);
+                    String flowJsonWithoutParams = extractAndExportParams(flowJson, flowCodePath);
+                    try (
+                            OutputStream outputStream = IoUtils.generateExportOutputStream(flowMetaFilePath )
+                    ) {
+                        org.apache.commons.io.IOUtils.write(flowJsonWithoutParams,outputStream,"UTF-8");
+                    }
+                    dssFlows.add(dssFlow);
+                } else {
+                    String warnMsg = String.format(DSSWorkFlowConstant.PUBLISH_FLOW_REPORT_FORMATE, dssFlow.getName(), dssFlow.getBmlVersion());
+                    logger.info(warnMsg);
+                    throw new DSSErrorException(90033, warnMsg);
+                }
+            }
+        }
+        if (dssFlows.isEmpty()) {
+            throw new DSSErrorException(90037, "该工程没有可以导出的工作流,请检查工作流是否都为空");
+        }
+        //打包导出工程
+        return ZipHelper.zip(projectPath);
+    }
     @Override
     public String exportFlowInfo(Long dssProjectId, String projectName, long rootFlowId, String userName, Workspace workspace, List<DSSLabel> dssLabels) throws Exception {
         //获取rootFlow,和所有子Flow
@@ -132,7 +189,38 @@ public String exportFlowInfo(Long dssProjectId, String projectName, long rootFlo
         return ZipHelper.zip(flowExportSaveBasePath);
     }
 
+    private void exportAllSubFlowsNew(String userName, DSSFlow dssFlowParent, Long projectId, String projectName,
+                                      String parentFlowCodePath, String parentFlowMetaPath, Workspace workspace, List<DSSLabel> dssLabels) throws Exception {
+        List<? extends DSSFlow> subFlows = dssFlowParent.getChildren();
+        if (subFlows != null) {
+            for (DSSFlow subFlow : subFlows) {
+                String subFlowCodePath = parentFlowCodePath + File.separator + subFlow.getName();
+                String subFlowMetaPath = parentFlowMetaPath  + File.separator + subFlow.getName();
+
+                String subFlowMetaSavePath =  subFlowMetaPath+ File.separator +  FLOW_FILE_NAME;
+                //导出子flow的json文件
+                String flowJson = bmlService.readTextFromBML(userName, subFlow.getResourceId(), subFlow.getBmlVersion());
 
+                if (!subFlow.getHasSaved()) {
+                    logger.info("工作流{}从未保存过，忽略", subFlow.getName());
+                } else if (StringUtils.isNotBlank(flowJson)) {
+                    exportFlowResourcesNew(userName, projectId, projectName, subFlowCodePath, flowJson, subFlow.getName(), workspace, dssLabels);
+                    exportAllSubFlowsNew(userName, subFlow, projectId, projectName, subFlowCodePath, subFlowMetaPath, workspace, dssLabels);
+                    String subFlowWithoutParams = extractAndExportParams(flowJson, subFlowCodePath);
+                    try (
+                            OutputStream outputStream = IoUtils.generateExportOutputStream(subFlowMetaSavePath )
+                    ) {
+                        org.apache.commons.io.IOUtils.write(subFlowWithoutParams,outputStream,"UTF-8");
+                    }
+
+                } else {
+                    String warnMsg = String.format(DSSWorkFlowConstant.PUBLISH_FLOW_REPORT_FORMATE, subFlow.getName(), subFlow.getBmlVersion());
+                    logger.info(warnMsg);
+                    throw new DSSErrorException(90014, warnMsg);
+                }
+            }
+        }
+    }
     private void exportAllSubFlows(String userName, DSSFlow dssFlowParent, Long projectId, String projectName,
                                    String projectExportBasePath, Workspace workspace, List<DSSLabel> dssLabels) throws Exception {
         List<? extends DSSFlow> subFlows = dssFlowParent.getChildren();
@@ -159,7 +247,83 @@ private void exportAllSubFlows(String userName, DSSFlow dssFlowParent, Long proj
     private String genWorkFlowExportDir(String projectExportPath, String flowName) {
         return projectExportPath + File.separator + flowName;
     }
+    /**
+     * 导出工作流中的各种资源，放到flowCodePath中。
+     * 工作流中的资源包括工作流资源和节点资源
+     * @param flowCodePath 保存工作流代码的目录
+     * @param flowJson 工作流元信息
+     * @param flowName 工作流明
+     * @param dssLabels label列表
+     * @throws Exception
+     */
+    private void exportFlowResourcesNew(String userName, Long projectId, String projectName,
+                                        String flowCodePath, String flowJson, String flowName,
+                                        Workspace workspace, List<DSSLabel> dssLabels) throws Exception {
+        if (StringUtils.isNotEmpty(flowCodePath)) {
+            //导出工作流资源文件
+            List<Resource> resources = workFlowParser.getWorkFlowResources(flowJson);
+            if (resources != null) {
+                resources.forEach(resource -> {
+                    downloadFlowResourceFromBmlNew(userName, resource, flowCodePath);
+                });
+            }
 
+            //导出工作流节点资源文件,工作流节点appconn文件
+            List<DSSNode> nodes = workFlowParser.getWorkFlowNodes(flowJson);
+            if (nodes != null) {
+                for (DSSNode node : nodes) {
+                    nodeExportService.downloadNodeResourceToLocalNew(userName, node, flowCodePath);
+                    NodeInfo nodeInfo = nodeInfoMapper.getWorkflowNodeByType(node.getNodeType());
+                    if(nodeInfo==null){
+                        String msg = String.format("%s note type not exist,please check appconn install successfully", node.getNodeType());
+                        logger.error(msg);
+                        throw new DSSRuntimeException(msg);
+                    }
+                    if (Boolean.TRUE.equals(nodeInfo.getSupportJump()) && nodeInfo.getJumpType() == 1) {
+                        logger.info("node.getJobContent() is :{}", node.getJobContent());
+                        nodeExportService.downloadAppConnResourceToLocalNew(userName, projectId, projectName, node, flowCodePath, workspace, dssLabels);
+                    }
+                }
+            }
+
+        } else {
+            throw new DSSErrorException(90067, "工作流导出生成路径为空");
+        }
+    }
+
+    /**
+     * 从flowjson中分离各个节点的params参数，以及flow本身的参数，把参数写到磁盘，并返回分离后的flow
+     * @param flowJson 要分离参数的flow
+     * @param flowCodePath 工作流代码导出目录
+     * @return 分离后的flow
+     */
+    private String extractAndExportParams(String flowJson,String flowCodePath) throws IOException {
+        JsonParser parser = new JsonParser();
+        JsonObject jsonObject = parser.parse(flowJson).getAsJsonObject();
+        JsonArray nodeJsonArray = jsonObject.getAsJsonArray("nodes");
+        Gson gson = new Gson();
+        for (JsonElement element : nodeJsonArray) {
+            JsonObject node = element.getAsJsonObject();
+            JsonElement params = node.remove("params");
+            String nodeName = Optional.ofNullable(node.get("title")).map(JsonElement::getAsString).orElse(null);
+            if (params == null || nodeName == null) {
+                continue;
+            }
+            String nodeParamsPath = IoUtils.addFileSeparator(flowCodePath, nodeName, NODE_PARAMS_FILE_NAME);
+            String paramsJson = gson.toJson(params);
+            try (
+
+                    OutputStream outputStream = IoUtils.generateExportOutputStream(nodeParamsPath )
+            ) {
+
+                org.apache.commons.io.IOUtils.write(paramsJson,outputStream,"UTF-8");
+
+            }
+
+        }
+        return gson.toJson(jsonObject);
+
+    }
     @Override
     public void exportFlowResources(String userName, Long projectId, String projectName,
                                     String projectSavePath, String flowJson, String flowName,
@@ -300,7 +464,10 @@ public void exportFlowResources_for_multi_thread(String userName, Long projectId
     public String downloadFlowJsonFromBml(String userName, String resourceId, String version, String savePath) {
         return bmlService.downloadAndGetText(userName, resourceId, version, savePath);
     }
-
+    private String downloadFlowResourceFromBmlNew(String userName, Resource resource, String flowCodePath) {
+        String flowResourcePath = IoUtils.addFileSeparator(flowCodePath,resource.getFileName());
+        return bmlService.downloadToLocalPath(userName, resource.getResourceId(), resource.getVersion(), flowResourcePath);
+    }
     private String downloadFlowResourceFromBml(String userName, Resource resource, String savePath) {
         String flowResourcePath = savePath + File.separator + resource.getResourceId() + ".re";
         return bmlService.downloadToLocalPath(userName, resource.getResourceId(), resource.getVersion(), flowResourcePath);
diff --git a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/io/input/MetaInputService.java b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/io/input/MetaInputService.java
index 506de99e4..114052642 100644
--- a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/io/input/MetaInputService.java
+++ b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/io/input/MetaInputService.java
@@ -19,6 +19,7 @@
 
 import com.webank.wedatasphere.dss.workflow.common.entity.DSSFlow;
 import com.webank.wedatasphere.dss.workflow.common.entity.DSSFlowRelation;
+import org.apache.linkis.protocol.util.ImmutablePair;
 
 import java.io.IOException;
 import java.util.List;
@@ -26,6 +27,7 @@
 public interface MetaInputService {
 
     List<DSSFlow> inputFlow(String basePath) throws IOException;
+    ImmutablePair<List<DSSFlow>,List<DSSFlowRelation>> inputFlowNew(String flowMetaPath) throws IOException;
 
     List<DSSFlowRelation> inputFlowRelation(String basePath) throws IOException;
 
diff --git a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/io/input/NodeInputService.java b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/io/input/NodeInputService.java
index e01c1f092..108de00b3 100644
--- a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/io/input/NodeInputService.java
+++ b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/io/input/NodeInputService.java
@@ -29,9 +29,14 @@ public interface NodeInputService {
 
     String uploadResourceToBml(String userName, String nodeJson, String inputResourcePath, String projectName) throws IOException;
 
+    String uploadResourceToBmlNew(String userName, String nodeJson, String nodePath, String projectName) throws IOException;
+
     String uploadAppConnResource(String userName, String projectName, DSSFlow dssFlow,
                                  String nodeJson, String flowContextId, String appConnResourcePath,
                                  Workspace workspace, String orcVersion, List<DSSLabel> dssLabels) throws DSSErrorException,IOException;
+    String uploadAppConnResourceNew(String userName, String projectName, DSSFlow dssFlow,
+                                 String nodeJson, String flowContextId, String nodePath,
+                                 Workspace workspace, String orcVersion, List<DSSLabel> dssLabels) throws DSSErrorException,IOException;
 
     String updateNodeSubflowID(String nodeJson, long subflowID) throws IOException;
 
diff --git a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/io/input/WorkFlowInputService.java b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/io/input/WorkFlowInputService.java
index b954d8d28..0b7ef1470 100644
--- a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/io/input/WorkFlowInputService.java
+++ b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/io/input/WorkFlowInputService.java
@@ -28,6 +28,10 @@
 
 public interface WorkFlowInputService {
 
+    void inputWorkFlowNew(String userName, DSSFlow dssFlow, String projectName,
+                          String flowCodePath, String flowMetaPath, Long parentFlowId, Workspace workspace,
+                          String orcVersion, String contextId, List<DSSLabel> dssLabels) throws DSSErrorException,IOException;
+
     /**
      *
      * @param userName
diff --git a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/io/input/impl/MetaInputServiceImpl.java b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/io/input/impl/MetaInputServiceImpl.java
index 0d181ebdc..f0971bed8 100644
--- a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/io/input/impl/MetaInputServiceImpl.java
+++ b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/io/input/impl/MetaInputServiceImpl.java
@@ -16,19 +16,24 @@
 
 package com.webank.wedatasphere.dss.workflow.io.input.impl;
 
+import com.google.gson.Gson;
+import com.google.gson.JsonObject;
+import com.google.gson.JsonParser;
+import com.google.gson.reflect.TypeToken;
 import com.webank.wedatasphere.dss.common.utils.IoUtils;
 import com.webank.wedatasphere.dss.workflow.common.entity.DSSFlow;
 import com.webank.wedatasphere.dss.workflow.common.entity.DSSFlowRelation;
 import com.webank.wedatasphere.dss.workflow.io.input.MetaInputService;
 import com.webank.wedatasphere.dss.workflow.io.input.MetaReader;
+import org.apache.linkis.protocol.util.ImmutablePair;
 import org.springframework.stereotype.Service;
 
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.InputStream;
+import java.io.*;
+import java.lang.reflect.Type;
 import java.util.List;
 
+import static com.webank.wedatasphere.dss.workflow.io.export.impl.MetaExportServiceImpl.*;
+
 
 @Service
 public class MetaInputServiceImpl implements MetaInputService {
@@ -37,6 +42,20 @@ public class MetaInputServiceImpl implements MetaInputService {
 
     private final String fileName = "meta.txt";
 
+    @Override
+    public ImmutablePair<List<DSSFlow>,List<DSSFlowRelation>> inputFlowNew(String flowMetaPath) throws IOException {
+        File flowMetaFile = new File(flowMetaPath + File.separator + FLOW_META_FILE_NAME);
+        JsonParser jsonParser = new JsonParser();
+        Gson gson = new Gson();
+        try (FileReader reader = new FileReader(flowMetaFile)) {
+            Type flowListType = new TypeToken<List<DSSFlow>>() {}.getType();
+            Type flowRelationListType = new TypeToken<List<DSSFlowRelation>>() {}.getType();
+            JsonObject jsonObject = jsonParser.parse(reader).getAsJsonObject();
+            List<DSSFlow> flows = gson.fromJson(jsonObject.get(FLOW_META_KEY), flowListType);
+            List<DSSFlowRelation> flowRelations = gson.fromJson(jsonObject.get(FLOW_RELATION_META_KEY), flowRelationListType);
+            return new ImmutablePair<>(flows, flowRelations);
+        }
+    }
 
     @Override
     public List<DSSFlow> inputFlow(String basePath) throws IOException {
diff --git a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/io/input/impl/NodeInputServiceImpl.java b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/io/input/impl/NodeInputServiceImpl.java
index df2869718..bef421a56 100644
--- a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/io/input/impl/NodeInputServiceImpl.java
+++ b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/io/input/impl/NodeInputServiceImpl.java
@@ -22,6 +22,7 @@
 import com.webank.wedatasphere.dss.common.entity.Resource;
 import com.webank.wedatasphere.dss.common.exception.DSSErrorException;
 import com.webank.wedatasphere.dss.common.label.DSSLabel;
+import com.webank.wedatasphere.dss.common.utils.IoUtils;
 import com.webank.wedatasphere.dss.common.utils.MapUtils;
 import com.webank.wedatasphere.dss.contextservice.service.ContextService;
 import com.webank.wedatasphere.dss.contextservice.service.impl.ContextServiceImpl;
@@ -47,6 +48,8 @@
 import java.util.*;
 import java.util.function.Supplier;
 
+import static com.webank.wedatasphere.dss.workflow.io.export.impl.NodeExportServiceImpl.APPCONN_FILE_NAME;
+
 @Service
 public class NodeInputServiceImpl implements NodeInputService {
     @Autowired
@@ -63,7 +66,33 @@ public class NodeInputServiceImpl implements NodeInputService {
 
     private final Logger logger = LoggerFactory.getLogger(this.getClass());
 
-
+    @Override
+    public String uploadResourceToBmlNew(String userName, String nodeJson, String nodePath, String projectName) throws IOException {
+        List<Resource> resources = nodeParser.getNodeResource(nodeJson);
+        Map<String, Object> jobContent = nodeParser.getNodeJobContent(nodeJson);
+        String scriptName = Optional.ofNullable(jobContent.get("script")).map(Object::toString).orElse(null);
+        if (resources != null && resources.size() > 0) {
+            resources.forEach(resource -> {
+                if (resource.getVersion() != null && resource.getFileName() != null && resource.getResourceId() != null) {
+                    //需要区分代码节点和非代码节点。非代码节点直接根据filename上传即可
+                    String fileName=resource.getFileName();
+                    if(fileName.equals(scriptName)){
+                        fileName = fileName.substring(fileName.lastIndexOf('.'));
+                    }
+                    String filePath = IoUtils.addFileSeparator(nodePath, fileName);
+                    InputStream resourceInputStream = readResource(userName, resource, filePath);
+                    BmlResource bmlReturnMap = bmlService.upload(userName,
+                            resourceInputStream, UUID.randomUUID().toString() + ".json", projectName);
+                    resource.setResourceId(bmlReturnMap.getResourceId());
+                    resource.setVersion(bmlReturnMap.getVersion());
+                } else {
+                    logger.warn("Illegal resource information");
+                    logger.warn("username:{},fileName:{},version:{},resourceId:{}", userName, resource.getFileName(), resource.getVersion(), resource.getResourceId());
+                }
+            });
+        }
+        return nodeParser.updateNodeResource(nodeJson, resources);
+    }
     @Override
     public String uploadResourceToBml(String userName, String nodeJson, String inputResourcePath, String projectName) throws IOException {
         List<Resource> resources = nodeParser.getNodeResource(nodeJson);
@@ -88,7 +117,65 @@ private InputStream readResource(String userName, Resource resource, String flow
         String readPath = flowResourcePath + resource.getResourceId() + "_" + resource.getVersion() + ".re";
         return bmlService.readLocalResourceFile(userName, readPath);
     }
+    @Override
+    public String uploadAppConnResourceNew(String userName, String projectName, DSSFlow dssFlow,
+                                           String nodeJson, String flowContextId, String nodePath,
+                                           Workspace workspace, String orcVersion, List<DSSLabel> dssLabels) throws DSSErrorException, IOException {
+        Map<String, Object> nodeJsonMap = BDPJettyServerHelper.jacksonJson().readValue(nodeJson, Map.class);
+        String nodeType = nodeJsonMap.get("jobType").toString();
+        String nodeId = nodeJsonMap.get("id").toString();
+        String nodeResourcePath = IoUtils.addFileSeparator(nodePath,APPCONN_FILE_NAME) ;
+        Map<String, Object> nodeContent = (LinkedHashMap<String, Object>) nodeJsonMap.get("jobContent");
+        CommonAppConnNode appConnNode = new CommonAppConnNode();
+        appConnNode.setId(nodeId);
+        appConnNode.setName((String) nodeJsonMap.get("title"));
+        appConnNode.setDssLabels(dssLabels);
+        appConnNode.setNodeType(nodeType);
+        appConnNode.setJobContent(nodeContent);
+        appConnNode.setFlowId(dssFlow.getId());
+        appConnNode.setProjectId(dssFlow.getProjectId());
+        appConnNode.setWorkspace(workspace);
+        appConnNode.setContextId(flowContextId);
+
+        Map<String, Object> nodeExportContent = null;
+        logger.info("nodeResourcePath:{}", nodeResourcePath);
+        File file = new File(nodeResourcePath);
+        if (file.exists()) {
+            InputStream resourceInputStream = bmlService.readLocalResourceFile(userName, nodeResourcePath);
+            Supplier<Map<String, Object>> bmlResourceMap = () -> {
+                BmlResource resource = bmlService.upload(userName, resourceInputStream, UUID.randomUUID().toString() + ".json",
+                        projectName);
+                return ImmutableMap.of(
+                        "resourceId", resource.getResourceId(),
+                        "version", resource.getVersion()
+                );
+            };
+            Supplier<Map<String, Object>> streamResourceMap = () -> MapUtils.newCommonMap(ImportRequestRef.INPUT_STREAM_KEY, resourceInputStream);
+            try {
+                nodeExportContent = nodeService.importNode(userName, appConnNode, bmlResourceMap, streamResourceMap, orcVersion);
+            } catch (ExternalOperationFailedException e) {
+                logger.error("failed to import node.", e);
+                throw new DSSErrorException(e.getErrCode(), e.getMessage());
+            } catch (Exception e) {
+                logger.error("failed to import node.", e);
+                throw new DSSErrorException(90011, e.getMessage());
+            }
+            if (nodeExportContent != null) {
+                if (nodeExportContent.get("project_id") != null) {
+                    Long newProjectId = Long.parseLong(nodeExportContent.get("project_id").toString());
+                    logger.warn(String.format("new appConn node add into dss,dssProjectId: %s,newProjectId: %s", appConnNode.getProjectId(), newProjectId));
+                    nodeExportContent.remove("project_id");
+                }
+                nodeJsonMap.replace("jobContent", nodeExportContent);
+                appConnNode.setJobContent(nodeExportContent);
+                return BDPJettyServerHelper.jacksonJson().writeValueAsString(nodeJsonMap);
+            }
+        } else {
+            logger.warn("appConn node resource file does not exists. nodeId: {}" + nodeId);
+        }
 
+        return  nodeJson ;
+    }
     @Override
     public String uploadAppConnResource(String userName, String projectName, DSSFlow dssFlow,
                                         String nodeJson, String flowContextId, String appConnResourcePath,
diff --git a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/io/input/impl/WorkFlowInputServiceImpl.java b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/io/input/impl/WorkFlowInputServiceImpl.java
index e2e85305e..8d4ce6ad3 100644
--- a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/io/input/impl/WorkFlowInputServiceImpl.java
+++ b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/io/input/impl/WorkFlowInputServiceImpl.java
@@ -23,6 +23,7 @@
 import com.webank.wedatasphere.dss.common.entity.Resource;
 import com.webank.wedatasphere.dss.common.exception.DSSErrorException;
 import com.webank.wedatasphere.dss.common.label.DSSLabel;
+import com.webank.wedatasphere.dss.common.utils.IoUtils;
 import com.webank.wedatasphere.dss.common.utils.MapUtils;
 import com.webank.wedatasphere.dss.contextservice.service.ContextService;
 import com.webank.wedatasphere.dss.contextservice.service.impl.ContextServiceImpl;
@@ -57,6 +58,9 @@
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
+import static com.webank.wedatasphere.dss.workflow.io.export.impl.WorkFlowExportServiceImpl.FLOW_FILE_NAME;
+import static com.webank.wedatasphere.dss.workflow.io.export.impl.WorkFlowExportServiceImpl.NODE_PARAMS_FILE_NAME;
+
 
 @Service
 public class WorkFlowInputServiceImpl implements WorkFlowInputService {
@@ -79,6 +83,56 @@ public class WorkFlowInputServiceImpl implements WorkFlowInputService {
     private FlowMapper flowMapper;
     private static ContextService contextService = ContextServiceImpl.getInstance();
 
+    @Override
+    public void inputWorkFlowNew(String userName,
+                                 DSSFlow dssFlow,
+                                 String projectName,
+                                 String flowCodePath,
+                                 String flowMetaPath,
+                                 Long parentFlowId,
+                                 Workspace workspace,
+                                 String orcVersion,
+                                 String contextId,
+                                 List<DSSLabel> dssLabels) throws DSSErrorException, IOException {
+        String flowMetaFilePath = IoUtils.addFileSeparator(flowMetaPath, FLOW_FILE_NAME);
+        String flowJson = bmlService.readLocalTextFile(userName, flowMetaFilePath);
+
+        // TODO: 2020/7/31 优化update方法里面的saveContent
+        flowJson = updateFlowContextIdAndVersion(userName,
+                workspace.getWorkspaceName(),
+                projectName,
+                flowJson,
+                dssFlow,
+                parentFlowId,
+                contextId,
+                orcVersion);
+        flowJson = inputWorkFlowNodesNew(userName, projectName, flowJson, dssFlow,
+                flowCodePath, workspace, orcVersion, dssLabels);
+        //如果包含subflow,需要一同导入subflow内容，并更新parentflow的json内容
+        List<? extends DSSFlow> subFlows = dssFlow.getChildren();
+        List<String[]> templateIds = new ArrayList<>();
+        if (subFlows != null) {
+            for (DSSFlow subFlow : subFlows) {
+                String subCodePath = IoUtils.addFileSeparator(flowCodePath, subFlow.getName());
+                String subMetaPath = IoUtils.addFileSeparator(flowMetaPath, subFlow.getName());
+                inputWorkFlowNew(userName, subFlow, projectName, subCodePath,subMetaPath, dssFlow.getId(),
+                        workspace, orcVersion, contextId, dssLabels);
+                templateIds.addAll(subFlow.getFlowIdParamConfTemplateIdTuples());
+            }
+        }
+
+        flowJson = uploadFlowResourceToBmlNew(userName, flowJson, flowCodePath, projectName);
+
+        DSSFlow updateDssFlow = uploadFlowJsonToBml(userName, projectName, dssFlow, flowJson);
+        List<String> tempIds = workFlowParser.getParamConfTemplate(flowJson);
+        List<String[]> templateIdsInRoot = tempIds.stream()
+                .map(e->new String[]{updateDssFlow.getId().toString(),e})
+                .collect(Collectors.toList());
+        templateIds.addAll(templateIdsInRoot);
+        updateDssFlow.setFlowIdParamConfTemplateIdTuples(templateIds);
+        contextService.checkAndSaveContext(flowJson, String.valueOf(parentFlowId));
+        flowMapper.updateFlowInputInfo(updateDssFlow) ;
+    }
     @Override
     public void inputWorkFlow(String userName,
                               DSSFlow dssFlow,
@@ -93,7 +147,7 @@ public void inputWorkFlow(String userName,
         String flowInputPath = inputProjectPath + File.separator + dssFlow.getName();
         String flowJsonPath = flowInputPath + File.separator + dssFlow.getName() + ".json";
         String flowJson = bmlService.readLocalTextFile(userName, flowJsonPath);
-        //生成新的节点key。
+        //生成新的节点key。为了解决复制工程后，新工程出现原有工程工作流的历史执行记录
         Set<String> nodeKeys=findFlowNodeKeys(flowJson);
         Map<String, String> oldNewNodeKeyMap = nodeKeys.stream().collect(Collectors.toMap(Function.identity(), v -> UUID.randomUUID().toString(),(e1,e2)->e1));
         String updateFlowJson=flowJson;
@@ -195,6 +249,80 @@ private String updateFlowContextIdAndVersion(String userName,
         }
         return workFlowParser.updateFlowJsonWithMap(flowJson, MapUtils.newCommonMap(CSCommonUtils.CONTEXT_ID_STR, contextId, DSSJobContentConstant.ORC_VERSION_KEY, orcVersion));
     }
+    /**
+     * 导入工作流节点
+     * @param userName
+     * @param projectName
+     * @param flowJson
+     * @param dssFlow
+     * @param workspace
+     * @param orcVersion
+     * @param dssLabels
+     * @return
+     * @throws DSSErrorException
+     * @throws IOException
+     */
+    private String inputWorkFlowNodesNew(String userName, String projectName, String flowJson,
+                                         DSSFlow dssFlow, String flowCodePath, Workspace workspace,
+                                         String orcVersion, List<DSSLabel> dssLabels) throws DSSErrorException, IOException {
+        List<String> nodeJsonList = workFlowParser.getWorkFlowNodesJson(flowJson);
+        if (nodeJsonList == null) {
+            throw new DSSErrorException(90073, "工作流内没有工作流节点，导入失败 " + dssFlow.getName());
+        }
+        String updateContextId = workFlowParser.getValueWithKey(flowJson, CSCommonUtils.CONTEXT_ID_STR);
+        if (nodeJsonList.size() == 0) {
+            return flowJson;
+        }
+        List<DSSFlow> subflows = (List<DSSFlow>) dssFlow.getChildren();
+        List<Map<String, Object>> nodeJsonListRes = new ArrayList<>();
+        if (nodeJsonList.size() > 0) {
+            for (String nodeJson : nodeJsonList) {
+                String nodeName = nodeParser.getNodeValue("title", nodeJson);
+                String nodePath = IoUtils.addFileSeparator(flowCodePath, nodeName);
+                //上传节点资源到bml，实现节点资源导入，返回新的节点json
+                String updateNodeJson = nodeInputService.uploadResourceToBmlNew(userName, nodeJson, nodePath, projectName);
+                //导入第三方节点
+                updateNodeJson = nodeInputService.uploadAppConnResourceNew(userName, projectName,
+                        dssFlow, updateNodeJson, updateContextId, nodePath,
+                        workspace, orcVersion, dssLabels);
+                Map<String, Object> nodeJsonMap = BDPJettyServerHelper.jacksonJson().readValue(updateNodeJson, Map.class);
+                String nodeParams = readNodeParam(userName, nodePath);
+
+                //更新subflowID
+                String nodeType = nodeJsonMap.get("jobType").toString();
+                if ("workflow.subflow".equals(nodeType) && CollectionUtils.isNotEmpty(subflows)) {
+                    String subFlowName = nodeJsonMap.get("title").toString();
+                    logger.info("subflows:{}", subflows);
+                    List<DSSFlow> dssFlowList = subflows.stream().filter(subflow ->
+                            subflow.getName().equals(subFlowName)
+                    ).collect(Collectors.toList());
+                    if (dssFlowList.size() == 1) {
+                        updateNodeJson = nodeInputService.updateNodeSubflowID(updateNodeJson, dssFlowList.get(0).getId());
+                        nodeJsonMap = BDPJettyServerHelper.jacksonJson().readValue(updateNodeJson, Map.class);
+
+                    } else if (dssFlowList.size() > 1) {
+                        logger.error("工程内存在重复的子工作流节点名称，导入失败" + subFlowName);
+                        throw new DSSErrorException(90077, "工程内存在重复的子工作流节点名称，导入失败" + subFlowName);
+                    } else {
+                        logger.error("工程内未能找到子工作流节点，导入失败" + subFlowName);
+                        throw new DSSErrorException(90078, "工程内未能找到子工作流节点，导入失败" + subFlowName);
+                    }
+                }
+                if (nodeParams != null) {
+                    nodeJsonMap.put("params", nodeParams);
+                }
+                nodeJsonListRes.add(nodeJsonMap);
+
+            }
+        }
+
+        return workFlowParser.updateFlowJsonWithKey(flowJson, "nodes", nodeJsonListRes);
+    }
+
+    private String readNodeParam(String userName,String nodePath){
+        String paramsFilePath = IoUtils.addFileSeparator(nodePath, NODE_PARAMS_FILE_NAME);
+        return bmlService.readLocalTextFile(userName, paramsFilePath);
+    }
 
     private String inputWorkFlowNodes(String userName, String projectName, String flowJson,
                                       DSSFlow dssFlow, String flowPath, Workspace workspace,
@@ -254,7 +382,23 @@ private String inputWorkFlowNodes(String userName, String projectName, String fl
         return workFlowParser.updateFlowJsonWithKey(flowJson, "nodes", nodeJsonListRes);
 
     }
+    private String uploadFlowResourceToBmlNew(String userName, String flowJson, String flowCodePath, String projectName) throws IOException {
 
+        List<Resource> resourceList = workFlowParser.getWorkFlowResources(flowJson);
+        //上传文件获取resourceId和version save应该是已经有
+        if (resourceList != null) {
+            resourceList.forEach(resource -> {
+                InputStream resourceInputStream = readFlowResourceNew(userName, resource, flowCodePath);
+                BmlResource bmlReturnMap = bmlService.upload(userName, resourceInputStream, UUID.randomUUID().toString() + ".json", projectName);
+                resource.setResourceId(bmlReturnMap.getResourceId());
+                resource.setVersion(bmlReturnMap.getVersion());
+            });
+            if (resourceList.size() == 0) {
+                return flowJson;
+            }
+        }
+        return workFlowParser.updateFlowJsonWithKey(flowJson, "resources", resourceList);
+    }
     private String uploadFlowResourceToBml(String userName, String flowJson, String flowResourcePath, String projectName) throws IOException {
 
         List<Resource> resourceList = workFlowParser.getWorkFlowResources(flowJson);
@@ -272,7 +416,10 @@ private String uploadFlowResourceToBml(String userName, String flowJson, String
         }
         return workFlowParser.updateFlowJsonWithKey(flowJson, "resources", resourceList);
     }
-
+    private InputStream readFlowResourceNew(String userName, Resource resource, String flowCodePath) {
+        String readPath =  IoUtils.addFileSeparator(flowCodePath,resource.getFileName());
+        return bmlService.readLocalResourceFile(userName, readPath);
+    }
     private InputStream readFlowResource(String userName, Resource resource, String flowResourcePath) {
         // TODO: 2020/3/20 和导出统一,资源都放resouce 如有问题,后再修改
         String readPath = flowResourcePath + File.separator + "resource" + File.separator + resource.getResourceId() + ".re";
diff --git a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/parser/DefaultNodeParser.java b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/parser/DefaultNodeParser.java
index bcaf0dce7..391c34723 100644
--- a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/parser/DefaultNodeParser.java
+++ b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/parser/DefaultNodeParser.java
@@ -28,6 +28,7 @@
 
 import java.io.IOException;
 import java.util.HashMap;
+import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -71,6 +72,14 @@ public String getNodeValue(String key, String nodeJson) throws IOException {
 
     }
 
+
+    @Override
+    public Map<String, Object> getNodeJobContent(String nodeJson) throws IOException {
+        Map<String, Object> nodeJsonMap = BDPJettyServerHelper.jacksonJson().readValue(nodeJson, Map.class);
+        return  (LinkedHashMap<String, Object>) nodeJsonMap.get("jobContent");
+    }
+
+
     @Override
     public List<Resource> getNodeResource(String nodeJson) {
         Gson gson = new Gson();
diff --git a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/scala/com/webank/wedatasphere/dss/workflow/receiver/DSSWorkflowReceiver.scala b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/scala/com/webank/wedatasphere/dss/workflow/receiver/DSSWorkflowReceiver.scala
index 954166b0d..4db4617bf 100644
--- a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/scala/com/webank/wedatasphere/dss/workflow/receiver/DSSWorkflowReceiver.scala
+++ b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/scala/com/webank/wedatasphere/dss/workflow/receiver/DSSWorkflowReceiver.scala
@@ -59,7 +59,7 @@ class DSSWorkflowReceiver(workflowManager: WorkFlowManager)  extends Receiver {
       workflowManager.unlockWorkflow(reqUnlockWorkflow.getUsername, reqUnlockWorkflow.getFlowId, reqUnlockWorkflow.getConfirmDelete)
 
     case reqExportFlow: RequestExportWorkflow =>
-      val dssExportFlowResource: BmlResource = workflowManager.exportWorkflow(
+      val dssExportFlowResource: BmlResource = workflowManager.exportWorkflowNew(
         reqExportFlow.userName,
         reqExportFlow.flowID,
         reqExportFlow.projectId,
@@ -77,7 +77,7 @@ class DSSWorkflowReceiver(workflowManager: WorkFlowManager)  extends Receiver {
       dssFlowImportParam.setOrcVersion(requestImportWorkflow.getOrcVersion)
       dssFlowImportParam.setWorkspace(requestImportWorkflow.getWorkspace)
       dssFlowImportParam.setContextId(requestImportWorkflow.getContextId)
-      val dssFlows = workflowManager.importWorkflow(requestImportWorkflow.getUserName,
+      val dssFlows = workflowManager.importWorkflowNew(requestImportWorkflow.getUserName,
         requestImportWorkflow.getResourceId,
         requestImportWorkflow.getBmlVersion,
         dssFlowImportParam, requestImportWorkflow.getDssLabels)

From c2317bee93b986dceef2b2aba0f841e6b955cbb6 Mon Sep 17 00:00:00 2001
From: zhaobincai <zhaobincai@webank.com>
Date: Thu, 11 Apr 2024 14:51:13 +0800
Subject: [PATCH 023/302] =?UTF-8?q?git=20add=EF=BC=9Aworkflow=20lock=20upd?=
 =?UTF-8?q?ate?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../receiver/DSSGitReceiver.scala             |  1 -
 .../dss-workflow/dss-workflow-server/pom.xml  |  6 ++
 .../constant/DSSWorkFlowConstant.java         |  6 ++
 .../dss/workflow/dao/LockMapper.java          | 14 ++++
 .../dss/workflow/dao/impl/lockMapper.xml      | 27 ++++++++
 .../workflow/lock/DSSFlowEditLockManager.java | 65 +++++++++++++++++--
 .../service/impl/DSSFlowServiceImpl.java      |  2 +
 .../service/impl/PublishServiceImpl.java      |  2 +
 .../dss/workflow/util/DSSFlowStatusUtils.java | 17 +++++
 9 files changed, 135 insertions(+), 5 deletions(-)
 create mode 100644 dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/util/DSSFlowStatusUtils.java

diff --git a/dss-git/dss-git-server/src/main/scala/com.webank.wedatasphere.dss.git/receiver/DSSGitReceiver.scala b/dss-git/dss-git-server/src/main/scala/com.webank.wedatasphere.dss.git/receiver/DSSGitReceiver.scala
index b5d0dcf38..ee93a2b59 100644
--- a/dss-git/dss-git-server/src/main/scala/com.webank.wedatasphere.dss.git/receiver/DSSGitReceiver.scala
+++ b/dss-git/dss-git-server/src/main/scala/com.webank.wedatasphere.dss.git/receiver/DSSGitReceiver.scala
@@ -25,7 +25,6 @@ import org.springframework.stereotype.Component
 import java.util
 import scala.concurrent.duration.Duration
 
-@Component
 class DSSGitReceiver(gitProjectManagerService: DSSGitProjectManagerService, gitWorkflowManagerService: DSSGitWorkflowManagerService) extends Receiver {
 
   override def receive(message: Any, sender: Sender): Unit = {}
diff --git a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/pom.xml b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/pom.xml
index e64bfa1dc..7a719f9f7 100644
--- a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/pom.xml
+++ b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/pom.xml
@@ -28,6 +28,12 @@
 
     <artifactId>dss-workflow-server</artifactId>
     <dependencies>
+        <dependency>
+            <groupId>com.webank.wedatasphere.dss</groupId>
+            <artifactId>dss-git-common</artifactId>
+            <version>${dss.version}</version>
+            <scope>provided</scope>
+        </dependency>
         <dependency>
             <groupId>com.webank.wedatasphere.dss</groupId>
             <artifactId>dss-common</artifactId>
diff --git a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/constant/DSSWorkFlowConstant.java b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/constant/DSSWorkFlowConstant.java
index d85658d7e..9167d8634 100644
--- a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/constant/DSSWorkFlowConstant.java
+++ b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/constant/DSSWorkFlowConstant.java
@@ -60,4 +60,10 @@ public class DSSWorkFlowConstant {
      * 仅仅用于兼容老的、已经创建的工作量，用于自动路由到一个默认的调度系统。
      */
     public static final CommonVars<String> DEFAULT_SCHEDULER_APP_CONN = CommonVars.apply("wds.dss.workflow.scheduler.default", "schedulis");
+    /**
+     * 工作流状态：save-已发布 push-已提交 publish-已保存
+     */
+    public static final String FLOW_STATUS_SAVE = "save";
+    public static final String FLOW_STATUS_PUSH = "push";
+    public static final String FLOW_STATUS_PUBLISH = "publish";
 }
diff --git a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/dao/LockMapper.java b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/dao/LockMapper.java
index c2f8ab5e3..ec741e671 100644
--- a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/dao/LockMapper.java
+++ b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/dao/LockMapper.java
@@ -19,6 +19,8 @@
 import org.apache.ibatis.annotations.Param;
 import org.springframework.dao.DuplicateKeyException;
 
+import java.util.List;
+
 
 public interface LockMapper {
 
@@ -48,4 +50,16 @@ Boolean flowNotExistEditLock(@Param("flowID") Long flowID,
     void clearExpire(@Param("expireTime") String expireTime, @Param("flowId") long flowId);
 
     void deleteALL();
+
+
+    void deleteExpectAfterSave(@Param("list") List<String> list);
+
+
+    void insertFlowStatus(@Param("flowID") Long flowID, @Param("status") String status);
+
+    void updateFlowStatus(@Param("flowID") Long flowID, @Param("status") String status);
+
+    List<String> selectFlowIdByStatus( @Param("status") String status);
+
+    String selectStatusByFlowId(@Param("flowID") Long flowID);
 }
diff --git a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/dao/impl/lockMapper.xml b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/dao/impl/lockMapper.xml
index 41e45c40c..083cd7282 100644
--- a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/dao/impl/lockMapper.xml
+++ b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/dao/impl/lockMapper.xml
@@ -73,4 +73,31 @@
         delete from dss_workflow_edit_lock
     </delete>
 
+
+    <delete id="deleteExpectAfterSave">
+        delete from dss_workflow_edit_lock where flow_id not in
+        <foreach collection="list" item="index" separator="," open="(" close=")">
+            #{index}
+        </foreach>
+    </delete>
+
+    <insert id="insertFlowStatus">
+        INSERT INTO dss_workflow_status (`flow_id`, `status`, `create_time`, `update_time`)
+        VALUES
+        (#{flowID}, #{status}, NOW(), NOW())
+    </insert>
+
+    <update id="updateFlowStatus">
+        update dss_workflow_status set `status` = #{status}, `update_time` = NOW()
+        where `flow_id` = #{flowID}
+    </update>
+
+    <select id="selectFlowIdByStatus" resultType="java.lang.String">
+        select `flow_id` from dss_workflow_status where `status` = #{status}
+    </select>
+
+    <select id="selectStatusByFlowId" resultType="java.lang.String">
+        select `status` from dss_workflow_status where `flow_id` = #{flowID} order by update_time limit 1
+    </select>
+
 </mapper>
\ No newline at end of file
diff --git a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/lock/DSSFlowEditLockManager.java b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/lock/DSSFlowEditLockManager.java
index 2bb3298aa..9cc5b9853 100644
--- a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/lock/DSSFlowEditLockManager.java
+++ b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/lock/DSSFlowEditLockManager.java
@@ -16,27 +16,39 @@
 
 package com.webank.wedatasphere.dss.workflow.lock;
 
+import com.webank.wedatasphere.dss.common.entity.BmlResource;
+import com.webank.wedatasphere.dss.common.entity.project.DSSProject;
 import com.webank.wedatasphere.dss.common.exception.DSSErrorException;
+import com.webank.wedatasphere.dss.common.protocol.project.ProjectInfoRequest;
+import com.webank.wedatasphere.dss.common.utils.RpcAskUtils;
+import com.webank.wedatasphere.dss.git.common.protocol.request.GitCommitRequest;
+import com.webank.wedatasphere.dss.git.common.protocol.response.GitCommitResponse;
+import com.webank.wedatasphere.dss.sender.service.DSSSenderServiceFactory;
 import com.webank.wedatasphere.dss.workflow.common.entity.DSSFlow;
 import com.webank.wedatasphere.dss.workflow.constant.DSSWorkFlowConstant;
+import com.webank.wedatasphere.dss.workflow.dao.FlowMapper;
 import com.webank.wedatasphere.dss.workflow.dao.LockMapper;
 import com.webank.wedatasphere.dss.workflow.entity.DSSFlowEditLock;
+import com.webank.wedatasphere.dss.workflow.util.DSSFlowStatusUtils;
 import org.apache.linkis.DataWorkCloudApplication;
 import org.apache.linkis.common.utils.Utils;
 import org.apache.commons.lang.StringUtils;
+import org.apache.linkis.rpc.Sender;
 import org.apache.poi.util.StringUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.dao.DuplicateKeyException;
+import org.springframework.util.CollectionUtils;
 
 import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.Optional;
-import java.util.UUID;
+import java.util.*;
 import java.util.concurrent.DelayQueue;
 import java.util.concurrent.Delayed;
 import java.util.concurrent.TimeUnit;
 
+import static com.webank.wedatasphere.dss.workflow.constant.DSSWorkFlowConstant.FLOW_STATUS_PUSH;
+import static com.webank.wedatasphere.dss.workflow.constant.DSSWorkFlowConstant.FLOW_STATUS_SAVE;
+
 
 /**
  * 工作流编辑分布式锁
@@ -49,6 +61,8 @@ public class DSSFlowEditLockManager {
 
     private static LockMapper lockMapper;
 
+    private static FlowMapper flowMapper;
+
 
     private static final DelayQueue<UnLockEvent> unLockEvents = new DelayQueue<>();
     private static final ThreadLocal<SimpleDateFormat> sdf = ThreadLocal.withInitial(() -> new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"));
@@ -61,7 +75,16 @@ protected DSSFlowEditLockManager() {
         LOGGER.info("编辑锁超时时间为：{} ms", DSSWorkFlowConstant.DSS_FLOW_EDIT_LOCK_TIMEOUT.getValue());
         init();
         //程序重启时，删除所有编辑锁
-        lockMapper.deleteALL();
+        List<String> publishList = lockMapper.selectFlowIdByStatus(DSSWorkFlowConstant.FLOW_STATUS_PUBLISH);
+        List<String> pushList = lockMapper.selectFlowIdByStatus(DSSWorkFlowConstant.FLOW_STATUS_PUSH);
+        List<String> result = new ArrayList<>();
+        result.addAll(publishList);
+        result.addAll(pushList);
+        if (!CollectionUtils.isEmpty(result)) {
+            lockMapper.deleteExpectAfterSave(result);
+        }else {
+            lockMapper.deleteALL();
+        }
         Utils.defaultScheduler().scheduleAtFixedRate(() -> {
             try {
                 UnLockEvent pop = unLockEvents.poll();
@@ -173,6 +196,13 @@ public static void deleteLock(String flowEditLock) throws DSSErrorException {
             if (StringUtils.isNotBlank(flowEditLock)) {
                 DSSFlowEditLock dssFlowEditLock = lockMapper.getFlowEditLockByLockContent(flowEditLock);
                 if (dssFlowEditLock != null) {
+                    String status = lockMapper.selectStatusByFlowId(dssFlowEditLock.getFlowID());
+                    if (DSSWorkFlowConstant.FLOW_STATUS_SAVE.equals(status)) {
+                        DSSFlow dssFlow = flowMapper.selectFlowByID(dssFlowEditLock.getFlowID());
+                        DSSProject projectInfo = getProjectInfo(dssFlow.getProjectId());
+//                        pushProject(projectInfo.getName(), projectInfo.getWorkspaceId(), "resurce", "version", "path", projectInfo.getUsername(), "comment");
+                        DSSFlowStatusUtils.updateFlowStatus(dssFlow.getId(), FLOW_STATUS_PUSH);
+                    }
                     lockMapper.clearExpire(sdf.get().format(new Date(System.currentTimeMillis() - DSSWorkFlowConstant.DSS_FLOW_EDIT_LOCK_TIMEOUT.getValue())), dssFlowEditLock.getFlowID());
                 }
             }
@@ -182,6 +212,29 @@ public static void deleteLock(String flowEditLock) throws DSSErrorException {
         }
     }
 
+    public static DSSProject getProjectInfo(Long projectId) throws DSSErrorException {
+        ProjectInfoRequest projectInfoRequest = new ProjectInfoRequest();
+        projectInfoRequest.setProjectId(projectId);
+        DSSProject dssProject = RpcAskUtils.processAskException(DSSSenderServiceFactory.getOrCreateServiceInstance().getProjectServerSender()
+                .ask(projectInfoRequest), DSSProject.class, ProjectInfoRequest.class);
+        if (dssProject == null) {
+            throw new DSSErrorException(90001, "工程不存在");
+        }
+        return dssProject;
+    }
+
+    public static void pushProject(String projectName, Long workspaceId, String resource, String version, String path, String username, String comment) {
+        LOGGER.info("-------=======================begin to add testGit1=======================-------");
+        Sender gitSender = DSSSenderServiceFactory.getOrCreateServiceInstance().getGitSender();
+        Map<String, BmlResource> file = new HashMap<>();
+        // 测试数据 key表示项目名、value为项目BmlResource资源
+        file.put(path, new BmlResource(resource, version));
+        GitCommitRequest request1 = new GitCommitRequest(workspaceId, projectName, file, comment, username);
+        GitCommitResponse responseWorkflowValidNode = RpcAskUtils.processAskException(gitSender.ask(request1), GitCommitResponse.class, GitCommitRequest.class);
+        LOGGER.info("-------=======================End to add testGit1=======================-------: {}", responseWorkflowValidNode);
+    }
+
+
     public static String updateLock(String lock) throws DSSErrorException {
         if (StringUtils.isBlank(lock)) {
             throw new DSSErrorException(60066, "update workflow failed because you do not have flowEditLock!");
@@ -206,6 +259,10 @@ public static String updateLock(String lock) throws DSSErrorException {
     }
 
     public static boolean isLockExpire(DSSFlowEditLock flowEditLock) {
+        String status = lockMapper.selectStatusByFlowId(flowEditLock.getFlowID());
+        if (StringUtils.isEmpty(status) && DSSWorkFlowConstant.FLOW_STATUS_SAVE.equals(status)) {
+            return false;
+        }
         return System.currentTimeMillis() - flowEditLock.getUpdateTime().getTime() >= DSSWorkFlowConstant.DSS_FLOW_EDIT_LOCK_TIMEOUT.getValue();
     }
 
diff --git a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/service/impl/DSSFlowServiceImpl.java b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/service/impl/DSSFlowServiceImpl.java
index 0c2c3ff4f..0ae0ad149 100644
--- a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/service/impl/DSSFlowServiceImpl.java
+++ b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/service/impl/DSSFlowServiceImpl.java
@@ -58,6 +58,7 @@
 import com.webank.wedatasphere.dss.workflow.service.DSSFlowService;
 import com.webank.wedatasphere.dss.workflow.service.SaveFlowHook;
 import com.webank.wedatasphere.dss.workflow.service.WorkflowNodeService;
+import com.webank.wedatasphere.dss.workflow.util.DSSFlowStatusUtils;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang.StringUtils;
 import org.apache.commons.lang.exception.ExceptionUtils;
@@ -304,6 +305,7 @@ public String saveFlow(Long flowID,
         }
         saveFlowHook.afterSave(jsonFlow,dssFlow,parentFlowID);
         String version = bmlReturnMap.get("version").toString();
+        DSSFlowStatusUtils.updateFlowStatus(flowID, FLOW_STATUS_SAVE);
         return version;
     }
 
diff --git a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/service/impl/PublishServiceImpl.java b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/service/impl/PublishServiceImpl.java
index 92bdc280b..2c87df6b2 100644
--- a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/service/impl/PublishServiceImpl.java
+++ b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/service/impl/PublishServiceImpl.java
@@ -34,6 +34,7 @@
 import com.webank.wedatasphere.dss.workflow.constant.DSSWorkFlowConstant;
 import com.webank.wedatasphere.dss.workflow.service.DSSFlowService;
 import com.webank.wedatasphere.dss.workflow.service.PublishService;
+import com.webank.wedatasphere.dss.workflow.util.DSSFlowStatusUtils;
 import org.apache.commons.lang.StringUtils;
 import org.apache.linkis.rpc.Sender;
 import org.slf4j.Logger;
@@ -97,6 +98,7 @@ public String submitPublish(String convertUser, Long workflowId,
             if (response.getResponse().isFailed()) {
                 throw new DSSErrorException(50311, response.getResponse().getMessage());
             }
+            DSSFlowStatusUtils.updateFlowStatus(workflowId, DSSWorkFlowConstant.FLOW_STATUS_PUBLISH);
             return response.getId();
         } catch (DSSErrorException e) {
             throw e;
diff --git a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/util/DSSFlowStatusUtils.java b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/util/DSSFlowStatusUtils.java
new file mode 100644
index 000000000..ebce3fec8
--- /dev/null
+++ b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/util/DSSFlowStatusUtils.java
@@ -0,0 +1,17 @@
+package com.webank.wedatasphere.dss.workflow.util;
+
+import com.webank.wedatasphere.dss.workflow.dao.LockMapper;
+import org.apache.commons.lang.StringUtils;
+
+public class DSSFlowStatusUtils {
+    private static LockMapper lockMapper;
+
+    public static void updateFlowStatus(Long flowId, String status) {
+        String oldStatus = lockMapper.selectStatusByFlowId(flowId);
+        if (StringUtils.isEmpty(oldStatus)) {
+            lockMapper.insertFlowStatus(flowId, status);
+        } else {
+            lockMapper.updateFlowStatus(flowId, status);
+        }
+    }
+}

From fe56a5b0a66a0be3f9b364104efb7dbb8af1578d Mon Sep 17 00:00:00 2001
From: xlinliu <arionliu@webank.com>
Date: Thu, 11 Apr 2024 17:21:06 +0800
Subject: [PATCH 024/302] update mvn version

---
 assembly/dss-package/pom.xml                                | 2 +-
 assembly/pom.xml                                            | 2 +-
 dss-appconn/appconns/dss-datachecker-appconn/pom.xml        | 4 ++--
 dss-appconn/appconns/dss-dolphinscheduler-appconn/pom.xml   | 2 +-
 dss-appconn/appconns/dss-eventchecker-appconn/pom.xml       | 2 +-
 dss-appconn/appconns/dss-schedulis-appconn/pom.xml          | 2 +-
 dss-appconn/appconns/dss-scriptis-appconn/pom.xml           | 2 +-
 dss-appconn/appconns/dss-sendemail-appconn/pom.xml          | 2 +-
 .../dss-sendemail-appconn/sendemail-appconn-core/pom.xml    | 2 +-
 dss-appconn/appconns/dss-sso-appconn/pom.xml                | 2 +-
 dss-appconn/appconns/dss-workflow-appconn/pom.xml           | 2 +-
 dss-appconn/dss-appconn-core/pom.xml                        | 2 +-
 dss-appconn/dss-appconn-loader/pom.xml                      | 2 +-
 .../dss-appconn-manager/dss-appconn-manager-client/pom.xml  | 2 +-
 .../dss-appconn-manager/dss-appconn-manager-core/pom.xml    | 2 +-
 dss-appconn/dss-appconn-manager/pom.xml                     | 2 +-
 dss-appconn/dss-scheduler-appconn/pom.xml                   | 2 +-
 dss-appconn/linkis-appconn-engineplugin/pom.xml             | 2 +-
 dss-appconn/pom.xml                                         | 2 +-
 dss-apps/dss-apiservice-server/pom.xml                      | 2 +-
 dss-apps/dss-apps-server/pom.xml                            | 2 +-
 dss-apps/dss-data-api/dss-api-sql-template/pom.xml          | 2 +-
 dss-apps/dss-data-api/dss-data-api-server/pom.xml           | 2 +-
 dss-apps/dss-data-api/pom.xml                               | 2 +-
 dss-apps/dss-data-governance/dss-data-asset-server/pom.xml  | 2 +-
 .../dss-data-classification-server/pom.xml                  | 2 +-
 .../dss-data-governance/dss-data-governance-common/pom.xml  | 2 +-
 .../dss-data-governance/dss-data-governance-server/pom.xml  | 2 +-
 dss-apps/dss-data-governance/pom.xml                        | 2 +-
 dss-apps/dss-scriptis-server/pom.xml                        | 2 +-
 dss-apps/dss-user-guide/dss-user-guide-server/pom.xml       | 2 +-
 dss-apps/dss-user-guide/pom.xml                             | 2 +-
 dss-apps/pom.xml                                            | 2 +-
 dss-commons/dss-common/pom.xml                              | 2 +-
 dss-commons/dss-contextservice/pom.xml                      | 2 +-
 dss-commons/dss-sender-service/pom.xml                      | 2 +-
 dss-commons/pom.xml                                         | 2 +-
 dss-framework/dss-appconn-framework/pom.xml                 | 2 +-
 dss-framework/dss-framework-admin-service/pom.xml           | 2 +-
 dss-framework/dss-framework-common/pom.xml                  | 2 +-
 dss-framework/dss-framework-orchestrator-server/pom.xml     | 2 +-
 dss-framework/dss-framework-project-server/pom.xml          | 2 +-
 dss-framework/dss-framework-proxy-user-service/pom.xml      | 2 +-
 dss-framework/dss-framework-workspace-server/pom.xml        | 2 +-
 .../framework-plugins/dss-framework-migrate-server/pom.xml  | 2 +-
 .../dss-framework-orchestrator-publish/pom.xml              | 2 +-
 dss-framework/pom.xml                                       | 2 +-
 dss-git/dss-git-common/pom.xml                              | 2 +-
 dss-git/dss-git-server/pom.xml                              | 6 +++---
 dss-git/pom.xml                                             | 2 +-
 dss-orchestrator/dss-orchestrator-common/pom.xml            | 2 +-
 .../dss-orchestrator-conversion-standard/pom.xml            | 2 +-
 dss-orchestrator/dss-orchestrator-core/pom.xml              | 2 +-
 dss-orchestrator/dss-orchestrator-db/pom.xml                | 2 +-
 dss-orchestrator/dss-orchestrator-loader/pom.xml            | 2 +-
 .../dss-workflow/dss-flow-execution-server/pom.xml          | 2 +-
 .../dss-workflow/dss-linkis-node-execution/pom.xml          | 2 +-
 .../orchestrators/dss-workflow/dss-workflow-common/pom.xml  | 2 +-
 .../dss-workflow/dss-workflow-conversion-standard/pom.xml   | 2 +-
 .../orchestrators/dss-workflow/dss-workflow-sdk/pom.xml     | 2 +-
 .../orchestrators/dss-workflow/dss-workflow-server/pom.xml  | 2 +-
 dss-orchestrator/orchestrators/dss-workflow/pom.xml         | 2 +-
 dss-orchestrator/pom.xml                                    | 2 +-
 dss-server/pom.xml                                          | 2 +-
 .../development-process-standard-execution/pom.xml          | 2 +-
 .../development-process-standard/pom.xml                    | 2 +-
 dss-standard/dss-standard-common/pom.xml                    | 2 +-
 dss-standard/pom.xml                                        | 2 +-
 .../sso-standard/origin-sso-integration-standard/pom.xml    | 2 +-
 .../spring-origin-sso-integration-plugin/pom.xml            | 2 +-
 dss-standard/sso-standard/sso-integration-standard/pom.xml  | 2 +-
 dss-standard/structure-standard/dss-project-plugin/pom.xml  | 2 +-
 dss-standard/structure-standard/dss-role-plugin/pom.xml     | 2 +-
 .../dss-structure-integration-standard/pom.xml              | 2 +-
 .../spring-origin-dss-project-plugin/pom.xml                | 2 +-
 plugins/azkaban/linkis-jobtype/pom.xml                      | 2 +-
 .../dolphinscheduler/dolphinscheduler-prod-metrics/pom.xml  | 2 +-
 .../dolphinscheduler/dss-dolphinscheduler-client/pom.xml    | 2 +-
 plugins/dolphinscheduler/dss-dolphinscheduler-token/pom.xml | 2 +-
 plugins/dolphinscheduler/pom.xml                            | 2 +-
 plugins/linkis/dss-gateway-support/pom.xml                  | 2 +-
 pom.xml                                                     | 4 ++--
 82 files changed, 86 insertions(+), 86 deletions(-)

diff --git a/assembly/dss-package/pom.xml b/assembly/dss-package/pom.xml
index 6cb3c2907..73d9253cd 100644
--- a/assembly/dss-package/pom.xml
+++ b/assembly/dss-package/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.1.0.20-gitflow</version>
+        <version>1.1.0.20-gitflow-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/assembly/pom.xml b/assembly/pom.xml
index 36fe79357..bf92e3d58 100644
--- a/assembly/pom.xml
+++ b/assembly/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.1.0.20-gitflow</version>
+        <version>1.1.0.20-gitflow-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <packaging>pom</packaging>
diff --git a/dss-appconn/appconns/dss-datachecker-appconn/pom.xml b/dss-appconn/appconns/dss-datachecker-appconn/pom.xml
index a5a43f1ed..483f9bf18 100644
--- a/dss-appconn/appconns/dss-datachecker-appconn/pom.xml
+++ b/dss-appconn/appconns/dss-datachecker-appconn/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.1.0.20-gitflow</version>
+        <version>1.1.0.20-gitflow-SNAPSHOT</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
@@ -54,7 +54,7 @@
         <dependency>
             <groupId>com.webank.wedatasphere.dss</groupId>
             <artifactId>dss-origin-sso-integration-standard</artifactId>
-            <version>1.1.0.20-gitflow</version>
+            <version>1.1.0.20-gitflow-SNAPSHOT</version>
             <exclusions>
                 <exclusion>
                     <groupId>org.apache.linkis</groupId>
diff --git a/dss-appconn/appconns/dss-dolphinscheduler-appconn/pom.xml b/dss-appconn/appconns/dss-dolphinscheduler-appconn/pom.xml
index 65af4adf5..e141b828b 100644
--- a/dss-appconn/appconns/dss-dolphinscheduler-appconn/pom.xml
+++ b/dss-appconn/appconns/dss-dolphinscheduler-appconn/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.1.0.20-gitflow</version>
+        <version>1.1.0.20-gitflow-SNAPSHOT</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-appconn/appconns/dss-eventchecker-appconn/pom.xml b/dss-appconn/appconns/dss-eventchecker-appconn/pom.xml
index d6afbe555..8793bd119 100644
--- a/dss-appconn/appconns/dss-eventchecker-appconn/pom.xml
+++ b/dss-appconn/appconns/dss-eventchecker-appconn/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.1.0.20-gitflow</version>
+        <version>1.1.0.20-gitflow-SNAPSHOT</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-appconn/appconns/dss-schedulis-appconn/pom.xml b/dss-appconn/appconns/dss-schedulis-appconn/pom.xml
index 2b9db0eb8..ac316cf2b 100644
--- a/dss-appconn/appconns/dss-schedulis-appconn/pom.xml
+++ b/dss-appconn/appconns/dss-schedulis-appconn/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.1.0.20-gitflow</version>
+        <version>1.1.0.20-gitflow-SNAPSHOT</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-appconn/appconns/dss-scriptis-appconn/pom.xml b/dss-appconn/appconns/dss-scriptis-appconn/pom.xml
index f091d88d8..214635def 100644
--- a/dss-appconn/appconns/dss-scriptis-appconn/pom.xml
+++ b/dss-appconn/appconns/dss-scriptis-appconn/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.1.0.20-gitflow</version>
+        <version>1.1.0.20-gitflow-SNAPSHOT</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-appconn/appconns/dss-sendemail-appconn/pom.xml b/dss-appconn/appconns/dss-sendemail-appconn/pom.xml
index 734217f54..e6f10dd24 100644
--- a/dss-appconn/appconns/dss-sendemail-appconn/pom.xml
+++ b/dss-appconn/appconns/dss-sendemail-appconn/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.1.0.20-gitflow</version>
+        <version>1.1.0.20-gitflow-SNAPSHOT</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-appconn/appconns/dss-sendemail-appconn/sendemail-appconn-core/pom.xml b/dss-appconn/appconns/dss-sendemail-appconn/sendemail-appconn-core/pom.xml
index 2ef6b8024..8cf886e56 100644
--- a/dss-appconn/appconns/dss-sendemail-appconn/sendemail-appconn-core/pom.xml
+++ b/dss-appconn/appconns/dss-sendemail-appconn/sendemail-appconn-core/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.1.0.20-gitflow</version>
+        <version>1.1.0.20-gitflow-SNAPSHOT</version>
         <relativePath>../../../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-appconn/appconns/dss-sso-appconn/pom.xml b/dss-appconn/appconns/dss-sso-appconn/pom.xml
index 61dbc445d..be4d1d293 100644
--- a/dss-appconn/appconns/dss-sso-appconn/pom.xml
+++ b/dss-appconn/appconns/dss-sso-appconn/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.1.0.20-gitflow</version>
+        <version>1.1.0.20-gitflow-SNAPSHOT</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-appconn/appconns/dss-workflow-appconn/pom.xml b/dss-appconn/appconns/dss-workflow-appconn/pom.xml
index b46b588aa..c940c50ed 100644
--- a/dss-appconn/appconns/dss-workflow-appconn/pom.xml
+++ b/dss-appconn/appconns/dss-workflow-appconn/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.1.0.20-gitflow</version>
+        <version>1.1.0.20-gitflow-SNAPSHOT</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-appconn/dss-appconn-core/pom.xml b/dss-appconn/dss-appconn-core/pom.xml
index f4328913c..9f465e35c 100644
--- a/dss-appconn/dss-appconn-core/pom.xml
+++ b/dss-appconn/dss-appconn-core/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.1.0.20-gitflow</version>
+        <version>1.1.0.20-gitflow-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-appconn/dss-appconn-loader/pom.xml b/dss-appconn/dss-appconn-loader/pom.xml
index 1d66b58f7..9ec086193 100644
--- a/dss-appconn/dss-appconn-loader/pom.xml
+++ b/dss-appconn/dss-appconn-loader/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.1.0.20-gitflow</version>
+        <version>1.1.0.20-gitflow-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-appconn/dss-appconn-manager/dss-appconn-manager-client/pom.xml b/dss-appconn/dss-appconn-manager/dss-appconn-manager-client/pom.xml
index 9ad85e38c..0323f73e5 100644
--- a/dss-appconn/dss-appconn-manager/dss-appconn-manager-client/pom.xml
+++ b/dss-appconn/dss-appconn-manager/dss-appconn-manager-client/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <artifactId>dss</artifactId>
     <groupId>com.webank.wedatasphere.dss</groupId>
-    <version>1.1.0.20-gitflow</version>
+    <version>1.1.0.20-gitflow-SNAPSHOT</version>
     <relativePath>../../../pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
diff --git a/dss-appconn/dss-appconn-manager/dss-appconn-manager-core/pom.xml b/dss-appconn/dss-appconn-manager/dss-appconn-manager-core/pom.xml
index 3a9eae97d..aa9fe2892 100644
--- a/dss-appconn/dss-appconn-manager/dss-appconn-manager-core/pom.xml
+++ b/dss-appconn/dss-appconn-manager/dss-appconn-manager-core/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <artifactId>dss</artifactId>
     <groupId>com.webank.wedatasphere.dss</groupId>
-    <version>1.1.0.20-gitflow</version>
+    <version>1.1.0.20-gitflow-SNAPSHOT</version>
     <relativePath>../../../pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
diff --git a/dss-appconn/dss-appconn-manager/pom.xml b/dss-appconn/dss-appconn-manager/pom.xml
index 9a05c4f5b..20d83a39e 100644
--- a/dss-appconn/dss-appconn-manager/pom.xml
+++ b/dss-appconn/dss-appconn-manager/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <artifactId>dss</artifactId>
     <groupId>com.webank.wedatasphere.dss</groupId>
-    <version>1.1.0.20-gitflow</version>
+    <version>1.1.0.20-gitflow-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
diff --git a/dss-appconn/dss-scheduler-appconn/pom.xml b/dss-appconn/dss-scheduler-appconn/pom.xml
index 6a3feb36b..941316f0f 100644
--- a/dss-appconn/dss-scheduler-appconn/pom.xml
+++ b/dss-appconn/dss-scheduler-appconn/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.1.0.20-gitflow</version>
+        <version>1.1.0.20-gitflow-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-appconn/linkis-appconn-engineplugin/pom.xml b/dss-appconn/linkis-appconn-engineplugin/pom.xml
index 4293c6b3c..3f0c750c5 100644
--- a/dss-appconn/linkis-appconn-engineplugin/pom.xml
+++ b/dss-appconn/linkis-appconn-engineplugin/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.1.0.20-gitflow</version>
+        <version>1.1.0.20-gitflow-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-appconn/pom.xml b/dss-appconn/pom.xml
index df5cf4be5..303c1e188 100644
--- a/dss-appconn/pom.xml
+++ b/dss-appconn/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.1.0.20-gitflow</version>
+        <version>1.1.0.20-gitflow-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-apps/dss-apiservice-server/pom.xml b/dss-apps/dss-apiservice-server/pom.xml
index deed27df2..bf9772482 100644
--- a/dss-apps/dss-apiservice-server/pom.xml
+++ b/dss-apps/dss-apiservice-server/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.1.0.20-gitflow</version>
+        <version>1.1.0.20-gitflow-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-apps/dss-apps-server/pom.xml b/dss-apps/dss-apps-server/pom.xml
index 685a787cf..f82116ca6 100644
--- a/dss-apps/dss-apps-server/pom.xml
+++ b/dss-apps/dss-apps-server/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.1.0.20-gitflow</version>
+        <version>1.1.0.20-gitflow-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-apps/dss-data-api/dss-api-sql-template/pom.xml b/dss-apps/dss-data-api/dss-api-sql-template/pom.xml
index 6e55b87f7..d650e6c38 100644
--- a/dss-apps/dss-data-api/dss-api-sql-template/pom.xml
+++ b/dss-apps/dss-data-api/dss-api-sql-template/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.1.0.20-gitflow</version>
+        <version>1.1.0.20-gitflow-SNAPSHOT</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-apps/dss-data-api/dss-data-api-server/pom.xml b/dss-apps/dss-data-api/dss-data-api-server/pom.xml
index c68ef8ace..16e28342e 100644
--- a/dss-apps/dss-data-api/dss-data-api-server/pom.xml
+++ b/dss-apps/dss-data-api/dss-data-api-server/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.1.0.20-gitflow</version>
+        <version>1.1.0.20-gitflow-SNAPSHOT</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-apps/dss-data-api/pom.xml b/dss-apps/dss-data-api/pom.xml
index 3edfc57ac..b8e46bb6b 100644
--- a/dss-apps/dss-data-api/pom.xml
+++ b/dss-apps/dss-data-api/pom.xml
@@ -6,7 +6,7 @@
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
         <relativePath>../../pom.xml</relativePath>
-        <version>1.1.0.20-gitflow</version>
+        <version>1.1.0.20-gitflow-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>dss-data-api</artifactId>
diff --git a/dss-apps/dss-data-governance/dss-data-asset-server/pom.xml b/dss-apps/dss-data-governance/dss-data-asset-server/pom.xml
index 07cb7f707..956f880ff 100644
--- a/dss-apps/dss-data-governance/dss-data-asset-server/pom.xml
+++ b/dss-apps/dss-data-governance/dss-data-asset-server/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.1.0.20-gitflow</version>
+        <version>1.1.0.20-gitflow-SNAPSHOT</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-apps/dss-data-governance/dss-data-classification-server/pom.xml b/dss-apps/dss-data-governance/dss-data-classification-server/pom.xml
index 3acdb5294..cc2ddc178 100644
--- a/dss-apps/dss-data-governance/dss-data-classification-server/pom.xml
+++ b/dss-apps/dss-data-governance/dss-data-classification-server/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.1.0.20-gitflow</version>
+        <version>1.1.0.20-gitflow-SNAPSHOT</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-apps/dss-data-governance/dss-data-governance-common/pom.xml b/dss-apps/dss-data-governance/dss-data-governance-common/pom.xml
index 8c647ec8f..102bf7354 100644
--- a/dss-apps/dss-data-governance/dss-data-governance-common/pom.xml
+++ b/dss-apps/dss-data-governance/dss-data-governance-common/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.1.0.20-gitflow</version>
+        <version>1.1.0.20-gitflow-SNAPSHOT</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-apps/dss-data-governance/dss-data-governance-server/pom.xml b/dss-apps/dss-data-governance/dss-data-governance-server/pom.xml
index 4f23fec59..6d4f1d4e6 100644
--- a/dss-apps/dss-data-governance/dss-data-governance-server/pom.xml
+++ b/dss-apps/dss-data-governance/dss-data-governance-server/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.1.0.20-gitflow</version>
+        <version>1.1.0.20-gitflow-SNAPSHOT</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-apps/dss-data-governance/pom.xml b/dss-apps/dss-data-governance/pom.xml
index 0b7c329db..dc137fac1 100644
--- a/dss-apps/dss-data-governance/pom.xml
+++ b/dss-apps/dss-data-governance/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.1.0.20-gitflow</version>
+        <version>1.1.0.20-gitflow-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-apps/dss-scriptis-server/pom.xml b/dss-apps/dss-scriptis-server/pom.xml
index a80964187..c552993eb 100644
--- a/dss-apps/dss-scriptis-server/pom.xml
+++ b/dss-apps/dss-scriptis-server/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.1.0.20-gitflow</version>
+        <version>1.1.0.20-gitflow-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/dss-apps/dss-user-guide/dss-user-guide-server/pom.xml b/dss-apps/dss-user-guide/dss-user-guide-server/pom.xml
index 2027bc57e..0da1d7523 100644
--- a/dss-apps/dss-user-guide/dss-user-guide-server/pom.xml
+++ b/dss-apps/dss-user-guide/dss-user-guide-server/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>dss-user-guide</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.1.0.20-gitflow</version>
+        <version>1.1.0.20-gitflow-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-apps/dss-user-guide/pom.xml b/dss-apps/dss-user-guide/pom.xml
index 4bcd02625..3eb89b9e2 100644
--- a/dss-apps/dss-user-guide/pom.xml
+++ b/dss-apps/dss-user-guide/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.1.0.20-gitflow</version>
+        <version>1.1.0.20-gitflow-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-apps/pom.xml b/dss-apps/pom.xml
index 92aa89b16..5043c1e00 100644
--- a/dss-apps/pom.xml
+++ b/dss-apps/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.1.0.20-gitflow</version>
+        <version>1.1.0.20-gitflow-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-commons/dss-common/pom.xml b/dss-commons/dss-common/pom.xml
index eaa3cc495..047f299e5 100644
--- a/dss-commons/dss-common/pom.xml
+++ b/dss-commons/dss-common/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <artifactId>dss-commons</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.1.0.20-gitflow</version>
+        <version>1.1.0.20-gitflow-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>dss-common</artifactId>
diff --git a/dss-commons/dss-contextservice/pom.xml b/dss-commons/dss-contextservice/pom.xml
index eca1886cd..95c945f41 100644
--- a/dss-commons/dss-contextservice/pom.xml
+++ b/dss-commons/dss-contextservice/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss-commons</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.1.0.20-gitflow</version>
+        <version>1.1.0.20-gitflow-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>dss-contextservice</artifactId>
diff --git a/dss-commons/dss-sender-service/pom.xml b/dss-commons/dss-sender-service/pom.xml
index 30ddf14c4..8c4e6ca31 100644
--- a/dss-commons/dss-sender-service/pom.xml
+++ b/dss-commons/dss-sender-service/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss-commons</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.1.0.20-gitflow</version>
+        <version>1.1.0.20-gitflow-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-commons/pom.xml b/dss-commons/pom.xml
index 1594156cf..1df2e96b3 100644
--- a/dss-commons/pom.xml
+++ b/dss-commons/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.1.0.20-gitflow</version>
+        <version>1.1.0.20-gitflow-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-framework/dss-appconn-framework/pom.xml b/dss-framework/dss-appconn-framework/pom.xml
index 2d942b819..87bd41044 100644
--- a/dss-framework/dss-appconn-framework/pom.xml
+++ b/dss-framework/dss-appconn-framework/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.1.0.20-gitflow</version>
+        <version>1.1.0.20-gitflow-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-framework/dss-framework-admin-service/pom.xml b/dss-framework/dss-framework-admin-service/pom.xml
index 78d894682..ae743cb6d 100644
--- a/dss-framework/dss-framework-admin-service/pom.xml
+++ b/dss-framework/dss-framework-admin-service/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.1.0.20-gitflow</version>
+        <version>1.1.0.20-gitflow-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/dss-framework/dss-framework-common/pom.xml b/dss-framework/dss-framework-common/pom.xml
index 893779971..acdd56ad7 100644
--- a/dss-framework/dss-framework-common/pom.xml
+++ b/dss-framework/dss-framework-common/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.1.0.20-gitflow</version>
+        <version>1.1.0.20-gitflow-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-framework/dss-framework-orchestrator-server/pom.xml b/dss-framework/dss-framework-orchestrator-server/pom.xml
index a277dddbf..cf6dab9da 100644
--- a/dss-framework/dss-framework-orchestrator-server/pom.xml
+++ b/dss-framework/dss-framework-orchestrator-server/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.1.0.20-gitflow</version>
+        <version>1.1.0.20-gitflow-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-framework/dss-framework-project-server/pom.xml b/dss-framework/dss-framework-project-server/pom.xml
index 277ca4acc..89d321c5e 100644
--- a/dss-framework/dss-framework-project-server/pom.xml
+++ b/dss-framework/dss-framework-project-server/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.1.0.20-gitflow</version>
+        <version>1.1.0.20-gitflow-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-framework/dss-framework-proxy-user-service/pom.xml b/dss-framework/dss-framework-proxy-user-service/pom.xml
index 694aafaee..7d8199be0 100644
--- a/dss-framework/dss-framework-proxy-user-service/pom.xml
+++ b/dss-framework/dss-framework-proxy-user-service/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>dss-framework</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.1.0.20-gitflow</version>
+        <version>1.1.0.20-gitflow-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/dss-framework/dss-framework-workspace-server/pom.xml b/dss-framework/dss-framework-workspace-server/pom.xml
index 4dc237583..8ce86cd04 100644
--- a/dss-framework/dss-framework-workspace-server/pom.xml
+++ b/dss-framework/dss-framework-workspace-server/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.1.0.20-gitflow</version>
+        <version>1.1.0.20-gitflow-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-framework/framework-plugins/dss-framework-migrate-server/pom.xml b/dss-framework/framework-plugins/dss-framework-migrate-server/pom.xml
index cbba44804..c60a6361a 100644
--- a/dss-framework/framework-plugins/dss-framework-migrate-server/pom.xml
+++ b/dss-framework/framework-plugins/dss-framework-migrate-server/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.1.0.20-gitflow</version>
+        <version>1.1.0.20-gitflow-SNAPSHOT</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-framework/framework-plugins/dss-framework-orchestrator-publish/pom.xml b/dss-framework/framework-plugins/dss-framework-orchestrator-publish/pom.xml
index f353752b2..d5ea8a20e 100644
--- a/dss-framework/framework-plugins/dss-framework-orchestrator-publish/pom.xml
+++ b/dss-framework/framework-plugins/dss-framework-orchestrator-publish/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.1.0.20-gitflow</version>
+        <version>1.1.0.20-gitflow-SNAPSHOT</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-framework/pom.xml b/dss-framework/pom.xml
index 03d5e141f..30768829c 100644
--- a/dss-framework/pom.xml
+++ b/dss-framework/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.1.0.20-gitflow</version>
+        <version>1.1.0.20-gitflow-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-git/dss-git-common/pom.xml b/dss-git/dss-git-common/pom.xml
index 1d68d21cd..6031181ce 100644
--- a/dss-git/dss-git-common/pom.xml
+++ b/dss-git/dss-git-common/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>dss-git</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.1.0.20-gitflow</version>
+        <version>1.1.0.20-gitflow-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/dss-git/dss-git-server/pom.xml b/dss-git/dss-git-server/pom.xml
index 7415c4676..ed9370e1f 100644
--- a/dss-git/dss-git-server/pom.xml
+++ b/dss-git/dss-git-server/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>dss-git</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.1.0.20-gitflow</version>
+        <version>1.1.0.20-gitflow-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -15,7 +15,7 @@
         <dependency>
             <groupId>com.webank.wedatasphere.dss</groupId>
             <artifactId>dss-common</artifactId>
-            <version>1.1.0.20-gitflow</version>
+            <version>1.1.0.20-gitflow-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>com.webank.wedatasphere.dss</groupId>
@@ -25,7 +25,7 @@
         <dependency>
             <groupId>com.webank.wedatasphere.dss</groupId>
             <artifactId>dss-git-common</artifactId>
-            <version>1.1.0.20-gitflow</version>
+            <version>1.1.0.20-gitflow-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.eclipse.jgit</groupId>
diff --git a/dss-git/pom.xml b/dss-git/pom.xml
index f5bf084f3..cdb92b9ba 100644
--- a/dss-git/pom.xml
+++ b/dss-git/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.1.0.20-gitflow</version>
+        <version>1.1.0.20-gitflow-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/dss-orchestrator/dss-orchestrator-common/pom.xml b/dss-orchestrator/dss-orchestrator-common/pom.xml
index 2664da0fb..3a1da0d89 100644
--- a/dss-orchestrator/dss-orchestrator-common/pom.xml
+++ b/dss-orchestrator/dss-orchestrator-common/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.1.0.20-gitflow</version>
+        <version>1.1.0.20-gitflow-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-orchestrator/dss-orchestrator-conversion-standard/pom.xml b/dss-orchestrator/dss-orchestrator-conversion-standard/pom.xml
index 81bc296cd..aec2e5db4 100644
--- a/dss-orchestrator/dss-orchestrator-conversion-standard/pom.xml
+++ b/dss-orchestrator/dss-orchestrator-conversion-standard/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <artifactId>dss-orchestrator</artifactId>
     <groupId>com.webank.wedatasphere.dss</groupId>
-    <version>1.1.0.20-gitflow</version>
+    <version>1.1.0.20-gitflow-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
diff --git a/dss-orchestrator/dss-orchestrator-core/pom.xml b/dss-orchestrator/dss-orchestrator-core/pom.xml
index f4632f8d9..3e9b2bfcc 100644
--- a/dss-orchestrator/dss-orchestrator-core/pom.xml
+++ b/dss-orchestrator/dss-orchestrator-core/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.1.0.20-gitflow</version>
+        <version>1.1.0.20-gitflow-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-orchestrator/dss-orchestrator-db/pom.xml b/dss-orchestrator/dss-orchestrator-db/pom.xml
index e0ff81661..c27c6c752 100644
--- a/dss-orchestrator/dss-orchestrator-db/pom.xml
+++ b/dss-orchestrator/dss-orchestrator-db/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.1.0.20-gitflow</version>
+        <version>1.1.0.20-gitflow-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-orchestrator/dss-orchestrator-loader/pom.xml b/dss-orchestrator/dss-orchestrator-loader/pom.xml
index 786b146ed..f4938ee12 100644
--- a/dss-orchestrator/dss-orchestrator-loader/pom.xml
+++ b/dss-orchestrator/dss-orchestrator-loader/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.1.0.20-gitflow</version>
+        <version>1.1.0.20-gitflow-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-orchestrator/orchestrators/dss-workflow/dss-flow-execution-server/pom.xml b/dss-orchestrator/orchestrators/dss-workflow/dss-flow-execution-server/pom.xml
index 71ebf0533..6c84379c1 100644
--- a/dss-orchestrator/orchestrators/dss-workflow/dss-flow-execution-server/pom.xml
+++ b/dss-orchestrator/orchestrators/dss-workflow/dss-flow-execution-server/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.1.0.20-gitflow</version>
+        <version>1.1.0.20-gitflow-SNAPSHOT</version>
         <relativePath>../../../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-orchestrator/orchestrators/dss-workflow/dss-linkis-node-execution/pom.xml b/dss-orchestrator/orchestrators/dss-workflow/dss-linkis-node-execution/pom.xml
index 267159e48..00a3609a5 100644
--- a/dss-orchestrator/orchestrators/dss-workflow/dss-linkis-node-execution/pom.xml
+++ b/dss-orchestrator/orchestrators/dss-workflow/dss-linkis-node-execution/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.1.0.20-gitflow</version>
+        <version>1.1.0.20-gitflow-SNAPSHOT</version>
         <relativePath>../../../../pom.xml</relativePath>
     </parent>
     
diff --git a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-common/pom.xml b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-common/pom.xml
index 19ed8ba51..636776c9a 100644
--- a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-common/pom.xml
+++ b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-common/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.1.0.20-gitflow</version>
+        <version>1.1.0.20-gitflow-SNAPSHOT</version>
         <relativePath>../../../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-conversion-standard/pom.xml b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-conversion-standard/pom.xml
index b04d2f827..f45c507e0 100644
--- a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-conversion-standard/pom.xml
+++ b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-conversion-standard/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <artifactId>dss-workflow</artifactId>
     <groupId>com.webank.wedatasphere.dss</groupId>
-    <version>1.1.0.20-gitflow</version>
+    <version>1.1.0.20-gitflow-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
diff --git a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-sdk/pom.xml b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-sdk/pom.xml
index 1bb38bd47..c9ac573c6 100644
--- a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-sdk/pom.xml
+++ b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-sdk/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss-workflow</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.1.0.20-gitflow</version>
+        <version>1.1.0.20-gitflow-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/pom.xml b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/pom.xml
index 7a719f9f7..cadabe8ac 100644
--- a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/pom.xml
+++ b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.1.0.20-gitflow</version>
+        <version>1.1.0.20-gitflow-SNAPSHOT</version>
         <relativePath>../../../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-orchestrator/orchestrators/dss-workflow/pom.xml b/dss-orchestrator/orchestrators/dss-workflow/pom.xml
index dd0332ed0..9aa7450c0 100644
--- a/dss-orchestrator/orchestrators/dss-workflow/pom.xml
+++ b/dss-orchestrator/orchestrators/dss-workflow/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.1.0.20-gitflow</version>
+        <version>1.1.0.20-gitflow-SNAPSHOT</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-orchestrator/pom.xml b/dss-orchestrator/pom.xml
index 7db5c88d5..68dbba3b6 100644
--- a/dss-orchestrator/pom.xml
+++ b/dss-orchestrator/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.1.0.20-gitflow</version>
+        <version>1.1.0.20-gitflow-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-server/pom.xml b/dss-server/pom.xml
index 2a0bea047..1256a846d 100644
--- a/dss-server/pom.xml
+++ b/dss-server/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.1.0.20-gitflow</version>
+        <version>1.1.0.20-gitflow-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-standard/development-standard/development-process-standard-execution/pom.xml b/dss-standard/development-standard/development-process-standard-execution/pom.xml
index 73152d53f..2e792a15b 100644
--- a/dss-standard/development-standard/development-process-standard-execution/pom.xml
+++ b/dss-standard/development-standard/development-process-standard-execution/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <artifactId>dss</artifactId>
     <groupId>com.webank.wedatasphere.dss</groupId>
-    <version>1.1.0.20-gitflow</version>
+    <version>1.1.0.20-gitflow-SNAPSHOT</version>
     <relativePath>../../../pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
diff --git a/dss-standard/development-standard/development-process-standard/pom.xml b/dss-standard/development-standard/development-process-standard/pom.xml
index 9e2eeeddc..e5a87317a 100644
--- a/dss-standard/development-standard/development-process-standard/pom.xml
+++ b/dss-standard/development-standard/development-process-standard/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <artifactId>dss</artifactId>
     <groupId>com.webank.wedatasphere.dss</groupId>
-    <version>1.1.0.20-gitflow</version>
+    <version>1.1.0.20-gitflow-SNAPSHOT</version>
     <relativePath>../../../pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
diff --git a/dss-standard/dss-standard-common/pom.xml b/dss-standard/dss-standard-common/pom.xml
index 0eb04080c..02d0026f0 100644
--- a/dss-standard/dss-standard-common/pom.xml
+++ b/dss-standard/dss-standard-common/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <artifactId>dss</artifactId>
     <groupId>com.webank.wedatasphere.dss</groupId>
-    <version>1.1.0.20-gitflow</version>
+    <version>1.1.0.20-gitflow-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
diff --git a/dss-standard/pom.xml b/dss-standard/pom.xml
index 407d4b310..e7adf85ec 100644
--- a/dss-standard/pom.xml
+++ b/dss-standard/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <artifactId>dss</artifactId>
     <groupId>com.webank.wedatasphere.dss</groupId>
-    <version>1.1.0.20-gitflow</version>
+    <version>1.1.0.20-gitflow-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
diff --git a/dss-standard/sso-standard/origin-sso-integration-standard/pom.xml b/dss-standard/sso-standard/origin-sso-integration-standard/pom.xml
index 53e3df0c9..e354d5ff0 100644
--- a/dss-standard/sso-standard/origin-sso-integration-standard/pom.xml
+++ b/dss-standard/sso-standard/origin-sso-integration-standard/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <artifactId>dss</artifactId>
     <groupId>com.webank.wedatasphere.dss</groupId>
-    <version>1.1.0.20-gitflow</version>
+    <version>1.1.0.20-gitflow-SNAPSHOT</version>
     <relativePath>../../../pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
diff --git a/dss-standard/sso-standard/spring-origin-sso-integration-plugin/pom.xml b/dss-standard/sso-standard/spring-origin-sso-integration-plugin/pom.xml
index 3d0decf4d..c8674f6b0 100644
--- a/dss-standard/sso-standard/spring-origin-sso-integration-plugin/pom.xml
+++ b/dss-standard/sso-standard/spring-origin-sso-integration-plugin/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <artifactId>dss</artifactId>
     <groupId>com.webank.wedatasphere.dss</groupId>
-    <version>1.1.0.20-gitflow</version>
+    <version>1.1.0.20-gitflow-SNAPSHOT</version>
     <relativePath>../../../pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
diff --git a/dss-standard/sso-standard/sso-integration-standard/pom.xml b/dss-standard/sso-standard/sso-integration-standard/pom.xml
index ae6b0934e..88a2fd29f 100644
--- a/dss-standard/sso-standard/sso-integration-standard/pom.xml
+++ b/dss-standard/sso-standard/sso-integration-standard/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <artifactId>dss</artifactId>
     <groupId>com.webank.wedatasphere.dss</groupId>
-    <version>1.1.0.20-gitflow</version>
+    <version>1.1.0.20-gitflow-SNAPSHOT</version>
     <relativePath>../../../pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
diff --git a/dss-standard/structure-standard/dss-project-plugin/pom.xml b/dss-standard/structure-standard/dss-project-plugin/pom.xml
index 201653ce4..0653c70b9 100644
--- a/dss-standard/structure-standard/dss-project-plugin/pom.xml
+++ b/dss-standard/structure-standard/dss-project-plugin/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <artifactId>dss</artifactId>
     <groupId>com.webank.wedatasphere.dss</groupId>
-    <version>1.1.0.20-gitflow</version>
+    <version>1.1.0.20-gitflow-SNAPSHOT</version>
     <relativePath>../../../pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
diff --git a/dss-standard/structure-standard/dss-role-plugin/pom.xml b/dss-standard/structure-standard/dss-role-plugin/pom.xml
index d998d70cf..eaf45a494 100644
--- a/dss-standard/structure-standard/dss-role-plugin/pom.xml
+++ b/dss-standard/structure-standard/dss-role-plugin/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <artifactId>dss</artifactId>
     <groupId>com.webank.wedatasphere.dss</groupId>
-    <version>1.1.0.20-gitflow</version>
+    <version>1.1.0.20-gitflow-SNAPSHOT</version>
     <relativePath>../../../pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
diff --git a/dss-standard/structure-standard/dss-structure-integration-standard/pom.xml b/dss-standard/structure-standard/dss-structure-integration-standard/pom.xml
index c6a8ade84..4be7d394b 100644
--- a/dss-standard/structure-standard/dss-structure-integration-standard/pom.xml
+++ b/dss-standard/structure-standard/dss-structure-integration-standard/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <artifactId>dss</artifactId>
     <groupId>com.webank.wedatasphere.dss</groupId>
-    <version>1.1.0.20-gitflow</version>
+    <version>1.1.0.20-gitflow-SNAPSHOT</version>
     <relativePath>../../../pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
diff --git a/dss-standard/structure-standard/spring-origin-dss-project-plugin/pom.xml b/dss-standard/structure-standard/spring-origin-dss-project-plugin/pom.xml
index f32d4ff68..3a359028d 100644
--- a/dss-standard/structure-standard/spring-origin-dss-project-plugin/pom.xml
+++ b/dss-standard/structure-standard/spring-origin-dss-project-plugin/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <artifactId>dss</artifactId>
     <groupId>com.webank.wedatasphere.dss</groupId>
-    <version>1.1.0.20-gitflow</version>
+    <version>1.1.0.20-gitflow-SNAPSHOT</version>
     <relativePath>../../../pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
diff --git a/plugins/azkaban/linkis-jobtype/pom.xml b/plugins/azkaban/linkis-jobtype/pom.xml
index 1df83160f..b356cba44 100644
--- a/plugins/azkaban/linkis-jobtype/pom.xml
+++ b/plugins/azkaban/linkis-jobtype/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.1.0.20-gitflow</version>
+        <version>1.1.0.20-gitflow-SNAPSHOT</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
     <artifactId>linkis-jobtype</artifactId>
diff --git a/plugins/dolphinscheduler/dolphinscheduler-prod-metrics/pom.xml b/plugins/dolphinscheduler/dolphinscheduler-prod-metrics/pom.xml
index ba7b8e3f6..a6d6f09c5 100644
--- a/plugins/dolphinscheduler/dolphinscheduler-prod-metrics/pom.xml
+++ b/plugins/dolphinscheduler/dolphinscheduler-prod-metrics/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <artifactId>dss-plugin-dolphinscheduler</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.1.0.20-gitflow</version>
+        <version>1.1.0.20-gitflow-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/plugins/dolphinscheduler/dss-dolphinscheduler-client/pom.xml b/plugins/dolphinscheduler/dss-dolphinscheduler-client/pom.xml
index 4d39d90a5..9d7bae316 100644
--- a/plugins/dolphinscheduler/dss-dolphinscheduler-client/pom.xml
+++ b/plugins/dolphinscheduler/dss-dolphinscheduler-client/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <artifactId>dss-plugin-dolphinscheduler</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.1.0.20-gitflow</version>
+        <version>1.1.0.20-gitflow-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/plugins/dolphinscheduler/dss-dolphinscheduler-token/pom.xml b/plugins/dolphinscheduler/dss-dolphinscheduler-token/pom.xml
index dd082dd2d..6126d2cdf 100644
--- a/plugins/dolphinscheduler/dss-dolphinscheduler-token/pom.xml
+++ b/plugins/dolphinscheduler/dss-dolphinscheduler-token/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <artifactId>dss-plugin-dolphinscheduler</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.1.0.20-gitflow</version>
+        <version>1.1.0.20-gitflow-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/plugins/dolphinscheduler/pom.xml b/plugins/dolphinscheduler/pom.xml
index b4ab5b2e6..00877c8a6 100644
--- a/plugins/dolphinscheduler/pom.xml
+++ b/plugins/dolphinscheduler/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <artifactId>dss</artifactId>
     <groupId>com.webank.wedatasphere.dss</groupId>
-    <version>1.1.0.20-gitflow</version>
+    <version>1.1.0.20-gitflow-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
diff --git a/plugins/linkis/dss-gateway-support/pom.xml b/plugins/linkis/dss-gateway-support/pom.xml
index 20214563d..8388c8978 100644
--- a/plugins/linkis/dss-gateway-support/pom.xml
+++ b/plugins/linkis/dss-gateway-support/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.1.0.20-gitflow</version>
+        <version>1.1.0.20-gitflow-SNAPSHOT</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/pom.xml b/pom.xml
index 40a361154..fdc31062b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
     <packaging>pom</packaging>
     <groupId>com.webank.wedatasphere.dss</groupId>
     <artifactId>dss</artifactId>
-    <version>1.1.0.20-gitflow</version>
+    <version>1.1.0.20-gitflow-SNAPSHOT</version>
 
     <modules>
         <module>dss-commons</module>
@@ -41,7 +41,7 @@
     </modules>
 
     <properties>
-        <dss.version>1.1.0.20-gitflow</dss.version>
+        <dss.version>1.1.0.20-gitflow-SNAPSHOT</dss.version>
         <linkis.version>1.1.19-wds-SNAPSHOT</linkis.version>
         <scala.version>2.11.12</scala.version>
         <jdk.compile.version>1.8</jdk.compile.version>

From 5b131eb6022d6b5220ab7ca2faf7bd106cf701c2 Mon Sep 17 00:00:00 2001
From: xlinliu <arionliu@webank.com>
Date: Thu, 11 Apr 2024 21:52:54 +0800
Subject: [PATCH 025/302] =?UTF-8?q?=E5=AF=BC=E5=85=A5=E5=AF=BC=E5=87=BA?=
 =?UTF-8?q?=E5=9F=BA=E4=BA=8E=E6=96=B0=E6=A0=BC=E5=BC=8F=E6=96=87=E4=BB=B6?=
 =?UTF-8?q?=E7=BB=93=E6=9E=84=20fix1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../workflow/io/export/impl/WorkFlowExportServiceImpl.java    | 3 ---
 .../dss/workflow/io/input/impl/NodeInputServiceImpl.java      | 4 ++--
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/io/export/impl/WorkFlowExportServiceImpl.java b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/io/export/impl/WorkFlowExportServiceImpl.java
index 862432b02..cd0e945d4 100644
--- a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/io/export/impl/WorkFlowExportServiceImpl.java
+++ b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/io/export/impl/WorkFlowExportServiceImpl.java
@@ -306,9 +306,6 @@ private String extractAndExportParams(String flowJson,String flowCodePath) throw
             JsonObject node = element.getAsJsonObject();
             JsonElement params = node.remove("params");
             String nodeName = Optional.ofNullable(node.get("title")).map(JsonElement::getAsString).orElse(null);
-            if (params == null || nodeName == null) {
-                continue;
-            }
             String nodeParamsPath = IoUtils.addFileSeparator(flowCodePath, nodeName, NODE_PARAMS_FILE_NAME);
             String paramsJson = gson.toJson(params);
             try (
diff --git a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/io/input/impl/NodeInputServiceImpl.java b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/io/input/impl/NodeInputServiceImpl.java
index bef421a56..27d8c8a1e 100644
--- a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/io/input/impl/NodeInputServiceImpl.java
+++ b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/io/input/impl/NodeInputServiceImpl.java
@@ -70,7 +70,7 @@ public class NodeInputServiceImpl implements NodeInputService {
     public String uploadResourceToBmlNew(String userName, String nodeJson, String nodePath, String projectName) throws IOException {
         List<Resource> resources = nodeParser.getNodeResource(nodeJson);
         Map<String, Object> jobContent = nodeParser.getNodeJobContent(nodeJson);
-        String scriptName = Optional.ofNullable(jobContent.get("script")).map(Object::toString).orElse(null);
+        String scriptName = Optional.ofNullable(jobContent).map(e->e.get("script")).map(Object::toString).orElse(null);
         if (resources != null && resources.size() > 0) {
             resources.forEach(resource -> {
                 if (resource.getVersion() != null && resource.getFileName() != null && resource.getResourceId() != null) {
@@ -80,7 +80,7 @@ public String uploadResourceToBmlNew(String userName, String nodeJson, String no
                         fileName = fileName.substring(fileName.lastIndexOf('.'));
                     }
                     String filePath = IoUtils.addFileSeparator(nodePath, fileName);
-                    InputStream resourceInputStream = readResource(userName, resource, filePath);
+                    InputStream resourceInputStream = bmlService.readLocalResourceFile(userName, filePath);
                     BmlResource bmlReturnMap = bmlService.upload(userName,
                             resourceInputStream, UUID.randomUUID().toString() + ".json", projectName);
                     resource.setResourceId(bmlReturnMap.getResourceId());

From c2ac017e9fe150fdd8e038d4b284207f7dd788e2 Mon Sep 17 00:00:00 2001
From: zhaobincai <zhaobincai@webank.com>
Date: Thu, 11 Apr 2024 21:55:09 +0800
Subject: [PATCH 026/302] git fix

---
 .../dss/workflow/dao/impl/lockMapper.xml        |  1 +
 .../workflow/lock/DSSFlowEditLockManager.java   |  2 +-
 .../service/impl/DSSFlowServiceImpl.java        |  5 ++++-
 .../service/impl/PublishServiceImpl.java        |  5 ++++-
 .../dss/workflow/util/DSSFlowStatusUtils.java   | 17 -----------------
 5 files changed, 10 insertions(+), 20 deletions(-)
 delete mode 100644 dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/util/DSSFlowStatusUtils.java

diff --git a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/dao/impl/lockMapper.xml b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/dao/impl/lockMapper.xml
index 083cd7282..7a791566a 100644
--- a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/dao/impl/lockMapper.xml
+++ b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/dao/impl/lockMapper.xml
@@ -85,6 +85,7 @@
         INSERT INTO dss_workflow_status (`flow_id`, `status`, `create_time`, `update_time`)
         VALUES
         (#{flowID}, #{status}, NOW(), NOW())
+        ON DUPLICATE KEY UPDATE `status` = #{status}, `update_time` = NOW()
     </insert>
 
     <update id="updateFlowStatus">
diff --git a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/lock/DSSFlowEditLockManager.java b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/lock/DSSFlowEditLockManager.java
index 9cc5b9853..33eee153c 100644
--- a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/lock/DSSFlowEditLockManager.java
+++ b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/lock/DSSFlowEditLockManager.java
@@ -201,7 +201,7 @@ public static void deleteLock(String flowEditLock) throws DSSErrorException {
                         DSSFlow dssFlow = flowMapper.selectFlowByID(dssFlowEditLock.getFlowID());
                         DSSProject projectInfo = getProjectInfo(dssFlow.getProjectId());
 //                        pushProject(projectInfo.getName(), projectInfo.getWorkspaceId(), "resurce", "version", "path", projectInfo.getUsername(), "comment");
-                        DSSFlowStatusUtils.updateFlowStatus(dssFlow.getId(), FLOW_STATUS_PUSH);
+                        lockMapper.insertFlowStatus(dssFlow.getId(), FLOW_STATUS_PUSH);
                     }
                     lockMapper.clearExpire(sdf.get().format(new Date(System.currentTimeMillis() - DSSWorkFlowConstant.DSS_FLOW_EDIT_LOCK_TIMEOUT.getValue())), dssFlowEditLock.getFlowID());
                 }
diff --git a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/service/impl/DSSFlowServiceImpl.java b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/service/impl/DSSFlowServiceImpl.java
index 0ae0ad149..55633e77a 100644
--- a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/service/impl/DSSFlowServiceImpl.java
+++ b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/service/impl/DSSFlowServiceImpl.java
@@ -47,6 +47,7 @@
 import com.webank.wedatasphere.dss.workflow.core.entity.WorkflowWithContextImpl;
 import com.webank.wedatasphere.dss.workflow.core.json2flow.JsonToFlowParser;
 import com.webank.wedatasphere.dss.workflow.dao.FlowMapper;
+import com.webank.wedatasphere.dss.workflow.dao.LockMapper;
 import com.webank.wedatasphere.dss.workflow.dao.NodeInfoMapper;
 import com.webank.wedatasphere.dss.workflow.entity.CommonAppConnNode;
 import com.webank.wedatasphere.dss.workflow.entity.NodeInfo;
@@ -90,6 +91,8 @@ public class DSSFlowServiceImpl implements DSSFlowService {
     @Autowired
     private FlowMapper flowMapper;
     @Autowired
+    private LockMapper lockMapper;
+    @Autowired
     private NodeInfoMapper nodeInfoMapper;
     @Autowired
     private NodeInputService nodeInputService;
@@ -305,7 +308,7 @@ public String saveFlow(Long flowID,
         }
         saveFlowHook.afterSave(jsonFlow,dssFlow,parentFlowID);
         String version = bmlReturnMap.get("version").toString();
-        DSSFlowStatusUtils.updateFlowStatus(flowID, FLOW_STATUS_SAVE);
+        lockMapper.insertFlowStatus(flowID, FLOW_STATUS_SAVE);
         return version;
     }
 
diff --git a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/service/impl/PublishServiceImpl.java b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/service/impl/PublishServiceImpl.java
index 2c87df6b2..8b6ab6535 100644
--- a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/service/impl/PublishServiceImpl.java
+++ b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/service/impl/PublishServiceImpl.java
@@ -32,6 +32,7 @@
 import com.webank.wedatasphere.dss.workflow.common.entity.DSSFlow;
 import com.webank.wedatasphere.dss.workflow.common.parser.WorkFlowParser;
 import com.webank.wedatasphere.dss.workflow.constant.DSSWorkFlowConstant;
+import com.webank.wedatasphere.dss.workflow.dao.LockMapper;
 import com.webank.wedatasphere.dss.workflow.service.DSSFlowService;
 import com.webank.wedatasphere.dss.workflow.service.PublishService;
 import com.webank.wedatasphere.dss.workflow.util.DSSFlowStatusUtils;
@@ -51,6 +52,8 @@ public class PublishServiceImpl implements PublishService {
     private DSSFlowService dssFlowService;
     @Autowired
     private WorkFlowParser workFlowParser;
+    @Autowired
+    private LockMapper lockMapper;
 
     public void setDssFlowService(DSSFlowService dssFlowService) {
         this.dssFlowService = dssFlowService;
@@ -98,7 +101,7 @@ public String submitPublish(String convertUser, Long workflowId,
             if (response.getResponse().isFailed()) {
                 throw new DSSErrorException(50311, response.getResponse().getMessage());
             }
-            DSSFlowStatusUtils.updateFlowStatus(workflowId, DSSWorkFlowConstant.FLOW_STATUS_PUBLISH);
+            lockMapper.insertFlowStatus(workflowId, DSSWorkFlowConstant.FLOW_STATUS_PUBLISH);
             return response.getId();
         } catch (DSSErrorException e) {
             throw e;
diff --git a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/util/DSSFlowStatusUtils.java b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/util/DSSFlowStatusUtils.java
deleted file mode 100644
index ebce3fec8..000000000
--- a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/util/DSSFlowStatusUtils.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package com.webank.wedatasphere.dss.workflow.util;
-
-import com.webank.wedatasphere.dss.workflow.dao.LockMapper;
-import org.apache.commons.lang.StringUtils;
-
-public class DSSFlowStatusUtils {
-    private static LockMapper lockMapper;
-
-    public static void updateFlowStatus(Long flowId, String status) {
-        String oldStatus = lockMapper.selectStatusByFlowId(flowId);
-        if (StringUtils.isEmpty(oldStatus)) {
-            lockMapper.insertFlowStatus(flowId, status);
-        } else {
-            lockMapper.updateFlowStatus(flowId, status);
-        }
-    }
-}

From 600fa586a754f471cd7e62924637f9d13208d9b9 Mon Sep 17 00:00:00 2001
From: xlinliu <arionliu@webank.com>
Date: Thu, 11 Apr 2024 21:57:09 +0800
Subject: [PATCH 027/302] =?UTF-8?q?=E5=AF=BC=E5=85=A5=E5=AF=BC=E5=87=BA?=
 =?UTF-8?q?=E5=9F=BA=E4=BA=8E=E6=96=B0=E6=A0=BC=E5=BC=8F=E6=96=87=E4=BB=B6?=
 =?UTF-8?q?=E7=BB=93=E6=9E=84=20fix2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dss/workflow/io/input/impl/WorkFlowInputServiceImpl.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/io/input/impl/WorkFlowInputServiceImpl.java b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/io/input/impl/WorkFlowInputServiceImpl.java
index 8d4ce6ad3..3d9dd0888 100644
--- a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/io/input/impl/WorkFlowInputServiceImpl.java
+++ b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/io/input/impl/WorkFlowInputServiceImpl.java
@@ -308,7 +308,7 @@ private String inputWorkFlowNodesNew(String userName, String projectName, String
                         throw new DSSErrorException(90078, "工程内未能找到子工作流节点，导入失败" + subFlowName);
                     }
                 }
-                if (nodeParams != null) {
+                if (nodeParams != null && !"null".equalsIgnoreCase(nodeParams)) {
                     nodeJsonMap.put("params", nodeParams);
                 }
                 nodeJsonListRes.add(nodeJsonMap);

From 282161919e743fa2ad61697016e5647bf6d75709 Mon Sep 17 00:00:00 2001
From: xlinliu <arionliu@webank.com>
Date: Thu, 11 Apr 2024 21:57:09 +0800
Subject: [PATCH 028/302] =?UTF-8?q?=E5=AF=BC=E5=85=A5=E5=AF=BC=E5=87=BA?=
 =?UTF-8?q?=E5=9F=BA=E4=BA=8E=E6=96=B0=E6=A0=BC=E5=BC=8F=E6=96=87=E4=BB=B6?=
 =?UTF-8?q?=E7=BB=93=E6=9E=84=20fix2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../workflow/io/input/impl/WorkFlowInputServiceImpl.java    | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/io/input/impl/WorkFlowInputServiceImpl.java b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/io/input/impl/WorkFlowInputServiceImpl.java
index 3d9dd0888..d33ae1fa4 100644
--- a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/io/input/impl/WorkFlowInputServiceImpl.java
+++ b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/io/input/impl/WorkFlowInputServiceImpl.java
@@ -286,7 +286,7 @@ private String inputWorkFlowNodesNew(String userName, String projectName, String
                         dssFlow, updateNodeJson, updateContextId, nodePath,
                         workspace, orcVersion, dssLabels);
                 Map<String, Object> nodeJsonMap = BDPJettyServerHelper.jacksonJson().readValue(updateNodeJson, Map.class);
-                String nodeParams = readNodeParam(userName, nodePath);
+                String nodeParamsJson = readNodeParam(userName, nodePath);
 
                 //更新subflowID
                 String nodeType = nodeJsonMap.get("jobType").toString();
@@ -308,8 +308,8 @@ private String inputWorkFlowNodesNew(String userName, String projectName, String
                         throw new DSSErrorException(90078, "工程内未能找到子工作流节点，导入失败" + subFlowName);
                     }
                 }
-                if (nodeParams != null && !"null".equalsIgnoreCase(nodeParams)) {
-                    nodeJsonMap.put("params", nodeParams);
+                if (nodeParamsJson != null && !"null".equalsIgnoreCase(nodeParamsJson)) {
+                    nodeJsonMap.put("params", BDPJettyServerHelper.jacksonJson().readValue(nodeParamsJson, Map.class));
                 }
                 nodeJsonListRes.add(nodeJsonMap);
 

From 500b7824bcb0f3ba0be3f88a1c8382855e4a53d6 Mon Sep 17 00:00:00 2001
From: zhaobincai <zhaobincai@webank.com>
Date: Fri, 12 Apr 2024 10:07:01 +0800
Subject: [PATCH 029/302] git fix

---
 .../dss/workflow/service/impl/DSSFlowServiceImpl.java            | 1 -
 .../dss/workflow/service/impl/PublishServiceImpl.java            | 1 -
 2 files changed, 2 deletions(-)

diff --git a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/service/impl/DSSFlowServiceImpl.java b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/service/impl/DSSFlowServiceImpl.java
index 55633e77a..c064ab801 100644
--- a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/service/impl/DSSFlowServiceImpl.java
+++ b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/service/impl/DSSFlowServiceImpl.java
@@ -59,7 +59,6 @@
 import com.webank.wedatasphere.dss.workflow.service.DSSFlowService;
 import com.webank.wedatasphere.dss.workflow.service.SaveFlowHook;
 import com.webank.wedatasphere.dss.workflow.service.WorkflowNodeService;
-import com.webank.wedatasphere.dss.workflow.util.DSSFlowStatusUtils;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang.StringUtils;
 import org.apache.commons.lang.exception.ExceptionUtils;
diff --git a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/service/impl/PublishServiceImpl.java b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/service/impl/PublishServiceImpl.java
index 8b6ab6535..f236e31ba 100644
--- a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/service/impl/PublishServiceImpl.java
+++ b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/service/impl/PublishServiceImpl.java
@@ -35,7 +35,6 @@
 import com.webank.wedatasphere.dss.workflow.dao.LockMapper;
 import com.webank.wedatasphere.dss.workflow.service.DSSFlowService;
 import com.webank.wedatasphere.dss.workflow.service.PublishService;
-import com.webank.wedatasphere.dss.workflow.util.DSSFlowStatusUtils;
 import org.apache.commons.lang.StringUtils;
 import org.apache.linkis.rpc.Sender;
 import org.slf4j.Logger;

From b38b57423d058b248115882fd6412926b18a7563 Mon Sep 17 00:00:00 2001
From: zhaobincai <zhaobincai@webank.com>
Date: Fri, 12 Apr 2024 10:09:25 +0800
Subject: [PATCH 030/302] git fix

---
 .../wedatasphere/dss/workflow/lock/DSSFlowEditLockManager.java   | 1 -
 1 file changed, 1 deletion(-)

diff --git a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/lock/DSSFlowEditLockManager.java b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/lock/DSSFlowEditLockManager.java
index 33eee153c..f8bbd7550 100644
--- a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/lock/DSSFlowEditLockManager.java
+++ b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/lock/DSSFlowEditLockManager.java
@@ -29,7 +29,6 @@
 import com.webank.wedatasphere.dss.workflow.dao.FlowMapper;
 import com.webank.wedatasphere.dss.workflow.dao.LockMapper;
 import com.webank.wedatasphere.dss.workflow.entity.DSSFlowEditLock;
-import com.webank.wedatasphere.dss.workflow.util.DSSFlowStatusUtils;
 import org.apache.linkis.DataWorkCloudApplication;
 import org.apache.linkis.common.utils.Utils;
 import org.apache.commons.lang.StringUtils;

From 93e3896b32022c51eab7ac2c81f3cacd72a7fb7c Mon Sep 17 00:00:00 2001
From: SunpengWan <825559776@qq.com>
Date: Fri, 12 Apr 2024 17:58:54 +0800
Subject: [PATCH 031/302] update exclusion ooxml-schemas package name to
 poi-ooxml-schemas

---
 dss-commons/dss-common/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dss-commons/dss-common/pom.xml b/dss-commons/dss-common/pom.xml
index 3af009adc..25c083351 100644
--- a/dss-commons/dss-common/pom.xml
+++ b/dss-commons/dss-common/pom.xml
@@ -117,7 +117,7 @@
                 </exclusion>
                 <exclusion>
                     <groupId>org.apache.poi</groupId>
-                    <artifactId>ooxml-schemas</artifactId>
+                    <artifactId>poi-ooxml-schemas</artifactId>
                 </exclusion>
             </exclusions>
         </dependency>

From 174555480b86ae0c790de32d1c54fe96235c4ae5 Mon Sep 17 00:00:00 2001
From: zhaobincai <zhaobincai@webank.com>
Date: Mon, 15 Apr 2024 10:53:01 +0800
Subject: [PATCH 032/302] git replace "/" File.separator

---
 .../impl/DSSGitProjectManagerServiceImpl.java |  2 +-
 .../DSSGitWorkflowManagerServiceImpl.java     | 27 ++++++++++-----
 .../dss/git/utils/DSSGitUtils.java            | 33 ++++++++++---------
 .../wedatasphere/dss/git/utils/FileUtils.java | 30 ++++++++++++++---
 4 files changed, 62 insertions(+), 30 deletions(-)

diff --git a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitProjectManagerServiceImpl.java b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitProjectManagerServiceImpl.java
index 86c854115..871bfb322 100644
--- a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitProjectManagerServiceImpl.java
+++ b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitProjectManagerServiceImpl.java
@@ -47,7 +47,7 @@ public GitCreateProjectResponse create(GitCreateProjectRequest request) {
             // 本地创建Git项目
             DSSGitUtils.create(request.getProjectName(), gitUser);
             // 获取git项目
-            File repoDir = new File(GitServerConfig.GIT_SERVER_PATH.getValue() + "/" + request.getProjectName() + "/.git");
+            File repoDir = new File(File.separator + FileUtils.normalizePath(GitServerConfig.GIT_SERVER_PATH.getValue()) + File.separator + request.getProjectName() + File.separator +".git");
             Repository repository = new FileRepositoryBuilder().setGitDir(repoDir).build();
             // 关联远端Git
             DSSGitUtils.remote(repository, request.getProjectName(), gitUser);
diff --git a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitWorkflowManagerServiceImpl.java b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitWorkflowManagerServiceImpl.java
index 063849a9f..c6764e915 100644
--- a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitWorkflowManagerServiceImpl.java
+++ b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitWorkflowManagerServiceImpl.java
@@ -23,6 +23,8 @@
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStreamReader;
+import java.nio.file.Path;
+import java.nio.file.Paths;
 import java.util.*;
 import java.util.concurrent.TimeUnit;
 
@@ -47,7 +49,7 @@ public GItDiffResponse diff(GitDiffRequest request) {
         Repository repository = null;
         try {
             // Path to the Git repository (.git directory or its parent)
-            File repoDir = new File(GitServerConfig.GIT_SERVER_PATH.getValue() + "/" + request.getProjectName() + "/.git");
+            File repoDir = new File("/" + FileUtils.normalizePath(GitServerConfig.GIT_SERVER_PATH.getValue()) + "/" + request.getProjectName() + "/.git");
             // 当前机器不存在就新建
             if (repoDir.exists()) {
                 repository = new FileRepositoryBuilder().setGitDir(repoDir).build();
@@ -85,7 +87,7 @@ public GitCommitResponse commit(GitCommitRequest request) {
         GitCommitResponse commitResponse = null;
         try {
             // Path to the Git repository (.git directory or its parent)
-            File repoDir = new File(GitServerConfig.GIT_SERVER_PATH.getValue() + "/" + request.getProjectName() + "/.git");
+            File repoDir = new File("/" + FileUtils.normalizePath(GitServerConfig.GIT_SERVER_PATH.getValue()) + "/" + request.getProjectName() + "/.git");
             // 当前机器不存在就新建
             if (repoDir.exists()) {
                 repository = new FileRepositoryBuilder().setGitDir(repoDir).build();
@@ -115,8 +117,8 @@ public GitCommitResponse commit(GitCommitRequest request) {
 
     @Override
     public GitSearchResponse search(GitSearchRequest request) {
-        String gitDir = GitServerConfig.GIT_SERVER_PATH.getValue() + "/" + request.getProjectName() + "/.git";
-        String workTree = GitServerConfig.GIT_SERVER_PATH.getValue() + "/" + request.getProjectName() ;
+        String gitDir = "/" + FileUtils.normalizePath(GitServerConfig.GIT_SERVER_PATH.getValue()) + "/" + request.getProjectName() + "/.git";
+        String workTree = "/" + FileUtils.normalizePath(GitServerConfig.GIT_SERVER_PATH.getValue()) + "/" + request.getProjectName() ;
         List<String> gitCommands = new ArrayList<>(Arrays.asList(
                 "git", "--git-dir=" + gitDir, "--work-tree=" + workTree, "grep", "-l", request.getSearchContent()
         ));
@@ -124,7 +126,7 @@ public GitSearchResponse search(GitSearchRequest request) {
         List<String> fileList = process(gitCommands);
         List<String> filePathList = new ArrayList<>();
         for (String file : fileList) {
-            filePathList.add(GitServerConfig.GIT_SERVER_PATH.getValue()+ "/" + request.getProjectName() + "/" + file);
+            filePathList.add("/" + FileUtils.normalizePath(GitServerConfig.GIT_SERVER_PATH.getValue())+ "/" + request.getProjectName() + "/" + file);
         }
 
         List<String> fileCommands = new ArrayList<>(Arrays.asList(
@@ -240,7 +242,7 @@ public GitDeleteResponse delete(GitDeleteRequest request) {
         GitDeleteResponse deleteResponse = null;
         try {
             // Path to the Git repository (.git directory or its parent)
-            File repoDir = new File(GitServerConfig.GIT_SERVER_PATH.getValue() + "/" + request.getProjectName() + "/.git");
+            File repoDir = new File("/" + FileUtils.normalizePath(GitServerConfig.GIT_SERVER_PATH.getValue()) + "/" + request.getProjectName() + "/.git");
             // 当前机器不存在就新建
             if (repoDir.exists()) {
                 repository = new FileRepositoryBuilder().setGitDir(repoDir).build();
@@ -279,10 +281,10 @@ public GitFileContentResponse getFileContent(GitFileContentRequest request) {
             return null;
         }
         Repository repository = null;
-        GitCommitResponse commitResponse = null;
+        GitFileContentResponse contentResponse = null;
         try {
             // Path to the Git repository (.git directory or its parent)
-            File repoDir = new File(GitServerConfig.GIT_SERVER_PATH.getValue() + "/" + request.getProjectName() + "/.git");
+            File repoDir = new File("/" + FileUtils.normalizePath(GitServerConfig.GIT_SERVER_PATH.getValue()) + "/" + request.getProjectName() + "/.git");
             // 当前机器不存在就新建
             if (repoDir.exists()) {
                 repository = new FileRepositoryBuilder().setGitDir(repoDir).build();
@@ -292,7 +294,14 @@ public GitFileContentResponse getFileContent(GitFileContentRequest request) {
             }
             DSSGitUtils.pull(repository, request.getProjectName(), gitUser);
 
-            DSSGitUtils.getTargetCommitFileContent(request.getProjectName(), request.getCommitId(), request.getFilePath());
+            String content = DSSGitUtils.getTargetCommitFileContent(request.getProjectName(), request.getCommitId(), request.getFilePath());
+            String fullpath = File.separator + FileUtils.normalizePath(GitServerConfig.GIT_SERVER_PATH.getValue()) + File.separator + FileUtils.normalizePath(request.getFilePath());
+            File file = new File(fullpath);
+            String fileName = file.getName();
+            BmlResource bmlResource = FileUtils.uploadResourceToBML(bmlService, gitUser.getGitUser(), content, fileName, request.getProjectName());
+            logger.info("upload success, the fileName is : {}", request.getFilePath());
+            contentResponse.setBmlResource(bmlResource);
+            return contentResponse;
         } catch (Exception e) {
             logger.error("pull failed, the reason is ",e);
         } finally {
diff --git a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/utils/DSSGitUtils.java b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/utils/DSSGitUtils.java
index 91c061de0..2c2029466 100644
--- a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/utils/DSSGitUtils.java
+++ b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/utils/DSSGitUtils.java
@@ -75,7 +75,7 @@ public static void init(String projectName, GitUserEntity gitUserDO) throws DSSE
     }
 
     public static void remote(Repository repository, String projectName, GitUserEntity gitUser) {
-        File repoDir = new File(GitServerConfig.GIT_SERVER_PATH.getValue() + "/" + projectName +"/.git");
+        File repoDir = new File(File.separator + FileUtils.normalizePath(GitServerConfig.GIT_SERVER_PATH.getValue()) + File.separator + projectName + File.separator + ".git");
 
         try {
             Git git = new Git(repository);
@@ -83,7 +83,7 @@ public static void remote(Repository repository, String projectName, GitUserEnti
             // 添加远程仓库引用
             git.remoteAdd()
                     .setName("origin")
-                    .setUri(new URIish(GitServerConfig.GIT_URL_PRE.getValue() + gitUser.getGitUser() + "/" + projectName +".git"))
+                    .setUri(new URIish(GitServerConfig.GIT_URL_PRE.getValue() + gitUser.getGitUser() + File.separator + projectName +".git"))
                     .call();
 
             logger.info("remote success");
@@ -96,8 +96,8 @@ public static void remote(Repository repository, String projectName, GitUserEnti
 
     public static void create(String projectName, GitUserEntity gitUserDO) {
         logger.info("start success");
-        File repoDir = new File(GitServerConfig.GIT_SERVER_PATH.getValue() + "/" + projectName); // 指定仓库的目录
-        File respo = new File(GitServerConfig.GIT_SERVER_PATH.getValue() + "/" +  projectName +"/.git");
+        File repoDir = new File(File.separator + FileUtils.normalizePath(GitServerConfig.GIT_SERVER_PATH.getValue()) + File.separator + projectName); // 指定仓库的目录
+        File respo = new File(File.separator + FileUtils.normalizePath(GitServerConfig.GIT_SERVER_PATH.getValue()) + File.separator +  projectName + File.separator +".git");
         if (!respo.exists()) {
             try {
                 // 初始化仓库
@@ -186,7 +186,7 @@ public static void push(Repository repository, String projectName, GitUserEntity
 
 
     public static void reset(String projectName) {
-        String repoPath = GitServerConfig.GIT_SERVER_PATH.getValue() + "/" + projectName +"/.git"; // 仓库路径
+        String repoPath = File.separator + FileUtils.normalizePath(GitServerConfig.GIT_SERVER_PATH.getValue()) + File.separator + projectName + File.separator + ".git"; // 仓库路径
         try (Repository repository = new FileRepositoryBuilder()
                 .setGitDir(new File(repoPath))
                 .build();
@@ -203,7 +203,7 @@ public static void reset(String projectName) {
     }
 
     public static void checkoutTargetCommit(GitRevertRequest request) {
-        File repoDir = new File(GitServerConfig.GIT_SERVER_PATH.getValue() + "/" + request.getProjectName()+  "/.git");
+        File repoDir = new File(File.separator + FileUtils.normalizePath(GitServerConfig.GIT_SERVER_PATH.getValue()) + File.separator + request.getProjectName()+ File.separator + ".git");
         String commitId = request.getCommitId(); // 替换为目标commit的完整哈希值
 
         try (Repository repository = new FileRepositoryBuilder().setGitDir(repoDir).build();
@@ -295,7 +295,7 @@ public static List<String> parseProjectNames(String json) throws org.json.JSONEx
     }
 
     public static Set<String> status(String projectName) {
-        File repoDir = new File(GitServerConfig.GIT_SERVER_PATH.getValue() + "/" + projectName +"/.git"); // 修改为你的仓库路径
+        File repoDir = new File(File.separator + FileUtils.normalizePath(GitServerConfig.GIT_SERVER_PATH.getValue()) + File.separator + projectName + File.separator +".git"); // 修改为你的仓库路径
 
         try (Repository repository = new FileRepositoryBuilder().setGitDir(repoDir).build()) {
             Git git = new Git(repository);
@@ -357,7 +357,7 @@ public static void archive(String projectName, GitUserEntity gitUserDO) {
     }
 
     public static void archiveLocal(String projectName) {
-        File repoDir = new File(GitServerConfig.GIT_SERVER_PATH.getValue() + "/" + projectName +  "/.git");
+        File repoDir = new File(File.separator + FileUtils.normalizePath(GitServerConfig.GIT_SERVER_PATH.getValue()) + File.separator + projectName + File.separator + ".git");
         if (!repoDir.exists()) {
             logger.info("file {} not exists", repoDir.getAbsolutePath());
             return ;
@@ -367,7 +367,7 @@ public static void archiveLocal(String projectName) {
             // 删除名为"origin"的远程仓库配置
             git.remoteRemove().setRemoteName("origin").call();
             // 删除本地文件
-            FileUtils.removeDirectory(GitServerConfig.GIT_SERVER_PATH.getValue() + "/" + projectName);
+            FileUtils.removeDirectory(File.separator + FileUtils.normalizePath(GitServerConfig.GIT_SERVER_PATH.getValue()) + File.separator + projectName);
             logger.info("Remote 'origin' removed successfully.");
         } catch (GitAPIException | IOException e) {
             logger.error("revert remote failed, the reason is: ",e);
@@ -375,7 +375,7 @@ public static void archiveLocal(String projectName) {
     }
 
     public static void updateLocal(GitBaseRequest request, String filePath) {
-        File repoDir = new File(GitServerConfig.GIT_SERVER_PATH.getValue() + "/" + request.getProjectName() + "/.git");
+        File repoDir = new File(File.separator + FileUtils.normalizePath(GitServerConfig.GIT_SERVER_PATH.getValue()) + File.separator + request.getProjectName() + File.separator + ".git");
         Repository repository = null;
         try {
             repository = new FileRepositoryBuilder().setGitDir(repoDir).build();
@@ -391,9 +391,9 @@ public static void updateLocal(GitBaseRequest request, String filePath) {
         }
     }
 
-    public static InputStream getTargetCommitFileContent(String projectName, String commitId, String filePath) {
-        String repoPath = GitServerConfig.GIT_SERVER_PATH.getValue() + "/" + projectName +  "/.git";
-
+    public static String getTargetCommitFileContent(String projectName, String commitId, String filePath) {
+        String repoPath = File.separator + FileUtils.normalizePath(GitServerConfig.GIT_SERVER_PATH.getValue()) + File.separator + projectName + File.separator +".git";
+        String content = "";
         try {
             FileRepositoryBuilder repositoryBuilder = new FileRepositoryBuilder();
             try (Repository repository = repositoryBuilder.setGitDir(new File(repoPath))
@@ -423,7 +423,8 @@ public static InputStream getTargetCommitFileContent(String projectName, String
                         try {
                             ObjectLoader loader = repository.open(objectId);
                             byte[] bytes = loader.getBytes();
-                            logger.info("File content: " + new String(bytes));
+                            content = new String(bytes);
+                            logger.info("File content: " + content);
                         } catch (Exception e) {
                             logger.error("getFileContent Failed, the reason is: ", e);
                         }
@@ -435,12 +436,12 @@ public static InputStream getTargetCommitFileContent(String projectName, String
         } catch (IOException e) {
             logger.error("getFileContent Failed, the reason is: ", e);
         }
-        return null;
+        return content;
     }
 
     public static void getCommitId(String projectName, int num) {
         // 获取当前CommitId，
-        File repoDir = new File(GitServerConfig.GIT_SERVER_PATH.getValue()  + "/" + projectName + "/.git");
+        File repoDir = new File(File.separator + FileUtils.normalizePath(GitServerConfig.GIT_SERVER_PATH.getValue()) + File.separator + projectName + File.separator +".git");
 
         try (Repository repository = new FileRepositoryBuilder().setGitDir(repoDir).build();
              Git git = new Git(repository)) {
diff --git a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/utils/FileUtils.java b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/utils/FileUtils.java
index c4fd8b20a..83dcfbfc1 100644
--- a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/utils/FileUtils.java
+++ b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/utils/FileUtils.java
@@ -24,7 +24,7 @@ public class FileUtils {
 
     public static void addFiles(String projectName) {
 
-        String filePath = GitServerConfig.GIT_SERVER_PATH.getValue() + "/" + projectName +"/file1.txt";
+        String filePath = "/" + FileUtils.normalizePath(GitServerConfig.GIT_SERVER_PATH.getValue()) + "/" + projectName +"/file1.txt";
         List<String> lines = Arrays.asList("The first line", "The second line");
 
         try {
@@ -52,7 +52,7 @@ public static void removeFiles (String filePath) {
     }
 
     public static void addDirectory (String directory) {
-        String filePath = GitServerConfig.GIT_SERVER_PATH.getValue() + "/testGit1/file1.txt";
+        String filePath = "/" + FileUtils.normalizePath(GitServerConfig.GIT_SERVER_PATH.getValue()) + "/testGit1/file1.txt";
         List<String> lines = Arrays.asList("The first line", "The second line");
 
         try {
@@ -88,6 +88,16 @@ public static void removeDirectory (String removeDirectoryPath) {
         }
     }
 
+    public static BmlResource uploadResourceToBML(BMLService bmlService, String userName, String content, String fileName, String projectName) {
+        Map<String, Object> bmlReturnMap = bmlService.upload(userName, content, fileName, projectName);
+
+        BmlResource bmlResource = new BmlResource();
+        bmlResource.setResourceId(bmlReturnMap.get("resourceId").toString());
+        bmlResource.setVersion(bmlReturnMap.get("version").toString());
+
+        return bmlResource;
+    }
+
     public static String unzipFile(String zipFile) {
         logger.info("-------=======================beginning to uznip testGit1=======================-------{}", zipFile);
 
@@ -121,9 +131,9 @@ public static File newFile(File destinationDir, ZipEntry zipEntry) throws IOExce
     }
 
     public static void removeAndUpdate (BMLService bmlService, String path,  BmlResource bmlResource, String username) {
-        FileUtils.removeDirectory(GitServerConfig.GIT_SERVER_PATH.getValue() + "/" +path);
+        FileUtils.removeDirectory("/" + FileUtils.normalizePath(GitServerConfig.GIT_SERVER_PATH.getValue()) + "/" +path);
         try {
-            downloadAndUnzipBMLResource(bmlService, path, bmlResource, username, GitServerConfig.GIT_SERVER_PATH.getValue());
+            downloadAndUnzipBMLResource(bmlService, path, bmlResource, username, "/" + FileUtils.normalizePath(GitServerConfig.GIT_SERVER_PATH.getValue()));
         }catch (DSSErrorException e) {
             logger.error("unzip BML Resource Failed, the reason is : ", e);
         }
@@ -159,4 +169,16 @@ private static String readImportZipProjectName(String zipFilePath) throws IOExce
         }
         throw new IOException();
     }
+
+    public static String normalizePath(String path) {
+        path = path.trim();
+        while(path.startsWith(File.separator)) {
+            path = path.substring(File.separator.length());
+        }
+        while(path.endsWith(File.separator)) {
+            path = path.substring(0, path.length()-File.separator.length());
+        }
+        
+        return path;
+    }
 }

From f36bd74b103f5fe55b9e57c6b821c5e4724b4374 Mon Sep 17 00:00:00 2001
From: zhaobincai <zhaobincai@webank.com>
Date: Mon, 15 Apr 2024 16:34:15 +0800
Subject: [PATCH 033/302] git getHistory

---
 .../protocol/request/GitHistoryRequest.java   | 40 ++++++++
 .../response/GitCheckProjectResponse.java     |  5 +-
 .../protocol/response/GitCommitResponse.java  |  5 +-
 .../protocol/response/GitDeleteResponse.java  |  4 -
 .../protocol/response/GitHistoryResponse.java | 22 +++++
 .../dss/git/constant/DSSGitConstant.java      | 11 +++
 .../service/DSSGitWorkflowManagerService.java |  2 +
 .../DSSGitWorkflowManagerServiceImpl.java     | 98 ++++++++++++-------
 .../dss/git/utils/DSSGitUtils.java            | 43 ++++++++
 9 files changed, 182 insertions(+), 48 deletions(-)
 create mode 100644 dss-git/dss-git-common/src/main/java/com.webank.wedatasphere.dss.git.common/protocol/request/GitHistoryRequest.java
 create mode 100644 dss-git/dss-git-common/src/main/java/com.webank.wedatasphere.dss.git.common/protocol/response/GitHistoryResponse.java
 create mode 100644 dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/constant/DSSGitConstant.java

diff --git a/dss-git/dss-git-common/src/main/java/com.webank.wedatasphere.dss.git.common/protocol/request/GitHistoryRequest.java b/dss-git/dss-git-common/src/main/java/com.webank.wedatasphere.dss.git.common/protocol/request/GitHistoryRequest.java
new file mode 100644
index 000000000..8e8be1ab3
--- /dev/null
+++ b/dss-git/dss-git-common/src/main/java/com.webank.wedatasphere.dss.git.common/protocol/request/GitHistoryRequest.java
@@ -0,0 +1,40 @@
+package com.webank.wedatasphere.dss.git.common.protocol.request;
+
+public class GitHistoryRequest extends GitBaseRequest{
+    private String startCommitId;
+    private String endCommitId;
+
+    public GitHistoryRequest(String startCommitId, String endCommitId) {
+        this.startCommitId = startCommitId;
+        this.endCommitId = endCommitId;
+    }
+
+    public GitHistoryRequest(Long workspaceId, String projectName, String startCommitId, String endCommitId) {
+        super(workspaceId, projectName);
+        this.startCommitId = startCommitId;
+        this.endCommitId = endCommitId;
+    }
+
+    public GitHistoryRequest() {
+    }
+
+    public GitHistoryRequest(Long workspaceId, String projectName) {
+        super(workspaceId, projectName);
+    }
+
+    public String getStartCommitId() {
+        return startCommitId;
+    }
+
+    public void setStartCommitId(String startCommitId) {
+        this.startCommitId = startCommitId;
+    }
+
+    public String getEndCommitId() {
+        return endCommitId;
+    }
+
+    public void setEndCommitId(String endCommitId) {
+        this.endCommitId = endCommitId;
+    }
+}
diff --git a/dss-git/dss-git-common/src/main/java/com.webank.wedatasphere.dss.git.common/protocol/response/GitCheckProjectResponse.java b/dss-git/dss-git-common/src/main/java/com.webank.wedatasphere.dss.git.common/protocol/response/GitCheckProjectResponse.java
index 08bc1d792..ffba6c462 100644
--- a/dss-git/dss-git-common/src/main/java/com.webank.wedatasphere.dss.git.common/protocol/response/GitCheckProjectResponse.java
+++ b/dss-git/dss-git-common/src/main/java/com.webank.wedatasphere.dss.git.common/protocol/response/GitCheckProjectResponse.java
@@ -1,9 +1,6 @@
 package com.webank.wedatasphere.dss.git.common.protocol.response;
 
-/**
- * @author zhaobincai
- * @date 2024/3/28 15:06
- */
+
 public class GitCheckProjectResponse{
     private String projectName;
     /**
diff --git a/dss-git/dss-git-common/src/main/java/com.webank.wedatasphere.dss.git.common/protocol/response/GitCommitResponse.java b/dss-git/dss-git-common/src/main/java/com.webank.wedatasphere.dss.git.common/protocol/response/GitCommitResponse.java
index e366dd3a3..79a27418e 100644
--- a/dss-git/dss-git-common/src/main/java/com.webank.wedatasphere.dss.git.common/protocol/response/GitCommitResponse.java
+++ b/dss-git/dss-git-common/src/main/java/com.webank.wedatasphere.dss.git.common/protocol/response/GitCommitResponse.java
@@ -1,9 +1,6 @@
 package com.webank.wedatasphere.dss.git.common.protocol.response;
 
-/**
- * @author zhaobincai
- * @date 2024/3/25 10:15
- */
+
 public class GitCommitResponse{
     private String commitId;
     private String commitTime;
diff --git a/dss-git/dss-git-common/src/main/java/com.webank.wedatasphere.dss.git.common/protocol/response/GitDeleteResponse.java b/dss-git/dss-git-common/src/main/java/com.webank.wedatasphere.dss.git.common/protocol/response/GitDeleteResponse.java
index 3bbeb0a04..3682bb636 100644
--- a/dss-git/dss-git-common/src/main/java/com.webank.wedatasphere.dss.git.common/protocol/response/GitDeleteResponse.java
+++ b/dss-git/dss-git-common/src/main/java/com.webank.wedatasphere.dss.git.common/protocol/response/GitDeleteResponse.java
@@ -2,10 +2,6 @@
 
 import java.util.List;
 
-/**
- * @author zhaobincai
- * @date 2024/3/28 15:06
- */
 public class GitDeleteResponse {
     private String projectName;
 
diff --git a/dss-git/dss-git-common/src/main/java/com.webank.wedatasphere.dss.git.common/protocol/response/GitHistoryResponse.java b/dss-git/dss-git-common/src/main/java/com.webank.wedatasphere.dss.git.common/protocol/response/GitHistoryResponse.java
new file mode 100644
index 000000000..1254ce1be
--- /dev/null
+++ b/dss-git/dss-git-common/src/main/java/com.webank.wedatasphere.dss.git.common/protocol/response/GitHistoryResponse.java
@@ -0,0 +1,22 @@
+package com.webank.wedatasphere.dss.git.common.protocol.response;
+
+import java.util.List;
+
+public class GitHistoryResponse {
+    private List<GitCommitResponse> responses;
+
+    public GitHistoryResponse(List<GitCommitResponse> responses) {
+        this.responses = responses;
+    }
+
+    public GitHistoryResponse() {
+    }
+
+    public List<GitCommitResponse> getResponses() {
+        return responses;
+    }
+
+    public void setResponses(List<GitCommitResponse> responses) {
+        this.responses = responses;
+    }
+}
diff --git a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/constant/DSSGitConstant.java b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/constant/DSSGitConstant.java
new file mode 100644
index 000000000..543f8420f
--- /dev/null
+++ b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/constant/DSSGitConstant.java
@@ -0,0 +1,11 @@
+package com.webank.wedatasphere.dss.git.constant;
+
+import com.webank.wedatasphere.dss.git.config.GitServerConfig;
+import com.webank.wedatasphere.dss.git.utils.FileUtils;
+
+import java.io.File;
+
+public class DSSGitConstant {
+    public static String GIT_PATH_PRE = File.separator + FileUtils.normalizePath(GitServerConfig.GIT_SERVER_PATH.getValue()) + File.separator;
+    public static String GIT_PATH_SUFFIX = File.separator + ".git";
+}
diff --git a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/DSSGitWorkflowManagerService.java b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/DSSGitWorkflowManagerService.java
index 55c5c7b69..e0706ed49 100644
--- a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/DSSGitWorkflowManagerService.java
+++ b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/DSSGitWorkflowManagerService.java
@@ -16,4 +16,6 @@ public interface DSSGitWorkflowManagerService {
     GitDeleteResponse delete(GitDeleteRequest request) throws ExecutionException, InterruptedException;
 
     GitFileContentResponse getFileContent(GitFileContentRequest request);
+
+    GitHistoryResponse getHistory(GitHistoryRequest request);
 }
diff --git a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitWorkflowManagerServiceImpl.java b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitWorkflowManagerServiceImpl.java
index c6764e915..edde0ac63 100644
--- a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitWorkflowManagerServiceImpl.java
+++ b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitWorkflowManagerServiceImpl.java
@@ -48,15 +48,11 @@ public GItDiffResponse diff(GitDiffRequest request) {
         GItDiffResponse diff = null;
         Repository repository = null;
         try {
-            // Path to the Git repository (.git directory or its parent)
-            File repoDir = new File("/" + FileUtils.normalizePath(GitServerConfig.GIT_SERVER_PATH.getValue()) + "/" + request.getProjectName() + "/.git");
-            // 当前机器不存在就新建
-            if (repoDir.exists()) {
-                repository = new FileRepositoryBuilder().setGitDir(repoDir).build();
-            } else {
-                repository = FileRepositoryBuilder.create(new File(String.valueOf(repoDir)));
-                DSSGitUtils.remote(repository, request.getProjectName(), gitUser);
-            }
+            // 拼接.git路径
+            String gitPath = DSSGitUtils.generateGitPath(request.getProjectName());
+            // 获取git仓库
+            File repoDir = new File(gitPath);
+            repository = getRepository(repoDir, request.getProjectName(), gitUser);
             // 本地保持最新状态
             DSSGitUtils.pull(repository, request.getProjectName(), gitUser);
             // 解压BML文件到本地 todo 对接Server时放开调试
@@ -86,15 +82,11 @@ public GitCommitResponse commit(GitCommitRequest request) {
         Repository repository = null;
         GitCommitResponse commitResponse = null;
         try {
-            // Path to the Git repository (.git directory or its parent)
-            File repoDir = new File("/" + FileUtils.normalizePath(GitServerConfig.GIT_SERVER_PATH.getValue()) + "/" + request.getProjectName() + "/.git");
-            // 当前机器不存在就新建
-            if (repoDir.exists()) {
-                repository = new FileRepositoryBuilder().setGitDir(repoDir).build();
-            } else {
-                repository = FileRepositoryBuilder.create(new File(String.valueOf(repoDir)));
-                DSSGitUtils.remote(repository, request.getProjectName(), gitUser);
-            }
+            // 拼接.git路径
+            String gitPath = DSSGitUtils.generateGitPath(request.getProjectName());
+            // 获取git仓库
+            File repoDir = new File(gitPath);
+            repository = getRepository(repoDir, request.getProjectName(), gitUser);
             // 本地保持最新状态
             DSSGitUtils.pull(repository, request.getProjectName(), gitUser);
             // 解压BML文件到本地 todo 对接Server时放开调试
@@ -241,15 +233,11 @@ public GitDeleteResponse delete(GitDeleteRequest request) {
         Repository repository = null;
         GitDeleteResponse deleteResponse = null;
         try {
-            // Path to the Git repository (.git directory or its parent)
-            File repoDir = new File("/" + FileUtils.normalizePath(GitServerConfig.GIT_SERVER_PATH.getValue()) + "/" + request.getProjectName() + "/.git");
-            // 当前机器不存在就新建
-            if (repoDir.exists()) {
-                repository = new FileRepositoryBuilder().setGitDir(repoDir).build();
-            } else {
-                repository = FileRepositoryBuilder.create(new File(String.valueOf(repoDir)));
-                DSSGitUtils.remote(repository, request.getProjectName(), gitUser);
-            }
+            // 拼接.git路径
+            String gitPath = DSSGitUtils.generateGitPath(request.getProjectName());
+            // 获取git仓库
+            File repoDir = new File(gitPath);
+            repository = getRepository(repoDir, request.getProjectName(), gitUser);
             // 本地保持最新状态
             DSSGitUtils.pull(repository, request.getProjectName(), gitUser);
             List<String> deleteFileList = request.getDeleteFileList();
@@ -283,15 +271,12 @@ public GitFileContentResponse getFileContent(GitFileContentRequest request) {
         Repository repository = null;
         GitFileContentResponse contentResponse = null;
         try {
-            // Path to the Git repository (.git directory or its parent)
-            File repoDir = new File("/" + FileUtils.normalizePath(GitServerConfig.GIT_SERVER_PATH.getValue()) + "/" + request.getProjectName() + "/.git");
-            // 当前机器不存在就新建
-            if (repoDir.exists()) {
-                repository = new FileRepositoryBuilder().setGitDir(repoDir).build();
-            } else {
-                repository = FileRepositoryBuilder.create(new File(String.valueOf(repoDir)));
-                DSSGitUtils.remote(repository, request.getProjectName(), gitUser);
-            }
+            // 拼接.git路径
+            String gitPath = DSSGitUtils.generateGitPath(request.getProjectName());
+            // 获取git仓库
+            File repoDir = new File(gitPath);
+            repository = getRepository(repoDir, request.getProjectName(), gitUser);
+            // 本地保持最新状态
             DSSGitUtils.pull(repository, request.getProjectName(), gitUser);
 
             String content = DSSGitUtils.getTargetCommitFileContent(request.getProjectName(), request.getCommitId(), request.getFilePath());
@@ -309,4 +294,45 @@ public GitFileContentResponse getFileContent(GitFileContentRequest request) {
         }
        return null;
     }
+
+    @Override
+    public GitHistoryResponse getHistory(GitHistoryRequest request) {
+        GitUserEntity gitUser = dssWorkspaceGitService.selectGit(request.getWorkspaceId());
+        if (gitUser == null) {
+            logger.error("the workspace : {} don't associate with git", request.getWorkspaceId());
+            return null;
+        }
+
+        Repository repository = null;
+        GitHistoryResponse response = new GitHistoryResponse();
+        try {
+            // 拼接.git路径
+            String gitPath = DSSGitUtils.generateGitPath(request.getProjectName());
+            // 获取git仓库
+            File repoDir = new File(gitPath);
+            repository = getRepository(repoDir, request.getProjectName(), gitUser);
+            // 本地保持最新状态
+            DSSGitUtils.pull(repository, request.getProjectName(), gitUser);
+
+            response = DSSGitUtils.listCommitsBetween(repository, request.getStartCommitId(), request.getEndCommitId());
+
+        } catch (Exception e) {
+            logger.error("pull failed, the reason is ",e);
+        } finally {
+            repository.close();
+        }
+        return response;
+    }
+
+    private Repository getRepository(File repoDir, String projectName, GitUserEntity gitUser) throws IOException {
+        Repository repository = null;
+        // 当前机器不存在就新建
+        if (repoDir.exists()) {
+            repository = new FileRepositoryBuilder().setGitDir(repoDir).build();
+        } else {
+            repository = FileRepositoryBuilder.create(new File(String.valueOf(repoDir)));
+            DSSGitUtils.remote(repository, projectName, gitUser);
+        }
+        return repository;
+    }
 }
diff --git a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/utils/DSSGitUtils.java b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/utils/DSSGitUtils.java
index 2c2029466..b7a952b07 100644
--- a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/utils/DSSGitUtils.java
+++ b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/utils/DSSGitUtils.java
@@ -7,7 +7,9 @@
 import com.webank.wedatasphere.dss.git.common.protocol.request.GitRevertRequest;
 import com.webank.wedatasphere.dss.git.common.protocol.response.GItDiffResponse;
 import com.webank.wedatasphere.dss.git.common.protocol.response.GitCommitResponse;
+import com.webank.wedatasphere.dss.git.common.protocol.response.GitHistoryResponse;
 import com.webank.wedatasphere.dss.git.config.GitServerConfig;
+import com.webank.wedatasphere.dss.git.constant.DSSGitConstant;
 import org.apache.http.HttpEntity;
 import org.apache.http.client.methods.CloseableHttpResponse;
 import org.apache.http.client.methods.HttpGet;
@@ -489,6 +491,47 @@ public static GitCommitResponse getCurrentCommit(Repository repository) {
         }
     }
 
+    public static GitHistoryResponse listCommitsBetween(Repository repository, String startCommitId, String endCommitId) throws Exception {
+        List<GitCommitResponse> gitCommitResponseList = new ArrayList<>();
+
+        ObjectId start = repository.resolve(startCommitId);
+        ObjectId end = repository.resolve(endCommitId);
+
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        try (RevWalk walk = new RevWalk(repository)) {
+            RevCommit startCommit = walk.parseCommit(start);
+            RevCommit endCommit = walk.parseCommit(end);
+
+            walk.markStart(startCommit);
+            if (endCommit.getParentCount() > 0) {  // Check if endCommit has any parents
+                walk.markUninteresting(walk.parseCommit(endCommit.getParent(0))); // Mark parent of end commit as uninteresting
+            }
+
+            for (RevCommit commit : walk) {
+                PersonIdent authorIdent = commit.getAuthorIdent(); // 获取提交人信息
+                GitCommitResponse commitResponse = new GitCommitResponse();
+                commitResponse.setCommitId(commit.getId().getName());
+                commitResponse.setCommitTime(sdf.format(commit.getAuthorIdent().getWhen()));
+                commitResponse.setComment(commit.getShortMessage());
+                commitResponse.setCommitUser(commit.getAuthorIdent().getName());
+                gitCommitResponseList.add(commitResponse);
+                System.out.println("Commit Hash: " + commit.getName()); // 提交的Hash值
+                System.out.println("Commit Time: " + authorIdent.getWhen()); // 提交时间
+                System.out.println("Commit Message: " + commit.getFullMessage()); // 提交信息
+                System.out.println("Author: " + authorIdent.getName() + " <" + authorIdent.getEmailAddress() + ">"); // 提交人
+                System.out.println("-----------------------------------------------------");
+            }
+        }
+        GitHistoryResponse historyResponse = new GitHistoryResponse();
+        historyResponse.setResponses(gitCommitResponseList);
+        return historyResponse;
+    }
+
+    public static String generateGitPath(String projectName) {
+        // eg ： /data/GitInstall/testGit/.git
+        return DSSGitConstant.GIT_PATH_PRE + projectName + DSSGitConstant.GIT_PATH_SUFFIX;
+    }
+
 
 
 

From a9b550a7b50711114fca72c4c0744c08f09a34dc Mon Sep 17 00:00:00 2001
From: zhaobincai <zhaobincai@webank.com>
Date: Mon, 15 Apr 2024 16:46:53 +0800
Subject: [PATCH 034/302] git getHistory add Receiver

---
 .../receiver/DSSGitChooser.scala                              | 3 ++-
 .../receiver/DSSGitReceiver.scala                             | 4 +++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/dss-git/dss-git-server/src/main/scala/com.webank.wedatasphere.dss.git/receiver/DSSGitChooser.scala b/dss-git/dss-git-server/src/main/scala/com.webank.wedatasphere.dss.git/receiver/DSSGitChooser.scala
index 975581bac..fc187f481 100644
--- a/dss-git/dss-git-server/src/main/scala/com.webank.wedatasphere.dss.git/receiver/DSSGitChooser.scala
+++ b/dss-git/dss-git-server/src/main/scala/com.webank.wedatasphere.dss.git/receiver/DSSGitChooser.scala
@@ -16,7 +16,7 @@
 
 package com.webank.wedatasphere.dss.git.server.receiver
 
-import com.webank.wedatasphere.dss.git.common.protocol.request.{GitArchiveProjectRequest, GitBaseRequest, GitCheckProjectRequest, GitCommitRequest, GitCreateProjectRequest, GitDeleteRequest, GitDiffRequest, GitFileContentRequest, GitRemoveRequest, GitRevertRequest, GitSearchRequest}
+import com.webank.wedatasphere.dss.git.common.protocol.request.{GitArchiveProjectRequest, GitBaseRequest, GitCheckProjectRequest, GitCommitRequest, GitCreateProjectRequest, GitDeleteRequest, GitDiffRequest, GitFileContentRequest, GitHistoryRequest, GitRemoveRequest, GitRevertRequest, GitSearchRequest}
 import com.webank.wedatasphere.dss.git.service.{DSSGitProjectManagerService, DSSGitWorkflowManagerService}
 
 import javax.annotation.PostConstruct
@@ -48,6 +48,7 @@ class DSSGitChooser extends ReceiverChooser {
     case _: GitSearchRequest => receiver
     case _: GitFileContentRequest => receiver
     case _: GitDeleteRequest => receiver
+    case _: GitHistoryRequest => receiver
     case _ => None
   }
 }
\ No newline at end of file
diff --git a/dss-git/dss-git-server/src/main/scala/com.webank.wedatasphere.dss.git/receiver/DSSGitReceiver.scala b/dss-git/dss-git-server/src/main/scala/com.webank.wedatasphere.dss.git/receiver/DSSGitReceiver.scala
index ee93a2b59..264707a01 100644
--- a/dss-git/dss-git-server/src/main/scala/com.webank.wedatasphere.dss.git/receiver/DSSGitReceiver.scala
+++ b/dss-git/dss-git-server/src/main/scala/com.webank.wedatasphere.dss.git/receiver/DSSGitReceiver.scala
@@ -16,7 +16,7 @@
 
 package com.webank.wedatasphere.dss.git.server.receiver
 
-import com.webank.wedatasphere.dss.git.common.protocol.request.{GitArchiveProjectRequest, GitCheckProjectRequest, GitCommitRequest, GitCreateProjectRequest, GitDeleteRequest, GitDiffRequest, GitFileContentRequest, GitRevertRequest, GitSearchRequest}
+import com.webank.wedatasphere.dss.git.common.protocol.request.{GitArchiveProjectRequest, GitCheckProjectRequest, GitCommitRequest, GitCreateProjectRequest, GitDeleteRequest, GitDiffRequest, GitFileContentRequest, GitHistoryRequest, GitRevertRequest, GitSearchRequest}
 import com.webank.wedatasphere.dss.git.service.{DSSGitProjectManagerService, DSSGitWorkflowManagerService}
 import org.apache.linkis.rpc.{Receiver, Sender}
 import org.slf4j.{Logger, LoggerFactory}
@@ -46,6 +46,8 @@ class DSSGitReceiver(gitProjectManagerService: DSSGitProjectManagerService, gitW
       gitWorkflowManagerService.delete(gitDeleteRequest)
     case gitFileContentRequest: GitFileContentRequest =>
       gitWorkflowManagerService.getFileContent(gitFileContentRequest)
+    case gitHistoryRequest: GitHistoryRequest =>
+      gitWorkflowManagerService.getHistory(gitHistoryRequest)
     case _ => None
   }
 

From c71ce001ab4945057f8a9a6aafa96abac7958ac9 Mon Sep 17 00:00:00 2001
From: zhaobincai <zhaobincai@webank.com>
Date: Mon, 15 Apr 2024 17:31:22 +0800
Subject: [PATCH 035/302] =?UTF-8?q?workflow=20lock=EF=BC=9Aonly=20update?=
 =?UTF-8?q?=20target=20project=20status?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dss/common/entity/project/DSSProject.java      | 14 ++++++++++++++
 .../dss/workflow/lock/DSSFlowEditLockManager.java  | 14 +++++++++-----
 .../workflow/service/impl/DSSFlowServiceImpl.java  |  9 ++++++++-
 .../workflow/service/impl/PublishServiceImpl.java  | 10 ++++++++--
 4 files changed, 39 insertions(+), 8 deletions(-)

diff --git a/dss-commons/dss-common/src/main/java/com/webank/wedatasphere/dss/common/entity/project/DSSProject.java b/dss-commons/dss-common/src/main/java/com/webank/wedatasphere/dss/common/entity/project/DSSProject.java
index 7595a45ec..1e0112d98 100644
--- a/dss-commons/dss-common/src/main/java/com/webank/wedatasphere/dss/common/entity/project/DSSProject.java
+++ b/dss-commons/dss-common/src/main/java/com/webank/wedatasphere/dss/common/entity/project/DSSProject.java
@@ -40,6 +40,11 @@ public class DSSProject implements Project {
 
     private Boolean editable;
 
+    /**
+     * 1-接入git 0-不接入（默认）
+     */
+    private Boolean associateGit;
+
 
     @Override
     public Long getId() {
@@ -169,6 +174,15 @@ public String toString() {
                 ", workspaceId=" + workspaceId +
                 ", workspaceName='" + workspaceName + '\'' +
                 ", editable=" + editable +
+                ", associateGit=" + associateGit +
                 '}';
     }
+
+    public Boolean getAssociateGit() {
+        return associateGit;
+    }
+
+    public void setAssociateGit(Boolean associateGit) {
+        this.associateGit = associateGit;
+    }
 }
diff --git a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/lock/DSSFlowEditLockManager.java b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/lock/DSSFlowEditLockManager.java
index f8bbd7550..e973f3488 100644
--- a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/lock/DSSFlowEditLockManager.java
+++ b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/lock/DSSFlowEditLockManager.java
@@ -195,12 +195,16 @@ public static void deleteLock(String flowEditLock) throws DSSErrorException {
             if (StringUtils.isNotBlank(flowEditLock)) {
                 DSSFlowEditLock dssFlowEditLock = lockMapper.getFlowEditLockByLockContent(flowEditLock);
                 if (dssFlowEditLock != null) {
-                    String status = lockMapper.selectStatusByFlowId(dssFlowEditLock.getFlowID());
-                    if (DSSWorkFlowConstant.FLOW_STATUS_SAVE.equals(status)) {
-                        DSSFlow dssFlow = flowMapper.selectFlowByID(dssFlowEditLock.getFlowID());
-                        DSSProject projectInfo = getProjectInfo(dssFlow.getProjectId());
+                    // 获取当前项目信息
+                    DSSFlow dssFlow = flowMapper.selectFlowByID(dssFlowEditLock.getFlowID());
+                    DSSProject projectInfo = getProjectInfo(dssFlow.getProjectId());
+                    // 对于接入Git的项目，工作流解锁加入额外处理
+                    if (projectInfo.getAssociateGit()) {
+                        String status = lockMapper.selectStatusByFlowId(dssFlowEditLock.getFlowID());
+                        if (DSSWorkFlowConstant.FLOW_STATUS_SAVE.equals(status)) {
 //                        pushProject(projectInfo.getName(), projectInfo.getWorkspaceId(), "resurce", "version", "path", projectInfo.getUsername(), "comment");
-                        lockMapper.insertFlowStatus(dssFlow.getId(), FLOW_STATUS_PUSH);
+                            lockMapper.insertFlowStatus(dssFlow.getId(), FLOW_STATUS_PUSH);
+                        }
                     }
                     lockMapper.clearExpire(sdf.get().format(new Date(System.currentTimeMillis() - DSSWorkFlowConstant.DSS_FLOW_EDIT_LOCK_TIMEOUT.getValue())), dssFlowEditLock.getFlowID());
                 }
diff --git a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/service/impl/DSSFlowServiceImpl.java b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/service/impl/DSSFlowServiceImpl.java
index c064ab801..c9626df05 100644
--- a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/service/impl/DSSFlowServiceImpl.java
+++ b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/service/impl/DSSFlowServiceImpl.java
@@ -27,6 +27,7 @@
 import com.webank.wedatasphere.dss.common.entity.node.DSSNode;
 import com.webank.wedatasphere.dss.common.entity.node.DSSNodeDefault;
 import com.webank.wedatasphere.dss.common.entity.node.Node;
+import com.webank.wedatasphere.dss.common.entity.project.DSSProject;
 import com.webank.wedatasphere.dss.common.exception.DSSErrorException;
 import com.webank.wedatasphere.dss.common.exception.DSSRuntimeException;
 import com.webank.wedatasphere.dss.common.label.DSSLabel;
@@ -54,6 +55,7 @@
 import com.webank.wedatasphere.dss.workflow.entity.vo.ExtraToolBarsVO;
 import com.webank.wedatasphere.dss.workflow.io.export.NodeExportService;
 import com.webank.wedatasphere.dss.workflow.io.input.NodeInputService;
+import com.webank.wedatasphere.dss.workflow.lock.DSSFlowEditLockManager;
 import com.webank.wedatasphere.dss.workflow.lock.Lock;
 import com.webank.wedatasphere.dss.common.service.BMLService;
 import com.webank.wedatasphere.dss.workflow.service.DSSFlowService;
@@ -307,7 +309,12 @@ public String saveFlow(Long flowID,
         }
         saveFlowHook.afterSave(jsonFlow,dssFlow,parentFlowID);
         String version = bmlReturnMap.get("version").toString();
-        lockMapper.insertFlowStatus(flowID, FLOW_STATUS_SAVE);
+        DSSProject projectInfo = DSSFlowEditLockManager.getProjectInfo(flowID);
+        //仅对接入Git的项目 更新状态为 保存
+        if (projectInfo!= null && projectInfo.getAssociateGit()) {
+            lockMapper.insertFlowStatus(flowID, FLOW_STATUS_SAVE);
+        }
+
         return version;
     }
 
diff --git a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/service/impl/PublishServiceImpl.java b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/service/impl/PublishServiceImpl.java
index f236e31ba..f3b6dec33 100644
--- a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/service/impl/PublishServiceImpl.java
+++ b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/service/impl/PublishServiceImpl.java
@@ -33,6 +33,7 @@
 import com.webank.wedatasphere.dss.workflow.common.parser.WorkFlowParser;
 import com.webank.wedatasphere.dss.workflow.constant.DSSWorkFlowConstant;
 import com.webank.wedatasphere.dss.workflow.dao.LockMapper;
+import com.webank.wedatasphere.dss.workflow.lock.DSSFlowEditLockManager;
 import com.webank.wedatasphere.dss.workflow.service.DSSFlowService;
 import com.webank.wedatasphere.dss.workflow.service.PublishService;
 import org.apache.commons.lang.StringUtils;
@@ -43,7 +44,7 @@
 
 import java.util.Map;
 
-import static com.webank.wedatasphere.dss.workflow.constant.DSSWorkFlowConstant.DEFAULT_SCHEDULER_APP_CONN;
+import static com.webank.wedatasphere.dss.workflow.constant.DSSWorkFlowConstant.*;
 
 public class PublishServiceImpl implements PublishService {
 
@@ -100,7 +101,12 @@ public String submitPublish(String convertUser, Long workflowId,
             if (response.getResponse().isFailed()) {
                 throw new DSSErrorException(50311, response.getResponse().getMessage());
             }
-            lockMapper.insertFlowStatus(workflowId, DSSWorkFlowConstant.FLOW_STATUS_PUBLISH);
+            DSSProject projectInfo = DSSFlowEditLockManager.getProjectInfo(flowID);
+            //仅对接入Git的项目更新状态为 发布-publish
+            if (projectInfo.getAssociateGit()) {
+                lockMapper.insertFlowStatus(workflowId, DSSWorkFlowConstant.FLOW_STATUS_PUBLISH);
+            }
+
             return response.getId();
         } catch (DSSErrorException e) {
             throw e;

From bd20908fc8c452f95a5ae0e3cf017f1c2acb586a Mon Sep 17 00:00:00 2001
From: zhaobincai <zhaobincai@webank.com>
Date: Mon, 15 Apr 2024 17:47:56 +0800
Subject: [PATCH 036/302] =?UTF-8?q?workflow=20lock=EF=BC=9Aonly=20update?=
 =?UTF-8?q?=20target=20project=20status?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../wedatasphere/dss/workflow/dao/impl/lockMapper.xml    | 1 -
 .../dss/workflow/lock/DSSFlowEditLockManager.java        | 2 +-
 .../dss/workflow/service/impl/DSSFlowServiceImpl.java    | 7 ++++++-
 .../dss/workflow/service/impl/PublishServiceImpl.java    | 9 +++++++--
 4 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/dao/impl/lockMapper.xml b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/dao/impl/lockMapper.xml
index 7a791566a..083cd7282 100644
--- a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/dao/impl/lockMapper.xml
+++ b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/dao/impl/lockMapper.xml
@@ -85,7 +85,6 @@
         INSERT INTO dss_workflow_status (`flow_id`, `status`, `create_time`, `update_time`)
         VALUES
         (#{flowID}, #{status}, NOW(), NOW())
-        ON DUPLICATE KEY UPDATE `status` = #{status}, `update_time` = NOW()
     </insert>
 
     <update id="updateFlowStatus">
diff --git a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/lock/DSSFlowEditLockManager.java b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/lock/DSSFlowEditLockManager.java
index e973f3488..222f51e99 100644
--- a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/lock/DSSFlowEditLockManager.java
+++ b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/lock/DSSFlowEditLockManager.java
@@ -201,7 +201,7 @@ public static void deleteLock(String flowEditLock) throws DSSErrorException {
                     // 对于接入Git的项目，工作流解锁加入额外处理
                     if (projectInfo.getAssociateGit()) {
                         String status = lockMapper.selectStatusByFlowId(dssFlowEditLock.getFlowID());
-                        if (DSSWorkFlowConstant.FLOW_STATUS_SAVE.equals(status)) {
+                        if (!StringUtils.isEmpty(status) && DSSWorkFlowConstant.FLOW_STATUS_SAVE.equals(status)) {
 //                        pushProject(projectInfo.getName(), projectInfo.getWorkspaceId(), "resurce", "version", "path", projectInfo.getUsername(), "comment");
                             lockMapper.insertFlowStatus(dssFlow.getId(), FLOW_STATUS_PUSH);
                         }
diff --git a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/service/impl/DSSFlowServiceImpl.java b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/service/impl/DSSFlowServiceImpl.java
index c9626df05..483cc4576 100644
--- a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/service/impl/DSSFlowServiceImpl.java
+++ b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/service/impl/DSSFlowServiceImpl.java
@@ -312,7 +312,12 @@ public String saveFlow(Long flowID,
         DSSProject projectInfo = DSSFlowEditLockManager.getProjectInfo(flowID);
         //仅对接入Git的项目 更新状态为 保存
         if (projectInfo!= null && projectInfo.getAssociateGit()) {
-            lockMapper.insertFlowStatus(flowID, FLOW_STATUS_SAVE);
+            String status = lockMapper.selectStatusByFlowId(flowID);
+            if (StringUtils.isEmpty(status)) {
+                lockMapper.insertFlowStatus(flowID, FLOW_STATUS_SAVE);
+            } else {
+                lockMapper.updateFlowStatus(flowID,FLOW_STATUS_SAVE);
+            }
         }
 
         return version;
diff --git a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/service/impl/PublishServiceImpl.java b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/service/impl/PublishServiceImpl.java
index f3b6dec33..4841278cf 100644
--- a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/service/impl/PublishServiceImpl.java
+++ b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/service/impl/PublishServiceImpl.java
@@ -101,10 +101,15 @@ public String submitPublish(String convertUser, Long workflowId,
             if (response.getResponse().isFailed()) {
                 throw new DSSErrorException(50311, response.getResponse().getMessage());
             }
-            DSSProject projectInfo = DSSFlowEditLockManager.getProjectInfo(flowID);
+            DSSProject projectInfo = DSSFlowEditLockManager.getProjectInfo(workflowId);
             //仅对接入Git的项目更新状态为 发布-publish
             if (projectInfo.getAssociateGit()) {
-                lockMapper.insertFlowStatus(workflowId, DSSWorkFlowConstant.FLOW_STATUS_PUBLISH);
+                String status = lockMapper.selectStatusByFlowId(workflowId);
+                if (StringUtils.isEmpty(status)) {
+                    lockMapper.insertFlowStatus(workflowId, DSSWorkFlowConstant.FLOW_STATUS_PUBLISH);
+                } else {
+                    lockMapper.updateFlowStatus(workflowId,DSSWorkFlowConstant.FLOW_STATUS_PUBLISH);
+                }
             }
 
             return response.getId();

From 37359dfae1df6dacf0114cad2decfeb5d7f47e1a Mon Sep 17 00:00:00 2001
From: zhaobincai <zhaobincai@webank.com>
Date: Mon, 15 Apr 2024 17:52:38 +0800
Subject: [PATCH 037/302] git workflow lock fix

---
 .../webank/wedatasphere/dss/workflow/dao/impl/lockMapper.xml    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/dao/impl/lockMapper.xml b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/dao/impl/lockMapper.xml
index 083cd7282..3a78c3bd3 100644
--- a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/dao/impl/lockMapper.xml
+++ b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/dao/impl/lockMapper.xml
@@ -97,7 +97,7 @@
     </select>
 
     <select id="selectStatusByFlowId" resultType="java.lang.String">
-        select `status` from dss_workflow_status where `flow_id` = #{flowID} order by update_time limit 1
+        select `status` from dss_workflow_status where `flow_id` = #{flowID} order by update_time desc limit 1
     </select>
 
 </mapper>
\ No newline at end of file

From c8a88f00f01078c544a1bdc0dca72e93cfec6578 Mon Sep 17 00:00:00 2001
From: zhaobincai <zhaobincai@webank.com>
Date: Mon, 15 Apr 2024 20:55:57 +0800
Subject: [PATCH 038/302] git workflow lock fix

---
 .../service/impl/DSSFlowServiceImpl.java      | 21 +++++++++++--------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/service/impl/DSSFlowServiceImpl.java b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/service/impl/DSSFlowServiceImpl.java
index 483cc4576..30869108e 100644
--- a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/service/impl/DSSFlowServiceImpl.java
+++ b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/service/impl/DSSFlowServiceImpl.java
@@ -309,17 +309,20 @@ public String saveFlow(Long flowID,
         }
         saveFlowHook.afterSave(jsonFlow,dssFlow,parentFlowID);
         String version = bmlReturnMap.get("version").toString();
-        DSSProject projectInfo = DSSFlowEditLockManager.getProjectInfo(flowID);
-        //仅对接入Git的项目 更新状态为 保存
-        if (projectInfo!= null && projectInfo.getAssociateGit()) {
-            String status = lockMapper.selectStatusByFlowId(flowID);
-            if (StringUtils.isEmpty(status)) {
-                lockMapper.insertFlowStatus(flowID, FLOW_STATUS_SAVE);
-            } else {
-                lockMapper.updateFlowStatus(flowID,FLOW_STATUS_SAVE);
+        try {
+            DSSProject projectInfo = DSSFlowEditLockManager.getProjectInfo(flowID);
+            //仅对接入Git的项目 更新状态为 保存
+            if (projectInfo != null && projectInfo.getAssociateGit()) {
+                String status = lockMapper.selectStatusByFlowId(flowID);
+                if (StringUtils.isEmpty(status)) {
+                    lockMapper.insertFlowStatus(flowID, FLOW_STATUS_SAVE);
+                } else {
+                    lockMapper.updateFlowStatus(flowID, FLOW_STATUS_SAVE);
+                }
             }
+        } catch (DSSErrorException e) {
+            logger.error("getProjectInfo failed by:", e);
         }
-
         return version;
     }
 

From f6eb4aa69f456191cf8648778a9ec66b94bf5aca Mon Sep 17 00:00:00 2001
From: zhaobincai <zhaobincai@webank.com>
Date: Tue, 16 Apr 2024 10:21:00 +0800
Subject: [PATCH 039/302] git workflow lock fix1

---
 .../dss/workflow/service/impl/DSSFlowServiceImpl.java           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/service/impl/DSSFlowServiceImpl.java b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/service/impl/DSSFlowServiceImpl.java
index 30869108e..bcbf5b1cd 100644
--- a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/service/impl/DSSFlowServiceImpl.java
+++ b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/service/impl/DSSFlowServiceImpl.java
@@ -310,7 +310,7 @@ public String saveFlow(Long flowID,
         saveFlowHook.afterSave(jsonFlow,dssFlow,parentFlowID);
         String version = bmlReturnMap.get("version").toString();
         try {
-            DSSProject projectInfo = DSSFlowEditLockManager.getProjectInfo(flowID);
+            DSSProject projectInfo = DSSFlowEditLockManager.getProjectInfo(dssFlow.getProjectId());
             //仅对接入Git的项目 更新状态为 保存
             if (projectInfo != null && projectInfo.getAssociateGit()) {
                 String status = lockMapper.selectStatusByFlowId(flowID);

From f5028738147d10234991cfdba852cd871c726afc Mon Sep 17 00:00:00 2001
From: zhaobincai <zhaobincai@webank.com>
Date: Tue, 16 Apr 2024 10:44:30 +0800
Subject: [PATCH 040/302] git workflow lock fix2

---
 .../dss/workflow/service/impl/DSSFlowServiceImpl.java          | 2 +-
 .../dss/workflow/service/impl/PublishServiceImpl.java          | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/service/impl/DSSFlowServiceImpl.java b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/service/impl/DSSFlowServiceImpl.java
index bcbf5b1cd..a37b52eff 100644
--- a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/service/impl/DSSFlowServiceImpl.java
+++ b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/service/impl/DSSFlowServiceImpl.java
@@ -312,7 +312,7 @@ public String saveFlow(Long flowID,
         try {
             DSSProject projectInfo = DSSFlowEditLockManager.getProjectInfo(dssFlow.getProjectId());
             //仅对接入Git的项目 更新状态为 保存
-            if (projectInfo != null && projectInfo.getAssociateGit()) {
+            if (projectInfo.getAssociateGit()) {
                 String status = lockMapper.selectStatusByFlowId(flowID);
                 if (StringUtils.isEmpty(status)) {
                     lockMapper.insertFlowStatus(flowID, FLOW_STATUS_SAVE);
diff --git a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/service/impl/PublishServiceImpl.java b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/service/impl/PublishServiceImpl.java
index 4841278cf..42351d267 100644
--- a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/service/impl/PublishServiceImpl.java
+++ b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/service/impl/PublishServiceImpl.java
@@ -101,9 +101,8 @@ public String submitPublish(String convertUser, Long workflowId,
             if (response.getResponse().isFailed()) {
                 throw new DSSErrorException(50311, response.getResponse().getMessage());
             }
-            DSSProject projectInfo = DSSFlowEditLockManager.getProjectInfo(workflowId);
             //仅对接入Git的项目更新状态为 发布-publish
-            if (projectInfo.getAssociateGit()) {
+            if (dssProject.getAssociateGit()) {
                 String status = lockMapper.selectStatusByFlowId(workflowId);
                 if (StringUtils.isEmpty(status)) {
                     lockMapper.insertFlowStatus(workflowId, DSSWorkFlowConstant.FLOW_STATUS_PUBLISH);

From 730129c8d0f80398dfd7fb1d411c0d1f1c126a14 Mon Sep 17 00:00:00 2001
From: SunpengWan <825559776@qq.com>
Date: Tue, 16 Apr 2024 11:37:35 +0800
Subject: [PATCH 041/302] FlowEntranceJob class override clear function

---
 .../dss/flow/execution/entrance/job/FlowEntranceJob.scala     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dss-orchestrator/orchestrators/dss-workflow/dss-flow-execution-server/src/main/scala/com/webank/wedatasphere/dss/flow/execution/entrance/job/FlowEntranceJob.scala b/dss-orchestrator/orchestrators/dss-workflow/dss-flow-execution-server/src/main/scala/com/webank/wedatasphere/dss/flow/execution/entrance/job/FlowEntranceJob.scala
index f97475fb2..611abd395 100644
--- a/dss-orchestrator/orchestrators/dss-workflow/dss-flow-execution-server/src/main/scala/com/webank/wedatasphere/dss/flow/execution/entrance/job/FlowEntranceJob.scala
+++ b/dss-orchestrator/orchestrators/dss-workflow/dss-flow-execution-server/src/main/scala/com/webank/wedatasphere/dss/flow/execution/entrance/job/FlowEntranceJob.scala
@@ -171,7 +171,7 @@ class FlowEntranceJob(persistManager:PersistenceManager) extends EntranceExecuti
 
   }
 
-
-
+   override def clear(): Unit = {
+   }
 
 }

From 955f11b584d1dec69e9d02b542346668baad6d6c Mon Sep 17 00:00:00 2001
From: zhaobincai <zhaobincai@webank.com>
Date: Tue, 16 Apr 2024 11:49:59 +0800
Subject: [PATCH 042/302] git diff rename

---
 .../response/{GItDiffResponse.java => GitDiffResponse.java} | 6 +++---
 .../dss/git/service/DSSGitWorkflowManagerService.java       | 2 +-
 .../git/service/impl/DSSGitWorkflowManagerServiceImpl.java  | 6 ++----
 .../com/webank/wedatasphere/dss/git/utils/DSSGitUtils.java  | 6 +++---
 4 files changed, 9 insertions(+), 11 deletions(-)
 rename dss-git/dss-git-common/src/main/java/com.webank.wedatasphere.dss.git.common/protocol/response/{GItDiffResponse.java => GitDiffResponse.java} (76%)

diff --git a/dss-git/dss-git-common/src/main/java/com.webank.wedatasphere.dss.git.common/protocol/response/GItDiffResponse.java b/dss-git/dss-git-common/src/main/java/com.webank.wedatasphere.dss.git.common/protocol/response/GitDiffResponse.java
similarity index 76%
rename from dss-git/dss-git-common/src/main/java/com.webank.wedatasphere.dss.git.common/protocol/response/GItDiffResponse.java
rename to dss-git/dss-git-common/src/main/java/com.webank.wedatasphere.dss.git.common/protocol/response/GitDiffResponse.java
index 7495b05cf..14f8e1f13 100644
--- a/dss-git/dss-git-common/src/main/java/com.webank.wedatasphere.dss.git.common/protocol/response/GItDiffResponse.java
+++ b/dss-git/dss-git-common/src/main/java/com.webank.wedatasphere.dss.git.common/protocol/response/GitDiffResponse.java
@@ -3,14 +3,14 @@
 
 import com.webank.wedatasphere.dss.git.common.protocol.GitTree;
 
-public class GItDiffResponse{
+public class GitDiffResponse {
     private GitTree tree;
 
-    public GItDiffResponse(GitTree tree) {
+    public GitDiffResponse(GitTree tree) {
         this.tree = tree;
     }
 
-    public GItDiffResponse() {
+    public GitDiffResponse() {
     }
 
     public GitTree getTree() {
diff --git a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/DSSGitWorkflowManagerService.java b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/DSSGitWorkflowManagerService.java
index e0706ed49..08822a741 100644
--- a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/DSSGitWorkflowManagerService.java
+++ b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/DSSGitWorkflowManagerService.java
@@ -7,7 +7,7 @@
 import java.util.concurrent.ExecutionException;
 
 public interface DSSGitWorkflowManagerService {
-    GItDiffResponse diff(GitDiffRequest request) throws ExecutionException, InterruptedException;
+    GitDiffResponse diff(GitDiffRequest request) throws ExecutionException, InterruptedException;
 
     GitCommitResponse commit(GitCommitRequest request) throws ExecutionException, InterruptedException;
 
diff --git a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitWorkflowManagerServiceImpl.java b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitWorkflowManagerServiceImpl.java
index edde0ac63..53d9887e1 100644
--- a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitWorkflowManagerServiceImpl.java
+++ b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitWorkflowManagerServiceImpl.java
@@ -23,8 +23,6 @@
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStreamReader;
-import java.nio.file.Path;
-import java.nio.file.Paths;
 import java.util.*;
 import java.util.concurrent.TimeUnit;
 
@@ -39,13 +37,13 @@ public class DSSGitWorkflowManagerServiceImpl implements DSSGitWorkflowManagerSe
     @Qualifier("workflowBmlService")
     private BMLService bmlService;
     @Override
-    public GItDiffResponse diff(GitDiffRequest request) {
+    public GitDiffResponse diff(GitDiffRequest request) {
         GitUserEntity gitUser = dssWorkspaceGitService.selectGit(request.getWorkspaceId());
         if (gitUser == null) {
             logger.error("the workspace : {} don't associate with git", request.getWorkspaceId());
             return null;
         }
-        GItDiffResponse diff = null;
+        GitDiffResponse diff = null;
         Repository repository = null;
         try {
             // 拼接.git路径
diff --git a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/utils/DSSGitUtils.java b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/utils/DSSGitUtils.java
index b7a952b07..9751f4847 100644
--- a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/utils/DSSGitUtils.java
+++ b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/utils/DSSGitUtils.java
@@ -5,7 +5,7 @@
 import com.webank.wedatasphere.dss.git.common.protocol.GitTree;
 import com.webank.wedatasphere.dss.git.common.protocol.request.GitBaseRequest;
 import com.webank.wedatasphere.dss.git.common.protocol.request.GitRevertRequest;
-import com.webank.wedatasphere.dss.git.common.protocol.response.GItDiffResponse;
+import com.webank.wedatasphere.dss.git.common.protocol.response.GitDiffResponse;
 import com.webank.wedatasphere.dss.git.common.protocol.response.GitCommitResponse;
 import com.webank.wedatasphere.dss.git.common.protocol.response.GitHistoryResponse;
 import com.webank.wedatasphere.dss.git.config.GitServerConfig;
@@ -137,7 +137,7 @@ public static void pull(Repository repository, String projectName, GitUserEntity
         }
     }
 
-    public static GItDiffResponse diff(String projectName) {
+    public static GitDiffResponse diff(String projectName) {
 
         Set<String> status = status(projectName);
         GitTree root = new GitTree("");
@@ -146,7 +146,7 @@ public static GItDiffResponse diff(String projectName) {
         }
         // 打印树形结构
         printTree("", root);
-        return new GItDiffResponse(root);
+        return new GitDiffResponse(root);
     }
 
     // 打印树结构

From d33f9cb10662b0a29997bdcb9daeae8e6bf767f4 Mon Sep 17 00:00:00 2001
From: ryanlei <ryanlei@webank.com>
Date: Wed, 17 Apr 2024 10:14:39 +0800
Subject: [PATCH 043/302] feat: 1.3.0 changes

---
 .../module/apiServices/apiCard.vue            |     2 +-
 .../module/apiServicesExecute/index.vue       |   426 +-
 .../module/apiServicesExecute/result.vue      |   351 +
 .../module/apiServicesExecute/title.vue       |   109 +
 .../component/APIVersions.vue                 |     2 +-
 .../module/servicesMangement/index.vue        |     4 +-
 .../cyeditor/cyeditor-context-menu/index.js   |     2 +-
 web/packages/cyeditor/distlib/cyeditor.mjs    | 34131 ----------------
 web/packages/cyeditor/distlib/cyeditor.umd.js |    29 -
 web/packages/cyeditor/index.scss              |     8 +
 web/packages/cyeditor/package.json            |     2 +-
 .../module/common/tabCard/index.vue           |     2 +-
 .../dataGovernance/view/fieldInfo/index.vue   |     2 +-
 .../dataService/module/common/navMenu.vue     |     2 +-
 .../module/dataManagement/index.vue           |     4 +-
 .../assets/styles/workflow.scss               |     2 +-
 .../components/tabList/index.scss             |     2 +-
 web/packages/dss/module/footer/guide.vue      |     4 +-
 .../dss/module/footer/libraryDetail.vue       |    14 +-
 web/packages/dss/module/header/index.scss     |     2 +-
 web/packages/dss/vue.config.js                |     8 +-
 web/packages/editor/editor.vue                |     2 +-
 web/packages/editorLsp/editor.vue             |     2 +-
 web/packages/editorLsp/package.json           |     1 -
 .../open-source/scriptis/apiPublish/index.vue |     3 +-
 .../components/importToHive/index.vue         |     1 +
 .../module/hdfsSidebar/hdfsSidebar.vue        |     9 +-
 .../hiveSidebar/hiveTableExport/index.scss    |    13 +-
 .../hiveSidebar/hiveTableExport/index.vue     |    51 +-
 .../module/workSidebar/workSidebar.vue        |    28 +-
 .../scriptis/module/workbench/container.vue   |    38 +-
 .../createTable/components/importTable.vue    |     2 +
 .../components/importTable_csv.vue            |     1 +
 .../module/workbench/createTable/index.vue    |     9 +-
 .../module/workbench/script/editor.vue        |    10 +-
 .../module/workbench/script/field.vue         |    31 +-
 .../module/workbench/script/script.vue        |    44 +-
 .../tableDetails/components/statistics.vue    |     2 +-
 .../module/workbench/tableDetails/index.vue   |     2 +-
 web/packages/scriptis/view/audit/index.scss   |     4 +-
 web/packages/shared/common/i18n/en.json       |     2 +
 web/packages/shared/common/i18n/zh.json       |     2 +
 web/packages/shared/common/service/execute.js |   115 +-
 .../components/consoleComponent/console.vue   |    92 +-
 .../components/consoleComponent/history.vue   |   344 +
 .../components/consoleComponent/modal.js      |     1 +
 .../components/consoleComponent/result.vue    |   100 +-
 .../consoleComponent/resultsExport.vue        |    70 +-
 .../components/consoleComponent/tableRow.vue  |    21 +-
 .../components/consoleComponent/toolbar.vue   |   511 +-
 .../components/resourceSimple/index.vue       |     6 +-
 .../components/resourceSimple/queue.vue       |     6 +-
 .../shared/components/table/table.vue         |     8 +-
 .../workflows/assets/styles/workflow.scss     |     2 +-
 .../module/common/tabList/index.scss          |     2 +-
 web/packages/workflows/module/ide/index.vue   |     3 +-
 .../module/process/component/console.vue      |    28 +-
 .../process/component/designtoolbar.vue       |    14 +-
 .../process/component/nodeparameter.vue       |    35 +-
 .../workflows/module/process/index.vue        |     9 +-
 .../workflows/module/process/module.vue       |    35 +-
 .../workflows/view/workflow/importModal.vue   |     4 +-
 .../workflows/view/workflow/index.vue         |   422 +-
 web/packages/workspace/i18n/en.json           |     6 +-
 web/packages/workspace/i18n/zh.json           |     6 +-
 .../workspace/module/appProcess/index.vue     |     2 +-
 .../workspace/module/bankHome/index.scss      |     2 +-
 .../management/module/productsettings.vue     |     2 +-
 .../module/managementPlatform/index.vue       |     2 +-
 .../workspace/module/newHome/index.scss       |     4 +-
 .../module/newProject/module/projectItem.vue  |     2 +-
 .../permissions/module/departManagement.vue   |     4 +-
 .../workspace/view/enginekill/index.vue       |   147 +-
 73 files changed, 2303 insertions(+), 35067 deletions(-)
 create mode 100644 web/packages/apiServices/module/apiServicesExecute/result.vue
 create mode 100644 web/packages/apiServices/module/apiServicesExecute/title.vue
 delete mode 100644 web/packages/cyeditor/distlib/cyeditor.mjs
 delete mode 100644 web/packages/cyeditor/distlib/cyeditor.umd.js
 create mode 100644 web/packages/shared/components/consoleComponent/history.vue

diff --git a/web/packages/apiServices/module/apiServices/apiCard.vue b/web/packages/apiServices/module/apiServices/apiCard.vue
index d035bc2de..0bf1ba39f 100644
--- a/web/packages/apiServices/module/apiServices/apiCard.vue
+++ b/web/packages/apiServices/module/apiServices/apiCard.vue
@@ -209,7 +209,7 @@ export default {
       right: 0;
       z-index: $zindex-select;
       transform: translateY(-50%);
-      /deep/.ivu-select-dropdown {
+      ::v-deep.ivu-select-dropdown {
         max-width: none;
       }
     }
diff --git a/web/packages/apiServices/module/apiServicesExecute/index.vue b/web/packages/apiServices/module/apiServicesExecute/index.vue
index df41c1bcf..021433042 100644
--- a/web/packages/apiServices/module/apiServicesExecute/index.vue
+++ b/web/packages/apiServices/module/apiServicesExecute/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="dataServicesContent">
+  <div class="dataServicesContainer">
     <div class="tap-bar">
       <Breadcrumb class="breadcrumb" separator="/">
         <BreadcrumbItem :to="{ name: 'Apiservices', query:{ workspaceId: $route.query.workspaceId }}">
@@ -10,35 +10,36 @@
         </BreadcrumbItem>
       </Breadcrumb>
     </div>
-    <div class="execute-content">
-      <Row class="content-top">
-        <i-col span="10">
-          <h3 class="title">{{$t('message.apiServices.apiTestInfo.params')}}</h3>
-          <Form ref="searchFrom" class="search-from" :label-width="100" :model="conditionResult">
-            <FormItem v-for="(item, index) in conditionResult.items" :prop="`items.${index}.defaultValue`" :key="item.id"  :rules="[{
-              required: item.required,
-              message: $t('message.apiServices.placeholder.emter'),
-              trigger: 'blur'
-            }]">
-              <div class="label-class" :title="item.displayName || item.name" slot="label">
-                {{ `${item.displayName || item.name}:` }}
-                <div :title="item.details || ''" class="details-tip"><Icon type="md-help-circle" /></div>
-              </div>
-              <Input class="input-bar" :class="{ verificationValue: tip[item.name] }" @on-blur="verificationValue(item)" :type="inputType(item.type)" v-model="item.defaultValue" :placeholder="item.description || $t('message.apiServices.placeholder.emter')">
-              </Input>
-            </FormItem>
-            <Button class="execute-button" type="primary" @click="search">{{buttonText}}</Button>
-          </Form>
-        </i-col>
-        <i-col span="10">
-          <template v-if="apiData && apiData.comment">
-            <h3 class="title">{{$t('message.apiServices.query.comment')}}</h3>
-            <Alert class="alert-bar" show-icon>{{ apiData.comment }}</Alert>
-          </template>
-        </i-col>
-      </Row>
-      <results ref="currentConsole" getResultUrl="dss/apiservice" :work="apiData" :dispatch="dispatch" :height="height" @executRun="executRun"></results>
+    <div ref="tab-list-scroll" class="workbench-tab work-list-tab">
+      <div
+        v-for="(item, index) in tabslist" :key="item.taskID"
+        :class="{ active: item.taskID == currentTaskId }"
+        class="workbench-tab-item"
+        ref="work_item"
+      >
+        <we-title
+          :index="index"
+          :work="item"
+          @on-choose="onChooseWork"
+          @on-remove="onRemove"
+        />
+      </div>
     </div>
+    <div class="execute-content" v-for="(item, index) in tabslist" :key="item.filename" v-show="item.taskID == currentTaskId">
+      <ExecuteResult
+        :ref="'executeResult'+ item.taskID"
+        :key="item.filename"
+        :workInfo="item"
+        :conditionList="conditionList"
+        :selectCondition="selectCondition"
+        :showConditionList="showConditionList"
+        :historyList="historyList"
+        :isHistory="index !== 0"
+        :triggerSearchFn="triggerSearchFn"
+        @viewHistory="viewHistory"
+        @updateHistory="updateHistory"/>
+    </div>
+    <div />
     <Modal :title="$t('message.apiServices.apiTestInfo.params')" v-model="conditionShow" @on-ok="confirmSelect">
       <CheckboxGroup v-model="selectCondition">
         <Checkbox v-for="item in conditionList" :key="item.id" :label="item.id" :disabled="!!item.required">
@@ -49,11 +50,13 @@
   </div>
 </template>
 <script>
-import results from '@dataspherestudio/shared/components/consoleComponent';
+import ExecuteResult from './result.vue';
 import api from '@dataspherestudio/shared/common/service/api';
+import title from "./title.vue";
 export default {
   components: {
-    results
+    ExecuteResult,
+    "we-title": title,
   },
   data() {
     return {
@@ -64,57 +67,65 @@ export default {
       apiData: null,
       excuteLoading: false,
       tip: {},
-      height: 500
+      height: 500,
+      tabslist: [],
+      currentTaskId: '',
+      historyList: []
     }
   },
   created() {
     this.getExecutePath();
   },
-  computed: {
-    buttonText() {
-      return this.excuteLoading ? this.$t('message.apiServices.query.stop') : this.$t('message.apiServices.query.buttonText')
-    },
-    // iview动态表单组件需要的是object
-    conditionResult() {
-      return {items: this.showConditionList}
-    }
-  },
-  mounted() {
-    this.height = this.$el.clientHeight - 325
-  },
   methods: {
-    // 验证发布和更新的默认值是否满足条件
-    verificationValue (row) {
-      let flag;
-      if(row.defaultValue.length > 1024 && Number(row.type) !== 4) {
-        this.$Message.error({ content: this.$t('message.apiServices.more1024') });
-        flag = true;
-      } else if(row.type == 4 && row.defaultValue.split('\n').length > 5000) {
-        this.$Message.error({ content: this.$t('message.apiServices.moreline') });
-        flag = true;
-      } else {
-        flag = false
+    // 获取历史记录列表
+    async getHistoryList() {
+      let homeTabItem = {
+        ...this.apiData,
+        filename: this.apiData.aliasName || this.apiData.name,
+        noClose: true,
+        taskID: ''
       }
-      this.$set(this.tip, row.name, flag)
-    },
-    // 参数默认值输入框类型
-    inputType(typeNumer) {
-      typeNumer = Number(typeNumer);
-      if (typeNumer === 1) {
-        return 'text';
-      } else if (typeNumer === 2) {
-        return 'number';
-      } else if (typeNumer === 3) {
-        return 'text';
-      } else if (typeNumer === 4) {
-        return 'textarea';
+      const result = await api.fetch('/dss/apiservice/getApiHistory', {
+        apiId: this.apiData.id,
+        apiVersionId: this.apiData.latestVersionId
+      }, 'get')
+      this.historyList = (result.data || []).map(item => ({ execID: item.strongerExecId, ...item }))
+      if (this.historyList[0] && ['Inited','Scheduled', 'Running'].includes(this.historyList[0].status)) {
+        homeTabItem = {
+          ...homeTabItem,
+          ...this.historyList[0],
+          shouldRuning: true
+        }
+        this.currentTaskId = this.historyList[0].taskID
       }
+      this.tabslist.push(homeTabItem)
     },
-    executRun(val) {
-      this.excuteLoading = val;
+    updateHistory(params) {
+      const data = {
+        ...this.historyList[0],
+        fileName: this.apiData.aliasName || this.apiData.name,
+        ...params
+      }
+      if (params.runningTime) {
+        data.costTime = params.runningTime
+      }
+      this.historyList.splice(0, 1, data)
     },
-    goBack() {
-      this.$router.go(-1)
+    // 获取api相关数据
+    getExecutePath() {
+      api.fetch('/dss/apiservice/queryById', {
+        id: this.$route.query.id
+      }, 'get').then((rst) => {
+        if (rst.result) {
+          this.apiData = rst.result;
+          // 更改网页title
+          document.title = rst.result.aliasName || rst.result.name;
+          this.initApiParamInfo()
+          this.getHistoryList()
+        }
+      }).catch((err) => {
+        console.error(err)
+      });
     },
     initApiParamInfo() {
       api.fetch('/dss/apiservice/apiParamQuery', {
@@ -132,101 +143,60 @@ export default {
         }
       })
     },
-    // 获取api相关数据
-    getExecutePath() {
-      api.fetch('/dss/apiservice/queryById', {
-        id: this.$route.query.id
-      }, 'get').then((rst) => {
-        if (rst.result) {
-          this.apiData = rst.result;
-          // 更改网页title
-          document.title = rst.result.aliasName || rst.result.name;
-          this.initApiParamInfo()
-        }
-      }).catch((err) => {
-        console.error(err)
-      });
-    },
-    // 关闭页面，停止状态接口的轮询
-    beforeDestroy() {
-      this.$refs.currentConsole.killExecute(false);
-    },
-    moreConditionAction() {
-      this.conditionShow = true;
-    },
     // 过滤出勾选的参数
     confirmSelect() {
       this.showConditionList = this.conditionList.filter((item) => this.selectCondition.includes(item.id));
     },
-    search() {
-      if(Object.values(this.tip).some(i => i)) return this.$Message.error({ content: this.$t('message.apiServices.outlimit') });
-      // 后续的执行逻辑
-      if (this.excuteLoading) { // 停止执行
-        if(!(this.apiData && this.apiData.execID)) return this.$Message.error({ content: this.$t('message.apiServices.uninittask') });
-        api.fetch(`/entrance/${this.apiData.execID}/kill`, {taskID: this.apiData.taskID}, 'get').then(() => {
-          // kill成功后，去查kill后的状态
-          this.$refs.currentConsole.killExecute(true);
-          const name = this.apiData.name;
-          this.$Notice.close(name);
-          this.$Notice.warning({
-            title: this.$t('message.apiServices.kill.title'),
-            desc: `${this.$t('message.apiServices.kill.desc')} ${name} ！`,
-            name: name,
-            duration: 3,
-          });
-        }).catch(() => {
-          this.$refs.currentConsole.killExecute(false);
+    onChooseWork(params) {
+      if (params.taskID === this.currentTaskId) {
+        this.$Notice.info({
+          desc: `当前任务【${params.taskID}】已在当前tab页打开，可切换进度/结果/日志栏目查看！`,
+          duration: 3,
         });
-      } else {
-        if (this.showConditionList.length > 0) {
-          this.$refs.searchFrom.validate(valid => {
-            if (valid) {
-              this.executAction();
-            } else {
-              console.log(this.showConditionList)
-            }
-          })
-        } else {
-          this.executAction();
-        }
+        return
       }
+      this.currentTaskId = params.taskID
     },
-    executAction() {
-      if (!this.apiData) return;
-      this.excuteLoading = true;
-      let params = {}
-      this.showConditionList.forEach((item) => {
-        params[item.name] = item.defaultValue || '';
+    triggerSearchFn(params) {
+      this.historyList.unshift({
+        costTime: '',
+        createdTime: Date.now(),
+        status: '',
+        taskID: params.taskID,
+        execID: params.execID,
+        id: params.taskID
       })
-      params.ApiServiceToken = this.apiData.userToken;
-      // apiservice
-      let url = this.apiData.path.startsWith("/")?'/dss/apiservice/execute' + this.apiData.path:'/dss/apiservice/execute/' + this.apiData.path;
-      // 这里接口定义不同请求，参数体不一样
-      api.fetch(url, {
-        moduleName: 'dss-web',
-        params: params,
-      }, this.apiData.method.toLowerCase()).then((rst) => {
-        // 行内改版会返回execID和taskID
-        this.apiData.taskID = rst.taskId;
-        this.apiData.execID = rst.execId;
-        this.$nextTick(() => {
-          // 调用控制台的初始化实例方法
-          this.$refs.currentConsole.checkFromCache();
-        })
-      }).catch(() => {
-        this.excuteLoading = false;
-      });
+      this.tabslist[0].taskID = params.taskID;
+      this.tabslist[0].execID = params.execID;
+      this.onChooseWork(params)
     },
+    viewHistory(params) {
+      if (this.tabslist.findIndex((item => item.taskID == params.taskID)) === -1) {
+        this.tabslist.push(params)
+      }
+      this.onChooseWork(params)
+    },
+    onRemove(params) {
+      const removeIndex = this.tabslist.findIndex((item => item.taskID === params.taskID))
+      if (removeIndex !== -1) {
+        this.tabslist.splice(removeIndex, 1)
+        if (this.currentTaskId === params.taskID) {
+          this.onChooseWork(this.tabslist[removeIndex - 1])
+        }
+      }
+    }
   }
 }
 </script>
 <style lang="scss" scoped>
 @import '@dataspherestudio/shared/common/style/variables.scss';
-  .dataServicesContent {
+  .dataServicesContainer {
     height: 100%;
+    // display: flex;
+    // flex-direction: column;
     .tap-bar {
       @include bg-color($light-base-color, $dark-base-color);
-      margin-bottom: $padding-25;
+      // margin-bottom: $padding-25;
       border-bottom: $border-width-base $border-style-base #dcdcdc;
       @include border-color($border-color-base, $dark-menu-base-color);
       .breadcrumb {
@@ -235,110 +205,21 @@ export default {
       }
       .ivu-breadcrumb {
         font-size: 16px;
-        /deep/.ivu-breadcrumb-item-separator {
+        ::v-deep.ivu-breadcrumb-item-separator {
           @include font-color(rgba(0, 0, 0, 0.65), $dark-text-color);
         }
       }
     }
-    .verificationValue {
-      .ivu-input {
-        color: red!important;
-        border-color: red;
-      }
-    }
-    .none {
-    display: none !important;
-    }
-    .back {
-      margin-right: $margin;
-      padding-right: $padding;
-      font-size: 1.5rem;
-      position: relative;
-      color: $subsidiary-color;
-      cursor: pointer;
-      font-weight: 700;
-      &::after {
-        content: "";
-        position: absolute;
-        border-right: $border-width-base $border-style-base $border-color-base;
-        height: 60%;
-        top: 50%;
-        right: 0;
-        transform: translateY(-50%);
-        width: 0;
-      }
-    }
-  }
-  .title {
-      font-size: $font-size-large;
-      font-weight: bold;
-      padding-left: 12px;
-      border-left: 3px solid #2d8cf0;
-      @include font-color(rgba(0, 0, 0, 0.85), $dark-text-color);
-      line-height: 17px;
-      margin-bottom: 15px;
-  }
-  .search-from {
-    display: flex;
-    justify-content: flex-start;
-    align-items: flex-start;
-    flex-wrap: wrap;
-    .input-bar {
-      width: 200px;
-      position: relative;
-      margin-right: 20px;
-    }
-    /deep/.ivu-form-item-label {
-      padding-right: 20px;
-      position: relative;
-      line-height: 1.2;
-      display: flex;
-    }
-    .label-class {
-      overflow: hidden;
-      text-overflow: ellipsis;
-      white-space: nowrap;
-    }
-    .more-condition {
-      color: $primary-color;
-      margin-right: 20px;
-      padding: 6px;
-      cursor: pointer;
-    }
-    .execute-button {
-      margin-left: 15px;
-      margin-Bottom: 24px;
-    }
-    /deep/.ivu-input-group-prepend {
-      padding: 0!important;
-
-    }
-  }
-  .details-tip {
-    position: absolute;
-    color: $primary-color;
-    right: 0;
-    top: 0;
-    font-size: $font-size-large;
-    height: $percent-all;
-    width: 20px;
-    display: flex;
-    align-items: $align-center;
-    justify-content: $align-center;
-    box-sizing: border-box;
-    vertical-align: middle;
-    font-weight: 700;
-    &:hover {
-      color: $success-color;
-    }
   }
   .execute-content {
+    flex: 1;
     border: $border-width-base $border-style-base  #dcdcdc;
     @include border-color($border-color-base, $dark-menu-base-color);
     border-radius: 2px;
     overflow: hidden;
     @include bg-color($light-base-color, $dark-base-color);
     margin: 0 25px;
+    height: calc(100% - 110px);
     .content-top {
       padding: 25px;
       .alert-bar {
@@ -350,5 +231,66 @@ export default {
       border-top: none;
     }
   }
+  .workbench-tab {
+    display: flex;
+    flex-direction: row;
+    flex-wrap: nowrap;
+    justify-content: flex-start;
+    align-items: center;
+    height: 45px;
+    @include bg-color($light-base-color, $dark-base-color);
+    width: calc(100% - 45px);
+    overflow: hidden;
+    &.work-list-tab {
+      overflow-x: auto;
+      overflow-y: hidden;
+      padding-left: 16px;
+      &::-webkit-scrollbar {
+        height: 6px;
+      }
+      &::-webkit-scrollbar-thumb {
+        box-shadow: inset 0 0 2px rgba(0, 0, 0, 0.2);
+        border-radius: 3px;
+        background-color: #787d8b;
+      }
+      &::-webkit-scrollbar-track {
+        box-shadow: inset 0 0 2px rgba(0, 0, 0, 0.2);
+        border-radius: 3px;
+      }
+      .list-group > span {
+        white-space: nowrap;
+        display: block;
+        height: 0;
+      }
+    }
+    .workbench-tab-item {
+      text-align: center;
+      border-top: none;
+      display: inline-block;
+      height: 24px;
+      line-height: 24px;
+      @include bg-color(#e1e5ea, $dark-workspace-body-bg-color);
+      @include font-color(
+        $workspace-title-color,
+        $dark-workspace-title-color
+      );
+      cursor: pointer;
+      min-width: 100px;
+      max-width: 200px;
+      overflow: hidden;
+      margin-right: 8px;
+      border-radius: 12px;
+      &.active {
+        margin-top: 1px;
+        @include bg-color(#e8eef4, $dark-workspace-body-bg-color);
+        color: $primary-color;
+        @include font-color($primary-color, $dark-primary-color);
+      }
+
+      &:hover {
+        @include bg-color(#d1d7dd, $dark-workspace-body-bg-color);
+      }
+    }
+  }
 </style>
 
diff --git a/web/packages/apiServices/module/apiServicesExecute/result.vue b/web/packages/apiServices/module/apiServicesExecute/result.vue
new file mode 100644
index 000000000..024b9d1c1
--- /dev/null
+++ b/web/packages/apiServices/module/apiServicesExecute/result.vue
@@ -0,0 +1,351 @@
+<template>
+  <div class="dataServicesContent">
+    <Row class="content-top">
+      <i-col span="10">
+        <h3 class="title">{{$t('message.apiServices.apiTestInfo.params')}}</h3>
+        <Form ref="searchFrom" class="search-from" :label-width="100" :disabled="isHistory" :model="conditionResult">
+          <FormItem v-for="(item, index) in conditionResult.items" :prop="`items.${index}.defaultValue`" :key="item.id"  :rules="[{
+            required: item.required,
+            message: $t('message.apiServices.placeholder.emter'),
+            trigger: 'blur'
+          }]">
+            <div class="label-class" :title="item.displayName || item.name" slot="label">
+              {{ `${item.displayName || item.name}:` }}
+              <div :title="item.details || ''" class="details-tip"><Icon type="md-help-circle" /></div>
+            </div>
+            <Input class="input-bar" :class="{ verificationValue: tip[item.name] }" :disabled="isHistory" @on-blur="verificationValue(item)" :type="inputType(item.type)" v-model="item.defaultValue" :placeholder="item.description || $t('message.apiServices.placeholder.emter')">
+            </Input>
+          </FormItem>
+          <Button class="execute-button" type="primary" :disabled="isHistory" @click="search">{{buttonText}}</Button>
+        </Form>
+      </i-col>
+      <i-col span="10">
+        <template v-if="workInfo && workInfo.comment">
+          <h3 class="title">{{$t('message.apiServices.query.comment')}}</h3>
+          <Alert class="alert-bar" show-icon>{{ workInfo.comment }}</Alert>
+        </template>
+      </i-col>
+    </Row>
+    <results
+      ref="currentConsole"
+      getResultUrl="dss/apiservice"
+      :isHistory="isHistory"
+      :historyList="historyList"
+      :work="workInfo"
+      :dispatch="dispatch"
+      :height="height"
+      @executRun="executRun"
+      @viewHistory="viewHistory"
+      @updateHistory="updateHistory"
+    >
+    </results>
+    <Modal :title="$t('message.apiServices.apiTestInfo.params')" v-model="conditionShow" @on-ok="confirmSelect">
+      <CheckboxGroup v-model="selectCondition">
+        <Checkbox v-for="item in conditionList" :key="item.id" :label="item.id" :disabled="!!item.required">
+          <span>{{item.name}}</span>
+        </Checkbox>
+      </CheckboxGroup>
+    </Modal>
+  </div>
+</template>
+<script>
+import results from '@dataspherestudio/shared/components/consoleComponent';
+import api from '@dataspherestudio/shared/common/service/api';
+export default {
+  name: "ModuleApiServiceExecute",
+  components: {
+    results,
+  },
+  props: {
+    workInfo: {
+      type: Object,
+      default: () => ({})
+    },
+    showConditionList: {
+      type: Array,
+      default: () => ([])
+    },
+    selectCondition: {
+      type: Array,
+      default: () => ([])
+    },
+    conditionList: {
+      type: Array,
+      default: () => ([])
+    },
+    triggerSearchFn: {
+      type: Function,
+      default: () => (() => {})
+    },
+    isHistory: {
+      type: Boolean,
+      default: false
+    },
+    historyList: {
+      type: Array,
+      default: () => ([])
+    },
+  },
+  data() {
+    return {
+      conditionShow: false,
+      excuteLoading: false,
+      tip: {},
+      height: 500,
+      historyFormData: {}
+    }
+  },
+  computed: {
+    buttonText() {
+      return this.excuteLoading ? this.$t('message.apiServices.query.stop') : this.$t('message.apiServices.query.buttonText')
+    },
+    // iview动态表单组件需要的是object
+    conditionResult() {
+      const list = this.showConditionList.map(item => {
+        if(this.historyFormData[item.name]) {
+          return { ...item, defaultValue: this.historyFormData[item.name] }
+        }
+        return item
+      })
+      return {items: list}
+    }
+  },
+  watch: {
+    showConditionList() {
+      setTimeout(() => {
+        this.height = this.$refs.currentConsole.$el.clientHeight
+      }, 500)
+    }
+  },
+  mounted() {
+    if (this.isHistory) {
+      this.$refs.currentConsole.checkFromCache();
+      this.getHistoryFormData()
+    } else {
+      this.initHomeTask()
+    }
+    this.height = this.$refs.currentConsole.$el.clientHeight
+  },
+  // 关闭页面，停止状态接口的轮询
+  beforeDestroy() {
+    this.$refs.currentConsole.killExecute(false);
+  },
+  methods: {
+    // 判断首页是否还有再执行的任务
+    async initHomeTask() {
+      if (this.workInfo.shouldRuning) {
+        try {
+          this.excuteLoading = true;
+          await this.getHistoryFormData()
+          this.$nextTick(() => {
+            // 调用控制台的初始化实例方法
+            this.$refs.currentConsole.checkFromCache();
+          })
+        } catch (error) {
+          this.excuteLoading = false;
+        }
+      }
+    },
+    // 获取历史筛选条件
+    async getHistoryFormData() {
+      const result = await api.fetch('/dss/apiservice/getHistoryQueryParams', {
+        taskId: this.workInfo.taskID
+      }, 'get')
+      this.historyFormData = JSON.parse(result.data) || {}
+    },
+    // 验证发布和更新的默认值是否满足条件
+    verificationValue (row) {
+      let flag;
+      if(row.defaultValue.length > 1024 && Number(row.type) !== 4) {
+        this.$Message.error({ content: this.$t('message.apiServices.more1024') });
+        flag = true;
+      } else if(row.type == 4 && row.defaultValue.split('\n').length > 5000) {
+        this.$Message.error({ content: this.$t('message.apiServices.moreline') });
+        flag = true;
+      } else {
+        flag = false
+      }
+      console.warn(row)
+      this.$set(this.tip, row.name, flag)
+    },
+    // 参数默认值输入框类型
+    inputType(typeNumer) {
+      typeNumer = Number(typeNumer);
+      if (typeNumer === 1) {
+        return 'text';
+      } else if (typeNumer === 2) {
+        return 'number';
+      } else if (typeNumer === 3) {
+        return 'text';
+      } else if (typeNumer === 4) {
+        return 'textarea';
+      }
+    },
+    executRun(val) {
+      this.excuteLoading = val;
+    },
+    // 过滤出勾选的参数
+    confirmSelect() {
+      this.showConditionList = this.conditionList.filter((item) => this.selectCondition.includes(item.id));
+    },
+    search() {
+      if(Object.values(this.tip).some(i => i)) return this.$Message.error({ content: this.$t('message.apiServices.outlimit') });
+      // 后续的执行逻辑
+      if (this.excuteLoading) { // 停止执行
+        if(!(this.workInfo && this.workInfo.execID)) return this.$Message.error({ content: this.$t('message.apiServices.uninittask') });
+        api.fetch(`/entrance/${this.workInfo.execID}/kill`, {taskID: this.workInfo.taskID}, 'get').then(() => {
+          // kill成功后，去查kill后的状态
+          this.$refs.currentConsole.killExecute(true);
+          const name = this.workInfo.name;
+          this.$Notice.close(name);
+          this.$Notice.warning({
+            title: this.$t('message.apiServices.kill.title'),
+            desc: `${this.$t('message.apiServices.kill.desc')} ${name} ！`,
+            name: name,
+            duration: 3,
+          });
+        }).catch(() => {
+          this.$refs.currentConsole.killExecute(false);
+        });
+      } else {
+        if (this.showConditionList.length > 0) {
+          this.$refs.searchFrom.validate(valid => {
+            if (valid) {
+              this.executAction();
+            } else {
+              console.log(this.showConditionList)
+            }
+          })
+        } else {
+          this.executAction();
+        }
+      }
+    },
+    executAction() {
+      if (!this.workInfo) return;
+      this.excuteLoading = true;
+      let params = {}
+      this.showConditionList.forEach((item) => {
+        params[item.name] = item.defaultValue || '';
+      })
+      params.ApiServiceToken = this.workInfo.userToken;
+      // apiservice
+      let url = this.workInfo.path.startsWith("/")?'/dss/apiservice/execute' + this.workInfo.path:'/dss/apiservice/execute/' + this.workInfo.path;
+      // 这里接口定义不同请求，参数体不一样
+      api.fetch(url, {
+        moduleName: 'dss-web',
+        params: params,
+      }, this.workInfo.method.toLowerCase()).then((rst) => {
+        // 行内改版会返回execID和taskID
+        this.triggerSearchFn({
+          taskID: rst.taskId,
+          execID: rst.execId
+        })
+        this.$nextTick(() => {
+          // 调用控制台的初始化实例方法
+          this.$refs.currentConsole.checkFromCache();
+        })
+      }).catch(() => {
+        this.excuteLoading = false;
+      });
+    },
+    viewHistory(params) {
+      this.$emit('viewHistory', params)
+    },
+    updateHistory(params) {
+      this.$emit('updateHistory', params)
+    }
+  }
+}
+</script>
+<style lang="scss" scoped>
+@import '@dataspherestudio/shared/common/style/variables.scss';
+  .dataServicesContent {
+    height: 100%;
+    display: flex;
+    flex-direction: column;
+  }
+  .title {
+      font-size: $font-size-large;
+      font-weight: bold;
+      padding-left: 12px;
+      border-left: 3px solid #2d8cf0;
+      @include font-color(rgba(0, 0, 0, 0.85), $dark-text-color);
+      line-height: 17px;
+      margin-bottom: 15px;
+  }
+  .search-from {
+    display: flex;
+    justify-content: flex-start;
+    align-items: flex-start;
+    flex-wrap: wrap;
+    .input-bar {
+      width: 200px;
+      position: relative;
+      margin-right: 20px;
+    }
+    ::v-deep.ivu-form-item-label {
+      padding-right: 20px;
+      position: relative;
+      line-height: 1.2;
+      display: flex;
+    }
+    .label-class {
+      overflow: hidden;
+      text-overflow: ellipsis;
+      white-space: nowrap;
+    }
+    .more-condition {
+      color: $primary-color;
+      margin-right: 20px;
+      padding: 6px;
+      cursor: pointer;
+    }
+    .execute-button {
+      margin-left: 15px;
+      margin-Bottom: 24px;
+    }
+    ::v-deep.ivu-input-group-prepend {
+      padding: 0!important;
+
+    }
+  }
+  .details-tip {
+    position: absolute;
+    color: $primary-color;
+    right: 0;
+    top: 0;
+    font-size: $font-size-large;
+    height: $percent-all;
+    width: 20px;
+    display: flex;
+    align-items: $align-center;
+    justify-content: $align-center;
+    box-sizing: border-box;
+    vertical-align: middle;
+    font-weight: 700;
+    &:hover {
+      color: $success-color;
+    }
+  }
+  .execute-content {
+    border: $border-width-base $border-style-base  #dcdcdc;
+    @include border-color($border-color-base, $dark-menu-base-color);
+    border-radius: 2px;
+    overflow: hidden;
+    @include bg-color($light-base-color, $dark-base-color);
+    margin: 0 25px;
+    .content-top {
+      padding: 25px;
+      .alert-bar {
+        margin-left: 15px;
+      }
+    }
+    .log-panel {
+      margin-top: 0px;
+      border-top: none;
+    }
+  }
+</style>
+  
+  
\ No newline at end of file
diff --git a/web/packages/apiServices/module/apiServicesExecute/title.vue b/web/packages/apiServices/module/apiServicesExecute/title.vue
new file mode 100644
index 000000000..2807e1158
--- /dev/null
+++ b/web/packages/apiServices/module/apiServicesExecute/title.vue
@@ -0,0 +1,109 @@
+<template>
+  <div
+    class="workbench-title"
+    @click="choose"
+    @mouseover="mouseover"
+    @mouseout="mouseout">
+    <SvgIcon class='workbench-title-logo' v-if="work.logo" :icon-class="work.logo" :color="work.color"/>
+    <span
+      v-if="!(node && index === 0)"
+      :title="work.filepath || work.filename"
+      class="workbench-title-text">{{ work.filename }}</span>
+    <span
+      v-if="(node && index === 0)"
+      :title="work.filepath || work.filename"
+      class="workbench-title-text">{{$t('message.scripts.container.title.editorName')}}</span>
+    <span
+      class="workbench-title-button"
+      v-if="!(node && index === 0)">
+      <Icon
+        v-show="isHover && !work.noClose"
+        type="md-close"
+        style="opacity: 0.65;"
+        @click.stop="remove"/>
+      <SvgIcon v-show="!isHover && work.unsave && work.type !== 'historyScript'"
+        :style="{ color: work.unsave ? '#ed4014' : '' }"
+        icon-class="fi-radio-on2"/>
+      <Spin
+        v-show="!isHover && work.data && work.data.running"
+        size="small">
+        <Icon
+          type="ios-loading"
+          size="12"
+          style="opacity: 0.85;"
+          class="we-icon-loading"/>
+      </Spin>
+    </span>
+  </div>
+</template>
+<script>
+export default {
+  name: 'we-title',
+  props: {
+    work: {
+      type: Object,
+      required: true,
+    },
+    node: Object,
+    index: Number
+  },
+  data() {
+    return {
+      isHover: false,
+    };
+  },
+  methods: {
+    mouseover() {
+      this.isHover = true;
+    },
+    mouseout() {
+      this.isHover = false;
+    },
+    choose() {
+      this.$emit('on-choose', this.work, this.index);
+    },
+    remove() {
+      this.$emit('on-remove', this.work, this.index);
+    },
+  },
+};
+</script>
+<style lang="scss" scoped>
+@import '@dataspherestudio/shared/common/style/variables.scss';
+  .workbench-title {
+    position: $relative;
+    display: flex;
+    align-items: center;
+    justify-content: flex-start;
+    padding: 0 16px;
+    padding-right: 30px;
+    font-size: $font-size-base;
+    height: 24px;
+    line-height: 24px;
+    .workbench-title-logo {
+        font-size: 16px;
+        margin-right: 4px;
+    }
+    .workbench-title-text {
+        display: block;
+        flex: 1;
+        overflow: hidden;
+        white-space: nowrap;
+        text-overflow: ellipsis;
+    }
+    .workbench-title-button {
+        position: $absolute;
+        right: 10px;
+        top: 0;
+        font-size: $font-size-base;
+        .fi-radio-on2 {
+            font-size: $font-size-small;
+        }
+    }
+
+    .workbench-title-hover {
+      @include bg-color(#d1d7dd, $dark-workspace-body-bg-color) ;
+    }
+  }
+</style>
+
diff --git a/web/packages/apiServices/module/servicesMangement/component/APIVersions.vue b/web/packages/apiServices/module/servicesMangement/component/APIVersions.vue
index 8b51b3a0f..6be09a45a 100644
--- a/web/packages/apiServices/module/servicesMangement/component/APIVersions.vue
+++ b/web/packages/apiServices/module/servicesMangement/component/APIVersions.vue
@@ -272,7 +272,7 @@ export default {
     margin-top: 20px;
   }
   .viewModal {
-    /deep/.ivu-modal {
+    ::v-deep.ivu-modal {
       width: 80%!important;
       min-width: 700px;
     }
diff --git a/web/packages/apiServices/module/servicesMangement/index.vue b/web/packages/apiServices/module/servicesMangement/index.vue
index fec4b29f5..6b0c7d4d1 100644
--- a/web/packages/apiServices/module/servicesMangement/index.vue
+++ b/web/packages/apiServices/module/servicesMangement/index.vue
@@ -352,7 +352,7 @@ export default {
       font-size: 14px;
       vertical-align: middle;
       @include bg-color($light-base-color, $dark-base-color);
-      /deep/.ivu-breadcrumb-item-separator {
+      ::v-deep.ivu-breadcrumb-item-separator {
         color: #080808;
       }
     }
@@ -374,7 +374,7 @@ export default {
     }
   }
   .approvalNoItem {
-    /deep/.ivu-form-item-content {
+    ::v-deep.ivu-form-item-content {
       display: flex;
       align-items: center;
     }
diff --git a/web/packages/cyeditor/cyeditor-context-menu/index.js b/web/packages/cyeditor/cyeditor-context-menu/index.js
index 0038c1e1a..11b543351 100644
--- a/web/packages/cyeditor/cyeditor-context-menu/index.js
+++ b/web/packages/cyeditor/cyeditor-context-menu/index.js
@@ -40,7 +40,7 @@ class ContextMenu {
 
   _initDom() {
     function getSvgIcon(icon) {
-      return `<svg aria-hidden="true" class="icon designer-menu-li-icon"><use xlink:href="#icon-${icon}"></use></svg>`
+      return icon ? `<svg aria-hidden="true" class="icon designer-menu-li-icon"><use xlink:href="#icon-${icon}"></use></svg>` : ''
     }
     this.ctxmenu.innerHTML = this._options.menus.reduce((str, item) => {
       return str + `<div class="ctx-menu-item ${item.disabled ? 'ctx-menu-item-disabled' : ''}" data-menu-item="${item.id}">
diff --git a/web/packages/cyeditor/distlib/cyeditor.mjs b/web/packages/cyeditor/distlib/cyeditor.mjs
deleted file mode 100644
index 77f6d938f..000000000
--- a/web/packages/cyeditor/distlib/cyeditor.mjs
+++ /dev/null
@@ -1,34131 +0,0 @@
-var Cb = typeof globalThis < "u" ? globalThis : typeof window < "u" ? window : typeof global < "u" ? global : typeof self < "u" ? self : {};
-function TG(a) {
-  return a && a.__esModule && Object.prototype.hasOwnProperty.call(a, "default") ? a.default : a;
-}
-function yte(a) {
-  var r = typeof a;
-  return a != null && (r == "object" || r == "function");
-}
-var iw = yte, kte = typeof Cb == "object" && Cb && Cb.Object === Object && Cb, Ete = kte, Ste = Ete, Cte = typeof self == "object" && self && self.Object === Object && self, xte = Ste || Cte || Function("return this")(), a5 = xte, Tte = a5, Lte = function() {
-  return Tte.Date.now();
-}, Pte = Lte, Dte = /\s/;
-function jte(a) {
-  for (var r = a.length; r-- && Dte.test(a.charAt(r)); )
-    ;
-  return r;
-}
-var Nte = jte, Ite = Nte, Mte = /^\s+/;
-function Ote(a) {
-  return a && a.slice(0, Ite(a) + 1).replace(Mte, "");
-}
-var Ate = Ote, Rte = a5, Bte = Rte.Symbol, E6 = Bte, c_ = E6, LG = Object.prototype, zte = LG.hasOwnProperty, Hte = LG.toString, Rp = c_ ? c_.toStringTag : void 0;
-function _te(a) {
-  var r = zte.call(a, Rp), u = a[Rp];
-  try {
-    a[Rp] = void 0;
-    var c = !0;
-  } catch {
-  }
-  var d = Hte.call(a);
-  return c && (r ? a[Rp] = u : delete a[Rp]), d;
-}
-var Gte = _te, $te = Object.prototype, Yte = $te.toString;
-function Fte(a) {
-  return Yte.call(a);
-}
-var qte = Fte, l_ = E6, Vte = Gte, Wte = qte, Ute = "[object Null]", Kte = "[object Undefined]", f_ = l_ ? l_.toStringTag : void 0;
-function Zte(a) {
-  return a == null ? a === void 0 ? Kte : Ute : f_ && f_ in Object(a) ? Vte(a) : Wte(a);
-}
-var PG = Zte;
-function Xte(a) {
-  return a != null && typeof a == "object";
-}
-var Qte = Xte, Jte = PG, ene = Qte, tne = "[object Symbol]";
-function nne(a) {
-  return typeof a == "symbol" || ene(a) && Jte(a) == tne;
-}
-var aw = nne, rne = Ate, h_ = iw, ine = aw, d_ = 0 / 0, ane = /^[-+]0x[0-9a-f]+$/i, one = /^0b[01]+$/i, sne = /^0o[0-7]+$/i, une = parseInt;
-function cne(a) {
-  if (typeof a == "number")
-    return a;
-  if (ine(a))
-    return d_;
-  if (h_(a)) {
-    var r = typeof a.valueOf == "function" ? a.valueOf() : a;
-    a = h_(r) ? r + "" : r;
-  }
-  if (typeof a != "string")
-    return a === 0 ? a : +a;
-  a = rne(a);
-  var u = one.test(a);
-  return u || sne.test(a) ? une(a.slice(2), u ? 2 : 8) : ane.test(a) ? d_ : +a;
-}
-var lne = cne, fne = iw, UL = Pte, v_ = lne, hne = "Expected a function", dne = Math.max, vne = Math.min;
-function gne(a, r, u) {
-  var c, d, g, b, y, k, E = 0, C = !1, T = !1, P = !0;
-  if (typeof a != "function")
-    throw new TypeError(hne);
-  r = v_(r) || 0, fne(u) && (C = !!u.leading, T = "maxWait" in u, g = T ? dne(v_(u.maxWait) || 0, r) : g, P = "trailing" in u ? !!u.trailing : P);
-  function N(X) {
-    var K = c, ee = d;
-    return c = d = void 0, E = X, b = a.apply(ee, K), b;
-  }
-  function D(X) {
-    return E = X, y = setTimeout(B, r), C ? N(X) : b;
-  }
-  function H(X) {
-    var K = X - k, ee = X - E, Z = r - K;
-    return T ? vne(Z, g - ee) : Z;
-  }
-  function _(X) {
-    var K = X - k, ee = X - E;
-    return k === void 0 || K >= r || K < 0 || T && ee >= g;
-  }
-  function B() {
-    var X = UL();
-    if (_(X))
-      return $(X);
-    y = setTimeout(B, H(X));
-  }
-  function $(X) {
-    return y = void 0, P && c ? N(X) : (c = d = void 0, b);
-  }
-  function F() {
-    y !== void 0 && clearTimeout(y), E = 0, c = k = d = y = void 0;
-  }
-  function W() {
-    return y === void 0 ? b : $(UL());
-  }
-  function Q() {
-    var X = UL(), K = _(X);
-    if (c = arguments, d = this, k = X, K) {
-      if (y === void 0)
-        return D(k);
-      if (T)
-        return clearTimeout(y), y = setTimeout(B, r), N(k);
-    }
-    return y === void 0 && (y = setTimeout(B, r)), b;
-  }
-  return Q.cancel = F, Q.flush = W, Q;
-}
-var bne = gne, DG = { exports: {} };
-(function(a, r) {
-  (function() {
-    var u, c, d, g, b, y, k, E, C, T, P, N, D, H, _;
-    d = Math.floor, T = Math.min, c = function(B, $) {
-      return B < $ ? -1 : B > $ ? 1 : 0;
-    }, C = function(B, $, F, W, Q) {
-      var X;
-      if (F == null && (F = 0), Q == null && (Q = c), F < 0)
-        throw new Error("lo must be non-negative");
-      for (W == null && (W = B.length); F < W; )
-        X = d((F + W) / 2), Q($, B[X]) < 0 ? W = X : F = X + 1;
-      return [].splice.apply(B, [F, F - F].concat($)), $;
-    }, y = function(B, $, F) {
-      return F == null && (F = c), B.push($), H(B, 0, B.length - 1, F);
-    }, b = function(B, $) {
-      var F, W;
-      return $ == null && ($ = c), F = B.pop(), B.length ? (W = B[0], B[0] = F, _(B, 0, $)) : W = F, W;
-    }, E = function(B, $, F) {
-      var W;
-      return F == null && (F = c), W = B[0], B[0] = $, _(B, 0, F), W;
-    }, k = function(B, $, F) {
-      var W;
-      return F == null && (F = c), B.length && F(B[0], $) < 0 && (W = [B[0], $], $ = W[0], B[0] = W[1], _(B, 0, F)), $;
-    }, g = function(B, $) {
-      var F, W, Q, X, K, ee;
-      for ($ == null && ($ = c), X = function() {
-        ee = [];
-        for (var Z = 0, ae = d(B.length / 2); 0 <= ae ? Z < ae : Z > ae; 0 <= ae ? Z++ : Z--)
-          ee.push(Z);
-        return ee;
-      }.apply(this).reverse(), K = [], W = 0, Q = X.length; W < Q; W++)
-        F = X[W], K.push(_(B, F, $));
-      return K;
-    }, D = function(B, $, F) {
-      var W;
-      if (F == null && (F = c), W = B.indexOf($), W !== -1)
-        return H(B, 0, W, F), _(B, W, F);
-    }, P = function(B, $, F) {
-      var W, Q, X, K, ee;
-      if (F == null && (F = c), Q = B.slice(0, $), !Q.length)
-        return Q;
-      for (g(Q, F), ee = B.slice($), X = 0, K = ee.length; X < K; X++)
-        W = ee[X], k(Q, W, F);
-      return Q.sort(F).reverse();
-    }, N = function(B, $, F) {
-      var W, Q, X, K, ee, Z, ae, oe, J;
-      if (F == null && (F = c), $ * 10 <= B.length) {
-        if (X = B.slice(0, $).sort(F), !X.length)
-          return X;
-        for (Q = X[X.length - 1], ae = B.slice($), K = 0, Z = ae.length; K < Z; K++)
-          W = ae[K], F(W, Q) < 0 && (C(X, W, 0, null, F), X.pop(), Q = X[X.length - 1]);
-        return X;
-      }
-      for (g(B, F), J = [], ee = 0, oe = T($, B.length); 0 <= oe ? ee < oe : ee > oe; 0 <= oe ? ++ee : --ee)
-        J.push(b(B, F));
-      return J;
-    }, H = function(B, $, F, W) {
-      var Q, X, K;
-      for (W == null && (W = c), Q = B[F]; F > $; ) {
-        if (K = F - 1 >> 1, X = B[K], W(Q, X) < 0) {
-          B[F] = X, F = K;
-          continue;
-        }
-        break;
-      }
-      return B[F] = Q;
-    }, _ = function(B, $, F) {
-      var W, Q, X, K, ee;
-      for (F == null && (F = c), Q = B.length, ee = $, X = B[$], W = 2 * $ + 1; W < Q; )
-        K = W + 1, K < Q && !(F(B[W], B[K]) < 0) && (W = K), B[$] = B[W], $ = W, W = 2 * $ + 1;
-      return B[$] = X, H(B, ee, $, F);
-    }, u = function() {
-      B.push = y, B.pop = b, B.replace = E, B.pushpop = k, B.heapify = g, B.updateItem = D, B.nlargest = P, B.nsmallest = N;
-      function B($) {
-        this.cmp = $ ?? c, this.nodes = [];
-      }
-      return B.prototype.push = function($) {
-        return y(this.nodes, $, this.cmp);
-      }, B.prototype.pop = function() {
-        return b(this.nodes, this.cmp);
-      }, B.prototype.peek = function() {
-        return this.nodes[0];
-      }, B.prototype.contains = function($) {
-        return this.nodes.indexOf($) !== -1;
-      }, B.prototype.replace = function($) {
-        return E(this.nodes, $, this.cmp);
-      }, B.prototype.pushpop = function($) {
-        return k(this.nodes, $, this.cmp);
-      }, B.prototype.heapify = function() {
-        return g(this.nodes, this.cmp);
-      }, B.prototype.updateItem = function($) {
-        return D(this.nodes, $, this.cmp);
-      }, B.prototype.clear = function() {
-        return this.nodes = [];
-      }, B.prototype.empty = function() {
-        return this.nodes.length === 0;
-      }, B.prototype.size = function() {
-        return this.nodes.length;
-      }, B.prototype.clone = function() {
-        var $;
-        return $ = new B(), $.nodes = this.nodes.slice(0), $;
-      }, B.prototype.toArray = function() {
-        return this.nodes.slice(0);
-      }, B.prototype.insert = B.prototype.push, B.prototype.top = B.prototype.peek, B.prototype.front = B.prototype.peek, B.prototype.has = B.prototype.contains, B.prototype.copy = B.prototype.clone, B;
-    }(), function(B, $) {
-      return a.exports = $();
-    }(this, function() {
-      return u;
-    });
-  }).call(Cb);
-})(DG);
-var pne = DG.exports, wne = pne, mne = Array.isArray, o5 = mne, yne = o5, kne = aw, Ene = /\.|\[(?:[^[\]]*|(["'])(?:(?!\1)[^\\]|\\.)*?\1)\]/, Sne = /^\w*$/;
-function Cne(a, r) {
-  if (yne(a))
-    return !1;
-  var u = typeof a;
-  return u == "number" || u == "symbol" || u == "boolean" || a == null || kne(a) ? !0 : Sne.test(a) || !Ene.test(a) || r != null && a in Object(r);
-}
-var xne = Cne, Tne = PG, Lne = iw, Pne = "[object AsyncFunction]", Dne = "[object Function]", jne = "[object GeneratorFunction]", Nne = "[object Proxy]";
-function Ine(a) {
-  if (!Lne(a))
-    return !1;
-  var r = Tne(a);
-  return r == Dne || r == jne || r == Pne || r == Nne;
-}
-var Mne = Ine, One = a5, Ane = One["__core-js_shared__"], Rne = Ane, KL = Rne, g_ = function() {
-  var a = /[^.]+$/.exec(KL && KL.keys && KL.keys.IE_PROTO || "");
-  return a ? "Symbol(src)_1." + a : "";
-}();
-function Bne(a) {
-  return !!g_ && g_ in a;
-}
-var zne = Bne, Hne = Function.prototype, _ne = Hne.toString;
-function Gne(a) {
-  if (a != null) {
-    try {
-      return _ne.call(a);
-    } catch {
-    }
-    try {
-      return a + "";
-    } catch {
-    }
-  }
-  return "";
-}
-var $ne = Gne, Yne = Mne, Fne = zne, qne = iw, Vne = $ne, Wne = /[\\^$.*+?()[\]{}|]/g, Une = /^\[object .+?Constructor\]$/, Kne = Function.prototype, Zne = Object.prototype, Xne = Kne.toString, Qne = Zne.hasOwnProperty, Jne = RegExp(
-  "^" + Xne.call(Qne).replace(Wne, "\\$&").replace(/hasOwnProperty|(function).*?(?=\\\()| for .+?(?=\\\])/g, "$1.*?") + "$"
-);
-function ere(a) {
-  if (!qne(a) || Fne(a))
-    return !1;
-  var r = Yne(a) ? Jne : Une;
-  return r.test(Vne(a));
-}
-var tre = ere;
-function nre(a, r) {
-  return a == null ? void 0 : a[r];
-}
-var rre = nre, ire = tre, are = rre;
-function ore(a, r) {
-  var u = are(a, r);
-  return ire(u) ? u : void 0;
-}
-var S6 = ore, sre = S6, ure = sre(Object, "create"), s5 = ure, b_ = s5;
-function cre() {
-  this.__data__ = b_ ? b_(null) : {}, this.size = 0;
-}
-var lre = cre;
-function fre(a) {
-  var r = this.has(a) && delete this.__data__[a];
-  return this.size -= r ? 1 : 0, r;
-}
-var hre = fre, dre = s5, vre = "__lodash_hash_undefined__", gre = Object.prototype, bre = gre.hasOwnProperty;
-function pre(a) {
-  var r = this.__data__;
-  if (dre) {
-    var u = r[a];
-    return u === vre ? void 0 : u;
-  }
-  return bre.call(r, a) ? r[a] : void 0;
-}
-var wre = pre, mre = s5, yre = Object.prototype, kre = yre.hasOwnProperty;
-function Ere(a) {
-  var r = this.__data__;
-  return mre ? r[a] !== void 0 : kre.call(r, a);
-}
-var Sre = Ere, Cre = s5, xre = "__lodash_hash_undefined__";
-function Tre(a, r) {
-  var u = this.__data__;
-  return this.size += this.has(a) ? 0 : 1, u[a] = Cre && r === void 0 ? xre : r, this;
-}
-var Lre = Tre, Pre = lre, Dre = hre, jre = wre, Nre = Sre, Ire = Lre;
-function Ab(a) {
-  var r = -1, u = a == null ? 0 : a.length;
-  for (this.clear(); ++r < u; ) {
-    var c = a[r];
-    this.set(c[0], c[1]);
-  }
-}
-Ab.prototype.clear = Pre;
-Ab.prototype.delete = Dre;
-Ab.prototype.get = jre;
-Ab.prototype.has = Nre;
-Ab.prototype.set = Ire;
-var Mre = Ab;
-function Ore() {
-  this.__data__ = [], this.size = 0;
-}
-var Are = Ore;
-function Rre(a, r) {
-  return a === r || a !== a && r !== r;
-}
-var jG = Rre, Bre = jG;
-function zre(a, r) {
-  for (var u = a.length; u--; )
-    if (Bre(a[u][0], r))
-      return u;
-  return -1;
-}
-var u5 = zre, Hre = u5, _re = Array.prototype, Gre = _re.splice;
-function $re(a) {
-  var r = this.__data__, u = Hre(r, a);
-  if (u < 0)
-    return !1;
-  var c = r.length - 1;
-  return u == c ? r.pop() : Gre.call(r, u, 1), --this.size, !0;
-}
-var Yre = $re, Fre = u5;
-function qre(a) {
-  var r = this.__data__, u = Fre(r, a);
-  return u < 0 ? void 0 : r[u][1];
-}
-var Vre = qre, Wre = u5;
-function Ure(a) {
-  return Wre(this.__data__, a) > -1;
-}
-var Kre = Ure, Zre = u5;
-function Xre(a, r) {
-  var u = this.__data__, c = Zre(u, a);
-  return c < 0 ? (++this.size, u.push([a, r])) : u[c][1] = r, this;
-}
-var Qre = Xre, Jre = Are, eie = Yre, tie = Vre, nie = Kre, rie = Qre;
-function Rb(a) {
-  var r = -1, u = a == null ? 0 : a.length;
-  for (this.clear(); ++r < u; ) {
-    var c = a[r];
-    this.set(c[0], c[1]);
-  }
-}
-Rb.prototype.clear = Jre;
-Rb.prototype.delete = eie;
-Rb.prototype.get = tie;
-Rb.prototype.has = nie;
-Rb.prototype.set = rie;
-var iie = Rb, aie = S6, oie = a5, sie = aie(oie, "Map"), uie = sie, p_ = Mre, cie = iie, lie = uie;
-function fie() {
-  this.size = 0, this.__data__ = {
-    hash: new p_(),
-    map: new (lie || cie)(),
-    string: new p_()
-  };
-}
-var hie = fie;
-function die(a) {
-  var r = typeof a;
-  return r == "string" || r == "number" || r == "symbol" || r == "boolean" ? a !== "__proto__" : a === null;
-}
-var vie = die, gie = vie;
-function bie(a, r) {
-  var u = a.__data__;
-  return gie(r) ? u[typeof r == "string" ? "string" : "hash"] : u.map;
-}
-var c5 = bie, pie = c5;
-function wie(a) {
-  var r = pie(this, a).delete(a);
-  return this.size -= r ? 1 : 0, r;
-}
-var mie = wie, yie = c5;
-function kie(a) {
-  return yie(this, a).get(a);
-}
-var Eie = kie, Sie = c5;
-function Cie(a) {
-  return Sie(this, a).has(a);
-}
-var xie = Cie, Tie = c5;
-function Lie(a, r) {
-  var u = Tie(this, a), c = u.size;
-  return u.set(a, r), this.size += u.size == c ? 0 : 1, this;
-}
-var Pie = Lie, Die = hie, jie = mie, Nie = Eie, Iie = xie, Mie = Pie;
-function Bb(a) {
-  var r = -1, u = a == null ? 0 : a.length;
-  for (this.clear(); ++r < u; ) {
-    var c = a[r];
-    this.set(c[0], c[1]);
-  }
-}
-Bb.prototype.clear = Die;
-Bb.prototype.delete = jie;
-Bb.prototype.get = Nie;
-Bb.prototype.has = Iie;
-Bb.prototype.set = Mie;
-var Oie = Bb, NG = Oie, Aie = "Expected a function";
-function C6(a, r) {
-  if (typeof a != "function" || r != null && typeof r != "function")
-    throw new TypeError(Aie);
-  var u = function() {
-    var c = arguments, d = r ? r.apply(this, c) : c[0], g = u.cache;
-    if (g.has(d))
-      return g.get(d);
-    var b = a.apply(this, c);
-    return u.cache = g.set(d, b) || g, b;
-  };
-  return u.cache = new (C6.Cache || NG)(), u;
-}
-C6.Cache = NG;
-var Rie = C6, Bie = Rie, zie = 500;
-function Hie(a) {
-  var r = Bie(a, function(c) {
-    return u.size === zie && u.clear(), c;
-  }), u = r.cache;
-  return r;
-}
-var _ie = Hie, Gie = _ie, $ie = /[^.[\]]+|\[(?:(-?\d+(?:\.\d+)?)|(["'])((?:(?!\2)[^\\]|\\.)*?)\2)\]|(?=(?:\.|\[\])(?:\.|\[\]|$))/g, Yie = /\\(\\)?/g, Fie = Gie(function(a) {
-  var r = [];
-  return a.charCodeAt(0) === 46 && r.push(""), a.replace($ie, function(u, c, d, g) {
-    r.push(d ? g.replace(Yie, "$1") : c || u);
-  }), r;
-}), IG = Fie;
-function qie(a, r) {
-  for (var u = -1, c = a == null ? 0 : a.length, d = Array(c); ++u < c; )
-    d[u] = r(a[u], u, a);
-  return d;
-}
-var MG = qie, w_ = E6, Vie = MG, Wie = o5, Uie = aw, Kie = 1 / 0, m_ = w_ ? w_.prototype : void 0, y_ = m_ ? m_.toString : void 0;
-function OG(a) {
-  if (typeof a == "string")
-    return a;
-  if (Wie(a))
-    return Vie(a, OG) + "";
-  if (Uie(a))
-    return y_ ? y_.call(a) : "";
-  var r = a + "";
-  return r == "0" && 1 / a == -Kie ? "-0" : r;
-}
-var Zie = OG, Xie = Zie;
-function Qie(a) {
-  return a == null ? "" : Xie(a);
-}
-var AG = Qie, Jie = o5, eae = xne, tae = IG, nae = AG;
-function rae(a, r) {
-  return Jie(a) ? a : eae(a, r) ? [a] : tae(nae(a));
-}
-var RG = rae, iae = aw, aae = 1 / 0;
-function oae(a) {
-  if (typeof a == "string" || iae(a))
-    return a;
-  var r = a + "";
-  return r == "0" && 1 / a == -aae ? "-0" : r;
-}
-var x6 = oae, sae = RG, uae = x6;
-function cae(a, r) {
-  r = sae(r, a);
-  for (var u = 0, c = r.length; a != null && u < c; )
-    a = a[uae(r[u++])];
-  return u && u == c ? a : void 0;
-}
-var lae = cae, fae = lae;
-function hae(a, r, u) {
-  var c = a == null ? void 0 : fae(a, r);
-  return c === void 0 ? u : c;
-}
-var dae = hae, vae = S6, gae = function() {
-  try {
-    var a = vae(Object, "defineProperty");
-    return a({}, "", {}), a;
-  } catch {
-  }
-}(), bae = gae, k_ = bae;
-function pae(a, r, u) {
-  r == "__proto__" && k_ ? k_(a, r, {
-    configurable: !0,
-    enumerable: !0,
-    value: u,
-    writable: !0
-  }) : a[r] = u;
-}
-var wae = pae, mae = wae, yae = jG, kae = Object.prototype, Eae = kae.hasOwnProperty;
-function Sae(a, r, u) {
-  var c = a[r];
-  (!(Eae.call(a, r) && yae(c, u)) || u === void 0 && !(r in a)) && mae(a, r, u);
-}
-var Cae = Sae, xae = 9007199254740991, Tae = /^(?:0|[1-9]\d*)$/;
-function Lae(a, r) {
-  var u = typeof a;
-  return r = r ?? xae, !!r && (u == "number" || u != "symbol" && Tae.test(a)) && a > -1 && a % 1 == 0 && a < r;
-}
-var Pae = Lae, Dae = Cae, jae = RG, Nae = Pae, E_ = iw, Iae = x6;
-function Mae(a, r, u, c) {
-  if (!E_(a))
-    return a;
-  r = jae(r, a);
-  for (var d = -1, g = r.length, b = g - 1, y = a; y != null && ++d < g; ) {
-    var k = Iae(r[d]), E = u;
-    if (k === "__proto__" || k === "constructor" || k === "prototype")
-      return a;
-    if (d != b) {
-      var C = y[k];
-      E = c ? c(C, k, y) : void 0, E === void 0 && (E = E_(C) ? C : Nae(r[d + 1]) ? [] : {});
-    }
-    Dae(y, k, E), y = y[k];
-  }
-  return a;
-}
-var Oae = Mae, Aae = Oae;
-function Rae(a, r, u) {
-  return a == null ? a : Aae(a, r, u);
-}
-var Bae = Rae;
-function zae(a, r) {
-  var u = -1, c = a.length;
-  for (r || (r = Array(c)); ++u < c; )
-    r[u] = a[u];
-  return r;
-}
-var Hae = zae, _ae = MG, Gae = Hae, $ae = o5, Yae = aw, Fae = IG, qae = x6, Vae = AG;
-function Wae(a) {
-  return $ae(a) ? _ae(a, qae) : Yae(a) ? [a] : Gae(Fae(Vae(a)));
-}
-var Uae = Wae, Kae = bne, Zae = wne, Xae = dae, Qae = Bae, Jae = Uae;
-function ow(a) {
-  return a && typeof a == "object" && "default" in a ? a : { default: a };
-}
-var l5 = /* @__PURE__ */ ow(Kae), sw = /* @__PURE__ */ ow(Zae), eoe = /* @__PURE__ */ ow(Xae), toe = /* @__PURE__ */ ow(Qae), noe = /* @__PURE__ */ ow(Jae);
-function Ra(a) {
-  "@babel/helpers - typeof";
-  return Ra = typeof Symbol == "function" && typeof Symbol.iterator == "symbol" ? function(r) {
-    return typeof r;
-  } : function(r) {
-    return r && typeof Symbol == "function" && r.constructor === Symbol && r !== Symbol.prototype ? "symbol" : typeof r;
-  }, Ra(a);
-}
-function T6(a, r) {
-  if (!(a instanceof r))
-    throw new TypeError("Cannot call a class as a function");
-}
-function S_(a, r) {
-  for (var u = 0; u < r.length; u++) {
-    var c = r[u];
-    c.enumerable = c.enumerable || !1, c.configurable = !0, "value" in c && (c.writable = !0), Object.defineProperty(a, c.key, c);
-  }
-}
-function L6(a, r, u) {
-  return r && S_(a.prototype, r), u && S_(a, u), Object.defineProperty(a, "prototype", {
-    writable: !1
-  }), a;
-}
-function BG(a, r, u) {
-  return r in a ? Object.defineProperty(a, r, {
-    value: u,
-    enumerable: !0,
-    configurable: !0,
-    writable: !0
-  }) : a[r] = u, a;
-}
-function kc(a, r) {
-  return roe(a) || ioe(a, r) || aoe(a, r) || ooe();
-}
-function roe(a) {
-  if (Array.isArray(a))
-    return a;
-}
-function ioe(a, r) {
-  var u = a == null ? null : typeof Symbol < "u" && a[Symbol.iterator] || a["@@iterator"];
-  if (u != null) {
-    var c = [], d = !0, g = !1, b, y;
-    try {
-      for (u = u.call(a); !(d = (b = u.next()).done) && (c.push(b.value), !(r && c.length === r)); d = !0)
-        ;
-    } catch (k) {
-      g = !0, y = k;
-    } finally {
-      try {
-        !d && u.return != null && u.return();
-      } finally {
-        if (g)
-          throw y;
-      }
-    }
-    return c;
-  }
-}
-function aoe(a, r) {
-  if (a) {
-    if (typeof a == "string")
-      return C_(a, r);
-    var u = Object.prototype.toString.call(a).slice(8, -1);
-    if (u === "Object" && a.constructor && (u = a.constructor.name), u === "Map" || u === "Set")
-      return Array.from(a);
-    if (u === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(u))
-      return C_(a, r);
-  }
-}
-function C_(a, r) {
-  (r == null || r > a.length) && (r = a.length);
-  for (var u = 0, c = new Array(r); u < r; u++)
-    c[u] = a[u];
-  return c;
-}
-function ooe() {
-  throw new TypeError(`Invalid attempt to destructure non-iterable instance.
-In order to be iterable, non-array objects must have a [Symbol.iterator]() method.`);
-}
-var Oa = typeof window > "u" ? null : window, x_ = Oa ? Oa.navigator : null;
-Oa && Oa.document;
-var soe = Ra(""), zG = Ra({}), uoe = Ra(function() {
-}), coe = typeof HTMLElement > "u" ? "undefined" : Ra(HTMLElement), uw = function(r) {
-  return r && r.instanceString && zi(r.instanceString) ? r.instanceString() : null;
-}, qt = function(r) {
-  return r != null && Ra(r) == soe;
-}, zi = function(r) {
-  return r != null && Ra(r) === uoe;
-}, Qr = function(r) {
-  return !tu(r) && (Array.isArray ? Array.isArray(r) : r != null && r instanceof Array);
-}, fr = function(r) {
-  return r != null && Ra(r) === zG && !Qr(r) && r.constructor === Object;
-}, loe = function(r) {
-  return r != null && Ra(r) === zG;
-}, kt = function(r) {
-  return r != null && Ra(r) === Ra(1) && !isNaN(r);
-}, foe = function(r) {
-  return kt(r) && Math.floor(r) === r;
-}, ZE = function(r) {
-  if (coe !== "undefined")
-    return r != null && r instanceof HTMLElement;
-}, tu = function(r) {
-  return cw(r) || HG(r);
-}, cw = function(r) {
-  return uw(r) === "collection" && r._private.single;
-}, HG = function(r) {
-  return uw(r) === "collection" && !r._private.single;
-}, P6 = function(r) {
-  return uw(r) === "core";
-}, _G = function(r) {
-  return uw(r) === "stylesheet";
-}, hoe = function(r) {
-  return uw(r) === "event";
-}, zh = function(r) {
-  return r == null ? !0 : !!(r === "" || r.match(/^\s+$/));
-}, doe = function(r) {
-  return typeof HTMLElement > "u" ? !1 : r instanceof HTMLElement;
-}, voe = function(r) {
-  return fr(r) && kt(r.x1) && kt(r.x2) && kt(r.y1) && kt(r.y2);
-}, goe = function(r) {
-  return loe(r) && zi(r.then);
-}, boe = function() {
-  return x_ && x_.userAgent.match(/msie|trident|edge/i);
-}, Up = function(r, u) {
-  u || (u = function() {
-    if (arguments.length === 1)
-      return arguments[0];
-    if (arguments.length === 0)
-      return "undefined";
-    for (var g = [], b = 0; b < arguments.length; b++)
-      g.push(arguments[b]);
-    return g.join("$");
-  });
-  var c = function d() {
-    var g = this, b = arguments, y, k = u.apply(g, b), E = d.cache;
-    return (y = E[k]) || (y = E[k] = r.apply(g, b)), y;
-  };
-  return c.cache = {}, c;
-}, D6 = Up(function(a) {
-  return a.replace(/([A-Z])/g, function(r) {
-    return "-" + r.toLowerCase();
-  });
-}), f5 = Up(function(a) {
-  return a.replace(/(-\w)/g, function(r) {
-    return r[1].toUpperCase();
-  });
-}), GG = Up(function(a, r) {
-  return a + r[0].toUpperCase() + r.substring(1);
-}, function(a, r) {
-  return a + "$" + r;
-}), T_ = function(r) {
-  return zh(r) ? r : r.charAt(0).toUpperCase() + r.substring(1);
-}, Aa = "(?:[-+]?(?:(?:\\d+|\\d*\\.\\d+)(?:[Ee][+-]?\\d+)?))", poe = "rgb[a]?\\((" + Aa + "[%]?)\\s*,\\s*(" + Aa + "[%]?)\\s*,\\s*(" + Aa + "[%]?)(?:\\s*,\\s*(" + Aa + "))?\\)", woe = "rgb[a]?\\((?:" + Aa + "[%]?)\\s*,\\s*(?:" + Aa + "[%]?)\\s*,\\s*(?:" + Aa + "[%]?)(?:\\s*,\\s*(?:" + Aa + "))?\\)", moe = "hsl[a]?\\((" + Aa + ")\\s*,\\s*(" + Aa + "[%])\\s*,\\s*(" + Aa + "[%])(?:\\s*,\\s*(" + Aa + "))?\\)", yoe = "hsl[a]?\\((?:" + Aa + ")\\s*,\\s*(?:" + Aa + "[%])\\s*,\\s*(?:" + Aa + "[%])(?:\\s*,\\s*(?:" + Aa + "))?\\)", koe = "\\#[0-9a-fA-F]{3}", Eoe = "\\#[0-9a-fA-F]{6}", $G = function(r, u) {
-  return r < u ? -1 : r > u ? 1 : 0;
-}, Soe = function(r, u) {
-  return -1 * $G(r, u);
-}, on = Object.assign != null ? Object.assign.bind(Object) : function(a) {
-  for (var r = arguments, u = 1; u < r.length; u++) {
-    var c = r[u];
-    if (c != null)
-      for (var d = Object.keys(c), g = 0; g < d.length; g++) {
-        var b = d[g];
-        a[b] = c[b];
-      }
-  }
-  return a;
-}, Coe = function(r) {
-  if (!(!(r.length === 4 || r.length === 7) || r[0] !== "#")) {
-    var u = r.length === 4, c, d, g, b = 16;
-    return u ? (c = parseInt(r[1] + r[1], b), d = parseInt(r[2] + r[2], b), g = parseInt(r[3] + r[3], b)) : (c = parseInt(r[1] + r[2], b), d = parseInt(r[3] + r[4], b), g = parseInt(r[5] + r[6], b)), [c, d, g];
-  }
-}, xoe = function(r) {
-  var u, c, d, g, b, y, k, E;
-  function C(D, H, _) {
-    return _ < 0 && (_ += 1), _ > 1 && (_ -= 1), _ < 1 / 6 ? D + (H - D) * 6 * _ : _ < 1 / 2 ? H : _ < 2 / 3 ? D + (H - D) * (2 / 3 - _) * 6 : D;
-  }
-  var T = new RegExp("^" + moe + "$").exec(r);
-  if (T) {
-    if (c = parseInt(T[1]), c < 0 ? c = (360 - -1 * c % 360) % 360 : c > 360 && (c = c % 360), c /= 360, d = parseFloat(T[2]), d < 0 || d > 100 || (d = d / 100, g = parseFloat(T[3]), g < 0 || g > 100) || (g = g / 100, b = T[4], b !== void 0 && (b = parseFloat(b), b < 0 || b > 1)))
-      return;
-    if (d === 0)
-      y = k = E = Math.round(g * 255);
-    else {
-      var P = g < 0.5 ? g * (1 + d) : g + d - g * d, N = 2 * g - P;
-      y = Math.round(255 * C(N, P, c + 1 / 3)), k = Math.round(255 * C(N, P, c)), E = Math.round(255 * C(N, P, c - 1 / 3));
-    }
-    u = [y, k, E, b];
-  }
-  return u;
-}, Toe = function(r) {
-  var u, c = new RegExp("^" + poe + "$").exec(r);
-  if (c) {
-    u = [];
-    for (var d = [], g = 1; g <= 3; g++) {
-      var b = c[g];
-      if (b[b.length - 1] === "%" && (d[g] = !0), b = parseFloat(b), d[g] && (b = b / 100 * 255), b < 0 || b > 255)
-        return;
-      u.push(Math.floor(b));
-    }
-    var y = d[1] || d[2] || d[3], k = d[1] && d[2] && d[3];
-    if (y && !k)
-      return;
-    var E = c[4];
-    if (E !== void 0) {
-      if (E = parseFloat(E), E < 0 || E > 1)
-        return;
-      u.push(E);
-    }
-  }
-  return u;
-}, Loe = function(r) {
-  return Doe[r.toLowerCase()];
-}, Poe = function(r) {
-  return (Qr(r) ? r : null) || Loe(r) || Coe(r) || Toe(r) || xoe(r);
-}, Doe = {
-  // special colour names
-  transparent: [0, 0, 0, 0],
-  // NB alpha === 0
-  // regular colours
-  aliceblue: [240, 248, 255],
-  antiquewhite: [250, 235, 215],
-  aqua: [0, 255, 255],
-  aquamarine: [127, 255, 212],
-  azure: [240, 255, 255],
-  beige: [245, 245, 220],
-  bisque: [255, 228, 196],
-  black: [0, 0, 0],
-  blanchedalmond: [255, 235, 205],
-  blue: [0, 0, 255],
-  blueviolet: [138, 43, 226],
-  brown: [165, 42, 42],
-  burlywood: [222, 184, 135],
-  cadetblue: [95, 158, 160],
-  chartreuse: [127, 255, 0],
-  chocolate: [210, 105, 30],
-  coral: [255, 127, 80],
-  cornflowerblue: [100, 149, 237],
-  cornsilk: [255, 248, 220],
-  crimson: [220, 20, 60],
-  cyan: [0, 255, 255],
-  darkblue: [0, 0, 139],
-  darkcyan: [0, 139, 139],
-  darkgoldenrod: [184, 134, 11],
-  darkgray: [169, 169, 169],
-  darkgreen: [0, 100, 0],
-  darkgrey: [169, 169, 169],
-  darkkhaki: [189, 183, 107],
-  darkmagenta: [139, 0, 139],
-  darkolivegreen: [85, 107, 47],
-  darkorange: [255, 140, 0],
-  darkorchid: [153, 50, 204],
-  darkred: [139, 0, 0],
-  darksalmon: [233, 150, 122],
-  darkseagreen: [143, 188, 143],
-  darkslateblue: [72, 61, 139],
-  darkslategray: [47, 79, 79],
-  darkslategrey: [47, 79, 79],
-  darkturquoise: [0, 206, 209],
-  darkviolet: [148, 0, 211],
-  deeppink: [255, 20, 147],
-  deepskyblue: [0, 191, 255],
-  dimgray: [105, 105, 105],
-  dimgrey: [105, 105, 105],
-  dodgerblue: [30, 144, 255],
-  firebrick: [178, 34, 34],
-  floralwhite: [255, 250, 240],
-  forestgreen: [34, 139, 34],
-  fuchsia: [255, 0, 255],
-  gainsboro: [220, 220, 220],
-  ghostwhite: [248, 248, 255],
-  gold: [255, 215, 0],
-  goldenrod: [218, 165, 32],
-  gray: [128, 128, 128],
-  grey: [128, 128, 128],
-  green: [0, 128, 0],
-  greenyellow: [173, 255, 47],
-  honeydew: [240, 255, 240],
-  hotpink: [255, 105, 180],
-  indianred: [205, 92, 92],
-  indigo: [75, 0, 130],
-  ivory: [255, 255, 240],
-  khaki: [240, 230, 140],
-  lavender: [230, 230, 250],
-  lavenderblush: [255, 240, 245],
-  lawngreen: [124, 252, 0],
-  lemonchiffon: [255, 250, 205],
-  lightblue: [173, 216, 230],
-  lightcoral: [240, 128, 128],
-  lightcyan: [224, 255, 255],
-  lightgoldenrodyellow: [250, 250, 210],
-  lightgray: [211, 211, 211],
-  lightgreen: [144, 238, 144],
-  lightgrey: [211, 211, 211],
-  lightpink: [255, 182, 193],
-  lightsalmon: [255, 160, 122],
-  lightseagreen: [32, 178, 170],
-  lightskyblue: [135, 206, 250],
-  lightslategray: [119, 136, 153],
-  lightslategrey: [119, 136, 153],
-  lightsteelblue: [176, 196, 222],
-  lightyellow: [255, 255, 224],
-  lime: [0, 255, 0],
-  limegreen: [50, 205, 50],
-  linen: [250, 240, 230],
-  magenta: [255, 0, 255],
-  maroon: [128, 0, 0],
-  mediumaquamarine: [102, 205, 170],
-  mediumblue: [0, 0, 205],
-  mediumorchid: [186, 85, 211],
-  mediumpurple: [147, 112, 219],
-  mediumseagreen: [60, 179, 113],
-  mediumslateblue: [123, 104, 238],
-  mediumspringgreen: [0, 250, 154],
-  mediumturquoise: [72, 209, 204],
-  mediumvioletred: [199, 21, 133],
-  midnightblue: [25, 25, 112],
-  mintcream: [245, 255, 250],
-  mistyrose: [255, 228, 225],
-  moccasin: [255, 228, 181],
-  navajowhite: [255, 222, 173],
-  navy: [0, 0, 128],
-  oldlace: [253, 245, 230],
-  olive: [128, 128, 0],
-  olivedrab: [107, 142, 35],
-  orange: [255, 165, 0],
-  orangered: [255, 69, 0],
-  orchid: [218, 112, 214],
-  palegoldenrod: [238, 232, 170],
-  palegreen: [152, 251, 152],
-  paleturquoise: [175, 238, 238],
-  palevioletred: [219, 112, 147],
-  papayawhip: [255, 239, 213],
-  peachpuff: [255, 218, 185],
-  peru: [205, 133, 63],
-  pink: [255, 192, 203],
-  plum: [221, 160, 221],
-  powderblue: [176, 224, 230],
-  purple: [128, 0, 128],
-  red: [255, 0, 0],
-  rosybrown: [188, 143, 143],
-  royalblue: [65, 105, 225],
-  saddlebrown: [139, 69, 19],
-  salmon: [250, 128, 114],
-  sandybrown: [244, 164, 96],
-  seagreen: [46, 139, 87],
-  seashell: [255, 245, 238],
-  sienna: [160, 82, 45],
-  silver: [192, 192, 192],
-  skyblue: [135, 206, 235],
-  slateblue: [106, 90, 205],
-  slategray: [112, 128, 144],
-  slategrey: [112, 128, 144],
-  snow: [255, 250, 250],
-  springgreen: [0, 255, 127],
-  steelblue: [70, 130, 180],
-  tan: [210, 180, 140],
-  teal: [0, 128, 128],
-  thistle: [216, 191, 216],
-  tomato: [255, 99, 71],
-  turquoise: [64, 224, 208],
-  violet: [238, 130, 238],
-  wheat: [245, 222, 179],
-  white: [255, 255, 255],
-  whitesmoke: [245, 245, 245],
-  yellow: [255, 255, 0],
-  yellowgreen: [154, 205, 50]
-}, YG = function(r) {
-  for (var u = r.map, c = r.keys, d = c.length, g = 0; g < d; g++) {
-    var b = c[g];
-    if (fr(b))
-      throw Error("Tried to set map with object key");
-    g < c.length - 1 ? (u[b] == null && (u[b] = {}), u = u[b]) : u[b] = r.value;
-  }
-}, FG = function(r) {
-  for (var u = r.map, c = r.keys, d = c.length, g = 0; g < d; g++) {
-    var b = c[g];
-    if (fr(b))
-      throw Error("Tried to get map with object key");
-    if (u = u[b], u == null)
-      return u;
-  }
-  return u;
-}, ZL = Oa ? Oa.performance : null, qG = ZL && ZL.now ? function() {
-  return ZL.now();
-} : function() {
-  return Date.now();
-}, joe = function() {
-  if (Oa) {
-    if (Oa.requestAnimationFrame)
-      return function(a) {
-        Oa.requestAnimationFrame(a);
-      };
-    if (Oa.mozRequestAnimationFrame)
-      return function(a) {
-        Oa.mozRequestAnimationFrame(a);
-      };
-    if (Oa.webkitRequestAnimationFrame)
-      return function(a) {
-        Oa.webkitRequestAnimationFrame(a);
-      };
-    if (Oa.msRequestAnimationFrame)
-      return function(a) {
-        Oa.msRequestAnimationFrame(a);
-      };
-  }
-  return function(a) {
-    a && setTimeout(function() {
-      a(qG());
-    }, 1e3 / 60);
-  };
-}(), XE = function(r) {
-  return joe(r);
-}, kf = qG, xb = 9261, VG = 65599, $p = 5381, WG = function(r) {
-  for (var u = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : xb, c = u, d; d = r.next(), !d.done; )
-    c = c * VG + d.value | 0;
-  return c;
-}, Kp = function(r) {
-  var u = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : xb;
-  return u * VG + r | 0;
-}, Zp = function(r) {
-  var u = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : $p;
-  return (u << 5) + u + r | 0;
-}, Noe = function(r, u) {
-  return r * 2097152 + u;
-}, Ih = function(r) {
-  return r[0] * 2097152 + r[1];
-}, NE = function(r, u) {
-  return [Kp(r[0], u[0]), Zp(r[1], u[1])];
-}, Ioe = function(r, u) {
-  var c = {
-    value: 0,
-    done: !1
-  }, d = 0, g = r.length, b = {
-    next: function() {
-      return d < g ? c.value = r[d++] : c.done = !0, c;
-    }
-  };
-  return WG(b, u);
-}, fv = function(r, u) {
-  var c = {
-    value: 0,
-    done: !1
-  }, d = 0, g = r.length, b = {
-    next: function() {
-      return d < g ? c.value = r.charCodeAt(d++) : c.done = !0, c;
-    }
-  };
-  return WG(b, u);
-}, UG = function() {
-  return Moe(arguments);
-}, Moe = function(r) {
-  for (var u, c = 0; c < r.length; c++) {
-    var d = r[c];
-    c === 0 ? u = fv(d) : u = fv(d, u);
-  }
-  return u;
-}, L_ = !0, Ooe = console.warn != null, Aoe = console.trace != null, j6 = Number.MAX_SAFE_INTEGER || 9007199254740991, KG = function() {
-  return !0;
-}, QE = function() {
-  return !1;
-}, P_ = function() {
-  return 0;
-}, N6 = function() {
-}, Qi = function(r) {
-  throw new Error(r);
-}, ZG = function(r) {
-  if (r !== void 0)
-    L_ = !!r;
-  else
-    return L_;
-}, Sr = function(r) {
-  ZG() && (Ooe ? console.warn(r) : (console.log(r), Aoe && console.trace()));
-}, Roe = function(r) {
-  return on({}, r);
-}, kl = function(r) {
-  return r == null ? r : Qr(r) ? r.slice() : fr(r) ? Roe(r) : r;
-}, Boe = function(r) {
-  return r.slice();
-}, XG = function(r, u) {
-  for (
-    // loop :)
-    u = r = "";
-    // b - result , a - numeric letiable
-    r++ < 36;
-    //
-    u += r * 51 & 52 ? (
-      //  return a random number or 4
-      (r ^ 15 ? (
-        // generate a random number from 0 to 15
-        8 ^ Math.random() * (r ^ 20 ? 16 : 4)
-      ) : 4).toString(16)
-    ) : "-"
-  )
-    ;
-  return u;
-}, zoe = {}, QG = function() {
-  return zoe;
-}, po = function(r) {
-  var u = Object.keys(r);
-  return function(c) {
-    for (var d = {}, g = 0; g < u.length; g++) {
-      var b = u[g], y = c == null ? void 0 : c[b];
-      d[b] = y === void 0 ? r[b] : y;
-    }
-    return d;
-  };
-}, Hh = function(r, u, c) {
-  for (var d = r.length - 1; d >= 0 && !(r[d] === u && (r.splice(d, 1), c)); d--)
-    ;
-}, I6 = function(r) {
-  r.splice(0, r.length);
-}, Hoe = function(r, u) {
-  for (var c = 0; c < u.length; c++) {
-    var d = u[c];
-    r.push(d);
-  }
-}, Sc = function(r, u, c) {
-  return c && (u = GG(c, u)), r[u];
-}, Oh = function(r, u, c, d) {
-  c && (u = GG(c, u)), r[u] = d;
-}, _oe = /* @__PURE__ */ function() {
-  function a() {
-    T6(this, a), this._obj = {};
-  }
-  return L6(a, [{
-    key: "set",
-    value: function(u, c) {
-      return this._obj[u] = c, this;
-    }
-  }, {
-    key: "delete",
-    value: function(u) {
-      return this._obj[u] = void 0, this;
-    }
-  }, {
-    key: "clear",
-    value: function() {
-      this._obj = {};
-    }
-  }, {
-    key: "has",
-    value: function(u) {
-      return this._obj[u] !== void 0;
-    }
-  }, {
-    key: "get",
-    value: function(u) {
-      return this._obj[u];
-    }
-  }]), a;
-}(), El = typeof Map < "u" ? Map : _oe, Goe = "undefined", $oe = /* @__PURE__ */ function() {
-  function a(r) {
-    if (T6(this, a), this._obj = /* @__PURE__ */ Object.create(null), this.size = 0, r != null) {
-      var u;
-      r.instanceString != null && r.instanceString() === this.instanceString() ? u = r.toArray() : u = r;
-      for (var c = 0; c < u.length; c++)
-        this.add(u[c]);
-    }
-  }
-  return L6(a, [{
-    key: "instanceString",
-    value: function() {
-      return "set";
-    }
-  }, {
-    key: "add",
-    value: function(u) {
-      var c = this._obj;
-      c[u] !== 1 && (c[u] = 1, this.size++);
-    }
-  }, {
-    key: "delete",
-    value: function(u) {
-      var c = this._obj;
-      c[u] === 1 && (c[u] = 0, this.size--);
-    }
-  }, {
-    key: "clear",
-    value: function() {
-      this._obj = /* @__PURE__ */ Object.create(null);
-    }
-  }, {
-    key: "has",
-    value: function(u) {
-      return this._obj[u] === 1;
-    }
-  }, {
-    key: "toArray",
-    value: function() {
-      var u = this;
-      return Object.keys(this._obj).filter(function(c) {
-        return u.has(c);
-      });
-    }
-  }, {
-    key: "forEach",
-    value: function(u, c) {
-      return this.toArray().forEach(u, c);
-    }
-  }]), a;
-}(), zb = (typeof Set > "u" ? "undefined" : Ra(Set)) !== Goe ? Set : $oe, h5 = function(r, u) {
-  var c = arguments.length > 2 && arguments[2] !== void 0 ? arguments[2] : !0;
-  if (r === void 0 || u === void 0 || !P6(r)) {
-    Qi("An element must have a core reference and parameters set");
-    return;
-  }
-  var d = u.group;
-  if (d == null && (u.data && u.data.source != null && u.data.target != null ? d = "edges" : d = "nodes"), d !== "nodes" && d !== "edges") {
-    Qi("An element must be of type `nodes` or `edges`; you specified `" + d + "`");
-    return;
-  }
-  this.length = 1, this[0] = this;
-  var g = this._private = {
-    cy: r,
-    single: !0,
-    // indicates this is an element
-    data: u.data || {},
-    // data object
-    position: u.position || {
-      x: 0,
-      y: 0
-    },
-    // (x, y) position pair
-    autoWidth: void 0,
-    // width and height of nodes calculated by the renderer when set to special 'auto' value
-    autoHeight: void 0,
-    autoPadding: void 0,
-    compoundBoundsClean: !1,
-    // whether the compound dimensions need to be recalculated the next time dimensions are read
-    listeners: [],
-    // array of bound listeners
-    group: d,
-    // string; 'nodes' or 'edges'
-    style: {},
-    // properties as set by the style
-    rstyle: {},
-    // properties for style sent from the renderer to the core
-    styleCxts: [],
-    // applied style contexts from the styler
-    styleKeys: {},
-    // per-group keys of style property values
-    removed: !0,
-    // whether it's inside the vis; true if removed (set true here since we call restore)
-    selected: !!u.selected,
-    // whether it's selected
-    selectable: u.selectable === void 0 ? !0 : !!u.selectable,
-    // whether it's selectable
-    locked: !!u.locked,
-    // whether the element is locked (cannot be moved)
-    grabbed: !1,
-    // whether the element is grabbed by the mouse; renderer sets this privately
-    grabbable: u.grabbable === void 0 ? !0 : !!u.grabbable,
-    // whether the element can be grabbed
-    pannable: u.pannable === void 0 ? d === "edges" : !!u.pannable,
-    // whether the element has passthrough panning enabled
-    active: !1,
-    // whether the element is active from user interaction
-    classes: new zb(),
-    // map ( className => true )
-    animation: {
-      // object for currently-running animations
-      current: [],
-      queue: []
-    },
-    rscratch: {},
-    // object in which the renderer can store information
-    scratch: u.scratch || {},
-    // scratch objects
-    edges: [],
-    // array of connected edges
-    children: [],
-    // array of children
-    parent: u.parent && u.parent.isNode() ? u.parent : null,
-    // parent ref
-    traversalCache: {},
-    // cache of output of traversal functions
-    backgrounding: !1,
-    // whether background images are loading
-    bbCache: null,
-    // cache of the current bounding box
-    bbCacheShift: {
-      x: 0,
-      y: 0
-    },
-    // shift applied to cached bb to be applied on next get
-    bodyBounds: null,
-    // bounds cache of element body, w/o overlay
-    overlayBounds: null,
-    // bounds cache of element body, including overlay
-    labelBounds: {
-      // bounds cache of labels
-      all: null,
-      source: null,
-      target: null,
-      main: null
-    },
-    arrowBounds: {
-      // bounds cache of edge arrows
-      source: null,
-      target: null,
-      "mid-source": null,
-      "mid-target": null
-    }
-  };
-  if (g.position.x == null && (g.position.x = 0), g.position.y == null && (g.position.y = 0), u.renderedPosition) {
-    var b = u.renderedPosition, y = r.pan(), k = r.zoom();
-    g.position = {
-      x: (b.x - y.x) / k,
-      y: (b.y - y.y) / k
-    };
-  }
-  var E = [];
-  Qr(u.classes) ? E = u.classes : qt(u.classes) && (E = u.classes.split(/\s+/));
-  for (var C = 0, T = E.length; C < T; C++) {
-    var P = E[C];
-    !P || P === "" || g.classes.add(P);
-  }
-  this.createEmitter();
-  var N = u.style || u.css;
-  N && (Sr("Setting a `style` bypass at element creation should be done only when absolutely necessary.  Try to use the stylesheet instead."), this.style(N)), (c === void 0 || c) && this.restore();
-}, D_ = function(r) {
-  return r = {
-    bfs: r.bfs || !r.dfs,
-    dfs: r.dfs || !r.bfs
-  }, function(c, d, g) {
-    var b;
-    fr(c) && !tu(c) && (b = c, c = b.roots || b.root, d = b.visit, g = b.directed), g = arguments.length === 2 && !zi(d) ? d : g, d = zi(d) ? d : function() {
-    };
-    for (var y = this._private.cy, k = c = qt(c) ? this.filter(c) : c, E = [], C = [], T = {}, P = {}, N = {}, D = 0, H, _ = this.byGroup(), B = _.nodes, $ = _.edges, F = 0; F < k.length; F++) {
-      var W = k[F], Q = W.id();
-      W.isNode() && (E.unshift(W), r.bfs && (N[Q] = !0, C.push(W)), P[Q] = 0);
-    }
-    for (var X = function() {
-      var fe = r.bfs ? E.shift() : E.pop(), se = fe.id();
-      if (r.dfs) {
-        if (N[se])
-          return "continue";
-        N[se] = !0, C.push(fe);
-      }
-      var pe = P[se], he = T[se], de = he != null ? he.source() : null, ke = he != null ? he.target() : null, Pe = he == null ? void 0 : fe.same(de) ? ke[0] : de[0], Ae = void 0;
-      if (Ae = d(fe, he, Pe, D++, pe), Ae === !0)
-        return H = fe, "break";
-      if (Ae === !1)
-        return "break";
-      for (var Te = fe.connectedEdges().filter(function(Ge) {
-        return (!g || Ge.source().same(fe)) && $.has(Ge);
-      }), Oe = 0; Oe < Te.length; Oe++) {
-        var ze = Te[Oe], We = ze.connectedNodes().filter(function(Ge) {
-          return !Ge.same(fe) && B.has(Ge);
-        }), $e = We.id();
-        We.length !== 0 && !N[$e] && (We = We[0], E.push(We), r.bfs && (N[$e] = !0, C.push(We)), T[$e] = ze, P[$e] = P[se] + 1);
-      }
-    }; E.length !== 0; ) {
-      var K = X();
-      if (K !== "continue" && K === "break")
-        break;
-    }
-    for (var ee = y.collection(), Z = 0; Z < C.length; Z++) {
-      var ae = C[Z], oe = T[ae.id()];
-      oe != null && ee.push(oe), ee.push(ae);
-    }
-    return {
-      path: y.collection(ee),
-      found: y.collection(H)
-    };
-  };
-}, Xp = {
-  breadthFirstSearch: D_({
-    bfs: !0
-  }),
-  depthFirstSearch: D_({
-    dfs: !0
-  })
-};
-Xp.bfs = Xp.breadthFirstSearch;
-Xp.dfs = Xp.depthFirstSearch;
-var Yoe = po({
-  root: null,
-  weight: function(r) {
-    return 1;
-  },
-  directed: !1
-}), Foe = {
-  dijkstra: function(r) {
-    if (!fr(r)) {
-      var u = arguments;
-      r = {
-        root: u[0],
-        weight: u[1],
-        directed: u[2]
-      };
-    }
-    var c = Yoe(r), d = c.root, g = c.weight, b = c.directed, y = this, k = g, E = qt(d) ? this.filter(d)[0] : d[0], C = {}, T = {}, P = {}, N = this.byGroup(), D = N.nodes, H = N.edges;
-    H.unmergeBy(function(pe) {
-      return pe.isLoop();
-    });
-    for (var _ = function(he) {
-      return C[he.id()];
-    }, B = function(he, de) {
-      C[he.id()] = de, $.updateItem(he);
-    }, $ = new sw.default(function(pe, he) {
-      return _(pe) - _(he);
-    }), F = 0; F < D.length; F++) {
-      var W = D[F];
-      C[W.id()] = W.same(E) ? 0 : 1 / 0, $.push(W);
-    }
-    for (var Q = function(he, de) {
-      for (var ke = (b ? he.edgesTo(de) : he.edgesWith(de)).intersect(H), Pe = 1 / 0, Ae, Te = 0; Te < ke.length; Te++) {
-        var Oe = ke[Te], ze = k(Oe);
-        (ze < Pe || !Ae) && (Pe = ze, Ae = Oe);
-      }
-      return {
-        edge: Ae,
-        dist: Pe
-      };
-    }; $.size() > 0; ) {
-      var X = $.pop(), K = _(X), ee = X.id();
-      if (P[ee] = K, K !== 1 / 0)
-        for (var Z = X.neighborhood().intersect(D), ae = 0; ae < Z.length; ae++) {
-          var oe = Z[ae], J = oe.id(), fe = Q(X, oe), se = K + fe.dist;
-          se < _(oe) && (B(oe, se), T[J] = {
-            node: X,
-            edge: fe.edge
-          });
-        }
-    }
-    return {
-      distanceTo: function(he) {
-        var de = qt(he) ? D.filter(he)[0] : he[0];
-        return P[de.id()];
-      },
-      pathTo: function(he) {
-        var de = qt(he) ? D.filter(he)[0] : he[0], ke = [], Pe = de, Ae = Pe.id();
-        if (de.length > 0)
-          for (ke.unshift(de); T[Ae]; ) {
-            var Te = T[Ae];
-            ke.unshift(Te.edge), ke.unshift(Te.node), Pe = Te.node, Ae = Pe.id();
-          }
-        return y.spawn(ke);
-      }
-    };
-  }
-}, qoe = {
-  // kruskal's algorithm (finds min spanning tree, assuming undirected graph)
-  // implemented from pseudocode from wikipedia
-  kruskal: function(r) {
-    r = r || function(F) {
-      return 1;
-    };
-    for (var u = this.byGroup(), c = u.nodes, d = u.edges, g = c.length, b = new Array(g), y = c, k = function(W) {
-      for (var Q = 0; Q < b.length; Q++) {
-        var X = b[Q];
-        if (X.has(W))
-          return Q;
-      }
-    }, E = 0; E < g; E++)
-      b[E] = this.spawn(c[E]);
-    for (var C = d.sort(function(F, W) {
-      return r(F) - r(W);
-    }), T = 0; T < C.length; T++) {
-      var P = C[T], N = P.source()[0], D = P.target()[0], H = k(N), _ = k(D), B = b[H], $ = b[_];
-      H !== _ && (y.merge(P), B.merge($), b.splice(_, 1));
-    }
-    return y;
-  }
-}, Voe = po({
-  root: null,
-  goal: null,
-  weight: function(r) {
-    return 1;
-  },
-  heuristic: function(r) {
-    return 0;
-  },
-  directed: !1
-}), Woe = {
-  // Implemented from pseudocode from wikipedia
-  aStar: function(r) {
-    var u = this.cy(), c = Voe(r), d = c.root, g = c.goal, b = c.heuristic, y = c.directed, k = c.weight;
-    d = u.collection(d)[0], g = u.collection(g)[0];
-    var E = d.id(), C = g.id(), T = {}, P = {}, N = {}, D = new sw.default(function(Ae, Te) {
-      return P[Ae.id()] - P[Te.id()];
-    }), H = new zb(), _ = {}, B = {}, $ = function(Te, Oe) {
-      D.push(Te), H.add(Oe);
-    }, F, W, Q = function() {
-      F = D.pop(), W = F.id(), H.delete(W);
-    }, X = function(Te) {
-      return H.has(Te);
-    };
-    $(d, E), T[E] = 0, P[E] = b(d);
-    for (var K = 0; D.size() > 0; ) {
-      if (Q(), K++, W === C) {
-        for (var ee = [], Z = g, ae = C, oe = B[ae]; ee.unshift(Z), oe != null && ee.unshift(oe), Z = _[ae], Z != null; )
-          ae = Z.id(), oe = B[ae];
-        return {
-          found: !0,
-          distance: T[W],
-          path: this.spawn(ee),
-          steps: K
-        };
-      }
-      N[W] = !0;
-      for (var J = F._private.edges, fe = 0; fe < J.length; fe++) {
-        var se = J[fe];
-        if (this.hasElementWithId(se.id()) && !(y && se.data("source") !== W)) {
-          var pe = se.source(), he = se.target(), de = pe.id() !== W ? pe : he, ke = de.id();
-          if (this.hasElementWithId(ke) && !N[ke]) {
-            var Pe = T[W] + k(se);
-            if (!X(ke)) {
-              T[ke] = Pe, P[ke] = Pe + b(de), $(de, ke), _[ke] = F, B[ke] = se;
-              continue;
-            }
-            Pe < T[ke] && (T[ke] = Pe, P[ke] = Pe + b(de), _[ke] = F, B[ke] = se);
-          }
-        }
-      }
-    }
-    return {
-      found: !1,
-      distance: void 0,
-      path: void 0,
-      steps: K
-    };
-  }
-}, Uoe = po({
-  weight: function(r) {
-    return 1;
-  },
-  directed: !1
-}), Koe = {
-  // Implemented from pseudocode from wikipedia
-  floydWarshall: function(r) {
-    for (var u = this.cy(), c = Uoe(r), d = c.weight, g = c.directed, b = d, y = this.byGroup(), k = y.nodes, E = y.edges, C = k.length, T = C * C, P = function(ze) {
-      return k.indexOf(ze);
-    }, N = function(ze) {
-      return k[ze];
-    }, D = new Array(T), H = 0; H < T; H++) {
-      var _ = H % C, B = (H - _) / C;
-      B === _ ? D[H] = 0 : D[H] = 1 / 0;
-    }
-    for (var $ = new Array(T), F = new Array(T), W = 0; W < E.length; W++) {
-      var Q = E[W], X = Q.source()[0], K = Q.target()[0];
-      if (X !== K) {
-        var ee = P(X), Z = P(K), ae = ee * C + Z, oe = b(Q);
-        if (D[ae] > oe && (D[ae] = oe, $[ae] = Z, F[ae] = Q), !g) {
-          var J = Z * C + ee;
-          !g && D[J] > oe && (D[J] = oe, $[J] = ee, F[J] = Q);
-        }
-      }
-    }
-    for (var fe = 0; fe < C; fe++)
-      for (var se = 0; se < C; se++)
-        for (var pe = se * C + fe, he = 0; he < C; he++) {
-          var de = se * C + he, ke = fe * C + he;
-          D[pe] + D[ke] < D[de] && (D[de] = D[pe] + D[ke], $[de] = $[pe]);
-        }
-    var Pe = function(ze) {
-      return (qt(ze) ? u.filter(ze) : ze)[0];
-    }, Ae = function(ze) {
-      return P(Pe(ze));
-    }, Te = {
-      distance: function(ze, We) {
-        var $e = Ae(ze), Ge = Ae(We);
-        return D[$e * C + Ge];
-      },
-      path: function(ze, We) {
-        var $e = Ae(ze), Ge = Ae(We), me = N($e);
-        if ($e === Ge)
-          return me.collection();
-        if ($[$e * C + Ge] == null)
-          return u.collection();
-        var Ve = u.collection(), Ke = $e, at;
-        for (Ve.merge(me); $e !== Ge; )
-          Ke = $e, $e = $[$e * C + Ge], at = F[Ke * C + $e], Ve.merge(at), Ve.merge(N($e));
-        return Ve;
-      }
-    };
-    return Te;
-  }
-  // floydWarshall
-}, Zoe = po({
-  weight: function(r) {
-    return 1;
-  },
-  directed: !1,
-  root: null
-}), Xoe = {
-  // Implemented from pseudocode from wikipedia
-  bellmanFord: function(r) {
-    var u = this, c = Zoe(r), d = c.weight, g = c.directed, b = c.root, y = d, k = this, E = this.cy(), C = this.byGroup(), T = C.edges, P = C.nodes, N = P.length, D = new El(), H = !1, _ = [];
-    b = E.collection(b)[0], T.unmergeBy(function(Lt) {
-      return Lt.isLoop();
-    });
-    for (var B = T.length, $ = function(yt) {
-      var Mt = D.get(yt.id());
-      return Mt || (Mt = {}, D.set(yt.id(), Mt)), Mt;
-    }, F = function(yt) {
-      return (qt(yt) ? E.$(yt) : yt)[0];
-    }, W = function(yt) {
-      return $(F(yt)).dist;
-    }, Q = function(yt) {
-      for (var Mt = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : b, In = F(yt), Pn = [], Vt = In; ; ) {
-        if (Vt == null)
-          return u.spawn();
-        var ar = $(Vt), Qe = ar.edge, ne = ar.pred;
-        if (Pn.unshift(Vt[0]), Vt.same(Mt) && Pn.length > 0)
-          break;
-        Qe != null && Pn.unshift(Qe), Vt = ne;
-      }
-      return k.spawn(Pn);
-    }, X = 0; X < N; X++) {
-      var K = P[X], ee = $(K);
-      K.same(b) ? ee.dist = 0 : ee.dist = 1 / 0, ee.pred = null, ee.edge = null;
-    }
-    for (var Z = !1, ae = function(yt, Mt, In, Pn, Vt, ar) {
-      var Qe = Pn.dist + ar;
-      Qe < Vt.dist && !In.same(Pn.edge) && (Vt.dist = Qe, Vt.pred = yt, Vt.edge = In, Z = !0);
-    }, oe = 1; oe < N; oe++) {
-      Z = !1;
-      for (var J = 0; J < B; J++) {
-        var fe = T[J], se = fe.source(), pe = fe.target(), he = y(fe), de = $(se), ke = $(pe);
-        ae(se, pe, fe, de, ke, he), g || ae(pe, se, fe, ke, de, he);
-      }
-      if (!Z)
-        break;
-    }
-    if (Z)
-      for (var Pe = [], Ae = 0; Ae < B; Ae++) {
-        var Te = T[Ae], Oe = Te.source(), ze = Te.target(), We = y(Te), $e = $(Oe).dist, Ge = $(ze).dist;
-        if ($e + We < Ge || !g && Ge + We < $e)
-          if (H || (Sr("Graph contains a negative weight cycle for Bellman-Ford"), H = !0), r.findNegativeWeightCycles !== !1) {
-            var me = [];
-            $e + We < Ge && me.push(Oe), !g && Ge + We < $e && me.push(ze);
-            for (var Ve = me.length, Ke = 0; Ke < Ve; Ke++) {
-              var at = me[Ke], ft = [at];
-              ft.push($(at).edge);
-              for (var en = $(at).pred; ft.indexOf(en) === -1; )
-                ft.push(en), ft.push($(en).edge), en = $(en).pred;
-              ft = ft.slice(ft.indexOf(en));
-              for (var gn = ft[0].id(), mt = 0, ht = 2; ht < ft.length; ht += 2)
-                ft[ht].id() < gn && (gn = ft[ht].id(), mt = ht);
-              ft = ft.slice(mt).concat(ft.slice(0, mt)), ft.push(ft[0]);
-              var Rt = ft.map(function(Lt) {
-                return Lt.id();
-              }).join(",");
-              Pe.indexOf(Rt) === -1 && (_.push(k.spawn(ft)), Pe.push(Rt));
-            }
-          } else
-            break;
-      }
-    return {
-      distanceTo: W,
-      pathTo: Q,
-      hasNegativeWeightCycle: H,
-      negativeWeightCycles: _
-    };
-  }
-  // bellmanFord
-}, Qoe = Math.sqrt(2), Joe = function(r, u, c) {
-  c.length === 0 && Qi("Karger-Stein must be run on a connected (sub)graph");
-  for (var d = c[r], g = d[1], b = d[2], y = u[g], k = u[b], E = c, C = E.length - 1; C >= 0; C--) {
-    var T = E[C], P = T[1], N = T[2];
-    (u[P] === y && u[N] === k || u[P] === k && u[N] === y) && E.splice(C, 1);
-  }
-  for (var D = 0; D < E.length; D++) {
-    var H = E[D];
-    H[1] === k ? (E[D] = H.slice(), E[D][1] = y) : H[2] === k && (E[D] = H.slice(), E[D][2] = y);
-  }
-  for (var _ = 0; _ < u.length; _++)
-    u[_] === k && (u[_] = y);
-  return E;
-}, XL = function(r, u, c, d) {
-  for (; c > d; ) {
-    var g = Math.floor(Math.random() * u.length);
-    u = Joe(g, r, u), c--;
-  }
-  return u;
-}, ese = {
-  // Computes the minimum cut of an undirected graph
-  // Returns the correct answer with high probability
-  kargerStein: function() {
-    var r = this, u = this.byGroup(), c = u.nodes, d = u.edges;
-    d.unmergeBy(function(ke) {
-      return ke.isLoop();
-    });
-    var g = c.length, b = d.length, y = Math.ceil(Math.pow(Math.log(g) / Math.LN2, 2)), k = Math.floor(g / Qoe);
-    if (g < 2) {
-      Qi("At least 2 nodes are required for Karger-Stein algorithm");
-      return;
-    }
-    for (var E = [], C = 0; C < b; C++) {
-      var T = d[C];
-      E.push([C, c.indexOf(T.source()), c.indexOf(T.target())]);
-    }
-    for (var P = 1 / 0, N = [], D = new Array(g), H = new Array(g), _ = new Array(g), B = function(Pe, Ae) {
-      for (var Te = 0; Te < g; Te++)
-        Ae[Te] = Pe[Te];
-    }, $ = 0; $ <= y; $++) {
-      for (var F = 0; F < g; F++)
-        H[F] = F;
-      var W = XL(H, E.slice(), g, k), Q = W.slice();
-      B(H, _);
-      var X = XL(H, W, k, 2), K = XL(_, Q, k, 2);
-      X.length <= K.length && X.length < P ? (P = X.length, N = X, B(H, D)) : K.length <= X.length && K.length < P && (P = K.length, N = K, B(_, D));
-    }
-    for (var ee = this.spawn(N.map(function(ke) {
-      return d[ke[0]];
-    })), Z = this.spawn(), ae = this.spawn(), oe = D[0], J = 0; J < D.length; J++) {
-      var fe = D[J], se = c[J];
-      fe === oe ? Z.merge(se) : ae.merge(se);
-    }
-    var pe = function(Pe) {
-      var Ae = r.spawn();
-      return Pe.forEach(function(Te) {
-        Ae.merge(Te), Te.connectedEdges().forEach(function(Oe) {
-          r.contains(Oe) && !ee.contains(Oe) && Ae.merge(Oe);
-        });
-      }), Ae;
-    }, he = [pe(Z), pe(ae)], de = {
-      cut: ee,
-      components: he,
-      // n.b. partitions are included to be compatible with the old api spec
-      // (could be removed in a future major version)
-      partition1: Z,
-      partition2: ae
-    };
-    return de;
-  }
-}, tse = function(r) {
-  return {
-    x: r.x,
-    y: r.y
-  };
-}, d5 = function(r, u, c) {
-  return {
-    x: r.x * u + c.x,
-    y: r.y * u + c.y
-  };
-}, JG = function(r, u, c) {
-  return {
-    x: (r.x - c.x) / u,
-    y: (r.y - c.y) / u
-  };
-}, Tb = function(r) {
-  return {
-    x: r[0],
-    y: r[1]
-  };
-}, nse = function(r) {
-  for (var u = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : 0, c = arguments.length > 2 && arguments[2] !== void 0 ? arguments[2] : r.length, d = 1 / 0, g = u; g < c; g++) {
-    var b = r[g];
-    isFinite(b) && (d = Math.min(b, d));
-  }
-  return d;
-}, rse = function(r) {
-  for (var u = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : 0, c = arguments.length > 2 && arguments[2] !== void 0 ? arguments[2] : r.length, d = -1 / 0, g = u; g < c; g++) {
-    var b = r[g];
-    isFinite(b) && (d = Math.max(b, d));
-  }
-  return d;
-}, ise = function(r) {
-  for (var u = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : 0, c = arguments.length > 2 && arguments[2] !== void 0 ? arguments[2] : r.length, d = 0, g = 0, b = u; b < c; b++) {
-    var y = r[b];
-    isFinite(y) && (d += y, g++);
-  }
-  return d / g;
-}, ase = function(r) {
-  var u = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : 0, c = arguments.length > 2 && arguments[2] !== void 0 ? arguments[2] : r.length, d = arguments.length > 3 && arguments[3] !== void 0 ? arguments[3] : !0, g = arguments.length > 4 && arguments[4] !== void 0 ? arguments[4] : !0, b = arguments.length > 5 && arguments[5] !== void 0 ? arguments[5] : !0;
-  d ? r = r.slice(u, c) : (c < r.length && r.splice(c, r.length - c), u > 0 && r.splice(0, u));
-  for (var y = 0, k = r.length - 1; k >= 0; k--) {
-    var E = r[k];
-    b ? isFinite(E) || (r[k] = -1 / 0, y++) : r.splice(k, 1);
-  }
-  g && r.sort(function(P, N) {
-    return P - N;
-  });
-  var C = r.length, T = Math.floor(C / 2);
-  return C % 2 !== 0 ? r[T + 1 + y] : (r[T - 1 + y] + r[T + y]) / 2;
-}, ose = function(r) {
-  return Math.PI * r / 180;
-}, IE = function(r, u) {
-  return Math.atan2(u, r) - Math.PI / 2;
-}, M6 = Math.log2 || function(a) {
-  return Math.log(a) / Math.log(2);
-}, e$ = function(r) {
-  return r > 0 ? 1 : r < 0 ? -1 : 0;
-}, hv = function(r, u) {
-  return Math.sqrt(uv(r, u));
-}, uv = function(r, u) {
-  var c = u.x - r.x, d = u.y - r.y;
-  return c * c + d * d;
-}, sse = function(r) {
-  for (var u = r.length, c = 0, d = 0; d < u; d++)
-    c += r[d];
-  for (var g = 0; g < u; g++)
-    r[g] = r[g] / c;
-  return r;
-}, Ja = function(r, u, c, d) {
-  return (1 - d) * (1 - d) * r + 2 * (1 - d) * d * u + d * d * c;
-}, Pb = function(r, u, c, d) {
-  return {
-    x: Ja(r.x, u.x, c.x, d),
-    y: Ja(r.y, u.y, c.y, d)
-  };
-}, use = function(r, u, c, d) {
-  var g = {
-    x: u.x - r.x,
-    y: u.y - r.y
-  }, b = hv(r, u), y = {
-    x: g.x / b,
-    y: g.y / b
-  };
-  return c = c ?? 0, d = d ?? c * b, {
-    x: r.x + y.x * d,
-    y: r.y + y.y * d
-  };
-}, Qp = function(r, u, c) {
-  return Math.max(r, Math.min(c, u));
-}, Ms = function(r) {
-  if (r == null)
-    return {
-      x1: 1 / 0,
-      y1: 1 / 0,
-      x2: -1 / 0,
-      y2: -1 / 0,
-      w: 0,
-      h: 0
-    };
-  if (r.x1 != null && r.y1 != null) {
-    if (r.x2 != null && r.y2 != null && r.x2 >= r.x1 && r.y2 >= r.y1)
-      return {
-        x1: r.x1,
-        y1: r.y1,
-        x2: r.x2,
-        y2: r.y2,
-        w: r.x2 - r.x1,
-        h: r.y2 - r.y1
-      };
-    if (r.w != null && r.h != null && r.w >= 0 && r.h >= 0)
-      return {
-        x1: r.x1,
-        y1: r.y1,
-        x2: r.x1 + r.w,
-        y2: r.y1 + r.h,
-        w: r.w,
-        h: r.h
-      };
-  }
-}, cse = function(r) {
-  return {
-    x1: r.x1,
-    x2: r.x2,
-    w: r.w,
-    y1: r.y1,
-    y2: r.y2,
-    h: r.h
-  };
-}, lse = function(r) {
-  r.x1 = 1 / 0, r.y1 = 1 / 0, r.x2 = -1 / 0, r.y2 = -1 / 0, r.w = 0, r.h = 0;
-}, fse = function(r, u) {
-  r.x1 = Math.min(r.x1, u.x1), r.x2 = Math.max(r.x2, u.x2), r.w = r.x2 - r.x1, r.y1 = Math.min(r.y1, u.y1), r.y2 = Math.max(r.y2, u.y2), r.h = r.y2 - r.y1;
-}, hse = function(r, u, c) {
-  r.x1 = Math.min(r.x1, u), r.x2 = Math.max(r.x2, u), r.w = r.x2 - r.x1, r.y1 = Math.min(r.y1, c), r.y2 = Math.max(r.y2, c), r.h = r.y2 - r.y1;
-}, YE = function(r) {
-  var u = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : 0;
-  return r.x1 -= u, r.x2 += u, r.y1 -= u, r.y2 += u, r.w = r.x2 - r.x1, r.h = r.y2 - r.y1, r;
-}, QL = function(r) {
-  var u = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : [0], c, d, g, b;
-  if (u.length === 1)
-    c = d = g = b = u[0];
-  else if (u.length === 2)
-    c = g = u[0], b = d = u[1];
-  else if (u.length === 4) {
-    var y = kc(u, 4);
-    c = y[0], d = y[1], g = y[2], b = y[3];
-  }
-  return r.x1 -= b, r.x2 += d, r.y1 -= c, r.y2 += g, r.w = r.x2 - r.x1, r.h = r.y2 - r.y1, r;
-}, j_ = function(r, u) {
-  r.x1 = u.x1, r.y1 = u.y1, r.x2 = u.x2, r.y2 = u.y2, r.w = r.x2 - r.x1, r.h = r.y2 - r.y1;
-}, O6 = function(r, u) {
-  return !(r.x1 > u.x2 || u.x1 > r.x2 || r.x2 < u.x1 || u.x2 < r.x1 || r.y2 < u.y1 || u.y2 < r.y1 || r.y1 > u.y2 || u.y1 > r.y2);
-}, Ib = function(r, u, c) {
-  return r.x1 <= u && u <= r.x2 && r.y1 <= c && c <= r.y2;
-}, dse = function(r, u) {
-  return Ib(r, u.x, u.y);
-}, t$ = function(r, u) {
-  return Ib(r, u.x1, u.y1) && Ib(r, u.x2, u.y2);
-}, n$ = function(r, u, c, d, g, b, y) {
-  var k = lw(g, b), E = g / 2, C = b / 2, T;
-  {
-    var P = c - E + k - y, N = d - C - y, D = c + E - k + y, H = N;
-    if (T = Ah(r, u, c, d, P, N, D, H, !1), T.length > 0)
-      return T;
-  }
-  {
-    var _ = c + E + y, B = d - C + k - y, $ = _, F = d + C - k + y;
-    if (T = Ah(r, u, c, d, _, B, $, F, !1), T.length > 0)
-      return T;
-  }
-  {
-    var W = c - E + k - y, Q = d + C + y, X = c + E - k + y, K = Q;
-    if (T = Ah(r, u, c, d, W, Q, X, K, !1), T.length > 0)
-      return T;
-  }
-  {
-    var ee = c - E - y, Z = d - C + k - y, ae = ee, oe = d + C - k + y;
-    if (T = Ah(r, u, c, d, ee, Z, ae, oe, !1), T.length > 0)
-      return T;
-  }
-  var J;
-  {
-    var fe = c - E + k, se = d - C + k;
-    if (J = Yp(r, u, c, d, fe, se, k + y), J.length > 0 && J[0] <= fe && J[1] <= se)
-      return [J[0], J[1]];
-  }
-  {
-    var pe = c + E - k, he = d - C + k;
-    if (J = Yp(r, u, c, d, pe, he, k + y), J.length > 0 && J[0] >= pe && J[1] <= he)
-      return [J[0], J[1]];
-  }
-  {
-    var de = c + E - k, ke = d + C - k;
-    if (J = Yp(r, u, c, d, de, ke, k + y), J.length > 0 && J[0] >= de && J[1] >= ke)
-      return [J[0], J[1]];
-  }
-  {
-    var Pe = c - E + k, Ae = d + C - k;
-    if (J = Yp(r, u, c, d, Pe, Ae, k + y), J.length > 0 && J[0] <= Pe && J[1] >= Ae)
-      return [J[0], J[1]];
-  }
-  return [];
-}, vse = function(r, u, c, d, g, b, y) {
-  var k = y, E = Math.min(c, g), C = Math.max(c, g), T = Math.min(d, b), P = Math.max(d, b);
-  return E - k <= r && r <= C + k && T - k <= u && u <= P + k;
-}, gse = function(r, u, c, d, g, b, y, k, E) {
-  var C = {
-    x1: Math.min(c, y, g) - E,
-    x2: Math.max(c, y, g) + E,
-    y1: Math.min(d, k, b) - E,
-    y2: Math.max(d, k, b) + E
-  };
-  return !(r < C.x1 || r > C.x2 || u < C.y1 || u > C.y2);
-}, bse = function(r, u, c, d) {
-  c -= d;
-  var g = u * u - 4 * r * c;
-  if (g < 0)
-    return [];
-  var b = Math.sqrt(g), y = 2 * r, k = (-u + b) / y, E = (-u - b) / y;
-  return [k, E];
-}, pse = function(r, u, c, d, g) {
-  var b = 1e-5;
-  r === 0 && (r = b), u /= r, c /= r, d /= r;
-  var y, k, E, C, T, P, N, D;
-  if (k = (3 * c - u * u) / 9, E = -(27 * d) + u * (9 * c - 2 * (u * u)), E /= 54, y = k * k * k + E * E, g[1] = 0, N = u / 3, y > 0) {
-    T = E + Math.sqrt(y), T = T < 0 ? -Math.pow(-T, 1 / 3) : Math.pow(T, 1 / 3), P = E - Math.sqrt(y), P = P < 0 ? -Math.pow(-P, 1 / 3) : Math.pow(P, 1 / 3), g[0] = -N + T + P, N += (T + P) / 2, g[4] = g[2] = -N, N = Math.sqrt(3) * (-P + T) / 2, g[3] = N, g[5] = -N;
-    return;
-  }
-  if (g[5] = g[3] = 0, y === 0) {
-    D = E < 0 ? -Math.pow(-E, 1 / 3) : Math.pow(E, 1 / 3), g[0] = -N + 2 * D, g[4] = g[2] = -(D + N);
-    return;
-  }
-  k = -k, C = k * k * k, C = Math.acos(E / Math.sqrt(C)), D = 2 * Math.sqrt(k), g[0] = -N + D * Math.cos(C / 3), g[2] = -N + D * Math.cos((C + 2 * Math.PI) / 3), g[4] = -N + D * Math.cos((C + 4 * Math.PI) / 3);
-}, wse = function(r, u, c, d, g, b, y, k) {
-  var E = 1 * c * c - 4 * c * g + 2 * c * y + 4 * g * g - 4 * g * y + y * y + d * d - 4 * d * b + 2 * d * k + 4 * b * b - 4 * b * k + k * k, C = 1 * 9 * c * g - 3 * c * c - 3 * c * y - 6 * g * g + 3 * g * y + 9 * d * b - 3 * d * d - 3 * d * k - 6 * b * b + 3 * b * k, T = 1 * 3 * c * c - 6 * c * g + c * y - c * r + 2 * g * g + 2 * g * r - y * r + 3 * d * d - 6 * d * b + d * k - d * u + 2 * b * b + 2 * b * u - k * u, P = 1 * c * g - c * c + c * r - g * r + d * b - d * d + d * u - b * u, N = [];
-  pse(E, C, T, P, N);
-  for (var D = 1e-7, H = [], _ = 0; _ < 6; _ += 2)
-    Math.abs(N[_ + 1]) < D && N[_] >= 0 && N[_] <= 1 && H.push(N[_]);
-  H.push(1), H.push(0);
-  for (var B = -1, $, F, W, Q = 0; Q < H.length; Q++)
-    $ = Math.pow(1 - H[Q], 2) * c + 2 * (1 - H[Q]) * H[Q] * g + H[Q] * H[Q] * y, F = Math.pow(1 - H[Q], 2) * d + 2 * (1 - H[Q]) * H[Q] * b + H[Q] * H[Q] * k, W = Math.pow($ - r, 2) + Math.pow(F - u, 2), B >= 0 ? W < B && (B = W) : B = W;
-  return B;
-}, mse = function(r, u, c, d, g, b) {
-  var y = [r - c, u - d], k = [g - c, b - d], E = k[0] * k[0] + k[1] * k[1], C = y[0] * y[0] + y[1] * y[1], T = y[0] * k[0] + y[1] * k[1], P = T * T / E;
-  return T < 0 ? C : P > E ? (r - g) * (r - g) + (u - b) * (u - b) : C - P;
-}, Is = function(r, u, c) {
-  for (var d, g, b, y, k, E = 0, C = 0; C < c.length / 2; C++)
-    if (d = c[C * 2], g = c[C * 2 + 1], C + 1 < c.length / 2 ? (b = c[(C + 1) * 2], y = c[(C + 1) * 2 + 1]) : (b = c[(C + 1 - c.length / 2) * 2], y = c[(C + 1 - c.length / 2) * 2 + 1]), !(d == r && b == r))
-      if (d >= r && r >= b || d <= r && r <= b)
-        k = (r - d) / (b - d) * (y - g) + g, k > u && E++;
-      else
-        continue;
-  return E % 2 !== 0;
-}, Ef = function(r, u, c, d, g, b, y, k, E) {
-  var C = new Array(c.length), T;
-  k[0] != null ? (T = Math.atan(k[1] / k[0]), k[0] < 0 ? T = T + Math.PI / 2 : T = -T - Math.PI / 2) : T = k;
-  for (var P = Math.cos(-T), N = Math.sin(-T), D = 0; D < C.length / 2; D++)
-    C[D * 2] = b / 2 * (c[D * 2] * P - c[D * 2 + 1] * N), C[D * 2 + 1] = y / 2 * (c[D * 2 + 1] * P + c[D * 2] * N), C[D * 2] += d, C[D * 2 + 1] += g;
-  var H;
-  if (E > 0) {
-    var _ = i$(C, -E);
-    H = r$(_);
-  } else
-    H = C;
-  return Is(r, u, H);
-}, yse = function(r, u, c, d, g, b, y) {
-  for (var k = new Array(c.length), E = b / 2, C = y / 2, T = A6(b, y), P = T * T, N = 0; N < c.length / 4; N++) {
-    var D = void 0, H = void 0;
-    N === 0 ? D = c.length - 2 : D = N * 4 - 2, H = N * 4 + 2;
-    var _ = d + E * c[N * 4], B = g + C * c[N * 4 + 1], $ = -c[D] * c[H] - c[D + 1] * c[H + 1], F = T / Math.tan(Math.acos($) / 2), W = _ - F * c[D], Q = B - F * c[D + 1], X = _ + F * c[H], K = B + F * c[H + 1];
-    k[N * 4] = W, k[N * 4 + 1] = Q, k[N * 4 + 2] = X, k[N * 4 + 3] = K;
-    var ee = c[D + 1], Z = -c[D], ae = ee * c[H] + Z * c[H + 1];
-    ae < 0 && (ee *= -1, Z *= -1);
-    var oe = W + ee * T, J = Q + Z * T, fe = Math.pow(oe - r, 2) + Math.pow(J - u, 2);
-    if (fe <= P)
-      return !0;
-  }
-  return Is(r, u, k);
-}, r$ = function(r) {
-  for (var u = new Array(r.length / 2), c, d, g, b, y, k, E, C, T = 0; T < r.length / 4; T++) {
-    c = r[T * 4], d = r[T * 4 + 1], g = r[T * 4 + 2], b = r[T * 4 + 3], T < r.length / 4 - 1 ? (y = r[(T + 1) * 4], k = r[(T + 1) * 4 + 1], E = r[(T + 1) * 4 + 2], C = r[(T + 1) * 4 + 3]) : (y = r[0], k = r[1], E = r[2], C = r[3]);
-    var P = Ah(c, d, g, b, y, k, E, C, !0);
-    u[T * 2] = P[0], u[T * 2 + 1] = P[1];
-  }
-  return u;
-}, i$ = function(r, u) {
-  for (var c = new Array(r.length * 2), d, g, b, y, k = 0; k < r.length / 2; k++) {
-    d = r[k * 2], g = r[k * 2 + 1], k < r.length / 2 - 1 ? (b = r[(k + 1) * 2], y = r[(k + 1) * 2 + 1]) : (b = r[0], y = r[1]);
-    var E = y - g, C = -(b - d), T = Math.sqrt(E * E + C * C), P = E / T, N = C / T;
-    c[k * 4] = d + P * u, c[k * 4 + 1] = g + N * u, c[k * 4 + 2] = b + P * u, c[k * 4 + 3] = y + N * u;
-  }
-  return c;
-}, kse = function(r, u, c, d, g, b) {
-  var y = c - r, k = d - u;
-  y /= g, k /= b;
-  var E = Math.sqrt(y * y + k * k), C = E - 1;
-  if (C < 0)
-    return [];
-  var T = C / E;
-  return [(c - r) * T + r, (d - u) * T + u];
-}, lv = function(r, u, c, d, g, b, y) {
-  return r -= g, u -= b, r /= c / 2 + y, u /= d / 2 + y, r * r + u * u <= 1;
-}, Yp = function(r, u, c, d, g, b, y) {
-  var k = [c - r, d - u], E = [r - g, u - b], C = k[0] * k[0] + k[1] * k[1], T = 2 * (E[0] * k[0] + E[1] * k[1]), P = E[0] * E[0] + E[1] * E[1] - y * y, N = T * T - 4 * C * P;
-  if (N < 0)
-    return [];
-  var D = (-T + Math.sqrt(N)) / (2 * C), H = (-T - Math.sqrt(N)) / (2 * C), _ = Math.min(D, H), B = Math.max(D, H), $ = [];
-  if (_ >= 0 && _ <= 1 && $.push(_), B >= 0 && B <= 1 && $.push(B), $.length === 0)
-    return [];
-  var F = $[0] * k[0] + r, W = $[0] * k[1] + u;
-  if ($.length > 1) {
-    if ($[0] == $[1])
-      return [F, W];
-    var Q = $[1] * k[0] + r, X = $[1] * k[1] + u;
-    return [F, W, Q, X];
-  } else
-    return [F, W];
-}, JL = function(r, u, c) {
-  return u <= r && r <= c || c <= r && r <= u ? r : r <= u && u <= c || c <= u && u <= r ? u : c;
-}, Ah = function(r, u, c, d, g, b, y, k, E) {
-  var C = r - g, T = c - r, P = y - g, N = u - b, D = d - u, H = k - b, _ = P * N - H * C, B = T * N - D * C, $ = H * T - P * D;
-  if ($ !== 0) {
-    var F = _ / $, W = B / $, Q = 1e-3, X = 0 - Q, K = 1 + Q;
-    return X <= F && F <= K && X <= W && W <= K ? [r + F * T, u + F * D] : E ? [r + F * T, u + F * D] : [];
-  } else
-    return _ === 0 || B === 0 ? JL(r, c, y) === y ? [y, k] : JL(r, c, g) === g ? [g, b] : JL(g, y, c) === c ? [c, d] : [] : [];
-}, Jp = function(r, u, c, d, g, b, y, k) {
-  var E = [], C, T = new Array(c.length), P = !0;
-  b == null && (P = !1);
-  var N;
-  if (P) {
-    for (var D = 0; D < T.length / 2; D++)
-      T[D * 2] = c[D * 2] * b + d, T[D * 2 + 1] = c[D * 2 + 1] * y + g;
-    if (k > 0) {
-      var H = i$(T, -k);
-      N = r$(H);
-    } else
-      N = T;
-  } else
-    N = c;
-  for (var _, B, $, F, W = 0; W < N.length / 2; W++)
-    _ = N[W * 2], B = N[W * 2 + 1], W < N.length / 2 - 1 ? ($ = N[(W + 1) * 2], F = N[(W + 1) * 2 + 1]) : ($ = N[0], F = N[1]), C = Ah(r, u, d, g, _, B, $, F), C.length !== 0 && E.push(C[0], C[1]);
-  return E;
-}, Ese = function(r, u, c, d, g, b, y, k) {
-  for (var E = [], C, T = new Array(c.length), P = b / 2, N = y / 2, D = A6(b, y), H = 0; H < c.length / 4; H++) {
-    var _ = void 0, B = void 0;
-    H === 0 ? _ = c.length - 2 : _ = H * 4 - 2, B = H * 4 + 2;
-    var $ = d + P * c[H * 4], F = g + N * c[H * 4 + 1], W = -c[_] * c[B] - c[_ + 1] * c[B + 1], Q = D / Math.tan(Math.acos(W) / 2), X = $ - Q * c[_], K = F - Q * c[_ + 1], ee = $ + Q * c[B], Z = F + Q * c[B + 1];
-    H === 0 ? (T[c.length - 2] = X, T[c.length - 1] = K) : (T[H * 4 - 2] = X, T[H * 4 - 1] = K), T[H * 4] = ee, T[H * 4 + 1] = Z;
-    var ae = c[_ + 1], oe = -c[_], J = ae * c[B] + oe * c[B + 1];
-    J < 0 && (ae *= -1, oe *= -1);
-    var fe = X + ae * D, se = K + oe * D;
-    C = Yp(r, u, d, g, fe, se, D), C.length !== 0 && E.push(C[0], C[1]);
-  }
-  for (var pe = 0; pe < T.length / 4; pe++)
-    C = Ah(r, u, d, g, T[pe * 4], T[pe * 4 + 1], T[pe * 4 + 2], T[pe * 4 + 3], !1), C.length !== 0 && E.push(C[0], C[1]);
-  if (E.length > 2) {
-    for (var he = [E[0], E[1]], de = Math.pow(he[0] - r, 2) + Math.pow(he[1] - u, 2), ke = 1; ke < E.length / 2; ke++) {
-      var Pe = Math.pow(E[ke * 2] - r, 2) + Math.pow(E[ke * 2 + 1] - u, 2);
-      Pe <= de && (he[0] = E[ke * 2], he[1] = E[ke * 2 + 1], de = Pe);
-    }
-    return he;
-  }
-  return E;
-}, ME = function(r, u, c) {
-  var d = [r[0] - u[0], r[1] - u[1]], g = Math.sqrt(d[0] * d[0] + d[1] * d[1]), b = (g - c) / g;
-  return b < 0 && (b = 1e-5), [u[0] + b * d[0], u[1] + b * d[1]];
-}, us = function(r, u) {
-  var c = c6(r, u);
-  return c = a$(c), c;
-}, a$ = function(r) {
-  for (var u, c, d = r.length / 2, g = 1 / 0, b = 1 / 0, y = -1 / 0, k = -1 / 0, E = 0; E < d; E++)
-    u = r[2 * E], c = r[2 * E + 1], g = Math.min(g, u), y = Math.max(y, u), b = Math.min(b, c), k = Math.max(k, c);
-  for (var C = 2 / (y - g), T = 2 / (k - b), P = 0; P < d; P++)
-    u = r[2 * P] = r[2 * P] * C, c = r[2 * P + 1] = r[2 * P + 1] * T, g = Math.min(g, u), y = Math.max(y, u), b = Math.min(b, c), k = Math.max(k, c);
-  if (b < -1)
-    for (var N = 0; N < d; N++)
-      c = r[2 * N + 1] = r[2 * N + 1] + (-1 - b);
-  return r;
-}, c6 = function(r, u) {
-  var c = 1 / r * 2 * Math.PI, d = r % 2 === 0 ? Math.PI / 2 + c / 2 : Math.PI / 2;
-  d += u;
-  for (var g = new Array(r * 2), b, y = 0; y < r; y++)
-    b = y * c + d, g[2 * y] = Math.cos(b), g[2 * y + 1] = Math.sin(-b);
-  return g;
-}, lw = function(r, u) {
-  return Math.min(r / 4, u / 4, 8);
-}, A6 = function(r, u) {
-  return Math.min(r / 10, u / 10, 8);
-}, o$ = function() {
-  return 8;
-}, Sse = function(r, u, c) {
-  return [r - 2 * u + c, 2 * (u - r), r];
-}, l6 = function(r, u) {
-  return {
-    heightOffset: Math.min(15, 0.05 * u),
-    widthOffset: Math.min(100, 0.25 * r),
-    ctrlPtOffsetPct: 0.05
-  };
-}, Cse = po({
-  dampingFactor: 0.8,
-  precision: 1e-6,
-  iterations: 200,
-  weight: function(r) {
-    return 1;
-  }
-}), xse = {
-  pageRank: function(r) {
-    for (var u = Cse(r), c = u.dampingFactor, d = u.precision, g = u.iterations, b = u.weight, y = this._private.cy, k = this.byGroup(), E = k.nodes, C = k.edges, T = E.length, P = T * T, N = C.length, D = new Array(P), H = new Array(T), _ = (1 - c) / T, B = 0; B < T; B++) {
-      for (var $ = 0; $ < T; $++) {
-        var F = B * T + $;
-        D[F] = 0;
-      }
-      H[B] = 0;
-    }
-    for (var W = 0; W < N; W++) {
-      var Q = C[W], X = Q.data("source"), K = Q.data("target");
-      if (X !== K) {
-        var ee = E.indexOfId(X), Z = E.indexOfId(K), ae = b(Q), oe = Z * T + ee;
-        D[oe] += ae, H[ee] += ae;
-      }
-    }
-    for (var J = 1 / T + _, fe = 0; fe < T; fe++)
-      if (H[fe] === 0)
-        for (var se = 0; se < T; se++) {
-          var pe = se * T + fe;
-          D[pe] = J;
-        }
-      else
-        for (var he = 0; he < T; he++) {
-          var de = he * T + fe;
-          D[de] = D[de] / H[fe] + _;
-        }
-    for (var ke = new Array(T), Pe = new Array(T), Ae, Te = 0; Te < T; Te++)
-      ke[Te] = 1;
-    for (var Oe = 0; Oe < g; Oe++) {
-      for (var ze = 0; ze < T; ze++)
-        Pe[ze] = 0;
-      for (var We = 0; We < T; We++)
-        for (var $e = 0; $e < T; $e++) {
-          var Ge = We * T + $e;
-          Pe[We] += D[Ge] * ke[$e];
-        }
-      sse(Pe), Ae = ke, ke = Pe, Pe = Ae;
-      for (var me = 0, Ve = 0; Ve < T; Ve++) {
-        var Ke = Ae[Ve] - ke[Ve];
-        me += Ke * Ke;
-      }
-      if (me < d)
-        break;
-    }
-    var at = {
-      rank: function(en) {
-        return en = y.collection(en)[0], ke[E.indexOf(en)];
-      }
-    };
-    return at;
-  }
-  // pageRank
-}, N_ = po({
-  root: null,
-  weight: function(r) {
-    return 1;
-  },
-  directed: !1,
-  alpha: 0
-}), Db = {
-  degreeCentralityNormalized: function(r) {
-    r = N_(r);
-    var u = this.cy(), c = this.nodes(), d = c.length;
-    if (r.directed) {
-      for (var C = {}, T = {}, P = 0, N = 0, D = 0; D < d; D++) {
-        var H = c[D], _ = H.id();
-        r.root = H;
-        var B = this.degreeCentrality(r);
-        P < B.indegree && (P = B.indegree), N < B.outdegree && (N = B.outdegree), C[_] = B.indegree, T[_] = B.outdegree;
-      }
-      return {
-        indegree: function(F) {
-          return P == 0 ? 0 : (qt(F) && (F = u.filter(F)), C[F.id()] / P);
-        },
-        outdegree: function(F) {
-          return N === 0 ? 0 : (qt(F) && (F = u.filter(F)), T[F.id()] / N);
-        }
-      };
-    } else {
-      for (var g = {}, b = 0, y = 0; y < d; y++) {
-        var k = c[y];
-        r.root = k;
-        var E = this.degreeCentrality(r);
-        b < E.degree && (b = E.degree), g[k.id()] = E.degree;
-      }
-      return {
-        degree: function(F) {
-          return b === 0 ? 0 : (qt(F) && (F = u.filter(F)), g[F.id()] / b);
-        }
-      };
-    }
-  },
-  // degreeCentralityNormalized
-  // Implemented from the algorithm in Opsahl's paper
-  // "Node centrality in weighted networks: Generalizing degree and shortest paths"
-  // check the heading 2 "Degree"
-  degreeCentrality: function(r) {
-    r = N_(r);
-    var u = this.cy(), c = this, d = r, g = d.root, b = d.weight, y = d.directed, k = d.alpha;
-    if (g = u.collection(g)[0], y) {
-      for (var N = g.connectedEdges(), D = N.filter(function(X) {
-        return X.target().same(g) && c.has(X);
-      }), H = N.filter(function(X) {
-        return X.source().same(g) && c.has(X);
-      }), _ = D.length, B = H.length, $ = 0, F = 0, W = 0; W < D.length; W++)
-        $ += b(D[W]);
-      for (var Q = 0; Q < H.length; Q++)
-        F += b(H[Q]);
-      return {
-        indegree: Math.pow(_, 1 - k) * Math.pow($, k),
-        outdegree: Math.pow(B, 1 - k) * Math.pow(F, k)
-      };
-    } else {
-      for (var E = g.connectedEdges().intersection(c), C = E.length, T = 0, P = 0; P < E.length; P++)
-        T += b(E[P]);
-      return {
-        degree: Math.pow(C, 1 - k) * Math.pow(T, k)
-      };
-    }
-  }
-  // degreeCentrality
-};
-Db.dc = Db.degreeCentrality;
-Db.dcn = Db.degreeCentralityNormalised = Db.degreeCentralityNormalized;
-var I_ = po({
-  harmonic: !0,
-  weight: function() {
-    return 1;
-  },
-  directed: !1,
-  root: null
-}), jb = {
-  closenessCentralityNormalized: function(r) {
-    for (var u = I_(r), c = u.harmonic, d = u.weight, g = u.directed, b = this.cy(), y = {}, k = 0, E = this.nodes(), C = this.floydWarshall({
-      weight: d,
-      directed: g
-    }), T = 0; T < E.length; T++) {
-      for (var P = 0, N = E[T], D = 0; D < E.length; D++)
-        if (T !== D) {
-          var H = C.distance(N, E[D]);
-          c ? P += 1 / H : P += H;
-        }
-      c || (P = 1 / P), k < P && (k = P), y[N.id()] = P;
-    }
-    return {
-      closeness: function(B) {
-        return k == 0 ? 0 : (qt(B) ? B = b.filter(B)[0].id() : B = B.id(), y[B] / k);
-      }
-    };
-  },
-  // Implemented from pseudocode from wikipedia
-  closenessCentrality: function(r) {
-    var u = I_(r), c = u.root, d = u.weight, g = u.directed, b = u.harmonic;
-    c = this.filter(c)[0];
-    for (var y = this.dijkstra({
-      root: c,
-      weight: d,
-      directed: g
-    }), k = 0, E = this.nodes(), C = 0; C < E.length; C++) {
-      var T = E[C];
-      if (!T.same(c)) {
-        var P = y.distanceTo(T);
-        b ? k += 1 / P : k += P;
-      }
-    }
-    return b ? k : 1 / k;
-  }
-  // closenessCentrality
-};
-jb.cc = jb.closenessCentrality;
-jb.ccn = jb.closenessCentralityNormalised = jb.closenessCentralityNormalized;
-var Tse = po({
-  weight: null,
-  directed: !1
-}), f6 = {
-  // Implemented from the algorithm in the paper "On Variants of Shortest-Path Betweenness Centrality and their Generic Computation" by Ulrik Brandes
-  betweennessCentrality: function(r) {
-    for (var u = Tse(r), c = u.directed, d = u.weight, g = d != null, b = this.cy(), y = this.nodes(), k = {}, E = {}, C = 0, T = {
-      set: function(F, W) {
-        E[F] = W, W > C && (C = W);
-      },
-      get: function(F) {
-        return E[F];
-      }
-    }, P = 0; P < y.length; P++) {
-      var N = y[P], D = N.id();
-      c ? k[D] = N.outgoers().nodes() : k[D] = N.openNeighborhood().nodes(), T.set(D, 0);
-    }
-    for (var H = function(F) {
-      for (var W = y[F].id(), Q = [], X = {}, K = {}, ee = {}, Z = new sw.default(function($e, Ge) {
-        return ee[$e] - ee[Ge];
-      }), ae = 0; ae < y.length; ae++) {
-        var oe = y[ae].id();
-        X[oe] = [], K[oe] = 0, ee[oe] = 1 / 0;
-      }
-      for (K[W] = 1, ee[W] = 0, Z.push(W); !Z.empty(); ) {
-        var J = Z.pop();
-        if (Q.push(J), g)
-          for (var fe = 0; fe < k[J].length; fe++) {
-            var se = k[J][fe], pe = b.getElementById(J), he = void 0;
-            pe.edgesTo(se).length > 0 ? he = pe.edgesTo(se)[0] : he = se.edgesTo(pe)[0];
-            var de = d(he);
-            se = se.id(), ee[se] > ee[J] + de && (ee[se] = ee[J] + de, Z.nodes.indexOf(se) < 0 ? Z.push(se) : Z.updateItem(se), K[se] = 0, X[se] = []), ee[se] == ee[J] + de && (K[se] = K[se] + K[J], X[se].push(J));
-          }
-        else
-          for (var ke = 0; ke < k[J].length; ke++) {
-            var Pe = k[J][ke].id();
-            ee[Pe] == 1 / 0 && (Z.push(Pe), ee[Pe] = ee[J] + 1), ee[Pe] == ee[J] + 1 && (K[Pe] = K[Pe] + K[J], X[Pe].push(J));
-          }
-      }
-      for (var Ae = {}, Te = 0; Te < y.length; Te++)
-        Ae[y[Te].id()] = 0;
-      for (; Q.length > 0; ) {
-        for (var Oe = Q.pop(), ze = 0; ze < X[Oe].length; ze++) {
-          var We = X[Oe][ze];
-          Ae[We] = Ae[We] + K[We] / K[Oe] * (1 + Ae[Oe]);
-        }
-        Oe != y[F].id() && T.set(Oe, T.get(Oe) + Ae[Oe]);
-      }
-    }, _ = 0; _ < y.length; _++)
-      H(_);
-    var B = {
-      betweenness: function(F) {
-        var W = b.collection(F).id();
-        return T.get(W);
-      },
-      betweennessNormalized: function(F) {
-        if (C == 0)
-          return 0;
-        var W = b.collection(F).id();
-        return T.get(W) / C;
-      }
-    };
-    return B.betweennessNormalised = B.betweennessNormalized, B;
-  }
-  // betweennessCentrality
-};
-f6.bc = f6.betweennessCentrality;
-var Lse = po({
-  expandFactor: 2,
-  // affects time of computation and cluster granularity to some extent: M * M
-  inflateFactor: 2,
-  // affects cluster granularity (the greater the value, the more clusters): M(i,j) / E(j)
-  multFactor: 1,
-  // optional self loops for each node. Use a neutral value to improve cluster computations.
-  maxIterations: 20,
-  // maximum number of iterations of the MCL algorithm in a single run
-  attributes: [
-    // attributes/features used to group nodes, ie. similarity values between nodes
-    function(a) {
-      return 1;
-    }
-  ]
-}), Pse = function(r) {
-  return Lse(r);
-}, Dse = function(r, u) {
-  for (var c = 0, d = 0; d < u.length; d++)
-    c += u[d](r);
-  return c;
-}, jse = function(r, u, c) {
-  for (var d = 0; d < u; d++)
-    r[d * u + d] = c;
-}, s$ = function(r, u) {
-  for (var c, d = 0; d < u; d++) {
-    c = 0;
-    for (var g = 0; g < u; g++)
-      c += r[g * u + d];
-    for (var b = 0; b < u; b++)
-      r[b * u + d] = r[b * u + d] / c;
-  }
-}, Nse = function(r, u, c) {
-  for (var d = new Array(c * c), g = 0; g < c; g++) {
-    for (var b = 0; b < c; b++)
-      d[g * c + b] = 0;
-    for (var y = 0; y < c; y++)
-      for (var k = 0; k < c; k++)
-        d[g * c + k] += r[g * c + y] * u[y * c + k];
-  }
-  return d;
-}, Ise = function(r, u, c) {
-  for (var d = r.slice(0), g = 1; g < c; g++)
-    r = Nse(r, d, u);
-  return r;
-}, Mse = function(r, u, c) {
-  for (var d = new Array(u * u), g = 0; g < u * u; g++)
-    d[g] = Math.pow(r[g], c);
-  return s$(d, u), d;
-}, Ose = function(r, u, c, d) {
-  for (var g = 0; g < c; g++) {
-    var b = Math.round(r[g] * Math.pow(10, d)) / Math.pow(10, d), y = Math.round(u[g] * Math.pow(10, d)) / Math.pow(10, d);
-    if (b !== y)
-      return !1;
-  }
-  return !0;
-}, Ase = function(r, u, c, d) {
-  for (var g = [], b = 0; b < u; b++) {
-    for (var y = [], k = 0; k < u; k++)
-      Math.round(r[b * u + k] * 1e3) / 1e3 > 0 && y.push(c[k]);
-    y.length !== 0 && g.push(d.collection(y));
-  }
-  return g;
-}, Rse = function(r, u) {
-  for (var c = 0; c < r.length; c++)
-    if (!u[c] || r[c].id() !== u[c].id())
-      return !1;
-  return !0;
-}, Bse = function(r) {
-  for (var u = 0; u < r.length; u++)
-    for (var c = 0; c < r.length; c++)
-      u != c && Rse(r[u], r[c]) && r.splice(c, 1);
-  return r;
-}, M_ = function(r) {
-  for (var u = this.nodes(), c = this.edges(), d = this.cy(), g = Pse(r), b = {}, y = 0; y < u.length; y++)
-    b[u[y].id()] = y;
-  for (var k = u.length, E = k * k, C = new Array(E), T, P = 0; P < E; P++)
-    C[P] = 0;
-  for (var N = 0; N < c.length; N++) {
-    var D = c[N], H = b[D.source().id()], _ = b[D.target().id()], B = Dse(D, g.attributes);
-    C[H * k + _] += B, C[_ * k + H] += B;
-  }
-  jse(C, k, g.multFactor), s$(C, k);
-  for (var $ = !0, F = 0; $ && F < g.maxIterations; )
-    $ = !1, T = Ise(C, k, g.expandFactor), C = Mse(T, k, g.inflateFactor), Ose(C, T, E, 4) || ($ = !0), F++;
-  var W = Ase(C, k, u, d);
-  return W = Bse(W), W;
-}, zse = {
-  markovClustering: M_,
-  mcl: M_
-}, Hse = function(r) {
-  return r;
-}, u$ = function(r, u) {
-  return Math.abs(u - r);
-}, O_ = function(r, u, c) {
-  return r + u$(u, c);
-}, A_ = function(r, u, c) {
-  return r + Math.pow(c - u, 2);
-}, _se = function(r) {
-  return Math.sqrt(r);
-}, Gse = function(r, u, c) {
-  return Math.max(r, u$(u, c));
-}, Bp = function(r, u, c, d, g) {
-  for (var b = arguments.length > 5 && arguments[5] !== void 0 ? arguments[5] : Hse, y = d, k, E, C = 0; C < r; C++)
-    k = u(C), E = c(C), y = g(y, k, E);
-  return b(y);
-}, Mb = {
-  euclidean: function(r, u, c) {
-    return r >= 2 ? Bp(r, u, c, 0, A_, _se) : Bp(r, u, c, 0, O_);
-  },
-  squaredEuclidean: function(r, u, c) {
-    return Bp(r, u, c, 0, A_);
-  },
-  manhattan: function(r, u, c) {
-    return Bp(r, u, c, 0, O_);
-  },
-  max: function(r, u, c) {
-    return Bp(r, u, c, -1 / 0, Gse);
-  }
-};
-Mb["squared-euclidean"] = Mb.squaredEuclidean;
-Mb.squaredeuclidean = Mb.squaredEuclidean;
-function v5(a, r, u, c, d, g) {
-  var b;
-  return zi(a) ? b = a : b = Mb[a] || Mb.euclidean, r === 0 && zi(a) ? b(d, g) : b(r, u, c, d, g);
-}
-var $se = po({
-  k: 2,
-  m: 2,
-  sensitivityThreshold: 1e-4,
-  distance: "euclidean",
-  maxIterations: 10,
-  attributes: [],
-  testMode: !1,
-  testCentroids: null
-}), R6 = function(r) {
-  return $se(r);
-}, JE = function(r, u, c, d, g) {
-  var b = g !== "kMedoids", y = b ? function(T) {
-    return c[T];
-  } : function(T) {
-    return d[T](c);
-  }, k = function(P) {
-    return d[P](u);
-  }, E = c, C = u;
-  return v5(r, d.length, y, k, E, C);
-}, e6 = function(r, u, c) {
-  for (var d = c.length, g = new Array(d), b = new Array(d), y = new Array(u), k = null, E = 0; E < d; E++)
-    g[E] = r.min(c[E]).value, b[E] = r.max(c[E]).value;
-  for (var C = 0; C < u; C++) {
-    k = [];
-    for (var T = 0; T < d; T++)
-      k[T] = Math.random() * (b[T] - g[T]) + g[T];
-    y[C] = k;
-  }
-  return y;
-}, c$ = function(r, u, c, d, g) {
-  for (var b = 1 / 0, y = 0, k = 0; k < u.length; k++) {
-    var E = JE(c, r, u[k], d, g);
-    E < b && (b = E, y = k);
-  }
-  return y;
-}, l$ = function(r, u, c) {
-  for (var d = [], g = null, b = 0; b < u.length; b++)
-    g = u[b], c[g.id()] === r && d.push(g);
-  return d;
-}, Yse = function(r, u, c) {
-  return Math.abs(u - r) <= c;
-}, Fse = function(r, u, c) {
-  for (var d = 0; d < r.length; d++)
-    for (var g = 0; g < r[d].length; g++) {
-      var b = Math.abs(r[d][g] - u[d][g]);
-      if (b > c)
-        return !1;
-    }
-  return !0;
-}, qse = function(r, u, c) {
-  for (var d = 0; d < c; d++)
-    if (r === u[d])
-      return !0;
-  return !1;
-}, R_ = function(r, u) {
-  var c = new Array(u);
-  if (r.length < 50)
-    for (var d = 0; d < u; d++) {
-      for (var g = r[Math.floor(Math.random() * r.length)]; qse(g, c, d); )
-        g = r[Math.floor(Math.random() * r.length)];
-      c[d] = g;
-    }
-  else
-    for (var b = 0; b < u; b++)
-      c[b] = r[Math.floor(Math.random() * r.length)];
-  return c;
-}, B_ = function(r, u, c) {
-  for (var d = 0, g = 0; g < u.length; g++)
-    d += JE("manhattan", u[g], r, c, "kMedoids");
-  return d;
-}, Vse = function(r) {
-  var u = this.cy(), c = this.nodes(), d = null, g = R6(r), b = new Array(g.k), y = {}, k;
-  g.testMode ? typeof g.testCentroids == "number" ? (g.testCentroids, k = e6(c, g.k, g.attributes)) : Ra(g.testCentroids) === "object" ? k = g.testCentroids : k = e6(c, g.k, g.attributes) : k = e6(c, g.k, g.attributes);
-  for (var E = !0, C = 0; E && C < g.maxIterations; ) {
-    for (var T = 0; T < c.length; T++)
-      d = c[T], y[d.id()] = c$(d, k, g.distance, g.attributes, "kMeans");
-    E = !1;
-    for (var P = 0; P < g.k; P++) {
-      var N = l$(P, c, y);
-      if (N.length !== 0) {
-        for (var D = g.attributes.length, H = k[P], _ = new Array(D), B = new Array(D), $ = 0; $ < D; $++) {
-          B[$] = 0;
-          for (var F = 0; F < N.length; F++)
-            d = N[F], B[$] += g.attributes[$](d);
-          _[$] = B[$] / N.length, Yse(_[$], H[$], g.sensitivityThreshold) || (E = !0);
-        }
-        k[P] = _, b[P] = u.collection(N);
-      }
-    }
-    C++;
-  }
-  return b;
-}, Wse = function(r) {
-  var u = this.cy(), c = this.nodes(), d = null, g = R6(r), b = new Array(g.k), y, k = {}, E, C = new Array(g.k);
-  g.testMode ? typeof g.testCentroids == "number" || (Ra(g.testCentroids) === "object" ? y = g.testCentroids : y = R_(c, g.k)) : y = R_(c, g.k);
-  for (var T = !0, P = 0; T && P < g.maxIterations; ) {
-    for (var N = 0; N < c.length; N++)
-      d = c[N], k[d.id()] = c$(d, y, g.distance, g.attributes, "kMedoids");
-    T = !1;
-    for (var D = 0; D < y.length; D++) {
-      var H = l$(D, c, k);
-      if (H.length !== 0) {
-        C[D] = B_(y[D], H, g.attributes);
-        for (var _ = 0; _ < H.length; _++)
-          E = B_(H[_], H, g.attributes), E < C[D] && (C[D] = E, y[D] = H[_], T = !0);
-        b[D] = u.collection(H);
-      }
-    }
-    P++;
-  }
-  return b;
-}, Use = function(r, u, c, d, g) {
-  for (var b, y, k = 0; k < u.length; k++)
-    for (var E = 0; E < r.length; E++)
-      d[k][E] = Math.pow(c[k][E], g.m);
-  for (var C = 0; C < r.length; C++)
-    for (var T = 0; T < g.attributes.length; T++) {
-      b = 0, y = 0;
-      for (var P = 0; P < u.length; P++)
-        b += d[P][C] * g.attributes[T](u[P]), y += d[P][C];
-      r[C][T] = b / y;
-    }
-}, Kse = function(r, u, c, d, g) {
-  for (var b = 0; b < r.length; b++)
-    u[b] = r[b].slice();
-  for (var y, k, E, C = 2 / (g.m - 1), T = 0; T < c.length; T++)
-    for (var P = 0; P < d.length; P++) {
-      y = 0;
-      for (var N = 0; N < c.length; N++)
-        k = JE(g.distance, d[P], c[T], g.attributes, "cmeans"), E = JE(g.distance, d[P], c[N], g.attributes, "cmeans"), y += Math.pow(k / E, C);
-      r[P][T] = 1 / y;
-    }
-}, Zse = function(r, u, c, d) {
-  for (var g = new Array(c.k), b = 0; b < g.length; b++)
-    g[b] = [];
-  for (var y, k, E = 0; E < u.length; E++) {
-    y = -1 / 0, k = -1;
-    for (var C = 0; C < u[0].length; C++)
-      u[E][C] > y && (y = u[E][C], k = C);
-    g[k].push(r[E]);
-  }
-  for (var T = 0; T < g.length; T++)
-    g[T] = d.collection(g[T]);
-  return g;
-}, z_ = function(r) {
-  var u = this.cy(), c = this.nodes(), d = R6(r), g, b, y, k, E;
-  k = new Array(c.length);
-  for (var C = 0; C < c.length; C++)
-    k[C] = new Array(d.k);
-  y = new Array(c.length);
-  for (var T = 0; T < c.length; T++)
-    y[T] = new Array(d.k);
-  for (var P = 0; P < c.length; P++) {
-    for (var N = 0, D = 0; D < d.k; D++)
-      y[P][D] = Math.random(), N += y[P][D];
-    for (var H = 0; H < d.k; H++)
-      y[P][H] = y[P][H] / N;
-  }
-  b = new Array(d.k);
-  for (var _ = 0; _ < d.k; _++)
-    b[_] = new Array(d.attributes.length);
-  E = new Array(c.length);
-  for (var B = 0; B < c.length; B++)
-    E[B] = new Array(d.k);
-  for (var $ = !0, F = 0; $ && F < d.maxIterations; )
-    $ = !1, Use(b, c, y, E, d), Kse(y, k, b, c, d), Fse(y, k, d.sensitivityThreshold) || ($ = !0), F++;
-  return g = Zse(c, y, d, u), {
-    clusters: g,
-    degreeOfMembership: y
-  };
-}, Xse = {
-  kMeans: Vse,
-  kMedoids: Wse,
-  fuzzyCMeans: z_,
-  fcm: z_
-}, Qse = po({
-  distance: "euclidean",
-  // distance metric to compare nodes
-  linkage: "min",
-  // linkage criterion : how to determine the distance between clusters of nodes
-  mode: "threshold",
-  // mode:'threshold' => clusters must be threshold distance apart
-  threshold: 1 / 0,
-  // the distance threshold
-  // mode:'dendrogram' => the nodes are organised as leaves in a tree (siblings are close), merging makes clusters
-  addDendrogram: !1,
-  // whether to add the dendrogram to the graph for viz
-  dendrogramDepth: 0,
-  // depth at which dendrogram branches are merged into the returned clusters
-  attributes: []
-  // array of attr functions
-}), Jse = {
-  single: "min",
-  complete: "max"
-}, eue = function(r) {
-  var u = Qse(r), c = Jse[u.linkage];
-  return c != null && (u.linkage = c), u;
-}, H_ = function(r, u, c, d, g) {
-  for (var b = 0, y = 1 / 0, k, E = g.attributes, C = function(Z, ae) {
-    return v5(g.distance, E.length, function(oe) {
-      return E[oe](Z);
-    }, function(oe) {
-      return E[oe](ae);
-    }, Z, ae);
-  }, T = 0; T < r.length; T++) {
-    var P = r[T].key, N = c[P][d[P]];
-    N < y && (b = P, y = N);
-  }
-  if (g.mode === "threshold" && y >= g.threshold || g.mode === "dendrogram" && r.length === 1)
-    return !1;
-  var D = u[b], H = u[d[b]], _;
-  g.mode === "dendrogram" ? _ = {
-    left: D,
-    right: H,
-    key: D.key
-  } : _ = {
-    value: D.value.concat(H.value),
-    key: D.key
-  }, r[D.index] = _, r.splice(H.index, 1), u[D.key] = _;
-  for (var B = 0; B < r.length; B++) {
-    var $ = r[B];
-    D.key === $.key ? k = 1 / 0 : g.linkage === "min" ? (k = c[D.key][$.key], c[D.key][$.key] > c[H.key][$.key] && (k = c[H.key][$.key])) : g.linkage === "max" ? (k = c[D.key][$.key], c[D.key][$.key] < c[H.key][$.key] && (k = c[H.key][$.key])) : g.linkage === "mean" ? k = (c[D.key][$.key] * D.size + c[H.key][$.key] * H.size) / (D.size + H.size) : g.mode === "dendrogram" ? k = C($.value, D.value) : k = C($.value[0], D.value[0]), c[D.key][$.key] = c[$.key][D.key] = k;
-  }
-  for (var F = 0; F < r.length; F++) {
-    var W = r[F].key;
-    if (d[W] === D.key || d[W] === H.key) {
-      for (var Q = W, X = 0; X < r.length; X++) {
-        var K = r[X].key;
-        c[W][K] < c[W][Q] && (Q = K);
-      }
-      d[W] = Q;
-    }
-    r[F].index = F;
-  }
-  return D.key = H.key = D.index = H.index = null, !0;
-}, OE = function a(r, u, c) {
-  r && (r.value ? u.push(r.value) : (r.left && a(r.left, u), r.right && a(r.right, u)));
-}, tue = function a(r, u) {
-  if (!r)
-    return "";
-  if (r.left && r.right) {
-    var c = a(r.left, u), d = a(r.right, u), g = u.add({
-      group: "nodes",
-      data: {
-        id: c + "," + d
-      }
-    });
-    return u.add({
-      group: "edges",
-      data: {
-        source: c,
-        target: g.id()
-      }
-    }), u.add({
-      group: "edges",
-      data: {
-        source: d,
-        target: g.id()
-      }
-    }), g.id();
-  } else if (r.value)
-    return r.value.id();
-}, nue = function a(r, u, c) {
-  if (!r)
-    return [];
-  var d = [], g = [], b = [];
-  return u === 0 ? (r.left && OE(r.left, d), r.right && OE(r.right, g), b = d.concat(g), [c.collection(b)]) : u === 1 ? r.value ? [c.collection(r.value)] : (r.left && OE(r.left, d), r.right && OE(r.right, g), [c.collection(d), c.collection(g)]) : r.value ? [c.collection(r.value)] : (r.left && (d = a(r.left, u - 1, c)), r.right && (g = a(r.right, u - 1, c)), d.concat(g));
-}, __ = function(r) {
-  for (var u = this.cy(), c = this.nodes(), d = eue(r), g = d.attributes, b = function(F, W) {
-    return v5(d.distance, g.length, function(Q) {
-      return g[Q](F);
-    }, function(Q) {
-      return g[Q](W);
-    }, F, W);
-  }, y = [], k = [], E = [], C = [], T = 0; T < c.length; T++) {
-    var P = {
-      value: d.mode === "dendrogram" ? c[T] : [c[T]],
-      key: T,
-      index: T
-    };
-    y[T] = P, C[T] = P, k[T] = [], E[T] = 0;
-  }
-  for (var N = 0; N < y.length; N++)
-    for (var D = 0; D <= N; D++) {
-      var H = void 0;
-      d.mode === "dendrogram" ? H = N === D ? 1 / 0 : b(y[N].value, y[D].value) : H = N === D ? 1 / 0 : b(y[N].value[0], y[D].value[0]), k[N][D] = H, k[D][N] = H, H < k[N][E[N]] && (E[N] = D);
-    }
-  for (var _ = H_(y, C, k, E, d); _; )
-    _ = H_(y, C, k, E, d);
-  var B;
-  return d.mode === "dendrogram" ? (B = nue(y[0], d.dendrogramDepth, u), d.addDendrogram && tue(y[0], u)) : (B = new Array(y.length), y.forEach(function($, F) {
-    $.key = $.index = null, B[F] = u.collection($.value);
-  })), B;
-}, rue = {
-  hierarchicalClustering: __,
-  hca: __
-}, iue = po({
-  distance: "euclidean",
-  // distance metric to compare attributes between two nodes
-  preference: "median",
-  // suitability of a data point to serve as an exemplar
-  damping: 0.8,
-  // damping factor between [0.5, 1)
-  maxIterations: 1e3,
-  // max number of iterations to run
-  minIterations: 100,
-  // min number of iterations to run in order for clustering to stop
-  attributes: [
-    // functions to quantify the similarity between any two points
-    // e.g. node => node.data('weight')
-  ]
-}), aue = function(r) {
-  var u = r.damping, c = r.preference;
-  0.5 <= u && u < 1 || Qi("Damping must range on [0.5, 1).  Got: ".concat(u));
-  var d = ["median", "mean", "min", "max"];
-  return d.some(function(g) {
-    return g === c;
-  }) || kt(c) || Qi("Preference must be one of [".concat(d.map(function(g) {
-    return "'".concat(g, "'");
-  }).join(", "), "] or a number.  Got: ").concat(c)), iue(r);
-}, oue = function(r, u, c, d) {
-  var g = function(y, k) {
-    return d[k](y);
-  };
-  return -v5(r, d.length, function(b) {
-    return g(u, b);
-  }, function(b) {
-    return g(c, b);
-  }, u, c);
-}, sue = function(r, u) {
-  var c = null;
-  return u === "median" ? c = ase(r) : u === "mean" ? c = ise(r) : u === "min" ? c = nse(r) : u === "max" ? c = rse(r) : c = u, c;
-}, uue = function(r, u, c) {
-  for (var d = [], g = 0; g < r; g++)
-    u[g * r + g] + c[g * r + g] > 0 && d.push(g);
-  return d;
-}, G_ = function(r, u, c) {
-  for (var d = [], g = 0; g < r; g++) {
-    for (var b = -1, y = -1 / 0, k = 0; k < c.length; k++) {
-      var E = c[k];
-      u[g * r + E] > y && (b = E, y = u[g * r + E]);
-    }
-    b > 0 && d.push(b);
-  }
-  for (var C = 0; C < c.length; C++)
-    d[c[C]] = c[C];
-  return d;
-}, cue = function(r, u, c) {
-  for (var d = G_(r, u, c), g = 0; g < c.length; g++) {
-    for (var b = [], y = 0; y < d.length; y++)
-      d[y] === c[g] && b.push(y);
-    for (var k = -1, E = -1 / 0, C = 0; C < b.length; C++) {
-      for (var T = 0, P = 0; P < b.length; P++)
-        T += u[b[P] * r + b[C]];
-      T > E && (k = C, E = T);
-    }
-    c[g] = b[k];
-  }
-  return d = G_(r, u, c), d;
-}, $_ = function(r) {
-  for (var u = this.cy(), c = this.nodes(), d = aue(r), g = {}, b = 0; b < c.length; b++)
-    g[c[b].id()] = b;
-  var y, k, E, C, T, P;
-  y = c.length, k = y * y, E = new Array(k);
-  for (var N = 0; N < k; N++)
-    E[N] = -1 / 0;
-  for (var D = 0; D < y; D++)
-    for (var H = 0; H < y; H++)
-      D !== H && (E[D * y + H] = oue(d.distance, c[D], c[H], d.attributes));
-  C = sue(E, d.preference);
-  for (var _ = 0; _ < y; _++)
-    E[_ * y + _] = C;
-  T = new Array(k);
-  for (var B = 0; B < k; B++)
-    T[B] = 0;
-  P = new Array(k);
-  for (var $ = 0; $ < k; $++)
-    P[$] = 0;
-  for (var F = new Array(y), W = new Array(y), Q = new Array(y), X = 0; X < y; X++)
-    F[X] = 0, W[X] = 0, Q[X] = 0;
-  for (var K = new Array(y * d.minIterations), ee = 0; ee < K.length; ee++)
-    K[ee] = 0;
-  var Z;
-  for (Z = 0; Z < d.maxIterations; Z++) {
-    for (var ae = 0; ae < y; ae++) {
-      for (var oe = -1 / 0, J = -1 / 0, fe = -1, se = 0, pe = 0; pe < y; pe++)
-        F[pe] = T[ae * y + pe], se = P[ae * y + pe] + E[ae * y + pe], se >= oe ? (J = oe, oe = se, fe = pe) : se > J && (J = se);
-      for (var he = 0; he < y; he++)
-        T[ae * y + he] = (1 - d.damping) * (E[ae * y + he] - oe) + d.damping * F[he];
-      T[ae * y + fe] = (1 - d.damping) * (E[ae * y + fe] - J) + d.damping * F[fe];
-    }
-    for (var de = 0; de < y; de++) {
-      for (var ke = 0, Pe = 0; Pe < y; Pe++)
-        F[Pe] = P[Pe * y + de], W[Pe] = Math.max(0, T[Pe * y + de]), ke += W[Pe];
-      ke -= W[de], W[de] = T[de * y + de], ke += W[de];
-      for (var Ae = 0; Ae < y; Ae++)
-        P[Ae * y + de] = (1 - d.damping) * Math.min(0, ke - W[Ae]) + d.damping * F[Ae];
-      P[de * y + de] = (1 - d.damping) * (ke - W[de]) + d.damping * F[de];
-    }
-    for (var Te = 0, Oe = 0; Oe < y; Oe++) {
-      var ze = P[Oe * y + Oe] + T[Oe * y + Oe] > 0 ? 1 : 0;
-      K[Z % d.minIterations * y + Oe] = ze, Te += ze;
-    }
-    if (Te > 0 && (Z >= d.minIterations - 1 || Z == d.maxIterations - 1)) {
-      for (var We = 0, $e = 0; $e < y; $e++) {
-        Q[$e] = 0;
-        for (var Ge = 0; Ge < d.minIterations; Ge++)
-          Q[$e] += K[Ge * y + $e];
-        (Q[$e] === 0 || Q[$e] === d.minIterations) && We++;
-      }
-      if (We === y)
-        break;
-    }
-  }
-  for (var me = uue(y, T, P), Ve = cue(y, E, me), Ke = {}, at = 0; at < me.length; at++)
-    Ke[me[at]] = [];
-  for (var ft = 0; ft < c.length; ft++) {
-    var en = g[c[ft].id()], gn = Ve[en];
-    gn != null && Ke[gn].push(c[ft]);
-  }
-  for (var mt = new Array(me.length), ht = 0; ht < me.length; ht++)
-    mt[ht] = u.collection(Ke[me[ht]]);
-  return mt;
-}, lue = {
-  affinityPropagation: $_,
-  ap: $_
-}, fue = po({
-  root: void 0,
-  directed: !1
-}), hue = {
-  hierholzer: function(r) {
-    if (!fr(r)) {
-      var u = arguments;
-      r = {
-        root: u[0],
-        directed: u[1]
-      };
-    }
-    var c = fue(r), d = c.root, g = c.directed, b = this, y = !1, k, E, C;
-    d && (C = qt(d) ? this.filter(d)[0].id() : d[0].id());
-    var T = {}, P = {};
-    g ? b.forEach(function($) {
-      var F = $.id();
-      if ($.isNode()) {
-        var W = $.indegree(!0), Q = $.outdegree(!0), X = W - Q, K = Q - W;
-        X == 1 ? k ? y = !0 : k = F : K == 1 ? E ? y = !0 : E = F : (K > 1 || X > 1) && (y = !0), T[F] = [], $.outgoers().forEach(function(ee) {
-          ee.isEdge() && T[F].push(ee.id());
-        });
-      } else
-        P[F] = [void 0, $.target().id()];
-    }) : b.forEach(function($) {
-      var F = $.id();
-      if ($.isNode()) {
-        var W = $.degree(!0);
-        W % 2 && (k ? E ? y = !0 : E = F : k = F), T[F] = [], $.connectedEdges().forEach(function(Q) {
-          return T[F].push(Q.id());
-        });
-      } else
-        P[F] = [$.source().id(), $.target().id()];
-    });
-    var N = {
-      found: !1,
-      trail: void 0
-    };
-    if (y)
-      return N;
-    if (E && k)
-      if (g) {
-        if (C && E != C)
-          return N;
-        C = E;
-      } else {
-        if (C && E != C && k != C)
-          return N;
-        C || (C = E);
-      }
-    else
-      C || (C = b[0].id());
-    var D = function(F) {
-      for (var W = F, Q = [F], X, K, ee; T[W].length; )
-        X = T[W].shift(), K = P[X][0], ee = P[X][1], W != ee ? (T[ee] = T[ee].filter(function(Z) {
-          return Z != X;
-        }), W = ee) : !g && W != K && (T[K] = T[K].filter(function(Z) {
-          return Z != X;
-        }), W = K), Q.unshift(X), Q.unshift(W);
-      return Q;
-    }, H = [], _ = [];
-    for (_ = D(C); _.length != 1; )
-      T[_[0]].length == 0 ? (H.unshift(b.getElementById(_.shift())), H.unshift(b.getElementById(_.shift()))) : _ = D(_.shift()).concat(_);
-    H.unshift(b.getElementById(_.shift()));
-    for (var B in T)
-      if (T[B].length)
-        return N;
-    return N.found = !0, N.trail = this.spawn(H, !0), N;
-  }
-}, AE = function() {
-  var r = this, u = {}, c = 0, d = 0, g = [], b = [], y = {}, k = function(P, N) {
-    for (var D = b.length - 1, H = [], _ = r.spawn(); b[D].x != P || b[D].y != N; )
-      H.push(b.pop().edge), D--;
-    H.push(b.pop().edge), H.forEach(function(B) {
-      var $ = B.connectedNodes().intersection(r);
-      _.merge(B), $.forEach(function(F) {
-        var W = F.id(), Q = F.connectedEdges().intersection(r);
-        _.merge(F), u[W].cutVertex ? _.merge(Q.filter(function(X) {
-          return X.isLoop();
-        })) : _.merge(Q);
-      });
-    }), g.push(_);
-  }, E = function T(P, N, D) {
-    P === D && (d += 1), u[N] = {
-      id: c,
-      low: c++,
-      cutVertex: !1
-    };
-    var H = r.getElementById(N).connectedEdges().intersection(r);
-    if (H.size() === 0)
-      g.push(r.spawn(r.getElementById(N)));
-    else {
-      var _, B, $, F;
-      H.forEach(function(W) {
-        _ = W.source().id(), B = W.target().id(), $ = _ === N ? B : _, $ !== D && (F = W.id(), y[F] || (y[F] = !0, b.push({
-          x: N,
-          y: $,
-          edge: W
-        })), $ in u ? u[N].low = Math.min(u[N].low, u[$].id) : (T(P, $, N), u[N].low = Math.min(u[N].low, u[$].low), u[N].id <= u[$].low && (u[N].cutVertex = !0, k(N, $))));
-      });
-    }
-  };
-  r.forEach(function(T) {
-    if (T.isNode()) {
-      var P = T.id();
-      P in u || (d = 0, E(P, P), u[P].cutVertex = d > 1);
-    }
-  });
-  var C = Object.keys(u).filter(function(T) {
-    return u[T].cutVertex;
-  }).map(function(T) {
-    return r.getElementById(T);
-  });
-  return {
-    cut: r.spawn(C),
-    components: g
-  };
-}, due = {
-  hopcroftTarjanBiconnected: AE,
-  htbc: AE,
-  htb: AE,
-  hopcroftTarjanBiconnectedComponents: AE
-}, RE = function() {
-  var r = this, u = {}, c = 0, d = [], g = [], b = r.spawn(r), y = function k(E) {
-    g.push(E), u[E] = {
-      index: c,
-      low: c++,
-      explored: !1
-    };
-    var C = r.getElementById(E).connectedEdges().intersection(r);
-    if (C.forEach(function(H) {
-      var _ = H.target().id();
-      _ !== E && (_ in u || k(_), u[_].explored || (u[E].low = Math.min(u[E].low, u[_].low)));
-    }), u[E].index === u[E].low) {
-      for (var T = r.spawn(); ; ) {
-        var P = g.pop();
-        if (T.merge(r.getElementById(P)), u[P].low = u[E].index, u[P].explored = !0, P === E)
-          break;
-      }
-      var N = T.edgesWith(T), D = T.merge(N);
-      d.push(D), b = b.difference(D);
-    }
-  };
-  return r.forEach(function(k) {
-    if (k.isNode()) {
-      var E = k.id();
-      E in u || y(E);
-    }
-  }), {
-    cut: b,
-    components: d
-  };
-}, vue = {
-  tarjanStronglyConnected: RE,
-  tsc: RE,
-  tscc: RE,
-  tarjanStronglyConnectedComponents: RE
-}, f$ = {};
-[Xp, Foe, qoe, Woe, Koe, Xoe, ese, xse, Db, jb, f6, zse, Xse, rue, lue, hue, due, vue].forEach(function(a) {
-  on(f$, a);
-});
-/*!
-Embeddable Minimum Strictly-Compliant Promises/A+ 1.1.1 Thenable
-Copyright (c) 2013-2014 Ralf S. Engelschall (http://engelschall.com)
-Licensed under The MIT License (http://opensource.org/licenses/MIT)
-*/
-var h$ = 0, d$ = 1, v$ = 2, Sf = function a(r) {
-  if (!(this instanceof a))
-    return new a(r);
-  this.id = "Thenable/1.0.7", this.state = h$, this.fulfillValue = void 0, this.rejectReason = void 0, this.onFulfilled = [], this.onRejected = [], this.proxy = {
-    then: this.then.bind(this)
-  }, typeof r == "function" && r.call(this, this.fulfill.bind(this), this.reject.bind(this));
-};
-Sf.prototype = {
-  /*  promise resolving methods  */
-  fulfill: function(r) {
-    return Y_(this, d$, "fulfillValue", r);
-  },
-  reject: function(r) {
-    return Y_(this, v$, "rejectReason", r);
-  },
-  /*  "The then Method" [Promises/A+ 1.1, 1.2, 2.2]  */
-  then: function(r, u) {
-    var c = this, d = new Sf();
-    return c.onFulfilled.push(q_(r, d, "fulfill")), c.onRejected.push(q_(u, d, "reject")), g$(c), d.proxy;
-  }
-};
-var Y_ = function(r, u, c, d) {
-  return r.state === h$ && (r.state = u, r[c] = d, g$(r)), r;
-}, g$ = function(r) {
-  r.state === d$ ? F_(r, "onFulfilled", r.fulfillValue) : r.state === v$ && F_(r, "onRejected", r.rejectReason);
-}, F_ = function(r, u, c) {
-  if (r[u].length !== 0) {
-    var d = r[u];
-    r[u] = [];
-    var g = function() {
-      for (var y = 0; y < d.length; y++)
-        d[y](c);
-    };
-    typeof setImmediate == "function" ? setImmediate(g) : setTimeout(g, 0);
-  }
-}, q_ = function(r, u, c) {
-  return function(d) {
-    if (typeof r != "function")
-      u[c].call(u, d);
-    else {
-      var g;
-      try {
-        g = r(d);
-      } catch (b) {
-        u.reject(b);
-        return;
-      }
-      gue(u, g);
-    }
-  };
-}, gue = function a(r, u) {
-  if (r === u || r.proxy === u) {
-    r.reject(new TypeError("cannot resolve promise with itself"));
-    return;
-  }
-  var c;
-  if (Ra(u) === "object" && u !== null || typeof u == "function")
-    try {
-      c = u.then;
-    } catch (g) {
-      r.reject(g);
-      return;
-    }
-  if (typeof c == "function") {
-    var d = !1;
-    try {
-      c.call(
-        u,
-        /*  resolvePromise  */
-        /*  [Promises/A+ 2.3.3.3.1]  */
-        function(g) {
-          d || (d = !0, g === u ? r.reject(new TypeError("circular thenable chain")) : a(r, g));
-        },
-        /*  rejectPromise  */
-        /*  [Promises/A+ 2.3.3.3.2]  */
-        function(g) {
-          d || (d = !0, r.reject(g));
-        }
-      );
-    } catch (g) {
-      d || r.reject(g);
-    }
-    return;
-  }
-  r.fulfill(u);
-};
-Sf.all = function(a) {
-  return new Sf(function(r, u) {
-    for (var c = new Array(a.length), d = 0, g = function(k, E) {
-      c[k] = E, d++, d === a.length && r(c);
-    }, b = 0; b < a.length; b++)
-      (function(y) {
-        var k = a[y], E = k != null && k.then != null;
-        if (E)
-          k.then(function(T) {
-            g(y, T);
-          }, function(T) {
-            u(T);
-          });
-        else {
-          var C = k;
-          g(y, C);
-        }
-      })(b);
-  });
-};
-Sf.resolve = function(a) {
-  return new Sf(function(r, u) {
-    r(a);
-  });
-};
-Sf.reject = function(a) {
-  return new Sf(function(r, u) {
-    u(a);
-  });
-};
-var Hb = typeof Promise < "u" ? Promise : Sf, h6 = function(r, u, c) {
-  var d = P6(r), g = !d, b = this._private = on({
-    duration: 1e3
-  }, u, c);
-  if (b.target = r, b.style = b.style || b.css, b.started = !1, b.playing = !1, b.hooked = !1, b.applying = !1, b.progress = 0, b.completes = [], b.frames = [], b.complete && zi(b.complete) && b.completes.push(b.complete), g) {
-    var y = r.position();
-    b.startPosition = b.startPosition || {
-      x: y.x,
-      y: y.y
-    }, b.startStyle = b.startStyle || r.cy().style().getAnimationStartStyle(r, b.style);
-  }
-  if (d) {
-    var k = r.pan();
-    b.startPan = {
-      x: k.x,
-      y: k.y
-    }, b.startZoom = r.zoom();
-  }
-  this.length = 1, this[0] = this;
-}, dv = h6.prototype;
-on(dv, {
-  instanceString: function() {
-    return "animation";
-  },
-  hook: function() {
-    var r = this._private;
-    if (!r.hooked) {
-      var u, c = r.target._private.animation;
-      r.queue ? u = c.queue : u = c.current, u.push(this), tu(r.target) && r.target.cy().addToAnimationPool(r.target), r.hooked = !0;
-    }
-    return this;
-  },
-  play: function() {
-    var r = this._private;
-    return r.progress === 1 && (r.progress = 0), r.playing = !0, r.started = !1, r.stopped = !1, this.hook(), this;
-  },
-  playing: function() {
-    return this._private.playing;
-  },
-  apply: function() {
-    var r = this._private;
-    return r.applying = !0, r.started = !1, r.stopped = !1, this.hook(), this;
-  },
-  applying: function() {
-    return this._private.applying;
-  },
-  pause: function() {
-    var r = this._private;
-    return r.playing = !1, r.started = !1, this;
-  },
-  stop: function() {
-    var r = this._private;
-    return r.playing = !1, r.started = !1, r.stopped = !0, this;
-  },
-  rewind: function() {
-    return this.progress(0);
-  },
-  fastforward: function() {
-    return this.progress(1);
-  },
-  time: function(r) {
-    var u = this._private;
-    return r === void 0 ? u.progress * u.duration : this.progress(r / u.duration);
-  },
-  progress: function(r) {
-    var u = this._private, c = u.playing;
-    return r === void 0 ? u.progress : (c && this.pause(), u.progress = r, u.started = !1, c && this.play(), this);
-  },
-  completed: function() {
-    return this._private.progress === 1;
-  },
-  reverse: function() {
-    var r = this._private, u = r.playing;
-    u && this.pause(), r.progress = 1 - r.progress, r.started = !1;
-    var c = function(E, C) {
-      var T = r[E];
-      T != null && (r[E] = r[C], r[C] = T);
-    };
-    if (c("zoom", "startZoom"), c("pan", "startPan"), c("position", "startPosition"), r.style)
-      for (var d = 0; d < r.style.length; d++) {
-        var g = r.style[d], b = g.name, y = r.startStyle[b];
-        r.startStyle[b] = g, r.style[d] = y;
-      }
-    return u && this.play(), this;
-  },
-  promise: function(r) {
-    var u = this._private, c;
-    switch (r) {
-      case "frame":
-        c = u.frames;
-        break;
-      default:
-      case "complete":
-      case "completed":
-        c = u.completes;
-    }
-    return new Hb(function(d, g) {
-      c.push(function() {
-        d();
-      });
-    });
-  }
-});
-dv.complete = dv.completed;
-dv.run = dv.play;
-dv.running = dv.playing;
-var bue = {
-  animated: function() {
-    return function() {
-      var u = this, c = u.length !== void 0, d = c ? u : [u], g = this._private.cy || this;
-      if (!g.styleEnabled())
-        return !1;
-      var b = d[0];
-      if (b)
-        return b._private.animation.current.length > 0;
-    };
-  },
-  // animated
-  clearQueue: function() {
-    return function() {
-      var u = this, c = u.length !== void 0, d = c ? u : [u], g = this._private.cy || this;
-      if (!g.styleEnabled())
-        return this;
-      for (var b = 0; b < d.length; b++) {
-        var y = d[b];
-        y._private.animation.queue = [];
-      }
-      return this;
-    };
-  },
-  // clearQueue
-  delay: function() {
-    return function(u, c) {
-      var d = this._private.cy || this;
-      return d.styleEnabled() ? this.animate({
-        delay: u,
-        duration: u,
-        complete: c
-      }) : this;
-    };
-  },
-  // delay
-  delayAnimation: function() {
-    return function(u, c) {
-      var d = this._private.cy || this;
-      return d.styleEnabled() ? this.animation({
-        delay: u,
-        duration: u,
-        complete: c
-      }) : this;
-    };
-  },
-  // delay
-  animation: function() {
-    return function(u, c) {
-      var d = this, g = d.length !== void 0, b = g ? d : [d], y = this._private.cy || this, k = !g, E = !k;
-      if (!y.styleEnabled())
-        return this;
-      var C = y.style();
-      u = on({}, u, c);
-      var T = Object.keys(u).length === 0;
-      if (T)
-        return new h6(b[0], u);
-      switch (u.duration === void 0 && (u.duration = 400), u.duration) {
-        case "slow":
-          u.duration = 600;
-          break;
-        case "fast":
-          u.duration = 200;
-          break;
-      }
-      if (E && (u.style = C.getPropsList(u.style || u.css), u.css = void 0), E && u.renderedPosition != null) {
-        var P = u.renderedPosition, N = y.pan(), D = y.zoom();
-        u.position = JG(P, D, N);
-      }
-      if (k && u.panBy != null) {
-        var H = u.panBy, _ = y.pan();
-        u.pan = {
-          x: _.x + H.x,
-          y: _.y + H.y
-        };
-      }
-      var B = u.center || u.centre;
-      if (k && B != null) {
-        var $ = y.getCenterPan(B.eles, u.zoom);
-        $ != null && (u.pan = $);
-      }
-      if (k && u.fit != null) {
-        var F = u.fit, W = y.getFitViewport(F.eles || F.boundingBox, F.padding);
-        W != null && (u.pan = W.pan, u.zoom = W.zoom);
-      }
-      if (k && fr(u.zoom)) {
-        var Q = y.getZoomedViewport(u.zoom);
-        Q != null ? (Q.zoomed && (u.zoom = Q.zoom), Q.panned && (u.pan = Q.pan)) : u.zoom = null;
-      }
-      return new h6(b[0], u);
-    };
-  },
-  // animate
-  animate: function() {
-    return function(u, c) {
-      var d = this, g = d.length !== void 0, b = g ? d : [d], y = this._private.cy || this;
-      if (!y.styleEnabled())
-        return this;
-      c && (u = on({}, u, c));
-      for (var k = 0; k < b.length; k++) {
-        var E = b[k], C = E.animated() && (u.queue === void 0 || u.queue), T = E.animation(u, C ? {
-          queue: !0
-        } : void 0);
-        T.play();
-      }
-      return this;
-    };
-  },
-  // animate
-  stop: function() {
-    return function(u, c) {
-      var d = this, g = d.length !== void 0, b = g ? d : [d], y = this._private.cy || this;
-      if (!y.styleEnabled())
-        return this;
-      for (var k = 0; k < b.length; k++) {
-        for (var E = b[k], C = E._private, T = C.animation.current, P = 0; P < T.length; P++) {
-          var N = T[P], D = N._private;
-          c && (D.duration = 0);
-        }
-        u && (C.animation.queue = []), c || (C.animation.current = []);
-      }
-      return y.notify("draw"), this;
-    };
-  }
-  // stop
-}, pue = {
-  // access data field
-  data: function(r) {
-    var u = {
-      field: "data",
-      bindingEvent: "data",
-      allowBinding: !1,
-      allowSetting: !1,
-      allowGetting: !1,
-      settingEvent: "data",
-      settingTriggersEvent: !1,
-      triggerFnName: "trigger",
-      immutableKeys: {},
-      // key => true if immutable
-      updateStyle: !1,
-      beforeGet: function(d) {
-      },
-      beforeSet: function(d, g) {
-      },
-      onSet: function(d) {
-      },
-      canSet: function(d) {
-        return !0;
-      }
-    };
-    return r = on({}, u, r), function(d, g) {
-      var b = r, y = this, k = y.length !== void 0, E = k ? y : [y], C = k ? y[0] : y;
-      if (qt(d)) {
-        var T = d.indexOf(".") !== -1, P = T && noe.default(d);
-        if (b.allowGetting && g === void 0) {
-          var N;
-          return C && (b.beforeGet(C), P && C._private[b.field][d] === void 0 ? N = eoe.default(C._private[b.field], P) : N = C._private[b.field][d]), N;
-        } else if (b.allowSetting && g !== void 0) {
-          var D = !b.immutableKeys[d];
-          if (D) {
-            var H = BG({}, d, g);
-            b.beforeSet(y, H);
-            for (var _ = 0, B = E.length; _ < B; _++) {
-              var $ = E[_];
-              b.canSet($) && (P && C._private[b.field][d] === void 0 ? toe.default($._private[b.field], P, g) : $._private[b.field][d] = g);
-            }
-            b.updateStyle && y.updateStyle(), b.onSet(y), b.settingTriggersEvent && y[b.triggerFnName](b.settingEvent);
-          }
-        }
-      } else if (b.allowSetting && fr(d)) {
-        var F = d, W, Q, X = Object.keys(F);
-        b.beforeSet(y, F);
-        for (var K = 0; K < X.length; K++) {
-          W = X[K], Q = F[W];
-          var ee = !b.immutableKeys[W];
-          if (ee)
-            for (var Z = 0; Z < E.length; Z++) {
-              var ae = E[Z];
-              b.canSet(ae) && (ae._private[b.field][W] = Q);
-            }
-        }
-        b.updateStyle && y.updateStyle(), b.onSet(y), b.settingTriggersEvent && y[b.triggerFnName](b.settingEvent);
-      } else if (b.allowBinding && zi(d)) {
-        var oe = d;
-        y.on(b.bindingEvent, oe);
-      } else if (b.allowGetting && d === void 0) {
-        var J;
-        return C && (b.beforeGet(C), J = C._private[b.field]), J;
-      }
-      return y;
-    };
-  },
-  // data
-  // remove data field
-  removeData: function(r) {
-    var u = {
-      field: "data",
-      event: "data",
-      triggerFnName: "trigger",
-      triggerEvent: !1,
-      immutableKeys: {}
-      // key => true if immutable
-    };
-    return r = on({}, u, r), function(d) {
-      var g = r, b = this, y = b.length !== void 0, k = y ? b : [b];
-      if (qt(d)) {
-        for (var E = d.split(/\s+/), C = E.length, T = 0; T < C; T++) {
-          var P = E[T];
-          if (!zh(P)) {
-            var N = !g.immutableKeys[P];
-            if (N)
-              for (var D = 0, H = k.length; D < H; D++)
-                k[D]._private[g.field][P] = void 0;
-          }
-        }
-        g.triggerEvent && b[g.triggerFnName](g.event);
-      } else if (d === void 0) {
-        for (var _ = 0, B = k.length; _ < B; _++)
-          for (var $ = k[_]._private[g.field], F = Object.keys($), W = 0; W < F.length; W++) {
-            var Q = F[W], X = !g.immutableKeys[Q];
-            X && ($[Q] = void 0);
-          }
-        g.triggerEvent && b[g.triggerFnName](g.event);
-      }
-      return b;
-    };
-  }
-  // removeData
-}, wue = {
-  eventAliasesOn: function(r) {
-    var u = r;
-    u.addListener = u.listen = u.bind = u.on, u.unlisten = u.unbind = u.off = u.removeListener, u.trigger = u.emit, u.pon = u.promiseOn = function(c, d) {
-      var g = this, b = Array.prototype.slice.call(arguments, 0);
-      return new Hb(function(y, k) {
-        var E = function(N) {
-          g.off.apply(g, T), y(N);
-        }, C = b.concat([E]), T = C.concat([]);
-        g.on.apply(g, C);
-      });
-    };
-  }
-}, Mr = {};
-[bue, pue, wue].forEach(function(a) {
-  on(Mr, a);
-});
-var mue = {
-  animate: Mr.animate(),
-  animation: Mr.animation(),
-  animated: Mr.animated(),
-  clearQueue: Mr.clearQueue(),
-  delay: Mr.delay(),
-  delayAnimation: Mr.delayAnimation(),
-  stop: Mr.stop()
-}, FE = {
-  classes: function(r) {
-    var u = this;
-    if (r === void 0) {
-      var c = [];
-      return u[0]._private.classes.forEach(function(D) {
-        return c.push(D);
-      }), c;
-    } else
-      Qr(r) || (r = (r || "").match(/\S+/g) || []);
-    for (var d = [], g = new zb(r), b = 0; b < u.length; b++) {
-      for (var y = u[b], k = y._private, E = k.classes, C = !1, T = 0; T < r.length; T++) {
-        var P = r[T], N = E.has(P);
-        if (!N) {
-          C = !0;
-          break;
-        }
-      }
-      C || (C = E.size !== r.length), C && (k.classes = g, d.push(y));
-    }
-    return d.length > 0 && this.spawn(d).updateStyle().emit("class"), u;
-  },
-  addClass: function(r) {
-    return this.toggleClass(r, !0);
-  },
-  hasClass: function(r) {
-    var u = this[0];
-    return u != null && u._private.classes.has(r);
-  },
-  toggleClass: function(r, u) {
-    Qr(r) || (r = r.match(/\S+/g) || []);
-    for (var c = this, d = u === void 0, g = [], b = 0, y = c.length; b < y; b++)
-      for (var k = c[b], E = k._private.classes, C = !1, T = 0; T < r.length; T++) {
-        var P = r[T], N = E.has(P), D = !1;
-        u || d && !N ? (E.add(P), D = !0) : (!u || d && N) && (E.delete(P), D = !0), !C && D && (g.push(k), C = !0);
-      }
-    return g.length > 0 && this.spawn(g).updateStyle().emit("class"), c;
-  },
-  removeClass: function(r) {
-    return this.toggleClass(r, !1);
-  },
-  flashClass: function(r, u) {
-    var c = this;
-    if (u == null)
-      u = 250;
-    else if (u === 0)
-      return c;
-    return c.addClass(r), setTimeout(function() {
-      c.removeClass(r);
-    }, u), c;
-  }
-};
-FE.className = FE.classNames = FE.classes;
-var lr = {
-  metaChar: "[\\!\\\"\\#\\$\\%\\&\\'\\(\\)\\*\\+\\,\\.\\/\\:\\;\\<\\=\\>\\?\\@\\[\\]\\^\\`\\{\\|\\}\\~]",
-  // chars we need to escape in let names, etc
-  comparatorOp: "=|\\!=|>|>=|<|<=|\\$=|\\^=|\\*=",
-  // binary comparison op (used in data selectors)
-  boolOp: "\\?|\\!|\\^",
-  // boolean (unary) operators (used in data selectors)
-  string: `"(?:\\\\"|[^"])*"|'(?:\\\\'|[^'])*'`,
-  // string literals (used in data selectors) -- doublequotes | singlequotes
-  number: Aa,
-  // number literal (used in data selectors) --- e.g. 0.1234, 1234, 12e123
-  meta: "degree|indegree|outdegree",
-  // allowed metadata fields (i.e. allowed functions to use from Collection)
-  separator: "\\s*,\\s*",
-  // queries are separated by commas, e.g. edge[foo = 'bar'], node.someClass
-  descendant: "\\s+",
-  child: "\\s+>\\s+",
-  subject: "\\$",
-  group: "node|edge|\\*",
-  directedEdge: "\\s+->\\s+",
-  undirectedEdge: "\\s+<->\\s+"
-};
-lr.variable = "(?:[\\w-.]|(?:\\\\" + lr.metaChar + "))+";
-lr.className = "(?:[\\w-]|(?:\\\\" + lr.metaChar + "))+";
-lr.value = lr.string + "|" + lr.number;
-lr.id = lr.variable;
-(function() {
-  var a, r, u;
-  for (a = lr.comparatorOp.split("|"), u = 0; u < a.length; u++)
-    r = a[u], lr.comparatorOp += "|@" + r;
-  for (a = lr.comparatorOp.split("|"), u = 0; u < a.length; u++)
-    r = a[u], !(r.indexOf("!") >= 0) && r !== "=" && (lr.comparatorOp += "|\\!" + r);
-})();
-var Vr = function() {
-  return {
-    checks: []
-  };
-}, It = {
-  /** E.g. node */
-  GROUP: 0,
-  /** A collection of elements */
-  COLLECTION: 1,
-  /** A filter(ele) function */
-  FILTER: 2,
-  /** E.g. [foo > 1] */
-  DATA_COMPARE: 3,
-  /** E.g. [foo] */
-  DATA_EXIST: 4,
-  /** E.g. [?foo] */
-  DATA_BOOL: 5,
-  /** E.g. [[degree > 2]] */
-  META_COMPARE: 6,
-  /** E.g. :selected */
-  STATE: 7,
-  /** E.g. #foo */
-  ID: 8,
-  /** E.g. .foo */
-  CLASS: 9,
-  /** E.g. #foo <-> #bar */
-  UNDIRECTED_EDGE: 10,
-  /** E.g. #foo -> #bar */
-  DIRECTED_EDGE: 11,
-  /** E.g. $#foo -> #bar */
-  NODE_SOURCE: 12,
-  /** E.g. #foo -> $#bar */
-  NODE_TARGET: 13,
-  /** E.g. $#foo <-> #bar */
-  NODE_NEIGHBOR: 14,
-  /** E.g. #foo > #bar */
-  CHILD: 15,
-  /** E.g. #foo #bar */
-  DESCENDANT: 16,
-  /** E.g. $#foo > #bar */
-  PARENT: 17,
-  /** E.g. $#foo #bar */
-  ANCESTOR: 18,
-  /** E.g. #foo > $bar > #baz */
-  COMPOUND_SPLIT: 19,
-  /** Always matches, useful placeholder for subject in `COMPOUND_SPLIT` */
-  TRUE: 20
-}, d6 = [{
-  selector: ":selected",
-  matches: function(r) {
-    return r.selected();
-  }
-}, {
-  selector: ":unselected",
-  matches: function(r) {
-    return !r.selected();
-  }
-}, {
-  selector: ":selectable",
-  matches: function(r) {
-    return r.selectable();
-  }
-}, {
-  selector: ":unselectable",
-  matches: function(r) {
-    return !r.selectable();
-  }
-}, {
-  selector: ":locked",
-  matches: function(r) {
-    return r.locked();
-  }
-}, {
-  selector: ":unlocked",
-  matches: function(r) {
-    return !r.locked();
-  }
-}, {
-  selector: ":visible",
-  matches: function(r) {
-    return r.visible();
-  }
-}, {
-  selector: ":hidden",
-  matches: function(r) {
-    return !r.visible();
-  }
-}, {
-  selector: ":transparent",
-  matches: function(r) {
-    return r.transparent();
-  }
-}, {
-  selector: ":grabbed",
-  matches: function(r) {
-    return r.grabbed();
-  }
-}, {
-  selector: ":free",
-  matches: function(r) {
-    return !r.grabbed();
-  }
-}, {
-  selector: ":removed",
-  matches: function(r) {
-    return r.removed();
-  }
-}, {
-  selector: ":inside",
-  matches: function(r) {
-    return !r.removed();
-  }
-}, {
-  selector: ":grabbable",
-  matches: function(r) {
-    return r.grabbable();
-  }
-}, {
-  selector: ":ungrabbable",
-  matches: function(r) {
-    return !r.grabbable();
-  }
-}, {
-  selector: ":animated",
-  matches: function(r) {
-    return r.animated();
-  }
-}, {
-  selector: ":unanimated",
-  matches: function(r) {
-    return !r.animated();
-  }
-}, {
-  selector: ":parent",
-  matches: function(r) {
-    return r.isParent();
-  }
-}, {
-  selector: ":childless",
-  matches: function(r) {
-    return r.isChildless();
-  }
-}, {
-  selector: ":child",
-  matches: function(r) {
-    return r.isChild();
-  }
-}, {
-  selector: ":orphan",
-  matches: function(r) {
-    return r.isOrphan();
-  }
-}, {
-  selector: ":nonorphan",
-  matches: function(r) {
-    return r.isChild();
-  }
-}, {
-  selector: ":compound",
-  matches: function(r) {
-    return r.isNode() ? r.isParent() : r.source().isParent() || r.target().isParent();
-  }
-}, {
-  selector: ":loop",
-  matches: function(r) {
-    return r.isLoop();
-  }
-}, {
-  selector: ":simple",
-  matches: function(r) {
-    return r.isSimple();
-  }
-}, {
-  selector: ":active",
-  matches: function(r) {
-    return r.active();
-  }
-}, {
-  selector: ":inactive",
-  matches: function(r) {
-    return !r.active();
-  }
-}, {
-  selector: ":backgrounding",
-  matches: function(r) {
-    return r.backgrounding();
-  }
-}, {
-  selector: ":nonbackgrounding",
-  matches: function(r) {
-    return !r.backgrounding();
-  }
-}].sort(function(a, r) {
-  return Soe(a.selector, r.selector);
-}), yue = function() {
-  for (var a = {}, r, u = 0; u < d6.length; u++)
-    r = d6[u], a[r.selector] = r.matches;
-  return a;
-}(), kue = function(r, u) {
-  return yue[r](u);
-}, Eue = "(" + d6.map(function(a) {
-  return a.selector;
-}).join("|") + ")", mb = function(r) {
-  return r.replace(new RegExp("\\\\(" + lr.metaChar + ")", "g"), function(u, c) {
-    return c;
-  });
-}, Mh = function(r, u, c) {
-  r[r.length - 1] = c;
-}, v6 = [{
-  name: "group",
-  // just used for identifying when debugging
-  query: !0,
-  regex: "(" + lr.group + ")",
-  populate: function(r, u, c) {
-    var d = kc(c, 1), g = d[0];
-    u.checks.push({
-      type: It.GROUP,
-      value: g === "*" ? g : g + "s"
-    });
-  }
-}, {
-  name: "state",
-  query: !0,
-  regex: Eue,
-  populate: function(r, u, c) {
-    var d = kc(c, 1), g = d[0];
-    u.checks.push({
-      type: It.STATE,
-      value: g
-    });
-  }
-}, {
-  name: "id",
-  query: !0,
-  regex: "\\#(" + lr.id + ")",
-  populate: function(r, u, c) {
-    var d = kc(c, 1), g = d[0];
-    u.checks.push({
-      type: It.ID,
-      value: mb(g)
-    });
-  }
-}, {
-  name: "className",
-  query: !0,
-  regex: "\\.(" + lr.className + ")",
-  populate: function(r, u, c) {
-    var d = kc(c, 1), g = d[0];
-    u.checks.push({
-      type: It.CLASS,
-      value: mb(g)
-    });
-  }
-}, {
-  name: "dataExists",
-  query: !0,
-  regex: "\\[\\s*(" + lr.variable + ")\\s*\\]",
-  populate: function(r, u, c) {
-    var d = kc(c, 1), g = d[0];
-    u.checks.push({
-      type: It.DATA_EXIST,
-      field: mb(g)
-    });
-  }
-}, {
-  name: "dataCompare",
-  query: !0,
-  regex: "\\[\\s*(" + lr.variable + ")\\s*(" + lr.comparatorOp + ")\\s*(" + lr.value + ")\\s*\\]",
-  populate: function(r, u, c) {
-    var d = kc(c, 3), g = d[0], b = d[1], y = d[2], k = new RegExp("^" + lr.string + "$").exec(y) != null;
-    k ? y = y.substring(1, y.length - 1) : y = parseFloat(y), u.checks.push({
-      type: It.DATA_COMPARE,
-      field: mb(g),
-      operator: b,
-      value: y
-    });
-  }
-}, {
-  name: "dataBool",
-  query: !0,
-  regex: "\\[\\s*(" + lr.boolOp + ")\\s*(" + lr.variable + ")\\s*\\]",
-  populate: function(r, u, c) {
-    var d = kc(c, 2), g = d[0], b = d[1];
-    u.checks.push({
-      type: It.DATA_BOOL,
-      field: mb(b),
-      operator: g
-    });
-  }
-}, {
-  name: "metaCompare",
-  query: !0,
-  regex: "\\[\\[\\s*(" + lr.meta + ")\\s*(" + lr.comparatorOp + ")\\s*(" + lr.number + ")\\s*\\]\\]",
-  populate: function(r, u, c) {
-    var d = kc(c, 3), g = d[0], b = d[1], y = d[2];
-    u.checks.push({
-      type: It.META_COMPARE,
-      field: mb(g),
-      operator: b,
-      value: parseFloat(y)
-    });
-  }
-}, {
-  name: "nextQuery",
-  separator: !0,
-  regex: lr.separator,
-  populate: function(r, u) {
-    var c = r.currentSubject, d = r.edgeCount, g = r.compoundCount, b = r[r.length - 1];
-    c != null && (b.subject = c, r.currentSubject = null), b.edgeCount = d, b.compoundCount = g, r.edgeCount = 0, r.compoundCount = 0;
-    var y = r[r.length++] = Vr();
-    return y;
-  }
-}, {
-  name: "directedEdge",
-  separator: !0,
-  regex: lr.directedEdge,
-  populate: function(r, u) {
-    if (r.currentSubject == null) {
-      var c = Vr(), d = u, g = Vr();
-      return c.checks.push({
-        type: It.DIRECTED_EDGE,
-        source: d,
-        target: g
-      }), Mh(r, u, c), r.edgeCount++, g;
-    } else {
-      var b = Vr(), y = u, k = Vr();
-      return b.checks.push({
-        type: It.NODE_SOURCE,
-        source: y,
-        target: k
-      }), Mh(r, u, b), r.edgeCount++, k;
-    }
-  }
-}, {
-  name: "undirectedEdge",
-  separator: !0,
-  regex: lr.undirectedEdge,
-  populate: function(r, u) {
-    if (r.currentSubject == null) {
-      var c = Vr(), d = u, g = Vr();
-      return c.checks.push({
-        type: It.UNDIRECTED_EDGE,
-        nodes: [d, g]
-      }), Mh(r, u, c), r.edgeCount++, g;
-    } else {
-      var b = Vr(), y = u, k = Vr();
-      return b.checks.push({
-        type: It.NODE_NEIGHBOR,
-        node: y,
-        neighbor: k
-      }), Mh(r, u, b), k;
-    }
-  }
-}, {
-  name: "child",
-  separator: !0,
-  regex: lr.child,
-  populate: function(r, u) {
-    if (r.currentSubject == null) {
-      var c = Vr(), d = Vr(), g = r[r.length - 1];
-      return c.checks.push({
-        type: It.CHILD,
-        parent: g,
-        child: d
-      }), Mh(r, u, c), r.compoundCount++, d;
-    } else if (r.currentSubject === u) {
-      var b = Vr(), y = r[r.length - 1], k = Vr(), E = Vr(), C = Vr(), T = Vr();
-      return b.checks.push({
-        type: It.COMPOUND_SPLIT,
-        left: y,
-        right: k,
-        subject: E
-      }), E.checks = u.checks, u.checks = [{
-        type: It.TRUE
-      }], T.checks.push({
-        type: It.TRUE
-      }), k.checks.push({
-        type: It.PARENT,
-        // type is swapped on right side queries
-        parent: T,
-        child: C
-        // empty for now
-      }), Mh(r, y, b), r.currentSubject = E, r.compoundCount++, C;
-    } else {
-      var P = Vr(), N = Vr(), D = [{
-        type: It.PARENT,
-        parent: P,
-        child: N
-      }];
-      return P.checks = u.checks, u.checks = D, r.compoundCount++, N;
-    }
-  }
-}, {
-  name: "descendant",
-  separator: !0,
-  regex: lr.descendant,
-  populate: function(r, u) {
-    if (r.currentSubject == null) {
-      var c = Vr(), d = Vr(), g = r[r.length - 1];
-      return c.checks.push({
-        type: It.DESCENDANT,
-        ancestor: g,
-        descendant: d
-      }), Mh(r, u, c), r.compoundCount++, d;
-    } else if (r.currentSubject === u) {
-      var b = Vr(), y = r[r.length - 1], k = Vr(), E = Vr(), C = Vr(), T = Vr();
-      return b.checks.push({
-        type: It.COMPOUND_SPLIT,
-        left: y,
-        right: k,
-        subject: E
-      }), E.checks = u.checks, u.checks = [{
-        type: It.TRUE
-      }], T.checks.push({
-        type: It.TRUE
-      }), k.checks.push({
-        type: It.ANCESTOR,
-        // type is swapped on right side queries
-        ancestor: T,
-        descendant: C
-        // empty for now
-      }), Mh(r, y, b), r.currentSubject = E, r.compoundCount++, C;
-    } else {
-      var P = Vr(), N = Vr(), D = [{
-        type: It.ANCESTOR,
-        ancestor: P,
-        descendant: N
-      }];
-      return P.checks = u.checks, u.checks = D, r.compoundCount++, N;
-    }
-  }
-}, {
-  name: "subject",
-  modifier: !0,
-  regex: lr.subject,
-  populate: function(r, u) {
-    if (r.currentSubject != null && r.currentSubject !== u)
-      return Sr("Redefinition of subject in selector `" + r.toString() + "`"), !1;
-    r.currentSubject = u;
-    var c = r[r.length - 1], d = c.checks[0], g = d == null ? null : d.type;
-    g === It.DIRECTED_EDGE ? d.type = It.NODE_TARGET : g === It.UNDIRECTED_EDGE && (d.type = It.NODE_NEIGHBOR, d.node = d.nodes[1], d.neighbor = d.nodes[0], d.nodes = null);
-  }
-}];
-v6.forEach(function(a) {
-  return a.regexObj = new RegExp("^" + a.regex);
-});
-var Sue = function(r) {
-  for (var u, c, d, g = 0; g < v6.length; g++) {
-    var b = v6[g], y = b.name, k = r.match(b.regexObj);
-    if (k != null) {
-      c = k, u = b, d = y;
-      var E = k[0];
-      r = r.substring(E.length);
-      break;
-    }
-  }
-  return {
-    expr: u,
-    match: c,
-    name: d,
-    remaining: r
-  };
-}, Cue = function(r) {
-  var u = r.match(/^\s+/);
-  if (u) {
-    var c = u[0];
-    r = r.substring(c.length);
-  }
-  return r;
-}, xue = function(r) {
-  var u = this, c = u.inputText = r, d = u[0] = Vr();
-  for (u.length = 1, c = Cue(c); ; ) {
-    var g = Sue(c);
-    if (g.expr == null)
-      return Sr("The selector `" + r + "`is invalid"), !1;
-    var b = g.match.slice(1), y = g.expr.populate(u, d, b);
-    if (y === !1)
-      return !1;
-    if (y != null && (d = y), c = g.remaining, c.match(/^\s*$/))
-      break;
-  }
-  var k = u[u.length - 1];
-  u.currentSubject != null && (k.subject = u.currentSubject), k.edgeCount = u.edgeCount, k.compoundCount = u.compoundCount;
-  for (var E = 0; E < u.length; E++) {
-    var C = u[E];
-    if (C.compoundCount > 0 && C.edgeCount > 0)
-      return Sr("The selector `" + r + "` is invalid because it uses both a compound selector and an edge selector"), !1;
-    if (C.edgeCount > 1)
-      return Sr("The selector `" + r + "` is invalid because it uses multiple edge selectors"), !1;
-    C.edgeCount === 1 && Sr("The selector `" + r + "` is deprecated.  Edge selectors do not take effect on changes to source and target nodes after an edge is added, for performance reasons.  Use a class or data selector on edges instead, updating the class or data of an edge when your app detects a change in source or target nodes.");
-  }
-  return !0;
-}, Tue = function() {
-  if (this.toStringCache != null)
-    return this.toStringCache;
-  for (var r = function(C) {
-    return C ?? "";
-  }, u = function(C) {
-    return qt(C) ? '"' + C + '"' : r(C);
-  }, c = function(C) {
-    return " " + C + " ";
-  }, d = function(C, T) {
-    var P = C.type, N = C.value;
-    switch (P) {
-      case It.GROUP: {
-        var D = r(N);
-        return D.substring(0, D.length - 1);
-      }
-      case It.DATA_COMPARE: {
-        var H = C.field, _ = C.operator;
-        return "[" + H + c(r(_)) + u(N) + "]";
-      }
-      case It.DATA_BOOL: {
-        var B = C.operator, $ = C.field;
-        return "[" + r(B) + $ + "]";
-      }
-      case It.DATA_EXIST: {
-        var F = C.field;
-        return "[" + F + "]";
-      }
-      case It.META_COMPARE: {
-        var W = C.operator, Q = C.field;
-        return "[[" + Q + c(r(W)) + u(N) + "]]";
-      }
-      case It.STATE:
-        return N;
-      case It.ID:
-        return "#" + N;
-      case It.CLASS:
-        return "." + N;
-      case It.PARENT:
-      case It.CHILD:
-        return g(C.parent, T) + c(">") + g(C.child, T);
-      case It.ANCESTOR:
-      case It.DESCENDANT:
-        return g(C.ancestor, T) + " " + g(C.descendant, T);
-      case It.COMPOUND_SPLIT: {
-        var X = g(C.left, T), K = g(C.subject, T), ee = g(C.right, T);
-        return X + (X.length > 0 ? " " : "") + K + ee;
-      }
-      case It.TRUE:
-        return "";
-    }
-  }, g = function(C, T) {
-    return C.checks.reduce(function(P, N, D) {
-      return P + (T === C && D === 0 ? "$" : "") + d(N, T);
-    }, "");
-  }, b = "", y = 0; y < this.length; y++) {
-    var k = this[y];
-    b += g(k, k.subject), this.length > 1 && y < this.length - 1 && (b += ", ");
-  }
-  return this.toStringCache = b, b;
-}, Lue = {
-  parse: xue,
-  toString: Tue
-}, b$ = function(r, u, c) {
-  var d, g = qt(r), b = kt(r), y = qt(c), k, E, C = !1, T = !1, P = !1;
-  switch (u.indexOf("!") >= 0 && (u = u.replace("!", ""), T = !0), u.indexOf("@") >= 0 && (u = u.replace("@", ""), C = !0), (g || y || C) && (k = !g && !b ? "" : "" + r, E = "" + c), C && (r = k = k.toLowerCase(), c = E = E.toLowerCase()), u) {
-    case "*=":
-      d = k.indexOf(E) >= 0;
-      break;
-    case "$=":
-      d = k.indexOf(E, k.length - E.length) >= 0;
-      break;
-    case "^=":
-      d = k.indexOf(E) === 0;
-      break;
-    case "=":
-      d = r === c;
-      break;
-    case ">":
-      P = !0, d = r > c;
-      break;
-    case ">=":
-      P = !0, d = r >= c;
-      break;
-    case "<":
-      P = !0, d = r < c;
-      break;
-    case "<=":
-      P = !0, d = r <= c;
-      break;
-    default:
-      d = !1;
-      break;
-  }
-  return T && (r != null || !P) && (d = !d), d;
-}, Pue = function(r, u) {
-  switch (u) {
-    case "?":
-      return !!r;
-    case "!":
-      return !r;
-    case "^":
-      return r === void 0;
-  }
-}, Due = function(r) {
-  return r !== void 0;
-}, B6 = function(r, u) {
-  return r.data(u);
-}, jue = function(r, u) {
-  return r[u]();
-}, Ji = [], vi = function(r, u) {
-  return r.checks.every(function(c) {
-    return Ji[c.type](c, u);
-  });
-};
-Ji[It.GROUP] = function(a, r) {
-  var u = a.value;
-  return u === "*" || u === r.group();
-};
-Ji[It.STATE] = function(a, r) {
-  var u = a.value;
-  return kue(u, r);
-};
-Ji[It.ID] = function(a, r) {
-  var u = a.value;
-  return r.id() === u;
-};
-Ji[It.CLASS] = function(a, r) {
-  var u = a.value;
-  return r.hasClass(u);
-};
-Ji[It.META_COMPARE] = function(a, r) {
-  var u = a.field, c = a.operator, d = a.value;
-  return b$(jue(r, u), c, d);
-};
-Ji[It.DATA_COMPARE] = function(a, r) {
-  var u = a.field, c = a.operator, d = a.value;
-  return b$(B6(r, u), c, d);
-};
-Ji[It.DATA_BOOL] = function(a, r) {
-  var u = a.field, c = a.operator;
-  return Pue(B6(r, u), c);
-};
-Ji[It.DATA_EXIST] = function(a, r) {
-  var u = a.field;
-  return a.operator, Due(B6(r, u));
-};
-Ji[It.UNDIRECTED_EDGE] = function(a, r) {
-  var u = a.nodes[0], c = a.nodes[1], d = r.source(), g = r.target();
-  return vi(u, d) && vi(c, g) || vi(c, d) && vi(u, g);
-};
-Ji[It.NODE_NEIGHBOR] = function(a, r) {
-  return vi(a.node, r) && r.neighborhood().some(function(u) {
-    return u.isNode() && vi(a.neighbor, u);
-  });
-};
-Ji[It.DIRECTED_EDGE] = function(a, r) {
-  return vi(a.source, r.source()) && vi(a.target, r.target());
-};
-Ji[It.NODE_SOURCE] = function(a, r) {
-  return vi(a.source, r) && r.outgoers().some(function(u) {
-    return u.isNode() && vi(a.target, u);
-  });
-};
-Ji[It.NODE_TARGET] = function(a, r) {
-  return vi(a.target, r) && r.incomers().some(function(u) {
-    return u.isNode() && vi(a.source, u);
-  });
-};
-Ji[It.CHILD] = function(a, r) {
-  return vi(a.child, r) && vi(a.parent, r.parent());
-};
-Ji[It.PARENT] = function(a, r) {
-  return vi(a.parent, r) && r.children().some(function(u) {
-    return vi(a.child, u);
-  });
-};
-Ji[It.DESCENDANT] = function(a, r) {
-  return vi(a.descendant, r) && r.ancestors().some(function(u) {
-    return vi(a.ancestor, u);
-  });
-};
-Ji[It.ANCESTOR] = function(a, r) {
-  return vi(a.ancestor, r) && r.descendants().some(function(u) {
-    return vi(a.descendant, u);
-  });
-};
-Ji[It.COMPOUND_SPLIT] = function(a, r) {
-  return vi(a.subject, r) && vi(a.left, r) && vi(a.right, r);
-};
-Ji[It.TRUE] = function() {
-  return !0;
-};
-Ji[It.COLLECTION] = function(a, r) {
-  var u = a.value;
-  return u.has(r);
-};
-Ji[It.FILTER] = function(a, r) {
-  var u = a.value;
-  return u(r);
-};
-var Nue = function(r) {
-  var u = this;
-  if (u.length === 1 && u[0].checks.length === 1 && u[0].checks[0].type === It.ID)
-    return r.getElementById(u[0].checks[0].value).collection();
-  var c = function(g) {
-    for (var b = 0; b < u.length; b++) {
-      var y = u[b];
-      if (vi(y, g))
-        return !0;
-    }
-    return !1;
-  };
-  return u.text() == null && (c = function() {
-    return !0;
-  }), r.filter(c);
-}, Iue = function(r) {
-  for (var u = this, c = 0; c < u.length; c++) {
-    var d = u[c];
-    if (vi(d, r))
-      return !0;
-  }
-  return !1;
-}, Mue = {
-  matches: Iue,
-  filter: Nue
-}, _h = function(r) {
-  this.inputText = r, this.currentSubject = null, this.compoundCount = 0, this.edgeCount = 0, this.length = 0, r == null || qt(r) && r.match(/^\s*$/) || (tu(r) ? this.addQuery({
-    checks: [{
-      type: It.COLLECTION,
-      value: r.collection()
-    }]
-  }) : zi(r) ? this.addQuery({
-    checks: [{
-      type: It.FILTER,
-      value: r
-    }]
-  }) : qt(r) ? this.parse(r) || (this.invalid = !0) : Qi("A selector must be created from a string; found "));
-}, Gh = _h.prototype;
-[Lue, Mue].forEach(function(a) {
-  return on(Gh, a);
-});
-Gh.text = function() {
-  return this.inputText;
-};
-Gh.size = function() {
-  return this.length;
-};
-Gh.eq = function(a) {
-  return this[a];
-};
-Gh.sameText = function(a) {
-  return !this.invalid && !a.invalid && this.text() === a.text();
-};
-Gh.addQuery = function(a) {
-  this[this.length++] = a;
-};
-Gh.selector = Gh.toString;
-var Rh = {
-  allAre: function(r) {
-    var u = new _h(r);
-    return this.every(function(c) {
-      return u.matches(c);
-    });
-  },
-  is: function(r) {
-    var u = new _h(r);
-    return this.some(function(c) {
-      return u.matches(c);
-    });
-  },
-  some: function(r, u) {
-    for (var c = 0; c < this.length; c++) {
-      var d = u ? r.apply(u, [this[c], c, this]) : r(this[c], c, this);
-      if (d)
-        return !0;
-    }
-    return !1;
-  },
-  every: function(r, u) {
-    for (var c = 0; c < this.length; c++) {
-      var d = u ? r.apply(u, [this[c], c, this]) : r(this[c], c, this);
-      if (!d)
-        return !1;
-    }
-    return !0;
-  },
-  same: function(r) {
-    if (this === r)
-      return !0;
-    r = this.cy().collection(r);
-    var u = this.length, c = r.length;
-    return u !== c ? !1 : u === 1 ? this[0] === r[0] : this.every(function(d) {
-      return r.hasElementWithId(d.id());
-    });
-  },
-  anySame: function(r) {
-    return r = this.cy().collection(r), this.some(function(u) {
-      return r.hasElementWithId(u.id());
-    });
-  },
-  allAreNeighbors: function(r) {
-    r = this.cy().collection(r);
-    var u = this.neighborhood();
-    return r.every(function(c) {
-      return u.hasElementWithId(c.id());
-    });
-  },
-  contains: function(r) {
-    r = this.cy().collection(r);
-    var u = this;
-    return r.every(function(c) {
-      return u.hasElementWithId(c.id());
-    });
-  }
-};
-Rh.allAreNeighbours = Rh.allAreNeighbors;
-Rh.has = Rh.contains;
-Rh.equal = Rh.equals = Rh.same;
-var Iu = function(r, u) {
-  return function(d, g, b, y) {
-    var k = d, E = this, C;
-    if (k == null ? C = "" : tu(k) && k.length === 1 && (C = k.id()), E.length === 1 && C) {
-      var T = E[0]._private, P = T.traversalCache = T.traversalCache || {}, N = P[u] = P[u] || [], D = fv(C), H = N[D];
-      return H || (N[D] = r.call(E, d, g, b, y));
-    } else
-      return r.call(E, d, g, b, y);
-  };
-}, Ob = {
-  parent: function(r) {
-    var u = [];
-    if (this.length === 1) {
-      var c = this[0]._private.parent;
-      if (c)
-        return c;
-    }
-    for (var d = 0; d < this.length; d++) {
-      var g = this[d], b = g._private.parent;
-      b && u.push(b);
-    }
-    return this.spawn(u, !0).filter(r);
-  },
-  parents: function(r) {
-    for (var u = [], c = this.parent(); c.nonempty(); ) {
-      for (var d = 0; d < c.length; d++) {
-        var g = c[d];
-        u.push(g);
-      }
-      c = c.parent();
-    }
-    return this.spawn(u, !0).filter(r);
-  },
-  commonAncestors: function(r) {
-    for (var u, c = 0; c < this.length; c++) {
-      var d = this[c], g = d.parents();
-      u = u || g, u = u.intersect(g);
-    }
-    return u.filter(r);
-  },
-  orphans: function(r) {
-    return this.stdFilter(function(u) {
-      return u.isOrphan();
-    }).filter(r);
-  },
-  nonorphans: function(r) {
-    return this.stdFilter(function(u) {
-      return u.isChild();
-    }).filter(r);
-  },
-  children: Iu(function(a) {
-    for (var r = [], u = 0; u < this.length; u++)
-      for (var c = this[u], d = c._private.children, g = 0; g < d.length; g++)
-        r.push(d[g]);
-    return this.spawn(r, !0).filter(a);
-  }, "children"),
-  siblings: function(r) {
-    return this.parent().children().not(this).filter(r);
-  },
-  isParent: function() {
-    var r = this[0];
-    if (r)
-      return r.isNode() && r._private.children.length !== 0;
-  },
-  isChildless: function() {
-    var r = this[0];
-    if (r)
-      return r.isNode() && r._private.children.length === 0;
-  },
-  isChild: function() {
-    var r = this[0];
-    if (r)
-      return r.isNode() && r._private.parent != null;
-  },
-  isOrphan: function() {
-    var r = this[0];
-    if (r)
-      return r.isNode() && r._private.parent == null;
-  },
-  descendants: function(r) {
-    var u = [];
-    function c(d) {
-      for (var g = 0; g < d.length; g++) {
-        var b = d[g];
-        u.push(b), b.children().nonempty() && c(b.children());
-      }
-    }
-    return c(this.children()), this.spawn(u, !0).filter(r);
-  }
-};
-function z6(a, r, u, c) {
-  for (var d = [], g = new zb(), b = a.cy(), y = b.hasCompoundNodes(), k = 0; k < a.length; k++) {
-    var E = a[k];
-    u ? d.push(E) : y && c(d, g, E);
-  }
-  for (; d.length > 0; ) {
-    var C = d.shift();
-    r(C), g.add(C.id()), y && c(d, g, C);
-  }
-  return a;
-}
-function p$(a, r, u) {
-  if (u.isParent())
-    for (var c = u._private.children, d = 0; d < c.length; d++) {
-      var g = c[d];
-      r.has(g.id()) || a.push(g);
-    }
-}
-Ob.forEachDown = function(a) {
-  var r = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : !0;
-  return z6(this, a, r, p$);
-};
-function w$(a, r, u) {
-  if (u.isChild()) {
-    var c = u._private.parent;
-    r.has(c.id()) || a.push(c);
-  }
-}
-Ob.forEachUp = function(a) {
-  var r = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : !0;
-  return z6(this, a, r, w$);
-};
-function Oue(a, r, u) {
-  w$(a, r, u), p$(a, r, u);
-}
-Ob.forEachUpAndDown = function(a) {
-  var r = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : !0;
-  return z6(this, a, r, Oue);
-};
-Ob.ancestors = Ob.parents;
-var ew, m$;
-ew = m$ = {
-  data: Mr.data({
-    field: "data",
-    bindingEvent: "data",
-    allowBinding: !0,
-    allowSetting: !0,
-    settingEvent: "data",
-    settingTriggersEvent: !0,
-    triggerFnName: "trigger",
-    allowGetting: !0,
-    immutableKeys: {
-      id: !0,
-      source: !0,
-      target: !0,
-      parent: !0
-    },
-    updateStyle: !0
-  }),
-  removeData: Mr.removeData({
-    field: "data",
-    event: "data",
-    triggerFnName: "trigger",
-    triggerEvent: !0,
-    immutableKeys: {
-      id: !0,
-      source: !0,
-      target: !0,
-      parent: !0
-    },
-    updateStyle: !0
-  }),
-  scratch: Mr.data({
-    field: "scratch",
-    bindingEvent: "scratch",
-    allowBinding: !0,
-    allowSetting: !0,
-    settingEvent: "scratch",
-    settingTriggersEvent: !0,
-    triggerFnName: "trigger",
-    allowGetting: !0,
-    updateStyle: !0
-  }),
-  removeScratch: Mr.removeData({
-    field: "scratch",
-    event: "scratch",
-    triggerFnName: "trigger",
-    triggerEvent: !0,
-    updateStyle: !0
-  }),
-  rscratch: Mr.data({
-    field: "rscratch",
-    allowBinding: !1,
-    allowSetting: !0,
-    settingTriggersEvent: !1,
-    allowGetting: !0
-  }),
-  removeRscratch: Mr.removeData({
-    field: "rscratch",
-    triggerEvent: !1
-  }),
-  id: function() {
-    var r = this[0];
-    if (r)
-      return r._private.data.id;
-  }
-};
-ew.attr = ew.data;
-ew.removeAttr = ew.removeData;
-var Aue = m$, g5 = {};
-function t6(a) {
-  return function(r) {
-    var u = this;
-    if (r === void 0 && (r = !0), u.length !== 0)
-      if (u.isNode() && !u.removed()) {
-        for (var c = 0, d = u[0], g = d._private.edges, b = 0; b < g.length; b++) {
-          var y = g[b];
-          !r && y.isLoop() || (c += a(d, y));
-        }
-        return c;
-      } else
-        return;
-  };
-}
-on(g5, {
-  degree: t6(function(a, r) {
-    return r.source().same(r.target()) ? 2 : 1;
-  }),
-  indegree: t6(function(a, r) {
-    return r.target().same(a) ? 1 : 0;
-  }),
-  outdegree: t6(function(a, r) {
-    return r.source().same(a) ? 1 : 0;
-  })
-});
-function yb(a, r) {
-  return function(u) {
-    for (var c, d = this.nodes(), g = 0; g < d.length; g++) {
-      var b = d[g], y = b[a](u);
-      y !== void 0 && (c === void 0 || r(y, c)) && (c = y);
-    }
-    return c;
-  };
-}
-on(g5, {
-  minDegree: yb("degree", function(a, r) {
-    return a < r;
-  }),
-  maxDegree: yb("degree", function(a, r) {
-    return a > r;
-  }),
-  minIndegree: yb("indegree", function(a, r) {
-    return a < r;
-  }),
-  maxIndegree: yb("indegree", function(a, r) {
-    return a > r;
-  }),
-  minOutdegree: yb("outdegree", function(a, r) {
-    return a < r;
-  }),
-  maxOutdegree: yb("outdegree", function(a, r) {
-    return a > r;
-  })
-});
-on(g5, {
-  totalDegree: function(r) {
-    for (var u = 0, c = this.nodes(), d = 0; d < c.length; d++)
-      u += c[d].degree(r);
-    return u;
-  }
-});
-var Cc, y$, k$ = function(r, u, c) {
-  for (var d = 0; d < r.length; d++) {
-    var g = r[d];
-    if (!g.locked()) {
-      var b = g._private.position, y = {
-        x: u.x != null ? u.x - b.x : 0,
-        y: u.y != null ? u.y - b.y : 0
-      };
-      g.isParent() && !(y.x === 0 && y.y === 0) && g.children().shift(y, c), g.dirtyBoundingBoxCache();
-    }
-  }
-}, V_ = {
-  field: "position",
-  bindingEvent: "position",
-  allowBinding: !0,
-  allowSetting: !0,
-  settingEvent: "position",
-  settingTriggersEvent: !0,
-  triggerFnName: "emitAndNotify",
-  allowGetting: !0,
-  validKeys: ["x", "y"],
-  beforeGet: function(r) {
-    r.updateCompoundBounds();
-  },
-  beforeSet: function(r, u) {
-    k$(r, u, !1);
-  },
-  onSet: function(r) {
-    r.dirtyCompoundBoundsCache();
-  },
-  canSet: function(r) {
-    return !r.locked();
-  }
-};
-Cc = y$ = {
-  position: Mr.data(V_),
-  // position but no notification to renderer
-  silentPosition: Mr.data(on({}, V_, {
-    allowBinding: !1,
-    allowSetting: !0,
-    settingTriggersEvent: !1,
-    allowGetting: !1,
-    beforeSet: function(r, u) {
-      k$(r, u, !0);
-    },
-    onSet: function(r) {
-      r.dirtyCompoundBoundsCache();
-    }
-  })),
-  positions: function(r, u) {
-    if (fr(r))
-      u ? this.silentPosition(r) : this.position(r);
-    else if (zi(r)) {
-      var c = r, d = this.cy();
-      d.startBatch();
-      for (var g = 0; g < this.length; g++) {
-        var b = this[g], y = void 0;
-        (y = c(b, g)) && (u ? b.silentPosition(y) : b.position(y));
-      }
-      d.endBatch();
-    }
-    return this;
-  },
-  silentPositions: function(r) {
-    return this.positions(r, !0);
-  },
-  shift: function(r, u, c) {
-    var d;
-    if (fr(r) ? (d = {
-      x: kt(r.x) ? r.x : 0,
-      y: kt(r.y) ? r.y : 0
-    }, c = u) : qt(r) && kt(u) && (d = {
-      x: 0,
-      y: 0
-    }, d[r] = u), d != null) {
-      var g = this.cy();
-      g.startBatch();
-      for (var b = 0; b < this.length; b++) {
-        var y = this[b];
-        if (!(g.hasCompoundNodes() && y.isChild() && y.ancestors().anySame(this))) {
-          var k = y.position(), E = {
-            x: k.x + d.x,
-            y: k.y + d.y
-          };
-          c ? y.silentPosition(E) : y.position(E);
-        }
-      }
-      g.endBatch();
-    }
-    return this;
-  },
-  silentShift: function(r, u) {
-    return fr(r) ? this.shift(r, !0) : qt(r) && kt(u) && this.shift(r, u, !0), this;
-  },
-  // get/set the rendered (i.e. on screen) positon of the element
-  renderedPosition: function(r, u) {
-    var c = this[0], d = this.cy(), g = d.zoom(), b = d.pan(), y = fr(r) ? r : void 0, k = y !== void 0 || u !== void 0 && qt(r);
-    if (c && c.isNode())
-      if (k)
-        for (var E = 0; E < this.length; E++) {
-          var C = this[E];
-          u !== void 0 ? C.position(r, (u - b[r]) / g) : y !== void 0 && C.position(JG(y, g, b));
-        }
-      else {
-        var T = c.position();
-        return y = d5(T, g, b), r === void 0 ? y : y[r];
-      }
-    else if (!k)
-      return;
-    return this;
-  },
-  // get/set the position relative to the parent
-  relativePosition: function(r, u) {
-    var c = this[0], d = this.cy(), g = fr(r) ? r : void 0, b = g !== void 0 || u !== void 0 && qt(r), y = d.hasCompoundNodes();
-    if (c && c.isNode())
-      if (b)
-        for (var k = 0; k < this.length; k++) {
-          var E = this[k], C = y ? E.parent() : null, T = C && C.length > 0, P = T;
-          T && (C = C[0]);
-          var N = P ? C.position() : {
-            x: 0,
-            y: 0
-          };
-          u !== void 0 ? E.position(r, u + N[r]) : g !== void 0 && E.position({
-            x: g.x + N.x,
-            y: g.y + N.y
-          });
-        }
-      else {
-        var D = c.position(), H = y ? c.parent() : null, _ = H && H.length > 0, B = _;
-        _ && (H = H[0]);
-        var $ = B ? H.position() : {
-          x: 0,
-          y: 0
-        };
-        return g = {
-          x: D.x - $.x,
-          y: D.y - $.y
-        }, r === void 0 ? g : g[r];
-      }
-    else if (!b)
-      return;
-    return this;
-  }
-};
-Cc.modelPosition = Cc.point = Cc.position;
-Cc.modelPositions = Cc.points = Cc.positions;
-Cc.renderedPoint = Cc.renderedPosition;
-Cc.relativePoint = Cc.relativePosition;
-var Rue = y$, Nb, Yh;
-Nb = Yh = {};
-Yh.renderedBoundingBox = function(a) {
-  var r = this.boundingBox(a), u = this.cy(), c = u.zoom(), d = u.pan(), g = r.x1 * c + d.x, b = r.x2 * c + d.x, y = r.y1 * c + d.y, k = r.y2 * c + d.y;
-  return {
-    x1: g,
-    x2: b,
-    y1: y,
-    y2: k,
-    w: b - g,
-    h: k - y
-  };
-};
-Yh.dirtyCompoundBoundsCache = function() {
-  var a = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : !1, r = this.cy();
-  return !r.styleEnabled() || !r.hasCompoundNodes() ? this : (this.forEachUp(function(u) {
-    if (u.isParent()) {
-      var c = u._private;
-      c.compoundBoundsClean = !1, c.bbCache = null, a || u.emitAndNotify("bounds");
-    }
-  }), this);
-};
-Yh.updateCompoundBounds = function() {
-  var a = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : !1, r = this.cy();
-  if (!r.styleEnabled() || !r.hasCompoundNodes())
-    return this;
-  if (!a && r.batching())
-    return this;
-  function u(b) {
-    if (!b.isParent())
-      return;
-    var y = b._private, k = b.children(), E = b.pstyle("compound-sizing-wrt-labels").value === "include", C = {
-      width: {
-        val: b.pstyle("min-width").pfValue,
-        left: b.pstyle("min-width-bias-left"),
-        right: b.pstyle("min-width-bias-right")
-      },
-      height: {
-        val: b.pstyle("min-height").pfValue,
-        top: b.pstyle("min-height-bias-top"),
-        bottom: b.pstyle("min-height-bias-bottom")
-      }
-    }, T = k.boundingBox({
-      includeLabels: E,
-      includeOverlays: !1,
-      // updating the compound bounds happens outside of the regular
-      // cache cycle (i.e. before fired events)
-      useCache: !1
-    }), P = y.position;
-    (T.w === 0 || T.h === 0) && (T = {
-      w: b.pstyle("width").pfValue,
-      h: b.pstyle("height").pfValue
-    }, T.x1 = P.x - T.w / 2, T.x2 = P.x + T.w / 2, T.y1 = P.y - T.h / 2, T.y2 = P.y + T.h / 2);
-    function N(Z, ae, oe) {
-      var J = 0, fe = 0, se = ae + oe;
-      return Z > 0 && se > 0 && (J = ae / se * Z, fe = oe / se * Z), {
-        biasDiff: J,
-        biasComplementDiff: fe
-      };
-    }
-    function D(Z, ae, oe, J) {
-      if (oe.units === "%")
-        switch (J) {
-          case "width":
-            return Z > 0 ? oe.pfValue * Z : 0;
-          case "height":
-            return ae > 0 ? oe.pfValue * ae : 0;
-          case "average":
-            return Z > 0 && ae > 0 ? oe.pfValue * (Z + ae) / 2 : 0;
-          case "min":
-            return Z > 0 && ae > 0 ? Z > ae ? oe.pfValue * ae : oe.pfValue * Z : 0;
-          case "max":
-            return Z > 0 && ae > 0 ? Z > ae ? oe.pfValue * Z : oe.pfValue * ae : 0;
-          default:
-            return 0;
-        }
-      else
-        return oe.units === "px" ? oe.pfValue : 0;
-    }
-    var H = C.width.left.value;
-    C.width.left.units === "px" && C.width.val > 0 && (H = H * 100 / C.width.val);
-    var _ = C.width.right.value;
-    C.width.right.units === "px" && C.width.val > 0 && (_ = _ * 100 / C.width.val);
-    var B = C.height.top.value;
-    C.height.top.units === "px" && C.height.val > 0 && (B = B * 100 / C.height.val);
-    var $ = C.height.bottom.value;
-    C.height.bottom.units === "px" && C.height.val > 0 && ($ = $ * 100 / C.height.val);
-    var F = N(C.width.val - T.w, H, _), W = F.biasDiff, Q = F.biasComplementDiff, X = N(C.height.val - T.h, B, $), K = X.biasDiff, ee = X.biasComplementDiff;
-    y.autoPadding = D(T.w, T.h, b.pstyle("padding"), b.pstyle("padding-relative-to").value), y.autoWidth = Math.max(T.w, C.width.val), P.x = (-W + T.x1 + T.x2 + Q) / 2, y.autoHeight = Math.max(T.h, C.height.val), P.y = (-K + T.y1 + T.y2 + ee) / 2;
-  }
-  for (var c = 0; c < this.length; c++) {
-    var d = this[c], g = d._private;
-    (!g.compoundBoundsClean || a) && (u(d), r.batching() || (g.compoundBoundsClean = !0));
-  }
-  return this;
-};
-var Nu = function(r) {
-  return r === 1 / 0 || r === -1 / 0 ? 0 : r;
-}, Ec = function(r, u, c, d, g) {
-  d - u === 0 || g - c === 0 || u == null || c == null || d == null || g == null || (r.x1 = u < r.x1 ? u : r.x1, r.x2 = d > r.x2 ? d : r.x2, r.y1 = c < r.y1 ? c : r.y1, r.y2 = g > r.y2 ? g : r.y2, r.w = r.x2 - r.x1, r.h = r.y2 - r.y1);
-}, cv = function(r, u) {
-  return u == null ? r : Ec(r, u.x1, u.y1, u.x2, u.y2);
-}, zp = function(r, u, c) {
-  return Sc(r, u, c);
-}, BE = function(r, u, c) {
-  if (!u.cy().headless()) {
-    var d = u._private, g = d.rstyle, b = g.arrowWidth / 2, y = u.pstyle(c + "-arrow-shape").value, k, E;
-    if (y !== "none") {
-      c === "source" ? (k = g.srcX, E = g.srcY) : c === "target" ? (k = g.tgtX, E = g.tgtY) : (k = g.midX, E = g.midY);
-      var C = d.arrowBounds = d.arrowBounds || {}, T = C[c] = C[c] || {};
-      T.x1 = k - b, T.y1 = E - b, T.x2 = k + b, T.y2 = E + b, T.w = T.x2 - T.x1, T.h = T.y2 - T.y1, YE(T, 1), Ec(r, T.x1, T.y1, T.x2, T.y2);
-    }
-  }
-}, n6 = function(r, u, c) {
-  if (!u.cy().headless()) {
-    var d;
-    c ? d = c + "-" : d = "";
-    var g = u._private, b = g.rstyle, y = u.pstyle(d + "label").strValue;
-    if (y) {
-      var k = u.pstyle("text-halign"), E = u.pstyle("text-valign"), C = zp(b, "labelWidth", c), T = zp(b, "labelHeight", c), P = zp(b, "labelX", c), N = zp(b, "labelY", c), D = u.pstyle(d + "text-margin-x").pfValue, H = u.pstyle(d + "text-margin-y").pfValue, _ = u.isEdge(), B = u.pstyle(d + "text-rotation"), $ = u.pstyle("text-outline-width").pfValue, F = u.pstyle("text-border-width").pfValue, W = F / 2, Q = u.pstyle("text-background-padding").pfValue, X = 2, K = T, ee = C, Z = ee / 2, ae = K / 2, oe, J, fe, se;
-      if (_)
-        oe = P - Z, J = P + Z, fe = N - ae, se = N + ae;
-      else {
-        switch (k.value) {
-          case "left":
-            oe = P - ee, J = P;
-            break;
-          case "center":
-            oe = P - Z, J = P + Z;
-            break;
-          case "right":
-            oe = P, J = P + ee;
-            break;
-        }
-        switch (E.value) {
-          case "top":
-            fe = N - K, se = N;
-            break;
-          case "center":
-            fe = N - ae, se = N + ae;
-            break;
-          case "bottom":
-            fe = N, se = N + K;
-            break;
-        }
-      }
-      oe += D - Math.max($, W) - Q - X, J += D + Math.max($, W) + Q + X, fe += H - Math.max($, W) - Q - X, se += H + Math.max($, W) + Q + X;
-      var pe = c || "main", he = g.labelBounds, de = he[pe] = he[pe] || {};
-      de.x1 = oe, de.y1 = fe, de.x2 = J, de.y2 = se, de.w = J - oe, de.h = se - fe;
-      var ke = _ && B.strValue === "autorotate", Pe = B.pfValue != null && B.pfValue !== 0;
-      if (ke || Pe) {
-        var Ae = ke ? zp(g.rstyle, "labelAngle", c) : B.pfValue, Te = Math.cos(Ae), Oe = Math.sin(Ae), ze = (oe + J) / 2, We = (fe + se) / 2;
-        if (!_) {
-          switch (k.value) {
-            case "left":
-              ze = J;
-              break;
-            case "right":
-              ze = oe;
-              break;
-          }
-          switch (E.value) {
-            case "top":
-              We = se;
-              break;
-            case "bottom":
-              We = fe;
-              break;
-          }
-        }
-        var $e = function(gn, mt) {
-          return gn = gn - ze, mt = mt - We, {
-            x: gn * Te - mt * Oe + ze,
-            y: gn * Oe + mt * Te + We
-          };
-        }, Ge = $e(oe, fe), me = $e(oe, se), Ve = $e(J, fe), Ke = $e(J, se);
-        oe = Math.min(Ge.x, me.x, Ve.x, Ke.x), J = Math.max(Ge.x, me.x, Ve.x, Ke.x), fe = Math.min(Ge.y, me.y, Ve.y, Ke.y), se = Math.max(Ge.y, me.y, Ve.y, Ke.y);
-      }
-      var at = pe + "Rot", ft = he[at] = he[at] || {};
-      ft.x1 = oe, ft.y1 = fe, ft.x2 = J, ft.y2 = se, ft.w = J - oe, ft.h = se - fe, Ec(r, oe, fe, J, se), Ec(g.labelBounds.all, oe, fe, J, se);
-    }
-    return r;
-  }
-}, Bue = function(r, u) {
-  var c = r._private.cy, d = c.styleEnabled(), g = c.headless(), b = Ms(), y = r._private, k = r.isNode(), E = r.isEdge(), C, T, P, N, D, H, _ = y.rstyle, B = k && d ? r.pstyle("bounds-expansion").pfValue : [0], $ = function(Rt) {
-    return Rt.pstyle("display").value !== "none";
-  }, F = !d || $(r) && (!E || $(r.source()) && $(r.target()));
-  if (F) {
-    var W = 0, Q = 0;
-    d && u.includeOverlays && (W = r.pstyle("overlay-opacity").value, W !== 0 && (Q = r.pstyle("overlay-padding").value));
-    var X = 0, K = 0;
-    d && u.includeUnderlays && (X = r.pstyle("underlay-opacity").value, X !== 0 && (K = r.pstyle("underlay-padding").value));
-    var ee = Math.max(Q, K), Z = 0, ae = 0;
-    if (d && (Z = r.pstyle("width").pfValue, ae = Z / 2), k && u.includeNodes) {
-      var oe = r.position();
-      D = oe.x, H = oe.y;
-      var J = r.outerWidth(), fe = J / 2, se = r.outerHeight(), pe = se / 2;
-      C = D - fe, T = D + fe, P = H - pe, N = H + pe, Ec(b, C, P, T, N);
-    } else if (E && u.includeEdges)
-      if (d && !g) {
-        var he = r.pstyle("curve-style").strValue;
-        if (C = Math.min(_.srcX, _.midX, _.tgtX), T = Math.max(_.srcX, _.midX, _.tgtX), P = Math.min(_.srcY, _.midY, _.tgtY), N = Math.max(_.srcY, _.midY, _.tgtY), C -= ae, T += ae, P -= ae, N += ae, Ec(b, C, P, T, N), he === "haystack") {
-          var de = _.haystackPts;
-          if (de && de.length === 2) {
-            if (C = de[0].x, P = de[0].y, T = de[1].x, N = de[1].y, C > T) {
-              var ke = C;
-              C = T, T = ke;
-            }
-            if (P > N) {
-              var Pe = P;
-              P = N, N = Pe;
-            }
-            Ec(b, C - ae, P - ae, T + ae, N + ae);
-          }
-        } else if (he === "bezier" || he === "unbundled-bezier" || he === "segments" || he === "taxi") {
-          var Ae;
-          switch (he) {
-            case "bezier":
-            case "unbundled-bezier":
-              Ae = _.bezierPts;
-              break;
-            case "segments":
-            case "taxi":
-              Ae = _.linePts;
-              break;
-          }
-          if (Ae != null)
-            for (var Te = 0; Te < Ae.length; Te++) {
-              var Oe = Ae[Te];
-              C = Oe.x - ae, T = Oe.x + ae, P = Oe.y - ae, N = Oe.y + ae, Ec(b, C, P, T, N);
-            }
-        }
-      } else {
-        var ze = r.source(), We = ze.position(), $e = r.target(), Ge = $e.position();
-        if (C = We.x, T = Ge.x, P = We.y, N = Ge.y, C > T) {
-          var me = C;
-          C = T, T = me;
-        }
-        if (P > N) {
-          var Ve = P;
-          P = N, N = Ve;
-        }
-        C -= ae, T += ae, P -= ae, N += ae, Ec(b, C, P, T, N);
-      }
-    if (d && u.includeEdges && E && (BE(b, r, "mid-source"), BE(b, r, "mid-target"), BE(b, r, "source"), BE(b, r, "target")), d) {
-      var Ke = r.pstyle("ghost").value === "yes";
-      if (Ke) {
-        var at = r.pstyle("ghost-offset-x").pfValue, ft = r.pstyle("ghost-offset-y").pfValue;
-        Ec(b, b.x1 + at, b.y1 + ft, b.x2 + at, b.y2 + ft);
-      }
-    }
-    var en = y.bodyBounds = y.bodyBounds || {};
-    j_(en, b), QL(en, B), YE(en, 1), d && (C = b.x1, T = b.x2, P = b.y1, N = b.y2, Ec(b, C - ee, P - ee, T + ee, N + ee));
-    var gn = y.overlayBounds = y.overlayBounds || {};
-    j_(gn, b), QL(gn, B), YE(gn, 1);
-    var mt = y.labelBounds = y.labelBounds || {};
-    mt.all != null ? lse(mt.all) : mt.all = Ms(), d && u.includeLabels && (u.includeMainLabels && n6(b, r, null), E && (u.includeSourceLabels && n6(b, r, "source"), u.includeTargetLabels && n6(b, r, "target")));
-  }
-  return b.x1 = Nu(b.x1), b.y1 = Nu(b.y1), b.x2 = Nu(b.x2), b.y2 = Nu(b.y2), b.w = Nu(b.x2 - b.x1), b.h = Nu(b.y2 - b.y1), b.w > 0 && b.h > 0 && F && (QL(b, B), YE(b, 1)), b;
-}, E$ = function(r) {
-  var u = 0, c = function(b) {
-    return (b ? 1 : 0) << u++;
-  }, d = 0;
-  return d += c(r.incudeNodes), d += c(r.includeEdges), d += c(r.includeLabels), d += c(r.includeMainLabels), d += c(r.includeSourceLabels), d += c(r.includeTargetLabels), d += c(r.includeOverlays), d;
-}, S$ = function(r) {
-  if (r.isEdge()) {
-    var u = r.source().position(), c = r.target().position(), d = function(b) {
-      return Math.round(b);
-    };
-    return Ioe([d(u.x), d(u.y), d(c.x), d(c.y)]);
-  } else
-    return 0;
-}, W_ = function(r, u) {
-  var c = r._private, d, g = r.isEdge(), b = u == null ? U_ : E$(u), y = b === U_, k = S$(r), E = c.bbCachePosKey === k, C = u.useCache && E, T = function(H) {
-    return H._private.bbCache == null || H._private.styleDirty;
-  }, P = !C || T(r) || g && T(r.source()) || T(r.target());
-  if (P ? (E || r.recalculateRenderedStyle(C), d = Bue(r, tw), c.bbCache = d, c.bbCachePosKey = k) : d = c.bbCache, !y) {
-    var N = r.isNode();
-    d = Ms(), (u.includeNodes && N || u.includeEdges && !N) && (u.includeOverlays ? cv(d, c.overlayBounds) : cv(d, c.bodyBounds)), u.includeLabels && (u.includeMainLabels && (!g || u.includeSourceLabels && u.includeTargetLabels) ? cv(d, c.labelBounds.all) : (u.includeMainLabels && cv(d, c.labelBounds.mainRot), u.includeSourceLabels && cv(d, c.labelBounds.sourceRot), u.includeTargetLabels && cv(d, c.labelBounds.targetRot))), d.w = d.x2 - d.x1, d.h = d.y2 - d.y1;
-  }
-  return d;
-}, tw = {
-  includeNodes: !0,
-  includeEdges: !0,
-  includeLabels: !0,
-  includeMainLabels: !0,
-  includeSourceLabels: !0,
-  includeTargetLabels: !0,
-  includeOverlays: !0,
-  includeUnderlays: !0,
-  useCache: !0
-}, U_ = E$(tw), K_ = po(tw);
-Yh.boundingBox = function(a) {
-  var r;
-  if (this.length === 1 && this[0]._private.bbCache != null && !this[0]._private.styleDirty && (a === void 0 || a.useCache === void 0 || a.useCache === !0))
-    a === void 0 ? a = tw : a = K_(a), r = W_(this[0], a);
-  else {
-    r = Ms(), a = a || tw;
-    var u = K_(a), c = this, d = c.cy(), g = d.styleEnabled();
-    if (g)
-      for (var b = 0; b < c.length; b++) {
-        var y = c[b], k = y._private, E = S$(y), C = k.bbCachePosKey === E, T = u.useCache && C && !k.styleDirty;
-        y.recalculateRenderedStyle(T);
-      }
-    this.updateCompoundBounds(!a.useCache);
-    for (var P = 0; P < c.length; P++) {
-      var N = c[P];
-      cv(r, W_(N, u));
-    }
-  }
-  return r.x1 = Nu(r.x1), r.y1 = Nu(r.y1), r.x2 = Nu(r.x2), r.y2 = Nu(r.y2), r.w = Nu(r.x2 - r.x1), r.h = Nu(r.y2 - r.y1), r;
-};
-Yh.dirtyBoundingBoxCache = function() {
-  for (var a = 0; a < this.length; a++) {
-    var r = this[a]._private;
-    r.bbCache = null, r.bbCachePosKey = null, r.bodyBounds = null, r.overlayBounds = null, r.labelBounds.all = null, r.labelBounds.source = null, r.labelBounds.target = null, r.labelBounds.main = null, r.labelBounds.sourceRot = null, r.labelBounds.targetRot = null, r.labelBounds.mainRot = null, r.arrowBounds.source = null, r.arrowBounds.target = null, r.arrowBounds["mid-source"] = null, r.arrowBounds["mid-target"] = null;
-  }
-  return this.emitAndNotify("bounds"), this;
-};
-Yh.boundingBoxAt = function(a) {
-  var r = this.nodes(), u = this.cy(), c = u.hasCompoundNodes(), d = u.collection();
-  if (c && (d = r.filter(function(E) {
-    return E.isParent();
-  }), r = r.not(d)), fr(a)) {
-    var g = a;
-    a = function() {
-      return g;
-    };
-  }
-  var b = function(C, T) {
-    return C._private.bbAtOldPos = a(C, T);
-  }, y = function(C) {
-    return C._private.bbAtOldPos;
-  };
-  u.startBatch(), r.forEach(b).silentPositions(a), c && (d.dirtyCompoundBoundsCache(), d.dirtyBoundingBoxCache(), d.updateCompoundBounds(!0));
-  var k = cse(this.boundingBox({
-    useCache: !1
-  }));
-  return r.silentPositions(y), c && (d.dirtyCompoundBoundsCache(), d.dirtyBoundingBoxCache(), d.updateCompoundBounds(!0)), u.endBatch(), k;
-};
-Nb.boundingbox = Nb.bb = Nb.boundingBox;
-Nb.renderedBoundingbox = Nb.renderedBoundingBox;
-var zue = Yh, Fp, fw;
-Fp = fw = {};
-var C$ = function(r) {
-  r.uppercaseName = T_(r.name), r.autoName = "auto" + r.uppercaseName, r.labelName = "label" + r.uppercaseName, r.outerName = "outer" + r.uppercaseName, r.uppercaseOuterName = T_(r.outerName), Fp[r.name] = function() {
-    var c = this[0], d = c._private, g = d.cy, b = g._private.styleEnabled;
-    if (c)
-      if (b) {
-        if (c.isParent())
-          return c.updateCompoundBounds(), d[r.autoName] || 0;
-        var y = c.pstyle(r.name);
-        switch (y.strValue) {
-          case "label":
-            return c.recalculateRenderedStyle(), d.rstyle[r.labelName] || 0;
-          default:
-            return y.pfValue;
-        }
-      } else
-        return 1;
-  }, Fp["outer" + r.uppercaseName] = function() {
-    var c = this[0], d = c._private, g = d.cy, b = g._private.styleEnabled;
-    if (c)
-      if (b) {
-        var y = c[r.name](), k = c.pstyle("border-width").pfValue, E = 2 * c.padding();
-        return y + k + E;
-      } else
-        return 1;
-  }, Fp["rendered" + r.uppercaseName] = function() {
-    var c = this[0];
-    if (c) {
-      var d = c[r.name]();
-      return d * this.cy().zoom();
-    }
-  }, Fp["rendered" + r.uppercaseOuterName] = function() {
-    var c = this[0];
-    if (c) {
-      var d = c[r.outerName]();
-      return d * this.cy().zoom();
-    }
-  };
-};
-C$({
-  name: "width"
-});
-C$({
-  name: "height"
-});
-fw.padding = function() {
-  var a = this[0], r = a._private;
-  return a.isParent() ? (a.updateCompoundBounds(), r.autoPadding !== void 0 ? r.autoPadding : a.pstyle("padding").pfValue) : a.pstyle("padding").pfValue;
-};
-fw.paddedHeight = function() {
-  var a = this[0];
-  return a.height() + 2 * a.padding();
-};
-fw.paddedWidth = function() {
-  var a = this[0];
-  return a.width() + 2 * a.padding();
-};
-var Hue = fw, _ue = function(r, u) {
-  if (r.isEdge())
-    return u(r);
-}, Gue = function(r, u) {
-  if (r.isEdge()) {
-    var c = r.cy();
-    return d5(u(r), c.zoom(), c.pan());
-  }
-}, $ue = function(r, u) {
-  if (r.isEdge()) {
-    var c = r.cy(), d = c.pan(), g = c.zoom();
-    return u(r).map(function(b) {
-      return d5(b, g, d);
-    });
-  }
-}, Yue = function(r) {
-  return r.renderer().getControlPoints(r);
-}, Fue = function(r) {
-  return r.renderer().getSegmentPoints(r);
-}, que = function(r) {
-  return r.renderer().getSourceEndpoint(r);
-}, Vue = function(r) {
-  return r.renderer().getTargetEndpoint(r);
-}, Wue = function(r) {
-  return r.renderer().getEdgeMidpoint(r);
-}, Z_ = {
-  controlPoints: {
-    get: Yue,
-    mult: !0
-  },
-  segmentPoints: {
-    get: Fue,
-    mult: !0
-  },
-  sourceEndpoint: {
-    get: que
-  },
-  targetEndpoint: {
-    get: Vue
-  },
-  midpoint: {
-    get: Wue
-  }
-}, Uue = function(r) {
-  return "rendered" + r[0].toUpperCase() + r.substr(1);
-}, Kue = Object.keys(Z_).reduce(function(a, r) {
-  var u = Z_[r], c = Uue(r);
-  return a[r] = function() {
-    return _ue(this, u.get);
-  }, u.mult ? a[c] = function() {
-    return $ue(this, u.get);
-  } : a[c] = function() {
-    return Gue(this, u.get);
-  }, a;
-}, {}), Zue = on({}, Rue, zue, Hue, Kue);
-/*!
-Event object based on jQuery events, MIT license
-
-https://jquery.org/license/
-https://tldrlegal.com/license/mit-license
-https://github.com/jquery/jquery/blob/master/src/event.js
-*/
-var x$ = function(r, u) {
-  this.recycle(r, u);
-};
-function Hp() {
-  return !1;
-}
-function zE() {
-  return !0;
-}
-x$.prototype = {
-  instanceString: function() {
-    return "event";
-  },
-  recycle: function(r, u) {
-    if (this.isImmediatePropagationStopped = this.isPropagationStopped = this.isDefaultPrevented = Hp, r != null && r.preventDefault ? (this.type = r.type, this.isDefaultPrevented = r.defaultPrevented ? zE : Hp) : r != null && r.type ? u = r : this.type = r, u != null && (this.originalEvent = u.originalEvent, this.type = u.type != null ? u.type : this.type, this.cy = u.cy, this.target = u.target, this.position = u.position, this.renderedPosition = u.renderedPosition, this.namespace = u.namespace, this.layout = u.layout), this.cy != null && this.position != null && this.renderedPosition == null) {
-      var c = this.position, d = this.cy.zoom(), g = this.cy.pan();
-      this.renderedPosition = {
-        x: c.x * d + g.x,
-        y: c.y * d + g.y
-      };
-    }
-    this.timeStamp = r && r.timeStamp || Date.now();
-  },
-  preventDefault: function() {
-    this.isDefaultPrevented = zE;
-    var r = this.originalEvent;
-    r && r.preventDefault && r.preventDefault();
-  },
-  stopPropagation: function() {
-    this.isPropagationStopped = zE;
-    var r = this.originalEvent;
-    r && r.stopPropagation && r.stopPropagation();
-  },
-  stopImmediatePropagation: function() {
-    this.isImmediatePropagationStopped = zE, this.stopPropagation();
-  },
-  isDefaultPrevented: Hp,
-  isPropagationStopped: Hp,
-  isImmediatePropagationStopped: Hp
-};
-var T$ = /^([^.]+)(\.(?:[^.]+))?$/, Xue = ".*", L$ = {
-  qualifierCompare: function(r, u) {
-    return r === u;
-  },
-  eventMatches: function() {
-    return !0;
-  },
-  addEventFields: function() {
-  },
-  callbackContext: function(r) {
-    return r;
-  },
-  beforeEmit: function() {
-  },
-  afterEmit: function() {
-  },
-  bubble: function() {
-    return !1;
-  },
-  parent: function() {
-    return null;
-  },
-  context: null
-}, X_ = Object.keys(L$), Que = {};
-function b5() {
-  for (var a = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : Que, r = arguments.length > 1 ? arguments[1] : void 0, u = 0; u < X_.length; u++) {
-    var c = X_[u];
-    this[c] = a[c] || L$[c];
-  }
-  this.context = r || this.context, this.listeners = [], this.emitting = 0;
-}
-var $h = b5.prototype, P$ = function(r, u, c, d, g, b, y) {
-  zi(d) && (g = d, d = null), y && (b == null ? b = y : b = on({}, b, y));
-  for (var k = Qr(c) ? c : c.split(/\s+/), E = 0; E < k.length; E++) {
-    var C = k[E];
-    if (!zh(C)) {
-      var T = C.match(T$);
-      if (T) {
-        var P = T[1], N = T[2] ? T[2] : null, D = u(r, C, P, N, d, g, b);
-        if (D === !1)
-          break;
-      }
-    }
-  }
-}, Q_ = function(r, u) {
-  return r.addEventFields(r.context, u), new x$(u.type, u);
-}, Jue = function(r, u, c) {
-  if (hoe(c)) {
-    u(r, c);
-    return;
-  } else if (fr(c)) {
-    u(r, Q_(r, c));
-    return;
-  }
-  for (var d = Qr(c) ? c : c.split(/\s+/), g = 0; g < d.length; g++) {
-    var b = d[g];
-    if (!zh(b)) {
-      var y = b.match(T$);
-      if (y) {
-        var k = y[1], E = y[2] ? y[2] : null, C = Q_(r, {
-          type: k,
-          namespace: E,
-          target: r.context
-        });
-        u(r, C);
-      }
-    }
-  }
-};
-$h.on = $h.addListener = function(a, r, u, c, d) {
-  return P$(this, function(g, b, y, k, E, C, T) {
-    zi(C) && g.listeners.push({
-      event: b,
-      // full event string
-      callback: C,
-      // callback to run
-      type: y,
-      // the event type (e.g. 'click')
-      namespace: k,
-      // the event namespace (e.g. ".foo")
-      qualifier: E,
-      // a restriction on whether to match this emitter
-      conf: T
-      // additional configuration
-    });
-  }, a, r, u, c, d), this;
-};
-$h.one = function(a, r, u, c) {
-  return this.on(a, r, u, c, {
-    one: !0
-  });
-};
-$h.removeListener = $h.off = function(a, r, u, c) {
-  var d = this;
-  this.emitting !== 0 && (this.listeners = Boe(this.listeners));
-  for (var g = this.listeners, b = function(E) {
-    var C = g[E];
-    P$(d, function(T, P, N, D, H, _) {
-      if ((C.type === N || a === "*") && (!D && C.namespace !== ".*" || C.namespace === D) && (!H || T.qualifierCompare(C.qualifier, H)) && (!_ || C.callback === _))
-        return g.splice(E, 1), !1;
-    }, a, r, u, c);
-  }, y = g.length - 1; y >= 0; y--)
-    b(y);
-  return this;
-};
-$h.removeAllListeners = function() {
-  return this.removeListener("*");
-};
-$h.emit = $h.trigger = function(a, r, u) {
-  var c = this.listeners, d = c.length;
-  return this.emitting++, Qr(r) || (r = [r]), Jue(this, function(g, b) {
-    u != null && (c = [{
-      event: b.event,
-      type: b.type,
-      namespace: b.namespace,
-      callback: u
-    }], d = c.length);
-    for (var y = function(C) {
-      var T = c[C];
-      if (T.type === b.type && (!T.namespace || T.namespace === b.namespace || T.namespace === Xue) && g.eventMatches(g.context, T, b)) {
-        var P = [b];
-        r != null && Hoe(P, r), g.beforeEmit(g.context, T, b), T.conf && T.conf.one && (g.listeners = g.listeners.filter(function(H) {
-          return H !== T;
-        }));
-        var N = g.callbackContext(g.context, T, b), D = T.callback.apply(N, P);
-        g.afterEmit(g.context, T, b), D === !1 && (b.stopPropagation(), b.preventDefault());
-      }
-    }, k = 0; k < d; k++)
-      y(k);
-    g.bubble(g.context) && !b.isPropagationStopped() && g.parent(g.context).emit(b, r);
-  }, a), this.emitting--, this;
-};
-var ece = {
-  qualifierCompare: function(r, u) {
-    return r == null || u == null ? r == null && u == null : r.sameText(u);
-  },
-  eventMatches: function(r, u, c) {
-    var d = u.qualifier;
-    return d != null ? r !== c.target && cw(c.target) && d.matches(c.target) : !0;
-  },
-  addEventFields: function(r, u) {
-    u.cy = r.cy(), u.target = r;
-  },
-  callbackContext: function(r, u, c) {
-    return u.qualifier != null ? c.target : r;
-  },
-  beforeEmit: function(r, u) {
-    u.conf && u.conf.once && u.conf.onceCollection.removeListener(u.event, u.qualifier, u.callback);
-  },
-  bubble: function() {
-    return !0;
-  },
-  parent: function(r) {
-    return r.isChild() ? r.parent() : r.cy();
-  }
-}, HE = function(r) {
-  return qt(r) ? new _h(r) : r;
-}, D$ = {
-  createEmitter: function() {
-    for (var r = 0; r < this.length; r++) {
-      var u = this[r], c = u._private;
-      c.emitter || (c.emitter = new b5(ece, u));
-    }
-    return this;
-  },
-  emitter: function() {
-    return this._private.emitter;
-  },
-  on: function(r, u, c) {
-    for (var d = HE(u), g = 0; g < this.length; g++) {
-      var b = this[g];
-      b.emitter().on(r, d, c);
-    }
-    return this;
-  },
-  removeListener: function(r, u, c) {
-    for (var d = HE(u), g = 0; g < this.length; g++) {
-      var b = this[g];
-      b.emitter().removeListener(r, d, c);
-    }
-    return this;
-  },
-  removeAllListeners: function() {
-    for (var r = 0; r < this.length; r++) {
-      var u = this[r];
-      u.emitter().removeAllListeners();
-    }
-    return this;
-  },
-  one: function(r, u, c) {
-    for (var d = HE(u), g = 0; g < this.length; g++) {
-      var b = this[g];
-      b.emitter().one(r, d, c);
-    }
-    return this;
-  },
-  once: function(r, u, c) {
-    for (var d = HE(u), g = 0; g < this.length; g++) {
-      var b = this[g];
-      b.emitter().on(r, d, c, {
-        once: !0,
-        onceCollection: this
-      });
-    }
-  },
-  emit: function(r, u) {
-    for (var c = 0; c < this.length; c++) {
-      var d = this[c];
-      d.emitter().emit(r, u);
-    }
-    return this;
-  },
-  emitAndNotify: function(r, u) {
-    if (this.length !== 0)
-      return this.cy().notify(r, this), this.emit(r, u), this;
-  }
-};
-Mr.eventAliasesOn(D$);
-var j$ = {
-  nodes: function(r) {
-    return this.filter(function(u) {
-      return u.isNode();
-    }).filter(r);
-  },
-  edges: function(r) {
-    return this.filter(function(u) {
-      return u.isEdge();
-    }).filter(r);
-  },
-  // internal helper to get nodes and edges as separate collections with single iteration over elements
-  byGroup: function() {
-    for (var r = this.spawn(), u = this.spawn(), c = 0; c < this.length; c++) {
-      var d = this[c];
-      d.isNode() ? r.push(d) : u.push(d);
-    }
-    return {
-      nodes: r,
-      edges: u
-    };
-  },
-  filter: function(r, u) {
-    if (r === void 0)
-      return this;
-    if (qt(r) || tu(r))
-      return new _h(r).filter(this);
-    if (zi(r)) {
-      for (var c = this.spawn(), d = this, g = 0; g < d.length; g++) {
-        var b = d[g], y = u ? r.apply(u, [b, g, d]) : r(b, g, d);
-        y && c.push(b);
-      }
-      return c;
-    }
-    return this.spawn();
-  },
-  not: function(r) {
-    if (r) {
-      qt(r) && (r = this.filter(r));
-      for (var u = this.spawn(), c = 0; c < this.length; c++) {
-        var d = this[c], g = r.has(d);
-        g || u.push(d);
-      }
-      return u;
-    } else
-      return this;
-  },
-  absoluteComplement: function() {
-    var r = this.cy();
-    return r.mutableElements().not(this);
-  },
-  intersect: function(r) {
-    if (qt(r)) {
-      var u = r;
-      return this.filter(u);
-    }
-    for (var c = this.spawn(), d = this, g = r, b = this.length < r.length, y = b ? d : g, k = b ? g : d, E = 0; E < y.length; E++) {
-      var C = y[E];
-      k.has(C) && c.push(C);
-    }
-    return c;
-  },
-  xor: function(r) {
-    var u = this._private.cy;
-    qt(r) && (r = u.$(r));
-    var c = this.spawn(), d = this, g = r, b = function(k, E) {
-      for (var C = 0; C < k.length; C++) {
-        var T = k[C], P = T._private.data.id, N = E.hasElementWithId(P);
-        N || c.push(T);
-      }
-    };
-    return b(d, g), b(g, d), c;
-  },
-  diff: function(r) {
-    var u = this._private.cy;
-    qt(r) && (r = u.$(r));
-    var c = this.spawn(), d = this.spawn(), g = this.spawn(), b = this, y = r, k = function(C, T, P) {
-      for (var N = 0; N < C.length; N++) {
-        var D = C[N], H = D._private.data.id, _ = T.hasElementWithId(H);
-        _ ? g.merge(D) : P.push(D);
-      }
-    };
-    return k(b, y, c), k(y, b, d), {
-      left: c,
-      right: d,
-      both: g
-    };
-  },
-  add: function(r) {
-    var u = this._private.cy;
-    if (!r)
-      return this;
-    if (qt(r)) {
-      var c = r;
-      r = u.mutableElements().filter(c);
-    }
-    for (var d = this.spawnSelf(), g = 0; g < r.length; g++) {
-      var b = r[g], y = !this.has(b);
-      y && d.push(b);
-    }
-    return d;
-  },
-  // in place merge on calling collection
-  merge: function(r) {
-    var u = this._private, c = u.cy;
-    if (!r)
-      return this;
-    if (r && qt(r)) {
-      var d = r;
-      r = c.mutableElements().filter(d);
-    }
-    for (var g = u.map, b = 0; b < r.length; b++) {
-      var y = r[b], k = y._private.data.id, E = !g.has(k);
-      if (E) {
-        var C = this.length++;
-        this[C] = y, g.set(k, {
-          ele: y,
-          index: C
-        });
-      }
-    }
-    return this;
-  },
-  unmergeAt: function(r) {
-    var u = this[r], c = u.id(), d = this._private, g = d.map;
-    this[r] = void 0, g.delete(c);
-    var b = r === this.length - 1;
-    if (this.length > 1 && !b) {
-      var y = this.length - 1, k = this[y], E = k._private.data.id;
-      this[y] = void 0, this[r] = k, g.set(E, {
-        ele: k,
-        index: r
-      });
-    }
-    return this.length--, this;
-  },
-  // remove single ele in place in calling collection
-  unmergeOne: function(r) {
-    r = r[0];
-    var u = this._private, c = r._private.data.id, d = u.map, g = d.get(c);
-    if (!g)
-      return this;
-    var b = g.index;
-    return this.unmergeAt(b), this;
-  },
-  // remove eles in place on calling collection
-  unmerge: function(r) {
-    var u = this._private.cy;
-    if (!r)
-      return this;
-    if (r && qt(r)) {
-      var c = r;
-      r = u.mutableElements().filter(c);
-    }
-    for (var d = 0; d < r.length; d++)
-      this.unmergeOne(r[d]);
-    return this;
-  },
-  unmergeBy: function(r) {
-    for (var u = this.length - 1; u >= 0; u--) {
-      var c = this[u];
-      r(c) && this.unmergeAt(u);
-    }
-    return this;
-  },
-  map: function(r, u) {
-    for (var c = [], d = this, g = 0; g < d.length; g++) {
-      var b = d[g], y = u ? r.apply(u, [b, g, d]) : r(b, g, d);
-      c.push(y);
-    }
-    return c;
-  },
-  reduce: function(r, u) {
-    for (var c = u, d = this, g = 0; g < d.length; g++)
-      c = r(c, d[g], g, d);
-    return c;
-  },
-  max: function(r, u) {
-    for (var c = -1 / 0, d, g = this, b = 0; b < g.length; b++) {
-      var y = g[b], k = u ? r.apply(u, [y, b, g]) : r(y, b, g);
-      k > c && (c = k, d = y);
-    }
-    return {
-      value: c,
-      ele: d
-    };
-  },
-  min: function(r, u) {
-    for (var c = 1 / 0, d, g = this, b = 0; b < g.length; b++) {
-      var y = g[b], k = u ? r.apply(u, [y, b, g]) : r(y, b, g);
-      k < c && (c = k, d = y);
-    }
-    return {
-      value: c,
-      ele: d
-    };
-  }
-}, br = j$;
-br.u = br["|"] = br["+"] = br.union = br.or = br.add;
-br["\\"] = br["!"] = br["-"] = br.difference = br.relativeComplement = br.subtract = br.not;
-br.n = br["&"] = br["."] = br.and = br.intersection = br.intersect;
-br["^"] = br["(+)"] = br["(-)"] = br.symmetricDifference = br.symdiff = br.xor;
-br.fnFilter = br.filterFn = br.stdFilter = br.filter;
-br.complement = br.abscomp = br.absoluteComplement;
-var tce = {
-  isNode: function() {
-    return this.group() === "nodes";
-  },
-  isEdge: function() {
-    return this.group() === "edges";
-  },
-  isLoop: function() {
-    return this.isEdge() && this.source()[0] === this.target()[0];
-  },
-  isSimple: function() {
-    return this.isEdge() && this.source()[0] !== this.target()[0];
-  },
-  group: function() {
-    var r = this[0];
-    if (r)
-      return r._private.group;
-  }
-}, N$ = function(r, u) {
-  var c = r.cy(), d = c.hasCompoundNodes();
-  function g(C) {
-    var T = C.pstyle("z-compound-depth");
-    return T.value === "auto" ? d ? C.zDepth() : 0 : T.value === "bottom" ? -1 : T.value === "top" ? j6 : 0;
-  }
-  var b = g(r) - g(u);
-  if (b !== 0)
-    return b;
-  function y(C) {
-    var T = C.pstyle("z-index-compare");
-    return T.value === "auto" && C.isNode() ? 1 : 0;
-  }
-  var k = y(r) - y(u);
-  if (k !== 0)
-    return k;
-  var E = r.pstyle("z-index").value - u.pstyle("z-index").value;
-  return E !== 0 ? E : r.poolIndex() - u.poolIndex();
-}, e5 = {
-  forEach: function(r, u) {
-    if (zi(r))
-      for (var c = this.length, d = 0; d < c; d++) {
-        var g = this[d], b = u ? r.apply(u, [g, d, this]) : r(g, d, this);
-        if (b === !1)
-          break;
-      }
-    return this;
-  },
-  toArray: function() {
-    for (var r = [], u = 0; u < this.length; u++)
-      r.push(this[u]);
-    return r;
-  },
-  slice: function(r, u) {
-    var c = [], d = this.length;
-    u == null && (u = d), r == null && (r = 0), r < 0 && (r = d + r), u < 0 && (u = d + u);
-    for (var g = r; g >= 0 && g < u && g < d; g++)
-      c.push(this[g]);
-    return this.spawn(c);
-  },
-  size: function() {
-    return this.length;
-  },
-  eq: function(r) {
-    return this[r] || this.spawn();
-  },
-  first: function() {
-    return this[0] || this.spawn();
-  },
-  last: function() {
-    return this[this.length - 1] || this.spawn();
-  },
-  empty: function() {
-    return this.length === 0;
-  },
-  nonempty: function() {
-    return !this.empty();
-  },
-  sort: function(r) {
-    if (!zi(r))
-      return this;
-    var u = this.toArray().sort(r);
-    return this.spawn(u);
-  },
-  sortByZIndex: function() {
-    return this.sort(N$);
-  },
-  zDepth: function() {
-    var r = this[0];
-    if (r) {
-      var u = r._private, c = u.group;
-      if (c === "nodes") {
-        var d = u.data.parent ? r.parents().size() : 0;
-        return r.isParent() ? d : j6 - 1;
-      } else {
-        var g = u.source, b = u.target, y = g.zDepth(), k = b.zDepth();
-        return Math.max(y, k, 0);
-      }
-    }
-  }
-};
-e5.each = e5.forEach;
-var nce = function() {
-  var r = "undefined", u = (typeof Symbol > "u" ? "undefined" : Ra(Symbol)) != r && Ra(Symbol.iterator) != r;
-  u && (e5[Symbol.iterator] = function() {
-    var c = this, d = {
-      value: void 0,
-      done: !1
-    }, g = 0, b = this.length;
-    return BG({
-      next: function() {
-        return g < b ? d.value = c[g++] : (d.value = void 0, d.done = !0), d;
-      }
-    }, Symbol.iterator, function() {
-      return this;
-    });
-  });
-};
-nce();
-var rce = po({
-  nodeDimensionsIncludeLabels: !1
-}), qE = {
-  // Calculates and returns node dimensions { x, y } based on options given
-  layoutDimensions: function(r) {
-    r = rce(r);
-    var u;
-    if (!this.takesUpSpace())
-      u = {
-        w: 0,
-        h: 0
-      };
-    else if (r.nodeDimensionsIncludeLabels) {
-      var c = this.boundingBox();
-      u = {
-        w: c.w,
-        h: c.h
-      };
-    } else
-      u = {
-        w: this.outerWidth(),
-        h: this.outerHeight()
-      };
-    return (u.w === 0 || u.h === 0) && (u.w = u.h = 1), u;
-  },
-  // using standard layout options, apply position function (w/ or w/o animation)
-  layoutPositions: function(r, u, c) {
-    var d = this.nodes().filter(function(Q) {
-      return !Q.isParent();
-    }), g = this.cy(), b = u.eles, y = function(X) {
-      return X.id();
-    }, k = Up(c, y);
-    r.emit({
-      type: "layoutstart",
-      layout: r
-    }), r.animations = [];
-    var E = function(X, K, ee) {
-      var Z = {
-        x: K.x1 + K.w / 2,
-        y: K.y1 + K.h / 2
-      }, ae = {
-        // scale from center of bounding box (not necessarily 0,0)
-        x: (ee.x - Z.x) * X,
-        y: (ee.y - Z.y) * X
-      };
-      return {
-        x: Z.x + ae.x,
-        y: Z.y + ae.y
-      };
-    }, C = u.spacingFactor && u.spacingFactor !== 1, T = function() {
-      if (!C)
-        return null;
-      for (var X = Ms(), K = 0; K < d.length; K++) {
-        var ee = d[K], Z = k(ee, K);
-        hse(X, Z.x, Z.y);
-      }
-      return X;
-    }, P = T(), N = Up(function(Q, X) {
-      var K = k(Q, X);
-      if (C) {
-        var ee = Math.abs(u.spacingFactor);
-        K = E(ee, P, K);
-      }
-      return u.transform != null && (K = u.transform(Q, K)), K;
-    }, y);
-    if (u.animate) {
-      for (var D = 0; D < d.length; D++) {
-        var H = d[D], _ = N(H, D), B = u.animateFilter == null || u.animateFilter(H, D);
-        if (B) {
-          var $ = H.animation({
-            position: _,
-            duration: u.animationDuration,
-            easing: u.animationEasing
-          });
-          r.animations.push($);
-        } else
-          H.position(_);
-      }
-      if (u.fit) {
-        var F = g.animation({
-          fit: {
-            boundingBox: b.boundingBoxAt(N),
-            padding: u.padding
-          },
-          duration: u.animationDuration,
-          easing: u.animationEasing
-        });
-        r.animations.push(F);
-      } else if (u.zoom !== void 0 && u.pan !== void 0) {
-        var W = g.animation({
-          zoom: u.zoom,
-          pan: u.pan,
-          duration: u.animationDuration,
-          easing: u.animationEasing
-        });
-        r.animations.push(W);
-      }
-      r.animations.forEach(function(Q) {
-        return Q.play();
-      }), r.one("layoutready", u.ready), r.emit({
-        type: "layoutready",
-        layout: r
-      }), Hb.all(r.animations.map(function(Q) {
-        return Q.promise();
-      })).then(function() {
-        r.one("layoutstop", u.stop), r.emit({
-          type: "layoutstop",
-          layout: r
-        });
-      });
-    } else
-      d.positions(N), u.fit && g.fit(u.eles, u.padding), u.zoom != null && g.zoom(u.zoom), u.pan && g.pan(u.pan), r.one("layoutready", u.ready), r.emit({
-        type: "layoutready",
-        layout: r
-      }), r.one("layoutstop", u.stop), r.emit({
-        type: "layoutstop",
-        layout: r
-      });
-    return this;
-  },
-  layout: function(r) {
-    var u = this.cy();
-    return u.makeLayout(on({}, r, {
-      eles: this
-    }));
-  }
-};
-qE.createLayout = qE.makeLayout = qE.layout;
-function I$(a, r, u) {
-  var c = u._private, d = c.styleCache = c.styleCache || [], g;
-  return (g = d[a]) != null || (g = d[a] = r(u)), g;
-}
-function p5(a, r) {
-  return a = fv(a), function(c) {
-    return I$(a, r, c);
-  };
-}
-function w5(a, r) {
-  a = fv(a);
-  var u = function(d) {
-    return r.call(d);
-  };
-  return function() {
-    var d = this[0];
-    if (d)
-      return I$(a, u, d);
-  };
-}
-var go = {
-  recalculateRenderedStyle: function(r) {
-    var u = this.cy(), c = u.renderer(), d = u.styleEnabled();
-    return c && d && c.recalculateRenderedStyle(this, r), this;
-  },
-  dirtyStyleCache: function() {
-    var r = this.cy(), u = function(g) {
-      return g._private.styleCache = null;
-    };
-    if (r.hasCompoundNodes()) {
-      var c;
-      c = this.spawnSelf().merge(this.descendants()).merge(this.parents()), c.merge(c.connectedEdges()), c.forEach(u);
-    } else
-      this.forEach(function(d) {
-        u(d), d.connectedEdges().forEach(u);
-      });
-    return this;
-  },
-  // fully updates (recalculates) the style for the elements
-  updateStyle: function(r) {
-    var u = this._private.cy;
-    if (!u.styleEnabled())
-      return this;
-    if (u.batching()) {
-      var c = u._private.batchStyleEles;
-      return c.merge(this), this;
-    }
-    var d = u.hasCompoundNodes(), g = this;
-    r = !!(r || r === void 0), d && (g = this.spawnSelf().merge(this.descendants()).merge(this.parents()));
-    var b = g;
-    return r ? b.emitAndNotify("style") : b.emit("style"), g.forEach(function(y) {
-      return y._private.styleDirty = !0;
-    }), this;
-  },
-  // private: clears dirty flag and recalculates style
-  cleanStyle: function() {
-    var r = this.cy();
-    if (r.styleEnabled())
-      for (var u = 0; u < this.length; u++) {
-        var c = this[u];
-        c._private.styleDirty && (c._private.styleDirty = !1, r.style().apply(c));
-      }
-  },
-  // get the internal parsed style object for the specified property
-  parsedStyle: function(r) {
-    var u = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : !0, c = this[0], d = c.cy();
-    if (d.styleEnabled() && c) {
-      this.cleanStyle();
-      var g = c._private.style[r];
-      return g ?? (u ? d.style().getDefaultProperty(r) : null);
-    }
-  },
-  numericStyle: function(r) {
-    var u = this[0];
-    if (u.cy().styleEnabled() && u) {
-      var c = u.pstyle(r);
-      return c.pfValue !== void 0 ? c.pfValue : c.value;
-    }
-  },
-  numericStyleUnits: function(r) {
-    var u = this[0];
-    if (u.cy().styleEnabled() && u)
-      return u.pstyle(r).units;
-  },
-  // get the specified css property as a rendered value (i.e. on-screen value)
-  // or get the whole rendered style if no property specified (NB doesn't allow setting)
-  renderedStyle: function(r) {
-    var u = this.cy();
-    if (!u.styleEnabled())
-      return this;
-    var c = this[0];
-    if (c)
-      return u.style().getRenderedStyle(c, r);
-  },
-  // read the calculated css style of the element or override the style (via a bypass)
-  style: function(r, u) {
-    var c = this.cy();
-    if (!c.styleEnabled())
-      return this;
-    var d = !1, g = c.style();
-    if (fr(r)) {
-      var b = r;
-      g.applyBypass(this, b, d), this.emitAndNotify("style");
-    } else if (qt(r))
-      if (u === void 0) {
-        var y = this[0];
-        return y ? g.getStylePropertyValue(y, r) : void 0;
-      } else
-        g.applyBypass(this, r, u, d), this.emitAndNotify("style");
-    else if (r === void 0) {
-      var k = this[0];
-      return k ? g.getRawStyle(k) : void 0;
-    }
-    return this;
-  },
-  removeStyle: function(r) {
-    var u = this.cy();
-    if (!u.styleEnabled())
-      return this;
-    var c = !1, d = u.style(), g = this;
-    if (r === void 0)
-      for (var b = 0; b < g.length; b++) {
-        var y = g[b];
-        d.removeAllBypasses(y, c);
-      }
-    else {
-      r = r.split(/\s+/);
-      for (var k = 0; k < g.length; k++) {
-        var E = g[k];
-        d.removeBypasses(E, r, c);
-      }
-    }
-    return this.emitAndNotify("style"), this;
-  },
-  show: function() {
-    return this.css("display", "element"), this;
-  },
-  hide: function() {
-    return this.css("display", "none"), this;
-  },
-  effectiveOpacity: function() {
-    var r = this.cy();
-    if (!r.styleEnabled())
-      return 1;
-    var u = r.hasCompoundNodes(), c = this[0];
-    if (c) {
-      var d = c._private, g = c.pstyle("opacity").value;
-      if (!u)
-        return g;
-      var b = d.data.parent ? c.parents() : null;
-      if (b)
-        for (var y = 0; y < b.length; y++) {
-          var k = b[y], E = k.pstyle("opacity").value;
-          g = E * g;
-        }
-      return g;
-    }
-  },
-  transparent: function() {
-    var r = this.cy();
-    if (!r.styleEnabled())
-      return !1;
-    var u = this[0], c = u.cy().hasCompoundNodes();
-    if (u)
-      return c ? u.effectiveOpacity() === 0 : u.pstyle("opacity").value === 0;
-  },
-  backgrounding: function() {
-    var r = this.cy();
-    if (!r.styleEnabled())
-      return !1;
-    var u = this[0];
-    return !!u._private.backgrounding;
-  }
-};
-function r6(a, r) {
-  var u = a._private, c = u.data.parent ? a.parents() : null;
-  if (c)
-    for (var d = 0; d < c.length; d++) {
-      var g = c[d];
-      if (!r(g))
-        return !1;
-    }
-  return !0;
-}
-function H6(a) {
-  var r = a.ok, u = a.edgeOkViaNode || a.ok, c = a.parentOk || a.ok;
-  return function() {
-    var d = this.cy();
-    if (!d.styleEnabled())
-      return !0;
-    var g = this[0], b = d.hasCompoundNodes();
-    if (g) {
-      var y = g._private;
-      if (!r(g))
-        return !1;
-      if (g.isNode())
-        return !b || r6(g, c);
-      var k = y.source, E = y.target;
-      return u(k) && (!b || r6(k, u)) && (k === E || u(E) && (!b || r6(E, u)));
-    }
-  };
-}
-var _b = p5("eleTakesUpSpace", function(a) {
-  return a.pstyle("display").value === "element" && a.width() !== 0 && (a.isNode() ? a.height() !== 0 : !0);
-});
-go.takesUpSpace = w5("takesUpSpace", H6({
-  ok: _b
-}));
-var ice = p5("eleInteractive", function(a) {
-  return a.pstyle("events").value === "yes" && a.pstyle("visibility").value === "visible" && _b(a);
-}), ace = p5("parentInteractive", function(a) {
-  return a.pstyle("visibility").value === "visible" && _b(a);
-});
-go.interactive = w5("interactive", H6({
-  ok: ice,
-  parentOk: ace,
-  edgeOkViaNode: _b
-}));
-go.noninteractive = function() {
-  var a = this[0];
-  if (a)
-    return !a.interactive();
-};
-var oce = p5("eleVisible", function(a) {
-  return a.pstyle("visibility").value === "visible" && a.pstyle("opacity").pfValue !== 0 && _b(a);
-}), sce = _b;
-go.visible = w5("visible", H6({
-  ok: oce,
-  edgeOkViaNode: sce
-}));
-go.hidden = function() {
-  var a = this[0];
-  if (a)
-    return !a.visible();
-};
-go.isBundledBezier = w5("isBundledBezier", function() {
-  return this.cy().styleEnabled() ? !this.removed() && this.pstyle("curve-style").value === "bezier" && this.takesUpSpace() : !1;
-});
-go.bypass = go.css = go.style;
-go.renderedCss = go.renderedStyle;
-go.removeBypass = go.removeCss = go.removeStyle;
-go.pstyle = go.parsedStyle;
-var Bh = {};
-function J_(a) {
-  return function() {
-    var r = arguments, u = [];
-    if (r.length === 2) {
-      var c = r[0], d = r[1];
-      this.on(a.event, c, d);
-    } else if (r.length === 1 && zi(r[0])) {
-      var g = r[0];
-      this.on(a.event, g);
-    } else if (r.length === 0 || r.length === 1 && Qr(r[0])) {
-      for (var b = r.length === 1 ? r[0] : null, y = 0; y < this.length; y++) {
-        var k = this[y], E = !a.ableField || k._private[a.ableField], C = k._private[a.field] != a.value;
-        if (a.overrideAble) {
-          var T = a.overrideAble(k);
-          if (T !== void 0 && (E = T, !T))
-            return this;
-        }
-        E && (k._private[a.field] = a.value, C && u.push(k));
-      }
-      var P = this.spawn(u);
-      P.updateStyle(), P.emit(a.event), b && P.emit(b);
-    }
-    return this;
-  };
-}
-function Gb(a) {
-  Bh[a.field] = function() {
-    var r = this[0];
-    if (r) {
-      if (a.overrideField) {
-        var u = a.overrideField(r);
-        if (u !== void 0)
-          return u;
-      }
-      return r._private[a.field];
-    }
-  }, Bh[a.on] = J_({
-    event: a.on,
-    field: a.field,
-    ableField: a.ableField,
-    overrideAble: a.overrideAble,
-    value: !0
-  }), Bh[a.off] = J_({
-    event: a.off,
-    field: a.field,
-    ableField: a.ableField,
-    overrideAble: a.overrideAble,
-    value: !1
-  });
-}
-Gb({
-  field: "locked",
-  overrideField: function(r) {
-    return r.cy().autolock() ? !0 : void 0;
-  },
-  on: "lock",
-  off: "unlock"
-});
-Gb({
-  field: "grabbable",
-  overrideField: function(r) {
-    return r.cy().autoungrabify() || r.pannable() ? !1 : void 0;
-  },
-  on: "grabify",
-  off: "ungrabify"
-});
-Gb({
-  field: "selected",
-  ableField: "selectable",
-  overrideAble: function(r) {
-    return r.cy().autounselectify() ? !1 : void 0;
-  },
-  on: "select",
-  off: "unselect"
-});
-Gb({
-  field: "selectable",
-  overrideField: function(r) {
-    return r.cy().autounselectify() ? !1 : void 0;
-  },
-  on: "selectify",
-  off: "unselectify"
-});
-Bh.deselect = Bh.unselect;
-Bh.grabbed = function() {
-  var a = this[0];
-  if (a)
-    return a._private.grabbed;
-};
-Gb({
-  field: "active",
-  on: "activate",
-  off: "unactivate"
-});
-Gb({
-  field: "pannable",
-  on: "panify",
-  off: "unpanify"
-});
-Bh.inactive = function() {
-  var a = this[0];
-  if (a)
-    return !a._private.active;
-};
-var Mo = {}, eG = function(r) {
-  return function(c) {
-    for (var d = this, g = [], b = 0; b < d.length; b++) {
-      var y = d[b];
-      if (y.isNode()) {
-        for (var k = !1, E = y.connectedEdges(), C = 0; C < E.length; C++) {
-          var T = E[C], P = T.source(), N = T.target();
-          if (r.noIncomingEdges && N === y && P !== y || r.noOutgoingEdges && P === y && N !== y) {
-            k = !0;
-            break;
-          }
-        }
-        k || g.push(y);
-      }
-    }
-    return this.spawn(g, !0).filter(c);
-  };
-}, tG = function(r) {
-  return function(u) {
-    for (var c = this, d = [], g = 0; g < c.length; g++) {
-      var b = c[g];
-      if (b.isNode())
-        for (var y = b.connectedEdges(), k = 0; k < y.length; k++) {
-          var E = y[k], C = E.source(), T = E.target();
-          r.outgoing && C === b ? (d.push(E), d.push(T)) : r.incoming && T === b && (d.push(E), d.push(C));
-        }
-    }
-    return this.spawn(d, !0).filter(u);
-  };
-}, nG = function(r) {
-  return function(u) {
-    for (var c = this, d = [], g = {}; ; ) {
-      var b = r.outgoing ? c.outgoers() : c.incomers();
-      if (b.length === 0)
-        break;
-      for (var y = !1, k = 0; k < b.length; k++) {
-        var E = b[k], C = E.id();
-        g[C] || (g[C] = !0, d.push(E), y = !0);
-      }
-      if (!y)
-        break;
-      c = b;
-    }
-    return this.spawn(d, !0).filter(u);
-  };
-};
-Mo.clearTraversalCache = function() {
-  for (var a = 0; a < this.length; a++)
-    this[a]._private.traversalCache = null;
-};
-on(Mo, {
-  // get the root nodes in the DAG
-  roots: eG({
-    noIncomingEdges: !0
-  }),
-  // get the leaf nodes in the DAG
-  leaves: eG({
-    noOutgoingEdges: !0
-  }),
-  // normally called children in graph theory
-  // these nodes =edges=> outgoing nodes
-  outgoers: Iu(tG({
-    outgoing: !0
-  }), "outgoers"),
-  // aka DAG descendants
-  successors: nG({
-    outgoing: !0
-  }),
-  // normally called parents in graph theory
-  // these nodes <=edges= incoming nodes
-  incomers: Iu(tG({
-    incoming: !0
-  }), "incomers"),
-  // aka DAG ancestors
-  predecessors: nG({
-    incoming: !0
-  })
-});
-on(Mo, {
-  neighborhood: Iu(function(a) {
-    for (var r = [], u = this.nodes(), c = 0; c < u.length; c++)
-      for (var d = u[c], g = d.connectedEdges(), b = 0; b < g.length; b++) {
-        var y = g[b], k = y.source(), E = y.target(), C = d === k ? E : k;
-        C.length > 0 && r.push(C[0]), r.push(y[0]);
-      }
-    return this.spawn(r, !0).filter(a);
-  }, "neighborhood"),
-  closedNeighborhood: function(r) {
-    return this.neighborhood().add(this).filter(r);
-  },
-  openNeighborhood: function(r) {
-    return this.neighborhood(r);
-  }
-});
-Mo.neighbourhood = Mo.neighborhood;
-Mo.closedNeighbourhood = Mo.closedNeighborhood;
-Mo.openNeighbourhood = Mo.openNeighborhood;
-on(Mo, {
-  source: Iu(function(r) {
-    var u = this[0], c;
-    return u && (c = u._private.source || u.cy().collection()), c && r ? c.filter(r) : c;
-  }, "source"),
-  target: Iu(function(r) {
-    var u = this[0], c;
-    return u && (c = u._private.target || u.cy().collection()), c && r ? c.filter(r) : c;
-  }, "target"),
-  sources: rG({
-    attr: "source"
-  }),
-  targets: rG({
-    attr: "target"
-  })
-});
-function rG(a) {
-  return function(u) {
-    for (var c = [], d = 0; d < this.length; d++) {
-      var g = this[d], b = g._private[a.attr];
-      b && c.push(b);
-    }
-    return this.spawn(c, !0).filter(u);
-  };
-}
-on(Mo, {
-  edgesWith: Iu(iG(), "edgesWith"),
-  edgesTo: Iu(iG({
-    thisIsSrc: !0
-  }), "edgesTo")
-});
-function iG(a) {
-  return function(u) {
-    var c = [], d = this._private.cy, g = a || {};
-    qt(u) && (u = d.$(u));
-    for (var b = 0; b < u.length; b++)
-      for (var y = u[b]._private.edges, k = 0; k < y.length; k++) {
-        var E = y[k], C = E._private.data, T = this.hasElementWithId(C.source) && u.hasElementWithId(C.target), P = u.hasElementWithId(C.source) && this.hasElementWithId(C.target), N = T || P;
-        N && ((g.thisIsSrc || g.thisIsTgt) && (g.thisIsSrc && !T || g.thisIsTgt && !P) || c.push(E));
-      }
-    return this.spawn(c, !0);
-  };
-}
-on(Mo, {
-  connectedEdges: Iu(function(a) {
-    for (var r = [], u = this, c = 0; c < u.length; c++) {
-      var d = u[c];
-      if (d.isNode())
-        for (var g = d._private.edges, b = 0; b < g.length; b++) {
-          var y = g[b];
-          r.push(y);
-        }
-    }
-    return this.spawn(r, !0).filter(a);
-  }, "connectedEdges"),
-  connectedNodes: Iu(function(a) {
-    for (var r = [], u = this, c = 0; c < u.length; c++) {
-      var d = u[c];
-      d.isEdge() && (r.push(d.source()[0]), r.push(d.target()[0]));
-    }
-    return this.spawn(r, !0).filter(a);
-  }, "connectedNodes"),
-  parallelEdges: Iu(aG(), "parallelEdges"),
-  codirectedEdges: Iu(aG({
-    codirected: !0
-  }), "codirectedEdges")
-});
-function aG(a) {
-  var r = {
-    codirected: !1
-  };
-  return a = on({}, r, a), function(c) {
-    for (var d = [], g = this.edges(), b = a, y = 0; y < g.length; y++)
-      for (var k = g[y], E = k._private, C = E.source, T = C._private.data.id, P = E.data.target, N = C._private.edges, D = 0; D < N.length; D++) {
-        var H = N[D], _ = H._private.data, B = _.target, $ = _.source, F = B === P && $ === T, W = T === B && P === $;
-        (b.codirected && F || !b.codirected && (F || W)) && d.push(H);
-      }
-    return this.spawn(d, !0).filter(c);
-  };
-}
-on(Mo, {
-  components: function(r) {
-    var u = this, c = u.cy(), d = c.collection(), g = r == null ? u.nodes() : r.nodes(), b = [];
-    r != null && g.empty() && (g = r.sources());
-    var y = function(C, T) {
-      d.merge(C), g.unmerge(C), T.merge(C);
-    };
-    if (g.empty())
-      return u.spawn();
-    var k = function() {
-      var C = c.collection();
-      b.push(C);
-      var T = g[0];
-      y(T, C), u.bfs({
-        directed: !1,
-        roots: T,
-        visit: function(N) {
-          return y(N, C);
-        }
-      }), C.forEach(function(P) {
-        P.connectedEdges().forEach(function(N) {
-          u.has(N) && C.has(N.source()) && C.has(N.target()) && C.merge(N);
-        });
-      });
-    };
-    do
-      k();
-    while (g.length > 0);
-    return b;
-  },
-  component: function() {
-    var r = this[0];
-    return r.cy().mutableElements().components(r)[0];
-  }
-});
-Mo.componentsOf = Mo.components;
-var bo = function(r, u) {
-  var c = arguments.length > 2 && arguments[2] !== void 0 ? arguments[2] : !1, d = arguments.length > 3 && arguments[3] !== void 0 ? arguments[3] : !1;
-  if (r === void 0) {
-    Qi("A collection must have a reference to the core");
-    return;
-  }
-  var g = new El(), b = !1;
-  if (!u)
-    u = [];
-  else if (u.length > 0 && fr(u[0]) && !cw(u[0])) {
-    b = !0;
-    for (var y = [], k = new zb(), E = 0, C = u.length; E < C; E++) {
-      var T = u[E];
-      T.data == null && (T.data = {});
-      var P = T.data;
-      if (P.id == null)
-        P.id = XG();
-      else if (r.hasElementWithId(P.id) || k.has(P.id))
-        continue;
-      var N = new h5(r, T, !1);
-      y.push(N), k.add(P.id);
-    }
-    u = y;
-  }
-  this.length = 0;
-  for (var D = 0, H = u.length; D < H; D++) {
-    var _ = u[D][0];
-    if (_ != null) {
-      var B = _._private.data.id;
-      (!c || !g.has(B)) && (c && g.set(B, {
-        index: this.length,
-        ele: _
-      }), this[this.length] = _, this.length++);
-    }
-  }
-  this._private = {
-    eles: this,
-    cy: r,
-    get map() {
-      return this.lazyMap == null && this.rebuildMap(), this.lazyMap;
-    },
-    set map($) {
-      this.lazyMap = $;
-    },
-    rebuildMap: function() {
-      for (var F = this.lazyMap = new El(), W = this.eles, Q = 0; Q < W.length; Q++) {
-        var X = W[Q];
-        F.set(X.id(), {
-          index: Q,
-          ele: X
-        });
-      }
-    }
-  }, c && (this._private.map = g), b && !d && this.restore();
-}, si = h5.prototype = bo.prototype = Object.create(Array.prototype);
-si.instanceString = function() {
-  return "collection";
-};
-si.spawn = function(a, r) {
-  return new bo(this.cy(), a, r);
-};
-si.spawnSelf = function() {
-  return this.spawn(this);
-};
-si.cy = function() {
-  return this._private.cy;
-};
-si.renderer = function() {
-  return this._private.cy.renderer();
-};
-si.element = function() {
-  return this[0];
-};
-si.collection = function() {
-  return HG(this) ? this : new bo(this._private.cy, [this]);
-};
-si.unique = function() {
-  return new bo(this._private.cy, this, !0);
-};
-si.hasElementWithId = function(a) {
-  return a = "" + a, this._private.map.has(a);
-};
-si.getElementById = function(a) {
-  a = "" + a;
-  var r = this._private.cy, u = this._private.map.get(a);
-  return u ? u.ele : new bo(r);
-};
-si.$id = si.getElementById;
-si.poolIndex = function() {
-  var a = this._private.cy, r = a._private.elements, u = this[0]._private.data.id;
-  return r._private.map.get(u).index;
-};
-si.indexOf = function(a) {
-  var r = a[0]._private.data.id;
-  return this._private.map.get(r).index;
-};
-si.indexOfId = function(a) {
-  return a = "" + a, this._private.map.get(a).index;
-};
-si.json = function(a) {
-  var r = this.element(), u = this.cy();
-  if (r == null && a)
-    return this;
-  if (r != null) {
-    var c = r._private;
-    if (fr(a)) {
-      if (u.startBatch(), a.data) {
-        r.data(a.data);
-        var d = c.data;
-        if (r.isEdge()) {
-          var g = !1, b = {}, y = a.data.source, k = a.data.target;
-          y != null && y != d.source && (b.source = "" + y, g = !0), k != null && k != d.target && (b.target = "" + k, g = !0), g && (r = r.move(b));
-        } else {
-          var E = "parent" in a.data, C = a.data.parent;
-          E && (C != null || d.parent != null) && C != d.parent && (C === void 0 && (C = null), C != null && (C = "" + C), r = r.move({
-            parent: C
-          }));
-        }
-      }
-      a.position && r.position(a.position);
-      var T = function(H, _, B) {
-        var $ = a[H];
-        $ != null && $ !== c[H] && ($ ? r[_]() : r[B]());
-      };
-      return T("removed", "remove", "restore"), T("selected", "select", "unselect"), T("selectable", "selectify", "unselectify"), T("locked", "lock", "unlock"), T("grabbable", "grabify", "ungrabify"), T("pannable", "panify", "unpanify"), a.classes != null && r.classes(a.classes), u.endBatch(), this;
-    } else if (a === void 0) {
-      var P = {
-        data: kl(c.data),
-        position: kl(c.position),
-        group: c.group,
-        removed: c.removed,
-        selected: c.selected,
-        selectable: c.selectable,
-        locked: c.locked,
-        grabbable: c.grabbable,
-        pannable: c.pannable,
-        classes: null
-      };
-      P.classes = "";
-      var N = 0;
-      return c.classes.forEach(function(D) {
-        return P.classes += N++ === 0 ? D : " " + D;
-      }), P;
-    }
-  }
-};
-si.jsons = function() {
-  for (var a = [], r = 0; r < this.length; r++) {
-    var u = this[r], c = u.json();
-    a.push(c);
-  }
-  return a;
-};
-si.clone = function() {
-  for (var a = this.cy(), r = [], u = 0; u < this.length; u++) {
-    var c = this[u], d = c.json(), g = new h5(a, d, !1);
-    r.push(g);
-  }
-  return new bo(a, r);
-};
-si.copy = si.clone;
-si.restore = function() {
-  for (var a = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : !0, r = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : !0, u = this, c = u.cy(), d = c._private, g = [], b = [], y, k = 0, E = u.length; k < E; k++) {
-    var C = u[k];
-    r && !C.removed() || (C.isNode() ? g.push(C) : b.push(C));
-  }
-  y = g.concat(b);
-  var T, P = function() {
-    y.splice(T, 1), T--;
-  };
-  for (T = 0; T < y.length; T++) {
-    var N = y[T], D = N._private, H = D.data;
-    if (N.clearTraversalCache(), !(!r && !D.removed)) {
-      if (H.id === void 0)
-        H.id = XG();
-      else if (kt(H.id))
-        H.id = "" + H.id;
-      else if (zh(H.id) || !qt(H.id)) {
-        Qi("Can not create element with invalid string ID `" + H.id + "`"), P();
-        continue;
-      } else if (c.hasElementWithId(H.id)) {
-        Qi("Can not create second element with ID `" + H.id + "`"), P();
-        continue;
-      }
-    }
-    var _ = H.id;
-    if (N.isNode()) {
-      var B = D.position;
-      B.x == null && (B.x = 0), B.y == null && (B.y = 0);
-    }
-    if (N.isEdge()) {
-      for (var $ = N, F = ["source", "target"], W = F.length, Q = !1, X = 0; X < W; X++) {
-        var K = F[X], ee = H[K];
-        kt(ee) && (ee = H[K] = "" + H[K]), ee == null || ee === "" ? (Qi("Can not create edge `" + _ + "` with unspecified " + K), Q = !0) : c.hasElementWithId(ee) || (Qi("Can not create edge `" + _ + "` with nonexistant " + K + " `" + ee + "`"), Q = !0);
-      }
-      if (Q) {
-        P();
-        continue;
-      }
-      var Z = c.getElementById(H.source), ae = c.getElementById(H.target);
-      Z.same(ae) ? Z._private.edges.push($) : (Z._private.edges.push($), ae._private.edges.push($)), $._private.source = Z, $._private.target = ae;
-    }
-    D.map = new El(), D.map.set(_, {
-      ele: N,
-      index: 0
-    }), D.removed = !1, r && c.addToPool(N);
-  }
-  for (var oe = 0; oe < g.length; oe++) {
-    var J = g[oe], fe = J._private.data;
-    kt(fe.parent) && (fe.parent = "" + fe.parent);
-    var se = fe.parent, pe = se != null;
-    if (pe || J._private.parent) {
-      var he = J._private.parent ? c.collection().merge(J._private.parent) : c.getElementById(se);
-      if (he.empty())
-        fe.parent = void 0;
-      else if (he[0].removed())
-        Sr("Node added with missing parent, reference to parent removed"), fe.parent = void 0, J._private.parent = null;
-      else {
-        for (var de = !1, ke = he; !ke.empty(); ) {
-          if (J.same(ke)) {
-            de = !0, fe.parent = void 0;
-            break;
-          }
-          ke = ke.parent();
-        }
-        de || (he[0]._private.children.push(J), J._private.parent = he[0], d.hasCompoundNodes = !0);
-      }
-    }
-  }
-  if (y.length > 0) {
-    for (var Pe = y.length === u.length ? u : new bo(c, y), Ae = 0; Ae < Pe.length; Ae++) {
-      var Te = Pe[Ae];
-      Te.isNode() || (Te.parallelEdges().clearTraversalCache(), Te.source().clearTraversalCache(), Te.target().clearTraversalCache());
-    }
-    var Oe;
-    d.hasCompoundNodes ? Oe = c.collection().merge(Pe).merge(Pe.connectedNodes()).merge(Pe.parent()) : Oe = Pe, Oe.dirtyCompoundBoundsCache().dirtyBoundingBoxCache().updateStyle(a), a ? Pe.emitAndNotify("add") : r && Pe.emit("add");
-  }
-  return u;
-};
-si.removed = function() {
-  var a = this[0];
-  return a && a._private.removed;
-};
-si.inside = function() {
-  var a = this[0];
-  return a && !a._private.removed;
-};
-si.remove = function() {
-  var a = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : !0, r = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : !0, u = this, c = [], d = {}, g = u._private.cy;
-  function b(se) {
-    for (var pe = se._private.edges, he = 0; he < pe.length; he++)
-      k(pe[he]);
-  }
-  function y(se) {
-    for (var pe = se._private.children, he = 0; he < pe.length; he++)
-      k(pe[he]);
-  }
-  function k(se) {
-    var pe = d[se.id()];
-    r && se.removed() || pe || (d[se.id()] = !0, se.isNode() ? (c.push(se), b(se), y(se)) : c.unshift(se));
-  }
-  for (var E = 0, C = u.length; E < C; E++) {
-    var T = u[E];
-    k(T);
-  }
-  function P(se, pe) {
-    var he = se._private.edges;
-    Hh(he, pe), se.clearTraversalCache();
-  }
-  function N(se) {
-    se.clearTraversalCache();
-  }
-  var D = [];
-  D.ids = {};
-  function H(se, pe) {
-    pe = pe[0], se = se[0];
-    var he = se._private.children, de = se.id();
-    Hh(he, pe), pe._private.parent = null, D.ids[de] || (D.ids[de] = !0, D.push(se));
-  }
-  u.dirtyCompoundBoundsCache(), r && g.removeFromPool(c);
-  for (var _ = 0; _ < c.length; _++) {
-    var B = c[_];
-    if (B.isEdge()) {
-      var $ = B.source()[0], F = B.target()[0];
-      P($, B), P(F, B);
-      for (var W = B.parallelEdges(), Q = 0; Q < W.length; Q++) {
-        var X = W[Q];
-        N(X), X.isBundledBezier() && X.dirtyBoundingBoxCache();
-      }
-    } else {
-      var K = B.parent();
-      K.length !== 0 && H(K, B);
-    }
-    r && (B._private.removed = !0);
-  }
-  var ee = g._private.elements;
-  g._private.hasCompoundNodes = !1;
-  for (var Z = 0; Z < ee.length; Z++) {
-    var ae = ee[Z];
-    if (ae.isParent()) {
-      g._private.hasCompoundNodes = !0;
-      break;
-    }
-  }
-  var oe = new bo(this.cy(), c);
-  oe.size() > 0 && (a ? oe.emitAndNotify("remove") : r && oe.emit("remove"));
-  for (var J = 0; J < D.length; J++) {
-    var fe = D[J];
-    (!r || !fe.removed()) && fe.updateStyle();
-  }
-  return oe;
-};
-si.move = function(a) {
-  var r = this._private.cy, u = this, c = !1, d = !1, g = function(D) {
-    return D == null ? D : "" + D;
-  };
-  if (a.source !== void 0 || a.target !== void 0) {
-    var b = g(a.source), y = g(a.target), k = b != null && r.hasElementWithId(b), E = y != null && r.hasElementWithId(y);
-    (k || E) && (r.batch(function() {
-      u.remove(c, d), u.emitAndNotify("moveout");
-      for (var N = 0; N < u.length; N++) {
-        var D = u[N], H = D._private.data;
-        D.isEdge() && (k && (H.source = b), E && (H.target = y));
-      }
-      u.restore(c, d);
-    }), u.emitAndNotify("move"));
-  } else if (a.parent !== void 0) {
-    var C = g(a.parent), T = C === null || r.hasElementWithId(C);
-    if (T) {
-      var P = C === null ? void 0 : C;
-      r.batch(function() {
-        var N = u.remove(c, d);
-        N.emitAndNotify("moveout");
-        for (var D = 0; D < u.length; D++) {
-          var H = u[D], _ = H._private.data;
-          H.isNode() && (_.parent = P);
-        }
-        N.restore(c, d);
-      }), u.emitAndNotify("move");
-    }
-  }
-  return this;
-};
-[f$, mue, FE, Rh, Ob, Aue, g5, Zue, D$, j$, tce, e5, qE, go, Bh, Mo].forEach(function(a) {
-  on(si, a);
-});
-var uce = {
-  add: function(r) {
-    var u, c = this;
-    if (tu(r)) {
-      var d = r;
-      if (d._private.cy === c)
-        u = d.restore();
-      else {
-        for (var g = [], b = 0; b < d.length; b++) {
-          var y = d[b];
-          g.push(y.json());
-        }
-        u = new bo(c, g);
-      }
-    } else if (Qr(r)) {
-      var k = r;
-      u = new bo(c, k);
-    } else if (fr(r) && (Qr(r.nodes) || Qr(r.edges))) {
-      for (var E = r, C = [], T = ["nodes", "edges"], P = 0, N = T.length; P < N; P++) {
-        var D = T[P], H = E[D];
-        if (Qr(H))
-          for (var _ = 0, B = H.length; _ < B; _++) {
-            var $ = on({
-              group: D
-            }, H[_]);
-            C.push($);
-          }
-      }
-      u = new bo(c, C);
-    } else {
-      var F = r;
-      u = new h5(c, F).collection();
-    }
-    return u;
-  },
-  remove: function(r) {
-    if (!tu(r)) {
-      if (qt(r)) {
-        var u = r;
-        r = this.$(u);
-      }
-    }
-    return r.remove();
-  }
-};
-/*! Bezier curve function generator. Copyright Gaetan Renaudeau. MIT License: http://en.wikipedia.org/wiki/MIT_License */
-function cce(a, r, u, c) {
-  var d = 4, g = 1e-3, b = 1e-7, y = 10, k = 11, E = 1 / (k - 1), C = typeof Float32Array < "u";
-  if (arguments.length !== 4)
-    return !1;
-  for (var T = 0; T < 4; ++T)
-    if (typeof arguments[T] != "number" || isNaN(arguments[T]) || !isFinite(arguments[T]))
-      return !1;
-  a = Math.min(a, 1), u = Math.min(u, 1), a = Math.max(a, 0), u = Math.max(u, 0);
-  var P = C ? new Float32Array(k) : new Array(k);
-  function N(ae, oe) {
-    return 1 - 3 * oe + 3 * ae;
-  }
-  function D(ae, oe) {
-    return 3 * oe - 6 * ae;
-  }
-  function H(ae) {
-    return 3 * ae;
-  }
-  function _(ae, oe, J) {
-    return ((N(oe, J) * ae + D(oe, J)) * ae + H(oe)) * ae;
-  }
-  function B(ae, oe, J) {
-    return 3 * N(oe, J) * ae * ae + 2 * D(oe, J) * ae + H(oe);
-  }
-  function $(ae, oe) {
-    for (var J = 0; J < d; ++J) {
-      var fe = B(oe, a, u);
-      if (fe === 0)
-        return oe;
-      var se = _(oe, a, u) - ae;
-      oe -= se / fe;
-    }
-    return oe;
-  }
-  function F() {
-    for (var ae = 0; ae < k; ++ae)
-      P[ae] = _(ae * E, a, u);
-  }
-  function W(ae, oe, J) {
-    var fe, se, pe = 0;
-    do
-      se = oe + (J - oe) / 2, fe = _(se, a, u) - ae, fe > 0 ? J = se : oe = se;
-    while (Math.abs(fe) > b && ++pe < y);
-    return se;
-  }
-  function Q(ae) {
-    for (var oe = 0, J = 1, fe = k - 1; J !== fe && P[J] <= ae; ++J)
-      oe += E;
-    --J;
-    var se = (ae - P[J]) / (P[J + 1] - P[J]), pe = oe + se * E, he = B(pe, a, u);
-    return he >= g ? $(ae, pe) : he === 0 ? pe : W(ae, oe, oe + E);
-  }
-  var X = !1;
-  function K() {
-    X = !0, (a !== r || u !== c) && F();
-  }
-  var ee = function(oe) {
-    return X || K(), a === r && u === c ? oe : oe === 0 ? 0 : oe === 1 ? 1 : _(Q(oe), r, c);
-  };
-  ee.getControlPoints = function() {
-    return [{
-      x: a,
-      y: r
-    }, {
-      x: u,
-      y: c
-    }];
-  };
-  var Z = "generateBezier(" + [a, r, u, c] + ")";
-  return ee.toString = function() {
-    return Z;
-  }, ee;
-}
-/*! Runge-Kutta spring physics function generator. Adapted from Framer.js, copyright Koen Bok. MIT License: http://en.wikipedia.org/wiki/MIT_License */
-var lce = function() {
-  function a(c) {
-    return -c.tension * c.x - c.friction * c.v;
-  }
-  function r(c, d, g) {
-    var b = {
-      x: c.x + g.dx * d,
-      v: c.v + g.dv * d,
-      tension: c.tension,
-      friction: c.friction
-    };
-    return {
-      dx: b.v,
-      dv: a(b)
-    };
-  }
-  function u(c, d) {
-    var g = {
-      dx: c.v,
-      dv: a(c)
-    }, b = r(c, d * 0.5, g), y = r(c, d * 0.5, b), k = r(c, d, y), E = 1 / 6 * (g.dx + 2 * (b.dx + y.dx) + k.dx), C = 1 / 6 * (g.dv + 2 * (b.dv + y.dv) + k.dv);
-    return c.x = c.x + E * d, c.v = c.v + C * d, c;
-  }
-  return function c(d, g, b) {
-    var y = {
-      x: -1,
-      v: 0,
-      tension: null,
-      friction: null
-    }, k = [0], E = 0, C = 1 / 1e4, T = 16 / 1e3, P, N, D;
-    for (d = parseFloat(d) || 500, g = parseFloat(g) || 20, b = b || null, y.tension = d, y.friction = g, P = b !== null, P ? (E = c(d, g), N = E / b * T) : N = T; D = u(D || y, N), k.push(1 + D.x), E += 16, Math.abs(D.x) > C && Math.abs(D.v) > C; )
-      ;
-    return P ? function(H) {
-      return k[H * (k.length - 1) | 0];
-    } : E;
-  };
-}(), oi = function(r, u, c, d) {
-  var g = cce(r, u, c, d);
-  return function(b, y, k) {
-    return b + (y - b) * g(k);
-  };
-}, VE = {
-  linear: function(r, u, c) {
-    return r + (u - r) * c;
-  },
-  // default easings
-  ease: oi(0.25, 0.1, 0.25, 1),
-  "ease-in": oi(0.42, 0, 1, 1),
-  "ease-out": oi(0, 0, 0.58, 1),
-  "ease-in-out": oi(0.42, 0, 0.58, 1),
-  // sine
-  "ease-in-sine": oi(0.47, 0, 0.745, 0.715),
-  "ease-out-sine": oi(0.39, 0.575, 0.565, 1),
-  "ease-in-out-sine": oi(0.445, 0.05, 0.55, 0.95),
-  // quad
-  "ease-in-quad": oi(0.55, 0.085, 0.68, 0.53),
-  "ease-out-quad": oi(0.25, 0.46, 0.45, 0.94),
-  "ease-in-out-quad": oi(0.455, 0.03, 0.515, 0.955),
-  // cubic
-  "ease-in-cubic": oi(0.55, 0.055, 0.675, 0.19),
-  "ease-out-cubic": oi(0.215, 0.61, 0.355, 1),
-  "ease-in-out-cubic": oi(0.645, 0.045, 0.355, 1),
-  // quart
-  "ease-in-quart": oi(0.895, 0.03, 0.685, 0.22),
-  "ease-out-quart": oi(0.165, 0.84, 0.44, 1),
-  "ease-in-out-quart": oi(0.77, 0, 0.175, 1),
-  // quint
-  "ease-in-quint": oi(0.755, 0.05, 0.855, 0.06),
-  "ease-out-quint": oi(0.23, 1, 0.32, 1),
-  "ease-in-out-quint": oi(0.86, 0, 0.07, 1),
-  // expo
-  "ease-in-expo": oi(0.95, 0.05, 0.795, 0.035),
-  "ease-out-expo": oi(0.19, 1, 0.22, 1),
-  "ease-in-out-expo": oi(1, 0, 0, 1),
-  // circ
-  "ease-in-circ": oi(0.6, 0.04, 0.98, 0.335),
-  "ease-out-circ": oi(0.075, 0.82, 0.165, 1),
-  "ease-in-out-circ": oi(0.785, 0.135, 0.15, 0.86),
-  // user param easings...
-  spring: function(r, u, c) {
-    if (c === 0)
-      return VE.linear;
-    var d = lce(r, u, c);
-    return function(g, b, y) {
-      return g + (b - g) * d(y);
-    };
-  },
-  "cubic-bezier": oi
-};
-function oG(a, r, u, c, d) {
-  if (c === 1 || r === u)
-    return u;
-  var g = d(r, u, c);
-  return a == null || ((a.roundValue || a.color) && (g = Math.round(g)), a.min !== void 0 && (g = Math.max(g, a.min)), a.max !== void 0 && (g = Math.min(g, a.max))), g;
-}
-function sG(a, r) {
-  return a.pfValue != null || a.value != null ? a.pfValue != null && (r == null || r.type.units !== "%") ? a.pfValue : a.value : a;
-}
-function kb(a, r, u, c, d) {
-  var g = d != null ? d.type : null;
-  u < 0 ? u = 0 : u > 1 && (u = 1);
-  var b = sG(a, d), y = sG(r, d);
-  if (kt(b) && kt(y))
-    return oG(g, b, y, u, c);
-  if (Qr(b) && Qr(y)) {
-    for (var k = [], E = 0; E < y.length; E++) {
-      var C = b[E], T = y[E];
-      if (C != null && T != null) {
-        var P = oG(g, C, T, u, c);
-        k.push(P);
-      } else
-        k.push(T);
-    }
-    return k;
-  }
-}
-function fce(a, r, u, c) {
-  var d = !c, g = a._private, b = r._private, y = b.easing, k = b.startTime, E = c ? a : a.cy(), C = E.style();
-  if (!b.easingImpl)
-    if (y == null)
-      b.easingImpl = VE.linear;
-    else {
-      var T;
-      if (qt(y)) {
-        var P = C.parse("transition-timing-function", y);
-        T = P.value;
-      } else
-        T = y;
-      var N, D;
-      qt(T) ? (N = T, D = []) : (N = T[1], D = T.slice(2).map(function(Pe) {
-        return +Pe;
-      })), D.length > 0 ? (N === "spring" && D.push(b.duration), b.easingImpl = VE[N].apply(null, D)) : b.easingImpl = VE[N];
-    }
-  var H = b.easingImpl, _;
-  if (b.duration === 0 ? _ = 1 : _ = (u - k) / b.duration, b.applying && (_ = b.progress), _ < 0 ? _ = 0 : _ > 1 && (_ = 1), b.delay == null) {
-    var B = b.startPosition, $ = b.position;
-    if ($ && d && !a.locked()) {
-      var F = {};
-      _p(B.x, $.x) && (F.x = kb(B.x, $.x, _, H)), _p(B.y, $.y) && (F.y = kb(B.y, $.y, _, H)), a.position(F);
-    }
-    var W = b.startPan, Q = b.pan, X = g.pan, K = Q != null && c;
-    K && (_p(W.x, Q.x) && (X.x = kb(W.x, Q.x, _, H)), _p(W.y, Q.y) && (X.y = kb(W.y, Q.y, _, H)), a.emit("pan"));
-    var ee = b.startZoom, Z = b.zoom, ae = Z != null && c;
-    ae && (_p(ee, Z) && (g.zoom = Qp(g.minZoom, kb(ee, Z, _, H), g.maxZoom)), a.emit("zoom")), (K || ae) && a.emit("viewport");
-    var oe = b.style;
-    if (oe && oe.length > 0 && d) {
-      for (var J = 0; J < oe.length; J++) {
-        var fe = oe[J], se = fe.name, pe = fe, he = b.startStyle[se], de = C.properties[he.name], ke = kb(he, pe, _, H, de);
-        C.overrideBypass(a, se, ke);
-      }
-      a.emit("style");
-    }
-  }
-  return b.progress = _, _;
-}
-function _p(a, r) {
-  return a == null || r == null ? !1 : kt(a) && kt(r) ? !0 : !!(a && r);
-}
-function hce(a, r, u, c) {
-  var d = r._private;
-  d.started = !0, d.startTime = u - d.progress * d.duration;
-}
-function uG(a, r) {
-  var u = r._private.aniEles, c = [];
-  function d(C, T) {
-    var P = C._private, N = P.animation.current, D = P.animation.queue, H = !1;
-    if (N.length === 0) {
-      var _ = D.shift();
-      _ && N.push(_);
-    }
-    for (var B = function(X) {
-      for (var K = X.length - 1; K >= 0; K--) {
-        var ee = X[K];
-        ee();
-      }
-      X.splice(0, X.length);
-    }, $ = N.length - 1; $ >= 0; $--) {
-      var F = N[$], W = F._private;
-      if (W.stopped) {
-        N.splice($, 1), W.hooked = !1, W.playing = !1, W.started = !1, B(W.frames);
-        continue;
-      }
-      !W.playing && !W.applying || (W.playing && W.applying && (W.applying = !1), W.started || hce(C, F, a), fce(C, F, a, T), W.applying && (W.applying = !1), B(W.frames), W.step != null && W.step(a), F.completed() && (N.splice($, 1), W.hooked = !1, W.playing = !1, W.started = !1, B(W.completes)), H = !0);
-    }
-    return !T && N.length === 0 && D.length === 0 && c.push(C), H;
-  }
-  for (var g = !1, b = 0; b < u.length; b++) {
-    var y = u[b], k = d(y);
-    g = g || k;
-  }
-  var E = d(r, !0);
-  (g || E) && (u.length > 0 ? r.notify("draw", u) : r.notify("draw")), u.unmerge(c), r.emit("step");
-}
-var dce = {
-  // pull in animation functions
-  animate: Mr.animate(),
-  animation: Mr.animation(),
-  animated: Mr.animated(),
-  clearQueue: Mr.clearQueue(),
-  delay: Mr.delay(),
-  delayAnimation: Mr.delayAnimation(),
-  stop: Mr.stop(),
-  addToAnimationPool: function(r) {
-    var u = this;
-    u.styleEnabled() && u._private.aniEles.merge(r);
-  },
-  stopAnimationLoop: function() {
-    this._private.animationsRunning = !1;
-  },
-  startAnimationLoop: function() {
-    var r = this;
-    if (r._private.animationsRunning = !0, !r.styleEnabled())
-      return;
-    function u() {
-      r._private.animationsRunning && XE(function(g) {
-        uG(g, r), u();
-      });
-    }
-    var c = r.renderer();
-    c && c.beforeRender ? c.beforeRender(function(g, b) {
-      uG(b, r);
-    }, c.beforeRenderPriorities.animations) : u();
-  }
-}, vce = {
-  qualifierCompare: function(r, u) {
-    return r == null || u == null ? r == null && u == null : r.sameText(u);
-  },
-  eventMatches: function(r, u, c) {
-    var d = u.qualifier;
-    return d != null ? r !== c.target && cw(c.target) && d.matches(c.target) : !0;
-  },
-  addEventFields: function(r, u) {
-    u.cy = r, u.target = r;
-  },
-  callbackContext: function(r, u, c) {
-    return u.qualifier != null ? c.target : r;
-  }
-}, _E = function(r) {
-  return qt(r) ? new _h(r) : r;
-}, M$ = {
-  createEmitter: function() {
-    var r = this._private;
-    return r.emitter || (r.emitter = new b5(vce, this)), this;
-  },
-  emitter: function() {
-    return this._private.emitter;
-  },
-  on: function(r, u, c) {
-    return this.emitter().on(r, _E(u), c), this;
-  },
-  removeListener: function(r, u, c) {
-    return this.emitter().removeListener(r, _E(u), c), this;
-  },
-  removeAllListeners: function() {
-    return this.emitter().removeAllListeners(), this;
-  },
-  one: function(r, u, c) {
-    return this.emitter().one(r, _E(u), c), this;
-  },
-  once: function(r, u, c) {
-    return this.emitter().one(r, _E(u), c), this;
-  },
-  emit: function(r, u) {
-    return this.emitter().emit(r, u), this;
-  },
-  emitAndNotify: function(r, u) {
-    return this.emit(r), this.notify(r, u), this;
-  }
-};
-Mr.eventAliasesOn(M$);
-var g6 = {
-  png: function(r) {
-    var u = this._private.renderer;
-    return r = r || {}, u.png(r);
-  },
-  jpg: function(r) {
-    var u = this._private.renderer;
-    return r = r || {}, r.bg = r.bg || "#fff", u.jpg(r);
-  }
-};
-g6.jpeg = g6.jpg;
-var WE = {
-  layout: function(r) {
-    var u = this;
-    if (r == null) {
-      Qi("Layout options must be specified to make a layout");
-      return;
-    }
-    if (r.name == null) {
-      Qi("A `name` must be specified to make a layout");
-      return;
-    }
-    var c = r.name, d = u.extension("layout", c);
-    if (d == null) {
-      Qi("No such layout `" + c + "` found.  Did you forget to import it and `cytoscape.use()` it?");
-      return;
-    }
-    var g;
-    qt(r.eles) ? g = u.$(r.eles) : g = r.eles != null ? r.eles : u.$();
-    var b = new d(on({}, r, {
-      cy: u,
-      eles: g
-    }));
-    return b;
-  }
-};
-WE.createLayout = WE.makeLayout = WE.layout;
-var gce = {
-  notify: function(r, u) {
-    var c = this._private;
-    if (this.batching()) {
-      c.batchNotifications = c.batchNotifications || {};
-      var d = c.batchNotifications[r] = c.batchNotifications[r] || this.collection();
-      u != null && d.merge(u);
-      return;
-    }
-    if (c.notificationsEnabled) {
-      var g = this.renderer();
-      this.destroyed() || !g || g.notify(r, u);
-    }
-  },
-  notifications: function(r) {
-    var u = this._private;
-    return r === void 0 ? u.notificationsEnabled : (u.notificationsEnabled = !!r, this);
-  },
-  noNotifications: function(r) {
-    this.notifications(!1), r(), this.notifications(!0);
-  },
-  batching: function() {
-    return this._private.batchCount > 0;
-  },
-  startBatch: function() {
-    var r = this._private;
-    return r.batchCount == null && (r.batchCount = 0), r.batchCount === 0 && (r.batchStyleEles = this.collection(), r.batchNotifications = {}), r.batchCount++, this;
-  },
-  endBatch: function() {
-    var r = this._private;
-    if (r.batchCount === 0)
-      return this;
-    if (r.batchCount--, r.batchCount === 0) {
-      r.batchStyleEles.updateStyle();
-      var u = this.renderer();
-      Object.keys(r.batchNotifications).forEach(function(c) {
-        var d = r.batchNotifications[c];
-        d.empty() ? u.notify(c) : u.notify(c, d);
-      });
-    }
-    return this;
-  },
-  batch: function(r) {
-    return this.startBatch(), r(), this.endBatch(), this;
-  },
-  // for backwards compatibility
-  batchData: function(r) {
-    var u = this;
-    return this.batch(function() {
-      for (var c = Object.keys(r), d = 0; d < c.length; d++) {
-        var g = c[d], b = r[g], y = u.getElementById(g);
-        y.data(b);
-      }
-    });
-  }
-}, bce = po({
-  hideEdgesOnViewport: !1,
-  textureOnViewport: !1,
-  motionBlur: !1,
-  motionBlurOpacity: 0.05,
-  pixelRatio: void 0,
-  desktopTapThreshold: 4,
-  touchTapThreshold: 8,
-  wheelSensitivity: 1,
-  debug: !1,
-  showFps: !1
-}), b6 = {
-  renderTo: function(r, u, c, d) {
-    var g = this._private.renderer;
-    return g.renderTo(r, u, c, d), this;
-  },
-  renderer: function() {
-    return this._private.renderer;
-  },
-  forceRender: function() {
-    return this.notify("draw"), this;
-  },
-  resize: function() {
-    return this.invalidateSize(), this.emitAndNotify("resize"), this;
-  },
-  initRenderer: function(r) {
-    var u = this, c = u.extension("renderer", r.name);
-    if (c == null) {
-      Qi("Can not initialise: No such renderer `".concat(r.name, "` found. Did you forget to import it and `cytoscape.use()` it?"));
-      return;
-    }
-    r.wheelSensitivity !== void 0 && Sr("You have set a custom wheel sensitivity.  This will make your app zoom unnaturally when using mainstream mice.  You should change this value from the default only if you can guarantee that all your users will use the same hardware and OS configuration as your current machine.");
-    var d = bce(r);
-    d.cy = u, u._private.renderer = new c(d), this.notify("init");
-  },
-  destroyRenderer: function() {
-    var r = this;
-    r.notify("destroy");
-    var u = r.container();
-    if (u)
-      for (u._cyreg = null; u.childNodes.length > 0; )
-        u.removeChild(u.childNodes[0]);
-    r._private.renderer = null, r.mutableElements().forEach(function(c) {
-      var d = c._private;
-      d.rscratch = {}, d.rstyle = {}, d.animation.current = [], d.animation.queue = [];
-    });
-  },
-  onRender: function(r) {
-    return this.on("render", r);
-  },
-  offRender: function(r) {
-    return this.off("render", r);
-  }
-};
-b6.invalidateDimensions = b6.resize;
-var UE = {
-  // get a collection
-  // - empty collection on no args
-  // - collection of elements in the graph on selector arg
-  // - guarantee a returned collection when elements or collection specified
-  collection: function(r, u) {
-    return qt(r) ? this.$(r) : tu(r) ? r.collection() : Qr(r) ? (u || (u = {}), new bo(this, r, u.unique, u.removed)) : new bo(this);
-  },
-  nodes: function(r) {
-    var u = this.$(function(c) {
-      return c.isNode();
-    });
-    return r ? u.filter(r) : u;
-  },
-  edges: function(r) {
-    var u = this.$(function(c) {
-      return c.isEdge();
-    });
-    return r ? u.filter(r) : u;
-  },
-  // search the graph like jQuery
-  $: function(r) {
-    var u = this._private.elements;
-    return r ? u.filter(r) : u.spawnSelf();
-  },
-  mutableElements: function() {
-    return this._private.elements;
-  }
-};
-UE.elements = UE.filter = UE.$;
-var Ao = {}, Vp = "t", pce = "f";
-Ao.apply = function(a) {
-  for (var r = this, u = r._private, c = u.cy, d = c.collection(), g = 0; g < a.length; g++) {
-    var b = a[g], y = r.getContextMeta(b);
-    if (!y.empty) {
-      var k = r.getContextStyle(y), E = r.applyContextStyle(y, k, b);
-      b._private.appliedInitStyle ? r.updateTransitions(b, E.diffProps) : b._private.appliedInitStyle = !0;
-      var C = r.updateStyleHints(b);
-      C && d.push(b);
-    }
-  }
-  return d;
-};
-Ao.getPropertiesDiff = function(a, r) {
-  var u = this, c = u._private.propDiffs = u._private.propDiffs || {}, d = a + "-" + r, g = c[d];
-  if (g)
-    return g;
-  for (var b = [], y = {}, k = 0; k < u.length; k++) {
-    var E = u[k], C = a[k] === Vp, T = r[k] === Vp, P = C !== T, N = E.mappedProperties.length > 0;
-    if (P || T && N) {
-      var D = void 0;
-      P && N || P ? D = E.properties : N && (D = E.mappedProperties);
-      for (var H = 0; H < D.length; H++) {
-        for (var _ = D[H], B = _.name, $ = !1, F = k + 1; F < u.length; F++) {
-          var W = u[F], Q = r[F] === Vp;
-          if (Q && ($ = W.properties[_.name] != null, $))
-            break;
-        }
-        !y[B] && !$ && (y[B] = !0, b.push(B));
-      }
-    }
-  }
-  return c[d] = b, b;
-};
-Ao.getContextMeta = function(a) {
-  for (var r = this, u = "", c, d = a._private.styleCxtKey || "", g = 0; g < r.length; g++) {
-    var b = r[g], y = b.selector && b.selector.matches(a);
-    y ? u += Vp : u += pce;
-  }
-  return c = r.getPropertiesDiff(d, u), a._private.styleCxtKey = u, {
-    key: u,
-    diffPropNames: c,
-    empty: c.length === 0
-  };
-};
-Ao.getContextStyle = function(a) {
-  var r = a.key, u = this, c = this._private.contextStyles = this._private.contextStyles || {};
-  if (c[r])
-    return c[r];
-  for (var d = {
-    _private: {
-      key: r
-    }
-  }, g = 0; g < u.length; g++) {
-    var b = u[g], y = r[g] === Vp;
-    if (y)
-      for (var k = 0; k < b.properties.length; k++) {
-        var E = b.properties[k];
-        d[E.name] = E;
-      }
-  }
-  return c[r] = d, d;
-};
-Ao.applyContextStyle = function(a, r, u) {
-  for (var c = this, d = a.diffPropNames, g = {}, b = c.types, y = 0; y < d.length; y++) {
-    var k = d[y], E = r[k], C = u.pstyle(k);
-    if (!E)
-      if (C)
-        C.bypass ? E = {
-          name: k,
-          deleteBypassed: !0
-        } : E = {
-          name: k,
-          delete: !0
-        };
-      else
-        continue;
-    if (C !== E) {
-      if (E.mapped === b.fn && C != null && C.mapping != null && C.mapping.value === E.value) {
-        var T = C.mapping, P = T.fnValue = E.value(u);
-        if (P === T.prevFnValue)
-          continue;
-      }
-      var N = g[k] = {
-        prev: C
-      };
-      c.applyParsedProperty(u, E), N.next = u.pstyle(k), N.next && N.next.bypass && (N.next = N.next.bypassed);
-    }
-  }
-  return {
-    diffProps: g
-  };
-};
-Ao.updateStyleHints = function(a) {
-  var r = a._private, u = this, c = u.propertyGroupNames, d = u.propertyGroupKeys, g = function(at, ft, en) {
-    return u.getPropertiesHash(at, ft, en);
-  }, b = r.styleKey;
-  if (a.removed())
-    return !1;
-  var y = r.group === "nodes", k = a._private.style;
-  c = Object.keys(k);
-  for (var E = 0; E < d.length; E++) {
-    var C = d[E];
-    r.styleKeys[C] = [xb, $p];
-  }
-  for (var T = function(at, ft) {
-    return r.styleKeys[ft][0] = Kp(at, r.styleKeys[ft][0]);
-  }, P = function(at, ft) {
-    return r.styleKeys[ft][1] = Zp(at, r.styleKeys[ft][1]);
-  }, N = function(at, ft) {
-    T(at, ft), P(at, ft);
-  }, D = function(at, ft) {
-    for (var en = 0; en < at.length; en++) {
-      var gn = at.charCodeAt(en);
-      T(gn, ft), P(gn, ft);
-    }
-  }, H = 2e9, _ = function(at) {
-    return -128 < at && at < 128 && Math.floor(at) !== at ? H - (at * 1024 | 0) : at;
-  }, B = 0; B < c.length; B++) {
-    var $ = c[B], F = k[$];
-    if (F != null) {
-      var W = this.properties[$], Q = W.type, X = W.groupKey, K = void 0;
-      W.hashOverride != null ? K = W.hashOverride(a, F) : F.pfValue != null && (K = F.pfValue);
-      var ee = W.enums == null ? F.value : null, Z = K != null, ae = ee != null, oe = Z || ae, J = F.units;
-      if (Q.number && oe && !Q.multiple) {
-        var fe = Z ? K : ee;
-        N(_(fe), X), !Z && J != null && D(J, X);
-      } else
-        D(F.strValue, X);
-    }
-  }
-  for (var se = [xb, $p], pe = 0; pe < d.length; pe++) {
-    var he = d[pe], de = r.styleKeys[he];
-    se[0] = Kp(de[0], se[0]), se[1] = Zp(de[1], se[1]);
-  }
-  r.styleKey = Noe(se[0], se[1]);
-  var ke = r.styleKeys;
-  r.labelDimsKey = Ih(ke.labelDimensions);
-  var Pe = g(a, ["label"], ke.labelDimensions);
-  if (r.labelKey = Ih(Pe), r.labelStyleKey = Ih(NE(ke.commonLabel, Pe)), !y) {
-    var Ae = g(a, ["source-label"], ke.labelDimensions);
-    r.sourceLabelKey = Ih(Ae), r.sourceLabelStyleKey = Ih(NE(ke.commonLabel, Ae));
-    var Te = g(a, ["target-label"], ke.labelDimensions);
-    r.targetLabelKey = Ih(Te), r.targetLabelStyleKey = Ih(NE(ke.commonLabel, Te));
-  }
-  if (y) {
-    var Oe = r.styleKeys, ze = Oe.nodeBody, We = Oe.nodeBorder, $e = Oe.backgroundImage, Ge = Oe.compound, me = Oe.pie, Ve = [ze, We, $e, Ge, me].filter(function(Ke) {
-      return Ke != null;
-    }).reduce(NE, [xb, $p]);
-    r.nodeKey = Ih(Ve), r.hasPie = me != null && me[0] !== xb && me[1] !== $p;
-  }
-  return b !== r.styleKey;
-};
-Ao.clearStyleHints = function(a) {
-  var r = a._private;
-  r.styleCxtKey = "", r.styleKeys = {}, r.styleKey = null, r.labelKey = null, r.labelStyleKey = null, r.sourceLabelKey = null, r.sourceLabelStyleKey = null, r.targetLabelKey = null, r.targetLabelStyleKey = null, r.nodeKey = null, r.hasPie = null;
-};
-Ao.applyParsedProperty = function(a, r) {
-  var u = this, c = r, d = a._private.style, g, b = u.types, y = u.properties[c.name].type, k = c.bypass, E = d[c.name], C = E && E.bypass, T = a._private, P = "mapping", N = function(ze) {
-    return ze == null ? null : ze.pfValue != null ? ze.pfValue : ze.value;
-  }, D = function() {
-    var ze = N(E), We = N(c);
-    u.checkTriggers(a, c.name, ze, We);
-  };
-  if (c && c.name.substr(0, 3) === "pie" && Sr("The pie style properties are deprecated.  Create charts using background images instead."), r.name === "curve-style" && a.isEdge() && // loops must be bundled beziers
-  (r.value !== "bezier" && a.isLoop() || // edges connected to compound nodes can not be haystacks
-  r.value === "haystack" && (a.source().isParent() || a.target().isParent())) && (c = r = this.parse(r.name, "bezier", k)), c.delete)
-    return d[c.name] = void 0, D(), !0;
-  if (c.deleteBypassed)
-    return E ? E.bypass ? (E.bypassed = void 0, D(), !0) : !1 : (D(), !0);
-  if (c.deleteBypass)
-    return E ? E.bypass ? (d[c.name] = E.bypassed, D(), !0) : !1 : (D(), !0);
-  var H = function() {
-    Sr("Do not assign mappings to elements without corresponding data (i.e. ele `" + a.id() + "` has no mapping for property `" + c.name + "` with data field `" + c.field + "`); try a `[" + c.field + "]` selector to limit scope to elements with `" + c.field + "` defined");
-  };
-  switch (c.mapped) {
-    case b.mapData: {
-      for (var _ = c.field.split("."), B = T.data, $ = 0; $ < _.length && B; $++) {
-        var F = _[$];
-        B = B[F];
-      }
-      if (B == null)
-        return H(), !1;
-      var W;
-      if (kt(B)) {
-        var Q = c.fieldMax - c.fieldMin;
-        Q === 0 ? W = 0 : W = (B - c.fieldMin) / Q;
-      } else
-        return Sr("Do not use continuous mappers without specifying numeric data (i.e. `" + c.field + ": " + B + "` for `" + a.id() + "` is non-numeric)"), !1;
-      if (W < 0 ? W = 0 : W > 1 && (W = 1), y.color) {
-        var X = c.valueMin[0], K = c.valueMax[0], ee = c.valueMin[1], Z = c.valueMax[1], ae = c.valueMin[2], oe = c.valueMax[2], J = c.valueMin[3] == null ? 1 : c.valueMin[3], fe = c.valueMax[3] == null ? 1 : c.valueMax[3], se = [Math.round(X + (K - X) * W), Math.round(ee + (Z - ee) * W), Math.round(ae + (oe - ae) * W), Math.round(J + (fe - J) * W)];
-        g = {
-          // colours are simple, so just create the flat property instead of expensive string parsing
-          bypass: c.bypass,
-          // we're a bypass if the mapping property is a bypass
-          name: c.name,
-          value: se,
-          strValue: "rgb(" + se[0] + ", " + se[1] + ", " + se[2] + ")"
-        };
-      } else if (y.number) {
-        var pe = c.valueMin + (c.valueMax - c.valueMin) * W;
-        g = this.parse(c.name, pe, c.bypass, P);
-      } else
-        return !1;
-      if (!g)
-        return H(), !1;
-      g.mapping = c, c = g;
-      break;
-    }
-    case b.data: {
-      for (var he = c.field.split("."), de = T.data, ke = 0; ke < he.length && de; ke++) {
-        var Pe = he[ke];
-        de = de[Pe];
-      }
-      if (de != null && (g = this.parse(c.name, de, c.bypass, P)), !g)
-        return H(), !1;
-      g.mapping = c, c = g;
-      break;
-    }
-    case b.fn: {
-      var Ae = c.value, Te = c.fnValue != null ? c.fnValue : Ae(a);
-      if (c.prevFnValue = Te, Te == null)
-        return Sr("Custom function mappers may not return null (i.e. `" + c.name + "` for ele `" + a.id() + "` is null)"), !1;
-      if (g = this.parse(c.name, Te, c.bypass, P), !g)
-        return Sr("Custom function mappers may not return invalid values for the property type (i.e. `" + c.name + "` for ele `" + a.id() + "` is invalid)"), !1;
-      g.mapping = kl(c), c = g;
-      break;
-    }
-    case void 0:
-      break;
-    default:
-      return !1;
-  }
-  return k ? (C ? c.bypassed = E.bypassed : c.bypassed = E, d[c.name] = c) : C ? E.bypassed = c : d[c.name] = c, D(), !0;
-};
-Ao.cleanElements = function(a, r) {
-  for (var u = 0; u < a.length; u++) {
-    var c = a[u];
-    if (this.clearStyleHints(c), c.dirtyCompoundBoundsCache(), c.dirtyBoundingBoxCache(), !r)
-      c._private.style = {};
-    else
-      for (var d = c._private.style, g = Object.keys(d), b = 0; b < g.length; b++) {
-        var y = g[b], k = d[y];
-        k != null && (k.bypass ? k.bypassed = null : d[y] = null);
-      }
-  }
-};
-Ao.update = function() {
-  var a = this._private.cy, r = a.mutableElements();
-  r.updateStyle();
-};
-Ao.updateTransitions = function(a, r) {
-  var u = this, c = a._private, d = a.pstyle("transition-property").value, g = a.pstyle("transition-duration").pfValue, b = a.pstyle("transition-delay").pfValue;
-  if (d.length > 0 && g > 0) {
-    for (var y = {}, k = !1, E = 0; E < d.length; E++) {
-      var C = d[E], T = a.pstyle(C), P = r[C];
-      if (P) {
-        var N = P.prev, D = N, H = P.next != null ? P.next : T, _ = !1, B = void 0, $ = 1e-6;
-        D && (kt(D.pfValue) && kt(H.pfValue) ? (_ = H.pfValue - D.pfValue, B = D.pfValue + $ * _) : kt(D.value) && kt(H.value) ? (_ = H.value - D.value, B = D.value + $ * _) : Qr(D.value) && Qr(H.value) && (_ = D.value[0] !== H.value[0] || D.value[1] !== H.value[1] || D.value[2] !== H.value[2], B = D.strValue), _ && (y[C] = H.strValue, this.applyBypass(a, C, B), k = !0));
-      }
-    }
-    if (!k)
-      return;
-    c.transitioning = !0, new Hb(function(F) {
-      b > 0 ? a.delayAnimation(b).play().promise().then(F) : F();
-    }).then(function() {
-      return a.animation({
-        style: y,
-        duration: g,
-        easing: a.pstyle("transition-timing-function").value,
-        queue: !1
-      }).play().promise();
-    }).then(function() {
-      u.removeBypasses(a, d), a.emitAndNotify("style"), c.transitioning = !1;
-    });
-  } else
-    c.transitioning && (this.removeBypasses(a, d), a.emitAndNotify("style"), c.transitioning = !1);
-};
-Ao.checkTrigger = function(a, r, u, c, d, g) {
-  var b = this.properties[r], y = d(b);
-  y != null && y(u, c) && g(b);
-};
-Ao.checkZOrderTrigger = function(a, r, u, c) {
-  var d = this;
-  this.checkTrigger(a, r, u, c, function(g) {
-    return g.triggersZOrder;
-  }, function() {
-    d._private.cy.notify("zorder", a);
-  });
-};
-Ao.checkBoundsTrigger = function(a, r, u, c) {
-  this.checkTrigger(a, r, u, c, function(d) {
-    return d.triggersBounds;
-  }, function(d) {
-    a.dirtyCompoundBoundsCache(), a.dirtyBoundingBoxCache(), // only for beziers -- so performance of other edges isn't affected
-    d.triggersBoundsOfParallelBeziers && (r === "curve-style" && (u === "bezier" || c === "bezier") || r === "display" && (u === "none" || c === "none")) && a.parallelEdges().forEach(function(g) {
-      g.isBundledBezier() && g.dirtyBoundingBoxCache();
-    });
-  });
-};
-Ao.checkTriggers = function(a, r, u, c) {
-  a.dirtyStyleCache(), this.checkZOrderTrigger(a, r, u, c), this.checkBoundsTrigger(a, r, u, c);
-};
-var hw = {};
-hw.applyBypass = function(a, r, u, c) {
-  var d = this, g = [], b = !0;
-  if (r === "*" || r === "**") {
-    if (u !== void 0)
-      for (var y = 0; y < d.properties.length; y++) {
-        var k = d.properties[y], E = k.name, C = this.parse(E, u, !0);
-        C && g.push(C);
-      }
-  } else if (qt(r)) {
-    var T = this.parse(r, u, !0);
-    T && g.push(T);
-  } else if (fr(r)) {
-    var P = r;
-    c = u;
-    for (var N = Object.keys(P), D = 0; D < N.length; D++) {
-      var H = N[D], _ = P[H];
-      if (_ === void 0 && (_ = P[f5(H)]), _ !== void 0) {
-        var B = this.parse(H, _, !0);
-        B && g.push(B);
-      }
-    }
-  } else
-    return !1;
-  if (g.length === 0)
-    return !1;
-  for (var $ = !1, F = 0; F < a.length; F++) {
-    for (var W = a[F], Q = {}, X = void 0, K = 0; K < g.length; K++) {
-      var ee = g[K];
-      if (c) {
-        var Z = W.pstyle(ee.name);
-        X = Q[ee.name] = {
-          prev: Z
-        };
-      }
-      $ = this.applyParsedProperty(W, kl(ee)) || $, c && (X.next = W.pstyle(ee.name));
-    }
-    $ && this.updateStyleHints(W), c && this.updateTransitions(W, Q, b);
-  }
-  return $;
-};
-hw.overrideBypass = function(a, r, u) {
-  r = D6(r);
-  for (var c = 0; c < a.length; c++) {
-    var d = a[c], g = d._private.style[r], b = this.properties[r].type, y = b.color, k = b.mutiple, E = g ? g.pfValue != null ? g.pfValue : g.value : null;
-    !g || !g.bypass ? this.applyBypass(d, r, u) : (g.value = u, g.pfValue != null && (g.pfValue = u), y ? g.strValue = "rgb(" + u.join(",") + ")" : k ? g.strValue = u.join(" ") : g.strValue = "" + u, this.updateStyleHints(d)), this.checkTriggers(d, r, E, u);
-  }
-};
-hw.removeAllBypasses = function(a, r) {
-  return this.removeBypasses(a, this.propertyNames, r);
-};
-hw.removeBypasses = function(a, r, u) {
-  for (var c = !0, d = 0; d < a.length; d++) {
-    for (var g = a[d], b = {}, y = 0; y < r.length; y++) {
-      var k = r[y], E = this.properties[k], C = g.pstyle(E.name);
-      if (!(!C || !C.bypass)) {
-        var T = "", P = this.parse(k, T, !0), N = b[E.name] = {
-          prev: C
-        };
-        this.applyParsedProperty(g, P), N.next = g.pstyle(E.name);
-      }
-    }
-    this.updateStyleHints(g), u && this.updateTransitions(g, b, c);
-  }
-};
-var _6 = {};
-_6.getEmSizeInPixels = function() {
-  var a = this.containerCss("font-size");
-  return a != null ? parseFloat(a) : 1;
-};
-_6.containerCss = function(a) {
-  var r = this._private.cy, u = r.container(), c = r.window();
-  if (c && u && c.getComputedStyle)
-    return c.getComputedStyle(u).getPropertyValue(a);
-};
-var Sl = {};
-Sl.getRenderedStyle = function(a, r) {
-  return r ? this.getStylePropertyValue(a, r, !0) : this.getRawStyle(a, !0);
-};
-Sl.getRawStyle = function(a, r) {
-  var u = this;
-  if (a = a[0], a) {
-    for (var c = {}, d = 0; d < u.properties.length; d++) {
-      var g = u.properties[d], b = u.getStylePropertyValue(a, g.name, r);
-      b != null && (c[g.name] = b, c[f5(g.name)] = b);
-    }
-    return c;
-  }
-};
-Sl.getIndexedStyle = function(a, r, u, c) {
-  var d = a.pstyle(r)[u][c];
-  return d ?? a.cy().style().getDefaultProperty(r)[u][0];
-};
-Sl.getStylePropertyValue = function(a, r, u) {
-  var c = this;
-  if (a = a[0], a) {
-    var d = c.properties[r];
-    d.alias && (d = d.pointsTo);
-    var g = d.type, b = a.pstyle(d.name);
-    if (b) {
-      var y = b.value, k = b.units, E = b.strValue;
-      if (u && g.number && y != null && kt(y)) {
-        var C = a.cy().zoom(), T = function(_) {
-          return _ * C;
-        }, P = function(_, B) {
-          return T(_) + B;
-        }, N = Qr(y), D = N ? k.every(function(H) {
-          return H != null;
-        }) : k != null;
-        return D ? N ? y.map(function(H, _) {
-          return P(H, k[_]);
-        }).join(" ") : P(y, k) : N ? y.map(function(H) {
-          return qt(H) ? H : "" + T(H);
-        }).join(" ") : "" + T(y);
-      } else if (E != null)
-        return E;
-    }
-    return null;
-  }
-};
-Sl.getAnimationStartStyle = function(a, r) {
-  for (var u = {}, c = 0; c < r.length; c++) {
-    var d = r[c], g = d.name, b = a.pstyle(g);
-    b !== void 0 && (fr(b) ? b = this.parse(g, b.strValue) : b = this.parse(g, b)), b && (u[g] = b);
-  }
-  return u;
-};
-Sl.getPropsList = function(a) {
-  var r = this, u = [], c = a, d = r.properties;
-  if (c)
-    for (var g = Object.keys(c), b = 0; b < g.length; b++) {
-      var y = g[b], k = c[y], E = d[y] || d[D6(y)], C = this.parse(E.name, k);
-      C && u.push(C);
-    }
-  return u;
-};
-Sl.getNonDefaultPropertiesHash = function(a, r, u) {
-  var c = u.slice(), d, g, b, y, k, E;
-  for (k = 0; k < r.length; k++)
-    if (d = r[k], g = a.pstyle(d, !1), g != null)
-      if (g.pfValue != null)
-        c[0] = Kp(y, c[0]), c[1] = Zp(y, c[1]);
-      else
-        for (b = g.strValue, E = 0; E < b.length; E++)
-          y = b.charCodeAt(E), c[0] = Kp(y, c[0]), c[1] = Zp(y, c[1]);
-  return c;
-};
-Sl.getPropertiesHash = Sl.getNonDefaultPropertiesHash;
-var m5 = {};
-m5.appendFromJson = function(a) {
-  for (var r = this, u = 0; u < a.length; u++) {
-    var c = a[u], d = c.selector, g = c.style || c.css, b = Object.keys(g);
-    r.selector(d);
-    for (var y = 0; y < b.length; y++) {
-      var k = b[y], E = g[k];
-      r.css(k, E);
-    }
-  }
-  return r;
-};
-m5.fromJson = function(a) {
-  var r = this;
-  return r.resetToDefault(), r.appendFromJson(a), r;
-};
-m5.json = function() {
-  for (var a = [], r = this.defaultLength; r < this.length; r++) {
-    for (var u = this[r], c = u.selector, d = u.properties, g = {}, b = 0; b < d.length; b++) {
-      var y = d[b];
-      g[y.name] = y.strValue;
-    }
-    a.push({
-      selector: c ? c.toString() : "core",
-      style: g
-    });
-  }
-  return a;
-};
-var G6 = {};
-G6.appendFromString = function(a) {
-  var r = this, u = this, c = "" + a, d, g, b;
-  c = c.replace(/[/][*](\s|.)+?[*][/]/g, "");
-  function y() {
-    c.length > d.length ? c = c.substr(d.length) : c = "";
-  }
-  function k() {
-    g.length > b.length ? g = g.substr(b.length) : g = "";
-  }
-  for (; ; ) {
-    var E = c.match(/^\s*$/);
-    if (E)
-      break;
-    var C = c.match(/^\s*((?:.|\s)+?)\s*\{((?:.|\s)+?)\}/);
-    if (!C) {
-      Sr("Halting stylesheet parsing: String stylesheet contains more to parse but no selector and block found in: " + c);
-      break;
-    }
-    d = C[0];
-    var T = C[1];
-    if (T !== "core") {
-      var P = new _h(T);
-      if (P.invalid) {
-        Sr("Skipping parsing of block: Invalid selector found in string stylesheet: " + T), y();
-        continue;
-      }
-    }
-    var N = C[2], D = !1;
-    g = N;
-    for (var H = []; ; ) {
-      var _ = g.match(/^\s*$/);
-      if (_)
-        break;
-      var B = g.match(/^\s*(.+?)\s*:\s*(.+?)(?:\s*;|\s*$)/);
-      if (!B) {
-        Sr("Skipping parsing of block: Invalid formatting of style property and value definitions found in:" + N), D = !0;
-        break;
-      }
-      b = B[0];
-      var $ = B[1], F = B[2], W = r.properties[$];
-      if (!W) {
-        Sr("Skipping property: Invalid property name in: " + b), k();
-        continue;
-      }
-      var Q = u.parse($, F);
-      if (!Q) {
-        Sr("Skipping property: Invalid property definition in: " + b), k();
-        continue;
-      }
-      H.push({
-        name: $,
-        val: F
-      }), k();
-    }
-    if (D) {
-      y();
-      break;
-    }
-    u.selector(T);
-    for (var X = 0; X < H.length; X++) {
-      var K = H[X];
-      u.css(K.name, K.val);
-    }
-    y();
-  }
-  return u;
-};
-G6.fromString = function(a) {
-  var r = this;
-  return r.resetToDefault(), r.appendFromString(a), r;
-};
-var vo = {};
-(function() {
-  var a = Aa, r = woe, u = yoe, c = koe, d = Eoe, g = function(Ve) {
-    return "^" + Ve + "\\s*\\(\\s*([\\w\\.]+)\\s*\\)$";
-  }, b = function(Ve) {
-    var Ke = a + "|\\w+|" + r + "|" + u + "|" + c + "|" + d;
-    return "^" + Ve + "\\s*\\(([\\w\\.]+)\\s*\\,\\s*(" + a + ")\\s*\\,\\s*(" + a + ")\\s*,\\s*(" + Ke + ")\\s*\\,\\s*(" + Ke + ")\\)$";
-  }, y = [`^url\\s*\\(\\s*['"]?(.+?)['"]?\\s*\\)$`, "^(none)$", "^(.+)$"];
-  vo.types = {
-    time: {
-      number: !0,
-      min: 0,
-      units: "s|ms",
-      implicitUnits: "ms"
-    },
-    percent: {
-      number: !0,
-      min: 0,
-      max: 100,
-      units: "%",
-      implicitUnits: "%"
-    },
-    percentages: {
-      number: !0,
-      min: 0,
-      max: 100,
-      units: "%",
-      implicitUnits: "%",
-      multiple: !0
-    },
-    zeroOneNumber: {
-      number: !0,
-      min: 0,
-      max: 1,
-      unitless: !0
-    },
-    zeroOneNumbers: {
-      number: !0,
-      min: 0,
-      max: 1,
-      unitless: !0,
-      multiple: !0
-    },
-    nOneOneNumber: {
-      number: !0,
-      min: -1,
-      max: 1,
-      unitless: !0
-    },
-    nonNegativeInt: {
-      number: !0,
-      min: 0,
-      integer: !0,
-      unitless: !0
-    },
-    nonNegativeNumber: {
-      number: !0,
-      min: 0,
-      unitless: !0
-    },
-    position: {
-      enums: ["parent", "origin"]
-    },
-    nodeSize: {
-      number: !0,
-      min: 0,
-      enums: ["label"]
-    },
-    number: {
-      number: !0,
-      unitless: !0
-    },
-    numbers: {
-      number: !0,
-      unitless: !0,
-      multiple: !0
-    },
-    positiveNumber: {
-      number: !0,
-      unitless: !0,
-      min: 0,
-      strictMin: !0
-    },
-    size: {
-      number: !0,
-      min: 0
-    },
-    bidirectionalSize: {
-      number: !0
-    },
-    // allows negative
-    bidirectionalSizeMaybePercent: {
-      number: !0,
-      allowPercent: !0
-    },
-    // allows negative
-    bidirectionalSizes: {
-      number: !0,
-      multiple: !0
-    },
-    // allows negative
-    sizeMaybePercent: {
-      number: !0,
-      min: 0,
-      allowPercent: !0
-    },
-    axisDirection: {
-      enums: ["horizontal", "leftward", "rightward", "vertical", "upward", "downward", "auto"]
-    },
-    paddingRelativeTo: {
-      enums: ["width", "height", "average", "min", "max"]
-    },
-    bgWH: {
-      number: !0,
-      min: 0,
-      allowPercent: !0,
-      enums: ["auto"],
-      multiple: !0
-    },
-    bgPos: {
-      number: !0,
-      allowPercent: !0,
-      multiple: !0
-    },
-    bgRelativeTo: {
-      enums: ["inner", "include-padding"],
-      multiple: !0
-    },
-    bgRepeat: {
-      enums: ["repeat", "repeat-x", "repeat-y", "no-repeat"],
-      multiple: !0
-    },
-    bgFit: {
-      enums: ["none", "contain", "cover"],
-      multiple: !0
-    },
-    bgCrossOrigin: {
-      enums: ["anonymous", "use-credentials", "null"],
-      multiple: !0
-    },
-    bgClip: {
-      enums: ["none", "node"],
-      multiple: !0
-    },
-    bgContainment: {
-      enums: ["inside", "over"],
-      multiple: !0
-    },
-    color: {
-      color: !0
-    },
-    colors: {
-      color: !0,
-      multiple: !0
-    },
-    fill: {
-      enums: ["solid", "linear-gradient", "radial-gradient"]
-    },
-    bool: {
-      enums: ["yes", "no"]
-    },
-    bools: {
-      enums: ["yes", "no"],
-      multiple: !0
-    },
-    lineStyle: {
-      enums: ["solid", "dotted", "dashed"]
-    },
-    lineCap: {
-      enums: ["butt", "round", "square"]
-    },
-    borderStyle: {
-      enums: ["solid", "dotted", "dashed", "double"]
-    },
-    curveStyle: {
-      enums: ["bezier", "unbundled-bezier", "haystack", "segments", "straight", "straight-triangle", "taxi"]
-    },
-    fontFamily: {
-      regex: '^([\\w- \\"]+(?:\\s*,\\s*[\\w- \\"]+)*)$'
-    },
-    fontStyle: {
-      enums: ["italic", "normal", "oblique"]
-    },
-    fontWeight: {
-      enums: ["normal", "bold", "bolder", "lighter", "100", "200", "300", "400", "500", "600", "800", "900", 100, 200, 300, 400, 500, 600, 700, 800, 900]
-    },
-    textDecoration: {
-      enums: ["none", "underline", "overline", "line-through"]
-    },
-    textTransform: {
-      enums: ["none", "uppercase", "lowercase"]
-    },
-    textWrap: {
-      enums: ["none", "wrap", "ellipsis"]
-    },
-    textOverflowWrap: {
-      enums: ["whitespace", "anywhere"]
-    },
-    textBackgroundShape: {
-      enums: ["rectangle", "roundrectangle", "round-rectangle"]
-    },
-    nodeShape: {
-      enums: ["rectangle", "roundrectangle", "round-rectangle", "cutrectangle", "cut-rectangle", "bottomroundrectangle", "bottom-round-rectangle", "barrel", "ellipse", "triangle", "round-triangle", "square", "pentagon", "round-pentagon", "hexagon", "round-hexagon", "concavehexagon", "concave-hexagon", "heptagon", "round-heptagon", "octagon", "round-octagon", "tag", "round-tag", "star", "diamond", "round-diamond", "vee", "rhomboid", "right-rhomboid", "polygon"]
-    },
-    overlayShape: {
-      enums: ["roundrectangle", "round-rectangle", "ellipse"]
-    },
-    compoundIncludeLabels: {
-      enums: ["include", "exclude"]
-    },
-    arrowShape: {
-      enums: ["tee", "triangle", "triangle-tee", "circle-triangle", "triangle-cross", "triangle-backcurve", "vee", "square", "circle", "diamond", "chevron", "none"]
-    },
-    arrowFill: {
-      enums: ["filled", "hollow"]
-    },
-    display: {
-      enums: ["element", "none"]
-    },
-    visibility: {
-      enums: ["hidden", "visible"]
-    },
-    zCompoundDepth: {
-      enums: ["bottom", "orphan", "auto", "top"]
-    },
-    zIndexCompare: {
-      enums: ["auto", "manual"]
-    },
-    valign: {
-      enums: ["top", "center", "bottom"]
-    },
-    halign: {
-      enums: ["left", "center", "right"]
-    },
-    justification: {
-      enums: ["left", "center", "right", "auto"]
-    },
-    text: {
-      string: !0
-    },
-    data: {
-      mapping: !0,
-      regex: g("data")
-    },
-    layoutData: {
-      mapping: !0,
-      regex: g("layoutData")
-    },
-    scratch: {
-      mapping: !0,
-      regex: g("scratch")
-    },
-    mapData: {
-      mapping: !0,
-      regex: b("mapData")
-    },
-    mapLayoutData: {
-      mapping: !0,
-      regex: b("mapLayoutData")
-    },
-    mapScratch: {
-      mapping: !0,
-      regex: b("mapScratch")
-    },
-    fn: {
-      mapping: !0,
-      fn: !0
-    },
-    url: {
-      regexes: y,
-      singleRegexMatchValue: !0
-    },
-    urls: {
-      regexes: y,
-      singleRegexMatchValue: !0,
-      multiple: !0
-    },
-    propList: {
-      propList: !0
-    },
-    angle: {
-      number: !0,
-      units: "deg|rad",
-      implicitUnits: "rad"
-    },
-    textRotation: {
-      number: !0,
-      units: "deg|rad",
-      implicitUnits: "rad",
-      enums: ["none", "autorotate"]
-    },
-    polygonPointList: {
-      number: !0,
-      multiple: !0,
-      evenMultiple: !0,
-      min: -1,
-      max: 1,
-      unitless: !0
-    },
-    edgeDistances: {
-      enums: ["intersection", "node-position", "endpoints"]
-    },
-    edgeEndpoint: {
-      number: !0,
-      multiple: !0,
-      units: "%|px|em|deg|rad",
-      implicitUnits: "px",
-      enums: ["inside-to-node", "outside-to-node", "outside-to-node-or-label", "outside-to-line", "outside-to-line-or-label"],
-      singleEnum: !0,
-      validate: function(Ve, Ke) {
-        switch (Ve.length) {
-          case 2:
-            return Ke[0] !== "deg" && Ke[0] !== "rad" && Ke[1] !== "deg" && Ke[1] !== "rad";
-          case 1:
-            return qt(Ve[0]) || Ke[0] === "deg" || Ke[0] === "rad";
-          default:
-            return !1;
-        }
-      }
-    },
-    easing: {
-      regexes: ["^(spring)\\s*\\(\\s*(" + a + ")\\s*,\\s*(" + a + ")\\s*\\)$", "^(cubic-bezier)\\s*\\(\\s*(" + a + ")\\s*,\\s*(" + a + ")\\s*,\\s*(" + a + ")\\s*,\\s*(" + a + ")\\s*\\)$"],
-      enums: ["linear", "ease", "ease-in", "ease-out", "ease-in-out", "ease-in-sine", "ease-out-sine", "ease-in-out-sine", "ease-in-quad", "ease-out-quad", "ease-in-out-quad", "ease-in-cubic", "ease-out-cubic", "ease-in-out-cubic", "ease-in-quart", "ease-out-quart", "ease-in-out-quart", "ease-in-quint", "ease-out-quint", "ease-in-out-quint", "ease-in-expo", "ease-out-expo", "ease-in-out-expo", "ease-in-circ", "ease-out-circ", "ease-in-out-circ"]
-    },
-    gradientDirection: {
-      enums: [
-        "to-bottom",
-        "to-top",
-        "to-left",
-        "to-right",
-        "to-bottom-right",
-        "to-bottom-left",
-        "to-top-right",
-        "to-top-left",
-        "to-right-bottom",
-        "to-left-bottom",
-        "to-right-top",
-        "to-left-top"
-        // different order
-      ]
-    },
-    boundsExpansion: {
-      number: !0,
-      multiple: !0,
-      min: 0,
-      validate: function(Ve) {
-        var Ke = Ve.length;
-        return Ke === 1 || Ke === 2 || Ke === 4;
-      }
-    }
-  };
-  var k = {
-    zeroNonZero: function(Ve, Ke) {
-      return (Ve == null || Ke == null) && Ve !== Ke || Ve == 0 && Ke != 0 ? !0 : Ve != 0 && Ke == 0;
-    },
-    any: function(Ve, Ke) {
-      return Ve != Ke;
-    },
-    emptyNonEmpty: function(Ve, Ke) {
-      var at = zh(Ve), ft = zh(Ke);
-      return at && !ft || !at && ft;
-    }
-  }, E = vo.types, C = [{
-    name: "label",
-    type: E.text,
-    triggersBounds: k.any,
-    triggersZOrder: k.emptyNonEmpty
-  }, {
-    name: "text-rotation",
-    type: E.textRotation,
-    triggersBounds: k.any
-  }, {
-    name: "text-margin-x",
-    type: E.bidirectionalSize,
-    triggersBounds: k.any
-  }, {
-    name: "text-margin-y",
-    type: E.bidirectionalSize,
-    triggersBounds: k.any
-  }], T = [{
-    name: "source-label",
-    type: E.text,
-    triggersBounds: k.any
-  }, {
-    name: "source-text-rotation",
-    type: E.textRotation,
-    triggersBounds: k.any
-  }, {
-    name: "source-text-margin-x",
-    type: E.bidirectionalSize,
-    triggersBounds: k.any
-  }, {
-    name: "source-text-margin-y",
-    type: E.bidirectionalSize,
-    triggersBounds: k.any
-  }, {
-    name: "source-text-offset",
-    type: E.size,
-    triggersBounds: k.any
-  }], P = [{
-    name: "target-label",
-    type: E.text,
-    triggersBounds: k.any
-  }, {
-    name: "target-text-rotation",
-    type: E.textRotation,
-    triggersBounds: k.any
-  }, {
-    name: "target-text-margin-x",
-    type: E.bidirectionalSize,
-    triggersBounds: k.any
-  }, {
-    name: "target-text-margin-y",
-    type: E.bidirectionalSize,
-    triggersBounds: k.any
-  }, {
-    name: "target-text-offset",
-    type: E.size,
-    triggersBounds: k.any
-  }], N = [{
-    name: "font-family",
-    type: E.fontFamily,
-    triggersBounds: k.any
-  }, {
-    name: "font-style",
-    type: E.fontStyle,
-    triggersBounds: k.any
-  }, {
-    name: "font-weight",
-    type: E.fontWeight,
-    triggersBounds: k.any
-  }, {
-    name: "font-size",
-    type: E.size,
-    triggersBounds: k.any
-  }, {
-    name: "text-transform",
-    type: E.textTransform,
-    triggersBounds: k.any
-  }, {
-    name: "text-wrap",
-    type: E.textWrap,
-    triggersBounds: k.any
-  }, {
-    name: "text-overflow-wrap",
-    type: E.textOverflowWrap,
-    triggersBounds: k.any
-  }, {
-    name: "text-max-width",
-    type: E.size,
-    triggersBounds: k.any
-  }, {
-    name: "text-outline-width",
-    type: E.size,
-    triggersBounds: k.any
-  }, {
-    name: "line-height",
-    type: E.positiveNumber,
-    triggersBounds: k.any
-  }], D = [{
-    name: "text-valign",
-    type: E.valign,
-    triggersBounds: k.any
-  }, {
-    name: "text-halign",
-    type: E.halign,
-    triggersBounds: k.any
-  }, {
-    name: "color",
-    type: E.color
-  }, {
-    name: "text-outline-color",
-    type: E.color
-  }, {
-    name: "text-outline-opacity",
-    type: E.zeroOneNumber
-  }, {
-    name: "text-background-color",
-    type: E.color
-  }, {
-    name: "text-background-opacity",
-    type: E.zeroOneNumber
-  }, {
-    name: "text-background-padding",
-    type: E.size,
-    triggersBounds: k.any
-  }, {
-    name: "text-border-opacity",
-    type: E.zeroOneNumber
-  }, {
-    name: "text-border-color",
-    type: E.color
-  }, {
-    name: "text-border-width",
-    type: E.size,
-    triggersBounds: k.any
-  }, {
-    name: "text-border-style",
-    type: E.borderStyle,
-    triggersBounds: k.any
-  }, {
-    name: "text-background-shape",
-    type: E.textBackgroundShape,
-    triggersBounds: k.any
-  }, {
-    name: "text-justification",
-    type: E.justification
-  }], H = [{
-    name: "events",
-    type: E.bool,
-    triggersZOrder: k.any
-  }, {
-    name: "text-events",
-    type: E.bool,
-    triggersZOrder: k.any
-  }], _ = [{
-    name: "display",
-    type: E.display,
-    triggersZOrder: k.any,
-    triggersBounds: k.any,
-    triggersBoundsOfParallelBeziers: !0
-  }, {
-    name: "visibility",
-    type: E.visibility,
-    triggersZOrder: k.any
-  }, {
-    name: "opacity",
-    type: E.zeroOneNumber,
-    triggersZOrder: k.zeroNonZero
-  }, {
-    name: "text-opacity",
-    type: E.zeroOneNumber
-  }, {
-    name: "min-zoomed-font-size",
-    type: E.size
-  }, {
-    name: "z-compound-depth",
-    type: E.zCompoundDepth,
-    triggersZOrder: k.any
-  }, {
-    name: "z-index-compare",
-    type: E.zIndexCompare,
-    triggersZOrder: k.any
-  }, {
-    name: "z-index",
-    type: E.number,
-    triggersZOrder: k.any
-  }], B = [{
-    name: "overlay-padding",
-    type: E.size,
-    triggersBounds: k.any
-  }, {
-    name: "overlay-color",
-    type: E.color
-  }, {
-    name: "overlay-opacity",
-    type: E.zeroOneNumber,
-    triggersBounds: k.zeroNonZero
-  }, {
-    name: "overlay-shape",
-    type: E.overlayShape,
-    triggersBounds: k.any
-  }], $ = [{
-    name: "underlay-padding",
-    type: E.size,
-    triggersBounds: k.any
-  }, {
-    name: "underlay-color",
-    type: E.color
-  }, {
-    name: "underlay-opacity",
-    type: E.zeroOneNumber,
-    triggersBounds: k.zeroNonZero
-  }, {
-    name: "underlay-shape",
-    type: E.overlayShape,
-    triggersBounds: k.any
-  }], F = [{
-    name: "transition-property",
-    type: E.propList
-  }, {
-    name: "transition-duration",
-    type: E.time
-  }, {
-    name: "transition-delay",
-    type: E.time
-  }, {
-    name: "transition-timing-function",
-    type: E.easing
-  }], W = function(Ve, Ke) {
-    return Ke.value === "label" ? -Ve.poolIndex() : Ke.pfValue;
-  }, Q = [{
-    name: "height",
-    type: E.nodeSize,
-    triggersBounds: k.any,
-    hashOverride: W
-  }, {
-    name: "width",
-    type: E.nodeSize,
-    triggersBounds: k.any,
-    hashOverride: W
-  }, {
-    name: "shape",
-    type: E.nodeShape,
-    triggersBounds: k.any
-  }, {
-    name: "shape-polygon-points",
-    type: E.polygonPointList,
-    triggersBounds: k.any
-  }, {
-    name: "background-color",
-    type: E.color
-  }, {
-    name: "background-fill",
-    type: E.fill
-  }, {
-    name: "background-opacity",
-    type: E.zeroOneNumber
-  }, {
-    name: "background-blacken",
-    type: E.nOneOneNumber
-  }, {
-    name: "background-gradient-stop-colors",
-    type: E.colors
-  }, {
-    name: "background-gradient-stop-positions",
-    type: E.percentages
-  }, {
-    name: "background-gradient-direction",
-    type: E.gradientDirection
-  }, {
-    name: "padding",
-    type: E.sizeMaybePercent,
-    triggersBounds: k.any
-  }, {
-    name: "padding-relative-to",
-    type: E.paddingRelativeTo,
-    triggersBounds: k.any
-  }, {
-    name: "bounds-expansion",
-    type: E.boundsExpansion,
-    triggersBounds: k.any
-  }], X = [{
-    name: "border-color",
-    type: E.color
-  }, {
-    name: "border-opacity",
-    type: E.zeroOneNumber
-  }, {
-    name: "border-width",
-    type: E.size,
-    triggersBounds: k.any
-  }, {
-    name: "border-style",
-    type: E.borderStyle
-  }], K = [{
-    name: "background-image",
-    type: E.urls
-  }, {
-    name: "background-image-crossorigin",
-    type: E.bgCrossOrigin
-  }, {
-    name: "background-image-opacity",
-    type: E.zeroOneNumbers
-  }, {
-    name: "background-image-containment",
-    type: E.bgContainment
-  }, {
-    name: "background-image-smoothing",
-    type: E.bools
-  }, {
-    name: "background-position-x",
-    type: E.bgPos
-  }, {
-    name: "background-position-y",
-    type: E.bgPos
-  }, {
-    name: "background-width-relative-to",
-    type: E.bgRelativeTo
-  }, {
-    name: "background-height-relative-to",
-    type: E.bgRelativeTo
-  }, {
-    name: "background-repeat",
-    type: E.bgRepeat
-  }, {
-    name: "background-fit",
-    type: E.bgFit
-  }, {
-    name: "background-clip",
-    type: E.bgClip
-  }, {
-    name: "background-width",
-    type: E.bgWH
-  }, {
-    name: "background-height",
-    type: E.bgWH
-  }, {
-    name: "background-offset-x",
-    type: E.bgPos
-  }, {
-    name: "background-offset-y",
-    type: E.bgPos
-  }], ee = [{
-    name: "position",
-    type: E.position,
-    triggersBounds: k.any
-  }, {
-    name: "compound-sizing-wrt-labels",
-    type: E.compoundIncludeLabels,
-    triggersBounds: k.any
-  }, {
-    name: "min-width",
-    type: E.size,
-    triggersBounds: k.any
-  }, {
-    name: "min-width-bias-left",
-    type: E.sizeMaybePercent,
-    triggersBounds: k.any
-  }, {
-    name: "min-width-bias-right",
-    type: E.sizeMaybePercent,
-    triggersBounds: k.any
-  }, {
-    name: "min-height",
-    type: E.size,
-    triggersBounds: k.any
-  }, {
-    name: "min-height-bias-top",
-    type: E.sizeMaybePercent,
-    triggersBounds: k.any
-  }, {
-    name: "min-height-bias-bottom",
-    type: E.sizeMaybePercent,
-    triggersBounds: k.any
-  }], Z = [{
-    name: "line-style",
-    type: E.lineStyle
-  }, {
-    name: "line-color",
-    type: E.color
-  }, {
-    name: "line-fill",
-    type: E.fill
-  }, {
-    name: "line-cap",
-    type: E.lineCap
-  }, {
-    name: "line-opacity",
-    type: E.zeroOneNumber
-  }, {
-    name: "line-dash-pattern",
-    type: E.numbers
-  }, {
-    name: "line-dash-offset",
-    type: E.number
-  }, {
-    name: "line-gradient-stop-colors",
-    type: E.colors
-  }, {
-    name: "line-gradient-stop-positions",
-    type: E.percentages
-  }, {
-    name: "curve-style",
-    type: E.curveStyle,
-    triggersBounds: k.any,
-    triggersBoundsOfParallelBeziers: !0
-  }, {
-    name: "haystack-radius",
-    type: E.zeroOneNumber,
-    triggersBounds: k.any
-  }, {
-    name: "source-endpoint",
-    type: E.edgeEndpoint,
-    triggersBounds: k.any
-  }, {
-    name: "target-endpoint",
-    type: E.edgeEndpoint,
-    triggersBounds: k.any
-  }, {
-    name: "control-point-step-size",
-    type: E.size,
-    triggersBounds: k.any
-  }, {
-    name: "control-point-distances",
-    type: E.bidirectionalSizes,
-    triggersBounds: k.any
-  }, {
-    name: "control-point-weights",
-    type: E.numbers,
-    triggersBounds: k.any
-  }, {
-    name: "segment-distances",
-    type: E.bidirectionalSizes,
-    triggersBounds: k.any
-  }, {
-    name: "segment-weights",
-    type: E.numbers,
-    triggersBounds: k.any
-  }, {
-    name: "taxi-turn",
-    type: E.bidirectionalSizeMaybePercent,
-    triggersBounds: k.any
-  }, {
-    name: "taxi-turn-min-distance",
-    type: E.size,
-    triggersBounds: k.any
-  }, {
-    name: "taxi-direction",
-    type: E.axisDirection,
-    triggersBounds: k.any
-  }, {
-    name: "edge-distances",
-    type: E.edgeDistances,
-    triggersBounds: k.any
-  }, {
-    name: "arrow-scale",
-    type: E.positiveNumber,
-    triggersBounds: k.any
-  }, {
-    name: "loop-direction",
-    type: E.angle,
-    triggersBounds: k.any
-  }, {
-    name: "loop-sweep",
-    type: E.angle,
-    triggersBounds: k.any
-  }, {
-    name: "source-distance-from-node",
-    type: E.size,
-    triggersBounds: k.any
-  }, {
-    name: "target-distance-from-node",
-    type: E.size,
-    triggersBounds: k.any
-  }], ae = [{
-    name: "ghost",
-    type: E.bool,
-    triggersBounds: k.any
-  }, {
-    name: "ghost-offset-x",
-    type: E.bidirectionalSize,
-    triggersBounds: k.any
-  }, {
-    name: "ghost-offset-y",
-    type: E.bidirectionalSize,
-    triggersBounds: k.any
-  }, {
-    name: "ghost-opacity",
-    type: E.zeroOneNumber
-  }], oe = [{
-    name: "selection-box-color",
-    type: E.color
-  }, {
-    name: "selection-box-opacity",
-    type: E.zeroOneNumber
-  }, {
-    name: "selection-box-border-color",
-    type: E.color
-  }, {
-    name: "selection-box-border-width",
-    type: E.size
-  }, {
-    name: "active-bg-color",
-    type: E.color
-  }, {
-    name: "active-bg-opacity",
-    type: E.zeroOneNumber
-  }, {
-    name: "active-bg-size",
-    type: E.size
-  }, {
-    name: "outside-texture-bg-color",
-    type: E.color
-  }, {
-    name: "outside-texture-bg-opacity",
-    type: E.zeroOneNumber
-  }], J = [];
-  vo.pieBackgroundN = 16, J.push({
-    name: "pie-size",
-    type: E.sizeMaybePercent
-  });
-  for (var fe = 1; fe <= vo.pieBackgroundN; fe++)
-    J.push({
-      name: "pie-" + fe + "-background-color",
-      type: E.color
-    }), J.push({
-      name: "pie-" + fe + "-background-size",
-      type: E.percent
-    }), J.push({
-      name: "pie-" + fe + "-background-opacity",
-      type: E.zeroOneNumber
-    });
-  var se = [], pe = vo.arrowPrefixes = ["source", "mid-source", "target", "mid-target"];
-  [{
-    name: "arrow-shape",
-    type: E.arrowShape,
-    triggersBounds: k.any
-  }, {
-    name: "arrow-color",
-    type: E.color
-  }, {
-    name: "arrow-fill",
-    type: E.arrowFill
-  }].forEach(function(me) {
-    pe.forEach(function(Ve) {
-      var Ke = Ve + "-" + me.name, at = me.type, ft = me.triggersBounds;
-      se.push({
-        name: Ke,
-        type: at,
-        triggersBounds: ft
-      });
-    });
-  }, {});
-  var he = vo.properties = [].concat(H, F, _, B, $, ae, D, N, C, T, P, Q, X, K, J, ee, Z, se, oe), de = vo.propertyGroups = {
-    // common to all eles
-    behavior: H,
-    transition: F,
-    visibility: _,
-    overlay: B,
-    underlay: $,
-    ghost: ae,
-    // labels
-    commonLabel: D,
-    labelDimensions: N,
-    mainLabel: C,
-    sourceLabel: T,
-    targetLabel: P,
-    // node props
-    nodeBody: Q,
-    nodeBorder: X,
-    backgroundImage: K,
-    pie: J,
-    compound: ee,
-    // edge props
-    edgeLine: Z,
-    edgeArrow: se,
-    core: oe
-  }, ke = vo.propertyGroupNames = {}, Pe = vo.propertyGroupKeys = Object.keys(de);
-  Pe.forEach(function(me) {
-    ke[me] = de[me].map(function(Ve) {
-      return Ve.name;
-    }), de[me].forEach(function(Ve) {
-      return Ve.groupKey = me;
-    });
-  });
-  var Ae = vo.aliases = [{
-    name: "content",
-    pointsTo: "label"
-  }, {
-    name: "control-point-distance",
-    pointsTo: "control-point-distances"
-  }, {
-    name: "control-point-weight",
-    pointsTo: "control-point-weights"
-  }, {
-    name: "edge-text-rotation",
-    pointsTo: "text-rotation"
-  }, {
-    name: "padding-left",
-    pointsTo: "padding"
-  }, {
-    name: "padding-right",
-    pointsTo: "padding"
-  }, {
-    name: "padding-top",
-    pointsTo: "padding"
-  }, {
-    name: "padding-bottom",
-    pointsTo: "padding"
-  }];
-  vo.propertyNames = he.map(function(me) {
-    return me.name;
-  });
-  for (var Te = 0; Te < he.length; Te++) {
-    var Oe = he[Te];
-    he[Oe.name] = Oe;
-  }
-  for (var ze = 0; ze < Ae.length; ze++) {
-    var We = Ae[ze], $e = he[We.pointsTo], Ge = {
-      name: We.name,
-      alias: !0,
-      pointsTo: $e
-    };
-    he.push(Ge), he[We.name] = Ge;
-  }
-})();
-vo.getDefaultProperty = function(a) {
-  return this.getDefaultProperties()[a];
-};
-vo.getDefaultProperties = function() {
-  var a = this._private;
-  if (a.defaultProperties != null)
-    return a.defaultProperties;
-  for (var r = on({
-    // core props
-    "selection-box-color": "#ddd",
-    "selection-box-opacity": 0.65,
-    "selection-box-border-color": "#aaa",
-    "selection-box-border-width": 1,
-    "active-bg-color": "black",
-    "active-bg-opacity": 0.15,
-    "active-bg-size": 30,
-    "outside-texture-bg-color": "#000",
-    "outside-texture-bg-opacity": 0.125,
-    // common node/edge props
-    events: "yes",
-    "text-events": "no",
-    "text-valign": "top",
-    "text-halign": "center",
-    "text-justification": "auto",
-    "line-height": 1,
-    color: "#000",
-    "text-outline-color": "#000",
-    "text-outline-width": 0,
-    "text-outline-opacity": 1,
-    "text-opacity": 1,
-    "text-decoration": "none",
-    "text-transform": "none",
-    "text-wrap": "none",
-    "text-overflow-wrap": "whitespace",
-    "text-max-width": 9999,
-    "text-background-color": "#000",
-    "text-background-opacity": 0,
-    "text-background-shape": "rectangle",
-    "text-background-padding": 0,
-    "text-border-opacity": 0,
-    "text-border-width": 0,
-    "text-border-style": "solid",
-    "text-border-color": "#000",
-    "font-family": "Helvetica Neue, Helvetica, sans-serif",
-    "font-style": "normal",
-    "font-weight": "normal",
-    "font-size": 16,
-    "min-zoomed-font-size": 0,
-    "text-rotation": "none",
-    "source-text-rotation": "none",
-    "target-text-rotation": "none",
-    visibility: "visible",
-    display: "element",
-    opacity: 1,
-    "z-compound-depth": "auto",
-    "z-index-compare": "auto",
-    "z-index": 0,
-    label: "",
-    "text-margin-x": 0,
-    "text-margin-y": 0,
-    "source-label": "",
-    "source-text-offset": 0,
-    "source-text-margin-x": 0,
-    "source-text-margin-y": 0,
-    "target-label": "",
-    "target-text-offset": 0,
-    "target-text-margin-x": 0,
-    "target-text-margin-y": 0,
-    "overlay-opacity": 0,
-    "overlay-color": "#000",
-    "overlay-padding": 10,
-    "overlay-shape": "round-rectangle",
-    "underlay-opacity": 0,
-    "underlay-color": "#000",
-    "underlay-padding": 10,
-    "underlay-shape": "round-rectangle",
-    "transition-property": "none",
-    "transition-duration": 0,
-    "transition-delay": 0,
-    "transition-timing-function": "linear",
-    // node props
-    "background-blacken": 0,
-    "background-color": "#999",
-    "background-fill": "solid",
-    "background-opacity": 1,
-    "background-image": "none",
-    "background-image-crossorigin": "anonymous",
-    "background-image-opacity": 1,
-    "background-image-containment": "inside",
-    "background-image-smoothing": "yes",
-    "background-position-x": "50%",
-    "background-position-y": "50%",
-    "background-offset-x": 0,
-    "background-offset-y": 0,
-    "background-width-relative-to": "include-padding",
-    "background-height-relative-to": "include-padding",
-    "background-repeat": "no-repeat",
-    "background-fit": "none",
-    "background-clip": "node",
-    "background-width": "auto",
-    "background-height": "auto",
-    "border-color": "#000",
-    "border-opacity": 1,
-    "border-width": 0,
-    "border-style": "solid",
-    height: 30,
-    width: 30,
-    shape: "ellipse",
-    "shape-polygon-points": "-1, -1,   1, -1,   1, 1,   -1, 1",
-    "bounds-expansion": 0,
-    // node gradient
-    "background-gradient-direction": "to-bottom",
-    "background-gradient-stop-colors": "#999",
-    "background-gradient-stop-positions": "0%",
-    // ghost props
-    ghost: "no",
-    "ghost-offset-y": 0,
-    "ghost-offset-x": 0,
-    "ghost-opacity": 0,
-    // compound props
-    padding: 0,
-    "padding-relative-to": "width",
-    position: "origin",
-    "compound-sizing-wrt-labels": "include",
-    "min-width": 0,
-    "min-width-bias-left": 0,
-    "min-width-bias-right": 0,
-    "min-height": 0,
-    "min-height-bias-top": 0,
-    "min-height-bias-bottom": 0
-  }, {
-    // node pie bg
-    "pie-size": "100%"
-  }, [{
-    name: "pie-{{i}}-background-color",
-    value: "black"
-  }, {
-    name: "pie-{{i}}-background-size",
-    value: "0%"
-  }, {
-    name: "pie-{{i}}-background-opacity",
-    value: 1
-  }].reduce(function(k, E) {
-    for (var C = 1; C <= vo.pieBackgroundN; C++) {
-      var T = E.name.replace("{{i}}", C), P = E.value;
-      k[T] = P;
-    }
-    return k;
-  }, {}), {
-    // edge props
-    "line-style": "solid",
-    "line-color": "#999",
-    "line-fill": "solid",
-    "line-cap": "butt",
-    "line-opacity": 1,
-    "line-gradient-stop-colors": "#999",
-    "line-gradient-stop-positions": "0%",
-    "control-point-step-size": 40,
-    "control-point-weights": 0.5,
-    "segment-weights": 0.5,
-    "segment-distances": 20,
-    "taxi-turn": "50%",
-    "taxi-turn-min-distance": 10,
-    "taxi-direction": "auto",
-    "edge-distances": "intersection",
-    "curve-style": "haystack",
-    "haystack-radius": 0,
-    "arrow-scale": 1,
-    "loop-direction": "-45deg",
-    "loop-sweep": "-90deg",
-    "source-distance-from-node": 0,
-    "target-distance-from-node": 0,
-    "source-endpoint": "outside-to-node",
-    "target-endpoint": "outside-to-node",
-    "line-dash-pattern": [6, 3],
-    "line-dash-offset": 0
-  }, [{
-    name: "arrow-shape",
-    value: "none"
-  }, {
-    name: "arrow-color",
-    value: "#999"
-  }, {
-    name: "arrow-fill",
-    value: "filled"
-  }].reduce(function(k, E) {
-    return vo.arrowPrefixes.forEach(function(C) {
-      var T = C + "-" + E.name, P = E.value;
-      k[T] = P;
-    }), k;
-  }, {})), u = {}, c = 0; c < this.properties.length; c++) {
-    var d = this.properties[c];
-    if (!d.pointsTo) {
-      var g = d.name, b = r[g], y = this.parse(g, b);
-      u[g] = y;
-    }
-  }
-  return a.defaultProperties = u, a.defaultProperties;
-};
-vo.addDefaultStylesheet = function() {
-  this.selector(":parent").css({
-    shape: "rectangle",
-    padding: 10,
-    "background-color": "#eee",
-    "border-color": "#ccc",
-    "border-width": 1
-  }).selector("edge").css({
-    width: 3
-  }).selector(":loop").css({
-    "curve-style": "bezier"
-  }).selector("edge:compound").css({
-    "curve-style": "bezier",
-    "source-endpoint": "outside-to-line",
-    "target-endpoint": "outside-to-line"
-  }).selector(":selected").css({
-    "background-color": "#0169D9",
-    "line-color": "#0169D9",
-    "source-arrow-color": "#0169D9",
-    "target-arrow-color": "#0169D9",
-    "mid-source-arrow-color": "#0169D9",
-    "mid-target-arrow-color": "#0169D9"
-  }).selector(":parent:selected").css({
-    "background-color": "#CCE1F9",
-    "border-color": "#aec8e5"
-  }).selector(":active").css({
-    "overlay-color": "black",
-    "overlay-padding": 10,
-    "overlay-opacity": 0.25
-  }), this.defaultLength = this.length;
-};
-var y5 = {};
-y5.parse = function(a, r, u, c) {
-  var d = this;
-  if (zi(r))
-    return d.parseImplWarn(a, r, u, c);
-  var g = c === "mapping" || c === !0 || c === !1 || c == null ? "dontcare" : c, b = u ? "t" : "f", y = "" + r, k = UG(a, y, b, g), E = d.propCache = d.propCache || [], C;
-  return (C = E[k]) || (C = E[k] = d.parseImplWarn(a, r, u, c)), (u || c === "mapping") && (C = kl(C), C && (C.value = kl(C.value))), C;
-};
-y5.parseImplWarn = function(a, r, u, c) {
-  var d = this.parseImpl(a, r, u, c);
-  return !d && r != null && Sr("The style property `".concat(a, ": ").concat(r, "` is invalid")), d && (d.name === "width" || d.name === "height") && r === "label" && Sr("The style value of `label` is deprecated for `" + d.name + "`"), d;
-};
-y5.parseImpl = function(a, r, u, c) {
-  var d = this;
-  a = D6(a);
-  var g = d.properties[a], b = r, y = d.types;
-  if (!g || r === void 0)
-    return null;
-  g.alias && (g = g.pointsTo, a = g.name);
-  var k = qt(r);
-  k && (r = r.trim());
-  var E = g.type;
-  if (!E)
-    return null;
-  if (u && (r === "" || r === null))
-    return {
-      name: a,
-      value: r,
-      bypass: !0,
-      deleteBypass: !0
-    };
-  if (zi(r))
-    return {
-      name: a,
-      value: r,
-      strValue: "fn",
-      mapped: y.fn,
-      bypass: u
-    };
-  var C, T;
-  if (!(!k || c || r.length < 7 || r[1] !== "a")) {
-    if (r.length >= 7 && r[0] === "d" && (C = new RegExp(y.data.regex).exec(r))) {
-      if (u)
-        return !1;
-      var P = y.data;
-      return {
-        name: a,
-        value: C,
-        strValue: "" + r,
-        mapped: P,
-        field: C[1],
-        bypass: u
-      };
-    } else if (r.length >= 10 && r[0] === "m" && (T = new RegExp(y.mapData.regex).exec(r))) {
-      if (u || E.multiple)
-        return !1;
-      var N = y.mapData;
-      if (!(E.color || E.number))
-        return !1;
-      var D = this.parse(a, T[4]);
-      if (!D || D.mapped)
-        return !1;
-      var H = this.parse(a, T[5]);
-      if (!H || H.mapped)
-        return !1;
-      if (D.pfValue === H.pfValue || D.strValue === H.strValue)
-        return Sr("`" + a + ": " + r + "` is not a valid mapper because the output range is zero; converting to `" + a + ": " + D.strValue + "`"), this.parse(a, D.strValue);
-      if (E.color) {
-        var _ = D.value, B = H.value, $ = _[0] === B[0] && _[1] === B[1] && _[2] === B[2] && // optional alpha
-        (_[3] === B[3] || (_[3] == null || _[3] === 1) && (B[3] == null || B[3] === 1));
-        if ($)
-          return !1;
-      }
-      return {
-        name: a,
-        value: T,
-        strValue: "" + r,
-        mapped: N,
-        field: T[1],
-        fieldMin: parseFloat(T[2]),
-        // min & max are numeric
-        fieldMax: parseFloat(T[3]),
-        valueMin: D.value,
-        valueMax: H.value,
-        bypass: u
-      };
-    }
-  }
-  if (E.multiple && c !== "multiple") {
-    var F;
-    if (k ? F = r.split(/\s+/) : Qr(r) ? F = r : F = [r], E.evenMultiple && F.length % 2 !== 0)
-      return null;
-    for (var W = [], Q = [], X = [], K = "", ee = !1, Z = 0; Z < F.length; Z++) {
-      var ae = d.parse(a, F[Z], u, "multiple");
-      ee = ee || qt(ae.value), W.push(ae.value), X.push(ae.pfValue != null ? ae.pfValue : ae.value), Q.push(ae.units), K += (Z > 0 ? " " : "") + ae.strValue;
-    }
-    return E.validate && !E.validate(W, Q) ? null : E.singleEnum && ee ? W.length === 1 && qt(W[0]) ? {
-      name: a,
-      value: W[0],
-      strValue: W[0],
-      bypass: u
-    } : null : {
-      name: a,
-      value: W,
-      pfValue: X,
-      strValue: K,
-      bypass: u,
-      units: Q
-    };
-  }
-  var oe = function() {
-    for (var Ke = 0; Ke < E.enums.length; Ke++) {
-      var at = E.enums[Ke];
-      if (at === r)
-        return {
-          name: a,
-          value: r,
-          strValue: "" + r,
-          bypass: u
-        };
-    }
-    return null;
-  };
-  if (E.number) {
-    var J, fe = "px";
-    if (E.units && (J = E.units), E.implicitUnits && (fe = E.implicitUnits), !E.unitless)
-      if (k) {
-        var se = "px|em" + (E.allowPercent ? "|\\%" : "");
-        J && (se = J);
-        var pe = r.match("^(" + Aa + ")(" + se + ")?$");
-        pe && (r = pe[1], J = pe[2] || fe);
-      } else
-        (!J || E.implicitUnits) && (J = fe);
-    if (r = parseFloat(r), isNaN(r) && E.enums === void 0)
-      return null;
-    if (isNaN(r) && E.enums !== void 0)
-      return r = b, oe();
-    if (E.integer && !foe(r) || E.min !== void 0 && (r < E.min || E.strictMin && r === E.min) || E.max !== void 0 && (r > E.max || E.strictMax && r === E.max))
-      return null;
-    var he = {
-      name: a,
-      value: r,
-      strValue: "" + r + (J || ""),
-      units: J,
-      bypass: u
-    };
-    return E.unitless || J !== "px" && J !== "em" ? he.pfValue = r : he.pfValue = J === "px" || !J ? r : this.getEmSizeInPixels() * r, (J === "ms" || J === "s") && (he.pfValue = J === "ms" ? r : 1e3 * r), (J === "deg" || J === "rad") && (he.pfValue = J === "rad" ? r : ose(r)), J === "%" && (he.pfValue = r / 100), he;
-  } else if (E.propList) {
-    var de = [], ke = "" + r;
-    if (ke !== "none") {
-      for (var Pe = ke.split(/\s*,\s*|\s+/), Ae = 0; Ae < Pe.length; Ae++) {
-        var Te = Pe[Ae].trim();
-        d.properties[Te] ? de.push(Te) : Sr("`" + Te + "` is not a valid property name");
-      }
-      if (de.length === 0)
-        return null;
-    }
-    return {
-      name: a,
-      value: de,
-      strValue: de.length === 0 ? "none" : de.join(" "),
-      bypass: u
-    };
-  } else if (E.color) {
-    var Oe = Poe(r);
-    return Oe ? {
-      name: a,
-      value: Oe,
-      pfValue: Oe,
-      strValue: "rgb(" + Oe[0] + "," + Oe[1] + "," + Oe[2] + ")",
-      // n.b. no spaces b/c of multiple support
-      bypass: u
-    } : null;
-  } else if (E.regex || E.regexes) {
-    if (E.enums) {
-      var ze = oe();
-      if (ze)
-        return ze;
-    }
-    for (var We = E.regexes ? E.regexes : [E.regex], $e = 0; $e < We.length; $e++) {
-      var Ge = new RegExp(We[$e]), me = Ge.exec(r);
-      if (me)
-        return {
-          name: a,
-          value: E.singleRegexMatchValue ? me[1] : me,
-          strValue: "" + r,
-          bypass: u
-        };
-    }
-    return null;
-  } else
-    return E.string ? {
-      name: a,
-      value: "" + r,
-      strValue: "" + r,
-      bypass: u
-    } : E.enums ? oe() : null;
-};
-var Io = function a(r) {
-  if (!(this instanceof a))
-    return new a(r);
-  if (!P6(r)) {
-    Qi("A style must have a core reference");
-    return;
-  }
-  this._private = {
-    cy: r,
-    coreStyle: {}
-  }, this.length = 0, this.resetToDefault();
-}, Oo = Io.prototype;
-Oo.instanceString = function() {
-  return "style";
-};
-Oo.clear = function() {
-  for (var a = this._private, r = a.cy, u = r.elements(), c = 0; c < this.length; c++)
-    this[c] = void 0;
-  return this.length = 0, a.contextStyles = {}, a.propDiffs = {}, this.cleanElements(u, !0), u.forEach(function(d) {
-    var g = d[0]._private;
-    g.styleDirty = !0, g.appliedInitStyle = !1;
-  }), this;
-};
-Oo.resetToDefault = function() {
-  return this.clear(), this.addDefaultStylesheet(), this;
-};
-Oo.core = function(a) {
-  return this._private.coreStyle[a] || this.getDefaultProperty(a);
-};
-Oo.selector = function(a) {
-  var r = a === "core" ? null : new _h(a), u = this.length++;
-  return this[u] = {
-    selector: r,
-    properties: [],
-    mappedProperties: [],
-    index: u
-  }, this;
-};
-Oo.css = function() {
-  var a = this, r = arguments;
-  if (r.length === 1)
-    for (var u = r[0], c = 0; c < a.properties.length; c++) {
-      var d = a.properties[c], g = u[d.name];
-      g === void 0 && (g = u[f5(d.name)]), g !== void 0 && this.cssRule(d.name, g);
-    }
-  else
-    r.length === 2 && this.cssRule(r[0], r[1]);
-  return this;
-};
-Oo.style = Oo.css;
-Oo.cssRule = function(a, r) {
-  var u = this.parse(a, r);
-  if (u) {
-    var c = this.length - 1;
-    this[c].properties.push(u), this[c].properties[u.name] = u, u.name.match(/pie-(\d+)-background-size/) && u.value && (this._private.hasPie = !0), u.mapped && this[c].mappedProperties.push(u);
-    var d = !this[c].selector;
-    d && (this._private.coreStyle[u.name] = u);
-  }
-  return this;
-};
-Oo.append = function(a) {
-  return _G(a) ? a.appendToStyle(this) : Qr(a) ? this.appendFromJson(a) : qt(a) && this.appendFromString(a), this;
-};
-Io.fromJson = function(a, r) {
-  var u = new Io(a);
-  return u.fromJson(r), u;
-};
-Io.fromString = function(a, r) {
-  return new Io(a).fromString(r);
-};
-[Ao, hw, _6, Sl, m5, G6, vo, y5].forEach(function(a) {
-  on(Oo, a);
-});
-Io.types = Oo.types;
-Io.properties = Oo.properties;
-Io.propertyGroups = Oo.propertyGroups;
-Io.propertyGroupNames = Oo.propertyGroupNames;
-Io.propertyGroupKeys = Oo.propertyGroupKeys;
-var wce = {
-  style: function(r) {
-    if (r) {
-      var u = this.setStyle(r);
-      u.update();
-    }
-    return this._private.style;
-  },
-  setStyle: function(r) {
-    var u = this._private;
-    return _G(r) ? u.style = r.generateStyle(this) : Qr(r) ? u.style = Io.fromJson(this, r) : qt(r) ? u.style = Io.fromString(this, r) : u.style = Io(this), u.style;
-  },
-  // e.g. cy.data() changed => recalc ele mappers
-  updateStyle: function() {
-    this.mutableElements().updateStyle();
-  }
-}, mce = "single", vv = {
-  autolock: function(r) {
-    if (r !== void 0)
-      this._private.autolock = !!r;
-    else
-      return this._private.autolock;
-    return this;
-  },
-  autoungrabify: function(r) {
-    if (r !== void 0)
-      this._private.autoungrabify = !!r;
-    else
-      return this._private.autoungrabify;
-    return this;
-  },
-  autounselectify: function(r) {
-    if (r !== void 0)
-      this._private.autounselectify = !!r;
-    else
-      return this._private.autounselectify;
-    return this;
-  },
-  selectionType: function(r) {
-    var u = this._private;
-    if (u.selectionType == null && (u.selectionType = mce), r !== void 0)
-      (r === "additive" || r === "single") && (u.selectionType = r);
-    else
-      return u.selectionType;
-    return this;
-  },
-  panningEnabled: function(r) {
-    if (r !== void 0)
-      this._private.panningEnabled = !!r;
-    else
-      return this._private.panningEnabled;
-    return this;
-  },
-  userPanningEnabled: function(r) {
-    if (r !== void 0)
-      this._private.userPanningEnabled = !!r;
-    else
-      return this._private.userPanningEnabled;
-    return this;
-  },
-  zoomingEnabled: function(r) {
-    if (r !== void 0)
-      this._private.zoomingEnabled = !!r;
-    else
-      return this._private.zoomingEnabled;
-    return this;
-  },
-  userZoomingEnabled: function(r) {
-    if (r !== void 0)
-      this._private.userZoomingEnabled = !!r;
-    else
-      return this._private.userZoomingEnabled;
-    return this;
-  },
-  boxSelectionEnabled: function(r) {
-    if (r !== void 0)
-      this._private.boxSelectionEnabled = !!r;
-    else
-      return this._private.boxSelectionEnabled;
-    return this;
-  },
-  pan: function() {
-    var r = arguments, u = this._private.pan, c, d, g, b, y;
-    switch (r.length) {
-      case 0:
-        return u;
-      case 1:
-        if (qt(r[0]))
-          return c = r[0], u[c];
-        if (fr(r[0])) {
-          if (!this._private.panningEnabled)
-            return this;
-          g = r[0], b = g.x, y = g.y, kt(b) && (u.x = b), kt(y) && (u.y = y), this.emit("pan viewport");
-        }
-        break;
-      case 2:
-        if (!this._private.panningEnabled)
-          return this;
-        c = r[0], d = r[1], (c === "x" || c === "y") && kt(d) && (u[c] = d), this.emit("pan viewport");
-        break;
-    }
-    return this.notify("viewport"), this;
-  },
-  panBy: function(r, u) {
-    var c = arguments, d = this._private.pan, g, b, y, k, E;
-    if (!this._private.panningEnabled)
-      return this;
-    switch (c.length) {
-      case 1:
-        fr(r) && (y = c[0], k = y.x, E = y.y, kt(k) && (d.x += k), kt(E) && (d.y += E), this.emit("pan viewport"));
-        break;
-      case 2:
-        g = r, b = u, (g === "x" || g === "y") && kt(b) && (d[g] += b), this.emit("pan viewport");
-        break;
-    }
-    return this.notify("viewport"), this;
-  },
-  fit: function(r, u) {
-    var c = this.getFitViewport(r, u);
-    if (c) {
-      var d = this._private;
-      d.zoom = c.zoom, d.pan = c.pan, this.emit("pan zoom viewport"), this.notify("viewport");
-    }
-    return this;
-  },
-  getFitViewport: function(r, u) {
-    if (kt(r) && u === void 0 && (u = r, r = void 0), !(!this._private.panningEnabled || !this._private.zoomingEnabled)) {
-      var c;
-      if (qt(r)) {
-        var d = r;
-        r = this.$(d);
-      } else if (voe(r)) {
-        var g = r;
-        c = {
-          x1: g.x1,
-          y1: g.y1,
-          x2: g.x2,
-          y2: g.y2
-        }, c.w = c.x2 - c.x1, c.h = c.y2 - c.y1;
-      } else
-        tu(r) || (r = this.mutableElements());
-      if (!(tu(r) && r.empty())) {
-        c = c || r.boundingBox();
-        var b = this.width(), y = this.height(), k;
-        if (u = kt(u) ? u : 0, !isNaN(b) && !isNaN(y) && b > 0 && y > 0 && !isNaN(c.w) && !isNaN(c.h) && c.w > 0 && c.h > 0) {
-          k = Math.min((b - 2 * u) / c.w, (y - 2 * u) / c.h), k = k > this._private.maxZoom ? this._private.maxZoom : k, k = k < this._private.minZoom ? this._private.minZoom : k;
-          var E = {
-            // now pan to middle
-            x: (b - k * (c.x1 + c.x2)) / 2,
-            y: (y - k * (c.y1 + c.y2)) / 2
-          };
-          return {
-            zoom: k,
-            pan: E
-          };
-        }
-      }
-    }
-  },
-  zoomRange: function(r, u) {
-    var c = this._private;
-    if (u == null) {
-      var d = r;
-      r = d.min, u = d.max;
-    }
-    return kt(r) && kt(u) && r <= u ? (c.minZoom = r, c.maxZoom = u) : kt(r) && u === void 0 && r <= c.maxZoom ? c.minZoom = r : kt(u) && r === void 0 && u >= c.minZoom && (c.maxZoom = u), this;
-  },
-  minZoom: function(r) {
-    return r === void 0 ? this._private.minZoom : this.zoomRange({
-      min: r
-    });
-  },
-  maxZoom: function(r) {
-    return r === void 0 ? this._private.maxZoom : this.zoomRange({
-      max: r
-    });
-  },
-  getZoomedViewport: function(r) {
-    var u = this._private, c = u.pan, d = u.zoom, g, b, y = !1;
-    if (u.zoomingEnabled || (y = !0), kt(r) ? b = r : fr(r) && (b = r.level, r.position != null ? g = d5(r.position, d, c) : r.renderedPosition != null && (g = r.renderedPosition), g != null && !u.panningEnabled && (y = !0)), b = b > u.maxZoom ? u.maxZoom : b, b = b < u.minZoom ? u.minZoom : b, y || !kt(b) || b === d || g != null && (!kt(g.x) || !kt(g.y)))
-      return null;
-    if (g != null) {
-      var k = c, E = d, C = b, T = {
-        x: -C / E * (g.x - k.x) + g.x,
-        y: -C / E * (g.y - k.y) + g.y
-      };
-      return {
-        zoomed: !0,
-        panned: !0,
-        zoom: C,
-        pan: T
-      };
-    } else
-      return {
-        zoomed: !0,
-        panned: !1,
-        zoom: b,
-        pan: c
-      };
-  },
-  zoom: function(r) {
-    if (r === void 0)
-      return this._private.zoom;
-    var u = this.getZoomedViewport(r), c = this._private;
-    return u == null || !u.zoomed ? this : (c.zoom = u.zoom, u.panned && (c.pan.x = u.pan.x, c.pan.y = u.pan.y), this.emit("zoom" + (u.panned ? " pan" : "") + " viewport"), this.notify("viewport"), this);
-  },
-  viewport: function(r) {
-    var u = this._private, c = !0, d = !0, g = [], b = !1, y = !1;
-    if (!r)
-      return this;
-    if (kt(r.zoom) || (c = !1), fr(r.pan) || (d = !1), !c && !d)
-      return this;
-    if (c) {
-      var k = r.zoom;
-      k < u.minZoom || k > u.maxZoom || !u.zoomingEnabled ? b = !0 : (u.zoom = k, g.push("zoom"));
-    }
-    if (d && (!b || !r.cancelOnFailedZoom) && u.panningEnabled) {
-      var E = r.pan;
-      kt(E.x) && (u.pan.x = E.x, y = !1), kt(E.y) && (u.pan.y = E.y, y = !1), y || g.push("pan");
-    }
-    return g.length > 0 && (g.push("viewport"), this.emit(g.join(" ")), this.notify("viewport")), this;
-  },
-  center: function(r) {
-    var u = this.getCenterPan(r);
-    return u && (this._private.pan = u, this.emit("pan viewport"), this.notify("viewport")), this;
-  },
-  getCenterPan: function(r, u) {
-    if (this._private.panningEnabled) {
-      if (qt(r)) {
-        var c = r;
-        r = this.mutableElements().filter(c);
-      } else
-        tu(r) || (r = this.mutableElements());
-      if (r.length !== 0) {
-        var d = r.boundingBox(), g = this.width(), b = this.height();
-        u = u === void 0 ? this._private.zoom : u;
-        var y = {
-          // middle
-          x: (g - u * (d.x1 + d.x2)) / 2,
-          y: (b - u * (d.y1 + d.y2)) / 2
-        };
-        return y;
-      }
-    }
-  },
-  reset: function() {
-    return !this._private.panningEnabled || !this._private.zoomingEnabled ? this : (this.viewport({
-      pan: {
-        x: 0,
-        y: 0
-      },
-      zoom: 1
-    }), this);
-  },
-  invalidateSize: function() {
-    this._private.sizeCache = null;
-  },
-  size: function() {
-    var r = this._private, u = r.container, c = this;
-    return r.sizeCache = r.sizeCache || (u ? function() {
-      var d = c.window().getComputedStyle(u), g = function(y) {
-        return parseFloat(d.getPropertyValue(y));
-      };
-      return {
-        width: u.clientWidth - g("padding-left") - g("padding-right"),
-        height: u.clientHeight - g("padding-top") - g("padding-bottom")
-      };
-    }() : {
-      // fallback if no container (not 0 b/c can be used for dividing etc)
-      width: 1,
-      height: 1
-    });
-  },
-  width: function() {
-    return this.size().width;
-  },
-  height: function() {
-    return this.size().height;
-  },
-  extent: function() {
-    var r = this._private.pan, u = this._private.zoom, c = this.renderedExtent(), d = {
-      x1: (c.x1 - r.x) / u,
-      x2: (c.x2 - r.x) / u,
-      y1: (c.y1 - r.y) / u,
-      y2: (c.y2 - r.y) / u
-    };
-    return d.w = d.x2 - d.x1, d.h = d.y2 - d.y1, d;
-  },
-  renderedExtent: function() {
-    var r = this.width(), u = this.height();
-    return {
-      x1: 0,
-      y1: 0,
-      x2: r,
-      y2: u,
-      w: r,
-      h: u
-    };
-  },
-  multiClickDebounceTime: function(r) {
-    if (r)
-      this._private.multiClickDebounceTime = r;
-    else
-      return this._private.multiClickDebounceTime;
-    return this;
-  }
-};
-vv.centre = vv.center;
-vv.autolockNodes = vv.autolock;
-vv.autoungrabifyNodes = vv.autoungrabify;
-var nw = {
-  data: Mr.data({
-    field: "data",
-    bindingEvent: "data",
-    allowBinding: !0,
-    allowSetting: !0,
-    settingEvent: "data",
-    settingTriggersEvent: !0,
-    triggerFnName: "trigger",
-    allowGetting: !0,
-    updateStyle: !0
-  }),
-  removeData: Mr.removeData({
-    field: "data",
-    event: "data",
-    triggerFnName: "trigger",
-    triggerEvent: !0,
-    updateStyle: !0
-  }),
-  scratch: Mr.data({
-    field: "scratch",
-    bindingEvent: "scratch",
-    allowBinding: !0,
-    allowSetting: !0,
-    settingEvent: "scratch",
-    settingTriggersEvent: !0,
-    triggerFnName: "trigger",
-    allowGetting: !0,
-    updateStyle: !0
-  }),
-  removeScratch: Mr.removeData({
-    field: "scratch",
-    event: "scratch",
-    triggerFnName: "trigger",
-    triggerEvent: !0,
-    updateStyle: !0
-  })
-};
-nw.attr = nw.data;
-nw.removeAttr = nw.removeData;
-var rw = function(r) {
-  var u = this;
-  r = on({}, r);
-  var c = r.container;
-  c && !ZE(c) && ZE(c[0]) && (c = c[0]);
-  var d = c ? c._cyreg : null;
-  d = d || {}, d && d.cy && (d.cy.destroy(), d = {});
-  var g = d.readies = d.readies || [];
-  c && (c._cyreg = d), d.cy = u;
-  var b = Oa !== void 0 && c !== void 0 && !r.headless, y = r;
-  y.layout = on({
-    name: b ? "grid" : "null"
-  }, y.layout), y.renderer = on({
-    name: b ? "canvas" : "null"
-  }, y.renderer);
-  var k = function(D, H, _) {
-    return H !== void 0 ? H : _ !== void 0 ? _ : D;
-  }, E = this._private = {
-    container: c,
-    // html dom ele container
-    ready: !1,
-    // whether ready has been triggered
-    options: y,
-    // cached options
-    elements: new bo(this),
-    // elements in the graph
-    listeners: [],
-    // list of listeners
-    aniEles: new bo(this),
-    // elements being animated
-    data: y.data || {},
-    // data for the core
-    scratch: {},
-    // scratch object for core
-    layout: null,
-    renderer: null,
-    destroyed: !1,
-    // whether destroy was called
-    notificationsEnabled: !0,
-    // whether notifications are sent to the renderer
-    minZoom: 1e-50,
-    maxZoom: 1e50,
-    zoomingEnabled: k(!0, y.zoomingEnabled),
-    userZoomingEnabled: k(!0, y.userZoomingEnabled),
-    panningEnabled: k(!0, y.panningEnabled),
-    userPanningEnabled: k(!0, y.userPanningEnabled),
-    boxSelectionEnabled: k(!0, y.boxSelectionEnabled),
-    autolock: k(!1, y.autolock, y.autolockNodes),
-    autoungrabify: k(!1, y.autoungrabify, y.autoungrabifyNodes),
-    autounselectify: k(!1, y.autounselectify),
-    styleEnabled: y.styleEnabled === void 0 ? b : y.styleEnabled,
-    zoom: kt(y.zoom) ? y.zoom : 1,
-    pan: {
-      x: fr(y.pan) && kt(y.pan.x) ? y.pan.x : 0,
-      y: fr(y.pan) && kt(y.pan.y) ? y.pan.y : 0
-    },
-    animation: {
-      // object for currently-running animations
-      current: [],
-      queue: []
-    },
-    hasCompoundNodes: !1,
-    multiClickDebounceTime: k(250, y.multiClickDebounceTime)
-  };
-  this.createEmitter(), this.selectionType(y.selectionType), this.zoomRange({
-    min: y.minZoom,
-    max: y.maxZoom
-  });
-  var C = function(D, H) {
-    var _ = D.some(goe);
-    if (_)
-      return Hb.all(D).then(H);
-    H(D);
-  };
-  E.styleEnabled && u.setStyle([]);
-  var T = on({}, y, y.renderer);
-  u.initRenderer(T);
-  var P = function(D, H, _) {
-    u.notifications(!1);
-    var B = u.mutableElements();
-    B.length > 0 && B.remove(), D != null && (fr(D) || Qr(D)) && u.add(D), u.one("layoutready", function(F) {
-      u.notifications(!0), u.emit(F), u.one("load", H), u.emitAndNotify("load");
-    }).one("layoutstop", function() {
-      u.one("done", _), u.emit("done");
-    });
-    var $ = on({}, u._private.options.layout);
-    $.eles = u.elements(), u.layout($).run();
-  };
-  C([y.style, y.elements], function(N) {
-    var D = N[0], H = N[1];
-    E.styleEnabled && u.style().append(D), P(H, function() {
-      u.startAnimationLoop(), E.ready = !0, zi(y.ready) && u.on("ready", y.ready);
-      for (var _ = 0; _ < g.length; _++) {
-        var B = g[_];
-        u.on("ready", B);
-      }
-      d && (d.readies = []), u.emit("ready");
-    }, y.done);
-  });
-}, t5 = rw.prototype;
-on(t5, {
-  instanceString: function() {
-    return "core";
-  },
-  isReady: function() {
-    return this._private.ready;
-  },
-  destroyed: function() {
-    return this._private.destroyed;
-  },
-  ready: function(r) {
-    return this.isReady() ? this.emitter().emit("ready", [], r) : this.on("ready", r), this;
-  },
-  destroy: function() {
-    var r = this;
-    if (!r.destroyed())
-      return r.stopAnimationLoop(), r.destroyRenderer(), this.emit("destroy"), r._private.destroyed = !0, r;
-  },
-  hasElementWithId: function(r) {
-    return this._private.elements.hasElementWithId(r);
-  },
-  getElementById: function(r) {
-    return this._private.elements.getElementById(r);
-  },
-  hasCompoundNodes: function() {
-    return this._private.hasCompoundNodes;
-  },
-  headless: function() {
-    return this._private.renderer.isHeadless();
-  },
-  styleEnabled: function() {
-    return this._private.styleEnabled;
-  },
-  addToPool: function(r) {
-    return this._private.elements.merge(r), this;
-  },
-  removeFromPool: function(r) {
-    return this._private.elements.unmerge(r), this;
-  },
-  container: function() {
-    return this._private.container || null;
-  },
-  window: function() {
-    var r = this._private.container;
-    if (r == null)
-      return Oa;
-    var u = this._private.container.ownerDocument;
-    return u === void 0 || u == null ? Oa : u.defaultView || Oa;
-  },
-  mount: function(r) {
-    if (r != null) {
-      var u = this, c = u._private, d = c.options;
-      return !ZE(r) && ZE(r[0]) && (r = r[0]), u.stopAnimationLoop(), u.destroyRenderer(), c.container = r, c.styleEnabled = !0, u.invalidateSize(), u.initRenderer(on({}, d, d.renderer, {
-        // allow custom renderer name to be re-used, otherwise use canvas
-        name: d.renderer.name === "null" ? "canvas" : d.renderer.name
-      })), u.startAnimationLoop(), u.style(d.style), u.emit("mount"), u;
-    }
-  },
-  unmount: function() {
-    var r = this;
-    return r.stopAnimationLoop(), r.destroyRenderer(), r.initRenderer({
-      name: "null"
-    }), r.emit("unmount"), r;
-  },
-  options: function() {
-    return kl(this._private.options);
-  },
-  json: function(r) {
-    var u = this, c = u._private, d = u.mutableElements(), g = function(W) {
-      return u.getElementById(W.id());
-    };
-    if (fr(r)) {
-      if (u.startBatch(), r.elements) {
-        var b = {}, y = function(W, Q) {
-          for (var X = [], K = [], ee = 0; ee < W.length; ee++) {
-            var Z = W[ee];
-            if (!Z.data.id) {
-              Sr("cy.json() cannot handle elements without an ID attribute");
-              continue;
-            }
-            var ae = "" + Z.data.id, oe = u.getElementById(ae);
-            b[ae] = !0, oe.length !== 0 ? K.push({
-              ele: oe,
-              json: Z
-            }) : (Q && (Z.group = Q), X.push(Z));
-          }
-          u.add(X);
-          for (var J = 0; J < K.length; J++) {
-            var fe = K[J], se = fe.ele, pe = fe.json;
-            se.json(pe);
-          }
-        };
-        if (Qr(r.elements))
-          y(r.elements);
-        else
-          for (var k = ["nodes", "edges"], E = 0; E < k.length; E++) {
-            var C = k[E], T = r.elements[C];
-            Qr(T) && y(T, C);
-          }
-        var P = u.collection();
-        d.filter(function(F) {
-          return !b[F.id()];
-        }).forEach(function(F) {
-          F.isParent() ? P.merge(F) : F.remove();
-        }), P.forEach(function(F) {
-          return F.children().move({
-            parent: null
-          });
-        }), P.forEach(function(F) {
-          return g(F).remove();
-        });
-      }
-      r.style && u.style(r.style), r.zoom != null && r.zoom !== c.zoom && u.zoom(r.zoom), r.pan && (r.pan.x !== c.pan.x || r.pan.y !== c.pan.y) && u.pan(r.pan), r.data && u.data(r.data);
-      for (var N = ["minZoom", "maxZoom", "zoomingEnabled", "userZoomingEnabled", "panningEnabled", "userPanningEnabled", "boxSelectionEnabled", "autolock", "autoungrabify", "autounselectify", "multiClickDebounceTime"], D = 0; D < N.length; D++) {
-        var H = N[D];
-        r[H] != null && u[H](r[H]);
-      }
-      return u.endBatch(), this;
-    } else {
-      var _ = !!r, B = {};
-      _ ? B.elements = this.elements().map(function(F) {
-        return F.json();
-      }) : (B.elements = {}, d.forEach(function(F) {
-        var W = F.group();
-        B.elements[W] || (B.elements[W] = []), B.elements[W].push(F.json());
-      })), this._private.styleEnabled && (B.style = u.style().json()), B.data = kl(u.data());
-      var $ = c.options;
-      return B.zoomingEnabled = c.zoomingEnabled, B.userZoomingEnabled = c.userZoomingEnabled, B.zoom = c.zoom, B.minZoom = c.minZoom, B.maxZoom = c.maxZoom, B.panningEnabled = c.panningEnabled, B.userPanningEnabled = c.userPanningEnabled, B.pan = kl(c.pan), B.boxSelectionEnabled = c.boxSelectionEnabled, B.renderer = kl($.renderer), B.hideEdgesOnViewport = $.hideEdgesOnViewport, B.textureOnViewport = $.textureOnViewport, B.wheelSensitivity = $.wheelSensitivity, B.motionBlur = $.motionBlur, B.multiClickDebounceTime = $.multiClickDebounceTime, B;
-    }
-  }
-});
-t5.$id = t5.getElementById;
-[uce, dce, M$, g6, WE, gce, b6, UE, wce, vv, nw].forEach(function(a) {
-  on(t5, a);
-});
-var yce = {
-  fit: !0,
-  // whether to fit the viewport to the graph
-  directed: !1,
-  // whether the tree is directed downwards (or edges can point in any direction if false)
-  padding: 30,
-  // padding on fit
-  circle: !1,
-  // put depths in concentric circles if true, put depths top down if false
-  grid: !1,
-  // whether to create an even grid into which the DAG is placed (circle:false only)
-  spacingFactor: 1.75,
-  // positive spacing factor, larger => more space between nodes (N.B. n/a if causes overlap)
-  boundingBox: void 0,
-  // constrain layout bounds; { x1, y1, x2, y2 } or { x1, y1, w, h }
-  avoidOverlap: !0,
-  // prevents node overlap, may overflow boundingBox if not enough space
-  nodeDimensionsIncludeLabels: !1,
-  // Excludes the label when calculating node bounding boxes for the layout algorithm
-  roots: void 0,
-  // the roots of the trees
-  depthSort: void 0,
-  // a sorting function to order nodes at equal depth. e.g. function(a, b){ return a.data('weight') - b.data('weight') }
-  animate: !1,
-  // whether to transition the node positions
-  animationDuration: 500,
-  // duration of animation in ms if enabled
-  animationEasing: void 0,
-  // easing of animation if enabled,
-  animateFilter: function(r, u) {
-    return !0;
-  },
-  // a function that determines whether the node should be animated.  All nodes animated by default on animate enabled.  Non-animated nodes are positioned immediately when the layout starts
-  ready: void 0,
-  // callback on layoutready
-  stop: void 0,
-  // callback on layoutstop
-  transform: function(r, u) {
-    return u;
-  }
-  // transform a given node position. Useful for changing flow direction in discrete layouts
-}, kce = {
-  maximal: !1,
-  // whether to shift nodes down their natural BFS depths in order to avoid upwards edges (DAGS only); setting acyclic to true sets maximal to true also
-  acyclic: !1
-  // whether the tree is acyclic and thus a node could be shifted (due to the maximal option) multiple times without causing an infinite loop; setting to true sets maximal to true also; if you are uncertain whether a tree is acyclic, set to false to avoid potential infinite loops
-}, Eb = function(r) {
-  return r.scratch("breadthfirst");
-}, cG = function(r, u) {
-  return r.scratch("breadthfirst", u);
-};
-function O$(a) {
-  this.options = on({}, yce, kce, a);
-}
-O$.prototype.run = function() {
-  var a = this.options, r = a, u = a.cy, c = r.eles, d = c.nodes().filter(function(mt) {
-    return !mt.isParent();
-  }), g = c, b = r.directed, y = r.acyclic || r.maximal || r.maximalAdjustments > 0, k = Ms(r.boundingBox ? r.boundingBox : {
-    x1: 0,
-    y1: 0,
-    w: u.width(),
-    h: u.height()
-  }), E;
-  if (tu(r.roots))
-    E = r.roots;
-  else if (Qr(r.roots)) {
-    for (var C = [], T = 0; T < r.roots.length; T++) {
-      var P = r.roots[T], N = u.getElementById(P);
-      C.push(N);
-    }
-    E = u.collection(C);
-  } else if (qt(r.roots))
-    E = u.$(r.roots);
-  else if (b)
-    E = d.roots();
-  else {
-    var D = c.components();
-    E = u.collection();
-    for (var H = function(ht) {
-      var Rt = D[ht], Lt = Rt.maxDegree(!1), yt = Rt.filter(function(Mt) {
-        return Mt.degree(!1) === Lt;
-      });
-      E = E.add(yt);
-    }, _ = 0; _ < D.length; _++)
-      H(_);
-  }
-  var B = [], $ = {}, F = function(ht, Rt) {
-    B[Rt] == null && (B[Rt] = []);
-    var Lt = B[Rt].length;
-    B[Rt].push(ht), cG(ht, {
-      index: Lt,
-      depth: Rt
-    });
-  }, W = function(ht, Rt) {
-    var Lt = Eb(ht), yt = Lt.depth, Mt = Lt.index;
-    B[yt][Mt] = null, F(ht, Rt);
-  };
-  g.bfs({
-    roots: E,
-    directed: r.directed,
-    visit: function(ht, Rt, Lt, yt, Mt) {
-      var In = ht[0], Pn = In.id();
-      F(In, Mt), $[Pn] = !0;
-    }
-  });
-  for (var Q = [], X = 0; X < d.length; X++) {
-    var K = d[X];
-    $[K.id()] || Q.push(K);
-  }
-  var ee = function(ht) {
-    for (var Rt = B[ht], Lt = 0; Lt < Rt.length; Lt++) {
-      var yt = Rt[Lt];
-      if (yt == null) {
-        Rt.splice(Lt, 1), Lt--;
-        continue;
-      }
-      cG(yt, {
-        depth: ht,
-        index: Lt
-      });
-    }
-  }, Z = function() {
-    for (var ht = 0; ht < B.length; ht++)
-      ee(ht);
-  }, ae = function(ht, Rt) {
-    for (var Lt = Eb(ht), yt = ht.incomers().filter(function(ne) {
-      return ne.isNode() && c.has(ne);
-    }), Mt = -1, In = ht.id(), Pn = 0; Pn < yt.length; Pn++) {
-      var Vt = yt[Pn], ar = Eb(Vt);
-      Mt = Math.max(Mt, ar.depth);
-    }
-    if (Lt.depth <= Mt) {
-      if (!r.acyclic && Rt[In])
-        return null;
-      var Qe = Mt + 1;
-      return W(ht, Qe), Rt[In] = Qe, !0;
-    }
-    return !1;
-  };
-  if (b && y) {
-    var oe = [], J = {}, fe = function(ht) {
-      return oe.push(ht);
-    }, se = function() {
-      return oe.shift();
-    };
-    for (d.forEach(function(mt) {
-      return oe.push(mt);
-    }); oe.length > 0; ) {
-      var pe = se(), he = ae(pe, J);
-      if (he)
-        pe.outgoers().filter(function(mt) {
-          return mt.isNode() && c.has(mt);
-        }).forEach(fe);
-      else if (he === null) {
-        Sr("Detected double maximal shift for node `" + pe.id() + "`.  Bailing maximal adjustment due to cycle.  Use `options.maximal: true` only on DAGs.");
-        break;
-      }
-    }
-  }
-  Z();
-  var de = 0;
-  if (r.avoidOverlap)
-    for (var ke = 0; ke < d.length; ke++) {
-      var Pe = d[ke], Ae = Pe.layoutDimensions(r), Te = Ae.w, Oe = Ae.h;
-      de = Math.max(de, Te, Oe);
-    }
-  var ze = {}, We = function(ht) {
-    if (ze[ht.id()])
-      return ze[ht.id()];
-    for (var Rt = Eb(ht).depth, Lt = ht.neighborhood(), yt = 0, Mt = 0, In = 0; In < Lt.length; In++) {
-      var Pn = Lt[In];
-      if (!(Pn.isEdge() || Pn.isParent() || !d.has(Pn))) {
-        var Vt = Eb(Pn);
-        if (Vt != null) {
-          var ar = Vt.index, Qe = Vt.depth;
-          if (!(ar == null || Qe == null)) {
-            var ne = B[Qe].length;
-            Qe < Rt && (yt += ar / ne, Mt++);
-          }
-        }
-      }
-    }
-    return Mt = Math.max(1, Mt), yt = yt / Mt, Mt === 0 && (yt = 0), ze[ht.id()] = yt, yt;
-  }, $e = function(ht, Rt) {
-    var Lt = We(ht), yt = We(Rt), Mt = Lt - yt;
-    return Mt === 0 ? $G(ht.id(), Rt.id()) : Mt;
-  };
-  r.depthSort !== void 0 && ($e = r.depthSort);
-  for (var Ge = 0; Ge < B.length; Ge++)
-    B[Ge].sort($e), ee(Ge);
-  for (var me = [], Ve = 0; Ve < Q.length; Ve++)
-    me.push(Q[Ve]);
-  B.unshift(me), Z();
-  for (var Ke = 0, at = 0; at < B.length; at++)
-    Ke = Math.max(B[at].length, Ke);
-  var ft = {
-    x: k.x1 + k.w / 2,
-    y: k.x1 + k.h / 2
-  }, en = B.reduce(function(mt, ht) {
-    return Math.max(mt, ht.length);
-  }, 0), gn = function(ht) {
-    var Rt = Eb(ht), Lt = Rt.depth, yt = Rt.index, Mt = B[Lt].length, In = Math.max(k.w / ((r.grid ? en : Mt) + 1), de), Pn = Math.max(k.h / (B.length + 1), de), Vt = Math.min(k.w / 2 / B.length, k.h / 2 / B.length);
-    if (Vt = Math.max(Vt, de), r.circle) {
-      var Qe = Vt * Lt + Vt - (B.length > 0 && B[0].length <= 3 ? Vt / 2 : 0), ne = 2 * Math.PI / B[Lt].length * yt;
-      return Lt === 0 && B[0].length === 1 && (Qe = 1), {
-        x: ft.x + Qe * Math.cos(ne),
-        y: ft.y + Qe * Math.sin(ne)
-      };
-    } else {
-      var ar = {
-        x: ft.x + (yt + 1 - (Mt + 1) / 2) * In,
-        y: (Lt + 1) * Pn
-      };
-      return ar;
-    }
-  };
-  return c.nodes().layoutPositions(this, r, gn), this;
-};
-var Ece = {
-  fit: !0,
-  // whether to fit the viewport to the graph
-  padding: 30,
-  // the padding on fit
-  boundingBox: void 0,
-  // constrain layout bounds; { x1, y1, x2, y2 } or { x1, y1, w, h }
-  avoidOverlap: !0,
-  // prevents node overlap, may overflow boundingBox and radius if not enough space
-  nodeDimensionsIncludeLabels: !1,
-  // Excludes the label when calculating node bounding boxes for the layout algorithm
-  spacingFactor: void 0,
-  // Applies a multiplicative factor (>0) to expand or compress the overall area that the nodes take up
-  radius: void 0,
-  // the radius of the circle
-  startAngle: 3 / 2 * Math.PI,
-  // where nodes start in radians
-  sweep: void 0,
-  // how many radians should be between the first and last node (defaults to full circle)
-  clockwise: !0,
-  // whether the layout should go clockwise (true) or counterclockwise/anticlockwise (false)
-  sort: void 0,
-  // a sorting function to order the nodes; e.g. function(a, b){ return a.data('weight') - b.data('weight') }
-  animate: !1,
-  // whether to transition the node positions
-  animationDuration: 500,
-  // duration of animation in ms if enabled
-  animationEasing: void 0,
-  // easing of animation if enabled
-  animateFilter: function(r, u) {
-    return !0;
-  },
-  // a function that determines whether the node should be animated.  All nodes animated by default on animate enabled.  Non-animated nodes are positioned immediately when the layout starts
-  ready: void 0,
-  // callback on layoutready
-  stop: void 0,
-  // callback on layoutstop
-  transform: function(r, u) {
-    return u;
-  }
-  // transform a given node position. Useful for changing flow direction in discrete layouts 
-};
-function A$(a) {
-  this.options = on({}, Ece, a);
-}
-A$.prototype.run = function() {
-  var a = this.options, r = a, u = a.cy, c = r.eles, d = r.counterclockwise !== void 0 ? !r.counterclockwise : r.clockwise, g = c.nodes().not(":parent");
-  r.sort && (g = g.sort(r.sort));
-  for (var b = Ms(r.boundingBox ? r.boundingBox : {
-    x1: 0,
-    y1: 0,
-    w: u.width(),
-    h: u.height()
-  }), y = {
-    x: b.x1 + b.w / 2,
-    y: b.y1 + b.h / 2
-  }, k = r.sweep === void 0 ? 2 * Math.PI - 2 * Math.PI / g.length : r.sweep, E = k / Math.max(1, g.length - 1), C, T = 0, P = 0; P < g.length; P++) {
-    var N = g[P], D = N.layoutDimensions(r), H = D.w, _ = D.h;
-    T = Math.max(T, H, _);
-  }
-  if (kt(r.radius) ? C = r.radius : g.length <= 1 ? C = 0 : C = Math.min(b.h, b.w) / 2 - T, g.length > 1 && r.avoidOverlap) {
-    T *= 1.75;
-    var B = Math.cos(E) - Math.cos(0), $ = Math.sin(E) - Math.sin(0), F = Math.sqrt(T * T / (B * B + $ * $));
-    C = Math.max(F, C);
-  }
-  var W = function(X, K) {
-    var ee = r.startAngle + K * E * (d ? 1 : -1), Z = C * Math.cos(ee), ae = C * Math.sin(ee), oe = {
-      x: y.x + Z,
-      y: y.y + ae
-    };
-    return oe;
-  };
-  return c.nodes().layoutPositions(this, r, W), this;
-};
-var Sce = {
-  fit: !0,
-  // whether to fit the viewport to the graph
-  padding: 30,
-  // the padding on fit
-  startAngle: 3 / 2 * Math.PI,
-  // where nodes start in radians
-  sweep: void 0,
-  // how many radians should be between the first and last node (defaults to full circle)
-  clockwise: !0,
-  // whether the layout should go clockwise (true) or counterclockwise/anticlockwise (false)
-  equidistant: !1,
-  // whether levels have an equal radial distance betwen them, may cause bounding box overflow
-  minNodeSpacing: 10,
-  // min spacing between outside of nodes (used for radius adjustment)
-  boundingBox: void 0,
-  // constrain layout bounds; { x1, y1, x2, y2 } or { x1, y1, w, h }
-  avoidOverlap: !0,
-  // prevents node overlap, may overflow boundingBox if not enough space
-  nodeDimensionsIncludeLabels: !1,
-  // Excludes the label when calculating node bounding boxes for the layout algorithm
-  height: void 0,
-  // height of layout area (overrides container height)
-  width: void 0,
-  // width of layout area (overrides container width)
-  spacingFactor: void 0,
-  // Applies a multiplicative factor (>0) to expand or compress the overall area that the nodes take up
-  concentric: function(r) {
-    return r.degree();
-  },
-  levelWidth: function(r) {
-    return r.maxDegree() / 4;
-  },
-  animate: !1,
-  // whether to transition the node positions
-  animationDuration: 500,
-  // duration of animation in ms if enabled
-  animationEasing: void 0,
-  // easing of animation if enabled
-  animateFilter: function(r, u) {
-    return !0;
-  },
-  // a function that determines whether the node should be animated.  All nodes animated by default on animate enabled.  Non-animated nodes are positioned immediately when the layout starts
-  ready: void 0,
-  // callback on layoutready
-  stop: void 0,
-  // callback on layoutstop
-  transform: function(r, u) {
-    return u;
-  }
-  // transform a given node position. Useful for changing flow direction in discrete layouts
-};
-function R$(a) {
-  this.options = on({}, Sce, a);
-}
-R$.prototype.run = function() {
-  for (var a = this.options, r = a, u = r.counterclockwise !== void 0 ? !r.counterclockwise : r.clockwise, c = a.cy, d = r.eles, g = d.nodes().not(":parent"), b = Ms(r.boundingBox ? r.boundingBox : {
-    x1: 0,
-    y1: 0,
-    w: c.width(),
-    h: c.height()
-  }), y = {
-    x: b.x1 + b.w / 2,
-    y: b.y1 + b.h / 2
-  }, k = [], E = 0, C = 0; C < g.length; C++) {
-    var T = g[C], P = void 0;
-    P = r.concentric(T), k.push({
-      value: P,
-      node: T
-    }), T._private.scratch.concentric = P;
-  }
-  g.updateStyle();
-  for (var N = 0; N < g.length; N++) {
-    var D = g[N], H = D.layoutDimensions(r);
-    E = Math.max(E, H.w, H.h);
-  }
-  k.sort(function(mt, ht) {
-    return ht.value - mt.value;
-  });
-  for (var _ = r.levelWidth(g), B = [[]], $ = B[0], F = 0; F < k.length; F++) {
-    var W = k[F];
-    if ($.length > 0) {
-      var Q = Math.abs($[0].value - W.value);
-      Q >= _ && ($ = [], B.push($));
-    }
-    $.push(W);
-  }
-  var X = E + r.minNodeSpacing;
-  if (!r.avoidOverlap) {
-    var K = B.length > 0 && B[0].length > 1, ee = Math.min(b.w, b.h) / 2 - X, Z = ee / (B.length + K ? 1 : 0);
-    X = Math.min(X, Z);
-  }
-  for (var ae = 0, oe = 0; oe < B.length; oe++) {
-    var J = B[oe], fe = r.sweep === void 0 ? 2 * Math.PI - 2 * Math.PI / J.length : r.sweep, se = J.dTheta = fe / Math.max(1, J.length - 1);
-    if (J.length > 1 && r.avoidOverlap) {
-      var pe = Math.cos(se) - Math.cos(0), he = Math.sin(se) - Math.sin(0), de = Math.sqrt(X * X / (pe * pe + he * he));
-      ae = Math.max(de, ae);
-    }
-    J.r = ae, ae += X;
-  }
-  if (r.equidistant) {
-    for (var ke = 0, Pe = 0, Ae = 0; Ae < B.length; Ae++) {
-      var Te = B[Ae], Oe = Te.r - Pe;
-      ke = Math.max(ke, Oe);
-    }
-    Pe = 0;
-    for (var ze = 0; ze < B.length; ze++) {
-      var We = B[ze];
-      ze === 0 && (Pe = We.r), We.r = Pe, Pe += ke;
-    }
-  }
-  for (var $e = {}, Ge = 0; Ge < B.length; Ge++)
-    for (var me = B[Ge], Ve = me.dTheta, Ke = me.r, at = 0; at < me.length; at++) {
-      var ft = me[at], en = r.startAngle + (u ? 1 : -1) * Ve * at, gn = {
-        x: y.x + Ke * Math.cos(en),
-        y: y.y + Ke * Math.sin(en)
-      };
-      $e[ft.node.id()] = gn;
-    }
-  return d.nodes().layoutPositions(this, r, function(mt) {
-    var ht = mt.id();
-    return $e[ht];
-  }), this;
-};
-var i6, Cce = {
-  // Called on `layoutready`
-  ready: function() {
-  },
-  // Called on `layoutstop`
-  stop: function() {
-  },
-  // Whether to animate while running the layout
-  // true : Animate continuously as the layout is running
-  // false : Just show the end result
-  // 'end' : Animate with the end result, from the initial positions to the end positions
-  animate: !0,
-  // Easing of the animation for animate:'end'
-  animationEasing: void 0,
-  // The duration of the animation for animate:'end'
-  animationDuration: void 0,
-  // A function that determines whether the node should be animated
-  // All nodes animated by default on animate enabled
-  // Non-animated nodes are positioned immediately when the layout starts
-  animateFilter: function(r, u) {
-    return !0;
-  },
-  // The layout animates only after this many milliseconds for animate:true
-  // (prevents flashing on fast runs)
-  animationThreshold: 250,
-  // Number of iterations between consecutive screen positions update
-  refresh: 20,
-  // Whether to fit the network view after when done
-  fit: !0,
-  // Padding on fit
-  padding: 30,
-  // Constrain layout bounds; { x1, y1, x2, y2 } or { x1, y1, w, h }
-  boundingBox: void 0,
-  // Excludes the label when calculating node bounding boxes for the layout algorithm
-  nodeDimensionsIncludeLabels: !1,
-  // Randomize the initial positions of the nodes (true) or use existing positions (false)
-  randomize: !1,
-  // Extra spacing between components in non-compound graphs
-  componentSpacing: 40,
-  // Node repulsion (non overlapping) multiplier
-  nodeRepulsion: function(r) {
-    return 2048;
-  },
-  // Node repulsion (overlapping) multiplier
-  nodeOverlap: 4,
-  // Ideal edge (non nested) length
-  idealEdgeLength: function(r) {
-    return 32;
-  },
-  // Divisor to compute edge forces
-  edgeElasticity: function(r) {
-    return 32;
-  },
-  // Nesting factor (multiplier) to compute ideal edge length for nested edges
-  nestingFactor: 1.2,
-  // Gravity force (constant)
-  gravity: 1,
-  // Maximum number of iterations to perform
-  numIter: 1e3,
-  // Initial temperature (maximum node displacement)
-  initialTemp: 1e3,
-  // Cooling factor (how the temperature is reduced between consecutive iterations
-  coolingFactor: 0.99,
-  // Lower temperature threshold (below this point the layout will end)
-  minTemp: 1
-};
-function k5(a) {
-  this.options = on({}, Cce, a), this.options.layout = this;
-  var r = this.options.eles.nodes(), u = this.options.eles.edges(), c = u.filter(function(d) {
-    var g = d.source().data("id"), b = d.target().data("id"), y = r.some(function(E) {
-      return E.data("id") === g;
-    }), k = r.some(function(E) {
-      return E.data("id") === b;
-    });
-    return !y || !k;
-  });
-  this.options.eles = this.options.eles.not(c);
-}
-k5.prototype.run = function() {
-  var a = this.options, r = a.cy, u = this;
-  u.stopped = !1, (a.animate === !0 || a.animate === !1) && u.emit({
-    type: "layoutstart",
-    layout: u
-  }), a.debug === !0 ? i6 = !0 : i6 = !1;
-  var c = xce(r, u, a);
-  i6 && Pce(c), a.randomize && Dce(c);
-  var d = kf(), g = function() {
-    jce(c, r, a), a.fit === !0 && r.fit(a.padding);
-  }, b = function(P) {
-    return !(u.stopped || P >= a.numIter || (Nce(c, a), c.temperature = c.temperature * a.coolingFactor, c.temperature < a.minTemp));
-  }, y = function() {
-    if (a.animate === !0 || a.animate === !1)
-      g(), u.one("layoutstop", a.stop), u.emit({
-        type: "layoutstop",
-        layout: u
-      });
-    else {
-      var P = a.eles.nodes(), N = B$(c, a, P);
-      P.layoutPositions(u, a, N);
-    }
-  }, k = 0, E = !0;
-  if (a.animate === !0) {
-    var C = function T() {
-      for (var P = 0; E && P < a.refresh; )
-        E = b(k), k++, P++;
-      if (!E)
-        fG(c, a), y();
-      else {
-        var N = kf();
-        N - d >= a.animationThreshold && g(), XE(T);
-      }
-    };
-    C();
-  } else {
-    for (; E; )
-      E = b(k), k++;
-    fG(c, a), y();
-  }
-  return this;
-};
-k5.prototype.stop = function() {
-  return this.stopped = !0, this.thread && this.thread.stop(), this.emit("layoutstop"), this;
-};
-k5.prototype.destroy = function() {
-  return this.thread && this.thread.stop(), this;
-};
-var xce = function(r, u, c) {
-  for (var d = c.eles.edges(), g = c.eles.nodes(), b = Ms(c.boundingBox ? c.boundingBox : {
-    x1: 0,
-    y1: 0,
-    w: r.width(),
-    h: r.height()
-  }), y = {
-    isCompound: r.hasCompoundNodes(),
-    layoutNodes: [],
-    idToIndex: {},
-    nodeSize: g.size(),
-    graphSet: [],
-    indexToGraph: [],
-    layoutEdges: [],
-    edgeSize: d.size(),
-    temperature: c.initialTemp,
-    clientWidth: b.w,
-    clientHeight: b.h,
-    boundingBox: b
-  }, k = c.eles.components(), E = {}, C = 0; C < k.length; C++)
-    for (var T = k[C], P = 0; P < T.length; P++) {
-      var N = T[P];
-      E[N.id()] = C;
-    }
-  for (var C = 0; C < y.nodeSize; C++) {
-    var D = g[C], H = D.layoutDimensions(c), _ = {};
-    _.isLocked = D.locked(), _.id = D.data("id"), _.parentId = D.data("parent"), _.cmptId = E[D.id()], _.children = [], _.positionX = D.position("x"), _.positionY = D.position("y"), _.offsetX = 0, _.offsetY = 0, _.height = H.w, _.width = H.h, _.maxX = _.positionX + _.width / 2, _.minX = _.positionX - _.width / 2, _.maxY = _.positionY + _.height / 2, _.minY = _.positionY - _.height / 2, _.padLeft = parseFloat(D.style("padding")), _.padRight = parseFloat(D.style("padding")), _.padTop = parseFloat(D.style("padding")), _.padBottom = parseFloat(D.style("padding")), _.nodeRepulsion = zi(c.nodeRepulsion) ? c.nodeRepulsion(D) : c.nodeRepulsion, y.layoutNodes.push(_), y.idToIndex[_.id] = C;
-  }
-  for (var B = [], $ = 0, F = -1, W = [], C = 0; C < y.nodeSize; C++) {
-    var D = y.layoutNodes[C], Q = D.parentId;
-    Q != null ? y.layoutNodes[y.idToIndex[Q]].children.push(D.id) : (B[++F] = D.id, W.push(D.id));
-  }
-  for (y.graphSet.push(W); $ <= F; ) {
-    var X = B[$++], K = y.idToIndex[X], N = y.layoutNodes[K], ee = N.children;
-    if (ee.length > 0) {
-      y.graphSet.push(ee);
-      for (var C = 0; C < ee.length; C++)
-        B[++F] = ee[C];
-    }
-  }
-  for (var C = 0; C < y.graphSet.length; C++)
-    for (var Z = y.graphSet[C], P = 0; P < Z.length; P++) {
-      var ae = y.idToIndex[Z[P]];
-      y.indexToGraph[ae] = C;
-    }
-  for (var C = 0; C < y.edgeSize; C++) {
-    var oe = d[C], J = {};
-    J.id = oe.data("id"), J.sourceId = oe.data("source"), J.targetId = oe.data("target");
-    var fe = zi(c.idealEdgeLength) ? c.idealEdgeLength(oe) : c.idealEdgeLength, se = zi(c.edgeElasticity) ? c.edgeElasticity(oe) : c.edgeElasticity, pe = y.idToIndex[J.sourceId], he = y.idToIndex[J.targetId], de = y.indexToGraph[pe], ke = y.indexToGraph[he];
-    if (de != ke) {
-      for (var Pe = Tce(J.sourceId, J.targetId, y), Ae = y.graphSet[Pe], Te = 0, _ = y.layoutNodes[pe]; Ae.indexOf(_.id) === -1; )
-        _ = y.layoutNodes[y.idToIndex[_.parentId]], Te++;
-      for (_ = y.layoutNodes[he]; Ae.indexOf(_.id) === -1; )
-        _ = y.layoutNodes[y.idToIndex[_.parentId]], Te++;
-      fe *= Te * c.nestingFactor;
-    }
-    J.idealLength = fe, J.elasticity = se, y.layoutEdges.push(J);
-  }
-  return y;
-}, Tce = function(r, u, c) {
-  var d = Lce(r, u, 0, c);
-  return 2 > d.count ? 0 : d.graph;
-}, Lce = function a(r, u, c, d) {
-  var g = d.graphSet[c];
-  if (-1 < g.indexOf(r) && -1 < g.indexOf(u))
-    return {
-      count: 2,
-      graph: c
-    };
-  for (var b = 0, y = 0; y < g.length; y++) {
-    var k = g[y], E = d.idToIndex[k], C = d.layoutNodes[E].children;
-    if (C.length !== 0) {
-      var T = d.indexToGraph[d.idToIndex[C[0]]], P = a(r, u, T, d);
-      if (P.count !== 0)
-        if (P.count === 1) {
-          if (b++, b === 2)
-            break;
-        } else
-          return P;
-    }
-  }
-  return {
-    count: b,
-    graph: c
-  };
-}, Pce, Dce = function(r, u) {
-  for (var c = r.clientWidth, d = r.clientHeight, g = 0; g < r.nodeSize; g++) {
-    var b = r.layoutNodes[g];
-    b.children.length === 0 && !b.isLocked && (b.positionX = Math.random() * c, b.positionY = Math.random() * d);
-  }
-}, B$ = function(r, u, c) {
-  var d = r.boundingBox, g = {
-    x1: 1 / 0,
-    x2: -1 / 0,
-    y1: 1 / 0,
-    y2: -1 / 0
-  };
-  return u.boundingBox && (c.forEach(function(b) {
-    var y = r.layoutNodes[r.idToIndex[b.data("id")]];
-    g.x1 = Math.min(g.x1, y.positionX), g.x2 = Math.max(g.x2, y.positionX), g.y1 = Math.min(g.y1, y.positionY), g.y2 = Math.max(g.y2, y.positionY);
-  }), g.w = g.x2 - g.x1, g.h = g.y2 - g.y1), function(b, y) {
-    var k = r.layoutNodes[r.idToIndex[b.data("id")]];
-    if (u.boundingBox) {
-      var E = (k.positionX - g.x1) / g.w, C = (k.positionY - g.y1) / g.h;
-      return {
-        x: d.x1 + E * d.w,
-        y: d.y1 + C * d.h
-      };
-    } else
-      return {
-        x: k.positionX,
-        y: k.positionY
-      };
-  };
-}, jce = function(r, u, c) {
-  var d = c.layout, g = c.eles.nodes(), b = B$(r, c, g);
-  g.positions(b), r.ready !== !0 && (r.ready = !0, d.one("layoutready", c.ready), d.emit({
-    type: "layoutready",
-    layout: this
-  }));
-}, Nce = function(r, u, c) {
-  Ice(r, u), Ace(r), Rce(r, u), Bce(r), zce(r);
-}, Ice = function(r, u) {
-  for (var c = 0; c < r.graphSet.length; c++)
-    for (var d = r.graphSet[c], g = d.length, b = 0; b < g; b++)
-      for (var y = r.layoutNodes[r.idToIndex[d[b]]], k = b + 1; k < g; k++) {
-        var E = r.layoutNodes[r.idToIndex[d[k]]];
-        Mce(y, E, r, u);
-      }
-}, lG = function(r) {
-  return -r + 2 * r * Math.random();
-}, Mce = function(r, u, c, d) {
-  var g = r.cmptId, b = u.cmptId;
-  if (!(g !== b && !c.isCompound)) {
-    var y = u.positionX - r.positionX, k = u.positionY - r.positionY, E = 1;
-    y === 0 && k === 0 && (y = lG(E), k = lG(E));
-    var C = Oce(r, u, y, k);
-    if (C > 0)
-      var T = d.nodeOverlap * C, P = Math.sqrt(y * y + k * k), N = T * y / P, D = T * k / P;
-    else
-      var H = n5(r, y, k), _ = n5(u, -1 * y, -1 * k), B = _.x - H.x, $ = _.y - H.y, F = B * B + $ * $, P = Math.sqrt(F), T = (r.nodeRepulsion + u.nodeRepulsion) / F, N = T * B / P, D = T * $ / P;
-    r.isLocked || (r.offsetX -= N, r.offsetY -= D), u.isLocked || (u.offsetX += N, u.offsetY += D);
-  }
-}, Oce = function(r, u, c, d) {
-  if (c > 0)
-    var g = r.maxX - u.minX;
-  else
-    var g = u.maxX - r.minX;
-  if (d > 0)
-    var b = r.maxY - u.minY;
-  else
-    var b = u.maxY - r.minY;
-  return g >= 0 && b >= 0 ? Math.sqrt(g * g + b * b) : 0;
-}, n5 = function(r, u, c) {
-  var d = r.positionX, g = r.positionY, b = r.height || 1, y = r.width || 1, k = c / u, E = b / y, C = {};
-  return u === 0 && 0 < c || u === 0 && 0 > c ? (C.x = d, C.y = g + b / 2, C) : 0 < u && -1 * E <= k && k <= E ? (C.x = d + y / 2, C.y = g + y * c / 2 / u, C) : 0 > u && -1 * E <= k && k <= E ? (C.x = d - y / 2, C.y = g - y * c / 2 / u, C) : 0 < c && (k <= -1 * E || k >= E) ? (C.x = d + b * u / 2 / c, C.y = g + b / 2, C) : (0 > c && (k <= -1 * E || k >= E) && (C.x = d - b * u / 2 / c, C.y = g - b / 2), C);
-}, Ace = function(r, u) {
-  for (var c = 0; c < r.edgeSize; c++) {
-    var d = r.layoutEdges[c], g = r.idToIndex[d.sourceId], b = r.layoutNodes[g], y = r.idToIndex[d.targetId], k = r.layoutNodes[y], E = k.positionX - b.positionX, C = k.positionY - b.positionY;
-    if (!(E === 0 && C === 0)) {
-      var T = n5(b, E, C), P = n5(k, -1 * E, -1 * C), N = P.x - T.x, D = P.y - T.y, H = Math.sqrt(N * N + D * D), _ = Math.pow(d.idealLength - H, 2) / d.elasticity;
-      if (H !== 0)
-        var B = _ * N / H, $ = _ * D / H;
-      else
-        var B = 0, $ = 0;
-      b.isLocked || (b.offsetX += B, b.offsetY += $), k.isLocked || (k.offsetX -= B, k.offsetY -= $);
-    }
-  }
-}, Rce = function(r, u) {
-  if (u.gravity !== 0)
-    for (var c = 1, d = 0; d < r.graphSet.length; d++) {
-      var g = r.graphSet[d], b = g.length;
-      if (d === 0)
-        var y = r.clientHeight / 2, k = r.clientWidth / 2;
-      else
-        var E = r.layoutNodes[r.idToIndex[g[0]]], C = r.layoutNodes[r.idToIndex[E.parentId]], y = C.positionX, k = C.positionY;
-      for (var T = 0; T < b; T++) {
-        var P = r.layoutNodes[r.idToIndex[g[T]]];
-        if (!P.isLocked) {
-          var N = y - P.positionX, D = k - P.positionY, H = Math.sqrt(N * N + D * D);
-          if (H > c) {
-            var _ = u.gravity * N / H, B = u.gravity * D / H;
-            P.offsetX += _, P.offsetY += B;
-          }
-        }
-      }
-    }
-}, Bce = function(r, u) {
-  var c = [], d = 0, g = -1;
-  for (c.push.apply(c, r.graphSet[0]), g += r.graphSet[0].length; d <= g; ) {
-    var b = c[d++], y = r.idToIndex[b], k = r.layoutNodes[y], E = k.children;
-    if (0 < E.length && !k.isLocked) {
-      for (var C = k.offsetX, T = k.offsetY, P = 0; P < E.length; P++) {
-        var N = r.layoutNodes[r.idToIndex[E[P]]];
-        N.offsetX += C, N.offsetY += T, c[++g] = E[P];
-      }
-      k.offsetX = 0, k.offsetY = 0;
-    }
-  }
-}, zce = function(r, u) {
-  for (var c = 0; c < r.nodeSize; c++) {
-    var d = r.layoutNodes[c];
-    0 < d.children.length && (d.maxX = void 0, d.minX = void 0, d.maxY = void 0, d.minY = void 0);
-  }
-  for (var c = 0; c < r.nodeSize; c++) {
-    var d = r.layoutNodes[c];
-    if (!(0 < d.children.length || d.isLocked)) {
-      var g = Hce(d.offsetX, d.offsetY, r.temperature);
-      d.positionX += g.x, d.positionY += g.y, d.offsetX = 0, d.offsetY = 0, d.minX = d.positionX - d.width, d.maxX = d.positionX + d.width, d.minY = d.positionY - d.height, d.maxY = d.positionY + d.height, _ce(d, r);
-    }
-  }
-  for (var c = 0; c < r.nodeSize; c++) {
-    var d = r.layoutNodes[c];
-    0 < d.children.length && !d.isLocked && (d.positionX = (d.maxX + d.minX) / 2, d.positionY = (d.maxY + d.minY) / 2, d.width = d.maxX - d.minX, d.height = d.maxY - d.minY);
-  }
-}, Hce = function(r, u, c) {
-  var d = Math.sqrt(r * r + u * u);
-  if (d > c)
-    var g = {
-      x: c * r / d,
-      y: c * u / d
-    };
-  else
-    var g = {
-      x: r,
-      y: u
-    };
-  return g;
-}, _ce = function a(r, u) {
-  var c = r.parentId;
-  if (c != null) {
-    var d = u.layoutNodes[u.idToIndex[c]], g = !1;
-    if ((d.maxX == null || r.maxX + d.padRight > d.maxX) && (d.maxX = r.maxX + d.padRight, g = !0), (d.minX == null || r.minX - d.padLeft < d.minX) && (d.minX = r.minX - d.padLeft, g = !0), (d.maxY == null || r.maxY + d.padBottom > d.maxY) && (d.maxY = r.maxY + d.padBottom, g = !0), (d.minY == null || r.minY - d.padTop < d.minY) && (d.minY = r.minY - d.padTop, g = !0), g)
-      return a(d, u);
-  }
-}, fG = function(r, u) {
-  for (var c = r.layoutNodes, d = [], g = 0; g < c.length; g++) {
-    var b = c[g], y = b.cmptId, k = d[y] = d[y] || [];
-    k.push(b);
-  }
-  for (var E = 0, g = 0; g < d.length; g++) {
-    var C = d[g];
-    if (C) {
-      C.x1 = 1 / 0, C.x2 = -1 / 0, C.y1 = 1 / 0, C.y2 = -1 / 0;
-      for (var T = 0; T < C.length; T++) {
-        var P = C[T];
-        C.x1 = Math.min(C.x1, P.positionX - P.width / 2), C.x2 = Math.max(C.x2, P.positionX + P.width / 2), C.y1 = Math.min(C.y1, P.positionY - P.height / 2), C.y2 = Math.max(C.y2, P.positionY + P.height / 2);
-      }
-      C.w = C.x2 - C.x1, C.h = C.y2 - C.y1, E += C.w * C.h;
-    }
-  }
-  d.sort(function($, F) {
-    return F.w * F.h - $.w * $.h;
-  });
-  for (var N = 0, D = 0, H = 0, _ = 0, B = Math.sqrt(E) * r.clientWidth / r.clientHeight, g = 0; g < d.length; g++) {
-    var C = d[g];
-    if (C) {
-      for (var T = 0; T < C.length; T++) {
-        var P = C[T];
-        P.isLocked || (P.positionX += N - C.x1, P.positionY += D - C.y1);
-      }
-      N += C.w + u.componentSpacing, H += C.w + u.componentSpacing, _ = Math.max(_, C.h), H > B && (D += _ + u.componentSpacing, N = 0, H = 0, _ = 0);
-    }
-  }
-}, Gce = {
-  fit: !0,
-  // whether to fit the viewport to the graph
-  padding: 30,
-  // padding used on fit
-  boundingBox: void 0,
-  // constrain layout bounds; { x1, y1, x2, y2 } or { x1, y1, w, h }
-  avoidOverlap: !0,
-  // prevents node overlap, may overflow boundingBox if not enough space
-  avoidOverlapPadding: 10,
-  // extra spacing around nodes when avoidOverlap: true
-  nodeDimensionsIncludeLabels: !1,
-  // Excludes the label when calculating node bounding boxes for the layout algorithm
-  spacingFactor: void 0,
-  // Applies a multiplicative factor (>0) to expand or compress the overall area that the nodes take up
-  condense: !1,
-  // uses all available space on false, uses minimal space on true
-  rows: void 0,
-  // force num of rows in the grid
-  cols: void 0,
-  // force num of columns in the grid
-  position: function(r) {
-  },
-  // returns { row, col } for element
-  sort: void 0,
-  // a sorting function to order the nodes; e.g. function(a, b){ return a.data('weight') - b.data('weight') }
-  animate: !1,
-  // whether to transition the node positions
-  animationDuration: 500,
-  // duration of animation in ms if enabled
-  animationEasing: void 0,
-  // easing of animation if enabled
-  animateFilter: function(r, u) {
-    return !0;
-  },
-  // a function that determines whether the node should be animated.  All nodes animated by default on animate enabled.  Non-animated nodes are positioned immediately when the layout starts
-  ready: void 0,
-  // callback on layoutready
-  stop: void 0,
-  // callback on layoutstop
-  transform: function(r, u) {
-    return u;
-  }
-  // transform a given node position. Useful for changing flow direction in discrete layouts 
-};
-function z$(a) {
-  this.options = on({}, Gce, a);
-}
-z$.prototype.run = function() {
-  var a = this.options, r = a, u = a.cy, c = r.eles, d = c.nodes().not(":parent");
-  r.sort && (d = d.sort(r.sort));
-  var g = Ms(r.boundingBox ? r.boundingBox : {
-    x1: 0,
-    y1: 0,
-    w: u.width(),
-    h: u.height()
-  });
-  if (g.h === 0 || g.w === 0)
-    c.nodes().layoutPositions(this, r, function(ze) {
-      return {
-        x: g.x1,
-        y: g.y1
-      };
-    });
-  else {
-    var b = d.size(), y = Math.sqrt(b * g.h / g.w), k = Math.round(y), E = Math.round(g.w / g.h * y), C = function(We) {
-      if (We == null)
-        return Math.min(k, E);
-      var $e = Math.min(k, E);
-      $e == k ? k = We : E = We;
-    }, T = function(We) {
-      if (We == null)
-        return Math.max(k, E);
-      var $e = Math.max(k, E);
-      $e == k ? k = We : E = We;
-    }, P = r.rows, N = r.cols != null ? r.cols : r.columns;
-    if (P != null && N != null)
-      k = P, E = N;
-    else if (P != null && N == null)
-      k = P, E = Math.ceil(b / k);
-    else if (P == null && N != null)
-      E = N, k = Math.ceil(b / E);
-    else if (E * k > b) {
-      var D = C(), H = T();
-      (D - 1) * H >= b ? C(D - 1) : (H - 1) * D >= b && T(H - 1);
-    } else
-      for (; E * k < b; ) {
-        var _ = C(), B = T();
-        (B + 1) * _ >= b ? T(B + 1) : C(_ + 1);
-      }
-    var $ = g.w / E, F = g.h / k;
-    if (r.condense && ($ = 0, F = 0), r.avoidOverlap)
-      for (var W = 0; W < d.length; W++) {
-        var Q = d[W], X = Q._private.position;
-        (X.x == null || X.y == null) && (X.x = 0, X.y = 0);
-        var K = Q.layoutDimensions(r), ee = r.avoidOverlapPadding, Z = K.w + ee, ae = K.h + ee;
-        $ = Math.max($, Z), F = Math.max(F, ae);
-      }
-    for (var oe = {}, J = function(We, $e) {
-      return !!oe["c-" + We + "-" + $e];
-    }, fe = function(We, $e) {
-      oe["c-" + We + "-" + $e] = !0;
-    }, se = 0, pe = 0, he = function() {
-      pe++, pe >= E && (pe = 0, se++);
-    }, de = {}, ke = 0; ke < d.length; ke++) {
-      var Pe = d[ke], Ae = r.position(Pe);
-      if (Ae && (Ae.row !== void 0 || Ae.col !== void 0)) {
-        var Te = {
-          row: Ae.row,
-          col: Ae.col
-        };
-        if (Te.col === void 0)
-          for (Te.col = 0; J(Te.row, Te.col); )
-            Te.col++;
-        else if (Te.row === void 0)
-          for (Te.row = 0; J(Te.row, Te.col); )
-            Te.row++;
-        de[Pe.id()] = Te, fe(Te.row, Te.col);
-      }
-    }
-    var Oe = function(We, $e) {
-      var Ge, me;
-      if (We.locked() || We.isParent())
-        return !1;
-      var Ve = de[We.id()];
-      if (Ve)
-        Ge = Ve.col * $ + $ / 2 + g.x1, me = Ve.row * F + F / 2 + g.y1;
-      else {
-        for (; J(se, pe); )
-          he();
-        Ge = pe * $ + $ / 2 + g.x1, me = se * F + F / 2 + g.y1, fe(se, pe), he();
-      }
-      return {
-        x: Ge,
-        y: me
-      };
-    };
-    d.layoutPositions(this, r, Oe);
-  }
-  return this;
-};
-var $ce = {
-  ready: function() {
-  },
-  // on layoutready
-  stop: function() {
-  }
-  // on layoutstop
-};
-function $6(a) {
-  this.options = on({}, $ce, a);
-}
-$6.prototype.run = function() {
-  var a = this.options, r = a.eles, u = this;
-  return a.cy, u.emit("layoutstart"), r.nodes().positions(function() {
-    return {
-      x: 0,
-      y: 0
-    };
-  }), u.one("layoutready", a.ready), u.emit("layoutready"), u.one("layoutstop", a.stop), u.emit("layoutstop"), this;
-};
-$6.prototype.stop = function() {
-  return this;
-};
-var Yce = {
-  positions: void 0,
-  // map of (node id) => (position obj); or function(node){ return somPos; }
-  zoom: void 0,
-  // the zoom level to set (prob want fit = false if set)
-  pan: void 0,
-  // the pan level to set (prob want fit = false if set)
-  fit: !0,
-  // whether to fit to viewport
-  padding: 30,
-  // padding on fit
-  spacingFactor: void 0,
-  // Applies a multiplicative factor (>0) to expand or compress the overall area that the nodes take up
-  animate: !1,
-  // whether to transition the node positions
-  animationDuration: 500,
-  // duration of animation in ms if enabled
-  animationEasing: void 0,
-  // easing of animation if enabled
-  animateFilter: function(r, u) {
-    return !0;
-  },
-  // a function that determines whether the node should be animated.  All nodes animated by default on animate enabled.  Non-animated nodes are positioned immediately when the layout starts
-  ready: void 0,
-  // callback on layoutready
-  stop: void 0,
-  // callback on layoutstop
-  transform: function(r, u) {
-    return u;
-  }
-  // transform a given node position. Useful for changing flow direction in discrete layouts
-};
-function H$(a) {
-  this.options = on({}, Yce, a);
-}
-H$.prototype.run = function() {
-  var a = this.options, r = a.eles, u = r.nodes(), c = zi(a.positions);
-  function d(g) {
-    if (a.positions == null)
-      return tse(g.position());
-    if (c)
-      return a.positions(g);
-    var b = a.positions[g._private.data.id];
-    return b ?? null;
-  }
-  return u.layoutPositions(this, a, function(g, b) {
-    var y = d(g);
-    return g.locked() || y == null ? !1 : y;
-  }), this;
-};
-var Fce = {
-  fit: !0,
-  // whether to fit to viewport
-  padding: 30,
-  // fit padding
-  boundingBox: void 0,
-  // constrain layout bounds; { x1, y1, x2, y2 } or { x1, y1, w, h }
-  animate: !1,
-  // whether to transition the node positions
-  animationDuration: 500,
-  // duration of animation in ms if enabled
-  animationEasing: void 0,
-  // easing of animation if enabled
-  animateFilter: function(r, u) {
-    return !0;
-  },
-  // a function that determines whether the node should be animated.  All nodes animated by default on animate enabled.  Non-animated nodes are positioned immediately when the layout starts
-  ready: void 0,
-  // callback on layoutready
-  stop: void 0,
-  // callback on layoutstop
-  transform: function(r, u) {
-    return u;
-  }
-  // transform a given node position. Useful for changing flow direction in discrete layouts 
-};
-function _$(a) {
-  this.options = on({}, Fce, a);
-}
-_$.prototype.run = function() {
-  var a = this.options, r = a.cy, u = a.eles, c = Ms(a.boundingBox ? a.boundingBox : {
-    x1: 0,
-    y1: 0,
-    w: r.width(),
-    h: r.height()
-  }), d = function(b, y) {
-    return {
-      x: c.x1 + Math.round(Math.random() * c.w),
-      y: c.y1 + Math.round(Math.random() * c.h)
-    };
-  };
-  return u.nodes().layoutPositions(this, a, d), this;
-};
-var qce = [{
-  name: "breadthfirst",
-  impl: O$
-}, {
-  name: "circle",
-  impl: A$
-}, {
-  name: "concentric",
-  impl: R$
-}, {
-  name: "cose",
-  impl: k5
-}, {
-  name: "grid",
-  impl: z$
-}, {
-  name: "null",
-  impl: $6
-}, {
-  name: "preset",
-  impl: H$
-}, {
-  name: "random",
-  impl: _$
-}];
-function G$(a) {
-  this.options = a, this.notifications = 0;
-}
-var hG = function() {
-}, dG = function() {
-  throw new Error("A headless instance can not render images");
-};
-G$.prototype = {
-  recalculateRenderedStyle: hG,
-  notify: function() {
-    this.notifications++;
-  },
-  init: hG,
-  isHeadless: function() {
-    return !0;
-  },
-  png: dG,
-  jpg: dG
-};
-var Y6 = {};
-Y6.arrowShapeWidth = 0.3;
-Y6.registerArrowShapes = function() {
-  var a = this.arrowShapes = {}, r = this, u = function(E, C, T, P, N, D, H) {
-    var _ = N.x - T / 2 - H, B = N.x + T / 2 + H, $ = N.y - T / 2 - H, F = N.y + T / 2 + H, W = _ <= E && E <= B && $ <= C && C <= F;
-    return W;
-  }, c = function(E, C, T, P, N) {
-    var D = E * Math.cos(P) - C * Math.sin(P), H = E * Math.sin(P) + C * Math.cos(P), _ = D * T, B = H * T, $ = _ + N.x, F = B + N.y;
-    return {
-      x: $,
-      y: F
-    };
-  }, d = function(E, C, T, P) {
-    for (var N = [], D = 0; D < E.length; D += 2) {
-      var H = E[D], _ = E[D + 1];
-      N.push(c(H, _, C, T, P));
-    }
-    return N;
-  }, g = function(E) {
-    for (var C = [], T = 0; T < E.length; T++) {
-      var P = E[T];
-      C.push(P.x, P.y);
-    }
-    return C;
-  }, b = function(E) {
-    return E.pstyle("width").pfValue * E.pstyle("arrow-scale").pfValue * 2;
-  }, y = function(E, C) {
-    qt(C) && (C = a[C]), a[E] = on({
-      name: E,
-      points: [-0.15, -0.3, 0.15, -0.3, 0.15, 0.3, -0.15, 0.3],
-      collide: function(P, N, D, H, _, B) {
-        var $ = g(d(this.points, D + 2 * B, H, _)), F = Is(P, N, $);
-        return F;
-      },
-      roughCollide: u,
-      draw: function(P, N, D, H) {
-        var _ = d(this.points, N, D, H);
-        r.arrowShapeImpl("polygon")(P, _);
-      },
-      spacing: function(P) {
-        return 0;
-      },
-      gap: b
-    }, C);
-  };
-  y("none", {
-    collide: QE,
-    roughCollide: QE,
-    draw: N6,
-    spacing: P_,
-    gap: P_
-  }), y("triangle", {
-    points: [-0.15, -0.3, 0, 0, 0.15, -0.3]
-  }), y("arrow", "triangle"), y("triangle-backcurve", {
-    points: a.triangle.points,
-    controlPoint: [0, -0.15],
-    roughCollide: u,
-    draw: function(E, C, T, P, N) {
-      var D = d(this.points, C, T, P), H = this.controlPoint, _ = c(H[0], H[1], C, T, P);
-      r.arrowShapeImpl(this.name)(E, D, _);
-    },
-    gap: function(E) {
-      return b(E) * 0.8;
-    }
-  }), y("triangle-tee", {
-    points: [0, 0, 0.15, -0.3, -0.15, -0.3, 0, 0],
-    pointsTee: [-0.15, -0.4, -0.15, -0.5, 0.15, -0.5, 0.15, -0.4],
-    collide: function(E, C, T, P, N, D, H) {
-      var _ = g(d(this.points, T + 2 * H, P, N)), B = g(d(this.pointsTee, T + 2 * H, P, N)), $ = Is(E, C, _) || Is(E, C, B);
-      return $;
-    },
-    draw: function(E, C, T, P, N) {
-      var D = d(this.points, C, T, P), H = d(this.pointsTee, C, T, P);
-      r.arrowShapeImpl(this.name)(E, D, H);
-    }
-  }), y("circle-triangle", {
-    radius: 0.15,
-    pointsTr: [0, -0.15, 0.15, -0.45, -0.15, -0.45, 0, -0.15],
-    collide: function(E, C, T, P, N, D, H) {
-      var _ = N, B = Math.pow(_.x - E, 2) + Math.pow(_.y - C, 2) <= Math.pow((T + 2 * H) * this.radius, 2), $ = g(d(this.points, T + 2 * H, P, N));
-      return Is(E, C, $) || B;
-    },
-    draw: function(E, C, T, P, N) {
-      var D = d(this.pointsTr, C, T, P);
-      r.arrowShapeImpl(this.name)(E, D, P.x, P.y, this.radius * C);
-    },
-    spacing: function(E) {
-      return r.getArrowWidth(E.pstyle("width").pfValue, E.pstyle("arrow-scale").value) * this.radius;
-    }
-  }), y("triangle-cross", {
-    points: [0, 0, 0.15, -0.3, -0.15, -0.3, 0, 0],
-    baseCrossLinePts: [
-      -0.15,
-      -0.4,
-      // first half of the rectangle
-      -0.15,
-      -0.4,
-      0.15,
-      -0.4,
-      // second half of the rectangle
-      0.15,
-      -0.4
-    ],
-    crossLinePts: function(E, C) {
-      var T = this.baseCrossLinePts.slice(), P = C / E, N = 3, D = 5;
-      return T[N] = T[N] - P, T[D] = T[D] - P, T;
-    },
-    collide: function(E, C, T, P, N, D, H) {
-      var _ = g(d(this.points, T + 2 * H, P, N)), B = g(d(this.crossLinePts(T, D), T + 2 * H, P, N)), $ = Is(E, C, _) || Is(E, C, B);
-      return $;
-    },
-    draw: function(E, C, T, P, N) {
-      var D = d(this.points, C, T, P), H = d(this.crossLinePts(C, N), C, T, P);
-      r.arrowShapeImpl(this.name)(E, D, H);
-    }
-  }), y("vee", {
-    points: [-0.15, -0.3, 0, 0, 0.15, -0.3, 0, -0.15],
-    gap: function(E) {
-      return b(E) * 0.525;
-    }
-  }), y("circle", {
-    radius: 0.15,
-    collide: function(E, C, T, P, N, D, H) {
-      var _ = N, B = Math.pow(_.x - E, 2) + Math.pow(_.y - C, 2) <= Math.pow((T + 2 * H) * this.radius, 2);
-      return B;
-    },
-    draw: function(E, C, T, P, N) {
-      r.arrowShapeImpl(this.name)(E, P.x, P.y, this.radius * C);
-    },
-    spacing: function(E) {
-      return r.getArrowWidth(E.pstyle("width").pfValue, E.pstyle("arrow-scale").value) * this.radius;
-    }
-  }), y("tee", {
-    points: [-0.15, 0, -0.15, -0.1, 0.15, -0.1, 0.15, 0],
-    spacing: function(E) {
-      return 1;
-    },
-    gap: function(E) {
-      return 1;
-    }
-  }), y("square", {
-    points: [-0.15, 0, 0.15, 0, 0.15, -0.3, -0.15, -0.3]
-  }), y("diamond", {
-    points: [-0.15, -0.15, 0, -0.3, 0.15, -0.15, 0, 0],
-    gap: function(E) {
-      return E.pstyle("width").pfValue * E.pstyle("arrow-scale").value;
-    }
-  }), y("chevron", {
-    points: [0, 0, -0.15, -0.15, -0.1, -0.2, 0, -0.1, 0.1, -0.2, 0.15, -0.15],
-    gap: function(E) {
-      return 0.95 * E.pstyle("width").pfValue * E.pstyle("arrow-scale").value;
-    }
-  });
-};
-var pv = {};
-pv.projectIntoViewport = function(a, r) {
-  var u = this.cy, c = this.findContainerClientCoords(), d = c[0], g = c[1], b = c[4], y = u.pan(), k = u.zoom(), E = ((a - d) / b - y.x) / k, C = ((r - g) / b - y.y) / k;
-  return [E, C];
-};
-pv.findContainerClientCoords = function() {
-  if (this.containerBB)
-    return this.containerBB;
-  var a = this.container, r = a.getBoundingClientRect(), u = this.cy.window().getComputedStyle(a), c = function(B) {
-    return parseFloat(u.getPropertyValue(B));
-  }, d = {
-    left: c("padding-left"),
-    right: c("padding-right"),
-    top: c("padding-top"),
-    bottom: c("padding-bottom")
-  }, g = {
-    left: c("border-left-width"),
-    right: c("border-right-width"),
-    top: c("border-top-width"),
-    bottom: c("border-bottom-width")
-  }, b = a.clientWidth, y = a.clientHeight, k = d.left + d.right, E = d.top + d.bottom, C = g.left + g.right, T = r.width / (b + C), P = b - k, N = y - E, D = r.left + d.left + g.left, H = r.top + d.top + g.top;
-  return this.containerBB = [D, H, P, N, T];
-};
-pv.invalidateContainerClientCoordsCache = function() {
-  this.containerBB = null;
-};
-pv.findNearestElement = function(a, r, u, c) {
-  return this.findNearestElements(a, r, u, c)[0];
-};
-pv.findNearestElements = function(a, r, u, c) {
-  var d = this, g = this, b = g.getCachedZSortedEles(), y = [], k = g.cy.zoom(), E = g.cy.hasCompoundNodes(), C = (c ? 24 : 8) / k, T = (c ? 8 : 2) / k, P = (c ? 8 : 2) / k, N = 1 / 0, D, H;
-  u && (b = b.interactive);
-  function _(K, ee) {
-    if (K.isNode()) {
-      if (H)
-        return;
-      H = K, y.push(K);
-    }
-    if (K.isEdge() && (ee == null || ee < N))
-      if (D) {
-        if (D.pstyle("z-compound-depth").value === K.pstyle("z-compound-depth").value && D.pstyle("z-compound-depth").value === K.pstyle("z-compound-depth").value) {
-          for (var Z = 0; Z < y.length; Z++)
-            if (y[Z].isEdge()) {
-              y[Z] = K, D = K, N = ee ?? N;
-              break;
-            }
-        }
-      } else
-        y.push(K), D = K, N = ee ?? N;
-  }
-  function B(K) {
-    var ee = K.outerWidth() + 2 * T, Z = K.outerHeight() + 2 * T, ae = ee / 2, oe = Z / 2, J = K.position();
-    if (J.x - ae <= a && a <= J.x + ae && J.y - oe <= r && r <= J.y + oe) {
-      var fe = g.nodeShapes[d.getNodeShape(K)];
-      if (fe.checkPoint(a, r, 0, ee, Z, J.x, J.y))
-        return _(K, 0), !0;
-    }
-  }
-  function $(K) {
-    var ee = K._private, Z = ee.rscratch, ae = K.pstyle("width").pfValue, oe = K.pstyle("arrow-scale").value, J = ae / 2 + C, fe = J * J, se = J * 2, ke = ee.source, Pe = ee.target, pe;
-    if (Z.edgeType === "segments" || Z.edgeType === "straight" || Z.edgeType === "haystack") {
-      for (var he = Z.allpts, de = 0; de + 3 < he.length; de += 2)
-        if (vse(a, r, he[de], he[de + 1], he[de + 2], he[de + 3], se) && fe > (pe = mse(a, r, he[de], he[de + 1], he[de + 2], he[de + 3])))
-          return _(K, pe), !0;
-    } else if (Z.edgeType === "bezier" || Z.edgeType === "multibezier" || Z.edgeType === "self" || Z.edgeType === "compound") {
-      for (var he = Z.allpts, de = 0; de + 5 < Z.allpts.length; de += 4)
-        if (gse(a, r, he[de], he[de + 1], he[de + 2], he[de + 3], he[de + 4], he[de + 5], se) && fe > (pe = wse(a, r, he[de], he[de + 1], he[de + 2], he[de + 3], he[de + 4], he[de + 5])))
-          return _(K, pe), !0;
-    }
-    for (var ke = ke || ee.source, Pe = Pe || ee.target, Ae = d.getArrowWidth(ae, oe), Te = [{
-      name: "source",
-      x: Z.arrowStartX,
-      y: Z.arrowStartY,
-      angle: Z.srcArrowAngle
-    }, {
-      name: "target",
-      x: Z.arrowEndX,
-      y: Z.arrowEndY,
-      angle: Z.tgtArrowAngle
-    }, {
-      name: "mid-source",
-      x: Z.midX,
-      y: Z.midY,
-      angle: Z.midsrcArrowAngle
-    }, {
-      name: "mid-target",
-      x: Z.midX,
-      y: Z.midY,
-      angle: Z.midtgtArrowAngle
-    }], de = 0; de < Te.length; de++) {
-      var Oe = Te[de], ze = g.arrowShapes[K.pstyle(Oe.name + "-arrow-shape").value], We = K.pstyle("width").pfValue;
-      if (ze.roughCollide(a, r, Ae, Oe.angle, {
-        x: Oe.x,
-        y: Oe.y
-      }, We, C) && ze.collide(a, r, Ae, Oe.angle, {
-        x: Oe.x,
-        y: Oe.y
-      }, We, C))
-        return _(K), !0;
-    }
-    E && y.length > 0 && (B(ke), B(Pe));
-  }
-  function F(K, ee, Z) {
-    return Sc(K, ee, Z);
-  }
-  function W(K, ee) {
-    var Z = K._private, ae = P, oe;
-    ee ? oe = ee + "-" : oe = "", K.boundingBox();
-    var J = Z.labelBounds[ee || "main"], fe = K.pstyle(oe + "label").value, se = K.pstyle("text-events").strValue === "yes";
-    if (!(!se || !fe)) {
-      var pe = F(Z.rscratch, "labelX", ee), he = F(Z.rscratch, "labelY", ee), de = F(Z.rscratch, "labelAngle", ee), ke = K.pstyle(oe + "text-margin-x").pfValue, Pe = K.pstyle(oe + "text-margin-y").pfValue, Ae = J.x1 - ae - ke, Te = J.x2 + ae - ke, Oe = J.y1 - ae - Pe, ze = J.y2 + ae - Pe;
-      if (de) {
-        var We = Math.cos(de), $e = Math.sin(de), Ge = function(gn, mt) {
-          return gn = gn - pe, mt = mt - he, {
-            x: gn * We - mt * $e + pe,
-            y: gn * $e + mt * We + he
-          };
-        }, me = Ge(Ae, Oe), Ve = Ge(Ae, ze), Ke = Ge(Te, Oe), at = Ge(Te, ze), ft = [
-          // with the margin added after the rotation is applied
-          me.x + ke,
-          me.y + Pe,
-          Ke.x + ke,
-          Ke.y + Pe,
-          at.x + ke,
-          at.y + Pe,
-          Ve.x + ke,
-          Ve.y + Pe
-        ];
-        if (Is(a, r, ft))
-          return _(K), !0;
-      } else if (Ib(J, a, r))
-        return _(K), !0;
-    }
-  }
-  for (var Q = b.length - 1; Q >= 0; Q--) {
-    var X = b[Q];
-    X.isNode() ? B(X) || W(X) : $(X) || W(X) || W(X, "source") || W(X, "target");
-  }
-  return y;
-};
-pv.getAllInBox = function(a, r, u, c) {
-  var d = this.getCachedZSortedEles().interactive, g = [], b = Math.min(a, u), y = Math.max(a, u), k = Math.min(r, c), E = Math.max(r, c);
-  a = b, u = y, r = k, c = E;
-  for (var C = Ms({
-    x1: a,
-    y1: r,
-    x2: u,
-    y2: c
-  }), T = 0; T < d.length; T++) {
-    var P = d[T];
-    if (P.isNode()) {
-      var N = P, D = N.boundingBox({
-        includeNodes: !0,
-        includeEdges: !1,
-        includeLabels: !1
-      });
-      O6(C, D) && !t$(D, C) && g.push(N);
-    } else {
-      var H = P, _ = H._private, B = _.rscratch;
-      if (B.startX != null && B.startY != null && !Ib(C, B.startX, B.startY) || B.endX != null && B.endY != null && !Ib(C, B.endX, B.endY))
-        continue;
-      if (B.edgeType === "bezier" || B.edgeType === "multibezier" || B.edgeType === "self" || B.edgeType === "compound" || B.edgeType === "segments" || B.edgeType === "haystack") {
-        for (var $ = _.rstyle.bezierPts || _.rstyle.linePts || _.rstyle.haystackPts, F = !0, W = 0; W < $.length; W++)
-          if (!dse(C, $[W])) {
-            F = !1;
-            break;
-          }
-        F && g.push(H);
-      } else
-        (B.edgeType === "haystack" || B.edgeType === "straight") && g.push(H);
-    }
-  }
-  return g;
-};
-var r5 = {};
-r5.calculateArrowAngles = function(a) {
-  var r = a._private.rscratch, u = r.edgeType === "haystack", c = r.edgeType === "bezier", d = r.edgeType === "multibezier", g = r.edgeType === "segments", b = r.edgeType === "compound", y = r.edgeType === "self", k, E, C, T, P, N, B, $;
-  if (u ? (C = r.haystackPts[0], T = r.haystackPts[1], P = r.haystackPts[2], N = r.haystackPts[3]) : (C = r.arrowStartX, T = r.arrowStartY, P = r.arrowEndX, N = r.arrowEndY), B = r.midX, $ = r.midY, g)
-    k = C - r.segpts[0], E = T - r.segpts[1];
-  else if (d || b || y || c) {
-    var D = r.allpts, H = Ja(D[0], D[2], D[4], 0.1), _ = Ja(D[1], D[3], D[5], 0.1);
-    k = C - H, E = T - _;
-  } else
-    k = C - B, E = T - $;
-  r.srcArrowAngle = IE(k, E);
-  var B = r.midX, $ = r.midY;
-  if (u && (B = (C + P) / 2, $ = (T + N) / 2), k = P - C, E = N - T, g) {
-    var D = r.allpts;
-    if (D.length / 2 % 2 === 0) {
-      var F = D.length / 2, W = F - 2;
-      k = D[F] - D[W], E = D[F + 1] - D[W + 1];
-    } else {
-      var F = D.length / 2 - 1, W = F - 2, Q = F + 2;
-      k = D[F] - D[W], E = D[F + 1] - D[W + 1];
-    }
-  } else if (d || b || y) {
-    var D = r.allpts, X = r.ctrlpts, K, ee, Z, ae;
-    if (X.length / 2 % 2 === 0) {
-      var oe = D.length / 2 - 1, J = oe + 2, fe = J + 2;
-      K = Ja(D[oe], D[J], D[fe], 0), ee = Ja(D[oe + 1], D[J + 1], D[fe + 1], 0), Z = Ja(D[oe], D[J], D[fe], 1e-4), ae = Ja(D[oe + 1], D[J + 1], D[fe + 1], 1e-4);
-    } else {
-      var J = D.length / 2 - 1, oe = J - 2, fe = J + 2;
-      K = Ja(D[oe], D[J], D[fe], 0.4999), ee = Ja(D[oe + 1], D[J + 1], D[fe + 1], 0.4999), Z = Ja(D[oe], D[J], D[fe], 0.5), ae = Ja(D[oe + 1], D[J + 1], D[fe + 1], 0.5);
-    }
-    k = Z - K, E = ae - ee;
-  }
-  if (r.midtgtArrowAngle = IE(k, E), r.midDispX = k, r.midDispY = E, k *= -1, E *= -1, g) {
-    var D = r.allpts;
-    if (D.length / 2 % 2 !== 0) {
-      var F = D.length / 2 - 1, Q = F + 2;
-      k = -(D[Q] - D[F]), E = -(D[Q + 1] - D[F + 1]);
-    }
-  }
-  if (r.midsrcArrowAngle = IE(k, E), g)
-    k = P - r.segpts[r.segpts.length - 2], E = N - r.segpts[r.segpts.length - 1];
-  else if (d || b || y || c) {
-    var D = r.allpts, se = D.length, H = Ja(D[se - 6], D[se - 4], D[se - 2], 0.9), _ = Ja(D[se - 5], D[se - 3], D[se - 1], 0.9);
-    k = P - H, E = N - _;
-  } else
-    k = P - B, E = N - $;
-  r.tgtArrowAngle = IE(k, E);
-};
-r5.getArrowWidth = r5.getArrowHeight = function(a, r) {
-  var u = this.arrowWidthCache = this.arrowWidthCache || {}, c = u[a + ", " + r];
-  return c || (c = Math.max(Math.pow(a * 13.37, 0.9), 29) * r, u[a + ", " + r] = c, c);
-};
-var Ro = {};
-Ro.findMidptPtsEtc = function(a, r) {
-  var u = r.posPts, c = r.intersectionPts, d = r.vectorNormInverse, g, b = a.pstyle("source-endpoint"), y = a.pstyle("target-endpoint"), k = b.units != null && y.units != null, E = function(Q, X, K, ee) {
-    var Z = ee - X, ae = K - Q, oe = Math.sqrt(ae * ae + Z * Z);
-    return {
-      x: -Z / oe,
-      y: ae / oe
-    };
-  }, C = a.pstyle("edge-distances").value;
-  switch (C) {
-    case "node-position":
-      g = u;
-      break;
-    case "intersection":
-      g = c;
-      break;
-    case "endpoints": {
-      if (k) {
-        var T = this.manualEndptToPx(a.source()[0], b), P = kc(T, 2), N = P[0], D = P[1], H = this.manualEndptToPx(a.target()[0], y), _ = kc(H, 2), B = _[0], $ = _[1], F = {
-          x1: N,
-          y1: D,
-          x2: B,
-          y2: $
-        };
-        d = E(N, D, B, $), g = F;
-      } else
-        Sr("Edge ".concat(a.id(), " has edge-distances:endpoints specified without manual endpoints specified via source-endpoint and target-endpoint.  Falling back on edge-distances:intersection (default).")), g = c;
-      break;
-    }
-  }
-  return {
-    midptPts: g,
-    vectorNormInverse: d
-  };
-};
-Ro.findHaystackPoints = function(a) {
-  for (var r = 0; r < a.length; r++) {
-    var u = a[r], c = u._private, d = c.rscratch;
-    if (!d.haystack) {
-      var g = Math.random() * 2 * Math.PI;
-      d.source = {
-        x: Math.cos(g),
-        y: Math.sin(g)
-      }, g = Math.random() * 2 * Math.PI, d.target = {
-        x: Math.cos(g),
-        y: Math.sin(g)
-      };
-    }
-    var b = c.source, y = c.target, k = b.position(), E = y.position(), C = b.width(), T = y.width(), P = b.height(), N = y.height(), D = u.pstyle("haystack-radius").value, H = D / 2;
-    d.haystackPts = d.allpts = [d.source.x * C * H + k.x, d.source.y * P * H + k.y, d.target.x * T * H + E.x, d.target.y * N * H + E.y], d.midX = (d.allpts[0] + d.allpts[2]) / 2, d.midY = (d.allpts[1] + d.allpts[3]) / 2, d.edgeType = "haystack", d.haystack = !0, this.storeEdgeProjections(u), this.calculateArrowAngles(u), this.recalculateEdgeLabelProjections(u), this.calculateLabelAngles(u);
-  }
-};
-Ro.findSegmentsPoints = function(a, r) {
-  var u = a._private.rscratch, c = a.pstyle("segment-weights"), d = a.pstyle("segment-distances"), g = Math.min(c.pfValue.length, d.pfValue.length);
-  u.edgeType = "segments", u.segpts = [];
-  for (var b = 0; b < g; b++) {
-    var y = c.pfValue[b], k = d.pfValue[b], E = 1 - y, C = y, T = this.findMidptPtsEtc(a, r), P = T.midptPts, N = T.vectorNormInverse, D = {
-      x: P.x1 * E + P.x2 * C,
-      y: P.y1 * E + P.y2 * C
-    };
-    u.segpts.push(D.x + N.x * k, D.y + N.y * k);
-  }
-};
-Ro.findLoopPoints = function(a, r, u, c) {
-  var d = a._private.rscratch, g = r.dirCounts, b = r.srcPos, y = a.pstyle("control-point-distances"), k = y ? y.pfValue[0] : void 0, E = a.pstyle("loop-direction").pfValue, C = a.pstyle("loop-sweep").pfValue, T = a.pstyle("control-point-step-size").pfValue;
-  d.edgeType = "self";
-  var P = u, N = T;
-  c && (P = 0, N = k);
-  var D = E - Math.PI / 2, H = D - C / 2, _ = D + C / 2, B = E + "_" + C;
-  P = g[B] === void 0 ? g[B] = 0 : ++g[B], d.ctrlpts = [b.x + Math.cos(H) * 1.4 * N * (P / 3 + 1), b.y + Math.sin(H) * 1.4 * N * (P / 3 + 1), b.x + Math.cos(_) * 1.4 * N * (P / 3 + 1), b.y + Math.sin(_) * 1.4 * N * (P / 3 + 1)];
-};
-Ro.findCompoundLoopPoints = function(a, r, u, c) {
-  var d = a._private.rscratch;
-  d.edgeType = "compound";
-  var g = r.srcPos, b = r.tgtPos, y = r.srcW, k = r.srcH, E = r.tgtW, C = r.tgtH, T = a.pstyle("control-point-step-size").pfValue, P = a.pstyle("control-point-distances"), N = P ? P.pfValue[0] : void 0, D = u, H = T;
-  c && (D = 0, H = N);
-  var _ = 50, B = {
-    x: g.x - y / 2,
-    y: g.y - k / 2
-  }, $ = {
-    x: b.x - E / 2,
-    y: b.y - C / 2
-  }, F = {
-    x: Math.min(B.x, $.x),
-    y: Math.min(B.y, $.y)
-  }, W = 0.5, Q = Math.max(W, Math.log(y * 0.01)), X = Math.max(W, Math.log(E * 0.01));
-  d.ctrlpts = [F.x, F.y - (1 + Math.pow(_, 1.12) / 100) * H * (D / 3 + 1) * Q, F.x - (1 + Math.pow(_, 1.12) / 100) * H * (D / 3 + 1) * X, F.y];
-};
-Ro.findStraightEdgePoints = function(a) {
-  a._private.rscratch.edgeType = "straight";
-};
-Ro.findBezierPoints = function(a, r, u, c, d) {
-  var g = a._private.rscratch, b = a.pstyle("control-point-step-size").pfValue, y = a.pstyle("control-point-distances"), k = a.pstyle("control-point-weights"), E = y && k ? Math.min(y.value.length, k.value.length) : 1, C = y ? y.pfValue[0] : void 0, T = k.value[0], P = c;
-  g.edgeType = P ? "multibezier" : "bezier", g.ctrlpts = [];
-  for (var N = 0; N < E; N++) {
-    var D = (0.5 - r.eles.length / 2 + u) * b * (d ? -1 : 1), H = void 0, _ = e$(D);
-    P && (C = y ? y.pfValue[N] : b, T = k.value[N]), c ? H = C : H = C !== void 0 ? _ * C : void 0;
-    var B = H !== void 0 ? H : D, $ = 1 - T, F = T, W = this.findMidptPtsEtc(a, r), Q = W.midptPts, X = W.vectorNormInverse, K = {
-      x: Q.x1 * $ + Q.x2 * F,
-      y: Q.y1 * $ + Q.y2 * F
-    };
-    g.ctrlpts.push(K.x + X.x * B, K.y + X.y * B);
-  }
-};
-Ro.findTaxiPoints = function(a, r) {
-  var u = a._private.rscratch;
-  u.edgeType = "segments";
-  var c = "vertical", d = "horizontal", g = "leftward", b = "rightward", y = "downward", k = "upward", E = "auto", C = r.posPts, T = r.srcW, P = r.srcH, N = r.tgtW, D = r.tgtH, H = a.pstyle("edge-distances").value, _ = H !== "node-position", B = a.pstyle("taxi-direction").value, $ = B, F = a.pstyle("taxi-turn"), W = F.units === "%", Q = F.pfValue, X = Q < 0, K = a.pstyle("taxi-turn-min-distance").pfValue, ee = _ ? (T + N) / 2 : 0, Z = _ ? (P + D) / 2 : 0, ae = C.x2 - C.x1, oe = C.y2 - C.y1, J = function(tt, Gt) {
-    return tt > 0 ? Math.max(tt - Gt, 0) : Math.min(tt + Gt, 0);
-  }, fe = J(ae, ee), se = J(oe, Z), pe = !1;
-  $ === E ? B = Math.abs(fe) > Math.abs(se) ? d : c : $ === k || $ === y ? (B = c, pe = !0) : ($ === g || $ === b) && (B = d, pe = !0);
-  var he = B === c, de = he ? se : fe, ke = he ? oe : ae, Pe = e$(ke), Ae = !1;
-  !(pe && (W || X)) && ($ === y && ke < 0 || $ === k && ke > 0 || $ === g && ke > 0 || $ === b && ke < 0) && (Pe *= -1, de = Pe * Math.abs(de), Ae = !0);
-  var Te;
-  if (W) {
-    var Oe = Q < 0 ? 1 + Q : Q;
-    Te = Oe * de;
-  } else {
-    var ze = Q < 0 ? de : 0;
-    Te = ze + Q * Pe;
-  }
-  var We = function(tt) {
-    return Math.abs(tt) < K || Math.abs(tt) >= Math.abs(de);
-  }, $e = We(Te), Ge = We(Math.abs(de) - Math.abs(Te)), me = $e || Ge;
-  if (me && !Ae)
-    if (he) {
-      var Ve = Math.abs(ke) <= P / 2, Ke = Math.abs(ae) <= N / 2;
-      if (Ve) {
-        var at = (C.x1 + C.x2) / 2, ft = C.y1, en = C.y2;
-        u.segpts = [at, ft, at, en];
-      } else if (Ke) {
-        var gn = (C.y1 + C.y2) / 2, mt = C.x1, ht = C.x2;
-        u.segpts = [mt, gn, ht, gn];
-      } else
-        u.segpts = [C.x1, C.y2];
-    } else {
-      var Rt = Math.abs(ke) <= T / 2, Lt = Math.abs(oe) <= D / 2;
-      if (Rt) {
-        var yt = (C.y1 + C.y2) / 2, Mt = C.x1, In = C.x2;
-        u.segpts = [Mt, yt, In, yt];
-      } else if (Lt) {
-        var Pn = (C.x1 + C.x2) / 2, Vt = C.y1, ar = C.y2;
-        u.segpts = [Pn, Vt, Pn, ar];
-      } else
-        u.segpts = [C.x2, C.y1];
-    }
-  else if (he) {
-    var Qe = C.y1 + Te + (_ ? P / 2 * Pe : 0), ne = C.x1, Ie = C.x2;
-    u.segpts = [ne, Qe, Ie, Qe];
-  } else {
-    var Je = C.x1 + Te + (_ ? T / 2 * Pe : 0), Ye = C.y1, Fe = C.y2;
-    u.segpts = [Je, Ye, Je, Fe];
-  }
-};
-Ro.tryToCorrectInvalidPoints = function(a, r) {
-  var u = a._private.rscratch;
-  if (u.edgeType === "bezier") {
-    var c = r.srcPos, d = r.tgtPos, g = r.srcW, b = r.srcH, y = r.tgtW, k = r.tgtH, E = r.srcShape, C = r.tgtShape, T = !kt(u.startX) || !kt(u.startY), P = !kt(u.arrowStartX) || !kt(u.arrowStartY), N = !kt(u.endX) || !kt(u.endY), D = !kt(u.arrowEndX) || !kt(u.arrowEndY), H = 3, _ = this.getArrowWidth(a.pstyle("width").pfValue, a.pstyle("arrow-scale").value) * this.arrowShapeWidth, B = H * _, $ = hv({
-      x: u.ctrlpts[0],
-      y: u.ctrlpts[1]
-    }, {
-      x: u.startX,
-      y: u.startY
-    }), F = $ < B, W = hv({
-      x: u.ctrlpts[0],
-      y: u.ctrlpts[1]
-    }, {
-      x: u.endX,
-      y: u.endY
-    }), Q = W < B, X = !1;
-    if (T || P || F) {
-      X = !0;
-      var K = {
-        // delta
-        x: u.ctrlpts[0] - c.x,
-        y: u.ctrlpts[1] - c.y
-      }, ee = Math.sqrt(K.x * K.x + K.y * K.y), Z = {
-        // normalised delta
-        x: K.x / ee,
-        y: K.y / ee
-      }, ae = Math.max(g, b), oe = {
-        // *2 radius guarantees outside shape
-        x: u.ctrlpts[0] + Z.x * 2 * ae,
-        y: u.ctrlpts[1] + Z.y * 2 * ae
-      }, J = E.intersectLine(c.x, c.y, g, b, oe.x, oe.y, 0);
-      F ? (u.ctrlpts[0] = u.ctrlpts[0] + Z.x * (B - $), u.ctrlpts[1] = u.ctrlpts[1] + Z.y * (B - $)) : (u.ctrlpts[0] = J[0] + Z.x * B, u.ctrlpts[1] = J[1] + Z.y * B);
-    }
-    if (N || D || Q) {
-      X = !0;
-      var fe = {
-        // delta
-        x: u.ctrlpts[0] - d.x,
-        y: u.ctrlpts[1] - d.y
-      }, se = Math.sqrt(fe.x * fe.x + fe.y * fe.y), pe = {
-        // normalised delta
-        x: fe.x / se,
-        y: fe.y / se
-      }, he = Math.max(g, b), de = {
-        // *2 radius guarantees outside shape
-        x: u.ctrlpts[0] + pe.x * 2 * he,
-        y: u.ctrlpts[1] + pe.y * 2 * he
-      }, ke = C.intersectLine(d.x, d.y, y, k, de.x, de.y, 0);
-      Q ? (u.ctrlpts[0] = u.ctrlpts[0] + pe.x * (B - W), u.ctrlpts[1] = u.ctrlpts[1] + pe.y * (B - W)) : (u.ctrlpts[0] = ke[0] + pe.x * B, u.ctrlpts[1] = ke[1] + pe.y * B);
-    }
-    X && this.findEndpoints(a);
-  }
-};
-Ro.storeAllpts = function(a) {
-  var r = a._private.rscratch;
-  if (r.edgeType === "multibezier" || r.edgeType === "bezier" || r.edgeType === "self" || r.edgeType === "compound") {
-    r.allpts = [], r.allpts.push(r.startX, r.startY);
-    for (var u = 0; u + 1 < r.ctrlpts.length; u += 2)
-      r.allpts.push(r.ctrlpts[u], r.ctrlpts[u + 1]), u + 3 < r.ctrlpts.length && r.allpts.push((r.ctrlpts[u] + r.ctrlpts[u + 2]) / 2, (r.ctrlpts[u + 1] + r.ctrlpts[u + 3]) / 2);
-    r.allpts.push(r.endX, r.endY);
-    var c, d;
-    r.ctrlpts.length / 2 % 2 === 0 ? (c = r.allpts.length / 2 - 1, r.midX = r.allpts[c], r.midY = r.allpts[c + 1]) : (c = r.allpts.length / 2 - 3, d = 0.5, r.midX = Ja(r.allpts[c], r.allpts[c + 2], r.allpts[c + 4], d), r.midY = Ja(r.allpts[c + 1], r.allpts[c + 3], r.allpts[c + 5], d));
-  } else if (r.edgeType === "straight")
-    r.allpts = [r.startX, r.startY, r.endX, r.endY], r.midX = (r.startX + r.endX + r.arrowStartX + r.arrowEndX) / 4, r.midY = (r.startY + r.endY + r.arrowStartY + r.arrowEndY) / 4;
-  else if (r.edgeType === "segments")
-    if (r.allpts = [], r.allpts.push(r.startX, r.startY), r.allpts.push.apply(r.allpts, r.segpts), r.allpts.push(r.endX, r.endY), r.segpts.length % 4 === 0) {
-      var g = r.segpts.length / 2, b = g - 2;
-      r.midX = (r.segpts[b] + r.segpts[g]) / 2, r.midY = (r.segpts[b + 1] + r.segpts[g + 1]) / 2;
-    } else {
-      var y = r.segpts.length / 2 - 1;
-      r.midX = r.segpts[y], r.midY = r.segpts[y + 1];
-    }
-};
-Ro.checkForInvalidEdgeWarning = function(a) {
-  var r = a[0]._private.rscratch;
-  r.nodesOverlap || kt(r.startX) && kt(r.startY) && kt(r.endX) && kt(r.endY) ? r.loggedErr = !1 : r.loggedErr || (r.loggedErr = !0, Sr("Edge `" + a.id() + "` has invalid endpoints and so it is impossible to draw.  Adjust your edge style (e.g. control points) accordingly or use an alternative edge type.  This is expected behaviour when the source node and the target node overlap."));
-};
-Ro.findEdgeControlPoints = function(a) {
-  var r = this;
-  if (!(!a || a.length === 0)) {
-    for (var u = this, c = u.cy, d = c.hasCompoundNodes(), g = {
-      map: new El(),
-      get: function(K) {
-        var ee = this.map.get(K[0]);
-        return ee != null ? ee.get(K[1]) : null;
-      },
-      set: function(K, ee) {
-        var Z = this.map.get(K[0]);
-        Z == null && (Z = new El(), this.map.set(K[0], Z)), Z.set(K[1], ee);
-      }
-    }, b = [], y = [], k = 0; k < a.length; k++) {
-      var E = a[k], C = E._private, T = E.pstyle("curve-style").value;
-      if (!(E.removed() || !E.takesUpSpace())) {
-        if (T === "haystack") {
-          y.push(E);
-          continue;
-        }
-        var P = T === "unbundled-bezier" || T === "segments" || T === "straight" || T === "straight-triangle" || T === "taxi", N = T === "unbundled-bezier" || T === "bezier", D = C.source, H = C.target, _ = D.poolIndex(), B = H.poolIndex(), $ = [_, B].sort(), F = g.get($);
-        F == null && (F = {
-          eles: []
-        }, g.set($, F), b.push($)), F.eles.push(E), P && (F.hasUnbundled = !0), N && (F.hasBezier = !0);
-      }
-    }
-    for (var W = function(K) {
-      var ee = b[K], Z = g.get(ee), ae = void 0;
-      if (!Z.hasUnbundled) {
-        var oe = Z.eles[0].parallelEdges().filter(function(ar) {
-          return ar.isBundledBezier();
-        });
-        I6(Z.eles), oe.forEach(function(ar) {
-          return Z.eles.push(ar);
-        }), Z.eles.sort(function(ar, Qe) {
-          return ar.poolIndex() - Qe.poolIndex();
-        });
-      }
-      var J = Z.eles[0], fe = J.source(), se = J.target();
-      if (fe.poolIndex() > se.poolIndex()) {
-        var pe = fe;
-        fe = se, se = pe;
-      }
-      var he = Z.srcPos = fe.position(), de = Z.tgtPos = se.position(), ke = Z.srcW = fe.outerWidth(), Pe = Z.srcH = fe.outerHeight(), Ae = Z.tgtW = se.outerWidth(), Te = Z.tgtH = se.outerHeight(), Oe = Z.srcShape = u.nodeShapes[r.getNodeShape(fe)], ze = Z.tgtShape = u.nodeShapes[r.getNodeShape(se)];
-      Z.dirCounts = {
-        north: 0,
-        west: 0,
-        south: 0,
-        east: 0,
-        northwest: 0,
-        southwest: 0,
-        northeast: 0,
-        southeast: 0
-      };
-      for (var We = 0; We < Z.eles.length; We++) {
-        var $e = Z.eles[We], Ge = $e[0]._private.rscratch, me = $e.pstyle("curve-style").value, Ve = me === "unbundled-bezier" || me === "segments" || me === "taxi", Ke = !fe.same($e.source());
-        if (!Z.calculatedIntersection && fe !== se && (Z.hasBezier || Z.hasUnbundled)) {
-          Z.calculatedIntersection = !0;
-          var at = Oe.intersectLine(he.x, he.y, ke, Pe, de.x, de.y, 0), ft = Z.srcIntn = at, en = ze.intersectLine(de.x, de.y, Ae, Te, he.x, he.y, 0), gn = Z.tgtIntn = en, mt = Z.intersectionPts = {
-            x1: at[0],
-            x2: en[0],
-            y1: at[1],
-            y2: en[1]
-          }, ht = Z.posPts = {
-            x1: he.x,
-            x2: de.x,
-            y1: he.y,
-            y2: de.y
-          }, Rt = en[1] - at[1], Lt = en[0] - at[0], yt = Math.sqrt(Lt * Lt + Rt * Rt), Mt = Z.vector = {
-            x: Lt,
-            y: Rt
-          }, In = Z.vectorNorm = {
-            x: Mt.x / yt,
-            y: Mt.y / yt
-          }, Pn = {
-            x: -In.y,
-            y: In.x
-          };
-          Z.nodesOverlap = !kt(yt) || ze.checkPoint(at[0], at[1], 0, Ae, Te, de.x, de.y) || Oe.checkPoint(en[0], en[1], 0, ke, Pe, he.x, he.y), Z.vectorNormInverse = Pn, ae = {
-            nodesOverlap: Z.nodesOverlap,
-            dirCounts: Z.dirCounts,
-            calculatedIntersection: !0,
-            hasBezier: Z.hasBezier,
-            hasUnbundled: Z.hasUnbundled,
-            eles: Z.eles,
-            srcPos: de,
-            tgtPos: he,
-            srcW: Ae,
-            srcH: Te,
-            tgtW: ke,
-            tgtH: Pe,
-            srcIntn: gn,
-            tgtIntn: ft,
-            srcShape: ze,
-            tgtShape: Oe,
-            posPts: {
-              x1: ht.x2,
-              y1: ht.y2,
-              x2: ht.x1,
-              y2: ht.y1
-            },
-            intersectionPts: {
-              x1: mt.x2,
-              y1: mt.y2,
-              x2: mt.x1,
-              y2: mt.y1
-            },
-            vector: {
-              x: -Mt.x,
-              y: -Mt.y
-            },
-            vectorNorm: {
-              x: -In.x,
-              y: -In.y
-            },
-            vectorNormInverse: {
-              x: -Pn.x,
-              y: -Pn.y
-            }
-          };
-        }
-        var Vt = Ke ? ae : Z;
-        Ge.nodesOverlap = Vt.nodesOverlap, Ge.srcIntn = Vt.srcIntn, Ge.tgtIntn = Vt.tgtIntn, d && (fe.isParent() || fe.isChild() || se.isParent() || se.isChild()) && (fe.parents().anySame(se) || se.parents().anySame(fe) || fe.same(se) && fe.isParent()) ? r.findCompoundLoopPoints($e, Vt, We, Ve) : fe === se ? r.findLoopPoints($e, Vt, We, Ve) : me === "segments" ? r.findSegmentsPoints($e, Vt) : me === "taxi" ? r.findTaxiPoints($e, Vt) : me === "straight" || !Ve && Z.eles.length % 2 === 1 && We === Math.floor(Z.eles.length / 2) ? r.findStraightEdgePoints($e) : r.findBezierPoints($e, Vt, We, Ve, Ke), r.findEndpoints($e), r.tryToCorrectInvalidPoints($e, Vt), r.checkForInvalidEdgeWarning($e), r.storeAllpts($e), r.storeEdgeProjections($e), r.calculateArrowAngles($e), r.recalculateEdgeLabelProjections($e), r.calculateLabelAngles($e);
-      }
-    }, Q = 0; Q < b.length; Q++)
-      W(Q);
-    this.findHaystackPoints(y);
-  }
-};
-function $$(a) {
-  var r = [];
-  if (a != null) {
-    for (var u = 0; u < a.length; u += 2) {
-      var c = a[u], d = a[u + 1];
-      r.push({
-        x: c,
-        y: d
-      });
-    }
-    return r;
-  }
-}
-Ro.getSegmentPoints = function(a) {
-  var r = a[0]._private.rscratch, u = r.edgeType;
-  if (u === "segments")
-    return this.recalculateRenderedStyle(a), $$(r.segpts);
-};
-Ro.getControlPoints = function(a) {
-  var r = a[0]._private.rscratch, u = r.edgeType;
-  if (u === "bezier" || u === "multibezier" || u === "self" || u === "compound")
-    return this.recalculateRenderedStyle(a), $$(r.ctrlpts);
-};
-Ro.getEdgeMidpoint = function(a) {
-  var r = a[0]._private.rscratch;
-  return this.recalculateRenderedStyle(a), {
-    x: r.midX,
-    y: r.midY
-  };
-};
-var dw = {};
-dw.manualEndptToPx = function(a, r) {
-  var u = this, c = a.position(), d = a.outerWidth(), g = a.outerHeight();
-  if (r.value.length === 2) {
-    var b = [r.pfValue[0], r.pfValue[1]];
-    return r.units[0] === "%" && (b[0] = b[0] * d), r.units[1] === "%" && (b[1] = b[1] * g), b[0] += c.x, b[1] += c.y, b;
-  } else {
-    var y = r.pfValue[0];
-    y = -Math.PI / 2 + y;
-    var k = 2 * Math.max(d, g), E = [c.x + Math.cos(y) * k, c.y + Math.sin(y) * k];
-    return u.nodeShapes[this.getNodeShape(a)].intersectLine(c.x, c.y, d, g, E[0], E[1], 0);
-  }
-};
-dw.findEndpoints = function(a) {
-  var r = this, u, c = a.source()[0], d = a.target()[0], g = c.position(), b = d.position(), y = a.pstyle("target-arrow-shape").value, k = a.pstyle("source-arrow-shape").value, E = a.pstyle("target-distance-from-node").pfValue, C = a.pstyle("source-distance-from-node").pfValue, T = a.pstyle("curve-style").value, P = a._private.rscratch, N = P.edgeType, D = T === "taxi", H = N === "self" || N === "compound", _ = N === "bezier" || N === "multibezier" || H, B = N !== "bezier", $ = N === "straight" || N === "segments", F = N === "segments", W = _ || B || $, Q = H || D, X = a.pstyle("source-endpoint"), K = Q ? "outside-to-node" : X.value, ee = a.pstyle("target-endpoint"), Z = Q ? "outside-to-node" : ee.value;
-  P.srcManEndpt = X, P.tgtManEndpt = ee;
-  var ae, oe, J, fe;
-  if (_) {
-    var se = [P.ctrlpts[0], P.ctrlpts[1]], pe = B ? [P.ctrlpts[P.ctrlpts.length - 2], P.ctrlpts[P.ctrlpts.length - 1]] : se;
-    ae = pe, oe = se;
-  } else if ($) {
-    var he = F ? P.segpts.slice(0, 2) : [b.x, b.y], de = F ? P.segpts.slice(P.segpts.length - 2) : [g.x, g.y];
-    ae = de, oe = he;
-  }
-  if (Z === "inside-to-node")
-    u = [b.x, b.y];
-  else if (ee.units)
-    u = this.manualEndptToPx(d, ee);
-  else if (Z === "outside-to-line")
-    u = P.tgtIntn;
-  else if (Z === "outside-to-node" || Z === "outside-to-node-or-label" ? J = ae : (Z === "outside-to-line" || Z === "outside-to-line-or-label") && (J = [g.x, g.y]), u = r.nodeShapes[this.getNodeShape(d)].intersectLine(b.x, b.y, d.outerWidth(), d.outerHeight(), J[0], J[1], 0), Z === "outside-to-node-or-label" || Z === "outside-to-line-or-label") {
-    var ke = d._private.rscratch, Pe = ke.labelWidth, Ae = ke.labelHeight, Te = ke.labelX, Oe = ke.labelY, ze = Pe / 2, We = Ae / 2, $e = d.pstyle("text-valign").value;
-    $e === "top" ? Oe -= We : $e === "bottom" && (Oe += We);
-    var Ge = d.pstyle("text-halign").value;
-    Ge === "left" ? Te -= ze : Ge === "right" && (Te += ze);
-    var me = Jp(J[0], J[1], [Te - ze, Oe - We, Te + ze, Oe - We, Te + ze, Oe + We, Te - ze, Oe + We], b.x, b.y);
-    if (me.length > 0) {
-      var Ve = g, Ke = uv(Ve, Tb(u)), at = uv(Ve, Tb(me)), ft = Ke;
-      if (at < Ke && (u = me, ft = at), me.length > 2) {
-        var en = uv(Ve, {
-          x: me[2],
-          y: me[3]
-        });
-        en < ft && (u = [me[2], me[3]]);
-      }
-    }
-  }
-  var gn = ME(u, ae, r.arrowShapes[y].spacing(a) + E), mt = ME(u, ae, r.arrowShapes[y].gap(a) + E);
-  if (P.endX = mt[0], P.endY = mt[1], P.arrowEndX = gn[0], P.arrowEndY = gn[1], K === "inside-to-node")
-    u = [g.x, g.y];
-  else if (X.units)
-    u = this.manualEndptToPx(c, X);
-  else if (K === "outside-to-line")
-    u = P.srcIntn;
-  else if (K === "outside-to-node" || K === "outside-to-node-or-label" ? fe = oe : (K === "outside-to-line" || K === "outside-to-line-or-label") && (fe = [b.x, b.y]), u = r.nodeShapes[this.getNodeShape(c)].intersectLine(g.x, g.y, c.outerWidth(), c.outerHeight(), fe[0], fe[1], 0), K === "outside-to-node-or-label" || K === "outside-to-line-or-label") {
-    var ht = c._private.rscratch, Rt = ht.labelWidth, Lt = ht.labelHeight, yt = ht.labelX, Mt = ht.labelY, In = Rt / 2, Pn = Lt / 2, Vt = c.pstyle("text-valign").value;
-    Vt === "top" ? Mt -= Pn : Vt === "bottom" && (Mt += Pn);
-    var ar = c.pstyle("text-halign").value;
-    ar === "left" ? yt -= In : ar === "right" && (yt += In);
-    var Qe = Jp(fe[0], fe[1], [yt - In, Mt - Pn, yt + In, Mt - Pn, yt + In, Mt + Pn, yt - In, Mt + Pn], g.x, g.y);
-    if (Qe.length > 0) {
-      var ne = b, Ie = uv(ne, Tb(u)), Je = uv(ne, Tb(Qe)), Ye = Ie;
-      if (Je < Ie && (u = [Qe[0], Qe[1]], Ye = Je), Qe.length > 2) {
-        var Fe = uv(ne, {
-          x: Qe[2],
-          y: Qe[3]
-        });
-        Fe < Ye && (u = [Qe[2], Qe[3]]);
-      }
-    }
-  }
-  var bn = ME(u, oe, r.arrowShapes[k].spacing(a) + C), tt = ME(u, oe, r.arrowShapes[k].gap(a) + C);
-  P.startX = tt[0], P.startY = tt[1], P.arrowStartX = bn[0], P.arrowStartY = bn[1], W && (!kt(P.startX) || !kt(P.startY) || !kt(P.endX) || !kt(P.endY) ? P.badLine = !0 : P.badLine = !1);
-};
-dw.getSourceEndpoint = function(a) {
-  var r = a[0]._private.rscratch;
-  switch (this.recalculateRenderedStyle(a), r.edgeType) {
-    case "haystack":
-      return {
-        x: r.haystackPts[0],
-        y: r.haystackPts[1]
-      };
-    default:
-      return {
-        x: r.arrowStartX,
-        y: r.arrowStartY
-      };
-  }
-};
-dw.getTargetEndpoint = function(a) {
-  var r = a[0]._private.rscratch;
-  switch (this.recalculateRenderedStyle(a), r.edgeType) {
-    case "haystack":
-      return {
-        x: r.haystackPts[2],
-        y: r.haystackPts[3]
-      };
-    default:
-      return {
-        x: r.arrowEndX,
-        y: r.arrowEndY
-      };
-  }
-};
-var F6 = {};
-function Vce(a, r, u) {
-  for (var c = function(E, C, T, P) {
-    return Ja(E, C, T, P);
-  }, d = r._private, g = d.rstyle.bezierPts, b = 0; b < a.bezierProjPcts.length; b++) {
-    var y = a.bezierProjPcts[b];
-    g.push({
-      x: c(u[0], u[2], u[4], y),
-      y: c(u[1], u[3], u[5], y)
-    });
-  }
-}
-F6.storeEdgeProjections = function(a) {
-  var r = a._private, u = r.rscratch, c = u.edgeType;
-  if (r.rstyle.bezierPts = null, r.rstyle.linePts = null, r.rstyle.haystackPts = null, c === "multibezier" || c === "bezier" || c === "self" || c === "compound") {
-    r.rstyle.bezierPts = [];
-    for (var d = 0; d + 5 < u.allpts.length; d += 4)
-      Vce(this, a, u.allpts.slice(d, d + 6));
-  } else if (c === "segments")
-    for (var g = r.rstyle.linePts = [], d = 0; d + 1 < u.allpts.length; d += 2)
-      g.push({
-        x: u.allpts[d],
-        y: u.allpts[d + 1]
-      });
-  else if (c === "haystack") {
-    var b = u.haystackPts;
-    r.rstyle.haystackPts = [{
-      x: b[0],
-      y: b[1]
-    }, {
-      x: b[2],
-      y: b[3]
-    }];
-  }
-  r.rstyle.arrowWidth = this.getArrowWidth(a.pstyle("width").pfValue, a.pstyle("arrow-scale").value) * this.arrowShapeWidth;
-};
-F6.recalculateEdgeProjections = function(a) {
-  this.findEdgeControlPoints(a);
-};
-var Cl = {};
-Cl.recalculateNodeLabelProjection = function(a) {
-  var r = a.pstyle("label").strValue;
-  if (!zh(r)) {
-    var u, c, d = a._private, g = a.width(), b = a.height(), y = a.padding(), k = a.position(), E = a.pstyle("text-halign").strValue, C = a.pstyle("text-valign").strValue, T = d.rscratch, P = d.rstyle;
-    switch (E) {
-      case "left":
-        u = k.x - g / 2 - y;
-        break;
-      case "right":
-        u = k.x + g / 2 + y;
-        break;
-      default:
-        u = k.x;
-    }
-    switch (C) {
-      case "top":
-        c = k.y - b / 2 - y;
-        break;
-      case "bottom":
-        c = k.y + b / 2 + y;
-        break;
-      default:
-        c = k.y;
-    }
-    T.labelX = u, T.labelY = c, P.labelX = u, P.labelY = c, this.calculateLabelAngles(a), this.applyLabelDimensions(a);
-  }
-};
-var Y$ = function(r, u) {
-  var c = Math.atan(u / r);
-  return r === 0 && c < 0 && (c = c * -1), c;
-}, F$ = function(r, u) {
-  var c = u.x - r.x, d = u.y - r.y;
-  return Y$(c, d);
-}, Wce = function(r, u, c, d) {
-  var g = Qp(0, d - 1e-3, 1), b = Qp(0, d + 1e-3, 1), y = Pb(r, u, c, g), k = Pb(r, u, c, b);
-  return F$(y, k);
-};
-Cl.recalculateEdgeLabelProjections = function(a) {
-  var r, u = a._private, c = u.rscratch, d = this, g = {
-    mid: a.pstyle("label").strValue,
-    source: a.pstyle("source-label").strValue,
-    target: a.pstyle("target-label").strValue
-  };
-  if (g.mid || g.source || g.target) {
-    r = {
-      x: c.midX,
-      y: c.midY
-    };
-    var b = function(T, P, N) {
-      Oh(u.rscratch, T, P, N), Oh(u.rstyle, T, P, N);
-    };
-    b("labelX", null, r.x), b("labelY", null, r.y);
-    var y = Y$(c.midDispX, c.midDispY);
-    b("labelAutoAngle", null, y);
-    var k = function C() {
-      if (C.cache)
-        return C.cache;
-      for (var T = [], P = 0; P + 5 < c.allpts.length; P += 4) {
-        var N = {
-          x: c.allpts[P],
-          y: c.allpts[P + 1]
-        }, D = {
-          x: c.allpts[P + 2],
-          y: c.allpts[P + 3]
-        }, H = {
-          x: c.allpts[P + 4],
-          y: c.allpts[P + 5]
-        };
-        T.push({
-          p0: N,
-          p1: D,
-          p2: H,
-          startDist: 0,
-          length: 0,
-          segments: []
-        });
-      }
-      var _ = u.rstyle.bezierPts, B = d.bezierProjPcts.length;
-      function $(K, ee, Z, ae, oe) {
-        var J = hv(ee, Z), fe = K.segments[K.segments.length - 1], se = {
-          p0: ee,
-          p1: Z,
-          t0: ae,
-          t1: oe,
-          startDist: fe ? fe.startDist + fe.length : 0,
-          length: J
-        };
-        K.segments.push(se), K.length += J;
-      }
-      for (var F = 0; F < T.length; F++) {
-        var W = T[F], Q = T[F - 1];
-        Q && (W.startDist = Q.startDist + Q.length), $(W, W.p0, _[F * B], 0, d.bezierProjPcts[0]);
-        for (var X = 0; X < B - 1; X++)
-          $(W, _[F * B + X], _[F * B + X + 1], d.bezierProjPcts[X], d.bezierProjPcts[X + 1]);
-        $(W, _[F * B + B - 1], W.p2, d.bezierProjPcts[B - 1], 1);
-      }
-      return C.cache = T;
-    }, E = function(T) {
-      var P, N = T === "source";
-      if (g[T]) {
-        var D = a.pstyle(T + "-text-offset").pfValue;
-        switch (c.edgeType) {
-          case "self":
-          case "compound":
-          case "bezier":
-          case "multibezier": {
-            for (var H = k(), _, B = 0, $ = 0, F = 0; F < H.length; F++) {
-              for (var W = H[N ? F : H.length - 1 - F], Q = 0; Q < W.segments.length; Q++) {
-                var X = W.segments[N ? Q : W.segments.length - 1 - Q], K = F === H.length - 1 && Q === W.segments.length - 1;
-                if (B = $, $ += X.length, $ >= D || K) {
-                  _ = {
-                    cp: W,
-                    segment: X
-                  };
-                  break;
-                }
-              }
-              if (_)
-                break;
-            }
-            var ee = _.cp, Z = _.segment, ae = (D - B) / Z.length, oe = Z.t1 - Z.t0, J = N ? Z.t0 + oe * ae : Z.t1 - oe * ae;
-            J = Qp(0, J, 1), r = Pb(ee.p0, ee.p1, ee.p2, J), P = Wce(ee.p0, ee.p1, ee.p2, J);
-            break;
-          }
-          case "straight":
-          case "segments":
-          case "haystack": {
-            for (var fe = 0, se, pe, he, de, ke = c.allpts.length, Pe = 0; Pe + 3 < ke && (N ? (he = {
-              x: c.allpts[Pe],
-              y: c.allpts[Pe + 1]
-            }, de = {
-              x: c.allpts[Pe + 2],
-              y: c.allpts[Pe + 3]
-            }) : (he = {
-              x: c.allpts[ke - 2 - Pe],
-              y: c.allpts[ke - 1 - Pe]
-            }, de = {
-              x: c.allpts[ke - 4 - Pe],
-              y: c.allpts[ke - 3 - Pe]
-            }), se = hv(he, de), pe = fe, fe += se, !(fe >= D)); Pe += 2)
-              ;
-            var Ae = D - pe, Te = Ae / se;
-            Te = Qp(0, Te, 1), r = use(he, de, Te), P = F$(he, de);
-            break;
-          }
-        }
-        b("labelX", T, r.x), b("labelY", T, r.y), b("labelAutoAngle", T, P);
-      }
-    };
-    E("source"), E("target"), this.applyLabelDimensions(a);
-  }
-};
-Cl.applyLabelDimensions = function(a) {
-  this.applyPrefixedLabelDimensions(a), a.isEdge() && (this.applyPrefixedLabelDimensions(a, "source"), this.applyPrefixedLabelDimensions(a, "target"));
-};
-Cl.applyPrefixedLabelDimensions = function(a, r) {
-  var u = a._private, c = this.getLabelText(a, r), d = this.calculateLabelDimensions(a, c), g = a.pstyle("line-height").pfValue, b = a.pstyle("text-wrap").strValue, y = Sc(u.rscratch, "labelWrapCachedLines", r) || [], k = b !== "wrap" ? 1 : Math.max(y.length, 1), E = d.height / k, C = E * g, T = d.width, P = d.height + (k - 1) * (g - 1) * E;
-  Oh(u.rstyle, "labelWidth", r, T), Oh(u.rscratch, "labelWidth", r, T), Oh(u.rstyle, "labelHeight", r, P), Oh(u.rscratch, "labelHeight", r, P), Oh(u.rscratch, "labelLineHeight", r, C);
-};
-Cl.getLabelText = function(a, r) {
-  var u = a._private, c = r ? r + "-" : "", d = a.pstyle(c + "label").strValue, g = a.pstyle("text-transform").value, b = function(Ae, Te) {
-    return Te ? (Oh(u.rscratch, Ae, r, Te), Te) : Sc(u.rscratch, Ae, r);
-  };
-  if (!d)
-    return "";
-  g == "none" || (g == "uppercase" ? d = d.toUpperCase() : g == "lowercase" && (d = d.toLowerCase()));
-  var y = a.pstyle("text-wrap").value;
-  if (y === "wrap") {
-    var k = b("labelKey");
-    if (k != null && b("labelWrapKey") === k)
-      return b("labelWrapCachedText");
-    for (var E = "​", C = d.split(`
-`), T = a.pstyle("text-max-width").pfValue, P = a.pstyle("text-overflow-wrap").value, N = P === "anywhere", D = [], H = /[\s\u200b]+/, _ = N ? "" : " ", B = 0; B < C.length; B++) {
-      var $ = C[B], F = this.calculateLabelDimensions(a, $), W = F.width;
-      if (N) {
-        var Q = $.split("").join(E);
-        $ = Q;
-      }
-      if (W > T) {
-        for (var X = $.split(H), K = "", ee = 0; ee < X.length; ee++) {
-          var Z = X[ee], ae = K.length === 0 ? Z : K + _ + Z, oe = this.calculateLabelDimensions(a, ae), J = oe.width;
-          J <= T ? K += Z + _ : (K && D.push(K), K = Z + _);
-        }
-        K.match(/^[\s\u200b]+$/) || D.push(K);
-      } else
-        D.push($);
-    }
-    b("labelWrapCachedLines", D), d = b("labelWrapCachedText", D.join(`
-`)), b("labelWrapKey", k);
-  } else if (y === "ellipsis") {
-    var fe = a.pstyle("text-max-width").pfValue, se = "", pe = "…", he = !1;
-    if (this.calculateLabelDimensions(a, d).width < fe)
-      return d;
-    for (var de = 0; de < d.length; de++) {
-      var ke = this.calculateLabelDimensions(a, se + d[de] + pe).width;
-      if (ke > fe)
-        break;
-      se += d[de], de === d.length - 1 && (he = !0);
-    }
-    return he || (se += pe), se;
-  }
-  return d;
-};
-Cl.getLabelJustification = function(a) {
-  var r = a.pstyle("text-justification").strValue, u = a.pstyle("text-halign").strValue;
-  if (r === "auto")
-    if (a.isNode())
-      switch (u) {
-        case "left":
-          return "right";
-        case "right":
-          return "left";
-        default:
-          return "center";
-      }
-    else
-      return "center";
-  else
-    return r;
-};
-Cl.calculateLabelDimensions = function(a, r) {
-  var u = this, c = fv(r, a._private.labelDimsKey), d = u.labelDimCache || (u.labelDimCache = []), g = d[c];
-  if (g != null)
-    return g;
-  var b = 0, y = a.pstyle("font-style").strValue, k = a.pstyle("font-size").pfValue, E = a.pstyle("font-family").strValue, C = a.pstyle("font-weight").strValue, T = this.labelCalcCanvas, P = this.labelCalcCanvasContext;
-  if (!T) {
-    T = this.labelCalcCanvas = document.createElement("canvas"), P = this.labelCalcCanvasContext = T.getContext("2d");
-    var N = T.style;
-    N.position = "absolute", N.left = "-9999px", N.top = "-9999px", N.zIndex = "-1", N.visibility = "hidden", N.pointerEvents = "none";
-  }
-  P.font = "".concat(y, " ").concat(C, " ").concat(k, "px ").concat(E);
-  for (var D = 0, H = 0, _ = r.split(`
-`), B = 0; B < _.length; B++) {
-    var $ = _[B], F = P.measureText($), W = Math.ceil(F.width), Q = k;
-    D = Math.max(W, D), H += Q;
-  }
-  return D += b, H += b, d[c] = {
-    width: D,
-    height: H
-  };
-};
-Cl.calculateLabelAngle = function(a, r) {
-  var u = a._private, c = u.rscratch, d = a.isEdge(), g = r ? r + "-" : "", b = a.pstyle(g + "text-rotation"), y = b.strValue;
-  return y === "none" ? 0 : d && y === "autorotate" ? c.labelAutoAngle : y === "autorotate" ? 0 : b.pfValue;
-};
-Cl.calculateLabelAngles = function(a) {
-  var r = this, u = a.isEdge(), c = a._private, d = c.rscratch;
-  d.labelAngle = r.calculateLabelAngle(a), u && (d.sourceLabelAngle = r.calculateLabelAngle(a, "source"), d.targetLabelAngle = r.calculateLabelAngle(a, "target"));
-};
-var q$ = {}, vG = 28, gG = !1;
-q$.getNodeShape = function(a) {
-  var r = this, u = a.pstyle("shape").value;
-  if (u === "cutrectangle" && (a.width() < vG || a.height() < vG))
-    return gG || (Sr("The `cutrectangle` node shape can not be used at small sizes so `rectangle` is used instead"), gG = !0), "rectangle";
-  if (a.isParent())
-    return u === "rectangle" || u === "roundrectangle" || u === "round-rectangle" || u === "cutrectangle" || u === "cut-rectangle" || u === "barrel" ? u : "rectangle";
-  if (u === "polygon") {
-    var c = a.pstyle("shape-polygon-points").value;
-    return r.nodeShapes.makePolygon(c).name;
-  }
-  return u;
-};
-var E5 = {};
-E5.registerCalculationListeners = function() {
-  var a = this.cy, r = a.collection(), u = this, c = function(b) {
-    var y = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : !0;
-    if (r.merge(b), y)
-      for (var k = 0; k < b.length; k++) {
-        var E = b[k], C = E._private, T = C.rstyle;
-        T.clean = !1, T.cleanConnected = !1;
-      }
-  };
-  u.binder(a).on("bounds.* dirty.*", function(b) {
-    var y = b.target;
-    c(y);
-  }).on("style.* background.*", function(b) {
-    var y = b.target;
-    c(y, !1);
-  });
-  var d = function(b) {
-    if (b) {
-      var y = u.onUpdateEleCalcsFns;
-      r.cleanStyle();
-      for (var k = 0; k < r.length; k++) {
-        var E = r[k], C = E._private.rstyle;
-        E.isNode() && !C.cleanConnected && (c(E.connectedEdges()), C.cleanConnected = !0);
-      }
-      if (y)
-        for (var T = 0; T < y.length; T++) {
-          var P = y[T];
-          P(b, r);
-        }
-      u.recalculateRenderedStyle(r), r = a.collection();
-    }
-  };
-  u.flushRenderedStyleQueue = function() {
-    d(!0);
-  }, u.beforeRender(d, u.beforeRenderPriorities.eleCalcs);
-};
-E5.onUpdateEleCalcs = function(a) {
-  var r = this.onUpdateEleCalcsFns = this.onUpdateEleCalcsFns || [];
-  r.push(a);
-};
-E5.recalculateRenderedStyle = function(a, r) {
-  var u = function(W) {
-    return W._private.rstyle.cleanConnected;
-  }, c = [], d = [];
-  if (!this.destroyed) {
-    r === void 0 && (r = !0);
-    for (var g = 0; g < a.length; g++) {
-      var b = a[g], y = b._private, k = y.rstyle;
-      b.isEdge() && (!u(b.source()) || !u(b.target())) && (k.clean = !1), !(r && k.clean || b.removed()) && b.pstyle("display").value !== "none" && (y.group === "nodes" ? d.push(b) : c.push(b), k.clean = !0);
-    }
-    for (var E = 0; E < d.length; E++) {
-      var C = d[E], T = C._private, P = T.rstyle, N = C.position();
-      this.recalculateNodeLabelProjection(C), P.nodeX = N.x, P.nodeY = N.y, P.nodeW = C.pstyle("width").pfValue, P.nodeH = C.pstyle("height").pfValue;
-    }
-    this.recalculateEdgeProjections(c);
-    for (var D = 0; D < c.length; D++) {
-      var H = c[D], _ = H._private, B = _.rstyle, $ = _.rscratch;
-      B.srcX = $.arrowStartX, B.srcY = $.arrowStartY, B.tgtX = $.arrowEndX, B.tgtY = $.arrowEndY, B.midX = $.midX, B.midY = $.midY, B.labelAngle = $.labelAngle, B.sourceLabelAngle = $.sourceLabelAngle, B.targetLabelAngle = $.targetLabelAngle;
-    }
-  }
-};
-var S5 = {};
-S5.updateCachedGrabbedEles = function() {
-  var a = this.cachedZSortedEles;
-  if (a) {
-    a.drag = [], a.nondrag = [];
-    for (var r = [], u = 0; u < a.length; u++) {
-      var c = a[u], d = c._private.rscratch;
-      c.grabbed() && !c.isParent() ? r.push(c) : d.inDragLayer ? a.drag.push(c) : a.nondrag.push(c);
-    }
-    for (var u = 0; u < r.length; u++) {
-      var c = r[u];
-      a.drag.push(c);
-    }
-  }
-};
-S5.invalidateCachedZSortedEles = function() {
-  this.cachedZSortedEles = null;
-};
-S5.getCachedZSortedEles = function(a) {
-  if (a || !this.cachedZSortedEles) {
-    var r = this.cy.mutableElements().toArray();
-    r.sort(N$), r.interactive = r.filter(function(u) {
-      return u.interactive();
-    }), this.cachedZSortedEles = r, this.updateCachedGrabbedEles();
-  } else
-    r = this.cachedZSortedEles;
-  return r;
-};
-var V$ = {};
-[pv, r5, Ro, dw, F6, Cl, q$, E5, S5].forEach(function(a) {
-  on(V$, a);
-});
-var W$ = {};
-W$.getCachedImage = function(a, r, u) {
-  var c = this, d = c.imageCache = c.imageCache || {}, g = d[a];
-  if (g)
-    return g.image.complete || g.image.addEventListener("load", u), g.image;
-  g = d[a] = d[a] || {};
-  var b = g.image = new Image();
-  b.addEventListener("load", u), b.addEventListener("error", function() {
-    b.error = !0;
-  });
-  var y = "data:", k = a.substring(0, y.length).toLowerCase() === y;
-  return k || (r = r === "null" ? null : r, b.crossOrigin = r), b.src = a, b;
-};
-var $b = {};
-$b.registerBinding = function(a, r, u, c) {
-  var d = Array.prototype.slice.apply(arguments, [1]), g = this.binder(a);
-  return g.on.apply(g, d);
-};
-$b.binder = function(a) {
-  var r = this, u = r.cy.window(), c = a === u || a === u.document || a === u.document.body || doe(a);
-  if (r.supportsPassiveEvents == null) {
-    var d = !1;
-    try {
-      var g = Object.defineProperty({}, "passive", {
-        get: function() {
-          return d = !0, !0;
-        }
-      });
-      u.addEventListener("test", null, g);
-    } catch {
-    }
-    r.supportsPassiveEvents = d;
-  }
-  var b = function(k, E, C) {
-    var T = Array.prototype.slice.call(arguments);
-    return c && r.supportsPassiveEvents && (T[2] = {
-      capture: C ?? !1,
-      passive: !1,
-      once: !1
-    }), r.bindings.push({
-      target: a,
-      args: T
-    }), (a.addEventListener || a.on).apply(a, T), this;
-  };
-  return {
-    on: b,
-    addEventListener: b,
-    addListener: b,
-    bind: b
-  };
-};
-$b.nodeIsDraggable = function(a) {
-  return a && a.isNode() && !a.locked() && a.grabbable();
-};
-$b.nodeIsGrabbable = function(a) {
-  return this.nodeIsDraggable(a) && a.interactive();
-};
-$b.load = function() {
-  var a = this, r = a.cy.window(), u = function(ne) {
-    return ne.selected();
-  }, c = function(ne, Ie, Je, Ye) {
-    ne == null && (ne = a.cy);
-    for (var Fe = 0; Fe < Ie.length; Fe++) {
-      var bn = Ie[Fe];
-      ne.emit({
-        originalEvent: Je,
-        type: bn,
-        position: Ye
-      });
-    }
-  }, d = function(ne) {
-    return ne.shiftKey || ne.metaKey || ne.ctrlKey;
-  }, g = function(ne, Ie) {
-    var Je = !0;
-    if (a.cy.hasCompoundNodes() && ne && ne.pannable())
-      for (var Ye = 0; Ie && Ye < Ie.length; Ye++) {
-        var ne = Ie[Ye];
-        if (ne.isNode() && ne.isParent() && !ne.pannable()) {
-          Je = !1;
-          break;
-        }
-      }
-    else
-      Je = !0;
-    return Je;
-  }, b = function(ne) {
-    ne[0]._private.grabbed = !0;
-  }, y = function(ne) {
-    ne[0]._private.grabbed = !1;
-  }, k = function(ne) {
-    ne[0]._private.rscratch.inDragLayer = !0;
-  }, E = function(ne) {
-    ne[0]._private.rscratch.inDragLayer = !1;
-  }, C = function(ne) {
-    ne[0]._private.rscratch.isGrabTarget = !0;
-  }, T = function(ne) {
-    ne[0]._private.rscratch.isGrabTarget = !1;
-  }, P = function(ne, Ie) {
-    var Je = Ie.addToList, Ye = Je.has(ne);
-    !Ye && ne.grabbable() && !ne.locked() && (Je.merge(ne), b(ne));
-  }, N = function(ne, Ie) {
-    if (ne.cy().hasCompoundNodes() && !(Ie.inDragLayer == null && Ie.addToList == null)) {
-      var Je = ne.descendants();
-      Ie.inDragLayer && (Je.forEach(k), Je.connectedEdges().forEach(k)), Ie.addToList && P(Je, Ie);
-    }
-  }, D = function(ne, Ie) {
-    Ie = Ie || {};
-    var Je = ne.cy().hasCompoundNodes();
-    Ie.inDragLayer && (ne.forEach(k), ne.neighborhood().stdFilter(function(Ye) {
-      return !Je || Ye.isEdge();
-    }).forEach(k)), Ie.addToList && ne.forEach(function(Ye) {
-      P(Ye, Ie);
-    }), N(ne, Ie), B(ne, {
-      inDragLayer: Ie.inDragLayer
-    }), a.updateCachedGrabbedEles();
-  }, H = D, _ = function(ne) {
-    ne && (a.getCachedZSortedEles().forEach(function(Ie) {
-      y(Ie), E(Ie), T(Ie);
-    }), a.updateCachedGrabbedEles());
-  }, B = function(ne, Ie) {
-    if (!(Ie.inDragLayer == null && Ie.addToList == null) && ne.cy().hasCompoundNodes()) {
-      var Je = ne.ancestors().orphans();
-      if (!Je.same(ne)) {
-        var Ye = Je.descendants().spawnSelf().merge(Je).unmerge(ne).unmerge(ne.descendants()), Fe = Ye.connectedEdges();
-        Ie.inDragLayer && (Fe.forEach(k), Ye.forEach(k)), Ie.addToList && Ye.forEach(function(bn) {
-          P(bn, Ie);
-        });
-      }
-    }
-  }, $ = function() {
-    document.activeElement != null && document.activeElement.blur != null && document.activeElement.blur();
-  }, F = typeof MutationObserver < "u", W = typeof ResizeObserver < "u";
-  F ? (a.removeObserver = new MutationObserver(function(Qe) {
-    for (var ne = 0; ne < Qe.length; ne++) {
-      var Ie = Qe[ne], Je = Ie.removedNodes;
-      if (Je)
-        for (var Ye = 0; Ye < Je.length; Ye++) {
-          var Fe = Je[Ye];
-          if (Fe === a.container) {
-            a.destroy();
-            break;
-          }
-        }
-    }
-  }), a.container.parentNode && a.removeObserver.observe(a.container.parentNode, {
-    childList: !0
-  })) : a.registerBinding(a.container, "DOMNodeRemoved", function(Qe) {
-    a.destroy();
-  });
-  var Q = l5.default(function() {
-    a.cy.resize();
-  }, 100);
-  F && (a.styleObserver = new MutationObserver(Q), a.styleObserver.observe(a.container, {
-    attributes: !0
-  })), a.registerBinding(r, "resize", Q), W && (a.resizeObserver = new ResizeObserver(Q), a.resizeObserver.observe(a.container));
-  var X = function(ne, Ie) {
-    for (; ne != null; )
-      Ie(ne), ne = ne.parentNode;
-  }, K = function() {
-    a.invalidateContainerClientCoordsCache();
-  };
-  X(a.container, function(Qe) {
-    a.registerBinding(Qe, "transitionend", K), a.registerBinding(Qe, "animationend", K), a.registerBinding(Qe, "scroll", K);
-  }), a.registerBinding(a.container, "contextmenu", function(Qe) {
-    Qe.preventDefault();
-  });
-  var ee = function() {
-    return a.selection[4] !== 0;
-  }, Z = function(ne) {
-    for (var Ie = a.findContainerClientCoords(), Je = Ie[0], Ye = Ie[1], Fe = Ie[2], bn = Ie[3], tt = ne.touches ? ne.touches : [ne], Gt = !1, tr = 0; tr < tt.length; tr++) {
-      var hr = tt[tr];
-      if (Je <= hr.clientX && hr.clientX <= Je + Fe && Ye <= hr.clientY && hr.clientY <= Ye + bn) {
-        Gt = !0;
-        break;
-      }
-    }
-    if (!Gt)
-      return !1;
-    for (var Dn = a.container, rr = ne.target, wn = rr.parentNode, jn = !1; wn; ) {
-      if (wn === Dn) {
-        jn = !0;
-        break;
-      }
-      wn = wn.parentNode;
-    }
-    return !!jn;
-  };
-  a.registerBinding(a.container, "mousedown", function(ne) {
-    if (Z(ne)) {
-      ne.preventDefault(), $(), a.hoverData.capture = !0, a.hoverData.which = ne.which;
-      var Ie = a.cy, Je = [ne.clientX, ne.clientY], Ye = a.projectIntoViewport(Je[0], Je[1]), Fe = a.selection, bn = a.findNearestElements(Ye[0], Ye[1], !0, !1), tt = bn[0], Gt = a.dragData.possibleDragElements;
-      a.hoverData.mdownPos = Ye, a.hoverData.mdownGPos = Je;
-      var tr = function() {
-        a.hoverData.tapholdCancelled = !1, clearTimeout(a.hoverData.tapholdTimeout), a.hoverData.tapholdTimeout = setTimeout(function() {
-          if (!a.hoverData.tapholdCancelled) {
-            var ui = a.hoverData.down;
-            ui ? ui.emit({
-              originalEvent: ne,
-              type: "taphold",
-              position: {
-                x: Ye[0],
-                y: Ye[1]
-              }
-            }) : Ie.emit({
-              originalEvent: ne,
-              type: "taphold",
-              position: {
-                x: Ye[0],
-                y: Ye[1]
-              }
-            });
-          }
-        }, a.tapholdDuration);
-      };
-      if (ne.which == 3) {
-        a.hoverData.cxtStarted = !0;
-        var hr = {
-          originalEvent: ne,
-          type: "cxttapstart",
-          position: {
-            x: Ye[0],
-            y: Ye[1]
-          }
-        };
-        tt ? (tt.activate(), tt.emit(hr), a.hoverData.down = tt) : Ie.emit(hr), a.hoverData.downTime = (/* @__PURE__ */ new Date()).getTime(), a.hoverData.cxtDragged = !1;
-      } else if (ne.which == 1) {
-        tt && tt.activate();
-        {
-          if (tt != null && a.nodeIsGrabbable(tt)) {
-            var Dn = function(ui) {
-              return {
-                originalEvent: ne,
-                type: ui,
-                position: {
-                  x: Ye[0],
-                  y: Ye[1]
-                }
-              };
-            }, rr = function(ui) {
-              ui.emit(Dn("grab"));
-            };
-            if (C(tt), !tt.selected())
-              Gt = a.dragData.possibleDragElements = Ie.collection(), H(tt, {
-                addToList: Gt
-              }), tt.emit(Dn("grabon")).emit(Dn("grab"));
-            else {
-              Gt = a.dragData.possibleDragElements = Ie.collection();
-              var wn = Ie.$(function(jn) {
-                return jn.isNode() && jn.selected() && a.nodeIsGrabbable(jn);
-              });
-              D(wn, {
-                addToList: Gt
-              }), tt.emit(Dn("grabon")), wn.forEach(rr);
-            }
-            a.redrawHint("eles", !0), a.redrawHint("drag", !0);
-          }
-          a.hoverData.down = tt, a.hoverData.downs = bn, a.hoverData.downTime = (/* @__PURE__ */ new Date()).getTime();
-        }
-        c(tt, ["mousedown", "tapstart", "vmousedown"], ne, {
-          x: Ye[0],
-          y: Ye[1]
-        }), tt == null ? (Fe[4] = 1, a.data.bgActivePosistion = {
-          x: Ye[0],
-          y: Ye[1]
-        }, a.redrawHint("select", !0), a.redraw()) : tt.pannable() && (Fe[4] = 1), tr();
-      }
-      Fe[0] = Fe[2] = Ye[0], Fe[1] = Fe[3] = Ye[1];
-    }
-  }, !1), a.registerBinding(r, "mousemove", function(ne) {
-    var Ie = a.hoverData.capture;
-    if (!(!Ie && !Z(ne))) {
-      var Je = !1, Ye = a.cy, Fe = Ye.zoom(), bn = [ne.clientX, ne.clientY], tt = a.projectIntoViewport(bn[0], bn[1]), Gt = a.hoverData.mdownPos, tr = a.hoverData.mdownGPos, hr = a.selection, Dn = null;
-      !a.hoverData.draggingEles && !a.hoverData.dragging && !a.hoverData.selecting && (Dn = a.findNearestElement(tt[0], tt[1], !0, !1));
-      var rr = a.hoverData.last, wn = a.hoverData.down, jn = [tt[0] - hr[2], tt[1] - hr[3]], ui = a.dragData.possibleDragElements, aa;
-      if (tr) {
-        var cs = bn[0] - tr[0], ls = cs * cs, oa = bn[1] - tr[1], Bo = oa * oa, za = ls + Bo;
-        a.hoverData.isOverThresholdDrag = aa = za >= a.desktopTapThreshold2;
-      }
-      var ru = d(ne);
-      aa && (a.hoverData.tapholdCancelled = !0);
-      var Mu = function() {
-        var Os = a.hoverData.dragDelta = a.hoverData.dragDelta || [];
-        Os.length === 0 ? (Os.push(jn[0]), Os.push(jn[1])) : (Os[0] += jn[0], Os[1] += jn[1]);
-      };
-      Je = !0, c(Dn, ["mousemove", "vmousemove", "tapdrag"], ne, {
-        x: tt[0],
-        y: tt[1]
-      });
-      var Tl = function() {
-        a.data.bgActivePosistion = void 0, a.hoverData.selecting || Ye.emit({
-          originalEvent: ne,
-          type: "boxstart",
-          position: {
-            x: tt[0],
-            y: tt[1]
-          }
-        }), hr[4] = 1, a.hoverData.selecting = !0, a.redrawHint("select", !0), a.redraw();
-      };
-      if (a.hoverData.which === 3) {
-        if (aa) {
-          var xc = {
-            originalEvent: ne,
-            type: "cxtdrag",
-            position: {
-              x: tt[0],
-              y: tt[1]
-            }
-          };
-          wn ? wn.emit(xc) : Ye.emit(xc), a.hoverData.cxtDragged = !0, (!a.hoverData.cxtOver || Dn !== a.hoverData.cxtOver) && (a.hoverData.cxtOver && a.hoverData.cxtOver.emit({
-            originalEvent: ne,
-            type: "cxtdragout",
-            position: {
-              x: tt[0],
-              y: tt[1]
-            }
-          }), a.hoverData.cxtOver = Dn, Dn && Dn.emit({
-            originalEvent: ne,
-            type: "cxtdragover",
-            position: {
-              x: tt[0],
-              y: tt[1]
-            }
-          }));
-        }
-      } else if (a.hoverData.dragging) {
-        if (Je = !0, Ye.panningEnabled() && Ye.userPanningEnabled()) {
-          var Ll;
-          if (a.hoverData.justStartedPan) {
-            var Vh = a.hoverData.mdownPos;
-            Ll = {
-              x: (tt[0] - Vh[0]) * Fe,
-              y: (tt[1] - Vh[1]) * Fe
-            }, a.hoverData.justStartedPan = !1;
-          } else
-            Ll = {
-              x: jn[0] * Fe,
-              y: jn[1] * Fe
-            };
-          Ye.panBy(Ll), Ye.emit("dragpan"), a.hoverData.dragged = !0;
-        }
-        tt = a.projectIntoViewport(ne.clientX, ne.clientY);
-      } else if (hr[4] == 1 && (wn == null || wn.pannable())) {
-        if (aa) {
-          if (!a.hoverData.dragging && Ye.boxSelectionEnabled() && (ru || !Ye.panningEnabled() || !Ye.userPanningEnabled()))
-            Tl();
-          else if (!a.hoverData.selecting && Ye.panningEnabled() && Ye.userPanningEnabled()) {
-            var Tc = g(wn, a.hoverData.downs);
-            Tc && (a.hoverData.dragging = !0, a.hoverData.justStartedPan = !0, hr[4] = 0, a.data.bgActivePosistion = Tb(Gt), a.redrawHint("select", !0), a.redraw());
-          }
-          wn && wn.pannable() && wn.active() && wn.unactivate();
-        }
-      } else {
-        if (wn && wn.pannable() && wn.active() && wn.unactivate(), (!wn || !wn.grabbed()) && Dn != rr && (rr && c(rr, ["mouseout", "tapdragout"], ne, {
-          x: tt[0],
-          y: tt[1]
-        }), Dn && c(Dn, ["mouseover", "tapdragover"], ne, {
-          x: tt[0],
-          y: tt[1]
-        }), a.hoverData.last = Dn), wn)
-          if (aa) {
-            if (Ye.boxSelectionEnabled() && ru)
-              wn && wn.grabbed() && (_(ui), wn.emit("freeon"), ui.emit("free"), a.dragData.didDrag && (wn.emit("dragfreeon"), ui.emit("dragfree"))), Tl();
-            else if (wn && wn.grabbed() && a.nodeIsDraggable(wn)) {
-              var eo = !a.dragData.didDrag;
-              eo && a.redrawHint("eles", !0), a.dragData.didDrag = !0, a.hoverData.draggingEles || D(ui, {
-                inDragLayer: !0
-              });
-              var ma = {
-                x: 0,
-                y: 0
-              };
-              if (kt(jn[0]) && kt(jn[1]) && (ma.x += jn[0], ma.y += jn[1], eo)) {
-                var to = a.hoverData.dragDelta;
-                to && kt(to[0]) && kt(to[1]) && (ma.x += to[0], ma.y += to[1]);
-              }
-              a.hoverData.draggingEles = !0, ui.silentShift(ma).emit("position drag"), a.redrawHint("drag", !0), a.redraw();
-            }
-          } else
-            Mu();
-        Je = !0;
-      }
-      if (hr[2] = tt[0], hr[3] = tt[1], Je)
-        return ne.stopPropagation && ne.stopPropagation(), ne.preventDefault && ne.preventDefault(), !1;
-    }
-  }, !1);
-  var ae, oe, J;
-  a.registerBinding(r, "mouseup", function(ne) {
-    var Ie = a.hoverData.capture;
-    if (Ie) {
-      a.hoverData.capture = !1;
-      var Je = a.cy, Ye = a.projectIntoViewport(ne.clientX, ne.clientY), Fe = a.selection, bn = a.findNearestElement(Ye[0], Ye[1], !0, !1), tt = a.dragData.possibleDragElements, Gt = a.hoverData.down, tr = d(ne);
-      if (a.data.bgActivePosistion && (a.redrawHint("select", !0), a.redraw()), a.hoverData.tapholdCancelled = !0, a.data.bgActivePosistion = void 0, Gt && Gt.unactivate(), a.hoverData.which === 3) {
-        var hr = {
-          originalEvent: ne,
-          type: "cxttapend",
-          position: {
-            x: Ye[0],
-            y: Ye[1]
-          }
-        };
-        if (Gt ? Gt.emit(hr) : Je.emit(hr), !a.hoverData.cxtDragged) {
-          var Dn = {
-            originalEvent: ne,
-            type: "cxttap",
-            position: {
-              x: Ye[0],
-              y: Ye[1]
-            }
-          };
-          Gt ? Gt.emit(Dn) : Je.emit(Dn);
-        }
-        a.hoverData.cxtDragged = !1, a.hoverData.which = null;
-      } else if (a.hoverData.which === 1) {
-        if (c(bn, ["mouseup", "tapend", "vmouseup"], ne, {
-          x: Ye[0],
-          y: Ye[1]
-        }), !a.dragData.didDrag && // didn't move a node around
-        !a.hoverData.dragged && // didn't pan
-        !a.hoverData.selecting && // not box selection
-        !a.hoverData.isOverThresholdDrag && (c(Gt, ["click", "tap", "vclick"], ne, {
-          x: Ye[0],
-          y: Ye[1]
-        }), oe = !1, ne.timeStamp - J <= Je.multiClickDebounceTime() ? (ae && clearTimeout(ae), oe = !0, J = null, c(Gt, ["dblclick", "dbltap", "vdblclick"], ne, {
-          x: Ye[0],
-          y: Ye[1]
-        })) : (ae = setTimeout(function() {
-          oe || c(Gt, ["oneclick", "onetap", "voneclick"], ne, {
-            x: Ye[0],
-            y: Ye[1]
-          });
-        }, Je.multiClickDebounceTime()), J = ne.timeStamp)), Gt == null && !a.dragData.didDrag && !a.hoverData.selecting && !a.hoverData.dragged && !d(ne) && (Je.$(u).unselect(["tapunselect"]), tt.length > 0 && a.redrawHint("eles", !0), a.dragData.possibleDragElements = tt = Je.collection()), bn == Gt && !a.dragData.didDrag && !a.hoverData.selecting && bn != null && bn._private.selectable && (a.hoverData.dragging || (Je.selectionType() === "additive" || tr ? bn.selected() ? bn.unselect(["tapunselect"]) : bn.select(["tapselect"]) : tr || (Je.$(u).unmerge(bn).unselect(["tapunselect"]), bn.select(["tapselect"]))), a.redrawHint("eles", !0)), a.hoverData.selecting) {
-          var rr = Je.collection(a.getAllInBox(Fe[0], Fe[1], Fe[2], Fe[3]));
-          a.redrawHint("select", !0), rr.length > 0 && a.redrawHint("eles", !0), Je.emit({
-            type: "boxend",
-            originalEvent: ne,
-            position: {
-              x: Ye[0],
-              y: Ye[1]
-            }
-          });
-          var wn = function(aa) {
-            return aa.selectable() && !aa.selected();
-          };
-          Je.selectionType() === "additive" || tr || Je.$(u).unmerge(rr).unselect(), rr.emit("box").stdFilter(wn).select().emit("boxselect"), a.redraw();
-        }
-        if (a.hoverData.dragging && (a.hoverData.dragging = !1, a.redrawHint("select", !0), a.redrawHint("eles", !0), a.redraw()), !Fe[4]) {
-          a.redrawHint("drag", !0), a.redrawHint("eles", !0);
-          var jn = Gt && Gt.grabbed();
-          _(tt), jn && (Gt.emit("freeon"), tt.emit("free"), a.dragData.didDrag && (Gt.emit("dragfreeon"), tt.emit("dragfree")));
-        }
-      }
-      Fe[4] = 0, a.hoverData.down = null, a.hoverData.cxtStarted = !1, a.hoverData.draggingEles = !1, a.hoverData.selecting = !1, a.hoverData.isOverThresholdDrag = !1, a.dragData.didDrag = !1, a.hoverData.dragged = !1, a.hoverData.dragDelta = [], a.hoverData.mdownPos = null, a.hoverData.mdownGPos = null;
-    }
-  }, !1);
-  var fe = function(ne) {
-    if (!a.scrollingPage) {
-      var Ie = a.cy, Je = Ie.zoom(), Ye = Ie.pan(), Fe = a.projectIntoViewport(ne.clientX, ne.clientY), bn = [Fe[0] * Je + Ye.x, Fe[1] * Je + Ye.y];
-      if (a.hoverData.draggingEles || a.hoverData.dragging || a.hoverData.cxtStarted || ee()) {
-        ne.preventDefault();
-        return;
-      }
-      if (Ie.panningEnabled() && Ie.userPanningEnabled() && Ie.zoomingEnabled() && Ie.userZoomingEnabled()) {
-        ne.preventDefault(), a.data.wheelZooming = !0, clearTimeout(a.data.wheelTimeout), a.data.wheelTimeout = setTimeout(function() {
-          a.data.wheelZooming = !1, a.redrawHint("eles", !0), a.redraw();
-        }, 150);
-        var tt;
-        ne.deltaY != null ? tt = ne.deltaY / -250 : ne.wheelDeltaY != null ? tt = ne.wheelDeltaY / 1e3 : tt = ne.wheelDelta / 1e3, tt = tt * a.wheelSensitivity;
-        var Gt = ne.deltaMode === 1;
-        Gt && (tt *= 33);
-        var tr = Ie.zoom() * Math.pow(10, tt);
-        ne.type === "gesturechange" && (tr = a.gestureStartZoom * ne.scale), Ie.zoom({
-          level: tr,
-          renderedPosition: {
-            x: bn[0],
-            y: bn[1]
-          }
-        }), Ie.emit(ne.type === "gesturechange" ? "pinchzoom" : "scrollzoom");
-      }
-    }
-  };
-  a.registerBinding(a.container, "wheel", fe, !0), a.registerBinding(r, "scroll", function(ne) {
-    a.scrollingPage = !0, clearTimeout(a.scrollingPageTimeout), a.scrollingPageTimeout = setTimeout(function() {
-      a.scrollingPage = !1;
-    }, 250);
-  }, !0), a.registerBinding(a.container, "gesturestart", function(ne) {
-    a.gestureStartZoom = a.cy.zoom(), a.hasTouchStarted || ne.preventDefault();
-  }, !0), a.registerBinding(a.container, "gesturechange", function(Qe) {
-    a.hasTouchStarted || fe(Qe);
-  }, !0), a.registerBinding(a.container, "mouseout", function(ne) {
-    var Ie = a.projectIntoViewport(ne.clientX, ne.clientY);
-    a.cy.emit({
-      originalEvent: ne,
-      type: "mouseout",
-      position: {
-        x: Ie[0],
-        y: Ie[1]
-      }
-    });
-  }, !1), a.registerBinding(a.container, "mouseover", function(ne) {
-    var Ie = a.projectIntoViewport(ne.clientX, ne.clientY);
-    a.cy.emit({
-      originalEvent: ne,
-      type: "mouseover",
-      position: {
-        x: Ie[0],
-        y: Ie[1]
-      }
-    });
-  }, !1);
-  var se, pe, he, de, ke, Pe, Ae, Te, Oe, ze, We, $e, Ge, me = function(ne, Ie, Je, Ye) {
-    return Math.sqrt((Je - ne) * (Je - ne) + (Ye - Ie) * (Ye - Ie));
-  }, Ve = function(ne, Ie, Je, Ye) {
-    return (Je - ne) * (Je - ne) + (Ye - Ie) * (Ye - Ie);
-  }, Ke;
-  a.registerBinding(a.container, "touchstart", Ke = function(ne) {
-    if (a.hasTouchStarted = !0, !!Z(ne)) {
-      $(), a.touchData.capture = !0, a.data.bgActivePosistion = void 0;
-      var Ie = a.cy, Je = a.touchData.now, Ye = a.touchData.earlier;
-      if (ne.touches[0]) {
-        var Fe = a.projectIntoViewport(ne.touches[0].clientX, ne.touches[0].clientY);
-        Je[0] = Fe[0], Je[1] = Fe[1];
-      }
-      if (ne.touches[1]) {
-        var Fe = a.projectIntoViewport(ne.touches[1].clientX, ne.touches[1].clientY);
-        Je[2] = Fe[0], Je[3] = Fe[1];
-      }
-      if (ne.touches[2]) {
-        var Fe = a.projectIntoViewport(ne.touches[2].clientX, ne.touches[2].clientY);
-        Je[4] = Fe[0], Je[5] = Fe[1];
-      }
-      if (ne.touches[1]) {
-        a.touchData.singleTouchMoved = !0, _(a.dragData.touchDragEles);
-        var bn = a.findContainerClientCoords();
-        Oe = bn[0], ze = bn[1], We = bn[2], $e = bn[3], se = ne.touches[0].clientX - Oe, pe = ne.touches[0].clientY - ze, he = ne.touches[1].clientX - Oe, de = ne.touches[1].clientY - ze, Ge = 0 <= se && se <= We && 0 <= he && he <= We && 0 <= pe && pe <= $e && 0 <= de && de <= $e;
-        var tt = Ie.pan(), Gt = Ie.zoom();
-        ke = me(se, pe, he, de), Pe = Ve(se, pe, he, de), Ae = [(se + he) / 2, (pe + de) / 2], Te = [(Ae[0] - tt.x) / Gt, (Ae[1] - tt.y) / Gt];
-        var tr = 200, hr = tr * tr;
-        if (Pe < hr && !ne.touches[2]) {
-          var Dn = a.findNearestElement(Je[0], Je[1], !0, !0), rr = a.findNearestElement(Je[2], Je[3], !0, !0);
-          Dn && Dn.isNode() ? (Dn.activate().emit({
-            originalEvent: ne,
-            type: "cxttapstart",
-            position: {
-              x: Je[0],
-              y: Je[1]
-            }
-          }), a.touchData.start = Dn) : rr && rr.isNode() ? (rr.activate().emit({
-            originalEvent: ne,
-            type: "cxttapstart",
-            position: {
-              x: Je[0],
-              y: Je[1]
-            }
-          }), a.touchData.start = rr) : Ie.emit({
-            originalEvent: ne,
-            type: "cxttapstart",
-            position: {
-              x: Je[0],
-              y: Je[1]
-            }
-          }), a.touchData.start && (a.touchData.start._private.grabbed = !1), a.touchData.cxt = !0, a.touchData.cxtDragged = !1, a.data.bgActivePosistion = void 0, a.redraw();
-          return;
-        }
-      }
-      if (ne.touches[2])
-        Ie.boxSelectionEnabled() && ne.preventDefault();
-      else if (!ne.touches[1]) {
-        if (ne.touches[0]) {
-          var wn = a.findNearestElements(Je[0], Je[1], !0, !0), jn = wn[0];
-          if (jn != null && (jn.activate(), a.touchData.start = jn, a.touchData.starts = wn, a.nodeIsGrabbable(jn))) {
-            var ui = a.dragData.touchDragEles = Ie.collection(), aa = null;
-            a.redrawHint("eles", !0), a.redrawHint("drag", !0), jn.selected() ? (aa = Ie.$(function(za) {
-              return za.selected() && a.nodeIsGrabbable(za);
-            }), D(aa, {
-              addToList: ui
-            })) : H(jn, {
-              addToList: ui
-            }), C(jn);
-            var cs = function(ru) {
-              return {
-                originalEvent: ne,
-                type: ru,
-                position: {
-                  x: Je[0],
-                  y: Je[1]
-                }
-              };
-            };
-            jn.emit(cs("grabon")), aa ? aa.forEach(function(za) {
-              za.emit(cs("grab"));
-            }) : jn.emit(cs("grab"));
-          }
-          c(jn, ["touchstart", "tapstart", "vmousedown"], ne, {
-            x: Je[0],
-            y: Je[1]
-          }), jn == null && (a.data.bgActivePosistion = {
-            x: Fe[0],
-            y: Fe[1]
-          }, a.redrawHint("select", !0), a.redraw()), a.touchData.singleTouchMoved = !1, a.touchData.singleTouchStartTime = +/* @__PURE__ */ new Date(), clearTimeout(a.touchData.tapholdTimeout), a.touchData.tapholdTimeout = setTimeout(function() {
-            a.touchData.singleTouchMoved === !1 && !a.pinching && !a.touchData.selecting && c(a.touchData.start, ["taphold"], ne, {
-              x: Je[0],
-              y: Je[1]
-            });
-          }, a.tapholdDuration);
-        }
-      }
-      if (ne.touches.length >= 1) {
-        for (var ls = a.touchData.startPosition = [null, null, null, null, null, null], oa = 0; oa < Je.length; oa++)
-          ls[oa] = Ye[oa] = Je[oa];
-        var Bo = ne.touches[0];
-        a.touchData.startGPosition = [Bo.clientX, Bo.clientY];
-      }
-    }
-  }, !1);
-  var at;
-  a.registerBinding(window, "touchmove", at = function(ne) {
-    var Ie = a.touchData.capture;
-    if (!(!Ie && !Z(ne))) {
-      var Je = a.selection, Ye = a.cy, Fe = a.touchData.now, bn = a.touchData.earlier, tt = Ye.zoom();
-      if (ne.touches[0]) {
-        var Gt = a.projectIntoViewport(ne.touches[0].clientX, ne.touches[0].clientY);
-        Fe[0] = Gt[0], Fe[1] = Gt[1];
-      }
-      if (ne.touches[1]) {
-        var Gt = a.projectIntoViewport(ne.touches[1].clientX, ne.touches[1].clientY);
-        Fe[2] = Gt[0], Fe[3] = Gt[1];
-      }
-      if (ne.touches[2]) {
-        var Gt = a.projectIntoViewport(ne.touches[2].clientX, ne.touches[2].clientY);
-        Fe[4] = Gt[0], Fe[5] = Gt[1];
-      }
-      var tr = a.touchData.startGPosition, hr;
-      if (Ie && ne.touches[0] && tr) {
-        for (var Dn = [], rr = 0; rr < Fe.length; rr++)
-          Dn[rr] = Fe[rr] - bn[rr];
-        var wn = ne.touches[0].clientX - tr[0], jn = wn * wn, ui = ne.touches[0].clientY - tr[1], aa = ui * ui, cs = jn + aa;
-        hr = cs >= a.touchTapThreshold2;
-      }
-      if (Ie && a.touchData.cxt) {
-        ne.preventDefault();
-        var ls = ne.touches[0].clientX - Oe, oa = ne.touches[0].clientY - ze, Bo = ne.touches[1].clientX - Oe, za = ne.touches[1].clientY - ze, ru = Ve(ls, oa, Bo, za), Mu = ru / Pe, Tl = 150, xc = Tl * Tl, Ll = 1.5, Vh = Ll * Ll;
-        if (Mu >= Vh || ru >= xc) {
-          a.touchData.cxt = !1, a.data.bgActivePosistion = void 0, a.redrawHint("select", !0);
-          var Tc = {
-            originalEvent: ne,
-            type: "cxttapend",
-            position: {
-              x: Fe[0],
-              y: Fe[1]
-            }
-          };
-          a.touchData.start ? (a.touchData.start.unactivate().emit(Tc), a.touchData.start = null) : Ye.emit(Tc);
-        }
-      }
-      if (Ie && a.touchData.cxt) {
-        var Tc = {
-          originalEvent: ne,
-          type: "cxtdrag",
-          position: {
-            x: Fe[0],
-            y: Fe[1]
-          }
-        };
-        a.data.bgActivePosistion = void 0, a.redrawHint("select", !0), a.touchData.start ? a.touchData.start.emit(Tc) : Ye.emit(Tc), a.touchData.start && (a.touchData.start._private.grabbed = !1), a.touchData.cxtDragged = !0;
-        var eo = a.findNearestElement(Fe[0], Fe[1], !0, !0);
-        (!a.touchData.cxtOver || eo !== a.touchData.cxtOver) && (a.touchData.cxtOver && a.touchData.cxtOver.emit({
-          originalEvent: ne,
-          type: "cxtdragout",
-          position: {
-            x: Fe[0],
-            y: Fe[1]
-          }
-        }), a.touchData.cxtOver = eo, eo && eo.emit({
-          originalEvent: ne,
-          type: "cxtdragover",
-          position: {
-            x: Fe[0],
-            y: Fe[1]
-          }
-        }));
-      } else if (Ie && ne.touches[2] && Ye.boxSelectionEnabled())
-        ne.preventDefault(), a.data.bgActivePosistion = void 0, this.lastThreeTouch = +/* @__PURE__ */ new Date(), a.touchData.selecting || Ye.emit({
-          originalEvent: ne,
-          type: "boxstart",
-          position: {
-            x: Fe[0],
-            y: Fe[1]
-          }
-        }), a.touchData.selecting = !0, a.touchData.didSelect = !0, Je[4] = 1, !Je || Je.length === 0 || Je[0] === void 0 ? (Je[0] = (Fe[0] + Fe[2] + Fe[4]) / 3, Je[1] = (Fe[1] + Fe[3] + Fe[5]) / 3, Je[2] = (Fe[0] + Fe[2] + Fe[4]) / 3 + 1, Je[3] = (Fe[1] + Fe[3] + Fe[5]) / 3 + 1) : (Je[2] = (Fe[0] + Fe[2] + Fe[4]) / 3, Je[3] = (Fe[1] + Fe[3] + Fe[5]) / 3), a.redrawHint("select", !0), a.redraw();
-      else if (Ie && ne.touches[1] && !a.touchData.didSelect && Ye.zoomingEnabled() && Ye.panningEnabled() && Ye.userZoomingEnabled() && Ye.userPanningEnabled()) {
-        ne.preventDefault(), a.data.bgActivePosistion = void 0, a.redrawHint("select", !0);
-        var ma = a.dragData.touchDragEles;
-        if (ma) {
-          a.redrawHint("drag", !0);
-          for (var to = 0; to < ma.length; to++) {
-            var Wh = ma[to]._private;
-            Wh.grabbed = !1, Wh.rscratch.inDragLayer = !1;
-          }
-        }
-        var Os = a.touchData.start, ls = ne.touches[0].clientX - Oe, oa = ne.touches[0].clientY - ze, Bo = ne.touches[1].clientX - Oe, za = ne.touches[1].clientY - ze, qb = me(ls, oa, Bo, za), bw = qb / ke;
-        if (Ge) {
-          var pw = ls - se, ww = oa - pe, mw = Bo - he, yw = za - de, kw = (pw + mw) / 2, Ew = (ww + yw) / 2, Tf = Ye.zoom(), yv = Tf * bw, Uh = Ye.pan(), Vb = Te[0] * Tf + Uh.x, Wb = Te[1] * Tf + Uh.y, Sw = {
-            x: -yv / Tf * (Vb - Uh.x - kw) + Vb,
-            y: -yv / Tf * (Wb - Uh.y - Ew) + Wb
-          };
-          if (Os && Os.active()) {
-            var ma = a.dragData.touchDragEles;
-            _(ma), a.redrawHint("drag", !0), a.redrawHint("eles", !0), Os.unactivate().emit("freeon"), ma.emit("free"), a.dragData.didDrag && (Os.emit("dragfreeon"), ma.emit("dragfree"));
-          }
-          Ye.viewport({
-            zoom: yv,
-            pan: Sw,
-            cancelOnFailedZoom: !0
-          }), Ye.emit("pinchzoom"), ke = qb, se = ls, pe = oa, he = Bo, de = za, a.pinching = !0;
-        }
-        if (ne.touches[0]) {
-          var Gt = a.projectIntoViewport(ne.touches[0].clientX, ne.touches[0].clientY);
-          Fe[0] = Gt[0], Fe[1] = Gt[1];
-        }
-        if (ne.touches[1]) {
-          var Gt = a.projectIntoViewport(ne.touches[1].clientX, ne.touches[1].clientY);
-          Fe[2] = Gt[0], Fe[3] = Gt[1];
-        }
-        if (ne.touches[2]) {
-          var Gt = a.projectIntoViewport(ne.touches[2].clientX, ne.touches[2].clientY);
-          Fe[4] = Gt[0], Fe[5] = Gt[1];
-        }
-      } else if (ne.touches[0] && !a.touchData.didSelect) {
-        var no = a.touchData.start, kv = a.touchData.last, eo;
-        if (!a.hoverData.draggingEles && !a.swipePanning && (eo = a.findNearestElement(Fe[0], Fe[1], !0, !0)), Ie && no != null && ne.preventDefault(), Ie && no != null && a.nodeIsDraggable(no))
-          if (hr) {
-            var ma = a.dragData.touchDragEles, Ub = !a.dragData.didDrag;
-            Ub && D(ma, {
-              inDragLayer: !0
-            }), a.dragData.didDrag = !0;
-            var Kh = {
-              x: 0,
-              y: 0
-            };
-            if (kt(Dn[0]) && kt(Dn[1]) && (Kh.x += Dn[0], Kh.y += Dn[1], Ub)) {
-              a.redrawHint("eles", !0);
-              var fs = a.touchData.dragDelta;
-              fs && kt(fs[0]) && kt(fs[1]) && (Kh.x += fs[0], Kh.y += fs[1]);
-            }
-            a.hoverData.draggingEles = !0, ma.silentShift(Kh).emit("position drag"), a.redrawHint("drag", !0), a.touchData.startPosition[0] == bn[0] && a.touchData.startPosition[1] == bn[1] && a.redrawHint("eles", !0), a.redraw();
-          } else {
-            var fs = a.touchData.dragDelta = a.touchData.dragDelta || [];
-            fs.length === 0 ? (fs.push(Dn[0]), fs.push(Dn[1])) : (fs[0] += Dn[0], fs[1] += Dn[1]);
-          }
-        if (c(no || eo, ["touchmove", "tapdrag", "vmousemove"], ne, {
-          x: Fe[0],
-          y: Fe[1]
-        }), (!no || !no.grabbed()) && eo != kv && (kv && kv.emit({
-          originalEvent: ne,
-          type: "tapdragout",
-          position: {
-            x: Fe[0],
-            y: Fe[1]
-          }
-        }), eo && eo.emit({
-          originalEvent: ne,
-          type: "tapdragover",
-          position: {
-            x: Fe[0],
-            y: Fe[1]
-          }
-        })), a.touchData.last = eo, Ie)
-          for (var to = 0; to < Fe.length; to++)
-            Fe[to] && a.touchData.startPosition[to] && hr && (a.touchData.singleTouchMoved = !0);
-        if (Ie && (no == null || no.pannable()) && Ye.panningEnabled() && Ye.userPanningEnabled()) {
-          var Cw = g(no, a.touchData.starts);
-          Cw && (ne.preventDefault(), a.data.bgActivePosistion || (a.data.bgActivePosistion = Tb(a.touchData.startPosition)), a.swipePanning ? (Ye.panBy({
-            x: Dn[0] * tt,
-            y: Dn[1] * tt
-          }), Ye.emit("dragpan")) : hr && (a.swipePanning = !0, Ye.panBy({
-            x: wn * tt,
-            y: ui * tt
-          }), Ye.emit("dragpan"), no && (no.unactivate(), a.redrawHint("select", !0), a.touchData.start = null)));
-          var Gt = a.projectIntoViewport(ne.touches[0].clientX, ne.touches[0].clientY);
-          Fe[0] = Gt[0], Fe[1] = Gt[1];
-        }
-      }
-      for (var rr = 0; rr < Fe.length; rr++)
-        bn[rr] = Fe[rr];
-      Ie && ne.touches.length > 0 && !a.hoverData.draggingEles && !a.swipePanning && a.data.bgActivePosistion != null && (a.data.bgActivePosistion = void 0, a.redrawHint("select", !0), a.redraw());
-    }
-  }, !1);
-  var ft;
-  a.registerBinding(r, "touchcancel", ft = function(ne) {
-    var Ie = a.touchData.start;
-    a.touchData.capture = !1, Ie && Ie.unactivate();
-  });
-  var en, gn, mt, ht;
-  if (a.registerBinding(r, "touchend", en = function(ne) {
-    var Ie = a.touchData.start, Je = a.touchData.capture;
-    if (Je)
-      ne.touches.length === 0 && (a.touchData.capture = !1), ne.preventDefault();
-    else
-      return;
-    var Ye = a.selection;
-    a.swipePanning = !1, a.hoverData.draggingEles = !1;
-    var Fe = a.cy, bn = Fe.zoom(), tt = a.touchData.now, Gt = a.touchData.earlier;
-    if (ne.touches[0]) {
-      var tr = a.projectIntoViewport(ne.touches[0].clientX, ne.touches[0].clientY);
-      tt[0] = tr[0], tt[1] = tr[1];
-    }
-    if (ne.touches[1]) {
-      var tr = a.projectIntoViewport(ne.touches[1].clientX, ne.touches[1].clientY);
-      tt[2] = tr[0], tt[3] = tr[1];
-    }
-    if (ne.touches[2]) {
-      var tr = a.projectIntoViewport(ne.touches[2].clientX, ne.touches[2].clientY);
-      tt[4] = tr[0], tt[5] = tr[1];
-    }
-    Ie && Ie.unactivate();
-    var hr;
-    if (a.touchData.cxt) {
-      if (hr = {
-        originalEvent: ne,
-        type: "cxttapend",
-        position: {
-          x: tt[0],
-          y: tt[1]
-        }
-      }, Ie ? Ie.emit(hr) : Fe.emit(hr), !a.touchData.cxtDragged) {
-        var Dn = {
-          originalEvent: ne,
-          type: "cxttap",
-          position: {
-            x: tt[0],
-            y: tt[1]
-          }
-        };
-        Ie ? Ie.emit(Dn) : Fe.emit(Dn);
-      }
-      a.touchData.start && (a.touchData.start._private.grabbed = !1), a.touchData.cxt = !1, a.touchData.start = null, a.redraw();
-      return;
-    }
-    if (!ne.touches[2] && Fe.boxSelectionEnabled() && a.touchData.selecting) {
-      a.touchData.selecting = !1;
-      var rr = Fe.collection(a.getAllInBox(Ye[0], Ye[1], Ye[2], Ye[3]));
-      Ye[0] = void 0, Ye[1] = void 0, Ye[2] = void 0, Ye[3] = void 0, Ye[4] = 0, a.redrawHint("select", !0), Fe.emit({
-        type: "boxend",
-        originalEvent: ne,
-        position: {
-          x: tt[0],
-          y: tt[1]
-        }
-      });
-      var wn = function(xc) {
-        return xc.selectable() && !xc.selected();
-      };
-      rr.emit("box").stdFilter(wn).select().emit("boxselect"), rr.nonempty() && a.redrawHint("eles", !0), a.redraw();
-    }
-    if (Ie != null && Ie.unactivate(), ne.touches[2])
-      a.data.bgActivePosistion = void 0, a.redrawHint("select", !0);
-    else if (!ne.touches[1]) {
-      if (!ne.touches[0]) {
-        if (!ne.touches[0]) {
-          a.data.bgActivePosistion = void 0, a.redrawHint("select", !0);
-          var jn = a.dragData.touchDragEles;
-          if (Ie != null) {
-            var ui = Ie._private.grabbed;
-            _(jn), a.redrawHint("drag", !0), a.redrawHint("eles", !0), ui && (Ie.emit("freeon"), jn.emit("free"), a.dragData.didDrag && (Ie.emit("dragfreeon"), jn.emit("dragfree"))), c(Ie, ["touchend", "tapend", "vmouseup", "tapdragout"], ne, {
-              x: tt[0],
-              y: tt[1]
-            }), Ie.unactivate(), a.touchData.start = null;
-          } else {
-            var aa = a.findNearestElement(tt[0], tt[1], !0, !0);
-            c(aa, ["touchend", "tapend", "vmouseup", "tapdragout"], ne, {
-              x: tt[0],
-              y: tt[1]
-            });
-          }
-          var cs = a.touchData.startPosition[0] - tt[0], ls = cs * cs, oa = a.touchData.startPosition[1] - tt[1], Bo = oa * oa, za = ls + Bo, ru = za * bn * bn;
-          a.touchData.singleTouchMoved || (Ie || Fe.$(":selected").unselect(["tapunselect"]), c(Ie, ["tap", "vclick"], ne, {
-            x: tt[0],
-            y: tt[1]
-          }), gn = !1, ne.timeStamp - ht <= Fe.multiClickDebounceTime() ? (mt && clearTimeout(mt), gn = !0, ht = null, c(Ie, ["dbltap", "vdblclick"], ne, {
-            x: tt[0],
-            y: tt[1]
-          })) : (mt = setTimeout(function() {
-            gn || c(Ie, ["onetap", "voneclick"], ne, {
-              x: tt[0],
-              y: tt[1]
-            });
-          }, Fe.multiClickDebounceTime()), ht = ne.timeStamp)), Ie != null && !a.dragData.didDrag && Ie._private.selectable && ru < a.touchTapThreshold2 && !a.pinching && (Fe.selectionType() === "single" ? (Fe.$(u).unmerge(Ie).unselect(["tapunselect"]), Ie.select(["tapselect"])) : Ie.selected() ? Ie.unselect(["tapunselect"]) : Ie.select(["tapselect"]), a.redrawHint("eles", !0)), a.touchData.singleTouchMoved = !0;
-        }
-      }
-    }
-    for (var Mu = 0; Mu < tt.length; Mu++)
-      Gt[Mu] = tt[Mu];
-    a.dragData.didDrag = !1, ne.touches.length === 0 && (a.touchData.dragDelta = [], a.touchData.startPosition = [null, null, null, null, null, null], a.touchData.startGPosition = null, a.touchData.didSelect = !1), ne.touches.length < 2 && (ne.touches.length === 1 && (a.touchData.startGPosition = [ne.touches[0].clientX, ne.touches[0].clientY]), a.pinching = !1, a.redrawHint("eles", !0), a.redraw());
-  }, !1), typeof TouchEvent > "u") {
-    var Rt = [], Lt = function(ne) {
-      return {
-        clientX: ne.clientX,
-        clientY: ne.clientY,
-        force: 1,
-        identifier: ne.pointerId,
-        pageX: ne.pageX,
-        pageY: ne.pageY,
-        radiusX: ne.width / 2,
-        radiusY: ne.height / 2,
-        screenX: ne.screenX,
-        screenY: ne.screenY,
-        target: ne.target
-      };
-    }, yt = function(ne) {
-      return {
-        event: ne,
-        touch: Lt(ne)
-      };
-    }, Mt = function(ne) {
-      Rt.push(yt(ne));
-    }, In = function(ne) {
-      for (var Ie = 0; Ie < Rt.length; Ie++) {
-        var Je = Rt[Ie];
-        if (Je.event.pointerId === ne.pointerId) {
-          Rt.splice(Ie, 1);
-          return;
-        }
-      }
-    }, Pn = function(ne) {
-      var Ie = Rt.filter(function(Je) {
-        return Je.event.pointerId === ne.pointerId;
-      })[0];
-      Ie.event = ne, Ie.touch = Lt(ne);
-    }, Vt = function(ne) {
-      ne.touches = Rt.map(function(Ie) {
-        return Ie.touch;
-      });
-    }, ar = function(ne) {
-      return ne.pointerType === "mouse" || ne.pointerType === 4;
-    };
-    a.registerBinding(a.container, "pointerdown", function(Qe) {
-      ar(Qe) || (Qe.preventDefault(), Mt(Qe), Vt(Qe), Ke(Qe));
-    }), a.registerBinding(a.container, "pointerup", function(Qe) {
-      ar(Qe) || (In(Qe), Vt(Qe), en(Qe));
-    }), a.registerBinding(a.container, "pointercancel", function(Qe) {
-      ar(Qe) || (In(Qe), Vt(Qe), ft(Qe));
-    }), a.registerBinding(a.container, "pointermove", function(Qe) {
-      ar(Qe) || (Qe.preventDefault(), Pn(Qe), Vt(Qe), at(Qe));
-    });
-  }
-};
-var Cf = {};
-Cf.generatePolygon = function(a, r) {
-  return this.nodeShapes[a] = {
-    renderer: this,
-    name: a,
-    points: r,
-    draw: function(c, d, g, b, y) {
-      this.renderer.nodeShapeImpl("polygon", c, d, g, b, y, this.points);
-    },
-    intersectLine: function(c, d, g, b, y, k, E) {
-      return Jp(y, k, this.points, c, d, g / 2, b / 2, E);
-    },
-    checkPoint: function(c, d, g, b, y, k, E) {
-      return Ef(c, d, this.points, k, E, b, y, [0, -1], g);
-    }
-  };
-};
-Cf.generateEllipse = function() {
-  return this.nodeShapes.ellipse = {
-    renderer: this,
-    name: "ellipse",
-    draw: function(r, u, c, d, g) {
-      this.renderer.nodeShapeImpl(this.name, r, u, c, d, g);
-    },
-    intersectLine: function(r, u, c, d, g, b, y) {
-      return kse(g, b, r, u, c / 2 + y, d / 2 + y);
-    },
-    checkPoint: function(r, u, c, d, g, b, y) {
-      return lv(r, u, d, g, b, y, c);
-    }
-  };
-};
-Cf.generateRoundPolygon = function(a, r) {
-  for (var u = new Array(r.length * 2), c = 0; c < r.length / 2; c++) {
-    var d = c * 2, g = void 0;
-    c < r.length / 2 - 1 ? g = (c + 1) * 2 : g = 0, u[c * 4] = r[d], u[c * 4 + 1] = r[d + 1];
-    var b = r[g] - r[d], y = r[g + 1] - r[d + 1], k = Math.sqrt(b * b + y * y);
-    u[c * 4 + 2] = b / k, u[c * 4 + 3] = y / k;
-  }
-  return this.nodeShapes[a] = {
-    renderer: this,
-    name: a,
-    points: u,
-    draw: function(C, T, P, N, D) {
-      this.renderer.nodeShapeImpl("round-polygon", C, T, P, N, D, this.points);
-    },
-    intersectLine: function(C, T, P, N, D, H, _) {
-      return Ese(D, H, this.points, C, T, P, N);
-    },
-    checkPoint: function(C, T, P, N, D, H, _) {
-      return yse(C, T, this.points, H, _, N, D);
-    }
-  };
-};
-Cf.generateRoundRectangle = function() {
-  return this.nodeShapes["round-rectangle"] = this.nodeShapes.roundrectangle = {
-    renderer: this,
-    name: "round-rectangle",
-    points: us(4, 0),
-    draw: function(r, u, c, d, g) {
-      this.renderer.nodeShapeImpl(this.name, r, u, c, d, g);
-    },
-    intersectLine: function(r, u, c, d, g, b, y) {
-      return n$(g, b, r, u, c, d, y);
-    },
-    checkPoint: function(r, u, c, d, g, b, y) {
-      var k = lw(d, g), E = k * 2;
-      return !!(Ef(r, u, this.points, b, y, d, g - E, [0, -1], c) || Ef(r, u, this.points, b, y, d - E, g, [0, -1], c) || lv(r, u, E, E, b - d / 2 + k, y - g / 2 + k, c) || lv(r, u, E, E, b + d / 2 - k, y - g / 2 + k, c) || lv(r, u, E, E, b + d / 2 - k, y + g / 2 - k, c) || lv(r, u, E, E, b - d / 2 + k, y + g / 2 - k, c));
-    }
-  };
-};
-Cf.generateCutRectangle = function() {
-  return this.nodeShapes["cut-rectangle"] = this.nodeShapes.cutrectangle = {
-    renderer: this,
-    name: "cut-rectangle",
-    cornerLength: o$(),
-    points: us(4, 0),
-    draw: function(r, u, c, d, g) {
-      this.renderer.nodeShapeImpl(this.name, r, u, c, d, g);
-    },
-    generateCutTrianglePts: function(r, u, c, d) {
-      var g = this.cornerLength, b = u / 2, y = r / 2, k = c - y, E = c + y, C = d - b, T = d + b;
-      return {
-        topLeft: [k, C + g, k + g, C, k + g, C + g],
-        topRight: [E - g, C, E, C + g, E - g, C + g],
-        bottomRight: [E, T - g, E - g, T, E - g, T - g],
-        bottomLeft: [k + g, T, k, T - g, k + g, T - g]
-      };
-    },
-    intersectLine: function(r, u, c, d, g, b, y) {
-      var k = this.generateCutTrianglePts(c + 2 * y, d + 2 * y, r, u), E = [].concat.apply([], [k.topLeft.splice(0, 4), k.topRight.splice(0, 4), k.bottomRight.splice(0, 4), k.bottomLeft.splice(0, 4)]);
-      return Jp(g, b, E, r, u);
-    },
-    checkPoint: function(r, u, c, d, g, b, y) {
-      if (Ef(r, u, this.points, b, y, d, g - 2 * this.cornerLength, [0, -1], c) || Ef(r, u, this.points, b, y, d - 2 * this.cornerLength, g, [0, -1], c))
-        return !0;
-      var k = this.generateCutTrianglePts(d, g, b, y);
-      return Is(r, u, k.topLeft) || Is(r, u, k.topRight) || Is(r, u, k.bottomRight) || Is(r, u, k.bottomLeft);
-    }
-  };
-};
-Cf.generateBarrel = function() {
-  return this.nodeShapes.barrel = {
-    renderer: this,
-    name: "barrel",
-    points: us(4, 0),
-    draw: function(r, u, c, d, g) {
-      this.renderer.nodeShapeImpl(this.name, r, u, c, d, g);
-    },
-    intersectLine: function(r, u, c, d, g, b, y) {
-      var k = 0.15, E = 0.5, C = 0.85, T = this.generateBarrelBezierPts(c + 2 * y, d + 2 * y, r, u), P = function(H) {
-        var _ = Pb({
-          x: H[0],
-          y: H[1]
-        }, {
-          x: H[2],
-          y: H[3]
-        }, {
-          x: H[4],
-          y: H[5]
-        }, k), B = Pb({
-          x: H[0],
-          y: H[1]
-        }, {
-          x: H[2],
-          y: H[3]
-        }, {
-          x: H[4],
-          y: H[5]
-        }, E), $ = Pb({
-          x: H[0],
-          y: H[1]
-        }, {
-          x: H[2],
-          y: H[3]
-        }, {
-          x: H[4],
-          y: H[5]
-        }, C);
-        return [H[0], H[1], _.x, _.y, B.x, B.y, $.x, $.y, H[4], H[5]];
-      }, N = [].concat(P(T.topLeft), P(T.topRight), P(T.bottomRight), P(T.bottomLeft));
-      return Jp(g, b, N, r, u);
-    },
-    generateBarrelBezierPts: function(r, u, c, d) {
-      var g = u / 2, b = r / 2, y = c - b, k = c + b, E = d - g, C = d + g, T = l6(r, u), P = T.heightOffset, N = T.widthOffset, D = T.ctrlPtOffsetPct * r, H = {
-        topLeft: [y, E + P, y + D, E, y + N, E],
-        topRight: [k - N, E, k - D, E, k, E + P],
-        bottomRight: [k, C - P, k - D, C, k - N, C],
-        bottomLeft: [y + N, C, y + D, C, y, C - P]
-      };
-      return H.topLeft.isTop = !0, H.topRight.isTop = !0, H.bottomLeft.isBottom = !0, H.bottomRight.isBottom = !0, H;
-    },
-    checkPoint: function(r, u, c, d, g, b, y) {
-      var k = l6(d, g), E = k.heightOffset, C = k.widthOffset;
-      if (Ef(r, u, this.points, b, y, d, g - 2 * E, [0, -1], c) || Ef(r, u, this.points, b, y, d - 2 * C, g, [0, -1], c))
-        return !0;
-      for (var T = this.generateBarrelBezierPts(d, g, b, y), P = function(K, ee, Z) {
-        var ae = Z[4], oe = Z[2], J = Z[0], fe = Z[5], se = Z[1], pe = Math.min(ae, J), he = Math.max(ae, J), de = Math.min(fe, se), ke = Math.max(fe, se);
-        if (pe <= K && K <= he && de <= ee && ee <= ke) {
-          var Pe = Sse(ae, oe, J), Ae = bse(Pe[0], Pe[1], Pe[2], K), Te = Ae.filter(function(Oe) {
-            return 0 <= Oe && Oe <= 1;
-          });
-          if (Te.length > 0)
-            return Te[0];
-        }
-        return null;
-      }, N = Object.keys(T), D = 0; D < N.length; D++) {
-        var H = N[D], _ = T[H], B = P(r, u, _);
-        if (B != null) {
-          var $ = _[5], F = _[3], W = _[1], Q = Ja($, F, W, B);
-          if (_.isTop && Q <= u || _.isBottom && u <= Q)
-            return !0;
-        }
-      }
-      return !1;
-    }
-  };
-};
-Cf.generateBottomRoundrectangle = function() {
-  return this.nodeShapes["bottom-round-rectangle"] = this.nodeShapes.bottomroundrectangle = {
-    renderer: this,
-    name: "bottom-round-rectangle",
-    points: us(4, 0),
-    draw: function(r, u, c, d, g) {
-      this.renderer.nodeShapeImpl(this.name, r, u, c, d, g);
-    },
-    intersectLine: function(r, u, c, d, g, b, y) {
-      var k = r - (c / 2 + y), E = u - (d / 2 + y), C = E, T = r + (c / 2 + y), P = Ah(g, b, r, u, k, E, T, C, !1);
-      return P.length > 0 ? P : n$(g, b, r, u, c, d, y);
-    },
-    checkPoint: function(r, u, c, d, g, b, y) {
-      var k = lw(d, g), E = 2 * k;
-      if (Ef(r, u, this.points, b, y, d, g - E, [0, -1], c) || Ef(r, u, this.points, b, y, d - E, g, [0, -1], c))
-        return !0;
-      var C = d / 2 + 2 * c, T = g / 2 + 2 * c, P = [b - C, y - T, b - C, y, b + C, y, b + C, y - T];
-      return !!(Is(r, u, P) || lv(r, u, E, E, b + d / 2 - k, y + g / 2 - k, c) || lv(r, u, E, E, b - d / 2 + k, y + g / 2 - k, c));
-    }
-  };
-};
-Cf.registerNodeShapes = function() {
-  var a = this.nodeShapes = {}, r = this;
-  this.generateEllipse(), this.generatePolygon("triangle", us(3, 0)), this.generateRoundPolygon("round-triangle", us(3, 0)), this.generatePolygon("rectangle", us(4, 0)), a.square = a.rectangle, this.generateRoundRectangle(), this.generateCutRectangle(), this.generateBarrel(), this.generateBottomRoundrectangle();
-  {
-    var u = [0, 1, 1, 0, 0, -1, -1, 0];
-    this.generatePolygon("diamond", u), this.generateRoundPolygon("round-diamond", u);
-  }
-  this.generatePolygon("pentagon", us(5, 0)), this.generateRoundPolygon("round-pentagon", us(5, 0)), this.generatePolygon("hexagon", us(6, 0)), this.generateRoundPolygon("round-hexagon", us(6, 0)), this.generatePolygon("heptagon", us(7, 0)), this.generateRoundPolygon("round-heptagon", us(7, 0)), this.generatePolygon("octagon", us(8, 0)), this.generateRoundPolygon("round-octagon", us(8, 0));
-  var c = new Array(20);
-  {
-    var d = c6(5, 0), g = c6(5, Math.PI / 5), b = 0.5 * (3 - Math.sqrt(5));
-    b *= 1.57;
-    for (var y = 0; y < g.length / 2; y++)
-      g[y * 2] *= b, g[y * 2 + 1] *= b;
-    for (var y = 0; y < 20 / 4; y++)
-      c[y * 4] = d[y * 2], c[y * 4 + 1] = d[y * 2 + 1], c[y * 4 + 2] = g[y * 2], c[y * 4 + 3] = g[y * 2 + 1];
-  }
-  c = a$(c), this.generatePolygon("star", c), this.generatePolygon("vee", [-1, -1, 0, -0.333, 1, -1, 0, 1]), this.generatePolygon("rhomboid", [-1, -1, 0.333, -1, 1, 1, -0.333, 1]), this.generatePolygon("right-rhomboid", [-0.333, -1, 1, -1, 0.333, 1, -1, 1]), this.nodeShapes.concavehexagon = this.generatePolygon("concave-hexagon", [-1, -0.95, -0.75, 0, -1, 0.95, 1, 0.95, 0.75, 0, 1, -0.95]);
-  {
-    var k = [-1, -1, 0.25, -1, 1, 0, 0.25, 1, -1, 1];
-    this.generatePolygon("tag", k), this.generateRoundPolygon("round-tag", k);
-  }
-  a.makePolygon = function(E) {
-    var C = E.join("$"), T = "polygon-" + C, P;
-    return (P = this[T]) ? P : r.generatePolygon(T, E);
-  };
-};
-var vw = {};
-vw.timeToRender = function() {
-  return this.redrawTotalTime / this.redrawCount;
-};
-vw.redraw = function(a) {
-  a = a || QG();
-  var r = this;
-  r.averageRedrawTime === void 0 && (r.averageRedrawTime = 0), r.lastRedrawTime === void 0 && (r.lastRedrawTime = 0), r.lastDrawTime === void 0 && (r.lastDrawTime = 0), r.requestedFrame = !0, r.renderOptions = a;
-};
-vw.beforeRender = function(a, r) {
-  if (!this.destroyed) {
-    r == null && Qi("Priority is not optional for beforeRender");
-    var u = this.beforeRenderCallbacks;
-    u.push({
-      fn: a,
-      priority: r
-    }), u.sort(function(c, d) {
-      return d.priority - c.priority;
-    });
-  }
-};
-var bG = function(r, u, c) {
-  for (var d = r.beforeRenderCallbacks, g = 0; g < d.length; g++)
-    d[g].fn(u, c);
-};
-vw.startRenderLoop = function() {
-  var a = this, r = a.cy;
-  if (!a.renderLoopStarted) {
-    a.renderLoopStarted = !0;
-    var u = function c(d) {
-      if (!a.destroyed) {
-        if (!r.batching())
-          if (a.requestedFrame && !a.skipFrame) {
-            bG(a, !0, d);
-            var g = kf();
-            a.render(a.renderOptions);
-            var b = a.lastDrawTime = kf();
-            a.averageRedrawTime === void 0 && (a.averageRedrawTime = b - g), a.redrawCount === void 0 && (a.redrawCount = 0), a.redrawCount++, a.redrawTotalTime === void 0 && (a.redrawTotalTime = 0);
-            var y = b - g;
-            a.redrawTotalTime += y, a.lastRedrawTime = y, a.averageRedrawTime = a.averageRedrawTime / 2 + y / 2, a.requestedFrame = !1;
-          } else
-            bG(a, !1, d);
-        a.skipFrame = !1, XE(c);
-      }
-    };
-    XE(u);
-  }
-};
-var Uce = function(r) {
-  this.init(r);
-}, U$ = Uce, Yb = U$.prototype;
-Yb.clientFunctions = ["redrawHint", "render", "renderTo", "matchCanvasSize", "nodeShapeImpl", "arrowShapeImpl"];
-Yb.init = function(a) {
-  var r = this;
-  r.options = a, r.cy = a.cy;
-  var u = r.container = a.cy.container(), c = r.cy.window();
-  if (c) {
-    var d = c.document, g = d.head, b = "__________cytoscape_stylesheet", y = "__________cytoscape_container", k = d.getElementById(b) != null;
-    if (u.className.indexOf(y) < 0 && (u.className = (u.className || "") + " " + y), !k) {
-      var E = d.createElement("style");
-      E.id = b, E.textContent = "." + y + " { position: relative; }", g.insertBefore(E, g.children[0]);
-    }
-    var C = c.getComputedStyle(u), T = C.getPropertyValue("position");
-    T === "static" && Sr("A Cytoscape container has style position:static and so can not use UI extensions properly");
-  }
-  r.selection = [void 0, void 0, void 0, void 0, 0], r.bezierProjPcts = [0.05, 0.225, 0.4, 0.5, 0.6, 0.775, 0.95], r.hoverData = {
-    down: null,
-    last: null,
-    downTime: null,
-    triggerMode: null,
-    dragging: !1,
-    initialPan: [null, null],
-    capture: !1
-  }, r.dragData = {
-    possibleDragElements: []
-  }, r.touchData = {
-    start: null,
-    capture: !1,
-    // These 3 fields related to tap, taphold events
-    startPosition: [null, null, null, null, null, null],
-    singleTouchStartTime: null,
-    singleTouchMoved: !0,
-    now: [null, null, null, null, null, null],
-    earlier: [null, null, null, null, null, null]
-  }, r.redraws = 0, r.showFps = a.showFps, r.debug = a.debug, r.hideEdgesOnViewport = a.hideEdgesOnViewport, r.textureOnViewport = a.textureOnViewport, r.wheelSensitivity = a.wheelSensitivity, r.motionBlurEnabled = a.motionBlur, r.forcedPixelRatio = kt(a.pixelRatio) ? a.pixelRatio : null, r.motionBlur = a.motionBlur, r.motionBlurOpacity = a.motionBlurOpacity, r.motionBlurTransparency = 1 - r.motionBlurOpacity, r.motionBlurPxRatio = 1, r.mbPxRBlurry = 1, r.minMbLowQualFrames = 4, r.fullQualityMb = !1, r.clearedForMotionBlur = [], r.desktopTapThreshold = a.desktopTapThreshold, r.desktopTapThreshold2 = a.desktopTapThreshold * a.desktopTapThreshold, r.touchTapThreshold = a.touchTapThreshold, r.touchTapThreshold2 = a.touchTapThreshold * a.touchTapThreshold, r.tapholdDuration = 500, r.bindings = [], r.beforeRenderCallbacks = [], r.beforeRenderPriorities = {
-    // higher priority execs before lower one
-    animations: 400,
-    eleCalcs: 300,
-    eleTxrDeq: 200,
-    lyrTxrDeq: 150,
-    lyrTxrSkip: 100
-  }, r.registerNodeShapes(), r.registerArrowShapes(), r.registerCalculationListeners();
-};
-Yb.notify = function(a, r) {
-  var u = this, c = u.cy;
-  if (!this.destroyed) {
-    if (a === "init") {
-      u.load();
-      return;
-    }
-    if (a === "destroy") {
-      u.destroy();
-      return;
-    }
-    (a === "add" || a === "remove" || a === "move" && c.hasCompoundNodes() || a === "load" || a === "zorder" || a === "mount") && u.invalidateCachedZSortedEles(), a === "viewport" && u.redrawHint("select", !0), (a === "load" || a === "resize" || a === "mount") && (u.invalidateContainerClientCoordsCache(), u.matchCanvasSize(u.container)), u.redrawHint("eles", !0), u.redrawHint("drag", !0), this.startRenderLoop(), this.redraw();
-  }
-};
-Yb.destroy = function() {
-  var a = this;
-  a.destroyed = !0, a.cy.stopAnimationLoop();
-  for (var r = 0; r < a.bindings.length; r++) {
-    var u = a.bindings[r], c = u, d = c.target;
-    (d.off || d.removeEventListener).apply(d, c.args);
-  }
-  if (a.bindings = [], a.beforeRenderCallbacks = [], a.onUpdateEleCalcsFns = [], a.removeObserver && a.removeObserver.disconnect(), a.styleObserver && a.styleObserver.disconnect(), a.resizeObserver && a.resizeObserver.disconnect(), a.labelCalcDiv)
-    try {
-      document.body.removeChild(a.labelCalcDiv);
-    } catch {
-    }
-};
-Yb.isHeadless = function() {
-  return !1;
-};
-[Y6, V$, W$, $b, Cf, vw].forEach(function(a) {
-  on(Yb, a);
-});
-var a6 = 1e3 / 60, K$ = {
-  setupDequeueing: function(r) {
-    return function() {
-      var c = this, d = this.renderer;
-      if (!c.dequeueingSetup) {
-        c.dequeueingSetup = !0;
-        var g = l5.default(function() {
-          d.redrawHint("eles", !0), d.redrawHint("drag", !0), d.redraw();
-        }, r.deqRedrawThreshold), b = function(E, C) {
-          var T = kf(), P = d.averageRedrawTime, N = d.lastRedrawTime, D = [], H = d.cy.extent(), _ = d.getPixelRatio();
-          for (E || d.flushRenderedStyleQueue(); ; ) {
-            var B = kf(), $ = B - T, F = B - C;
-            if (N < a6) {
-              var W = a6 - (E ? P : 0);
-              if (F >= r.deqFastCost * W)
-                break;
-            } else if (E) {
-              if ($ >= r.deqCost * N || $ >= r.deqAvgCost * P)
-                break;
-            } else if (F >= r.deqNoDrawCost * a6)
-              break;
-            var Q = r.deq(c, _, H);
-            if (Q.length > 0)
-              for (var X = 0; X < Q.length; X++)
-                D.push(Q[X]);
-            else
-              break;
-          }
-          D.length > 0 && (r.onDeqd(c, D), !E && r.shouldRedraw(c, D, _, H) && g());
-        }, y = r.priority || N6;
-        d.beforeRender(b, y(c));
-      }
-    };
-  }
-}, Kce = /* @__PURE__ */ function() {
-  function a(r) {
-    var u = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : QE;
-    T6(this, a), this.idsByKey = new El(), this.keyForId = new El(), this.cachesByLvl = new El(), this.lvls = [], this.getKey = r, this.doesEleInvalidateKey = u;
-  }
-  return L6(a, [{
-    key: "getIdsFor",
-    value: function(u) {
-      u == null && Qi("Can not get id list for null key");
-      var c = this.idsByKey, d = this.idsByKey.get(u);
-      return d || (d = new zb(), c.set(u, d)), d;
-    }
-  }, {
-    key: "addIdForKey",
-    value: function(u, c) {
-      u != null && this.getIdsFor(u).add(c);
-    }
-  }, {
-    key: "deleteIdForKey",
-    value: function(u, c) {
-      u != null && this.getIdsFor(u).delete(c);
-    }
-  }, {
-    key: "getNumberOfIdsForKey",
-    value: function(u) {
-      return u == null ? 0 : this.getIdsFor(u).size;
-    }
-  }, {
-    key: "updateKeyMappingFor",
-    value: function(u) {
-      var c = u.id(), d = this.keyForId.get(c), g = this.getKey(u);
-      this.deleteIdForKey(d, c), this.addIdForKey(g, c), this.keyForId.set(c, g);
-    }
-  }, {
-    key: "deleteKeyMappingFor",
-    value: function(u) {
-      var c = u.id(), d = this.keyForId.get(c);
-      this.deleteIdForKey(d, c), this.keyForId.delete(c);
-    }
-  }, {
-    key: "keyHasChangedFor",
-    value: function(u) {
-      var c = u.id(), d = this.keyForId.get(c), g = this.getKey(u);
-      return d !== g;
-    }
-  }, {
-    key: "isInvalid",
-    value: function(u) {
-      return this.keyHasChangedFor(u) || this.doesEleInvalidateKey(u);
-    }
-  }, {
-    key: "getCachesAt",
-    value: function(u) {
-      var c = this.cachesByLvl, d = this.lvls, g = c.get(u);
-      return g || (g = new El(), c.set(u, g), d.push(u)), g;
-    }
-  }, {
-    key: "getCache",
-    value: function(u, c) {
-      return this.getCachesAt(c).get(u);
-    }
-  }, {
-    key: "get",
-    value: function(u, c) {
-      var d = this.getKey(u), g = this.getCache(d, c);
-      return g != null && this.updateKeyMappingFor(u), g;
-    }
-  }, {
-    key: "getForCachedKey",
-    value: function(u, c) {
-      var d = this.keyForId.get(u.id()), g = this.getCache(d, c);
-      return g;
-    }
-  }, {
-    key: "hasCache",
-    value: function(u, c) {
-      return this.getCachesAt(c).has(u);
-    }
-  }, {
-    key: "has",
-    value: function(u, c) {
-      var d = this.getKey(u);
-      return this.hasCache(d, c);
-    }
-  }, {
-    key: "setCache",
-    value: function(u, c, d) {
-      d.key = u, this.getCachesAt(c).set(u, d);
-    }
-  }, {
-    key: "set",
-    value: function(u, c, d) {
-      var g = this.getKey(u);
-      this.setCache(g, c, d), this.updateKeyMappingFor(u);
-    }
-  }, {
-    key: "deleteCache",
-    value: function(u, c) {
-      this.getCachesAt(c).delete(u);
-    }
-  }, {
-    key: "delete",
-    value: function(u, c) {
-      var d = this.getKey(u);
-      this.deleteCache(d, c);
-    }
-  }, {
-    key: "invalidateKey",
-    value: function(u) {
-      var c = this;
-      this.lvls.forEach(function(d) {
-        return c.deleteCache(u, d);
-      });
-    }
-    // returns true if no other eles reference the invalidated cache (n.b. other eles may need the cache with the same key)
-  }, {
-    key: "invalidate",
-    value: function(u) {
-      var c = u.id(), d = this.keyForId.get(c);
-      this.deleteKeyMappingFor(u);
-      var g = this.doesEleInvalidateKey(u);
-      return g && this.invalidateKey(d), g || this.getNumberOfIdsForKey(d) === 0;
-    }
-  }]), a;
-}(), pG = 25, GE = 50, KE = -4, p6 = 3, Zce = 7.99, Xce = 8, Qce = 1024, Jce = 1024, ele = 1024, tle = 0.2, nle = 0.8, rle = 10, ile = 0.15, ale = 0.1, ole = 0.9, sle = 0.9, ule = 100, cle = 1, Lb = {
-  dequeue: "dequeue",
-  downscale: "downscale",
-  highQuality: "highQuality"
-}, lle = po({
-  getKey: null,
-  doesEleInvalidateKey: QE,
-  drawElement: null,
-  getBoundingBox: null,
-  getRotationPoint: null,
-  getRotationOffset: null,
-  isVisible: KG,
-  allowEdgeTxrCaching: !0,
-  allowParentTxrCaching: !0
-}), qp = function(r, u) {
-  var c = this;
-  c.renderer = r, c.onDequeues = [];
-  var d = lle(u);
-  on(c, d), c.lookup = new Kce(d.getKey, d.doesEleInvalidateKey), c.setupDequeueing();
-}, Ba = qp.prototype;
-Ba.reasons = Lb;
-Ba.getTextureQueue = function(a) {
-  var r = this;
-  return r.eleImgCaches = r.eleImgCaches || {}, r.eleImgCaches[a] = r.eleImgCaches[a] || [];
-};
-Ba.getRetiredTextureQueue = function(a) {
-  var r = this, u = r.eleImgCaches.retired = r.eleImgCaches.retired || {}, c = u[a] = u[a] || [];
-  return c;
-};
-Ba.getElementQueue = function() {
-  var a = this, r = a.eleCacheQueue = a.eleCacheQueue || new sw.default(function(u, c) {
-    return c.reqs - u.reqs;
-  });
-  return r;
-};
-Ba.getElementKeyToQueue = function() {
-  var a = this, r = a.eleKeyToCacheQueue = a.eleKeyToCacheQueue || {};
-  return r;
-};
-Ba.getElement = function(a, r, u, c, d) {
-  var g = this, b = this.renderer, y = b.cy.zoom(), k = this.lookup;
-  if (!r || r.w === 0 || r.h === 0 || isNaN(r.w) || isNaN(r.h) || !a.visible() || a.removed() || !g.allowEdgeTxrCaching && a.isEdge() || !g.allowParentTxrCaching && a.isParent())
-    return null;
-  if (c == null && (c = Math.ceil(M6(y * u))), c < KE)
-    c = KE;
-  else if (y >= Zce || c > p6)
-    return null;
-  var E = Math.pow(2, c), C = r.h * E, T = r.w * E, P = b.eleTextBiggerThanMin(a, E);
-  if (!this.isVisible(a, P))
-    return null;
-  var N = k.get(a, c);
-  if (N && N.invalidated && (N.invalidated = !1, N.texture.invalidatedWidth -= N.width), N)
-    return N;
-  var D;
-  if (C <= pG ? D = pG : C <= GE ? D = GE : D = Math.ceil(C / GE) * GE, C > ele || T > Jce)
-    return null;
-  var H = g.getTextureQueue(D), _ = H[H.length - 2], B = function() {
-    return g.recycleTexture(D, T) || g.addTexture(D, T);
-  };
-  _ || (_ = H[H.length - 1]), _ || (_ = B()), _.width - _.usedWidth < T && (_ = B());
-  for (var $ = function(he) {
-    return he && he.scaledLabelShown === P;
-  }, F = d && d === Lb.dequeue, W = d && d === Lb.highQuality, Q = d && d === Lb.downscale, X, K = c + 1; K <= p6; K++) {
-    var ee = k.get(a, K);
-    if (ee) {
-      X = ee;
-      break;
-    }
-  }
-  var Z = X && X.level === c + 1 ? X : null, ae = function() {
-    _.context.drawImage(Z.texture.canvas, Z.x, 0, Z.width, Z.height, _.usedWidth, 0, T, C);
-  };
-  if (_.context.setTransform(1, 0, 0, 1, 0, 0), _.context.clearRect(_.usedWidth, 0, T, D), $(Z))
-    ae();
-  else if ($(X))
-    if (W) {
-      for (var oe = X.level; oe > c; oe--)
-        Z = g.getElement(a, r, u, oe, Lb.downscale);
-      ae();
-    } else
-      return g.queueElement(a, X.level - 1), X;
-  else {
-    var J;
-    if (!F && !W && !Q)
-      for (var fe = c - 1; fe >= KE; fe--) {
-        var se = k.get(a, fe);
-        if (se) {
-          J = se;
-          break;
-        }
-      }
-    if ($(J))
-      return g.queueElement(a, c), J;
-    _.context.translate(_.usedWidth, 0), _.context.scale(E, E), this.drawElement(_.context, a, r, P, !1), _.context.scale(1 / E, 1 / E), _.context.translate(-_.usedWidth, 0);
-  }
-  return N = {
-    x: _.usedWidth,
-    texture: _,
-    level: c,
-    scale: E,
-    width: T,
-    height: C,
-    scaledLabelShown: P
-  }, _.usedWidth += Math.ceil(T + Xce), _.eleCaches.push(N), k.set(a, c, N), g.checkTextureFullness(_), N;
-};
-Ba.invalidateElements = function(a) {
-  for (var r = 0; r < a.length; r++)
-    this.invalidateElement(a[r]);
-};
-Ba.invalidateElement = function(a) {
-  var r = this, u = r.lookup, c = [], d = u.isInvalid(a);
-  if (d) {
-    for (var g = KE; g <= p6; g++) {
-      var b = u.getForCachedKey(a, g);
-      b && c.push(b);
-    }
-    var y = u.invalidate(a);
-    if (y)
-      for (var k = 0; k < c.length; k++) {
-        var E = c[k], C = E.texture;
-        C.invalidatedWidth += E.width, E.invalidated = !0, r.checkTextureUtility(C);
-      }
-    r.removeFromQueue(a);
-  }
-};
-Ba.checkTextureUtility = function(a) {
-  a.invalidatedWidth >= tle * a.width && this.retireTexture(a);
-};
-Ba.checkTextureFullness = function(a) {
-  var r = this, u = r.getTextureQueue(a.height);
-  a.usedWidth / a.width > nle && a.fullnessChecks >= rle ? Hh(u, a) : a.fullnessChecks++;
-};
-Ba.retireTexture = function(a) {
-  var r = this, u = a.height, c = r.getTextureQueue(u), d = this.lookup;
-  Hh(c, a), a.retired = !0;
-  for (var g = a.eleCaches, b = 0; b < g.length; b++) {
-    var y = g[b];
-    d.deleteCache(y.key, y.level);
-  }
-  I6(g);
-  var k = r.getRetiredTextureQueue(u);
-  k.push(a);
-};
-Ba.addTexture = function(a, r) {
-  var u = this, c = u.getTextureQueue(a), d = {};
-  return c.push(d), d.eleCaches = [], d.height = a, d.width = Math.max(Qce, r), d.usedWidth = 0, d.invalidatedWidth = 0, d.fullnessChecks = 0, d.canvas = u.renderer.makeOffscreenCanvas(d.width, d.height), d.context = d.canvas.getContext("2d"), d;
-};
-Ba.recycleTexture = function(a, r) {
-  for (var u = this, c = u.getTextureQueue(a), d = u.getRetiredTextureQueue(a), g = 0; g < d.length; g++) {
-    var b = d[g];
-    if (b.width >= r)
-      return b.retired = !1, b.usedWidth = 0, b.invalidatedWidth = 0, b.fullnessChecks = 0, I6(b.eleCaches), b.context.setTransform(1, 0, 0, 1, 0, 0), b.context.clearRect(0, 0, b.width, b.height), Hh(d, b), c.push(b), b;
-  }
-};
-Ba.queueElement = function(a, r) {
-  var u = this, c = u.getElementQueue(), d = u.getElementKeyToQueue(), g = this.getKey(a), b = d[g];
-  if (b)
-    b.level = Math.max(b.level, r), b.eles.merge(a), b.reqs++, c.updateItem(b);
-  else {
-    var y = {
-      eles: a.spawn().merge(a),
-      level: r,
-      reqs: 1,
-      key: g
-    };
-    c.push(y), d[g] = y;
-  }
-};
-Ba.dequeue = function(a) {
-  for (var r = this, u = r.getElementQueue(), c = r.getElementKeyToQueue(), d = [], g = r.lookup, b = 0; b < cle && u.size() > 0; b++) {
-    var y = u.pop(), k = y.key, E = y.eles[0], C = g.hasCache(E, y.level);
-    if (c[k] = null, C)
-      continue;
-    d.push(y);
-    var T = r.getBoundingBox(E);
-    r.getElement(E, T, a, y.level, Lb.dequeue);
-  }
-  return d;
-};
-Ba.removeFromQueue = function(a) {
-  var r = this, u = r.getElementQueue(), c = r.getElementKeyToQueue(), d = this.getKey(a), g = c[d];
-  g != null && (g.eles.length === 1 ? (g.reqs = j6, u.updateItem(g), u.pop(), c[d] = null) : g.eles.unmerge(a));
-};
-Ba.onDequeue = function(a) {
-  this.onDequeues.push(a);
-};
-Ba.offDequeue = function(a) {
-  Hh(this.onDequeues, a);
-};
-Ba.setupDequeueing = K$.setupDequeueing({
-  deqRedrawThreshold: ule,
-  deqCost: ile,
-  deqAvgCost: ale,
-  deqNoDrawCost: ole,
-  deqFastCost: sle,
-  deq: function(r, u, c) {
-    return r.dequeue(u, c);
-  },
-  onDeqd: function(r, u) {
-    for (var c = 0; c < r.onDequeues.length; c++) {
-      var d = r.onDequeues[c];
-      d(u);
-    }
-  },
-  shouldRedraw: function(r, u, c, d) {
-    for (var g = 0; g < u.length; g++)
-      for (var b = u[g].eles, y = 0; y < b.length; y++) {
-        var k = b[y].boundingBox();
-        if (O6(k, d))
-          return !0;
-      }
-    return !1;
-  },
-  priority: function(r) {
-    return r.renderer.beforeRenderPriorities.eleTxrDeq;
-  }
-});
-var fle = 1, Wp = -4, i5 = 2, hle = 3.99, dle = 50, vle = 50, gle = 0.15, ble = 0.1, ple = 0.9, wle = 0.9, mle = 1, wG = 250, yle = 4e3 * 4e3, kle = !0, Z$ = function(r) {
-  var u = this, c = u.renderer = r, d = c.cy;
-  u.layersByLevel = {}, u.firstGet = !0, u.lastInvalidationTime = kf() - 2 * wG, u.skipping = !1, u.eleTxrDeqs = d.collection(), u.scheduleElementRefinement = l5.default(function() {
-    u.refineElementTextures(u.eleTxrDeqs), u.eleTxrDeqs.unmerge(u.eleTxrDeqs);
-  }, vle), c.beforeRender(function(b, y) {
-    y - u.lastInvalidationTime <= wG ? u.skipping = !0 : u.skipping = !1;
-  }, c.beforeRenderPriorities.lyrTxrSkip);
-  var g = function(y, k) {
-    return k.reqs - y.reqs;
-  };
-  u.layersQueue = new sw.default(g), u.setupDequeueing();
-}, wo = Z$.prototype, mG = 0, Ele = Math.pow(2, 53) - 1;
-wo.makeLayer = function(a, r) {
-  var u = Math.pow(2, r), c = Math.ceil(a.w * u), d = Math.ceil(a.h * u), g = this.renderer.makeOffscreenCanvas(c, d), b = {
-    id: mG = ++mG % Ele,
-    bb: a,
-    level: r,
-    width: c,
-    height: d,
-    canvas: g,
-    context: g.getContext("2d"),
-    eles: [],
-    elesQueue: [],
-    reqs: 0
-  }, y = b.context, k = -b.bb.x1, E = -b.bb.y1;
-  return y.scale(u, u), y.translate(k, E), b;
-};
-wo.getLayers = function(a, r, u) {
-  var c = this, d = c.renderer, g = d.cy, b = g.zoom(), y = c.firstGet;
-  if (c.firstGet = !1, u == null) {
-    if (u = Math.ceil(M6(b * r)), u < Wp)
-      u = Wp;
-    else if (b >= hle || u > i5)
-      return null;
-  }
-  c.validateLayersElesOrdering(u, a);
-  var k = c.layersByLevel, E = Math.pow(2, u), C = k[u] = k[u] || [], T, P = c.levelIsComplete(u, a), N, D = function() {
-    var ae = function(pe) {
-      if (c.validateLayersElesOrdering(pe, a), c.levelIsComplete(pe, a))
-        return N = k[pe], !0;
-    }, oe = function(pe) {
-      if (!N)
-        for (var he = u + pe; Wp <= he && he <= i5 && !ae(he); he += pe)
-          ;
-    };
-    oe(1), oe(-1);
-    for (var J = C.length - 1; J >= 0; J--) {
-      var fe = C[J];
-      fe.invalid && Hh(C, fe);
-    }
-  };
-  if (!P)
-    D();
-  else
-    return C;
-  var H = function() {
-    if (!T) {
-      T = Ms();
-      for (var ae = 0; ae < a.length; ae++)
-        fse(T, a[ae].boundingBox());
-    }
-    return T;
-  }, _ = function(ae) {
-    ae = ae || {};
-    var oe = ae.after;
-    H();
-    var J = T.w * E * (T.h * E);
-    if (J > yle)
-      return null;
-    var fe = c.makeLayer(T, u);
-    if (oe != null) {
-      var se = C.indexOf(oe) + 1;
-      C.splice(se, 0, fe);
-    } else
-      (ae.insert === void 0 || ae.insert) && C.unshift(fe);
-    return fe;
-  };
-  if (c.skipping && !y)
-    return null;
-  for (var B = null, $ = a.length / fle, F = !y, W = 0; W < a.length; W++) {
-    var Q = a[W], X = Q._private.rscratch, K = X.imgLayerCaches = X.imgLayerCaches || {}, ee = K[u];
-    if (ee) {
-      B = ee;
-      continue;
-    }
-    if ((!B || B.eles.length >= $ || !t$(B.bb, Q.boundingBox())) && (B = _({
-      insert: !0,
-      after: B
-    }), !B))
-      return null;
-    N || F ? c.queueLayer(B, Q) : c.drawEleInLayer(B, Q, u, r), B.eles.push(Q), K[u] = B;
-  }
-  return N || (F ? null : C);
-};
-wo.getEleLevelForLayerLevel = function(a, r) {
-  return a;
-};
-wo.drawEleInLayer = function(a, r, u, c) {
-  var d = this, g = this.renderer, b = a.context, y = r.boundingBox();
-  y.w === 0 || y.h === 0 || !r.visible() || (u = d.getEleLevelForLayerLevel(u, c), g.setImgSmoothing(b, !1), g.drawCachedElement(b, r, null, null, u, kle), g.setImgSmoothing(b, !0));
-};
-wo.levelIsComplete = function(a, r) {
-  var u = this, c = u.layersByLevel[a];
-  if (!c || c.length === 0)
-    return !1;
-  for (var d = 0, g = 0; g < c.length; g++) {
-    var b = c[g];
-    if (b.reqs > 0 || b.invalid)
-      return !1;
-    d += b.eles.length;
-  }
-  return d === r.length;
-};
-wo.validateLayersElesOrdering = function(a, r) {
-  var u = this.layersByLevel[a];
-  if (u)
-    for (var c = 0; c < u.length; c++) {
-      for (var d = u[c], g = -1, b = 0; b < r.length; b++)
-        if (d.eles[0] === r[b]) {
-          g = b;
-          break;
-        }
-      if (g < 0) {
-        this.invalidateLayer(d);
-        continue;
-      }
-      for (var y = g, b = 0; b < d.eles.length; b++)
-        if (d.eles[b] !== r[y + b]) {
-          this.invalidateLayer(d);
-          break;
-        }
-    }
-};
-wo.updateElementsInLayers = function(a, r) {
-  for (var u = this, c = cw(a[0]), d = 0; d < a.length; d++)
-    for (var g = c ? null : a[d], b = c ? a[d] : a[d].ele, y = b._private.rscratch, k = y.imgLayerCaches = y.imgLayerCaches || {}, E = Wp; E <= i5; E++) {
-      var C = k[E];
-      C && (g && u.getEleLevelForLayerLevel(C.level) !== g.level || r(C, b, g));
-    }
-};
-wo.haveLayers = function() {
-  for (var a = this, r = !1, u = Wp; u <= i5; u++) {
-    var c = a.layersByLevel[u];
-    if (c && c.length > 0) {
-      r = !0;
-      break;
-    }
-  }
-  return r;
-};
-wo.invalidateElements = function(a) {
-  var r = this;
-  a.length !== 0 && (r.lastInvalidationTime = kf(), !(a.length === 0 || !r.haveLayers()) && r.updateElementsInLayers(a, function(c, d, g) {
-    r.invalidateLayer(c);
-  }));
-};
-wo.invalidateLayer = function(a) {
-  if (this.lastInvalidationTime = kf(), !a.invalid) {
-    var r = a.level, u = a.eles, c = this.layersByLevel[r];
-    Hh(c, a), a.elesQueue = [], a.invalid = !0, a.replacement && (a.replacement.invalid = !0);
-    for (var d = 0; d < u.length; d++) {
-      var g = u[d]._private.rscratch.imgLayerCaches;
-      g && (g[r] = null);
-    }
-  }
-};
-wo.refineElementTextures = function(a) {
-  var r = this;
-  r.updateElementsInLayers(a, function(c, d, g) {
-    var b = c.replacement;
-    if (b || (b = c.replacement = r.makeLayer(c.bb, c.level), b.replaces = c, b.eles = c.eles), !b.reqs)
-      for (var y = 0; y < b.eles.length; y++)
-        r.queueLayer(b, b.eles[y]);
-  });
-};
-wo.enqueueElementRefinement = function(a) {
-  this.eleTxrDeqs.merge(a), this.scheduleElementRefinement();
-};
-wo.queueLayer = function(a, r) {
-  var u = this, c = u.layersQueue, d = a.elesQueue, g = d.hasId = d.hasId || {};
-  if (!a.replacement) {
-    if (r) {
-      if (g[r.id()])
-        return;
-      d.push(r), g[r.id()] = !0;
-    }
-    a.reqs ? (a.reqs++, c.updateItem(a)) : (a.reqs = 1, c.push(a));
-  }
-};
-wo.dequeue = function(a) {
-  for (var r = this, u = r.layersQueue, c = [], d = 0; d < mle && u.size() !== 0; ) {
-    var g = u.peek();
-    if (g.replacement) {
-      u.pop();
-      continue;
-    }
-    if (g.replaces && g !== g.replaces.replacement) {
-      u.pop();
-      continue;
-    }
-    if (g.invalid) {
-      u.pop();
-      continue;
-    }
-    var b = g.elesQueue.shift();
-    b && (r.drawEleInLayer(g, b, g.level, a), d++), c.length === 0 && c.push(!0), g.elesQueue.length === 0 && (u.pop(), g.reqs = 0, g.replaces && r.applyLayerReplacement(g), r.requestRedraw());
-  }
-  return c;
-};
-wo.applyLayerReplacement = function(a) {
-  var r = this, u = r.layersByLevel[a.level], c = a.replaces, d = u.indexOf(c);
-  if (!(d < 0 || c.invalid)) {
-    u[d] = a;
-    for (var g = 0; g < a.eles.length; g++) {
-      var b = a.eles[g]._private, y = b.imgLayerCaches = b.imgLayerCaches || {};
-      y && (y[a.level] = a);
-    }
-    r.requestRedraw();
-  }
-};
-wo.requestRedraw = l5.default(function() {
-  var a = this.renderer;
-  a.redrawHint("eles", !0), a.redrawHint("drag", !0), a.redraw();
-}, 100);
-wo.setupDequeueing = K$.setupDequeueing({
-  deqRedrawThreshold: dle,
-  deqCost: gle,
-  deqAvgCost: ble,
-  deqNoDrawCost: ple,
-  deqFastCost: wle,
-  deq: function(r, u) {
-    return r.dequeue(u);
-  },
-  onDeqd: N6,
-  shouldRedraw: KG,
-  priority: function(r) {
-    return r.renderer.beforeRenderPriorities.lyrTxrDeq;
-  }
-});
-var X$ = {}, yG;
-function Sle(a, r) {
-  for (var u = 0; u < r.length; u++) {
-    var c = r[u];
-    a.lineTo(c.x, c.y);
-  }
-}
-function Cle(a, r, u) {
-  for (var c, d = 0; d < r.length; d++) {
-    var g = r[d];
-    d === 0 && (c = g), a.lineTo(g.x, g.y);
-  }
-  a.quadraticCurveTo(u.x, u.y, c.x, c.y);
-}
-function kG(a, r, u) {
-  a.beginPath && a.beginPath();
-  for (var c = r, d = 0; d < c.length; d++) {
-    var g = c[d];
-    a.lineTo(g.x, g.y);
-  }
-  var b = u, y = u[0];
-  a.moveTo(y.x, y.y);
-  for (var d = 1; d < b.length; d++) {
-    var g = b[d];
-    a.lineTo(g.x, g.y);
-  }
-  a.closePath && a.closePath();
-}
-function xle(a, r, u, c, d) {
-  a.beginPath && a.beginPath(), a.arc(u, c, d, 0, Math.PI * 2, !1);
-  var g = r, b = g[0];
-  a.moveTo(b.x, b.y);
-  for (var y = 0; y < g.length; y++) {
-    var k = g[y];
-    a.lineTo(k.x, k.y);
-  }
-  a.closePath && a.closePath();
-}
-function Tle(a, r, u, c) {
-  a.arc(r, u, c, 0, Math.PI * 2, !1);
-}
-X$.arrowShapeImpl = function(a) {
-  return (yG || (yG = {
-    polygon: Sle,
-    "triangle-backcurve": Cle,
-    "triangle-tee": kG,
-    "circle-triangle": xle,
-    "triangle-cross": kG,
-    circle: Tle
-  }))[a];
-};
-var xl = {};
-xl.drawElement = function(a, r, u, c, d, g) {
-  var b = this;
-  r.isNode() ? b.drawNode(a, r, u, c, d, g) : b.drawEdge(a, r, u, c, d, g);
-};
-xl.drawElementOverlay = function(a, r) {
-  var u = this;
-  r.isNode() ? u.drawNodeOverlay(a, r) : u.drawEdgeOverlay(a, r);
-};
-xl.drawElementUnderlay = function(a, r) {
-  var u = this;
-  r.isNode() ? u.drawNodeUnderlay(a, r) : u.drawEdgeUnderlay(a, r);
-};
-xl.drawCachedElementPortion = function(a, r, u, c, d, g, b, y) {
-  var k = this, E = u.getBoundingBox(r);
-  if (!(E.w === 0 || E.h === 0)) {
-    var C = u.getElement(r, E, c, d, g);
-    if (C != null) {
-      var T = y(k, r);
-      if (T === 0)
-        return;
-      var P = b(k, r), N = E.x1, D = E.y1, H = E.w, _ = E.h, B, $, F, W, Q;
-      if (P !== 0) {
-        var X = u.getRotationPoint(r);
-        F = X.x, W = X.y, a.translate(F, W), a.rotate(P), Q = k.getImgSmoothing(a), Q || k.setImgSmoothing(a, !0);
-        var K = u.getRotationOffset(r);
-        B = K.x, $ = K.y;
-      } else
-        B = N, $ = D;
-      var ee;
-      T !== 1 && (ee = a.globalAlpha, a.globalAlpha = ee * T), a.drawImage(C.texture.canvas, C.x, 0, C.width, C.height, B, $, H, _), T !== 1 && (a.globalAlpha = ee), P !== 0 && (a.rotate(-P), a.translate(-F, -W), Q || k.setImgSmoothing(a, !1));
-    } else
-      u.drawElement(a, r);
-  }
-};
-var Lle = function() {
-  return 0;
-}, Ple = function(r, u) {
-  return r.getTextAngle(u, null);
-}, Dle = function(r, u) {
-  return r.getTextAngle(u, "source");
-}, jle = function(r, u) {
-  return r.getTextAngle(u, "target");
-}, Nle = function(r, u) {
-  return u.effectiveOpacity();
-}, o6 = function(r, u) {
-  return u.pstyle("text-opacity").pfValue * u.effectiveOpacity();
-};
-xl.drawCachedElement = function(a, r, u, c, d, g) {
-  var b = this, y = b.data, k = y.eleTxrCache, E = y.lblTxrCache, C = y.slbTxrCache, T = y.tlbTxrCache, P = r.boundingBox(), N = g === !0 ? k.reasons.highQuality : null;
-  if (!(P.w === 0 || P.h === 0 || !r.visible()) && (!c || O6(P, c))) {
-    var D = r.isEdge(), H = r.element()._private.rscratch.badLine;
-    b.drawElementUnderlay(a, r), b.drawCachedElementPortion(a, r, k, u, d, N, Lle, Nle), (!D || !H) && b.drawCachedElementPortion(a, r, E, u, d, N, Ple, o6), D && !H && (b.drawCachedElementPortion(a, r, C, u, d, N, Dle, o6), b.drawCachedElementPortion(a, r, T, u, d, N, jle, o6)), b.drawElementOverlay(a, r);
-  }
-};
-xl.drawElements = function(a, r) {
-  for (var u = this, c = 0; c < r.length; c++) {
-    var d = r[c];
-    u.drawElement(a, d);
-  }
-};
-xl.drawCachedElements = function(a, r, u, c) {
-  for (var d = this, g = 0; g < r.length; g++) {
-    var b = r[g];
-    d.drawCachedElement(a, b, u, c);
-  }
-};
-xl.drawCachedNodes = function(a, r, u, c) {
-  for (var d = this, g = 0; g < r.length; g++) {
-    var b = r[g];
-    b.isNode() && d.drawCachedElement(a, b, u, c);
-  }
-};
-xl.drawLayeredElements = function(a, r, u, c) {
-  var d = this, g = d.data.lyrTxrCache.getLayers(r, u);
-  if (g)
-    for (var b = 0; b < g.length; b++) {
-      var y = g[b], k = y.bb;
-      k.w === 0 || k.h === 0 || a.drawImage(y.canvas, k.x1, k.y1, k.w, k.h);
-    }
-  else
-    d.drawCachedElements(a, r, u, c);
-};
-var xf = {};
-xf.drawEdge = function(a, r, u) {
-  var c = arguments.length > 3 && arguments[3] !== void 0 ? arguments[3] : !0, d = arguments.length > 4 && arguments[4] !== void 0 ? arguments[4] : !0, g = arguments.length > 5 && arguments[5] !== void 0 ? arguments[5] : !0, b = this, y = r._private.rscratch;
-  if (!(g && !r.visible()) && !(y.badLine || y.allpts == null || isNaN(y.allpts[0]))) {
-    var k;
-    u && (k = u, a.translate(-k.x1, -k.y1));
-    var E = g ? r.pstyle("opacity").value : 1, C = g ? r.pstyle("line-opacity").value : 1, T = r.pstyle("curve-style").value, P = r.pstyle("line-style").value, N = r.pstyle("width").pfValue, D = r.pstyle("line-cap").value, H = E * C, _ = E * C, B = function() {
-      var J = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : H;
-      T === "straight-triangle" ? (b.eleStrokeStyle(a, r, J), b.drawEdgeTrianglePath(r, a, y.allpts)) : (a.lineWidth = N, a.lineCap = D, b.eleStrokeStyle(a, r, J), b.drawEdgePath(r, a, y.allpts, P), a.lineCap = "butt");
-    }, $ = function() {
-      d && b.drawEdgeOverlay(a, r);
-    }, F = function() {
-      d && b.drawEdgeUnderlay(a, r);
-    }, W = function() {
-      var J = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : _;
-      b.drawArrowheads(a, r, J);
-    }, Q = function() {
-      b.drawElementText(a, r, null, c);
-    };
-    a.lineJoin = "round";
-    var X = r.pstyle("ghost").value === "yes";
-    if (X) {
-      var K = r.pstyle("ghost-offset-x").pfValue, ee = r.pstyle("ghost-offset-y").pfValue, Z = r.pstyle("ghost-opacity").value, ae = H * Z;
-      a.translate(K, ee), B(ae), W(ae), a.translate(-K, -ee);
-    }
-    F(), B(), W(), $(), Q(), u && a.translate(k.x1, k.y1);
-  }
-};
-var Q$ = function(r) {
-  if (!["overlay", "underlay"].includes(r))
-    throw new Error("Invalid state");
-  return function(u, c) {
-    if (c.visible()) {
-      var d = c.pstyle("".concat(r, "-opacity")).value;
-      if (d !== 0) {
-        var g = this, b = g.usePaths(), y = c._private.rscratch, k = c.pstyle("".concat(r, "-padding")).pfValue, E = 2 * k, C = c.pstyle("".concat(r, "-color")).value;
-        u.lineWidth = E, y.edgeType === "self" && !b ? u.lineCap = "butt" : u.lineCap = "round", g.colorStrokeStyle(u, C[0], C[1], C[2], d), g.drawEdgePath(c, u, y.allpts, "solid");
-      }
-    }
-  };
-};
-xf.drawEdgeOverlay = Q$("overlay");
-xf.drawEdgeUnderlay = Q$("underlay");
-xf.drawEdgePath = function(a, r, u, c) {
-  var d = a._private.rscratch, g = r, b, y = !1, k = this.usePaths(), E = a.pstyle("line-dash-pattern").pfValue, C = a.pstyle("line-dash-offset").pfValue;
-  if (k) {
-    var T = u.join("$"), P = d.pathCacheKey && d.pathCacheKey === T;
-    P ? (b = r = d.pathCache, y = !0) : (b = r = new Path2D(), d.pathCacheKey = T, d.pathCache = b);
-  }
-  if (g.setLineDash)
-    switch (c) {
-      case "dotted":
-        g.setLineDash([1, 1]);
-        break;
-      case "dashed":
-        g.setLineDash(E), g.lineDashOffset = C;
-        break;
-      case "solid":
-        g.setLineDash([]);
-        break;
-    }
-  if (!y && !d.badLine)
-    switch (r.beginPath && r.beginPath(), r.moveTo(u[0], u[1]), d.edgeType) {
-      case "bezier":
-      case "self":
-      case "compound":
-      case "multibezier":
-        for (var N = 2; N + 3 < u.length; N += 4)
-          r.quadraticCurveTo(u[N], u[N + 1], u[N + 2], u[N + 3]);
-        break;
-      case "straight":
-      case "segments":
-      case "haystack":
-        for (var D = 2; D + 1 < u.length; D += 2)
-          r.lineTo(u[D], u[D + 1]);
-        break;
-    }
-  r = g, k ? r.stroke(b) : r.stroke(), r.setLineDash && r.setLineDash([]);
-};
-xf.drawEdgeTrianglePath = function(a, r, u) {
-  r.fillStyle = r.strokeStyle;
-  for (var c = a.pstyle("width").pfValue, d = 0; d + 1 < u.length; d += 2) {
-    var g = [u[d + 2] - u[d], u[d + 3] - u[d + 1]], b = Math.sqrt(g[0] * g[0] + g[1] * g[1]), y = [g[1] / b, -g[0] / b], k = [y[0] * c / 2, y[1] * c / 2];
-    r.beginPath(), r.moveTo(u[d] - k[0], u[d + 1] - k[1]), r.lineTo(u[d] + k[0], u[d + 1] + k[1]), r.lineTo(u[d + 2], u[d + 3]), r.closePath(), r.fill();
-  }
-};
-xf.drawArrowheads = function(a, r, u) {
-  var c = r._private.rscratch, d = c.edgeType === "haystack";
-  d || this.drawArrowhead(a, r, "source", c.arrowStartX, c.arrowStartY, c.srcArrowAngle, u), this.drawArrowhead(a, r, "mid-target", c.midX, c.midY, c.midtgtArrowAngle, u), this.drawArrowhead(a, r, "mid-source", c.midX, c.midY, c.midsrcArrowAngle, u), d || this.drawArrowhead(a, r, "target", c.arrowEndX, c.arrowEndY, c.tgtArrowAngle, u);
-};
-xf.drawArrowhead = function(a, r, u, c, d, g, b) {
-  if (!(isNaN(c) || c == null || isNaN(d) || d == null || isNaN(g) || g == null)) {
-    var y = this, k = r.pstyle(u + "-arrow-shape").value;
-    if (k !== "none") {
-      var E = r.pstyle(u + "-arrow-fill").value === "hollow" ? "both" : "filled", C = r.pstyle(u + "-arrow-fill").value, T = r.pstyle("width").pfValue, P = r.pstyle("opacity").value;
-      b === void 0 && (b = P);
-      var N = a.globalCompositeOperation;
-      (b !== 1 || C === "hollow") && (a.globalCompositeOperation = "destination-out", y.colorFillStyle(a, 255, 255, 255, 1), y.colorStrokeStyle(a, 255, 255, 255, 1), y.drawArrowShape(r, a, E, T, k, c, d, g), a.globalCompositeOperation = N);
-      var D = r.pstyle(u + "-arrow-color").value;
-      y.colorFillStyle(a, D[0], D[1], D[2], b), y.colorStrokeStyle(a, D[0], D[1], D[2], b), y.drawArrowShape(r, a, C, T, k, c, d, g);
-    }
-  }
-};
-xf.drawArrowShape = function(a, r, u, c, d, g, b, y) {
-  var k = this, E = this.usePaths() && d !== "triangle-cross", C = !1, T, P = r, N = {
-    x: g,
-    y: b
-  }, D = a.pstyle("arrow-scale").value, H = this.getArrowWidth(c, D), _ = k.arrowShapes[d];
-  if (E) {
-    var B = k.arrowPathCache = k.arrowPathCache || [], $ = fv(d), F = B[$];
-    F != null ? (T = r = F, C = !0) : (T = r = new Path2D(), B[$] = T);
-  }
-  C || (r.beginPath && r.beginPath(), E ? _.draw(r, 1, 0, {
-    x: 0,
-    y: 0
-  }, 1) : _.draw(r, H, y, N, c), r.closePath && r.closePath()), r = P, E && (r.translate(g, b), r.rotate(y), r.scale(H, H)), (u === "filled" || u === "both") && (E ? r.fill(T) : r.fill()), (u === "hollow" || u === "both") && (r.lineWidth = (_.matchEdgeWidth ? c : 1) / (E ? H : 1), r.lineJoin = "miter", E ? r.stroke(T) : r.stroke()), E && (r.scale(1 / H, 1 / H), r.rotate(-y), r.translate(-g, -b));
-};
-var q6 = {};
-q6.safeDrawImage = function(a, r, u, c, d, g, b, y, k, E) {
-  if (!(d <= 0 || g <= 0 || k <= 0 || E <= 0))
-    try {
-      a.drawImage(r, u, c, d, g, b, y, k, E);
-    } catch (C) {
-      Sr(C);
-    }
-};
-q6.drawInscribedImage = function(a, r, u, c, d) {
-  var g = this, b = u.position(), y = b.x, k = b.y, E = u.cy().style(), C = E.getIndexedStyle.bind(E), T = C(u, "background-fit", "value", c), P = C(u, "background-repeat", "value", c), N = u.width(), D = u.height(), H = u.padding() * 2, _ = N + (C(u, "background-width-relative-to", "value", c) === "inner" ? 0 : H), B = D + (C(u, "background-height-relative-to", "value", c) === "inner" ? 0 : H), $ = u._private.rscratch, F = C(u, "background-clip", "value", c), W = F === "node", Q = C(u, "background-image-opacity", "value", c) * d, X = C(u, "background-image-smoothing", "value", c), K = r.width || r.cachedW, ee = r.height || r.cachedH;
-  (K == null || ee == null) && (document.body.appendChild(r), K = r.cachedW = r.width || r.offsetWidth, ee = r.cachedH = r.height || r.offsetHeight, document.body.removeChild(r));
-  var Z = K, ae = ee;
-  if (C(u, "background-width", "value", c) !== "auto" && (C(u, "background-width", "units", c) === "%" ? Z = C(u, "background-width", "pfValue", c) * _ : Z = C(u, "background-width", "pfValue", c)), C(u, "background-height", "value", c) !== "auto" && (C(u, "background-height", "units", c) === "%" ? ae = C(u, "background-height", "pfValue", c) * B : ae = C(u, "background-height", "pfValue", c)), !(Z === 0 || ae === 0)) {
-    if (T === "contain") {
-      var oe = Math.min(_ / Z, B / ae);
-      Z *= oe, ae *= oe;
-    } else if (T === "cover") {
-      var oe = Math.max(_ / Z, B / ae);
-      Z *= oe, ae *= oe;
-    }
-    var J = y - _ / 2, fe = C(u, "background-position-x", "units", c), se = C(u, "background-position-x", "pfValue", c);
-    fe === "%" ? J += (_ - Z) * se : J += se;
-    var pe = C(u, "background-offset-x", "units", c), he = C(u, "background-offset-x", "pfValue", c);
-    pe === "%" ? J += (_ - Z) * he : J += he;
-    var de = k - B / 2, ke = C(u, "background-position-y", "units", c), Pe = C(u, "background-position-y", "pfValue", c);
-    ke === "%" ? de += (B - ae) * Pe : de += Pe;
-    var Ae = C(u, "background-offset-y", "units", c), Te = C(u, "background-offset-y", "pfValue", c);
-    Ae === "%" ? de += (B - ae) * Te : de += Te, $.pathCache && (J -= y, de -= k, y = 0, k = 0);
-    var Oe = a.globalAlpha;
-    a.globalAlpha = Q;
-    var ze = g.getImgSmoothing(a), We = !1;
-    if (X === "no" && ze ? (g.setImgSmoothing(a, !1), We = !0) : X === "yes" && !ze && (g.setImgSmoothing(a, !0), We = !0), P === "no-repeat")
-      W && (a.save(), $.pathCache ? a.clip($.pathCache) : (g.nodeShapes[g.getNodeShape(u)].draw(a, y, k, _, B), a.clip())), g.safeDrawImage(a, r, 0, 0, K, ee, J, de, Z, ae), W && a.restore();
-    else {
-      var $e = a.createPattern(r, P);
-      a.fillStyle = $e, g.nodeShapes[g.getNodeShape(u)].draw(a, y, k, _, B), a.translate(J, de), a.fill(), a.translate(-J, -de);
-    }
-    a.globalAlpha = Oe, We && g.setImgSmoothing(a, ze);
-  }
-};
-var wv = {};
-wv.eleTextBiggerThanMin = function(a, r) {
-  if (!r) {
-    var u = a.cy().zoom(), c = this.getPixelRatio(), d = Math.ceil(M6(u * c));
-    r = Math.pow(2, d);
-  }
-  var g = a.pstyle("font-size").pfValue * r, b = a.pstyle("min-zoomed-font-size").pfValue;
-  return !(g < b);
-};
-wv.drawElementText = function(a, r, u, c, d) {
-  var g = arguments.length > 5 && arguments[5] !== void 0 ? arguments[5] : !0, b = this;
-  if (c == null) {
-    if (g && !b.eleTextBiggerThanMin(r))
-      return;
-  } else if (c === !1)
-    return;
-  if (r.isNode()) {
-    var y = r.pstyle("label");
-    if (!y || !y.value)
-      return;
-    var k = b.getLabelJustification(r);
-    a.textAlign = k, a.textBaseline = "bottom";
-  } else {
-    var E = r.element()._private.rscratch.badLine, C = r.pstyle("label"), T = r.pstyle("source-label"), P = r.pstyle("target-label");
-    if (E || (!C || !C.value) && (!T || !T.value) && (!P || !P.value))
-      return;
-    a.textAlign = "center", a.textBaseline = "bottom";
-  }
-  var N = !u, D;
-  u && (D = u, a.translate(-D.x1, -D.y1)), d == null ? (b.drawText(a, r, null, N, g), r.isEdge() && (b.drawText(a, r, "source", N, g), b.drawText(a, r, "target", N, g))) : b.drawText(a, r, d, N, g), u && a.translate(D.x1, D.y1);
-};
-wv.getFontCache = function(a) {
-  var r;
-  this.fontCaches = this.fontCaches || [];
-  for (var u = 0; u < this.fontCaches.length; u++)
-    if (r = this.fontCaches[u], r.context === a)
-      return r;
-  return r = {
-    context: a
-  }, this.fontCaches.push(r), r;
-};
-wv.setupTextStyle = function(a, r) {
-  var u = arguments.length > 2 && arguments[2] !== void 0 ? arguments[2] : !0, c = r.pstyle("font-style").strValue, d = r.pstyle("font-size").pfValue + "px", g = r.pstyle("font-family").strValue, b = r.pstyle("font-weight").strValue, y = u ? r.effectiveOpacity() * r.pstyle("text-opacity").value : 1, k = r.pstyle("text-outline-opacity").value * y, E = r.pstyle("color").value, C = r.pstyle("text-outline-color").value;
-  a.font = c + " " + b + " " + d + " " + g, a.lineJoin = "round", this.colorFillStyle(a, E[0], E[1], E[2], y), this.colorStrokeStyle(a, C[0], C[1], C[2], k);
-};
-function Ile(a, r, u, c, d) {
-  var g = arguments.length > 5 && arguments[5] !== void 0 ? arguments[5] : 5;
-  a.beginPath(), a.moveTo(r + g, u), a.lineTo(r + c - g, u), a.quadraticCurveTo(r + c, u, r + c, u + g), a.lineTo(r + c, u + d - g), a.quadraticCurveTo(r + c, u + d, r + c - g, u + d), a.lineTo(r + g, u + d), a.quadraticCurveTo(r, u + d, r, u + d - g), a.lineTo(r, u + g), a.quadraticCurveTo(r, u, r + g, u), a.closePath(), a.fill();
-}
-wv.getTextAngle = function(a, r) {
-  var u, c = a._private, d = c.rscratch, g = r ? r + "-" : "", b = a.pstyle(g + "text-rotation"), y = Sc(d, "labelAngle", r);
-  return b.strValue === "autorotate" ? u = a.isEdge() ? y : 0 : b.strValue === "none" ? u = 0 : u = b.pfValue, u;
-};
-wv.drawText = function(a, r, u) {
-  var c = arguments.length > 3 && arguments[3] !== void 0 ? arguments[3] : !0, d = arguments.length > 4 && arguments[4] !== void 0 ? arguments[4] : !0, g = r._private, b = g.rscratch, y = d ? r.effectiveOpacity() : 1;
-  if (!(d && (y === 0 || r.pstyle("text-opacity").value === 0))) {
-    u === "main" && (u = null);
-    var k = Sc(b, "labelX", u), E = Sc(b, "labelY", u), C, T, P = this.getLabelText(r, u);
-    if (P != null && P !== "" && !isNaN(k) && !isNaN(E)) {
-      this.setupTextStyle(a, r, d);
-      var N = u ? u + "-" : "", D = Sc(b, "labelWidth", u), H = Sc(b, "labelHeight", u), _ = r.pstyle(N + "text-margin-x").pfValue, B = r.pstyle(N + "text-margin-y").pfValue, $ = r.isEdge(), F = r.pstyle("text-halign").value, W = r.pstyle("text-valign").value;
-      $ && (F = "center", W = "center"), k += _, E += B;
-      var Q;
-      switch (c ? Q = this.getTextAngle(r, u) : Q = 0, Q !== 0 && (C = k, T = E, a.translate(C, T), a.rotate(Q), k = 0, E = 0), W) {
-        case "top":
-          break;
-        case "center":
-          E += H / 2;
-          break;
-        case "bottom":
-          E += H;
-          break;
-      }
-      var X = r.pstyle("text-background-opacity").value, K = r.pstyle("text-border-opacity").value, ee = r.pstyle("text-border-width").pfValue, Z = r.pstyle("text-background-padding").pfValue;
-      if (X > 0 || ee > 0 && K > 0) {
-        var ae = k - Z;
-        switch (F) {
-          case "left":
-            ae -= D;
-            break;
-          case "center":
-            ae -= D / 2;
-            break;
-        }
-        var oe = E - H - Z, J = D + 2 * Z, fe = H + 2 * Z;
-        if (X > 0) {
-          var se = a.fillStyle, pe = r.pstyle("text-background-color").value;
-          a.fillStyle = "rgba(" + pe[0] + "," + pe[1] + "," + pe[2] + "," + X * y + ")";
-          var he = r.pstyle("text-background-shape").strValue;
-          he.indexOf("round") === 0 ? Ile(a, ae, oe, J, fe, 2) : a.fillRect(ae, oe, J, fe), a.fillStyle = se;
-        }
-        if (ee > 0 && K > 0) {
-          var de = a.strokeStyle, ke = a.lineWidth, Pe = r.pstyle("text-border-color").value, Ae = r.pstyle("text-border-style").value;
-          if (a.strokeStyle = "rgba(" + Pe[0] + "," + Pe[1] + "," + Pe[2] + "," + K * y + ")", a.lineWidth = ee, a.setLineDash)
-            switch (Ae) {
-              case "dotted":
-                a.setLineDash([1, 1]);
-                break;
-              case "dashed":
-                a.setLineDash([4, 2]);
-                break;
-              case "double":
-                a.lineWidth = ee / 4, a.setLineDash([]);
-                break;
-              case "solid":
-                a.setLineDash([]);
-                break;
-            }
-          if (a.strokeRect(ae, oe, J, fe), Ae === "double") {
-            var Te = ee / 2;
-            a.strokeRect(ae + Te, oe + Te, J - Te * 2, fe - Te * 2);
-          }
-          a.setLineDash && a.setLineDash([]), a.lineWidth = ke, a.strokeStyle = de;
-        }
-      }
-      var Oe = 2 * r.pstyle("text-outline-width").pfValue;
-      if (Oe > 0 && (a.lineWidth = Oe), r.pstyle("text-wrap").value === "wrap") {
-        var ze = Sc(b, "labelWrapCachedLines", u), We = Sc(b, "labelLineHeight", u), $e = D / 2, Ge = this.getLabelJustification(r);
-        switch (Ge === "auto" || (F === "left" ? Ge === "left" ? k += -D : Ge === "center" && (k += -$e) : F === "center" ? Ge === "left" ? k += -$e : Ge === "right" && (k += $e) : F === "right" && (Ge === "center" ? k += $e : Ge === "right" && (k += D))), W) {
-          case "top":
-            E -= (ze.length - 1) * We;
-            break;
-          case "center":
-          case "bottom":
-            E -= (ze.length - 1) * We;
-            break;
-        }
-        for (var me = 0; me < ze.length; me++)
-          Oe > 0 && a.strokeText(ze[me], k, E), a.fillText(ze[me], k, E), E += We;
-      } else
-        Oe > 0 && a.strokeText(P, k, E), a.fillText(P, k, E);
-      Q !== 0 && (a.rotate(-Q), a.translate(-C, -T));
-    }
-  }
-};
-var Fb = {};
-Fb.drawNode = function(a, r, u) {
-  var c = arguments.length > 3 && arguments[3] !== void 0 ? arguments[3] : !0, d = arguments.length > 4 && arguments[4] !== void 0 ? arguments[4] : !0, g = arguments.length > 5 && arguments[5] !== void 0 ? arguments[5] : !0, b = this, y, k, E = r._private, C = E.rscratch, T = r.position();
-  if (!(!kt(T.x) || !kt(T.y)) && !(g && !r.visible())) {
-    var P = g ? r.effectiveOpacity() : 1, N = b.usePaths(), D, H = !1, _ = r.padding();
-    y = r.width() + 2 * _, k = r.height() + 2 * _;
-    var B;
-    u && (B = u, a.translate(-B.x1, -B.y1));
-    for (var $ = r.pstyle("background-image"), F = $.value, W = new Array(F.length), Q = new Array(F.length), X = 0, K = 0; K < F.length; K++) {
-      var ee = F[K], Z = W[K] = ee != null && ee !== "none";
-      if (Z) {
-        var ae = r.cy().style().getIndexedStyle(r, "background-image-crossorigin", "value", K);
-        X++, Q[K] = b.getCachedImage(ee, ae, function() {
-          E.backgroundTimestamp = Date.now(), r.emitAndNotify("background");
-        });
-      }
-    }
-    var oe = r.pstyle("background-blacken").value, J = r.pstyle("border-width").pfValue, fe = r.pstyle("background-opacity").value * P, se = r.pstyle("border-color").value, pe = r.pstyle("border-style").value, he = r.pstyle("border-opacity").value * P;
-    a.lineJoin = "miter";
-    var de = function() {
-      var yt = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : fe;
-      b.eleFillStyle(a, r, yt);
-    }, ke = function() {
-      var yt = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : he;
-      b.colorStrokeStyle(a, se[0], se[1], se[2], yt);
-    }, Pe = r.pstyle("shape").strValue, Ae = r.pstyle("shape-polygon-points").pfValue;
-    if (N) {
-      a.translate(T.x, T.y);
-      var Te = b.nodePathCache = b.nodePathCache || [], Oe = UG(Pe === "polygon" ? Pe + "," + Ae.join(",") : Pe, "" + k, "" + y), ze = Te[Oe];
-      ze != null ? (D = ze, H = !0, C.pathCache = D) : (D = new Path2D(), Te[Oe] = C.pathCache = D);
-    }
-    var We = function() {
-      if (!H) {
-        var yt = T;
-        N && (yt = {
-          x: 0,
-          y: 0
-        }), b.nodeShapes[b.getNodeShape(r)].draw(D || a, yt.x, yt.y, y, k);
-      }
-      N ? a.fill(D) : a.fill();
-    }, $e = function() {
-      for (var yt = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : P, Mt = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : !0, In = E.backgrounding, Pn = 0, Vt = 0; Vt < Q.length; Vt++) {
-        var ar = r.cy().style().getIndexedStyle(r, "background-image-containment", "value", Vt);
-        if (Mt && ar === "over" || !Mt && ar === "inside") {
-          Pn++;
-          continue;
-        }
-        W[Vt] && Q[Vt].complete && !Q[Vt].error && (Pn++, b.drawInscribedImage(a, Q[Vt], r, Vt, yt));
-      }
-      E.backgrounding = Pn !== X, In !== E.backgrounding && r.updateStyle(!1);
-    }, Ge = function() {
-      var yt = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : !1, Mt = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : P;
-      b.hasPie(r) && (b.drawPie(a, r, Mt), yt && (N || b.nodeShapes[b.getNodeShape(r)].draw(a, T.x, T.y, y, k)));
-    }, me = function() {
-      var yt = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : P, Mt = (oe > 0 ? oe : -oe) * yt, In = oe > 0 ? 0 : 255;
-      oe !== 0 && (b.colorFillStyle(a, In, In, In, Mt), N ? a.fill(D) : a.fill());
-    }, Ve = function() {
-      if (J > 0) {
-        if (a.lineWidth = J, a.lineCap = "butt", a.setLineDash)
-          switch (pe) {
-            case "dotted":
-              a.setLineDash([1, 1]);
-              break;
-            case "dashed":
-              a.setLineDash([4, 2]);
-              break;
-            case "solid":
-            case "double":
-              a.setLineDash([]);
-              break;
-          }
-        if (N ? a.stroke(D) : a.stroke(), pe === "double") {
-          a.lineWidth = J / 3;
-          var yt = a.globalCompositeOperation;
-          a.globalCompositeOperation = "destination-out", N ? a.stroke(D) : a.stroke(), a.globalCompositeOperation = yt;
-        }
-        a.setLineDash && a.setLineDash([]);
-      }
-    }, Ke = function() {
-      d && b.drawNodeOverlay(a, r, T, y, k);
-    }, at = function() {
-      d && b.drawNodeUnderlay(a, r, T, y, k);
-    }, ft = function() {
-      b.drawElementText(a, r, null, c);
-    }, en = r.pstyle("ghost").value === "yes";
-    if (en) {
-      var gn = r.pstyle("ghost-offset-x").pfValue, mt = r.pstyle("ghost-offset-y").pfValue, ht = r.pstyle("ghost-opacity").value, Rt = ht * P;
-      a.translate(gn, mt), de(ht * fe), We(), $e(Rt, !0), ke(ht * he), Ve(), Ge(oe !== 0 || J !== 0), $e(Rt, !1), me(Rt), a.translate(-gn, -mt);
-    }
-    N && a.translate(-T.x, -T.y), at(), N && a.translate(T.x, T.y), de(), We(), $e(P, !0), ke(), Ve(), Ge(oe !== 0 || J !== 0), $e(P, !1), me(), N && a.translate(-T.x, -T.y), ft(), Ke(), u && a.translate(B.x1, B.y1);
-  }
-};
-var J$ = function(r) {
-  if (!["overlay", "underlay"].includes(r))
-    throw new Error("Invalid state");
-  return function(u, c, d, g, b) {
-    var y = this;
-    if (c.visible()) {
-      var k = c.pstyle("".concat(r, "-padding")).pfValue, E = c.pstyle("".concat(r, "-opacity")).value, C = c.pstyle("".concat(r, "-color")).value, T = c.pstyle("".concat(r, "-shape")).value;
-      if (E > 0) {
-        if (d = d || c.position(), g == null || b == null) {
-          var P = c.padding();
-          g = c.width() + 2 * P, b = c.height() + 2 * P;
-        }
-        y.colorFillStyle(u, C[0], C[1], C[2], E), y.nodeShapes[T].draw(u, d.x, d.y, g + k * 2, b + k * 2), u.fill();
-      }
-    }
-  };
-};
-Fb.drawNodeOverlay = J$("overlay");
-Fb.drawNodeUnderlay = J$("underlay");
-Fb.hasPie = function(a) {
-  return a = a[0], a._private.hasPie;
-};
-Fb.drawPie = function(a, r, u, c) {
-  r = r[0], c = c || r.position();
-  var d = r.cy().style(), g = r.pstyle("pie-size"), b = c.x, y = c.y, k = r.width(), E = r.height(), C = Math.min(k, E) / 2, T = 0, P = this.usePaths();
-  P && (b = 0, y = 0), g.units === "%" ? C = C * g.pfValue : g.pfValue !== void 0 && (C = g.pfValue / 2);
-  for (var N = 1; N <= d.pieBackgroundN; N++) {
-    var D = r.pstyle("pie-" + N + "-background-size").value, H = r.pstyle("pie-" + N + "-background-color").value, _ = r.pstyle("pie-" + N + "-background-opacity").value * u, B = D / 100;
-    B + T > 1 && (B = 1 - T);
-    var $ = 1.5 * Math.PI + 2 * Math.PI * T, F = 2 * Math.PI * B, W = $ + F;
-    D === 0 || T >= 1 || T + B > 1 || (a.beginPath(), a.moveTo(b, y), a.arc(b, y, C, $, W), a.closePath(), this.colorFillStyle(a, H[0], H[1], H[2], _), a.fill(), T += B);
-  }
-};
-var nu = {}, Mle = 100;
-nu.getPixelRatio = function() {
-  var a = this.data.contexts[0];
-  if (this.forcedPixelRatio != null)
-    return this.forcedPixelRatio;
-  var r = a.backingStorePixelRatio || a.webkitBackingStorePixelRatio || a.mozBackingStorePixelRatio || a.msBackingStorePixelRatio || a.oBackingStorePixelRatio || a.backingStorePixelRatio || 1;
-  return (window.devicePixelRatio || 1) / r;
-};
-nu.paintCache = function(a) {
-  for (var r = this.paintCaches = this.paintCaches || [], u = !0, c, d = 0; d < r.length; d++)
-    if (c = r[d], c.context === a) {
-      u = !1;
-      break;
-    }
-  return u && (c = {
-    context: a
-  }, r.push(c)), c;
-};
-nu.createGradientStyleFor = function(a, r, u, c, d) {
-  var g, b = this.usePaths(), y = u.pstyle(r + "-gradient-stop-colors").value, k = u.pstyle(r + "-gradient-stop-positions").pfValue;
-  if (c === "radial-gradient")
-    if (u.isEdge()) {
-      var E = u.sourceEndpoint(), C = u.targetEndpoint(), T = u.midpoint(), P = hv(E, T), N = hv(C, T);
-      g = a.createRadialGradient(T.x, T.y, 0, T.x, T.y, Math.max(P, N));
-    } else {
-      var D = b ? {
-        x: 0,
-        y: 0
-      } : u.position(), H = u.paddedWidth(), _ = u.paddedHeight();
-      g = a.createRadialGradient(D.x, D.y, 0, D.x, D.y, Math.max(H, _));
-    }
-  else if (u.isEdge()) {
-    var B = u.sourceEndpoint(), $ = u.targetEndpoint();
-    g = a.createLinearGradient(B.x, B.y, $.x, $.y);
-  } else {
-    var F = b ? {
-      x: 0,
-      y: 0
-    } : u.position(), W = u.paddedWidth(), Q = u.paddedHeight(), X = W / 2, K = Q / 2, ee = u.pstyle("background-gradient-direction").value;
-    switch (ee) {
-      case "to-bottom":
-        g = a.createLinearGradient(F.x, F.y - K, F.x, F.y + K);
-        break;
-      case "to-top":
-        g = a.createLinearGradient(F.x, F.y + K, F.x, F.y - K);
-        break;
-      case "to-left":
-        g = a.createLinearGradient(F.x + X, F.y, F.x - X, F.y);
-        break;
-      case "to-right":
-        g = a.createLinearGradient(F.x - X, F.y, F.x + X, F.y);
-        break;
-      case "to-bottom-right":
-      case "to-right-bottom":
-        g = a.createLinearGradient(F.x - X, F.y - K, F.x + X, F.y + K);
-        break;
-      case "to-top-right":
-      case "to-right-top":
-        g = a.createLinearGradient(F.x - X, F.y + K, F.x + X, F.y - K);
-        break;
-      case "to-bottom-left":
-      case "to-left-bottom":
-        g = a.createLinearGradient(F.x + X, F.y - K, F.x - X, F.y + K);
-        break;
-      case "to-top-left":
-      case "to-left-top":
-        g = a.createLinearGradient(F.x + X, F.y + K, F.x - X, F.y - K);
-        break;
-    }
-  }
-  if (!g)
-    return null;
-  for (var Z = k.length === y.length, ae = y.length, oe = 0; oe < ae; oe++)
-    g.addColorStop(Z ? k[oe] : oe / (ae - 1), "rgba(" + y[oe][0] + "," + y[oe][1] + "," + y[oe][2] + "," + d + ")");
-  return g;
-};
-nu.gradientFillStyle = function(a, r, u, c) {
-  var d = this.createGradientStyleFor(a, "background", r, u, c);
-  if (!d)
-    return null;
-  a.fillStyle = d;
-};
-nu.colorFillStyle = function(a, r, u, c, d) {
-  a.fillStyle = "rgba(" + r + "," + u + "," + c + "," + d + ")";
-};
-nu.eleFillStyle = function(a, r, u) {
-  var c = r.pstyle("background-fill").value;
-  if (c === "linear-gradient" || c === "radial-gradient")
-    this.gradientFillStyle(a, r, c, u);
-  else {
-    var d = r.pstyle("background-color").value;
-    this.colorFillStyle(a, d[0], d[1], d[2], u);
-  }
-};
-nu.gradientStrokeStyle = function(a, r, u, c) {
-  var d = this.createGradientStyleFor(a, "line", r, u, c);
-  if (!d)
-    return null;
-  a.strokeStyle = d;
-};
-nu.colorStrokeStyle = function(a, r, u, c, d) {
-  a.strokeStyle = "rgba(" + r + "," + u + "," + c + "," + d + ")";
-};
-nu.eleStrokeStyle = function(a, r, u) {
-  var c = r.pstyle("line-fill").value;
-  if (c === "linear-gradient" || c === "radial-gradient")
-    this.gradientStrokeStyle(a, r, c, u);
-  else {
-    var d = r.pstyle("line-color").value;
-    this.colorStrokeStyle(a, d[0], d[1], d[2], u);
-  }
-};
-nu.matchCanvasSize = function(a) {
-  var r = this, u = r.data, c = r.findContainerClientCoords(), d = c[2], g = c[3], b = r.getPixelRatio(), y = r.motionBlurPxRatio;
-  (a === r.data.bufferCanvases[r.MOTIONBLUR_BUFFER_NODE] || a === r.data.bufferCanvases[r.MOTIONBLUR_BUFFER_DRAG]) && (b = y);
-  var k = d * b, E = g * b, C;
-  if (!(k === r.canvasWidth && E === r.canvasHeight)) {
-    r.fontCaches = null;
-    var T = u.canvasContainer;
-    T.style.width = d + "px", T.style.height = g + "px";
-    for (var P = 0; P < r.CANVAS_LAYERS; P++)
-      C = u.canvases[P], C.width = k, C.height = E, C.style.width = d + "px", C.style.height = g + "px";
-    for (var P = 0; P < r.BUFFER_COUNT; P++)
-      C = u.bufferCanvases[P], C.width = k, C.height = E, C.style.width = d + "px", C.style.height = g + "px";
-    r.textureMult = 1, b <= 1 && (C = u.bufferCanvases[r.TEXTURE_BUFFER], r.textureMult = 2, C.width = k * r.textureMult, C.height = E * r.textureMult), r.canvasWidth = k, r.canvasHeight = E;
-  }
-};
-nu.renderTo = function(a, r, u, c) {
-  this.render({
-    forcedContext: a,
-    forcedZoom: r,
-    forcedPan: u,
-    drawAllLayers: !0,
-    forcedPxRatio: c
-  });
-};
-nu.render = function(a) {
-  a = a || QG();
-  var r = a.forcedContext, u = a.drawAllLayers, c = a.drawOnlyNodeLayer, d = a.forcedZoom, g = a.forcedPan, b = this, y = a.forcedPxRatio === void 0 ? this.getPixelRatio() : a.forcedPxRatio, k = b.cy, E = b.data, C = E.canvasNeedsRedraw, T = b.textureOnViewport && !r && (b.pinching || b.hoverData.dragging || b.swipePanning || b.data.wheelZooming), P = a.motionBlur !== void 0 ? a.motionBlur : b.motionBlur, N = b.motionBlurPxRatio, D = k.hasCompoundNodes(), H = b.hoverData.draggingEles, _ = !!(b.hoverData.selecting || b.touchData.selecting);
-  P = P && !r && b.motionBlurEnabled && !_;
-  var B = P;
-  r || (b.prevPxRatio !== y && (b.invalidateContainerClientCoordsCache(), b.matchCanvasSize(b.container), b.redrawHint("eles", !0), b.redrawHint("drag", !0)), b.prevPxRatio = y), !r && b.motionBlurTimeout && clearTimeout(b.motionBlurTimeout), P && (b.mbFrames == null && (b.mbFrames = 0), b.mbFrames++, b.mbFrames < 3 && (B = !1), b.mbFrames > b.minMbLowQualFrames && (b.motionBlurPxRatio = b.mbPxRBlurry)), b.clearingMotionBlur && (b.motionBlurPxRatio = 1), b.textureDrawLastFrame && !T && (C[b.NODE] = !0, C[b.SELECT_BOX] = !0);
-  var $ = k.style(), F = k.zoom(), W = d !== void 0 ? d : F, Q = k.pan(), X = {
-    x: Q.x,
-    y: Q.y
-  }, K = {
-    zoom: F,
-    pan: {
-      x: Q.x,
-      y: Q.y
-    }
-  }, ee = b.prevViewport, Z = ee === void 0 || K.zoom !== ee.zoom || K.pan.x !== ee.pan.x || K.pan.y !== ee.pan.y;
-  !Z && !(H && !D) && (b.motionBlurPxRatio = 1), g && (X = g), W *= y, X.x *= y, X.y *= y;
-  var ae = b.getCachedZSortedEles();
-  function oe(mt, ht, Rt, Lt, yt) {
-    var Mt = mt.globalCompositeOperation;
-    mt.globalCompositeOperation = "destination-out", b.colorFillStyle(mt, 255, 255, 255, b.motionBlurTransparency), mt.fillRect(ht, Rt, Lt, yt), mt.globalCompositeOperation = Mt;
-  }
-  function J(mt, ht) {
-    var Rt, Lt, yt, Mt;
-    !b.clearingMotionBlur && (mt === E.bufferContexts[b.MOTIONBLUR_BUFFER_NODE] || mt === E.bufferContexts[b.MOTIONBLUR_BUFFER_DRAG]) ? (Rt = {
-      x: Q.x * N,
-      y: Q.y * N
-    }, Lt = F * N, yt = b.canvasWidth * N, Mt = b.canvasHeight * N) : (Rt = X, Lt = W, yt = b.canvasWidth, Mt = b.canvasHeight), mt.setTransform(1, 0, 0, 1, 0, 0), ht === "motionBlur" ? oe(mt, 0, 0, yt, Mt) : !r && (ht === void 0 || ht) && mt.clearRect(0, 0, yt, Mt), u || (mt.translate(Rt.x, Rt.y), mt.scale(Lt, Lt)), g && mt.translate(g.x, g.y), d && mt.scale(d, d);
-  }
-  if (T || (b.textureDrawLastFrame = !1), T) {
-    if (b.textureDrawLastFrame = !0, !b.textureCache) {
-      b.textureCache = {}, b.textureCache.bb = k.mutableElements().boundingBox(), b.textureCache.texture = b.data.bufferCanvases[b.TEXTURE_BUFFER];
-      var fe = b.data.bufferContexts[b.TEXTURE_BUFFER];
-      fe.setTransform(1, 0, 0, 1, 0, 0), fe.clearRect(0, 0, b.canvasWidth * b.textureMult, b.canvasHeight * b.textureMult), b.render({
-        forcedContext: fe,
-        drawOnlyNodeLayer: !0,
-        forcedPxRatio: y * b.textureMult
-      });
-      var K = b.textureCache.viewport = {
-        zoom: k.zoom(),
-        pan: k.pan(),
-        width: b.canvasWidth,
-        height: b.canvasHeight
-      };
-      K.mpan = {
-        x: (0 - K.pan.x) / K.zoom,
-        y: (0 - K.pan.y) / K.zoom
-      };
-    }
-    C[b.DRAG] = !1, C[b.NODE] = !1;
-    var se = E.contexts[b.NODE], pe = b.textureCache.texture, K = b.textureCache.viewport;
-    se.setTransform(1, 0, 0, 1, 0, 0), P ? oe(se, 0, 0, K.width, K.height) : se.clearRect(0, 0, K.width, K.height);
-    var he = $.core("outside-texture-bg-color").value, de = $.core("outside-texture-bg-opacity").value;
-    b.colorFillStyle(se, he[0], he[1], he[2], de), se.fillRect(0, 0, K.width, K.height);
-    var F = k.zoom();
-    J(se, !1), se.clearRect(K.mpan.x, K.mpan.y, K.width / K.zoom / y, K.height / K.zoom / y), se.drawImage(pe, K.mpan.x, K.mpan.y, K.width / K.zoom / y, K.height / K.zoom / y);
-  } else
-    b.textureOnViewport && !r && (b.textureCache = null);
-  var ke = k.extent(), Pe = b.pinching || b.hoverData.dragging || b.swipePanning || b.data.wheelZooming || b.hoverData.draggingEles || b.cy.animated(), Ae = b.hideEdgesOnViewport && Pe, Te = [];
-  if (Te[b.NODE] = !C[b.NODE] && P && !b.clearedForMotionBlur[b.NODE] || b.clearingMotionBlur, Te[b.NODE] && (b.clearedForMotionBlur[b.NODE] = !0), Te[b.DRAG] = !C[b.DRAG] && P && !b.clearedForMotionBlur[b.DRAG] || b.clearingMotionBlur, Te[b.DRAG] && (b.clearedForMotionBlur[b.DRAG] = !0), C[b.NODE] || u || c || Te[b.NODE]) {
-    var Oe = P && !Te[b.NODE] && N !== 1, se = r || (Oe ? b.data.bufferContexts[b.MOTIONBLUR_BUFFER_NODE] : E.contexts[b.NODE]), ze = P && !Oe ? "motionBlur" : void 0;
-    J(se, ze), Ae ? b.drawCachedNodes(se, ae.nondrag, y, ke) : b.drawLayeredElements(se, ae.nondrag, y, ke), b.debug && b.drawDebugPoints(se, ae.nondrag), !u && !P && (C[b.NODE] = !1);
-  }
-  if (!c && (C[b.DRAG] || u || Te[b.DRAG])) {
-    var Oe = P && !Te[b.DRAG] && N !== 1, se = r || (Oe ? b.data.bufferContexts[b.MOTIONBLUR_BUFFER_DRAG] : E.contexts[b.DRAG]);
-    J(se, P && !Oe ? "motionBlur" : void 0), Ae ? b.drawCachedNodes(se, ae.drag, y, ke) : b.drawCachedElements(se, ae.drag, y, ke), b.debug && b.drawDebugPoints(se, ae.drag), !u && !P && (C[b.DRAG] = !1);
-  }
-  if (b.showFps || !c && C[b.SELECT_BOX] && !u) {
-    var se = r || E.contexts[b.SELECT_BOX];
-    if (J(se), b.selection[4] == 1 && (b.hoverData.selecting || b.touchData.selecting)) {
-      var F = b.cy.zoom(), We = $.core("selection-box-border-width").value / F;
-      se.lineWidth = We, se.fillStyle = "rgba(" + $.core("selection-box-color").value[0] + "," + $.core("selection-box-color").value[1] + "," + $.core("selection-box-color").value[2] + "," + $.core("selection-box-opacity").value + ")", se.fillRect(b.selection[0], b.selection[1], b.selection[2] - b.selection[0], b.selection[3] - b.selection[1]), We > 0 && (se.strokeStyle = "rgba(" + $.core("selection-box-border-color").value[0] + "," + $.core("selection-box-border-color").value[1] + "," + $.core("selection-box-border-color").value[2] + "," + $.core("selection-box-opacity").value + ")", se.strokeRect(b.selection[0], b.selection[1], b.selection[2] - b.selection[0], b.selection[3] - b.selection[1]));
-    }
-    if (E.bgActivePosistion && !b.hoverData.selecting) {
-      var F = b.cy.zoom(), $e = E.bgActivePosistion;
-      se.fillStyle = "rgba(" + $.core("active-bg-color").value[0] + "," + $.core("active-bg-color").value[1] + "," + $.core("active-bg-color").value[2] + "," + $.core("active-bg-opacity").value + ")", se.beginPath(), se.arc($e.x, $e.y, $.core("active-bg-size").pfValue / F, 0, 2 * Math.PI), se.fill();
-    }
-    var Ge = b.lastRedrawTime;
-    if (b.showFps && Ge) {
-      Ge = Math.round(Ge);
-      var me = Math.round(1e3 / Ge);
-      se.setTransform(1, 0, 0, 1, 0, 0), se.fillStyle = "rgba(255, 0, 0, 0.75)", se.strokeStyle = "rgba(255, 0, 0, 0.75)", se.lineWidth = 1, se.fillText("1 frame = " + Ge + " ms = " + me + " fps", 0, 20);
-      var Ve = 60;
-      se.strokeRect(0, 30, 250, 20), se.fillRect(0, 30, 250 * Math.min(me / Ve, 1), 20);
-    }
-    u || (C[b.SELECT_BOX] = !1);
-  }
-  if (P && N !== 1) {
-    var Ke = E.contexts[b.NODE], at = b.data.bufferCanvases[b.MOTIONBLUR_BUFFER_NODE], ft = E.contexts[b.DRAG], en = b.data.bufferCanvases[b.MOTIONBLUR_BUFFER_DRAG], gn = function(ht, Rt, Lt) {
-      ht.setTransform(1, 0, 0, 1, 0, 0), Lt || !B ? ht.clearRect(0, 0, b.canvasWidth, b.canvasHeight) : oe(ht, 0, 0, b.canvasWidth, b.canvasHeight);
-      var yt = N;
-      ht.drawImage(
-        Rt,
-        // img
-        0,
-        0,
-        // sx, sy
-        b.canvasWidth * yt,
-        b.canvasHeight * yt,
-        // sw, sh
-        0,
-        0,
-        // x, y
-        b.canvasWidth,
-        b.canvasHeight
-        // w, h
-      );
-    };
-    (C[b.NODE] || Te[b.NODE]) && (gn(Ke, at, Te[b.NODE]), C[b.NODE] = !1), (C[b.DRAG] || Te[b.DRAG]) && (gn(ft, en, Te[b.DRAG]), C[b.DRAG] = !1);
-  }
-  b.prevViewport = K, b.clearingMotionBlur && (b.clearingMotionBlur = !1, b.motionBlurCleared = !0, b.motionBlur = !0), P && (b.motionBlurTimeout = setTimeout(function() {
-    b.motionBlurTimeout = null, b.clearedForMotionBlur[b.NODE] = !1, b.clearedForMotionBlur[b.DRAG] = !1, b.motionBlur = !1, b.clearingMotionBlur = !T, b.mbFrames = 0, C[b.NODE] = !0, C[b.DRAG] = !0, b.redraw();
-  }, Mle)), r || k.emit("render");
-};
-var Fh = {};
-Fh.drawPolygonPath = function(a, r, u, c, d, g) {
-  var b = c / 2, y = d / 2;
-  a.beginPath && a.beginPath(), a.moveTo(r + b * g[0], u + y * g[1]);
-  for (var k = 1; k < g.length / 2; k++)
-    a.lineTo(r + b * g[k * 2], u + y * g[k * 2 + 1]);
-  a.closePath();
-};
-Fh.drawRoundPolygonPath = function(a, r, u, c, d, g) {
-  var b = c / 2, y = d / 2, k = A6(c, d);
-  a.beginPath && a.beginPath();
-  for (var E = 0; E < g.length / 4; E++) {
-    var C = void 0, T = void 0;
-    E === 0 ? C = g.length - 2 : C = E * 4 - 2, T = E * 4 + 2;
-    var P = r + b * g[E * 4], N = u + y * g[E * 4 + 1], D = -g[C] * g[T] - g[C + 1] * g[T + 1], H = k / Math.tan(Math.acos(D) / 2), _ = P - H * g[C], B = N - H * g[C + 1], $ = P + H * g[T], F = N + H * g[T + 1];
-    E === 0 ? a.moveTo(_, B) : a.lineTo(_, B), a.arcTo(P, N, $, F, k);
-  }
-  a.closePath();
-};
-Fh.drawRoundRectanglePath = function(a, r, u, c, d) {
-  var g = c / 2, b = d / 2, y = lw(c, d);
-  a.beginPath && a.beginPath(), a.moveTo(r, u - b), a.arcTo(r + g, u - b, r + g, u, y), a.arcTo(r + g, u + b, r, u + b, y), a.arcTo(r - g, u + b, r - g, u, y), a.arcTo(r - g, u - b, r, u - b, y), a.lineTo(r, u - b), a.closePath();
-};
-Fh.drawBottomRoundRectanglePath = function(a, r, u, c, d) {
-  var g = c / 2, b = d / 2, y = lw(c, d);
-  a.beginPath && a.beginPath(), a.moveTo(r, u - b), a.lineTo(r + g, u - b), a.lineTo(r + g, u), a.arcTo(r + g, u + b, r, u + b, y), a.arcTo(r - g, u + b, r - g, u, y), a.lineTo(r - g, u - b), a.lineTo(r, u - b), a.closePath();
-};
-Fh.drawCutRectanglePath = function(a, r, u, c, d) {
-  var g = c / 2, b = d / 2, y = o$();
-  a.beginPath && a.beginPath(), a.moveTo(r - g + y, u - b), a.lineTo(r + g - y, u - b), a.lineTo(r + g, u - b + y), a.lineTo(r + g, u + b - y), a.lineTo(r + g - y, u + b), a.lineTo(r - g + y, u + b), a.lineTo(r - g, u + b - y), a.lineTo(r - g, u - b + y), a.closePath();
-};
-Fh.drawBarrelPath = function(a, r, u, c, d) {
-  var g = c / 2, b = d / 2, y = r - g, k = r + g, E = u - b, C = u + b, T = l6(c, d), P = T.widthOffset, N = T.heightOffset, D = T.ctrlPtOffsetPct * P;
-  a.beginPath && a.beginPath(), a.moveTo(y, E + N), a.lineTo(y, C - N), a.quadraticCurveTo(y + D, C, y + P, C), a.lineTo(k - P, C), a.quadraticCurveTo(k - D, C, k, C - N), a.lineTo(k, E + N), a.quadraticCurveTo(k - D, E, k - P, E), a.lineTo(y + P, E), a.quadraticCurveTo(y + D, E, y, E + N), a.closePath();
-};
-var EG = Math.sin(0), SG = Math.cos(0), w6 = {}, m6 = {}, eY = Math.PI / 40;
-for (var Sb = 0 * Math.PI; Sb < 2 * Math.PI; Sb += eY)
-  w6[Sb] = Math.sin(Sb), m6[Sb] = Math.cos(Sb);
-Fh.drawEllipsePath = function(a, r, u, c, d) {
-  if (a.beginPath && a.beginPath(), a.ellipse)
-    a.ellipse(r, u, c / 2, d / 2, 0, 0, 2 * Math.PI);
-  else
-    for (var g, b, y = c / 2, k = d / 2, E = 0 * Math.PI; E < 2 * Math.PI; E += eY)
-      g = r - y * w6[E] * EG + y * m6[E] * SG, b = u + k * m6[E] * EG + k * w6[E] * SG, E === 0 ? a.moveTo(g, b) : a.lineTo(g, b);
-  a.closePath();
-};
-var gw = {};
-gw.createBuffer = function(a, r) {
-  var u = document.createElement("canvas");
-  return u.width = a, u.height = r, [u, u.getContext("2d")];
-};
-gw.bufferCanvasImage = function(a) {
-  var r = this.cy, u = r.mutableElements(), c = u.boundingBox(), d = this.findContainerClientCoords(), g = a.full ? Math.ceil(c.w) : d[2], b = a.full ? Math.ceil(c.h) : d[3], y = kt(a.maxWidth) || kt(a.maxHeight), k = this.getPixelRatio(), E = 1;
-  if (a.scale !== void 0)
-    g *= a.scale, b *= a.scale, E = a.scale;
-  else if (y) {
-    var C = 1 / 0, T = 1 / 0;
-    kt(a.maxWidth) && (C = E * a.maxWidth / g), kt(a.maxHeight) && (T = E * a.maxHeight / b), E = Math.min(C, T), g *= E, b *= E;
-  }
-  y || (g *= k, b *= k, E *= k);
-  var P = document.createElement("canvas");
-  P.width = g, P.height = b, P.style.width = g + "px", P.style.height = b + "px";
-  var N = P.getContext("2d");
-  if (g > 0 && b > 0) {
-    N.clearRect(0, 0, g, b), N.globalCompositeOperation = "source-over";
-    var D = this.getCachedZSortedEles();
-    if (a.full)
-      N.translate(-c.x1 * E, -c.y1 * E), N.scale(E, E), this.drawElements(N, D), N.scale(1 / E, 1 / E), N.translate(c.x1 * E, c.y1 * E);
-    else {
-      var H = r.pan(), _ = {
-        x: H.x * E,
-        y: H.y * E
-      };
-      E *= r.zoom(), N.translate(_.x, _.y), N.scale(E, E), this.drawElements(N, D), N.scale(1 / E, 1 / E), N.translate(-_.x, -_.y);
-    }
-    a.bg && (N.globalCompositeOperation = "destination-over", N.fillStyle = a.bg, N.rect(0, 0, g, b), N.fill());
-  }
-  return P;
-};
-function Ole(a, r) {
-  for (var u = atob(a), c = new ArrayBuffer(u.length), d = new Uint8Array(c), g = 0; g < u.length; g++)
-    d[g] = u.charCodeAt(g);
-  return new Blob([c], {
-    type: r
-  });
-}
-function CG(a) {
-  var r = a.indexOf(",");
-  return a.substr(r + 1);
-}
-function tY(a, r, u) {
-  var c = function() {
-    return r.toDataURL(u, a.quality);
-  };
-  switch (a.output) {
-    case "blob-promise":
-      return new Hb(function(d, g) {
-        try {
-          r.toBlob(function(b) {
-            b != null ? d(b) : g(new Error("`canvas.toBlob()` sent a null value in its callback"));
-          }, u, a.quality);
-        } catch (b) {
-          g(b);
-        }
-      });
-    case "blob":
-      return Ole(CG(c()), u);
-    case "base64":
-      return CG(c());
-    case "base64uri":
-    default:
-      return c();
-  }
-}
-gw.png = function(a) {
-  return tY(a, this.bufferCanvasImage(a), "image/png");
-};
-gw.jpg = function(a) {
-  return tY(a, this.bufferCanvasImage(a), "image/jpeg");
-};
-var nY = {};
-nY.nodeShapeImpl = function(a, r, u, c, d, g, b) {
-  switch (a) {
-    case "ellipse":
-      return this.drawEllipsePath(r, u, c, d, g);
-    case "polygon":
-      return this.drawPolygonPath(r, u, c, d, g, b);
-    case "round-polygon":
-      return this.drawRoundPolygonPath(r, u, c, d, g, b);
-    case "roundrectangle":
-    case "round-rectangle":
-      return this.drawRoundRectanglePath(r, u, c, d, g);
-    case "cutrectangle":
-    case "cut-rectangle":
-      return this.drawCutRectanglePath(r, u, c, d, g);
-    case "bottomroundrectangle":
-    case "bottom-round-rectangle":
-      return this.drawBottomRoundRectanglePath(r, u, c, d, g);
-    case "barrel":
-      return this.drawBarrelPath(r, u, c, d, g);
-  }
-};
-var Ale = rY, gr = rY.prototype;
-gr.CANVAS_LAYERS = 3;
-gr.SELECT_BOX = 0;
-gr.DRAG = 1;
-gr.NODE = 2;
-gr.BUFFER_COUNT = 3;
-gr.TEXTURE_BUFFER = 0;
-gr.MOTIONBLUR_BUFFER_NODE = 1;
-gr.MOTIONBLUR_BUFFER_DRAG = 2;
-function rY(a) {
-  var r = this;
-  r.data = {
-    canvases: new Array(gr.CANVAS_LAYERS),
-    contexts: new Array(gr.CANVAS_LAYERS),
-    canvasNeedsRedraw: new Array(gr.CANVAS_LAYERS),
-    bufferCanvases: new Array(gr.BUFFER_COUNT),
-    bufferContexts: new Array(gr.CANVAS_LAYERS)
-  };
-  var u = "-webkit-tap-highlight-color", c = "rgba(0,0,0,0)";
-  r.data.canvasContainer = document.createElement("div");
-  var d = r.data.canvasContainer.style;
-  r.data.canvasContainer.style[u] = c, d.position = "relative", d.zIndex = "0", d.overflow = "hidden";
-  var g = a.cy.container();
-  g.appendChild(r.data.canvasContainer), g.style[u] = c;
-  var b = {
-    "-webkit-user-select": "none",
-    "-moz-user-select": "-moz-none",
-    "user-select": "none",
-    "-webkit-tap-highlight-color": "rgba(0,0,0,0)",
-    "outline-style": "none"
-  };
-  boe() && (b["-ms-touch-action"] = "none", b["touch-action"] = "none");
-  for (var y = 0; y < gr.CANVAS_LAYERS; y++) {
-    var k = r.data.canvases[y] = document.createElement("canvas");
-    r.data.contexts[y] = k.getContext("2d"), Object.keys(b).forEach(function(Ge) {
-      k.style[Ge] = b[Ge];
-    }), k.style.position = "absolute", k.setAttribute("data-id", "layer" + y), k.style.zIndex = String(gr.CANVAS_LAYERS - y), r.data.canvasContainer.appendChild(k), r.data.canvasNeedsRedraw[y] = !1;
-  }
-  r.data.topCanvas = r.data.canvases[0], r.data.canvases[gr.NODE].setAttribute("data-id", "layer" + gr.NODE + "-node"), r.data.canvases[gr.SELECT_BOX].setAttribute("data-id", "layer" + gr.SELECT_BOX + "-selectbox"), r.data.canvases[gr.DRAG].setAttribute("data-id", "layer" + gr.DRAG + "-drag");
-  for (var y = 0; y < gr.BUFFER_COUNT; y++)
-    r.data.bufferCanvases[y] = document.createElement("canvas"), r.data.bufferContexts[y] = r.data.bufferCanvases[y].getContext("2d"), r.data.bufferCanvases[y].style.position = "absolute", r.data.bufferCanvases[y].setAttribute("data-id", "buffer" + y), r.data.bufferCanvases[y].style.zIndex = String(-y - 1), r.data.bufferCanvases[y].style.visibility = "hidden";
-  r.pathsEnabled = !0;
-  var E = Ms(), C = function(me) {
-    return {
-      x: (me.x1 + me.x2) / 2,
-      y: (me.y1 + me.y2) / 2
-    };
-  }, T = function(me) {
-    return {
-      x: -me.w / 2,
-      y: -me.h / 2
-    };
-  }, P = function(me) {
-    var Ve = me[0]._private, Ke = Ve.oldBackgroundTimestamp === Ve.backgroundTimestamp;
-    return !Ke;
-  }, N = function(me) {
-    return me[0]._private.nodeKey;
-  }, D = function(me) {
-    return me[0]._private.labelStyleKey;
-  }, H = function(me) {
-    return me[0]._private.sourceLabelStyleKey;
-  }, _ = function(me) {
-    return me[0]._private.targetLabelStyleKey;
-  }, B = function(me, Ve, Ke, at, ft) {
-    return r.drawElement(me, Ve, Ke, !1, !1, ft);
-  }, $ = function(me, Ve, Ke, at, ft) {
-    return r.drawElementText(me, Ve, Ke, at, "main", ft);
-  }, F = function(me, Ve, Ke, at, ft) {
-    return r.drawElementText(me, Ve, Ke, at, "source", ft);
-  }, W = function(me, Ve, Ke, at, ft) {
-    return r.drawElementText(me, Ve, Ke, at, "target", ft);
-  }, Q = function(me) {
-    return me.boundingBox(), me[0]._private.bodyBounds;
-  }, X = function(me) {
-    return me.boundingBox(), me[0]._private.labelBounds.main || E;
-  }, K = function(me) {
-    return me.boundingBox(), me[0]._private.labelBounds.source || E;
-  }, ee = function(me) {
-    return me.boundingBox(), me[0]._private.labelBounds.target || E;
-  }, Z = function(me, Ve) {
-    return Ve;
-  }, ae = function(me) {
-    return C(Q(me));
-  }, oe = function(me, Ve, Ke) {
-    var at = me ? me + "-" : "";
-    return {
-      x: Ve.x + Ke.pstyle(at + "text-margin-x").pfValue,
-      y: Ve.y + Ke.pstyle(at + "text-margin-y").pfValue
-    };
-  }, J = function(me, Ve, Ke) {
-    var at = me[0]._private.rscratch;
-    return {
-      x: at[Ve],
-      y: at[Ke]
-    };
-  }, fe = function(me) {
-    return oe("", J(me, "labelX", "labelY"), me);
-  }, se = function(me) {
-    return oe("source", J(me, "sourceLabelX", "sourceLabelY"), me);
-  }, pe = function(me) {
-    return oe("target", J(me, "targetLabelX", "targetLabelY"), me);
-  }, he = function(me) {
-    return T(Q(me));
-  }, de = function(me) {
-    return T(K(me));
-  }, ke = function(me) {
-    return T(ee(me));
-  }, Pe = function(me) {
-    var Ve = X(me), Ke = T(X(me));
-    if (me.isNode()) {
-      switch (me.pstyle("text-halign").value) {
-        case "left":
-          Ke.x = -Ve.w;
-          break;
-        case "right":
-          Ke.x = 0;
-          break;
-      }
-      switch (me.pstyle("text-valign").value) {
-        case "top":
-          Ke.y = -Ve.h;
-          break;
-        case "bottom":
-          Ke.y = 0;
-          break;
-      }
-    }
-    return Ke;
-  }, Ae = r.data.eleTxrCache = new qp(r, {
-    getKey: N,
-    doesEleInvalidateKey: P,
-    drawElement: B,
-    getBoundingBox: Q,
-    getRotationPoint: ae,
-    getRotationOffset: he,
-    allowEdgeTxrCaching: !1,
-    allowParentTxrCaching: !1
-  }), Te = r.data.lblTxrCache = new qp(r, {
-    getKey: D,
-    drawElement: $,
-    getBoundingBox: X,
-    getRotationPoint: fe,
-    getRotationOffset: Pe,
-    isVisible: Z
-  }), Oe = r.data.slbTxrCache = new qp(r, {
-    getKey: H,
-    drawElement: F,
-    getBoundingBox: K,
-    getRotationPoint: se,
-    getRotationOffset: de,
-    isVisible: Z
-  }), ze = r.data.tlbTxrCache = new qp(r, {
-    getKey: _,
-    drawElement: W,
-    getBoundingBox: ee,
-    getRotationPoint: pe,
-    getRotationOffset: ke,
-    isVisible: Z
-  }), We = r.data.lyrTxrCache = new Z$(r);
-  r.onUpdateEleCalcs(function(me, Ve) {
-    Ae.invalidateElements(Ve), Te.invalidateElements(Ve), Oe.invalidateElements(Ve), ze.invalidateElements(Ve), We.invalidateElements(Ve);
-    for (var Ke = 0; Ke < Ve.length; Ke++) {
-      var at = Ve[Ke]._private;
-      at.oldBackgroundTimestamp = at.backgroundTimestamp;
-    }
-  });
-  var $e = function(me) {
-    for (var Ve = 0; Ve < me.length; Ve++)
-      We.enqueueElementRefinement(me[Ve].ele);
-  };
-  Ae.onDequeue($e), Te.onDequeue($e), Oe.onDequeue($e), ze.onDequeue($e);
-}
-gr.redrawHint = function(a, r) {
-  var u = this;
-  switch (a) {
-    case "eles":
-      u.data.canvasNeedsRedraw[gr.NODE] = r;
-      break;
-    case "drag":
-      u.data.canvasNeedsRedraw[gr.DRAG] = r;
-      break;
-    case "select":
-      u.data.canvasNeedsRedraw[gr.SELECT_BOX] = r;
-      break;
-  }
-};
-var Rle = typeof Path2D < "u";
-gr.path2dEnabled = function(a) {
-  if (a === void 0)
-    return this.pathsEnabled;
-  this.pathsEnabled = !!a;
-};
-gr.usePaths = function() {
-  return Rle && this.pathsEnabled;
-};
-gr.setImgSmoothing = function(a, r) {
-  a.imageSmoothingEnabled != null ? a.imageSmoothingEnabled = r : (a.webkitImageSmoothingEnabled = r, a.mozImageSmoothingEnabled = r, a.msImageSmoothingEnabled = r);
-};
-gr.getImgSmoothing = function(a) {
-  return a.imageSmoothingEnabled != null ? a.imageSmoothingEnabled : a.webkitImageSmoothingEnabled || a.mozImageSmoothingEnabled || a.msImageSmoothingEnabled;
-};
-gr.makeOffscreenCanvas = function(a, r) {
-  var u;
-  return (typeof OffscreenCanvas > "u" ? "undefined" : Ra(OffscreenCanvas)) !== "undefined" ? u = new OffscreenCanvas(a, r) : (u = document.createElement("canvas"), u.width = a, u.height = r), u;
-};
-[X$, xl, xf, q6, wv, Fb, nu, Fh, gw, nY].forEach(function(a) {
-  on(gr, a);
-});
-var Ble = [{
-  name: "null",
-  impl: G$
-}, {
-  name: "base",
-  impl: U$
-}, {
-  name: "canvas",
-  impl: Ale
-}], zle = [{
-  type: "layout",
-  extensions: qce
-}, {
-  type: "renderer",
-  extensions: Ble
-}], iY = {}, aY = {};
-function oY(a, r, u) {
-  var c = u, d = function(ee) {
-    Sr("Can not register `" + r + "` for `" + a + "` since `" + ee + "` already exists in the prototype and can not be overridden");
-  };
-  if (a === "core") {
-    if (rw.prototype[r])
-      return d(r);
-    rw.prototype[r] = u;
-  } else if (a === "collection") {
-    if (bo.prototype[r])
-      return d(r);
-    bo.prototype[r] = u;
-  } else if (a === "layout") {
-    for (var g = function(ee) {
-      this.options = ee, u.call(this, ee), fr(this._private) || (this._private = {}), this._private.cy = ee.cy, this._private.listeners = [], this.createEmitter();
-    }, b = g.prototype = Object.create(u.prototype), y = [], k = 0; k < y.length; k++) {
-      var E = y[k];
-      b[E] = b[E] || function() {
-        return this;
-      };
-    }
-    b.start && !b.run ? b.run = function() {
-      return this.start(), this;
-    } : !b.start && b.run && (b.start = function() {
-      return this.run(), this;
-    });
-    var C = u.prototype.stop;
-    b.stop = function() {
-      var K = this.options;
-      if (K && K.animate) {
-        var ee = this.animations;
-        if (ee)
-          for (var Z = 0; Z < ee.length; Z++)
-            ee[Z].stop();
-      }
-      return C ? C.call(this) : this.emit("layoutstop"), this;
-    }, b.destroy || (b.destroy = function() {
-      return this;
-    }), b.cy = function() {
-      return this._private.cy;
-    };
-    var T = function(ee) {
-      return ee._private.cy;
-    }, P = {
-      addEventFields: function(ee, Z) {
-        Z.layout = ee, Z.cy = T(ee), Z.target = ee;
-      },
-      bubble: function() {
-        return !0;
-      },
-      parent: function(ee) {
-        return T(ee);
-      }
-    };
-    on(b, {
-      createEmitter: function() {
-        return this._private.emitter = new b5(P, this), this;
-      },
-      emitter: function() {
-        return this._private.emitter;
-      },
-      on: function(ee, Z) {
-        return this.emitter().on(ee, Z), this;
-      },
-      one: function(ee, Z) {
-        return this.emitter().one(ee, Z), this;
-      },
-      once: function(ee, Z) {
-        return this.emitter().one(ee, Z), this;
-      },
-      removeListener: function(ee, Z) {
-        return this.emitter().removeListener(ee, Z), this;
-      },
-      removeAllListeners: function() {
-        return this.emitter().removeAllListeners(), this;
-      },
-      emit: function(ee, Z) {
-        return this.emitter().emit(ee, Z), this;
-      }
-    }), Mr.eventAliasesOn(b), c = g;
-  } else if (a === "renderer" && r !== "null" && r !== "base") {
-    var N = sY("renderer", "base"), D = N.prototype, H = u, _ = u.prototype, B = function() {
-      N.apply(this, arguments), H.apply(this, arguments);
-    }, $ = B.prototype;
-    for (var F in D) {
-      var W = D[F], Q = _[F] != null;
-      if (Q)
-        return d(F);
-      $[F] = W;
-    }
-    for (var X in _)
-      $[X] = _[X];
-    D.clientFunctions.forEach(function(K) {
-      $[K] = $[K] || function() {
-        Qi("Renderer does not implement `renderer." + K + "()` on its prototype");
-      };
-    }), c = B;
-  } else if (a === "__proto__" || a === "constructor" || a === "prototype")
-    return Qi(a + " is an illegal type to be registered, possibly lead to prototype pollutions");
-  return YG({
-    map: iY,
-    keys: [a, r],
-    value: c
-  });
-}
-function sY(a, r) {
-  return FG({
-    map: iY,
-    keys: [a, r]
-  });
-}
-function Hle(a, r, u, c, d) {
-  return YG({
-    map: aY,
-    keys: [a, r, u, c],
-    value: d
-  });
-}
-function _le(a, r, u, c) {
-  return FG({
-    map: aY,
-    keys: [a, r, u, c]
-  });
-}
-var y6 = function() {
-  if (arguments.length === 2)
-    return sY.apply(null, arguments);
-  if (arguments.length === 3)
-    return oY.apply(null, arguments);
-  if (arguments.length === 4)
-    return _le.apply(null, arguments);
-  if (arguments.length === 5)
-    return Hle.apply(null, arguments);
-  Qi("Invalid extension access syntax");
-};
-rw.prototype.extension = y6;
-zle.forEach(function(a) {
-  a.extensions.forEach(function(r) {
-    oY(a.type, r.name, r.impl);
-  });
-});
-var uY = function a() {
-  if (!(this instanceof a))
-    return new a();
-  this.length = 0;
-}, gv = uY.prototype;
-gv.instanceString = function() {
-  return "stylesheet";
-};
-gv.selector = function(a) {
-  var r = this.length++;
-  return this[r] = {
-    selector: a,
-    properties: []
-  }, this;
-};
-gv.css = function(a, r) {
-  var u = this.length - 1;
-  if (qt(a))
-    this[u].properties.push({
-      name: a,
-      value: r
-    });
-  else if (fr(a))
-    for (var c = a, d = Object.keys(c), g = 0; g < d.length; g++) {
-      var b = d[g], y = c[b];
-      if (y != null) {
-        var k = Io.properties[b] || Io.properties[f5(b)];
-        if (k != null) {
-          var E = k.name, C = y;
-          this[u].properties.push({
-            name: E,
-            value: C
-          });
-        }
-      }
-    }
-  return this;
-};
-gv.style = gv.css;
-gv.generateStyle = function(a) {
-  var r = new Io(a);
-  return this.appendToStyle(r);
-};
-gv.appendToStyle = function(a) {
-  for (var r = 0; r < this.length; r++) {
-    var u = this[r], c = u.selector, d = u.properties;
-    a.selector(c);
-    for (var g = 0; g < d.length; g++) {
-      var b = d[g];
-      a.css(b.name, b.value);
-    }
-  }
-  return a;
-};
-var Gle = "3.27.0", bv = function(r) {
-  if (r === void 0 && (r = {}), fr(r))
-    return new rw(r);
-  if (qt(r))
-    return y6.apply(y6, arguments);
-};
-bv.use = function(a) {
-  var r = Array.prototype.slice.call(arguments, 1);
-  return r.unshift(bv), a.apply(null, r), this;
-};
-bv.warnings = function(a) {
-  return ZG(a);
-};
-bv.version = Gle;
-bv.stylesheet = bv.Stylesheet = uY;
-var $le = bv;
-const qh = /* @__PURE__ */ TG($le);
-var cY = { exports: {} }, s6 = { exports: {} }, xG;
-function Yle() {
-  return xG || (xG = 1, function(a) {
-    (function() {
-      var r;
-      typeof window < "u" ? (r = window, r.document) : r = { Array: function() {
-      } };
-      function u() {
-      }
-      function c() {
-      }
-      function d() {
-      }
-      function g() {
-      }
-      function b() {
-      }
-      function y() {
-      }
-      function k() {
-      }
-      function E() {
-      }
-      function C() {
-      }
-      function T() {
-      }
-      function P() {
-      }
-      function N() {
-      }
-      function D() {
-      }
-      function H() {
-      }
-      function _() {
-      }
-      function B() {
-      }
-      function $() {
-      }
-      function F() {
-      }
-      function W() {
-      }
-      function Q() {
-      }
-      function X() {
-      }
-      function K() {
-      }
-      function ee() {
-      }
-      function Z() {
-      }
-      function ae() {
-      }
-      function oe() {
-      }
-      function J() {
-      }
-      function fe() {
-      }
-      function se() {
-      }
-      function pe() {
-      }
-      function he() {
-      }
-      function de() {
-      }
-      function ke() {
-      }
-      function Pe() {
-      }
-      function Ae() {
-      }
-      function Te() {
-      }
-      function Oe() {
-      }
-      function ze() {
-      }
-      function We() {
-      }
-      function $e() {
-      }
-      function Ge() {
-      }
-      function me() {
-      }
-      function Ve() {
-      }
-      function Ke() {
-      }
-      function at() {
-      }
-      function ft() {
-      }
-      function en() {
-      }
-      function gn() {
-      }
-      function mt() {
-      }
-      function ht() {
-      }
-      function Rt() {
-      }
-      function Lt() {
-      }
-      function yt() {
-      }
-      function Mt() {
-      }
-      function In() {
-      }
-      function Pn() {
-      }
-      function Vt() {
-      }
-      function ar() {
-      }
-      function Qe() {
-      }
-      function ne() {
-      }
-      function Ie() {
-      }
-      function Je() {
-      }
-      function Ye() {
-      }
-      function Fe() {
-      }
-      function bn() {
-      }
-      function tt() {
-      }
-      function Gt() {
-      }
-      function tr() {
-      }
-      function hr() {
-      }
-      function Dn() {
-      }
-      function rr() {
-      }
-      function wn() {
-      }
-      function jn() {
-      }
-      function ui() {
-      }
-      function aa() {
-      }
-      function cs() {
-      }
-      function ls() {
-      }
-      function oa() {
-      }
-      function Bo() {
-      }
-      function za() {
-      }
-      function ru() {
-      }
-      function Mu() {
-      }
-      function Tl() {
-      }
-      function xc() {
-      }
-      function Ll() {
-      }
-      function Vh() {
-      }
-      function Tc() {
-      }
-      function eo() {
-      }
-      function ma() {
-      }
-      function to() {
-      }
-      function Wh() {
-      }
-      function Os() {
-      }
-      function qb() {
-      }
-      function bw() {
-      }
-      function pw() {
-      }
-      function ww() {
-      }
-      function mw() {
-      }
-      function yw() {
-      }
-      function kw() {
-      }
-      function Ew() {
-      }
-      function Tf() {
-      }
-      function yv() {
-      }
-      function Uh() {
-      }
-      function Vb() {
-      }
-      function Wb() {
-      }
-      function Sw() {
-      }
-      function no() {
-      }
-      function kv() {
-      }
-      function Ub() {
-      }
-      function Kh() {
-      }
-      function fs() {
-      }
-      function Cw() {
-      }
-      function U6() {
-      }
-      function K6() {
-      }
-      function C5() {
-      }
-      function Z6() {
-      }
-      function X6() {
-      }
-      function Q6() {
-      }
-      function J6() {
-      }
-      function eP() {
-      }
-      function tP() {
-      }
-      function xw() {
-      }
-      function Tw() {
-      }
-      function nP() {
-        wj();
-      }
-      function mY() {
-        iQ();
-      }
-      function rP() {
-        HM();
-      }
-      function iP() {
-        Rj();
-      }
-      function aP() {
-        C4();
-      }
-      function oP() {
-        _7();
-      }
-      function sP() {
-        G7();
-      }
-      function uP() {
-        lD();
-      }
-      function cP() {
-        hN();
-      }
-      function lP() {
-        gj();
-      }
-      function fP() {
-        SO();
-      }
-      function hP() {
-        bj();
-      }
-      function dP() {
-        pj();
-      }
-      function vP() {
-        vA();
-      }
-      function gP() {
-        F3();
-      }
-      function Lc() {
-        Dm(this);
-      }
-      function bP() {
-      }
-      function Se() {
-        km(this);
-      }
-      function Lw() {
-      }
-      function pP(e) {
-        this.a = e;
-      }
-      function wP(e) {
-        this.a = e;
-      }
-      function Kb(e) {
-        this.a = e;
-      }
-      function mP(e) {
-        this.a = e;
-      }
-      function yP(e) {
-        this.a = e;
-      }
-      function kP(e) {
-        this.a = e;
-      }
-      function EP(e) {
-        this.a = e;
-      }
-      function Pw(e) {
-        this.a = e;
-      }
-      function SP(e) {
-        this.a = e;
-      }
-      function Dw(e) {
-        this.b = e;
-      }
-      function x5(e) {
-        this.a = e;
-      }
-      function CP(e) {
-        this.a = e;
-      }
-      function xP(e) {
-        this.a = e;
-      }
-      function TP(e) {
-        this.a = e;
-      }
-      function LP(e) {
-        this.a = e;
-      }
-      function PP(e) {
-        this.a = e;
-      }
-      function DP(e) {
-        this.a = e;
-      }
-      function jP(e) {
-        this.a = e;
-      }
-      function T5(e) {
-        this.a = e;
-      }
-      function jw(e) {
-        this.a = e;
-      }
-      function Nw(e) {
-        this.a = e;
-      }
-      function NP(e) {
-        this.a = e;
-      }
-      function IP(e) {
-        this.a = e;
-      }
-      function L5(e) {
-        this.a = e;
-      }
-      function Zb(e) {
-        this.a = e;
-      }
-      function Iw(e) {
-        this.e = e;
-      }
-      function Zh(e) {
-        this.a = e;
-      }
-      function MP(e) {
-        this.a = e;
-      }
-      function Lf(e) {
-        this.a = e;
-      }
-      function P5(e) {
-        this.a = e;
-      }
-      function OP(e) {
-        this.a = e;
-      }
-      function AP(e) {
-        this.a = e;
-      }
-      function Mw(e) {
-        this.a = e;
-      }
-      function RP(e) {
-        this.a = e;
-      }
-      function BP(e) {
-        this.a = e;
-      }
-      function zP(e) {
-        this.a = e;
-      }
-      function HP(e) {
-        this.a = e;
-      }
-      function _P(e) {
-        this.a = e;
-      }
-      function GP(e) {
-        this.a = e;
-      }
-      function Xh(e) {
-        this.a = e;
-      }
-      function $P(e) {
-        this.a = e;
-      }
-      function YP(e) {
-        this.a = e;
-      }
-      function FP(e) {
-        this.a = e;
-      }
-      function qP(e) {
-        this.a = e;
-      }
-      function VP(e) {
-        this.a = e;
-      }
-      function WP(e) {
-        this.a = e;
-      }
-      function UP(e) {
-        this.a = e;
-      }
-      function KP(e) {
-        this.c = e;
-      }
-      function D5(e) {
-        this.a = e;
-      }
-      function ZP(e) {
-        this.a = e;
-      }
-      function XP(e) {
-        this.a = e;
-      }
-      function QP(e) {
-        this.a = e;
-      }
-      function JP(e) {
-        this.a = e;
-      }
-      function e7(e) {
-        this.a = e;
-      }
-      function j5(e) {
-        this.a = e;
-      }
-      function t7(e) {
-        this.a = e;
-      }
-      function Ut(e) {
-        this.a = e;
-      }
-      function iu(e) {
-        this.a = e;
-      }
-      function Pf(e) {
-        this.d = e;
-      }
-      function Wt(e) {
-        this.a = e;
-      }
-      function Zt(e) {
-        this.a = e;
-      }
-      function Ev(e) {
-        this.a = e;
-      }
-      function Sv(e) {
-        this.a = e;
-      }
-      function N5(e) {
-        this.b = e;
-      }
-      function Xb(e) {
-        this.a = e;
-      }
-      function Qb(e) {
-        this.a = e;
-      }
-      function M(e) {
-        this.c = e;
-      }
-      function ro(e) {
-        this.a = e;
-      }
-      function n7(e) {
-        this.a = e;
-      }
-      function r7(e) {
-        this.a = e;
-      }
-      function Cv(e) {
-        this.b = e;
-      }
-      function Qh(e) {
-        this.b = e;
-      }
-      function I5(e) {
-        this.c = e;
-      }
-      function M5(e) {
-        this.a = e;
-      }
-      function O5(e) {
-        this.a = e;
-      }
-      function Jb(e) {
-        this.a = e;
-      }
-      function A5() {
-        this.a = [];
-      }
-      function R5(e) {
-        this.a = e;
-      }
-      function Ow(e) {
-        this.a = e;
-      }
-      function i7(e) {
-        e.b = e.a;
-      }
-      function a7(e) {
-        e.c = e.d.d;
-      }
-      function Ha(e, t) {
-        e.g = t;
-      }
-      function B5(e, t) {
-        e.k = t;
-      }
-      function yY(e, t) {
-        e.a = t;
-      }
-      function kY(e, t) {
-        e.b = t;
-      }
-      function EY(e, t) {
-        e.e.k = t;
-      }
-      function SY(e) {
-        return e.a;
-      }
-      function CY(e) {
-        return e.a;
-      }
-      function xY(e) {
-        return e.a;
-      }
-      function TY(e) {
-        return e.a;
-      }
-      function LY(e) {
-        return e.a;
-      }
-      function PY() {
-        return null;
-      }
-      function DY() {
-        return null;
-      }
-      function Aw() {
-        this.c = this;
-      }
-      function z5() {
-        Dm(this);
-      }
-      function $t() {
-        so(this);
-      }
-      function o7(e) {
-        YZ(this, e);
-      }
-      function jY(e) {
-        s9(), jJ(e);
-      }
-      function s7(e) {
-        e.a = new Wr();
-      }
-      function xv(e, t) {
-        e.a = t - e.a;
-      }
-      function Tv(e, t) {
-        e.b = t - e.b;
-      }
-      function Df() {
-        Df = c;
-      }
-      function Rw() {
-        Rw = c;
-      }
-      function NY() {
-        throw new Fn();
-      }
-      function IY() {
-        throw new Fn();
-      }
-      function MY() {
-        throw new Fn();
-      }
-      function OY() {
-        throw new Fn();
-      }
-      function AY() {
-        throw new Fn();
-      }
-      function RY() {
-        throw new Fn();
-      }
-      function BY() {
-        throw new Fn();
-      }
-      function zY() {
-        throw new Fn();
-      }
-      function HY() {
-        throw new Fn();
-      }
-      function u7() {
-        this.a = new Se();
-      }
-      function c7() {
-        this.a = new Se();
-      }
-      function l7() {
-        this.a = new Se();
-      }
-      function f7() {
-        this.a = new Se();
-      }
-      function Bw() {
-        this.a = new Se();
-      }
-      function Pl() {
-        this.a = new no();
-      }
-      function Jh() {
-        this.a = new VN();
-      }
-      function h7() {
-        this.b = new Se();
-      }
-      function Ci() {
-        Wr.call(this);
-      }
-      function d7() {
-        lm.call(this);
-      }
-      function H5() {
-        bP.call(this);
-      }
-      function e1() {
-        bP.call(this);
-      }
-      function _5() {
-        Se.call(this);
-      }
-      function v7() {
-        Lc.call(this);
-      }
-      function ed() {
-        Lc.call(this);
-      }
-      function G5() {
-        Lc.call(this);
-      }
-      function g7() {
-        Lc.call(this);
-      }
-      function Lv() {
-        Lc.call(this);
-      }
-      function td() {
-        Lc.call(this);
-      }
-      function Fn() {
-        Lc.call(this);
-      }
-      function $5() {
-        this.f = new Se();
-      }
-      function b7() {
-        this.d = new Se();
-      }
-      function p7() {
-        this.a = new $r();
-      }
-      function w7() {
-        throw new Fn();
-      }
-      function m7() {
-        throw new Fn();
-      }
-      function y7() {
-        throw new Fn();
-      }
-      function k7() {
-        throw new Fn();
-      }
-      function _Y() {
-        throw new Fn();
-      }
-      function Y5() {
-        this.a = new Se();
-      }
-      function F5() {
-        F5 = c, U0 = new d();
-      }
-      function mn() {
-        mn = c;
-      }
-      function Pv() {
-        Pv = c, G2 = new g();
-      }
-      function E7() {
-        E7 = c, F8 = new E();
-      }
-      function S7() {
-        S7 = c, q8 = new eN();
-      }
-      function q5() {
-        q5 = c, Sx = new y();
-      }
-      function C7() {
-        C7 = c, K8 = new D();
-      }
-      function V5() {
-        V5 = c, ez = new Z();
-      }
-      function x7() {
-        x7 = c, tz = new fe();
-      }
-      function W5(e) {
-        return Hs(e), e;
-      }
-      function U5(e) {
-        dr(), this.a = e;
-      }
-      function K5(e) {
-        Ea(), this.a = e;
-      }
-      function T7(e) {
-        Ea(), this.a = e;
-      }
-      function L7(e) {
-        Ea(), this.a = e;
-      }
-      function P7(e, t) {
-        e.i = t, t.f = e;
-      }
-      function GY(e, t) {
-        vn(e.b, t);
-      }
-      function nd() {
-        Lc.call(this);
-      }
-      function D7() {
-        Lc.call(this);
-      }
-      function sa() {
-        Lc.call(this);
-      }
-      function j7() {
-        fN.call(this);
-      }
-      function N7() {
-        fN.call(this);
-      }
-      function I7() {
-        G5.call(this);
-      }
-      function M7() {
-        ed.call(this);
-      }
-      function As(e) {
-        Z7.call(this, e);
-      }
-      function $Y(e) {
-        F9.call(this, e);
-      }
-      function YY(e) {
-        F9.call(this, e);
-      }
-      function Z5(e) {
-        I9.call(this, e);
-      }
-      function O7(e) {
-        uj.call(this, e);
-      }
-      function X5(e) {
-        mN.call(this, e);
-      }
-      function Q5(e) {
-        cS.call(this, e);
-      }
-      function Dv(e) {
-        od.call(this, e);
-      }
-      function J5(e) {
-        I9.call(this, e);
-      }
-      function FY(e, t) {
-        e.a.W().nb(t);
-      }
-      function zo(e, t) {
-        return e === t;
-      }
-      function zw(e) {
-        return e ? e.a : 0;
-      }
-      function hs(e) {
-        return e ? e.d : 0;
-      }
-      function Hw(e) {
-        return e ? e.j : 0;
-      }
-      function A7(e) {
-        As.call(this, e);
-      }
-      function t1(e) {
-        As.call(this, e);
-      }
-      function mo(e) {
-        As.call(this, e);
-      }
-      function _w(e) {
-        mo.call(this, e);
-      }
-      function Dl() {
-        Nw.call(this, {});
-      }
-      function R7(e) {
-        o7.call(this, e);
-      }
-      function B7(e) {
-        o7.call(this, e);
-      }
-      function qY(e, t, n) {
-        BW(e, t.b, n);
-      }
-      function VY(e, t, n) {
-        lV(e.c, t, n);
-      }
-      function WY(e, t, n) {
-        e.b.Fc(t, n);
-      }
-      function eS(e) {
-        qP.call(this, e);
-      }
-      function Gw(e) {
-        qP.call(this, e);
-      }
-      function z7() {
-        this.a = ($n(), Po);
-      }
-      function H7() {
-        this.a = ($n(), Po);
-      }
-      function $r() {
-        this.a = new $t();
-      }
-      function tS() {
-        this.a = new RD();
-      }
-      function nS() {
-        nS = c, iT = new se();
-      }
-      function _7() {
-        _7 = c, lz = new ze();
-      }
-      function G7() {
-        G7 = c, vz = new hr();
-      }
-      function Pt(e) {
-        return yn(), e;
-      }
-      function ge(e) {
-        return or(e), e;
-      }
-      function UY(e) {
-        Z7.call(this, e);
-      }
-      function Ho(e) {
-        As.call(this, e);
-      }
-      function tn(e) {
-        As.call(this, e);
-      }
-      function n1(e) {
-        this.c = qf(vt(e));
-      }
-      function Yr() {
-        this.a = 0, this.b = 0;
-      }
-      function Wr() {
-        k9(this), Bs(this);
-      }
-      function $7() {
-        z2 == null && (z2 = []);
-      }
-      function r1(e) {
-        e.b = null, e.c = 0;
-      }
-      function KY(e, t) {
-        return e.b = t, e;
-      }
-      function Y7(e, t) {
-        return e.c = t, e;
-      }
-      function $w(e, t) {
-        return e.f = t, e;
-      }
-      function F7(e, t) {
-        return e.g = t, e;
-      }
-      function q7(e, t) {
-        return e.a = t, e;
-      }
-      function V7(e, t) {
-        return e.f = t, e;
-      }
-      function ZY(e, t) {
-        return e.k = t, e;
-      }
-      function XY(e, t) {
-        return e.e - t.e;
-      }
-      function QY(e, t) {
-        return e.d - t.d;
-      }
-      function JY(e) {
-        return e < 0 ? -e : e;
-      }
-      function W7(e) {
-        return isNaN(e);
-      }
-      function eF(e) {
-        return new jw(e);
-      }
-      function tF(e) {
-        return new Rc(e);
-      }
-      function U7(e) {
-        As.call(this, e);
-      }
-      function Ou(e) {
-        As.call(this, e);
-      }
-      function K7(e) {
-        As.call(this, e);
-      }
-      function jv(e) {
-        As.call(this, e);
-      }
-      function jf(e) {
-        As.call(this, e);
-      }
-      function Z7(e) {
-        this.f = e, Dm(this);
-      }
-      function X7() {
-        this.b = 0, this.a = 0;
-      }
-      function rd() {
-        rd = c;
-      }
-      function Q7() {
-        Q7 = c, n_ = bZ();
-      }
-      function nF(e, t, n) {
-        e.set(t, n);
-      }
-      function rF(e, t, n) {
-        e.set(t, n);
-      }
-      function J7(e, t) {
-        Cd(), dx.dc(e, t);
-      }
-      function ie(e, t) {
-        return CN(e, t);
-      }
-      function eD(e, t) {
-        return e.a.B(t);
-      }
-      function Nf(e, t) {
-        return e.g[t.e];
-      }
-      function Yw(e, t) {
-        return e.i[t.e];
-      }
-      function Fw(e, t) {
-        return e.j[t.e];
-      }
-      function If(e, t) {
-        return e.n[t.e];
-      }
-      function Mf(e, t) {
-        return e.o[t.e];
-      }
-      function iF(e, t) {
-        return t in e.a;
-      }
-      function aF(e, t) {
-        return e.b - t.b;
-      }
-      function oF(e, t) {
-        return e.d - t.d;
-      }
-      function sF(e, t) {
-        return e.i - t.i;
-      }
-      function je(e, t) {
-        return e > t ? e : t;
-      }
-      function tD(e, t) {
-        return e > t ? e : t;
-      }
-      function Jr(e, t) {
-        return e > t ? e : t;
-      }
-      function Xt(e, t) {
-        return e < t ? e : t;
-      }
-      function uF(e, t) {
-        return e < t ? e : t;
-      }
-      function Au(e, t) {
-        return e < t ? e : t;
-      }
-      function Ru(e) {
-        return !!e && e.b;
-      }
-      function nD(e) {
-        mq(e, e.length);
-      }
-      function cF(e) {
-        Dq(e, e.length);
-      }
-      function Nv(e) {
-        jq(e, e.length);
-      }
-      function lF(e) {
-        Ho.call(this, e);
-      }
-      function id(e) {
-        j5.call(this, e);
-      }
-      function fF(e) {
-        ZP.call(this, e);
-      }
-      function i1(e) {
-        tn.call(this, e);
-      }
-      function jl(e) {
-        Cv.call(this, e);
-      }
-      function rD(e) {
-        jl.call(this, e);
-      }
-      function rS(e) {
-        L1.call(this, e);
-      }
-      function ad() {
-        j5.call(this, "");
-      }
-      function qw() {
-        j5.call(this, "");
-      }
-      function a1(e) {
-        return Al(e), e.n;
-      }
-      function iD(e) {
-        return Al(e), e.j;
-      }
-      function Hi(e) {
-        return e.e && e.e();
-      }
-      function aD(e, t) {
-        return e.a.sb(t);
-      }
-      function hF(e, t) {
-        return e || vt(t);
-      }
-      function oD(e, t) {
-        return z(e.a, t);
-      }
-      function sD(e, t) {
-        return pq(e.a, t);
-      }
-      function dF(e, t) {
-        return Iy(e, t) < 0;
-      }
-      function o1(e) {
-        return mn(), "" + e;
-      }
-      function uD(e) {
-        return e ? e.d : null;
-      }
-      function Bu(e) {
-        Ea(), this.a = vt(e);
-      }
-      function cD() {
-        cI(), this.g = new wS();
-      }
-      function lD() {
-        lD = c, gz = (Gi(), Us);
-      }
-      function vF() {
-        X0 != 0 && (X0 = 0), Q0 = -1;
-      }
-      function Iv(e) {
-        return iX(e, e.d), e;
-      }
-      function Of(e, t) {
-        return e.a.d = t, e;
-      }
-      function Af(e, t) {
-        return e.a.a = t, e;
-      }
-      function Rf(e, t) {
-        return e.a.c = t, e;
-      }
-      function Bf(e, t) {
-        return e.a.f = t, e;
-      }
-      function fD(e, t) {
-        return e.a.f = t, e;
-      }
-      function iS(e, t) {
-        return e.a.b = t, e;
-      }
-      function aS(e, t, n) {
-        e.splice(t, n);
-      }
-      function gF(e, t) {
-        return u3(t, e);
-      }
-      function hD(e, t) {
-        return e.b.t(t);
-      }
-      function dD(e, t) {
-        return e.c.t(t);
-      }
-      function Pc(e, t) {
-        return e.a.R(t);
-      }
-      function oS(e, t) {
-        return e.get(t);
-      }
-      function Vw(e, t) {
-        return e.get(t);
-      }
-      function bF(e, t) {
-        return e.test(t);
-      }
-      function ei(e) {
-        return e <= 0 ? 0 - e : e;
-      }
-      function vD(e) {
-        return mn(), "" + e;
-      }
-      function pF(e) {
-        return mn(), "" + e;
-      }
-      function Ww(e) {
-        this.a = new sm(e);
-      }
-      function gD(e) {
-        this.a = new N4(e);
-      }
-      function bD(e) {
-        this.a = f(vt(e), 19);
-      }
-      function Uw(e) {
-        this.b = f(vt(e), 57);
-      }
-      function pD(e) {
-        this.d = f(vt(e), 56);
-      }
-      function sn(e, t) {
-        this.d = e, this.e = t;
-      }
-      function Kw(e, t) {
-        this.b = e, this.a = t;
-      }
-      function wD(e, t) {
-        this.b = e, this.a = t;
-      }
-      function sS(e, t) {
-        this.b = e, this.c = t;
-      }
-      function uS(e, t) {
-        this.a = e, this.b = t;
-      }
-      function Zw(e, t) {
-        this.a = e, this.b = t;
-      }
-      function mD(e, t) {
-        this.a = e, this.f = t;
-      }
-      function Xw(e, t) {
-        sn.call(this, e, t);
-      }
-      function yD(e, t) {
-        sn.call(this, e, t);
-      }
-      function kD(e, t) {
-        sn.call(this, e, t);
-      }
-      function ED(e, t) {
-        this.b = e, this.c = t;
-      }
-      function SD(e, t) {
-        this.e = e, this.c = t;
-      }
-      function wF(e, t) {
-        this.a = e, this.b = t;
-      }
-      function CD(e, t) {
-        this.a = e, this.b = t;
-      }
-      function xD(e, t) {
-        sn.call(this, e, t);
-      }
-      function TD(e, t) {
-        this.a = e, this.b = t;
-      }
-      function LD(e) {
-        this.a = f(vt(e), 20);
-      }
-      function od(e) {
-        this.a = f(vt(e), 20);
-      }
-      function PD(e) {
-        this.a = f(vt(e), 57);
-      }
-      function cS(e) {
-        this.b = f(vt(e), 35);
-      }
-      function ot(e, t) {
-        this.a = e, this.b = t;
-      }
-      function pr(e, t) {
-        this.a = e, this.b = t;
-      }
-      function sd(e, t) {
-        sn.call(this, e, t);
-      }
-      function lS(e, t) {
-        return Qf(e.b, t);
-      }
-      function mF(e) {
-        return qj(), e ? U8 : W8;
-      }
-      function Nl(e) {
-        return e == ja || e == Fi;
-      }
-      function Qw(e) {
-        return e == Ws || e == Ts;
-      }
-      function DD(e, t) {
-        wr(e, t, e.a, e.a.a);
-      }
-      function Jw(e, t) {
-        wr(e, t, e.c.b, e.c);
-      }
-      function Mv(e, t) {
-        sn.call(this, e, t);
-      }
-      function s1(e, t) {
-        sn.call(this, e, t);
-      }
-      function u1(e, t) {
-        sn.call(this, e, t);
-      }
-      function ud(e, t) {
-        sn.call(this, e, t);
-      }
-      function em(e, t) {
-        sn.call(this, e, t);
-      }
-      function Dc(e, t) {
-        sn.call(this, e, t);
-      }
-      function Ov(e, t) {
-        sn.call(this, e, t);
-      }
-      function cd(e, t) {
-        sn.call(this, e, t);
-      }
-      function tm(e, t) {
-        sn.call(this, e, t);
-      }
-      function Av(e, t) {
-        sn.call(this, e, t);
-      }
-      function c1(e, t) {
-        sn.call(this, e, t);
-      }
-      function l1(e, t) {
-        sn.call(this, e, t);
-      }
-      function nm(e, t) {
-        sn.call(this, e, t);
-      }
-      function rm(e, t) {
-        sn.call(this, e, t);
-      }
-      function fS(e, t) {
-        this.b = e, this.a = t;
-      }
-      function zf(e, t) {
-        this.c = e, this.d = t;
-      }
-      function hS(e, t) {
-        this.a = e, this.c = t;
-      }
-      function jD(e, t) {
-        this.e = e, this.c = t;
-      }
-      function ND(e, t) {
-        this.e = e, this.d = t;
-      }
-      function f1(e, t) {
-        sn.call(this, e, t);
-      }
-      function ld(e, t) {
-        sn.call(this, e, t);
-      }
-      function ID(e, t) {
-        this.a = e, this.b = t;
-      }
-      function MD(e, t) {
-        this.a = e, this.b = t;
-      }
-      function im(e, t) {
-        sn.call(this, e, t);
-      }
-      function nn(e, t) {
-        sn.call(this, e, t);
-      }
-      function Il(e, t) {
-        sn.call(this, e, t);
-      }
-      function dS(e, t) {
-        sn.call(this, e, t);
-      }
-      function fd(e, t) {
-        sn.call(this, e, t);
-      }
-      function vS(e, t) {
-        sn.call(this, e, t);
-      }
-      function am(e, t) {
-        sn.call(this, e, t);
-      }
-      function gS(e, t) {
-        sn.call(this, e, t);
-      }
-      function yF(e, t) {
-        return Fo(e.c, t);
-      }
-      function om(e) {
-        return e.b < e.d.Y();
-      }
-      function h1(e) {
-        return e.d.c + e.e.c;
-      }
-      function OD(e, t) {
-        return e.c.ab(t);
-      }
-      function kF(e, t) {
-        return e.b.kb(t);
-      }
-      function EF(e, t) {
-        return e.b.lb(t);
-      }
-      function SF(e, t) {
-        return e.b.pb(t);
-      }
-      function bS(e, t) {
-        return e.b.kb(t);
-      }
-      function AD(e, t) {
-        return e.b.lb(t);
-      }
-      function CF(e) {
-        return e == uc || e == dl;
-      }
-      function xF(e) {
-        return e == uc || e == hl;
-      }
-      function ds(e) {
-        return e != jo && e != ac;
-      }
-      function TF(e) {
-        return La(e), e.d.Y();
-      }
-      function Hf(e) {
-        this.c = e, II(this);
-      }
-      function sm(e) {
-        LM.call(this, e, 0);
-      }
-      function RD() {
-        N4.call(this, null);
-      }
-      function Rv() {
-        YY.call(this, new $t());
-      }
-      function BD() {
-        kD.call(this, "KEY", 0);
-      }
-      function um(e) {
-        Kf(), uj.call(this, e);
-      }
-      function LF(e) {
-        r.clearTimeout(e);
-      }
-      function zD(e) {
-        return e.Vb(e.b.H());
-      }
-      function pS(e) {
-        this.a = f(vt(e), 144);
-      }
-      function wS() {
-        this.b = (On(), new $t());
-      }
-      function Ml() {
-        Ml = c, wf = new tP();
-      }
-      function cm() {
-        cm = c, PE = new X6();
-      }
-      function HD() {
-        HD = c, t_ = new eP();
-      }
-      function d1() {
-        d1 = c, z8 = new n1(",");
-      }
-      function _D() {
-        _D = c;
-      }
-      function lm() {
-        $a.call(this, 0, 0, 0, 0);
-      }
-      function mS(e, t) {
-        sn.call(this, e, t);
-      }
-      function Bv(e, t) {
-        sn.call(this, e, t);
-      }
-      function yS(e, t) {
-        sn.call(this, e, t);
-      }
-      function kS(e, t) {
-        sn.call(this, e, t);
-      }
-      function GD(e) {
-        $f(), Zn.call(this, e);
-      }
-      function ES(e, t) {
-        sn.call(this, e, t);
-      }
-      function $D(e, t) {
-        this.c = e, this.b = t;
-      }
-      function YD(e, t) {
-        this.a = e, this.b = t;
-      }
-      function FD(e, t) {
-        this.b = e, this.d = t;
-      }
-      function SS(e, t) {
-        sn.call(this, e, t);
-      }
-      function hd(e, t) {
-        sn.call(this, e, t);
-      }
-      function fm(e, t) {
-        sn.call(this, e, t);
-      }
-      function zv(e, t) {
-        sn.call(this, e, t);
-      }
-      function dd(e, t) {
-        sn.call(this, e, t);
-      }
-      function zu(e, t) {
-        sn.call(this, e, t);
-      }
-      function hm(e, t) {
-        sn.call(this, e, t);
-      }
-      function CS(e, t) {
-        sn.call(this, e, t);
-      }
-      function Hv(e, t) {
-        sn.call(this, e, t);
-      }
-      function dm(e, t) {
-        sn.call(this, e, t);
-      }
-      function vm(e, t) {
-        sn.call(this, e, t);
-      }
-      function gm(e, t) {
-        sn.call(this, e, t);
-      }
-      function _v(e, t, n) {
-        e.splice(t, 0, n);
-      }
-      function Gv(e, t, n) {
-        e.g[t.e][t.e] = n;
-      }
-      function qD(e, t) {
-        e.a = t, e.g = 0, e.f = 0;
-      }
-      function Rs(e) {
-        return e.a = 0, e.b = 0, e;
-      }
-      function ea(e) {
-        return Di(e.b.c, e, 0);
-      }
-      function v1(e) {
-        return Math.ceil(e);
-      }
-      function VD(e) {
-        return Math.sqrt(e);
-      }
-      function WD(e, t) {
-        return Vw(e.a, t);
-      }
-      function bm(e, t) {
-        return !!y3(e, t);
-      }
-      function pm(e, t) {
-        xq(e, e.length, t);
-      }
-      function g1(e, t) {
-        sn.call(this, e, t);
-      }
-      function b1(e, t) {
-        this.b = e, this.a = t;
-      }
-      function p1(e, t) {
-        this.d = e, this.e = t;
-      }
-      function UD() {
-        Rm(), this.c = new $r();
-      }
-      function KD() {
-        S0(), this.a = new $r();
-      }
-      function ZD() {
-        return Q7(), new n_();
-      }
-      function _f(e) {
-        if (!e)
-          throw new ed();
-      }
-      function w1(e) {
-        if (!e)
-          throw new Lv();
-      }
-      function m1(e) {
-        if (!e)
-          throw new sa();
-      }
-      function XD() {
-        this.b = (On(), new $t());
-      }
-      function QD() {
-        this.b = (On(), new $t());
-      }
-      function qn(e) {
-        this.a = e.a, this.b = e.b;
-      }
-      function He(e) {
-        return e ?? null;
-      }
-      function ci(e) {
-        return e ? e.zb() : null;
-      }
-      function JD(e, t) {
-        return e.Nb().sb(t);
-      }
-      function e9(e, t) {
-        return e.a.a.a.U(t);
-      }
-      function wm(e, t) {
-        return pU(e.mb(), t);
-      }
-      function PF(e, t) {
-        return mr(t.b, e.b);
-      }
-      function DF(e, t) {
-        return mr(t.k, e.k);
-      }
-      function xS(e) {
-        return Math.floor(e);
-      }
-      function jc(e, t) {
-        return e.a += "" + t, e;
-      }
-      function Hu(e, t) {
-        return e.a += "" + t, e;
-      }
-      function io(e, t) {
-        return e.a += "" + t, e;
-      }
-      function y1(e) {
-        return Yv(e == null), e;
-      }
-      function TS(e) {
-        return e.d && r2(e), e.a;
-      }
-      function mm(e) {
-        return e.d && r2(e), e.b;
-      }
-      function ym(e) {
-        return e.d && r2(e), e.c;
-      }
-      function t9(e, t) {
-        return Le(e.a, t), t;
-      }
-      function n9(e) {
-        so(this), eM(this, e);
-      }
-      function r9(e) {
-        this.c = e, this.e = !1;
-      }
-      function i9() {
-        yD.call(this, "OPEN", 0);
-      }
-      function a9() {
-        xD.call(this, "SIZE", 0);
-      }
-      function jF() {
-        ZP.call(this, "UTF-8");
-      }
-      function o9() {
-        o9 = c, VL = {}, Mp = {};
-      }
-      function s9() {
-        s9 = c, cf = new nt(l8, 0);
-      }
-      function ya(e) {
-        return vt(e), new Gf(e);
-      }
-      function $v(e) {
-        return mn(), e.length;
-      }
-      function NF(e, t) {
-        return aW(e.a, t.a);
-      }
-      function IF(e, t) {
-        return b9(e.a, t.a);
-      }
-      function u9(e, t) {
-        return e == t ? 0 : e ? 1 : -1;
-      }
-      function c9(e) {
-        return hs(e.e) - hs(e.g);
-      }
-      function _a(e) {
-        return new ot(e.a, e.b);
-      }
-      function MF(e) {
-        return new ot(e.d, e.e);
-      }
-      function km(e) {
-        e.c = ve(Ze, Me, 1, 0, 4, 1);
-      }
-      function l9() {
-        kD.call(this, "VALUE", 1);
-      }
-      function LS(e) {
-        HS.call(this), this.a = e;
-      }
-      function f9(e) {
-        this.a = new KA(), this.b = e;
-      }
-      function Gf(e) {
-        this.a = e, Aw.call(this);
-      }
-      function h9(e) {
-        this.a = e, Aw.call(this);
-      }
-      function d9() {
-        _M(), this.d = (lu(), Ip);
-      }
-      function OF(e) {
-        if (!e)
-          throw new g7();
-      }
-      function Ol(e) {
-        if (!e)
-          throw new Lv();
-      }
-      function v9(e) {
-        if (!e)
-          throw new ed();
-      }
-      function Yv(e) {
-        if (!e)
-          throw new v7();
-      }
-      function ut(e) {
-        if (!e)
-          throw new sa();
-      }
-      function _i() {
-        R5.call(this, new yd());
-      }
-      function g9() {
-        yD.call(this, "CLOSED", 1);
-      }
-      function _o(e) {
-        mN.call(this, new X5(e));
-      }
-      function PS(e, t) {
-        return ++e.d, Cr(e, t);
-      }
-      function AF(e, t) {
-        return zm(e.a, 0, t);
-      }
-      function RF(e, t) {
-        return mr(e.a, t.a);
-      }
-      function vd(e) {
-        return zl(e.b.mb(), e.a);
-      }
-      function Go(e) {
-        return Am(e.a.mb(), e.b);
-      }
-      function Em(e, t) {
-        return t == e.c ? e.d : e.c;
-      }
-      function BF(e, t) {
-        return e < t ? -1 : e > t ? 1 : 0;
-      }
-      function b9(e, t) {
-        return e < t ? -1 : e > t ? 1 : 0;
-      }
-      function Sm(e) {
-        return e != null ? Uo(e) : 0;
-      }
-      function p9(e) {
-        this.a = ZD(), this.b = e;
-      }
-      function w9(e) {
-        this.a = ZD(), this.b = e;
-      }
-      function m9(e) {
-        this.a = e, t4.call(this, e);
-      }
-      function y9() {
-        jS(), this.b = new $P(this);
-      }
-      function $o() {
-        $o = c, px = FF(new n1(", "));
-      }
-      function yo() {
-        yo = c, Wa = new i9(), Z0 = new g9();
-      }
-      function _n() {
-        _n = c, $8 = new P(), wx = new N();
-      }
-      function k1() {
-        k1 = c, $2 = new BD(), mx = new l9();
-      }
-      function E1() {
-        E1 = c, Y2 = new a9(), kx = new j9();
-      }
-      function $f() {
-        $f = c, Q8 = new _(), J8 = new B();
-      }
-      function DS(e) {
-        e.g = new Se(), e.b = new Se();
-      }
-      function k9(e) {
-        e.a = new xw(), e.c = new xw();
-      }
-      function jS() {
-        jS = c, Sz = new Ew(), Ez = new Sj();
-      }
-      function E9() {
-        Xw.call(this, "IS_NULL", 2);
-      }
-      function S9() {
-        g1.call(this, "Head", 1);
-      }
-      function C9() {
-        g1.call(this, "Tail", 3);
-      }
-      function NS(e, t) {
-        i3.call(this, e, t, null);
-      }
-      function IS(e, t) {
-        ah(e, 0, e.length, t);
-      }
-      function Fv(e, t) {
-        return Le(t.a, e.a), e.a;
-      }
-      function Yo(e, t) {
-        return e.a *= t, e.b *= t, e;
-      }
-      function x9(e, t) {
-        dr(), this.a = e, this.b = t;
-      }
-      function zF(e, t) {
-        return e.a[t.d.k][t.k];
-      }
-      function ka(e, t) {
-        return e.a[t.d.k][t.k];
-      }
-      function HF(e, t) {
-        return ty(e.b, t.mc());
-      }
-      function T9(e, t) {
-        return uD(jU(e.a, t));
-      }
-      function L9(e, t) {
-        return uD(NU(e.a, t));
-      }
-      function Or(e, t) {
-        return f(Pa(e.a, t), 20);
-      }
-      function xe(e, t) {
-        return e != null && Uy(e, t);
-      }
-      function Nc(e) {
-        return e.a < e.c.c.length;
-      }
-      function S1(e) {
-        return e.a < e.c.a.length;
-      }
-      function _F(e, t) {
-        return mr(e.i.a, t.i.a);
-      }
-      function GF(e, t) {
-        return e.i.b = (or(t), t);
-      }
-      function $F(e, t) {
-        return e.i.b = (or(t), t);
-      }
-      function Cm(e, t) {
-        return e.a.eb(t) != null;
-      }
-      function xm(e, t, n) {
-        return e.g[t.e][n.e];
-      }
-      function P9(e) {
-        return yn(), mn(), "" + e;
-      }
-      function D9() {
-        g1.call(this, "Range", 2);
-      }
-      function j9() {
-        xD.call(this, "DISTINCT", 1);
-      }
-      function N9() {
-        Xw.call(this, "NOT_NULL", 3);
-      }
-      function On() {
-        On = c, Y8 = new G9(($o(), px));
-      }
-      function I9(e) {
-        this.d = (Qt(), new I5(e));
-      }
-      function MS(e, t) {
-        return YM(e, new ad(), t).a;
-      }
-      function C1(e, t) {
-        return t == null ? e.b : Wj(t);
-      }
-      function YF(e) {
-        return e == null ? null : e.name;
-      }
-      function Yf(e) {
-        return typeof e == "number";
-      }
-      function ko(e) {
-        return typeof e == "string";
-      }
-      function OS(e, t) {
-        return new Kj(e, e.Y(), t);
-      }
-      function AS(e, t) {
-        return new oA(e.a, e.b, t);
-      }
-      function FF(e) {
-        return vt($s), new kj(e, e);
-      }
-      function Ic(e) {
-        return fi(e, nl), new ji(e);
-      }
-      function M9(e, t) {
-        this.a = t, cS.call(this, e);
-      }
-      function O9(e, t) {
-        this.a = t, cS.call(this, e);
-      }
-      function A9(e, t) {
-        this.a = e, Uw.call(this, t);
-      }
-      function R9(e) {
-        this.c = e, this.a = HZ(this.c);
-      }
-      function ao(e) {
-        var t;
-        t = e.a, e.a = e.b, e.b = t;
-      }
-      function qF(e, t) {
-        e.e.j.a = t.a, e.e.j.b = t.b;
-      }
-      function VF(e, t, n) {
-        e.a = t ^ 1502, e.b = n ^ R2;
-      }
-      function ua(e, t, n) {
-        return e.a += t, e.b += n, e;
-      }
-      function WF(e, t, n) {
-        return e.a -= t, e.b -= n, e;
-      }
-      function Tm(e) {
-        return e.a = -e.a, e.b = -e.b, e;
-      }
-      function Lm(e) {
-        return ut(e.b != 0), e.a.a.c;
-      }
-      function x1(e) {
-        return ut(e.b != 0), e.c.b.c;
-      }
-      function B9(e, t) {
-        e.a && (o4(t), EN(t));
-      }
-      function T1(e, t, n) {
-        var i;
-        i = e.ub(t), i.J(n);
-      }
-      function UF(e, t) {
-        return BF(t.Yb(), e.Yb());
-      }
-      function Pm(e) {
-        return f(_e(e.a, e.b), 128);
-      }
-      function z9(e) {
-        return Wm(e.c, e.c.length);
-      }
-      function KF(e) {
-        return e.l + e.m * Jl + e.h * tc;
-      }
-      function gi(e) {
-        return e == yh || e == es || e == ni;
-      }
-      function ta(e) {
-        return typeof e == "number";
-      }
-      function Fo(e, t) {
-        return !!t && e.b[t.e] == t;
-      }
-      function RS(e, t) {
-        var n;
-        n = e[ol], t[ol] = n;
-      }
-      function qv(e, t) {
-        mo.call(this, e), this.b = t;
-      }
-      function L1(e) {
-        Cv.call(this, e), this.a = e;
-      }
-      function BS(e) {
-        Qh.call(this, e), this.a = e;
-      }
-      function zS(e) {
-        jl.call(this, e), this.a = e;
-      }
-      function H9(e) {
-        R5.call(this, new EI(e));
-      }
-      function Vv(e) {
-        this.a = e, N5.call(this, e);
-      }
-      function _9(e) {
-        this.c = e, this.a = 1, this.b = 1;
-      }
-      function G9(e) {
-        this.a = e, this.b = qf(vt("="));
-      }
-      function $9() {
-        this.a = new Wr(), this.e = new Wr();
-      }
-      function Y9() {
-        this.a = new c7(), this.c = new Te();
-      }
-      function HS() {
-        this.i = new Yr(), this.j = new Yr();
-      }
-      function F9(e) {
-        _f(e.d.c + e.e.c == 0), this.b = e;
-      }
-      function Dm(e) {
-        return e.g = null, J7(e, e.f), e;
-      }
-      function _S(e) {
-        return _n(), vt(e), new sj(e);
-      }
-      function q9(e) {
-        return Cd(), parseInt(e) || -1;
-      }
-      function V9(e, t) {
-        return Qv(e.a, t) != null;
-      }
-      function Wv(e, t) {
-        return !hU(e, t) && !aM(e, t);
-      }
-      function au(e) {
-        return e.$H || (e.$H = ++mte);
-      }
-      function ZF(e) {
-        return e.d != null ? e.d : "" + e.e;
-      }
-      function P1(e) {
-        return e.d != null ? e.d : "" + e.e;
-      }
-      function jm(e) {
-        return e.b = f(Xq(e.a), 21);
-      }
-      function Ff(e) {
-        return typeof e == "boolean";
-      }
-      function W9(e) {
-        e.b = new K9(e), e.c = new $t();
-      }
-      function U9() {
-        this.a = new Se(), this.d = new Se();
-      }
-      function K9(e) {
-        i4.call(this, e, null, null);
-      }
-      function Z9(e, t, n, i) {
-        d4.call(this, e, t, n, i);
-      }
-      function X9(e, t, n, i) {
-        cy.call(this, e, t, n, i);
-      }
-      function qo(e, t, n, i) {
-        cy.call(this, e, t, n, i);
-      }
-      function GS(e, t, n) {
-        ig.call(this, e, t, n, null);
-      }
-      function $S(e, t, n) {
-        ig.call(this, e, t, n, null);
-      }
-      function YS(e, t, n) {
-        e.i = t, t.f = e, t.i = n, n.f = t;
-      }
-      function FS(e, t) {
-        s7(this), this.e = e, this.f = t;
-      }
-      function XF(e, t) {
-        this.d = e, a7(this), this.b = t;
-      }
-      function Nm(e) {
-        k9(this), Bs(this), na(this, e);
-      }
-      function jt(e) {
-        return Yv(e == null || Ff(e)), e;
-      }
-      function Ot(e) {
-        return Yv(e == null || Yf(e)), e;
-      }
-      function qf(e) {
-        return Yv(e == null || ko(e)), e;
-      }
-      function dn(e, t) {
-        return e.a += t.a, e.b += t.b, e;
-      }
-      function ou(e, t) {
-        return e.a -= t.a, e.b -= t.b, e;
-      }
-      function QF(e, t) {
-        return e.i.a = (or(t), t + 10);
-      }
-      function JF(e, t) {
-        return e.i.a = (or(t), t + 10);
-      }
-      function Mc(e, t) {
-        return f(Kt(e.k, t), 24).a;
-      }
-      function eq(e, t) {
-        return PK(e, t), new IN(e, t);
-      }
-      function qS(e, t) {
-        return f(e.b.sb(t), 92).a;
-      }
-      function Q9(e) {
-        return f(e, 7).b.c.length != 0;
-      }
-      function J9(e) {
-        return f(e, 7).e.c.length != 0;
-      }
-      function ej(e) {
-        return e.d ? Di(e.d.a, e, 0) : -1;
-      }
-      function tq(e) {
-        return e == null ? null : e.message;
-      }
-      function Al(e) {
-        e.n == null && mX(e);
-      }
-      function nq(e, t, n, i) {
-        return tI(e, t, n, i), e;
-      }
-      function rq(e, t) {
-        return mn(), e.indexOf(t);
-      }
-      function Bt(e, t) {
-        if (!t)
-          throw new td();
-        e.g = t;
-      }
-      function VS(e) {
-        if (e.e.c != e.b)
-          throw new nd();
-      }
-      function D1(e) {
-        if (e.f.c != e.b)
-          throw new nd();
-      }
-      function iq(e, t) {
-        return vt(e), vt(t), u3(e, t);
-      }
-      function Oc(e, t) {
-        this.a = e, this.c = t, this.b = 2;
-      }
-      function j1() {
-        s7(this), this.e = -1, this.f = !0;
-      }
-      function Im() {
-        $Y.call(this, new $t()), this.a = 3;
-      }
-      function tj(e) {
-        cy.call(this, e.d, e.b, e.a, e.c);
-      }
-      function WS(e) {
-        cy.call(this, e.d, e.b, e.a, e.c);
-      }
-      function nj(e) {
-        L3.call(this, e), this.c = new Se();
-      }
-      function rj() {
-        Xw.call(this, "ALWAYS_TRUE", 0);
-      }
-      function ij() {
-        Xw.call(this, "ALWAYS_FALSE", 1);
-      }
-      function aj(e) {
-        _R(), this.a = new Im(), rM(this, e);
-      }
-      function aq(e) {
-        return !e.e && (e.e = new Se()), e.e;
-      }
-      function US(e) {
-        var t;
-        return t = new kv(), t.e = e, t;
-      }
-      function Mm(e) {
-        var t;
-        t = e[ol] | 0, e[ol] = t + 1;
-      }
-      function su(e, t) {
-        e.a.rb(e.b, t), ++e.b, e.c = -1;
-      }
-      function KS(e, t) {
-        Ol(e.c != -1), e.a.wb(e.c, t);
-      }
-      function oq(e, t) {
-        return yn(), e == t ? 0 : e ? 1 : -1;
-      }
-      function Om(e, t, n) {
-        return e.g[t.e][n.e] * e.d;
-      }
-      function sq(e, t, n) {
-        return e.apply(t, n);
-      }
-      function ZS(e, t, n) {
-        return Sq(e, f(t, 17), n);
-      }
-      function uq(e, t) {
-        return t == (we(), qe) ? e.c : e.d;
-      }
-      function oj(e, t) {
-        return t != null && e.Nb().kb(t);
-      }
-      function cq(e, t) {
-        this.e = t, this.f = e, Dm(this);
-      }
-      function sj(e) {
-        this.b = e, this.a = (_n(), _n(), wx);
-      }
-      function uj(e) {
-        Ea(), this.a = (Qt(), new jl(e));
-      }
-      function Ea() {
-        Ea = c, new K5((Qt(), Qt(), bc));
-      }
-      function cj() {
-        cj = c, Pz = bi(new An(), (Pr(), Ik));
-      }
-      function Uv(e) {
-        mU.call(this, e, (X4(), qL));
-      }
-      function _u(e) {
-        km(this), r4(this.c, 0, e.ob());
-      }
-      function lj(e, t, n) {
-        this.b = e, this.a = t, this.c = n;
-      }
-      function XS(e, t, n) {
-        zf.call(this, e, t), this.b = n;
-      }
-      function N1(e, t, n) {
-        this.b = e, this.a = t, this.c = n;
-      }
-      function QS(e, t) {
-        var n;
-        return n = e.e, e.e = t, n;
-      }
-      function fj(e) {
-        so(e.c), e.b.b = e.b, e.b.a = e.b;
-      }
-      function I1(e) {
-        e.b ? I1(e.b) : un(e.f.b, e.e, e.d);
-      }
-      function JS(e) {
-        return ut(e.b != 0), zs(e, e.a.a);
-      }
-      function lq(e) {
-        return ut(e.b != 0), zs(e, e.c.b);
-      }
-      function Am(e, t) {
-        return _n(), vt(t), new M9(e, t);
-      }
-      function fq(e, t) {
-        return On(), new O9(e.mb(), t);
-      }
-      function hj(e, t) {
-        return mn(), e.charCodeAt(t);
-      }
-      function gd(e, t, n) {
-        return mn(), e.substr(t, n);
-      }
-      function hq(e) {
-        return mn(), e == null ? $s : ha(e);
-      }
-      function Kv(e, t, n) {
-        return xm(e, t.g, n.g) * e.d;
-      }
-      function Gu(e, t, n) {
-        return { l: e, m: t, h: n };
-      }
-      function uu(e, t) {
-        return xd(e, new zf(t.a, t.b));
-      }
-      function dj(e, t, n, i, s) {
-        e.d = t, e.e = n, e.c = i, e.b = s;
-      }
-      function Sa(e, t, n, i, s) {
-        e.b = t, e.c = n, e.d = i, e.a = s;
-      }
-      function rn(e, t) {
-        return wr(e, t, e.c.b, e.c), !0;
-      }
-      function Le(e, t) {
-        return e.c[e.c.length] = t, !0;
-      }
-      function nt(e, t) {
-        $f(), Zn.call(this, e), this.a = t;
-      }
-      function vj() {
-        cj(), this.e = new Wr(), this.d = new Wr();
-      }
-      function Rl() {
-        Rl = c, e_ = new C5(), GL = new C5();
-      }
-      function gj() {
-        gj = c, qz = Zv(new An(), (Pr(), Vd));
-      }
-      function bj() {
-        bj = c, Uz = Zv(new An(), (Pr(), Vd));
-      }
-      function pj() {
-        pj = c, Xz = Zv(new An(), (Pr(), Vd));
-      }
-      function Rm() {
-        Rm = c, Qz = Zv(new An(), (Pr(), Vd));
-      }
-      function wj() {
-        wj = c, Error.stackTraceLimit = 64;
-      }
-      function e4() {
-        Sa(this, !1, !1, !1, !1);
-      }
-      function M1(e) {
-        var t;
-        return t = new Se(), Ey(t, e), t;
-      }
-      function ca(e) {
-        var t;
-        return t = new Wr(), h3(t, e), t;
-      }
-      function O1(e) {
-        var t;
-        return t = new An(), xr(t, e), t;
-      }
-      function dq(e) {
-        var t;
-        return t = new U6(), t.a = e, t;
-      }
-      function f(e, t) {
-        return Yv(e == null || Uy(e, t)), e;
-      }
-      function A1(e, t) {
-        if (e < 0 || e >= t)
-          throw new I7();
-      }
-      function Eo(e, t) {
-        return vt(e), vt(t), new Tj(e, t);
-      }
-      function vs(e, t) {
-        return vt(e), vt(t), new Lj(e, t);
-      }
-      function vq(e, t) {
-        return mn(), e.lastIndexOf(t);
-      }
-      function Bm(e, t, n) {
-        return e < t ? n <= e : e <= n || e == t;
-      }
-      function mj(e, t, n) {
-        this.d = e, this.b = n, this.a = t;
-      }
-      function ti(e, t, n) {
-        this.a = e, this.b = t, this.c = n;
-      }
-      function yj(e, t, n) {
-        this.a = e, this.b = t, this.c = n;
-      }
-      function kj(e, t) {
-        this.a = e, this.b = $s, this.c = t.c;
-      }
-      function Ej(e) {
-        this.c = e.c, this.a = e.e, this.b = e.b;
-      }
-      function t4(e) {
-        this.d = e, a7(this), this.b = Lq(e.d);
-      }
-      function Sj() {
-        n4.call(this), this.a = new YP(this);
-      }
-      function n4() {
-        this.c = new $(), this.d = new uN(this);
-      }
-      function gq(e) {
-        var t;
-        return t = new $r(), Ey(t, e), t;
-      }
-      function Cj(e) {
-        So(e.a), mI(e.c, e.b), e.b = null;
-      }
-      function xj(e) {
-        return e.c - f(_e(e.a, e.b), 128).b;
-      }
-      function bq(e, t) {
-        return e.c < t.c ? -1 : e.c == t.c ? 0 : 1;
-      }
-      function pq(e, t) {
-        return Nl(e.b.d) ? t.xc() : t.wc();
-      }
-      function zm(e, t, n) {
-        return mn(), e.substr(t, n - t);
-      }
-      function r4(e, t, n) {
-        Xy(n, 0, e, t, n.length, !1);
-      }
-      function i4(e, t, n) {
-        this.c = e, p1.call(this, t, n);
-      }
-      function Tj(e, t) {
-        this.b = e, this.a = t, Aw.call(this);
-      }
-      function Lj(e, t) {
-        this.a = e, this.b = t, Aw.call(this);
-      }
-      function Pj(e, t) {
-        this.b = e, this.a = t, fi(t, "count");
-      }
-      function Hm(e) {
-        this.b = e, this.a = Bc(this.b.a).Kb();
-      }
-      function Zn(e) {
-        $f(), this.c = Q8, this.d = J8, this.b = e;
-      }
-      function Dj(e, t, n) {
-        $D.call(this, e, t), this.a = n;
-      }
-      function jj(e, t, n) {
-        $D.call(this, e, t), this.a = n;
-      }
-      function _e(e, t) {
-        return Sn(t, e.c.length), e.c[t];
-      }
-      function bi(e, t) {
-        return f(_e(e.a, 5), 18).ib(t), e;
-      }
-      function $u(e, t) {
-        return f(_e(e.a, 0), 18).ib(t), e;
-      }
-      function R1(e, t) {
-        return f(_e(e.a, 1), 18).ib(t), e;
-      }
-      function pi(e, t) {
-        return f(_e(e.a, 2), 18).ib(t), e;
-      }
-      function Ca(e, t) {
-        return f(_e(e.a, 3), 18).ib(t), e;
-      }
-      function Zv(e, t) {
-        return f(_e(e.a, 4), 18).ib(t), e;
-      }
-      function wq(e) {
-        return Ss(e, ($n(), ja)), e.e = !0, e;
-      }
-      function a4(e) {
-        Cd();
-        var t;
-        return t = dx.ec(e), MK(t);
-      }
-      function B1(e, t) {
-        var n;
-        return n = Zm(e, t), n.g = 2, n;
-      }
-      function mq(e, t) {
-        var n;
-        for (n = 0; n < t; ++n)
-          e[n] = 0;
-      }
-      function Nj(e, t) {
-        e.b = t.b, e.c = t.c, e.d = t.d, e.a = t.a;
-      }
-      function o4(e) {
-        e.a.b = e.b, e.b.a = e.a, e.a = e.b = null;
-      }
-      function Ij(e) {
-        return e.b.c.length + e.e.c.length;
-      }
-      function _m(e) {
-        return Array.isArray(e) && e.ad === u;
-      }
-      function Mj(e, t) {
-        return _n(), SM(new M(e), t) != -1;
-      }
-      function Gm(e, t, n, i, s, l) {
-        return AO(e, t, n, i, s, 0, l);
-      }
-      function z1(e, t, n) {
-        $f(), Q1.call(this, e.b, t, n, e.d);
-      }
-      function H1(e, t) {
-        $f(), Q1.call(this, e.b, t, e.c, e.d);
-      }
-      function Ac(e, t, n) {
-        qc(t, e.c.length), _v(e.c, t, n);
-      }
-      function Oj(e, t) {
-        return Sn(t, e.a.length), e.a[t];
-      }
-      function yq(e) {
-        e.sort(function(t, n) {
-          return t - n;
-        });
-      }
-      function vt(e) {
-        if (e == null)
-          throw new td();
-        return e;
-      }
-      function Rc(e) {
-        if (e == null)
-          throw new td();
-        this.a = e;
-      }
-      function _1(e, t, n) {
-        if (e.a != t)
-          throw new nd();
-        e.a = n;
-      }
-      function s4(e, t) {
-        if (!e)
-          throw new tn((mn(), t));
-      }
-      function u4(e, t) {
-        if (!e)
-          throw new U7((mn(), t));
-      }
-      function or(e) {
-        if (e == null)
-          throw new td();
-        return e;
-      }
-      function $m(e) {
-        R5.call(this, new yd()), na(this, e);
-      }
-      function c4(e) {
-        this.a = new sm(e.Y()), na(this, e);
-      }
-      function G1(e) {
-        this.c = e, this.a = new Hf(this.c.a);
-      }
-      function cu(e) {
-        dr(), this.a = (Qt(), new r7(vt(e)));
-      }
-      function yn() {
-        yn = c, Rn = (yn(), !1), ii = !0;
-      }
-      function Aj() {
-        Aj = c, _L = ve(H2, Dr, 24, 256, 0, 1);
-      }
-      function Rj() {
-        Rj = c, Dz = bi($u(new An(), (Pr(), Tk)), Ik);
-      }
-      function Ym() {
-        Ym = c, nz = new W(), iz = new n4(), rz = new Q();
-      }
-      function Bj(e) {
-        return e != null && Km(e) && e.ad !== u;
-      }
-      function Fm(e) {
-        return !Array.isArray(e) && e.ad === u;
-      }
-      function Bl(e, t) {
-        return ko(t) ? oN(e, t) : c2(e.d, t);
-      }
-      function l4(e, t) {
-        return xe(t, 17) && Fo(e, f(t, 17));
-      }
-      function zj(e, t) {
-        return xe(t, 17) && KW(e, f(t, 17));
-      }
-      function kq(e, t) {
-        return Vw(e.a, t) !== void 0;
-      }
-      function Yt(e, t) {
-        var n;
-        return n = b0(e), lg(n, t), n;
-      }
-      function Eq(e, t) {
-        return !e && (e = []), e[e.length] = t, e;
-      }
-      function Sq(e, t, n) {
-        return hi(e.a, t), Um(e, t.e, n);
-      }
-      function Cq(e, t, n) {
-        return mn(), e.lastIndexOf(t, n);
-      }
-      function Hj(e, t, n) {
-        if (!e)
-          throw new tn(uQ(t, n));
-      }
-      function xq(e, t, n) {
-        var i;
-        for (i = 0; i < t; ++i)
-          e[i] = n;
-      }
-      function Vf(e, t) {
-        var n;
-        return n = e.a.Y(), fy(t, n), n - t;
-      }
-      function qm(e) {
-        var t;
-        return t = e.i, t || (e.i = e.T());
-      }
-      function f4(e) {
-        var t;
-        return t = e.c, t || (e.c = e.gb());
-      }
-      function _j(e) {
-        var t;
-        return t = e.c, t || (e.c = e.Jb());
-      }
-      function Bc(e) {
-        return e.e ? e.e : e.e = e.Ob();
-      }
-      function Gj(e) {
-        return e.f ? e.f : e.f = e.Pb();
-      }
-      function Tq(e, t) {
-        return Gu(e.l & t.l, e.m & t.m, e.h & t.h);
-      }
-      function $j(e, t) {
-        return mr((or(e), e), (or(t), t));
-      }
-      function Lq(e) {
-        return xe(e, 20) ? f(e, 20).tb() : e.mb();
-      }
-      function $1(e) {
-        for (_n(), vt(e); e.G(); )
-          e.H(), e.I();
-      }
-      function h4(e) {
-        var t;
-        for (t = e; t.g; )
-          t = t.g;
-        return t;
-      }
-      function Pq(e) {
-        return e.b.i.a += e.a.f * (e.a.a - 1), null;
-      }
-      function bd(e) {
-        Ol(e.b != -1), e.c.vb(e.a = e.b), e.b = -1;
-      }
-      function Yj(e) {
-        return ut(e.b > 0), e.a.sb(e.c = --e.b);
-      }
-      function Y1(e) {
-        e.b ? Y1(e.b) : e.d.V() && Bl(e.f.b, e.e);
-      }
-      function Wf(e) {
-        if (La(e.d), e.d.d != e.c)
-          throw new nd();
-      }
-      function Vm(e, t) {
-        if (t[ol] != e[ol])
-          throw new nd();
-      }
-      function zl(e, t) {
-        return _n(), vt(e), vt(t), new wD(e, t);
-      }
-      function Fj(e, t) {
-        dr(), wF.call(this, e, h0(new ro(t)));
-      }
-      function d4(e, t, n, i) {
-        this.a = e, ig.call(this, e, t, n, i);
-      }
-      function zc(e) {
-        this.a = Math.cos(e), this.b = Math.sin(e);
-      }
-      function gs(e, t, n) {
-        mo.call(this, e), this.b = t, this.a = n;
-      }
-      function v4(e) {
-        this.b = new Se(), this.a = new Se(), this.c = e;
-      }
-      function Hc(e) {
-        this.c = new Yr(), this.a = new Se(), this.b = e;
-      }
-      function qj() {
-        qj = c, W8 = new T5(!1), U8 = new T5(!0);
-      }
-      function Yu(e, t) {
-        return ++e.d, e.c[e.c.length] = t, !0;
-      }
-      function Xv(e, t) {
-        wr(e.d, t, e.b.b, e.b), ++e.a, e.c = null;
-      }
-      function vn(e, t) {
-        var n;
-        return n = e.a.db(t, e), n == null;
-      }
-      function Wm(e, t) {
-        var n;
-        return n = e.slice(0, t), ag(n, e);
-      }
-      function xi(e, t) {
-        var n;
-        return n = new Array(t), ag(n, e);
-      }
-      function Um(e, t, n) {
-        var i;
-        return i = e.b[t], e.b[t] = n, i;
-      }
-      function Dq(e, t) {
-        var n;
-        for (n = 0; n < t; ++n)
-          e[n] = null;
-      }
-      function jq(e, t) {
-        var n;
-        for (n = 0; n < t; ++n)
-          e[n] = !1;
-      }
-      function Nq(e, t) {
-        return yn(), f(t.b, 24).a < e ? ii : Rn;
-      }
-      function Iq(e, t) {
-        return yn(), f(t.a, 24).a < e ? ii : Rn;
-      }
-      function Mq(e, t) {
-        return f(_j(Bc(e.a)).sb(t), 21).yb();
-      }
-      function Vj(e) {
-        return On(), Am(wV(e.a).mb(), (k1(), $2));
-      }
-      function Dt(e) {
-        return _n(), new _o(Go(vs(e.a, new T())));
-      }
-      function Km(e) {
-        return typeof e === z0 || typeof e === UR;
-      }
-      function Oq(e) {
-        r.setTimeout(function() {
-          throw e;
-        }, 0);
-      }
-      function Aq(e, t) {
-        return e > 0 ? new FS(e - 1, t) : new FS(e, t);
-      }
-      function Wj(e) {
-        return vt(e), xe(e, 345) ? f(e, 345) : ha(e);
-      }
-      function g4(e, t) {
-        return CM(e.a, t, (yn(), Rn)) == null;
-      }
-      function b4(e, t) {
-        var n;
-        return n = e.a.Y(), kV(t, n), n - 1 - t;
-      }
-      function Uj(e, t, n) {
-        var i;
-        return i = Fu(e, t), lW(e, t, n), i;
-      }
-      function G(e, t, n) {
-        var i;
-        return i = Zm(e, t), RI(n, i), i;
-      }
-      function Zm(e, t) {
-        var n;
-        return n = new m3(), n.i = e, n.d = t, n;
-      }
-      function Kj(e, t, n) {
-        this.a = e, fy(n, t), this.c = t, this.b = n;
-      }
-      function Ga(e, t, n) {
-        return OF(n == null || uX(e, n)), e[t] = n;
-      }
-      function p4(e) {
-        e.a = null, e.e = null, so(e.b), e.d = 0, ++e.c;
-      }
-      function Rq(e) {
-        tn.call(this, (mn(), e ?? $s));
-      }
-      function Bq(e) {
-        tn.call(this, (mn(), e ?? $s));
-      }
-      function Hl(e) {
-        var t;
-        return t = e.f, t || (e.f = new pS(e));
-      }
-      function w4(e) {
-        var t;
-        return t = e.k, t || (e.k = new yP(e));
-      }
-      function Zj(e) {
-        var t;
-        return t = e.e, t || (e.e = new PD(e));
-      }
-      function Uf(e) {
-        var t;
-        return t = e.e, !t && (e.e = t = e.gb()), t;
-      }
-      function Xm(e) {
-        var t, n;
-        return t = e.c.f.d, n = e.d.f.d, t == n;
-      }
-      function m4(e, t) {
-        var n;
-        return n = new rg(e), n3(n, t), n;
-      }
-      function pd(e, t) {
-        return e.a += String.fromCharCode(t), e;
-      }
-      function Ti(e) {
-        return !e.a && e.d ? e.d.b : e.a;
-      }
-      function Qm(e) {
-        return ta(e) ? e | 0 : e.l | e.m << 22;
-      }
-      function zq(e) {
-        return fi(e, KC), Jf(Tr(Tr(5, e), e / 10 | 0));
-      }
-      function Kt(e, t) {
-        return ko(t) ? K1(e, t) : ci(li(e.d, t));
-      }
-      function _l(e) {
-        return xe(e, 19) ? f(e, 19).Y() : dy(e.mb());
-      }
-      function y4(e) {
-        return e ? new c4(($o(), e)) : gq(null.mb());
-      }
-      function Gl(e, t) {
-        return He(e) === He(t) || e != null && xo(e, t);
-      }
-      function Xj(e, t) {
-        return nS(), mr(ge(Ot(e)), ge(Ot(t)));
-      }
-      function Qj(e) {
-        return On(), Am(e.a.bb().mb(), (k1(), mx));
-      }
-      function dr() {
-        dr = c, Ea(), _g = new Qn((Qt(), Qt(), bc));
-      }
-      function Kf() {
-        Kf = c, Ea(), Gd = new um((Qt(), Qt(), LE));
-      }
-      function Jj(e, t) {
-        if (e == null)
-          throw new jv((mn(), t));
-      }
-      function Hq(e, t) {
-        return F3(), (e - t <= 0 ? 0 - (e - t) : e - t) < 0.2;
-      }
-      function _q(e, t) {
-        return e.i.b < t.i.b ? -1 : e.i.b == t.i.b ? 0 : 1;
-      }
-      function Vo(e, t, n, i) {
-        e.g[t.e][n.e] = i, e.g[n.e][t.e] = i;
-      }
-      function So(e) {
-        Ol(e.c != -1), e.d.vb(e.c), e.b = e.c, e.c = -1;
-      }
-      function Jm(e) {
-        this.c = e, this.b = e.a.b.a, RS(e.a.c, this);
-      }
-      function ey(e) {
-        CC.call(this, new ro(e)), this.a = new Yr();
-      }
-      function eN() {
-        Z5.call(this, new J5(new $t())), this.a = this;
-      }
-      function tN() {
-        xI(), this.b = (On(), new $t()), this.a = new $t();
-      }
-      function Gq() {
-        return k1(), re(ie(yx, 1), De, 188, 0, [$2, mx]);
-      }
-      function $q() {
-        return yo(), re(ie(bx, 1), De, 159, 0, [Wa, Z0]);
-      }
-      function Yq() {
-        return E1(), re(ie(Ex, 1), De, 205, 0, [Y2, kx]);
-      }
-      function nN(e) {
-        q1(e.a), e.b = ve(Ze, Me, 1, e.b.length, 4, 1);
-      }
-      function rN(e) {
-        return !e.b && (e.b = new jl(e.c.W())), e.b;
-      }
-      function Qv(e, t) {
-        var n;
-        return n = new Tw(), IR(e, t, n), n.d;
-      }
-      function F1(e, t) {
-        var n;
-        return n = Zm("", e), n.k = t, n.g = 1, n;
-      }
-      function q1(e) {
-        var t;
-        for (t = e.mb(); t.G(); )
-          t.H(), t.I();
-      }
-      function k4(e, t) {
-        return xe(t, 79) && zo(e.b, f(t, 79).mc());
-      }
-      function Fq() {
-        return t0(), re(ie(wz, 1), De, 175, 0, [YT, Mk]);
-      }
-      function qq() {
-        return U1(), re(ie(Tz, 1), De, 193, 0, [Ok, ZT]);
-      }
-      function Vq() {
-        return tg(), re(ie(Hz, 1), De, 192, 0, [Bk, Rk]);
-      }
-      function un(e, t, n) {
-        return ko(t) ? Z1(e, t, n) : ra(e.d, t, n);
-      }
-      function Wq(e, t, n) {
-        e.i = 0, e.e = 0, t != n && hM(e, t, n);
-      }
-      function Uq(e, t, n) {
-        e.i = 0, e.e = 0, t != n && fM(e, t, n);
-      }
-      function E4(e, t, n, i) {
-        this.d = e, this.b = t, this.a = n, this.c = i;
-      }
-      function $a(e, t, n, i) {
-        this.d = e, this.e = t, this.c = n, this.b = i;
-      }
-      function V1(e, t, n, i) {
-        this.a = e, this.c = t, this.b = n, this.d = i;
-      }
-      function Li(e, t, n, i) {
-        sn.call(this, e, t), this.a = n, this.b = i;
-      }
-      function Kq(e, t) {
-        var n;
-        return n = oS(e.a, t), n ?? [];
-      }
-      function ty(e, t) {
-        return mn(), e == t ? 0 : e < t ? -1 : 1;
-      }
-      function Zq(e, t) {
-        var n;
-        return n = FW(e.f, t), dn(Tm(n), e.f.d);
-      }
-      function Zf(e, t) {
-        return l4(e.a, t) ? e.b[f(t, 17).e] : null;
-      }
-      function la(e, t) {
-        return He(e) === He(t) || e != null && xo(e, t);
-      }
-      function Mn(e, t) {
-        if (t == null)
-          throw new td();
-        return yK(e, t);
-      }
-      function iN(e) {
-        return Yv(e == null || Km(e) && e.ad !== u), e;
-      }
-      function xa(e) {
-        return !e.a && (e.a = new rD(e.c.bb())), e.a;
-      }
-      function aN(e) {
-        return !e.d && (e.d = new Cv(e.c.fb())), e.d;
-      }
-      function Bs(e) {
-        e.a.a = e.c, e.c.b = e.a, e.a.b = e.c.a = null, e.b = 0;
-      }
-      function Xq(e) {
-        return ut(e.b < e.d.Y()), e.d.sb(e.c = e.b++);
-      }
-      function oN(e, t) {
-        return t == null ? c2(e.d, null) : bM(e.e, t);
-      }
-      function sN(e, t) {
-        this.g = e, this.d = re(ie(kr, 1), Ni, 9, 0, [t]);
-      }
-      function uN(e) {
-        this.c = e, this.b = new gD(f(vt(new X()), 56));
-      }
-      function bs() {
-        this.a = new Ci(), this.b = (fi(3, nl), new ji(3));
-      }
-      function cN(e, t) {
-        this.a = e, XF.call(this, e, f(e.d, 20).ub(t));
-      }
-      function W1(e, t, n, i) {
-        this.a = e, this.c = t, this.b = n, this.d = i;
-      }
-      function ny(e, t, n) {
-        this.a = zC, this.d = e, this.b = t, this.c = n;
-      }
-      function lN() {
-        this.d = 0, this.b = 0, this.a = 0, this.c = 0;
-      }
-      function fN() {
-        this.b = new $r(), this.d = new Wr(), this.e = new Y5();
-      }
-      function Qt() {
-        Qt = c, bc = new Z6(), $L = new Q6(), LE = new J6();
-      }
-      function S4() {
-        S4 = c, _8 = new rj(), H8 = new ij(), gx = new E9(), G8 = new N9();
-      }
-      function U1() {
-        U1 = c, Ok = new vS("GREEDY", 0), ZT = new vS(I2, 1);
-      }
-      function C4() {
-        C4 = c, rT = new H1((Ee(), zx), (yn(), yn(), ii));
-      }
-      function hN() {
-        hN = c, Gz = bi(Ca(pi(new An(), (Pr(), Dk)), Lk), Pk);
-      }
-      function Xf(e, t) {
-        var n;
-        return n = vy(t), f(Kt(e.c, n), 24).a;
-      }
-      function Qq(e, t) {
-        var n;
-        return n = Cm(e.a, t), n && (t.f = null), n;
-      }
-      function dN(e) {
-        var t;
-        return t = e.b.ob(), nI(t, t.length), t;
-      }
-      function ry(e) {
-        return e < 0 ? -1 : e > 0 ? 1 : 0;
-      }
-      function Jq() {
-        return Gi(), re(ie(ete, 1), De, 171, 0, [nb, ns, Us]);
-      }
-      function eV() {
-        return v0(), re(ie(cB, 1), De, 166, 0, [X2, Ix, Mx]);
-      }
-      function tV() {
-        return th(), re(ie(EB, 1), De, 149, 0, [Qg, ok, ak]);
-      }
-      function nV() {
-        return hy(), re(ie(Jee, 1), De, 225, 0, [oc, xh, sc]);
-      }
-      function rV() {
-        return d0(), re(ie(ite, 1), De, 221, 0, [cT, lT, uT]);
-      }
-      function iV() {
-        return a0(), re(ie(jz, 1), De, 173, 0, [Ak, QT, XT]);
-      }
-      function vN(e, t) {
-        return cg(Tq(ta(e) ? Uu(e) : e, ta(t) ? Uu(t) : t));
-      }
-      function aV(e) {
-        return e.b == 0 ? null : (ut(e.b != 0), zs(e, e.a.a));
-      }
-      function x4(e) {
-        e.d = e.d - 15, e.b = e.b - 15, e.c = e.c + 15, e.a = e.a + 15;
-      }
-      function T4(e) {
-        this.b = e, this.c = e, e.e = null, e.c = null, this.a = 1;
-      }
-      function gN(e, t, n) {
-        this.d = e, this.b = new Se(), this.c = t, this.a = n;
-      }
-      function iy(e, t) {
-        yY(this, new ot(e.a, e.b)), kY(this, ca(t));
-      }
-      function oV(e, t) {
-        return t === e ? !0 : (La(e), e.d.t(t));
-      }
-      function sV(e) {
-        return e == No || e == rs;
-      }
-      function uV(e) {
-        Nc(new M(bg(e.e))) && (Bee(e), zX(e));
-      }
-      function bN(e, t) {
-        var n;
-        n = f(Z4(e.e, t), 116), n && (e.d = !0);
-      }
-      function L4(e, t) {
-        var n;
-        return n = e.b.pb(t), nI(n, e.b.Y()), n;
-      }
-      function cV(e) {
-        var t;
-        return t = MA(e, (we(), qe)), t += MA(e, Be), t;
-      }
-      function lV(e, t, n) {
-        Sg(e, t, n, (we(), Be), e.f), Sg(e, t, n, qe, e.n);
-      }
-      function cn(e, t) {
-        e.f && Cr(e.f.f, e), e.f = t, e.f && Le(e.f.f, e);
-      }
-      function Ar(e, t) {
-        e.d && Cr(e.d.a, e), e.d = t, e.d && Le(e.d.a, e);
-      }
-      function kn(e, t) {
-        e.d && Cr(e.d.b, e), e.d = t, e.d && Le(e.d.b, e);
-      }
-      function Bn(e, t) {
-        e.c && Cr(e.c.e, e), e.c = t, e.c && Le(e.c.e, e);
-      }
-      function ay(e) {
-        var t;
-        return t = ca(e.b), na(t, e.c), na(t, e.i), t;
-      }
-      function fV() {
-        WL == 256 && (VL = Mp, Mp = {}, WL = 0), ++WL;
-      }
-      function Co() {
-        Co = c, cc = new yS(Ad, 0), Ps = new yS(Od, 1);
-      }
-      function _c() {
-        _c = c, Ks = new SS(Od, 0), hf = new SS(Ad, 1);
-      }
-      function hV() {
-        return _c(), re(ie(fte, 1), De, 223, 0, [Ks, hf]);
-      }
-      function dV() {
-        return e0(), re(ie(ute, 1), De, 242, 0, [cb, ub]);
-      }
-      function vV() {
-        return Co(), re(ie(cte, 1), De, 248, 0, [cc, Ps]);
-      }
-      function gV() {
-        return oo(), re(ie(lte, 1), De, 247, 0, [ku, Za]);
-      }
-      function bV() {
-        return og(), re(ie(Jz, 1), De, 194, 0, [Hk, _k]);
-      }
-      function pV() {
-        return J1(), re(ie(_H, 1), De, 174, 0, [iE, pL]);
-      }
-      function P4(e) {
-        return Qt(), xe(e, 63) ? new rS(e) : new L1(e);
-      }
-      function wV(e) {
-        var t;
-        return t = e.g, f(t || (e.g = new x5(e)), 20);
-      }
-      function li(e, t) {
-        return DM(e, t, Kq(e, t == null ? 0 : e.b.Vc(t)));
-      }
-      function pN(e) {
-        var t;
-        return t = n0(e), "n_" + (t ?? o1(e.k));
-      }
-      function wN(e) {
-        return a1(kd(e)) + "@" + (Uo(e) >>> 0).toString(16);
-      }
-      function mV(e, t) {
-        return oq(Pt((or(e), e)), Pt((or(t), t)));
-      }
-      function K1(e, t) {
-        return t == null ? ci(li(e.d, null)) : WD(e.e, t);
-      }
-      function yV(e, t, n) {
-        return new M4(e.c, gR(e.b, BV(e.d, t, n)), e.a);
-      }
-      function Xn(e) {
-        return Math.max(Math.min(e, yr), -2147483648) | 0;
-      }
-      function D4(e) {
-        this.e = e, this.b = this.e.a.entries(), this.a = [];
-      }
-      function j4(e) {
-        this.c = e, this.b = new Ul(new iu(this.c.a).a);
-      }
-      function mN(e) {
-        this.b = (_n(), _n(), _n(), $8), this.a = f(vt(e), 35);
-      }
-      function $l(e, t, n) {
-        $f(), nt.call(this, e, t), n != null && (this.c = n);
-      }
-      function yN(e, t, n) {
-        if (e < 0 || t < e || t > n)
-          throw new Ho(qZ(e, t, n));
-      }
-      function kV(e, t) {
-        if (e < 0 || e >= t)
-          throw new Ho(WZ(e, t));
-        return e;
-      }
-      function oy(e, t) {
-        if (e == null)
-          throw new jv((mn(), t));
-        return e;
-      }
-      function Et(e) {
-        if (!xt(e))
-          throw new sa();
-        return e.c = e.b, e.b.H();
-      }
-      function EV(e) {
-        function t() {
-        }
-        return t.prototype = e || {}, new t();
-      }
-      function kN(e) {
-        var t;
-        return t = new Ww(Ty(e.length)), lg(t, e), t;
-      }
-      function EN(e) {
-        var t;
-        t = e.c.b.b, e.b = t, e.a = e.c.b, t.a = e.c.b.b = e;
-      }
-      function N4(e) {
-        this.b = null, !e && (e = (Ml(), Ml(), wf)), this.a = e;
-      }
-      function I4(e) {
-        this.b = e, this.a = new fn(this.b, this.b.c.length);
-      }
-      function SN(e) {
-        return dr(), vt(e), mO(e || M1(new M(null)));
-      }
-      function SV(e, t) {
-        var n = F2[e.charCodeAt(0)];
-        return n ?? e;
-      }
-      function CN(e, t) {
-        var n = e.a = e.a || [];
-        return n[t] || (n[t] = e.Oc(t));
-      }
-      function xN(e, t, n) {
-        var i;
-        H3(t, n, e.c.length), i = n - t, aS(e.c, t, i);
-      }
-      function M4(e, t, n) {
-        pD.call(this, t.a), this.c = e, this.b = t, this.a = n;
-      }
-      function sy(e) {
-        return m1(e.c), e.e = e.a = e.c, e.c = e.c.c, ++e.d, e.a.f;
-      }
-      function TN(e) {
-        return m1(e.e), e.c = e.a = e.e, e.e = e.e.e, --e.d, e.a.f;
-      }
-      function Pi(e) {
-        return ln(re(ie(_t, 1), Ht, 10, 0, [e.f.i, e.i, e.a]));
-      }
-      function CV() {
-        return ys(), re(ie(rB, 1), De, 107, 0, [W2, $g, sl, ph]);
-      }
-      function xV() {
-        return fu(), re(ie(aB, 1), De, 122, 0, [K2, Tx, af, U2]);
-      }
-      function TV() {
-        return sh(), re(ie(hk, 1), De, 139, 0, [tb, fk, lk, ck]);
-      }
-      function LV() {
-        return du(), re(ie(qd, 1), De, 150, 0, [uk, eb, sk, Jg]);
-      }
-      function PV() {
-        return S4(), re(ie(K0, 1), De, 136, 0, [_8, H8, gx, G8]);
-      }
-      function DV() {
-        return ug(), re(ie(nte, 1), De, 201, 0, [uc, dl, hl, lf]);
-      }
-      function jV() {
-        return we(), re(ie(Nr, 1), De, 32, 0, [cr, rt, Be, ct, qe]);
-      }
-      function NV() {
-        return $n(), re(ie(Gg, 1), De, 59, 0, [Po, Fi, ja, Ts, Ws]);
-      }
-      function LN() {
-        LN = c, Lz = Rr((U1(), re(ie(Tz, 1), De, 193, 0, [Ok, ZT])));
-      }
-      function PN() {
-        PN = c, mz = Rr((t0(), re(ie(wz, 1), De, 175, 0, [YT, Mk])));
-      }
-      function DN() {
-        DN = c, _z = Rr((tg(), re(ie(Hz, 1), De, 192, 0, [Bk, Rk])));
-      }
-      function IV() {
-        return ms(), re(ie(dte, 1), De, 140, 0, [Cp, gf, Lh]);
-      }
-      function MV() {
-        return nh(), re(ie(hte, 1), De, 218, 0, [iL, yp, lb]);
-      }
-      function OV() {
-        return sr(), re(ie(vte, 1), De, 219, 0, [hE, Ai, ri]);
-      }
-      function AV() {
-        return p0(), re(ie(UH, 1), De, 153, 0, [zL, TE, HL]);
-      }
-      function RV() {
-        return lu(), re(ie(ZH, 1), De, 172, 0, [iv, gb, Ip]);
-      }
-      function Z1(e, t, n) {
-        return t == null ? ra(e.d, null, n) : zy(e.e, t, n);
-      }
-      function BV(e, t, n) {
-        return new j0(e, !1, null, (yo(), Wa), !0, t, n);
-      }
-      function O4(e, t) {
-        return zj(e.a, t) ? Um(e, f(t, 17).e, null) : null;
-      }
-      function X1(e) {
-        return vt(e), R3((_n(), new _o(Go(vs(e.a, new T())))));
-      }
-      function zV(e) {
-        return Qt(), e ? new n7(e) : (HD(), t_);
-      }
-      function jN(e, t) {
-        var n, i;
-        return i = Vf(e, t), n = e.a.ub(i), new ED(e, n);
-      }
-      function HV(e, t) {
-        var n, i;
-        for (i = e.Y(), n = 0; n < i; n++)
-          e.wb(n, t[n]);
-      }
-      function NN(e, t, n) {
-        var i;
-        i = new fs(), i.b = t, i.a = n, ++t.b, Le(e.d, i);
-      }
-      function _V(e, t, n) {
-        e.d && Cr(e.d.b, e), e.d = t, e.d && Ac(e.d.b, n, e);
-      }
-      function uy(e, t, n) {
-        H3(t, n, e.Y()), this.c = e, this.a = t, this.b = n - t;
-      }
-      function cy(e, t, n, i) {
-        this.d = e, this.b = t, this.a = n, this.c = i;
-      }
-      function IN(e, t) {
-        Z5.call(this, UI(vt(e), vt(t))), this.b = e, this.c = t;
-      }
-      function fn(e, t) {
-        this.a = e, Pf.call(this, e), qc(t, e.Y()), this.b = t;
-      }
-      function Q1(e, t, n, i) {
-        $f(), $l.call(this, e, t, n), i != null && (this.d = i);
-      }
-      function GV(e, t, n) {
-        e.i = 0, e.e = 0, t != n && (hM(e, t, n), fM(e, t, n));
-      }
-      function O(e) {
-        return ut(e.a < e.c.c.length), e.b = e.a++, e.c.c[e.b];
-      }
-      function Jv(e) {
-        return ut(e.b.b != e.d.a), e.c = e.b = e.b.b, --e.a, e.c.c;
-      }
-      function MN(e, t) {
-        var n;
-        return n = 1 - t, e.a[n] = c0(e.a[n], n), c0(e, t);
-      }
-      function $V(e) {
-        var t;
-        return t = (wi(), wi(), vH), e.d && r2(e), NY(), t;
-      }
-      function YV(e) {
-        var t;
-        return ta(e) ? (t = e, t == -0 ? 0 : t) : JK(e);
-      }
-      function wd(e) {
-        var t;
-        return t = (vt(e), new _u(($o(), e))), D0(t), h0(t);
-      }
-      function FV(e) {
-        _n();
-        for (var t; ; )
-          if (t = e.H(), !e.G())
-            return t;
-      }
-      function ON(e) {
-        return D1(e), m1(e.c), e.e = e.a = e.c, e.c = e.c.b, ++e.d, e.a;
-      }
-      function AN(e) {
-        return D1(e), m1(e.e), e.c = e.a = e.e, e.e = e.e.d, --e.d, e.a;
-      }
-      function qV(e) {
-        var t;
-        t = e.Y(), t != 0 && (e.d.Q(), e.f.c -= t, Y1(e));
-      }
-      function VV(e, t, n) {
-        var i;
-        i = vK();
-        try {
-          return sq(e, t, n);
-        } finally {
-          vW(i);
-        }
-      }
-      function WV(e) {
-        return function() {
-          return VV(e, this, arguments);
-        };
-      }
-      function eg(e) {
-        return xe(e, 19) ? f(e, 19).V() : !e.mb().G();
-      }
-      function Qn(e) {
-        dr(), this.a = (Qt(), xe(e, 63) ? new rS(e) : new L1(e));
-      }
-      function J1() {
-        J1 = c, iE = new CS(Y0, 0), pL = new CS("TOP_LEFT", 1);
-      }
-      function oo() {
-        oo = c, ku = new kS("DOWN", 0), Za = new kS("UP", 1);
-      }
-      function tg() {
-        tg = c, Bk = new gS("LAYER_SWEEP", 0), Rk = new gS(I2, 1);
-      }
-      function e0() {
-        e0 = c, cb = new mS("UPPER", 0), ub = new mS("LOWER", 1);
-      }
-      function UV(e) {
-        if (e < 0)
-          throw new K7("Negative array size: " + e);
-      }
-      function A4(e, t) {
-        return xe(t, 21) ? Zy(e.a, f(t, 21)) : !1;
-      }
-      function RN(e, t) {
-        return xe(t, 21) ? Zy(e.a, f(t, 21)) : !1;
-      }
-      function BN(e, t) {
-        return xe(t, 21) ? Zy(e.a, f(t, 21)) : !1;
-      }
-      function ly(e) {
-        var t;
-        return t = new bs(), hu(t, e), ce(t, (Ee(), Un), null), t;
-      }
-      function zN(e, t) {
-        return t === e ? "(this Map)" : (mn(), t == null ? $s : ha(t));
-      }
-      function R4(e, t, n, i) {
-        return xe(n, 63) ? new Z9(e, t, n, i) : new d4(e, t, n, i);
-      }
-      function KV() {
-        return Zu(), re(ie(Wx, 1), De, 100, 0, [sf, Ls, Fx, qx, Vx]);
-      }
-      function ZV() {
-        return zn(), re(ie(yB, 1), De, 28, 0, [ac, jo, Xg, yh, es, ni]);
-      }
-      function XV() {
-        return Ko(), re(ie(eB, 1), De, 103, 0, [V2, tp, np, rp, J0, ep]);
-      }
-      function QV() {
-        return P0(), re(ie(sB, 1), De, 133, 0, [Z2, Dx, Nx, Lx, jx, Px]);
-      }
-      function HN() {
-        HN = c, SB = Rr((th(), re(ie(EB, 1), De, 149, 0, [Qg, ok, ak])));
-      }
-      function _N() {
-        _N = c, lB = Rr((v0(), re(ie(cB, 1), De, 166, 0, [X2, Ix, Mx])));
-      }
-      function GN() {
-        GN = c, Nz = Rr((a0(), re(ie(jz, 1), De, 173, 0, [Ak, QT, XT])));
-      }
-      function JV() {
-        return et(), re(ie(aT, 1), De, 132, 0, [Hn, hn, Cn, er, Ka, Ii]);
-      }
-      function eW() {
-        return jd(), re(ie(yz, 1), De, 125, 0, [sb, qT, UT, WT, VT, FT]);
-      }
-      function tW(e) {
-        return _n(), pd(YM(($o(), px), pd(new ad(), 91), e), 93).a;
-      }
-      function Ya(e, t) {
-        Qt();
-        var n;
-        n = e.ob(), ah(n, 0, n.length, t), HV(e, n);
-      }
-      function $N(e, t, n, i, s) {
-        this.c = e, this.e = t, this.d = n, this.b = i, this.a = s;
-      }
-      function ps(e, t, n, i, s) {
-        sn.call(this, e, t), this.a = n, this.b = i, this.c = s;
-      }
-      function Yl(e, t, n, i, s) {
-        sn.call(this, e, t), this.a = n, this.b = i, this.c = s;
-      }
-      function YN(e, t, n) {
-        this.a = t, this.c = e, this.b = (vt(n), new _u(($o(), n)));
-      }
-      function FN() {
-        km(this), this.b = new ot(ki, ki), this.a = new ot(Hr, Hr);
-      }
-      function t0() {
-        t0 = c, YT = new dS("QUADRATIC", 0), Mk = new dS("SCANLINE", 1);
-      }
-      function nW() {
-        throw new jf("Add not supported on this collection");
-      }
-      function qN(e) {
-        var t, n;
-        return n = hq(e.Zb()), t = e.Yb(), t == 1 ? n : n + " x " + t;
-      }
-      function Ft(e) {
-        return ut(e.b != e.d.c), e.c = e.b, e.b = e.b.a, ++e.a, e.c.c;
-      }
-      function rW(e) {
-        if (e.Tc())
-          return null;
-        var t = e.k, n = W0[t];
-        return n;
-      }
-      function fy(e, t) {
-        if (e < 0 || e > t)
-          throw new Ho(J3(e, t, "index"));
-        return e;
-      }
-      function iW(e, t) {
-        var n;
-        return La(e), n = e.d.nb(t), n && (--e.f.c, Y1(e)), n;
-      }
-      function ng(e, t, n) {
-        var i;
-        i = (vt(e), new _u(($o(), e))), YK(new YN(i, t, n));
-      }
-      function aW(e, t) {
-        return ty((mn(), e.toLowerCase()), t.toLowerCase());
-      }
-      function oW(e, t) {
-        return ty((mn(), e.toLowerCase()), t.toLowerCase());
-      }
-      function sW() {
-        return X4(), re(ie(DE, 1), De, 138, 0, [qL, r_, i_, a_]);
-      }
-      function uW(e, t, n, i) {
-        Array.prototype.splice.apply(e, [t, n].concat(i));
-      }
-      function wr(e, t, n, i) {
-        var s;
-        s = new xw(), s.c = t, s.b = n, s.a = i, i.b = n.a = s, ++e.b;
-      }
-      function B4(e, t) {
-        var n;
-        return n = P4(M1(new by(e, t))), $1(new by(e, t)), n;
-      }
-      function cW(e, t, n) {
-        if (n) {
-          var i = n.gc();
-          e.a[t] = i(n);
-        } else
-          delete e.a[t];
-      }
-      function lW(e, t, n) {
-        if (n) {
-          var i = n.gc();
-          n = i(n);
-        } else
-          n = void 0;
-        e.a[t] = n;
-      }
-      function rg(e) {
-        this.d = e.d, this.c = e.c, this.a = e.a, this.b = e.b;
-      }
-      function VN() {
-        this.g = new _5(), this.c = new _5(), this.a = new Se(), this.k = new Se();
-      }
-      function WN() {
-        this.d = new tN(), this.a = new Y9(), this.c = new XD(), this.b = new oP();
-      }
-      function z4() {
-        this.i = new Se(), this.g = new Yr(), this.n = new e4(), this.q = new e4();
-      }
-      function UN(e, t, n, i) {
-        this.e = e, this.b = new Se(), this.d = t, this.a = n, this.c = i;
-      }
-      function md() {
-        md = c, sz = new pe(), uz = new he(), az = new de(), oz = new ke(), cz = new Pe();
-      }
-      function hy() {
-        hy = c, oc = new nm(Od, 0), xh = new nm(Y0, 1), sc = new nm(Ad, 2);
-      }
-      function KN() {
-        KN = c, iB = Rr((ys(), re(ie(rB, 1), De, 107, 0, [W2, $g, sl, ph])));
-      }
-      function ZN() {
-        ZN = c, oB = Rr((fu(), re(ie(aB, 1), De, 122, 0, [K2, Tx, af, U2])));
-      }
-      function XN() {
-        XN = c, TB = Rr((sh(), re(ie(hk, 1), De, 139, 0, [tb, fk, lk, ck])));
-      }
-      function QN() {
-        QN = c, xB = Rr((du(), re(ie(qd, 1), De, 150, 0, [uk, eb, sk, Jg])));
-      }
-      function JN() {
-        JN = c, eH = Rr((og(), re(ie(Jz, 1), De, 194, 0, [Hk, _k])));
-      }
-      function eI() {
-        eI = c, GH = Rr((J1(), re(ie(_H, 1), De, 174, 0, [iE, pL])));
-      }
-      function Gc(e) {
-        return vt(e), xe(e, 19) ? new _u(($o(), f(e, 19))) : M1(e.mb());
-      }
-      function fW(e) {
-        return Pt(ge(jt(z(e, (le(), vc))))) && z(e, lt) != null;
-      }
-      function hW(e) {
-        return Pt(ge(jt(z(e, (le(), vc))))) && z(e, lt) != null;
-      }
-      function tI(e, t, n, i) {
-        t == null && (t = $s), e.a += "" + (mn(), t.substr(n, i - n));
-      }
-      function nI(e, t) {
-        var n;
-        for (n = 0; n < t; ++n)
-          Ga(e, n, new O5(f(e[n], 21)));
-      }
-      function dW(e, t) {
-        var n, i;
-        n = f(WK(e.b, t), 19), n && (i = n.Y(), n.Q(), e.c -= i);
-      }
-      function $c(e, t, n) {
-        var i;
-        return i = (Sn(t, e.c.length), e.c[t]), e.c[t] = n, i;
-      }
-      function Yc(e) {
-        return ut(e.a < e.c.a.length), e.b = e.a, II(e), e.c.b[e.b];
-      }
-      function dy(e) {
-        _n();
-        var t;
-        for (t = 0; e.G(); )
-          e.H(), t = Tr(t, 1);
-        return Jf(t);
-      }
-      function H4(e) {
-        this.d = e, this.b = this.d.a.entries(), this.a = this.b.next();
-      }
-      function rI(e) {
-        this.g = e, this.f = new Se(), this.a = Xt(this.g.c.c, this.g.d.c);
-      }
-      function iI(e) {
-        F5(), this.e = null, this.f = null, this.a = "", this.b = e, this.a = "";
-      }
-      function yd() {
-        $t.call(this), W9(this), this.b.b = this.b, this.b.a = this.b;
-      }
-      function vW(e) {
-        e && _W((q5(), Sx)), --X0, e && Q0 != -1 && (LF(Q0), Q0 = -1);
-      }
-      function Fc(e) {
-        return !e.c || !e.d ? !1 : !!e.c.f && e.c.f == e.d.f;
-      }
-      function gW() {
-        return Date.now ? Date.now() : (/* @__PURE__ */ new Date()).getTime();
-      }
-      function n0(e) {
-        return e.c.c.length != 0 ? f(_e(e.c, 0), 33).a : null;
-      }
-      function aI(e) {
-        return e.c.c.length != 0 ? f(_e(e.c, 0), 33).a : null;
-      }
-      function bW(e) {
-        return e.d = 3, e.c = UW(e), e.d != 2 ? (e.d = 0, !0) : !1;
-      }
-      function r0(e, t, n) {
-        this.a = e, this.b = t, this.c = n, Le(e.j, this), Le(t.d, this);
-      }
-      function Fa(e, t, n, i) {
-        var s;
-        e.c ? s = new jw(Xn(i)) : s = new jw(i), Ta(t, n, s);
-      }
-      function i0(e) {
-        var t, n;
-        return vt(e), t = zq(e.length), n = new ji(t), lg(n, e), n;
-      }
-      function _4(e) {
-        var t, n, i;
-        return t = e & Va, n = e >> 22 & Va, i = e < 0 ? ec : 0, Gu(t, n, i);
-      }
-      function pW() {
-        return E0(), re(ie(Kz, 1), De, 141, 0, [nL, JT, eL, zk, tL]);
-      }
-      function wW() {
-        return C0(), re(ie(OH, 1), De, 115, 0, [kp, Uk, Zk, Kk, Xk]);
-      }
-      function mW() {
-        return $i(), re(ie(qH, 1), De, 85, 0, [pf, db, gc, ev, Tu]);
-      }
-      function oI() {
-        oI = c, nB = Rr(($n(), re(ie(Gg, 1), De, 59, 0, [Po, Fi, ja, Ts, Ws])));
-      }
-      function sI() {
-        sI = c, CB = Rr((we(), re(ie(Nr, 1), De, 32, 0, [cr, rt, Be, ct, qe])));
-      }
-      function uI() {
-        uI = c, mB = Rr((Zu(), re(ie(Wx, 1), De, 100, 0, [sf, Ls, Fx, qx, Vx])));
-      }
-      function cI() {
-        cI = c, $z = bi(Ca(Ca(Ca(pi(new An(), (Pr(), Dk)), NT), gT), Lk), Pk);
-      }
-      function lI(e, t) {
-        var n, i;
-        for (i = t.mb(); i.G(); )
-          n = f(i.H(), 55), rR(e, n, 0, 0);
-      }
-      function ws(e, t, n) {
-        var i, s;
-        for (s = e.mb(); s.G(); )
-          i = f(s.H(), 55), Pg(i, t, n);
-      }
-      function G4(e, t, n) {
-        var i, s;
-        for (i = 0, s = 0; s < t.length; s++)
-          i += e.Hc(t[s], i, n);
-      }
-      function Fl(e, t) {
-        var n;
-        return n = (Sn(t, e.c.length), e.c[t]), aS(e.c, t, 1), n;
-      }
-      function yW(e) {
-        var t;
-        for (vt(e), YW(!0), t = 0; t < 0 && xt(e); t++)
-          Et(e);
-        return t;
-      }
-      function so(e) {
-        var t;
-        e.d = new p9(e), e.e = new w9(e), t = e[ol] | 0, e[ol] = t + 1;
-      }
-      function fI(e) {
-        e.g = new $r(), e.o = new $r(), e.c = new $r(), e.j = new Se(), e.d = new Se();
-      }
-      function qc(e, t) {
-        if (e < 0 || e > t)
-          throw new Ho("Index: " + e + ", Size: " + t);
-      }
-      function Sn(e, t) {
-        if (e < 0 || e >= t)
-          throw new Ho("Index: " + e + ", Size: " + t);
-      }
-      function hI(e, t) {
-        var n, i;
-        return n = t.yb(), i = y3(e, n), !!i && la(i.e, t.zb());
-      }
-      function kW(e, t) {
-        var n;
-        return n = e.d, t > 0 ? f(_e(n.a, t - 1), 9) : null;
-      }
-      function ve(e, t, n, i, s, l) {
-        var h;
-        return h = DO(s, i), s != 9 && re(ie(e, l), t, n, s, h), h;
-      }
-      function ql(e) {
-        var t;
-        if (!qu(e))
-          throw new sa();
-        return e.d = 1, t = e.c, e.c = null, t;
-      }
-      function ig(e, t, n, i) {
-        this.f = e, this.e = t, this.d = n, this.b = i, this.c = i ? i.d : null;
-      }
-      function EW(e, t) {
-        if (e && typeof e == z0)
-          try {
-            e.__gwt$exception = t;
-          } catch {
-          }
-      }
-      function SW(e, t) {
-        e.a.$b(t.d, e.b) > 0 && (Le(e.c, new XS(t.c, t.d, e.d)), e.b = t.d);
-      }
-      function CW(e, t) {
-        var n;
-        return n = mr(e.j, t.j), n == 0 ? mr(e.k, t.k) : n;
-      }
-      function $4(e) {
-        var t, n;
-        return n = f(_e(e.f, 0), 7), t = f(z(n, (le(), lt)), 7), t;
-      }
-      function vy(e) {
-        var t, n;
-        return n = f(_e(e.f, 0), 7), t = f(z(n, (le(), lt)), 7), t;
-      }
-      function xW(e, t) {
-        return mr(ge(Ot(z(e, (le(), xu)))), ge(Ot(z(t, xu))));
-      }
-      function dI() {
-        dI = c, KH = Rr((p0(), re(ie(UH, 1), De, 153, 0, [zL, TE, HL])));
-      }
-      function vI() {
-        vI = c, XH = Rr((lu(), re(ie(ZH, 1), De, 172, 0, [iv, gb, Ip])));
-      }
-      function gI() {
-        gI = c, tB = Rr((Ko(), re(ie(eB, 1), De, 103, 0, [V2, tp, np, rp, J0, ep])));
-      }
-      function bI() {
-        bI = c, uB = Rr((P0(), re(ie(sB, 1), De, 133, 0, [Z2, Dx, Nx, Lx, jx, Px])));
-      }
-      function pI() {
-        pI = c, kB = Rr((zn(), re(ie(yB, 1), De, 28, 0, [ac, jo, Xg, yh, es, ni])));
-      }
-      function wI() {
-        wI = c, kz = Rr((jd(), re(ie(yz, 1), De, 125, 0, [sb, qT, UT, WT, VT, FT])));
-      }
-      function TW() {
-        return Xc(), re(ie(bz, 1), De, 109, 0, [gp, ab, ob, _T, GT, HT, $T, bp]);
-      }
-      function LW() {
-        return gu(), re(ie(Ln, 1), De, 41, 0, [qi, Ua, Wi, ba, ga, va, Ei, Ui, Vi]);
-      }
-      function PW() {
-        return Pd(), re(ie(Wk, 1), De, 123, 0, [Vk, qk, Fk, $k, Gk, Yk]);
-      }
-      function DW() {
-        return mg(), re(ie(RH, 1), De, 124, 0, [Jk, oL, uL, aL, sL, Qk]);
-      }
-      function Y4() {
-        Y4 = c, xx = new nt("de.cau.cs.kieler.labels.labelManager", null);
-      }
-      function jW() {
-        return Date.now ? Date.now() : (/* @__PURE__ */ new Date()).getTime();
-      }
-      function NW(e) {
-        var t;
-        return t = f(Wm(e.b, e.b.length), 11), new ti(e.a, t, e.c);
-      }
-      function IW(e, t) {
-        var n;
-        return n = (mn(), t.length), zo(gd(e, e.length - n, n), t);
-      }
-      function mI(e, t) {
-        var n;
-        return n = new Tw(), n.c = !0, n.d = t.zb(), IR(e, t.yb(), n);
-      }
-      function MW(e, t) {
-        var n;
-        return n = t.yb(), On(), new uS(n, dO(e.b, n, f(t.zb(), 19)));
-      }
-      function Cr(e, t) {
-        var n;
-        return n = Di(e, t, 0), n == -1 ? !1 : (e.vb(n), !0);
-      }
-      function ag(e, t) {
-        return Q4(t) != 9 && re(kd(t), t._c, t.__elementTypeId$, Q4(t), e), e;
-      }
-      function F4(e) {
-        return Vm(e.c.a.c, e), ut(e.b != e.c.a.b), e.a = e.b, e.b = e.b.a, e.a;
-      }
-      function q4(e) {
-        Ol(!!e.c), Vm(e.e, e), e.c.I(), e.c = null, e.b = l3(e), RS(e.e, e);
-      }
-      function OW(e, t, n) {
-        e.a = t, e.c = n, e.b.a.Q(), Bs(e.d), e.e.a.c = ve(Ze, Me, 1, 0, 4, 1);
-      }
-      function yI(e, t, n) {
-        Z5.call(this, UI(vt(e), vt(t))), this.b = e, this.c = t, this.a = n;
-      }
-      function kI(e, t, n, i) {
-        this.b = new WP(this), this.a = e, this.c = t, this.e = n, this.d = i;
-      }
-      function EI(e) {
-        LM.call(this, e, 0), W9(this), this.b.b = this.b, this.b.a = this.b;
-      }
-      function gy(e, t) {
-        p1.call(this, e, t), this.a = ve(wte, Me, 183, 2, 0, 1), this.b = !0;
-      }
-      function Qf(e, t) {
-        return ko(t) ? t == null ? !!li(e.d, null) : kq(e.e, t) : !!li(e.d, t);
-      }
-      function V4(e, t) {
-        return rd(), (e - t > 0 ? e - t : -(e - t)) <= Mg || e == t || isNaN(e) && isNaN(t);
-      }
-      function SI(e, t) {
-        return rd(), (e - t > 0 ? e - t : -(e - t)) <= Mg || e == t || isNaN(e) && isNaN(t);
-      }
-      function W4(e) {
-        var t, n;
-        t = !0;
-        do
-          t ? n = VM(e) : n = QM(e), t = !t;
-        while (n);
-        f3(e, e.d);
-      }
-      function Ta(e, t, n) {
-        var i;
-        if (t == null)
-          throw new td();
-        return i = Mn(e, t), cW(e, t, n), i;
-      }
-      function ce(e, t, n) {
-        return !e.n && (e.n = new $t()), n == null ? Bl(e.n, t) : un(e.n, t, n), e;
-      }
-      function Di(e, t, n) {
-        for (; n < e.c.length; ++n)
-          if (la(t, e.c[n]))
-            return n;
-        return -1;
-      }
-      function AW(e, t) {
-        for (; t >= e.a.c.length; )
-          Le(e.a, new Wr());
-        return f(_e(e.a, t), 20);
-      }
-      function RW(e, t) {
-        var n;
-        return n = f(vg(e.a, t), 19), n ? dO(e.b, t, n) : null;
-      }
-      function BW(e, t, n) {
-        var i;
-        i = Mn(e, T2), i || (i = new Dl(), Ta(e, T2, i)), Ta(i.kc(), t, n);
-      }
-      function At(e, t, n, i, s) {
-        var l;
-        return l = Zm(e, t), RI(n, l), l.g = s ? 8 : 0, l.f = i, l.e = s, l;
-      }
-      function by(e, t) {
-        var n;
-        this.f = e, this.b = t, n = f(Kt(e.b, t), 126), this.c = n ? n.b : null;
-      }
-      function U4(e, t) {
-        var n, i, s;
-        for (i = 0, s = t.length; i < s; ++i)
-          n = t[i], wr(e, n, e.c.b, e.c);
-      }
-      function CI(e, t, n, i, s, l) {
-        var h;
-        h = ly(i), Bn(h, s), kn(h, l), pt(e.a, i, new N1(h, t, n.f));
-      }
-      function K4(e, t, n) {
-        var i;
-        return i = 0, e.c[n] > 0 && (i += yee(t)), e.b[n] && (i += Pee(t)), i;
-      }
-      function Z4(e, t) {
-        var n;
-        return n = f(Bl(e.c, t), 176), n ? (o4(n), n.e) : null;
-      }
-      function Jf(e) {
-        return Iy(e, yr) > 0 ? yr : Iy(e, Ys) < 0 ? Ys : Qm(e);
-      }
-      function zW(e) {
-        return $o(), fi(e, "size"), Qm(dF(zM(e, 8), WC) ? zM(e, 8) : WC), new qw();
-      }
-      function py(e) {
-        cq.call(this, (mn(), e == null ? $s : ha(e)), xe(e, 46) ? f(e, 46) : null);
-      }
-      function ji(e) {
-        km(this), s4(e >= 0, "Initial capacity must not be negative");
-      }
-      function xI() {
-        xI = c, QB = Zv(Ca(Ca(new An(), (Pr(), LT)), ET), CT), JB = pi(new An(), ST);
-      }
-      function fa() {
-        fa = c, sT = new $e(), oT = new Ge(), mk = new me(), wk = new Ve(), yk = new Ke(), kk = new at();
-      }
-      function X4() {
-        X4 = c, qL = new g1("All", 0), r_ = new S9(), i_ = new D9(), a_ = new C9();
-      }
-      function a0() {
-        a0 = c, Ak = new am(T8, 0), QT = new am("LONGEST_PATH", 1), XT = new am(I2, 2);
-      }
-      function o0() {
-        o0 = c, Z8 = Gu(Va, Va, 524287), X8 = Gu(0, 0, 524288), _4(1), _4(2), Cx = _4(0);
-      }
-      function TI() {
-        TI = c, pz = Rr((Xc(), re(ie(bz, 1), De, 109, 0, [gp, ab, ob, _T, GT, HT, $T, bp])));
-      }
-      function LI() {
-        LI = c, Zz = Rr((E0(), re(ie(Kz, 1), De, 141, 0, [nL, JT, eL, zk, tL])));
-      }
-      function PI() {
-        PI = c, AH = Rr((C0(), re(ie(OH, 1), De, 115, 0, [kp, Uk, Zk, Kk, Xk])));
-      }
-      function DI() {
-        DI = c, VH = Rr(($i(), re(ie(qH, 1), De, 85, 0, [pf, db, gc, ev, Tu])));
-      }
-      function jI(e) {
-        W3(), VF(this, Qm(vN(cg(cX(ta(e) ? Uu(e) : e, 24)), hx)), Qm(vN(e, hx)));
-      }
-      function kd(e) {
-        return ko(e) ? _2 : Yf(e) ? bb : Ff(e) ? gte : Fm(e) || _m(e) ? e.$c : e.$c || Qee;
-      }
-      function Q4(e) {
-        return e.__elementTypeCategory$ == null ? 9 : e.__elementTypeCategory$;
-      }
-      function HW(e) {
-        var t, n;
-        if (e.a) {
-          n = null;
-          do
-            t = e.a, e.a = null, n = JO(t, n);
-          while (e.a);
-          e.a = n;
-        }
-      }
-      function _W(e) {
-        var t, n;
-        if (e.b) {
-          n = null;
-          do
-            t = e.b, e.b = null, n = JO(t, n);
-          while (e.b);
-          e.b = n;
-        }
-      }
-      function eh(e) {
-        _D();
-        var t, n;
-        for (n = JC, t = 0; t < e.length; t++)
-          e[t] > n && (n = e[t]);
-        return n;
-      }
-      function s0(e, t) {
-        var n;
-        return n = f(Kt(e.b, t), 106), n || (n = t.rc(), un(e.b, t, n)), n;
-      }
-      function wy(e, t) {
-        var n;
-        return n = f(Kt(e.c, t), 176), n ? (B9(e, n), n.e) : null;
-      }
-      function NI(e, t, n, i) {
-        var s;
-        s = f(wy(e.e, t), 116), s.b += n, s.a += i, gg(e.e, t, s), e.d = !0;
-      }
-      function II(e) {
-        var t;
-        for (++e.a, t = e.c.a.length; e.a < t; ++e.a)
-          if (e.c.b[e.a])
-            return;
-      }
-      function GW(e) {
-        var t, n, i;
-        for (t = (e.g == null && (e.g = a4(e)), e.g), n = 0, i = t.length; n < i; ++n)
-          ;
-      }
-      function $W(e, t) {
-        var n, i;
-        return La(e), i = e.d.V(), n = e.d.ib(t), n && (++e.f.c, i && I1(e)), n;
-      }
-      function fi(e, t) {
-        if (e < 0)
-          throw new tn(t + " cannot be negative but was: " + e);
-        return e;
-      }
-      function YW(e) {
-        if (!e)
-          throw new tn((mn(), "numberToAdvance must be nonnegative"));
-      }
-      function J4(e) {
-        if (!e.a.G() && (e.a = e.b.mb(), !e.a.G()))
-          throw new sa();
-        return e.a.H();
-      }
-      function Ed(e) {
-        _n();
-        var t;
-        return vt(e), xe(e, 108) ? (t = f(e, 108), t) : new SP(e);
-      }
-      function Fu(e, t) {
-        var n = e.a[t], i = (Ly(), q2)[typeof n];
-        return i ? i(n) : E3(typeof n);
-      }
-      function my(e, t) {
-        var n, i;
-        for (i = new M(e); i.a < i.c.c.length; )
-          n = f(O(i), 7), I0(n, t);
-      }
-      function yy(e, t) {
-        var n, i, s, l;
-        for (i = e.d, s = 0, l = i.length; s < l; ++s)
-          n = i[s], ka(e.g, n).a = t;
-      }
-      function FW(e, t) {
-        var n;
-        return n = ou(_a(f(Kt(e.g, t), 10)), MF(f(Kt(e.f, t), 198).b)), n;
-      }
-      function ky(e) {
-        var t;
-        return !qu(zl((t = new Wt(e.b.a).a.bb().mb(), new Zt(t)), e.a));
-      }
-      function e3(e) {
-        var t;
-        Ol(!!e.c), t = e.c.a, zs(e.d, e.c), e.b == e.c ? e.b = t : --e.a, e.c = null;
-      }
-      function MI(e) {
-        return e.c && e.d ? e.c.f + "(" + e.c + ")->" + e.d.f + "(" + e.d + ")" : "e_" + au(e);
-      }
-      function qW(e, t) {
-        return ug(), e == uc && t == dl || e == dl && t == uc || e == lf && t == hl || e == hl && t == lf;
-      }
-      function VW(e, t) {
-        return ug(), e == uc && t == hl || e == uc && t == lf || e == dl && t == lf || e == dl && t == hl;
-      }
-      function WW() {
-        return Dg(), re(ie(zH, 1), De, 110, 0, [fL, rE, hL, gL, dL, bL, vL, nE]);
-      }
-      function OI() {
-        OI = c, wB = Rr((gu(), re(ie(Ln, 1), De, 41, 0, [qi, Ua, Wi, ba, ga, va, Ei, Ui, Vi])));
-      }
-      function th() {
-        th = c, Qg = new tm("OUTSIDE", 0), ok = new tm("INSIDE", 1), ak = new tm("FIXED", 2);
-      }
-      function ms() {
-        ms = c, Cp = new hm(Rd, 0), gf = new hm("TOP", 1), Lh = new hm("BOTTOM", 2);
-      }
-      function og() {
-        og = c, Hk = new ES("CLASSIC", 0), _k = new ES("IMPROVE_STRAIGHTNESS", 1);
-      }
-      function t3() {
-        this.e = new Yr(), this.a = new lN(), this.d = new Yr(), this.b = new Se(), this.c = new Se();
-      }
-      function u0(e, t, n) {
-        this.b = t, this.a = e, this.c = n, Le(this.a.e, this), Le(this.b.b, this);
-      }
-      function n3(e, t) {
-        e.d = Xt(e.d, t.d), e.c = je(e.c, t.c), e.a = je(e.a, t.a), e.b = Xt(e.b, t.b);
-      }
-      function zs(e, t) {
-        var n;
-        return n = t.c, t.a.b = t.b, t.b.a = t.a, t.a = t.b = null, t.c = null, --e.b, n;
-      }
-      function Ey(e, t) {
-        _n();
-        var n;
-        for (vt(e), vt(t), n = !1; t.G(); )
-          n = n | e.ib(t.H());
-        return n;
-      }
-      function Sd(e) {
-        var t;
-        return Vm(e.e, e), ut(e.b), e.c = e.a, t = f(e.a.H(), 21), e.b = l3(e), t;
-      }
-      function UW(e) {
-        for (var t; e.b.G(); )
-          if (t = e.b.H(), e.a.D(t))
-            return t;
-        return e.d = 2, null;
-      }
-      function KW(e, t) {
-        return t && e.b[t.e] == t ? (Ga(e.b, t.e, null), --e.c, !0) : !1;
-      }
-      function ZW(e) {
-        return C2 < e && e < tc ? e < 0 ? Math.ceil(e) : Math.floor(e) : cg(DQ(e));
-      }
-      function AI(e) {
-        if (e) {
-          if (e.V())
-            throw new sa();
-          return e.sb(e.Y() - 1);
-        }
-        return FV(null.mb());
-      }
-      function XW(e, t) {
-        var n;
-        return n = e.d, t < n.a.c.length - 1 ? f(_e(n.a, t + 1), 9) : null;
-      }
-      function RI(e, t) {
-        if (e) {
-          t.k = e;
-          var n = rW(t);
-          if (!n) {
-            W0[e] = [t];
-            return;
-          }
-          n.$c = t;
-        }
-      }
-      function BI(e, t) {
-        var n, i;
-        i = !1;
-        do
-          e.i ? n = EU(e, t) : n = kU(e, t), i = i | n;
-        while (n);
-        return i;
-      }
-      function zI(e, t, n) {
-        var i, s;
-        i = t;
-        do
-          s = ge(e.n[i.k]) + n, e.n[i.k] = s, i = e.a[i.k];
-        while (i != t);
-      }
-      function QW(e) {
-        var t, n;
-        for (n = new M(e.a.b); n.a < n.c.c.length; )
-          t = f(O(n), 25), t.vc();
-      }
-      function JW() {
-        $7();
-        for (var e = z2, t = 0; t < arguments.length; t++)
-          e.push(arguments[t]);
-      }
-      function eU(e, t) {
-        var n, i;
-        for (n = 0, i = e.Y(); n < i; ++n)
-          if (la(t, e.sb(n)))
-            return n;
-        return -1;
-      }
-      function r3(e, t) {
-        var n;
-        return oy(e, "set1"), oy(t, "set2"), n = (d1(), new bD(t)), new lj(e, n, t);
-      }
-      function tU(e) {
-        var t = /function(?:\s+([\w$]+))?\s*\(/, n = t.exec(e);
-        return n && n[1] || y2;
-      }
-      function nU(e, t, n) {
-        Nt(n, b8, 3), fO(e.c, t, Vl(n, 1)), EA(e, t, Vl(n, 1)), VR(t, Vl(n, 1)), Ct(n);
-      }
-      function HI() {
-        HI = c, MH = Rr((Pd(), re(ie(Wk, 1), De, 123, 0, [Vk, qk, Fk, $k, Gk, Yk])));
-      }
-      function _I() {
-        _I = c, BH = Rr((mg(), re(ie(RH, 1), De, 124, 0, [Jk, oL, uL, aL, sL, Qk])));
-      }
-      function GI() {
-        GI = c, QH = re(ie(Kn, 1), Wn, 26, 12, [0, 8, 4, 12, 2, 10, 6, 14, 1, 9, 5, 13, 3, 11, 7, 15]);
-      }
-      function sr() {
-        sr = c, hE = new dm(ef, 0), Ai = new dm("INPUT", 1), ri = new dm("OUTPUT", 2);
-      }
-      function $I(e) {
-        this.c = e, this.b = new Ul(new iu(e.b).a), this.a = null, this.d = (_n(), _n(), wx);
-      }
-      function YI(e) {
-        this.e = e, this.d = new Ww(Ty(qm(this.e).Y())), this.c = this.e.a, this.b = this.e.c;
-      }
-      function i3(e, t, n) {
-        this.c = e, z4.call(this), this.b = t, this.j = new $a(t.d, t.e, t.c, t.b), this.a = n;
-      }
-      function FI(e, t) {
-        e.j > 0 && e.c < e.j && (e.c += t, e.g && e.g.d > 0 && e.e != 0 && FI(e.g, t / e.j * e.g.d));
-      }
-      function qI(e) {
-        return e.b.d.f.g == (et(), Cn) ? f(z(e.b.d.f, (le(), lt)), 7) : e.b.d;
-      }
-      function rU(e) {
-        return e.b.c.f.g == (et(), Cn) ? f(z(e.b.c.f, (le(), lt)), 7) : e.b.c;
-      }
-      function qu(e) {
-        switch (w1(e.d != 3), e.d) {
-          case 2:
-            return !1;
-          case 0:
-            return !0;
-        }
-        return bW(e);
-      }
-      function VI(e) {
-        switch (e.e) {
-          case 2:
-            return we(), qe;
-          case 4:
-            return we(), Be;
-          default:
-            return e;
-        }
-      }
-      function WI(e) {
-        switch (e.e) {
-          case 1:
-            return we(), ct;
-          case 3:
-            return we(), rt;
-          default:
-            return e;
-        }
-      }
-      function iU(e) {
-        var t;
-        return xe(e, 90) ? (t = f(e, 90), new X5(t.a)) : (_n(), new Dw(e));
-      }
-      function UI(e, t) {
-        Qt();
-        var n;
-        return n = new sm(1), ko(e) ? Z1(n, e, t) : ra(n.d, e, t), new I5(n);
-      }
-      function KI(e, t) {
-        return e.g ? (e.g = KI(e.g, t), --e.a, e.j = Ku(e.j, t.c), vu(e)) : e.e;
-      }
-      function ZI(e, t) {
-        return e.e ? (e.e = ZI(e.e, t), --e.a, e.j = Ku(e.j, t.c), vu(e)) : e.g;
-      }
-      function na(e, t) {
-        var n, i, s;
-        for (or(t), n = !1, s = t.mb(); s.G(); )
-          i = s.H(), n = n | e.ib(i);
-        return n;
-      }
-      function aU(e) {
-        var t, n, i;
-        for (t = 0, i = e.mb(); i.G(); )
-          n = i.H(), t += n != null ? Uo(n) : 0, t = ~~t;
-        return t;
-      }
-      function oU(e) {
-        var t, n, i, s;
-        for (n = e.a, i = 0, s = n.length; i < s; ++i)
-          t = n[i], t.B(null);
-        return null;
-      }
-      function Sy(e) {
-        var t, n, i;
-        for (i = new Ci(), n = e.b.mb(); n.G(); )
-          t = f(n.H(), 92), rn(i, t.a);
-        return i;
-      }
-      function sg(e) {
-        var t, n, i;
-        for (t = 0, i = e.mb(); i.G(); )
-          n = Ot(i.H()), t += (or(n), n);
-        return t / e.Y();
-      }
-      function XI(e, t) {
-        var n;
-        return n = f(Kt(e.c, t), 200), n || (n = new b7(), n.c = t, un(e.c, n.c, n)), n;
-      }
-      function hi(e, t) {
-        var n;
-        return or(t), n = t.e, e.b[n] ? !1 : (Ga(e.b, n, t), ++e.c, !0);
-      }
-      function c0(e, t) {
-        var n, i;
-        return n = 1 - t, i = e.a[n], e.a[n] = i.a[t], i.a[t] = e, e.b = !0, i.b = !1, i;
-      }
-      function QI(e, t) {
-        var n;
-        return xe(t, 10) ? (n = f(t, 10), e.a == n.a && e.b == n.b) : !1;
-      }
-      function a3(e, t, n) {
-        return e.g = new l0(t, n), YS(e, e.g, e.i), e.d = Jr(2, e.d), ++e.a, e.j = Tr(e.j, n), e;
-      }
-      function o3(e, t, n) {
-        return e.e = new l0(t, n), YS(e.f, e.e, e), e.d = Jr(2, e.d), ++e.a, e.j = Tr(e.j, n), e;
-      }
-      function JI(e, t) {
-        var n = e.a, i = 0;
-        for (var s in n)
-          n.hasOwnProperty(s) && (t[i++] = s);
-        return t;
-      }
-      function eM(e, t) {
-        var n, i;
-        for (or(t), i = t.bb().mb(); i.G(); )
-          n = f(i.H(), 21), e.db(n.yb(), n.zb());
-      }
-      function sU(e, t, n) {
-        var i;
-        return i = e.a.e[f(t.a, 9).k] - e.a.e[f(n.a, 9).k], Xn(i > 0 ? 1 : i < 0 ? -1 : 0);
-      }
-      function tM(e, t, n) {
-        this.g = e, this.d = t, this.e = n, this.a = new Se(), KZ(this), Qt(), Ya(this.a, null);
-      }
-      function l0(e, t) {
-        _f(t > 0), this.b = e, this.c = t, this.j = t, this.a = 1, this.d = 1, this.e = null, this.g = null;
-      }
-      function uU(e) {
-        e.a = null, e.e = null, e.b.c = ve(Ze, Me, 1, 0, 4, 1), e.f.c = ve(Ze, Me, 1, 0, 4, 1), e.c = null;
-      }
-      function cU() {
-        return vr(), re(ie(lL, 1), De, 113, 0, [eE, as, Ep, tE, df, vf, Sp, Ud, Kd, cL]);
-      }
-      function lU(e) {
-        return Xl(e, 26) * 14901161193847656e-24 + Xl(e, 27) * 11102230246251565e-32;
-      }
-      function Cy(e) {
-        return xe(e, 87) ? wd(f(e, 87)) : xe(e, 88) ? f(e, 88).a : xe(e, 63) ? new Dv(e) : new od(e);
-      }
-      function nM(e) {
-        var t;
-        return t = f(z(e, (le(), _r)), 32), e.g == (et(), Cn) && (t == (we(), qe) || t == Be);
-      }
-      function rM(e, t) {
-        return tZ(e, t) ? (pt(e.a, f(z(t, (le(), bf)), 18), t), !0) : !1;
-      }
-      function xr(e, t) {
-        var n;
-        if (t)
-          for (n = 0; n < 6; n++)
-            f(_e(e.a, n), 18).jb(f(_e(t.a, n), 19));
-        return e;
-      }
-      function Vl(e, t) {
-        var n;
-        return e.b ? null : (n = Aq(e.e, e.f), rn(e.a, n), n.g = e, e.d = t, n);
-      }
-      function Vu(e, t) {
-        var n, i;
-        for (i = Jt(e, 0); i.b != i.d.c; )
-          n = f(Ft(i), 10), n.a += t.a, n.b += t.b;
-        return e;
-      }
-      function s3(e, t) {
-        var n, i;
-        for (n = 0; n < t.length; n++)
-          for (i = 0; i < t[n].length; i++)
-            t[n][i] = e[n][i];
-      }
-      function fU(e) {
-        var t, n;
-        for (n = new M(e.b.f); n.a < n.c.c.length; )
-          t = f(O(n), 7), bN(e.a, $y(t.g));
-      }
-      function ug() {
-        ug = c, uc = new f1("Q1", 0), dl = new f1("Q4", 1), hl = new f1("Q2", 2), lf = new f1("Q3", 3);
-      }
-      function ys() {
-        ys = c, W2 = new s1(ef, 0), $g = new s1(Y0, 1), sl = new s1("HEAD", 2), ph = new s1("TAIL", 3);
-      }
-      function lu() {
-        lu = c, iv = new gm("AGGRESSIVE", 0), gb = new gm("CAREFUL", 1), Ip = new gm("OFF", 2);
-      }
-      function iM() {
-        iM = c, HH = Rr((Dg(), re(ie(zH, 1), De, 110, 0, [fL, rE, hL, gL, dL, bL, vL, nE])));
-      }
-      function u3(e, t) {
-        return yn(), ko(e) ? ty(e, qf(t)) : Yf(e) ? $j(e, Ot(t)) : Ff(e) ? mV(e, jt(t)) : e.F(t);
-      }
-      function c3(e, t, n) {
-        var i;
-        return i = t.$b(n, e.b), i < 0 ? e.e ? c3(e.e, t, n) : 0 : i > 0 ? e.g ? c3(e.g, t, n) : 0 : e.c;
-      }
-      function hU(e, t) {
-        var n, i;
-        return e.b ? (i = e.e, n = e.a.$b(t, i), n < 0 | n == 0 & e.d == (yo(), Wa)) : !1;
-      }
-      function aM(e, t) {
-        var n, i;
-        return e.c ? (i = e.g, n = e.a.$b(t, i), n > 0 | n == 0 & e.f == (yo(), Wa)) : !1;
-      }
-      function cg(e) {
-        var t;
-        return t = e.h, t == 0 ? e.l + e.m * Jl : t == ec ? e.l + e.m * Jl - tc : e;
-      }
-      function ln(e) {
-        var t, n, i, s;
-        for (t = new Yr(), i = 0, s = e.length; i < s; ++i)
-          n = e[i], t.a += n.a, t.b += n.b;
-        return t;
-      }
-      function dU(e) {
-        var t, n, i, s;
-        for (n = e.a, i = 0, s = n.length; i < s; ++i)
-          t = n[i], mM(e, t, (we(), ct)), mM(e, t, rt);
-      }
-      function vU(e) {
-        var t, n, i;
-        for (t = 1, i = e.mb(); i.G(); )
-          n = i.H(), t = 31 * t + (n == null ? 0 : Uo(n)), t = ~~t;
-        return t;
-      }
-      function gU(e) {
-        var t, n;
-        return t = f(e.e && e.e(), 11), n = f(Wm(t, t.length), 11), new ti(t, n, t.length);
-      }
-      function oM(e) {
-        this.e = He(z(Ti(e[0]), (Ee(), of))) === He((fu(), af)), this.a = e, this.c = new $t(), dU(this);
-      }
-      function sM(e) {
-        V5(), this.g = (On(), new $t()), this.f = new $t(), this.b = new $t(), this.c = new Rv(), this.i = e;
-      }
-      function uM(e) {
-        this.o = e, this.g = new Se(), this.j = new Wr(), this.n = new Wr(), this.e = new Se(), this.b = new Se();
-      }
-      function f0(e, t) {
-        if (vn(e.a, t), t.f)
-          throw new As("CNode belongs to another CGroup.");
-        t.f = e;
-      }
-      function bU(e, t) {
-        typeof window === z0 && typeof window.$gwt === z0 && (window.$gwt[e] = t);
-      }
-      function cM(e, t, n, i) {
-        var s, l;
-        for (s = sK(e, t, n, i), s < 0 && (s = -s - 1), l = n - 1; l >= s; l--)
-          e[l + 1] = e[l];
-        e[s] = i;
-      }
-      function lM(e, t, n, i) {
-        var s, l;
-        for (s = wK(e, t, n, i), s < 0 && (s = -s - 1), l = n - 1; l >= s; l--)
-          e[l + 1] = e[l];
-        e[s] = i;
-      }
-      function Wu(e, t) {
-        var n, i;
-        for (or(t), i = t.mb(); i.G(); )
-          if (n = i.H(), !e.kb(n))
-            return !1;
-        return !0;
-      }
-      function pU(e, t) {
-        _n();
-        var n;
-        for (vt(t); e.G(); )
-          if (n = e.H(), !nM(f(n, 9)))
-            return !1;
-        return !0;
-      }
-      function wU(e, t) {
-        var n, i, s;
-        return n = t.k - e.k, n == 0 ? (i = e.e.a * e.e.b, s = t.e.a * t.e.b, mr(i, s)) : n;
-      }
-      function Uu(e) {
-        var t, n, i, s;
-        return s = e, i = 0, s < 0 && (s += tc, i = ec), n = Xn(s / Jl), t = Xn(s - n * Jl), Gu(t, n, i);
-      }
-      function xy(e, t) {
-        return e.c.c = ve(Ze, Me, 1, 0, 4, 1), WO(e, e.e, t), WO(e, e.a, t), Qt(), Ya(e.c, null), PU(e);
-      }
-      function fM(e, t, n) {
-        e.g = n2(e, t, (we(), Be), e.b), e.d = n2(e, n, Be, e.b), !(e.g.c == 0 || e.d.c == 0) && GO(e);
-      }
-      function hM(e, t, n) {
-        e.g = n2(e, t, (we(), qe), e.j), e.d = n2(e, n, qe, e.j), !(e.g.c == 0 || e.d.c == 0) && GO(e);
-      }
-      function dM(e, t, n) {
-        return new $a(Xt(e.a, t.a) - n / 2, Xt(e.b, t.b) - n / 2, ei(e.a - t.a) + n, ei(e.b - t.b) + n);
-      }
-      function l3(e) {
-        return e.a.G() ? !0 : e.a != e.d ? !1 : (e.a = new D4(e.e.d), e.a.G());
-      }
-      function Tn(e, t) {
-        var n, i;
-        return n = t.ob(), i = n.length, i == 0 ? !1 : (r4(e.c, e.c.length, n), !0);
-      }
-      function f3(e, t) {
-        var n, i;
-        for (n = 0; n < e.a.length; n++)
-          for (i = 0; i < e.a[n].length; i++)
-            e.a[n][i] = t[n][i];
-      }
-      function lg(e, t) {
-        Qt();
-        var n, i, s, l;
-        for (l = !1, i = 0, s = t.length; i < s; ++i)
-          n = t[i], l = l | e.ib(n);
-        return l;
-      }
-      function Ty(e) {
-        return On(), e < 3 ? (fi(e, "expectedSize"), e + 1) : e < WC ? Xn(e / 0.75 + 1) : yr;
-      }
-      function h3(e, t) {
-        var n;
-        return xe(t, 19) ? (n = ($o(), f(t, 19)), e.jb(n)) : Ey(e, f(vt(t), 22).mb());
-      }
-      function vM(e, t) {
-        var n, i;
-        i = e.d.f, i.g != (et(), Hn) && (n = Dt(En(i)), xt(n) && un(t, e, f(Et(n), 12)));
-      }
-      function d3(e, t) {
-        var n, i;
-        return UV(t), n = ZM(e, 0, t), i = ve(Kn, Wn, 26, t, 12, 1), Xy(e, 0, i, 0, n, !0), i;
-      }
-      function mU(e, t) {
-        var n;
-        this.c = e, n = new Se(), z3(e, n, t, e.b, null, !1, null, !1), this.a = new fn(n, 0);
-      }
-      function gM(e) {
-        return e.a ? aM(e.c.b, e.a.b) ? (e.a = null, !1) : !0 : !1;
-      }
-      function Wl(e) {
-        if (!e)
-          throw new Ou((mn(), "no calls to next() since the last call to remove()"));
-      }
-      function Ly() {
-        Ly = c, q2 = { boolean: mF, number: eF, string: tF, object: cA, function: cA, undefined: PY };
-      }
-      function Py() {
-        Py = c, gk = kN(re(ie(Gg, 1), De, 59, 0, [($n(), ja), Fi])), bk = kN(re(ie(Gg, 1), De, 59, 0, [Ws, Ts]));
-      }
-      function v3(e) {
-        Qt();
-        var t, n, i;
-        for (i = 0, n = e.mb(); n.G(); )
-          t = n.H(), i = i + (t != null ? Uo(t) : 0), i = i | 0;
-        return i;
-      }
-      function yU(e) {
-        Df();
-        var t, n, i;
-        for (i = 0, n = Uf(e).mb(); n.G(); )
-          t = f(n.H(), 83), i = Tr(i, t.Yb());
-        return Jf(i);
-      }
-      function Hs(e) {
-        var t, n;
-        for (n = new M(e.a.b); n.a < n.c.c.length; )
-          t = f(O(n), 25), t.i.Q();
-        e.c.Dc(e), XA(e);
-      }
-      function bM(e, t) {
-        var n;
-        return n = Vw(e.a, t), n === void 0 ? ++e.d : (e.a[A2](t), --e.c, Mm(e.b)), n;
-      }
-      function kU(e, t) {
-        var n, i, s, l;
-        for (n = !1, i = e.d[t].length, s = i - 1; s > 0; s--)
-          l = s - 1, n = n | iO(e, t, l, s);
-        return n;
-      }
-      function EU(e, t) {
-        var n, i, s, l;
-        for (n = !1, i = e.d[t].length, l = 0; l < i - 1; l++)
-          s = l + 1, n = n | iO(e, t, l, s);
-        return n;
-      }
-      function SU(e, t) {
-        var n, i, s;
-        return n = e.l + t.l, i = e.m + t.m + (n >> 22), s = e.h + t.h + (i >> 22), Gu(n & Va, i & Va, s & ec);
-      }
-      function CU(e, t) {
-        var n, i, s;
-        return n = e.l - t.l, i = e.m - t.m + (n >> 22), s = e.h - t.h + (i >> 22), Gu(n & Va, i & Va, s & ec);
-      }
-      function pM(e, t) {
-        var n;
-        for (n = 0; n < (mn(), t.length); n++)
-          if (e == t.charCodeAt(n))
-            return !0;
-        return !1;
-      }
-      function wM(e, t) {
-        var n;
-        for (n = 0; n < (mn(), t.length); n++)
-          if (e == t.charCodeAt(n))
-            return !0;
-        return !1;
-      }
-      function z(e, t) {
-        var n, i;
-        return e.n && (i = Kt(e.n, t), i != null) ? i : (n = yJ(t), xe(n, 5) && ce(e, t, n), n);
-      }
-      function Dy(e) {
-        var t, n, i;
-        for (t = new Ci(), i = Jt(e, 0); i.b != i.d.c; )
-          n = f(Ft(i), 10), T1(t, 0, new qn(n));
-        return t;
-      }
-      function mM(e, t, n) {
-        var i, s, l, h;
-        for (h = new Oc(t, n), l = 0, s = Qc(h); s.G(); )
-          i = f(s.H(), 7), un(e.c, i, gt(l++));
-      }
-      function xU(e, t, n) {
-        if (vt(t), n.G())
-          for (jc(t, e.C(n.H())); n.G(); )
-            jc(t, e.c), jc(t, e.C(n.H()));
-        return t;
-      }
-      function TU(e, t, n, i, s) {
-        i ? iZ(e, t) : (aZ(e, t, s), UJ(e, t, n)), t.c.length > 1 && (Ya(t, e.b), gQ(e.c, t));
-      }
-      function re(e, t, n, i, s) {
-        return s.$c = e, s._c = t, s.ad = u, s.__elementTypeId$ = n, s.__elementTypeCategory$ = i, s;
-      }
-      function fg(e, t, n) {
-        switch (n.e) {
-          case 2:
-            e.b = t;
-            break;
-          case 1:
-            e.c = t;
-            break;
-          case 4:
-            e.d = t;
-            break;
-          case 3:
-            e.a = t;
-        }
-      }
-      function yM(e, t, n) {
-        var i, s;
-        return s = $4(n).g, i = IM(e, t, s).a, i - JY(f(Kt(e.c, t), 24).a - f(Kt(e.c, n), 24).a);
-      }
-      function mr(e, t) {
-        return e < t ? -1 : e > t ? 1 : e == t ? 0 : isNaN(e) ? isNaN(t) ? 0 : 1 : -1;
-      }
-      function h0(e) {
-        switch (e.Y()) {
-          case 0:
-            return _g;
-          case 1:
-            return new cu(e.mb().H());
-          default:
-            return new Qn(e);
-        }
-      }
-      function Cd() {
-        Cd = c;
-        var e, t;
-        t = !(Error.stackTraceLimit || "stack" in new Error()), e = new nP(), dx = t ? new b() : e;
-      }
-      function g3() {
-        g3 = c, Ux = new nt("intCoordinates", (yn(), yn(), Rn)), Kx = new Zn("jsonObject"), vk = new ot(0, 0);
-      }
-      function d0() {
-        d0 = c, cT = new im("MIRROR_X", 0), lT = new im("TRANSPOSE", 1), uT = new im("MIRROR_AND_TRANSPOSE", 2);
-      }
-      function nh() {
-        nh = c, iL = new fm(Rd, 0), yp = new fm("INCOMING_ONLY", 1), lb = new fm("OUTGOING_ONLY", 2);
-      }
-      function b3() {
-        return wi(), re(ie(Wd, 1), De, 60, 0, [Ds, lc, Eu, Su, is, dc, hc, No, rs, fc, Cu, gl, ff]);
-      }
-      function kM() {
-        kM = c;
-        var e, t, n, i;
-        for (vl = new P3(Wd), t = b3(), n = 0, i = t.length; n < i; ++n)
-          e = t[n], ZS(vl, e, null);
-      }
-      function EM(e) {
-        Qt();
-        var t, n, i;
-        for (i = 1, n = e.mb(); n.G(); )
-          t = n.H(), i = 31 * i + (t != null ? Uo(t) : 0), i = i | 0;
-        return i;
-      }
-      function SM(e, t) {
-        _n();
-        var n, i;
-        for (oy(t, "predicate"), i = 0; e.G(); i++)
-          if (n = e.H(), t.D(n))
-            return i;
-        return -1;
-      }
-      function p3(e, t) {
-        var n, i;
-        return n = e.c.a, i = t.ac(n), e.b.b && (i = Ku(i, lC(e, t, n))), e.b.c && (i = Ku(i, cC(e, t, n))), i;
-      }
-      function CM(e, t, n) {
-        var i, s;
-        return i = new gy(t, n), s = new Tw(), e.b = VA(e, e.b, i, s), s.b || ++e.c, e.b.b = !1, s.d;
-      }
-      function jy(e, t, n) {
-        var i, s, l;
-        for (i = new Wr(), l = Jt(n, 0); l.b != l.d.c; )
-          s = f(Ft(l), 10), rn(i, new qn(s));
-        YU(e, t, i);
-      }
-      function w3(e, t) {
-        var n;
-        return t === e ? !0 : xe(t, 144) ? (n = f(t, 144), e.P().t(n.P())) : !1;
-      }
-      function xM(e) {
-        var t;
-        if (t = e.a.c.length, t > 0)
-          return A1(t - 1, e.a.c.length), Fl(e.a, t - 1);
-        throw new D7();
-      }
-      function TM(e) {
-        e.b.c.length - e.e.c.length < 0 ? (Bt(e, (we(), Be)), e.a.a = e.j.a) : (Bt(e, (we(), qe)), e.a.a = 0);
-      }
-      function LM(e, t) {
-        s4(e >= 0, "Negative initial capacity"), s4(t >= 0, "Non-positive load factor"), so(this);
-      }
-      function Ul(e) {
-        var t;
-        this.e = e, this.d = new H4(this.e.e), this.a = this.d, this.b = l3(this), t = e[ol], this[ol] = t;
-      }
-      function m3() {
-        this.n = null, this.j = null, this.i = null, this.d = null, this.b = null, this.k = null, this.a = null;
-      }
-      function Ny(e) {
-        var t, n, i, s;
-        for (s = 1, n = 0, i = e.length; n < i; ++n)
-          t = e[n], s = 31 * s + (t != null ? Uo(t) : 0), s = s | 0;
-        return s;
-      }
-      function Rr(e) {
-        var t, n, i, s;
-        for (t = {}, i = 0, s = e.length; i < s; ++i)
-          n = e[i], t[":" + (n.d != null ? n.d : "" + n.e)] = n;
-        return t;
-      }
-      function PM(e) {
-        m2();
-        var t, n, i, s;
-        for (n = D3(), i = 0, s = n.length; i < s; ++i)
-          if (t = n[i], oj(t.a, e))
-            return t;
-        return dk;
-      }
-      function DM(e, t, n) {
-        var i, s, l;
-        for (s = 0, l = n.length; s < l; ++s)
-          if (i = n[s], e.b.Uc(t, i.yb()))
-            return i;
-        return null;
-      }
-      function jM(e, t, n) {
-        var i, s;
-        for (s = n.mb(); s.G(); )
-          if (i = f(s.H(), 21), e.Uc(t, i.zb()))
-            return !0;
-        return !1;
-      }
-      function y3(e, t) {
-        var n, i, s;
-        for (s = e.b; s; ) {
-          if (n = e.a.$b(t, s.d), n == 0)
-            return s;
-          i = n < 0 ? 0 : 1, s = s.a[i];
-        }
-        return null;
-      }
-      function LU(e, t) {
-        var n, i;
-        return n = f(Bl(e.a, t), 19), n ? (i = e.b.Z(), i.jb(n), e.b.c -= n.Y(), n.Q(), i) : null;
-      }
-      function NM(e, t, n) {
-        var i;
-        for (i = f(t.B(e), 9); i.g == (et(), hn); )
-          !i.n && (i.n = new $t()), Bl(i.n, n), i = f(t.B(i), 9);
-      }
-      function Iy(e, t) {
-        var n;
-        return ta(e) && ta(t) && (n = e - t, !isNaN(n)) ? n : NO(ta(e) ? Uu(e) : e, ta(t) ? Uu(t) : t);
-      }
-      function Ur(e) {
-        var t;
-        return xe(e, 46) ? e : (t = e && e.__gwt$exception, t || (t = new iI(e), J7(t, e), EW(e, t)), t);
-      }
-      function PU(e) {
-        var t, n, i;
-        for (t = 0, i = new M(e.c); i.a < i.c.c.length; )
-          n = f(O(i), 226), t += HA(e, n.a, n.b);
-        return t;
-      }
-      function DU(e) {
-        var t;
-        return t = new rI(e), ng(e.a, cz, new ro(re(ie(rb, 1), Me, 160, 0, [t]))), t.d && Le(t.f, t.d), t.f;
-      }
-      function IM(e, t, n) {
-        switch (n.e) {
-          case 1:
-            return f(Kt(e.d, t), 24);
-          case 3:
-            return f(Kt(e.j, t), 24);
-        }
-        return gt(0);
-      }
-      function MM(e, t, n) {
-        return e.d[t.k][n.k] || (NK(e, t, n), e.d[t.k][n.k] = !0, e.d[n.k][t.k] = !0), e.a[t.k][n.k];
-      }
-      function k3(e, t, n) {
-        var i;
-        return i = t.$b(n, e.b), i < 0 ? e.e ? f(hF(k3(e.e, t, n), e), 206) : e : i == 0 ? e : e.g ? k3(e.g, t, n) : null;
-      }
-      function xo(e, t) {
-        return ko(e) ? zo(e, t) : Yf(e) || Ff(e) ? (or(e), e === t) : Fm(e) ? e.t(t) : (_m(e), e === t);
-      }
-      function Gn(e, t) {
-        return zo(e.b, t) || IW(e.b, t) && (mn(), t.length == $v(e.b) || hj(e.b, $v(e.b) - t.length - 1) == 46);
-      }
-      function My(e, t) {
-        var n, i, s;
-        for (n = 0, s = Jn(e, t).mb(); s.G(); )
-          i = f(s.H(), 7), n += z(i, (le(), js)) != null ? 1 : 0;
-        return n;
-      }
-      function jU(e, t) {
-        var n, i, s;
-        for (i = null, s = e.b; s; )
-          n = e.a.$b(t, s.d), n >= 0 ? s = s.a[1] : (i = s, s = s.a[0]);
-        return i;
-      }
-      function NU(e, t) {
-        var n, i, s;
-        for (i = null, s = e.b; s; )
-          n = e.a.$b(t, s.d), n <= 0 ? s = s.a[0] : (i = s, s = s.a[1]);
-        return i;
-      }
-      function IU(e, t, n, i) {
-        var s, l;
-        for (l = e.mb(); l.G(); )
-          s = f(l.H(), 33), s.i.a = t.a + (i.a - s.j.a) / 2, s.i.b = t.b, t.b += s.j.b + n;
-      }
-      function OM(e, t) {
-        var n;
-        e.c.length != 0 && (n = f(Vn(e, ve(kr, Ni, 9, e.c.length, 0, 1)), 51), IS(n, new ar()), _O(n, t));
-      }
-      function AM(e, t) {
-        var n;
-        e.c.length != 0 && (n = f(Vn(e, ve(kr, Ni, 9, e.c.length, 0, 1)), 51), IS(n, new Qe()), _O(n, t));
-      }
-      function RM(e) {
-        var t, n;
-        return t = e.g, t == (et(), Cn) ? (n = f(z(e, (le(), _r)), 32), n == (we(), rt) || n == ct) : !1;
-      }
-      function Br(e, t) {
-        var n;
-        return or(t), n = e[":" + t], Hj(!!n, "Enum constant undefined: %s", re(ie(Ze, 1), Me, 1, 4, [t])), n;
-      }
-      function MU(e, t, n) {
-        if (!e)
-          throw new tn(Tg("lowerEndpoint (%s) > upperEndpoint (%s)", re(ie(Ze, 1), Me, 1, 4, [t, n])));
-      }
-      function E3(e) {
-        throw Ly(), new A7("Unexpected typeof result '" + e + "'; please report this bug to the GWT team");
-      }
-      function Oy(e) {
-        switch (e.e) {
-          case 1:
-            return ct;
-          case 2:
-            return qe;
-          case 3:
-            return rt;
-          case 4:
-            return Be;
-          default:
-            return cr;
-        }
-      }
-      function BM(e) {
-        switch (e.e) {
-          case 2:
-            return Fi;
-          case 1:
-            return ja;
-          case 4:
-            return Ts;
-          case 3:
-            return Ws;
-          default:
-            return Po;
-        }
-      }
-      function OU(e) {
-        return e >= 48 && e < 58 ? e - 48 : e >= 97 && e < 97 ? e - 97 + 10 : e >= 65 && e < 65 ? e - 65 + 10 : -1;
-      }
-      function AU(e, t) {
-        var n, i;
-        for (i = Qj(Zj(e.P())); i.b.G(); )
-          if (n = f(eD(i, i.b.H()), 19), n.kb(t))
-            return !0;
-        return !1;
-      }
-      function RU(e) {
-        var t;
-        if (!gM(e))
-          throw new sa();
-        return t = new CD(e.c, e.a), e.b = t, e.a.i == e.c.a ? e.a = null : e.a = e.a.i, t;
-      }
-      function BU(e, t) {
-        On();
-        var n;
-        return e === t ? !0 : xe(t, 57) ? (n = f(t, 57), rA(Bc(e), n.bb())) : !1;
-      }
-      function zU(e, t, n, i) {
-        return Df(), fi(n, "oldCount"), fi(i, "newCount"), e.Cb(t) == n ? (e.Gb(t, i), !0) : !1;
-      }
-      function HU(e, t, n, i, s) {
-        return vt(n), vt(s), yV(new M4(e.c, gR(e.b, new j0(e.d, !0, t, n, !1, null, (yo(), Wa))), e.a), i, s);
-      }
-      function S3(e) {
-        switch (Ea(), e.Y()) {
-          case 0:
-            return Kf(), Gd;
-          case 1:
-            return new Bu(e.mb().H());
-          default:
-            return new um(e);
-        }
-      }
-      function Tr(e, t) {
-        var n;
-        return ta(e) && ta(t) && (n = e + t, C2 < n && n < tc) ? n : cg(SU(ta(e) ? Uu(e) : e, ta(t) ? Uu(t) : t));
-      }
-      function zM(e, t) {
-        var n;
-        return ta(e) && ta(t) && (n = e * t, C2 < n && n < tc) ? n : cg(SJ(ta(e) ? Uu(e) : e, ta(t) ? Uu(t) : t));
-      }
-      function Ku(e, t) {
-        var n;
-        return ta(e) && ta(t) && (n = e - t, C2 < n && n < tc) ? n : cg(CU(ta(e) ? Uu(e) : e, ta(t) ? Uu(t) : t));
-      }
-      function $n() {
-        $n = c, Po = new Mv(ef, 0), Fi = new Mv(Ad, 1), ja = new Mv(Od, 2), Ts = new Mv("DOWN", 3), Ws = new Mv("UP", 4);
-      }
-      function fu() {
-        fu = c, K2 = new u1(ef, 0), Tx = new u1("POLYLINE", 1), af = new u1("ORTHOGONAL", 2), U2 = new u1("SPLINES", 3);
-      }
-      function v0() {
-        v0 = c, X2 = new em("INHERIT", 0), Ix = new em("INCLUDE_CHILDREN", 1), Mx = new em("SEPARATE_CHILDREN", 2);
-      }
-      function HM() {
-        HM = c, Iz = pi($u(new An(), (Pr(), xk)), hp), Mz = bi(pi(R1(new An(), Sk), Ek), ib), Oz = bi(Ca(new An(), Ck), ib);
-      }
-      function _M() {
-        _M = c, Az = pi($u(new An(), (Pr(), xk)), hp), Rz = bi(pi(R1(new An(), Sk), Ek), ib), Bz = bi(Ca(new An(), Ck), ib);
-      }
-      function GM(e) {
-        this.a = new _i(), this.d = new _i(), this.b = new _i(), this.c = new _i(), this.g = new _i(), this.i = new _i(), this.f = e;
-      }
-      function $M(e, t, n, i, s, l) {
-        this.e = new Se(), this.f = (sr(), hE), Le(this.e, e), this.d = t, this.a = n, this.b = i, this.f = s, this.c = l;
-      }
-      function _U(e, t, n, i, s, l, h, v) {
-        var p;
-        for (p = n; l < h; )
-          p >= i || t < n && v.$b(e[t], e[p]) <= 0 ? Ga(s, l++, e[t++]) : Ga(s, l++, e[p++]);
-      }
-      function GU(e, t, n, i, s) {
-        var l, h;
-        for (h = e.mb(); h.G(); )
-          l = f(h.H(), 33), l.i.a = t.a, l.i.b = s ? t.b : t.b + i.b - l.j.b, t.a += l.j.a + n;
-      }
-      function $U(e, t) {
-        Rm();
-        var n, i;
-        for (i = Dt(yg(e)); xt(i); )
-          if (n = f(Et(i), 12), n.d.f == t || n.c.f == t)
-            return n;
-        return null;
-      }
-      function Ay(e, t, n) {
-        var i, s, l;
-        for (i = 0, l = Jt(e, 0); l.b != l.d.c && (s = ge(Ot(Ft(l))), !(s > n)); )
-          s >= t && ++i;
-        return i;
-      }
-      function YU(e, t, n) {
-        var i, s, l, h;
-        for (or(n), h = !1, l = Jt(e, t), s = Jt(n, 0); s.b != s.d.c; )
-          i = Ft(s), Xv(l, i), h = !0;
-        return h;
-      }
-      function FU(e, t) {
-        var n, i, s;
-        return t.V() ? !1 : (s = e.Y(), n = e.d.jb(t), n && (i = e.d.Y(), e.f.c += i - s, s == 0 && I1(e)), n);
-      }
-      function hu(e, t) {
-        var n;
-        return t && (n = t.n ? t.n : (Qt(), Qt(), $L), n.V() || (e.n ? eM(e.n, n) : e.n = new n9(n))), e;
-      }
-      function YM(e, t, n) {
-        var i;
-        try {
-          xU(e, t, n);
-        } catch (s) {
-          throw s = Ur(s), xe(s, 181) ? (i = s, new py(i)) : Kr(s);
-        }
-        return t;
-      }
-      function qU(e, t, n) {
-        var i;
-        try {
-          XZ(e, t, n);
-        } catch (s) {
-          throw s = Ur(s), xe(s, 181) ? (i = s, new py(i)) : Kr(s);
-        }
-        return t;
-      }
-      function Kr(e) {
-        var t;
-        return xe(e, 164) && (t = f(e, 164), He(t.b) !== He((F5(), U0))) ? He(t.b) === He(U0) ? null : t.b : e;
-      }
-      function rh(e, t) {
-        var n;
-        for (n = f(z(Ti(e), (le(), wl)), 9); n; ) {
-          if (n == t)
-            return !0;
-          n = f(z(Ti(n), wl), 9);
-        }
-        return !1;
-      }
-      function VU(e) {
-        switch (f(z(e, (le(), Zs)), 140).e) {
-          case 1:
-            ce(e, Zs, (ms(), Lh));
-            break;
-          case 2:
-            ce(e, Zs, (ms(), gf));
-        }
-      }
-      function Wo(e) {
-        switch (Ea(), e.c) {
-          case 0:
-            return Kf(), Gd;
-          case 1:
-            return new Bu(nA(new Hf(e)));
-          default:
-            return new O7(e);
-        }
-      }
-      function ur(e) {
-        dr();
-        var t, n;
-        for (t = 0, n = e.length; t < n; t++)
-          if (e[t] == null)
-            throw new jv("at index " + t);
-        return new ro(e);
-      }
-      function WU(e, t, n) {
-        return t.length == 0 || n.length == 0 ? 0 : (e.e ? e.b = new R7(e.c) : e.b = new B7(e.c), e.b.Gc(t, n));
-      }
-      function Ct(e) {
-        if (e.i == null)
-          throw new Ou("The task has not begun yet.");
-        e.b || (e.c < e.j && FI(e, e.j - e.c), e.b = !0);
-      }
-      function Ry(e, t) {
-        var n, i;
-        for (i = new M(t); i.a < i.c.c.length; )
-          n = f(O(i), 27), Cr(e.b.b, n.b), Qq(f(n.a, 78), f(n.b, 25));
-      }
-      function UU(e, t) {
-        var n, i;
-        for (i = new M(e.a); i.a < i.c.c.length; )
-          if (n = f(O(i), 222), rM(n, t))
-            return;
-        Le(e.a, new aj(t));
-      }
-      function KU(e) {
-        var t, n, i;
-        for (t = new Se(), i = new M(e.b); i.a < i.c.c.length; )
-          n = f(O(i), 251), Tn(t, f(n.Ac(), 19));
-        return t;
-      }
-      function ZU(e, t) {
-        var n, i, s;
-        for (s = new Se(), i = Jn(e, t).mb(); i.G(); )
-          n = f(i.H(), 7), s.c[s.c.length] = n;
-        return Ya(s, new aa()), s;
-      }
-      function Lr(e) {
-        var t, n, i;
-        for (t = new Se(), i = new M(e.f); i.a < i.c.c.length; )
-          n = f(O(i), 7), Le(t, n.b);
-        return vt(t), new Gf(t);
-      }
-      function En(e) {
-        var t, n, i;
-        for (t = new Se(), i = new M(e.f); i.a < i.c.c.length; )
-          n = f(O(i), 7), Le(t, n.e);
-        return vt(t), new Gf(t);
-      }
-      function gt(e) {
-        var t, n;
-        return e > -129 && e < 128 ? (t = e + 128, n = (Aj(), _L)[t], !n && (n = _L[t] = new D5(e)), n) : new D5(e);
-      }
-      function C3(e) {
-        var t, n;
-        for (t = Qy(e.b, e.d), n = yr; n > t; ) {
-          if (f3(e, e.d), t == 0) {
-            n = 0;
-            break;
-          }
-          VM(e), QM(e), n = t, t = Qy(e.b, e.d);
-        }
-        e.c = n;
-      }
-      function FM() {
-        W3();
-        var e, t, n;
-        n = pte++ + jW(), e = Xn(Math.floor(n * M2)) & hx, t = Xn(n - e * fx), this.a = e ^ 1502, this.b = t ^ R2;
-      }
-      function Uo(e) {
-        return ko(e) ? Wy(e) : Yf(e) ? Xn((or(e), e)) : Ff(e) ? Pt((or(e), e)) ? 1231 : 1237 : Fm(e) ? e.v() : (_m(e), au(e));
-      }
-      function XU(e, t, n) {
-        var i, s, l;
-        s = new CO(), s.d = n, i = kZ(s, t), l = new WN(), Pt(ge(jt(z(i, rT)))) ? nU(l, i, new j1()) : hR(e, l, i), FR(s, i);
-      }
-      function qM(e, t, n, i) {
-        var s, l, h, v;
-        for (v = new Oc(t, i), h = 0, l = Qc(v); l.G(); )
-          s = f(l.H(), 7), un(e.i, s, gt(h++));
-        un(n, t, gt(h));
-      }
-      function QU(e, t) {
-        var n, i, s, l, h;
-        for (n = 0, h = 0, s = 0, l = t.length; s < l; ++s)
-          i = t[s], n = RA(e, n, i, (we(), Be), e.f), h = RA(e, h, i, qe, e.n);
-      }
-      function JU(e, t) {
-        var n, i, s, l;
-        if (e.n)
-          for (i = 0, s = t.length; i < s; ++i)
-            n = t[i], l = Kt(e.n, n), l != null && (n.nc(), n.oc());
-      }
-      function eK(e, t) {
-        var n, i, s;
-        for (i = new M(t); i.a < i.c.c.length; )
-          n = f(O(i), 75), s = tQ(e.a), NI(e.a, s, n.k, n.j), Dd(n, s, !0);
-      }
-      function tK(e, t) {
-        var n, i, s;
-        for (i = new M(t); i.a < i.c.c.length; )
-          n = f(O(i), 75), s = RX(e.a), NI(e.a, s, n.k, n.j), Dd(n, s, !0);
-      }
-      function By(e) {
-        var t, n;
-        return n = f(z(e, (Ee(), Do)), 59), n == ($n(), Po) ? (t = f(z(e, (le(), Ph)), 15).a, t >= 1 ? Fi : Ts) : n;
-      }
-      function xt(e) {
-        if (vt(e.b), e.b.G())
-          return !0;
-        for (; e.a.G(); )
-          if (vt(e.b = e.Wb(e.a.H())), e.b.G())
-            return !0;
-        return !1;
-      }
-      function Kl(e) {
-        return (e.d != e.c.d || e.i != e.g.d) && (e.a.c = ve(Ze, Me, 1, 0, 4, 1), Tn(e.a, e.c), Tn(e.a, e.g), e.d = e.c.d, e.i = e.g.d), e.a;
-      }
-      function La(e) {
-        var t;
-        if (e.b) {
-          if (La(e.b), e.b.d != e.c)
-            throw new nd();
-        } else
-          e.d.V() && (t = f(Kt(e.f.b, e.e), 19), t && (e.d = t));
-      }
-      function x3(e, t, n, i, s) {
-        var l, h, v, p;
-        for (p = i0(e), TU(t, p, i, s, n), l = 0, v = new M(p); v.a < v.c.c.length; )
-          h = f(O(v), 9), e[l++] = h;
-      }
-      function nK(e) {
-        var t, n, i;
-        for (i = f(oD(e.a, (Ee(), wh)), 15).a, n = new M(KO(e.a)); n.a < n.c.c.length; )
-          t = f(O(n), 626), Cee(e, t, i);
-      }
-      function An() {
-        var e, t;
-        for (this.a = new ji(6), t = 0; t < 6; t++)
-          Le(this.a, (e = f(Hi(dz), 11), new ti(e, f(xi(e, e.length), 11), 0)));
-      }
-      function VM(e) {
-        var t, n, i;
-        for (i = !1, n = 0; n < e.d.length; n++)
-          e.j = (t = new K3(e.e, e.d, n, 0), new q3(n, e.d, t)), i = i | BI(e, n);
-        return i;
-      }
-      function rK(e, t, n) {
-        var i, s;
-        for (s = e.a.c, i = s.c.length; i < n; i++)
-          Ac(s, 0, new Hc(e.a));
-        Ar(t, f(_e(s, s.c.length - n), 16)), e.b[t.k] = n;
-      }
-      function WM(e, t) {
-        var n, i;
-        for (n = Jt(e, 0); n.b != n.d.c; ) {
-          if (i = ge(Ot(Ft(n))), i == t)
-            return;
-          if (i > t) {
-            Jv(n);
-            break;
-          }
-        }
-        Xv(n, t);
-      }
-      function zy(e, t, n) {
-        var i;
-        return i = Vw(e.a, t), rF(e.a, t, n === void 0 ? null : n), i === void 0 ? (++e.c, Mm(e.b)) : ++e.d, i;
-      }
-      function Hy(e, t, n) {
-        return (t - e <= 0 ? 0 - (t - e) : t - e) < nc || (n - e <= 0 ? 0 - (n - e) : n - e) < nc ? !0 : t - e > nc ? e - n > nc : n - e > nc;
-      }
-      function UM(e) {
-        switch (e.e) {
-          case 0:
-            return Uk;
-          case 1:
-            return kp;
-          case 2:
-            return Kk;
-          case 3:
-            return Zk;
-          default:
-            return Xk;
-        }
-      }
-      function T3(e, t) {
-        switch (t.e) {
-          case 2:
-            return e.b;
-          case 1:
-            return e.c;
-          case 4:
-            return e.d;
-          case 3:
-            return e.a;
-          default:
-            return !1;
-        }
-      }
-      function g0(e) {
-        switch (we(), e.e) {
-          case 4:
-            return rt;
-          case 1:
-            return Be;
-          case 3:
-            return ct;
-          case 2:
-            return qe;
-          default:
-            return cr;
-        }
-      }
-      function _y(e, t) {
-        if (t == e.c)
-          return e.d;
-        if (t == e.d)
-          return e.c;
-        throw new tn("Node " + t + " not part of edge " + e);
-      }
-      function iK(e, t) {
-        var n;
-        return Fo(e.a, t) ? f(Fo(e.a, t) ? e.b[t.e] : null, 62) : (n = new d7(), hi(e.a, t), Um(e, t.e, n), n);
-      }
-      function KM(e, t) {
-        var n, i, s, l;
-        for (l = e.g.tb(), n = 0; l.G(); ) {
-          if (i = ge(Ot(l.H())), s = i - t, s > al)
-            return n;
-          s > V0 && ++n;
-        }
-        return n;
-      }
-      function b0(e) {
-        var t, n, i, s;
-        return n = (t = f(Hi((i = e.$c, s = i.f, s == an ? i : s)), 11), new ti(t, f(xi(t, t.length), 11), 0)), hi(n, e), n;
-      }
-      function Gy(e, t) {
-        var n, i;
-        for (i = new M(t); i.a < i.c.c.length; )
-          n = f(O(i), 27), Le(e.b.b, f(n.b, 25)), f0(f(n.a, 78), f(n.b, 25));
-      }
-      function aK(e, t, n, i) {
-        var s, l, h;
-        for (s = t + 1; s < n; ++s)
-          for (l = s; l > t && i.$b(e[l - 1], e[l]) > 0; --l)
-            h = e[l], Ga(e, l, e[l - 1]), Ga(e, l - 1, h);
-      }
-      function oK(e) {
-        var t, n;
-        if (!ds(f(z(e, (Ee(), dt)), 28)))
-          for (n = new M(e.f); n.a < n.c.c.length; )
-            t = f(O(n), 7), Bt(t, (we(), cr));
-      }
-      function ks(e, t) {
-        switch (t.e) {
-          case 1:
-            return Eo(e.f, (fa(), oT));
-          case 2:
-            return Eo(e.f, (fa(), sT));
-          default:
-            return Qt(), Qt(), bc;
-        }
-      }
-      function nr(e, t) {
-        return k4(t, (Ee(), Yx)) ? z(e.e, (le(), Oi)) : k4(t, ul) ? z(e.e, (le(), Qd)) : z(e.e, t);
-      }
-      function sK(e, t, n, i) {
-        var s, l, h;
-        for (l = t, s = n - 1; l <= s; ) {
-          if (h = (l + s) / 2 | 0, e[h] == i)
-            return h;
-          e[h] < i ? l = h + 1 : s = h - 1;
-        }
-        return -l - 1;
-      }
-      function hg(e, t, n) {
-        var i, s;
-        for (s = e.mb(); s.G(); )
-          if (i = s.H(), He(t) === He(i) || t != null && xo(t, i))
-            return n && s.I(), !0;
-        return !1;
-      }
-      function ZM(e, t, n) {
-        var i;
-        return Hj(t <= n, "%s > %s", re(ie(Ze, 1), Me, 1, 4, [gt(t), gt(n)])), i = e.length, n = n < i ? n : i, H3(t, n, i), n - t;
-      }
-      function XM(e, t) {
-        var n, i, s;
-        n = e, s = 0;
-        do {
-          if (n == t)
-            return s;
-          if (i = f(z(n, (le(), wl)), 9), !i)
-            throw new ed();
-          n = Ti(i), ++s;
-        } while (!0);
-      }
-      function QM(e) {
-        var t, n, i;
-        for (i = !1, n = e.d.length - 1; n >= 0; n--)
-          e.j = (t = new K3(e.e, e.d, n, 1), new q3(n, e.d, t)), i = i | BI(e, n);
-        return i;
-      }
-      function L3(e) {
-        this.f = (On(), new $t()), this.n = new $t(), this.k = new $t(), this.g = new $r(), this.i = new gO((E7(), F8)), this.j = e, QU(this, e);
-      }
-      function P3(e) {
-        var t;
-        this.a = (t = f(e.e && e.e(), 11), new ti(t, f(xi(t, t.length), 11), 0)), this.b = ve(Ze, Me, 1, this.a.a.length, 4, 1);
-      }
-      function JM(e, t) {
-        var n;
-        return t === e ? !0 : !xe(t, 18) || (n = f(t, 18), n.Y() != e.Y()) ? !1 : e.lb(n);
-      }
-      function $y(e) {
-        switch (wi(), e.e) {
-          case 1:
-            return Ds;
-          case 2:
-            return Eu;
-          case 3:
-            return is;
-          case 4:
-            return hc;
-          default:
-            return ff;
-        }
-      }
-      function eO(e, t) {
-        switch (t.e) {
-          case 1:
-            return e.e.d;
-          case 2:
-            return e.e.c;
-          case 3:
-            return e.e.a;
-          case 4:
-            return e.e.b;
-          default:
-            return 0;
-        }
-      }
-      function D3() {
-        return m2(), re(ie(UB, 1), De, 67, 0, [VB, qB, WB, BB, RB, zB, GB, _B, HB, FB, YB, $B, OB, MB, AB, NB, jB, IB, PB, LB, DB, dk]);
-      }
-      function Zu() {
-        Zu = c, sf = new Ov(ef, 0), Ls = new Ov("JUSTIFIED", 1), Fx = new Ov("BEGIN", 2), qx = new Ov(Y0, 3), Vx = new Ov("END", 4);
-      }
-      function du() {
-        du = c, uk = new c1("PORTS", 0), eb = new c1("PORT_LABELS", 1), sk = new c1("NODE_LABELS", 2), Jg = new c1("MINIMUM_SIZE", 3);
-      }
-      function Gi() {
-        Gi = c, nb = new rm("UNKNOWN", 0), ns = new rm("ABOVE", 1), Us = new rm("BELOW", 2), KB = new nt("de.cau.cs.kieler.labelSide", nb);
-      }
-      function p0() {
-        p0 = c, zL = new vm("EQUALLY_DISTRIBUTED", 0), TE = new vm("NORTH_STACKED", 1), HL = new vm("NORTH_SEQUENCE", 2);
-      }
-      function uK() {
-        W0 = {}, !Array.isArray && (Array.isArray = function(e) {
-          return Object.prototype.toString.call(e) === "[object Array]";
-        });
-      }
-      function cK(e, t) {
-        return rd(), rd(), ((e - t > 0 ? e - t : -(e - t)) <= Mg || e == t || isNaN(e) && isNaN(t) ? 0 : e < t ? -1 : e > t ? 1 : u9(isNaN(e), isNaN(t))) > 0;
-      }
-      function j3(e, t) {
-        return rd(), rd(), ((e - t > 0 ? e - t : -(e - t)) <= Mg || e == t || isNaN(e) && isNaN(t) ? 0 : e < t ? -1 : e > t ? 1 : u9(isNaN(e), isNaN(t))) < 0;
-      }
-      function Yy(e) {
-        var t, n;
-        for (e.d || fQ(e), n = new Ci(), t = e.b.mb(), t.H(); t.G(); )
-          rn(n, f(t.H(), 92).a);
-        return ut(n.b != 0), zs(n, n.c.b), n;
-      }
-      function tO(e) {
-        var t, n, i, s;
-        for (s = new _i(), t = new _u(e.c), D0(t), i = new M(t); i.a < i.c.c.length; )
-          n = f(O(i), 7), s.a.db(n, s);
-        return s;
-      }
-      function lK(e, t) {
-        var n, i, s;
-        for (vt(t), i = (s = e.g, f(s || (e.g = new x5(e)), 20)).mb(); i.G(); )
-          n = f(i.H(), 21), pt(t, n.zb(), n.yb());
-        return t;
-      }
-      function nO(e, t) {
-        var n, i, s;
-        return xe(t, 21) ? (n = f(t, 21), i = n.yb(), s = vg(e.qb(), i), Gl(s, n.zb()) && (s != null || e.qb().R(i))) : !1;
-      }
-      function N3(e, t) {
-        var n, i, s;
-        for (s = e.g.tb(); s.G(); )
-          if (n = ge(Ot(s.H())), i = n - t <= 0 ? 0 - (n - t) : n - t, i < al)
-            return s.L() - 1;
-        return e.g.Y();
-      }
-      function rO(e) {
-        var t, n;
-        for (n = new M(e.a); n.a < n.c.c.length; )
-          if (t = f(O(n), 9), t.g == (et(), Hn) || t.g == Ii)
-            return !1;
-        return !0;
-      }
-      function Nt(e, t, n) {
-        if (e.b)
-          throw new Ou("The task is already done.");
-        return e.i != null ? !1 : (e.i = t, e.j = n, !0);
-      }
-      function fK(e, t) {
-        return e.f < t.f ? -1 : e.f > t.f ? 1 : e.g < t.g ? -1 : e.g > t.g ? 1 : e.b - t.b;
-      }
-      function hK(e, t) {
-        if (t.c == e)
-          return t.d;
-        if (t.d == e)
-          return t.c;
-        throw new tn("Input edge is not connected to the input port.");
-      }
-      function Fy(e) {
-        var t;
-        e.c != 0 && (t = f(_e(e.a, e.b), 128), t.b == 1 ? (++e.b, e.b < e.a.c.length && i7(f(_e(e.a, e.b), 128))) : --t.b, --e.c);
-      }
-      function xd(e, t) {
-        return e.b.a = Xt(e.b.a, t.c), e.b.b = Xt(e.b.b, t.d), e.a.a = je(e.a.a, t.c), e.a.b = je(e.a.b, t.d), e.c[e.c.length] = t, !0;
-      }
-      function dK(e, t, n) {
-        var i, s;
-        return i = ge(e.n[t.f.k]) + ge(e.d[t.f.k]) + t.i.b + t.a.b, s = ge(e.n[n.f.k]) + ge(e.d[n.f.k]) + n.i.b + n.a.b, s - i;
-      }
-      function iO(e, t, n, i) {
-        var s, l, h;
-        return s = !1, WQ(e.j, n, i) && (VY(e.j, e.d[t][n], e.d[t][i]), l = e.d[t], h = l[i], l[i] = l[n], l[n] = h, s = !0), s;
-      }
-      function w0(e, t, n) {
-        var i, s, l, h, v;
-        v = Ti(e), s = v.a, i = f(z(v, (le(), os)), 15).a, l = v.d, h = e.i, t && (h.a = h.a - s.b - i - l.a), n && (h.b = h.b - s.d - i - l.b);
-      }
-      function aO(e, t) {
-        var n, i, s;
-        for (i = Dt(yg(e)); xt(i); )
-          return n = f(Et(i), 12), s = f(t.B(n), 9), new Kb(vt(s.i.b + s.j.b / 2));
-        return Pv(), Pv(), G2;
-      }
-      function oO(e) {
-        var t, n, i, s, l;
-        for (i = b2(e), t = Zo, l = 0, s = 0; t > 0.5 && l < 50; )
-          s = zA(i), n = Zl(i, s, !0), t = ei(n.b), ++l;
-        return Zl(e, s, !1);
-      }
-      function sO(e) {
-        var t, n, i, s, l;
-        for (i = b2(e), t = Zo, l = 0, s = 0; t > 0.5 && l < 50; )
-          s = BA(i), n = Zl(i, s, !0), t = ei(n.a), ++l;
-        return Zl(e, s, !1);
-      }
-      function m0(e) {
-        var t, n, i;
-        for (this.a = new _i(), this.e = new $r(), this.f = 0, n = 0, i = e.length; n < i; ++n)
-          t = e[n], !this.g && (this.g = t), f0(this, t);
-      }
-      function uO(e) {
-        DS(this), this.c = e.c, this.f = e.f, this.e = e.e, this.k = e.k, this.d = e.d, this.g = ca(e.g), this.j = e.j, this.i = e.i, this.b = ca(e.b);
-      }
-      function qy(e) {
-        switch (e.e) {
-          case 1:
-            return $n(), Ws;
-          case 4:
-            return $n(), ja;
-          case 2:
-            return $n(), Fi;
-          case 3:
-            return $n(), Ts;
-        }
-        return $n(), Po;
-      }
-      function cO(e, t) {
-        return VZ(e, t) ? (vn(e.g, t), !0) : (t.g != (we(), cr) && vn(e.i, t), t.e.c.length == 0 ? vn(e.c, t) : vn(e.b, t), !1);
-      }
-      function lO(e, t) {
-        var n, i;
-        return qc(0, e.c.length), n = Ky(t, ve(Ze, Me, 1, t.a.Y(), 4, 1)), i = n.length, i == 0 ? !1 : (r4(e.c, 0, n), !0);
-      }
-      function Vy(e, t) {
-        for (var n = 0; !t[n] || t[n] == ""; )
-          n++;
-        for (var i = t[n++]; n < t.length; n++)
-          !t[n] || t[n] == "" || (i += e + t[n]);
-        return i;
-      }
-      function vK() {
-        var e;
-        return X0 != 0 && (e = gW(), e - V8 > 2e3 && (V8 = e, Q0 = r.setTimeout(vF, 10))), X0++ == 0 ? (HW((q5(), Sx)), !0) : !1;
-      }
-      function Es(e) {
-        var t, n;
-        for (n = new M(e.a.b); n.a < n.c.c.length; )
-          t = f(O(n), 25), t.j.d = -t.j.d - t.j.c, t.o && (t.g.a = -t.g.a + t.o.j.c);
-        A0(e);
-      }
-      function dg(e, t) {
-        var n;
-        for (n = e; t.b < t.d.Y() && n == e; )
-          n = (ut(t.b < t.d.Y()), f(t.d.sb(t.c = t.b++), 7)).g;
-        n == e || (ut(t.b > 0), t.a.sb(t.c = --t.b));
-      }
-      function gK(e) {
-        var t;
-        gi(f(z(e, (Ee(), dt)), 28)) && (t = e.c, NA((Sn(0, t.c.length), f(t.c[0], 16))), NA(f(_e(t, t.c.length - 1), 16)));
-      }
-      function fO(e, t, n) {
-        Nt(n, "Compound graph preprocessor", 1), e.a = new Rv(), pR(e, t, null), dJ(e, t), ce(t, (le(), kL), e.a), e.a = null, so(e.b), Ct(n);
-      }
-      function hO(e) {
-        var t, n;
-        return t = f(Et(Dt(Lr(e))), 12), n = f(Et(Dt(En(e))), 12), !Pt(ge(jt(z(t, (le(), Xs))))) || !Pt(ge(jt(z(n, Xs))));
-      }
-      function bK(e, t, n) {
-        t.g == (et(), Hn) && n.g == hn && (e.d = My(t, (we(), ct)), e.b = My(t, rt)), n.g == Hn && t.g == hn && (e.d = My(n, (we(), rt)), e.b = My(n, ct));
-      }
-      function pK(e, t, n) {
-        var i, s, l, h;
-        return l = t.g, h = n.g, l != h ? l.e - h.e : (i = e.a[t.k], s = e.a[n.k], !i && !s ? 0 : i ? s ? mr(i.a, s.a) : 1 : -1);
-      }
-      function wK(e, t, n, i) {
-        var s, l, h, v;
-        for (l = t, s = n - 1; l <= s; )
-          if (h = l + s >>> 1, v = e[h], v < i)
-            l = h + 1;
-          else if (v > i)
-            s = h - 1;
-          else
-            return h;
-        return -(l + 1);
-      }
-      function mK(e) {
-        return xe(e, 137) ? (Qt(), new zS(f(e, 137))) : xe(e, 18) ? (Qt(), new jl(f(e, 18))) : xe(e, 20) ? P4(f(e, 20)) : (Qt(), new Cv(e));
-      }
-      function dO(e, t, n) {
-        return xe(n, 137) ? new $S(e, t, f(n, 137)) : xe(n, 18) ? new GS(e, t, f(n, 18)) : xe(n, 20) ? R4(e, t, f(n, 20), null) : new ig(e, t, n, null);
-      }
-      function Td(e, t) {
-        var n;
-        n = e.ub(t);
-        try {
-          return n.H();
-        } catch (i) {
-          throw i = Ur(i), xe(i, 74) ? new Ho("Can't get element " + t) : Kr(i);
-        }
-      }
-      function vg(e, t) {
-        On(), vt(e);
-        try {
-          return e.cb(t);
-        } catch (n) {
-          if (n = Ur(n), xe(n, 119))
-            return null;
-          if (xe(n, 76))
-            return null;
-          throw Kr(n);
-        }
-      }
-      function yK(e, t) {
-        var n = e.a, i;
-        t = String(t), n.hasOwnProperty(t) && (i = n[t]);
-        var s = (Ly(), q2)[typeof i], l = s ? s(i) : E3(typeof i);
-        return l;
-      }
-      function vO(e, t, n, i) {
-        t < n ? (e.b = 0.5 * (t + n), e.p = O2 * e.b + 0.9 * t, e.a = O2 * e.b + 0.9 * n) : (e.b = 0.5 * (t + i), e.p = O2 * e.b + 0.9 * i, e.a = O2 * e.b + 0.9 * t);
-      }
-      function gO(e) {
-        pD.call(this, e), this.b = new j0(e, !1, null, (yo(), Wa), !1, null, Wa), this.a = new l0(null, 1), P7(this.a, this.a), this.c = new C();
-      }
-      function y0(e) {
-        switch (nS(), this.c = new Se(), this.d = e, e.e) {
-          case 0:
-          case 2:
-            this.a = zV(iT), this.b = ki;
-            break;
-          case 3:
-          case 1:
-            this.a = iT, this.b = Hr;
-        }
-      }
-      function Ko() {
-        Ko = c, V2 = new sd("AUTOMATIC", 0), tp = new sd(Od, 1), np = new sd(Ad, 2), rp = new sd("TOP", 3), J0 = new sd("BOTTOM", 4), ep = new sd(Y0, 5);
-      }
-      function Wy(e) {
-        o9();
-        var t, n, i;
-        return n = ":" + e, i = Mp[n], i !== void 0 ? i : (i = VL[n], t = i === void 0 ? QZ(e) : i, fV(), Mp[n] = t, t);
-      }
-      function kK(e, t, n, i, s, l, h) {
-        Ea();
-        var v, p;
-        return p = h.length + 6, v = new ji(p), lg(v, re(ie(Ze, 1), Me, 1, 4, [e, t, n, i, s, l])), lg(v, h), jO(new M(v));
-      }
-      function EK(e) {
-        var t;
-        t = f(z(e, (Ee(), ia)), 18), !t.V() && (t.kb((gu(), qi)) ? (t.nb(qi), t.ib(Wi)) : t.kb(Wi) && (t.nb(Wi), t.ib(qi)));
-      }
-      function SK(e) {
-        var t;
-        t = f(z(e, (Ee(), ia)), 18), !t.V() && (t.kb((gu(), ba)) ? (t.nb(ba), t.ib(va)) : t.kb(va) && (t.nb(va), t.ib(ba)));
-      }
-      function CK(e, t) {
-        var n, i, s, l;
-        return s = e.g, n = ge(Ot(z(e, (le(), xu)))), l = t.g, i = ge(Ot(z(t, xu))), l != (et(), Cn) ? -1 : s != Cn ? 1 : n == i ? 0 : n < i ? -1 : 1;
-      }
-      function xK(e, t, n) {
-        var i, s;
-        return i = Au(Mc(e, t.d), Mc(e, t.c)), s = Jr(Mc(e, t.d), Mc(e, t.c)), Jf(p3(HU(n, gt(i), (yo(), Wa), gt(s), Wa), (E1(), Y2)));
-      }
-      function bO(e, t) {
-        On(), vt(e);
-        try {
-          return e.R(t);
-        } catch (n) {
-          if (n = Ur(n), xe(n, 119))
-            return !1;
-          if (xe(n, 76))
-            return !1;
-          throw Kr(n);
-        }
-      }
-      function pO(e, t) {
-        $o(), vt(e);
-        try {
-          return A4(e, t);
-        } catch (n) {
-          if (n = Ur(n), xe(n, 119))
-            return !1;
-          if (xe(n, 76))
-            return !1;
-          throw Kr(n);
-        }
-      }
-      function TK(e, t) {
-        return e.e < t.e ? -1 : e.e > t.e ? 1 : e.f < t.f ? -1 : e.f > t.f ? 1 : au(e) - au(t);
-      }
-      function wO(e) {
-        switch (e.e) {
-          case 1:
-            return we(), qe;
-          case 4:
-            return we(), rt;
-          case 3:
-            return we(), Be;
-          case 2:
-            return we(), ct;
-          default:
-            return we(), cr;
-        }
-      }
-      function mO(e) {
-        var t, n;
-        switch (t = Wm(e.c, e.c.length), t.length) {
-          case 0:
-            return _g;
-          case 1:
-            return n = new cu(t[0]), n;
-          default:
-            return new Qn(ur(t));
-        }
-      }
-      function LK(e) {
-        var t, n, i, s;
-        for (i = ve(Kee, Me, 64, e.c.length, 0, 1), s = 0, n = new M(e); n.a < n.c.c.length; )
-          t = f(O(n), 64), i[s++] = t;
-        return new OP(i);
-      }
-      function yO(e) {
-        var t, n;
-        if (!e.b)
-          for (e.b = Ic(e.a.b.c.length), n = new M(e.a.b); n.a < n.c.c.length; )
-            t = f(O(n), 33), Le(e.b, new Iw(t));
-        return e.b;
-      }
-      function ih(e, t) {
-        var n, i, s;
-        if (e.e)
-          return 1;
-        for (n = 0, s = new M(t.f); s.a < s.c.c.length; )
-          i = f(O(s), 7), n += i.b.c.length + i.e.c.length;
-        return n;
-      }
-      function kO(e) {
-        var t, n, i, s;
-        for (t = !1, s = !1, i = new M(e.f); i.a < i.c.c.length; )
-          n = f(O(i), 7), t = t | n.g == (we(), Be), s = s | n.g == qe;
-        return t && s;
-      }
-      function EO(e) {
-        var t, n;
-        for (this.b = new Se(), this.c = e, this.a = !1, n = new M(e.b); n.a < n.c.c.length; )
-          t = f(O(n), 9), this.a = this.a | t.g == (et(), Hn);
-      }
-      function qa(e) {
-        HS.call(this), this.g = (et(), Hn), this.f = (fi(6, nl), new ji(6)), this.c = (fi(2, nl), new ji(2)), this.e = new Lw(), this.b = new Lw(), this.a = e;
-      }
-      function I3(e, t, n, i, s, l) {
-        DS(this), this.e = e, this.f = t, this.d = n, this.c = i, this.g = s, this.b = l, this.j = ge(Ot(s.mb().H())), this.i = ge(Ot(AI(s)));
-      }
-      function PK(e, t) {
-        if (e == null)
-          throw new jv("null key in entry: null=" + t);
-        if (t == null)
-          throw new jv("null value in entry: " + e + "=null");
-      }
-      function SO() {
-        SO = c, Vz = Zv(new An(), (Pr(), Vd)), pp = new nt("linearSegments.inputPrio", gt(0)), wp = new nt("linearSegments.outputPrio", gt(0));
-      }
-      function M3(e) {
-        var t, n, i, s;
-        for (n = (s = new Ev(e.b).a.bb().mb(), new Sv(s)); n.a.G(); )
-          t = (i = f(n.a.H(), 21), f(i.zb(), 19)), t.Q();
-        so(e.b), e.c = 0;
-      }
-      function Jt(e, t) {
-        var n, i;
-        if (qc(t, e.b), t >= e.b >> 1)
-          for (i = e.c, n = e.b; n > t; --n)
-            i = i.b;
-        else
-          for (i = e.a.a, n = 0; n < t; ++n)
-            i = i.a;
-        return new mj(e, t, i);
-      }
-      function Vc(e, t) {
-        var n, i, s;
-        for (s = new Yr(), i = e.mb(); i.G(); )
-          n = f(i.H(), 55), Pg(n, s.a, 0), s.a += n.e.a + t, s.b = je(s.b, n.e.b);
-        return s.b > 0 && (s.b += t), s;
-      }
-      function k0(e, t) {
-        var n, i, s;
-        for (s = new Yr(), i = e.mb(); i.G(); )
-          n = f(i.H(), 55), Pg(n, 0, s.b), s.b += n.e.b + t, s.a = je(s.a, n.e.a);
-        return s.a > 0 && (s.a += t), s;
-      }
-      function gg(e, t, n) {
-        var i, s, l;
-        return s = f(Kt(e.c, t), 176), s ? (l = QS(s, n), B9(e, s), l) : (i = new i4(e, t, n), un(e.c, t, i), EN(i), null);
-      }
-      function DK(e, t) {
-        return DX(e.b).kb(t.c) ? sV(e.b) ? !(Bm(t.d, e.c, e.a) && Bm(t.a, e.c, e.a)) : Bm(t.d, e.c, e.a) && Bm(t.a, e.c, e.a) : !1;
-      }
-      function jK(e, t) {
-        return e.c < t.c || e.c == t.c && Xm(e.a) && Xm(t.a) && Mc(e.d, Em(e.a, e.b)) > Mc(e.d, Em(t.a, t.b)) ? -1 : e.c == t.c && Em(e.a, e.b) == Em(e.a, e.b) ? 0 : 1;
-      }
-      function NK(e, t, n) {
-        if (e.e)
-          switch (e.b) {
-            case 1:
-              Uq(e.c, t, n);
-              break;
-            case 0:
-              Wq(e.c, t, n);
-          }
-        else
-          GV(e.c, t, n);
-        e.a[t.k][n.k] = e.c.i, e.a[n.k][t.k] = e.c.e;
-      }
-      function IK(e, t, n) {
-        switch (n.e) {
-          case 1:
-            e.a = t.a / 2, e.b = 0;
-            break;
-          case 2:
-            e.a = t.a, e.b = t.b / 2;
-            break;
-          case 3:
-            e.a = t.a / 2, e.b = t.b;
-            break;
-          case 4:
-            e.a = 0, e.b = t.b / 2;
-        }
-      }
-      function O3(e) {
-        switch (e.e) {
-          case 8:
-            return we(), rt;
-          case 9:
-            return we(), ct;
-          case 10:
-            return we(), Be;
-          case 11:
-            return we(), qe;
-          default:
-            return we(), cr;
-        }
-      }
-      function MK(e) {
-        var t, n, i;
-        for (t = "Ot", i = Au(e.length, 5), n = 0; n < i; n++)
-          if (zo(e[n].d, t)) {
-            e.length >= n + 1 && e.splice(0, n + 1);
-            break;
-          }
-        return e;
-      }
-      function Uy(e, t) {
-        return ko(e) ? !!B8[t] : e._c ? !!e._c[t] : Yf(e) ? !!R8[t] : Ff(e) ? !!A8[t] : !1;
-      }
-      function CO() {
-        g3(), this.i = (On(), new $t()), this.a = new $t(), this.k = new $t(), this.j = new $t(), this.b = new $t(), this.n = new $t(), this.f = new $t(), this.e = new $t();
-      }
-      function OK(e, t) {
-        var n, i;
-        t.a.R(e) || (i = f(z(e, (le(), _r)), 32), n = f(_e(e.f, 0), 7), i == (we(), rt) ? Bt(n, ct) : i == ct && Bt(n, rt), t.a.db(e, t));
-      }
-      function xO(e) {
-        var t, n;
-        return n = Jr(1, f(z(e, (le(), Xa)), 24).a), e.c.f.g == (et(), Hn) && e.d.f.g == Hn ? t = 1 : e.c.f.g == Hn || e.d.f.g == Hn ? t = 2 : t = 8, n * t;
-      }
-      function AK(e) {
-        var t, n, i, s, l;
-        for (l = f(z(e, (le(), lt)), 7), t = f(Vn(e.b, ve(Ki, Yi, 12, e.b.c.length, 0, 1)), 47), i = 0, s = t.length; i < s; ++i)
-          n = t[i], kn(n, l);
-      }
-      function RK(e) {
-        var t, n, i, s, l;
-        for (n = f(z(e, (le(), lt)), 7), t = f(Vn(e.e, ve(Ki, Yi, 12, e.e.c.length, 0, 1)), 47), s = 0, l = t.length; s < l; ++s)
-          i = t[s], Bn(i, n);
-      }
-      function TO(e) {
-        var t, n;
-        n = e.i, t = dn(new ot(n.a, n.b), e.j), this.d = Xt(n.b, t.b), this.a = je(n.b, t.b), this.b = Xt(n.a, t.a), this.c = je(n.a, t.a);
-      }
-      function ah(e, t, n, i) {
-        var s, l, h, v;
-        !i && (i = (Ml(), Ml(), wf)), s = (l = ZM(e, t, n), h = (v = new Array(n - t), ag(v, e)), Xy(e, t, h, 0, l, !0), h), eC(s, e, t, n, -t, i);
-      }
-      function Vn(e, t) {
-        var n, i, s;
-        for (s = e.c.length, t.length < s && (t = (i = new Array(s), ag(i, t))), n = 0; n < s; ++n)
-          Ga(t, n, e.c[n]);
-        return t.length > s && Ga(t, s, null), t;
-      }
-      function LO(e, t) {
-        var n, i, s;
-        for (s = e.a.length, t.length < s && (t = (i = new Array(s), ag(i, t))), n = 0; n < s; ++n)
-          Ga(t, n, e.a[n]);
-        return t.length > s && Ga(t, s, null), t;
-      }
-      function ha(e) {
-        return ko(e) ? e : Yf(e) ? vD((or(e), e)) : Ff(e) ? P9(Pt((or(e), e))) : Fm(e) ? e.w() : _m(e) ? wN(e) : e.toString ? e.toString() : "[JavaScriptObject]";
-      }
-      function BK(e) {
-        var t, n, i, s, l;
-        for (l = 0, n = e.b, i = 0, s = n.length; i < s; ++i)
-          t = n[i], t.g == (et(), hn) || un(e.c, t, gt(l++)), qM(e, t, e.d, (we(), rt)), qM(e, t, e.j, ct);
-      }
-      function E0() {
-        E0 = c, nL = new Bv("SIMPLE", 0), JT = new Bv(I2, 1), eL = new Bv("LINEAR_SEGMENTS", 2), zk = new Bv("BRANDES_KOEPF", 3), tL = new Bv(T8, 4);
-      }
-      function $i() {
-        $i = c, pf = new Hv(Rd, 0), db = new Hv("FIRST", 1), gc = new Hv("FIRST_SEPARATE", 2), ev = new Hv("LAST", 3), Tu = new Hv("LAST_SEPARATE", 4);
-      }
-      function S0() {
-        S0 = c, mp = new K6(), lH = pi(new An(), (Pr(), up)), fH = bi(pi(new An(), vp), dp), uH = bi(Ca(pi(R1(new An(), cp), fp), Th), lp), cH = bi(Ca(new An(), Th), sp);
-      }
-      function zK(e) {
-        var t, n, i, s;
-        for (n = (s = new Wt(e.d.a).a.bb().mb(), new Zt(s)); n.a.G(); )
-          t = (i = f(n.a.H(), 21), f(i.yb(), 12)), Le(t.c.e, t), Le(t.d.b, t);
-      }
-      function A3(e, t) {
-        var n, i;
-        if (v9(t > 0), (t & -t) == t)
-          return Xn(t * Xl(e, 31) * 4656612873077393e-25);
-        do
-          n = Xl(e, 31), i = n % t;
-        while (n - i + (t - 1) < 0);
-        return Xn(i);
-      }
-      function HK(e, t) {
-        if (e.c.f == t)
-          return e.d.f;
-        if (e.d.f == t)
-          return e.c.f;
-        throw new tn("Node " + t + " is neither source nor target of edge " + e);
-      }
-      function _K(e, t, n) {
-        return v9(e >= 0 && e <= 1114111), e >= jg ? (t[n++] = 55296 + (e - jg >> 10 & 1023) & Cs, t[n] = 56320 + (e - jg & 1023) & Cs, 2) : (t[n] = e & Cs, 1);
-      }
-      function GK(e, t) {
-        _n();
-        for (var n, i; e.G(); )
-          if (!t.G() || (n = e.H(), i = t.H(), !(He(n) === He(i) || n != null && xo(n, i))))
-            return !1;
-        return !t.G();
-      }
-      function $K(e) {
-        var t, n, i;
-        for (r1(e.b.a), e.a = ve(op, Me, 25, e.c.b.a.b.c.length, 0, 1), t = 0, i = new M(e.c.b.a.b); i.a < i.c.c.length; )
-          n = f(O(i), 25), n.k = t++;
-      }
-      function YK(e) {
-        var t, n, i, s;
-        for (Ya(e.c, e.a), s = new M(e.c); s.a < s.c.c.length; )
-          for (i = O(s), n = new M(e.b); n.a < n.c.c.length; )
-            t = f(O(n), 160), t.Ec(i);
-      }
-      function bg(e) {
-        var t, n;
-        if (!e.a)
-          for (e.a = Ic(f(e.e, 9).c.c.length), n = new M(f(e.e, 9).c); n.a < n.c.c.length; )
-            t = f(O(n), 33), Le(e.a, new Iw(t));
-        return e.a;
-      }
-      function pg(e) {
-        var t, n;
-        if (!e.b)
-          for (e.b = Ic(f(e.e, 7).c.c.length), n = new M(f(e.e, 7).c); n.a < n.c.c.length; )
-            t = f(O(n), 33), Le(e.b, new Iw(t));
-        return e.b;
-      }
-      function PO(e) {
-        this.b = e, this.c = (On(), new $t()), this.i = new $t(), this.d = new $t(), this.j = new $t(), this.k = He(z(Ti(e[0]), (Ee(), of))) === He((fu(), af)), BK(this);
-      }
-      function Ld(e) {
-        switch (e.e) {
-          case 1:
-            return 4.71238898038469;
-          default:
-          case 2:
-            return 0;
-          case 3:
-            return 1.5707963267948966;
-          case 4:
-            return 3.141592653589793;
-        }
-      }
-      function R3(e) {
-        _n();
-        var t;
-        if (t = yW(e), !xt(e))
-          throw new Ho("position (0) must be less than the number of elements that remained (" + t + ")");
-        return Et(e);
-      }
-      function B3(e, t) {
-        var n, i;
-        n = e.ub(t);
-        try {
-          return i = n.H(), n.I(), i;
-        } catch (s) {
-          throw s = Ur(s), xe(s, 74) ? new Ho("Can't remove element " + t) : Kr(s);
-        }
-      }
-      function Ky(e, t) {
-        var n, i, s, l;
-        for (l = e.Y(), t.length < l && (t = (s = new Array(l), ag(s, t))), i = e.mb(), n = 0; n < l; ++n)
-          Ga(t, n, i.H());
-        return t.length > l && Ga(t, l, null), t;
-      }
-      function oh(e, t, n) {
-        if (n && (t < 0 || t > n.a.c.length))
-          throw new tn("index must be >= 0 and <= layer node count");
-        e.d && Cr(e.d.a, e), e.d = n, n && Ac(n.a, t, e);
-      }
-      function z3(e, t, n, i, s, l, h, v) {
-        var p, m;
-        i && (p = i.a[0], p && z3(e, t, n, p, s, l, h, v), XK(e, n, i.d, s, l, h, v) && t.ib(i), m = i.a[1], m && z3(e, t, n, m, s, l, h, v));
-      }
-      function H3(e, t, n) {
-        if (e < 0)
-          throw new Ho(XR + e + " < 0");
-        if (t > n)
-          throw new Ho("toIndex: " + t + " > size " + n);
-        if (e > t)
-          throw new tn(XR + e + " > toIndex: " + t);
-      }
-      function Zy(e, t) {
-        var n, i, s;
-        return n = t.yb(), s = t.zb(), i = e.cb(n), !(!(He(s) === He(i) || s != null && xo(s, i)) || i == null && !e.R(n));
-      }
-      function FK(e, t, n) {
-        var i;
-        i = t.c.f, i.g == (et(), hn) ? (ce(e, (le(), Mi), f(z(i, Mi), 7)), ce(e, Si, f(z(i, Si), 7))) : (ce(e, (le(), Mi), t.c), ce(e, Si, n.d));
-      }
-      function qK(e, t, n) {
-        var i;
-        i = t.c.f, i.g == (et(), hn) ? (ce(e, (le(), Mi), f(z(i, Mi), 7)), ce(e, Si, f(z(i, Si), 7))) : (ce(e, (le(), Mi), t.c), ce(e, Si, n.d));
-      }
-      function _3(e, t, n) {
-        var i, s, l, h, v;
-        for (GW(e), s = (e.i == null && (e.i = ve(Uee, Dr, 46, 0, 0, 1)), e.i), l = 0, h = s.length; l < h; ++l)
-          i = s[l], _3(i);
-        v = e.e, v && _3(v);
-      }
-      function DO(e, t) {
-        var n = new Array(t), i;
-        switch (e) {
-          case 11:
-          case 12:
-            i = 0;
-            break;
-          case 13:
-            i = !1;
-            break;
-          default:
-            return n;
-        }
-        for (var s = 0; s < t; ++s)
-          n[s] = i;
-        return n;
-      }
-      function VK(e) {
-        var t, n, i, s;
-        for (s = ve(kr, Dr, 51, e.a.length, 0, 2), n = 0; n < s.length; n++)
-          i = e.a[n].length, t = ve(kr, Ni, 9, i, 0, 1), nJ(e.a[n], 0, t, 0, i), s[n] = t;
-        return s;
-      }
-      function Xu(e) {
-        var t, n;
-        if (!e.b)
-          for (e.b = Ic(f(e.e, 9).f.c.length), n = new M(f(e.e, 9).f); n.a < n.c.c.length; )
-            t = f(O(n), 7), Le(e.b, new ND(t, e.c));
-        return e.b;
-      }
-      function WK(e, t) {
-        On(), vt(e);
-        try {
-          return ko(t) ? oN(e, t) : c2(e.d, t);
-        } catch (n) {
-          if (n = Ur(n), xe(n, 119))
-            return null;
-          if (xe(n, 76))
-            return null;
-          throw Kr(n);
-        }
-      }
-      function UK(e) {
-        var t;
-        return t = (GI(), QH), t[e >>> 28] | t[e >> 24 & 15] << 4 | t[e >> 20 & 15] << 8 | t[e >> 16 & 15] << 12 | t[e >> 12 & 15] << 16 | t[e >> 8 & 15] << 20 | t[e >> 4 & 15] << 24 | t[e & 15] << 28;
-      }
-      function KK(e, t, n) {
-        var i, s;
-        return t.c == (sr(), ri) && n.c == Ai ? -1 : t.c == Ai && n.c == ri ? 1 : (i = XM(t.a, e.a), s = XM(n.a, e.a), t.c == ri ? s - i : i - s);
-      }
-      function ZK(e) {
-        var t, n, i, s, l;
-        for (s = yr, l = null, i = new M(e.d); i.a < i.c.c.length; )
-          n = f(O(i), 89), n.c.j ^ n.d.j && (t = n.d.e - n.c.e - n.a, t < s && (s = t, l = n));
-        return l;
-      }
-      function XK(e, t, n, i, s, l, h) {
-        var v, p;
-        return !(t.Xc() && (p = e.a.$b(n, i), p < 0 || !s && p == 0) || t.Yc() && (v = e.a.$b(n, l), v > 0 || !h && v == 0));
-      }
-      function jO(e) {
-        Ea();
-        var t, n;
-        if (!e.G())
-          return Kf(), Gd;
-        if (n = e.H(), !e.G())
-          return new Bu(n);
-        t = new _i(), vn(t, vt(n));
-        do
-          vn(t, vt(e.H()));
-        while (e.G());
-        return S3(t);
-      }
-      function QK(e, t, n) {
-        e.e = t, e.a = n, e.d = xy(e, (we(), Be)), e.d += xy(e, qe), Sg(e, t, n, Be, e.f), Sg(e, t, n, qe, e.n), e.b = xy(e, Be), e.b += xy(e, qe), Sg(e, n, t, Be, e.f), Sg(e, n, t, qe, e.n);
-      }
-      function Wc(e) {
-        var t, n, i;
-        for (n = (mn(), e.length), i = 0; i < n && e.charCodeAt(i) <= 32; )
-          ++i;
-        for (t = n; t > i && e.charCodeAt(t - 1) <= 32; )
-          --t;
-        return i > 0 || t < n ? e.substr(i, t - i) : e;
-      }
-      function Xy(e, t, n, i, s, l) {
-        var h, v, p;
-        for (He(e) === He(n) && (e = e.slice(t, t + s), t = 0), v = t, p = t + s; v < p; )
-          h = v + 1e4 < p ? v + 1e4 : p, s = h - v, uW(n, i, l ? s : 0, e.slice(v, h)), v = h, i += s;
-      }
-      function JK(e) {
-        var t, n, i;
-        return NO(e, (o0(), Cx)) < 0 ? -KF((t = ~e.l + 1 & Va, n = ~e.m + (t == 0 ? 1 : 0) & Va, i = ~e.h + (t == 0 && n == 0 ? 1 : 0) & ec, Gu(t, n, i))) : e.l + e.m * Jl + e.h * tc;
-      }
-      function eZ(e, t) {
-        var n;
-        switch (n = e.f, t.e) {
-          case 1:
-            return -(e.i.b + e.j.b);
-          case 2:
-            return e.i.a - n.j.a;
-          case 3:
-            return e.i.b - n.j.b;
-          case 4:
-            return -(e.i.a + e.j.a);
-        }
-        return 0;
-      }
-      function zn() {
-        zn = c, ac = new cd(ef, 0), jo = new cd("FREE", 1), Xg = new cd("FIXED_SIDE", 2), yh = new cd("FIXED_ORDER", 3), es = new cd("FIXED_RATIO", 4), ni = new cd("FIXED_POS", 5);
-      }
-      function tZ(e, t) {
-        var n, i, s, l;
-        for (n = f(z(t, (le(), bf)), 18), l = f(Pa(St, n), 18), s = l.mb(); s.G(); )
-          if (i = f(s.H(), 18), !f(Pa(e.a, i), 20).V())
-            return !1;
-        return !0;
-      }
-      function G3(e, t, n) {
-        this.b = new Im(), this.i = new Se(), this.d = new AP(this), this.g = e, this.a = t.c.length, this.c = t, this.e = f(_e(this.c, this.c.c.length - 1), 9), this.f = n, QQ(this);
-      }
-      function C0() {
-        C0 = c, kp = new zv("ALWAYS_UP", 0), Uk = new zv("ALWAYS_DOWN", 1), Zk = new zv("DIRECTION_UP", 2), Kk = new zv("DIRECTION_DOWN", 3), Xk = new zv("SMART", 4);
-      }
-      function NO(e, t) {
-        var n, i, s, l, h, v, p, m;
-        return p = e.h >> 19, m = t.h >> 19, p != m ? m - p : (s = e.h, v = t.h, s != v ? s - v : (i = e.m, h = t.m, i != h ? i - h : (n = e.l, l = t.l, n - l)));
-      }
-      function IO(e) {
-        var t, n, i, s;
-        for (n = (s = new Wt(e.p.a).a.bb().mb(), new Zt(s)); n.a.G(); )
-          if (t = (i = f(n.a.H(), 21), f(i.yb(), 89)), t.e && e.b[t.b] < 0)
-            return t;
-        return null;
-      }
-      function wg(e, t) {
-        var n, i, s, l, h;
-        i = Xt(e.d, t.d), l = Xt(e.e, t.e), s = je(e.d + e.c, t.d + t.c), h = je(e.e + e.b, t.e + t.b), s < i && (n = i, i = s, s = n), h < l && (n = l, l = h, h = n), dj(e, i, l, s - i, h - l);
-      }
-      function x0(e, t) {
-        var n;
-        if (T2 in e.a) {
-          if (n = Mn(e, T2), !n.kc())
-            throw new gs("The 'properties' property of a graph element must be an object.", n, e);
-          VO(n.kc(), t, !0);
-        }
-      }
-      function nZ(e, t) {
-        var n, i, s;
-        if (i = e.b.j.e, e.a || (i += e.b.j.b), s = t.b.j.e, t.a || (s += t.b.j.b), n = mr(i, s), n == 0) {
-          if (!e.a && t.a)
-            return -1;
-          if (!t.a && e.a)
-            return 1;
-        }
-        return n;
-      }
-      function $3(e) {
-        var t, n;
-        switch (f(z(Ti(e), (zt(), yE)), 174).e) {
-          case 0:
-            return t = e.i, n = e.j, new ot(t.a + n.a / 2, t.b + n.b / 2);
-          case 1:
-            return new qn(e.i);
-          default:
-            return null;
-        }
-      }
-      function Yn() {
-        fa(), HS.call(this), this.g = (we(), cr), this.a = new Yr(), this.d = new Lw(), this.c = (fi(2, nl), new ji(2)), this.b = (fi(4, nl), new ji(4)), this.e = (fi(4, nl), new ji(4));
-      }
-      function rZ(e, t, n) {
-        e.d = 0, e.b = 0, MX(e, t, n), t.g == (et(), er) && n.g == hn ? vy(t).g == (we(), rt) ? e.d = 1 : e.b = 1 : n.g == er && t.g == hn && (vy(n).g == (we(), rt) ? e.b = 1 : e.d = 1), bK(e, t, n);
-      }
-      function iZ(e, t) {
-        var n, i;
-        for (i = new M(t); i.a < i.c.c.length; )
-          n = f(O(i), 9), e.a[n.d.k][n.k].a = lU(e.e), e.a[n.d.k][n.k].d = ge(e.a[n.d.k][n.k].a), e.a[n.d.k][n.k].b = 1;
-      }
-      function aZ(e, t, n) {
-        var i, s, l;
-        for (l = new M(t); l.a < l.c.c.length; )
-          i = f(O(l), 9), e.a[i.d.k][i.k].e = !1;
-        for (s = new M(t); s.a < s.c.c.length; )
-          i = f(O(s), 9), AC(e, i, n);
-      }
-      function oZ(e, t) {
-        var n, i, s, l;
-        for (n = 0, i = 0, l = new M(t.b); l.a < l.c.c.length; )
-          s = f(O(l), 33), n = je(n, s.j.a), i += s.j.b;
-        ce(t, (le(), FH), new ot(n, i)), e.k < n && (e.k = n), e.j += i;
-      }
-      function MO(e, t) {
-        this.c = (On(), new $t()), this.a = e, this.b = t, this.d = f(z(e, (le(), ml)), 134), He(z(e, (zt(), vE))) === He((og(), _k)) ? this.e = new N7() : this.e = new j7();
-      }
-      function Qy(e, t) {
-        var n, i, s, l;
-        for (s = 0, i = 0; i < t.length; i++)
-          n = t[i], i < t.length - 1 && (l = t[i + 1], s += WU(e, n, l)), s += (e.d = new PO(n), FZ(e.d)), s += (e.a = new L3(n), cV(e.a));
-        return s;
-      }
-      function Y3(e) {
-        switch (e.c.e) {
-          case 1:
-            return fa(), mk;
-          case 2:
-            return fa(), wk;
-          case 3:
-            return fa(), yk;
-          case 4:
-            return fa(), kk;
-        }
-        throw new jf("Can't filter on undefined side");
-      }
-      function T0(e, t) {
-        var n;
-        try {
-          return n = e.c.a, !Wv(e.b, t) || !n ? 0 : c3(n, e.d, t);
-        } catch (i) {
-          if (i = Ur(i), xe(i, 119))
-            return 0;
-          if (xe(i, 76))
-            return 0;
-          throw Kr(i);
-        }
-      }
-      function sZ(e) {
-        var t, n, i, s, l;
-        for (i = new Ul(new iu(e.b).a); i.b; )
-          n = Sd(i), t = f(n.yb(), 9), l = f(f(n.zb(), 27).a, 9), s = f(f(n.zb(), 27).b, 10), dn(Rs(t.i), dn(_a(l.i), s));
-      }
-      function uZ(e, t, n) {
-        var i, s, l;
-        if (i = mr(e.a[t.k], e.a[n.k]), i == 0) {
-          if (s = f(z(t, (le(), Dh)), 20), l = f(z(n, Dh), 20), s.kb(n))
-            return -1;
-          if (l.kb(t))
-            return 1;
-        }
-        return i;
-      }
-      function cZ(e, t) {
-        var n, i;
-        switch (i = dn(_a(e.i), e.a), n = e.f.j, t.e) {
-          case 1:
-            return -i.b;
-          case 2:
-            return -i.a + n.a;
-          case 3:
-            return -i.b + n.b;
-          case 4:
-            return -i.a;
-          default:
-            return 0;
-        }
-      }
-      function OO(e, t) {
-        var n, i, s, l;
-        for (s = 0; s < t.length; s++)
-          for (s + 1 < t.length && G4(e, t[s + 1], (sr(), Ai)), l = t[s], n = 0, i = 0; i < l.length; i++)
-            Fee(e, l[i]), n += e.Hc(l[i], n, (sr(), ri));
-      }
-      function F3() {
-        F3 = c, IH = Ca(Ca($u(new An(), (Pr(), AT)), OT), RT), PH = bi(Ca(pi(R1(new An(), cp), fp), Th), lp), jH = pi(new An(), up), NH = bi(pi(new An(), vp), dp), DH = bi(Ca(new An(), Th), sp);
-      }
-      function lZ(e, t, n, i) {
-        $7();
-        var s = z2;
-        function l() {
-          for (var h = 0; h < s.length; h++)
-            s[h]();
-        }
-        if (e)
-          try {
-            Ap(l)();
-          } catch (h) {
-            e(t, h);
-          }
-        else
-          Ap(l)();
-      }
-      function L0(e) {
-        if (vx == null && (vx = /^\s*[+-]?(NaN|Infinity|((\d+\.?\d*)|(\.\d+))([eE][+-]?\d+)?[dDfF]?)\s*$/), !bF(vx, e))
-          throw new i1(k2 + e + '"');
-        return parseFloat(e);
-      }
-      function mg() {
-        mg = c, Jk = new dd(Rd, 0), oL = new dd("LEFTUP", 1), uL = new dd("RIGHTUP", 2), aL = new dd("LEFTDOWN", 3), sL = new dd("RIGHTDOWN", 4), Qk = new dd("BALANCED", 5);
-      }
-      function Pd() {
-        Pd = c, Vk = new hd("V_TOP", 0), qk = new hd("V_CENTER", 1), Fk = new hd("V_BOTTOM", 2), $k = new hd("H_LEFT", 3), Gk = new hd("H_CENTER", 4), Yk = new hd("H_RIGHT", 5);
-      }
-      function P0() {
-        P0 = c, Z2 = new ud(Rd, 0), Dx = new ud("DIRECTED", 1), Nx = new ud("UNDIRECTED", 2), Lx = new ud("ASSOCIATION", 3), jx = new ud("GENERALIZATION", 4), Px = new ud("DEPENDENCY", 5);
-      }
-      function et() {
-        et = c, Hn = new ld("NORMAL", 0), hn = new ld("LONG_EDGE", 1), Cn = new ld("EXTERNAL_PORT", 2), er = new ld("NORTH_SOUTH_PORT", 3), Ka = new ld("LABEL", 4), Ii = new ld("BIG_NODE", 5);
-      }
-      function AO(e, t, n, i, s, l, h) {
-        var v, p, m, S, x;
-        if (S = s[l], m = l == h - 1, v = m ? i : 0, x = DO(v, S), i != 9 && re(ie(e, h - l), t[l], n[l], v, x), !m)
-          for (++l, p = 0; p < S; ++p)
-            x[p] = AO(e, t, n, i, s, l, h);
-        return x;
-      }
-      function yg(e) {
-        var t, n, i;
-        for (t = new Se(), i = new M(e.f); i.a < i.c.c.length; )
-          n = f(O(i), 7), Le(t, ya((dr(), new Qn(ur(re(ie(Ze, 1), Me, 1, 4, [n.b, n.e]))))));
-        return vt(t), new Gf(t);
-      }
-      function q3(e, t, n) {
-        if (this.a = n, e >= t.length)
-          throw new Ho("Greedy SwitchDecider: Free layer layer not in graph.");
-        this.b = t[e], this.c = new nj(this.b), this.d = new oM(this.b);
-      }
-      function RO(e, t) {
-        var n;
-        if (this.f = e, this.b = this.f.c, n = e.d, fy(t, n), t >= (n / 2 | 0))
-          for (this.e = e.e, this.d = n; t++ < n; )
-            AN(this);
-        else
-          for (this.c = e.a; t-- > 0; )
-            ON(this);
-        this.a = null;
-      }
-      function Uc(e) {
-        var t, n, i;
-        for (n = new M(e.a.b); n.a < n.c.c.length; )
-          t = f(O(n), 25), i = t.j.d, t.j.d = t.j.e, t.j.e = i, i = t.j.c, t.j.c = t.j.b, t.j.b = i, i = t.g.a, t.g.a = t.g.b, t.g.b = i;
-        A0(e);
-      }
-      function fZ(e, t) {
-        var n, i, s;
-        for (i = new fn(e.b, 0); i.b < i.d.Y(); )
-          n = (ut(i.b < i.d.Y()), f(i.d.sb(i.c = i.b++), 33)), s = f(z(n, (Ee(), da)), 107), s == (ys(), sl) && (So(i), Le(t.b, n));
-      }
-      function hZ(e, t, n) {
-        var i, s, l, h;
-        for (h = Di(e.f, t, 0), l = new $5(), l.b = n, i = new fn(e.f, h); i.b < i.d.Y(); )
-          s = (ut(i.b < i.d.Y()), f(i.d.sb(i.c = i.b++), 9)), s.k = n, Le(l.f, s), So(i);
-        return l;
-      }
-      function dZ(e, t) {
-        Df();
-        var n, i, s;
-        if (t.V())
-          return !1;
-        if (xe(t, 207))
-          for (s = f(t, 207), i = s.bb().mb(); i.G(); )
-            n = f(i.H(), 83), e.Bb(n.Zb(), n.Yb());
-        else
-          Ey(e, t.mb());
-        return !0;
-      }
-      function sh() {
-        sh = c, tb = new l1("DEFAULT_MINIMUM_SIZE", 0), fk = new l1("MINIMUM_SIZE_ACCOUNTS_FOR_INSETS", 1), lk = new l1("COMPUTE_INSETS", 2), ck = new l1("APPLY_ADDITIONAL_INSETS", 3);
-      }
-      function BO(e) {
-        var t, n, i, s;
-        for (n = e.a.b + 2, s = ve(_t, Ht, 10, n, 0, 1), s[0] = _a(Pi(e.c)), i = Jt(e.a, 0); i.b != i.d.c; )
-          t = f(Ft(i), 10), s[i.a] = new ot(t.a, t.b);
-        return s[n - 1] = _a(Pi(e.d)), s;
-      }
-      function V3(e, t, n) {
-        var i, s, l;
-        for (s = e.bb().mb(); s.G(); )
-          if (i = f(s.H(), 21), l = i.yb(), He(t) === He(l) || t != null && xo(t, l))
-            return n && (i = new p1(i.yb(), i.zb()), s.I()), i;
-        return null;
-      }
-      function vZ(e, t, n) {
-        var i, s;
-        return i = e.a[t.d.k][t.k], s = e.a[n.d.k][n.k], i.a != null && s.a != null ? $j(i.a, s.a) : i.a != null ? -1 : s.a != null ? 1 : 0;
-      }
-      function gZ(e, t, n) {
-        var i, s, l;
-        return s = t.c, l = t.d, i = n, vn(e.a, t) ? (cO(e, s) && (i = !0), cO(e, l) && (i = !0), i && (Cr(t.c.e, t), Cr(t.d.b, t), vn(e.d, t)), oZ(e, t), !0) : !1;
-      }
-      function Zl(e, t, n) {
-        var i, s;
-        return s = KM(e, t), s == e.c ? qS(e, N3(e, t)) : n ? (QO(e, t, e.c - s), qS(e, N3(e, t))) : (i = new uO(e), QO(i, t, e.c - s), qS(i, N3(i, t)));
-      }
-      function bZ() {
-        function e() {
-          try {
-            return (/* @__PURE__ */ new Map()).entries().next().done;
-          } catch {
-            return !1;
-          }
-        }
-        return typeof Map === UR && Map.prototype.entries && e() ? Map : bee();
-      }
-      function Pa(e, t) {
-        var n;
-        return n = f(Kt(e.b, t), 19), !n && (n = e.Z()), xe(n, 137) ? new $S(e, t, f(n, 137)) : xe(n, 18) ? new GS(e, t, f(n, 18)) : xe(n, 20) ? R4(e, t, f(n, 20), null) : new ig(e, t, n, null);
-      }
-      function vu(e) {
-        switch (hs(e.e) - hs(e.g)) {
-          case -2:
-            return c9(e.g) > 0 && (e.g = FO(e.g)), YO(e);
-          case 2:
-            return c9(e.e) < 0 && (e.e = YO(e.e)), FO(e);
-          default:
-            return e.d = 1 + Jr(hs(e.e), hs(e.g)), e;
-        }
-      }
-      function zO(e, t) {
-        this.f = (On(), new $t()), this.b = new $t(), this.j = new $t(), this.a = e, this.c = t, this.c > 0 && lA(this, this.c - 1, (we(), Be)), this.c < this.a.length - 1 && lA(this, this.c + 1, (we(), qe));
-      }
-      function pZ(e) {
-        var t;
-        e.c == null && (t = He(e.b) === He(U0) ? null : e.b, e.d = t == null ? $s : Bj(t) ? YF(iN(t)) : ko(t) ? "String" : a1(kd(t)), e.a = e.a + ": " + (Bj(t) ? tq(iN(t)) : t + ""), e.c = "(" + e.d + ") " + e.a);
-      }
-      function wZ(e) {
-        var t, n, i, s;
-        for (n = new M(e.a.c); n.a < n.c.c.length; )
-          for (t = f(O(n), 9), s = Jt(ca(t.c), 0); s.b != s.d.c; )
-            i = f(Ft(s), 33), z(i, (le(), lt)) == null && Cr(t.c, i);
-        return null;
-      }
-      function Kc(e, t) {
-        var n, i, s, l, h;
-        for (h = new Se(), i = f(Zf(vl, e), 20).mb(); i.G(); )
-          n = f(i.H(), 75), Tn(h, n.b);
-        for (D0(h), my(h, e.a), l = new M(h); l.a < l.c.c.length; )
-          s = f(O(l), 7), su(t, s);
-      }
-      function mZ(e) {
-        for (var t, n, i, s; e.o.a.c.length != 0; )
-          n = f(xM(e.o), 27), i = f(n.a, 61), t = f(n.b, 89), s = _y(t, i), t.d == i ? (Yu(s.g, t), i.e = s.e + t.a) : (Yu(s.c, t), i.e = s.e - t.a), Le(e.e.a, i);
-      }
-      function HO(e, t, n) {
-        var i, s, l;
-        return fi(n, "count"), Wv(e.b, t) ? (l = e.c.a, l ? (s = ve(Kn, Wn, 26, 1, 12, 1), i = kC(l, e.d, t, n, s), _1(e.c, l, i), s[0]) : (n > 0 && N0(e, t, n), 0)) : (_f(n == 0), 0);
-      }
-      function _O(e, t) {
-        var n, i, s, l, h;
-        for (s = f(z(t, (le(), Oi)), 15).a * f(z(t, (zt(), Qs)), 15).a, h = e[0].i.a + e[0].j.a, l = 1; l < e.length; l++)
-          n = e[l].i, i = e[l].j, n.a <= h + s && (n.a = h + s), h = n.a + i.a;
-      }
-      function W3() {
-        W3 = c;
-        var e, t, n, i;
-        for (YL = ve(Zi, mi, 26, 25, 12, 1), FL = ve(Zi, mi, 26, 33, 12, 1), i = 152587890625e-16, t = 32; t >= 0; t--)
-          FL[t] = i, i *= 0.5;
-        for (n = 1, e = 24; e >= 0; e--)
-          YL[e] = n, n *= 0.5;
-      }
-      function GO(e) {
-        for (; e.g.c != 0 && e.d.c != 0; )
-          Pm(e.g).c > Pm(e.d).c ? (e.i += e.g.c, Fy(e.d)) : Pm(e.d).c > Pm(e.g).c ? (e.e += e.d.c, Fy(e.g)) : (e.i += xj(e.g), e.e += xj(e.d), Fy(e.g), Fy(e.d));
-      }
-      function yZ(e) {
-        if (!e)
-          throw new _w("An element is null. The origin of an edge could not be determined, this might be due to an inconsistency within the internal element mappings.");
-      }
-      function kZ(e, t) {
-        var n, i;
-        return so(e.i), so(e.a), so(e.k), so(e.j), so(e.b), so(e.n), so(e.f), so(e.e), e.d && (i = Mn(e.d, Ux.b), i && i.ic() && (e.c = i.ic().a)), n = BR(e, t, null), sR(e, t), n;
-      }
-      function EZ(e) {
-        var t, n, i, s, l, h;
-        for (i = iR(b2(e)), t = Zo, l = 0, s = 0; t > 0.5 && l < 50; )
-          s = zA(i), n = Zl(i, s, !0), t = ei(n.b), ++l;
-        return h = Ot(Td(ca(e.g), ca(e.g).b - 1)), Zl(e, (or(h), h - s), !1);
-      }
-      function SZ(e) {
-        var t, n, i, s, l, h;
-        for (i = iR(b2(e)), t = Zo, l = 0, s = 0; t > 0.5 && l < 50; )
-          s = BA(i), n = Zl(i, s, !0), t = ei(n.a), ++l;
-        return h = Ot(Td(ca(e.g), ca(e.g).b - 1)), Zl(e, (or(h), h - s), !1);
-      }
-      function Qu(e) {
-        var t, n, i, s;
-        for (s = new id("["), t = !1, i = e.mb(); i.G(); )
-          n = i.H(), t ? s.a += ", " : t = !0, io(s, n === e ? "(this Collection)" : (mn(), n == null ? $s : ha(n)));
-        return s.a += "]", s.a;
-      }
-      function $O(e) {
-        var t, n, i, s;
-        for (s = new id("{"), t = !1, i = e.bb().mb(); i.G(); )
-          n = f(i.H(), 21), t ? s.a += ", " : t = !0, io(s, zN(e, n.yb())), s.a += "=", io(s, zN(e, n.zb()));
-        return s.a += "}", s.a;
-      }
-      function YO(e) {
-        var t;
-        return w1(!!e.g), t = e.g, e.g = t.e, t.e = e, t.j = e.j, t.a = e.a, e.a = 1 + zw(e.e) + zw(e.g), e.j = Tr(Tr(e.c, Hw(e.e)), Hw(e.g)), e.d = 1 + Jr(hs(e.e), hs(e.g)), t.d = 1 + Jr(hs(t.e), hs(t.g)), t;
-      }
-      function FO(e) {
-        var t;
-        return w1(!!e.e), t = e.e, e.e = t.g, t.g = e, t.j = e.j, t.a = e.a, e.a = 1 + zw(e.e) + zw(e.g), e.j = Tr(Tr(e.c, Hw(e.e)), Hw(e.g)), e.d = 1 + Jr(hs(e.e), hs(e.g)), t.d = 1 + Jr(hs(t.e), hs(t.g)), t;
-      }
-      function CZ(e) {
-        var t;
-        Nc(new M(Xu(e.e))) && (t = f(nr(e.e, (Ee(), dt)), 28), t == (zn(), ni) ? KX(e.e) : t == es ? qJ(e.e) : Pt(ge(jt(nr(e.e, qg)))) || e.e.e.j.a == 0 && e.e.e.j.b == 0 ? HX(e.e) : zJ(e));
-      }
-      function U3(e, t, n) {
-        var i, s, l;
-        if (s = new M(e), s.a < s.c.c.length) {
-          for (l = f(O(s), 33), i = yR(l, t, n); s.a < s.c.c.length; )
-            l = f(O(s), 33), n3(i, yR(l, t, n));
-          return new rg(i);
-        } else
-          return null;
-      }
-      function xZ(e, t) {
-        var n, i, s, l, h, v;
-        for (s = 0, i = new M(t.c); i.a < i.c.c.length; )
-          for (n = f(O(i), 16), h = new M(n.a); h.a < h.c.c.length; )
-            l = f(O(h), 9), v = l.j.a + l.e.c + l.e.b + e.b, s = s > v ? s : v;
-        return s;
-      }
-      function TZ(e, t) {
-        md();
-        var n;
-        if (e.c == t.c) {
-          if (e.b == t.b || qW(e.b, t.b)) {
-            if (n = CF(e.b) ? 1 : -1, e.a && !t.a)
-              return n;
-            if (!e.a && t.a)
-              return -n;
-          }
-          return b9(e.b.e, t.b.e);
-        } else
-          return mr(e.c, t.c);
-      }
-      function qO(e) {
-        var t, n;
-        switch (n = _a(ln(re(ie(_t, 1), Ht, 10, 0, [e.f.i, e.i, e.a]))), t = e.f.e, e.g.e) {
-          case 1:
-            n.b -= t.d;
-            break;
-          case 2:
-            n.a += t.c;
-            break;
-          case 3:
-            n.b += t.a;
-            break;
-          case 4:
-            n.a -= t.b;
-        }
-        return n;
-      }
-      function LZ(e, t) {
-        var n;
-        return n = 0, t.g == (et(), er) ? ($4(t).f != e.a && (qD(e, $4(t).f), e.e = !0), e.e ? ++e.g : n += e.f) : t.g == hn ? e.e ? n += e.g : ++e.f : t.g == Hn && (qD(e, t), e.e = !1), n;
-      }
-      function PZ(e, t, n, i, s) {
-        var l, h, v, p;
-        for (p = null, v = new M(i); v.a < v.c.c.length; )
-          if (h = f(O(v), 187), h != n && Di(h.e, s, 0) != -1) {
-            p = h;
-            break;
-          }
-        l = ly(s), Bn(l, n.b), kn(l, p.b), pt(e.a, s, new N1(l, t, n.f));
-      }
-      function DZ(e) {
-        switch (f(z(e, (zt(), Er)), 85).e) {
-          case 1:
-            ce(e, Er, ($i(), ev));
-            break;
-          case 2:
-            ce(e, Er, ($i(), Tu));
-            break;
-          case 3:
-            ce(e, Er, ($i(), db));
-            break;
-          case 4:
-            ce(e, Er, ($i(), gc));
-        }
-      }
-      function VO(e, t, n) {
-        var i, s, l, h;
-        if (e)
-          for (s = (l = JI(e, ve(_2, Dr, 2, 0, 5, 1)), new Pf(new ro(new TD(e, l).b))); s.b < s.d.Y(); )
-            i = (ut(s.b < s.d.Y()), qf(s.d.sb(s.c = s.b++))), h = Mn(e, i), Wee(t, i, h, n);
-      }
-      function jZ(e, t, n) {
-        var i, s, l, h, v, p;
-        for (s = 1; s < e; )
-          s *= 2;
-        for (p = 2 * s - 1, s -= 1, v = ve(Kn, Wn, 26, p, 12, 1), i = 0, h = 0; h < t; h++)
-          for (l = n[h] + s, ++v[l]; l > 0; )
-            l % 2 > 0 && (i += v[l + 1]), l = (l - 1) / 2 | 0, ++v[l];
-        return i;
-      }
-      function Dd(e, t, n) {
-        var i, s, l, h;
-        if (e.e = t, n)
-          for (s = (h = new Wt(e.a.a).a.bb().mb(), new Zt(h)); s.a.G(); )
-            i = (l = f(s.a.H(), 21), f(l.yb(), 12)), ce(i, (le(), hb), e.e), Bt(i.c, t.a), Bt(i.d, t.b);
-      }
-      function jd() {
-        jd = c, sb = new fd(Rd, 0), qT = new fd(Od, 1), UT = new fd(Ad, 2), WT = new fd("LEFT_RIGHT_CONSTRAINT_LOCKING", 3), VT = new fd("LEFT_RIGHT_CONNECTION_LOCKING", 4), FT = new fd("EDGE_LENGTH", 5);
-      }
-      function K3(e, t, n, i) {
-        var s;
-        this.b = i, this.e = e.a, s = t[n], this.d = Gm(pb, [Dr, Bg], [227, 26], 13, [s.length, s.length], 2), this.a = Gm(Kn, [Dr, Wn], [52, 26], 12, [s.length, s.length], 2), this.c = new zO(t, n);
-      }
-      function NZ(e, t, n, i) {
-        var s, l;
-        for (l = t, s = l.d == null || e.a.$b(n.d, l.d) > 0 ? 1 : 0; l.a[s] != n; )
-          l = l.a[s], s = e.a.$b(n.d, l.d) > 0 ? 1 : 0;
-        l.a[s] = i, i.b = n.b, i.a[0] = n.a[0], i.a[1] = n.a[1], n.a[0] = null, n.a[1] = null;
-      }
-      function IZ(e, t, n) {
-        var i, s, l, h;
-        if (Nt(n, b8, 1), OR(e.d, t), h = TJ(e.a, t), h.Y() == 1)
-          LC(f(h.sb(0), 55), n);
-        else
-          for (l = 1 / h.Y(), s = h.mb(); s.G(); )
-            i = f(s.H(), 55), LC(i, Vl(n, l));
-        WY(e.a, h, t), dR(t), Ct(n);
-      }
-      function WO(e, t, n) {
-        var i, s, l, h, v;
-        for (v = new Oc(t, n), h = Qc(v); h.G(); )
-          for (l = f(h.H(), 7), s = Dt(ya((dr(), new Qn(ur(re(ie(Ze, 1), Me, 1, 4, [l.b, l.e])))))); xt(s); )
-            i = f(Et(s), 12), Fc(i) || zZ(e, t, l, i);
-      }
-      function UO(e, t) {
-        var n, i, s;
-        for (s = Jn(e, t), i = s.mb(); i.G(); )
-          if (n = f(i.H(), 7), z(n, (le(), js)) != null || xt(Dt(ya((dr(), new Qn(ur(re(ie(Ze, 1), Me, 1, 4, [n.b, n.e]))))))))
-            return !0;
-        return !1;
-      }
-      function Jy(e) {
-        var t, n;
-        if (eg(e))
-          throw new tn(j8);
-        for (n = Jt(e, 0); n.b != n.d.c; )
-          t = f(Ft(n), 10), this.d = Xt(this.d, t.b), this.c = je(this.c, t.a), this.a = je(this.a, t.b), this.b = Xt(this.b, t.a);
-      }
-      function MZ(e, t, n) {
-        if (t < 0 || n < 0)
-          throw new tn("The highx must be bigger then lowx and the highy must be bigger then lowy");
-        return e.a < 0 ? e.a = 0 : e.a > t && (e.a = t), e.b < 0 ? e.b = 0 : e.b > n && (e.b = n), e;
-      }
-      function Jn(e, t) {
-        switch (t.e) {
-          case 1:
-            return Eo(e.f, (fa(), mk));
-          case 2:
-            return Eo(e.f, (fa(), wk));
-          case 3:
-            return Eo(e.f, (fa(), yk));
-          case 4:
-            return Eo(e.f, (fa(), kk));
-          default:
-            return Qt(), Qt(), bc;
-        }
-      }
-      function OZ(e) {
-        var t, n, i, s;
-        for (s = (_n(), new _o(Go(vs(e.a, new T())))); xt(s); )
-          for (i = f(Et(s), 9), i.g == (et(), Ka) && ce(i, (le(), lo), (Gi(), Us)), n = Dt(En(i)); xt(n); )
-            t = f(Et(n), 12), l2(t, (Gi(), Us));
-      }
-      function AZ(e) {
-        var t, n, i, s;
-        for (s = (_n(), new _o(Go(vs(e.a, new T())))); xt(s); )
-          for (i = f(Et(s), 9), i.g == (et(), Ka) && ce(i, (le(), lo), (Gi(), ns)), n = Dt(En(i)); xt(n); )
-            t = f(Et(n), 12), l2(t, (Gi(), ns));
-      }
-      function e2(e, t) {
-        switch (this.b = new $r(), e) {
-          case 0:
-            this.d = new e7(this);
-            break;
-          case 1:
-            this.d = new QP(this);
-            break;
-          case 2:
-            this.d = new JP(this);
-            break;
-          default:
-            throw new ed();
-        }
-        this.c = t, this.a = 0.2 * t;
-      }
-      function KO(e) {
-        var t, n, i, s;
-        if (!e.b)
-          for (e.b = new Se(), n = new M(e.a.c); n.a < n.c.c.length; )
-            for (t = f(O(n), 16), s = new M(t.a); s.a < s.c.c.length; )
-              i = f(O(s), 9), Le(e.b, new jD(i, e.c));
-        return e.b;
-      }
-      function RZ(e, t) {
-        var n, i, s;
-        n = uq(t, e.e), i = f(Kt(e.g.f, n), 24).a, s = e.a.c.length - 1, e.a.c.length != 0 && f(_e(e.a, s), 128).c == i ? (++f(_e(e.a, s), 128).a, ++f(_e(e.a, s), 128).b) : Le(e.a, new _9(i));
-      }
-      function Z3(e) {
-        mn();
-        var t, n;
-        return e >= jg ? (t = 55296 + (e - jg >> 10 & 1023) & Cs, n = 56320 + (e - jg & 1023) & Cs, String.fromCharCode(t) + ("" + String.fromCharCode(n))) : String.fromCharCode(e & Cs);
-      }
-      function BZ(e, t, n, i) {
-        var s, l, h;
-        switch (s = Ti(n), l = By(s), h = new Yn(), cn(h, n), i.e) {
-          case 1:
-            Bt(h, Oy(g0(l)));
-            break;
-          case 2:
-            Bt(h, g0(l));
-        }
-        return ce(h, (le(), Qd), f(z(t, Qd), 15)), ce(t, lt, h), un(e.b, h, t), h;
-      }
-      function zZ(e, t, n, i) {
-        var s;
-        Le(e.c, new E4(e, n, i, f(Kt(e.k, n), 24).a)), Xm(i) && (t == e.e ? i.d.f != e.a && i.c.f != e.a : i.d.f != e.e && i.c.f != e.e) && (s = n == i.c ? i.d : i.c, Le(e.c, new E4(e, s, i, f(Kt(e.k, s), 24).a)));
-      }
-      function ZO(e, t) {
-        var n, i, s;
-        if (t === e)
-          return !0;
-        if (!xe(t, 57) || (s = f(t, 57), e.Y() != s.Y()))
-          return !1;
-        for (i = s.bb().mb(); i.G(); )
-          if (n = f(i.H(), 21), !e._(n))
-            return !1;
-        return !0;
-      }
-      function XO(e, t) {
-        var n, i, s;
-        return i = new qa(e), hu(i, t), ce(i, (le(), Tp), t), ce(i, (Ee(), dt), (zn(), ni)), ce(i, co, (Ko(), ep)), Ha(i, (et(), Cn)), n = new Yn(), cn(n, i), Bt(n, (we(), qe)), s = new Yn(), cn(s, i), Bt(s, Be), i;
-      }
-      function X3(e, t) {
-        var n, i, s;
-        for (s = yr, i = new M(Kl(t)); i.a < i.c.c.length; )
-          n = f(O(i), 89), n.e && !e.c[n.b] && (e.c[n.b] = !0, s = Au(s, X3(e, _y(n, t))));
-        return e.i[t.b] = e.j, e.g[t.b] = Au(s, e.j++), e.g[t.b];
-      }
-      function QO(e, t, n) {
-        var i, s, l, h;
-        if (h = e.g.tb(), e.e)
-          for (s = 0; s < e.c; s++)
-            h.H();
-        else
-          for (s = 0; s < e.c - 1; s++)
-            h.H();
-        for (l = e.b.tb(), i = ge(Ot(h.H())); i - t < al; )
-          i = ge(Ot(h.H())), l.H();
-        h.M(), UA(e, n, t, l, h);
-      }
-      function JO(e, t) {
-        var n, i, s, l;
-        for (i = 0, s = e.length; i < s; i++) {
-          l = e[i];
-          try {
-            l[1] ? l[0].bd() && (t = Eq(t, l)) : l[0].bd();
-          } catch (h) {
-            if (h = Ur(h), xe(h, 46))
-              n = h, Oq(xe(n, 164) ? f(n, 164).cc() : n);
-            else
-              throw Kr(h);
-          }
-        }
-        return t;
-      }
-      function HZ(e) {
-        var t, n, i;
-        if (i = e.c.a, !i)
-          return null;
-        if (e.b.b) {
-          if (t = e.b.e, n = k3(e.c.a, e.d, t), !n)
-            return null;
-          e.b.d == (yo(), Wa) && e.d.$b(t, n.b) == 0 && (n = n.i);
-        } else
-          n = e.a.i;
-        return n == e.a || !Wv(e.b, n.b) ? null : n;
-      }
-      function _Z(e, t) {
-        var n, i, s, l, h, v;
-        for (l = 0, i = new M(t.c); i.a < i.c.c.length; ) {
-          for (n = f(O(i), 16), s = 0, v = new M(n.a); v.a < v.c.c.length; )
-            h = f(O(v), 9), s += h.j.b + h.e.a + h.e.d + e.a;
-          s -= e.a, l = l > s ? l : s;
-        }
-        return l;
-      }
-      function GZ(e) {
-        var t, n, i, s, l;
-        for (l = yr, s = yr, i = new M(Kl(e)); i.a < i.c.c.length; )
-          n = f(O(i), 89), t = n.d.e - n.c.e, n.d == e && t < s ? s = t : t < l && (l = t);
-        return s == yr && (s = -1), l == yr && (l = -1), new pr(gt(s), gt(l));
-      }
-      function eA(e, t, n) {
-        var i, s, l, h, v;
-        for (t.k = -1, v = ks(t, (sr(), ri)).mb(); v.G(); )
-          for (h = f(v.H(), 7), s = new M(h.e); s.a < s.c.c.length; )
-            i = f(O(s), 12), l = i.d.f, t != l && (l.k < 0 ? n.ib(i) : l.k > 0 && eA(e, l, n));
-        t.k = 0;
-      }
-      function tA(e, t) {
-        if (0 > t)
-          throw new tn("Top must be smaller or equal to bottom.");
-        if (0 > e)
-          throw new tn("Left must be smaller or equal to right.");
-        this.d = 0, this.c = e, this.a = t, this.b = 0;
-      }
-      function t2(e) {
-        var t, n, i;
-        if (e.length == 0)
-          throw new tn(j8);
-        for (n = 0, i = e.length; n < i; ++n)
-          t = e[n], this.d = Xt(this.d, t.b), this.c = je(this.c, t.a), this.a = je(this.a, t.b), this.b = Xt(this.b, t.a);
-      }
-      function $Z() {
-        return Pr(), re(ie(dz, 1), De, 37, 0, [TT, vT, zT, hT, xk, AT, Tk, jT, Sk, cp, DT, PT, hp, bT, Ek, Dk, Nk, fp, ST, up, MT, jk, vp, gT, NT, OT, IT, Lk, yT, Th, Ck, ET, RT, LT, pT, Vd, CT, ib, fT, kT, wT, Pk, dp, lp, mT, Ik, xT, dT, BT, sp]);
-      }
-      function YZ(e, t) {
-        var n, i, s, l, h, v, p, m, S;
-        for (S = 0, i = 0, s = t.length; i < s; ++i)
-          for (n = t[i], h = 0, v = n.length; h < v; ++h)
-            for (l = n[h], m = new M(l.f); m.a < m.c.c.length; )
-              p = f(O(m), 7), p.k = S++;
-        e.a = ve(Kn, Wn, 26, S, 12, 1);
-      }
-      function nA(e) {
-        _n();
-        var t, n, i;
-        if (t = e.H(), !e.G())
-          return t;
-        for (i = new ad(), i.a += "expected one element but was: <" + t, n = 0; n < 4 && e.G(); n++)
-          io(i, ", " + e.H());
-        throw e.G() && (i.a += ", ..."), i.a += ">", new tn(i.a);
-      }
-      function FZ(e) {
-        var t, n, i, s, l;
-        for (t = 0, i = e.b, s = 0, l = i.length; s < l; ++s)
-          n = i[s], t += LZ(e, n), gi(f(z(n, (Ee(), dt)), 28)) && (Jn(n, (we(), rt)).mb().G() && (t += eR(e, n, rt)), Jn(n, ct).mb().G() && (t += eR(e, n, ct)));
-        return t;
-      }
-      function n2(e, t, n, i) {
-        var s, l, h, v, p;
-        if (i.d.c + i.e.c == 0)
-          for (h = e.a[e.c], v = 0, p = h.length; v < p; ++v)
-            l = h[v], un(i, l, new tM(e, l, n));
-        return s = f(ci(li(i.d, t)), 284), s.b = 0, s.c = s.f, s.c == 0 || i7(f(_e(s.a, s.b), 128)), s;
-      }
-      function D0(e) {
-        var t;
-        Qt();
-        var n, i, s, l, h, v;
-        if (xe(e, 63))
-          for (l = 0, s = e.Y() - 1; l < s; ++l, --s)
-            t = e.sb(l), e.wb(l, e.sb(s)), e.wb(s, t);
-        else
-          for (n = e.tb(), h = e.ub(e.Y()); n.L() < h.N(); )
-            i = n.H(), v = h.M(), n.O(v), h.O(i);
-      }
-      function qZ(e, t, n) {
-        return e < 0 || e > n ? J3(e, n, "start index") : t < 0 || t > n ? J3(t, n, "end index") : Tg("end index (%s) must not be less than start index (%s)", re(ie(Ze, 1), Me, 1, 4, [gt(t), gt(e)]));
-      }
-      function Q3(e) {
-        if (!("id" in e.a))
-          throw new qv("Every graph element must specify an 'id' property.", e);
-        if (!Mn(e, "id").lc())
-          throw new qv("Invalid format for 'id'. Must be a string, was " + Mn(e, "id").$c, e);
-      }
-      function Zc(e, t) {
-        var n, i, s, l, h, v, p;
-        for (p = e.b, i = f(Zf(vl, e), 20).mb(); i.G(); )
-          for (n = f(i.H(), 75), v = (l = new Wt(n.c.a).a.bb().mb(), new Zt(l)); v.a.G(); )
-            h = (s = f(v.a.H(), 21), f(s.yb(), 7)), su(t, h), I0(h, p);
-      }
-      function VZ(e, t) {
-        var n, i, s;
-        for (s = new M(t.e); s.a < s.c.c.length; )
-          if (n = f(O(s), 12), n.d.f != e.f)
-            return !0;
-        for (i = new M(t.b); i.a < i.c.c.length; )
-          if (n = f(O(i), 12), n.c.f != e.f)
-            return !0;
-        return !1;
-      }
-      function r2(e) {
-        var t, n, i, s;
-        for (q1(e.c), q1(e.b), q1(e.a), s = (n = new Wt(e.e).a.bb().mb(), new Zt(n)); s.a.G(); )
-          i = (t = f(s.a.H(), 21), f(t.yb(), 60)), i.c != 2 && (hi(e.a, i), i.c == 0 && hi(e.c, i)), hi(e.b, i);
-        e.d = !1;
-      }
-      function rA(e, t) {
-        var n;
-        if (e === t)
-          return !0;
-        if (xe(t, 18)) {
-          n = f(t, 18);
-          try {
-            return e.Y() == n.Y() && e.lb(n);
-          } catch (i) {
-            if (i = Ur(i), xe(i, 76))
-              return !1;
-            if (xe(i, 119))
-              return !1;
-            throw Kr(i);
-          }
-        }
-        return !1;
-      }
-      function ra(e, t, n) {
-        var i, s, l, h;
-        if (h = t == null ? 0 : e.b.Vc(t), s = (i = oS(e.a, h), i ?? []), s.length == 0)
-          nF(e.a, h, s);
-        else if (l = DM(e, t, s), l)
-          return l.Ab(n);
-        return Ga(s, s.length, new p1(t, n)), ++e.c, Mm(e.b), null;
-      }
-      function J3(e, t, n) {
-        if (e < 0)
-          return Tg(QR, re(ie(Ze, 1), Me, 1, 4, [n, gt(e)]));
-        if (t < 0)
-          throw new tn(JR + t);
-        return Tg("%s (%s) must not be greater than size (%s)", re(ie(Ze, 1), Me, 1, 4, [n, gt(e), gt(t)]));
-      }
-      function WZ(e, t) {
-        if (e < 0)
-          return Tg(QR, re(ie(Ze, 1), Me, 1, 4, ["index", gt(e)]));
-        if (t < 0)
-          throw new tn(JR + t);
-        return Tg("%s (%s) must be less than size (%s)", re(ie(Ze, 1), Me, 1, 4, ["index", gt(e), gt(t)]));
-      }
-      function iA(e) {
-        var t, n, i, s;
-        for (s = ve(kr, Dr, 51, e.c.c.length, 0, 2), i = new fn(e.c, 0); i.b < i.d.Y(); )
-          t = (ut(i.b < i.d.Y()), f(i.d.sb(i.c = i.b++), 16)), n = i.b - 1, s[n] = f(Vn(t.a, ve(kr, Ni, 9, t.a.c.length, 0, 1)), 51);
-        return s;
-      }
-      function Nd(e, t, n, i, s) {
-        switch (this.c = s, this.d = t, this.a = n, s.e) {
-          case 4:
-            this.b = ei(e.b);
-            break;
-          case 1:
-            this.b = ei(e.d);
-            break;
-          case 2:
-            this.b = ei(e.c - i.j.a);
-            break;
-          case 3:
-            this.b = ei(e.a - i.j.b);
-            break;
-          default:
-            this.b = 0;
-        }
-      }
-      function aA(e, t, n, i, s) {
-        var l, h, v, p, m;
-        if (t)
-          for (v = t.mb(); v.G(); )
-            for (h = f(v.H(), 9), m = vC(h, (sr(), ri), n).mb(); m.G(); )
-              p = f(m.H(), 7), l = f(ci(li(s.d, p)), 80), l || (l = new uM(e), i.c[i.c.length] = l, FA(l, p, s));
-      }
-      function UZ(e, t) {
-        var n, i, s;
-        if (n = e.c, n.a.Y() > 1)
-          throw new tn("In straight hyperEdges there may be only one edge.");
-        rn((s = new Wt(n.a).a.bb().mb(), i = f(new Zt(s).a.H(), 21), f(i.yb(), 12)).a, new ot(t, e.b));
-      }
-      function oA(e, t, n) {
-        var i, s;
-        if (this.f = e, i = f(Kt(e.b, t), 126), s = i ? i.a : 0, fy(n, s), n >= (s / 2 | 0))
-          for (this.e = i ? i.c : null, this.d = s; n++ < s; )
-            TN(this);
-        else
-          for (this.c = i ? i.b : null; n-- > 0; )
-            sy(this);
-        this.b = t, this.a = null;
-      }
-      function kg(e, t) {
-        (typeof document !== Og || a.exports) && Ap(e(t)), typeof document === Og && typeof self !== Og && self.postMessage(t);
-      }
-      function i2(e, t) {
-        var n, i, s, l;
-        "x" in e.a && (s = f(Mn(e, "x"), 104), t.i.a = s.a), "y" in e.a && (l = f(Mn(e, "y"), 104), t.i.b = l.a), P2 in e.a && (i = f(Mn(e, P2), 104), t.j.a = i.a), D2 in e.a && (n = f(Mn(e, D2), 104), t.j.b = n.a);
-      }
-      function sA(e, t, n) {
-        var i, s;
-        fI(this), t == (_c(), Ks) ? vn(this.g, e.c) : vn(this.o, e.c), n == Ks ? vn(this.g, e.d) : vn(this.o, e.d), vn(this.c, e), i = Pi(e.c).b, s = Pi(e.d).b, vO(this, i, s, s), this.f = Hq(Pi(e.c).b, Pi(e.d).b);
-      }
-      function KZ(e) {
-        var t, n, i, s, l, h;
-        for (h = new Oc(e.d, e.e), l = Qc(h); l.G(); )
-          for (s = f(l.H(), 7), i = e.e == (we(), qe) ? s.b : s.e, n = new M(i); n.a < n.c.c.length; )
-            t = f(O(n), 12), !Fc(t) && t.c.f.d != t.d.f.d && (RZ(e, t), ++e.f, ++e.c);
-      }
-      function Eg(e, t, n) {
-        var i, s, l, h, v;
-        for (h = (Qt(), new jl(f(_e(t.a, n), 18))), v = new ji(h.b.Y()), s = new Qh(h.b.mb()); s.b.G(); )
-          i = f(s.b.H(), 37), l = f(Kt(e.a, i), 31), l || (l = Hee(i), un(e.a, i, l)), v.c[v.c.length] = l;
-        return v;
-      }
-      function ZZ(e, t) {
-        var n, i, s, l;
-        for (i = new fn(e.f.c, 0); i.b < i.d.Y(); )
-          for (n = (ut(i.b < i.d.Y()), f(i.d.sb(i.c = i.b++), 16)), l = t[i.b - 1], s = new fn(n.a, 0); s.b < s.d.Y(); )
-            ut(s.b < s.d.Y()), s.d.sb(s.c = s.b++), KS(s, l[s.b - 1]);
-      }
-      function uA(e) {
-        var t, n;
-        if (ds(f(z(e, (Ee(), dt)), 28)))
-          for (n = new M(e.f); n.a < n.c.c.length; )
-            t = f(O(n), 7), t.g == (we(), cr) && TM(t);
-        else {
-          for (n = new M(e.f); n.a < n.c.c.length; )
-            t = f(O(n), 7), TM(t);
-          ce(e, dt, (zn(), Xg));
-        }
-      }
-      function eC(e, t, n, i, s, l) {
-        var h, v, p, m;
-        if (h = i - n, h < 7) {
-          aK(t, n, i, l);
-          return;
-        }
-        if (p = n + s, v = i + s, m = p + (v - p >> 1), eC(t, e, p, m, -s, l), eC(t, e, m, v, -s, l), l.$b(e[m - 1], e[m]) <= 0) {
-          for (; n < i; )
-            Ga(t, n++, e[p++]);
-          return;
-        }
-        _U(e, p, m, v, t, n, i, l);
-      }
-      function cA(e) {
-        if (!e)
-          return C7(), K8;
-        var t = e.valueOf ? e.valueOf() : e;
-        if (t !== e) {
-          var n = q2[typeof t];
-          return n ? n(t) : E3(typeof t);
-        } else
-          return e instanceof Array || e instanceof r.Array ? new jP(e) : new Nw(e);
-      }
-      function a2(e, t, n) {
-        var i, s;
-        return i = n.c, s = n.d, e.g[i.b] <= e.i[t.b] && e.i[t.b] <= e.i[i.b] && e.g[s.b] <= e.i[t.b] && e.i[t.b] <= e.i[s.b] ? !(e.i[i.b] < e.i[s.b]) : e.i[i.b] < e.i[s.b];
-      }
-      function lA(e, t, n) {
-        var i, s, l, h, v, p, m, S;
-        for (m = 0, s = e.a[t], l = 0, h = s.length; l < h; ++l) {
-          for (i = s[l], S = new Oc(i, n), p = Qc(S); p.G(); )
-            v = f(p.H(), 7), un(e.f, v, gt(m)), gi(f(z(i, (Ee(), dt)), 28)) && ++m;
-          gi(f(z(i, (Ee(), dt)), 28)) || ++m;
-        }
-      }
-      function XZ(e, t, n) {
-        var i, s;
-        if (vt(t), n.G())
-          for (s = f(n.H(), 21), jc(t, C1(e.a, s.yb())), jc(t, e.b), jc(t, C1(e.a, s.zb())); n.G(); )
-            jc(t, e.a.c), i = f(n.H(), 21), jc(t, C1(e.a, i.yb())), jc(t, e.b), jc(t, C1(e.a, i.zb()));
-        return t;
-      }
-      function o2(e, t) {
-        var n, i;
-        return n = f(Bl(e.b, t), 19), n ? (i = e.Z(), i.jb(n), e.c -= n.Y(), n.Q(), xe(i, 137) ? (Qt(), new zS(f(i, 137))) : xe(i, 18) ? (Qt(), new jl(f(i, 18))) : xe(i, 20) ? P4(f(i, 20)) : (Qt(), new Cv(i))) : e.$();
-      }
-      function fA(e, t) {
-        var n;
-        t.d ? t.d.b = t.b : e.a = t.b, t.b ? t.b.d = t.d : e.e = t.d, !t.e && !t.c ? (n = f(Bl(e.b, t.a), 126), n.a = 0, ++e.c) : (n = f(Kt(e.b, t.a), 126), --n.a, t.e ? t.e.c = t.c : n.b = t.c, t.c ? t.c.e = t.e : n.c = t.e), --e.d;
-      }
-      function tC(e, t, n) {
-        switch (n.e) {
-          case 1:
-            return new ot(t.a, Xt(e.d.b, t.b));
-          case 2:
-            return new ot(je(e.c.a, t.a), t.b);
-          case 3:
-            return new ot(t.a, je(e.c.b, t.b));
-          case 4:
-            return new ot(Xt(t.a, e.d.a), t.b);
-        }
-        return new ot(t.a, t.b);
-      }
-      function QZ(e) {
-        var t, n, i, s;
-        for (t = 0, i = (mn(), e.length), s = i - 4, n = 0; n < s; )
-          t = e.charCodeAt(n + 3) + 31 * (e.charCodeAt(n + 2) + 31 * (e.charCodeAt(n + 1) + 31 * (e.charCodeAt(n) + 31 * t))), t = t | 0, n += 4;
-        for (; n < i; )
-          t = t * 31 + hj(e, n++);
-        return t = t | 0, t;
-      }
-      function hA(e, t) {
-        var n, i, s;
-        for (this.a = e, this.c = t, this.b = ve(Yz, Dr, 673, e.length, 0, 2), n = 0; n < e.length; ++n)
-          for (s = e[n].length, this.b[n] = ve(Yz, { 673: 1, 3: 1, 5: 1, 6: 1 }, 102, s, 0, 1), i = 0; i < s; ++i)
-            this.b[n][i] = new sN(this, e[n][i].c);
-      }
-      function j0(e, t, n, i, s, l, h) {
-        var v;
-        this.a = f(vt(e), 56), this.b = t, this.c = s, this.e = n, this.d = f(vt(i), 159), this.g = l, this.f = f(vt(h), 159), t && e.$b(n, n), s && e.$b(l, l), t && s && (v = e.$b(n, l), MU(v <= 0, n, l), v == 0 && _f(i != (yo(), Wa) | h != Wa));
-      }
-      function dA(e) {
-        if (this.a = e, e.c.f.g == (et(), Cn))
-          this.c = e.c, this.d = f(z(e.c.f, (le(), _r)), 32);
-        else if (e.d.f.g == Cn)
-          this.c = e.d, this.d = f(z(e.d.f, (le(), _r)), 32);
-        else
-          throw new tn("Edge " + e + " is not an external edge.");
-      }
-      function vA() {
-        vA = c, iH = Ca(new An(), (Pr(), yT)), rL = pi(new An(), up), oH = bi(pi(new An(), vp), dp), rH = bi(Ca(pi(new An(), bT), pT), wT), sH = pi(new An(), MT), aH = bi(new An(), kT), tH = bi(Ca(pi(R1(new An(), cp), fp), Th), lp), nH = bi(Ca(new An(), Th), sp);
-      }
-      function N0(e, t, n) {
-        var i, s, l, h;
-        return fi(n, XC), n == 0 ? T0(e, t) : (_f(Wv(e.b, t)), h = e.c.a, h ? (l = ve(Kn, Wn, 26, 1, 12, 1), i = wC(h, e.d, t, n, l), _1(e.c, h, i), l[0]) : (e.d.$b(t, t), s = new l0(t, n), YS(e.a, s, e.a), _1(e.c, null, s), 0));
-      }
-      function gA(e, t, n) {
-        var i, s, l, h, v, p;
-        for (i = 0, p = n, t || (i = n * (e.c.length - 1), p *= -1), l = new M(e); l.a < l.c.c.length; ) {
-          for (s = f(O(l), 9), ce(s, (Ee(), co), (Ko(), ep)), s.j.a = i, v = Jn(s, (we(), Be)).mb(); v.G(); )
-            h = f(v.H(), 7), h.i.a = i;
-          i += p;
-        }
-      }
-      function pt(e, t, n) {
-        var i;
-        if (i = f(Kt(e.b, t), 19), i)
-          return i.ib(n) ? (++e.c, !0) : !1;
-        if (i = e.Z(), i.ib(n))
-          return ++e.c, un(e.b, t, i), !0;
-        throw new py("New Collection violated the Collection spec");
-      }
-      function s2(e, t, n) {
-        var i, s, l;
-        for (NX(e, t, n), l = new Se(), s = new M(e.b.a.b); s.a < s.c.c.length; )
-          i = f(O(s), 25), t.D(i) && (Le(l, new fS(i, !0)), Le(l, new fS(i, !1)));
-        $K(e.d), ng(l, e.c, new ro(re(ie(rb, 1), Me, 160, 0, [e.d]))), LX(e, t, n);
-      }
-      function bA(e, t) {
-        var n, i, s, l, h;
-        for (e.c[t.k] = !0, Le(e.a, t), h = new M(t.f); h.a < h.c.c.length; )
-          for (l = f(O(h), 7), i = Dt(ya((dr(), new Qn(ur(re(ie(Ze, 1), Me, 1, 4, [l.b, l.e])))))); xt(i); )
-            n = f(Et(i), 12), s = hK(l, n).f, e.c[s.k] || bA(e, s);
-      }
-      function nC(e, t, n, i) {
-        var s, l, h;
-        if ("labels" in t.a) {
-          if (h = Mn(t, "labels"), !h.hc())
-            throw new gs("The 'labels' property of a node must be an array.", h, t);
-          for (l = h.hc(), s = 0; s < l.a.length; ++s)
-            xe(Fu(l, s), 69) && EJ(e, f(Fu(l, s), 69), n, i);
-        }
-      }
-      function pA(e, t, n) {
-        var i, s, l, h, v, p;
-        l = f(_e(t.b, 0), 12).c, i = l.f, s = i.g, p = f(_e(n.e, 0), 12).d, h = p.f, v = h.g, s == (et(), hn) ? ce(e, (le(), Mi), f(z(i, Mi), 7)) : ce(e, (le(), Mi), l), v == hn ? ce(e, (le(), Si), f(z(h, Si), 7)) : ce(e, (le(), Si), p);
-      }
-      function gu() {
-        gu = c, qi = new Dc("H_LEFT", 0), Ua = new Dc("H_CENTER", 1), Wi = new Dc("H_RIGHT", 2), ba = new Dc("V_TOP", 3), ga = new Dc("V_CENTER", 4), va = new Dc("V_BOTTOM", 5), Ei = new Dc("INSIDE", 6), Ui = new Dc("OUTSIDE", 7), Vi = new Dc("H_PRIORITY", 8);
-      }
-      function rC(e) {
-        Ym();
-        var t, n, i;
-        for (this.b = nz, this.c = iz, this.d = ($n(), Po), this.g = (x7(), tz), this.a = e, $w(this, new F()), A0(this), i = new M(e.b); i.a < i.c.c.length; )
-          n = f(O(i), 25), n.f || (t = new m0(re(ie(op, 1), Me, 25, 0, [n])), Le(e.a, t));
-      }
-      function iC(e, t) {
-        var n, i, s, l;
-        for (s = 1, t.j = !0, i = new M(Kl(t)); i.a < i.c.c.length; )
-          n = f(O(i), 89), e.c[n.b] || (e.c[n.b] = !0, l = _y(n, t), n.e ? s += iC(e, l) : !l.j && n.a == n.d.e - n.c.e && (n.e = !0, vn(e.p, n), s += iC(e, l)));
-        return s;
-      }
-      function u2(e) {
-        var t, n, i, s, l, h, v, p;
-        for (s = ki, i = Hr, n = new M(e.e.c); n.a < n.c.c.length; )
-          for (t = f(O(n), 16), h = new M(t.a); h.a < h.c.c.length; )
-            l = f(O(h), 9), p = ge(e.n[l.k]), v = p + ge(e.b[e.f[l.k].k]), s = s < p ? s : p, i = i > v ? i : v;
-        return i - s;
-      }
-      function wA(e) {
-        var t;
-        return t = new Dl(), Ta(t, "type", new Rc((Al(XB), XB.n))), Ta(t, x2, new Rc(e.f)), e.b && Ta(t, "value", e.b), e.a && Ta(t, "context", e.a), Ta(t, d8, new Rc(MS(new n1(`
-`), new Pf(new ro((e.g == null && (e.g = a4(e)), e.g)))))), t;
-      }
-      function JZ(e, t) {
-        return e.c < t.c ? -1 : e.c > t.c ? 1 : e.b < t.b ? -1 : e.b > t.b ? 1 : e.a != t.a ? e.a.b - t.a.b : e.d == 0 && t.d == 1 ? -1 : e.d == 1 && t.d == 0 ? 1 : 0;
-      }
-      function mA(e, t) {
-        var n, i, s, l, h;
-        if (t === e)
-          return !0;
-        if (!xe(t, 20) || (h = f(t, 20), e.Y() != h.Y()))
-          return !1;
-        for (l = h.mb(), i = e.mb(); i.G(); )
-          if (n = i.H(), s = l.H(), !(He(n) === He(s) || n != null && xo(n, s)))
-            return !1;
-        return !0;
-      }
-      function yA(e) {
-        !F2 && (F2 = Lee());
-        var t = e.replace(/[\x00-\x1f\xad\u0600-\u0603\u06dd\u070f\u17b4\u17b5\u200b-\u200f\u2028-\u202e\u2060-\u2064\u206a-\u206f\ufeff\ufff9-\ufffb"\\]/g, function(n) {
-          return SV(n);
-        });
-        return '"' + t + '"';
-      }
-      function kA(e, t) {
-        var n, i, s, l, h, v, p;
-        for (s = t == 1 ? bk : gk, i = (h = new Wt(s.a).a.bb().mb(), new Zt(h)); i.a.G(); )
-          for (n = (l = f(i.a.H(), 21), f(l.yb(), 59)), p = f(Pa(e.f.c, n), 18).mb(); p.G(); )
-            v = f(p.H(), 27), Cr(e.b.b, v.b), Cr(e.b.a, f(v.b, 25).f);
-      }
-      function EA(e, t, n) {
-        var i, s, l, h;
-        if (Nt(n, "Recursive layout", 2), t.b.c.length != 0) {
-          for (h = 1 / t.b.c.length, l = new M(t.b); l.a < l.c.c.length; )
-            s = f(O(l), 9), i = f(z(s, (le(), pl)), 55), i && (EA(e, i, Vl(n, h)), _Q(s, i));
-          OR(e.d, t), LC(t, n);
-        }
-        dR(t), Ct(n);
-      }
-      function aC(e, t) {
-        z4.call(this), this.d = new $r(), this.b = f(z(t, (le(), Oi)), 15).a * f(z(t, (zt(), Qs)), 15).a, this.e = this.b * f(z(t, tv), 15).a, this.a = new Ci(), this.c = new Ci(), this.j = new $a(e.j, e.k, 0, e.n - e.k), this.o = e.g, this.g.a = e.i, ER(this, e);
-      }
-      function c2(e, t) {
-        var n, i, s, l, h;
-        for (l = t == null ? 0 : e.b.Vc(t), i = (n = oS(e.a, l), n ?? []), h = 0; h < i.length; h++)
-          if (s = i[h], e.b.Uc(t, s.yb()))
-            return i.length == 1 ? (i.length = 0, e.a[A2](l)) : i.splice(h, 1), --e.c, Mm(e.b), s.zb();
-        return null;
-      }
-      function eX(e, t, n) {
-        var i;
-        i = null, t && (i = t.e), xd(e, new zf(t.i.a - i.b + n.a, t.i.b - i.d + n.b)), xd(e, new zf(t.i.a - i.b + n.a, t.i.b + t.j.b + i.a + n.b)), xd(e, new zf(t.i.a + t.j.a + i.c + n.a, t.i.b - i.d + n.b)), xd(e, new zf(t.i.a + t.j.a + i.c + n.a, t.i.b + t.j.b + i.a + n.b));
-      }
-      function I0(e, t) {
-        switch (t.e) {
-          case 2:
-            Bt(e, (we(), Be)), e.a.a = e.j.a, e.a.b = e.j.b / 2;
-            break;
-          case 4:
-            Bt(e, (we(), qe)), e.a.a = 0, e.a.b = e.j.b / 2;
-            break;
-          case 1:
-            Bt(e, (we(), rt)), e.a.a = e.j.a / 2, e.a.b = 0;
-            break;
-          case 3:
-            Bt(e, (we(), ct)), e.a.a = e.j.a / 2, e.a.b = e.j.b;
-        }
-      }
-      function tX(e, t) {
-        Df();
-        var n, i, s;
-        if (t === e)
-          return !0;
-        if (xe(t, 207)) {
-          if (s = f(t, 207), e.Y() != s.Y() || Uf(e).Y() != s.bb().Y())
-            return !1;
-          for (i = s.bb().mb(); i.G(); )
-            if (n = f(i.H(), 83), e.Cb(n.Zb()) != n.Yb())
-              return !1;
-          return !0;
-        }
-        return !1;
-      }
-      function Xl(e, t) {
-        var n, i, s, l, h, v;
-        return l = e.a * R2 + e.b * 1502, v = e.b * R2 + 11, n = Math.floor(v * M2), l += n, v -= n * fx, l %= fx, e.a = l, e.b = v, t <= 24 ? xS(e.a * YL[t]) : (s = e.a * (1 << t - 24), h = xS(e.b * FL[t]), i = s + h, i >= 2147483648 && (i -= 4294967296), i);
-      }
-      function oC(e, t, n) {
-        var i, s, l;
-        if (t != n) {
-          i = t;
-          do
-            dn(e, i.d), l = f(z(i, (le(), wl)), 9), l && (s = i.a, ua(e, s.b, s.d), dn(e, l.i), i = Ti(l));
-          while (l);
-          i = n;
-          do
-            ou(e, i.d), l = f(z(i, (le(), wl)), 9), l && (s = i.a, WF(e, s.b, s.d), ou(e, l.i), i = Ti(l));
-          while (l);
-        }
-      }
-      function nX(e, t) {
-        var n, i, s, l, h, v;
-        for (n = new Se(), v = new wS(), s = (h = new Wt(e.a).a.bb().mb(), new Zt(h)); s.a.G(); )
-          i = (l = f(s.a.H(), 21), f(l.yb(), 12)), v2(v, i.c, i, null), v2(v, i.d, i, null);
-        for (; v.a; )
-          Le(n, RQ(v, t, gi(f(z(t, (Ee(), dt)), 28))));
-        return n;
-      }
-      function rX(e, t) {
-        var n, i, s, l, h;
-        for (l = new M(e.e.a); l.a < l.c.c.length; )
-          if (s = f(O(l), 61), s.c.c.length == s.g.c.length) {
-            for (i = s.e, h = GZ(s), n = s.e - f(h.a, 24).a + 1; n < s.e + f(h.b, 24).a; n++)
-              t[n] < t[i] && (i = n);
-            t[i] < t[s.e] && (--t[s.e], ++t[i], s.e = i);
-          }
-      }
-      function SA(e, t) {
-        var n, i, s, l, h, v, p;
-        for (s = t == 1 ? bk : gk, i = (h = new Wt(s.a).a.bb().mb(), new Zt(h)); i.a.G(); )
-          for (n = (l = f(i.a.H(), 21), f(l.yb(), 59)), p = f(Pa(e.f.c, n), 18).mb(); p.G(); )
-            v = f(p.H(), 27), Le(e.b.b, f(v.b, 25)), Le(e.b.a, f(v.b, 25).f);
-      }
-      function CA(e) {
-        Rm();
-        var t, n, i, s, l, h, v;
-        for (n = (On(), new yd()), s = new M(e.e.c); s.a < s.c.c.length; )
-          for (i = f(O(s), 16), h = new M(i.a); h.a < h.c.c.length; )
-            l = f(O(h), 9), v = e.f[l.k], t = f(wy(n, v), 20), t || (t = new Se(), gg(n, v, t)), t.ib(l);
-        return n;
-      }
-      function iX(e, t) {
-        var n, i, s, l;
-        for (i = new M(e.a.a); i.a < i.c.c.length; )
-          n = f(O(i), 78), n.i = !0;
-        for (l = new M(e.a.b); l.a < l.c.c.length; )
-          s = f(O(l), 25), s.p = Pt(ge(jt(e.f.B(new pr(s, t))))), s.f.i = s.f.i & Pt(ge(jt(e.f.B(new pr(s, t)))));
-        return e;
-      }
-      function xA(e, t) {
-        var n, i, s, l;
-        for (s = ca(En(t)), i = Jt(s, 0); i.b != i.d.c; )
-          return n = f(Ft(i), 12), l = n.d.f, l.g == (et(), Ii) && !(Pt(ge(jt(z(l, (le(), vc))))) && z(l, lt) != null) ? (Cr(l.d.a, l), cn(n.c, null), cn(n.d, null), xA(e, l)) : t;
-        return t;
-      }
-      function aX(e, t) {
-        var n, i, s, l, h, v, p;
-        if (!t.e)
-          throw new tn("The input edge is not a tree edge.");
-        for (l = null, s = yr, i = new M(e.d); i.a < i.c.c.length; )
-          n = f(O(i), 89), v = n.c, p = n.d, a2(e, v, t) && !a2(e, p, t) && (h = p.e - v.e - n.a, h < s && (s = h, l = n));
-        return l;
-      }
-      function TA(e, t) {
-        var n, i, s, l, h;
-        return l = t.a, l.c.f == t.b ? h = l.d : h = l.c, l.c.f == t.b ? i = l.c : i = l.d, s = dK(e.a, h, i), s > 0 && s < Zo ? (n = bX(e.a, i.f, s), zI(e.a, i.f, -n), n > 0) : s < 0 && -s < Zo ? (n = pX(e.a, i.f, -s), zI(e.a, i.f, n), n > 0) : !1;
-      }
-      function oX(e, t, n, i, s) {
-        var l, h;
-        QI(ln(re(ie(_t, 1), Ht, 10, 0, [s.f.i, s.i, s.a])), n) || (t.c == s ? T1(t.a, 0, new qn(n)) : rn(t.a, new qn(n)), i && !Pc(e.a, n) && (h = f(z(t, (Ee(), Un)), 44), h || (h = new Ci(), ce(t, Un, h)), l = new qn(n), wr(h, l, h.c.b, h.c), vn(e.a, l)));
-      }
-      function LA(e) {
-        var t, n, i, s, l, h, v;
-        for (t = 0, i = new M(e.a); i.a < i.c.c.length; )
-          for (n = f(O(i), 9), l = Dt(En(n)); xt(l); )
-            s = f(Et(l), 12), e == s.d.f.d && s.c.g == (we(), qe) && (h = Pi(s.c).b, v = Pi(s.d).b, t = t > (v - h <= 0 ? 0 - (v - h) : v - h) ? t : v - h <= 0 ? 0 - (v - h) : v - h);
-        return t;
-      }
-      function sX(e, t) {
-        var n, i, s;
-        if (He(t) === He(vt(e)))
-          return !0;
-        if (!xe(t, 20) || (i = f(t, 20), s = e.Y(), s != i.Y()))
-          return !1;
-        if (xe(i, 63)) {
-          for (n = 0; n < s; n++)
-            if (!Gl(e.sb(n), i.sb(n)))
-              return !1;
-          return !0;
-        } else
-          return GK(e.mb(), i.mb());
-      }
-      function PA(e, t) {
-        var n, i, s, l, h, v, p, m;
-        if (s = e.b[t.k], s >= 0)
-          return s;
-        for (l = 1, v = new M(t.f); v.a < v.c.c.length; )
-          for (h = f(O(v), 7), i = new M(h.e); i.a < i.c.c.length; )
-            n = f(O(i), 12), m = n.d.f, t != m && (p = PA(e, m), l = l > p + 1 ? l : p + 1);
-        return rK(e, t, l), l;
-      }
-      function DA(e, t, n) {
-        var i, s, l, h, v, p;
-        if (i = 0, e.b != 0 && t.b != 0) {
-          l = Jt(e, 0), h = Jt(t, 0), v = ge(Ot(Ft(l))), p = ge(Ot(Ft(h))), s = !0;
-          do
-            v > p - n && v < p + n && ++i, v <= p && l.b != l.d.c ? v = ge(Ot(Ft(l))) : p <= v && h.b != h.d.c ? p = ge(Ot(Ft(h))) : s = !1;
-          while (s);
-        }
-        return i;
-      }
-      function uX(e, t) {
-        switch (Q4(e)) {
-          case 5:
-            return ko(t);
-          case 6:
-            return Yf(t);
-          case 7:
-            return Ff(t);
-          case 0:
-            return Uy(t, e.__elementTypeId$);
-          case 2:
-            return Km(t) && t.ad !== u;
-          case 1:
-            return Km(t) && t.ad !== u || Uy(t, e.__elementTypeId$);
-          default:
-            return !0;
-        }
-      }
-      function cX(e, t) {
-        var n, i, s, l, h;
-        return t &= 63, n = e.h, i = (n & 524288) != 0, i && (n |= -1048576), t < 22 ? (h = n >> t, l = e.m >> t | n << 22 - t, s = e.l >> t | e.m << 22 - t) : t < 44 ? (h = i ? ec : 0, l = n >> t - 22, s = e.m >> t - 22 | n << 44 - t) : (h = i ? ec : 0, l = i ? Va : 0, s = n >> t - 44), Gu(s & Va, l & Va, h & ec);
-      }
-      function jA(e, t) {
-        switch (e.e) {
-          case 1:
-            switch (t.e) {
-              case 1:
-                return 1;
-              case 4:
-                return 2;
-              case 3:
-                return 3;
-              case 2:
-                return 4;
-            }
-            break;
-          case 2:
-            switch (t.e) {
-              case 1:
-                return 1;
-              case 2:
-                return 2;
-              case 3:
-                return 3;
-              case 4:
-                return 4;
-            }
-            break;
-          default:
-            throw new tn(ux);
-        }
-        return 0;
-      }
-      function lX(e, t, n) {
-        var i, s, l, h, v, p;
-        i = new Se(), i.c[i.c.length] = t, p = t, v = 0;
-        do
-          p = hee(e, p), p && (i.c[i.c.length] = p), ++v;
-        while (p);
-        for (h = (n - (i.c.length - 1) * e.d.d) / i.c.length, l = new M(i); l.a < l.c.c.length; )
-          s = f(O(l), 9), s.j.a = h;
-        return new pr(gt(v), h);
-      }
-      function fX(e, t, n) {
-        var i, s, l, h, v, p;
-        i = new Se(), i.c[i.c.length] = t, p = t, v = 0;
-        do
-          p = QJ(e, p), p && (i.c[i.c.length] = p), ++v;
-        while (p);
-        for (h = (n - (i.c.length - 1) * e.d.d) / i.c.length, l = new M(i); l.a < l.c.c.length; )
-          s = f(O(l), 9), s.j.a = h;
-        return new pr(gt(v), h);
-      }
-      function hX(e) {
-        var t, n, i, s, l, h;
-        for (s = f(_e(e.f, 0), 7), h = 0, i = Dt(ya((dr(), new Qn(ur(re(ie(Ze, 1), Me, 1, 4, [new Zh(s), new Lf(s)])))))); xt(i); )
-          n = f(Et(i), 7), h += n.f.i.a + n.i.a + n.a.a;
-        t = f(z(e, (Ee(), wu)), 10), l = t ? t.a : 0, e.i.a = h / (s.b.c.length + s.e.c.length) - l;
-      }
-      function dX(e, t) {
-        var n, i, s, l;
-        if (t < 2 * e.c)
-          throw new tn("The knot vector must have at least two time the dimension elements.");
-        for (e.j = 0, e.i = 1, i = 0; i < e.c; i++)
-          e.g.ib(0);
-        for (l = t + 1 - 2 * e.c, s = 1; s < l; s++)
-          e.g.ib(s / l);
-        if (e.e)
-          for (n = 0; n < e.c; n++)
-            e.g.ib(1);
-      }
-      function sC(e) {
-        var t, n;
-        return n = e.c, e.c = 0, P7(e.f, e.i), e.e ? e.g ? e.e.d >= e.g.d ? (t = e.f, t.e = KI(e.e, t), t.g = e.g, t.a = e.a - 1, t.j = Ku(e.j, n), vu(t)) : (t = e.i, t.g = ZI(e.g, t), t.e = e.e, t.a = e.a - 1, t.j = Ku(e.j, n), vu(t)) : e.e : e.g;
-      }
-      function vX(e) {
-        var t, n, i, s, l, h;
-        for (s = new M(e.a); s.a < s.c.c.length; )
-          i = f(O(s), 9), i.g == (et(), er) && (l = f(z(i, (le(), bl)), 9), n = i.f, t = (Sn(0, n.c.length), f(n.c[0], 7)), h = f(z(t, lt), 7), h.g == (we(), rt) && i.k > l.k ? Bt(h, ct) : h.g == ct && l.k > i.k && Bt(h, rt));
-      }
-      function gX(e, t, n) {
-        var i, s, l, h, v, p, m;
-        for (m = e.b, h = 0, l = new M(e.a.b); l.a < l.c.c.length; )
-          s = f(O(l), 33), h = je(h, s.j.a);
-        return p = cee(e.a.c, e.a.d, t, n, h), na(e.a.a, Yy(p)), v = U3(e.a.b, p.a, m), i = new rg((!p.k && (p.k = new Jy(Sy(p))), p.k)), x4(i), v ? m4(i, v) : i;
-      }
-      function bX(e, t, n) {
-        var i, s, l, h, v, p, m;
-        i = n, s = t;
-        do
-          s = e.a[s.k], h = (m = e.f[s.k], ge(e.n[m.k]) + ge(e.d[s.k]) - s.e.d), v = kW(s, s.d ? Di(s.d.a, s, 0) : -1), v && (l = (p = e.f[v.k], ge(e.n[p.k]) + ge(e.d[v.k]) + v.j.b + v.e.a), i = Xt(i, h - (l + Kv(e.j, s, v))));
-        while (t != s);
-        return i;
-      }
-      function pX(e, t, n) {
-        var i, s, l, h, v, p, m;
-        i = n, s = t;
-        do
-          s = e.a[s.k], l = (m = e.f[s.k], ge(e.n[m.k]) + ge(e.d[s.k]) + s.j.b + s.e.a), v = XW(s, s.d ? Di(s.d.a, s, 0) : -1), v && (h = (p = e.f[v.k], ge(e.n[p.k]) + ge(e.d[v.k]) - v.e.d), i = Xt(i, h - (l + Kv(e.j, s, v))));
-        while (t != s);
-        return i;
-      }
-      function uC(e, t, n) {
-        var i, s, l;
-        if (fi(n, XC), n == 0)
-          return T0(e, t);
-        l = e.c.a, s = ve(Kn, Wn, 26, 1, 12, 1);
-        try {
-          if (!Wv(e.b, t) || !l)
-            return 0;
-          i = EC(l, e.d, t, n, s);
-        } catch (h) {
-          if (h = Ur(h), xe(h, 119))
-            return 0;
-          if (xe(h, 76))
-            return 0;
-          throw Kr(h);
-        }
-        return _1(e.c, l, i), s[0];
-      }
-      function wX(e, t) {
-        var n, i, s, l, h;
-        return e.b ? (i = f(nr(e.e, (Ee(), Yg)), 65), s = i.b + i.c, n = i.d + i.a) : (s = t * 2, n = t * 2), h = je(e.o[1] > 0 ? s + e.i[1] * t + e.n[1] : 0, e.o[3] > 0 ? s + e.i[3] * t + e.n[3] : 0), l = je(e.o[4] > 0 ? n + e.i[4] * t + e.n[4] : 0, e.o[2] > 0 ? n + e.i[2] * t + e.n[2] : 0), new ot(h, l);
-      }
-      function NA(e) {
-        var t, n, i, s, l, h;
-        for (h = f(Vn(e.a, ve(kr, Ni, 9, e.a.c.length, 0, 1)), 51), IS(h, new In()), n = null, s = 0, l = h.length; s < l && (i = h[s], i.g == (et(), Cn)); ++s)
-          t = f(z(i, (le(), _r)), 32), !(t != (we(), qe) && t != Be) && (n && f(z(n, Dh), 20).ib(i), n = i);
-      }
-      function Sg(e, t, n, i, s) {
-        var l, h, v, p;
-        for (p = new Oc(t, i), v = Qc(p); v.G(); )
-          l = f(v.H(), 7), un(e.k, l, gt(f(Kt(e.k, l), 24).a + f(ci(li(s.d, n)), 24).a));
-        for (p = new Oc(n, i), h = Qc(p); h.G(); )
-          l = f(h.H(), 7), un(e.k, l, gt(f(Kt(e.k, l), 24).a - f(ci(li(s.d, t)), 24).a));
-      }
-      function A(e, t, n) {
-        var i = W0, s, l = i[e], h = l instanceof Array ? l[0] : null;
-        l && !h ? w = l : (w = (s = t && t.prototype, !s && (s = W0[t]), EV(s)), w._c = n, w.constructor = w, !t && (w.ad = u), i[e] = w);
-        for (var v = 3; v < arguments.length; ++v)
-          arguments[v].prototype = w;
-        h && (w.$c = h);
-      }
-      function mX(e) {
-        if (e.Sc()) {
-          var t = e.c;
-          t.Tc() ? e.n = "[" + t.k : t.Sc() ? e.n = "[" + t.Qc() : e.n = "[L" + t.Qc() + ";", e.b = t.Pc() + "[]", e.j = t.Rc() + "[]";
-          return;
-        }
-        var n = e.i, i = e.d;
-        i = i.split("/"), e.n = Vy(".", [n, Vy("$", i)]), e.b = Vy(".", [n, Vy(".", i)]), e.j = i[i.length - 1];
-      }
-      function cC(e, t, n) {
-        var i;
-        if (!n)
-          return 0;
-        if (i = e.d.$b(e.b.g, n.b), i > 0)
-          return cC(e, t, n.g);
-        if (i == 0)
-          switch (e.b.f.e) {
-            case 0:
-              return Tr(t._b(n), t.ac(n.g));
-            case 1:
-              return t.ac(n.g);
-            default:
-              throw new z5();
-          }
-        else
-          return Tr(Tr(t.ac(n.g), t._b(n)), cC(e, t, n.e));
-      }
-      function lC(e, t, n) {
-        var i;
-        if (!n)
-          return 0;
-        if (i = e.d.$b(e.b.e, n.b), i < 0)
-          return lC(e, t, n.e);
-        if (i == 0)
-          switch (e.b.d.e) {
-            case 0:
-              return Tr(t._b(n), t.ac(n.e));
-            case 1:
-              return t.ac(n.e);
-            default:
-              throw new z5();
-          }
-        else
-          return Tr(Tr(t.ac(n.e), t._b(n)), lC(e, t, n.g));
-      }
-      function IA(e, t, n, i) {
-        var s, l, h, v;
-        return h = new qa(e), Ha(h, (et(), hn)), ce(h, (le(), lt), t), ce(h, (Ee(), dt), (zn(), ni)), ce(h, Mi, n), ce(h, Si, i), l = new Yn(), Bt(l, (we(), qe)), cn(l, h), v = new Yn(), Bt(v, Be), cn(v, h), kn(t, l), s = new bs(), hu(s, t), ce(s, Un, null), Bn(s, v), kn(s, i), h;
-      }
-      function MA(e, t) {
-        var n, i, s, l, h, v, p, m, S, x;
-        for (n = 0, h = e.j, v = 0, p = h.length; v < p; ++v)
-          for (l = h[v], x = new Oc(l, t), S = Qc(x); S.G(); )
-            for (m = f(S.H(), 7), s = Dt(ya((dr(), new Qn(ur(re(ie(Ze, 1), Me, 1, 4, [m.b, m.e])))))); xt(s); )
-              i = f(Et(s), 12), Fc(i) || (n += HA(e, i, m));
-        return n;
-      }
-      function yX(e, t) {
-        return e.c < t.c ? -1 : e.c > t.c ? 1 : e.b < t.b ? -1 : e.b > t.b ? 1 : e.a != t.a ? au(e.a) - au(t.a) : e.d == (e0(), cb) && t.d == ub ? -1 : e.d == ub && t.d == cb ? 1 : 0;
-      }
-      function kX(e) {
-        var t, n, i, s, l, h;
-        for (s = new Wr(), i = new M(e.d.a); i.a < i.c.c.length; )
-          n = f(O(i), 61), n.c.c.length == 0 && wr(s, n, s.c.b, s.c);
-        if (s.b > 1)
-          for (t = Fv(iS(new Jh(), e.b++), e.d), h = Jt(s, 0); h.b != h.d.c; )
-            l = f(Ft(h), 61), uh(Of(Rf(Bf(Af(new Pl(), 1), 0), t), l));
-      }
-      function EX(e, t, n, i) {
-        var s, l, h, v, p, m;
-        for (m = 0, h = new M(e.a.b); h.a < h.c.c.length; )
-          l = f(O(h), 33), m = je(m, l.j.a);
-        return p = $J(e.a.c, t, e.a.d, i, O3(e.b), n), na(e.a.a, Yy(p)), v = U3(e.a.b, p.a, e.b), s = new rg((!p.k && (p.k = new Jy(Sy(p))), p.k)), x4(s), v ? m4(s, v) : s;
-      }
-      function l2(e, t) {
-        var n, i, s, l, h;
-        for (i = new M(e.b); i.a < i.c.c.length; )
-          n = f(O(i), 33), ce(n, (le(), lo), t);
-        for (h = new M(e.c.c); h.a < h.c.c.length; )
-          s = f(O(h), 33), ce(s, (le(), lo), t);
-        for (l = new M(e.d.c); l.a < l.c.c.length; )
-          s = f(O(l), 33), ce(s, (le(), lo), t);
-      }
-      function Xc() {
-        Xc = c, gp = new Il(Rd, 0), ab = new Il("NIKOLOV", 1), ob = new Il("NIKOLOV_PIXEL", 2), _T = new Il("NIKOLOV_IMPROVED", 3), GT = new Il("NIKOLOV_IMPROVED_PIXEL", 4), HT = new Il("DUMMYNODE_PERCENTAGE", 5), $T = new Il("NODECOUNT_PERCENTAGE", 6), bp = new Il("NO_BOUNDARY", 7);
-      }
-      function OA(e, t) {
-        var n, i, s, l, h;
-        if (l = 0, h = f(ci(li(t.d, e)), 24), !h)
-          return 0;
-        for (s = Dt(ya((dr(), new Qn(ur(re(ie(Ze, 1), Me, 1, 4, [e.b, e.e])))))); xt(s); )
-          i = f(Et(s), 12), i.c == e ? n = f(Kt(t, i.d), 24) : n = f(Kt(t, i.c), 24), n && h.a > n.a && (l = Jr(l, h.a - n.a - 1));
-        return l;
-      }
-      function SX(e) {
-        var t, n;
-        switch (t = f(z(e, (Ee(), Yd)), 15).a, n = f(z(e, Fd), 15).a, ce(e, Fd, new Ut(t)), ce(e, Yd, new Ut(n)), f(z(e, co), 103).e) {
-          case 1:
-            ce(e, co, (Ko(), rp));
-            break;
-          case 2:
-            ce(e, co, (Ko(), J0));
-            break;
-          case 3:
-            ce(e, co, (Ko(), tp));
-            break;
-          case 4:
-            ce(e, co, (Ko(), np));
-        }
-      }
-      function CX(e) {
-        var t, n, i, s, l;
-        for (s = (_n(), new _o(Go(vs(e.a, new T())))); xt(s); )
-          for (i = f(Et(s), 9), i.g == (et(), Ka) && (l = hO(i) ? (Gi(), Us) : (Gi(), ns), ce(i, (le(), lo), l)), n = Dt(En(i)); xt(n); )
-            t = f(Et(n), 12), l = Pt(ge(jt(z(t, (le(), Xs))))) ? (Gi(), ns) : (Gi(), Us), l2(t, l);
-      }
-      function xX(e) {
-        var t, n, i, s, l;
-        for (s = (_n(), new _o(Go(vs(e.a, new T())))); xt(s); )
-          for (i = f(Et(s), 9), i.g == (et(), Ka) && (l = hO(i) ? (Gi(), ns) : (Gi(), Us), ce(i, (le(), lo), l)), n = Dt(En(i)); xt(n); )
-            t = f(Et(n), 12), l = Pt(ge(jt(z(t, (le(), Xs))))) ? (Gi(), Us) : (Gi(), ns), l2(t, l);
-      }
-      function fC(e, t, n) {
-        var i, s, l;
-        for (l = new M(e.e); l.a < l.c.c.length; )
-          i = f(O(l), 118), i.b.d < 0 && i.c > 0 && (i.b.c -= i.c, i.b.c <= 0 && i.b.f > 0 && rn(t, i.b));
-        for (s = new M(e.b); s.a < s.c.c.length; )
-          i = f(O(s), 118), i.a.d < 0 && i.c > 0 && (i.a.f -= i.c, i.a.f <= 0 && i.a.c > 0 && rn(n, i.a));
-      }
-      function hC(e, t, n) {
-        var i, s, l;
-        for (l = new M(e.j); l.a < l.c.c.length; )
-          i = f(O(l), 117), i.b.i < 0 && i.c > 0 && (i.b.e -= i.c, i.b.e <= 0 && i.b.k > 0 && rn(t, i.b));
-        for (s = new M(e.d); s.a < s.c.c.length; )
-          i = f(O(s), 117), i.a.i < 0 && i.c > 0 && (i.a.k -= i.c, i.a.k <= 0 && i.a.e > 0 && rn(n, i.a));
-      }
-      function TX(e) {
-        var t, n, i, s, l;
-        switch (l = e.d.c + e.e.c, l) {
-          case 0:
-            return S7(), q8;
-          case 1:
-            return i = f(nA(new Ul(new iu(e).a)), 21), eq(i.yb(), i.zb());
-          default:
-            for (s = (On(), new yd()), n = new Ul(new iu(e).a); n.b; )
-              t = Sd(n), gg(s, vt(t.yb()), vt(t.zb()));
-            return new J5(s);
-        }
-      }
-      function LX(e, t, n) {
-        var i, s, l;
-        for (s = new M(e.b.a.b); s.a < s.c.c.length; )
-          i = f(O(s), 25), t.D(i) && (l = ge(Ot(n.B(i))), l > 0 && (!(Nl(e.b.d) && i.q.d) && !(Qw(e.b.d) && i.q.b) && (i.j.e += 0 > l / 2 - 0.5 ? 0 : l / 2 - 0.5), !(Nl(e.b.d) && i.q.a) && !(Qw(e.b.d) && i.q.c) && (i.j.b -= l - 1)));
-      }
-      function PX(e, t) {
-        switch (e.e) {
-          case 1:
-            switch (t.e) {
-              case 1:
-                return cx;
-              case 4:
-                return 0.5;
-              case 3:
-                return lx;
-              case 2:
-                return L8;
-            }
-            break;
-          case 2:
-            switch (t.e) {
-              case 1:
-                return cx;
-              case 2:
-                return 0.5;
-              case 3:
-                return lx;
-              case 4:
-                return L8;
-            }
-            break;
-          default:
-            throw new tn(ux);
-        }
-        return 0;
-      }
-      function f2(e, t) {
-        var n, i, s, l;
-        for (l = new fn(e, 0), n = (ut(l.b < l.d.Y()), f(l.d.sb(l.c = l.b++), 48)); l.b < l.d.Y(); )
-          i = (ut(l.b < l.d.Y()), f(l.d.sb(l.c = l.b++), 48)), s = new XS(i.c, n.d, t), ut(l.b > 0), l.a.sb(l.c = --l.b), su(l, s), ut(l.b < l.d.Y()), l.d.sb(l.c = l.b++), s.a = !1, n = i;
-      }
-      function AA(e) {
-        var t, n, i, s, l, h;
-        for (s = f(z(e, (le(), xp)), 7), h = new M(e.f); h.a < h.c.c.length; ) {
-          for (l = f(O(h), 7), i = new M(l.e); i.a < i.c.c.length; )
-            return t = f(O(i), 12), kn(t, s), l;
-          for (n = new M(l.b); n.a < n.c.c.length; )
-            return t = f(O(n), 12), Bn(t, s), l;
-        }
-        return null;
-      }
-      function RA(e, t, n, i, s) {
-        var l, h, v, p, m, S;
-        for (h = t, l = 0, v = !1, S = new Oc(n, i), m = Qc(S); m.G(); )
-          p = f(m.H(), 7), v = !0, un(e.k, p, gt(h)), (gi(f(z(n, (Ee(), dt)), 28)) || p.b.c.length + p.e.c.length > 1) && (++l, ++h);
-        return !gi(f(z(n, (Ee(), dt)), 28)) && v && (++l, ++h), un(s, n, gt(l)), h;
-      }
-      function BA(e) {
-        var t, n, i, s, l, h, v, p, m, S, x, L;
-        for (h = e.b.mb(), v = f(h.H(), 92), S = v.a.a, m = S > al, p = S < V0; h.G(); ) {
-          if (n = v, l = S, s = m, i = p, v = f(h.H(), 92), S = v.a.a, m = S > al, p = S < V0, !(m || p))
-            return sg(v.b);
-          if (s && p || i && m)
-            return t = l / (l - S), x = sg(n.b), L = sg(v.b), t * x + (1 - t) * L;
-        }
-        return 0;
-      }
-      function zA(e) {
-        var t, n, i, s, l, h, v, p, m, S, x, L;
-        for (h = e.b.mb(), v = f(h.H(), 92), S = v.a.b, m = S > al, p = S < V0; h.G(); ) {
-          if (n = v, l = S, s = m, i = p, v = f(h.H(), 92), S = v.a.b, m = S > al, p = S < V0, !(m || p))
-            return sg(v.b);
-          if (s && p || i && m)
-            return t = l / (l - S), x = sg(n.b), L = sg(v.b), t * x + (1 - t) * L;
-        }
-        return 0;
-      }
-      function HA(e, t, n) {
-        var i, s;
-        return i = 0, Xm(t) ? Pc(e.g, t) ? (uC(e.i, gt(Mc(e, t.c)), 1) > 0, uC(e.i, gt(Mc(e, t.d)), 1) > 0, Cm(e.g, t), i += xK(e, t, e.i)) : (vn(e.g, t), N0(e.i, gt(Mc(e, t.c)), 1), N0(e.i, gt(Mc(e, t.d)), 1)) : (s = T0(e.i, gt(f(Kt(e.k, n), 24).a)), i += e.g.a.Y() - s), i;
-      }
-      function DX(e) {
-        switch (e.e) {
-          case 0:
-            return mH;
-          case 1:
-            return bH;
-          case 2:
-            return gH;
-          case 3:
-            return EH;
-          case 4:
-            return kH;
-          case 5:
-            return LH;
-          case 6:
-            return TH;
-          case 7:
-            return yH;
-          case 8:
-            return pH;
-          case 9:
-            return wH;
-          case 11:
-            return CH;
-          case 10:
-            return SH;
-          default:
-            return xH;
-        }
-      }
-      function M0(e) {
-        switch (e.e) {
-          case 0:
-            return No;
-          case 1:
-            return Ds;
-          case 2:
-            return lc;
-          case 3:
-            return Eu;
-          case 4:
-            return Su;
-          case 5:
-            return is;
-          case 6:
-            return dc;
-          case 7:
-            return hc;
-          case 8:
-            return fc;
-          case 9:
-            return rs;
-          case 10:
-            return gl;
-          case 11:
-            return Cu;
-          default:
-            return ff;
-        }
-      }
-      function Cg(e) {
-        switch (e.e) {
-          case 0:
-            return is;
-          case 1:
-            return dc;
-          case 2:
-            return hc;
-          case 3:
-            return No;
-          case 4:
-            return Ds;
-          case 5:
-            return lc;
-          case 6:
-            return Eu;
-          case 7:
-            return Su;
-          case 8:
-            return fc;
-          case 9:
-            return rs;
-          case 10:
-            return gl;
-          case 11:
-            return Cu;
-          default:
-            return ff;
-        }
-      }
-      function dC(e) {
-        switch (e.e) {
-          case 0:
-            return lc;
-          case 1:
-            return Eu;
-          case 2:
-            return Su;
-          case 3:
-            return is;
-          case 4:
-            return dc;
-          case 5:
-            return hc;
-          case 6:
-            return No;
-          case 7:
-            return Ds;
-          case 8:
-            return fc;
-          case 9:
-            return rs;
-          case 10:
-            return gl;
-          case 11:
-            return Cu;
-          default:
-            return ff;
-        }
-      }
-      function jX(e) {
-        var t, n, i, s, l, h, v, p;
-        for (n = (On(), new yd()), v = new $m(($o(), new ro(e.f))), h = (s = new Wt(v.a).a.bb().mb(), new Zt(s)); h.a.G(); ) {
-          if (l = (i = f(h.a.H(), 21), f(i.yb(), 9)), !l) {
-            Rl();
-            break;
-          }
-          p = e.i[l.k], t = f(wy(n, p), 20), t || (t = new Se(), gg(n, p, t)), t.ib(l);
-        }
-        return n;
-      }
-      function NX(e, t, n) {
-        var i, s, l;
-        for (s = new M(e.b.a.b); s.a < s.c.c.length; )
-          i = f(O(s), 25), t.D(i) && (l = ge(Ot(n.B(i))), l > 0 && (!(Nl(e.b.d) && i.q.d) && !(Qw(e.b.d) && i.q.b) && (i.j.e -= 0 > l / 2 - 0.5 ? 0 : l / 2 - 0.5), !(Nl(e.b.d) && i.q.a) && !(Qw(e.b.d) && i.q.c) && (i.j.b += 0 > l - 1 ? 0 : l - 1)));
-      }
-      function Qc(e) {
-        var t, n, i;
-        switch (i = e.a.f, e.b) {
-          case 0:
-            return new M(e.a.f);
-          case 1:
-            return zl((n = new I4(i), n), Y3(e));
-          case 2:
-            switch (e.c.e) {
-              case 2:
-              case 1:
-                return zl(new M(i), Y3(e));
-              case 3:
-              case 4:
-                return zl((t = new I4(i), t), Y3(e));
-            }
-        }
-        throw new jf("PortOrder not implemented.");
-      }
-      function IX(e, t) {
-        var n;
-        e.d && (t.c != e.e.c || VW(e.e.b, t.b)) && (Le(e.f, e.d), e.a = e.d.d + e.d.c, e.d = null, e.e = null), xF(t.b) ? e.c = t : e.b = t, (t.b == (ug(), uc) && !t.a || t.b == hl && t.a || t.b == lf && t.a || t.b == dl && !t.a) && e.c && e.b && (n = new $a(e.a, e.c.d, t.c - e.a, e.b.d - e.c.d), e.d = n, e.e = t);
-      }
-      function Jc(e, t, n, i) {
-        this.e = e, this.j = f(z(e, (le(), ml)), 134), this.f = ve(kr, Ni, 9, t, 0, 1), this.b = ve(bb, Dr, 184, t, 6, 1), this.a = ve(kr, Ni, 9, t, 0, 1), this.d = ve(bb, Dr, 184, t, 6, 1), this.i = ve(kr, Ni, 9, t, 0, 1), this.g = ve(bb, Dr, 184, t, 6, 1), this.n = ve(bb, Dr, 184, t, 6, 1), this.k = n, this.c = i;
-      }
-      function MX(e, t, n) {
-        var i, s;
-        if (t.g == (et(), er) && n.g == er) {
-          if (!gi(f(z(f(z(t, (le(), lt)), 9), (Ee(), dt)), 28)) || f(z(t, lt), 9) != f(z(n, lt), 9))
-            return;
-          if (kO(t) || kO(n)) {
-            e.d = 1, e.b = 1;
-            return;
-          }
-          s = f(_e(t.f, 0), 7).g, i = f(_e(n.f, 0), 7).g, vy(t).g == (we(), rt) ? _A(e, t, n, s, i) : _A(e, n, t, i, s);
-        }
-      }
-      function uh(e) {
-        if (!e.a.c || !e.a.d)
-          throw new Ou((Al(xz), xz.j + " must have a source and target " + (Al(KT), KT.j) + " specified."));
-        if (e.a.c == e.a.d)
-          throw new Ou("Network simplex does not support self-loops: " + e.a + " " + e.a.c + " " + e.a.d);
-        return Yu(e.a.c.g, e.a), Yu(e.a.d.c, e.a), e.a;
-      }
-      function _A(e, t, n, i, s) {
-        i == (we(), Be) && s == Be ? Xf(e, t) > Xf(e, n) ? e.d = ih(e, n) : e.b = ih(e, t) : i == qe && s == qe ? Xf(e, t) < Xf(e, n) ? e.d = ih(e, n) : e.b = ih(e, t) : i == qe && s == Be ? Xf(e, t) > Xf(e, n) && (e.d = ih(e, n), e.b = ih(e, t)) : Xf(e, t) < Xf(e, n) && (e.d = ih(e, n), e.b = ih(e, t));
-      }
-      function OX(e) {
-        var t, n, i, s, l, h, v, p;
-        for (p = e.f.c.length, n = 0, t = p, s = 2 * p, v = new M(e.f); v.a < v.c.c.length; )
-          switch (h = f(O(v), 7), h.g.e) {
-            case 2:
-            case 4:
-              h.k = -1;
-              break;
-            case 1:
-            case 3:
-              i = h.b.c.length, l = h.e.c.length, i > 0 && l > 0 ? h.k = t++ : i > 0 ? h.k = n++ : l > 0 ? h.k = s++ : h.k = n++;
-          }
-        Ya(e.f, new Vh());
-      }
-      function AX(e, t, n, i) {
-        var s, l, h, v, p;
-        n.d.f != t.f && (s = new qa(e), Ha(s, (et(), hn)), ce(s, (le(), lt), n), ce(s, (Ee(), dt), (zn(), ni)), i.c[i.c.length] = s, h = new Yn(), cn(h, s), Bt(h, (we(), qe)), v = new Yn(), cn(v, s), Bt(v, Be), p = n.d, kn(n, h), l = new bs(), hu(l, n), ce(l, Un, null), Bn(l, v), kn(l, p), pA(s, h, v));
-      }
-      function RX(e) {
-        var t, n, i, s, l, h, v, p, m;
-        for (h = Zo, p = Zo, v = null, n = new Jm(new Ow(e.e)); n.b != n.c.a.b; )
-          if (t = F4(n), f(t.d, 60).c == 1 && (i = f(t.e, 116).a, m = f(t.e, 116).b, s = h - i > nc, l = i - h < nc && p - m > nc, (s || l) && (p = f(t.e, 116).b, h = f(t.e, 116).a, v = f(t.d, 60), p == 0 && h == 0)))
-            return v;
-        return v;
-      }
-      function GA(e, t) {
-        var n, i, s, l, h, v;
-        return l = e.d, v = f(z(e, (Ee(), Jo)), 15).a, v < 0 && (v = 0, ce(e, Jo, new Ut(v))), t.j.b = v, h = Math.floor(v / 2), i = new Yn(), Bt(i, (we(), qe)), cn(i, t), i.i.b = h, s = new Yn(), Bt(s, Be), cn(s, t), s.i.b = h, kn(e, i), n = new bs(), hu(n, e), ce(n, Un, null), Bn(n, s), kn(n, l), FK(t, e, n), fZ(e, n), n;
-      }
-      function BX(e) {
-        var t, n;
-        n = f(z(e, (zt(), Er)), 85), t = f(z(e, (le(), Zs)), 140), n == ($i(), gc) ? (ce(e, Er, pf), ce(e, Zs, (ms(), gf))) : n == Tu ? (ce(e, Er, pf), ce(e, Zs, (ms(), Lh))) : t == (ms(), gf) ? (ce(e, Er, gc), ce(e, Zs, Cp)) : t == Lh && (ce(e, Er, Tu), ce(e, Zs, Cp));
-      }
-      function zX(e) {
-        var t, n, i, s, l;
-        for (i = new M(bg(e.e)); i.a < i.c.c.length; )
-          n = f(O(i), 129), l = new qn(n.e.i), s = D3()[n.e.k], t = f(Zf(e.c, s), 283), l.b = t.e + t.a, s.b == (hy(), oc) ? l.a = t.d : s.b == xh ? l.a = t.d + (t.c - n.e.j.a) / 2 : s.b == sc && (l.a = t.d + t.c - n.e.j.a), n.e.i.a = l.a, n.e.i.b = l.b, t.a += n.e.j.b + e.d;
-      }
-      function HX(e) {
-        var t, n, i;
-        for (n = new M(Xu(e)); n.a < n.c.c.length; ) {
-          switch (t = f(O(n), 161), i = new qn(t.e.i), f(t.e, 7).g.e) {
-            case 4:
-              i.a = 0, i.b = e.e.j.b / 2;
-              break;
-            case 2:
-              i.a = e.e.j.a, i.b = e.e.j.b / 2;
-              break;
-            case 1:
-              i.a = e.e.j.a / 2, i.b = 0;
-              break;
-            case 3:
-              i.a = e.e.j.a / 2, i.b = e.e.j.b;
-          }
-          t.e.i.a = i.a, t.e.i.b = i.b;
-        }
-      }
-      function $A() {
-        this.c = ve(Zi, mi, 26, (we(), re(ie(Nr, 1), De, 32, 0, [cr, rt, Be, ct, qe])).length, 12, 1), this.b = ve(Zi, mi, 26, re(ie(Nr, 1), De, 32, 0, [cr, rt, Be, ct, qe]).length, 12, 1), this.a = ve(Zi, mi, 26, re(ie(Nr, 1), De, 32, 0, [cr, rt, Be, ct, qe]).length, 12, 1), pm(this.c, ki), pm(this.b, Hr), pm(this.a, Hr);
-      }
-      function YA(e, t, n) {
-        var i, s, l, h, v, p, m, S;
-        for (l = ge(Ot(e.b.mb().H())), m = ge(Ot(AI(t.b))), i = Yo(_a(e.a), m - n), s = Yo(_a(t.a), n - l), S = dn(i, s), Yo(S, 1 / (m - l)), this.a = S, this.b = new Se(), v = !0, h = e.b.mb(), h.H(); h.G(); )
-          p = ge(Ot(h.H())), v && p - n > al && (this.b.ib(n), v = !1), this.b.ib(p);
-        v && this.b.ib(n);
-      }
-      function _X(e) {
-        var t, n, i, s;
-        if (vQ(e, e.n), e.d.c.length > 0) {
-          for (Nv(e.c); iC(e, f(O(new M(e.e.a)), 61)) < e.e.a.c.length; ) {
-            for (t = ZK(e), s = t.d.e - t.c.e - t.a, t.d.j && (s = -s), i = new M(e.e.a); i.a < i.c.c.length; )
-              n = f(O(i), 61), n.j && (n.e += s);
-            Nv(e.c);
-          }
-          Nv(e.c), X3(e, f(O(new M(e.e.a)), 61)), jR(e);
-        }
-      }
-      function GX(e, t) {
-        var n, i, s, l, h, v, p;
-        for (n = Hr, v = (et(), Hn), s = new M(t.a); s.a < s.c.c.length; )
-          i = f(O(s), 9), l = i.g, l != Hn && (h = Ot(z(i, (le(), TL))), h == null ? (n = n > 0 ? n : 0, i.i.b = n + Om(e.a, l, v)) : i.i.b = (or(h), h)), p = Om(e.a, l, v), i.i.b < n + p + i.e.d && (i.i.b = n + p + i.e.d), n = i.i.b + i.j.b + i.e.a, v = l;
-      }
-      function FA(e, t, n) {
-        var i, s, l;
-        for (n.db(t, e), Le(e.g, t), l = e.o.d.Lc(t), W7(e.k) ? e.k = l : e.k = Xt(e.k, l), W7(e.a) ? e.a = l : e.a = je(e.a, l), t.g == e.o.d.Mc() ? WM(e.j, l) : WM(e.n, l), s = Dt(ya((dr(), new Qn(ur(re(ie(Ze, 1), Me, 1, 4, [new Zh(t), new Lf(t)])))))); xt(s); )
-          i = f(Et(s), 7), n.R(i) || FA(e, i, n);
-      }
-      function $X(e) {
-        var t, n, i, s, l;
-        for (i = (mn(), e.length), s = i > 0 && (e.charCodeAt(0) == 45 || e.charCodeAt(0) == 43) ? 1 : 0, t = s; t < i; t++)
-          if (OU(e.charCodeAt(t)) == -1)
-            throw new i1(k2 + e + '"');
-        if (l = parseInt(e, 10), n = l < Ys, isNaN(l))
-          throw new i1(k2 + e + '"');
-        if (n || l > yr)
-          throw new i1(k2 + e + '"');
-        return l;
-      }
-      function YX(e, t, n, i) {
-        var s, l, h, v;
-        for (s = f(Jn(t, (we(), qe)).mb().H(), 7), l = f(Jn(t, Be).mb().H(), 7), v = new M(e.f); v.a < v.c.c.length; ) {
-          for (h = f(O(v), 7); h.b.c.length != 0; )
-            kn(f(_e(h.b, 0), 12), s);
-          for (; h.e.c.length != 0; )
-            Bn(f(_e(h.e, 0), 12), l);
-        }
-        n || ce(t, (le(), Mi), null), i || ce(t, (le(), Si), null);
-      }
-      function FX(e) {
-        var t, n, i, s, l, h, v;
-        for (v = new FN(), h = new M(e.b); h.a < h.c.c.length; )
-          if (l = f(O(h), 9), l.g != (et(), Cn)) {
-            for (eX(v, l, new Yr()), s = Dt(En(l)); xt(s); )
-              if (i = f(Et(s), 12), !(i.c.f.g == Cn || i.d.f.g == Cn))
-                for (n = Jt(i.a, 0); n.b != n.d.c; )
-                  t = f(Ft(n), 10), xd(v, new zf(t.a, t.b));
-          }
-        return v;
-      }
-      function xg(e, t, n, i) {
-        var s, l, h;
-        if (this.e = new Ci(), this.a = e, this.b = t, e.b < t.b ? (this.j = e.a, this.k = e.b, this.n = t.b) : (this.j = t.a, this.k = t.b, this.n = e.b), s = f(z(i, (Ee(), Un)), 44), s)
-          for (h = Jt(s, 0); h.b != h.d.c; )
-            l = f(Ft(h), 10), V4(l.a, e.a) && rn(this.e, l);
-        this.g = n, this.g && (this.i = this.j - n.j.d), this.f = i;
-      }
-      function el(e) {
-        Ea();
-        var t, n, i, s, l, h;
-        for (h = new _i(), lg(h, e), n = (l = new Wt(h.a).a.bb().mb(), new Zt(l)); n.a.G(); )
-          t = (i = f(n.a.H(), 21), i.yb()), vt(t);
-        switch (h.a.Y()) {
-          case 0:
-            return Kf(), Gd;
-          case 1:
-            return new Bu((s = new Wt(h.a).a.bb().mb(), i = f(new Zt(s).a.H(), 21), i.yb()));
-          default:
-            return new um(h);
-        }
-      }
-      function O0(e, t, n, i) {
-        var s, l, h;
-        Fa(e, n, "x", t.i.a + i.a), Fa(e, n, "y", t.i.b + i.b), Fa(e, n, P2, t.j.a), Fa(e, n, D2, t.j.b), xe(t, 9) && f(z(t, (Ee(), Zg)), 86).kb((sh(), lk)) && (s = f(t, 9).b, h = Mn(n, j2), h || (h = new Dl(), Ta(n, j2, h)), l = h.kc(), Fa(e, l, "left", s.b), Fa(e, l, "top", s.d), Fa(e, l, "right", s.c), Fa(e, l, tx, s.a));
-      }
-      function qA(e, t) {
-        var n, i, s, l, h, v, p, m, S, x;
-        for (h = t == 1 ? bk : gk, l = (p = new Wt(h.a).a.bb().mb(), new Zt(p)); l.a.G(); )
-          for (s = (v = f(l.a.H(), 21), f(v.yb(), 59)), S = f(Pa(e.f.c, s), 18).mb(); S.G(); )
-            switch (m = f(S.H(), 27), i = f(m.b, 25), x = f(m.a, 78), n = x.c, s.e) {
-              case 2:
-              case 1:
-                i.j.e += n;
-                break;
-              case 4:
-              case 3:
-                i.j.d += n;
-            }
-      }
-      function qX(e, t) {
-        var n, i, s;
-        t.a ? (g4(e.b, t.b), e.a[t.b.k] = f(L9(e.b, t.b), 25), n = f(T9(e.b, t.b), 25), n && (e.a[n.k] = t.b)) : (i = f(L9(e.b, t.b), 25), i && i == e.a[t.b.k] && i.f && i.f != t.b.f && i.i.ib(t.b), s = f(T9(e.b, t.b), 25), s && e.a[s.k] == t.b && s.f && s.f != t.b.f && t.b.i.ib(s), V9(e.b, t.b));
-      }
-      function VX(e, t) {
-        var n, i, s, l, h, v, p;
-        for (s = new Se(), n = 0; n <= e.i; n++)
-          i = new Hc(t), i.k = e.i - n, s.c[s.c.length] = i;
-        for (v = new M(e.o); v.a < v.c.c.length; )
-          h = f(O(v), 9), Ar(h, f(_e(s, e.i - e.f[h.k]), 16));
-        for (l = new M(s); l.a < l.c.c.length; )
-          p = f(O(l), 16), p.a.c.length == 0 && bd(l);
-        t.c.c = ve(Ze, Me, 1, 0, 4, 1), Tn(t.c, s);
-      }
-      function WX(e) {
-        var t, n, i, s;
-        for (e.a.a.c = ve(Ze, Me, 1, 0, 4, 1), i = new M(e.a.b); i.a < i.c.c.length; )
-          t = f(O(i), 25), t.f = null;
-        for (s = new M(e.a.b); s.a < s.c.c.length; )
-          t = f(O(s), 25), !t.o && Le(e.a.a, new m0(re(ie(op, 1), Me, 25, 0, [t])));
-        for (n = new M(e.a.b); n.a < n.c.c.length; )
-          t = f(O(n), 25), t.o && f0(t.o.f, t);
-      }
-      function Tg(e, t) {
-        var n, i, s, l;
-        for (e = (mn(), e ?? $s), n = (e.length + 16 * t.length, new qw()), l = 0, i = 0; i < t.length && (s = e.indexOf("%s", l), s != -1); )
-          tI(n, e, l, s), Hu(n, t[i++]), l = s + 2;
-        if (nq(n, e, l, e.length), i < t.length) {
-          for (n.a += " [", Hu(n, t[i++]); i < t.length; )
-            n.a += ", ", Hu(n, t[i++]);
-          n.a += "]";
-        }
-        return n.a;
-      }
-      function VA(e, t, n, i) {
-        var s, l;
-        if (t) {
-          if (s = e.a.$b(n.d, t.d), s == 0)
-            return i.d = QS(t, n.e), i.b = !0, t;
-          l = s < 0 ? 0 : 1, t.a[l] = VA(e, t.a[l], n, i), Ru(t.a[l]) && (Ru(t.a[1 - l]) ? (t.b = !0, t.a[0].b = !1, t.a[1].b = !1) : Ru(t.a[l].a[l]) ? t = c0(t, 1 - l) : Ru(t.a[l].a[1 - l]) && (t = MN(t, 1 - l)));
-        } else
-          return n;
-        return t;
-      }
-      function UX(e, t) {
-        var n, i, s, l, h, v, p, m, S, x;
-        for (p = $v(t.a), v = Xn(v1(p / e.a)), x = t.a, h = 0, m = v, l = 0; l < e.a; ++l)
-          S = (mn(), x.substr((0 > h ? 0 : h) < p ? 0 > h ? 0 : h : p, (0 > (m < p ? m : p) ? 0 : m < p ? m : p) - ((0 > h ? 0 : h) < p ? 0 > h ? 0 : h : p))), h = m, m += v, i = f(_e(e.c, l), 9), n = new LS(S), n.j.b = t.j.b, pt(e.b, t, n), Le(i.c, n);
-        Cr(e.g.c, t), Le(e.i, (s = new MD(e, t), s));
-      }
-      function WA(e, t, n) {
-        var i, s, l, h, v, p, m, S, x;
-        for (t.k = 1, l = t.d, x = ks(t, (sr(), ri)).mb(); x.G(); )
-          for (S = f(x.H(), 7), s = new M(S.e); s.a < s.c.c.length; )
-            i = f(O(s), 12), m = i.d.f, t != m && (h = m.d, h.k <= l.k && (v = l.k + 1, v == n.c.c.length ? (p = new Hc(n), p.k = v, Le(n.c, p), Ar(m, p)) : (p = f(_e(n.c, v), 16), Ar(m, p)), WA(e, m, n)));
-      }
-      function KX(e) {
-        var t, n, i, s, l;
-        for (t = e.e.j, i = new M(Xu(e)); i.a < i.c.c.length; ) {
-          switch (n = f(O(i), 161), s = f(nr(n, (Ee(), ul)), 15), !s && (s = new Ut(0)), l = new qn(n.e.i), f(n.e, 7).g.e) {
-            case 4:
-              l.a = -n.e.j.a - s.a;
-              break;
-            case 2:
-              l.a = t.a + s.a;
-              break;
-            case 1:
-              l.b = -n.e.j.b - s.a;
-              break;
-            case 3:
-              l.b = t.b + s.a;
-          }
-          n.e.i.a = l.a, n.e.i.b = l.b;
-        }
-      }
-      function ZX(e) {
-        var t, n, i;
-        i = f(z(e, (Ee(), ia)), 18), !i.V() && (n = (t = f(Hi(Ln), 11), new ti(t, f(xi(t, t.length), 11), 0)), i.kb((gu(), Ei)) ? hi(n, Ei) : hi(n, Ui), i.kb(Vi) || hi(n, Vi), i.kb(qi) ? hi(n, ba) : i.kb(Ua) ? hi(n, ga) : i.kb(Wi) && hi(n, va), i.kb(ba) ? hi(n, qi) : i.kb(ga) ? hi(n, Ua) : i.kb(va) && hi(n, Wi), ce(e, ia, n));
-      }
-      function UA(e, t, n, i, s) {
-        var l, h, v, p, m, S, x, L, j, I;
-        for (L = KM(e, n), p = 0; p < t; p++) {
-          for (s.J(n), j = new Se(), I = f(i.H(), 92), S = L + p; S < e.c; S++)
-            v = I, I = f(i.H(), 92), Le(j, new YA(v, I, n));
-          for (x = L + p; x < e.c; x++)
-            i.M(), x > L + p && i.I();
-          for (h = new M(j); h.a < h.c.c.length; )
-            l = f(O(h), 92), i.J(l);
-          if (p < t - 1)
-            for (m = L + p; m < e.c; m++)
-              i.M();
-        }
-      }
-      function XX(e) {
-        var t, n, i, s;
-        if (e.d && f(e.e, 7).f.g == (et(), er))
-          return Qt(), Qt(), bc;
-        if (!e.a) {
-          for (e.a = new Se(), i = new M(f(e.e, 7).b); i.a < i.c.c.length; )
-            t = f(O(i), 12), Le(e.a, new Zb(t));
-          if (e.d && (s = f(z(f(e.e, 7), (le(), js)), 9), s))
-            for (n = Dt(Lr(s)); xt(n); )
-              t = f(Et(n), 12), Le(e.a, new Zb(t));
-        }
-        return e.a;
-      }
-      function QX(e) {
-        var t, n, i, s;
-        if (e.d && f(e.e, 7).f.g == (et(), er))
-          return Qt(), Qt(), bc;
-        if (!e.c) {
-          for (e.c = new Se(), i = new M(f(e.e, 7).e); i.a < i.c.c.length; )
-            t = f(O(i), 12), Le(e.c, new Zb(t));
-          if (e.d && (s = f(z(f(e.e, 7), (le(), js)), 9), s))
-            for (n = Dt(En(s)); xt(n); )
-              t = f(Et(n), 12), Le(e.c, new Zb(t));
-        }
-        return e.c;
-      }
-      function JX(e, t) {
-        var n, i, s, l, h, v, p, m;
-        for (v = f(z(e, (le(), lt)), 7), p = ln(re(ie(_t, 1), Ht, 10, 0, [v.f.i, v.i, v.a])).a, m = e.f.i.b, n = f(Vn(e.b, ve(Ki, Yi, 12, e.b.c.length, 0, 1)), 47), s = 0, l = n.length; s < l; ++s)
-          i = n[s], kn(i, v), Jw(i.a, new ot(p, m)), t && (h = f(z(i, (Ee(), Un)), 44), h || (h = new Ci(), ce(i, Un, h)), rn(h, new ot(p, m)));
-      }
-      function eQ(e, t) {
-        var n, i, s, l, h, v, p, m;
-        for (s = f(z(e, (le(), lt)), 7), p = ln(re(ie(_t, 1), Ht, 10, 0, [s.f.i, s.i, s.a])).a, m = e.f.i.b, n = f(Vn(e.e, ve(Ki, Yi, 12, e.e.c.length, 0, 1)), 47), h = 0, v = n.length; h < v; ++h)
-          l = n[h], Bn(l, s), DD(l.a, new ot(p, m)), t && (i = f(z(l, (Ee(), Un)), 44), i || (i = new Ci(), ce(l, Un, i)), rn(i, new ot(p, m)));
-      }
-      function tQ(e) {
-        var t, n, i, s, l, h, v, p, m;
-        for (h = Zo, p = Zo, v = null, n = new Jm(new Ow(e.e)); n.b != n.c.a.b; )
-          if (t = F4(n), (He(t.d) === He((wi(), rs)) || He(t.d) === He(fc)) && (i = f(t.e, 116).a, m = f(t.e, 116).b, s = h - i > nc, l = i - h < nc && p - m > nc, (s || l) && (p = f(t.e, 116).b, h = f(t.e, 116).a, v = f(t.d, 60), p == 0 && h == 0)))
-            return v;
-        return v;
-      }
-      function nQ(e, t) {
-        var n, i, s, l, h;
-        e.d = t, so(e.b), e.c = !1;
-        e:
-          for (i = new M(e.d.c); i.a < i.c.c.length; )
-            for (n = f(O(i), 16), l = new M(n.a); l.a < l.c.c.length; )
-              if (s = f(O(l), 9), !eg(yg(s))) {
-                e.c = !0;
-                break e;
-              }
-        return h = Yt(($n(), Po), re(ie(Gg, 1), De, 59, 0, [ja, Fi])), e.c || (hi(h, Ws), hi(h, Ts)), e.a = new v4(h), qee(e), e.a;
-      }
-      function KA() {
-        var e, t, n, i, s;
-        for (this.e = (On(), new yd()), this.b = (n = f(Hi(Wd), 11), new ti(n, f(xi(n, n.length), 11), 0)), this.c = (i = f(Hi(Wd), 11), new ti(i, f(xi(i, i.length), 11), 0)), this.a = (s = f(Hi(Wd), 11), new ti(s, f(xi(s, s.length), 11), 0)), t = (wi(), wi(), hH).mb(); t.G(); )
-          e = f(t.H(), 60), gg(this.e, e, new X7());
-      }
-      function rQ(e, t, n) {
-        var i, s, l, h, v, p;
-        ei(e.k - e.a) < pu || ei(t.k - t.a) < pu || (i = DA(e.n, t.j, n), s = DA(t.n, e.j, n), l = Ay(e.n, t.k, t.a) + Ay(t.j, e.k, e.a), h = Ay(t.n, e.k, e.a) + Ay(e.j, t.k, t.a), v = 16 * i + l, p = 16 * s + h, v < p ? new u0(e, t, p - v) : v > p ? new u0(t, e, v - p) : v > 0 && p > 0 && (new u0(e, t, 0), new u0(t, e, 0)));
-      }
-      function tl(e, t) {
-        var n, i, s, l, h, v, p, m, S;
-        for (m = new Se(), S = null, i = f(Zf(vl, e), 20).mb(); i.G(); ) {
-          for (n = f(i.H(), 75), p = (l = new Wt(n.c.a).a.bb().mb(), new Zt(l)); p.a.G(); )
-            h = (s = f(p.a.H(), 21), f(s.yb(), 7)), su(t, h), I0(h, e.b);
-          Tn(m, n.b), S = e.a;
-        }
-        for (D0(m), my(m, S), v = new M(m); v.a < v.c.c.length; )
-          h = f(O(v), 7), su(t, h);
-      }
-      function iQ() {
-        var e = { layout: function(t) {
-          Ap(WJ(t));
-        } };
-        typeof document !== Og && (r.$klay = e), a.exports && (a.exports = e), typeof document === Og && typeof self !== Og && self.addEventListener("message", function(t) {
-          e.layout(t.data);
-        }, !1);
-      }
-      function Lg(e, t, n, i, s) {
-        var l, h, v;
-        v = s ? i.b : i.a, (v > n.k && v < n.a || n.j.b != 0 && n.n.b != 0 && (ei(v - ge(Ot(Lm(n.j)))) < pu && ei(v - ge(Ot(Lm(n.n)))) < pu || ei(v - ge(Ot(x1(n.j)))) < pu && ei(v - ge(Ot(x1(n.n)))) < pu)) && (Pc(e.b, i) || (h = f(z(t, (Ee(), Un)), 44), h || (h = new Ci(), ce(t, Un, h)), l = new qn(i), wr(h, l, h.c.b, h.c), vn(e.b, l)));
-      }
-      function aQ(e, t, n) {
-        var i, s, l, h, v, p, m, S, x;
-        for (i = n.c, s = n.d, v = Pi(t.c), p = Pi(t.d), i == t.c ? (v = tC(e, v, s), p = qO(t.d)) : (v = qO(t.c), p = tC(e, p, s)), m = new Nm(t.a), wr(m, v, m.a, m.a.a), wr(m, p, m.c.b, m.c), h = t.c == i, x = new f7(), l = 0; l < m.b - 1; ++l)
-          S = new pr(f(Td(m, l), 10), f(Td(m, l + 1), 10)), h && l == 0 || !h && l == m.b - 2 ? x.b = S : Le(x.a, S);
-        return x;
-      }
-      function oQ(e, t) {
-        var n, i, s, l;
-        if (l = e.g.e - t.g.e, l != 0)
-          return l;
-        if (n = f(z(e, (Ee(), mu)), 24), i = f(z(t, mu), 24), n && i && (s = n.a - i.a, s != 0))
-          return s;
-        switch (e.g.e) {
-          case 1:
-            return mr(e.i.a, t.i.a);
-          case 2:
-            return mr(e.i.b, t.i.b);
-          case 3:
-            return mr(t.i.a, e.i.a);
-          case 4:
-            return mr(t.i.b, e.i.b);
-          default:
-            throw new Ou(m8);
-        }
-      }
-      function sQ(e, t) {
-        var n, i, s, l, h;
-        for (h = new Yr(), l = new M(Xu(e)); l.a < l.c.c.length; )
-          switch (s = f(O(l), 161), f(s.e, 7).g.e) {
-            case 4:
-            case 2:
-              h.b = je(h.b, s.e.i.b + s.e.j.b + (t ? (i = f(s.e, 7).d, new qo(i.d, i.b, i.a, i.c)).a : 0));
-              break;
-            case 1:
-            case 3:
-              h.a = je(h.a, s.e.i.a + s.e.j.a + (t ? (n = f(s.e, 7).d, new qo(n.d, n.b, n.a, n.c)).c : 0));
-          }
-        return h;
-      }
-      function h2(e, t) {
-        var n, i, s, l, h, v, p;
-        for (s = new Se(), p = new Se(), n = f(Zf(vl, e), 20).mb(); n.G(); )
-          i = f(n.H(), 75), lO(s, i.b), lO(s, tO(i)), n.G() && (i = f(n.H(), 75), Tn(p, tO(i)), Tn(p, i.b));
-        for (my(s, e.b), my(p, e.a), v = new M(s); v.a < v.c.c.length; )
-          l = f(O(v), 7), su(t, l);
-        for (h = new M(p); h.a < h.c.c.length; )
-          l = f(O(h), 7), su(t, l);
-      }
-      function vr() {
-        vr = c, eE = new zu("COMMENTS", 0), as = new zu("EXTERNAL_PORTS", 1), Ep = new zu("HYPEREDGES", 2), tE = new zu("HYPERNODES", 3), df = new zu("NON_FREE_PORTS", 4), vf = new zu("NORTH_SOUTH_PORTS", 5), Sp = new zu("SELF_LOOPS", 6), Ud = new zu("CENTER_LABELS", 7), Kd = new zu("END_LABELS", 8), cL = new zu("PARTITIONS", 9);
-      }
-      function uQ(e, t) {
-        var n, i, s, l;
-        for (e = (mn(), e ?? $s), n = (e.length + 16 * t.length, new qw()), l = 0, i = 0; i < t.length && (s = e.indexOf("%s", l), s != -1); )
-          io(n, e.substr(l, s - l)), Hu(n, t[i++]), l = s + 2;
-        if (io(n, gd(e, l, e.length - l)), i < t.length) {
-          for (n.a += " [", Hu(n, t[i++]); i < t.length; )
-            n.a += ", ", Hu(n, t[i++]);
-          n.a += "]";
-        }
-        return n.a;
-      }
-      function vC(e, t, n) {
-        var i, s;
-        switch (s = null, t.e) {
-          case 1:
-            s = (fa(), oT);
-            break;
-          case 2:
-            s = (fa(), sT);
-        }
-        switch (i = null, n.e) {
-          case 1:
-            i = (fa(), mk);
-            break;
-          case 2:
-            i = (fa(), wk);
-            break;
-          case 3:
-            i = (fa(), yk);
-            break;
-          case 4:
-            i = (fa(), kk);
-        }
-        return s && i ? Eo(e.f, (d1(), new pP(new ro(re(ie(Zee, 1), Me, 68, 0, [f(vt(s), 68), f(vt(i), 68)]))))) : (Qt(), Qt(), bc);
-      }
-      function gC(e, t, n) {
-        var i, s, l, h, v, p, m;
-        for (p = ca(En(t)), s = Jt(p, 0); s.b != s.d.c; )
-          i = f(Ft(s), 12), m = i.d.f, !(Pt(ge(jt(z(m, (le(), vc))))) && z(m, lt) != null) && m.g == (et(), Ii) && !Pt(ge(jt(z(i, Xs)))) && i.d.g == (we(), qe) && (l = ea(m.d) - ea(t.d), l > 1 && (n ? h = ea(t.d) + 1 : h = ea(m.d) - 1, v = f(_e(e.a.c, h), 16), Ar(m, v)), gC(e, m, n));
-        return t;
-      }
-      function ZA(e, t) {
-        var n, i, s, l;
-        for (t.d ? s = e.a.c == (Co(), cc) ? Lr(t.b) : En(t.b) : s = e.a.c == (Co(), Ps) ? Lr(t.b) : En(t.b), l = !1, i = (_n(), new _o(Go(vs(s.a, new T())))); xt(i); )
-          if (n = f(Et(i), 12), e.c.a[n.c.f.d.k] !== e.c.a[n.d.f.d.k] && (l = !0, Pc(e.b, e.a.f[HK(n, t.b).k])))
-            return t.c = !0, t.a = n, t;
-        return t.c = l, t.a = null, t;
-      }
-      function cQ(e, t, n) {
-        var i, s, l, h;
-        for (i = f(z(e.d, (Ee(), Ax)), 15).a, l = new M(e.a.b); l.a < l.c.c.length; )
-          if (s = f(O(l), 25), xe(s, 93) && (h = f(s, 93).b, h.g == (et(), Cn)))
-            switch (f(z(h, (le(), _r)), 32).e) {
-              case 4:
-                h.i.a = t.a - i;
-                break;
-              case 2:
-                h.i.a = n.a + i - (h.j.a + h.e.c);
-                break;
-              case 1:
-                h.i.b = t.b - i;
-                break;
-              case 3:
-                h.i.b = n.b + i - (h.j.b + h.e.a);
-            }
-      }
-      function lQ() {
-        if (!Object.create || !Object.getOwnPropertyNames)
-          return !1;
-        var e = "__proto__", t = /* @__PURE__ */ Object.create(null);
-        if (t[e] !== void 0)
-          return !1;
-        var n = Object.getOwnPropertyNames(t);
-        return !(n.length != 0 || (t[e] = 42, t[e] !== 42) || Object.getOwnPropertyNames(t).length == 0);
-      }
-      function XA(e) {
-        var t, n, i, s, l, h, v, p, m;
-        for (h = new M(e.a.a); h.a < h.c.c.length; )
-          s = f(O(h), 78), s.f = 0, s.e.a.Q();
-        for (l = new M(e.a.a); l.a < l.c.c.length; )
-          for (s = f(O(l), 78), n = (m = new Wt(s.a.a).a.bb().mb(), new Zt(m)); n.a.G(); )
-            for (t = (i = f(n.a.H(), 21), f(i.yb(), 25)), p = t.i.mb(); p.G(); )
-              v = f(p.H(), 25), v.f != s && (vn(s.e, v), ++v.f.f);
-      }
-      function bC(e, t, n, i) {
-        var s, l, h, v;
-        if (t.g == (et(), Ii)) {
-          for (l = Dt(Lr(t)); xt(l); )
-            if (s = f(Et(l), 12), h = s.c.f, (h.g == Ii || Pt(ge(jt(z(h, (le(), vc)))))) && e.d.a[s.c.f.d.k] == i && e.d.a[t.d.k] == n)
-              return !0;
-        }
-        if (t.g == hn) {
-          for (l = Dt(Lr(t)); xt(l); )
-            if (s = f(Et(l), 12), v = s.c.f.g, v == hn && e.d.a[s.c.f.d.k] == i && e.d.a[t.d.k] == n)
-              return !0;
-        }
-        return !1;
-      }
-      function fQ(e) {
-        var t, n, i, s, l, h;
-        if (s = e.g.tb(), i = e.b.tb(), e.e)
-          for (n = 0; n < e.c; n++)
-            s.H();
-        else
-          for (n = 0; n < e.c - 1; n++)
-            s.H(), s.I();
-        for (t = ge(Ot(s.H())); e.i - t > al; ) {
-          for (l = t, h = 0; (t - l <= 0 ? 0 - (t - l) : t - l) < al; )
-            ++h, t = ge(Ot(s.H())), i.H();
-          h < e.c && (s.M(), UA(e, e.c - h, l, i, s), s.H()), i.M();
-        }
-        if (!e.e)
-          for (n = 0; n < e.c - 1; n++)
-            s.H(), s.I();
-        e.e = !0, e.d = !0;
-      }
-      function hQ(e) {
-        var t, n, i, s;
-        switch (ym(e.a).c) {
-          case 4:
-            return wi(), is;
-          case 3:
-            return f($V(e.a).mb().H(), 60);
-          case 2:
-            return i = ym(e.a), n = new Hf(i), t = f(Yc(n), 60), s = f(Yc(n), 60), Cg(t) == s ? Fo(i, (wi(), is)) ? Eu : is : M0(M0(t)) == s ? M0(t) : dC(t);
-          case 1:
-            return i = ym(e.a), Cg(f(Yc(new Hf(i)), 60));
-          case 0:
-            return wi(), Su;
-          default:
-            return null;
-        }
-      }
-      function QA(e, t) {
-        var n;
-        z4.call(this), this.a = f(z(t, (le(), Oi)), 15).a, this.c = this.a * f(z(t, (zt(), tv)), 15).a, this.b = e, this.j = new $a(e.i.a - e.e.b, e.i.b - e.e.d, e.j.a + e.e.b + e.e.c, e.j.b + e.e.d + e.e.a), Rs(this.g), n = _l(Lr(e)) - _l(En(e)), n < 0 ? fg(this.n, !0, ($n(), ja)) : n > 0 && fg(this.n, !0, ($n(), Fi)), e.g == (et(), Cn) && Sa(this.n, !1, !1, !1, !1);
-      }
-      function Pg(e, t, n) {
-        var i, s, l, h, v, p, m, S, x, L;
-        for (l = new ot(t, n), S = new M(e.b); S.a < S.c.c.length; )
-          for (m = f(O(S), 9), dn(m.i, l), L = new M(m.f); L.a < L.c.c.length; )
-            for (x = f(O(L), 7), s = new M(x.e); s.a < s.c.c.length; )
-              for (i = f(O(s), 12), Vu(i.a, l), h = f(z(i, (Ee(), Un)), 44), h && Vu(h, l), p = new M(i.b); p.a < p.c.c.length; )
-                v = f(O(p), 33), dn(v.i, l);
-      }
-      function dQ(e, t, n) {
-        var i, s, l, h, v, p, m, S, x, L;
-        for (l = new ot(t, n), S = new M(e.b); S.a < S.c.c.length; )
-          for (m = f(O(S), 9), dn(m.i, l), L = new M(m.f); L.a < L.c.c.length; )
-            for (x = f(O(L), 7), s = new M(x.e); s.a < s.c.c.length; )
-              for (i = f(O(s), 12), Vu(i.a, l), h = f(z(i, (Ee(), Un)), 44), h && Vu(h, l), p = new M(i.b); p.a < p.c.c.length; )
-                v = f(O(p), 33), dn(v.i, l);
-      }
-      function JA(e, t) {
-        var n, i, s, l, h;
-        for (h = new M(e.f); h.a < h.c.c.length; )
-          if (l = f(O(h), 7), t) {
-            if (l.b.c.length != 0)
-              throw new t1((s = n0(e), ax + (s ?? o1(e.k)) + S8 + C8 + ox));
-          } else
-            for (i = new M(l.b); i.a < i.c.c.length; )
-              if (n = f(O(i), 12), He(z(n.c.f, (zt(), Er))) !== He(($i(), gc)))
-                throw new t1((s = n0(e), ax + (s ?? o1(e.k)) + S8 + C8 + ox));
-      }
-      function eR(e, t, n) {
-        var i, s, l, h, v, p, m;
-        for (i = 0, m = Jn(t, n), p = m.mb(); p.G(); )
-          v = f(p.H(), 7), f(z(v, (le(), js)), 9) && (h = f(z(v, js), 9), Jn(h, (we(), Be)).mb().G() && (i += (l = e.k ? 1 : Ij(f(_e(h.f, 0), 7)), l * Au(IM(e, t, n).a - 1 - f(Kt(e.i, v), 24).a, yM(e, t, h)))), Jn(h, qe).mb().G() && (i += (s = e.k ? 1 : Ij(f(_e(h.f, 0), 7)), s * Au(f(Kt(e.i, v), 24).a, yM(e, t, h)))));
-        return i;
-      }
-      function vQ(e, t) {
-        var n, i, s, l, h, v, p;
-        for (s = ve(Kn, Wn, 26, e.e.a.c.length, 12, 1), h = new M(e.e.a); h.a < h.c.c.length; )
-          l = f(O(h), 61), s[l.b] += l.c.c.length;
-        for (v = ca(t); v.b != 0; )
-          for (l = f(v.b == 0 ? null : (ut(v.b != 0), zs(v, v.a.a)), 61), i = new M(l.g); i.a < i.c.c.length; )
-            n = f(O(i), 89), p = n.d, p.e = Jr(p.e, l.e + n.a), --s[p.b], s[p.b] == 0 && wr(v, p, v.c.b, v.c);
-      }
-      function tR(e, t, n, i, s, l, h) {
-        if (e.d = i.e.i.a, e.e = i.e.i.b, s && (e.d += s.e.i.a, e.e += s.e.i.b), e.c = t.e.j.a, e.b = t.e.j.b, !s)
-          n ? e.d -= h + t.e.j.a : e.d += i.e.j.a + h;
-        else
-          switch (f(s.e, 7).g.e) {
-            case 0:
-            case 2:
-              e.d += s.e.j.a + h + l.a + h;
-              break;
-            case 4:
-              e.d -= h + l.a + h + t.e.j.a;
-              break;
-            case 1:
-              e.d += s.e.j.a + h, e.e -= h + l.b + h + t.e.j.b;
-              break;
-            case 3:
-              e.d += s.e.j.a + h, e.e += s.e.j.b + h + l.b + h;
-          }
-      }
-      function gQ(e, t) {
-        var n, i, s, l, h, v, p, m, S;
-        for (s = new Se(), p = new M(t); p.a < p.c.c.length; )
-          l = f(O(p), 9), Le(s, e.b[l.d.k][l.k]);
-        for (iJ(e, s); S = ZJ(s); )
-          qQ(e, f(S.a, 102), f(S.b, 102), s);
-        for (t.c = ve(Ze, Me, 1, 0, 4, 1), i = new M(s); i.a < i.c.c.length; )
-          for (n = f(O(i), 102), h = n.d, v = 0, m = h.length; v < m; ++v)
-            l = h[v], t.c[t.c.length] = l, e.a[l.d.k][l.k].a = ka(n.g, n.d[0]).a;
-      }
-      function d2(e) {
-        var t, n, i, s, l, h, v;
-        for (v = (On(), new $t()), i = new M(e.a.b); i.a < i.c.c.length; )
-          t = f(O(i), 25), un(v, t, new Se());
-        for (s = new M(e.a.b); s.a < s.c.c.length; )
-          for (t = f(O(s), 25), t.r = Hr, h = t.i.mb(); h.G(); )
-            l = f(h.H(), 25), f(ci(li(v.d, l)), 20).ib(t);
-        for (n = new M(e.a.b); n.a < n.c.c.length; )
-          t = f(O(n), 25), t.i.Q(), t.i = f(ci(li(v.d, t)), 20);
-        XA(e);
-      }
-      function bQ(e) {
-        var t, n, i, s, l;
-        switch (s = f(_e(e.b, 0), 9), t = new qa(e), Le(e.b, t), t.j.a = je(1, s.j.a), t.j.b = je(1, s.j.b), t.i.a = s.i.a, t.i.b = s.i.b, f(z(s, (le(), _r)), 32).e) {
-          case 4:
-            t.i.a += 2;
-            break;
-          case 1:
-            t.i.b += 2;
-            break;
-          case 2:
-            t.i.a -= 2;
-            break;
-          case 3:
-            t.i.b -= 2;
-        }
-        return i = new Yn(), cn(i, t), n = new bs(), l = f(_e(s.f, 0), 7), Bn(n, l), kn(n, i), dn(Rs(i.i), l.i), dn(Rs(i.a), l.a), t;
-      }
-      function pQ(e) {
-        var t, n, i, s, l, h, v, p, m;
-        for (m = (On(), new $t()), t = 0, n = new Bw(), v = e.mb(); v.G(); )
-          l = f(v.H(), 9), p = Fv(fD(iS(new Jh(), t++), l), n), ra(m.d, l, p);
-        for (h = e.mb(); h.G(); )
-          for (l = f(h.H(), 9), s = Dt(En(l)); xt(s); )
-            i = f(Et(s), 12), !Fc(i) && uh(Of(Rf(Af(Bf(new Pl(), Jr(1, f(z(i, (le(), Xa)), 24).a)), 1), f(Kt(m, i.c.f), 61)), f(Kt(m, i.d.f), 61)));
-        return n;
-      }
-      function wQ(e) {
-        var t, n;
-        if (!e.V()) {
-          for (n = f(e.sb(0), 75).f, new yC(e), t = new fn(n.f, 0), Kc((wi(), No), t), Zc(gl, t), dg((we(), rt), t), h2(Ds, t), Zc(Cu, t), tl(lc, t), Kc(rs, t), dg(Be, t), h2(Eu, t), Kc(fc, t), tl(Su, t), Kc(Cu, t), dg(ct, t), h2(is, t), Kc(gl, t), tl(dc, t), Zc(fc, t); t.b < t.d.Y(); )
-            ut(t.b < t.d.Y()), t.d.sb(t.c = t.b++);
-          h2(hc, t), Zc(rs, t), Zc(No, t);
-        }
-      }
-      function mQ(e) {
-        var t, n;
-        if (!e.V()) {
-          for (n = f(e.sb(0), 75).f, new yC(e), t = new fn(n.f, 0), Kc((wi(), No), t), Zc(gl, t), dg((we(), rt), t), tl(Ds, t), Zc(Cu, t), tl(lc, t), Kc(rs, t), dg(Be, t), tl(Eu, t), Kc(fc, t), tl(Su, t), Kc(Cu, t), dg(ct, t), tl(is, t), Kc(gl, t), tl(dc, t), Zc(fc, t); t.b < t.d.Y(); )
-            ut(t.b < t.d.Y()), t.d.sb(t.c = t.b++);
-          tl(hc, t), Zc(rs, t), Zc(No, t);
-        }
-      }
-      function nR(e) {
-        var t, n, i, s, l, h, v, p, m;
-        for (s = Ys, h = yr, m = new M(e.e.a); m.a < m.c.c.length; )
-          v = f(O(m), 61), h = Au(h, v.e), s = Jr(s, v.e);
-        for (l = 0, i = ve(Kn, Wn, 26, s - h + 1, 12, 1), p = new M(e.e.a); p.a < p.c.c.length; )
-          v = f(O(p), 61), v.e -= h, ++i[v.e];
-        if (e.k)
-          for (n = new M(e.k.c); n.a < n.c.c.length && (t = f(O(n), 16), i[l++] += t.a.c.length, i.length != l); )
-            ;
-        return i;
-      }
-      function yQ(e) {
-        var t, n, i, s;
-        for (QW(e), sZ(e), s = new ot(ki, ki), t = new ot(Hr, Hr), i = new M(e.a.b); i.a < i.c.c.length; )
-          n = f(O(i), 25), s.a = Xt(s.a, n.j.d), s.b = Xt(s.b, n.j.e), t.a = je(t.a, n.j.d + n.j.c), t.b = je(t.b, n.j.e + n.j.b);
-        dn(Rs(e.d.d), Tm(new ot(s.a, s.b))), dn(Rs(e.d.e), ou(new ot(t.a, t.b), s)), cQ(e, s, t), e.a.a.c = ve(Ze, Me, 1, 0, 4, 1), e.a.b.c = ve(Ze, Me, 1, 0, 4, 1);
-      }
-      function kQ(e, t) {
-        var n, i, s, l, h, v, p, m, S, x;
-        if (h = e.e, S = f(z(e, (le(), Jd)), 20), x = 0, S) {
-          for (p = 0, l = S.mb(); l.G(); )
-            s = f(l.H(), 9), p = je(p, s.j.b), x += s.j.a;
-          x += t / 2 * (S.Y() - 1), h.d += p + t;
-        }
-        if (n = f(z(e, Zd), 20), i = 0, n) {
-          for (p = 0, l = n.mb(); l.G(); )
-            s = f(l.H(), 9), p = je(p, s.j.b), i += s.j.a;
-          i += t / 2 * (n.Y() - 1), h.a += p + t;
-        }
-        v = x > i ? x : i, v > e.j.a && (m = (v - e.j.a) / 2, h.b = je(h.b, m), h.c = je(h.c, m));
-      }
-      function rR(e, t, n, i) {
-        var s, l, h, v, p, m, S, x, L, j;
-        for (h = ua(t.d, n, i), x = new M(t.b); x.a < x.c.c.length; ) {
-          for (S = f(O(x), 9), dn(S.i, h), j = new M(S.f); j.a < j.c.c.length; )
-            for (L = f(O(j), 7), l = new M(L.e); l.a < l.c.c.length; )
-              for (s = f(O(l), 12), Vu(s.a, h), v = f(z(s, (Ee(), Un)), 44), v && Vu(v, h), m = new M(s.b); m.a < m.c.c.length; )
-                p = f(O(m), 33), dn(p.i, h);
-          Le(e.b, S), S.a = e;
-        }
-      }
-      function EQ(e, t) {
-        var n, i, s, l, h;
-        for (e.c == null || e.c.length < t.c.length ? e.c = ve(pb, Bg, 26, t.c.length, 13, 1) : Nv(e.c), e.a = new Se(), i = 0, h = new M(t); h.a < h.c.c.length; )
-          s = f(O(h), 9), s.k = i++;
-        for (n = new Wr(), l = new M(t); l.a < l.c.c.length; )
-          s = f(O(l), 9), e.c[s.k] || (bA(e, s), n.b == 0 || (ut(n.b != 0), f(n.a.a.c, 20)).Y() < e.a.c.length ? DD(n, e.a) : Jw(n, e.a), e.a = new Se());
-        return n;
-      }
-      function SQ(e, t, n) {
-        var i, s, l, h, v, p, m, S, x;
-        return i = Ld(e.g), m = dn(_a(e.i), e.a), S = dn(_a(t.i), t.a), s = dn(new qn(m), Yo(new zc(i), n)), x = dn(new qn(S), Yo(new zc(i), n)), h = Yo(ou(new qn(s), x), 0.5), p = dn(dn(new qn(x), h), Yo(new zc(i), VD(h.a * h.a + h.b * h.b))), v = new ey(re(ie(_t, 1), Ht, 10, 0, [m, s, p, x, S])), l = Zl(v, 0.5, !1), v.a = l, B5(v, new t2(re(ie(_t, 1), Ht, 10, 0, [l, m, S]))), v;
-      }
-      function pC(e, t) {
-        var n, i, s, l, h;
-        if (Nt(t, "Network simplex", 1), e.e.a.c.length < 1) {
-          Ct(t);
-          return;
-        }
-        for (l = new M(e.e.a); l.a < l.c.c.length; )
-          s = f(O(l), 61), s.e = 0;
-        for (h = e.e.a.c.length >= 40, h && zQ(e), vJ(e), _X(e), n = IO(e), i = 0; n && i < e.f; )
-          CQ(e, n, aX(e, n)), n = IO(e), ++i;
-        h && mZ(e), e.a ? rX(e, nR(e)) : nR(e), e.b = null, e.d = null, e.p = null, e.c = null, e.g = null, e.i = null, e.n = null, e.o = null, Ct(t);
-      }
-      function ch(e) {
-        var t, n, i, s, l, h, v, p, m, S;
-        for (m = new $r(), s = (On(), new $t()), v = 0, p = e.length; v < p; ++v)
-          h = e[v], t = h.mc(), m.a.db(t, m), t == null ? ra(s.d, null, h) : zy(s.e, t, h), S = zm(t, (mn(), t.lastIndexOf(".") + 1), t.length), Pc(nT, S) || (m.a.db(S, m), S == null ? ra(s.d, null, h) : zy(s.e, S, h), vn(nT, S));
-        return i = (Ea(), jO((l = new Wt(m.a).a.bb().mb(), new Zt(l)))), n = TX(s), new pr(i, n);
-      }
-      function CQ(e, t, n) {
-        var i, s, l;
-        if (!t.e)
-          throw new tn("Given leave edge is no tree edge.");
-        if (n.e)
-          throw new tn("Given enter edge is a tree edge already.");
-        for (t.e = !1, Cm(e.p, t), n.e = !0, vn(e.p, n), i = n.d.e - n.c.e - n.a, a2(e, n.d, t) || (i = -i), l = new M(e.e.a); l.a < l.c.c.length; )
-          s = f(O(l), 61), a2(e, s, t) || (s.e += i);
-        e.j = 1, Nv(e.c), X3(e, f(O(new M(e.e.a)), 61)), jR(e);
-      }
-      function xQ(e, t) {
-        var n, i, s, l, h, v, p, m, S, x, L, j;
-        if (e.V())
-          return new Yr();
-        for (m = 0, x = 0, s = e.mb(); s.G(); )
-          i = f(s.H(), 55), l = i.e, m = je(m, l.a), x += l.a * l.b;
-        for (m = je(m, Math.sqrt(x) * f(z(f(e.mb().H(), 55), (le(), Ph)), 15).a), L = 0, j = 0, p = 0, n = t, v = e.mb(); v.G(); )
-          h = f(v.H(), 55), S = h.e, L + S.a > m && (L = 0, j += p + t, p = 0), Pg(h, L, j), n = je(n, L + S.a), p = je(p, S.b), L += S.a + t;
-        return new ot(n + t, j + p + t);
-      }
-      function v2(e, t, n, i) {
-        var s, l, h;
-        return h = new mD(t, n), e.a ? i ? (s = f(Kt(e.b, t), 126), ++s.a, h.d = i.d, h.e = i.e, h.b = i, h.c = i, i.e ? i.e.c = h : f(Kt(e.b, t), 126).b = h, i.d ? i.d.b = h : e.a = h, i.d = h, i.e = h) : (e.e.b = h, h.d = e.e, e.e = h, s = f(Kt(e.b, t), 126), s ? (++s.a, l = s.c, l.c = h, h.e = l, s.c = h) : (un(e.b, t, new T4(h)), ++e.c)) : (e.a = e.e = h, un(e.b, t, new T4(h)), ++e.c), ++e.d, h;
-      }
-      function _s(e) {
-        var t, n, i, s, l, h, v, p;
-        if (e.e)
-          throw new Ou((Al(pk), "The " + pk.j + p8));
-        for (e.d == ($n(), Po) && Ss(e, ja), n = new M(e.a.a); n.a < n.c.c.length; )
-          t = f(O(n), 78), t.f = 0;
-        for (h = new M(e.a.b); h.a < h.c.c.length; )
-          for (l = f(O(h), 25), l.r = Hr, s = l.i.mb(); s.G(); )
-            i = f(s.H(), 25), ++i.f.f;
-        for (e.b.Cc(e), p = new M(e.a.b); p.a < p.c.c.length; )
-          v = f(O(p), 25), v.p = !0;
-        return e;
-      }
-      function TQ(e, t, n, i, s) {
-        var l, h, v, p;
-        l = new qa(e), Ha(l, (et(), er)), ce(l, (Ee(), dt), (zn(), ni)), ce(l, (le(), lt), t.c.f), h = new Yn(), ce(h, lt, t.c), Bt(h, s), cn(h, l), ce(t.c, js, l), v = new qa(e), Ha(v, er), ce(v, dt, ni), ce(v, lt, t.d.f), p = new Yn(), ce(p, lt, t.d), Bt(p, s), cn(p, v), ce(t.d, js, v), Bn(t, h), kn(t, p), qc(0, n.c.length), _v(n.c, 0, l), i.c[i.c.length] = v, ce(l, Xd, gt(1)), ce(v, Xd, gt(1));
-      }
-      function LQ(e, t) {
-        var n, i, s, l, h;
-        if (h = f(z(e.f, (Ee(), dt)), 28), l = e.g.e - t.g.e, l != 0 || h == (zn(), Xg))
-          return l;
-        if (h == (zn(), yh) && (n = f(z(e, mu), 24), i = f(z(t, mu), 24), n && i && (s = n.a - i.a, s != 0)))
-          return s;
-        switch (e.g.e) {
-          case 1:
-            return mr(e.i.a, t.i.a);
-          case 2:
-            return mr(e.i.b, t.i.b);
-          case 3:
-            return mr(t.i.a, e.i.a);
-          case 4:
-            return mr(t.i.b, e.i.b);
-          default:
-            throw new Ou(m8);
-        }
-      }
-      function iR(e) {
-        var t, n, i, s, l, h, v, p, m, S, x;
-        for (v = new Se(), l = ge(Ot(e.g.sb(e.g.Y() - 1))), x = e.g.mb(); x.G(); )
-          S = Ot(x.H()), Ac(v, 0, l - (or(S), S));
-        for (h = Dy(Sy(e)), m = new Se(), s = new M(v), p = new Se(), t = 0; t < e.c - 1; t++)
-          Le(m, Ot(O(s)));
-        for (i = Jt(h, 0); i.b != i.d.c; )
-          n = f(Ft(i), 10), Le(m, Ot(O(s))), Le(p, new iy(n, m)), Sn(0, m.c.length), m.c.splice(0, 1);
-        return new I3(e.e, e.f, e.d, e.c, v, p);
-      }
-      function wC(e, t, n, i, s) {
-        var l, h, v, p, m;
-        return l = t.$b(n, e.b), l < 0 ? (v = e.e, v ? (h = v.d, e.e = wC(v, t, n, i, s), s[0] == 0 && ++e.a, e.j = Tr(e.j, i), e.e.d == h ? e : vu(e)) : (s[0] = 0, o3(e, n, i))) : l > 0 ? (p = e.g, p ? (h = p.d, e.g = wC(p, t, n, i, s), s[0] == 0 && ++e.a, e.j = Tr(e.j, i), e.g.d == h ? e : vu(e)) : (s[0] = 0, a3(e, n, i))) : (s[0] = e.c, m = Tr(e.c, i), _f(Iy(m, yr) <= 0), e.c += i, e.j = Tr(e.j, i), e);
-      }
-      function PQ(e, t) {
-        var n, i, s, l, h, v;
-        s = R0(t, `,|;|\\(|\\)|\\[|\\]|\\{|\\}| |	|
-`), Bs(e);
-        try {
-          for (i = 0, h = 0, l = 0, v = 0; i < s.length; )
-            s[i] != null && $v(Wc(s[i])) > 0 && (h % 2 == 0 ? l = L0(s[i]) : v = L0(s[i]), h > 0 && h % 2 != 0 && rn(e, new ot(l, v)), ++h), ++i;
-        } catch (p) {
-          throw p = Ur(p), xe(p, 130) ? (n = p, new tn("The given string does not match the expected format for vectors." + n)) : Kr(p);
-        }
-      }
-      function aR(e, t, n) {
-        var i, s, l, h, v, p, m, S;
-        for (s = !0, h = new M(t.c); h.a < h.c.c.length; ) {
-          for (l = f(O(h), 16), m = Hr, p = new M(l.a); p.a < p.c.c.length; )
-            if (v = f(O(p), 9), S = ge(n.n[v.k]) + ge(n.d[v.k]) - v.e.d, i = ge(n.n[v.k]) + ge(n.d[v.k]) + v.j.b + v.e.a, S > m && i > m)
-              m = ge(n.n[v.k]) + ge(n.d[v.k]) + v.j.b + v.e.a;
-            else {
-              s = !1, e.a && Rl();
-              break;
-            }
-          if (!s)
-            break;
-        }
-        return e.a && Rl(), s;
-      }
-      function DQ(e) {
-        var t, n, i, s, l, h, v, p;
-        return isNaN(e) ? (o0(), Cx) : e < -9223372036854776e3 ? (o0(), X8) : e >= 9223372036854776e3 ? (o0(), Z8) : (s = !1, e < 0 && (s = !0, e = -e), i = 0, e >= tc && (i = Xn(e / tc), e -= i * tc), n = 0, e >= Jl && (n = Xn(e / Jl), e -= n * Jl), t = Xn(e), l = Gu(t, n, i), s && (h = ~l.l + 1 & Va, v = ~l.m + (h == 0 ? 1 : 0) & Va, p = ~l.h + (h == 0 && v == 0 ? 1 : 0) & ec, l.l = h, l.m = v, l.h = p), l);
-      }
-      function jQ(e) {
-        var t, n, i, s, l, h, v;
-        if (s = pg(e), Nc(new M(s))) {
-          for (v = new $a(0, 0, e.e.j.a, e.e.j.b), n = new M(s); n.a < n.c.c.length; )
-            t = f(O(n), 129), i = new $a(t.e.i.a, t.e.i.b, t.e.j.a, t.e.j.b), wg(v, i);
-          h = new WS((l = f(e.e, 7).d, new qo(l.d, l.b, l.a, l.c))), h.d = -v.e, h.a = v.e + v.b - e.e.j.b, h.b = -v.d, h.c = v.d + v.c - e.e.j.a, f(e.e, 7).d.b = h.b, f(e.e, 7).d.d = h.d, f(e.e, 7).d.c = h.c, f(e.e, 7).d.a = h.a;
-        }
-      }
-      function oR(e) {
-        var t, n, i, s, l;
-        for (l = new M(e.f); l.a < l.c.c.length; )
-          for (s = f(O(l), 7), i = new M(s.e); i.a < i.c.c.length; )
-            if (n = f(O(i), 12), He(z(n.d.f, (zt(), Er))) !== He(($i(), Tu)))
-              throw new t1((t = n0(e), ax + (t ?? o1(e.k)) + "' has its layer constraint set to LAST or LAST_SEPARATE, but has at least one outgoing edge. Connections between nodes with these " + ox));
-      }
-      function NQ(e, t, n, i) {
-        var s, l, h, v, p, m;
-        for (l = new M(e); l.a < l.c.c.length; ) {
-          if (s = f(O(l), 12), h = s.c, t.a.R(h))
-            v = (_c(), Ks);
-          else if (n.a.R(h))
-            v = (_c(), hf);
-          else
-            throw new tn("Source port must be in one of the port sets.");
-          if (p = s.d, t.a.R(p))
-            m = (_c(), Ks);
-          else if (n.a.R(p))
-            m = (_c(), hf);
-          else
-            throw new tn("Target port must be in one of the port sets.");
-          Le(i, new sA(s, v, m));
-        }
-      }
-      function sR(e, t) {
-        var n, i, s, l, h, v;
-        if ("edges" in t.a) {
-          if (v = Mn(t, "edges"), !v.hc())
-            throw new gs("The 'edges' property of a node has to be an array.", v, t);
-          for (l = v.hc(), h = 0; h < l.a.length; ++h) {
-            if (s = Fu(l, h), !s.kc())
-              throw new gs("All elements of the 'edges' property must be objects.", s, t);
-            Vee(e, s.kc());
-          }
-        }
-        if (zd in t.a)
-          for (i = Mn(t, zd).hc(), h = 0; h < i.a.length; ++h)
-            n = Fu(i, h).kc(), sR(e, n);
-      }
-      function A0(e) {
-        var t, n, i, s, l, h, v, p;
-        for (i = new M(e.a.a); i.a < i.c.c.length; ) {
-          for (n = f(O(i), 78), n.g = null, h = (p = new Wt(n.a.a).a.bb().mb(), new Zt(p)); h.a.G(); )
-            s = (t = f(h.a.H(), 21), f(t.yb(), 25)), Rs(s.g), (!n.g || s.j.d < n.g.j.d) && (n.g = s);
-          for (l = (v = new Wt(n.a.a).a.bb().mb(), new Zt(v)); l.a.G(); )
-            s = (t = f(l.a.H(), 21), f(t.yb(), 25)), s.g.a = s.j.d - n.g.j.d, s.g.b = s.j.e - n.g.j.e;
-        }
-        return e;
-      }
-      function IQ(e, t) {
-        var n, i, s, l, h, v, p, m, S, x, L, j, I;
-        for (n = !1, j = Mg * e.b.f * e.b.d, s = new M(t.c); s.a < s.c.c.length; )
-          for (i = f(O(s), 16), m = new M(i.a), l = f(O(m), 9), S = h4(e.a[l.k]); m.a < m.c.c.length; )
-            v = f(O(m), 9), x = h4(e.a[v.k]), S != x && (L = Kv(e.b, l, v), h = l.i.b + l.j.b + l.e.a + S.a + L, p = v.i.b - v.e.d + x.a, h > p + j && (I = S.i + x.i, x.a = (x.i * x.a + S.i * S.a) / I, x.i = I, S.g = x, n = !0)), l = v, S = x;
-        return n;
-      }
-      function MQ(e) {
-        var t, n, i, s, l, h;
-        if (He(z(e, (Ee(), dt))) === He((zn(), es)) || He(z(e, dt)) === He(ni)) {
-          for (h = new M(e.f); h.a < h.c.c.length; )
-            if (l = f(O(h), 7), l.g == (we(), rt) || l.g == ct)
-              return !1;
-        }
-        if (ds(f(z(e, dt), 28))) {
-          for (s = Jn(e, (we(), Be)).mb(); s.G(); )
-            if (i = f(s.H(), 7), i.b.c.length != 0)
-              return !1;
-        }
-        for (n = Dt(En(e)); xt(n); )
-          if (t = f(Et(n), 12), t.c.f == t.d.f)
-            return !1;
-        return !0;
-      }
-      function uR(e, t) {
-        var n, i, s, l, h, v, p, m, S;
-        if (s = e.f, h = s.j.a, l = s.j.b, h <= 0 && l <= 0)
-          return we(), cr;
-        switch (m = e.i.a, S = e.i.b, v = e.j.a, n = e.j.b, t.e) {
-          case 2:
-          case 1:
-            if (m < 0)
-              return we(), qe;
-            if (m + v > h)
-              return we(), Be;
-            break;
-          case 4:
-          case 3:
-            if (S < 0)
-              return we(), rt;
-            if (S + n > l)
-              return we(), ct;
-        }
-        return p = (m + v / 2) / h, i = (S + n / 2) / l, p + i <= 1 && p - i <= 0 ? (we(), qe) : p + i >= 1 && p - i >= 0 ? (we(), Be) : i < 0.5 ? (we(), rt) : (we(), ct);
-      }
-      function cR(e, t, n, i, s, l, h) {
-        var v, p, m, S, x, L;
-        for (L = new lm(), m = t.mb(); m.G(); )
-          for (v = f(m.H(), 627), x = new M(yO(v)); x.a < x.c.c.length; )
-            S = f(O(x), 129), He(nr(S, (Ee(), da))) === He((ys(), ph)) && (tR(L, S, !1, i, s, l, h), wg(e, L));
-        for (p = n.mb(); p.G(); )
-          for (v = f(p.H(), 627), x = new M(yO(v)); x.a < x.c.c.length; )
-            S = f(O(x), 129), He(nr(S, (Ee(), da))) === He((ys(), sl)) && (tR(L, S, !0, i, s, l, h), wg(e, L));
-      }
-      function mC(e, t) {
-        var n, i, s, l, h, v, p, m;
-        for (p = new M(t.f); p.a < p.c.c.length; )
-          for (v = f(O(p), 7), s = Dt(ya((dr(), new Qn(ur(re(ie(Ze, 1), Me, 1, 4, [v.b, v.e])))))); xt(s); )
-            i = f(Et(s), 12), n = i.c == v ? i.d : i.c, l = n.f, t != l && (m = f(z(i, (le(), Xa)), 24).a, m < 0 && (m = 0), h = l.k, e.b[h] == 0 && (i.d == n ? (e.a[h] -= m + 1, e.a[h] <= 0 && e.c[h] > 0 && rn(e.e, l)) : (e.c[h] -= m + 1, e.c[h] <= 0 && e.a[h] > 0 && rn(e.d, l))));
-      }
-      function OQ(e, t) {
-        var n, i, s, l, h, v, p, m, S;
-        for (h = new M(t.c); h.a < h.c.c.length; )
-          for (l = f(O(h), 16), m = new M(l.a); m.a < m.c.c.length; ) {
-            for (p = f(O(m), 9), S = new Se(), v = 0, s = Dt(Lr(p)); xt(s); )
-              n = f(Et(s), 12), f(z(n, (le(), Xa)), 24).a > v && (v = f(z(n, Xa), 24).a);
-            for (i = Dt(Lr(p)); xt(i); )
-              n = f(Et(i), 12), p.d != n.c.f.d && f(z(n, (le(), Xa)), 24).a == v && Le(S, new pr(n.c.f, n));
-            Ya(S, e.c), Ac(e.b, p.k, S);
-          }
-      }
-      function AQ(e, t) {
-        var n, i, s, l, h, v, p, m, S;
-        for (h = new M(t.c); h.a < h.c.c.length; )
-          for (l = f(O(h), 16), m = new M(l.a); m.a < m.c.c.length; ) {
-            for (p = f(O(m), 9), S = new Se(), v = 0, s = Dt(En(p)); xt(s); )
-              n = f(Et(s), 12), f(z(n, (le(), Xa)), 24).a > v && (v = f(z(n, Xa), 24).a);
-            for (i = Dt(En(p)); xt(i); )
-              n = f(Et(i), 12), p.d != n.d.f.d && f(z(n, (le(), Xa)), 24).a == v && Le(S, new pr(n.d.f, n));
-            Ya(S, e.c), Ac(e.f, p.k, S);
-          }
-      }
-      function yC(e) {
-        kM();
-        var t, n, i, s, l, h, v, p, m, S;
-        for (this.b = new Tf(), this.c = new Se(), this.a = new Se(), p = b3(), m = 0, S = p.length; m < S; ++m)
-          v = p[m], ZS(vl, v, new Se());
-        for (n = e.mb(); n.G(); )
-          t = f(n.H(), 75), Tn(this.a, ay(t)), t.g.a.Y() == 0 ? f(Zf(vl, t.e), 20).ib(t) : Le(this.c, t);
-        for (l = (h = new Ev(vl).a.bb().mb(), new Sv(h)); l.a.G(); )
-          s = (i = f(l.a.H(), 21), f(i.zb(), 20)), Ya(s, this.b);
-        D0(f(Zf(vl, (wi(), No)), 20));
-      }
-      function lR(e, t) {
-        var n, i, s, l, h, v, p;
-        if (p = f(z(t, (Ee(), dt)), 28), p == (zn(), es) || p == ni)
-          for (l = (n = f(z(t, (le(), os)), 15).a, new ot(t.e.a + t.a.b + t.a.c + 2 * n, t.e.b + t.a.d + t.a.a + 2 * n)).b, v = new M(e.a); v.a < v.c.c.length; )
-            h = f(O(v), 9), h.g == (et(), Cn) && (i = f(z(h, _r), 32), !(i != (we(), Be) && i != qe) && (s = ge(Ot(z(h, xu))), p == es && (s *= l), h.i.b = s - f(z(h, wu), 10).b, w0(h, !1, !0)));
-      }
-      function fR(e, t) {
-        var n, i, s, l, h, v, p, m;
-        for (n = new qa(e.d.c), Ha(n, (et(), Ii)), ce(n, (Ee(), dt), f(z(t, dt), 28)), ce(n, ia, f(z(t, ia), 86)), n.k = e.d.b++, Le(e.b, n), n.j.b = t.j.b, n.j.a = 0, m = (we(), Be), l = Gc(Jn(t, m)), p = new M(l); p.a < p.c.c.length; )
-          v = f(O(p), 7), cn(v, n);
-        return h = new Yn(), Bt(h, m), cn(h, t), h.i.a = n.j.a, h.i.b = n.j.b / 2, s = new Yn(), Bt(s, Oy(m)), cn(s, n), s.i.b = n.j.b / 2, s.i.a = -s.j.a, i = new bs(), Bn(i, h), kn(i, s), n;
-      }
-      function RQ(e, t, n) {
-        var i, s, l, h, v, p, m, S, x, L, j, I;
-        for (p = new Im(), lK(e, p), s = new GM(t), j = new Se(), Le(j, (I = e.j, f(zD(Vj(I || (e.j = new LP(e)))), 7))), L = new Se(); j.c.length != 0; ) {
-          for (v = f(O(new M(j)), 7), L.c[L.c.length] = v, i = B4(e, v), h = new Qh(i.b.mb()); h.b.G(); )
-            if (l = f(h.b.H(), 12), gZ(s, l, n))
-              for (x = f(o2(p, l), 20), S = x.mb(); S.G(); )
-                m = f(S.H(), 7), Di(L, m, 0) != -1 || (j.c[j.c.length] = m);
-          Cr(j, v);
-        }
-        return s;
-      }
-      function R0(e, t) {
-        var n, i, s, l, h, v, p;
-        for (n = RegExp(t, "g"), v = ve(_2, Dr, 2, 0, 5, 1), i = 0, p = e, l = null; ; )
-          if (h = n.exec(p), h == null || p == "") {
-            v[i] = p;
-            break;
-          } else
-            v[i] = zm(p, 0, h.index), p = zm(p, h.index + h[0].length, (mn(), p.length)), n.lastIndex = 0, l == p && (v[i] = p.substr(0, 1), p = gd(p, 1, p.length - 1)), l = p, ++i;
-        if (mn(), e.length > 0) {
-          for (s = v.length; s > 0 && v[s - 1] == ""; )
-            --s;
-          s < v.length && (v.length = s);
-        }
-        return v;
-      }
-      function BQ(e) {
-        var t, n, i, s, l, h;
-        for (h = new M(Xu(e.e)); h.a < h.c.c.length; )
-          switch (l = f(O(h), 161), f(l.e, 7).g.e) {
-            case 4:
-              e.q.b = je(e.q.b, (n = f(l.e, 7).d, new qo(n.d, n.b, n.a, n.c)).c);
-              break;
-            case 2:
-              e.q.c = je(e.q.c, (i = f(l.e, 7).d, new qo(i.d, i.b, i.a, i.c)).b);
-              break;
-            case 1:
-              e.q.d = je(e.q.d, (s = f(l.e, 7).d, new qo(s.d, s.b, s.a, s.c)).a);
-              break;
-            case 3:
-              e.q.a = je(e.q.a, (t = f(l.e, 7).d, new qo(t.d, t.b, t.a, t.c)).d);
-          }
-      }
-      function kC(e, t, n, i, s) {
-        var l, h, v;
-        return l = t.$b(n, e.b), l < 0 ? (h = e.e, h ? (e.e = kC(h, t, n, i, s), i == 0 && s[0] != 0 ? --e.a : i > 0 && s[0] == 0 && ++e.a, e.j = Tr(e.j, i - s[0]), vu(e)) : (s[0] = 0, i > 0 ? o3(e, n, i) : e)) : l > 0 ? (v = e.g, v ? (e.g = kC(v, t, n, i, s), i == 0 && s[0] != 0 ? --e.a : i > 0 && s[0] == 0 && ++e.a, e.j = Tr(e.j, i - s[0]), vu(e)) : (s[0] = 0, i > 0 ? a3(e, n, i) : e)) : (s[0] = e.c, i == 0 ? sC(e) : (e.j = Tr(e.j, i - e.c), e.c = i, e));
-      }
-      function zQ(e) {
-        var t, n, i, s, l, h, v;
-        for (e.o = new Y5(), i = new Wr(), h = new M(e.e.a); h.a < h.c.c.length; )
-          l = f(O(h), 61), Kl(l).c.length == 1 && wr(i, l, i.c.b, i.c);
-        for (; i.b != 0; )
-          l = f(i.b == 0 ? null : (ut(i.b != 0), zs(i, i.a.a)), 61), Kl(l).c.length != 0 && (t = f(_e(Kl(l), 0), 89), n = l.g.c.length > 0, v = _y(t, l), PS(n ? v.c : v.g, t), Kl(v).c.length == 1 && wr(i, v, i.c.b, i.c), s = new pr(l, t), t9(e.o, s), Cr(e.e.a, l));
-      }
-      function EC(e, t, n, i, s) {
-        var l, h, v;
-        return l = t.$b(n, e.b), l < 0 ? (h = e.e, h ? (e.e = EC(h, t, n, i, s), s[0] > 0 && (i >= s[0] ? (--e.a, e.j = Ku(e.j, s[0])) : e.j = Ku(e.j, i)), s[0] == 0 ? e : vu(e)) : (s[0] = 0, e)) : l > 0 ? (v = e.g, v ? (e.g = EC(v, t, n, i, s), s[0] > 0 && (i >= s[0] ? (--e.a, e.j = Ku(e.j, s[0])) : e.j = Ku(e.j, i)), vu(e)) : (s[0] = 0, e)) : (s[0] = e.c, i >= e.c ? sC(e) : (e.c -= i, e.j = Ku(e.j, i), e));
-      }
-      function hR(e, t, n) {
-        var i, s, l, h, v, p, m, S;
-        for (p = new M(n.b); p.a < p.c.c.length; )
-          v = f(O(p), 9), h = f(z(v, (le(), pl)), 55), h && (S = hR(e, t, h), v.j.a = (l = f(z(S, os), 15).a, new ot(S.e.a + S.a.b + S.a.c + 2 * l, S.e.b + S.a.d + S.a.a + 2 * l)).a, v.j.b = (s = f(z(S, os), 15).a, new ot(S.e.a + S.a.b + S.a.c + 2 * s, S.e.b + S.a.d + S.a.a + 2 * s)).b);
-        return m = new j1(), i = qf(z(n, (Ee(), Ox))), i != null && zo(i, "de.cau.cs.kieler.fixed") ? Yee(n, m) : IZ(t, n, m), n;
-      }
-      function dR(e) {
-        var t, n, i, s, l, h, v, p;
-        v = f(z(e, (Ee(), ic)), 18), p = f(z(e, Zg), 18), i = f(z(e, (le(), os)), 15).a, e.d.a += i, e.d.b += i, e.e.a += 2 * i, e.e.b += 2 * i, ce(e, os, new Ut(0)), s = (n = f(z(e, os), 15).a, new ot(e.e.a + e.a.b + e.a.c + 2 * n, e.e.b + e.a.d + e.a.a + 2 * n)), t = new qn(s), v.kb((du(), Jg)) && (h = f(z(e, Fd), 15).a, l = f(z(e, Yd), 15).a, p.kb((sh(), tb)) && (h <= 0 && (h = 20), l <= 0 && (l = 20)), t.a = je(s.a, h), t.b = je(s.b, l)), rJ(e, s, t);
-      }
-      function vR(e, t, n) {
-        var i, s, l, h, v, p, m, S;
-        if (t.k == 0) {
-          for (t.k = 1, h = n, n || (s = new Se(), l = (i = f(Hi(Nr), 11), new ti(i, f(xi(i, i.length), 11), 0)), h = new pr(s, l)), f(h.a, 20).ib(t), t.g == (et(), Cn) && f(h.b, 18).ib(f(z(t, (le(), _r)), 32)), p = new M(t.f); p.a < p.c.c.length; )
-            for (v = f(O(p), 7), S = Dt(ya((dr(), new Qn(ur(re(ie(Ze, 1), Me, 1, 4, [new Zh(v), new Lf(v)])))))); xt(S); )
-              m = f(Et(S), 7), vR(e, m.f, h);
-          return h;
-        }
-        return null;
-      }
-      function HQ(e, t, n, i) {
-        var s, l, h, v, p;
-        switch (p = new qn(t.i), p.a += t.j.a / 2, p.b += t.j.b / 2, v = f(z(t, (le(), Qd)), 15).a, l = e.e, h = e.a, s = e.d, f(z(t, _r), 32).e) {
-          case 1:
-            p.a += h.b + s.a - n / 2, p.b = -i - v, t.i.b = -(h.d + v + s.b);
-            break;
-          case 2:
-            p.a = l.a + h.b + h.c + v, p.b += h.d + s.b - i / 2, t.i.a = l.a + h.c + v - s.a;
-            break;
-          case 3:
-            p.a += h.b + s.a - n / 2, p.b = l.b + h.d + h.a + v, t.i.b = l.b + h.a + v - s.b;
-            break;
-          case 4:
-            p.a = -n - v, p.b += h.d + s.b - i / 2, t.i.a = -(h.b + v + s.a);
-        }
-        return p;
-      }
-      function _Q(e, t) {
-        var n, i, s, l, h, v, p;
-        for (l = new M(t.b); l.a < l.c.c.length; )
-          s = f(O(l), 9), h = z(s, (le(), lt)), xe(h, 7) && (v = f(h, 7), p = HQ(t, s, v.j.a, v.j.b), v.i.a = p.a, v.i.b = p.b, Bt(v, f(z(s, _r), 32)));
-        n = (i = f(z(t, (le(), os)), 15).a, new ot(t.e.a + t.a.b + t.a.c + 2 * i, t.e.b + t.a.d + t.a.a + 2 * i)), f(z(t, qr), 18).kb((vr(), as)) ? (ce(e, (Ee(), dt), (zn(), ni)), f(z(Ti(e), qr), 18).ib(df), OC(e, n, !1)) : OC(e, n, !0);
-      }
-      function SC(e, t, n) {
-        var i, s, l, h, v;
-        switch (v = null, t.e) {
-          case 1:
-            for (s = new M(e.f); s.a < s.c.c.length; )
-              if (i = f(O(s), 7), Pt(ge(jt(z(i, (le(), sE))))))
-                return i;
-            v = new Yn(), ce(v, (le(), sE), (yn(), yn(), ii));
-            break;
-          case 2:
-            for (h = new M(e.f); h.a < h.c.c.length; )
-              if (l = f(O(h), 7), Pt(ge(jt(z(l, (le(), uE))))))
-                return l;
-            v = new Yn(), ce(v, (le(), uE), (yn(), yn(), ii));
-        }
-        return v && (cn(v, e), Bt(v, n), IK(v.i, e.j, n)), v;
-      }
-      function gR(e, t) {
-        var n, i, s, l, h, v, p;
-        return vt(t), _f(e.a.t(t.a)), i = e.b, l = e.e, h = e.d, e.b ? t.b && (n = e.a.$b(e.e, t.e), (n < 0 || n == 0 && t.d == (yo(), Wa)) && (l = t.e, h = t.d)) : (i = t.b, l = t.e, h = t.d), s = e.c, v = e.g, p = e.f, e.c ? t.c && (n = e.a.$b(e.g, t.g), (n > 0 || n == 0 && t.f == (yo(), Wa)) && (v = t.g, p = t.f)) : (s = t.c, v = t.g, p = t.f), i && s && (n = e.a.$b(l, v), (n > 0 || n == 0 && h == (yo(), Wa) && p == (yo(), Wa)) && (l = v, h = (yo(), Wa), p = Z0)), new j0(e.a, i, l, h, s, v, p);
-      }
-      function GQ(e, t, n, i) {
-        var s, l, h, v, p, m, S;
-        if (n.c.f != t.f)
-          for (s = new qa(e), Ha(s, (et(), hn)), ce(s, (le(), lt), n), ce(s, (Ee(), dt), (zn(), ni)), i.c[i.c.length] = s, h = new Yn(), cn(h, s), Bt(h, (we(), qe)), v = new Yn(), cn(v, s), Bt(v, Be), kn(n, h), l = new bs(), hu(l, n), ce(l, Un, null), Bn(l, v), kn(l, t), pA(s, h, v), m = new fn(n.b, 0); m.b < m.d.Y(); )
-            p = (ut(m.b < m.d.Y()), f(m.d.sb(m.c = m.b++), 33)), S = f(z(p, da), 107), S == (ys(), sl) && (So(m), Le(l.b, p));
-      }
-      function $Q(e, t, n, i) {
-        var s, l, h, v, p, m, S, x, L, j, I, R, Y;
-        for (l = n + (t.n + 1) * e.a, h = t.b, s = new ot(l, h), p = (S = new Wt(t.c.a).a.bb().mb(), new Zt(S)); p.a.G(); )
-          v = (m = f(p.a.H(), 21), f(m.yb(), 12)), I = Pi(v.d), x = Pi(v.c), j = new ot(l, x.b), Y = new ot(l, I.b), L = new ot(n - 10, x.b), R = new ot(i, I.b), I.a >= i && x.a >= i && (L.a = i), I.a <= n && x.a <= n && (R.a = n - 10), t.c.a.Y() == 1 ? U4(v.a, re(ie(_t, 1), Ht, 10, 0, [L, j, Y, R])) : U4(v.a, re(ie(_t, 1), Ht, 10, 0, [L, j, s, Y, R]));
-      }
-      function bu(e, t) {
-        var n, i, s, l, h, v;
-        for (l = e.c, h = e.d, Bn(e, null), kn(e, null), t && Pt(ge(jt(z(h, (le(), sE))))) ? Bn(e, SC(h.f, (sr(), ri), (we(), Be))) : Bn(e, h), t && Pt(ge(jt(z(l, (le(), uE))))) ? kn(e, SC(l.f, (sr(), Ai), (we(), qe))) : kn(e, l), i = new M(e.b); i.a < i.c.c.length; )
-          n = f(O(i), 33), s = f(z(n, (Ee(), da)), 107), s == (ys(), ph) ? ce(n, da, sl) : s == sl && ce(n, da, ph);
-        v = Pt(ge(jt(z(e, (le(), Xs))))), ce(e, Xs, (yn(), v ? Rn : ii)), e.a = Dy(e.a);
-      }
-      function CC(e) {
-        var t, n, i, s, l, h;
-        for (DS(this), n = e.Y() - 1; n < 3; n++)
-          e.rb(0, f(e.sb(0), 10));
-        if (e.Y() < 4)
-          throw new tn("At (least dimension + 1) control points are necessary!");
-        for (this.c = 3, this.e = !0, this.f = !0, this.d = !1, dX(this, e.Y() + this.c - 1), h = new Se(), l = this.g.mb(), t = 0; t < this.c - 1; t++)
-          Le(h, Ot(l.H()));
-        for (s = e.mb(); s.G(); )
-          i = f(s.H(), 10), Le(h, Ot(l.H())), this.b.ib(new iy(i, h)), Sn(0, h.c.length), h.c.splice(0, 1);
-      }
-      function YQ(e) {
-        var t, n, i, s, l, h, v, p, m, S, x;
-        for (x = new Cw(), x.d = 0, h = new M(e.c); h.a < h.c.c.length; )
-          l = f(O(h), 16), x.d += l.a.c.length;
-        for (i = 0, s = 0, x.a = ve(Kn, Wn, 26, e.c.c.length, 12, 1), m = 0, x.e = ve(Kn, Wn, 26, x.d, 12, 1), n = new M(e.c); n.a < n.c.c.length; )
-          for (t = f(O(n), 16), t.k = i++, x.a[t.k] = s++, S = 0, p = new M(t.a); p.a < p.c.c.length; )
-            v = f(O(p), 9), v.k = m++, x.e[v.k] = S++;
-        return x.c = new XP(x), x.b = Ic(x.d), OQ(x, e), x.f = Ic(x.d), AQ(x, e), x;
-      }
-      function FQ(e, t) {
-        var n, i, s, l, h, v, p, m, S, x, L, j, I, R;
-        for (v = ve(Kn, Wn, 26, t.c.c.length, 12, 1), m = ve(aT, De, 132, t.c.c.length, 0, 1), x = e.a, L = 0, j = x.length; L < j; ++L) {
-          for (S = x[L], R = 0, h = new M(S.f); h.a < h.c.c.length; )
-            s = f(O(h), 9), p = s.g, i = ea(s.d), ++v[i], I = e.b.a * e.b.d, v[i] > 0 && m[i] && (I = Om(e.b, m[i], p)), R = je(R, s.d.c.b + I);
-          for (l = new M(S.f); l.a < l.c.c.length; )
-            s = f(O(l), 9), s.i.b = R + s.e.d, n = s.d, n.c.b = R + s.e.d + s.j.b + s.e.a, m[Di(n.b.c, n, 0)] = s.g;
-        }
-      }
-      function bR(e) {
-        var t, n, i, s, l, h, v, p, m, S;
-        for (p = new M(e.a); p.a < p.c.c.length; )
-          if (v = f(O(p), 9), v.g == (et(), Cn) && (s = f(z(v, (le(), _r)), 32), s == (we(), Be) || s == qe))
-            for (i = Dt(yg(v)); xt(i); )
-              n = f(Et(i), 12), t = n.a, t.b != 0 && (m = n.c, m.f == v && (l = (ut(t.b != 0), f(t.a.a.c, 10)), l.b = ln(re(ie(_t, 1), Ht, 10, 0, [m.f.i, m.i, m.a])).b), S = n.d, S.f == v && (h = (ut(t.b != 0), f(t.c.b.c, 10)), h.b = ln(re(ie(_t, 1), Ht, 10, 0, [S.f.i, S.i, S.a])).b));
-      }
-      function qQ(e, t, n, i) {
-        var s, l, h, v, p, m;
-        for (h = new LR(e, t, n), p = new fn(i, 0), s = !1; p.b < p.d.Y(); )
-          v = (ut(p.b < p.d.Y()), f(p.d.sb(p.c = p.b++), 102)), v == t || v == n ? So(p) : !s && ge(ka(v.g, v.d[0]).a) > ge(ka(h.g, h.d[0]).a) ? (ut(p.b > 0), p.a.sb(p.c = --p.b), su(p, h), s = !0) : v.e && v.e.Y() > 0 && (l = (!v.e && (v.e = new Se()), v.e).nb(t), m = (!v.e && (v.e = new Se()), v.e).nb(n), (l || m) && ((!v.e && (v.e = new Se()), v.e).ib(h), ++h.c));
-        s || (i.c[i.c.length] = h);
-      }
-      function VQ(e, t, n, i) {
-        var s, l, h, v, p, m, S, x, L, j, I;
-        n.d.f != t.f && (s = new qa(e), Ha(s, (et(), hn)), ce(s, (le(), lt), n), ce(s, (Ee(), dt), (zn(), ni)), i.c[i.c.length] = s, h = new Yn(), cn(h, s), Bt(h, (we(), qe)), v = new Yn(), cn(v, s), Bt(v, Be), p = n.d, kn(n, h), l = new bs(), hu(l, n), ce(l, Un, null), Bn(l, v), kn(l, p), m = f(_e(h.b, 0), 12).c, S = m.f, x = S.g, L = f(_e(v.e, 0), 12).d, j = L.f, I = j.g, x == hn ? ce(s, Mi, f(z(S, Mi), 7)) : ce(s, Mi, m), I == hn ? ce(s, Si, f(z(j, Si), 7)) : ce(s, Si, L));
-      }
-      function WQ(e, t, n) {
-        var i, s, l, h, v, p, m, S, x, L, j, I, R, Y, q;
-        return v = e.b[t], p = e.b[n], m = f(z(v, (le(), Dh)), 20), !!m && m.Y() != 0 && m.kb(p) || (S = v.g != (et(), hn) && p.g != hn, x = f(z(v, bl), 9), L = f(z(p, bl), 9), j = !!x && x != v || !!L && L != p, I = x != L, R = UO(v, (we(), rt)), Y = UO(p, ct), q = j && I || R || Y, S && q) || v.g == (et(), er) && p.g == Hn || p.g == (et(), er) && v.g == Hn ? !1 : (h = e.b[t], i = e.b[n], QK(e.c, h, i), rZ(e.d, h, i), l = MM(e.a, h, i) + e.c.d + e.d.d, s = MM(e.a, i, h) + e.c.b + e.d.b, l > s);
-      }
-      function UQ(e, t) {
-        var n, i, s, l, h, v, p, m, S, x, L, j, I, R;
-        for (h = t, L = t.d, S = t.c.f, j = t.d.f, x = ea(S.d), I = ea(j.d), v = x; v < I; v++)
-          s = new qa(e), Ha(s, (et(), hn)), ce(s, (le(), lt), h), ce(s, (Ee(), dt), (zn(), ni)), p = f(_e(e.c, v + 1), 16), Ar(s, p), R = f(z(h, Jo), 15).a, R < 0 && (R = 0, ce(h, Jo, new Ut(R))), s.j.b = R, m = Math.floor(R / 2), i = new Yn(), Bt(i, (we(), qe)), cn(i, s), i.i.b = m, l = new Yn(), Bt(l, Be), cn(l, s), l.i.b = m, kn(h, i), n = new bs(), hu(n, h), ce(n, Un, null), Bn(n, l), kn(n, L), qK(s, h, n), h = n;
-      }
-      function KQ(e, t) {
-        if (wi(), e == t)
-          return $y(e);
-        switch (e.e) {
-          case 1:
-            switch (t.e) {
-              case 4:
-                return No;
-              case 1:
-                return Ds;
-              case 2:
-                return lc;
-              case 3:
-                return Cu;
-            }
-          case 2:
-            switch (t.e) {
-              case 1:
-                return lc;
-              case 2:
-                return Eu;
-              case 3:
-                return Su;
-              case 4:
-                return rs;
-            }
-          case 3:
-            switch (t.e) {
-              case 2:
-                return Su;
-              case 3:
-                return is;
-              case 4:
-                return dc;
-              case 1:
-                return Cu;
-            }
-          case 4:
-            switch (t.e) {
-              case 3:
-                return dc;
-              case 4:
-                return hc;
-              case 1:
-                return No;
-              case 2:
-                return rs;
-            }
-        }
-        return ff;
-      }
-      function ZQ(e) {
-        var t, n, i, s, l, h, v, p, m, S, x, L, j, I, R;
-        for (x = new _i(), s = null, h = new M(e.c); h.a < h.c.c.length; ) {
-          for (l = f(O(h), 16), p = new M(l.a); p.a < p.c.c.length; )
-            v = f(O(p), 9), v.g == (et(), Cn) && (S = f(z(v, (le(), Tp)), 9), S && (OK(S, x), L = new Yn(), cn(L, v), j = f(z(v, _r), 32), Bt(L, j), I = f(_e(S.f, 0), 7), R = new bs(), Bn(R, L), kn(R, I)));
-          s = l;
-        }
-        for (n = (m = new Wt(x.a).a.bb().mb(), new Zt(m)); n.a.G(); )
-          t = (i = f(n.a.H(), 21), f(i.yb(), 9)), Ar(t, s);
-        return x;
-      }
-      function pR(e, t, n) {
-        var i, s, l, h, v, p, m, S, x;
-        for (s = new Se(), m = new M(t.b); m.a < m.c.c.length; )
-          if (p = f(O(m), 9), v = f(z(p, (le(), pl)), 55), v && (i = pR(e, v, p), Tn(s, i), GJ(e, v, p), f(z(v, qr), 18).kb((vr(), as))))
-            for (x = new M(p.f); x.a < x.c.c.length; )
-              S = f(O(x), 7), Kt(e.b, S) == null && (l = B0(S, (zn(), jo), S.g, -(S.b.c.length - S.e.c.length), S.j, f(z(v, (Ee(), Do)), 59), v), ce(l, lt, S), un(e.b, S, l), Le(v.b, l));
-        return h = new Se(), FJ(e, t, n, s, h), n && BJ(e, t, n, h), h;
-      }
-      function XQ(e) {
-        var t, n, i, s, l, h, v, p, m, S, x, L;
-        for (t = CA(e), S = (v = new Wt(t).a.bb().mb(), new Zt(v)); S.a.G(); ) {
-          for (m = (s = f(S.a.H(), 21), f(s.yb(), 9)), x = m.e.d, L = m.j.b + m.e.a, e.d[m.k] = 0, n = m; (l = e.a[n.k]) != m; )
-            i = $U(n, l), e.c == (Co(), Ps) ? p = i.d.i.b + i.d.a.b - i.c.i.b - i.c.a.b : p = i.c.i.b + i.c.a.b - i.d.i.b - i.d.a.b, h = ge(e.d[n.k]) + p, e.d[l.k] = h, x = je(x, l.e.d - h), L = je(L, h + l.j.b + l.e.a), n = l;
-          n = m;
-          do
-            e.d[n.k] = ge(e.d[n.k]) + x, n = e.a[n.k];
-          while (n != m);
-          e.b[m.k] = x + L;
-        }
-      }
-      function g2(e, t, n) {
-        var i, s, l, h, v, p, m, S;
-        return i = e.a.k == (oo(), Za) ? ki : Hr, v = ZA(e, new FD(t, n)), !v.a && v.c ? (rn(e.d, v), i) : v.a ? (s = v.a.c, p = v.a.d, n ? (m = e.a.c == (Co(), cc) ? p : s, l = e.a.c == cc ? s : p, h = e.a.f[l.f.k], S = ge(e.a.n[h.k]) + ge(e.a.d[l.f.k]) + l.i.b + l.a.b - ge(e.a.d[m.f.k]) - m.i.b - m.a.b) : (m = e.a.c == (Co(), Ps) ? p : s, l = e.a.c == Ps ? s : p, S = ge(e.a.n[e.a.f[l.f.k].k]) + ge(e.a.d[l.f.k]) + l.i.b + l.a.b - ge(e.a.d[m.f.k]) - m.i.b - m.a.b), S) : i;
-      }
-      function QQ(e) {
-        var t, n, i, s, l;
-        for (ce(e.g, (le(), mL), ca(e.g.c)), t = 1; t < e.c.c.length - 1; ++t)
-          ce(f(_e(e.c, t), 9), (Ee(), ia), (gu(), Yt(Ei, re(ie(Ln, 1), De, 41, 0, [ga, Ua]))));
-        for (i = Jt(ca(e.g.c), 0); i.b != i.d.c; )
-          n = f(Ft(i), 33), s = f(z(e.g, (Ee(), ia)), 86), Wu(s, Yt((gu(), Ui), re(ie(Ln, 1), De, 41, 0, [qi, ga]))) || (Wu(s, Yt(Ui, re(ie(Ln, 1), De, 41, 0, [Wi, ga]))) ? (Le(e.e.c, n), Cr(e.g.c, n), l = new ID(e, n), ce(e.g, aE, l)) : (UX(e, n), Le(e.i, e.d), ce(e.g, aE, LK(e.i))));
-      }
-      function wR(e, t, n, i) {
-        var s, l, h, v, p, m, S;
-        if (l = By(i), v = Pt(ge(jt(z(i, (zt(), ML))))), (v || Pt(ge(jt(z(e, (Ee(), qg)))))) && !ds(f(z(e, (Ee(), dt)), 28)))
-          s = g0(l), p = SC(e, n, n == (sr(), ri) ? s : Oy(s));
-        else
-          switch (p = new Yn(), cn(p, e), S = p.i, S.a = t.a - e.i.a, S.b = t.b - e.i.b, MZ(S, e.j.a, e.j.b), Bt(p, uR(p, l)), h = f(z(i, (le(), qr)), 18), m = p.g, l.e) {
-            case 2:
-            case 1:
-              (m == (we(), rt) || m == ct) && h.ib((vr(), vf));
-              break;
-            case 4:
-            case 3:
-              (m == (we(), Be) || m == qe) && h.ib((vr(), vf));
-          }
-        return p;
-      }
-      function JQ(e) {
-        var t, n, i, s, l, h, v, p;
-        for (i = _S(Gc(e.a)), s = (t = f(Hi(Wd), 11), new ti(t, f(xi(t, t.length), 11), 0)); i.a.G() || i.b.mb().G(); )
-          n = f(J4(i), 12), v = n.c.g, p = n.d.g, v == (we(), cr) ? p != cr && (h = $y(p), ce(n, (le(), hb), h), Bt(n.c, p), hi(s, h), i.a.I()) : p == cr ? (h = $y(v), ce(n, (le(), hb), h), Bt(n.d, v), hi(s, h), i.a.I()) : (h = KQ(v, p), ce(n, (le(), hb), h), hi(s, h), i.a.I());
-        return s.c == 1 ? l = f(Yc(new Hf(s)), 60) : l = (wi(), ff), Dd(e, l, !1), l;
-      }
-      function eJ(e, t) {
-        var n, i, s, l;
-        for (s = 0; s < (mn(), t.length) && pM(t.charCodeAt(s), t8); )
-          ++s;
-        for (n = t.length; n > 0 && pM(t.charCodeAt(n - 1), n8); )
-          --n;
-        if (s >= n)
-          throw new tn("The given string does not contain any numbers.");
-        if (l = R0(t.substr(s, n - s), `,|;|\r|
-`), l.length != 2)
-          throw new tn("Exactly two numbers are expected, " + l.length + " were found.");
-        try {
-          e.a = L0(Wc(l[0])), e.b = L0(Wc(l[1]));
-        } catch (h) {
-          throw h = Ur(h), xe(h, 130) ? (i = h, new tn(r8 + i)) : Kr(h);
-        }
-      }
-      function tJ(e, t, n) {
-        var i, s, l, h, v, p, m, S, x;
-        for (p = n + t.d.c.a, x = new M(t.f); x.a < x.c.c.length; ) {
-          if (S = f(O(x), 7), i = ln(re(ie(_t, 1), Ht, 10, 0, [S.f.i, S.i, S.a])), l = new ot(0, i.b), S.g == (we(), Be))
-            l.a = p;
-          else if (S.g == qe)
-            l.a = n;
-          else
-            continue;
-          if (i.a != l.a)
-            for (s = S.e.c.length + S.b.c.length > 1, v = Dt(ya((dr(), new Qn(ur(re(ie(Ze, 1), Me, 1, 4, [S.b, S.e])))))); xt(v); )
-              h = f(Et(v), 12), m = h.c == S ? h.d : h.c, ei(ln(re(ie(_t, 1), Ht, 10, 0, [m.f.i, m.i, m.a])).b - l.b) > 1 && oX(e, h, l, s, S);
-        }
-      }
-      function mR(e, t) {
-        var n, i, s, l, h, v;
-        for (h = new Ul(new iu(e.f.b).a); h.b; ) {
-          if (l = Sd(h), s = f(l.yb(), 251), t == 1) {
-            if (s.yc() != ($n(), Ws) && s.yc() != Ts)
-              continue;
-          } else if (s.yc() != ($n(), ja) && s.yc() != Fi)
-            continue;
-          switch (i = f(f(l.zb(), 27).b, 25), v = f(f(l.zb(), 27).a, 78), n = v.c, s.yc().e) {
-            case 2:
-              i.j.d = e.e.a, i.j.c = je(1, i.j.c + n);
-              break;
-            case 1:
-              i.j.d = i.j.d + n, i.j.c = je(1, i.j.c - n);
-              break;
-            case 4:
-              i.j.e = e.e.b, i.j.b = je(1, i.j.b + n);
-              break;
-            case 3:
-              i.j.e = i.j.e + n, i.j.b = je(1, i.j.b - n);
-          }
-        }
-      }
-      function xC(e, t, n, i, s) {
-        var l, h, v, p, m, S, x, L, j;
-        for (L = (On(), new $t()), v = new Se(), aA(e, n, e.d.Mc(), v, L), aA(e, i, e.d.Nc(), v, L), p = new fn(v, 0); p.b < p.d.Y(); )
-          for (l = (ut(p.b < p.d.Y()), f(p.d.sb(p.c = p.b++), 80)), m = new fn(v, p.b); m.b < m.d.Y(); )
-            h = (ut(m.b < m.d.Y()), f(m.d.sb(m.c = m.b++), 80)), rQ(l, h, e.a);
-        for (zee(v, f(z(t, (le(), jh)), 154)), _J(v), j = -1, x = new M(v); x.a < x.c.c.length; )
-          S = f(O(x), 80), !(ei(S.k - S.a) < pu) && (j = Jr(j, S.i), e.d.Kc(S, s));
-        return e.b.a.Q(), j + 1;
-      }
-      function yR(e, t, n) {
-        var i, s;
-        switch (s = new qn(t), i = new qn(e.j), n.e) {
-          case 1:
-          case 8:
-          case 7:
-            ua(s, -i.a / 2, -i.b), ua(t, 0, -(0.5 + i.b));
-            break;
-          case 3:
-          case 4:
-          case 5:
-            ua(s, -i.a / 2, 0), ua(t, 0, 0.5 + i.b);
-            break;
-          case 0:
-            ua(s, -i.a / 2, -i.b), ua(t, 0, -(0.5 + -i.b));
-            break;
-          case 10:
-          case 2:
-            ua(s, 0, -i.b / 2), ua(t, 0, -(0.5 + i.b));
-            break;
-          case 6:
-            ua(s, -i.a, i.b / 2), ua(t, 0, -(0.5 + i.b));
-            break;
-          case 9:
-            ua(s, -i.a / 2, 0), ua(t, 0, -(0.5 + i.b));
-            break;
-          case 11:
-            ua(s, -i.a, -i.b / 2), ua(t, 0, -(0.5 + i.b));
-        }
-        return dn(Rs(e.i), s), new TO(e);
-      }
-      function nJ(e, t, n, i, s) {
-        Rl();
-        var l, h, v, p, m, S, x;
-        if (Jj(e, "src"), Jj(n, "dest"), S = kd(e), v = kd(n), u4((S.g & 4) != 0, "srcType is not an array"), u4((v.g & 4) != 0, "destType is not an array"), m = S.c, l = v.c, u4(m.g & 1 ? m == l : (l.g & 1) == 0, "Array types don't match"), x = e.length, p = n.length, t < 0 || i < 0 || s < 0 || t + s > x || i + s > p)
-          throw new G5();
-        if ((!(m.g & 1) || m.g & 4) && S != v)
-          if (e === n && t < i)
-            for (t += s, h = i + s; h-- > i; )
-              n[h] = e[--t];
-          else
-            for (h = i + s; i < h; )
-              n[i++] = e[t++];
-        else
-          s > 0 && Xy(e, t, n, i, s, !0);
-      }
-      function rJ(e, t, n) {
-        var i, s, l, h, v;
-        if (i = f(z(e, (zt(), bE)), 18), n.a > t.a && (i.kb((Pd(), Gk)) ? e.d.a += (n.a - t.a) / 2 : i.kb(Yk) && (e.d.a += n.a - t.a)), n.b > t.b && (i.kb((Pd(), qk)) ? e.d.b += (n.b - t.b) / 2 : i.kb(Fk) && (e.d.b += n.b - t.b)), f(z(e, (le(), qr)), 18).kb((vr(), as)) && (n.a > t.a || n.b > t.b))
-          for (v = new M(e.b); v.a < v.c.c.length; )
-            h = f(O(v), 9), h.g == (et(), Cn) && (s = f(z(h, _r), 32), s == (we(), Be) ? h.i.a += n.a - t.a : s == ct && (h.i.b += n.b - t.b));
-        l = e.a, e.e.a = n.a - l.b - l.c, e.e.b = n.b - l.d - l.a;
-      }
-      function TC(e, t, n, i, s, l) {
-        var h, v, p;
-        if (h = t.$b(n, e.b), h < 0)
-          return v = e.e, v ? (e.e = TC(v, t, n, i, s, l), l[0] == i && (s == 0 && l[0] != 0 ? --e.a : s > 0 && l[0] == 0 && ++e.a, e.j = Tr(e.j, s - l[0])), vu(e)) : (l[0] = 0, i == 0 && s > 0 ? o3(e, n, s) : e);
-        if (h > 0)
-          return p = e.g, p ? (e.g = TC(p, t, n, i, s, l), l[0] == i && (s == 0 && l[0] != 0 ? --e.a : s > 0 && l[0] == 0 && ++e.a, e.j = Tr(e.j, s - l[0])), vu(e)) : (l[0] = 0, i == 0 && s > 0 ? a3(e, n, s) : e);
-        if (l[0] = e.c, i == e.c) {
-          if (s == 0)
-            return sC(e);
-          e.j = Tr(e.j, s - e.c), e.c = s;
-        }
-        return e;
-      }
-      function b2(e) {
-        var t, n, i, s, l, h, v, p, m, S, x, L, j, I, R, Y;
-        for (p = e.e, j = e.f, h = e.d, I = e.c, S = I - 1, R = e.g, x = ca(e.g.xb(1, e.g.Y() - 1)), m = new Se(), n = 0; n < e.b.Y() - 1; n++)
-          v = Yo(ou(_a(f(e.b.sb(n + 1), 92).a), f(e.b.sb(n), 92).a), I / (ge(Ot(R.sb(n + I))) - ge(Ot(R.sb(n))))), m.c[m.c.length] = v;
-        for (Y = new Se(), l = Jt(x, 0), L = new Se(), t = 0; t < S - 1; t++)
-          Le(Y, Ot(Ft(l)));
-        for (s = new M(m); s.a < s.c.c.length; )
-          i = f(O(s), 10), Le(Y, Ot(Ft(l))), Le(L, new iy(i, Y)), Sn(0, Y.c.length), Y.c.splice(0, 1);
-        return new I3(p, j, h, S, x, L);
-      }
-      function kR(e) {
-        this.q = new H5(), this.p = new H5(), this.o = ve(Kn, Wn, 26, (we(), re(ie(Nr, 1), De, 32, 0, [cr, rt, Be, ct, qe])).length, 12, 1), this.i = ve(Kn, Wn, 26, re(ie(Nr, 1), De, 32, 0, [cr, rt, Be, ct, qe]).length, 12, 1), this.j = ve(Zi, mi, 26, re(ie(Nr, 1), De, 32, 0, [cr, rt, Be, ct, qe]).length, 12, 1), this.n = ve(Zi, mi, 26, re(ie(Nr, 1), De, 32, 0, [cr, rt, Be, ct, qe]).length, 12, 1), this.g = ve(Wx, De, 100, re(ie(Nr, 1), De, 32, 0, [cr, rt, Be, ct, qe]).length, 0, 1), this.c = new P3(UB), this.e = e, nD(this.o), nD(this.i), pm(this.n, 0);
-      }
-      function LC(e, t) {
-        var n, i, s, l, h, v, p, m, S;
-        if (h = t.i != null && !t.b, h || Nt(t, "Component Layout", 1), n = f(z(e, (le(), PL)), 20), l = 1 / n.Y(), Pt(ge(jt(z(e, (Ee(), Fg))))))
-          for (S = n.mb(); S.G(); )
-            m = f(S.H(), 31), iD(kd(m)), m.sc(e, Vl(t, l));
-        else
-          for (S = n.mb(); S.G(); )
-            m = f(S.H(), 31), m.sc(e, Vl(t, l));
-        for (s = new M(e.c); s.a < s.c.c.length; )
-          i = f(O(s), 16), Tn(e.b, i.a), i.a.c = ve(Ze, Me, 1, 0, 4, 1);
-        for (p = new M(e.b); p.a < p.c.c.length; )
-          v = f(O(p), 9), Ar(v, null);
-        e.c.c = ve(Ze, Me, 1, 0, 4, 1), h || Ct(t);
-      }
-      function iJ(e, t) {
-        var n, i, s, l, h, v, p, m, S, x, L;
-        for (h = new M(t); h.a < h.c.c.length; )
-          s = f(O(h), 102), s.e = null, s.c = 0;
-        for (v = null, l = new M(t); l.a < l.c.c.length; ) {
-          for (s = f(O(l), 102), S = s.d[0], L = f(z(S, (le(), Dh)), 20).mb(); L.G(); )
-            x = f(L.H(), 9), (!s.e && (s.e = new Se()), s.e).ib(e.b[x.d.k][x.k]), ++e.b[x.d.k][x.k].c;
-          if (S.g == (et(), Hn)) {
-            if (v)
-              for (m = AS(new Zw(e.c, v), 0); m.c; )
-                for (p = f(sy(m), 9), i = AS(new Zw(e.c, S), 0); i.c; )
-                  n = f(sy(i), 9), aq(e.b[p.d.k][p.k]).ib(e.b[n.d.k][n.k]), ++e.b[n.d.k][n.k].c;
-            v = S;
-          }
-        }
-      }
-      function aJ(e, t, n, i) {
-        var s, l, h, v, p, m;
-        if (Q3(t), l = f(z(i, (le(), qr)), 18), v = (Ee(), Wg).b, !(v in t.a && Mn(t, v).ic().a))
-          switch (p = new Yn(), ce(p, lt, t), cn(p, n), h = f(Mn(t, "id"), 97), Z1(e.k, h.a, p), un(e.n, p, t), i2(t, p), x0(t, p), nC(e, t, p, i), Bt(p, f(z(p, Kg), 32)), m = f(z(n, dt), 28), m == (zn(), ac) && (m = jo), s = f(z(i, Do), 59), s == ($n(), Po) && (s = Fi), mJ(p, m, s, f(z(p, wu), 10)), s.e) {
-            case 2:
-            case 1:
-              (p.g == (we(), rt) || p.g == ct) && l.ib((vr(), vf));
-              break;
-            case 4:
-            case 3:
-              (p.g == (we(), Be) || p.g == qe) && l.ib((vr(), vf));
-          }
-      }
-      function oJ(e, t) {
-        var n, i, s, l, h, v, p, m;
-        for (e.f = t, s = t.c.c.length, e.a = ve(kr, Dr, 51, s, 0, 2), e.d = ve(kr, Dr, 51, s, 0, 2), e.g = ve(kr, Dr, 51, s, 0, 2), h = new fn(t.c, 0); h.b < h.d.Y(); )
-          for (i = (ut(h.b < h.d.Y()), f(h.d.sb(h.c = h.b++), 16)), v = i.a.c.length, l = h.b - 1, e.a[l] = ve(kr, Ni, 9, v, 0, 1), e.d[l] = ve(kr, Ni, 9, v, 0, 1), e.g[l] = ve(kr, Ni, 9, v, 0, 1), m = new fn(i.a, 0), n = 0; m.b < m.d.Y(); )
-            p = (ut(m.b < m.d.Y()), f(m.d.sb(m.c = m.b++), 9)), p.k = n++, e.d[l][m.b - 1] = p, e.a[l][m.b - 1] = p, e.g[l][m.b - 1] = p;
-        e.b = new r9(e.d), e.e.c && (e.b.e = !0);
-      }
-      function sJ(e) {
-        var t, n, i, s, l, h;
-        for (s = new Se(), h = new M(e.c.f); h.a < h.c.c.length; )
-          l = f(O(h), 7), l.g == (we(), Be) && (s.c[s.c.length] = l);
-        if (e.d.a == ($n(), Fi) && !ds(f(z(e.c, (Ee(), dt)), 28)))
-          for (i = Dt(En(e.c)); xt(i); )
-            n = f(Et(i), 12), Le(s, n.c);
-        ce(e.c, (le(), fb), new Ut(e.c.j.a)), ce(e.c, vc, (yn(), yn(), ii)), Le(e.b, e.c), t = null, e.e == 1 ? t = CJ(e, e.c, ea(e.c.d), e.c.j.a) : e.e == 0 ? t = xJ(e, e.c, ea(e.c.d), e.c.j.a) : e.e == 3 ? t = fX(e, e.c, e.c.j.a) : e.e == 2 && (t = lX(e, e.c, e.c.j.a)), t && new G3(e.c, e.b, ge(Ot(t.b)));
-      }
-      function PC(e, t, n) {
-        var i, s, l, h, v, p, m, S;
-        if (s = t.g, Pt(ge(jt(z(t, (le(), vc))))) && (s = (et(), Ii)), t.k >= 0)
-          return !1;
-        if (n.e && s == (et(), Ii) && s != n.e)
-          return !1;
-        if (t.k = n.b, Le(n.f, t), n.e = s, s == (et(), hn) || s == er || s == Ii) {
-          for (h = new M(t.f); h.a < h.c.c.length; )
-            for (l = f(O(h), 7), S = (i = new M(new Lf(l).a.e), new P5(i)); Nc(S.a); )
-              if (m = f(O(S.a), 12).d, v = m.f, p = v.g, t.d != v.d) {
-                if (s == Ii) {
-                  if (p == Ii && PC(e, v, n))
-                    return !0;
-                } else if ((p == hn || p == er) && PC(e, v, n))
-                  return !0;
-              }
-        }
-        return !0;
-      }
-      function ER(e, t) {
-        var n, i, s, l, h, v, p, m, S;
-        for (U4(e.a, re(ie(_t, 1), Ht, 10, 0, [t.a, t.b])), na(e.c, t.e), e.q.d = e.q.d | t.d, e.q.a = e.q.a | t.c, v = Xt(e.j.e, t.k), p = je(e.j.e + e.j.b, t.n), dj(e.j, t.j, v, 0, p - v), vn(e.d, t.f), t.f.c.f == t.f.d.f && Sa(e.n, !0, !0, !0, !0), h = new $r(), m = new $r(), s = (S = new Wt(e.d.a).a.bb().mb(), new Zt(S)); s.a.G(); )
-          i = (l = f(s.a.H(), 21), f(l.yb(), 12)), vn(h, i.c), vn(m, i.d);
-        n = h.a.Y() - m.a.Y(), n < 0 ? (fg(e.n, !0, ($n(), ja)), fg(e.n, !1, Fi)) : n > 0 && (fg(e.n, !1, ($n(), ja)), fg(e.n, !0, Fi));
-      }
-      function uJ(e, t) {
-        var n, i, s, l, h, v, p, m, S, x;
-        for (h = 0; h < (mn(), t.length) && wM(t.charCodeAt(h), t8); )
-          ++h;
-        for (n = t.length; n > 0 && wM(t.charCodeAt(n - 1), n8); )
-          --n;
-        if (h < n) {
-          S = R0(t.substr(h, n - h), ",|;");
-          try {
-            for (p = 0, m = S.length; p < m; ++p) {
-              if (v = S[p], l = R0(v, "="), l.length != 2)
-                throw new tn("Expecting a list of key-value pairs.");
-              s = Wc(l[0]), x = L0(Wc(l[1])), zo(s, "top") ? e.d = x : zo(s, "left") ? e.b = x : zo(s, tx) ? e.a = x : zo(s, "right") && (e.c = x);
-            }
-          } catch (L) {
-            throw L = Ur(L), xe(L, 130) ? (i = L, new tn(r8 + i)) : Kr(L);
-          }
-        }
-      }
-      function cJ(e, t) {
-        var n, i, s, l, h, v, p, m, S;
-        for (S = new Wr(), v = (m = new Ev(e.c).a.bb().mb(), new Sv(m)); v.a.G(); )
-          l = (s = f(v.a.H(), 21), f(s.zb(), 200)), l.b == 0 && wr(S, l, S.c.b, S.c);
-        for (; S.b != 0; )
-          for (l = f(S.b == 0 ? null : (ut(S.b != 0), zs(S, S.a.a)), 200), i = new M(l.d); i.a < i.c.c.length; )
-            n = f(O(i), 279), t.k == (oo(), ku) ? n.b.a = Xt(n.b.a, l.a + n.a) : n.b.a = je(n.b.a, l.a + n.a), --n.b.b, n.b.b == 0 && rn(S, n.b);
-        for (h = (p = new Ev(e.c).a.bb().mb(), new Sv(p)); h.a.G(); )
-          l = (s = f(h.a.H(), 21), f(s.zb(), 200)), t.g[l.c.k] = l.a;
-      }
-      function lJ(e, t, n) {
-        var i, s, l, h;
-        switch (l = e.i, s = ln(re(ie(_t, 1), Ht, 10, 0, [t.i, t.f.i])), i = ln(re(ie(_t, 1), Ht, 10, 0, [t.f.i, t.i, t.a])), h = t.d, t.g.e) {
-          case 4:
-            l.a = Xt(s.a, i.a) - h.b - e.j.a - n, l.b = ln(re(ie(_t, 1), Ht, 10, 0, [t.f.i, t.i, t.a])).b + n;
-            break;
-          case 2:
-            l.a = je(s.a + t.j.a, i.a) + h.c + n, l.b = ln(re(ie(_t, 1), Ht, 10, 0, [t.f.i, t.i, t.a])).b + n;
-            break;
-          case 1:
-            l.a = ln(re(ie(_t, 1), Ht, 10, 0, [t.f.i, t.i, t.a])).a + n, l.b = Xt(s.b, i.b) - h.d - e.j.b - n;
-            break;
-          case 3:
-            l.a = ln(re(ie(_t, 1), Ht, 10, 0, [t.f.i, t.i, t.a])).a + n, l.b = je(s.b + t.j.b, i.b) + h.a + n;
-        }
-      }
-      function fJ(e, t, n) {
-        var i, s, l, h;
-        switch (l = e.i, s = ln(re(ie(_t, 1), Ht, 10, 0, [t.i, t.f.i])), i = ln(re(ie(_t, 1), Ht, 10, 0, [t.f.i, t.i, t.a])), h = t.d, t.g.e) {
-          case 4:
-            l.a = Xt(s.a, i.a) - h.b - e.j.a - n, l.b = ln(re(ie(_t, 1), Ht, 10, 0, [t.f.i, t.i, t.a])).b - e.j.b - n;
-            break;
-          case 2:
-            l.a = je(s.a + t.j.a, i.a) + h.c + n, l.b = ln(re(ie(_t, 1), Ht, 10, 0, [t.f.i, t.i, t.a])).b - e.j.b - n;
-            break;
-          case 1:
-            l.a = ln(re(ie(_t, 1), Ht, 10, 0, [t.f.i, t.i, t.a])).a + n, l.b = Xt(s.b, i.b) - h.d - e.j.b - n;
-            break;
-          case 3:
-            l.a = ln(re(ie(_t, 1), Ht, 10, 0, [t.f.i, t.i, t.a])).a + n, l.b = je(s.b + t.j.b, i.b) + h.a + n;
-        }
-      }
-      function hJ(e) {
-        var t, n;
-        switch (n = f(z(e, (le(), qr)), 18), t = O1(QB), Pt(ge(jt(z(e, (zt(), vb))))) ? $u(t, (Pr(), Nk)) : pi(t, (Pr(), Nk)), z(e, (Y4(), xx)) != null && xr(t, JB), f(z(e, (Ee(), Do)), 59).e) {
-          case 2:
-            bi($u(t, (Pr(), TT)), xT);
-            break;
-          case 3:
-            bi($u(t, (Pr(), vT)), dT);
-            break;
-          case 4:
-            bi($u(t, (Pr(), zT)), BT);
-        }
-        return n.kb((vr(), eE)) && bi($u(t, (Pr(), hT)), fT), He(z(e, jp)) !== He((Xc(), gp)) && pi(t, (Pr(), PT)), He(z(e, Np)) !== He((jd(), sb)) && He(z(e, SL)) === He((fu(), af)) && bi(t, (Pr(), mT)), n.kb(cL) && ($u(t, (Pr(), jT)), pi(t, DT)), t;
-      }
-      function Dg() {
-        Dg = c, fL = new Yl("ONE_SIDED", 0, !0, !1, !1), rE = new Yl("TWO_SIDED", 1, !1, !1, !1), hL = new Yl("ONE_SIDED_BEST_OF_UP_OR_DOWN", 2, !0, !0, !1), gL = new Yl("TWO_SIDED_BEST_OF_UP_OR_DOWN", 3, !1, !0, !1), dL = new Yl("ONE_SIDED_BEST_OF_UP_OR_DOWN_ORTHOGONAL_HYPEREDGES", 4, !0, !0, !0), bL = new Yl("TWO_SIDED_BEST_OF_UP_OR_DOWN_ORTHOGONAL_HYPEREDGES", 5, !1, !0, !0), vL = new Yl("ONE_SIDED_ORTHOGONAL_HYPEREDGES", 6, !0, !1, !0), nE = new Yl("OFF", 7, !1, !1, !1);
-      }
-      function p2(e, t, n, i, s, l, h) {
-        var v, p, m, S, x, L, j;
-        return x = Pt(ge(jt(z(t, (zt(), OL))))), L = null, l == (sr(), Ai) && i.c.f == n ? L = i.c : l == ri && i.d.f == n && (L = i.d), m = h, !h || !x || L ? (S = (we(), cr), L ? S = L.g : ds(f(z(n, (Ee(), dt)), 28)) && (S = l == Ai ? qe : Be), p = pJ(e, t, n, l, S, i), v = ly((Ti(n), i)), l == Ai ? (Bn(v, f(_e(p.f, 0), 7)), kn(v, s)) : (Bn(v, s), kn(v, f(_e(p.f, 0), 7))), m = new $M(i, v, p, f(z(p, (le(), lt)), 7), l, !L)) : (Le(h.e, i), j = tD(f(z(h.d, (Ee(), Jo)), 15).a, f(z(i, Jo), 15).a), ce(h.d, Jo, new Ut(j))), pt(e.a, i, new N1(m.d, t, l)), m;
-      }
-      function DC(e, t, n, i) {
-        var s, l, h, v, p, m, S, x;
-        if (l = new qa(e), Ha(l, (et(), er)), ce(l, (Ee(), dt), (zn(), ni)), s = 0, t) {
-          for (h = new Yn(), ce(h, (le(), lt), t), ce(l, lt, t.f), Bt(h, (we(), qe)), cn(h, l), x = f(Vn(t.b, ve(Ki, Yi, 12, t.b.c.length, 0, 1)), 47), m = 0, S = x.length; m < S; ++m)
-            p = x[m], kn(p, h);
-          ce(t, js, l), ++s;
-        }
-        if (n) {
-          for (v = new Yn(), ce(l, (le(), lt), n.f), ce(v, lt, n), Bt(v, (we(), Be)), cn(v, l), x = f(Vn(n.e, ve(Ki, Yi, 12, n.e.c.length, 0, 1)), 47), m = 0, S = x.length; m < S; ++m)
-            p = x[m], Bn(p, v);
-          ce(n, js, l), ++s;
-        }
-        return ce(l, (le(), Xd), gt(s)), i.c[i.c.length] = l, l;
-      }
-      function dJ(e, t) {
-        var n, i, s, l, h, v, p;
-        for (h = qm(e.a).mb(); h.G(); ) {
-          if (l = f(h.H(), 12), l.b.c.length > 0)
-            for (i = new _u(f(Pa(e.a, l), 18)), Ya(i, new L5(t)), s = new fn(l.b, 0); s.b < s.d.Y(); ) {
-              switch (n = (ut(s.b < s.d.Y()), f(s.d.sb(s.c = s.b++), 33)), v = -1, f(z(n, (Ee(), da)), 107).e) {
-                case 2:
-                  v = i.c.length - 1;
-                  break;
-                case 1:
-                  v = i.c.length / 2 | 0;
-                  break;
-                case 3:
-                  v = 0;
-              }
-              v != -1 && (p = (Sn(v, i.c.length), f(i.c[v], 114)), Le(p.b.b, n), f(z(Ti(p.b.c.f), (le(), qr)), 18).ib((vr(), Kd)), f(z(Ti(p.b.c.f), qr), 18).ib(Ud), So(s), ce(n, LL, l));
-            }
-          Bn(l, null), kn(l, null);
-        }
-      }
-      function vJ(e) {
-        var t, n, i, s, l, h, v, p, m, S, x;
-        for (S = e.e.a.c.length, h = new M(e.e.a); h.a < h.c.c.length; )
-          l = f(O(h), 61), l.j = !1;
-        for (e.i = ve(Kn, Wn, 26, S, 12, 1), e.g = ve(Kn, Wn, 26, S, 12, 1), e.n = new Se(), s = 0, x = new Se(), p = new M(e.e.a); p.a < p.c.c.length; )
-          v = f(O(p), 61), v.b = s++, v.c.c.length == 0 && Le(e.n, v), Tn(x, v.g);
-        for (t = 0, i = new M(x); i.a < i.c.c.length; )
-          n = f(O(i), 89), n.b = t++, n.e = !1;
-        m = x.c.length, e.b == null || e.b.length < m ? (e.b = ve(Zi, mi, 26, m, 12, 1), e.c = ve(pb, Bg, 26, m, 13, 1)) : Nv(e.c), e.d = x, e.p = new H9(Ty(e.d.c.length)), e.j = 1;
-      }
-      function gJ(e, t) {
-        var n, i, s, l, h, v, p, m, S, x, L, j, I, R, Y, q, V, U, te;
-        for (R = e.d, Y = t.d, j = f(ks(e, (sr(), Ai)).mb().H(), 7), U = f(ks(e, ri).mb().H(), 7), I = f(ks(t, Ai).mb().H(), 7), te = f(ks(t, ri).mb().H(), 7), x = f(Vn(j.b, ve(Ki, Yi, 12, 1, 0, 1)), 47), q = f(Vn(U.e, ve(Ki, Yi, 12, 1, 0, 1)), 47), L = f(Vn(I.b, ve(Ki, Yi, 12, 1, 0, 1)), 47), V = f(Vn(te.e, ve(Ki, Yi, 12, 1, 0, 1)), 47), Ar(e, Y), s = 0, p = L.length; s < p; ++s)
-          n = L[s], kn(n, j);
-        for (l = 0, m = V.length; l < m; ++l)
-          n = V[l], Bn(n, U);
-        for (Ar(t, R), h = 0, S = x.length; h < S; ++h)
-          n = x[h], kn(n, I);
-        for (i = 0, v = q.length; i < v; ++i)
-          n = q[i], Bn(n, te);
-      }
-      function bJ(e) {
-        var t, n, i, s, l, h, v, p;
-        for (l = new M(e.a.b); l.a < l.c.c.length; )
-          s = f(O(l), 25), s.vc();
-        for (p = new ot(ki, ki), t = new ot(Hr, Hr), i = new M(e.a.b); i.a < i.c.c.length; )
-          n = f(O(i), 25), p.a = Xt(p.a, n.j.d), p.b = Xt(p.b, n.j.e), t.a = je(t.a, n.j.d + n.j.c), t.b = je(t.b, n.j.e + n.j.b);
-        for (v = w4(e.c).mb(); v.G(); )
-          h = f(v.H(), 27), n = f(h.b, 25), p.a = Xt(p.a, n.j.d), p.b = Xt(p.b, n.j.e), t.a = je(t.a, n.j.d + n.j.c), t.b = je(t.b, n.j.e + n.j.b);
-        e.d = Tm(new ot(p.a, p.b)), e.e = ou(new ot(t.a, t.b), p), e.a.a.c = ve(Ze, Me, 1, 0, 4, 1), e.a.b.c = ve(Ze, Me, 1, 0, 4, 1);
-      }
-      function SR(e) {
-        var t, n, i, s, l, h, v;
-        if (v = f(_e(e.f, 0), 7), v.e.c.length != 0 && v.b.c.length != 0)
-          throw new Ou("Interactive layout does not support NORTH/SOUTH ports with incoming _and_ outgoing edges.");
-        if (v.e.c.length != 0) {
-          for (l = ki, n = new M(v.e); n.a < n.c.c.length; )
-            t = f(O(n), 12), h = t.d.f, i = f(z(h, (Ee(), Vg)), 65), l = Xt(l, h.i.a - i.b);
-          return new Kb(vt(l));
-        }
-        if (v.b.c.length != 0) {
-          for (s = Hr, n = new M(v.b); n.a < n.c.c.length; )
-            t = f(O(n), 12), h = t.c.f, i = f(z(h, (Ee(), Vg)), 65), s = je(s, h.i.a + h.j.a + i.c);
-          return new Kb(vt(s));
-        }
-        return Pv(), Pv(), G2;
-      }
-      function pJ(e, t, n, i, s, l) {
-        var h, v, p, m, S, x, L;
-        return m = i == (sr(), Ai) ? l.c : l.d, p = By(t), m.f == n ? (h = f(Kt(e.b, m), 9), h || (h = B0(m, f(z(n, (Ee(), dt)), 28), s, i == Ai ? -1 : 1, m.j, p, t), ce(h, (le(), lt), m), un(e.b, m, h))) : (S = f(z(l, (Ee(), Jo)), 15).a, h = B0((x = new H(), L = f(z(t, (le(), Oi)), 15).a * f(z(t, (zt(), Qs)), 15).a / 2, ce(x, Qd, new Ut(L)), x), f(z(n, dt), 28), s, i == Ai ? -1 : 1, new ot(S, S), p, t), v = BZ(e, h, n, i), ce(h, lt, v), un(e.b, v, h)), f(z(t, (le(), qr)), 18).ib((vr(), as)), ds(f(z(t, (Ee(), dt)), 28)) ? ce(t, dt, (zn(), Xg)) : ce(t, dt, (zn(), jo)), h;
-      }
-      function wJ(e, t) {
-        var n, i, s, l, h, v, p, m, S, x, L, j, I, R, Y, q, V, U, te, ue, ye, Ce;
-        i = f(z(t, (zt(), IL)), 15).a, ue = f(z(t, nv), 24).a, L = 4, s = 3, ye = 20 / ue, j = !1, p = 0, h = yr;
-        do {
-          for (l = p != 1, x = p != 0, Ce = 0, Y = e.a, V = 0, te = Y.length; V < te; ++V)
-            I = Y[V], I.g = null, iee(e, I, l, x, i), Ce += ei(I.a);
-          do
-            v = IQ(e, t);
-          while (v);
-          for (R = e.a, q = 0, U = R.length; q < U; ++q)
-            if (I = R[q], n = h4(I).a, n != 0)
-              for (S = new M(I.f); S.a < S.c.c.length; )
-                m = f(O(S), 9), m.i.b += n;
-          p == 0 || p == 1 ? (--L, L <= 0 && (Ce < h || -L > ue) ? (p = 2, h = yr) : p == 0 ? (p = 1, h = Ce) : (p = 0, h = Ce)) : (j = Ce >= h || h - Ce < ye, h = Ce, j && --s);
-        } while (!(j && s <= 0));
-      }
-      function jC(e, t, n) {
-        var i, s, l, h, v, p, m, S, x, L, j;
-        for (x = f(Vn(e.f, ve(fz, E8, 7, e.f.c.length, 0, 1)), 346), m = 0, S = x.length; m < S; ++m) {
-          if (p = x[m], n != (sr(), Ai))
-            for (v = f(Vn(p.e, ve(Ki, Yi, 12, p.e.c.length, 0, 1)), 47), s = 0, l = v.length; s < l; ++s)
-              i = v[s], j = f(z(i.d.f, (zt(), Er)), 85), !Pt(ge(jt(z(i, (le(), Xs))))) && !(t == ($i(), ev) && j == Tu) && bu(i, !0);
-          if (n != ri)
-            for (h = f(Vn(p.b, ve(Ki, Yi, 12, p.b.c.length, 0, 1)), 47), s = 0, l = h.length; s < l; ++s)
-              i = h[s], L = f(z(i.c.f, (zt(), Er)), 85), !Pt(ge(jt(z(i, (le(), Xs))))) && !(t == ($i(), db) && L == gc) && bu(i, !0);
-        }
-      }
-      function mJ(e, t, n, i) {
-        var s, l, h, v, p;
-        if (h = e.g, h == (we(), cr) && t != (zn(), jo) && t != (zn(), ac) && (h = uR(e, n), Bt(e, h), z(e, (Ee(), ul)) == null && h != cr && (e.i.a != 0 || e.i.b != 0) && ce(e, ul, new Ut(eZ(e, h)))), t == (zn(), es)) {
-          switch (p = 0, h.e) {
-            case 1:
-            case 3:
-              l = e.f.j.a, l > 0 && (p = e.i.a / l);
-              break;
-            case 2:
-            case 4:
-              s = e.f.j.b, s > 0 && (p = e.i.b / s);
-          }
-          ce(e, (le(), xu), p);
-        }
-        if (v = e.j, i)
-          e.a.a = i.a, e.a.b = i.b;
-        else if (t != jo && t != ac && h != cr)
-          switch (h.e) {
-            case 1:
-              e.a.a = v.a / 2;
-              break;
-            case 2:
-              e.a.a = v.a, e.a.b = v.b / 2;
-              break;
-            case 3:
-              e.a.a = v.a / 2, e.a.b = v.b;
-              break;
-            case 4:
-              e.a.b = v.b / 2;
-          }
-        else
-          e.a.a = v.a / 2, e.a.b = v.b / 2;
-      }
-      function yJ(e) {
-        var t, n, i, s;
-        if (xe(e.a, 10))
-          return _a(f(e.a, 10));
-        if (xe(e.a, 66))
-          return NW(f(e.a, 86));
-        if (xe(e.a, 50))
-          return f(e.a, 50).Wc();
-        if (xe(e.a, 191)) {
-          for (t = new tS(), s = (i = new Uv(new Vv(new Xb(f(e.a, 191).a).a).b), new Qb(i)); om(s.a.a); )
-            g4(t, (n = jm(s.a), n.yb()));
-          return t;
-        } else {
-          if (xe(e.a, 13))
-            return new _u(f(e.a, 13));
-          if (xe(e.a, 44)) {
-            for (t = new Ci(), s = Jt(f(e.a, 44), 0); s.b != s.d.c; )
-              rn(t, f(Ft(s), 10));
-            return t;
-          } else if (xe(e.a, 58)) {
-            for (t = new Wr(), s = Jt(f(e.a, 58), 0); s.b != s.d.c; )
-              rn(t, Ft(s));
-            return t;
-          } else
-            return e.a;
-        }
-      }
-      function lh(e, t) {
-        var n, i, s, l, h, v, p, m, S, x, L, j, I;
-        v = 0, I = 0, p = d3(e.f, e.f.length), l = e.d, h = e.i, i = e.a, s = e.b;
-        do {
-          for (j = 0, S = new M(e.p); S.a < S.c.c.length; )
-            m = f(O(S), 9), L = DR(e, m), n = !0, (e.q == (Xc(), ab) || e.q == ob) && (n = Pt(ge(jt(L.b)))), f(L.a, 24).a < 0 && n ? (++j, p = d3(e.f, e.f.length), e.d = e.d + f(L.a, 24).a, I += l - e.d, l = e.d + f(L.a, 24).a, h = e.i, i = Gc(e.a), s = Gc(e.b)) : (e.f = d3(p, p.length), e.d = l, e.a = (vt(i), i ? new _u(($o(), i)) : M1(new M(null))), e.b = (vt(s), s ? new _u(($o(), s)) : M1(new M(null))), e.i = h);
-          ++v, x = j != 0 && Pt(ge(jt(t.B(new pr(gt(I), gt(v))))));
-        } while (x);
-      }
-      function kJ(e, t, n, i) {
-        var s, l, h, v, p, m, S;
-        if (!Nc(new M(bg(e))))
-          return i;
-        for (S = PM(f(nr(e, (Ee(), ia)), 86)), p = new M(bg(e)); p.a < p.c.c.length; )
-          v = f(O(p), 129), m = PM(f(nr(v, ia), 86)), m == (m2(), dk) && (m = S), EY(v, m.e), s = iK(n, m), s.c = je(s.c, v.e.j.a), s.b += v.e.j.b + t;
-        for (h = new G1(new Jb(n).a); S1(h.a); )
-          switch (l = (h.b = Yc(h.a), new b1(h.c, h.b)), s = f(l.b.b[l.a.e], 62), s.b -= t, f(l.a, 67).e) {
-            case 12:
-            case 13:
-            case 14:
-              i.d = je(i.d, s.b + t);
-              break;
-            case 15:
-              i.b = je(i.b, s.c + t);
-              break;
-            case 17:
-              i.c = je(i.c, s.c + t);
-              break;
-            case 18:
-            case 19:
-            case 20:
-              i.a = je(i.a, s.b + t);
-          }
-        return i;
-      }
-      function NC(e, t, n) {
-        var i, s, l, h, v, p, m, S, x, L, j, I, R;
-        for (fI(this), n == (_c(), Ks) ? vn(this.g, e) : vn(this.o, e), j = Zo, L = 5e-324, m = (h = new Wt(t.a).a.bb().mb(), new Zt(h)); m.a.G(); )
-          v = (s = f(m.a.H(), 21), f(s.yb(), 27)), S = f(v.a, 223), i = f(v.b, 12), x = i.c, x == e && (x = i.d), S == Ks ? vn(this.g, x) : vn(this.o, x), R = ln(re(ie(_t, 1), Ht, 10, 0, [x.f.i, x.i, x.a])).b, j = j < R ? j : R, L = L > R ? L : R;
-        for (I = ln(re(ie(_t, 1), Ht, 10, 0, [e.f.i, e.i, e.a])).b, vO(this, I, j, L), p = (l = new Wt(t.a).a.bb().mb(), new Zt(l)); p.a.G(); )
-          v = (s = f(p.a.H(), 21), f(s.yb(), 27)), vn(this.c, f(v.b, 12));
-        this.f = !1;
-      }
-      function EJ(e, t, n, i) {
-        var s, l, h, v, p, m;
-        if (v = (Ee(), Wg).b, !(v in t.a && Mn(t, v).ic().a)) {
-          if (m = Mn(t, x2), m) {
-            if (!m.lc())
-              throw new gs("A label's 'text' property must be a string.", m, t);
-          } else
-            throw new gs("Labels must have a property 'text'.", null, t);
-          if (p = m.lc().a, l = new LS(p), ce(l, (le(), lt), t), un(e.f, l, t), i2(t, l), x0(t, l), xe(n, 9) ? Le(f(n, 9).c, l) : xe(n, 12) ? Le(f(n, 12).b, l) : xe(n, 7) && Le(f(n, 7).c, l), xe(n, 12))
-            switch (h = f(z(l, da), 107), i2(t, l), ce(l, da, h), s = f(z(i, qr), 18), h.e) {
-              case 2:
-              case 3:
-                s.ib((vr(), Kd));
-              case 1:
-              case 0:
-                s.ib((vr(), Ud)), ce(l, da, (ys(), $g));
-            }
-        }
-      }
-      function IC(e, t) {
-        var n, i, s, l, h, v, p, m, S, x, L, j, I, R, Y, q;
-        for (l = 0, h = 0, m = new M(e.a); m.a < m.c.c.length; )
-          v = f(O(m), 9), l = je(l, v.e.b), h = je(h, v.e.c);
-        for (p = new M(e.a); p.a < p.c.c.length; ) {
-          switch (v = f(O(p), 9), n = f(z(v, (Ee(), co)), 103), n.e) {
-            case 1:
-              I = 0;
-              break;
-            case 2:
-              I = 1;
-              break;
-            case 5:
-              I = 0.5;
-              break;
-            default:
-              for (i = 0, x = 0, j = new M(v.f); j.a < j.c.c.length; )
-                L = f(O(j), 7), L.b.c.length == 0 || ++i, L.e.c.length == 0 || ++x;
-              i + x == 0 ? I = 0.5 : I = x / (i + x);
-          }
-          Y = e.c, S = v.j.a, q = (Y.a - S) * I, I > 0.5 ? q -= h * 2 * (I - 0.5) : I < 0.5 && (q += l * 2 * (0.5 - I)), s = v.e.b, q < s && (q = s), R = v.e.c, q > Y.a - R - S && (q = Y.a - R - S), v.i.a = t + q;
-        }
-      }
-      function SJ(e, t) {
-        var n, i, s, l, h, v, p, m, S, x, L, j, I, R, Y, q, V, U, te, ue, ye, Ce, be, Ne, Ue, Xe, it;
-        return n = e.l & 8191, i = e.l >> 13 | (e.m & 15) << 9, s = e.m >> 4 & 8191, l = e.m >> 17 | (e.h & 255) << 5, h = (e.h & 1048320) >> 8, v = t.l & 8191, p = t.l >> 13 | (t.m & 15) << 9, m = t.m >> 4 & 8191, S = t.m >> 17 | (t.h & 255) << 5, x = (t.h & 1048320) >> 8, be = n * v, Ne = i * v, Ue = s * v, Xe = l * v, it = h * v, p != 0 && (Ne += n * p, Ue += i * p, Xe += s * p, it += l * p), m != 0 && (Ue += n * m, Xe += i * m, it += s * m), S != 0 && (Xe += n * S, it += i * S), x != 0 && (it += n * x), j = be & Va, I = (Ne & 511) << 13, L = j + I, Y = be >> 22, q = Ne >> 9, V = (Ue & 262143) << 4, U = (Xe & 31) << 17, R = Y + q + V + U, ue = Ue >> 18, ye = Xe >> 5, Ce = (it & 4095) << 8, te = ue + ye + Ce, R += L >> 22, L &= Va, te += R >> 22, R &= Va, te &= ec, Gu(L, R, te);
-      }
-      function CJ(e, t, n, i) {
-        var s, l, h, v, p, m, S, x, L, j, I, R, Y, q, V, U, te, ue, ye;
-        if (Y = e.d.c.c.c.length, n >= Y - 1)
-          return null;
-        for (s = new Se(), s.c[s.c.length] = t, te = t, h = n, I = -1, v = f(_e(e.d.c.c, n), 16), j = 0; j < v.a.c.length; ++j)
-          if (q = f(_e(v.a, j), 9), q == t) {
-            I = j;
-            break;
-          }
-        if (R = RC(e, 1, I, n, Y, e.a), !R)
-          return null;
-        for (ue = e.a, L = 0, l = 0; te && ue > 1 && h < Y - 1; )
-          S = fR(e, te), x = f(_e(e.d.c.c, h + 1), 16), ye = f(R.sb(L++), 24).a, V = Au(ye, x.a.c.length), oh(S, V, x), te && (s.c[s.c.length] = te), te = S, --ue, ++l, ++h;
-        for (U = (i - (s.c.length - 1) * e.d.d) / s.c.length, m = new M(s); m.a < m.c.c.length; )
-          p = f(O(m), 9), p.j.a = U;
-        return new pr(gt(l), U);
-      }
-      function xJ(e, t, n, i) {
-        var s, l, h, v, p, m, S, x, L, j, I, R, Y, q, V, U, te, ue, ye;
-        if (n <= 0)
-          return null;
-        for (s = new Se(), s.c[s.c.length] = t, te = t, h = n, I = -1, v = f(_e(e.d.c.c, n), 16), j = 0; j < v.a.c.length; ++j)
-          if (Y = f(_e(v.a, j), 9), Y == t) {
-            I = j;
-            break;
-          }
-        if (R = RC(e, 0, I, n, e.d.c.c.c.length, e.a), !R)
-          return null;
-        for (ue = e.a, L = 0, l = 0, U = I; te && ue > 1 && h > 1; )
-          S = fR(e, te), v = f(_e(e.d.c.c, h), 16), x = f(_e(e.d.c.c, h - 1), 16), ye = f(R.sb(L++), 24).a, q = Au(ye, x.a.c.length), oh(te, q, x), oh(S, U, v), U = q, te && (s.c[s.c.length] = te), te = S, --ue, ++l, --h;
-        for (V = (i - (s.c.length - 1) * e.d.d) / s.c.length, m = new M(s); m.a < m.c.c.length; )
-          p = f(O(m), 9), p.j.a = V;
-        return new pr(gt(l), V);
-      }
-      function TJ(e, t) {
-        var n, i, s, l, h, v, p, m, S, x, L, j, I;
-        if (e.b = e.c, I = jt(z(t, (Ee(), $x))), j = I == null || Pt((or(I), I)), l = f(z(t, (le(), qr)), 18).kb((vr(), as)), s = f(z(t, dt), 28), n = !(s == (zn(), yh) || s == es || s == ni), j && (n || !l)) {
-          for (x = new M(t.b); x.a < x.c.c.length; )
-            m = f(O(x), 9), m.k = 0;
-          for (L = new Se(), S = new M(t.b); S.a < S.c.c.length; )
-            if (m = f(O(S), 9), i = vR(e, m, null), i) {
-              for (p = new t3(), hu(p, t), ce(p, bf, f(i.b, 18)), Nj(p.a, t.a), v = f(i.a, 20).mb(); v.G(); )
-                h = f(v.H(), 9), Le(p.b, h), h.a = p;
-              L.ib(p);
-            }
-          l && (e.b = e.a);
-        } else
-          L = new ro(re(ie(rte, 1), { 38: 1, 39: 1, 42: 1, 3: 1, 8: 1, 5: 1, 6: 1 }, 55, 0, [t]));
-        return L;
-      }
-      function LJ(e) {
-        var t, n, i, s, l, h, v, p, m;
-        for (n = new M(e.a.a.b); n.a < n.c.c.length; )
-          for (t = f(O(n), 25), h = t.i.mb(); h.G(); )
-            l = f(h.H(), 25), t.f != l.f && (Nl(e.a.d) ? p = e.a.g.tc(t, l) : p = e.a.g.uc(t, l), i = t.g.a + t.j.c + p - l.g.a, i = Math.ceil(i), i = 0 > i ? 0 : i, t.o && l.o && xe(t, 82) && xe(l, 82) && !ky(r3(f(t, 82).d, f(l, 82).d)) ? (s = Fv(new Jh(), e.d), v = Xn(v1(l.g.a - t.g.a)), uh(Of(Rf(Bf(Af(new Pl(), 0 > v ? 0 : v), 1), s), e.c[t.f.d])), uh(Of(Rf(Bf(Af(new Pl(), 0 > -v ? 0 : -v), 1), s), e.c[l.f.d]))) : (m = 1, (xe(t, 82) && xe(l, 93) || xe(l, 82) && xe(t, 93)) && (m = 2), uh(Of(Rf(Bf(Af(new Pl(), Xn(i)), m), e.c[t.f.d]), e.c[l.f.d]))));
-      }
-      function CR() {
-        CR = c, nT = new $r(), tT = ch(re(ie(rf, 1), Me, 79, 0, [(Ee(), Ox), vB])), eT = ch(re(ie(rf, 1), Me, 79, 0, [Hx, mu, (zt(), RL), gB, (le(), Xa), nv, AL])), Zx = ch(re(ie(rf, 1), Me, 79, 0, [fB, $d, Wg, dB, bB, zx, pB, ik, $x, qg, dE, NL, wE, ML, vb, OL, BL, SE, gE])), Jx = ch(re(ie(rf, 1), Me, 79, 0, [Fd, Yd, wh, Jo, ul, cE, os, Ph, Oi, tv, Qs, IL])), Qx = ch(re(ie(rf, 1), Me, 79, 0, [Kg, co, Do, of, da, Rx, Bx, J2, ek, tk, nk, rk, dt, Ug, vE, pE, kE, Nh, Pp, EE, jp, Dp, mE, Er, Np, CE, xE, rv, yE])), Xx = ch(re(ie(rf, 1), Me, 79, 0, [ia, ic, Zg, bE])), ap = ch(re(ie(rf, 1), Me, 79, 0, [Yg, Q2, Un, Vg, wu, mh])), ZB = ch(re(ie(rf, 1), Me, 79, 0, [(g3(), Ux)]));
-      }
-      function xR(e) {
-        var t, n, i, s, l, h, v;
-        for (t = 0, l = new M(e.b.a); l.a < l.c.c.length; )
-          i = f(O(l), 78), i.b = 0, i.c = 0;
-        for (SA(e, 0), Gy(e, e.g), A0(e.c), W5(e.c), n = ($n(), ja), _s(Iv(Ss(_s(Iv(Ss(_s(Ss(e.c, n)), BM(n)))), n))), Ss(e.c, ja), Ry(e, e.g), kA(e, 0), mR(e, 0), qA(e, 1), SA(e, 1), Gy(e, e.d), A0(e.c), h = new M(e.b.a); h.a < h.c.c.length; )
-          i = f(O(h), 78), t += ei(i.c);
-        for (v = new M(e.b.a); v.a < v.c.c.length; )
-          i = f(O(v), 78), i.b = 0, i.c = 0;
-        for (n = Ws, _s(Iv(Ss(_s(Iv(Ss(_s(W5(Ss(e.c, n))), BM(n)))), n))), Ss(e.c, ja), Ry(e, e.d), kA(e, 1), mR(e, 1), qA(e, 0), W5(e.c), s = new M(e.b.a); s.a < s.c.c.length; )
-          i = f(O(s), 78), t += ei(i.c);
-        return t;
-      }
-      function PJ(e) {
-        var t, n, i, s, l, h, v;
-        for (t = new Se(), e.g = new Se(), e.d = new Se(), h = new Ul(new iu(e.f.b).a); h.b; )
-          l = Sd(h), Le(t, f(f(l.zb(), 27).b, 25)), Nl(f(l.yb(), 251).yc()) ? Le(e.d, f(l.zb(), 27)) : Le(e.g, f(l.zb(), 27));
-        for (Gy(e, e.d), Gy(e, e.g), e.c = new rC(e.b), F7(e.c, (V5(), ez)), Ry(e, e.d), Ry(e, e.g), Tn(t, e.c.a.b), e.e = new ot(ki, ki), e.a = new ot(Hr, Hr), i = new M(t); i.a < i.c.c.length; )
-          n = f(O(i), 25), e.e.a = Xt(e.e.a, n.j.d), e.e.b = Xt(e.e.b, n.j.e), e.a.a = je(e.a.a, n.j.d + n.j.c), e.a.b = je(e.a.b, n.j.e + n.j.b);
-        $w(e.c, new oe()), v = 0;
-        do
-          s = xR(e), ++v;
-        while ((v < 2 || s > Mg) && v < 10);
-        $w(e.c, new J()), xR(e), wq(e.c), bJ(e.f);
-      }
-      function DJ(e) {
-        md();
-        var t, n, i, s, l, h, v;
-        for (v = new u7(), n = new M(e); n.a < n.c.c.length; )
-          t = f(O(n), 48), (!v.b || t.c >= v.b.c) && (v.b = t), (!v.c || t.c <= v.c.c) && (v.d = v.c, v.c = t), (!v.e || t.d >= v.e.d) && (v.e = t), (!v.f || t.d <= v.f.d) && (v.f = t);
-        return i = new y0((ug(), uc)), ng(e, uz, new ro(re(ie(rb, 1), Me, 160, 0, [i]))), h = new y0(dl), ng(e, sz, new ro(re(ie(rb, 1), Me, 160, 0, [h]))), s = new y0(hl), ng(e, oz, new ro(re(ie(rb, 1), Me, 160, 0, [s]))), l = new y0(lf), ng(e, az, new ro(re(ie(rb, 1), Me, 160, 0, [l]))), f2(i.c, uc), f2(s.c, hl), f2(l.c, lf), f2(h.c, dl), v.a.c = ve(Ze, Me, 1, 0, 4, 1), Tn(v.a, i.c), Tn(v.a, Cy(s.c)), Tn(v.a, l.c), Tn(v.a, Cy(h.c)), v;
-      }
-      function jJ(e) {
-        var t, n, i, s, l, h, v, p, m, S;
-        for (s = f(oD(e, (Ee(), wh)), 15).a, v = new M(KO(e)); v.a < v.c.c.length; ) {
-          for (h = f(O(v), 626), n = new kR(h), n.d = s, n.k = f(nr(h, _x), 15).a, i = f(nr(h, Ug), 149), t = Pt(ge(jt(z(f(h.e, 9), (le(), yL))))), S = new M(Xu(h)); S.a < S.c.c.length; )
-            m = f(O(S), 161), i == (th(), ok) ? NJ(m, t, s) : i == Qg && see(m, s), jQ(m);
-          pee(n, f(nr(h, ic), 86).kb((du(), eb))), BQ(n), kJ(n.e, n.d, n.c, n.p), JJ(n), CZ(n), uV(n), p = new tj((l = f(h.e, 9).b, new X9(l.d, l.b, l.a, l.c))), p.b = n.p.b + n.q.b, p.c = n.p.c + n.q.c, p.d = n.p.d + n.q.d, p.a = n.p.a + n.q.a, f(h.e, 9).b.b = p.b, f(h.e, 9).b.d = p.d, f(h.e, 9).b.c = p.c, f(h.e, 9).b.a = p.a;
-        }
-      }
-      function TR(e, t) {
-        var n, i, s, l, h, v, p, m, S, x, L, j, I, R, Y, q, V, U;
-        for (p = f(Jn(e, (we(), qe)).mb().H(), 7).b, j = f(Jn(e, Be).mb().H(), 7).e, v = p.c.length, U = Pi(f(_e(e.f, 0), 7)); v-- > 0; ) {
-          for (R = (Sn(0, p.c.length), f(p.c[0], 12)), s = (Sn(0, j.c.length), f(j.c[0], 12)), V = s.d.b, l = Di(V, s, 0), _V(R, s.d, l), Bn(s, null), kn(s, null), I = R.a, t && rn(I, new qn(U)), i = Jt(s.a, 0); i.b != i.d.c; )
-            n = f(Ft(i), 10), rn(I, new qn(n));
-          for (q = R.b, L = new M(s.b); L.a < L.c.c.length; )
-            x = f(O(L), 33), q.c[q.c.length] = x;
-          if (Y = f(z(R, (Ee(), Un)), 44), h = f(z(s, Un), 44), h)
-            for (Y || (Y = new Ci(), ce(R, Un, Y)), S = Jt(h, 0); S.b != S.d.c; )
-              m = f(Ft(S), 10), rn(Y, new qn(m));
-        }
-      }
-      function NJ(e, t, n) {
-        var i, s, l, h, v;
-        if (l = SN(pg(e)), !l.Nb().V()) {
-          switch (v = 0, f(e.e, 7).g.e) {
-            case 4:
-            case 2:
-              v = t && Pt(ge(jt(z(f(e.e, 7), (le(), YH))))) ? e.e.j.b : (e.e.j.b - f(l.Nb().sb(0), 129).pc().b) / 2 - n;
-              break;
-            case 1:
-              v = e.e.j.b;
-              break;
-            case 3:
-              v = 0;
-          }
-          for (f(e.e, 7).g == (we(), ct) && wd(l), s = new M(pg(e)); s.a < s.c.c.length; ) {
-            switch (i = f(O(s), 129), h = new qn(e.e.i), f(e.e, 7).g.e) {
-              case 4:
-                h.a = e.e.j.a + n, h.b = v + n, v += n + i.e.j.b;
-                break;
-              case 2:
-                h.a = -i.e.j.a - n, h.b = v + n, v += n + i.e.j.b;
-                break;
-              case 1:
-                h.a = (e.e.j.a - i.e.j.a) / 2, h.b = v + n, v += n + i.e.j.b;
-                break;
-              case 3:
-                h.a = (e.e.j.a - i.e.j.a) / 2, h.b = v - n - i.e.j.b, v -= n + i.e.j.b;
-            }
-            i.e.i.a = h.a, i.e.i.b = h.b;
-          }
-        }
-      }
-      function IJ(e, t) {
-        var n, i, s, l, h, v, p, m, S, x;
-        for (e.a = new v4(gU(Gg)), i = new M(t.a); i.a < i.c.c.length; ) {
-          for (n = f(O(i), 347), v = new m0(re(ie(op, 1), Me, 25, 0, [])), Le(e.a.a, v), m = new M(n.d); m.a < m.c.c.length; )
-            p = f(O(m), 62), S = new NS(e, p), MC(S, f(z(n.c, (le(), bf)), 18)), Qf(e.g, n) || (un(e.g, n, new ot(p.d, p.e)), un(e.f, n, S)), Le(e.a.b, S), f0(v, S);
-          for (h = new M(n.b); h.a < h.c.c.length; )
-            l = f(O(h), 251), S = new NS(e, l.Bc()), un(e.b, l, new pr(v, S)), MC(S, f(z(n.c, (le(), bf)), 18)), l.zc() && (x = new i3(e, l.zc(), 1), MC(x, f(z(n.c, bf), 18)), s = new m0(re(ie(op, 1), Me, 25, 0, [])), f0(s, x), pt(e.c, l.yc(), new pr(v, x)));
-        }
-        return e.a;
-      }
-      function MJ(e, t) {
-        var n, i, s, l, h, v, p, m, S, x, L, j, I, R, Y, q, V, U;
-        if (R = t.c.c.length, !(R < 3)) {
-          for (j = ve(Kn, Wn, 26, R, 12, 1), x = 0, S = new M(t.c); S.a < S.c.c.length; )
-            m = f(O(S), 16), j[x++] = m.a.c.length;
-          for (L = new fn(t.c, 2), i = 1; i < R - 1; i++)
-            for (n = (ut(L.b < L.d.Y()), f(L.d.sb(L.c = L.b++), 16)), I = new M(n.a), l = 0, v = 0, p = 0; p < j[i + 1]; p++)
-              if (U = f(O(I), 9), p == j[i + 1] - 1 || bC(e, U, i + 1, i)) {
-                for (h = j[i] - 1, bC(e, U, i + 1, i) && (h = e.d.e[f(f(f(_e(e.d.b, U.k), 20).sb(0), 27).a, 9).k]); v <= p; ) {
-                  if (V = f(_e(n.a, v), 9), !bC(e, V, i + 1, i))
-                    for (q = f(_e(e.d.b, V.k), 20).mb(); q.G(); )
-                      Y = f(q.H(), 27), s = e.d.e[f(Y.a, 9).k], (s < l || s > h) && vn(e.c, f(Y.b, 12));
-                  ++v;
-                }
-                l = h;
-              }
-        }
-      }
-      function LR(e, t, n) {
-        var i, s, l, h, v, p;
-        for (this.g = e, v = t.d.length, p = n.d.length, this.d = ve(kr, Ni, 9, v + p, 0, 1), h = 0; h < v; h++)
-          this.d[h] = t.d[h];
-        for (l = 0; l < p; l++)
-          this.d[v + l] = n.d[l];
-        if (t.e) {
-          if (this.e = ca(t.e), this.e.nb(n), n.e)
-            for (s = n.e.mb(); s.G(); )
-              i = f(s.H(), 102), i != t && (this.e.kb(i) ? --i.c : this.e.ib(i));
-        } else
-          n.e && (this.e = ca(n.e), this.e.nb(t));
-        this.f = t.f + n.f, this.a = t.a + n.a, this.a > 0 ? yy(this, this.f / this.a) : ka(t.g, t.d[0]).a != null && ka(n.g, n.d[0]).a != null ? yy(this, (ge(ka(t.g, t.d[0]).a) + ge(ka(n.g, n.d[0]).a)) / 2) : ka(t.g, t.d[0]).a != null ? yy(this, ka(t.g, t.d[0]).a) : ka(n.g, n.d[0]).a != null && yy(this, ka(n.g, n.d[0]).a);
-      }
-      function OJ(e, t) {
-        var n, i, s, l, h, v, p, m, S, x, L;
-        switch (e.g.e) {
-          case 1:
-            if (i = f(z(e, (le(), lt)), 12), n = f(z(i, xL), 44), n ? Pt(ge(jt(z(i, Xs)))) && (n = Dy(n)) : n = new Ci(), m = f(z(e, Mi), 7), S = ln(re(ie(_t, 1), Ht, 10, 0, [m.f.i, m.i, m.a])), t <= S.a)
-              return S.b;
-            if (wr(n, S, n.a, n.a.a), x = f(z(e, Si), 7), L = ln(re(ie(_t, 1), Ht, 10, 0, [x.f.i, x.i, x.a])), L.a <= t)
-              return L.b;
-            for (wr(n, L, n.c.b, n.c), p = Jt(n, 0), h = f(Ft(p), 10), v = f(Ft(p), 10); v.a < t && p.b != p.d.c; )
-              h = v, v = f(Ft(p), 10);
-            return h.b + (t - h.a) / (v.a - h.a) * (v.b - h.b);
-          case 3:
-            switch (l = f(z(f(_e(e.f, 0), 7), (le(), lt)), 7), s = l.f, l.g.e) {
-              case 1:
-                return s.i.b;
-              case 3:
-                return s.i.b + s.j.b;
-            }
-        }
-        return $3(e).b;
-      }
-      function PR(e) {
-        var t, n, i, s, l, h, v, p, m, S, x, L;
-        if (S = He(z(e.c.f, (le(), pl))) === He(z(e.d.f, pl)), h = new Yr(), n = f(z(e, (Ee(), Q2)), 44), n && n.b >= 2)
-          for (Bs(e.a), i = 0, L = Jt(n, 0); L.b != L.d.c; )
-            x = f(Ft(L), 10), i == 0 ? (t = ou(ou(new ot(x.a, x.b), e.c.i), e.c.f.i), e.c.a.a = t.a, e.c.a.b = t.b) : i == n.b - 1 ? (t = ou(ou(new ot(x.a, x.b), e.d.i), e.d.f.i), e.d.a.a = t.a, e.d.a.b = t.b) : rn(e.a, x), ++i;
-        if (S)
-          for (p = Jt(e.a, 0); p.b != p.d.c; )
-            v = f(Ft(p), 10), h.a = je(h.a, v.a), h.b = je(h.b, v.b);
-        for (l = new M(e.b); l.a < l.c.c.length; )
-          s = f(O(l), 33), m = f(z(s, mh), 10), m && (s.i.a = m.a, s.i.b = m.b), S && (h.a = je(h.a, s.i.a + s.j.a), h.b = je(h.b, s.i.b + s.j.b));
-        return h;
-      }
-      function AJ(e, t, n) {
-        var i, s, l, h, v, p, m;
-        if (Q3(t), i = f(z(n, (le(), qr)), 18), h = new qa(n), ce(h, lt, t), Le(n.b, h), l = f(Mn(t, "id"), 97), Z1(e.i, l.a, h), un(e.j, h, t), i2(t, h), x0(t, h), "ports" in t.a) {
-          if (m = Mn(t, "ports"), !m.hc())
-            throw new gs("The 'ports' property of the node must be an array.", m, t);
-          for (p = m.hc(), s = 0; s < p.a.length; ++s)
-            xe(Fu(p, s), 69) && aJ(e, f(Fu(p, s), 69), h, n);
-        }
-        return nC(e, t, h, n), zd in t.a && Mn(t, zd).hc().a.length > 0 && ce(h, yL, (yn(), yn(), ii)), v = f(z(h, (Ee(), dt)), 28), v == (zn(), ac) || v != jo && i.ib((vr(), df)), Pt(ge(jt(z(h, $d)))) && i.ib((vr(), eE)), Pt(ge(jt(z(h, qg)))) && (i.ib((vr(), tE)), i.ib(Ep), ce(h, dt, jo)), h;
-      }
-      function MC(e, t) {
-        t.V() && Sa(e.n, !0, !0, !0, !0), t.t((we(), Eh)) && Sa(e.n, !0, !0, !0, !1), t.t(kh) && Sa(e.n, !1, !0, !0, !0), t.t(Sh) && Sa(e.n, !0, !0, !1, !0), t.t(Ch) && Sa(e.n, !0, !1, !0, !0), t.t(ll) && Sa(e.n, !1, !0, !0, !1), t.t(cl) && Sa(e.n, !1, !0, !1, !0), t.t(fl) && Sa(e.n, !0, !1, !1, !0), t.t(uf) && Sa(e.n, !0, !1, !0, !1), t.t(ts) && Sa(e.n, !0, !0, !0, !0), t.t(yu) && Sa(e.n, !0, !0, !0, !0), t.t(ts) && Sa(e.n, !0, !0, !0, !0), t.t(pa) && Sa(e.n, !0, !0, !0, !0), t.t(Ma) && Sa(e.n, !0, !0, !0, !0), t.t(Ia) && Sa(e.n, !0, !0, !0, !0), t.t(Fr) && Sa(e.n, !0, !0, !0, !0);
-      }
-      function DR(e, t) {
-        var n, i, s, l, h, v, p, m, S, x;
-        for (p = !0, s = 0, m = e.f[t.k], S = t.j.b + e.n, n = e.c[t.k][2], $c(e.a, m, gt(f(_e(e.a, m), 24).a - 1 + n)), $c(e.b, m, ge(Ot(_e(e.b, m))) - S + n * e.e), ++m, m >= e.i ? (++e.i, Le(e.a, gt(1)), Le(e.b, S)) : (i = e.c[t.k][1], $c(e.a, m, gt(f(_e(e.a, m), 24).a + 1 - i)), $c(e.b, m, ge(Ot(_e(e.b, m))) + S - i * e.e)), (e.q == (Xc(), ab) && (f(_e(e.a, m), 24).a > e.j || f(_e(e.a, m - 1), 24).a > e.j) || e.q == ob && (ge(Ot(_e(e.b, m))) > e.k || ge(Ot(_e(e.b, m - 1))) > e.k)) && (p = !1), h = Dt(Lr(t)); xt(h); )
-          l = f(Et(h), 12), v = l.c.f, e.f[v.k] == m && (x = DR(e, v), s = s + f(x.a, 24).a, p = p && Pt(ge(jt(x.b))));
-        return e.f[t.k] = m, s = s + e.c[t.k][0], new pr(gt(s), (yn(), p ? ii : Rn));
-      }
-      function OC(e, t, n) {
-        var i, s, l, h, v, p, m, S, x, L, j, I, R, Y, q;
-        if (L = new qn(e.j), q = t.a / L.a, v = t.b / L.b, R = t.a - L.a, l = t.b - L.b, n)
-          for (s = He(z(e, (Ee(), dt))) === He((zn(), ni)), I = new M(e.f); I.a < I.c.c.length; )
-            switch (j = f(O(I), 7), j.g.e) {
-              case 1:
-                s || (j.i.a *= q);
-                break;
-              case 2:
-                j.i.a += R, s || (j.i.b *= v);
-                break;
-              case 3:
-                s || (j.i.a *= q), j.i.b += l;
-                break;
-              case 4:
-                s || (j.i.b *= v);
-            }
-        for (m = new M(e.c); m.a < m.c.c.length; )
-          p = f(O(m), 33), S = p.i.a + p.j.a / 2, x = p.i.b + p.j.b / 2, Y = S / L.a, h = x / L.b, Y + h >= 1 && (Y - h > 0 && x >= 0 ? (p.i.a += R, p.i.b += l * h) : Y - h < 0 && S >= 0 && (p.i.a += R * Y, p.i.b += l));
-        e.j.a = t.a, e.j.b = t.b, ce(e, (Ee(), ic), (du(), i = f(Hi(qd), 11), new ti(i, f(xi(i, i.length), 11), 0)));
-      }
-      function jR(e) {
-        var t, n, i, s, l, h, v, p, m, S;
-        for (i = new Se(), h = new M(e.e.a); h.a < h.c.c.length; ) {
-          for (s = f(O(h), 61), S = 0, s.k.c = ve(Ze, Me, 1, 0, 4, 1), n = new M(Kl(s)); n.a < n.c.c.length; )
-            t = f(O(n), 89), t.e && (Le(s.k, t), ++S);
-          S == 1 && (i.c[i.c.length] = s);
-        }
-        for (l = new M(i); l.a < l.c.c.length; )
-          for (s = f(O(l), 61); s.k.c.length == 1; ) {
-            for (m = f(O(new M(s.k)), 89), e.b[m.b] = m.f, v = m.c, p = m.d, n = new M(Kl(s)); n.a < n.c.c.length; )
-              t = f(O(n), 89), t == m || (t.e ? v == t.c || p == t.d ? e.b[m.b] -= e.b[t.b] - t.f : e.b[m.b] += e.b[t.b] - t.f : s == v ? t.c == s ? e.b[m.b] += t.f : e.b[m.b] -= t.f : t.c == s ? e.b[m.b] -= t.f : e.b[m.b] += t.f);
-            Cr(v.k, m), Cr(p.k, m), v == s ? s = m.d : s = m.c;
-          }
-      }
-      function RJ(e) {
-        var t, n, i, s, l, h, v, p, m, S;
-        for (m = new Wr(), v = new Wr(), l = new M(e); l.a < l.c.c.length; )
-          i = f(O(l), 77), i.e = i.d.c.length, i.k = i.j.c.length, i.e == 0 && wr(m, i, m.c.b, m.c), i.k == 0 && i.g.a.Y() == 0 && wr(v, i, v.c.b, v.c);
-        for (h = -1; m.b != 0; )
-          for (i = f(B3(m, 0), 77), n = new M(i.j); n.a < n.c.c.length; )
-            t = f(O(n), 117), S = t.b, S.n = Jr(S.n, i.n + 1), h = Jr(h, S.n), --S.e, S.e == 0 && wr(m, S, m.c.b, m.c);
-        if (h > -1) {
-          for (s = Jt(v, 0); s.b != s.d.c; )
-            i = f(Ft(s), 77), i.n = h;
-          for (; v.b != 0; )
-            for (i = f(B3(v, 0), 77), n = new M(i.d); n.a < n.c.c.length; )
-              t = f(O(n), 117), p = t.a, p.g.a.Y() == 0 && (p.n = Au(p.n, i.n - 1), --p.k, p.k == 0 && wr(v, p, v.c.b, v.c));
-        }
-      }
-      function BJ(e, t, n, i) {
-        var s, l, h, v, p, m, S, x, L, j, I, R, Y, q, V, U, te, ue;
-        for (p = new Se(), l = new M(t.b); l.a < l.c.c.length; )
-          for (s = f(O(l), 9), v = new M(s.f); v.a < v.c.c.length; ) {
-            for (h = f(O(v), 7), S = null, U = f(Vn(h.e, ve(Ki, Yi, 12, 0, 0, 1)), 47), te = 0, ue = U.length; te < ue; ++te)
-              V = U[te], rh(V.d.f, n) || (q = p2(e, t, n, V, V.c, (sr(), ri), S), q != S && (p.c[p.c.length] = q), q.c && (S = q));
-            for (m = null, I = f(Vn(h.b, ve(Ki, Yi, 12, 0, 0, 1)), 47), R = 0, Y = I.length; R < Y; ++R)
-              j = I[R], rh(j.c.f, n) || (q = p2(e, t, n, j, j.d, (sr(), Ai), m), q != m && (p.c[p.c.length] = q), q.c && (m = q));
-          }
-        for (L = new M(p); L.a < L.c.c.length; )
-          x = f(O(L), 187), Di(t.b, x.a, 0) != -1 || Le(t.b, x.a), x.c && (i.c[i.c.length] = x);
-      }
-      function zJ(e) {
-        var t, n, i, s, l, h, v, p, m;
-        for (i = e.e.e.j, t = f(nr(e.e, (Ee(), ic)), 86).kb((du(), eb)), _ee(e), l = new M(Xu(e.e)); l.a < l.c.c.length; ) {
-          switch (s = f(O(l), 161), v = f(nr(s, ul), 15), !v && (v = new Ut(0)), p = s.e.j, h = (n = f(s.e, 7).d, new qo(n.d, n.b, n.a, n.c)), m = new qn(s.e.i), f(s.e, 7).g.e) {
-            case 4:
-              m.a = -p.a - v.a, m.b = e.s - p.b - (t ? h.a : 0), e.s -= Fw(e, (we(), qe)) + p.b + (t ? h.d + h.a : 0);
-              break;
-            case 2:
-              m.a = i.a + v.a, m.b = e.a + (t ? h.d : 0), e.a += Fw(e, (we(), Be)) + p.b + (t ? h.d + h.a : 0);
-              break;
-            case 1:
-              m.a = e.f + (t ? h.b : 0), m.b = -s.e.j.b - v.a, e.f += Fw(e, (we(), rt)) + p.a + (t ? h.b + h.c : 0);
-              break;
-            case 3:
-              m.a = e.r - p.a - (t ? h.c : 0), m.b = i.b + v.a, e.r -= Fw(e, (we(), ct)) + p.a + (t ? h.b + h.c : 0);
-          }
-          s.e.i.a = m.a, s.e.i.b = m.b;
-        }
-      }
-      function HJ(e, t, n) {
-        var i, s, l, h, v, p, m, S, x, L, j, I, R, Y, q;
-        for (S = new _i(), x = new _i(), Y = new _i(), q = new _i(), m = f(z(t, (le(), Oi)), 15).a, l = m * f(z(t, (zt(), Qs)), 15).a, Pt(ge(jt(z(t, (Ee(), Fg))))), p = (L = new Wt(n.a).a.bb().mb(), new Zt(L)); p.a.G(); )
-          if (v = (h = f(p.a.H(), 21), f(h.yb(), 9)), j = f(z(v, _r), 32), j == (we(), rt))
-            for (x.a.db(v, x), s = Dt(Lr(v)); xt(s); )
-              i = f(Et(s), 12), vn(S, i.c.f);
-          else if (j == ct)
-            for (q.a.db(v, q), s = Dt(Lr(v)); xt(s); )
-              i = f(Et(s), 12), vn(Y, i.c.f);
-        S.a.Y() != 0 && (I = new e2(2, l), R = xC(I, t, S, x, -m - t.d.b), R > 0 && (e.a = m + (R - 1) * l, t.d.b += e.a, t.e.b += e.a)), Y.a.Y() != 0 && (I = new e2(1, l), R = xC(I, t, Y, q, t.e.b + m - t.d.b), R > 0 && (t.e.b += m + (R - 1) * l));
-      }
-      function NR(e, t) {
-        var n, i, s, l, h, v, p, m, S;
-        return mn(), t.length == 0 ? e.fc(zC, y2, -1, -1) : (S = Wc(t), zo(S.substr(0, 3), "at ") && (S = gd(S, 3, S.length - 3)), S = S.replace(/\[.*?\]/g, ""), h = S.indexOf("("), h == -1 ? (h = S.indexOf("@"), h == -1 ? (m = S, S = "") : (m = Wc(gd(S, h + 1, S.length - (h + 1))), S = Wc(S.substr(0, h)))) : (n = S.indexOf(")", h), m = S.substr(h + 1, n - (h + 1)), S = Wc(S.substr(0, h))), h = rq(S, Z3(46)), h != -1 && (S = gd(S, h + 1, S.length - (h + 1))), (S.length == 0 || zo(S, "Anonymous function")) && (S = y2), v = vq(m, Z3(58)), s = Cq(m, Z3(58), v - 1), p = -1, i = -1, l = zC, v != -1 && s != -1 && (l = m.substr(0, s), p = q9(m.substr(s + 1, v - (s + 1))), i = q9(gd(m, v + 1, m.length - (v + 1)))), e.fc(l, S, p, i));
-      }
-      function _J(e) {
-        var t, n, i, s, l, h, v, p, m, S;
-        for (m = new Se(), v = new Se(), h = new M(e); h.a < h.c.c.length; )
-          s = f(O(h), 80), s.c = s.b.c.length, s.f = s.e.c.length, s.c == 0 && (m.c[m.c.length] = s), s.f == 0 && s.j.b == 0 && (v.c[v.c.length] = s);
-        for (i = -1; m.c.length != 0; )
-          for (s = f(Fl(m, 0), 80), n = new M(s.e); n.a < n.c.c.length; )
-            t = f(O(n), 118), S = t.b, S.i = Jr(S.i, s.i + 1), i = Jr(i, S.i), --S.c, S.c == 0 && (m.c[m.c.length] = S);
-        if (i > -1) {
-          for (l = new M(v); l.a < l.c.c.length; )
-            s = f(O(l), 80), s.i = i;
-          for (; v.c.length != 0; )
-            for (s = f(Fl(v, 0), 80), n = new M(s.b); n.a < n.c.c.length; )
-              t = f(O(n), 118), p = t.a, !(p.j.b > 0) && (p.i = Au(p.i, s.i - 1), --p.f, p.f == 0 && (v.c[v.c.length] = p));
-        }
-      }
-      function GJ(e, t, n) {
-        var i, s, l, h, v, p, m, S, x, L, j, I, R;
-        if (Pt(ge(jt(z(n, (Ee(), ik))))))
-          for (v = new M(n.f); v.a < v.c.c.length; )
-            for (h = f(O(v), 7), x = f(Vn(h.e, ve(Ki, Yi, 12, h.e.c.length, 0, 1)), 47), m = 0, S = x.length; m < S; ++m)
-              p = x[m], l = p.d.f == n, s = l && Pt(ge(jt(z(p, ik)))), s && (j = p.c, L = f(Kt(e.b, j), 9), L || (L = B0(j, (zn(), jo), j.g, -1, j.j, f(z(t, Do), 59), t), ce(L, (le(), lt), j), un(e.b, j, L), Le(t.b, L)), R = p.d, I = f(Kt(e.b, R), 9), I || (I = B0(R, (zn(), jo), R.g, 1, R.j, f(z(t, Do), 59), t), ce(I, (le(), lt), R), un(e.b, R, I), Le(t.b, I)), i = ly(p), Bn(i, f(_e(L.f, 0), 7)), kn(i, f(_e(I.f, 0), 7)), pt(e.a, p, new N1(i, t, (sr(), ri))), f(z(t, (le(), qr)), 18).ib((vr(), as)));
-      }
-      function $J(e, t, n, i, s, l) {
-        var h, v, p, m, S, x, L, j, I, R, Y, q, V, U;
-        switch (j = Ld(e.g), R = Ld(n.g), I = dn(_a(e.i), e.a), Y = dn(_a(n.i), n.a), h = dn(new qn(I), Yo(new zc(j), t)), v = dn(new qn(Y), Yo(new zc(R), i)), m = cZ(e, s), s == (we(), ct) || s == Be ? m += l : m -= l, L = new Yr(), q = new Yr(), s.e) {
-          case 1:
-          case 3:
-            L.a = h.a, L.b = I.b + m, q.a = v.a, q.b = L.b;
-            break;
-          case 2:
-          case 4:
-            L.a = I.a + m, L.b = h.b, q.a = L.a, q.b = v.b;
-            break;
-          default:
-            return null;
-        }
-        switch (S = Yo(dn(new ot(L.a, L.b), q), 0.5), x = new ey(re(ie(_t, 1), Ht, 10, 0, [I, h, L, S, q, v, Y])), p = oO(x), U = sO(x), s.e) {
-          case 1:
-          case 3:
-            x.a = p, V = SZ(x);
-            break;
-          case 2:
-          case 4:
-            x.a = U, V = EZ(x);
-            break;
-          default:
-            return null;
-        }
-        return B5(x, new t2(re(ie(_t, 1), Ht, 10, 0, [p, U, V, I, Y]))), x;
-      }
-      function YJ(e, t, n, i) {
-        var s, l, h, v, p, m, S, x, L, j;
-        for (l = new dA(t), x = aQ(e, t, l), j = je(f(z(t, (Ee(), Jo)), 15).a, 1), S = new M(x.a); S.a < S.c.c.length; )
-          m = f(O(S), 27), p = dM(f(m.a, 10), f(m.b, 10), j), o = !0, o = o & uu(n, new ot(p.d, p.e)), o = o & uu(n, ua(new ot(p.d, p.e), p.c, 0)), o = o & uu(n, ua(new ot(p.d, p.e), 0, p.b)), o & uu(n, ua(new ot(p.d, p.e), p.c, p.b));
-        switch (L = l.d, v = dM(f(x.b.a, 10), f(x.b.b, 10), j), L == (we(), qe) || L == Be ? (i.c[L.e] = Xt(i.c[L.e], v.e), i.b[L.e] = je(i.b[L.e], v.e + v.b)) : (i.c[L.e] = Xt(i.c[L.e], v.d), i.b[L.e] = je(i.b[L.e], v.d + v.c)), s = Hr, h = l.c.f.e, L.e) {
-          case 4:
-            s = h.c;
-            break;
-          case 2:
-            s = h.b;
-            break;
-          case 1:
-            s = h.a;
-            break;
-          case 3:
-            s = h.d;
-        }
-        return i.a[L.e] = je(i.a[L.e], s), l;
-      }
-      function FJ(e, t, n, i, s) {
-        var l, h, v, p, m, S, x, L, j, I, R, Y;
-        for (l = new Se(), m = new M(i); m.a < m.c.c.length; )
-          if (v = f(O(m), 187), h = null, v.f == (sr(), ri))
-            for (I = new M(v.e); I.a < I.c.c.length; )
-              j = f(O(I), 12), Y = j.d.f, Ti(Y) == t ? CI(e, t, v, j, v.b, j.d) : !n || rh(Y, n) ? PZ(e, t, v, i, j) : (L = p2(e, t, n, j, v.b, ri, h), L != h && (l.c[l.c.length] = L), L.c && (h = L));
-          else
-            for (x = new M(v.e); x.a < x.c.c.length; )
-              if (S = f(O(x), 12), R = S.c.f, Ti(R) == t)
-                CI(e, t, v, S, S.c, v.b);
-              else {
-                if (!n || rh(R, n))
-                  continue;
-                L = p2(e, t, n, S, v.b, Ai, h), L != h && (l.c[l.c.length] = L), L.c && (h = L);
-              }
-        for (p = new M(l); p.a < p.c.c.length; )
-          v = f(O(p), 187), Di(t.b, v.a, 0) != -1 || Le(t.b, v.a), v.c && (s.c[s.c.length] = v);
-      }
-      function qJ(e) {
-        var t, n, i, s;
-        for (t = e.e.j, i = new M(Xu(e)); i.a < i.c.c.length; ) {
-          switch (n = f(O(i), 161), s = f(nr(n, (Ee(), ul)), 15), !s && (s = new Ut(0)), f(n.e, 7).g.e) {
-            case 4:
-              n.e.i.b = t.b * ge(Ot(nr(n, cf))), n.e.i.a = -n.e.j.a - s.a;
-              break;
-            case 2:
-              n.e.i.b = t.b * ge(Ot(nr(n, cf))), n.e.i.a = t.a + s.a;
-              break;
-            case 1:
-              n.e.i.a = t.a * ge(Ot(nr(n, cf))), n.e.i.b = -n.e.j.b - s.a;
-              break;
-            case 3:
-              n.e.i.a = t.a * ge(Ot(nr(n, cf))), n.e.i.b = t.b + s.a;
-          }
-          switch (f(n.e, 7).g.e) {
-            case 4:
-              n.e.i.b = t.b * ge(Ot(nr(n, cf))), n.e.i.a = -n.e.j.a - s.a;
-              break;
-            case 2:
-              n.e.i.b = t.b * ge(Ot(nr(n, cf))), n.e.i.a = t.a + s.a;
-              break;
-            case 1:
-              n.e.i.a = t.a * ge(Ot(nr(n, cf))), n.e.i.b = -n.e.j.b - s.a;
-              break;
-            case 3:
-              n.e.i.a = t.a * ge(Ot(nr(n, cf))), n.e.i.b = t.b + s.a;
-          }
-        }
-      }
-      function VJ(e) {
-        var t, n, i, s, l, h, v, p, m;
-        for (l = e.f, s = y4(ay(e)), m = Jt(ca(e.g), 0); m.b != m.d.c; )
-          if (p = f(Ft(m), 7), p.e.c.length == 0) {
-            for (n = new M(p.b); n.a < n.c.c.length; )
-              if (t = f(O(n), 12), i = t.c, s.a.R(i)) {
-                for (h = new fn(l.f, 0), v = (ut(h.b < h.d.Y()), f(h.d.sb(h.c = h.b++), 7)); v != p; )
-                  v = (ut(h.b < h.d.Y()), f(h.d.sb(h.c = h.b++), 7));
-                su(h, i), Xv(m, i), I0(i, p.g), Jv(m), Jv(m), s.a.eb(i) != null;
-              }
-          } else
-            for (n = new M(p.e); n.a < n.c.c.length; )
-              if (t = f(O(n), 12), i = t.d, s.a.R(i)) {
-                for (h = new fn(l.f, 0), v = (ut(h.b < h.d.Y()), f(h.d.sb(h.c = h.b++), 7)); v != p; )
-                  v = (ut(h.b < h.d.Y()), f(h.d.sb(h.c = h.b++), 7));
-                ut(h.b > 0), h.a.sb(h.c = --h.b), su(h, i), Xv(m, i), I0(i, p.g), Jv(m), Jv(m), s.a.eb(i) != null;
-              }
-      }
-      function WJ(e) {
-        var t, n, i, s, l, h, v, p, m;
-        l = new Nw(e), s = Mn(l, "graph"), p = Mn(l, "success"), i = Mn(l, "error"), h = Mn(l, "options");
-        try {
-          if (!s || !s.kc())
-            throw new t1("Mandatory parameter missing, 'graph' must be specified");
-          XU(new aP(), s.kc(), h ? h.kc() : null), v = s.kc().a, p && p.kc() ? kg(p.kc().a, v) : kg(null, v);
-        } catch (S) {
-          if (S = Ur(S), xe(S, 73))
-            m = S, i && i.kc() ? kg(i.kc().a, wA(m).a) : kg(null, wA(m).a);
-          else if (xe(S, 54))
-            t = S, n = new Dl(), Ta(n, "type", new Rc(a1(t.$c))), t.bc() != null ? Ta(n, x2, new Rc(t.bc())) : Ta(n, x2, new Rc("null (sic)")), Ta(n, d8, new Rc(MS(new n1(`
-`), new Pf(new ro((t.g == null && (t.g = a4(t)), t.g)))))), i && i.kc() ? kg(i.kc().a, n.a) : kg(null, n.a), _3(t, (Rl(), e_));
-          else
-            throw Kr(S);
-        }
-      }
-      function UJ(e, t, n) {
-        var i, s, l, h, v, p, m, S, x, L;
-        if (n)
-          for (i = -1, S = new fn(t, 0); S.b < S.d.Y(); ) {
-            if (v = (ut(S.b < S.d.Y()), f(S.d.sb(S.c = S.b++), 9)), x = e.a[v.d.k][v.k].a, x == null) {
-              for (h = i + 1, l = new fn(t, S.b); l.b < l.d.Y(); )
-                if (L = zF(e, (ut(l.b < l.d.Y()), f(l.d.sb(l.c = l.b++), 9))).a, L != null) {
-                  h = (or(L), L);
-                  break;
-                }
-              x = (i + h) / 2, e.a[v.d.k][v.k].a = x, e.a[v.d.k][v.k].d = (or(x), x), e.a[v.d.k][v.k].b = 1;
-            }
-            i = (or(x), x);
-          }
-        else {
-          for (s = 0, m = new M(t); m.a < m.c.c.length; )
-            v = f(O(m), 9), e.a[v.d.k][v.k].a != null && (s = je(s, ge(e.a[v.d.k][v.k].a)));
-          for (s += 2, p = new M(t); p.a < p.c.c.length; )
-            v = f(O(p), 9), e.a[v.d.k][v.k].a == null && (x = Xl(e.e, 24) * M2 * s - 1, e.a[v.d.k][v.k].a = x, e.a[v.d.k][v.k].d = x, e.a[v.d.k][v.k].b = 1);
-        }
-      }
-      function KJ(e, t, n) {
-        var i, s, l, h, v, p, m, S, x, L, j, I;
-        for (p = 0, m = 0, I = 0, j = 0, h = 0, L = 0, x = 0, S = 0, l = new G1(new Jb(e.c).a); S1(l.a); )
-          switch (s = (l.b = Yc(l.a), new b1(l.c, l.b)), i = f(s.b.b[s.a.e], 62), f(s.a, 67).e) {
-            case 12:
-            case 13:
-            case 14:
-              L += i.c + t;
-              break;
-            case 15:
-            case 16:
-            case 17:
-              x += i.c + t, h = je(h, i.b + t);
-              break;
-            case 18:
-            case 19:
-            case 20:
-              S += i.c + t;
-              break;
-            case 0:
-            case 1:
-            case 2:
-              I += i.c + t;
-              break;
-            case 3:
-            case 4:
-            case 5:
-              j += i.c + t;
-              break;
-            case 6:
-            case 7:
-            case 8:
-              p += i.b + t;
-              break;
-            case 9:
-            case 10:
-            case 11:
-              m += i.b + t;
-          }
-        p -= t, m -= t, I -= t, j -= t, L += L != 0 ? t : 0, x += x != 0 ? t : 0, S += S != 0 ? t : 0, v = e.p.d + h + e.p.a, v += v != 0 ? t : 0, n.a = je(n.a, I), n.a = je(n.a, L), n.a = je(n.a, x), n.a = je(n.a, S), n.a = je(n.a, j), n.b = je(n.b, p), n.b = je(n.b, v), n.b = je(n.b, m);
-      }
-      function ZJ(e) {
-        var t, n, i, s, l, h, v, p;
-        for (t = null, i = new M(e); i.a < i.c.c.length; )
-          n = f(O(i), 102), ge(ka(n.g, n.d[0]).a), n.b = null, n.e && n.e.Y() > 0 && n.c == 0 && (!t && (t = new Se()), t.c[t.c.length] = n);
-        if (t)
-          for (; t.c.length != 0; ) {
-            if (n = f(Fl(t, 0), 102), n.b && n.b.c.length > 0) {
-              for (l = (!n.b && (n.b = new Se()), new M(n.b)); l.a < l.c.c.length; )
-                if (s = f(O(l), 102), ge(ka(s.g, s.d[0]).a) == ge(ka(n.g, n.d[0]).a)) {
-                  if (Di(e, s, 0) > Di(e, n, 0))
-                    return new pr(s, n);
-                } else if (ge(ka(s.g, s.d[0]).a) > ge(ka(n.g, n.d[0]).a))
-                  return new pr(s, n);
-            }
-            for (v = (!n.e && (n.e = new Se()), n.e).mb(); v.G(); )
-              h = f(v.H(), 102), p = (!h.b && (h.b = new Se()), h.b), qc(0, p.c.length), _v(p.c, 0, n), h.c == p.c.length && (t.c[t.c.length] = h);
-          }
-        return null;
-      }
-      function XJ(e) {
-        var t, n, i, s, l, h, v, p, m, S, x, L, j, I, R;
-        for (x = (On(), new $t()), S = (_n(), new _o(Go(vs(e.a, new T())))); xt(S); )
-          for (m = f(Et(S), 9), s = ZU(m, (we(), Be)), i = new M(s); i.a < i.c.c.length; )
-            for (n = f(O(i), 7), h = new M(n.e); h.a < h.c.c.length; ) {
-              for (l = f(O(h), 12), Gi(), R = l.d.f, (R.g == (et(), hn) || R.g == Ka) && (R = f(z(R, (le(), Si)), 7).f), li(x.d, R) ? t = f(ci(li(x.d, R)), 171) : (s.c.length == 2 ? He(n) === He((Sn(0, s.c.length), s.c[0])) ? t = ns : t = Us : t = ns, ra(x.d, R, t)), p = new M(l.b); p.a < p.c.c.length; )
-                v = f(O(p), 33), ce(v, (le(), lo), t);
-              for (I = new M(l.c.c); I.a < I.c.c.length; )
-                L = f(O(I), 33), ce(L, (le(), lo), t);
-              for (j = new M(l.d.c); j.a < j.c.c.length; )
-                L = f(O(j), 33), ce(L, (le(), lo), t);
-            }
-      }
-      function QJ(e, t) {
-        var n, i, s, l, h, v, p, m, S;
-        if (_l(En(t)) != 1 || f(X1(En(t)), 12).d.f.g != (et(), hn))
-          return null;
-        for (l = f(X1(En(t)), 12), n = l.d.f, Ha(n, (et(), Ii)), ce(n, (le(), Mi), null), ce(n, Si, null), ce(n, (Ee(), dt), f(z(t, dt), 28)), ce(n, ia, f(z(t, ia), 86)), s = z(l.c, lt), h = null, m = Jn(n, (we(), Be)).mb(); m.G(); )
-          if (v = f(m.H(), 7), v.e.c.length != 0) {
-            ce(v, lt, s), S = l.c, v.j.a = S.j.a, v.j.b = S.j.b, v.a.a = S.a.a, v.a.b = S.a.b, Tn(v.c, S.c), S.c.c = ve(Ze, Me, 1, 0, 4, 1), h = v;
-            break;
-          }
-        if (ce(l.c, lt, null), !eg(Jn(t, Be)))
-          for (p = new M(Gc(Jn(t, Be))); p.a < p.c.c.length; )
-            v = f(O(p), 7), v.e.c.length == 0 ? (i = new Yn(), Bt(i, Be), i.j.a = v.j.a, i.j.b = v.j.b, cn(i, n), ce(i, lt, z(v, lt)), cn(v, null)) : cn(h, n);
-        return n.j.b = t.j.b, Le(e.b, n), n;
-      }
-      function JJ(e) {
-        var t, n, i, s, l, h, v, p, m;
-        if (l = e.e.e.j, h = new qn(l), p = f(nr(e.e, (Ee(), ic)), 86), m = f(nr(e.e, Zg), 86), v = f(nr(e.e, dt), 28), t = Fo(p, (du(), eb)), p.c != 0) {
-          switch (l.a = 0, l.b = 0, i = null, v.e) {
-            case 1:
-            case 2:
-            case 3:
-              i = wX(e, e.k);
-              break;
-            case 4:
-              i = new qn(h);
-              break;
-            case 5:
-              i = sQ(e.e, t);
-          }
-          Fo(p, uk) && (i && (l.a = je(l.a, i.a), l.b = je(l.b, i.b)), t && (l.a = je(l.a, e.q.b + e.q.c + e.k), l.b = je(l.b, e.q.d + e.q.a + e.k))), Fo(p, sk) && Nc(new M(bg(e.e))) && KJ(e, e.d, l), Fo(p, Jg) && (s = f(nr(e.e, Fd), 15).a, n = f(nr(e.e, Yd), 15).a, Fo(m, (sh(), tb)) && (s <= 0 && (s = 20), n <= 0 && (n = 20)), Fo(m, fk) ? (s > 0 && (l.a = je(l.a, s + e.q.b + e.q.c)), n > 0 && (l.b = je(l.b, n + e.q.d + e.q.a))) : (s > 0 && (l.a = je(l.a, s)), n > 0 && (l.b = je(l.b, n)))), qF(e.e, l);
-        }
-      }
-      function IR(e, t, n) {
-        var i, s, l, h, v, p, m, S, x, L, j;
-        if (!e.b)
-          return !1;
-        for (h = null, L = null, p = new gy(null, null), s = 1, p.a[1] = e.b, x = p; x.a[s]; )
-          m = s, v = L, L = x, x = x.a[s], i = e.a.$b(t, x.d), s = i < 0 ? 0 : 1, i == 0 && (!n.c || la(x.e, n.d)) && (h = x), !(x && x.b) && !Ru(x.a[s]) && (Ru(x.a[1 - s]) ? L = L.a[m] = c0(x, s) : Ru(x.a[1 - s]) || (j = L.a[1 - m], j && (!Ru(j.a[1 - m]) && !Ru(j.a[m]) ? (L.b = !1, j.b = !0, x.b = !0) : (l = v.a[1] == L ? 1 : 0, Ru(j.a[m]) ? v.a[l] = MN(L, m) : Ru(j.a[1 - m]) && (v.a[l] = c0(L, m)), x.b = v.a[l].b = !0, v.a[l].a[0].b = !1, v.a[l].a[1].b = !1))));
-        return h && (n.b = !0, n.d = h.e, x != h && (S = new gy(x.d, x.e), NZ(e, p, h, S), L == h && (L = S)), L.a[L.a[1] == x ? 1 : 0] = x.a[x.a[0] ? 0 : 1], --e.c), e.b = p.a[1], e.b && (e.b.b = !1), n.b;
-      }
-      function eee(e, t) {
-        var n, i, s, l, h, v, p, m, S, x, L, j, I, R, Y, q, V;
-        for (i = f(z(e, (Ee(), dt)), 28), p = e.e, v = e.a, n = f(z(e, (le(), os)), 15).a, m = p.a + v.b + v.c + 2 * n, S = 0 - v.d - n - e.d.b, j = p.b + v.d + v.a + 2 * n - e.d.b, x = new Se(), I = new Se(), l = (L = new Wt(t.a).a.bb().mb(), new Zt(L)); l.a.G(); ) {
-          switch (s = (h = f(l.a.H(), 21), f(h.yb(), 9)), i.e) {
-            case 1:
-            case 2:
-            case 3:
-              hX(s);
-              break;
-            case 4:
-              R = f(z(s, wu), 10), Y = R ? R.a : 0, s.i.a = m * ge(Ot(z(s, xu))) - Y, w0(s, !0, !1);
-              break;
-            case 5:
-              q = f(z(s, wu), 10), V = q ? q.a : 0, s.i.a = ge(Ot(z(s, xu))) - V, w0(s, !0, !1), p.a = je(p.a, s.i.a + s.j.a / 2);
-          }
-          switch (f(z(s, _r), 32).e) {
-            case 1:
-              s.i.b = S, x.c[x.c.length] = s;
-              break;
-            case 3:
-              s.i.b = j, I.c[I.c.length] = s;
-          }
-        }
-        switch (i.e) {
-          case 1:
-          case 2:
-            OM(x, e), OM(I, e);
-            break;
-          case 3:
-            AM(x, e), AM(I, e);
-        }
-      }
-      function tee(e) {
-        var t, n, i, s, l, h;
-        return i = f(z(e.a.g, (Ee(), ia)), 86), JM(i, (gu(), t = f(Hi(Ln), 11), new ti(t, f(xi(t, t.length), 11), 0))) || (Wu(i, b0(qi)) ? (n = f(f(Pa(e.a.b, e.b), 20).sb(0), 33), e.b.i.a = n.i.a, e.b.i.b = n.i.b) : Wu(i, b0(Wi)) ? (s = f(_e(e.a.c, e.a.c.c.length - 1), 9), l = f(f(Pa(e.a.b, e.b), 20).sb(f(Pa(e.a.b, e.b), 20).Y() - 1), 33), h = s.j.a - (l.i.a + l.j.a), e.b.i.a = e.a.g.j.a - h - e.b.j.a, e.b.i.b = l.i.b) : Wu(i, Yt(ga, re(ie(Ln, 1), De, 41, 0, [Ua]))) ? (n = f(f(Pa(e.a.b, e.b), 20).sb(0), 33), e.b.i.a = (e.a.g.j.a - e.b.j.a) / 2, e.b.i.b = n.i.b) : Wu(i, b0(ga)) ? (n = f(f(Pa(e.a.b, e.b), 20).sb(0), 33), e.b.i.b = n.i.b) : Wu(i, b0(Ua)) && (n = f(f(Pa(e.a.b, e.b), 20).sb(0), 33), e.b.i.a = (e.a.g.j.a - e.b.j.a) / 2, e.b.i.b = n.i.b)), null;
-      }
-      function MR(e) {
-        var t, n, i, s, l, h, v, p, m, S, x, L, j, I, R, Y;
-        for (I = new M(e); I.a < I.c.c.length; ) {
-          for (j = f(O(I), 9), ao(j.i), ao(j.j), ZX(j), SX(j), Y = new M(j.f); Y.a < Y.c.c.length; ) {
-            for (R = f(O(Y), 7), ao(R.i), ao(R.a), ao(R.j), Bt(R, wO(R.g)), l = f(z(R, (Ee(), mu)), 24), l && ce(R, mu, gt(-l.a)), s = new M(R.e); s.a < s.c.c.length; ) {
-              for (i = f(O(s), 12), n = Jt(i.a, 0); n.b != n.d.c; )
-                t = f(Ft(n), 10), ao(t);
-              if (p = f(z(i, Un), 44), p)
-                for (v = Jt(p, 0); v.b != v.d.c; )
-                  h = f(Ft(v), 10), ao(h);
-              for (x = new M(i.b); x.a < x.c.c.length; )
-                m = f(O(x), 33), ao(m.i), ao(m.j);
-            }
-            for (L = new M(R.c); L.a < L.c.c.length; )
-              m = f(O(L), 33), ao(m.i), ao(m.j);
-          }
-          for (j.g == (et(), Cn) && (ce(j, (le(), _r), wO(f(z(j, _r), 32))), BX(j)), S = new M(j.c); S.a < S.c.c.length; )
-            m = f(O(S), 33), ao(m.j), ao(m.i);
-        }
-      }
-      function nee(e, t, n, i) {
-        var s, l, h, v, p, m, S, x, L, j, I, R, Y, q, V;
-        for (yZ(n), rh(t.d.f, t.c.f) ? (S = t.c, x = ln(re(ie(_t, 1), Ht, 10, 0, [S.i, S.a])), m = S.f.b, ua(x, -m.b, -m.d), x.a -= i.a, x.b -= i.b) : x = Pi(t.c), x.a += i.a, x.b += i.b, L = new Dl(), Fa(e, L, "x", x.a), Fa(e, L, "y", x.b), Ta(n, "sourcePoint", L), j = Pi(t.d), z(t, (le(), fE)) != null && dn(j, f(z(t, fE), 10)), dn(j, i), I = new Dl(), Fa(e, I, "x", j.a), Fa(e, I, "y", j.b), Ta(n, "targetPoint", I), s = new A5(), V = Vu(t.a, i), l = 0, q = Jt(V, 0); q.b != q.d.c; )
-          R = f(Ft(q), 10), p = new Dl(), Fa(e, p, "x", R.a), Fa(e, p, "y", R.b), Uj(s, l++, p);
-        if (V.b == 0 ? Ta(n, L2, null) : Ta(n, L2, s), h = f(z(t, (Ee(), Un)), 44), l = 0, h) {
-          for (Vu(h, i), v = new A5(), Y = Jt(h, 0); Y.b != Y.d.c; )
-            R = f(Ft(Y), 10), p = new Dl(), Fa(e, p, "x", R.a), Fa(e, p, "y", R.b), Uj(v, l++, p);
-          Ta(n, v8, v);
-        } else
-          Ta(n, v8, null);
-      }
-      function ree(e, t, n, i) {
-        var s, l, h, v, p, m, S, x, L, j, I, R, Y, q;
-        if (R = e.i, Y = e.j, L = e.e, t) {
-          for (x = i / 2 * (t.Y() - 1), j = 0, m = t.mb(); m.G(); )
-            v = f(m.H(), 9), x += v.j.a, j = je(j, v.j.b);
-          for (q = R.a - (x - Y.a) / 2, h = R.b - L.d + j, s = Y.a / (t.Y() + 1), l = s, p = t.mb(); p.G(); )
-            v = f(p.H(), 9), v.i.a = q, v.i.b = h - v.j.b, q += v.j.a + i / 2, S = AA(v), S.i.a = v.j.a / 2 - S.a.a, S.i.b = v.j.b, I = f(z(v, (le(), xp)), 7), I.b.c.length + I.e.c.length == 1 && (I.i.a = l - I.a.a, I.i.b = 0, cn(I, e)), l += s;
-        }
-        if (n) {
-          for (x = i / 2 * (n.Y() - 1), j = 0, m = n.mb(); m.G(); )
-            v = f(m.H(), 9), x += v.j.a, j = je(j, v.j.b);
-          for (q = R.a - (x - Y.a) / 2, h = R.b + Y.b + L.a - j, s = Y.a / (n.Y() + 1), l = s, p = n.mb(); p.G(); )
-            v = f(p.H(), 9), v.i.a = q, v.i.b = h, q += v.j.a + i / 2, S = AA(v), S.i.a = v.j.a / 2 - S.a.a, S.i.b = 0, I = f(z(v, (le(), xp)), 7), I.b.c.length + I.e.c.length == 1 && (I.i.a = l - I.a.a, I.i.b = Y.b, cn(I, e)), l += s;
-        }
-      }
-      function iee(e, t, n, i, s) {
-        var l, h, v, p, m, S, x, L, j, I, R, Y, q, V, U, te, ue, ye;
-        for (ye = 0, j = 0, x = new M(t.f); x.a < x.c.c.length; ) {
-          for (S = f(O(x), 9), L = 0, v = 0, p = n ? f(z(S, pp), 24).a : Ys, q = i ? f(z(S, wp), 24).a : Ys, m = p > q ? p : q, U = new M(S.f); U.a < U.c.c.length; ) {
-            if (V = f(O(U), 7), te = S.i.b + V.i.b + V.a.b, i)
-              for (h = new M(V.e); h.a < h.c.c.length; )
-                l = f(O(h), 12), R = l.d, I = R.f, t != e.a[I.k] && (Y = Jr(f(z(I, pp), 24).a, f(z(I, wp), 24).a), ue = f(z(l, (le(), Xa)), 24).a, ue >= m && ue >= Y && (L += I.i.b + R.i.b + R.a.b - te, ++v));
-            if (n)
-              for (h = new M(V.b); h.a < h.c.c.length; )
-                l = f(O(h), 12), R = l.c, I = R.f, t != e.a[I.k] && (Y = Jr(f(z(I, pp), 24).a, f(z(I, wp), 24).a), ue = f(z(l, (le(), Xa)), 24).a, ue >= m && ue >= Y && (L += I.i.b + R.i.b + R.a.b - te, ++v));
-          }
-          v > 0 && (ye += L / v, ++j);
-        }
-        j > 0 ? (t.a = s * ye / j, t.i = j) : (t.a = 0, t.i = 0);
-      }
-      function aee(e, t, n, i) {
-        var s, l, h, v, p, m, S, x, L, j, I, R, Y, q, V;
-        for (j = t.c.length, L = 0, x = new M(e.c); x.a < x.c.c.length; )
-          if (S = f(O(x), 16), q = S.a, q.c.length != 0) {
-            for (Y = new M(q), m = 0, V = null, s = f(O(Y), 9); s; ) {
-              if (l = f(_e(t, s.k), 111), l.c >= 0) {
-                for (p = null, v = new fn(S.a, m + 1); v.b < v.d.Y() && (h = (ut(v.b < v.d.Y()), f(v.d.sb(v.c = v.b++), 9)), p = f(_e(t, h.k), 111), !(p.d == l.d && p.c < l.c)); )
-                  p = null;
-                p && (V && ($c(i, s.k, gt(f(_e(i, s.k), 24).a - 1)), f(_e(n, V.k), 20).nb(l)), l = hZ(l, s, j++), t.c[t.c.length] = l, Le(n, new Se()), V ? (f(_e(n, V.k), 20).ib(l), Le(i, gt(1))) : Le(i, gt(0)));
-              }
-              I = null, Y.a < Y.c.c.length && (I = f(O(Y), 9), R = f(_e(t, I.k), 111), f(_e(n, s.k), 20).ib(R), $c(i, I.k, gt(f(_e(i, I.k), 24).a + 1))), l.d = L, l.c = m++, V = s, s = I;
-            }
-            ++L;
-          }
-        Pt(ge(jt(z(e, (Ee(), Fg)))));
-      }
-      function Ss(e, t) {
-        var n;
-        if (e.e)
-          throw new Ou((Al(pk), "The " + pk.j + p8));
-        if (!yF(e.a, t))
-          throw new As("The direction " + t + " is not supported by the CGraph instance.");
-        if (t == e.d)
-          return e;
-        switch (n = e.d, e.d = t, n.e) {
-          case 0:
-            switch (t.e) {
-              case 2:
-                Hs(e);
-                break;
-              case 1:
-                Es(e), Hs(e);
-                break;
-              case 4:
-                Uc(e), Hs(e);
-                break;
-              case 3:
-                Uc(e), Es(e), Hs(e);
-            }
-            break;
-          case 2:
-            switch (t.e) {
-              case 1:
-                Es(e), d2(e);
-                break;
-              case 4:
-                Uc(e), Hs(e);
-                break;
-              case 3:
-                Uc(e), Es(e), Hs(e);
-            }
-            break;
-          case 1:
-            switch (t.e) {
-              case 2:
-                Es(e), d2(e);
-                break;
-              case 4:
-                Es(e), Uc(e), Hs(e);
-                break;
-              case 3:
-                Es(e), Uc(e), Es(e), Hs(e);
-            }
-            break;
-          case 4:
-            switch (t.e) {
-              case 2:
-                Uc(e), Hs(e);
-                break;
-              case 1:
-                Uc(e), Es(e), Hs(e);
-                break;
-              case 3:
-                Es(e), d2(e);
-            }
-            break;
-          case 3:
-            switch (t.e) {
-              case 2:
-                Es(e), Uc(e), Hs(e);
-                break;
-              case 1:
-                Es(e), Uc(e), Es(e), Hs(e);
-                break;
-              case 4:
-                Es(e), d2(e);
-            }
-        }
-        return e;
-      }
-      function AC(e, t, n) {
-        var i, s, l, h, v, p, m, S, x;
-        if (!e.a[t.d.k][t.k].e) {
-          for (e.a[t.d.k][t.k].e = !0, e.a[t.d.k][t.k].b = 0, e.a[t.d.k][t.k].d = 0, e.a[t.d.k][t.k].a = null, S = new M(t.f); S.a < S.c.c.length; )
-            for (m = f(O(S), 7), x = n ? new Zh(m) : new Lf(m), p = x.mb(); p.G(); )
-              v = f(p.H(), 7), h = v.f, h.d == t.d ? h != t && (AC(e, h, n), e.a[t.d.k][t.k].b += e.a[h.d.k][h.k].b, e.a[t.d.k][t.k].d += e.a[h.d.k][h.k].d) : (e.a[t.d.k][t.k].d += e.d[v.k], ++e.a[t.d.k][t.k].b);
-          if (l = f(z(t, (le(), wL)), 20), l)
-            for (s = l.mb(); s.G(); )
-              i = f(s.H(), 9), t.d == i.d && (AC(e, i, n), e.a[t.d.k][t.k].b += e.a[i.d.k][i.k].b, e.a[t.d.k][t.k].d += e.a[i.d.k][i.k].d);
-          e.a[t.d.k][t.k].b > 0 && (e.a[t.d.k][t.k].d += Xl(e.e, 24) * M2 * 0.07000000029802322 - 0.03500000014901161, e.a[t.d.k][t.k].a = e.a[t.d.k][t.k].d / e.a[t.d.k][t.k].b);
-        }
-      }
-      function oee(e, t) {
-        var n, i, s, l, h, v, p, m, S, x, L;
-        for (s = new M(e.a.c); s.a < s.c.c.length; )
-          for (n = f(O(s), 16), p = new M(n.a); p.a < p.c.c.length; )
-            v = f(O(p), 9), t.i[v.k] = v, t.g[v.k] = t.k == (oo(), Za) ? Hr : ki;
-        for (h = e.a.c, t.c == (Co(), Ps) && (h = xe(h, 87) ? wd(f(h, 87)) : xe(h, 88) ? f(h, 88).a : xe(h, 63) ? new Dv(h) : new od(h)), OW(e.e, t, e.b), cF(t.n), l = h.mb(); l.G(); )
-          for (n = f(l.H(), 16), m = n.a, t.k == (oo(), Za) && (m = xe(m, 87) ? wd(f(m, 87)) : xe(m, 88) ? f(m, 88).a : xe(m, 63) ? new Dv(m) : new od(m)), L = m.mb(); L.G(); )
-            x = f(L.H(), 9), t.f[x.k] == x && GR(e, x, t);
-        for (cJ(e, t), i = h.mb(); i.G(); )
-          for (n = f(i.H(), 16), L = new M(n.a); L.a < L.c.c.length; )
-            x = f(O(L), 9), t.n[x.k] = t.n[t.f[x.k].k], x == t.f[x.k] && (S = ge(t.g[t.i[x.k].k]), (t.k == (oo(), Za) && S > Hr || t.k == ku && S < ki) && (t.n[x.k] = ge(t.n[x.k]) + S));
-        e.e.Jc();
-      }
-      function OR(e, t) {
-        var n, i, s, l, h, v, p, m, S, x, L;
-        JU(t, re(ie(rf, 1), Me, 79, 0, [(le(), Oi), os, (zt(), nv), Ph])), m = f(z(t, Oi), 15).a, f(z(t, Qs), 15).a * m < 2 && ce(t, Qs, new Ut(2 / m)), S = f(z(t, (Ee(), Do)), 59), S == ($n(), Po) && ce(t, Do, By(t)), x = f(z(t, RL), 24), x.a == 0 ? ce(t, jh, new FM()) : ce(t, jh, new jI(x.a)), L = new RR(t), ce(t, ml, L), s = s0(e, f(z(t, pE), 180)), v = s0(e, f(z(t, kE), 180)), i = s0(e, f(z(t, Pp), 180)), p = s0(e, f(z(t, EE), 180)), l = s0(e, dq(f(z(t, SL), 122))), h = new An(), ce(t, $H, h), xr(xr(xr(xr(xr(xr(h, s.qc(t)), v.qc(t)), i.qc(t)), p.qc(t)), l.qc(t)), hJ(t)), n = (fi(30, nl), new ji(30)), ce(t, PL, n), Tn(n, Eg(e, h, 0)), n.c[n.c.length] = s, Tn(n, Eg(e, h, 1)), n.c[n.c.length] = v, Tn(n, Eg(e, h, 2)), n.c[n.c.length] = i, Tn(n, Eg(e, h, 3)), n.c[n.c.length] = p, Tn(n, Eg(e, h, 4)), n.c[n.c.length] = l, Tn(n, Eg(e, h, 5));
-      }
-      function see(e, t) {
-        var n, i, s, l, h, v;
-        if (l = SN(pg(e)), !l.Nb().V()) {
-          switch (s = f(z(f(f(f(l.Nb().sb(0), 129), 224).e, 33), (Gi(), KB)), 171), s = s == nb ? Us : s, v = 0, f(e.e, 7).g.e) {
-            case 4:
-            case 2:
-              s == Us && (v = e.e.j.b);
-              break;
-            case 3:
-              v = e.e.j.b;
-          }
-          for ((f(e.e, 7).g == (we(), rt) || s == ns) && (l = wd(l)), i = Ed(l.Nb().mb()); i.G(); ) {
-            if (n = f(i.H(), 129), h = new qn(n.e.i), s == ns)
-              switch (f(e.e, 7).g.e) {
-                case 1:
-                case 4:
-                  h.a = -n.e.j.a - t, h.b = v - t - n.e.j.b, v -= t + n.e.j.b;
-                  break;
-                case 2:
-                  h.a = e.e.j.a + t, h.b = v - t - n.e.j.b, v -= t + n.e.j.b;
-                  break;
-                case 3:
-                  h.a = -n.e.j.a - t, h.b = v + t, v += t + n.e.j.b;
-              }
-            else
-              switch (f(e.e, 7).g.e) {
-                case 4:
-                  h.a = -n.e.j.a - t, h.b = v + t, v += t + n.e.j.b;
-                  break;
-                case 2:
-                  h.a = e.e.j.a + t, h.b = v + t, v += t + n.e.j.b;
-                  break;
-                case 1:
-                  h.a = e.e.j.a + t, h.b = v - t - n.e.j.b, v -= t + n.e.j.b;
-                  break;
-                case 3:
-                  h.a = e.e.j.a + t, h.b = v + t, v += t + n.e.j.b;
-              }
-            n.e.i.a = h.a, n.e.i.b = h.b;
-          }
-        }
-      }
-      function uee(e, t, n) {
-        var i, s, l, h, v, p, m, S, x, L, j;
-        for (i = 0, s = 0, S = 0; S < e.length; S++)
-          if (p = e[S], gi(f(z(p, (Ee(), dt)), 28)))
-            for (h = Jn(p, (we(), Be)).mb(); h.G(); )
-              l = f(h.H(), 7), l.b.c.length + l.e.c.length > 0 && (i += l.b.c.length + l.e.c.length, un(t, l, gt(i)));
-          else {
-            for (v = Jn(p, (we(), Be)).mb(); v.G(); )
-              l = f(v.H(), 7), i += l.b.c.length + l.e.c.length;
-            for (h = Jn(p, Be).mb(); h.G(); )
-              l = f(h.H(), 7), l.b.c.length + l.e.c.length > 0 && un(t, l, gt(i));
-          }
-        for (m = e.length - 1; m >= 0; m--)
-          if (p = e[m], gi(f(z(p, (Ee(), dt)), 28)))
-            for (L = Jn(p, (we(), qe)).mb(); L.G(); )
-              x = f(L.H(), 7), x.b.c.length + x.e.c.length > 0 && (s += x.b.c.length + x.e.c.length, un(n, x, gt(s)));
-          else {
-            for (j = Jn(p, (we(), qe)).mb(); j.G(); )
-              x = f(j.H(), 7), s += x.b.c.length + x.e.c.length;
-            for (L = Jn(p, qe).mb(); L.G(); )
-              x = f(L.H(), 7), x.b.c.length + x.e.c.length > 0 && un(n, x, gt(s));
-          }
-      }
-      function cee(e, t, n, i, s) {
-        var l, h, v, p, m, S, x, L, j, I, R, Y, q;
-        switch (L = Ld(e.g), I = Ld(t.g), j = dn(_a(e.i), e.a), R = dn(_a(t.i), t.a), p = dn(new ot(j.a, j.b), Yo(new zc(L), 1.3 * n)), Y = dn(new ot(R.a, R.b), Yo(new zc(I), 1.3 * i)), v = ei(p.a - Y.a), v < s && (e.g == (we(), qe) || e.g == Be ? p.a < Y.a ? p.a = Y.a - s : p.a = Y.a + s : p.a < Y.a ? Y.a = p.a + s : Y.a = p.a - s), l = 0, h = 0, e.g.e) {
-          case 4:
-            l = 2 * (j.a - n) - 0.5 * (p.a + Y.a);
-            break;
-          case 2:
-            l = 2 * (j.a + n) - 0.5 * (p.a + Y.a);
-            break;
-          case 1:
-            h = 2 * (j.b - n) - 0.5 * (p.b + Y.b);
-            break;
-          case 3:
-            h = 2 * (j.b + n) - 0.5 * (p.b + Y.b);
-        }
-        switch (t.g.e) {
-          case 4:
-            l = 2 * (R.a - i) - 0.5 * (Y.a + p.a);
-            break;
-          case 2:
-            l = 2 * (R.a + i) - 0.5 * (Y.a + p.a);
-            break;
-          case 1:
-            h = 2 * (R.b - i) - 0.5 * (Y.b + p.b);
-            break;
-          case 3:
-            h = 2 * (R.b + i) - 0.5 * (Y.b + p.b);
-        }
-        return x = new ot(l, h), S = new ey(re(ie(_t, 1), Ht, 10, 0, [j, p, x, Y, R])), m = oO(S), q = sO(S), S.a = m, B5(S, new t2(re(ie(_t, 1), Ht, 10, 0, [m, q, j, R]))), S;
-      }
-      function AR(e, t, n) {
-        var i, s, l, h, v, p, m, S, x, L, j, I, R, Y;
-        for (p = n.a, s = f(z(n, (le(), os)), 15).a, I = n.d, v = (i = f(z(n, os), 15).a, new ot(n.e.a + n.a.b + n.a.c + 2 * i, n.e.b + n.a.d + n.a.a + 2 * i)), m = v.b, L = new M(e.a); L.a < L.c.c.length; )
-          if (S = f(O(L), 9), S.g == (et(), Cn)) {
-            switch (l = f(z(S, _r), 32), h = f(z(S, CL), 10), j = S.i, l.e) {
-              case 2:
-                j.a = n.e.a + s + p.c - I.a;
-                break;
-              case 4:
-                j.a = -I.a - s - p.b;
-            }
-            switch (Y = 0, l.e) {
-              case 2:
-              case 4:
-                t == (zn(), es) ? (R = ge(Ot(z(S, xu))), j.b = v.b * R - f(z(S, (Ee(), wu)), 10).b, Y = j.b + h.b, w0(S, !1, !0)) : t == ni && (j.b = ge(Ot(z(S, xu))) - f(z(S, (Ee(), wu)), 10).b, Y = j.b + h.b, w0(S, !1, !0));
-            }
-            m = m > Y ? m : Y;
-          }
-        for (n.e.b += m - v.b, x = new M(e.a); x.a < x.c.c.length; )
-          if (S = f(O(x), 9), S.g == (et(), Cn))
-            switch (l = f(z(S, _r), 32), j = S.i, l.e) {
-              case 1:
-                j.b = -I.b - s - p.d;
-                break;
-              case 3:
-                j.b = n.e.b + s + p.a - I.b;
-            }
-      }
-      function lee(e) {
-        var t, n, i, s, l, h, v, p, m, S, x, L, j, I;
-        for (s = new Se(), p = new M(e.d.f); p.a < p.c.c.length; )
-          h = f(O(p), 7), h.g == (we(), Be) && (s.c[s.c.length] = h);
-        if (e.e.a == ($n(), Fi) && !ds(f(z(e.d, (Ee(), dt)), 28)))
-          for (i = Dt(En(e.d)); xt(i); )
-            n = f(Et(i), 12), Le(s, n.c);
-        for (l = e.d.j.a, ce(e.d, (le(), fb), new Ut(e.d.j.a)), e.d.j.a = e.c, ce(e.d, vc, (yn(), yn(), ii)), Le(e.b, e.d), m = e.d, l -= e.c, S = e.a; S > 1; )
-          t = Xt(l, e.c), m = (x = new qa(e.e.c), Ha(x, (et(), Ii)), ce(x, (Ee(), dt), f(z(m, dt), 28)), ce(x, ia, f(z(m, ia), 86)), x.k = e.e.b++, Le(e.b, x), x.j.b = m.j.b, x.j.a = t, L = new Yn(), Bt(L, (we(), Be)), cn(L, m), L.i.a = x.j.a, L.i.b = x.j.b / 2, j = new Yn(), Bt(j, qe), cn(j, x), j.i.b = x.j.b / 2, j.i.a = -j.j.a, I = new bs(), Bn(I, L), kn(I, j), x), Le(e.e.c.b, m), --S, l -= e.c + e.e.d;
-        for (new G3(e.d, e.b, e.c), v = new M(s); v.a < v.c.c.length; )
-          h = f(O(v), 7), Cr(e.d.f, h), cn(h, m);
-      }
-      function fee(e, t) {
-        var n, i, s, l, h, v, p, m, S, x, L, j;
-        if (!(e.p > t.a || t.p > e.a)) {
-          for (n = 0, i = 0, x = (h = new Wt(e.o.a).a.bb().mb(), new Zt(h)); x.a.G(); )
-            m = (s = f(x.a.H(), 21), f(s.yb(), 7)), Hy(ln(re(ie(_t, 1), Ht, 10, 0, [m.f.i, m.i, m.a])).b, t.p, t.a) && ++n;
-          for (L = (v = new Wt(e.g.a).a.bb().mb(), new Zt(v)); L.a.G(); )
-            m = (s = f(L.a.H(), 21), f(s.yb(), 7)), Hy(ln(re(ie(_t, 1), Ht, 10, 0, [m.f.i, m.i, m.a])).b, t.p, t.a) && --n;
-          for (j = (p = new Wt(t.o.a).a.bb().mb(), new Zt(p)); j.a.G(); )
-            m = (s = f(j.a.H(), 21), f(s.yb(), 7)), Hy(ln(re(ie(_t, 1), Ht, 10, 0, [m.f.i, m.i, m.a])).b, e.p, e.a) && ++i;
-          for (S = (l = new Wt(t.g.a).a.bb().mb(), new Zt(l)); S.a.G(); )
-            m = (s = f(S.a.H(), 21), f(s.yb(), 7)), Hy(ln(re(ie(_t, 1), Ht, 10, 0, [m.f.i, m.i, m.a])).b, e.p, e.a) && --i;
-          n < i ? new r0(e, t, i - n) : i < n ? new r0(t, e, n - i) : (new r0(t, e, 0), new r0(e, t, 0));
-        }
-      }
-      function RR(e) {
-        var t;
-        this.f = f(z(e, (le(), Oi)), 15).a, this.d = f(z(e, (zt(), tv)), 15).a, this.a = this.f * f(z(e, Qs), 15).a, this.b = this.f * f(z(e, WH), 15).a, f(z(e, cE), 15), this.c = f(z(e, cE), 15).a, this.e = f(z(e, (Ee(), wh)), 15).a, t = (et(), re(ie(aT, 1), De, 132, 0, [Hn, hn, Cn, er, Ka, Ii])).length, this.g = Gm(Op, [Dr, F0], [250, 26], 12, [t, t], 2), Gv(this, Hn, this.f), Vo(this, Hn, hn, this.b), Vo(this, Hn, er, this.b), Vo(this, Hn, Cn, this.c), Vo(this, Hn, Ka, this.b), Vo(this, Hn, Ii, this.b), Gv(this, hn, this.a), Vo(this, hn, er, this.a), Vo(this, hn, Cn, this.c), Vo(this, hn, Ka, this.e), Vo(this, hn, Ii, this.b), Gv(this, er, this.a), Vo(this, er, Cn, this.c), Vo(this, er, Ka, this.e), Vo(this, er, Ii, this.b), Gv(this, Cn, this.c), Vo(this, Cn, Ka, this.c), Vo(this, Cn, Ii, this.c), Gv(this, Ka, this.e), Vo(this, Ka, Ii, this.e), Gv(this, Ii, this.f);
-      }
-      function hee(e, t) {
-        var n, i, s, l, h, v, p, m, S;
-        if (_l(Lr(t)) != 1 || f(X1(Lr(t)), 12).c.f.g != (et(), hn))
-          return null;
-        for (n = f(X1(Lr(t)), 12), i = n.c.f, Ha(i, (et(), Hn)), ce(i, (le(), Mi), null), ce(i, Si, null), ce(i, fb, f(z(t, fb), 15)), ce(i, vc, (yn(), yn(), ii)), ce(i, lt, z(t, lt)), i.j.b = t.j.b, l = z(n.d, lt), h = null, m = Jn(i, (we(), qe)).mb(); m.G(); )
-          if (v = f(m.H(), 7), v.b.c.length != 0) {
-            ce(v, lt, l), S = n.d, v.j.a = S.j.a, v.j.b = S.j.b, v.a.a = S.a.a, v.a.b = S.a.b, Tn(v.c, S.c), S.c.c = ve(Ze, Me, 1, 0, 4, 1), h = v;
-            break;
-          }
-        if (ce(n.d, lt, null), _l(Jn(t, qe)) > 1)
-          for (p = Jt(ca(Jn(t, qe)), 0); p.b != p.d.c; )
-            v = f(Ft(p), 7), v.b.c.length == 0 ? (s = new Yn(), Bt(s, qe), s.j.a = v.j.a, s.j.b = v.j.b, cn(s, i), ce(s, lt, z(v, lt)), cn(v, null)) : cn(h, i);
-        return ce(t, lt, null), ce(t, vc, Rn), Ha(t, Ii), ce(i, (Ee(), dt), f(z(t, dt), 28)), ce(i, ia, f(z(t, ia), 86)), Ac(e.b, 0, i), i;
-      }
-      function B0(e, t, n, i, s, l, h) {
-        var v, p, m, S, x, L;
-        switch (x = n, m = new qa(h), Ha(m, (et(), Cn)), ce(m, (le(), CL), s), ce(m, (Ee(), dt), (zn(), ni)), ce(m, Qd, f(z(e, ul), 15)), p = f(z(e, wu), 10), !p && (p = new ot(s.a / 2, s.b / 2)), ce(m, wu, p), S = new Yn(), cn(S, m), t != jo && t != ac || (v = l != ($n(), Po) ? l : Fi, i > 0 ? x = g0(v) : x = Oy(g0(v)), ce(e, Kg, x)), x.e) {
-          case 4:
-            ce(m, (zt(), Er), ($i(), gc)), ce(m, oE, (nh(), lb)), m.j.b = s.b, Bt(S, (we(), Be)), S.i.b = p.b;
-            break;
-          case 2:
-            ce(m, (zt(), Er), ($i(), Tu)), ce(m, oE, (nh(), yp)), m.j.b = s.b, Bt(S, (we(), qe)), S.i.b = p.b;
-            break;
-          case 1:
-            ce(m, Zs, (ms(), gf)), m.j.a = s.a, Bt(S, (we(), ct)), S.i.a = p.a;
-            break;
-          case 3:
-            ce(m, Zs, (ms(), Lh)), m.j.a = s.a, Bt(S, (we(), rt)), S.i.a = p.a;
-        }
-        if (t == yh || t == es || t == ni) {
-          switch (L = 0, x.e) {
-            case 4:
-            case 2:
-              L = null.cd, t == es && (L /= null.cd);
-              break;
-            case 1:
-            case 3:
-              L = null.cd, t == es && (L /= null.cd);
-          }
-          ce(m, xu, L);
-        }
-        return ce(m, _r, x), m;
-      }
-      function dee(e) {
-        var t, n, i, s, l, h, v, p, m, S, x, L, j, I, R, Y, q, V, U;
-        for (m = new Ci(), q = (On(), new $t()), un(q, e, BO(e)), i = (fi(2, nl), new ji(2)), e.c && Le(i, e.c), e.d && Le(i, e.d), j = new M(i); j.a < j.c.c.length; )
-          if (L = f(O(j), 7), t = new Wr(), na(t, Gc(ya((dr(), new Qn(ur(re(ie(Ze, 1), Me, 1, 4, [L.b, L.e]))))))), hg(t, e, !0), t.b != 0)
-            for (U = f(ci(li(q.d, e)), 34), L == e.d ? (I = U[U.length - 1], V = !0) : (I = U[0], V = !1), p = 1; p < U.length; p++) {
-              for (V ? R = U[U.length - 1 - p] : R = U[p], n = Jt(t, 0); n.b != n.d.c; )
-                S = f(Ft(n), 12), x = f(ci(li(q.d, S)), 34), x == null && (x = BO(S), ra(q.d, S, x)), x.length <= p ? e3(n) : (V ? Y = x[x.length - 1 - p] : Y = x[p], (R.a != Y.a || R.b != Y.b) && (s = R.a - I.a, h = R.b - I.b, l = Y.a - I.a, v = Y.b - I.b, l * h == v * s && ry(s) == ry(l) && ry(h) == ry(v) ? ((s <= 0 ? 0 - s : s) < (l <= 0 ? 0 - l : l) || (h <= 0 ? 0 - h : h) < (v <= 0 ? 0 - v : v)) && wr(m, R, m.c.b, m.c) : p > 1 && wr(m, I, m.c.b, m.c), e3(n)));
-              I = R;
-            }
-        return m;
-      }
-      function vee(e) {
-        var t, n, i, s, l, h, v, p, m, S, x, L, j, I, R;
-        for (e.n = f(z(e.g, (le(), Oi)), 15).a * f(z(e.g, (zt(), tv)), 15).a, e.e = e.n * f(z(e.g, Qs), 15).a, e.i = e.g.c.c.length, v = e.i - 1, L = 0, e.j = 0, e.k = 0, e.a = i0(ve(H2, Dr, 24, e.i, 0, 1)), e.b = i0(ve(bb, Dr, 184, e.i, 6, 1)), h = new M(e.g.c); h.a < h.c.c.length; ) {
-          for (s = f(O(h), 16), s.k = v, x = new M(s.a); x.a < x.c.c.length; )
-            S = f(O(x), 9), S.k = L, ++L;
-          --v;
-        }
-        for (e.f = ve(Kn, Wn, 26, L, 12, 1), e.c = Gm(Kn, [Dr, Wn], [52, 26], 12, [L, 3], 2), e.o = new Se(), e.p = new Se(), t = 0, e.d = 0, l = new M(e.g.c); l.a < l.c.c.length; ) {
-          for (s = f(O(l), 16), v = s.k, i = 0, R = 0, p = s.a.c.length, m = 0, x = new M(s.a); x.a < x.c.c.length; )
-            S = f(O(x), 9), L = S.k, e.f[L] = S.d.k, m += S.j.b + e.n, n = _l(Lr(S)), I = _l(En(S)), e.c[L][0] = I - n, e.c[L][1] = n, e.c[L][2] = I, i += n, R += I, n > 0 && Le(e.p, S), Le(e.o, S);
-          t -= i, j = p + t, m += t * e.e, $c(e.a, v, gt(j)), $c(e.b, v, m), e.j = Jr(e.j, j), e.k = je(e.k, m), e.d += t, t += R;
-        }
-      }
-      function we() {
-        we = c;
-        var e;
-        cr = new Av(ef, 0), rt = new Av("NORTH", 1), Be = new Av("EAST", 2), ct = new Av("SOUTH", 3), qe = new Av("WEST", 4), ip = (Qt(), new jl((e = f(Hi(Nr), 11), new ti(e, f(xi(e, e.length), 11), 0)))), Eh = Wo(Yt(rt, re(ie(Nr, 1), De, 32, 0, []))), kh = Wo(Yt(Be, re(ie(Nr, 1), De, 32, 0, []))), Sh = Wo(Yt(ct, re(ie(Nr, 1), De, 32, 0, []))), Ch = Wo(Yt(qe, re(ie(Nr, 1), De, 32, 0, []))), ts = Wo(Yt(rt, re(ie(Nr, 1), De, 32, 0, [ct]))), yu = Wo(Yt(Be, re(ie(Nr, 1), De, 32, 0, [qe]))), uf = Wo(Yt(rt, re(ie(Nr, 1), De, 32, 0, [qe]))), ll = Wo(Yt(rt, re(ie(Nr, 1), De, 32, 0, [Be]))), fl = Wo(Yt(ct, re(ie(Nr, 1), De, 32, 0, [qe]))), cl = Wo(Yt(Be, re(ie(Nr, 1), De, 32, 0, [ct]))), Ia = Wo(Yt(rt, re(ie(Nr, 1), De, 32, 0, [Be, qe]))), pa = Wo(Yt(Be, re(ie(Nr, 1), De, 32, 0, [ct, qe]))), Ma = Wo(Yt(rt, re(ie(Nr, 1), De, 32, 0, [ct, qe]))), Na = Wo(Yt(rt, re(ie(Nr, 1), De, 32, 0, [Be, ct]))), Fr = Wo(Yt(rt, re(ie(Nr, 1), De, 32, 0, [Be, ct, qe])));
-      }
-      function gee(e) {
-        var t, n, i, s, l, h, v, p, m, S, x, L, j, I, R, Y, q, V, U, te, ue, ye, Ce, be, Ne;
-        for (te = new Se(), L = new M(e.c); L.a < L.c.c.length; )
-          for (x = f(O(L), 16), R = new M(x.a); R.a < R.c.c.length; )
-            if (j = f(O(R), 9), j.g == (et(), Cn) && z(j, (le(), Tp)) != null) {
-              for (Y = null, V = null, q = null, Ce = new M(j.f); Ce.a < Ce.c.c.length; )
-                switch (ye = f(O(Ce), 7), ye.g.e) {
-                  case 4:
-                    Y = ye;
-                    break;
-                  case 2:
-                    V = ye;
-                    break;
-                  default:
-                    q = ye;
-                }
-              for (U = f(_e(q.e, 0), 12), p = new Nm(U.a), v = new qn(q.i), dn(v, j.i), m = Jt(p, 0), Xv(m, v), ue = Dy(U.a), S = new qn(q.i), dn(S, j.i), wr(ue, S, ue.c.b, ue.c), be = f(z(j, Tp), 9), Ne = f(_e(be.f, 0), 7), h = f(Vn(Y.b, ve(Ki, Yi, 12, 0, 0, 1)), 47), i = 0, l = h.length; i < l; ++i)
-                t = h[i], kn(t, Ne), jy(t.a, t.a.b, p);
-              for (h = f(Vn(V.e, ve(Ki, Yi, 12, V.e.c.length, 0, 1)), 47), n = 0, s = h.length; n < s; ++n)
-                t = h[n], Bn(t, Ne), jy(t.a, 0, ue);
-              Bn(U, null), kn(U, null), te.c[te.c.length] = j;
-            }
-        for (I = new M(te); I.a < I.c.c.length; )
-          j = f(O(I), 9), Ar(j, null);
-      }
-      function bee() {
-        function e() {
-          this.obj = this.createObject();
-        }
-        return e.prototype.createObject = function(t) {
-          return /* @__PURE__ */ Object.create(null);
-        }, e.prototype.get = function(t) {
-          return this.obj[t];
-        }, e.prototype.set = function(t, n) {
-          this.obj[t] = n;
-        }, e.prototype[A2] = function(t) {
-          delete this.obj[t];
-        }, e.prototype.keys = function() {
-          return Object.getOwnPropertyNames(this.obj);
-        }, e.prototype.entries = function() {
-          var t = this.keys(), n = this, i = 0;
-          return { next: function() {
-            if (i >= t.length)
-              return { done: !0 };
-            var s = t[i++];
-            return { value: [s, n.get(s)], done: !1 };
-          } };
-        }, lQ() || (e.prototype.createObject = function() {
-          return {};
-        }, e.prototype.get = function(t) {
-          return this.obj[":" + t];
-        }, e.prototype.set = function(t, n) {
-          this.obj[":" + t] = n;
-        }, e.prototype[A2] = function(t) {
-          delete this.obj[":" + t];
-        }, e.prototype.keys = function() {
-          var t = [];
-          for (var n in this.obj)
-            n.charCodeAt(0) == 58 && t.push(n.substring(1));
-          return t;
-        }), e;
-      }
-      function BR(e, t, n) {
-        var i, s, l, h, v, p, m, S, x, L, j, I, R, Y, q, V, U, te;
-        if (S = new t3(), ce(S, Kx, t), un(e.e, t, S), ce(S, (le(), wl), n), e.d && VO(e.d, S, !1), x0(t, S), j2 in t.a && (Y = S.a, q = f(Mn(t, j2), 69), R = f(Mn(q, "left"), 104), R && (Y.b = R.a), U = f(Mn(q, "top"), 104), U && (Y.d = U.a), V = f(Mn(q, "right"), 104), V && (Y.c = V.a), s = f(Mn(q, tx), 104), s && (Y.a = s.a)), x = (i = f(Hi(lL), 11), new ti(i, f(xi(i, i.length), 11), 0)), ce(S, qr, x), e.g == null && (e.g = jt(z(S, (C4(), rT)))), zd in t.a) {
-          if (te = Mn(t, zd), !te.hc())
-            throw new gs("The 'children' property of nodes must be an array.", te, t);
-          if (m = te.hc(), m.a.length > 0) {
-            for (n && ce(n, pl, S), v = ve(kr, Ni, 9, m.a.length, 0, 1), j = 0; j < m.a.length; ++j) {
-              if (p = Fu(m, j), !p.kc())
-                throw new gs("A 'children' array contains a non-object node element.", p, t);
-              l = AJ(e, p.kc(), S), v[j] = l;
-            }
-            for (L = 0; L < m.a.length; ++L)
-              I = Fu(m, L).kc(), h = v[L], zd in I.a && !Pt(ge(jt(z(h, (Ee(), Wg))))) && BR(e, I, h);
-          }
-        }
-        return S;
-      }
-      function pee(e, t) {
-        var n, i, s, l, h, v, p, m, S, x, L, j, I, R;
-        if (Nc(new M(Xu(e.e)))) {
-          for (v = new M(Xu(e.e)); v.a < v.c.c.length; )
-            switch (h = f(O(v), 161), m = f(h.e, 7).g.e, ++e.o[m], f(h.e, 7).g.e) {
-              case 4:
-              case 2:
-                e.n[m] += h.e.j.b + (t ? (i = f(h.e, 7).d, new qo(i.d, i.b, i.a, i.c)).a + (s = f(h.e, 7).d, new qo(s.d, s.b, s.a, s.c)).d : 0);
-                break;
-              case 1:
-              case 3:
-                e.n[m] += h.e.j.a + (t ? (l = f(h.e, 7).d, new qo(l.d, l.b, l.a, l.c)).b + (n = f(h.e, 7).d, new qo(n.d, n.b, n.a, n.c)).c : 0);
-            }
-          for (p = f(nr(e.e, (Ee(), J2)), 100), p = p == (Zu(), sf) ? Ls : p, e.g[1] = f(nr(e.e, tk), 100), e.g[3] = f(nr(e.e, nk), 100), e.g[4] = f(nr(e.e, rk), 100), e.g[2] = f(nr(e.e, ek), 100), x = (we(), re(ie(Nr, 1), De, 32, 0, [cr, rt, Be, ct, qe])), j = 0, R = x.length; j < R; ++j)
-            m = x[j], e.g[m.e] = e.g[m.e] == sf ? p : e.g[m.e];
-          for (e.b = nr(e.e, Yg) != null, S = re(ie(Nr, 1), De, 32, 0, [cr, rt, Be, ct, qe]), L = 0, I = S.length; L < I; ++L)
-            m = S[L], e.o[m.e] == 1 ? e.i[m.e] = 2 : !e.b && e.g[m.e] == Ls ? e.i[m.e] = e.o[m.e] + 1 : e.i[m.e] = e.o[m.e] - 1;
-        }
-      }
-      function wee(e, t, n, i, s, l) {
-        var h, v, p, m, S, x, L, j, I, R, Y, q, V, U, te, ue;
-        if (p = f(e.a, 16), R = f(e.b, 16), m = f(t.a, 18), Y = f(t.b, 18), p)
-          for (x = new M(p.a); x.a < x.c.c.length; )
-            for (S = f(O(x), 9), U = Jn(S, (we(), Be)).mb(); U.G(); )
-              for (V = f(U.H(), 7), m.ib(V), v = new M(V.e); v.a < v.c.c.length; )
-                h = f(O(v), 12), !Fc(h) && (n.c[n.c.length] = h, vM(h, i), q = h.c.f.g, (q == (et(), Hn) || q == er) && (s.c[s.c.length] = h), ue = h.d, te = ue.f.d, te == R ? Y.ib(ue) : te == p ? m.ib(ue) : Cr(n, h));
-        if (R)
-          for (x = new M(R.a); x.a < x.c.c.length; ) {
-            for (S = f(O(x), 9), I = new M(S.f); I.a < I.c.c.length; )
-              for (j = f(O(I), 7), v = new M(j.e); v.a < v.c.c.length; )
-                h = f(O(v), 12), Fc(h) && (L = l.a.db(h, l), L == null);
-            for (U = Jn(S, (we(), qe)).mb(); U.G(); )
-              for (V = f(U.H(), 7), Y.ib(V), v = new M(V.e); v.a < v.c.c.length; )
-                h = f(O(v), 12), !Fc(h) && (n.c[n.c.length] = h, vM(h, i), q = h.c.f.g, (q == (et(), Hn) || q == er) && (s.c[s.c.length] = h), ue = h.d, te = ue.f.d, te == R ? Y.ib(ue) : te == p ? m.ib(ue) : Cr(n, h));
-          }
-      }
-      function mee(e, t, n) {
-        var i, s, l, h, v, p, m, S, x, L, j, I, R, Y, q, V, U, te, ue, ye, Ce, be;
-        for (U = t.c.length, s = new Jc(e.b, n, null, null), be = ve(Zi, mi, 26, U, 12, 1), R = ve(Zi, mi, 26, U, 12, 1), I = ve(Zi, mi, 26, U, 12, 1), Y = 0, v = 0; v < U; v++)
-          R[v] = yr, I[v] = Ys;
-        for (p = 0; p < U; p++)
-          for (i = (Sn(p, t.c.length), f(t.c[p], 81)), be[p] = u2(i), be[Y] > be[p] && (Y = p), x = new M(e.b.c); x.a < x.c.c.length; )
-            for (S = f(O(x), 16), V = new M(S.a); V.a < V.c.c.length; )
-              q = f(O(V), 9), ye = ge(i.n[q.k]) + ge(i.d[q.k]), R[p] = R[p] < ye ? R[p] : ye, I[p] = je(I[p], ye + q.j.b);
-        for (Ce = ve(Zi, mi, 26, U, 12, 1), m = 0; m < U; m++)
-          (Sn(m, t.c.length), f(t.c[m], 81)).k == (oo(), ku) ? Ce[m] = R[Y] - R[m] : Ce[m] = I[Y] - I[m];
-        for (l = ve(Zi, mi, 26, U, 12, 1), j = new M(e.b.c); j.a < j.c.c.length; )
-          for (L = f(O(j), 16), ue = new M(L.a); ue.a < ue.c.c.length; ) {
-            for (te = f(O(ue), 9), h = 0; h < U; h++)
-              l[h] = ge((Sn(h, t.c.length), f(t.c[h], 81)).n[te.k]) + ge((Sn(h, t.c.length), f(t.c[h], 81)).d[te.k]) + Ce[h];
-            yq(l), s.n[te.k] = (l[1] + l[2]) / 2, s.d[te.k] = 0;
-          }
-        return s;
-      }
-      function w2(e, t, n, i, s, l) {
-        var h, v, p, m, S, x, L, j, I, R, Y, q, V, U, te, ue;
-        for (R = null, n == (_c(), Ks) ? R = e : n == hf && (R = t), q = (L = new Wt(R.a).a.bb().mb(), new Zt(L)); q.a.G(); ) {
-          for (Y = (S = f(q.a.H(), 21), f(S.yb(), 7)), V = ln(re(ie(_t, 1), Ht, 10, 0, [Y.f.i, Y.i, Y.a])).b, ue = new $r(), h = new $r(), p = Dt(ya((dr(), new Qn(ur(re(ie(Ze, 1), Me, 1, 4, [Y.b, Y.e])))))); xt(p); )
-            if (v = f(Et(p), 12), Pt(ge(jt(z(v, (le(), Xs))))) == i && Di(s, v, 0) != -1) {
-              if (v.d == Y ? U = v.c : U = v.d, te = ln(re(ie(_t, 1), Ht, 10, 0, [U.f.i, U.i, U.a])).b, (te - V <= 0 ? 0 - (te - V) : te - V) < 0.2)
-                continue;
-              te < V ? e.a.R(U) ? vn(ue, new pr(Ks, v)) : vn(ue, new pr(hf, v)) : e.a.R(U) ? vn(h, new pr(Ks, v)) : vn(h, new pr(hf, v));
-            }
-          if (ue.a.Y() > 1)
-            for (Le(l, new NC(Y, ue, n)), I = (x = new Wt(ue.a).a.bb().mb(), new Zt(x)); I.a.G(); )
-              j = (m = f(I.a.H(), 21), f(m.yb(), 27)), Cr(s, j.b);
-          if (h.a.Y() > 1)
-            for (Le(l, new NC(Y, h, n)), I = (x = new Wt(h.a).a.bb().mb(), new Zt(x)); I.a.G(); )
-              j = (m = f(I.a.H(), 21), f(m.yb(), 27)), Cr(s, j.b);
-        }
-      }
-      function yee(e) {
-        var t, n, i, s, l, h, v, p, m, S, x, L, j, I, R, Y, q, V, U, te, ue, ye, Ce;
-        for (s = 0, V = 0, q = (On(), new $t()), i = new $t(), l = new $t(), Ce = new $t(), uee(e, l, Ce), t = null, Y = 0, ye = 0, U = !0, p = !0, L = 0, I = e.length; L < I; ++L) {
-          for (S = e[L], ue = new M(S.f); ue.a < ue.c.c.length; )
-            switch (te = f(O(ue), 7), te.g.e) {
-              case 2:
-                s += OA(te, l);
-                break;
-              case 4:
-                s += OA(te, Ce);
-            }
-          if (R = S.g, p && (R == (et(), Hn) || R == er)) {
-            if (m = f(z(S, (le(), bl)), 9), !m) {
-              p = !1;
-              continue;
-            }
-            t != m && (t && un(q, t, new pr(gt(Y), gt(ye))), t = m, Y = 0, ye = 0, U = !0), S == t && (U = !1), U ? (Y += f(z(S, Xd), 24).a, un(i, S, gt(Y))) : (ye += f(z(S, Xd), 24).a, un(i, S, gt(ye)));
-          }
-        }
-        if (t && un(q, t, new pr(gt(Y), gt(ye))), p)
-          for (v = null, h = 0, n = 0, U = !0, x = 0, j = e.length; x < j; ++x)
-            switch (S = e[x], R = S.g, R.e) {
-              case 0:
-                h = f(ci(li(i.d, S)), 24).a, n = f(f(ci(li(q.d, S)), 27).b, 24).a, v = S, U = !1;
-                break;
-              case 3:
-                h = f(ci(li(i.d, S)), 24).a, m = f(z(S, (le(), bl)), 9), m != v && (n = f(f(ci(li(q.d, m)), 27).a, 24).a, v = m, U = !0);
-                break;
-              default:
-                V += U ? h : n - h;
-            }
-        return s + V;
-      }
-      function kee(e) {
-        var t, n, i, s, l, h, v, p, m, S, x, L, j, I, R, Y, q, V, U;
-        for (x = (On(), new $t()), m = new Rv(), i = new M(e.a.a.b); i.a < i.c.c.length; )
-          if (t = f(O(i), 25), xe(t, 93))
-            S = f(t, 93).b, ra(x.d, S, t);
-          else if (xe(t, 82))
-            for (l = (I = new Wt(f(t, 82).d.a).a.bb().mb(), new Zt(I)); l.a.G(); )
-              s = (h = f(l.a.H(), 21), f(h.yb(), 12)), pt(m, s, t);
-        for (n = new M(e.a.a.b); n.a < n.c.c.length; )
-          if (t = f(O(n), 25), xe(t, 93)) {
-            for (S = f(t, 93).b, p = Dt(En(S)); xt(p); )
-              if (v = f(Et(p), 12), !Fc(v) && (Y = v.c, U = v.d, !((we(), ts).kb(v.c.g) && ts.kb(v.d.g)))) {
-                if (q = f(Kt(x, v.d.f), 25), uh(Of(Rf(Bf(Af(new Pl(), 0), 100), e.c[t.f.d]), e.c[q.f.d])), Y.g == qe && J9((fa(), Y))) {
-                  for (j = f(Pa(m, v), 18).mb(); j.G(); )
-                    if (L = f(j.H(), 25), L.j.d < t.j.d) {
-                      if (R = e.c[L.f.d], V = e.c[t.f.d], R == V)
-                        continue;
-                      uh(Of(Rf(Bf(Af(new Pl(), 1), 100), R), V));
-                    }
-                }
-                if (U.g == Be && Q9((fa(), U))) {
-                  for (j = f(Pa(m, v), 18).mb(); j.G(); )
-                    if (L = f(j.H(), 25), L.j.d > t.j.d) {
-                      if (R = e.c[t.f.d], V = e.c[L.f.d], R == V)
-                        continue;
-                      uh(Of(Rf(Bf(Af(new Pl(), 1), 100), R), V));
-                    }
-                }
-              }
-          }
-      }
-      function zR(e, t) {
-        var n, i, s, l, h, v, p, m, S, x, L, j, I;
-        switch (h = new Ej(e), v = Gc(Eo(t, h)), Ya(v, new Vb()), s = e.b, s.c) {
-          case 2:
-            p = new Xh(s.a), n = vd(Eo(v, p)), qu(n) ? m = f(ql(n), 91).b : m = 15, p = new Xh(O3(s)), n = vd(Eo(v, p)), qu(n) ? l = f(ql(n), 91).b : l = 15, p = new Xh(s.b), n = vd(Eo(v, p)), qu(n) ? S = f(ql(n), 91).b : S = 15, i = EX(e, m, l, S), vn(t, new Nd(i, e.c, e.e, e.a.c.f, s.a)), vn(t, new Nd(i, e.c, e.e, e.a.c.f, O3(s))), vn(t, new Nd(i, e.c, e.e, e.a.c.f, s.b));
-            break;
-          case 1:
-            p = new Xh(s.a), n = vd(Eo(v, p)), qu(n) ? m = f(ql(n), 91).b : m = 15, p = new Xh(s.b), n = vd(Eo(v, p)), qu(n) ? S = f(ql(n), 91).b : S = 15, i = gX(e, m, S), vn(t, new Nd(i, e.c, e.e, e.a.c.f, s.a)), vn(t, new Nd(i, e.c, e.e, e.a.c.f, s.b));
-            break;
-          case 0:
-            p = new Xh(s.a), n = vd(Eo(v, p)), qu(n) ? m = f(ql(n), 91).b : m = 15, i = (x = e.b, L = SQ(e.a.c, e.a.d, m), na(e.a.a, Yy(L)), j = U3(e.a.b, L.a, x), I = new rg((!L.k && (L.k = new Jy(Sy(L))), L.k)), x4(I), j ? m4(I, j) : I), vn(t, new Nd(i, e.c, e.e, e.a.c.f, s.a));
-            break;
-          default:
-            throw new tn("The loopside must be defined.");
-        }
-        return i;
-      }
-      function Eee(e, t, n) {
-        var i, s, l, h, v, p, m, S, x, L, j, I, R, Y, q, V, U, te, ue;
-        for (v = new M(e.a.c); v.a < v.c.c.length; )
-          for (l = f(O(v), 16), U = new M(l.a); U.a < U.c.c.length; )
-            V = f(O(U), 9), t.f[V.k] = V, t.a[V.k] = V, t.d[V.k] = 0;
-        for (p = e.a.c, t.c == (Co(), Ps) && (p = xe(p, 87) ? wd(f(p, 87)) : xe(p, 88) ? f(p, 88).a : xe(p, 63) ? new Dv(p) : new od(p)), h = p.mb(); h.G(); )
-          for (l = f(h.H(), 16), j = -1, L = l.a, t.k == (oo(), Za) && (j = yr, L = xe(L, 87) ? wd(f(L, 87)) : xe(L, 88) ? f(L, 88).a : xe(L, 63) ? new Dv(L) : new od(L)), ue = L.mb(); ue.G(); )
-            if (te = f(ue.H(), 9), t.c == Ps ? x = f(_e(e.b.f, te.k), 20) : x = f(_e(e.b.b, te.k), 20), x.Y() > 0)
-              if (i = x.Y(), m = Xn(Math.floor((i + 1) / 2)) - 1, s = Xn(Math.ceil((i + 1) / 2)) - 1, t.k == Za)
-                for (S = s; S >= m; S--)
-                  t.a[te.k] == te && (R = f(x.sb(S), 27), I = f(R.a, 9), !Pc(n, R.b) && j > e.b.e[I.k] && (t.a[I.k] = te, t.f[te.k] = t.f[I.k], t.a[te.k] = t.f[te.k], j = e.b.e[I.k]));
-              else
-                for (S = m; S <= s; S++)
-                  t.a[te.k] == te && (q = f(x.sb(S), 27), Y = f(q.a, 9), !Pc(n, q.b) && j < e.b.e[Y.k] && (t.a[Y.k] = te, t.f[te.k] = t.f[Y.k], t.a[te.k] = t.f[te.k], j = e.b.e[Y.k]));
-      }
-      function wi() {
-        wi = c, Ds = new ps("N", 0, (we(), rt), rt, 0), lc = new ps("EN", 1, Be, rt, 1), Eu = new ps("E", 2, Be, Be, 0), Su = new ps("SE", 3, ct, Be, 1), is = new ps("S", 4, ct, ct, 0), dc = new ps("WS", 5, qe, ct, 1), hc = new ps("W", 6, qe, qe, 0), No = new ps("NW", 7, rt, qe, 1), rs = new ps("ENW", 8, Be, qe, 2), fc = new ps("ESW", 9, Be, qe, 2), Cu = new ps("SEN", 10, ct, rt, 2), gl = new ps("SWN", 11, ct, rt, 2), ff = new ps(ef, 12, cr, cr, 3), hH = kK(Ds, lc, Eu, Su, is, dc, re(ie(Wd, 1), De, 60, 0, [hc, No, rs, fc, Cu, gl])), vH = (Ea(), el(re(ie(Ze, 1), Me, 1, 4, [Ds, Eu, is, hc]))), dH = el(re(ie(Ze, 1), Me, 1, 4, [lc, Su, dc, No])), mH = new Bu(rt), bH = el(re(ie(Ze, 1), Me, 1, 4, [Be, rt])), gH = new Bu(Be), EH = el(re(ie(Ze, 1), Me, 1, 4, [ct, Be])), kH = new Bu(ct), LH = el(re(ie(Ze, 1), Me, 1, 4, [qe, ct])), TH = new Bu(qe), yH = el(re(ie(Ze, 1), Me, 1, 4, [rt, qe])), pH = el(re(ie(Ze, 1), Me, 1, 4, [Be, rt, qe])), wH = el(re(ie(Ze, 1), Me, 1, 4, [Be, ct, qe])), CH = el(re(ie(Ze, 1), Me, 1, 4, [ct, qe, rt])), SH = el(re(ie(Ze, 1), Me, 1, 4, [ct, Be, rt])), xH = (Kf(), Gd);
-      }
-      function HR(e, t) {
-        var n, i, s, l, h, v, p, m, S, x, L, j, I, R, Y, q, V, U, te;
-        if (V = 0, t.e.a == 0)
-          for (Y = new M(e); Y.a < Y.c.c.length; )
-            I = f(O(Y), 9), V = je(V, I.i.a + I.j.a + I.e.c);
-        else
-          V = t.e.a - t.d.a;
-        for (V -= t.d.a, R = new M(e); R.a < R.c.c.length; ) {
-          switch (I = f(O(R), 9), xv(I.i, V - I.j.a), EK(I), f(z(I, (Ee(), co)), 103).e) {
-            case 1:
-              ce(I, co, (Ko(), np));
-              break;
-            case 2:
-              ce(I, co, (Ko(), tp));
-          }
-          for (q = I.j, te = new M(I.f); te.a < te.c.c.length; ) {
-            for (U = f(O(te), 7), xv(U.i, q.a - U.j.a), xv(U.a, U.j.a), Bt(U, VI(U.g)), h = f(z(U, mu), 24), h && ce(U, mu, gt(-h.a)), l = new M(U.e); l.a < l.c.c.length; ) {
-              for (s = f(O(l), 12), i = Jt(s.a, 0); i.b != i.d.c; )
-                n = f(Ft(i), 10), n.a = V - n.a;
-              if (m = f(z(s, Un), 44), m)
-                for (p = Jt(m, 0); p.b != p.d.c; )
-                  v = f(Ft(p), 10), v.a = V - v.a;
-              for (L = new M(s.b); L.a < L.c.c.length; )
-                S = f(O(L), 33), xv(S.i, V - S.j.a);
-            }
-            for (j = new M(U.c); j.a < j.c.c.length; )
-              S = f(O(j), 33), xv(S.i, -S.j.a);
-          }
-          for (I.g == (et(), Cn) && (ce(I, (le(), _r), VI(f(z(I, _r), 32))), DZ(I)), x = new M(I.c); x.a < x.c.c.length; )
-            S = f(O(x), 33), xv(S.i, q.a - S.j.a);
-        }
-      }
-      function See(e, t) {
-        var n, i, s, l, h, v, p, m, S, x, L, j, I, R, Y, q, V, U, te;
-        if (V = 0, t.e.b == 0)
-          for (Y = new M(e); Y.a < Y.c.c.length; )
-            I = f(O(Y), 9), V = je(V, I.i.b + I.j.b + I.e.a);
-        else
-          V = t.e.b - t.d.b;
-        for (V -= t.d.b, R = new M(e); R.a < R.c.c.length; ) {
-          switch (I = f(O(R), 9), Tv(I.i, V - I.j.b), SK(I), f(z(I, (Ee(), co)), 103).e) {
-            case 3:
-              ce(I, co, (Ko(), J0));
-              break;
-            case 4:
-              ce(I, co, (Ko(), rp));
-          }
-          for (q = I.j, te = new M(I.f); te.a < te.c.c.length; ) {
-            for (U = f(O(te), 7), Tv(U.i, q.b - U.j.b), Tv(U.a, U.j.b), Bt(U, WI(U.g)), h = f(z(U, mu), 24), h && ce(U, mu, gt(-h.a)), l = new M(U.e); l.a < l.c.c.length; ) {
-              for (s = f(O(l), 12), i = Jt(s.a, 0); i.b != i.d.c; )
-                n = f(Ft(i), 10), n.b = V - n.b;
-              if (m = f(z(s, Un), 44), m)
-                for (p = Jt(m, 0); p.b != p.d.c; )
-                  v = f(Ft(p), 10), v.b = V - v.b;
-              for (L = new M(s.b); L.a < L.c.c.length; )
-                S = f(O(L), 33), Tv(S.i, V - S.j.b);
-            }
-            for (j = new M(U.c); j.a < j.c.c.length; )
-              S = f(O(j), 33), Tv(S.i, -S.j.b);
-          }
-          for (I.g == (et(), Cn) && (ce(I, (le(), _r), WI(f(z(I, _r), 32))), VU(I)), x = new M(I.c); x.a < x.c.c.length; )
-            S = f(O(x), 33), Tv(S.i, q.b - S.j.b);
-        }
-      }
-      function Cee(e, t, n) {
-        var i, s, l, h, v, p, m, S, x, L, j;
-        if (i = new $a(t.e.i.a, t.e.i.b, t.e.j.a, t.e.j.b), s = new lm(), e.c)
-          for (h = new M(bg(t)); h.a < h.c.c.length; )
-            l = f(O(h), 129), s.d = l.e.i.a + t.e.i.a, s.e = l.e.i.b + t.e.i.b, s.c = l.e.j.a, s.b = l.e.j.b, wg(i, s);
-        for (S = new M(Xu(t)); S.a < S.c.c.length; ) {
-          if (m = f(O(S), 161), x = m.e.i.a + t.e.i.a, L = m.e.i.b + t.e.i.b, e.e && (s.d = x, s.e = L, s.c = m.e.j.a, s.b = m.e.j.b, wg(i, s)), e.d)
-            for (h = new M(pg(m)); h.a < h.c.c.length; )
-              l = f(O(h), 129), s.d = l.e.i.a + x, s.e = l.e.i.b + L, s.c = l.e.j.a, s.b = l.e.j.b, wg(i, s);
-          if (e.b) {
-            if (j = new ot(-n, -n), He(nr(t, (Ee(), Ug))) === He((th(), Qg)))
-              for (h = new M(pg(m)); h.a < h.c.c.length; )
-                l = f(O(h), 129), j.a += l.e.j.a + n, j.b += l.e.j.b + n;
-            j.a = je(j.a, 0), j.b = je(j.b, 0), cR(i, QX(m), XX(m), t, m, j, n);
-          }
-        }
-        e.b && cR(i, (Qt(), Qt(), bc), bc, t, null, null, n), p = new WS((v = f(t.e, 9).e, new qo(v.d, v.b, v.a, v.c))), p.d = t.e.i.b - i.e, p.a = i.e + i.b - (t.e.i.b + t.e.j.b), p.b = t.e.i.a - i.d, p.c = i.d + i.c - (t.e.i.a + t.e.j.a), f(t.e, 9).e.b = p.b, f(t.e, 9).e.d = p.d, f(t.e, 9).e.c = p.c, f(t.e, 9).e.a = p.a;
-      }
-      function _R() {
-        _R = c, St = new Rv(), pt(St, (we(), ip), Fr), pt(St, Ch, Ma), pt(St, Ch, Fr), pt(St, kh, Na), pt(St, kh, Fr), pt(St, Eh, Ia), pt(St, Eh, Fr), pt(St, Sh, pa), pt(St, Sh, Fr), pt(St, ts, yu), pt(St, ts, Ia), pt(St, ts, pa), pt(St, ts, Fr), pt(St, yu, ts), pt(St, yu, Ma), pt(St, yu, Na), pt(St, yu, Fr), pt(St, uf, uf), pt(St, uf, Ia), pt(St, uf, Ma), pt(St, ll, ll), pt(St, ll, Ia), pt(St, ll, Na), pt(St, fl, fl), pt(St, fl, pa), pt(St, fl, Ma), pt(St, cl, cl), pt(St, cl, pa), pt(St, cl, Na), pt(St, Ia, Eh), pt(St, Ia, ts), pt(St, Ia, uf), pt(St, Ia, ll), pt(St, Ia, Ia), pt(St, Ia, Ma), pt(St, Ia, Na), pt(St, Ia, Fr), pt(St, pa, Sh), pt(St, pa, ts), pt(St, pa, fl), pt(St, pa, cl), pt(St, pa, pa), pt(St, pa, Ma), pt(St, pa, Na), pt(St, pa, Fr), pt(St, Ma, Ch), pt(St, Ma, yu), pt(St, Ma, uf), pt(St, Ma, fl), pt(St, Ma, Ia), pt(St, Ma, pa), pt(St, Ma, Ma), pt(St, Ma, Fr), pt(St, Na, kh), pt(St, Na, yu), pt(St, Na, ll), pt(St, Na, cl), pt(St, Na, Ia), pt(St, Na, pa), pt(St, Na, Na), pt(St, Na, Fr), pt(St, Fr, ip), pt(St, Fr, Ch), pt(St, Fr, kh), pt(St, Fr, Eh), pt(St, Fr, Sh), pt(St, Fr, ts), pt(St, Fr, yu), pt(St, Fr, Ia), pt(St, Fr, pa), pt(St, Fr, Ma), pt(St, Fr, Na), pt(St, Fr, Fr);
-      }
-      function GR(e, t, n) {
-        var i, s, l, h, v, p, m, S, x, L, j, I, R, Y, q;
-        if (n.n[t.k] == null) {
-          p = !0, n.n[t.k] = 0, h = t, q = n.k == (oo(), ku) ? Hr : ki;
-          do
-            s = e.b.e[h.k], l = h.d.a.c.length, v = h.g, n.k == ku && s > 0 || n.k == Za && s < l - 1 ? (n.k == Za ? m = f(_e(h.d.a, s + 1), 9) : m = f(_e(h.d.a, s - 1), 9), x = n.f[m.k], S = m.g, GR(e, x, n), q = e.e.Ic(q, t, h), n.i[t.k] == t && (n.i[t.k] = n.i[x.k]), n.i[t.k] == n.i[x.k] ? (Y = Om(e.d, v, S), n.k == Za ? (i = ge(n.n[t.k]), j = ge(n.n[x.k]) + ge(n.d[m.k]) - m.e.d - Y - h.e.a - h.j.b - ge(n.d[h.k]), p ? (p = !1, n.n[t.k] = j < q ? j : q) : n.n[t.k] = i < (j < q ? j : q) ? i : j < q ? j : q) : (i = ge(n.n[t.k]), j = ge(n.n[x.k]) + ge(n.d[m.k]) + m.j.b + m.e.a + Y + h.e.d - ge(n.d[h.k]), p ? (p = !1, n.n[t.k] = j > q ? j : q) : n.n[t.k] = i > (j > q ? j : q) ? i : j > q ? j : q)) : (Y = e.d.f, R = XI(e, n.i[t.k]), L = XI(e, n.i[x.k]), n.k == Za ? (I = ge(n.n[t.k]) + ge(n.d[h.k]) + h.j.b + h.e.a + Y - (ge(n.n[x.k]) + ge(n.d[m.k]) - m.e.d), NN(R, L, I)) : (I = ge(n.n[t.k]) + ge(n.d[h.k]) - h.e.d - ge(n.n[x.k]) - ge(n.d[m.k]) - m.j.b - m.e.a - Y, NN(R, L, I)))) : q = e.e.Ic(q, t, h), h = n.a[h.k];
-          while (h != t);
-          GY(e.e, t);
-        }
-      }
-      function xee(e, t, n, i) {
-        var s, l, h, v, p, m, S, x, L, j, I, R, Y, q, V;
-        if (L = !1, x = !1, ds(f(z(i, (Ee(), dt)), 28))) {
-          h = !1, v = !1;
-          e:
-            for (I = new M(i.f); I.a < I.c.c.length; )
-              for (j = f(O(I), 7), Y = Dt(ya((dr(), new Qn(ur(re(ie(Ze, 1), Me, 1, 4, [new Zh(j), new Lf(j)])))))); xt(Y); )
-                if (R = f(Et(Y), 7), !Pt(ge(jt(z(R.f, $d))))) {
-                  if (j.g == (we(), rt)) {
-                    h = !0;
-                    break e;
-                  }
-                  if (j.g == ct) {
-                    v = !0;
-                    break e;
-                  }
-                }
-          L = v && !h, x = h && !v;
-        }
-        if (!L && !x && i.c.c.length != 0) {
-          for (S = 0, m = new M(i.c); m.a < m.c.c.length; )
-            p = f(O(m), 33), S += p.i.b + p.j.b / 2;
-          S /= i.c.c.length, V = S >= i.j.b / 2;
-        } else
-          V = !x;
-        V ? (q = f(z(i, (le(), Jd)), 20), q ? L ? l = q : (s = f(z(i, Zd), 20), s ? q.Y() <= s.Y() ? l = q : l = s : (l = new Se(), ce(i, Zd, l))) : (l = new Se(), ce(i, Jd, l))) : (s = f(z(i, (le(), Zd)), 20), s ? x ? l = s : (q = f(z(i, Jd), 20), q ? s.Y() <= q.Y() ? l = s : l = q : (l = new Se(), ce(i, Jd, l))) : (l = new Se(), ce(i, Zd, l))), l.ib(e), ce(e, (le(), xp), n), t.d == n ? (kn(t, null), n.b.c.length + n.e.c.length == 0 && cn(n, null)) : (Bn(t, null), n.b.c.length + n.e.c.length == 0 && cn(n, null)), Bs(t.a);
-      }
-      function Tee(e, t) {
-        var n, i, s, l, h, v, p, m, S, x, L, j, I, R, Y, q, V, U;
-        for (n = new EO(t), n.a || bQ(t), m = FX(t), p = new Rv(), Y = new $A(), R = new M(t.b); R.a < R.c.c.length; )
-          for (I = f(O(R), 9), s = Dt(En(I)); xt(s); )
-            i = f(Et(s), 12), (i.c.f.g == (et(), Cn) || i.d.f.g == Cn) && (S = YJ(e, i, m, Y), pt(p, qy(S.d), S.a));
-        for (h = new Se(), U = f(z(n.c, (le(), bf)), 18).mb(); U.G(); ) {
-          switch (V = f(U.H(), 32), j = Y.c[V.e], L = Y.b[V.e], v = Y.a[V.e], l = null, q = null, V.e) {
-            case 4:
-              l = new $a(e.d.a, j, m.b.a - e.d.a, L - j), q = new $a(e.d.a, j, v, L - j), uu(m, new ot(l.d + l.c, l.e)), uu(m, new ot(l.d + l.c, l.e + l.b));
-              break;
-            case 2:
-              l = new $a(m.a.a, j, e.c.a - m.a.a, L - j), q = new $a(e.c.a - v, j, v, L - j), uu(m, new ot(l.d, l.e)), uu(m, new ot(l.d, l.e + l.b));
-              break;
-            case 1:
-              l = new $a(j, e.d.b, L - j, m.b.b - e.d.b), q = new $a(j, e.d.b, L - j, v), uu(m, new ot(l.d, l.e + l.b)), uu(m, new ot(l.d + l.c, l.e + l.b));
-              break;
-            case 3:
-              l = new $a(j, m.a.b, L - j, e.c.b - m.a.b), q = new $a(j, e.c.b - v, L - j, v), uu(m, new ot(l.d, l.e)), uu(m, new ot(l.d + l.c, l.e));
-          }
-          l && (x = new p7(), x.d = V, x.b = l, x.c = q, x.a = y4(f(Pa(p, qy(V)), 18)), h.c[h.c.length] = x);
-        }
-        return Tn(n.b, h), n.d = DU(DJ(m)), n;
-      }
-      function Lee() {
-        var e = ["\\u0000", "\\u0001", "\\u0002", "\\u0003", "\\u0004", "\\u0005", "\\u0006", "\\u0007", "\\b", "\\t", "\\n", "\\u000B", "\\f", "\\r", "\\u000E", "\\u000F", "\\u0010", "\\u0011", "\\u0012", "\\u0013", "\\u0014", "\\u0015", "\\u0016", "\\u0017", "\\u0018", "\\u0019", "\\u001A", "\\u001B", "\\u001C", "\\u001D", "\\u001E", "\\u001F"];
-        return e[34] = '\\"', e[92] = "\\\\", e[173] = "\\u00ad", e[1536] = "\\u0600", e[1537] = "\\u0601", e[1538] = "\\u0602", e[1539] = "\\u0603", e[1757] = "\\u06dd", e[1807] = "\\u070f", e[6068] = "\\u17b4", e[6069] = "\\u17b5", e[8203] = "\\u200b", e[8204] = "\\u200c", e[8205] = "\\u200d", e[8206] = "\\u200e", e[8207] = "\\u200f", e[8232] = "\\u2028", e[8233] = "\\u2029", e[8234] = "\\u202a", e[8235] = "\\u202b", e[8236] = "\\u202c", e[8237] = "\\u202d", e[8238] = "\\u202e", e[8288] = "\\u2060", e[8289] = "\\u2061", e[8290] = "\\u2062", e[8291] = "\\u2063", e[8292] = "\\u2064", e[8298] = "\\u206a", e[8299] = "\\u206b", e[8300] = "\\u206c", e[8301] = "\\u206d", e[8302] = "\\u206e", e[8303] = "\\u206f", e[65279] = "\\ufeff", e[65529] = "\\ufff9", e[65530] = "\\ufffa", e[65531] = "\\ufffb", e;
-      }
-      function Pee(e) {
-        var t, n, i, s, l, h, v, p, m, S, x, L, j, I, R, Y, q, V, U, te, ue, ye;
-        for (t = 0, q = !0, ye = null, i = 0; i < e.length; i++)
-          if (l = e[i], Y = l.g, Y == (et(), Hn))
-            ye = l, q = !1;
-          else if (Y == er) {
-            if (xe(z(l, (le(), lt)), 12) || (n = f(z(l, lt), 9), ye != n && (ye = n, q = !0), !gi(f(z(n, (Ee(), dt)), 28))))
-              continue;
-            for (L = null, I = null, U = new M(l.f); U.a < U.c.c.length; )
-              V = f(O(U), 7), V.b.c.length == 0 ? V.e.c.length == 0 || (I = f(z(V, lt), 7)) : L = f(z(V, lt), 7);
-            for (s = i + 1; s < e.length && (h = e[s], x = h.g, x != Hn); s++)
-              if (x == er) {
-                if (He(z(h, lt)) !== He(n))
-                  break;
-                for (v = null, m = null, ue = new M(h.f); ue.a < ue.c.c.length; )
-                  te = f(O(ue), 7), te.b.c.length == 0 ? te.e.c.length == 0 || (m = f(z(te, lt), 7)) : v = f(z(te, lt), 7);
-                q ? (j = !1, R = !1, I && v && I.k < v.k && (++t, R = !0), L && m && L.k > m.k && (++t, j = !0), I && m && I.k > m.k && (++t, R = !0), L && v && L.k < v.k && (++t, j = !0), j && R && L == I && --t) : (p = !1, S = !1, L && m && L.k < m.k && (++t, S = !0), I && v && I.k > v.k && (++t, p = !0), L && v && L.k < v.k && (++t, p = !0), I && m && I.k > m.k && (++t, S = !0), p && S && v == m && --t);
-              }
-          }
-        return t;
-      }
-      function Dee(e) {
-        var t, n, i, s, l, h, v, p, m, S, x, L, j, I, R, Y, q, V, U, te, ue, ye, Ce, be, Ne, Ue;
-        for (U = e.a, te = 0, ue = U.length; te < ue; ++te) {
-          for (V = U[te], m = yr, S = yr, I = new M(V.f); I.a < I.c.c.length; )
-            L = f(O(I), 9), h = L.d ? Di(L.d.a, L, 0) : -1, h > 0 ? (x = f(_e(L.d.a, h - 1), 9), be = Kv(e.b, L, x), Y = L.i.b - L.e.d - (x.i.b + x.j.b + x.e.a + be)) : Y = L.i.b - L.e.d, m = Y < m ? Y : m, h < L.d.a.c.length - 1 ? (x = f(_e(L.d.a, h + 1), 9), be = Kv(e.b, L, x), q = x.i.b - x.e.d - (L.i.b + L.j.b + L.e.a + be)) : q = 2 * L.i.b, S = q < S ? q : S;
-          for (p = yr, l = !1, s = f(_e(V.f, 0), 9), Ue = new M(s.f); Ue.a < Ue.c.c.length; )
-            for (Ne = f(O(Ue), 7), R = s.i.b + Ne.i.b + Ne.a.b, i = new M(Ne.b); i.a < i.c.c.length; )
-              n = f(O(i), 12), ye = n.c, t = ye.f.i.b + ye.i.b + ye.a.b - R, (t <= 0 ? 0 - t : t) < (p <= 0 ? 0 - p : p) && (t <= 0 ? 0 - t : t) < (t < 0 ? m : S) && (p = t, l = !0);
-          for (v = f(_e(V.f, V.f.c.length - 1), 9), Ce = new M(v.f); Ce.a < Ce.c.c.length; )
-            for (ye = f(O(Ce), 7), R = v.i.b + ye.i.b + ye.a.b, i = new M(ye.e); i.a < i.c.c.length; )
-              n = f(O(i), 12), Ne = n.d, t = Ne.f.i.b + Ne.i.b + Ne.a.b - R, (t <= 0 ? 0 - t : t) < (p <= 0 ? 0 - p : p) && (t <= 0 ? 0 - t : t) < (t < 0 ? m : S) && (p = t, l = !0);
-          if (l && p != 0)
-            for (j = new M(V.f); j.a < j.c.c.length; )
-              L = f(O(j), 9), L.i.b += p;
-        }
-      }
-      function jee(e, t) {
-        var n, i, s, l, h, v, p, m, S, x, L, j, I, R, Y, q, V, U, te, ue, ye, Ce, be, Ne, Ue;
-        return x = xQ(Or(e, (we(), ip)), t), I = Vc(Or(e, Eh), t), te = Vc(Or(e, Sh), t), be = k0(Or(e, Ch), t), L = k0(Or(e, kh), t), V = Vc(Or(e, uf), t), R = Vc(Or(e, ll), t), ye = Vc(Or(e, fl), t), ue = Vc(Or(e, cl), t), Ne = k0(Or(e, yu), t), q = Vc(Or(e, ts), t), U = Vc(Or(e, Ia), t), Ce = Vc(Or(e, pa), t), Ue = k0(Or(e, Ma), t), j = k0(Or(e, Na), t), Y = Vc(Or(e, Fr), t), n = eh(re(ie(Zi, 1), mi, 26, 12, [V.a, be.a, ye.a, Ue.a])), i = eh(re(ie(Zi, 1), mi, 26, 12, [I.a, x.a, te.a, Y.a])), s = q.a, l = eh(re(ie(Zi, 1), mi, 26, 12, [R.a, L.a, ue.a, j.a])), m = eh(re(ie(Zi, 1), mi, 26, 12, [V.b, I.b, R.b, U.b])), p = eh(re(ie(Zi, 1), mi, 26, 12, [be.b, x.b, L.b, Y.b])), S = Ne.b, v = eh(re(ie(Zi, 1), mi, 26, 12, [ye.b, te.b, ue.b, Ce.b])), ws(Or(e, ip), n + s, m + S), ws(Or(e, Fr), n + s, m + S), ws(Or(e, Eh), n + s, 0), ws(Or(e, Sh), n + s, m + S + p), ws(Or(e, Ch), 0, m + S), ws(Or(e, kh), n + s + i, m + S), ws(Or(e, ll), n + s + i, 0), ws(Or(e, fl), 0, m + S + p), ws(Or(e, cl), n + s + i, m + S + p), ws(Or(e, yu), 0, m), ws(Or(e, ts), n, 0), ws(Or(e, pa), 0, m + S + p), ws(Or(e, Na), n + s + i, 0), h = new Yr(), h.a = eh(re(ie(Zi, 1), mi, 26, 12, [n + i + s + l, Ne.a, U.a, Ce.a])), h.b = eh(re(ie(Zi, 1), mi, 26, 12, [m + p + S + v, q.b, Ue.b, j.b])), h;
-      }
-      function Nee(e, t) {
-        var n, i, s, l, h, v, p, m, S, x, L, j, I, R;
-        if (i = new Ci(), m = null, I = e.c, j = I.f.g, j != (et(), Hn) && j != er)
-          throw new tn("The target node of the edge must be a normal node or a northSouthPort.");
-        for (j == er && (L = f(z(I, (le(), lt)), 7), m = new ot(ln(re(ie(_t, 1), Ht, 10, 0, [L.f.i, L.i, L.a])).a, ln(re(ie(_t, 1), Ht, 10, 0, [I.f.i, I.i, I.a])).b), I = L), Jw(i, ln(re(ie(_t, 1), Ht, 10, 0, [I.f.i, I.i, I.a]))), h = je(5, eO(I.f, I.g)), x = new zc(Ld(I.g)), x.a *= h, x.b *= h, rn(i, dn(x, ln(re(ie(_t, 1), Ht, 10, 0, [I.f.i, I.i, I.a])))), m && wr(i, m, i.c.b, i.c), l = e, p = e, v = null, n = !1; l; )
-          s = l.a, s.b != 0 && (n ? (rn(i, Yo(dn(v, (ut(s.b != 0), f(s.a.a.c, 10))), 0.5)), n = !1) : n = !0, v = _a((ut(s.b != 0), f(s.c.b.c, 10))), na(i, s), Bs(s)), p = l, l = f(ci(li(t.d, l)), 12);
-        R = p.d, R.f.g == er && (L = f(z(R, (le(), lt)), 7), rn(i, new ot(ln(re(ie(_t, 1), Ht, 10, 0, [L.f.i, L.i, L.a])).a, ln(re(ie(_t, 1), Ht, 10, 0, [R.f.i, R.i, R.a])).b)), R = L), h = je(5, eO(R.f, R.g)), x = new zc(Ld(R.g)), Yo(x, h), rn(i, dn(x, ln(re(ie(_t, 1), Ht, 10, 0, [R.f.i, R.i, R.a])))), Jw(i, ln(re(ie(_t, 1), Ht, 10, 0, [R.f.i, R.i, R.a]))), S = new CC(i), na(e.a, Yy(S));
-      }
-      function Iee(e) {
-        var t, n, i, s, l, h, v, p, m, S, x, L, j, I;
-        if (He(z(e.c, (Ee(), dt))) === He((zn(), es)) || He(z(e.c, dt)) === He(ni)) {
-          for (S = new M(e.c.f); S.a < S.c.c.length; )
-            if (m = f(O(S), 7), m.g == (we(), rt) || m.g == ct)
-              return !1;
-        }
-        for (i = Dt(En(e.c)); xt(i); )
-          if (n = f(Et(i), 12), n.c.f == n.d.f)
-            return !1;
-        if (ds(f(z(e.c, dt), 28))) {
-          for (j = new Se(), p = Jn(e.c, (we(), qe)).mb(); p.G(); )
-            h = f(p.H(), 7), Le(j, ya((dr(), new Qn(ur(re(ie(Ze, 1), Me, 1, 4, [h.b, h.e]))))));
-          for (I = (vt(j), new Gf(j)), j = new Se(), v = Jn(e.c, Be).mb(); v.G(); )
-            h = f(v.H(), 7), Le(j, ya((dr(), new Qn(ur(re(ie(Ze, 1), Me, 1, 4, [h.b, h.e]))))));
-          t = (vt(j), new Gf(j));
-        } else
-          I = Lr(e.c), t = En(e.c);
-        return l = !eg(En(e.c)), s = !eg(Lr(e.c)), !l && !s ? !1 : l ? s ? dy((_n(), new _o(Go(vs(I.a, new T()))))) == 1 && (x = (vt(I), f(R3(new _o(Go(vs(I.a, new T())))), 12)).c.f, x.g == (et(), hn) && f(z(x, (le(), Mi)), 7).f != e.c) ? (e.e = 2, !0) : dy(new _o(Go(vs(t.a, new T())))) == 1 && (L = (vt(t), f(R3(new _o(Go(vs(t.a, new T())))), 12)).d.f, L.g == (et(), hn) && f(z(L, (le(), Si)), 7).f != e.c) ? (e.e = 3, !0) : !1 : (e.e = 0, !0) : (e.e = 1, !0);
-      }
-      function Mee(e, t, n) {
-        var i, s, l, h, v, p, m, S, x, L, j, I, R, Y, q;
-        if (i = new Se(), s = yr, l = yr, h = yr, n)
-          for (s = e.e.a, R = new M(t.f); R.a < R.c.c.length; )
-            for (I = f(O(R), 7), p = new M(I.e); p.a < p.c.c.length; )
-              v = f(O(p), 12), v.a.b != 0 && (S = f(Lm(v.a), 10), S.a < s && (l = s - S.a, h = yr, i.c = ve(Ze, Me, 1, 0, 4, 1), s = S.a), S.a <= s && (i.c[i.c.length] = v, v.a.b > 1 && (h = Xt(h, ei(f(Td(v.a, 1), 10).b - S.b)))));
-        else
-          for (R = new M(t.f); R.a < R.c.c.length; )
-            for (I = f(O(R), 7), p = new M(I.b); p.a < p.c.c.length; )
-              v = f(O(p), 12), v.a.b != 0 && (L = f(x1(v.a), 10), L.a > s && (l = L.a - s, h = yr, i.c = ve(Ze, Me, 1, 0, 4, 1), s = L.a), L.a >= s && (i.c[i.c.length] = v, v.a.b > 1 && (h = Xt(h, ei(f(Td(v.a, v.a.b - 2), 10).b - L.b)))));
-        if (i.c.length != 0 && l > t.j.a / 2 && h > t.j.b / 2) {
-          for (j = new Yn(), cn(j, t), Bt(j, (we(), rt)), j.i.a = t.j.a / 2, q = new Yn(), cn(q, t), Bt(q, ct), q.i.a = t.j.a / 2, q.i.b = t.j.b, p = new M(i); p.a < p.c.c.length; )
-            v = f(O(p), 12), n ? (m = f(JS(v.a), 10), Y = v.a.b == 0 ? Pi(v.d) : f(Lm(v.a), 10), Y.b >= m.b ? Bn(v, q) : Bn(v, j)) : (m = f(lq(v.a), 10), Y = v.a.b == 0 ? Pi(v.c) : f(x1(v.a), 10), Y.b >= m.b ? kn(v, q) : kn(v, j)), x = f(z(v, (Ee(), Un)), 44), x && hg(x, m, !0);
-          t.i.a = s - t.j.a / 2;
-        }
-      }
-      function Oee(e, t) {
-        var n, i, s, l, h, v, p, m, S, x, L, j, I, R, Y, q, V, U;
-        for (q = new Se(), V = new Se(), U = new Se(), l = new M(t); l.a < l.c.c.length; )
-          s = f(O(l), 75), s.k > 50 ? q.c[q.c.length] = s : s.k > 0 ? V.c[V.c.length] = s : U.c[U.c.length] = s;
-        if (V.c.length == 1 && q.c.length == 0 && (Tn(q, V), V.c = ve(Ze, Me, 1, 0, 4, 1)), q.c.length != 0 && Fo(mm(e.a), (wi(), Ds)) && Fo(mm(e.a), (wi(), is)) ? eK(e, q) : Tn(V, q), V.c.length == 0 || tK(e, V), U.c.length != 0) {
-          if (n = ym(e.a), n.c != 0)
-            for (S = new M(U), p = (vt(n), _S(new h9(n).a)); S.a < S.c.c.length; ) {
-              for (s = f(O(S), 75); S.a < S.c.c.length && s.a.a.Y() < 2; )
-                s = f(O(S), 75);
-              s.a.a.Y() > 1 && (R = f(J4(p), 60), Dd(s, R, !0), bd(S), bN(e.a, R));
-            }
-          for (L = U.c.length, i = hQ(e), j = new Se(), h = L / TS(e.a).c | 0, v = 0; v < h; v++)
-            Tn(j, TS(e.a));
-          switch (I = L % TS(e.a).c, I > 3 && (Tn(j, (wi(), wi(), dH)), I -= 4), I) {
-            case 3:
-              Le(j, Cg(i));
-            case 2:
-              Y = M0(Cg(i));
-              do
-                Y = M0(Y);
-              while (!Fo(mm(e.a), Y));
-              j.c[j.c.length] = Y, Y = dC(Cg(i));
-              do
-                Y = dC(Y);
-              while (!Fo(mm(e.a), Y));
-              j.c[j.c.length] = Y;
-              break;
-            case 1:
-              Le(j, Cg(i));
-          }
-          for (x = new M(j), m = new M(U); x.a < x.c.c.length && m.a < m.c.c.length; )
-            Dd(f(O(m), 75), f(O(x), 60), !0);
-        }
-      }
-      function Aee(e, t) {
-        var n, i, s, l, h, v, p, m, S, x, L, j, I, R, Y, q, V, U, te, ue, ye;
-        for (S = t.c.c.length, e.a = ve(kr, Dr, 51, S, 0, 2), e.b = ve(kr, Dr, 51, S, 0, 2), e.k = ve(kr, Dr, 51, S, 0, 2), p = ve(Kn, Wn, 26, S, 12, 1), h = ve(pb, Bg, 26, S, 13, 1), e.c = ve(pb, Bg, 26, S, 13, 1), e.d = ve(pb, Bg, 26, S, 13, 1), q = 0, ue = 0, L = new fn(t.c, 0); L.b < L.d.Y(); )
-          for (m = (ut(L.b < L.d.Y()), f(L.d.sb(L.c = L.b++), 16)), x = L.b - 1, j = m.a.c.length, e.a[x] = ve(kr, Ni, 9, j, 0, 1), e.k[x] = ve(kr, Ni, 9, j, 0, 1), e.b[x] = ve(kr, Ni, 9, j, 0, 1), p[x] = 0, h[x] = !1, V = new fn(m.a, 0); V.b < V.d.Y(); ) {
-            for (Y = (ut(V.b < V.d.Y()), f(V.d.sb(V.c = V.b++), 9)), e.b[x][V.b - 1] = Y, Y.k = q++, I = f(z(Y, (le(), bl)), 9), I && v2(e.g, I, Y, null), te = new M(Y.f); te.a < te.c.c.length; ) {
-              for (U = f(O(te), 7), U.k = ue++, l = new M(U.e); l.a < l.c.c.length; )
-                s = f(O(l), 12), s.d.f.d == m && ++p[x];
-              U.g == (we(), Be) ? U.e.c.length + U.b.c.length > 1 && (e.c[x] = !0) : U.g == qe && U.e.c.length + U.b.c.length > 1 && (e.d[x] = !0);
-            }
-            Y.g == (et(), er) && (++p[x], h[x] = !0);
-          }
-        for (n = !0, R = !0, v = 0; v < e.d.length - 1; v++)
-          i = e.c[v] || e.d[v + 1], n = n & i, R = R & !i;
-        e.j = ve(Op, F0, 26, ue, 12, 1), ye = ve(Kn, Wn, 26, ue, 12, 1), n || (e.i = new Dj(p, h, ye), e.f = e.i), R || (e.e = new jj(p, h, ye), e.f = e.e);
-      }
-      function $R(e, t, n) {
-        var i, s, l, h, v, p, m, S, x, L, j, I, R, Y, q, V, U, te, ue, ye, Ce, be;
-        for (e.d = new ot(ki, ki), e.c = new ot(Hr, Hr), L = t.mb(); L.G(); )
-          for (S = f(L.H(), 55), U = new M(S.b); U.a < U.c.c.length; )
-            V = f(O(U), 9), e.d.a = Xt(e.d.a, V.i.a - V.e.b), e.d.b = Xt(e.d.b, V.i.b - V.e.d), e.c.a = je(e.c.a, V.i.a + V.j.a + V.e.c), e.c.b = je(e.c.b, V.i.b + V.j.b + V.e.a);
-        for (v = new l7(), x = t.mb(); x.G(); )
-          S = f(x.H(), 55), i = Tee(e, S), Le(v.a, i), i.a = i.a | !f(z(i.c, (le(), bf)), 18).V();
-        for (e.b = (Py(), be = new ae(), be.f = new sM(n), be.b = IJ(be.f, v), be), PJ((I = e.b, new j1(), I)), e.e = new Yr(), e.a = e.b.f.e, h = new M(v.a); h.a < h.c.c.length; )
-          for (s = f(O(h), 347), te = Zq(e.b, s), dQ(s.c, te.a, te.b), Y = new M(s.c.b); Y.a < Y.c.c.length; )
-            R = f(O(Y), 9), R.g == (et(), Cn) && (q = tC(e, R.i, f(z(R, (le(), _r)), 32)), dn(Rs(R.i), q));
-        for (l = new M(v.a); l.a < l.c.c.length; )
-          for (s = f(O(l), 347), m = new M(KU(s)); m.a < m.c.c.length; )
-            for (p = f(O(m), 12), Ce = new Nm(p.a), T1(Ce, 0, Pi(p.c)), rn(Ce, Pi(p.d)), j = null, ye = Jt(Ce, 0); ye.b != ye.d.c; ) {
-              if (ue = f(Ft(ye), 10), !j) {
-                j = ue;
-                continue;
-              }
-              SI(j.a, ue.a) ? (e.e.a = Xt(e.e.a, j.a), e.a.a = je(e.a.a, j.a)) : SI(j.b, ue.b) && (e.e.b = Xt(e.e.b, j.b), e.a.b = je(e.a.b, j.b)), j = ue;
-            }
-        Tm(e.e), dn(e.a, e.e);
-      }
-      function YR(e, t, n, i, s) {
-        var l, h, v, p, m, S, x, L, j, I, R, Y, q, V, U, te, ue, ye, Ce, be, Ne, Ue, Xe;
-        for (R = new ji(t.b), te = new ji(t.b), L = new ji(t.b), be = new ji(t.b), Y = new ji(t.b), Ce = Jt(t, 0); Ce.b != Ce.d.c; )
-          for (ue = f(Ft(Ce), 7), v = new M(ue.e); v.a < v.c.c.length; )
-            if (l = f(O(v), 12), l.c.f == l.d.f) {
-              if (ue.g == l.d.g) {
-                be.c[be.c.length] = l;
-                continue;
-              } else if (ue.g == (we(), rt) && l.d.g == ct) {
-                Y.c[Y.c.length] = l;
-                continue;
-              }
-            }
-        for (p = new M(Y); p.a < p.c.c.length; )
-          l = f(O(p), 12), TQ(e, l, n, i, (we(), Be));
-        for (h = new M(be); h.a < h.c.c.length; )
-          l = f(O(h), 12), Ne = new qa(e), Ha(Ne, (et(), er)), ce(Ne, (Ee(), dt), (zn(), ni)), ce(Ne, (le(), lt), l), Ue = new Yn(), ce(Ue, lt, l.d), Bt(Ue, (we(), qe)), cn(Ue, Ne), Xe = new Yn(), ce(Xe, lt, l.c), Bt(Xe, Be), cn(Xe, Ne), ce(l.c, js, Ne), ce(l.d, js, Ne), Bn(l, null), kn(l, null), n.c[n.c.length] = Ne, ce(Ne, Xd, gt(2));
-        for (ye = Jt(t, 0); ye.b != ye.d.c; )
-          ue = f(Ft(ye), 7), m = ue.b.c.length > 0, q = ue.e.c.length > 0, m && q ? L.c[L.c.length] = ue : m ? R.c[R.c.length] = ue : q && (te.c[te.c.length] = ue);
-        for (I = new M(R); I.a < I.c.c.length; )
-          j = f(O(I), 7), Le(s, DC(e, j, null, n));
-        for (U = new M(te); U.a < U.c.c.length; )
-          V = f(O(U), 7), Le(s, DC(e, null, V, n));
-        for (x = new M(L); x.a < x.c.c.length; )
-          S = f(O(x), 7), Le(s, DC(e, S, S, n));
-      }
-      function FR(e, t) {
-        var n, i, s, l, h, v, p, m, S, x, L, j, I, R, Y, q, V, U, te, ue, ye, Ce;
-        for (te = new qn(t.d), p = new Se(), U = new M(t.b); U.a < U.c.c.length; )
-          if (q = f(O(U), 9), j = f(Kt(e.j, q), 69), j) {
-            for (O0(e, q, j, te), ye = new M(q.f); ye.a < ye.c.c.length; )
-              if (ue = f(O(ye), 7), I = f(Kt(e.n, ue), 69), I && (O0(e, ue, I, vk), qY(I, (Ee(), Kg), new Rc(ZF(ue.g)))), He(z(q, (Ee(), Ug))) !== He((th(), ak)))
-                for (Y = new M(ue.c); Y.a < Y.c.c.length; )
-                  R = f(O(Y), 33), L = f(Kt(e.f, R), 69), O0(e, R, L, vk);
-            if (f(z(q, (Ee(), ia)), 86).Y() != 0)
-              for (Y = new M(q.c); Y.a < Y.c.c.length; )
-                R = f(O(Y), 33), L = f(Kt(e.f, R), 69), O0(e, R, L, vk);
-            for (v = Dt(En(q)); xt(v); )
-              l = f(Et(v), 12), rh(l.d.f, q) || (p.c[p.c.length] = l);
-          }
-        if (Ce = f(z(t, (le(), wl)), 9), Ce)
-          for (v = Dt(En(Ce)); xt(v); )
-            l = f(Et(v), 12), rh(l.d.f, Ce) && (p.c[p.c.length] = l);
-        for (h = new M(p); h.a < h.c.c.length; )
-          for (l = f(O(h), 12), x = f(Kt(e.b, l), 69), nee(e, l, x, te), Y = new M(l.b); Y.a < Y.c.c.length; )
-            R = f(O(Y), 33), L = f(Kt(e.f, R), 69), O0(e, R, L, te);
-        for (n = (i = f(z(t, os), 15).a, new ot(t.e.a + t.a.b + t.a.c + 2 * i, t.e.b + t.a.d + t.a.a + 2 * i)), S = f(z(t, wl), 9), S && (S.j.a = n.a, S.j.b = n.b), m = f(z(t, Kx), 69), Fa(e, m, P2, n.a), Fa(e, m, D2, n.b), V = new M(t.b); V.a < V.c.c.length; )
-          q = f(O(V), 9), s = f(z(q, pl), 55), s && FR(e, s);
-      }
-      function Ree(e, t) {
-        var n, i, s, l, h, v, p, m, S, x, L, j, I, R, Y, q, V, U, te, ue, ye, Ce, be, Ne, Ue, Xe, it, st;
-        for (Xe = new Wr(), be = new Wr(), q = -1, p = new M(e); p.a < p.c.c.length; ) {
-          for (h = f(O(p), 77), h.i = q--, x = 0, ue = 0, l = new M(h.j); l.a < l.c.c.length; )
-            i = f(O(l), 117), ue += i.c;
-          for (s = new M(h.d); s.a < s.c.c.length; )
-            i = f(O(s), 117), x += i.c;
-          h.e = x, h.k = ue, ue == 0 ? wr(be, h, be.c.b, be.c) : x == 0 && wr(Xe, h, Xe.c.b, Xe.c);
-        }
-        for (st = new $m(($o(), e)), L = e.c.length, Y = L + 1, V = L - 1, I = new Se(); st.a.Y() != 0; ) {
-          for (; be.b != 0; )
-            Ce = (ut(be.b != 0), f(zs(be, be.a.a), 77)), st.a.eb(Ce) != null, Ce.i = V--, hC(Ce, Xe, be);
-          for (; Xe.b != 0; )
-            Ne = (ut(Xe.b != 0), f(zs(Xe, Xe.a.a), 77)), st.a.eb(Ne) != null, Ne.i = Y++, hC(Ne, Xe, be);
-          for (R = Ys, m = (U = new Wt(st.a).a.bb().mb(), new Zt(U)); m.a.G(); )
-            h = (S = f(m.a.H(), 21), f(S.yb(), 77)), te = h.k - h.e, te >= R && (te > R && (I.c = ve(Ze, Me, 1, 0, 4, 1), R = te), I.c[I.c.length] = h);
-          I.c.length != 0 && (j = f(_e(I, A3(t, I.c.length)), 77), st.a.eb(j) != null, j.i = Y++, hC(j, Xe, be), I.c = ve(Ze, Me, 1, 0, 4, 1));
-        }
-        for (ye = e.c.length + 1, v = new M(e); v.a < v.c.c.length; )
-          h = f(O(v), 77), h.i < L && (h.i += ye);
-        for (Ue = new M(e); Ue.a < Ue.c.c.length; )
-          for (Ne = f(O(Ue), 77), n = new fn(Ne.j, 0); n.b < n.d.Y(); )
-            i = (ut(n.b < n.d.Y()), f(n.d.sb(n.c = n.b++), 117)), it = i.b, Ne.i > it.i && (So(n), Cr(it.d, i), i.c > 0 && (i.a = it, Le(it.j, i), i.b = Ne, Le(Ne.d, i)));
-      }
-      function Bee(e) {
-        var t, n, i;
-        for (i = new G1(new Jb(e.c).a); S1(i.a); )
-          switch (n = (i.b = Yc(i.a), new b1(i.c, i.b)), t = f(n.b.b[n.a.e], 62), f(n.a, 67).e) {
-            case 0:
-              t.d = 0, t.e = -(t.b + e.d);
-              break;
-            case 1:
-              t.d = (e.e.e.j.a - t.c) / 2, t.e = -(t.b + e.d);
-              break;
-            case 2:
-              t.d = e.e.e.j.a - t.c, t.e = -(t.b + e.d);
-              break;
-            case 3:
-              t.d = 0, t.e = e.e.e.j.b + e.d;
-              break;
-            case 4:
-              t.d = (e.e.e.j.a - t.c) / 2, t.e = e.e.e.j.b + e.d;
-              break;
-            case 5:
-              t.d = e.e.e.j.a - t.c, t.e = e.e.e.j.b + e.d;
-              break;
-            case 6:
-              t.d = -(t.c + e.d), t.e = 0;
-              break;
-            case 7:
-              t.d = -(t.c + e.d), t.e = (e.e.e.j.b - t.b) / 2;
-              break;
-            case 8:
-              t.d = -(t.c + e.d), t.e = e.e.e.j.b - t.b;
-              break;
-            case 9:
-              t.d = e.e.e.j.a + e.d, t.e = 0;
-              break;
-            case 10:
-              t.d = e.e.e.j.a + e.d, t.e = (e.e.e.j.b - t.b) / 2;
-              break;
-            case 11:
-              t.d = e.e.e.j.a + e.d, t.e = e.e.e.j.b - t.b;
-              break;
-            case 12:
-              t.d = e.q.b + e.d, t.e = e.q.d + e.d;
-              break;
-            case 13:
-              t.d = (e.e.e.j.a - t.c) / 2, t.e = e.q.d + e.d;
-              break;
-            case 14:
-              t.d = e.e.e.j.a - e.q.c - t.c - e.d, t.e = e.q.d + e.d;
-              break;
-            case 15:
-              t.d = e.q.b + e.d, t.e = (e.e.e.j.b - t.b) / 2;
-              break;
-            case 16:
-              t.d = (e.e.e.j.a - t.c) / 2, t.e = (e.e.e.j.b - t.b) / 2;
-              break;
-            case 17:
-              t.d = e.e.e.j.a - e.q.c - t.c - e.d, t.e = (e.e.e.j.b - t.b) / 2;
-              break;
-            case 18:
-              t.d = e.q.b + e.d, t.e = e.e.e.j.b - e.q.a - t.b - e.d;
-              break;
-            case 19:
-              t.d = (e.e.e.j.a - t.c) / 2, t.e = e.e.e.j.b - e.q.a - t.b - e.d;
-              break;
-            case 20:
-              t.d = e.e.e.j.a - e.q.c - t.c - e.d, t.e = e.e.e.j.b - e.q.a - t.b - e.d;
-          }
-      }
-      function zee(e, t) {
-        var n, i, s, l, h, v, p, m, S, x, L, j, I, R, Y, q, V, U, te, ue, ye, Ce, be, Ne, Ue, Xe, it, st, Tt;
-        for (Xe = new Wr(), be = new Wr(), I = -1, V = new M(e); V.a < V.c.c.length; ) {
-          for (Y = f(O(V), 80), Y.d = I--, p = 0, ue = 0, l = new M(Y.e); l.a < l.c.c.length; )
-            i = f(O(l), 118), ue += i.c;
-          for (s = new M(Y.b); s.a < s.c.c.length; )
-            i = f(O(s), 118), p += i.c;
-          Y.c = p, Y.f = ue, ue == 0 ? wr(be, Y, be.c.b, be.c) : p == 0 && wr(Xe, Y, Xe.c.b, Xe.c);
-        }
-        for (st = (Tt = new tS(), h3(Tt, e), Tt), m = e.c.length, R = m - 1, j = m + 1, x = new Se(); st.a.c != 0; ) {
-          for (; be.b != 0; )
-            Ce = (ut(be.b != 0), f(zs(be, be.a.a), 80)), Qv(st.a, Ce) != null, Ce.d = R--, fC(Ce, Xe, be);
-          for (; Xe.b != 0; )
-            Ne = (ut(Xe.b != 0), f(zs(Xe, Xe.a.a), 80)), Qv(st.a, Ne) != null, Ne.d = j++, fC(Ne, Xe, be);
-          for (L = Ys, U = (v = new Uv(new Vv(new Xb(st.a).a).b), new Qb(v)); om(U.a.a); )
-            Y = (h = jm(U.a), f(h.yb(), 80)), te = Y.f - Y.c, te >= L && (te > L && (x.c = ve(Ze, Me, 1, 0, 4, 1), L = te), x.c[x.c.length] = Y);
-          x.c.length != 0 && (S = f(_e(x, A3(t, x.c.length)), 80), Qv(st.a, S) != null, S.d = j++, fC(S, Xe, be), x.c = ve(Ze, Me, 1, 0, 4, 1));
-        }
-        for (ye = e.c.length + 1, q = new M(e); q.a < q.c.c.length; )
-          Y = f(O(q), 80), Y.d < m && (Y.d += ye);
-        for (Ue = new M(e); Ue.a < Ue.c.c.length; )
-          for (Ne = f(O(Ue), 80), n = new fn(Ne.e, 0); n.b < n.d.Y(); )
-            i = (ut(n.b < n.d.Y()), f(n.d.sb(n.c = n.b++), 118)), it = i.b, Ne.d > it.d && (So(n), Cr(it.b, i), i.c > 0 && (i.a = it, Le(it.e, i), i.b = Ne, Le(Ne.b, i)));
-      }
-      function Hee(e) {
-        switch (e.e) {
-          case 14:
-            return new ft();
-          case 37:
-            return new gn();
-          case 8:
-            return new z7();
-          case 30:
-            return new H7();
-          case 38:
-            return new ht();
-          case 3:
-            return new Rt();
-          case 47:
-          case 1:
-            return new Mw((d0(), lT));
-          case 4:
-            return new Lt();
-          case 49:
-            return new yt();
-          case 23:
-            return new Sw();
-          case 13:
-            return new Mt();
-          case 34:
-            return new Pn();
-          case 40:
-            return new Vt();
-          case 35:
-            return new ne();
-          case 44:
-            return new y9();
-          case 28:
-            return new Ie();
-          case 39:
-            return new Je();
-          case 27:
-            return new Ye();
-          case 6:
-            return new Fe();
-          case 31:
-            return new tr();
-          case 9:
-            return new sP();
-          case 43:
-            return new Dn();
-          case 17:
-            return new rr();
-          case 18:
-            return new ui();
-          case 29:
-            return new uP();
-          case 11:
-            return new Mu();
-          case 12:
-            return new cs();
-          case 36:
-            return new ls();
-          case 46:
-          case 0:
-            return new Mw((d0(), cT));
-          case 41:
-            return new Bo();
-          case 15:
-            return new za();
-          case 33:
-            return new ru();
-          case 42:
-            return new xc();
-          case 22:
-            return new Ll();
-          case 19:
-            return new Gt();
-          case 10:
-            return new oa();
-          case 7:
-            return new Tc();
-          case 24:
-            return new eo();
-          case 21:
-            return new ma();
-          case 16:
-            return new Wh();
-          case 45:
-            return new Os();
-          case 26:
-            return new qb();
-          case 20:
-            return new bw();
-          case 25:
-            return new pw();
-          case 5:
-            return new yv();
-          case 32:
-            return new Uh();
-          case 48:
-          case 2:
-            return new Mw((d0(), uT));
-          default:
-            throw new tn("No implementation is available for the layout processor " + (e.d != null ? e.d : "" + e.e));
-        }
-      }
-      function _ee(e) {
-        var t, n, i, s, l, h, v;
-        if (n = e.e.e.j, e.b ? t = f(nr(e.e, (Ee(), Yg)), 65) : t = new qo(e.k, e.k, e.k, e.k), s = n.a, (e.b || e.g[1] != (Zu(), Ls)) && (s -= t.b + t.c), l = n.a, (e.b || e.g[3] != (Zu(), Ls)) && (l -= t.b + t.c), h = n.b, (e.b || e.g[4] != (Zu(), Ls)) && (h -= t.d + t.a), i = n.b, (e.b || e.g[2] != (Zu(), Ls)) && (i -= t.d + t.a), Nf(e, (we(), rt)) == (Zu(), Ls))
-          e.j[1] = (s - If(e, rt)) / Yw(e, rt), e.f = e.b ? t.b + (Mf(e, rt) == 1 ? e.j[1] : 0) : e.j[1];
-        else
-          switch (e.j[1] = e.k, v = If(e, rt) + e.j[1] * (Mf(e, rt) - 1), Nf(e, rt).e) {
-            case 2:
-              e.f = t.b;
-              break;
-            case 3:
-              e.f = t.b + (s - v) / 2;
-              break;
-            case 4:
-              e.f = n.a - v - t.c;
-          }
-        if (Nf(e, ct) == Ls)
-          e.j[3] = (l - If(e, ct)) / Yw(e, ct), e.r = n.a - (e.b ? t.c + (Mf(e, ct) == 1 ? e.j[3] : 0) : e.j[3]);
-        else
-          switch (e.j[3] = e.k, v = If(e, ct) + e.j[3] * (Mf(e, ct) - 1), Nf(e, ct).e) {
-            case 2:
-              e.r = v + t.b;
-              break;
-            case 3:
-              e.r = n.a - (l - v) / 2 - t.c;
-              break;
-            case 4:
-              e.r = n.a - t.c;
-          }
-        if (Nf(e, qe) == Ls)
-          e.j[4] = (h - If(e, qe)) / Yw(e, qe), e.s = n.b - (e.b ? t.a + (Mf(e, qe) == 1 ? e.j[4] : 0) : e.j[4]);
-        else
-          switch (e.j[4] = e.k, v = If(e, qe) + e.j[4] * (Mf(e, qe) - 1), Nf(e, qe).e) {
-            case 2:
-              e.s = v + t.d;
-              break;
-            case 3:
-              e.s = n.b - (h - v) / 2 - t.a;
-              break;
-            case 4:
-              e.s = n.b - t.a;
-          }
-        if (Nf(e, Be) == Ls)
-          e.j[2] = (i - If(e, Be)) / Yw(e, Be), e.a = e.b ? t.d + (Mf(e, Be) == 1 ? e.j[2] : 0) : e.j[2];
-        else
-          switch (e.j[2] = e.k, v = If(e, Be) + e.j[2] * (Mf(e, Be) - 1), Nf(e, Be).e) {
-            case 2:
-              e.a = t.d;
-              break;
-            case 3:
-              e.a = t.d + (i - v) / 2;
-              break;
-            case 4:
-              e.a = n.b - v - t.a;
-          }
-      }
-      function qR(e, t, n) {
-        var i, s, l, h, v, p, m, S, x, L, j, I, R, Y, q, V, U, te, ue, ye, Ce, be, Ne, Ue, Xe, it, st, Tt;
-        for (it = 0, h = 0, x = t[0].d, be = n[0].d, I = 0, Y = n.length; I < Y; ++I)
-          if (L = n[I], gi(f(z(L, (Ee(), dt)), 28))) {
-            for (V = 0, ue = new M(L.f); ue.a < ue.c.c.length && (te = f(O(ue), 7), te.g == (we(), rt)); )
-              for (l = new M(te.b); l.a < l.c.c.length; )
-                if (s = f(O(l), 12), s.c.f.d == x) {
-                  ++V;
-                  break;
-                }
-            for (U = 0, Ce = new fn(L.f, L.f.c.length); Ce.b > 0; ) {
-              for (te = (ut(Ce.b > 0), f(Ce.a.sb(Ce.c = --Ce.b), 7)), ye = 0, l = new M(te.b); l.a < l.c.c.length; )
-                s = f(O(l), 12), s.c.f.d == x && ++ye;
-              ye > 0 && (te.g == (we(), rt) ? (e.a[te.k] = it, ++it) : (e.a[te.k] = it + V + U, ++U), h += ye);
-            }
-            it += U;
-          } else {
-            for (q = 0, ue = new M(L.f); ue.a < ue.c.c.length; ) {
-              for (te = f(O(ue), 7), l = new M(te.b); l.a < l.c.c.length; )
-                s = f(O(l), 12), s.c.f.d == x && ++q;
-              e.a[te.k] = it;
-            }
-            q > 0 && (++it, h += q);
-          }
-        for (Ne = ve(Kn, Wn, 26, h, 12, 1), p = 0, j = 0, R = t.length; j < R; ++j)
-          if (L = t[j], gi(f(z(L, (Ee(), dt)), 28)))
-            for (ue = new M(L.f); ue.a < ue.c.c.length; )
-              for (te = f(O(ue), 7), Ue = p, l = new M(te.e); l.a < l.c.c.length; )
-                s = f(O(l), 12), Xe = s.d, Xe.f.d == be && lM(Ne, Ue, p++, e.a[Xe.k]);
-          else
-            for (Ue = p, ue = new M(L.f); ue.a < ue.c.c.length; )
-              for (te = f(O(ue), 7), l = new M(te.e); l.a < l.c.c.length; )
-                s = f(O(l), 12), Xe = s.d, Xe.f.d == be && lM(Ne, Ue, p++, e.a[Xe.k]);
-        for (v = 1; v < it; )
-          v *= 2;
-        for (Tt = 2 * v - 1, v -= 1, st = ve(Kn, Wn, 26, Tt, 12, 1), i = 0, S = 0; S < h; S++)
-          for (m = Ne[S] + v, ++st[m]; m > 0; )
-            m % 2 > 0 && (i += st[m + 1]), m = (m - 1) / 2 | 0, ++st[m];
-        return i;
-      }
-      function VR(e, t) {
-        var n, i, s, l, h, v, p, m, S, x, L, j, I, R, Y, q, V, U, te, ue, ye, Ce, be, Ne, Ue, Xe, it, st, Tt, xn;
-        for (Nt(t, "Compound graph postprocessor", 1), n = Pt(ge(jt(z(e, (zt(), dE))))), v = f(z(e, (le(), kL)), 144), x = new $r(), ye = v.W().mb(); ye.G(); ) {
-          for (ue = f(ye.H(), 12), h = new _u(v.U(ue)), Ya(h, new L5(e)), Xe = rU((Sn(0, h.c.length), f(h.c[0], 114))), st = qI(f(_e(h, h.c.length - 1), 114)), Bs(ue.a), Ne = Xe.f, rh(st.f, Ne) ? be = f(z(Ne, pl), 55) : be = Ti(Ne), I = f(z(ue, (Ee(), Un)), 44), Mj(h, lz) ? I ? Bs(I) : (I = new Ci(), ce(ue, Un, I)) : I && ce(ue, Un, null), Y = null, l = new M(h); l.a < l.c.c.length; ) {
-            for (s = f(O(l), 114), te = new Yr(), oC(te, s.a, be), q = s.b, i = new Ci(), jy(i, 0, q.a), Vu(i, te), Ue = new qn(Pi(q.c)), it = new qn(Pi(q.d)), Ue.a += te.a, Ue.b += te.b, it.a += te.a, it.b += te.b, Y && (i.b == 0 ? U = it : U = (ut(i.b != 0), f(i.a.a.c, 10)), Tt = ei(Y.a - U.a) > pu, xn = ei(Y.b - U.b) > pu, (!n && Tt && xn || n && (Tt || xn)) && rn(ue.a, Ue)), na(ue.a, i), i.b == 0 ? Y = Ue : Y = (ut(i.b != 0), f(i.c.b.c, 10)), V = f(z(q, Un), 44), V && (j = new Ci(), jy(j, 0, V), Vu(j, te), na(I, j)), qI(s) == st && (Ti(st.f) != s.a && (te = new Yr(), oC(te, Ti(st.f), be)), ce(ue, fE, te)), R = new fn(q.b, 0); R.b < R.d.Y(); )
-              p = (ut(R.b < R.d.Y()), f(R.d.sb(R.c = R.b++), 33)), He(z(p, LL)) === He(ue) && (oC(p.i, Ti(q.c.f), be), So(R), Le(ue.b, p));
-            x.a.db(q, x);
-          }
-          Bn(ue, Xe), kn(ue, st);
-        }
-        for (S = (Ce = new Wt(x.a).a.bb().mb(), new Zt(Ce)); S.a.G(); )
-          m = (L = f(S.a.H(), 21), f(L.yb(), 12)), Bn(m, null), kn(m, null);
-        Ct(t);
-      }
-      function Gee(e) {
-        var t, n, i, s, l, h, v, p, m, S, x, L, j, I, R, Y, q, V, U, te, ue, ye, Ce, be, Ne, Ue, Xe, it, st, Tt;
-        if (Ne = f(z(e, (Ee(), dt)), 28), Ne != (zn(), jo) && Ne != ac) {
-          for (R = e.c, I = R.c.length, x = new ji((fi(I + 2, KC), Jf(Tr(Tr(5, I + 2), (I + 2) / 10 | 0)))), Y = new ji((fi(I + 2, KC), Jf(Tr(Tr(5, I + 2), (I + 2) / 10 | 0)))), Le(x, new $t()), Le(x, new $t()), Le(Y, new Se()), Le(Y, new Se()), Ce = new $r(), t = 0; t < I; t++)
-            for (n = (Sn(t, R.c.length), f(R.c[t], 16)), Ue = (Sn(t, x.c.length), f(x.c[t], 57)), q = (On(), new $t()), x.c[x.c.length] = q, it = (Sn(t, Y.c.length), f(Y.c[t], 20)), U = new Se(), Y.c[Y.c.length] = U, s = new M(n.a); s.a < s.c.c.length; ) {
-              for (i = f(O(s), 9), m = Dt(Lr(i)); xt(m); )
-                v = f(Et(m), 12), st = v.c.f, RM(st) && (Ce.a.db(st, Ce), Xe = f(Ue.cb(z(st, (le(), lt))), 9), Xe || (Xe = XO(e, st), Ue.db(z(st, lt), Xe), it.ib(Xe)), Bn(v, f(_e(Xe.f, 1), 7)));
-              for (p = Dt(En(i)); xt(p); )
-                v = f(Et(p), 12), Tt = v.d.f, RM(Tt) && (Ce.a.db(Tt, Ce), V = f(Kt(q, z(Tt, (le(), lt))), 9), V || (V = XO(e, Tt), un(q, z(Tt, lt), V), U.c[U.c.length] = V), kn(v, f(_e(V.f, 0), 7)));
-            }
-          for (L = 0; L < Y.c.length; L++)
-            if (te = (Sn(L, Y.c.length), f(Y.c[L], 20)), !te.V())
-              for (L == 0 ? (j = new Hc(e), qc(0, R.c.length), _v(R.c, 0, j)) : L == x.c.length - 1 ? (j = new Hc(e), R.c[R.c.length] = j) : j = (Sn(L - 1, R.c.length), f(R.c[L - 1], 16)), h = te.mb(); h.G(); )
-                l = f(h.H(), 9), Ar(l, j);
-          for (ye = (be = new Wt(Ce.a).a.bb().mb(), new Zt(be)); ye.a.G(); )
-            ue = (S = f(ye.a.H(), 21), f(S.yb(), 9)), Ar(ue, null);
-        }
-      }
-      function $ee(e, t) {
-        var n, i, s, l, h, v, p, m, S, x, L, j, I, R, Y, q, V, U, te, ue, ye, Ce, be, Ne, Ue, Xe, it, st, Tt, xn, Nn;
-        for (Tt = new Se(), I = new M(t.c); I.a < I.c.c.length; )
-          for (L = f(O(I), 16), ue = new M(L.a); ue.a < ue.c.c.length; ) {
-            for (te = f(O(ue), 9), te.k = -1, x = Ys, be = Ys, Ue = new M(te.f); Ue.a < Ue.c.c.length; ) {
-              for (Ne = f(O(Ue), 7), s = new M(Ne.b); s.a < s.c.c.length; )
-                n = f(O(s), 12), Xe = f(z(n, (le(), Xa)), 24).a, x = x > Xe ? x : Xe;
-              for (i = new M(Ne.e); i.a < i.c.c.length; )
-                n = f(O(i), 12), Xe = f(z(n, (le(), Xa)), 24).a, be = be > Xe ? be : Xe;
-            }
-            ce(te, pp, gt(x)), ce(te, wp, gt(be));
-          }
-        for (q = 0, j = new M(t.c); j.a < j.c.c.length; )
-          for (L = f(O(j), 16), ue = new M(L.a); ue.a < ue.c.c.length; )
-            te = f(O(ue), 9), te.k < 0 && (st = new $5(), st.b = q++, PC(e, te, st), Tt.c[Tt.c.length] = st);
-        for (Ce = Ic(Tt.c.length), S = Ic(Tt.c.length), h = 0; h < Tt.c.length; h++)
-          Le(Ce, new Se()), Le(S, gt(0));
-        for (aee(t, Tt, Ce, S), xn = f(Vn(Tt, ve(Wz, D8, 111, Tt.c.length, 0, 1)), 625), ye = f(Vn(Ce, ve(Xee, { 3: 1, 5: 1, 6: 1, 672: 1 }, 20, Ce.c.length, 0, 1)), 672), m = ve(Kn, Wn, 26, S.c.length, 12, 1), v = 0; v < m.length; v++)
-          m[v] = (Sn(v, S.c.length), f(S.c[v], 24)).a;
-        for (V = 0, U = new Se(), p = 0; p < xn.length; p++)
-          m[p] == 0 && Le(U, xn[p]);
-        for (Y = ve(Kn, Wn, 26, xn.length, 12, 1); U.c.length != 0; )
-          for (st = f(Fl(U, 0), 111), Y[st.b] = V++; !ye[st.b].V(); )
-            Nn = f(ye[st.b].vb(0), 111), --m[Nn.b], m[Nn.b] == 0 && (U.c[U.c.length] = Nn);
-        for (e.a = ve(Wz, D8, 111, xn.length, 0, 1), l = 0; l < xn.length; l++)
-          for (R = xn[l], it = Y[l], e.a[it] = R, R.b = it, ue = new M(R.f); ue.a < ue.c.c.length; )
-            te = f(O(ue), 9), te.k = it;
-        return e.a;
-      }
-      function Yee(e, t) {
-        var n, i, s, l, h, v, p, m, S, x, L, j, I, R, Y, q, V, U, te, ue, ye, Ce, be, Ne;
-        for (Nt(t, "Fixed Layout", 1), p = f(z(e, (Ee(), of)), 122), R = 0, Y = 0, U = new M(e.b); U.a < U.c.c.length; ) {
-          for (q = f(O(U), 9), be = f(z(q, mh), 10), be && (q.i.a = be.a, q.i.b = be.b, f(z(q, ic), 86).kb((du(), Jg)) && (Ne = f(z(q, Fd), 15).a, m = f(z(q, Yd), 15).a, Ne > 0 && m > 0 && OC(q, new ot(Ne, m), !0))), R = je(R, q.i.a + q.j.a), Y = je(Y, q.i.b + q.j.b), j = new M(q.c); j.a < j.c.c.length; )
-            x = f(O(j), 33), be = f(z(x, mh), 10), be && (x.i.a = be.a, x.i.b = be.b), R = je(R, q.i.a + x.i.a + x.j.a), Y = je(Y, q.i.b + x.i.b + x.j.b);
-          for (ue = new M(q.f); ue.a < ue.c.c.length; )
-            for (te = f(O(ue), 7), be = f(z(te, mh), 10), be && (te.i.a = be.a, te.i.b = be.b), ye = q.i.a + te.i.a, Ce = q.i.b + te.i.b, R = je(R, ye + te.j.a), Y = je(Y, Ce + te.j.b), L = new M(te.c); L.a < L.c.c.length; )
-              x = f(O(L), 33), be = f(z(x, mh), 10), be && (x.i.a = be.a, x.i.b = be.b), R = je(R, ye + x.i.a + x.j.a), Y = je(Y, Ce + x.i.b + x.j.b);
-          for (v = Dt(En(q)); xt(v); )
-            l = f(Et(v), 12), I = PR(l), R = je(R, I.a), Y = je(Y, I.b);
-          for (h = Dt(Lr(q)); xt(h); )
-            l = f(Et(h), 12), He(z(l.c.f, (le(), pl))) !== He(e) && (I = PR(l), R = je(R, I.a), Y = je(Y, I.b));
-        }
-        if (p == (fu(), af))
-          for (V = new M(e.b); V.a < V.c.c.length; )
-            for (q = f(O(V), 9), h = Dt(En(q)); xt(h); )
-              l = f(Et(h), 12), S = dee(l), S.b == 0 ? ce(l, Un, null) : ce(l, Un, S);
-        e.e.a = R, e.e.b = Y, ce(e, ic, (du(), i = f(Hi(qd), 11), new ti(i, f(xi(i, i.length), 11), 0))), s = f(z(e, (le(), wl)), 9), s && ce(s, ic, (n = f(Hi(qd), 11), new ti(n, f(xi(n, n.length), 11), 0))), Ct(t);
-      }
-      function Fee(e, t) {
-        var n, i, s, l, h, v, p, m, S, x, L, j, I, R, Y, q, V, U, te, ue, ye, Ce, be, Ne, Ue, Xe, it;
-        if (!gi(f(z(t, (Ee(), dt)), 28))) {
-          if (t.f.c.length > 1) {
-            Ce = ve(bte, Dr, 15, e.a.length, 0, 1), m = Ic(e.a.length), R = 0, I = 0, n = 2 * t.d.a.c.length + 1;
-            e:
-              for (ye = new M(t.f); ye.a < ye.c.c.length; ) {
-                if (ue = f(O(ye), 7), q = ue.g == (we(), rt) || ue.g == ct, it = 0, q) {
-                  if (be = f(z(ue, (le(), js)), 9), !be)
-                    continue;
-                  for (L = !1, te = !1, Ue = new M(be.f); Ue.a < Ue.c.c.length; )
-                    Ne = f(O(Ue), 7), He(z(Ne, lt)) === He(ue) && (Ne.e.c.length == 0 ? Ne.b.c.length == 0 || (L = !0) : te = !0);
-                  L && !te ? it = ue.g == rt ? -(be.d ? Di(be.d.a, be, 0) : -1) : n - (be.d ? Di(be.d.a, be, 0) : -1) : te && !L ? it = (be.d ? Di(be.d.a, be, 0) : -1) + 1 : L && te && (it = ue.g == rt ? 0 : n / 2);
-                } else {
-                  for (U = new M(ue.e); U.a < U.c.c.length; )
-                    if (V = f(O(U), 12), s = V.d, s.f.d == t.d) {
-                      m.c[m.c.length] = ue;
-                      continue e;
-                    } else
-                      it += e.a[s.k];
-                  for (x = new M(ue.b); x.a < x.c.c.length; )
-                    if (S = f(O(x), 12), s = S.c, s.f.d == t.d) {
-                      m.c[m.c.length] = ue;
-                      continue e;
-                    } else
-                      it -= e.a[s.k];
-                }
-                ue.b.c.length + ue.e.c.length > 0 ? (Ce[ue.k] = new Ut(it / (ue.b.c.length + ue.e.c.length)), R = uF(R, Ce[ue.k].a), I = tD(I, Ce[ue.k].a)) : q && (Ce[ue.k] = new Ut(it));
-              }
-            for (Y = (t.d ? Di(t.d.a, t, 0) : -1) + 1, j = t.d.a.c.length + 1, p = new M(m); p.a < p.c.c.length; ) {
-              for (v = f(O(p), 7), it = 0, h = 0, l = Dt(ya((dr(), new Qn(ur(re(ie(Ze, 1), Me, 1, 4, [new Zh(v), new Lf(v)])))))); xt(l); )
-                s = f(Et(l), 7), s.f.d == t.d && (it += ej(s.f) + 1, ++h);
-              i = it / h, Xe = v.g, Xe == (we(), Be) ? i < Y ? Ce[v.k] = new Ut(R - i) : Ce[v.k] = new Ut(I + (j - i)) : Xe == qe && (i < Y ? Ce[v.k] = new Ut(I + i) : Ce[v.k] = new Ut(R - (j - i)));
-            }
-            Ya(t.f, new VP(Ce));
-          }
-          ce(t, dt, (zn(), yh));
-        }
-      }
-      function qee(e) {
-        var t, n, i, s, l, h, v, p, m, S, x, L, j, I, R, Y, q, V, U, te, ue, ye, Ce, be, Ne;
-        for (be = new Se(), e.a.b.c = ve(Ze, Me, 1, 0, 4, 1), te = (On(), new $t()), q = new M(e.d.c); q.a < q.c.c.length; )
-          for (R = f(O(q), 16), U = new M(R.a); U.a < U.c.c.length; ) {
-            if (V = f(O(U), 9), Pt(ge(jt(z(V, (Ee(), $d))))) && !eg(yg(V))) {
-              v = f(X1(yg(V)), 12), ue = v.c.f, ue == V && (ue = v.d.f), ye = new pr(ue, ou(_a(V.i), ue.i)), un(e.b, V, ye);
-              continue;
-            }
-            l = new QA(V, e.d), Le(e.a.b, l), ra(te.d, V, l);
-          }
-        for (Y = new M(e.d.c); Y.a < Y.c.c.length; )
-          for (R = f(O(Y), 16), U = new M(R.a); U.a < U.c.c.length; ) {
-            for (V = f(O(U), 9), l = f(ci(li(te.d, V)), 25), S = Dt(En(V)); xt(S); )
-              if (p = f(Et(S), 12), i = Jt(p.a, 0), x = !0, I = null, i.b != i.d.c) {
-                for (t = f(Ft(i), 10), p.c.g == (we(), rt) && (Ne = new xg(t, new ot(t.a, l.j.e), l, p), Ne.c = !0, be.c[be.c.length] = Ne), p.c.g == ct && (Ne = new xg(t, new ot(t.a, l.j.e + l.j.b), l, p), Ne.d = !0, be.c[be.c.length] = Ne); i.b != i.d.c; )
-                  n = f(Ft(i), 10), V4(t.b, n.b) || (I = new xg(t, n, null, p), be.c[be.c.length] = I, x && (x = !1, n.b < l.j.e ? I.c = !0 : n.b > l.j.e + l.j.b ? I.d = !0 : (I.d = !0, I.c = !0))), i.b != i.d.c && (t = n);
-                I && (h = f(Kt(te, p.d.f), 25), t.b < h.j.e ? I.c = !0 : t.b > h.j.e + h.j.b ? I.d = !0 : (I.d = !0, I.c = !0));
-              }
-            for (m = Dt(Lr(V)); xt(m); )
-              p = f(Et(m), 12), p.a.b != 0 && (t = f(x1(p.a), 10), p.d.g == (we(), rt) && (Ne = new xg(t, new ot(t.a, l.j.e), l, p), Ne.c = !0, be.c[be.c.length] = Ne), p.d.g == ct && (Ne = new xg(t, new ot(t.a, l.j.e + l.j.b), l, p), Ne.d = !0, be.c[be.c.length] = Ne));
-          }
-        if (be.c.length != 0) {
-          for (Qt(), Ya(be, null), j = (Sn(0, be.c.length), f(be.c[0], 142)), s = new aC(j, e.d), L = 1; L < be.c.length; L++)
-            Ce = (Sn(L, be.c.length), f(be.c[L], 142)), V4(s.j.d, Ce.j) && !(j3(s.j.e + s.j.b, Ce.k) || j3(Ce.n, s.j.e)) ? ER(s, Ce) : (Le(e.a.b, s), s = new aC(Ce, e.d));
-          Le(e.a.b, s);
-        }
-        be.c = ve(Ze, Me, 1, 0, 4, 1), WX(e);
-      }
-      function RC(e, t, n, i, s, l) {
-        var h, v, p, m, S, x, L, j, I, R, Y, q, V, U, te, ue, ye, Ce, be, Ne, Ue, Xe, it, st, Tt, xn, Nn, Ri, Xi;
-        for (v = f(_e(e.d.c.c, i), 16), Nn = new $r(), I = new $r(), j = 0; j < v.a.c.length; ++j)
-          V = f(_e(v.a, j), 9), j < n ? (Ue = Nn.a.db(V, Nn), Ue == null) : j > n && (Ne = I.a.db(V, I), Ne == null);
-        for (Ri = new $r(), R = new $r(), te = (it = new Wt(Nn.a).a.bb().mb(), new Zt(it)); te.a.G(); )
-          for (V = (x = f(te.a.H(), 21), f(x.yb(), 9)), h = t == 1 ? En(V) : Lr(V), m = (_n(), new _o(Go(vs(h.a, new T())))); xt(m); )
-            p = f(Et(m), 12), ea(V.d) != ea(p.d.f.d) && vn(Ri, p.d.f);
-        for (ue = (st = new Wt(I.a).a.bb().mb(), new Zt(st)); ue.a.G(); )
-          for (V = (x = f(ue.a.H(), 21), f(x.yb(), 9)), h = t == 1 ? En(V) : Lr(V), m = (_n(), new _o(Go(vs(h.a, new T())))); xt(m); )
-            p = f(Et(m), 12), ea(V.d) != ea(p.d.f.d) && vn(R, p.d.f);
-        for (hz && Rl(), be = f(_e(e.d.c.c, i + (t == 1 ? 1 : -1)), 16), Y = Ys, q = yr, L = 0; L < be.a.c.length; L++)
-          V = f(_e(be.a, L), 9), Ri.a.R(V) ? Y = Y > L ? Y : L : R.a.R(V) && (q = q < L ? q : L);
-        if (Y < q) {
-          for (ye = (Tt = new Wt(Ri.a).a.bb().mb(), new Zt(Tt)); ye.a.G(); ) {
-            for (V = (x = f(ye.a.H(), 21), f(x.yb(), 9)), S = Dt(En(V)); xt(S); )
-              if (p = f(Et(S), 12), ea(V.d) == ea(p.d.f.d))
-                return null;
-            for (m = Dt(Lr(V)); xt(m); )
-              if (p = f(Et(m), 12), ea(V.d) == ea(p.c.f.d))
-                return null;
-          }
-          for (Ce = (Xe = new Wt(R.a).a.bb().mb(), new Zt(Xe)); Ce.a.G(); ) {
-            for (V = (x = f(Ce.a.H(), 21), f(x.yb(), 9)), S = Dt(En(V)); xt(S); )
-              if (p = f(Et(S), 12), ea(V.d) == ea(p.d.f.d))
-                return null;
-            for (m = Dt(Lr(V)); xt(m); )
-              if (p = f(Et(m), 12), ea(V.d) == ea(p.c.f.d))
-                return null;
-          }
-          for (Nn.a.Y() == 0 ? Xi = 0 : I.a.Y() == 0 ? Xi = be.a.c.length : Xi = Y + 1, U = new M(v.a); U.a < U.c.c.length; )
-            if (V = f(O(U), 9), V.g == (et(), er))
-              return null;
-          return l == 1 ? i0(re(ie(H2, 1), Dr, 24, 0, [gt(Xi)])) : t == 1 && i == s - 2 || t == 0 && i == 1 ? i0(re(ie(H2, 1), Dr, 24, 0, [gt(Xi)])) : (xn = RC(e, t, Xi, i + (t == 1 ? 1 : -1), s, l - 1), xn && t == 1 && xn.rb(0, gt(Xi)), xn);
-        }
-        return null;
-      }
-      function Vee(e, t) {
-        var n, i, s, l, h, v, p, m, S, x, L, j, I, R, Y, q, V, U;
-        if (Q3(t), j = (Ee(), Wg).b, !(j in t.a && Mn(t, j).ic().a)) {
-          if (p = Mn(t, "source"), m = Mn(t, "sourcePort"), S = Mn(t, "target"), x = Mn(t, "targetPort"), p) {
-            if (!p.lc())
-              throw new gs("Invalid format of an edge's 'source' property. It must be a string.", p, t);
-          } else
-            throw new gs("Edges must contain a 'source' property.", null, t);
-          if (S) {
-            if (!S.lc())
-              throw new gs("Invalid format of an edge's 'target' property. It must be a string.", S, t);
-          } else
-            throw new gs("Edges must contain a 'target' property.", null, t);
-          Y = null, V = null;
-          try {
-            R = f(K1(e.i, p.lc().a), 9), m && m.lc() && (Y = f(K1(e.k, m.lc().a), 7)), q = f(K1(e.i, S.lc().a), 9), x && x.lc() && (V = f(K1(e.k, x.lc().a), 7));
-          } catch (te) {
-            throw te = Ur(te), xe(te, 76) ? new qv("An edge's 'source', 'target', 'sourcePort', and 'targetPort' properties have to be strings.", t) : Kr(te);
-          }
-          if (!Pt(ge(e.g))) {
-            if (!R || !q)
-              return;
-            if (Ti(R) != Ti(q))
-              return;
-          }
-          if (!R || !q)
-            throw new qv("An edge's source or target node could not be resolved.", t);
-          if (I = Ti(R), i = new bs(), ce(i, (le(), lt), t), h = f(Mn(t, "id"), 97), Z1(e.a, h.a, i), un(e.b, i, t), x0(t, i), nC(e, t, i, I), s = f(z(I, qr), 18), R == q && s.ib((vr(), Sp)), !Y)
-            Y = wR(R, new Yr(), (sr(), ri), I);
-          else if (Y.f != R)
-            throw new _w("Inconsistent source port reference found.");
-          if (!V)
-            V = wR(q, new Yr(), (sr(), Ai), I);
-          else if (V.f != q)
-            throw new _w("Inconsistent target port reference found.");
-          if (Bn(i, Y), kn(i, V), (_l(ya((dr(), new Qn(ur(re(ie(Ze, 1), Me, 1, 4, [Y.b, Y.e])))))) > 1 || _l(ya(new Qn(ur(re(ie(Ze, 1), Me, 1, 4, [V.b, V.e]))))) > 1) && s.ib((vr(), Ep)), He(z(I, (zt(), Pp))) === He((tg(), Rk)) && !(L2 in t.a)) {
-            n = new Ci();
-            try {
-              for (v = Mn(t, L2).hc(), l = 0; l < v.a.length; ++l)
-                L = Fu(v, l).kc(), U = new ot(Mn(L, "x").jc().a, Mn(L, "y").jc().a), wr(n, U, n.c.b, n.c);
-              ce(i, xL, n);
-            } catch (te) {
-              throw te = Ur(te), xe(te, 54) ? new qv("Invalid format of an edges 'bendPoints' property.", t) : Kr(te);
-            }
-          }
-          ce(i, Un, null);
-        }
-      }
-      function Pr() {
-        Pr = c, TT = new nn("LEFT_DIR_PREPROCESSOR", 0), vT = new nn("DOWN_DIR_PREPROCESSOR", 1), zT = new nn("UP_DIR_PREPROCESSOR", 2), hT = new nn("COMMENT_PREPROCESSOR", 3), xk = new nn("EDGE_AND_LAYER_CONSTRAINT_EDGE_REVERSER", 4), AT = new nn("SPLINE_SELF_LOOP_PREPROCESSOR", 5), Tk = new nn("INTERACTIVE_EXTERNAL_PORT_POSITIONER", 6), jT = new nn("PARTITION_PREPROCESSOR", 7), Sk = new nn("BIG_NODES_PREPROCESSOR", 8), cp = new nn("LABEL_DUMMY_INSERTER", 9), DT = new nn("PARTITION_POSTPROCESSOR", 10), PT = new nn("NODE_PROMOTION", 11), hp = new nn("LAYER_CONSTRAINT_PROCESSOR", 12), bT = new nn("HIERARCHICAL_PORT_CONSTRAINT_PROCESSOR", 13), Ek = new nn("BIG_NODES_INTERMEDIATEPROCESSOR", 14), Dk = new nn("LONG_EDGE_SPLITTER", 15), Nk = new nn("PORT_SIDE_PROCESSOR", 16), fp = new nn("LABEL_DUMMY_SWITCHER", 17), ST = new nn("LABEL_MANAGEMENT_PROCESSOR", 18), up = new nn("INVERTED_PORT_PROCESSOR", 19), MT = new nn("SELF_LOOP_PROCESSOR", 20), jk = new nn("PORT_LIST_SORTER", 21), vp = new nn("NORTH_SOUTH_PORT_PREPROCESSOR", 22), gT = new nn("GREEDY_SWITCH", 23), NT = new nn("PORT_DISTRIBUTER", 24), OT = new nn("SPLINE_SELF_LOOP_POSITIONER", 25), IT = new nn("SAUSAGE_COMPACTION", 26), Lk = new nn("IN_LAYER_CONSTRAINT_PROCESSOR", 27), yT = new nn("HYPEREDGE_DUMMY_MERGER", 28), Th = new nn("LABEL_SIDE_SELECTOR", 29), Ck = new nn("BIG_NODES_SPLITTER", 30), ET = new nn("LABEL_AND_NODE_SIZE_PROCESSOR", 31), RT = new nn("SPLINE_SELF_LOOP_ROUTER", 32), LT = new nn("NODE_MARGIN_CALCULATOR", 33), pT = new nn("HIERARCHICAL_PORT_DUMMY_SIZE_PROCESSOR", 34), Vd = new nn("HIERARCHICAL_PORT_POSITION_PROCESSOR", 35), CT = new nn("LAYER_SIZE_AND_GRAPH_HEIGHT_CALCULATOR", 36), ib = new nn("BIG_NODES_POSTPROCESSOR", 37), fT = new nn("COMMENT_POSTPROCESSOR", 38), kT = new nn("HYPERNODE_PROCESSOR", 39), wT = new nn("HIERARCHICAL_PORT_ORTHOGONAL_EDGE_ROUTER", 40), Pk = new nn("LONG_EDGE_JOINER", 41), dp = new nn("NORTH_SOUTH_PORT_POSTPROCESSOR", 42), lp = new nn("LABEL_DUMMY_REMOVER", 43), mT = new nn("HORIZONTAL_COMPACTOR", 44), Ik = new nn("REVERSED_EDGE_RESTORER", 45), xT = new nn("LEFT_DIR_POSTPROCESSOR", 46), dT = new nn("DOWN_DIR_POSTPROCESSOR", 47), BT = new nn("UP_DIR_POSTPROCESSOR", 48), sp = new nn("END_LABEL_PROCESSOR", 49);
-      }
-      function le() {
-        le = c;
-        var e, t;
-        lt = new Zn("origin"), $H = new Zn("processingConfiguration"), PL = new Zn("processors"), yL = new nt("compoundNode", (yn(), yn(), Rn)), YH = new nt("insideConnections", Rn), pl = new Zn("nestedLGraph"), wl = new Zn("parentLNode"), xL = new Zn("originalBendpoints"), TL = new Zn("originalDummyNodePosition"), LL = new Zn("originalLabelEdge"), DL = new Zn("representedLabels"), lo = new nt("labelSide", (Gi(), nb)), Xs = new nt("reversed", Rn), jh = new Zn("random"), Mi = new nt("longEdgeSource", null), Si = new nt("longEdgeTarget", null), oE = new nt("edgeConstraint", (nh(), iL)), bl = new Zn("inLayerLayoutUnit"), Zs = new nt("inLayerConstraint", (ms(), Cp)), Dh = new nt("inLayerSuccessorConstraint", new Se()), js = new Zn("portDummy"), Xd = new nt("crossingHint", gt(0)), qr = new nt("graphProperties", (t = f(Hi(lL), 11), new ti(t, f(xi(t, t.length), 11), 0))), _r = new nt("externalPortSide", (we(), cr)), CL = new nt("externalPortSize", new Yr()), Tp = new Zn("externalPortReplacedDummy"), bf = new nt("externalPortConnections", (e = f(Hi(Nr), 11), new ti(e, f(xi(e, e.length), 11), 0))), xu = new nt(l8, 0), wL = new Zn("barycenterAssociates"), Jd = new Zn("TopSideComments"), Zd = new Zn("BottomSideComments"), xp = new Zn("CommentConnectionPort"), sE = new nt("inputCollect", Rn), uE = new nt("outputCollect", Rn), EL = new nt("cyclic", Rn), fb = new nt("bigNodeOriginalSize", new Ut(0)), vc = new nt("bigNodeInitial", Rn), mL = new nt("de.cau.cs.kieler.klay.layered.bigNodeLabels", new Se()), aE = new nt("de.cau.cs.kieler.klay.layered.postProcess", null), kL = new Zn("crossHierarchyMap"), fE = new Zn("targetOffset"), FH = new nt("splineLabelSize", new Yr()), hb = new nt("splineLoopSide", (wi(), ff)), lE = new nt("splineSelfLoopComponents", new Se()), jL = new nt("splineSelfLoopMargins", new e1()), ml = new Zn("spacings"), Lp = new nt("partitionConstraint", Rn), Qd = new H1((Ee(), ul), new Ut(0)), Oi = new z1(Yx, new Ut(20), new Ut(1)), cE = new z1(_x, new Ut(10), new Ut(1)), os = new z1(Ax, new Ut(12), new Ut(0)), Xa = new H1(Gx, gt(0)), Ph = new z1(hB, new Ut(w8), new Ut(0)), SL = new H1(of, (fu(), af));
-      }
-      function zt() {
-        zt = c, jp = new nt("de.cau.cs.kieler.klay.layered.nodePromotion", (Xc(), gp)), AL = new Q1("de.cau.cs.kieler.klay.layered.nodePromotionBoundary", gt(0), gt(0), gt(100)), RL = new nt(c8, gt(1)), tv = new $l("de.cau.cs.kieler.klay.layered.inLayerSpacingFactor", new Ut(1), new Ut(0)), Qs = new nt("de.cau.cs.kieler.klay.layered.edgeSpacingFactor", new Ut(0.5)), WH = new nt("de.cau.cs.kieler.klay.layered.edgeNodeSpacingFactor", new Ut(lx)), wE = new nt("de.cau.cs.kieler.klay.layered.distributeNodes", (yn(), yn(), Rn)), rv = new nt("de.cau.cs.kieler.klay.layered.wideNodesOnMultipleLayers", (lu(), Ip)), pE = new nt("de.cau.cs.kieler.klay.layered.cycleBreaking", (U1(), Ok)), kE = new nt("de.cau.cs.kieler.klay.layered.nodeLayering", (a0(), Ak)), Pp = new nt("de.cau.cs.kieler.klay.layered.crossMin", (tg(), Bk)), mE = new nt("de.cau.cs.kieler.klay.layered.greedySwitch", (Dg(), rE)), EE = new nt("de.cau.cs.kieler.klay.layered.nodePlace", (E0(), zk)), IL = new Q1("de.cau.cs.kieler.klay.layered.linearSegmentsDeflectionDampening", new Ut(cx), new Ut(0), new Ut(1)), Dp = new nt("de.cau.cs.kieler.klay.layered.fixedAlignment", (mg(), Jk)), Nh = new nt("de.cau.cs.kieler.klay.layered.edgeLabelSideSelection", (C0(), kp)), NL = new nt(u8, Rn), nv = new $l("de.cau.cs.kieler.klay.layered.thoroughness", gt(10), gt(1)), Er = new nt("de.cau.cs.kieler.klay.layered.layerConstraint", ($i(), pf)), ML = new nt("de.cau.cs.kieler.klay.layered.mergeEdges", Rn), OL = new nt("de.cau.cs.kieler.klay.layered.mergeHierarchyEdges", ii), yE = new nt("de.cau.cs.kieler.klay.layered.interactiveReferencePoint", (J1(), iE)), vb = new nt("de.cau.cs.kieler.klay.layered.feedBackEdges", Rn), dE = new nt("de.cau.cs.kieler.klay.layered.unnecessaryBendpoints", Rn), bE = new nt("de.cau.cs.kieler.klay.layered.contentAlignment", (Pd(), Yt(Vk, re(ie(Wk, 1), De, 123, 0, [$k])))), BL = new nt("de.cau.cs.kieler.klay.layered.sausageFolding", Rn), xE = new nt("de.cau.cs.kieler.klay.layered.splines.selfLoopPlacement", (p0(), TE)), vE = new nt("de.cau.cs.kieler.klay.layered.nodeplace.compactionStrategy", (og(), Hk)), SE = new nt("de.cau.cs.kieler.klay.layered.northOrSouthPort", Rn), Np = new nt("de.cau.cs.kieler.klay.layered.postCompaction", (jd(), sb)), CE = new nt("de.cau.cs.kieler.klay.layered.postCompaction.constraints", (t0(), Mk)), gE = new nt("de.cau.cs.kieler.klay.layered.components.compact", Rn);
-      }
-      function m2() {
-        m2 = c, VB = new Li("OUT_T_L", 0, (dr(), new cu(Yt((gu(), Ui), re(ie(Ln, 1), De, 41, 0, [ba, qi])))), (hy(), oc)), qB = new Li("OUT_T_C", 1, new Qn(ur(re(ie(Ze, 1), Me, 1, 4, [Yt(Ui, re(ie(Ln, 1), De, 41, 0, [ba, Ua])), Yt(Ui, re(ie(Ln, 1), De, 41, 0, [ba, Ua, Vi]))]))), xh), WB = new Li("OUT_T_R", 2, new cu(Yt(Ui, re(ie(Ln, 1), De, 41, 0, [ba, Wi]))), sc), BB = new Li("OUT_B_L", 3, new cu(Yt(Ui, re(ie(Ln, 1), De, 41, 0, [va, qi]))), oc), RB = new Li("OUT_B_C", 4, new Qn(ur(re(ie(Ze, 1), Me, 1, 4, [Yt(Ui, re(ie(Ln, 1), De, 41, 0, [va, Ua])), Yt(Ui, re(ie(Ln, 1), De, 41, 0, [va, Ua, Vi]))]))), xh), zB = new Li("OUT_B_R", 5, new cu(Yt(Ui, re(ie(Ln, 1), De, 41, 0, [va, Wi]))), sc), GB = new Li("OUT_L_T", 6, new cu(Yt(Ui, re(ie(Ln, 1), De, 41, 0, [qi, ba, Vi]))), sc), _B = new Li("OUT_L_C", 7, new Qn(ur(re(ie(Ze, 1), Me, 1, 4, [Yt(Ui, re(ie(Ln, 1), De, 41, 0, [qi, ga])), Yt(Ui, re(ie(Ln, 1), De, 41, 0, [qi, ga, Vi]))]))), sc), HB = new Li("OUT_L_B", 8, new cu(Yt(Ui, re(ie(Ln, 1), De, 41, 0, [qi, va, Vi]))), sc), FB = new Li("OUT_R_T", 9, new cu(Yt(Ui, re(ie(Ln, 1), De, 41, 0, [Wi, ba, Vi]))), oc), YB = new Li("OUT_R_C", 10, new Qn(ur(re(ie(Ze, 1), Me, 1, 4, [Yt(Ui, re(ie(Ln, 1), De, 41, 0, [Wi, ga])), Yt(Ui, re(ie(Ln, 1), De, 41, 0, [Wi, ga, Vi]))]))), oc), $B = new Li("OUT_R_B", 11, new cu(Yt(Ui, re(ie(Ln, 1), De, 41, 0, [Wi, va, Vi]))), oc), OB = new Li("IN_T_L", 12, new Qn(ur(re(ie(Ze, 1), Me, 1, 4, [Yt(Ei, re(ie(Ln, 1), De, 41, 0, [ba, qi])), Yt(Ei, re(ie(Ln, 1), De, 41, 0, [ba, qi, Vi]))]))), oc), MB = new Li("IN_T_C", 13, new Qn(ur(re(ie(Ze, 1), Me, 1, 4, [Yt(Ei, re(ie(Ln, 1), De, 41, 0, [ba, Ua])), Yt(Ei, re(ie(Ln, 1), De, 41, 0, [ba, Ua, Vi]))]))), xh), AB = new Li("IN_T_R", 14, new Qn(ur(re(ie(Ze, 1), Me, 1, 4, [Yt(Ei, re(ie(Ln, 1), De, 41, 0, [ba, Wi])), Yt(Ei, re(ie(Ln, 1), De, 41, 0, [ba, Wi, Vi]))]))), sc), NB = new Li("IN_C_L", 15, new Qn(ur(re(ie(Ze, 1), Me, 1, 4, [Yt(Ei, re(ie(Ln, 1), De, 41, 0, [ga, qi])), Yt(Ei, re(ie(Ln, 1), De, 41, 0, [ga, qi, Vi]))]))), oc), jB = new Li("IN_C_C", 16, new Qn(ur(re(ie(Ze, 1), Me, 1, 4, [Yt(Ei, re(ie(Ln, 1), De, 41, 0, [ga, Ua])), Yt(Ei, re(ie(Ln, 1), De, 41, 0, [ga, Ua, Vi]))]))), xh), IB = new Li("IN_C_R", 17, new Qn(ur(re(ie(Ze, 1), Me, 1, 4, [Yt(Ei, re(ie(Ln, 1), De, 41, 0, [ga, Wi])), Yt(Ei, re(ie(Ln, 1), De, 41, 0, [ga, Wi, Vi]))]))), sc), PB = new Li("IN_B_L", 18, new Qn(ur(re(ie(Ze, 1), Me, 1, 4, [Yt(Ei, re(ie(Ln, 1), De, 41, 0, [va, qi])), Yt(Ei, re(ie(Ln, 1), De, 41, 0, [va, qi, Vi]))]))), oc), LB = new Li("IN_B_C", 19, new Qn(ur(re(ie(Ze, 1), Me, 1, 4, [Yt(Ei, re(ie(Ln, 1), De, 41, 0, [va, Ua])), Yt(Ei, re(ie(Ln, 1), De, 41, 0, [va, Ua, Vi]))]))), xh), DB = new Li("IN_B_R", 20, new Qn(ur(re(ie(Ze, 1), Me, 1, 4, [Yt(Ei, re(ie(Ln, 1), De, 41, 0, [va, Wi])), Yt(Ei, re(ie(Ln, 1), De, 41, 0, [va, Wi, Vi]))]))), sc), dk = new Li(ef, 21, _g, null);
-      }
-      function WR(e, t, n) {
-        var i, s, l, h, v, p, m, S, x, L, j, I, R, Y, q, V, U, te, ue, ye, Ce, be, Ne, Ue, Xe, it, st, Tt, xn, Nn, Ri, Xi, pc, wc, wb, Js, ai, Bi, eu, Gr, Xr, Qa, mc, Ns, Lu, yl, ss, Pu, av, fo, Du, ho, wa, ju, ov;
-        for (yl = 0, it = 0, xn = t.length; it < xn; ++it)
-          if (Ue = t[it], gi(f(z(Ue, (Ee(), dt)), 28)))
-            for (Bi = new M(Ue.f); Bi.a < Bi.c.c.length; ) {
-              for (ai = f(O(Bi), 7), Gr = 0, v = new M(ai.e); v.a < v.c.c.length; )
-                h = f(O(v), 12), Ue.d != h.d.f.d && ++Gr;
-              Gr > 0 && (e.a[ai.k] = yl++);
-            }
-          else {
-            for (Ri = 0, Bi = new M(Ue.f); Bi.a < Bi.c.c.length; ) {
-              for (ai = f(O(Bi), 7), v = new M(ai.e); v.a < v.c.c.length; )
-                h = f(O(v), 12), Ue.d != h.d.f.d && ++Ri;
-              e.a[ai.k] = yl;
-            }
-            Ri > 0 && ++yl;
-          }
-        for (Du = 0, st = 0, Nn = n.length; st < Nn; ++st)
-          if (Ue = n[st], gi(f(z(Ue, (Ee(), dt)), 28))) {
-            for (Xi = 0, Bi = new M(Ue.f); Bi.a < Bi.c.c.length && (ai = f(O(Bi), 7), ai.g == (we(), rt)); )
-              for (v = new M(ai.b); v.a < v.c.c.length; )
-                if (h = f(O(v), 12), Ue.d != h.c.f.d) {
-                  ++Xi;
-                  break;
-                }
-            for (wc = 0, Xr = new fn(Ue.f, Ue.f.c.length); Xr.b > 0; ) {
-              for (ai = (ut(Xr.b > 0), f(Xr.a.sb(Xr.c = --Xr.b), 7)), Gr = 0, v = new M(ai.b); v.a < v.c.c.length; )
-                h = f(O(v), 12), Ue.d != h.c.f.d && ++Gr;
-              Gr > 0 && (ai.g == (we(), rt) ? (e.a[ai.k] = Du, ++Du) : (e.a[ai.k] = Du + Xi + wc, ++wc));
-            }
-            Du += wc;
-          } else {
-            for (Ri = 0, Bi = new M(Ue.f); Bi.a < Bi.c.c.length; ) {
-              for (ai = f(O(Bi), 7), v = new M(ai.b); v.a < v.c.c.length; )
-                h = f(O(v), 12), Ue.d != h.c.f.d && ++Ri;
-              e.a[ai.k] = Du;
-            }
-            Ri > 0 && ++Du;
-          }
-        for (eu = (On(), new $t()), j = new _i(), Xe = 0, Tt = t.length; Xe < Tt; ++Xe)
-          for (Ue = t[Xe], av = new M(Ue.f); av.a < av.c.c.length; )
-            for (Pu = f(O(av), 7), v = new M(Pu.e); v.a < v.c.c.length; )
-              if (h = f(O(v), 12), wa = h.d, Ue.d != wa.f.d)
-                if (ss = f(ci(li(eu.d, Pu)), 197), ho = f(ci(li(eu.d, wa)), 197), !ss && !ho)
-                  L = new U9(), j.a.db(L, j), Le(L.a, h), Le(L.d, Pu), ra(eu.d, Pu, L), Le(L.d, wa), ra(eu.d, wa, L);
-                else if (!ss)
-                  Le(ho.a, h), Le(ho.d, Pu), ra(eu.d, Pu, ho);
-                else if (!ho)
-                  Le(ss.a, h), Le(ss.d, wa), ra(eu.d, wa, ss);
-                else if (ss == ho)
-                  Le(ss.a, h);
-                else {
-                  for (Le(ss.a, h), Js = new M(ho.d); Js.a < Js.c.c.length; )
-                    wb = f(O(Js), 7), ra(eu.d, wb, ss);
-                  Tn(ss.a, ho.a), Tn(ss.d, ho.d), j.a.eb(ho) != null;
-                }
-        for (I = f(Ky(j, ve(ste, { 674: 1, 3: 1, 5: 1, 6: 1 }, 197, j.a.Y(), 0, 1)), 674), Ne = t[0].d, Lu = n[0].d, S = 0, x = I.length; S < x; ++S)
-          for (m = I[S], m.e = yl, m.f = Du, Bi = new M(m.d); Bi.a < Bi.c.c.length; )
-            ai = f(O(Bi), 7), Qa = e.a[ai.k], ai.f.d == Ne ? (Qa < m.e && (m.e = Qa), Qa > m.b && (m.b = Qa)) : ai.f.d == Lu && (Qa < m.f && (m.f = Qa), Qa > m.c && (m.c = Qa));
-        for (ah(I, 0, I.length, (Ml(), Ml(), wf)), fo = ve(Kn, Wn, 26, I.length, 12, 1), i = ve(Kn, Wn, 26, Du + 1, 12, 1), Y = 0; Y < I.length; Y++)
-          fo[Y] = I[Y].f, i[fo[Y]] = 1;
-        for (l = 0, q = 0; q < i.length; q++)
-          i[q] == 1 ? i[q] = l : --l;
-        for (mc = 0, V = 0; V < fo.length; V++)
-          fo[V] += i[fo[V]], mc = Jr(mc, fo[V] + 1);
-        for (p = 1; p < mc; )
-          p *= 2;
-        for (ov = 2 * p - 1, p -= 1, ju = ve(Kn, Wn, 26, ov, 12, 1), s = 0, Ce = 0; Ce < fo.length; Ce++)
-          for (ye = fo[Ce] + p, ++ju[ye]; ye > 0; )
-            ye % 2 > 0 && (s += ju[ye + 1]), ye = (ye - 1) / 2 | 0, ++ju[ye];
-        for (be = ve(Fz, Me, 156, I.length * 2, 0, 1), U = 0; U < I.length; U++)
-          be[2 * U] = new W1(I[U], I[U].e, I[U].b, (e0(), cb)), be[2 * U + 1] = new W1(I[U], I[U].b, I[U].e, ub);
-        for (ah(be, 0, be.length, wf), pc = 0, te = 0; te < be.length; te++)
-          switch (be[te].d.e) {
-            case 0:
-              ++pc;
-              break;
-            case 1:
-              --pc, s += pc;
-          }
-        for (Ns = ve(Fz, Me, 156, I.length * 2, 0, 1), ue = 0; ue < I.length; ue++)
-          Ns[2 * ue] = new W1(I[ue], I[ue].f, I[ue].c, (e0(), cb)), Ns[2 * ue + 1] = new W1(I[ue], I[ue].c, I[ue].f, ub);
-        for (ah(Ns, 0, Ns.length, wf), pc = 0, R = 0; R < Ns.length; R++)
-          switch (Ns[R].d.e) {
-            case 0:
-              ++pc;
-              break;
-            case 1:
-              --pc, s += pc;
-          }
-        return s;
-      }
-      function Ee() {
-        Ee = c;
-        var e, t;
-        fB = new nt("de.cau.cs.kieler.animate", (yn(), yn(), ii)), new nt("de.cau.cs.kieler.minAnimTime", gt(400)), new nt("de.cau.cs.kieler.maxAnimTime", gt(4e3)), new nt("de.cau.cs.kieler.animTimeFactor", gt(100)), Yg = new nt("de.cau.cs.kieler.additionalPortSpace", null), $d = new nt("de.cau.cs.kieler.commentBox", Rn), new Zn("de.cau.cs.kieler.diagramType"), da = new nt("de.cau.cs.kieler.edgeLabelPlacement", (ys(), W2)), Rx = new nt("de.cau.cs.kieler.edgeType", (P0(), Z2)), vB = new Zn("de.cau.cs.kieler.fontName"), gB = new nt("de.cau.cs.kieler.fontSize", gt(0)), qg = new nt("de.cau.cs.kieler.hypernode", Rn), Un = new nt("de.cau.cs.kieler.junctionPoints", new Ci()), new nt("de.cau.cs.kieler.layoutAncestors", Rn), Vg = new nt("de.cau.cs.kieler.margins", new e1()), Yd = new $l("de.cau.cs.kieler.minHeight", new Ut(0), new Ut(0)), Fd = new $l("de.cau.cs.kieler.minWidth", new Ut(0), new Ut(0)), Wg = new nt("de.cau.cs.kieler.noLayout", Rn), ul = new Zn("de.cau.cs.kieler.offset"), wu = new Zn("de.cau.cs.kieler.klay.layered.portAnchor"), mu = new Zn("de.cau.cs.kieler.portIndex"), Kg = new nt("de.cau.cs.kieler.portSide", (we(), cr)), new nt("de.cau.cs.kieler.progressBar", Rn), new nt("de.cau.cs.kieler.resetConfig", ii), new nt("de.cau.cs.kieler.scaleFactor", new Ut(1)), Jo = new nt("de.cau.cs.kieler.thickness", new Ut(1)), new nt("de.cau.cs.kieler.zoomToFit", Rn), Ox = new Zn("de.cau.cs.kieler.algorithm"), co = new nt("de.cau.cs.kieler.alignment", (Ko(), V2)), hB = new nt("de.cau.cs.kieler.aspectRatio", new Ut(0)), Q2 = new Zn("de.cau.cs.kieler.bendPoints"), Ax = new nt("de.cau.cs.kieler.borderSpacing", new Ut(-1)), Fg = new nt(u8, Rn), Do = new nt("de.cau.cs.kieler.direction", ($n(), Po)), of = new nt("de.cau.cs.kieler.edgeRouting", (fu(), K2)), dB = new nt("de.cau.cs.kieler.expandNodes", Rn), Bx = new nt("de.cau.cs.kieler.hierarchyHandling", (v0(), X2)), bB = new nt("de.cau.cs.kieler.interactive", Rn), wh = new $l("de.cau.cs.kieler.labelSpacing", new Ut(3), new Ut(0)), zx = new nt("de.cau.cs.kieler.layoutHierarchy", Rn), ia = new nt("de.cau.cs.kieler.nodeLabelPlacement", (gu(), t = f(Hi(Ln), 11), new ti(t, f(xi(t, t.length), 11), 0))), dt = new nt("de.cau.cs.kieler.portConstraints", (zn(), ac)), Ug = new nt("de.cau.cs.kieler.portLabelPlacement", (th(), Qg)), _x = new $l("de.cau.cs.kieler.portSpacing", new Ut(-1), new Ut(0)), J2 = new nt("de.cau.cs.kieler.portAlignment", (Zu(), Ls)), tk = new nt("de.cau.cs.kieler.portAlignment.north", sf), nk = new nt("de.cau.cs.kieler.portAlignment.south", sf), rk = new nt("de.cau.cs.kieler.portAlignment.west", sf), ek = new nt("de.cau.cs.kieler.portAlignment.east", sf), mh = new Zn("de.cau.cs.kieler.position"), Gx = new Zn("de.cau.cs.kieler.priority"), new Zn(c8), ik = new nt("de.cau.cs.kieler.selfLoopInside", Rn), $x = new Zn("de.cau.cs.kieler.separateConnComp"), ic = new nt("de.cau.cs.kieler.sizeConstraint", (du(), e = f(Hi(qd), 11), new ti(e, f(xi(e, e.length), 11), 0))), Zg = new nt("de.cau.cs.kieler.sizeOptions", Yt((sh(), tb), re(ie(hk, 1), De, 139, 0, [ck]))), Yx = new $l("de.cau.cs.kieler.spacing", new Ut(-1), new Ut(0)), pB = new nt("de.cau.cs.kieler.layoutPartitions", Rn), Hx = new Zn("de.cau.cs.kieler.partition");
-      }
-      function Wee(e, t, n, i) {
-        CR();
-        var s, l, h, v, p, m, S, x, L, j, I, R, Y, q, V;
-        if (!(!i && (e.n ? e.n : (Qt(), Qt(), $L)).R(new GD(t)))) {
-          if (f(tT.a, 18).kb(t)) {
-            if (!n.lc())
-              throw new mo(g8 + t + tf + n + ").");
-            j = f(f(tT.b, 57).cb(t), 79), I = n.lc().a, ce(e, j, I);
-            return;
-          } else if (f(eT.a, 18).kb(t))
-            try {
-              if (!n.jc())
-                throw new M7();
-              j = f(f(eT.b, 57).cb(t), 79), q = gt($X((mn(), "" + n.jc().a))), ce(e, j, q);
-              return;
-            } catch (U) {
-              throw U = Ur(U), xe(U, 130) ? new mo("Invalid integer format for property '" + t + tf + n + ").") : Kr(U);
-            }
-          else if (f(Zx.a, 18).kb(t)) {
-            if (!n.ic())
-              throw new mo(g8 + t + tf + n + ").");
-            j = f(f(Zx.b, 57).cb(t), 79), q = (yn(), n.ic().a ? ii : Rn), ce(e, j, q);
-            return;
-          } else if (f(Jx.a, 18).kb(t)) {
-            if (!n.jc())
-              throw new mo("Invalid float format for property '" + t + tf + n + ").");
-            j = f(f(Jx.b, 57).cb(t), 79), q = new t7(n.jc().a), ce(e, j, q);
-            return;
-          } else if (f(Qx.a, 18).kb(t)) {
-            if (!n.lc())
-              throw new mo(nx + t + tf + n + ").");
-            S = n.lc().a, x = null;
-            try {
-              Gn((Ee(), Kg), t) ? x = (we(), f(Br((sI(), CB), S), 32)) : Gn(co, t) ? x = (Ko(), f(Br((gI(), tB), S), 103)) : Gn(Do, t) ? x = ($n(), f(Br((oI(), nB), S), 59)) : Gn(of, t) ? x = (fu(), f(Br((ZN(), oB), S), 122)) : Gn(Bx, t) ? x = (v0(), f(Br((_N(), lB), S), 166)) : Gn(J2, t) || Gn(ek, t) || Gn(tk, t) || Gn(nk, t) || Gn(rk, t) ? x = (Zu(), f(Br((uI(), mB), S), 100)) : Gn(dt, t) ? x = (zn(), f(Br((pI(), kB), S), 28)) : Gn(Ug, t) ? x = (th(), f(Br((HN(), SB), S), 149)) : Gn(Rx, t) ? x = (P0(), f(Br((bI(), uB), S), 133)) : Gn(da, t) ? x = (ys(), f(Br((KN(), iB), S), 107)) : Gn((zt(), pE), t) ? x = (U1(), f(Br((LN(), Lz), S), 193)) : Gn(kE, t) ? x = (a0(), f(Br((GN(), Nz), S), 173)) : Gn(Nh, t) ? x = (C0(), f(Br((PI(), AH), S), 115)) : Gn(vE, t) ? x = (og(), f(Br((JN(), eH), S), 194)) : Gn(Pp, t) ? x = (tg(), f(Br((DN(), _z), S), 192)) : Gn(jp, t) ? x = (Xc(), f(Br((TI(), pz), S), 109)) : Gn(EE, t) ? x = (E0(), f(Br((LI(), Zz), S), 141)) : Gn(Np, t) ? x = (jd(), f(Br((wI(), kz), S), 125)) : Gn(CE, t) ? x = (t0(), f(Br((PN(), mz), S), 175)) : Gn(Dp, t) ? x = (mg(), f(Br((_I(), BH), S), 124)) : Gn(mE, t) ? x = (Dg(), f(Br((iM(), HH), S), 110)) : Gn(Er, t) ? x = ($i(), f(Br((DI(), VH), S), 85)) : Gn(xE, t) ? x = (p0(), f(Br((dI(), KH), S), 153)) : Gn(rv, t) ? x = (lu(), f(Br((vI(), XH), S), 172)) : Gn(yE, t) && (x = (J1(), f(Br((eI(), GH), S), 174)));
-            } catch (U) {
-              throw U = Ur(U), xe(U, 54) ? new mo(nx + t + tf + n + ").") : Kr(U);
-            }
-            j = f(f(Qx.b, 57).cb(t), 79), ce(e, j, x);
-            return;
-          } else if (f(Xx.a, 18).kb(t)) {
-            if (!n.lc())
-              throw new mo(nx + t + tf + n + ").");
-            for (m = n.lc().a, R = null, p = R0(m, "[\\[\\]\\s,]+"), h = 0, v = p.length; h < v; ++h)
-              l = p[h], $v(Wc(l)) != 0 && (Gn((Ee(), ia), t) ? (!R && (R = (s = f(Hi(Ln), 11), new ti(s, f(xi(s, s.length), 11), 0))), hi(R, (gu(), f(Br((OI(), wB), l), 41)))) : Gn(ic, t) ? (!R && (R = (s = f(Hi(qd), 11), new ti(s, f(xi(s, s.length), 11), 0))), hi(R, (du(), f(Br((QN(), xB), l), 150)))) : Gn(Zg, t) ? (!R && (R = (s = f(Hi(hk), 11), new ti(s, f(xi(s, s.length), 11), 0))), hi(R, (sh(), f(Br((XN(), TB), l), 139)))) : Gn((zt(), bE), t) && (!R && (R = (s = f(Hi(Wk), 11), new ti(s, f(xi(s, s.length), 11), 0))), hi(R, (Pd(), f(Br((HI(), MH), l), 123)))));
-            j = f(f(Xx.b, 57).cb(t), 79), ce(e, j, R);
-            return;
-          } else if (f(ap.a, 18).kb(t)) {
-            if (!n.lc())
-              throw new mo("Invalid _other_ format for property '" + t + tf + n + ").");
-            if (Gn((Ee(), mh), t) || Gn(wu, t))
-              try {
-                Y = new Yr(), eJ(Y, n.lc().a), j = f(f(ap.b, 57).cb(t), 79), ce(e, j, Y);
-                return;
-              } catch (U) {
-                throw U = Ur(U), xe(U, 29) ? new mo("Invalid KVector format for property '" + t + "' " + n + ".") : Kr(U);
-              }
-            else if (Gn(Q2, t) || Gn(Un, t))
-              try {
-                V = new Ci(), PQ(V, n.lc().a), j = f(f(ap.b, 57).cb(t), 79), ce(e, j, V);
-                return;
-              } catch (U) {
-                throw U = Ur(U), xe(U, 29) ? new mo("Invalid KVectorChain format for property '" + t + "' " + n + ".") : Kr(U);
-              }
-            else if (Gn(Vg, t) || Gn(Yg, t))
-              try {
-                L = new e1(), uJ(L, n.lc().a), j = f(f(ap.b, 57).cb(t), 79), ce(e, j, L);
-                return;
-              } catch (U) {
-                throw U = Ur(U), xe(U, 29) ? new mo("Invalid Margins format for property '" + t + "' " + n + ".") : Kr(U);
-              }
-          } else if (f(ZB.a, 18).kb(t))
-            return;
-          throw new mo("Unsupported layout option '" + t + tf + n + ").");
-        }
-      }
-      var z0 = "object", Dr = { 3: 1, 8: 1, 5: 1, 6: 1 }, BC = { 3: 1, 46: 1 }, Gs = { 3: 1, 54: 1, 46: 1 }, $s = "null", y2 = "anonymous", zC = "Unknown", UR = "function", yr = 2147483647, KR = { 181: 1, 3: 1, 54: 1, 46: 1 }, jg = 65536, Cs = 65535, ZR = { 3: 1, 54: 1, 29: 1, 46: 1 }, k2 = 'For input string: "', Ys = -2147483648, jr = { 56: 1 }, HC = { 23: 1, 145: 1, 185: 1 }, mi = { 3: 1, 5: 1 }, _C = "Invalid UTF8 sequence", XR = "fromIndex: ", zr = "java.lang", GC = "com.google.gwt.core.client", H0 = "com.google.gwt.core.client.impl", _0 = "java.io", $C = "java.nio.charset", YC = "javaemul.internal", To = "com.google.common.base", QR = "%s (%s) must not be negative", Me = { 3: 1, 5: 1, 6: 1 }, JR = "negative size: ", De = { 3: 1, 8: 1, 5: 1, 11: 1, 6: 1 }, G0 = { 68: 1, 136: 1, 3: 1, 23: 1, 17: 1 }, Id = { 108: 1, 35: 1 }, Re = "com.google.common.collect", E2 = { 108: 1, 35: 1, 96: 1 }, Ng = { 144: 1, 3: 1 }, ir = { 35: 1 }, fh = { 57: 1 }, wt = "java.util", Md = { 22: 1, 19: 1 }, di = { 22: 1, 19: 1, 18: 1 }, hh = { 22: 1, 19: 1, 20: 1 }, S2 = { 22: 1, 19: 1, 20: 1, 63: 1 }, dh = { 35: 1, 96: 1 }, FC = { 22: 1, 19: 1, 18: 1, 137: 1 }, Ig = { 21: 1 }, e8 = "AbstractMapEntry", qC = { 207: 1, 22: 1, 19: 1 }, VC = { 159: 1, 3: 1, 23: 1, 17: 1 }, WC = 1073741824, Ju = { 22: 1 }, UC = { 3: 1, 22: 1, 19: 1 }, vh = { 87: 1, 3: 1, 22: 1, 19: 1, 20: 1, 63: 1 }, gh = { 3: 1, 57: 1 }, bh = { 3: 1, 22: 1, 19: 1, 18: 1 }, yi = { 64: 1 }, KC = "arraySize", nl = "initialArraySize", ZC = { 64: 1, 188: 1, 3: 1, 23: 1, 17: 1 }, XC = "occurrences", Wn = { 52: 1, 3: 1, 5: 1 }, QC = { 205: 1, 3: 1, 23: 1, 17: 1 }, Mg = 1e-4, Ql = "com.google.gwt.json.client", Va = 4194303, ec = 1048575, Jl = 4194304, tc = 17592186044416, C2 = -17592186044416, t8 = `([{"' 	\r
-`, n8 = `)]}"' 	\r
-`, r8 = "The given string contains parts that cannot be parsed as numbers.", i8 = "de.cau.cs.kieler.core.math", JC = -17976931348623157e292, $0 = "de.cau.cs.kieler.core.properties", a8 = { 79: 1, 23: 1 }, o8 = "de.cau.cs.kieler.core.util", s8 = "de.cau.cs.kieler.kiml", Od = "LEFT", Ad = "RIGHT", Y0 = "CENTER", Fs = "de.cau.cs.kieler.kiml.options", ef = "UNDEFINED", Rd = "NONE", u8 = "de.cau.cs.kieler.debugMode", c8 = "de.cau.cs.kieler.randomSeed", Bd = "de.cau.cs.kieler.kiml.util.nodespacing", ex = "de.cau.cs.kieler.kiml.util.labelspacing", l8 = "portRatioOrPosition", f8 = "NodeMarginCalculator", tx = "bottom", h8 = { 286: 1, 121: 1, 3: 1, 5: 1 }, Og = "undefined", x2 = "text", d8 = "stacktrace", Ht = { 34: 1, 3: 1, 8: 1, 5: 1, 6: 1 }, T2 = "properties", L2 = "bendPoints", v8 = "junctionPoints", P2 = "width", D2 = "height", j2 = "padding", zd = "children", Ni = { 38: 1, 39: 1, 42: 1, 51: 1, 71: 1, 3: 1, 8: 1, 5: 1, 6: 1 }, N2 = "de.cau.cs.kieler.klay.gwt.client.layout", g8 = "Invalid boolean format for property '", tf = "' (", nx = "Invalid enum format for property '", rx = "de.cau.cs.kieler.klay.layered", b8 = "Layered layout", ki = 1 / 0, Hr = -1 / 0, Ag = "de.cau.cs.kieler.klay.layered.compaction.components", Hd = "de.cau.cs.kieler.klay.layered.compaction.oned", p8 = " instance has been finished already.", nf = "de.cau.cs.kieler.klay.layered.compaction.oned.algs", qs = "de.cau.cs.kieler.klay.layered.compaction.recthull", uo = { 68: 1 }, xs = "de.cau.cs.kieler.klay.layered.components", ix = { 3: 1, 5: 1, 22: 1, 13: 1, 19: 1, 20: 1, 63: 1 }, w8 = 1.600000023841858, pu = 1e-3, pn = { 31: 1 }, Rg = "de.cau.cs.kieler.klay.layered.compound", Yi = { 38: 1, 39: 1, 47: 1, 42: 1, 3: 1, 8: 1, 5: 1, 6: 1 }, Zr = "de.cau.cs.kieler.klay.layered.graph", m8 = "Port side is undefined", bt = "de.cau.cs.kieler.klay.layered.intermediate", y8 = "Big nodes pre-processing", k8 = 34028234663852886e22, E8 = { 38: 1, 39: 1, 42: 1, 346: 1, 71: 1, 3: 1, 8: 1, 5: 1, 6: 1 }, ax = "Node '", S8 = "' has its layer constraint set to FIRST or FIRST_SEPARATE, but has ", C8 = "at least one incoming edge. Connections between nodes with these ", ox = "layer constraints are not supported.", Zo = 17976931348623157e292, x8 = "Odd port side processing", F0 = { 250: 1, 3: 1, 5: 1 }, nc = 1e-8, Lo = "de.cau.cs.kieler.klay.layered.intermediate.compaction", Da = "de.cau.cs.kieler.klay.layered.intermediate.greedyswitch", Bg = { 227: 1, 3: 1, 5: 1 }, _d = "de.cau.cs.kieler.klay.layered.networksimplex", I2 = "INTERACTIVE", sx = "de.cau.cs.kieler.klay.layered.p1cycles", Xo = { 106: 1, 31: 1 }, q0 = "de.cau.cs.kieler.klay.layered.p2layers", T8 = "NETWORK_SIMPLEX", rc = "de.cau.cs.kieler.klay.layered.p3order", M2 = 5960464477539063e-23, ux = "Port type is undefined", cx = 0.30000001192092896, lx = 0.699999988079071, L8 = 0.8999999761581421, P8 = "de.cau.cs.kieler.klay.layered.p3order.constraints", zg = "de.cau.cs.kieler.klay.layered.p3order.counting", Hg = "de.cau.cs.kieler.klay.layered.p4nodes", D8 = { 625: 1, 3: 1, 5: 1, 6: 1 }, Qo = "de.cau.cs.kieler.klay.layered.p4nodes.bk", rl = "de.cau.cs.kieler.klay.layered.p5edges", il = "de.cau.cs.kieler.klay.layered.p5edges.splines", al = 1e-6, V0 = -1e-6, j8 = "The list of vectors may not be empty.", O2 = 0.09999999999999998, Vs = "de.cau.cs.kieler.klay.layered.properties", ol = "_gwt_modCount", N8 = { 3: 1, 22: 1, 19: 1, 20: 1, 63: 1 }, I8 = { 3: 1, 5: 1, 57: 1 }, M8 = { 3: 1, 5: 1, 22: 1, 19: 1, 50: 1, 18: 1 }, A2 = "delete", R2 = 15525485, fx = 16777216, hx = 16777215, O8 = { 3: 1, 5: 1, 22: 1, 19: 1, 20: 1, 63: 1 }, B2 = { 3: 1, 23: 1, 17: 1, 138: 1 }, w, W0, z2;
-      uK(), A(1, null, {}, d), w.t = function(t) {
-        return this === t;
-      }, w.u = function() {
-        return this.$c;
-      }, w.v = function() {
-        return au(this);
-      }, w.w = function() {
-        return wN(this);
-      }, w.toString = function() {
-        return this.w();
-      }, A(46, 1, BC), w.bc = function() {
-        return this.f;
-      }, w.w = function() {
-        var t, n;
-        return t = a1(this.$c), n = this.bc(), n != null ? t + ": " + n : t;
-      }, A(54, 46, Gs), A(72, 54, Gs, As), A(164, 72, { 164: 1, 3: 1, 54: 1, 46: 1 }, iI), w.bc = function() {
-        return pZ(this), this.c;
-      }, w.cc = function() {
-        return He(this.b) === He(U0) ? null : this.b;
-      };
-      var U0, dx;
-      A(642, 1, {}), A(356, 642, {}, b), w.dc = function(t, n) {
-        var i = {}, s = [];
-        t.__gwt$backingJsError = { fnStack: s };
-        for (var l = arguments.callee.caller; l; ) {
-          var h = (Cd(), l.name || (l.name = tU(l.toString())));
-          s.push(h);
-          var v = ":" + h, p = i[v];
-          if (p) {
-            var m, S;
-            for (m = 0, S = p.length; m < S; m++)
-              if (p[m] === l)
-                return;
-          }
-          (p || (i[v] = [])).push(l), l = l.caller;
-        }
-      }, w.ec = function(t) {
-        var n, i, s, l, h;
-        for (s = (Cd(), h = t.__gwt$backingJsError, h && h.fnStack ? h.fnStack : []), i = s.length, l = ve(JH, Dr, 146, i, 0, 1), n = 0; n < i; n++)
-          l[n] = new ny(s[n], null, -1);
-        return l;
-      }, A(643, 642, {}), w.dc = function(t, n) {
-        function i(l) {
-          if (!("stack" in l))
-            try {
-              throw l;
-            } catch {
-            }
-          return l;
-        }
-        var s;
-        typeof n == "string" ? s = i(new Error(n.replace(`
-`, " "))) : n && typeof n == z0 && "stack" in n ? s = n : s = i(new Error()), t.__gwt$backingJsError = s;
-      }, w.fc = function(t, n, i, s) {
-        return new ny(n, t + "@" + s, i < 0 ? -1 : i);
-      }, w.ec = function(t) {
-        var n, i, s, l, h, v, p;
-        if (l = (Cd(), p = t.__gwt$backingJsError, p && p.stack ? p.stack.split(`
-`) : []), h = ve(JH, Dr, 146, 0, 0, 1), n = 0, s = l.length, s == 0)
-          return h;
-        for (v = NR(this, l[0]), zo(v.d, y2) || (h[n++] = v), i = 1; i < s; i++)
-          h[n++] = NR(this, l[i]);
-        return h;
-      }, A(357, 643, {}, nP), w.fc = function(t, n, i, s) {
-        return new ny(n, t, -1);
-      };
-      var A8, R8, B8;
-      A(181, 54, KR), A(351, 181, KR, UY), A(288, 1, {}, m3), w.Oc = function(t) {
-        var n;
-        return n = new m3(), n.g = 4, t > 1 ? n.c = CN(this, t - 1) : n.c = this, n;
-      }, w.Pc = function() {
-        return Al(this), this.b;
-      }, w.Qc = function() {
-        return a1(this);
-      }, w.Rc = function() {
-        return iD(this);
-      }, w.Sc = function() {
-        return (this.g & 4) != 0;
-      }, w.Tc = function() {
-        return (this.g & 1) != 0;
-      }, w.w = function() {
-        return (this.g & 2 ? "interface " : this.g & 1 ? "" : "class ") + (Al(this), this.n);
-      }, w.g = 0, A(119, 72, { 3: 1, 119: 1, 54: 1, 46: 1 }, v7), A(29, 72, ZR, ed, tn), A(95, 72, Gs, G5, Ho), A(231, 1, { 3: 1, 231: 1 });
-      var vx;
-      A(24, 231, { 3: 1, 23: 1, 24: 1, 231: 1 }, D5), w.F = function(t) {
-        return IF(this, f(t, 24));
-      }, w.t = function(t) {
-        return xe(t, 24) && f(t, 24).a == this.a;
-      }, w.v = function() {
-        return this.a;
-      }, w.w = function() {
-        return o1(this.a);
-      }, w.a = 0, B8 = { 3: 1, 345: 1, 23: 1, 2: 1 }, A(350, 1, jr, Kh), w.$b = function(t, n) {
-        return oW(qf(t), qf(n));
-      }, A(257, 95, Gs, lF), A(145, 1, { 23: 1, 145: 1 }), w.F = function(t) {
-        return NF(this, f(t, 145));
-      }, w.t = function(t) {
-        var n;
-        return t === this ? !0 : xe(t, 145) ? (n = f(t, 145), zo(this.a, n.a)) : !1;
-      }, w.v = function() {
-        return Wy(this.a);
-      }, w.w = function() {
-        return this.a;
-      }, A(358, 29, ZR, Bq), A(256, 29, { 3: 1, 54: 1, 29: 1, 46: 1, 256: 1 }, Rq), A(185, 145, HC), A(289, 185, HC, fF), w.Zc = function(t, n, i) {
-        var s, l;
-        for (s = ve(o_, mi, 26, i, 12, 1), l = 0; l < i; ++l)
-          s[l] = t[n + l] & 255 & Cs;
-        return s;
-      }, A(355, 185, HC, jF), w.Zc = function(t, n, i) {
-        var s, l, h, v, p, m, S, x;
-        for (h = 0, S = 0; S < i; ) {
-          if (++h, l = t[n + S], (l & 192) == 128)
-            throw new tn(_C);
-          if (!(l & 128))
-            ++S;
-          else if ((l & 224) == 192)
-            S += 2;
-          else if ((l & 240) == 224)
-            S += 3;
-          else if ((l & 248) == 240)
-            S += 4;
-          else
-            throw new tn(_C);
-          if (S > i)
-            throw new Ho(_C);
-        }
-        for (v = ve(o_, mi, 26, h, 12, 1), x = 0, p = 0, m = 0; m < i; ) {
-          for (l = t[n + m++], l & 128 ? (l & 224) == 192 ? (p = 2, l &= 31) : (l & 240) == 224 ? (p = 3, l &= 15) : (l & 248) == 240 ? (p = 4, l &= 7) : (l & 252) == 248 && (p = 5, l &= 3) : (p = 1, l &= 127); --p > 0; ) {
-            if (s = t[n + m++], (s & 192) != 128)
-              throw new tn("Invalid UTF8 sequence at " + (n + m - 1) + ", byte=" + (s >>> 0).toString(16));
-            l = l << 6 | s & 63;
-          }
-          x += _K(l, v, x);
-        }
-        return v;
-      };
-      var Ze = G(zr, "Object", 1), Uee = G(zr, "Throwable", 46);
-      G(zr, "Exception", 54), G(zr, "RuntimeException", 72), G(GC, "JavaScriptException", 164), G(H0, "StackTraceCreator/Collector", 642), G(H0, "StackTraceCreator/CollectorLegacy", 356), G(H0, "StackTraceCreator/CollectorModern", 643), G(H0, "StackTraceCreator/CollectorModernNoSourceMap", 357), G(_0, "IOException", 181), G(_0, "UnsupportedEncodingException", 351), G(zr, "Class", 288), G(zr, "ClassCastException", 119), G(zr, "IllegalArgumentException", 29), G(zr, "IndexOutOfBoundsException", 95), G(zr, "Number", 231);
-      var H2 = G(zr, "Integer", 24), _2 = G(zr, "String", 2);
-      G(zr, "String/1", 350), G(zr, "StringIndexOutOfBoundsException", 257), G($C, "Charset", 145), G($C, "IllegalCharsetNameException", 358), G($C, "UnsupportedCharsetException", 256), G(YC, "EmulatedCharset", 185), G(YC, "EmulatedCharset/LatinCharset", 289), G(YC, "EmulatedCharset/UtfCharset", 355), A(669, 1, { 3: 1 }), G(To, "Optional", 669), A(601, 669, { 3: 1 }, g), w.t = function(t) {
-        return t === this;
-      }, w.v = function() {
-        return 2040732332;
-      }, w.w = function() {
-        return "Optional.absent()";
-      }, w.A = function(t) {
-        return vt(t), Pv(), G2;
-      };
-      var G2;
-      G(To, "Absent", 601);
-      var Kee = B1(To, "Function");
-      A(208, 1, {}, n1), w.C = function(t) {
-        return Wj(t);
-      }, G(To, "Joiner", 208), A(363, 208, {}, kj), w.C = function(t) {
-        return C1(this, t);
-      }, G(To, "Joiner/1", 363), A(362, 1, {}, G9), G(To, "Joiner/MapJoiner", 362);
-      var Zee = B1(To, "Predicate"), z8;
-      A(244, 1, { 68: 1, 244: 1, 3: 1 }, pP), w.D = function(t) {
-        var n;
-        for (n = 0; n < this.a.a.length; n++)
-          if (!f(Oj(this.a, n), 68).D(t))
-            return !1;
-        return !0;
-      }, w.t = function(t) {
-        var n;
-        return xe(t, 244) ? (n = f(t, 244), mA(this.a, n.a)) : !1;
-      }, w.v = function() {
-        return EM(this.a) + 306654252;
-      }, w.w = function() {
-        return "Predicates.and(" + MS((d1(), z8), new Pf(this.a)) + ")";
-      }, G(To, "Predicates/AndPredicate", 244), A(246, 1, { 68: 1, 246: 1, 3: 1 }, bD), w.D = function(t) {
-        try {
-          return this.a.kb(t);
-        } catch (n) {
-          if (n = Ur(n), xe(n, 76))
-            return !1;
-          if (xe(n, 119))
-            return !1;
-          throw Kr(n);
-        }
-      }, w.t = function(t) {
-        var n;
-        return xe(t, 246) ? (n = f(t, 246), this.a.t(n.a)) : !1;
-      }, w.v = function() {
-        return this.a.v();
-      }, w.w = function() {
-        return "Predicates.in(" + this.a + ")";
-      }, G(To, "Predicates/InPredicate", 246), A(245, 1, { 68: 1, 245: 1, 3: 1 }, wP), w.D = function(t) {
-        return xo(this.a, t);
-      }, w.t = function(t) {
-        var n;
-        return xe(t, 245) ? (n = f(t, 245), xo(this.a, n.a)) : !1;
-      }, w.v = function() {
-        return Uo(this.a);
-      }, w.w = function() {
-        return "Predicates.equalTo(" + this.a + ")";
-      }, G(To, "Predicates/IsEqualToPredicate", 245), A(17, 1, { 3: 1, 23: 1, 17: 1 }), w.F = function(t) {
-        return XY(this, f(t, 17));
-      }, w.t = function(t) {
-        return this === t;
-      }, w.v = function() {
-        return au(this);
-      }, w.w = function() {
-        return P1(this);
-      }, w.e = 0;
-      var an = G(zr, "Enum", 17);
-      A(136, 17, G0);
-      var H8, _8, gx, G8, K0 = At(To, "Predicates/ObjectPredicate", 136, an, PV);
-      A(591, 136, G0, rj), w.D = function(t) {
-        return !0;
-      }, w.w = function() {
-        return "Predicates.alwaysTrue()";
-      }, At(To, "Predicates/ObjectPredicate/1", 591, K0, null), A(592, 136, G0, ij), w.D = function(t) {
-        return !1;
-      }, w.w = function() {
-        return "Predicates.alwaysFalse()";
-      }, At(To, "Predicates/ObjectPredicate/2", 592, K0, null), A(593, 136, G0, E9), w.D = function(t) {
-        return t == null;
-      }, w.w = function() {
-        return "Predicates.isNull()";
-      }, At(To, "Predicates/ObjectPredicate/3", 593, K0, null), A(594, 136, G0, N9), w.D = function(t) {
-        return t != null;
-      }, w.w = function() {
-        return "Predicates.notNull()";
-      }, At(To, "Predicates/ObjectPredicate/4", 594, K0, null), A(177, 669, { 177: 1, 3: 1 }, Kb), w.t = function(t) {
-        var n;
-        return xe(t, 177) ? (n = f(t, 177), xo(this.a, n.a)) : !1;
-      }, w.v = function() {
-        return 1502476572 + Uo(this.a);
-      }, w.w = function() {
-        return "Optional.of(" + this.a + ")";
-      }, w.A = function(t) {
-        return new Kb(oy(t.B(this.a), "the Function passed to Optional.transform() must not return null."));
-      }, G(To, "Present", 177), A(108, 1, Id), w.I = function() {
-        RY();
-      }, G(Re, "UnmodifiableIterator", 108), A(651, 108, E2), w.J = function(t) {
-        throw new Fn();
-      }, w.O = function(t) {
-        throw new Fn();
-      }, G(Re, "UnmodifiableListIterator", 651), A(378, 651, E2), w.G = function() {
-        return this.b < this.c;
-      }, w.K = function() {
-        return this.b > 0;
-      }, w.H = function() {
-        if (this.b >= this.c)
-          throw new sa();
-        return aD(this, this.b++);
-      }, w.L = function() {
-        return this.b;
-      }, w.M = function() {
-        if (this.b <= 0)
-          throw new sa();
-        return aD(this, --this.b);
-      }, w.N = function() {
-        return this.b - 1;
-      }, w.b = 0, w.c = 0, G(Re, "AbstractIndexedListIterator", 378), A(428, 108, Id), w.G = function() {
-        return qu(this);
-      }, w.H = function() {
-        return ql(this);
-      }, w.d = 1, G(Re, "AbstractIterator", 428), A(653, 1, { 144: 1 }), w.P = function() {
-        var t;
-        return t = this.f, t || (this.f = this.S());
-      }, w.T = function() {
-        return new Uw(this.P());
-      }, w.t = function(t) {
-        return w3(this, t);
-      }, w.v = function() {
-        return this.P().v();
-      }, w.V = function() {
-        return this.Y() == 0;
-      }, w.W = function() {
-        return qm(this);
-      }, w.w = function() {
-        return this.P().w();
-      }, G(Re, "AbstractMultimap", 653), A(294, 653, Ng), w.Q = function() {
-        M3(this);
-      }, w.R = function(t) {
-        return Qf(this.b, t);
-      }, w.S = function() {
-        return new Kw(this, this.b);
-      }, w.T = function() {
-        return new A9(this, this.b);
-      }, w.$ = function() {
-        return mK(this.Z());
-      }, w.U = function(t) {
-        return Pa(this, t);
-      }, w.X = function(t) {
-        return o2(this, t);
-      }, w.Y = function() {
-        return this.c;
-      }, w.c = 0, G(Re, "AbstractMapBasedMultimap", 294), A(600, 294, Ng), w.Z = function() {
-        return new ji(this.a);
-      }, w.$ = function() {
-        return dr(), dr(), _g;
-      }, w.U = function(t) {
-        return f(Pa(this, t), 20);
-      }, w.X = function(t) {
-        return f(o2(this, t), 20);
-      }, w.P = function() {
-        var t;
-        return t = this.f, t || (this.f = new Kw(this, this.b));
-      }, w.t = function(t) {
-        return w3(this, t);
-      }, G(Re, "AbstractListMultimap", 600), A(388, 1, ir), w.G = function() {
-        return this.b.b || this.d.G();
-      }, w.H = function() {
-        var t;
-        return this.d.G() || (t = Sd(this.b), t.yb(), this.a = f(t.zb(), 19), this.d = this.a.mb()), this.d.H();
-      }, w.I = function() {
-        this.d.I(), this.a.V() && q4(this.b), --this.c.c;
-      }, G(Re, "AbstractMapBasedMultimap/Itr", 388), A(389, 388, ir, $I), G(Re, "AbstractMapBasedMultimap/1", 389), A(638, 1, fh), w.Q = function() {
-        this.bb().Q();
-      }, w._ = function(t) {
-        return Zy(this, t);
-      }, w.R = function(t) {
-        return !!V3(this, t, !1);
-      }, w.ab = function(t) {
-        var n, i, s;
-        for (i = this.bb().mb(); i.G(); )
-          if (n = f(i.H(), 21), s = n.zb(), He(t) === He(s) || t != null && xo(t, s))
-            return !0;
-        return !1;
-      }, w.t = function(t) {
-        return ZO(this, t);
-      }, w.cb = function(t) {
-        return ci(V3(this, t, !1));
-      }, w.v = function() {
-        return v3(this.bb());
-      }, w.V = function() {
-        return this.Y() == 0;
-      }, w.W = function() {
-        return new Wt(this);
-      }, w.db = function(t, n) {
-        throw new jf("Put not supported on this map");
-      }, w.eb = function(t) {
-        return ci(V3(this, t, !0));
-      }, w.Y = function() {
-        return this.bb().Y();
-      }, w.w = function() {
-        return $O(this);
-      }, w.fb = function() {
-        return new Ev(this);
-      }, G(wt, "AbstractMap", 638), A(654, 638, fh), w.bb = function() {
-        return f4(this);
-      }, w.W = function() {
-        var t;
-        return t = this.d, t || (this.d = new Uw(this));
-      }, w.fb = function() {
-        return Zj(this);
-      }, G(Re, "Maps/ViewCachingAbstractMap", 654), A(262, 654, fh, Kw), w.cb = function(t) {
-        return RW(this, t);
-      }, w.eb = function(t) {
-        return LU(this, t);
-      }, w.Q = function() {
-        this.a == this.b.b ? M3(this.b) : $1(new j4(this));
-      }, w.R = function(t) {
-        return bO(this.a, t);
-      }, w.hb = function() {
-        return new mP(this);
-      }, w.gb = function() {
-        return this.hb();
-      }, w.t = function(t) {
-        return this === t || ZO(this.a, t);
-      }, w.v = function() {
-        return v3(new iu(this.a));
-      }, w.W = function() {
-        return qm(this.b);
-      }, w.Y = function() {
-        return h1(this.a);
-      }, w.w = function() {
-        return $O(this.a);
-      }, G(Re, "AbstractMapBasedMultimap/AsMap", 262), A(640, 1, Md), w.ib = function(t) {
-        return nW();
-      }, w.jb = function(t) {
-        return na(this, t);
-      }, w.Q = function() {
-        q1(this);
-      }, w.kb = function(t) {
-        return hg(this, t, !1);
-      }, w.lb = function(t) {
-        return Wu(this, t);
-      }, w.V = function() {
-        return this.Y() == 0;
-      }, w.nb = function(t) {
-        return hg(this, t, !0);
-      }, w.ob = function() {
-        return this.pb(ve(Ze, Me, 1, this.Y(), 4, 1));
-      }, w.pb = function(t) {
-        return Ky(this, t);
-      }, w.w = function() {
-        return Qu(this);
-      }, G(wt, "AbstractCollection", 640), A(641, 640, di), w.t = function(t) {
-        return JM(this, t);
-      }, w.v = function() {
-        return v3(this);
-      }, G(wt, "AbstractSet", 641), A(649, 641, di), G(Re, "Sets/ImprovedAbstractSet", 649), A(655, 649, di), w.Q = function() {
-        this.qb().Q();
-      }, w.kb = function(t) {
-        return nO(this, t);
-      }, w.V = function() {
-        return this.qb().V();
-      }, w.nb = function(t) {
-        var n;
-        return this.kb(t) ? (n = f(t, 21), this.qb().W().nb(n.yb())) : !1;
-      }, w.Y = function() {
-        return this.qb().Y();
-      }, G(Re, "Maps/EntrySet", 655), A(387, 655, di, mP), w.kb = function(t) {
-        return pO(new iu(this.a.a), t);
-      }, w.mb = function() {
-        return new j4(this.a);
-      }, w.qb = function() {
-        return this.a;
-      }, w.nb = function(t) {
-        var n;
-        return pO(new iu(this.a.a), t) ? (n = f(t, 21), dW(this.a.b, n.yb()), !0) : !1;
-      }, G(Re, "AbstractMapBasedMultimap/AsMap/AsMapEntries", 387), A(299, 1, ir, j4), w.H = function() {
-        var t;
-        return t = Sd(this.b), this.a = f(t.zb(), 19), MW(this.c, t);
-      }, w.G = function() {
-        return this.b.b;
-      }, w.I = function() {
-        q4(this.b), this.c.b.c -= this.a.Y(), this.a.Q();
-      }, G(Re, "AbstractMapBasedMultimap/AsMap/AsMapIterator", 299), A(260, 649, di, Uw), w.Q = function() {
-        this.b.Q();
-      }, w.kb = function(t) {
-        return this.b.R(t);
-      }, w.V = function() {
-        return this.b.V();
-      }, w.mb = function() {
-        return On(), Am(this.b.bb().mb(), (k1(), $2));
-      }, w.nb = function(t) {
-        return this.b.R(t) ? (this.b.eb(t), !0) : !1;
-      }, w.Y = function() {
-        return this.b.Y();
-      }, G(Re, "Maps/KeySet", 260), A(386, 260, di, A9), w.Q = function() {
-        var t;
-        $1((t = this.b.bb().mb(), new sS(this, t)));
-      }, w.lb = function(t) {
-        return this.b.W().lb(t);
-      }, w.t = function(t) {
-        return this === t || this.b.W().t(t);
-      }, w.v = function() {
-        return this.b.W().v();
-      }, w.mb = function() {
-        var t;
-        return t = this.b.bb().mb(), new sS(this, t);
-      }, w.nb = function(t) {
-        var n, i;
-        return i = 0, n = f(this.b.eb(t), 19), n && (i = n.Y(), n.Q(), this.a.c -= i), i > 0;
-      }, G(Re, "AbstractMapBasedMultimap/KeySet", 386), A(300, 1, ir, sS), w.G = function() {
-        return this.c.G();
-      }, w.H = function() {
-        return this.a = f(this.c.H(), 21), this.a.yb();
-      }, w.I = function() {
-        var t;
-        Wl(!!this.a), t = f(this.a.zb(), 19), this.c.I(), this.b.a.c -= t.Y(), t.Q();
-      }, G(Re, "AbstractMapBasedMultimap/KeySet/1", 300), A(216, 640, Md, ig), w.ib = function(t) {
-        return $W(this, t);
-      }, w.jb = function(t) {
-        return FU(this, t);
-      }, w.Q = function() {
-        qV(this);
-      }, w.kb = function(t) {
-        return La(this), this.d.kb(t);
-      }, w.lb = function(t) {
-        return La(this), this.d.lb(t);
-      }, w.t = function(t) {
-        return oV(this, t);
-      }, w.v = function() {
-        return La(this), this.d.v();
-      }, w.mb = function() {
-        return La(this), new t4(this);
-      }, w.nb = function(t) {
-        return iW(this, t);
-      }, w.Y = function() {
-        return La(this), this.d.Y();
-      }, w.w = function() {
-        return La(this), ha(this.d);
-      }, G(Re, "AbstractMapBasedMultimap/WrappedCollection", 216);
-      var Xee = B1(wt, "List");
-      A(297, 216, hh, d4), w.rb = function(t, n) {
-        var i;
-        La(this), i = this.d.V(), f(this.d, 20).rb(t, n), ++this.a.c, i && I1(this);
-      }, w.sb = function(t) {
-        return La(this), f(this.d, 20).sb(t);
-      }, w.tb = function() {
-        return La(this), new m9(this);
-      }, w.ub = function(t) {
-        return La(this), new cN(this, t);
-      }, w.vb = function(t) {
-        var n;
-        return La(this), n = f(this.d, 20).vb(t), --this.a.c, Y1(this), n;
-      }, w.wb = function(t, n) {
-        return La(this), f(this.d, 20).wb(t, n);
-      }, w.xb = function(t, n) {
-        return La(this), R4(this.a, this.e, f(this.d, 20).xb(t, n), this.b ? this.b : this);
-      }, G(Re, "AbstractMapBasedMultimap/WrappedList", 297), A(385, 297, S2, Z9), G(Re, "AbstractMapBasedMultimap/RandomAccessWrappedList", 385), A(189, 1, ir, t4), w.G = function() {
-        return Wf(this), this.b.G();
-      }, w.H = function() {
-        return Wf(this), this.b.H();
-      }, w.I = function() {
-        this.b.I(), --this.d.f.c, Y1(this.d);
-      }, G(Re, "AbstractMapBasedMultimap/WrappedCollection/WrappedIterator", 189), A(298, 189, dh, m9, cN), w.J = function(t) {
-        var n;
-        n = TF(this.a) == 0, (Wf(this), f(this.b, 96)).J(t), ++this.a.a.c, n && I1(this.a);
-      }, w.K = function() {
-        return (Wf(this), f(this.b, 96)).K();
-      }, w.L = function() {
-        return (Wf(this), f(this.b, 96)).L();
-      }, w.M = function() {
-        return (Wf(this), f(this.b, 96)).M();
-      }, w.N = function() {
-        return (Wf(this), f(this.b, 96)).N();
-      }, w.O = function(t) {
-        (Wf(this), f(this.b, 96)).O(t);
-      }, G(Re, "AbstractMapBasedMultimap/WrappedList/WrappedListIterator", 298), A(295, 216, di, GS), G(Re, "AbstractMapBasedMultimap/WrappedSet", 295), A(296, 216, FC, $S), G(Re, "AbstractMapBasedMultimap/WrappedSortedSet", 296), A(668, 1, Ig), w.t = function(t) {
-        var n;
-        return xe(t, 21) ? (n = f(t, 21), Gl(this.yb(), n.yb()) && Gl(this.zb(), n.zb())) : !1;
-      }, w.v = function() {
-        var t, n;
-        return t = this.yb(), n = this.zb(), (t == null ? 0 : Uo(t)) ^ (n == null ? 0 : Uo(n));
-      }, w.Ab = function(t) {
-        throw new Fn();
-      }, w.w = function() {
-        return this.yb() + "=" + this.zb();
-      }, G(Re, e8, 668), A(390, 640, Md, yP), w.Q = function() {
-        M3(this.a);
-      }, w.kb = function(t) {
-        return AU(this.a, t);
-      }, w.mb = function() {
-        return new $I(this.a);
-      }, w.Y = function() {
-        return this.a.c;
-      }, G(Re, "AbstractMultimap/Values", 390), A(656, 640, qC), w.ib = function(t) {
-        return this.Bb(t, 1), !0;
-      }, w.Bb = function(t, n) {
-        throw new Fn();
-      }, w.jb = function(t) {
-        return dZ(this, t);
-      }, w.Q = function() {
-        $1(this.Eb());
-      }, w.kb = function(t) {
-        return this.Cb(t) > 0;
-      }, w.Cb = function(t) {
-        var n, i;
-        for (i = Uf(this).mb(); i.G(); )
-          if (n = f(i.H(), 83), Gl(n.Zb(), t))
-            return n.Yb();
-        return 0;
-      }, w.gb = function() {
-        return new kP(this);
-      }, w.bb = function() {
-        return Uf(this);
-      }, w.t = function(t) {
-        return tX(this, t);
-      }, w.v = function() {
-        return Uf(this).v();
-      }, w.V = function() {
-        return Uf(this).V();
-      }, w.mb = function() {
-        return Df(), new SD(this, Uf(this).mb());
-      }, w.nb = function(t) {
-        return this.Fb(t, 1) > 0;
-      }, w.Fb = function(t, n) {
-        throw new Fn();
-      }, w.Gb = function(t, n) {
-        var i, s;
-        return Df(), fi(n, "count"), i = this.Cb(t), s = n - i, s > 0 ? this.Bb(t, s) : s < 0 && this.Fb(t, -s), i;
-      }, w.Hb = function(t, n, i) {
-        return zU(this, t, n, i);
-      }, w.Y = function() {
-        return yU(this);
-      }, w.w = function() {
-        return ha(Uf(this));
-      }, G(Re, "AbstractMultiset", 656), A(657, 649, di), w.Q = function() {
-        this.Ib().Q();
-      }, w.kb = function(t) {
-        var n, i;
-        return xe(t, 83) ? (i = f(t, 83), i.Yb() <= 0 ? !1 : (n = this.Ib().Cb(i.Zb()), n == i.Yb())) : !1;
-      }, w.nb = function(t) {
-        var n, i, s, l;
-        return xe(t, 83) && (i = f(t, 83), n = i.Zb(), s = i.Yb(), s != 0) ? (l = this.Ib(), l.Hb(n, s, 0)) : !1;
-      }, G(Re, "Multisets/EntrySet", 657), A(396, 657, di, kP), w.mb = function() {
-        return this.a.Eb();
-      }, w.Ib = function() {
-        return this.a;
-      }, w.Y = function() {
-        return this.a.Db();
-      }, G(Re, "AbstractMultiset/EntrySet", 396), A(384, 294, Ng), w.Z = function() {
-        return new Ww(Ty(this.a));
-      }, w.$ = function() {
-        return Ea(), Kf(), Gd;
-      }, w.U = function(t) {
-        return f(Pa(this, t), 18);
-      }, w.X = function(t) {
-        return f(o2(this, t), 18);
-      }, w.P = function() {
-        var t;
-        return t = this.f, t || (this.f = new Kw(this, this.b));
-      }, w.t = function(t) {
-        return w3(this, t);
-      }, G(Re, "AbstractSetMultimap", 384), A(342, 656, qC), G(Re, "AbstractSortedMultiset", 342), A(280, 600, Ng, Im), w.a = 0, G(Re, "ArrayListMultimap", 280), A(159, 17, VC);
-      var Z0, Wa, bx = At(Re, "BoundType", 159, an, $q);
-      A(623, 159, VC, i9), At(Re, "BoundType/1", 623, bx, null), A(624, 159, VC, g9), At(Re, "BoundType/2", 624, bx, null);
-      var px;
-      A(234, 1, Ju), w.w = function() {
-        return tW(this.c.mb());
-      }, G(Re, "FluentIterable", 234), A(170, 234, Ju, Gf), w.mb = function() {
-        return Dt(this);
-      }, G(Re, "FluentIterable/2", 170), A(664, 1, {}), w.w = function() {
-        return ha(xa(this.a.d).b);
-      }, G(Re, "ForwardingObject", 664), A(665, 664, Md), w.ib = function(t) {
-        return xa(this.a.d), w7();
-      }, w.jb = function(t) {
-        return xa(this.a.d), m7();
-      }, w.Q = function() {
-        xa(this.a.d), y7();
-      }, w.kb = function(t) {
-        return bS(xa(this.a.d), t);
-      }, w.lb = function(t) {
-        return AD(xa(this.a.d), t);
-      }, w.V = function() {
-        return xa(this.a.d).b.V();
-      }, w.mb = function() {
-        var t;
-        return t = xa(this.a.d).b.mb(), new M5(t);
-      }, w.nb = function(t) {
-        return xa(this.a.d), k7();
-      }, w.Y = function() {
-        return xa(this.a.d).b.Y();
-      }, w.ob = function() {
-        return dN(xa(this.a.d));
-      }, w.pb = function(t) {
-        return L4(xa(this.a.d), t);
-      }, G(Re, "ForwardingCollection", 665), A(660, 640, UC), w.mb = function() {
-        return this.Kb();
-      }, w.ib = function(t) {
-        return IY();
-      }, w.jb = function(t) {
-        return MY();
-      }, w.Q = function() {
-        OY();
-      }, w.kb = function(t) {
-        return t != null && hg(this, t, !1);
-      }, w.Jb = function() {
-        switch (this.Y()) {
-          case 0:
-            return dr(), dr(), _g;
-          case 1:
-            return dr(), new cu(this.Kb().H());
-          default:
-            return new Fj(this, this.ob());
-        }
-      }, w.nb = function(t) {
-        return AY();
-      }, G(Re, "ImmutableCollection", 660), A(316, 660, UC, K5), w.mb = function() {
-        return Ed(this.a.mb());
-      }, w.kb = function(t) {
-        return t != null && this.a.kb(t);
-      }, w.lb = function(t) {
-        return this.a.lb(t);
-      }, w.V = function() {
-        return this.a.V();
-      }, w.Kb = function() {
-        return Ed(this.a.mb());
-      }, w.Y = function() {
-        return this.a.Y();
-      }, w.ob = function() {
-        return this.a.ob();
-      }, w.pb = function(t) {
-        return this.a.pb(t);
-      }, w.w = function() {
-        return ha(this.a);
-      }, G(Re, "ForwardingImmutableCollection", 316), A(87, 660, vh), w.mb = function() {
-        return this.Kb();
-      }, w.tb = function() {
-        return this.Lb(0);
-      }, w.ub = function(t) {
-        return this.Lb(t);
-      }, w.xb = function(t, n) {
-        return this.Mb(t, n);
-      }, w.rb = function(t, n) {
-        throw new Fn();
-      }, w.t = function(t) {
-        return sX(this, t);
-      }, w.v = function() {
-        return vU(this);
-      }, w.Kb = function() {
-        return this.Lb(0);
-      }, w.Lb = function(t) {
-        return OS(this, t);
-      }, w.vb = function(t) {
-        throw new Fn();
-      }, w.wb = function(t, n) {
-        throw new Fn();
-      }, w.Mb = function(t, n) {
-        var i;
-        return h0((i = new LD(this), new uy(i, t, n)));
-      };
-      var _g;
-      G(Re, "ImmutableList", 87), A(667, 87, vh), w.mb = function() {
-        return Ed(this.Nb().mb());
-      }, w.xb = function(t, n) {
-        return h0(this.Nb().xb(t, n));
-      }, w.kb = function(t) {
-        return oj(this, t);
-      }, w.lb = function(t) {
-        return this.Nb().lb(t);
-      }, w.t = function(t) {
-        return this.Nb().t(t);
-      }, w.sb = function(t) {
-        return JD(this, t);
-      }, w.v = function() {
-        return this.Nb().v();
-      }, w.V = function() {
-        return this.Nb().V();
-      }, w.Kb = function() {
-        return Ed(this.Nb().mb());
-      }, w.Y = function() {
-        return this.Nb().Y();
-      }, w.Mb = function(t, n) {
-        return h0(this.Nb().xb(t, n));
-      }, w.ob = function() {
-        return this.Nb().pb(ve(Ze, Me, 1, this.Nb().Y(), 4, 1));
-      }, w.pb = function(t) {
-        return this.Nb().pb(t);
-      }, w.w = function() {
-        return ha(this.Nb());
-      }, G(Re, "ForwardingImmutableList", 667), A(524, 1, gh), w.bb = function() {
-        return Bc(this);
-      }, w.W = function() {
-        return Gj(this);
-      }, w.fb = function() {
-        return this.Rb();
-      }, w.Q = function() {
-        throw new Fn();
-      }, w.R = function(t) {
-        return this.cb(t) != null;
-      }, w.ab = function(t) {
-        return this.Rb().kb(t);
-      }, w.Pb = function() {
-        return new T7(this);
-      }, w.Qb = function() {
-        return new L7(this);
-      }, w.t = function(t) {
-        return BU(this, t);
-      }, w.v = function() {
-        return Bc(this).v();
-      }, w.V = function() {
-        return this.Y() == 0;
-      }, w.db = function(t, n) {
-        return BY();
-      }, w.eb = function(t) {
-        throw new Fn();
-      }, w.w = function() {
-        var t;
-        return On(), t = pd(zW(this.Y()), 123), qU(Y8, t, Bc(this).mb()), t.a += "}", t.a;
-      }, w.Rb = function() {
-        return this.g ? this.g : this.g = this.Qb();
-      }, w.e = null, w.f = null, w.g = null, G(Re, "ImmutableMap", 524), A(320, 524, gh), w.R = function(t) {
-        return bO(this.d, t);
-      }, w.ab = function(t) {
-        return OD(this.d, t);
-      }, w.Ob = function() {
-        return S3(new EP(this));
-      }, w.Pb = function() {
-        return S3(rN(this.d));
-      }, w.Qb = function() {
-        return Ea(), new K5(aN(this.d));
-      }, w.t = function(t) {
-        return dD(this.d, t);
-      }, w.cb = function(t) {
-        return t == null ? null : vg(this.d, t);
-      }, w.v = function() {
-        return this.d.c.v();
-      }, w.V = function() {
-        return this.d.c.V();
-      }, w.Y = function() {
-        return this.d.c.Y();
-      }, w.w = function() {
-        return ha(this.d.c);
-      }, G(Re, "ForwardingImmutableMap", 320), A(666, 665, di), w.t = function(t) {
-        return t === this || hD(xa(this.a.d), t);
-      }, w.v = function() {
-        return xa(this.a.d).b.v();
-      }, G(Re, "ForwardingSet", 666), A(523, 666, di, EP), w.kb = function(t) {
-        if (xe(t, 21) && f(t, 21).yb() == null)
-          return !1;
-        try {
-          return bS(xa(this.a.d), t);
-        } catch (n) {
-          if (n = Ur(n), xe(n, 119))
-            return !1;
-          throw Kr(n);
-        }
-      }, w.pb = function(t) {
-        var n;
-        return n = L4(xa(this.a.d), t), xa(this.a.d).b.Y() < n.length && Ga(n, xa(this.a.d).b.Y(), null), n;
-      }, G(Re, "ForwardingImmutableMap/1", 523), A(663, 660, bh), w.mb = function() {
-        return this.Kb();
-      }, w.t = function(t) {
-        return rA(this, t);
-      }, w.v = function() {
-        return aU(this);
-      }, G(Re, "ImmutableSet", 663), A(315, 663, bh), w.mb = function() {
-        return Ed(new Qh(this.a.b.mb()));
-      }, w.kb = function(t) {
-        return t != null && kF(this.a, t);
-      }, w.lb = function(t) {
-        return EF(this.a, t);
-      }, w.v = function() {
-        return this.a.b.v();
-      }, w.V = function() {
-        return this.a.b.V();
-      }, w.Kb = function() {
-        return Ed(new Qh(this.a.b.mb()));
-      }, w.Y = function() {
-        return this.a.b.Y();
-      }, w.ob = function() {
-        return this.a.b.ob();
-      }, w.pb = function(t) {
-        return SF(this.a, t);
-      }, w.w = function() {
-        return ha(this.a.b);
-      }, G(Re, "ForwardingImmutableSet", 315), A(178, 1, { 178: 1, 3: 1 }, j0), w.t = function(t) {
-        var n;
-        return xe(t, 178) ? (n = f(t, 178), this.a.t(n.a) && this.b == n.b && this.c == n.c && this.d == n.d && this.f == n.f && Gl(this.e, n.e) && Gl(this.g, n.g)) : !1;
-      }, w.v = function() {
-        return Ny(re(ie(Ze, 1), Me, 1, 4, [this.a, this.e, this.d, this.g, this.f]));
-      }, w.w = function() {
-        return pd(Hu(pd(Hu(pd(io(Hu(new ad(), this.a), ":"), this.d == (yo(), Z0) ? 91 : 40), this.b ? this.e : "-∞"), 44), this.c ? this.g : "∞"), this.f == Z0 ? 93 : 41).a;
-      }, w.b = !1, w.c = !1, G(Re, "GeneralRange", 178), A(215, 384, Ng, Rv), w.a = 2, G(Re, "HashMultimap", 215), A(661, 87, vh), w.kb = function(t) {
-        return this.Sb().kb(t);
-      }, w.V = function() {
-        return this.Sb().V();
-      }, w.Y = function() {
-        return this.Sb().Y();
-      }, G(Re, "ImmutableAsList", 661), A(275, 320, gh), w.Rb = function() {
-        return this.Ub();
-      }, w.fb = function() {
-        return this.Ub();
-      }, w.Ub = function() {
-        return Gj(this.Tb());
-      }, G(Re, "ImmutableBiMap", 275), A(341, 668, { 3: 1, 21: 1 }, uS), w.yb = function() {
-        return this.a;
-      }, w.zb = function() {
-        return this.b;
-      }, w.Ab = function(t) {
-        throw new Fn();
-      }, G(Re, "ImmutableEntry", 341), A(436, 315, bh, O7), G(Re, "ImmutableEnumSet", 436), A(379, 378, E2, Kj), G(Re, "ImmutableList/1", 379), A(266, 108, Id, Pw), w.G = function() {
-        return this.a.G();
-      }, w.H = function() {
-        return f(this.a.H(), 21).yb();
-      }, G(Re, "ImmutableMap/1", 266), A(670, 663, bh), w.mb = function() {
-        var t;
-        return t = Bc(this.a).Kb(), new Pw(t);
-      }, w.Jb = function() {
-        return new U5(this);
-      }, w.Kb = function() {
-        var t;
-        return (t = this.c, t || (this.c = new U5(this))).Kb();
-      }, G(Re, "ImmutableSet/Indexed", 670), A(606, 670, bh, T7), w.mb = function() {
-        var t;
-        return t = Bc(this.a).Kb(), new Pw(t);
-      }, w.kb = function(t) {
-        return this.a.R(t);
-      }, w.Kb = function() {
-        var t;
-        return t = Bc(this.a).Kb(), new Pw(t);
-      }, w.Y = function() {
-        return this.a.Y();
-      }, G(Re, "ImmutableMapKeySet", 606), A(604, 660, UC, L7), w.mb = function() {
-        return new Hm(this);
-      }, w.kb = function(t) {
-        return t != null && (_n(), _n(), SM(new Hm(this), (d1(), t == null ? (S4(), gx) : new wP(t))) != -1);
-      }, w.Jb = function() {
-        var t;
-        return t = _j(Bc(this.a)), new x9(this, t);
-      }, w.Kb = function() {
-        return new Hm(this);
-      }, w.Y = function() {
-        return this.a.Y();
-      }, G(Re, "ImmutableMapValues", 604), A(282, 108, Id, Hm), w.G = function() {
-        return this.a.G();
-      }, w.H = function() {
-        return f(this.a.H(), 21).zb();
-      }, G(Re, "ImmutableMapValues/1", 282), A(605, 661, vh, x9), w.Sb = function() {
-        return this.a;
-      }, w.sb = function(t) {
-        return f(this.b.sb(t), 21).zb();
-      }, G(Re, "ImmutableMapValues/2", 605), A(311, 661, vh, U5), w.Sb = function() {
-        return this.a;
-      }, w.sb = function(t) {
-        return Mq(this.a, t);
-      }, G(Re, "ImmutableSet/Indexed/1", 311), A(414, 234, Ju, h9), w.mb = function() {
-        return _S(this.a);
-      }, w.w = function() {
-        return Qu(this.a) + " (cycled)";
-      }, G(Re, "Iterables/1", 414), A(105, 1, yi, T), w.B = function(t) {
-        return f(t, 22).mb();
-      }, G(Re, "Iterables/12", 105), A(415, 234, Ju, Tj), w.mb = function() {
-        return vd(this);
-      }, G(Re, "Iterables/4", 415), A(416, 234, Ju, Lj), w.mb = function() {
-        return Go(this);
-      }, G(Re, "Iterables/5", 416);
-      var $8, wx;
-      A(424, 651, E2, P), w.G = function() {
-        return !1;
-      }, w.K = function() {
-        return !1;
-      }, w.H = function() {
-        throw new sa();
-      }, w.L = function() {
-        return 0;
-      }, w.M = function() {
-        throw new sa();
-      }, w.N = function() {
-        return -1;
-      }, G(Re, "Iterators/1", 424), A(264, 108, Id, Dw), w.G = function() {
-        return !this.a;
-      }, w.H = function() {
-        if (this.a)
-          throw new sa();
-        return this.a = !0, this.b;
-      }, w.a = !1, G(Re, "Iterators/11", 264), A(425, 1, ir, N), w.G = function() {
-        return !1;
-      }, w.H = function() {
-        throw new sa();
-      }, w.I = function() {
-        Wl(!1);
-      }, G(Re, "Iterators/2", 425), A(426, 108, Id, SP), w.G = function() {
-        return this.a.G();
-      }, w.H = function() {
-        return this.a.H();
-      }, G(Re, "Iterators/3", 426), A(427, 1, ir, sj), w.G = function() {
-        return this.a.G() || this.b.mb().G();
-      }, w.H = function() {
-        return J4(this);
-      }, w.I = function() {
-        this.a.I();
-      }, G(Re, "Iterators/4", 427), A(429, 428, Id, wD), G(Re, "Iterators/6", 429), A(261, 1, ir), w.G = function() {
-        return this.b.G();
-      }, w.H = function() {
-        return zD(this);
-      }, w.I = function() {
-        this.b.I();
-      }, G(Re, "TransformedIterator", 261), A(430, 261, ir, M9), w.Vb = function(t) {
-        return eD(this, t);
-      }, G(Re, "Iterators/7", 430), A(313, 1, ir), w.G = function() {
-        return xt(this);
-      }, w.H = function() {
-        return Et(this);
-      }, w.I = function() {
-        Wl(!!this.c), this.c.I(), this.c = null;
-      }, G(Re, "MultitransformedIterator", 313), A(90, 313, { 90: 1, 35: 1 }, _o), w.Wb = function(t) {
-        return f(t, 35);
-      }, G(Re, "Iterators/ConcatenatedIterator", 90), A(314, 313, ir, X5), w.Wb = function(t) {
-        return iU(f(t, 35));
-      }, G(Re, "Iterators/ConcatenatedIterator/1", 314), A(329, 653, Ng, wS), w.U = function(t) {
-        return new Zw(this, t);
-      }, w.X = function(t) {
-        return B4(this, t);
-      }, w.Q = function() {
-        p4(this);
-      }, w.R = function(t) {
-        return lS(this, t);
-      }, w.S = function() {
-        return new pS(this);
-      }, w.T = function() {
-        return new CP(this);
-      }, w.V = function() {
-        return !this.a;
-      }, w.Y = function() {
-        return this.d;
-      }, w.c = 0, w.d = 0, G(Re, "LinkedListMultimap", 329), A(647, 640, hh), w.rb = function(t, n) {
-        throw new jf("Add not supported on this list");
-      }, w.ib = function(t) {
-        return this.rb(this.Y(), t), !0;
-      }, w.Q = function() {
-        this.Xb(0, this.Y());
-      }, w.t = function(t) {
-        return mA(this, t);
-      }, w.v = function() {
-        return EM(this);
-      }, w.mb = function() {
-        return new Pf(this);
-      }, w.tb = function() {
-        return this.ub(0);
-      }, w.ub = function(t) {
-        return new fn(this, t);
-      }, w.vb = function(t) {
-        throw new jf("Remove not supported on this list");
-      }, w.Xb = function(t, n) {
-        var i, s;
-        for (s = this.ub(t), i = t; i < n; ++i)
-          s.H(), s.I();
-      }, w.wb = function(t, n) {
-        throw new jf("Set not supported on this list");
-      }, w.xb = function(t, n) {
-        return new uy(this, t, n);
-      }, w.d = 0, G(wt, "AbstractList", 647), A(648, 647, hh), w.rb = function(t, n) {
-        T1(this, t, n);
-      }, w.sb = function(t) {
-        return Td(this, t);
-      }, w.mb = function() {
-        return this.ub(0);
-      }, w.vb = function(t) {
-        return B3(this, t);
-      }, w.wb = function(t, n) {
-        var i, s;
-        i = this.ub(t);
-        try {
-          return s = i.H(), i.O(n), s;
-        } catch (l) {
-          throw l = Ur(l), xe(l, 74) ? new Ho("Can't set element " + t) : Kr(l);
-        }
-      }, G(wt, "AbstractSequentialList", 648), A(276, 648, hh, Zw), w.ub = function(t) {
-        return AS(this, t);
-      }, w.Y = function() {
-        var t;
-        return t = f(Kt(this.a.b, this.b), 126), t ? t.a : 0;
-      }, G(Re, "LinkedListMultimap/1", 276), A(330, 648, hh, x5), w.ub = function(t) {
-        return new RO(this.a, t);
-      }, w.Y = function() {
-        return this.a.d;
-      }, G(Re, "LinkedListMultimap/1EntriesImpl", 330), A(563, 649, di, CP), w.kb = function(t) {
-        return lS(this.a, t);
-      }, w.mb = function() {
-        return new YI(this.a);
-      }, w.nb = function(t) {
-        return !B4(this.a, t).a.V();
-      }, w.Y = function() {
-        return h1(this.a.b);
-      }, G(Re, "LinkedListMultimap/1KeySetImpl", 563), A(562, 1, ir, YI), w.G = function() {
-        return VS(this), !!this.c;
-      }, w.H = function() {
-        VS(this), m1(this.c), this.a = this.c, vn(this.d, this.a.a);
-        do
-          this.c = this.c.b;
-        while (this.c && !vn(this.d, this.c.a));
-        return this.a.a;
-      }, w.I = function() {
-        VS(this), Wl(!!this.a), $1(new by(this.e, this.a.a)), this.a = null, this.b = this.e.c;
-      }, w.b = 0, G(Re, "LinkedListMultimap/DistinctKeyIterator", 562), A(126, 1, { 126: 1 }, T4), w.a = 0, G(Re, "LinkedListMultimap/KeyList", 126), A(560, 668, Ig, mD), w.yb = function() {
-        return this.a;
-      }, w.zb = function() {
-        return this.f;
-      }, w.Ab = function(t) {
-        var n;
-        return n = this.f, this.f = t, n;
-      }, G(Re, "LinkedListMultimap/Node", 560), A(561, 1, dh, RO), w.J = function(t) {
-        f(t, 21), zY();
-      }, w.H = function() {
-        return ON(this);
-      }, w.M = function() {
-        return AN(this);
-      }, w.O = function(t) {
-        f(t, 21), HY();
-      }, w.G = function() {
-        return D1(this), !!this.c;
-      }, w.K = function() {
-        return D1(this), !!this.e;
-      }, w.L = function() {
-        return this.d;
-      }, w.N = function() {
-        return this.d - 1;
-      }, w.I = function() {
-        D1(this), Wl(!!this.a), this.a != this.c ? (this.e = this.a.d, --this.d) : this.c = this.a.b, fA(this.f, this.a), this.a = null, this.b = this.f.c;
-      }, w.b = 0, w.d = 0, G(Re, "LinkedListMultimap/NodeIterator", 561), A(241, 1, dh, by, oA), w.J = function(t) {
-        this.e = v2(this.f, this.b, t, this.c), ++this.d, this.a = null;
-      }, w.G = function() {
-        return !!this.c;
-      }, w.K = function() {
-        return !!this.e;
-      }, w.H = function() {
-        return sy(this);
-      }, w.L = function() {
-        return this.d;
-      }, w.M = function() {
-        return TN(this);
-      }, w.N = function() {
-        return this.d - 1;
-      }, w.I = function() {
-        Wl(!!this.a), this.a != this.c ? (this.e = this.a.e, --this.d) : this.c = this.a.c, fA(this.f, this.a), this.a = null;
-      }, w.O = function(t) {
-        w1(!!this.a), this.a.f = t;
-      }, w.d = 0, G(Re, "LinkedListMultimap/ValueForKeyIterator", 241), A(419, 647, hh), w.rb = function(t, n) {
-        this.a.rb(t, n);
-      }, w.kb = function(t) {
-        return this.a.kb(t);
-      }, w.sb = function(t) {
-        return this.a.sb(t);
-      }, w.vb = function(t) {
-        return this.a.vb(t);
-      }, w.wb = function(t, n) {
-        return this.a.wb(t, n);
-      }, w.Y = function() {
-        return this.a.Y();
-      }, G(Re, "Lists/AbstractListWrapper", 419), A(420, 419, S2), G(Re, "Lists/RandomAccessListWrapper", 420), A(422, 420, S2, LD), w.ub = function(t) {
-        return this.a.ub(t);
-      }, G(Re, "Lists/1", 422), A(88, 647, { 88: 1, 22: 1, 19: 1, 20: 1 }, od), w.rb = function(t, n) {
-        this.a.rb(Vf(this, t), n);
-      }, w.Q = function() {
-        this.a.Q();
-      }, w.sb = function(t) {
-        return this.a.sb(b4(this, t));
-      }, w.mb = function() {
-        return jN(this, 0);
-      }, w.ub = function(t) {
-        return jN(this, t);
-      }, w.vb = function(t) {
-        return this.a.vb(b4(this, t));
-      }, w.Xb = function(t, n) {
-        (yN(t, n, this.a.Y()), Cy(this.a.xb(Vf(this, n), Vf(this, t)))).Q();
-      }, w.wb = function(t, n) {
-        return this.a.wb(b4(this, t), n);
-      }, w.Y = function() {
-        return this.a.Y();
-      }, w.xb = function(t, n) {
-        return yN(t, n, this.a.Y()), Cy(this.a.xb(Vf(this, n), Vf(this, t)));
-      }, G(Re, "Lists/ReverseList", 88), A(220, 88, { 88: 1, 22: 1, 19: 1, 20: 1, 63: 1 }, Dv), G(Re, "Lists/RandomAccessReverseList", 220), A(421, 1, dh, ED), w.J = function(t) {
-        this.c.J(t), this.c.M(), this.a = !1;
-      }, w.G = function() {
-        return this.c.K();
-      }, w.K = function() {
-        return this.c.G();
-      }, w.H = function() {
-        if (!this.c.K())
-          throw new sa();
-        return this.a = !0, this.c.M();
-      }, w.L = function() {
-        return Vf(this.b, this.c.L());
-      }, w.M = function() {
-        if (!this.c.G())
-          throw new sa();
-        return this.a = !0, this.c.H();
-      }, w.N = function() {
-        return Vf(this.b, this.c.L()) - 1;
-      }, w.I = function() {
-        Wl(this.a), this.c.I(), this.a = !1;
-      }, w.O = function(t) {
-        w1(this.a), this.c.O(t);
-      }, w.a = !1, G(Re, "Lists/ReverseList/1", 421);
-      var Y8;
-      A(376, 261, ir, O9), w.Vb = function(t) {
-        return On(), new uS(t, e9(this.a, t));
-      }, G(Re, "Maps/1", 376), A(188, 17, ZC);
-      var $2, mx, yx = At(Re, "Maps/EntryFunction", 188, an, Gq);
-      A(374, 188, ZC, BD), w.B = function(t) {
-        return f(t, 21).yb();
-      }, At(Re, "Maps/EntryFunction/1", 374, yx, null), A(375, 188, ZC, l9), w.B = function(t) {
-        return f(t, 21).zb();
-      }, At(Re, "Maps/EntryFunction/2", 375, yx, null), A(373, 640, Md, PD), w.Q = function() {
-        this.a.Q();
-      }, w.kb = function(t) {
-        return this.a.ab(t);
-      }, w.V = function() {
-        return this.a.V();
-      }, w.mb = function() {
-        return Qj(this);
-      }, w.nb = function(t) {
-        var n, i;
-        try {
-          return hg(this, t, !0);
-        } catch (s) {
-          if (s = Ur(s), xe(s, 45)) {
-            for (i = this.a.bb().mb(); i.G(); )
-              if (n = f(i.H(), 21), Gl(t, n.zb()))
-                return this.a.eb(n.yb()), !0;
-            return !1;
-          } else
-            throw Kr(s);
-        }
-      }, w.Y = function() {
-        return this.a.Y();
-      }, G(Re, "Maps/Values", 373), A(301, 654, fh, pS), w.cb = function(t) {
-        return this.a.R(t) ? this.a.U(t) : null;
-      }, w.eb = function(t) {
-        return this.a.R(t) ? this.a.X(t) : null;
-      }, w.Q = function() {
-        this.a.Q();
-      }, w.R = function(t) {
-        return this.a.R(t);
-      }, w.hb = function() {
-        return new xP(this);
-      }, w.gb = function() {
-        return this.hb();
-      }, w.V = function() {
-        return this.a.V();
-      }, w.W = function() {
-        return this.a.W();
-      }, w.Y = function() {
-        return this.a.W().Y();
-      }, G(Re, "Multimaps/AsMap", 301), A(393, 655, di, xP), w.mb = function() {
-        return fq(this.a.a.W(), new TP(this));
-      }, w.qb = function() {
-        return this.a;
-      }, w.nb = function(t) {
-        var n;
-        return nO(this, t) ? (n = f(t, 21), FY(this.a, n.yb()), !0) : !1;
-      }, G(Re, "Multimaps/AsMap/EntrySet", 393), A(395, 1, yi, TP), w.B = function(t) {
-        return e9(this, t);
-      }, G(Re, "Multimaps/AsMap/EntrySet/1", 395), A(391, 656, qC, LP), w.Q = function() {
-        p4(this.a);
-      }, w.kb = function(t) {
-        return lS(this.a, t);
-      }, w.Cb = function(t) {
-        var n;
-        return n = f(vg(Hl(this.a), t), 19), n ? n.Y() : 0;
-      }, w.gb = function() {
-        return new DP(this);
-      }, w.Db = function() {
-        return Hl(this.a).Y();
-      }, w.Eb = function() {
-        return new Q5(f4(Hl(this.a)).mb());
-      }, w.mb = function() {
-        return Vj(this);
-      }, w.Fb = function(t, n) {
-        var i, s, l, h, v;
-        if (fi(n, XC), n == 0)
-          return v = f(vg(Hl(this.a), t), 19), v ? v.Y() : 0;
-        if (h = f(vg(Hl(this.a), t), 19), !h)
-          return 0;
-        if (l = h.Y(), n >= l)
-          h.Q();
-        else
-          for (s = h.mb(), i = 0; i < n; i++)
-            s.H(), s.I();
-        return l;
-      }, G(Re, "Multimaps/Keys", 391), A(302, 261, ir, Q5), w.Vb = function(t) {
-        return new PP(f(t, 21));
-      }, G(Re, "Multimaps/Keys/1", 302), A(658, 1, { 83: 1 }), w.t = function(t) {
-        var n;
-        return xe(t, 83) ? (n = f(t, 83), this.Yb() == n.Yb() && Gl(this.Zb(), n.Zb())) : !1;
-      }, w.v = function() {
-        var t;
-        return t = this.Zb(), (t == null ? 0 : Uo(t)) ^ this.Yb();
-      }, w.w = function() {
-        return qN(this);
-      }, G(Re, "Multisets/AbstractEntry", 658), A(394, 658, { 83: 1 }, PP), w.Yb = function() {
-        return f(this.a.zb(), 19).Y();
-      }, w.Zb = function() {
-        return this.a.yb();
-      }, G(Re, "Multimaps/Keys/1/1", 394), A(392, 657, di, DP), w.kb = function(t) {
-        var n, i;
-        return xe(t, 83) ? (i = f(t, 83), n = f(Hl(this.a.a).cb(i.Zb()), 19), !!n && n.Y() == i.Yb()) : !1;
-      }, w.V = function() {
-        return !this.a.a.a;
-      }, w.mb = function() {
-        return new Q5(f4(Hl(this.a.a)).mb());
-      }, w.Ib = function() {
-        return this.a;
-      }, w.nb = function(t) {
-        var n, i;
-        return xe(t, 83) && (i = f(t, 83), n = f(Hl(this.a.a).cb(i.Zb()), 19), n && n.Y() == i.Yb()) ? (n.Q(), !0) : !1;
-      }, w.Y = function() {
-        return Hl(this.a.a).Y();
-      }, G(Re, "Multimaps/Keys/KeysEntrySet", 392), A(659, 1, jr), G(Re, "Ordering", 659), A(398, 659, jr, k), w.$b = function(t, n) {
-        return UF(f(t, 83), f(n, 83));
-      }, G(Re, "Multisets/1", 398), A(397, 658, { 83: 1, 3: 1 }, Pj), w.Yb = function() {
-        return this.a;
-      }, w.Zb = function() {
-        return this.b;
-      }, w.a = 0, G(Re, "Multisets/ImmutableEntry", 397), A(303, 1, ir, SD), w.G = function() {
-        return this.d > 0 || this.c.G();
-      }, w.H = function() {
-        if (!(this.d > 0 || this.c.G()))
-          throw new sa();
-        return this.d == 0 && (this.b = f(this.c.H(), 83), this.f = this.d = this.b.Yb()), --this.d, this.a = !0, this.b.Zb();
-      }, w.I = function() {
-        Wl(this.a), this.f == 1 ? this.c.I() : this.e.Fb(this.b.Zb(), 1) > 0, --this.f, this.a = !1;
-      }, w.a = !1, w.d = 0, w.f = 0, G(Re, "Multisets/MultisetIteratorImpl", 303), A(622, 659, { 3: 1, 56: 1 }, E), w.$b = function(t, n) {
-        return iq(f(t, 23), f(n, 23));
-      }, w.w = function() {
-        return "Ordering.natural()";
-      };
-      var F8;
-      G(Re, "NaturalOrdering", 622), A(343, 661, vh, Fj), w.ub = function(t) {
-        return OS(this.b, t);
-      }, w.Sb = function() {
-        return this.a;
-      }, w.sb = function(t) {
-        return JD(this.b, t);
-      }, w.Lb = function(t) {
-        return OS(this.b, t);
-      }, G(Re, "RegularImmutableAsList", 343), A(559, 275, gh, eN), w.Tb = function() {
-        return this.a;
-      };
-      var q8;
-      G(Re, "RegularImmutableBiMap", 559), A(53, 667, vh, Qn), w.Nb = function() {
-        return this.a;
-      }, G(Re, "RegularImmutableList", 53), A(321, 320, gh, J5), G(Re, "RegularImmutableMap", 321), A(265, 315, bh, um);
-      var Gd;
-      G(Re, "RegularImmutableSet", 265), A(650, 641, di), G(Re, "Sets/SetView", 650), A(377, 650, di, lj), w.kb = function(t) {
-        return Pc(this.b, t) && Pc(this.c, t);
-      }, w.lb = function(t) {
-        return Wu(this.b, t) && Wu(this.c, t);
-      }, w.V = function() {
-        return ky(this);
-      }, w.mb = function() {
-        var t;
-        return zl((t = new Wt(this.b.a).a.bb().mb(), new Zt(t)), this.a);
-      }, w.Y = function() {
-        var t;
-        return dy(zl((t = new Wt(this.b.a).a.bb().mb(), new Zt(t)), this.a));
-      }, G(Re, "Sets/2", 377), A(328, 275, gh, IN, yI), w.fb = function() {
-        return Ea(), new Bu(this.c);
-      }, w.Tb = function() {
-        var t;
-        return t = this.a, t || (this.a = new yI(this.c, this.b, this));
-      }, w.Ub = function() {
-        return Ea(), new Bu(this.c);
-      }, G(Re, "SingletonImmutableBiMap", 328), A(127, 667, vh, cu), w.Nb = function() {
-        return this.a;
-      }, G(Re, "SingletonImmutableList", 127), A(135, 663, bh, Bu), w.mb = function() {
-        return _n(), new Dw(this.a);
-      }, w.kb = function(t) {
-        return xo(this.a, t);
-      }, w.Kb = function() {
-        return _n(), new Dw(this.a);
-      }, w.Y = function() {
-        return 1;
-      }, G(Re, "SingletonImmutableSet", 135), A(285, 342, { 207: 1, 3: 1, 22: 1, 19: 1 }, M4, gO), w.Bb = function(t, n) {
-        return N0(this, t, n);
-      }, w.Cb = function(t) {
-        return T0(this, t);
-      }, w.Db = function() {
-        return Jf(p3(this, (E1(), kx)));
-      }, w.Eb = function() {
-        return new R9(this);
-      }, w.Fb = function(t, n) {
-        return uC(this, t, n);
-      }, w.Gb = function(t, n) {
-        return HO(this, t, n);
-      }, w.Hb = function(t, n, i) {
-        var s, l, h;
-        return fi(i, "newCount"), fi(n, "oldCount"), _f(Wv(this.b, t)), h = this.c.a, h ? (l = ve(Kn, Wn, 26, 1, 12, 1), s = TC(h, this.d, t, n, i, l), _1(this.c, h, s), l[0] == n) : n == 0 ? (i > 0 && N0(this, t, i), !0) : !1;
-      }, w.Y = function() {
-        return Jf(p3(this, (E1(), Y2)));
-      }, G(Re, "TreeMultiset", 285), A(619, 658, { 83: 1 }, CD), w.Yb = function() {
-        var t;
-        return t = this.b.c, t == 0 ? T0(this.a, this.b.b) : t;
-      }, w.Zb = function() {
-        return this.b.b;
-      }, G(Re, "TreeMultiset/1", 619), A(620, 1, ir, R9), w.H = function() {
-        return RU(this);
-      }, w.G = function() {
-        return gM(this);
-      }, w.I = function() {
-        Wl(!!this.b), HO(this.c, this.b.b.b, 0), this.b = null;
-      }, G(Re, "TreeMultiset/2", 620), A(205, 17, QC);
-      var kx, Y2, Ex = At(Re, "TreeMultiset/Aggregate", 205, an, Yq);
-      A(617, 205, QC, a9), w._b = function(t) {
-        return t.c;
-      }, w.ac = function(t) {
-        return t ? t.j : 0;
-      }, At(Re, "TreeMultiset/Aggregate/1", 617, Ex, null), A(618, 205, QC, j9), w._b = function(t) {
-        return 1;
-      }, w.ac = function(t) {
-        return t ? t.a : 0;
-      }, At(Re, "TreeMultiset/Aggregate/2", 618, Ex, null), A(206, 658, { 83: 1, 206: 1 }, l0), w.Yb = function() {
-        return this.c;
-      }, w.Zb = function() {
-        return this.b;
-      }, w.w = function() {
-        return Df(), qN(new Pj(this.b, this.c));
-      }, w.a = 0, w.c = 0, w.d = 0, w.j = 0, G(Re, "TreeMultiset/AvlNode", 206), A(616, 1, {}, C), G(Re, "TreeMultiset/Reference", 616);
-      var Qee = G(GC, "JavaScriptObject$", 0), F2;
-      A(628, 1, {}), G(GC, "Scheduler", 628);
-      var X0 = 0, V8 = 0, Q0 = -1;
-      A(360, 628, {}, y);
-      var Sx;
-      G(H0, "SchedulerImpl", 360), A(646, 1, {}), w.hc = function() {
-        return null;
-      }, w.ic = function() {
-        return null;
-      }, w.jc = function() {
-        return null;
-      }, w.kc = function() {
-        return null;
-      }, w.lc = function() {
-        return null;
-      }, G(Ql, "JSONValue", 646), A(214, 646, { 214: 1 }, A5, jP), w.t = function(t) {
-        return xe(t, 214) ? this.a == f(t, 214).a : !1;
-      }, w.gc = function() {
-        return SY;
-      }, w.v = function() {
-        return au(this.a);
-      }, w.hc = function() {
-        return this;
-      }, w.w = function() {
-        var t, n, i;
-        for (i = new id("["), n = 0, t = this.a.length; n < t; n++)
-          n > 0 && (i.a += ","), Hu(i, Fu(this, n));
-        return i.a += "]", i.a;
-      }, G(Ql, "JSONArray", 214), A(292, 646, {}, T5), w.gc = function() {
-        return CY;
-      }, w.ic = function() {
-        return this;
-      }, w.w = function() {
-        return P9(this.a);
-      }, w.a = !1;
-      var W8, U8;
-      G(Ql, "JSONBoolean", 292), A(371, 72, Gs, A7), G(Ql, "JSONException", 371), A(435, 646, {}, D), w.gc = function() {
-        return DY;
-      }, w.w = function() {
-        return $s;
-      };
-      var K8;
-      G(Ql, "JSONNull", 435), A(104, 646, { 104: 1 }, jw), w.t = function(t) {
-        return xe(t, 104) ? this.a == f(t, 104).a : !1;
-      }, w.gc = function() {
-        return xY;
-      }, w.v = function() {
-        return Xn(ge(this.a));
-      }, w.jc = function() {
-        return this;
-      }, w.w = function() {
-        return this.a + "";
-      }, w.a = 0, G(Ql, "JSONNumber", 104), A(69, 646, { 69: 1 }, Dl, Nw), w.t = function(t) {
-        return xe(t, 69) ? this.a == f(t, 69).a : !1;
-      }, w.gc = function() {
-        return TY;
-      }, w.v = function() {
-        return au(this.a);
-      }, w.kc = function() {
-        return this;
-      }, w.w = function() {
-        var t, n, i, s, l, h;
-        for (h = new id("{"), t = !0, l = JI(this, ve(_2, Dr, 2, 0, 5, 1)), i = 0, s = l.length; i < s; ++i)
-          n = l[i], t ? t = !1 : h.a += ", ", io(h, yA(n)), h.a += ":", Hu(h, Mn(this, n));
-        return h.a += "}", h.a;
-      }, G(Ql, "JSONObject", 69), A(361, 641, di, TD), w.kb = function(t) {
-        return ko(t) && iF(this.a, qf(t));
-      }, w.mb = function() {
-        return new Pf(new ro(this.b));
-      }, w.Y = function() {
-        return this.b.length;
-      }, G(Ql, "JSONObject/1", 361);
-      var q2;
-      A(97, 646, { 97: 1 }, Rc), w.t = function(t) {
-        return xe(t, 97) ? zo(this.a, f(t, 97).a) : !1;
-      }, w.gc = function() {
-        return LY;
-      }, w.v = function() {
-        return Wy(this.a);
-      }, w.lc = function() {
-        return this;
-      }, w.w = function() {
-        return yA(this.a);
-      }, G(Ql, "JSONString", 97);
-      var Z8, X8, Cx;
-      A(186, 1, {}, j1, FS), w.b = !1, w.c = 0, w.d = -1, w.e = 0, w.f = !1, w.j = 0, G("de.cau.cs.kieler.core.alg", "BasicProgressMonitor", 186), A(10, 1, { 10: 1, 286: 1, 3: 1, 5: 1 }, Yr, zc, ot, qn), w.t = function(t) {
-        return QI(this, t);
-      }, w.v = function() {
-        return Xn(ge(this.a)) + UK(Xn(ge(this.b)));
-      }, w.w = function() {
-        return "(" + this.a + "," + this.b + ")";
-      }, w.a = 0, w.b = 0;
-      var _t = G(i8, "KVector", 10);
-      A(58, 648, { 3: 1, 5: 1, 22: 1, 19: 1, 58: 1, 20: 1 }, Wr), w.ib = function(t) {
-        return rn(this, t);
-      }, w.Q = function() {
-        Bs(this);
-      }, w.ub = function(t) {
-        return Jt(this, t);
-      }, w.Y = function() {
-        return this.b;
-      }, w.b = 0, G(wt, "LinkedList", 58), A(44, 58, { 44: 1, 286: 1, 3: 1, 5: 1, 22: 1, 19: 1, 58: 1, 20: 1 }, Ci, Nm), w.w = function() {
-        var t, n, i;
-        for (t = new id("("), n = Jt(this, 0); n.b != n.d.c; )
-          i = f(Ft(n), 10), io(t, i.a + "," + i.b), n.b != n.d.c && (t.a += "; ");
-        return t.a += ")", t.a;
-      }, G(i8, "KVectorChain", 44);
-      var rf = B1($0, "IProperty");
-      A(131, 1, { 179: 1, 131: 1, 3: 1 }, H), G($0, "MapPropertyHolder", 131), A(14, 1, a8, H1, z1, Zn, nt, $l, Q1), w.F = function(t) {
-        return HF(this, f(t, 79));
-      }, w.t = function(t) {
-        return k4(this, t);
-      }, w.mc = function() {
-        return this.b;
-      }, w.nc = function() {
-        return this.c;
-      }, w.oc = function() {
-        return this.d;
-      }, w.v = function() {
-        return Wy(this.b);
-      }, w.w = function() {
-        return this.b;
-      };
-      var Q8, J8;
-      G($0, "Property", 14), A(366, 1, { 23: 1 }, _), w.F = function(t) {
-        return -1;
-      }, G($0, "Property/1", 366), A(367, 1, { 23: 1 }, B), w.F = function(t) {
-        return 1;
-      }, G($0, "Property/2", 367), A(27, 1, { 27: 1, 22: 1 }, pr), w.t = function(t) {
-        var n, i, s;
-        return xe(t, 27) ? (i = f(t, 27), n = this.a == null ? i.a == null : xo(this.a, i.a), s = this.b == null ? i.b == null : xo(this.b, i.b), n && s) : !1;
-      }, w.v = function() {
-        var t, n, i, s, l, h;
-        return i = this.a == null ? 0 : Uo(this.a), t = i & Cs, n = i & -65536, h = this.b == null ? 0 : Uo(this.b), s = h & Cs, l = h & -65536, t ^ l >> 16 & Cs | n ^ s << 16;
-      }, w.mb = function() {
-        return new NP(this);
-      }, w.w = function() {
-        return this.a == null && this.b == null ? "pair(null,null)" : this.a == null ? "pair(null," + ha(this.b) + ")" : this.b == null ? "pair(" + ha(this.a) + ",null)" : "pair(" + ha(this.a) + "," + ha(this.b) + ")";
-      }, G(o8, "Pair", 27), A(431, 1, ir, NP), w.G = function() {
-        return !this.c && (!this.b && this.a.a != null || this.a.b != null);
-      }, w.H = function() {
-        if (!this.c && !this.b && this.a.a != null)
-          return this.b = !0, this.a.a;
-        if (!this.c && this.a.b != null)
-          return this.c = !0, this.a.b;
-        throw new sa();
-      }, w.I = function() {
-        throw this.c && this.a.b != null ? this.a.b = null : this.b && this.a.a != null && (this.a.a = null), new Lv();
-      }, w.b = !1, w.c = !1, G(o8, "Pair/1", 431), A(228, 72, Gs, t1), G(s8, "UnsupportedConfigurationException", 228), A(99, 72, Gs, mo), G(s8, "UnsupportedGraphException", 99);
-      var xx;
-      A(103, 17, { 103: 1, 3: 1, 23: 1, 17: 1 }, sd);
-      var V2, J0, ep, tp, np, rp, eB = At(Fs, "Alignment", 103, an, XV), tB;
-      A(59, 17, { 59: 1, 3: 1, 23: 1, 17: 1 }, Mv);
-      var Ts, ja, Fi, Po, Ws, Gg = At(Fs, "Direction", 59, an, NV), nB;
-      A(107, 17, { 107: 1, 3: 1, 23: 1, 17: 1 }, s1);
-      var $g, sl, ph, W2, rB = At(Fs, "EdgeLabelPlacement", 107, an, CV), iB;
-      A(122, 17, { 122: 1, 3: 1, 23: 1, 17: 1 }, u1);
-      var af, Tx, U2, K2, aB = At(Fs, "EdgeRouting", 122, an, xV), oB;
-      A(133, 17, { 133: 1, 3: 1, 23: 1, 17: 1 }, ud);
-      var Lx, Px, Dx, jx, Z2, Nx, sB = At(Fs, "EdgeType", 133, an, QV), uB;
-      A(166, 17, { 166: 1, 3: 1, 23: 1, 17: 1 }, em);
-      var Ix, X2, Mx, cB = At(Fs, "HierarchyHandling", 166, an, eV), lB, Yg, Ox, co, fB, hB, Q2, Ax, $d, Fg, Do, da, of, Rx, dB, vB, gB, Bx, qg, bB, Un, wh, zx, pB, Vg, Yd, Fd, ia, Wg, ul, Hx, J2, ek, tk, nk, rk, wu, dt, mu, Ug, Kg, _x, mh, Gx, ik, $x, ic, Zg, Yx, Jo;
-      A(41, 17, { 41: 1, 3: 1, 23: 1, 17: 1 }, Dc);
-      var Ua, qi, Vi, Wi, Ei, Ui, va, ga, ba, Ln = At(Fs, "NodeLabelPlacement", 41, an, LW), wB;
-      A(100, 17, { 100: 1, 3: 1, 23: 1, 17: 1 }, Ov);
-      var Fx, qx, Vx, Ls, sf, Wx = At(Fs, "PortAlignment", 100, an, KV), mB;
-      A(28, 17, { 28: 1, 3: 1, 23: 1, 17: 1 }, cd);
-      var yh, ni, es, Xg, jo, ac, yB = At(Fs, "PortConstraints", 28, an, ZV), kB;
-      A(149, 17, { 149: 1, 3: 1, 23: 1, 17: 1 }, tm);
-      var ak, ok, Qg, EB = At(Fs, "PortLabelPlacement", 149, an, tV), SB;
-      A(32, 17, { 32: 1, 3: 1, 23: 1, 17: 1 }, Av);
-      var Be, rt, kh, cl, pa, yu, ip, Eh, ll, Na, Fr, Ia, ts, Ma, uf, Sh, fl, Ch, ct, cr, qe, Nr = At(Fs, "PortSide", 32, an, jV), CB;
-      A(150, 17, { 150: 1, 3: 1, 23: 1, 17: 1 }, c1);
-      var Jg, sk, uk, eb, qd = At(Fs, "SizeConstraint", 150, an, LV), xB;
-      A(139, 17, { 139: 1, 3: 1, 23: 1, 17: 1 }, l1);
-      var ck, lk, tb, fk, hk = At(Fs, "SizeOptions", 139, an, TV), TB;
-      A(62, 1, { 62: 1 }, lm, $a), w.t = function(t) {
-        var n;
-        return t == null || !xe(t, 62) ? !1 : (n = f(t, 62), la(this.d, n.d) && la(this.e, n.e) && la(this.c, n.c) && la(this.b, n.b));
-      }, w.v = function() {
-        return Ny(re(ie(Ze, 1), Me, 1, 4, [this.d, this.e, this.c, this.b]));
-      }, w.w = function() {
-        return "Rect[x=" + this.d + ",y=" + this.e + ",w=" + this.c + ",h=" + this.b + "]";
-      }, w.b = 0, w.c = 0, w.d = 0, w.e = 0, G(Bd, "Rectangle", 62), A(283, 62, { 283: 1, 62: 1 }, d7), w.a = 0, G(ex, "LabelGroup", 283), A(67, 17, { 67: 1, 3: 1, 23: 1, 17: 1 }, Li);
-      var LB, PB, DB, jB, NB, IB, MB, OB, AB, RB, BB, zB, HB, _B, GB, $B, YB, FB, qB, VB, WB, dk, UB = At(ex, "LabelLocation", 67, an, D3);
-      A(225, 17, { 225: 1, 3: 1, 23: 1, 17: 1 }, nm);
-      var xh, oc, sc, Jee = At(ex, "TextAlignment", 225, an, nV), cf;
-      A(589, 1, {}, kR), w.a = 0, w.b = !1, w.d = 0, w.f = 0, w.k = 0, w.r = 0, w.s = 0, G(Bd, "LabelAndNodeSizeProcessor/NodeData", 589), A(171, 17, { 171: 1, 3: 1, 23: 1, 17: 1 }, rm);
-      var ns, Us, KB, nb, ete = At(Bd, "LabelSide", 171, an, Jq);
-      A(590, 1, {}, IP), w.b = !0, w.c = !0, w.d = !0, w.e = !0, G(Bd, f8, 590), A(121, 1, h8), w.t = function(t) {
-        var n;
-        return xe(t, 121) ? (n = f(t, 121), this.d == n.d && this.a == n.a && this.b == n.b && this.c == n.c) : !1;
-      }, w.v = function() {
-        var t, n;
-        return t = Xn(ge(this.b)) << 16, t |= Xn(ge(this.a)) & Cs, n = Xn(ge(this.c)) << 16, n |= Xn(ge(this.d)) & Cs, t ^ n;
-      }, w.w = function() {
-        return "[top=" + this.d + ",left=" + this.b + ",bottom=" + this.a + ",right=" + this.c + "]";
-      }, w.a = 0, w.b = 0, w.c = 0, w.d = 0, G(Bd, "Spacing", 121), A(232, 121, h8, H5, X9, tj), G(Bd, "Spacing/Insets", 232), A(65, 121, { 286: 1, 121: 1, 65: 1, 3: 1, 5: 1 }, e1, qo, WS), G(Bd, "Spacing/Margins", 65), A(364, 1, {}, CO), w.c = !1, w.d = null, w.g = null;
-      var Ux, Kx, vk;
-      G(N2, "JsonGraphImporter", 364);
-      var Zx, Xx, Qx, Jx, eT, ZB, ap, tT, nT;
-      A(417, 14, a8, GD), G(N2, "LayoutOptionResolver/DummyProperty", 417), A(348, 1, {}, aP);
-      var rT;
-      G(N2, "RecursiveLGraphLayout", 348), A(73, 99, { 73: 1, 3: 1, 54: 1, 46: 1 }, _w, qv, gs);
-      var XB = G(N2, "UnsupportedJsonGraphException", 73);
-      A(380, 1, {}, tN);
-      var QB, JB;
-      G(rx, "GraphConfigurator", 380), A(49, 1, {}, An), G(rx, "IntermediateProcessingConfiguration", 49), A(365, 1, {}, WN), G(rx, "KlayLayered", 365), A(577, 1, {}, sM), w.i = 0;
-      var ez;
-      G(Ag, "ComponentsToCGraphTransformer", 577);
-      var tz;
-      A(578, 1, {}, Z), w.tc = function(t, n) {
-        return Xt(t.wc(), n.wc());
-      }, w.uc = function(t, n) {
-        return Xt(t.xc(), n.xc());
-      }, G(Ag, "ComponentsToCGraphTransformer/1", 578), A(25, 1, { 25: 1 }), w.k = 0, w.o = null, w.p = !0, w.r = Hr;
-      var op = G(Hd, "CNode", 25);
-      A(198, 25, { 198: 1, 25: 1 }, NS, i3), w.vc = function() {
-        this.b.d = this.j.d, this.b.e = this.j.e;
-      }, w.wc = function() {
-        return this.a != null ? ge(this.a) : this.c.i;
-      }, w.xc = function() {
-        return this.a != null ? ge(this.a) : this.c.i;
-      }, w.w = function() {
-        return "";
-      }, G(Ag, "ComponentsToCGraphTransformer/CRectNode", 198), A(549, 1, {}, ae);
-      var gk, bk;
-      G(Ag, "OneDimensionalComponentsCompaction", 549), A(550, 1, yi, oe), w.B = function(t) {
-        return Py(), yn(), f(f(t, 27).a, 25).f.f != 0 ? ii : Rn;
-      }, G(Ag, "OneDimensionalComponentsCompaction/lambda$0$Type", 550), A(551, 1, yi, J), w.B = function(t) {
-        return Py(), yn(), T3(f(f(t, 27).a, 25).n, f(f(t, 27).b, 59)) || f(f(t, 27).a, 25).f.f != 0 && T3(f(f(t, 27).a, 25).n, f(f(t, 27).b, 59)) ? ii : Rn;
-      }, G(Ag, "OneDimensionalComponentsCompaction/lambda$1$Type", 551), A(324, 1, {}, v4), G(Hd, "CGraph", 324), A(78, 1, { 78: 1 }, m0), w.b = 0, w.c = 0, w.d = 0, w.f = 0, w.i = !0, w.j = Hr, G(Hd, "CGroup", 78), A(470, 1, {}, fe), w.tc = function(t, n) {
-        return je(t.wc(), n.wc());
-      }, w.uc = function(t, n) {
-        return je(t.xc(), n.xc());
-      }, G(Hd, "ISpacingsHandler/1", 470), A(323, 1, {}, rC), w.e = !1;
-      var nz, rz, iz, pk = G(Hd, "OneDimensionalCompactor", 323);
-      A(554, 1, yi, F), w.B = function(t) {
-        return Ym(), yn(), f(f(t, 27).a, 25).f.f != 0 ? ii : Rn;
-      }, G(Hd, "OneDimensionalCompactor/lambda$0$Type", 554), A(335, 1, {}, e4), w.a = !1, w.b = !1, w.c = !1, w.d = !1, G(Hd, "Quadruplet", 335), A(587, 1, {}, W), w.Cc = function(t) {
-        var n, i, s, l, h, v, p, m, S, x, L, j, I, R, Y, q, V, U;
-        for (x = ki, s = new M(t.a.b); s.a < s.c.c.length; )
-          n = f(O(s), 25), x = Xt(x, n.f.g.j.d + n.g.a);
-        for (q = new Wr(), p = new M(t.a.a); p.a < p.c.c.length; )
-          v = f(O(p), 78), v.j = x, v.f == 0 && wr(q, v, q.c.b, q.c);
-        for (; q.b != 0; ) {
-          for (v = f(q.b == 0 ? null : (ut(q.b != 0), zs(q, q.a.a)), 78), l = v.g.j.d, I = (Y = new Wt(v.a.a).a.bb().mb(), new Zt(Y)); I.a.G(); )
-            L = (h = f(I.a.H(), 21), f(h.yb(), 25)), U = v.j + L.g.a, L.f.i || L.j.d < U ? L.r = U : L.r = L.j.d;
-          for (l -= v.g.r, v.b += l, t.d == ($n(), Fi) || t.d == Ts ? v.c += l : v.c -= l, j = (R = new Wt(v.a.a).a.bb().mb(), new Zt(R)); j.a.G(); )
-            for (L = (h = f(j.a.H(), 21), f(h.yb(), 25)), S = L.i.mb(); S.G(); )
-              m = f(S.H(), 25), Nl(t.d) ? V = t.g.tc(L, m) : V = t.g.uc(L, m), m.f.j = je(m.f.j, L.r + L.j.c + V - m.g.a), m.p || (m.f.j = je(m.f.j, m.j.d - m.g.a)), --m.f.f, m.f.f == 0 && rn(q, m.f);
-        }
-        for (i = new M(t.a.b); i.a < i.c.c.length; )
-          n = f(O(i), 25), n.j.d = n.r;
-      }, G(nf, "LongestPathCompaction", 587), A(588, 1, {}, Q), w.Dc = function(t) {
-        var n, i, s, l, h, v, p;
-        for (i = new M(t.a.b); i.a < i.c.c.length; )
-          n = f(O(i), 25), n.i.Q();
-        for (l = new M(t.a.b); l.a < l.c.c.length; )
-          for (s = f(O(l), 25), v = new M(t.a.b); v.a < v.c.c.length; )
-            h = f(O(v), 25), s != h && (s.f && s.f == h.f || (Nl(t.d) ? p = t.g.uc(s, h) : p = t.g.tc(s, h), s != h.o && (h.j.d > s.j.d || s.j.d == h.j.d && s.j.c < h.j.c) && cK(h.j.e + h.j.b + p, s.j.e) && j3(h.j.e, s.j.e + s.j.b + p) && s.i.ib(h)));
-      }, G(nf, "QuadraticConstraintCalculation", 588), A(317, 1, {}, n4), w.Dc = function(t) {
-        this.b = t, s2(this, new K(), new ee());
-      }, G(nf, "ScanlineConstraintCalculator", 317);
-      var rb = B1(qs, "Scanline/EventHandler");
-      A(464, 1, { 160: 1 }, uN), w.Ec = function(t) {
-        qX(this, f(t, 235));
-      }, G(nf, "ScanlineConstraintCalculator/ConstraintsScanlineHandler", 464), A(465, 1, jr, X), w.$b = function(t, n) {
-        return mr((f(t, 25).j.d + f(t, 25).j.c) / 2, (f(n, 25).j.d + f(n, 25).j.c) / 2);
-      }, G(nf, "ScanlineConstraintCalculator/ConstraintsScanlineHandler/lambda$0$Type", 465), A(235, 1, { 235: 1 }, fS), w.a = !1, G(nf, "ScanlineConstraintCalculator/Timestamp", 235), A(466, 1, jr, $), w.$b = function(t, n) {
-        return nZ(t, n);
-      }, G(nf, "ScanlineConstraintCalculator/lambda$0$Type", 466), A(467, 1, uo, K), w.D = function(t) {
-        return !0;
-      }, G(nf, "ScanlineConstraintCalculator/lambda$1$Type", 467), A(468, 1, yi, ee), w.B = function(t) {
-        return 0;
-      }, G(nf, "ScanlineConstraintCalculator/lambda$2$Type", 468), A(48, 1, { 48: 1 }, zf, XS), w.t = function(t) {
-        var n;
-        return t == null || tte != kd(t) ? !1 : (n = f(t, 48), la(this.c, n.c) && la(this.d, n.d));
-      }, w.v = function() {
-        return Ny(re(ie(Ze, 1), Me, 1, 4, [this.c, this.d]));
-      }, w.w = function() {
-        return "(" + this.c + ", " + this.d + (this.a ? "cx" : "") + this.b + ")";
-      }, w.a = !0, w.c = 0, w.d = 0;
-      var tte = G(qs, "Point", 48);
-      A(201, 17, { 201: 1, 3: 1, 23: 1, 17: 1 }, f1);
-      var uc, hl, lf, dl, nte = At(qs, "Point/Quadrant", 201, an, DV);
-      A(569, 1, {}, u7), w.b = null, w.c = null, w.d = null, w.e = null, w.f = null;
-      var az, oz, sz, uz, cz;
-      G(qs, "RectilinearConvexHull", 569), A(243, 1, { 160: 1 }, y0), w.Ec = function(t) {
-        SW(this, f(t, 48));
-      }, w.b = 0;
-      var iT;
-      G(qs, "RectilinearConvexHull/MaximalElementsEventHandler", 243), A(571, 1, jr, se), w.$b = function(t, n) {
-        return Xj(t, n);
-      }, G(qs, "RectilinearConvexHull/MaximalElementsEventHandler/lambda$0$Type", 571), A(570, 1, { 160: 1 }, rI), w.Ec = function(t) {
-        IX(this, f(t, 48));
-      }, w.a = 0, w.b = null, w.c = null, w.d = null, w.e = null, G(qs, "RectilinearConvexHull/RectangleEventHandler", 570), A(572, 1, jr, pe), w.$b = function(t, n) {
-        return md(), f(t, 48).c == f(n, 48).c ? mr(f(n, 48).d, f(t, 48).d) : mr(f(t, 48).c, f(n, 48).c);
-      }, G(qs, "RectilinearConvexHull/lambda$0$Type", 572), A(573, 1, jr, he), w.$b = function(t, n) {
-        return md(), f(t, 48).c == f(n, 48).c ? mr(f(t, 48).d, f(n, 48).d) : mr(f(t, 48).c, f(n, 48).c);
-      }, G(qs, "RectilinearConvexHull/lambda$1$Type", 573), A(574, 1, jr, de), w.$b = function(t, n) {
-        return md(), f(t, 48).c == f(n, 48).c ? mr(f(n, 48).d, f(t, 48).d) : mr(f(n, 48).c, f(t, 48).c);
-      }, G(qs, "RectilinearConvexHull/lambda$2$Type", 574), A(575, 1, jr, ke), w.$b = function(t, n) {
-        return md(), f(t, 48).c == f(n, 48).c ? mr(f(t, 48).d, f(n, 48).d) : mr(f(n, 48).c, f(t, 48).c);
-      }, G(qs, "RectilinearConvexHull/lambda$3$Type", 575), A(576, 1, jr, Pe), w.$b = function(t, n) {
-        return TZ(t, n);
-      }, G(qs, "RectilinearConvexHull/lambda$4$Type", 576), A(469, 1, {}, YN), G(qs, "Scanline", 469), A(662, 1, {}), G(xs, "AbstractGraphPlacer", 662), A(222, 1, { 222: 1 }, aj);
-      var St;
-      G(xs, "ComponentGroup", 222), A(434, 662, {}, c7), w.Fc = function(t, n) {
-        var i, s, l, h, v, p, m, S, x, L, j, I, R;
-        if (this.a.c = ve(Ze, Me, 1, 0, 4, 1), n.b.c = ve(Ze, Me, 1, 0, 4, 1), t.V()) {
-          n.e.a = 0, n.e.b = 0;
-          return;
-        }
-        for (h = f(t.sb(0), 55), hu(n, h), l = t.mb(); l.G(); )
-          s = f(l.H(), 55), UU(this, s);
-        for (I = new Yr(), R = 2 * f(z(h, (le(), Oi)), 15).a, m = new M(this.a); m.a < m.c.c.length; )
-          v = f(O(m), 222), S = jee(v, R), ws(w4(v.a), I.a, I.b), I.a += S.a, I.b += S.b;
-        if (n.e.a = I.a - R, n.e.b = I.b - R, Pt(ge(jt(z(h, (zt(), gE))))) && He(z(h, (Ee(), of))) === He((fu(), af))) {
-          for (j = t.mb(); j.G(); )
-            x = f(j.H(), 55), Pg(x, x.d.a, x.d.b);
-          for (i = new Ae(), $R(i, t, R), L = t.mb(); L.G(); )
-            x = f(L.H(), 55), dn(Rs(x.d), i.e);
-          dn(Rs(n.e), i.a);
-        }
-        for (p = new M(this.a); p.a < p.c.c.length; )
-          v = f(O(p), 222), lI(n, w4(v.a));
-      }, G(xs, "ComponentGroupGraphPlacer", 434), A(322, 1, {}, Ae), G(xs, "ComponentsCompactor", 322), A(13, 647, ix, Se, ji, _u), w.rb = function(t, n) {
-        Ac(this, t, n);
-      }, w.ib = function(t) {
-        return Le(this, t);
-      }, w.jb = function(t) {
-        return Tn(this, t);
-      }, w.Q = function() {
-        this.c = ve(Ze, Me, 1, 0, 4, 1);
-      }, w.kb = function(t) {
-        return Di(this, t, 0) != -1;
-      }, w.sb = function(t) {
-        return _e(this, t);
-      }, w.V = function() {
-        return this.c.length == 0;
-      }, w.mb = function() {
-        return new M(this);
-      }, w.vb = function(t) {
-        return Fl(this, t);
-      }, w.nb = function(t) {
-        return Cr(this, t);
-      }, w.Xb = function(t, n) {
-        xN(this, t, n);
-      }, w.wb = function(t, n) {
-        return $c(this, t, n);
-      }, w.Y = function() {
-        return this.c.length;
-      }, w.ob = function() {
-        return z9(this);
-      }, w.pb = function(t) {
-        return Vn(this, t);
-      }, G(wt, "ArrayList", 13), A(532, 13, ix, FN), w.ib = function(t) {
-        return xd(this, f(t, 48));
-      }, G(xs, "ComponentsCompactor/Hullpoints", 532), A(529, 1, { 347: 1 }, EO), w.a = !1, G(xs, "ComponentsCompactor/InternalComponent", 529), A(528, 1, Ju, l7), w.mb = function() {
-        return new M(this.a);
-      }, G(xs, "ComponentsCompactor/InternalConnectedComponents", 528), A(531, 1, { 251: 1 }, dA), w.zc = function() {
-        return null;
-      }, w.Ac = function() {
-        return this.a;
-      }, w.yc = function() {
-        return qy(this.d);
-      }, w.Bc = function() {
-        return this.b;
-      }, G(xs, "ComponentsCompactor/InternalExternalExtension", 531), A(530, 1, { 251: 1 }, p7), w.Ac = function() {
-        return this.a;
-      }, w.yc = function() {
-        return qy(this.d);
-      }, w.zc = function() {
-        return this.c;
-      }, w.Bc = function() {
-        return this.b;
-      }, G(xs, "ComponentsCompactor/InternalUnionExternalExtension", 530), A(534, 1, {}, $A), G(xs, "ComponentsCompactor/OuterSegments", 534), A(533, 1, {}, f7), G(xs, "ComponentsCompactor/Segments", 533), A(381, 1, {}, Y9), G(xs, "ComponentsProcessor", 381), A(432, 662, {}, Te), w.Fc = function(t, n) {
-        var i, s, l, h, v, p, m, S, x, L, j, I, R, Y, q, V, U, te, ue, ye, Ce, be;
-        if (t.Y() == 1) {
-          te = f(t.sb(0), 55), te != n && (n.b.c = ve(Ze, Me, 1, 0, 4, 1), rR(n, te, 0, 0), hu(n, te), Nj(n.a, te.a), n.e.a = te.e.a, n.e.b = te.e.b);
-          return;
-        } else if (t.V()) {
-          n.b.c = ve(Ze, Me, 1, 0, 4, 1), n.e.a = 0, n.e.b = 0;
-          return;
-        }
-        for (p = t.mb(); p.G(); ) {
-          for (h = f(p.H(), 55), q = 0, R = new M(h.b); R.a < R.c.c.length; )
-            I = f(O(R), 9), q += f(z(I, (le(), Xa)), 24).a;
-          h.k = q;
-        }
-        for (Ya(t, new Oe()), l = f(t.sb(0), 55), n.b.c = ve(Ze, Me, 1, 0, 4, 1), hu(n, l), j = 0, ye = 0, m = t.mb(); m.G(); )
-          h = f(m.H(), 55), U = h.e, j = je(j, U.a), ye += U.a * U.b;
-        for (j = je(j, Math.sqrt(ye) * f(z(n, (le(), Ph)), 15).a), ue = w8 * f(z(n, Oi), 15).a, Ce = 0, be = 0, L = 0, i = ue, v = t.mb(); v.G(); )
-          h = f(v.H(), 55), U = h.e, Ce + U.a > j && (Ce = 0, be += L + ue, L = 0), Y = h.d, Pg(h, Ce + Y.a, be + Y.b), Y.a = 0, Y.b = 0, i = je(i, Ce + U.a), L = je(L, U.b), Ce += U.a + ue;
-        if (n.e.a = i, n.e.b = be + L, V = f(z(n, Oi), 15).a, Pt(ge(jt(z(l, (zt(), gE)))))) {
-          for (s = new Ae(), $R(s, t, V), x = t.mb(); x.G(); )
-            S = f(x.H(), 55), dn(Rs(S.d), s.e);
-          dn(Rs(n.e), s.a);
-        }
-        lI(n, t);
-      }, G(xs, "SimpleRowGraphPlacer", 432), A(433, 1, jr, Oe), w.$b = function(t, n) {
-        return wU(f(t, 55), f(n, 55));
-      }, G(xs, "SimpleRowGraphPlacer/1", 433), A(369, 1, pn, oP), w.sc = function(t, n) {
-        VR(t, n);
-      };
-      var lz;
-      G(Rg, "CompoundGraphPostprocessor", 369), A(370, 1, uo, ze), w.D = function(t) {
-        var n;
-        return n = f(z(f(t, 114).b, (Ee(), Un)), 44), !!n && n.b != 0;
-      }, G(Rg, "CompoundGraphPostprocessor/1", 370), A(368, 1, pn, XD), w.sc = function(t, n) {
-        fO(this, t, n);
-      }, G(Rg, "CompoundGraphPreprocessor", 368), A(187, 1, { 187: 1 }, $M), w.c = !1, G(Rg, "CompoundGraphPreprocessor/ExternalPort", 187), A(114, 1, { 114: 1 }, N1), w.w = function() {
-        return P1(this.c) + ":" + MI(this.b);
-      }, G(Rg, "CrossHierarchyEdge", 114), A(310, 1, jr, L5), w.$b = function(t, n) {
-        return KK(this, f(t, 114), f(n, 114));
-      }, G(Rg, "CrossHierarchyEdgeComparator", 310), A(147, 131, { 179: 1, 131: 1, 147: 1, 3: 1 }), w.k = 0, G(Zr, "LGraphElement", 147), A(12, 147, { 179: 1, 131: 1, 12: 1, 147: 1, 3: 1 }, bs), w.w = function() {
-        return MI(this);
-      };
-      var Ki = G(Zr, "LEdge", 12);
-      A(55, 147, { 179: 1, 131: 1, 55: 1, 147: 1, 3: 1, 22: 1 }, t3), w.mb = function() {
-        return new M(this.c);
-      }, w.w = function() {
-        return this.c.c.length == 0 ? "G-unlayered" + Qu(this.b) : this.b.c.length == 0 ? "G-layered" + Qu(this.c) : "G[layerless" + Qu(this.b) + ", layers" + Qu(this.c) + "]";
-      };
-      var rte = G(Zr, "LGraph", 55);
-      A(273, 1, {}), w.pc = function() {
-        return this.e.j;
-      }, G(Zr, "LGraphAdapters/AbstractLShapeAdapter", 273), A(240, 1, { 627: 1 }, Zb), w.b = null, G(Zr, "LGraphAdapters/LEdgeAdapter", 240), A(325, 1, {}, hS), w.pc = function() {
-        return this.a.e;
-      }, w.b = null, w.c = !1, G(Zr, "LGraphAdapters/LGraphAdapter", 325), A(224, 273, { 129: 1, 224: 1 }, Iw), G(Zr, "LGraphAdapters/LLabelAdapter", 224), A(555, 273, { 626: 1 }, jD), w.a = null, w.b = null, w.c = !1, G(Zr, "LGraphAdapters/LNodeAdapter", 555), A(556, 273, { 161: 1 }, ND), w.a = null, w.b = null, w.c = null, w.d = !1, G(Zr, "LGraphAdapters/LPortAdapter", 556), A(557, 1, jr, We), w.$b = function(t, n) {
-        return oQ(f(t, 7), f(n, 7));
-      }, G(Zr, "LGraphAdapters/PortComparator", 557), A(168, 1, { 168: 1 }, Lw, lN), w.t = function(t) {
-        var n;
-        return xe(t, 168) ? (n = f(t, 168), this.d == n.d && this.a == n.a && this.b == n.b && this.c == n.c) : !1;
-      }, w.v = function() {
-        var t, n;
-        return t = Xn(ge(this.b)) << 16, t |= Xn(ge(this.a)) & Cs, n = Xn(ge(this.c)) << 16, n |= Xn(ge(this.d)) & Cs, t ^ n;
-      }, w.w = function() {
-        return "Insets[top=" + this.d + ",left=" + this.b + ",bottom=" + this.a + ",right=" + this.c + "]";
-      }, w.a = 0, w.b = 0, w.c = 0, w.d = 0, G(Zr, "LInsets", 168), A(165, 147, { 179: 1, 131: 1, 147: 1, 165: 1, 3: 1 }), G(Zr, "LShape", 165), A(33, 165, { 179: 1, 131: 1, 147: 1, 33: 1, 165: 1, 3: 1 }, LS), w.w = function() {
-        return this.a == null ? "l_" + this.k : "l_" + this.a;
-      }, G(Zr, "LLabel", 33), A(9, 165, { 179: 1, 131: 1, 147: 1, 9: 1, 165: 1, 3: 1 }, qa), w.w = function() {
-        return pN(this);
-      };
-      var kr = G(Zr, "LNode", 9);
-      A(132, 17, { 132: 1, 3: 1, 23: 1, 17: 1 }, ld);
-      var Ii, Cn, Ka, hn, Hn, er, aT = At(Zr, "LNode/NodeType", 132, an, JV);
-      A(7, 165, { 179: 1, 131: 1, 147: 1, 7: 1, 165: 1, 3: 1 }, Yn), w.w = function() {
-        var t;
-        return t = aI(this), t == null ? "p_" + this.k : "p_" + t;
-      };
-      var wk, oT, mk, sT, yk, kk, fz = G(Zr, "LPort", 7);
-      A(399, 1, uo, $e), w.D = function(t) {
-        return J9(t);
-      }, G(Zr, "LPort/1", 399), A(400, 1, uo, Ge), w.D = function(t) {
-        return Q9(t);
-      }, G(Zr, "LPort/2", 400), A(401, 1, uo, me), w.D = function(t) {
-        return f(t, 7).g == (we(), rt);
-      }, G(Zr, "LPort/3", 401), A(402, 1, uo, Ve), w.D = function(t) {
-        return f(t, 7).g == (we(), Be);
-      }, G(Zr, "LPort/4", 402), A(403, 1, uo, Ke), w.D = function(t) {
-        return f(t, 7).g == (we(), ct);
-      }, G(Zr, "LPort/5", 403), A(404, 1, uo, at), w.D = function(t) {
-        return f(t, 7).g == (we(), qe);
-      }, G(Zr, "LPort/6", 404), A(190, 1, Ju, Zh), w.mb = function() {
-        var t;
-        return t = new M(this.a.b), new MP(t);
-      }, G(Zr, "LPort/7", 190), A(405, 1, ir, MP), w.H = function() {
-        return f(O(this.a), 12).c;
-      }, w.G = function() {
-        return Nc(this.a);
-      }, w.I = function() {
-        bd(this.a);
-      }, G(Zr, "LPort/7/1", 405), A(169, 1, Ju, Lf), w.mb = function() {
-        var t;
-        return t = new M(this.a.e), new P5(t);
-      }, G(Zr, "LPort/8", 169), A(304, 1, ir, P5), w.H = function() {
-        return f(O(this.a), 12).d;
-      }, w.G = function() {
-        return Nc(this.a);
-      }, w.I = function() {
-        bd(this.a);
-      }, G(Zr, "LPort/8/1", 304), A(16, 147, { 179: 1, 131: 1, 147: 1, 16: 1, 3: 1, 22: 1 }, Hc), w.mb = function() {
-        return new M(this.a);
-      }, w.w = function() {
-        return "L_" + Di(this.b.c, this, 0) + Qu(this.a);
-      }, G(Zr, "Layer", 16), A(437, 1, pn, ft), w.sc = function(t, n) {
-        var i, s, l, h, v, p, m;
-        for (Nt(n, "Big nodes intermediate-processing", 1), this.a = t, h = new M(this.a.c); h.a < h.c.c.length; )
-          for (l = f(O(h), 16), m = ca(l.a), i = Eo(m, new en()), p = zl(i.b.mb(), i.a); qu(p); )
-            v = f(ql(p), 9), He(z(v, (zt(), Er))) === He(($i(), ev)) || He(z(v, Er)) === He(Tu) ? (s = gC(this, v, !1), ce(s, Er, f(z(v, Er), 85)), ce(v, Er, pf)) : gC(this, v, !0);
-        Ct(n);
-      }, G(bt, "BigNodesIntermediateProcessor", 437), A(438, 1, uo, en), w.D = function(t) {
-        return fW(f(t, 9));
-      }, G(bt, "BigNodesIntermediateProcessor/1", 438), A(582, 1, yi, OP), w.B = function(t) {
-        var n;
-        return oU((n = this, y1(t), n));
-      }, G(bt, "BigNodesLabelHandler/CompoundFunction", 582), A(332, 1, {}, G3), w.a = 0, w.e = null, w.f = 0, G(bt, "BigNodesLabelHandler/Handler", 332), A(583, 1, yi, AP), w.B = function(t) {
-        var n;
-        return wZ((n = this, y1(t), n));
-      }, G(bt, "BigNodesLabelHandler/Handler/1", 583), A(584, 1, yi, ID), w.B = function(t) {
-        var n;
-        return Pq((n = this, y1(t), n));
-      }, G(bt, "BigNodesLabelHandler/Handler/2", 584), A(585, 1, yi, MD), w.B = function(t) {
-        var n;
-        return tee((n = this, y1(t), n));
-      }, G(bt, "BigNodesLabelHandler/Handler/3", 585), A(439, 1, pn, gn), w.sc = function(t, n) {
-        var i, s, l, h, v, p, m, S, x, L, j, I, R, Y;
-        for (Nt(n, "Big nodes post-processing", 1), this.a = t, p = new M(this.a.c); p.a < p.c.c.length; )
-          for (v = f(O(p), 16), i = Eo(v.a, new mt()), S = zl(i.b.mb(), i.a); qu(S); ) {
-            for (m = f(ql(S), 9), L = f(z(m, (le(), fb)), 15), h = xA(this, m), Y = new Se(), R = Jn(h, (we(), Be)).mb(); R.G(); )
-              j = f(R.H(), 7), Y.c[Y.c.length] = j, x = j.i.a - h.j.a, j.i.a = L.a + x;
-            for (m.j.a = L.a, I = new M(Y); I.a < I.c.c.length; )
-              j = f(O(I), 7), cn(j, m);
-            this.a.e.a < m.i.a + m.j.a && (this.a.e.a = m.i.a + m.j.a), l = f(z(m, mL), 20), Tn(m.c, l), s = f(z(m, aE), 64), s && s.B(null);
-          }
-        Ct(n);
-      }, G(bt, "BigNodesPostProcessor", 439), A(440, 1, uo, mt), w.D = function(t) {
-        return hW(f(t, 9));
-      }, G(bt, "BigNodesPostProcessor/1", 440), A(441, 1, pn, z7), w.sc = function(t, n) {
-        var i, s, l, h, v, p, m, S, x, L, j, I;
-        for (Nt(n, y8, 1), this.c = t, L = this.c.b, l = 0, m = new M(L); m.a < m.c.c.length; )
-          v = f(O(m), 9), v.k = l++;
-        for (this.d = f(z(this.c, (le(), Oi)), 15).a, this.a = f(z(this.c, (Ee(), Do)), 59), this.b = L.c.length, h = k8, S = new M(L); S.a < S.c.c.length; )
-          v = f(O(S), 9), v.g == (et(), Hn) && v.j.a < h && (h = v.j.a);
-        for (h = 50 > h ? 50 : h, i = new Se(), I = h + this.d, x = new M(L); x.a < x.c.c.length; )
-          if (v = f(O(x), 9), v.g == (et(), Hn) && v.j.a > I) {
-            for (j = 1, s = v.j.a; s > h; )
-              ++j, s = (v.j.a - (j - 1) * this.d) / j;
-            Le(i, new UN(this, v, j, s));
-          }
-        for (p = new M(i); p.a < p.c.c.length; )
-          v = f(O(p), 267), MQ(v.d) && lee(v);
-        Ct(n);
-      }, w.b = 0, w.d = 0, G(bt, "BigNodesPreProcessor", 441), A(267, 1, { 267: 1 }, UN), w.a = 0, w.c = 0, G(bt, "BigNodesPreProcessor/BigNode", 267), A(442, 1, pn, H7), w.sc = function(t, n) {
-        var i, s, l, h, v, p, m, S, x, L, j, I, R, Y;
-        for (Nt(n, y8, 1), hz = Pt(ge(jt(z(t, (Ee(), Fg))))), this.c = t, I = new Se(), v = new M(t.c); v.a < v.c.c.length; )
-          h = f(O(v), 16), Tn(I, h.a);
-        for (l = 0, x = new M(I); x.a < x.c.c.length; )
-          m = f(O(x), 9), m.k = l++;
-        for (this.d = f(z(this.c, (le(), Oi)), 15).a, this.a = f(z(this.c, Do), 59), this.b = I.c.length, p = k8, L = new M(I); L.a < L.c.c.length; )
-          m = f(O(L), 9), m.g == (et(), Hn) && m.j.a < p && (p = m.j.a);
-        for (p = 50 > p ? 50 : p, i = new Se(), Y = p + this.d, j = new M(I); j.a < j.c.c.length; )
-          if (m = f(O(j), 9), m.g == (et(), Hn) && m.j.a > Y) {
-            for (R = 1, s = m.j.a; s > p; )
-              ++R, s = (m.j.a - (R - 1) * this.d) / R;
-            Le(i, new gN(this, m, R));
-          }
-        for (S = new M(i); S.a < S.c.c.length; )
-          m = f(O(S), 268), Iee(m) && sJ(m);
-        Ct(n);
-      }, w.b = 0, w.d = 0;
-      var hz = !1;
-      G(bt, "BigNodesSplitter", 442), A(268, 1, { 268: 1 }, gN), w.a = 0, w.e = 4, G(bt, "BigNodesSplitter/BigNode", 268), A(443, 1, pn, ht), w.sc = function(t, n) {
-        var i, s, l, h, v, p, m, S;
-        for (Nt(n, "Comment post-processing", 1), m = f(z(t, (le(), Oi)), 15).a, h = new M(t.c); h.a < h.c.c.length; ) {
-          for (l = f(O(h), 16), s = new Se(), p = new M(l.a); p.a < p.c.c.length; )
-            v = f(O(p), 9), S = f(z(v, Jd), 20), i = f(z(v, Zd), 20), (S || i) && (ree(v, S, i, m), S && Tn(s, S), i && Tn(s, i));
-          Tn(l.a, s);
-        }
-        Ct(n);
-      }, G(bt, "CommentPostprocessor", 443), A(444, 1, pn, Rt), w.sc = function(t, n) {
-        var i, s, l, h, v, p, m, S, x, L, j, I, R, Y, q;
-        for (Nt(n, "Comment pre-processing", 1), p = new M(t.b); p.a < p.c.c.length; )
-          if (v = f(O(p), 9), Pt(ge(jt(z(v, (Ee(), $d)))))) {
-            for (s = 0, i = null, m = null, I = new M(v.f); I.a < I.c.c.length; )
-              L = f(O(I), 7), s += L.b.c.length + L.e.c.length, L.b.c.length == 1 && (i = f(_e(L.b, 0), 12), m = i.c), L.e.c.length == 1 && (i = f(_e(L.e, 0), 12), m = i.d);
-            if (s == 1 && m.b.c.length + m.e.c.length == 1 && !Pt(ge(jt(z(m.f, $d)))))
-              xee(v, i, m, m.f), bd(p);
-            else {
-              for (q = new Se(), j = new M(v.f); j.a < j.c.c.length; ) {
-                for (L = f(O(j), 7), x = new M(L.e); x.a < x.c.c.length; )
-                  S = f(O(x), 12), S.d.e.c.length == 0 || (q.c[q.c.length] = S);
-                for (h = new M(L.b); h.a < h.c.c.length; )
-                  l = f(O(h), 12), l.c.b.c.length == 0 || (q.c[q.c.length] = l);
-              }
-              for (Y = new M(q); Y.a < Y.c.c.length; )
-                R = f(O(Y), 12), bu(R, !0);
-            }
-          }
-        Ct(n);
-      }, G(bt, "CommentPreprocessor", 444), A(445, 1, pn, Lt), w.sc = function(t, n) {
-        var i, s, l, h, v, p, m, S, x, L;
-        for (Nt(n, "Edge and layer constraint edge reversal", 1), S = new M(t.b); S.a < S.c.c.length; ) {
-          switch (m = f(O(S), 9), v = f(z(m, (zt(), Er)), 85), h = null, v.e) {
-            case 1:
-            case 2:
-              h = (nh(), lb);
-              break;
-            case 3:
-            case 4:
-              h = (nh(), yp);
-          }
-          if (h)
-            ce(m, (le(), oE), (nh(), lb)), h == yp ? jC(m, v, (sr(), ri)) : h == lb && jC(m, v, (sr(), Ai));
-          else if (ds(f(z(m, (Ee(), dt)), 28)) && m.f.c.length != 0) {
-            for (i = !0, L = new M(m.f); L.a < L.c.c.length; ) {
-              if (x = f(O(L), 7), !(x.g == (we(), Be) && x.b.c.length - x.e.c.length > 0 || x.g == qe && x.b.c.length - x.e.c.length < 0)) {
-                i = !1;
-                break;
-              }
-              if (x.g == qe) {
-                for (l = new M(x.e); l.a < l.c.c.length; )
-                  if (s = f(O(l), 12), p = f(z(s.d.f, Er), 85), p == ($i(), ev) || p == Tu) {
-                    i = !1;
-                    break;
-                  }
-              }
-              if (x.g == Be) {
-                for (l = new M(x.b); l.a < l.c.c.length; )
-                  if (s = f(O(l), 12), p = f(z(s.c.f, Er), 85), p == ($i(), db) || p == gc) {
-                    i = !1;
-                    break;
-                  }
-              }
-            }
-            i && jC(m, v, (sr(), hE));
-          }
-        }
-        Ct(n);
-      }, G(bt, "EdgeAndLayerConstraintEdgeReverser", 445), A(446, 1, pn, yt), w.sc = function(t, n) {
-        var i, s, l, h, v, p, m, S, x, L;
-        for (Nt(n, "End label placement", 1), v = f(z(t, (Ee(), wh)), 15).a, this.a = (On(), new $t()), this.c = new $t(), this.b = new $t(), m = new M(t.c); m.a < m.c.c.length; )
-          for (p = f(O(m), 16), x = new M(p.a); x.a < x.c.c.length; )
-            for (S = f(O(x), 9), s = Dt(En(S)); xt(s); )
-              for (i = f(Et(s), 12), h = new M(i.b); h.a < h.c.c.length; )
-                l = f(O(h), 33), (He(z(l, da)) === He((ys(), ph)) || He(z(l, da)) === He(sl)) && (L = null, He(z(l, da)) === He(ph) ? L = i.c : He(z(l, da)) === He(sl) && (L = i.d), Qf(this.a, L.f) || un(this.a, L.f, 0), Qf(this.c, L.f) || un(this.c, L.f, 0), Qf(this.b, L) || un(this.b, L, 0), He(z(l, (le(), lo))) === He((Gi(), ns)) ? fJ(l, L, v) : lJ(l, L, v));
-        Ct(n);
-      }, G(bt, "EndLabelProcessor", 446), A(269, 1, pn, Mw), w.sc = function(t, n) {
-        var i, s, l, h, v;
-        for (Nt(n, "Graph transformation (" + this.a + ")", 1), l = Gc(t.b), s = new M(t.c); s.a < s.c.c.length; )
-          i = f(O(s), 16), Tn(l, i.a);
-        switch (this.a.e) {
-          case 0:
-            HR(l, t);
-            break;
-          case 1:
-            MR(l), v = f(z(t, (zt(), Nh)), 115), v && ce(t, Nh, UM(v)), ao(t.d), ao(t.e);
-            break;
-          case 2:
-            HR(l, t), See(l, t), MR(l), h = f(z(t, (zt(), Nh)), 115), h && ce(t, Nh, UM(h)), ao(t.d), ao(t.e);
-        }
-        Ct(n);
-      }, G(bt, "GraphTransformer", 269), A(221, 17, { 221: 1, 3: 1, 23: 1, 17: 1 }, im);
-      var uT, cT, lT, ite = At(bt, "GraphTransformer/Mode", 221, an, rV);
-      A(448, 1, pn, Mt), w.sc = function(t, n) {
-        Nt(n, "Hierarchical port constraint processing", 1), gK(t), Gee(t), Ct(n);
-      }, G(bt, "HierarchicalPortConstraintProcessor", 448), A(449, 1, jr, In), w.$b = function(t, n) {
-        return CK(f(t, 9), f(n, 9));
-      }, G(bt, "HierarchicalPortConstraintProcessor/NodeComparator", 449), A(450, 1, pn, Pn), w.sc = function(t, n) {
-        var i, s, l, h, v, p, m, S, x, L;
-        for (Nt(n, "Hierarchical port dummy size processing", 1), m = new Se(), L = new Se(), p = f(z(t, (le(), Oi)), 15).a, x = p * f(z(t, (zt(), Qs)), 15).a, i = x * 2, l = new M(t.c); l.a < l.c.c.length; ) {
-          for (s = f(O(l), 16), m.c = ve(Ze, Me, 1, 0, 4, 1), L.c = ve(Ze, Me, 1, 0, 4, 1), v = new M(s.a); v.a < v.c.c.length; )
-            h = f(O(v), 9), h.g == (et(), Cn) && (S = f(z(h, _r), 32), S == (we(), rt) ? m.c[m.c.length] = h : S == ct && (L.c[L.c.length] = h));
-          gA(m, !0, i), gA(L, !1, i);
-        }
-        Ct(n);
-      }, G(bt, "HierarchicalPortDummySizeProcessor", 450), A(451, 1, pn, Vt), w.sc = function(t, n) {
-        var i, s, l, h;
-        Nt(n, "Orthogonally routing hierarchical port edges", 1), this.a = 0, i = ZQ(t), eee(t, i), HJ(this, t, i), gee(t), s = f(z(t, (Ee(), dt)), 28), l = t.c, AR((Sn(0, l.c.length), f(l.c[0], 16)), s, t), AR(f(_e(l, l.c.length - 1), 16), s, t), h = t.c, bR((Sn(0, h.c.length), f(h.c[0], 16))), bR(f(_e(h, h.c.length - 1), 16)), Ct(n);
-      }, w.a = 0, G(bt, "HierarchicalPortOrthogonalEdgeRouter", 451), A(452, 1, jr, ar), w.$b = function(t, n) {
-        return _F(f(t, 9), f(n, 9));
-      }, G(bt, "HierarchicalPortOrthogonalEdgeRouter/1", 452), A(453, 1, jr, Qe), w.$b = function(t, n) {
-        return xW(f(t, 9), f(n, 9));
-      }, G(bt, "HierarchicalPortOrthogonalEdgeRouter/2", 453), A(454, 1, pn, ne), w.sc = function(t, n) {
-        var i;
-        Nt(n, "Hierarchical port position processing", 1), i = t.c, i.c.length > 0 && lR((Sn(0, i.c.length), f(i.c[0], 16)), t), i.c.length > 1 && lR(f(_e(i, i.c.length - 1), 16), t), Ct(n);
-      }, G(bt, "HierarchicalPortPositionProcessor", 454), A(471, 1, pn, Ie), w.sc = function(t, n) {
-        var i, s, l, h, v, p, m, S, x, L, j, I, R, Y;
-        for (Nt(n, "Hyperedge merging", 1), I = new fn(t.c, 0); I.b < I.d.Y(); )
-          if (j = (ut(I.b < I.d.Y()), f(I.d.sb(I.c = I.b++), 16)), Y = j.a, Y.c.length != 0)
-            for (p = null, L = null, R = 0; R < Y.c.length; R++)
-              i = (Sn(R, Y.c.length), f(Y.c[R], 9)), v = i.g, v == (et(), hn) && L == hn && (l = f(z(i, (le(), Mi)), 7), S = f(z(p, Mi), 7), h = f(z(i, Si), 7), x = f(z(p, Si), 7), s = !!l || !!h, m = !!S || !!x, s && m && (l == S || h == x) && (YX(i, p, l == S, h == x), Sn(R, Y.c.length), aS(Y.c, R, 1), --R, i = p, v = L)), p = i, L = v;
-        Ct(n);
-      }, G(bt, "HyperedgeDummyMerger", 471), A(472, 1, pn, Je), w.sc = function(t, n) {
-        var i, s, l, h, v, p, m, S, x, L;
-        for (Nt(n, "Hypernodes processing", 1), l = new M(t.c); l.a < l.c.c.length; )
-          for (s = f(O(l), 16), p = new M(s.a); p.a < p.c.c.length; )
-            if (v = f(O(p), 9), Pt(ge(jt(z(v, (Ee(), qg))))) && v.f.c.length <= 2) {
-              for (L = 0, x = 0, i = 0, h = 0, S = new M(v.f); S.a < S.c.c.length; )
-                switch (m = f(O(S), 7), m.g.e) {
-                  case 1:
-                    ++L;
-                    break;
-                  case 2:
-                    ++x;
-                    break;
-                  case 3:
-                    ++i;
-                    break;
-                  case 4:
-                    ++h;
-                }
-              L == 0 && i == 0 && Mee(t, v, h <= x);
-            }
-        Ct(n);
-      }, G(bt, "HypernodesProcessor", 472), A(473, 1, pn, Ye), w.sc = function(t, n) {
-        var i, s, l, h, v, p, m, S, x;
-        for (Nt(n, "Layer constraint edge reversal", 1), v = new M(t.c); v.a < v.c.c.length; ) {
-          for (h = f(O(v), 16), x = -1, i = new Se(), S = f(Vn(h.a, ve(kr, Ni, 9, h.a.c.length, 0, 1)), 51), l = 0; l < S.length; l++)
-            s = f(z(S[l], (le(), Zs)), 140), x == -1 ? s != (ms(), gf) && (x = l) : s == (ms(), gf) && (Ar(S[l], null), oh(S[l], x++, h)), s == (ms(), Lh) && Le(i, S[l]);
-          for (m = new M(i); m.a < m.c.c.length; )
-            p = f(O(m), 9), Ar(p, null), Ar(p, h);
-        }
-        Ct(n);
-      }, G(bt, "InLayerConstraintProcessor", 473), A(474, 1, pn, Fe), w.sc = function(t, n) {
-        var i, s, l, h, v, p;
-        if (f(z(t, (le(), qr)), 18).kb((vr(), as))) {
-          for (p = new M(t.b); p.a < p.c.c.length; )
-            h = f(O(p), 9), h.g == (et(), Hn) && (l = f(z(h, (Ee(), Vg)), 65), this.c = Xt(this.c, h.i.a - l.b), this.a = je(this.a, h.i.a + h.j.a + l.c), this.d = Xt(this.d, h.i.b - l.d), this.b = je(this.b, h.i.b + h.j.b + l.a));
-          for (v = new M(t.b); v.a < v.c.c.length; )
-            if (h = f(O(v), 9), h.g != (et(), Hn))
-              switch (h.g.e) {
-                case 2:
-                  if (s = f(z(h, (zt(), Er)), 85), s == ($i(), gc)) {
-                    h.i.a = this.c - 10, aO(h, new bn()).A(new RP(h));
-                    break;
-                  }
-                  if (s == Tu) {
-                    h.i.a = this.a + 10, aO(h, new tt()).A(new BP(h));
-                    break;
-                  }
-                  if (i = f(z(h, Zs), 140), i == (ms(), gf)) {
-                    SR(h).A(new zP(h)), h.i.b = this.d - 10;
-                    break;
-                  }
-                  if (i == Lh) {
-                    SR(h).A(new HP(h)), h.i.b = this.b + 10;
-                    break;
-                  }
-                  break;
-                default:
-                  throw new tn("The node type " + h.g + " is not supported by the " + ate);
-              }
-        }
-      }, w.a = Hr, w.b = Hr, w.c = ki, w.d = ki;
-      var ate = G(bt, "InteractiveExternalPortPositioner", 474);
-      A(475, 1, yi, bn), w.B = function(t) {
-        return f(t, 12).d.f;
-      }, G(bt, "InteractiveExternalPortPositioner/lambda$0$Type", 475), A(476, 1, yi, RP), w.B = function(t) {
-        return GF(this.a, t);
-      }, G(bt, "InteractiveExternalPortPositioner/lambda$1$Type", 476), A(477, 1, yi, tt), w.B = function(t) {
-        return f(t, 12).c.f;
-      }, G(bt, "InteractiveExternalPortPositioner/lambda$2$Type", 477), A(478, 1, yi, BP), w.B = function(t) {
-        return $F(this.a, t);
-      }, G(bt, "InteractiveExternalPortPositioner/lambda$3$Type", 478), A(479, 1, yi, zP), w.B = function(t) {
-        return QF(this.a, t);
-      }, G(bt, "InteractiveExternalPortPositioner/lambda$4$Type", 479), A(480, 1, yi, HP), w.B = function(t) {
-        return JF(this.a, t);
-      }, G(bt, "InteractiveExternalPortPositioner/lambda$5$Type", 480), A(37, 17, { 37: 1, 3: 1, 23: 1, 17: 1 }, nn);
-      var Ek, ib, Sk, Ck, fT, hT, dT, vT, xk, sp, gT, bT, pT, wT, Vd, mT, yT, kT, Tk, up, Lk, ET, cp, lp, fp, ST, Th, hp, CT, xT, TT, Pk, Dk, LT, PT, dp, vp, DT, jT, NT, jk, Nk, Ik, IT, MT, OT, AT, RT, BT, zT, dz = At(bt, "IntermediateProcessorStrategy", 37, an, $Z);
-      A(503, 1, pn, Gt), w.sc = function(t, n) {
-        var i, s, l, h, v, p, m, S, x, L, j, I, R, Y, q, V, U;
-        for (Nt(n, "Inverted port preprocessing", 1), S = t.c, m = new fn(S, 0), i = null, U = new Se(); m.b < m.d.Y(); ) {
-          for (V = i, i = (ut(m.b < m.d.Y()), f(m.d.sb(m.c = m.b++), 16)), j = new M(U); j.a < j.c.c.length; )
-            x = f(O(j), 9), Ar(x, V);
-          for (U.c = ve(Ze, Me, 1, 0, 4, 1), I = new M(i.a); I.a < I.c.c.length; )
-            if (x = f(O(I), 9), x.g == (et(), Hn) && ds(f(z(x, (Ee(), dt)), 28))) {
-              for (q = vC(x, (sr(), Ai), (we(), Be)).mb(); q.G(); )
-                for (R = f(q.H(), 7), p = R.b, v = f(Vn(p, ve(Ki, Yi, 12, p.c.length, 0, 1)), 47), l = 0, h = v.length; l < h; ++l)
-                  s = v[l], GQ(t, R, s, U);
-              for (Y = vC(x, ri, qe).mb(); Y.G(); )
-                for (R = f(Y.H(), 7), p = R.e, v = f(Vn(p, ve(Ki, Yi, 12, p.c.length, 0, 1)), 47), l = 0, h = v.length; l < h; ++l)
-                  s = v[l], AX(t, R, s, U);
-            }
-        }
-        for (L = new M(U); L.a < L.c.c.length; )
-          x = f(O(L), 9), Ar(x, i);
-        Ct(n);
-      }, G(bt, "InvertedPortProcessor", 503), A(481, 1, pn, tr), w.sc = function(t, n) {
-        Nt(n, "Node and Port Label Placement and Node Sizing", 1), jY((Rw(), Rw(), new hS(t, !1))), Ct(n);
-      }, G(bt, "LabelAndNodeSizeProcessor", 481), A(482, 1, pn, sP), w.sc = function(t, n) {
-        var i, s, l, h, v, p, m, S, x, L, j, I, R, Y, q, V, U, te;
-        for (Nt(n, "Label dummy insertions", 1), j = new Se(), x = f(z(t, (Ee(), wh)), 15).a, L = f(z(t, Do), 59), R = new M(t.b); R.a < R.c.c.length; )
-          for (I = f(O(R), 9), q = new M(I.f); q.a < q.c.c.length; )
-            for (Y = f(O(q), 7), p = new M(Y.e); p.a < p.c.c.length; )
-              if (v = f(O(p), 12), v.c.f != v.d.f && Mj(v.b, vz)) {
-                for (U = Ic(v.b.c.length), i = new qa(t), Ha(i, (et(), Ka)), ce(i, (le(), lt), v), ce(i, DL, U), ce(i, dt, (zn(), ni)), ce(i, Mi, v.c), ce(i, Si, v.d), j.c[j.c.length] = i, GA(v, i), te = f(z(v, Jo), 15).a, te < 0 && (te = 0, ce(v, Jo, new Ut(te))), V = Math.floor(te / 2), l = new M(i.f); l.a < l.c.c.length; )
-                  s = f(O(l), 7), s.i.b = V;
-                for (h = i.j, m = new fn(v.b, 0); m.b < m.d.Y(); )
-                  S = (ut(m.b < m.d.Y()), f(m.d.sb(m.c = m.b++), 33)), He(z(S, da)) === He((ys(), $g)) && (L == ($n(), Ws) || L == Ts ? (h.a += S.j.a + x, h.b = je(h.b, S.j.b)) : (h.a = je(h.a, S.j.a), h.b += S.j.b + x), U.c[U.c.length] = S, So(m));
-                (L == ($n(), Ws) || L == Ts) && (h.a -= x), h.b += x + te;
-              }
-        Tn(t.b, j), Ct(n);
-      };
-      var vz;
-      G(bt, "LabelDummyInserter", 482), A(483, 1, uo, hr), w.D = function(t) {
-        return He(z(f(t, 33), (Ee(), da))) === He((ys(), $g));
-      }, G(bt, "LabelDummyInserter/1", 483), A(484, 1, pn, Dn), w.sc = function(t, n) {
-        var i, s, l, h, v, p, m, S, x, L, j;
-        for (Nt(n, "Label dummy removal", 1), l = f(z(t, (Ee(), wh)), 15).a, p = f(z(t, Do), 59), v = new M(t.c); v.a < v.c.c.length; )
-          for (h = f(O(v), 16), S = new fn(h.a, 0); S.b < S.d.Y(); )
-            m = (ut(S.b < S.d.Y()), f(S.d.sb(S.c = S.b++), 9)), m.g == (et(), Ka) && (x = f(z(m, (le(), lt)), 12), j = f(z(x, Jo), 15).a, i = new qn(m.i), He(z(m, lo)) === He((Gi(), Us)) && (i.b += j + l), s = new ot(m.j.a, m.j.b - j - l), L = f(z(m, DL), 20), p == ($n(), Ws) || p == Ts ? GU(L, i, l, s, He(z(m, lo)) !== He(ns)) : IU(L, i, l, s), Tn(x.b, L), TR(m, !1), So(S));
-        Ct(n);
-      }, G(bt, "LabelDummyRemover", 484), A(485, 1, pn, rr), w.sc = function(t, n) {
-        var i, s, l, h, v, p, m, S, x, L, j, I, R, Y, q, V, U;
-        for (Nt(n, "Label dummy switching", 1), i = new Se(), L = new Se(), p = new Se(), I = new Se(), v = new M(t.c); v.a < v.c.c.length; )
-          for (h = f(O(v), 16), x = new M(h.a); x.a < x.c.c.length; )
-            if (S = f(O(x), 9), S.g == (et(), Ka)) {
-              i.c[i.c.length] = S, p.c = ve(Ze, Me, 1, 0, 4, 1), I.c = ve(Ze, Me, 1, 0, 4, 1), Y = S;
-              do
-                Y = f(Et(Dt(Lr(Y))), 12).c.f, Y.g == hn && (p.c[p.c.length] = Y);
-              while (Y.g == hn);
-              U = S;
-              do
-                U = f(Et(Dt(En(U))), 12).d.f, U.g == hn && (I.c[I.c.length] = U);
-              while (U.g == hn);
-              m = p.c.length, R = I.c.length, m > R + 1 ? (j = (m + R) / 2 | 0, Le(L, new pr(S, (Sn(j, p.c.length), f(p.c[j], 9))))) : R > m + 1 && (j = ((R - m) / 2 | 0) - 1, Le(L, new pr(S, (Sn(j, I.c.length), f(I.c[j], 9)))));
-            }
-        for (V = new M(L); V.a < V.c.c.length; )
-          q = f(O(V), 27), gJ(f(q.a, 9), f(q.b, 9));
-        for (l = new M(i); l.a < l.c.c.length; )
-          s = f(O(l), 9), NM(s, new wn(), (le(), Si)), NM(s, new jn(), Mi);
-        Ct(n);
-      }, G(bt, "LabelDummySwitcher", 485), A(486, 1, yi, wn), w.B = function(t) {
-        return f(Et(Dt(Lr(f(t, 9)))), 12).c.f;
-      }, G(bt, "LabelDummySwitcher/lambda$0$Type", 486), A(487, 1, yi, jn), w.B = function(t) {
-        return f(Et(Dt(En(f(t, 9)))), 12).d.f;
-      }, G(bt, "LabelDummySwitcher/lambda$1$Type", 487), A(488, 1, pn, ui), w.sc = function(t, n) {
-        Nt(n, "Label management", 1), y1(z(t, (Y4(), xx))), Ct(n);
-      }, G(bt, "LabelManagementProcessor", 488), A(489, 1, pn, uP), w.sc = function(t, n) {
-        var i, s, l, h, v, p, m, S, x, L, j, I, R, Y;
-        switch (m = f(z(t, (zt(), Nh)), 115), Nt(n, "Label side selection (" + m + ")", 1), S = (vt(t), new Gf(t)), m.e) {
-          case 0:
-            AZ(S);
-            break;
-          case 1:
-            OZ(S);
-            break;
-          case 2:
-            xX(S);
-            break;
-          case 3:
-            CX(S);
-            break;
-          case 4:
-            XJ(S);
-        }
-        for (p = new M(t.c); p.a < p.c.c.length; )
-          for (v = f(O(p), 16), s = new M(v.a); s.a < s.c.c.length; ) {
-            for (i = f(O(s), 9), I = new M(i.f); I.a < I.c.c.length; )
-              for (L = f(O(I), 7), h = new M(L.c); h.a < h.c.c.length; )
-                l = f(O(h), 33), He(z(l, (le(), lo))) === He((Gi(), nb)) && ce(l, lo, gz);
-            if (i.g == (et(), Ka) && He(z(i, (le(), lo))) === He((Gi(), ns)))
-              for (x = f(z(i, lt), 12), Y = f(z(x, (Ee(), Jo)), 15).a, R = i.j.b - Math.ceil(Y / 2), j = new M(i.f); j.a < j.c.c.length; )
-                L = f(O(j), 7), L.i.b = R;
-          }
-        Ct(n);
-      };
-      var gz;
-      G(bt, "LabelSideSelector", 489), A(490, 1, jr, aa), w.$b = function(t, n) {
-        return _q(f(t, 7), f(n, 7));
-      }, G(bt, "LabelSideSelector/1", 490), A(495, 1, pn, cs), w.sc = function(t, n) {
-        var i, s, l, h, v, p, m, S, x, L, j, I, R, Y, q, V, U, te;
-        if (Nt(n, "Layer constraint application", 1), S = t.c, S.c.length == 0) {
-          Ct(n);
-          return;
-        }
-        for (h = (Sn(0, S.c.length), f(S.c[0], 16)), v = f(_e(S, S.c.length - 1), 16), U = new Hc(t), te = new Hc(t), m = new M(S); m.a < m.c.c.length; )
-          for (p = f(O(m), 16), Y = f(Vn(p.a, ve(kr, Ni, 9, p.a.c.length, 0, 1)), 51), j = 0, R = Y.length; j < R; ++j)
-            switch (L = Y[j], i = f(z(L, (zt(), Er)), 85), i.e) {
-              case 1:
-                Ar(L, h), JA(L, !1);
-                break;
-              case 2:
-                Ar(L, U), JA(L, !0);
-                break;
-              case 3:
-                Ar(L, v), oR(L);
-                break;
-              case 4:
-                Ar(L, te), oR(L);
-            }
-        if (S.c.length >= 2) {
-          for (x = !0, q = (Sn(1, S.c.length), f(S.c[1], 16)), I = new M(h.a); I.a < I.c.c.length; ) {
-            if (L = f(O(I), 9), He(z(L, (zt(), Er))) === He(($i(), pf))) {
-              x = !1;
-              break;
-            }
-            for (l = Dt(En(L)); xt(l); )
-              if (s = f(Et(l), 12), s.d.f.d == q) {
-                x = !1;
-                break;
-              }
-            if (!x)
-              break;
-          }
-          if (x) {
-            for (Y = f(Vn(h.a, ve(kr, Ni, 9, h.a.c.length, 0, 1)), 51), j = 0, R = Y.length; j < R; ++j)
-              L = Y[j], Ar(L, q);
-            Cr(S, h);
-          }
-        }
-        if (S.c.length >= 2) {
-          for (x = !0, V = f(_e(S, S.c.length - 2), 16), I = new M(v.a); I.a < I.c.c.length; ) {
-            if (L = f(O(I), 9), He(z(L, (zt(), Er))) === He(($i(), pf))) {
-              x = !1;
-              break;
-            }
-            for (l = Dt(Lr(L)); xt(l); )
-              if (s = f(Et(l), 12), s.c.f.d == V) {
-                x = !1;
-                break;
-              }
-            if (!x)
-              break;
-          }
-          if (x) {
-            for (Y = f(Vn(v.a, ve(kr, Ni, 9, v.a.c.length, 0, 1)), 51), j = 0, R = Y.length; j < R; ++j)
-              L = Y[j], Ar(L, V);
-            Cr(S, v);
-          }
-        }
-        S.c.length == 1 && (Sn(0, S.c.length), f(S.c[0], 16)).a.c.length == 0 && Fl(S, 0), U.a.c.length == 0 || (qc(0, S.c.length), _v(S.c, 0, U)), te.a.c.length == 0 || (S.c[S.c.length] = te), Ct(n);
-      }, G(bt, "LayerConstraintProcessor", 495), A(496, 1, pn, ls), w.sc = function(t, n) {
-        var i, s, l, h, v, p, m, S, x, L, j, I, R;
-        for (Nt(n, "Layer size calculation", 1), S = Zo, m = 5e-324, v = new M(t.c); v.a < v.c.c.length; )
-          if (h = f(O(v), 16), p = h.c, p.a = 0, p.b = 0, h.a.c.length != 0) {
-            for (L = new M(h.a); L.a < L.c.c.length; )
-              x = f(O(L), 9), I = x.j, j = x.e, p.a = je(p.a, I.a + j.b + j.c);
-            s = f(_e(h.a, 0), 9), R = s.i.b - s.e.d, l = f(_e(h.a, h.a.c.length - 1), 9), i = l.i.b + l.j.b + l.e.a, p.b = i - R, S = S < R ? S : R, m = m > i ? m : i;
-          }
-        t.e.b = m - S, t.d.b -= S, Ct(n);
-      }, G(bt, "LayerSizeAndGraphHeightCalculator", 496), A(497, 1, pn, Bo), w.sc = function(t, n) {
-        var i, s, l, h, v;
-        for (Nt(n, "Edge joining", 1), i = Pt(ge(jt(z(t, (zt(), dE))))), l = new M(t.c); l.a < l.c.c.length; )
-          for (s = f(O(l), 16), v = new fn(s.a, 0); v.b < v.d.Y(); )
-            h = (ut(v.b < v.d.Y()), f(v.d.sb(v.c = v.b++), 9)), h.g == (et(), hn) && (TR(h, i), So(v));
-        Ct(n);
-      }, G(bt, "LongEdgeJoiner", 497), A(498, 1, pn, za), w.sc = function(t, n) {
-        var i, s, l, h, v, p, m, S, x, L, j, I;
-        if (Nt(n, "Edge splitting", 1), t.c.c.length <= 2) {
-          Ct(n);
-          return;
-        }
-        for (h = new fn(t.c, 0), v = (ut(h.b < h.d.Y()), f(h.d.sb(h.c = h.b++), 16)); h.b < h.d.Y(); )
-          for (l = v, v = (ut(h.b < h.d.Y()), f(h.d.sb(h.c = h.b++), 16)), m = new M(l.a); m.a < m.c.c.length; )
-            for (p = f(O(m), 9), x = new M(p.f); x.a < x.c.c.length; )
-              for (S = f(O(x), 7), s = new M(S.e); s.a < s.c.c.length; )
-                i = f(O(s), 12), j = i.d, L = j.f.d, L != l && L != v && GA(i, (I = new qa(t), Ha(I, (et(), hn)), ce(I, (le(), lt), i), ce(I, (Ee(), dt), (zn(), ni)), Ar(I, v), I));
-        Ct(n);
-      }, G(bt, "LongEdgeSplitter", 498), A(499, 1, pn, ru), w.sc = function(t, n) {
-        var i, s, l, h, v, p, m, S;
-        for (Nt(n, "Node margin calculation", 1), i = new IP((Rw(), new hS(t, !0))), nK(i), p = f(z(t, (le(), Oi)), 15).a, l = new M(t.c); l.a < l.c.c.length; )
-          for (s = f(O(l), 16), v = new M(s.a); v.a < v.c.c.length; )
-            h = f(O(v), 9), kQ(h, p), m = h.e, S = f(z(h, jL), 65), m.b = je(m.b, S.b), m.c = je(m.c, S.c), m.a = je(m.a, S.a), m.d = je(m.d, S.d);
-        Ct(n);
-      }, G(bt, f8, 499), A(491, 1, pn, Mu), w.sc = function(t, n) {
-        var i, s, l, h, v, p, m, S, x, L;
-        switch (Nt(n, "Node promotion heuristic", 1), this.g = t, vee(this), this.q = f(z(t, (zt(), jp)), 109), S = f(z(this.g, AL), 24).a, l = new Tl(), this.q.e) {
-          case 2:
-          case 1:
-            lh(this, l);
-            break;
-          case 3:
-            for (this.q = (Xc(), bp), lh(this, l), p = 0, v = new M(this.a); v.a < v.c.c.length; )
-              h = f(O(v), 24), p = Jr(p, h.a);
-            p > this.j && (this.q = ab, lh(this, l));
-            break;
-          case 4:
-            for (this.q = (Xc(), bp), lh(this, l), m = 0, s = new M(this.b); s.a < s.c.c.length; )
-              i = Ot(O(s)), m = je(m, (or(i), i));
-            m > this.k && (this.q = ob, lh(this, l));
-            break;
-          case 6:
-            L = Xn(v1(this.f.length * S / 100)), lh(this, new _P(L));
-            break;
-          case 5:
-            x = Xn(v1(this.d * S / 100)), lh(this, new GP(x));
-            break;
-          default:
-            lh(this, l);
-        }
-        VX(this, t), Ct(n);
-      }, w.d = 0, w.e = 0, w.i = 0, w.j = 0, w.k = 0, w.n = 0, G(bt, "NodePromotion", 491), A(492, 1, yi, Tl), w.B = function(t) {
-        return yn(), yn(), ii;
-      }, G(bt, "NodePromotion/lambda$0$Type", 492), A(493, 1, yi, _P), w.B = function(t) {
-        return Nq(this.a, t);
-      }, w.a = 0, G(bt, "NodePromotion/lambda$1$Type", 493), A(494, 1, yi, GP), w.B = function(t) {
-        return Iq(this.a, t);
-      }, w.a = 0, G(bt, "NodePromotion/lambda$2$Type", 494), A(109, 17, { 109: 1, 3: 1, 23: 1, 17: 1 }, Il);
-      var HT, ab, _T, GT, ob, $T, gp, bp, bz = At(bt, "NodePromotionStrategy", 109, an, TW), pz;
-      A(500, 1, pn, xc), w.sc = function(t, n) {
-        var i, s, l, h, v, p, m, S, x, L, j, I, R, Y, q, V, U, te, ue;
-        for (Nt(n, x8, 1), I = f(z(t, (Ee(), of)), 122), l = new M(t.c); l.a < l.c.c.length; )
-          for (s = f(O(l), 16), m = f(Vn(s.a, ve(kr, Ni, 9, s.a.c.length, 0, 1)), 51), v = 0, p = m.length; v < p; ++v)
-            if (h = m[v], h.g == (et(), er)) {
-              if (I == (fu(), U2))
-                for (x = new M(h.f); x.a < x.c.c.length; )
-                  S = f(O(x), 7), S.b.c.length == 0 || AK(S), S.e.c.length == 0 || RK(S);
-              else if (xe(z(h, (le(), lt)), 12))
-                Y = f(z(h, lt), 12), q = f(Jn(h, (we(), qe)).mb().H(), 7), V = f(Jn(h, Be).mb().H(), 7), U = f(z(q, lt), 7), te = f(z(V, lt), 7), Bn(Y, te), kn(Y, U), ue = new qn(V.f.i), ue.a = ln(re(ie(_t, 1), Ht, 10, 0, [te.f.i, te.i, te.a])).a, rn(Y.a, ue), ue = new qn(q.f.i), ue.a = ln(re(ie(_t, 1), Ht, 10, 0, [U.f.i, U.i, U.a])).a, rn(Y.a, ue);
-              else {
-                if (h.f.c.length >= 2) {
-                  for (R = !0, L = new M(h.f), i = f(O(L), 7); L.a < L.c.c.length; )
-                    if (j = i, i = f(O(L), 7), !xo(z(j, lt), z(i, lt))) {
-                      R = !1;
-                      break;
-                    }
-                } else
-                  R = !1;
-                for (x = new M(h.f); x.a < x.c.c.length; )
-                  S = f(O(x), 7), S.b.c.length == 0 || JX(S, R), S.e.c.length == 0 || eQ(S, R);
-              }
-              Ar(h, null);
-            }
-        Ct(n);
-      }, G(bt, "NorthSouthPortPostprocessor", 500), A(501, 1, pn, Ll), w.sc = function(t, n) {
-        var i, s, l, h, v, p, m, S, x, L, j, I, R, Y, q, V, U, te, ue;
-        for (Nt(n, x8, 1), R = new Se(), ue = new Se(), S = new M(t.c); S.a < S.c.c.length; )
-          for (m = f(O(S), 16), q = -1, I = f(Vn(m.a, ve(kr, Ni, 9, m.a.c.length, 0, 1)), 51), L = 0, j = I.length; L < j; ++L)
-            if (x = I[L], ++q, !!(x.g == (et(), Hn) && ds(f(z(x, (Ee(), dt)), 28)))) {
-              for (gi(f(z(x, (Ee(), dt)), 28)) || OX(x), ce(x, (le(), bl), x), R.c = ve(Ze, Me, 1, 0, 4, 1), ue.c = ve(Ze, Me, 1, 0, 4, 1), i = new Se(), te = new Wr(), h3(te, Jn(x, (we(), rt))), YR(t, te, R, ue, i), p = q, h = new M(R); h.a < h.c.c.length; )
-                s = f(O(h), 9), oh(s, p, m), ++q, ce(s, bl, x), v = f(_e(s.f, 0), 7), Y = f(z(v, lt), 7), Pt(ge(jt(z(Y, (zt(), SE))))) || f(z(s, Dh), 20).ib(x);
-              for (Bs(te), U = Jn(x, ct).mb(); U.G(); )
-                V = f(U.H(), 7), wr(te, V, te.a, te.a.a);
-              for (YR(t, te, ue, null, i), l = new M(ue); l.a < l.c.c.length; )
-                s = f(O(l), 9), oh(s, ++q, m), ce(s, bl, x), v = f(_e(s.f, 0), 7), Y = f(z(v, lt), 7), Pt(ge(jt(z(Y, (zt(), SE))))) || f(z(x, Dh), 20).ib(s);
-              i.c.length == 0 || ce(x, wL, i);
-            }
-        Ct(n);
-      }, G(bt, "NorthSouthPortPreprocessor", 501), A(502, 1, jr, Vh), w.$b = function(t, n) {
-        var i, s;
-        return i = t.g, s = n.g, i != s ? i.e - s.e : t.k == n.k ? 0 : i == (we(), rt) ? t.k - n.k : n.k - t.k;
-      }, G(bt, "NorthSouthPortPreprocessor/lambda$0$Type", 502), A(504, 1, pn, oa), w.sc = function(t, n) {
-        var i, s, l, h, v, p;
-        for (Nt(n, "Removing partition constraint edges", 1), s = new M(t.c); s.a < s.c.c.length; )
-          for (i = f(O(s), 16), h = new M(i.a); h.a < h.c.c.length; )
-            for (l = f(O(h), 9), p = new M(l.f); p.a < p.c.c.length; )
-              v = f(O(p), 7), Pt(ge(jt(z(v, (le(), Lp))))) && bd(p);
-        Ct(n);
-      }, G(bt, "PartitionPostprocessor", 504), A(505, 1, pn, Tc), w.sc = function(t, n) {
-        var i, s, l, h, v, p, m, S, x, L;
-        for (Nt(n, "Adding partition constraint edges", 1), this.a = new Se(), p = new M(t.b); p.a < p.c.c.length; )
-          h = f(O(p), 9), l = f(z(h, (Ee(), Hx)), 24), AW(this, l.a).ib(h);
-        for (s = 0; s < this.a.c.length - 1; s++)
-          for (v = f(_e(this.a, s), 20).mb(); v.G(); )
-            for (h = f(v.H(), 9), x = new Yn(), cn(x, h), Bt(x, (we(), Be)), ce(x, (le(), Lp), (yn(), yn(), ii)), S = f(_e(this.a, s + 1), 20).mb(); S.G(); )
-              m = f(S.H(), 9), L = new Yn(), cn(L, m), Bt(L, qe), ce(L, Lp, ii), i = new bs(), ce(i, Lp, ii), ce(i, (Ee(), Gx), gt(20)), Bn(i, x), kn(i, L);
-        this.a = null, Ct(n);
-      }, G(bt, "PartitionPreprocessor", 505), A(506, 1, pn, eo), w.sc = function(t, n) {
-        var i, s, l, h, v, p, m, S, x, L, j, I, R, Y;
-        for (Nt(n, "Port distribution", 1), i = iA(t), I = 0, x = 0, l = 0, v = i.length; l < v; ++l)
-          for (s = i[l], m = 0, S = s.length; m < S; ++m)
-            for (p = s[m], p.k = x++, j = new M(p.f); j.a < j.c.c.length; )
-              L = f(O(j), 7), L.k = I++;
-        for (h = new M(t.c); h.a < h.c.c.length; )
-          s = f(O(h), 16), vX(s);
-        Y = f(z(t, (le(), jh)), 154), R = Xl(Y, 1) != 0 ? new Gw(ve(Op, F0, 26, I, 12, 1)) : new eS(ve(Op, F0, 26, I, 12, 1)), OO(R, i), Ct(n);
-      }, G(bt, "PortDistributionProcessor", 506), A(507, 1, pn, ma), w.sc = function(t, n) {
-        var i, s, l, h, v;
-        for (Nt(n, "Port order processing", 1), v = new to(), s = new M(t.c); s.a < s.c.c.length; )
-          for (i = f(O(s), 16), h = new M(i.a); h.a < h.c.c.length; )
-            l = f(O(h), 9), ds(f(z(l, (Ee(), dt)), 28)) && Ya(l.f, v);
-        Ct(n);
-      }, G(bt, "PortListSorter", 507), A(508, 1, jr, to), w.$b = function(t, n) {
-        return LQ(f(t, 7), f(n, 7));
-      }, G(bt, "PortListSorter/PortComparator", 508), A(509, 1, pn, Wh), w.sc = function(t, n) {
-        var i, s, l, h, v;
-        for (Nt(n, "Port side processing", 1), v = new M(t.b); v.a < v.c.c.length; )
-          l = f(O(v), 9), uA(l);
-        for (s = new M(t.c); s.a < s.c.c.length; )
-          for (i = f(O(s), 16), h = new M(i.a); h.a < h.c.c.length; )
-            l = f(O(h), 9), uA(l);
-        Ct(n);
-      }, G(bt, "PortSideProcessor", 509), A(510, 1, pn, Os), w.sc = function(t, n) {
-        var i, s, l, h, v, p, m, S, x, L;
-        for (Nt(n, "Restoring reversed edges", 1), p = new M(t.c); p.a < p.c.c.length; )
-          for (v = f(O(p), 16), S = new M(v.a); S.a < S.c.c.length; )
-            for (m = f(O(S), 9), L = new M(m.f); L.a < L.c.c.length; )
-              for (x = f(O(L), 7), h = f(Vn(x.e, ve(Ki, Yi, 12, x.e.c.length, 0, 1)), 47), s = 0, l = h.length; s < l; ++s)
-                i = h[s], Pt(ge(jt(z(i, (le(), Xs))))) && bu(i, !1);
-        Ct(n);
-      }, G(bt, "ReversedEdgeRestorer", 510), A(511, 1, pn, qb), w.sc = function(t, n) {
-        var i, s, l, h, v, p, m, S, x, L, j, I, R, Y, q, V, U, te, ue, ye, Ce, be, Ne, Ue, Xe, it, st, Tt, xn, Nn;
-        if (Nt(n, "Sausage Folding", 1), this.b = f(z(t, (le(), Oi)), 15).a, this.a = this.b * f(z(t, (zt(), tv)), 15).a, R = _Z(this, t), I = t.c.c.length, Y = xZ(this, t), st = I * Y, l = f(z(t, (Ee(), Do)), 59), l == ($n(), ja) || l == Fi || l == Po ? s = f(z(t, Ph), 15).a : s = 1 / f(z(t, Ph), 15).a, i = st / R, s > i) {
-          Ct(n);
-          return;
-        }
-        Xe = 0, h = Zo;
-        do
-          ++Xe, i = st / Xe / (R * Xe), j = h, h = i - s <= 0 ? 0 - (i - s) : i - s;
-        while (i > s);
-        for (j < h && --Xe, Ne = I / (1 > Xe ? 1 : Xe) | 0, S = Ne, ue = Ne, Nn = !0; S < I; ) {
-          L = f(_e(t.c, S), 16), Ue = !0, U = null, te = null;
-          e:
-            for (xn = new M(L.a); xn.a < xn.c.c.length; )
-              for (Tt = f(O(xn), 9), p = Dt(Lr(Tt)); xt(p); ) {
-                if (v = f(Et(p), 12), U && U != Tt) {
-                  Ue = !1;
-                  break e;
-                }
-                if (U = Tt, it = v.c.f, te && te != it) {
-                  Ue = !1;
-                  break e;
-                }
-                te = it;
-              }
-          if (Nn && Ue && (ue = 0, Nn = !1), S != ue) {
-            for (ye = f(_e(t.c, ue), 16), V = new M(Gc(L.a)); V.a < V.c.c.length; )
-              if (q = f(O(V), 9), oh(q, ye.a.c.length, ye), ue == 0)
-                for (p = new M(Gc(Lr(q))); p.a < p.c.c.length; )
-                  for (v = f(O(p), 12), bu(v, !0), ce(t, EL, (yn(), yn(), ii)), UQ(t, v), m = new Se(), VQ(t, v.c, v, m), be = new M(m); be.a < be.c.c.length; )
-                    Ce = f(O(be), 9), oh(Ce, ye.a.c.length - 1, ye);
-          }
-          ue >= Ne && (Nn = !0), ++ue, ++S;
-        }
-        for (x = new fn(t.c, 0); x.b < x.d.Y(); )
-          L = (ut(x.b < x.d.Y()), f(x.d.sb(x.c = x.b++), 16)), L.a.c.length == 0 && So(x);
-        Ct(n);
-      }, w.a = 0, w.b = 0, G(bt, "SausageFolding", 511), A(512, 1, pn, bw), w.sc = function(t, n) {
-        var i, s, l, h, v, p, m, S, x, L, j, I, R, Y, q, V, U;
-        for (Nt(n, "Self-loop processing", 1), i = new Se(), x = new M(t.c); x.a < x.c.c.length; ) {
-          for (S = f(O(x), 16), i.c = ve(Ze, Me, 1, 0, 4, 1), j = new M(S.a); j.a < j.c.c.length; )
-            for (L = f(O(j), 9), R = new M(L.f); R.a < R.c.c.length; )
-              for (I = f(O(R), 7), m = f(Vn(I.e, ve(Ki, Yi, 12, I.e.c.length, 0, 1)), 47), v = 0, p = m.length; v < p; ++v)
-                h = m[v], h.c.f == h.d.f && (Y = h.c, V = h.d, q = Y.g, U = V.g, ((q == (we(), rt) || q == ct) && U == qe || q == ct && U == rt || q == Be && U != Be) && bu(h, !1), q == Be && U == qe ? Le(i, IA(t, h, V, Y)) : q == qe && U == Be && Le(i, IA(t, h, Y, V)));
-          for (l = new M(i); l.a < l.c.c.length; )
-            s = f(O(l), 9), Ar(s, S);
-        }
-        Ct(n);
-      }, G(bt, "SelfLoopProcessor", 512), A(513, 1, pn, pw), w.sc = function(t, n) {
-        var i, s, l, h, v, p, m, S, x, L, j, I, R;
-        for (Nt(n, "Spline SelfLoop positioning", 1), x = f(z(t, (zt(), xE)), 153), S = new M(t.c); S.a < S.c.c.length; )
-          for (m = f(O(S), 16), j = new M(m.a); j.a < j.c.c.length; ) {
-            for (L = f(O(j), 9), v = f(z(L, (le(), lE)), 20), p = new Se(), l = v.mb(); l.G(); )
-              i = f(l.H(), 75), zK(i), (I = y4(i.g), na(I, i.i), I).a.Y() == 0 ? p.c[p.c.length] = i : (JQ(i), i.g.a.Y() == 0 || VJ(i));
-            switch (x.e) {
-              case 0:
-                R = new f9(L), fU(R), Oee(R, p);
-                break;
-              case 2:
-                for (h = new M(p); h.a < h.c.c.length; )
-                  i = f(O(h), 75), Dd(i, (wi(), Ds), !0);
-                break;
-              case 1:
-                for (s = new M(p); s.a < s.c.c.length; )
-                  i = f(O(s), 75), Dd(i, (wi(), Ds), !0);
-            }
-            switch (x.e) {
-              case 0:
-              case 1:
-                mQ(v);
-                break;
-              case 2:
-                wQ(v);
-            }
-          }
-        Ct(n);
-      }, G(bt, "SplineSelfLoopPositioner", 513), A(515, 1, {}, f9), G(bt, "SplineSelfLoopPositioner/DistributedLoopSidesCalculator", 515), A(516, 1, {}, KA), w.d = !0, G(bt, "SplineSelfLoopPositioner/DistributedLoopSidesCalculator/SortedLoopSides", 516), A(116, 1, { 116: 1 }, X7), w.a = 0, w.b = 0, G(bt, "SplineSelfLoopPositioner/DistributedLoopSidesCalculator/SortedLoopSides/SizeOfSide", 116), A(318, 1, {}, yC);
-      var vl;
-      G(bt, "SplineSelfLoopPositioner/PortReadder", 318), A(514, 1, jr, Tf), w.$b = function(t, n) {
-        return DF(f(t, 75), f(n, 75));
-      }, G(bt, "SplineSelfLoopPositioner/TextWidthComparator", 514), A(517, 1, pn, yv), w.sc = function(t, n) {
-        var i, s, l, h, v, p, m, S, x, L, j, I, R, Y, q, V, U;
-        for (Nt(n, "Spline SelfLoop pre-processing.", 1), x = new _i(), j = new M(t.b); j.a < j.c.c.length; ) {
-          for (L = f(O(j), 9), oK(L), x.a.Q(), p = Dt(En(L)); xt(p); )
-            h = f(Et(p), 12), Fc(h) && (I = x.a.db(h, x), I == null);
-          for (v = (R = new Wt(x.a).a.bb().mb(), new Zt(R)); v.a.G(); )
-            h = (m = f(v.a.H(), 21), f(m.yb(), 12)), V = h.c.g, U = h.d.g, (V == (we(), rt) && (U == Be || U == ct) || V == Be && U == ct || V == ct && U == qe || V == qe && (U == rt || U == Be)) && bu(h, !1);
-          if (i = nX(x, L), ce(L, (le(), lE), i), !gi(f(z(L, (Ee(), dt)), 28))) {
-            for (q = new $r(), l = new M(i); l.a < l.c.c.length; )
-              s = f(O(l), 75), na(q, ay(s)), na(q, s.i);
-            for (S = new fn(L.f, 0); S.b < S.d.Y(); )
-              Y = (ut(S.b < S.d.Y()), f(S.d.sb(S.c = S.b++), 7)), q.a.R(Y) && So(S);
-          }
-        }
-        Ct(n);
-      }, G(bt, "SplineSelfLoopPreProcessor", 517), A(518, 1, pn, Uh), w.sc = function(t, n) {
-        var i, s, l, h, v, p, m, S, x, L, j, I, R, Y, q, V, U, te, ue, ye, Ce, be, Ne, Ue, Xe, it, st, Tt, xn;
-        for (Nt(n, "Spline SelfLoop routing", 1), Xe = new Wb(), j = new M(t.c); j.a < j.c.c.length; )
-          for (L = f(O(j), 16), U = new M(L.a); U.a < U.c.c.length; ) {
-            for (V = f(O(U), 9), ue = V.f, I = new _i(), s = f(z(V, (le(), lE)), 20).mb(); s.G(); )
-              i = f(s.H(), 75), na(I, i.a);
-            for (ye = new Se(), v = (te = new Wt(I.a).a.bb().mb(), new Zt(te)); v.a.G(); ) {
-              for (h = (p = f(v.a.H(), 21), f(p.yb(), 12)), Ne = h.c, st = h.d, x = new M(h.c.f.f), be = 0, it = 0, m = 0, S = 0; m < 2; )
-                l = f(O(x), 7), Ne == l && (be = S, ++m), st == l && (it = S, ++m), ++S;
-              Ce = f(z(h, hb), 60), Ue = Ce == (wi(), No) || Ce == rs ? ue.c.length - (it - be < 0 ? -(it - be) : it - be) + 1 : it - be < 0 ? -(it - be) : it - be, Le(ye, new $N(be, it, Ue, Ce, h));
-            }
-            if (Ya(ye, Xe), Y = new $r(), R = new M(ye), R.a < R.c.c.length) {
-              for (q = zR(f(O(R), 195), Y); R.a < R.c.c.length; )
-                n3(q, zR(f(O(R), 195), Y));
-              ce(V, jL, (Tt = new e1(), xn = new tA(V.j.a, V.j.b), Tt.d = je(0, xn.d - q.d), Tt.b = je(0, xn.b - q.b), Tt.a = je(0, q.a - xn.a), Tt.c = je(0, q.c - xn.c), Tt));
-            }
-          }
-        Ct(n);
-      }, G(bt, "SplineSelfLoopRouter", 518), A(91, 1, { 91: 1 }, Nd), w.w = function() {
-        return this.b + ": " + this.d + " -> " + this.a + " " + P1(this.c);
-      }, w.a = 0, w.b = 0, w.d = 0, G(bt, "SplineSelfLoopRouter/LoopPadding", 91), A(521, 1, uo, Ej), w.D = function(t) {
-        return DK(this, f(t, 91));
-      }, w.a = 0, w.c = 0, G(bt, "SplineSelfLoopRouter/LoopPadding/EnclosingPredicate", 521), A(520, 1, jr, Vb), w.$b = function(t, n) {
-        return PF(f(t, 91), f(n, 91));
-      }, G(bt, "SplineSelfLoopRouter/LoopPadding/MarginComparator", 520), A(196, 1, uo, Xh), w.D = function(t) {
-        return f(t, 91).c == this.a;
-      }, G(bt, "SplineSelfLoopRouter/LoopPadding/PortSidePredicate", 196), A(195, 1, { 195: 1 }, $N), w.c = 0, w.d = 0, w.e = 0, G(bt, "SplineSelfLoopRouter/SelfLoopEdge", 195), A(519, 1, jr, Wb), w.$b = function(t, n) {
-        return QY(f(t, 195), f(n, 195));
-      }, G(bt, "SplineSelfLoopRouter/SelfLoopEdge/StepSizeComparator", 519), A(82, 25, { 25: 1, 82: 1 }, aC), w.vc = function() {
-        var t, n, i, s;
-        for (n = Jt(this.a, 0); n.b != n.d.c; )
-          t = f(Ft(n), 10), t.a = this.j.d;
-        for (s = Jt(this.c, 0); s.b != s.d.c; )
-          i = f(Ft(s), 10), i.a = this.j.d;
-      }, w.wc = function() {
-        return this.b;
-      }, w.xc = function() {
-        return this.e;
-      }, w.w = function() {
-        return Qu(new Wt(this.d.a));
-      }, w.b = 0, w.e = 0, G(Lo, "CLEdge", 82), A(93, 25, { 25: 1, 93: 1 }, QA), w.vc = function() {
-        this.b.i.a = this.j.d + this.b.e.b;
-      }, w.wc = function() {
-        return this.b.g == (et(), Cn) ? 0 : this.a;
-      }, w.xc = function() {
-        return this.b.g == (et(), Cn) ? 0 : this.c;
-      }, w.w = function() {
-        return ha(z(this.b, (le(), lt)));
-      }, w.a = 0, w.c = 0, G(Lo, "CLNode", 93), A(175, 17, { 175: 1, 3: 1, 23: 1, 17: 1 }, dS);
-      var YT, Mk, wz = At(Lo, "ConstraintCalculationStrategy", 175, an, Fq), mz;
-      A(125, 17, { 125: 1, 3: 1, 23: 1, 17: 1 }, fd);
-      var FT, qT, VT, WT, sb, UT, yz = At(Lo, "GraphCompactionStrategy", 125, an, eW), kz;
-      A(455, 1, pn, y9), w.sc = function(t, n) {
-        var i, s, l;
-        if (s = f(z(t, (zt(), Np)), 125), s != (jd(), sb)) {
-          switch (Nt(n, "Horizontal Compaction", 1), this.a = t, l = new QD(), i = new rC(nQ(l, t)), F7(i, this.b), f(z(t, CE), 175).e) {
-            case 1:
-              Y7(i, Ez);
-              break;
-            default:
-              Y7(i, (Ym(), rz));
-          }
-          switch (s.e) {
-            case 1:
-              _s(i);
-              break;
-            case 2:
-              _s(Ss(i, ($n(), Fi)));
-              break;
-            case 3:
-              _s(Iv(Ss(_s(i), ($n(), Fi))));
-              break;
-            case 4:
-              _s(Iv($w(Ss(_s(i), ($n(), Fi)), new ww())));
-              break;
-            case 5:
-              _s(KY(i, Sz));
-          }
-          Ss(i, ($n(), ja)), i.e = !0, yQ(l), Ct(n);
-        }
-      };
-      var Ez, Sz;
-      G(Lo, "HorizontalGraphCompactor", 455), A(462, 1, {}, $P), w.tc = function(t, n) {
-        var i, s, l;
-        return xe(t, 82) && xe(n, 82) && !ky(r3(f(t, 82).d, f(n, 82).d)) || (i = null, xe(t, 93) && (i = f(t, 93).b), s = null, xe(n, 93) && (s = f(n, 93).b), i && i.g == (et(), Cn) || s && s.g == (et(), Cn)) ? 0 : (l = f(z(this.a.a, (le(), ml)), 134), xm(l, i ? i.g : (et(), hn), s ? s.g : (et(), hn)));
-      }, w.uc = function(t, n) {
-        return xe(t, 82) && xe(n, 82) && !ky(r3(f(t, 82).d, f(n, 82).d)) ? 1 : Xt(t.xc(), n.xc());
-      }, G(Lo, "HorizontalGraphCompactor/1", 462), A(456, 317, {}, Sj), w.Dc = function(t) {
-        var n, i, s;
-        for (this.b = t, s2(this, new mw(), this.a), s2(this, new yw(), this.a), n = ki, s = new M(this.b.a.b); s.a < s.c.c.length; )
-          i = f(O(s), 25), !(xe(i, 93) && f(i, 93).b.g == (et(), Cn)) && (n = Xt(n, ge(sD(this.a, i))));
-        n == ki && (n = 0), s2(this, new kw(), new FP(n));
-      }, G(Lo, "HorizontalGraphCompactor/EdgeAwareScanlineConstraintCalculation", 456), A(457, 1, yi, YP), w.B = function(t) {
-        return sD(this, t);
-      }, G(Lo, "HorizontalGraphCompactor/EdgeAwareScanlineConstraintCalculation/lambda$0$Type", 457), A(458, 1, uo, mw), w.D = function(t) {
-        return xe(f(t, 25), 82);
-      }, G(Lo, "HorizontalGraphCompactor/EdgeAwareScanlineConstraintCalculation/lambda$1$Type", 458), A(459, 1, uo, yw), w.D = function(t) {
-        return xe(f(t, 25), 93);
-      }, G(Lo, "HorizontalGraphCompactor/EdgeAwareScanlineConstraintCalculation/lambda$2$Type", 459), A(460, 1, uo, kw), w.D = function(t) {
-        return !0;
-      }, G(Lo, "HorizontalGraphCompactor/EdgeAwareScanlineConstraintCalculation/lambda$3$Type", 460), A(461, 1, yi, FP), w.B = function(t) {
-        return this.a;
-      }, w.a = 0, G(Lo, "HorizontalGraphCompactor/EdgeAwareScanlineConstraintCalculation/lambda$4$Type", 461), A(463, 1, yi, ww), w.B = function(t) {
-        return jS(), yn(), T3(f(f(t, 27).a, 25).n, f(f(t, 27).b, 59)) ? Rn : ii;
-      }, G(Lo, "HorizontalGraphCompactor/lambda$0$Type", 463), A(553, 1, {}, QD), w.c = !1, G(Lo, "LGraphToCGraphTransformer", 553), A(552, 1, {}, Ew), w.Cc = function(t) {
-        var n, i, s, l, h;
-        for (this.a = t, this.d = new Bw(), this.c = ve(KT, Me, 61, this.a.a.a.c.length, 0, 1), this.b = 0, i = new M(this.a.a.a); i.a < i.c.c.length; )
-          n = f(O(i), 78), n.d = this.b, h = Fv(fD(iS(new Jh(), this.b), n), this.d), this.c[this.b] = h, ++this.b;
-        for (LJ(this), kee(this), kX(this), pC(US(this.d), new j1()), l = new M(this.a.a.b); l.a < l.c.c.length; )
-          s = f(O(l), 25), s.r = this.c[s.f.d].e + s.g.a, s.j.d = s.r;
-      }, w.b = 0, G(Lo, "NetworkSimplexCompaction", 552), A(142, 1, { 142: 1, 23: 1 }, xg), w.F = function(t) {
-        return CW(this, f(t, 142));
-      }, w.c = !1, w.d = !0, w.i = 0, w.j = 0, w.k = 0, w.n = 0, G(Lo, "VerticalSegment", 142), A(586, 1, {}, r9), w.e = !1, G(Da, "AllCrossingsCounter", 586), A(339, 1, {}), G(Da, "BetweenLayerEdgeAllCrossingsCounter", 339), A(613, 1, {}, zO), w.c = 0, w.e = 0, w.i = 0, G(Da, "BetweenLayerEdgeTwoNodeCrossingsCounter", 613), A(284, 1, { 284: 1 }, tM), w.w = function() {
-        return "AdjacencyList [node=" + this.d + ", adjacencies= " + this.a + "]";
-      }, w.b = 0, w.c = 0, w.f = 0, G(Da, "BetweenLayerEdgeTwoNodeCrossingsCounter/AdjacencyList", 284), A(128, 1, { 128: 1, 23: 1 }, _9), w.F = function(t) {
-        return bq(this, f(t, 128));
-      }, w.w = function() {
-        return "Adjacency [position=" + this.c + ", cardinality=" + this.a + ", currentCardinality=" + this.b + "]";
-      }, w.a = 0, w.b = 0, w.c = 0, G(Da, "BetweenLayerEdgeTwoNodeCrossingsCounter/AdjacencyList/Adjacency", 128), A(610, 339, {}, R7), w.Gc = function(t, n) {
-        var i, s, l, h, v, p, m, S, x, L, j, I, R, Y, q, V, U, te, ue, ye, Ce, be, Ne, Ue, Xe, it, st, Tt, xn, Nn, Ri, Xi, pc, wc, wb, Js, ai, Bi, eu, Gr, Xr, Qa, mc, Ns, Lu, yl, ss, Pu, av, fo, Du, ho, wa, ju, ov, mf, yf, yc, sv, jE, u_;
-        for (ho = 0, xn = 0, Xi = t.length; xn < Xi; ++xn)
-          if (st = t[xn], gi(f(z(st, (Ee(), dt)), 28)))
-            for (Xr = new M(st.f); Xr.a < Xr.c.c.length; ) {
-              for (Gr = f(O(Xr), 7), mc = 0, v = new M(Gr.e); v.a < v.c.c.length; )
-                h = f(O(v), 12), st.d != h.d.f.d && ++mc;
-              mc > 0 && (this.a[Gr.k] = ho++);
-            }
-          else {
-            for (wc = 0, Xr = new M(st.f); Xr.a < Xr.c.c.length; ) {
-              for (Gr = f(O(Xr), 7), v = new M(Gr.e); v.a < v.c.c.length; )
-                h = f(O(v), 12), st.d != h.d.f.d && ++wc;
-              this.a[Gr.k] = ho;
-            }
-            wc > 0 && ++ho;
-          }
-        for (yf = 0, Nn = 0, pc = n.length; Nn < pc; ++Nn)
-          if (st = n[Nn], gi(f(z(st, (Ee(), dt)), 28))) {
-            for (wb = 0, Xr = new M(st.f); Xr.a < Xr.c.c.length && (Gr = f(O(Xr), 7), Gr.g == (we(), rt)); )
-              for (v = new M(Gr.b); v.a < v.c.c.length; )
-                if (h = f(O(v), 12), st.d != h.c.f.d) {
-                  ++wb;
-                  break;
-                }
-            for (ai = 0, Ns = new fn(st.f, st.f.c.length); Ns.b > 0; ) {
-              for (Gr = (ut(Ns.b > 0), f(Ns.a.sb(Ns.c = --Ns.b), 7)), mc = 0, v = new M(Gr.b); v.a < v.c.c.length; )
-                h = f(O(v), 12), st.d != h.c.f.d && ++mc;
-              mc > 0 && (Gr.g == (we(), rt) ? (this.a[Gr.k] = yf, ++yf) : (this.a[Gr.k] = yf + wb + ai, ++ai));
-            }
-            yf += ai;
-          } else {
-            for (wc = 0, Xr = new M(st.f); Xr.a < Xr.c.c.length; ) {
-              for (Gr = f(O(Xr), 7), v = new M(Gr.b); v.a < v.c.c.length; )
-                h = f(O(v), 12), st.d != h.c.f.d && ++wc;
-              this.a[Gr.k] = yf;
-            }
-            wc > 0 && ++yf;
-          }
-        for (Qa = new $t(), Y = new $r(), Tt = 0, Ri = t.length; Tt < Ri; ++Tt)
-          for (st = t[Tt], ov = new M(st.f); ov.a < ov.c.c.length; )
-            for (ju = f(O(ov), 7), v = new M(ju.e); v.a < v.c.c.length; )
-              if (h = f(O(v), 12), sv = h.d, st.d != sv.f.d)
-                if (wa = f(ci(li(Qa.d, ju)), 204), yc = f(ci(li(Qa.d, sv)), 204), !wa && !yc)
-                  R = new $9(), Y.a.db(R, Y), rn(R.a, h), rn(R.e, ju), ra(Qa.d, ju, R), rn(R.e, sv), ra(Qa.d, sv, R);
-                else if (!wa)
-                  rn(yc.a, h), rn(yc.e, ju), ra(Qa.d, ju, yc);
-                else if (!yc)
-                  rn(wa.a, h), rn(wa.e, sv), ra(Qa.d, sv, wa);
-                else if (wa == yc)
-                  rn(wa.a, h);
-                else {
-                  for (rn(wa.a, h), eu = Jt(yc.e, 0); eu.b != eu.d.c; )
-                    Bi = f(Ft(eu), 7), ra(Qa.d, Bi, wa);
-                  na(wa.a, yc.a), na(wa.e, yc.e), Y.a.eb(yc) != null;
-                }
-        for (q = f(Ky(Y, ve(ote, { 675: 1, 3: 1, 5: 1, 6: 1 }, 204, Y.a.Y(), 0, 1)), 675), it = t[0].d, Du = n[0].d, j = 0, I = q.length; j < I; ++j)
-          for (L = q[j], L.f = ho, L.g = yf, Xr = Jt(L.e, 0); Xr.b != Xr.d.c; )
-            Gr = f(Ft(Xr), 7), Lu = this.a[Gr.k], Gr.f.d == it ? (Lu < L.f && (L.f = Lu, L.b = au(Gr)), Lu > L.c && (L.c = Lu)) : Gr.f.d == Du && (Lu < L.g && (L.g = Lu), Lu > L.d && (L.d = Lu));
-        for (ah(q, 0, q.length, (Ml(), Ml(), wf)), mf = ve(Kn, Wn, 26, q.length, 12, 1), i = ve(Kn, Wn, 26, yf + 1, 12, 1), U = 0; U < q.length; U++)
-          mf[U] = q[U].g, i[mf[U]] = 1;
-        for (l = 0, te = 0; te < i.length; te++)
-          i[te] == 1 ? i[te] = l : --l;
-        for (yl = 0, ue = 0; ue < mf.length; ue++)
-          mf[ue] += i[mf[ue]], yl = Jr(yl, mf[ue] + 1);
-        for (x = 1; x < yl; )
-          x *= 2;
-        for (u_ = 2 * x - 1, x -= 1, jE = ve(Kn, Wn, 26, u_, 12, 1), s = 0, m = 0, S = mf.length; m < S; ++m)
-          for (p = mf[m], Ce = p + x, ++jE[Ce]; Ce > 0; )
-            Ce % 2 > 0 && (s += jE[Ce + 1]), Ce = (Ce - 1) / 2 | 0, ++jE[Ce];
-        for (Xe = ve(Cz, Me, 158, q.length * 2, 0, 1), ye = 0; ye < q.length; ye++)
-          Xe[2 * ye] = new V1(q[ye], q[ye].f, q[ye].c, 0), Xe[2 * ye + 1] = new V1(q[ye], q[ye].c, q[ye].f, 1);
-        for (ah(Xe, 0, Xe.length, wf), Js = 0, Ne = 0, Ue = Xe.length; Ne < Ue; ++Ne)
-          switch (be = Xe[Ne], be.d) {
-            case 0:
-              ++Js;
-              break;
-            case 1:
-              --Js, s += Js;
-          }
-        for (fo = ve(Cz, Me, 158, q.length * 2, 0, 1), V = 0; V < q.length; V++)
-          fo[2 * V] = new V1(q[V], q[V].g, q[V].d, 0), fo[2 * V + 1] = new V1(q[V], q[V].d, q[V].g, 1);
-        for (ah(fo, 0, fo.length, wf), Js = 0, Pu = 0, av = fo.length; Pu < av; ++Pu)
-          switch (ss = fo[Pu], ss.d) {
-            case 0:
-              ++Js;
-              break;
-            case 1:
-              --Js, s += Js;
-          }
-        return s;
-      }, G(Da, "BetweenLayerHyperedgeAllCrossingsCounter", 610), A(204, 1, { 204: 1, 23: 1 }, $9), w.F = function(t) {
-        return fK(this, f(t, 204));
-      }, w.b = 0, w.c = 0, w.d = 0, w.f = 0, w.g = 0;
-      var ote = G(Da, "BetweenLayerHyperedgeAllCrossingsCounter/Hyperedge", 204);
-      A(158, 1, { 158: 1, 23: 1 }, V1), w.F = function(t) {
-        return JZ(this, f(t, 158));
-      }, w.b = 0, w.c = 0, w.d = 0;
-      var Cz = G(Da, "BetweenLayerHyperedgeAllCrossingsCounter/HyperedgeCorner", 158);
-      A(611, 339, {}, B7), w.Gc = function(t, n) {
-        var i, s, l, h, v, p, m, S, x, L, j, I, R, Y, q, V, U, te, ue, ye, Ce, be, Ne;
-        for (Ne = 0, h = 0, p = t[0].d, ue = n[0].d, x = 0, j = n.length; x < j; ++x)
-          if (m = n[x], gi(f(z(m, (Ee(), dt)), 28))) {
-            for (R = 0, V = new M(m.f); V.a < V.c.c.length && (q = f(O(V), 7), q.g == (we(), rt)); )
-              for (l = new M(q.b); l.a < l.c.c.length; )
-                if (s = f(O(l), 12), s.c.f.d == p) {
-                  ++R;
-                  break;
-                }
-            for (Y = 0, te = new fn(m.f, m.f.c.length); te.b > 0; ) {
-              for (q = (ut(te.b > 0), f(te.a.sb(te.c = --te.b), 7)), U = 0, l = new M(q.b); l.a < l.c.c.length; )
-                s = f(O(l), 12), s.c.f.d == p && ++U;
-              U > 0 && (q.g == (we(), rt) ? (this.a[q.k] = Ne, ++Ne) : (this.a[q.k] = Ne + R + Y, ++Y), h += U);
-            }
-            Ne += Y;
-          } else {
-            for (I = 0, V = new M(m.f); V.a < V.c.c.length; ) {
-              for (q = f(O(V), 7), l = new M(q.b); l.a < l.c.c.length; )
-                s = f(O(l), 12), s.c.f.d == p && ++I;
-              this.a[q.k] = Ne;
-            }
-            I > 0 && (++Ne, h += I);
-          }
-        for (ye = ve(Kn, Wn, 26, h, 12, 1), v = 0, S = 0, L = t.length; S < L; ++S)
-          if (m = t[S], gi(f(z(m, (Ee(), dt)), 28)))
-            for (V = new M(m.f); V.a < V.c.c.length; )
-              for (q = f(O(V), 7), Ce = v, l = new M(q.e); l.a < l.c.c.length; )
-                s = f(O(l), 12), be = s.d, be.f.d == ue && cM(ye, Ce, v++, this.a[be.k]);
-          else
-            for (Ce = v, V = new M(m.f); V.a < V.c.c.length; )
-              for (q = f(O(V), 7), l = new M(q.e); l.a < l.c.c.length; )
-                s = f(O(l), 12), be = s.d, be.f.d == ue && cM(ye, Ce, v++, this.a[be.k]);
-        return i = jZ(Ne, h, ye), i;
-      }, G(Da, "BetweenLayerStraightEdgeAllCrossingsCounter", 611), A(338, 1, {}, K3), w.b = 0, w.e = !1, G(Da, "CrossingMatrixFiller", 338), A(447, 1, pn, Sw), w.sc = function(t, n) {
-        var i, s, l, h;
-        if (Nt(n, "Greedy switch crossing reduction", 1), this.e = f(z(t, (zt(), mE)), 110), i = t.c.c.length, i < 2 || this.e == (Dg(), nE)) {
-          Ct(n);
-          return;
-        }
-        oJ(this, t), this.e.b ? (this.e.a ? C3(this) : W4(this), s = VK(this), l = this.e.a ? this.c : Qy(this.b, this.d), this.i = !this.i, this.d = this.g, this.e.a ? C3(this) : W4(this), h = this.e.a ? this.c : Qy(this.b, this.d), l <= h && f3(this, s)) : this.e.a ? C3(this) : W4(this), ZZ(this, this.a), Ct(n);
-      }, w.c = 0, w.i = !0, G(Da, "GreedySwitchProcessor", 447), A(340, 1, {}, L3), G(Da, "InLayerEdgeAllCrossingsCounter", 340), A(614, 340, {}, nj), w.b = 0, w.d = 0, G(Da, "InLayerEdgeTwoNodeCrossingCounter", 614), A(226, 1, { 226: 1, 23: 1 }, E4), w.F = function(t) {
-        return jK(this, f(t, 226));
-      }, w.w = function() {
-        return "ComparableEdgeAndPort [port=" + this.b + ", edge=" + this.a + ", portPosition=" + this.c + "]";
-      }, w.c = 0, G(Da, "InLayerEdgeTwoNodeCrossingCounter/ComparableEdgeAndPort", 226), A(612, 1, {}, PO), w.e = !0, w.f = 0, w.g = 0, w.k = !1, G(Da, "NorthSouthEdgeAllCrossingsCounter", 612), A(615, 1, {}, oM), w.b = 0, w.d = 0, w.e = !1, G(Da, "NorthSouthEdgeNeighbouringNodeCrossingsCounter", 615), A(143, 1, Ju, Oc), w.mb = function() {
-        return Qc(this);
-      }, w.b = 0, G(Da, "PortIterable", 143), A(344, 1, ir, I4), w.H = function() {
-        return f(Yj(this.a), 7);
-      }, w.G = function() {
-        return this.a.b > 0;
-      }, w.I = function() {
-        throw new Fn();
-      }, G(Da, "PortIterable/1", 344), A(336, 1, {}, q3), G(Da, "SwitchDecider", 336), A(89, 1, { 89: 1 }, no), w.w = function() {
-        return "NEdge[id=" + this.b + " w=" + this.f + " d=" + this.a + "]";
-      }, w.a = 1, w.b = 0, w.e = !1, w.f = 0;
-      var xz = G(_d, "NEdge", 89);
-      A(157, 1, {}, Pl), G(_d, "NEdge/NEdgeBuilder", 157), A(278, 1, {}, Bw), G(_d, "NGraph", 278), A(61, 1, { 61: 1 }, VN), w.b = 0, w.d = -1, w.e = 0, w.i = -1, w.j = !1;
-      var KT = G(_d, "NNode", 61);
-      A(333, 13, ix, _5), w.rb = function(t, n) {
-        ++this.d, qc(t, this.c.length), _v(this.c, t, n);
-      }, w.ib = function(t) {
-        return Yu(this, t);
-      }, w.jb = function(t) {
-        return ++this.d, Tn(this, t);
-      }, w.Q = function() {
-        ++this.d, this.c = ve(Ze, Me, 1, 0, 4, 1);
-      }, w.vb = function(t) {
-        return ++this.d, Fl(this, t);
-      }, w.nb = function(t) {
-        return PS(this, t);
-      }, G(_d, "NNode/ChangeAwareArrayList", 333), A(199, 1, {}, Jh), G(_d, "NNode/NNodeBuilder", 199), A(595, 1, {}, kv), w.a = !1, w.f = yr, w.j = 0, G(_d, "NetworkSimplex", 595), A(193, 17, { 180: 1, 193: 1, 3: 1, 23: 1, 17: 1 }, vS), w.rc = function() {
-        switch (this.e) {
-          case 0:
-            return new vj();
-          case 1:
-            return new iP();
-          default:
-            throw new tn("No implementation is available for the cycle breaker " + (this.d != null ? this.d : "" + this.e));
-        }
-      };
-      var Ok, ZT, Tz = At(sx, "CycleBreakingStrategy", 193, an, qq), Lz;
-      A(539, 1, Xo, vj), w.qc = function(t) {
-        return Pz;
-      }, w.sc = function(t, n) {
-        var i, s, l, h, v, p, m, S, x, L, j, I, R, Y, q, V, U, te, ue, ye, Ce, be, Ne, Ue, Xe, it, st, Tt, xn, Nn;
-        for (Nt(n, "Greedy cycle removal", 1), V = t.b, Nn = V.c.length, this.a = ve(Kn, Wn, 26, Nn, 12, 1), this.c = ve(Kn, Wn, 26, Nn, 12, 1), this.b = ve(Kn, Wn, 26, Nn, 12, 1), p = 0, Y = new M(V); Y.a < Y.c.c.length; ) {
-          for (I = f(O(Y), 9), I.k = p, Ce = new M(I.f); Ce.a < Ce.c.c.length; ) {
-            for (ue = f(O(Ce), 7), h = new M(ue.b); h.a < h.c.c.length; )
-              i = f(O(h), 12), i.c.f != I && (Ue = f(z(i, (le(), Xa)), 24).a, this.a[p] += Ue > 0 ? Ue + 1 : 1);
-            for (l = new M(ue.e); l.a < l.c.c.length; )
-              i = f(O(l), 12), i.d.f != I && (Ue = f(z(i, (le(), Xa)), 24).a, this.c[p] += Ue > 0 ? Ue + 1 : 1);
-          }
-          this.c[p] == 0 ? rn(this.d, I) : this.a[p] == 0 && rn(this.e, I), ++p;
-        }
-        for (j = -1, L = 1, S = new Se(), Xe = f(z(t, (le(), jh)), 154); Nn > 0; ) {
-          for (; this.d.b != 0; )
-            st = f(JS(this.d), 9), this.b[st.k] = j--, mC(this, st), --Nn;
-          for (; this.e.b != 0; )
-            Tt = f(JS(this.e), 9), this.b[Tt.k] = L++, mC(this, Tt), --Nn;
-          if (Nn > 0) {
-            for (x = Ys, q = new M(V); q.a < q.c.c.length; )
-              I = f(O(q), 9), this.b[I.k] == 0 && (U = this.c[I.k] - this.a[I.k], U >= x && (U > x && (S.c = ve(Ze, Me, 1, 0, 4, 1), x = U), S.c[S.c.length] = I));
-            m = f(_e(S, A3(Xe, S.c.length)), 9), this.b[m.k] = L++, mC(this, m), --Nn;
-          }
-        }
-        for (it = V.c.length + 1, p = 0; p < V.c.length; p++)
-          this.b[p] < 0 && (this.b[p] += it);
-        for (R = new M(V); R.a < R.c.c.length; )
-          for (I = f(O(R), 9), Ne = f(Vn(I.f, ve(fz, E8, 7, I.f.c.length, 0, 1)), 346), ye = 0, be = Ne.length; ye < be; ++ye)
-            for (ue = Ne[ye], te = f(Vn(ue.e, ve(Ki, Yi, 12, ue.e.c.length, 0, 1)), 47), s = 0, v = te.length; s < v; ++s)
-              i = te[s], xn = i.d.f.k, this.b[I.k] > this.b[xn] && (bu(i, !0), ce(t, EL, (yn(), yn(), ii)));
-        this.a = null, this.c = null, this.b = null, Bs(this.e), Bs(this.d), Ct(n);
-      };
-      var Pz;
-      G(sx, "GreedyCycleBreaker", 539), A(540, 1, Xo, iP), w.qc = function(t) {
-        return Dz;
-      }, w.sc = function(t, n) {
-        var i, s, l, h, v, p, m, S, x, L, j, I, R, Y;
-        for (Nt(n, "Interactive cycle breaking", 1), x = new Se(), j = new M(t.b); j.a < j.c.c.length; )
-          for (L = f(O(j), 9), L.k = 1, I = $3(L).a, S = ks(L, (sr(), ri)).mb(); S.G(); )
-            for (m = f(S.H(), 7), l = new M(m.e); l.a < l.c.c.length; )
-              i = f(O(l), 12), R = i.d.f, R != L && (Y = $3(R).a, Y < I && (x.c[x.c.length] = i));
-        for (h = new M(x); h.a < h.c.c.length; )
-          i = f(O(h), 12), bu(i, !0);
-        for (x.c = ve(Ze, Me, 1, 0, 4, 1), p = new M(t.b); p.a < p.c.c.length; )
-          v = f(O(p), 9), v.k > 0 && eA(this, v, x);
-        for (s = new M(x); s.a < s.c.c.length; )
-          i = f(O(s), 12), bu(i, !0);
-        x.c = ve(Ze, Me, 1, 0, 4, 1), Ct(n);
-      };
-      var Dz;
-      G(sx, "InteractiveCycleBreaker", 540), A(543, 1, Xo, Ub), w.qc = function(t) {
-        return pi($u(new An(), (Pr(), Tk)), hp);
-      }, w.sc = function(t, n) {
-        var i, s, l, h, v, p, m, S, x, L, j, I, R, Y;
-        for (Nt(n, "Interactive node layering", 1), i = new Se(), L = new M(t.b); L.a < L.c.c.length; ) {
-          for (S = f(O(L), 9), p = S.i.a, v = p + S.j.a, v = p + 1 > v ? p + 1 : v, Y = new fn(i, 0), s = null; Y.b < Y.d.Y(); )
-            if (I = (ut(Y.b < Y.d.Y()), f(Y.d.sb(Y.c = Y.b++), 239)), I.c >= v) {
-              ut(Y.b > 0), Y.a.sb(Y.c = --Y.b);
-              break;
-            } else
-              I.a > p && (s ? (Tn(s.b, I.b), s.a = je(s.a, I.a), So(Y)) : (Le(I.b, S), I.c = Xt(I.c, p), I.a = je(I.a, v), s = I));
-          s || (s = new h7(), s.c = p, s.a = v, su(Y, s), Le(s.b, S));
-        }
-        for (h = t.c, m = 0, R = new M(i); R.a < R.c.c.length; )
-          for (I = f(O(R), 239), l = new Hc(t), l.k = m++, h.c[h.c.length] = l, j = new M(I.b); j.a < j.c.c.length; )
-            S = f(O(j), 9), Ar(S, l), S.k = 0;
-        for (x = new M(t.b); x.a < x.c.c.length; )
-          S = f(O(x), 9), S.k == 0 && WA(this, S, t);
-        for (; (Sn(0, h.c.length), f(h.c[0], 16)).a.c.length == 0; )
-          Sn(0, h.c.length), h.c.splice(0, 1);
-        t.b.c = ve(Ze, Me, 1, 0, 4, 1), Ct(n);
-      }, G(q0, "InteractiveLayerer", 543), A(239, 1, { 239: 1 }, h7), w.a = 0, w.c = 0, G(q0, "InteractiveLayerer/LayerSpan", 239), A(173, 17, { 180: 1, 173: 1, 3: 1, 23: 1, 17: 1 }, am), w.rc = function() {
-        switch (this.e) {
-          case 0:
-            return new d9();
-          case 1:
-            return new rP();
-          case 2:
-            return new Ub();
-          default:
-            throw new tn("No implementation is available for the layerer " + (this.d != null ? this.d : "" + this.e));
-        }
-      };
-      var XT, QT, Ak, jz = At(q0, "LayeringStrategy", 173, an, iV), Nz;
-      A(542, 1, Xo, rP), w.qc = function(t) {
-        var n;
-        return n = O1(Iz), Pt(ge(jt(z(t, (zt(), wE))))) || He(z(t, rv)) === He((lu(), iv)) ? xr(n, Mz) : He(z(t, rv)) === He((lu(), gb)) && xr(n, Oz), Pt(ge(jt(z(t, BL)))) && Ca(n, (Pr(), IT)), n;
-      }, w.sc = function(t, n) {
-        var i, s, l, h, v;
-        for (Nt(n, "Longest path layering", 1), this.a = t, v = this.a.b, this.b = ve(Kn, Wn, 26, v.c.length, 12, 1), i = 0, h = new M(v); h.a < h.c.c.length; )
-          s = f(O(h), 9), s.k = i, this.b[i] = -1, ++i;
-        for (l = new M(v); l.a < l.c.c.length; )
-          s = f(O(l), 9), PA(this, s);
-        v.c = ve(Ze, Me, 1, 0, 4, 1), this.a = null, this.b = null, Ct(n);
-      };
-      var Iz, Mz, Oz;
-      G(q0, "LongestPathLayerer", 542), A(541, 1, Xo, d9), w.qc = function(t) {
-        var n;
-        return n = O1(Az), Pt(ge(jt(z(t, (zt(), wE))))) || He(z(t, rv)) === He((lu(), iv)) ? (xr(n, Rz), this.d = (lu(), iv)) : He(z(t, rv)) === He((lu(), gb)) && (xr(n, Bz), this.d = gb), n;
-      }, w.sc = function(t, n) {
-        var i, s, l, h, v, p, m, S, x, L;
-        if (Nt(n, "Network simplex layering", 1), this.b = t, L = f(z(t, (zt(), nv)), 24).a * 4, x = this.b.b, x.c.length < 1) {
-          Ct(n);
-          return;
-        }
-        for (s = Jt(EQ(this, x), 0); s.b != s.d.c; )
-          for (i = f(Ft(s), 20), h = L * Xn(VD(i.Y())), l = pQ(i), pC(q7(ZY(V7(US(l), h), this.b), this.d == (lu(), iv)), Vl(n, 1)), p = this.b.c, S = new M(l.a); S.a < S.c.c.length; ) {
-            for (m = f(O(S), 61); p.c.length <= m.e; )
-              Ac(p, p.c.length, new Hc(this.b));
-            v = f(m.f, 9), Ar(v, f(_e(p, m.e), 16));
-          }
-        x.c = ve(Ze, Me, 1, 0, 4, 1), this.a = null, this.b = null, this.c = null, Ct(n);
-      };
-      var Az, Rz, Bz;
-      G(q0, "NetworkSimplexLayerer", 541), A(326, 1, {}), G(rc, "AbstractPortDistributor", 326), A(558, 1, jr, VP), w.$b = function(t, n) {
-        return pK(this, f(t, 7), f(n, 7));
-      }, G(rc, "AbstractPortDistributor/1", 558), A(564, 1, {}, kI), G(rc, "BarycenterHeuristic", 564), A(272, 1, { 272: 1 }, KP), w.b = 0, w.d = 0, w.e = !1;
-      var zz = G(rc, "BarycenterHeuristic/BarycenterState", 272);
-      A(565, 1, jr, WP), w.$b = function(t, n) {
-        return vZ(this.a, t, n);
-      }, G(rc, "BarycenterHeuristic/lambda$0$Type", 565), A(192, 17, { 180: 1, 192: 1, 3: 1, 23: 1, 17: 1 }, gS), w.rc = function() {
-        switch (this.e) {
-          case 0:
-            return new cD();
-          case 1:
-            return new cP();
-          default:
-            throw new tn("No implementation is available for the crossing minimizer " + (this.d != null ? this.d : "" + this.e));
-        }
-      };
-      var Rk, Bk, Hz = At(rc, "CrossingMinimizationStrategy", 192, an, Vq), _z;
-      A(526, 1, Xo, cP), w.qc = function(t) {
-        var n;
-        return n = O1(Gz), f(z(t, (le(), qr)), 18).kb((vr(), df)) && pi(n, (Pr(), jk)), n;
-      }, w.sc = function(t, n) {
-        var i, s, l, h, v, p, m, S, x, L, j, I, R;
-        for (Nt(n, "Interactive crossing minimization", 1), j = 0, l = new M(t.c); l.a < l.c.c.length; ) {
-          for (s = f(O(l), 16), i = 0, S = 0, m = new M(s.a); m.a < m.c.c.length; )
-            for (v = f(O(m), 9), v.i.a > 0 && (i += v.i.a + v.j.a / 2, ++S), L = new M(v.f); L.a < L.c.c.length; )
-              x = f(O(L), 7), x.k = j++;
-          for (i /= S, R = ve(Zi, mi, 26, s.a.c.length, 12, 1), h = 0, p = new M(s.a); p.a < p.c.c.length; )
-            v = f(O(p), 9), v.k = h++, R[v.k] = OJ(v, i), v.g == (et(), hn) && ce(v, (le(), TL), R[v.k]);
-          Ya(s.a, new UP(R));
-        }
-        I = new Gw(ve(Op, F0, 26, j, 12, 1)), OO(I, iA(t)), Ct(n);
-      };
-      var Gz;
-      G(rc, "InteractiveCrossingMinimizer", 526), A(527, 1, jr, UP), w.$b = function(t, n) {
-        return uZ(this, f(t, 9), f(n, 9));
-      }, G(rc, "InteractiveCrossingMinimizer/1", 527), A(525, 1, Xo, cD), w.qc = function(t) {
-        var n;
-        return n = O1($z), f(z(t, (le(), qr)), 18).kb((vr(), df)) && pi(n, (Pr(), jk)), n;
-      }, w.sc = function(t, n) {
-        var i, s, l, h, v, p, m, S, x, L, j, I, R, Y, q, V, U, te, ue, ye, Ce, be, Ne, Ue, Xe, it, st, Tt;
-        if (Nt(n, "Layer sweep crossing minimization", 1), it = f(z(t, (le(), jh)), 154), q = t.c.c.length, q < 2) {
-          Ct(n);
-          return;
-        }
-        for (Aee(this, t), s = yr, Tt = f(z(t, (zt(), nv)), 24).a, i = ve(zz, Dr, 671, t.c.c.length, 0, 2), j = 0, Y = new M(t.c); Y.a < Y.c.c.length; ) {
-          for (R = f(O(Y), 16), R.k = j, i[j] = ve(zz, { 671: 1, 3: 1, 5: 1, 6: 1 }, 272, R.a.c.length, 0, 1), I = 0, ye = new M(R.a); ye.a < ye.c.c.length; )
-            ue = f(O(ye), 9), ue.k = I, i[j][I] = new KP(ue), ++I;
-          ++j;
-        }
-        for (l = new hA(i, this.g), h = new kI(i, l, it, this.j), be = new Gw(this.j), te = new eS(this.j), st = 0; st < Tt && s > 0; st++) {
-          x = Xl(it, 1) != 0, S = x ? 0 : q - 1, m = this.b[S], Ue = Xl(it, 1) != 0 ? be : te, x3(m, h, x, !1, !0), v = yr, p = !0;
-          do {
-            if (s3(this.b, this.k), Xe = v, v = 0, v += K4(this.f, m, S), x) {
-              for (V = 1; V < q; V++)
-                L = this.b[V], G4(Ue, m, (sr(), ri)), x3(L, h, !0, !p, !1), v += K4(this.f, L, V), this.d[V] || this.c[V - 1] ? v += WR(this.e, m, L) : v += qR(this.i, m, L), m = L;
-              S = q - 1;
-            } else {
-              for (V = q - 2; V >= 0; V--)
-                L = this.b[V], G4(Ue, m, (sr(), Ai)), x3(L, h, !1, !p, !1), v += K4(this.f, L, V), this.c[V] || this.d[V + 1] ? v += WR(this.e, L, m) : v += qR(this.i, L, m), m = L;
-              S = 0;
-            }
-            p = !1, x = !x;
-          } while (v < Xe && v > 0);
-          (v < s || Xe < s) && (v <= Xe ? (s3(this.b, this.a), s = v) : (s3(this.k, this.a), s = Xe));
-        }
-        for (U = new fn(t.c, 0); U.b < U.d.Y(); )
-          for (R = (ut(U.b < U.d.Y()), f(U.d.sb(U.c = U.b++), 16)), Ne = this.a[U.b - 1], Ce = new fn(R.a, 0); Ce.b < Ce.d.Y(); )
-            ut(Ce.b < Ce.d.Y()), Ce.d.sb(Ce.c = Ce.b++), KS(Ce, Ne[Ce.b - 1]);
-        this.j = null, this.a = null, this.b = null, this.k = null, this.i = null, this.e = null, this.c = null, this.d = null, p4(this.g), Ct(n);
-      };
-      var $z;
-      G(rc, "LayerSweepCrossingMinimizer", 525), A(327, 326, {}, eS), w.Hc = function(t, n, i) {
-        var s, l, h, v, p, m, S, x, L, j, I, R;
-        if (j = this.a, gi(f(z(t, (Ee(), dt)), 28)))
-          switch (i.e) {
-            case 1: {
-              for (l = 0, p = 0, L = new M(t.f); L.a < L.c.c.length; )
-                S = f(O(L), 7), S.b.c.length != 0 && (++l, S.g == (we(), rt) && ++p);
-              for (m = n + p, R = n + l, x = ks(t, (sr(), Ai)).mb(); x.G(); )
-                S = f(x.H(), 7), S.g == (we(), rt) ? (j[S.k] = m, --m) : (j[S.k] = R, --R);
-              return l;
-            }
-            case 2: {
-              for (I = 0, x = ks(t, (sr(), ri)).mb(); x.G(); )
-                S = f(x.H(), 7), ++I, j[S.k] = n + I;
-              return I;
-            }
-            default:
-              throw new ed();
-          }
-        else {
-          for (v = 4, h = 0, L = ks(t, i).mb(); L.G(); )
-            S = f(L.H(), 7), s = jA(i, S.g), v = v < s - 1 ? v : s - 1, h = h > s ? h : s;
-          if (h > v) {
-            for (x = ks(t, i).mb(); x.G(); )
-              S = f(x.H(), 7), j[S.k] = n + jA(i, S.g) - v;
-            return h - v;
-          }
-          return 0;
-        }
-      }, G(rc, "LayerTotalPortDistributor", 327), A(274, 326, {}, Gw), w.Hc = function(t, n, i) {
-        var s, l, h, v, p, m, S, x, L, j, I;
-        if (L = this.a, gi(f(z(t, (Ee(), dt)), 28)))
-          switch (i.e) {
-            case 1: {
-              for (l = 0, h = 0, x = new M(t.f); x.a < x.c.c.length; )
-                m = f(O(x), 7), m.b.c.length != 0 && (++l, m.g == (we(), rt) && ++h);
-              for (s = 1 / (l + 1), v = n + h * s, I = n + 1 - s, S = ks(t, (sr(), Ai)).mb(); S.G(); )
-                m = f(S.H(), 7), m.g == (we(), rt) ? (L[m.k] = v, v -= s) : (L[m.k] = I, I -= s);
-              break;
-            }
-            case 2: {
-              for (p = 0, x = new M(t.f); x.a < x.c.c.length; )
-                m = f(O(x), 7), m.e.c.length == 0 || ++p;
-              for (s = 1 / (p + 1), j = n + s, S = ks(t, (sr(), ri)).mb(); S.G(); )
-                m = f(S.H(), 7), L[m.k] = j, j += s;
-              break;
-            }
-            default:
-              throw new tn(ux);
-          }
-        else
-          for (S = ks(t, i).mb(); S.G(); )
-            m = f(S.H(), 7), L[m.k] = n + PX(i, m.g);
-        return 1;
-      }, G(rc, "NodeRelativePortDistributor", 274), A(566, 1, {}, hA), G(P8, "ForsterConstraintResolver", 566), A(102, 1, { 102: 1 }, sN, LR), w.w = function() {
-        var t, n;
-        for (n = new ad(), n.a += "[", t = 0; t < this.d.length; t++)
-          io(n, pN(this.d[t])), ka(this.g, this.d[0]).a != null && io(io((n.a += "<", n), vD(ge(ka(this.g, this.d[0]).a))), ">"), t < this.d.length - 1 && (n.a += ", ");
-        return n.a += "]", n.a;
-      }, w.a = 0, w.c = 0, w.f = 0;
-      var Yz = G(P8, "ForsterConstraintResolver/ConstraintGroup", 102);
-      A(331, 1, {}), G(zg, "AbstractCrossingsCounter", 331), A(568, 331, {}, Dj), G(zg, "BarthJuengerMutzelCrossingsCounter", 568), A(567, 331, {}, jj), G(zg, "HyperedgeCrossingsCounter", 567), A(197, 1, { 197: 1, 23: 1 }, U9), w.F = function(t) {
-        return TK(this, f(t, 197));
-      }, w.b = 0, w.c = 0, w.e = 0, w.f = 0;
-      var ste = G(zg, "HyperedgeCrossingsCounter/Hyperedge", 197);
-      A(156, 1, { 156: 1, 23: 1 }, W1), w.F = function(t) {
-        return yX(this, f(t, 156));
-      }, w.b = 0, w.c = 0;
-      var Fz = G(zg, "HyperedgeCrossingsCounter/HyperedgeCorner", 156);
-      A(242, 17, { 242: 1, 3: 1, 23: 1, 17: 1 }, mS);
-      var ub, cb, ute = At(zg, "HyperedgeCrossingsCounter/HyperedgeCorner/Type", 242, an, dV);
-      A(545, 1, Xo, lP), w.qc = function(t) {
-        return f(z(t, (le(), qr)), 18).kb((vr(), as)) ? qz : null;
-      }, w.sc = function(t, n) {
-        var i, s;
-        for (Nt(n, "Interactive node placement", 1), this.a = f(z(t, (le(), ml)), 134), s = new M(t.c); s.a < s.c.c.length; )
-          i = f(O(s), 16), GX(this, i);
-        Ct(n);
-      };
-      var qz;
-      G(Hg, "InteractiveNodePlacer", 545), A(546, 1, Xo, fP), w.qc = function(t) {
-        return f(z(t, (le(), qr)), 18).kb((vr(), as)) ? Vz : null;
-      }, w.sc = function(t, n) {
-        Nt(n, "Linear segments node placement", 1), this.b = f(z(t, (le(), ml)), 134), $ee(this, t), FQ(this, t), wJ(this, t), Dee(this), this.a = null, this.b = null, Ct(n);
-      };
-      var Vz, pp, wp;
-      G(Hg, "LinearSegmentsNodePlacer", 546), A(111, 1, { 111: 1, 23: 1 }, $5), w.F = function(t) {
-        return aF(this, f(t, 111));
-      }, w.t = function(t) {
-        var n;
-        return xe(t, 111) ? (n = f(t, 111), this.b == n.b) : !1;
-      }, w.v = function() {
-        return this.b;
-      }, w.w = function() {
-        return "ls" + Qu(this.f);
-      }, w.a = 0, w.b = 0, w.c = -1, w.d = -1, w.i = 0;
-      var Wz = G(Hg, "LinearSegmentsNodePlacer/LinearSegment", 111);
-      A(548, 1, Xo, hP), w.qc = function(t) {
-        return f(z(t, (le(), qr)), 18).kb((vr(), as)) ? Uz : null;
-      }, w.sc = function(t, n) {
-        var i, s, l, h, v, p, m, S, x, L, j, I, R, Y, q, V, U, te, ue, ye, Ce, be, Ne, Ue, Xe, it, st, Tt, xn, Nn;
-        for (Tt = f(z(t, (le(), ml)), 134), ue = (On(), new $t()), te = 0, l = new Bw(), m = new M(t.c); m.a < m.c.c.length; )
-          for (v = f(O(m), 16), Xe = null, Ue = null, I = new M(v.a); I.a < I.c.c.length; )
-            j = f(O(I), 9), ++te, U = Fv(new Jh(), l), U.f = j, ra(ue.d, j, U), j.e.d = v1(j.e.d), Ue && (V = new no(), V.f = 0, V.a = Xn(xS(Xe.e.d + Xe.j.b + Xe.e.a + Kv(Tt, f(Ue.f, 9), j))), V.c = Ue, V.d = U, Yu(Ue.g, V), Yu(U.c, V)), Xe = j, Ue = U;
-        for (S = new M(t.c); S.a < S.c.c.length; )
-          for (v = f(O(S), 16), I = new M(v.a); I.a < I.c.c.length; )
-            for (j = f(O(I), 9), be = new M(j.f); be.a < be.c.c.length; )
-              Ce = f(O(be), 7), Nn = Ce.i.b + Ce.a.b, Nn != Math.floor(Nn) && (ye = Nn - YV(ZW(Math.round(Nn))), Ce.i.b -= ye);
-        for (p = new M(t.c); p.a < p.c.c.length; )
-          for (v = f(O(p), 16), I = new M(v.a); I.a < I.c.c.length; )
-            for (j = f(O(I), 9), L = Dt(En(j)); xt(L); )
-              x = f(Et(L), 12), !Fc(x) && x.d.f.d != v && (st = x.c.f.e.d + x.c.i.b + x.c.a.b, xn = x.d.f.e.d + x.d.i.b + x.d.a.b, i = xn - st, Ne = Xn(i), s = Fv(new Jh(), l), R = new no(), R.f = xO(x), R.a = Ne > 0 ? Ne : 0, R.c = s, R.d = f(Kt(ue, x.c.f), 61), Yu(R.c.g, R), Yu(R.d.c, R), it = new no(), it.f = xO(x), it.a = Ne < 0 ? -Ne : 0, it.c = s, it.d = f(Kt(ue, x.d.f), 61), Yu(it.c.g, it), Yu(it.d.c, it));
-        for (h = f(z(t, (zt(), nv)), 24).a * Xn(Math.sqrt(te)), pC(q7(V7(US(l), h), !1), Vl(n, 1)), q = new M(l.a); q.a < q.c.c.length; )
-          Y = f(O(q), 61), Y.f != null && (j = f(Y.f, 9), j.i.b = Y.e + j.e.d);
-      };
-      var Uz;
-      G(Hg, "NetworkSimplexPlacer", 548), A(141, 17, { 180: 1, 141: 1, 3: 1, 23: 1, 17: 1 }, Bv), w.rc = function() {
-        switch (this.e) {
-          case 0:
-            return new dP();
-          case 1:
-            return new lP();
-          case 2:
-            return new fP();
-          case 3:
-            return new UD();
-          case 4:
-            return new hP();
-          default:
-            throw new tn("No implementation is available for the node placer " + (this.d != null ? this.d : "" + this.e));
-        }
-      };
-      var zk, JT, eL, tL, nL, Kz = At(Hg, "NodePlacementStrategy", 141, an, pW), Zz;
-      A(544, 1, Xo, dP), w.qc = function(t) {
-        return f(z(t, (le(), qr)), 18).kb((vr(), as)) ? Xz : null;
-      }, w.sc = function(t, n) {
-        var i, s, l, h, v, p, m, S, x, L;
-        for (Nt(n, "Simple node placement", 1), L = f(z(t, (le(), ml)), 134), p = 0, h = new M(t.c); h.a < h.c.c.length; ) {
-          for (s = f(O(h), 16), v = s.c, v.b = 0, i = null, S = new M(s.a); S.a < S.c.c.length; )
-            m = f(O(S), 9), i && (v.b += xm(L, m.g, i.g) * L.d), v.b += m.e.d + m.j.b + m.e.a, i = m;
-          p = je(p, v.b);
-        }
-        for (l = new M(t.c); l.a < l.c.c.length; )
-          for (s = f(O(l), 16), v = s.c, x = (p - v.b) / 2, i = null, S = new M(s.a); S.a < S.c.c.length; )
-            m = f(O(S), 9), i && (x += xm(L, m.g, i.g) * L.d), x += m.e.d, m.i.b = x, x += m.j.b + m.e.a, i = m;
-        Ct(n);
-      };
-      var Xz;
-      G(Hg, "SimpleNodePlacer", 544), A(81, 1, { 81: 1 }, Jc), w.w = function() {
-        var t;
-        return t = "", this.c == (Co(), cc) ? t += Ad : this.c == Ps && (t += Od), this.k == (oo(), ku) ? t += "DOWN" : this.k == Za ? t += "UP" : t += "BALANCED", t;
-      }, G(Qo, "BKAlignedLayout", 81), A(248, 17, { 248: 1, 3: 1, 23: 1, 17: 1 }, yS);
-      var Ps, cc, cte = At(Qo, "BKAlignedLayout/HDirection", 248, an, vV);
-      A(247, 17, { 247: 1, 3: 1, 23: 1, 17: 1 }, kS);
-      var ku, Za, lte = At(Qo, "BKAlignedLayout/VDirection", 247, an, gV);
-      A(596, 1, {}, YD), G(Qo, "BKAligner", 596), A(599, 1, {}, MO), G(Qo, "BKCompactor", 599), A(279, 1, { 279: 1 }, fs), w.a = 0, G(Qo, "BKCompactor/ClassEdge", 279), A(200, 1, { 200: 1 }, b7), w.a = 0, w.b = 0, G(Qo, "BKCompactor/ClassNode", 200), A(547, 1, Xo, UD), w.qc = function(t) {
-        return f(z(t, (le(), qr)), 18).kb((vr(), as)) ? Qz : null;
-      }, w.sc = function(t, n) {
-        var i, s, l, h, v, p, m, S, x, L, j, I, R, Y, q, V, U, te;
-        switch (Nt(n, "Brandes & Koepf node placement", 1), this.b = t, this.d = YQ(t), this.a = Pt(ge(jt(z(t, (zt(), NL))))), this.e = He(z(t, Dp)) === He((mg(), Qk)), MJ(this, t), I = (fi(4, nl), new ji(4)), f(z(t, Dp), 124).e) {
-          case 3:
-            R = new Jc(t, this.d.d, (oo(), ku), (Co(), Ps)), I.c[I.c.length] = R;
-            break;
-          case 1:
-            Y = new Jc(t, this.d.d, (oo(), Za), (Co(), Ps)), I.c[I.c.length] = Y;
-            break;
-          case 4:
-            U = new Jc(t, this.d.d, (oo(), ku), (Co(), cc)), I.c[I.c.length] = U;
-            break;
-          case 2:
-            te = new Jc(t, this.d.d, (oo(), Za), (Co(), cc)), I.c[I.c.length] = te;
-            break;
-          default:
-            R = new Jc(t, this.d.d, (oo(), ku), (Co(), Ps)), Y = new Jc(t, this.d.d, Za, Ps), U = new Jc(t, this.d.d, ku, cc), te = new Jc(t, this.d.d, Za, cc), I.c[I.c.length] = U, I.c[I.c.length] = te, I.c[I.c.length] = R, I.c[I.c.length] = Y;
-        }
-        for (i = new YD(t, this.d), h = new M(I); h.a < h.c.c.length; )
-          s = f(O(h), 81), Eee(i, s, this.c), XQ(s);
-        for (x = new MO(t, this.d), v = new M(I); v.a < v.c.c.length; )
-          s = f(O(v), 81), oee(x, s);
-        if (this.a)
-          for (p = new M(I); p.a < p.c.c.length; )
-            s = f(O(p), 81), Rl(), s + "" + u2(s);
-        if (S = null, this.e && (m = mee(this, I, this.d.d), aR(this, t, m) && (S = m)), !S)
-          for (p = new M(I); p.a < p.c.c.length; )
-            s = f(O(p), 81), aR(this, t, s) && (!S || u2(S) > u2(s)) && (S = s);
-        for (!S && (S = (Sn(0, I.c.length), f(I.c[0], 81))), j = new M(t.c); j.a < j.c.c.length; )
-          for (L = f(O(j), 16), V = new M(L.a); V.a < V.c.c.length; )
-            q = f(O(V), 9), q.i.b = ge(S.n[q.k]) + ge(S.d[q.k]);
-        for (this.a && (Rl(), "" + CA(S), "" + jX(S)), l = new M(I); l.a < l.c.c.length; )
-          s = f(O(l), 81), s.f = null, s.b = null, s.a = null, s.d = null, s.i = null, s.g = null, s.n = null;
-        uU(this.d), this.c.a.Q(), Ct(n);
-      }, w.a = !1, w.e = !1;
-      var Qz;
-      G(Qo, "BKNodePlacer", 547), A(194, 17, { 194: 1, 3: 1, 23: 1, 17: 1 }, ES);
-      var Hk, _k, Jz = At(Qo, "CompactionStrategy", 194, an, bV), eH;
-      A(597, 1, {}, Cw), w.d = 0, G(Qo, "NeighborhoodInformation", 597), A(598, 1, jr, XP), w.$b = function(t, n) {
-        return sU(this, f(t, 27), f(n, 27));
-      }, G(Qo, "NeighborhoodInformation/NeighborComparator", 598), A(334, 1, {}), G(Qo, "ThresholdStrategy", 334), A(602, 334, {}, j7), w.Ic = function(t, n, i) {
-        return this.a.k == (oo(), Za) ? ki : Hr;
-      }, w.Jc = function() {
-      }, G(Qo, "ThresholdStrategy/NullThresholdStrategy", 602), A(249, 1, { 249: 1 }, FD), w.c = !1, w.d = !1, G(Qo, "ThresholdStrategy/Postprocessable", 249), A(603, 334, {}, N7), w.Ic = function(t, n, i) {
-        var s, l, h;
-        return l = n == i, s = this.a.a[i.k] == n, l || s ? (h = t, this.a.c == (Co(), cc) ? (l && (h = g2(this, n, !0)), (h == 1 / 0 || h == -1 / 0) && s && (h = g2(this, i, !1))) : (l && (h = g2(this, n, !0)), (h == 1 / 0 || h == -1 / 0) && s && (h = g2(this, i, !1))), h) : t;
-      }, w.Jc = function() {
-        for (var t, n, i, s; this.d.b != 0; )
-          s = f(aV(this.d), 249), i = ZA(this, s), i.a && (t = i.a, this.c.a[t.c.f.d.k] !== this.c.a[t.d.f.d.k] && (n = TA(this, s), n || t9(this.e, s)));
-        for (; this.e.a.c.length != 0; )
-          TA(this, f(xM(this.e), 249));
-      }, G(Qo, "ThresholdStrategy/SimpleThresholdStrategy", 603), A(423, 1, { 180: 1 }, U6), w.rc = function() {
-        switch (this.a.e) {
-          case 1:
-            return new KD();
-          case 3:
-            return new gP();
-          default:
-            return new vP();
-        }
-      }, G(rl, "EdgeRouterFactory", 423), A(538, 1, Xo, vP), w.qc = function(t) {
-        var n, i;
-        return i = f(z(t, (le(), qr)), 18), n = new An(), i.kb((vr(), Ep)) && (xr(n, iH), xr(n, rL)), (i.kb(df) || Pt(ge(jt(z(t, (zt(), vb)))))) && (xr(n, rL), i.kb(vf) && xr(n, oH)), i.kb(as) && xr(n, rH), i.kb(Sp) && xr(n, sH), i.kb(tE) && xr(n, aH), i.kb(Ud) && xr(n, tH), i.kb(Kd) && xr(n, nH), n;
-      }, w.sc = function(t, n) {
-        var i, s, l, h, v, p, m, S, x, L, j, I, R;
-        Nt(n, "Orthogonal edge routing", 1), j = f(z(t, (le(), ml)), 134), Pt(ge(jt(z(t, (Ee(), Fg))))), x = new e2(0, j.a), R = 0, h = new fn(t.c, 0), v = null, p = null;
-        do
-          m = h.b < h.d.Y() ? (ut(h.b < h.d.Y()), f(h.d.sb(h.c = h.b++), 16)) : null, S = m ? m.a : null, v && (IC(v, R), R += v.c.a), I = v ? R + j.b : R, L = xC(x, t, p, S, I), s = !v || wm(p, (S0(), mp)), l = !m || wm(S, (S0(), mp)), L > 0 ? (i = j.b + (L - 1) * j.a, m && (i += j.b), i < j.f && !s && !l && (i = j.f), R += i) : !s && !l && (R += j.f), v = m, p = S;
-        while (m);
-        t.e.a = R, Ct(n);
-      };
-      var tH, nH, rH, iH, aH, rL, oH, sH;
-      G(rl, "OrthogonalEdgeRouter", 538), A(277, 1, {}, e2), w.a = 0, w.c = 0, G(rl, "OrthogonalRoutingGenerator", 277), A(118, 1, { 118: 1 }, u0), w.w = function() {
-        return this.a + "->" + this.b;
-      }, w.c = 0, G(rl, "OrthogonalRoutingGenerator/Dependency", 118), A(80, 1, { 80: 1, 23: 1 }, uM), w.F = function(t) {
-        return oF(this, f(t, 80));
-      }, w.t = function(t) {
-        var n;
-        return xe(t, 80) ? (n = f(t, 80), this.d == n.d) : !1;
-      }, w.v = function() {
-        return this.d;
-      }, w.w = function() {
-        var t, n, i, s;
-        for (t = new id("{"), s = new M(this.g); s.a < s.c.c.length; )
-          i = f(O(s), 7), n = n0(i.f), n == null && (n = "n" + ej(i.f)), t.a += "" + n, s.a < s.c.c.length && (t.a += ",");
-        return t.a += "}", t.a;
-      }, w.a = NaN, w.c = 0, w.d = 0, w.f = 0, w.i = 0, w.k = NaN, G(rl, "OrthogonalRoutingGenerator/HyperNode", 80), A(580, 1, {}, QP), w.Kc = function(t, n) {
-        var i, s, l, h, v, p, m, S, x, L;
-        for (L = n + t.i * this.a.c, p = new M(t.g); p.a < p.c.c.length; )
-          for (v = f(O(p), 7), m = ln(re(ie(_t, 1), Ht, 10, 0, [v.f.i, v.i, v.a])).a, s = new M(v.e); s.a < s.c.c.length; )
-            i = f(O(s), 12), S = i.d, x = ln(re(ie(_t, 1), Ht, 10, 0, [S.f.i, S.i, S.a])).a, (m - x <= 0 ? 0 - (m - x) : m - x) > pu && (l = new ot(m, L), rn(i.a, l), Lg(this.a, i, t, l, !1), h = new ot(x, L), rn(i.a, h), Lg(this.a, i, t, h, !1));
-      }, w.Lc = function(t) {
-        return t.f.i.a + t.i.a + t.a.a;
-      }, w.Mc = function() {
-        return we(), ct;
-      }, w.Nc = function() {
-        return we(), rt;
-      }, G(rl, "OrthogonalRoutingGenerator/NorthToSouthRoutingStrategy", 580), A(581, 1, {}, JP), w.Kc = function(t, n) {
-        var i, s, l, h, v, p, m, S, x, L;
-        for (L = n - t.i * this.a.c, p = new M(t.g); p.a < p.c.c.length; )
-          for (v = f(O(p), 7), m = ln(re(ie(_t, 1), Ht, 10, 0, [v.f.i, v.i, v.a])).a, s = new M(v.e); s.a < s.c.c.length; )
-            i = f(O(s), 12), S = i.d, x = ln(re(ie(_t, 1), Ht, 10, 0, [S.f.i, S.i, S.a])).a, (m - x <= 0 ? 0 - (m - x) : m - x) > pu && (l = new ot(m, L), rn(i.a, l), Lg(this.a, i, t, l, !1), h = new ot(x, L), rn(i.a, h), Lg(this.a, i, t, h, !1));
-      }, w.Lc = function(t) {
-        return t.f.i.a + t.i.a + t.a.a;
-      }, w.Mc = function() {
-        return we(), rt;
-      }, w.Nc = function() {
-        return we(), ct;
-      }, G(rl, "OrthogonalRoutingGenerator/SouthToNorthRoutingStrategy", 581), A(579, 1, {}, e7), w.Kc = function(t, n) {
-        var i, s, l, h, v, p, m, S, x, L;
-        for (L = n + t.i * this.a.c, p = new M(t.g); p.a < p.c.c.length; )
-          for (v = f(O(p), 7), m = ln(re(ie(_t, 1), Ht, 10, 0, [v.f.i, v.i, v.a])).b, s = new M(v.e); s.a < s.c.c.length; )
-            i = f(O(s), 12), S = i.d, x = ln(re(ie(_t, 1), Ht, 10, 0, [S.f.i, S.i, S.a])).b, (m - x <= 0 ? 0 - (m - x) : m - x) > pu && (l = new ot(L, m), rn(i.a, l), Lg(this.a, i, t, l, !0), h = new ot(L, x), rn(i.a, h), Lg(this.a, i, t, h, !0));
-      }, w.Lc = function(t) {
-        return t.f.i.b + t.i.b + t.a.b;
-      }, w.Mc = function() {
-        return we(), Be;
-      }, w.Nc = function() {
-        return we(), qe;
-      }, G(rl, "OrthogonalRoutingGenerator/WestToEastRoutingStrategy", 579), A(535, 1, Xo, KD), w.qc = function(t) {
-        var n, i;
-        return i = f(z(t, (le(), qr)), 18), n = new An(), (i.kb((vr(), df)) || Pt(ge(jt(z(t, (zt(), vb)))))) && (xr(n, lH), i.kb(vf) && xr(n, fH)), i.kb(Ud) && xr(n, uH), i.kb(Kd) && xr(n, cH), n;
-      }, w.sc = function(t, n) {
-        var i, s, l, h, v, p, m, S, x, L, j, I, R, Y, q, V, U, te, ue, ye;
-        for (Nt(n, "Polyline edge routing", 1), L = f(z(t, (le(), Oi)), 15).a, i = f(z(t, (zt(), Qs)), 15).a, q = 0, t.c.c.length != 0 && (V = LA(f(_e(t.c, 0), 16)), q = 0.4 * i * V), h = new fn(t.c, 0); h.b < h.d.Y(); ) {
-          for (l = (ut(h.b < h.d.Y()), f(h.d.sb(h.c = h.b++), 16)), s = wm(l, mp), s && q > 0 && (q -= L), IC(l, q), m = 0, x = new M(l.a); x.a < x.c.c.length; ) {
-            for (S = f(O(x), 9), p = 0, I = Dt(En(S)); xt(I); )
-              j = f(Et(I), 12), R = Pi(j.c).b, Y = Pi(j.d).b, l == j.d.f.d && (U = j.c, te = j.d, ue = (ln(re(ie(_t, 1), Ht, 10, 0, [U.f.i, U.i, U.a])).b + ln(re(ie(_t, 1), Ht, 10, 0, [te.f.i, te.i, te.a])).b) / 2, U.g == (we(), Be) ? ye = new ot(q + U.f.d.c.a + 0.4 * i * (R - Y <= 0 ? 0 - (R - Y) : R - Y), ue) : ye = new ot(q - 0.4 * i * (R - Y <= 0 ? 0 - (R - Y) : R - Y), ue), T1(j.a, 0, ye), j.c.g == qe && (R = 0, Y = 0)), p = p > (Y - R <= 0 ? 0 - (Y - R) : Y - R) ? p : Y - R <= 0 ? 0 - (Y - R) : Y - R;
-            switch (S.g.e) {
-              case 0:
-              case 4:
-              case 1:
-              case 3:
-                tJ(this, S, q);
-            }
-            m = m > p ? m : p;
-          }
-          h.b < h.d.Y() && (V = LA((ut(h.b < h.d.Y()), f(h.d.sb(h.c = h.b++), 16))), m = m > V ? m : V, ut(h.b > 0), h.a.sb(h.c = --h.b)), v = 0.4 * i * m, !s && h.b < h.d.Y() && (v += L), q += l.c.a + v;
-        }
-        this.a.a.Q(), t.e.a = q, Ct(n);
-      };
-      var uH, cH, lH, fH, mp;
-      G(rl, "PolylineEdgeRouter", 535), A(536, 1, uo, K6), w.D = function(t) {
-        return nM(f(t, 9));
-      }, G(rl, "PolylineEdgeRouter/1", 536), A(75, 1, { 75: 1 }, GM), w.w = function() {
-        var t, n, i, s;
-        for (i = new ad(), this.e && io(io(i, P1(this.e)), ": "), n = Jt(ay(this), 0); n.b != n.d.c; )
-          t = f(Ft(n), 7), io(io(pd(io(i, (s = aI(t), s == null ? "p_" + t.k : "p_" + s)), 32), P1(t.g)), " / ");
-        return AF(i, $v(i.a) - 2 - 1);
-      }, w.j = 0, w.k = 0, G(il, "ConnectedSelfLoopComponent", 75), A(60, 17, { 60: 1, 3: 1, 23: 1, 17: 1 }, ps), w.c = 0;
-      var hH, dH, vH, Eu, lc, rs, fc, Ds, No, is, Su, Cu, gH, bH, pH, wH, mH, yH, kH, EH, SH, CH, xH, TH, LH, gl, ff, hc, dc, Wd = At(il, "LoopSide", 60, an, b3);
-      A(203, 1, {}, uO, CC, I3), w.w = function() {
-        return this.b.w();
-      }, w.c = 0, w.d = !1, w.e = !1, w.f = !1, w.i = 0, w.j = 0, G(il, "NubSpline", 203), A(92, 1, { 92: 1 }, iy, YA), G(il, "NubSpline/PolarCP", 92), A(281, 203, {}, ey), G(il, "NubsSelfLoop", 281), A(112, 1, {}, tA, TO, rg, Jy, t2), w.a = JC, w.b = Zo, w.c = JC, w.d = Zo, G(il, "Rectangle", 112), A(537, 1, Xo, gP), w.qc = function(t) {
-        var n, i;
-        return n = new An(), i = f(z(t, (le(), qr)), 18), i.kb((vr(), Sp)) && xr(n, IH), i.kb(Ud) && xr(n, PH), (i.kb(df) || Pt(ge(jt(z(t, (zt(), vb)))))) && (xr(n, jH), i.kb(vf) && xr(n, NH)), i.kb(Kd) && xr(n, DH), n;
-      }, w.sc = function(t, n) {
-        var i, s, l, h, v, p, m, S, x, L, j, I, R, Y, q, V, U, te, ue, ye, Ce, be, Ne, Ue, Xe, it, st, Tt, xn, Nn, Ri, Xi;
-        Nt(n, "Spline edge routing", 1), ue = f(z(t, (le(), Oi)), 15).a, this.a = ue * f(z(t, (zt(), Qs)), 15).a, Xi = 0, q = new M(t.c), V = null, Nn = (On(), new $t()), xn = new Se(), m = !0, S = !0;
-        do {
-          for (be = q.a < q.c.c.length ? f(O(q), 16) : null, j = new Se(), v = new Se(), U = new _i(), Ue = new _i(), st = new _i(), wee(new pr(V, be), new pr(U, Ue), v, Nn, xn, st), w2(U, Ue, (_c(), Ks), !0, v, j), w2(U, Ue, Ks, !1, v, j), w2(U, Ue, hf, !0, v, j), w2(U, Ue, hf, !1, v, j), NQ(v, U, Ue, j), Tt = new fn(j, 0); Tt.b < Tt.d.Y(); )
-            for (x = (ut(Tt.b < Tt.d.Y()), f(Tt.d.sb(Tt.c = Tt.b++), 77)), Ri = new fn(j, Tt.b); Ri.b < Ri.d.Y(); )
-              L = (ut(Ri.b < Ri.d.Y()), f(Ri.d.sb(Ri.c = Ri.b++), 77)), fee(x, L);
-          if (Ree(j, f(z(t, jh), 154)), RJ(j), Ne = Xi + 10, be) {
-            for (S = !be || wm(be.a, (S0(), mp)), te = -1, l = new M(j); l.a < l.c.c.length; )
-              i = f(O(l), 77), te = Jr(te, i.n);
-            ++te, te > 0 ? (I = (te + 1) * this.a, I < ue && !m && !S && (I = ue), Ne += I) : m || S || rO(V) || rO(be) || (Ne += ue), IC(be, Ne);
-          }
-          for (it = (Ce = new Wt(st.a).a.bb().mb(), new Zt(Ce)); it.a.G(); )
-            for (Xe = (p = f(it.a.H(), 21), f(p.yb(), 12)), ye = Xe.c.f.i, Vu(Xe.a, ye), Y = new M(Xe.b); Y.a < Y.c.c.length; )
-              R = f(O(Y), 33), dn(R.i, ye);
-          for (h = new M(j); h.a < h.c.c.length; )
-            i = f(O(h), 77), i.f ? UZ(i, Xi) : $Q(this, i, Xi, Ne);
-          if (be)
-            Xi = Ne + be.c.a + 10;
-          else {
-            for (te = -1, l = new M(j); l.a < l.c.c.length; )
-              i = f(O(l), 77), te = Jr(te, i.n);
-            te >= 0 && (Xi += (te + 2) * this.a);
-          }
-          V = be, m = S;
-        } while (be);
-        for (s = new M(xn); s.a < s.c.c.length; )
-          i = f(O(s), 12), Nee(i, Nn);
-        t.e.a = Xi, Ct(n);
-      }, w.a = 3;
-      var PH, DH, jH, NH, IH;
-      G(il, "SplineEdgeRouter", 537), A(117, 1, { 117: 1 }, r0), w.w = function() {
-        return this.a + " ->(" + this.c + ") " + this.b;
-      }, w.c = 0, G(il, "SplineEdgeRouter/Dependency", 117), A(223, 17, { 223: 1, 3: 1, 23: 1, 17: 1 }, SS);
-      var Ks, hf, fte = At(il, "SplineEdgeRouter/SideToProcess", 223, an, hV);
-      A(77, 1, { 77: 1, 23: 1 }, sA, NC), w.F = function(t) {
-        return sF(this, f(t, 77));
-      }, w.a = 0, w.b = 0, w.e = 0, w.f = !1, w.i = 0, w.k = 0, w.n = 0, w.p = 0, G(il, "SplineEdgeRouter/SplineHyperEdge", 77), A(123, 17, { 123: 1, 3: 1, 23: 1, 17: 1 }, hd);
-      var Gk, $k, Yk, Fk, qk, Vk, Wk = At(Vs, "ContentAlignment", 123, an, PW), MH;
-      A(218, 17, { 218: 1, 3: 1, 23: 1, 17: 1 }, fm);
-      var yp, iL, lb, hte = At(Vs, "EdgeConstraint", 218, an, MV);
-      A(115, 17, { 115: 1, 3: 1, 23: 1, 17: 1 }, zv);
-      var Uk, kp, Kk, Zk, Xk, OH = At(Vs, "EdgeLabelSideSelection", 115, an, wW), AH;
-      A(124, 17, { 124: 1, 3: 1, 23: 1, 17: 1 }, dd);
-      var Qk, aL, oL, Jk, sL, uL, RH = At(Vs, "FixedAlignment", 124, an, DW), BH;
-      A(113, 17, { 113: 1, 3: 1, 23: 1, 17: 1 }, zu);
-      var Ud, eE, Kd, as, Ep, tE, df, vf, cL, Sp, lL = At(Vs, "GraphProperties", 113, an, cU);
-      A(110, 17, { 110: 1, 3: 1, 23: 1, 17: 1 }, Yl), w.a = !1, w.b = !1, w.c = !1;
-      var nE, fL, hL, dL, vL, rE, gL, bL, zH = At(Vs, "GreedySwitchType", 110, an, WW), HH;
-      A(140, 17, { 140: 1, 3: 1, 23: 1, 17: 1 }, hm);
-      var Lh, Cp, gf, dte = At(Vs, "InLayerConstraint", 140, an, IV);
-      A(174, 17, { 174: 1, 3: 1, 23: 1, 17: 1 }, CS);
-      var iE, pL, _H = At(Vs, "InteractiveReferencePoint", 174, an, pV), GH, Ph, wL, mL, aE, vc, fb, os, Zd, xp, yL, $H, Xd, kL, EL, oE, SL, bf, Tp, _r, CL, qr, sE, YH, Zs, bl, Dh, lo, Mi, Si, pl, Qd, lt, xL, TL, LL, uE, wl, Lp, js, xu, cE, Xa, PL, jh, DL, Xs, Oi, ml, FH, hb, lE, jL, fE, Jd;
-      A(85, 17, { 85: 1, 3: 1, 23: 1, 17: 1 }, Hv);
-      var db, gc, ev, Tu, pf, qH = At(Vs, "LayerConstraint", 85, an, mW), VH;
-      A(219, 17, { 219: 1, 3: 1, 23: 1, 17: 1 }, dm);
-      var Ai, ri, hE, vte = At(Vs, "PortType", 219, an, OV), dE, vE, gE, bE, Pp, pE, NL, wE, Nh, WH, Qs, vb, Dp, mE, yE, Er, IL, ML, OL, kE, EE, jp, AL, SE, tv, Np, CE, RL, BL, xE, nv, rv;
-      A(153, 17, { 153: 1, 3: 1, 23: 1, 17: 1 }, vm);
-      var zL, HL, TE, UH = At(Vs, "SelfLoopPlacement", 153, an, AV), KH;
-      A(134, 1, { 134: 1 }, RR), w.a = 0, w.b = 0, w.c = 0, w.d = 0, w.e = 0, w.f = 0, G(Vs, "Spacings", 134), A(172, 17, { 172: 1, 3: 1, 23: 1, 17: 1 }, gm);
-      var iv, gb, Ip, ZH = At(Vs, "WideNodesStrategy", 172, an, RV), XH;
-      A(644, 1, {}), G(_0, "OutputStream", 644), A(645, 644, {}), G(_0, "FilterOutputStream", 645), A(291, 645, {}, C5), G(_0, "PrintStream", 291), A(255, 1, {}), w.w = function() {
-        return this.a;
-      }, G(zr, "AbstractStringBuilder", 255), A(621, 95, Gs, I7), G(zr, "ArrayIndexOutOfBoundsException", 621), A(290, 72, Gs, g7, U7), G(zr, "ArrayStoreException", 290), A(252, 46, BC), G(zr, "Error", 252), A(84, 252, BC, z5, py), G(zr, "AssertionError", 84), A8 = { 3: 1, 349: 1, 23: 1 };
-      var Rn, ii, gte = G(zr, "Boolean", 349);
-      R8 = { 3: 1, 23: 1, 184: 1, 231: 1 };
-      var bb = G(zr, "Double", 184);
-      A(15, 231, { 3: 1, 23: 1, 15: 1, 231: 1 }, t7, Ut), w.F = function(t) {
-        return RF(this, f(t, 15));
-      }, w.t = function(t) {
-        return xe(t, 15) && f(t, 15).a == this.a;
-      }, w.v = function() {
-        return Xn(this.a);
-      }, w.w = function() {
-        return pF(this.a);
-      }, w.a = 0;
-      var bte = G(zr, "Float", 15);
-      A(101, 72, Gs, Lv, Ou), G(zr, "IllegalStateException", 101);
-      var _L, QH;
-      A(608, 72, Gs, K7), G(zr, "NegativeArraySizeException", 608), A(76, 72, { 3: 1, 54: 1, 76: 1, 46: 1 }, td, jv), G(zr, "NullPointerException", 76), A(130, 29, { 3: 1, 54: 1, 29: 1, 130: 1, 46: 1 }, M7, i1), G(zr, "NumberFormatException", 130), A(146, 1, { 3: 1, 146: 1 }, ny), w.t = function(t) {
-        var n;
-        return xe(t, 146) ? (n = f(t, 146), this.c == n.c && la(this.d, n.d) && la(this.a, n.a) && la(this.b, n.b)) : !1;
-      }, w.v = function() {
-        return Ny(re(ie(Ze, 1), Me, 1, 4, [gt(this.c), this.a, this.d, this.b]));
-      }, w.w = function() {
-        return this.a + "." + this.d + "(" + (this.b != null ? this.b : "Unknown Source") + (this.c >= 0 ? ":" + this.c : "") + ")";
-      }, w.c = 0;
-      var JH = G(zr, "StackTraceElement", 146);
-      A(98, 255, { 345: 1 }, ad, qw, id), G(zr, "StringBuilder", 98);
-      var e_, GL;
-      A(45, 72, { 3: 1, 54: 1, 46: 1, 45: 1 }, Fn, jf), G(zr, "UnsupportedOperationException", 45), A(213, 638, fh), w.Q = function() {
-        so(this);
-      }, w.R = function(t) {
-        return Qf(this, t);
-      }, w.ab = function(t) {
-        return jM(this, t, this.e) || jM(this, t, this.d);
-      }, w.bb = function() {
-        return new iu(this);
-      }, w.cb = function(t) {
-        return Kt(this, t);
-      }, w.db = function(t, n) {
-        return un(this, t, n);
-      }, w.eb = function(t) {
-        return Bl(this, t);
-      }, w.Y = function() {
-        return h1(this);
-      }, G(wt, "AbstractHashMap", 213), A(120, 641, di, iu), w.Q = function() {
-        this.a.Q();
-      }, w.kb = function(t) {
-        return A4(this, t);
-      }, w.mb = function() {
-        return new Ul(this.a);
-      }, w.nb = function(t) {
-        var n;
-        return A4(this, t) ? (n = f(t, 21).yb(), this.a.eb(n), !0) : !1;
-      }, w.Y = function() {
-        return this.a.Y();
-      }, G(wt, "AbstractHashMap/EntrySet", 120), A(148, 1, ir, Ul), w.H = function() {
-        return Sd(this);
-      }, w.G = function() {
-        return this.b;
-      }, w.I = function() {
-        q4(this);
-      }, w.b = !1, G(wt, "AbstractHashMap/EntrySetIterator", 148), A(162, 1, ir, Pf), w.G = function() {
-        return this.b < this.d.Y();
-      }, w.H = function() {
-        return ut(this.G()), this.d.sb(this.c = this.b++);
-      }, w.I = function() {
-        So(this);
-      }, w.b = 0, w.c = -1, G(wt, "AbstractList/IteratorImpl", 162), A(43, 162, dh, fn), w.J = function(t) {
-        su(this, t);
-      }, w.K = function() {
-        return this.b > 0;
-      }, w.L = function() {
-        return this.b;
-      }, w.M = function() {
-        return Yj(this);
-      }, w.N = function() {
-        return this.b - 1;
-      }, w.O = function(t) {
-        KS(this, t);
-      }, G(wt, "AbstractList/ListIteratorImpl", 43), A(258, 647, hh, uy), w.rb = function(t, n) {
-        qc(t, this.b), this.c.rb(this.a + t, n), ++this.b;
-      }, w.sb = function(t) {
-        return Sn(t, this.b), this.c.sb(this.a + t);
-      }, w.vb = function(t) {
-        var n;
-        return Sn(t, this.b), n = this.c.vb(this.a + t), --this.b, n;
-      }, w.wb = function(t, n) {
-        return Sn(t, this.b), this.c.wb(this.a + t, n);
-      }, w.Y = function() {
-        return this.b;
-      }, w.a = 0, w.b = 0, G(wt, "AbstractList/SubList", 258), A(36, 641, di, Wt), w.Q = function() {
-        this.a.Q();
-      }, w.kb = function(t) {
-        return this.a.R(t);
-      }, w.mb = function() {
-        var t;
-        return t = this.a.bb().mb(), new Zt(t);
-      }, w.nb = function(t) {
-        return this.a.R(t) ? (this.a.eb(t), !0) : !1;
-      }, w.Y = function() {
-        return this.a.Y();
-      }, G(wt, "AbstractMap/1", 36), A(40, 1, ir, Zt), w.G = function() {
-        return this.a.G();
-      }, w.H = function() {
-        var t;
-        return t = f(this.a.H(), 21), t.yb();
-      }, w.I = function() {
-        this.a.I();
-      }, G(wt, "AbstractMap/1/1", 40), A(211, 640, Md, Ev), w.Q = function() {
-        this.a.Q();
-      }, w.kb = function(t) {
-        return this.a.ab(t);
-      }, w.mb = function() {
-        var t;
-        return t = this.a.bb().mb(), new Sv(t);
-      }, w.Y = function() {
-        return this.a.Y();
-      }, G(wt, "AbstractMap/2", 211), A(212, 1, ir, Sv), w.G = function() {
-        return this.a.G();
-      }, w.H = function() {
-        var t;
-        return t = f(this.a.H(), 21), t.zb();
-      }, w.I = function() {
-        this.a.I();
-      }, G(wt, "AbstractMap/2/1", 212), A(210, 1, { 210: 1, 21: 1 }), w.t = function(t) {
-        var n;
-        return xe(t, 21) ? (n = f(t, 21), la(this.d, n.yb()) && la(this.e, n.zb())) : !1;
-      }, w.yb = function() {
-        return this.d;
-      }, w.zb = function() {
-        return this.e;
-      }, w.v = function() {
-        return Sm(this.d) ^ Sm(this.e);
-      }, w.Ab = function(t) {
-        return QS(this, t);
-      }, w.w = function() {
-        return this.d + "=" + this.e;
-      }, G(wt, "AbstractMap/AbstractEntry", 210), A(163, 210, { 210: 1, 163: 1, 21: 1 }, p1), G(wt, "AbstractMap/SimpleEntry", 163), A(652, 1, Ig), w.t = function(t) {
-        var n;
-        return xe(t, 21) ? (n = f(t, 21), la(this.yb(), n.yb()) && la(this.zb(), n.zb())) : !1;
-      }, w.v = function() {
-        return Sm(this.yb()) ^ Sm(this.zb());
-      }, w.w = function() {
-        return this.yb() + "=" + this.zb();
-      }, G(wt, e8, 652), A(639, 638, fh), w._ = function(t) {
-        return hI(this, t);
-      }, w.R = function(t) {
-        return bm(this, t);
-      }, w.bb = function() {
-        return new N5(this);
-      }, w.cb = function(t) {
-        return ci(y3(this, t));
-      }, w.W = function() {
-        return new Xb(this);
-      }, G(wt, "AbstractNavigableMap", 639), A(287, 641, di, N5), w.kb = function(t) {
-        return xe(t, 21) && hI(this.b, f(t, 21));
-      }, w.mb = function() {
-        return new Uv(this.b);
-      }, w.nb = function(t) {
-        var n;
-        return xe(t, 21) ? (n = f(t, 21), mI(this.b, n)) : !1;
-      }, w.Y = function() {
-        return this.b.c;
-      }, G(wt, "AbstractNavigableMap/EntrySet", 287), A(229, 641, FC, Xb), w.Q = function() {
-        r1(this.a);
-      }, w.kb = function(t) {
-        return bm(this.a, t);
-      }, w.mb = function() {
-        var t;
-        return t = new Uv(new Vv(this.a).b), new Qb(t);
-      }, w.nb = function(t) {
-        return bm(this.a, t) ? (Qv(this.a, t), !0) : !1;
-      }, w.Y = function() {
-        return this.a.c;
-      }, G(wt, "AbstractNavigableMap/NavigableKeySet", 229), A(230, 1, ir, Qb), w.G = function() {
-        return om(this.a.a);
-      }, w.H = function() {
-        var t;
-        return t = jm(this.a), t.yb();
-      }, w.I = function() {
-        Cj(this.a);
-      }, G(wt, "AbstractNavigableMap/NavigableKeySet/1", 230), A(4, 1, ir, M), w.G = function() {
-        return Nc(this);
-      }, w.H = function() {
-        return O(this);
-      }, w.I = function() {
-        bd(this);
-      }, w.a = 0, w.b = -1, G(wt, "ArrayList/1", 4), A(94, 647, N8, ro), w.kb = function(t) {
-        return eU(this, t) != -1;
-      }, w.sb = function(t) {
-        return Oj(this, t);
-      }, w.wb = function(t, n) {
-        var i;
-        return i = (Sn(t, this.a.length), this.a[t]), Ga(this.a, t, n), i;
-      }, w.Y = function() {
-        return this.a.length;
-      }, w.ob = function() {
-        return LO(this, ve(Ze, Me, 1, this.a.length, 4, 1));
-      }, w.pb = function(t) {
-        return LO(this, t);
-      }, G(wt, "Arrays/ArrayList", 94);
-      var bc, $L, LE;
-      A(413, 1, jr, n7), w.$b = function(t, n) {
-        return Xj(n, t);
-      }, G(wt, "Collections/2", 413), A(406, 647, N8, Z6), w.kb = function(t) {
-        return !1;
-      }, w.sb = function(t) {
-        return Sn(t, 0), null;
-      }, w.mb = function() {
-        return Qt(), cm(), PE;
-      }, w.tb = function() {
-        return Qt(), cm(), PE;
-      }, w.Y = function() {
-        return 0;
-      }, G(wt, "Collections/EmptyList", 406), A(407, 1, dh, X6), w.J = function(t) {
-        throw new Fn();
-      }, w.G = function() {
-        return !1;
-      }, w.K = function() {
-        return !1;
-      }, w.H = function() {
-        throw new sa();
-      }, w.L = function() {
-        return 0;
-      }, w.M = function() {
-        throw new sa();
-      }, w.N = function() {
-        return -1;
-      }, w.I = function() {
-        throw new Lv();
-      }, w.O = function(t) {
-        throw new Lv();
-      };
-      var PE;
-      G(wt, "Collections/EmptyListIterator", 407), A(409, 638, gh, Q6), w.R = function(t) {
-        return !1;
-      }, w.ab = function(t) {
-        return !1;
-      }, w.bb = function() {
-        return Qt(), LE;
-      }, w.cb = function(t) {
-        return null;
-      }, w.W = function() {
-        return Qt(), LE;
-      }, w.Y = function() {
-        return 0;
-      }, w.fb = function() {
-        return Qt(), bc;
-      }, G(wt, "Collections/EmptyMap", 409), A(408, 641, bh, J6), w.kb = function(t) {
-        return !1;
-      }, w.mb = function() {
-        return Qt(), cm(), PE;
-      }, w.Y = function() {
-        return 0;
-      }, G(wt, "Collections/EmptySet", 408), A(410, 1, jr, eP), w.$b = function(t, n) {
-        return gF(f(t, 23), f(n, 23));
-      };
-      var t_;
-      G(wt, "Collections/ReverseComparator", 410), A(411, 647, { 3: 1, 22: 1, 19: 1, 20: 1 }, r7), w.kb = function(t) {
-        return la(this.a, t);
-      }, w.sb = function(t) {
-        return Sn(t, 1), this.a;
-      }, w.Y = function() {
-        return 1;
-      }, G(wt, "Collections/SingletonList", 411), A(217, 1, Md, Cv), w.ib = function(t) {
-        return w7();
-      }, w.jb = function(t) {
-        return m7();
-      }, w.Q = function() {
-        y7();
-      }, w.kb = function(t) {
-        return this.b.kb(t);
-      }, w.lb = function(t) {
-        return this.b.lb(t);
-      }, w.V = function() {
-        return this.b.V();
-      }, w.mb = function() {
-        return new Qh(this.b.mb());
-      }, w.nb = function(t) {
-        return k7();
-      }, w.Y = function() {
-        return this.b.Y();
-      }, w.ob = function() {
-        return this.b.ob();
-      }, w.pb = function(t) {
-        return this.b.pb(t);
-      }, w.w = function() {
-        return ha(this.b);
-      }, G(wt, "Collections/UnmodifiableCollection", 217), A(152, 1, ir, Qh), w.G = function() {
-        return this.b.G();
-      }, w.H = function() {
-        return this.b.H();
-      }, w.I = function() {
-        _Y();
-      }, G(wt, "Collections/UnmodifiableCollectionIterator", 152), A(233, 217, hh, L1), w.rb = function(t, n) {
-        throw new Fn();
-      }, w.t = function(t) {
-        return this.a.t(t);
-      }, w.sb = function(t) {
-        return this.a.sb(t);
-      }, w.v = function() {
-        return this.a.v();
-      }, w.V = function() {
-        return this.a.V();
-      }, w.tb = function() {
-        return new BS(this.a.ub(0));
-      }, w.ub = function(t) {
-        return new BS(this.a.ub(t));
-      }, w.vb = function(t) {
-        throw new Fn();
-      }, w.wb = function(t, n) {
-        throw new Fn();
-      }, w.xb = function(t, n) {
-        return new L1(this.a.xb(t, n));
-      }, G(wt, "Collections/UnmodifiableList", 233), A(309, 152, dh, BS), w.J = function(t) {
-        throw new Fn();
-      }, w.K = function() {
-        return this.a.K();
-      }, w.L = function() {
-        return this.a.L();
-      }, w.M = function() {
-        return this.a.M();
-      }, w.N = function() {
-        return this.a.N();
-      }, w.O = function(t) {
-        throw new Fn();
-      }, G(wt, "Collections/UnmodifiableListIterator", 309), A(305, 1, fh, I5), w.Q = function() {
-        throw new Fn();
-      }, w.R = function(t) {
-        return this.c.R(t);
-      }, w.ab = function(t) {
-        return OD(this, t);
-      }, w.bb = function() {
-        return xa(this);
-      }, w.t = function(t) {
-        return dD(this, t);
-      }, w.cb = function(t) {
-        return this.c.cb(t);
-      }, w.v = function() {
-        return this.c.v();
-      }, w.V = function() {
-        return this.c.V();
-      }, w.W = function() {
-        return rN(this);
-      }, w.db = function(t, n) {
-        throw new Fn();
-      }, w.eb = function(t) {
-        throw new Fn();
-      }, w.Y = function() {
-        return this.c.Y();
-      }, w.w = function() {
-        return ha(this.c);
-      }, w.fb = function() {
-        return aN(this);
-      }, G(wt, "Collections/UnmodifiableMap", 305), A(151, 217, di, jl), w.t = function(t) {
-        return hD(this, t);
-      }, w.v = function() {
-        return this.b.v();
-      }, G(wt, "Collections/UnmodifiableSet", 151), A(412, 151, di, rD), w.kb = function(t) {
-        return bS(this, t);
-      }, w.lb = function(t) {
-        return AD(this, t);
-      }, w.mb = function() {
-        var t;
-        return t = this.b.mb(), new M5(t);
-      }, w.ob = function() {
-        return dN(this);
-      }, w.pb = function(t) {
-        return L4(this, t);
-      }, G(wt, "Collections/UnmodifiableMap/UnmodifiableEntrySet", 412), A(263, 1, ir, M5), w.H = function() {
-        return new O5(f(this.a.H(), 21));
-      }, w.G = function() {
-        return this.a.G();
-      }, w.I = function() {
-        throw new Fn();
-      }, G(wt, "Collections/UnmodifiableMap/UnmodifiableEntrySet/1", 263), A(306, 1, Ig, O5), w.t = function(t) {
-        return this.a.t(t);
-      }, w.yb = function() {
-        return this.a.yb();
-      }, w.zb = function() {
-        return this.a.zb();
-      }, w.v = function() {
-        return this.a.v();
-      }, w.Ab = function(t) {
-        throw new Fn();
-      }, w.w = function() {
-        return ha(this.a);
-      }, G(wt, "Collections/UnmodifiableMap/UnmodifiableEntrySet/UnmodifiableEntry", 306), A(307, 233, S2, rS), G(wt, "Collections/UnmodifiableRandomAccessList", 307), A(308, 151, FC, zS), w.t = function(t) {
-        return this.a.t(t);
-      }, w.v = function() {
-        return this.a.v();
-      }, G(wt, "Collections/UnmodifiableSortedSet", 308);
-      var wf;
-      A(522, 1, jr, tP), w.$b = function(t, n) {
-        return or(t), or(n), u3(f(t, 23), n);
-      }, G(wt, "Comparators/1", 522), A(202, 72, Gs, nd), G(wt, "ConcurrentModificationException", 202), A(609, 72, Gs, D7), G(wt, "EmptyStackException", 609), A(319, 638, fh, P3), w.db = function(t, n) {
-        return ZS(this, t, n);
-      }, w.Q = function() {
-        nN(this);
-      }, w.R = function(t) {
-        return l4(this.a, t);
-      }, w.ab = function(t) {
-        var n, i;
-        for (i = new Hf(this.a); i.a < i.c.a.length; )
-          if (n = Yc(i), la(t, this.b[n.e]))
-            return !0;
-        return !1;
-      }, w.bb = function() {
-        return new Jb(this);
-      }, w.cb = function(t) {
-        return Zf(this, t);
-      }, w.eb = function(t) {
-        return O4(this, t);
-      }, w.Y = function() {
-        return this.a.c;
-      }, G(wt, "EnumMap", 319), A(236, 641, di, Jb), w.Q = function() {
-        nN(this.a);
-      }, w.kb = function(t) {
-        return RN(this, t);
-      }, w.mb = function() {
-        return new G1(this.a);
-      }, w.nb = function(t) {
-        var n;
-        return RN(this, t) ? (n = f(t, 21).yb(), O4(this.a, n), !0) : !1;
-      }, w.Y = function() {
-        return this.a.a.c;
-      }, G(wt, "EnumMap/EntrySet", 236), A(237, 1, ir, G1), w.H = function() {
-        return this.b = Yc(this.a), new b1(this.c, this.b);
-      }, w.G = function() {
-        return S1(this.a);
-      }, w.I = function() {
-        Ol(!!this.b), O4(this.c, this.b), this.b = null;
-      }, G(wt, "EnumMap/EntrySetIterator", 237), A(238, 652, Ig, b1), w.yb = function() {
-        return this.a;
-      }, w.zb = function() {
-        return this.b.b[this.a.e];
-      }, w.Ab = function(t) {
-        return Um(this.b, this.a.e, t);
-      }, G(wt, "EnumMap/MapEntry", 238), A(86, 641, { 22: 1, 19: 1, 86: 1, 18: 1 }), G(wt, "EnumSet", 86), A(66, 86, { 22: 1, 19: 1, 86: 1, 66: 1, 18: 1 }, ti), w.ib = function(t) {
-        return hi(this, f(t, 17));
-      }, w.kb = function(t) {
-        return l4(this, t);
-      }, w.mb = function() {
-        return new Hf(this);
-      }, w.nb = function(t) {
-        return zj(this, t);
-      }, w.Y = function() {
-        return this.c;
-      }, w.c = 0, G(wt, "EnumSet/EnumSetImpl", 66), A(167, 1, ir, Hf), w.H = function() {
-        return Yc(this);
-      }, w.G = function() {
-        return S1(this);
-      }, w.I = function() {
-        Ol(this.b != -1), Ga(this.c.b, this.b, null), --this.c.c, this.b = -1;
-      }, w.a = -1, w.b = -1, G(wt, "EnumSet/EnumSetImpl/IteratorImpl", 167), A(30, 213, I8, $t, sm, n9), w.Uc = function(t, n) {
-        return He(t) === He(n) || t != null && xo(t, n);
-      }, w.Vc = function(t) {
-        var n;
-        return n = Uo(t), n | 0;
-      }, G(wt, "HashMap", 30), A(50, 641, M8, $r, Ww, c4), w.ib = function(t) {
-        return vn(this, t);
-      }, w.Q = function() {
-        this.a.Q();
-      }, w.Wc = function() {
-        return new c4(this);
-      }, w.kb = function(t) {
-        return Pc(this, t);
-      }, w.V = function() {
-        return this.a.Y() == 0;
-      }, w.mb = function() {
-        var t;
-        return t = new Wt(this.a).a.bb().mb(), new Zt(t);
-      }, w.nb = function(t) {
-        return Cm(this, t);
-      }, w.Y = function() {
-        return this.a.Y();
-      }, w.w = function() {
-        return Qu(new Wt(this.a));
-      }, G(wt, "HashSet", 50), A(418, 1, Ju, p9), w.mb = function() {
-        return new D4(this);
-      }, w.c = 0, G(wt, "InternalHashCodeMap", 418), A(312, 1, ir, D4), w.H = function() {
-        return this.d = this.a[this.c++], this.d;
-      }, w.G = function() {
-        var t;
-        return this.c < this.a.length ? !0 : (t = this.b.next(), t.done ? !1 : (this.a = t.value[1], this.c = 0, !0));
-      }, w.I = function() {
-        c2(this.e, this.d.yb()), this.c != 0 && --this.c;
-      }, w.c = 0, w.d = null, G(wt, "InternalHashCodeMap/1", 312);
-      var n_;
-      A(382, 1, Ju, w9), w.mb = function() {
-        return new H4(this);
-      }, w.c = 0, w.d = 0, G(wt, "InternalStringMap", 382), A(293, 1, ir, H4), w.H = function() {
-        return this.c = this.a, this.a = this.b.next(), new yj(this.d, this.c, this.d.d);
-      }, w.G = function() {
-        return !this.a.done;
-      }, w.I = function() {
-        bM(this.d, this.c.value[0]);
-      }, G(wt, "InternalStringMap/1", 293), A(383, 652, Ig, yj), w.yb = function() {
-        return this.b.value[0];
-      }, w.zb = function() {
-        return this.a.d != this.c ? WD(this.a, this.b.value[0]) : this.b.value[1];
-      }, w.Ab = function(t) {
-        return zy(this.a, this.b.value[0], t);
-      }, w.c = 0, G(wt, "InternalStringMap/2", 383), A(155, 30, I8, yd, EI), w.Q = function() {
-        fj(this);
-      }, w.R = function(t) {
-        return Qf(this.c, t);
-      }, w.ab = function(t) {
-        var n;
-        for (n = this.b.a; n != this.b; ) {
-          if (la(n.e, t))
-            return !0;
-          n = n.a;
-        }
-        return !1;
-      }, w.bb = function() {
-        return new Ow(this);
-      }, w.cb = function(t) {
-        return wy(this, t);
-      }, w.db = function(t, n) {
-        return gg(this, t, n);
-      }, w.eb = function(t) {
-        return Z4(this, t);
-      }, w.Y = function() {
-        return h1(this.c);
-      }, w.a = !1, G(wt, "LinkedHashMap", 155), A(176, 163, { 210: 1, 163: 1, 176: 1, 21: 1 }, K9, i4), G(wt, "LinkedHashMap/ChainEntry", 176), A(270, 641, di, Ow), w.Q = function() {
-        fj(this.a);
-      }, w.kb = function(t) {
-        return BN(this, t);
-      }, w.mb = function() {
-        return new Jm(this);
-      }, w.nb = function(t) {
-        var n;
-        return BN(this, t) ? (n = f(t, 21).yb(), Z4(this.a, n), !0) : !1;
-      }, w.Y = function() {
-        return h1(this.a.c);
-      }, G(wt, "LinkedHashMap/EntrySet", 270), A(271, 1, ir, Jm), w.H = function() {
-        return F4(this);
-      }, w.G = function() {
-        return this.b != this.c.a.b;
-      }, w.I = function() {
-        Ol(!!this.a), Vm(this.c.a.c, this), o4(this.a), Bl(this.c.a.c, this.a.d), RS(this.c.a.c, this), this.a = null;
-      }, G(wt, "LinkedHashMap/EntrySet/EntryIterator", 271), A(70, 50, M8, _i, H9, $m), w.Wc = function() {
-        return new $m(this);
-      }, G(wt, "LinkedHashSet", 70), A(372, 1, dh, mj), w.J = function(t) {
-        Xv(this, t);
-      }, w.G = function() {
-        return this.b != this.d.c;
-      }, w.K = function() {
-        return this.b.b != this.d.a;
-      }, w.H = function() {
-        return Ft(this);
-      }, w.L = function() {
-        return this.a;
-      }, w.M = function() {
-        return Jv(this);
-      }, w.N = function() {
-        return this.a - 1;
-      }, w.I = function() {
-        e3(this);
-      }, w.O = function(t) {
-        Ol(!!this.c), this.c.c = t;
-      }, w.a = 0, w.c = null, G(wt, "LinkedList/ListIteratorImpl", 372), A(259, 1, {}, xw), G(wt, "LinkedList/Node", 259), A(74, 72, { 3: 1, 54: 1, 46: 1, 74: 1 }, sa), G(wt, "NoSuchElementException", 74), A(154, 1, { 154: 1 }, FM, jI), w.a = 0, w.b = 0;
-      var YL, FL, pte = 0;
-      G(wt, "Random", 154), A(607, 647, O8), w.rb = function(t, n) {
-        A1(t, this.a.c.length + 1), Ac(this.a, t, n);
-      }, w.ib = function(t) {
-        return Le(this.a, t);
-      }, w.jb = function(t) {
-        return Tn(this.a, t);
-      }, w.Q = function() {
-        this.a.c = ve(Ze, Me, 1, 0, 4, 1);
-      }, w.kb = function(t) {
-        return Di(this.a, t, 0) != -1;
-      }, w.lb = function(t) {
-        return Wu(this.a, t);
-      }, w.sb = function(t) {
-        return A1(t, this.a.c.length), _e(this.a, t);
-      }, w.V = function() {
-        return this.a.c.length == 0;
-      }, w.mb = function() {
-        return new M(this.a);
-      }, w.vb = function(t) {
-        return A1(t, this.a.c.length), Fl(this.a, t);
-      }, w.Xb = function(t, n) {
-        xN(this.a, t, n);
-      }, w.wb = function(t, n) {
-        return A1(t, this.a.c.length), $c(this.a, t, n);
-      }, w.Y = function() {
-        return this.a.c.length;
-      }, w.xb = function(t, n) {
-        return new uy(this.a, t, n);
-      }, w.ob = function() {
-        return z9(this.a);
-      }, w.pb = function(t) {
-        return Vn(this.a, t);
-      }, w.w = function() {
-        return Qu(this.a);
-      }, G(wt, "Vector", 607), A(337, 607, O8, Y5), G(wt, "Stack", 337), A(253, 639, gh, RD, N4), w.Q = function() {
-        r1(this);
-      }, w.bb = function() {
-        return new Vv(this);
-      }, w.db = function(t, n) {
-        return CM(this, t, n);
-      }, w.eb = function(t) {
-        return Qv(this, t);
-      }, w.Y = function() {
-        return this.c;
-      }, w.c = 0, G(wt, "TreeMap", 253), A(182, 1, ir, Uv), w.H = function() {
-        return jm(this);
-      }, w.G = function() {
-        return om(this.a);
-      }, w.I = function() {
-        Cj(this);
-      }, G(wt, "TreeMap/EntryIterator", 182), A(209, 287, di, Vv), w.Q = function() {
-        r1(this.a);
-      }, G(wt, "TreeMap/EntrySet", 209), A(183, 163, { 210: 1, 163: 1, 21: 1, 183: 1 }, gy), w.b = !1;
-      var wte = G(wt, "TreeMap/Node", 183);
-      A(254, 1, {}, Tw), w.w = function() {
-        return "State: mv=" + this.c + " value=" + this.d + " done=" + this.a + " found=" + this.b;
-      }, w.a = !1, w.b = !1, w.c = !1, G(wt, "TreeMap/State", 254), A(138, 17, B2, g1), w.Xc = function() {
-        return !1;
-      }, w.Yc = function() {
-        return !1;
-      };
-      var qL, r_, i_, a_, DE = At(wt, "TreeMap/SubMapType", 138, an, sW);
-      A(352, 138, B2, S9), w.Yc = function() {
-        return !0;
-      }, At(wt, "TreeMap/SubMapType/1", 352, DE, null), A(353, 138, B2, D9), w.Xc = function() {
-        return !0;
-      }, w.Yc = function() {
-        return !0;
-      }, At(wt, "TreeMap/SubMapType/2", 353, DE, null), A(354, 138, B2, C9), w.Xc = function() {
-        return !0;
-      }, At(wt, "TreeMap/SubMapType/3", 354, DE, null), A(191, 641, { 3: 1, 22: 1, 19: 1, 18: 1, 137: 1, 191: 1 }, tS, gD), w.ib = function(t) {
-        return g4(this, t);
-      }, w.Q = function() {
-        r1(this.a);
-      }, w.kb = function(t) {
-        return bm(this.a, t);
-      }, w.mb = function() {
-        var t;
-        return t = new Uv(new Vv(new Xb(this.a).a).b), new Qb(t);
-      }, w.nb = function(t) {
-        return V9(this, t);
-      }, w.Y = function() {
-        return this.a.c;
-      }, G(wt, "TreeSet", 191);
-      var mte = 0, VL, WL = 0, Mp, Kn = F1("int", "I"), pb = F1("boolean", "Z"), o_ = F1("char", "C"), Zi = F1("double", "D"), Op = F1("float", "F"), Ap = WV, s_ = s_ = lZ;
-      JW(mY), bU("permProps", [[["locale", "default"], ["user.agent", "gecko1_8"]]]), s_(null, "klay", null);
-    })();
-  }(s6)), s6.exports;
-}
-(function(a, r) {
-  (function(c, d) {
-    a.exports = d(Yle());
-  })(Cb, function(u) {
-    return (
-      /******/
-      function(c) {
-        var d = {};
-        function g(b) {
-          if (d[b])
-            return d[b].exports;
-          var y = d[b] = {
-            /******/
-            i: b,
-            /******/
-            l: !1,
-            /******/
-            exports: {}
-            /******/
-          };
-          return c[b].call(y.exports, y, y.exports, g), y.l = !0, y.exports;
-        }
-        return g.m = c, g.c = d, g.i = function(b) {
-          return b;
-        }, g.d = function(b, y, k) {
-          g.o(b, y) || Object.defineProperty(b, y, {
-            /******/
-            configurable: !1,
-            /******/
-            enumerable: !0,
-            /******/
-            get: k
-            /******/
-          });
-        }, g.n = function(b) {
-          var y = b && b.__esModule ? (
-            /******/
-            function() {
-              return b.default;
-            }
-          ) : (
-            /******/
-            function() {
-              return b;
-            }
-          );
-          return g.d(y, "a", y), y;
-        }, g.o = function(b, y) {
-          return Object.prototype.hasOwnProperty.call(b, y);
-        }, g.p = "", g(g.s = 3);
-      }([
-        /* 0 */
-        /***/
-        function(c, d, g) {
-          var b = g(4), y = g(1), k = g(2), E = {
-            addUnnecessaryBendpoints: "de.cau.cs.kieler.klay.layered.unnecessaryBendpoints",
-            alignment: "de.cau.cs.kieler.alignment",
-            aspectRatio: "de.cau.cs.kieler.aspectRatio",
-            borderSpacing: "borderSpacing",
-            compactComponents: "de.cau.cs.kieler.klay.layered.components.compact",
-            compactionStrategy: "de.cau.cs.kieler.klay.layered.nodeplace.compactionStrategy",
-            contentAlignment: "de.cau.cs.kieler.klay.layered.contentAlignment",
-            crossingMinimization: "de.cau.cs.kieler.klay.layered.crossMin",
-            cycleBreaking: "de.cau.cs.kieler.klay.layered.cycleBreaking",
-            debugMode: "de.cau.cs.kieler.debugMode",
-            direction: "de.cau.cs.kieler.direction",
-            edgeLabelSideSelection: "de.cau.cs.kieler.klay.layered.edgeLabelSideSelection",
-            // <broken> 'de.cau.cs.kieler.klay.layered.edgeNodeSpacingFactor': options.edgeNodeSpacingFactor,
-            edgeRouting: "de.cau.cs.kieler.edgeRouting",
-            edgeSpacingFactor: "de.cau.cs.kieler.klay.layered.edgeSpacingFactor",
-            feedbackEdges: "de.cau.cs.kieler.klay.layered.feedBackEdges",
-            fixedAlignment: "de.cau.cs.kieler.klay.layered.fixedAlignment",
-            greedySwitchCrossingMinimization: "de.cau.cs.kieler.klay.layered.greedySwitch",
-            hierarchyHandling: "de.cau.cs.kieler.hierarchyHandling",
-            inLayerSpacingFactor: "de.cau.cs.kieler.klay.layered.inLayerSpacingFactor",
-            interactiveReferencePoint: "de.cau.cs.kieler.klay.layered.interactiveReferencePoint",
-            layerConstraint: "de.cau.cs.kieler.klay.layered.layerConstraint",
-            layoutHierarchy: "de.cau.cs.kieler.layoutHierarchy",
-            linearSegmentsDeflectionDampening: "de.cau.cs.kieler.klay.layered.linearSegmentsDeflectionDampening",
-            mergeEdges: "de.cau.cs.kieler.klay.layered.mergeEdges",
-            mergeHierarchyCrossingEdges: "de.cau.cs.kieler.klay.layered.mergeHierarchyEdges",
-            noLayout: "de.cau.cs.kieler.noLayout",
-            nodeLabelPlacement: "de.cau.cs.kieler.nodeLabelPlacement",
-            nodeLayering: "de.cau.cs.kieler.klay.layered.nodeLayering",
-            nodePlacement: "de.cau.cs.kieler.klay.layered.nodePlace",
-            portAlignment: "de.cau.cs.kieler.portAlignment",
-            portAlignmentEastern: "de.cau.cs.kieler.portAlignment.east",
-            portAlignmentNorth: "de.cau.cs.kieler.portAlignment.north",
-            portAlignmentSouth: "de.cau.cs.kieler.portAlignment.south",
-            portAlignmentWest: "de.cau.cs.kieler.portAlignment.west",
-            portConstraints: "de.cau.cs.kieler.portConstraints",
-            portLabelPlacement: "de.cau.cs.kieler.portLabelPlacement",
-            portOffset: "de.cau.cs.kieler.offset",
-            portSide: "de.cau.cs.kieler.portSide",
-            portSpacing: "de.cau.cs.kieler.portSpacing",
-            postCompaction: "de.cau.cs.kieler.klay.layered.postCompaction",
-            priority: "de.cau.cs.kieler.priority",
-            randomizationSeed: "de.cau.cs.kieler.randomSeed",
-            routeSelfLoopInside: "de.cau.cs.kieler.selfLoopInside",
-            separateConnectedComponents: "de.cau.cs.kieler.separateConnComp",
-            sizeConstraint: "de.cau.cs.kieler.sizeConstraint",
-            sizeOptions: "de.cau.cs.kieler.sizeOptions",
-            spacing: "de.cau.cs.kieler.spacing",
-            splineSelfLoopPlacement: "de.cau.cs.kieler.klay.layered.splines.selfLoopPlacement",
-            thoroughness: "de.cau.cs.kieler.klay.layered.thoroughness",
-            wideNodesOnMultipleLayers: "de.cau.cs.kieler.klay.layered.wideNodesOnMultipleLayers"
-          }, C = function($) {
-            for (var F = Object.keys($), W = {}, Q = 0; Q < F.length; Q++) {
-              var X = F[Q], K = E[X], ee = $[X];
-              W[K] = ee;
-            }
-            return W;
-          }, T = {
-            interactiveReferencePoint: "CENTER"
-            // Determines which point of a node is considered by interactive layout phases.
-          }, P = function($) {
-            for (var F = $.parent(), W = $.scratch("klay"), Q = {
-              x: W.x,
-              y: W.y
-            }; F.nonempty(); ) {
-              var X = F.scratch("klay");
-              Q.x += X.x, Q.y += X.y, F = F.parent();
-            }
-            return Q;
-          }, N = function($, F) {
-            var W = $.layoutDimensions(F), Q = $.numericStyle("padding"), X = {
-              _cyEle: $,
-              id: $.id(),
-              padding: {
-                top: Q,
-                left: Q,
-                bottom: Q,
-                right: Q
-              }
-            };
-            return $.isParent() || (X.width = W.w, X.height = W.h), $.scratch("klay", X), X;
-          }, D = function($, F) {
-            var W = {
-              _cyEle: $,
-              id: $.id(),
-              source: $.data("source"),
-              target: $.data("target"),
-              properties: {}
-            }, Q = F.priority($);
-            return Q != null && (W.properties.priority = Q), $.scratch("klay", W), W;
-          }, H = function($, F, W) {
-            for (var Q = [], X = [], K = {}, ee = {
-              id: "root",
-              children: [],
-              edges: []
-            }, Z = 0; Z < $.length; Z++) {
-              var ae = $[Z], oe = N(ae, W);
-              Q.push(oe), K[ae.id()] = oe;
-            }
-            for (var J = 0; J < F.length; J++) {
-              var fe = F[J], se = D(fe, W);
-              X.push(se), K[fe.id()] = se;
-            }
-            for (var pe = 0; pe < Q.length; pe++) {
-              var he = Q[pe], de = he._cyEle;
-              if (!de.isChild())
-                ee.children.push(he);
-              else {
-                var ke = de.parent(), Pe = K[ke.id()], Ae = Pe.children = Pe.children || [];
-                Ae.push(he);
-              }
-            }
-            for (var Te = 0; Te < X.length; Te++) {
-              var Oe = X[Te], ze = Oe._cyEle;
-              ze.source().parent(), ze.target().parent(), ee.edges.push(Oe);
-            }
-            return ee;
-          };
-          function _(B) {
-            var $ = B.klay;
-            this.options = y({}, k, B), this.options.klay = y({}, k.klay, $, T);
-          }
-          _.prototype.run = function() {
-            var B = this, $ = this.options, F = $.eles, W = F.nodes(), Q = F.edges(), X = H(W, Q, $);
-            return b.layout({
-              graph: X,
-              options: C($.klay),
-              success: function() {
-              },
-              error: function(ee) {
-                throw ee;
-              }
-            }), W.filter(function(K) {
-              return !K.isParent();
-            }).layoutPositions(B, $, P), this;
-          }, _.prototype.stop = function() {
-            return this;
-          }, _.prototype.destroy = function() {
-            return this;
-          }, c.exports = _;
-        },
-        /* 1 */
-        /***/
-        function(c, d, g) {
-          c.exports = Object.assign != null ? Object.assign.bind(Object) : function(b) {
-            for (var y = arguments.length, k = Array(y > 1 ? y - 1 : 0), E = 1; E < y; E++)
-              k[E - 1] = arguments[E];
-            return k.filter(function(C) {
-              return C != null;
-            }).forEach(function(C) {
-              Object.keys(C).forEach(function(T) {
-                return b[T] = C[T];
-              });
-            }), b;
-          };
-        },
-        /* 2 */
-        /***/
-        function(c, d, g) {
-          var b = {
-            nodeDimensionsIncludeLabels: !1,
-            // Boolean which changes whether label dimensions are included when calculating node dimensions
-            fit: !0,
-            // Whether to fit
-            padding: 20,
-            // Padding on fit
-            animate: !1,
-            // Whether to transition the node positions
-            animateFilter: function(k, E) {
-              return !0;
-            },
-            // Whether to animate specific nodes when animation is on; non-animated nodes immediately go to their final positions
-            animationDuration: 500,
-            // Duration of animation in ms if enabled
-            animationEasing: void 0,
-            // Easing of animation if enabled
-            transform: function(k, E) {
-              return E;
-            },
-            // A function that applies a transform to the final node position
-            ready: void 0,
-            // Callback on layoutready
-            stop: void 0,
-            // Callback on layoutstop
-            klay: {
-              // Following descriptions taken from http://layout.rtsys.informatik.uni-kiel.de:9444/Providedlayout.html?algorithm=de.cau.cs.kieler.klay.layered
-              addUnnecessaryBendpoints: !1,
-              // Adds bend points even if an edge does not change direction.
-              aspectRatio: 1.6,
-              // The aimed aspect ratio of the drawing, that is the quotient of width by height
-              borderSpacing: 20,
-              // Minimal amount of space to be left to the border
-              compactComponents: !1,
-              // Tries to further compact components (disconnected sub-graphs).
-              crossingMinimization: "LAYER_SWEEP",
-              // Strategy for crossing minimization.
-              /* LAYER_SWEEP The layer sweep algorithm iterates multiple times over the layers, trying to find node orderings that minimize the number of crossings. The algorithm uses randomization to increase the odds of finding a good result. To improve its results, consider increasing the Thoroughness option, which influences the number of iterations done. The Randomization seed also influences results.
-              INTERACTIVE Orders the nodes of each layer by comparing their positions before the layout algorithm was started. The idea is that the relative order of nodes as it was before layout was applied is not changed. This of course requires valid positions for all nodes to have been set on the input graph before calling the layout algorithm. The interactive layer sweep algorithm uses the Interactive Reference Point option to determine which reference point of nodes are used to compare positions. */
-              cycleBreaking: "GREEDY",
-              // Strategy for cycle breaking. Cycle breaking looks for cycles in the graph and determines which edges to reverse to break the cycles. Reversed edges will end up pointing to the opposite direction of regular edges (that is, reversed edges will point left if edges usually point right).
-              /* GREEDY This algorithm reverses edges greedily. The algorithm tries to avoid edges that have the Priority property set.
-              INTERACTIVE The interactive algorithm tries to reverse edges that already pointed leftwards in the input graph. This requires node and port coordinates to have been set to sensible values.*/
-              direction: "UNDEFINED",
-              // Overall direction of edges: horizontal (right / left) or vertical (down / up)
-              /* UNDEFINED, RIGHT, LEFT, DOWN, UP */
-              edgeRouting: "ORTHOGONAL",
-              // Defines how edges are routed (POLYLINE, ORTHOGONAL, SPLINES)
-              edgeSpacingFactor: 0.5,
-              // Factor by which the object spacing is multiplied to arrive at the minimal spacing between edges.
-              feedbackEdges: !1,
-              // Whether feedback edges should be highlighted by routing around the nodes.
-              fixedAlignment: "NONE",
-              // Tells the BK node placer to use a certain alignment instead of taking the optimal result.  This option should usually be left alone.
-              /* NONE Chooses the smallest layout from the four possible candidates.
-              LEFTUP Chooses the left-up candidate from the four possible candidates.
-              RIGHTUP Chooses the right-up candidate from the four possible candidates.
-              LEFTDOWN Chooses the left-down candidate from the four possible candidates.
-              RIGHTDOWN Chooses the right-down candidate from the four possible candidates.
-              BALANCED Creates a balanced layout from the four possible candidates. */
-              inLayerSpacingFactor: 1,
-              // Factor by which the usual spacing is multiplied to determine the in-layer spacing between objects.
-              layoutHierarchy: !1,
-              // Whether the selected layouter should consider the full hierarchy
-              linearSegmentsDeflectionDampening: 0.3,
-              // Dampens the movement of nodes to keep the diagram from getting too large.
-              mergeEdges: !1,
-              // Edges that have no ports are merged so they touch the connected nodes at the same points.
-              mergeHierarchyCrossingEdges: !0,
-              // If hierarchical layout is active, hierarchy-crossing edges use as few hierarchical ports as possible.
-              nodeLayering: "NETWORK_SIMPLEX",
-              // Strategy for node layering.
-              /* NETWORK_SIMPLEX This algorithm tries to minimize the length of edges. This is the most computationally intensive algorithm. The number of iterations after which it aborts if it hasn't found a result yet can be set with the Maximal Iterations option.
-              LONGEST_PATH A very simple algorithm that distributes nodes along their longest path to a sink node.
-              INTERACTIVE Distributes the nodes into layers by comparing their positions before the layout algorithm was started. The idea is that the relative horizontal order of nodes as it was before layout was applied is not changed. This of course requires valid positions for all nodes to have been set on the input graph before calling the layout algorithm. The interactive node layering algorithm uses the Interactive Reference Point option to determine which reference point of nodes are used to compare positions. */
-              nodePlacement: "BRANDES_KOEPF",
-              // Strategy for Node Placement
-              /* BRANDES_KOEPF Minimizes the number of edge bends at the expense of diagram size: diagrams drawn with this algorithm are usually higher than diagrams drawn with other algorithms.
-              LINEAR_SEGMENTS Computes a balanced placement.
-              INTERACTIVE Tries to keep the preset y coordinates of nodes from the original layout. For dummy nodes, a guess is made to infer their coordinates. Requires the other interactive phase implementations to have run as well.
-              SIMPLE Minimizes the area at the expense of... well, pretty much everything else. */
-              randomizationSeed: 1,
-              // Seed used for pseudo-random number generators to control the layout algorithm; 0 means a new seed is generated
-              routeSelfLoopInside: !1,
-              // Whether a self-loop is routed around or inside its node.
-              separateConnectedComponents: !0,
-              // Whether each connected component should be processed separately
-              spacing: 20,
-              // Overall setting for the minimal amount of space to be left between objects
-              thoroughness: 7
-              // How much effort should be spent to produce a nice layout..
-            },
-            priority: function(k) {
-              return null;
-            }
-            // Edges with a non-nil value are skipped when geedy edge cycle breaking is enabled
-          };
-          c.exports = b;
-        },
-        /* 3 */
-        /***/
-        function(c, d, g) {
-          var b = g(0), y = function(E) {
-            E && E("layout", "klay", b);
-          };
-          typeof cytoscape < "u" && y(cytoscape), c.exports = y;
-        },
-        /* 4 */
-        /***/
-        function(c, d) {
-          c.exports = u;
-        }
-        /******/
-      ])
-    );
-  });
-})(cY);
-var Fle = cY.exports;
-const qle = /* @__PURE__ */ TG(Fle);
-function mv(a) {
-  var r = -1, u = a == null ? 0 : a.length;
-  for (this.clear(); ++r < u; ) {
-    var c = a[r];
-    this.set(c[0], c[1]);
-  }
-}
-function Vle() {
-  this.size = 0, this.__data__ = {
-    hash: new Hash(),
-    map: new (Map || ListCache)(),
-    string: new Hash()
-  };
-}
-function Wle(a) {
-  var r = getMapData(this, a).delete(a);
-  return this.size -= r ? 1 : 0, r;
-}
-function Ule(a) {
-  return getMapData(this, a).get(a);
-}
-function Kle(a) {
-  return getMapData(this, a).has(a);
-}
-function Zle(a, r) {
-  var u = getMapData(this, a), c = u.size;
-  return u.set(a, r), this.size += u.size == c ? 0 : 1, this;
-}
-mv.prototype.clear = Vle;
-mv.prototype.delete = Wle;
-mv.prototype.get = Ule;
-mv.prototype.has = Kle;
-mv.prototype.set = Zle;
-const Xle = "Expected a function";
-function V6(a, r) {
-  if (typeof a != "function" || r != null && typeof r != "function")
-    throw new TypeError(Xle);
-  var u = function() {
-    var c = arguments, d = r ? r.apply(this, c) : c[0], g = u.cache;
-    if (g.has(d))
-      return g.get(d);
-    var b = a.apply(this, c);
-    return u.cache = g.set(d, b) || g, b;
-  };
-  return u.cache = new (V6.Cache || mv)(), u;
-}
-V6.Cache = mv;
-const lY = function() {
-  var a = "Expected a function", r = Math.max, u = Date.now, c = u || function() {
-    return (/* @__PURE__ */ new Date()).getTime();
-  };
-  function d(b, y, k) {
-    var E, C, T, P, N, D, H, _ = 0, B = !1, $ = !0;
-    if (typeof b != "function")
-      throw new TypeError(a);
-    if (y = y < 0 ? 0 : +y || 0, k === !0) {
-      var F = !0;
-      $ = !1;
-    } else
-      g(k) && (F = !!k.leading, B = "maxWait" in k && r(+k.maxWait || 0, y), $ = "trailing" in k ? !!k.trailing : $);
-    function W() {
-      D && clearTimeout(D), C && clearTimeout(C), _ = 0, C = D = H = void 0;
-    }
-    function Q(Z, ae) {
-      ae && clearTimeout(ae), C = D = H = void 0, Z && (_ = c(), T = b.apply(N, E), !D && !C && (E = N = void 0));
-    }
-    function X() {
-      var Z = y - (c() - P);
-      Z <= 0 || Z > y ? Q(H, C) : D = setTimeout(X, Z);
-    }
-    function K() {
-      Q($, D);
-    }
-    function ee() {
-      if (E = arguments, P = c(), N = this, H = $ && (D || !F), B === !1)
-        var Z = F && !D;
-      else {
-        !C && !F && (_ = P);
-        var ae = B - (P - _), oe = ae <= 0 || ae > B;
-        oe ? (C && (C = clearTimeout(C)), _ = P, T = b.apply(N, E)) : C || (C = setTimeout(K, ae));
-      }
-      return oe && D ? D = clearTimeout(D) : !D && y !== B && (D = setTimeout(X, y)), Z && (oe = !0, T = b.apply(N, E)), oe && !D && !C && (E = N = void 0), T;
-    }
-    return ee.cancel = W, ee;
-  }
-  function g(b) {
-    var y = typeof b;
-    return !!b && (y === "object" || y === "function");
-  }
-  return d;
-}(), Qle = function(a, r, u) {
-  var c = !0, d = !0;
-  return u === !1 ? c = !1 : typeof u == typeof {} && (c = "leading" in u ? u.leading : c, d = "trailing" in u ? u.trailing : d), u = u || {}, u.leading = c, u.maxWait = r, u.trailing = d, lY(a, r, u);
-}, fY = {}, Jle = Object.getPrototypeOf, efe = fY.toString, W6 = fY.hasOwnProperty, hY = W6.toString, tfe = hY.call(Object), dY = function(r) {
-  return typeof r == "function" && typeof r.nodeType != "number";
-}, nfe = (a, r, u) => ((a << 16) + (r << 8) + u).toString(16).padStart(6, "0"), rfe = document.querySelectorAll.bind(document);
-function k6(a) {
-  let r, u;
-  return !a || efe.call(a) !== "[object Object]" ? !1 : (r = Jle(a), r ? (u = W6.call(r, "constructor") && r.constructor, typeof u == "function" && hY.call(u) === tfe) : !0);
-}
-function vY() {
-  let a, r, u, c, d, g, b = arguments[0] || {}, y = 1, k = arguments.length, E = !1;
-  for (typeof b == "boolean" && (E = b, b = arguments[y] || {}, y++), typeof b != "object" && !dY(b) && (b = {}), y === k && (b = this, y--); y < k; y++)
-    if ((a = arguments[y]) != null)
-      for (r in a)
-        u = b[r], c = a[r], b !== c && (E && c && (k6(c) || (d = Array.isArray(c))) ? (d ? (d = !1, g = u && Array.isArray(u) ? u : []) : g = u && k6(u) ? u : {}, b[r] = vY(E, g, c)) : c !== void 0 && (b[r] = c));
-  return b;
-}
-function ife(a) {
-  return document.getElementById(a);
-}
-function afe(a, r, u) {
-  const c = function() {
-    u(), a.removeEventListener(r, c);
-  };
-  a.addEventListener(r, c);
-}
-function ofe(a) {
-  if (a && a.nodeType === 1 && window.Node && a instanceof Node)
-    return !0;
-}
-function sfe(a, r) {
-  if (typeof r == "string") {
-    var u = a.ownerDocument.defaultView;
-    return u.getComputedStyle(a, null)[r];
-  } else if (typeof r == "object")
-    for (var c in r)
-      a.style[c] = r[c];
-}
-function ufe(a, r) {
-  a.classList.add(r);
-}
-function cfe(a, r) {
-  a.classList.remove(r);
-}
-function lfe(a, r) {
-  return a.classList.contains(r);
-}
-function ffe(a) {
-  const r = a.getBoundingClientRect();
-  return {
-    top: r.top + window.pageYOffset - document.documentElement.clientTop,
-    left: r.left + window.pageXOffset - document.documentElement.clientLeft
-  };
-}
-function hfe() {
-  function a() {
-    return Math.floor((1 + Math.random()) * 65536).toString(16).substring(1);
-  }
-  return a() + a() + "-" + a() + "-" + a() + "-" + a() + "-" + a() + a() + a();
-}
-const Ir = {
-  hasOwn: W6,
-  isFunction: dY,
-  query: rfe,
-  isPlainObject: k6,
-  extend: vY,
-  css: sfe,
-  addClass: ufe,
-  removeClass: cfe,
-  hasClass: lfe,
-  offset: ffe,
-  once: afe,
-  $: ife,
-  isNode: ofe,
-  debounce: lY,
-  throttle: Qle,
-  RGBToHex: nfe,
-  memoize: V6,
-  guid: hfe
-};
-class dfe {
-  constructor() {
-    this.events = {};
-  }
-  /**
-   * Adds listener to EventBus
-   * @param {string} type The name of the event to listen for
-   * @param {function} callback Callback to call when event was triggered
-   * @param {object} scope The scope in which the callback shall be executed
-   * @param  {...any} args Any number of args to be passed to the callback
-   */
-  on(r, u, c, ...d) {
-    typeof this.events[r] > "u" && (this.events[r] = []), this.events[r].push({
-      scope: c,
-      callback: u,
-      args: d
-    });
-  }
-  /**
-   * Removes listener from EventBus
-   * @param {string} type The name of the event to remove
-   * @param {function} callback Callback of the event to remove
-   * @param {object} scope The scope of the to be removed event
-   */
-  off(r, u, c) {
-    if (typeof this.events[r] > "u")
-      return;
-    const d = (g) => g.scope !== c || g.callback !== u;
-    this.events[r] = this.events[r].filter(d);
-  }
-  /**
-   * Checks if the passed event is registered in the EventBus
-   * @param {string} type Type of the to be checked event
-   * @param {callback} callback Callback of the to be checked event
-   * @param {object} scope Scope of the to be checked event
-   */
-  has(r, u, c) {
-    if (typeof this.events[r] > "u")
-      return !1;
-    let d = this.events[r].length;
-    if (u === void 0 && c === void 0)
-      return d > 0;
-    const g = (b) => {
-      const y = c ? b.scope === c : !0, k = b.callback === u;
-      if (y && k)
-        return !0;
-    };
-    return this.events[r].some(g);
-  }
-  /**
-   * Emits an event on the EventBus
-   * @param {string} type Type of event to emit
-   * @param {object} target The caller
-   * @param {...any} args Any number of args to be passed to the callback
-   */
-  emit(r, u, ...c) {
-    if (typeof this.events[r] > "u")
-      return;
-    let d = {
-      type: r,
-      target: u
-    };
-    const g = this.events[r].slice();
-    for (const b of g)
-      b && b.callback && b.callback.apply(b.scope, [d, ...c, ...b.args]);
-  }
-  debug() {
-    let r = "";
-    for (const [u, c] of Object.entries(this.events))
-      for (const d of c) {
-        let g = d.scope && d.scope.constructor.name || "Anonymous";
-        r += `${g} listening for "${u}"
-`;
-      }
-    return r;
-  }
-}
-class vfe {
-  constructor(r, u) {
-    this.cy = r;
-    let c = {
-      stackOrder: -1,
-      gridSpacing: 35,
-      strokeStyle: "#eeeeee",
-      lineWidth: 1,
-      lineDash: [5, 8],
-      zoomDash: !0,
-      panGrid: !0,
-      snapToGrid: !0,
-      drawGrid: !0
-    };
-    this._options = Ir.extend(!0, {}, c, u), this._init(), this._initEvents();
-  }
-  _init() {
-    this._container = this.cy.container(), this.canvas = document.createElement("canvas"), this.ctx = this.canvas.getContext("2d"), this._container.append(this.canvas);
-  }
-  _initEvents() {
-    window.addEventListener("resize", () => this._resizeCanvas()), this.cy.ready(() => {
-      this._resizeCanvas(), this._options.snapToGrid && this.snapAll(), this.cy.on("zoom", () => this._drawGrid()), this.cy.on("pan", () => this._drawGrid()), this.cy.on("free", (r) => this._nodeFreed(r)), this.cy.on("add", (r) => this._nodeAdded(r));
-    });
-  }
-  _resizeCanvas() {
-    let r = this._container.getBoundingClientRect();
-    this.canvas.height = r.height, this.canvas.width = r.width, this.canvas.style.position = "absolute", this.canvas.style.top = 0, this.canvas.style.left = 0, this.canvas.style.zIndex = this._options.stackOrder, setTimeout(() => {
-      let u = Ir.offset(this.canvas), c = Ir.offset(this._container);
-      this.canvas.style.top = -(u.top - c.top), this.canvas.style.left = -(u.left - c.left), this._drawGrid();
-    }, 0);
-  }
-  _drawGrid() {
-    if (this.clear(), !this._options.drawGrid)
-      return;
-    let r = this.cy.zoom(), u = this._container.getBoundingClientRect(), c = u.width, d = u.height, g = this._options.gridSpacing * r, b = this.cy.pan(), y = b.x % g, k = b.y % g;
-    if (this.ctx.strokeStyle = this._options.strokeStyle, this.ctx.lineWidth = this._options.lineWidth, this._options.zoomDash) {
-      let E = this._options.lineDash.slice();
-      for (let C = 0; C < E.length; C++)
-        E[C] = this._options.lineDash[C] * r;
-      this.ctx.setLineDash(E);
-    } else
-      this.ctx.setLineDash(this._options.lineDash);
-    this._options.panGrid ? this.ctx.lineDashOffset = -b.y : this.ctx.lineDashOffset = 0;
-    for (let E = y; E < c; E += g)
-      this.ctx.beginPath(), this.ctx.moveTo(E, 0), this.ctx.lineTo(E, d), this.ctx.stroke();
-    this._options.panGrid ? this.ctx.lineDashOffset = -b.x : this.ctx.lineDashOffset = 0;
-    for (let E = k; E < d; E += g)
-      this.ctx.beginPath(), this.ctx.moveTo(0, E), this.ctx.lineTo(c, E), this.ctx.stroke();
-  }
-  _nodeFreed(r) {
-    this._options.snapToGrid && this.snapNode(r.target);
-  }
-  _nodeAdded(r) {
-    this._options.snapToGrid && this.snapNode(r.target);
-  }
-  snapNode(r) {
-    let u = r.position(), c = Math.floor(u.x / this._options.gridSpacing), d = Math.floor(u.y / this._options.gridSpacing);
-    r.position({
-      x: (c + 0.5) * this._options.gridSpacing,
-      y: (d + 0.5) * this._options.gridSpacing
-    });
-  }
-  snapAll() {
-    this.cy.nodes().each((r) => {
-      this.snapNode(r);
-    });
-  }
-  refresh() {
-    this._resizeCanvas();
-  }
-  snapOn() {
-    this._options.snapToGrid = !0, this.snapAll(), this.cy.trigger("cyeditor.snapgridon");
-  }
-  snapOff() {
-    this._options.snapToGrid = !1, this.cy.trigger("cyeditor.snapgridoff");
-  }
-  gridOn() {
-    this._options.drawGrid = !0, this._drawGrid(), this.cy.trigger("cyeditor.gridon");
-  }
-  gridOff() {
-    this._options.drawGrid = !1, this._drawGrid(), this.cy.trigger("cyeditor.gridoff");
-  }
-  clear() {
-    let r = this._container.getBoundingClientRect(), u = r.width, c = r.height;
-    this.ctx.clearRect(0, 0, u, c);
-  }
-}
-const gY = (a) => {
-  a && a("core", "snapToGrid", function(r) {
-    return new vfe(this, r);
-  });
-};
-let gfe = {
-  container: !1,
-  // can be a selector
-  viewLiveFramerate: 0,
-  // set false to update graph pan only on drag end; set 0 to do it instantly; set a number (frames per second) to update not more than N times per second
-  dblClickDelay: 200,
-  // milliseconds
-  removeCustomContainer: !0,
-  // destroy the container specified by user on plugin destroy
-  rerenderDelay: 500
-  // ms to throttle rerender updates to the panzoom for performance
-};
-class bfe {
-  constructor(r, u) {
-    this.cy = r, this._options = Ir.extend({}, gfe, u), this._init(r, u);
-  }
-  _init() {
-    this._cyListeners = [], this._contianer = this.cy.container(), this.boundingBox = this.bb();
-    let r = this._contianer.getBoundingClientRect();
-    this.width = r.width, this.height = r.height, this._initPanel(), this._initThumbnail(), this._initView(), this._initOverlay();
-  }
-  _addCyListener(r, u) {
-    this._cyListeners.push({
-      events: r,
-      handler: u
-    }), this.cy.on(r, u);
-  }
-  _removeCyListeners() {
-    let r = this.cy;
-    this._cyListeners.forEach(function(u) {
-      r.off(u.events, u.handler);
-    }), r.offRender(this._onRenderHandler);
-  }
-  _initPanel() {
-    let r = this._options;
-    if (r.container) {
-      if (typeof r.container == "string" ? this.$panel = Ir.query(r.container)[0] : Ir.isNode(r.container) && (this.$panel = r.container), !this.$panel) {
-        console.error("There is no any element matching your container");
-        return;
-      }
-    } else
-      this.$panel = document.createElement("div"), document.body.appendChild(this.$panel);
-    this.$panel.classList.add("cytoscape-navigator"), this._setupPanel(), this._addCyListener("resize", this.resize.bind(this));
-  }
-  _setupPanel() {
-    let r = this.$panel.getBoundingClientRect();
-    this.panelWidth = r.width, this.panelHeight = r.height;
-  }
-  _initThumbnail() {
-    this.$thumbnail = document.createElement("img"), this.$panel.appendChild(this.$thumbnail), this._setupThumbnailSizes(), this._updateThumbnailImage();
-  }
-  _setupThumbnailSizes() {
-    this.boundingBox = this.bb(), this.thumbnailZoom = Math.min(this.panelHeight / this.boundingBox.h, this.panelWidth / this.boundingBox.w), this.thumbnailPan = {
-      x: (this.panelWidth - this.thumbnailZoom * (this.boundingBox.x1 + this.boundingBox.x2)) / 2,
-      y: (this.panelHeight - this.thumbnailZoom * (this.boundingBox.y1 + this.boundingBox.y2)) / 2
-    };
-  }
-  // If bounding box has changed then update sizes
-  // Otherwise just update the thumbnail
-  _checkThumbnailSizesAndUpdate() {
-    let r = this.thumbnailZoom, u = this.thumbnailPan.x, c = this.thumbnailPan.y;
-    this._setupThumbnailSizes(), this._updateThumbnailImage(), (r !== this.thumbnailZoom || u !== this.thumbnailPan.x || c !== this.thumbnailPan.y) && this._setupView();
-  }
-  _initView() {
-    this.$view = document.createElement("div"), this.$view.className = "cytoscape-navigatorView", this.$panel.appendChild(this.$view);
-    let r = window.getComputedStyle(this.$view);
-    this.viewBorderTop = parseInt(r["border-top-width"], 10), this.viewBorderRight = parseInt(r["border-right-width"], 10), this.viewBorderBottom = parseInt(r["border-bottom-width"], 10), this.viewBorderLeft = parseInt(r["border-left-width"], 10), this.viewBorderHorizontal = this.viewBorderLeft + this.viewBorderRight, this.viewBorderVertical = this.viewBorderTop + this.viewBorderBottom, this._setupView(), this._addCyListener("zoom pan", this._setupView.bind(this));
-  }
-  _setupView() {
-    if (this.viewLocked)
-      return;
-    let r = this.cy.zoom(), u = this.cy.pan();
-    this.viewW = this.width / r * this.thumbnailZoom, this.viewX = -u.x * this.viewW / this.width + this.thumbnailPan.x - this.viewBorderLeft, this.viewH = this.height / r * this.thumbnailZoom, this.viewY = -u.y * this.viewH / this.height + this.thumbnailPan.y - this.viewBorderTop, this.$view.style.width = this.viewW + "px", this.$view.style.height = this.viewH + "px", this.$view.style.position = "absolute", this.$view.style.left = this.viewX + "px", this.$view.style.top = this.viewY + "px";
-  }
-  /*
-     * Used inner attributes
-     *
-     * timeout {number} used to keep stable frame rate
-     * lastMoveStartTime {number}
-     * inMovement {boolean}
-     * hookPoint {object} {x: 0, y: 0}
-     */
-  _initOverlay() {
-    this.$overlay = document.createElement("div"), this.$overlay.className = "cytoscape-navigatorOverlay", this.$panel.appendChild(this.$overlay), this.overlayHookPointX = 0, this.overlayHookPointY = 0, this._initEventsHandling();
-  }
-  _initEventsHandling() {
-    let r = [
-      // Mouse events
-      "mousedown",
-      "mousewheel",
-      "DOMMouseScroll",
-      // Mozilla specific event
-      // Touch events
-      "touchstart"
-    ], u = [
-      "mouseup",
-      "mouseout",
-      "mousemove",
-      // Touch events
-      "touchmove",
-      "touchend"
-    ], c = (g) => {
-      let b = Ir.extend({}, g);
-      if (b.type === "touchstart" && (b.offsetX = this.viewX + this.viewW / 2, b.offsetY = this.viewY + this.viewH / 2), b.offsetX === void 0 || b.offsetY === void 0) {
-        let y = Ir.offset(b.target);
-        b.offsetX = b.pageX - y.left, b.offsetY = b.pageY - y.top;
-      }
-      return b.type === "mousedown" || b.type === "touchstart" ? this._eventMoveStart(b) : (b.type === "mousewheel" || b.type === "DOMMouseScroll") && this._eventZoom(b), g.preventDefault(), !1;
-    }, d = (g) => {
-      let b = Ir.extend({}, g);
-      if (this.overlayInMovement) {
-        if (b.type === "touchend" ? (b.offsetX = this.viewX + this.viewW / 2, b.offsetY = this.viewY + this.viewH / 2) : b.type === "touchmove" && (b.pageX = b.touches[0].pageX, b.pageY = b.touches[0].pageY), b.target && (b.offsetX === void 0 || b.offsetY === void 0)) {
-          let y = Ir.offset(b.target);
-          b.offsetX = b.pageX - y.left, b.offsetY = b.pageY - y.top;
-        }
-        if (b.target && b.target !== this.$overlay) {
-          let y = Ir.offset(b.target), k = Ir.offset(this.$overlay);
-          if (y && k)
-            b.offsetX = b.offsetX - k.left + y.left, b.offsetY = b.offsetY - k.top + y.top;
-          else
-            return !1;
-        }
-        return b.type === "mousemove" || b.type === "touchmove" ? this._eventMove(b) : (b.type === "mouseup" || b.type === "touchend") && this._eventMoveEnd(b), g.preventDefault(), !1;
-      }
-    };
-    r.forEach((g) => {
-      this.$overlay.addEventListener(g, c);
-    }), u.forEach((g) => {
-      window.addEventListener(g, d);
-    }), this._removeEventsHandling = () => {
-      u.forEach((g) => {
-        window.removeEventListener(g, d);
-      }), r.forEach((g) => {
-        this.$overlay.addEventListener(g, c);
-      });
-    };
-  }
-  _eventMoveStart(r) {
-    let u = (/* @__PURE__ */ new Date()).getTime();
-    this.overlayLastMoveStartTime && this.overlayLastMoveStartTime + this._options.dblClickDelay > u ? (this.overlayLastMoveStartTime = 0, this.overlayInMovement = !0, this.overlayHookPointX = this.viewW / 2, this.overlayHookPointY = this.viewH / 2, this._options.viewLiveFramerate !== !1 ? this._eventMove({
-      offsetX: this.panelWidth / 2,
-      offsetY: this.panelHeight / 2
-    }) : this._eventMoveEnd({
-      offsetX: this.panelWidth / 2,
-      offsetY: this.panelHeight / 2
-    }), this.cy.reset(), this.overlayInMovement = !1) : (this.overlayLastMoveStartTime = u, this.overlayInMovement = !0, this.viewLocked = !0, r.offsetX >= this.viewX && r.offsetX <= this.viewX + this.viewW && r.offsetY >= this.viewY && r.offsetY <= this.viewY + this.viewH ? (this.overlayHookPointX = r.offsetX - this.viewX, this.overlayHookPointY = r.offsetY - this.viewY) : (this.overlayHookPointX = this.viewW / 2, this.overlayHookPointY = this.viewH / 2, this._eventMove(r)));
-  }
-  _eventMove(r) {
-    this._checkMousePosition(r), this.overlayInMovement && (this.viewX = r.offsetX - this.overlayHookPointX, this.viewY = r.offsetY - this.overlayHookPointY, this.$view.style.left = this.viewX + "px", this.$view.style.top = this.viewY + "px", this._options.viewLiveFramerate !== !1 && (this._options.viewLiveFramerate === 0 ? this._moveCy() : this.overlayTimeout || (this.overlayTimeout = setTimeout(() => {
-      this._moveCy(), this.overlayTimeout = !1;
-    }, 1e3 / this._options.viewLiveFramerate))));
-  }
-  _checkMousePosition(r) {
-    r.offsetX > this.viewX && r.offsetX < this.viewX + this.viewBorderHorizontal + this.viewW && r.offsetY > this.viewY && r.offsetY < this.viewY + this.viewBorderVertical + this.viewH ? this.$panel.classList.add("mouseover-view") : this.$panel.classList.remove("mouseover-view");
-  }
-  _eventMoveEnd(r) {
-    this.viewLocked = !1, this.$panel.classList.remove("mouseover-view"), this.overlayInMovement && (this._eventMove(r), this._options.viewLiveFramerate === !1 && this._moveCy(), this.overlayInMovement = !1);
-  }
-  _eventZoom(r) {
-    let u = Math.pow(10, r.wheelDeltaY / 1e3 || r.wheelDelta / 1e3 || r.detail / -32), c = {
-      left: r.offsetX,
-      top: r.offsetY
-    };
-    this.cy.zoomingEnabled() && this._zoomCy(u, c);
-  }
-  _updateThumbnailImage() {
-    if (this._thumbnailUpdating)
-      return;
-    this._thumbnailUpdating = !0;
-    let r = () => {
-      this._checkThumbnailSizesAndUpdate(), this._setupView();
-      let u = this.$thumbnail;
-      if (!u)
-        return;
-      let c = this.panelWidth, d = this.panelHeight, g = this.boundingBox, b = Math.min(c / g.w, d / g.h), y = {
-        x: (c - b * g.w) / 2,
-        y: (d - b * g.h) / 2
-      }, k = this.cy.png({
-        full: !0,
-        scale: b
-      });
-      k.indexOf("image/png") < 0 ? u.removeAttribute("src") : u.setAttribute("src", k), u.style.position = "absolute", u.style.left = y.x + "px", u.style.top = y.y + "px";
-    };
-    this._onRenderHandler = Ir.throttle(r, this._options.rerenderDelay), this.cy.onRender(this._onRenderHandler);
-  }
-  _moveCy() {
-    this.cy.pan({
-      x: -(this.viewX + this.viewBorderLeft - this.thumbnailPan.x) * this.width / this.viewW,
-      y: -(this.viewY + this.viewBorderLeft - this.thumbnailPan.y) * this.height / this.viewH
-    });
-  }
-  _zoomCy(r) {
-    let u = {
-      x: this.width / 2,
-      y: this.height / 2
-    };
-    this.cy.zoom({
-      level: this.cy.zoom() * r,
-      renderedPosition: u
-    });
-  }
-  destroy() {
-    if (this._removeCyListeners(), this._removeEventsHandling(), this._options.container && !this._options.removeCustomContainer) {
-      let r = this.$panel.childNodes;
-      for (let u = r.length - 1; u >= 0; u--)
-        this.$panel.removeChild(r[u]);
-    } else
-      this.$panel.parentNode.removeChild(this.$panel);
-  }
-  resize() {
-    let r = this._contianer.getBoundingClientRect();
-    this.width = r.width, this.height = r.height, this._setupPanel(), this._checkThumbnailSizesAndUpdate(), this._setupView();
-  }
-  bb() {
-    let r = this.cy.elements().boundingBox();
-    return r.w === 0 || r.h === 0 ? {
-      x1: 0,
-      x2: 1 / 0,
-      y1: 0,
-      y2: 1 / 0,
-      w: 1 / 0,
-      h: 1 / 0
-    } : r;
-  }
-}
-const pfe = (a) => {
-  a && a("core", "navigator", function(r) {
-    return new bfe(this, r);
-  });
-}, wfe = {
-  preview: !0,
-  // whether to show added edges preview before releasing selection
-  hoverDelay: 150,
-  // time spent hovering over a target node before it is considered selected
-  handleNodes: "node",
-  // selector/filter function for whether edges can be made from a given node
-  snap: !1,
-  // when enabled, the edge can be drawn by just moving close to a target node (can be confusing on compound graphs)
-  snapThreshold: 50,
-  // the target node must be less than or equal to this many pixels away from the cursor/finger
-  snapFrequency: 15,
-  // the number of times per second (Hz) that snap checks done (lower is less expensive)
-  noEdgeEventsInDraw: !1,
-  // set events:no to edges during draws, prevents mouseouts on compounds
-  disableBrowserGestures: !0,
-  // during an edge drawing gesture, disable browser gestures such as two-finger trackpad swipe and pinch-to-zoom
-  handlePosition: function(a) {
-    return "middle top";
-  },
-  handleInDrawMode: !1,
-  // whether to show the handle in draw mode
-  edgeType: function(a, r) {
-    return "flat";
-  },
-  loopAllowed: function(a) {
-    return !1;
-  },
-  nodeLoopOffset: -50,
-  // offset for edgeType: 'node' loops
-  nodeParams: function(a, r) {
-    return {};
-  },
-  edgeParams: function(a, r, u) {
-    return {};
-  },
-  ghostEdgeParams: function() {
-    return {};
-  },
-  show: function(a) {
-  },
-  hide: function(a) {
-  },
-  start: function(a) {
-  },
-  complete: function(a, r, u) {
-  },
-  stop: function(a) {
-  },
-  cancel: function(a, r) {
-  },
-  hoverover: function(a, r) {
-  },
-  hoverout: function(a, r) {
-  },
-  previewon: function(a, r, u) {
-  },
-  previewoff: function(a, r, u) {
-  },
-  drawon: function() {
-  },
-  drawoff: function() {
-  }
-};
-function mfe() {
-  if (this.saveGestureState(), this.cy.zoomingEnabled(!1).panningEnabled(!1).boxSelectionEnabled(!1), this.options.disableBrowserGestures) {
-    let a = this.windowListenerOptions;
-    window.addEventListener("touchstart", this.preventDefault, a), window.addEventListener("touchmove", this.preventDefault, a), window.addEventListener("wheel", this.preventDefault, a);
-  }
-  return this;
-}
-function yfe() {
-  if (this.cy.zoomingEnabled(this.lastZoomingEnabled).panningEnabled(this.lastPanningEnabled).boxSelectionEnabled(this.lastBoxSelectionEnabled), this.options.disableBrowserGestures) {
-    let a = this.windowListenerOptions;
-    window.removeEventListener("touchstart", this.preventDefault, a), window.removeEventListener("touchmove", this.preventDefault, a), window.removeEventListener("wheel", this.preventDefault, a);
-  }
-  return this;
-}
-function kfe() {
-  let {
-    cy: a
-  } = this;
-  return this.lastPanningEnabled = a.panningEnabled(), this.lastZoomingEnabled = a.zoomingEnabled(), this.lastBoxSelectionEnabled = a.boxSelectionEnabled(), this;
-}
-const Efe = {
-  disableGestures: mfe,
-  resetGestures: yfe,
-  saveGestureState: kfe
-};
-function Sfe() {
-  let {
-    cy: a,
-    options: r
-  } = this;
-  return this.addListener(a, "drag", () => {
-    this.grabbingNode = !0;
-  }), this.addListener(a, "free", () => {
-    this.grabbingNode = !1;
-  }), this.addListener(a, "mouseover", "node", (u) => {
-    this.show(u.target);
-  }), this.addListener(a, "tap", "node", (u) => {
-    let c = u.target;
-    c.same(this.handleNode) || this.show(c);
-  }), this.addListener(a, "position", "node", (u) => {
-    u.target.same(this.sourceNode) && this.hide();
-  }), this.addListener(a, "tapstart", "node", (u) => {
-    let c = u.target;
-    c.same(this.handleNode) ? this.start(this.sourceNode) : this.drawMode ? this.start(c) : c.same(this.sourceNode) && this.hide();
-  }), this.addListener(a, "tapdrag", (u) => {
-    this.update(u.position);
-  }), this.addListener(a, "tapdragover", "node", (u) => {
-    this.preview(u.target);
-  }), this.addListener(a, "tapdragout", "node", (u) => {
-    r.snap && u.target.same(this.targetNode) || this.unpreview(u.target);
-  }), this.addListener(a, "tapend", () => {
-    this.stop();
-  }), this.addListener(a, "remove", (u) => {
-    u.target.same(this.sourceNode) && this.hide();
-  }), this;
-}
-const Cfe = {
-  addCytoscapeListeners: Sfe
-}, xfe = (a) => typeof a == "string";
-function $E(a, r, u) {
-  let c = {};
-  return Object.assign(c, r, a), Object.assign(c.data, r.data, a.data), xfe(r.classes) ? c.classes = r.classes + " " + u : Array.isArray(r.classes) ? c.classes = r.classes.join(" ") + " " + u : c.classes = u, c;
-}
-function Tfe(a = !1) {
-  let {
-    cy: r,
-    options: u,
-    presumptiveTargets: c,
-    previewEles: d,
-    active: g
-  } = this, b = this.sourceNode, y = this.targetNode, k = a ? "eh-preview" : "", E = r.collection(), C = u.edgeType(b, y);
-  if (!g || !C || a && !u.preview)
-    return;
-  if (!y || y.size() === 0) {
-    d.remove(), this.emit("cancel", this.mp(), b, c);
-    return;
-  }
-  if (!a && u.preview) {
-    d.removeClass("eh-preview").style("events", ""), this.emit("complete", this.mp(), b, y, d);
-    return;
-  }
-  let T = b.position(), P = y.position(), N;
-  if (b.same(y) ? N = {
-    x: T.x + u.nodeLoopOffset,
-    y: T.y + u.nodeLoopOffset
-  } : N = {
-    x: (T.x + P.x) / 2,
-    y: (T.y + P.y) / 2
-  }, C === "node") {
-    let D = r.add(
-      $E(
-        {
-          group: "nodes",
-          position: N
-        },
-        u.nodeParams(b, y),
-        k
-      )
-    ), H = r.add(
-      $E(
-        {
-          group: "edges",
-          data: {
-            source: b.id(),
-            target: D.id()
-          }
-        },
-        u.edgeParams(b, y, 0),
-        k
-      )
-    ), _ = r.add(
-      $E(
-        {
-          group: "edges",
-          data: {
-            source: D.id(),
-            target: y.id()
-          }
-        },
-        u.edgeParams(b, y, 1),
-        k
-      )
-    );
-    E = E.merge(D).merge(H).merge(_);
-  } else {
-    let D = r.add(
-      $E(
-        {
-          group: "edges",
-          data: {
-            source: b.id(),
-            target: y.id()
-          }
-        },
-        u.edgeParams(b, y, 0),
-        k
-      )
-    );
-    E = E.merge(D);
-  }
-  return a ? (this.previewEles = E, E.style("events", "no")) : (E.style("events", ""), this.emit("complete", this.mp(), b, y, E)), this;
-}
-function Lfe() {
-  return this.makeEdges(!0), this;
-}
-function Pfe() {
-  return this.previewEles.nonempty() && this.previewEles.inside();
-}
-function Dfe() {
-  return this.previewShown() && this.previewEles.remove(), this;
-}
-function jfe() {
-  return this.handleNode.nonempty() && this.handleNode.inside();
-}
-function Nfe() {
-  return this.handleShown() && this.handleNode.remove(), this;
-}
-function Ife(a) {
-  let {
-    options: r,
-    cy: u
-  } = this, c = typeof r.handlePosition == "string" ? () => r.handlePosition : r.handlePosition, d = a.position(), g = a.outerHeight(), b = a.outerWidth(), y = 0, k = 0, E = c(a).toLowerCase().split(/\s+/), C = E[0], T = E[1];
-  C === "left" ? y = -(b / 2) : C === "right" && (y = b / 2), T === "top" ? k = -(g / 2) : T === "bottom" && (k = g / 2);
-  let P = this.hx = d.x + y, N = this.hy = d.y + k, D = {
-    x: P,
-    y: N
-  };
-  return this.handleShown() ? this.handleNode.position(D) : u.batch(() => {
-    this.handleNode = u.add({
-      classes: "eh-handle",
-      position: D,
-      grabbable: !1,
-      selectable: !1
-    }), this.handleNode.style("z-index", 9007199254740991);
-  }), this;
-}
-function Mfe() {
-  let {
-    sourceNode: a,
-    ghostNode: r,
-    cy: u,
-    mx: c,
-    my: d,
-    options: g
-  } = this, b = c, y = d, k, E;
-  if (a)
-    return (!r || r.length === 0 || r.removed()) && (E = this.ghostEles = u.collection(), u.batch(() => {
-      r = this.ghostNode = u.add({
-        group: "nodes",
-        classes: "eh-ghost eh-ghost-node",
-        position: {
-          x: 0,
-          y: 0
-        }
-      }), r.style({
-        "background-color": "blue",
-        width: 1e-4,
-        height: 1e-4,
-        opacity: 0,
-        events: "no"
-      });
-      let C = g.ghostEdgeParams();
-      k = u.add(Object.assign({}, C, {
-        group: "edges",
-        data: Object.assign({}, C.data, {
-          source: a.id(),
-          target: r.id()
-        })
-      })), k.addClass("eh-ghost eh-ghost-edge"), k.style({
-        events: "no"
-      });
-    }), E.merge(r).merge(k)), r.position({
-      x: b,
-      y
-    }), this;
-}
-const Ofe = {
-  makeEdges: Tfe,
-  makePreview: Lfe,
-  removePreview: Dfe,
-  previewShown: Pfe,
-  updateEdge: Mfe,
-  handleShown: jfe,
-  setHandleFor: Ife,
-  removeHandle: Nfe
-};
-function Afe(a) {
-  const { options: r, previewEles: u, ghostEles: c, handleNode: d } = this, g = (N) => u.anySame(N), b = (N) => c.anySame(N), y = (N) => N.filter(r.handleNodes).length > 0, k = (N) => d.same(N), E = (N) => g(N) || k(N) || b(N), { enabled: C, active: T, grabbingNode: P } = this;
-  return C && !T && !P && (a == null || !E(a) && y(a));
-}
-function Rfe(a) {
-  return this.canStartOn(a) && this.drawMode;
-}
-function Bfe(a) {
-  return this.canStartOn(a) && !this.drawMode;
-}
-function zfe(a) {
-  let { options: r, drawMode: u } = this;
-  if (!(!this.canStartOn(a) || u && !r.handleInDrawMode))
-    return this.sourceNode = a, this.setHandleFor(a), this.emit("show", this.hp(), this.sourceNode), this;
-}
-function Hfe() {
-  return this.removeHandle(), this.emit("hide", this.hp(), this.sourceNode), this;
-}
-function _fe(a) {
-  this.canStartOn(a) && (this.active = !0, this.sourceNode = a, this.sourceNode.addClass("eh-source"), this.disableGestures(), this.disableEdgeEvents(), this.emit("start", this.hp(), a));
-}
-function Gfe(a) {
-  if (!this.active)
-    return;
-  let r = a;
-  return this.mx = r.x, this.my = r.y, this.updateEdge(), this.throttledSnap(), this;
-}
-function $fe() {
-  if (!this.active || !this.options.snap)
-    return !1;
-  let a = this.cy, r = this.targetNode, u = this.options.snapThreshold, c = (N) => {
-    let H = b(N) + u;
-    return H * H;
-  }, d = this.mp(), g = (N, D) => (D.x - N.x) * (D.x - N.x) + (D.y - N.y) * (D.y - N.y), b = (N) => (N.outerWidth() + N.outerHeight()) / 4, y = Ir.memoize((N) => g(N.position(), d), (N) => N.id()), k = (N) => y(N) <= c(N), E = (N, D) => y(N) - y(D), C = !1, T = a.nodes(k).sort(E), P = !1;
-  r.nonempty() && !k(r) && this.unpreview(r);
-  for (let N = 0; N < T.length; N++) {
-    let D = T[N];
-    if (D.same(r) || this.preview(D, C)) {
-      P = !0;
-      break;
-    }
-  }
-  return P;
-}
-function Yfe(a, r = !0) {
-  let { options: u, sourceNode: c, ghostNode: d, ghostEles: g, presumptiveTargets: b, previewEles: y, active: k } = this, E = c, C = a.same(E), T = u.loopAllowed(a), P = a.same(d), N = !u.edgeType(E, a), D = a.same(this.handleNode), H = a.same(this.targetNode);
-  if (!k || D || P || N || H || C && !T)
-    return !1;
-  this.targetNode.nonempty() && this.unpreview(this.targetNode), clearTimeout(this.previewTimeout);
-  let _ = () => {
-    this.targetNode = a, b.merge(a), a.addClass("eh-presumptive-target"), a.addClass("eh-target"), this.emit("hoverover", this.mp(), E, a), u.preview && (a.addClass("eh-preview"), g.addClass("eh-preview-active"), c.addClass("eh-preview-active"), a.addClass("eh-preview-active"), this.makePreview(), this.emit("previewon", this.mp(), E, a, y));
-  };
-  return r && u.hoverDelay > 0 ? this.previewTimeout = setTimeout(_, u.hoverDelay) : _(), !0;
-}
-function Ffe(a) {
-  if (!this.active || a.same(this.handleNode))
-    return;
-  let { previewTimeout: r, sourceNode: u, previewEles: c, ghostEles: d, cy: g } = this;
-  clearTimeout(r), this.previewTimeout = null;
-  let b = u;
-  return a.removeClass("eh-preview eh-target eh-presumptive-target eh-preview-active"), d.removeClass("eh-preview-active"), u.removeClass("eh-preview-active"), this.targetNode = g.collection(), this.removePreview(b, a), this.emit("hoverout", this.mp(), b, a), this.emit("previewoff", this.mp(), b, a, c), this;
-}
-function qfe() {
-  if (!this.active)
-    return;
-  let { sourceNode: a, targetNode: r, ghostEles: u, presumptiveTargets: c } = this;
-  return clearTimeout(this.previewTimeout), a.removeClass("eh-source"), r.removeClass("eh-target eh-preview eh-hover"), c.removeClass("eh-presumptive-target"), this.makeEdges(), this.removeHandle(), u.remove(), this.clearCollections(), this.resetGestures(), this.enableEdgeEvents(), this.active = !1, this.emit("stop", this.mp(), a), this;
-}
-const Vfe = {
-  show: zfe,
-  hide: Hfe,
-  start: _fe,
-  update: Gfe,
-  preview: Yfe,
-  unpreview: Ffe,
-  stop: qfe,
-  snap: $fe,
-  canStartOn: Afe,
-  canStartDrawModeOn: Rfe,
-  canStartNonDrawModeOn: Bfe
-};
-function Wfe() {
-  return this.addCytoscapeListeners(), this.addListener(this.cy, "destroy", () => this.destroy()), this;
-}
-function Ufe() {
-  for (let a = this.listeners.length - 1; a >= 0; a--) {
-    let r = this.listeners[a];
-    this.removeListener(r.target, r.event, r.selector, r.callback, r.options);
-  }
-  return this;
-}
-function bY(a, r, u, c, d) {
-  return typeof u != "string" && (c = u, d = c, u = null), d == null && (d = !1), { target: a, event: r, selector: u, callback: c, options: d };
-}
-function pY(a) {
-  return a instanceof Element;
-}
-function Kfe(a, r, u, c, d) {
-  let g = bY(a, r, u, c, d);
-  return this.listeners.push(g), pY(g.target) ? g.target.addEventListener(g.event, g.callback, g.options) : g.selector ? g.target.addListener(g.event, g.selector, g.callback, g.options) : g.target.addListener(g.event, g.callback, g.options), this;
-}
-function Zfe(a, r, u, c, d) {
-  let g = bY(a, r, u, c, d);
-  for (let b = this.listeners.length - 1; b >= 0; b--) {
-    let y = this.listeners[b];
-    if (g.target === y.target && g.event === y.event && (g.selector == null || g.selector === y.selector) && (g.callback == null || g.callback === y.callback)) {
-      this.listeners.splice(b, 1), pY(g.target) ? g.target.removeEventListener(g.event, g.callback, g.options) : g.selector ? g.target.removeListener(g.event, g.selector, g.callback, g.options) : g.target.removeListener(g.event, g.callback, g.options);
-      break;
-    }
-  }
-  return this;
-}
-function Xfe(a, r, ...u) {
-  let { options: c, cy: d } = this;
-  d.emit({ type: `eh${a}`, position: r }, u);
-  let g = c[a];
-  return g != null && g(...u), this;
-}
-const Qfe = { addListener: Kfe, addListeners: Wfe, removeListener: Zfe, removeListeners: Ufe, emit: Xfe };
-class wY {
-  constructor(r, u) {
-    this.cy = r, this.listeners = [], this.enabled = !0, this.drawMode = !1, this.active = !1, this.grabbingNode = !1, this.handleNode = r.collection(), this.clearCollections(), this.hx = 0, this.hy = 0, this.hr = 0, this.mx = 0, this.my = 0, this.options = Object.assign({}, wfe, u), this.saveGestureState(), this.addListeners(), this.throttledSnap = Ir.throttle(this.snap.bind(this), 1e3 / u.snapFrequency), this.preventDefault = (d) => d.preventDefault();
-    let c = !1;
-    try {
-      let d = Object.defineProperty({}, "passive", {
-        get: function() {
-          c = !0;
-        }
-      });
-      window.addEventListener("test", null, d);
-    } catch {
-    }
-    c ? this.windowListenerOptions = {
-      capture: !0,
-      passive: !1
-    } : this.windowListenerOptions = !0;
-  }
-  destroy() {
-    this.removeListeners();
-  }
-  setOptions(r) {
-    Object.assign(this.options, r);
-  }
-  mp() {
-    return {
-      x: this.mx,
-      y: this.my
-    };
-  }
-  hp() {
-    return {
-      x: this.hx,
-      y: this.hy
-    };
-  }
-  clearCollections() {
-    this.previewEles = this.cy.collection(), this.ghostEles = this.cy.collection(), this.ghostNode = this.cy.collection(), this.sourceNode = this.cy.collection(), this.targetNode = this.cy.collection(), this.presumptiveTargets = this.cy.collection();
-  }
-  enable() {
-    return this.enabled = !0, this.emit("enable"), this;
-  }
-  disable() {
-    return this.enabled = !1, this.emit("disable"), this;
-  }
-  toggleDrawMode(r) {
-    let {
-      cy: u,
-      options: c
-    } = this;
-    return this.drawMode = r ?? !this.drawMode, this.drawMode ? (this.prevUngrabifyState = u.autoungrabify(), u.autoungrabify(!0), !c.handleInDrawMode && this.handleShown() && this.hide(), this.emit("drawon")) : (u.autoungrabify(this.prevUngrabifyState), this.emit("drawoff")), this;
-  }
-  enableDrawMode() {
-    return this.toggleDrawMode(!0);
-  }
-  disableDrawMode() {
-    return this.toggleDrawMode(!1);
-  }
-  disableEdgeEvents() {
-    return this.options.noEdgeEventsInDraw && this.cy.edges().style("events", "no"), this;
-  }
-  enableEdgeEvents() {
-    return this.options.noEdgeEventsInDraw && this.cy.edges().style("events", ""), this;
-  }
-}
-let Jfe = wY.prototype, ehe = (a) => Object.assign(Jfe, a);
-const the = [Efe, Cfe, Ofe, Vfe, Qfe];
-the.forEach(ehe);
-const nhe = (a) => {
-  a && a("core", "edgehandles", function(r) {
-    return new wY(this, r);
-  });
-}, rhe = {
-  container: !1,
-  addWhenDrop: !0,
-  nodeTypes: []
-};
-class ihe {
-  constructor(r, u) {
-    this.cy = r, this._options = Object.assign({}, rhe, u), this._options.nodeTypes.forEach((c) => {
-      c.width = c.width || 76, c.height = c.height || 76, c.category = c.category || "other";
-    }), !(this._options.nodeTypes.length < 1) && (this._initShapePanel(), this._initShapeItems(), this._initEvents());
-  }
-  _initShapeItems() {
-    let r = this._options.nodeTypes.filter((g) => g.type && g.image);
-    r.forEach((g) => {
-      g._id = Ir.guid();
-    });
-    let u = {}, c = [];
-    r.forEach((g) => {
-      g.category ? u[g.category] ? u[g.category].push(g) : u[g.category] = [g] : c.push(g);
-    }), c.length && (u.other = c);
-    let d = Object.keys(u).map((g) => {
-      let b = u[g].map((y) => `<div class="shape-item" draggable="true" data-id="${y._id}"><img src="${y.image}" draggable="false"/><span>${y.name}</span></div>`).join("");
-      return `<div class="category">
-                  <div class="panel-title">${g}</div>
-                  <div class="shapes">${b}</div>
-                </div>`;
-    }).join("");
-    this._shapePanel.innerHTML = d;
-  }
-  _initEvents() {
-    let r = this.cy.container(), u = (c) => {
-      c.preventDefault();
-    };
-    Ir.query(".shape-item").forEach((c) => {
-      c.addEventListener("dragstart", (d) => {
-        d.dataTransfer.setData("id", d.target.getAttribute("data-id"));
-      });
-    }), r.addEventListener("drop", (c) => {
-      let d = c.dataTransfer.getData("id");
-      if (c.target.compareDocumentPosition(r) === 10) {
-        let b = { x: c.offsetX, y: c.offsetY };
-        const y = this._options.nodeTypes.find((k) => k._id === d);
-        y && this._addNodeToCy(y, b);
-      }
-    }), r.addEventListener("dragenter", u), r.addEventListener("dragover", u);
-  }
-  _addNodeToCy({ type: r, width: u, height: c, bg: d, name: g = "", points: b, image: y }, k) {
-    let E = { type: r, name: g, bg: d, width: u, height: c };
-    E.image = y;
-    let C = {
-      group: "nodes",
-      data: E,
-      position: k
-    };
-    b && (C.data.points = b), this._options.addWhenDrop && this.cy.trigger("cyeditor.addnode", C);
-  }
-  _initShapePanel() {
-    let { _options: r } = this;
-    r.container ? (typeof r.container == "string" ? this._shapePanel = Ir.query(r.container)[0] : Ir.isNode(r.container) && (this._shapePanel = r.container), this._shapePanel || console.error("There is no any element matching your container")) : (this._shapePanel = document.createElement("div"), document.body.appendChild(this._shapePanel));
-  }
-}
-const ahe = (a) => {
-  a && a("core", "dragAddNodes", function(r) {
-    return new ihe(this, r);
-  });
-}, ohe = {
-  menus: [
-    {
-      id: "remove",
-      content: "remove",
-      disabled: !1,
-      divider: !0
-    },
-    {
-      id: "hide",
-      content: "hide",
-      disabled: !1
-    }
-  ],
-  beforeShow: () => !0,
-  beforeClose: () => !0
-};
-class she {
-  constructor(r, u) {
-    this.cy = r, this._options = Object.assign({}, ohe, u), this._listeners = {}, this._init();
-  }
-  _init() {
-    this._initContainer(), this._initDom(), this._initEvents();
-  }
-  _initContainer() {
-    this._container = this.cy.container(), this.ctxmenu = document.createElement("div"), this.ctxmenu.className = "cy-editor-ctx-menu", this._container.append(this.ctxmenu);
-  }
-  _initDom() {
-    let r = "";
-    this._options.menus.forEach((u) => {
-      r += `<div class="ctx-menu-item ${u.disabled ? "ctx-menu-item-disabled" : ""}" data-menu-item="${u.id}">${u.content}</div>`;
-    }), this.ctxmenu.innerHTML = r;
-  }
-  _initEvents() {
-    this._listeners.eventCyTap = (r) => {
-      let u = r.renderedPosition || r.cyRenderedPosition, c = u.x, d = u.y;
-      Ir.css(this.ctxmenu, {
-        top: d + "px",
-        left: c + "px"
-      }), this.show(r);
-    }, this._listeners.eventTapstart = (r) => {
-      this.close(r);
-    }, this._listeners.click = (r) => {
-      const u = r.target.getAttribute("data-menu-item"), c = this._options.menus.find((d) => d.id === u);
-      this.cy.trigger("cyeditor.ctxmenu", c);
-    }, this.ctxmenu.addEventListener("mousedown", this._listeners.click), this.cy.on("cxttap", this._listeners.eventCyTap), this.cy.on("tapstart", this._listeners.eventTapstart);
-  }
-  disable(r, u = !0) {
-    Ir.query(`.cy-editor-ctx-menu [data-menu-item=${r}]`).forEach((d) => {
-      u ? Ir.addClass(d, "ctx-menu-item-disabled") : Ir.removeClass(d, "ctx-menu-item-disabled");
-    });
-  }
-  changeMenus(r) {
-    this._options.menus = r, this._initDom();
-  }
-  show(r) {
-    if (typeof this._options.beforeShow == "function" && !this.isShow) {
-      const u = this._options.beforeShow(r, this._options.menus.slice(0));
-      if (!u)
-        return;
-      if (u && u.then) {
-        u.then((c) => {
-          c && (Ir.css(this.ctxmenu, {
-            display: "block"
-          }), this.isShow = !0);
-        });
-        return;
-      }
-      Array.isArray(u) && this.changeMenus(u), Ir.css(this.ctxmenu, {
-        display: "block"
-      }), this.isShow = !0;
-    }
-  }
-  close(r) {
-    if (typeof this._options.beforeShow == "function" && this.isShow) {
-      const u = this._options.beforeClose(r);
-      u === !0 ? (Ir.css(this.ctxmenu, {
-        display: "none"
-      }), this.isShow = !1) : u.then && u.then(() => {
-        Ir.css(this.ctxmenu, {
-          display: "none"
-        }), this.isShow = !1;
-      });
-    }
-  }
-  destroyCxtMenu() {
-    this.ctxmenu.removeEventListener("mousedown", this._listeners.click), this.cy.off("tapstart", this._listeners.eventTapstart), this.cy.off("cxttap", this._listeners.eventCyTap);
-  }
-}
-const uhe = (a) => {
-  a && a("core", "contextMenu", function(r) {
-    return new she(this, r);
-  });
-};
-class che {
-  constructor(r, u = {}) {
-    this._cy = r, this._params = u, this._node_dom = {};
-    let c = r.container();
-    if (u.dom_container)
-      this._nodes_dom_container = u.dom_container;
-    else {
-      let d = document.createElement("div");
-      d.style.position = "absolute", d.style.zIndex = 10, c.querySelector("canvas").parentNode.appendChild(d), this._nodes_dom_container = d;
-    }
-    this._resize_observer = new ResizeObserver((d) => {
-      for (let g of d) {
-        let b = g.target, y = b.__cy_id;
-        r.getElementById(y).style({ width: b.offsetWidth, height: b.offsetHeight, shape: "rectangle" });
-      }
-    }), r.on("add", "node", (d) => {
-      this._add_node(d.target);
-    });
-    for (let d of r.nodes())
-      this._add_node(d);
-    r.on("pan zoom", (d) => {
-      let g = r.pan(), b = r.zoom(), y = "translate(" + g.x + "px," + g.y + "px) scale(" + b + ")";
-      this._nodes_dom_container.style.msTransform = y, this._nodes_dom_container.style.transform = y;
-    }), r.on("position bounds", "node", (d) => {
-      let g = d.target, b = g.id();
-      if (!this._node_dom[b])
-        return;
-      let y = this._node_dom[b], k = `translate(-50%, -50%) translate(${g.position("x").toFixed(2)}px, ${g.position("y").toFixed(2)}px)`;
-      y.style.webkitTransform = k, y.style.msTransform = k, y.style.transform = k, y.style.display = "inline", y.style.position = "absolute", y.style["z-index"] = 10;
-    });
-  }
-  _add_node(r) {
-    let u = r.data();
-    u.dom && (this._nodes_dom_container.appendChild(u.dom), u.dom.__cy_id = r.id(), this._node_dom[r.id()] = u.dom, this._resize_observer.observe(u.dom));
-  }
-  node_dom(r) {
-    return this._node_dom[r];
-  }
-}
-const lhe = (a) => {
-  a && a("core", "domNode", function(r, u) {
-    return new che(this, r, u);
-  });
-}, fhe = [
-  {
-    selector: ".eh-handle",
-    style: {
-      "background-color": "red",
-      width: 12,
-      height: 12,
-      shape: "ellipse",
-      "overlay-opacity": 0,
-      "border-width": 12,
-      // makes the handle easier to hit
-      "border-opacity": 0,
-      "background-opacity": 0.5
-    }
-  },
-  {
-    selector: ".eh-hover",
-    style: {
-      "background-color": "red",
-      "background-opacity": 0.5
-    }
-  },
-  {
-    selector: ".eh-source",
-    style: {
-      "border-width": 2,
-      "border-color": "red"
-    }
-  },
-  {
-    selector: ".eh-target",
-    style: {
-      "border-width": 2,
-      "border-color": "red"
-    }
-  },
-  {
-    selector: ".eh-preview, .eh-ghost-edge",
-    style: {
-      "background-color": "red",
-      "line-color": "red",
-      "target-arrow-color": "red",
-      "source-arrow-color": "red"
-    }
-  },
-  {
-    selector: ".eh-ghost-edge.eh-preview-active",
-    style: {
-      opacity: 0
-    }
-  }
-], hhe = "data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiBhcmlhLWhpZGRlbj0idHJ1ZSIgcm9sZT0iaW1nIiBjbGFzcz0iaWNvbmlmeSBpY29uaWZ5LS1sb2dvcyIgd2lkdGg9IjMxLjg4IiBoZWlnaHQ9IjMyIiBwcmVzZXJ2ZUFzcGVjdFJhdGlvPSJ4TWlkWU1pZCBtZWV0IiB2aWV3Qm94PSIwIDAgMjU2IDI1NyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJJY29uaWZ5SWQxODEzMDg4ZmUxZmJjMDFmYjQ2NiIgeDE9Ii0uODI4JSIgeDI9IjU3LjYzNiUiIHkxPSI3LjY1MiUiIHkyPSI3OC40MTElIj48c3RvcCBvZmZzZXQ9IjAlIiBzdG9wLWNvbG9yPSIjNDFEMUZGIj48L3N0b3A+PHN0b3Agb2Zmc2V0PSIxMDAlIiBzdG9wLWNvbG9yPSIjQkQzNEZFIj48L3N0b3A+PC9saW5lYXJHcmFkaWVudD48bGluZWFyR3JhZGllbnQgaWQ9Ikljb25pZnlJZDE4MTMwODhmZTFmYmMwMWZiNDY3IiB4MT0iNDMuMzc2JSIgeDI9IjUwLjMxNiUiIHkxPSIyLjI0MiUiIHkyPSI4OS4wMyUiPjxzdG9wIG9mZnNldD0iMCUiIHN0b3AtY29sb3I9IiNGRkVBODMiPjwvc3RvcD48c3RvcCBvZmZzZXQ9IjguMzMzJSIgc3RvcC1jb2xvcj0iI0ZGREQzNSI+PC9zdG9wPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iI0ZGQTgwMCI+PC9zdG9wPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxwYXRoIGZpbGw9InVybCgjSWNvbmlmeUlkMTgxMzA4OGZlMWZiYzAxZmI0NjYpIiBkPSJNMjU1LjE1MyAzNy45MzhMMTM0Ljg5NyAyNTIuOTc2Yy0yLjQ4MyA0LjQ0LTguODYyIDQuNDY2LTExLjM4Mi4wNDhMLjg3NSAzNy45NThjLTIuNzQ2LTQuODE0IDEuMzcxLTEwLjY0NiA2LjgyNy05LjY3bDEyMC4zODUgMjEuNTE3YTYuNTM3IDYuNTM3IDAgMCAwIDIuMzIyLS4wMDRsMTE3Ljg2Ny0yMS40ODNjNS40MzgtLjk5MSA5LjU3NCA0Ljc5NiA2Ljg3NyA5LjYyWiI+PC9wYXRoPjxwYXRoIGZpbGw9InVybCgjSWNvbmlmeUlkMTgxMzA4OGZlMWZiYzAxZmI0NjcpIiBkPSJNMTg1LjQzMi4wNjNMOTYuNDQgMTcuNTAxYTMuMjY4IDMuMjY4IDAgMCAwLTIuNjM0IDMuMDE0bC01LjQ3NCA5Mi40NTZhMy4yNjggMy4yNjggMCAwIDAgMy45OTcgMy4zNzhsMjQuNzc3LTUuNzE4YzIuMzE4LS41MzUgNC40MTMgMS41MDcgMy45MzYgMy44MzhsLTcuMzYxIDM2LjA0N2MtLjQ5NSAyLjQyNiAxLjc4MiA0LjUgNC4xNTEgMy43OGwxNS4zMDQtNC42NDljMi4zNzItLjcyIDQuNjUyIDEuMzYgNC4xNSAzLjc4OGwtMTEuNjk4IDU2LjYyMWMtLjczMiAzLjU0MiAzLjk3OSA1LjQ3MyA1Ljk0MyAyLjQzN2wxLjMxMy0yLjAyOGw3Mi41MTYtMTQ0LjcyYzEuMjE1LTIuNDIzLS44OC01LjE4Ni0zLjU0LTQuNjcybC0yNS41MDUgNC45MjJjLTIuMzk2LjQ2Mi00LjQzNS0xLjc3LTMuNzU5LTQuMTE0bDE2LjY0Ni01Ny43MDVjLjY3Ny0yLjM1LTEuMzctNC41ODMtMy43NjktNC4xMTNaIj48L3BhdGg+PC9zdmc+", dhe = [
-  {
-    type: "rectangle",
-    image: hhe,
-    bg: "#999",
-    width: 150,
-    height: 40,
-    name: "矩形",
-    category: "基础形状"
-  }
-], vhe = [{
-  selector: "node[type]",
-  style: {
-    shape: "data(type)",
-    label: "data(type)",
-    height: "data(height)",
-    width: "data(width)",
-    "text-valign": "center",
-    "text-halign": "center"
-  }
-}, {
-  selector: "node[points]",
-  style: {
-    "shape-polygon-points": "data(points)",
-    label: `polygon
-(custom points)`,
-    "text-wrap": "wrap"
-  }
-}, {
-  selector: "node[name]",
-  style: {
-    // 'content': 'data(name)'
-    content: ""
-  }
-}, {
-  selector: "node[image]",
-  style: {
-    "background-opacity": 0,
-    "background-fit": "cover",
-    "background-image": (a) => a.data("image") || { value: "" }
-  }
-}, {
-  selector: "node[bg]",
-  style: {
-    "background-opacity": 0.45,
-    "background-color": "data(bg)",
-    "border-width": 1,
-    "border-opacity": 0.8,
-    "border-color": "data(bg)"
-  }
-}, {
-  selector: "node:active",
-  style: {
-    "overlay-color": "#0169D9",
-    "overlay-padding": 8,
-    "overlay-opacity": 0.25
-  }
-}, {
-  selector: "node:selected",
-  style: {
-    "overlay-color": "#0169D9",
-    "overlay-padding": 8,
-    "overlay-opacity": 0.25
-  }
-}], ghe = [
-  {
-    selector: "edge",
-    style: {
-      "curve-style": "bezier",
-      "target-arrow-shape": "triangle",
-      width: 1
-    }
-  },
-  {
-    selector: "edge[lineType]",
-    style: {
-      "curve-style": "data(lineType)"
-    }
-  },
-  {
-    selector: "edge[lineColor]",
-    style: {
-      "target-arrow-shape": "triangle",
-      width: 1,
-      "line-color": "data(lineColor)",
-      "source-arrow-color": "data(lineColor)",
-      "target-arrow-color": "data(lineColor)",
-      "mid-source-arrow-color": "data(lineColor)",
-      "mid-target-arrow-color": "data(lineColor)"
-    }
-  },
-  {
-    selector: "edge[lineColor]:active",
-    style: {
-      "overlay-color": "#0169D9",
-      "overlay-padding": 2,
-      "overlay-opacity": 0.25,
-      "line-color": "data(lineColor)",
-      "source-arrow-color": "data(lineColor)",
-      "target-arrow-color": "data(lineColor)",
-      "mid-source-arrow-color": "data(lineColor)",
-      "mid-target-arrow-color": "data(lineColor)"
-    }
-  },
-  {
-    selector: "edge[lineColor]:selected",
-    style: {
-      "overlay-color": "#0169D9",
-      "overlay-padding": 2,
-      "overlay-opacity": 0.25,
-      "line-color": "data(lineColor)",
-      "source-arrow-color": "data(lineColor)",
-      "target-arrow-color": "data(lineColor)",
-      "mid-source-arrow-color": "data(lineColor)",
-      "mid-target-arrow-color": "data(lineColor)"
-    }
-  }
-], u6 = {
-  cy: {
-    layout: {
-      name: "concentric",
-      fit: !1,
-      concentric: function(a) {
-        return 0;
-      },
-      minNodeSpacing: 100
-    },
-    styleEnabled: !0,
-    style: [
-      ...ghe,
-      ...vhe,
-      ...fhe
-    ],
-    minZoom: 0.1,
-    maxZoom: 10
-  },
-  editor: {
-    container: "",
-    zoomRate: 0.2,
-    lineType: "bezier",
-    dragAddNodes: !0,
-    snapGrid: !0,
-    contextMenu: !0,
-    navigator: !0,
-    nodeTypes: dhe,
-    beforeAdd(a) {
-      return !0;
-    },
-    afterAdd(a) {
-    }
-  }
-}, Gp = {
-  node: {
-    type: "rectangle",
-    bg: "#999",
-    name: "",
-    width: 150,
-    height: 40,
-    image: ""
-  },
-  edge: {
-    lineColor: "#999"
-  }
-};
-qh.use(nhe);
-qh.use(pfe);
-qh.use(gY);
-qh.use(ahe);
-qh.use(uhe);
-qh.use(lhe);
-qh.use(qle);
-class bhe extends dfe {
-  constructor(r = u6) {
-    return super(), this._plugins = {}, this._listeners = {}, this._initOptions(r), this._initDom(), this._initCy(), this._initPlugin(), this._initEvents(), {
-      editor: this,
-      cy: this.cy
-    };
-  }
-  _initOptions(r = {}) {
-    this.editorOptions = Object.assign(
-      {},
-      u6.editor,
-      r.editor
-    );
-    const { zoomRate: u } = this.editorOptions;
-    this._handleOptonsChange = {
-      snapGrid: this._snapGridChange,
-      lineType: this._lineTypeChange
-    }, r.editor.nodeTypes && this.setOption("nodeTypes", r.editor.nodeTypes), (u <= 0 || u >= 1) && console.error(
-      "zoomRate must be float number, greater than 0 and less than 1"
-    ), this.cyOptions = Object.assign({}, u6.cy, r.cy);
-    const { elements: c } = this.cyOptions;
-    c && (Array.isArray(c.nodes) && c.nodes.forEach((d) => {
-      d.data = Object.assign({}, Gp.node, d.data);
-    }), Array.isArray(c.edges) && c.edges.forEach((d) => {
-      d.data = Object.assign({}, Gp.edge, d.data);
-    }));
-  }
-  _initCy() {
-    this.cyOptions.container = Ir.query("#cy")[0], this.cy = qh(this.cyOptions), this.cy.domNode();
-  }
-  _initDom() {
-    let { dragAddNodes: r, navigator: u, container: c } = this.editorOptions, d = r ? '<div class="left"></div>' : "", g = u ? '<div class="panel-title">导航器</div><div class="thumb"></div>' : "", b = "";
-    u && (b = `<div class="tool-overlay">${g}</div>`);
-    let y = `${d}<div id="cy"></div> ${b}
-`, k;
-    if (c) {
-      if (typeof c == "string" ? k = Ir.query(c)[0] : Ir.isNode(c) && (k = c), k.className = "cy-editor-container", k.classList.contains("cy-editor-container") || (k.className = k.className + " cy-editor-container"), !k) {
-        console.error("There is no any element matching your container");
-        return;
-      }
-    } else
-      k = document.createElement("div"), k.className = "cy-editor-container", document.body.appendChild(k);
-    k.innerHTML = y;
-  }
-  _initEvents() {
-    const { edgehandles: r } = this._plugins;
-    this._listeners.hoverout = (u) => {
-      r && (r.active = !0, r.stop(u));
-    }, this._listeners.select = (u) => {
-      this._doAction;
-    }, this._listeners.addEles = (u, c) => {
-      if (c.position) {
-        let b = { pan: this.cy.pan(), zoom: this.cy.zoom() }, y = (c.position.x - b.pan.x) / b.zoom, k = (c.position.y - b.pan.y) / b.zoom;
-        c.position = { x: y, y: k };
-      }
-      if (!this._hook("beforeAdd", c, !0))
-        return;
-      let d;
-      this.editorOptions.getDomNode && (d = this.editorOptions.getDomNode(c.data));
-      const g = Object.assign({}, Gp.node, {
-        data: d ? { ...c.data, dom: d } : { ...c.data },
-        position: c.position
-      });
-      this.cy.add(g), this._hook("afterAdd", c), this.emit("change", c, this);
-    }, this.cy.on("click", this._listeners.hoverout).on("select", this._listeners.select).on("cyeditor.addnode", this._listeners.addEles), this.emit("ready");
-  }
-  _initPlugin() {
-    const { dragAddNodes: r, contextMenu: u, snapGrid: c, navigator: d } = this.editorOptions;
-    this._plugins.edgehandles = this.cy.edgehandles({
-      snap: !1,
-      handlePosition() {
-        return "middle middle";
-      },
-      edgeParams: this._edgeParams.bind(this)
-    }), r && (this._plugins.dragAddNodes = this.cy.dragAddNodes({
-      container: ".cy-editor-container .left",
-      nodeTypes: this.editorOptions.nodeTypes
-    })), c && (this._plugins.cySnapToGrid = this.cy.snapToGrid()), d && this.cy.navigator({
-      container: ".cy-editor-container .thumb"
-    }), u && (this._plugins.contextMenu = this.cy.contextMenu(u));
-  }
-  _snapGridChange() {
-    this._plugins.cySnapToGrid && (this.editorOptions.snapGrid ? (this._plugins.cySnapToGrid.gridOn(), this._plugins.cySnapToGrid.snapOn()) : (this._plugins.cySnapToGrid.gridOff(), this._plugins.cySnapToGrid.snapOff()));
-  }
-  _edgeParams() {
-    return {
-      data: { lineType: this.editorOptions.lineType }
-    };
-  }
-  _lineTypeChange(r) {
-    let u = this.cy.$("edge:selected");
-    u.length < 1 && (u = this.cy.$("edge")), u.forEach((c) => {
-      c.data({
-        lineType: r
-      });
-    });
-  }
-  _hook(r, u, c = !1) {
-    if (typeof this.editorOptions[r] == "function") {
-      const d = this.editorOptions[r](u);
-      return c ? d : !0;
-    }
-  }
-  doCommand(r, u) {
-    switch (u.command) {
-      case "gridon":
-        this.toggleGrid();
-        break;
-      case "zoomin":
-        this.zoom(1);
-        break;
-      case "zoomout":
-        this.zoom(-1);
-        break;
-      case "fit":
-        this.fit();
-        break;
-      case "delete":
-        this.deleteSelected();
-        break;
-      case "boxselect":
-        this.cy.userPanningEnabled(!u.selected), this.cy.boxSelectionEnabled(u.selected);
-        break;
-    }
-  }
-  /**
-   * change editor option, support snapGrid, lineType
-   * @param {string|object} key
-   * @param {*} value
-   */
-  setOption(r, u) {
-    typeof r == "string" ? (this.editorOptions[r] = u, typeof this._handleOptonsChange[r] == "function" && this._handleOptonsChange[r].call(this, u)) : typeof r == "object" && Object.assign(this.editorOptions, r);
-    let { dragAddNodes: c, navigator: d } = this.editorOptions;
-    c && this.cy && (this._plugins.dragAddNodes = this.cy.dragAddNodes({
-      container: ".cy-editor-container .left",
-      nodeTypes: this.editorOptions.nodeTypes
-    })), gY && this.cy && (this._plugins.cySnapToGrid = this.cy.snapToGrid());
-  }
-  deleteSelected() {
-    let r = this.cy.$(":selected");
-    r.length && this.cy.remove(r);
-  }
-  async save() {
-    try {
-      let r = await this.cy.png({ output: "blob-promise" });
-      if (window.navigator.msSaveBlob)
-        window.navigator.msSaveBlob(r, `chart-${Date.now()}.png`);
-      else {
-        let u = document.createElement("a");
-        u.download = `chart-${Date.now()}.png`, u.href = window.URL.createObjectURL(r), u.click();
-      }
-    } catch (r) {
-      console.log(r);
-    }
-  }
-  fit() {
-    this._fit_status ? (this.cy.viewport({
-      zoom: this._fit_status.zoom,
-      pan: this._fit_status.pan
-    }), this._fit_status = null) : (this._fit_status = { pan: this.cy.pan(), zoom: this.cy.zoom() }, this.cy.fit());
-  }
-  zoom(r = 1, u) {
-    u = u || this.editorOptions.zoomRate;
-    let c = this.cy.width(), d = this.cy.height(), g = this.cy.zoom() + u * r, b = this.cy.pan();
-    b.x = b.x + -1 * c * u * r / 2, b.y = b.y + -1 * d * u * r / 2, this.cy.viewport({
-      zoom: g,
-      pan: b
-    });
-  }
-  toggleGrid() {
-    this._plugins.cySnapToGrid ? this.setOption("snapGrid", !this.editorOptions.snapGrid) : console.warn("Can not `toggleGrid`, please check the initialize option");
-  }
-  jpg(r = {}) {
-    return this.cy.png(r);
-  }
-  png(r) {
-    return this.cy.png(r);
-  }
-  /**
-   * Export the graph as JSON or Import the graph as JSON
-   * @param {*} opt params for cy.json(opt)
-   * @param {*} keys JSON Object keys
-   */
-  json(r = !1, u) {
-    u = u || [
-      "boxSelectionEnabled",
-      "elements",
-      "pan",
-      "panningEnabled",
-      "userPanningEnabled",
-      "userZoomingEnabled",
-      "zoom",
-      "zoomingEnabled"
-    ];
-    let c = {};
-    if (typeof r == "boolean") {
-      let d = this.cy.json(r);
-      return u.forEach((g) => {
-        c[g] = d[g];
-      }), c;
-    }
-    return typeof r == "object" && (c = {}, r.elements && (Array.isArray(r.elements.nodes) && r.elements.nodes.forEach((d) => {
-      let g;
-      this.editorOptions.getDomNode && (g = this.editorOptions.getDomNode(d.data)), d.data = Object.assign({}, Gp.node, {
-        ...d.data,
-        dom: g
-      });
-    }), Array.isArray(r.elements.edges) && r.elements.edges.forEach((d) => {
-      d.data = Object.assign({}, Gp.edge, d.data);
-    })), u.forEach((d) => {
-      c[d] = r[d];
-    })), this.cy.json(c);
-  }
-  /**
-   * get or set data
-   * @param {string|object} name
-   * @param {*} value
-   */
-  data(r, u) {
-    return this.cy.data(r, u);
-  }
-  /**
-   *  remove data
-   * @param {string} names  split by space
-   */
-  removeData(r) {
-    this.cy.removeData(r);
-  }
-  destroy() {
-    this.cy.removeAllListeners(), this.cy.destroy();
-  }
-}
-export {
-  bhe as default
-};
diff --git a/web/packages/cyeditor/distlib/cyeditor.umd.js b/web/packages/cyeditor/distlib/cyeditor.umd.js
deleted file mode 100644
index 864957172..000000000
--- a/web/packages/cyeditor/distlib/cyeditor.umd.js
+++ /dev/null
@@ -1,29 +0,0 @@
-(function(xc,kv){typeof exports=="object"&&typeof module<"u"?module.exports=kv():typeof define=="function"&&define.amd?define(kv):(xc=typeof globalThis<"u"?globalThis:xc||self,xc.CyEditor=kv())})(this,function(){"use strict";var xc=typeof globalThis<"u"?globalThis:typeof window<"u"?window:typeof global<"u"?global:typeof self<"u"?self:{};function kv(a){return a&&a.__esModule&&Object.prototype.hasOwnProperty.call(a,"default")?a.default:a}function mY(a){var r=typeof a;return a!=null&&(r=="object"||r=="function")}var Vb=mY,yY=typeof xc=="object"&&xc&&xc.Object===Object&&xc,kY=yY,EY=kY,SY=typeof self=="object"&&self&&self.Object===Object&&self,CY=EY||SY||Function("return this")(),pw=CY,xY=pw,TY=function(){return xY.Date.now()},LY=TY,PY=/\s/;function DY(a){for(var r=a.length;r--&&PY.test(a.charAt(r)););return r}var jY=DY,NY=jY,IY=/^\s+/;function MY(a){return a&&a.slice(0,NY(a)+1).replace(IY,"")}var OY=MY,AY=pw,RY=AY.Symbol,x5=RY,K6=x5,Z6=Object.prototype,BY=Z6.hasOwnProperty,zY=Z6.toString,Wb=K6?K6.toStringTag:void 0;function HY(a){var r=BY.call(a,Wb),u=a[Wb];try{a[Wb]=void 0;var c=!0}catch{}var d=zY.call(a);return c&&(r?a[Wb]=u:delete a[Wb]),d}var _Y=HY,GY=Object.prototype,$Y=GY.toString;function YY(a){return $Y.call(a)}var FY=YY,X6=x5,qY=_Y,VY=FY,WY="[object Null]",UY="[object Undefined]",Q6=X6?X6.toStringTag:void 0;function KY(a){return a==null?a===void 0?UY:WY:Q6&&Q6 in Object(a)?qY(a):VY(a)}var J6=KY;function ZY(a){return a!=null&&typeof a=="object"}var XY=ZY,QY=J6,JY=XY,eF="[object Symbol]";function tF(a){return typeof a=="symbol"||JY(a)&&QY(a)==eF}var Ub=tF,nF=OY,eP=Vb,rF=Ub,tP=0/0,iF=/^[-+]0x[0-9a-f]+$/i,aF=/^0b[01]+$/i,oF=/^0o[0-7]+$/i,sF=parseInt;function uF(a){if(typeof a=="number")return a;if(rF(a))return tP;if(eP(a)){var r=typeof a.valueOf=="function"?a.valueOf():a;a=eP(r)?r+"":r}if(typeof a!="string")return a===0?a:+a;a=nF(a);var u=aF.test(a);return u||oF.test(a)?sF(a.slice(2),u?2:8):iF.test(a)?tP:+a}var cF=uF,lF=Vb,T5=LY,nP=cF,fF="Expected a function",hF=Math.max,dF=Math.min;function vF(a,r,u){var c,d,g,b,y,k,E=0,C=!1,T=!1,P=!0;if(typeof a!="function")throw new TypeError(fF);r=nP(r)||0,lF(u)&&(C=!!u.leading,T="maxWait"in u,g=T?hF(nP(u.maxWait)||0,r):g,P="trailing"in u?!!u.trailing:P);function N(X){var K=c,ee=d;return c=d=void 0,E=X,b=a.apply(ee,K),b}function D(X){return E=X,y=setTimeout(B,r),C?N(X):b}function H(X){var K=X-k,ee=X-E,Z=r-K;return T?dF(Z,g-ee):Z}function _(X){var K=X-k,ee=X-E;return k===void 0||K>=r||K<0||T&&ee>=g}function B(){var X=T5();if(_(X))return $(X);y=setTimeout(B,H(X))}function $(X){return y=void 0,P&&c?N(X):(c=d=void 0,b)}function F(){y!==void 0&&clearTimeout(y),E=0,c=k=d=y=void 0}function W(){return y===void 0?b:$(T5())}function Q(){var X=T5(),K=_(X);if(c=arguments,d=this,k=X,K){if(y===void 0)return D(k);if(T)return clearTimeout(y),y=setTimeout(B,r),N(k)}return y===void 0&&(y=setTimeout(B,r)),b}return Q.cancel=F,Q.flush=W,Q}var gF=vF,rP={exports:{}};(function(a,r){(function(){var u,c,d,g,b,y,k,E,C,T,P,N,D,H,_;d=Math.floor,T=Math.min,c=function(B,$){return B<$?-1:B>$?1:0},C=function(B,$,F,W,Q){var X;if(F==null&&(F=0),Q==null&&(Q=c),F<0)throw new Error("lo must be non-negative");for(W==null&&(W=B.length);F<W;)X=d((F+W)/2),Q($,B[X])<0?W=X:F=X+1;return[].splice.apply(B,[F,F-F].concat($)),$},y=function(B,$,F){return F==null&&(F=c),B.push($),H(B,0,B.length-1,F)},b=function(B,$){var F,W;return $==null&&($=c),F=B.pop(),B.length?(W=B[0],B[0]=F,_(B,0,$)):W=F,W},E=function(B,$,F){var W;return F==null&&(F=c),W=B[0],B[0]=$,_(B,0,F),W},k=function(B,$,F){var W;return F==null&&(F=c),B.length&&F(B[0],$)<0&&(W=[B[0],$],$=W[0],B[0]=W[1],_(B,0,F)),$},g=function(B,$){var F,W,Q,X,K,ee;for($==null&&($=c),X=function(){ee=[];for(var Z=0,ae=d(B.length/2);0<=ae?Z<ae:Z>ae;0<=ae?Z++:Z--)ee.push(Z);return ee}.apply(this).reverse(),K=[],W=0,Q=X.length;W<Q;W++)F=X[W],K.push(_(B,F,$));return K},D=function(B,$,F){var W;if(F==null&&(F=c),W=B.indexOf($),W!==-1)return H(B,0,W,F),_(B,W,F)},P=function(B,$,F){var W,Q,X,K,ee;if(F==null&&(F=c),Q=B.slice(0,$),!Q.length)return Q;for(g(Q,F),ee=B.slice($),X=0,K=ee.length;X<K;X++)W=ee[X],k(Q,W,F);return Q.sort(F).reverse()},N=function(B,$,F){var W,Q,X,K,ee,Z,ae,oe,J;if(F==null&&(F=c),$*10<=B.length){if(X=B.slice(0,$).sort(F),!X.length)return X;for(Q=X[X.length-1],ae=B.slice($),K=0,Z=ae.length;K<Z;K++)W=ae[K],F(W,Q)<0&&(C(X,W,0,null,F),X.pop(),Q=X[X.length-1]);return X}for(g(B,F),J=[],ee=0,oe=T($,B.length);0<=oe?ee<oe:ee>oe;0<=oe?++ee:--ee)J.push(b(B,F));return J},H=function(B,$,F,W){var Q,X,K;for(W==null&&(W=c),Q=B[F];F>$;){if(K=F-1>>1,X=B[K],W(Q,X)<0){B[F]=X,F=K;continue}break}return B[F]=Q},_=function(B,$,F){var W,Q,X,K,ee;for(F==null&&(F=c),Q=B.length,ee=$,X=B[$],W=2*$+1;W<Q;)K=W+1,K<Q&&!(F(B[W],B[K])<0)&&(W=K),B[$]=B[W],$=W,W=2*$+1;return B[$]=X,H(B,ee,$,F)},u=function(){B.push=y,B.pop=b,B.replace=E,B.pushpop=k,B.heapify=g,B.updateItem=D,B.nlargest=P,B.nsmallest=N;function B($){this.cmp=$??c,this.nodes=[]}return B.prototype.push=function($){return y(this.nodes,$,this.cmp)},B.prototype.pop=function(){return b(this.nodes,this.cmp)},B.prototype.peek=function(){return this.nodes[0]},B.prototype.contains=function($){return this.nodes.indexOf($)!==-1},B.prototype.replace=function($){return E(this.nodes,$,this.cmp)},B.prototype.pushpop=function($){return k(this.nodes,$,this.cmp)},B.prototype.heapify=function(){return g(this.nodes,this.cmp)},B.prototype.updateItem=function($){return D(this.nodes,$,this.cmp)},B.prototype.clear=function(){return this.nodes=[]},B.prototype.empty=function(){return this.nodes.length===0},B.prototype.size=function(){return this.nodes.length},B.prototype.clone=function(){var $;return $=new B,$.nodes=this.nodes.slice(0),$},B.prototype.toArray=function(){return this.nodes.slice(0)},B.prototype.insert=B.prototype.push,B.prototype.top=B.prototype.peek,B.prototype.front=B.prototype.peek,B.prototype.has=B.prototype.contains,B.prototype.copy=B.prototype.clone,B}(),function(B,$){return a.exports=$()}(this,function(){return u})}).call(xc)})(rP);var bF=rP.exports,pF=bF,wF=Array.isArray,ww=wF,mF=ww,yF=Ub,kF=/\.|\[(?:[^[\]]*|(["'])(?:(?!\1)[^\\]|\\.)*?\1)\]/,EF=/^\w*$/;function SF(a,r){if(mF(a))return!1;var u=typeof a;return u=="number"||u=="symbol"||u=="boolean"||a==null||yF(a)?!0:EF.test(a)||!kF.test(a)||r!=null&&a in Object(r)}var CF=SF,xF=J6,TF=Vb,LF="[object AsyncFunction]",PF="[object Function]",DF="[object GeneratorFunction]",jF="[object Proxy]";function NF(a){if(!TF(a))return!1;var r=xF(a);return r==PF||r==DF||r==LF||r==jF}var IF=NF,MF=pw,OF=MF["__core-js_shared__"],AF=OF,L5=AF,iP=function(){var a=/[^.]+$/.exec(L5&&L5.keys&&L5.keys.IE_PROTO||"");return a?"Symbol(src)_1."+a:""}();function RF(a){return!!iP&&iP in a}var BF=RF,zF=Function.prototype,HF=zF.toString;function _F(a){if(a!=null){try{return HF.call(a)}catch{}try{return a+""}catch{}}return""}var GF=_F,$F=IF,YF=BF,FF=Vb,qF=GF,VF=/[\\^$.*+?()[\]{}|]/g,WF=/^\[object .+?Constructor\]$/,UF=Function.prototype,KF=Object.prototype,ZF=UF.toString,XF=KF.hasOwnProperty,QF=RegExp("^"+ZF.call(XF).replace(VF,"\\$&").replace(/hasOwnProperty|(function).*?(?=\\\()| for .+?(?=\\\])/g,"$1.*?")+"$");function JF(a){if(!FF(a)||YF(a))return!1;var r=$F(a)?QF:WF;return r.test(qF(a))}var eq=JF;function tq(a,r){return a==null?void 0:a[r]}var nq=tq,rq=eq,iq=nq;function aq(a,r){var u=iq(a,r);return rq(u)?u:void 0}var P5=aq,oq=P5,sq=oq(Object,"create"),mw=sq,aP=mw;function uq(){this.__data__=aP?aP(null):{},this.size=0}var cq=uq;function lq(a){var r=this.has(a)&&delete this.__data__[a];return this.size-=r?1:0,r}var fq=lq,hq=mw,dq="__lodash_hash_undefined__",vq=Object.prototype,gq=vq.hasOwnProperty;function bq(a){var r=this.__data__;if(hq){var u=r[a];return u===dq?void 0:u}return gq.call(r,a)?r[a]:void 0}var pq=bq,wq=mw,mq=Object.prototype,yq=mq.hasOwnProperty;function kq(a){var r=this.__data__;return wq?r[a]!==void 0:yq.call(r,a)}var Eq=kq,Sq=mw,Cq="__lodash_hash_undefined__";function xq(a,r){var u=this.__data__;return this.size+=this.has(a)?0:1,u[a]=Sq&&r===void 0?Cq:r,this}var Tq=xq,Lq=cq,Pq=fq,Dq=pq,jq=Eq,Nq=Tq;function Ev(a){var r=-1,u=a==null?0:a.length;for(this.clear();++r<u;){var c=a[r];this.set(c[0],c[1])}}Ev.prototype.clear=Lq,Ev.prototype.delete=Pq,Ev.prototype.get=Dq,Ev.prototype.has=jq,Ev.prototype.set=Nq;var Iq=Ev;function Mq(){this.__data__=[],this.size=0}var Oq=Mq;function Aq(a,r){return a===r||a!==a&&r!==r}var oP=Aq,Rq=oP;function Bq(a,r){for(var u=a.length;u--;)if(Rq(a[u][0],r))return u;return-1}var yw=Bq,zq=yw,Hq=Array.prototype,_q=Hq.splice;function Gq(a){var r=this.__data__,u=zq(r,a);if(u<0)return!1;var c=r.length-1;return u==c?r.pop():_q.call(r,u,1),--this.size,!0}var $q=Gq,Yq=yw;function Fq(a){var r=this.__data__,u=Yq(r,a);return u<0?void 0:r[u][1]}var qq=Fq,Vq=yw;function Wq(a){return Vq(this.__data__,a)>-1}var Uq=Wq,Kq=yw;function Zq(a,r){var u=this.__data__,c=Kq(u,a);return c<0?(++this.size,u.push([a,r])):u[c][1]=r,this}var Xq=Zq,Qq=Oq,Jq=$q,eV=qq,tV=Uq,nV=Xq;function Sv(a){var r=-1,u=a==null?0:a.length;for(this.clear();++r<u;){var c=a[r];this.set(c[0],c[1])}}Sv.prototype.clear=Qq,Sv.prototype.delete=Jq,Sv.prototype.get=eV,Sv.prototype.has=tV,Sv.prototype.set=nV;var rV=Sv,iV=P5,aV=pw,oV=iV(aV,"Map"),sV=oV,sP=Iq,uV=rV,cV=sV;function lV(){this.size=0,this.__data__={hash:new sP,map:new(cV||uV),string:new sP}}var fV=lV;function hV(a){var r=typeof a;return r=="string"||r=="number"||r=="symbol"||r=="boolean"?a!=="__proto__":a===null}var dV=hV,vV=dV;function gV(a,r){var u=a.__data__;return vV(r)?u[typeof r=="string"?"string":"hash"]:u.map}var kw=gV,bV=kw;function pV(a){var r=bV(this,a).delete(a);return this.size-=r?1:0,r}var wV=pV,mV=kw;function yV(a){return mV(this,a).get(a)}var kV=yV,EV=kw;function SV(a){return EV(this,a).has(a)}var CV=SV,xV=kw;function TV(a,r){var u=xV(this,a),c=u.size;return u.set(a,r),this.size+=u.size==c?0:1,this}var LV=TV,PV=fV,DV=wV,jV=kV,NV=CV,IV=LV;function Cv(a){var r=-1,u=a==null?0:a.length;for(this.clear();++r<u;){var c=a[r];this.set(c[0],c[1])}}Cv.prototype.clear=PV,Cv.prototype.delete=DV,Cv.prototype.get=jV,Cv.prototype.has=NV,Cv.prototype.set=IV;var MV=Cv,uP=MV,OV="Expected a function";function D5(a,r){if(typeof a!="function"||r!=null&&typeof r!="function")throw new TypeError(OV);var u=function(){var c=arguments,d=r?r.apply(this,c):c[0],g=u.cache;if(g.has(d))return g.get(d);var b=a.apply(this,c);return u.cache=g.set(d,b)||g,b};return u.cache=new(D5.Cache||uP),u}D5.Cache=uP;var AV=D5,RV=AV,BV=500;function zV(a){var r=RV(a,function(c){return u.size===BV&&u.clear(),c}),u=r.cache;return r}var HV=zV,_V=HV,GV=/[^.[\]]+|\[(?:(-?\d+(?:\.\d+)?)|(["'])((?:(?!\2)[^\\]|\\.)*?)\2)\]|(?=(?:\.|\[\])(?:\.|\[\]|$))/g,$V=/\\(\\)?/g,YV=_V(function(a){var r=[];return a.charCodeAt(0)===46&&r.push(""),a.replace(GV,function(u,c,d,g){r.push(d?g.replace($V,"$1"):c||u)}),r}),cP=YV;function FV(a,r){for(var u=-1,c=a==null?0:a.length,d=Array(c);++u<c;)d[u]=r(a[u],u,a);return d}var lP=FV,fP=x5,qV=lP,VV=ww,WV=Ub,UV=1/0,hP=fP?fP.prototype:void 0,dP=hP?hP.toString:void 0;function vP(a){if(typeof a=="string")return a;if(VV(a))return qV(a,vP)+"";if(WV(a))return dP?dP.call(a):"";var r=a+"";return r=="0"&&1/a==-UV?"-0":r}var KV=vP,ZV=KV;function XV(a){return a==null?"":ZV(a)}var gP=XV,QV=ww,JV=CF,eW=cP,tW=gP;function nW(a,r){return QV(a)?a:JV(a,r)?[a]:eW(tW(a))}var bP=nW,rW=Ub,iW=1/0;function aW(a){if(typeof a=="string"||rW(a))return a;var r=a+"";return r=="0"&&1/a==-iW?"-0":r}var j5=aW,oW=bP,sW=j5;function uW(a,r){r=oW(r,a);for(var u=0,c=r.length;a!=null&&u<c;)a=a[sW(r[u++])];return u&&u==c?a:void 0}var cW=uW,lW=cW;function fW(a,r,u){var c=a==null?void 0:lW(a,r);return c===void 0?u:c}var hW=fW,dW=P5,vW=function(){try{var a=dW(Object,"defineProperty");return a({},"",{}),a}catch{}}(),gW=vW,pP=gW;function bW(a,r,u){r=="__proto__"&&pP?pP(a,r,{configurable:!0,enumerable:!0,value:u,writable:!0}):a[r]=u}var pW=bW,wW=pW,mW=oP,yW=Object.prototype,kW=yW.hasOwnProperty;function EW(a,r,u){var c=a[r];(!(kW.call(a,r)&&mW(c,u))||u===void 0&&!(r in a))&&wW(a,r,u)}var SW=EW,CW=9007199254740991,xW=/^(?:0|[1-9]\d*)$/;function TW(a,r){var u=typeof a;return r=r??CW,!!r&&(u=="number"||u!="symbol"&&xW.test(a))&&a>-1&&a%1==0&&a<r}var LW=TW,PW=SW,DW=bP,jW=LW,wP=Vb,NW=j5;function IW(a,r,u,c){if(!wP(a))return a;r=DW(r,a);for(var d=-1,g=r.length,b=g-1,y=a;y!=null&&++d<g;){var k=NW(r[d]),E=u;if(k==="__proto__"||k==="constructor"||k==="prototype")return a;if(d!=b){var C=y[k];E=c?c(C,k,y):void 0,E===void 0&&(E=wP(C)?C:jW(r[d+1])?[]:{})}PW(y,k,E),y=y[k]}return a}var MW=IW,OW=MW;function AW(a,r,u){return a==null?a:OW(a,r,u)}var RW=AW;function BW(a,r){var u=-1,c=a.length;for(r||(r=Array(c));++u<c;)r[u]=a[u];return r}var zW=BW,HW=lP,_W=zW,GW=ww,$W=Ub,YW=cP,FW=j5,qW=gP;function VW(a){return GW(a)?HW(a,FW):$W(a)?[a]:_W(YW(qW(a)))}var WW=VW,UW=gF,KW=pF,ZW=hW,XW=RW,QW=WW;function Kb(a){return a&&typeof a=="object"&&"default"in a?a:{default:a}}var Ew=Kb(UW),Zb=Kb(KW),JW=Kb(ZW),eU=Kb(XW),tU=Kb(QW);function ma(a){"@babel/helpers - typeof";return ma=typeof Symbol=="function"&&typeof Symbol.iterator=="symbol"?function(r){return typeof r}:function(r){return r&&typeof Symbol=="function"&&r.constructor===Symbol&&r!==Symbol.prototype?"symbol":typeof r},ma(a)}function N5(a,r){if(!(a instanceof r))throw new TypeError("Cannot call a class as a function")}function mP(a,r){for(var u=0;u<r.length;u++){var c=r[u];c.enumerable=c.enumerable||!1,c.configurable=!0,"value"in c&&(c.writable=!0),Object.defineProperty(a,c.key,c)}}function I5(a,r,u){return r&&mP(a.prototype,r),u&&mP(a,u),Object.defineProperty(a,"prototype",{writable:!1}),a}function yP(a,r,u){return r in a?Object.defineProperty(a,r,{value:u,enumerable:!0,configurable:!0,writable:!0}):a[r]=u,a}function Mu(a,r){return nU(a)||rU(a,r)||iU(a,r)||aU()}function nU(a){if(Array.isArray(a))return a}function rU(a,r){var u=a==null?null:typeof Symbol<"u"&&a[Symbol.iterator]||a["@@iterator"];if(u!=null){var c=[],d=!0,g=!1,b,y;try{for(u=u.call(a);!(d=(b=u.next()).done)&&(c.push(b.value),!(r&&c.length===r));d=!0);}catch(k){g=!0,y=k}finally{try{!d&&u.return!=null&&u.return()}finally{if(g)throw y}}return c}}function iU(a,r){if(a){if(typeof a=="string")return kP(a,r);var u=Object.prototype.toString.call(a).slice(8,-1);if(u==="Object"&&a.constructor&&(u=a.constructor.name),u==="Map"||u==="Set")return Array.from(a);if(u==="Arguments"||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(u))return kP(a,r)}}function kP(a,r){(r==null||r>a.length)&&(r=a.length);for(var u=0,c=new Array(r);u<r;u++)c[u]=a[u];return c}function aU(){throw new TypeError(`Invalid attempt to destructure non-iterable instance.
-In order to be iterable, non-array objects must have a [Symbol.iterator]() method.`)}var ya=typeof window>"u"?null:window,EP=ya?ya.navigator:null;ya&&ya.document;var oU=ma(""),SP=ma({}),sU=ma(function(){}),uU=typeof HTMLElement>"u"?"undefined":ma(HTMLElement),Xb=function(r){return r&&r.instanceString&&Ci(r.instanceString)?r.instanceString():null},Yt=function(r){return r!=null&&ma(r)==oU},Ci=function(r){return r!=null&&ma(r)===sU},Wr=function(r){return!Os(r)&&(Array.isArray?Array.isArray(r):r!=null&&r instanceof Array)},ar=function(r){return r!=null&&ma(r)===SP&&!Wr(r)&&r.constructor===Object},cU=function(r){return r!=null&&ma(r)===SP},kt=function(r){return r!=null&&ma(r)===ma(1)&&!isNaN(r)},lU=function(r){return kt(r)&&Math.floor(r)===r},Sw=function(r){if(uU!=="undefined")return r!=null&&r instanceof HTMLElement},Os=function(r){return Qb(r)||CP(r)},Qb=function(r){return Xb(r)==="collection"&&r._private.single},CP=function(r){return Xb(r)==="collection"&&!r._private.single},M5=function(r){return Xb(r)==="core"},xP=function(r){return Xb(r)==="stylesheet"},fU=function(r){return Xb(r)==="event"},Lf=function(r){return r==null?!0:!!(r===""||r.match(/^\s+$/))},hU=function(r){return typeof HTMLElement>"u"?!1:r instanceof HTMLElement},dU=function(r){return ar(r)&&kt(r.x1)&&kt(r.x2)&&kt(r.y1)&&kt(r.y2)},vU=function(r){return cU(r)&&Ci(r.then)},gU=function(){return EP&&EP.userAgent.match(/msie|trident|edge/i)},Jb=function(r,u){u||(u=function(){if(arguments.length===1)return arguments[0];if(arguments.length===0)return"undefined";for(var g=[],b=0;b<arguments.length;b++)g.push(arguments[b]);return g.join("$")});var c=function d(){var g=this,b=arguments,y,k=u.apply(g,b),E=d.cache;return(y=E[k])||(y=E[k]=r.apply(g,b)),y};return c.cache={},c},O5=Jb(function(a){return a.replace(/([A-Z])/g,function(r){return"-"+r.toLowerCase()})}),Cw=Jb(function(a){return a.replace(/(-\w)/g,function(r){return r[1].toUpperCase()})}),TP=Jb(function(a,r){return a+r[0].toUpperCase()+r.substring(1)},function(a,r){return a+"$"+r}),LP=function(r){return Lf(r)?r:r.charAt(0).toUpperCase()+r.substring(1)},ka="(?:[-+]?(?:(?:\\d+|\\d*\\.\\d+)(?:[Ee][+-]?\\d+)?))",bU="rgb[a]?\\(("+ka+"[%]?)\\s*,\\s*("+ka+"[%]?)\\s*,\\s*("+ka+"[%]?)(?:\\s*,\\s*("+ka+"))?\\)",pU="rgb[a]?\\((?:"+ka+"[%]?)\\s*,\\s*(?:"+ka+"[%]?)\\s*,\\s*(?:"+ka+"[%]?)(?:\\s*,\\s*(?:"+ka+"))?\\)",wU="hsl[a]?\\(("+ka+")\\s*,\\s*("+ka+"[%])\\s*,\\s*("+ka+"[%])(?:\\s*,\\s*("+ka+"))?\\)",mU="hsl[a]?\\((?:"+ka+")\\s*,\\s*(?:"+ka+"[%])\\s*,\\s*(?:"+ka+"[%])(?:\\s*,\\s*(?:"+ka+"))?\\)",yU="\\#[0-9a-fA-F]{3}",kU="\\#[0-9a-fA-F]{6}",PP=function(r,u){return r<u?-1:r>u?1:0},EU=function(r,u){return-1*PP(r,u)},en=Object.assign!=null?Object.assign.bind(Object):function(a){for(var r=arguments,u=1;u<r.length;u++){var c=r[u];if(c!=null)for(var d=Object.keys(c),g=0;g<d.length;g++){var b=d[g];a[b]=c[b]}}return a},SU=function(r){if(!(!(r.length===4||r.length===7)||r[0]!=="#")){var u=r.length===4,c,d,g,b=16;return u?(c=parseInt(r[1]+r[1],b),d=parseInt(r[2]+r[2],b),g=parseInt(r[3]+r[3],b)):(c=parseInt(r[1]+r[2],b),d=parseInt(r[3]+r[4],b),g=parseInt(r[5]+r[6],b)),[c,d,g]}},CU=function(r){var u,c,d,g,b,y,k,E;function C(D,H,_){return _<0&&(_+=1),_>1&&(_-=1),_<1/6?D+(H-D)*6*_:_<1/2?H:_<2/3?D+(H-D)*(2/3-_)*6:D}var T=new RegExp("^"+wU+"$").exec(r);if(T){if(c=parseInt(T[1]),c<0?c=(360- -1*c%360)%360:c>360&&(c=c%360),c/=360,d=parseFloat(T[2]),d<0||d>100||(d=d/100,g=parseFloat(T[3]),g<0||g>100)||(g=g/100,b=T[4],b!==void 0&&(b=parseFloat(b),b<0||b>1)))return;if(d===0)y=k=E=Math.round(g*255);else{var P=g<.5?g*(1+d):g+d-g*d,N=2*g-P;y=Math.round(255*C(N,P,c+1/3)),k=Math.round(255*C(N,P,c)),E=Math.round(255*C(N,P,c-1/3))}u=[y,k,E,b]}return u},xU=function(r){var u,c=new RegExp("^"+bU+"$").exec(r);if(c){u=[];for(var d=[],g=1;g<=3;g++){var b=c[g];if(b[b.length-1]==="%"&&(d[g]=!0),b=parseFloat(b),d[g]&&(b=b/100*255),b<0||b>255)return;u.push(Math.floor(b))}var y=d[1]||d[2]||d[3],k=d[1]&&d[2]&&d[3];if(y&&!k)return;var E=c[4];if(E!==void 0){if(E=parseFloat(E),E<0||E>1)return;u.push(E)}}return u},TU=function(r){return PU[r.toLowerCase()]},LU=function(r){return(Wr(r)?r:null)||TU(r)||SU(r)||xU(r)||CU(r)},PU={transparent:[0,0,0,0],aliceblue:[240,248,255],antiquewhite:[250,235,215],aqua:[0,255,255],aquamarine:[127,255,212],azure:[240,255,255],beige:[245,245,220],bisque:[255,228,196],black:[0,0,0],blanchedalmond:[255,235,205],blue:[0,0,255],blueviolet:[138,43,226],brown:[165,42,42],burlywood:[222,184,135],cadetblue:[95,158,160],chartreuse:[127,255,0],chocolate:[210,105,30],coral:[255,127,80],cornflowerblue:[100,149,237],cornsilk:[255,248,220],crimson:[220,20,60],cyan:[0,255,255],darkblue:[0,0,139],darkcyan:[0,139,139],darkgoldenrod:[184,134,11],darkgray:[169,169,169],darkgreen:[0,100,0],darkgrey:[169,169,169],darkkhaki:[189,183,107],darkmagenta:[139,0,139],darkolivegreen:[85,107,47],darkorange:[255,140,0],darkorchid:[153,50,204],darkred:[139,0,0],darksalmon:[233,150,122],darkseagreen:[143,188,143],darkslateblue:[72,61,139],darkslategray:[47,79,79],darkslategrey:[47,79,79],darkturquoise:[0,206,209],darkviolet:[148,0,211],deeppink:[255,20,147],deepskyblue:[0,191,255],dimgray:[105,105,105],dimgrey:[105,105,105],dodgerblue:[30,144,255],firebrick:[178,34,34],floralwhite:[255,250,240],forestgreen:[34,139,34],fuchsia:[255,0,255],gainsboro:[220,220,220],ghostwhite:[248,248,255],gold:[255,215,0],goldenrod:[218,165,32],gray:[128,128,128],grey:[128,128,128],green:[0,128,0],greenyellow:[173,255,47],honeydew:[240,255,240],hotpink:[255,105,180],indianred:[205,92,92],indigo:[75,0,130],ivory:[255,255,240],khaki:[240,230,140],lavender:[230,230,250],lavenderblush:[255,240,245],lawngreen:[124,252,0],lemonchiffon:[255,250,205],lightblue:[173,216,230],lightcoral:[240,128,128],lightcyan:[224,255,255],lightgoldenrodyellow:[250,250,210],lightgray:[211,211,211],lightgreen:[144,238,144],lightgrey:[211,211,211],lightpink:[255,182,193],lightsalmon:[255,160,122],lightseagreen:[32,178,170],lightskyblue:[135,206,250],lightslategray:[119,136,153],lightslategrey:[119,136,153],lightsteelblue:[176,196,222],lightyellow:[255,255,224],lime:[0,255,0],limegreen:[50,205,50],linen:[250,240,230],magenta:[255,0,255],maroon:[128,0,0],mediumaquamarine:[102,205,170],mediumblue:[0,0,205],mediumorchid:[186,85,211],mediumpurple:[147,112,219],mediumseagreen:[60,179,113],mediumslateblue:[123,104,238],mediumspringgreen:[0,250,154],mediumturquoise:[72,209,204],mediumvioletred:[199,21,133],midnightblue:[25,25,112],mintcream:[245,255,250],mistyrose:[255,228,225],moccasin:[255,228,181],navajowhite:[255,222,173],navy:[0,0,128],oldlace:[253,245,230],olive:[128,128,0],olivedrab:[107,142,35],orange:[255,165,0],orangered:[255,69,0],orchid:[218,112,214],palegoldenrod:[238,232,170],palegreen:[152,251,152],paleturquoise:[175,238,238],palevioletred:[219,112,147],papayawhip:[255,239,213],peachpuff:[255,218,185],peru:[205,133,63],pink:[255,192,203],plum:[221,160,221],powderblue:[176,224,230],purple:[128,0,128],red:[255,0,0],rosybrown:[188,143,143],royalblue:[65,105,225],saddlebrown:[139,69,19],salmon:[250,128,114],sandybrown:[244,164,96],seagreen:[46,139,87],seashell:[255,245,238],sienna:[160,82,45],silver:[192,192,192],skyblue:[135,206,235],slateblue:[106,90,205],slategray:[112,128,144],slategrey:[112,128,144],snow:[255,250,250],springgreen:[0,255,127],steelblue:[70,130,180],tan:[210,180,140],teal:[0,128,128],thistle:[216,191,216],tomato:[255,99,71],turquoise:[64,224,208],violet:[238,130,238],wheat:[245,222,179],white:[255,255,255],whitesmoke:[245,245,245],yellow:[255,255,0],yellowgreen:[154,205,50]},DP=function(r){for(var u=r.map,c=r.keys,d=c.length,g=0;g<d;g++){var b=c[g];if(ar(b))throw Error("Tried to set map with object key");g<c.length-1?(u[b]==null&&(u[b]={}),u=u[b]):u[b]=r.value}},jP=function(r){for(var u=r.map,c=r.keys,d=c.length,g=0;g<d;g++){var b=c[g];if(ar(b))throw Error("Tried to get map with object key");if(u=u[b],u==null)return u}return u},A5=ya?ya.performance:null,NP=A5&&A5.now?function(){return A5.now()}:function(){return Date.now()},DU=function(){if(ya){if(ya.requestAnimationFrame)return function(a){ya.requestAnimationFrame(a)};if(ya.mozRequestAnimationFrame)return function(a){ya.mozRequestAnimationFrame(a)};if(ya.webkitRequestAnimationFrame)return function(a){ya.webkitRequestAnimationFrame(a)};if(ya.msRequestAnimationFrame)return function(a){ya.msRequestAnimationFrame(a)}}return function(a){a&&setTimeout(function(){a(NP())},1e3/60)}}(),xw=function(r){return DU(r)},Ll=NP,xv=9261,IP=65599,e1=5381,MP=function(r){for(var u=arguments.length>1&&arguments[1]!==void 0?arguments[1]:xv,c=u,d;d=r.next(),!d.done;)c=c*IP+d.value|0;return c},t1=function(r){var u=arguments.length>1&&arguments[1]!==void 0?arguments[1]:xv;return u*IP+r|0},n1=function(r){var u=arguments.length>1&&arguments[1]!==void 0?arguments[1]:e1;return(u<<5)+u+r|0},jU=function(r,u){return r*2097152+u},Pf=function(r){return r[0]*2097152+r[1]},Tw=function(r,u){return[t1(r[0],u[0]),n1(r[1],u[1])]},NU=function(r,u){var c={value:0,done:!1},d=0,g=r.length,b={next:function(){return d<g?c.value=r[d++]:c.done=!0,c}};return MP(b,u)},Wh=function(r,u){var c={value:0,done:!1},d=0,g=r.length,b={next:function(){return d<g?c.value=r.charCodeAt(d++):c.done=!0,c}};return MP(b,u)},OP=function(){return IU(arguments)},IU=function(r){for(var u,c=0;c<r.length;c++){var d=r[c];c===0?u=Wh(d):u=Wh(d,u)}return u},AP=!0,MU=console.warn!=null,OU=console.trace!=null,R5=Number.MAX_SAFE_INTEGER||9007199254740991,RP=function(){return!0},Lw=function(){return!1},BP=function(){return 0},B5=function(){},Hi=function(r){throw new Error(r)},zP=function(r){if(r!==void 0)AP=!!r;else return AP},pr=function(r){zP()&&(MU?console.warn(r):(console.log(r),OU&&console.trace()))},AU=function(r){return en({},r)},Tc=function(r){return r==null?r:Wr(r)?r.slice():ar(r)?AU(r):r},RU=function(r){return r.slice()},HP=function(r,u){for(u=r="";r++<36;u+=r*51&52?(r^15?8^Math.random()*(r^20?16:4):4).toString(16):"-");return u},BU={},_P=function(){return BU},eo=function(r){var u=Object.keys(r);return function(c){for(var d={},g=0;g<u.length;g++){var b=u[g],y=c==null?void 0:c[b];d[b]=y===void 0?r[b]:y}return d}},Df=function(r,u,c){for(var d=r.length-1;d>=0&&!(r[d]===u&&(r.splice(d,1),c));d--);},z5=function(r){r.splice(0,r.length)},zU=function(r,u){for(var c=0;c<u.length;c++){var d=u[c];r.push(d)}},Ou=function(r,u,c){return c&&(u=TP(c,u)),r[u]},jf=function(r,u,c,d){c&&(u=TP(c,u)),r[u]=d},HU=function(){function a(){N5(this,a),this._obj={}}return I5(a,[{key:"set",value:function(u,c){return this._obj[u]=c,this}},{key:"delete",value:function(u){return this._obj[u]=void 0,this}},{key:"clear",value:function(){this._obj={}}},{key:"has",value:function(u){return this._obj[u]!==void 0}},{key:"get",value:function(u){return this._obj[u]}}]),a}(),Lc=typeof Map<"u"?Map:HU,_U="undefined",GU=function(){function a(r){if(N5(this,a),this._obj=Object.create(null),this.size=0,r!=null){var u;r.instanceString!=null&&r.instanceString()===this.instanceString()?u=r.toArray():u=r;for(var c=0;c<u.length;c++)this.add(u[c])}}return I5(a,[{key:"instanceString",value:function(){return"set"}},{key:"add",value:function(u){var c=this._obj;c[u]!==1&&(c[u]=1,this.size++)}},{key:"delete",value:function(u){var c=this._obj;c[u]===1&&(c[u]=0,this.size--)}},{key:"clear",value:function(){this._obj=Object.create(null)}},{key:"has",value:function(u){return this._obj[u]===1}},{key:"toArray",value:function(){var u=this;return Object.keys(this._obj).filter(function(c){return u.has(c)})}},{key:"forEach",value:function(u,c){return this.toArray().forEach(u,c)}}]),a}(),Tv=(typeof Set>"u"?"undefined":ma(Set))!==_U?Set:GU,Pw=function(r,u){var c=arguments.length>2&&arguments[2]!==void 0?arguments[2]:!0;if(r===void 0||u===void 0||!M5(r)){Hi("An element must have a core reference and parameters set");return}var d=u.group;if(d==null&&(u.data&&u.data.source!=null&&u.data.target!=null?d="edges":d="nodes"),d!=="nodes"&&d!=="edges"){Hi("An element must be of type `nodes` or `edges`; you specified `"+d+"`");return}this.length=1,this[0]=this;var g=this._private={cy:r,single:!0,data:u.data||{},position:u.position||{x:0,y:0},autoWidth:void 0,autoHeight:void 0,autoPadding:void 0,compoundBoundsClean:!1,listeners:[],group:d,style:{},rstyle:{},styleCxts:[],styleKeys:{},removed:!0,selected:!!u.selected,selectable:u.selectable===void 0?!0:!!u.selectable,locked:!!u.locked,grabbed:!1,grabbable:u.grabbable===void 0?!0:!!u.grabbable,pannable:u.pannable===void 0?d==="edges":!!u.pannable,active:!1,classes:new Tv,animation:{current:[],queue:[]},rscratch:{},scratch:u.scratch||{},edges:[],children:[],parent:u.parent&&u.parent.isNode()?u.parent:null,traversalCache:{},backgrounding:!1,bbCache:null,bbCacheShift:{x:0,y:0},bodyBounds:null,overlayBounds:null,labelBounds:{all:null,source:null,target:null,main:null},arrowBounds:{source:null,target:null,"mid-source":null,"mid-target":null}};if(g.position.x==null&&(g.position.x=0),g.position.y==null&&(g.position.y=0),u.renderedPosition){var b=u.renderedPosition,y=r.pan(),k=r.zoom();g.position={x:(b.x-y.x)/k,y:(b.y-y.y)/k}}var E=[];Wr(u.classes)?E=u.classes:Yt(u.classes)&&(E=u.classes.split(/\s+/));for(var C=0,T=E.length;C<T;C++){var P=E[C];!P||P===""||g.classes.add(P)}this.createEmitter();var N=u.style||u.css;N&&(pr("Setting a `style` bypass at element creation should be done only when absolutely necessary.  Try to use the stylesheet instead."),this.style(N)),(c===void 0||c)&&this.restore()},GP=function(r){return r={bfs:r.bfs||!r.dfs,dfs:r.dfs||!r.bfs},function(c,d,g){var b;ar(c)&&!Os(c)&&(b=c,c=b.roots||b.root,d=b.visit,g=b.directed),g=arguments.length===2&&!Ci(d)?d:g,d=Ci(d)?d:function(){};for(var y=this._private.cy,k=c=Yt(c)?this.filter(c):c,E=[],C=[],T={},P={},N={},D=0,H,_=this.byGroup(),B=_.nodes,$=_.edges,F=0;F<k.length;F++){var W=k[F],Q=W.id();W.isNode()&&(E.unshift(W),r.bfs&&(N[Q]=!0,C.push(W)),P[Q]=0)}for(var X=function(){var fe=r.bfs?E.shift():E.pop(),se=fe.id();if(r.dfs){if(N[se])return"continue";N[se]=!0,C.push(fe)}var pe=P[se],he=T[se],de=he!=null?he.source():null,ke=he!=null?he.target():null,Pe=he==null?void 0:fe.same(de)?ke[0]:de[0],Ae=void 0;if(Ae=d(fe,he,Pe,D++,pe),Ae===!0)return H=fe,"break";if(Ae===!1)return"break";for(var Te=fe.connectedEdges().filter(function(Ge){return(!g||Ge.source().same(fe))&&$.has(Ge)}),Oe=0;Oe<Te.length;Oe++){var ze=Te[Oe],We=ze.connectedNodes().filter(function(Ge){return!Ge.same(fe)&&B.has(Ge)}),$e=We.id();We.length!==0&&!N[$e]&&(We=We[0],E.push(We),r.bfs&&(N[$e]=!0,C.push(We)),T[$e]=ze,P[$e]=P[se]+1)}};E.length!==0;){var K=X();if(K!=="continue"&&K==="break")break}for(var ee=y.collection(),Z=0;Z<C.length;Z++){var ae=C[Z],oe=T[ae.id()];oe!=null&&ee.push(oe),ee.push(ae)}return{path:y.collection(ee),found:y.collection(H)}}},r1={breadthFirstSearch:GP({bfs:!0}),depthFirstSearch:GP({dfs:!0})};r1.bfs=r1.breadthFirstSearch,r1.dfs=r1.depthFirstSearch;var $U=eo({root:null,weight:function(r){return 1},directed:!1}),YU={dijkstra:function(r){if(!ar(r)){var u=arguments;r={root:u[0],weight:u[1],directed:u[2]}}var c=$U(r),d=c.root,g=c.weight,b=c.directed,y=this,k=g,E=Yt(d)?this.filter(d)[0]:d[0],C={},T={},P={},N=this.byGroup(),D=N.nodes,H=N.edges;H.unmergeBy(function(pe){return pe.isLoop()});for(var _=function(he){return C[he.id()]},B=function(he,de){C[he.id()]=de,$.updateItem(he)},$=new Zb.default(function(pe,he){return _(pe)-_(he)}),F=0;F<D.length;F++){var W=D[F];C[W.id()]=W.same(E)?0:1/0,$.push(W)}for(var Q=function(he,de){for(var ke=(b?he.edgesTo(de):he.edgesWith(de)).intersect(H),Pe=1/0,Ae,Te=0;Te<ke.length;Te++){var Oe=ke[Te],ze=k(Oe);(ze<Pe||!Ae)&&(Pe=ze,Ae=Oe)}return{edge:Ae,dist:Pe}};$.size()>0;){var X=$.pop(),K=_(X),ee=X.id();if(P[ee]=K,K!==1/0)for(var Z=X.neighborhood().intersect(D),ae=0;ae<Z.length;ae++){var oe=Z[ae],J=oe.id(),fe=Q(X,oe),se=K+fe.dist;se<_(oe)&&(B(oe,se),T[J]={node:X,edge:fe.edge})}}return{distanceTo:function(he){var de=Yt(he)?D.filter(he)[0]:he[0];return P[de.id()]},pathTo:function(he){var de=Yt(he)?D.filter(he)[0]:he[0],ke=[],Pe=de,Ae=Pe.id();if(de.length>0)for(ke.unshift(de);T[Ae];){var Te=T[Ae];ke.unshift(Te.edge),ke.unshift(Te.node),Pe=Te.node,Ae=Pe.id()}return y.spawn(ke)}}}},FU={kruskal:function(r){r=r||function(F){return 1};for(var u=this.byGroup(),c=u.nodes,d=u.edges,g=c.length,b=new Array(g),y=c,k=function(W){for(var Q=0;Q<b.length;Q++){var X=b[Q];if(X.has(W))return Q}},E=0;E<g;E++)b[E]=this.spawn(c[E]);for(var C=d.sort(function(F,W){return r(F)-r(W)}),T=0;T<C.length;T++){var P=C[T],N=P.source()[0],D=P.target()[0],H=k(N),_=k(D),B=b[H],$=b[_];H!==_&&(y.merge(P),B.merge($),b.splice(_,1))}return y}},qU=eo({root:null,goal:null,weight:function(r){return 1},heuristic:function(r){return 0},directed:!1}),VU={aStar:function(r){var u=this.cy(),c=qU(r),d=c.root,g=c.goal,b=c.heuristic,y=c.directed,k=c.weight;d=u.collection(d)[0],g=u.collection(g)[0];var E=d.id(),C=g.id(),T={},P={},N={},D=new Zb.default(function(Ae,Te){return P[Ae.id()]-P[Te.id()]}),H=new Tv,_={},B={},$=function(Te,Oe){D.push(Te),H.add(Oe)},F,W,Q=function(){F=D.pop(),W=F.id(),H.delete(W)},X=function(Te){return H.has(Te)};$(d,E),T[E]=0,P[E]=b(d);for(var K=0;D.size()>0;){if(Q(),K++,W===C){for(var ee=[],Z=g,ae=C,oe=B[ae];ee.unshift(Z),oe!=null&&ee.unshift(oe),Z=_[ae],Z!=null;)ae=Z.id(),oe=B[ae];return{found:!0,distance:T[W],path:this.spawn(ee),steps:K}}N[W]=!0;for(var J=F._private.edges,fe=0;fe<J.length;fe++){var se=J[fe];if(this.hasElementWithId(se.id())&&!(y&&se.data("source")!==W)){var pe=se.source(),he=se.target(),de=pe.id()!==W?pe:he,ke=de.id();if(this.hasElementWithId(ke)&&!N[ke]){var Pe=T[W]+k(se);if(!X(ke)){T[ke]=Pe,P[ke]=Pe+b(de),$(de,ke),_[ke]=F,B[ke]=se;continue}Pe<T[ke]&&(T[ke]=Pe,P[ke]=Pe+b(de),_[ke]=F,B[ke]=se)}}}}return{found:!1,distance:void 0,path:void 0,steps:K}}},WU=eo({weight:function(r){return 1},directed:!1}),UU={floydWarshall:function(r){for(var u=this.cy(),c=WU(r),d=c.weight,g=c.directed,b=d,y=this.byGroup(),k=y.nodes,E=y.edges,C=k.length,T=C*C,P=function(ze){return k.indexOf(ze)},N=function(ze){return k[ze]},D=new Array(T),H=0;H<T;H++){var _=H%C,B=(H-_)/C;B===_?D[H]=0:D[H]=1/0}for(var $=new Array(T),F=new Array(T),W=0;W<E.length;W++){var Q=E[W],X=Q.source()[0],K=Q.target()[0];if(X!==K){var ee=P(X),Z=P(K),ae=ee*C+Z,oe=b(Q);if(D[ae]>oe&&(D[ae]=oe,$[ae]=Z,F[ae]=Q),!g){var J=Z*C+ee;!g&&D[J]>oe&&(D[J]=oe,$[J]=ee,F[J]=Q)}}}for(var fe=0;fe<C;fe++)for(var se=0;se<C;se++)for(var pe=se*C+fe,he=0;he<C;he++){var de=se*C+he,ke=fe*C+he;D[pe]+D[ke]<D[de]&&(D[de]=D[pe]+D[ke],$[de]=$[pe])}var Pe=function(ze){return(Yt(ze)?u.filter(ze):ze)[0]},Ae=function(ze){return P(Pe(ze))},Te={distance:function(ze,We){var $e=Ae(ze),Ge=Ae(We);return D[$e*C+Ge]},path:function(ze,We){var $e=Ae(ze),Ge=Ae(We),me=N($e);if($e===Ge)return me.collection();if($[$e*C+Ge]==null)return u.collection();var Ve=u.collection(),Ke=$e,at;for(Ve.merge(me);$e!==Ge;)Ke=$e,$e=$[$e*C+Ge],at=F[Ke*C+$e],Ve.merge(at),Ve.merge(N($e));return Ve}};return Te}},KU=eo({weight:function(r){return 1},directed:!1,root:null}),ZU={bellmanFord:function(r){var u=this,c=KU(r),d=c.weight,g=c.directed,b=c.root,y=d,k=this,E=this.cy(),C=this.byGroup(),T=C.edges,P=C.nodes,N=P.length,D=new Lc,H=!1,_=[];b=E.collection(b)[0],T.unmergeBy(function(Lt){return Lt.isLoop()});for(var B=T.length,$=function(yt){var Mt=D.get(yt.id());return Mt||(Mt={},D.set(yt.id(),Mt)),Mt},F=function(yt){return(Yt(yt)?E.$(yt):yt)[0]},W=function(yt){return $(F(yt)).dist},Q=function(yt){for(var Mt=arguments.length>1&&arguments[1]!==void 0?arguments[1]:b,In=F(yt),Pn=[],Vt=In;;){if(Vt==null)return u.spawn();var sr=$(Vt),Qe=sr.edge,ne=sr.pred;if(Pn.unshift(Vt[0]),Vt.same(Mt)&&Pn.length>0)break;Qe!=null&&Pn.unshift(Qe),Vt=ne}return k.spawn(Pn)},X=0;X<N;X++){var K=P[X],ee=$(K);K.same(b)?ee.dist=0:ee.dist=1/0,ee.pred=null,ee.edge=null}for(var Z=!1,ae=function(yt,Mt,In,Pn,Vt,sr){var Qe=Pn.dist+sr;Qe<Vt.dist&&!In.same(Pn.edge)&&(Vt.dist=Qe,Vt.pred=yt,Vt.edge=In,Z=!0)},oe=1;oe<N;oe++){Z=!1;for(var J=0;J<B;J++){var fe=T[J],se=fe.source(),pe=fe.target(),he=y(fe),de=$(se),ke=$(pe);ae(se,pe,fe,de,ke,he),g||ae(pe,se,fe,ke,de,he)}if(!Z)break}if(Z)for(var Pe=[],Ae=0;Ae<B;Ae++){var Te=T[Ae],Oe=Te.source(),ze=Te.target(),We=y(Te),$e=$(Oe).dist,Ge=$(ze).dist;if($e+We<Ge||!g&&Ge+We<$e)if(H||(pr("Graph contains a negative weight cycle for Bellman-Ford"),H=!0),r.findNegativeWeightCycles!==!1){var me=[];$e+We<Ge&&me.push(Oe),!g&&Ge+We<$e&&me.push(ze);for(var Ve=me.length,Ke=0;Ke<Ve;Ke++){var at=me[Ke],ft=[at];ft.push($(at).edge);for(var tn=$(at).pred;ft.indexOf(tn)===-1;)ft.push(tn),ft.push($(tn).edge),tn=$(tn).pred;ft=ft.slice(ft.indexOf(tn));for(var gn=ft[0].id(),mt=0,ht=2;ht<ft.length;ht+=2)ft[ht].id()<gn&&(gn=ft[ht].id(),mt=ht);ft=ft.slice(mt).concat(ft.slice(0,mt)),ft.push(ft[0]);var Rt=ft.map(function(Lt){return Lt.id()}).join(",");Pe.indexOf(Rt)===-1&&(_.push(k.spawn(ft)),Pe.push(Rt))}}else break}return{distanceTo:W,pathTo:Q,hasNegativeWeightCycle:H,negativeWeightCycles:_}}},XU=Math.sqrt(2),QU=function(r,u,c){c.length===0&&Hi("Karger-Stein must be run on a connected (sub)graph");for(var d=c[r],g=d[1],b=d[2],y=u[g],k=u[b],E=c,C=E.length-1;C>=0;C--){var T=E[C],P=T[1],N=T[2];(u[P]===y&&u[N]===k||u[P]===k&&u[N]===y)&&E.splice(C,1)}for(var D=0;D<E.length;D++){var H=E[D];H[1]===k?(E[D]=H.slice(),E[D][1]=y):H[2]===k&&(E[D]=H.slice(),E[D][2]=y)}for(var _=0;_<u.length;_++)u[_]===k&&(u[_]=y);return E},H5=function(r,u,c,d){for(;c>d;){var g=Math.floor(Math.random()*u.length);u=QU(g,r,u),c--}return u},JU={kargerStein:function(){var r=this,u=this.byGroup(),c=u.nodes,d=u.edges;d.unmergeBy(function(ke){return ke.isLoop()});var g=c.length,b=d.length,y=Math.ceil(Math.pow(Math.log(g)/Math.LN2,2)),k=Math.floor(g/XU);if(g<2){Hi("At least 2 nodes are required for Karger-Stein algorithm");return}for(var E=[],C=0;C<b;C++){var T=d[C];E.push([C,c.indexOf(T.source()),c.indexOf(T.target())])}for(var P=1/0,N=[],D=new Array(g),H=new Array(g),_=new Array(g),B=function(Pe,Ae){for(var Te=0;Te<g;Te++)Ae[Te]=Pe[Te]},$=0;$<=y;$++){for(var F=0;F<g;F++)H[F]=F;var W=H5(H,E.slice(),g,k),Q=W.slice();B(H,_);var X=H5(H,W,k,2),K=H5(_,Q,k,2);X.length<=K.length&&X.length<P?(P=X.length,N=X,B(H,D)):K.length<=X.length&&K.length<P&&(P=K.length,N=K,B(_,D))}for(var ee=this.spawn(N.map(function(ke){return d[ke[0]]})),Z=this.spawn(),ae=this.spawn(),oe=D[0],J=0;J<D.length;J++){var fe=D[J],se=c[J];fe===oe?Z.merge(se):ae.merge(se)}var pe=function(Pe){var Ae=r.spawn();return Pe.forEach(function(Te){Ae.merge(Te),Te.connectedEdges().forEach(function(Oe){r.contains(Oe)&&!ee.contains(Oe)&&Ae.merge(Oe)})}),Ae},he=[pe(Z),pe(ae)],de={cut:ee,components:he,partition1:Z,partition2:ae};return de}},eK=function(r){return{x:r.x,y:r.y}},Dw=function(r,u,c){return{x:r.x*u+c.x,y:r.y*u+c.y}},$P=function(r,u,c){return{x:(r.x-c.x)/u,y:(r.y-c.y)/u}},Lv=function(r){return{x:r[0],y:r[1]}},tK=function(r){for(var u=arguments.length>1&&arguments[1]!==void 0?arguments[1]:0,c=arguments.length>2&&arguments[2]!==void 0?arguments[2]:r.length,d=1/0,g=u;g<c;g++){var b=r[g];isFinite(b)&&(d=Math.min(b,d))}return d},nK=function(r){for(var u=arguments.length>1&&arguments[1]!==void 0?arguments[1]:0,c=arguments.length>2&&arguments[2]!==void 0?arguments[2]:r.length,d=-1/0,g=u;g<c;g++){var b=r[g];isFinite(b)&&(d=Math.max(b,d))}return d},rK=function(r){for(var u=arguments.length>1&&arguments[1]!==void 0?arguments[1]:0,c=arguments.length>2&&arguments[2]!==void 0?arguments[2]:r.length,d=0,g=0,b=u;b<c;b++){var y=r[b];isFinite(y)&&(d+=y,g++)}return d/g},iK=function(r){var u=arguments.length>1&&arguments[1]!==void 0?arguments[1]:0,c=arguments.length>2&&arguments[2]!==void 0?arguments[2]:r.length,d=arguments.length>3&&arguments[3]!==void 0?arguments[3]:!0,g=arguments.length>4&&arguments[4]!==void 0?arguments[4]:!0,b=arguments.length>5&&arguments[5]!==void 0?arguments[5]:!0;d?r=r.slice(u,c):(c<r.length&&r.splice(c,r.length-c),u>0&&r.splice(0,u));for(var y=0,k=r.length-1;k>=0;k--){var E=r[k];b?isFinite(E)||(r[k]=-1/0,y++):r.splice(k,1)}g&&r.sort(function(P,N){return P-N});var C=r.length,T=Math.floor(C/2);return C%2!==0?r[T+1+y]:(r[T-1+y]+r[T+y])/2},aK=function(r){return Math.PI*r/180},jw=function(r,u){return Math.atan2(u,r)-Math.PI/2},_5=Math.log2||function(a){return Math.log(a)/Math.log(2)},YP=function(r){return r>0?1:r<0?-1:0},Uh=function(r,u){return Math.sqrt(Kh(r,u))},Kh=function(r,u){var c=u.x-r.x,d=u.y-r.y;return c*c+d*d},oK=function(r){for(var u=r.length,c=0,d=0;d<u;d++)c+=r[d];for(var g=0;g<u;g++)r[g]=r[g]/c;return r},za=function(r,u,c,d){return(1-d)*(1-d)*r+2*(1-d)*d*u+d*d*c},Pv=function(r,u,c,d){return{x:za(r.x,u.x,c.x,d),y:za(r.y,u.y,c.y,d)}},sK=function(r,u,c,d){var g={x:u.x-r.x,y:u.y-r.y},b=Uh(r,u),y={x:g.x/b,y:g.y/b};return c=c??0,d=d??c*b,{x:r.x+y.x*d,y:r.y+y.y*d}},i1=function(r,u,c){return Math.max(r,Math.min(c,u))},cs=function(r){if(r==null)return{x1:1/0,y1:1/0,x2:-1/0,y2:-1/0,w:0,h:0};if(r.x1!=null&&r.y1!=null){if(r.x2!=null&&r.y2!=null&&r.x2>=r.x1&&r.y2>=r.y1)return{x1:r.x1,y1:r.y1,x2:r.x2,y2:r.y2,w:r.x2-r.x1,h:r.y2-r.y1};if(r.w!=null&&r.h!=null&&r.w>=0&&r.h>=0)return{x1:r.x1,y1:r.y1,x2:r.x1+r.w,y2:r.y1+r.h,w:r.w,h:r.h}}},uK=function(r){return{x1:r.x1,x2:r.x2,w:r.w,y1:r.y1,y2:r.y2,h:r.h}},cK=function(r){r.x1=1/0,r.y1=1/0,r.x2=-1/0,r.y2=-1/0,r.w=0,r.h=0},lK=function(r,u){r.x1=Math.min(r.x1,u.x1),r.x2=Math.max(r.x2,u.x2),r.w=r.x2-r.x1,r.y1=Math.min(r.y1,u.y1),r.y2=Math.max(r.y2,u.y2),r.h=r.y2-r.y1},fK=function(r,u,c){r.x1=Math.min(r.x1,u),r.x2=Math.max(r.x2,u),r.w=r.x2-r.x1,r.y1=Math.min(r.y1,c),r.y2=Math.max(r.y2,c),r.h=r.y2-r.y1},Nw=function(r){var u=arguments.length>1&&arguments[1]!==void 0?arguments[1]:0;return r.x1-=u,r.x2+=u,r.y1-=u,r.y2+=u,r.w=r.x2-r.x1,r.h=r.y2-r.y1,r},G5=function(r){var u=arguments.length>1&&arguments[1]!==void 0?arguments[1]:[0],c,d,g,b;if(u.length===1)c=d=g=b=u[0];else if(u.length===2)c=g=u[0],b=d=u[1];else if(u.length===4){var y=Mu(u,4);c=y[0],d=y[1],g=y[2],b=y[3]}return r.x1-=b,r.x2+=d,r.y1-=c,r.y2+=g,r.w=r.x2-r.x1,r.h=r.y2-r.y1,r},FP=function(r,u){r.x1=u.x1,r.y1=u.y1,r.x2=u.x2,r.y2=u.y2,r.w=r.x2-r.x1,r.h=r.y2-r.y1},$5=function(r,u){return!(r.x1>u.x2||u.x1>r.x2||r.x2<u.x1||u.x2<r.x1||r.y2<u.y1||u.y2<r.y1||r.y1>u.y2||u.y1>r.y2)},Dv=function(r,u,c){return r.x1<=u&&u<=r.x2&&r.y1<=c&&c<=r.y2},hK=function(r,u){return Dv(r,u.x,u.y)},qP=function(r,u){return Dv(r,u.x1,u.y1)&&Dv(r,u.x2,u.y2)},VP=function(r,u,c,d,g,b,y){var k=s1(g,b),E=g/2,C=b/2,T;{var P=c-E+k-y,N=d-C-y,D=c+E-k+y,H=N;if(T=Nf(r,u,c,d,P,N,D,H,!1),T.length>0)return T}{var _=c+E+y,B=d-C+k-y,$=_,F=d+C-k+y;if(T=Nf(r,u,c,d,_,B,$,F,!1),T.length>0)return T}{var W=c-E+k-y,Q=d+C+y,X=c+E-k+y,K=Q;if(T=Nf(r,u,c,d,W,Q,X,K,!1),T.length>0)return T}{var ee=c-E-y,Z=d-C+k-y,ae=ee,oe=d+C-k+y;if(T=Nf(r,u,c,d,ee,Z,ae,oe,!1),T.length>0)return T}var J;{var fe=c-E+k,se=d-C+k;if(J=a1(r,u,c,d,fe,se,k+y),J.length>0&&J[0]<=fe&&J[1]<=se)return[J[0],J[1]]}{var pe=c+E-k,he=d-C+k;if(J=a1(r,u,c,d,pe,he,k+y),J.length>0&&J[0]>=pe&&J[1]<=he)return[J[0],J[1]]}{var de=c+E-k,ke=d+C-k;if(J=a1(r,u,c,d,de,ke,k+y),J.length>0&&J[0]>=de&&J[1]>=ke)return[J[0],J[1]]}{var Pe=c-E+k,Ae=d+C-k;if(J=a1(r,u,c,d,Pe,Ae,k+y),J.length>0&&J[0]<=Pe&&J[1]>=Ae)return[J[0],J[1]]}return[]},dK=function(r,u,c,d,g,b,y){var k=y,E=Math.min(c,g),C=Math.max(c,g),T=Math.min(d,b),P=Math.max(d,b);return E-k<=r&&r<=C+k&&T-k<=u&&u<=P+k},vK=function(r,u,c,d,g,b,y,k,E){var C={x1:Math.min(c,y,g)-E,x2:Math.max(c,y,g)+E,y1:Math.min(d,k,b)-E,y2:Math.max(d,k,b)+E};return!(r<C.x1||r>C.x2||u<C.y1||u>C.y2)},gK=function(r,u,c,d){c-=d;var g=u*u-4*r*c;if(g<0)return[];var b=Math.sqrt(g),y=2*r,k=(-u+b)/y,E=(-u-b)/y;return[k,E]},bK=function(r,u,c,d,g){var b=1e-5;r===0&&(r=b),u/=r,c/=r,d/=r;var y,k,E,C,T,P,N,D;if(k=(3*c-u*u)/9,E=-(27*d)+u*(9*c-2*(u*u)),E/=54,y=k*k*k+E*E,g[1]=0,N=u/3,y>0){T=E+Math.sqrt(y),T=T<0?-Math.pow(-T,1/3):Math.pow(T,1/3),P=E-Math.sqrt(y),P=P<0?-Math.pow(-P,1/3):Math.pow(P,1/3),g[0]=-N+T+P,N+=(T+P)/2,g[4]=g[2]=-N,N=Math.sqrt(3)*(-P+T)/2,g[3]=N,g[5]=-N;return}if(g[5]=g[3]=0,y===0){D=E<0?-Math.pow(-E,1/3):Math.pow(E,1/3),g[0]=-N+2*D,g[4]=g[2]=-(D+N);return}k=-k,C=k*k*k,C=Math.acos(E/Math.sqrt(C)),D=2*Math.sqrt(k),g[0]=-N+D*Math.cos(C/3),g[2]=-N+D*Math.cos((C+2*Math.PI)/3),g[4]=-N+D*Math.cos((C+4*Math.PI)/3)},pK=function(r,u,c,d,g,b,y,k){var E=1*c*c-4*c*g+2*c*y+4*g*g-4*g*y+y*y+d*d-4*d*b+2*d*k+4*b*b-4*b*k+k*k,C=1*9*c*g-3*c*c-3*c*y-6*g*g+3*g*y+9*d*b-3*d*d-3*d*k-6*b*b+3*b*k,T=1*3*c*c-6*c*g+c*y-c*r+2*g*g+2*g*r-y*r+3*d*d-6*d*b+d*k-d*u+2*b*b+2*b*u-k*u,P=1*c*g-c*c+c*r-g*r+d*b-d*d+d*u-b*u,N=[];bK(E,C,T,P,N);for(var D=1e-7,H=[],_=0;_<6;_+=2)Math.abs(N[_+1])<D&&N[_]>=0&&N[_]<=1&&H.push(N[_]);H.push(1),H.push(0);for(var B=-1,$,F,W,Q=0;Q<H.length;Q++)$=Math.pow(1-H[Q],2)*c+2*(1-H[Q])*H[Q]*g+H[Q]*H[Q]*y,F=Math.pow(1-H[Q],2)*d+2*(1-H[Q])*H[Q]*b+H[Q]*H[Q]*k,W=Math.pow($-r,2)+Math.pow(F-u,2),B>=0?W<B&&(B=W):B=W;return B},wK=function(r,u,c,d,g,b){var y=[r-c,u-d],k=[g-c,b-d],E=k[0]*k[0]+k[1]*k[1],C=y[0]*y[0]+y[1]*y[1],T=y[0]*k[0]+y[1]*k[1],P=T*T/E;return T<0?C:P>E?(r-g)*(r-g)+(u-b)*(u-b):C-P},ls=function(r,u,c){for(var d,g,b,y,k,E=0,C=0;C<c.length/2;C++)if(d=c[C*2],g=c[C*2+1],C+1<c.length/2?(b=c[(C+1)*2],y=c[(C+1)*2+1]):(b=c[(C+1-c.length/2)*2],y=c[(C+1-c.length/2)*2+1]),!(d==r&&b==r))if(d>=r&&r>=b||d<=r&&r<=b)k=(r-d)/(b-d)*(y-g)+g,k>u&&E++;else continue;return E%2!==0},Pl=function(r,u,c,d,g,b,y,k,E){var C=new Array(c.length),T;k[0]!=null?(T=Math.atan(k[1]/k[0]),k[0]<0?T=T+Math.PI/2:T=-T-Math.PI/2):T=k;for(var P=Math.cos(-T),N=Math.sin(-T),D=0;D<C.length/2;D++)C[D*2]=b/2*(c[D*2]*P-c[D*2+1]*N),C[D*2+1]=y/2*(c[D*2+1]*P+c[D*2]*N),C[D*2]+=d,C[D*2+1]+=g;var H;if(E>0){var _=UP(C,-E);H=WP(_)}else H=C;return ls(r,u,H)},mK=function(r,u,c,d,g,b,y){for(var k=new Array(c.length),E=b/2,C=y/2,T=q5(b,y),P=T*T,N=0;N<c.length/4;N++){var D=void 0,H=void 0;N===0?D=c.length-2:D=N*4-2,H=N*4+2;var _=d+E*c[N*4],B=g+C*c[N*4+1],$=-c[D]*c[H]-c[D+1]*c[H+1],F=T/Math.tan(Math.acos($)/2),W=_-F*c[D],Q=B-F*c[D+1],X=_+F*c[H],K=B+F*c[H+1];k[N*4]=W,k[N*4+1]=Q,k[N*4+2]=X,k[N*4+3]=K;var ee=c[D+1],Z=-c[D],ae=ee*c[H]+Z*c[H+1];ae<0&&(ee*=-1,Z*=-1);var oe=W+ee*T,J=Q+Z*T,fe=Math.pow(oe-r,2)+Math.pow(J-u,2);if(fe<=P)return!0}return ls(r,u,k)},WP=function(r){for(var u=new Array(r.length/2),c,d,g,b,y,k,E,C,T=0;T<r.length/4;T++){c=r[T*4],d=r[T*4+1],g=r[T*4+2],b=r[T*4+3],T<r.length/4-1?(y=r[(T+1)*4],k=r[(T+1)*4+1],E=r[(T+1)*4+2],C=r[(T+1)*4+3]):(y=r[0],k=r[1],E=r[2],C=r[3]);var P=Nf(c,d,g,b,y,k,E,C,!0);u[T*2]=P[0],u[T*2+1]=P[1]}return u},UP=function(r,u){for(var c=new Array(r.length*2),d,g,b,y,k=0;k<r.length/2;k++){d=r[k*2],g=r[k*2+1],k<r.length/2-1?(b=r[(k+1)*2],y=r[(k+1)*2+1]):(b=r[0],y=r[1]);var E=y-g,C=-(b-d),T=Math.sqrt(E*E+C*C),P=E/T,N=C/T;c[k*4]=d+P*u,c[k*4+1]=g+N*u,c[k*4+2]=b+P*u,c[k*4+3]=y+N*u}return c},yK=function(r,u,c,d,g,b){var y=c-r,k=d-u;y/=g,k/=b;var E=Math.sqrt(y*y+k*k),C=E-1;if(C<0)return[];var T=C/E;return[(c-r)*T+r,(d-u)*T+u]},Zh=function(r,u,c,d,g,b,y){return r-=g,u-=b,r/=c/2+y,u/=d/2+y,r*r+u*u<=1},a1=function(r,u,c,d,g,b,y){var k=[c-r,d-u],E=[r-g,u-b],C=k[0]*k[0]+k[1]*k[1],T=2*(E[0]*k[0]+E[1]*k[1]),P=E[0]*E[0]+E[1]*E[1]-y*y,N=T*T-4*C*P;if(N<0)return[];var D=(-T+Math.sqrt(N))/(2*C),H=(-T-Math.sqrt(N))/(2*C),_=Math.min(D,H),B=Math.max(D,H),$=[];if(_>=0&&_<=1&&$.push(_),B>=0&&B<=1&&$.push(B),$.length===0)return[];var F=$[0]*k[0]+r,W=$[0]*k[1]+u;if($.length>1){if($[0]==$[1])return[F,W];var Q=$[1]*k[0]+r,X=$[1]*k[1]+u;return[F,W,Q,X]}else return[F,W]},Y5=function(r,u,c){return u<=r&&r<=c||c<=r&&r<=u?r:r<=u&&u<=c||c<=u&&u<=r?u:c},Nf=function(r,u,c,d,g,b,y,k,E){var C=r-g,T=c-r,P=y-g,N=u-b,D=d-u,H=k-b,_=P*N-H*C,B=T*N-D*C,$=H*T-P*D;if($!==0){var F=_/$,W=B/$,Q=.001,X=0-Q,K=1+Q;return X<=F&&F<=K&&X<=W&&W<=K?[r+F*T,u+F*D]:E?[r+F*T,u+F*D]:[]}else return _===0||B===0?Y5(r,c,y)===y?[y,k]:Y5(r,c,g)===g?[g,b]:Y5(g,y,c)===c?[c,d]:[]:[]},o1=function(r,u,c,d,g,b,y,k){var E=[],C,T=new Array(c.length),P=!0;b==null&&(P=!1);var N;if(P){for(var D=0;D<T.length/2;D++)T[D*2]=c[D*2]*b+d,T[D*2+1]=c[D*2+1]*y+g;if(k>0){var H=UP(T,-k);N=WP(H)}else N=T}else N=c;for(var _,B,$,F,W=0;W<N.length/2;W++)_=N[W*2],B=N[W*2+1],W<N.length/2-1?($=N[(W+1)*2],F=N[(W+1)*2+1]):($=N[0],F=N[1]),C=Nf(r,u,d,g,_,B,$,F),C.length!==0&&E.push(C[0],C[1]);return E},kK=function(r,u,c,d,g,b,y,k){for(var E=[],C,T=new Array(c.length),P=b/2,N=y/2,D=q5(b,y),H=0;H<c.length/4;H++){var _=void 0,B=void 0;H===0?_=c.length-2:_=H*4-2,B=H*4+2;var $=d+P*c[H*4],F=g+N*c[H*4+1],W=-c[_]*c[B]-c[_+1]*c[B+1],Q=D/Math.tan(Math.acos(W)/2),X=$-Q*c[_],K=F-Q*c[_+1],ee=$+Q*c[B],Z=F+Q*c[B+1];H===0?(T[c.length-2]=X,T[c.length-1]=K):(T[H*4-2]=X,T[H*4-1]=K),T[H*4]=ee,T[H*4+1]=Z;var ae=c[_+1],oe=-c[_],J=ae*c[B]+oe*c[B+1];J<0&&(ae*=-1,oe*=-1);var fe=X+ae*D,se=K+oe*D;C=a1(r,u,d,g,fe,se,D),C.length!==0&&E.push(C[0],C[1])}for(var pe=0;pe<T.length/4;pe++)C=Nf(r,u,d,g,T[pe*4],T[pe*4+1],T[pe*4+2],T[pe*4+3],!1),C.length!==0&&E.push(C[0],C[1]);if(E.length>2){for(var he=[E[0],E[1]],de=Math.pow(he[0]-r,2)+Math.pow(he[1]-u,2),ke=1;ke<E.length/2;ke++){var Pe=Math.pow(E[ke*2]-r,2)+Math.pow(E[ke*2+1]-u,2);Pe<=de&&(he[0]=E[ke*2],he[1]=E[ke*2+1],de=Pe)}return he}return E},Iw=function(r,u,c){var d=[r[0]-u[0],r[1]-u[1]],g=Math.sqrt(d[0]*d[0]+d[1]*d[1]),b=(g-c)/g;return b<0&&(b=1e-5),[u[0]+b*d[0],u[1]+b*d[1]]},Bo=function(r,u){var c=F5(r,u);return c=KP(c),c},KP=function(r){for(var u,c,d=r.length/2,g=1/0,b=1/0,y=-1/0,k=-1/0,E=0;E<d;E++)u=r[2*E],c=r[2*E+1],g=Math.min(g,u),y=Math.max(y,u),b=Math.min(b,c),k=Math.max(k,c);for(var C=2/(y-g),T=2/(k-b),P=0;P<d;P++)u=r[2*P]=r[2*P]*C,c=r[2*P+1]=r[2*P+1]*T,g=Math.min(g,u),y=Math.max(y,u),b=Math.min(b,c),k=Math.max(k,c);if(b<-1)for(var N=0;N<d;N++)c=r[2*N+1]=r[2*N+1]+(-1-b);return r},F5=function(r,u){var c=1/r*2*Math.PI,d=r%2===0?Math.PI/2+c/2:Math.PI/2;d+=u;for(var g=new Array(r*2),b,y=0;y<r;y++)b=y*c+d,g[2*y]=Math.cos(b),g[2*y+1]=Math.sin(-b);return g},s1=function(r,u){return Math.min(r/4,u/4,8)},q5=function(r,u){return Math.min(r/10,u/10,8)},ZP=function(){return 8},EK=function(r,u,c){return[r-2*u+c,2*(u-r),r]},V5=function(r,u){return{heightOffset:Math.min(15,.05*u),widthOffset:Math.min(100,.25*r),ctrlPtOffsetPct:.05}},SK=eo({dampingFactor:.8,precision:1e-6,iterations:200,weight:function(r){return 1}}),CK={pageRank:function(r){for(var u=SK(r),c=u.dampingFactor,d=u.precision,g=u.iterations,b=u.weight,y=this._private.cy,k=this.byGroup(),E=k.nodes,C=k.edges,T=E.length,P=T*T,N=C.length,D=new Array(P),H=new Array(T),_=(1-c)/T,B=0;B<T;B++){for(var $=0;$<T;$++){var F=B*T+$;D[F]=0}H[B]=0}for(var W=0;W<N;W++){var Q=C[W],X=Q.data("source"),K=Q.data("target");if(X!==K){var ee=E.indexOfId(X),Z=E.indexOfId(K),ae=b(Q),oe=Z*T+ee;D[oe]+=ae,H[ee]+=ae}}for(var J=1/T+_,fe=0;fe<T;fe++)if(H[fe]===0)for(var se=0;se<T;se++){var pe=se*T+fe;D[pe]=J}else for(var he=0;he<T;he++){var de=he*T+fe;D[de]=D[de]/H[fe]+_}for(var ke=new Array(T),Pe=new Array(T),Ae,Te=0;Te<T;Te++)ke[Te]=1;for(var Oe=0;Oe<g;Oe++){for(var ze=0;ze<T;ze++)Pe[ze]=0;for(var We=0;We<T;We++)for(var $e=0;$e<T;$e++){var Ge=We*T+$e;Pe[We]+=D[Ge]*ke[$e]}oK(Pe),Ae=ke,ke=Pe,Pe=Ae;for(var me=0,Ve=0;Ve<T;Ve++){var Ke=Ae[Ve]-ke[Ve];me+=Ke*Ke}if(me<d)break}var at={rank:function(tn){return tn=y.collection(tn)[0],ke[E.indexOf(tn)]}};return at}},XP=eo({root:null,weight:function(r){return 1},directed:!1,alpha:0}),jv={degreeCentralityNormalized:function(r){r=XP(r);var u=this.cy(),c=this.nodes(),d=c.length;if(r.directed){for(var C={},T={},P=0,N=0,D=0;D<d;D++){var H=c[D],_=H.id();r.root=H;var B=this.degreeCentrality(r);P<B.indegree&&(P=B.indegree),N<B.outdegree&&(N=B.outdegree),C[_]=B.indegree,T[_]=B.outdegree}return{indegree:function(F){return P==0?0:(Yt(F)&&(F=u.filter(F)),C[F.id()]/P)},outdegree:function(F){return N===0?0:(Yt(F)&&(F=u.filter(F)),T[F.id()]/N)}}}else{for(var g={},b=0,y=0;y<d;y++){var k=c[y];r.root=k;var E=this.degreeCentrality(r);b<E.degree&&(b=E.degree),g[k.id()]=E.degree}return{degree:function(F){return b===0?0:(Yt(F)&&(F=u.filter(F)),g[F.id()]/b)}}}},degreeCentrality:function(r){r=XP(r);var u=this.cy(),c=this,d=r,g=d.root,b=d.weight,y=d.directed,k=d.alpha;if(g=u.collection(g)[0],y){for(var N=g.connectedEdges(),D=N.filter(function(X){return X.target().same(g)&&c.has(X)}),H=N.filter(function(X){return X.source().same(g)&&c.has(X)}),_=D.length,B=H.length,$=0,F=0,W=0;W<D.length;W++)$+=b(D[W]);for(var Q=0;Q<H.length;Q++)F+=b(H[Q]);return{indegree:Math.pow(_,1-k)*Math.pow($,k),outdegree:Math.pow(B,1-k)*Math.pow(F,k)}}else{for(var E=g.connectedEdges().intersection(c),C=E.length,T=0,P=0;P<E.length;P++)T+=b(E[P]);return{degree:Math.pow(C,1-k)*Math.pow(T,k)}}}};jv.dc=jv.degreeCentrality,jv.dcn=jv.degreeCentralityNormalised=jv.degreeCentralityNormalized;var QP=eo({harmonic:!0,weight:function(){return 1},directed:!1,root:null}),Nv={closenessCentralityNormalized:function(r){for(var u=QP(r),c=u.harmonic,d=u.weight,g=u.directed,b=this.cy(),y={},k=0,E=this.nodes(),C=this.floydWarshall({weight:d,directed:g}),T=0;T<E.length;T++){for(var P=0,N=E[T],D=0;D<E.length;D++)if(T!==D){var H=C.distance(N,E[D]);c?P+=1/H:P+=H}c||(P=1/P),k<P&&(k=P),y[N.id()]=P}return{closeness:function(B){return k==0?0:(Yt(B)?B=b.filter(B)[0].id():B=B.id(),y[B]/k)}}},closenessCentrality:function(r){var u=QP(r),c=u.root,d=u.weight,g=u.directed,b=u.harmonic;c=this.filter(c)[0];for(var y=this.dijkstra({root:c,weight:d,directed:g}),k=0,E=this.nodes(),C=0;C<E.length;C++){var T=E[C];if(!T.same(c)){var P=y.distanceTo(T);b?k+=1/P:k+=P}}return b?k:1/k}};Nv.cc=Nv.closenessCentrality,Nv.ccn=Nv.closenessCentralityNormalised=Nv.closenessCentralityNormalized;var xK=eo({weight:null,directed:!1}),W5={betweennessCentrality:function(r){for(var u=xK(r),c=u.directed,d=u.weight,g=d!=null,b=this.cy(),y=this.nodes(),k={},E={},C=0,T={set:function(F,W){E[F]=W,W>C&&(C=W)},get:function(F){return E[F]}},P=0;P<y.length;P++){var N=y[P],D=N.id();c?k[D]=N.outgoers().nodes():k[D]=N.openNeighborhood().nodes(),T.set(D,0)}for(var H=function(F){for(var W=y[F].id(),Q=[],X={},K={},ee={},Z=new Zb.default(function($e,Ge){return ee[$e]-ee[Ge]}),ae=0;ae<y.length;ae++){var oe=y[ae].id();X[oe]=[],K[oe]=0,ee[oe]=1/0}for(K[W]=1,ee[W]=0,Z.push(W);!Z.empty();){var J=Z.pop();if(Q.push(J),g)for(var fe=0;fe<k[J].length;fe++){var se=k[J][fe],pe=b.getElementById(J),he=void 0;pe.edgesTo(se).length>0?he=pe.edgesTo(se)[0]:he=se.edgesTo(pe)[0];var de=d(he);se=se.id(),ee[se]>ee[J]+de&&(ee[se]=ee[J]+de,Z.nodes.indexOf(se)<0?Z.push(se):Z.updateItem(se),K[se]=0,X[se]=[]),ee[se]==ee[J]+de&&(K[se]=K[se]+K[J],X[se].push(J))}else for(var ke=0;ke<k[J].length;ke++){var Pe=k[J][ke].id();ee[Pe]==1/0&&(Z.push(Pe),ee[Pe]=ee[J]+1),ee[Pe]==ee[J]+1&&(K[Pe]=K[Pe]+K[J],X[Pe].push(J))}}for(var Ae={},Te=0;Te<y.length;Te++)Ae[y[Te].id()]=0;for(;Q.length>0;){for(var Oe=Q.pop(),ze=0;ze<X[Oe].length;ze++){var We=X[Oe][ze];Ae[We]=Ae[We]+K[We]/K[Oe]*(1+Ae[Oe])}Oe!=y[F].id()&&T.set(Oe,T.get(Oe)+Ae[Oe])}},_=0;_<y.length;_++)H(_);var B={betweenness:function(F){var W=b.collection(F).id();return T.get(W)},betweennessNormalized:function(F){if(C==0)return 0;var W=b.collection(F).id();return T.get(W)/C}};return B.betweennessNormalised=B.betweennessNormalized,B}};W5.bc=W5.betweennessCentrality;var TK=eo({expandFactor:2,inflateFactor:2,multFactor:1,maxIterations:20,attributes:[function(a){return 1}]}),LK=function(r){return TK(r)},PK=function(r,u){for(var c=0,d=0;d<u.length;d++)c+=u[d](r);return c},DK=function(r,u,c){for(var d=0;d<u;d++)r[d*u+d]=c},JP=function(r,u){for(var c,d=0;d<u;d++){c=0;for(var g=0;g<u;g++)c+=r[g*u+d];for(var b=0;b<u;b++)r[b*u+d]=r[b*u+d]/c}},jK=function(r,u,c){for(var d=new Array(c*c),g=0;g<c;g++){for(var b=0;b<c;b++)d[g*c+b]=0;for(var y=0;y<c;y++)for(var k=0;k<c;k++)d[g*c+k]+=r[g*c+y]*u[y*c+k]}return d},NK=function(r,u,c){for(var d=r.slice(0),g=1;g<c;g++)r=jK(r,d,u);return r},IK=function(r,u,c){for(var d=new Array(u*u),g=0;g<u*u;g++)d[g]=Math.pow(r[g],c);return JP(d,u),d},MK=function(r,u,c,d){for(var g=0;g<c;g++){var b=Math.round(r[g]*Math.pow(10,d))/Math.pow(10,d),y=Math.round(u[g]*Math.pow(10,d))/Math.pow(10,d);if(b!==y)return!1}return!0},OK=function(r,u,c,d){for(var g=[],b=0;b<u;b++){for(var y=[],k=0;k<u;k++)Math.round(r[b*u+k]*1e3)/1e3>0&&y.push(c[k]);y.length!==0&&g.push(d.collection(y))}return g},AK=function(r,u){for(var c=0;c<r.length;c++)if(!u[c]||r[c].id()!==u[c].id())return!1;return!0},RK=function(r){for(var u=0;u<r.length;u++)for(var c=0;c<r.length;c++)u!=c&&AK(r[u],r[c])&&r.splice(c,1);return r},e7=function(r){for(var u=this.nodes(),c=this.edges(),d=this.cy(),g=LK(r),b={},y=0;y<u.length;y++)b[u[y].id()]=y;for(var k=u.length,E=k*k,C=new Array(E),T,P=0;P<E;P++)C[P]=0;for(var N=0;N<c.length;N++){var D=c[N],H=b[D.source().id()],_=b[D.target().id()],B=PK(D,g.attributes);C[H*k+_]+=B,C[_*k+H]+=B}DK(C,k,g.multFactor),JP(C,k);for(var $=!0,F=0;$&&F<g.maxIterations;)$=!1,T=NK(C,k,g.expandFactor),C=IK(T,k,g.inflateFactor),MK(C,T,E,4)||($=!0),F++;var W=OK(C,k,u,d);return W=RK(W),W},BK={markovClustering:e7,mcl:e7},zK=function(r){return r},t7=function(r,u){return Math.abs(u-r)},n7=function(r,u,c){return r+t7(u,c)},r7=function(r,u,c){return r+Math.pow(c-u,2)},HK=function(r){return Math.sqrt(r)},_K=function(r,u,c){return Math.max(r,t7(u,c))},u1=function(r,u,c,d,g){for(var b=arguments.length>5&&arguments[5]!==void 0?arguments[5]:zK,y=d,k,E,C=0;C<r;C++)k=u(C),E=c(C),y=g(y,k,E);return b(y)},Iv={euclidean:function(r,u,c){return r>=2?u1(r,u,c,0,r7,HK):u1(r,u,c,0,n7)},squaredEuclidean:function(r,u,c){return u1(r,u,c,0,r7)},manhattan:function(r,u,c){return u1(r,u,c,0,n7)},max:function(r,u,c){return u1(r,u,c,-1/0,_K)}};Iv["squared-euclidean"]=Iv.squaredEuclidean,Iv.squaredeuclidean=Iv.squaredEuclidean;function Mw(a,r,u,c,d,g){var b;return Ci(a)?b=a:b=Iv[a]||Iv.euclidean,r===0&&Ci(a)?b(d,g):b(r,u,c,d,g)}var GK=eo({k:2,m:2,sensitivityThreshold:1e-4,distance:"euclidean",maxIterations:10,attributes:[],testMode:!1,testCentroids:null}),U5=function(r){return GK(r)},Ow=function(r,u,c,d,g){var b=g!=="kMedoids",y=b?function(T){return c[T]}:function(T){return d[T](c)},k=function(P){return d[P](u)},E=c,C=u;return Mw(r,d.length,y,k,E,C)},K5=function(r,u,c){for(var d=c.length,g=new Array(d),b=new Array(d),y=new Array(u),k=null,E=0;E<d;E++)g[E]=r.min(c[E]).value,b[E]=r.max(c[E]).value;for(var C=0;C<u;C++){k=[];for(var T=0;T<d;T++)k[T]=Math.random()*(b[T]-g[T])+g[T];y[C]=k}return y},i7=function(r,u,c,d,g){for(var b=1/0,y=0,k=0;k<u.length;k++){var E=Ow(c,r,u[k],d,g);E<b&&(b=E,y=k)}return y},a7=function(r,u,c){for(var d=[],g=null,b=0;b<u.length;b++)g=u[b],c[g.id()]===r&&d.push(g);return d},$K=function(r,u,c){return Math.abs(u-r)<=c},YK=function(r,u,c){for(var d=0;d<r.length;d++)for(var g=0;g<r[d].length;g++){var b=Math.abs(r[d][g]-u[d][g]);if(b>c)return!1}return!0},FK=function(r,u,c){for(var d=0;d<c;d++)if(r===u[d])return!0;return!1},o7=function(r,u){var c=new Array(u);if(r.length<50)for(var d=0;d<u;d++){for(var g=r[Math.floor(Math.random()*r.length)];FK(g,c,d);)g=r[Math.floor(Math.random()*r.length)];c[d]=g}else for(var b=0;b<u;b++)c[b]=r[Math.floor(Math.random()*r.length)];return c},s7=function(r,u,c){for(var d=0,g=0;g<u.length;g++)d+=Ow("manhattan",u[g],r,c,"kMedoids");return d},qK=function(r){var u=this.cy(),c=this.nodes(),d=null,g=U5(r),b=new Array(g.k),y={},k;g.testMode?typeof g.testCentroids=="number"?(g.testCentroids,k=K5(c,g.k,g.attributes)):ma(g.testCentroids)==="object"?k=g.testCentroids:k=K5(c,g.k,g.attributes):k=K5(c,g.k,g.attributes);for(var E=!0,C=0;E&&C<g.maxIterations;){for(var T=0;T<c.length;T++)d=c[T],y[d.id()]=i7(d,k,g.distance,g.attributes,"kMeans");E=!1;for(var P=0;P<g.k;P++){var N=a7(P,c,y);if(N.length!==0){for(var D=g.attributes.length,H=k[P],_=new Array(D),B=new Array(D),$=0;$<D;$++){B[$]=0;for(var F=0;F<N.length;F++)d=N[F],B[$]+=g.attributes[$](d);_[$]=B[$]/N.length,$K(_[$],H[$],g.sensitivityThreshold)||(E=!0)}k[P]=_,b[P]=u.collection(N)}}C++}return b},VK=function(r){var u=this.cy(),c=this.nodes(),d=null,g=U5(r),b=new Array(g.k),y,k={},E,C=new Array(g.k);g.testMode?typeof g.testCentroids=="number"||(ma(g.testCentroids)==="object"?y=g.testCentroids:y=o7(c,g.k)):y=o7(c,g.k);for(var T=!0,P=0;T&&P<g.maxIterations;){for(var N=0;N<c.length;N++)d=c[N],k[d.id()]=i7(d,y,g.distance,g.attributes,"kMedoids");T=!1;for(var D=0;D<y.length;D++){var H=a7(D,c,k);if(H.length!==0){C[D]=s7(y[D],H,g.attributes);for(var _=0;_<H.length;_++)E=s7(H[_],H,g.attributes),E<C[D]&&(C[D]=E,y[D]=H[_],T=!0);b[D]=u.collection(H)}}P++}return b},WK=function(r,u,c,d,g){for(var b,y,k=0;k<u.length;k++)for(var E=0;E<r.length;E++)d[k][E]=Math.pow(c[k][E],g.m);for(var C=0;C<r.length;C++)for(var T=0;T<g.attributes.length;T++){b=0,y=0;for(var P=0;P<u.length;P++)b+=d[P][C]*g.attributes[T](u[P]),y+=d[P][C];r[C][T]=b/y}},UK=function(r,u,c,d,g){for(var b=0;b<r.length;b++)u[b]=r[b].slice();for(var y,k,E,C=2/(g.m-1),T=0;T<c.length;T++)for(var P=0;P<d.length;P++){y=0;for(var N=0;N<c.length;N++)k=Ow(g.distance,d[P],c[T],g.attributes,"cmeans"),E=Ow(g.distance,d[P],c[N],g.attributes,"cmeans"),y+=Math.pow(k/E,C);r[P][T]=1/y}},KK=function(r,u,c,d){for(var g=new Array(c.k),b=0;b<g.length;b++)g[b]=[];for(var y,k,E=0;E<u.length;E++){y=-1/0,k=-1;for(var C=0;C<u[0].length;C++)u[E][C]>y&&(y=u[E][C],k=C);g[k].push(r[E])}for(var T=0;T<g.length;T++)g[T]=d.collection(g[T]);return g},u7=function(r){var u=this.cy(),c=this.nodes(),d=U5(r),g,b,y,k,E;k=new Array(c.length);for(var C=0;C<c.length;C++)k[C]=new Array(d.k);y=new Array(c.length);for(var T=0;T<c.length;T++)y[T]=new Array(d.k);for(var P=0;P<c.length;P++){for(var N=0,D=0;D<d.k;D++)y[P][D]=Math.random(),N+=y[P][D];for(var H=0;H<d.k;H++)y[P][H]=y[P][H]/N}b=new Array(d.k);for(var _=0;_<d.k;_++)b[_]=new Array(d.attributes.length);E=new Array(c.length);for(var B=0;B<c.length;B++)E[B]=new Array(d.k);for(var $=!0,F=0;$&&F<d.maxIterations;)$=!1,WK(b,c,y,E,d),UK(y,k,b,c,d),YK(y,k,d.sensitivityThreshold)||($=!0),F++;return g=KK(c,y,d,u),{clusters:g,degreeOfMembership:y}},ZK={kMeans:qK,kMedoids:VK,fuzzyCMeans:u7,fcm:u7},XK=eo({distance:"euclidean",linkage:"min",mode:"threshold",threshold:1/0,addDendrogram:!1,dendrogramDepth:0,attributes:[]}),QK={single:"min",complete:"max"},JK=function(r){var u=XK(r),c=QK[u.linkage];return c!=null&&(u.linkage=c),u},c7=function(r,u,c,d,g){for(var b=0,y=1/0,k,E=g.attributes,C=function(Z,ae){return Mw(g.distance,E.length,function(oe){return E[oe](Z)},function(oe){return E[oe](ae)},Z,ae)},T=0;T<r.length;T++){var P=r[T].key,N=c[P][d[P]];N<y&&(b=P,y=N)}if(g.mode==="threshold"&&y>=g.threshold||g.mode==="dendrogram"&&r.length===1)return!1;var D=u[b],H=u[d[b]],_;g.mode==="dendrogram"?_={left:D,right:H,key:D.key}:_={value:D.value.concat(H.value),key:D.key},r[D.index]=_,r.splice(H.index,1),u[D.key]=_;for(var B=0;B<r.length;B++){var $=r[B];D.key===$.key?k=1/0:g.linkage==="min"?(k=c[D.key][$.key],c[D.key][$.key]>c[H.key][$.key]&&(k=c[H.key][$.key])):g.linkage==="max"?(k=c[D.key][$.key],c[D.key][$.key]<c[H.key][$.key]&&(k=c[H.key][$.key])):g.linkage==="mean"?k=(c[D.key][$.key]*D.size+c[H.key][$.key]*H.size)/(D.size+H.size):g.mode==="dendrogram"?k=C($.value,D.value):k=C($.value[0],D.value[0]),c[D.key][$.key]=c[$.key][D.key]=k}for(var F=0;F<r.length;F++){var W=r[F].key;if(d[W]===D.key||d[W]===H.key){for(var Q=W,X=0;X<r.length;X++){var K=r[X].key;c[W][K]<c[W][Q]&&(Q=K)}d[W]=Q}r[F].index=F}return D.key=H.key=D.index=H.index=null,!0},Aw=function a(r,u,c){r&&(r.value?u.push(r.value):(r.left&&a(r.left,u),r.right&&a(r.right,u)))},eZ=function a(r,u){if(!r)return"";if(r.left&&r.right){var c=a(r.left,u),d=a(r.right,u),g=u.add({group:"nodes",data:{id:c+","+d}});return u.add({group:"edges",data:{source:c,target:g.id()}}),u.add({group:"edges",data:{source:d,target:g.id()}}),g.id()}else if(r.value)return r.value.id()},tZ=function a(r,u,c){if(!r)return[];var d=[],g=[],b=[];return u===0?(r.left&&Aw(r.left,d),r.right&&Aw(r.right,g),b=d.concat(g),[c.collection(b)]):u===1?r.value?[c.collection(r.value)]:(r.left&&Aw(r.left,d),r.right&&Aw(r.right,g),[c.collection(d),c.collection(g)]):r.value?[c.collection(r.value)]:(r.left&&(d=a(r.left,u-1,c)),r.right&&(g=a(r.right,u-1,c)),d.concat(g))},l7=function(r){for(var u=this.cy(),c=this.nodes(),d=JK(r),g=d.attributes,b=function(F,W){return Mw(d.distance,g.length,function(Q){return g[Q](F)},function(Q){return g[Q](W)},F,W)},y=[],k=[],E=[],C=[],T=0;T<c.length;T++){var P={value:d.mode==="dendrogram"?c[T]:[c[T]],key:T,index:T};y[T]=P,C[T]=P,k[T]=[],E[T]=0}for(var N=0;N<y.length;N++)for(var D=0;D<=N;D++){var H=void 0;d.mode==="dendrogram"?H=N===D?1/0:b(y[N].value,y[D].value):H=N===D?1/0:b(y[N].value[0],y[D].value[0]),k[N][D]=H,k[D][N]=H,H<k[N][E[N]]&&(E[N]=D)}for(var _=c7(y,C,k,E,d);_;)_=c7(y,C,k,E,d);var B;return d.mode==="dendrogram"?(B=tZ(y[0],d.dendrogramDepth,u),d.addDendrogram&&eZ(y[0],u)):(B=new Array(y.length),y.forEach(function($,F){$.key=$.index=null,B[F]=u.collection($.value)})),B},nZ={hierarchicalClustering:l7,hca:l7},rZ=eo({distance:"euclidean",preference:"median",damping:.8,maxIterations:1e3,minIterations:100,attributes:[]}),iZ=function(r){var u=r.damping,c=r.preference;.5<=u&&u<1||Hi("Damping must range on [0.5, 1).  Got: ".concat(u));var d=["median","mean","min","max"];return d.some(function(g){return g===c})||kt(c)||Hi("Preference must be one of [".concat(d.map(function(g){return"'".concat(g,"'")}).join(", "),"] or a number.  Got: ").concat(c)),rZ(r)},aZ=function(r,u,c,d){var g=function(y,k){return d[k](y)};return-Mw(r,d.length,function(b){return g(u,b)},function(b){return g(c,b)},u,c)},oZ=function(r,u){var c=null;return u==="median"?c=iK(r):u==="mean"?c=rK(r):u==="min"?c=tK(r):u==="max"?c=nK(r):c=u,c},sZ=function(r,u,c){for(var d=[],g=0;g<r;g++)u[g*r+g]+c[g*r+g]>0&&d.push(g);return d},f7=function(r,u,c){for(var d=[],g=0;g<r;g++){for(var b=-1,y=-1/0,k=0;k<c.length;k++){var E=c[k];u[g*r+E]>y&&(b=E,y=u[g*r+E])}b>0&&d.push(b)}for(var C=0;C<c.length;C++)d[c[C]]=c[C];return d},uZ=function(r,u,c){for(var d=f7(r,u,c),g=0;g<c.length;g++){for(var b=[],y=0;y<d.length;y++)d[y]===c[g]&&b.push(y);for(var k=-1,E=-1/0,C=0;C<b.length;C++){for(var T=0,P=0;P<b.length;P++)T+=u[b[P]*r+b[C]];T>E&&(k=C,E=T)}c[g]=b[k]}return d=f7(r,u,c),d},h7=function(r){for(var u=this.cy(),c=this.nodes(),d=iZ(r),g={},b=0;b<c.length;b++)g[c[b].id()]=b;var y,k,E,C,T,P;y=c.length,k=y*y,E=new Array(k);for(var N=0;N<k;N++)E[N]=-1/0;for(var D=0;D<y;D++)for(var H=0;H<y;H++)D!==H&&(E[D*y+H]=aZ(d.distance,c[D],c[H],d.attributes));C=oZ(E,d.preference);for(var _=0;_<y;_++)E[_*y+_]=C;T=new Array(k);for(var B=0;B<k;B++)T[B]=0;P=new Array(k);for(var $=0;$<k;$++)P[$]=0;for(var F=new Array(y),W=new Array(y),Q=new Array(y),X=0;X<y;X++)F[X]=0,W[X]=0,Q[X]=0;for(var K=new Array(y*d.minIterations),ee=0;ee<K.length;ee++)K[ee]=0;var Z;for(Z=0;Z<d.maxIterations;Z++){for(var ae=0;ae<y;ae++){for(var oe=-1/0,J=-1/0,fe=-1,se=0,pe=0;pe<y;pe++)F[pe]=T[ae*y+pe],se=P[ae*y+pe]+E[ae*y+pe],se>=oe?(J=oe,oe=se,fe=pe):se>J&&(J=se);for(var he=0;he<y;he++)T[ae*y+he]=(1-d.damping)*(E[ae*y+he]-oe)+d.damping*F[he];T[ae*y+fe]=(1-d.damping)*(E[ae*y+fe]-J)+d.damping*F[fe]}for(var de=0;de<y;de++){for(var ke=0,Pe=0;Pe<y;Pe++)F[Pe]=P[Pe*y+de],W[Pe]=Math.max(0,T[Pe*y+de]),ke+=W[Pe];ke-=W[de],W[de]=T[de*y+de],ke+=W[de];for(var Ae=0;Ae<y;Ae++)P[Ae*y+de]=(1-d.damping)*Math.min(0,ke-W[Ae])+d.damping*F[Ae];P[de*y+de]=(1-d.damping)*(ke-W[de])+d.damping*F[de]}for(var Te=0,Oe=0;Oe<y;Oe++){var ze=P[Oe*y+Oe]+T[Oe*y+Oe]>0?1:0;K[Z%d.minIterations*y+Oe]=ze,Te+=ze}if(Te>0&&(Z>=d.minIterations-1||Z==d.maxIterations-1)){for(var We=0,$e=0;$e<y;$e++){Q[$e]=0;for(var Ge=0;Ge<d.minIterations;Ge++)Q[$e]+=K[Ge*y+$e];(Q[$e]===0||Q[$e]===d.minIterations)&&We++}if(We===y)break}}for(var me=sZ(y,T,P),Ve=uZ(y,E,me),Ke={},at=0;at<me.length;at++)Ke[me[at]]=[];for(var ft=0;ft<c.length;ft++){var tn=g[c[ft].id()],gn=Ve[tn];gn!=null&&Ke[gn].push(c[ft])}for(var mt=new Array(me.length),ht=0;ht<me.length;ht++)mt[ht]=u.collection(Ke[me[ht]]);return mt},cZ={affinityPropagation:h7,ap:h7},lZ=eo({root:void 0,directed:!1}),fZ={hierholzer:function(r){if(!ar(r)){var u=arguments;r={root:u[0],directed:u[1]}}var c=lZ(r),d=c.root,g=c.directed,b=this,y=!1,k,E,C;d&&(C=Yt(d)?this.filter(d)[0].id():d[0].id());var T={},P={};g?b.forEach(function($){var F=$.id();if($.isNode()){var W=$.indegree(!0),Q=$.outdegree(!0),X=W-Q,K=Q-W;X==1?k?y=!0:k=F:K==1?E?y=!0:E=F:(K>1||X>1)&&(y=!0),T[F]=[],$.outgoers().forEach(function(ee){ee.isEdge()&&T[F].push(ee.id())})}else P[F]=[void 0,$.target().id()]}):b.forEach(function($){var F=$.id();if($.isNode()){var W=$.degree(!0);W%2&&(k?E?y=!0:E=F:k=F),T[F]=[],$.connectedEdges().forEach(function(Q){return T[F].push(Q.id())})}else P[F]=[$.source().id(),$.target().id()]});var N={found:!1,trail:void 0};if(y)return N;if(E&&k)if(g){if(C&&E!=C)return N;C=E}else{if(C&&E!=C&&k!=C)return N;C||(C=E)}else C||(C=b[0].id());var D=function(F){for(var W=F,Q=[F],X,K,ee;T[W].length;)X=T[W].shift(),K=P[X][0],ee=P[X][1],W!=ee?(T[ee]=T[ee].filter(function(Z){return Z!=X}),W=ee):!g&&W!=K&&(T[K]=T[K].filter(function(Z){return Z!=X}),W=K),Q.unshift(X),Q.unshift(W);return Q},H=[],_=[];for(_=D(C);_.length!=1;)T[_[0]].length==0?(H.unshift(b.getElementById(_.shift())),H.unshift(b.getElementById(_.shift()))):_=D(_.shift()).concat(_);H.unshift(b.getElementById(_.shift()));for(var B in T)if(T[B].length)return N;return N.found=!0,N.trail=this.spawn(H,!0),N}},Rw=function(){var r=this,u={},c=0,d=0,g=[],b=[],y={},k=function(P,N){for(var D=b.length-1,H=[],_=r.spawn();b[D].x!=P||b[D].y!=N;)H.push(b.pop().edge),D--;H.push(b.pop().edge),H.forEach(function(B){var $=B.connectedNodes().intersection(r);_.merge(B),$.forEach(function(F){var W=F.id(),Q=F.connectedEdges().intersection(r);_.merge(F),u[W].cutVertex?_.merge(Q.filter(function(X){return X.isLoop()})):_.merge(Q)})}),g.push(_)},E=function T(P,N,D){P===D&&(d+=1),u[N]={id:c,low:c++,cutVertex:!1};var H=r.getElementById(N).connectedEdges().intersection(r);if(H.size()===0)g.push(r.spawn(r.getElementById(N)));else{var _,B,$,F;H.forEach(function(W){_=W.source().id(),B=W.target().id(),$=_===N?B:_,$!==D&&(F=W.id(),y[F]||(y[F]=!0,b.push({x:N,y:$,edge:W})),$ in u?u[N].low=Math.min(u[N].low,u[$].id):(T(P,$,N),u[N].low=Math.min(u[N].low,u[$].low),u[N].id<=u[$].low&&(u[N].cutVertex=!0,k(N,$))))})}};r.forEach(function(T){if(T.isNode()){var P=T.id();P in u||(d=0,E(P,P),u[P].cutVertex=d>1)}});var C=Object.keys(u).filter(function(T){return u[T].cutVertex}).map(function(T){return r.getElementById(T)});return{cut:r.spawn(C),components:g}},hZ={hopcroftTarjanBiconnected:Rw,htbc:Rw,htb:Rw,hopcroftTarjanBiconnectedComponents:Rw},Bw=function(){var r=this,u={},c=0,d=[],g=[],b=r.spawn(r),y=function k(E){g.push(E),u[E]={index:c,low:c++,explored:!1};var C=r.getElementById(E).connectedEdges().intersection(r);if(C.forEach(function(H){var _=H.target().id();_!==E&&(_ in u||k(_),u[_].explored||(u[E].low=Math.min(u[E].low,u[_].low)))}),u[E].index===u[E].low){for(var T=r.spawn();;){var P=g.pop();if(T.merge(r.getElementById(P)),u[P].low=u[E].index,u[P].explored=!0,P===E)break}var N=T.edgesWith(T),D=T.merge(N);d.push(D),b=b.difference(D)}};return r.forEach(function(k){if(k.isNode()){var E=k.id();E in u||y(E)}}),{cut:b,components:d}},dZ={tarjanStronglyConnected:Bw,tsc:Bw,tscc:Bw,tarjanStronglyConnectedComponents:Bw},d7={};[r1,YU,FU,VU,UU,ZU,JU,CK,jv,Nv,W5,BK,ZK,nZ,cZ,fZ,hZ,dZ].forEach(function(a){en(d7,a)});/*!
-Embeddable Minimum Strictly-Compliant Promises/A+ 1.1.1 Thenable
-Copyright (c) 2013-2014 Ralf S. Engelschall (http://engelschall.com)
-Licensed under The MIT License (http://opensource.org/licenses/MIT)
-*/var v7=0,g7=1,b7=2,Dl=function a(r){if(!(this instanceof a))return new a(r);this.id="Thenable/1.0.7",this.state=v7,this.fulfillValue=void 0,this.rejectReason=void 0,this.onFulfilled=[],this.onRejected=[],this.proxy={then:this.then.bind(this)},typeof r=="function"&&r.call(this,this.fulfill.bind(this),this.reject.bind(this))};Dl.prototype={fulfill:function(r){return p7(this,g7,"fulfillValue",r)},reject:function(r){return p7(this,b7,"rejectReason",r)},then:function(r,u){var c=this,d=new Dl;return c.onFulfilled.push(y7(r,d,"fulfill")),c.onRejected.push(y7(u,d,"reject")),w7(c),d.proxy}};var p7=function(r,u,c,d){return r.state===v7&&(r.state=u,r[c]=d,w7(r)),r},w7=function(r){r.state===g7?m7(r,"onFulfilled",r.fulfillValue):r.state===b7&&m7(r,"onRejected",r.rejectReason)},m7=function(r,u,c){if(r[u].length!==0){var d=r[u];r[u]=[];var g=function(){for(var y=0;y<d.length;y++)d[y](c)};typeof setImmediate=="function"?setImmediate(g):setTimeout(g,0)}},y7=function(r,u,c){return function(d){if(typeof r!="function")u[c].call(u,d);else{var g;try{g=r(d)}catch(b){u.reject(b);return}vZ(u,g)}}},vZ=function a(r,u){if(r===u||r.proxy===u){r.reject(new TypeError("cannot resolve promise with itself"));return}var c;if(ma(u)==="object"&&u!==null||typeof u=="function")try{c=u.then}catch(g){r.reject(g);return}if(typeof c=="function"){var d=!1;try{c.call(u,function(g){d||(d=!0,g===u?r.reject(new TypeError("circular thenable chain")):a(r,g))},function(g){d||(d=!0,r.reject(g))})}catch(g){d||r.reject(g)}return}r.fulfill(u)};Dl.all=function(a){return new Dl(function(r,u){for(var c=new Array(a.length),d=0,g=function(k,E){c[k]=E,d++,d===a.length&&r(c)},b=0;b<a.length;b++)(function(y){var k=a[y],E=k!=null&&k.then!=null;if(E)k.then(function(T){g(y,T)},function(T){u(T)});else{var C=k;g(y,C)}})(b)})},Dl.resolve=function(a){return new Dl(function(r,u){r(a)})},Dl.reject=function(a){return new Dl(function(r,u){u(a)})};var Mv=typeof Promise<"u"?Promise:Dl,Z5=function(r,u,c){var d=M5(r),g=!d,b=this._private=en({duration:1e3},u,c);if(b.target=r,b.style=b.style||b.css,b.started=!1,b.playing=!1,b.hooked=!1,b.applying=!1,b.progress=0,b.completes=[],b.frames=[],b.complete&&Ci(b.complete)&&b.completes.push(b.complete),g){var y=r.position();b.startPosition=b.startPosition||{x:y.x,y:y.y},b.startStyle=b.startStyle||r.cy().style().getAnimationStartStyle(r,b.style)}if(d){var k=r.pan();b.startPan={x:k.x,y:k.y},b.startZoom=r.zoom()}this.length=1,this[0]=this},Xh=Z5.prototype;en(Xh,{instanceString:function(){return"animation"},hook:function(){var r=this._private;if(!r.hooked){var u,c=r.target._private.animation;r.queue?u=c.queue:u=c.current,u.push(this),Os(r.target)&&r.target.cy().addToAnimationPool(r.target),r.hooked=!0}return this},play:function(){var r=this._private;return r.progress===1&&(r.progress=0),r.playing=!0,r.started=!1,r.stopped=!1,this.hook(),this},playing:function(){return this._private.playing},apply:function(){var r=this._private;return r.applying=!0,r.started=!1,r.stopped=!1,this.hook(),this},applying:function(){return this._private.applying},pause:function(){var r=this._private;return r.playing=!1,r.started=!1,this},stop:function(){var r=this._private;return r.playing=!1,r.started=!1,r.stopped=!0,this},rewind:function(){return this.progress(0)},fastforward:function(){return this.progress(1)},time:function(r){var u=this._private;return r===void 0?u.progress*u.duration:this.progress(r/u.duration)},progress:function(r){var u=this._private,c=u.playing;return r===void 0?u.progress:(c&&this.pause(),u.progress=r,u.started=!1,c&&this.play(),this)},completed:function(){return this._private.progress===1},reverse:function(){var r=this._private,u=r.playing;u&&this.pause(),r.progress=1-r.progress,r.started=!1;var c=function(E,C){var T=r[E];T!=null&&(r[E]=r[C],r[C]=T)};if(c("zoom","startZoom"),c("pan","startPan"),c("position","startPosition"),r.style)for(var d=0;d<r.style.length;d++){var g=r.style[d],b=g.name,y=r.startStyle[b];r.startStyle[b]=g,r.style[d]=y}return u&&this.play(),this},promise:function(r){var u=this._private,c;switch(r){case"frame":c=u.frames;break;default:case"complete":case"completed":c=u.completes}return new Mv(function(d,g){c.push(function(){d()})})}}),Xh.complete=Xh.completed,Xh.run=Xh.play,Xh.running=Xh.playing;var gZ={animated:function(){return function(){var u=this,c=u.length!==void 0,d=c?u:[u],g=this._private.cy||this;if(!g.styleEnabled())return!1;var b=d[0];if(b)return b._private.animation.current.length>0}},clearQueue:function(){return function(){var u=this,c=u.length!==void 0,d=c?u:[u],g=this._private.cy||this;if(!g.styleEnabled())return this;for(var b=0;b<d.length;b++){var y=d[b];y._private.animation.queue=[]}return this}},delay:function(){return function(u,c){var d=this._private.cy||this;return d.styleEnabled()?this.animate({delay:u,duration:u,complete:c}):this}},delayAnimation:function(){return function(u,c){var d=this._private.cy||this;return d.styleEnabled()?this.animation({delay:u,duration:u,complete:c}):this}},animation:function(){return function(u,c){var d=this,g=d.length!==void 0,b=g?d:[d],y=this._private.cy||this,k=!g,E=!k;if(!y.styleEnabled())return this;var C=y.style();u=en({},u,c);var T=Object.keys(u).length===0;if(T)return new Z5(b[0],u);switch(u.duration===void 0&&(u.duration=400),u.duration){case"slow":u.duration=600;break;case"fast":u.duration=200;break}if(E&&(u.style=C.getPropsList(u.style||u.css),u.css=void 0),E&&u.renderedPosition!=null){var P=u.renderedPosition,N=y.pan(),D=y.zoom();u.position=$P(P,D,N)}if(k&&u.panBy!=null){var H=u.panBy,_=y.pan();u.pan={x:_.x+H.x,y:_.y+H.y}}var B=u.center||u.centre;if(k&&B!=null){var $=y.getCenterPan(B.eles,u.zoom);$!=null&&(u.pan=$)}if(k&&u.fit!=null){var F=u.fit,W=y.getFitViewport(F.eles||F.boundingBox,F.padding);W!=null&&(u.pan=W.pan,u.zoom=W.zoom)}if(k&&ar(u.zoom)){var Q=y.getZoomedViewport(u.zoom);Q!=null?(Q.zoomed&&(u.zoom=Q.zoom),Q.panned&&(u.pan=Q.pan)):u.zoom=null}return new Z5(b[0],u)}},animate:function(){return function(u,c){var d=this,g=d.length!==void 0,b=g?d:[d],y=this._private.cy||this;if(!y.styleEnabled())return this;c&&(u=en({},u,c));for(var k=0;k<b.length;k++){var E=b[k],C=E.animated()&&(u.queue===void 0||u.queue),T=E.animation(u,C?{queue:!0}:void 0);T.play()}return this}},stop:function(){return function(u,c){var d=this,g=d.length!==void 0,b=g?d:[d],y=this._private.cy||this;if(!y.styleEnabled())return this;for(var k=0;k<b.length;k++){for(var E=b[k],C=E._private,T=C.animation.current,P=0;P<T.length;P++){var N=T[P],D=N._private;c&&(D.duration=0)}u&&(C.animation.queue=[]),c||(C.animation.current=[])}return y.notify("draw"),this}}},bZ={data:function(r){var u={field:"data",bindingEvent:"data",allowBinding:!1,allowSetting:!1,allowGetting:!1,settingEvent:"data",settingTriggersEvent:!1,triggerFnName:"trigger",immutableKeys:{},updateStyle:!1,beforeGet:function(d){},beforeSet:function(d,g){},onSet:function(d){},canSet:function(d){return!0}};return r=en({},u,r),function(d,g){var b=r,y=this,k=y.length!==void 0,E=k?y:[y],C=k?y[0]:y;if(Yt(d)){var T=d.indexOf(".")!==-1,P=T&&tU.default(d);if(b.allowGetting&&g===void 0){var N;return C&&(b.beforeGet(C),P&&C._private[b.field][d]===void 0?N=JW.default(C._private[b.field],P):N=C._private[b.field][d]),N}else if(b.allowSetting&&g!==void 0){var D=!b.immutableKeys[d];if(D){var H=yP({},d,g);b.beforeSet(y,H);for(var _=0,B=E.length;_<B;_++){var $=E[_];b.canSet($)&&(P&&C._private[b.field][d]===void 0?eU.default($._private[b.field],P,g):$._private[b.field][d]=g)}b.updateStyle&&y.updateStyle(),b.onSet(y),b.settingTriggersEvent&&y[b.triggerFnName](b.settingEvent)}}}else if(b.allowSetting&&ar(d)){var F=d,W,Q,X=Object.keys(F);b.beforeSet(y,F);for(var K=0;K<X.length;K++){W=X[K],Q=F[W];var ee=!b.immutableKeys[W];if(ee)for(var Z=0;Z<E.length;Z++){var ae=E[Z];b.canSet(ae)&&(ae._private[b.field][W]=Q)}}b.updateStyle&&y.updateStyle(),b.onSet(y),b.settingTriggersEvent&&y[b.triggerFnName](b.settingEvent)}else if(b.allowBinding&&Ci(d)){var oe=d;y.on(b.bindingEvent,oe)}else if(b.allowGetting&&d===void 0){var J;return C&&(b.beforeGet(C),J=C._private[b.field]),J}return y}},removeData:function(r){var u={field:"data",event:"data",triggerFnName:"trigger",triggerEvent:!1,immutableKeys:{}};return r=en({},u,r),function(d){var g=r,b=this,y=b.length!==void 0,k=y?b:[b];if(Yt(d)){for(var E=d.split(/\s+/),C=E.length,T=0;T<C;T++){var P=E[T];if(!Lf(P)){var N=!g.immutableKeys[P];if(N)for(var D=0,H=k.length;D<H;D++)k[D]._private[g.field][P]=void 0}}g.triggerEvent&&b[g.triggerFnName](g.event)}else if(d===void 0){for(var _=0,B=k.length;_<B;_++)for(var $=k[_]._private[g.field],F=Object.keys($),W=0;W<F.length;W++){var Q=F[W],X=!g.immutableKeys[Q];X&&($[Q]=void 0)}g.triggerEvent&&b[g.triggerFnName](g.event)}return b}}},pZ={eventAliasesOn:function(r){var u=r;u.addListener=u.listen=u.bind=u.on,u.unlisten=u.unbind=u.off=u.removeListener,u.trigger=u.emit,u.pon=u.promiseOn=function(c,d){var g=this,b=Array.prototype.slice.call(arguments,0);return new Mv(function(y,k){var E=function(N){g.off.apply(g,T),y(N)},C=b.concat([E]),T=C.concat([]);g.on.apply(g,C)})}}},Cr={};[gZ,bZ,pZ].forEach(function(a){en(Cr,a)});var wZ={animate:Cr.animate(),animation:Cr.animation(),animated:Cr.animated(),clearQueue:Cr.clearQueue(),delay:Cr.delay(),delayAnimation:Cr.delayAnimation(),stop:Cr.stop()},zw={classes:function(r){var u=this;if(r===void 0){var c=[];return u[0]._private.classes.forEach(function(D){return c.push(D)}),c}else Wr(r)||(r=(r||"").match(/\S+/g)||[]);for(var d=[],g=new Tv(r),b=0;b<u.length;b++){for(var y=u[b],k=y._private,E=k.classes,C=!1,T=0;T<r.length;T++){var P=r[T],N=E.has(P);if(!N){C=!0;break}}C||(C=E.size!==r.length),C&&(k.classes=g,d.push(y))}return d.length>0&&this.spawn(d).updateStyle().emit("class"),u},addClass:function(r){return this.toggleClass(r,!0)},hasClass:function(r){var u=this[0];return u!=null&&u._private.classes.has(r)},toggleClass:function(r,u){Wr(r)||(r=r.match(/\S+/g)||[]);for(var c=this,d=u===void 0,g=[],b=0,y=c.length;b<y;b++)for(var k=c[b],E=k._private.classes,C=!1,T=0;T<r.length;T++){var P=r[T],N=E.has(P),D=!1;u||d&&!N?(E.add(P),D=!0):(!u||d&&N)&&(E.delete(P),D=!0),!C&&D&&(g.push(k),C=!0)}return g.length>0&&this.spawn(g).updateStyle().emit("class"),c},removeClass:function(r){return this.toggleClass(r,!1)},flashClass:function(r,u){var c=this;if(u==null)u=250;else if(u===0)return c;return c.addClass(r),setTimeout(function(){c.removeClass(r)},u),c}};zw.className=zw.classNames=zw.classes;var or={metaChar:"[\\!\\\"\\#\\$\\%\\&\\'\\(\\)\\*\\+\\,\\.\\/\\:\\;\\<\\=\\>\\?\\@\\[\\]\\^\\`\\{\\|\\}\\~]",comparatorOp:"=|\\!=|>|>=|<|<=|\\$=|\\^=|\\*=",boolOp:"\\?|\\!|\\^",string:`"(?:\\\\"|[^"])*"|'(?:\\\\'|[^'])*'`,number:ka,meta:"degree|indegree|outdegree",separator:"\\s*,\\s*",descendant:"\\s+",child:"\\s+>\\s+",subject:"\\$",group:"node|edge|\\*",directedEdge:"\\s+->\\s+",undirectedEdge:"\\s+<->\\s+"};or.variable="(?:[\\w-.]|(?:\\\\"+or.metaChar+"))+",or.className="(?:[\\w-]|(?:\\\\"+or.metaChar+"))+",or.value=or.string+"|"+or.number,or.id=or.variable,function(){var a,r,u;for(a=or.comparatorOp.split("|"),u=0;u<a.length;u++)r=a[u],or.comparatorOp+="|@"+r;for(a=or.comparatorOp.split("|"),u=0;u<a.length;u++)r=a[u],!(r.indexOf("!")>=0)&&r!=="="&&(or.comparatorOp+="|\\!"+r)}();var $r=function(){return{checks:[]}},jt={GROUP:0,COLLECTION:1,FILTER:2,DATA_COMPARE:3,DATA_EXIST:4,DATA_BOOL:5,META_COMPARE:6,STATE:7,ID:8,CLASS:9,UNDIRECTED_EDGE:10,DIRECTED_EDGE:11,NODE_SOURCE:12,NODE_TARGET:13,NODE_NEIGHBOR:14,CHILD:15,DESCENDANT:16,PARENT:17,ANCESTOR:18,COMPOUND_SPLIT:19,TRUE:20},X5=[{selector:":selected",matches:function(r){return r.selected()}},{selector:":unselected",matches:function(r){return!r.selected()}},{selector:":selectable",matches:function(r){return r.selectable()}},{selector:":unselectable",matches:function(r){return!r.selectable()}},{selector:":locked",matches:function(r){return r.locked()}},{selector:":unlocked",matches:function(r){return!r.locked()}},{selector:":visible",matches:function(r){return r.visible()}},{selector:":hidden",matches:function(r){return!r.visible()}},{selector:":transparent",matches:function(r){return r.transparent()}},{selector:":grabbed",matches:function(r){return r.grabbed()}},{selector:":free",matches:function(r){return!r.grabbed()}},{selector:":removed",matches:function(r){return r.removed()}},{selector:":inside",matches:function(r){return!r.removed()}},{selector:":grabbable",matches:function(r){return r.grabbable()}},{selector:":ungrabbable",matches:function(r){return!r.grabbable()}},{selector:":animated",matches:function(r){return r.animated()}},{selector:":unanimated",matches:function(r){return!r.animated()}},{selector:":parent",matches:function(r){return r.isParent()}},{selector:":childless",matches:function(r){return r.isChildless()}},{selector:":child",matches:function(r){return r.isChild()}},{selector:":orphan",matches:function(r){return r.isOrphan()}},{selector:":nonorphan",matches:function(r){return r.isChild()}},{selector:":compound",matches:function(r){return r.isNode()?r.isParent():r.source().isParent()||r.target().isParent()}},{selector:":loop",matches:function(r){return r.isLoop()}},{selector:":simple",matches:function(r){return r.isSimple()}},{selector:":active",matches:function(r){return r.active()}},{selector:":inactive",matches:function(r){return!r.active()}},{selector:":backgrounding",matches:function(r){return r.backgrounding()}},{selector:":nonbackgrounding",matches:function(r){return!r.backgrounding()}}].sort(function(a,r){return EU(a.selector,r.selector)}),mZ=function(){for(var a={},r,u=0;u<X5.length;u++)r=X5[u],a[r.selector]=r.matches;return a}(),yZ=function(r,u){return mZ[r](u)},kZ="("+X5.map(function(a){return a.selector}).join("|")+")",Ov=function(r){return r.replace(new RegExp("\\\\("+or.metaChar+")","g"),function(u,c){return c})},If=function(r,u,c){r[r.length-1]=c},Q5=[{name:"group",query:!0,regex:"("+or.group+")",populate:function(r,u,c){var d=Mu(c,1),g=d[0];u.checks.push({type:jt.GROUP,value:g==="*"?g:g+"s"})}},{name:"state",query:!0,regex:kZ,populate:function(r,u,c){var d=Mu(c,1),g=d[0];u.checks.push({type:jt.STATE,value:g})}},{name:"id",query:!0,regex:"\\#("+or.id+")",populate:function(r,u,c){var d=Mu(c,1),g=d[0];u.checks.push({type:jt.ID,value:Ov(g)})}},{name:"className",query:!0,regex:"\\.("+or.className+")",populate:function(r,u,c){var d=Mu(c,1),g=d[0];u.checks.push({type:jt.CLASS,value:Ov(g)})}},{name:"dataExists",query:!0,regex:"\\[\\s*("+or.variable+")\\s*\\]",populate:function(r,u,c){var d=Mu(c,1),g=d[0];u.checks.push({type:jt.DATA_EXIST,field:Ov(g)})}},{name:"dataCompare",query:!0,regex:"\\[\\s*("+or.variable+")\\s*("+or.comparatorOp+")\\s*("+or.value+")\\s*\\]",populate:function(r,u,c){var d=Mu(c,3),g=d[0],b=d[1],y=d[2],k=new RegExp("^"+or.string+"$").exec(y)!=null;k?y=y.substring(1,y.length-1):y=parseFloat(y),u.checks.push({type:jt.DATA_COMPARE,field:Ov(g),operator:b,value:y})}},{name:"dataBool",query:!0,regex:"\\[\\s*("+or.boolOp+")\\s*("+or.variable+")\\s*\\]",populate:function(r,u,c){var d=Mu(c,2),g=d[0],b=d[1];u.checks.push({type:jt.DATA_BOOL,field:Ov(b),operator:g})}},{name:"metaCompare",query:!0,regex:"\\[\\[\\s*("+or.meta+")\\s*("+or.comparatorOp+")\\s*("+or.number+")\\s*\\]\\]",populate:function(r,u,c){var d=Mu(c,3),g=d[0],b=d[1],y=d[2];u.checks.push({type:jt.META_COMPARE,field:Ov(g),operator:b,value:parseFloat(y)})}},{name:"nextQuery",separator:!0,regex:or.separator,populate:function(r,u){var c=r.currentSubject,d=r.edgeCount,g=r.compoundCount,b=r[r.length-1];c!=null&&(b.subject=c,r.currentSubject=null),b.edgeCount=d,b.compoundCount=g,r.edgeCount=0,r.compoundCount=0;var y=r[r.length++]=$r();return y}},{name:"directedEdge",separator:!0,regex:or.directedEdge,populate:function(r,u){if(r.currentSubject==null){var c=$r(),d=u,g=$r();return c.checks.push({type:jt.DIRECTED_EDGE,source:d,target:g}),If(r,u,c),r.edgeCount++,g}else{var b=$r(),y=u,k=$r();return b.checks.push({type:jt.NODE_SOURCE,source:y,target:k}),If(r,u,b),r.edgeCount++,k}}},{name:"undirectedEdge",separator:!0,regex:or.undirectedEdge,populate:function(r,u){if(r.currentSubject==null){var c=$r(),d=u,g=$r();return c.checks.push({type:jt.UNDIRECTED_EDGE,nodes:[d,g]}),If(r,u,c),r.edgeCount++,g}else{var b=$r(),y=u,k=$r();return b.checks.push({type:jt.NODE_NEIGHBOR,node:y,neighbor:k}),If(r,u,b),k}}},{name:"child",separator:!0,regex:or.child,populate:function(r,u){if(r.currentSubject==null){var c=$r(),d=$r(),g=r[r.length-1];return c.checks.push({type:jt.CHILD,parent:g,child:d}),If(r,u,c),r.compoundCount++,d}else if(r.currentSubject===u){var b=$r(),y=r[r.length-1],k=$r(),E=$r(),C=$r(),T=$r();return b.checks.push({type:jt.COMPOUND_SPLIT,left:y,right:k,subject:E}),E.checks=u.checks,u.checks=[{type:jt.TRUE}],T.checks.push({type:jt.TRUE}),k.checks.push({type:jt.PARENT,parent:T,child:C}),If(r,y,b),r.currentSubject=E,r.compoundCount++,C}else{var P=$r(),N=$r(),D=[{type:jt.PARENT,parent:P,child:N}];return P.checks=u.checks,u.checks=D,r.compoundCount++,N}}},{name:"descendant",separator:!0,regex:or.descendant,populate:function(r,u){if(r.currentSubject==null){var c=$r(),d=$r(),g=r[r.length-1];return c.checks.push({type:jt.DESCENDANT,ancestor:g,descendant:d}),If(r,u,c),r.compoundCount++,d}else if(r.currentSubject===u){var b=$r(),y=r[r.length-1],k=$r(),E=$r(),C=$r(),T=$r();return b.checks.push({type:jt.COMPOUND_SPLIT,left:y,right:k,subject:E}),E.checks=u.checks,u.checks=[{type:jt.TRUE}],T.checks.push({type:jt.TRUE}),k.checks.push({type:jt.ANCESTOR,ancestor:T,descendant:C}),If(r,y,b),r.currentSubject=E,r.compoundCount++,C}else{var P=$r(),N=$r(),D=[{type:jt.ANCESTOR,ancestor:P,descendant:N}];return P.checks=u.checks,u.checks=D,r.compoundCount++,N}}},{name:"subject",modifier:!0,regex:or.subject,populate:function(r,u){if(r.currentSubject!=null&&r.currentSubject!==u)return pr("Redefinition of subject in selector `"+r.toString()+"`"),!1;r.currentSubject=u;var c=r[r.length-1],d=c.checks[0],g=d==null?null:d.type;g===jt.DIRECTED_EDGE?d.type=jt.NODE_TARGET:g===jt.UNDIRECTED_EDGE&&(d.type=jt.NODE_NEIGHBOR,d.node=d.nodes[1],d.neighbor=d.nodes[0],d.nodes=null)}}];Q5.forEach(function(a){return a.regexObj=new RegExp("^"+a.regex)});var EZ=function(r){for(var u,c,d,g=0;g<Q5.length;g++){var b=Q5[g],y=b.name,k=r.match(b.regexObj);if(k!=null){c=k,u=b,d=y;var E=k[0];r=r.substring(E.length);break}}return{expr:u,match:c,name:d,remaining:r}},SZ=function(r){var u=r.match(/^\s+/);if(u){var c=u[0];r=r.substring(c.length)}return r},CZ=function(r){var u=this,c=u.inputText=r,d=u[0]=$r();for(u.length=1,c=SZ(c);;){var g=EZ(c);if(g.expr==null)return pr("The selector `"+r+"`is invalid"),!1;var b=g.match.slice(1),y=g.expr.populate(u,d,b);if(y===!1)return!1;if(y!=null&&(d=y),c=g.remaining,c.match(/^\s*$/))break}var k=u[u.length-1];u.currentSubject!=null&&(k.subject=u.currentSubject),k.edgeCount=u.edgeCount,k.compoundCount=u.compoundCount;for(var E=0;E<u.length;E++){var C=u[E];if(C.compoundCount>0&&C.edgeCount>0)return pr("The selector `"+r+"` is invalid because it uses both a compound selector and an edge selector"),!1;if(C.edgeCount>1)return pr("The selector `"+r+"` is invalid because it uses multiple edge selectors"),!1;C.edgeCount===1&&pr("The selector `"+r+"` is deprecated.  Edge selectors do not take effect on changes to source and target nodes after an edge is added, for performance reasons.  Use a class or data selector on edges instead, updating the class or data of an edge when your app detects a change in source or target nodes.")}return!0},xZ=function(){if(this.toStringCache!=null)return this.toStringCache;for(var r=function(C){return C??""},u=function(C){return Yt(C)?'"'+C+'"':r(C)},c=function(C){return" "+C+" "},d=function(C,T){var P=C.type,N=C.value;switch(P){case jt.GROUP:{var D=r(N);return D.substring(0,D.length-1)}case jt.DATA_COMPARE:{var H=C.field,_=C.operator;return"["+H+c(r(_))+u(N)+"]"}case jt.DATA_BOOL:{var B=C.operator,$=C.field;return"["+r(B)+$+"]"}case jt.DATA_EXIST:{var F=C.field;return"["+F+"]"}case jt.META_COMPARE:{var W=C.operator,Q=C.field;return"[["+Q+c(r(W))+u(N)+"]]"}case jt.STATE:return N;case jt.ID:return"#"+N;case jt.CLASS:return"."+N;case jt.PARENT:case jt.CHILD:return g(C.parent,T)+c(">")+g(C.child,T);case jt.ANCESTOR:case jt.DESCENDANT:return g(C.ancestor,T)+" "+g(C.descendant,T);case jt.COMPOUND_SPLIT:{var X=g(C.left,T),K=g(C.subject,T),ee=g(C.right,T);return X+(X.length>0?" ":"")+K+ee}case jt.TRUE:return""}},g=function(C,T){return C.checks.reduce(function(P,N,D){return P+(T===C&&D===0?"$":"")+d(N,T)},"")},b="",y=0;y<this.length;y++){var k=this[y];b+=g(k,k.subject),this.length>1&&y<this.length-1&&(b+=", ")}return this.toStringCache=b,b},TZ={parse:CZ,toString:xZ},k7=function(r,u,c){var d,g=Yt(r),b=kt(r),y=Yt(c),k,E,C=!1,T=!1,P=!1;switch(u.indexOf("!")>=0&&(u=u.replace("!",""),T=!0),u.indexOf("@")>=0&&(u=u.replace("@",""),C=!0),(g||y||C)&&(k=!g&&!b?"":""+r,E=""+c),C&&(r=k=k.toLowerCase(),c=E=E.toLowerCase()),u){case"*=":d=k.indexOf(E)>=0;break;case"$=":d=k.indexOf(E,k.length-E.length)>=0;break;case"^=":d=k.indexOf(E)===0;break;case"=":d=r===c;break;case">":P=!0,d=r>c;break;case">=":P=!0,d=r>=c;break;case"<":P=!0,d=r<c;break;case"<=":P=!0,d=r<=c;break;default:d=!1;break}return T&&(r!=null||!P)&&(d=!d),d},LZ=function(r,u){switch(u){case"?":return!!r;case"!":return!r;case"^":return r===void 0}},PZ=function(r){return r!==void 0},J5=function(r,u){return r.data(u)},DZ=function(r,u){return r[u]()},_i=[],ui=function(r,u){return r.checks.every(function(c){return _i[c.type](c,u)})};_i[jt.GROUP]=function(a,r){var u=a.value;return u==="*"||u===r.group()},_i[jt.STATE]=function(a,r){var u=a.value;return yZ(u,r)},_i[jt.ID]=function(a,r){var u=a.value;return r.id()===u},_i[jt.CLASS]=function(a,r){var u=a.value;return r.hasClass(u)},_i[jt.META_COMPARE]=function(a,r){var u=a.field,c=a.operator,d=a.value;return k7(DZ(r,u),c,d)},_i[jt.DATA_COMPARE]=function(a,r){var u=a.field,c=a.operator,d=a.value;return k7(J5(r,u),c,d)},_i[jt.DATA_BOOL]=function(a,r){var u=a.field,c=a.operator;return LZ(J5(r,u),c)},_i[jt.DATA_EXIST]=function(a,r){var u=a.field;return a.operator,PZ(J5(r,u))},_i[jt.UNDIRECTED_EDGE]=function(a,r){var u=a.nodes[0],c=a.nodes[1],d=r.source(),g=r.target();return ui(u,d)&&ui(c,g)||ui(c,d)&&ui(u,g)},_i[jt.NODE_NEIGHBOR]=function(a,r){return ui(a.node,r)&&r.neighborhood().some(function(u){return u.isNode()&&ui(a.neighbor,u)})},_i[jt.DIRECTED_EDGE]=function(a,r){return ui(a.source,r.source())&&ui(a.target,r.target())},_i[jt.NODE_SOURCE]=function(a,r){return ui(a.source,r)&&r.outgoers().some(function(u){return u.isNode()&&ui(a.target,u)})},_i[jt.NODE_TARGET]=function(a,r){return ui(a.target,r)&&r.incomers().some(function(u){return u.isNode()&&ui(a.source,u)})},_i[jt.CHILD]=function(a,r){return ui(a.child,r)&&ui(a.parent,r.parent())},_i[jt.PARENT]=function(a,r){return ui(a.parent,r)&&r.children().some(function(u){return ui(a.child,u)})},_i[jt.DESCENDANT]=function(a,r){return ui(a.descendant,r)&&r.ancestors().some(function(u){return ui(a.ancestor,u)})},_i[jt.ANCESTOR]=function(a,r){return ui(a.ancestor,r)&&r.descendants().some(function(u){return ui(a.descendant,u)})},_i[jt.COMPOUND_SPLIT]=function(a,r){return ui(a.subject,r)&&ui(a.left,r)&&ui(a.right,r)},_i[jt.TRUE]=function(){return!0},_i[jt.COLLECTION]=function(a,r){var u=a.value;return u.has(r)},_i[jt.FILTER]=function(a,r){var u=a.value;return u(r)};var jZ=function(r){var u=this;if(u.length===1&&u[0].checks.length===1&&u[0].checks[0].type===jt.ID)return r.getElementById(u[0].checks[0].value).collection();var c=function(g){for(var b=0;b<u.length;b++){var y=u[b];if(ui(y,g))return!0}return!1};return u.text()==null&&(c=function(){return!0}),r.filter(c)},NZ=function(r){for(var u=this,c=0;c<u.length;c++){var d=u[c];if(ui(d,r))return!0}return!1},IZ={matches:NZ,filter:jZ},Mf=function(r){this.inputText=r,this.currentSubject=null,this.compoundCount=0,this.edgeCount=0,this.length=0,r==null||Yt(r)&&r.match(/^\s*$/)||(Os(r)?this.addQuery({checks:[{type:jt.COLLECTION,value:r.collection()}]}):Ci(r)?this.addQuery({checks:[{type:jt.FILTER,value:r}]}):Yt(r)?this.parse(r)||(this.invalid=!0):Hi("A selector must be created from a string; found "))},Of=Mf.prototype;[TZ,IZ].forEach(function(a){return en(Of,a)}),Of.text=function(){return this.inputText},Of.size=function(){return this.length},Of.eq=function(a){return this[a]},Of.sameText=function(a){return!this.invalid&&!a.invalid&&this.text()===a.text()},Of.addQuery=function(a){this[this.length++]=a},Of.selector=Of.toString;var Af={allAre:function(r){var u=new Mf(r);return this.every(function(c){return u.matches(c)})},is:function(r){var u=new Mf(r);return this.some(function(c){return u.matches(c)})},some:function(r,u){for(var c=0;c<this.length;c++){var d=u?r.apply(u,[this[c],c,this]):r(this[c],c,this);if(d)return!0}return!1},every:function(r,u){for(var c=0;c<this.length;c++){var d=u?r.apply(u,[this[c],c,this]):r(this[c],c,this);if(!d)return!1}return!0},same:function(r){if(this===r)return!0;r=this.cy().collection(r);var u=this.length,c=r.length;return u!==c?!1:u===1?this[0]===r[0]:this.every(function(d){return r.hasElementWithId(d.id())})},anySame:function(r){return r=this.cy().collection(r),this.some(function(u){return r.hasElementWithId(u.id())})},allAreNeighbors:function(r){r=this.cy().collection(r);var u=this.neighborhood();return r.every(function(c){return u.hasElementWithId(c.id())})},contains:function(r){r=this.cy().collection(r);var u=this;return r.every(function(c){return u.hasElementWithId(c.id())})}};Af.allAreNeighbours=Af.allAreNeighbors,Af.has=Af.contains,Af.equal=Af.equals=Af.same;var ru=function(r,u){return function(d,g,b,y){var k=d,E=this,C;if(k==null?C="":Os(k)&&k.length===1&&(C=k.id()),E.length===1&&C){var T=E[0]._private,P=T.traversalCache=T.traversalCache||{},N=P[u]=P[u]||[],D=Wh(C),H=N[D];return H||(N[D]=r.call(E,d,g,b,y))}else return r.call(E,d,g,b,y)}},Av={parent:function(r){var u=[];if(this.length===1){var c=this[0]._private.parent;if(c)return c}for(var d=0;d<this.length;d++){var g=this[d],b=g._private.parent;b&&u.push(b)}return this.spawn(u,!0).filter(r)},parents:function(r){for(var u=[],c=this.parent();c.nonempty();){for(var d=0;d<c.length;d++){var g=c[d];u.push(g)}c=c.parent()}return this.spawn(u,!0).filter(r)},commonAncestors:function(r){for(var u,c=0;c<this.length;c++){var d=this[c],g=d.parents();u=u||g,u=u.intersect(g)}return u.filter(r)},orphans:function(r){return this.stdFilter(function(u){return u.isOrphan()}).filter(r)},nonorphans:function(r){return this.stdFilter(function(u){return u.isChild()}).filter(r)},children:ru(function(a){for(var r=[],u=0;u<this.length;u++)for(var c=this[u],d=c._private.children,g=0;g<d.length;g++)r.push(d[g]);return this.spawn(r,!0).filter(a)},"children"),siblings:function(r){return this.parent().children().not(this).filter(r)},isParent:function(){var r=this[0];if(r)return r.isNode()&&r._private.children.length!==0},isChildless:function(){var r=this[0];if(r)return r.isNode()&&r._private.children.length===0},isChild:function(){var r=this[0];if(r)return r.isNode()&&r._private.parent!=null},isOrphan:function(){var r=this[0];if(r)return r.isNode()&&r._private.parent==null},descendants:function(r){var u=[];function c(d){for(var g=0;g<d.length;g++){var b=d[g];u.push(b),b.children().nonempty()&&c(b.children())}}return c(this.children()),this.spawn(u,!0).filter(r)}};function eS(a,r,u,c){for(var d=[],g=new Tv,b=a.cy(),y=b.hasCompoundNodes(),k=0;k<a.length;k++){var E=a[k];u?d.push(E):y&&c(d,g,E)}for(;d.length>0;){var C=d.shift();r(C),g.add(C.id()),y&&c(d,g,C)}return a}function E7(a,r,u){if(u.isParent())for(var c=u._private.children,d=0;d<c.length;d++){var g=c[d];r.has(g.id())||a.push(g)}}Av.forEachDown=function(a){var r=arguments.length>1&&arguments[1]!==void 0?arguments[1]:!0;return eS(this,a,r,E7)};function S7(a,r,u){if(u.isChild()){var c=u._private.parent;r.has(c.id())||a.push(c)}}Av.forEachUp=function(a){var r=arguments.length>1&&arguments[1]!==void 0?arguments[1]:!0;return eS(this,a,r,S7)};function MZ(a,r,u){S7(a,r,u),E7(a,r,u)}Av.forEachUpAndDown=function(a){var r=arguments.length>1&&arguments[1]!==void 0?arguments[1]:!0;return eS(this,a,r,MZ)},Av.ancestors=Av.parents;var c1,C7;c1=C7={data:Cr.data({field:"data",bindingEvent:"data",allowBinding:!0,allowSetting:!0,settingEvent:"data",settingTriggersEvent:!0,triggerFnName:"trigger",allowGetting:!0,immutableKeys:{id:!0,source:!0,target:!0,parent:!0},updateStyle:!0}),removeData:Cr.removeData({field:"data",event:"data",triggerFnName:"trigger",triggerEvent:!0,immutableKeys:{id:!0,source:!0,target:!0,parent:!0},updateStyle:!0}),scratch:Cr.data({field:"scratch",bindingEvent:"scratch",allowBinding:!0,allowSetting:!0,settingEvent:"scratch",settingTriggersEvent:!0,triggerFnName:"trigger",allowGetting:!0,updateStyle:!0}),removeScratch:Cr.removeData({field:"scratch",event:"scratch",triggerFnName:"trigger",triggerEvent:!0,updateStyle:!0}),rscratch:Cr.data({field:"rscratch",allowBinding:!1,allowSetting:!0,settingTriggersEvent:!1,allowGetting:!0}),removeRscratch:Cr.removeData({field:"rscratch",triggerEvent:!1}),id:function(){var r=this[0];if(r)return r._private.data.id}},c1.attr=c1.data,c1.removeAttr=c1.removeData;var OZ=C7,Hw={};function tS(a){return function(r){var u=this;if(r===void 0&&(r=!0),u.length!==0)if(u.isNode()&&!u.removed()){for(var c=0,d=u[0],g=d._private.edges,b=0;b<g.length;b++){var y=g[b];!r&&y.isLoop()||(c+=a(d,y))}return c}else return}}en(Hw,{degree:tS(function(a,r){return r.source().same(r.target())?2:1}),indegree:tS(function(a,r){return r.target().same(a)?1:0}),outdegree:tS(function(a,r){return r.source().same(a)?1:0})});function Rv(a,r){return function(u){for(var c,d=this.nodes(),g=0;g<d.length;g++){var b=d[g],y=b[a](u);y!==void 0&&(c===void 0||r(y,c))&&(c=y)}return c}}en(Hw,{minDegree:Rv("degree",function(a,r){return a<r}),maxDegree:Rv("degree",function(a,r){return a>r}),minIndegree:Rv("indegree",function(a,r){return a<r}),maxIndegree:Rv("indegree",function(a,r){return a>r}),minOutdegree:Rv("outdegree",function(a,r){return a<r}),maxOutdegree:Rv("outdegree",function(a,r){return a>r})}),en(Hw,{totalDegree:function(r){for(var u=0,c=this.nodes(),d=0;d<c.length;d++)u+=c[d].degree(r);return u}});var Au,x7,T7=function(r,u,c){for(var d=0;d<r.length;d++){var g=r[d];if(!g.locked()){var b=g._private.position,y={x:u.x!=null?u.x-b.x:0,y:u.y!=null?u.y-b.y:0};g.isParent()&&!(y.x===0&&y.y===0)&&g.children().shift(y,c),g.dirtyBoundingBoxCache()}}},L7={field:"position",bindingEvent:"position",allowBinding:!0,allowSetting:!0,settingEvent:"position",settingTriggersEvent:!0,triggerFnName:"emitAndNotify",allowGetting:!0,validKeys:["x","y"],beforeGet:function(r){r.updateCompoundBounds()},beforeSet:function(r,u){T7(r,u,!1)},onSet:function(r){r.dirtyCompoundBoundsCache()},canSet:function(r){return!r.locked()}};Au=x7={position:Cr.data(L7),silentPosition:Cr.data(en({},L7,{allowBinding:!1,allowSetting:!0,settingTriggersEvent:!1,allowGetting:!1,beforeSet:function(r,u){T7(r,u,!0)},onSet:function(r){r.dirtyCompoundBoundsCache()}})),positions:function(r,u){if(ar(r))u?this.silentPosition(r):this.position(r);else if(Ci(r)){var c=r,d=this.cy();d.startBatch();for(var g=0;g<this.length;g++){var b=this[g],y=void 0;(y=c(b,g))&&(u?b.silentPosition(y):b.position(y))}d.endBatch()}return this},silentPositions:function(r){return this.positions(r,!0)},shift:function(r,u,c){var d;if(ar(r)?(d={x:kt(r.x)?r.x:0,y:kt(r.y)?r.y:0},c=u):Yt(r)&&kt(u)&&(d={x:0,y:0},d[r]=u),d!=null){var g=this.cy();g.startBatch();for(var b=0;b<this.length;b++){var y=this[b];if(!(g.hasCompoundNodes()&&y.isChild()&&y.ancestors().anySame(this))){var k=y.position(),E={x:k.x+d.x,y:k.y+d.y};c?y.silentPosition(E):y.position(E)}}g.endBatch()}return this},silentShift:function(r,u){return ar(r)?this.shift(r,!0):Yt(r)&&kt(u)&&this.shift(r,u,!0),this},renderedPosition:function(r,u){var c=this[0],d=this.cy(),g=d.zoom(),b=d.pan(),y=ar(r)?r:void 0,k=y!==void 0||u!==void 0&&Yt(r);if(c&&c.isNode())if(k)for(var E=0;E<this.length;E++){var C=this[E];u!==void 0?C.position(r,(u-b[r])/g):y!==void 0&&C.position($P(y,g,b))}else{var T=c.position();return y=Dw(T,g,b),r===void 0?y:y[r]}else if(!k)return;return this},relativePosition:function(r,u){var c=this[0],d=this.cy(),g=ar(r)?r:void 0,b=g!==void 0||u!==void 0&&Yt(r),y=d.hasCompoundNodes();if(c&&c.isNode())if(b)for(var k=0;k<this.length;k++){var E=this[k],C=y?E.parent():null,T=C&&C.length>0,P=T;T&&(C=C[0]);var N=P?C.position():{x:0,y:0};u!==void 0?E.position(r,u+N[r]):g!==void 0&&E.position({x:g.x+N.x,y:g.y+N.y})}else{var D=c.position(),H=y?c.parent():null,_=H&&H.length>0,B=_;_&&(H=H[0]);var $=B?H.position():{x:0,y:0};return g={x:D.x-$.x,y:D.y-$.y},r===void 0?g:g[r]}else if(!b)return;return this}},Au.modelPosition=Au.point=Au.position,Au.modelPositions=Au.points=Au.positions,Au.renderedPoint=Au.renderedPosition,Au.relativePoint=Au.relativePosition;var AZ=x7,Bv,Rf;Bv=Rf={},Rf.renderedBoundingBox=function(a){var r=this.boundingBox(a),u=this.cy(),c=u.zoom(),d=u.pan(),g=r.x1*c+d.x,b=r.x2*c+d.x,y=r.y1*c+d.y,k=r.y2*c+d.y;return{x1:g,x2:b,y1:y,y2:k,w:b-g,h:k-y}},Rf.dirtyCompoundBoundsCache=function(){var a=arguments.length>0&&arguments[0]!==void 0?arguments[0]:!1,r=this.cy();return!r.styleEnabled()||!r.hasCompoundNodes()?this:(this.forEachUp(function(u){if(u.isParent()){var c=u._private;c.compoundBoundsClean=!1,c.bbCache=null,a||u.emitAndNotify("bounds")}}),this)},Rf.updateCompoundBounds=function(){var a=arguments.length>0&&arguments[0]!==void 0?arguments[0]:!1,r=this.cy();if(!r.styleEnabled()||!r.hasCompoundNodes())return this;if(!a&&r.batching())return this;function u(b){if(!b.isParent())return;var y=b._private,k=b.children(),E=b.pstyle("compound-sizing-wrt-labels").value==="include",C={width:{val:b.pstyle("min-width").pfValue,left:b.pstyle("min-width-bias-left"),right:b.pstyle("min-width-bias-right")},height:{val:b.pstyle("min-height").pfValue,top:b.pstyle("min-height-bias-top"),bottom:b.pstyle("min-height-bias-bottom")}},T=k.boundingBox({includeLabels:E,includeOverlays:!1,useCache:!1}),P=y.position;(T.w===0||T.h===0)&&(T={w:b.pstyle("width").pfValue,h:b.pstyle("height").pfValue},T.x1=P.x-T.w/2,T.x2=P.x+T.w/2,T.y1=P.y-T.h/2,T.y2=P.y+T.h/2);function N(Z,ae,oe){var J=0,fe=0,se=ae+oe;return Z>0&&se>0&&(J=ae/se*Z,fe=oe/se*Z),{biasDiff:J,biasComplementDiff:fe}}function D(Z,ae,oe,J){if(oe.units==="%")switch(J){case"width":return Z>0?oe.pfValue*Z:0;case"height":return ae>0?oe.pfValue*ae:0;case"average":return Z>0&&ae>0?oe.pfValue*(Z+ae)/2:0;case"min":return Z>0&&ae>0?Z>ae?oe.pfValue*ae:oe.pfValue*Z:0;case"max":return Z>0&&ae>0?Z>ae?oe.pfValue*Z:oe.pfValue*ae:0;default:return 0}else return oe.units==="px"?oe.pfValue:0}var H=C.width.left.value;C.width.left.units==="px"&&C.width.val>0&&(H=H*100/C.width.val);var _=C.width.right.value;C.width.right.units==="px"&&C.width.val>0&&(_=_*100/C.width.val);var B=C.height.top.value;C.height.top.units==="px"&&C.height.val>0&&(B=B*100/C.height.val);var $=C.height.bottom.value;C.height.bottom.units==="px"&&C.height.val>0&&($=$*100/C.height.val);var F=N(C.width.val-T.w,H,_),W=F.biasDiff,Q=F.biasComplementDiff,X=N(C.height.val-T.h,B,$),K=X.biasDiff,ee=X.biasComplementDiff;y.autoPadding=D(T.w,T.h,b.pstyle("padding"),b.pstyle("padding-relative-to").value),y.autoWidth=Math.max(T.w,C.width.val),P.x=(-W+T.x1+T.x2+Q)/2,y.autoHeight=Math.max(T.h,C.height.val),P.y=(-K+T.y1+T.y2+ee)/2}for(var c=0;c<this.length;c++){var d=this[c],g=d._private;(!g.compoundBoundsClean||a)&&(u(d),r.batching()||(g.compoundBoundsClean=!0))}return this};var iu=function(r){return r===1/0||r===-1/0?0:r},Ru=function(r,u,c,d,g){d-u===0||g-c===0||u==null||c==null||d==null||g==null||(r.x1=u<r.x1?u:r.x1,r.x2=d>r.x2?d:r.x2,r.y1=c<r.y1?c:r.y1,r.y2=g>r.y2?g:r.y2,r.w=r.x2-r.x1,r.h=r.y2-r.y1)},Qh=function(r,u){return u==null?r:Ru(r,u.x1,u.y1,u.x2,u.y2)},l1=function(r,u,c){return Ou(r,u,c)},_w=function(r,u,c){if(!u.cy().headless()){var d=u._private,g=d.rstyle,b=g.arrowWidth/2,y=u.pstyle(c+"-arrow-shape").value,k,E;if(y!=="none"){c==="source"?(k=g.srcX,E=g.srcY):c==="target"?(k=g.tgtX,E=g.tgtY):(k=g.midX,E=g.midY);var C=d.arrowBounds=d.arrowBounds||{},T=C[c]=C[c]||{};T.x1=k-b,T.y1=E-b,T.x2=k+b,T.y2=E+b,T.w=T.x2-T.x1,T.h=T.y2-T.y1,Nw(T,1),Ru(r,T.x1,T.y1,T.x2,T.y2)}}},nS=function(r,u,c){if(!u.cy().headless()){var d;c?d=c+"-":d="";var g=u._private,b=g.rstyle,y=u.pstyle(d+"label").strValue;if(y){var k=u.pstyle("text-halign"),E=u.pstyle("text-valign"),C=l1(b,"labelWidth",c),T=l1(b,"labelHeight",c),P=l1(b,"labelX",c),N=l1(b,"labelY",c),D=u.pstyle(d+"text-margin-x").pfValue,H=u.pstyle(d+"text-margin-y").pfValue,_=u.isEdge(),B=u.pstyle(d+"text-rotation"),$=u.pstyle("text-outline-width").pfValue,F=u.pstyle("text-border-width").pfValue,W=F/2,Q=u.pstyle("text-background-padding").pfValue,X=2,K=T,ee=C,Z=ee/2,ae=K/2,oe,J,fe,se;if(_)oe=P-Z,J=P+Z,fe=N-ae,se=N+ae;else{switch(k.value){case"left":oe=P-ee,J=P;break;case"center":oe=P-Z,J=P+Z;break;case"right":oe=P,J=P+ee;break}switch(E.value){case"top":fe=N-K,se=N;break;case"center":fe=N-ae,se=N+ae;break;case"bottom":fe=N,se=N+K;break}}oe+=D-Math.max($,W)-Q-X,J+=D+Math.max($,W)+Q+X,fe+=H-Math.max($,W)-Q-X,se+=H+Math.max($,W)+Q+X;var pe=c||"main",he=g.labelBounds,de=he[pe]=he[pe]||{};de.x1=oe,de.y1=fe,de.x2=J,de.y2=se,de.w=J-oe,de.h=se-fe;var ke=_&&B.strValue==="autorotate",Pe=B.pfValue!=null&&B.pfValue!==0;if(ke||Pe){var Ae=ke?l1(g.rstyle,"labelAngle",c):B.pfValue,Te=Math.cos(Ae),Oe=Math.sin(Ae),ze=(oe+J)/2,We=(fe+se)/2;if(!_){switch(k.value){case"left":ze=J;break;case"right":ze=oe;break}switch(E.value){case"top":We=se;break;case"bottom":We=fe;break}}var $e=function(gn,mt){return gn=gn-ze,mt=mt-We,{x:gn*Te-mt*Oe+ze,y:gn*Oe+mt*Te+We}},Ge=$e(oe,fe),me=$e(oe,se),Ve=$e(J,fe),Ke=$e(J,se);oe=Math.min(Ge.x,me.x,Ve.x,Ke.x),J=Math.max(Ge.x,me.x,Ve.x,Ke.x),fe=Math.min(Ge.y,me.y,Ve.y,Ke.y),se=Math.max(Ge.y,me.y,Ve.y,Ke.y)}var at=pe+"Rot",ft=he[at]=he[at]||{};ft.x1=oe,ft.y1=fe,ft.x2=J,ft.y2=se,ft.w=J-oe,ft.h=se-fe,Ru(r,oe,fe,J,se),Ru(g.labelBounds.all,oe,fe,J,se)}return r}},RZ=function(r,u){var c=r._private.cy,d=c.styleEnabled(),g=c.headless(),b=cs(),y=r._private,k=r.isNode(),E=r.isEdge(),C,T,P,N,D,H,_=y.rstyle,B=k&&d?r.pstyle("bounds-expansion").pfValue:[0],$=function(Rt){return Rt.pstyle("display").value!=="none"},F=!d||$(r)&&(!E||$(r.source())&&$(r.target()));if(F){var W=0,Q=0;d&&u.includeOverlays&&(W=r.pstyle("overlay-opacity").value,W!==0&&(Q=r.pstyle("overlay-padding").value));var X=0,K=0;d&&u.includeUnderlays&&(X=r.pstyle("underlay-opacity").value,X!==0&&(K=r.pstyle("underlay-padding").value));var ee=Math.max(Q,K),Z=0,ae=0;if(d&&(Z=r.pstyle("width").pfValue,ae=Z/2),k&&u.includeNodes){var oe=r.position();D=oe.x,H=oe.y;var J=r.outerWidth(),fe=J/2,se=r.outerHeight(),pe=se/2;C=D-fe,T=D+fe,P=H-pe,N=H+pe,Ru(b,C,P,T,N)}else if(E&&u.includeEdges)if(d&&!g){var he=r.pstyle("curve-style").strValue;if(C=Math.min(_.srcX,_.midX,_.tgtX),T=Math.max(_.srcX,_.midX,_.tgtX),P=Math.min(_.srcY,_.midY,_.tgtY),N=Math.max(_.srcY,_.midY,_.tgtY),C-=ae,T+=ae,P-=ae,N+=ae,Ru(b,C,P,T,N),he==="haystack"){var de=_.haystackPts;if(de&&de.length===2){if(C=de[0].x,P=de[0].y,T=de[1].x,N=de[1].y,C>T){var ke=C;C=T,T=ke}if(P>N){var Pe=P;P=N,N=Pe}Ru(b,C-ae,P-ae,T+ae,N+ae)}}else if(he==="bezier"||he==="unbundled-bezier"||he==="segments"||he==="taxi"){var Ae;switch(he){case"bezier":case"unbundled-bezier":Ae=_.bezierPts;break;case"segments":case"taxi":Ae=_.linePts;break}if(Ae!=null)for(var Te=0;Te<Ae.length;Te++){var Oe=Ae[Te];C=Oe.x-ae,T=Oe.x+ae,P=Oe.y-ae,N=Oe.y+ae,Ru(b,C,P,T,N)}}}else{var ze=r.source(),We=ze.position(),$e=r.target(),Ge=$e.position();if(C=We.x,T=Ge.x,P=We.y,N=Ge.y,C>T){var me=C;C=T,T=me}if(P>N){var Ve=P;P=N,N=Ve}C-=ae,T+=ae,P-=ae,N+=ae,Ru(b,C,P,T,N)}if(d&&u.includeEdges&&E&&(_w(b,r,"mid-source"),_w(b,r,"mid-target"),_w(b,r,"source"),_w(b,r,"target")),d){var Ke=r.pstyle("ghost").value==="yes";if(Ke){var at=r.pstyle("ghost-offset-x").pfValue,ft=r.pstyle("ghost-offset-y").pfValue;Ru(b,b.x1+at,b.y1+ft,b.x2+at,b.y2+ft)}}var tn=y.bodyBounds=y.bodyBounds||{};FP(tn,b),G5(tn,B),Nw(tn,1),d&&(C=b.x1,T=b.x2,P=b.y1,N=b.y2,Ru(b,C-ee,P-ee,T+ee,N+ee));var gn=y.overlayBounds=y.overlayBounds||{};FP(gn,b),G5(gn,B),Nw(gn,1);var mt=y.labelBounds=y.labelBounds||{};mt.all!=null?cK(mt.all):mt.all=cs(),d&&u.includeLabels&&(u.includeMainLabels&&nS(b,r,null),E&&(u.includeSourceLabels&&nS(b,r,"source"),u.includeTargetLabels&&nS(b,r,"target")))}return b.x1=iu(b.x1),b.y1=iu(b.y1),b.x2=iu(b.x2),b.y2=iu(b.y2),b.w=iu(b.x2-b.x1),b.h=iu(b.y2-b.y1),b.w>0&&b.h>0&&F&&(G5(b,B),Nw(b,1)),b},P7=function(r){var u=0,c=function(b){return(b?1:0)<<u++},d=0;return d+=c(r.incudeNodes),d+=c(r.includeEdges),d+=c(r.includeLabels),d+=c(r.includeMainLabels),d+=c(r.includeSourceLabels),d+=c(r.includeTargetLabels),d+=c(r.includeOverlays),d},D7=function(r){if(r.isEdge()){var u=r.source().position(),c=r.target().position(),d=function(b){return Math.round(b)};return NU([d(u.x),d(u.y),d(c.x),d(c.y)])}else return 0},j7=function(r,u){var c=r._private,d,g=r.isEdge(),b=u==null?N7:P7(u),y=b===N7,k=D7(r),E=c.bbCachePosKey===k,C=u.useCache&&E,T=function(H){return H._private.bbCache==null||H._private.styleDirty},P=!C||T(r)||g&&T(r.source())||T(r.target());if(P?(E||r.recalculateRenderedStyle(C),d=RZ(r,f1),c.bbCache=d,c.bbCachePosKey=k):d=c.bbCache,!y){var N=r.isNode();d=cs(),(u.includeNodes&&N||u.includeEdges&&!N)&&(u.includeOverlays?Qh(d,c.overlayBounds):Qh(d,c.bodyBounds)),u.includeLabels&&(u.includeMainLabels&&(!g||u.includeSourceLabels&&u.includeTargetLabels)?Qh(d,c.labelBounds.all):(u.includeMainLabels&&Qh(d,c.labelBounds.mainRot),u.includeSourceLabels&&Qh(d,c.labelBounds.sourceRot),u.includeTargetLabels&&Qh(d,c.labelBounds.targetRot))),d.w=d.x2-d.x1,d.h=d.y2-d.y1}return d},f1={includeNodes:!0,includeEdges:!0,includeLabels:!0,includeMainLabels:!0,includeSourceLabels:!0,includeTargetLabels:!0,includeOverlays:!0,includeUnderlays:!0,useCache:!0},N7=P7(f1),I7=eo(f1);Rf.boundingBox=function(a){var r;if(this.length===1&&this[0]._private.bbCache!=null&&!this[0]._private.styleDirty&&(a===void 0||a.useCache===void 0||a.useCache===!0))a===void 0?a=f1:a=I7(a),r=j7(this[0],a);else{r=cs(),a=a||f1;var u=I7(a),c=this,d=c.cy(),g=d.styleEnabled();if(g)for(var b=0;b<c.length;b++){var y=c[b],k=y._private,E=D7(y),C=k.bbCachePosKey===E,T=u.useCache&&C&&!k.styleDirty;y.recalculateRenderedStyle(T)}this.updateCompoundBounds(!a.useCache);for(var P=0;P<c.length;P++){var N=c[P];Qh(r,j7(N,u))}}return r.x1=iu(r.x1),r.y1=iu(r.y1),r.x2=iu(r.x2),r.y2=iu(r.y2),r.w=iu(r.x2-r.x1),r.h=iu(r.y2-r.y1),r},Rf.dirtyBoundingBoxCache=function(){for(var a=0;a<this.length;a++){var r=this[a]._private;r.bbCache=null,r.bbCachePosKey=null,r.bodyBounds=null,r.overlayBounds=null,r.labelBounds.all=null,r.labelBounds.source=null,r.labelBounds.target=null,r.labelBounds.main=null,r.labelBounds.sourceRot=null,r.labelBounds.targetRot=null,r.labelBounds.mainRot=null,r.arrowBounds.source=null,r.arrowBounds.target=null,r.arrowBounds["mid-source"]=null,r.arrowBounds["mid-target"]=null}return this.emitAndNotify("bounds"),this},Rf.boundingBoxAt=function(a){var r=this.nodes(),u=this.cy(),c=u.hasCompoundNodes(),d=u.collection();if(c&&(d=r.filter(function(E){return E.isParent()}),r=r.not(d)),ar(a)){var g=a;a=function(){return g}}var b=function(C,T){return C._private.bbAtOldPos=a(C,T)},y=function(C){return C._private.bbAtOldPos};u.startBatch(),r.forEach(b).silentPositions(a),c&&(d.dirtyCompoundBoundsCache(),d.dirtyBoundingBoxCache(),d.updateCompoundBounds(!0));var k=uK(this.boundingBox({useCache:!1}));return r.silentPositions(y),c&&(d.dirtyCompoundBoundsCache(),d.dirtyBoundingBoxCache(),d.updateCompoundBounds(!0)),u.endBatch(),k},Bv.boundingbox=Bv.bb=Bv.boundingBox,Bv.renderedBoundingbox=Bv.renderedBoundingBox;var BZ=Rf,h1,d1;h1=d1={};var M7=function(r){r.uppercaseName=LP(r.name),r.autoName="auto"+r.uppercaseName,r.labelName="label"+r.uppercaseName,r.outerName="outer"+r.uppercaseName,r.uppercaseOuterName=LP(r.outerName),h1[r.name]=function(){var c=this[0],d=c._private,g=d.cy,b=g._private.styleEnabled;if(c)if(b){if(c.isParent())return c.updateCompoundBounds(),d[r.autoName]||0;var y=c.pstyle(r.name);switch(y.strValue){case"label":return c.recalculateRenderedStyle(),d.rstyle[r.labelName]||0;default:return y.pfValue}}else return 1},h1["outer"+r.uppercaseName]=function(){var c=this[0],d=c._private,g=d.cy,b=g._private.styleEnabled;if(c)if(b){var y=c[r.name](),k=c.pstyle("border-width").pfValue,E=2*c.padding();return y+k+E}else return 1},h1["rendered"+r.uppercaseName]=function(){var c=this[0];if(c){var d=c[r.name]();return d*this.cy().zoom()}},h1["rendered"+r.uppercaseOuterName]=function(){var c=this[0];if(c){var d=c[r.outerName]();return d*this.cy().zoom()}}};M7({name:"width"}),M7({name:"height"}),d1.padding=function(){var a=this[0],r=a._private;return a.isParent()?(a.updateCompoundBounds(),r.autoPadding!==void 0?r.autoPadding:a.pstyle("padding").pfValue):a.pstyle("padding").pfValue},d1.paddedHeight=function(){var a=this[0];return a.height()+2*a.padding()},d1.paddedWidth=function(){var a=this[0];return a.width()+2*a.padding()};var zZ=d1,HZ=function(r,u){if(r.isEdge())return u(r)},_Z=function(r,u){if(r.isEdge()){var c=r.cy();return Dw(u(r),c.zoom(),c.pan())}},GZ=function(r,u){if(r.isEdge()){var c=r.cy(),d=c.pan(),g=c.zoom();return u(r).map(function(b){return Dw(b,g,d)})}},$Z=function(r){return r.renderer().getControlPoints(r)},YZ=function(r){return r.renderer().getSegmentPoints(r)},FZ=function(r){return r.renderer().getSourceEndpoint(r)},qZ=function(r){return r.renderer().getTargetEndpoint(r)},VZ=function(r){return r.renderer().getEdgeMidpoint(r)},O7={controlPoints:{get:$Z,mult:!0},segmentPoints:{get:YZ,mult:!0},sourceEndpoint:{get:FZ},targetEndpoint:{get:qZ},midpoint:{get:VZ}},WZ=function(r){return"rendered"+r[0].toUpperCase()+r.substr(1)},UZ=Object.keys(O7).reduce(function(a,r){var u=O7[r],c=WZ(r);return a[r]=function(){return HZ(this,u.get)},u.mult?a[c]=function(){return GZ(this,u.get)}:a[c]=function(){return _Z(this,u.get)},a},{}),KZ=en({},AZ,BZ,zZ,UZ);/*!
-	Event object based on jQuery events, MIT license
-
-	https://jquery.org/license/
-	https://tldrlegal.com/license/mit-license
-	https://github.com/jquery/jquery/blob/master/src/event.js
-	*/var A7=function(r,u){this.recycle(r,u)};function v1(){return!1}function Gw(){return!0}A7.prototype={instanceString:function(){return"event"},recycle:function(r,u){if(this.isImmediatePropagationStopped=this.isPropagationStopped=this.isDefaultPrevented=v1,r!=null&&r.preventDefault?(this.type=r.type,this.isDefaultPrevented=r.defaultPrevented?Gw:v1):r!=null&&r.type?u=r:this.type=r,u!=null&&(this.originalEvent=u.originalEvent,this.type=u.type!=null?u.type:this.type,this.cy=u.cy,this.target=u.target,this.position=u.position,this.renderedPosition=u.renderedPosition,this.namespace=u.namespace,this.layout=u.layout),this.cy!=null&&this.position!=null&&this.renderedPosition==null){var c=this.position,d=this.cy.zoom(),g=this.cy.pan();this.renderedPosition={x:c.x*d+g.x,y:c.y*d+g.y}}this.timeStamp=r&&r.timeStamp||Date.now()},preventDefault:function(){this.isDefaultPrevented=Gw;var r=this.originalEvent;r&&r.preventDefault&&r.preventDefault()},stopPropagation:function(){this.isPropagationStopped=Gw;var r=this.originalEvent;r&&r.stopPropagation&&r.stopPropagation()},stopImmediatePropagation:function(){this.isImmediatePropagationStopped=Gw,this.stopPropagation()},isDefaultPrevented:v1,isPropagationStopped:v1,isImmediatePropagationStopped:v1};var R7=/^([^.]+)(\.(?:[^.]+))?$/,ZZ=".*",B7={qualifierCompare:function(r,u){return r===u},eventMatches:function(){return!0},addEventFields:function(){},callbackContext:function(r){return r},beforeEmit:function(){},afterEmit:function(){},bubble:function(){return!1},parent:function(){return null},context:null},z7=Object.keys(B7),XZ={};function $w(){for(var a=arguments.length>0&&arguments[0]!==void 0?arguments[0]:XZ,r=arguments.length>1?arguments[1]:void 0,u=0;u<z7.length;u++){var c=z7[u];this[c]=a[c]||B7[c]}this.context=r||this.context,this.listeners=[],this.emitting=0}var Bf=$w.prototype,H7=function(r,u,c,d,g,b,y){Ci(d)&&(g=d,d=null),y&&(b==null?b=y:b=en({},b,y));for(var k=Wr(c)?c:c.split(/\s+/),E=0;E<k.length;E++){var C=k[E];if(!Lf(C)){var T=C.match(R7);if(T){var P=T[1],N=T[2]?T[2]:null,D=u(r,C,P,N,d,g,b);if(D===!1)break}}}},_7=function(r,u){return r.addEventFields(r.context,u),new A7(u.type,u)},QZ=function(r,u,c){if(fU(c)){u(r,c);return}else if(ar(c)){u(r,_7(r,c));return}for(var d=Wr(c)?c:c.split(/\s+/),g=0;g<d.length;g++){var b=d[g];if(!Lf(b)){var y=b.match(R7);if(y){var k=y[1],E=y[2]?y[2]:null,C=_7(r,{type:k,namespace:E,target:r.context});u(r,C)}}}};Bf.on=Bf.addListener=function(a,r,u,c,d){return H7(this,function(g,b,y,k,E,C,T){Ci(C)&&g.listeners.push({event:b,callback:C,type:y,namespace:k,qualifier:E,conf:T})},a,r,u,c,d),this},Bf.one=function(a,r,u,c){return this.on(a,r,u,c,{one:!0})},Bf.removeListener=Bf.off=function(a,r,u,c){var d=this;this.emitting!==0&&(this.listeners=RU(this.listeners));for(var g=this.listeners,b=function(E){var C=g[E];H7(d,function(T,P,N,D,H,_){if((C.type===N||a==="*")&&(!D&&C.namespace!==".*"||C.namespace===D)&&(!H||T.qualifierCompare(C.qualifier,H))&&(!_||C.callback===_))return g.splice(E,1),!1},a,r,u,c)},y=g.length-1;y>=0;y--)b(y);return this},Bf.removeAllListeners=function(){return this.removeListener("*")},Bf.emit=Bf.trigger=function(a,r,u){var c=this.listeners,d=c.length;return this.emitting++,Wr(r)||(r=[r]),QZ(this,function(g,b){u!=null&&(c=[{event:b.event,type:b.type,namespace:b.namespace,callback:u}],d=c.length);for(var y=function(C){var T=c[C];if(T.type===b.type&&(!T.namespace||T.namespace===b.namespace||T.namespace===ZZ)&&g.eventMatches(g.context,T,b)){var P=[b];r!=null&&zU(P,r),g.beforeEmit(g.context,T,b),T.conf&&T.conf.one&&(g.listeners=g.listeners.filter(function(H){return H!==T}));var N=g.callbackContext(g.context,T,b),D=T.callback.apply(N,P);g.afterEmit(g.context,T,b),D===!1&&(b.stopPropagation(),b.preventDefault())}},k=0;k<d;k++)y(k);g.bubble(g.context)&&!b.isPropagationStopped()&&g.parent(g.context).emit(b,r)},a),this.emitting--,this};var JZ={qualifierCompare:function(r,u){return r==null||u==null?r==null&&u==null:r.sameText(u)},eventMatches:function(r,u,c){var d=u.qualifier;return d!=null?r!==c.target&&Qb(c.target)&&d.matches(c.target):!0},addEventFields:function(r,u){u.cy=r.cy(),u.target=r},callbackContext:function(r,u,c){return u.qualifier!=null?c.target:r},beforeEmit:function(r,u){u.conf&&u.conf.once&&u.conf.onceCollection.removeListener(u.event,u.qualifier,u.callback)},bubble:function(){return!0},parent:function(r){return r.isChild()?r.parent():r.cy()}},Yw=function(r){return Yt(r)?new Mf(r):r},G7={createEmitter:function(){for(var r=0;r<this.length;r++){var u=this[r],c=u._private;c.emitter||(c.emitter=new $w(JZ,u))}return this},emitter:function(){return this._private.emitter},on:function(r,u,c){for(var d=Yw(u),g=0;g<this.length;g++){var b=this[g];b.emitter().on(r,d,c)}return this},removeListener:function(r,u,c){for(var d=Yw(u),g=0;g<this.length;g++){var b=this[g];b.emitter().removeListener(r,d,c)}return this},removeAllListeners:function(){for(var r=0;r<this.length;r++){var u=this[r];u.emitter().removeAllListeners()}return this},one:function(r,u,c){for(var d=Yw(u),g=0;g<this.length;g++){var b=this[g];b.emitter().one(r,d,c)}return this},once:function(r,u,c){for(var d=Yw(u),g=0;g<this.length;g++){var b=this[g];b.emitter().on(r,d,c,{once:!0,onceCollection:this})}},emit:function(r,u){for(var c=0;c<this.length;c++){var d=this[c];d.emitter().emit(r,u)}return this},emitAndNotify:function(r,u){if(this.length!==0)return this.cy().notify(r,this),this.emit(r,u),this}};Cr.eventAliasesOn(G7);var $7={nodes:function(r){return this.filter(function(u){return u.isNode()}).filter(r)},edges:function(r){return this.filter(function(u){return u.isEdge()}).filter(r)},byGroup:function(){for(var r=this.spawn(),u=this.spawn(),c=0;c<this.length;c++){var d=this[c];d.isNode()?r.push(d):u.push(d)}return{nodes:r,edges:u}},filter:function(r,u){if(r===void 0)return this;if(Yt(r)||Os(r))return new Mf(r).filter(this);if(Ci(r)){for(var c=this.spawn(),d=this,g=0;g<d.length;g++){var b=d[g],y=u?r.apply(u,[b,g,d]):r(b,g,d);y&&c.push(b)}return c}return this.spawn()},not:function(r){if(r){Yt(r)&&(r=this.filter(r));for(var u=this.spawn(),c=0;c<this.length;c++){var d=this[c],g=r.has(d);g||u.push(d)}return u}else return this},absoluteComplement:function(){var r=this.cy();return r.mutableElements().not(this)},intersect:function(r){if(Yt(r)){var u=r;return this.filter(u)}for(var c=this.spawn(),d=this,g=r,b=this.length<r.length,y=b?d:g,k=b?g:d,E=0;E<y.length;E++){var C=y[E];k.has(C)&&c.push(C)}return c},xor:function(r){var u=this._private.cy;Yt(r)&&(r=u.$(r));var c=this.spawn(),d=this,g=r,b=function(k,E){for(var C=0;C<k.length;C++){var T=k[C],P=T._private.data.id,N=E.hasElementWithId(P);N||c.push(T)}};return b(d,g),b(g,d),c},diff:function(r){var u=this._private.cy;Yt(r)&&(r=u.$(r));var c=this.spawn(),d=this.spawn(),g=this.spawn(),b=this,y=r,k=function(C,T,P){for(var N=0;N<C.length;N++){var D=C[N],H=D._private.data.id,_=T.hasElementWithId(H);_?g.merge(D):P.push(D)}};return k(b,y,c),k(y,b,d),{left:c,right:d,both:g}},add:function(r){var u=this._private.cy;if(!r)return this;if(Yt(r)){var c=r;r=u.mutableElements().filter(c)}for(var d=this.spawnSelf(),g=0;g<r.length;g++){var b=r[g],y=!this.has(b);y&&d.push(b)}return d},merge:function(r){var u=this._private,c=u.cy;if(!r)return this;if(r&&Yt(r)){var d=r;r=c.mutableElements().filter(d)}for(var g=u.map,b=0;b<r.length;b++){var y=r[b],k=y._private.data.id,E=!g.has(k);if(E){var C=this.length++;this[C]=y,g.set(k,{ele:y,index:C})}}return this},unmergeAt:function(r){var u=this[r],c=u.id(),d=this._private,g=d.map;this[r]=void 0,g.delete(c);var b=r===this.length-1;if(this.length>1&&!b){var y=this.length-1,k=this[y],E=k._private.data.id;this[y]=void 0,this[r]=k,g.set(E,{ele:k,index:r})}return this.length--,this},unmergeOne:function(r){r=r[0];var u=this._private,c=r._private.data.id,d=u.map,g=d.get(c);if(!g)return this;var b=g.index;return this.unmergeAt(b),this},unmerge:function(r){var u=this._private.cy;if(!r)return this;if(r&&Yt(r)){var c=r;r=u.mutableElements().filter(c)}for(var d=0;d<r.length;d++)this.unmergeOne(r[d]);return this},unmergeBy:function(r){for(var u=this.length-1;u>=0;u--){var c=this[u];r(c)&&this.unmergeAt(u)}return this},map:function(r,u){for(var c=[],d=this,g=0;g<d.length;g++){var b=d[g],y=u?r.apply(u,[b,g,d]):r(b,g,d);c.push(y)}return c},reduce:function(r,u){for(var c=u,d=this,g=0;g<d.length;g++)c=r(c,d[g],g,d);return c},max:function(r,u){for(var c=-1/0,d,g=this,b=0;b<g.length;b++){var y=g[b],k=u?r.apply(u,[y,b,g]):r(y,b,g);k>c&&(c=k,d=y)}return{value:c,ele:d}},min:function(r,u){for(var c=1/0,d,g=this,b=0;b<g.length;b++){var y=g[b],k=u?r.apply(u,[y,b,g]):r(y,b,g);k<c&&(c=k,d=y)}return{value:c,ele:d}}},hr=$7;hr.u=hr["|"]=hr["+"]=hr.union=hr.or=hr.add,hr["\\"]=hr["!"]=hr["-"]=hr.difference=hr.relativeComplement=hr.subtract=hr.not,hr.n=hr["&"]=hr["."]=hr.and=hr.intersection=hr.intersect,hr["^"]=hr["(+)"]=hr["(-)"]=hr.symmetricDifference=hr.symdiff=hr.xor,hr.fnFilter=hr.filterFn=hr.stdFilter=hr.filter,hr.complement=hr.abscomp=hr.absoluteComplement;var eX={isNode:function(){return this.group()==="nodes"},isEdge:function(){return this.group()==="edges"},isLoop:function(){return this.isEdge()&&this.source()[0]===this.target()[0]},isSimple:function(){return this.isEdge()&&this.source()[0]!==this.target()[0]},group:function(){var r=this[0];if(r)return r._private.group}},Y7=function(r,u){var c=r.cy(),d=c.hasCompoundNodes();function g(C){var T=C.pstyle("z-compound-depth");return T.value==="auto"?d?C.zDepth():0:T.value==="bottom"?-1:T.value==="top"?R5:0}var b=g(r)-g(u);if(b!==0)return b;function y(C){var T=C.pstyle("z-index-compare");return T.value==="auto"&&C.isNode()?1:0}var k=y(r)-y(u);if(k!==0)return k;var E=r.pstyle("z-index").value-u.pstyle("z-index").value;return E!==0?E:r.poolIndex()-u.poolIndex()},Fw={forEach:function(r,u){if(Ci(r))for(var c=this.length,d=0;d<c;d++){var g=this[d],b=u?r.apply(u,[g,d,this]):r(g,d,this);if(b===!1)break}return this},toArray:function(){for(var r=[],u=0;u<this.length;u++)r.push(this[u]);return r},slice:function(r,u){var c=[],d=this.length;u==null&&(u=d),r==null&&(r=0),r<0&&(r=d+r),u<0&&(u=d+u);for(var g=r;g>=0&&g<u&&g<d;g++)c.push(this[g]);return this.spawn(c)},size:function(){return this.length},eq:function(r){return this[r]||this.spawn()},first:function(){return this[0]||this.spawn()},last:function(){return this[this.length-1]||this.spawn()},empty:function(){return this.length===0},nonempty:function(){return!this.empty()},sort:function(r){if(!Ci(r))return this;var u=this.toArray().sort(r);return this.spawn(u)},sortByZIndex:function(){return this.sort(Y7)},zDepth:function(){var r=this[0];if(r){var u=r._private,c=u.group;if(c==="nodes"){var d=u.data.parent?r.parents().size():0;return r.isParent()?d:R5-1}else{var g=u.source,b=u.target,y=g.zDepth(),k=b.zDepth();return Math.max(y,k,0)}}}};Fw.each=Fw.forEach;var tX=function(){var r="undefined",u=(typeof Symbol>"u"?"undefined":ma(Symbol))!=r&&ma(Symbol.iterator)!=r;u&&(Fw[Symbol.iterator]=function(){var c=this,d={value:void 0,done:!1},g=0,b=this.length;return yP({next:function(){return g<b?d.value=c[g++]:(d.value=void 0,d.done=!0),d}},Symbol.iterator,function(){return this})})};tX();var nX=eo({nodeDimensionsIncludeLabels:!1}),qw={layoutDimensions:function(r){r=nX(r);var u;if(!this.takesUpSpace())u={w:0,h:0};else if(r.nodeDimensionsIncludeLabels){var c=this.boundingBox();u={w:c.w,h:c.h}}else u={w:this.outerWidth(),h:this.outerHeight()};return(u.w===0||u.h===0)&&(u.w=u.h=1),u},layoutPositions:function(r,u,c){var d=this.nodes().filter(function(Q){return!Q.isParent()}),g=this.cy(),b=u.eles,y=function(X){return X.id()},k=Jb(c,y);r.emit({type:"layoutstart",layout:r}),r.animations=[];var E=function(X,K,ee){var Z={x:K.x1+K.w/2,y:K.y1+K.h/2},ae={x:(ee.x-Z.x)*X,y:(ee.y-Z.y)*X};return{x:Z.x+ae.x,y:Z.y+ae.y}},C=u.spacingFactor&&u.spacingFactor!==1,T=function(){if(!C)return null;for(var X=cs(),K=0;K<d.length;K++){var ee=d[K],Z=k(ee,K);fK(X,Z.x,Z.y)}return X},P=T(),N=Jb(function(Q,X){var K=k(Q,X);if(C){var ee=Math.abs(u.spacingFactor);K=E(ee,P,K)}return u.transform!=null&&(K=u.transform(Q,K)),K},y);if(u.animate){for(var D=0;D<d.length;D++){var H=d[D],_=N(H,D),B=u.animateFilter==null||u.animateFilter(H,D);if(B){var $=H.animation({position:_,duration:u.animationDuration,easing:u.animationEasing});r.animations.push($)}else H.position(_)}if(u.fit){var F=g.animation({fit:{boundingBox:b.boundingBoxAt(N),padding:u.padding},duration:u.animationDuration,easing:u.animationEasing});r.animations.push(F)}else if(u.zoom!==void 0&&u.pan!==void 0){var W=g.animation({zoom:u.zoom,pan:u.pan,duration:u.animationDuration,easing:u.animationEasing});r.animations.push(W)}r.animations.forEach(function(Q){return Q.play()}),r.one("layoutready",u.ready),r.emit({type:"layoutready",layout:r}),Mv.all(r.animations.map(function(Q){return Q.promise()})).then(function(){r.one("layoutstop",u.stop),r.emit({type:"layoutstop",layout:r})})}else d.positions(N),u.fit&&g.fit(u.eles,u.padding),u.zoom!=null&&g.zoom(u.zoom),u.pan&&g.pan(u.pan),r.one("layoutready",u.ready),r.emit({type:"layoutready",layout:r}),r.one("layoutstop",u.stop),r.emit({type:"layoutstop",layout:r});return this},layout:function(r){var u=this.cy();return u.makeLayout(en({},r,{eles:this}))}};qw.createLayout=qw.makeLayout=qw.layout;function F7(a,r,u){var c=u._private,d=c.styleCache=c.styleCache||[],g;return(g=d[a])!=null||(g=d[a]=r(u)),g}function Vw(a,r){return a=Wh(a),function(c){return F7(a,r,c)}}function Ww(a,r){a=Wh(a);var u=function(d){return r.call(d)};return function(){var d=this[0];if(d)return F7(a,u,d)}}var to={recalculateRenderedStyle:function(r){var u=this.cy(),c=u.renderer(),d=u.styleEnabled();return c&&d&&c.recalculateRenderedStyle(this,r),this},dirtyStyleCache:function(){var r=this.cy(),u=function(g){return g._private.styleCache=null};if(r.hasCompoundNodes()){var c;c=this.spawnSelf().merge(this.descendants()).merge(this.parents()),c.merge(c.connectedEdges()),c.forEach(u)}else this.forEach(function(d){u(d),d.connectedEdges().forEach(u)});return this},updateStyle:function(r){var u=this._private.cy;if(!u.styleEnabled())return this;if(u.batching()){var c=u._private.batchStyleEles;return c.merge(this),this}var d=u.hasCompoundNodes(),g=this;r=!!(r||r===void 0),d&&(g=this.spawnSelf().merge(this.descendants()).merge(this.parents()));var b=g;return r?b.emitAndNotify("style"):b.emit("style"),g.forEach(function(y){return y._private.styleDirty=!0}),this},cleanStyle:function(){var r=this.cy();if(r.styleEnabled())for(var u=0;u<this.length;u++){var c=this[u];c._private.styleDirty&&(c._private.styleDirty=!1,r.style().apply(c))}},parsedStyle:function(r){var u=arguments.length>1&&arguments[1]!==void 0?arguments[1]:!0,c=this[0],d=c.cy();if(d.styleEnabled()&&c){this.cleanStyle();var g=c._private.style[r];return g??(u?d.style().getDefaultProperty(r):null)}},numericStyle:function(r){var u=this[0];if(u.cy().styleEnabled()&&u){var c=u.pstyle(r);return c.pfValue!==void 0?c.pfValue:c.value}},numericStyleUnits:function(r){var u=this[0];if(u.cy().styleEnabled()&&u)return u.pstyle(r).units},renderedStyle:function(r){var u=this.cy();if(!u.styleEnabled())return this;var c=this[0];if(c)return u.style().getRenderedStyle(c,r)},style:function(r,u){var c=this.cy();if(!c.styleEnabled())return this;var d=!1,g=c.style();if(ar(r)){var b=r;g.applyBypass(this,b,d),this.emitAndNotify("style")}else if(Yt(r))if(u===void 0){var y=this[0];return y?g.getStylePropertyValue(y,r):void 0}else g.applyBypass(this,r,u,d),this.emitAndNotify("style");else if(r===void 0){var k=this[0];return k?g.getRawStyle(k):void 0}return this},removeStyle:function(r){var u=this.cy();if(!u.styleEnabled())return this;var c=!1,d=u.style(),g=this;if(r===void 0)for(var b=0;b<g.length;b++){var y=g[b];d.removeAllBypasses(y,c)}else{r=r.split(/\s+/);for(var k=0;k<g.length;k++){var E=g[k];d.removeBypasses(E,r,c)}}return this.emitAndNotify("style"),this},show:function(){return this.css("display","element"),this},hide:function(){return this.css("display","none"),this},effectiveOpacity:function(){var r=this.cy();if(!r.styleEnabled())return 1;var u=r.hasCompoundNodes(),c=this[0];if(c){var d=c._private,g=c.pstyle("opacity").value;if(!u)return g;var b=d.data.parent?c.parents():null;if(b)for(var y=0;y<b.length;y++){var k=b[y],E=k.pstyle("opacity").value;g=E*g}return g}},transparent:function(){var r=this.cy();if(!r.styleEnabled())return!1;var u=this[0],c=u.cy().hasCompoundNodes();if(u)return c?u.effectiveOpacity()===0:u.pstyle("opacity").value===0},backgrounding:function(){var r=this.cy();if(!r.styleEnabled())return!1;var u=this[0];return!!u._private.backgrounding}};function rS(a,r){var u=a._private,c=u.data.parent?a.parents():null;if(c)for(var d=0;d<c.length;d++){var g=c[d];if(!r(g))return!1}return!0}function iS(a){var r=a.ok,u=a.edgeOkViaNode||a.ok,c=a.parentOk||a.ok;return function(){var d=this.cy();if(!d.styleEnabled())return!0;var g=this[0],b=d.hasCompoundNodes();if(g){var y=g._private;if(!r(g))return!1;if(g.isNode())return!b||rS(g,c);var k=y.source,E=y.target;return u(k)&&(!b||rS(k,u))&&(k===E||u(E)&&(!b||rS(E,u)))}}}var zv=Vw("eleTakesUpSpace",function(a){return a.pstyle("display").value==="element"&&a.width()!==0&&(a.isNode()?a.height()!==0:!0)});to.takesUpSpace=Ww("takesUpSpace",iS({ok:zv}));var rX=Vw("eleInteractive",function(a){return a.pstyle("events").value==="yes"&&a.pstyle("visibility").value==="visible"&&zv(a)}),iX=Vw("parentInteractive",function(a){return a.pstyle("visibility").value==="visible"&&zv(a)});to.interactive=Ww("interactive",iS({ok:rX,parentOk:iX,edgeOkViaNode:zv})),to.noninteractive=function(){var a=this[0];if(a)return!a.interactive()};var aX=Vw("eleVisible",function(a){return a.pstyle("visibility").value==="visible"&&a.pstyle("opacity").pfValue!==0&&zv(a)}),oX=zv;to.visible=Ww("visible",iS({ok:aX,edgeOkViaNode:oX})),to.hidden=function(){var a=this[0];if(a)return!a.visible()},to.isBundledBezier=Ww("isBundledBezier",function(){return this.cy().styleEnabled()?!this.removed()&&this.pstyle("curve-style").value==="bezier"&&this.takesUpSpace():!1}),to.bypass=to.css=to.style,to.renderedCss=to.renderedStyle,to.removeBypass=to.removeCss=to.removeStyle,to.pstyle=to.parsedStyle;var zf={};function q7(a){return function(){var r=arguments,u=[];if(r.length===2){var c=r[0],d=r[1];this.on(a.event,c,d)}else if(r.length===1&&Ci(r[0])){var g=r[0];this.on(a.event,g)}else if(r.length===0||r.length===1&&Wr(r[0])){for(var b=r.length===1?r[0]:null,y=0;y<this.length;y++){var k=this[y],E=!a.ableField||k._private[a.ableField],C=k._private[a.field]!=a.value;if(a.overrideAble){var T=a.overrideAble(k);if(T!==void 0&&(E=T,!T))return this}E&&(k._private[a.field]=a.value,C&&u.push(k))}var P=this.spawn(u);P.updateStyle(),P.emit(a.event),b&&P.emit(b)}return this}}function Hv(a){zf[a.field]=function(){var r=this[0];if(r){if(a.overrideField){var u=a.overrideField(r);if(u!==void 0)return u}return r._private[a.field]}},zf[a.on]=q7({event:a.on,field:a.field,ableField:a.ableField,overrideAble:a.overrideAble,value:!0}),zf[a.off]=q7({event:a.off,field:a.field,ableField:a.ableField,overrideAble:a.overrideAble,value:!1})}Hv({field:"locked",overrideField:function(r){return r.cy().autolock()?!0:void 0},on:"lock",off:"unlock"}),Hv({field:"grabbable",overrideField:function(r){return r.cy().autoungrabify()||r.pannable()?!1:void 0},on:"grabify",off:"ungrabify"}),Hv({field:"selected",ableField:"selectable",overrideAble:function(r){return r.cy().autounselectify()?!1:void 0},on:"select",off:"unselect"}),Hv({field:"selectable",overrideField:function(r){return r.cy().autounselectify()?!1:void 0},on:"selectify",off:"unselectify"}),zf.deselect=zf.unselect,zf.grabbed=function(){var a=this[0];if(a)return a._private.grabbed},Hv({field:"active",on:"activate",off:"unactivate"}),Hv({field:"pannable",on:"panify",off:"unpanify"}),zf.inactive=function(){var a=this[0];if(a)return!a._private.active};var mo={},V7=function(r){return function(c){for(var d=this,g=[],b=0;b<d.length;b++){var y=d[b];if(y.isNode()){for(var k=!1,E=y.connectedEdges(),C=0;C<E.length;C++){var T=E[C],P=T.source(),N=T.target();if(r.noIncomingEdges&&N===y&&P!==y||r.noOutgoingEdges&&P===y&&N!==y){k=!0;break}}k||g.push(y)}}return this.spawn(g,!0).filter(c)}},W7=function(r){return function(u){for(var c=this,d=[],g=0;g<c.length;g++){var b=c[g];if(b.isNode())for(var y=b.connectedEdges(),k=0;k<y.length;k++){var E=y[k],C=E.source(),T=E.target();r.outgoing&&C===b?(d.push(E),d.push(T)):r.incoming&&T===b&&(d.push(E),d.push(C))}}return this.spawn(d,!0).filter(u)}},U7=function(r){return function(u){for(var c=this,d=[],g={};;){var b=r.outgoing?c.outgoers():c.incomers();if(b.length===0)break;for(var y=!1,k=0;k<b.length;k++){var E=b[k],C=E.id();g[C]||(g[C]=!0,d.push(E),y=!0)}if(!y)break;c=b}return this.spawn(d,!0).filter(u)}};mo.clearTraversalCache=function(){for(var a=0;a<this.length;a++)this[a]._private.traversalCache=null},en(mo,{roots:V7({noIncomingEdges:!0}),leaves:V7({noOutgoingEdges:!0}),outgoers:ru(W7({outgoing:!0}),"outgoers"),successors:U7({outgoing:!0}),incomers:ru(W7({incoming:!0}),"incomers"),predecessors:U7({incoming:!0})}),en(mo,{neighborhood:ru(function(a){for(var r=[],u=this.nodes(),c=0;c<u.length;c++)for(var d=u[c],g=d.connectedEdges(),b=0;b<g.length;b++){var y=g[b],k=y.source(),E=y.target(),C=d===k?E:k;C.length>0&&r.push(C[0]),r.push(y[0])}return this.spawn(r,!0).filter(a)},"neighborhood"),closedNeighborhood:function(r){return this.neighborhood().add(this).filter(r)},openNeighborhood:function(r){return this.neighborhood(r)}}),mo.neighbourhood=mo.neighborhood,mo.closedNeighbourhood=mo.closedNeighborhood,mo.openNeighbourhood=mo.openNeighborhood,en(mo,{source:ru(function(r){var u=this[0],c;return u&&(c=u._private.source||u.cy().collection()),c&&r?c.filter(r):c},"source"),target:ru(function(r){var u=this[0],c;return u&&(c=u._private.target||u.cy().collection()),c&&r?c.filter(r):c},"target"),sources:K7({attr:"source"}),targets:K7({attr:"target"})});function K7(a){return function(u){for(var c=[],d=0;d<this.length;d++){var g=this[d],b=g._private[a.attr];b&&c.push(b)}return this.spawn(c,!0).filter(u)}}en(mo,{edgesWith:ru(Z7(),"edgesWith"),edgesTo:ru(Z7({thisIsSrc:!0}),"edgesTo")});function Z7(a){return function(u){var c=[],d=this._private.cy,g=a||{};Yt(u)&&(u=d.$(u));for(var b=0;b<u.length;b++)for(var y=u[b]._private.edges,k=0;k<y.length;k++){var E=y[k],C=E._private.data,T=this.hasElementWithId(C.source)&&u.hasElementWithId(C.target),P=u.hasElementWithId(C.source)&&this.hasElementWithId(C.target),N=T||P;N&&((g.thisIsSrc||g.thisIsTgt)&&(g.thisIsSrc&&!T||g.thisIsTgt&&!P)||c.push(E))}return this.spawn(c,!0)}}en(mo,{connectedEdges:ru(function(a){for(var r=[],u=this,c=0;c<u.length;c++){var d=u[c];if(d.isNode())for(var g=d._private.edges,b=0;b<g.length;b++){var y=g[b];r.push(y)}}return this.spawn(r,!0).filter(a)},"connectedEdges"),connectedNodes:ru(function(a){for(var r=[],u=this,c=0;c<u.length;c++){var d=u[c];d.isEdge()&&(r.push(d.source()[0]),r.push(d.target()[0]))}return this.spawn(r,!0).filter(a)},"connectedNodes"),parallelEdges:ru(X7(),"parallelEdges"),codirectedEdges:ru(X7({codirected:!0}),"codirectedEdges")});function X7(a){var r={codirected:!1};return a=en({},r,a),function(c){for(var d=[],g=this.edges(),b=a,y=0;y<g.length;y++)for(var k=g[y],E=k._private,C=E.source,T=C._private.data.id,P=E.data.target,N=C._private.edges,D=0;D<N.length;D++){var H=N[D],_=H._private.data,B=_.target,$=_.source,F=B===P&&$===T,W=T===B&&P===$;(b.codirected&&F||!b.codirected&&(F||W))&&d.push(H)}return this.spawn(d,!0).filter(c)}}en(mo,{components:function(r){var u=this,c=u.cy(),d=c.collection(),g=r==null?u.nodes():r.nodes(),b=[];r!=null&&g.empty()&&(g=r.sources());var y=function(C,T){d.merge(C),g.unmerge(C),T.merge(C)};if(g.empty())return u.spawn();var k=function(){var C=c.collection();b.push(C);var T=g[0];y(T,C),u.bfs({directed:!1,roots:T,visit:function(N){return y(N,C)}}),C.forEach(function(P){P.connectedEdges().forEach(function(N){u.has(N)&&C.has(N.source())&&C.has(N.target())&&C.merge(N)})})};do k();while(g.length>0);return b},component:function(){var r=this[0];return r.cy().mutableElements().components(r)[0]}}),mo.componentsOf=mo.components;var no=function(r,u){var c=arguments.length>2&&arguments[2]!==void 0?arguments[2]:!1,d=arguments.length>3&&arguments[3]!==void 0?arguments[3]:!1;if(r===void 0){Hi("A collection must have a reference to the core");return}var g=new Lc,b=!1;if(!u)u=[];else if(u.length>0&&ar(u[0])&&!Qb(u[0])){b=!0;for(var y=[],k=new Tv,E=0,C=u.length;E<C;E++){var T=u[E];T.data==null&&(T.data={});var P=T.data;if(P.id==null)P.id=HP();else if(r.hasElementWithId(P.id)||k.has(P.id))continue;var N=new Pw(r,T,!1);y.push(N),k.add(P.id)}u=y}this.length=0;for(var D=0,H=u.length;D<H;D++){var _=u[D][0];if(_!=null){var B=_._private.data.id;(!c||!g.has(B))&&(c&&g.set(B,{index:this.length,ele:_}),this[this.length]=_,this.length++)}}this._private={eles:this,cy:r,get map(){return this.lazyMap==null&&this.rebuildMap(),this.lazyMap},set map($){this.lazyMap=$},rebuildMap:function(){for(var F=this.lazyMap=new Lc,W=this.eles,Q=0;Q<W.length;Q++){var X=W[Q];F.set(X.id(),{index:Q,ele:X})}}},c&&(this._private.map=g),b&&!d&&this.restore()},Jr=Pw.prototype=no.prototype=Object.create(Array.prototype);Jr.instanceString=function(){return"collection"},Jr.spawn=function(a,r){return new no(this.cy(),a,r)},Jr.spawnSelf=function(){return this.spawn(this)},Jr.cy=function(){return this._private.cy},Jr.renderer=function(){return this._private.cy.renderer()},Jr.element=function(){return this[0]},Jr.collection=function(){return CP(this)?this:new no(this._private.cy,[this])},Jr.unique=function(){return new no(this._private.cy,this,!0)},Jr.hasElementWithId=function(a){return a=""+a,this._private.map.has(a)},Jr.getElementById=function(a){a=""+a;var r=this._private.cy,u=this._private.map.get(a);return u?u.ele:new no(r)},Jr.$id=Jr.getElementById,Jr.poolIndex=function(){var a=this._private.cy,r=a._private.elements,u=this[0]._private.data.id;return r._private.map.get(u).index},Jr.indexOf=function(a){var r=a[0]._private.data.id;return this._private.map.get(r).index},Jr.indexOfId=function(a){return a=""+a,this._private.map.get(a).index},Jr.json=function(a){var r=this.element(),u=this.cy();if(r==null&&a)return this;if(r!=null){var c=r._private;if(ar(a)){if(u.startBatch(),a.data){r.data(a.data);var d=c.data;if(r.isEdge()){var g=!1,b={},y=a.data.source,k=a.data.target;y!=null&&y!=d.source&&(b.source=""+y,g=!0),k!=null&&k!=d.target&&(b.target=""+k,g=!0),g&&(r=r.move(b))}else{var E="parent"in a.data,C=a.data.parent;E&&(C!=null||d.parent!=null)&&C!=d.parent&&(C===void 0&&(C=null),C!=null&&(C=""+C),r=r.move({parent:C}))}}a.position&&r.position(a.position);var T=function(H,_,B){var $=a[H];$!=null&&$!==c[H]&&($?r[_]():r[B]())};return T("removed","remove","restore"),T("selected","select","unselect"),T("selectable","selectify","unselectify"),T("locked","lock","unlock"),T("grabbable","grabify","ungrabify"),T("pannable","panify","unpanify"),a.classes!=null&&r.classes(a.classes),u.endBatch(),this}else if(a===void 0){var P={data:Tc(c.data),position:Tc(c.position),group:c.group,removed:c.removed,selected:c.selected,selectable:c.selectable,locked:c.locked,grabbable:c.grabbable,pannable:c.pannable,classes:null};P.classes="";var N=0;return c.classes.forEach(function(D){return P.classes+=N++===0?D:" "+D}),P}}},Jr.jsons=function(){for(var a=[],r=0;r<this.length;r++){var u=this[r],c=u.json();a.push(c)}return a},Jr.clone=function(){for(var a=this.cy(),r=[],u=0;u<this.length;u++){var c=this[u],d=c.json(),g=new Pw(a,d,!1);r.push(g)}return new no(a,r)},Jr.copy=Jr.clone,Jr.restore=function(){for(var a=arguments.length>0&&arguments[0]!==void 0?arguments[0]:!0,r=arguments.length>1&&arguments[1]!==void 0?arguments[1]:!0,u=this,c=u.cy(),d=c._private,g=[],b=[],y,k=0,E=u.length;k<E;k++){var C=u[k];r&&!C.removed()||(C.isNode()?g.push(C):b.push(C))}y=g.concat(b);var T,P=function(){y.splice(T,1),T--};for(T=0;T<y.length;T++){var N=y[T],D=N._private,H=D.data;if(N.clearTraversalCache(),!(!r&&!D.removed)){if(H.id===void 0)H.id=HP();else if(kt(H.id))H.id=""+H.id;else if(Lf(H.id)||!Yt(H.id)){Hi("Can not create element with invalid string ID `"+H.id+"`"),P();continue}else if(c.hasElementWithId(H.id)){Hi("Can not create second element with ID `"+H.id+"`"),P();continue}}var _=H.id;if(N.isNode()){var B=D.position;B.x==null&&(B.x=0),B.y==null&&(B.y=0)}if(N.isEdge()){for(var $=N,F=["source","target"],W=F.length,Q=!1,X=0;X<W;X++){var K=F[X],ee=H[K];kt(ee)&&(ee=H[K]=""+H[K]),ee==null||ee===""?(Hi("Can not create edge `"+_+"` with unspecified "+K),Q=!0):c.hasElementWithId(ee)||(Hi("Can not create edge `"+_+"` with nonexistant "+K+" `"+ee+"`"),Q=!0)}if(Q){P();continue}var Z=c.getElementById(H.source),ae=c.getElementById(H.target);Z.same(ae)?Z._private.edges.push($):(Z._private.edges.push($),ae._private.edges.push($)),$._private.source=Z,$._private.target=ae}D.map=new Lc,D.map.set(_,{ele:N,index:0}),D.removed=!1,r&&c.addToPool(N)}for(var oe=0;oe<g.length;oe++){var J=g[oe],fe=J._private.data;kt(fe.parent)&&(fe.parent=""+fe.parent);var se=fe.parent,pe=se!=null;if(pe||J._private.parent){var he=J._private.parent?c.collection().merge(J._private.parent):c.getElementById(se);if(he.empty())fe.parent=void 0;else if(he[0].removed())pr("Node added with missing parent, reference to parent removed"),fe.parent=void 0,J._private.parent=null;else{for(var de=!1,ke=he;!ke.empty();){if(J.same(ke)){de=!0,fe.parent=void 0;break}ke=ke.parent()}de||(he[0]._private.children.push(J),J._private.parent=he[0],d.hasCompoundNodes=!0)}}}if(y.length>0){for(var Pe=y.length===u.length?u:new no(c,y),Ae=0;Ae<Pe.length;Ae++){var Te=Pe[Ae];Te.isNode()||(Te.parallelEdges().clearTraversalCache(),Te.source().clearTraversalCache(),Te.target().clearTraversalCache())}var Oe;d.hasCompoundNodes?Oe=c.collection().merge(Pe).merge(Pe.connectedNodes()).merge(Pe.parent()):Oe=Pe,Oe.dirtyCompoundBoundsCache().dirtyBoundingBoxCache().updateStyle(a),a?Pe.emitAndNotify("add"):r&&Pe.emit("add")}return u},Jr.removed=function(){var a=this[0];return a&&a._private.removed},Jr.inside=function(){var a=this[0];return a&&!a._private.removed},Jr.remove=function(){var a=arguments.length>0&&arguments[0]!==void 0?arguments[0]:!0,r=arguments.length>1&&arguments[1]!==void 0?arguments[1]:!0,u=this,c=[],d={},g=u._private.cy;function b(se){for(var pe=se._private.edges,he=0;he<pe.length;he++)k(pe[he])}function y(se){for(var pe=se._private.children,he=0;he<pe.length;he++)k(pe[he])}function k(se){var pe=d[se.id()];r&&se.removed()||pe||(d[se.id()]=!0,se.isNode()?(c.push(se),b(se),y(se)):c.unshift(se))}for(var E=0,C=u.length;E<C;E++){var T=u[E];k(T)}function P(se,pe){var he=se._private.edges;Df(he,pe),se.clearTraversalCache()}function N(se){se.clearTraversalCache()}var D=[];D.ids={};function H(se,pe){pe=pe[0],se=se[0];var he=se._private.children,de=se.id();Df(he,pe),pe._private.parent=null,D.ids[de]||(D.ids[de]=!0,D.push(se))}u.dirtyCompoundBoundsCache(),r&&g.removeFromPool(c);for(var _=0;_<c.length;_++){var B=c[_];if(B.isEdge()){var $=B.source()[0],F=B.target()[0];P($,B),P(F,B);for(var W=B.parallelEdges(),Q=0;Q<W.length;Q++){var X=W[Q];N(X),X.isBundledBezier()&&X.dirtyBoundingBoxCache()}}else{var K=B.parent();K.length!==0&&H(K,B)}r&&(B._private.removed=!0)}var ee=g._private.elements;g._private.hasCompoundNodes=!1;for(var Z=0;Z<ee.length;Z++){var ae=ee[Z];if(ae.isParent()){g._private.hasCompoundNodes=!0;break}}var oe=new no(this.cy(),c);oe.size()>0&&(a?oe.emitAndNotify("remove"):r&&oe.emit("remove"));for(var J=0;J<D.length;J++){var fe=D[J];(!r||!fe.removed())&&fe.updateStyle()}return oe},Jr.move=function(a){var r=this._private.cy,u=this,c=!1,d=!1,g=function(D){return D==null?D:""+D};if(a.source!==void 0||a.target!==void 0){var b=g(a.source),y=g(a.target),k=b!=null&&r.hasElementWithId(b),E=y!=null&&r.hasElementWithId(y);(k||E)&&(r.batch(function(){u.remove(c,d),u.emitAndNotify("moveout");for(var N=0;N<u.length;N++){var D=u[N],H=D._private.data;D.isEdge()&&(k&&(H.source=b),E&&(H.target=y))}u.restore(c,d)}),u.emitAndNotify("move"))}else if(a.parent!==void 0){var C=g(a.parent),T=C===null||r.hasElementWithId(C);if(T){var P=C===null?void 0:C;r.batch(function(){var N=u.remove(c,d);N.emitAndNotify("moveout");for(var D=0;D<u.length;D++){var H=u[D],_=H._private.data;H.isNode()&&(_.parent=P)}N.restore(c,d)}),u.emitAndNotify("move")}}return this},[d7,wZ,zw,Af,Av,OZ,Hw,KZ,G7,$7,eX,Fw,qw,to,zf,mo].forEach(function(a){en(Jr,a)});var sX={add:function(r){var u,c=this;if(Os(r)){var d=r;if(d._private.cy===c)u=d.restore();else{for(var g=[],b=0;b<d.length;b++){var y=d[b];g.push(y.json())}u=new no(c,g)}}else if(Wr(r)){var k=r;u=new no(c,k)}else if(ar(r)&&(Wr(r.nodes)||Wr(r.edges))){for(var E=r,C=[],T=["nodes","edges"],P=0,N=T.length;P<N;P++){var D=T[P],H=E[D];if(Wr(H))for(var _=0,B=H.length;_<B;_++){var $=en({group:D},H[_]);C.push($)}}u=new no(c,C)}else{var F=r;u=new Pw(c,F).collection()}return u},remove:function(r){if(!Os(r)){if(Yt(r)){var u=r;r=this.$(u)}}return r.remove()}};/*! Bezier curve function generator. Copyright Gaetan Renaudeau. MIT License: http://en.wikipedia.org/wiki/MIT_License */function uX(a,r,u,c){var d=4,g=.001,b=1e-7,y=10,k=11,E=1/(k-1),C=typeof Float32Array<"u";if(arguments.length!==4)return!1;for(var T=0;T<4;++T)if(typeof arguments[T]!="number"||isNaN(arguments[T])||!isFinite(arguments[T]))return!1;a=Math.min(a,1),u=Math.min(u,1),a=Math.max(a,0),u=Math.max(u,0);var P=C?new Float32Array(k):new Array(k);function N(ae,oe){return 1-3*oe+3*ae}function D(ae,oe){return 3*oe-6*ae}function H(ae){return 3*ae}function _(ae,oe,J){return((N(oe,J)*ae+D(oe,J))*ae+H(oe))*ae}function B(ae,oe,J){return 3*N(oe,J)*ae*ae+2*D(oe,J)*ae+H(oe)}function $(ae,oe){for(var J=0;J<d;++J){var fe=B(oe,a,u);if(fe===0)return oe;var se=_(oe,a,u)-ae;oe-=se/fe}return oe}function F(){for(var ae=0;ae<k;++ae)P[ae]=_(ae*E,a,u)}function W(ae,oe,J){var fe,se,pe=0;do se=oe+(J-oe)/2,fe=_(se,a,u)-ae,fe>0?J=se:oe=se;while(Math.abs(fe)>b&&++pe<y);return se}function Q(ae){for(var oe=0,J=1,fe=k-1;J!==fe&&P[J]<=ae;++J)oe+=E;--J;var se=(ae-P[J])/(P[J+1]-P[J]),pe=oe+se*E,he=B(pe,a,u);return he>=g?$(ae,pe):he===0?pe:W(ae,oe,oe+E)}var X=!1;function K(){X=!0,(a!==r||u!==c)&&F()}var ee=function(oe){return X||K(),a===r&&u===c?oe:oe===0?0:oe===1?1:_(Q(oe),r,c)};ee.getControlPoints=function(){return[{x:a,y:r},{x:u,y:c}]};var Z="generateBezier("+[a,r,u,c]+")";return ee.toString=function(){return Z},ee}/*! Runge-Kutta spring physics function generator. Adapted from Framer.js, copyright Koen Bok. MIT License: http://en.wikipedia.org/wiki/MIT_License */var cX=function(){function a(c){return-c.tension*c.x-c.friction*c.v}function r(c,d,g){var b={x:c.x+g.dx*d,v:c.v+g.dv*d,tension:c.tension,friction:c.friction};return{dx:b.v,dv:a(b)}}function u(c,d){var g={dx:c.v,dv:a(c)},b=r(c,d*.5,g),y=r(c,d*.5,b),k=r(c,d,y),E=1/6*(g.dx+2*(b.dx+y.dx)+k.dx),C=1/6*(g.dv+2*(b.dv+y.dv)+k.dv);return c.x=c.x+E*d,c.v=c.v+C*d,c}return function c(d,g,b){var y={x:-1,v:0,tension:null,friction:null},k=[0],E=0,C=1/1e4,T=16/1e3,P,N,D;for(d=parseFloat(d)||500,g=parseFloat(g)||20,b=b||null,y.tension=d,y.friction=g,P=b!==null,P?(E=c(d,g),N=E/b*T):N=T;D=u(D||y,N),k.push(1+D.x),E+=16,Math.abs(D.x)>C&&Math.abs(D.v)>C;);return P?function(H){return k[H*(k.length-1)|0]}:E}}(),ei=function(r,u,c,d){var g=uX(r,u,c,d);return function(b,y,k){return b+(y-b)*g(k)}},Uw={linear:function(r,u,c){return r+(u-r)*c},ease:ei(.25,.1,.25,1),"ease-in":ei(.42,0,1,1),"ease-out":ei(0,0,.58,1),"ease-in-out":ei(.42,0,.58,1),"ease-in-sine":ei(.47,0,.745,.715),"ease-out-sine":ei(.39,.575,.565,1),"ease-in-out-sine":ei(.445,.05,.55,.95),"ease-in-quad":ei(.55,.085,.68,.53),"ease-out-quad":ei(.25,.46,.45,.94),"ease-in-out-quad":ei(.455,.03,.515,.955),"ease-in-cubic":ei(.55,.055,.675,.19),"ease-out-cubic":ei(.215,.61,.355,1),"ease-in-out-cubic":ei(.645,.045,.355,1),"ease-in-quart":ei(.895,.03,.685,.22),"ease-out-quart":ei(.165,.84,.44,1),"ease-in-out-quart":ei(.77,0,.175,1),"ease-in-quint":ei(.755,.05,.855,.06),"ease-out-quint":ei(.23,1,.32,1),"ease-in-out-quint":ei(.86,0,.07,1),"ease-in-expo":ei(.95,.05,.795,.035),"ease-out-expo":ei(.19,1,.22,1),"ease-in-out-expo":ei(1,0,0,1),"ease-in-circ":ei(.6,.04,.98,.335),"ease-out-circ":ei(.075,.82,.165,1),"ease-in-out-circ":ei(.785,.135,.15,.86),spring:function(r,u,c){if(c===0)return Uw.linear;var d=cX(r,u,c);return function(g,b,y){return g+(b-g)*d(y)}},"cubic-bezier":ei};function Q7(a,r,u,c,d){if(c===1||r===u)return u;var g=d(r,u,c);return a==null||((a.roundValue||a.color)&&(g=Math.round(g)),a.min!==void 0&&(g=Math.max(g,a.min)),a.max!==void 0&&(g=Math.min(g,a.max))),g}function J7(a,r){return a.pfValue!=null||a.value!=null?a.pfValue!=null&&(r==null||r.type.units!=="%")?a.pfValue:a.value:a}function _v(a,r,u,c,d){var g=d!=null?d.type:null;u<0?u=0:u>1&&(u=1);var b=J7(a,d),y=J7(r,d);if(kt(b)&&kt(y))return Q7(g,b,y,u,c);if(Wr(b)&&Wr(y)){for(var k=[],E=0;E<y.length;E++){var C=b[E],T=y[E];if(C!=null&&T!=null){var P=Q7(g,C,T,u,c);k.push(P)}else k.push(T)}return k}}function lX(a,r,u,c){var d=!c,g=a._private,b=r._private,y=b.easing,k=b.startTime,E=c?a:a.cy(),C=E.style();if(!b.easingImpl)if(y==null)b.easingImpl=Uw.linear;else{var T;if(Yt(y)){var P=C.parse("transition-timing-function",y);T=P.value}else T=y;var N,D;Yt(T)?(N=T,D=[]):(N=T[1],D=T.slice(2).map(function(Pe){return+Pe})),D.length>0?(N==="spring"&&D.push(b.duration),b.easingImpl=Uw[N].apply(null,D)):b.easingImpl=Uw[N]}var H=b.easingImpl,_;if(b.duration===0?_=1:_=(u-k)/b.duration,b.applying&&(_=b.progress),_<0?_=0:_>1&&(_=1),b.delay==null){var B=b.startPosition,$=b.position;if($&&d&&!a.locked()){var F={};g1(B.x,$.x)&&(F.x=_v(B.x,$.x,_,H)),g1(B.y,$.y)&&(F.y=_v(B.y,$.y,_,H)),a.position(F)}var W=b.startPan,Q=b.pan,X=g.pan,K=Q!=null&&c;K&&(g1(W.x,Q.x)&&(X.x=_v(W.x,Q.x,_,H)),g1(W.y,Q.y)&&(X.y=_v(W.y,Q.y,_,H)),a.emit("pan"));var ee=b.startZoom,Z=b.zoom,ae=Z!=null&&c;ae&&(g1(ee,Z)&&(g.zoom=i1(g.minZoom,_v(ee,Z,_,H),g.maxZoom)),a.emit("zoom")),(K||ae)&&a.emit("viewport");var oe=b.style;if(oe&&oe.length>0&&d){for(var J=0;J<oe.length;J++){var fe=oe[J],se=fe.name,pe=fe,he=b.startStyle[se],de=C.properties[he.name],ke=_v(he,pe,_,H,de);C.overrideBypass(a,se,ke)}a.emit("style")}}return b.progress=_,_}function g1(a,r){return a==null||r==null?!1:kt(a)&&kt(r)?!0:!!(a&&r)}function fX(a,r,u,c){var d=r._private;d.started=!0,d.startTime=u-d.progress*d.duration}function eD(a,r){var u=r._private.aniEles,c=[];function d(C,T){var P=C._private,N=P.animation.current,D=P.animation.queue,H=!1;if(N.length===0){var _=D.shift();_&&N.push(_)}for(var B=function(X){for(var K=X.length-1;K>=0;K--){var ee=X[K];ee()}X.splice(0,X.length)},$=N.length-1;$>=0;$--){var F=N[$],W=F._private;if(W.stopped){N.splice($,1),W.hooked=!1,W.playing=!1,W.started=!1,B(W.frames);continue}!W.playing&&!W.applying||(W.playing&&W.applying&&(W.applying=!1),W.started||fX(C,F,a),lX(C,F,a,T),W.applying&&(W.applying=!1),B(W.frames),W.step!=null&&W.step(a),F.completed()&&(N.splice($,1),W.hooked=!1,W.playing=!1,W.started=!1,B(W.completes)),H=!0)}return!T&&N.length===0&&D.length===0&&c.push(C),H}for(var g=!1,b=0;b<u.length;b++){var y=u[b],k=d(y);g=g||k}var E=d(r,!0);(g||E)&&(u.length>0?r.notify("draw",u):r.notify("draw")),u.unmerge(c),r.emit("step")}var hX={animate:Cr.animate(),animation:Cr.animation(),animated:Cr.animated(),clearQueue:Cr.clearQueue(),delay:Cr.delay(),delayAnimation:Cr.delayAnimation(),stop:Cr.stop(),addToAnimationPool:function(r){var u=this;u.styleEnabled()&&u._private.aniEles.merge(r)},stopAnimationLoop:function(){this._private.animationsRunning=!1},startAnimationLoop:function(){var r=this;if(r._private.animationsRunning=!0,!r.styleEnabled())return;function u(){r._private.animationsRunning&&xw(function(g){eD(g,r),u()})}var c=r.renderer();c&&c.beforeRender?c.beforeRender(function(g,b){eD(b,r)},c.beforeRenderPriorities.animations):u()}},dX={qualifierCompare:function(r,u){return r==null||u==null?r==null&&u==null:r.sameText(u)},eventMatches:function(r,u,c){var d=u.qualifier;return d!=null?r!==c.target&&Qb(c.target)&&d.matches(c.target):!0},addEventFields:function(r,u){u.cy=r,u.target=r},callbackContext:function(r,u,c){return u.qualifier!=null?c.target:r}},Kw=function(r){return Yt(r)?new Mf(r):r},tD={createEmitter:function(){var r=this._private;return r.emitter||(r.emitter=new $w(dX,this)),this},emitter:function(){return this._private.emitter},on:function(r,u,c){return this.emitter().on(r,Kw(u),c),this},removeListener:function(r,u,c){return this.emitter().removeListener(r,Kw(u),c),this},removeAllListeners:function(){return this.emitter().removeAllListeners(),this},one:function(r,u,c){return this.emitter().one(r,Kw(u),c),this},once:function(r,u,c){return this.emitter().one(r,Kw(u),c),this},emit:function(r,u){return this.emitter().emit(r,u),this},emitAndNotify:function(r,u){return this.emit(r),this.notify(r,u),this}};Cr.eventAliasesOn(tD);var aS={png:function(r){var u=this._private.renderer;return r=r||{},u.png(r)},jpg:function(r){var u=this._private.renderer;return r=r||{},r.bg=r.bg||"#fff",u.jpg(r)}};aS.jpeg=aS.jpg;var Zw={layout:function(r){var u=this;if(r==null){Hi("Layout options must be specified to make a layout");return}if(r.name==null){Hi("A `name` must be specified to make a layout");return}var c=r.name,d=u.extension("layout",c);if(d==null){Hi("No such layout `"+c+"` found.  Did you forget to import it and `cytoscape.use()` it?");return}var g;Yt(r.eles)?g=u.$(r.eles):g=r.eles!=null?r.eles:u.$();var b=new d(en({},r,{cy:u,eles:g}));return b}};Zw.createLayout=Zw.makeLayout=Zw.layout;var vX={notify:function(r,u){var c=this._private;if(this.batching()){c.batchNotifications=c.batchNotifications||{};var d=c.batchNotifications[r]=c.batchNotifications[r]||this.collection();u!=null&&d.merge(u);return}if(c.notificationsEnabled){var g=this.renderer();this.destroyed()||!g||g.notify(r,u)}},notifications:function(r){var u=this._private;return r===void 0?u.notificationsEnabled:(u.notificationsEnabled=!!r,this)},noNotifications:function(r){this.notifications(!1),r(),this.notifications(!0)},batching:function(){return this._private.batchCount>0},startBatch:function(){var r=this._private;return r.batchCount==null&&(r.batchCount=0),r.batchCount===0&&(r.batchStyleEles=this.collection(),r.batchNotifications={}),r.batchCount++,this},endBatch:function(){var r=this._private;if(r.batchCount===0)return this;if(r.batchCount--,r.batchCount===0){r.batchStyleEles.updateStyle();var u=this.renderer();Object.keys(r.batchNotifications).forEach(function(c){var d=r.batchNotifications[c];d.empty()?u.notify(c):u.notify(c,d)})}return this},batch:function(r){return this.startBatch(),r(),this.endBatch(),this},batchData:function(r){var u=this;return this.batch(function(){for(var c=Object.keys(r),d=0;d<c.length;d++){var g=c[d],b=r[g],y=u.getElementById(g);y.data(b)}})}},gX=eo({hideEdgesOnViewport:!1,textureOnViewport:!1,motionBlur:!1,motionBlurOpacity:.05,pixelRatio:void 0,desktopTapThreshold:4,touchTapThreshold:8,wheelSensitivity:1,debug:!1,showFps:!1}),oS={renderTo:function(r,u,c,d){var g=this._private.renderer;return g.renderTo(r,u,c,d),this},renderer:function(){return this._private.renderer},forceRender:function(){return this.notify("draw"),this},resize:function(){return this.invalidateSize(),this.emitAndNotify("resize"),this},initRenderer:function(r){var u=this,c=u.extension("renderer",r.name);if(c==null){Hi("Can not initialise: No such renderer `".concat(r.name,"` found. Did you forget to import it and `cytoscape.use()` it?"));return}r.wheelSensitivity!==void 0&&pr("You have set a custom wheel sensitivity.  This will make your app zoom unnaturally when using mainstream mice.  You should change this value from the default only if you can guarantee that all your users will use the same hardware and OS configuration as your current machine.");var d=gX(r);d.cy=u,u._private.renderer=new c(d),this.notify("init")},destroyRenderer:function(){var r=this;r.notify("destroy");var u=r.container();if(u)for(u._cyreg=null;u.childNodes.length>0;)u.removeChild(u.childNodes[0]);r._private.renderer=null,r.mutableElements().forEach(function(c){var d=c._private;d.rscratch={},d.rstyle={},d.animation.current=[],d.animation.queue=[]})},onRender:function(r){return this.on("render",r)},offRender:function(r){return this.off("render",r)}};oS.invalidateDimensions=oS.resize;var Xw={collection:function(r,u){return Yt(r)?this.$(r):Os(r)?r.collection():Wr(r)?(u||(u={}),new no(this,r,u.unique,u.removed)):new no(this)},nodes:function(r){var u=this.$(function(c){return c.isNode()});return r?u.filter(r):u},edges:function(r){var u=this.$(function(c){return c.isEdge()});return r?u.filter(r):u},$:function(r){var u=this._private.elements;return r?u.filter(r):u.spawnSelf()},mutableElements:function(){return this._private.elements}};Xw.elements=Xw.filter=Xw.$;var yo={},b1="t",bX="f";yo.apply=function(a){for(var r=this,u=r._private,c=u.cy,d=c.collection(),g=0;g<a.length;g++){var b=a[g],y=r.getContextMeta(b);if(!y.empty){var k=r.getContextStyle(y),E=r.applyContextStyle(y,k,b);b._private.appliedInitStyle?r.updateTransitions(b,E.diffProps):b._private.appliedInitStyle=!0;var C=r.updateStyleHints(b);C&&d.push(b)}}return d},yo.getPropertiesDiff=function(a,r){var u=this,c=u._private.propDiffs=u._private.propDiffs||{},d=a+"-"+r,g=c[d];if(g)return g;for(var b=[],y={},k=0;k<u.length;k++){var E=u[k],C=a[k]===b1,T=r[k]===b1,P=C!==T,N=E.mappedProperties.length>0;if(P||T&&N){var D=void 0;P&&N||P?D=E.properties:N&&(D=E.mappedProperties);for(var H=0;H<D.length;H++){for(var _=D[H],B=_.name,$=!1,F=k+1;F<u.length;F++){var W=u[F],Q=r[F]===b1;if(Q&&($=W.properties[_.name]!=null,$))break}!y[B]&&!$&&(y[B]=!0,b.push(B))}}}return c[d]=b,b},yo.getContextMeta=function(a){for(var r=this,u="",c,d=a._private.styleCxtKey||"",g=0;g<r.length;g++){var b=r[g],y=b.selector&&b.selector.matches(a);y?u+=b1:u+=bX}return c=r.getPropertiesDiff(d,u),a._private.styleCxtKey=u,{key:u,diffPropNames:c,empty:c.length===0}},yo.getContextStyle=function(a){var r=a.key,u=this,c=this._private.contextStyles=this._private.contextStyles||{};if(c[r])return c[r];for(var d={_private:{key:r}},g=0;g<u.length;g++){var b=u[g],y=r[g]===b1;if(y)for(var k=0;k<b.properties.length;k++){var E=b.properties[k];d[E.name]=E}}return c[r]=d,d},yo.applyContextStyle=function(a,r,u){for(var c=this,d=a.diffPropNames,g={},b=c.types,y=0;y<d.length;y++){var k=d[y],E=r[k],C=u.pstyle(k);if(!E)if(C)C.bypass?E={name:k,deleteBypassed:!0}:E={name:k,delete:!0};else continue;if(C!==E){if(E.mapped===b.fn&&C!=null&&C.mapping!=null&&C.mapping.value===E.value){var T=C.mapping,P=T.fnValue=E.value(u);if(P===T.prevFnValue)continue}var N=g[k]={prev:C};c.applyParsedProperty(u,E),N.next=u.pstyle(k),N.next&&N.next.bypass&&(N.next=N.next.bypassed)}}return{diffProps:g}},yo.updateStyleHints=function(a){var r=a._private,u=this,c=u.propertyGroupNames,d=u.propertyGroupKeys,g=function(at,ft,tn){return u.getPropertiesHash(at,ft,tn)},b=r.styleKey;if(a.removed())return!1;var y=r.group==="nodes",k=a._private.style;c=Object.keys(k);for(var E=0;E<d.length;E++){var C=d[E];r.styleKeys[C]=[xv,e1]}for(var T=function(at,ft){return r.styleKeys[ft][0]=t1(at,r.styleKeys[ft][0])},P=function(at,ft){return r.styleKeys[ft][1]=n1(at,r.styleKeys[ft][1])},N=function(at,ft){T(at,ft),P(at,ft)},D=function(at,ft){for(var tn=0;tn<at.length;tn++){var gn=at.charCodeAt(tn);T(gn,ft),P(gn,ft)}},H=2e9,_=function(at){return-128<at&&at<128&&Math.floor(at)!==at?H-(at*1024|0):at},B=0;B<c.length;B++){var $=c[B],F=k[$];if(F!=null){var W=this.properties[$],Q=W.type,X=W.groupKey,K=void 0;W.hashOverride!=null?K=W.hashOverride(a,F):F.pfValue!=null&&(K=F.pfValue);var ee=W.enums==null?F.value:null,Z=K!=null,ae=ee!=null,oe=Z||ae,J=F.units;if(Q.number&&oe&&!Q.multiple){var fe=Z?K:ee;N(_(fe),X),!Z&&J!=null&&D(J,X)}else D(F.strValue,X)}}for(var se=[xv,e1],pe=0;pe<d.length;pe++){var he=d[pe],de=r.styleKeys[he];se[0]=t1(de[0],se[0]),se[1]=n1(de[1],se[1])}r.styleKey=jU(se[0],se[1]);var ke=r.styleKeys;r.labelDimsKey=Pf(ke.labelDimensions);var Pe=g(a,["label"],ke.labelDimensions);if(r.labelKey=Pf(Pe),r.labelStyleKey=Pf(Tw(ke.commonLabel,Pe)),!y){var Ae=g(a,["source-label"],ke.labelDimensions);r.sourceLabelKey=Pf(Ae),r.sourceLabelStyleKey=Pf(Tw(ke.commonLabel,Ae));var Te=g(a,["target-label"],ke.labelDimensions);r.targetLabelKey=Pf(Te),r.targetLabelStyleKey=Pf(Tw(ke.commonLabel,Te))}if(y){var Oe=r.styleKeys,ze=Oe.nodeBody,We=Oe.nodeBorder,$e=Oe.backgroundImage,Ge=Oe.compound,me=Oe.pie,Ve=[ze,We,$e,Ge,me].filter(function(Ke){return Ke!=null}).reduce(Tw,[xv,e1]);r.nodeKey=Pf(Ve),r.hasPie=me!=null&&me[0]!==xv&&me[1]!==e1}return b!==r.styleKey},yo.clearStyleHints=function(a){var r=a._private;r.styleCxtKey="",r.styleKeys={},r.styleKey=null,r.labelKey=null,r.labelStyleKey=null,r.sourceLabelKey=null,r.sourceLabelStyleKey=null,r.targetLabelKey=null,r.targetLabelStyleKey=null,r.nodeKey=null,r.hasPie=null},yo.applyParsedProperty=function(a,r){var u=this,c=r,d=a._private.style,g,b=u.types,y=u.properties[c.name].type,k=c.bypass,E=d[c.name],C=E&&E.bypass,T=a._private,P="mapping",N=function(ze){return ze==null?null:ze.pfValue!=null?ze.pfValue:ze.value},D=function(){var ze=N(E),We=N(c);u.checkTriggers(a,c.name,ze,We)};if(c&&c.name.substr(0,3)==="pie"&&pr("The pie style properties are deprecated.  Create charts using background images instead."),r.name==="curve-style"&&a.isEdge()&&(r.value!=="bezier"&&a.isLoop()||r.value==="haystack"&&(a.source().isParent()||a.target().isParent()))&&(c=r=this.parse(r.name,"bezier",k)),c.delete)return d[c.name]=void 0,D(),!0;if(c.deleteBypassed)return E?E.bypass?(E.bypassed=void 0,D(),!0):!1:(D(),!0);if(c.deleteBypass)return E?E.bypass?(d[c.name]=E.bypassed,D(),!0):!1:(D(),!0);var H=function(){pr("Do not assign mappings to elements without corresponding data (i.e. ele `"+a.id()+"` has no mapping for property `"+c.name+"` with data field `"+c.field+"`); try a `["+c.field+"]` selector to limit scope to elements with `"+c.field+"` defined")};switch(c.mapped){case b.mapData:{for(var _=c.field.split("."),B=T.data,$=0;$<_.length&&B;$++){var F=_[$];B=B[F]}if(B==null)return H(),!1;var W;if(kt(B)){var Q=c.fieldMax-c.fieldMin;Q===0?W=0:W=(B-c.fieldMin)/Q}else return pr("Do not use continuous mappers without specifying numeric data (i.e. `"+c.field+": "+B+"` for `"+a.id()+"` is non-numeric)"),!1;if(W<0?W=0:W>1&&(W=1),y.color){var X=c.valueMin[0],K=c.valueMax[0],ee=c.valueMin[1],Z=c.valueMax[1],ae=c.valueMin[2],oe=c.valueMax[2],J=c.valueMin[3]==null?1:c.valueMin[3],fe=c.valueMax[3]==null?1:c.valueMax[3],se=[Math.round(X+(K-X)*W),Math.round(ee+(Z-ee)*W),Math.round(ae+(oe-ae)*W),Math.round(J+(fe-J)*W)];g={bypass:c.bypass,name:c.name,value:se,strValue:"rgb("+se[0]+", "+se[1]+", "+se[2]+")"}}else if(y.number){var pe=c.valueMin+(c.valueMax-c.valueMin)*W;g=this.parse(c.name,pe,c.bypass,P)}else return!1;if(!g)return H(),!1;g.mapping=c,c=g;break}case b.data:{for(var he=c.field.split("."),de=T.data,ke=0;ke<he.length&&de;ke++){var Pe=he[ke];de=de[Pe]}if(de!=null&&(g=this.parse(c.name,de,c.bypass,P)),!g)return H(),!1;g.mapping=c,c=g;break}case b.fn:{var Ae=c.value,Te=c.fnValue!=null?c.fnValue:Ae(a);if(c.prevFnValue=Te,Te==null)return pr("Custom function mappers may not return null (i.e. `"+c.name+"` for ele `"+a.id()+"` is null)"),!1;if(g=this.parse(c.name,Te,c.bypass,P),!g)return pr("Custom function mappers may not return invalid values for the property type (i.e. `"+c.name+"` for ele `"+a.id()+"` is invalid)"),!1;g.mapping=Tc(c),c=g;break}case void 0:break;default:return!1}return k?(C?c.bypassed=E.bypassed:c.bypassed=E,d[c.name]=c):C?E.bypassed=c:d[c.name]=c,D(),!0},yo.cleanElements=function(a,r){for(var u=0;u<a.length;u++){var c=a[u];if(this.clearStyleHints(c),c.dirtyCompoundBoundsCache(),c.dirtyBoundingBoxCache(),!r)c._private.style={};else for(var d=c._private.style,g=Object.keys(d),b=0;b<g.length;b++){var y=g[b],k=d[y];k!=null&&(k.bypass?k.bypassed=null:d[y]=null)}}},yo.update=function(){var a=this._private.cy,r=a.mutableElements();r.updateStyle()},yo.updateTransitions=function(a,r){var u=this,c=a._private,d=a.pstyle("transition-property").value,g=a.pstyle("transition-duration").pfValue,b=a.pstyle("transition-delay").pfValue;if(d.length>0&&g>0){for(var y={},k=!1,E=0;E<d.length;E++){var C=d[E],T=a.pstyle(C),P=r[C];if(P){var N=P.prev,D=N,H=P.next!=null?P.next:T,_=!1,B=void 0,$=1e-6;D&&(kt(D.pfValue)&&kt(H.pfValue)?(_=H.pfValue-D.pfValue,B=D.pfValue+$*_):kt(D.value)&&kt(H.value)?(_=H.value-D.value,B=D.value+$*_):Wr(D.value)&&Wr(H.value)&&(_=D.value[0]!==H.value[0]||D.value[1]!==H.value[1]||D.value[2]!==H.value[2],B=D.strValue),_&&(y[C]=H.strValue,this.applyBypass(a,C,B),k=!0))}}if(!k)return;c.transitioning=!0,new Mv(function(F){b>0?a.delayAnimation(b).play().promise().then(F):F()}).then(function(){return a.animation({style:y,duration:g,easing:a.pstyle("transition-timing-function").value,queue:!1}).play().promise()}).then(function(){u.removeBypasses(a,d),a.emitAndNotify("style"),c.transitioning=!1})}else c.transitioning&&(this.removeBypasses(a,d),a.emitAndNotify("style"),c.transitioning=!1)},yo.checkTrigger=function(a,r,u,c,d,g){var b=this.properties[r],y=d(b);y!=null&&y(u,c)&&g(b)},yo.checkZOrderTrigger=function(a,r,u,c){var d=this;this.checkTrigger(a,r,u,c,function(g){return g.triggersZOrder},function(){d._private.cy.notify("zorder",a)})},yo.checkBoundsTrigger=function(a,r,u,c){this.checkTrigger(a,r,u,c,function(d){return d.triggersBounds},function(d){a.dirtyCompoundBoundsCache(),a.dirtyBoundingBoxCache(),d.triggersBoundsOfParallelBeziers&&(r==="curve-style"&&(u==="bezier"||c==="bezier")||r==="display"&&(u==="none"||c==="none"))&&a.parallelEdges().forEach(function(g){g.isBundledBezier()&&g.dirtyBoundingBoxCache()})})},yo.checkTriggers=function(a,r,u,c){a.dirtyStyleCache(),this.checkZOrderTrigger(a,r,u,c),this.checkBoundsTrigger(a,r,u,c)};var p1={};p1.applyBypass=function(a,r,u,c){var d=this,g=[],b=!0;if(r==="*"||r==="**"){if(u!==void 0)for(var y=0;y<d.properties.length;y++){var k=d.properties[y],E=k.name,C=this.parse(E,u,!0);C&&g.push(C)}}else if(Yt(r)){var T=this.parse(r,u,!0);T&&g.push(T)}else if(ar(r)){var P=r;c=u;for(var N=Object.keys(P),D=0;D<N.length;D++){var H=N[D],_=P[H];if(_===void 0&&(_=P[Cw(H)]),_!==void 0){var B=this.parse(H,_,!0);B&&g.push(B)}}}else return!1;if(g.length===0)return!1;for(var $=!1,F=0;F<a.length;F++){for(var W=a[F],Q={},X=void 0,K=0;K<g.length;K++){var ee=g[K];if(c){var Z=W.pstyle(ee.name);X=Q[ee.name]={prev:Z}}$=this.applyParsedProperty(W,Tc(ee))||$,c&&(X.next=W.pstyle(ee.name))}$&&this.updateStyleHints(W),c&&this.updateTransitions(W,Q,b)}return $},p1.overrideBypass=function(a,r,u){r=O5(r);for(var c=0;c<a.length;c++){var d=a[c],g=d._private.style[r],b=this.properties[r].type,y=b.color,k=b.mutiple,E=g?g.pfValue!=null?g.pfValue:g.value:null;!g||!g.bypass?this.applyBypass(d,r,u):(g.value=u,g.pfValue!=null&&(g.pfValue=u),y?g.strValue="rgb("+u.join(",")+")":k?g.strValue=u.join(" "):g.strValue=""+u,this.updateStyleHints(d)),this.checkTriggers(d,r,E,u)}},p1.removeAllBypasses=function(a,r){return this.removeBypasses(a,this.propertyNames,r)},p1.removeBypasses=function(a,r,u){for(var c=!0,d=0;d<a.length;d++){for(var g=a[d],b={},y=0;y<r.length;y++){var k=r[y],E=this.properties[k],C=g.pstyle(E.name);if(!(!C||!C.bypass)){var T="",P=this.parse(k,T,!0),N=b[E.name]={prev:C};this.applyParsedProperty(g,P),N.next=g.pstyle(E.name)}}this.updateStyleHints(g),u&&this.updateTransitions(g,b,c)}};var sS={};sS.getEmSizeInPixels=function(){var a=this.containerCss("font-size");return a!=null?parseFloat(a):1},sS.containerCss=function(a){var r=this._private.cy,u=r.container(),c=r.window();if(c&&u&&c.getComputedStyle)return c.getComputedStyle(u).getPropertyValue(a)};var Pc={};Pc.getRenderedStyle=function(a,r){return r?this.getStylePropertyValue(a,r,!0):this.getRawStyle(a,!0)},Pc.getRawStyle=function(a,r){var u=this;if(a=a[0],a){for(var c={},d=0;d<u.properties.length;d++){var g=u.properties[d],b=u.getStylePropertyValue(a,g.name,r);b!=null&&(c[g.name]=b,c[Cw(g.name)]=b)}return c}},Pc.getIndexedStyle=function(a,r,u,c){var d=a.pstyle(r)[u][c];return d??a.cy().style().getDefaultProperty(r)[u][0]},Pc.getStylePropertyValue=function(a,r,u){var c=this;if(a=a[0],a){var d=c.properties[r];d.alias&&(d=d.pointsTo);var g=d.type,b=a.pstyle(d.name);if(b){var y=b.value,k=b.units,E=b.strValue;if(u&&g.number&&y!=null&&kt(y)){var C=a.cy().zoom(),T=function(_){return _*C},P=function(_,B){return T(_)+B},N=Wr(y),D=N?k.every(function(H){return H!=null}):k!=null;return D?N?y.map(function(H,_){return P(H,k[_])}).join(" "):P(y,k):N?y.map(function(H){return Yt(H)?H:""+T(H)}).join(" "):""+T(y)}else if(E!=null)return E}return null}},Pc.getAnimationStartStyle=function(a,r){for(var u={},c=0;c<r.length;c++){var d=r[c],g=d.name,b=a.pstyle(g);b!==void 0&&(ar(b)?b=this.parse(g,b.strValue):b=this.parse(g,b)),b&&(u[g]=b)}return u},Pc.getPropsList=function(a){var r=this,u=[],c=a,d=r.properties;if(c)for(var g=Object.keys(c),b=0;b<g.length;b++){var y=g[b],k=c[y],E=d[y]||d[O5(y)],C=this.parse(E.name,k);C&&u.push(C)}return u},Pc.getNonDefaultPropertiesHash=function(a,r,u){var c=u.slice(),d,g,b,y,k,E;for(k=0;k<r.length;k++)if(d=r[k],g=a.pstyle(d,!1),g!=null)if(g.pfValue!=null)c[0]=t1(y,c[0]),c[1]=n1(y,c[1]);else for(b=g.strValue,E=0;E<b.length;E++)y=b.charCodeAt(E),c[0]=t1(y,c[0]),c[1]=n1(y,c[1]);return c},Pc.getPropertiesHash=Pc.getNonDefaultPropertiesHash;var Qw={};Qw.appendFromJson=function(a){for(var r=this,u=0;u<a.length;u++){var c=a[u],d=c.selector,g=c.style||c.css,b=Object.keys(g);r.selector(d);for(var y=0;y<b.length;y++){var k=b[y],E=g[k];r.css(k,E)}}return r},Qw.fromJson=function(a){var r=this;return r.resetToDefault(),r.appendFromJson(a),r},Qw.json=function(){for(var a=[],r=this.defaultLength;r<this.length;r++){for(var u=this[r],c=u.selector,d=u.properties,g={},b=0;b<d.length;b++){var y=d[b];g[y.name]=y.strValue}a.push({selector:c?c.toString():"core",style:g})}return a};var uS={};uS.appendFromString=function(a){var r=this,u=this,c=""+a,d,g,b;c=c.replace(/[/][*](\s|.)+?[*][/]/g,"");function y(){c.length>d.length?c=c.substr(d.length):c=""}function k(){g.length>b.length?g=g.substr(b.length):g=""}for(;;){var E=c.match(/^\s*$/);if(E)break;var C=c.match(/^\s*((?:.|\s)+?)\s*\{((?:.|\s)+?)\}/);if(!C){pr("Halting stylesheet parsing: String stylesheet contains more to parse but no selector and block found in: "+c);break}d=C[0];var T=C[1];if(T!=="core"){var P=new Mf(T);if(P.invalid){pr("Skipping parsing of block: Invalid selector found in string stylesheet: "+T),y();continue}}var N=C[2],D=!1;g=N;for(var H=[];;){var _=g.match(/^\s*$/);if(_)break;var B=g.match(/^\s*(.+?)\s*:\s*(.+?)(?:\s*;|\s*$)/);if(!B){pr("Skipping parsing of block: Invalid formatting of style property and value definitions found in:"+N),D=!0;break}b=B[0];var $=B[1],F=B[2],W=r.properties[$];if(!W){pr("Skipping property: Invalid property name in: "+b),k();continue}var Q=u.parse($,F);if(!Q){pr("Skipping property: Invalid property definition in: "+b),k();continue}H.push({name:$,val:F}),k()}if(D){y();break}u.selector(T);for(var X=0;X<H.length;X++){var K=H[X];u.css(K.name,K.val)}y()}return u},uS.fromString=function(a){var r=this;return r.resetToDefault(),r.appendFromString(a),r};var ro={};(function(){var a=ka,r=pU,u=mU,c=yU,d=kU,g=function(Ve){return"^"+Ve+"\\s*\\(\\s*([\\w\\.]+)\\s*\\)$"},b=function(Ve){var Ke=a+"|\\w+|"+r+"|"+u+"|"+c+"|"+d;return"^"+Ve+"\\s*\\(([\\w\\.]+)\\s*\\,\\s*("+a+")\\s*\\,\\s*("+a+")\\s*,\\s*("+Ke+")\\s*\\,\\s*("+Ke+")\\)$"},y=[`^url\\s*\\(\\s*['"]?(.+?)['"]?\\s*\\)$`,"^(none)$","^(.+)$"];ro.types={time:{number:!0,min:0,units:"s|ms",implicitUnits:"ms"},percent:{number:!0,min:0,max:100,units:"%",implicitUnits:"%"},percentages:{number:!0,min:0,max:100,units:"%",implicitUnits:"%",multiple:!0},zeroOneNumber:{number:!0,min:0,max:1,unitless:!0},zeroOneNumbers:{number:!0,min:0,max:1,unitless:!0,multiple:!0},nOneOneNumber:{number:!0,min:-1,max:1,unitless:!0},nonNegativeInt:{number:!0,min:0,integer:!0,unitless:!0},nonNegativeNumber:{number:!0,min:0,unitless:!0},position:{enums:["parent","origin"]},nodeSize:{number:!0,min:0,enums:["label"]},number:{number:!0,unitless:!0},numbers:{number:!0,unitless:!0,multiple:!0},positiveNumber:{number:!0,unitless:!0,min:0,strictMin:!0},size:{number:!0,min:0},bidirectionalSize:{number:!0},bidirectionalSizeMaybePercent:{number:!0,allowPercent:!0},bidirectionalSizes:{number:!0,multiple:!0},sizeMaybePercent:{number:!0,min:0,allowPercent:!0},axisDirection:{enums:["horizontal","leftward","rightward","vertical","upward","downward","auto"]},paddingRelativeTo:{enums:["width","height","average","min","max"]},bgWH:{number:!0,min:0,allowPercent:!0,enums:["auto"],multiple:!0},bgPos:{number:!0,allowPercent:!0,multiple:!0},bgRelativeTo:{enums:["inner","include-padding"],multiple:!0},bgRepeat:{enums:["repeat","repeat-x","repeat-y","no-repeat"],multiple:!0},bgFit:{enums:["none","contain","cover"],multiple:!0},bgCrossOrigin:{enums:["anonymous","use-credentials","null"],multiple:!0},bgClip:{enums:["none","node"],multiple:!0},bgContainment:{enums:["inside","over"],multiple:!0},color:{color:!0},colors:{color:!0,multiple:!0},fill:{enums:["solid","linear-gradient","radial-gradient"]},bool:{enums:["yes","no"]},bools:{enums:["yes","no"],multiple:!0},lineStyle:{enums:["solid","dotted","dashed"]},lineCap:{enums:["butt","round","square"]},borderStyle:{enums:["solid","dotted","dashed","double"]},curveStyle:{enums:["bezier","unbundled-bezier","haystack","segments","straight","straight-triangle","taxi"]},fontFamily:{regex:'^([\\w- \\"]+(?:\\s*,\\s*[\\w- \\"]+)*)$'},fontStyle:{enums:["italic","normal","oblique"]},fontWeight:{enums:["normal","bold","bolder","lighter","100","200","300","400","500","600","800","900",100,200,300,400,500,600,700,800,900]},textDecoration:{enums:["none","underline","overline","line-through"]},textTransform:{enums:["none","uppercase","lowercase"]},textWrap:{enums:["none","wrap","ellipsis"]},textOverflowWrap:{enums:["whitespace","anywhere"]},textBackgroundShape:{enums:["rectangle","roundrectangle","round-rectangle"]},nodeShape:{enums:["rectangle","roundrectangle","round-rectangle","cutrectangle","cut-rectangle","bottomroundrectangle","bottom-round-rectangle","barrel","ellipse","triangle","round-triangle","square","pentagon","round-pentagon","hexagon","round-hexagon","concavehexagon","concave-hexagon","heptagon","round-heptagon","octagon","round-octagon","tag","round-tag","star","diamond","round-diamond","vee","rhomboid","right-rhomboid","polygon"]},overlayShape:{enums:["roundrectangle","round-rectangle","ellipse"]},compoundIncludeLabels:{enums:["include","exclude"]},arrowShape:{enums:["tee","triangle","triangle-tee","circle-triangle","triangle-cross","triangle-backcurve","vee","square","circle","diamond","chevron","none"]},arrowFill:{enums:["filled","hollow"]},display:{enums:["element","none"]},visibility:{enums:["hidden","visible"]},zCompoundDepth:{enums:["bottom","orphan","auto","top"]},zIndexCompare:{enums:["auto","manual"]},valign:{enums:["top","center","bottom"]},halign:{enums:["left","center","right"]},justification:{enums:["left","center","right","auto"]},text:{string:!0},data:{mapping:!0,regex:g("data")},layoutData:{mapping:!0,regex:g("layoutData")},scratch:{mapping:!0,regex:g("scratch")},mapData:{mapping:!0,regex:b("mapData")},mapLayoutData:{mapping:!0,regex:b("mapLayoutData")},mapScratch:{mapping:!0,regex:b("mapScratch")},fn:{mapping:!0,fn:!0},url:{regexes:y,singleRegexMatchValue:!0},urls:{regexes:y,singleRegexMatchValue:!0,multiple:!0},propList:{propList:!0},angle:{number:!0,units:"deg|rad",implicitUnits:"rad"},textRotation:{number:!0,units:"deg|rad",implicitUnits:"rad",enums:["none","autorotate"]},polygonPointList:{number:!0,multiple:!0,evenMultiple:!0,min:-1,max:1,unitless:!0},edgeDistances:{enums:["intersection","node-position","endpoints"]},edgeEndpoint:{number:!0,multiple:!0,units:"%|px|em|deg|rad",implicitUnits:"px",enums:["inside-to-node","outside-to-node","outside-to-node-or-label","outside-to-line","outside-to-line-or-label"],singleEnum:!0,validate:function(Ve,Ke){switch(Ve.length){case 2:return Ke[0]!=="deg"&&Ke[0]!=="rad"&&Ke[1]!=="deg"&&Ke[1]!=="rad";case 1:return Yt(Ve[0])||Ke[0]==="deg"||Ke[0]==="rad";default:return!1}}},easing:{regexes:["^(spring)\\s*\\(\\s*("+a+")\\s*,\\s*("+a+")\\s*\\)$","^(cubic-bezier)\\s*\\(\\s*("+a+")\\s*,\\s*("+a+")\\s*,\\s*("+a+")\\s*,\\s*("+a+")\\s*\\)$"],enums:["linear","ease","ease-in","ease-out","ease-in-out","ease-in-sine","ease-out-sine","ease-in-out-sine","ease-in-quad","ease-out-quad","ease-in-out-quad","ease-in-cubic","ease-out-cubic","ease-in-out-cubic","ease-in-quart","ease-out-quart","ease-in-out-quart","ease-in-quint","ease-out-quint","ease-in-out-quint","ease-in-expo","ease-out-expo","ease-in-out-expo","ease-in-circ","ease-out-circ","ease-in-out-circ"]},gradientDirection:{enums:["to-bottom","to-top","to-left","to-right","to-bottom-right","to-bottom-left","to-top-right","to-top-left","to-right-bottom","to-left-bottom","to-right-top","to-left-top"]},boundsExpansion:{number:!0,multiple:!0,min:0,validate:function(Ve){var Ke=Ve.length;return Ke===1||Ke===2||Ke===4}}};var k={zeroNonZero:function(Ve,Ke){return(Ve==null||Ke==null)&&Ve!==Ke||Ve==0&&Ke!=0?!0:Ve!=0&&Ke==0},any:function(Ve,Ke){return Ve!=Ke},emptyNonEmpty:function(Ve,Ke){var at=Lf(Ve),ft=Lf(Ke);return at&&!ft||!at&&ft}},E=ro.types,C=[{name:"label",type:E.text,triggersBounds:k.any,triggersZOrder:k.emptyNonEmpty},{name:"text-rotation",type:E.textRotation,triggersBounds:k.any},{name:"text-margin-x",type:E.bidirectionalSize,triggersBounds:k.any},{name:"text-margin-y",type:E.bidirectionalSize,triggersBounds:k.any}],T=[{name:"source-label",type:E.text,triggersBounds:k.any},{name:"source-text-rotation",type:E.textRotation,triggersBounds:k.any},{name:"source-text-margin-x",type:E.bidirectionalSize,triggersBounds:k.any},{name:"source-text-margin-y",type:E.bidirectionalSize,triggersBounds:k.any},{name:"source-text-offset",type:E.size,triggersBounds:k.any}],P=[{name:"target-label",type:E.text,triggersBounds:k.any},{name:"target-text-rotation",type:E.textRotation,triggersBounds:k.any},{name:"target-text-margin-x",type:E.bidirectionalSize,triggersBounds:k.any},{name:"target-text-margin-y",type:E.bidirectionalSize,triggersBounds:k.any},{name:"target-text-offset",type:E.size,triggersBounds:k.any}],N=[{name:"font-family",type:E.fontFamily,triggersBounds:k.any},{name:"font-style",type:E.fontStyle,triggersBounds:k.any},{name:"font-weight",type:E.fontWeight,triggersBounds:k.any},{name:"font-size",type:E.size,triggersBounds:k.any},{name:"text-transform",type:E.textTransform,triggersBounds:k.any},{name:"text-wrap",type:E.textWrap,triggersBounds:k.any},{name:"text-overflow-wrap",type:E.textOverflowWrap,triggersBounds:k.any},{name:"text-max-width",type:E.size,triggersBounds:k.any},{name:"text-outline-width",type:E.size,triggersBounds:k.any},{name:"line-height",type:E.positiveNumber,triggersBounds:k.any}],D=[{name:"text-valign",type:E.valign,triggersBounds:k.any},{name:"text-halign",type:E.halign,triggersBounds:k.any},{name:"color",type:E.color},{name:"text-outline-color",type:E.color},{name:"text-outline-opacity",type:E.zeroOneNumber},{name:"text-background-color",type:E.color},{name:"text-background-opacity",type:E.zeroOneNumber},{name:"text-background-padding",type:E.size,triggersBounds:k.any},{name:"text-border-opacity",type:E.zeroOneNumber},{name:"text-border-color",type:E.color},{name:"text-border-width",type:E.size,triggersBounds:k.any},{name:"text-border-style",type:E.borderStyle,triggersBounds:k.any},{name:"text-background-shape",type:E.textBackgroundShape,triggersBounds:k.any},{name:"text-justification",type:E.justification}],H=[{name:"events",type:E.bool,triggersZOrder:k.any},{name:"text-events",type:E.bool,triggersZOrder:k.any}],_=[{name:"display",type:E.display,triggersZOrder:k.any,triggersBounds:k.any,triggersBoundsOfParallelBeziers:!0},{name:"visibility",type:E.visibility,triggersZOrder:k.any},{name:"opacity",type:E.zeroOneNumber,triggersZOrder:k.zeroNonZero},{name:"text-opacity",type:E.zeroOneNumber},{name:"min-zoomed-font-size",type:E.size},{name:"z-compound-depth",type:E.zCompoundDepth,triggersZOrder:k.any},{name:"z-index-compare",type:E.zIndexCompare,triggersZOrder:k.any},{name:"z-index",type:E.number,triggersZOrder:k.any}],B=[{name:"overlay-padding",type:E.size,triggersBounds:k.any},{name:"overlay-color",type:E.color},{name:"overlay-opacity",type:E.zeroOneNumber,triggersBounds:k.zeroNonZero},{name:"overlay-shape",type:E.overlayShape,triggersBounds:k.any}],$=[{name:"underlay-padding",type:E.size,triggersBounds:k.any},{name:"underlay-color",type:E.color},{name:"underlay-opacity",type:E.zeroOneNumber,triggersBounds:k.zeroNonZero},{name:"underlay-shape",type:E.overlayShape,triggersBounds:k.any}],F=[{name:"transition-property",type:E.propList},{name:"transition-duration",type:E.time},{name:"transition-delay",type:E.time},{name:"transition-timing-function",type:E.easing}],W=function(Ve,Ke){return Ke.value==="label"?-Ve.poolIndex():Ke.pfValue},Q=[{name:"height",type:E.nodeSize,triggersBounds:k.any,hashOverride:W},{name:"width",type:E.nodeSize,triggersBounds:k.any,hashOverride:W},{name:"shape",type:E.nodeShape,triggersBounds:k.any},{name:"shape-polygon-points",type:E.polygonPointList,triggersBounds:k.any},{name:"background-color",type:E.color},{name:"background-fill",type:E.fill},{name:"background-opacity",type:E.zeroOneNumber},{name:"background-blacken",type:E.nOneOneNumber},{name:"background-gradient-stop-colors",type:E.colors},{name:"background-gradient-stop-positions",type:E.percentages},{name:"background-gradient-direction",type:E.gradientDirection},{name:"padding",type:E.sizeMaybePercent,triggersBounds:k.any},{name:"padding-relative-to",type:E.paddingRelativeTo,triggersBounds:k.any},{name:"bounds-expansion",type:E.boundsExpansion,triggersBounds:k.any}],X=[{name:"border-color",type:E.color},{name:"border-opacity",type:E.zeroOneNumber},{name:"border-width",type:E.size,triggersBounds:k.any},{name:"border-style",type:E.borderStyle}],K=[{name:"background-image",type:E.urls},{name:"background-image-crossorigin",type:E.bgCrossOrigin},{name:"background-image-opacity",type:E.zeroOneNumbers},{name:"background-image-containment",type:E.bgContainment},{name:"background-image-smoothing",type:E.bools},{name:"background-position-x",type:E.bgPos},{name:"background-position-y",type:E.bgPos},{name:"background-width-relative-to",type:E.bgRelativeTo},{name:"background-height-relative-to",type:E.bgRelativeTo},{name:"background-repeat",type:E.bgRepeat},{name:"background-fit",type:E.bgFit},{name:"background-clip",type:E.bgClip},{name:"background-width",type:E.bgWH},{name:"background-height",type:E.bgWH},{name:"background-offset-x",type:E.bgPos},{name:"background-offset-y",type:E.bgPos}],ee=[{name:"position",type:E.position,triggersBounds:k.any},{name:"compound-sizing-wrt-labels",type:E.compoundIncludeLabels,triggersBounds:k.any},{name:"min-width",type:E.size,triggersBounds:k.any},{name:"min-width-bias-left",type:E.sizeMaybePercent,triggersBounds:k.any},{name:"min-width-bias-right",type:E.sizeMaybePercent,triggersBounds:k.any},{name:"min-height",type:E.size,triggersBounds:k.any},{name:"min-height-bias-top",type:E.sizeMaybePercent,triggersBounds:k.any},{name:"min-height-bias-bottom",type:E.sizeMaybePercent,triggersBounds:k.any}],Z=[{name:"line-style",type:E.lineStyle},{name:"line-color",type:E.color},{name:"line-fill",type:E.fill},{name:"line-cap",type:E.lineCap},{name:"line-opacity",type:E.zeroOneNumber},{name:"line-dash-pattern",type:E.numbers},{name:"line-dash-offset",type:E.number},{name:"line-gradient-stop-colors",type:E.colors},{name:"line-gradient-stop-positions",type:E.percentages},{name:"curve-style",type:E.curveStyle,triggersBounds:k.any,triggersBoundsOfParallelBeziers:!0},{name:"haystack-radius",type:E.zeroOneNumber,triggersBounds:k.any},{name:"source-endpoint",type:E.edgeEndpoint,triggersBounds:k.any},{name:"target-endpoint",type:E.edgeEndpoint,triggersBounds:k.any},{name:"control-point-step-size",type:E.size,triggersBounds:k.any},{name:"control-point-distances",type:E.bidirectionalSizes,triggersBounds:k.any},{name:"control-point-weights",type:E.numbers,triggersBounds:k.any},{name:"segment-distances",type:E.bidirectionalSizes,triggersBounds:k.any},{name:"segment-weights",type:E.numbers,triggersBounds:k.any},{name:"taxi-turn",type:E.bidirectionalSizeMaybePercent,triggersBounds:k.any},{name:"taxi-turn-min-distance",type:E.size,triggersBounds:k.any},{name:"taxi-direction",type:E.axisDirection,triggersBounds:k.any},{name:"edge-distances",type:E.edgeDistances,triggersBounds:k.any},{name:"arrow-scale",type:E.positiveNumber,triggersBounds:k.any},{name:"loop-direction",type:E.angle,triggersBounds:k.any},{name:"loop-sweep",type:E.angle,triggersBounds:k.any},{name:"source-distance-from-node",type:E.size,triggersBounds:k.any},{name:"target-distance-from-node",type:E.size,triggersBounds:k.any}],ae=[{name:"ghost",type:E.bool,triggersBounds:k.any},{name:"ghost-offset-x",type:E.bidirectionalSize,triggersBounds:k.any},{name:"ghost-offset-y",type:E.bidirectionalSize,triggersBounds:k.any},{name:"ghost-opacity",type:E.zeroOneNumber}],oe=[{name:"selection-box-color",type:E.color},{name:"selection-box-opacity",type:E.zeroOneNumber},{name:"selection-box-border-color",type:E.color},{name:"selection-box-border-width",type:E.size},{name:"active-bg-color",type:E.color},{name:"active-bg-opacity",type:E.zeroOneNumber},{name:"active-bg-size",type:E.size},{name:"outside-texture-bg-color",type:E.color},{name:"outside-texture-bg-opacity",type:E.zeroOneNumber}],J=[];ro.pieBackgroundN=16,J.push({name:"pie-size",type:E.sizeMaybePercent});for(var fe=1;fe<=ro.pieBackgroundN;fe++)J.push({name:"pie-"+fe+"-background-color",type:E.color}),J.push({name:"pie-"+fe+"-background-size",type:E.percent}),J.push({name:"pie-"+fe+"-background-opacity",type:E.zeroOneNumber});var se=[],pe=ro.arrowPrefixes=["source","mid-source","target","mid-target"];[{name:"arrow-shape",type:E.arrowShape,triggersBounds:k.any},{name:"arrow-color",type:E.color},{name:"arrow-fill",type:E.arrowFill}].forEach(function(me){pe.forEach(function(Ve){var Ke=Ve+"-"+me.name,at=me.type,ft=me.triggersBounds;se.push({name:Ke,type:at,triggersBounds:ft})})},{});var he=ro.properties=[].concat(H,F,_,B,$,ae,D,N,C,T,P,Q,X,K,J,ee,Z,se,oe),de=ro.propertyGroups={behavior:H,transition:F,visibility:_,overlay:B,underlay:$,ghost:ae,commonLabel:D,labelDimensions:N,mainLabel:C,sourceLabel:T,targetLabel:P,nodeBody:Q,nodeBorder:X,backgroundImage:K,pie:J,compound:ee,edgeLine:Z,edgeArrow:se,core:oe},ke=ro.propertyGroupNames={},Pe=ro.propertyGroupKeys=Object.keys(de);Pe.forEach(function(me){ke[me]=de[me].map(function(Ve){return Ve.name}),de[me].forEach(function(Ve){return Ve.groupKey=me})});var Ae=ro.aliases=[{name:"content",pointsTo:"label"},{name:"control-point-distance",pointsTo:"control-point-distances"},{name:"control-point-weight",pointsTo:"control-point-weights"},{name:"edge-text-rotation",pointsTo:"text-rotation"},{name:"padding-left",pointsTo:"padding"},{name:"padding-right",pointsTo:"padding"},{name:"padding-top",pointsTo:"padding"},{name:"padding-bottom",pointsTo:"padding"}];ro.propertyNames=he.map(function(me){return me.name});for(var Te=0;Te<he.length;Te++){var Oe=he[Te];he[Oe.name]=Oe}for(var ze=0;ze<Ae.length;ze++){var We=Ae[ze],$e=he[We.pointsTo],Ge={name:We.name,alias:!0,pointsTo:$e};he.push(Ge),he[We.name]=Ge}})(),ro.getDefaultProperty=function(a){return this.getDefaultProperties()[a]},ro.getDefaultProperties=function(){var a=this._private;if(a.defaultProperties!=null)return a.defaultProperties;for(var r=en({"selection-box-color":"#ddd","selection-box-opacity":.65,"selection-box-border-color":"#aaa","selection-box-border-width":1,"active-bg-color":"black","active-bg-opacity":.15,"active-bg-size":30,"outside-texture-bg-color":"#000","outside-texture-bg-opacity":.125,events:"yes","text-events":"no","text-valign":"top","text-halign":"center","text-justification":"auto","line-height":1,color:"#000","text-outline-color":"#000","text-outline-width":0,"text-outline-opacity":1,"text-opacity":1,"text-decoration":"none","text-transform":"none","text-wrap":"none","text-overflow-wrap":"whitespace","text-max-width":9999,"text-background-color":"#000","text-background-opacity":0,"text-background-shape":"rectangle","text-background-padding":0,"text-border-opacity":0,"text-border-width":0,"text-border-style":"solid","text-border-color":"#000","font-family":"Helvetica Neue, Helvetica, sans-serif","font-style":"normal","font-weight":"normal","font-size":16,"min-zoomed-font-size":0,"text-rotation":"none","source-text-rotation":"none","target-text-rotation":"none",visibility:"visible",display:"element",opacity:1,"z-compound-depth":"auto","z-index-compare":"auto","z-index":0,label:"","text-margin-x":0,"text-margin-y":0,"source-label":"","source-text-offset":0,"source-text-margin-x":0,"source-text-margin-y":0,"target-label":"","target-text-offset":0,"target-text-margin-x":0,"target-text-margin-y":0,"overlay-opacity":0,"overlay-color":"#000","overlay-padding":10,"overlay-shape":"round-rectangle","underlay-opacity":0,"underlay-color":"#000","underlay-padding":10,"underlay-shape":"round-rectangle","transition-property":"none","transition-duration":0,"transition-delay":0,"transition-timing-function":"linear","background-blacken":0,"background-color":"#999","background-fill":"solid","background-opacity":1,"background-image":"none","background-image-crossorigin":"anonymous","background-image-opacity":1,"background-image-containment":"inside","background-image-smoothing":"yes","background-position-x":"50%","background-position-y":"50%","background-offset-x":0,"background-offset-y":0,"background-width-relative-to":"include-padding","background-height-relative-to":"include-padding","background-repeat":"no-repeat","background-fit":"none","background-clip":"node","background-width":"auto","background-height":"auto","border-color":"#000","border-opacity":1,"border-width":0,"border-style":"solid",height:30,width:30,shape:"ellipse","shape-polygon-points":"-1, -1,   1, -1,   1, 1,   -1, 1","bounds-expansion":0,"background-gradient-direction":"to-bottom","background-gradient-stop-colors":"#999","background-gradient-stop-positions":"0%",ghost:"no","ghost-offset-y":0,"ghost-offset-x":0,"ghost-opacity":0,padding:0,"padding-relative-to":"width",position:"origin","compound-sizing-wrt-labels":"include","min-width":0,"min-width-bias-left":0,"min-width-bias-right":0,"min-height":0,"min-height-bias-top":0,"min-height-bias-bottom":0},{"pie-size":"100%"},[{name:"pie-{{i}}-background-color",value:"black"},{name:"pie-{{i}}-background-size",value:"0%"},{name:"pie-{{i}}-background-opacity",value:1}].reduce(function(k,E){for(var C=1;C<=ro.pieBackgroundN;C++){var T=E.name.replace("{{i}}",C),P=E.value;k[T]=P}return k},{}),{"line-style":"solid","line-color":"#999","line-fill":"solid","line-cap":"butt","line-opacity":1,"line-gradient-stop-colors":"#999","line-gradient-stop-positions":"0%","control-point-step-size":40,"control-point-weights":.5,"segment-weights":.5,"segment-distances":20,"taxi-turn":"50%","taxi-turn-min-distance":10,"taxi-direction":"auto","edge-distances":"intersection","curve-style":"haystack","haystack-radius":0,"arrow-scale":1,"loop-direction":"-45deg","loop-sweep":"-90deg","source-distance-from-node":0,"target-distance-from-node":0,"source-endpoint":"outside-to-node","target-endpoint":"outside-to-node","line-dash-pattern":[6,3],"line-dash-offset":0},[{name:"arrow-shape",value:"none"},{name:"arrow-color",value:"#999"},{name:"arrow-fill",value:"filled"}].reduce(function(k,E){return ro.arrowPrefixes.forEach(function(C){var T=C+"-"+E.name,P=E.value;k[T]=P}),k},{})),u={},c=0;c<this.properties.length;c++){var d=this.properties[c];if(!d.pointsTo){var g=d.name,b=r[g],y=this.parse(g,b);u[g]=y}}return a.defaultProperties=u,a.defaultProperties},ro.addDefaultStylesheet=function(){this.selector(":parent").css({shape:"rectangle",padding:10,"background-color":"#eee","border-color":"#ccc","border-width":1}).selector("edge").css({width:3}).selector(":loop").css({"curve-style":"bezier"}).selector("edge:compound").css({"curve-style":"bezier","source-endpoint":"outside-to-line","target-endpoint":"outside-to-line"}).selector(":selected").css({"background-color":"#0169D9","line-color":"#0169D9","source-arrow-color":"#0169D9","target-arrow-color":"#0169D9","mid-source-arrow-color":"#0169D9","mid-target-arrow-color":"#0169D9"}).selector(":parent:selected").css({"background-color":"#CCE1F9","border-color":"#aec8e5"}).selector(":active").css({"overlay-color":"black","overlay-padding":10,"overlay-opacity":.25}),this.defaultLength=this.length};var Jw={};Jw.parse=function(a,r,u,c){var d=this;if(Ci(r))return d.parseImplWarn(a,r,u,c);var g=c==="mapping"||c===!0||c===!1||c==null?"dontcare":c,b=u?"t":"f",y=""+r,k=OP(a,y,b,g),E=d.propCache=d.propCache||[],C;return(C=E[k])||(C=E[k]=d.parseImplWarn(a,r,u,c)),(u||c==="mapping")&&(C=Tc(C),C&&(C.value=Tc(C.value))),C},Jw.parseImplWarn=function(a,r,u,c){var d=this.parseImpl(a,r,u,c);return!d&&r!=null&&pr("The style property `".concat(a,": ").concat(r,"` is invalid")),d&&(d.name==="width"||d.name==="height")&&r==="label"&&pr("The style value of `label` is deprecated for `"+d.name+"`"),d},Jw.parseImpl=function(a,r,u,c){var d=this;a=O5(a);var g=d.properties[a],b=r,y=d.types;if(!g||r===void 0)return null;g.alias&&(g=g.pointsTo,a=g.name);var k=Yt(r);k&&(r=r.trim());var E=g.type;if(!E)return null;if(u&&(r===""||r===null))return{name:a,value:r,bypass:!0,deleteBypass:!0};if(Ci(r))return{name:a,value:r,strValue:"fn",mapped:y.fn,bypass:u};var C,T;if(!(!k||c||r.length<7||r[1]!=="a")){if(r.length>=7&&r[0]==="d"&&(C=new RegExp(y.data.regex).exec(r))){if(u)return!1;var P=y.data;return{name:a,value:C,strValue:""+r,mapped:P,field:C[1],bypass:u}}else if(r.length>=10&&r[0]==="m"&&(T=new RegExp(y.mapData.regex).exec(r))){if(u||E.multiple)return!1;var N=y.mapData;if(!(E.color||E.number))return!1;var D=this.parse(a,T[4]);if(!D||D.mapped)return!1;var H=this.parse(a,T[5]);if(!H||H.mapped)return!1;if(D.pfValue===H.pfValue||D.strValue===H.strValue)return pr("`"+a+": "+r+"` is not a valid mapper because the output range is zero; converting to `"+a+": "+D.strValue+"`"),this.parse(a,D.strValue);if(E.color){var _=D.value,B=H.value,$=_[0]===B[0]&&_[1]===B[1]&&_[2]===B[2]&&(_[3]===B[3]||(_[3]==null||_[3]===1)&&(B[3]==null||B[3]===1));if($)return!1}return{name:a,value:T,strValue:""+r,mapped:N,field:T[1],fieldMin:parseFloat(T[2]),fieldMax:parseFloat(T[3]),valueMin:D.value,valueMax:H.value,bypass:u}}}if(E.multiple&&c!=="multiple"){var F;if(k?F=r.split(/\s+/):Wr(r)?F=r:F=[r],E.evenMultiple&&F.length%2!==0)return null;for(var W=[],Q=[],X=[],K="",ee=!1,Z=0;Z<F.length;Z++){var ae=d.parse(a,F[Z],u,"multiple");ee=ee||Yt(ae.value),W.push(ae.value),X.push(ae.pfValue!=null?ae.pfValue:ae.value),Q.push(ae.units),K+=(Z>0?" ":"")+ae.strValue}return E.validate&&!E.validate(W,Q)?null:E.singleEnum&&ee?W.length===1&&Yt(W[0])?{name:a,value:W[0],strValue:W[0],bypass:u}:null:{name:a,value:W,pfValue:X,strValue:K,bypass:u,units:Q}}var oe=function(){for(var Ke=0;Ke<E.enums.length;Ke++){var at=E.enums[Ke];if(at===r)return{name:a,value:r,strValue:""+r,bypass:u}}return null};if(E.number){var J,fe="px";if(E.units&&(J=E.units),E.implicitUnits&&(fe=E.implicitUnits),!E.unitless)if(k){var se="px|em"+(E.allowPercent?"|\\%":"");J&&(se=J);var pe=r.match("^("+ka+")("+se+")?$");pe&&(r=pe[1],J=pe[2]||fe)}else(!J||E.implicitUnits)&&(J=fe);if(r=parseFloat(r),isNaN(r)&&E.enums===void 0)return null;if(isNaN(r)&&E.enums!==void 0)return r=b,oe();if(E.integer&&!lU(r)||E.min!==void 0&&(r<E.min||E.strictMin&&r===E.min)||E.max!==void 0&&(r>E.max||E.strictMax&&r===E.max))return null;var he={name:a,value:r,strValue:""+r+(J||""),units:J,bypass:u};return E.unitless||J!=="px"&&J!=="em"?he.pfValue=r:he.pfValue=J==="px"||!J?r:this.getEmSizeInPixels()*r,(J==="ms"||J==="s")&&(he.pfValue=J==="ms"?r:1e3*r),(J==="deg"||J==="rad")&&(he.pfValue=J==="rad"?r:aK(r)),J==="%"&&(he.pfValue=r/100),he}else if(E.propList){var de=[],ke=""+r;if(ke!=="none"){for(var Pe=ke.split(/\s*,\s*|\s+/),Ae=0;Ae<Pe.length;Ae++){var Te=Pe[Ae].trim();d.properties[Te]?de.push(Te):pr("`"+Te+"` is not a valid property name")}if(de.length===0)return null}return{name:a,value:de,strValue:de.length===0?"none":de.join(" "),bypass:u}}else if(E.color){var Oe=LU(r);return Oe?{name:a,value:Oe,pfValue:Oe,strValue:"rgb("+Oe[0]+","+Oe[1]+","+Oe[2]+")",bypass:u}:null}else if(E.regex||E.regexes){if(E.enums){var ze=oe();if(ze)return ze}for(var We=E.regexes?E.regexes:[E.regex],$e=0;$e<We.length;$e++){var Ge=new RegExp(We[$e]),me=Ge.exec(r);if(me)return{name:a,value:E.singleRegexMatchValue?me[1]:me,strValue:""+r,bypass:u}}return null}else return E.string?{name:a,value:""+r,strValue:""+r,bypass:u}:E.enums?oe():null};var ko=function a(r){if(!(this instanceof a))return new a(r);if(!M5(r)){Hi("A style must have a core reference");return}this._private={cy:r,coreStyle:{}},this.length=0,this.resetToDefault()},Eo=ko.prototype;Eo.instanceString=function(){return"style"},Eo.clear=function(){for(var a=this._private,r=a.cy,u=r.elements(),c=0;c<this.length;c++)this[c]=void 0;return this.length=0,a.contextStyles={},a.propDiffs={},this.cleanElements(u,!0),u.forEach(function(d){var g=d[0]._private;g.styleDirty=!0,g.appliedInitStyle=!1}),this},Eo.resetToDefault=function(){return this.clear(),this.addDefaultStylesheet(),this},Eo.core=function(a){return this._private.coreStyle[a]||this.getDefaultProperty(a)},Eo.selector=function(a){var r=a==="core"?null:new Mf(a),u=this.length++;return this[u]={selector:r,properties:[],mappedProperties:[],index:u},this},Eo.css=function(){var a=this,r=arguments;if(r.length===1)for(var u=r[0],c=0;c<a.properties.length;c++){var d=a.properties[c],g=u[d.name];g===void 0&&(g=u[Cw(d.name)]),g!==void 0&&this.cssRule(d.name,g)}else r.length===2&&this.cssRule(r[0],r[1]);return this},Eo.style=Eo.css,Eo.cssRule=function(a,r){var u=this.parse(a,r);if(u){var c=this.length-1;this[c].properties.push(u),this[c].properties[u.name]=u,u.name.match(/pie-(\d+)-background-size/)&&u.value&&(this._private.hasPie=!0),u.mapped&&this[c].mappedProperties.push(u);var d=!this[c].selector;d&&(this._private.coreStyle[u.name]=u)}return this},Eo.append=function(a){return xP(a)?a.appendToStyle(this):Wr(a)?this.appendFromJson(a):Yt(a)&&this.appendFromString(a),this},ko.fromJson=function(a,r){var u=new ko(a);return u.fromJson(r),u},ko.fromString=function(a,r){return new ko(a).fromString(r)},[yo,p1,sS,Pc,Qw,uS,ro,Jw].forEach(function(a){en(Eo,a)}),ko.types=Eo.types,ko.properties=Eo.properties,ko.propertyGroups=Eo.propertyGroups,ko.propertyGroupNames=Eo.propertyGroupNames,ko.propertyGroupKeys=Eo.propertyGroupKeys;var pX={style:function(r){if(r){var u=this.setStyle(r);u.update()}return this._private.style},setStyle:function(r){var u=this._private;return xP(r)?u.style=r.generateStyle(this):Wr(r)?u.style=ko.fromJson(this,r):Yt(r)?u.style=ko.fromString(this,r):u.style=ko(this),u.style},updateStyle:function(){this.mutableElements().updateStyle()}},wX="single",Jh={autolock:function(r){if(r!==void 0)this._private.autolock=!!r;else return this._private.autolock;return this},autoungrabify:function(r){if(r!==void 0)this._private.autoungrabify=!!r;else return this._private.autoungrabify;return this},autounselectify:function(r){if(r!==void 0)this._private.autounselectify=!!r;else return this._private.autounselectify;return this},selectionType:function(r){var u=this._private;if(u.selectionType==null&&(u.selectionType=wX),r!==void 0)(r==="additive"||r==="single")&&(u.selectionType=r);else return u.selectionType;return this},panningEnabled:function(r){if(r!==void 0)this._private.panningEnabled=!!r;else return this._private.panningEnabled;return this},userPanningEnabled:function(r){if(r!==void 0)this._private.userPanningEnabled=!!r;else return this._private.userPanningEnabled;return this},zoomingEnabled:function(r){if(r!==void 0)this._private.zoomingEnabled=!!r;else return this._private.zoomingEnabled;return this},userZoomingEnabled:function(r){if(r!==void 0)this._private.userZoomingEnabled=!!r;else return this._private.userZoomingEnabled;return this},boxSelectionEnabled:function(r){if(r!==void 0)this._private.boxSelectionEnabled=!!r;else return this._private.boxSelectionEnabled;return this},pan:function(){var r=arguments,u=this._private.pan,c,d,g,b,y;switch(r.length){case 0:return u;case 1:if(Yt(r[0]))return c=r[0],u[c];if(ar(r[0])){if(!this._private.panningEnabled)return this;g=r[0],b=g.x,y=g.y,kt(b)&&(u.x=b),kt(y)&&(u.y=y),this.emit("pan viewport")}break;case 2:if(!this._private.panningEnabled)return this;c=r[0],d=r[1],(c==="x"||c==="y")&&kt(d)&&(u[c]=d),this.emit("pan viewport");break}return this.notify("viewport"),this},panBy:function(r,u){var c=arguments,d=this._private.pan,g,b,y,k,E;if(!this._private.panningEnabled)return this;switch(c.length){case 1:ar(r)&&(y=c[0],k=y.x,E=y.y,kt(k)&&(d.x+=k),kt(E)&&(d.y+=E),this.emit("pan viewport"));break;case 2:g=r,b=u,(g==="x"||g==="y")&&kt(b)&&(d[g]+=b),this.emit("pan viewport");break}return this.notify("viewport"),this},fit:function(r,u){var c=this.getFitViewport(r,u);if(c){var d=this._private;d.zoom=c.zoom,d.pan=c.pan,this.emit("pan zoom viewport"),this.notify("viewport")}return this},getFitViewport:function(r,u){if(kt(r)&&u===void 0&&(u=r,r=void 0),!(!this._private.panningEnabled||!this._private.zoomingEnabled)){var c;if(Yt(r)){var d=r;r=this.$(d)}else if(dU(r)){var g=r;c={x1:g.x1,y1:g.y1,x2:g.x2,y2:g.y2},c.w=c.x2-c.x1,c.h=c.y2-c.y1}else Os(r)||(r=this.mutableElements());if(!(Os(r)&&r.empty())){c=c||r.boundingBox();var b=this.width(),y=this.height(),k;if(u=kt(u)?u:0,!isNaN(b)&&!isNaN(y)&&b>0&&y>0&&!isNaN(c.w)&&!isNaN(c.h)&&c.w>0&&c.h>0){k=Math.min((b-2*u)/c.w,(y-2*u)/c.h),k=k>this._private.maxZoom?this._private.maxZoom:k,k=k<this._private.minZoom?this._private.minZoom:k;var E={x:(b-k*(c.x1+c.x2))/2,y:(y-k*(c.y1+c.y2))/2};return{zoom:k,pan:E}}}}},zoomRange:function(r,u){var c=this._private;if(u==null){var d=r;r=d.min,u=d.max}return kt(r)&&kt(u)&&r<=u?(c.minZoom=r,c.maxZoom=u):kt(r)&&u===void 0&&r<=c.maxZoom?c.minZoom=r:kt(u)&&r===void 0&&u>=c.minZoom&&(c.maxZoom=u),this},minZoom:function(r){return r===void 0?this._private.minZoom:this.zoomRange({min:r})},maxZoom:function(r){return r===void 0?this._private.maxZoom:this.zoomRange({max:r})},getZoomedViewport:function(r){var u=this._private,c=u.pan,d=u.zoom,g,b,y=!1;if(u.zoomingEnabled||(y=!0),kt(r)?b=r:ar(r)&&(b=r.level,r.position!=null?g=Dw(r.position,d,c):r.renderedPosition!=null&&(g=r.renderedPosition),g!=null&&!u.panningEnabled&&(y=!0)),b=b>u.maxZoom?u.maxZoom:b,b=b<u.minZoom?u.minZoom:b,y||!kt(b)||b===d||g!=null&&(!kt(g.x)||!kt(g.y)))return null;if(g!=null){var k=c,E=d,C=b,T={x:-C/E*(g.x-k.x)+g.x,y:-C/E*(g.y-k.y)+g.y};return{zoomed:!0,panned:!0,zoom:C,pan:T}}else return{zoomed:!0,panned:!1,zoom:b,pan:c}},zoom:function(r){if(r===void 0)return this._private.zoom;var u=this.getZoomedViewport(r),c=this._private;return u==null||!u.zoomed?this:(c.zoom=u.zoom,u.panned&&(c.pan.x=u.pan.x,c.pan.y=u.pan.y),this.emit("zoom"+(u.panned?" pan":"")+" viewport"),this.notify("viewport"),this)},viewport:function(r){var u=this._private,c=!0,d=!0,g=[],b=!1,y=!1;if(!r)return this;if(kt(r.zoom)||(c=!1),ar(r.pan)||(d=!1),!c&&!d)return this;if(c){var k=r.zoom;k<u.minZoom||k>u.maxZoom||!u.zoomingEnabled?b=!0:(u.zoom=k,g.push("zoom"))}if(d&&(!b||!r.cancelOnFailedZoom)&&u.panningEnabled){var E=r.pan;kt(E.x)&&(u.pan.x=E.x,y=!1),kt(E.y)&&(u.pan.y=E.y,y=!1),y||g.push("pan")}return g.length>0&&(g.push("viewport"),this.emit(g.join(" ")),this.notify("viewport")),this},center:function(r){var u=this.getCenterPan(r);return u&&(this._private.pan=u,this.emit("pan viewport"),this.notify("viewport")),this},getCenterPan:function(r,u){if(this._private.panningEnabled){if(Yt(r)){var c=r;r=this.mutableElements().filter(c)}else Os(r)||(r=this.mutableElements());if(r.length!==0){var d=r.boundingBox(),g=this.width(),b=this.height();u=u===void 0?this._private.zoom:u;var y={x:(g-u*(d.x1+d.x2))/2,y:(b-u*(d.y1+d.y2))/2};return y}}},reset:function(){return!this._private.panningEnabled||!this._private.zoomingEnabled?this:(this.viewport({pan:{x:0,y:0},zoom:1}),this)},invalidateSize:function(){this._private.sizeCache=null},size:function(){var r=this._private,u=r.container,c=this;return r.sizeCache=r.sizeCache||(u?function(){var d=c.window().getComputedStyle(u),g=function(y){return parseFloat(d.getPropertyValue(y))};return{width:u.clientWidth-g("padding-left")-g("padding-right"),height:u.clientHeight-g("padding-top")-g("padding-bottom")}}():{width:1,height:1})},width:function(){return this.size().width},height:function(){return this.size().height},extent:function(){var r=this._private.pan,u=this._private.zoom,c=this.renderedExtent(),d={x1:(c.x1-r.x)/u,x2:(c.x2-r.x)/u,y1:(c.y1-r.y)/u,y2:(c.y2-r.y)/u};return d.w=d.x2-d.x1,d.h=d.y2-d.y1,d},renderedExtent:function(){var r=this.width(),u=this.height();return{x1:0,y1:0,x2:r,y2:u,w:r,h:u}},multiClickDebounceTime:function(r){if(r)this._private.multiClickDebounceTime=r;else return this._private.multiClickDebounceTime;return this}};Jh.centre=Jh.center,Jh.autolockNodes=Jh.autolock,Jh.autoungrabifyNodes=Jh.autoungrabify;var w1={data:Cr.data({field:"data",bindingEvent:"data",allowBinding:!0,allowSetting:!0,settingEvent:"data",settingTriggersEvent:!0,triggerFnName:"trigger",allowGetting:!0,updateStyle:!0}),removeData:Cr.removeData({field:"data",event:"data",triggerFnName:"trigger",triggerEvent:!0,updateStyle:!0}),scratch:Cr.data({field:"scratch",bindingEvent:"scratch",allowBinding:!0,allowSetting:!0,settingEvent:"scratch",settingTriggersEvent:!0,triggerFnName:"trigger",allowGetting:!0,updateStyle:!0}),removeScratch:Cr.removeData({field:"scratch",event:"scratch",triggerFnName:"trigger",triggerEvent:!0,updateStyle:!0})};w1.attr=w1.data,w1.removeAttr=w1.removeData;var m1=function(r){var u=this;r=en({},r);var c=r.container;c&&!Sw(c)&&Sw(c[0])&&(c=c[0]);var d=c?c._cyreg:null;d=d||{},d&&d.cy&&(d.cy.destroy(),d={});var g=d.readies=d.readies||[];c&&(c._cyreg=d),d.cy=u;var b=ya!==void 0&&c!==void 0&&!r.headless,y=r;y.layout=en({name:b?"grid":"null"},y.layout),y.renderer=en({name:b?"canvas":"null"},y.renderer);var k=function(D,H,_){return H!==void 0?H:_!==void 0?_:D},E=this._private={container:c,ready:!1,options:y,elements:new no(this),listeners:[],aniEles:new no(this),data:y.data||{},scratch:{},layout:null,renderer:null,destroyed:!1,notificationsEnabled:!0,minZoom:1e-50,maxZoom:1e50,zoomingEnabled:k(!0,y.zoomingEnabled),userZoomingEnabled:k(!0,y.userZoomingEnabled),panningEnabled:k(!0,y.panningEnabled),userPanningEnabled:k(!0,y.userPanningEnabled),boxSelectionEnabled:k(!0,y.boxSelectionEnabled),autolock:k(!1,y.autolock,y.autolockNodes),autoungrabify:k(!1,y.autoungrabify,y.autoungrabifyNodes),autounselectify:k(!1,y.autounselectify),styleEnabled:y.styleEnabled===void 0?b:y.styleEnabled,zoom:kt(y.zoom)?y.zoom:1,pan:{x:ar(y.pan)&&kt(y.pan.x)?y.pan.x:0,y:ar(y.pan)&&kt(y.pan.y)?y.pan.y:0},animation:{current:[],queue:[]},hasCompoundNodes:!1,multiClickDebounceTime:k(250,y.multiClickDebounceTime)};this.createEmitter(),this.selectionType(y.selectionType),this.zoomRange({min:y.minZoom,max:y.maxZoom});var C=function(D,H){var _=D.some(vU);if(_)return Mv.all(D).then(H);H(D)};E.styleEnabled&&u.setStyle([]);var T=en({},y,y.renderer);u.initRenderer(T);var P=function(D,H,_){u.notifications(!1);var B=u.mutableElements();B.length>0&&B.remove(),D!=null&&(ar(D)||Wr(D))&&u.add(D),u.one("layoutready",function(F){u.notifications(!0),u.emit(F),u.one("load",H),u.emitAndNotify("load")}).one("layoutstop",function(){u.one("done",_),u.emit("done")});var $=en({},u._private.options.layout);$.eles=u.elements(),u.layout($).run()};C([y.style,y.elements],function(N){var D=N[0],H=N[1];E.styleEnabled&&u.style().append(D),P(H,function(){u.startAnimationLoop(),E.ready=!0,Ci(y.ready)&&u.on("ready",y.ready);for(var _=0;_<g.length;_++){var B=g[_];u.on("ready",B)}d&&(d.readies=[]),u.emit("ready")},y.done)})},em=m1.prototype;en(em,{instanceString:function(){return"core"},isReady:function(){return this._private.ready},destroyed:function(){return this._private.destroyed},ready:function(r){return this.isReady()?this.emitter().emit("ready",[],r):this.on("ready",r),this},destroy:function(){var r=this;if(!r.destroyed())return r.stopAnimationLoop(),r.destroyRenderer(),this.emit("destroy"),r._private.destroyed=!0,r},hasElementWithId:function(r){return this._private.elements.hasElementWithId(r)},getElementById:function(r){return this._private.elements.getElementById(r)},hasCompoundNodes:function(){return this._private.hasCompoundNodes},headless:function(){return this._private.renderer.isHeadless()},styleEnabled:function(){return this._private.styleEnabled},addToPool:function(r){return this._private.elements.merge(r),this},removeFromPool:function(r){return this._private.elements.unmerge(r),this},container:function(){return this._private.container||null},window:function(){var r=this._private.container;if(r==null)return ya;var u=this._private.container.ownerDocument;return u===void 0||u==null?ya:u.defaultView||ya},mount:function(r){if(r!=null){var u=this,c=u._private,d=c.options;return!Sw(r)&&Sw(r[0])&&(r=r[0]),u.stopAnimationLoop(),u.destroyRenderer(),c.container=r,c.styleEnabled=!0,u.invalidateSize(),u.initRenderer(en({},d,d.renderer,{name:d.renderer.name==="null"?"canvas":d.renderer.name})),u.startAnimationLoop(),u.style(d.style),u.emit("mount"),u}},unmount:function(){var r=this;return r.stopAnimationLoop(),r.destroyRenderer(),r.initRenderer({name:"null"}),r.emit("unmount"),r},options:function(){return Tc(this._private.options)},json:function(r){var u=this,c=u._private,d=u.mutableElements(),g=function(W){return u.getElementById(W.id())};if(ar(r)){if(u.startBatch(),r.elements){var b={},y=function(W,Q){for(var X=[],K=[],ee=0;ee<W.length;ee++){var Z=W[ee];if(!Z.data.id){pr("cy.json() cannot handle elements without an ID attribute");continue}var ae=""+Z.data.id,oe=u.getElementById(ae);b[ae]=!0,oe.length!==0?K.push({ele:oe,json:Z}):(Q&&(Z.group=Q),X.push(Z))}u.add(X);for(var J=0;J<K.length;J++){var fe=K[J],se=fe.ele,pe=fe.json;se.json(pe)}};if(Wr(r.elements))y(r.elements);else for(var k=["nodes","edges"],E=0;E<k.length;E++){var C=k[E],T=r.elements[C];Wr(T)&&y(T,C)}var P=u.collection();d.filter(function(F){return!b[F.id()]}).forEach(function(F){F.isParent()?P.merge(F):F.remove()}),P.forEach(function(F){return F.children().move({parent:null})}),P.forEach(function(F){return g(F).remove()})}r.style&&u.style(r.style),r.zoom!=null&&r.zoom!==c.zoom&&u.zoom(r.zoom),r.pan&&(r.pan.x!==c.pan.x||r.pan.y!==c.pan.y)&&u.pan(r.pan),r.data&&u.data(r.data);for(var N=["minZoom","maxZoom","zoomingEnabled","userZoomingEnabled","panningEnabled","userPanningEnabled","boxSelectionEnabled","autolock","autoungrabify","autounselectify","multiClickDebounceTime"],D=0;D<N.length;D++){var H=N[D];r[H]!=null&&u[H](r[H])}return u.endBatch(),this}else{var _=!!r,B={};_?B.elements=this.elements().map(function(F){return F.json()}):(B.elements={},d.forEach(function(F){var W=F.group();B.elements[W]||(B.elements[W]=[]),B.elements[W].push(F.json())})),this._private.styleEnabled&&(B.style=u.style().json()),B.data=Tc(u.data());var $=c.options;return B.zoomingEnabled=c.zoomingEnabled,B.userZoomingEnabled=c.userZoomingEnabled,B.zoom=c.zoom,B.minZoom=c.minZoom,B.maxZoom=c.maxZoom,B.panningEnabled=c.panningEnabled,B.userPanningEnabled=c.userPanningEnabled,B.pan=Tc(c.pan),B.boxSelectionEnabled=c.boxSelectionEnabled,B.renderer=Tc($.renderer),B.hideEdgesOnViewport=$.hideEdgesOnViewport,B.textureOnViewport=$.textureOnViewport,B.wheelSensitivity=$.wheelSensitivity,B.motionBlur=$.motionBlur,B.multiClickDebounceTime=$.multiClickDebounceTime,B}}}),em.$id=em.getElementById,[sX,hX,tD,aS,Zw,vX,oS,Xw,pX,Jh,w1].forEach(function(a){en(em,a)});var mX={fit:!0,directed:!1,padding:30,circle:!1,grid:!1,spacingFactor:1.75,boundingBox:void 0,avoidOverlap:!0,nodeDimensionsIncludeLabels:!1,roots:void 0,depthSort:void 0,animate:!1,animationDuration:500,animationEasing:void 0,animateFilter:function(r,u){return!0},ready:void 0,stop:void 0,transform:function(r,u){return u}},yX={maximal:!1,acyclic:!1},Gv=function(r){return r.scratch("breadthfirst")},nD=function(r,u){return r.scratch("breadthfirst",u)};function rD(a){this.options=en({},mX,yX,a)}rD.prototype.run=function(){var a=this.options,r=a,u=a.cy,c=r.eles,d=c.nodes().filter(function(mt){return!mt.isParent()}),g=c,b=r.directed,y=r.acyclic||r.maximal||r.maximalAdjustments>0,k=cs(r.boundingBox?r.boundingBox:{x1:0,y1:0,w:u.width(),h:u.height()}),E;if(Os(r.roots))E=r.roots;else if(Wr(r.roots)){for(var C=[],T=0;T<r.roots.length;T++){var P=r.roots[T],N=u.getElementById(P);C.push(N)}E=u.collection(C)}else if(Yt(r.roots))E=u.$(r.roots);else if(b)E=d.roots();else{var D=c.components();E=u.collection();for(var H=function(ht){var Rt=D[ht],Lt=Rt.maxDegree(!1),yt=Rt.filter(function(Mt){return Mt.degree(!1)===Lt});E=E.add(yt)},_=0;_<D.length;_++)H(_)}var B=[],$={},F=function(ht,Rt){B[Rt]==null&&(B[Rt]=[]);var Lt=B[Rt].length;B[Rt].push(ht),nD(ht,{index:Lt,depth:Rt})},W=function(ht,Rt){var Lt=Gv(ht),yt=Lt.depth,Mt=Lt.index;B[yt][Mt]=null,F(ht,Rt)};g.bfs({roots:E,directed:r.directed,visit:function(ht,Rt,Lt,yt,Mt){var In=ht[0],Pn=In.id();F(In,Mt),$[Pn]=!0}});for(var Q=[],X=0;X<d.length;X++){var K=d[X];$[K.id()]||Q.push(K)}var ee=function(ht){for(var Rt=B[ht],Lt=0;Lt<Rt.length;Lt++){var yt=Rt[Lt];if(yt==null){Rt.splice(Lt,1),Lt--;continue}nD(yt,{depth:ht,index:Lt})}},Z=function(){for(var ht=0;ht<B.length;ht++)ee(ht)},ae=function(ht,Rt){for(var Lt=Gv(ht),yt=ht.incomers().filter(function(ne){return ne.isNode()&&c.has(ne)}),Mt=-1,In=ht.id(),Pn=0;Pn<yt.length;Pn++){var Vt=yt[Pn],sr=Gv(Vt);Mt=Math.max(Mt,sr.depth)}if(Lt.depth<=Mt){if(!r.acyclic&&Rt[In])return null;var Qe=Mt+1;return W(ht,Qe),Rt[In]=Qe,!0}return!1};if(b&&y){var oe=[],J={},fe=function(ht){return oe.push(ht)},se=function(){return oe.shift()};for(d.forEach(function(mt){return oe.push(mt)});oe.length>0;){var pe=se(),he=ae(pe,J);if(he)pe.outgoers().filter(function(mt){return mt.isNode()&&c.has(mt)}).forEach(fe);else if(he===null){pr("Detected double maximal shift for node `"+pe.id()+"`.  Bailing maximal adjustment due to cycle.  Use `options.maximal: true` only on DAGs.");break}}}Z();var de=0;if(r.avoidOverlap)for(var ke=0;ke<d.length;ke++){var Pe=d[ke],Ae=Pe.layoutDimensions(r),Te=Ae.w,Oe=Ae.h;de=Math.max(de,Te,Oe)}var ze={},We=function(ht){if(ze[ht.id()])return ze[ht.id()];for(var Rt=Gv(ht).depth,Lt=ht.neighborhood(),yt=0,Mt=0,In=0;In<Lt.length;In++){var Pn=Lt[In];if(!(Pn.isEdge()||Pn.isParent()||!d.has(Pn))){var Vt=Gv(Pn);if(Vt!=null){var sr=Vt.index,Qe=Vt.depth;if(!(sr==null||Qe==null)){var ne=B[Qe].length;Qe<Rt&&(yt+=sr/ne,Mt++)}}}}return Mt=Math.max(1,Mt),yt=yt/Mt,Mt===0&&(yt=0),ze[ht.id()]=yt,yt},$e=function(ht,Rt){var Lt=We(ht),yt=We(Rt),Mt=Lt-yt;return Mt===0?PP(ht.id(),Rt.id()):Mt};r.depthSort!==void 0&&($e=r.depthSort);for(var Ge=0;Ge<B.length;Ge++)B[Ge].sort($e),ee(Ge);for(var me=[],Ve=0;Ve<Q.length;Ve++)me.push(Q[Ve]);B.unshift(me),Z();for(var Ke=0,at=0;at<B.length;at++)Ke=Math.max(B[at].length,Ke);var ft={x:k.x1+k.w/2,y:k.x1+k.h/2},tn=B.reduce(function(mt,ht){return Math.max(mt,ht.length)},0),gn=function(ht){var Rt=Gv(ht),Lt=Rt.depth,yt=Rt.index,Mt=B[Lt].length,In=Math.max(k.w/((r.grid?tn:Mt)+1),de),Pn=Math.max(k.h/(B.length+1),de),Vt=Math.min(k.w/2/B.length,k.h/2/B.length);if(Vt=Math.max(Vt,de),r.circle){var Qe=Vt*Lt+Vt-(B.length>0&&B[0].length<=3?Vt/2:0),ne=2*Math.PI/B[Lt].length*yt;return Lt===0&&B[0].length===1&&(Qe=1),{x:ft.x+Qe*Math.cos(ne),y:ft.y+Qe*Math.sin(ne)}}else{var sr={x:ft.x+(yt+1-(Mt+1)/2)*In,y:(Lt+1)*Pn};return sr}};return c.nodes().layoutPositions(this,r,gn),this};var kX={fit:!0,padding:30,boundingBox:void 0,avoidOverlap:!0,nodeDimensionsIncludeLabels:!1,spacingFactor:void 0,radius:void 0,startAngle:3/2*Math.PI,sweep:void 0,clockwise:!0,sort:void 0,animate:!1,animationDuration:500,animationEasing:void 0,animateFilter:function(r,u){return!0},ready:void 0,stop:void 0,transform:function(r,u){return u}};function iD(a){this.options=en({},kX,a)}iD.prototype.run=function(){var a=this.options,r=a,u=a.cy,c=r.eles,d=r.counterclockwise!==void 0?!r.counterclockwise:r.clockwise,g=c.nodes().not(":parent");r.sort&&(g=g.sort(r.sort));for(var b=cs(r.boundingBox?r.boundingBox:{x1:0,y1:0,w:u.width(),h:u.height()}),y={x:b.x1+b.w/2,y:b.y1+b.h/2},k=r.sweep===void 0?2*Math.PI-2*Math.PI/g.length:r.sweep,E=k/Math.max(1,g.length-1),C,T=0,P=0;P<g.length;P++){var N=g[P],D=N.layoutDimensions(r),H=D.w,_=D.h;T=Math.max(T,H,_)}if(kt(r.radius)?C=r.radius:g.length<=1?C=0:C=Math.min(b.h,b.w)/2-T,g.length>1&&r.avoidOverlap){T*=1.75;var B=Math.cos(E)-Math.cos(0),$=Math.sin(E)-Math.sin(0),F=Math.sqrt(T*T/(B*B+$*$));C=Math.max(F,C)}var W=function(X,K){var ee=r.startAngle+K*E*(d?1:-1),Z=C*Math.cos(ee),ae=C*Math.sin(ee),oe={x:y.x+Z,y:y.y+ae};return oe};return c.nodes().layoutPositions(this,r,W),this};var EX={fit:!0,padding:30,startAngle:3/2*Math.PI,sweep:void 0,clockwise:!0,equidistant:!1,minNodeSpacing:10,boundingBox:void 0,avoidOverlap:!0,nodeDimensionsIncludeLabels:!1,height:void 0,width:void 0,spacingFactor:void 0,concentric:function(r){return r.degree()},levelWidth:function(r){return r.maxDegree()/4},animate:!1,animationDuration:500,animationEasing:void 0,animateFilter:function(r,u){return!0},ready:void 0,stop:void 0,transform:function(r,u){return u}};function aD(a){this.options=en({},EX,a)}aD.prototype.run=function(){for(var a=this.options,r=a,u=r.counterclockwise!==void 0?!r.counterclockwise:r.clockwise,c=a.cy,d=r.eles,g=d.nodes().not(":parent"),b=cs(r.boundingBox?r.boundingBox:{x1:0,y1:0,w:c.width(),h:c.height()}),y={x:b.x1+b.w/2,y:b.y1+b.h/2},k=[],E=0,C=0;C<g.length;C++){var T=g[C],P=void 0;P=r.concentric(T),k.push({value:P,node:T}),T._private.scratch.concentric=P}g.updateStyle();for(var N=0;N<g.length;N++){var D=g[N],H=D.layoutDimensions(r);E=Math.max(E,H.w,H.h)}k.sort(function(mt,ht){return ht.value-mt.value});for(var _=r.levelWidth(g),B=[[]],$=B[0],F=0;F<k.length;F++){var W=k[F];if($.length>0){var Q=Math.abs($[0].value-W.value);Q>=_&&($=[],B.push($))}$.push(W)}var X=E+r.minNodeSpacing;if(!r.avoidOverlap){var K=B.length>0&&B[0].length>1,ee=Math.min(b.w,b.h)/2-X,Z=ee/(B.length+K?1:0);X=Math.min(X,Z)}for(var ae=0,oe=0;oe<B.length;oe++){var J=B[oe],fe=r.sweep===void 0?2*Math.PI-2*Math.PI/J.length:r.sweep,se=J.dTheta=fe/Math.max(1,J.length-1);if(J.length>1&&r.avoidOverlap){var pe=Math.cos(se)-Math.cos(0),he=Math.sin(se)-Math.sin(0),de=Math.sqrt(X*X/(pe*pe+he*he));ae=Math.max(de,ae)}J.r=ae,ae+=X}if(r.equidistant){for(var ke=0,Pe=0,Ae=0;Ae<B.length;Ae++){var Te=B[Ae],Oe=Te.r-Pe;ke=Math.max(ke,Oe)}Pe=0;for(var ze=0;ze<B.length;ze++){var We=B[ze];ze===0&&(Pe=We.r),We.r=Pe,Pe+=ke}}for(var $e={},Ge=0;Ge<B.length;Ge++)for(var me=B[Ge],Ve=me.dTheta,Ke=me.r,at=0;at<me.length;at++){var ft=me[at],tn=r.startAngle+(u?1:-1)*Ve*at,gn={x:y.x+Ke*Math.cos(tn),y:y.y+Ke*Math.sin(tn)};$e[ft.node.id()]=gn}return d.nodes().layoutPositions(this,r,function(mt){var ht=mt.id();return $e[ht]}),this};var cS,SX={ready:function(){},stop:function(){},animate:!0,animationEasing:void 0,animationDuration:void 0,animateFilter:function(r,u){return!0},animationThreshold:250,refresh:20,fit:!0,padding:30,boundingBox:void 0,nodeDimensionsIncludeLabels:!1,randomize:!1,componentSpacing:40,nodeRepulsion:function(r){return 2048},nodeOverlap:4,idealEdgeLength:function(r){return 32},edgeElasticity:function(r){return 32},nestingFactor:1.2,gravity:1,numIter:1e3,initialTemp:1e3,coolingFactor:.99,minTemp:1};function tm(a){this.options=en({},SX,a),this.options.layout=this;var r=this.options.eles.nodes(),u=this.options.eles.edges(),c=u.filter(function(d){var g=d.source().data("id"),b=d.target().data("id"),y=r.some(function(E){return E.data("id")===g}),k=r.some(function(E){return E.data("id")===b});return!y||!k});this.options.eles=this.options.eles.not(c)}tm.prototype.run=function(){var a=this.options,r=a.cy,u=this;u.stopped=!1,(a.animate===!0||a.animate===!1)&&u.emit({type:"layoutstart",layout:u}),a.debug===!0?cS=!0:cS=!1;var c=CX(r,u,a);cS&&LX(c),a.randomize&&PX(c);var d=Ll(),g=function(){DX(c,r,a),a.fit===!0&&r.fit(a.padding)},b=function(P){return!(u.stopped||P>=a.numIter||(jX(c,a),c.temperature=c.temperature*a.coolingFactor,c.temperature<a.minTemp))},y=function(){if(a.animate===!0||a.animate===!1)g(),u.one("layoutstop",a.stop),u.emit({type:"layoutstop",layout:u});else{var P=a.eles.nodes(),N=oD(c,a,P);P.layoutPositions(u,a,N)}},k=0,E=!0;if(a.animate===!0){var C=function T(){for(var P=0;E&&P<a.refresh;)E=b(k),k++,P++;if(!E)uD(c,a),y();else{var N=Ll();N-d>=a.animationThreshold&&g(),xw(T)}};C()}else{for(;E;)E=b(k),k++;uD(c,a),y()}return this},tm.prototype.stop=function(){return this.stopped=!0,this.thread&&this.thread.stop(),this.emit("layoutstop"),this},tm.prototype.destroy=function(){return this.thread&&this.thread.stop(),this};var CX=function(r,u,c){for(var d=c.eles.edges(),g=c.eles.nodes(),b=cs(c.boundingBox?c.boundingBox:{x1:0,y1:0,w:r.width(),h:r.height()}),y={isCompound:r.hasCompoundNodes(),layoutNodes:[],idToIndex:{},nodeSize:g.size(),graphSet:[],indexToGraph:[],layoutEdges:[],edgeSize:d.size(),temperature:c.initialTemp,clientWidth:b.w,clientHeight:b.h,boundingBox:b},k=c.eles.components(),E={},C=0;C<k.length;C++)for(var T=k[C],P=0;P<T.length;P++){var N=T[P];E[N.id()]=C}for(var C=0;C<y.nodeSize;C++){var D=g[C],H=D.layoutDimensions(c),_={};_.isLocked=D.locked(),_.id=D.data("id"),_.parentId=D.data("parent"),_.cmptId=E[D.id()],_.children=[],_.positionX=D.position("x"),_.positionY=D.position("y"),_.offsetX=0,_.offsetY=0,_.height=H.w,_.width=H.h,_.maxX=_.positionX+_.width/2,_.minX=_.positionX-_.width/2,_.maxY=_.positionY+_.height/2,_.minY=_.positionY-_.height/2,_.padLeft=parseFloat(D.style("padding")),_.padRight=parseFloat(D.style("padding")),_.padTop=parseFloat(D.style("padding")),_.padBottom=parseFloat(D.style("padding")),_.nodeRepulsion=Ci(c.nodeRepulsion)?c.nodeRepulsion(D):c.nodeRepulsion,y.layoutNodes.push(_),y.idToIndex[_.id]=C}for(var B=[],$=0,F=-1,W=[],C=0;C<y.nodeSize;C++){var D=y.layoutNodes[C],Q=D.parentId;Q!=null?y.layoutNodes[y.idToIndex[Q]].children.push(D.id):(B[++F]=D.id,W.push(D.id))}for(y.graphSet.push(W);$<=F;){var X=B[$++],K=y.idToIndex[X],N=y.layoutNodes[K],ee=N.children;if(ee.length>0){y.graphSet.push(ee);for(var C=0;C<ee.length;C++)B[++F]=ee[C]}}for(var C=0;C<y.graphSet.length;C++)for(var Z=y.graphSet[C],P=0;P<Z.length;P++){var ae=y.idToIndex[Z[P]];y.indexToGraph[ae]=C}for(var C=0;C<y.edgeSize;C++){var oe=d[C],J={};J.id=oe.data("id"),J.sourceId=oe.data("source"),J.targetId=oe.data("target");var fe=Ci(c.idealEdgeLength)?c.idealEdgeLength(oe):c.idealEdgeLength,se=Ci(c.edgeElasticity)?c.edgeElasticity(oe):c.edgeElasticity,pe=y.idToIndex[J.sourceId],he=y.idToIndex[J.targetId],de=y.indexToGraph[pe],ke=y.indexToGraph[he];if(de!=ke){for(var Pe=xX(J.sourceId,J.targetId,y),Ae=y.graphSet[Pe],Te=0,_=y.layoutNodes[pe];Ae.indexOf(_.id)===-1;)_=y.layoutNodes[y.idToIndex[_.parentId]],Te++;for(_=y.layoutNodes[he];Ae.indexOf(_.id)===-1;)_=y.layoutNodes[y.idToIndex[_.parentId]],Te++;fe*=Te*c.nestingFactor}J.idealLength=fe,J.elasticity=se,y.layoutEdges.push(J)}return y},xX=function(r,u,c){var d=TX(r,u,0,c);return 2>d.count?0:d.graph},TX=function a(r,u,c,d){var g=d.graphSet[c];if(-1<g.indexOf(r)&&-1<g.indexOf(u))return{count:2,graph:c};for(var b=0,y=0;y<g.length;y++){var k=g[y],E=d.idToIndex[k],C=d.layoutNodes[E].children;if(C.length!==0){var T=d.indexToGraph[d.idToIndex[C[0]]],P=a(r,u,T,d);if(P.count!==0)if(P.count===1){if(b++,b===2)break}else return P}}return{count:b,graph:c}},LX,PX=function(r,u){for(var c=r.clientWidth,d=r.clientHeight,g=0;g<r.nodeSize;g++){var b=r.layoutNodes[g];b.children.length===0&&!b.isLocked&&(b.positionX=Math.random()*c,b.positionY=Math.random()*d)}},oD=function(r,u,c){var d=r.boundingBox,g={x1:1/0,x2:-1/0,y1:1/0,y2:-1/0};return u.boundingBox&&(c.forEach(function(b){var y=r.layoutNodes[r.idToIndex[b.data("id")]];g.x1=Math.min(g.x1,y.positionX),g.x2=Math.max(g.x2,y.positionX),g.y1=Math.min(g.y1,y.positionY),g.y2=Math.max(g.y2,y.positionY)}),g.w=g.x2-g.x1,g.h=g.y2-g.y1),function(b,y){var k=r.layoutNodes[r.idToIndex[b.data("id")]];if(u.boundingBox){var E=(k.positionX-g.x1)/g.w,C=(k.positionY-g.y1)/g.h;return{x:d.x1+E*d.w,y:d.y1+C*d.h}}else return{x:k.positionX,y:k.positionY}}},DX=function(r,u,c){var d=c.layout,g=c.eles.nodes(),b=oD(r,c,g);g.positions(b),r.ready!==!0&&(r.ready=!0,d.one("layoutready",c.ready),d.emit({type:"layoutready",layout:this}))},jX=function(r,u,c){NX(r,u),OX(r),AX(r,u),RX(r),BX(r)},NX=function(r,u){for(var c=0;c<r.graphSet.length;c++)for(var d=r.graphSet[c],g=d.length,b=0;b<g;b++)for(var y=r.layoutNodes[r.idToIndex[d[b]]],k=b+1;k<g;k++){var E=r.layoutNodes[r.idToIndex[d[k]]];IX(y,E,r,u)}},sD=function(r){return-r+2*r*Math.random()},IX=function(r,u,c,d){var g=r.cmptId,b=u.cmptId;if(!(g!==b&&!c.isCompound)){var y=u.positionX-r.positionX,k=u.positionY-r.positionY,E=1;y===0&&k===0&&(y=sD(E),k=sD(E));var C=MX(r,u,y,k);if(C>0)var T=d.nodeOverlap*C,P=Math.sqrt(y*y+k*k),N=T*y/P,D=T*k/P;else var H=nm(r,y,k),_=nm(u,-1*y,-1*k),B=_.x-H.x,$=_.y-H.y,F=B*B+$*$,P=Math.sqrt(F),T=(r.nodeRepulsion+u.nodeRepulsion)/F,N=T*B/P,D=T*$/P;r.isLocked||(r.offsetX-=N,r.offsetY-=D),u.isLocked||(u.offsetX+=N,u.offsetY+=D)}},MX=function(r,u,c,d){if(c>0)var g=r.maxX-u.minX;else var g=u.maxX-r.minX;if(d>0)var b=r.maxY-u.minY;else var b=u.maxY-r.minY;return g>=0&&b>=0?Math.sqrt(g*g+b*b):0},nm=function(r,u,c){var d=r.positionX,g=r.positionY,b=r.height||1,y=r.width||1,k=c/u,E=b/y,C={};return u===0&&0<c||u===0&&0>c?(C.x=d,C.y=g+b/2,C):0<u&&-1*E<=k&&k<=E?(C.x=d+y/2,C.y=g+y*c/2/u,C):0>u&&-1*E<=k&&k<=E?(C.x=d-y/2,C.y=g-y*c/2/u,C):0<c&&(k<=-1*E||k>=E)?(C.x=d+b*u/2/c,C.y=g+b/2,C):(0>c&&(k<=-1*E||k>=E)&&(C.x=d-b*u/2/c,C.y=g-b/2),C)},OX=function(r,u){for(var c=0;c<r.edgeSize;c++){var d=r.layoutEdges[c],g=r.idToIndex[d.sourceId],b=r.layoutNodes[g],y=r.idToIndex[d.targetId],k=r.layoutNodes[y],E=k.positionX-b.positionX,C=k.positionY-b.positionY;if(!(E===0&&C===0)){var T=nm(b,E,C),P=nm(k,-1*E,-1*C),N=P.x-T.x,D=P.y-T.y,H=Math.sqrt(N*N+D*D),_=Math.pow(d.idealLength-H,2)/d.elasticity;if(H!==0)var B=_*N/H,$=_*D/H;else var B=0,$=0;b.isLocked||(b.offsetX+=B,b.offsetY+=$),k.isLocked||(k.offsetX-=B,k.offsetY-=$)}}},AX=function(r,u){if(u.gravity!==0)for(var c=1,d=0;d<r.graphSet.length;d++){var g=r.graphSet[d],b=g.length;if(d===0)var y=r.clientHeight/2,k=r.clientWidth/2;else var E=r.layoutNodes[r.idToIndex[g[0]]],C=r.layoutNodes[r.idToIndex[E.parentId]],y=C.positionX,k=C.positionY;for(var T=0;T<b;T++){var P=r.layoutNodes[r.idToIndex[g[T]]];if(!P.isLocked){var N=y-P.positionX,D=k-P.positionY,H=Math.sqrt(N*N+D*D);if(H>c){var _=u.gravity*N/H,B=u.gravity*D/H;P.offsetX+=_,P.offsetY+=B}}}}},RX=function(r,u){var c=[],d=0,g=-1;for(c.push.apply(c,r.graphSet[0]),g+=r.graphSet[0].length;d<=g;){var b=c[d++],y=r.idToIndex[b],k=r.layoutNodes[y],E=k.children;if(0<E.length&&!k.isLocked){for(var C=k.offsetX,T=k.offsetY,P=0;P<E.length;P++){var N=r.layoutNodes[r.idToIndex[E[P]]];N.offsetX+=C,N.offsetY+=T,c[++g]=E[P]}k.offsetX=0,k.offsetY=0}}},BX=function(r,u){for(var c=0;c<r.nodeSize;c++){var d=r.layoutNodes[c];0<d.children.length&&(d.maxX=void 0,d.minX=void 0,d.maxY=void 0,d.minY=void 0)}for(var c=0;c<r.nodeSize;c++){var d=r.layoutNodes[c];if(!(0<d.children.length||d.isLocked)){var g=zX(d.offsetX,d.offsetY,r.temperature);d.positionX+=g.x,d.positionY+=g.y,d.offsetX=0,d.offsetY=0,d.minX=d.positionX-d.width,d.maxX=d.positionX+d.width,d.minY=d.positionY-d.height,d.maxY=d.positionY+d.height,HX(d,r)}}for(var c=0;c<r.nodeSize;c++){var d=r.layoutNodes[c];0<d.children.length&&!d.isLocked&&(d.positionX=(d.maxX+d.minX)/2,d.positionY=(d.maxY+d.minY)/2,d.width=d.maxX-d.minX,d.height=d.maxY-d.minY)}},zX=function(r,u,c){var d=Math.sqrt(r*r+u*u);if(d>c)var g={x:c*r/d,y:c*u/d};else var g={x:r,y:u};return g},HX=function a(r,u){var c=r.parentId;if(c!=null){var d=u.layoutNodes[u.idToIndex[c]],g=!1;if((d.maxX==null||r.maxX+d.padRight>d.maxX)&&(d.maxX=r.maxX+d.padRight,g=!0),(d.minX==null||r.minX-d.padLeft<d.minX)&&(d.minX=r.minX-d.padLeft,g=!0),(d.maxY==null||r.maxY+d.padBottom>d.maxY)&&(d.maxY=r.maxY+d.padBottom,g=!0),(d.minY==null||r.minY-d.padTop<d.minY)&&(d.minY=r.minY-d.padTop,g=!0),g)return a(d,u)}},uD=function(r,u){for(var c=r.layoutNodes,d=[],g=0;g<c.length;g++){var b=c[g],y=b.cmptId,k=d[y]=d[y]||[];k.push(b)}for(var E=0,g=0;g<d.length;g++){var C=d[g];if(C){C.x1=1/0,C.x2=-1/0,C.y1=1/0,C.y2=-1/0;for(var T=0;T<C.length;T++){var P=C[T];C.x1=Math.min(C.x1,P.positionX-P.width/2),C.x2=Math.max(C.x2,P.positionX+P.width/2),C.y1=Math.min(C.y1,P.positionY-P.height/2),C.y2=Math.max(C.y2,P.positionY+P.height/2)}C.w=C.x2-C.x1,C.h=C.y2-C.y1,E+=C.w*C.h}}d.sort(function($,F){return F.w*F.h-$.w*$.h});for(var N=0,D=0,H=0,_=0,B=Math.sqrt(E)*r.clientWidth/r.clientHeight,g=0;g<d.length;g++){var C=d[g];if(C){for(var T=0;T<C.length;T++){var P=C[T];P.isLocked||(P.positionX+=N-C.x1,P.positionY+=D-C.y1)}N+=C.w+u.componentSpacing,H+=C.w+u.componentSpacing,_=Math.max(_,C.h),H>B&&(D+=_+u.componentSpacing,N=0,H=0,_=0)}}},_X={fit:!0,padding:30,boundingBox:void 0,avoidOverlap:!0,avoidOverlapPadding:10,nodeDimensionsIncludeLabels:!1,spacingFactor:void 0,condense:!1,rows:void 0,cols:void 0,position:function(r){},sort:void 0,animate:!1,animationDuration:500,animationEasing:void 0,animateFilter:function(r,u){return!0},ready:void 0,stop:void 0,transform:function(r,u){return u}};function cD(a){this.options=en({},_X,a)}cD.prototype.run=function(){var a=this.options,r=a,u=a.cy,c=r.eles,d=c.nodes().not(":parent");r.sort&&(d=d.sort(r.sort));var g=cs(r.boundingBox?r.boundingBox:{x1:0,y1:0,w:u.width(),h:u.height()});if(g.h===0||g.w===0)c.nodes().layoutPositions(this,r,function(ze){return{x:g.x1,y:g.y1}});else{var b=d.size(),y=Math.sqrt(b*g.h/g.w),k=Math.round(y),E=Math.round(g.w/g.h*y),C=function(We){if(We==null)return Math.min(k,E);var $e=Math.min(k,E);$e==k?k=We:E=We},T=function(We){if(We==null)return Math.max(k,E);var $e=Math.max(k,E);$e==k?k=We:E=We},P=r.rows,N=r.cols!=null?r.cols:r.columns;if(P!=null&&N!=null)k=P,E=N;else if(P!=null&&N==null)k=P,E=Math.ceil(b/k);else if(P==null&&N!=null)E=N,k=Math.ceil(b/E);else if(E*k>b){var D=C(),H=T();(D-1)*H>=b?C(D-1):(H-1)*D>=b&&T(H-1)}else for(;E*k<b;){var _=C(),B=T();(B+1)*_>=b?T(B+1):C(_+1)}var $=g.w/E,F=g.h/k;if(r.condense&&($=0,F=0),r.avoidOverlap)for(var W=0;W<d.length;W++){var Q=d[W],X=Q._private.position;(X.x==null||X.y==null)&&(X.x=0,X.y=0);var K=Q.layoutDimensions(r),ee=r.avoidOverlapPadding,Z=K.w+ee,ae=K.h+ee;$=Math.max($,Z),F=Math.max(F,ae)}for(var oe={},J=function(We,$e){return!!oe["c-"+We+"-"+$e]},fe=function(We,$e){oe["c-"+We+"-"+$e]=!0},se=0,pe=0,he=function(){pe++,pe>=E&&(pe=0,se++)},de={},ke=0;ke<d.length;ke++){var Pe=d[ke],Ae=r.position(Pe);if(Ae&&(Ae.row!==void 0||Ae.col!==void 0)){var Te={row:Ae.row,col:Ae.col};if(Te.col===void 0)for(Te.col=0;J(Te.row,Te.col);)Te.col++;else if(Te.row===void 0)for(Te.row=0;J(Te.row,Te.col);)Te.row++;de[Pe.id()]=Te,fe(Te.row,Te.col)}}var Oe=function(We,$e){var Ge,me;if(We.locked()||We.isParent())return!1;var Ve=de[We.id()];if(Ve)Ge=Ve.col*$+$/2+g.x1,me=Ve.row*F+F/2+g.y1;else{for(;J(se,pe);)he();Ge=pe*$+$/2+g.x1,me=se*F+F/2+g.y1,fe(se,pe),he()}return{x:Ge,y:me}};d.layoutPositions(this,r,Oe)}return this};var GX={ready:function(){},stop:function(){}};function lS(a){this.options=en({},GX,a)}lS.prototype.run=function(){var a=this.options,r=a.eles,u=this;return a.cy,u.emit("layoutstart"),r.nodes().positions(function(){return{x:0,y:0}}),u.one("layoutready",a.ready),u.emit("layoutready"),u.one("layoutstop",a.stop),u.emit("layoutstop"),this},lS.prototype.stop=function(){return this};var $X={positions:void 0,zoom:void 0,pan:void 0,fit:!0,padding:30,spacingFactor:void 0,animate:!1,animationDuration:500,animationEasing:void 0,animateFilter:function(r,u){return!0},ready:void 0,stop:void 0,transform:function(r,u){return u}};function lD(a){this.options=en({},$X,a)}lD.prototype.run=function(){var a=this.options,r=a.eles,u=r.nodes(),c=Ci(a.positions);function d(g){if(a.positions==null)return eK(g.position());if(c)return a.positions(g);var b=a.positions[g._private.data.id];return b??null}return u.layoutPositions(this,a,function(g,b){var y=d(g);return g.locked()||y==null?!1:y}),this};var YX={fit:!0,padding:30,boundingBox:void 0,animate:!1,animationDuration:500,animationEasing:void 0,animateFilter:function(r,u){return!0},ready:void 0,stop:void 0,transform:function(r,u){return u}};function fD(a){this.options=en({},YX,a)}fD.prototype.run=function(){var a=this.options,r=a.cy,u=a.eles,c=cs(a.boundingBox?a.boundingBox:{x1:0,y1:0,w:r.width(),h:r.height()}),d=function(b,y){return{x:c.x1+Math.round(Math.random()*c.w),y:c.y1+Math.round(Math.random()*c.h)}};return u.nodes().layoutPositions(this,a,d),this};var FX=[{name:"breadthfirst",impl:rD},{name:"circle",impl:iD},{name:"concentric",impl:aD},{name:"cose",impl:tm},{name:"grid",impl:cD},{name:"null",impl:lS},{name:"preset",impl:lD},{name:"random",impl:fD}];function hD(a){this.options=a,this.notifications=0}var dD=function(){},vD=function(){throw new Error("A headless instance can not render images")};hD.prototype={recalculateRenderedStyle:dD,notify:function(){this.notifications++},init:dD,isHeadless:function(){return!0},png:vD,jpg:vD};var fS={};fS.arrowShapeWidth=.3,fS.registerArrowShapes=function(){var a=this.arrowShapes={},r=this,u=function(E,C,T,P,N,D,H){var _=N.x-T/2-H,B=N.x+T/2+H,$=N.y-T/2-H,F=N.y+T/2+H,W=_<=E&&E<=B&&$<=C&&C<=F;return W},c=function(E,C,T,P,N){var D=E*Math.cos(P)-C*Math.sin(P),H=E*Math.sin(P)+C*Math.cos(P),_=D*T,B=H*T,$=_+N.x,F=B+N.y;return{x:$,y:F}},d=function(E,C,T,P){for(var N=[],D=0;D<E.length;D+=2){var H=E[D],_=E[D+1];N.push(c(H,_,C,T,P))}return N},g=function(E){for(var C=[],T=0;T<E.length;T++){var P=E[T];C.push(P.x,P.y)}return C},b=function(E){return E.pstyle("width").pfValue*E.pstyle("arrow-scale").pfValue*2},y=function(E,C){Yt(C)&&(C=a[C]),a[E]=en({name:E,points:[-.15,-.3,.15,-.3,.15,.3,-.15,.3],collide:function(P,N,D,H,_,B){var $=g(d(this.points,D+2*B,H,_)),F=ls(P,N,$);return F},roughCollide:u,draw:function(P,N,D,H){var _=d(this.points,N,D,H);r.arrowShapeImpl("polygon")(P,_)},spacing:function(P){return 0},gap:b},C)};y("none",{collide:Lw,roughCollide:Lw,draw:B5,spacing:BP,gap:BP}),y("triangle",{points:[-.15,-.3,0,0,.15,-.3]}),y("arrow","triangle"),y("triangle-backcurve",{points:a.triangle.points,controlPoint:[0,-.15],roughCollide:u,draw:function(E,C,T,P,N){var D=d(this.points,C,T,P),H=this.controlPoint,_=c(H[0],H[1],C,T,P);r.arrowShapeImpl(this.name)(E,D,_)},gap:function(E){return b(E)*.8}}),y("triangle-tee",{points:[0,0,.15,-.3,-.15,-.3,0,0],pointsTee:[-.15,-.4,-.15,-.5,.15,-.5,.15,-.4],collide:function(E,C,T,P,N,D,H){var _=g(d(this.points,T+2*H,P,N)),B=g(d(this.pointsTee,T+2*H,P,N)),$=ls(E,C,_)||ls(E,C,B);return $},draw:function(E,C,T,P,N){var D=d(this.points,C,T,P),H=d(this.pointsTee,C,T,P);r.arrowShapeImpl(this.name)(E,D,H)}}),y("circle-triangle",{radius:.15,pointsTr:[0,-.15,.15,-.45,-.15,-.45,0,-.15],collide:function(E,C,T,P,N,D,H){var _=N,B=Math.pow(_.x-E,2)+Math.pow(_.y-C,2)<=Math.pow((T+2*H)*this.radius,2),$=g(d(this.points,T+2*H,P,N));return ls(E,C,$)||B},draw:function(E,C,T,P,N){var D=d(this.pointsTr,C,T,P);r.arrowShapeImpl(this.name)(E,D,P.x,P.y,this.radius*C)},spacing:function(E){return r.getArrowWidth(E.pstyle("width").pfValue,E.pstyle("arrow-scale").value)*this.radius}}),y("triangle-cross",{points:[0,0,.15,-.3,-.15,-.3,0,0],baseCrossLinePts:[-.15,-.4,-.15,-.4,.15,-.4,.15,-.4],crossLinePts:function(E,C){var T=this.baseCrossLinePts.slice(),P=C/E,N=3,D=5;return T[N]=T[N]-P,T[D]=T[D]-P,T},collide:function(E,C,T,P,N,D,H){var _=g(d(this.points,T+2*H,P,N)),B=g(d(this.crossLinePts(T,D),T+2*H,P,N)),$=ls(E,C,_)||ls(E,C,B);return $},draw:function(E,C,T,P,N){var D=d(this.points,C,T,P),H=d(this.crossLinePts(C,N),C,T,P);r.arrowShapeImpl(this.name)(E,D,H)}}),y("vee",{points:[-.15,-.3,0,0,.15,-.3,0,-.15],gap:function(E){return b(E)*.525}}),y("circle",{radius:.15,collide:function(E,C,T,P,N,D,H){var _=N,B=Math.pow(_.x-E,2)+Math.pow(_.y-C,2)<=Math.pow((T+2*H)*this.radius,2);return B},draw:function(E,C,T,P,N){r.arrowShapeImpl(this.name)(E,P.x,P.y,this.radius*C)},spacing:function(E){return r.getArrowWidth(E.pstyle("width").pfValue,E.pstyle("arrow-scale").value)*this.radius}}),y("tee",{points:[-.15,0,-.15,-.1,.15,-.1,.15,0],spacing:function(E){return 1},gap:function(E){return 1}}),y("square",{points:[-.15,0,.15,0,.15,-.3,-.15,-.3]}),y("diamond",{points:[-.15,-.15,0,-.3,.15,-.15,0,0],gap:function(E){return E.pstyle("width").pfValue*E.pstyle("arrow-scale").value}}),y("chevron",{points:[0,0,-.15,-.15,-.1,-.2,0,-.1,.1,-.2,.15,-.15],gap:function(E){return .95*E.pstyle("width").pfValue*E.pstyle("arrow-scale").value}})};var ed={};ed.projectIntoViewport=function(a,r){var u=this.cy,c=this.findContainerClientCoords(),d=c[0],g=c[1],b=c[4],y=u.pan(),k=u.zoom(),E=((a-d)/b-y.x)/k,C=((r-g)/b-y.y)/k;return[E,C]},ed.findContainerClientCoords=function(){if(this.containerBB)return this.containerBB;var a=this.container,r=a.getBoundingClientRect(),u=this.cy.window().getComputedStyle(a),c=function(B){return parseFloat(u.getPropertyValue(B))},d={left:c("padding-left"),right:c("padding-right"),top:c("padding-top"),bottom:c("padding-bottom")},g={left:c("border-left-width"),right:c("border-right-width"),top:c("border-top-width"),bottom:c("border-bottom-width")},b=a.clientWidth,y=a.clientHeight,k=d.left+d.right,E=d.top+d.bottom,C=g.left+g.right,T=r.width/(b+C),P=b-k,N=y-E,D=r.left+d.left+g.left,H=r.top+d.top+g.top;return this.containerBB=[D,H,P,N,T]},ed.invalidateContainerClientCoordsCache=function(){this.containerBB=null},ed.findNearestElement=function(a,r,u,c){return this.findNearestElements(a,r,u,c)[0]},ed.findNearestElements=function(a,r,u,c){var d=this,g=this,b=g.getCachedZSortedEles(),y=[],k=g.cy.zoom(),E=g.cy.hasCompoundNodes(),C=(c?24:8)/k,T=(c?8:2)/k,P=(c?8:2)/k,N=1/0,D,H;u&&(b=b.interactive);function _(K,ee){if(K.isNode()){if(H)return;H=K,y.push(K)}if(K.isEdge()&&(ee==null||ee<N))if(D){if(D.pstyle("z-compound-depth").value===K.pstyle("z-compound-depth").value&&D.pstyle("z-compound-depth").value===K.pstyle("z-compound-depth").value){for(var Z=0;Z<y.length;Z++)if(y[Z].isEdge()){y[Z]=K,D=K,N=ee??N;break}}}else y.push(K),D=K,N=ee??N}function B(K){var ee=K.outerWidth()+2*T,Z=K.outerHeight()+2*T,ae=ee/2,oe=Z/2,J=K.position();if(J.x-ae<=a&&a<=J.x+ae&&J.y-oe<=r&&r<=J.y+oe){var fe=g.nodeShapes[d.getNodeShape(K)];if(fe.checkPoint(a,r,0,ee,Z,J.x,J.y))return _(K,0),!0}}function $(K){var ee=K._private,Z=ee.rscratch,ae=K.pstyle("width").pfValue,oe=K.pstyle("arrow-scale").value,J=ae/2+C,fe=J*J,se=J*2,ke=ee.source,Pe=ee.target,pe;if(Z.edgeType==="segments"||Z.edgeType==="straight"||Z.edgeType==="haystack"){for(var he=Z.allpts,de=0;de+3<he.length;de+=2)if(dK(a,r,he[de],he[de+1],he[de+2],he[de+3],se)&&fe>(pe=wK(a,r,he[de],he[de+1],he[de+2],he[de+3])))return _(K,pe),!0}else if(Z.edgeType==="bezier"||Z.edgeType==="multibezier"||Z.edgeType==="self"||Z.edgeType==="compound"){for(var he=Z.allpts,de=0;de+5<Z.allpts.length;de+=4)if(vK(a,r,he[de],he[de+1],he[de+2],he[de+3],he[de+4],he[de+5],se)&&fe>(pe=pK(a,r,he[de],he[de+1],he[de+2],he[de+3],he[de+4],he[de+5])))return _(K,pe),!0}for(var ke=ke||ee.source,Pe=Pe||ee.target,Ae=d.getArrowWidth(ae,oe),Te=[{name:"source",x:Z.arrowStartX,y:Z.arrowStartY,angle:Z.srcArrowAngle},{name:"target",x:Z.arrowEndX,y:Z.arrowEndY,angle:Z.tgtArrowAngle},{name:"mid-source",x:Z.midX,y:Z.midY,angle:Z.midsrcArrowAngle},{name:"mid-target",x:Z.midX,y:Z.midY,angle:Z.midtgtArrowAngle}],de=0;de<Te.length;de++){var Oe=Te[de],ze=g.arrowShapes[K.pstyle(Oe.name+"-arrow-shape").value],We=K.pstyle("width").pfValue;if(ze.roughCollide(a,r,Ae,Oe.angle,{x:Oe.x,y:Oe.y},We,C)&&ze.collide(a,r,Ae,Oe.angle,{x:Oe.x,y:Oe.y},We,C))return _(K),!0}E&&y.length>0&&(B(ke),B(Pe))}function F(K,ee,Z){return Ou(K,ee,Z)}function W(K,ee){var Z=K._private,ae=P,oe;ee?oe=ee+"-":oe="",K.boundingBox();var J=Z.labelBounds[ee||"main"],fe=K.pstyle(oe+"label").value,se=K.pstyle("text-events").strValue==="yes";if(!(!se||!fe)){var pe=F(Z.rscratch,"labelX",ee),he=F(Z.rscratch,"labelY",ee),de=F(Z.rscratch,"labelAngle",ee),ke=K.pstyle(oe+"text-margin-x").pfValue,Pe=K.pstyle(oe+"text-margin-y").pfValue,Ae=J.x1-ae-ke,Te=J.x2+ae-ke,Oe=J.y1-ae-Pe,ze=J.y2+ae-Pe;if(de){var We=Math.cos(de),$e=Math.sin(de),Ge=function(gn,mt){return gn=gn-pe,mt=mt-he,{x:gn*We-mt*$e+pe,y:gn*$e+mt*We+he}},me=Ge(Ae,Oe),Ve=Ge(Ae,ze),Ke=Ge(Te,Oe),at=Ge(Te,ze),ft=[me.x+ke,me.y+Pe,Ke.x+ke,Ke.y+Pe,at.x+ke,at.y+Pe,Ve.x+ke,Ve.y+Pe];if(ls(a,r,ft))return _(K),!0}else if(Dv(J,a,r))return _(K),!0}}for(var Q=b.length-1;Q>=0;Q--){var X=b[Q];X.isNode()?B(X)||W(X):$(X)||W(X)||W(X,"source")||W(X,"target")}return y},ed.getAllInBox=function(a,r,u,c){var d=this.getCachedZSortedEles().interactive,g=[],b=Math.min(a,u),y=Math.max(a,u),k=Math.min(r,c),E=Math.max(r,c);a=b,u=y,r=k,c=E;for(var C=cs({x1:a,y1:r,x2:u,y2:c}),T=0;T<d.length;T++){var P=d[T];if(P.isNode()){var N=P,D=N.boundingBox({includeNodes:!0,includeEdges:!1,includeLabels:!1});$5(C,D)&&!qP(D,C)&&g.push(N)}else{var H=P,_=H._private,B=_.rscratch;if(B.startX!=null&&B.startY!=null&&!Dv(C,B.startX,B.startY)||B.endX!=null&&B.endY!=null&&!Dv(C,B.endX,B.endY))continue;if(B.edgeType==="bezier"||B.edgeType==="multibezier"||B.edgeType==="self"||B.edgeType==="compound"||B.edgeType==="segments"||B.edgeType==="haystack"){for(var $=_.rstyle.bezierPts||_.rstyle.linePts||_.rstyle.haystackPts,F=!0,W=0;W<$.length;W++)if(!hK(C,$[W])){F=!1;break}F&&g.push(H)}else(B.edgeType==="haystack"||B.edgeType==="straight")&&g.push(H)}}return g};var rm={};rm.calculateArrowAngles=function(a){var r=a._private.rscratch,u=r.edgeType==="haystack",c=r.edgeType==="bezier",d=r.edgeType==="multibezier",g=r.edgeType==="segments",b=r.edgeType==="compound",y=r.edgeType==="self",k,E,C,T,P,N,B,$;if(u?(C=r.haystackPts[0],T=r.haystackPts[1],P=r.haystackPts[2],N=r.haystackPts[3]):(C=r.arrowStartX,T=r.arrowStartY,P=r.arrowEndX,N=r.arrowEndY),B=r.midX,$=r.midY,g)k=C-r.segpts[0],E=T-r.segpts[1];else if(d||b||y||c){var D=r.allpts,H=za(D[0],D[2],D[4],.1),_=za(D[1],D[3],D[5],.1);k=C-H,E=T-_}else k=C-B,E=T-$;r.srcArrowAngle=jw(k,E);var B=r.midX,$=r.midY;if(u&&(B=(C+P)/2,$=(T+N)/2),k=P-C,E=N-T,g){var D=r.allpts;if(D.length/2%2===0){var F=D.length/2,W=F-2;k=D[F]-D[W],E=D[F+1]-D[W+1]}else{var F=D.length/2-1,W=F-2,Q=F+2;k=D[F]-D[W],E=D[F+1]-D[W+1]}}else if(d||b||y){var D=r.allpts,X=r.ctrlpts,K,ee,Z,ae;if(X.length/2%2===0){var oe=D.length/2-1,J=oe+2,fe=J+2;K=za(D[oe],D[J],D[fe],0),ee=za(D[oe+1],D[J+1],D[fe+1],0),Z=za(D[oe],D[J],D[fe],1e-4),ae=za(D[oe+1],D[J+1],D[fe+1],1e-4)}else{var J=D.length/2-1,oe=J-2,fe=J+2;K=za(D[oe],D[J],D[fe],.4999),ee=za(D[oe+1],D[J+1],D[fe+1],.4999),Z=za(D[oe],D[J],D[fe],.5),ae=za(D[oe+1],D[J+1],D[fe+1],.5)}k=Z-K,E=ae-ee}if(r.midtgtArrowAngle=jw(k,E),r.midDispX=k,r.midDispY=E,k*=-1,E*=-1,g){var D=r.allpts;if(D.length/2%2!==0){var F=D.length/2-1,Q=F+2;k=-(D[Q]-D[F]),E=-(D[Q+1]-D[F+1])}}if(r.midsrcArrowAngle=jw(k,E),g)k=P-r.segpts[r.segpts.length-2],E=N-r.segpts[r.segpts.length-1];else if(d||b||y||c){var D=r.allpts,se=D.length,H=za(D[se-6],D[se-4],D[se-2],.9),_=za(D[se-5],D[se-3],D[se-1],.9);k=P-H,E=N-_}else k=P-B,E=N-$;r.tgtArrowAngle=jw(k,E)},rm.getArrowWidth=rm.getArrowHeight=function(a,r){var u=this.arrowWidthCache=this.arrowWidthCache||{},c=u[a+", "+r];return c||(c=Math.max(Math.pow(a*13.37,.9),29)*r,u[a+", "+r]=c,c)};var So={};So.findMidptPtsEtc=function(a,r){var u=r.posPts,c=r.intersectionPts,d=r.vectorNormInverse,g,b=a.pstyle("source-endpoint"),y=a.pstyle("target-endpoint"),k=b.units!=null&&y.units!=null,E=function(Q,X,K,ee){var Z=ee-X,ae=K-Q,oe=Math.sqrt(ae*ae+Z*Z);return{x:-Z/oe,y:ae/oe}},C=a.pstyle("edge-distances").value;switch(C){case"node-position":g=u;break;case"intersection":g=c;break;case"endpoints":{if(k){var T=this.manualEndptToPx(a.source()[0],b),P=Mu(T,2),N=P[0],D=P[1],H=this.manualEndptToPx(a.target()[0],y),_=Mu(H,2),B=_[0],$=_[1],F={x1:N,y1:D,x2:B,y2:$};d=E(N,D,B,$),g=F}else pr("Edge ".concat(a.id()," has edge-distances:endpoints specified without manual endpoints specified via source-endpoint and target-endpoint.  Falling back on edge-distances:intersection (default).")),g=c;break}}return{midptPts:g,vectorNormInverse:d}},So.findHaystackPoints=function(a){for(var r=0;r<a.length;r++){var u=a[r],c=u._private,d=c.rscratch;if(!d.haystack){var g=Math.random()*2*Math.PI;d.source={x:Math.cos(g),y:Math.sin(g)},g=Math.random()*2*Math.PI,d.target={x:Math.cos(g),y:Math.sin(g)}}var b=c.source,y=c.target,k=b.position(),E=y.position(),C=b.width(),T=y.width(),P=b.height(),N=y.height(),D=u.pstyle("haystack-radius").value,H=D/2;d.haystackPts=d.allpts=[d.source.x*C*H+k.x,d.source.y*P*H+k.y,d.target.x*T*H+E.x,d.target.y*N*H+E.y],d.midX=(d.allpts[0]+d.allpts[2])/2,d.midY=(d.allpts[1]+d.allpts[3])/2,d.edgeType="haystack",d.haystack=!0,this.storeEdgeProjections(u),this.calculateArrowAngles(u),this.recalculateEdgeLabelProjections(u),this.calculateLabelAngles(u)}},So.findSegmentsPoints=function(a,r){var u=a._private.rscratch,c=a.pstyle("segment-weights"),d=a.pstyle("segment-distances"),g=Math.min(c.pfValue.length,d.pfValue.length);u.edgeType="segments",u.segpts=[];for(var b=0;b<g;b++){var y=c.pfValue[b],k=d.pfValue[b],E=1-y,C=y,T=this.findMidptPtsEtc(a,r),P=T.midptPts,N=T.vectorNormInverse,D={x:P.x1*E+P.x2*C,y:P.y1*E+P.y2*C};u.segpts.push(D.x+N.x*k,D.y+N.y*k)}},So.findLoopPoints=function(a,r,u,c){var d=a._private.rscratch,g=r.dirCounts,b=r.srcPos,y=a.pstyle("control-point-distances"),k=y?y.pfValue[0]:void 0,E=a.pstyle("loop-direction").pfValue,C=a.pstyle("loop-sweep").pfValue,T=a.pstyle("control-point-step-size").pfValue;d.edgeType="self";var P=u,N=T;c&&(P=0,N=k);var D=E-Math.PI/2,H=D-C/2,_=D+C/2,B=E+"_"+C;P=g[B]===void 0?g[B]=0:++g[B],d.ctrlpts=[b.x+Math.cos(H)*1.4*N*(P/3+1),b.y+Math.sin(H)*1.4*N*(P/3+1),b.x+Math.cos(_)*1.4*N*(P/3+1),b.y+Math.sin(_)*1.4*N*(P/3+1)]},So.findCompoundLoopPoints=function(a,r,u,c){var d=a._private.rscratch;d.edgeType="compound";var g=r.srcPos,b=r.tgtPos,y=r.srcW,k=r.srcH,E=r.tgtW,C=r.tgtH,T=a.pstyle("control-point-step-size").pfValue,P=a.pstyle("control-point-distances"),N=P?P.pfValue[0]:void 0,D=u,H=T;c&&(D=0,H=N);var _=50,B={x:g.x-y/2,y:g.y-k/2},$={x:b.x-E/2,y:b.y-C/2},F={x:Math.min(B.x,$.x),y:Math.min(B.y,$.y)},W=.5,Q=Math.max(W,Math.log(y*.01)),X=Math.max(W,Math.log(E*.01));d.ctrlpts=[F.x,F.y-(1+Math.pow(_,1.12)/100)*H*(D/3+1)*Q,F.x-(1+Math.pow(_,1.12)/100)*H*(D/3+1)*X,F.y]},So.findStraightEdgePoints=function(a){a._private.rscratch.edgeType="straight"},So.findBezierPoints=function(a,r,u,c,d){var g=a._private.rscratch,b=a.pstyle("control-point-step-size").pfValue,y=a.pstyle("control-point-distances"),k=a.pstyle("control-point-weights"),E=y&&k?Math.min(y.value.length,k.value.length):1,C=y?y.pfValue[0]:void 0,T=k.value[0],P=c;g.edgeType=P?"multibezier":"bezier",g.ctrlpts=[];for(var N=0;N<E;N++){var D=(.5-r.eles.length/2+u)*b*(d?-1:1),H=void 0,_=YP(D);P&&(C=y?y.pfValue[N]:b,T=k.value[N]),c?H=C:H=C!==void 0?_*C:void 0;var B=H!==void 0?H:D,$=1-T,F=T,W=this.findMidptPtsEtc(a,r),Q=W.midptPts,X=W.vectorNormInverse,K={x:Q.x1*$+Q.x2*F,y:Q.y1*$+Q.y2*F};g.ctrlpts.push(K.x+X.x*B,K.y+X.y*B)}},So.findTaxiPoints=function(a,r){var u=a._private.rscratch;u.edgeType="segments";var c="vertical",d="horizontal",g="leftward",b="rightward",y="downward",k="upward",E="auto",C=r.posPts,T=r.srcW,P=r.srcH,N=r.tgtW,D=r.tgtH,H=a.pstyle("edge-distances").value,_=H!=="node-position",B=a.pstyle("taxi-direction").value,$=B,F=a.pstyle("taxi-turn"),W=F.units==="%",Q=F.pfValue,X=Q<0,K=a.pstyle("taxi-turn-min-distance").pfValue,ee=_?(T+N)/2:0,Z=_?(P+D)/2:0,ae=C.x2-C.x1,oe=C.y2-C.y1,J=function(tt,Gt){return tt>0?Math.max(tt-Gt,0):Math.min(tt+Gt,0)},fe=J(ae,ee),se=J(oe,Z),pe=!1;$===E?B=Math.abs(fe)>Math.abs(se)?d:c:$===k||$===y?(B=c,pe=!0):($===g||$===b)&&(B=d,pe=!0);var he=B===c,de=he?se:fe,ke=he?oe:ae,Pe=YP(ke),Ae=!1;!(pe&&(W||X))&&($===y&&ke<0||$===k&&ke>0||$===g&&ke>0||$===b&&ke<0)&&(Pe*=-1,de=Pe*Math.abs(de),Ae=!0);var Te;if(W){var Oe=Q<0?1+Q:Q;Te=Oe*de}else{var ze=Q<0?de:0;Te=ze+Q*Pe}var We=function(tt){return Math.abs(tt)<K||Math.abs(tt)>=Math.abs(de)},$e=We(Te),Ge=We(Math.abs(de)-Math.abs(Te)),me=$e||Ge;if(me&&!Ae)if(he){var Ve=Math.abs(ke)<=P/2,Ke=Math.abs(ae)<=N/2;if(Ve){var at=(C.x1+C.x2)/2,ft=C.y1,tn=C.y2;u.segpts=[at,ft,at,tn]}else if(Ke){var gn=(C.y1+C.y2)/2,mt=C.x1,ht=C.x2;u.segpts=[mt,gn,ht,gn]}else u.segpts=[C.x1,C.y2]}else{var Rt=Math.abs(ke)<=T/2,Lt=Math.abs(oe)<=D/2;if(Rt){var yt=(C.y1+C.y2)/2,Mt=C.x1,In=C.x2;u.segpts=[Mt,yt,In,yt]}else if(Lt){var Pn=(C.x1+C.x2)/2,Vt=C.y1,sr=C.y2;u.segpts=[Pn,Vt,Pn,sr]}else u.segpts=[C.x2,C.y1]}else if(he){var Qe=C.y1+Te+(_?P/2*Pe:0),ne=C.x1,Ie=C.x2;u.segpts=[ne,Qe,Ie,Qe]}else{var Je=C.x1+Te+(_?T/2*Pe:0),Ye=C.y1,Fe=C.y2;u.segpts=[Je,Ye,Je,Fe]}},So.tryToCorrectInvalidPoints=function(a,r){var u=a._private.rscratch;if(u.edgeType==="bezier"){var c=r.srcPos,d=r.tgtPos,g=r.srcW,b=r.srcH,y=r.tgtW,k=r.tgtH,E=r.srcShape,C=r.tgtShape,T=!kt(u.startX)||!kt(u.startY),P=!kt(u.arrowStartX)||!kt(u.arrowStartY),N=!kt(u.endX)||!kt(u.endY),D=!kt(u.arrowEndX)||!kt(u.arrowEndY),H=3,_=this.getArrowWidth(a.pstyle("width").pfValue,a.pstyle("arrow-scale").value)*this.arrowShapeWidth,B=H*_,$=Uh({x:u.ctrlpts[0],y:u.ctrlpts[1]},{x:u.startX,y:u.startY}),F=$<B,W=Uh({x:u.ctrlpts[0],y:u.ctrlpts[1]},{x:u.endX,y:u.endY}),Q=W<B,X=!1;if(T||P||F){X=!0;var K={x:u.ctrlpts[0]-c.x,y:u.ctrlpts[1]-c.y},ee=Math.sqrt(K.x*K.x+K.y*K.y),Z={x:K.x/ee,y:K.y/ee},ae=Math.max(g,b),oe={x:u.ctrlpts[0]+Z.x*2*ae,y:u.ctrlpts[1]+Z.y*2*ae},J=E.intersectLine(c.x,c.y,g,b,oe.x,oe.y,0);F?(u.ctrlpts[0]=u.ctrlpts[0]+Z.x*(B-$),u.ctrlpts[1]=u.ctrlpts[1]+Z.y*(B-$)):(u.ctrlpts[0]=J[0]+Z.x*B,u.ctrlpts[1]=J[1]+Z.y*B)}if(N||D||Q){X=!0;var fe={x:u.ctrlpts[0]-d.x,y:u.ctrlpts[1]-d.y},se=Math.sqrt(fe.x*fe.x+fe.y*fe.y),pe={x:fe.x/se,y:fe.y/se},he=Math.max(g,b),de={x:u.ctrlpts[0]+pe.x*2*he,y:u.ctrlpts[1]+pe.y*2*he},ke=C.intersectLine(d.x,d.y,y,k,de.x,de.y,0);Q?(u.ctrlpts[0]=u.ctrlpts[0]+pe.x*(B-W),u.ctrlpts[1]=u.ctrlpts[1]+pe.y*(B-W)):(u.ctrlpts[0]=ke[0]+pe.x*B,u.ctrlpts[1]=ke[1]+pe.y*B)}X&&this.findEndpoints(a)}},So.storeAllpts=function(a){var r=a._private.rscratch;if(r.edgeType==="multibezier"||r.edgeType==="bezier"||r.edgeType==="self"||r.edgeType==="compound"){r.allpts=[],r.allpts.push(r.startX,r.startY);for(var u=0;u+1<r.ctrlpts.length;u+=2)r.allpts.push(r.ctrlpts[u],r.ctrlpts[u+1]),u+3<r.ctrlpts.length&&r.allpts.push((r.ctrlpts[u]+r.ctrlpts[u+2])/2,(r.ctrlpts[u+1]+r.ctrlpts[u+3])/2);r.allpts.push(r.endX,r.endY);var c,d;r.ctrlpts.length/2%2===0?(c=r.allpts.length/2-1,r.midX=r.allpts[c],r.midY=r.allpts[c+1]):(c=r.allpts.length/2-3,d=.5,r.midX=za(r.allpts[c],r.allpts[c+2],r.allpts[c+4],d),r.midY=za(r.allpts[c+1],r.allpts[c+3],r.allpts[c+5],d))}else if(r.edgeType==="straight")r.allpts=[r.startX,r.startY,r.endX,r.endY],r.midX=(r.startX+r.endX+r.arrowStartX+r.arrowEndX)/4,r.midY=(r.startY+r.endY+r.arrowStartY+r.arrowEndY)/4;else if(r.edgeType==="segments")if(r.allpts=[],r.allpts.push(r.startX,r.startY),r.allpts.push.apply(r.allpts,r.segpts),r.allpts.push(r.endX,r.endY),r.segpts.length%4===0){var g=r.segpts.length/2,b=g-2;r.midX=(r.segpts[b]+r.segpts[g])/2,r.midY=(r.segpts[b+1]+r.segpts[g+1])/2}else{var y=r.segpts.length/2-1;r.midX=r.segpts[y],r.midY=r.segpts[y+1]}},So.checkForInvalidEdgeWarning=function(a){var r=a[0]._private.rscratch;r.nodesOverlap||kt(r.startX)&&kt(r.startY)&&kt(r.endX)&&kt(r.endY)?r.loggedErr=!1:r.loggedErr||(r.loggedErr=!0,pr("Edge `"+a.id()+"` has invalid endpoints and so it is impossible to draw.  Adjust your edge style (e.g. control points) accordingly or use an alternative edge type.  This is expected behaviour when the source node and the target node overlap."))},So.findEdgeControlPoints=function(a){var r=this;if(!(!a||a.length===0)){for(var u=this,c=u.cy,d=c.hasCompoundNodes(),g={map:new Lc,get:function(K){var ee=this.map.get(K[0]);return ee!=null?ee.get(K[1]):null},set:function(K,ee){var Z=this.map.get(K[0]);Z==null&&(Z=new Lc,this.map.set(K[0],Z)),Z.set(K[1],ee)}},b=[],y=[],k=0;k<a.length;k++){var E=a[k],C=E._private,T=E.pstyle("curve-style").value;if(!(E.removed()||!E.takesUpSpace())){if(T==="haystack"){y.push(E);continue}var P=T==="unbundled-bezier"||T==="segments"||T==="straight"||T==="straight-triangle"||T==="taxi",N=T==="unbundled-bezier"||T==="bezier",D=C.source,H=C.target,_=D.poolIndex(),B=H.poolIndex(),$=[_,B].sort(),F=g.get($);F==null&&(F={eles:[]},g.set($,F),b.push($)),F.eles.push(E),P&&(F.hasUnbundled=!0),N&&(F.hasBezier=!0)}}for(var W=function(K){var ee=b[K],Z=g.get(ee),ae=void 0;if(!Z.hasUnbundled){var oe=Z.eles[0].parallelEdges().filter(function(sr){return sr.isBundledBezier()});z5(Z.eles),oe.forEach(function(sr){return Z.eles.push(sr)}),Z.eles.sort(function(sr,Qe){return sr.poolIndex()-Qe.poolIndex()})}var J=Z.eles[0],fe=J.source(),se=J.target();if(fe.poolIndex()>se.poolIndex()){var pe=fe;fe=se,se=pe}var he=Z.srcPos=fe.position(),de=Z.tgtPos=se.position(),ke=Z.srcW=fe.outerWidth(),Pe=Z.srcH=fe.outerHeight(),Ae=Z.tgtW=se.outerWidth(),Te=Z.tgtH=se.outerHeight(),Oe=Z.srcShape=u.nodeShapes[r.getNodeShape(fe)],ze=Z.tgtShape=u.nodeShapes[r.getNodeShape(se)];Z.dirCounts={north:0,west:0,south:0,east:0,northwest:0,southwest:0,northeast:0,southeast:0};for(var We=0;We<Z.eles.length;We++){var $e=Z.eles[We],Ge=$e[0]._private.rscratch,me=$e.pstyle("curve-style").value,Ve=me==="unbundled-bezier"||me==="segments"||me==="taxi",Ke=!fe.same($e.source());if(!Z.calculatedIntersection&&fe!==se&&(Z.hasBezier||Z.hasUnbundled)){Z.calculatedIntersection=!0;var at=Oe.intersectLine(he.x,he.y,ke,Pe,de.x,de.y,0),ft=Z.srcIntn=at,tn=ze.intersectLine(de.x,de.y,Ae,Te,he.x,he.y,0),gn=Z.tgtIntn=tn,mt=Z.intersectionPts={x1:at[0],x2:tn[0],y1:at[1],y2:tn[1]},ht=Z.posPts={x1:he.x,x2:de.x,y1:he.y,y2:de.y},Rt=tn[1]-at[1],Lt=tn[0]-at[0],yt=Math.sqrt(Lt*Lt+Rt*Rt),Mt=Z.vector={x:Lt,y:Rt},In=Z.vectorNorm={x:Mt.x/yt,y:Mt.y/yt},Pn={x:-In.y,y:In.x};Z.nodesOverlap=!kt(yt)||ze.checkPoint(at[0],at[1],0,Ae,Te,de.x,de.y)||Oe.checkPoint(tn[0],tn[1],0,ke,Pe,he.x,he.y),Z.vectorNormInverse=Pn,ae={nodesOverlap:Z.nodesOverlap,dirCounts:Z.dirCounts,calculatedIntersection:!0,hasBezier:Z.hasBezier,hasUnbundled:Z.hasUnbundled,eles:Z.eles,srcPos:de,tgtPos:he,srcW:Ae,srcH:Te,tgtW:ke,tgtH:Pe,srcIntn:gn,tgtIntn:ft,srcShape:ze,tgtShape:Oe,posPts:{x1:ht.x2,y1:ht.y2,x2:ht.x1,y2:ht.y1},intersectionPts:{x1:mt.x2,y1:mt.y2,x2:mt.x1,y2:mt.y1},vector:{x:-Mt.x,y:-Mt.y},vectorNorm:{x:-In.x,y:-In.y},vectorNormInverse:{x:-Pn.x,y:-Pn.y}}}var Vt=Ke?ae:Z;Ge.nodesOverlap=Vt.nodesOverlap,Ge.srcIntn=Vt.srcIntn,Ge.tgtIntn=Vt.tgtIntn,d&&(fe.isParent()||fe.isChild()||se.isParent()||se.isChild())&&(fe.parents().anySame(se)||se.parents().anySame(fe)||fe.same(se)&&fe.isParent())?r.findCompoundLoopPoints($e,Vt,We,Ve):fe===se?r.findLoopPoints($e,Vt,We,Ve):me==="segments"?r.findSegmentsPoints($e,Vt):me==="taxi"?r.findTaxiPoints($e,Vt):me==="straight"||!Ve&&Z.eles.length%2===1&&We===Math.floor(Z.eles.length/2)?r.findStraightEdgePoints($e):r.findBezierPoints($e,Vt,We,Ve,Ke),r.findEndpoints($e),r.tryToCorrectInvalidPoints($e,Vt),r.checkForInvalidEdgeWarning($e),r.storeAllpts($e),r.storeEdgeProjections($e),r.calculateArrowAngles($e),r.recalculateEdgeLabelProjections($e),r.calculateLabelAngles($e)}},Q=0;Q<b.length;Q++)W(Q);this.findHaystackPoints(y)}};function gD(a){var r=[];if(a!=null){for(var u=0;u<a.length;u+=2){var c=a[u],d=a[u+1];r.push({x:c,y:d})}return r}}So.getSegmentPoints=function(a){var r=a[0]._private.rscratch,u=r.edgeType;if(u==="segments")return this.recalculateRenderedStyle(a),gD(r.segpts)},So.getControlPoints=function(a){var r=a[0]._private.rscratch,u=r.edgeType;if(u==="bezier"||u==="multibezier"||u==="self"||u==="compound")return this.recalculateRenderedStyle(a),gD(r.ctrlpts)},So.getEdgeMidpoint=function(a){var r=a[0]._private.rscratch;return this.recalculateRenderedStyle(a),{x:r.midX,y:r.midY}};var y1={};y1.manualEndptToPx=function(a,r){var u=this,c=a.position(),d=a.outerWidth(),g=a.outerHeight();if(r.value.length===2){var b=[r.pfValue[0],r.pfValue[1]];return r.units[0]==="%"&&(b[0]=b[0]*d),r.units[1]==="%"&&(b[1]=b[1]*g),b[0]+=c.x,b[1]+=c.y,b}else{var y=r.pfValue[0];y=-Math.PI/2+y;var k=2*Math.max(d,g),E=[c.x+Math.cos(y)*k,c.y+Math.sin(y)*k];return u.nodeShapes[this.getNodeShape(a)].intersectLine(c.x,c.y,d,g,E[0],E[1],0)}},y1.findEndpoints=function(a){var r=this,u,c=a.source()[0],d=a.target()[0],g=c.position(),b=d.position(),y=a.pstyle("target-arrow-shape").value,k=a.pstyle("source-arrow-shape").value,E=a.pstyle("target-distance-from-node").pfValue,C=a.pstyle("source-distance-from-node").pfValue,T=a.pstyle("curve-style").value,P=a._private.rscratch,N=P.edgeType,D=T==="taxi",H=N==="self"||N==="compound",_=N==="bezier"||N==="multibezier"||H,B=N!=="bezier",$=N==="straight"||N==="segments",F=N==="segments",W=_||B||$,Q=H||D,X=a.pstyle("source-endpoint"),K=Q?"outside-to-node":X.value,ee=a.pstyle("target-endpoint"),Z=Q?"outside-to-node":ee.value;P.srcManEndpt=X,P.tgtManEndpt=ee;var ae,oe,J,fe;if(_){var se=[P.ctrlpts[0],P.ctrlpts[1]],pe=B?[P.ctrlpts[P.ctrlpts.length-2],P.ctrlpts[P.ctrlpts.length-1]]:se;ae=pe,oe=se}else if($){var he=F?P.segpts.slice(0,2):[b.x,b.y],de=F?P.segpts.slice(P.segpts.length-2):[g.x,g.y];ae=de,oe=he}if(Z==="inside-to-node")u=[b.x,b.y];else if(ee.units)u=this.manualEndptToPx(d,ee);else if(Z==="outside-to-line")u=P.tgtIntn;else if(Z==="outside-to-node"||Z==="outside-to-node-or-label"?J=ae:(Z==="outside-to-line"||Z==="outside-to-line-or-label")&&(J=[g.x,g.y]),u=r.nodeShapes[this.getNodeShape(d)].intersectLine(b.x,b.y,d.outerWidth(),d.outerHeight(),J[0],J[1],0),Z==="outside-to-node-or-label"||Z==="outside-to-line-or-label"){var ke=d._private.rscratch,Pe=ke.labelWidth,Ae=ke.labelHeight,Te=ke.labelX,Oe=ke.labelY,ze=Pe/2,We=Ae/2,$e=d.pstyle("text-valign").value;$e==="top"?Oe-=We:$e==="bottom"&&(Oe+=We);var Ge=d.pstyle("text-halign").value;Ge==="left"?Te-=ze:Ge==="right"&&(Te+=ze);var me=o1(J[0],J[1],[Te-ze,Oe-We,Te+ze,Oe-We,Te+ze,Oe+We,Te-ze,Oe+We],b.x,b.y);if(me.length>0){var Ve=g,Ke=Kh(Ve,Lv(u)),at=Kh(Ve,Lv(me)),ft=Ke;if(at<Ke&&(u=me,ft=at),me.length>2){var tn=Kh(Ve,{x:me[2],y:me[3]});tn<ft&&(u=[me[2],me[3]])}}}var gn=Iw(u,ae,r.arrowShapes[y].spacing(a)+E),mt=Iw(u,ae,r.arrowShapes[y].gap(a)+E);if(P.endX=mt[0],P.endY=mt[1],P.arrowEndX=gn[0],P.arrowEndY=gn[1],K==="inside-to-node")u=[g.x,g.y];else if(X.units)u=this.manualEndptToPx(c,X);else if(K==="outside-to-line")u=P.srcIntn;else if(K==="outside-to-node"||K==="outside-to-node-or-label"?fe=oe:(K==="outside-to-line"||K==="outside-to-line-or-label")&&(fe=[b.x,b.y]),u=r.nodeShapes[this.getNodeShape(c)].intersectLine(g.x,g.y,c.outerWidth(),c.outerHeight(),fe[0],fe[1],0),K==="outside-to-node-or-label"||K==="outside-to-line-or-label"){var ht=c._private.rscratch,Rt=ht.labelWidth,Lt=ht.labelHeight,yt=ht.labelX,Mt=ht.labelY,In=Rt/2,Pn=Lt/2,Vt=c.pstyle("text-valign").value;Vt==="top"?Mt-=Pn:Vt==="bottom"&&(Mt+=Pn);var sr=c.pstyle("text-halign").value;sr==="left"?yt-=In:sr==="right"&&(yt+=In);var Qe=o1(fe[0],fe[1],[yt-In,Mt-Pn,yt+In,Mt-Pn,yt+In,Mt+Pn,yt-In,Mt+Pn],g.x,g.y);if(Qe.length>0){var ne=b,Ie=Kh(ne,Lv(u)),Je=Kh(ne,Lv(Qe)),Ye=Ie;if(Je<Ie&&(u=[Qe[0],Qe[1]],Ye=Je),Qe.length>2){var Fe=Kh(ne,{x:Qe[2],y:Qe[3]});Fe<Ye&&(u=[Qe[2],Qe[3]])}}}var bn=Iw(u,oe,r.arrowShapes[k].spacing(a)+C),tt=Iw(u,oe,r.arrowShapes[k].gap(a)+C);P.startX=tt[0],P.startY=tt[1],P.arrowStartX=bn[0],P.arrowStartY=bn[1],W&&(!kt(P.startX)||!kt(P.startY)||!kt(P.endX)||!kt(P.endY)?P.badLine=!0:P.badLine=!1)},y1.getSourceEndpoint=function(a){var r=a[0]._private.rscratch;switch(this.recalculateRenderedStyle(a),r.edgeType){case"haystack":return{x:r.haystackPts[0],y:r.haystackPts[1]};default:return{x:r.arrowStartX,y:r.arrowStartY}}},y1.getTargetEndpoint=function(a){var r=a[0]._private.rscratch;switch(this.recalculateRenderedStyle(a),r.edgeType){case"haystack":return{x:r.haystackPts[2],y:r.haystackPts[3]};default:return{x:r.arrowEndX,y:r.arrowEndY}}};var hS={};function qX(a,r,u){for(var c=function(E,C,T,P){return za(E,C,T,P)},d=r._private,g=d.rstyle.bezierPts,b=0;b<a.bezierProjPcts.length;b++){var y=a.bezierProjPcts[b];g.push({x:c(u[0],u[2],u[4],y),y:c(u[1],u[3],u[5],y)})}}hS.storeEdgeProjections=function(a){var r=a._private,u=r.rscratch,c=u.edgeType;if(r.rstyle.bezierPts=null,r.rstyle.linePts=null,r.rstyle.haystackPts=null,c==="multibezier"||c==="bezier"||c==="self"||c==="compound"){r.rstyle.bezierPts=[];for(var d=0;d+5<u.allpts.length;d+=4)qX(this,a,u.allpts.slice(d,d+6))}else if(c==="segments")for(var g=r.rstyle.linePts=[],d=0;d+1<u.allpts.length;d+=2)g.push({x:u.allpts[d],y:u.allpts[d+1]});else if(c==="haystack"){var b=u.haystackPts;r.rstyle.haystackPts=[{x:b[0],y:b[1]},{x:b[2],y:b[3]}]}r.rstyle.arrowWidth=this.getArrowWidth(a.pstyle("width").pfValue,a.pstyle("arrow-scale").value)*this.arrowShapeWidth},hS.recalculateEdgeProjections=function(a){this.findEdgeControlPoints(a)};var Dc={};Dc.recalculateNodeLabelProjection=function(a){var r=a.pstyle("label").strValue;if(!Lf(r)){var u,c,d=a._private,g=a.width(),b=a.height(),y=a.padding(),k=a.position(),E=a.pstyle("text-halign").strValue,C=a.pstyle("text-valign").strValue,T=d.rscratch,P=d.rstyle;switch(E){case"left":u=k.x-g/2-y;break;case"right":u=k.x+g/2+y;break;default:u=k.x}switch(C){case"top":c=k.y-b/2-y;break;case"bottom":c=k.y+b/2+y;break;default:c=k.y}T.labelX=u,T.labelY=c,P.labelX=u,P.labelY=c,this.calculateLabelAngles(a),this.applyLabelDimensions(a)}};var bD=function(r,u){var c=Math.atan(u/r);return r===0&&c<0&&(c=c*-1),c},pD=function(r,u){var c=u.x-r.x,d=u.y-r.y;return bD(c,d)},VX=function(r,u,c,d){var g=i1(0,d-.001,1),b=i1(0,d+.001,1),y=Pv(r,u,c,g),k=Pv(r,u,c,b);return pD(y,k)};Dc.recalculateEdgeLabelProjections=function(a){var r,u=a._private,c=u.rscratch,d=this,g={mid:a.pstyle("label").strValue,source:a.pstyle("source-label").strValue,target:a.pstyle("target-label").strValue};if(g.mid||g.source||g.target){r={x:c.midX,y:c.midY};var b=function(T,P,N){jf(u.rscratch,T,P,N),jf(u.rstyle,T,P,N)};b("labelX",null,r.x),b("labelY",null,r.y);var y=bD(c.midDispX,c.midDispY);b("labelAutoAngle",null,y);var k=function C(){if(C.cache)return C.cache;for(var T=[],P=0;P+5<c.allpts.length;P+=4){var N={x:c.allpts[P],y:c.allpts[P+1]},D={x:c.allpts[P+2],y:c.allpts[P+3]},H={x:c.allpts[P+4],y:c.allpts[P+5]};T.push({p0:N,p1:D,p2:H,startDist:0,length:0,segments:[]})}var _=u.rstyle.bezierPts,B=d.bezierProjPcts.length;function $(K,ee,Z,ae,oe){var J=Uh(ee,Z),fe=K.segments[K.segments.length-1],se={p0:ee,p1:Z,t0:ae,t1:oe,startDist:fe?fe.startDist+fe.length:0,length:J};K.segments.push(se),K.length+=J}for(var F=0;F<T.length;F++){var W=T[F],Q=T[F-1];Q&&(W.startDist=Q.startDist+Q.length),$(W,W.p0,_[F*B],0,d.bezierProjPcts[0]);for(var X=0;X<B-1;X++)$(W,_[F*B+X],_[F*B+X+1],d.bezierProjPcts[X],d.bezierProjPcts[X+1]);$(W,_[F*B+B-1],W.p2,d.bezierProjPcts[B-1],1)}return C.cache=T},E=function(T){var P,N=T==="source";if(g[T]){var D=a.pstyle(T+"-text-offset").pfValue;switch(c.edgeType){case"self":case"compound":case"bezier":case"multibezier":{for(var H=k(),_,B=0,$=0,F=0;F<H.length;F++){for(var W=H[N?F:H.length-1-F],Q=0;Q<W.segments.length;Q++){var X=W.segments[N?Q:W.segments.length-1-Q],K=F===H.length-1&&Q===W.segments.length-1;if(B=$,$+=X.length,$>=D||K){_={cp:W,segment:X};break}}if(_)break}var ee=_.cp,Z=_.segment,ae=(D-B)/Z.length,oe=Z.t1-Z.t0,J=N?Z.t0+oe*ae:Z.t1-oe*ae;J=i1(0,J,1),r=Pv(ee.p0,ee.p1,ee.p2,J),P=VX(ee.p0,ee.p1,ee.p2,J);break}case"straight":case"segments":case"haystack":{for(var fe=0,se,pe,he,de,ke=c.allpts.length,Pe=0;Pe+3<ke&&(N?(he={x:c.allpts[Pe],y:c.allpts[Pe+1]},de={x:c.allpts[Pe+2],y:c.allpts[Pe+3]}):(he={x:c.allpts[ke-2-Pe],y:c.allpts[ke-1-Pe]},de={x:c.allpts[ke-4-Pe],y:c.allpts[ke-3-Pe]}),se=Uh(he,de),pe=fe,fe+=se,!(fe>=D));Pe+=2);var Ae=D-pe,Te=Ae/se;Te=i1(0,Te,1),r=sK(he,de,Te),P=pD(he,de);break}}b("labelX",T,r.x),b("labelY",T,r.y),b("labelAutoAngle",T,P)}};E("source"),E("target"),this.applyLabelDimensions(a)}},Dc.applyLabelDimensions=function(a){this.applyPrefixedLabelDimensions(a),a.isEdge()&&(this.applyPrefixedLabelDimensions(a,"source"),this.applyPrefixedLabelDimensions(a,"target"))},Dc.applyPrefixedLabelDimensions=function(a,r){var u=a._private,c=this.getLabelText(a,r),d=this.calculateLabelDimensions(a,c),g=a.pstyle("line-height").pfValue,b=a.pstyle("text-wrap").strValue,y=Ou(u.rscratch,"labelWrapCachedLines",r)||[],k=b!=="wrap"?1:Math.max(y.length,1),E=d.height/k,C=E*g,T=d.width,P=d.height+(k-1)*(g-1)*E;jf(u.rstyle,"labelWidth",r,T),jf(u.rscratch,"labelWidth",r,T),jf(u.rstyle,"labelHeight",r,P),jf(u.rscratch,"labelHeight",r,P),jf(u.rscratch,"labelLineHeight",r,C)},Dc.getLabelText=function(a,r){var u=a._private,c=r?r+"-":"",d=a.pstyle(c+"label").strValue,g=a.pstyle("text-transform").value,b=function(Ae,Te){return Te?(jf(u.rscratch,Ae,r,Te),Te):Ou(u.rscratch,Ae,r)};if(!d)return"";g=="none"||(g=="uppercase"?d=d.toUpperCase():g=="lowercase"&&(d=d.toLowerCase()));var y=a.pstyle("text-wrap").value;if(y==="wrap"){var k=b("labelKey");if(k!=null&&b("labelWrapKey")===k)return b("labelWrapCachedText");for(var E="​",C=d.split(`
-`),T=a.pstyle("text-max-width").pfValue,P=a.pstyle("text-overflow-wrap").value,N=P==="anywhere",D=[],H=/[\s\u200b]+/,_=N?"":" ",B=0;B<C.length;B++){var $=C[B],F=this.calculateLabelDimensions(a,$),W=F.width;if(N){var Q=$.split("").join(E);$=Q}if(W>T){for(var X=$.split(H),K="",ee=0;ee<X.length;ee++){var Z=X[ee],ae=K.length===0?Z:K+_+Z,oe=this.calculateLabelDimensions(a,ae),J=oe.width;J<=T?K+=Z+_:(K&&D.push(K),K=Z+_)}K.match(/^[\s\u200b]+$/)||D.push(K)}else D.push($)}b("labelWrapCachedLines",D),d=b("labelWrapCachedText",D.join(`
-`)),b("labelWrapKey",k)}else if(y==="ellipsis"){var fe=a.pstyle("text-max-width").pfValue,se="",pe="…",he=!1;if(this.calculateLabelDimensions(a,d).width<fe)return d;for(var de=0;de<d.length;de++){var ke=this.calculateLabelDimensions(a,se+d[de]+pe).width;if(ke>fe)break;se+=d[de],de===d.length-1&&(he=!0)}return he||(se+=pe),se}return d},Dc.getLabelJustification=function(a){var r=a.pstyle("text-justification").strValue,u=a.pstyle("text-halign").strValue;if(r==="auto")if(a.isNode())switch(u){case"left":return"right";case"right":return"left";default:return"center"}else return"center";else return r},Dc.calculateLabelDimensions=function(a,r){var u=this,c=Wh(r,a._private.labelDimsKey),d=u.labelDimCache||(u.labelDimCache=[]),g=d[c];if(g!=null)return g;var b=0,y=a.pstyle("font-style").strValue,k=a.pstyle("font-size").pfValue,E=a.pstyle("font-family").strValue,C=a.pstyle("font-weight").strValue,T=this.labelCalcCanvas,P=this.labelCalcCanvasContext;if(!T){T=this.labelCalcCanvas=document.createElement("canvas"),P=this.labelCalcCanvasContext=T.getContext("2d");var N=T.style;N.position="absolute",N.left="-9999px",N.top="-9999px",N.zIndex="-1",N.visibility="hidden",N.pointerEvents="none"}P.font="".concat(y," ").concat(C," ").concat(k,"px ").concat(E);for(var D=0,H=0,_=r.split(`
-`),B=0;B<_.length;B++){var $=_[B],F=P.measureText($),W=Math.ceil(F.width),Q=k;D=Math.max(W,D),H+=Q}return D+=b,H+=b,d[c]={width:D,height:H}},Dc.calculateLabelAngle=function(a,r){var u=a._private,c=u.rscratch,d=a.isEdge(),g=r?r+"-":"",b=a.pstyle(g+"text-rotation"),y=b.strValue;return y==="none"?0:d&&y==="autorotate"?c.labelAutoAngle:y==="autorotate"?0:b.pfValue},Dc.calculateLabelAngles=function(a){var r=this,u=a.isEdge(),c=a._private,d=c.rscratch;d.labelAngle=r.calculateLabelAngle(a),u&&(d.sourceLabelAngle=r.calculateLabelAngle(a,"source"),d.targetLabelAngle=r.calculateLabelAngle(a,"target"))};var wD={},mD=28,yD=!1;wD.getNodeShape=function(a){var r=this,u=a.pstyle("shape").value;if(u==="cutrectangle"&&(a.width()<mD||a.height()<mD))return yD||(pr("The `cutrectangle` node shape can not be used at small sizes so `rectangle` is used instead"),yD=!0),"rectangle";if(a.isParent())return u==="rectangle"||u==="roundrectangle"||u==="round-rectangle"||u==="cutrectangle"||u==="cut-rectangle"||u==="barrel"?u:"rectangle";if(u==="polygon"){var c=a.pstyle("shape-polygon-points").value;return r.nodeShapes.makePolygon(c).name}return u};var im={};im.registerCalculationListeners=function(){var a=this.cy,r=a.collection(),u=this,c=function(b){var y=arguments.length>1&&arguments[1]!==void 0?arguments[1]:!0;if(r.merge(b),y)for(var k=0;k<b.length;k++){var E=b[k],C=E._private,T=C.rstyle;T.clean=!1,T.cleanConnected=!1}};u.binder(a).on("bounds.* dirty.*",function(b){var y=b.target;c(y)}).on("style.* background.*",function(b){var y=b.target;c(y,!1)});var d=function(b){if(b){var y=u.onUpdateEleCalcsFns;r.cleanStyle();for(var k=0;k<r.length;k++){var E=r[k],C=E._private.rstyle;E.isNode()&&!C.cleanConnected&&(c(E.connectedEdges()),C.cleanConnected=!0)}if(y)for(var T=0;T<y.length;T++){var P=y[T];P(b,r)}u.recalculateRenderedStyle(r),r=a.collection()}};u.flushRenderedStyleQueue=function(){d(!0)},u.beforeRender(d,u.beforeRenderPriorities.eleCalcs)},im.onUpdateEleCalcs=function(a){var r=this.onUpdateEleCalcsFns=this.onUpdateEleCalcsFns||[];r.push(a)},im.recalculateRenderedStyle=function(a,r){var u=function(W){return W._private.rstyle.cleanConnected},c=[],d=[];if(!this.destroyed){r===void 0&&(r=!0);for(var g=0;g<a.length;g++){var b=a[g],y=b._private,k=y.rstyle;b.isEdge()&&(!u(b.source())||!u(b.target()))&&(k.clean=!1),!(r&&k.clean||b.removed())&&b.pstyle("display").value!=="none"&&(y.group==="nodes"?d.push(b):c.push(b),k.clean=!0)}for(var E=0;E<d.length;E++){var C=d[E],T=C._private,P=T.rstyle,N=C.position();this.recalculateNodeLabelProjection(C),P.nodeX=N.x,P.nodeY=N.y,P.nodeW=C.pstyle("width").pfValue,P.nodeH=C.pstyle("height").pfValue}this.recalculateEdgeProjections(c);for(var D=0;D<c.length;D++){var H=c[D],_=H._private,B=_.rstyle,$=_.rscratch;B.srcX=$.arrowStartX,B.srcY=$.arrowStartY,B.tgtX=$.arrowEndX,B.tgtY=$.arrowEndY,B.midX=$.midX,B.midY=$.midY,B.labelAngle=$.labelAngle,B.sourceLabelAngle=$.sourceLabelAngle,B.targetLabelAngle=$.targetLabelAngle}}};var am={};am.updateCachedGrabbedEles=function(){var a=this.cachedZSortedEles;if(a){a.drag=[],a.nondrag=[];for(var r=[],u=0;u<a.length;u++){var c=a[u],d=c._private.rscratch;c.grabbed()&&!c.isParent()?r.push(c):d.inDragLayer?a.drag.push(c):a.nondrag.push(c)}for(var u=0;u<r.length;u++){var c=r[u];a.drag.push(c)}}},am.invalidateCachedZSortedEles=function(){this.cachedZSortedEles=null},am.getCachedZSortedEles=function(a){if(a||!this.cachedZSortedEles){var r=this.cy.mutableElements().toArray();r.sort(Y7),r.interactive=r.filter(function(u){return u.interactive()}),this.cachedZSortedEles=r,this.updateCachedGrabbedEles()}else r=this.cachedZSortedEles;return r};var kD={};[ed,rm,So,y1,hS,Dc,wD,im,am].forEach(function(a){en(kD,a)});var ED={};ED.getCachedImage=function(a,r,u){var c=this,d=c.imageCache=c.imageCache||{},g=d[a];if(g)return g.image.complete||g.image.addEventListener("load",u),g.image;g=d[a]=d[a]||{};var b=g.image=new Image;b.addEventListener("load",u),b.addEventListener("error",function(){b.error=!0});var y="data:",k=a.substring(0,y.length).toLowerCase()===y;return k||(r=r==="null"?null:r,b.crossOrigin=r),b.src=a,b};var $v={};$v.registerBinding=function(a,r,u,c){var d=Array.prototype.slice.apply(arguments,[1]),g=this.binder(a);return g.on.apply(g,d)},$v.binder=function(a){var r=this,u=r.cy.window(),c=a===u||a===u.document||a===u.document.body||hU(a);if(r.supportsPassiveEvents==null){var d=!1;try{var g=Object.defineProperty({},"passive",{get:function(){return d=!0,!0}});u.addEventListener("test",null,g)}catch{}r.supportsPassiveEvents=d}var b=function(k,E,C){var T=Array.prototype.slice.call(arguments);return c&&r.supportsPassiveEvents&&(T[2]={capture:C??!1,passive:!1,once:!1}),r.bindings.push({target:a,args:T}),(a.addEventListener||a.on).apply(a,T),this};return{on:b,addEventListener:b,addListener:b,bind:b}},$v.nodeIsDraggable=function(a){return a&&a.isNode()&&!a.locked()&&a.grabbable()},$v.nodeIsGrabbable=function(a){return this.nodeIsDraggable(a)&&a.interactive()},$v.load=function(){var a=this,r=a.cy.window(),u=function(ne){return ne.selected()},c=function(ne,Ie,Je,Ye){ne==null&&(ne=a.cy);for(var Fe=0;Fe<Ie.length;Fe++){var bn=Ie[Fe];ne.emit({originalEvent:Je,type:bn,position:Ye})}},d=function(ne){return ne.shiftKey||ne.metaKey||ne.ctrlKey},g=function(ne,Ie){var Je=!0;if(a.cy.hasCompoundNodes()&&ne&&ne.pannable())for(var Ye=0;Ie&&Ye<Ie.length;Ye++){var ne=Ie[Ye];if(ne.isNode()&&ne.isParent()&&!ne.pannable()){Je=!1;break}}else Je=!0;return Je},b=function(ne){ne[0]._private.grabbed=!0},y=function(ne){ne[0]._private.grabbed=!1},k=function(ne){ne[0]._private.rscratch.inDragLayer=!0},E=function(ne){ne[0]._private.rscratch.inDragLayer=!1},C=function(ne){ne[0]._private.rscratch.isGrabTarget=!0},T=function(ne){ne[0]._private.rscratch.isGrabTarget=!1},P=function(ne,Ie){var Je=Ie.addToList,Ye=Je.has(ne);!Ye&&ne.grabbable()&&!ne.locked()&&(Je.merge(ne),b(ne))},N=function(ne,Ie){if(ne.cy().hasCompoundNodes()&&!(Ie.inDragLayer==null&&Ie.addToList==null)){var Je=ne.descendants();Ie.inDragLayer&&(Je.forEach(k),Je.connectedEdges().forEach(k)),Ie.addToList&&P(Je,Ie)}},D=function(ne,Ie){Ie=Ie||{};var Je=ne.cy().hasCompoundNodes();Ie.inDragLayer&&(ne.forEach(k),ne.neighborhood().stdFilter(function(Ye){return!Je||Ye.isEdge()}).forEach(k)),Ie.addToList&&ne.forEach(function(Ye){P(Ye,Ie)}),N(ne,Ie),B(ne,{inDragLayer:Ie.inDragLayer}),a.updateCachedGrabbedEles()},H=D,_=function(ne){ne&&(a.getCachedZSortedEles().forEach(function(Ie){y(Ie),E(Ie),T(Ie)}),a.updateCachedGrabbedEles())},B=function(ne,Ie){if(!(Ie.inDragLayer==null&&Ie.addToList==null)&&ne.cy().hasCompoundNodes()){var Je=ne.ancestors().orphans();if(!Je.same(ne)){var Ye=Je.descendants().spawnSelf().merge(Je).unmerge(ne).unmerge(ne.descendants()),Fe=Ye.connectedEdges();Ie.inDragLayer&&(Fe.forEach(k),Ye.forEach(k)),Ie.addToList&&Ye.forEach(function(bn){P(bn,Ie)})}}},$=function(){document.activeElement!=null&&document.activeElement.blur!=null&&document.activeElement.blur()},F=typeof MutationObserver<"u",W=typeof ResizeObserver<"u";F?(a.removeObserver=new MutationObserver(function(Qe){for(var ne=0;ne<Qe.length;ne++){var Ie=Qe[ne],Je=Ie.removedNodes;if(Je)for(var Ye=0;Ye<Je.length;Ye++){var Fe=Je[Ye];if(Fe===a.container){a.destroy();break}}}}),a.container.parentNode&&a.removeObserver.observe(a.container.parentNode,{childList:!0})):a.registerBinding(a.container,"DOMNodeRemoved",function(Qe){a.destroy()});var Q=Ew.default(function(){a.cy.resize()},100);F&&(a.styleObserver=new MutationObserver(Q),a.styleObserver.observe(a.container,{attributes:!0})),a.registerBinding(r,"resize",Q),W&&(a.resizeObserver=new ResizeObserver(Q),a.resizeObserver.observe(a.container));var X=function(ne,Ie){for(;ne!=null;)Ie(ne),ne=ne.parentNode},K=function(){a.invalidateContainerClientCoordsCache()};X(a.container,function(Qe){a.registerBinding(Qe,"transitionend",K),a.registerBinding(Qe,"animationend",K),a.registerBinding(Qe,"scroll",K)}),a.registerBinding(a.container,"contextmenu",function(Qe){Qe.preventDefault()});var ee=function(){return a.selection[4]!==0},Z=function(ne){for(var Ie=a.findContainerClientCoords(),Je=Ie[0],Ye=Ie[1],Fe=Ie[2],bn=Ie[3],tt=ne.touches?ne.touches:[ne],Gt=!1,tr=0;tr<tt.length;tr++){var vr=tt[tr];if(Je<=vr.clientX&&vr.clientX<=Je+Fe&&Ye<=vr.clientY&&vr.clientY<=Ye+bn){Gt=!0;break}}if(!Gt)return!1;for(var Dn=a.container,rr=ne.target,wn=rr.parentNode,jn=!1;wn;){if(wn===Dn){jn=!0;break}wn=wn.parentNode}return!!jn};a.registerBinding(a.container,"mousedown",function(ne){if(Z(ne)){ne.preventDefault(),$(),a.hoverData.capture=!0,a.hoverData.which=ne.which;var Ie=a.cy,Je=[ne.clientX,ne.clientY],Ye=a.projectIntoViewport(Je[0],Je[1]),Fe=a.selection,bn=a.findNearestElements(Ye[0],Ye[1],!0,!1),tt=bn[0],Gt=a.dragData.possibleDragElements;a.hoverData.mdownPos=Ye,a.hoverData.mdownGPos=Je;var tr=function(){a.hoverData.tapholdCancelled=!1,clearTimeout(a.hoverData.tapholdTimeout),a.hoverData.tapholdTimeout=setTimeout(function(){if(!a.hoverData.tapholdCancelled){var ci=a.hoverData.down;ci?ci.emit({originalEvent:ne,type:"taphold",position:{x:Ye[0],y:Ye[1]}}):Ie.emit({originalEvent:ne,type:"taphold",position:{x:Ye[0],y:Ye[1]}})}},a.tapholdDuration)};if(ne.which==3){a.hoverData.cxtStarted=!0;var vr={originalEvent:ne,type:"cxttapstart",position:{x:Ye[0],y:Ye[1]}};tt?(tt.activate(),tt.emit(vr),a.hoverData.down=tt):Ie.emit(vr),a.hoverData.downTime=new Date().getTime(),a.hoverData.cxtDragged=!1}else if(ne.which==1){tt&&tt.activate();{if(tt!=null&&a.nodeIsGrabbable(tt)){var Dn=function(ci){return{originalEvent:ne,type:ci,position:{x:Ye[0],y:Ye[1]}}},rr=function(ci){ci.emit(Dn("grab"))};if(C(tt),!tt.selected())Gt=a.dragData.possibleDragElements=Ie.collection(),H(tt,{addToList:Gt}),tt.emit(Dn("grabon")).emit(Dn("grab"));else{Gt=a.dragData.possibleDragElements=Ie.collection();var wn=Ie.$(function(jn){return jn.isNode()&&jn.selected()&&a.nodeIsGrabbable(jn)});D(wn,{addToList:Gt}),tt.emit(Dn("grabon")),wn.forEach(rr)}a.redrawHint("eles",!0),a.redrawHint("drag",!0)}a.hoverData.down=tt,a.hoverData.downs=bn,a.hoverData.downTime=new Date().getTime()}c(tt,["mousedown","tapstart","vmousedown"],ne,{x:Ye[0],y:Ye[1]}),tt==null?(Fe[4]=1,a.data.bgActivePosistion={x:Ye[0],y:Ye[1]},a.redrawHint("select",!0),a.redraw()):tt.pannable()&&(Fe[4]=1),tr()}Fe[0]=Fe[2]=Ye[0],Fe[1]=Fe[3]=Ye[1]}},!1),a.registerBinding(r,"mousemove",function(ne){var Ie=a.hoverData.capture;if(!(!Ie&&!Z(ne))){var Je=!1,Ye=a.cy,Fe=Ye.zoom(),bn=[ne.clientX,ne.clientY],tt=a.projectIntoViewport(bn[0],bn[1]),Gt=a.hoverData.mdownPos,tr=a.hoverData.mdownGPos,vr=a.selection,Dn=null;!a.hoverData.draggingEles&&!a.hoverData.dragging&&!a.hoverData.selecting&&(Dn=a.findNearestElement(tt[0],tt[1],!0,!1));var rr=a.hoverData.last,wn=a.hoverData.down,jn=[tt[0]-vr[2],tt[1]-vr[3]],ci=a.dragData.possibleDragElements,aa;if(tr){var fs=bn[0]-tr[0],hs=fs*fs,oa=bn[1]-tr[1],zo=oa*oa,Ha=hs+zo;a.hoverData.isOverThresholdDrag=aa=Ha>=a.desktopTapThreshold2}var au=d(ne);aa&&(a.hoverData.tapholdCancelled=!0);var Bu=function(){var Rs=a.hoverData.dragDelta=a.hoverData.dragDelta||[];Rs.length===0?(Rs.push(jn[0]),Rs.push(jn[1])):(Rs[0]+=jn[0],Rs[1]+=jn[1])};Je=!0,c(Dn,["mousemove","vmousemove","tapdrag"],ne,{x:tt[0],y:tt[1]});var Il=function(){a.data.bgActivePosistion=void 0,a.hoverData.selecting||Ye.emit({originalEvent:ne,type:"boxstart",position:{x:tt[0],y:tt[1]}}),vr[4]=1,a.hoverData.selecting=!0,a.redrawHint("select",!0),a.redraw()};if(a.hoverData.which===3){if(aa){var Nc={originalEvent:ne,type:"cxtdrag",position:{x:tt[0],y:tt[1]}};wn?wn.emit(Nc):Ye.emit(Nc),a.hoverData.cxtDragged=!0,(!a.hoverData.cxtOver||Dn!==a.hoverData.cxtOver)&&(a.hoverData.cxtOver&&a.hoverData.cxtOver.emit({originalEvent:ne,type:"cxtdragout",position:{x:tt[0],y:tt[1]}}),a.hoverData.cxtOver=Dn,Dn&&Dn.emit({originalEvent:ne,type:"cxtdragover",position:{x:tt[0],y:tt[1]}}))}}else if(a.hoverData.dragging){if(Je=!0,Ye.panningEnabled()&&Ye.userPanningEnabled()){var Ml;if(a.hoverData.justStartedPan){var ad=a.hoverData.mdownPos;Ml={x:(tt[0]-ad[0])*Fe,y:(tt[1]-ad[1])*Fe},a.hoverData.justStartedPan=!1}else Ml={x:jn[0]*Fe,y:jn[1]*Fe};Ye.panBy(Ml),Ye.emit("dragpan"),a.hoverData.dragged=!0}tt=a.projectIntoViewport(ne.clientX,ne.clientY)}else if(vr[4]==1&&(wn==null||wn.pannable())){if(aa){if(!a.hoverData.dragging&&Ye.boxSelectionEnabled()&&(au||!Ye.panningEnabled()||!Ye.userPanningEnabled()))Il();else if(!a.hoverData.selecting&&Ye.panningEnabled()&&Ye.userPanningEnabled()){var Ic=g(wn,a.hoverData.downs);Ic&&(a.hoverData.dragging=!0,a.hoverData.justStartedPan=!0,vr[4]=0,a.data.bgActivePosistion=Lv(Gt),a.redrawHint("select",!0),a.redraw())}wn&&wn.pannable()&&wn.active()&&wn.unactivate()}}else{if(wn&&wn.pannable()&&wn.active()&&wn.unactivate(),(!wn||!wn.grabbed())&&Dn!=rr&&(rr&&c(rr,["mouseout","tapdragout"],ne,{x:tt[0],y:tt[1]}),Dn&&c(Dn,["mouseover","tapdragover"],ne,{x:tt[0],y:tt[1]}),a.hoverData.last=Dn),wn)if(aa){if(Ye.boxSelectionEnabled()&&au)wn&&wn.grabbed()&&(_(ci),wn.emit("freeon"),ci.emit("free"),a.dragData.didDrag&&(wn.emit("dragfreeon"),ci.emit("dragfree"))),Il();else if(wn&&wn.grabbed()&&a.nodeIsDraggable(wn)){var ao=!a.dragData.didDrag;ao&&a.redrawHint("eles",!0),a.dragData.didDrag=!0,a.hoverData.draggingEles||D(ci,{inDragLayer:!0});var Sa={x:0,y:0};if(kt(jn[0])&&kt(jn[1])&&(Sa.x+=jn[0],Sa.y+=jn[1],ao)){var oo=a.hoverData.dragDelta;oo&&kt(oo[0])&&kt(oo[1])&&(Sa.x+=oo[0],Sa.y+=oo[1])}a.hoverData.draggingEles=!0,ci.silentShift(Sa).emit("position drag"),a.redrawHint("drag",!0),a.redraw()}}else Bu();Je=!0}if(vr[2]=tt[0],vr[3]=tt[1],Je)return ne.stopPropagation&&ne.stopPropagation(),ne.preventDefault&&ne.preventDefault(),!1}},!1);var ae,oe,J;a.registerBinding(r,"mouseup",function(ne){var Ie=a.hoverData.capture;if(Ie){a.hoverData.capture=!1;var Je=a.cy,Ye=a.projectIntoViewport(ne.clientX,ne.clientY),Fe=a.selection,bn=a.findNearestElement(Ye[0],Ye[1],!0,!1),tt=a.dragData.possibleDragElements,Gt=a.hoverData.down,tr=d(ne);if(a.data.bgActivePosistion&&(a.redrawHint("select",!0),a.redraw()),a.hoverData.tapholdCancelled=!0,a.data.bgActivePosistion=void 0,Gt&&Gt.unactivate(),a.hoverData.which===3){var vr={originalEvent:ne,type:"cxttapend",position:{x:Ye[0],y:Ye[1]}};if(Gt?Gt.emit(vr):Je.emit(vr),!a.hoverData.cxtDragged){var Dn={originalEvent:ne,type:"cxttap",position:{x:Ye[0],y:Ye[1]}};Gt?Gt.emit(Dn):Je.emit(Dn)}a.hoverData.cxtDragged=!1,a.hoverData.which=null}else if(a.hoverData.which===1){if(c(bn,["mouseup","tapend","vmouseup"],ne,{x:Ye[0],y:Ye[1]}),!a.dragData.didDrag&&!a.hoverData.dragged&&!a.hoverData.selecting&&!a.hoverData.isOverThresholdDrag&&(c(Gt,["click","tap","vclick"],ne,{x:Ye[0],y:Ye[1]}),oe=!1,ne.timeStamp-J<=Je.multiClickDebounceTime()?(ae&&clearTimeout(ae),oe=!0,J=null,c(Gt,["dblclick","dbltap","vdblclick"],ne,{x:Ye[0],y:Ye[1]})):(ae=setTimeout(function(){oe||c(Gt,["oneclick","onetap","voneclick"],ne,{x:Ye[0],y:Ye[1]})},Je.multiClickDebounceTime()),J=ne.timeStamp)),Gt==null&&!a.dragData.didDrag&&!a.hoverData.selecting&&!a.hoverData.dragged&&!d(ne)&&(Je.$(u).unselect(["tapunselect"]),tt.length>0&&a.redrawHint("eles",!0),a.dragData.possibleDragElements=tt=Je.collection()),bn==Gt&&!a.dragData.didDrag&&!a.hoverData.selecting&&bn!=null&&bn._private.selectable&&(a.hoverData.dragging||(Je.selectionType()==="additive"||tr?bn.selected()?bn.unselect(["tapunselect"]):bn.select(["tapselect"]):tr||(Je.$(u).unmerge(bn).unselect(["tapunselect"]),bn.select(["tapselect"]))),a.redrawHint("eles",!0)),a.hoverData.selecting){var rr=Je.collection(a.getAllInBox(Fe[0],Fe[1],Fe[2],Fe[3]));a.redrawHint("select",!0),rr.length>0&&a.redrawHint("eles",!0),Je.emit({type:"boxend",originalEvent:ne,position:{x:Ye[0],y:Ye[1]}});var wn=function(aa){return aa.selectable()&&!aa.selected()};Je.selectionType()==="additive"||tr||Je.$(u).unmerge(rr).unselect(),rr.emit("box").stdFilter(wn).select().emit("boxselect"),a.redraw()}if(a.hoverData.dragging&&(a.hoverData.dragging=!1,a.redrawHint("select",!0),a.redrawHint("eles",!0),a.redraw()),!Fe[4]){a.redrawHint("drag",!0),a.redrawHint("eles",!0);var jn=Gt&&Gt.grabbed();_(tt),jn&&(Gt.emit("freeon"),tt.emit("free"),a.dragData.didDrag&&(Gt.emit("dragfreeon"),tt.emit("dragfree")))}}Fe[4]=0,a.hoverData.down=null,a.hoverData.cxtStarted=!1,a.hoverData.draggingEles=!1,a.hoverData.selecting=!1,a.hoverData.isOverThresholdDrag=!1,a.dragData.didDrag=!1,a.hoverData.dragged=!1,a.hoverData.dragDelta=[],a.hoverData.mdownPos=null,a.hoverData.mdownGPos=null}},!1);var fe=function(ne){if(!a.scrollingPage){var Ie=a.cy,Je=Ie.zoom(),Ye=Ie.pan(),Fe=a.projectIntoViewport(ne.clientX,ne.clientY),bn=[Fe[0]*Je+Ye.x,Fe[1]*Je+Ye.y];if(a.hoverData.draggingEles||a.hoverData.dragging||a.hoverData.cxtStarted||ee()){ne.preventDefault();return}if(Ie.panningEnabled()&&Ie.userPanningEnabled()&&Ie.zoomingEnabled()&&Ie.userZoomingEnabled()){ne.preventDefault(),a.data.wheelZooming=!0,clearTimeout(a.data.wheelTimeout),a.data.wheelTimeout=setTimeout(function(){a.data.wheelZooming=!1,a.redrawHint("eles",!0),a.redraw()},150);var tt;ne.deltaY!=null?tt=ne.deltaY/-250:ne.wheelDeltaY!=null?tt=ne.wheelDeltaY/1e3:tt=ne.wheelDelta/1e3,tt=tt*a.wheelSensitivity;var Gt=ne.deltaMode===1;Gt&&(tt*=33);var tr=Ie.zoom()*Math.pow(10,tt);ne.type==="gesturechange"&&(tr=a.gestureStartZoom*ne.scale),Ie.zoom({level:tr,renderedPosition:{x:bn[0],y:bn[1]}}),Ie.emit(ne.type==="gesturechange"?"pinchzoom":"scrollzoom")}}};a.registerBinding(a.container,"wheel",fe,!0),a.registerBinding(r,"scroll",function(ne){a.scrollingPage=!0,clearTimeout(a.scrollingPageTimeout),a.scrollingPageTimeout=setTimeout(function(){a.scrollingPage=!1},250)},!0),a.registerBinding(a.container,"gesturestart",function(ne){a.gestureStartZoom=a.cy.zoom(),a.hasTouchStarted||ne.preventDefault()},!0),a.registerBinding(a.container,"gesturechange",function(Qe){a.hasTouchStarted||fe(Qe)},!0),a.registerBinding(a.container,"mouseout",function(ne){var Ie=a.projectIntoViewport(ne.clientX,ne.clientY);a.cy.emit({originalEvent:ne,type:"mouseout",position:{x:Ie[0],y:Ie[1]}})},!1),a.registerBinding(a.container,"mouseover",function(ne){var Ie=a.projectIntoViewport(ne.clientX,ne.clientY);a.cy.emit({originalEvent:ne,type:"mouseover",position:{x:Ie[0],y:Ie[1]}})},!1);var se,pe,he,de,ke,Pe,Ae,Te,Oe,ze,We,$e,Ge,me=function(ne,Ie,Je,Ye){return Math.sqrt((Je-ne)*(Je-ne)+(Ye-Ie)*(Ye-Ie))},Ve=function(ne,Ie,Je,Ye){return(Je-ne)*(Je-ne)+(Ye-Ie)*(Ye-Ie)},Ke;a.registerBinding(a.container,"touchstart",Ke=function(ne){if(a.hasTouchStarted=!0,!!Z(ne)){$(),a.touchData.capture=!0,a.data.bgActivePosistion=void 0;var Ie=a.cy,Je=a.touchData.now,Ye=a.touchData.earlier;if(ne.touches[0]){var Fe=a.projectIntoViewport(ne.touches[0].clientX,ne.touches[0].clientY);Je[0]=Fe[0],Je[1]=Fe[1]}if(ne.touches[1]){var Fe=a.projectIntoViewport(ne.touches[1].clientX,ne.touches[1].clientY);Je[2]=Fe[0],Je[3]=Fe[1]}if(ne.touches[2]){var Fe=a.projectIntoViewport(ne.touches[2].clientX,ne.touches[2].clientY);Je[4]=Fe[0],Je[5]=Fe[1]}if(ne.touches[1]){a.touchData.singleTouchMoved=!0,_(a.dragData.touchDragEles);var bn=a.findContainerClientCoords();Oe=bn[0],ze=bn[1],We=bn[2],$e=bn[3],se=ne.touches[0].clientX-Oe,pe=ne.touches[0].clientY-ze,he=ne.touches[1].clientX-Oe,de=ne.touches[1].clientY-ze,Ge=0<=se&&se<=We&&0<=he&&he<=We&&0<=pe&&pe<=$e&&0<=de&&de<=$e;var tt=Ie.pan(),Gt=Ie.zoom();ke=me(se,pe,he,de),Pe=Ve(se,pe,he,de),Ae=[(se+he)/2,(pe+de)/2],Te=[(Ae[0]-tt.x)/Gt,(Ae[1]-tt.y)/Gt];var tr=200,vr=tr*tr;if(Pe<vr&&!ne.touches[2]){var Dn=a.findNearestElement(Je[0],Je[1],!0,!0),rr=a.findNearestElement(Je[2],Je[3],!0,!0);Dn&&Dn.isNode()?(Dn.activate().emit({originalEvent:ne,type:"cxttapstart",position:{x:Je[0],y:Je[1]}}),a.touchData.start=Dn):rr&&rr.isNode()?(rr.activate().emit({originalEvent:ne,type:"cxttapstart",position:{x:Je[0],y:Je[1]}}),a.touchData.start=rr):Ie.emit({originalEvent:ne,type:"cxttapstart",position:{x:Je[0],y:Je[1]}}),a.touchData.start&&(a.touchData.start._private.grabbed=!1),a.touchData.cxt=!0,a.touchData.cxtDragged=!1,a.data.bgActivePosistion=void 0,a.redraw();return}}if(ne.touches[2])Ie.boxSelectionEnabled()&&ne.preventDefault();else if(!ne.touches[1]){if(ne.touches[0]){var wn=a.findNearestElements(Je[0],Je[1],!0,!0),jn=wn[0];if(jn!=null&&(jn.activate(),a.touchData.start=jn,a.touchData.starts=wn,a.nodeIsGrabbable(jn))){var ci=a.dragData.touchDragEles=Ie.collection(),aa=null;a.redrawHint("eles",!0),a.redrawHint("drag",!0),jn.selected()?(aa=Ie.$(function(Ha){return Ha.selected()&&a.nodeIsGrabbable(Ha)}),D(aa,{addToList:ci})):H(jn,{addToList:ci}),C(jn);var fs=function(au){return{originalEvent:ne,type:au,position:{x:Je[0],y:Je[1]}}};jn.emit(fs("grabon")),aa?aa.forEach(function(Ha){Ha.emit(fs("grab"))}):jn.emit(fs("grab"))}c(jn,["touchstart","tapstart","vmousedown"],ne,{x:Je[0],y:Je[1]}),jn==null&&(a.data.bgActivePosistion={x:Fe[0],y:Fe[1]},a.redrawHint("select",!0),a.redraw()),a.touchData.singleTouchMoved=!1,a.touchData.singleTouchStartTime=+new Date,clearTimeout(a.touchData.tapholdTimeout),a.touchData.tapholdTimeout=setTimeout(function(){a.touchData.singleTouchMoved===!1&&!a.pinching&&!a.touchData.selecting&&c(a.touchData.start,["taphold"],ne,{x:Je[0],y:Je[1]})},a.tapholdDuration)}}if(ne.touches.length>=1){for(var hs=a.touchData.startPosition=[null,null,null,null,null,null],oa=0;oa<Je.length;oa++)hs[oa]=Ye[oa]=Je[oa];var zo=ne.touches[0];a.touchData.startGPosition=[zo.clientX,zo.clientY]}}},!1);var at;a.registerBinding(window,"touchmove",at=function(ne){var Ie=a.touchData.capture;if(!(!Ie&&!Z(ne))){var Je=a.selection,Ye=a.cy,Fe=a.touchData.now,bn=a.touchData.earlier,tt=Ye.zoom();if(ne.touches[0]){var Gt=a.projectIntoViewport(ne.touches[0].clientX,ne.touches[0].clientY);Fe[0]=Gt[0],Fe[1]=Gt[1]}if(ne.touches[1]){var Gt=a.projectIntoViewport(ne.touches[1].clientX,ne.touches[1].clientY);Fe[2]=Gt[0],Fe[3]=Gt[1]}if(ne.touches[2]){var Gt=a.projectIntoViewport(ne.touches[2].clientX,ne.touches[2].clientY);Fe[4]=Gt[0],Fe[5]=Gt[1]}var tr=a.touchData.startGPosition,vr;if(Ie&&ne.touches[0]&&tr){for(var Dn=[],rr=0;rr<Fe.length;rr++)Dn[rr]=Fe[rr]-bn[rr];var wn=ne.touches[0].clientX-tr[0],jn=wn*wn,ci=ne.touches[0].clientY-tr[1],aa=ci*ci,fs=jn+aa;vr=fs>=a.touchTapThreshold2}if(Ie&&a.touchData.cxt){ne.preventDefault();var hs=ne.touches[0].clientX-Oe,oa=ne.touches[0].clientY-ze,zo=ne.touches[1].clientX-Oe,Ha=ne.touches[1].clientY-ze,au=Ve(hs,oa,zo,Ha),Bu=au/Pe,Il=150,Nc=Il*Il,Ml=1.5,ad=Ml*Ml;if(Bu>=ad||au>=Nc){a.touchData.cxt=!1,a.data.bgActivePosistion=void 0,a.redrawHint("select",!0);var Ic={originalEvent:ne,type:"cxttapend",position:{x:Fe[0],y:Fe[1]}};a.touchData.start?(a.touchData.start.unactivate().emit(Ic),a.touchData.start=null):Ye.emit(Ic)}}if(Ie&&a.touchData.cxt){var Ic={originalEvent:ne,type:"cxtdrag",position:{x:Fe[0],y:Fe[1]}};a.data.bgActivePosistion=void 0,a.redrawHint("select",!0),a.touchData.start?a.touchData.start.emit(Ic):Ye.emit(Ic),a.touchData.start&&(a.touchData.start._private.grabbed=!1),a.touchData.cxtDragged=!0;var ao=a.findNearestElement(Fe[0],Fe[1],!0,!0);(!a.touchData.cxtOver||ao!==a.touchData.cxtOver)&&(a.touchData.cxtOver&&a.touchData.cxtOver.emit({originalEvent:ne,type:"cxtdragout",position:{x:Fe[0],y:Fe[1]}}),a.touchData.cxtOver=ao,ao&&ao.emit({originalEvent:ne,type:"cxtdragover",position:{x:Fe[0],y:Fe[1]}}))}else if(Ie&&ne.touches[2]&&Ye.boxSelectionEnabled())ne.preventDefault(),a.data.bgActivePosistion=void 0,this.lastThreeTouch=+new Date,a.touchData.selecting||Ye.emit({originalEvent:ne,type:"boxstart",position:{x:Fe[0],y:Fe[1]}}),a.touchData.selecting=!0,a.touchData.didSelect=!0,Je[4]=1,!Je||Je.length===0||Je[0]===void 0?(Je[0]=(Fe[0]+Fe[2]+Fe[4])/3,Je[1]=(Fe[1]+Fe[3]+Fe[5])/3,Je[2]=(Fe[0]+Fe[2]+Fe[4])/3+1,Je[3]=(Fe[1]+Fe[3]+Fe[5])/3+1):(Je[2]=(Fe[0]+Fe[2]+Fe[4])/3,Je[3]=(Fe[1]+Fe[3]+Fe[5])/3),a.redrawHint("select",!0),a.redraw();else if(Ie&&ne.touches[1]&&!a.touchData.didSelect&&Ye.zoomingEnabled()&&Ye.panningEnabled()&&Ye.userZoomingEnabled()&&Ye.userPanningEnabled()){ne.preventDefault(),a.data.bgActivePosistion=void 0,a.redrawHint("select",!0);var Sa=a.dragData.touchDragEles;if(Sa){a.redrawHint("drag",!0);for(var oo=0;oo<Sa.length;oo++){var od=Sa[oo]._private;od.grabbed=!1,od.rscratch.inDragLayer=!1}}var Rs=a.touchData.start,hs=ne.touches[0].clientX-Oe,oa=ne.touches[0].clientY-ze,zo=ne.touches[1].clientX-Oe,Ha=ne.touches[1].clientY-ze,T1=me(hs,oa,zo,Ha),lm=T1/ke;if(Ge){var fm=hs-se,hm=oa-pe,dm=zo-he,vm=Ha-de,gm=(fm+dm)/2,bm=(hm+vm)/2,Gf=Ye.zoom(),Wv=Gf*lm,sd=Ye.pan(),L1=Te[0]*Gf+sd.x,P1=Te[1]*Gf+sd.y,pm={x:-Wv/Gf*(L1-sd.x-gm)+L1,y:-Wv/Gf*(P1-sd.y-bm)+P1};if(Rs&&Rs.active()){var Sa=a.dragData.touchDragEles;_(Sa),a.redrawHint("drag",!0),a.redrawHint("eles",!0),Rs.unactivate().emit("freeon"),Sa.emit("free"),a.dragData.didDrag&&(Rs.emit("dragfreeon"),Sa.emit("dragfree"))}Ye.viewport({zoom:Wv,pan:pm,cancelOnFailedZoom:!0}),Ye.emit("pinchzoom"),ke=T1,se=hs,pe=oa,he=zo,de=Ha,a.pinching=!0}if(ne.touches[0]){var Gt=a.projectIntoViewport(ne.touches[0].clientX,ne.touches[0].clientY);Fe[0]=Gt[0],Fe[1]=Gt[1]}if(ne.touches[1]){var Gt=a.projectIntoViewport(ne.touches[1].clientX,ne.touches[1].clientY);Fe[2]=Gt[0],Fe[3]=Gt[1]}if(ne.touches[2]){var Gt=a.projectIntoViewport(ne.touches[2].clientX,ne.touches[2].clientY);Fe[4]=Gt[0],Fe[5]=Gt[1]}}else if(ne.touches[0]&&!a.touchData.didSelect){var so=a.touchData.start,Uv=a.touchData.last,ao;if(!a.hoverData.draggingEles&&!a.swipePanning&&(ao=a.findNearestElement(Fe[0],Fe[1],!0,!0)),Ie&&so!=null&&ne.preventDefault(),Ie&&so!=null&&a.nodeIsDraggable(so))if(vr){var Sa=a.dragData.touchDragEles,D1=!a.dragData.didDrag;D1&&D(Sa,{inDragLayer:!0}),a.dragData.didDrag=!0;var ud={x:0,y:0};if(kt(Dn[0])&&kt(Dn[1])&&(ud.x+=Dn[0],ud.y+=Dn[1],D1)){a.redrawHint("eles",!0);var ds=a.touchData.dragDelta;ds&&kt(ds[0])&&kt(ds[1])&&(ud.x+=ds[0],ud.y+=ds[1])}a.hoverData.draggingEles=!0,Sa.silentShift(ud).emit("position drag"),a.redrawHint("drag",!0),a.touchData.startPosition[0]==bn[0]&&a.touchData.startPosition[1]==bn[1]&&a.redrawHint("eles",!0),a.redraw()}else{var ds=a.touchData.dragDelta=a.touchData.dragDelta||[];ds.length===0?(ds.push(Dn[0]),ds.push(Dn[1])):(ds[0]+=Dn[0],ds[1]+=Dn[1])}if(c(so||ao,["touchmove","tapdrag","vmousemove"],ne,{x:Fe[0],y:Fe[1]}),(!so||!so.grabbed())&&ao!=Uv&&(Uv&&Uv.emit({originalEvent:ne,type:"tapdragout",position:{x:Fe[0],y:Fe[1]}}),ao&&ao.emit({originalEvent:ne,type:"tapdragover",position:{x:Fe[0],y:Fe[1]}})),a.touchData.last=ao,Ie)for(var oo=0;oo<Fe.length;oo++)Fe[oo]&&a.touchData.startPosition[oo]&&vr&&(a.touchData.singleTouchMoved=!0);if(Ie&&(so==null||so.pannable())&&Ye.panningEnabled()&&Ye.userPanningEnabled()){var wm=g(so,a.touchData.starts);wm&&(ne.preventDefault(),a.data.bgActivePosistion||(a.data.bgActivePosistion=Lv(a.touchData.startPosition)),a.swipePanning?(Ye.panBy({x:Dn[0]*tt,y:Dn[1]*tt}),Ye.emit("dragpan")):vr&&(a.swipePanning=!0,Ye.panBy({x:wn*tt,y:ci*tt}),Ye.emit("dragpan"),so&&(so.unactivate(),a.redrawHint("select",!0),a.touchData.start=null)));var Gt=a.projectIntoViewport(ne.touches[0].clientX,ne.touches[0].clientY);Fe[0]=Gt[0],Fe[1]=Gt[1]}}for(var rr=0;rr<Fe.length;rr++)bn[rr]=Fe[rr];Ie&&ne.touches.length>0&&!a.hoverData.draggingEles&&!a.swipePanning&&a.data.bgActivePosistion!=null&&(a.data.bgActivePosistion=void 0,a.redrawHint("select",!0),a.redraw())}},!1);var ft;a.registerBinding(r,"touchcancel",ft=function(ne){var Ie=a.touchData.start;a.touchData.capture=!1,Ie&&Ie.unactivate()});var tn,gn,mt,ht;if(a.registerBinding(r,"touchend",tn=function(ne){var Ie=a.touchData.start,Je=a.touchData.capture;if(Je)ne.touches.length===0&&(a.touchData.capture=!1),ne.preventDefault();else return;var Ye=a.selection;a.swipePanning=!1,a.hoverData.draggingEles=!1;var Fe=a.cy,bn=Fe.zoom(),tt=a.touchData.now,Gt=a.touchData.earlier;if(ne.touches[0]){var tr=a.projectIntoViewport(ne.touches[0].clientX,ne.touches[0].clientY);tt[0]=tr[0],tt[1]=tr[1]}if(ne.touches[1]){var tr=a.projectIntoViewport(ne.touches[1].clientX,ne.touches[1].clientY);tt[2]=tr[0],tt[3]=tr[1]}if(ne.touches[2]){var tr=a.projectIntoViewport(ne.touches[2].clientX,ne.touches[2].clientY);tt[4]=tr[0],tt[5]=tr[1]}Ie&&Ie.unactivate();var vr;if(a.touchData.cxt){if(vr={originalEvent:ne,type:"cxttapend",position:{x:tt[0],y:tt[1]}},Ie?Ie.emit(vr):Fe.emit(vr),!a.touchData.cxtDragged){var Dn={originalEvent:ne,type:"cxttap",position:{x:tt[0],y:tt[1]}};Ie?Ie.emit(Dn):Fe.emit(Dn)}a.touchData.start&&(a.touchData.start._private.grabbed=!1),a.touchData.cxt=!1,a.touchData.start=null,a.redraw();return}if(!ne.touches[2]&&Fe.boxSelectionEnabled()&&a.touchData.selecting){a.touchData.selecting=!1;var rr=Fe.collection(a.getAllInBox(Ye[0],Ye[1],Ye[2],Ye[3]));Ye[0]=void 0,Ye[1]=void 0,Ye[2]=void 0,Ye[3]=void 0,Ye[4]=0,a.redrawHint("select",!0),Fe.emit({type:"boxend",originalEvent:ne,position:{x:tt[0],y:tt[1]}});var wn=function(Nc){return Nc.selectable()&&!Nc.selected()};rr.emit("box").stdFilter(wn).select().emit("boxselect"),rr.nonempty()&&a.redrawHint("eles",!0),a.redraw()}if(Ie!=null&&Ie.unactivate(),ne.touches[2])a.data.bgActivePosistion=void 0,a.redrawHint("select",!0);else if(!ne.touches[1]){if(!ne.touches[0]){if(!ne.touches[0]){a.data.bgActivePosistion=void 0,a.redrawHint("select",!0);var jn=a.dragData.touchDragEles;if(Ie!=null){var ci=Ie._private.grabbed;_(jn),a.redrawHint("drag",!0),a.redrawHint("eles",!0),ci&&(Ie.emit("freeon"),jn.emit("free"),a.dragData.didDrag&&(Ie.emit("dragfreeon"),jn.emit("dragfree"))),c(Ie,["touchend","tapend","vmouseup","tapdragout"],ne,{x:tt[0],y:tt[1]}),Ie.unactivate(),a.touchData.start=null}else{var aa=a.findNearestElement(tt[0],tt[1],!0,!0);c(aa,["touchend","tapend","vmouseup","tapdragout"],ne,{x:tt[0],y:tt[1]})}var fs=a.touchData.startPosition[0]-tt[0],hs=fs*fs,oa=a.touchData.startPosition[1]-tt[1],zo=oa*oa,Ha=hs+zo,au=Ha*bn*bn;a.touchData.singleTouchMoved||(Ie||Fe.$(":selected").unselect(["tapunselect"]),c(Ie,["tap","vclick"],ne,{x:tt[0],y:tt[1]}),gn=!1,ne.timeStamp-ht<=Fe.multiClickDebounceTime()?(mt&&clearTimeout(mt),gn=!0,ht=null,c(Ie,["dbltap","vdblclick"],ne,{x:tt[0],y:tt[1]})):(mt=setTimeout(function(){gn||c(Ie,["onetap","voneclick"],ne,{x:tt[0],y:tt[1]})},Fe.multiClickDebounceTime()),ht=ne.timeStamp)),Ie!=null&&!a.dragData.didDrag&&Ie._private.selectable&&au<a.touchTapThreshold2&&!a.pinching&&(Fe.selectionType()==="single"?(Fe.$(u).unmerge(Ie).unselect(["tapunselect"]),Ie.select(["tapselect"])):Ie.selected()?Ie.unselect(["tapunselect"]):Ie.select(["tapselect"]),a.redrawHint("eles",!0)),a.touchData.singleTouchMoved=!0}}}for(var Bu=0;Bu<tt.length;Bu++)Gt[Bu]=tt[Bu];a.dragData.didDrag=!1,ne.touches.length===0&&(a.touchData.dragDelta=[],a.touchData.startPosition=[null,null,null,null,null,null],a.touchData.startGPosition=null,a.touchData.didSelect=!1),ne.touches.length<2&&(ne.touches.length===1&&(a.touchData.startGPosition=[ne.touches[0].clientX,ne.touches[0].clientY]),a.pinching=!1,a.redrawHint("eles",!0),a.redraw())},!1),typeof TouchEvent>"u"){var Rt=[],Lt=function(ne){return{clientX:ne.clientX,clientY:ne.clientY,force:1,identifier:ne.pointerId,pageX:ne.pageX,pageY:ne.pageY,radiusX:ne.width/2,radiusY:ne.height/2,screenX:ne.screenX,screenY:ne.screenY,target:ne.target}},yt=function(ne){return{event:ne,touch:Lt(ne)}},Mt=function(ne){Rt.push(yt(ne))},In=function(ne){for(var Ie=0;Ie<Rt.length;Ie++){var Je=Rt[Ie];if(Je.event.pointerId===ne.pointerId){Rt.splice(Ie,1);return}}},Pn=function(ne){var Ie=Rt.filter(function(Je){return Je.event.pointerId===ne.pointerId})[0];Ie.event=ne,Ie.touch=Lt(ne)},Vt=function(ne){ne.touches=Rt.map(function(Ie){return Ie.touch})},sr=function(ne){return ne.pointerType==="mouse"||ne.pointerType===4};a.registerBinding(a.container,"pointerdown",function(Qe){sr(Qe)||(Qe.preventDefault(),Mt(Qe),Vt(Qe),Ke(Qe))}),a.registerBinding(a.container,"pointerup",function(Qe){sr(Qe)||(In(Qe),Vt(Qe),tn(Qe))}),a.registerBinding(a.container,"pointercancel",function(Qe){sr(Qe)||(In(Qe),Vt(Qe),ft(Qe))}),a.registerBinding(a.container,"pointermove",function(Qe){sr(Qe)||(Qe.preventDefault(),Pn(Qe),Vt(Qe),at(Qe))})}};var jl={};jl.generatePolygon=function(a,r){return this.nodeShapes[a]={renderer:this,name:a,points:r,draw:function(c,d,g,b,y){this.renderer.nodeShapeImpl("polygon",c,d,g,b,y,this.points)},intersectLine:function(c,d,g,b,y,k,E){return o1(y,k,this.points,c,d,g/2,b/2,E)},checkPoint:function(c,d,g,b,y,k,E){return Pl(c,d,this.points,k,E,b,y,[0,-1],g)}}},jl.generateEllipse=function(){return this.nodeShapes.ellipse={renderer:this,name:"ellipse",draw:function(r,u,c,d,g){this.renderer.nodeShapeImpl(this.name,r,u,c,d,g)},intersectLine:function(r,u,c,d,g,b,y){return yK(g,b,r,u,c/2+y,d/2+y)},checkPoint:function(r,u,c,d,g,b,y){return Zh(r,u,d,g,b,y,c)}}},jl.generateRoundPolygon=function(a,r){for(var u=new Array(r.length*2),c=0;c<r.length/2;c++){var d=c*2,g=void 0;c<r.length/2-1?g=(c+1)*2:g=0,u[c*4]=r[d],u[c*4+1]=r[d+1];var b=r[g]-r[d],y=r[g+1]-r[d+1],k=Math.sqrt(b*b+y*y);u[c*4+2]=b/k,u[c*4+3]=y/k}return this.nodeShapes[a]={renderer:this,name:a,points:u,draw:function(C,T,P,N,D){this.renderer.nodeShapeImpl("round-polygon",C,T,P,N,D,this.points)},intersectLine:function(C,T,P,N,D,H,_){return kK(D,H,this.points,C,T,P,N)},checkPoint:function(C,T,P,N,D,H,_){return mK(C,T,this.points,H,_,N,D)}}},jl.generateRoundRectangle=function(){return this.nodeShapes["round-rectangle"]=this.nodeShapes.roundrectangle={renderer:this,name:"round-rectangle",points:Bo(4,0),draw:function(r,u,c,d,g){this.renderer.nodeShapeImpl(this.name,r,u,c,d,g)},intersectLine:function(r,u,c,d,g,b,y){return VP(g,b,r,u,c,d,y)},checkPoint:function(r,u,c,d,g,b,y){var k=s1(d,g),E=k*2;return!!(Pl(r,u,this.points,b,y,d,g-E,[0,-1],c)||Pl(r,u,this.points,b,y,d-E,g,[0,-1],c)||Zh(r,u,E,E,b-d/2+k,y-g/2+k,c)||Zh(r,u,E,E,b+d/2-k,y-g/2+k,c)||Zh(r,u,E,E,b+d/2-k,y+g/2-k,c)||Zh(r,u,E,E,b-d/2+k,y+g/2-k,c))}}},jl.generateCutRectangle=function(){return this.nodeShapes["cut-rectangle"]=this.nodeShapes.cutrectangle={renderer:this,name:"cut-rectangle",cornerLength:ZP(),points:Bo(4,0),draw:function(r,u,c,d,g){this.renderer.nodeShapeImpl(this.name,r,u,c,d,g)},generateCutTrianglePts:function(r,u,c,d){var g=this.cornerLength,b=u/2,y=r/2,k=c-y,E=c+y,C=d-b,T=d+b;return{topLeft:[k,C+g,k+g,C,k+g,C+g],topRight:[E-g,C,E,C+g,E-g,C+g],bottomRight:[E,T-g,E-g,T,E-g,T-g],bottomLeft:[k+g,T,k,T-g,k+g,T-g]}},intersectLine:function(r,u,c,d,g,b,y){var k=this.generateCutTrianglePts(c+2*y,d+2*y,r,u),E=[].concat.apply([],[k.topLeft.splice(0,4),k.topRight.splice(0,4),k.bottomRight.splice(0,4),k.bottomLeft.splice(0,4)]);return o1(g,b,E,r,u)},checkPoint:function(r,u,c,d,g,b,y){if(Pl(r,u,this.points,b,y,d,g-2*this.cornerLength,[0,-1],c)||Pl(r,u,this.points,b,y,d-2*this.cornerLength,g,[0,-1],c))return!0;var k=this.generateCutTrianglePts(d,g,b,y);return ls(r,u,k.topLeft)||ls(r,u,k.topRight)||ls(r,u,k.bottomRight)||ls(r,u,k.bottomLeft)}}},jl.generateBarrel=function(){return this.nodeShapes.barrel={renderer:this,name:"barrel",points:Bo(4,0),draw:function(r,u,c,d,g){this.renderer.nodeShapeImpl(this.name,r,u,c,d,g)},intersectLine:function(r,u,c,d,g,b,y){var k=.15,E=.5,C=.85,T=this.generateBarrelBezierPts(c+2*y,d+2*y,r,u),P=function(H){var _=Pv({x:H[0],y:H[1]},{x:H[2],y:H[3]},{x:H[4],y:H[5]},k),B=Pv({x:H[0],y:H[1]},{x:H[2],y:H[3]},{x:H[4],y:H[5]},E),$=Pv({x:H[0],y:H[1]},{x:H[2],y:H[3]},{x:H[4],y:H[5]},C);return[H[0],H[1],_.x,_.y,B.x,B.y,$.x,$.y,H[4],H[5]]},N=[].concat(P(T.topLeft),P(T.topRight),P(T.bottomRight),P(T.bottomLeft));return o1(g,b,N,r,u)},generateBarrelBezierPts:function(r,u,c,d){var g=u/2,b=r/2,y=c-b,k=c+b,E=d-g,C=d+g,T=V5(r,u),P=T.heightOffset,N=T.widthOffset,D=T.ctrlPtOffsetPct*r,H={topLeft:[y,E+P,y+D,E,y+N,E],topRight:[k-N,E,k-D,E,k,E+P],bottomRight:[k,C-P,k-D,C,k-N,C],bottomLeft:[y+N,C,y+D,C,y,C-P]};return H.topLeft.isTop=!0,H.topRight.isTop=!0,H.bottomLeft.isBottom=!0,H.bottomRight.isBottom=!0,H},checkPoint:function(r,u,c,d,g,b,y){var k=V5(d,g),E=k.heightOffset,C=k.widthOffset;if(Pl(r,u,this.points,b,y,d,g-2*E,[0,-1],c)||Pl(r,u,this.points,b,y,d-2*C,g,[0,-1],c))return!0;for(var T=this.generateBarrelBezierPts(d,g,b,y),P=function(K,ee,Z){var ae=Z[4],oe=Z[2],J=Z[0],fe=Z[5],se=Z[1],pe=Math.min(ae,J),he=Math.max(ae,J),de=Math.min(fe,se),ke=Math.max(fe,se);if(pe<=K&&K<=he&&de<=ee&&ee<=ke){var Pe=EK(ae,oe,J),Ae=gK(Pe[0],Pe[1],Pe[2],K),Te=Ae.filter(function(Oe){return 0<=Oe&&Oe<=1});if(Te.length>0)return Te[0]}return null},N=Object.keys(T),D=0;D<N.length;D++){var H=N[D],_=T[H],B=P(r,u,_);if(B!=null){var $=_[5],F=_[3],W=_[1],Q=za($,F,W,B);if(_.isTop&&Q<=u||_.isBottom&&u<=Q)return!0}}return!1}}},jl.generateBottomRoundrectangle=function(){return this.nodeShapes["bottom-round-rectangle"]=this.nodeShapes.bottomroundrectangle={renderer:this,name:"bottom-round-rectangle",points:Bo(4,0),draw:function(r,u,c,d,g){this.renderer.nodeShapeImpl(this.name,r,u,c,d,g)},intersectLine:function(r,u,c,d,g,b,y){var k=r-(c/2+y),E=u-(d/2+y),C=E,T=r+(c/2+y),P=Nf(g,b,r,u,k,E,T,C,!1);return P.length>0?P:VP(g,b,r,u,c,d,y)},checkPoint:function(r,u,c,d,g,b,y){var k=s1(d,g),E=2*k;if(Pl(r,u,this.points,b,y,d,g-E,[0,-1],c)||Pl(r,u,this.points,b,y,d-E,g,[0,-1],c))return!0;var C=d/2+2*c,T=g/2+2*c,P=[b-C,y-T,b-C,y,b+C,y,b+C,y-T];return!!(ls(r,u,P)||Zh(r,u,E,E,b+d/2-k,y+g/2-k,c)||Zh(r,u,E,E,b-d/2+k,y+g/2-k,c))}}},jl.registerNodeShapes=function(){var a=this.nodeShapes={},r=this;this.generateEllipse(),this.generatePolygon("triangle",Bo(3,0)),this.generateRoundPolygon("round-triangle",Bo(3,0)),this.generatePolygon("rectangle",Bo(4,0)),a.square=a.rectangle,this.generateRoundRectangle(),this.generateCutRectangle(),this.generateBarrel(),this.generateBottomRoundrectangle();{var u=[0,1,1,0,0,-1,-1,0];this.generatePolygon("diamond",u),this.generateRoundPolygon("round-diamond",u)}this.generatePolygon("pentagon",Bo(5,0)),this.generateRoundPolygon("round-pentagon",Bo(5,0)),this.generatePolygon("hexagon",Bo(6,0)),this.generateRoundPolygon("round-hexagon",Bo(6,0)),this.generatePolygon("heptagon",Bo(7,0)),this.generateRoundPolygon("round-heptagon",Bo(7,0)),this.generatePolygon("octagon",Bo(8,0)),this.generateRoundPolygon("round-octagon",Bo(8,0));var c=new Array(20);{var d=F5(5,0),g=F5(5,Math.PI/5),b=.5*(3-Math.sqrt(5));b*=1.57;for(var y=0;y<g.length/2;y++)g[y*2]*=b,g[y*2+1]*=b;for(var y=0;y<20/4;y++)c[y*4]=d[y*2],c[y*4+1]=d[y*2+1],c[y*4+2]=g[y*2],c[y*4+3]=g[y*2+1]}c=KP(c),this.generatePolygon("star",c),this.generatePolygon("vee",[-1,-1,0,-.333,1,-1,0,1]),this.generatePolygon("rhomboid",[-1,-1,.333,-1,1,1,-.333,1]),this.generatePolygon("right-rhomboid",[-.333,-1,1,-1,.333,1,-1,1]),this.nodeShapes.concavehexagon=this.generatePolygon("concave-hexagon",[-1,-.95,-.75,0,-1,.95,1,.95,.75,0,1,-.95]);{var k=[-1,-1,.25,-1,1,0,.25,1,-1,1];this.generatePolygon("tag",k),this.generateRoundPolygon("round-tag",k)}a.makePolygon=function(E){var C=E.join("$"),T="polygon-"+C,P;return(P=this[T])?P:r.generatePolygon(T,E)}};var k1={};k1.timeToRender=function(){return this.redrawTotalTime/this.redrawCount},k1.redraw=function(a){a=a||_P();var r=this;r.averageRedrawTime===void 0&&(r.averageRedrawTime=0),r.lastRedrawTime===void 0&&(r.lastRedrawTime=0),r.lastDrawTime===void 0&&(r.lastDrawTime=0),r.requestedFrame=!0,r.renderOptions=a},k1.beforeRender=function(a,r){if(!this.destroyed){r==null&&Hi("Priority is not optional for beforeRender");var u=this.beforeRenderCallbacks;u.push({fn:a,priority:r}),u.sort(function(c,d){return d.priority-c.priority})}};var SD=function(r,u,c){for(var d=r.beforeRenderCallbacks,g=0;g<d.length;g++)d[g].fn(u,c)};k1.startRenderLoop=function(){var a=this,r=a.cy;if(!a.renderLoopStarted){a.renderLoopStarted=!0;var u=function c(d){if(!a.destroyed){if(!r.batching())if(a.requestedFrame&&!a.skipFrame){SD(a,!0,d);var g=Ll();a.render(a.renderOptions);var b=a.lastDrawTime=Ll();a.averageRedrawTime===void 0&&(a.averageRedrawTime=b-g),a.redrawCount===void 0&&(a.redrawCount=0),a.redrawCount++,a.redrawTotalTime===void 0&&(a.redrawTotalTime=0);var y=b-g;a.redrawTotalTime+=y,a.lastRedrawTime=y,a.averageRedrawTime=a.averageRedrawTime/2+y/2,a.requestedFrame=!1}else SD(a,!1,d);a.skipFrame=!1,xw(c)}};xw(u)}};var WX=function(r){this.init(r)},CD=WX,Yv=CD.prototype;Yv.clientFunctions=["redrawHint","render","renderTo","matchCanvasSize","nodeShapeImpl","arrowShapeImpl"],Yv.init=function(a){var r=this;r.options=a,r.cy=a.cy;var u=r.container=a.cy.container(),c=r.cy.window();if(c){var d=c.document,g=d.head,b="__________cytoscape_stylesheet",y="__________cytoscape_container",k=d.getElementById(b)!=null;if(u.className.indexOf(y)<0&&(u.className=(u.className||"")+" "+y),!k){var E=d.createElement("style");E.id=b,E.textContent="."+y+" { position: relative; }",g.insertBefore(E,g.children[0])}var C=c.getComputedStyle(u),T=C.getPropertyValue("position");T==="static"&&pr("A Cytoscape container has style position:static and so can not use UI extensions properly")}r.selection=[void 0,void 0,void 0,void 0,0],r.bezierProjPcts=[.05,.225,.4,.5,.6,.775,.95],r.hoverData={down:null,last:null,downTime:null,triggerMode:null,dragging:!1,initialPan:[null,null],capture:!1},r.dragData={possibleDragElements:[]},r.touchData={start:null,capture:!1,startPosition:[null,null,null,null,null,null],singleTouchStartTime:null,singleTouchMoved:!0,now:[null,null,null,null,null,null],earlier:[null,null,null,null,null,null]},r.redraws=0,r.showFps=a.showFps,r.debug=a.debug,r.hideEdgesOnViewport=a.hideEdgesOnViewport,r.textureOnViewport=a.textureOnViewport,r.wheelSensitivity=a.wheelSensitivity,r.motionBlurEnabled=a.motionBlur,r.forcedPixelRatio=kt(a.pixelRatio)?a.pixelRatio:null,r.motionBlur=a.motionBlur,r.motionBlurOpacity=a.motionBlurOpacity,r.motionBlurTransparency=1-r.motionBlurOpacity,r.motionBlurPxRatio=1,r.mbPxRBlurry=1,r.minMbLowQualFrames=4,r.fullQualityMb=!1,r.clearedForMotionBlur=[],r.desktopTapThreshold=a.desktopTapThreshold,r.desktopTapThreshold2=a.desktopTapThreshold*a.desktopTapThreshold,r.touchTapThreshold=a.touchTapThreshold,r.touchTapThreshold2=a.touchTapThreshold*a.touchTapThreshold,r.tapholdDuration=500,r.bindings=[],r.beforeRenderCallbacks=[],r.beforeRenderPriorities={animations:400,eleCalcs:300,eleTxrDeq:200,lyrTxrDeq:150,lyrTxrSkip:100},r.registerNodeShapes(),r.registerArrowShapes(),r.registerCalculationListeners()},Yv.notify=function(a,r){var u=this,c=u.cy;if(!this.destroyed){if(a==="init"){u.load();return}if(a==="destroy"){u.destroy();return}(a==="add"||a==="remove"||a==="move"&&c.hasCompoundNodes()||a==="load"||a==="zorder"||a==="mount")&&u.invalidateCachedZSortedEles(),a==="viewport"&&u.redrawHint("select",!0),(a==="load"||a==="resize"||a==="mount")&&(u.invalidateContainerClientCoordsCache(),u.matchCanvasSize(u.container)),u.redrawHint("eles",!0),u.redrawHint("drag",!0),this.startRenderLoop(),this.redraw()}},Yv.destroy=function(){var a=this;a.destroyed=!0,a.cy.stopAnimationLoop();for(var r=0;r<a.bindings.length;r++){var u=a.bindings[r],c=u,d=c.target;(d.off||d.removeEventListener).apply(d,c.args)}if(a.bindings=[],a.beforeRenderCallbacks=[],a.onUpdateEleCalcsFns=[],a.removeObserver&&a.removeObserver.disconnect(),a.styleObserver&&a.styleObserver.disconnect(),a.resizeObserver&&a.resizeObserver.disconnect(),a.labelCalcDiv)try{document.body.removeChild(a.labelCalcDiv)}catch{}},Yv.isHeadless=function(){return!1},[fS,kD,ED,$v,jl,k1].forEach(function(a){en(Yv,a)});var dS=1e3/60,xD={setupDequeueing:function(r){return function(){var c=this,d=this.renderer;if(!c.dequeueingSetup){c.dequeueingSetup=!0;var g=Ew.default(function(){d.redrawHint("eles",!0),d.redrawHint("drag",!0),d.redraw()},r.deqRedrawThreshold),b=function(E,C){var T=Ll(),P=d.averageRedrawTime,N=d.lastRedrawTime,D=[],H=d.cy.extent(),_=d.getPixelRatio();for(E||d.flushRenderedStyleQueue();;){var B=Ll(),$=B-T,F=B-C;if(N<dS){var W=dS-(E?P:0);if(F>=r.deqFastCost*W)break}else if(E){if($>=r.deqCost*N||$>=r.deqAvgCost*P)break}else if(F>=r.deqNoDrawCost*dS)break;var Q=r.deq(c,_,H);if(Q.length>0)for(var X=0;X<Q.length;X++)D.push(Q[X]);else break}D.length>0&&(r.onDeqd(c,D),!E&&r.shouldRedraw(c,D,_,H)&&g())},y=r.priority||B5;d.beforeRender(b,y(c))}}}},UX=function(){function a(r){var u=arguments.length>1&&arguments[1]!==void 0?arguments[1]:Lw;N5(this,a),this.idsByKey=new Lc,this.keyForId=new Lc,this.cachesByLvl=new Lc,this.lvls=[],this.getKey=r,this.doesEleInvalidateKey=u}return I5(a,[{key:"getIdsFor",value:function(u){u==null&&Hi("Can not get id list for null key");var c=this.idsByKey,d=this.idsByKey.get(u);return d||(d=new Tv,c.set(u,d)),d}},{key:"addIdForKey",value:function(u,c){u!=null&&this.getIdsFor(u).add(c)}},{key:"deleteIdForKey",value:function(u,c){u!=null&&this.getIdsFor(u).delete(c)}},{key:"getNumberOfIdsForKey",value:function(u){return u==null?0:this.getIdsFor(u).size}},{key:"updateKeyMappingFor",value:function(u){var c=u.id(),d=this.keyForId.get(c),g=this.getKey(u);this.deleteIdForKey(d,c),this.addIdForKey(g,c),this.keyForId.set(c,g)}},{key:"deleteKeyMappingFor",value:function(u){var c=u.id(),d=this.keyForId.get(c);this.deleteIdForKey(d,c),this.keyForId.delete(c)}},{key:"keyHasChangedFor",value:function(u){var c=u.id(),d=this.keyForId.get(c),g=this.getKey(u);return d!==g}},{key:"isInvalid",value:function(u){return this.keyHasChangedFor(u)||this.doesEleInvalidateKey(u)}},{key:"getCachesAt",value:function(u){var c=this.cachesByLvl,d=this.lvls,g=c.get(u);return g||(g=new Lc,c.set(u,g),d.push(u)),g}},{key:"getCache",value:function(u,c){return this.getCachesAt(c).get(u)}},{key:"get",value:function(u,c){var d=this.getKey(u),g=this.getCache(d,c);return g!=null&&this.updateKeyMappingFor(u),g}},{key:"getForCachedKey",value:function(u,c){var d=this.keyForId.get(u.id()),g=this.getCache(d,c);return g}},{key:"hasCache",value:function(u,c){return this.getCachesAt(c).has(u)}},{key:"has",value:function(u,c){var d=this.getKey(u);return this.hasCache(d,c)}},{key:"setCache",value:function(u,c,d){d.key=u,this.getCachesAt(c).set(u,d)}},{key:"set",value:function(u,c,d){var g=this.getKey(u);this.setCache(g,c,d),this.updateKeyMappingFor(u)}},{key:"deleteCache",value:function(u,c){this.getCachesAt(c).delete(u)}},{key:"delete",value:function(u,c){var d=this.getKey(u);this.deleteCache(d,c)}},{key:"invalidateKey",value:function(u){var c=this;this.lvls.forEach(function(d){return c.deleteCache(u,d)})}},{key:"invalidate",value:function(u){var c=u.id(),d=this.keyForId.get(c);this.deleteKeyMappingFor(u);var g=this.doesEleInvalidateKey(u);return g&&this.invalidateKey(d),g||this.getNumberOfIdsForKey(d)===0}}]),a}(),TD=25,om=50,sm=-4,vS=3,KX=7.99,ZX=8,XX=1024,QX=1024,JX=1024,eQ=.2,tQ=.8,nQ=10,rQ=.15,iQ=.1,aQ=.9,oQ=.9,sQ=100,uQ=1,Fv={dequeue:"dequeue",downscale:"downscale",highQuality:"highQuality"},cQ=eo({getKey:null,doesEleInvalidateKey:Lw,drawElement:null,getBoundingBox:null,getRotationPoint:null,getRotationOffset:null,isVisible:RP,allowEdgeTxrCaching:!0,allowParentTxrCaching:!0}),E1=function(r,u){var c=this;c.renderer=r,c.onDequeues=[];var d=cQ(u);en(c,d),c.lookup=new UX(d.getKey,d.doesEleInvalidateKey),c.setupDequeueing()},Ea=E1.prototype;Ea.reasons=Fv,Ea.getTextureQueue=function(a){var r=this;return r.eleImgCaches=r.eleImgCaches||{},r.eleImgCaches[a]=r.eleImgCaches[a]||[]},Ea.getRetiredTextureQueue=function(a){var r=this,u=r.eleImgCaches.retired=r.eleImgCaches.retired||{},c=u[a]=u[a]||[];return c},Ea.getElementQueue=function(){var a=this,r=a.eleCacheQueue=a.eleCacheQueue||new Zb.default(function(u,c){return c.reqs-u.reqs});return r},Ea.getElementKeyToQueue=function(){var a=this,r=a.eleKeyToCacheQueue=a.eleKeyToCacheQueue||{};return r},Ea.getElement=function(a,r,u,c,d){var g=this,b=this.renderer,y=b.cy.zoom(),k=this.lookup;if(!r||r.w===0||r.h===0||isNaN(r.w)||isNaN(r.h)||!a.visible()||a.removed()||!g.allowEdgeTxrCaching&&a.isEdge()||!g.allowParentTxrCaching&&a.isParent())return null;if(c==null&&(c=Math.ceil(_5(y*u))),c<sm)c=sm;else if(y>=KX||c>vS)return null;var E=Math.pow(2,c),C=r.h*E,T=r.w*E,P=b.eleTextBiggerThanMin(a,E);if(!this.isVisible(a,P))return null;var N=k.get(a,c);if(N&&N.invalidated&&(N.invalidated=!1,N.texture.invalidatedWidth-=N.width),N)return N;var D;if(C<=TD?D=TD:C<=om?D=om:D=Math.ceil(C/om)*om,C>JX||T>QX)return null;var H=g.getTextureQueue(D),_=H[H.length-2],B=function(){return g.recycleTexture(D,T)||g.addTexture(D,T)};_||(_=H[H.length-1]),_||(_=B()),_.width-_.usedWidth<T&&(_=B());for(var $=function(he){return he&&he.scaledLabelShown===P},F=d&&d===Fv.dequeue,W=d&&d===Fv.highQuality,Q=d&&d===Fv.downscale,X,K=c+1;K<=vS;K++){var ee=k.get(a,K);if(ee){X=ee;break}}var Z=X&&X.level===c+1?X:null,ae=function(){_.context.drawImage(Z.texture.canvas,Z.x,0,Z.width,Z.height,_.usedWidth,0,T,C)};if(_.context.setTransform(1,0,0,1,0,0),_.context.clearRect(_.usedWidth,0,T,D),$(Z))ae();else if($(X))if(W){for(var oe=X.level;oe>c;oe--)Z=g.getElement(a,r,u,oe,Fv.downscale);ae()}else return g.queueElement(a,X.level-1),X;else{var J;if(!F&&!W&&!Q)for(var fe=c-1;fe>=sm;fe--){var se=k.get(a,fe);if(se){J=se;break}}if($(J))return g.queueElement(a,c),J;_.context.translate(_.usedWidth,0),_.context.scale(E,E),this.drawElement(_.context,a,r,P,!1),_.context.scale(1/E,1/E),_.context.translate(-_.usedWidth,0)}return N={x:_.usedWidth,texture:_,level:c,scale:E,width:T,height:C,scaledLabelShown:P},_.usedWidth+=Math.ceil(T+ZX),_.eleCaches.push(N),k.set(a,c,N),g.checkTextureFullness(_),N},Ea.invalidateElements=function(a){for(var r=0;r<a.length;r++)this.invalidateElement(a[r])},Ea.invalidateElement=function(a){var r=this,u=r.lookup,c=[],d=u.isInvalid(a);if(d){for(var g=sm;g<=vS;g++){var b=u.getForCachedKey(a,g);b&&c.push(b)}var y=u.invalidate(a);if(y)for(var k=0;k<c.length;k++){var E=c[k],C=E.texture;C.invalidatedWidth+=E.width,E.invalidated=!0,r.checkTextureUtility(C)}r.removeFromQueue(a)}},Ea.checkTextureUtility=function(a){a.invalidatedWidth>=eQ*a.width&&this.retireTexture(a)},Ea.checkTextureFullness=function(a){var r=this,u=r.getTextureQueue(a.height);a.usedWidth/a.width>tQ&&a.fullnessChecks>=nQ?Df(u,a):a.fullnessChecks++},Ea.retireTexture=function(a){var r=this,u=a.height,c=r.getTextureQueue(u),d=this.lookup;Df(c,a),a.retired=!0;for(var g=a.eleCaches,b=0;b<g.length;b++){var y=g[b];d.deleteCache(y.key,y.level)}z5(g);var k=r.getRetiredTextureQueue(u);k.push(a)},Ea.addTexture=function(a,r){var u=this,c=u.getTextureQueue(a),d={};return c.push(d),d.eleCaches=[],d.height=a,d.width=Math.max(XX,r),d.usedWidth=0,d.invalidatedWidth=0,d.fullnessChecks=0,d.canvas=u.renderer.makeOffscreenCanvas(d.width,d.height),d.context=d.canvas.getContext("2d"),d},Ea.recycleTexture=function(a,r){for(var u=this,c=u.getTextureQueue(a),d=u.getRetiredTextureQueue(a),g=0;g<d.length;g++){var b=d[g];if(b.width>=r)return b.retired=!1,b.usedWidth=0,b.invalidatedWidth=0,b.fullnessChecks=0,z5(b.eleCaches),b.context.setTransform(1,0,0,1,0,0),b.context.clearRect(0,0,b.width,b.height),Df(d,b),c.push(b),b}},Ea.queueElement=function(a,r){var u=this,c=u.getElementQueue(),d=u.getElementKeyToQueue(),g=this.getKey(a),b=d[g];if(b)b.level=Math.max(b.level,r),b.eles.merge(a),b.reqs++,c.updateItem(b);else{var y={eles:a.spawn().merge(a),level:r,reqs:1,key:g};c.push(y),d[g]=y}},Ea.dequeue=function(a){for(var r=this,u=r.getElementQueue(),c=r.getElementKeyToQueue(),d=[],g=r.lookup,b=0;b<uQ&&u.size()>0;b++){var y=u.pop(),k=y.key,E=y.eles[0],C=g.hasCache(E,y.level);if(c[k]=null,C)continue;d.push(y);var T=r.getBoundingBox(E);r.getElement(E,T,a,y.level,Fv.dequeue)}return d},Ea.removeFromQueue=function(a){var r=this,u=r.getElementQueue(),c=r.getElementKeyToQueue(),d=this.getKey(a),g=c[d];g!=null&&(g.eles.length===1?(g.reqs=R5,u.updateItem(g),u.pop(),c[d]=null):g.eles.unmerge(a))},Ea.onDequeue=function(a){this.onDequeues.push(a)},Ea.offDequeue=function(a){Df(this.onDequeues,a)},Ea.setupDequeueing=xD.setupDequeueing({deqRedrawThreshold:sQ,deqCost:rQ,deqAvgCost:iQ,deqNoDrawCost:aQ,deqFastCost:oQ,deq:function(r,u,c){return r.dequeue(u,c)},onDeqd:function(r,u){for(var c=0;c<r.onDequeues.length;c++){var d=r.onDequeues[c];d(u)}},shouldRedraw:function(r,u,c,d){for(var g=0;g<u.length;g++)for(var b=u[g].eles,y=0;y<b.length;y++){var k=b[y].boundingBox();if($5(k,d))return!0}return!1},priority:function(r){return r.renderer.beforeRenderPriorities.eleTxrDeq}});var lQ=1,S1=-4,um=2,fQ=3.99,hQ=50,dQ=50,vQ=.15,gQ=.1,bQ=.9,pQ=.9,wQ=1,LD=250,mQ=4e3*4e3,yQ=!0,PD=function(r){var u=this,c=u.renderer=r,d=c.cy;u.layersByLevel={},u.firstGet=!0,u.lastInvalidationTime=Ll()-2*LD,u.skipping=!1,u.eleTxrDeqs=d.collection(),u.scheduleElementRefinement=Ew.default(function(){u.refineElementTextures(u.eleTxrDeqs),u.eleTxrDeqs.unmerge(u.eleTxrDeqs)},dQ),c.beforeRender(function(b,y){y-u.lastInvalidationTime<=LD?u.skipping=!0:u.skipping=!1},c.beforeRenderPriorities.lyrTxrSkip);var g=function(y,k){return k.reqs-y.reqs};u.layersQueue=new Zb.default(g),u.setupDequeueing()},io=PD.prototype,DD=0,kQ=Math.pow(2,53)-1;io.makeLayer=function(a,r){var u=Math.pow(2,r),c=Math.ceil(a.w*u),d=Math.ceil(a.h*u),g=this.renderer.makeOffscreenCanvas(c,d),b={id:DD=++DD%kQ,bb:a,level:r,width:c,height:d,canvas:g,context:g.getContext("2d"),eles:[],elesQueue:[],reqs:0},y=b.context,k=-b.bb.x1,E=-b.bb.y1;return y.scale(u,u),y.translate(k,E),b},io.getLayers=function(a,r,u){var c=this,d=c.renderer,g=d.cy,b=g.zoom(),y=c.firstGet;if(c.firstGet=!1,u==null){if(u=Math.ceil(_5(b*r)),u<S1)u=S1;else if(b>=fQ||u>um)return null}c.validateLayersElesOrdering(u,a);var k=c.layersByLevel,E=Math.pow(2,u),C=k[u]=k[u]||[],T,P=c.levelIsComplete(u,a),N,D=function(){var ae=function(pe){if(c.validateLayersElesOrdering(pe,a),c.levelIsComplete(pe,a))return N=k[pe],!0},oe=function(pe){if(!N)for(var he=u+pe;S1<=he&&he<=um&&!ae(he);he+=pe);};oe(1),oe(-1);for(var J=C.length-1;J>=0;J--){var fe=C[J];fe.invalid&&Df(C,fe)}};if(!P)D();else return C;var H=function(){if(!T){T=cs();for(var ae=0;ae<a.length;ae++)lK(T,a[ae].boundingBox())}return T},_=function(ae){ae=ae||{};var oe=ae.after;H();var J=T.w*E*(T.h*E);if(J>mQ)return null;var fe=c.makeLayer(T,u);if(oe!=null){var se=C.indexOf(oe)+1;C.splice(se,0,fe)}else(ae.insert===void 0||ae.insert)&&C.unshift(fe);return fe};if(c.skipping&&!y)return null;for(var B=null,$=a.length/lQ,F=!y,W=0;W<a.length;W++){var Q=a[W],X=Q._private.rscratch,K=X.imgLayerCaches=X.imgLayerCaches||{},ee=K[u];if(ee){B=ee;continue}if((!B||B.eles.length>=$||!qP(B.bb,Q.boundingBox()))&&(B=_({insert:!0,after:B}),!B))return null;N||F?c.queueLayer(B,Q):c.drawEleInLayer(B,Q,u,r),B.eles.push(Q),K[u]=B}return N||(F?null:C)},io.getEleLevelForLayerLevel=function(a,r){return a},io.drawEleInLayer=function(a,r,u,c){var d=this,g=this.renderer,b=a.context,y=r.boundingBox();y.w===0||y.h===0||!r.visible()||(u=d.getEleLevelForLayerLevel(u,c),g.setImgSmoothing(b,!1),g.drawCachedElement(b,r,null,null,u,yQ),g.setImgSmoothing(b,!0))},io.levelIsComplete=function(a,r){var u=this,c=u.layersByLevel[a];if(!c||c.length===0)return!1;for(var d=0,g=0;g<c.length;g++){var b=c[g];if(b.reqs>0||b.invalid)return!1;d+=b.eles.length}return d===r.length},io.validateLayersElesOrdering=function(a,r){var u=this.layersByLevel[a];if(u)for(var c=0;c<u.length;c++){for(var d=u[c],g=-1,b=0;b<r.length;b++)if(d.eles[0]===r[b]){g=b;break}if(g<0){this.invalidateLayer(d);continue}for(var y=g,b=0;b<d.eles.length;b++)if(d.eles[b]!==r[y+b]){this.invalidateLayer(d);break}}},io.updateElementsInLayers=function(a,r){for(var u=this,c=Qb(a[0]),d=0;d<a.length;d++)for(var g=c?null:a[d],b=c?a[d]:a[d].ele,y=b._private.rscratch,k=y.imgLayerCaches=y.imgLayerCaches||{},E=S1;E<=um;E++){var C=k[E];C&&(g&&u.getEleLevelForLayerLevel(C.level)!==g.level||r(C,b,g))}},io.haveLayers=function(){for(var a=this,r=!1,u=S1;u<=um;u++){var c=a.layersByLevel[u];if(c&&c.length>0){r=!0;break}}return r},io.invalidateElements=function(a){var r=this;a.length!==0&&(r.lastInvalidationTime=Ll(),!(a.length===0||!r.haveLayers())&&r.updateElementsInLayers(a,function(c,d,g){r.invalidateLayer(c)}))},io.invalidateLayer=function(a){if(this.lastInvalidationTime=Ll(),!a.invalid){var r=a.level,u=a.eles,c=this.layersByLevel[r];Df(c,a),a.elesQueue=[],a.invalid=!0,a.replacement&&(a.replacement.invalid=!0);for(var d=0;d<u.length;d++){var g=u[d]._private.rscratch.imgLayerCaches;g&&(g[r]=null)}}},io.refineElementTextures=function(a){var r=this;r.updateElementsInLayers(a,function(c,d,g){var b=c.replacement;if(b||(b=c.replacement=r.makeLayer(c.bb,c.level),b.replaces=c,b.eles=c.eles),!b.reqs)for(var y=0;y<b.eles.length;y++)r.queueLayer(b,b.eles[y])})},io.enqueueElementRefinement=function(a){this.eleTxrDeqs.merge(a),this.scheduleElementRefinement()},io.queueLayer=function(a,r){var u=this,c=u.layersQueue,d=a.elesQueue,g=d.hasId=d.hasId||{};if(!a.replacement){if(r){if(g[r.id()])return;d.push(r),g[r.id()]=!0}a.reqs?(a.reqs++,c.updateItem(a)):(a.reqs=1,c.push(a))}},io.dequeue=function(a){for(var r=this,u=r.layersQueue,c=[],d=0;d<wQ&&u.size()!==0;){var g=u.peek();if(g.replacement){u.pop();continue}if(g.replaces&&g!==g.replaces.replacement){u.pop();continue}if(g.invalid){u.pop();continue}var b=g.elesQueue.shift();b&&(r.drawEleInLayer(g,b,g.level,a),d++),c.length===0&&c.push(!0),g.elesQueue.length===0&&(u.pop(),g.reqs=0,g.replaces&&r.applyLayerReplacement(g),r.requestRedraw())}return c},io.applyLayerReplacement=function(a){var r=this,u=r.layersByLevel[a.level],c=a.replaces,d=u.indexOf(c);if(!(d<0||c.invalid)){u[d]=a;for(var g=0;g<a.eles.length;g++){var b=a.eles[g]._private,y=b.imgLayerCaches=b.imgLayerCaches||{};y&&(y[a.level]=a)}r.requestRedraw()}},io.requestRedraw=Ew.default(function(){var a=this.renderer;a.redrawHint("eles",!0),a.redrawHint("drag",!0),a.redraw()},100),io.setupDequeueing=xD.setupDequeueing({deqRedrawThreshold:hQ,deqCost:vQ,deqAvgCost:gQ,deqNoDrawCost:bQ,deqFastCost:pQ,deq:function(r,u){return r.dequeue(u)},onDeqd:B5,shouldRedraw:RP,priority:function(r){return r.renderer.beforeRenderPriorities.lyrTxrDeq}});var jD={},ND;function EQ(a,r){for(var u=0;u<r.length;u++){var c=r[u];a.lineTo(c.x,c.y)}}function SQ(a,r,u){for(var c,d=0;d<r.length;d++){var g=r[d];d===0&&(c=g),a.lineTo(g.x,g.y)}a.quadraticCurveTo(u.x,u.y,c.x,c.y)}function ID(a,r,u){a.beginPath&&a.beginPath();for(var c=r,d=0;d<c.length;d++){var g=c[d];a.lineTo(g.x,g.y)}var b=u,y=u[0];a.moveTo(y.x,y.y);for(var d=1;d<b.length;d++){var g=b[d];a.lineTo(g.x,g.y)}a.closePath&&a.closePath()}function CQ(a,r,u,c,d){a.beginPath&&a.beginPath(),a.arc(u,c,d,0,Math.PI*2,!1);var g=r,b=g[0];a.moveTo(b.x,b.y);for(var y=0;y<g.length;y++){var k=g[y];a.lineTo(k.x,k.y)}a.closePath&&a.closePath()}function xQ(a,r,u,c){a.arc(r,u,c,0,Math.PI*2,!1)}jD.arrowShapeImpl=function(a){return(ND||(ND={polygon:EQ,"triangle-backcurve":SQ,"triangle-tee":ID,"circle-triangle":CQ,"triangle-cross":ID,circle:xQ}))[a]};var jc={};jc.drawElement=function(a,r,u,c,d,g){var b=this;r.isNode()?b.drawNode(a,r,u,c,d,g):b.drawEdge(a,r,u,c,d,g)},jc.drawElementOverlay=function(a,r){var u=this;r.isNode()?u.drawNodeOverlay(a,r):u.drawEdgeOverlay(a,r)},jc.drawElementUnderlay=function(a,r){var u=this;r.isNode()?u.drawNodeUnderlay(a,r):u.drawEdgeUnderlay(a,r)},jc.drawCachedElementPortion=function(a,r,u,c,d,g,b,y){var k=this,E=u.getBoundingBox(r);if(!(E.w===0||E.h===0)){var C=u.getElement(r,E,c,d,g);if(C!=null){var T=y(k,r);if(T===0)return;var P=b(k,r),N=E.x1,D=E.y1,H=E.w,_=E.h,B,$,F,W,Q;if(P!==0){var X=u.getRotationPoint(r);F=X.x,W=X.y,a.translate(F,W),a.rotate(P),Q=k.getImgSmoothing(a),Q||k.setImgSmoothing(a,!0);var K=u.getRotationOffset(r);B=K.x,$=K.y}else B=N,$=D;var ee;T!==1&&(ee=a.globalAlpha,a.globalAlpha=ee*T),a.drawImage(C.texture.canvas,C.x,0,C.width,C.height,B,$,H,_),T!==1&&(a.globalAlpha=ee),P!==0&&(a.rotate(-P),a.translate(-F,-W),Q||k.setImgSmoothing(a,!1))}else u.drawElement(a,r)}};var TQ=function(){return 0},LQ=function(r,u){return r.getTextAngle(u,null)},PQ=function(r,u){return r.getTextAngle(u,"source")},DQ=function(r,u){return r.getTextAngle(u,"target")},jQ=function(r,u){return u.effectiveOpacity()},gS=function(r,u){return u.pstyle("text-opacity").pfValue*u.effectiveOpacity()};jc.drawCachedElement=function(a,r,u,c,d,g){var b=this,y=b.data,k=y.eleTxrCache,E=y.lblTxrCache,C=y.slbTxrCache,T=y.tlbTxrCache,P=r.boundingBox(),N=g===!0?k.reasons.highQuality:null;if(!(P.w===0||P.h===0||!r.visible())&&(!c||$5(P,c))){var D=r.isEdge(),H=r.element()._private.rscratch.badLine;b.drawElementUnderlay(a,r),b.drawCachedElementPortion(a,r,k,u,d,N,TQ,jQ),(!D||!H)&&b.drawCachedElementPortion(a,r,E,u,d,N,LQ,gS),D&&!H&&(b.drawCachedElementPortion(a,r,C,u,d,N,PQ,gS),b.drawCachedElementPortion(a,r,T,u,d,N,DQ,gS)),b.drawElementOverlay(a,r)}},jc.drawElements=function(a,r){for(var u=this,c=0;c<r.length;c++){var d=r[c];u.drawElement(a,d)}},jc.drawCachedElements=function(a,r,u,c){for(var d=this,g=0;g<r.length;g++){var b=r[g];d.drawCachedElement(a,b,u,c)}},jc.drawCachedNodes=function(a,r,u,c){for(var d=this,g=0;g<r.length;g++){var b=r[g];b.isNode()&&d.drawCachedElement(a,b,u,c)}},jc.drawLayeredElements=function(a,r,u,c){var d=this,g=d.data.lyrTxrCache.getLayers(r,u);if(g)for(var b=0;b<g.length;b++){var y=g[b],k=y.bb;k.w===0||k.h===0||a.drawImage(y.canvas,k.x1,k.y1,k.w,k.h)}else d.drawCachedElements(a,r,u,c)};var Nl={};Nl.drawEdge=function(a,r,u){var c=arguments.length>3&&arguments[3]!==void 0?arguments[3]:!0,d=arguments.length>4&&arguments[4]!==void 0?arguments[4]:!0,g=arguments.length>5&&arguments[5]!==void 0?arguments[5]:!0,b=this,y=r._private.rscratch;if(!(g&&!r.visible())&&!(y.badLine||y.allpts==null||isNaN(y.allpts[0]))){var k;u&&(k=u,a.translate(-k.x1,-k.y1));var E=g?r.pstyle("opacity").value:1,C=g?r.pstyle("line-opacity").value:1,T=r.pstyle("curve-style").value,P=r.pstyle("line-style").value,N=r.pstyle("width").pfValue,D=r.pstyle("line-cap").value,H=E*C,_=E*C,B=function(){var J=arguments.length>0&&arguments[0]!==void 0?arguments[0]:H;T==="straight-triangle"?(b.eleStrokeStyle(a,r,J),b.drawEdgeTrianglePath(r,a,y.allpts)):(a.lineWidth=N,a.lineCap=D,b.eleStrokeStyle(a,r,J),b.drawEdgePath(r,a,y.allpts,P),a.lineCap="butt")},$=function(){d&&b.drawEdgeOverlay(a,r)},F=function(){d&&b.drawEdgeUnderlay(a,r)},W=function(){var J=arguments.length>0&&arguments[0]!==void 0?arguments[0]:_;b.drawArrowheads(a,r,J)},Q=function(){b.drawElementText(a,r,null,c)};a.lineJoin="round";var X=r.pstyle("ghost").value==="yes";if(X){var K=r.pstyle("ghost-offset-x").pfValue,ee=r.pstyle("ghost-offset-y").pfValue,Z=r.pstyle("ghost-opacity").value,ae=H*Z;a.translate(K,ee),B(ae),W(ae),a.translate(-K,-ee)}F(),B(),W(),$(),Q(),u&&a.translate(k.x1,k.y1)}};var MD=function(r){if(!["overlay","underlay"].includes(r))throw new Error("Invalid state");return function(u,c){if(c.visible()){var d=c.pstyle("".concat(r,"-opacity")).value;if(d!==0){var g=this,b=g.usePaths(),y=c._private.rscratch,k=c.pstyle("".concat(r,"-padding")).pfValue,E=2*k,C=c.pstyle("".concat(r,"-color")).value;u.lineWidth=E,y.edgeType==="self"&&!b?u.lineCap="butt":u.lineCap="round",g.colorStrokeStyle(u,C[0],C[1],C[2],d),g.drawEdgePath(c,u,y.allpts,"solid")}}}};Nl.drawEdgeOverlay=MD("overlay"),Nl.drawEdgeUnderlay=MD("underlay"),Nl.drawEdgePath=function(a,r,u,c){var d=a._private.rscratch,g=r,b,y=!1,k=this.usePaths(),E=a.pstyle("line-dash-pattern").pfValue,C=a.pstyle("line-dash-offset").pfValue;if(k){var T=u.join("$"),P=d.pathCacheKey&&d.pathCacheKey===T;P?(b=r=d.pathCache,y=!0):(b=r=new Path2D,d.pathCacheKey=T,d.pathCache=b)}if(g.setLineDash)switch(c){case"dotted":g.setLineDash([1,1]);break;case"dashed":g.setLineDash(E),g.lineDashOffset=C;break;case"solid":g.setLineDash([]);break}if(!y&&!d.badLine)switch(r.beginPath&&r.beginPath(),r.moveTo(u[0],u[1]),d.edgeType){case"bezier":case"self":case"compound":case"multibezier":for(var N=2;N+3<u.length;N+=4)r.quadraticCurveTo(u[N],u[N+1],u[N+2],u[N+3]);break;case"straight":case"segments":case"haystack":for(var D=2;D+1<u.length;D+=2)r.lineTo(u[D],u[D+1]);break}r=g,k?r.stroke(b):r.stroke(),r.setLineDash&&r.setLineDash([])},Nl.drawEdgeTrianglePath=function(a,r,u){r.fillStyle=r.strokeStyle;for(var c=a.pstyle("width").pfValue,d=0;d+1<u.length;d+=2){var g=[u[d+2]-u[d],u[d+3]-u[d+1]],b=Math.sqrt(g[0]*g[0]+g[1]*g[1]),y=[g[1]/b,-g[0]/b],k=[y[0]*c/2,y[1]*c/2];r.beginPath(),r.moveTo(u[d]-k[0],u[d+1]-k[1]),r.lineTo(u[d]+k[0],u[d+1]+k[1]),r.lineTo(u[d+2],u[d+3]),r.closePath(),r.fill()}},Nl.drawArrowheads=function(a,r,u){var c=r._private.rscratch,d=c.edgeType==="haystack";d||this.drawArrowhead(a,r,"source",c.arrowStartX,c.arrowStartY,c.srcArrowAngle,u),this.drawArrowhead(a,r,"mid-target",c.midX,c.midY,c.midtgtArrowAngle,u),this.drawArrowhead(a,r,"mid-source",c.midX,c.midY,c.midsrcArrowAngle,u),d||this.drawArrowhead(a,r,"target",c.arrowEndX,c.arrowEndY,c.tgtArrowAngle,u)},Nl.drawArrowhead=function(a,r,u,c,d,g,b){if(!(isNaN(c)||c==null||isNaN(d)||d==null||isNaN(g)||g==null)){var y=this,k=r.pstyle(u+"-arrow-shape").value;if(k!=="none"){var E=r.pstyle(u+"-arrow-fill").value==="hollow"?"both":"filled",C=r.pstyle(u+"-arrow-fill").value,T=r.pstyle("width").pfValue,P=r.pstyle("opacity").value;b===void 0&&(b=P);var N=a.globalCompositeOperation;(b!==1||C==="hollow")&&(a.globalCompositeOperation="destination-out",y.colorFillStyle(a,255,255,255,1),y.colorStrokeStyle(a,255,255,255,1),y.drawArrowShape(r,a,E,T,k,c,d,g),a.globalCompositeOperation=N);var D=r.pstyle(u+"-arrow-color").value;y.colorFillStyle(a,D[0],D[1],D[2],b),y.colorStrokeStyle(a,D[0],D[1],D[2],b),y.drawArrowShape(r,a,C,T,k,c,d,g)}}},Nl.drawArrowShape=function(a,r,u,c,d,g,b,y){var k=this,E=this.usePaths()&&d!=="triangle-cross",C=!1,T,P=r,N={x:g,y:b},D=a.pstyle("arrow-scale").value,H=this.getArrowWidth(c,D),_=k.arrowShapes[d];if(E){var B=k.arrowPathCache=k.arrowPathCache||[],$=Wh(d),F=B[$];F!=null?(T=r=F,C=!0):(T=r=new Path2D,B[$]=T)}C||(r.beginPath&&r.beginPath(),E?_.draw(r,1,0,{x:0,y:0},1):_.draw(r,H,y,N,c),r.closePath&&r.closePath()),r=P,E&&(r.translate(g,b),r.rotate(y),r.scale(H,H)),(u==="filled"||u==="both")&&(E?r.fill(T):r.fill()),(u==="hollow"||u==="both")&&(r.lineWidth=(_.matchEdgeWidth?c:1)/(E?H:1),r.lineJoin="miter",E?r.stroke(T):r.stroke()),E&&(r.scale(1/H,1/H),r.rotate(-y),r.translate(-g,-b))};var bS={};bS.safeDrawImage=function(a,r,u,c,d,g,b,y,k,E){if(!(d<=0||g<=0||k<=0||E<=0))try{a.drawImage(r,u,c,d,g,b,y,k,E)}catch(C){pr(C)}},bS.drawInscribedImage=function(a,r,u,c,d){var g=this,b=u.position(),y=b.x,k=b.y,E=u.cy().style(),C=E.getIndexedStyle.bind(E),T=C(u,"background-fit","value",c),P=C(u,"background-repeat","value",c),N=u.width(),D=u.height(),H=u.padding()*2,_=N+(C(u,"background-width-relative-to","value",c)==="inner"?0:H),B=D+(C(u,"background-height-relative-to","value",c)==="inner"?0:H),$=u._private.rscratch,F=C(u,"background-clip","value",c),W=F==="node",Q=C(u,"background-image-opacity","value",c)*d,X=C(u,"background-image-smoothing","value",c),K=r.width||r.cachedW,ee=r.height||r.cachedH;(K==null||ee==null)&&(document.body.appendChild(r),K=r.cachedW=r.width||r.offsetWidth,ee=r.cachedH=r.height||r.offsetHeight,document.body.removeChild(r));var Z=K,ae=ee;if(C(u,"background-width","value",c)!=="auto"&&(C(u,"background-width","units",c)==="%"?Z=C(u,"background-width","pfValue",c)*_:Z=C(u,"background-width","pfValue",c)),C(u,"background-height","value",c)!=="auto"&&(C(u,"background-height","units",c)==="%"?ae=C(u,"background-height","pfValue",c)*B:ae=C(u,"background-height","pfValue",c)),!(Z===0||ae===0)){if(T==="contain"){var oe=Math.min(_/Z,B/ae);Z*=oe,ae*=oe}else if(T==="cover"){var oe=Math.max(_/Z,B/ae);Z*=oe,ae*=oe}var J=y-_/2,fe=C(u,"background-position-x","units",c),se=C(u,"background-position-x","pfValue",c);fe==="%"?J+=(_-Z)*se:J+=se;var pe=C(u,"background-offset-x","units",c),he=C(u,"background-offset-x","pfValue",c);pe==="%"?J+=(_-Z)*he:J+=he;var de=k-B/2,ke=C(u,"background-position-y","units",c),Pe=C(u,"background-position-y","pfValue",c);ke==="%"?de+=(B-ae)*Pe:de+=Pe;var Ae=C(u,"background-offset-y","units",c),Te=C(u,"background-offset-y","pfValue",c);Ae==="%"?de+=(B-ae)*Te:de+=Te,$.pathCache&&(J-=y,de-=k,y=0,k=0);var Oe=a.globalAlpha;a.globalAlpha=Q;var ze=g.getImgSmoothing(a),We=!1;if(X==="no"&&ze?(g.setImgSmoothing(a,!1),We=!0):X==="yes"&&!ze&&(g.setImgSmoothing(a,!0),We=!0),P==="no-repeat")W&&(a.save(),$.pathCache?a.clip($.pathCache):(g.nodeShapes[g.getNodeShape(u)].draw(a,y,k,_,B),a.clip())),g.safeDrawImage(a,r,0,0,K,ee,J,de,Z,ae),W&&a.restore();else{var $e=a.createPattern(r,P);a.fillStyle=$e,g.nodeShapes[g.getNodeShape(u)].draw(a,y,k,_,B),a.translate(J,de),a.fill(),a.translate(-J,-de)}a.globalAlpha=Oe,We&&g.setImgSmoothing(a,ze)}};var td={};td.eleTextBiggerThanMin=function(a,r){if(!r){var u=a.cy().zoom(),c=this.getPixelRatio(),d=Math.ceil(_5(u*c));r=Math.pow(2,d)}var g=a.pstyle("font-size").pfValue*r,b=a.pstyle("min-zoomed-font-size").pfValue;return!(g<b)},td.drawElementText=function(a,r,u,c,d){var g=arguments.length>5&&arguments[5]!==void 0?arguments[5]:!0,b=this;if(c==null){if(g&&!b.eleTextBiggerThanMin(r))return}else if(c===!1)return;if(r.isNode()){var y=r.pstyle("label");if(!y||!y.value)return;var k=b.getLabelJustification(r);a.textAlign=k,a.textBaseline="bottom"}else{var E=r.element()._private.rscratch.badLine,C=r.pstyle("label"),T=r.pstyle("source-label"),P=r.pstyle("target-label");if(E||(!C||!C.value)&&(!T||!T.value)&&(!P||!P.value))return;a.textAlign="center",a.textBaseline="bottom"}var N=!u,D;u&&(D=u,a.translate(-D.x1,-D.y1)),d==null?(b.drawText(a,r,null,N,g),r.isEdge()&&(b.drawText(a,r,"source",N,g),b.drawText(a,r,"target",N,g))):b.drawText(a,r,d,N,g),u&&a.translate(D.x1,D.y1)},td.getFontCache=function(a){var r;this.fontCaches=this.fontCaches||[];for(var u=0;u<this.fontCaches.length;u++)if(r=this.fontCaches[u],r.context===a)return r;return r={context:a},this.fontCaches.push(r),r},td.setupTextStyle=function(a,r){var u=arguments.length>2&&arguments[2]!==void 0?arguments[2]:!0,c=r.pstyle("font-style").strValue,d=r.pstyle("font-size").pfValue+"px",g=r.pstyle("font-family").strValue,b=r.pstyle("font-weight").strValue,y=u?r.effectiveOpacity()*r.pstyle("text-opacity").value:1,k=r.pstyle("text-outline-opacity").value*y,E=r.pstyle("color").value,C=r.pstyle("text-outline-color").value;a.font=c+" "+b+" "+d+" "+g,a.lineJoin="round",this.colorFillStyle(a,E[0],E[1],E[2],y),this.colorStrokeStyle(a,C[0],C[1],C[2],k)};function NQ(a,r,u,c,d){var g=arguments.length>5&&arguments[5]!==void 0?arguments[5]:5;a.beginPath(),a.moveTo(r+g,u),a.lineTo(r+c-g,u),a.quadraticCurveTo(r+c,u,r+c,u+g),a.lineTo(r+c,u+d-g),a.quadraticCurveTo(r+c,u+d,r+c-g,u+d),a.lineTo(r+g,u+d),a.quadraticCurveTo(r,u+d,r,u+d-g),a.lineTo(r,u+g),a.quadraticCurveTo(r,u,r+g,u),a.closePath(),a.fill()}td.getTextAngle=function(a,r){var u,c=a._private,d=c.rscratch,g=r?r+"-":"",b=a.pstyle(g+"text-rotation"),y=Ou(d,"labelAngle",r);return b.strValue==="autorotate"?u=a.isEdge()?y:0:b.strValue==="none"?u=0:u=b.pfValue,u},td.drawText=function(a,r,u){var c=arguments.length>3&&arguments[3]!==void 0?arguments[3]:!0,d=arguments.length>4&&arguments[4]!==void 0?arguments[4]:!0,g=r._private,b=g.rscratch,y=d?r.effectiveOpacity():1;if(!(d&&(y===0||r.pstyle("text-opacity").value===0))){u==="main"&&(u=null);var k=Ou(b,"labelX",u),E=Ou(b,"labelY",u),C,T,P=this.getLabelText(r,u);if(P!=null&&P!==""&&!isNaN(k)&&!isNaN(E)){this.setupTextStyle(a,r,d);var N=u?u+"-":"",D=Ou(b,"labelWidth",u),H=Ou(b,"labelHeight",u),_=r.pstyle(N+"text-margin-x").pfValue,B=r.pstyle(N+"text-margin-y").pfValue,$=r.isEdge(),F=r.pstyle("text-halign").value,W=r.pstyle("text-valign").value;$&&(F="center",W="center"),k+=_,E+=B;var Q;switch(c?Q=this.getTextAngle(r,u):Q=0,Q!==0&&(C=k,T=E,a.translate(C,T),a.rotate(Q),k=0,E=0),W){case"top":break;case"center":E+=H/2;break;case"bottom":E+=H;break}var X=r.pstyle("text-background-opacity").value,K=r.pstyle("text-border-opacity").value,ee=r.pstyle("text-border-width").pfValue,Z=r.pstyle("text-background-padding").pfValue;if(X>0||ee>0&&K>0){var ae=k-Z;switch(F){case"left":ae-=D;break;case"center":ae-=D/2;break}var oe=E-H-Z,J=D+2*Z,fe=H+2*Z;if(X>0){var se=a.fillStyle,pe=r.pstyle("text-background-color").value;a.fillStyle="rgba("+pe[0]+","+pe[1]+","+pe[2]+","+X*y+")";var he=r.pstyle("text-background-shape").strValue;he.indexOf("round")===0?NQ(a,ae,oe,J,fe,2):a.fillRect(ae,oe,J,fe),a.fillStyle=se}if(ee>0&&K>0){var de=a.strokeStyle,ke=a.lineWidth,Pe=r.pstyle("text-border-color").value,Ae=r.pstyle("text-border-style").value;if(a.strokeStyle="rgba("+Pe[0]+","+Pe[1]+","+Pe[2]+","+K*y+")",a.lineWidth=ee,a.setLineDash)switch(Ae){case"dotted":a.setLineDash([1,1]);break;case"dashed":a.setLineDash([4,2]);break;case"double":a.lineWidth=ee/4,a.setLineDash([]);break;case"solid":a.setLineDash([]);break}if(a.strokeRect(ae,oe,J,fe),Ae==="double"){var Te=ee/2;a.strokeRect(ae+Te,oe+Te,J-Te*2,fe-Te*2)}a.setLineDash&&a.setLineDash([]),a.lineWidth=ke,a.strokeStyle=de}}var Oe=2*r.pstyle("text-outline-width").pfValue;if(Oe>0&&(a.lineWidth=Oe),r.pstyle("text-wrap").value==="wrap"){var ze=Ou(b,"labelWrapCachedLines",u),We=Ou(b,"labelLineHeight",u),$e=D/2,Ge=this.getLabelJustification(r);switch(Ge==="auto"||(F==="left"?Ge==="left"?k+=-D:Ge==="center"&&(k+=-$e):F==="center"?Ge==="left"?k+=-$e:Ge==="right"&&(k+=$e):F==="right"&&(Ge==="center"?k+=$e:Ge==="right"&&(k+=D))),W){case"top":E-=(ze.length-1)*We;break;case"center":case"bottom":E-=(ze.length-1)*We;break}for(var me=0;me<ze.length;me++)Oe>0&&a.strokeText(ze[me],k,E),a.fillText(ze[me],k,E),E+=We}else Oe>0&&a.strokeText(P,k,E),a.fillText(P,k,E);Q!==0&&(a.rotate(-Q),a.translate(-C,-T))}}};var qv={};qv.drawNode=function(a,r,u){var c=arguments.length>3&&arguments[3]!==void 0?arguments[3]:!0,d=arguments.length>4&&arguments[4]!==void 0?arguments[4]:!0,g=arguments.length>5&&arguments[5]!==void 0?arguments[5]:!0,b=this,y,k,E=r._private,C=E.rscratch,T=r.position();if(!(!kt(T.x)||!kt(T.y))&&!(g&&!r.visible())){var P=g?r.effectiveOpacity():1,N=b.usePaths(),D,H=!1,_=r.padding();y=r.width()+2*_,k=r.height()+2*_;var B;u&&(B=u,a.translate(-B.x1,-B.y1));for(var $=r.pstyle("background-image"),F=$.value,W=new Array(F.length),Q=new Array(F.length),X=0,K=0;K<F.length;K++){var ee=F[K],Z=W[K]=ee!=null&&ee!=="none";if(Z){var ae=r.cy().style().getIndexedStyle(r,"background-image-crossorigin","value",K);X++,Q[K]=b.getCachedImage(ee,ae,function(){E.backgroundTimestamp=Date.now(),r.emitAndNotify("background")})}}var oe=r.pstyle("background-blacken").value,J=r.pstyle("border-width").pfValue,fe=r.pstyle("background-opacity").value*P,se=r.pstyle("border-color").value,pe=r.pstyle("border-style").value,he=r.pstyle("border-opacity").value*P;a.lineJoin="miter";var de=function(){var yt=arguments.length>0&&arguments[0]!==void 0?arguments[0]:fe;b.eleFillStyle(a,r,yt)},ke=function(){var yt=arguments.length>0&&arguments[0]!==void 0?arguments[0]:he;b.colorStrokeStyle(a,se[0],se[1],se[2],yt)},Pe=r.pstyle("shape").strValue,Ae=r.pstyle("shape-polygon-points").pfValue;if(N){a.translate(T.x,T.y);var Te=b.nodePathCache=b.nodePathCache||[],Oe=OP(Pe==="polygon"?Pe+","+Ae.join(","):Pe,""+k,""+y),ze=Te[Oe];ze!=null?(D=ze,H=!0,C.pathCache=D):(D=new Path2D,Te[Oe]=C.pathCache=D)}var We=function(){if(!H){var yt=T;N&&(yt={x:0,y:0}),b.nodeShapes[b.getNodeShape(r)].draw(D||a,yt.x,yt.y,y,k)}N?a.fill(D):a.fill()},$e=function(){for(var yt=arguments.length>0&&arguments[0]!==void 0?arguments[0]:P,Mt=arguments.length>1&&arguments[1]!==void 0?arguments[1]:!0,In=E.backgrounding,Pn=0,Vt=0;Vt<Q.length;Vt++){var sr=r.cy().style().getIndexedStyle(r,"background-image-containment","value",Vt);if(Mt&&sr==="over"||!Mt&&sr==="inside"){Pn++;continue}W[Vt]&&Q[Vt].complete&&!Q[Vt].error&&(Pn++,b.drawInscribedImage(a,Q[Vt],r,Vt,yt))}E.backgrounding=Pn!==X,In!==E.backgrounding&&r.updateStyle(!1)},Ge=function(){var yt=arguments.length>0&&arguments[0]!==void 0?arguments[0]:!1,Mt=arguments.length>1&&arguments[1]!==void 0?arguments[1]:P;b.hasPie(r)&&(b.drawPie(a,r,Mt),yt&&(N||b.nodeShapes[b.getNodeShape(r)].draw(a,T.x,T.y,y,k)))},me=function(){var yt=arguments.length>0&&arguments[0]!==void 0?arguments[0]:P,Mt=(oe>0?oe:-oe)*yt,In=oe>0?0:255;oe!==0&&(b.colorFillStyle(a,In,In,In,Mt),N?a.fill(D):a.fill())},Ve=function(){if(J>0){if(a.lineWidth=J,a.lineCap="butt",a.setLineDash)switch(pe){case"dotted":a.setLineDash([1,1]);break;case"dashed":a.setLineDash([4,2]);break;case"solid":case"double":a.setLineDash([]);break}if(N?a.stroke(D):a.stroke(),pe==="double"){a.lineWidth=J/3;var yt=a.globalCompositeOperation;a.globalCompositeOperation="destination-out",N?a.stroke(D):a.stroke(),a.globalCompositeOperation=yt}a.setLineDash&&a.setLineDash([])}},Ke=function(){d&&b.drawNodeOverlay(a,r,T,y,k)},at=function(){d&&b.drawNodeUnderlay(a,r,T,y,k)},ft=function(){b.drawElementText(a,r,null,c)},tn=r.pstyle("ghost").value==="yes";if(tn){var gn=r.pstyle("ghost-offset-x").pfValue,mt=r.pstyle("ghost-offset-y").pfValue,ht=r.pstyle("ghost-opacity").value,Rt=ht*P;a.translate(gn,mt),de(ht*fe),We(),$e(Rt,!0),ke(ht*he),Ve(),Ge(oe!==0||J!==0),$e(Rt,!1),me(Rt),a.translate(-gn,-mt)}N&&a.translate(-T.x,-T.y),at(),N&&a.translate(T.x,T.y),de(),We(),$e(P,!0),ke(),Ve(),Ge(oe!==0||J!==0),$e(P,!1),me(),N&&a.translate(-T.x,-T.y),ft(),Ke(),u&&a.translate(B.x1,B.y1)}};var OD=function(r){if(!["overlay","underlay"].includes(r))throw new Error("Invalid state");return function(u,c,d,g,b){var y=this;if(c.visible()){var k=c.pstyle("".concat(r,"-padding")).pfValue,E=c.pstyle("".concat(r,"-opacity")).value,C=c.pstyle("".concat(r,"-color")).value,T=c.pstyle("".concat(r,"-shape")).value;if(E>0){if(d=d||c.position(),g==null||b==null){var P=c.padding();g=c.width()+2*P,b=c.height()+2*P}y.colorFillStyle(u,C[0],C[1],C[2],E),y.nodeShapes[T].draw(u,d.x,d.y,g+k*2,b+k*2),u.fill()}}}};qv.drawNodeOverlay=OD("overlay"),qv.drawNodeUnderlay=OD("underlay"),qv.hasPie=function(a){return a=a[0],a._private.hasPie},qv.drawPie=function(a,r,u,c){r=r[0],c=c||r.position();var d=r.cy().style(),g=r.pstyle("pie-size"),b=c.x,y=c.y,k=r.width(),E=r.height(),C=Math.min(k,E)/2,T=0,P=this.usePaths();P&&(b=0,y=0),g.units==="%"?C=C*g.pfValue:g.pfValue!==void 0&&(C=g.pfValue/2);for(var N=1;N<=d.pieBackgroundN;N++){var D=r.pstyle("pie-"+N+"-background-size").value,H=r.pstyle("pie-"+N+"-background-color").value,_=r.pstyle("pie-"+N+"-background-opacity").value*u,B=D/100;B+T>1&&(B=1-T);var $=1.5*Math.PI+2*Math.PI*T,F=2*Math.PI*B,W=$+F;D===0||T>=1||T+B>1||(a.beginPath(),a.moveTo(b,y),a.arc(b,y,C,$,W),a.closePath(),this.colorFillStyle(a,H[0],H[1],H[2],_),a.fill(),T+=B)}};var As={},IQ=100;As.getPixelRatio=function(){var a=this.data.contexts[0];if(this.forcedPixelRatio!=null)return this.forcedPixelRatio;var r=a.backingStorePixelRatio||a.webkitBackingStorePixelRatio||a.mozBackingStorePixelRatio||a.msBackingStorePixelRatio||a.oBackingStorePixelRatio||a.backingStorePixelRatio||1;return(window.devicePixelRatio||1)/r},As.paintCache=function(a){for(var r=this.paintCaches=this.paintCaches||[],u=!0,c,d=0;d<r.length;d++)if(c=r[d],c.context===a){u=!1;break}return u&&(c={context:a},r.push(c)),c},As.createGradientStyleFor=function(a,r,u,c,d){var g,b=this.usePaths(),y=u.pstyle(r+"-gradient-stop-colors").value,k=u.pstyle(r+"-gradient-stop-positions").pfValue;if(c==="radial-gradient")if(u.isEdge()){var E=u.sourceEndpoint(),C=u.targetEndpoint(),T=u.midpoint(),P=Uh(E,T),N=Uh(C,T);g=a.createRadialGradient(T.x,T.y,0,T.x,T.y,Math.max(P,N))}else{var D=b?{x:0,y:0}:u.position(),H=u.paddedWidth(),_=u.paddedHeight();g=a.createRadialGradient(D.x,D.y,0,D.x,D.y,Math.max(H,_))}else if(u.isEdge()){var B=u.sourceEndpoint(),$=u.targetEndpoint();g=a.createLinearGradient(B.x,B.y,$.x,$.y)}else{var F=b?{x:0,y:0}:u.position(),W=u.paddedWidth(),Q=u.paddedHeight(),X=W/2,K=Q/2,ee=u.pstyle("background-gradient-direction").value;switch(ee){case"to-bottom":g=a.createLinearGradient(F.x,F.y-K,F.x,F.y+K);break;case"to-top":g=a.createLinearGradient(F.x,F.y+K,F.x,F.y-K);break;case"to-left":g=a.createLinearGradient(F.x+X,F.y,F.x-X,F.y);break;case"to-right":g=a.createLinearGradient(F.x-X,F.y,F.x+X,F.y);break;case"to-bottom-right":case"to-right-bottom":g=a.createLinearGradient(F.x-X,F.y-K,F.x+X,F.y+K);break;case"to-top-right":case"to-right-top":g=a.createLinearGradient(F.x-X,F.y+K,F.x+X,F.y-K);break;case"to-bottom-left":case"to-left-bottom":g=a.createLinearGradient(F.x+X,F.y-K,F.x-X,F.y+K);break;case"to-top-left":case"to-left-top":g=a.createLinearGradient(F.x+X,F.y+K,F.x-X,F.y-K);break}}if(!g)return null;for(var Z=k.length===y.length,ae=y.length,oe=0;oe<ae;oe++)g.addColorStop(Z?k[oe]:oe/(ae-1),"rgba("+y[oe][0]+","+y[oe][1]+","+y[oe][2]+","+d+")");return g},As.gradientFillStyle=function(a,r,u,c){var d=this.createGradientStyleFor(a,"background",r,u,c);if(!d)return null;a.fillStyle=d},As.colorFillStyle=function(a,r,u,c,d){a.fillStyle="rgba("+r+","+u+","+c+","+d+")"},As.eleFillStyle=function(a,r,u){var c=r.pstyle("background-fill").value;if(c==="linear-gradient"||c==="radial-gradient")this.gradientFillStyle(a,r,c,u);else{var d=r.pstyle("background-color").value;this.colorFillStyle(a,d[0],d[1],d[2],u)}},As.gradientStrokeStyle=function(a,r,u,c){var d=this.createGradientStyleFor(a,"line",r,u,c);if(!d)return null;a.strokeStyle=d},As.colorStrokeStyle=function(a,r,u,c,d){a.strokeStyle="rgba("+r+","+u+","+c+","+d+")"},As.eleStrokeStyle=function(a,r,u){var c=r.pstyle("line-fill").value;if(c==="linear-gradient"||c==="radial-gradient")this.gradientStrokeStyle(a,r,c,u);else{var d=r.pstyle("line-color").value;this.colorStrokeStyle(a,d[0],d[1],d[2],u)}},As.matchCanvasSize=function(a){var r=this,u=r.data,c=r.findContainerClientCoords(),d=c[2],g=c[3],b=r.getPixelRatio(),y=r.motionBlurPxRatio;(a===r.data.bufferCanvases[r.MOTIONBLUR_BUFFER_NODE]||a===r.data.bufferCanvases[r.MOTIONBLUR_BUFFER_DRAG])&&(b=y);var k=d*b,E=g*b,C;if(!(k===r.canvasWidth&&E===r.canvasHeight)){r.fontCaches=null;var T=u.canvasContainer;T.style.width=d+"px",T.style.height=g+"px";for(var P=0;P<r.CANVAS_LAYERS;P++)C=u.canvases[P],C.width=k,C.height=E,C.style.width=d+"px",C.style.height=g+"px";for(var P=0;P<r.BUFFER_COUNT;P++)C=u.bufferCanvases[P],C.width=k,C.height=E,C.style.width=d+"px",C.style.height=g+"px";r.textureMult=1,b<=1&&(C=u.bufferCanvases[r.TEXTURE_BUFFER],r.textureMult=2,C.width=k*r.textureMult,C.height=E*r.textureMult),r.canvasWidth=k,r.canvasHeight=E}},As.renderTo=function(a,r,u,c){this.render({forcedContext:a,forcedZoom:r,forcedPan:u,drawAllLayers:!0,forcedPxRatio:c})},As.render=function(a){a=a||_P();var r=a.forcedContext,u=a.drawAllLayers,c=a.drawOnlyNodeLayer,d=a.forcedZoom,g=a.forcedPan,b=this,y=a.forcedPxRatio===void 0?this.getPixelRatio():a.forcedPxRatio,k=b.cy,E=b.data,C=E.canvasNeedsRedraw,T=b.textureOnViewport&&!r&&(b.pinching||b.hoverData.dragging||b.swipePanning||b.data.wheelZooming),P=a.motionBlur!==void 0?a.motionBlur:b.motionBlur,N=b.motionBlurPxRatio,D=k.hasCompoundNodes(),H=b.hoverData.draggingEles,_=!!(b.hoverData.selecting||b.touchData.selecting);P=P&&!r&&b.motionBlurEnabled&&!_;var B=P;r||(b.prevPxRatio!==y&&(b.invalidateContainerClientCoordsCache(),b.matchCanvasSize(b.container),b.redrawHint("eles",!0),b.redrawHint("drag",!0)),b.prevPxRatio=y),!r&&b.motionBlurTimeout&&clearTimeout(b.motionBlurTimeout),P&&(b.mbFrames==null&&(b.mbFrames=0),b.mbFrames++,b.mbFrames<3&&(B=!1),b.mbFrames>b.minMbLowQualFrames&&(b.motionBlurPxRatio=b.mbPxRBlurry)),b.clearingMotionBlur&&(b.motionBlurPxRatio=1),b.textureDrawLastFrame&&!T&&(C[b.NODE]=!0,C[b.SELECT_BOX]=!0);var $=k.style(),F=k.zoom(),W=d!==void 0?d:F,Q=k.pan(),X={x:Q.x,y:Q.y},K={zoom:F,pan:{x:Q.x,y:Q.y}},ee=b.prevViewport,Z=ee===void 0||K.zoom!==ee.zoom||K.pan.x!==ee.pan.x||K.pan.y!==ee.pan.y;!Z&&!(H&&!D)&&(b.motionBlurPxRatio=1),g&&(X=g),W*=y,X.x*=y,X.y*=y;var ae=b.getCachedZSortedEles();function oe(mt,ht,Rt,Lt,yt){var Mt=mt.globalCompositeOperation;mt.globalCompositeOperation="destination-out",b.colorFillStyle(mt,255,255,255,b.motionBlurTransparency),mt.fillRect(ht,Rt,Lt,yt),mt.globalCompositeOperation=Mt}function J(mt,ht){var Rt,Lt,yt,Mt;!b.clearingMotionBlur&&(mt===E.bufferContexts[b.MOTIONBLUR_BUFFER_NODE]||mt===E.bufferContexts[b.MOTIONBLUR_BUFFER_DRAG])?(Rt={x:Q.x*N,y:Q.y*N},Lt=F*N,yt=b.canvasWidth*N,Mt=b.canvasHeight*N):(Rt=X,Lt=W,yt=b.canvasWidth,Mt=b.canvasHeight),mt.setTransform(1,0,0,1,0,0),ht==="motionBlur"?oe(mt,0,0,yt,Mt):!r&&(ht===void 0||ht)&&mt.clearRect(0,0,yt,Mt),u||(mt.translate(Rt.x,Rt.y),mt.scale(Lt,Lt)),g&&mt.translate(g.x,g.y),d&&mt.scale(d,d)}if(T||(b.textureDrawLastFrame=!1),T){if(b.textureDrawLastFrame=!0,!b.textureCache){b.textureCache={},b.textureCache.bb=k.mutableElements().boundingBox(),b.textureCache.texture=b.data.bufferCanvases[b.TEXTURE_BUFFER];var fe=b.data.bufferContexts[b.TEXTURE_BUFFER];fe.setTransform(1,0,0,1,0,0),fe.clearRect(0,0,b.canvasWidth*b.textureMult,b.canvasHeight*b.textureMult),b.render({forcedContext:fe,drawOnlyNodeLayer:!0,forcedPxRatio:y*b.textureMult});var K=b.textureCache.viewport={zoom:k.zoom(),pan:k.pan(),width:b.canvasWidth,height:b.canvasHeight};K.mpan={x:(0-K.pan.x)/K.zoom,y:(0-K.pan.y)/K.zoom}}C[b.DRAG]=!1,C[b.NODE]=!1;var se=E.contexts[b.NODE],pe=b.textureCache.texture,K=b.textureCache.viewport;se.setTransform(1,0,0,1,0,0),P?oe(se,0,0,K.width,K.height):se.clearRect(0,0,K.width,K.height);var he=$.core("outside-texture-bg-color").value,de=$.core("outside-texture-bg-opacity").value;b.colorFillStyle(se,he[0],he[1],he[2],de),se.fillRect(0,0,K.width,K.height);var F=k.zoom();J(se,!1),se.clearRect(K.mpan.x,K.mpan.y,K.width/K.zoom/y,K.height/K.zoom/y),se.drawImage(pe,K.mpan.x,K.mpan.y,K.width/K.zoom/y,K.height/K.zoom/y)}else b.textureOnViewport&&!r&&(b.textureCache=null);var ke=k.extent(),Pe=b.pinching||b.hoverData.dragging||b.swipePanning||b.data.wheelZooming||b.hoverData.draggingEles||b.cy.animated(),Ae=b.hideEdgesOnViewport&&Pe,Te=[];if(Te[b.NODE]=!C[b.NODE]&&P&&!b.clearedForMotionBlur[b.NODE]||b.clearingMotionBlur,Te[b.NODE]&&(b.clearedForMotionBlur[b.NODE]=!0),Te[b.DRAG]=!C[b.DRAG]&&P&&!b.clearedForMotionBlur[b.DRAG]||b.clearingMotionBlur,Te[b.DRAG]&&(b.clearedForMotionBlur[b.DRAG]=!0),C[b.NODE]||u||c||Te[b.NODE]){var Oe=P&&!Te[b.NODE]&&N!==1,se=r||(Oe?b.data.bufferContexts[b.MOTIONBLUR_BUFFER_NODE]:E.contexts[b.NODE]),ze=P&&!Oe?"motionBlur":void 0;J(se,ze),Ae?b.drawCachedNodes(se,ae.nondrag,y,ke):b.drawLayeredElements(se,ae.nondrag,y,ke),b.debug&&b.drawDebugPoints(se,ae.nondrag),!u&&!P&&(C[b.NODE]=!1)}if(!c&&(C[b.DRAG]||u||Te[b.DRAG])){var Oe=P&&!Te[b.DRAG]&&N!==1,se=r||(Oe?b.data.bufferContexts[b.MOTIONBLUR_BUFFER_DRAG]:E.contexts[b.DRAG]);J(se,P&&!Oe?"motionBlur":void 0),Ae?b.drawCachedNodes(se,ae.drag,y,ke):b.drawCachedElements(se,ae.drag,y,ke),b.debug&&b.drawDebugPoints(se,ae.drag),!u&&!P&&(C[b.DRAG]=!1)}if(b.showFps||!c&&C[b.SELECT_BOX]&&!u){var se=r||E.contexts[b.SELECT_BOX];if(J(se),b.selection[4]==1&&(b.hoverData.selecting||b.touchData.selecting)){var F=b.cy.zoom(),We=$.core("selection-box-border-width").value/F;se.lineWidth=We,se.fillStyle="rgba("+$.core("selection-box-color").value[0]+","+$.core("selection-box-color").value[1]+","+$.core("selection-box-color").value[2]+","+$.core("selection-box-opacity").value+")",se.fillRect(b.selection[0],b.selection[1],b.selection[2]-b.selection[0],b.selection[3]-b.selection[1]),We>0&&(se.strokeStyle="rgba("+$.core("selection-box-border-color").value[0]+","+$.core("selection-box-border-color").value[1]+","+$.core("selection-box-border-color").value[2]+","+$.core("selection-box-opacity").value+")",se.strokeRect(b.selection[0],b.selection[1],b.selection[2]-b.selection[0],b.selection[3]-b.selection[1]))}if(E.bgActivePosistion&&!b.hoverData.selecting){var F=b.cy.zoom(),$e=E.bgActivePosistion;se.fillStyle="rgba("+$.core("active-bg-color").value[0]+","+$.core("active-bg-color").value[1]+","+$.core("active-bg-color").value[2]+","+$.core("active-bg-opacity").value+")",se.beginPath(),se.arc($e.x,$e.y,$.core("active-bg-size").pfValue/F,0,2*Math.PI),se.fill()}var Ge=b.lastRedrawTime;if(b.showFps&&Ge){Ge=Math.round(Ge);var me=Math.round(1e3/Ge);se.setTransform(1,0,0,1,0,0),se.fillStyle="rgba(255, 0, 0, 0.75)",se.strokeStyle="rgba(255, 0, 0, 0.75)",se.lineWidth=1,se.fillText("1 frame = "+Ge+" ms = "+me+" fps",0,20);var Ve=60;se.strokeRect(0,30,250,20),se.fillRect(0,30,250*Math.min(me/Ve,1),20)}u||(C[b.SELECT_BOX]=!1)}if(P&&N!==1){var Ke=E.contexts[b.NODE],at=b.data.bufferCanvases[b.MOTIONBLUR_BUFFER_NODE],ft=E.contexts[b.DRAG],tn=b.data.bufferCanvases[b.MOTIONBLUR_BUFFER_DRAG],gn=function(ht,Rt,Lt){ht.setTransform(1,0,0,1,0,0),Lt||!B?ht.clearRect(0,0,b.canvasWidth,b.canvasHeight):oe(ht,0,0,b.canvasWidth,b.canvasHeight);var yt=N;ht.drawImage(Rt,0,0,b.canvasWidth*yt,b.canvasHeight*yt,0,0,b.canvasWidth,b.canvasHeight)};(C[b.NODE]||Te[b.NODE])&&(gn(Ke,at,Te[b.NODE]),C[b.NODE]=!1),(C[b.DRAG]||Te[b.DRAG])&&(gn(ft,tn,Te[b.DRAG]),C[b.DRAG]=!1)}b.prevViewport=K,b.clearingMotionBlur&&(b.clearingMotionBlur=!1,b.motionBlurCleared=!0,b.motionBlur=!0),P&&(b.motionBlurTimeout=setTimeout(function(){b.motionBlurTimeout=null,b.clearedForMotionBlur[b.NODE]=!1,b.clearedForMotionBlur[b.DRAG]=!1,b.motionBlur=!1,b.clearingMotionBlur=!T,b.mbFrames=0,C[b.NODE]=!0,C[b.DRAG]=!0,b.redraw()},IQ)),r||k.emit("render")};var Hf={};Hf.drawPolygonPath=function(a,r,u,c,d,g){var b=c/2,y=d/2;a.beginPath&&a.beginPath(),a.moveTo(r+b*g[0],u+y*g[1]);for(var k=1;k<g.length/2;k++)a.lineTo(r+b*g[k*2],u+y*g[k*2+1]);a.closePath()},Hf.drawRoundPolygonPath=function(a,r,u,c,d,g){var b=c/2,y=d/2,k=q5(c,d);a.beginPath&&a.beginPath();for(var E=0;E<g.length/4;E++){var C=void 0,T=void 0;E===0?C=g.length-2:C=E*4-2,T=E*4+2;var P=r+b*g[E*4],N=u+y*g[E*4+1],D=-g[C]*g[T]-g[C+1]*g[T+1],H=k/Math.tan(Math.acos(D)/2),_=P-H*g[C],B=N-H*g[C+1],$=P+H*g[T],F=N+H*g[T+1];E===0?a.moveTo(_,B):a.lineTo(_,B),a.arcTo(P,N,$,F,k)}a.closePath()},Hf.drawRoundRectanglePath=function(a,r,u,c,d){var g=c/2,b=d/2,y=s1(c,d);a.beginPath&&a.beginPath(),a.moveTo(r,u-b),a.arcTo(r+g,u-b,r+g,u,y),a.arcTo(r+g,u+b,r,u+b,y),a.arcTo(r-g,u+b,r-g,u,y),a.arcTo(r-g,u-b,r,u-b,y),a.lineTo(r,u-b),a.closePath()},Hf.drawBottomRoundRectanglePath=function(a,r,u,c,d){var g=c/2,b=d/2,y=s1(c,d);a.beginPath&&a.beginPath(),a.moveTo(r,u-b),a.lineTo(r+g,u-b),a.lineTo(r+g,u),a.arcTo(r+g,u+b,r,u+b,y),a.arcTo(r-g,u+b,r-g,u,y),a.lineTo(r-g,u-b),a.lineTo(r,u-b),a.closePath()},Hf.drawCutRectanglePath=function(a,r,u,c,d){var g=c/2,b=d/2,y=ZP();a.beginPath&&a.beginPath(),a.moveTo(r-g+y,u-b),a.lineTo(r+g-y,u-b),a.lineTo(r+g,u-b+y),a.lineTo(r+g,u+b-y),a.lineTo(r+g-y,u+b),a.lineTo(r-g+y,u+b),a.lineTo(r-g,u+b-y),a.lineTo(r-g,u-b+y),a.closePath()},Hf.drawBarrelPath=function(a,r,u,c,d){var g=c/2,b=d/2,y=r-g,k=r+g,E=u-b,C=u+b,T=V5(c,d),P=T.widthOffset,N=T.heightOffset,D=T.ctrlPtOffsetPct*P;a.beginPath&&a.beginPath(),a.moveTo(y,E+N),a.lineTo(y,C-N),a.quadraticCurveTo(y+D,C,y+P,C),a.lineTo(k-P,C),a.quadraticCurveTo(k-D,C,k,C-N),a.lineTo(k,E+N),a.quadraticCurveTo(k-D,E,k-P,E),a.lineTo(y+P,E),a.quadraticCurveTo(y+D,E,y,E+N),a.closePath()};for(var AD=Math.sin(0),RD=Math.cos(0),pS={},wS={},BD=Math.PI/40,Vv=0*Math.PI;Vv<2*Math.PI;Vv+=BD)pS[Vv]=Math.sin(Vv),wS[Vv]=Math.cos(Vv);Hf.drawEllipsePath=function(a,r,u,c,d){if(a.beginPath&&a.beginPath(),a.ellipse)a.ellipse(r,u,c/2,d/2,0,0,2*Math.PI);else for(var g,b,y=c/2,k=d/2,E=0*Math.PI;E<2*Math.PI;E+=BD)g=r-y*pS[E]*AD+y*wS[E]*RD,b=u+k*wS[E]*AD+k*pS[E]*RD,E===0?a.moveTo(g,b):a.lineTo(g,b);a.closePath()};var C1={};C1.createBuffer=function(a,r){var u=document.createElement("canvas");return u.width=a,u.height=r,[u,u.getContext("2d")]},C1.bufferCanvasImage=function(a){var r=this.cy,u=r.mutableElements(),c=u.boundingBox(),d=this.findContainerClientCoords(),g=a.full?Math.ceil(c.w):d[2],b=a.full?Math.ceil(c.h):d[3],y=kt(a.maxWidth)||kt(a.maxHeight),k=this.getPixelRatio(),E=1;if(a.scale!==void 0)g*=a.scale,b*=a.scale,E=a.scale;else if(y){var C=1/0,T=1/0;kt(a.maxWidth)&&(C=E*a.maxWidth/g),kt(a.maxHeight)&&(T=E*a.maxHeight/b),E=Math.min(C,T),g*=E,b*=E}y||(g*=k,b*=k,E*=k);var P=document.createElement("canvas");P.width=g,P.height=b,P.style.width=g+"px",P.style.height=b+"px";var N=P.getContext("2d");if(g>0&&b>0){N.clearRect(0,0,g,b),N.globalCompositeOperation="source-over";var D=this.getCachedZSortedEles();if(a.full)N.translate(-c.x1*E,-c.y1*E),N.scale(E,E),this.drawElements(N,D),N.scale(1/E,1/E),N.translate(c.x1*E,c.y1*E);else{var H=r.pan(),_={x:H.x*E,y:H.y*E};E*=r.zoom(),N.translate(_.x,_.y),N.scale(E,E),this.drawElements(N,D),N.scale(1/E,1/E),N.translate(-_.x,-_.y)}a.bg&&(N.globalCompositeOperation="destination-over",N.fillStyle=a.bg,N.rect(0,0,g,b),N.fill())}return P};function MQ(a,r){for(var u=atob(a),c=new ArrayBuffer(u.length),d=new Uint8Array(c),g=0;g<u.length;g++)d[g]=u.charCodeAt(g);return new Blob([c],{type:r})}function zD(a){var r=a.indexOf(",");return a.substr(r+1)}function HD(a,r,u){var c=function(){return r.toDataURL(u,a.quality)};switch(a.output){case"blob-promise":return new Mv(function(d,g){try{r.toBlob(function(b){b!=null?d(b):g(new Error("`canvas.toBlob()` sent a null value in its callback"))},u,a.quality)}catch(b){g(b)}});case"blob":return MQ(zD(c()),u);case"base64":return zD(c());case"base64uri":default:return c()}}C1.png=function(a){return HD(a,this.bufferCanvasImage(a),"image/png")},C1.jpg=function(a){return HD(a,this.bufferCanvasImage(a),"image/jpeg")};var _D={};_D.nodeShapeImpl=function(a,r,u,c,d,g,b){switch(a){case"ellipse":return this.drawEllipsePath(r,u,c,d,g);case"polygon":return this.drawPolygonPath(r,u,c,d,g,b);case"round-polygon":return this.drawRoundPolygonPath(r,u,c,d,g,b);case"roundrectangle":case"round-rectangle":return this.drawRoundRectanglePath(r,u,c,d,g);case"cutrectangle":case"cut-rectangle":return this.drawCutRectanglePath(r,u,c,d,g);case"bottomroundrectangle":case"bottom-round-rectangle":return this.drawBottomRoundRectanglePath(r,u,c,d,g);case"barrel":return this.drawBarrelPath(r,u,c,d,g)}};var OQ=GD,dr=GD.prototype;dr.CANVAS_LAYERS=3,dr.SELECT_BOX=0,dr.DRAG=1,dr.NODE=2,dr.BUFFER_COUNT=3,dr.TEXTURE_BUFFER=0,dr.MOTIONBLUR_BUFFER_NODE=1,dr.MOTIONBLUR_BUFFER_DRAG=2;function GD(a){var r=this;r.data={canvases:new Array(dr.CANVAS_LAYERS),contexts:new Array(dr.CANVAS_LAYERS),canvasNeedsRedraw:new Array(dr.CANVAS_LAYERS),bufferCanvases:new Array(dr.BUFFER_COUNT),bufferContexts:new Array(dr.CANVAS_LAYERS)};var u="-webkit-tap-highlight-color",c="rgba(0,0,0,0)";r.data.canvasContainer=document.createElement("div");var d=r.data.canvasContainer.style;r.data.canvasContainer.style[u]=c,d.position="relative",d.zIndex="0",d.overflow="hidden";var g=a.cy.container();g.appendChild(r.data.canvasContainer),g.style[u]=c;var b={"-webkit-user-select":"none","-moz-user-select":"-moz-none","user-select":"none","-webkit-tap-highlight-color":"rgba(0,0,0,0)","outline-style":"none"};gU()&&(b["-ms-touch-action"]="none",b["touch-action"]="none");for(var y=0;y<dr.CANVAS_LAYERS;y++){var k=r.data.canvases[y]=document.createElement("canvas");r.data.contexts[y]=k.getContext("2d"),Object.keys(b).forEach(function(Ge){k.style[Ge]=b[Ge]}),k.style.position="absolute",k.setAttribute("data-id","layer"+y),k.style.zIndex=String(dr.CANVAS_LAYERS-y),r.data.canvasContainer.appendChild(k),r.data.canvasNeedsRedraw[y]=!1}r.data.topCanvas=r.data.canvases[0],r.data.canvases[dr.NODE].setAttribute("data-id","layer"+dr.NODE+"-node"),r.data.canvases[dr.SELECT_BOX].setAttribute("data-id","layer"+dr.SELECT_BOX+"-selectbox"),r.data.canvases[dr.DRAG].setAttribute("data-id","layer"+dr.DRAG+"-drag");for(var y=0;y<dr.BUFFER_COUNT;y++)r.data.bufferCanvases[y]=document.createElement("canvas"),r.data.bufferContexts[y]=r.data.bufferCanvases[y].getContext("2d"),r.data.bufferCanvases[y].style.position="absolute",r.data.bufferCanvases[y].setAttribute("data-id","buffer"+y),r.data.bufferCanvases[y].style.zIndex=String(-y-1),r.data.bufferCanvases[y].style.visibility="hidden";r.pathsEnabled=!0;var E=cs(),C=function(me){return{x:(me.x1+me.x2)/2,y:(me.y1+me.y2)/2}},T=function(me){return{x:-me.w/2,y:-me.h/2}},P=function(me){var Ve=me[0]._private,Ke=Ve.oldBackgroundTimestamp===Ve.backgroundTimestamp;return!Ke},N=function(me){return me[0]._private.nodeKey},D=function(me){return me[0]._private.labelStyleKey},H=function(me){return me[0]._private.sourceLabelStyleKey},_=function(me){return me[0]._private.targetLabelStyleKey},B=function(me,Ve,Ke,at,ft){return r.drawElement(me,Ve,Ke,!1,!1,ft)},$=function(me,Ve,Ke,at,ft){return r.drawElementText(me,Ve,Ke,at,"main",ft)},F=function(me,Ve,Ke,at,ft){return r.drawElementText(me,Ve,Ke,at,"source",ft)},W=function(me,Ve,Ke,at,ft){return r.drawElementText(me,Ve,Ke,at,"target",ft)},Q=function(me){return me.boundingBox(),me[0]._private.bodyBounds},X=function(me){return me.boundingBox(),me[0]._private.labelBounds.main||E},K=function(me){return me.boundingBox(),me[0]._private.labelBounds.source||E},ee=function(me){return me.boundingBox(),me[0]._private.labelBounds.target||E},Z=function(me,Ve){return Ve},ae=function(me){return C(Q(me))},oe=function(me,Ve,Ke){var at=me?me+"-":"";return{x:Ve.x+Ke.pstyle(at+"text-margin-x").pfValue,y:Ve.y+Ke.pstyle(at+"text-margin-y").pfValue}},J=function(me,Ve,Ke){var at=me[0]._private.rscratch;return{x:at[Ve],y:at[Ke]}},fe=function(me){return oe("",J(me,"labelX","labelY"),me)},se=function(me){return oe("source",J(me,"sourceLabelX","sourceLabelY"),me)},pe=function(me){return oe("target",J(me,"targetLabelX","targetLabelY"),me)},he=function(me){return T(Q(me))},de=function(me){return T(K(me))},ke=function(me){return T(ee(me))},Pe=function(me){var Ve=X(me),Ke=T(X(me));if(me.isNode()){switch(me.pstyle("text-halign").value){case"left":Ke.x=-Ve.w;break;case"right":Ke.x=0;break}switch(me.pstyle("text-valign").value){case"top":Ke.y=-Ve.h;break;case"bottom":Ke.y=0;break}}return Ke},Ae=r.data.eleTxrCache=new E1(r,{getKey:N,doesEleInvalidateKey:P,drawElement:B,getBoundingBox:Q,getRotationPoint:ae,getRotationOffset:he,allowEdgeTxrCaching:!1,allowParentTxrCaching:!1}),Te=r.data.lblTxrCache=new E1(r,{getKey:D,drawElement:$,getBoundingBox:X,getRotationPoint:fe,getRotationOffset:Pe,isVisible:Z}),Oe=r.data.slbTxrCache=new E1(r,{getKey:H,drawElement:F,getBoundingBox:K,getRotationPoint:se,getRotationOffset:de,isVisible:Z}),ze=r.data.tlbTxrCache=new E1(r,{getKey:_,drawElement:W,getBoundingBox:ee,getRotationPoint:pe,getRotationOffset:ke,isVisible:Z}),We=r.data.lyrTxrCache=new PD(r);r.onUpdateEleCalcs(function(me,Ve){Ae.invalidateElements(Ve),Te.invalidateElements(Ve),Oe.invalidateElements(Ve),ze.invalidateElements(Ve),We.invalidateElements(Ve);for(var Ke=0;Ke<Ve.length;Ke++){var at=Ve[Ke]._private;at.oldBackgroundTimestamp=at.backgroundTimestamp}});var $e=function(me){for(var Ve=0;Ve<me.length;Ve++)We.enqueueElementRefinement(me[Ve].ele)};Ae.onDequeue($e),Te.onDequeue($e),Oe.onDequeue($e),ze.onDequeue($e)}dr.redrawHint=function(a,r){var u=this;switch(a){case"eles":u.data.canvasNeedsRedraw[dr.NODE]=r;break;case"drag":u.data.canvasNeedsRedraw[dr.DRAG]=r;break;case"select":u.data.canvasNeedsRedraw[dr.SELECT_BOX]=r;break}};var AQ=typeof Path2D<"u";dr.path2dEnabled=function(a){if(a===void 0)return this.pathsEnabled;this.pathsEnabled=!!a},dr.usePaths=function(){return AQ&&this.pathsEnabled},dr.setImgSmoothing=function(a,r){a.imageSmoothingEnabled!=null?a.imageSmoothingEnabled=r:(a.webkitImageSmoothingEnabled=r,a.mozImageSmoothingEnabled=r,a.msImageSmoothingEnabled=r)},dr.getImgSmoothing=function(a){return a.imageSmoothingEnabled!=null?a.imageSmoothingEnabled:a.webkitImageSmoothingEnabled||a.mozImageSmoothingEnabled||a.msImageSmoothingEnabled},dr.makeOffscreenCanvas=function(a,r){var u;return(typeof OffscreenCanvas>"u"?"undefined":ma(OffscreenCanvas))!=="undefined"?u=new OffscreenCanvas(a,r):(u=document.createElement("canvas"),u.width=a,u.height=r),u},[jD,jc,Nl,bS,td,qv,As,Hf,C1,_D].forEach(function(a){en(dr,a)});var RQ=[{name:"null",impl:hD},{name:"base",impl:CD},{name:"canvas",impl:OQ}],BQ=[{type:"layout",extensions:FX},{type:"renderer",extensions:RQ}],$D={},YD={};function FD(a,r,u){var c=u,d=function(ee){pr("Can not register `"+r+"` for `"+a+"` since `"+ee+"` already exists in the prototype and can not be overridden")};if(a==="core"){if(m1.prototype[r])return d(r);m1.prototype[r]=u}else if(a==="collection"){if(no.prototype[r])return d(r);no.prototype[r]=u}else if(a==="layout"){for(var g=function(ee){this.options=ee,u.call(this,ee),ar(this._private)||(this._private={}),this._private.cy=ee.cy,this._private.listeners=[],this.createEmitter()},b=g.prototype=Object.create(u.prototype),y=[],k=0;k<y.length;k++){var E=y[k];b[E]=b[E]||function(){return this}}b.start&&!b.run?b.run=function(){return this.start(),this}:!b.start&&b.run&&(b.start=function(){return this.run(),this});var C=u.prototype.stop;b.stop=function(){var K=this.options;if(K&&K.animate){var ee=this.animations;if(ee)for(var Z=0;Z<ee.length;Z++)ee[Z].stop()}return C?C.call(this):this.emit("layoutstop"),this},b.destroy||(b.destroy=function(){return this}),b.cy=function(){return this._private.cy};var T=function(ee){return ee._private.cy},P={addEventFields:function(ee,Z){Z.layout=ee,Z.cy=T(ee),Z.target=ee},bubble:function(){return!0},parent:function(ee){return T(ee)}};en(b,{createEmitter:function(){return this._private.emitter=new $w(P,this),this},emitter:function(){return this._private.emitter},on:function(ee,Z){return this.emitter().on(ee,Z),this},one:function(ee,Z){return this.emitter().one(ee,Z),this},once:function(ee,Z){return this.emitter().one(ee,Z),this},removeListener:function(ee,Z){return this.emitter().removeListener(ee,Z),this},removeAllListeners:function(){return this.emitter().removeAllListeners(),this},emit:function(ee,Z){return this.emitter().emit(ee,Z),this}}),Cr.eventAliasesOn(b),c=g}else if(a==="renderer"&&r!=="null"&&r!=="base"){var N=qD("renderer","base"),D=N.prototype,H=u,_=u.prototype,B=function(){N.apply(this,arguments),H.apply(this,arguments)},$=B.prototype;for(var F in D){var W=D[F],Q=_[F]!=null;if(Q)return d(F);$[F]=W}for(var X in _)$[X]=_[X];D.clientFunctions.forEach(function(K){$[K]=$[K]||function(){Hi("Renderer does not implement `renderer."+K+"()` on its prototype")}}),c=B}else if(a==="__proto__"||a==="constructor"||a==="prototype")return Hi(a+" is an illegal type to be registered, possibly lead to prototype pollutions");return DP({map:$D,keys:[a,r],value:c})}function qD(a,r){return jP({map:$D,keys:[a,r]})}function zQ(a,r,u,c,d){return DP({map:YD,keys:[a,r,u,c],value:d})}function HQ(a,r,u,c){return jP({map:YD,keys:[a,r,u,c]})}var mS=function(){if(arguments.length===2)return qD.apply(null,arguments);if(arguments.length===3)return FD.apply(null,arguments);if(arguments.length===4)return HQ.apply(null,arguments);if(arguments.length===5)return zQ.apply(null,arguments);Hi("Invalid extension access syntax")};m1.prototype.extension=mS,BQ.forEach(function(a){a.extensions.forEach(function(r){FD(a.type,r.name,r.impl)})});var VD=function a(){if(!(this instanceof a))return new a;this.length=0},nd=VD.prototype;nd.instanceString=function(){return"stylesheet"},nd.selector=function(a){var r=this.length++;return this[r]={selector:a,properties:[]},this},nd.css=function(a,r){var u=this.length-1;if(Yt(a))this[u].properties.push({name:a,value:r});else if(ar(a))for(var c=a,d=Object.keys(c),g=0;g<d.length;g++){var b=d[g],y=c[b];if(y!=null){var k=ko.properties[b]||ko.properties[Cw(b)];if(k!=null){var E=k.name,C=y;this[u].properties.push({name:E,value:C})}}}return this},nd.style=nd.css,nd.generateStyle=function(a){var r=new ko(a);return this.appendToStyle(r)},nd.appendToStyle=function(a){for(var r=0;r<this.length;r++){var u=this[r],c=u.selector,d=u.properties;a.selector(c);for(var g=0;g<d.length;g++){var b=d[g];a.css(b.name,b.value)}}return a};var _Q="3.27.0",rd=function(r){if(r===void 0&&(r={}),ar(r))return new m1(r);if(Yt(r))return mS.apply(mS,arguments)};rd.use=function(a){var r=Array.prototype.slice.call(arguments,1);return r.unshift(rd),a.apply(null,r),this},rd.warnings=function(a){return zP(a)},rd.version=_Q,rd.stylesheet=rd.Stylesheet=VD;var GQ=rd;const _f=kv(GQ);var WD={exports:{}},yS={exports:{}},UD;function $Q(){return UD||(UD=1,function(a){(function(){var r;typeof window<"u"?(r=window,r.document):r={Array:function(){}};function u(){}function c(){}function d(){}function g(){}function b(){}function y(){}function k(){}function E(){}function C(){}function T(){}function P(){}function N(){}function D(){}function H(){}function _(){}function B(){}function $(){}function F(){}function W(){}function Q(){}function X(){}function K(){}function ee(){}function Z(){}function ae(){}function oe(){}function J(){}function fe(){}function se(){}function pe(){}function he(){}function de(){}function ke(){}function Pe(){}function Ae(){}function Te(){}function Oe(){}function ze(){}function We(){}function $e(){}function Ge(){}function me(){}function Ve(){}function Ke(){}function at(){}function ft(){}function tn(){}function gn(){}function mt(){}function ht(){}function Rt(){}function Lt(){}function yt(){}function Mt(){}function In(){}function Pn(){}function Vt(){}function sr(){}function Qe(){}function ne(){}function Ie(){}function Je(){}function Ye(){}function Fe(){}function bn(){}function tt(){}function Gt(){}function tr(){}function vr(){}function Dn(){}function rr(){}function wn(){}function jn(){}function ci(){}function aa(){}function fs(){}function hs(){}function oa(){}function zo(){}function Ha(){}function au(){}function Bu(){}function Il(){}function Nc(){}function Ml(){}function ad(){}function Ic(){}function ao(){}function Sa(){}function oo(){}function od(){}function Rs(){}function T1(){}function lm(){}function fm(){}function hm(){}function dm(){}function vm(){}function gm(){}function bm(){}function Gf(){}function Wv(){}function sd(){}function L1(){}function P1(){}function pm(){}function so(){}function Uv(){}function D1(){}function ud(){}function ds(){}function wm(){}function i9(){}function a9(){}function xS(){}function o9(){}function s9(){}function u9(){}function c9(){}function l9(){}function f9(){}function mm(){}function ym(){}function h9(){PM()}function dee(){Que()}function d9(){KR()}function v9(){VM()}function g9(){x3()}function b9(){Zj()}function p9(){Xj()}function w9(){yN()}function m9(){EO()}function y9(){xM()}function k9(){M8()}function E9(){TM()}function S9(){LM()}function C9(){CB()}function x9(){qC()}function Mc(){Sy(this)}function T9(){}function Se(){gy(this)}function km(){}function L9(e){this.a=e}function P9(e){this.a=e}function j1(e){this.a=e}function D9(e){this.a=e}function j9(e){this.a=e}function N9(e){this.a=e}function I9(e){this.a=e}function Em(e){this.a=e}function M9(e){this.a=e}function Sm(e){this.b=e}function TS(e){this.a=e}function O9(e){this.a=e}function A9(e){this.a=e}function R9(e){this.a=e}function B9(e){this.a=e}function z9(e){this.a=e}function H9(e){this.a=e}function _9(e){this.a=e}function LS(e){this.a=e}function Cm(e){this.a=e}function xm(e){this.a=e}function G9(e){this.a=e}function $9(e){this.a=e}function PS(e){this.a=e}function N1(e){this.a=e}function Tm(e){this.e=e}function cd(e){this.a=e}function Y9(e){this.a=e}function $f(e){this.a=e}function DS(e){this.a=e}function F9(e){this.a=e}function q9(e){this.a=e}function Lm(e){this.a=e}function V9(e){this.a=e}function W9(e){this.a=e}function U9(e){this.a=e}function K9(e){this.a=e}function Z9(e){this.a=e}function X9(e){this.a=e}function ld(e){this.a=e}function Q9(e){this.a=e}function J9(e){this.a=e}function ej(e){this.a=e}function tj(e){this.a=e}function nj(e){this.a=e}function rj(e){this.a=e}function ij(e){this.a=e}function aj(e){this.c=e}function jS(e){this.a=e}function oj(e){this.a=e}function sj(e){this.a=e}function uj(e){this.a=e}function cj(e){this.a=e}function lj(e){this.a=e}function NS(e){this.a=e}function fj(e){this.a=e}function Ut(e){this.a=e}function ou(e){this.a=e}function Yf(e){this.d=e}function Wt(e){this.a=e}function Zt(e){this.a=e}function Kv(e){this.a=e}function Zv(e){this.a=e}function IS(e){this.b=e}function I1(e){this.a=e}function M1(e){this.a=e}function M(e){this.c=e}function uo(e){this.a=e}function hj(e){this.a=e}function dj(e){this.a=e}function Xv(e){this.b=e}function fd(e){this.b=e}function MS(e){this.c=e}function OS(e){this.a=e}function AS(e){this.a=e}function O1(e){this.a=e}function RS(){this.a=[]}function BS(e){this.a=e}function Pm(e){this.a=e}function vj(e){e.b=e.a}function gj(e){e.c=e.d.d}function _a(e,t){e.g=t}function zS(e,t){e.k=t}function vee(e,t){e.a=t}function gee(e,t){e.b=t}function bee(e,t){e.e.k=t}function pee(e){return e.a}function wee(e){return e.a}function mee(e){return e.a}function yee(e){return e.a}function kee(e){return e.a}function Eee(){return null}function See(){return null}function Dm(){this.c=this}function HS(){Sy(this)}function $t(){ho(this)}function bj(e){Bse(this,e)}function Cee(e){pI(),Cle(e)}function pj(e){e.a=new Ur}function Qv(e,t){e.a=t-e.a}function Jv(e,t){e.b=t-e.b}function Ff(){Ff=c}function jm(){jm=c}function xee(){throw new Fn}function Tee(){throw new Fn}function Lee(){throw new Fn}function Pee(){throw new Fn}function Dee(){throw new Fn}function jee(){throw new Fn}function Nee(){throw new Fn}function Iee(){throw new Fn}function Mee(){throw new Fn}function wj(){this.a=new Se}function mj(){this.a=new Se}function yj(){this.a=new Se}function kj(){this.a=new Se}function Nm(){this.a=new Se}function Ol(){this.a=new so}function hd(){this.a=new nA}function Ej(){this.b=new Se}function xi(){Ur.call(this)}function Sj(){iy.call(this)}function _S(){T9.call(this)}function A1(){T9.call(this)}function GS(){Se.call(this)}function Cj(){Mc.call(this)}function dd(){Mc.call(this)}function $S(){Mc.call(this)}function xj(){Mc.call(this)}function eg(){Mc.call(this)}function vd(){Mc.call(this)}function Fn(){Mc.call(this)}function YS(){this.f=new Se}function Tj(){this.d=new Se}function Lj(){this.a=new Yr}function Pj(){throw new Fn}function Dj(){throw new Fn}function jj(){throw new Fn}function Nj(){throw new Fn}function Oee(){throw new Fn}function FS(){this.a=new Se}function qS(){qS=c,Dp=new d}function mn(){mn=c}function tg(){tg=c,Ak=new g}function Ij(){Ij=c,e_=new E}function Mj(){Mj=c,t_=new lO}function VS(){VS=c,CT=new y}function Oj(){Oj=c,a_=new D}function WS(){WS=c,lG=new Z}function Aj(){Aj=c,fG=new fe}function US(e){return Gs(e),e}function KS(e){gr(),this.a=e}function ZS(e){Ta(),this.a=e}function Rj(e){Ta(),this.a=e}function Bj(e){Ta(),this.a=e}function zj(e,t){e.i=t,t.f=e}function Aee(e,t){vn(e.b,t)}function gd(){Mc.call(this)}function Hj(){Mc.call(this)}function sa(){Mc.call(this)}function _j(){kO.call(this)}function Gj(){kO.call(this)}function $j(){$S.call(this)}function Yj(){dd.call(this)}function Bs(e){oN.call(this,e)}function Ree(e){eM.call(this,e)}function Bee(e){eM.call(this,e)}function XS(e){$I.call(this,e)}function Fj(e){wM.call(this,e)}function QS(e){DO.call(this,e)}function JS(e){l4.call(this,e)}function ng(e){md.call(this,e)}function e4(e){$I.call(this,e)}function zee(e,t){e.a.W().nb(t)}function Ho(e,t){return e===t}function Im(e){return e?e.a:0}function vs(e){return e?e.d:0}function Mm(e){return e?e.j:0}function qj(e){Bs.call(this,e)}function R1(e){Bs.call(this,e)}function Co(e){Bs.call(this,e)}function Om(e){Co.call(this,e)}function Al(){xm.call(this,{})}function Vj(e){bj.call(this,e)}function Wj(e){bj.call(this,e)}function Hee(e,t,n){Nie(e,t.b,n)}function _ee(e,t,n){ire(e.c,t,n)}function Gee(e,t,n){e.b.Fc(t,n)}function t4(e){tj.call(this,e)}function Am(e){tj.call(this,e)}function Uj(){this.a=($n(),Mo)}function Kj(){this.a=($n(),Mo)}function Yr(){this.a=new $t}function n4(){this.a=new VN}function r4(){r4=c,aL=new se}function Zj(){Zj=c,yG=new ze}function Xj(){Xj=c,CG=new vr}function Pt(e){return yn(),e}function ge(e){return ur(e),e}function $ee(e){oN.call(this,e)}function _o(e){Bs.call(this,e)}function nn(e){Bs.call(this,e)}function B1(e){this.c=oh(vt(e))}function Fr(){this.a=0,this.b=0}function Ur(){NI(this),Hs(this)}function Qj(){Ik==null&&(Ik=[])}function z1(e){e.b=null,e.c=0}function Yee(e,t){return e.b=t,e}function Jj(e,t){return e.c=t,e}function Rm(e,t){return e.f=t,e}function eN(e,t){return e.g=t,e}function tN(e,t){return e.a=t,e}function nN(e,t){return e.f=t,e}function Fee(e,t){return e.k=t,e}function qee(e,t){return e.e-t.e}function Vee(e,t){return e.d-t.d}function Wee(e){return e<0?-e:e}function rN(e){return isNaN(e)}function Uee(e){return new Cm(e)}function Kee(e){return new $c(e)}function iN(e){Bs.call(this,e)}function zu(e){Bs.call(this,e)}function aN(e){Bs.call(this,e)}function rg(e){Bs.call(this,e)}function qf(e){Bs.call(this,e)}function oN(e){this.f=e,Sy(this)}function sN(){this.b=0,this.a=0}function bd(){bd=c}function uN(){uN=c,hY=lse()}function Zee(e,t,n){e.set(t,n)}function Xee(e,t,n){e.set(t,n)}function cN(e,t){Bd(),vT.dc(e,t)}function ie(e,t){return OO(e,t)}function lN(e,t){return e.a.B(t)}function Vf(e,t){return e.g[t.e]}function Bm(e,t){return e.i[t.e]}function zm(e,t){return e.j[t.e]}function Wf(e,t){return e.n[t.e]}function Uf(e,t){return e.o[t.e]}function Qee(e,t){return t in e.a}function Jee(e,t){return e.b-t.b}function ete(e,t){return e.d-t.d}function tte(e,t){return e.i-t.i}function je(e,t){return e>t?e:t}function fN(e,t){return e>t?e:t}function ti(e,t){return e>t?e:t}function Xt(e,t){return e<t?e:t}function nte(e,t){return e<t?e:t}function Hu(e,t){return e<t?e:t}function _u(e){return!!e&&e.b}function hN(e){dne(e,e.length)}function rte(e){Sne(e,e.length)}function ig(e){Cne(e,e.length)}function ite(e){_o.call(this,e)}function pd(e){NS.call(this,e)}function ate(e){oj.call(this,e)}function H1(e){nn.call(this,e)}function Rl(e){Xv.call(this,e)}function dN(e){Rl.call(this,e)}function i4(e){u0.call(this,e)}function wd(){NS.call(this,"")}function Hm(){NS.call(this,"")}function _1(e){return Gl(e),e.n}function vN(e){return Gl(e),e.j}function Gi(e){return e.e&&e.e()}function gN(e,t){return e.a.sb(t)}function ote(e,t){return e||vt(t)}function bN(e,t){return z(e.a,t)}function pN(e,t){return fne(e.a,t)}function ste(e,t){return T2(e,t)<0}function G1(e){return mn(),""+e}function wN(e){return e?e.d:null}function Gu(e){Ta(),this.a=vt(e)}function mN(){mA(),this.g=new m4}function yN(){yN=c,xG=(Yi(),Zs)}function ute(){Ip!=0&&(Ip=0),Mp=-1}function ag(e){return Qse(e,e.d),e}function Kf(e,t){return e.a.d=t,e}function Zf(e,t){return e.a.a=t,e}function Xf(e,t){return e.a.c=t,e}function Qf(e,t){return e.a.f=t,e}function kN(e,t){return e.a.f=t,e}function a4(e,t){return e.a.b=t,e}function o4(e,t,n){e.splice(t,n)}function cte(e,t){return cC(t,e)}function EN(e,t){return e.b.t(t)}function SN(e,t){return e.c.t(t)}function Oc(e,t){return e.a.R(t)}function s4(e,t){return e.get(t)}function _m(e,t){return e.get(t)}function lte(e,t){return e.test(t)}function ni(e){return e<=0?0-e:e}function CN(e){return mn(),""+e}function fte(e){return mn(),""+e}function Gm(e){this.a=new ty(e)}function xN(e){this.a=new I3(e)}function TN(e){this.a=f(vt(e),19)}function $m(e){this.b=f(vt(e),57)}function LN(e){this.d=f(vt(e),56)}function sn(e,t){this.d=e,this.e=t}function Ym(e,t){this.b=e,this.a=t}function PN(e,t){this.b=e,this.a=t}function u4(e,t){this.b=e,this.c=t}function c4(e,t){this.a=e,this.b=t}function Fm(e,t){this.a=e,this.b=t}function DN(e,t){this.a=e,this.f=t}function qm(e,t){sn.call(this,e,t)}function jN(e,t){sn.call(this,e,t)}function NN(e,t){sn.call(this,e,t)}function IN(e,t){this.b=e,this.c=t}function MN(e,t){this.e=e,this.c=t}function hte(e,t){this.a=e,this.b=t}function ON(e,t){this.a=e,this.b=t}function AN(e,t){sn.call(this,e,t)}function RN(e,t){this.a=e,this.b=t}function BN(e){this.a=f(vt(e),20)}function md(e){this.a=f(vt(e),20)}function zN(e){this.a=f(vt(e),57)}function l4(e){this.b=f(vt(e),35)}function ot(e,t){this.a=e,this.b=t}function wr(e,t){this.a=e,this.b=t}function yd(e,t){sn.call(this,e,t)}function f4(e,t){return dh(e.b,t)}function dte(e){return tO(),e?i_:r_}function Bl(e){return e==Oa||e==Vi}function Vm(e){return e==Ks||e==Ps}function HN(e,t){mr(e,t,e.a,e.a.a)}function Wm(e,t){mr(e,t,e.c.b,e.c)}function og(e,t){sn.call(this,e,t)}function $1(e,t){sn.call(this,e,t)}function Y1(e,t){sn.call(this,e,t)}function kd(e,t){sn.call(this,e,t)}function Um(e,t){sn.call(this,e,t)}function Ac(e,t){sn.call(this,e,t)}function sg(e,t){sn.call(this,e,t)}function Ed(e,t){sn.call(this,e,t)}function Km(e,t){sn.call(this,e,t)}function ug(e,t){sn.call(this,e,t)}function F1(e,t){sn.call(this,e,t)}function q1(e,t){sn.call(this,e,t)}function Zm(e,t){sn.call(this,e,t)}function Xm(e,t){sn.call(this,e,t)}function h4(e,t){this.b=e,this.a=t}function Jf(e,t){this.c=e,this.d=t}function d4(e,t){this.a=e,this.c=t}function _N(e,t){this.e=e,this.c=t}function GN(e,t){this.e=e,this.d=t}function V1(e,t){sn.call(this,e,t)}function Sd(e,t){sn.call(this,e,t)}function $N(e,t){this.a=e,this.b=t}function YN(e,t){this.a=e,this.b=t}function Qm(e,t){sn.call(this,e,t)}function rn(e,t){sn.call(this,e,t)}function zl(e,t){sn.call(this,e,t)}function v4(e,t){sn.call(this,e,t)}function Cd(e,t){sn.call(this,e,t)}function g4(e,t){sn.call(this,e,t)}function Jm(e,t){sn.call(this,e,t)}function b4(e,t){sn.call(this,e,t)}function vte(e,t){return qo(e.c,t)}function ey(e){return e.b<e.d.Y()}function W1(e){return e.d.c+e.e.c}function FN(e,t){return e.c.ab(t)}function gte(e,t){return e.b.kb(t)}function bte(e,t){return e.b.lb(t)}function pte(e,t){return e.b.pb(t)}function p4(e,t){return e.b.kb(t)}function qN(e,t){return e.b.lb(t)}function wte(e){return e==hc||e==ml}function mte(e){return e==hc||e==wl}function gs(e){return e!=Ao&&e!=cc}function yte(e){return Na(e),e.d.Y()}function eh(e){this.c=e,$A(this)}function ty(e){BR.call(this,e,0)}function VN(){I3.call(this,null)}function cg(){Bee.call(this,new $t)}function WN(){NN.call(this,"KEY",0)}function ny(e){lh(),wM.call(this,e)}function kte(e){r.clearTimeout(e)}function UN(e){return e.Vb(e.b.H())}function w4(e){this.a=f(vt(e),144)}function m4(){this.b=(On(),new $t)}function Hl(){Hl=c,Cf=new f9}function ry(){ry=c,E5=new s9}function KN(){KN=c,fY=new l9}function U1(){U1=c,UH=new B1(",")}function ZN(){ZN=c}function iy(){Ya.call(this,0,0,0,0)}function y4(e,t){sn.call(this,e,t)}function lg(e,t){sn.call(this,e,t)}function k4(e,t){sn.call(this,e,t)}function E4(e,t){sn.call(this,e,t)}function XN(e){rh(),Zn.call(this,e)}function S4(e,t){sn.call(this,e,t)}function QN(e,t){this.c=e,this.b=t}function JN(e,t){this.a=e,this.b=t}function eI(e,t){this.b=e,this.d=t}function C4(e,t){sn.call(this,e,t)}function xd(e,t){sn.call(this,e,t)}function ay(e,t){sn.call(this,e,t)}function fg(e,t){sn.call(this,e,t)}function Td(e,t){sn.call(this,e,t)}function $u(e,t){sn.call(this,e,t)}function oy(e,t){sn.call(this,e,t)}function x4(e,t){sn.call(this,e,t)}function hg(e,t){sn.call(this,e,t)}function sy(e,t){sn.call(this,e,t)}function uy(e,t){sn.call(this,e,t)}function cy(e,t){sn.call(this,e,t)}function dg(e,t,n){e.splice(t,0,n)}function vg(e,t,n){e.g[t.e][t.e]=n}function tI(e,t){e.a=t,e.g=0,e.f=0}function zs(e){return e.a=0,e.b=0,e}function ea(e){return ji(e.b.c,e,0)}function K1(e){return Math.ceil(e)}function nI(e){return Math.sqrt(e)}function rI(e,t){return _m(e.a,t)}function ly(e,t){return!!kC(e,t)}function fy(e,t){mne(e,e.length,t)}function Z1(e,t){sn.call(this,e,t)}function X1(e,t){this.b=e,this.a=t}function Q1(e,t){this.d=e,this.e=t}function iI(){jy(),this.c=new Yr}function aI(){ip(),this.a=new Yr}function oI(){return uN(),new hY}function th(e){if(!e)throw new dd}function J1(e){if(!e)throw new eg}function e0(e){if(!e)throw new sa}function sI(){this.b=(On(),new $t)}function uI(){this.b=(On(),new $t)}function qn(e){this.a=e.a,this.b=e.b}function He(e){return e??null}function li(e){return e?e.zb():null}function cI(e,t){return e.Nb().sb(t)}function lI(e,t){return e.a.a.a.U(t)}function hy(e,t){return fae(e.mb(),t)}function Ete(e,t){return yr(t.b,e.b)}function Ste(e,t){return yr(t.k,e.k)}function T4(e){return Math.floor(e)}function Rc(e,t){return e.a+=""+t,e}function Yu(e,t){return e.a+=""+t,e}function co(e,t){return e.a+=""+t,e}function t0(e){return bg(e==null),e}function L4(e){return e.d&&X2(e),e.a}function dy(e){return e.d&&X2(e),e.b}function vy(e){return e.d&&X2(e),e.c}function fI(e,t){return Le(e.a,t),t}function hI(e){ho(this),lR(this,e)}function dI(e){this.c=e,this.e=!1}function vI(){jN.call(this,"OPEN",0)}function gI(){AN.call(this,"SIZE",0)}function Cte(){oj.call(this,"UTF-8")}function bI(){bI=c,W6={},vw={}}function pI(){pI=c,gf=new nt(yH,0)}function Ca(e){return vt(e),new nh(e)}function gg(e){return mn(),e.length}function xte(e,t){return Jre(e.a,t.a)}function Tte(e,t){return TI(e.a,t.a)}function wI(e,t){return e==t?0:e?1:-1}function mI(e){return vs(e.e)-vs(e.g)}function Ga(e){return new ot(e.a,e.b)}function Lte(e){return new ot(e.d,e.e)}function gy(e){e.c=ve(Ze,Me,1,0,4,1)}function yI(){NN.call(this,"VALUE",1)}function P4(e){_4.call(this),this.a=e}function kI(e){this.a=new az,this.b=e}function nh(e){this.a=e,Dm.call(this)}function EI(e){this.a=e,Dm.call(this)}function SI(){ZR(),this.d=(hu(),dw)}function Pte(e){if(!e)throw new xj}function _l(e){if(!e)throw new eg}function CI(e){if(!e)throw new dd}function bg(e){if(!e)throw new Cj}function ut(e){if(!e)throw new sa}function $i(){BS.call(this,new Md)}function xI(){jN.call(this,"CLOSED",1)}function Go(e){DO.call(this,new QS(e))}function D4(e,t){return++e.d,Tr(e,t)}function Dte(e,t){return Iy(e.a,0,t)}function jte(e,t){return yr(e.a,t.a)}function Ld(e){return Fl(e.b.mb(),e.a)}function $o(e){return Dy(e.a.mb(),e.b)}function by(e,t){return t==e.c?e.d:e.c}function Nte(e,t){return e<t?-1:e>t?1:0}function TI(e,t){return e<t?-1:e>t?1:0}function py(e){return e!=null?Ko(e):0}function LI(e){this.a=oI(),this.b=e}function PI(e){this.a=oI(),this.b=e}function DI(e){this.a=e,n3.call(this,e)}function jI(){N4(),this.b=new Q9(this)}function Yo(){Yo=c,wT=zte(new B1(", "))}function xo(){xo=c,Ua=new vI,Np=new xI}function _n(){_n=c,QH=new P,mT=new N}function n0(){n0=c,Rk=new WN,yT=new yI}function r0(){r0=c,Bk=new gI,ET=new _I}function rh(){rh=c,u_=new _,c_=new B}function j4(e){e.g=new Se,e.b=new Se}function NI(e){e.a=new mm,e.c=new mm}function N4(){N4=c,MG=new bm,IG=new MM}function II(){qm.call(this,"IS_NULL",2)}function MI(){Z1.call(this,"Head",1)}function OI(){Z1.call(this,"Tail",3)}function I4(e,t){aC.call(this,e,t,null)}function M4(e,t){yh(e,0,e.length,t)}function pg(e,t){return Le(t.a,e.a),e.a}function Fo(e,t){return e.a*=t,e.b*=t,e}function AI(e,t){gr(),this.a=e,this.b=t}function Ite(e,t){return e.a[t.d.k][t.k]}function xa(e,t){return e.a[t.d.k][t.k]}function Mte(e,t){return Ky(e.b,t.mc())}function RI(e,t){return wN(Cae(e.a,t))}function BI(e,t){return wN(xae(e.a,t))}function Or(e,t){return f(Ia(e.a,t),20)}function xe(e,t){return e!=null&&$2(e,t)}function Bc(e){return e.a<e.c.c.length}function i0(e){return e.a<e.c.a.length}function Ote(e,t){return yr(e.i.a,t.i.a)}function Ate(e,t){return e.i.b=(ur(t),t)}function Rte(e,t){return e.i.b=(ur(t),t)}function wy(e,t){return e.a.eb(t)!=null}function my(e,t,n){return e.g[t.e][n.e]}function zI(e){return yn(),mn(),""+e}function HI(){Z1.call(this,"Range",2)}function _I(){AN.call(this,"DISTINCT",1)}function GI(){qm.call(this,"NOT_NULL",3)}function On(){On=c,JH=new XI((Yo(),wT))}function $I(e){this.d=(Qt(),new MS(e))}function O4(e,t){return JR(e,new wd,t).a}function a0(e,t){return t==null?e.b:rO(t)}function Bte(e){return e==null?null:e.name}function ih(e){return typeof e=="number"}function To(e){return typeof e=="string"}function A4(e,t){return new aO(e,e.Y(),t)}function R4(e,t){return new bB(e.a,e.b,t)}function zte(e){return vt(Fs),new NM(e,e)}function zc(e){return hi(e,ul),new Ni(e)}function YI(e,t){this.a=t,l4.call(this,e)}function FI(e,t){this.a=t,l4.call(this,e)}function qI(e,t){this.a=e,$m.call(this,t)}function VI(e){this.c=e,this.a=Mse(this.c)}function lo(e){var t;t=e.a,e.a=e.b,e.b=t}function Hte(e,t){e.e.j.a=t.a,e.e.j.b=t.b}function _te(e,t,n){e.a=t^1502,e.b=n^jk}function ua(e,t,n){return e.a+=t,e.b+=n,e}function Gte(e,t,n){return e.a-=t,e.b-=n,e}function yy(e){return e.a=-e.a,e.b=-e.b,e}function ky(e){return ut(e.b!=0),e.a.a.c}function o0(e){return ut(e.b!=0),e.c.b.c}function WI(e,t){e.a&&(s3(t),IO(t))}function s0(e,t,n){var i;i=e.ub(t),i.J(n)}function $te(e,t){return Nte(t.Yb(),e.Yb())}function Ey(e){return f(_e(e.a,e.b),128)}function UI(e){return Gy(e.c,e.c.length)}function Yte(e){return e.l+e.m*of+e.h*ac}function gi(e){return e==Ah||e==ts||e==ii}function ta(e){return typeof e=="number"}function qo(e,t){return!!t&&e.b[t.e]==t}function B4(e,t){var n;n=e[hl],t[hl]=n}function wg(e,t){Co.call(this,e),this.b=t}function u0(e){Xv.call(this,e),this.a=e}function z4(e){fd.call(this,e),this.a=e}function H4(e){Rl.call(this,e),this.a=e}function KI(e){BS.call(this,new IA(e))}function mg(e){this.a=e,IS.call(this,e)}function ZI(e){this.c=e,this.a=1,this.b=1}function XI(e){this.a=e,this.b=oh(vt("="))}function QI(){this.a=new Ur,this.e=new Ur}function JI(){this.a=new mj,this.c=new Te}function _4(){this.i=new Fr,this.j=new Fr}function eM(e){th(e.d.c+e.e.c==0),this.b=e}function Sy(e){return e.g=null,cN(e,e.f),e}function G4(e){return _n(),vt(e),new pM(e)}function tM(e){return Bd(),parseInt(e)||-1}function nM(e,t){return xg(e.a,t)!=null}function yg(e,t){return!oae(e,t)&&!gR(e,t)}function su(e){return e.$H||(e.$H=++dhe)}function Fte(e){return e.d!=null?e.d:""+e.e}function c0(e){return e.d!=null?e.d:""+e.e}function Cy(e){return e.b=f(qne(e.a),21)}function ah(e){return typeof e=="boolean"}function rM(e){e.b=new aM(e),e.c=new $t}function iM(){this.a=new Se,this.d=new Se}function aM(e){a3.call(this,e,null,null)}function oM(e,t,n,i){v3.call(this,e,t,n,i)}function sM(e,t,n,i){r2.call(this,e,t,n,i)}function Vo(e,t,n,i){r2.call(this,e,t,n,i)}function $4(e,t,n){Ng.call(this,e,t,n,null)}function Y4(e,t,n){Ng.call(this,e,t,n,null)}function F4(e,t,n){e.i=t,t.f=e,t.i=n,n.f=t}function q4(e,t){pj(this),this.e=e,this.f=t}function qte(e,t){this.d=e,gj(this),this.b=t}function xy(e){NI(this),Hs(this),na(this,e)}function Nt(e){return bg(e==null||ah(e)),e}function Ot(e){return bg(e==null||ih(e)),e}function oh(e){return bg(e==null||To(e)),e}function dn(e,t){return e.a+=t.a,e.b+=t.b,e}function uu(e,t){return e.a-=t.a,e.b-=t.b,e}function Vte(e,t){return e.i.a=(ur(t),t+10)}function Wte(e,t){return e.i.a=(ur(t),t+10)}function Hc(e,t){return f(Kt(e.k,t),24).a}function Ute(e,t){return Eoe(e,t),new $O(e,t)}function V4(e,t){return f(e.b.sb(t),92).a}function uM(e){return f(e,7).b.c.length!=0}function cM(e){return f(e,7).e.c.length!=0}function lM(e){return e.d?ji(e.d.a,e,0):-1}function Kte(e){return e==null?null:e.message}function Gl(e){e.n==null&&due(e)}function Zte(e,t,n,i){return fA(e,t,n,i),e}function Xte(e,t){return mn(),e.indexOf(t)}function Bt(e,t){if(!t)throw new vd;e.g=t}function W4(e){if(e.e.c!=e.b)throw new gd}function l0(e){if(e.f.c!=e.b)throw new gd}function Qte(e,t){return vt(e),vt(t),cC(e,t)}function _c(e,t){this.a=e,this.c=t,this.b=2}function f0(){pj(this),this.e=-1,this.f=!0}function Ty(){Ree.call(this,new $t),this.a=3}function fM(e){r2.call(this,e.d,e.b,e.a,e.c)}function U4(e){r2.call(this,e.d,e.b,e.a,e.c)}function hM(e){PC.call(this,e),this.c=new Se}function dM(){qm.call(this,"ALWAYS_TRUE",0)}function vM(){qm.call(this,"ALWAYS_FALSE",1)}function gM(e){Zz(),this.a=new Ty,dR(this,e)}function Jte(e){return!e.e&&(e.e=new Se),e.e}function K4(e){var t;return t=new Uv,t.e=e,t}function Ly(e){var t;t=e[hl]|0,e[hl]=t+1}function cu(e,t){e.a.rb(e.b,t),++e.b,e.c=-1}function Z4(e,t){_l(e.c!=-1),e.a.wb(e.c,t)}function ene(e,t){return yn(),e==t?0:e?1:-1}function Py(e,t,n){return e.g[t.e][n.e]*e.d}function tne(e,t,n){return e.apply(t,n)}function X4(e,t,n){return pne(e,f(t,17),n)}function nne(e,t){return t==(we(),qe)?e.c:e.d}function bM(e,t){return t!=null&&e.Nb().kb(t)}function rne(e,t){this.e=t,this.f=e,Sy(this)}function pM(e){this.b=e,this.a=(_n(),_n(),mT)}function wM(e){Ta(),this.a=(Qt(),new Rl(e))}function Ta(){Ta=c,new ZS((Qt(),Qt(),yc))}function mM(){mM=c,zG=bi(new An,(jr(),TE))}function kg(e){dae.call(this,e,(Q3(),V6))}function Fu(e){gy(this),i3(this.c,0,e.ob())}function yM(e,t,n){this.b=e,this.a=t,this.c=n}function Q4(e,t,n){Jf.call(this,e,t),this.b=n}function h0(e,t,n){this.b=e,this.a=t,this.c=n}function J4(e,t){var n;return n=e.e,e.e=t,n}function kM(e){ho(e.c),e.b.b=e.b,e.b.a=e.b}function d0(e){e.b?d0(e.b):un(e.f.b,e.e,e.d)}function e3(e){return ut(e.b!=0),_s(e,e.a.a)}function ine(e){return ut(e.b!=0),_s(e,e.c.b)}function Dy(e,t){return _n(),vt(t),new YI(e,t)}function ane(e,t){return On(),new FI(e.mb(),t)}function EM(e,t){return mn(),e.charCodeAt(t)}function Pd(e,t,n){return mn(),e.substr(t,n)}function one(e){return mn(),e==null?Fs:ha(e)}function Eg(e,t,n){return my(e,t.g,n.g)*e.d}function qu(e,t,n){return{l:e,m:t,h:n}}function lu(e,t){return zd(e,new Jf(t.a,t.b))}function SM(e,t,n,i,s){e.d=t,e.e=n,e.c=i,e.b=s}function La(e,t,n,i,s){e.b=t,e.c=n,e.d=i,e.a=s}function an(e,t){return mr(e,t,e.c.b,e.c),!0}function Le(e,t){return e.c[e.c.length]=t,!0}function nt(e,t){rh(),Zn.call(this,e),this.a=t}function CM(){mM(),this.e=new Ur,this.d=new Ur}function $l(){$l=c,lY=new xS,$6=new xS}function xM(){xM=c,t$=Sg(new An,(jr(),av))}function TM(){TM=c,i$=Sg(new An,(jr(),av))}function LM(){LM=c,s$=Sg(new An,(jr(),av))}function jy(){jy=c,u$=Sg(new An,(jr(),av))}function PM(){PM=c,Error.stackTraceLimit=64}function t3(){La(this,!1,!1,!1,!1)}function v0(e){var t;return t=new Se,b2(t,e),t}function ca(e){var t;return t=new Ur,dC(t,e),t}function g0(e){var t;return t=new An,Lr(t,e),t}function sne(e){var t;return t=new i9,t.a=e,t}function f(e,t){return bg(e==null||$2(e,t)),e}function b0(e,t){if(e<0||e>=t)throw new $j}function Lo(e,t){return vt(e),vt(t),new RM(e,t)}function bs(e,t){return vt(e),vt(t),new BM(e,t)}function une(e,t){return mn(),e.lastIndexOf(t)}function Ny(e,t,n){return e<t?n<=e:e<=n||e==t}function DM(e,t,n){this.d=e,this.b=n,this.a=t}function ri(e,t,n){this.a=e,this.b=t,this.c=n}function jM(e,t,n){this.a=e,this.b=t,this.c=n}function NM(e,t){this.a=e,this.b=Fs,this.c=t.c}function IM(e){this.c=e.c,this.a=e.e,this.b=e.b}function n3(e){this.d=e,gj(this),this.b=kne(e.d)}function MM(){r3.call(this),this.a=new J9(this)}function r3(){this.c=new $,this.d=new wO(this)}function cne(e){var t;return t=new Yr,b2(t,e),t}function OM(e){Po(e.a),DA(e.c,e.b),e.b=null}function AM(e){return e.c-f(_e(e.a,e.b),128).b}function lne(e,t){return e.c<t.c?-1:e.c==t.c?0:1}function fne(e,t){return Bl(e.b.d)?t.xc():t.wc()}function Iy(e,t,n){return mn(),e.substr(t,n-t)}function i3(e,t,n){q2(n,0,e,t,n.length,!1)}function a3(e,t,n){this.c=e,Q1.call(this,t,n)}function RM(e,t){this.b=e,this.a=t,Dm.call(this)}function BM(e,t){this.a=e,this.b=t,Dm.call(this)}function zM(e,t){this.b=e,this.a=t,hi(t,"count")}function My(e){this.b=e,this.a=Yc(this.b.a).Kb()}function Zn(e){rh(),this.c=u_,this.d=c_,this.b=e}function HM(e,t,n){QN.call(this,e,t),this.a=n}function _M(e,t,n){QN.call(this,e,t),this.a=n}function _e(e,t){return Sn(t,e.c.length),e.c[t]}function bi(e,t){return f(_e(e.a,5),18).ib(t),e}function Vu(e,t){return f(_e(e.a,0),18).ib(t),e}function p0(e,t){return f(_e(e.a,1),18).ib(t),e}function pi(e,t){return f(_e(e.a,2),18).ib(t),e}function Pa(e,t){return f(_e(e.a,3),18).ib(t),e}function Sg(e,t){return f(_e(e.a,4),18).ib(t),e}function hne(e){return xs(e,($n(),Oa)),e.e=!0,e}function o3(e){Bd();var t;return t=vT.ec(e),Loe(t)}function w0(e,t){var n;return n=Fy(e,t),n.g=2,n}function dne(e,t){var n;for(n=0;n<t;++n)e[n]=0}function GM(e,t){e.b=t.b,e.c=t.c,e.d=t.d,e.a=t.a}function s3(e){e.a.b=e.b,e.b.a=e.a,e.a=e.b=null}function $M(e){return e.b.c.length+e.e.c.length}function Oy(e){return Array.isArray(e)&&e.ad===u}function YM(e,t){return _n(),MR(new M(e),t)!=-1}function Ay(e,t,n,i,s,l){return q8(e,t,n,i,s,0,l)}function m0(e,t,n){rh(),M0.call(this,e.b,t,n,e.d)}function y0(e,t){rh(),M0.call(this,e.b,t,e.c,e.d)}function Gc(e,t,n){Xc(t,e.c.length),dg(e.c,t,n)}function FM(e,t){return Sn(t,e.a.length),e.a[t]}function vne(e){e.sort(function(t,n){return t-n})}function vt(e){if(e==null)throw new vd;return e}function $c(e){if(e==null)throw new vd;this.a=e}function k0(e,t,n){if(e.a!=t)throw new gd;e.a=n}function u3(e,t){if(!e)throw new nn((mn(),t))}function c3(e,t){if(!e)throw new iN((mn(),t))}function ur(e){if(e==null)throw new vd;return e}function Ry(e){BS.call(this,new Md),na(this,e)}function l3(e){this.a=new ty(e.Y()),na(this,e)}function E0(e){this.c=e,this.a=new eh(this.c.a)}function fu(e){gr(),this.a=(Qt(),new dj(vt(e)))}function yn(){yn=c,Rn=(yn(),!1),oi=!0}function qM(){qM=c,G6=ve(Mk,Nr,24,256,0,1)}function VM(){VM=c,HG=bi(Vu(new An,(jr(),yE)),TE)}function By(){By=c,hG=new W,vG=new r3,dG=new Q}function WM(e){return e!=null&&Yy(e)&&e.ad!==u}function zy(e){return!Array.isArray(e)&&e.ad===u}function Yl(e,t){return To(t)?bO(e,t):rk(e.d,t)}function f3(e,t){return xe(t,17)&&qo(e,f(t,17))}function UM(e,t){return xe(t,17)&&Yie(e,f(t,17))}function gne(e,t){return _m(e.a,t)!==void 0}function Ft(e,t){var n;return n=X0(e),Bg(n,t),n}function bne(e,t){return!e&&(e=[]),e[e.length]=t,e}function pne(e,t,n){return di(e.a,t),$y(e,t.e,n)}function wne(e,t,n){return mn(),e.lastIndexOf(t,n)}function KM(e,t,n){if(!e)throw new nn(nce(t,n))}function mne(e,t,n){var i;for(i=0;i<t;++i)e[i]=n}function sh(e,t){var n;return n=e.a.Y(),a2(t,n),n-t}function Hy(e){var t;return t=e.i,t||(e.i=e.T())}function h3(e){var t;return t=e.c,t||(e.c=e.gb())}function ZM(e){var t;return t=e.c,t||(e.c=e.Jb())}function Yc(e){return e.e?e.e:e.e=e.Ob()}function XM(e){return e.f?e.f:e.f=e.Pb()}function yne(e,t){return qu(e.l&t.l,e.m&t.m,e.h&t.h)}function QM(e,t){return yr((ur(e),e),(ur(t),t))}function kne(e){return xe(e,20)?f(e,20).tb():e.mb()}function S0(e){for(_n(),vt(e);e.G();)e.H(),e.I()}function d3(e){var t;for(t=e;t.g;)t=t.g;return t}function Ene(e){return e.b.i.a+=e.a.f*(e.a.a-1),null}function Dd(e){_l(e.b!=-1),e.c.vb(e.a=e.b),e.b=-1}function JM(e){return ut(e.b>0),e.a.sb(e.c=--e.b)}function C0(e){e.b?C0(e.b):e.d.V()&&Yl(e.f.b,e.e)}function uh(e){if(Na(e.d),e.d.d!=e.c)throw new gd}function _y(e,t){if(t[hl]!=e[hl])throw new gd}function Fl(e,t){return _n(),vt(e),vt(t),new PN(e,t)}function eO(e,t){gr(),hte.call(this,e,W0(new uo(t)))}function v3(e,t,n,i){this.a=e,Ng.call(this,e,t,n,i)}function Fc(e){this.a=Math.cos(e),this.b=Math.sin(e)}function ps(e,t,n){Co.call(this,e),this.b=t,this.a=n}function g3(e){this.b=new Se,this.a=new Se,this.c=e}function qc(e){this.c=new Fr,this.a=new Se,this.b=e}function tO(){tO=c,r_=new LS(!1),i_=new LS(!0)}function Wu(e,t){return++e.d,e.c[e.c.length]=t,!0}function Cg(e,t){mr(e.d,t,e.b.b,e.b),++e.a,e.c=null}function vn(e,t){var n;return n=e.a.db(t,e),n==null}function Gy(e,t){var n;return n=e.slice(0,t),Ig(n,e)}function Ti(e,t){var n;return n=new Array(t),Ig(n,e)}function $y(e,t,n){var i;return i=e.b[t],e.b[t]=n,i}function Sne(e,t){var n;for(n=0;n<t;++n)e[n]=null}function Cne(e,t){var n;for(n=0;n<t;++n)e[n]=!1}function xne(e,t){return yn(),f(t.b,24).a<e?oi:Rn}function Tne(e,t){return yn(),f(t.a,24).a<e?oi:Rn}function Lne(e,t){return f(ZM(Yc(e.a)).sb(t),21).yb()}function nO(e){return On(),Dy(hre(e.a).mb(),(n0(),Rk))}function Dt(e){return _n(),new Go($o(bs(e.a,new T)))}function Yy(e){return typeof e===mp||typeof e===iH}function Pne(e){r.setTimeout(function(){throw e},0)}function Dne(e,t){return e>0?new q4(e-1,t):new q4(e,t)}function rO(e){return vt(e),xe(e,345)?f(e,345):ha(e)}function b3(e,t){return OR(e.a,t,(yn(),Rn))==null}function p3(e,t){var n;return n=e.a.Y(),gre(t,n),n-1-t}function iO(e,t,n){var i;return i=Uu(e,t),iie(e,t,n),i}function G(e,t,n){var i;return i=Fy(e,t),VA(n,i),i}function Fy(e,t){var n;return n=new yC,n.i=e,n.d=t,n}function aO(e,t,n){this.a=e,a2(n,t),this.c=t,this.b=n}function $a(e,t,n){return Pte(n==null||nue(e,n)),e[t]=n}function w3(e){e.a=null,e.e=null,ho(e.b),e.d=0,++e.c}function jne(e){nn.call(this,(mn(),e??Fs))}function Nne(e){nn.call(this,(mn(),e??Fs))}function ql(e){var t;return t=e.f,t||(e.f=new w4(e))}function m3(e){var t;return t=e.k,t||(e.k=new j9(e))}function oO(e){var t;return t=e.e,t||(e.e=new zN(e))}function ch(e){var t;return t=e.e,!t&&(e.e=t=e.gb()),t}function qy(e){var t,n;return t=e.c.f.d,n=e.d.f.d,t==n}function y3(e,t){var n;return n=new jg(e),rC(n,t),n}function jd(e,t){return e.a+=String.fromCharCode(t),e}function Li(e){return!e.a&&e.d?e.d.b:e.a}function Vy(e){return ta(e)?e|0:e.l|e.m<<22}function Ine(e){return hi(e,Zx),vh(Pr(Pr(5,e),e/10|0))}function Kt(e,t){return To(t)?j0(e,t):li(fi(e.d,t))}function Vl(e){return xe(e,19)?f(e,19).Y():s2(e.mb())}function k3(e){return e?new l3((Yo(),e)):cne(null.mb())}function Wl(e,t){return He(e)===He(t)||e!=null&&jo(e,t)}function sO(e,t){return r4(),yr(ge(Ot(e)),ge(Ot(t)))}function uO(e){return On(),Dy(e.a.bb().mb(),(n0(),yT))}function gr(){gr=c,Ta(),db=new Qn((Qt(),Qt(),yc))}function lh(){lh=c,Ta(),ev=new ny((Qt(),Qt(),k5))}function cO(e,t){if(e==null)throw new rg((mn(),t))}function Mne(e,t){return qC(),(e-t<=0?0-(e-t):e-t)<.2}function One(e,t){return e.i.b<t.i.b?-1:e.i.b==t.i.b?0:1}function Wo(e,t,n,i){e.g[t.e][n.e]=i,e.g[n.e][t.e]=i}function Po(e){_l(e.c!=-1),e.d.vb(e.c),e.b=e.c,e.c=-1}function Wy(e){this.c=e,this.b=e.a.b.a,B4(e.a.c,this)}function Uy(e){xx.call(this,new uo(e)),this.a=new Fr}function lO(){XS.call(this,new e4(new $t)),this.a=this}function fO(){AA(),this.b=(On(),new $t),this.a=new $t}function Ane(){return n0(),re(ie(kT,1),De,188,0,[Rk,yT])}function Rne(){return xo(),re(ie(pT,1),De,159,0,[Ua,Np])}function Bne(){return r0(),re(ie(ST,1),De,205,0,[Bk,ET])}function hO(e){T0(e.a),e.b=ve(Ze,Me,1,e.b.length,4,1)}function dO(e){return!e.b&&(e.b=new Rl(e.c.W())),e.b}function xg(e,t){var n;return n=new ym,$z(e,t,n),n.d}function x0(e,t){var n;return n=Fy("",e),n.k=t,n.g=1,n}function T0(e){var t;for(t=e.mb();t.G();)t.H(),t.I()}function E3(e,t){return xe(t,79)&&Ho(e.b,f(t,79).mc())}function zne(){return R0(),re(ie(PG,1),De,175,0,[FL,LE])}function Hne(){return D0(),re(ie(RG,1),De,193,0,[PE,XL])}function _ne(){return Pg(),re(ie(KG,1),De,192,0,[NE,jE])}function un(e,t,n){return To(t)?N0(e,t,n):ra(e.d,t,n)}function Gne(e,t,n){e.i=0,e.e=0,t!=n&&ER(e,t,n)}function $ne(e,t,n){e.i=0,e.e=0,t!=n&&kR(e,t,n)}function S3(e,t,n,i){this.d=e,this.b=t,this.a=n,this.c=i}function Ya(e,t,n,i){this.d=e,this.e=t,this.c=n,this.b=i}function L0(e,t,n,i){this.a=e,this.c=t,this.b=n,this.d=i}function Pi(e,t,n,i){sn.call(this,e,t),this.a=n,this.b=i}function Yne(e,t){var n;return n=s4(e.a,t),n??[]}function Ky(e,t){return mn(),e==t?0:e<t?-1:1}function Fne(e,t){var n;return n=zie(e.f,t),dn(yy(n),e.f.d)}function fh(e,t){return f3(e.a,t)?e.b[f(t,17).e]:null}function la(e,t){return He(e)===He(t)||e!=null&&jo(e,t)}function Mn(e,t){if(t==null)throw new vd;return voe(e,t)}function vO(e){return bg(e==null||Yy(e)&&e.ad!==u),e}function Da(e){return!e.a&&(e.a=new dN(e.c.bb())),e.a}function gO(e){return!e.d&&(e.d=new Xv(e.c.fb())),e.d}function Hs(e){e.a.a=e.c,e.c.b=e.a,e.a.b=e.c.a=null,e.b=0}function qne(e){return ut(e.b<e.d.Y()),e.d.sb(e.c=e.b++)}function bO(e,t){return t==null?rk(e.d,null):TR(e.e,t)}function pO(e,t){this.g=e,this.d=re(ie(Er,1),Ii,9,0,[t])}function wO(e){this.c=e,this.b=new xN(f(vt(new X),56))}function ws(){this.a=new xi,this.b=(hi(3,ul),new Ni(3))}function mO(e,t){this.a=e,qte.call(this,e,f(e.d,20).ub(t))}function P0(e,t,n,i){this.a=e,this.c=t,this.b=n,this.d=i}function Zy(e,t,n){this.a=Hx,this.d=e,this.b=t,this.c=n}function yO(){this.d=0,this.b=0,this.a=0,this.c=0}function kO(){this.b=new Yr,this.d=new Ur,this.e=new FS}function Qt(){Qt=c,yc=new o9,Y6=new u9,k5=new c9}function C3(){C3=c,ZH=new dM,KH=new vM,bT=new II,XH=new GI}function D0(){D0=c,PE=new g4("GREEDY",0),XL=new g4(Tk,1)}function x3(){x3=c,iL=new y0((Ee(),HT),(yn(),yn(),oi))}function EO(){EO=c,XG=bi(Pa(pi(new An,(jr(),SE)),kE),EE)}function hh(e,t){var n;return n=u2(t),f(Kt(e.c,n),24).a}function Vne(e,t){var n;return n=wy(e.a,t),n&&(t.f=null),n}function SO(e){var t;return t=e.b.ob(),hA(t,t.length),t}function Xy(e){return e<0?-1:e>0?1:0}function Wne(){return Yi(),re(ie(Ufe,1),De,171,0,[Db,rs,Zs])}function Une(){return K0(),re(ie(m_,1),De,166,0,[qk,MT,OT])}function Kne(){return bh(),re(ie(I_,1),De,149,0,[xb,eE,Jk])}function Zne(){return o2(),re(ie(Wfe,1),De,225,0,[lc,_h,fc])}function Xne(){return U0(),re(ie(Qfe,1),De,221,0,[lL,fL,cL])}function Qne(){return _0(),re(ie(_G,1),De,173,0,[DE,JL,QL])}function CO(e,t){return Rg(yne(ta(e)?Qu(e):e,ta(t)?Qu(t):t))}function Jne(e){return e.b==0?null:(ut(e.b!=0),_s(e,e.a.a))}function T3(e){e.d=e.d-15,e.b=e.b-15,e.c=e.c+15,e.a=e.a+15}function L3(e){this.b=e,this.c=e,e.e=null,e.c=null,this.a=1}function xO(e,t,n){this.d=e,this.b=new Se,this.c=t,this.a=n}function Qy(e,t){vee(this,new ot(e.a,e.b)),gee(this,ca(t))}function ere(e,t){return t===e?!0:(Na(e),e.d.t(t))}function tre(e){return e==Ro||e==is}function nre(e){Bc(new M(Yg(e.e)))&&(Nfe(e),Iue(e))}function TO(e,t){var n;n=f(X3(e.e,t),116),n&&(e.d=!0)}function P3(e,t){var n;return n=e.b.pb(t),hA(n,e.b.Y()),n}function rre(e){var t;return t=YB(e,(we(),qe)),t+=YB(e,Be),t}function ire(e,t,n){Zg(e,t,n,(we(),Be),e.f),Zg(e,t,n,qe,e.n)}function cn(e,t){e.f&&Tr(e.f.f,e),e.f=t,e.f&&Le(e.f.f,e)}function Ar(e,t){e.d&&Tr(e.d.a,e),e.d=t,e.d&&Le(e.d.a,e)}function kn(e,t){e.d&&Tr(e.d.b,e),e.d=t,e.d&&Le(e.d.b,e)}function Bn(e,t){e.c&&Tr(e.c.e,e),e.c=t,e.c&&Le(e.c.e,e)}function Jy(e){var t;return t=ca(e.b),na(t,e.c),na(t,e.i),t}function are(){U6==256&&(W6=vw,vw={},U6=0),++U6}function Do(){Do=c,dc=new k4(Ud,0),js=new k4(Wd,1)}function Vc(){Vc=c,Xs=new C4(Wd,0),wf=new C4(Ud,1)}function ore(){return Vc(),re(ie(ahe,1),De,223,0,[Xs,wf])}function sre(){return A0(),re(ie(nhe,1),De,242,0,[Rb,Ab])}function ure(){return Do(),re(ie(rhe,1),De,248,0,[dc,js])}function cre(){return fo(),re(ie(ihe,1),De,247,0,[Su,Xa])}function lre(){return Mg(),re(ie(c$,1),De,194,0,[ME,OE])}function fre(){return O0(),re(ie(Z$,1),De,174,0,[QE,w6])}function D3(e){return Qt(),xe(e,63)?new i4(e):new u0(e)}function hre(e){var t;return t=e.g,f(t||(e.g=new TS(e)),20)}function fi(e,t){return HR(e,t,Yne(e,t==null?0:e.b.Vc(t)))}function LO(e){var t;return t=B0(e),"n_"+(t??G1(e.k))}function PO(e){return _1(Od(e))+"@"+(Ko(e)>>>0).toString(16)}function dre(e,t){return ene(Pt((ur(e),e)),Pt((ur(t),t)))}function j0(e,t){return t==null?li(fi(e.d,null)):rI(e.e,t)}function vre(e,t,n){return new O3(e.c,xz(e.b,Nre(e.d,t,n)),e.a)}function Xn(e){return Math.max(Math.min(e,kr),-2147483648)|0}function j3(e){this.e=e,this.b=this.e.a.entries(),this.a=[]}function N3(e){this.c=e,this.b=new ef(new ou(this.c.a).a)}function DO(e){this.b=(_n(),_n(),_n(),QH),this.a=f(vt(e),35)}function Ul(e,t,n){rh(),nt.call(this,e,t),n!=null&&(this.c=n)}function jO(e,t,n){if(e<0||t<e||t>n)throw new _o(Hse(e,t,n))}function gre(e,t){if(e<0||e>=t)throw new _o(Gse(e,t));return e}function e2(e,t){if(e==null)throw new rg((mn(),t));return e}function Et(e){if(!xt(e))throw new sa;return e.c=e.b,e.b.H()}function bre(e){function t(){}return t.prototype=e||{},new t}function NO(e){var t;return t=new Gm(y2(e.length)),Bg(t,e),t}function IO(e){var t;t=e.c.b.b,e.b=t,e.a=e.c.b,t.a=e.c.b.b=e}function I3(e){this.b=null,!e&&(e=(Hl(),Hl(),Cf)),this.a=e}function M3(e){this.b=e,this.a=new fn(this.b,this.b.c.length)}function MO(e){return gr(),vt(e),D8(e||v0(new M(null)))}function pre(e,t){var n=zk[e.charCodeAt(0)];return n??e}function OO(e,t){var n=e.a=e.a||[];return n[t]||(n[t]=e.Oc(t))}function AO(e,t,n){var i;_C(t,n,e.c.length),i=n-t,o4(e.c,t,i)}function O3(e,t,n){LN.call(this,t.a),this.c=e,this.b=t,this.a=n}function t2(e){return e0(e.c),e.e=e.a=e.c,e.c=e.c.c,++e.d,e.a.f}function RO(e){return e0(e.e),e.c=e.a=e.e,e.e=e.e.e,--e.d,e.a.f}function Di(e){return ln(re(ie(_t,1),Ht,10,0,[e.f.i,e.i,e.a]))}function wre(){return Es(),re(ie(d_,1),De,107,0,[Gk,gb,dl,Ih])}function mre(){return du(),re(ie(g_,1),De,122,0,[Yk,LT,ff,$k])}function yre(){return Eh(),re(ie(oE,1),De,139,0,[Pb,aE,iE,rE])}function kre(){return gu(),re(ie(iv,1),De,150,0,[nE,Lb,tE,Tb])}function Ere(){return C3(),re(ie(jp,1),De,136,0,[ZH,KH,bT,XH])}function Sre(){return Ag(),re(ie(Zfe,1),De,201,0,[hc,ml,wl,bf])}function Cre(){return we(),re(ie(Mr,1),De,32,0,[fr,rt,Be,ct,qe])}function xre(){return $n(),re(ie(vb,1),De,59,0,[Mo,Vi,Oa,Ps,Ks])}function BO(){BO=c,BG=Rr((D0(),re(ie(RG,1),De,193,0,[PE,XL])))}function zO(){zO=c,DG=Rr((R0(),re(ie(PG,1),De,175,0,[FL,LE])))}function HO(){HO=c,ZG=Rr((Pg(),re(ie(KG,1),De,192,0,[NE,jE])))}function Tre(){return ks(),re(ie(she,1),De,140,0,[aw,kf,$h])}function Lre(){return ph(),re(ie(ohe,1),De,218,0,[a6,tw,Bb])}function Pre(){return cr(),re(ie(uhe,1),De,219,0,[o5,Ri,ai])}function Dre(){return Q0(),re(ie(iY,1),De,153,0,[H6,y5,_6])}function jre(){return hu(),re(ie(oY,1),De,172,0,[pv,$b,dw])}function N0(e,t,n){return t==null?ra(e.d,null,n):I2(e.e,t,n)}function Nre(e,t,n){return new fp(e,!1,null,(xo(),Ua),!0,t,n)}function A3(e,t){return UM(e.a,t)?$y(e,f(t,17).e,null):null}function I0(e){return vt(e),BC((_n(),new Go($o(bs(e.a,new T)))))}function Ire(e){return Qt(),e?new hj(e):(KN(),fY)}function _O(e,t){var n,i;return i=sh(e,t),n=e.a.ub(i),new IN(e,n)}function Mre(e,t){var n,i;for(i=e.Y(),n=0;n<i;n++)e.wb(n,t[n])}function GO(e,t,n){var i;i=new ds,i.b=t,i.a=n,++t.b,Le(e.d,i)}function Ore(e,t,n){e.d&&Tr(e.d.b,e),e.d=t,e.d&&Gc(e.d.b,n,e)}function n2(e,t,n){_C(t,n,e.Y()),this.c=e,this.a=t,this.b=n-t}function r2(e,t,n,i){this.d=e,this.b=t,this.a=n,this.c=i}function $O(e,t){XS.call(this,iR(vt(e),vt(t))),this.b=e,this.c=t}function fn(e,t){this.a=e,Yf.call(this,e),Xc(t,e.Y()),this.b=t}function M0(e,t,n,i){rh(),Ul.call(this,e,t,n),i!=null&&(this.d=i)}function Are(e,t,n){e.i=0,e.e=0,t!=n&&(ER(e,t,n),kR(e,t,n))}function O(e){return ut(e.a<e.c.c.length),e.b=e.a++,e.c.c[e.b]}function Tg(e){return ut(e.b.b!=e.d.a),e.c=e.b=e.b.b,--e.a,e.c.c}function YO(e,t){var n;return n=1-t,e.a[n]=F0(e.a[n],n),F0(e,t)}function Rre(e){var t;return t=(wi(),wi(),C$),e.d&&X2(e),xee(),t}function Bre(e){var t;return ta(e)?(t=e,t==-0?0:t):Woe(e)}function Nd(e){var t;return t=(vt(e),new Fu((Yo(),e))),lp(t),W0(t)}function zre(e){_n();for(var t;;)if(t=e.H(),!e.G())return t}function FO(e){return l0(e),e0(e.c),e.e=e.a=e.c,e.c=e.c.b,++e.d,e.a}function qO(e){return l0(e),e0(e.e),e.c=e.a=e.e,e.e=e.e.d,--e.d,e.a}function Hre(e){var t;t=e.Y(),t!=0&&(e.d.Q(),e.f.c-=t,C0(e))}function _re(e,t,n){var i;i=uoe();try{return tne(e,t,n)}finally{uie(i)}}function Gre(e){return function(){return _re(e,this,arguments)}}function Lg(e){return xe(e,19)?f(e,19).V():!e.mb().G()}function Qn(e){gr(),this.a=(Qt(),xe(e,63)?new i4(e):new u0(e))}function O0(){O0=c,QE=new x4(Cp,0),w6=new x4("TOP_LEFT",1)}function fo(){fo=c,Su=new E4("DOWN",0),Xa=new E4("UP",1)}function Pg(){Pg=c,NE=new b4("LAYER_SWEEP",0),jE=new b4(Tk,1)}function A0(){A0=c,Rb=new y4("UPPER",0),Ab=new y4("LOWER",1)}function $re(e){if(e<0)throw new aN("Negative array size: "+e)}function R3(e,t){return xe(t,21)?F2(e.a,f(t,21)):!1}function VO(e,t){return xe(t,21)?F2(e.a,f(t,21)):!1}function WO(e,t){return xe(t,21)?F2(e.a,f(t,21)):!1}function i2(e){var t;return t=new ws,vu(t,e),ce(t,(Ee(),Un),null),t}function UO(e,t){return t===e?"(this Map)":(mn(),t==null?Fs:ha(t))}function B3(e,t,n,i){return xe(n,63)?new oM(e,t,n,i):new v3(e,t,n,i)}function Yre(){return ec(),re(ie(UT,1),De,100,0,[df,Ds,qT,VT,WT])}function Fre(){return zn(),re(ie(j_,1),De,28,0,[cc,Ao,Cb,Ah,ts,ii])}function qre(){return Zo(),re(ie(l_,1),De,103,0,[_k,Rp,Bp,zp,Op,Ap])}function Vre(){return cp(),re(ie(p_,1),De,133,0,[Fk,jT,IT,PT,NT,DT])}function KO(){KO=c,M_=Rr((bh(),re(ie(I_,1),De,149,0,[xb,eE,Jk])))}function ZO(){ZO=c,y_=Rr((K0(),re(ie(m_,1),De,166,0,[qk,MT,OT])))}function XO(){XO=c,GG=Rr((_0(),re(ie(_G,1),De,173,0,[DE,JL,QL])))}function Wre(){return et(),re(ie(oL,1),De,132,0,[Hn,hn,Cn,er,Za,Mi])}function Ure(){return Yd(),re(ie(jG,1),De,125,0,[Ob,VL,KL,UL,WL,qL])}function Kre(e){return _n(),jd(JR((Yo(),wT),jd(new wd,91),e),93).a}function Fa(e,t){Qt();var n;n=e.ob(),yh(n,0,n.length,t),Mre(e,n)}function QO(e,t,n,i,s){this.c=e,this.e=t,this.d=n,this.b=i,this.a=s}function ms(e,t,n,i,s){sn.call(this,e,t),this.a=n,this.b=i,this.c=s}function Kl(e,t,n,i,s){sn.call(this,e,t),this.a=n,this.b=i,this.c=s}function JO(e,t,n){this.a=t,this.c=e,this.b=(vt(n),new Fu((Yo(),n)))}function eA(){gy(this),this.b=new ot(ki,ki),this.a=new ot(Hr,Hr)}function R0(){R0=c,FL=new v4("QUADRATIC",0),LE=new v4("SCANLINE",1)}function Zre(){throw new qf("Add not supported on this collection")}function tA(e){var t,n;return n=one(e.Zb()),t=e.Yb(),t==1?n:n+" x "+t}function qt(e){return ut(e.b!=e.d.c),e.c=e.b,e.b=e.b.a,++e.a,e.c.c}function Xre(e){if(e.Tc())return null;var t=e.k,n=Pp[t];return n}function a2(e,t){if(e<0||e>t)throw new _o(ex(e,t,"index"));return e}function Qre(e,t){var n;return Na(e),n=e.d.nb(t),n&&(--e.f.c,C0(e)),n}function Dg(e,t,n){var i;i=(vt(e),new Fu((Yo(),e))),Boe(new JO(i,t,n))}function Jre(e,t){return Ky((mn(),e.toLowerCase()),t.toLowerCase())}function eie(e,t){return Ky((mn(),e.toLowerCase()),t.toLowerCase())}function tie(){return Q3(),re(ie(S5,1),De,138,0,[V6,dY,vY,gY])}function nie(e,t,n,i){Array.prototype.splice.apply(e,[t,n].concat(i))}function mr(e,t,n,i){var s;s=new mm,s.c=t,s.b=n,s.a=i,i.b=n.a=s,++e.b}function z3(e,t){var n;return n=D3(v0(new l2(e,t))),S0(new l2(e,t)),n}function rie(e,t,n){if(n){var i=n.gc();e.a[t]=i(n)}else delete e.a[t]}function iie(e,t,n){if(n){var i=n.gc();n=i(n)}else n=void 0;e.a[t]=n}function jg(e){this.d=e.d,this.c=e.c,this.a=e.a,this.b=e.b}function nA(){this.g=new GS,this.c=new GS,this.a=new Se,this.k=new Se}function rA(){this.d=new fO,this.a=new JI,this.c=new sI,this.b=new b9}function H3(){this.i=new Se,this.g=new Fr,this.n=new t3,this.q=new t3}function iA(e,t,n,i){this.e=e,this.b=new Se,this.d=t,this.a=n,this.c=i}function Id(){Id=c,pG=new pe,wG=new he,gG=new de,bG=new ke,mG=new Pe}function o2(){o2=c,lc=new Zm(Wd,0),_h=new Zm(Cp,1),fc=new Zm(Ud,2)}function aA(){aA=c,v_=Rr((Es(),re(ie(d_,1),De,107,0,[Gk,gb,dl,Ih])))}function oA(){oA=c,b_=Rr((du(),re(ie(g_,1),De,122,0,[Yk,LT,ff,$k])))}function sA(){sA=c,R_=Rr((Eh(),re(ie(oE,1),De,139,0,[Pb,aE,iE,rE])))}function uA(){uA=c,A_=Rr((gu(),re(ie(iv,1),De,150,0,[nE,Lb,tE,Tb])))}function cA(){cA=c,l$=Rr((Mg(),re(ie(c$,1),De,194,0,[ME,OE])))}function lA(){lA=c,X$=Rr((O0(),re(ie(Z$,1),De,174,0,[QE,w6])))}function Wc(e){return vt(e),xe(e,19)?new Fu((Yo(),f(e,19))):v0(e.mb())}function aie(e){return Pt(ge(Nt(z(e,(le(),wc)))))&&z(e,lt)!=null}function oie(e){return Pt(ge(Nt(z(e,(le(),wc)))))&&z(e,lt)!=null}function fA(e,t,n,i){t==null&&(t=Fs),e.a+=""+(mn(),t.substr(n,i-n))}function hA(e,t){var n;for(n=0;n<t;++n)$a(e,n,new AS(f(e[n],21)))}function sie(e,t){var n,i;n=f(Goe(e.b,t),19),n&&(i=n.Y(),n.Q(),e.c-=i)}function Uc(e,t,n){var i;return i=(Sn(t,e.c.length),e.c[t]),e.c[t]=n,i}function Kc(e){return ut(e.a<e.c.a.length),e.b=e.a,$A(e),e.c.b[e.b]}function s2(e){_n();var t;for(t=0;e.G();)e.H(),t=Pr(t,1);return vh(t)}function _3(e){this.d=e,this.b=this.d.a.entries(),this.a=this.b.next()}function dA(e){this.g=e,this.f=new Se,this.a=Xt(this.g.c.c,this.g.d.c)}function vA(e){qS(),this.e=null,this.f=null,this.a="",this.b=e,this.a=""}function Md(){$t.call(this),rM(this),this.b.b=this.b,this.b.a=this.b}function uie(e){e&&Oie((VS(),CT)),--Ip,e&&Mp!=-1&&(kte(Mp),Mp=-1)}function Zc(e){return!e.c||!e.d?!1:!!e.c.f&&e.c.f==e.d.f}function cie(){return Date.now?Date.now():new Date().getTime()}function B0(e){return e.c.c.length!=0?f(_e(e.c,0),33).a:null}function gA(e){return e.c.c.length!=0?f(_e(e.c,0),33).a:null}function lie(e){return e.d=3,e.c=$ie(e),e.d!=2?(e.d=0,!0):!1}function z0(e,t,n){this.a=e,this.b=t,this.c=n,Le(e.j,this),Le(t.d,this)}function qa(e,t,n,i){var s;e.c?s=new Cm(Xn(i)):s=new Cm(i),ja(t,n,s)}function H0(e){var t,n;return vt(e),t=Ine(e.length),n=new Ni(t),Bg(n,e),n}function G3(e){var t,n,i;return t=e&Wa,n=e>>22&Wa,i=e<0?ic:0,qu(t,n,i)}function fie(){return rp(),re(ie(a$,1),De,141,0,[r6,e6,t6,IE,n6])}function hie(){return ap(),re(ie(F$,1),De,115,0,[nw,$E,FE,YE,qE])}function die(){return Fi(),re(ie(tY,1),De,85,0,[Sf,_b,mc,dv,Pu])}function bA(){bA=c,h_=Rr(($n(),re(ie(vb,1),De,59,0,[Mo,Vi,Oa,Ps,Ks])))}function pA(){pA=c,O_=Rr((we(),re(ie(Mr,1),De,32,0,[fr,rt,Be,ct,qe])))}function wA(){wA=c,D_=Rr((ec(),re(ie(UT,1),De,100,0,[df,Ds,qT,VT,WT])))}function mA(){mA=c,QG=bi(Pa(Pa(Pa(pi(new An,(jr(),SE)),IL),bL),kE),EE)}function yA(e,t){var n,i;for(i=t.mb();i.G();)n=f(i.H(),55),dz(e,n,0,0)}function ys(e,t,n){var i,s;for(s=e.mb();s.G();)i=f(s.H(),55),tb(i,t,n)}function $3(e,t,n){var i,s;for(i=0,s=0;s<t.length;s++)i+=e.Hc(t[s],i,n)}function Zl(e,t){var n;return n=(Sn(t,e.c.length),e.c[t]),o4(e.c,t,1),n}function vie(e){var t;for(vt(e),Bie(!0),t=0;t<0&&xt(e);t++)Et(e);return t}function ho(e){var t;e.d=new LI(e),e.e=new PI(e),t=e[hl]|0,e[hl]=t+1}function kA(e){e.g=new Yr,e.o=new Yr,e.c=new Yr,e.j=new Se,e.d=new Se}function Xc(e,t){if(e<0||e>t)throw new _o("Index: "+e+", Size: "+t)}function Sn(e,t){if(e<0||e>=t)throw new _o("Index: "+e+", Size: "+t)}function EA(e,t){var n,i;return n=t.yb(),i=kC(e,n),!!i&&la(i.e,t.zb())}function gie(e,t){var n;return n=e.d,t>0?f(_e(n.a,t-1),9):null}function ve(e,t,n,i,s,l){var h;return h=H8(s,i),s!=9&&re(ie(e,l),t,n,s,h),h}function Xl(e){var t;if(!Ku(e))throw new sa;return e.d=1,t=e.c,e.c=null,t}function Ng(e,t,n,i){this.f=e,this.e=t,this.d=n,this.b=i,this.c=i?i.d:null}function bie(e,t){if(e&&typeof e==mp)try{e.__gwt$exception=t}catch{}}function pie(e,t){e.a.$b(t.d,e.b)>0&&(Le(e.c,new Q4(t.c,t.d,e.d)),e.b=t.d)}function wie(e,t){var n;return n=yr(e.j,t.j),n==0?yr(e.k,t.k):n}function Y3(e){var t,n;return n=f(_e(e.f,0),7),t=f(z(n,(le(),lt)),7),t}function u2(e){var t,n;return n=f(_e(e.f,0),7),t=f(z(n,(le(),lt)),7),t}function mie(e,t){return yr(ge(Ot(z(e,(le(),Lu)))),ge(Ot(z(t,Lu))))}function SA(){SA=c,aY=Rr((Q0(),re(ie(iY,1),De,153,0,[H6,y5,_6])))}function CA(){CA=c,sY=Rr((hu(),re(ie(oY,1),De,172,0,[pv,$b,dw])))}function xA(){xA=c,f_=Rr((Zo(),re(ie(l_,1),De,103,0,[_k,Rp,Bp,zp,Op,Ap])))}function TA(){TA=c,w_=Rr((cp(),re(ie(p_,1),De,133,0,[Fk,jT,IT,PT,NT,DT])))}function LA(){LA=c,N_=Rr((zn(),re(ie(j_,1),De,28,0,[cc,Ao,Cb,Ah,ts,ii])))}function PA(){PA=c,NG=Rr((Yd(),re(ie(jG,1),De,125,0,[Ob,VL,KL,UL,WL,qL])))}function yie(){return rl(),re(ie(TG,1),De,109,0,[Zp,Ib,Mb,GL,$L,_L,YL,Xp])}function kie(){return pu(),re(ie(Ln,1),De,41,0,[Wi,Ka,Ki,ba,ga,va,Ei,Zi,Ui])}function Eie(){return Gd(),re(ie(GE,1),De,123,0,[_E,HE,zE,RE,AE,BE])}function Sie(){return Vg(),re(ie(V$,1),De,124,0,[WE,s6,c6,o6,u6,VE])}function F3(){F3=c,TT=new nt("de.cau.cs.kieler.labels.labelManager",null)}function Cie(){return Date.now?Date.now():new Date().getTime()}function xie(e){var t;return t=f(Gy(e.b,e.b.length),11),new ri(e.a,t,e.c)}function Tie(e,t){var n;return n=(mn(),t.length),Ho(Pd(e,e.length-n,n),t)}function DA(e,t){var n;return n=new ym,n.c=!0,n.d=t.zb(),$z(e,t.yb(),n)}function Lie(e,t){var n;return n=t.yb(),On(),new c4(n,S8(e.b,n,f(t.zb(),19)))}function Tr(e,t){var n;return n=ji(e,t,0),n==-1?!1:(e.vb(n),!0)}function Ig(e,t){return J3(t)!=9&&re(Od(t),t._c,t.__elementTypeId$,J3(t),e),e}function q3(e){return _y(e.c.a.c,e),ut(e.b!=e.c.a.b),e.a=e.b,e.b=e.b.a,e.a}function V3(e){_l(!!e.c),_y(e.e,e),e.c.I(),e.c=null,e.b=fC(e),B4(e.e,e)}function Pie(e,t,n){e.a=t,e.c=n,e.b.a.Q(),Hs(e.d),e.e.a.c=ve(Ze,Me,1,0,4,1)}function jA(e,t,n){XS.call(this,iR(vt(e),vt(t))),this.b=e,this.c=t,this.a=n}function NA(e,t,n,i){this.b=new rj(this),this.a=e,this.c=t,this.e=n,this.d=i}function IA(e){BR.call(this,e,0),rM(this),this.b.b=this.b,this.b.a=this.b}function c2(e,t){Q1.call(this,e,t),this.a=ve(hhe,Me,183,2,0,1),this.b=!0}function dh(e,t){return To(t)?t==null?!!fi(e.d,null):gne(e.e,t):!!fi(e.d,t)}function W3(e,t){return bd(),(e-t>0?e-t:-(e-t))<=ob||e==t||isNaN(e)&&isNaN(t)}function MA(e,t){return bd(),(e-t>0?e-t:-(e-t))<=ob||e==t||isNaN(e)&&isNaN(t)}function U3(e){var t,n;t=!0;do t?n=n8(e):n=u8(e),t=!t;while(n);hC(e,e.d)}function ja(e,t,n){var i;if(t==null)throw new vd;return i=Mn(e,t),rie(e,t,n),i}function ce(e,t,n){return!e.n&&(e.n=new $t),n==null?Yl(e.n,t):un(e.n,t,n),e}function ji(e,t,n){for(;n<e.c.length;++n)if(la(t,e.c[n]))return n;return-1}function Die(e,t){for(;t>=e.a.c.length;)Le(e.a,new Ur);return f(_e(e.a,t),20)}function jie(e,t){var n;return n=f(Gg(e.a,t),19),n?S8(e.b,t,n):null}function Nie(e,t,n){var i;i=Mn(e,yk),i||(i=new Al,ja(e,yk,i)),ja(i.kc(),t,n)}function At(e,t,n,i,s){var l;return l=Fy(e,t),VA(n,l),l.g=s?8:0,l.f=i,l.e=s,l}function l2(e,t){var n;this.f=e,this.b=t,n=f(Kt(e.b,t),126),this.c=n?n.b:null}function K3(e,t){var n,i,s;for(i=0,s=t.length;i<s;++i)n=t[i],mr(e,n,e.c.b,e.c)}function OA(e,t,n,i,s,l){var h;h=i2(i),Bn(h,s),kn(h,l),pt(e.a,i,new h0(h,t,n.f))}function Z3(e,t,n){var i;return i=0,e.c[n]>0&&(i+=vfe(t)),e.b[n]&&(i+=Efe(t)),i}function X3(e,t){var n;return n=f(Yl(e.c,t),176),n?(s3(n),n.e):null}function vh(e){return T2(e,kr)>0?kr:T2(e,qs)<0?qs:Vy(e)}function Iie(e){return Yo(),hi(e,"size"),Vy(ste(UR(e,8),Ux)?UR(e,8):Ux),new Hm}function f2(e){rne.call(this,(mn(),e==null?Fs:ha(e)),xe(e,46)?f(e,46):null)}function Ni(e){gy(this),u3(e>=0,"Initial capacity must not be negative")}function AA(){AA=c,uG=Sg(Pa(Pa(new An,(jr(),PL)),SL),xL),cG=pi(new An,CL)}function fa(){fa=c,uL=new $e,sL=new Ge,dE=new me,hE=new Ve,vE=new Ke,gE=new at}function Q3(){Q3=c,V6=new Z1("All",0),dY=new MI,vY=new HI,gY=new OI}function _0(){_0=c,DE=new Jm(RH,0),JL=new Jm("LONGEST_PATH",1),QL=new Jm(Tk,2)}function G0(){G0=c,o_=qu(Wa,Wa,524287),s_=qu(0,0,524288),G3(1),G3(2),xT=G3(0)}function RA(){RA=c,LG=Rr((rl(),re(ie(TG,1),De,109,0,[Zp,Ib,Mb,GL,$L,_L,YL,Xp])))}function BA(){BA=c,o$=Rr((rp(),re(ie(a$,1),De,141,0,[r6,e6,t6,IE,n6])))}function zA(){zA=c,q$=Rr((ap(),re(ie(F$,1),De,115,0,[nw,$E,FE,YE,qE])))}function HA(){HA=c,nY=Rr((Fi(),re(ie(tY,1),De,85,0,[Sf,_b,mc,dv,Pu])))}function _A(e){UC(),_te(this,Vy(CO(Rg(rue(ta(e)?Qu(e):e,24)),dT)),Vy(CO(e,dT)))}function Od(e){return To(e)?Ok:ih(e)?Yb:ah(e)?che:zy(e)||Oy(e)?e.$c:e.$c||Vfe}function J3(e){return e.__elementTypeCategory$==null?9:e.__elementTypeCategory$}function Mie(e){var t,n;if(e.a){n=null;do t=e.a,e.a=null,n=cB(t,n);while(e.a);e.a=n}}function Oie(e){var t,n;if(e.b){n=null;do t=e.b,e.b=null,n=cB(t,n);while(e.b);e.b=n}}function gh(e){ZN();var t,n;for(n=eT,t=0;t<e.length;t++)e[t]>n&&(n=e[t]);return n}function $0(e,t){var n;return n=f(Kt(e.b,t),106),n||(n=t.rc(),un(e.b,t,n)),n}function h2(e,t){var n;return n=f(Kt(e.c,t),176),n?(WI(e,n),n.e):null}function GA(e,t,n,i){var s;s=f(h2(e.e,t),116),s.b+=n,s.a+=i,$g(e.e,t,s),e.d=!0}function $A(e){var t;for(++e.a,t=e.c.a.length;e.a<t;++e.a)if(e.c.b[e.a])return}function Aie(e){var t,n,i;for(t=(e.g==null&&(e.g=o3(e)),e.g),n=0,i=t.length;n<i;++n);}function Rie(e,t){var n,i;return Na(e),i=e.d.V(),n=e.d.ib(t),n&&(++e.f.c,i&&d0(e)),n}function hi(e,t){if(e<0)throw new nn(t+" cannot be negative but was: "+e);return e}function Bie(e){if(!e)throw new nn((mn(),"numberToAdvance must be nonnegative"))}function eC(e){if(!e.a.G()&&(e.a=e.b.mb(),!e.a.G()))throw new sa;return e.a.H()}function Ad(e){_n();var t;return vt(e),xe(e,108)?(t=f(e,108),t):new M9(e)}function Uu(e,t){var n=e.a[t],i=(k2(),Hk)[typeof n];return i?i(n):SC(typeof n)}function d2(e,t){var n,i;for(i=new M(e);i.a<i.c.c.length;)n=f(O(i),7),dp(n,t)}function v2(e,t){var n,i,s,l;for(i=e.d,s=0,l=i.length;s<l;++s)n=i[s],xa(e.g,n).a=t}function zie(e,t){var n;return n=uu(Ga(f(Kt(e.g,t),10)),Lte(f(Kt(e.f,t),198).b)),n}function g2(e){var t;return!Ku(Fl((t=new Wt(e.b.a).a.bb().mb(),new Zt(t)),e.a))}function tC(e){var t;_l(!!e.c),t=e.c.a,_s(e.d,e.c),e.b==e.c?e.b=t:--e.a,e.c=null}function YA(e){return e.c&&e.d?e.c.f+"("+e.c+")->"+e.d.f+"("+e.d+")":"e_"+su(e)}function Hie(e,t){return Ag(),e==hc&&t==ml||e==ml&&t==hc||e==bf&&t==wl||e==wl&&t==bf}function _ie(e,t){return Ag(),e==hc&&t==wl||e==hc&&t==bf||e==ml&&t==bf||e==ml&&t==wl}function Gie(){return nb(),re(ie(U$,1),De,110,0,[h6,XE,d6,b6,v6,p6,g6,ZE])}function FA(){FA=c,P_=Rr((pu(),re(ie(Ln,1),De,41,0,[Wi,Ka,Ki,ba,ga,va,Ei,Zi,Ui])))}function bh(){bh=c,xb=new Km("OUTSIDE",0),eE=new Km("INSIDE",1),Jk=new Km("FIXED",2)}function ks(){ks=c,aw=new oy(Kd,0),kf=new oy("TOP",1),$h=new oy("BOTTOM",2)}function Mg(){Mg=c,ME=new S4("CLASSIC",0),OE=new S4("IMPROVE_STRAIGHTNESS",1)}function nC(){this.e=new Fr,this.a=new yO,this.d=new Fr,this.b=new Se,this.c=new Se}function Y0(e,t,n){this.b=t,this.a=e,this.c=n,Le(this.a.e,this),Le(this.b.b,this)}function rC(e,t){e.d=Xt(e.d,t.d),e.c=je(e.c,t.c),e.a=je(e.a,t.a),e.b=Xt(e.b,t.b)}function _s(e,t){var n;return n=t.c,t.a.b=t.b,t.b.a=t.a,t.a=t.b=null,t.c=null,--e.b,n}function b2(e,t){_n();var n;for(vt(e),vt(t),n=!1;t.G();)n=n|e.ib(t.H());return n}function Rd(e){var t;return _y(e.e,e),ut(e.b),e.c=e.a,t=f(e.a.H(),21),e.b=fC(e),t}function $ie(e){for(var t;e.b.G();)if(t=e.b.H(),e.a.D(t))return t;return e.d=2,null}function Yie(e,t){return t&&e.b[t.e]==t?($a(e.b,t.e,null),--e.c,!0):!1}function Fie(e){return wk<e&&e<ac?e<0?Math.ceil(e):Math.floor(e):Rg(Sce(e))}function qA(e){if(e){if(e.V())throw new sa;return e.sb(e.Y()-1)}return zre(null.mb())}function qie(e,t){var n;return n=e.d,t<n.a.c.length-1?f(_e(n.a,t+1),9):null}function VA(e,t){if(e){t.k=e;var n=Xre(t);if(!n){Pp[e]=[t];return}n.$c=t}}function WA(e,t){var n,i;i=!1;do e.i?n=bae(e,t):n=gae(e,t),i=i|n;while(n);return i}function UA(e,t,n){var i,s;i=t;do s=ge(e.n[i.k])+n,e.n[i.k]=s,i=e.a[i.k];while(i!=t)}function Vie(e){var t,n;for(n=new M(e.a.b);n.a<n.c.c.length;)t=f(O(n),25),t.vc()}function Wie(){Qj();for(var e=Ik,t=0;t<arguments.length;t++)e.push(arguments[t])}function Uie(e,t){var n,i;for(n=0,i=e.Y();n<i;++n)if(la(t,e.sb(n)))return n;return-1}function iC(e,t){var n;return e2(e,"set1"),e2(t,"set2"),n=(U1(),new TN(t)),new yM(e,n,t)}function Kie(e){var t=/function(?:\s+([\w$]+))?\s*\(/,n=t.exec(e);return n&&n[1]||vk}function Zie(e,t,n){It(n,TH,3),k8(e.c,t,Ql(n,1)),IB(e,t,Ql(n,1)),nH(t,Ql(n,1)),Ct(n)}function KA(){KA=c,Y$=Rr((Gd(),re(ie(GE,1),De,123,0,[_E,HE,zE,RE,AE,BE])))}function ZA(){ZA=c,W$=Rr((Vg(),re(ie(V$,1),De,124,0,[WE,s6,c6,o6,u6,VE])))}function XA(){XA=c,uY=re(ie(Kn,1),Wn,26,12,[0,8,4,12,2,10,6,14,1,9,5,13,3,11,7,15])}function cr(){cr=c,o5=new sy(sf,0),Ri=new sy("INPUT",1),ai=new sy("OUTPUT",2)}function QA(e){this.c=e,this.b=new ef(new ou(e.b).a),this.a=null,this.d=(_n(),_n(),mT)}function JA(e){this.e=e,this.d=new Gm(y2(Hy(this.e).Y())),this.c=this.e.a,this.b=this.e.c}function aC(e,t,n){this.c=e,H3.call(this),this.b=t,this.j=new Ya(t.d,t.e,t.c,t.b),this.a=n}function eR(e,t){e.j>0&&e.c<e.j&&(e.c+=t,e.g&&e.g.d>0&&e.e!=0&&eR(e.g,t/e.j*e.g.d))}function tR(e){return e.b.d.f.g==(et(),Cn)?f(z(e.b.d.f,(le(),lt)),7):e.b.d}function Xie(e){return e.b.c.f.g==(et(),Cn)?f(z(e.b.c.f,(le(),lt)),7):e.b.c}function Ku(e){switch(J1(e.d!=3),e.d){case 2:return!1;case 0:return!0}return lie(e)}function nR(e){switch(e.e){case 2:return we(),qe;case 4:return we(),Be;default:return e}}function rR(e){switch(e.e){case 1:return we(),ct;case 3:return we(),rt;default:return e}}function Qie(e){var t;return xe(e,90)?(t=f(e,90),new QS(t.a)):(_n(),new Sm(e))}function iR(e,t){Qt();var n;return n=new ty(1),To(e)?N0(n,e,t):ra(n.d,e,t),new MS(n)}function aR(e,t){return e.g?(e.g=aR(e.g,t),--e.a,e.j=Ju(e.j,t.c),bu(e)):e.e}function oR(e,t){return e.e?(e.e=oR(e.e,t),--e.a,e.j=Ju(e.j,t.c),bu(e)):e.g}function na(e,t){var n,i,s;for(ur(t),n=!1,s=t.mb();s.G();)i=s.H(),n=n|e.ib(i);return n}function Jie(e){var t,n,i;for(t=0,i=e.mb();i.G();)n=i.H(),t+=n!=null?Ko(n):0,t=~~t;return t}function eae(e){var t,n,i,s;for(n=e.a,i=0,s=n.length;i<s;++i)t=n[i],t.B(null);return null}function p2(e){var t,n,i;for(i=new xi,n=e.b.mb();n.G();)t=f(n.H(),92),an(i,t.a);return i}function Og(e){var t,n,i;for(t=0,i=e.mb();i.G();)n=Ot(i.H()),t+=(ur(n),n);return t/e.Y()}function sR(e,t){var n;return n=f(Kt(e.c,t),200),n||(n=new Tj,n.c=t,un(e.c,n.c,n)),n}function di(e,t){var n;return ur(t),n=t.e,e.b[n]?!1:($a(e.b,n,t),++e.c,!0)}function F0(e,t){var n,i;return n=1-t,i=e.a[n],e.a[n]=i.a[t],i.a[t]=e,e.b=!0,i.b=!1,i}function uR(e,t){var n;return xe(t,10)?(n=f(t,10),e.a==n.a&&e.b==n.b):!1}function oC(e,t,n){return e.g=new q0(t,n),F4(e,e.g,e.i),e.d=ti(2,e.d),++e.a,e.j=Pr(e.j,n),e}function sC(e,t,n){return e.e=new q0(t,n),F4(e.f,e.e,e),e.d=ti(2,e.d),++e.a,e.j=Pr(e.j,n),e}function cR(e,t){var n=e.a,i=0;for(var s in n)n.hasOwnProperty(s)&&(t[i++]=s);return t}function lR(e,t){var n,i;for(ur(t),i=t.bb().mb();i.G();)n=f(i.H(),21),e.db(n.yb(),n.zb())}function tae(e,t,n){var i;return i=e.a.e[f(t.a,9).k]-e.a.e[f(n.a,9).k],Xn(i>0?1:i<0?-1:0)}function fR(e,t,n){this.g=e,this.d=t,this.e=n,this.a=new Se,Yse(this),Qt(),Fa(this.a,null)}function q0(e,t){th(t>0),this.b=e,this.c=t,this.j=t,this.a=1,this.d=1,this.e=null,this.g=null}function nae(e){e.a=null,e.e=null,e.b.c=ve(Ze,Me,1,0,4,1),e.f.c=ve(Ze,Me,1,0,4,1),e.c=null}function rae(){return br(),re(ie(f6,1),De,113,0,[UE,os,rw,KE,mf,yf,iw,sv,uv,l6])}function iae(e){return rf(e,26)*14901161193847656e-24+rf(e,27)*11102230246251565e-32}function w2(e){return xe(e,87)?Nd(f(e,87)):xe(e,88)?f(e,88).a:xe(e,63)?new ng(e):new md(e)}function hR(e){var t;return t=f(z(e,(le(),_r)),32),e.g==(et(),Cn)&&(t==(we(),qe)||t==Be)}function dR(e,t){return Koe(e,t)?(pt(e.a,f(z(t,(le(),Ef)),18),t),!0):!1}function Lr(e,t){var n;if(t)for(n=0;n<6;n++)f(_e(e.a,n),18).jb(f(_e(t.a,n),19));return e}function Ql(e,t){var n;return e.b?null:(n=Dne(e.e,e.f),an(e.a,n),n.g=e,e.d=t,n)}function Zu(e,t){var n,i;for(i=Jt(e,0);i.b!=i.d.c;)n=f(qt(i),10),n.a+=t.a,n.b+=t.b;return e}function uC(e,t){var n,i;for(n=0;n<t.length;n++)for(i=0;i<t[n].length;i++)t[n][i]=e[n][i]}function aae(e){var t,n;for(n=new M(e.b.f);n.a<n.c.c.length;)t=f(O(n),7),TO(e.a,R2(t.g))}function Ag(){Ag=c,hc=new V1("Q1",0),ml=new V1("Q4",1),wl=new V1("Q2",2),bf=new V1("Q3",3)}function Es(){Es=c,Gk=new $1(sf,0),gb=new $1(Cp,1),dl=new $1("HEAD",2),Ih=new $1("TAIL",3)}function hu(){hu=c,pv=new cy("AGGRESSIVE",0),$b=new cy("CAREFUL",1),dw=new cy("OFF",2)}function vR(){vR=c,K$=Rr((nb(),re(ie(U$,1),De,110,0,[h6,XE,d6,b6,v6,p6,g6,ZE])))}function cC(e,t){return yn(),To(e)?Ky(e,oh(t)):ih(e)?QM(e,Ot(t)):ah(e)?dre(e,Nt(t)):e.F(t)}function lC(e,t,n){var i;return i=t.$b(n,e.b),i<0?e.e?lC(e.e,t,n):0:i>0?e.g?lC(e.g,t,n):0:e.c}function oae(e,t){var n,i;return e.b?(i=e.e,n=e.a.$b(t,i),n<0|n==0&e.d==(xo(),Ua)):!1}function gR(e,t){var n,i;return e.c?(i=e.g,n=e.a.$b(t,i),n>0|n==0&e.f==(xo(),Ua)):!1}function Rg(e){var t;return t=e.h,t==0?e.l+e.m*of:t==ic?e.l+e.m*of-ac:e}function ln(e){var t,n,i,s;for(t=new Fr,i=0,s=e.length;i<s;++i)n=e[i],t.a+=n.a,t.b+=n.b;return t}function sae(e){var t,n,i,s;for(n=e.a,i=0,s=n.length;i<s;++i)t=n[i],DR(e,t,(we(),ct)),DR(e,t,rt)}function uae(e){var t,n,i;for(t=1,i=e.mb();i.G();)n=i.H(),t=31*t+(n==null?0:Ko(n)),t=~~t;return t}function cae(e){var t,n;return t=f(e.e&&e.e(),11),n=f(Gy(t,t.length),11),new ri(t,n,t.length)}function bR(e){this.e=He(z(Li(e[0]),(Ee(),hf)))===He((du(),ff)),this.a=e,this.c=new $t,sae(this)}function pR(e){WS(),this.g=(On(),new $t),this.f=new $t,this.b=new $t,this.c=new cg,this.i=e}function wR(e){this.o=e,this.g=new Se,this.j=new Ur,this.n=new Ur,this.e=new Se,this.b=new Se}function V0(e,t){if(vn(e.a,t),t.f)throw new Bs("CNode belongs to another CGroup.");t.f=e}function lae(e,t){typeof window===mp&&typeof window.$gwt===mp&&(window.$gwt[e]=t)}function mR(e,t,n,i){var s,l;for(s=toe(e,t,n,i),s<0&&(s=-s-1),l=n-1;l>=s;l--)e[l+1]=e[l];e[s]=i}function yR(e,t,n,i){var s,l;for(s=hoe(e,t,n,i),s<0&&(s=-s-1),l=n-1;l>=s;l--)e[l+1]=e[l];e[s]=i}function Xu(e,t){var n,i;for(ur(t),i=t.mb();i.G();)if(n=i.H(),!e.kb(n))return!1;return!0}function fae(e,t){_n();var n;for(vt(t);e.G();)if(n=e.H(),!hR(f(n,9)))return!1;return!0}function hae(e,t){var n,i,s;return n=t.k-e.k,n==0?(i=e.e.a*e.e.b,s=t.e.a*t.e.b,yr(i,s)):n}function Qu(e){var t,n,i,s;return s=e,i=0,s<0&&(s+=ac,i=ic),n=Xn(s/of),t=Xn(s-n*of),qu(t,n,i)}function m2(e,t){return e.c.c=ve(Ze,Me,1,0,4,1),rB(e,e.e,t),rB(e,e.a,t),Qt(),Fa(e.c,null),Eae(e)}function kR(e,t,n){e.g=Z2(e,t,(we(),Be),e.b),e.d=Z2(e,n,Be,e.b),!(e.g.c==0||e.d.c==0)&&X8(e)}function ER(e,t,n){e.g=Z2(e,t,(we(),qe),e.j),e.d=Z2(e,n,qe,e.j),!(e.g.c==0||e.d.c==0)&&X8(e)}function SR(e,t,n){return new Ya(Xt(e.a,t.a)-n/2,Xt(e.b,t.b)-n/2,ni(e.a-t.a)+n,ni(e.b-t.b)+n)}function fC(e){return e.a.G()?!0:e.a!=e.d?!1:(e.a=new j3(e.e.d),e.a.G())}function Tn(e,t){var n,i;return n=t.ob(),i=n.length,i==0?!1:(i3(e.c,e.c.length,n),!0)}function hC(e,t){var n,i;for(n=0;n<e.a.length;n++)for(i=0;i<e.a[n].length;i++)e.a[n][i]=t[n][i]}function Bg(e,t){Qt();var n,i,s,l;for(l=!1,i=0,s=t.length;i<s;++i)n=t[i],l=l|e.ib(n);return l}function y2(e){return On(),e<3?(hi(e,"expectedSize"),e+1):e<Ux?Xn(e/.75+1):kr}function dC(e,t){var n;return xe(t,19)?(n=(Yo(),f(t,19)),e.jb(n)):b2(e,f(vt(t),22).mb())}function CR(e,t){var n,i;i=e.d.f,i.g!=(et(),Hn)&&(n=Dt(En(i)),xt(n)&&un(t,e,f(Et(n),12)))}function vC(e,t){var n,i;return $re(t),n=o8(e,0,t),i=ve(Kn,Wn,26,t,12,1),q2(e,0,i,0,n,!0),i}function dae(e,t){var n;this.c=e,n=new Se,HC(e,n,t,e.b,null,!1,null,!1),this.a=new fn(n,0)}function xR(e){return e.a?gR(e.c.b,e.a.b)?(e.a=null,!1):!0:!1}function Jl(e){if(!e)throw new zu((mn(),"no calls to next() since the last call to remove()"))}function k2(){k2=c,Hk={boolean:dte,number:Uee,string:Kee,object:mB,function:mB,undefined:Eee}}function E2(){E2=c,cE=NO(re(ie(vb,1),De,59,0,[($n(),Oa),Vi])),lE=NO(re(ie(vb,1),De,59,0,[Ks,Ps]))}function gC(e){Qt();var t,n,i;for(i=0,n=e.mb();n.G();)t=n.H(),i=i+(t!=null?Ko(t):0),i=i|0;return i}function vae(e){Ff();var t,n,i;for(i=0,n=ch(e).mb();n.G();)t=f(n.H(),83),i=Pr(i,t.Yb());return vh(i)}function Gs(e){var t,n;for(n=new M(e.a.b);n.a<n.c.c.length;)t=f(O(n),25),t.i.Q();e.c.Dc(e),sz(e)}function TR(e,t){var n;return n=_m(e.a,t),n===void 0?++e.d:(e.a[Dk](t),--e.c,Ly(e.b)),n}function gae(e,t){var n,i,s,l;for(n=!1,i=e.d[t].length,s=i-1;s>0;s--)l=s-1,n=n|v8(e,t,l,s);return n}function bae(e,t){var n,i,s,l;for(n=!1,i=e.d[t].length,l=0;l<i-1;l++)s=l+1,n=n|v8(e,t,l,s);return n}function pae(e,t){var n,i,s;return n=e.l+t.l,i=e.m+t.m+(n>>22),s=e.h+t.h+(i>>22),qu(n&Wa,i&Wa,s&ic)}function wae(e,t){var n,i,s;return n=e.l-t.l,i=e.m-t.m+(n>>22),s=e.h-t.h+(i>>22),qu(n&Wa,i&Wa,s&ic)}function LR(e,t){var n;for(n=0;n<(mn(),t.length);n++)if(e==t.charCodeAt(n))return!0;return!1}function PR(e,t){var n;for(n=0;n<(mn(),t.length);n++)if(e==t.charCodeAt(n))return!0;return!1}function z(e,t){var n,i;return e.n&&(i=Kt(e.n,t),i!=null)?i:(n=vle(t),xe(n,5)&&ce(e,t,n),n)}function S2(e){var t,n,i;for(t=new xi,i=Jt(e,0);i.b!=i.d.c;)n=f(qt(i),10),s0(t,0,new qn(n));return t}function DR(e,t,n){var i,s,l,h;for(h=new _c(t,n),l=0,s=il(h);s.G();)i=f(s.H(),7),un(e.c,i,gt(l++))}function mae(e,t,n){if(vt(t),n.G())for(Rc(t,e.C(n.H()));n.G();)Rc(t,e.c),Rc(t,e.C(n.H()));return t}function yae(e,t,n,i,s){i?Qoe(e,t):(Joe(e,t,s),$le(e,t,n)),t.c.length>1&&(Fa(t,e.b),cce(e.c,t))}function re(e,t,n,i,s){return s.$c=e,s._c=t,s.ad=u,s.__elementTypeId$=n,s.__elementTypeCategory$=i,s}function zg(e,t,n){switch(n.e){case 2:e.b=t;break;case 1:e.c=t;break;case 4:e.d=t;break;case 3:e.a=t}}function jR(e,t,n){var i,s;return s=Y3(n).g,i=$R(e,t,s).a,i-Wee(f(Kt(e.c,t),24).a-f(Kt(e.c,n),24).a)}function yr(e,t){return e<t?-1:e>t?1:e==t?0:isNaN(e)?isNaN(t)?0:1:-1}function W0(e){switch(e.Y()){case 0:return db;case 1:return new fu(e.mb().H());default:return new Qn(e)}}function Bd(){Bd=c;var e,t;t=!(Error.stackTraceLimit||"stack"in new Error),e=new h9,vT=t?new b:e}function bC(){bC=c,KT=new nt("intCoordinates",(yn(),yn(),Rn)),ZT=new Zn("jsonObject"),uE=new ot(0,0)}function U0(){U0=c,lL=new Qm("MIRROR_X",0),fL=new Qm("TRANSPOSE",1),cL=new Qm("MIRROR_AND_TRANSPOSE",2)}function ph(){ph=c,a6=new ay(Kd,0),tw=new ay("INCOMING_ONLY",1),Bb=new ay("OUTGOING_ONLY",2)}function pC(){return wi(),re(ie(ov,1),De,60,0,[Ns,vc,Cu,xu,as,pc,bc,Ro,is,gc,Tu,kl,pf])}function NR(){NR=c;var e,t,n,i;for(yl=new DC(ov),t=pC(),n=0,i=t.length;n<i;++n)e=t[n],X4(yl,e,null)}function IR(e){Qt();var t,n,i;for(i=1,n=e.mb();n.G();)t=n.H(),i=31*i+(t!=null?Ko(t):0),i=i|0;return i}function MR(e,t){_n();var n,i;for(e2(t,"predicate"),i=0;e.G();i++)if(n=e.H(),t.D(n))return i;return-1}function wC(e,t){var n,i;return n=e.c.a,i=t.ac(n),e.b.b&&(i=Ju(i,fx(e,t,n))),e.b.c&&(i=Ju(i,lx(e,t,n))),i}function OR(e,t,n){var i,s;return i=new c2(t,n),s=new ym,e.b=nz(e,e.b,i,s),s.b||++e.c,e.b.b=!1,s.d}function C2(e,t,n){var i,s,l;for(i=new Ur,l=Jt(n,0);l.b!=l.d.c;)s=f(qt(l),10),an(i,new qn(s));Bae(e,t,i)}function mC(e,t){var n;return t===e?!0:xe(t,144)?(n=f(t,144),e.P().t(n.P())):!1}function AR(e){var t;if(t=e.a.c.length,t>0)return b0(t-1,e.a.c.length),Zl(e.a,t-1);throw new Hj}function RR(e){e.b.c.length-e.e.c.length<0?(Bt(e,(we(),Be)),e.a.a=e.j.a):(Bt(e,(we(),qe)),e.a.a=0)}function BR(e,t){u3(e>=0,"Negative initial capacity"),u3(t>=0,"Non-positive load factor"),ho(this)}function ef(e){var t;this.e=e,this.d=new _3(this.e.e),this.a=this.d,this.b=fC(this),t=e[hl],this[hl]=t}function yC(){this.n=null,this.j=null,this.i=null,this.d=null,this.b=null,this.k=null,this.a=null}function x2(e){var t,n,i,s;for(s=1,n=0,i=e.length;n<i;++n)t=e[n],s=31*s+(t!=null?Ko(t):0),s=s|0;return s}function Rr(e){var t,n,i,s;for(t={},i=0,s=e.length;i<s;++i)n=e[i],t[":"+(n.d!=null?n.d:""+n.e)]=n;return t}function zR(e){dk();var t,n,i,s;for(n=jC(),i=0,s=n.length;i<s;++i)if(t=n[i],bM(t.a,e))return t;return sE}function HR(e,t,n){var i,s,l;for(s=0,l=n.length;s<l;++s)if(i=n[s],e.b.Uc(t,i.yb()))return i;return null}function _R(e,t,n){var i,s;for(s=n.mb();s.G();)if(i=f(s.H(),21),e.Uc(t,i.zb()))return!0;return!1}function kC(e,t){var n,i,s;for(s=e.b;s;){if(n=e.a.$b(t,s.d),n==0)return s;i=n<0?0:1,s=s.a[i]}return null}function kae(e,t){var n,i;return n=f(Yl(e.a,t),19),n?(i=e.b.Z(),i.jb(n),e.b.c-=n.Y(),n.Q(),i):null}function GR(e,t,n){var i;for(i=f(t.B(e),9);i.g==(et(),hn);)!i.n&&(i.n=new $t),Yl(i.n,n),i=f(t.B(i),9)}function T2(e,t){var n;return ta(e)&&ta(t)&&(n=e-t,!isNaN(n))?n:G8(ta(e)?Qu(e):e,ta(t)?Qu(t):t)}function Kr(e){var t;return xe(e,46)?e:(t=e&&e.__gwt$exception,t||(t=new vA(e),cN(t,e),bie(e,t)),t)}function Eae(e){var t,n,i;for(t=0,i=new M(e.c);i.a<i.c.c.length;)n=f(O(i),226),t+=KB(e,n.a,n.b);return t}function Sae(e){var t;return t=new dA(e),Dg(e.a,mG,new uo(re(ie(jb,1),Me,160,0,[t]))),t.d&&Le(t.f,t.d),t.f}function $R(e,t,n){switch(n.e){case 1:return f(Kt(e.d,t),24);case 3:return f(Kt(e.j,t),24)}return gt(0)}function YR(e,t,n){return e.d[t.k][n.k]||(xoe(e,t,n),e.d[t.k][n.k]=!0,e.d[n.k][t.k]=!0),e.a[t.k][n.k]}function EC(e,t,n){var i;return i=t.$b(n,e.b),i<0?e.e?f(ote(EC(e.e,t,n),e),206):e:i==0?e:e.g?EC(e.g,t,n):null}function jo(e,t){return To(e)?Ho(e,t):ih(e)||ah(e)?(ur(e),e===t):zy(e)?e.t(t):(Oy(e),e===t)}function Gn(e,t){return Ho(e.b,t)||Tie(e.b,t)&&(mn(),t.length==gg(e.b)||EM(e.b,gg(e.b)-t.length-1)==46)}function L2(e,t){var n,i,s;for(n=0,s=Jn(e,t).mb();s.G();)i=f(s.H(),7),n+=z(i,(le(),Is))!=null?1:0;return n}function Cae(e,t){var n,i,s;for(i=null,s=e.b;s;)n=e.a.$b(t,s.d),n>=0?s=s.a[1]:(i=s,s=s.a[0]);return i}function xae(e,t){var n,i,s;for(i=null,s=e.b;s;)n=e.a.$b(t,s.d),n<=0?s=s.a[0]:(i=s,s=s.a[1]);return i}function Tae(e,t,n,i){var s,l;for(l=e.mb();l.G();)s=f(l.H(),33),s.i.a=t.a+(i.a-s.j.a)/2,s.i.b=t.b,t.b+=s.j.b+n}function FR(e,t){var n;e.c.length!=0&&(n=f(Vn(e,ve(Er,Ii,9,e.c.length,0,1)),51),M4(n,new sr),Z8(n,t))}function qR(e,t){var n;e.c.length!=0&&(n=f(Vn(e,ve(Er,Ii,9,e.c.length,0,1)),51),M4(n,new Qe),Z8(n,t))}function VR(e){var t,n;return t=e.g,t==(et(),Cn)?(n=f(z(e,(le(),_r)),32),n==(we(),rt)||n==ct):!1}function Br(e,t){var n;return ur(t),n=e[":"+t],KM(!!n,"Enum constant undefined: %s",re(ie(Ze,1),Me,1,4,[t])),n}function Lae(e,t,n){if(!e)throw new nn(Jg("lowerEndpoint (%s) > upperEndpoint (%s)",re(ie(Ze,1),Me,1,4,[t,n])))}function SC(e){throw k2(),new qj("Unexpected typeof result '"+e+"'; please report this bug to the GWT team")}function P2(e){switch(e.e){case 1:return ct;case 2:return qe;case 3:return rt;case 4:return Be;default:return fr}}function WR(e){switch(e.e){case 2:return Vi;case 1:return Oa;case 4:return Ps;case 3:return Ks;default:return Mo}}function Pae(e){return e>=48&&e<58?e-48:e>=97&&e<97?e-97+10:e>=65&&e<65?e-65+10:-1}function Dae(e,t){var n,i;for(i=uO(oO(e.P()));i.b.G();)if(n=f(lN(i,i.b.H()),19),n.kb(t))return!0;return!1}function jae(e){var t;if(!xR(e))throw new sa;return t=new ON(e.c,e.a),e.b=t,e.a.i==e.c.a?e.a=null:e.a=e.a.i,t}function Nae(e,t){On();var n;return e===t?!0:xe(t,57)?(n=f(t,57),dB(Yc(e),n.bb())):!1}function Iae(e,t,n,i){return Ff(),hi(n,"oldCount"),hi(i,"newCount"),e.Cb(t)==n?(e.Gb(t,i),!0):!1}function Mae(e,t,n,i,s){return vt(n),vt(s),vre(new O3(e.c,xz(e.b,new fp(e.d,!0,t,n,!1,null,(xo(),Ua))),e.a),i,s)}function CC(e){switch(Ta(),e.Y()){case 0:return lh(),ev;case 1:return new Gu(e.mb().H());default:return new ny(e)}}function Pr(e,t){var n;return ta(e)&&ta(t)&&(n=e+t,wk<n&&n<ac)?n:Rg(pae(ta(e)?Qu(e):e,ta(t)?Qu(t):t))}function UR(e,t){var n;return ta(e)&&ta(t)&&(n=e*t,wk<n&&n<ac)?n:Rg(ple(ta(e)?Qu(e):e,ta(t)?Qu(t):t))}function Ju(e,t){var n;return ta(e)&&ta(t)&&(n=e-t,wk<n&&n<ac)?n:Rg(wae(ta(e)?Qu(e):e,ta(t)?Qu(t):t))}function $n(){$n=c,Mo=new og(sf,0),Vi=new og(Ud,1),Oa=new og(Wd,2),Ps=new og("DOWN",3),Ks=new og("UP",4)}function du(){du=c,Yk=new Y1(sf,0),LT=new Y1("POLYLINE",1),ff=new Y1("ORTHOGONAL",2),$k=new Y1("SPLINES",3)}function K0(){K0=c,qk=new Um("INHERIT",0),MT=new Um("INCLUDE_CHILDREN",1),OT=new Um("SEPARATE_CHILDREN",2)}function KR(){KR=c,$G=pi(Vu(new An,(jr(),mE)),Wp),YG=bi(pi(p0(new An,pE),bE),Nb),FG=bi(Pa(new An,wE),Nb)}function ZR(){ZR=c,qG=pi(Vu(new An,(jr(),mE)),Wp),VG=bi(pi(p0(new An,pE),bE),Nb),WG=bi(Pa(new An,wE),Nb)}function XR(e){this.a=new $i,this.d=new $i,this.b=new $i,this.c=new $i,this.g=new $i,this.i=new $i,this.f=e}function QR(e,t,n,i,s,l){this.e=new Se,this.f=(cr(),o5),Le(this.e,e),this.d=t,this.a=n,this.b=i,this.f=s,this.c=l}function Oae(e,t,n,i,s,l,h,v){var p;for(p=n;l<h;)p>=i||t<n&&v.$b(e[t],e[p])<=0?$a(s,l++,e[t++]):$a(s,l++,e[p++])}function Aae(e,t,n,i,s){var l,h;for(h=e.mb();h.G();)l=f(h.H(),33),l.i.a=t.a,l.i.b=s?t.b:t.b+i.b-l.j.b,t.a+=l.j.a+n}function Rae(e,t){jy();var n,i;for(i=Dt(Wg(e));xt(i);)if(n=f(Et(i),12),n.d.f==t||n.c.f==t)return n;return null}function D2(e,t,n){var i,s,l;for(i=0,l=Jt(e,0);l.b!=l.d.c&&(s=ge(Ot(qt(l))),!(s>n));)s>=t&&++i;return i}function Bae(e,t,n){var i,s,l,h;for(ur(n),h=!1,l=Jt(e,t),s=Jt(n,0);s.b!=s.d.c;)i=qt(s),Cg(l,i),h=!0;return h}function zae(e,t){var n,i,s;return t.V()?!1:(s=e.Y(),n=e.d.jb(t),n&&(i=e.d.Y(),e.f.c+=i-s,s==0&&d0(e)),n)}function vu(e,t){var n;return t&&(n=t.n?t.n:(Qt(),Qt(),Y6),n.V()||(e.n?lR(e.n,n):e.n=new hI(n))),e}function JR(e,t,n){var i;try{mae(e,t,n)}catch(s){throw s=Kr(s),xe(s,181)?(i=s,new f2(i)):Zr(s)}return t}function Hae(e,t,n){var i;try{qse(e,t,n)}catch(s){throw s=Kr(s),xe(s,181)?(i=s,new f2(i)):Zr(s)}return t}function Zr(e){var t;return xe(e,164)&&(t=f(e,164),He(t.b)!==He((qS(),Dp)))?He(t.b)===He(Dp)?null:t.b:e}function wh(e,t){var n;for(n=f(z(Li(e),(le(),Cl)),9);n;){if(n==t)return!0;n=f(z(Li(n),Cl),9)}return!1}function _ae(e){switch(f(z(e,(le(),Qs)),140).e){case 1:ce(e,Qs,(ks(),$h));break;case 2:ce(e,Qs,(ks(),kf))}}function Uo(e){switch(Ta(),e.c){case 0:return lh(),ev;case 1:return new Gu(hB(new eh(e)));default:return new Fj(e)}}function lr(e){gr();var t,n;for(t=0,n=e.length;t<n;t++)if(e[t]==null)throw new rg("at index "+t);return new uo(e)}function Gae(e,t,n){return t.length==0||n.length==0?0:(e.e?e.b=new Vj(e.c):e.b=new Wj(e.c),e.b.Gc(t,n))}function Ct(e){if(e.i==null)throw new zu("The task has not begun yet.");e.b||(e.c<e.j&&eR(e,e.j-e.c),e.b=!0)}function j2(e,t){var n,i;for(i=new M(t);i.a<i.c.c.length;)n=f(O(i),27),Tr(e.b.b,n.b),Vne(f(n.a,78),f(n.b,25))}function $ae(e,t){var n,i;for(i=new M(e.a);i.a<i.c.c.length;)if(n=f(O(i),222),dR(n,t))return;Le(e.a,new gM(t))}function Yae(e){var t,n,i;for(t=new Se,i=new M(e.b);i.a<i.c.c.length;)n=f(O(i),251),Tn(t,f(n.Ac(),19));return t}function Fae(e,t){var n,i,s;for(s=new Se,i=Jn(e,t).mb();i.G();)n=f(i.H(),7),s.c[s.c.length]=n;return Fa(s,new aa),s}function Dr(e){var t,n,i;for(t=new Se,i=new M(e.f);i.a<i.c.c.length;)n=f(O(i),7),Le(t,n.b);return vt(t),new nh(t)}function En(e){var t,n,i;for(t=new Se,i=new M(e.f);i.a<i.c.c.length;)n=f(O(i),7),Le(t,n.e);return vt(t),new nh(t)}function gt(e){var t,n;return e>-129&&e<128?(t=e+128,n=(qM(),G6)[t],!n&&(n=G6[t]=new jS(e)),n):new jS(e)}function xC(e){var t,n;for(t=V2(e.b,e.d),n=kr;n>t;){if(hC(e,e.d),t==0){n=0;break}n8(e),u8(e),n=t,t=V2(e.b,e.d)}e.c=n}function e8(){UC();var e,t,n;n=fhe+++Cie(),e=Xn(Math.floor(n*Lk))&dT,t=Xn(n-e*hT),this.a=e^1502,this.b=t^jk}function Ko(e){return To(e)?G2(e):ih(e)?Xn((ur(e),e)):ah(e)?Pt((ur(e),e))?1231:1237:zy(e)?e.v():(Oy(e),su(e))}function qae(e,t,n){var i,s,l;s=new O8,s.d=n,i=gse(s,t),l=new rA,Pt(ge(Nt(z(i,iL))))?Zie(l,i,new f0):Ez(e,l,i),eH(s,i)}function t8(e,t,n,i){var s,l,h,v;for(v=new _c(t,i),h=0,l=il(v);l.G();)s=f(l.H(),7),un(e.i,s,gt(h++));un(n,t,gt(h))}function Vae(e,t){var n,i,s,l,h;for(n=0,h=0,s=0,l=t.length;s<l;++s)i=t[s],n=VB(e,n,i,(we(),Be),e.f),h=VB(e,h,i,qe,e.n)}function Wae(e,t){var n,i,s,l;if(e.n)for(i=0,s=t.length;i<s;++i)n=t[i],l=Kt(e.n,n),l!=null&&(n.nc(),n.oc())}function Uae(e,t){var n,i,s;for(i=new M(t);i.a<i.c.c.length;)n=f(O(i),75),s=Kue(e.a),GA(e.a,s,n.k,n.j),$d(n,s,!0)}function Kae(e,t){var n,i,s;for(i=new M(t);i.a<i.c.c.length;)n=f(O(i),75),s=jue(e.a),GA(e.a,s,n.k,n.j),$d(n,s,!0)}function N2(e){var t,n;return n=f(z(e,(Ee(),Oo)),59),n==($n(),Mo)?(t=f(z(e,(le(),Yh)),15).a,t>=1?Vi:Ps):n}function xt(e){if(vt(e.b),e.b.G())return!0;for(;e.a.G();)if(vt(e.b=e.Wb(e.a.H())),e.b.G())return!0;return!1}function tf(e){return(e.d!=e.c.d||e.i!=e.g.d)&&(e.a.c=ve(Ze,Me,1,0,4,1),Tn(e.a,e.c),Tn(e.a,e.g),e.d=e.c.d,e.i=e.g.d),e.a}function Na(e){var t;if(e.b){if(Na(e.b),e.b.d!=e.c)throw new gd}else e.d.V()&&(t=f(Kt(e.f.b,e.e),19),t&&(e.d=t))}function TC(e,t,n,i,s){var l,h,v,p;for(p=H0(e),yae(t,p,i,s,n),l=0,v=new M(p);v.a<v.c.c.length;)h=f(O(v),9),e[l++]=h}function Zae(e){var t,n,i;for(i=f(bN(e.a,(Ee(),Mh)),15).a,n=new M(aB(e.a));n.a<n.c.c.length;)t=f(O(n),626),wfe(e,t,i)}function An(){var e,t;for(this.a=new Ni(6),t=0;t<6;t++)Le(this.a,(e=f(Gi(SG),11),new ri(e,f(Ti(e,e.length),11),0)))}function n8(e){var t,n,i;for(i=!1,n=0;n<e.d.length;n++)e.j=(t=new ZC(e.e,e.d,n,0),new VC(n,e.d,t)),i=i|WA(e,n);return i}function Xae(e,t,n){var i,s;for(s=e.a.c,i=s.c.length;i<n;i++)Gc(s,0,new qc(e.a));Ar(t,f(_e(s,s.c.length-n),16)),e.b[t.k]=n}function r8(e,t){var n,i;for(n=Jt(e,0);n.b!=n.d.c;){if(i=ge(Ot(qt(n))),i==t)return;if(i>t){Tg(n);break}}Cg(n,t)}function I2(e,t,n){var i;return i=_m(e.a,t),Xee(e.a,t,n===void 0?null:n),i===void 0?(++e.c,Ly(e.b)):++e.d,i}function M2(e,t,n){return(t-e<=0?0-(t-e):t-e)<oc||(n-e<=0?0-(n-e):n-e)<oc?!0:t-e>oc?e-n>oc:n-e>oc}function i8(e){switch(e.e){case 0:return $E;case 1:return nw;case 2:return YE;case 3:return FE;default:return qE}}function LC(e,t){switch(t.e){case 2:return e.b;case 1:return e.c;case 4:return e.d;case 3:return e.a;default:return!1}}function Z0(e){switch(we(),e.e){case 4:return rt;case 1:return Be;case 3:return ct;case 2:return qe;default:return fr}}function O2(e,t){if(t==e.c)return e.d;if(t==e.d)return e.c;throw new nn("Node "+t+" not part of edge "+e)}function Qae(e,t){var n;return qo(e.a,t)?f(qo(e.a,t)?e.b[t.e]:null,62):(n=new Sj,di(e.a,t),$y(e,t.e,n),n)}function a8(e,t){var n,i,s,l;for(l=e.g.tb(),n=0;l.G();){if(i=ge(Ot(l.H())),s=i-t,s>fl)return n;s>Lp&&++n}return n}function X0(e){var t,n,i,s;return n=(t=f(Gi((i=e.$c,s=i.f,s==on?i:s)),11),new ri(t,f(Ti(t,t.length),11),0)),di(n,e),n}function A2(e,t){var n,i;for(i=new M(t);i.a<i.c.c.length;)n=f(O(i),27),Le(e.b.b,f(n.b,25)),V0(f(n.a,78),f(n.b,25))}function Jae(e,t,n,i){var s,l,h;for(s=t+1;s<n;++s)for(l=s;l>t&&i.$b(e[l-1],e[l])>0;--l)h=e[l],$a(e,l,e[l-1]),$a(e,l-1,h)}function eoe(e){var t,n;if(!gs(f(z(e,(Ee(),dt)),28)))for(n=new M(e.f);n.a<n.c.c.length;)t=f(O(n),7),Bt(t,(we(),fr))}function Ss(e,t){switch(t.e){case 1:return Lo(e.f,(fa(),sL));case 2:return Lo(e.f,(fa(),uL));default:return Qt(),Qt(),yc}}function nr(e,t){return E3(t,(Ee(),FT))?z(e.e,(le(),Ai)):E3(t,vl)?z(e.e,(le(),fv)):z(e.e,t)}function toe(e,t,n,i){var s,l,h;for(l=t,s=n-1;l<=s;){if(h=(l+s)/2|0,e[h]==i)return h;e[h]<i?l=h+1:s=h-1}return-l-1}function Hg(e,t,n){var i,s;for(s=e.mb();s.G();)if(i=s.H(),He(t)===He(i)||t!=null&&jo(t,i))return n&&s.I(),!0;return!1}function o8(e,t,n){var i;return KM(t<=n,"%s > %s",re(ie(Ze,1),Me,1,4,[gt(t),gt(n)])),i=e.length,n=n<i?n:i,_C(t,n,i),n-t}function s8(e,t){var n,i,s;n=e,s=0;do{if(n==t)return s;if(i=f(z(n,(le(),Cl)),9),!i)throw new dd;n=Li(i),++s}while(!0)}function u8(e){var t,n,i;for(i=!1,n=e.d.length-1;n>=0;n--)e.j=(t=new ZC(e.e,e.d,n,1),new VC(n,e.d,t)),i=i|WA(e,n);return i}function PC(e){this.f=(On(),new $t),this.n=new $t,this.k=new $t,this.g=new Yr,this.i=new x8((Ij(),e_)),this.j=e,Vae(this,e)}function DC(e){var t;this.a=(t=f(e.e&&e.e(),11),new ri(t,f(Ti(t,t.length),11),0)),this.b=ve(Ze,Me,1,this.a.a.length,4,1)}function c8(e,t){var n;return t===e?!0:!xe(t,18)||(n=f(t,18),n.Y()!=e.Y())?!1:e.lb(n)}function R2(e){switch(wi(),e.e){case 1:return Ns;case 2:return Cu;case 3:return as;case 4:return bc;default:return pf}}function l8(e,t){switch(t.e){case 1:return e.e.d;case 2:return e.e.c;case 3:return e.e.a;case 4:return e.e.b;default:return 0}}function jC(){return dk(),re(ie(iG,1),De,67,0,[nG,tG,rG,W_,V_,U_,X_,Z_,K_,eG,J_,Q_,F_,Y_,q_,G_,__,$_,z_,B_,H_,sE])}function ec(){ec=c,df=new sg(sf,0),Ds=new sg("JUSTIFIED",1),qT=new sg("BEGIN",2),VT=new sg(Cp,3),WT=new sg("END",4)}function gu(){gu=c,nE=new F1("PORTS",0),Lb=new F1("PORT_LABELS",1),tE=new F1("NODE_LABELS",2),Tb=new F1("MINIMUM_SIZE",3)}function Yi(){Yi=c,Db=new Xm("UNKNOWN",0),rs=new Xm("ABOVE",1),Zs=new Xm("BELOW",2),aG=new nt("de.cau.cs.kieler.labelSide",Db)}function Q0(){Q0=c,H6=new uy("EQUALLY_DISTRIBUTED",0),y5=new uy("NORTH_STACKED",1),_6=new uy("NORTH_SEQUENCE",2)}function noe(){Pp={},!Array.isArray&&(Array.isArray=function(e){return Object.prototype.toString.call(e)==="[object Array]"})}function roe(e,t){return bd(),bd(),((e-t>0?e-t:-(e-t))<=ob||e==t||isNaN(e)&&isNaN(t)?0:e<t?-1:e>t?1:wI(isNaN(e),isNaN(t)))>0}function NC(e,t){return bd(),bd(),((e-t>0?e-t:-(e-t))<=ob||e==t||isNaN(e)&&isNaN(t)?0:e<t?-1:e>t?1:wI(isNaN(e),isNaN(t)))<0}function B2(e){var t,n;for(e.d||ace(e),n=new xi,t=e.b.mb(),t.H();t.G();)an(n,f(t.H(),92).a);return ut(n.b!=0),_s(n,n.c.b),n}function f8(e){var t,n,i,s;for(s=new $i,t=new Fu(e.c),lp(t),i=new M(t);i.a<i.c.c.length;)n=f(O(i),7),s.a.db(n,s);return s}function ioe(e,t){var n,i,s;for(vt(t),i=(s=e.g,f(s||(e.g=new TS(e)),20)).mb();i.G();)n=f(i.H(),21),pt(t,n.zb(),n.yb());return t}function h8(e,t){var n,i,s;return xe(t,21)?(n=f(t,21),i=n.yb(),s=Gg(e.qb(),i),Wl(s,n.zb())&&(s!=null||e.qb().R(i))):!1}function IC(e,t){var n,i,s;for(s=e.g.tb();s.G();)if(n=ge(Ot(s.H())),i=n-t<=0?0-(n-t):n-t,i<fl)return s.L()-1;return e.g.Y()}function d8(e){var t,n;for(n=new M(e.a);n.a<n.c.c.length;)if(t=f(O(n),9),t.g==(et(),Hn)||t.g==Mi)return!1;return!0}function It(e,t,n){if(e.b)throw new zu("The task is already done.");return e.i!=null?!1:(e.i=t,e.j=n,!0)}function aoe(e,t){return e.f<t.f?-1:e.f>t.f?1:e.g<t.g?-1:e.g>t.g?1:e.b-t.b}function ooe(e,t){if(t.c==e)return t.d;if(t.d==e)return t.c;throw new nn("Input edge is not connected to the input port.")}function z2(e){var t;e.c!=0&&(t=f(_e(e.a,e.b),128),t.b==1?(++e.b,e.b<e.a.c.length&&vj(f(_e(e.a,e.b),128))):--t.b,--e.c)}function zd(e,t){return e.b.a=Xt(e.b.a,t.c),e.b.b=Xt(e.b.b,t.d),e.a.a=je(e.a.a,t.c),e.a.b=je(e.a.b,t.d),e.c[e.c.length]=t,!0}function soe(e,t,n){var i,s;return i=ge(e.n[t.f.k])+ge(e.d[t.f.k])+t.i.b+t.a.b,s=ge(e.n[n.f.k])+ge(e.d[n.f.k])+n.i.b+n.a.b,s-i}function v8(e,t,n,i){var s,l,h;return s=!1,Gce(e.j,n,i)&&(_ee(e.j,e.d[t][n],e.d[t][i]),l=e.d[t],h=l[i],l[i]=l[n],l[n]=h,s=!0),s}function J0(e,t,n){var i,s,l,h,v;v=Li(e),s=v.a,i=f(z(v,(le(),ss)),15).a,l=v.d,h=e.i,t&&(h.a=h.a-s.b-i-l.a),n&&(h.b=h.b-s.d-i-l.b)}function g8(e,t){var n,i,s;for(i=Dt(Wg(e));xt(i);)return n=f(Et(i),12),s=f(t.B(n),9),new j1(vt(s.i.b+s.j.b/2));return tg(),tg(),Ak}function b8(e){var t,n,i,s,l;for(i=lk(e),t=Xo,l=0,s=0;t>.5&&l<50;)s=UB(i),n=nf(i,s,!0),t=ni(n.b),++l;return nf(e,s,!1)}function p8(e){var t,n,i,s,l;for(i=lk(e),t=Xo,l=0,s=0;t>.5&&l<50;)s=WB(i),n=nf(i,s,!0),t=ni(n.a),++l;return nf(e,s,!1)}function ep(e){var t,n,i;for(this.a=new $i,this.e=new Yr,this.f=0,n=0,i=e.length;n<i;++n)t=e[n],!this.g&&(this.g=t),V0(this,t)}function w8(e){j4(this),this.c=e.c,this.f=e.f,this.e=e.e,this.k=e.k,this.d=e.d,this.g=ca(e.g),this.j=e.j,this.i=e.i,this.b=ca(e.b)}function H2(e){switch(e.e){case 1:return $n(),Ks;case 4:return $n(),Oa;case 2:return $n(),Vi;case 3:return $n(),Ps}return $n(),Mo}function m8(e,t){return _se(e,t)?(vn(e.g,t),!0):(t.g!=(we(),fr)&&vn(e.i,t),t.e.c.length==0?vn(e.c,t):vn(e.b,t),!1)}function y8(e,t){var n,i;return Xc(0,e.c.length),n=Y2(t,ve(Ze,Me,1,t.a.Y(),4,1)),i=n.length,i==0?!1:(i3(e.c,0,n),!0)}function _2(e,t){for(var n=0;!t[n]||t[n]=="";)n++;for(var i=t[n++];n<t.length;n++)!t[n]||t[n]==""||(i+=e+t[n]);return i}function uoe(){var e;return Ip!=0&&(e=cie(),e-n_>2e3&&(n_=e,Mp=r.setTimeout(ute,10))),Ip++==0?(Mie((VS(),CT)),!0):!1}function Cs(e){var t,n;for(n=new M(e.a.b);n.a<n.c.c.length;)t=f(O(n),25),t.j.d=-t.j.d-t.j.c,t.o&&(t.g.a=-t.g.a+t.o.j.c);bp(e)}function _g(e,t){var n;for(n=e;t.b<t.d.Y()&&n==e;)n=(ut(t.b<t.d.Y()),f(t.d.sb(t.c=t.b++),7)).g;n==e||(ut(t.b>0),t.a.sb(t.c=--t.b))}function coe(e){var t;gi(f(z(e,(Ee(),dt)),28))&&(t=e.c,GB((Sn(0,t.c.length),f(t.c[0],16))),GB(f(_e(t,t.c.length-1),16)))}function k8(e,t,n){It(n,"Compound graph preprocessor",1),e.a=new cg,Lz(e,t,null),sle(e,t),ce(t,(le(),E6),e.a),e.a=null,ho(e.b),Ct(n)}function E8(e){var t,n;return t=f(Et(Dt(Dr(e))),12),n=f(Et(Dt(En(e))),12),!Pt(ge(Nt(z(t,(le(),Js)))))||!Pt(ge(Nt(z(n,Js))))}function loe(e,t,n){t.g==(et(),Hn)&&n.g==hn&&(e.d=L2(t,(we(),ct)),e.b=L2(t,rt)),n.g==Hn&&t.g==hn&&(e.d=L2(n,(we(),rt)),e.b=L2(n,ct))}function foe(e,t,n){var i,s,l,h;return l=t.g,h=n.g,l!=h?l.e-h.e:(i=e.a[t.k],s=e.a[n.k],!i&&!s?0:i?s?yr(i.a,s.a):1:-1)}function hoe(e,t,n,i){var s,l,h,v;for(l=t,s=n-1;l<=s;)if(h=l+s>>>1,v=e[h],v<i)l=h+1;else if(v>i)s=h-1;else return h;return-(l+1)}function doe(e){return xe(e,137)?(Qt(),new H4(f(e,137))):xe(e,18)?(Qt(),new Rl(f(e,18))):xe(e,20)?D3(f(e,20)):(Qt(),new Xv(e))}function S8(e,t,n){return xe(n,137)?new Y4(e,t,f(n,137)):xe(n,18)?new $4(e,t,f(n,18)):xe(n,20)?B3(e,t,f(n,20),null):new Ng(e,t,n,null)}function Hd(e,t){var n;n=e.ub(t);try{return n.H()}catch(i){throw i=Kr(i),xe(i,74)?new _o("Can't get element "+t):Zr(i)}}function Gg(e,t){On(),vt(e);try{return e.cb(t)}catch(n){if(n=Kr(n),xe(n,119))return null;if(xe(n,76))return null;throw Zr(n)}}function voe(e,t){var n=e.a,i;t=String(t),n.hasOwnProperty(t)&&(i=n[t]);var s=(k2(),Hk)[typeof i],l=s?s(i):SC(typeof i);return l}function C8(e,t,n,i){t<n?(e.b=.5*(t+n),e.p=Pk*e.b+.9*t,e.a=Pk*e.b+.9*n):(e.b=.5*(t+i),e.p=Pk*e.b+.9*i,e.a=Pk*e.b+.9*t)}function x8(e){LN.call(this,e),this.b=new fp(e,!1,null,(xo(),Ua),!1,null,Ua),this.a=new q0(null,1),zj(this.a,this.a),this.c=new C}function tp(e){switch(r4(),this.c=new Se,this.d=e,e.e){case 0:case 2:this.a=Ire(aL),this.b=ki;break;case 3:case 1:this.a=aL,this.b=Hr}}function Zo(){Zo=c,_k=new yd("AUTOMATIC",0),Rp=new yd(Wd,1),Bp=new yd(Ud,2),zp=new yd("TOP",3),Op=new yd("BOTTOM",4),Ap=new yd(Cp,5)}function G2(e){bI();var t,n,i;return n=":"+e,i=vw[n],i!==void 0?i:(i=W6[n],t=i===void 0?Vse(e):i,are(),vw[n]=t,t)}function goe(e,t,n,i,s,l,h){Ta();var v,p;return p=h.length+6,v=new Ni(p),Bg(v,re(ie(Ze,1),Me,1,4,[e,t,n,i,s,l])),Bg(v,h),_8(new M(v))}function boe(e){var t;t=f(z(e,(Ee(),ia)),18),!t.V()&&(t.kb((pu(),Wi))?(t.nb(Wi),t.ib(Ki)):t.kb(Ki)&&(t.nb(Ki),t.ib(Wi)))}function poe(e){var t;t=f(z(e,(Ee(),ia)),18),!t.V()&&(t.kb((pu(),ba))?(t.nb(ba),t.ib(va)):t.kb(va)&&(t.nb(va),t.ib(ba)))}function woe(e,t){var n,i,s,l;return s=e.g,n=ge(Ot(z(e,(le(),Lu)))),l=t.g,i=ge(Ot(z(t,Lu))),l!=(et(),Cn)?-1:s!=Cn?1:n==i?0:n<i?-1:1}function moe(e,t,n){var i,s;return i=Hu(Hc(e,t.d),Hc(e,t.c)),s=ti(Hc(e,t.d),Hc(e,t.c)),vh(wC(Mae(n,gt(i),(xo(),Ua),gt(s),Ua),(r0(),Bk)))}function T8(e,t){On(),vt(e);try{return e.R(t)}catch(n){if(n=Kr(n),xe(n,119))return!1;if(xe(n,76))return!1;throw Zr(n)}}function L8(e,t){Yo(),vt(e);try{return R3(e,t)}catch(n){if(n=Kr(n),xe(n,119))return!1;if(xe(n,76))return!1;throw Zr(n)}}function yoe(e,t){return e.e<t.e?-1:e.e>t.e?1:e.f<t.f?-1:e.f>t.f?1:su(e)-su(t)}function P8(e){switch(e.e){case 1:return we(),qe;case 4:return we(),rt;case 3:return we(),Be;case 2:return we(),ct;default:return we(),fr}}function D8(e){var t,n;switch(t=Gy(e.c,e.c.length),t.length){case 0:return db;case 1:return n=new fu(t[0]),n;default:return new Qn(lr(t))}}function koe(e){var t,n,i,s;for(i=ve(Yfe,Me,64,e.c.length,0,1),s=0,n=new M(e);n.a<n.c.c.length;)t=f(O(n),64),i[s++]=t;return new F9(i)}function j8(e){var t,n;if(!e.b)for(e.b=zc(e.a.b.c.length),n=new M(e.a.b);n.a<n.c.c.length;)t=f(O(n),33),Le(e.b,new Tm(t));return e.b}function mh(e,t){var n,i,s;if(e.e)return 1;for(n=0,s=new M(t.f);s.a<s.c.c.length;)i=f(O(s),7),n+=i.b.c.length+i.e.c.length;return n}function N8(e){var t,n,i,s;for(t=!1,s=!1,i=new M(e.f);i.a<i.c.c.length;)n=f(O(i),7),t=t|n.g==(we(),Be),s=s|n.g==qe;return t&&s}function I8(e){var t,n;for(this.b=new Se,this.c=e,this.a=!1,n=new M(e.b);n.a<n.c.c.length;)t=f(O(n),9),this.a=this.a|t.g==(et(),Hn)}function Va(e){_4.call(this),this.g=(et(),Hn),this.f=(hi(6,ul),new Ni(6)),this.c=(hi(2,ul),new Ni(2)),this.e=new km,this.b=new km,this.a=e}function MC(e,t,n,i,s,l){j4(this),this.e=e,this.f=t,this.d=n,this.c=i,this.g=s,this.b=l,this.j=ge(Ot(s.mb().H())),this.i=ge(Ot(qA(s)))}function Eoe(e,t){if(e==null)throw new rg("null key in entry: null="+t);if(t==null)throw new rg("null value in entry: "+e+"=null")}function M8(){M8=c,n$=Sg(new An,(jr(),av)),Qp=new nt("linearSegments.inputPrio",gt(0)),Jp=new nt("linearSegments.outputPrio",gt(0))}function OC(e){var t,n,i,s;for(n=(s=new Kv(e.b).a.bb().mb(),new Zv(s));n.a.G();)t=(i=f(n.a.H(),21),f(i.zb(),19)),t.Q();ho(e.b),e.c=0}function Jt(e,t){var n,i;if(Xc(t,e.b),t>=e.b>>1)for(i=e.c,n=e.b;n>t;--n)i=i.b;else for(i=e.a.a,n=0;n<t;++n)i=i.a;return new DM(e,t,i)}function Qc(e,t){var n,i,s;for(s=new Fr,i=e.mb();i.G();)n=f(i.H(),55),tb(n,s.a,0),s.a+=n.e.a+t,s.b=je(s.b,n.e.b);return s.b>0&&(s.b+=t),s}function np(e,t){var n,i,s;for(s=new Fr,i=e.mb();i.G();)n=f(i.H(),55),tb(n,0,s.b),s.b+=n.e.b+t,s.a=je(s.a,n.e.a);return s.a>0&&(s.a+=t),s}function $g(e,t,n){var i,s,l;return s=f(Kt(e.c,t),176),s?(l=J4(s,n),WI(e,s),l):(i=new a3(e,t,n),un(e.c,t,i),IO(i),null)}function Soe(e,t){return Sue(e.b).kb(t.c)?tre(e.b)?!(Ny(t.d,e.c,e.a)&&Ny(t.a,e.c,e.a)):Ny(t.d,e.c,e.a)&&Ny(t.a,e.c,e.a):!1}function Coe(e,t){return e.c<t.c||e.c==t.c&&qy(e.a)&&qy(t.a)&&Hc(e.d,by(e.a,e.b))>Hc(e.d,by(t.a,t.b))?-1:e.c==t.c&&by(e.a,e.b)==by(e.a,e.b)?0:1}function xoe(e,t,n){if(e.e)switch(e.b){case 1:$ne(e.c,t,n);break;case 0:Gne(e.c,t,n)}else Are(e.c,t,n);e.a[t.k][n.k]=e.c.i,e.a[n.k][t.k]=e.c.e}function Toe(e,t,n){switch(n.e){case 1:e.a=t.a/2,e.b=0;break;case 2:e.a=t.a,e.b=t.b/2;break;case 3:e.a=t.a/2,e.b=t.b;break;case 4:e.a=0,e.b=t.b/2}}function AC(e){switch(e.e){case 8:return we(),rt;case 9:return we(),ct;case 10:return we(),Be;case 11:return we(),qe;default:return we(),fr}}function Loe(e){var t,n,i;for(t="Ot",i=Hu(e.length,5),n=0;n<i;n++)if(Ho(e[n].d,t)){e.length>=n+1&&e.splice(0,n+1);break}return e}function $2(e,t){return To(e)?!!WH[t]:e._c?!!e._c[t]:ih(e)?!!VH[t]:ah(e)?!!qH[t]:!1}function O8(){bC(),this.i=(On(),new $t),this.a=new $t,this.k=new $t,this.j=new $t,this.b=new $t,this.n=new $t,this.f=new $t,this.e=new $t}function Poe(e,t){var n,i;t.a.R(e)||(i=f(z(e,(le(),_r)),32),n=f(_e(e.f,0),7),i==(we(),rt)?Bt(n,ct):i==ct&&Bt(n,rt),t.a.db(e,t))}function A8(e){var t,n;return n=ti(1,f(z(e,(le(),Qa)),24).a),e.c.f.g==(et(),Hn)&&e.d.f.g==Hn?t=1:e.c.f.g==Hn||e.d.f.g==Hn?t=2:t=8,n*t}function Doe(e){var t,n,i,s,l;for(l=f(z(e,(le(),lt)),7),t=f(Vn(e.b,ve(Xi,qi,12,e.b.c.length,0,1)),47),i=0,s=t.length;i<s;++i)n=t[i],kn(n,l)}function joe(e){var t,n,i,s,l;for(n=f(z(e,(le(),lt)),7),t=f(Vn(e.e,ve(Xi,qi,12,e.e.c.length,0,1)),47),s=0,l=t.length;s<l;++s)i=t[s],Bn(i,n)}function R8(e){var t,n;n=e.i,t=dn(new ot(n.a,n.b),e.j),this.d=Xt(n.b,t.b),this.a=je(n.b,t.b),this.b=Xt(n.a,t.a),this.c=je(n.a,t.a)}function yh(e,t,n,i){var s,l,h,v;!i&&(i=(Hl(),Hl(),Cf)),s=(l=o8(e,t,n),h=(v=new Array(n-t),Ig(v,e)),q2(e,t,h,0,l,!0),h),tx(s,e,t,n,-t,i)}function Vn(e,t){var n,i,s;for(s=e.c.length,t.length<s&&(t=(i=new Array(s),Ig(i,t))),n=0;n<s;++n)$a(t,n,e.c[n]);return t.length>s&&$a(t,s,null),t}function B8(e,t){var n,i,s;for(s=e.a.length,t.length<s&&(t=(i=new Array(s),Ig(i,t))),n=0;n<s;++n)$a(t,n,e.a[n]);return t.length>s&&$a(t,s,null),t}function ha(e){return To(e)?e:ih(e)?CN((ur(e),e)):ah(e)?zI(Pt((ur(e),e))):zy(e)?e.w():Oy(e)?PO(e):e.toString?e.toString():"[JavaScriptObject]"}function Noe(e){var t,n,i,s,l;for(l=0,n=e.b,i=0,s=n.length;i<s;++i)t=n[i],t.g==(et(),hn)||un(e.c,t,gt(l++)),t8(e,t,e.d,(we(),rt)),t8(e,t,e.j,ct)}function rp(){rp=c,r6=new lg("SIMPLE",0),e6=new lg(Tk,1),t6=new lg("LINEAR_SEGMENTS",2),IE=new lg("BRANDES_KOEPF",3),n6=new lg(RH,4)}function Fi(){Fi=c,Sf=new hg(Kd,0),_b=new hg("FIRST",1),mc=new hg("FIRST_SEPARATE",2),dv=new hg("LAST",3),Pu=new hg("LAST_SEPARATE",4)}function ip(){ip=c,ew=new a9,y$=pi(new An,(jr(),Yp)),k$=bi(pi(new An,Kp),Up),w$=bi(Pa(pi(p0(new An,Fp),Vp),Gh),qp),m$=bi(Pa(new An,Gh),$p)}function Ioe(e){var t,n,i,s;for(n=(s=new Wt(e.d.a).a.bb().mb(),new Zt(s));n.a.G();)t=(i=f(n.a.H(),21),f(i.yb(),12)),Le(t.c.e,t),Le(t.d.b,t)}function RC(e,t){var n,i;if(CI(t>0),(t&-t)==t)return Xn(t*rf(e,31)*4656612873077393e-25);do n=rf(e,31),i=n%t;while(n-i+(t-1)<0);return Xn(i)}function Moe(e,t){if(e.c.f==t)return e.d.f;if(e.d.f==t)return e.c.f;throw new nn("Node "+t+" is neither source nor target of edge "+e)}function Ooe(e,t,n){return CI(e>=0&&e<=1114111),e>=rb?(t[n++]=55296+(e-rb>>10&1023)&Ts,t[n]=56320+(e-rb&1023)&Ts,2):(t[n]=e&Ts,1)}function Aoe(e,t){_n();for(var n,i;e.G();)if(!t.G()||(n=e.H(),i=t.H(),!(He(n)===He(i)||n!=null&&jo(n,i))))return!1;return!t.G()}function Roe(e){var t,n,i;for(z1(e.b.a),e.a=ve(Gp,Me,25,e.c.b.a.b.c.length,0,1),t=0,i=new M(e.c.b.a.b);i.a<i.c.c.length;)n=f(O(i),25),n.k=t++}function Boe(e){var t,n,i,s;for(Fa(e.c,e.a),s=new M(e.c);s.a<s.c.c.length;)for(i=O(s),n=new M(e.b);n.a<n.c.c.length;)t=f(O(n),160),t.Ec(i)}function Yg(e){var t,n;if(!e.a)for(e.a=zc(f(e.e,9).c.c.length),n=new M(f(e.e,9).c);n.a<n.c.c.length;)t=f(O(n),33),Le(e.a,new Tm(t));return e.a}function Fg(e){var t,n;if(!e.b)for(e.b=zc(f(e.e,7).c.c.length),n=new M(f(e.e,7).c);n.a<n.c.c.length;)t=f(O(n),33),Le(e.b,new Tm(t));return e.b}function z8(e){this.b=e,this.c=(On(),new $t),this.i=new $t,this.d=new $t,this.j=new $t,this.k=He(z(Li(e[0]),(Ee(),hf)))===He((du(),ff)),Noe(this)}function _d(e){switch(e.e){case 1:return 4.71238898038469;default:case 2:return 0;case 3:return 1.5707963267948966;case 4:return 3.141592653589793}}function BC(e){_n();var t;if(t=vie(e),!xt(e))throw new _o("position (0) must be less than the number of elements that remained ("+t+")");return Et(e)}function zC(e,t){var n,i;n=e.ub(t);try{return i=n.H(),n.I(),i}catch(s){throw s=Kr(s),xe(s,74)?new _o("Can't remove element "+t):Zr(s)}}function Y2(e,t){var n,i,s,l;for(l=e.Y(),t.length<l&&(t=(s=new Array(l),Ig(s,t))),i=e.mb(),n=0;n<l;++n)$a(t,n,i.H());return t.length>l&&$a(t,l,null),t}function kh(e,t,n){if(n&&(t<0||t>n.a.c.length))throw new nn("index must be >= 0 and <= layer node count");e.d&&Tr(e.d.a,e),e.d=n,n&&Gc(n.a,t,e)}function HC(e,t,n,i,s,l,h,v){var p,m;i&&(p=i.a[0],p&&HC(e,t,n,p,s,l,h,v),qoe(e,n,i.d,s,l,h,v)&&t.ib(i),m=i.a[1],m&&HC(e,t,n,m,s,l,h,v))}function _C(e,t,n){if(e<0)throw new _o(sH+e+" < 0");if(t>n)throw new _o("toIndex: "+t+" > size "+n);if(e>t)throw new nn(sH+e+" > toIndex: "+t)}function F2(e,t){var n,i,s;return n=t.yb(),s=t.zb(),i=e.cb(n),!(!(He(s)===He(i)||s!=null&&jo(s,i))||i==null&&!e.R(n))}function zoe(e,t,n){var i;i=t.c.f,i.g==(et(),hn)?(ce(e,(le(),Oi),f(z(i,Oi),7)),ce(e,Si,f(z(i,Si),7))):(ce(e,(le(),Oi),t.c),ce(e,Si,n.d))}function Hoe(e,t,n){var i;i=t.c.f,i.g==(et(),hn)?(ce(e,(le(),Oi),f(z(i,Oi),7)),ce(e,Si,f(z(i,Si),7))):(ce(e,(le(),Oi),t.c),ce(e,Si,n.d))}function GC(e,t,n){var i,s,l,h,v;for(Aie(e),s=(e.i==null&&(e.i=ve($fe,Nr,46,0,0,1)),e.i),l=0,h=s.length;l<h;++l)i=s[l],GC(i);v=e.e,v&&GC(v)}function H8(e,t){var n=new Array(t),i;switch(e){case 11:case 12:i=0;break;case 13:i=!1;break;default:return n}for(var s=0;s<t;++s)n[s]=i;return n}function _oe(e){var t,n,i,s;for(s=ve(Er,Nr,51,e.a.length,0,2),n=0;n<s.length;n++)i=e.a[n].length,t=ve(Er,Ii,9,i,0,1),Zce(e.a[n],0,t,0,i),s[n]=t;return s}function tc(e){var t,n;if(!e.b)for(e.b=zc(f(e.e,9).f.c.length),n=new M(f(e.e,9).f);n.a<n.c.c.length;)t=f(O(n),7),Le(e.b,new GN(t,e.c));return e.b}function Goe(e,t){On(),vt(e);try{return To(t)?bO(e,t):rk(e.d,t)}catch(n){if(n=Kr(n),xe(n,119))return null;if(xe(n,76))return null;throw Zr(n)}}function $oe(e){var t;return t=(XA(),uY),t[e>>>28]|t[e>>24&15]<<4|t[e>>20&15]<<8|t[e>>16&15]<<12|t[e>>12&15]<<16|t[e>>8&15]<<20|t[e>>4&15]<<24|t[e&15]<<28}function Yoe(e,t,n){var i,s;return t.c==(cr(),ai)&&n.c==Ri?-1:t.c==Ri&&n.c==ai?1:(i=s8(t.a,e.a),s=s8(n.a,e.a),t.c==ai?s-i:i-s)}function Foe(e){var t,n,i,s,l;for(s=kr,l=null,i=new M(e.d);i.a<i.c.c.length;)n=f(O(i),89),n.c.j^n.d.j&&(t=n.d.e-n.c.e-n.a,t<s&&(s=t,l=n));return l}function qoe(e,t,n,i,s,l,h){var v,p;return!(t.Xc()&&(p=e.a.$b(n,i),p<0||!s&&p==0)||t.Yc()&&(v=e.a.$b(n,l),v>0||!h&&v==0))}function _8(e){Ta();var t,n;if(!e.G())return lh(),ev;if(n=e.H(),!e.G())return new Gu(n);t=new $i,vn(t,vt(n));do vn(t,vt(e.H()));while(e.G());return CC(t)}function Voe(e,t,n){e.e=t,e.a=n,e.d=m2(e,(we(),Be)),e.d+=m2(e,qe),Zg(e,t,n,Be,e.f),Zg(e,t,n,qe,e.n),e.b=m2(e,Be),e.b+=m2(e,qe),Zg(e,n,t,Be,e.f),Zg(e,n,t,qe,e.n)}function Jc(e){var t,n,i;for(n=(mn(),e.length),i=0;i<n&&e.charCodeAt(i)<=32;)++i;for(t=n;t>i&&e.charCodeAt(t-1)<=32;)--t;return i>0||t<n?e.substr(i,t-i):e}function q2(e,t,n,i,s,l){var h,v,p;for(He(e)===He(n)&&(e=e.slice(t,t+s),t=0),v=t,p=t+s;v<p;)h=v+1e4<p?v+1e4:p,s=h-v,nie(n,i,l?s:0,e.slice(v,h)),v=h,i+=s}function Woe(e){var t,n,i;return G8(e,(G0(),xT))<0?-Yte((t=~e.l+1&Wa,n=~e.m+(t==0?1:0)&Wa,i=~e.h+(t==0&&n==0?1:0)&ic,qu(t,n,i))):e.l+e.m*of+e.h*ac}function Uoe(e,t){var n;switch(n=e.f,t.e){case 1:return-(e.i.b+e.j.b);case 2:return e.i.a-n.j.a;case 3:return e.i.b-n.j.b;case 4:return-(e.i.a+e.j.a)}return 0}function zn(){zn=c,cc=new Ed(sf,0),Ao=new Ed("FREE",1),Cb=new Ed("FIXED_SIDE",2),Ah=new Ed("FIXED_ORDER",3),ts=new Ed("FIXED_RATIO",4),ii=new Ed("FIXED_POS",5)}function Koe(e,t){var n,i,s,l;for(n=f(z(t,(le(),Ef)),18),l=f(Ia(St,n),18),s=l.mb();s.G();)if(i=f(s.H(),18),!f(Ia(e.a,i),20).V())return!1;return!0}function $C(e,t,n){this.b=new Ty,this.i=new Se,this.d=new q9(this),this.g=e,this.a=t.c.length,this.c=t,this.e=f(_e(this.c,this.c.c.length-1),9),this.f=n,Vce(this)}function ap(){ap=c,nw=new fg("ALWAYS_UP",0),$E=new fg("ALWAYS_DOWN",1),FE=new fg("DIRECTION_UP",2),YE=new fg("DIRECTION_DOWN",3),qE=new fg("SMART",4)}function G8(e,t){var n,i,s,l,h,v,p,m;return p=e.h>>19,m=t.h>>19,p!=m?m-p:(s=e.h,v=t.h,s!=v?s-v:(i=e.m,h=t.m,i!=h?i-h:(n=e.l,l=t.l,n-l)))}function $8(e){var t,n,i,s;for(n=(s=new Wt(e.p.a).a.bb().mb(),new Zt(s));n.a.G();)if(t=(i=f(n.a.H(),21),f(i.yb(),89)),t.e&&e.b[t.b]<0)return t;return null}function qg(e,t){var n,i,s,l,h;i=Xt(e.d,t.d),l=Xt(e.e,t.e),s=je(e.d+e.c,t.d+t.c),h=je(e.e+e.b,t.e+t.b),s<i&&(n=i,i=s,s=n),h<l&&(n=l,l=h,h=n),SM(e,i,l,s-i,h-l)}function op(e,t){var n;if(yk in e.a){if(n=Mn(e,yk),!n.kc())throw new ps("The 'properties' property of a graph element must be an object.",n,e);nB(n.kc(),t,!0)}}function Zoe(e,t){var n,i,s;if(i=e.b.j.e,e.a||(i+=e.b.j.b),s=t.b.j.e,t.a||(s+=t.b.j.b),n=yr(i,s),n==0){if(!e.a&&t.a)return-1;if(!t.a&&e.a)return 1}return n}function YC(e){var t,n;switch(f(z(Li(e),(zt(),v5)),174).e){case 0:return t=e.i,n=e.j,new ot(t.a+n.a/2,t.b+n.b/2);case 1:return new qn(e.i);default:return null}}function Yn(){fa(),_4.call(this),this.g=(we(),fr),this.a=new Fr,this.d=new km,this.c=(hi(2,ul),new Ni(2)),this.b=(hi(4,ul),new Ni(4)),this.e=(hi(4,ul),new Ni(4))}function Xoe(e,t,n){e.d=0,e.b=0,Lue(e,t,n),t.g==(et(),er)&&n.g==hn?u2(t).g==(we(),rt)?e.d=1:e.b=1:n.g==er&&t.g==hn&&(u2(n).g==(we(),rt)?e.b=1:e.d=1),loe(e,t,n)}function Qoe(e,t){var n,i;for(i=new M(t);i.a<i.c.c.length;)n=f(O(i),9),e.a[n.d.k][n.k].a=iae(e.e),e.a[n.d.k][n.k].d=ge(e.a[n.d.k][n.k].a),e.a[n.d.k][n.k].b=1}function Joe(e,t,n){var i,s,l;for(l=new M(t);l.a<l.c.c.length;)i=f(O(l),9),e.a[i.d.k][i.k].e=!1;for(s=new M(t);s.a<s.c.c.length;)i=f(O(s),9),Rx(e,i,n)}function ese(e,t){var n,i,s,l;for(n=0,i=0,l=new M(t.b);l.a<l.c.c.length;)s=f(O(l),33),n=je(n,s.j.a),i+=s.j.b;ce(t,(le(),eY),new ot(n,i)),e.k<n&&(e.k=n),e.j+=i}function Y8(e,t){this.c=(On(),new $t),this.a=e,this.b=t,this.d=f(z(e,(le(),xl)),134),He(z(e,(zt(),u5)))===He((Mg(),OE))?this.e=new Gj:this.e=new _j}function V2(e,t){var n,i,s,l;for(s=0,i=0;i<t.length;i++)n=t[i],i<t.length-1&&(l=t[i+1],s+=Gae(e,n,l)),s+=(e.d=new z8(n),zse(e.d)),s+=(e.a=new PC(n),rre(e.a));return s}function FC(e){switch(e.c.e){case 1:return fa(),dE;case 2:return fa(),hE;case 3:return fa(),vE;case 4:return fa(),gE}throw new qf("Can't filter on undefined side")}function sp(e,t){var n;try{return n=e.c.a,!yg(e.b,t)||!n?0:lC(n,e.d,t)}catch(i){if(i=Kr(i),xe(i,119))return 0;if(xe(i,76))return 0;throw Zr(i)}}function tse(e){var t,n,i,s,l;for(i=new ef(new ou(e.b).a);i.b;)n=Rd(i),t=f(n.yb(),9),l=f(f(n.zb(),27).a,9),s=f(f(n.zb(),27).b,10),dn(zs(t.i),dn(Ga(l.i),s))}function nse(e,t,n){var i,s,l;if(i=yr(e.a[t.k],e.a[n.k]),i==0){if(s=f(z(t,(le(),Fh)),20),l=f(z(n,Fh),20),s.kb(n))return-1;if(l.kb(t))return 1}return i}function rse(e,t){var n,i;switch(i=dn(Ga(e.i),e.a),n=e.f.j,t.e){case 1:return-i.b;case 2:return-i.a+n.a;case 3:return-i.b+n.b;case 4:return-i.a;default:return 0}}function F8(e,t){var n,i,s,l;for(s=0;s<t.length;s++)for(s+1<t.length&&$3(e,t[s+1],(cr(),Ri)),l=t[s],n=0,i=0;i<l.length;i++)zfe(e,l[i]),n+=e.Hc(l[i],n,(cr(),ai))}function qC(){qC=c,$$=Pa(Pa(Vu(new An,(jr(),RL)),AL),BL),z$=bi(Pa(pi(p0(new An,Fp),Vp),Gh),qp),_$=pi(new An,Yp),G$=bi(pi(new An,Kp),Up),H$=bi(Pa(new An,Gh),$p)}function ise(e,t,n,i){Qj();var s=Ik;function l(){for(var h=0;h<s.length;h++)s[h]()}if(e)try{bw(l)()}catch(h){e(t,h)}else bw(l)()}function up(e){if(gT==null&&(gT=/^\s*[+-]?(NaN|Infinity|((\d+\.?\d*)|(\.\d+))([eE][+-]?\d+)?[dDfF]?)\s*$/),!lte(gT,e))throw new H1(gk+e+'"');return parseFloat(e)}function Vg(){Vg=c,WE=new Td(Kd,0),s6=new Td("LEFTUP",1),c6=new Td("RIGHTUP",2),o6=new Td("LEFTDOWN",3),u6=new Td("RIGHTDOWN",4),VE=new Td("BALANCED",5)}function Gd(){Gd=c,_E=new xd("V_TOP",0),HE=new xd("V_CENTER",1),zE=new xd("V_BOTTOM",2),RE=new xd("H_LEFT",3),AE=new xd("H_CENTER",4),BE=new xd("H_RIGHT",5)}function cp(){cp=c,Fk=new kd(Kd,0),jT=new kd("DIRECTED",1),IT=new kd("UNDIRECTED",2),PT=new kd("ASSOCIATION",3),NT=new kd("GENERALIZATION",4),DT=new kd("DEPENDENCY",5)}function et(){et=c,Hn=new Sd("NORMAL",0),hn=new Sd("LONG_EDGE",1),Cn=new Sd("EXTERNAL_PORT",2),er=new Sd("NORTH_SOUTH_PORT",3),Za=new Sd("LABEL",4),Mi=new Sd("BIG_NODE",5)}function q8(e,t,n,i,s,l,h){var v,p,m,S,x;if(S=s[l],m=l==h-1,v=m?i:0,x=H8(v,S),i!=9&&re(ie(e,h-l),t[l],n[l],v,x),!m)for(++l,p=0;p<S;++p)x[p]=q8(e,t,n,i,s,l,h);return x}function Wg(e){var t,n,i;for(t=new Se,i=new M(e.f);i.a<i.c.c.length;)n=f(O(i),7),Le(t,Ca((gr(),new Qn(lr(re(ie(Ze,1),Me,1,4,[n.b,n.e]))))));return vt(t),new nh(t)}function VC(e,t,n){if(this.a=n,e>=t.length)throw new _o("Greedy SwitchDecider: Free layer layer not in graph.");this.b=t[e],this.c=new hM(this.b),this.d=new bR(this.b)}function V8(e,t){var n;if(this.f=e,this.b=this.f.c,n=e.d,a2(t,n),t>=(n/2|0))for(this.e=e.e,this.d=n;t++<n;)qO(this);else for(this.c=e.a;t-- >0;)FO(this);this.a=null}function el(e){var t,n,i;for(n=new M(e.a.b);n.a<n.c.c.length;)t=f(O(n),25),i=t.j.d,t.j.d=t.j.e,t.j.e=i,i=t.j.c,t.j.c=t.j.b,t.j.b=i,i=t.g.a,t.g.a=t.g.b,t.g.b=i;bp(e)}function ase(e,t){var n,i,s;for(i=new fn(e.b,0);i.b<i.d.Y();)n=(ut(i.b<i.d.Y()),f(i.d.sb(i.c=i.b++),33)),s=f(z(n,(Ee(),da)),107),s==(Es(),dl)&&(Po(i),Le(t.b,n))}function ose(e,t,n){var i,s,l,h;for(h=ji(e.f,t,0),l=new YS,l.b=n,i=new fn(e.f,h);i.b<i.d.Y();)s=(ut(i.b<i.d.Y()),f(i.d.sb(i.c=i.b++),9)),s.k=n,Le(l.f,s),Po(i);return l}function sse(e,t){Ff();var n,i,s;if(t.V())return!1;if(xe(t,207))for(s=f(t,207),i=s.bb().mb();i.G();)n=f(i.H(),83),e.Bb(n.Zb(),n.Yb());else b2(e,t.mb());return!0}function Eh(){Eh=c,Pb=new q1("DEFAULT_MINIMUM_SIZE",0),aE=new q1("MINIMUM_SIZE_ACCOUNTS_FOR_INSETS",1),iE=new q1("COMPUTE_INSETS",2),rE=new q1("APPLY_ADDITIONAL_INSETS",3)}function W8(e){var t,n,i,s;for(n=e.a.b+2,s=ve(_t,Ht,10,n,0,1),s[0]=Ga(Di(e.c)),i=Jt(e.a,0);i.b!=i.d.c;)t=f(qt(i),10),s[i.a]=new ot(t.a,t.b);return s[n-1]=Ga(Di(e.d)),s}function WC(e,t,n){var i,s,l;for(s=e.bb().mb();s.G();)if(i=f(s.H(),21),l=i.yb(),He(t)===He(l)||t!=null&&jo(t,l))return n&&(i=new Q1(i.yb(),i.zb()),s.I()),i;return null}function use(e,t,n){var i,s;return i=e.a[t.d.k][t.k],s=e.a[n.d.k][n.k],i.a!=null&&s.a!=null?QM(i.a,s.a):i.a!=null?-1:s.a!=null?1:0}function cse(e,t,n){var i,s,l;return s=t.c,l=t.d,i=n,vn(e.a,t)?(m8(e,s)&&(i=!0),m8(e,l)&&(i=!0),i&&(Tr(t.c.e,t),Tr(t.d.b,t),vn(e.d,t)),ese(e,t),!0):!1}function nf(e,t,n){var i,s;return s=a8(e,t),s==e.c?V4(e,IC(e,t)):n?(uB(e,t,e.c-s),V4(e,IC(e,t))):(i=new w8(e),uB(i,t,e.c-s),V4(i,IC(i,t)))}function lse(){function e(){try{return new Map().entries().next().done}catch{return!1}}return typeof Map===iH&&Map.prototype.entries&&e()?Map:lfe()}function Ia(e,t){var n;return n=f(Kt(e.b,t),19),!n&&(n=e.Z()),xe(n,137)?new Y4(e,t,f(n,137)):xe(n,18)?new $4(e,t,f(n,18)):xe(n,20)?B3(e,t,f(n,20),null):new Ng(e,t,n,null)}function bu(e){switch(vs(e.e)-vs(e.g)){case-2:return mI(e.g)>0&&(e.g=eB(e.g)),J8(e);case 2:return mI(e.e)<0&&(e.e=J8(e.e)),eB(e);default:return e.d=1+ti(vs(e.e),vs(e.g)),e}}function U8(e,t){this.f=(On(),new $t),this.b=new $t,this.j=new $t,this.a=e,this.c=t,this.c>0&&yB(this,this.c-1,(we(),Be)),this.c<this.a.length-1&&yB(this,this.c+1,(we(),qe))}function fse(e){var t;e.c==null&&(t=He(e.b)===He(Dp)?null:e.b,e.d=t==null?Fs:WM(t)?Bte(vO(t)):To(t)?"String":_1(Od(t)),e.a=e.a+": "+(WM(t)?Kte(vO(t)):t+""),e.c="("+e.d+") "+e.a)}function hse(e){var t,n,i,s;for(n=new M(e.a.c);n.a<n.c.c.length;)for(t=f(O(n),9),s=Jt(ca(t.c),0);s.b!=s.d.c;)i=f(qt(s),33),z(i,(le(),lt))==null&&Tr(t.c,i);return null}function tl(e,t){var n,i,s,l,h;for(h=new Se,i=f(fh(yl,e),20).mb();i.G();)n=f(i.H(),75),Tn(h,n.b);for(lp(h),d2(h,e.a),l=new M(h);l.a<l.c.c.length;)s=f(O(l),7),cu(t,s)}function dse(e){for(var t,n,i,s;e.o.a.c.length!=0;)n=f(AR(e.o),27),i=f(n.a,61),t=f(n.b,89),s=O2(t,i),t.d==i?(Wu(s.g,t),i.e=s.e+t.a):(Wu(s.c,t),i.e=s.e-t.a),Le(e.e.a,i)}function K8(e,t,n){var i,s,l;return hi(n,"count"),yg(e.b,t)?(l=e.c.a,l?(s=ve(Kn,Wn,26,1,12,1),i=Ex(l,e.d,t,n,s),k0(e.c,l,i),s[0]):(n>0&&hp(e,t,n),0)):(th(n==0),0)}function Z8(e,t){var n,i,s,l,h;for(s=f(z(t,(le(),Ai)),15).a*f(z(t,(zt(),eu)),15).a,h=e[0].i.a+e[0].j.a,l=1;l<e.length;l++)n=e[l].i,i=e[l].j,n.a<=h+s&&(n.a=h+s),h=n.a+i.a}function UC(){UC=c;var e,t,n,i;for(F6=ve(Qi,mi,26,25,12,1),q6=ve(Qi,mi,26,33,12,1),i=152587890625e-16,t=32;t>=0;t--)q6[t]=i,i*=.5;for(n=1,e=24;e>=0;e--)F6[e]=n,n*=.5}function X8(e){for(;e.g.c!=0&&e.d.c!=0;)Ey(e.g).c>Ey(e.d).c?(e.i+=e.g.c,z2(e.d)):Ey(e.d).c>Ey(e.g).c?(e.e+=e.d.c,z2(e.g)):(e.i+=AM(e.g),e.e+=AM(e.d),z2(e.g),z2(e.d))}function vse(e){if(!e)throw new Om("An element is null. The origin of an edge could not be determined, this might be due to an inconsistency within the internal element mappings.")}function gse(e,t){var n,i;return ho(e.i),ho(e.a),ho(e.k),ho(e.j),ho(e.b),ho(e.n),ho(e.f),ho(e.e),e.d&&(i=Mn(e.d,KT.b),i&&i.ic()&&(e.c=i.ic().a)),n=Wz(e,t,null),pz(e,t),n}function bse(e){var t,n,i,s,l,h;for(i=vz(lk(e)),t=Xo,l=0,s=0;t>.5&&l<50;)s=UB(i),n=nf(i,s,!0),t=ni(n.b),++l;return h=Ot(Hd(ca(e.g),ca(e.g).b-1)),nf(e,(ur(h),h-s),!1)}function pse(e){var t,n,i,s,l,h;for(i=vz(lk(e)),t=Xo,l=0,s=0;t>.5&&l<50;)s=WB(i),n=nf(i,s,!0),t=ni(n.a),++l;return h=Ot(Hd(ca(e.g),ca(e.g).b-1)),nf(e,(ur(h),h-s),!1)}function nc(e){var t,n,i,s;for(s=new pd("["),t=!1,i=e.mb();i.G();)n=i.H(),t?s.a+=", ":t=!0,co(s,n===e?"(this Collection)":(mn(),n==null?Fs:ha(n)));return s.a+="]",s.a}function Q8(e){var t,n,i,s;for(s=new pd("{"),t=!1,i=e.bb().mb();i.G();)n=f(i.H(),21),t?s.a+=", ":t=!0,co(s,UO(e,n.yb())),s.a+="=",co(s,UO(e,n.zb()));return s.a+="}",s.a}function J8(e){var t;return J1(!!e.g),t=e.g,e.g=t.e,t.e=e,t.j=e.j,t.a=e.a,e.a=1+Im(e.e)+Im(e.g),e.j=Pr(Pr(e.c,Mm(e.e)),Mm(e.g)),e.d=1+ti(vs(e.e),vs(e.g)),t.d=1+ti(vs(t.e),vs(t.g)),t}function eB(e){var t;return J1(!!e.e),t=e.e,e.e=t.g,t.g=e,t.j=e.j,t.a=e.a,e.a=1+Im(e.e)+Im(e.g),e.j=Pr(Pr(e.c,Mm(e.e)),Mm(e.g)),e.d=1+ti(vs(e.e),vs(e.g)),t.d=1+ti(vs(t.e),vs(t.g)),t}function wse(e){var t;Bc(new M(tc(e.e)))&&(t=f(nr(e.e,(Ee(),dt)),28),t==(zn(),ii)?Yue(e.e):t==ts?Hle(e.e):Pt(ge(Nt(nr(e.e,wb))))||e.e.e.j.a==0&&e.e.e.j.b==0?Mue(e.e):Ile(e))}function KC(e,t,n){var i,s,l;if(s=new M(e),s.a<s.c.c.length){for(l=f(O(s),33),i=jz(l,t,n);s.a<s.c.c.length;)l=f(O(s),33),rC(i,jz(l,t,n));return new jg(i)}else return null}function mse(e,t){var n,i,s,l,h,v;for(s=0,i=new M(t.c);i.a<i.c.c.length;)for(n=f(O(i),16),h=new M(n.a);h.a<h.c.c.length;)l=f(O(h),9),v=l.j.a+l.e.c+l.e.b+e.b,s=s>v?s:v;return s}function yse(e,t){Id();var n;if(e.c==t.c){if(e.b==t.b||Hie(e.b,t.b)){if(n=wte(e.b)?1:-1,e.a&&!t.a)return n;if(!e.a&&t.a)return-n}return TI(e.b.e,t.b.e)}else return yr(e.c,t.c)}function tB(e){var t,n;switch(n=Ga(ln(re(ie(_t,1),Ht,10,0,[e.f.i,e.i,e.a]))),t=e.f.e,e.g.e){case 1:n.b-=t.d;break;case 2:n.a+=t.c;break;case 3:n.b+=t.a;break;case 4:n.a-=t.b}return n}function kse(e,t){var n;return n=0,t.g==(et(),er)?(Y3(t).f!=e.a&&(tI(e,Y3(t).f),e.e=!0),e.e?++e.g:n+=e.f):t.g==hn?e.e?n+=e.g:++e.f:t.g==Hn&&(tI(e,t),e.e=!1),n}function Ese(e,t,n,i,s){var l,h,v,p;for(p=null,v=new M(i);v.a<v.c.c.length;)if(h=f(O(v),187),h!=n&&ji(h.e,s,0)!=-1){p=h;break}l=i2(s),Bn(l,n.b),kn(l,p.b),pt(e.a,s,new h0(l,t,n.f))}function Sse(e){switch(f(z(e,(zt(),Sr)),85).e){case 1:ce(e,Sr,(Fi(),dv));break;case 2:ce(e,Sr,(Fi(),Pu));break;case 3:ce(e,Sr,(Fi(),_b));break;case 4:ce(e,Sr,(Fi(),mc))}}function nB(e,t,n){var i,s,l,h;if(e)for(s=(l=cR(e,ve(Ok,Nr,2,0,5,1)),new Yf(new uo(new RN(e,l).b)));s.b<s.d.Y();)i=(ut(s.b<s.d.Y()),oh(s.d.sb(s.c=s.b++))),h=Mn(e,i),Gfe(t,i,h,n)}function Cse(e,t,n){var i,s,l,h,v,p;for(s=1;s<e;)s*=2;for(p=2*s-1,s-=1,v=ve(Kn,Wn,26,p,12,1),i=0,h=0;h<t;h++)for(l=n[h]+s,++v[l];l>0;)l%2>0&&(i+=v[l+1]),l=(l-1)/2|0,++v[l];return i}function $d(e,t,n){var i,s,l,h;if(e.e=t,n)for(s=(h=new Wt(e.a.a).a.bb().mb(),new Zt(h));s.a.G();)i=(l=f(s.a.H(),21),f(l.yb(),12)),ce(i,(le(),Hb),e.e),Bt(i.c,t.a),Bt(i.d,t.b)}function Yd(){Yd=c,Ob=new Cd(Kd,0),VL=new Cd(Wd,1),KL=new Cd(Ud,2),UL=new Cd("LEFT_RIGHT_CONSTRAINT_LOCKING",3),WL=new Cd("LEFT_RIGHT_CONNECTION_LOCKING",4),qL=new Cd("EDGE_LENGTH",5)}function ZC(e,t,n,i){var s;this.b=i,this.e=e.a,s=t[n],this.d=Ay(Fb,[Nr,lb],[227,26],13,[s.length,s.length],2),this.a=Ay(Kn,[Nr,Wn],[52,26],12,[s.length,s.length],2),this.c=new U8(t,n)}function xse(e,t,n,i){var s,l;for(l=t,s=l.d==null||e.a.$b(n.d,l.d)>0?1:0;l.a[s]!=n;)l=l.a[s],s=e.a.$b(n.d,l.d)>0?1:0;l.a[s]=i,i.b=n.b,i.a[0]=n.a[0],i.a[1]=n.a[1],n.a[0]=null,n.a[1]=null}function Tse(e,t,n){var i,s,l,h;if(It(n,TH,1),Fz(e.d,t),h=yle(e.a,t),h.Y()==1)Px(f(h.sb(0),55),n);else for(l=1/h.Y(),s=h.mb();s.G();)i=f(s.H(),55),Px(i,Ql(n,l));Gee(e.a,h,t),Sz(t),Ct(n)}function rB(e,t,n){var i,s,l,h,v;for(v=new _c(t,n),h=il(v);h.G();)for(l=f(h.H(),7),s=Dt(Ca((gr(),new Qn(lr(re(ie(Ze,1),Me,1,4,[l.b,l.e]))))));xt(s);)i=f(Et(s),12),Zc(i)||Ise(e,t,l,i)}function iB(e,t){var n,i,s;for(s=Jn(e,t),i=s.mb();i.G();)if(n=f(i.H(),7),z(n,(le(),Is))!=null||xt(Dt(Ca((gr(),new Qn(lr(re(ie(Ze,1),Me,1,4,[n.b,n.e]))))))))return!0;return!1}function W2(e){var t,n;if(Lg(e))throw new nn(_H);for(n=Jt(e,0);n.b!=n.d.c;)t=f(qt(n),10),this.d=Xt(this.d,t.b),this.c=je(this.c,t.a),this.a=je(this.a,t.b),this.b=Xt(this.b,t.a)}function Lse(e,t,n){if(t<0||n<0)throw new nn("The highx must be bigger then lowx and the highy must be bigger then lowy");return e.a<0?e.a=0:e.a>t&&(e.a=t),e.b<0?e.b=0:e.b>n&&(e.b=n),e}function Jn(e,t){switch(t.e){case 1:return Lo(e.f,(fa(),dE));case 2:return Lo(e.f,(fa(),hE));case 3:return Lo(e.f,(fa(),vE));case 4:return Lo(e.f,(fa(),gE));default:return Qt(),Qt(),yc}}function Pse(e){var t,n,i,s;for(s=(_n(),new Go($o(bs(e.a,new T))));xt(s);)for(i=f(Et(s),9),i.g==(et(),Za)&&ce(i,(le(),bo),(Yi(),Zs)),n=Dt(En(i));xt(n);)t=f(Et(n),12),ik(t,(Yi(),Zs))}function Dse(e){var t,n,i,s;for(s=(_n(),new Go($o(bs(e.a,new T))));xt(s);)for(i=f(Et(s),9),i.g==(et(),Za)&&ce(i,(le(),bo),(Yi(),rs)),n=Dt(En(i));xt(n);)t=f(Et(n),12),ik(t,(Yi(),rs))}function U2(e,t){switch(this.b=new Yr,e){case 0:this.d=new lj(this);break;case 1:this.d=new uj(this);break;case 2:this.d=new cj(this);break;default:throw new dd}this.c=t,this.a=.2*t}function aB(e){var t,n,i,s;if(!e.b)for(e.b=new Se,n=new M(e.a.c);n.a<n.c.c.length;)for(t=f(O(n),16),s=new M(t.a);s.a<s.c.c.length;)i=f(O(s),9),Le(e.b,new _N(i,e.c));return e.b}function jse(e,t){var n,i,s;n=nne(t,e.e),i=f(Kt(e.g.f,n),24).a,s=e.a.c.length-1,e.a.c.length!=0&&f(_e(e.a,s),128).c==i?(++f(_e(e.a,s),128).a,++f(_e(e.a,s),128).b):Le(e.a,new ZI(i))}function XC(e){mn();var t,n;return e>=rb?(t=55296+(e-rb>>10&1023)&Ts,n=56320+(e-rb&1023)&Ts,String.fromCharCode(t)+(""+String.fromCharCode(n))):String.fromCharCode(e&Ts)}function Nse(e,t,n,i){var s,l,h;switch(s=Li(n),l=N2(s),h=new Yn,cn(h,n),i.e){case 1:Bt(h,P2(Z0(l)));break;case 2:Bt(h,Z0(l))}return ce(h,(le(),fv),f(z(t,fv),15)),ce(t,lt,h),un(e.b,h,t),h}function Ise(e,t,n,i){var s;Le(e.c,new S3(e,n,i,f(Kt(e.k,n),24).a)),qy(i)&&(t==e.e?i.d.f!=e.a&&i.c.f!=e.a:i.d.f!=e.e&&i.c.f!=e.e)&&(s=n==i.c?i.d:i.c,Le(e.c,new S3(e,s,i,f(Kt(e.k,s),24).a)))}function oB(e,t){var n,i,s;if(t===e)return!0;if(!xe(t,57)||(s=f(t,57),e.Y()!=s.Y()))return!1;for(i=s.bb().mb();i.G();)if(n=f(i.H(),21),!e._(n))return!1;return!0}function sB(e,t){var n,i,s;return i=new Va(e),vu(i,t),ce(i,(le(),sw),t),ce(i,(Ee(),dt),(zn(),ii)),ce(i,go,(Zo(),Ap)),_a(i,(et(),Cn)),n=new Yn,cn(n,i),Bt(n,(we(),qe)),s=new Yn,cn(s,i),Bt(s,Be),i}function QC(e,t){var n,i,s;for(s=kr,i=new M(tf(t));i.a<i.c.c.length;)n=f(O(i),89),n.e&&!e.c[n.b]&&(e.c[n.b]=!0,s=Hu(s,QC(e,O2(n,t))));return e.i[t.b]=e.j,e.g[t.b]=Hu(s,e.j++),e.g[t.b]}function uB(e,t,n){var i,s,l,h;if(h=e.g.tb(),e.e)for(s=0;s<e.c;s++)h.H();else for(s=0;s<e.c-1;s++)h.H();for(l=e.b.tb(),i=ge(Ot(h.H()));i-t<fl;)i=ge(Ot(h.H())),l.H();h.M(),iz(e,n,t,l,h)}function cB(e,t){var n,i,s,l;for(i=0,s=e.length;i<s;i++){l=e[i];try{l[1]?l[0].bd()&&(t=bne(t,l)):l[0].bd()}catch(h){if(h=Kr(h),xe(h,46))n=h,Pne(xe(n,164)?f(n,164).cc():n);else throw Zr(h)}}return t}function Mse(e){var t,n,i;if(i=e.c.a,!i)return null;if(e.b.b){if(t=e.b.e,n=EC(e.c.a,e.d,t),!n)return null;e.b.d==(xo(),Ua)&&e.d.$b(t,n.b)==0&&(n=n.i)}else n=e.a.i;return n==e.a||!yg(e.b,n.b)?null:n}function Ose(e,t){var n,i,s,l,h,v;for(l=0,i=new M(t.c);i.a<i.c.c.length;){for(n=f(O(i),16),s=0,v=new M(n.a);v.a<v.c.c.length;)h=f(O(v),9),s+=h.j.b+h.e.a+h.e.d+e.a;s-=e.a,l=l>s?l:s}return l}function Ase(e){var t,n,i,s,l;for(l=kr,s=kr,i=new M(tf(e));i.a<i.c.c.length;)n=f(O(i),89),t=n.d.e-n.c.e,n.d==e&&t<s?s=t:t<l&&(l=t);return s==kr&&(s=-1),l==kr&&(l=-1),new wr(gt(s),gt(l))}function lB(e,t,n){var i,s,l,h,v;for(t.k=-1,v=Ss(t,(cr(),ai)).mb();v.G();)for(h=f(v.H(),7),s=new M(h.e);s.a<s.c.c.length;)i=f(O(s),12),l=i.d.f,t!=l&&(l.k<0?n.ib(i):l.k>0&&lB(e,l,n));t.k=0}function fB(e,t){if(0>t)throw new nn("Top must be smaller or equal to bottom.");if(0>e)throw new nn("Left must be smaller or equal to right.");this.d=0,this.c=e,this.a=t,this.b=0}function K2(e){var t,n,i;if(e.length==0)throw new nn(_H);for(n=0,i=e.length;n<i;++n)t=e[n],this.d=Xt(this.d,t.b),this.c=je(this.c,t.a),this.a=je(this.a,t.b),this.b=Xt(this.b,t.a)}function Rse(){return jr(),re(ie(SG,1),De,37,0,[LL,gL,HL,dL,mE,RL,yE,NL,pE,Fp,jL,DL,Wp,pL,bE,SE,xE,Vp,CL,Yp,OL,CE,Kp,bL,IL,AL,ML,kE,kL,Gh,wE,SL,BL,PL,wL,av,xL,Nb,hL,EL,mL,EE,Up,qp,yL,TE,TL,vL,zL,$p])}function Bse(e,t){var n,i,s,l,h,v,p,m,S;for(S=0,i=0,s=t.length;i<s;++i)for(n=t[i],h=0,v=n.length;h<v;++h)for(l=n[h],m=new M(l.f);m.a<m.c.c.length;)p=f(O(m),7),p.k=S++;e.a=ve(Kn,Wn,26,S,12,1)}function hB(e){_n();var t,n,i;if(t=e.H(),!e.G())return t;for(i=new wd,i.a+="expected one element but was: <"+t,n=0;n<4&&e.G();n++)co(i,", "+e.H());throw e.G()&&(i.a+=", ..."),i.a+=">",new nn(i.a)}function zse(e){var t,n,i,s,l;for(t=0,i=e.b,s=0,l=i.length;s<l;++s)n=i[s],t+=kse(e,n),gi(f(z(n,(Ee(),dt)),28))&&(Jn(n,(we(),rt)).mb().G()&&(t+=lz(e,n,rt)),Jn(n,ct).mb().G()&&(t+=lz(e,n,ct)));return t}function Z2(e,t,n,i){var s,l,h,v,p;if(i.d.c+i.e.c==0)for(h=e.a[e.c],v=0,p=h.length;v<p;++v)l=h[v],un(i,l,new fR(e,l,n));return s=f(li(fi(i.d,t)),284),s.b=0,s.c=s.f,s.c==0||vj(f(_e(s.a,s.b),128)),s}function lp(e){var t;Qt();var n,i,s,l,h,v;if(xe(e,63))for(l=0,s=e.Y()-1;l<s;++l,--s)t=e.sb(l),e.wb(l,e.sb(s)),e.wb(s,t);else for(n=e.tb(),h=e.ub(e.Y());n.L()<h.N();)i=n.H(),v=h.M(),n.O(v),h.O(i)}function Hse(e,t,n){return e<0||e>n?ex(e,n,"start index"):t<0||t>n?ex(t,n,"end index"):Jg("end index (%s) must not be less than start index (%s)",re(ie(Ze,1),Me,1,4,[gt(t),gt(e)]))}function JC(e){if(!("id"in e.a))throw new wg("Every graph element must specify an 'id' property.",e);if(!Mn(e,"id").lc())throw new wg("Invalid format for 'id'. Must be a string, was "+Mn(e,"id").$c,e)}function nl(e,t){var n,i,s,l,h,v,p;for(p=e.b,i=f(fh(yl,e),20).mb();i.G();)for(n=f(i.H(),75),v=(l=new Wt(n.c.a).a.bb().mb(),new Zt(l));v.a.G();)h=(s=f(v.a.H(),21),f(s.yb(),7)),cu(t,h),dp(h,p)}function _se(e,t){var n,i,s;for(s=new M(t.e);s.a<s.c.c.length;)if(n=f(O(s),12),n.d.f!=e.f)return!0;for(i=new M(t.b);i.a<i.c.c.length;)if(n=f(O(i),12),n.c.f!=e.f)return!0;return!1}function X2(e){var t,n,i,s;for(T0(e.c),T0(e.b),T0(e.a),s=(n=new Wt(e.e).a.bb().mb(),new Zt(n));s.a.G();)i=(t=f(s.a.H(),21),f(t.yb(),60)),i.c!=2&&(di(e.a,i),i.c==0&&di(e.c,i)),di(e.b,i);e.d=!1}function dB(e,t){var n;if(e===t)return!0;if(xe(t,18)){n=f(t,18);try{return e.Y()==n.Y()&&e.lb(n)}catch(i){if(i=Kr(i),xe(i,76))return!1;if(xe(i,119))return!1;throw Zr(i)}}return!1}function ra(e,t,n){var i,s,l,h;if(h=t==null?0:e.b.Vc(t),s=(i=s4(e.a,h),i??[]),s.length==0)Zee(e.a,h,s);else if(l=HR(e,t,s),l)return l.Ab(n);return $a(s,s.length,new Q1(t,n)),++e.c,Ly(e.b),null}function ex(e,t,n){if(e<0)return Jg(uH,re(ie(Ze,1),Me,1,4,[n,gt(e)]));if(t<0)throw new nn(cH+t);return Jg("%s (%s) must not be greater than size (%s)",re(ie(Ze,1),Me,1,4,[n,gt(e),gt(t)]))}function Gse(e,t){if(e<0)return Jg(uH,re(ie(Ze,1),Me,1,4,["index",gt(e)]));if(t<0)throw new nn(cH+t);return Jg("%s (%s) must be less than size (%s)",re(ie(Ze,1),Me,1,4,["index",gt(e),gt(t)]))}function vB(e){var t,n,i,s;for(s=ve(Er,Nr,51,e.c.c.length,0,2),i=new fn(e.c,0);i.b<i.d.Y();)t=(ut(i.b<i.d.Y()),f(i.d.sb(i.c=i.b++),16)),n=i.b-1,s[n]=f(Vn(t.a,ve(Er,Ii,9,t.a.c.length,0,1)),51);return s}function Fd(e,t,n,i,s){switch(this.c=s,this.d=t,this.a=n,s.e){case 4:this.b=ni(e.b);break;case 1:this.b=ni(e.d);break;case 2:this.b=ni(e.c-i.j.a);break;case 3:this.b=ni(e.a-i.j.b);break;default:this.b=0}}function gB(e,t,n,i,s){var l,h,v,p,m;if(t)for(v=t.mb();v.G();)for(h=f(v.H(),9),m=gx(h,(cr(),ai),n).mb();m.G();)p=f(m.H(),7),l=f(li(fi(s.d,p)),80),l||(l=new wR(e),i.c[i.c.length]=l,ez(l,p,s))}function $se(e,t){var n,i,s;if(n=e.c,n.a.Y()>1)throw new nn("In straight hyperEdges there may be only one edge.");an((s=new Wt(n.a).a.bb().mb(),i=f(new Zt(s).a.H(),21),f(i.yb(),12)).a,new ot(t,e.b))}function bB(e,t,n){var i,s;if(this.f=e,i=f(Kt(e.b,t),126),s=i?i.a:0,a2(n,s),n>=(s/2|0))for(this.e=i?i.c:null,this.d=s;n++<s;)RO(this);else for(this.c=i?i.b:null;n-- >0;)t2(this);this.b=t,this.a=null}function Ug(e,t){(typeof document!==sb||a.exports)&&bw(e(t)),typeof document===sb&&typeof self!==sb&&self.postMessage(t)}function Q2(e,t){var n,i,s,l;"x"in e.a&&(s=f(Mn(e,"x"),104),t.i.a=s.a),"y"in e.a&&(l=f(Mn(e,"y"),104),t.i.b=l.a),Ek in e.a&&(i=f(Mn(e,Ek),104),t.j.a=i.a),Sk in e.a&&(n=f(Mn(e,Sk),104),t.j.b=n.a)}function pB(e,t,n){var i,s;kA(this),t==(Vc(),Xs)?vn(this.g,e.c):vn(this.o,e.c),n==Xs?vn(this.g,e.d):vn(this.o,e.d),vn(this.c,e),i=Di(e.c).b,s=Di(e.d).b,C8(this,i,s,s),this.f=Mne(Di(e.c).b,Di(e.d).b)}function Yse(e){var t,n,i,s,l,h;for(h=new _c(e.d,e.e),l=il(h);l.G();)for(s=f(l.H(),7),i=e.e==(we(),qe)?s.b:s.e,n=new M(i);n.a<n.c.c.length;)t=f(O(n),12),!Zc(t)&&t.c.f.d!=t.d.f.d&&(jse(e,t),++e.f,++e.c)}function Kg(e,t,n){var i,s,l,h,v;for(h=(Qt(),new Rl(f(_e(t.a,n),18))),v=new Ni(h.b.Y()),s=new fd(h.b.mb());s.b.G();)i=f(s.b.H(),37),l=f(Kt(e.a,i),31),l||(l=Mfe(i),un(e.a,i,l)),v.c[v.c.length]=l;return v}function Fse(e,t){var n,i,s,l;for(i=new fn(e.f.c,0);i.b<i.d.Y();)for(n=(ut(i.b<i.d.Y()),f(i.d.sb(i.c=i.b++),16)),l=t[i.b-1],s=new fn(n.a,0);s.b<s.d.Y();)ut(s.b<s.d.Y()),s.d.sb(s.c=s.b++),Z4(s,l[s.b-1])}function wB(e){var t,n;if(gs(f(z(e,(Ee(),dt)),28)))for(n=new M(e.f);n.a<n.c.c.length;)t=f(O(n),7),t.g==(we(),fr)&&RR(t);else{for(n=new M(e.f);n.a<n.c.c.length;)t=f(O(n),7),RR(t);ce(e,dt,(zn(),Cb))}}function tx(e,t,n,i,s,l){var h,v,p,m;if(h=i-n,h<7){Jae(t,n,i,l);return}if(p=n+s,v=i+s,m=p+(v-p>>1),tx(t,e,p,m,-s,l),tx(t,e,m,v,-s,l),l.$b(e[m-1],e[m])<=0){for(;n<i;)$a(t,n++,e[p++]);return}Oae(e,p,m,v,t,n,i,l)}function mB(e){if(!e)return Oj(),a_;var t=e.valueOf?e.valueOf():e;if(t!==e){var n=Hk[typeof t];return n?n(t):SC(typeof t)}else return e instanceof Array||e instanceof r.Array?new _9(e):new xm(e)}function J2(e,t,n){var i,s;return i=n.c,s=n.d,e.g[i.b]<=e.i[t.b]&&e.i[t.b]<=e.i[i.b]&&e.g[s.b]<=e.i[t.b]&&e.i[t.b]<=e.i[s.b]?!(e.i[i.b]<e.i[s.b]):e.i[i.b]<e.i[s.b]}function yB(e,t,n){var i,s,l,h,v,p,m,S;for(m=0,s=e.a[t],l=0,h=s.length;l<h;++l){for(i=s[l],S=new _c(i,n),p=il(S);p.G();)v=f(p.H(),7),un(e.f,v,gt(m)),gi(f(z(i,(Ee(),dt)),28))&&++m;gi(f(z(i,(Ee(),dt)),28))||++m}}function qse(e,t,n){var i,s;if(vt(t),n.G())for(s=f(n.H(),21),Rc(t,a0(e.a,s.yb())),Rc(t,e.b),Rc(t,a0(e.a,s.zb()));n.G();)Rc(t,e.a.c),i=f(n.H(),21),Rc(t,a0(e.a,i.yb())),Rc(t,e.b),Rc(t,a0(e.a,i.zb()));return t}function ek(e,t){var n,i;return n=f(Yl(e.b,t),19),n?(i=e.Z(),i.jb(n),e.c-=n.Y(),n.Q(),xe(i,137)?(Qt(),new H4(f(i,137))):xe(i,18)?(Qt(),new Rl(f(i,18))):xe(i,20)?D3(f(i,20)):(Qt(),new Xv(i))):e.$()}function kB(e,t){var n;t.d?t.d.b=t.b:e.a=t.b,t.b?t.b.d=t.d:e.e=t.d,!t.e&&!t.c?(n=f(Yl(e.b,t.a),126),n.a=0,++e.c):(n=f(Kt(e.b,t.a),126),--n.a,t.e?t.e.c=t.c:n.b=t.c,t.c?t.c.e=t.e:n.c=t.e),--e.d}function nx(e,t,n){switch(n.e){case 1:return new ot(t.a,Xt(e.d.b,t.b));case 2:return new ot(je(e.c.a,t.a),t.b);case 3:return new ot(t.a,je(e.c.b,t.b));case 4:return new ot(Xt(t.a,e.d.a),t.b)}return new ot(t.a,t.b)}function Vse(e){var t,n,i,s;for(t=0,i=(mn(),e.length),s=i-4,n=0;n<s;)t=e.charCodeAt(n+3)+31*(e.charCodeAt(n+2)+31*(e.charCodeAt(n+1)+31*(e.charCodeAt(n)+31*t))),t=t|0,n+=4;for(;n<i;)t=t*31+EM(e,n++);return t=t|0,t}function EB(e,t){var n,i,s;for(this.a=e,this.c=t,this.b=ve(JG,Nr,673,e.length,0,2),n=0;n<e.length;++n)for(s=e[n].length,this.b[n]=ve(JG,{673:1,3:1,5:1,6:1},102,s,0,1),i=0;i<s;++i)this.b[n][i]=new pO(this,e[n][i].c)}function fp(e,t,n,i,s,l,h){var v;this.a=f(vt(e),56),this.b=t,this.c=s,this.e=n,this.d=f(vt(i),159),this.g=l,this.f=f(vt(h),159),t&&e.$b(n,n),s&&e.$b(l,l),t&&s&&(v=e.$b(n,l),Lae(v<=0,n,l),v==0&&th(i!=(xo(),Ua)|h!=Ua))}function SB(e){if(this.a=e,e.c.f.g==(et(),Cn))this.c=e.c,this.d=f(z(e.c.f,(le(),_r)),32);else if(e.d.f.g==Cn)this.c=e.d,this.d=f(z(e.d.f,(le(),_r)),32);else throw new nn("Edge "+e+" is not an external edge.")}function CB(){CB=c,v$=Pa(new An,(jr(),kL)),i6=pi(new An,Yp),b$=bi(pi(new An,Kp),Up),d$=bi(Pa(pi(new An,pL),wL),mL),p$=pi(new An,OL),g$=bi(new An,EL),f$=bi(Pa(pi(p0(new An,Fp),Vp),Gh),qp),h$=bi(Pa(new An,Gh),$p)}function hp(e,t,n){var i,s,l,h;return hi(n,Qx),n==0?sp(e,t):(th(yg(e.b,t)),h=e.c.a,h?(l=ve(Kn,Wn,26,1,12,1),i=mx(h,e.d,t,n,l),k0(e.c,h,i),l[0]):(e.d.$b(t,t),s=new q0(t,n),F4(e.a,s,e.a),k0(e.c,null,s),0))}function xB(e,t,n){var i,s,l,h,v,p;for(i=0,p=n,t||(i=n*(e.c.length-1),p*=-1),l=new M(e);l.a<l.c.c.length;){for(s=f(O(l),9),ce(s,(Ee(),go),(Zo(),Ap)),s.j.a=i,v=Jn(s,(we(),Be)).mb();v.G();)h=f(v.H(),7),h.i.a=i;i+=p}}function pt(e,t,n){var i;if(i=f(Kt(e.b,t),19),i)return i.ib(n)?(++e.c,!0):!1;if(i=e.Z(),i.ib(n))return++e.c,un(e.b,t,i),!0;throw new f2("New Collection violated the Collection spec")}function tk(e,t,n){var i,s,l;for(xue(e,t,n),l=new Se,s=new M(e.b.a.b);s.a<s.c.c.length;)i=f(O(s),25),t.D(i)&&(Le(l,new h4(i,!0)),Le(l,new h4(i,!1)));Roe(e.d),Dg(l,e.c,new uo(re(ie(jb,1),Me,160,0,[e.d]))),kue(e,t,n)}function TB(e,t){var n,i,s,l,h;for(e.c[t.k]=!0,Le(e.a,t),h=new M(t.f);h.a<h.c.c.length;)for(l=f(O(h),7),i=Dt(Ca((gr(),new Qn(lr(re(ie(Ze,1),Me,1,4,[l.b,l.e]))))));xt(i);)n=f(Et(i),12),s=ooe(l,n).f,e.c[s.k]||TB(e,s)}function rx(e,t,n,i){var s,l,h;if("labels"in t.a){if(h=Mn(t,"labels"),!h.hc())throw new ps("The 'labels' property of a node must be an array.",h,t);for(l=h.hc(),s=0;s<l.a.length;++s)xe(Uu(l,s),69)&&ble(e,f(Uu(l,s),69),n,i)}}function LB(e,t,n){var i,s,l,h,v,p;l=f(_e(t.b,0),12).c,i=l.f,s=i.g,p=f(_e(n.e,0),12).d,h=p.f,v=h.g,s==(et(),hn)?ce(e,(le(),Oi),f(z(i,Oi),7)):ce(e,(le(),Oi),l),v==hn?ce(e,(le(),Si),f(z(h,Si),7)):ce(e,(le(),Si),p)}function pu(){pu=c,Wi=new Ac("H_LEFT",0),Ka=new Ac("H_CENTER",1),Ki=new Ac("H_RIGHT",2),ba=new Ac("V_TOP",3),ga=new Ac("V_CENTER",4),va=new Ac("V_BOTTOM",5),Ei=new Ac("INSIDE",6),Zi=new Ac("OUTSIDE",7),Ui=new Ac("H_PRIORITY",8)}function ix(e){By();var t,n,i;for(this.b=hG,this.c=vG,this.d=($n(),Mo),this.g=(Aj(),fG),this.a=e,Rm(this,new F),bp(this),i=new M(e.b);i.a<i.c.c.length;)n=f(O(i),25),n.f||(t=new ep(re(ie(Gp,1),Me,25,0,[n])),Le(e.a,t))}function ax(e,t){var n,i,s,l;for(s=1,t.j=!0,i=new M(tf(t));i.a<i.c.c.length;)n=f(O(i),89),e.c[n.b]||(e.c[n.b]=!0,l=O2(n,t),n.e?s+=ax(e,l):!l.j&&n.a==n.d.e-n.c.e&&(n.e=!0,vn(e.p,n),s+=ax(e,l)));return s}function nk(e){var t,n,i,s,l,h,v,p;for(s=ki,i=Hr,n=new M(e.e.c);n.a<n.c.c.length;)for(t=f(O(n),16),h=new M(t.a);h.a<h.c.c.length;)l=f(O(h),9),p=ge(e.n[l.k]),v=p+ge(e.b[e.f[l.k].k]),s=s<p?s:p,i=i>v?i:v;return i-s}function PB(e){var t;return t=new Al,ja(t,"type",new $c((Gl(sG),sG.n))),ja(t,mk,new $c(e.f)),e.b&&ja(t,"value",e.b),e.a&&ja(t,"context",e.a),ja(t,SH,new $c(O4(new B1(`
-`),new Yf(new uo((e.g==null&&(e.g=o3(e)),e.g)))))),t}function Wse(e,t){return e.c<t.c?-1:e.c>t.c?1:e.b<t.b?-1:e.b>t.b?1:e.a!=t.a?e.a.b-t.a.b:e.d==0&&t.d==1?-1:e.d==1&&t.d==0?1:0}function DB(e,t){var n,i,s,l,h;if(t===e)return!0;if(!xe(t,20)||(h=f(t,20),e.Y()!=h.Y()))return!1;for(l=h.mb(),i=e.mb();i.G();)if(n=i.H(),s=l.H(),!(He(n)===He(s)||n!=null&&jo(n,s)))return!1;return!0}function jB(e){!zk&&(zk=kfe());var t=e.replace(/[\x00-\x1f\xad\u0600-\u0603\u06dd\u070f\u17b4\u17b5\u200b-\u200f\u2028-\u202e\u2060-\u2064\u206a-\u206f\ufeff\ufff9-\ufffb"\\]/g,function(n){return pre(n)});return'"'+t+'"'}function NB(e,t){var n,i,s,l,h,v,p;for(s=t==1?lE:cE,i=(h=new Wt(s.a).a.bb().mb(),new Zt(h));i.a.G();)for(n=(l=f(i.a.H(),21),f(l.yb(),59)),p=f(Ia(e.f.c,n),18).mb();p.G();)v=f(p.H(),27),Tr(e.b.b,v.b),Tr(e.b.a,f(v.b,25).f)}function IB(e,t,n){var i,s,l,h;if(It(n,"Recursive layout",2),t.b.c.length!=0){for(h=1/t.b.c.length,l=new M(t.b);l.a<l.c.c.length;)s=f(O(l),9),i=f(z(s,(le(),Sl)),55),i&&(IB(e,i,Ql(n,h)),Oce(s,i));Fz(e.d,t),Px(t,n)}Sz(t),Ct(n)}function ox(e,t){H3.call(this),this.d=new Yr,this.b=f(z(t,(le(),Ai)),15).a*f(z(t,(zt(),eu)),15).a,this.e=this.b*f(z(t,vv),15).a,this.a=new xi,this.c=new xi,this.j=new Ya(e.j,e.k,0,e.n-e.k),this.o=e.g,this.g.a=e.i,Iz(this,e)}function rk(e,t){var n,i,s,l,h;for(l=t==null?0:e.b.Vc(t),i=(n=s4(e.a,l),n??[]),h=0;h<i.length;h++)if(s=i[h],e.b.Uc(t,s.yb()))return i.length==1?(i.length=0,e.a[Dk](l)):i.splice(h,1),--e.c,Ly(e.b),s.zb();return null}function Use(e,t,n){var i;i=null,t&&(i=t.e),zd(e,new Jf(t.i.a-i.b+n.a,t.i.b-i.d+n.b)),zd(e,new Jf(t.i.a-i.b+n.a,t.i.b+t.j.b+i.a+n.b)),zd(e,new Jf(t.i.a+t.j.a+i.c+n.a,t.i.b-i.d+n.b)),zd(e,new Jf(t.i.a+t.j.a+i.c+n.a,t.i.b+t.j.b+i.a+n.b))}function dp(e,t){switch(t.e){case 2:Bt(e,(we(),Be)),e.a.a=e.j.a,e.a.b=e.j.b/2;break;case 4:Bt(e,(we(),qe)),e.a.a=0,e.a.b=e.j.b/2;break;case 1:Bt(e,(we(),rt)),e.a.a=e.j.a/2,e.a.b=0;break;case 3:Bt(e,(we(),ct)),e.a.a=e.j.a/2,e.a.b=e.j.b}}function Kse(e,t){Ff();var n,i,s;if(t===e)return!0;if(xe(t,207)){if(s=f(t,207),e.Y()!=s.Y()||ch(e).Y()!=s.bb().Y())return!1;for(i=s.bb().mb();i.G();)if(n=f(i.H(),83),e.Cb(n.Zb())!=n.Yb())return!1;return!0}return!1}function rf(e,t){var n,i,s,l,h,v;return l=e.a*jk+e.b*1502,v=e.b*jk+11,n=Math.floor(v*Lk),l+=n,v-=n*hT,l%=hT,e.a=l,e.b=v,t<=24?T4(e.a*F6[t]):(s=e.a*(1<<t-24),h=T4(e.b*q6[t]),i=s+h,i>=2147483648&&(i-=4294967296),i)}function sx(e,t,n){var i,s,l;if(t!=n){i=t;do dn(e,i.d),l=f(z(i,(le(),Cl)),9),l&&(s=i.a,ua(e,s.b,s.d),dn(e,l.i),i=Li(l));while(l);i=n;do uu(e,i.d),l=f(z(i,(le(),Cl)),9),l&&(s=i.a,Gte(e,s.b,s.d),uu(e,l.i),i=Li(l));while(l)}}function Zse(e,t){var n,i,s,l,h,v;for(n=new Se,v=new m4,s=(h=new Wt(e.a).a.bb().mb(),new Zt(h));s.a.G();)i=(l=f(s.a.H(),21),f(l.yb(),12)),uk(v,i.c,i,null),uk(v,i.d,i,null);for(;v.a;)Le(n,jce(v,t,gi(f(z(t,(Ee(),dt)),28))));return n}function Xse(e,t){var n,i,s,l,h;for(l=new M(e.e.a);l.a<l.c.c.length;)if(s=f(O(l),61),s.c.c.length==s.g.c.length){for(i=s.e,h=Ase(s),n=s.e-f(h.a,24).a+1;n<s.e+f(h.b,24).a;n++)t[n]<t[i]&&(i=n);t[i]<t[s.e]&&(--t[s.e],++t[i],s.e=i)}}function MB(e,t){var n,i,s,l,h,v,p;for(s=t==1?lE:cE,i=(h=new Wt(s.a).a.bb().mb(),new Zt(h));i.a.G();)for(n=(l=f(i.a.H(),21),f(l.yb(),59)),p=f(Ia(e.f.c,n),18).mb();p.G();)v=f(p.H(),27),Le(e.b.b,f(v.b,25)),Le(e.b.a,f(v.b,25).f)}function OB(e){jy();var t,n,i,s,l,h,v;for(n=(On(),new Md),s=new M(e.e.c);s.a<s.c.c.length;)for(i=f(O(s),16),h=new M(i.a);h.a<h.c.c.length;)l=f(O(h),9),v=e.f[l.k],t=f(h2(n,v),20),t||(t=new Se,$g(n,v,t)),t.ib(l);return n}function Qse(e,t){var n,i,s,l;for(i=new M(e.a.a);i.a<i.c.c.length;)n=f(O(i),78),n.i=!0;for(l=new M(e.a.b);l.a<l.c.c.length;)s=f(O(l),25),s.p=Pt(ge(Nt(e.f.B(new wr(s,t))))),s.f.i=s.f.i&Pt(ge(Nt(e.f.B(new wr(s,t)))));return e}function AB(e,t){var n,i,s,l;for(s=ca(En(t)),i=Jt(s,0);i.b!=i.d.c;)return n=f(qt(i),12),l=n.d.f,l.g==(et(),Mi)&&!(Pt(ge(Nt(z(l,(le(),wc)))))&&z(l,lt)!=null)?(Tr(l.d.a,l),cn(n.c,null),cn(n.d,null),AB(e,l)):t;return t}function Jse(e,t){var n,i,s,l,h,v,p;if(!t.e)throw new nn("The input edge is not a tree edge.");for(l=null,s=kr,i=new M(e.d);i.a<i.c.c.length;)n=f(O(i),89),v=n.c,p=n.d,J2(e,v,t)&&!J2(e,p,t)&&(h=p.e-v.e-n.a,h<s&&(s=h,l=n));return l}function RB(e,t){var n,i,s,l,h;return l=t.a,l.c.f==t.b?h=l.d:h=l.c,l.c.f==t.b?i=l.c:i=l.d,s=soe(e.a,h,i),s>0&&s<Xo?(n=lue(e.a,i.f,s),UA(e.a,i.f,-n),n>0):s<0&&-s<Xo?(n=fue(e.a,i.f,-s),UA(e.a,i.f,n),n>0):!1}function eue(e,t,n,i,s){var l,h;uR(ln(re(ie(_t,1),Ht,10,0,[s.f.i,s.i,s.a])),n)||(t.c==s?s0(t.a,0,new qn(n)):an(t.a,new qn(n)),i&&!Oc(e.a,n)&&(h=f(z(t,(Ee(),Un)),44),h||(h=new xi,ce(t,Un,h)),l=new qn(n),mr(h,l,h.c.b,h.c),vn(e.a,l)))}function BB(e){var t,n,i,s,l,h,v;for(t=0,i=new M(e.a);i.a<i.c.c.length;)for(n=f(O(i),9),l=Dt(En(n));xt(l);)s=f(Et(l),12),e==s.d.f.d&&s.c.g==(we(),qe)&&(h=Di(s.c).b,v=Di(s.d).b,t=t>(v-h<=0?0-(v-h):v-h)?t:v-h<=0?0-(v-h):v-h);return t}function tue(e,t){var n,i,s;if(He(t)===He(vt(e)))return!0;if(!xe(t,20)||(i=f(t,20),s=e.Y(),s!=i.Y()))return!1;if(xe(i,63)){for(n=0;n<s;n++)if(!Wl(e.sb(n),i.sb(n)))return!1;return!0}else return Aoe(e.mb(),i.mb())}function zB(e,t){var n,i,s,l,h,v,p,m;if(s=e.b[t.k],s>=0)return s;for(l=1,v=new M(t.f);v.a<v.c.c.length;)for(h=f(O(v),7),i=new M(h.e);i.a<i.c.c.length;)n=f(O(i),12),m=n.d.f,t!=m&&(p=zB(e,m),l=l>p+1?l:p+1);return Xae(e,t,l),l}function HB(e,t,n){var i,s,l,h,v,p;if(i=0,e.b!=0&&t.b!=0){l=Jt(e,0),h=Jt(t,0),v=ge(Ot(qt(l))),p=ge(Ot(qt(h))),s=!0;do v>p-n&&v<p+n&&++i,v<=p&&l.b!=l.d.c?v=ge(Ot(qt(l))):p<=v&&h.b!=h.d.c?p=ge(Ot(qt(h))):s=!1;while(s)}return i}function nue(e,t){switch(J3(e)){case 5:return To(t);case 6:return ih(t);case 7:return ah(t);case 0:return $2(t,e.__elementTypeId$);case 2:return Yy(t)&&t.ad!==u;case 1:return Yy(t)&&t.ad!==u||$2(t,e.__elementTypeId$);default:return!0}}function rue(e,t){var n,i,s,l,h;return t&=63,n=e.h,i=(n&524288)!=0,i&&(n|=-1048576),t<22?(h=n>>t,l=e.m>>t|n<<22-t,s=e.l>>t|e.m<<22-t):t<44?(h=i?ic:0,l=n>>t-22,s=e.m>>t-22|n<<44-t):(h=i?ic:0,l=i?Wa:0,s=n>>t-44),qu(s&Wa,l&Wa,h&ic)}function _B(e,t){switch(e.e){case 1:switch(t.e){case 1:return 1;case 4:return 2;case 3:return 3;case 2:return 4}break;case 2:switch(t.e){case 1:return 1;case 2:return 2;case 3:return 3;case 4:return 4}break;default:throw new nn(cT)}return 0}function iue(e,t,n){var i,s,l,h,v,p;i=new Se,i.c[i.c.length]=t,p=t,v=0;do p=ofe(e,p),p&&(i.c[i.c.length]=p),++v;while(p);for(h=(n-(i.c.length-1)*e.d.d)/i.c.length,l=new M(i);l.a<l.c.c.length;)s=f(O(l),9),s.j.a=h;return new wr(gt(v),h)}function aue(e,t,n){var i,s,l,h,v,p;i=new Se,i.c[i.c.length]=t,p=t,v=0;do p=Vle(e,p),p&&(i.c[i.c.length]=p),++v;while(p);for(h=(n-(i.c.length-1)*e.d.d)/i.c.length,l=new M(i);l.a<l.c.c.length;)s=f(O(l),9),s.j.a=h;return new wr(gt(v),h)}function oue(e){var t,n,i,s,l,h;for(s=f(_e(e.f,0),7),h=0,i=Dt(Ca((gr(),new Qn(lr(re(ie(Ze,1),Me,1,4,[new cd(s),new $f(s)]))))));xt(i);)n=f(Et(i),7),h+=n.f.i.a+n.i.a+n.a.a;t=f(z(e,(Ee(),yu)),10),l=t?t.a:0,e.i.a=h/(s.b.c.length+s.e.c.length)-l}function sue(e,t){var n,i,s,l;if(t<2*e.c)throw new nn("The knot vector must have at least two time the dimension elements.");for(e.j=0,e.i=1,i=0;i<e.c;i++)e.g.ib(0);for(l=t+1-2*e.c,s=1;s<l;s++)e.g.ib(s/l);if(e.e)for(n=0;n<e.c;n++)e.g.ib(1)}function ux(e){var t,n;return n=e.c,e.c=0,zj(e.f,e.i),e.e?e.g?e.e.d>=e.g.d?(t=e.f,t.e=aR(e.e,t),t.g=e.g,t.a=e.a-1,t.j=Ju(e.j,n),bu(t)):(t=e.i,t.g=oR(e.g,t),t.e=e.e,t.a=e.a-1,t.j=Ju(e.j,n),bu(t)):e.e:e.g}function uue(e){var t,n,i,s,l,h;for(s=new M(e.a);s.a<s.c.c.length;)i=f(O(s),9),i.g==(et(),er)&&(l=f(z(i,(le(),El)),9),n=i.f,t=(Sn(0,n.c.length),f(n.c[0],7)),h=f(z(t,lt),7),h.g==(we(),rt)&&i.k>l.k?Bt(h,ct):h.g==ct&&l.k>i.k&&Bt(h,rt))}function cue(e,t,n){var i,s,l,h,v,p,m;for(m=e.b,h=0,l=new M(e.a.b);l.a<l.c.c.length;)s=f(O(l),33),h=je(h,s.j.a);return p=rfe(e.a.c,e.a.d,t,n,h),na(e.a.a,B2(p)),v=KC(e.a.b,p.a,m),i=new jg((!p.k&&(p.k=new W2(p2(p))),p.k)),T3(i),v?y3(i,v):i}function lue(e,t,n){var i,s,l,h,v,p,m;i=n,s=t;do s=e.a[s.k],h=(m=e.f[s.k],ge(e.n[m.k])+ge(e.d[s.k])-s.e.d),v=gie(s,s.d?ji(s.d.a,s,0):-1),v&&(l=(p=e.f[v.k],ge(e.n[p.k])+ge(e.d[v.k])+v.j.b+v.e.a),i=Xt(i,h-(l+Eg(e.j,s,v))));while(t!=s);return i}function fue(e,t,n){var i,s,l,h,v,p,m;i=n,s=t;do s=e.a[s.k],l=(m=e.f[s.k],ge(e.n[m.k])+ge(e.d[s.k])+s.j.b+s.e.a),v=qie(s,s.d?ji(s.d.a,s,0):-1),v&&(h=(p=e.f[v.k],ge(e.n[p.k])+ge(e.d[v.k])-v.e.d),i=Xt(i,h-(l+Eg(e.j,s,v))));while(t!=s);return i}function cx(e,t,n){var i,s,l;if(hi(n,Qx),n==0)return sp(e,t);l=e.c.a,s=ve(Kn,Wn,26,1,12,1);try{if(!yg(e.b,t)||!l)return 0;i=Sx(l,e.d,t,n,s)}catch(h){if(h=Kr(h),xe(h,119))return 0;if(xe(h,76))return 0;throw Zr(h)}return k0(e.c,l,i),s[0]}function hue(e,t){var n,i,s,l,h;return e.b?(i=f(nr(e.e,(Ee(),bb)),65),s=i.b+i.c,n=i.d+i.a):(s=t*2,n=t*2),h=je(e.o[1]>0?s+e.i[1]*t+e.n[1]:0,e.o[3]>0?s+e.i[3]*t+e.n[3]:0),l=je(e.o[4]>0?n+e.i[4]*t+e.n[4]:0,e.o[2]>0?n+e.i[2]*t+e.n[2]:0),new ot(h,l)}function GB(e){var t,n,i,s,l,h;for(h=f(Vn(e.a,ve(Er,Ii,9,e.a.c.length,0,1)),51),M4(h,new In),n=null,s=0,l=h.length;s<l&&(i=h[s],i.g==(et(),Cn));++s)t=f(z(i,(le(),_r)),32),!(t!=(we(),qe)&&t!=Be)&&(n&&f(z(n,Fh),20).ib(i),n=i)}function Zg(e,t,n,i,s){var l,h,v,p;for(p=new _c(t,i),v=il(p);v.G();)l=f(v.H(),7),un(e.k,l,gt(f(Kt(e.k,l),24).a+f(li(fi(s.d,n)),24).a));for(p=new _c(n,i),h=il(p);h.G();)l=f(h.H(),7),un(e.k,l,gt(f(Kt(e.k,l),24).a-f(li(fi(s.d,t)),24).a))}function A(e,t,n){var i=Pp,s,l=i[e],h=l instanceof Array?l[0]:null;l&&!h?w=l:(w=(s=t&&t.prototype,!s&&(s=Pp[t]),bre(s)),w._c=n,w.constructor=w,!t&&(w.ad=u),i[e]=w);for(var v=3;v<arguments.length;++v)arguments[v].prototype=w;h&&(w.$c=h)}function due(e){if(e.Sc()){var t=e.c;t.Tc()?e.n="["+t.k:t.Sc()?e.n="["+t.Qc():e.n="[L"+t.Qc()+";",e.b=t.Pc()+"[]",e.j=t.Rc()+"[]";return}var n=e.i,i=e.d;i=i.split("/"),e.n=_2(".",[n,_2("$",i)]),e.b=_2(".",[n,_2(".",i)]),e.j=i[i.length-1]}function lx(e,t,n){var i;if(!n)return 0;if(i=e.d.$b(e.b.g,n.b),i>0)return lx(e,t,n.g);if(i==0)switch(e.b.f.e){case 0:return Pr(t._b(n),t.ac(n.g));case 1:return t.ac(n.g);default:throw new HS}else return Pr(Pr(t.ac(n.g),t._b(n)),lx(e,t,n.e))}function fx(e,t,n){var i;if(!n)return 0;if(i=e.d.$b(e.b.e,n.b),i<0)return fx(e,t,n.e);if(i==0)switch(e.b.d.e){case 0:return Pr(t._b(n),t.ac(n.e));case 1:return t.ac(n.e);default:throw new HS}else return Pr(Pr(t.ac(n.e),t._b(n)),fx(e,t,n.g))}function $B(e,t,n,i){var s,l,h,v;return h=new Va(e),_a(h,(et(),hn)),ce(h,(le(),lt),t),ce(h,(Ee(),dt),(zn(),ii)),ce(h,Oi,n),ce(h,Si,i),l=new Yn,Bt(l,(we(),qe)),cn(l,h),v=new Yn,Bt(v,Be),cn(v,h),kn(t,l),s=new ws,vu(s,t),ce(s,Un,null),Bn(s,v),kn(s,i),h}function YB(e,t){var n,i,s,l,h,v,p,m,S,x;for(n=0,h=e.j,v=0,p=h.length;v<p;++v)for(l=h[v],x=new _c(l,t),S=il(x);S.G();)for(m=f(S.H(),7),s=Dt(Ca((gr(),new Qn(lr(re(ie(Ze,1),Me,1,4,[m.b,m.e]))))));xt(s);)i=f(Et(s),12),Zc(i)||(n+=KB(e,i,m));return n}function vue(e,t){return e.c<t.c?-1:e.c>t.c?1:e.b<t.b?-1:e.b>t.b?1:e.a!=t.a?su(e.a)-su(t.a):e.d==(A0(),Rb)&&t.d==Ab?-1:e.d==Ab&&t.d==Rb?1:0}function gue(e){var t,n,i,s,l,h;for(s=new Ur,i=new M(e.d.a);i.a<i.c.c.length;)n=f(O(i),61),n.c.c.length==0&&mr(s,n,s.c.b,s.c);if(s.b>1)for(t=pg(a4(new hd,e.b++),e.d),h=Jt(s,0);h.b!=h.d.c;)l=f(qt(h),61),Sh(Kf(Xf(Qf(Zf(new Ol,1),0),t),l))}function bue(e,t,n,i){var s,l,h,v,p,m;for(m=0,h=new M(e.a.b);h.a<h.c.c.length;)l=f(O(h),33),m=je(m,l.j.a);return p=Rle(e.a.c,t,e.a.d,i,AC(e.b),n),na(e.a.a,B2(p)),v=KC(e.a.b,p.a,e.b),s=new jg((!p.k&&(p.k=new W2(p2(p))),p.k)),T3(s),v?y3(s,v):s}function ik(e,t){var n,i,s,l,h;for(i=new M(e.b);i.a<i.c.c.length;)n=f(O(i),33),ce(n,(le(),bo),t);for(h=new M(e.c.c);h.a<h.c.c.length;)s=f(O(h),33),ce(s,(le(),bo),t);for(l=new M(e.d.c);l.a<l.c.c.length;)s=f(O(l),33),ce(s,(le(),bo),t)}function rl(){rl=c,Zp=new zl(Kd,0),Ib=new zl("NIKOLOV",1),Mb=new zl("NIKOLOV_PIXEL",2),GL=new zl("NIKOLOV_IMPROVED",3),$L=new zl("NIKOLOV_IMPROVED_PIXEL",4),_L=new zl("DUMMYNODE_PERCENTAGE",5),YL=new zl("NODECOUNT_PERCENTAGE",6),Xp=new zl("NO_BOUNDARY",7)}function FB(e,t){var n,i,s,l,h;if(l=0,h=f(li(fi(t.d,e)),24),!h)return 0;for(s=Dt(Ca((gr(),new Qn(lr(re(ie(Ze,1),Me,1,4,[e.b,e.e]))))));xt(s);)i=f(Et(s),12),i.c==e?n=f(Kt(t,i.d),24):n=f(Kt(t,i.c),24),n&&h.a>n.a&&(l=ti(l,h.a-n.a-1));return l}function pue(e){var t,n;switch(t=f(z(e,(Ee(),nv)),15).a,n=f(z(e,rv),15).a,ce(e,rv,new Ut(t)),ce(e,nv,new Ut(n)),f(z(e,go),103).e){case 1:ce(e,go,(Zo(),zp));break;case 2:ce(e,go,(Zo(),Op));break;case 3:ce(e,go,(Zo(),Rp));break;case 4:ce(e,go,(Zo(),Bp))}}function wue(e){var t,n,i,s,l;for(s=(_n(),new Go($o(bs(e.a,new T))));xt(s);)for(i=f(Et(s),9),i.g==(et(),Za)&&(l=E8(i)?(Yi(),Zs):(Yi(),rs),ce(i,(le(),bo),l)),n=Dt(En(i));xt(n);)t=f(Et(n),12),l=Pt(ge(Nt(z(t,(le(),Js)))))?(Yi(),rs):(Yi(),Zs),ik(t,l)}function mue(e){var t,n,i,s,l;for(s=(_n(),new Go($o(bs(e.a,new T))));xt(s);)for(i=f(Et(s),9),i.g==(et(),Za)&&(l=E8(i)?(Yi(),rs):(Yi(),Zs),ce(i,(le(),bo),l)),n=Dt(En(i));xt(n);)t=f(Et(n),12),l=Pt(ge(Nt(z(t,(le(),Js)))))?(Yi(),Zs):(Yi(),rs),ik(t,l)}function hx(e,t,n){var i,s,l;for(l=new M(e.e);l.a<l.c.c.length;)i=f(O(l),118),i.b.d<0&&i.c>0&&(i.b.c-=i.c,i.b.c<=0&&i.b.f>0&&an(t,i.b));for(s=new M(e.b);s.a<s.c.c.length;)i=f(O(s),118),i.a.d<0&&i.c>0&&(i.a.f-=i.c,i.a.f<=0&&i.a.c>0&&an(n,i.a))}function dx(e,t,n){var i,s,l;for(l=new M(e.j);l.a<l.c.c.length;)i=f(O(l),117),i.b.i<0&&i.c>0&&(i.b.e-=i.c,i.b.e<=0&&i.b.k>0&&an(t,i.b));for(s=new M(e.d);s.a<s.c.c.length;)i=f(O(s),117),i.a.i<0&&i.c>0&&(i.a.k-=i.c,i.a.k<=0&&i.a.e>0&&an(n,i.a))}function yue(e){var t,n,i,s,l;switch(l=e.d.c+e.e.c,l){case 0:return Mj(),t_;case 1:return i=f(hB(new ef(new ou(e).a)),21),Ute(i.yb(),i.zb());default:for(s=(On(),new Md),n=new ef(new ou(e).a);n.b;)t=Rd(n),$g(s,vt(t.yb()),vt(t.zb()));return new e4(s)}}function kue(e,t,n){var i,s,l;for(s=new M(e.b.a.b);s.a<s.c.c.length;)i=f(O(s),25),t.D(i)&&(l=ge(Ot(n.B(i))),l>0&&(!(Bl(e.b.d)&&i.q.d)&&!(Vm(e.b.d)&&i.q.b)&&(i.j.e+=0>l/2-.5?0:l/2-.5),!(Bl(e.b.d)&&i.q.a)&&!(Vm(e.b.d)&&i.q.c)&&(i.j.b-=l-1)))}function Eue(e,t){switch(e.e){case 1:switch(t.e){case 1:return lT;case 4:return .5;case 3:return fT;case 2:return BH}break;case 2:switch(t.e){case 1:return lT;case 2:return .5;case 3:return fT;case 4:return BH}break;default:throw new nn(cT)}return 0}function ak(e,t){var n,i,s,l;for(l=new fn(e,0),n=(ut(l.b<l.d.Y()),f(l.d.sb(l.c=l.b++),48));l.b<l.d.Y();)i=(ut(l.b<l.d.Y()),f(l.d.sb(l.c=l.b++),48)),s=new Q4(i.c,n.d,t),ut(l.b>0),l.a.sb(l.c=--l.b),cu(l,s),ut(l.b<l.d.Y()),l.d.sb(l.c=l.b++),s.a=!1,n=i}function qB(e){var t,n,i,s,l,h;for(s=f(z(e,(le(),ow)),7),h=new M(e.f);h.a<h.c.c.length;){for(l=f(O(h),7),i=new M(l.e);i.a<i.c.c.length;)return t=f(O(i),12),kn(t,s),l;for(n=new M(l.b);n.a<n.c.c.length;)return t=f(O(n),12),Bn(t,s),l}return null}function VB(e,t,n,i,s){var l,h,v,p,m,S;for(h=t,l=0,v=!1,S=new _c(n,i),m=il(S);m.G();)p=f(m.H(),7),v=!0,un(e.k,p,gt(h)),(gi(f(z(n,(Ee(),dt)),28))||p.b.c.length+p.e.c.length>1)&&(++l,++h);return!gi(f(z(n,(Ee(),dt)),28))&&v&&(++l,++h),un(s,n,gt(l)),h}function WB(e){var t,n,i,s,l,h,v,p,m,S,x,L;for(h=e.b.mb(),v=f(h.H(),92),S=v.a.a,m=S>fl,p=S<Lp;h.G();){if(n=v,l=S,s=m,i=p,v=f(h.H(),92),S=v.a.a,m=S>fl,p=S<Lp,!(m||p))return Og(v.b);if(s&&p||i&&m)return t=l/(l-S),x=Og(n.b),L=Og(v.b),t*x+(1-t)*L}return 0}function UB(e){var t,n,i,s,l,h,v,p,m,S,x,L;for(h=e.b.mb(),v=f(h.H(),92),S=v.a.b,m=S>fl,p=S<Lp;h.G();){if(n=v,l=S,s=m,i=p,v=f(h.H(),92),S=v.a.b,m=S>fl,p=S<Lp,!(m||p))return Og(v.b);if(s&&p||i&&m)return t=l/(l-S),x=Og(n.b),L=Og(v.b),t*x+(1-t)*L}return 0}function KB(e,t,n){var i,s;return i=0,qy(t)?Oc(e.g,t)?(cx(e.i,gt(Hc(e,t.c)),1)>0,cx(e.i,gt(Hc(e,t.d)),1)>0,wy(e.g,t),i+=moe(e,t,e.i)):(vn(e.g,t),hp(e.i,gt(Hc(e,t.c)),1),hp(e.i,gt(Hc(e,t.d)),1)):(s=sp(e.i,gt(f(Kt(e.k,n),24).a)),i+=e.g.a.Y()-s),i}function Sue(e){switch(e.e){case 0:return D$;case 1:return T$;case 2:return x$;case 3:return I$;case 4:return N$;case 5:return B$;case 6:return R$;case 7:return j$;case 8:return L$;case 9:return P$;case 11:return O$;case 10:return M$;default:return A$}}function vp(e){switch(e.e){case 0:return Ro;case 1:return Ns;case 2:return vc;case 3:return Cu;case 4:return xu;case 5:return as;case 6:return pc;case 7:return bc;case 8:return gc;case 9:return is;case 10:return kl;case 11:return Tu;default:return pf}}function Xg(e){switch(e.e){case 0:return as;case 1:return pc;case 2:return bc;case 3:return Ro;case 4:return Ns;case 5:return vc;case 6:return Cu;case 7:return xu;case 8:return gc;case 9:return is;case 10:return kl;case 11:return Tu;default:return pf}}function vx(e){switch(e.e){case 0:return vc;case 1:return Cu;case 2:return xu;case 3:return as;case 4:return pc;case 5:return bc;case 6:return Ro;case 7:return Ns;case 8:return gc;case 9:return is;case 10:return kl;case 11:return Tu;default:return pf}}function Cue(e){var t,n,i,s,l,h,v,p;for(n=(On(),new Md),v=new Ry((Yo(),new uo(e.f))),h=(s=new Wt(v.a).a.bb().mb(),new Zt(s));h.a.G();){if(l=(i=f(h.a.H(),21),f(i.yb(),9)),!l){$l();break}p=e.i[l.k],t=f(h2(n,p),20),t||(t=new Se,$g(n,p,t)),t.ib(l)}return n}function xue(e,t,n){var i,s,l;for(s=new M(e.b.a.b);s.a<s.c.c.length;)i=f(O(s),25),t.D(i)&&(l=ge(Ot(n.B(i))),l>0&&(!(Bl(e.b.d)&&i.q.d)&&!(Vm(e.b.d)&&i.q.b)&&(i.j.e-=0>l/2-.5?0:l/2-.5),!(Bl(e.b.d)&&i.q.a)&&!(Vm(e.b.d)&&i.q.c)&&(i.j.b+=0>l-1?0:l-1)))}function il(e){var t,n,i;switch(i=e.a.f,e.b){case 0:return new M(e.a.f);case 1:return Fl((n=new M3(i),n),FC(e));case 2:switch(e.c.e){case 2:case 1:return Fl(new M(i),FC(e));case 3:case 4:return Fl((t=new M3(i),t),FC(e))}}throw new qf("PortOrder not implemented.")}function Tue(e,t){var n;e.d&&(t.c!=e.e.c||_ie(e.e.b,t.b))&&(Le(e.f,e.d),e.a=e.d.d+e.d.c,e.d=null,e.e=null),mte(t.b)?e.c=t:e.b=t,(t.b==(Ag(),hc)&&!t.a||t.b==wl&&t.a||t.b==bf&&t.a||t.b==ml&&!t.a)&&e.c&&e.b&&(n=new Ya(e.a,e.c.d,t.c-e.a,e.b.d-e.c.d),e.d=n,e.e=t)}function al(e,t,n,i){this.e=e,this.j=f(z(e,(le(),xl)),134),this.f=ve(Er,Ii,9,t,0,1),this.b=ve(Yb,Nr,184,t,6,1),this.a=ve(Er,Ii,9,t,0,1),this.d=ve(Yb,Nr,184,t,6,1),this.i=ve(Er,Ii,9,t,0,1),this.g=ve(Yb,Nr,184,t,6,1),this.n=ve(Yb,Nr,184,t,6,1),this.k=n,this.c=i}function Lue(e,t,n){var i,s;if(t.g==(et(),er)&&n.g==er){if(!gi(f(z(f(z(t,(le(),lt)),9),(Ee(),dt)),28))||f(z(t,lt),9)!=f(z(n,lt),9))return;if(N8(t)||N8(n)){e.d=1,e.b=1;return}s=f(_e(t.f,0),7).g,i=f(_e(n.f,0),7).g,u2(t).g==(we(),rt)?ZB(e,t,n,s,i):ZB(e,n,t,i,s)}}function Sh(e){if(!e.a.c||!e.a.d)throw new zu((Gl(AG),AG.j+" must have a source and target "+(Gl(ZL),ZL.j)+" specified."));if(e.a.c==e.a.d)throw new zu("Network simplex does not support self-loops: "+e.a+" "+e.a.c+" "+e.a.d);return Wu(e.a.c.g,e.a),Wu(e.a.d.c,e.a),e.a}function ZB(e,t,n,i,s){i==(we(),Be)&&s==Be?hh(e,t)>hh(e,n)?e.d=mh(e,n):e.b=mh(e,t):i==qe&&s==qe?hh(e,t)<hh(e,n)?e.d=mh(e,n):e.b=mh(e,t):i==qe&&s==Be?hh(e,t)>hh(e,n)&&(e.d=mh(e,n),e.b=mh(e,t)):hh(e,t)<hh(e,n)&&(e.d=mh(e,n),e.b=mh(e,t))}function Pue(e){var t,n,i,s,l,h,v,p;for(p=e.f.c.length,n=0,t=p,s=2*p,v=new M(e.f);v.a<v.c.c.length;)switch(h=f(O(v),7),h.g.e){case 2:case 4:h.k=-1;break;case 1:case 3:i=h.b.c.length,l=h.e.c.length,i>0&&l>0?h.k=t++:i>0?h.k=n++:l>0?h.k=s++:h.k=n++}Fa(e.f,new ad)}function Due(e,t,n,i){var s,l,h,v,p;n.d.f!=t.f&&(s=new Va(e),_a(s,(et(),hn)),ce(s,(le(),lt),n),ce(s,(Ee(),dt),(zn(),ii)),i.c[i.c.length]=s,h=new Yn,cn(h,s),Bt(h,(we(),qe)),v=new Yn,cn(v,s),Bt(v,Be),p=n.d,kn(n,h),l=new ws,vu(l,n),ce(l,Un,null),Bn(l,v),kn(l,p),LB(s,h,v))}function jue(e){var t,n,i,s,l,h,v,p,m;for(h=Xo,p=Xo,v=null,n=new Wy(new Pm(e.e));n.b!=n.c.a.b;)if(t=q3(n),f(t.d,60).c==1&&(i=f(t.e,116).a,m=f(t.e,116).b,s=h-i>oc,l=i-h<oc&&p-m>oc,(s||l)&&(p=f(t.e,116).b,h=f(t.e,116).a,v=f(t.d,60),p==0&&h==0)))return v;return v}function XB(e,t){var n,i,s,l,h,v;return l=e.d,v=f(z(e,(Ee(),es)),15).a,v<0&&(v=0,ce(e,es,new Ut(v))),t.j.b=v,h=Math.floor(v/2),i=new Yn,Bt(i,(we(),qe)),cn(i,t),i.i.b=h,s=new Yn,Bt(s,Be),cn(s,t),s.i.b=h,kn(e,i),n=new ws,vu(n,e),ce(n,Un,null),Bn(n,s),kn(n,l),zoe(t,e,n),ase(e,n),n}function Nue(e){var t,n;n=f(z(e,(zt(),Sr)),85),t=f(z(e,(le(),Qs)),140),n==(Fi(),mc)?(ce(e,Sr,Sf),ce(e,Qs,(ks(),kf))):n==Pu?(ce(e,Sr,Sf),ce(e,Qs,(ks(),$h))):t==(ks(),kf)?(ce(e,Sr,mc),ce(e,Qs,aw)):t==$h&&(ce(e,Sr,Pu),ce(e,Qs,aw))}function Iue(e){var t,n,i,s,l;for(i=new M(Yg(e.e));i.a<i.c.c.length;)n=f(O(i),129),l=new qn(n.e.i),s=jC()[n.e.k],t=f(fh(e.c,s),283),l.b=t.e+t.a,s.b==(o2(),lc)?l.a=t.d:s.b==_h?l.a=t.d+(t.c-n.e.j.a)/2:s.b==fc&&(l.a=t.d+t.c-n.e.j.a),n.e.i.a=l.a,n.e.i.b=l.b,t.a+=n.e.j.b+e.d}function Mue(e){var t,n,i;for(n=new M(tc(e));n.a<n.c.c.length;){switch(t=f(O(n),161),i=new qn(t.e.i),f(t.e,7).g.e){case 4:i.a=0,i.b=e.e.j.b/2;break;case 2:i.a=e.e.j.a,i.b=e.e.j.b/2;break;case 1:i.a=e.e.j.a/2,i.b=0;break;case 3:i.a=e.e.j.a/2,i.b=e.e.j.b}t.e.i.a=i.a,t.e.i.b=i.b}}function QB(){this.c=ve(Qi,mi,26,(we(),re(ie(Mr,1),De,32,0,[fr,rt,Be,ct,qe])).length,12,1),this.b=ve(Qi,mi,26,re(ie(Mr,1),De,32,0,[fr,rt,Be,ct,qe]).length,12,1),this.a=ve(Qi,mi,26,re(ie(Mr,1),De,32,0,[fr,rt,Be,ct,qe]).length,12,1),fy(this.c,ki),fy(this.b,Hr),fy(this.a,Hr)}function JB(e,t,n){var i,s,l,h,v,p,m,S;for(l=ge(Ot(e.b.mb().H())),m=ge(Ot(qA(t.b))),i=Fo(Ga(e.a),m-n),s=Fo(Ga(t.a),n-l),S=dn(i,s),Fo(S,1/(m-l)),this.a=S,this.b=new Se,v=!0,h=e.b.mb(),h.H();h.G();)p=ge(Ot(h.H())),v&&p-n>fl&&(this.b.ib(n),v=!1),this.b.ib(p);v&&this.b.ib(n)}function Oue(e){var t,n,i,s;if(uce(e,e.n),e.d.c.length>0){for(ig(e.c);ax(e,f(O(new M(e.e.a)),61))<e.e.a.c.length;){for(t=Foe(e),s=t.d.e-t.c.e-t.a,t.d.j&&(s=-s),i=new M(e.e.a);i.a<i.c.c.length;)n=f(O(i),61),n.j&&(n.e+=s);ig(e.c)}ig(e.c),QC(e,f(O(new M(e.e.a)),61)),_z(e)}}function Aue(e,t){var n,i,s,l,h,v,p;for(n=Hr,v=(et(),Hn),s=new M(t.a);s.a<s.c.c.length;)i=f(O(s),9),l=i.g,l!=Hn&&(h=Ot(z(i,(le(),L6))),h==null?(n=n>0?n:0,i.i.b=n+Py(e.a,l,v)):i.i.b=(ur(h),h)),p=Py(e.a,l,v),i.i.b<n+p+i.e.d&&(i.i.b=n+p+i.e.d),n=i.i.b+i.j.b+i.e.a,v=l}function ez(e,t,n){var i,s,l;for(n.db(t,e),Le(e.g,t),l=e.o.d.Lc(t),rN(e.k)?e.k=l:e.k=Xt(e.k,l),rN(e.a)?e.a=l:e.a=je(e.a,l),t.g==e.o.d.Mc()?r8(e.j,l):r8(e.n,l),s=Dt(Ca((gr(),new Qn(lr(re(ie(Ze,1),Me,1,4,[new cd(t),new $f(t)]))))));xt(s);)i=f(Et(s),7),n.R(i)||ez(e,i,n)}function Rue(e){var t,n,i,s,l;for(i=(mn(),e.length),s=i>0&&(e.charCodeAt(0)==45||e.charCodeAt(0)==43)?1:0,t=s;t<i;t++)if(Pae(e.charCodeAt(t))==-1)throw new H1(gk+e+'"');if(l=parseInt(e,10),n=l<qs,isNaN(l))throw new H1(gk+e+'"');if(n||l>kr)throw new H1(gk+e+'"');return l}function Bue(e,t,n,i){var s,l,h,v;for(s=f(Jn(t,(we(),qe)).mb().H(),7),l=f(Jn(t,Be).mb().H(),7),v=new M(e.f);v.a<v.c.c.length;){for(h=f(O(v),7);h.b.c.length!=0;)kn(f(_e(h.b,0),12),s);for(;h.e.c.length!=0;)Bn(f(_e(h.e,0),12),l)}n||ce(t,(le(),Oi),null),i||ce(t,(le(),Si),null)}function zue(e){var t,n,i,s,l,h,v;for(v=new eA,h=new M(e.b);h.a<h.c.c.length;)if(l=f(O(h),9),l.g!=(et(),Cn)){for(Use(v,l,new Fr),s=Dt(En(l));xt(s);)if(i=f(Et(s),12),!(i.c.f.g==Cn||i.d.f.g==Cn))for(n=Jt(i.a,0);n.b!=n.d.c;)t=f(qt(n),10),zd(v,new Jf(t.a,t.b))}return v}function Qg(e,t,n,i){var s,l,h;if(this.e=new xi,this.a=e,this.b=t,e.b<t.b?(this.j=e.a,this.k=e.b,this.n=t.b):(this.j=t.a,this.k=t.b,this.n=e.b),s=f(z(i,(Ee(),Un)),44),s)for(h=Jt(s,0);h.b!=h.d.c;)l=f(qt(h),10),W3(l.a,e.a)&&an(this.e,l);this.g=n,this.g&&(this.i=this.j-n.j.d),this.f=i}function ol(e){Ta();var t,n,i,s,l,h;for(h=new $i,Bg(h,e),n=(l=new Wt(h.a).a.bb().mb(),new Zt(l));n.a.G();)t=(i=f(n.a.H(),21),i.yb()),vt(t);switch(h.a.Y()){case 0:return lh(),ev;case 1:return new Gu((s=new Wt(h.a).a.bb().mb(),i=f(new Zt(s).a.H(),21),i.yb()));default:return new ny(h)}}function gp(e,t,n,i){var s,l,h;qa(e,n,"x",t.i.a+i.a),qa(e,n,"y",t.i.b+i.b),qa(e,n,Ek,t.j.a),qa(e,n,Sk,t.j.b),xe(t,9)&&f(z(t,(Ee(),Sb)),86).kb((Eh(),iE))&&(s=f(t,9).b,h=Mn(n,Ck),h||(h=new Al,ja(n,Ck,h)),l=h.kc(),qa(e,l,"left",s.b),qa(e,l,"top",s.d),qa(e,l,"right",s.c),qa(e,l,nT,s.a))}function tz(e,t){var n,i,s,l,h,v,p,m,S,x;for(h=t==1?lE:cE,l=(p=new Wt(h.a).a.bb().mb(),new Zt(p));l.a.G();)for(s=(v=f(l.a.H(),21),f(v.yb(),59)),S=f(Ia(e.f.c,s),18).mb();S.G();)switch(m=f(S.H(),27),i=f(m.b,25),x=f(m.a,78),n=x.c,s.e){case 2:case 1:i.j.e+=n;break;case 4:case 3:i.j.d+=n}}function Hue(e,t){var n,i,s;t.a?(b3(e.b,t.b),e.a[t.b.k]=f(BI(e.b,t.b),25),n=f(RI(e.b,t.b),25),n&&(e.a[n.k]=t.b)):(i=f(BI(e.b,t.b),25),i&&i==e.a[t.b.k]&&i.f&&i.f!=t.b.f&&i.i.ib(t.b),s=f(RI(e.b,t.b),25),s&&e.a[s.k]==t.b&&s.f&&s.f!=t.b.f&&t.b.i.ib(s),nM(e.b,t.b))}function _ue(e,t){var n,i,s,l,h,v,p;for(s=new Se,n=0;n<=e.i;n++)i=new qc(t),i.k=e.i-n,s.c[s.c.length]=i;for(v=new M(e.o);v.a<v.c.c.length;)h=f(O(v),9),Ar(h,f(_e(s,e.i-e.f[h.k]),16));for(l=new M(s);l.a<l.c.c.length;)p=f(O(l),16),p.a.c.length==0&&Dd(l);t.c.c=ve(Ze,Me,1,0,4,1),Tn(t.c,s)}function Gue(e){var t,n,i,s;for(e.a.a.c=ve(Ze,Me,1,0,4,1),i=new M(e.a.b);i.a<i.c.c.length;)t=f(O(i),25),t.f=null;for(s=new M(e.a.b);s.a<s.c.c.length;)t=f(O(s),25),!t.o&&Le(e.a.a,new ep(re(ie(Gp,1),Me,25,0,[t])));for(n=new M(e.a.b);n.a<n.c.c.length;)t=f(O(n),25),t.o&&V0(t.o.f,t)}function Jg(e,t){var n,i,s,l;for(e=(mn(),e??Fs),n=(e.length+16*t.length,new Hm),l=0,i=0;i<t.length&&(s=e.indexOf("%s",l),s!=-1);)fA(n,e,l,s),Yu(n,t[i++]),l=s+2;if(Zte(n,e,l,e.length),i<t.length){for(n.a+=" [",Yu(n,t[i++]);i<t.length;)n.a+=", ",Yu(n,t[i++]);n.a+="]"}return n.a}function nz(e,t,n,i){var s,l;if(t){if(s=e.a.$b(n.d,t.d),s==0)return i.d=J4(t,n.e),i.b=!0,t;l=s<0?0:1,t.a[l]=nz(e,t.a[l],n,i),_u(t.a[l])&&(_u(t.a[1-l])?(t.b=!0,t.a[0].b=!1,t.a[1].b=!1):_u(t.a[l].a[l])?t=F0(t,1-l):_u(t.a[l].a[1-l])&&(t=YO(t,1-l)))}else return n;return t}function $ue(e,t){var n,i,s,l,h,v,p,m,S,x;for(p=gg(t.a),v=Xn(K1(p/e.a)),x=t.a,h=0,m=v,l=0;l<e.a;++l)S=(mn(),x.substr((0>h?0:h)<p?0>h?0:h:p,(0>(m<p?m:p)?0:m<p?m:p)-((0>h?0:h)<p?0>h?0:h:p))),h=m,m+=v,i=f(_e(e.c,l),9),n=new P4(S),n.j.b=t.j.b,pt(e.b,t,n),Le(i.c,n);Tr(e.g.c,t),Le(e.i,(s=new YN(e,t),s))}function rz(e,t,n){var i,s,l,h,v,p,m,S,x;for(t.k=1,l=t.d,x=Ss(t,(cr(),ai)).mb();x.G();)for(S=f(x.H(),7),s=new M(S.e);s.a<s.c.c.length;)i=f(O(s),12),m=i.d.f,t!=m&&(h=m.d,h.k<=l.k&&(v=l.k+1,v==n.c.c.length?(p=new qc(n),p.k=v,Le(n.c,p),Ar(m,p)):(p=f(_e(n.c,v),16),Ar(m,p)),rz(e,m,n)))}function Yue(e){var t,n,i,s,l;for(t=e.e.j,i=new M(tc(e));i.a<i.c.c.length;){switch(n=f(O(i),161),s=f(nr(n,(Ee(),vl)),15),!s&&(s=new Ut(0)),l=new qn(n.e.i),f(n.e,7).g.e){case 4:l.a=-n.e.j.a-s.a;break;case 2:l.a=t.a+s.a;break;case 1:l.b=-n.e.j.b-s.a;break;case 3:l.b=t.b+s.a}n.e.i.a=l.a,n.e.i.b=l.b}}function Fue(e){var t,n,i;i=f(z(e,(Ee(),ia)),18),!i.V()&&(n=(t=f(Gi(Ln),11),new ri(t,f(Ti(t,t.length),11),0)),i.kb((pu(),Ei))?di(n,Ei):di(n,Zi),i.kb(Ui)||di(n,Ui),i.kb(Wi)?di(n,ba):i.kb(Ka)?di(n,ga):i.kb(Ki)&&di(n,va),i.kb(ba)?di(n,Wi):i.kb(ga)?di(n,Ka):i.kb(va)&&di(n,Ki),ce(e,ia,n))}function iz(e,t,n,i,s){var l,h,v,p,m,S,x,L,j,I;for(L=a8(e,n),p=0;p<t;p++){for(s.J(n),j=new Se,I=f(i.H(),92),S=L+p;S<e.c;S++)v=I,I=f(i.H(),92),Le(j,new JB(v,I,n));for(x=L+p;x<e.c;x++)i.M(),x>L+p&&i.I();for(h=new M(j);h.a<h.c.c.length;)l=f(O(h),92),i.J(l);if(p<t-1)for(m=L+p;m<e.c;m++)i.M()}}function que(e){var t,n,i,s;if(e.d&&f(e.e,7).f.g==(et(),er))return Qt(),Qt(),yc;if(!e.a){for(e.a=new Se,i=new M(f(e.e,7).b);i.a<i.c.c.length;)t=f(O(i),12),Le(e.a,new N1(t));if(e.d&&(s=f(z(f(e.e,7),(le(),Is)),9),s))for(n=Dt(Dr(s));xt(n);)t=f(Et(n),12),Le(e.a,new N1(t))}return e.a}function Vue(e){var t,n,i,s;if(e.d&&f(e.e,7).f.g==(et(),er))return Qt(),Qt(),yc;if(!e.c){for(e.c=new Se,i=new M(f(e.e,7).e);i.a<i.c.c.length;)t=f(O(i),12),Le(e.c,new N1(t));if(e.d&&(s=f(z(f(e.e,7),(le(),Is)),9),s))for(n=Dt(En(s));xt(n);)t=f(Et(n),12),Le(e.c,new N1(t))}return e.c}function Wue(e,t){var n,i,s,l,h,v,p,m;for(v=f(z(e,(le(),lt)),7),p=ln(re(ie(_t,1),Ht,10,0,[v.f.i,v.i,v.a])).a,m=e.f.i.b,n=f(Vn(e.b,ve(Xi,qi,12,e.b.c.length,0,1)),47),s=0,l=n.length;s<l;++s)i=n[s],kn(i,v),Wm(i.a,new ot(p,m)),t&&(h=f(z(i,(Ee(),Un)),44),h||(h=new xi,ce(i,Un,h)),an(h,new ot(p,m)))}function Uue(e,t){var n,i,s,l,h,v,p,m;for(s=f(z(e,(le(),lt)),7),p=ln(re(ie(_t,1),Ht,10,0,[s.f.i,s.i,s.a])).a,m=e.f.i.b,n=f(Vn(e.e,ve(Xi,qi,12,e.e.c.length,0,1)),47),h=0,v=n.length;h<v;++h)l=n[h],Bn(l,s),HN(l.a,new ot(p,m)),t&&(i=f(z(l,(Ee(),Un)),44),i||(i=new xi,ce(l,Un,i)),an(i,new ot(p,m)))}function Kue(e){var t,n,i,s,l,h,v,p,m;for(h=Xo,p=Xo,v=null,n=new Wy(new Pm(e.e));n.b!=n.c.a.b;)if(t=q3(n),(He(t.d)===He((wi(),is))||He(t.d)===He(gc))&&(i=f(t.e,116).a,m=f(t.e,116).b,s=h-i>oc,l=i-h<oc&&p-m>oc,(s||l)&&(p=f(t.e,116).b,h=f(t.e,116).a,v=f(t.d,60),p==0&&h==0)))return v;return v}function Zue(e,t){var n,i,s,l,h;e.d=t,ho(e.b),e.c=!1;e:for(i=new M(e.d.c);i.a<i.c.c.length;)for(n=f(O(i),16),l=new M(n.a);l.a<l.c.c.length;)if(s=f(O(l),9),!Lg(Wg(s))){e.c=!0;break e}return h=Ft(($n(),Mo),re(ie(vb,1),De,59,0,[Oa,Vi])),e.c||(di(h,Ks),di(h,Ps)),e.a=new g3(h),Hfe(e),e.a}function az(){var e,t,n,i,s;for(this.e=(On(),new Md),this.b=(n=f(Gi(ov),11),new ri(n,f(Ti(n,n.length),11),0)),this.c=(i=f(Gi(ov),11),new ri(i,f(Ti(i,i.length),11),0)),this.a=(s=f(Gi(ov),11),new ri(s,f(Ti(s,s.length),11),0)),t=(wi(),wi(),E$).mb();t.G();)e=f(t.H(),60),$g(this.e,e,new sN)}function Xue(e,t,n){var i,s,l,h,v,p;ni(e.k-e.a)<mu||ni(t.k-t.a)<mu||(i=HB(e.n,t.j,n),s=HB(t.n,e.j,n),l=D2(e.n,t.k,t.a)+D2(t.j,e.k,e.a),h=D2(t.n,e.k,e.a)+D2(e.j,t.k,t.a),v=16*i+l,p=16*s+h,v<p?new Y0(e,t,p-v):v>p?new Y0(t,e,v-p):v>0&&p>0&&(new Y0(e,t,0),new Y0(t,e,0)))}function sl(e,t){var n,i,s,l,h,v,p,m,S;for(m=new Se,S=null,i=f(fh(yl,e),20).mb();i.G();){for(n=f(i.H(),75),p=(l=new Wt(n.c.a).a.bb().mb(),new Zt(l));p.a.G();)h=(s=f(p.a.H(),21),f(s.yb(),7)),cu(t,h),dp(h,e.b);Tn(m,n.b),S=e.a}for(lp(m),d2(m,S),v=new M(m);v.a<v.c.c.length;)h=f(O(v),7),cu(t,h)}function Que(){var e={layout:function(t){bw(Gle(t))}};typeof document!==sb&&(r.$klay=e),a.exports&&(a.exports=e),typeof document===sb&&typeof self!==sb&&self.addEventListener("message",function(t){e.layout(t.data)},!1)}function eb(e,t,n,i,s){var l,h,v;v=s?i.b:i.a,(v>n.k&&v<n.a||n.j.b!=0&&n.n.b!=0&&(ni(v-ge(Ot(ky(n.j))))<mu&&ni(v-ge(Ot(ky(n.n))))<mu||ni(v-ge(Ot(o0(n.j))))<mu&&ni(v-ge(Ot(o0(n.n))))<mu))&&(Oc(e.b,i)||(h=f(z(t,(Ee(),Un)),44),h||(h=new xi,ce(t,Un,h)),l=new qn(i),mr(h,l,h.c.b,h.c),vn(e.b,l)))}function Jue(e,t,n){var i,s,l,h,v,p,m,S,x;for(i=n.c,s=n.d,v=Di(t.c),p=Di(t.d),i==t.c?(v=nx(e,v,s),p=tB(t.d)):(v=tB(t.c),p=nx(e,p,s)),m=new xy(t.a),mr(m,v,m.a,m.a.a),mr(m,p,m.c.b,m.c),h=t.c==i,x=new kj,l=0;l<m.b-1;++l)S=new wr(f(Hd(m,l),10),f(Hd(m,l+1),10)),h&&l==0||!h&&l==m.b-2?x.b=S:Le(x.a,S);return x}function ece(e,t){var n,i,s,l;if(l=e.g.e-t.g.e,l!=0)return l;if(n=f(z(e,(Ee(),ku)),24),i=f(z(t,ku),24),n&&i&&(s=n.a-i.a,s!=0))return s;switch(e.g.e){case 1:return yr(e.i.a,t.i.a);case 2:return yr(e.i.b,t.i.b);case 3:return yr(t.i.a,e.i.a);case 4:return yr(t.i.b,e.i.b);default:throw new zu(DH)}}function tce(e,t){var n,i,s,l,h;for(h=new Fr,l=new M(tc(e));l.a<l.c.c.length;)switch(s=f(O(l),161),f(s.e,7).g.e){case 4:case 2:h.b=je(h.b,s.e.i.b+s.e.j.b+(t?(i=f(s.e,7).d,new Vo(i.d,i.b,i.a,i.c)).a:0));break;case 1:case 3:h.a=je(h.a,s.e.i.a+s.e.j.a+(t?(n=f(s.e,7).d,new Vo(n.d,n.b,n.a,n.c)).c:0))}return h}function ok(e,t){var n,i,s,l,h,v,p;for(s=new Se,p=new Se,n=f(fh(yl,e),20).mb();n.G();)i=f(n.H(),75),y8(s,i.b),y8(s,f8(i)),n.G()&&(i=f(n.H(),75),Tn(p,f8(i)),Tn(p,i.b));for(d2(s,e.b),d2(p,e.a),v=new M(s);v.a<v.c.c.length;)l=f(O(v),7),cu(t,l);for(h=new M(p);h.a<h.c.c.length;)l=f(O(h),7),cu(t,l)}function br(){br=c,UE=new $u("COMMENTS",0),os=new $u("EXTERNAL_PORTS",1),rw=new $u("HYPEREDGES",2),KE=new $u("HYPERNODES",3),mf=new $u("NON_FREE_PORTS",4),yf=new $u("NORTH_SOUTH_PORTS",5),iw=new $u("SELF_LOOPS",6),sv=new $u("CENTER_LABELS",7),uv=new $u("END_LABELS",8),l6=new $u("PARTITIONS",9)}function nce(e,t){var n,i,s,l;for(e=(mn(),e??Fs),n=(e.length+16*t.length,new Hm),l=0,i=0;i<t.length&&(s=e.indexOf("%s",l),s!=-1);)co(n,e.substr(l,s-l)),Yu(n,t[i++]),l=s+2;if(co(n,Pd(e,l,e.length-l)),i<t.length){for(n.a+=" [",Yu(n,t[i++]);i<t.length;)n.a+=", ",Yu(n,t[i++]);n.a+="]"}return n.a}function gx(e,t,n){var i,s;switch(s=null,t.e){case 1:s=(fa(),sL);break;case 2:s=(fa(),uL)}switch(i=null,n.e){case 1:i=(fa(),dE);break;case 2:i=(fa(),hE);break;case 3:i=(fa(),vE);break;case 4:i=(fa(),gE)}return s&&i?Lo(e.f,(U1(),new L9(new uo(re(ie(Ffe,1),Me,68,0,[f(vt(s),68),f(vt(i),68)]))))):(Qt(),Qt(),yc)}function bx(e,t,n){var i,s,l,h,v,p,m;for(p=ca(En(t)),s=Jt(p,0);s.b!=s.d.c;)i=f(qt(s),12),m=i.d.f,!(Pt(ge(Nt(z(m,(le(),wc)))))&&z(m,lt)!=null)&&m.g==(et(),Mi)&&!Pt(ge(Nt(z(i,Js))))&&i.d.g==(we(),qe)&&(l=ea(m.d)-ea(t.d),l>1&&(n?h=ea(t.d)+1:h=ea(m.d)-1,v=f(_e(e.a.c,h),16),Ar(m,v)),bx(e,m,n));return t}function oz(e,t){var n,i,s,l;for(t.d?s=e.a.c==(Do(),dc)?Dr(t.b):En(t.b):s=e.a.c==(Do(),js)?Dr(t.b):En(t.b),l=!1,i=(_n(),new Go($o(bs(s.a,new T))));xt(i);)if(n=f(Et(i),12),e.c.a[n.c.f.d.k]!==e.c.a[n.d.f.d.k]&&(l=!0,Oc(e.b,e.a.f[Moe(n,t.b).k])))return t.c=!0,t.a=n,t;return t.c=l,t.a=null,t}function rce(e,t,n){var i,s,l,h;for(i=f(z(e.d,(Ee(),RT)),15).a,l=new M(e.a.b);l.a<l.c.c.length;)if(s=f(O(l),25),xe(s,93)&&(h=f(s,93).b,h.g==(et(),Cn)))switch(f(z(h,(le(),_r)),32).e){case 4:h.i.a=t.a-i;break;case 2:h.i.a=n.a+i-(h.j.a+h.e.c);break;case 1:h.i.b=t.b-i;break;case 3:h.i.b=n.b+i-(h.j.b+h.e.a)}}function ice(){if(!Object.create||!Object.getOwnPropertyNames)return!1;var e="__proto__",t=Object.create(null);if(t[e]!==void 0)return!1;var n=Object.getOwnPropertyNames(t);return!(n.length!=0||(t[e]=42,t[e]!==42)||Object.getOwnPropertyNames(t).length==0)}function sz(e){var t,n,i,s,l,h,v,p,m;for(h=new M(e.a.a);h.a<h.c.c.length;)s=f(O(h),78),s.f=0,s.e.a.Q();for(l=new M(e.a.a);l.a<l.c.c.length;)for(s=f(O(l),78),n=(m=new Wt(s.a.a).a.bb().mb(),new Zt(m));n.a.G();)for(t=(i=f(n.a.H(),21),f(i.yb(),25)),p=t.i.mb();p.G();)v=f(p.H(),25),v.f!=s&&(vn(s.e,v),++v.f.f)}function px(e,t,n,i){var s,l,h,v;if(t.g==(et(),Mi)){for(l=Dt(Dr(t));xt(l);)if(s=f(Et(l),12),h=s.c.f,(h.g==Mi||Pt(ge(Nt(z(h,(le(),wc))))))&&e.d.a[s.c.f.d.k]==i&&e.d.a[t.d.k]==n)return!0}if(t.g==hn){for(l=Dt(Dr(t));xt(l);)if(s=f(Et(l),12),v=s.c.f.g,v==hn&&e.d.a[s.c.f.d.k]==i&&e.d.a[t.d.k]==n)return!0}return!1}function ace(e){var t,n,i,s,l,h;if(s=e.g.tb(),i=e.b.tb(),e.e)for(n=0;n<e.c;n++)s.H();else for(n=0;n<e.c-1;n++)s.H(),s.I();for(t=ge(Ot(s.H()));e.i-t>fl;){for(l=t,h=0;(t-l<=0?0-(t-l):t-l)<fl;)++h,t=ge(Ot(s.H())),i.H();h<e.c&&(s.M(),iz(e,e.c-h,l,i,s),s.H()),i.M()}if(!e.e)for(n=0;n<e.c-1;n++)s.H(),s.I();e.e=!0,e.d=!0}function oce(e){var t,n,i,s;switch(vy(e.a).c){case 4:return wi(),as;case 3:return f(Rre(e.a).mb().H(),60);case 2:return i=vy(e.a),n=new eh(i),t=f(Kc(n),60),s=f(Kc(n),60),Xg(t)==s?qo(i,(wi(),as))?Cu:as:vp(vp(t))==s?vp(t):vx(t);case 1:return i=vy(e.a),Xg(f(Kc(new eh(i)),60));case 0:return wi(),xu;default:return null}}function uz(e,t){var n;H3.call(this),this.a=f(z(t,(le(),Ai)),15).a,this.c=this.a*f(z(t,(zt(),vv)),15).a,this.b=e,this.j=new Ya(e.i.a-e.e.b,e.i.b-e.e.d,e.j.a+e.e.b+e.e.c,e.j.b+e.e.d+e.e.a),zs(this.g),n=Vl(Dr(e))-Vl(En(e)),n<0?zg(this.n,!0,($n(),Oa)):n>0&&zg(this.n,!0,($n(),Vi)),e.g==(et(),Cn)&&La(this.n,!1,!1,!1,!1)}function tb(e,t,n){var i,s,l,h,v,p,m,S,x,L;for(l=new ot(t,n),S=new M(e.b);S.a<S.c.c.length;)for(m=f(O(S),9),dn(m.i,l),L=new M(m.f);L.a<L.c.c.length;)for(x=f(O(L),7),s=new M(x.e);s.a<s.c.c.length;)for(i=f(O(s),12),Zu(i.a,l),h=f(z(i,(Ee(),Un)),44),h&&Zu(h,l),p=new M(i.b);p.a<p.c.c.length;)v=f(O(p),33),dn(v.i,l)}function sce(e,t,n){var i,s,l,h,v,p,m,S,x,L;for(l=new ot(t,n),S=new M(e.b);S.a<S.c.c.length;)for(m=f(O(S),9),dn(m.i,l),L=new M(m.f);L.a<L.c.c.length;)for(x=f(O(L),7),s=new M(x.e);s.a<s.c.c.length;)for(i=f(O(s),12),Zu(i.a,l),h=f(z(i,(Ee(),Un)),44),h&&Zu(h,l),p=new M(i.b);p.a<p.c.c.length;)v=f(O(p),33),dn(v.i,l)}function cz(e,t){var n,i,s,l,h;for(h=new M(e.f);h.a<h.c.c.length;)if(l=f(O(h),7),t){if(l.b.c.length!=0)throw new R1((s=B0(e),oT+(s??G1(e.k))+MH+OH+sT))}else for(i=new M(l.b);i.a<i.c.c.length;)if(n=f(O(i),12),He(z(n.c.f,(zt(),Sr)))!==He((Fi(),mc)))throw new R1((s=B0(e),oT+(s??G1(e.k))+MH+OH+sT))}function lz(e,t,n){var i,s,l,h,v,p,m;for(i=0,m=Jn(t,n),p=m.mb();p.G();)v=f(p.H(),7),f(z(v,(le(),Is)),9)&&(h=f(z(v,Is),9),Jn(h,(we(),Be)).mb().G()&&(i+=(l=e.k?1:$M(f(_e(h.f,0),7)),l*Hu($R(e,t,n).a-1-f(Kt(e.i,v),24).a,jR(e,t,h)))),Jn(h,qe).mb().G()&&(i+=(s=e.k?1:$M(f(_e(h.f,0),7)),s*Hu(f(Kt(e.i,v),24).a,jR(e,t,h)))));return i}function uce(e,t){var n,i,s,l,h,v,p;for(s=ve(Kn,Wn,26,e.e.a.c.length,12,1),h=new M(e.e.a);h.a<h.c.c.length;)l=f(O(h),61),s[l.b]+=l.c.c.length;for(v=ca(t);v.b!=0;)for(l=f(v.b==0?null:(ut(v.b!=0),_s(v,v.a.a)),61),i=new M(l.g);i.a<i.c.c.length;)n=f(O(i),89),p=n.d,p.e=ti(p.e,l.e+n.a),--s[p.b],s[p.b]==0&&mr(v,p,v.c.b,v.c)}function fz(e,t,n,i,s,l,h){if(e.d=i.e.i.a,e.e=i.e.i.b,s&&(e.d+=s.e.i.a,e.e+=s.e.i.b),e.c=t.e.j.a,e.b=t.e.j.b,!s)n?e.d-=h+t.e.j.a:e.d+=i.e.j.a+h;else switch(f(s.e,7).g.e){case 0:case 2:e.d+=s.e.j.a+h+l.a+h;break;case 4:e.d-=h+l.a+h+t.e.j.a;break;case 1:e.d+=s.e.j.a+h,e.e-=h+l.b+h+t.e.j.b;break;case 3:e.d+=s.e.j.a+h,e.e+=s.e.j.b+h+l.b+h}}function cce(e,t){var n,i,s,l,h,v,p,m,S;for(s=new Se,p=new M(t);p.a<p.c.c.length;)l=f(O(p),9),Le(s,e.b[l.d.k][l.k]);for(Qce(e,s);S=Fle(s);)Hce(e,f(S.a,102),f(S.b,102),s);for(t.c=ve(Ze,Me,1,0,4,1),i=new M(s);i.a<i.c.c.length;)for(n=f(O(i),102),h=n.d,v=0,m=h.length;v<m;++v)l=h[v],t.c[t.c.length]=l,e.a[l.d.k][l.k].a=xa(n.g,n.d[0]).a}function sk(e){var t,n,i,s,l,h,v;for(v=(On(),new $t),i=new M(e.a.b);i.a<i.c.c.length;)t=f(O(i),25),un(v,t,new Se);for(s=new M(e.a.b);s.a<s.c.c.length;)for(t=f(O(s),25),t.r=Hr,h=t.i.mb();h.G();)l=f(h.H(),25),f(li(fi(v.d,l)),20).ib(t);for(n=new M(e.a.b);n.a<n.c.c.length;)t=f(O(n),25),t.i.Q(),t.i=f(li(fi(v.d,t)),20);sz(e)}function lce(e){var t,n,i,s,l;switch(s=f(_e(e.b,0),9),t=new Va(e),Le(e.b,t),t.j.a=je(1,s.j.a),t.j.b=je(1,s.j.b),t.i.a=s.i.a,t.i.b=s.i.b,f(z(s,(le(),_r)),32).e){case 4:t.i.a+=2;break;case 1:t.i.b+=2;break;case 2:t.i.a-=2;break;case 3:t.i.b-=2}return i=new Yn,cn(i,t),n=new ws,l=f(_e(s.f,0),7),Bn(n,l),kn(n,i),dn(zs(i.i),l.i),dn(zs(i.a),l.a),t}function fce(e){var t,n,i,s,l,h,v,p,m;for(m=(On(),new $t),t=0,n=new Nm,v=e.mb();v.G();)l=f(v.H(),9),p=pg(kN(a4(new hd,t++),l),n),ra(m.d,l,p);for(h=e.mb();h.G();)for(l=f(h.H(),9),s=Dt(En(l));xt(s);)i=f(Et(s),12),!Zc(i)&&Sh(Kf(Xf(Zf(Qf(new Ol,ti(1,f(z(i,(le(),Qa)),24).a)),1),f(Kt(m,i.c.f),61)),f(Kt(m,i.d.f),61)));return n}function hce(e){var t,n;if(!e.V()){for(n=f(e.sb(0),75).f,new kx(e),t=new fn(n.f,0),tl((wi(),Ro),t),nl(kl,t),_g((we(),rt),t),ok(Ns,t),nl(Tu,t),sl(vc,t),tl(is,t),_g(Be,t),ok(Cu,t),tl(gc,t),sl(xu,t),tl(Tu,t),_g(ct,t),ok(as,t),tl(kl,t),sl(pc,t),nl(gc,t);t.b<t.d.Y();)ut(t.b<t.d.Y()),t.d.sb(t.c=t.b++);ok(bc,t),nl(is,t),nl(Ro,t)}}function dce(e){var t,n;if(!e.V()){for(n=f(e.sb(0),75).f,new kx(e),t=new fn(n.f,0),tl((wi(),Ro),t),nl(kl,t),_g((we(),rt),t),sl(Ns,t),nl(Tu,t),sl(vc,t),tl(is,t),_g(Be,t),sl(Cu,t),tl(gc,t),sl(xu,t),tl(Tu,t),_g(ct,t),sl(as,t),tl(kl,t),sl(pc,t),nl(gc,t);t.b<t.d.Y();)ut(t.b<t.d.Y()),t.d.sb(t.c=t.b++);sl(bc,t),nl(is,t),nl(Ro,t)}}function hz(e){var t,n,i,s,l,h,v,p,m;for(s=qs,h=kr,m=new M(e.e.a);m.a<m.c.c.length;)v=f(O(m),61),h=Hu(h,v.e),s=ti(s,v.e);for(l=0,i=ve(Kn,Wn,26,s-h+1,12,1),p=new M(e.e.a);p.a<p.c.c.length;)v=f(O(p),61),v.e-=h,++i[v.e];if(e.k)for(n=new M(e.k.c);n.a<n.c.c.length&&(t=f(O(n),16),i[l++]+=t.a.c.length,i.length!=l););return i}function vce(e){var t,n,i,s;for(Vie(e),tse(e),s=new ot(ki,ki),t=new ot(Hr,Hr),i=new M(e.a.b);i.a<i.c.c.length;)n=f(O(i),25),s.a=Xt(s.a,n.j.d),s.b=Xt(s.b,n.j.e),t.a=je(t.a,n.j.d+n.j.c),t.b=je(t.b,n.j.e+n.j.b);dn(zs(e.d.d),yy(new ot(s.a,s.b))),dn(zs(e.d.e),uu(new ot(t.a,t.b),s)),rce(e,s,t),e.a.a.c=ve(Ze,Me,1,0,4,1),e.a.b.c=ve(Ze,Me,1,0,4,1)}function gce(e,t){var n,i,s,l,h,v,p,m,S,x;if(h=e.e,S=f(z(e,(le(),hv)),20),x=0,S){for(p=0,l=S.mb();l.G();)s=f(l.H(),9),p=je(p,s.j.b),x+=s.j.a;x+=t/2*(S.Y()-1),h.d+=p+t}if(n=f(z(e,cv),20),i=0,n){for(p=0,l=n.mb();l.G();)s=f(l.H(),9),p=je(p,s.j.b),i+=s.j.a;i+=t/2*(n.Y()-1),h.a+=p+t}v=x>i?x:i,v>e.j.a&&(m=(v-e.j.a)/2,h.b=je(h.b,m),h.c=je(h.c,m))}function dz(e,t,n,i){var s,l,h,v,p,m,S,x,L,j;for(h=ua(t.d,n,i),x=new M(t.b);x.a<x.c.c.length;){for(S=f(O(x),9),dn(S.i,h),j=new M(S.f);j.a<j.c.c.length;)for(L=f(O(j),7),l=new M(L.e);l.a<l.c.c.length;)for(s=f(O(l),12),Zu(s.a,h),v=f(z(s,(Ee(),Un)),44),v&&Zu(v,h),m=new M(s.b);m.a<m.c.c.length;)p=f(O(m),33),dn(p.i,h);Le(e.b,S),S.a=e}}function bce(e,t){var n,i,s,l,h;for(e.c==null||e.c.length<t.c.length?e.c=ve(Fb,lb,26,t.c.length,13,1):ig(e.c),e.a=new Se,i=0,h=new M(t);h.a<h.c.c.length;)s=f(O(h),9),s.k=i++;for(n=new Ur,l=new M(t);l.a<l.c.c.length;)s=f(O(l),9),e.c[s.k]||(TB(e,s),n.b==0||(ut(n.b!=0),f(n.a.a.c,20)).Y()<e.a.c.length?HN(n,e.a):Wm(n,e.a),e.a=new Se);return n}function pce(e,t,n){var i,s,l,h,v,p,m,S,x;return i=_d(e.g),m=dn(Ga(e.i),e.a),S=dn(Ga(t.i),t.a),s=dn(new qn(m),Fo(new Fc(i),n)),x=dn(new qn(S),Fo(new Fc(i),n)),h=Fo(uu(new qn(s),x),.5),p=dn(dn(new qn(x),h),Fo(new Fc(i),nI(h.a*h.a+h.b*h.b))),v=new Uy(re(ie(_t,1),Ht,10,0,[m,s,p,x,S])),l=nf(v,.5,!1),v.a=l,zS(v,new K2(re(ie(_t,1),Ht,10,0,[l,m,S]))),v}function wx(e,t){var n,i,s,l,h;if(It(t,"Network simplex",1),e.e.a.c.length<1){Ct(t);return}for(l=new M(e.e.a);l.a<l.c.c.length;)s=f(O(l),61),s.e=0;for(h=e.e.a.c.length>=40,h&&Ice(e),ule(e),Oue(e),n=$8(e),i=0;n&&i<e.f;)wce(e,n,Jse(e,n)),n=$8(e),++i;h&&dse(e),e.a?Xse(e,hz(e)):hz(e),e.b=null,e.d=null,e.p=null,e.c=null,e.g=null,e.i=null,e.n=null,e.o=null,Ct(t)}function Ch(e){var t,n,i,s,l,h,v,p,m,S;for(m=new Yr,s=(On(),new $t),v=0,p=e.length;v<p;++v)h=e[v],t=h.mc(),m.a.db(t,m),t==null?ra(s.d,null,h):I2(s.e,t,h),S=Iy(t,(mn(),t.lastIndexOf(".")+1),t.length),Oc(rL,S)||(m.a.db(S,m),S==null?ra(s.d,null,h):I2(s.e,S,h),vn(rL,S));return i=(Ta(),_8((l=new Wt(m.a).a.bb().mb(),new Zt(l)))),n=yue(s),new wr(i,n)}function wce(e,t,n){var i,s,l;if(!t.e)throw new nn("Given leave edge is no tree edge.");if(n.e)throw new nn("Given enter edge is a tree edge already.");for(t.e=!1,wy(e.p,t),n.e=!0,vn(e.p,n),i=n.d.e-n.c.e-n.a,J2(e,n.d,t)||(i=-i),l=new M(e.e.a);l.a<l.c.c.length;)s=f(O(l),61),J2(e,s,t)||(s.e+=i);e.j=1,ig(e.c),QC(e,f(O(new M(e.e.a)),61)),_z(e)}function mce(e,t){var n,i,s,l,h,v,p,m,S,x,L,j;if(e.V())return new Fr;for(m=0,x=0,s=e.mb();s.G();)i=f(s.H(),55),l=i.e,m=je(m,l.a),x+=l.a*l.b;for(m=je(m,Math.sqrt(x)*f(z(f(e.mb().H(),55),(le(),Yh)),15).a),L=0,j=0,p=0,n=t,v=e.mb();v.G();)h=f(v.H(),55),S=h.e,L+S.a>m&&(L=0,j+=p+t,p=0),tb(h,L,j),n=je(n,L+S.a),p=je(p,S.b),L+=S.a+t;return new ot(n+t,j+p+t)}function uk(e,t,n,i){var s,l,h;return h=new DN(t,n),e.a?i?(s=f(Kt(e.b,t),126),++s.a,h.d=i.d,h.e=i.e,h.b=i,h.c=i,i.e?i.e.c=h:f(Kt(e.b,t),126).b=h,i.d?i.d.b=h:e.a=h,i.d=h,i.e=h):(e.e.b=h,h.d=e.e,e.e=h,s=f(Kt(e.b,t),126),s?(++s.a,l=s.c,l.c=h,h.e=l,s.c=h):(un(e.b,t,new L3(h)),++e.c)):(e.a=e.e=h,un(e.b,t,new L3(h)),++e.c),++e.d,h}function $s(e){var t,n,i,s,l,h,v,p;if(e.e)throw new zu((Gl(fE),"The "+fE.j+LH));for(e.d==($n(),Mo)&&xs(e,Oa),n=new M(e.a.a);n.a<n.c.c.length;)t=f(O(n),78),t.f=0;for(h=new M(e.a.b);h.a<h.c.c.length;)for(l=f(O(h),25),l.r=Hr,s=l.i.mb();s.G();)i=f(s.H(),25),++i.f.f;for(e.b.Cc(e),p=new M(e.a.b);p.a<p.c.c.length;)v=f(O(p),25),v.p=!0;return e}function yce(e,t,n,i,s){var l,h,v,p;l=new Va(e),_a(l,(et(),er)),ce(l,(Ee(),dt),(zn(),ii)),ce(l,(le(),lt),t.c.f),h=new Yn,ce(h,lt,t.c),Bt(h,s),cn(h,l),ce(t.c,Is,l),v=new Va(e),_a(v,er),ce(v,dt,ii),ce(v,lt,t.d.f),p=new Yn,ce(p,lt,t.d),Bt(p,s),cn(p,v),ce(t.d,Is,v),Bn(t,h),kn(t,p),Xc(0,n.c.length),dg(n.c,0,l),i.c[i.c.length]=v,ce(l,lv,gt(1)),ce(v,lv,gt(1))}function kce(e,t){var n,i,s,l,h;if(h=f(z(e.f,(Ee(),dt)),28),l=e.g.e-t.g.e,l!=0||h==(zn(),Cb))return l;if(h==(zn(),Ah)&&(n=f(z(e,ku),24),i=f(z(t,ku),24),n&&i&&(s=n.a-i.a,s!=0)))return s;switch(e.g.e){case 1:return yr(e.i.a,t.i.a);case 2:return yr(e.i.b,t.i.b);case 3:return yr(t.i.a,e.i.a);case 4:return yr(t.i.b,e.i.b);default:throw new zu(DH)}}function vz(e){var t,n,i,s,l,h,v,p,m,S,x;for(v=new Se,l=ge(Ot(e.g.sb(e.g.Y()-1))),x=e.g.mb();x.G();)S=Ot(x.H()),Gc(v,0,l-(ur(S),S));for(h=S2(p2(e)),m=new Se,s=new M(v),p=new Se,t=0;t<e.c-1;t++)Le(m,Ot(O(s)));for(i=Jt(h,0);i.b!=i.d.c;)n=f(qt(i),10),Le(m,Ot(O(s))),Le(p,new Qy(n,m)),Sn(0,m.c.length),m.c.splice(0,1);return new MC(e.e,e.f,e.d,e.c,v,p)}function mx(e,t,n,i,s){var l,h,v,p,m;return l=t.$b(n,e.b),l<0?(v=e.e,v?(h=v.d,e.e=mx(v,t,n,i,s),s[0]==0&&++e.a,e.j=Pr(e.j,i),e.e.d==h?e:bu(e)):(s[0]=0,sC(e,n,i))):l>0?(p=e.g,p?(h=p.d,e.g=mx(p,t,n,i,s),s[0]==0&&++e.a,e.j=Pr(e.j,i),e.g.d==h?e:bu(e)):(s[0]=0,oC(e,n,i))):(s[0]=e.c,m=Pr(e.c,i),th(T2(m,kr)<=0),e.c+=i,e.j=Pr(e.j,i),e)}function Ece(e,t){var n,i,s,l,h,v;s=pp(t,`,|;|\\(|\\)|\\[|\\]|\\{|\\}| |	|
-`),Hs(e);try{for(i=0,h=0,l=0,v=0;i<s.length;)s[i]!=null&&gg(Jc(s[i]))>0&&(h%2==0?l=up(s[i]):v=up(s[i]),h>0&&h%2!=0&&an(e,new ot(l,v)),++h),++i}catch(p){throw p=Kr(p),xe(p,130)?(n=p,new nn("The given string does not match the expected format for vectors."+n)):Zr(p)}}function gz(e,t,n){var i,s,l,h,v,p,m,S;for(s=!0,h=new M(t.c);h.a<h.c.c.length;){for(l=f(O(h),16),m=Hr,p=new M(l.a);p.a<p.c.c.length;)if(v=f(O(p),9),S=ge(n.n[v.k])+ge(n.d[v.k])-v.e.d,i=ge(n.n[v.k])+ge(n.d[v.k])+v.j.b+v.e.a,S>m&&i>m)m=ge(n.n[v.k])+ge(n.d[v.k])+v.j.b+v.e.a;else{s=!1,e.a&&$l();break}if(!s)break}return e.a&&$l(),s}function Sce(e){var t,n,i,s,l,h,v,p;return isNaN(e)?(G0(),xT):e<-9223372036854776e3?(G0(),s_):e>=9223372036854776e3?(G0(),o_):(s=!1,e<0&&(s=!0,e=-e),i=0,e>=ac&&(i=Xn(e/ac),e-=i*ac),n=0,e>=of&&(n=Xn(e/of),e-=n*of),t=Xn(e),l=qu(t,n,i),s&&(h=~l.l+1&Wa,v=~l.m+(h==0?1:0)&Wa,p=~l.h+(h==0&&v==0?1:0)&ic,l.l=h,l.m=v,l.h=p),l)}function Cce(e){var t,n,i,s,l,h,v;if(s=Fg(e),Bc(new M(s))){for(v=new Ya(0,0,e.e.j.a,e.e.j.b),n=new M(s);n.a<n.c.c.length;)t=f(O(n),129),i=new Ya(t.e.i.a,t.e.i.b,t.e.j.a,t.e.j.b),qg(v,i);h=new U4((l=f(e.e,7).d,new Vo(l.d,l.b,l.a,l.c))),h.d=-v.e,h.a=v.e+v.b-e.e.j.b,h.b=-v.d,h.c=v.d+v.c-e.e.j.a,f(e.e,7).d.b=h.b,f(e.e,7).d.d=h.d,f(e.e,7).d.c=h.c,f(e.e,7).d.a=h.a}}function bz(e){var t,n,i,s,l;for(l=new M(e.f);l.a<l.c.c.length;)for(s=f(O(l),7),i=new M(s.e);i.a<i.c.c.length;)if(n=f(O(i),12),He(z(n.d.f,(zt(),Sr)))!==He((Fi(),Pu)))throw new R1((t=B0(e),oT+(t??G1(e.k))+"' has its layer constraint set to LAST or LAST_SEPARATE, but has at least one outgoing edge. Connections between nodes with these "+sT))}function xce(e,t,n,i){var s,l,h,v,p,m;for(l=new M(e);l.a<l.c.c.length;){if(s=f(O(l),12),h=s.c,t.a.R(h))v=(Vc(),Xs);else if(n.a.R(h))v=(Vc(),wf);else throw new nn("Source port must be in one of the port sets.");if(p=s.d,t.a.R(p))m=(Vc(),Xs);else if(n.a.R(p))m=(Vc(),wf);else throw new nn("Target port must be in one of the port sets.");Le(i,new pB(s,v,m))}}function pz(e,t){var n,i,s,l,h,v;if("edges"in t.a){if(v=Mn(t,"edges"),!v.hc())throw new ps("The 'edges' property of a node has to be an array.",v,t);for(l=v.hc(),h=0;h<l.a.length;++h){if(s=Uu(l,h),!s.kc())throw new ps("All elements of the 'edges' property must be objects.",s,t);_fe(e,s.kc())}}if(Xd in t.a)for(i=Mn(t,Xd).hc(),h=0;h<i.a.length;++h)n=Uu(i,h).kc(),pz(e,n)}function bp(e){var t,n,i,s,l,h,v,p;for(i=new M(e.a.a);i.a<i.c.c.length;){for(n=f(O(i),78),n.g=null,h=(p=new Wt(n.a.a).a.bb().mb(),new Zt(p));h.a.G();)s=(t=f(h.a.H(),21),f(t.yb(),25)),zs(s.g),(!n.g||s.j.d<n.g.j.d)&&(n.g=s);for(l=(v=new Wt(n.a.a).a.bb().mb(),new Zt(v));l.a.G();)s=(t=f(l.a.H(),21),f(t.yb(),25)),s.g.a=s.j.d-n.g.j.d,s.g.b=s.j.e-n.g.j.e}return e}function Tce(e,t){var n,i,s,l,h,v,p,m,S,x,L,j,I;for(n=!1,j=ob*e.b.f*e.b.d,s=new M(t.c);s.a<s.c.c.length;)for(i=f(O(s),16),m=new M(i.a),l=f(O(m),9),S=d3(e.a[l.k]);m.a<m.c.c.length;)v=f(O(m),9),x=d3(e.a[v.k]),S!=x&&(L=Eg(e.b,l,v),h=l.i.b+l.j.b+l.e.a+S.a+L,p=v.i.b-v.e.d+x.a,h>p+j&&(I=S.i+x.i,x.a=(x.i*x.a+S.i*S.a)/I,x.i=I,S.g=x,n=!0)),l=v,S=x;return n}function Lce(e){var t,n,i,s,l,h;if(He(z(e,(Ee(),dt)))===He((zn(),ts))||He(z(e,dt))===He(ii)){for(h=new M(e.f);h.a<h.c.c.length;)if(l=f(O(h),7),l.g==(we(),rt)||l.g==ct)return!1}if(gs(f(z(e,dt),28))){for(s=Jn(e,(we(),Be)).mb();s.G();)if(i=f(s.H(),7),i.b.c.length!=0)return!1}for(n=Dt(En(e));xt(n);)if(t=f(Et(n),12),t.c.f==t.d.f)return!1;return!0}function wz(e,t){var n,i,s,l,h,v,p,m,S;if(s=e.f,h=s.j.a,l=s.j.b,h<=0&&l<=0)return we(),fr;switch(m=e.i.a,S=e.i.b,v=e.j.a,n=e.j.b,t.e){case 2:case 1:if(m<0)return we(),qe;if(m+v>h)return we(),Be;break;case 4:case 3:if(S<0)return we(),rt;if(S+n>l)return we(),ct}return p=(m+v/2)/h,i=(S+n/2)/l,p+i<=1&&p-i<=0?(we(),qe):p+i>=1&&p-i>=0?(we(),Be):i<.5?(we(),rt):(we(),ct)}function mz(e,t,n,i,s,l,h){var v,p,m,S,x,L;for(L=new iy,m=t.mb();m.G();)for(v=f(m.H(),627),x=new M(j8(v));x.a<x.c.c.length;)S=f(O(x),129),He(nr(S,(Ee(),da)))===He((Es(),Ih))&&(fz(L,S,!1,i,s,l,h),qg(e,L));for(p=n.mb();p.G();)for(v=f(p.H(),627),x=new M(j8(v));x.a<x.c.c.length;)S=f(O(x),129),He(nr(S,(Ee(),da)))===He((Es(),dl))&&(fz(L,S,!0,i,s,l,h),qg(e,L))}function yx(e,t){var n,i,s,l,h,v,p,m;for(p=new M(t.f);p.a<p.c.c.length;)for(v=f(O(p),7),s=Dt(Ca((gr(),new Qn(lr(re(ie(Ze,1),Me,1,4,[v.b,v.e]))))));xt(s);)i=f(Et(s),12),n=i.c==v?i.d:i.c,l=n.f,t!=l&&(m=f(z(i,(le(),Qa)),24).a,m<0&&(m=0),h=l.k,e.b[h]==0&&(i.d==n?(e.a[h]-=m+1,e.a[h]<=0&&e.c[h]>0&&an(e.e,l)):(e.c[h]-=m+1,e.c[h]<=0&&e.a[h]>0&&an(e.d,l))))}function Pce(e,t){var n,i,s,l,h,v,p,m,S;for(h=new M(t.c);h.a<h.c.c.length;)for(l=f(O(h),16),m=new M(l.a);m.a<m.c.c.length;){for(p=f(O(m),9),S=new Se,v=0,s=Dt(Dr(p));xt(s);)n=f(Et(s),12),f(z(n,(le(),Qa)),24).a>v&&(v=f(z(n,Qa),24).a);for(i=Dt(Dr(p));xt(i);)n=f(Et(i),12),p.d!=n.c.f.d&&f(z(n,(le(),Qa)),24).a==v&&Le(S,new wr(n.c.f,n));Fa(S,e.c),Gc(e.b,p.k,S)}}function Dce(e,t){var n,i,s,l,h,v,p,m,S;for(h=new M(t.c);h.a<h.c.c.length;)for(l=f(O(h),16),m=new M(l.a);m.a<m.c.c.length;){for(p=f(O(m),9),S=new Se,v=0,s=Dt(En(p));xt(s);)n=f(Et(s),12),f(z(n,(le(),Qa)),24).a>v&&(v=f(z(n,Qa),24).a);for(i=Dt(En(p));xt(i);)n=f(Et(i),12),p.d!=n.d.f.d&&f(z(n,(le(),Qa)),24).a==v&&Le(S,new wr(n.d.f,n));Fa(S,e.c),Gc(e.f,p.k,S)}}function kx(e){NR();var t,n,i,s,l,h,v,p,m,S;for(this.b=new Gf,this.c=new Se,this.a=new Se,p=pC(),m=0,S=p.length;m<S;++m)v=p[m],X4(yl,v,new Se);for(n=e.mb();n.G();)t=f(n.H(),75),Tn(this.a,Jy(t)),t.g.a.Y()==0?f(fh(yl,t.e),20).ib(t):Le(this.c,t);for(l=(h=new Kv(yl).a.bb().mb(),new Zv(h));l.a.G();)s=(i=f(l.a.H(),21),f(i.zb(),20)),Fa(s,this.b);lp(f(fh(yl,(wi(),Ro)),20))}function yz(e,t){var n,i,s,l,h,v,p;if(p=f(z(t,(Ee(),dt)),28),p==(zn(),ts)||p==ii)for(l=(n=f(z(t,(le(),ss)),15).a,new ot(t.e.a+t.a.b+t.a.c+2*n,t.e.b+t.a.d+t.a.a+2*n)).b,v=new M(e.a);v.a<v.c.c.length;)h=f(O(v),9),h.g==(et(),Cn)&&(i=f(z(h,_r),32),!(i!=(we(),Be)&&i!=qe)&&(s=ge(Ot(z(h,Lu))),p==ts&&(s*=l),h.i.b=s-f(z(h,yu),10).b,J0(h,!1,!0)))}function kz(e,t){var n,i,s,l,h,v,p,m;for(n=new Va(e.d.c),_a(n,(et(),Mi)),ce(n,(Ee(),dt),f(z(t,dt),28)),ce(n,ia,f(z(t,ia),86)),n.k=e.d.b++,Le(e.b,n),n.j.b=t.j.b,n.j.a=0,m=(we(),Be),l=Wc(Jn(t,m)),p=new M(l);p.a<p.c.c.length;)v=f(O(p),7),cn(v,n);return h=new Yn,Bt(h,m),cn(h,t),h.i.a=n.j.a,h.i.b=n.j.b/2,s=new Yn,Bt(s,P2(m)),cn(s,n),s.i.b=n.j.b/2,s.i.a=-s.j.a,i=new ws,Bn(i,h),kn(i,s),n}function jce(e,t,n){var i,s,l,h,v,p,m,S,x,L,j,I;for(p=new Ty,ioe(e,p),s=new XR(t),j=new Se,Le(j,(I=e.j,f(UN(nO(I||(e.j=new B9(e)))),7))),L=new Se;j.c.length!=0;){for(v=f(O(new M(j)),7),L.c[L.c.length]=v,i=z3(e,v),h=new fd(i.b.mb());h.b.G();)if(l=f(h.b.H(),12),cse(s,l,n))for(x=f(ek(p,l),20),S=x.mb();S.G();)m=f(S.H(),7),ji(L,m,0)!=-1||(j.c[j.c.length]=m);Tr(j,v)}return s}function pp(e,t){var n,i,s,l,h,v,p;for(n=RegExp(t,"g"),v=ve(Ok,Nr,2,0,5,1),i=0,p=e,l=null;;)if(h=n.exec(p),h==null||p==""){v[i]=p;break}else v[i]=Iy(p,0,h.index),p=Iy(p,h.index+h[0].length,(mn(),p.length)),n.lastIndex=0,l==p&&(v[i]=p.substr(0,1),p=Pd(p,1,p.length-1)),l=p,++i;if(mn(),e.length>0){for(s=v.length;s>0&&v[s-1]=="";)--s;s<v.length&&(v.length=s)}return v}function Nce(e){var t,n,i,s,l,h;for(h=new M(tc(e.e));h.a<h.c.c.length;)switch(l=f(O(h),161),f(l.e,7).g.e){case 4:e.q.b=je(e.q.b,(n=f(l.e,7).d,new Vo(n.d,n.b,n.a,n.c)).c);break;case 2:e.q.c=je(e.q.c,(i=f(l.e,7).d,new Vo(i.d,i.b,i.a,i.c)).b);break;case 1:e.q.d=je(e.q.d,(s=f(l.e,7).d,new Vo(s.d,s.b,s.a,s.c)).a);break;case 3:e.q.a=je(e.q.a,(t=f(l.e,7).d,new Vo(t.d,t.b,t.a,t.c)).d)}}function Ex(e,t,n,i,s){var l,h,v;return l=t.$b(n,e.b),l<0?(h=e.e,h?(e.e=Ex(h,t,n,i,s),i==0&&s[0]!=0?--e.a:i>0&&s[0]==0&&++e.a,e.j=Pr(e.j,i-s[0]),bu(e)):(s[0]=0,i>0?sC(e,n,i):e)):l>0?(v=e.g,v?(e.g=Ex(v,t,n,i,s),i==0&&s[0]!=0?--e.a:i>0&&s[0]==0&&++e.a,e.j=Pr(e.j,i-s[0]),bu(e)):(s[0]=0,i>0?oC(e,n,i):e)):(s[0]=e.c,i==0?ux(e):(e.j=Pr(e.j,i-e.c),e.c=i,e))}function Ice(e){var t,n,i,s,l,h,v;for(e.o=new FS,i=new Ur,h=new M(e.e.a);h.a<h.c.c.length;)l=f(O(h),61),tf(l).c.length==1&&mr(i,l,i.c.b,i.c);for(;i.b!=0;)l=f(i.b==0?null:(ut(i.b!=0),_s(i,i.a.a)),61),tf(l).c.length!=0&&(t=f(_e(tf(l),0),89),n=l.g.c.length>0,v=O2(t,l),D4(n?v.c:v.g,t),tf(v).c.length==1&&mr(i,v,i.c.b,i.c),s=new wr(l,t),fI(e.o,s),Tr(e.e.a,l))}function Sx(e,t,n,i,s){var l,h,v;return l=t.$b(n,e.b),l<0?(h=e.e,h?(e.e=Sx(h,t,n,i,s),s[0]>0&&(i>=s[0]?(--e.a,e.j=Ju(e.j,s[0])):e.j=Ju(e.j,i)),s[0]==0?e:bu(e)):(s[0]=0,e)):l>0?(v=e.g,v?(e.g=Sx(v,t,n,i,s),s[0]>0&&(i>=s[0]?(--e.a,e.j=Ju(e.j,s[0])):e.j=Ju(e.j,i)),bu(e)):(s[0]=0,e)):(s[0]=e.c,i>=e.c?ux(e):(e.c-=i,e.j=Ju(e.j,i),e))}function Ez(e,t,n){var i,s,l,h,v,p,m,S;for(p=new M(n.b);p.a<p.c.c.length;)v=f(O(p),9),h=f(z(v,(le(),Sl)),55),h&&(S=Ez(e,t,h),v.j.a=(l=f(z(S,ss),15).a,new ot(S.e.a+S.a.b+S.a.c+2*l,S.e.b+S.a.d+S.a.a+2*l)).a,v.j.b=(s=f(z(S,ss),15).a,new ot(S.e.a+S.a.b+S.a.c+2*s,S.e.b+S.a.d+S.a.a+2*s)).b);return m=new f0,i=oh(z(n,(Ee(),AT))),i!=null&&Ho(i,"de.cau.cs.kieler.fixed")?Bfe(n,m):Tse(t,n,m),n}function Sz(e){var t,n,i,s,l,h,v,p;v=f(z(e,(Ee(),uc)),18),p=f(z(e,Sb),18),i=f(z(e,(le(),ss)),15).a,e.d.a+=i,e.d.b+=i,e.e.a+=2*i,e.e.b+=2*i,ce(e,ss,new Ut(0)),s=(n=f(z(e,ss),15).a,new ot(e.e.a+e.a.b+e.a.c+2*n,e.e.b+e.a.d+e.a.a+2*n)),t=new qn(s),v.kb((gu(),Tb))&&(h=f(z(e,rv),15).a,l=f(z(e,nv),15).a,p.kb((Eh(),Pb))&&(h<=0&&(h=20),l<=0&&(l=20)),t.a=je(s.a,h),t.b=je(s.b,l)),Xce(e,s,t)}function Cz(e,t,n){var i,s,l,h,v,p,m,S;if(t.k==0){for(t.k=1,h=n,n||(s=new Se,l=(i=f(Gi(Mr),11),new ri(i,f(Ti(i,i.length),11),0)),h=new wr(s,l)),f(h.a,20).ib(t),t.g==(et(),Cn)&&f(h.b,18).ib(f(z(t,(le(),_r)),32)),p=new M(t.f);p.a<p.c.c.length;)for(v=f(O(p),7),S=Dt(Ca((gr(),new Qn(lr(re(ie(Ze,1),Me,1,4,[new cd(v),new $f(v)]))))));xt(S);)m=f(Et(S),7),Cz(e,m.f,h);return h}return null}function Mce(e,t,n,i){var s,l,h,v,p;switch(p=new qn(t.i),p.a+=t.j.a/2,p.b+=t.j.b/2,v=f(z(t,(le(),fv)),15).a,l=e.e,h=e.a,s=e.d,f(z(t,_r),32).e){case 1:p.a+=h.b+s.a-n/2,p.b=-i-v,t.i.b=-(h.d+v+s.b);break;case 2:p.a=l.a+h.b+h.c+v,p.b+=h.d+s.b-i/2,t.i.a=l.a+h.c+v-s.a;break;case 3:p.a+=h.b+s.a-n/2,p.b=l.b+h.d+h.a+v,t.i.b=l.b+h.a+v-s.b;break;case 4:p.a=-n-v,p.b+=h.d+s.b-i/2,t.i.a=-(h.b+v+s.a)}return p}function Oce(e,t){var n,i,s,l,h,v,p;for(l=new M(t.b);l.a<l.c.c.length;)s=f(O(l),9),h=z(s,(le(),lt)),xe(h,7)&&(v=f(h,7),p=Mce(t,s,v.j.a,v.j.b),v.i.a=p.a,v.i.b=p.b,Bt(v,f(z(s,_r),32)));n=(i=f(z(t,(le(),ss)),15).a,new ot(t.e.a+t.a.b+t.a.c+2*i,t.e.b+t.a.d+t.a.a+2*i)),f(z(t,Vr),18).kb((br(),os))?(ce(e,(Ee(),dt),(zn(),ii)),f(z(Li(e),Vr),18).ib(mf),Ax(e,n,!1)):Ax(e,n,!0)}function Cx(e,t,n){var i,s,l,h,v;switch(v=null,t.e){case 1:for(s=new M(e.f);s.a<s.c.c.length;)if(i=f(O(s),7),Pt(ge(Nt(z(i,(le(),t5))))))return i;v=new Yn,ce(v,(le(),t5),(yn(),yn(),oi));break;case 2:for(h=new M(e.f);h.a<h.c.c.length;)if(l=f(O(h),7),Pt(ge(Nt(z(l,(le(),n5))))))return l;v=new Yn,ce(v,(le(),n5),(yn(),yn(),oi))}return v&&(cn(v,e),Bt(v,n),Toe(v.i,e.j,n)),v}function xz(e,t){var n,i,s,l,h,v,p;return vt(t),th(e.a.t(t.a)),i=e.b,l=e.e,h=e.d,e.b?t.b&&(n=e.a.$b(e.e,t.e),(n<0||n==0&&t.d==(xo(),Ua))&&(l=t.e,h=t.d)):(i=t.b,l=t.e,h=t.d),s=e.c,v=e.g,p=e.f,e.c?t.c&&(n=e.a.$b(e.g,t.g),(n>0||n==0&&t.f==(xo(),Ua))&&(v=t.g,p=t.f)):(s=t.c,v=t.g,p=t.f),i&&s&&(n=e.a.$b(l,v),(n>0||n==0&&h==(xo(),Ua)&&p==(xo(),Ua))&&(l=v,h=(xo(),Ua),p=Np)),new fp(e.a,i,l,h,s,v,p)}function Ace(e,t,n,i){var s,l,h,v,p,m,S;if(n.c.f!=t.f)for(s=new Va(e),_a(s,(et(),hn)),ce(s,(le(),lt),n),ce(s,(Ee(),dt),(zn(),ii)),i.c[i.c.length]=s,h=new Yn,cn(h,s),Bt(h,(we(),qe)),v=new Yn,cn(v,s),Bt(v,Be),kn(n,h),l=new ws,vu(l,n),ce(l,Un,null),Bn(l,v),kn(l,t),LB(s,h,v),m=new fn(n.b,0);m.b<m.d.Y();)p=(ut(m.b<m.d.Y()),f(m.d.sb(m.c=m.b++),33)),S=f(z(p,da),107),S==(Es(),dl)&&(Po(m),Le(l.b,p))}function Rce(e,t,n,i){var s,l,h,v,p,m,S,x,L,j,I,R,Y;for(l=n+(t.n+1)*e.a,h=t.b,s=new ot(l,h),p=(S=new Wt(t.c.a).a.bb().mb(),new Zt(S));p.a.G();)v=(m=f(p.a.H(),21),f(m.yb(),12)),I=Di(v.d),x=Di(v.c),j=new ot(l,x.b),Y=new ot(l,I.b),L=new ot(n-10,x.b),R=new ot(i,I.b),I.a>=i&&x.a>=i&&(L.a=i),I.a<=n&&x.a<=n&&(R.a=n-10),t.c.a.Y()==1?K3(v.a,re(ie(_t,1),Ht,10,0,[L,j,Y,R])):K3(v.a,re(ie(_t,1),Ht,10,0,[L,j,s,Y,R]))}function wu(e,t){var n,i,s,l,h,v;for(l=e.c,h=e.d,Bn(e,null),kn(e,null),t&&Pt(ge(Nt(z(h,(le(),t5)))))?Bn(e,Cx(h.f,(cr(),ai),(we(),Be))):Bn(e,h),t&&Pt(ge(Nt(z(l,(le(),n5)))))?kn(e,Cx(l.f,(cr(),Ri),(we(),qe))):kn(e,l),i=new M(e.b);i.a<i.c.c.length;)n=f(O(i),33),s=f(z(n,(Ee(),da)),107),s==(Es(),Ih)?ce(n,da,dl):s==dl&&ce(n,da,Ih);v=Pt(ge(Nt(z(e,(le(),Js))))),ce(e,Js,(yn(),v?Rn:oi)),e.a=S2(e.a)}function xx(e){var t,n,i,s,l,h;for(j4(this),n=e.Y()-1;n<3;n++)e.rb(0,f(e.sb(0),10));if(e.Y()<4)throw new nn("At (least dimension + 1) control points are necessary!");for(this.c=3,this.e=!0,this.f=!0,this.d=!1,sue(this,e.Y()+this.c-1),h=new Se,l=this.g.mb(),t=0;t<this.c-1;t++)Le(h,Ot(l.H()));for(s=e.mb();s.G();)i=f(s.H(),10),Le(h,Ot(l.H())),this.b.ib(new Qy(i,h)),Sn(0,h.c.length),h.c.splice(0,1)}function Bce(e){var t,n,i,s,l,h,v,p,m,S,x;for(x=new wm,x.d=0,h=new M(e.c);h.a<h.c.c.length;)l=f(O(h),16),x.d+=l.a.c.length;for(i=0,s=0,x.a=ve(Kn,Wn,26,e.c.c.length,12,1),m=0,x.e=ve(Kn,Wn,26,x.d,12,1),n=new M(e.c);n.a<n.c.c.length;)for(t=f(O(n),16),t.k=i++,x.a[t.k]=s++,S=0,p=new M(t.a);p.a<p.c.c.length;)v=f(O(p),9),v.k=m++,x.e[v.k]=S++;return x.c=new sj(x),x.b=zc(x.d),Pce(x,e),x.f=zc(x.d),Dce(x,e),x}function zce(e,t){var n,i,s,l,h,v,p,m,S,x,L,j,I,R;for(v=ve(Kn,Wn,26,t.c.c.length,12,1),m=ve(oL,De,132,t.c.c.length,0,1),x=e.a,L=0,j=x.length;L<j;++L){for(S=x[L],R=0,h=new M(S.f);h.a<h.c.c.length;)s=f(O(h),9),p=s.g,i=ea(s.d),++v[i],I=e.b.a*e.b.d,v[i]>0&&m[i]&&(I=Py(e.b,m[i],p)),R=je(R,s.d.c.b+I);for(l=new M(S.f);l.a<l.c.c.length;)s=f(O(l),9),s.i.b=R+s.e.d,n=s.d,n.c.b=R+s.e.d+s.j.b+s.e.a,m[ji(n.b.c,n,0)]=s.g}}function Tz(e){var t,n,i,s,l,h,v,p,m,S;for(p=new M(e.a);p.a<p.c.c.length;)if(v=f(O(p),9),v.g==(et(),Cn)&&(s=f(z(v,(le(),_r)),32),s==(we(),Be)||s==qe))for(i=Dt(Wg(v));xt(i);)n=f(Et(i),12),t=n.a,t.b!=0&&(m=n.c,m.f==v&&(l=(ut(t.b!=0),f(t.a.a.c,10)),l.b=ln(re(ie(_t,1),Ht,10,0,[m.f.i,m.i,m.a])).b),S=n.d,S.f==v&&(h=(ut(t.b!=0),f(t.c.b.c,10)),h.b=ln(re(ie(_t,1),Ht,10,0,[S.f.i,S.i,S.a])).b))}function Hce(e,t,n,i){var s,l,h,v,p,m;for(h=new Bz(e,t,n),p=new fn(i,0),s=!1;p.b<p.d.Y();)v=(ut(p.b<p.d.Y()),f(p.d.sb(p.c=p.b++),102)),v==t||v==n?Po(p):!s&&ge(xa(v.g,v.d[0]).a)>ge(xa(h.g,h.d[0]).a)?(ut(p.b>0),p.a.sb(p.c=--p.b),cu(p,h),s=!0):v.e&&v.e.Y()>0&&(l=(!v.e&&(v.e=new Se),v.e).nb(t),m=(!v.e&&(v.e=new Se),v.e).nb(n),(l||m)&&((!v.e&&(v.e=new Se),v.e).ib(h),++h.c));s||(i.c[i.c.length]=h)}function _ce(e,t,n,i){var s,l,h,v,p,m,S,x,L,j,I;n.d.f!=t.f&&(s=new Va(e),_a(s,(et(),hn)),ce(s,(le(),lt),n),ce(s,(Ee(),dt),(zn(),ii)),i.c[i.c.length]=s,h=new Yn,cn(h,s),Bt(h,(we(),qe)),v=new Yn,cn(v,s),Bt(v,Be),p=n.d,kn(n,h),l=new ws,vu(l,n),ce(l,Un,null),Bn(l,v),kn(l,p),m=f(_e(h.b,0),12).c,S=m.f,x=S.g,L=f(_e(v.e,0),12).d,j=L.f,I=j.g,x==hn?ce(s,Oi,f(z(S,Oi),7)):ce(s,Oi,m),I==hn?ce(s,Si,f(z(j,Si),7)):ce(s,Si,L))}function Gce(e,t,n){var i,s,l,h,v,p,m,S,x,L,j,I,R,Y,q;return v=e.b[t],p=e.b[n],m=f(z(v,(le(),Fh)),20),!!m&&m.Y()!=0&&m.kb(p)||(S=v.g!=(et(),hn)&&p.g!=hn,x=f(z(v,El),9),L=f(z(p,El),9),j=!!x&&x!=v||!!L&&L!=p,I=x!=L,R=iB(v,(we(),rt)),Y=iB(p,ct),q=j&&I||R||Y,S&&q)||v.g==(et(),er)&&p.g==Hn||p.g==(et(),er)&&v.g==Hn?!1:(h=e.b[t],i=e.b[n],Voe(e.c,h,i),Xoe(e.d,h,i),l=YR(e.a,h,i)+e.c.d+e.d.d,s=YR(e.a,i,h)+e.c.b+e.d.b,l>s)}function $ce(e,t){var n,i,s,l,h,v,p,m,S,x,L,j,I,R;for(h=t,L=t.d,S=t.c.f,j=t.d.f,x=ea(S.d),I=ea(j.d),v=x;v<I;v++)s=new Va(e),_a(s,(et(),hn)),ce(s,(le(),lt),h),ce(s,(Ee(),dt),(zn(),ii)),p=f(_e(e.c,v+1),16),Ar(s,p),R=f(z(h,es),15).a,R<0&&(R=0,ce(h,es,new Ut(R))),s.j.b=R,m=Math.floor(R/2),i=new Yn,Bt(i,(we(),qe)),cn(i,s),i.i.b=m,l=new Yn,Bt(l,Be),cn(l,s),l.i.b=m,kn(h,i),n=new ws,vu(n,h),ce(n,Un,null),Bn(n,l),kn(n,L),Hoe(s,h,n),h=n}function Yce(e,t){if(wi(),e==t)return R2(e);switch(e.e){case 1:switch(t.e){case 4:return Ro;case 1:return Ns;case 2:return vc;case 3:return Tu}case 2:switch(t.e){case 1:return vc;case 2:return Cu;case 3:return xu;case 4:return is}case 3:switch(t.e){case 2:return xu;case 3:return as;case 4:return pc;case 1:return Tu}case 4:switch(t.e){case 3:return pc;case 4:return bc;case 1:return Ro;case 2:return is}}return pf}function Fce(e){var t,n,i,s,l,h,v,p,m,S,x,L,j,I,R;for(x=new $i,s=null,h=new M(e.c);h.a<h.c.c.length;){for(l=f(O(h),16),p=new M(l.a);p.a<p.c.c.length;)v=f(O(p),9),v.g==(et(),Cn)&&(S=f(z(v,(le(),sw)),9),S&&(Poe(S,x),L=new Yn,cn(L,v),j=f(z(v,_r),32),Bt(L,j),I=f(_e(S.f,0),7),R=new ws,Bn(R,L),kn(R,I)));s=l}for(n=(m=new Wt(x.a).a.bb().mb(),new Zt(m));n.a.G();)t=(i=f(n.a.H(),21),f(i.yb(),9)),Ar(t,s);return x}function Lz(e,t,n){var i,s,l,h,v,p,m,S,x;for(s=new Se,m=new M(t.b);m.a<m.c.c.length;)if(p=f(O(m),9),v=f(z(p,(le(),Sl)),55),v&&(i=Lz(e,v,p),Tn(s,i),Ale(e,v,p),f(z(v,Vr),18).kb((br(),os))))for(x=new M(p.f);x.a<x.c.c.length;)S=f(O(x),7),Kt(e.b,S)==null&&(l=wp(S,(zn(),Ao),S.g,-(S.b.c.length-S.e.c.length),S.j,f(z(v,(Ee(),Oo)),59),v),ce(l,lt,S),un(e.b,S,l),Le(v.b,l));return h=new Se,zle(e,t,n,s,h),n&&Nle(e,t,n,h),h}function qce(e){var t,n,i,s,l,h,v,p,m,S,x,L;for(t=OB(e),S=(v=new Wt(t).a.bb().mb(),new Zt(v));S.a.G();){for(m=(s=f(S.a.H(),21),f(s.yb(),9)),x=m.e.d,L=m.j.b+m.e.a,e.d[m.k]=0,n=m;(l=e.a[n.k])!=m;)i=Rae(n,l),e.c==(Do(),js)?p=i.d.i.b+i.d.a.b-i.c.i.b-i.c.a.b:p=i.c.i.b+i.c.a.b-i.d.i.b-i.d.a.b,h=ge(e.d[n.k])+p,e.d[l.k]=h,x=je(x,l.e.d-h),L=je(L,h+l.j.b+l.e.a),n=l;n=m;do e.d[n.k]=ge(e.d[n.k])+x,n=e.a[n.k];while(n!=m);e.b[m.k]=x+L}}function ck(e,t,n){var i,s,l,h,v,p,m,S;return i=e.a.k==(fo(),Xa)?ki:Hr,v=oz(e,new eI(t,n)),!v.a&&v.c?(an(e.d,v),i):v.a?(s=v.a.c,p=v.a.d,n?(m=e.a.c==(Do(),dc)?p:s,l=e.a.c==dc?s:p,h=e.a.f[l.f.k],S=ge(e.a.n[h.k])+ge(e.a.d[l.f.k])+l.i.b+l.a.b-ge(e.a.d[m.f.k])-m.i.b-m.a.b):(m=e.a.c==(Do(),js)?p:s,l=e.a.c==js?s:p,S=ge(e.a.n[e.a.f[l.f.k].k])+ge(e.a.d[l.f.k])+l.i.b+l.a.b-ge(e.a.d[m.f.k])-m.i.b-m.a.b),S):i}function Vce(e){var t,n,i,s,l;for(ce(e.g,(le(),y6),ca(e.g.c)),t=1;t<e.c.c.length-1;++t)ce(f(_e(e.c,t),9),(Ee(),ia),(pu(),Ft(Ei,re(ie(Ln,1),De,41,0,[ga,Ka]))));for(i=Jt(ca(e.g.c),0);i.b!=i.d.c;)n=f(qt(i),33),s=f(z(e.g,(Ee(),ia)),86),Xu(s,Ft((pu(),Zi),re(ie(Ln,1),De,41,0,[Wi,ga])))||(Xu(s,Ft(Zi,re(ie(Ln,1),De,41,0,[Ki,ga])))?(Le(e.e.c,n),Tr(e.g.c,n),l=new $N(e,n),ce(e.g,JE,l)):($ue(e,n),Le(e.i,e.d),ce(e.g,JE,koe(e.i))))}function Pz(e,t,n,i){var s,l,h,v,p,m,S;if(l=N2(i),v=Pt(ge(Nt(z(i,(zt(),O6))))),(v||Pt(ge(Nt(z(e,(Ee(),wb))))))&&!gs(f(z(e,(Ee(),dt)),28)))s=Z0(l),p=Cx(e,n,n==(cr(),ai)?s:P2(s));else switch(p=new Yn,cn(p,e),S=p.i,S.a=t.a-e.i.a,S.b=t.b-e.i.b,Lse(S,e.j.a,e.j.b),Bt(p,wz(p,l)),h=f(z(i,(le(),Vr)),18),m=p.g,l.e){case 2:case 1:(m==(we(),rt)||m==ct)&&h.ib((br(),yf));break;case 4:case 3:(m==(we(),Be)||m==qe)&&h.ib((br(),yf))}return p}function Wce(e){var t,n,i,s,l,h,v,p;for(i=G4(Wc(e.a)),s=(t=f(Gi(ov),11),new ri(t,f(Ti(t,t.length),11),0));i.a.G()||i.b.mb().G();)n=f(eC(i),12),v=n.c.g,p=n.d.g,v==(we(),fr)?p!=fr&&(h=R2(p),ce(n,(le(),Hb),h),Bt(n.c,p),di(s,h),i.a.I()):p==fr?(h=R2(v),ce(n,(le(),Hb),h),Bt(n.d,v),di(s,h),i.a.I()):(h=Yce(v,p),ce(n,(le(),Hb),h),di(s,h),i.a.I());return s.c==1?l=f(Kc(new eh(s)),60):l=(wi(),pf),$d(e,l,!1),l}function Uce(e,t){var n,i,s,l;for(s=0;s<(mn(),t.length)&&LR(t.charCodeAt(s),fH);)++s;for(n=t.length;n>0&&LR(t.charCodeAt(n-1),hH);)--n;if(s>=n)throw new nn("The given string does not contain any numbers.");if(l=pp(t.substr(s,n-s),`,|;|\r|
-`),l.length!=2)throw new nn("Exactly two numbers are expected, "+l.length+" were found.");try{e.a=up(Jc(l[0])),e.b=up(Jc(l[1]))}catch(h){throw h=Kr(h),xe(h,130)?(i=h,new nn(dH+i)):Zr(h)}}function Kce(e,t,n){var i,s,l,h,v,p,m,S,x;for(p=n+t.d.c.a,x=new M(t.f);x.a<x.c.c.length;){if(S=f(O(x),7),i=ln(re(ie(_t,1),Ht,10,0,[S.f.i,S.i,S.a])),l=new ot(0,i.b),S.g==(we(),Be))l.a=p;else if(S.g==qe)l.a=n;else continue;if(i.a!=l.a)for(s=S.e.c.length+S.b.c.length>1,v=Dt(Ca((gr(),new Qn(lr(re(ie(Ze,1),Me,1,4,[S.b,S.e]))))));xt(v);)h=f(Et(v),12),m=h.c==S?h.d:h.c,ni(ln(re(ie(_t,1),Ht,10,0,[m.f.i,m.i,m.a])).b-l.b)>1&&eue(e,h,l,s,S)}}function Dz(e,t){var n,i,s,l,h,v;for(h=new ef(new ou(e.f.b).a);h.b;){if(l=Rd(h),s=f(l.yb(),251),t==1){if(s.yc()!=($n(),Ks)&&s.yc()!=Ps)continue}else if(s.yc()!=($n(),Oa)&&s.yc()!=Vi)continue;switch(i=f(f(l.zb(),27).b,25),v=f(f(l.zb(),27).a,78),n=v.c,s.yc().e){case 2:i.j.d=e.e.a,i.j.c=je(1,i.j.c+n);break;case 1:i.j.d=i.j.d+n,i.j.c=je(1,i.j.c-n);break;case 4:i.j.e=e.e.b,i.j.b=je(1,i.j.b+n);break;case 3:i.j.e=i.j.e+n,i.j.b=je(1,i.j.b-n)}}}function Tx(e,t,n,i,s){var l,h,v,p,m,S,x,L,j;for(L=(On(),new $t),v=new Se,gB(e,n,e.d.Mc(),v,L),gB(e,i,e.d.Nc(),v,L),p=new fn(v,0);p.b<p.d.Y();)for(l=(ut(p.b<p.d.Y()),f(p.d.sb(p.c=p.b++),80)),m=new fn(v,p.b);m.b<m.d.Y();)h=(ut(m.b<m.d.Y()),f(m.d.sb(m.c=m.b++),80)),Xue(l,h,e.a);for(Ife(v,f(z(t,(le(),qh)),154)),Ole(v),j=-1,x=new M(v);x.a<x.c.c.length;)S=f(O(x),80),!(ni(S.k-S.a)<mu)&&(j=ti(j,S.i),e.d.Kc(S,s));return e.b.a.Q(),j+1}function jz(e,t,n){var i,s;switch(s=new qn(t),i=new qn(e.j),n.e){case 1:case 8:case 7:ua(s,-i.a/2,-i.b),ua(t,0,-(.5+i.b));break;case 3:case 4:case 5:ua(s,-i.a/2,0),ua(t,0,.5+i.b);break;case 0:ua(s,-i.a/2,-i.b),ua(t,0,-(.5+-i.b));break;case 10:case 2:ua(s,0,-i.b/2),ua(t,0,-(.5+i.b));break;case 6:ua(s,-i.a,i.b/2),ua(t,0,-(.5+i.b));break;case 9:ua(s,-i.a/2,0),ua(t,0,-(.5+i.b));break;case 11:ua(s,-i.a,-i.b/2),ua(t,0,-(.5+i.b))}return dn(zs(e.i),s),new R8(e)}function Zce(e,t,n,i,s){$l();var l,h,v,p,m,S,x;if(cO(e,"src"),cO(n,"dest"),S=Od(e),v=Od(n),c3((S.g&4)!=0,"srcType is not an array"),c3((v.g&4)!=0,"destType is not an array"),m=S.c,l=v.c,c3(m.g&1?m==l:(l.g&1)==0,"Array types don't match"),x=e.length,p=n.length,t<0||i<0||s<0||t+s>x||i+s>p)throw new $S;if((!(m.g&1)||m.g&4)&&S!=v)if(e===n&&t<i)for(t+=s,h=i+s;h-- >i;)n[h]=e[--t];else for(h=i+s;i<h;)n[i++]=e[t++];else s>0&&q2(e,t,n,i,s,!0)}function Xce(e,t,n){var i,s,l,h,v;if(i=f(z(e,(zt(),l5)),18),n.a>t.a&&(i.kb((Gd(),AE))?e.d.a+=(n.a-t.a)/2:i.kb(BE)&&(e.d.a+=n.a-t.a)),n.b>t.b&&(i.kb((Gd(),HE))?e.d.b+=(n.b-t.b)/2:i.kb(zE)&&(e.d.b+=n.b-t.b)),f(z(e,(le(),Vr)),18).kb((br(),os))&&(n.a>t.a||n.b>t.b))for(v=new M(e.b);v.a<v.c.c.length;)h=f(O(v),9),h.g==(et(),Cn)&&(s=f(z(h,_r),32),s==(we(),Be)?h.i.a+=n.a-t.a:s==ct&&(h.i.b+=n.b-t.b));l=e.a,e.e.a=n.a-l.b-l.c,e.e.b=n.b-l.d-l.a}function Lx(e,t,n,i,s,l){var h,v,p;if(h=t.$b(n,e.b),h<0)return v=e.e,v?(e.e=Lx(v,t,n,i,s,l),l[0]==i&&(s==0&&l[0]!=0?--e.a:s>0&&l[0]==0&&++e.a,e.j=Pr(e.j,s-l[0])),bu(e)):(l[0]=0,i==0&&s>0?sC(e,n,s):e);if(h>0)return p=e.g,p?(e.g=Lx(p,t,n,i,s,l),l[0]==i&&(s==0&&l[0]!=0?--e.a:s>0&&l[0]==0&&++e.a,e.j=Pr(e.j,s-l[0])),bu(e)):(l[0]=0,i==0&&s>0?oC(e,n,s):e);if(l[0]=e.c,i==e.c){if(s==0)return ux(e);e.j=Pr(e.j,s-e.c),e.c=s}return e}function lk(e){var t,n,i,s,l,h,v,p,m,S,x,L,j,I,R,Y;for(p=e.e,j=e.f,h=e.d,I=e.c,S=I-1,R=e.g,x=ca(e.g.xb(1,e.g.Y()-1)),m=new Se,n=0;n<e.b.Y()-1;n++)v=Fo(uu(Ga(f(e.b.sb(n+1),92).a),f(e.b.sb(n),92).a),I/(ge(Ot(R.sb(n+I)))-ge(Ot(R.sb(n))))),m.c[m.c.length]=v;for(Y=new Se,l=Jt(x,0),L=new Se,t=0;t<S-1;t++)Le(Y,Ot(qt(l)));for(s=new M(m);s.a<s.c.c.length;)i=f(O(s),10),Le(Y,Ot(qt(l))),Le(L,new Qy(i,Y)),Sn(0,Y.c.length),Y.c.splice(0,1);return new MC(p,j,h,S,x,L)}function Nz(e){this.q=new _S,this.p=new _S,this.o=ve(Kn,Wn,26,(we(),re(ie(Mr,1),De,32,0,[fr,rt,Be,ct,qe])).length,12,1),this.i=ve(Kn,Wn,26,re(ie(Mr,1),De,32,0,[fr,rt,Be,ct,qe]).length,12,1),this.j=ve(Qi,mi,26,re(ie(Mr,1),De,32,0,[fr,rt,Be,ct,qe]).length,12,1),this.n=ve(Qi,mi,26,re(ie(Mr,1),De,32,0,[fr,rt,Be,ct,qe]).length,12,1),this.g=ve(UT,De,100,re(ie(Mr,1),De,32,0,[fr,rt,Be,ct,qe]).length,0,1),this.c=new DC(iG),this.e=e,hN(this.o),hN(this.i),fy(this.n,0)}function Px(e,t){var n,i,s,l,h,v,p,m,S;if(h=t.i!=null&&!t.b,h||It(t,"Component Layout",1),n=f(z(e,(le(),D6)),20),l=1/n.Y(),Pt(ge(Nt(z(e,(Ee(),pb))))))for(S=n.mb();S.G();)m=f(S.H(),31),vN(Od(m)),m.sc(e,Ql(t,l));else for(S=n.mb();S.G();)m=f(S.H(),31),m.sc(e,Ql(t,l));for(s=new M(e.c);s.a<s.c.c.length;)i=f(O(s),16),Tn(e.b,i.a),i.a.c=ve(Ze,Me,1,0,4,1);for(p=new M(e.b);p.a<p.c.c.length;)v=f(O(p),9),Ar(v,null);e.c.c=ve(Ze,Me,1,0,4,1),h||Ct(t)}function Qce(e,t){var n,i,s,l,h,v,p,m,S,x,L;for(h=new M(t);h.a<h.c.c.length;)s=f(O(h),102),s.e=null,s.c=0;for(v=null,l=new M(t);l.a<l.c.c.length;){for(s=f(O(l),102),S=s.d[0],L=f(z(S,(le(),Fh)),20).mb();L.G();)x=f(L.H(),9),(!s.e&&(s.e=new Se),s.e).ib(e.b[x.d.k][x.k]),++e.b[x.d.k][x.k].c;if(S.g==(et(),Hn)){if(v)for(m=R4(new Fm(e.c,v),0);m.c;)for(p=f(t2(m),9),i=R4(new Fm(e.c,S),0);i.c;)n=f(t2(i),9),Jte(e.b[p.d.k][p.k]).ib(e.b[n.d.k][n.k]),++e.b[n.d.k][n.k].c;v=S}}}function Jce(e,t,n,i){var s,l,h,v,p,m;if(JC(t),l=f(z(i,(le(),Vr)),18),v=(Ee(),yb).b,!(v in t.a&&Mn(t,v).ic().a))switch(p=new Yn,ce(p,lt,t),cn(p,n),h=f(Mn(t,"id"),97),N0(e.k,h.a,p),un(e.n,p,t),Q2(t,p),op(t,p),rx(e,t,p,i),Bt(p,f(z(p,Eb),32)),m=f(z(n,dt),28),m==(zn(),cc)&&(m=Ao),s=f(z(i,Oo),59),s==($n(),Mo)&&(s=Vi),dle(p,m,s,f(z(p,yu),10)),s.e){case 2:case 1:(p.g==(we(),rt)||p.g==ct)&&l.ib((br(),yf));break;case 4:case 3:(p.g==(we(),Be)||p.g==qe)&&l.ib((br(),yf))}}function ele(e,t){var n,i,s,l,h,v,p,m;for(e.f=t,s=t.c.c.length,e.a=ve(Er,Nr,51,s,0,2),e.d=ve(Er,Nr,51,s,0,2),e.g=ve(Er,Nr,51,s,0,2),h=new fn(t.c,0);h.b<h.d.Y();)for(i=(ut(h.b<h.d.Y()),f(h.d.sb(h.c=h.b++),16)),v=i.a.c.length,l=h.b-1,e.a[l]=ve(Er,Ii,9,v,0,1),e.d[l]=ve(Er,Ii,9,v,0,1),e.g[l]=ve(Er,Ii,9,v,0,1),m=new fn(i.a,0),n=0;m.b<m.d.Y();)p=(ut(m.b<m.d.Y()),f(m.d.sb(m.c=m.b++),9)),p.k=n++,e.d[l][m.b-1]=p,e.a[l][m.b-1]=p,e.g[l][m.b-1]=p;e.b=new dI(e.d),e.e.c&&(e.b.e=!0)}function tle(e){var t,n,i,s,l,h;for(s=new Se,h=new M(e.c.f);h.a<h.c.c.length;)l=f(O(h),7),l.g==(we(),Be)&&(s.c[s.c.length]=l);if(e.d.a==($n(),Vi)&&!gs(f(z(e.c,(Ee(),dt)),28)))for(i=Dt(En(e.c));xt(i);)n=f(Et(i),12),Le(s,n.c);ce(e.c,(le(),zb),new Ut(e.c.j.a)),ce(e.c,wc,(yn(),yn(),oi)),Le(e.b,e.c),t=null,e.e==1?t=wle(e,e.c,ea(e.c.d),e.c.j.a):e.e==0?t=mle(e,e.c,ea(e.c.d),e.c.j.a):e.e==3?t=aue(e,e.c,e.c.j.a):e.e==2&&(t=iue(e,e.c,e.c.j.a)),t&&new $C(e.c,e.b,ge(Ot(t.b)))}function Dx(e,t,n){var i,s,l,h,v,p,m,S;if(s=t.g,Pt(ge(Nt(z(t,(le(),wc)))))&&(s=(et(),Mi)),t.k>=0)return!1;if(n.e&&s==(et(),Mi)&&s!=n.e)return!1;if(t.k=n.b,Le(n.f,t),n.e=s,s==(et(),hn)||s==er||s==Mi){for(h=new M(t.f);h.a<h.c.c.length;)for(l=f(O(h),7),S=(i=new M(new $f(l).a.e),new DS(i));Bc(S.a);)if(m=f(O(S.a),12).d,v=m.f,p=v.g,t.d!=v.d){if(s==Mi){if(p==Mi&&Dx(e,v,n))return!0}else if((p==hn||p==er)&&Dx(e,v,n))return!0}}return!0}function Iz(e,t){var n,i,s,l,h,v,p,m,S;for(K3(e.a,re(ie(_t,1),Ht,10,0,[t.a,t.b])),na(e.c,t.e),e.q.d=e.q.d|t.d,e.q.a=e.q.a|t.c,v=Xt(e.j.e,t.k),p=je(e.j.e+e.j.b,t.n),SM(e.j,t.j,v,0,p-v),vn(e.d,t.f),t.f.c.f==t.f.d.f&&La(e.n,!0,!0,!0,!0),h=new Yr,m=new Yr,s=(S=new Wt(e.d.a).a.bb().mb(),new Zt(S));s.a.G();)i=(l=f(s.a.H(),21),f(l.yb(),12)),vn(h,i.c),vn(m,i.d);n=h.a.Y()-m.a.Y(),n<0?(zg(e.n,!0,($n(),Oa)),zg(e.n,!1,Vi)):n>0&&(zg(e.n,!1,($n(),Oa)),zg(e.n,!0,Vi))}function nle(e,t){var n,i,s,l,h,v,p,m,S,x;for(h=0;h<(mn(),t.length)&&PR(t.charCodeAt(h),fH);)++h;for(n=t.length;n>0&&PR(t.charCodeAt(n-1),hH);)--n;if(h<n){S=pp(t.substr(h,n-h),",|;");try{for(p=0,m=S.length;p<m;++p){if(v=S[p],l=pp(v,"="),l.length!=2)throw new nn("Expecting a list of key-value pairs.");s=Jc(l[0]),x=up(Jc(l[1])),Ho(s,"top")?e.d=x:Ho(s,"left")?e.b=x:Ho(s,nT)?e.a=x:Ho(s,"right")&&(e.c=x)}}catch(L){throw L=Kr(L),xe(L,130)?(i=L,new nn(dH+i)):Zr(L)}}}function rle(e,t){var n,i,s,l,h,v,p,m,S;for(S=new Ur,v=(m=new Kv(e.c).a.bb().mb(),new Zv(m));v.a.G();)l=(s=f(v.a.H(),21),f(s.zb(),200)),l.b==0&&mr(S,l,S.c.b,S.c);for(;S.b!=0;)for(l=f(S.b==0?null:(ut(S.b!=0),_s(S,S.a.a)),200),i=new M(l.d);i.a<i.c.c.length;)n=f(O(i),279),t.k==(fo(),Su)?n.b.a=Xt(n.b.a,l.a+n.a):n.b.a=je(n.b.a,l.a+n.a),--n.b.b,n.b.b==0&&an(S,n.b);for(h=(p=new Kv(e.c).a.bb().mb(),new Zv(p));h.a.G();)l=(s=f(h.a.H(),21),f(s.zb(),200)),t.g[l.c.k]=l.a}function ile(e,t,n){var i,s,l,h;switch(l=e.i,s=ln(re(ie(_t,1),Ht,10,0,[t.i,t.f.i])),i=ln(re(ie(_t,1),Ht,10,0,[t.f.i,t.i,t.a])),h=t.d,t.g.e){case 4:l.a=Xt(s.a,i.a)-h.b-e.j.a-n,l.b=ln(re(ie(_t,1),Ht,10,0,[t.f.i,t.i,t.a])).b+n;break;case 2:l.a=je(s.a+t.j.a,i.a)+h.c+n,l.b=ln(re(ie(_t,1),Ht,10,0,[t.f.i,t.i,t.a])).b+n;break;case 1:l.a=ln(re(ie(_t,1),Ht,10,0,[t.f.i,t.i,t.a])).a+n,l.b=Xt(s.b,i.b)-h.d-e.j.b-n;break;case 3:l.a=ln(re(ie(_t,1),Ht,10,0,[t.f.i,t.i,t.a])).a+n,l.b=je(s.b+t.j.b,i.b)+h.a+n}}function ale(e,t,n){var i,s,l,h;switch(l=e.i,s=ln(re(ie(_t,1),Ht,10,0,[t.i,t.f.i])),i=ln(re(ie(_t,1),Ht,10,0,[t.f.i,t.i,t.a])),h=t.d,t.g.e){case 4:l.a=Xt(s.a,i.a)-h.b-e.j.a-n,l.b=ln(re(ie(_t,1),Ht,10,0,[t.f.i,t.i,t.a])).b-e.j.b-n;break;case 2:l.a=je(s.a+t.j.a,i.a)+h.c+n,l.b=ln(re(ie(_t,1),Ht,10,0,[t.f.i,t.i,t.a])).b-e.j.b-n;break;case 1:l.a=ln(re(ie(_t,1),Ht,10,0,[t.f.i,t.i,t.a])).a+n,l.b=Xt(s.b,i.b)-h.d-e.j.b-n;break;case 3:l.a=ln(re(ie(_t,1),Ht,10,0,[t.f.i,t.i,t.a])).a+n,l.b=je(s.b+t.j.b,i.b)+h.a+n}}function ole(e){var t,n;switch(n=f(z(e,(le(),Vr)),18),t=g0(uG),Pt(ge(Nt(z(e,(zt(),Gb)))))?Vu(t,(jr(),xE)):pi(t,(jr(),xE)),z(e,(F3(),TT))!=null&&Lr(t,cG),f(z(e,(Ee(),Oo)),59).e){case 2:bi(Vu(t,(jr(),LL)),TL);break;case 3:bi(Vu(t,(jr(),gL)),vL);break;case 4:bi(Vu(t,(jr(),HL)),zL)}return n.kb((br(),UE))&&bi(Vu(t,(jr(),dL)),hL),He(z(e,fw))!==He((rl(),Zp))&&pi(t,(jr(),DL)),He(z(e,hw))!==He((Yd(),Ob))&&He(z(e,C6))===He((du(),ff))&&bi(t,(jr(),yL)),n.kb(l6)&&(Vu(t,(jr(),NL)),pi(t,jL)),t}function nb(){nb=c,h6=new Kl("ONE_SIDED",0,!0,!1,!1),XE=new Kl("TWO_SIDED",1,!1,!1,!1),d6=new Kl("ONE_SIDED_BEST_OF_UP_OR_DOWN",2,!0,!0,!1),b6=new Kl("TWO_SIDED_BEST_OF_UP_OR_DOWN",3,!1,!0,!1),v6=new Kl("ONE_SIDED_BEST_OF_UP_OR_DOWN_ORTHOGONAL_HYPEREDGES",4,!0,!0,!0),p6=new Kl("TWO_SIDED_BEST_OF_UP_OR_DOWN_ORTHOGONAL_HYPEREDGES",5,!1,!0,!0),g6=new Kl("ONE_SIDED_ORTHOGONAL_HYPEREDGES",6,!0,!1,!0),ZE=new Kl("OFF",7,!1,!1,!1)}function fk(e,t,n,i,s,l,h){var v,p,m,S,x,L,j;return x=Pt(ge(Nt(z(t,(zt(),A6))))),L=null,l==(cr(),Ri)&&i.c.f==n?L=i.c:l==ai&&i.d.f==n&&(L=i.d),m=h,!h||!x||L?(S=(we(),fr),L?S=L.g:gs(f(z(n,(Ee(),dt)),28))&&(S=l==Ri?qe:Be),p=fle(e,t,n,l,S,i),v=i2((Li(n),i)),l==Ri?(Bn(v,f(_e(p.f,0),7)),kn(v,s)):(Bn(v,s),kn(v,f(_e(p.f,0),7))),m=new QR(i,v,p,f(z(p,(le(),lt)),7),l,!L)):(Le(h.e,i),j=fN(f(z(h.d,(Ee(),es)),15).a,f(z(i,es),15).a),ce(h.d,es,new Ut(j))),pt(e.a,i,new h0(m.d,t,l)),m}function jx(e,t,n,i){var s,l,h,v,p,m,S,x;if(l=new Va(e),_a(l,(et(),er)),ce(l,(Ee(),dt),(zn(),ii)),s=0,t){for(h=new Yn,ce(h,(le(),lt),t),ce(l,lt,t.f),Bt(h,(we(),qe)),cn(h,l),x=f(Vn(t.b,ve(Xi,qi,12,t.b.c.length,0,1)),47),m=0,S=x.length;m<S;++m)p=x[m],kn(p,h);ce(t,Is,l),++s}if(n){for(v=new Yn,ce(l,(le(),lt),n.f),ce(v,lt,n),Bt(v,(we(),Be)),cn(v,l),x=f(Vn(n.e,ve(Xi,qi,12,n.e.c.length,0,1)),47),m=0,S=x.length;m<S;++m)p=x[m],Bn(p,v);ce(n,Is,l),++s}return ce(l,(le(),lv),gt(s)),i.c[i.c.length]=l,l}function sle(e,t){var n,i,s,l,h,v,p;for(h=Hy(e.a).mb();h.G();){if(l=f(h.H(),12),l.b.c.length>0)for(i=new Fu(f(Ia(e.a,l),18)),Fa(i,new PS(t)),s=new fn(l.b,0);s.b<s.d.Y();){switch(n=(ut(s.b<s.d.Y()),f(s.d.sb(s.c=s.b++),33)),v=-1,f(z(n,(Ee(),da)),107).e){case 2:v=i.c.length-1;break;case 1:v=i.c.length/2|0;break;case 3:v=0}v!=-1&&(p=(Sn(v,i.c.length),f(i.c[v],114)),Le(p.b.b,n),f(z(Li(p.b.c.f),(le(),Vr)),18).ib((br(),uv)),f(z(Li(p.b.c.f),Vr),18).ib(sv),Po(s),ce(n,P6,l))}Bn(l,null),kn(l,null)}}function ule(e){var t,n,i,s,l,h,v,p,m,S,x;for(S=e.e.a.c.length,h=new M(e.e.a);h.a<h.c.c.length;)l=f(O(h),61),l.j=!1;for(e.i=ve(Kn,Wn,26,S,12,1),e.g=ve(Kn,Wn,26,S,12,1),e.n=new Se,s=0,x=new Se,p=new M(e.e.a);p.a<p.c.c.length;)v=f(O(p),61),v.b=s++,v.c.c.length==0&&Le(e.n,v),Tn(x,v.g);for(t=0,i=new M(x);i.a<i.c.c.length;)n=f(O(i),89),n.b=t++,n.e=!1;m=x.c.length,e.b==null||e.b.length<m?(e.b=ve(Qi,mi,26,m,12,1),e.c=ve(Fb,lb,26,m,13,1)):ig(e.c),e.d=x,e.p=new KI(y2(e.d.c.length)),e.j=1}function cle(e,t){var n,i,s,l,h,v,p,m,S,x,L,j,I,R,Y,q,V,U,te;for(R=e.d,Y=t.d,j=f(Ss(e,(cr(),Ri)).mb().H(),7),U=f(Ss(e,ai).mb().H(),7),I=f(Ss(t,Ri).mb().H(),7),te=f(Ss(t,ai).mb().H(),7),x=f(Vn(j.b,ve(Xi,qi,12,1,0,1)),47),q=f(Vn(U.e,ve(Xi,qi,12,1,0,1)),47),L=f(Vn(I.b,ve(Xi,qi,12,1,0,1)),47),V=f(Vn(te.e,ve(Xi,qi,12,1,0,1)),47),Ar(e,Y),s=0,p=L.length;s<p;++s)n=L[s],kn(n,j);for(l=0,m=V.length;l<m;++l)n=V[l],Bn(n,U);for(Ar(t,R),h=0,S=x.length;h<S;++h)n=x[h],kn(n,I);for(i=0,v=q.length;i<v;++i)n=q[i],Bn(n,te)}function lle(e){var t,n,i,s,l,h,v,p;for(l=new M(e.a.b);l.a<l.c.c.length;)s=f(O(l),25),s.vc();for(p=new ot(ki,ki),t=new ot(Hr,Hr),i=new M(e.a.b);i.a<i.c.c.length;)n=f(O(i),25),p.a=Xt(p.a,n.j.d),p.b=Xt(p.b,n.j.e),t.a=je(t.a,n.j.d+n.j.c),t.b=je(t.b,n.j.e+n.j.b);for(v=m3(e.c).mb();v.G();)h=f(v.H(),27),n=f(h.b,25),p.a=Xt(p.a,n.j.d),p.b=Xt(p.b,n.j.e),t.a=je(t.a,n.j.d+n.j.c),t.b=je(t.b,n.j.e+n.j.b);e.d=yy(new ot(p.a,p.b)),e.e=uu(new ot(t.a,t.b),p),e.a.a.c=ve(Ze,Me,1,0,4,1),e.a.b.c=ve(Ze,Me,1,0,4,1)}function Mz(e){var t,n,i,s,l,h,v;if(v=f(_e(e.f,0),7),v.e.c.length!=0&&v.b.c.length!=0)throw new zu("Interactive layout does not support NORTH/SOUTH ports with incoming _and_ outgoing edges.");if(v.e.c.length!=0){for(l=ki,n=new M(v.e);n.a<n.c.c.length;)t=f(O(n),12),h=t.d.f,i=f(z(h,(Ee(),mb)),65),l=Xt(l,h.i.a-i.b);return new j1(vt(l))}if(v.b.c.length!=0){for(s=Hr,n=new M(v.b);n.a<n.c.c.length;)t=f(O(n),12),h=t.c.f,i=f(z(h,(Ee(),mb)),65),s=je(s,h.i.a+h.j.a+i.c);return new j1(vt(s))}return tg(),tg(),Ak}function fle(e,t,n,i,s,l){var h,v,p,m,S,x,L;return m=i==(cr(),Ri)?l.c:l.d,p=N2(t),m.f==n?(h=f(Kt(e.b,m),9),h||(h=wp(m,f(z(n,(Ee(),dt)),28),s,i==Ri?-1:1,m.j,p,t),ce(h,(le(),lt),m),un(e.b,m,h))):(S=f(z(l,(Ee(),es)),15).a,h=wp((x=new H,L=f(z(t,(le(),Ai)),15).a*f(z(t,(zt(),eu)),15).a/2,ce(x,fv,new Ut(L)),x),f(z(n,dt),28),s,i==Ri?-1:1,new ot(S,S),p,t),v=Nse(e,h,n,i),ce(h,lt,v),un(e.b,v,h)),f(z(t,(le(),Vr)),18).ib((br(),os)),gs(f(z(t,(Ee(),dt)),28))?ce(t,dt,(zn(),Cb)):ce(t,dt,(zn(),Ao)),h}function hle(e,t){var n,i,s,l,h,v,p,m,S,x,L,j,I,R,Y,q,V,U,te,ue,ye,Ce;i=f(z(t,(zt(),M6)),15).a,ue=f(z(t,gv),24).a,L=4,s=3,ye=20/ue,j=!1,p=0,h=kr;do{for(l=p!=1,x=p!=0,Ce=0,Y=e.a,V=0,te=Y.length;V<te;++V)I=Y[V],I.g=null,Qle(e,I,l,x,i),Ce+=ni(I.a);do v=Tce(e,t);while(v);for(R=e.a,q=0,U=R.length;q<U;++q)if(I=R[q],n=d3(I).a,n!=0)for(S=new M(I.f);S.a<S.c.c.length;)m=f(O(S),9),m.i.b+=n;p==0||p==1?(--L,L<=0&&(Ce<h||-L>ue)?(p=2,h=kr):p==0?(p=1,h=Ce):(p=0,h=Ce)):(j=Ce>=h||h-Ce<ye,h=Ce,j&&--s)}while(!(j&&s<=0))}function Nx(e,t,n){var i,s,l,h,v,p,m,S,x,L,j;for(x=f(Vn(e.f,ve(kG,IH,7,e.f.c.length,0,1)),346),m=0,S=x.length;m<S;++m){if(p=x[m],n!=(cr(),Ri))for(v=f(Vn(p.e,ve(Xi,qi,12,p.e.c.length,0,1)),47),s=0,l=v.length;s<l;++s)i=v[s],j=f(z(i.d.f,(zt(),Sr)),85),!Pt(ge(Nt(z(i,(le(),Js)))))&&!(t==(Fi(),dv)&&j==Pu)&&wu(i,!0);if(n!=ai)for(h=f(Vn(p.b,ve(Xi,qi,12,p.b.c.length,0,1)),47),s=0,l=h.length;s<l;++s)i=h[s],L=f(z(i.c.f,(zt(),Sr)),85),!Pt(ge(Nt(z(i,(le(),Js)))))&&!(t==(Fi(),_b)&&L==mc)&&wu(i,!0)}}function dle(e,t,n,i){var s,l,h,v,p;if(h=e.g,h==(we(),fr)&&t!=(zn(),Ao)&&t!=(zn(),cc)&&(h=wz(e,n),Bt(e,h),z(e,(Ee(),vl))==null&&h!=fr&&(e.i.a!=0||e.i.b!=0)&&ce(e,vl,new Ut(Uoe(e,h)))),t==(zn(),ts)){switch(p=0,h.e){case 1:case 3:l=e.f.j.a,l>0&&(p=e.i.a/l);break;case 2:case 4:s=e.f.j.b,s>0&&(p=e.i.b/s)}ce(e,(le(),Lu),p)}if(v=e.j,i)e.a.a=i.a,e.a.b=i.b;else if(t!=Ao&&t!=cc&&h!=fr)switch(h.e){case 1:e.a.a=v.a/2;break;case 2:e.a.a=v.a,e.a.b=v.b/2;break;case 3:e.a.a=v.a/2,e.a.b=v.b;break;case 4:e.a.b=v.b/2}else e.a.a=v.a/2,e.a.b=v.b/2}function vle(e){var t,n,i,s;if(xe(e.a,10))return Ga(f(e.a,10));if(xe(e.a,66))return xie(f(e.a,86));if(xe(e.a,50))return f(e.a,50).Wc();if(xe(e.a,191)){for(t=new n4,s=(i=new kg(new mg(new I1(f(e.a,191).a).a).b),new M1(i));ey(s.a.a);)b3(t,(n=Cy(s.a),n.yb()));return t}else{if(xe(e.a,13))return new Fu(f(e.a,13));if(xe(e.a,44)){for(t=new xi,s=Jt(f(e.a,44),0);s.b!=s.d.c;)an(t,f(qt(s),10));return t}else if(xe(e.a,58)){for(t=new Ur,s=Jt(f(e.a,58),0);s.b!=s.d.c;)an(t,qt(s));return t}else return e.a}}function xh(e,t){var n,i,s,l,h,v,p,m,S,x,L,j,I;v=0,I=0,p=vC(e.f,e.f.length),l=e.d,h=e.i,i=e.a,s=e.b;do{for(j=0,S=new M(e.p);S.a<S.c.c.length;)m=f(O(S),9),L=Hz(e,m),n=!0,(e.q==(rl(),Ib)||e.q==Mb)&&(n=Pt(ge(Nt(L.b)))),f(L.a,24).a<0&&n?(++j,p=vC(e.f,e.f.length),e.d=e.d+f(L.a,24).a,I+=l-e.d,l=e.d+f(L.a,24).a,h=e.i,i=Wc(e.a),s=Wc(e.b)):(e.f=vC(p,p.length),e.d=l,e.a=(vt(i),i?new Fu((Yo(),i)):v0(new M(null))),e.b=(vt(s),s?new Fu((Yo(),s)):v0(new M(null))),e.i=h);++v,x=j!=0&&Pt(ge(Nt(t.B(new wr(gt(I),gt(v))))))}while(x)}function gle(e,t,n,i){var s,l,h,v,p,m,S;if(!Bc(new M(Yg(e))))return i;for(S=zR(f(nr(e,(Ee(),ia)),86)),p=new M(Yg(e));p.a<p.c.c.length;)v=f(O(p),129),m=zR(f(nr(v,ia),86)),m==(dk(),sE)&&(m=S),bee(v,m.e),s=Qae(n,m),s.c=je(s.c,v.e.j.a),s.b+=v.e.j.b+t;for(h=new E0(new O1(n).a);i0(h.a);)switch(l=(h.b=Kc(h.a),new X1(h.c,h.b)),s=f(l.b.b[l.a.e],62),s.b-=t,f(l.a,67).e){case 12:case 13:case 14:i.d=je(i.d,s.b+t);break;case 15:i.b=je(i.b,s.c+t);break;case 17:i.c=je(i.c,s.c+t);break;case 18:case 19:case 20:i.a=je(i.a,s.b+t)}return i}function Ix(e,t,n){var i,s,l,h,v,p,m,S,x,L,j,I,R;for(kA(this),n==(Vc(),Xs)?vn(this.g,e):vn(this.o,e),j=Xo,L=5e-324,m=(h=new Wt(t.a).a.bb().mb(),new Zt(h));m.a.G();)v=(s=f(m.a.H(),21),f(s.yb(),27)),S=f(v.a,223),i=f(v.b,12),x=i.c,x==e&&(x=i.d),S==Xs?vn(this.g,x):vn(this.o,x),R=ln(re(ie(_t,1),Ht,10,0,[x.f.i,x.i,x.a])).b,j=j<R?j:R,L=L>R?L:R;for(I=ln(re(ie(_t,1),Ht,10,0,[e.f.i,e.i,e.a])).b,C8(this,I,j,L),p=(l=new Wt(t.a).a.bb().mb(),new Zt(l));p.a.G();)v=(s=f(p.a.H(),21),f(s.yb(),27)),vn(this.c,f(v.b,12));this.f=!1}function ble(e,t,n,i){var s,l,h,v,p,m;if(v=(Ee(),yb).b,!(v in t.a&&Mn(t,v).ic().a)){if(m=Mn(t,mk),m){if(!m.lc())throw new ps("A label's 'text' property must be a string.",m,t)}else throw new ps("Labels must have a property 'text'.",null,t);if(p=m.lc().a,l=new P4(p),ce(l,(le(),lt),t),un(e.f,l,t),Q2(t,l),op(t,l),xe(n,9)?Le(f(n,9).c,l):xe(n,12)?Le(f(n,12).b,l):xe(n,7)&&Le(f(n,7).c,l),xe(n,12))switch(h=f(z(l,da),107),Q2(t,l),ce(l,da,h),s=f(z(i,Vr),18),h.e){case 2:case 3:s.ib((br(),uv));case 1:case 0:s.ib((br(),sv)),ce(l,da,(Es(),gb))}}}function Mx(e,t){var n,i,s,l,h,v,p,m,S,x,L,j,I,R,Y,q;for(l=0,h=0,m=new M(e.a);m.a<m.c.c.length;)v=f(O(m),9),l=je(l,v.e.b),h=je(h,v.e.c);for(p=new M(e.a);p.a<p.c.c.length;){switch(v=f(O(p),9),n=f(z(v,(Ee(),go)),103),n.e){case 1:I=0;break;case 2:I=1;break;case 5:I=.5;break;default:for(i=0,x=0,j=new M(v.f);j.a<j.c.c.length;)L=f(O(j),7),L.b.c.length==0||++i,L.e.c.length==0||++x;i+x==0?I=.5:I=x/(i+x)}Y=e.c,S=v.j.a,q=(Y.a-S)*I,I>.5?q-=h*2*(I-.5):I<.5&&(q+=l*2*(.5-I)),s=v.e.b,q<s&&(q=s),R=v.e.c,q>Y.a-R-S&&(q=Y.a-R-S),v.i.a=t+q}}function ple(e,t){var n,i,s,l,h,v,p,m,S,x,L,j,I,R,Y,q,V,U,te,ue,ye,Ce,be,Ne,Ue,Xe,it;return n=e.l&8191,i=e.l>>13|(e.m&15)<<9,s=e.m>>4&8191,l=e.m>>17|(e.h&255)<<5,h=(e.h&1048320)>>8,v=t.l&8191,p=t.l>>13|(t.m&15)<<9,m=t.m>>4&8191,S=t.m>>17|(t.h&255)<<5,x=(t.h&1048320)>>8,be=n*v,Ne=i*v,Ue=s*v,Xe=l*v,it=h*v,p!=0&&(Ne+=n*p,Ue+=i*p,Xe+=s*p,it+=l*p),m!=0&&(Ue+=n*m,Xe+=i*m,it+=s*m),S!=0&&(Xe+=n*S,it+=i*S),x!=0&&(it+=n*x),j=be&Wa,I=(Ne&511)<<13,L=j+I,Y=be>>22,q=Ne>>9,V=(Ue&262143)<<4,U=(Xe&31)<<17,R=Y+q+V+U,ue=Ue>>18,ye=Xe>>5,Ce=(it&4095)<<8,te=ue+ye+Ce,R+=L>>22,L&=Wa,te+=R>>22,R&=Wa,te&=ic,qu(L,R,te)}function wle(e,t,n,i){var s,l,h,v,p,m,S,x,L,j,I,R,Y,q,V,U,te,ue,ye;if(Y=e.d.c.c.c.length,n>=Y-1)return null;for(s=new Se,s.c[s.c.length]=t,te=t,h=n,I=-1,v=f(_e(e.d.c.c,n),16),j=0;j<v.a.c.length;++j)if(q=f(_e(v.a,j),9),q==t){I=j;break}if(R=Bx(e,1,I,n,Y,e.a),!R)return null;for(ue=e.a,L=0,l=0;te&&ue>1&&h<Y-1;)S=kz(e,te),x=f(_e(e.d.c.c,h+1),16),ye=f(R.sb(L++),24).a,V=Hu(ye,x.a.c.length),kh(S,V,x),te&&(s.c[s.c.length]=te),te=S,--ue,++l,++h;for(U=(i-(s.c.length-1)*e.d.d)/s.c.length,m=new M(s);m.a<m.c.c.length;)p=f(O(m),9),p.j.a=U;return new wr(gt(l),U)}function mle(e,t,n,i){var s,l,h,v,p,m,S,x,L,j,I,R,Y,q,V,U,te,ue,ye;if(n<=0)return null;for(s=new Se,s.c[s.c.length]=t,te=t,h=n,I=-1,v=f(_e(e.d.c.c,n),16),j=0;j<v.a.c.length;++j)if(Y=f(_e(v.a,j),9),Y==t){I=j;break}if(R=Bx(e,0,I,n,e.d.c.c.c.length,e.a),!R)return null;for(ue=e.a,L=0,l=0,U=I;te&&ue>1&&h>1;)S=kz(e,te),v=f(_e(e.d.c.c,h),16),x=f(_e(e.d.c.c,h-1),16),ye=f(R.sb(L++),24).a,q=Hu(ye,x.a.c.length),kh(te,q,x),kh(S,U,v),U=q,te&&(s.c[s.c.length]=te),te=S,--ue,++l,--h;for(V=(i-(s.c.length-1)*e.d.d)/s.c.length,m=new M(s);m.a<m.c.c.length;)p=f(O(m),9),p.j.a=V;return new wr(gt(l),V)}function yle(e,t){var n,i,s,l,h,v,p,m,S,x,L,j,I;if(e.b=e.c,I=Nt(z(t,(Ee(),YT))),j=I==null||Pt((ur(I),I)),l=f(z(t,(le(),Vr)),18).kb((br(),os)),s=f(z(t,dt),28),n=!(s==(zn(),Ah)||s==ts||s==ii),j&&(n||!l)){for(x=new M(t.b);x.a<x.c.c.length;)m=f(O(x),9),m.k=0;for(L=new Se,S=new M(t.b);S.a<S.c.c.length;)if(m=f(O(S),9),i=Cz(e,m,null),i){for(p=new nC,vu(p,t),ce(p,Ef,f(i.b,18)),GM(p.a,t.a),v=f(i.a,20).mb();v.G();)h=f(v.H(),9),Le(p.b,h),h.a=p;L.ib(p)}l&&(e.b=e.a)}else L=new uo(re(ie(Xfe,1),{38:1,39:1,42:1,3:1,8:1,5:1,6:1},55,0,[t]));return L}function kle(e){var t,n,i,s,l,h,v,p,m;for(n=new M(e.a.a.b);n.a<n.c.c.length;)for(t=f(O(n),25),h=t.i.mb();h.G();)l=f(h.H(),25),t.f!=l.f&&(Bl(e.a.d)?p=e.a.g.tc(t,l):p=e.a.g.uc(t,l),i=t.g.a+t.j.c+p-l.g.a,i=Math.ceil(i),i=0>i?0:i,t.o&&l.o&&xe(t,82)&&xe(l,82)&&!g2(iC(f(t,82).d,f(l,82).d))?(s=pg(new hd,e.d),v=Xn(K1(l.g.a-t.g.a)),Sh(Kf(Xf(Qf(Zf(new Ol,0>v?0:v),1),s),e.c[t.f.d])),Sh(Kf(Xf(Qf(Zf(new Ol,0>-v?0:-v),1),s),e.c[l.f.d]))):(m=1,(xe(t,82)&&xe(l,93)||xe(l,82)&&xe(t,93))&&(m=2),Sh(Kf(Xf(Qf(Zf(new Ol,Xn(i)),m),e.c[t.f.d]),e.c[l.f.d]))))}function Oz(){Oz=c,rL=new Yr,nL=Ch(re(ie(lf,1),Me,79,0,[(Ee(),AT),C_])),tL=Ch(re(ie(lf,1),Me,79,0,[_T,ku,(zt(),B6),x_,(le(),Qa),gv,R6])),XT=Ch(re(ie(lf,1),Me,79,0,[k_,tv,yb,S_,T_,HT,L_,Qk,YT,wb,s5,I6,h5,O6,Gb,A6,z6,p5,c5])),eL=Ch(re(ie(lf,1),Me,79,0,[rv,nv,Mh,es,vl,r5,ss,Yh,Ai,vv,eu,M6])),JT=Ch(re(ie(lf,1),Me,79,0,[Eb,go,Oo,hf,da,BT,zT,Wk,Uk,Kk,Zk,Xk,dt,kb,u5,f5,g5,Vh,cw,b5,fw,lw,d5,Sr,hw,w5,m5,bv,v5])),QT=Ch(re(ie(lf,1),Me,79,0,[ia,uc,Sb,l5])),_p=Ch(re(ie(lf,1),Me,79,0,[bb,Vk,Un,mb,yu,Oh])),oG=Ch(re(ie(lf,1),Me,79,0,[(bC(),KT)]))}function Az(e){var t,n,i,s,l,h,v;for(t=0,l=new M(e.b.a);l.a<l.c.c.length;)i=f(O(l),78),i.b=0,i.c=0;for(MB(e,0),A2(e,e.g),bp(e.c),US(e.c),n=($n(),Oa),$s(ag(xs($s(ag(xs($s(xs(e.c,n)),WR(n)))),n))),xs(e.c,Oa),j2(e,e.g),NB(e,0),Dz(e,0),tz(e,1),MB(e,1),A2(e,e.d),bp(e.c),h=new M(e.b.a);h.a<h.c.c.length;)i=f(O(h),78),t+=ni(i.c);for(v=new M(e.b.a);v.a<v.c.c.length;)i=f(O(v),78),i.b=0,i.c=0;for(n=Ks,$s(ag(xs($s(ag(xs($s(US(xs(e.c,n))),WR(n)))),n))),xs(e.c,Oa),j2(e,e.d),NB(e,1),Dz(e,1),tz(e,0),US(e.c),s=new M(e.b.a);s.a<s.c.c.length;)i=f(O(s),78),t+=ni(i.c);return t}function Ele(e){var t,n,i,s,l,h,v;for(t=new Se,e.g=new Se,e.d=new Se,h=new ef(new ou(e.f.b).a);h.b;)l=Rd(h),Le(t,f(f(l.zb(),27).b,25)),Bl(f(l.yb(),251).yc())?Le(e.d,f(l.zb(),27)):Le(e.g,f(l.zb(),27));for(A2(e,e.d),A2(e,e.g),e.c=new ix(e.b),eN(e.c,(WS(),lG)),j2(e,e.d),j2(e,e.g),Tn(t,e.c.a.b),e.e=new ot(ki,ki),e.a=new ot(Hr,Hr),i=new M(t);i.a<i.c.c.length;)n=f(O(i),25),e.e.a=Xt(e.e.a,n.j.d),e.e.b=Xt(e.e.b,n.j.e),e.a.a=je(e.a.a,n.j.d+n.j.c),e.a.b=je(e.a.b,n.j.e+n.j.b);Rm(e.c,new oe),v=0;do s=Az(e),++v;while((v<2||s>ob)&&v<10);Rm(e.c,new J),Az(e),hne(e.c),lle(e.f)}function Sle(e){Id();var t,n,i,s,l,h,v;for(v=new wj,n=new M(e);n.a<n.c.c.length;)t=f(O(n),48),(!v.b||t.c>=v.b.c)&&(v.b=t),(!v.c||t.c<=v.c.c)&&(v.d=v.c,v.c=t),(!v.e||t.d>=v.e.d)&&(v.e=t),(!v.f||t.d<=v.f.d)&&(v.f=t);return i=new tp((Ag(),hc)),Dg(e,wG,new uo(re(ie(jb,1),Me,160,0,[i]))),h=new tp(ml),Dg(e,pG,new uo(re(ie(jb,1),Me,160,0,[h]))),s=new tp(wl),Dg(e,bG,new uo(re(ie(jb,1),Me,160,0,[s]))),l=new tp(bf),Dg(e,gG,new uo(re(ie(jb,1),Me,160,0,[l]))),ak(i.c,hc),ak(s.c,wl),ak(l.c,bf),ak(h.c,ml),v.a.c=ve(Ze,Me,1,0,4,1),Tn(v.a,i.c),Tn(v.a,w2(s.c)),Tn(v.a,l.c),Tn(v.a,w2(h.c)),v}function Cle(e){var t,n,i,s,l,h,v,p,m,S;for(s=f(bN(e,(Ee(),Mh)),15).a,v=new M(aB(e));v.a<v.c.c.length;){for(h=f(O(v),626),n=new Nz(h),n.d=s,n.k=f(nr(h,GT),15).a,i=f(nr(h,kb),149),t=Pt(ge(Nt(z(f(h.e,9),(le(),k6))))),S=new M(tc(h));S.a<S.c.c.length;)m=f(O(S),161),i==(bh(),eE)?xle(m,t,s):i==xb&&tfe(m,s),Cce(m);ffe(n,f(nr(h,uc),86).kb((gu(),Lb))),Nce(n),gle(n.e,n.d,n.c,n.p),Wle(n),wse(n),nre(n),p=new fM((l=f(h.e,9).b,new sM(l.d,l.b,l.a,l.c))),p.b=n.p.b+n.q.b,p.c=n.p.c+n.q.c,p.d=n.p.d+n.q.d,p.a=n.p.a+n.q.a,f(h.e,9).b.b=p.b,f(h.e,9).b.d=p.d,f(h.e,9).b.c=p.c,f(h.e,9).b.a=p.a}}function Rz(e,t){var n,i,s,l,h,v,p,m,S,x,L,j,I,R,Y,q,V,U;for(p=f(Jn(e,(we(),qe)).mb().H(),7).b,j=f(Jn(e,Be).mb().H(),7).e,v=p.c.length,U=Di(f(_e(e.f,0),7));v-- >0;){for(R=(Sn(0,p.c.length),f(p.c[0],12)),s=(Sn(0,j.c.length),f(j.c[0],12)),V=s.d.b,l=ji(V,s,0),Ore(R,s.d,l),Bn(s,null),kn(s,null),I=R.a,t&&an(I,new qn(U)),i=Jt(s.a,0);i.b!=i.d.c;)n=f(qt(i),10),an(I,new qn(n));for(q=R.b,L=new M(s.b);L.a<L.c.c.length;)x=f(O(L),33),q.c[q.c.length]=x;if(Y=f(z(R,(Ee(),Un)),44),h=f(z(s,Un),44),h)for(Y||(Y=new xi,ce(R,Un,Y)),S=Jt(h,0);S.b!=S.d.c;)m=f(qt(S),10),an(Y,new qn(m))}}function xle(e,t,n){var i,s,l,h,v;if(l=MO(Fg(e)),!l.Nb().V()){switch(v=0,f(e.e,7).g.e){case 4:case 2:v=t&&Pt(ge(Nt(z(f(e.e,7),(le(),J$)))))?e.e.j.b:(e.e.j.b-f(l.Nb().sb(0),129).pc().b)/2-n;break;case 1:v=e.e.j.b;break;case 3:v=0}for(f(e.e,7).g==(we(),ct)&&Nd(l),s=new M(Fg(e));s.a<s.c.c.length;){switch(i=f(O(s),129),h=new qn(e.e.i),f(e.e,7).g.e){case 4:h.a=e.e.j.a+n,h.b=v+n,v+=n+i.e.j.b;break;case 2:h.a=-i.e.j.a-n,h.b=v+n,v+=n+i.e.j.b;break;case 1:h.a=(e.e.j.a-i.e.j.a)/2,h.b=v+n,v+=n+i.e.j.b;break;case 3:h.a=(e.e.j.a-i.e.j.a)/2,h.b=v-n-i.e.j.b,v-=n+i.e.j.b}i.e.i.a=h.a,i.e.i.b=h.b}}}function Tle(e,t){var n,i,s,l,h,v,p,m,S,x;for(e.a=new g3(cae(vb)),i=new M(t.a);i.a<i.c.c.length;){for(n=f(O(i),347),v=new ep(re(ie(Gp,1),Me,25,0,[])),Le(e.a.a,v),m=new M(n.d);m.a<m.c.c.length;)p=f(O(m),62),S=new I4(e,p),Ox(S,f(z(n.c,(le(),Ef)),18)),dh(e.g,n)||(un(e.g,n,new ot(p.d,p.e)),un(e.f,n,S)),Le(e.a.b,S),V0(v,S);for(h=new M(n.b);h.a<h.c.c.length;)l=f(O(h),251),S=new I4(e,l.Bc()),un(e.b,l,new wr(v,S)),Ox(S,f(z(n.c,(le(),Ef)),18)),l.zc()&&(x=new aC(e,l.zc(),1),Ox(x,f(z(n.c,Ef),18)),s=new ep(re(ie(Gp,1),Me,25,0,[])),V0(s,x),pt(e.c,l.yc(),new wr(v,x)))}return e.a}function Lle(e,t){var n,i,s,l,h,v,p,m,S,x,L,j,I,R,Y,q,V,U;if(R=t.c.c.length,!(R<3)){for(j=ve(Kn,Wn,26,R,12,1),x=0,S=new M(t.c);S.a<S.c.c.length;)m=f(O(S),16),j[x++]=m.a.c.length;for(L=new fn(t.c,2),i=1;i<R-1;i++)for(n=(ut(L.b<L.d.Y()),f(L.d.sb(L.c=L.b++),16)),I=new M(n.a),l=0,v=0,p=0;p<j[i+1];p++)if(U=f(O(I),9),p==j[i+1]-1||px(e,U,i+1,i)){for(h=j[i]-1,px(e,U,i+1,i)&&(h=e.d.e[f(f(f(_e(e.d.b,U.k),20).sb(0),27).a,9).k]);v<=p;){if(V=f(_e(n.a,v),9),!px(e,V,i+1,i))for(q=f(_e(e.d.b,V.k),20).mb();q.G();)Y=f(q.H(),27),s=e.d.e[f(Y.a,9).k],(s<l||s>h)&&vn(e.c,f(Y.b,12));++v}l=h}}}function Bz(e,t,n){var i,s,l,h,v,p;for(this.g=e,v=t.d.length,p=n.d.length,this.d=ve(Er,Ii,9,v+p,0,1),h=0;h<v;h++)this.d[h]=t.d[h];for(l=0;l<p;l++)this.d[v+l]=n.d[l];if(t.e){if(this.e=ca(t.e),this.e.nb(n),n.e)for(s=n.e.mb();s.G();)i=f(s.H(),102),i!=t&&(this.e.kb(i)?--i.c:this.e.ib(i))}else n.e&&(this.e=ca(n.e),this.e.nb(t));this.f=t.f+n.f,this.a=t.a+n.a,this.a>0?v2(this,this.f/this.a):xa(t.g,t.d[0]).a!=null&&xa(n.g,n.d[0]).a!=null?v2(this,(ge(xa(t.g,t.d[0]).a)+ge(xa(n.g,n.d[0]).a))/2):xa(t.g,t.d[0]).a!=null?v2(this,xa(t.g,t.d[0]).a):xa(n.g,n.d[0]).a!=null&&v2(this,xa(n.g,n.d[0]).a)}function Ple(e,t){var n,i,s,l,h,v,p,m,S,x,L;switch(e.g.e){case 1:if(i=f(z(e,(le(),lt)),12),n=f(z(i,T6),44),n?Pt(ge(Nt(z(i,Js))))&&(n=S2(n)):n=new xi,m=f(z(e,Oi),7),S=ln(re(ie(_t,1),Ht,10,0,[m.f.i,m.i,m.a])),t<=S.a)return S.b;if(mr(n,S,n.a,n.a.a),x=f(z(e,Si),7),L=ln(re(ie(_t,1),Ht,10,0,[x.f.i,x.i,x.a])),L.a<=t)return L.b;for(mr(n,L,n.c.b,n.c),p=Jt(n,0),h=f(qt(p),10),v=f(qt(p),10);v.a<t&&p.b!=p.d.c;)h=v,v=f(qt(p),10);return h.b+(t-h.a)/(v.a-h.a)*(v.b-h.b);case 3:switch(l=f(z(f(_e(e.f,0),7),(le(),lt)),7),s=l.f,l.g.e){case 1:return s.i.b;case 3:return s.i.b+s.j.b}}return YC(e).b}function zz(e){var t,n,i,s,l,h,v,p,m,S,x,L;if(S=He(z(e.c.f,(le(),Sl)))===He(z(e.d.f,Sl)),h=new Fr,n=f(z(e,(Ee(),Vk)),44),n&&n.b>=2)for(Hs(e.a),i=0,L=Jt(n,0);L.b!=L.d.c;)x=f(qt(L),10),i==0?(t=uu(uu(new ot(x.a,x.b),e.c.i),e.c.f.i),e.c.a.a=t.a,e.c.a.b=t.b):i==n.b-1?(t=uu(uu(new ot(x.a,x.b),e.d.i),e.d.f.i),e.d.a.a=t.a,e.d.a.b=t.b):an(e.a,x),++i;if(S)for(p=Jt(e.a,0);p.b!=p.d.c;)v=f(qt(p),10),h.a=je(h.a,v.a),h.b=je(h.b,v.b);for(l=new M(e.b);l.a<l.c.c.length;)s=f(O(l),33),m=f(z(s,Oh),10),m&&(s.i.a=m.a,s.i.b=m.b),S&&(h.a=je(h.a,s.i.a+s.j.a),h.b=je(h.b,s.i.b+s.j.b));return h}function Dle(e,t,n){var i,s,l,h,v,p,m;if(JC(t),i=f(z(n,(le(),Vr)),18),h=new Va(n),ce(h,lt,t),Le(n.b,h),l=f(Mn(t,"id"),97),N0(e.i,l.a,h),un(e.j,h,t),Q2(t,h),op(t,h),"ports"in t.a){if(m=Mn(t,"ports"),!m.hc())throw new ps("The 'ports' property of the node must be an array.",m,t);for(p=m.hc(),s=0;s<p.a.length;++s)xe(Uu(p,s),69)&&Jce(e,f(Uu(p,s),69),h,n)}return rx(e,t,h,n),Xd in t.a&&Mn(t,Xd).hc().a.length>0&&ce(h,k6,(yn(),yn(),oi)),v=f(z(h,(Ee(),dt)),28),v==(zn(),cc)||v!=Ao&&i.ib((br(),mf)),Pt(ge(Nt(z(h,tv))))&&i.ib((br(),UE)),Pt(ge(Nt(z(h,wb))))&&(i.ib((br(),KE)),i.ib(rw),ce(h,dt,Ao)),h}function Ox(e,t){t.V()&&La(e.n,!0,!0,!0,!0),t.t((we(),Bh))&&La(e.n,!0,!0,!0,!1),t.t(Rh)&&La(e.n,!1,!0,!0,!0),t.t(zh)&&La(e.n,!0,!0,!1,!0),t.t(Hh)&&La(e.n,!0,!1,!0,!0),t.t(bl)&&La(e.n,!1,!0,!0,!1),t.t(gl)&&La(e.n,!1,!0,!1,!0),t.t(pl)&&La(e.n,!0,!1,!1,!0),t.t(vf)&&La(e.n,!0,!1,!0,!1),t.t(ns)&&La(e.n,!0,!0,!0,!0),t.t(Eu)&&La(e.n,!0,!0,!0,!0),t.t(ns)&&La(e.n,!0,!0,!0,!0),t.t(pa)&&La(e.n,!0,!0,!0,!0),t.t(Ba)&&La(e.n,!0,!0,!0,!0),t.t(Ra)&&La(e.n,!0,!0,!0,!0),t.t(qr)&&La(e.n,!0,!0,!0,!0)}function Hz(e,t){var n,i,s,l,h,v,p,m,S,x;for(p=!0,s=0,m=e.f[t.k],S=t.j.b+e.n,n=e.c[t.k][2],Uc(e.a,m,gt(f(_e(e.a,m),24).a-1+n)),Uc(e.b,m,ge(Ot(_e(e.b,m)))-S+n*e.e),++m,m>=e.i?(++e.i,Le(e.a,gt(1)),Le(e.b,S)):(i=e.c[t.k][1],Uc(e.a,m,gt(f(_e(e.a,m),24).a+1-i)),Uc(e.b,m,ge(Ot(_e(e.b,m)))+S-i*e.e)),(e.q==(rl(),Ib)&&(f(_e(e.a,m),24).a>e.j||f(_e(e.a,m-1),24).a>e.j)||e.q==Mb&&(ge(Ot(_e(e.b,m)))>e.k||ge(Ot(_e(e.b,m-1)))>e.k))&&(p=!1),h=Dt(Dr(t));xt(h);)l=f(Et(h),12),v=l.c.f,e.f[v.k]==m&&(x=Hz(e,v),s=s+f(x.a,24).a,p=p&&Pt(ge(Nt(x.b))));return e.f[t.k]=m,s=s+e.c[t.k][0],new wr(gt(s),(yn(),p?oi:Rn))}function Ax(e,t,n){var i,s,l,h,v,p,m,S,x,L,j,I,R,Y,q;if(L=new qn(e.j),q=t.a/L.a,v=t.b/L.b,R=t.a-L.a,l=t.b-L.b,n)for(s=He(z(e,(Ee(),dt)))===He((zn(),ii)),I=new M(e.f);I.a<I.c.c.length;)switch(j=f(O(I),7),j.g.e){case 1:s||(j.i.a*=q);break;case 2:j.i.a+=R,s||(j.i.b*=v);break;case 3:s||(j.i.a*=q),j.i.b+=l;break;case 4:s||(j.i.b*=v)}for(m=new M(e.c);m.a<m.c.c.length;)p=f(O(m),33),S=p.i.a+p.j.a/2,x=p.i.b+p.j.b/2,Y=S/L.a,h=x/L.b,Y+h>=1&&(Y-h>0&&x>=0?(p.i.a+=R,p.i.b+=l*h):Y-h<0&&S>=0&&(p.i.a+=R*Y,p.i.b+=l));e.j.a=t.a,e.j.b=t.b,ce(e,(Ee(),uc),(gu(),i=f(Gi(iv),11),new ri(i,f(Ti(i,i.length),11),0)))}function _z(e){var t,n,i,s,l,h,v,p,m,S;for(i=new Se,h=new M(e.e.a);h.a<h.c.c.length;){for(s=f(O(h),61),S=0,s.k.c=ve(Ze,Me,1,0,4,1),n=new M(tf(s));n.a<n.c.c.length;)t=f(O(n),89),t.e&&(Le(s.k,t),++S);S==1&&(i.c[i.c.length]=s)}for(l=new M(i);l.a<l.c.c.length;)for(s=f(O(l),61);s.k.c.length==1;){for(m=f(O(new M(s.k)),89),e.b[m.b]=m.f,v=m.c,p=m.d,n=new M(tf(s));n.a<n.c.c.length;)t=f(O(n),89),t==m||(t.e?v==t.c||p==t.d?e.b[m.b]-=e.b[t.b]-t.f:e.b[m.b]+=e.b[t.b]-t.f:s==v?t.c==s?e.b[m.b]+=t.f:e.b[m.b]-=t.f:t.c==s?e.b[m.b]-=t.f:e.b[m.b]+=t.f);Tr(v.k,m),Tr(p.k,m),v==s?s=m.d:s=m.c}}function jle(e){var t,n,i,s,l,h,v,p,m,S;for(m=new Ur,v=new Ur,l=new M(e);l.a<l.c.c.length;)i=f(O(l),77),i.e=i.d.c.length,i.k=i.j.c.length,i.e==0&&mr(m,i,m.c.b,m.c),i.k==0&&i.g.a.Y()==0&&mr(v,i,v.c.b,v.c);for(h=-1;m.b!=0;)for(i=f(zC(m,0),77),n=new M(i.j);n.a<n.c.c.length;)t=f(O(n),117),S=t.b,S.n=ti(S.n,i.n+1),h=ti(h,S.n),--S.e,S.e==0&&mr(m,S,m.c.b,m.c);if(h>-1){for(s=Jt(v,0);s.b!=s.d.c;)i=f(qt(s),77),i.n=h;for(;v.b!=0;)for(i=f(zC(v,0),77),n=new M(i.d);n.a<n.c.c.length;)t=f(O(n),117),p=t.a,p.g.a.Y()==0&&(p.n=Hu(p.n,i.n-1),--p.k,p.k==0&&mr(v,p,v.c.b,v.c))}}function Nle(e,t,n,i){var s,l,h,v,p,m,S,x,L,j,I,R,Y,q,V,U,te,ue;for(p=new Se,l=new M(t.b);l.a<l.c.c.length;)for(s=f(O(l),9),v=new M(s.f);v.a<v.c.c.length;){for(h=f(O(v),7),S=null,U=f(Vn(h.e,ve(Xi,qi,12,0,0,1)),47),te=0,ue=U.length;te<ue;++te)V=U[te],wh(V.d.f,n)||(q=fk(e,t,n,V,V.c,(cr(),ai),S),q!=S&&(p.c[p.c.length]=q),q.c&&(S=q));for(m=null,I=f(Vn(h.b,ve(Xi,qi,12,0,0,1)),47),R=0,Y=I.length;R<Y;++R)j=I[R],wh(j.c.f,n)||(q=fk(e,t,n,j,j.d,(cr(),Ri),m),q!=m&&(p.c[p.c.length]=q),q.c&&(m=q))}for(L=new M(p);L.a<L.c.c.length;)x=f(O(L),187),ji(t.b,x.a,0)!=-1||Le(t.b,x.a),x.c&&(i.c[i.c.length]=x)}function Ile(e){var t,n,i,s,l,h,v,p,m;for(i=e.e.e.j,t=f(nr(e.e,(Ee(),uc)),86).kb((gu(),Lb)),Ofe(e),l=new M(tc(e.e));l.a<l.c.c.length;){switch(s=f(O(l),161),v=f(nr(s,vl),15),!v&&(v=new Ut(0)),p=s.e.j,h=(n=f(s.e,7).d,new Vo(n.d,n.b,n.a,n.c)),m=new qn(s.e.i),f(s.e,7).g.e){case 4:m.a=-p.a-v.a,m.b=e.s-p.b-(t?h.a:0),e.s-=zm(e,(we(),qe))+p.b+(t?h.d+h.a:0);break;case 2:m.a=i.a+v.a,m.b=e.a+(t?h.d:0),e.a+=zm(e,(we(),Be))+p.b+(t?h.d+h.a:0);break;case 1:m.a=e.f+(t?h.b:0),m.b=-s.e.j.b-v.a,e.f+=zm(e,(we(),rt))+p.a+(t?h.b+h.c:0);break;case 3:m.a=e.r-p.a-(t?h.c:0),m.b=i.b+v.a,e.r-=zm(e,(we(),ct))+p.a+(t?h.b+h.c:0)}s.e.i.a=m.a,s.e.i.b=m.b}}function Mle(e,t,n){var i,s,l,h,v,p,m,S,x,L,j,I,R,Y,q;for(S=new $i,x=new $i,Y=new $i,q=new $i,m=f(z(t,(le(),Ai)),15).a,l=m*f(z(t,(zt(),eu)),15).a,Pt(ge(Nt(z(t,(Ee(),pb))))),p=(L=new Wt(n.a).a.bb().mb(),new Zt(L));p.a.G();)if(v=(h=f(p.a.H(),21),f(h.yb(),9)),j=f(z(v,_r),32),j==(we(),rt))for(x.a.db(v,x),s=Dt(Dr(v));xt(s);)i=f(Et(s),12),vn(S,i.c.f);else if(j==ct)for(q.a.db(v,q),s=Dt(Dr(v));xt(s);)i=f(Et(s),12),vn(Y,i.c.f);S.a.Y()!=0&&(I=new U2(2,l),R=Tx(I,t,S,x,-m-t.d.b),R>0&&(e.a=m+(R-1)*l,t.d.b+=e.a,t.e.b+=e.a)),Y.a.Y()!=0&&(I=new U2(1,l),R=Tx(I,t,Y,q,t.e.b+m-t.d.b),R>0&&(t.e.b+=m+(R-1)*l))}function Gz(e,t){var n,i,s,l,h,v,p,m,S;return mn(),t.length==0?e.fc(Hx,vk,-1,-1):(S=Jc(t),Ho(S.substr(0,3),"at ")&&(S=Pd(S,3,S.length-3)),S=S.replace(/\[.*?\]/g,""),h=S.indexOf("("),h==-1?(h=S.indexOf("@"),h==-1?(m=S,S=""):(m=Jc(Pd(S,h+1,S.length-(h+1))),S=Jc(S.substr(0,h)))):(n=S.indexOf(")",h),m=S.substr(h+1,n-(h+1)),S=Jc(S.substr(0,h))),h=Xte(S,XC(46)),h!=-1&&(S=Pd(S,h+1,S.length-(h+1))),(S.length==0||Ho(S,"Anonymous function"))&&(S=vk),v=une(m,XC(58)),s=wne(m,XC(58),v-1),p=-1,i=-1,l=Hx,v!=-1&&s!=-1&&(l=m.substr(0,s),p=tM(m.substr(s+1,v-(s+1))),i=tM(Pd(m,v+1,m.length-(v+1)))),e.fc(l,S,p,i))}function Ole(e){var t,n,i,s,l,h,v,p,m,S;for(m=new Se,v=new Se,h=new M(e);h.a<h.c.c.length;)s=f(O(h),80),s.c=s.b.c.length,s.f=s.e.c.length,s.c==0&&(m.c[m.c.length]=s),s.f==0&&s.j.b==0&&(v.c[v.c.length]=s);for(i=-1;m.c.length!=0;)for(s=f(Zl(m,0),80),n=new M(s.e);n.a<n.c.c.length;)t=f(O(n),118),S=t.b,S.i=ti(S.i,s.i+1),i=ti(i,S.i),--S.c,S.c==0&&(m.c[m.c.length]=S);if(i>-1){for(l=new M(v);l.a<l.c.c.length;)s=f(O(l),80),s.i=i;for(;v.c.length!=0;)for(s=f(Zl(v,0),80),n=new M(s.b);n.a<n.c.c.length;)t=f(O(n),118),p=t.a,!(p.j.b>0)&&(p.i=Hu(p.i,s.i-1),--p.f,p.f==0&&(v.c[v.c.length]=p))}}function Ale(e,t,n){var i,s,l,h,v,p,m,S,x,L,j,I,R;if(Pt(ge(Nt(z(n,(Ee(),Qk))))))for(v=new M(n.f);v.a<v.c.c.length;)for(h=f(O(v),7),x=f(Vn(h.e,ve(Xi,qi,12,h.e.c.length,0,1)),47),m=0,S=x.length;m<S;++m)p=x[m],l=p.d.f==n,s=l&&Pt(ge(Nt(z(p,Qk)))),s&&(j=p.c,L=f(Kt(e.b,j),9),L||(L=wp(j,(zn(),Ao),j.g,-1,j.j,f(z(t,Oo),59),t),ce(L,(le(),lt),j),un(e.b,j,L),Le(t.b,L)),R=p.d,I=f(Kt(e.b,R),9),I||(I=wp(R,(zn(),Ao),R.g,1,R.j,f(z(t,Oo),59),t),ce(I,(le(),lt),R),un(e.b,R,I),Le(t.b,I)),i=i2(p),Bn(i,f(_e(L.f,0),7)),kn(i,f(_e(I.f,0),7)),pt(e.a,p,new h0(i,t,(cr(),ai))),f(z(t,(le(),Vr)),18).ib((br(),os)))}function Rle(e,t,n,i,s,l){var h,v,p,m,S,x,L,j,I,R,Y,q,V,U;switch(j=_d(e.g),R=_d(n.g),I=dn(Ga(e.i),e.a),Y=dn(Ga(n.i),n.a),h=dn(new qn(I),Fo(new Fc(j),t)),v=dn(new qn(Y),Fo(new Fc(R),i)),m=rse(e,s),s==(we(),ct)||s==Be?m+=l:m-=l,L=new Fr,q=new Fr,s.e){case 1:case 3:L.a=h.a,L.b=I.b+m,q.a=v.a,q.b=L.b;break;case 2:case 4:L.a=I.a+m,L.b=h.b,q.a=L.a,q.b=v.b;break;default:return null}switch(S=Fo(dn(new ot(L.a,L.b),q),.5),x=new Uy(re(ie(_t,1),Ht,10,0,[I,h,L,S,q,v,Y])),p=b8(x),U=p8(x),s.e){case 1:case 3:x.a=p,V=pse(x);break;case 2:case 4:x.a=U,V=bse(x);break;default:return null}return zS(x,new K2(re(ie(_t,1),Ht,10,0,[p,U,V,I,Y]))),x}function Ble(e,t,n,i){var s,l,h,v,p,m,S,x,L,j;for(l=new SB(t),x=Jue(e,t,l),j=je(f(z(t,(Ee(),es)),15).a,1),S=new M(x.a);S.a<S.c.c.length;)m=f(O(S),27),p=SR(f(m.a,10),f(m.b,10),j),o=!0,o=o&lu(n,new ot(p.d,p.e)),o=o&lu(n,ua(new ot(p.d,p.e),p.c,0)),o=o&lu(n,ua(new ot(p.d,p.e),0,p.b)),o&lu(n,ua(new ot(p.d,p.e),p.c,p.b));switch(L=l.d,v=SR(f(x.b.a,10),f(x.b.b,10),j),L==(we(),qe)||L==Be?(i.c[L.e]=Xt(i.c[L.e],v.e),i.b[L.e]=je(i.b[L.e],v.e+v.b)):(i.c[L.e]=Xt(i.c[L.e],v.d),i.b[L.e]=je(i.b[L.e],v.d+v.c)),s=Hr,h=l.c.f.e,L.e){case 4:s=h.c;break;case 2:s=h.b;break;case 1:s=h.a;break;case 3:s=h.d}return i.a[L.e]=je(i.a[L.e],s),l}function zle(e,t,n,i,s){var l,h,v,p,m,S,x,L,j,I,R,Y;for(l=new Se,m=new M(i);m.a<m.c.c.length;)if(v=f(O(m),187),h=null,v.f==(cr(),ai))for(I=new M(v.e);I.a<I.c.c.length;)j=f(O(I),12),Y=j.d.f,Li(Y)==t?OA(e,t,v,j,v.b,j.d):!n||wh(Y,n)?Ese(e,t,v,i,j):(L=fk(e,t,n,j,v.b,ai,h),L!=h&&(l.c[l.c.length]=L),L.c&&(h=L));else for(x=new M(v.e);x.a<x.c.c.length;)if(S=f(O(x),12),R=S.c.f,Li(R)==t)OA(e,t,v,S,S.c,v.b);else{if(!n||wh(R,n))continue;L=fk(e,t,n,S,v.b,Ri,h),L!=h&&(l.c[l.c.length]=L),L.c&&(h=L)}for(p=new M(l);p.a<p.c.c.length;)v=f(O(p),187),ji(t.b,v.a,0)!=-1||Le(t.b,v.a),v.c&&(s.c[s.c.length]=v)}function Hle(e){var t,n,i,s;for(t=e.e.j,i=new M(tc(e));i.a<i.c.c.length;){switch(n=f(O(i),161),s=f(nr(n,(Ee(),vl)),15),!s&&(s=new Ut(0)),f(n.e,7).g.e){case 4:n.e.i.b=t.b*ge(Ot(nr(n,gf))),n.e.i.a=-n.e.j.a-s.a;break;case 2:n.e.i.b=t.b*ge(Ot(nr(n,gf))),n.e.i.a=t.a+s.a;break;case 1:n.e.i.a=t.a*ge(Ot(nr(n,gf))),n.e.i.b=-n.e.j.b-s.a;break;case 3:n.e.i.a=t.a*ge(Ot(nr(n,gf))),n.e.i.b=t.b+s.a}switch(f(n.e,7).g.e){case 4:n.e.i.b=t.b*ge(Ot(nr(n,gf))),n.e.i.a=-n.e.j.a-s.a;break;case 2:n.e.i.b=t.b*ge(Ot(nr(n,gf))),n.e.i.a=t.a+s.a;break;case 1:n.e.i.a=t.a*ge(Ot(nr(n,gf))),n.e.i.b=-n.e.j.b-s.a;break;case 3:n.e.i.a=t.a*ge(Ot(nr(n,gf))),n.e.i.b=t.b+s.a}}}function _le(e){var t,n,i,s,l,h,v,p,m;for(l=e.f,s=k3(Jy(e)),m=Jt(ca(e.g),0);m.b!=m.d.c;)if(p=f(qt(m),7),p.e.c.length==0){for(n=new M(p.b);n.a<n.c.c.length;)if(t=f(O(n),12),i=t.c,s.a.R(i)){for(h=new fn(l.f,0),v=(ut(h.b<h.d.Y()),f(h.d.sb(h.c=h.b++),7));v!=p;)v=(ut(h.b<h.d.Y()),f(h.d.sb(h.c=h.b++),7));cu(h,i),Cg(m,i),dp(i,p.g),Tg(m),Tg(m),s.a.eb(i)!=null}}else for(n=new M(p.e);n.a<n.c.c.length;)if(t=f(O(n),12),i=t.d,s.a.R(i)){for(h=new fn(l.f,0),v=(ut(h.b<h.d.Y()),f(h.d.sb(h.c=h.b++),7));v!=p;)v=(ut(h.b<h.d.Y()),f(h.d.sb(h.c=h.b++),7));ut(h.b>0),h.a.sb(h.c=--h.b),cu(h,i),Cg(m,i),dp(i,p.g),Tg(m),Tg(m),s.a.eb(i)!=null}}function Gle(e){var t,n,i,s,l,h,v,p,m;l=new xm(e),s=Mn(l,"graph"),p=Mn(l,"success"),i=Mn(l,"error"),h=Mn(l,"options");try{if(!s||!s.kc())throw new R1("Mandatory parameter missing, 'graph' must be specified");qae(new g9,s.kc(),h?h.kc():null),v=s.kc().a,p&&p.kc()?Ug(p.kc().a,v):Ug(null,v)}catch(S){if(S=Kr(S),xe(S,73))m=S,i&&i.kc()?Ug(i.kc().a,PB(m).a):Ug(null,PB(m).a);else if(xe(S,54))t=S,n=new Al,ja(n,"type",new $c(_1(t.$c))),t.bc()!=null?ja(n,mk,new $c(t.bc())):ja(n,mk,new $c("null (sic)")),ja(n,SH,new $c(O4(new B1(`
-`),new Yf(new uo((t.g==null&&(t.g=o3(t)),t.g)))))),i&&i.kc()?Ug(i.kc().a,n.a):Ug(null,n.a),GC(t,($l(),lY));else throw Zr(S)}}function $le(e,t,n){var i,s,l,h,v,p,m,S,x,L;if(n)for(i=-1,S=new fn(t,0);S.b<S.d.Y();){if(v=(ut(S.b<S.d.Y()),f(S.d.sb(S.c=S.b++),9)),x=e.a[v.d.k][v.k].a,x==null){for(h=i+1,l=new fn(t,S.b);l.b<l.d.Y();)if(L=Ite(e,(ut(l.b<l.d.Y()),f(l.d.sb(l.c=l.b++),9))).a,L!=null){h=(ur(L),L);break}x=(i+h)/2,e.a[v.d.k][v.k].a=x,e.a[v.d.k][v.k].d=(ur(x),x),e.a[v.d.k][v.k].b=1}i=(ur(x),x)}else{for(s=0,m=new M(t);m.a<m.c.c.length;)v=f(O(m),9),e.a[v.d.k][v.k].a!=null&&(s=je(s,ge(e.a[v.d.k][v.k].a)));for(s+=2,p=new M(t);p.a<p.c.c.length;)v=f(O(p),9),e.a[v.d.k][v.k].a==null&&(x=rf(e.e,24)*Lk*s-1,e.a[v.d.k][v.k].a=x,e.a[v.d.k][v.k].d=x,e.a[v.d.k][v.k].b=1)}}function Yle(e,t,n){var i,s,l,h,v,p,m,S,x,L,j,I;for(p=0,m=0,I=0,j=0,h=0,L=0,x=0,S=0,l=new E0(new O1(e.c).a);i0(l.a);)switch(s=(l.b=Kc(l.a),new X1(l.c,l.b)),i=f(s.b.b[s.a.e],62),f(s.a,67).e){case 12:case 13:case 14:L+=i.c+t;break;case 15:case 16:case 17:x+=i.c+t,h=je(h,i.b+t);break;case 18:case 19:case 20:S+=i.c+t;break;case 0:case 1:case 2:I+=i.c+t;break;case 3:case 4:case 5:j+=i.c+t;break;case 6:case 7:case 8:p+=i.b+t;break;case 9:case 10:case 11:m+=i.b+t}p-=t,m-=t,I-=t,j-=t,L+=L!=0?t:0,x+=x!=0?t:0,S+=S!=0?t:0,v=e.p.d+h+e.p.a,v+=v!=0?t:0,n.a=je(n.a,I),n.a=je(n.a,L),n.a=je(n.a,x),n.a=je(n.a,S),n.a=je(n.a,j),n.b=je(n.b,p),n.b=je(n.b,v),n.b=je(n.b,m)}function Fle(e){var t,n,i,s,l,h,v,p;for(t=null,i=new M(e);i.a<i.c.c.length;)n=f(O(i),102),ge(xa(n.g,n.d[0]).a),n.b=null,n.e&&n.e.Y()>0&&n.c==0&&(!t&&(t=new Se),t.c[t.c.length]=n);if(t)for(;t.c.length!=0;){if(n=f(Zl(t,0),102),n.b&&n.b.c.length>0){for(l=(!n.b&&(n.b=new Se),new M(n.b));l.a<l.c.c.length;)if(s=f(O(l),102),ge(xa(s.g,s.d[0]).a)==ge(xa(n.g,n.d[0]).a)){if(ji(e,s,0)>ji(e,n,0))return new wr(s,n)}else if(ge(xa(s.g,s.d[0]).a)>ge(xa(n.g,n.d[0]).a))return new wr(s,n)}for(v=(!n.e&&(n.e=new Se),n.e).mb();v.G();)h=f(v.H(),102),p=(!h.b&&(h.b=new Se),h.b),Xc(0,p.c.length),dg(p.c,0,n),h.c==p.c.length&&(t.c[t.c.length]=h)}return null}function qle(e){var t,n,i,s,l,h,v,p,m,S,x,L,j,I,R;for(x=(On(),new $t),S=(_n(),new Go($o(bs(e.a,new T))));xt(S);)for(m=f(Et(S),9),s=Fae(m,(we(),Be)),i=new M(s);i.a<i.c.c.length;)for(n=f(O(i),7),h=new M(n.e);h.a<h.c.c.length;){for(l=f(O(h),12),Yi(),R=l.d.f,(R.g==(et(),hn)||R.g==Za)&&(R=f(z(R,(le(),Si)),7).f),fi(x.d,R)?t=f(li(fi(x.d,R)),171):(s.c.length==2?He(n)===He((Sn(0,s.c.length),s.c[0]))?t=rs:t=Zs:t=rs,ra(x.d,R,t)),p=new M(l.b);p.a<p.c.c.length;)v=f(O(p),33),ce(v,(le(),bo),t);for(I=new M(l.c.c);I.a<I.c.c.length;)L=f(O(I),33),ce(L,(le(),bo),t);for(j=new M(l.d.c);j.a<j.c.c.length;)L=f(O(j),33),ce(L,(le(),bo),t)}}function Vle(e,t){var n,i,s,l,h,v,p,m,S;if(Vl(En(t))!=1||f(I0(En(t)),12).d.f.g!=(et(),hn))return null;for(l=f(I0(En(t)),12),n=l.d.f,_a(n,(et(),Mi)),ce(n,(le(),Oi),null),ce(n,Si,null),ce(n,(Ee(),dt),f(z(t,dt),28)),ce(n,ia,f(z(t,ia),86)),s=z(l.c,lt),h=null,m=Jn(n,(we(),Be)).mb();m.G();)if(v=f(m.H(),7),v.e.c.length!=0){ce(v,lt,s),S=l.c,v.j.a=S.j.a,v.j.b=S.j.b,v.a.a=S.a.a,v.a.b=S.a.b,Tn(v.c,S.c),S.c.c=ve(Ze,Me,1,0,4,1),h=v;break}if(ce(l.c,lt,null),!Lg(Jn(t,Be)))for(p=new M(Wc(Jn(t,Be)));p.a<p.c.c.length;)v=f(O(p),7),v.e.c.length==0?(i=new Yn,Bt(i,Be),i.j.a=v.j.a,i.j.b=v.j.b,cn(i,n),ce(i,lt,z(v,lt)),cn(v,null)):cn(h,n);return n.j.b=t.j.b,Le(e.b,n),n}function Wle(e){var t,n,i,s,l,h,v,p,m;if(l=e.e.e.j,h=new qn(l),p=f(nr(e.e,(Ee(),uc)),86),m=f(nr(e.e,Sb),86),v=f(nr(e.e,dt),28),t=qo(p,(gu(),Lb)),p.c!=0){switch(l.a=0,l.b=0,i=null,v.e){case 1:case 2:case 3:i=hue(e,e.k);break;case 4:i=new qn(h);break;case 5:i=tce(e.e,t)}qo(p,nE)&&(i&&(l.a=je(l.a,i.a),l.b=je(l.b,i.b)),t&&(l.a=je(l.a,e.q.b+e.q.c+e.k),l.b=je(l.b,e.q.d+e.q.a+e.k))),qo(p,tE)&&Bc(new M(Yg(e.e)))&&Yle(e,e.d,l),qo(p,Tb)&&(s=f(nr(e.e,rv),15).a,n=f(nr(e.e,nv),15).a,qo(m,(Eh(),Pb))&&(s<=0&&(s=20),n<=0&&(n=20)),qo(m,aE)?(s>0&&(l.a=je(l.a,s+e.q.b+e.q.c)),n>0&&(l.b=je(l.b,n+e.q.d+e.q.a))):(s>0&&(l.a=je(l.a,s)),n>0&&(l.b=je(l.b,n)))),Hte(e.e,l)}}function $z(e,t,n){var i,s,l,h,v,p,m,S,x,L,j;if(!e.b)return!1;for(h=null,L=null,p=new c2(null,null),s=1,p.a[1]=e.b,x=p;x.a[s];)m=s,v=L,L=x,x=x.a[s],i=e.a.$b(t,x.d),s=i<0?0:1,i==0&&(!n.c||la(x.e,n.d))&&(h=x),!(x&&x.b)&&!_u(x.a[s])&&(_u(x.a[1-s])?L=L.a[m]=F0(x,s):_u(x.a[1-s])||(j=L.a[1-m],j&&(!_u(j.a[1-m])&&!_u(j.a[m])?(L.b=!1,j.b=!0,x.b=!0):(l=v.a[1]==L?1:0,_u(j.a[m])?v.a[l]=YO(L,m):_u(j.a[1-m])&&(v.a[l]=F0(L,m)),x.b=v.a[l].b=!0,v.a[l].a[0].b=!1,v.a[l].a[1].b=!1))));return h&&(n.b=!0,n.d=h.e,x!=h&&(S=new c2(x.d,x.e),xse(e,p,h,S),L==h&&(L=S)),L.a[L.a[1]==x?1:0]=x.a[x.a[0]?0:1],--e.c),e.b=p.a[1],e.b&&(e.b.b=!1),n.b}function Ule(e,t){var n,i,s,l,h,v,p,m,S,x,L,j,I,R,Y,q,V;for(i=f(z(e,(Ee(),dt)),28),p=e.e,v=e.a,n=f(z(e,(le(),ss)),15).a,m=p.a+v.b+v.c+2*n,S=0-v.d-n-e.d.b,j=p.b+v.d+v.a+2*n-e.d.b,x=new Se,I=new Se,l=(L=new Wt(t.a).a.bb().mb(),new Zt(L));l.a.G();){switch(s=(h=f(l.a.H(),21),f(h.yb(),9)),i.e){case 1:case 2:case 3:oue(s);break;case 4:R=f(z(s,yu),10),Y=R?R.a:0,s.i.a=m*ge(Ot(z(s,Lu)))-Y,J0(s,!0,!1);break;case 5:q=f(z(s,yu),10),V=q?q.a:0,s.i.a=ge(Ot(z(s,Lu)))-V,J0(s,!0,!1),p.a=je(p.a,s.i.a+s.j.a/2)}switch(f(z(s,_r),32).e){case 1:s.i.b=S,x.c[x.c.length]=s;break;case 3:s.i.b=j,I.c[I.c.length]=s}}switch(i.e){case 1:case 2:FR(x,e),FR(I,e);break;case 3:qR(x,e),qR(I,e)}}function Kle(e){var t,n,i,s,l,h;return i=f(z(e.a.g,(Ee(),ia)),86),c8(i,(pu(),t=f(Gi(Ln),11),new ri(t,f(Ti(t,t.length),11),0)))||(Xu(i,X0(Wi))?(n=f(f(Ia(e.a.b,e.b),20).sb(0),33),e.b.i.a=n.i.a,e.b.i.b=n.i.b):Xu(i,X0(Ki))?(s=f(_e(e.a.c,e.a.c.c.length-1),9),l=f(f(Ia(e.a.b,e.b),20).sb(f(Ia(e.a.b,e.b),20).Y()-1),33),h=s.j.a-(l.i.a+l.j.a),e.b.i.a=e.a.g.j.a-h-e.b.j.a,e.b.i.b=l.i.b):Xu(i,Ft(ga,re(ie(Ln,1),De,41,0,[Ka])))?(n=f(f(Ia(e.a.b,e.b),20).sb(0),33),e.b.i.a=(e.a.g.j.a-e.b.j.a)/2,e.b.i.b=n.i.b):Xu(i,X0(ga))?(n=f(f(Ia(e.a.b,e.b),20).sb(0),33),e.b.i.b=n.i.b):Xu(i,X0(Ka))&&(n=f(f(Ia(e.a.b,e.b),20).sb(0),33),e.b.i.a=(e.a.g.j.a-e.b.j.a)/2,e.b.i.b=n.i.b)),null}function Yz(e){var t,n,i,s,l,h,v,p,m,S,x,L,j,I,R,Y;for(I=new M(e);I.a<I.c.c.length;){for(j=f(O(I),9),lo(j.i),lo(j.j),Fue(j),pue(j),Y=new M(j.f);Y.a<Y.c.c.length;){for(R=f(O(Y),7),lo(R.i),lo(R.a),lo(R.j),Bt(R,P8(R.g)),l=f(z(R,(Ee(),ku)),24),l&&ce(R,ku,gt(-l.a)),s=new M(R.e);s.a<s.c.c.length;){for(i=f(O(s),12),n=Jt(i.a,0);n.b!=n.d.c;)t=f(qt(n),10),lo(t);if(p=f(z(i,Un),44),p)for(v=Jt(p,0);v.b!=v.d.c;)h=f(qt(v),10),lo(h);for(x=new M(i.b);x.a<x.c.c.length;)m=f(O(x),33),lo(m.i),lo(m.j)}for(L=new M(R.c);L.a<L.c.c.length;)m=f(O(L),33),lo(m.i),lo(m.j)}for(j.g==(et(),Cn)&&(ce(j,(le(),_r),P8(f(z(j,_r),32))),Nue(j)),S=new M(j.c);S.a<S.c.c.length;)m=f(O(S),33),lo(m.j),lo(m.i)}}function Zle(e,t,n,i){var s,l,h,v,p,m,S,x,L,j,I,R,Y,q,V;for(vse(n),wh(t.d.f,t.c.f)?(S=t.c,x=ln(re(ie(_t,1),Ht,10,0,[S.i,S.a])),m=S.f.b,ua(x,-m.b,-m.d),x.a-=i.a,x.b-=i.b):x=Di(t.c),x.a+=i.a,x.b+=i.b,L=new Al,qa(e,L,"x",x.a),qa(e,L,"y",x.b),ja(n,"sourcePoint",L),j=Di(t.d),z(t,(le(),a5))!=null&&dn(j,f(z(t,a5),10)),dn(j,i),I=new Al,qa(e,I,"x",j.a),qa(e,I,"y",j.b),ja(n,"targetPoint",I),s=new RS,V=Zu(t.a,i),l=0,q=Jt(V,0);q.b!=q.d.c;)R=f(qt(q),10),p=new Al,qa(e,p,"x",R.a),qa(e,p,"y",R.b),iO(s,l++,p);if(V.b==0?ja(n,kk,null):ja(n,kk,s),h=f(z(t,(Ee(),Un)),44),l=0,h){for(Zu(h,i),v=new RS,Y=Jt(h,0);Y.b!=Y.d.c;)R=f(qt(Y),10),p=new Al,qa(e,p,"x",R.a),qa(e,p,"y",R.b),iO(v,l++,p);ja(n,CH,v)}else ja(n,CH,null)}function Xle(e,t,n,i){var s,l,h,v,p,m,S,x,L,j,I,R,Y,q;if(R=e.i,Y=e.j,L=e.e,t){for(x=i/2*(t.Y()-1),j=0,m=t.mb();m.G();)v=f(m.H(),9),x+=v.j.a,j=je(j,v.j.b);for(q=R.a-(x-Y.a)/2,h=R.b-L.d+j,s=Y.a/(t.Y()+1),l=s,p=t.mb();p.G();)v=f(p.H(),9),v.i.a=q,v.i.b=h-v.j.b,q+=v.j.a+i/2,S=qB(v),S.i.a=v.j.a/2-S.a.a,S.i.b=v.j.b,I=f(z(v,(le(),ow)),7),I.b.c.length+I.e.c.length==1&&(I.i.a=l-I.a.a,I.i.b=0,cn(I,e)),l+=s}if(n){for(x=i/2*(n.Y()-1),j=0,m=n.mb();m.G();)v=f(m.H(),9),x+=v.j.a,j=je(j,v.j.b);for(q=R.a-(x-Y.a)/2,h=R.b+Y.b+L.a-j,s=Y.a/(n.Y()+1),l=s,p=n.mb();p.G();)v=f(p.H(),9),v.i.a=q,v.i.b=h,q+=v.j.a+i/2,S=qB(v),S.i.a=v.j.a/2-S.a.a,S.i.b=0,I=f(z(v,(le(),ow)),7),I.b.c.length+I.e.c.length==1&&(I.i.a=l-I.a.a,I.i.b=Y.b,cn(I,e)),l+=s}}function Qle(e,t,n,i,s){var l,h,v,p,m,S,x,L,j,I,R,Y,q,V,U,te,ue,ye;for(ye=0,j=0,x=new M(t.f);x.a<x.c.c.length;){for(S=f(O(x),9),L=0,v=0,p=n?f(z(S,Qp),24).a:qs,q=i?f(z(S,Jp),24).a:qs,m=p>q?p:q,U=new M(S.f);U.a<U.c.c.length;){if(V=f(O(U),7),te=S.i.b+V.i.b+V.a.b,i)for(h=new M(V.e);h.a<h.c.c.length;)l=f(O(h),12),R=l.d,I=R.f,t!=e.a[I.k]&&(Y=ti(f(z(I,Qp),24).a,f(z(I,Jp),24).a),ue=f(z(l,(le(),Qa)),24).a,ue>=m&&ue>=Y&&(L+=I.i.b+R.i.b+R.a.b-te,++v));if(n)for(h=new M(V.b);h.a<h.c.c.length;)l=f(O(h),12),R=l.c,I=R.f,t!=e.a[I.k]&&(Y=ti(f(z(I,Qp),24).a,f(z(I,Jp),24).a),ue=f(z(l,(le(),Qa)),24).a,ue>=m&&ue>=Y&&(L+=I.i.b+R.i.b+R.a.b-te,++v))}v>0&&(ye+=L/v,++j)}j>0?(t.a=s*ye/j,t.i=j):(t.a=0,t.i=0)}function Jle(e,t,n,i){var s,l,h,v,p,m,S,x,L,j,I,R,Y,q,V;for(j=t.c.length,L=0,x=new M(e.c);x.a<x.c.c.length;)if(S=f(O(x),16),q=S.a,q.c.length!=0){for(Y=new M(q),m=0,V=null,s=f(O(Y),9);s;){if(l=f(_e(t,s.k),111),l.c>=0){for(p=null,v=new fn(S.a,m+1);v.b<v.d.Y()&&(h=(ut(v.b<v.d.Y()),f(v.d.sb(v.c=v.b++),9)),p=f(_e(t,h.k),111),!(p.d==l.d&&p.c<l.c));)p=null;p&&(V&&(Uc(i,s.k,gt(f(_e(i,s.k),24).a-1)),f(_e(n,V.k),20).nb(l)),l=ose(l,s,j++),t.c[t.c.length]=l,Le(n,new Se),V?(f(_e(n,V.k),20).ib(l),Le(i,gt(1))):Le(i,gt(0)))}I=null,Y.a<Y.c.c.length&&(I=f(O(Y),9),R=f(_e(t,I.k),111),f(_e(n,s.k),20).ib(R),Uc(i,I.k,gt(f(_e(i,I.k),24).a+1))),l.d=L,l.c=m++,V=s,s=I}++L}Pt(ge(Nt(z(e,(Ee(),pb)))))}function xs(e,t){var n;if(e.e)throw new zu((Gl(fE),"The "+fE.j+LH));if(!vte(e.a,t))throw new Bs("The direction "+t+" is not supported by the CGraph instance.");if(t==e.d)return e;switch(n=e.d,e.d=t,n.e){case 0:switch(t.e){case 2:Gs(e);break;case 1:Cs(e),Gs(e);break;case 4:el(e),Gs(e);break;case 3:el(e),Cs(e),Gs(e)}break;case 2:switch(t.e){case 1:Cs(e),sk(e);break;case 4:el(e),Gs(e);break;case 3:el(e),Cs(e),Gs(e)}break;case 1:switch(t.e){case 2:Cs(e),sk(e);break;case 4:Cs(e),el(e),Gs(e);break;case 3:Cs(e),el(e),Cs(e),Gs(e)}break;case 4:switch(t.e){case 2:el(e),Gs(e);break;case 1:el(e),Cs(e),Gs(e);break;case 3:Cs(e),sk(e)}break;case 3:switch(t.e){case 2:Cs(e),el(e),Gs(e);break;case 1:Cs(e),el(e),Cs(e),Gs(e);break;case 4:Cs(e),sk(e)}}return e}function Rx(e,t,n){var i,s,l,h,v,p,m,S,x;if(!e.a[t.d.k][t.k].e){for(e.a[t.d.k][t.k].e=!0,e.a[t.d.k][t.k].b=0,e.a[t.d.k][t.k].d=0,e.a[t.d.k][t.k].a=null,S=new M(t.f);S.a<S.c.c.length;)for(m=f(O(S),7),x=n?new cd(m):new $f(m),p=x.mb();p.G();)v=f(p.H(),7),h=v.f,h.d==t.d?h!=t&&(Rx(e,h,n),e.a[t.d.k][t.k].b+=e.a[h.d.k][h.k].b,e.a[t.d.k][t.k].d+=e.a[h.d.k][h.k].d):(e.a[t.d.k][t.k].d+=e.d[v.k],++e.a[t.d.k][t.k].b);if(l=f(z(t,(le(),m6)),20),l)for(s=l.mb();s.G();)i=f(s.H(),9),t.d==i.d&&(Rx(e,i,n),e.a[t.d.k][t.k].b+=e.a[i.d.k][i.k].b,e.a[t.d.k][t.k].d+=e.a[i.d.k][i.k].d);e.a[t.d.k][t.k].b>0&&(e.a[t.d.k][t.k].d+=rf(e.e,24)*Lk*.07000000029802322-.03500000014901161,e.a[t.d.k][t.k].a=e.a[t.d.k][t.k].d/e.a[t.d.k][t.k].b)}}function efe(e,t){var n,i,s,l,h,v,p,m,S,x,L;for(s=new M(e.a.c);s.a<s.c.c.length;)for(n=f(O(s),16),p=new M(n.a);p.a<p.c.c.length;)v=f(O(p),9),t.i[v.k]=v,t.g[v.k]=t.k==(fo(),Xa)?Hr:ki;for(h=e.a.c,t.c==(Do(),js)&&(h=xe(h,87)?Nd(f(h,87)):xe(h,88)?f(h,88).a:xe(h,63)?new ng(h):new md(h)),Pie(e.e,t,e.b),rte(t.n),l=h.mb();l.G();)for(n=f(l.H(),16),m=n.a,t.k==(fo(),Xa)&&(m=xe(m,87)?Nd(f(m,87)):xe(m,88)?f(m,88).a:xe(m,63)?new ng(m):new md(m)),L=m.mb();L.G();)x=f(L.H(),9),t.f[x.k]==x&&Xz(e,x,t);for(rle(e,t),i=h.mb();i.G();)for(n=f(i.H(),16),L=new M(n.a);L.a<L.c.c.length;)x=f(O(L),9),t.n[x.k]=t.n[t.f[x.k].k],x==t.f[x.k]&&(S=ge(t.g[t.i[x.k].k]),(t.k==(fo(),Xa)&&S>Hr||t.k==Su&&S<ki)&&(t.n[x.k]=ge(t.n[x.k])+S));e.e.Jc()}function Fz(e,t){var n,i,s,l,h,v,p,m,S,x,L;Wae(t,re(ie(lf,1),Me,79,0,[(le(),Ai),ss,(zt(),gv),Yh])),m=f(z(t,Ai),15).a,f(z(t,eu),15).a*m<2&&ce(t,eu,new Ut(2/m)),S=f(z(t,(Ee(),Oo)),59),S==($n(),Mo)&&ce(t,Oo,N2(t)),x=f(z(t,B6),24),x.a==0?ce(t,qh,new e8):ce(t,qh,new _A(x.a)),L=new Vz(t),ce(t,xl,L),s=$0(e,f(z(t,f5),180)),v=$0(e,f(z(t,g5),180)),i=$0(e,f(z(t,cw),180)),p=$0(e,f(z(t,b5),180)),l=$0(e,sne(f(z(t,C6),122))),h=new An,ce(t,Q$,h),Lr(Lr(Lr(Lr(Lr(Lr(h,s.qc(t)),v.qc(t)),i.qc(t)),p.qc(t)),l.qc(t)),ole(t)),n=(hi(30,ul),new Ni(30)),ce(t,D6,n),Tn(n,Kg(e,h,0)),n.c[n.c.length]=s,Tn(n,Kg(e,h,1)),n.c[n.c.length]=v,Tn(n,Kg(e,h,2)),n.c[n.c.length]=i,Tn(n,Kg(e,h,3)),n.c[n.c.length]=p,Tn(n,Kg(e,h,4)),n.c[n.c.length]=l,Tn(n,Kg(e,h,5))}function tfe(e,t){var n,i,s,l,h,v;if(l=MO(Fg(e)),!l.Nb().V()){switch(s=f(z(f(f(f(l.Nb().sb(0),129),224).e,33),(Yi(),aG)),171),s=s==Db?Zs:s,v=0,f(e.e,7).g.e){case 4:case 2:s==Zs&&(v=e.e.j.b);break;case 3:v=e.e.j.b}for((f(e.e,7).g==(we(),rt)||s==rs)&&(l=Nd(l)),i=Ad(l.Nb().mb());i.G();){if(n=f(i.H(),129),h=new qn(n.e.i),s==rs)switch(f(e.e,7).g.e){case 1:case 4:h.a=-n.e.j.a-t,h.b=v-t-n.e.j.b,v-=t+n.e.j.b;break;case 2:h.a=e.e.j.a+t,h.b=v-t-n.e.j.b,v-=t+n.e.j.b;break;case 3:h.a=-n.e.j.a-t,h.b=v+t,v+=t+n.e.j.b}else switch(f(e.e,7).g.e){case 4:h.a=-n.e.j.a-t,h.b=v+t,v+=t+n.e.j.b;break;case 2:h.a=e.e.j.a+t,h.b=v+t,v+=t+n.e.j.b;break;case 1:h.a=e.e.j.a+t,h.b=v-t-n.e.j.b,v-=t+n.e.j.b;break;case 3:h.a=e.e.j.a+t,h.b=v+t,v+=t+n.e.j.b}n.e.i.a=h.a,n.e.i.b=h.b}}}function nfe(e,t,n){var i,s,l,h,v,p,m,S,x,L,j;for(i=0,s=0,S=0;S<e.length;S++)if(p=e[S],gi(f(z(p,(Ee(),dt)),28)))for(h=Jn(p,(we(),Be)).mb();h.G();)l=f(h.H(),7),l.b.c.length+l.e.c.length>0&&(i+=l.b.c.length+l.e.c.length,un(t,l,gt(i)));else{for(v=Jn(p,(we(),Be)).mb();v.G();)l=f(v.H(),7),i+=l.b.c.length+l.e.c.length;for(h=Jn(p,Be).mb();h.G();)l=f(h.H(),7),l.b.c.length+l.e.c.length>0&&un(t,l,gt(i))}for(m=e.length-1;m>=0;m--)if(p=e[m],gi(f(z(p,(Ee(),dt)),28)))for(L=Jn(p,(we(),qe)).mb();L.G();)x=f(L.H(),7),x.b.c.length+x.e.c.length>0&&(s+=x.b.c.length+x.e.c.length,un(n,x,gt(s)));else{for(j=Jn(p,(we(),qe)).mb();j.G();)x=f(j.H(),7),s+=x.b.c.length+x.e.c.length;for(L=Jn(p,qe).mb();L.G();)x=f(L.H(),7),x.b.c.length+x.e.c.length>0&&un(n,x,gt(s))}}function rfe(e,t,n,i,s){var l,h,v,p,m,S,x,L,j,I,R,Y,q;switch(L=_d(e.g),I=_d(t.g),j=dn(Ga(e.i),e.a),R=dn(Ga(t.i),t.a),p=dn(new ot(j.a,j.b),Fo(new Fc(L),1.3*n)),Y=dn(new ot(R.a,R.b),Fo(new Fc(I),1.3*i)),v=ni(p.a-Y.a),v<s&&(e.g==(we(),qe)||e.g==Be?p.a<Y.a?p.a=Y.a-s:p.a=Y.a+s:p.a<Y.a?Y.a=p.a+s:Y.a=p.a-s),l=0,h=0,e.g.e){case 4:l=2*(j.a-n)-.5*(p.a+Y.a);break;case 2:l=2*(j.a+n)-.5*(p.a+Y.a);break;case 1:h=2*(j.b-n)-.5*(p.b+Y.b);break;case 3:h=2*(j.b+n)-.5*(p.b+Y.b)}switch(t.g.e){case 4:l=2*(R.a-i)-.5*(Y.a+p.a);break;case 2:l=2*(R.a+i)-.5*(Y.a+p.a);break;case 1:h=2*(R.b-i)-.5*(Y.b+p.b);break;case 3:h=2*(R.b+i)-.5*(Y.b+p.b)}return x=new ot(l,h),S=new Uy(re(ie(_t,1),Ht,10,0,[j,p,x,Y,R])),m=b8(S),q=p8(S),S.a=m,zS(S,new K2(re(ie(_t,1),Ht,10,0,[m,q,j,R]))),S}function qz(e,t,n){var i,s,l,h,v,p,m,S,x,L,j,I,R,Y;for(p=n.a,s=f(z(n,(le(),ss)),15).a,I=n.d,v=(i=f(z(n,ss),15).a,new ot(n.e.a+n.a.b+n.a.c+2*i,n.e.b+n.a.d+n.a.a+2*i)),m=v.b,L=new M(e.a);L.a<L.c.c.length;)if(S=f(O(L),9),S.g==(et(),Cn)){switch(l=f(z(S,_r),32),h=f(z(S,x6),10),j=S.i,l.e){case 2:j.a=n.e.a+s+p.c-I.a;break;case 4:j.a=-I.a-s-p.b}switch(Y=0,l.e){case 2:case 4:t==(zn(),ts)?(R=ge(Ot(z(S,Lu))),j.b=v.b*R-f(z(S,(Ee(),yu)),10).b,Y=j.b+h.b,J0(S,!1,!0)):t==ii&&(j.b=ge(Ot(z(S,Lu)))-f(z(S,(Ee(),yu)),10).b,Y=j.b+h.b,J0(S,!1,!0))}m=m>Y?m:Y}for(n.e.b+=m-v.b,x=new M(e.a);x.a<x.c.c.length;)if(S=f(O(x),9),S.g==(et(),Cn))switch(l=f(z(S,_r),32),j=S.i,l.e){case 1:j.b=-I.b-s-p.d;break;case 3:j.b=n.e.b+s+p.a-I.b}}function ife(e){var t,n,i,s,l,h,v,p,m,S,x,L,j,I;for(s=new Se,p=new M(e.d.f);p.a<p.c.c.length;)h=f(O(p),7),h.g==(we(),Be)&&(s.c[s.c.length]=h);if(e.e.a==($n(),Vi)&&!gs(f(z(e.d,(Ee(),dt)),28)))for(i=Dt(En(e.d));xt(i);)n=f(Et(i),12),Le(s,n.c);for(l=e.d.j.a,ce(e.d,(le(),zb),new Ut(e.d.j.a)),e.d.j.a=e.c,ce(e.d,wc,(yn(),yn(),oi)),Le(e.b,e.d),m=e.d,l-=e.c,S=e.a;S>1;)t=Xt(l,e.c),m=(x=new Va(e.e.c),_a(x,(et(),Mi)),ce(x,(Ee(),dt),f(z(m,dt),28)),ce(x,ia,f(z(m,ia),86)),x.k=e.e.b++,Le(e.b,x),x.j.b=m.j.b,x.j.a=t,L=new Yn,Bt(L,(we(),Be)),cn(L,m),L.i.a=x.j.a,L.i.b=x.j.b/2,j=new Yn,Bt(j,qe),cn(j,x),j.i.b=x.j.b/2,j.i.a=-j.j.a,I=new ws,Bn(I,L),kn(I,j),x),Le(e.e.c.b,m),--S,l-=e.c+e.e.d;for(new $C(e.d,e.b,e.c),v=new M(s);v.a<v.c.c.length;)h=f(O(v),7),Tr(e.d.f,h),cn(h,m)}function afe(e,t){var n,i,s,l,h,v,p,m,S,x,L,j;if(!(e.p>t.a||t.p>e.a)){for(n=0,i=0,x=(h=new Wt(e.o.a).a.bb().mb(),new Zt(h));x.a.G();)m=(s=f(x.a.H(),21),f(s.yb(),7)),M2(ln(re(ie(_t,1),Ht,10,0,[m.f.i,m.i,m.a])).b,t.p,t.a)&&++n;for(L=(v=new Wt(e.g.a).a.bb().mb(),new Zt(v));L.a.G();)m=(s=f(L.a.H(),21),f(s.yb(),7)),M2(ln(re(ie(_t,1),Ht,10,0,[m.f.i,m.i,m.a])).b,t.p,t.a)&&--n;for(j=(p=new Wt(t.o.a).a.bb().mb(),new Zt(p));j.a.G();)m=(s=f(j.a.H(),21),f(s.yb(),7)),M2(ln(re(ie(_t,1),Ht,10,0,[m.f.i,m.i,m.a])).b,e.p,e.a)&&++i;for(S=(l=new Wt(t.g.a).a.bb().mb(),new Zt(l));S.a.G();)m=(s=f(S.a.H(),21),f(s.yb(),7)),M2(ln(re(ie(_t,1),Ht,10,0,[m.f.i,m.i,m.a])).b,e.p,e.a)&&--i;n<i?new z0(e,t,i-n):i<n?new z0(t,e,n-i):(new z0(t,e,0),new z0(e,t,0))}}function Vz(e){var t;this.f=f(z(e,(le(),Ai)),15).a,this.d=f(z(e,(zt(),vv)),15).a,this.a=this.f*f(z(e,eu),15).a,this.b=this.f*f(z(e,rY),15).a,f(z(e,r5),15),this.c=f(z(e,r5),15).a,this.e=f(z(e,(Ee(),Mh)),15).a,t=(et(),re(ie(oL,1),De,132,0,[Hn,hn,Cn,er,Za,Mi])).length,this.g=Ay(gw,[Nr,xp],[250,26],12,[t,t],2),vg(this,Hn,this.f),Wo(this,Hn,hn,this.b),Wo(this,Hn,er,this.b),Wo(this,Hn,Cn,this.c),Wo(this,Hn,Za,this.b),Wo(this,Hn,Mi,this.b),vg(this,hn,this.a),Wo(this,hn,er,this.a),Wo(this,hn,Cn,this.c),Wo(this,hn,Za,this.e),Wo(this,hn,Mi,this.b),vg(this,er,this.a),Wo(this,er,Cn,this.c),Wo(this,er,Za,this.e),Wo(this,er,Mi,this.b),vg(this,Cn,this.c),Wo(this,Cn,Za,this.c),Wo(this,Cn,Mi,this.c),vg(this,Za,this.e),Wo(this,Za,Mi,this.e),vg(this,Mi,this.f)}function ofe(e,t){var n,i,s,l,h,v,p,m,S;if(Vl(Dr(t))!=1||f(I0(Dr(t)),12).c.f.g!=(et(),hn))return null;for(n=f(I0(Dr(t)),12),i=n.c.f,_a(i,(et(),Hn)),ce(i,(le(),Oi),null),ce(i,Si,null),ce(i,zb,f(z(t,zb),15)),ce(i,wc,(yn(),yn(),oi)),ce(i,lt,z(t,lt)),i.j.b=t.j.b,l=z(n.d,lt),h=null,m=Jn(i,(we(),qe)).mb();m.G();)if(v=f(m.H(),7),v.b.c.length!=0){ce(v,lt,l),S=n.d,v.j.a=S.j.a,v.j.b=S.j.b,v.a.a=S.a.a,v.a.b=S.a.b,Tn(v.c,S.c),S.c.c=ve(Ze,Me,1,0,4,1),h=v;break}if(ce(n.d,lt,null),Vl(Jn(t,qe))>1)for(p=Jt(ca(Jn(t,qe)),0);p.b!=p.d.c;)v=f(qt(p),7),v.b.c.length==0?(s=new Yn,Bt(s,qe),s.j.a=v.j.a,s.j.b=v.j.b,cn(s,i),ce(s,lt,z(v,lt)),cn(v,null)):cn(h,i);return ce(t,lt,null),ce(t,wc,Rn),_a(t,Mi),ce(i,(Ee(),dt),f(z(t,dt),28)),ce(i,ia,f(z(t,ia),86)),Gc(e.b,0,i),i}function wp(e,t,n,i,s,l,h){var v,p,m,S,x,L;switch(x=n,m=new Va(h),_a(m,(et(),Cn)),ce(m,(le(),x6),s),ce(m,(Ee(),dt),(zn(),ii)),ce(m,fv,f(z(e,vl),15)),p=f(z(e,yu),10),!p&&(p=new ot(s.a/2,s.b/2)),ce(m,yu,p),S=new Yn,cn(S,m),t!=Ao&&t!=cc||(v=l!=($n(),Mo)?l:Vi,i>0?x=Z0(v):x=P2(Z0(v)),ce(e,Eb,x)),x.e){case 4:ce(m,(zt(),Sr),(Fi(),mc)),ce(m,e5,(ph(),Bb)),m.j.b=s.b,Bt(S,(we(),Be)),S.i.b=p.b;break;case 2:ce(m,(zt(),Sr),(Fi(),Pu)),ce(m,e5,(ph(),tw)),m.j.b=s.b,Bt(S,(we(),qe)),S.i.b=p.b;break;case 1:ce(m,Qs,(ks(),kf)),m.j.a=s.a,Bt(S,(we(),ct)),S.i.a=p.a;break;case 3:ce(m,Qs,(ks(),$h)),m.j.a=s.a,Bt(S,(we(),rt)),S.i.a=p.a}if(t==Ah||t==ts||t==ii){switch(L=0,x.e){case 4:case 2:L=null.cd,t==ts&&(L/=null.cd);break;case 1:case 3:L=null.cd,t==ts&&(L/=null.cd)}ce(m,Lu,L)}return ce(m,_r,x),m}function sfe(e){var t,n,i,s,l,h,v,p,m,S,x,L,j,I,R,Y,q,V,U;for(m=new xi,q=(On(),new $t),un(q,e,W8(e)),i=(hi(2,ul),new Ni(2)),e.c&&Le(i,e.c),e.d&&Le(i,e.d),j=new M(i);j.a<j.c.c.length;)if(L=f(O(j),7),t=new Ur,na(t,Wc(Ca((gr(),new Qn(lr(re(ie(Ze,1),Me,1,4,[L.b,L.e]))))))),Hg(t,e,!0),t.b!=0)for(U=f(li(fi(q.d,e)),34),L==e.d?(I=U[U.length-1],V=!0):(I=U[0],V=!1),p=1;p<U.length;p++){for(V?R=U[U.length-1-p]:R=U[p],n=Jt(t,0);n.b!=n.d.c;)S=f(qt(n),12),x=f(li(fi(q.d,S)),34),x==null&&(x=W8(S),ra(q.d,S,x)),x.length<=p?tC(n):(V?Y=x[x.length-1-p]:Y=x[p],(R.a!=Y.a||R.b!=Y.b)&&(s=R.a-I.a,h=R.b-I.b,l=Y.a-I.a,v=Y.b-I.b,l*h==v*s&&Xy(s)==Xy(l)&&Xy(h)==Xy(v)?((s<=0?0-s:s)<(l<=0?0-l:l)||(h<=0?0-h:h)<(v<=0?0-v:v))&&mr(m,R,m.c.b,m.c):p>1&&mr(m,I,m.c.b,m.c),tC(n)));I=R}return m}function ufe(e){var t,n,i,s,l,h,v,p,m,S,x,L,j,I,R;for(e.n=f(z(e.g,(le(),Ai)),15).a*f(z(e.g,(zt(),vv)),15).a,e.e=e.n*f(z(e.g,eu),15).a,e.i=e.g.c.c.length,v=e.i-1,L=0,e.j=0,e.k=0,e.a=H0(ve(Mk,Nr,24,e.i,0,1)),e.b=H0(ve(Yb,Nr,184,e.i,6,1)),h=new M(e.g.c);h.a<h.c.c.length;){for(s=f(O(h),16),s.k=v,x=new M(s.a);x.a<x.c.c.length;)S=f(O(x),9),S.k=L,++L;--v}for(e.f=ve(Kn,Wn,26,L,12,1),e.c=Ay(Kn,[Nr,Wn],[52,26],12,[L,3],2),e.o=new Se,e.p=new Se,t=0,e.d=0,l=new M(e.g.c);l.a<l.c.c.length;){for(s=f(O(l),16),v=s.k,i=0,R=0,p=s.a.c.length,m=0,x=new M(s.a);x.a<x.c.c.length;)S=f(O(x),9),L=S.k,e.f[L]=S.d.k,m+=S.j.b+e.n,n=Vl(Dr(S)),I=Vl(En(S)),e.c[L][0]=I-n,e.c[L][1]=n,e.c[L][2]=I,i+=n,R+=I,n>0&&Le(e.p,S),Le(e.o,S);t-=i,j=p+t,m+=t*e.e,Uc(e.a,v,gt(j)),Uc(e.b,v,m),e.j=ti(e.j,j),e.k=je(e.k,m),e.d+=t,t+=R}}function we(){we=c;var e;fr=new ug(sf,0),rt=new ug("NORTH",1),Be=new ug("EAST",2),ct=new ug("SOUTH",3),qe=new ug("WEST",4),Hp=(Qt(),new Rl((e=f(Gi(Mr),11),new ri(e,f(Ti(e,e.length),11),0)))),Bh=Uo(Ft(rt,re(ie(Mr,1),De,32,0,[]))),Rh=Uo(Ft(Be,re(ie(Mr,1),De,32,0,[]))),zh=Uo(Ft(ct,re(ie(Mr,1),De,32,0,[]))),Hh=Uo(Ft(qe,re(ie(Mr,1),De,32,0,[]))),ns=Uo(Ft(rt,re(ie(Mr,1),De,32,0,[ct]))),Eu=Uo(Ft(Be,re(ie(Mr,1),De,32,0,[qe]))),vf=Uo(Ft(rt,re(ie(Mr,1),De,32,0,[qe]))),bl=Uo(Ft(rt,re(ie(Mr,1),De,32,0,[Be]))),pl=Uo(Ft(ct,re(ie(Mr,1),De,32,0,[qe]))),gl=Uo(Ft(Be,re(ie(Mr,1),De,32,0,[ct]))),Ra=Uo(Ft(rt,re(ie(Mr,1),De,32,0,[Be,qe]))),pa=Uo(Ft(Be,re(ie(Mr,1),De,32,0,[ct,qe]))),Ba=Uo(Ft(rt,re(ie(Mr,1),De,32,0,[ct,qe]))),Aa=Uo(Ft(rt,re(ie(Mr,1),De,32,0,[Be,ct]))),qr=Uo(Ft(rt,re(ie(Mr,1),De,32,0,[Be,ct,qe])))}function cfe(e){var t,n,i,s,l,h,v,p,m,S,x,L,j,I,R,Y,q,V,U,te,ue,ye,Ce,be,Ne;for(te=new Se,L=new M(e.c);L.a<L.c.c.length;)for(x=f(O(L),16),R=new M(x.a);R.a<R.c.c.length;)if(j=f(O(R),9),j.g==(et(),Cn)&&z(j,(le(),sw))!=null){for(Y=null,V=null,q=null,Ce=new M(j.f);Ce.a<Ce.c.c.length;)switch(ye=f(O(Ce),7),ye.g.e){case 4:Y=ye;break;case 2:V=ye;break;default:q=ye}for(U=f(_e(q.e,0),12),p=new xy(U.a),v=new qn(q.i),dn(v,j.i),m=Jt(p,0),Cg(m,v),ue=S2(U.a),S=new qn(q.i),dn(S,j.i),mr(ue,S,ue.c.b,ue.c),be=f(z(j,sw),9),Ne=f(_e(be.f,0),7),h=f(Vn(Y.b,ve(Xi,qi,12,0,0,1)),47),i=0,l=h.length;i<l;++i)t=h[i],kn(t,Ne),C2(t.a,t.a.b,p);for(h=f(Vn(V.e,ve(Xi,qi,12,V.e.c.length,0,1)),47),n=0,s=h.length;n<s;++n)t=h[n],Bn(t,Ne),C2(t.a,0,ue);Bn(U,null),kn(U,null),te.c[te.c.length]=j}for(I=new M(te);I.a<I.c.c.length;)j=f(O(I),9),Ar(j,null)}function lfe(){function e(){this.obj=this.createObject()}return e.prototype.createObject=function(t){return Object.create(null)},e.prototype.get=function(t){return this.obj[t]},e.prototype.set=function(t,n){this.obj[t]=n},e.prototype[Dk]=function(t){delete this.obj[t]},e.prototype.keys=function(){return Object.getOwnPropertyNames(this.obj)},e.prototype.entries=function(){var t=this.keys(),n=this,i=0;return{next:function(){if(i>=t.length)return{done:!0};var s=t[i++];return{value:[s,n.get(s)],done:!1}}}},ice()||(e.prototype.createObject=function(){return{}},e.prototype.get=function(t){return this.obj[":"+t]},e.prototype.set=function(t,n){this.obj[":"+t]=n},e.prototype[Dk]=function(t){delete this.obj[":"+t]},e.prototype.keys=function(){var t=[];for(var n in this.obj)n.charCodeAt(0)==58&&t.push(n.substring(1));return t}),e}function Wz(e,t,n){var i,s,l,h,v,p,m,S,x,L,j,I,R,Y,q,V,U,te;if(S=new nC,ce(S,ZT,t),un(e.e,t,S),ce(S,(le(),Cl),n),e.d&&nB(e.d,S,!1),op(t,S),Ck in t.a&&(Y=S.a,q=f(Mn(t,Ck),69),R=f(Mn(q,"left"),104),R&&(Y.b=R.a),U=f(Mn(q,"top"),104),U&&(Y.d=U.a),V=f(Mn(q,"right"),104),V&&(Y.c=V.a),s=f(Mn(q,nT),104),s&&(Y.a=s.a)),x=(i=f(Gi(f6),11),new ri(i,f(Ti(i,i.length),11),0)),ce(S,Vr,x),e.g==null&&(e.g=Nt(z(S,(x3(),iL)))),Xd in t.a){if(te=Mn(t,Xd),!te.hc())throw new ps("The 'children' property of nodes must be an array.",te,t);if(m=te.hc(),m.a.length>0){for(n&&ce(n,Sl,S),v=ve(Er,Ii,9,m.a.length,0,1),j=0;j<m.a.length;++j){if(p=Uu(m,j),!p.kc())throw new ps("A 'children' array contains a non-object node element.",p,t);l=Dle(e,p.kc(),S),v[j]=l}for(L=0;L<m.a.length;++L)I=Uu(m,L).kc(),h=v[L],Xd in I.a&&!Pt(ge(Nt(z(h,(Ee(),yb)))))&&Wz(e,I,h)}}return S}function ffe(e,t){var n,i,s,l,h,v,p,m,S,x,L,j,I,R;if(Bc(new M(tc(e.e)))){for(v=new M(tc(e.e));v.a<v.c.c.length;)switch(h=f(O(v),161),m=f(h.e,7).g.e,++e.o[m],f(h.e,7).g.e){case 4:case 2:e.n[m]+=h.e.j.b+(t?(i=f(h.e,7).d,new Vo(i.d,i.b,i.a,i.c)).a+(s=f(h.e,7).d,new Vo(s.d,s.b,s.a,s.c)).d:0);break;case 1:case 3:e.n[m]+=h.e.j.a+(t?(l=f(h.e,7).d,new Vo(l.d,l.b,l.a,l.c)).b+(n=f(h.e,7).d,new Vo(n.d,n.b,n.a,n.c)).c:0)}for(p=f(nr(e.e,(Ee(),Wk)),100),p=p==(ec(),df)?Ds:p,e.g[1]=f(nr(e.e,Kk),100),e.g[3]=f(nr(e.e,Zk),100),e.g[4]=f(nr(e.e,Xk),100),e.g[2]=f(nr(e.e,Uk),100),x=(we(),re(ie(Mr,1),De,32,0,[fr,rt,Be,ct,qe])),j=0,R=x.length;j<R;++j)m=x[j],e.g[m.e]=e.g[m.e]==df?p:e.g[m.e];for(e.b=nr(e.e,bb)!=null,S=re(ie(Mr,1),De,32,0,[fr,rt,Be,ct,qe]),L=0,I=S.length;L<I;++L)m=S[L],e.o[m.e]==1?e.i[m.e]=2:!e.b&&e.g[m.e]==Ds?e.i[m.e]=e.o[m.e]+1:e.i[m.e]=e.o[m.e]-1}}function hfe(e,t,n,i,s,l){var h,v,p,m,S,x,L,j,I,R,Y,q,V,U,te,ue;if(p=f(e.a,16),R=f(e.b,16),m=f(t.a,18),Y=f(t.b,18),p)for(x=new M(p.a);x.a<x.c.c.length;)for(S=f(O(x),9),U=Jn(S,(we(),Be)).mb();U.G();)for(V=f(U.H(),7),m.ib(V),v=new M(V.e);v.a<v.c.c.length;)h=f(O(v),12),!Zc(h)&&(n.c[n.c.length]=h,CR(h,i),q=h.c.f.g,(q==(et(),Hn)||q==er)&&(s.c[s.c.length]=h),ue=h.d,te=ue.f.d,te==R?Y.ib(ue):te==p?m.ib(ue):Tr(n,h));if(R)for(x=new M(R.a);x.a<x.c.c.length;){for(S=f(O(x),9),I=new M(S.f);I.a<I.c.c.length;)for(j=f(O(I),7),v=new M(j.e);v.a<v.c.c.length;)h=f(O(v),12),Zc(h)&&(L=l.a.db(h,l),L==null);for(U=Jn(S,(we(),qe)).mb();U.G();)for(V=f(U.H(),7),Y.ib(V),v=new M(V.e);v.a<v.c.c.length;)h=f(O(v),12),!Zc(h)&&(n.c[n.c.length]=h,CR(h,i),q=h.c.f.g,(q==(et(),Hn)||q==er)&&(s.c[s.c.length]=h),ue=h.d,te=ue.f.d,te==R?Y.ib(ue):te==p?m.ib(ue):Tr(n,h))}}function dfe(e,t,n){var i,s,l,h,v,p,m,S,x,L,j,I,R,Y,q,V,U,te,ue,ye,Ce,be;for(U=t.c.length,s=new al(e.b,n,null,null),be=ve(Qi,mi,26,U,12,1),R=ve(Qi,mi,26,U,12,1),I=ve(Qi,mi,26,U,12,1),Y=0,v=0;v<U;v++)R[v]=kr,I[v]=qs;for(p=0;p<U;p++)for(i=(Sn(p,t.c.length),f(t.c[p],81)),be[p]=nk(i),be[Y]>be[p]&&(Y=p),x=new M(e.b.c);x.a<x.c.c.length;)for(S=f(O(x),16),V=new M(S.a);V.a<V.c.c.length;)q=f(O(V),9),ye=ge(i.n[q.k])+ge(i.d[q.k]),R[p]=R[p]<ye?R[p]:ye,I[p]=je(I[p],ye+q.j.b);for(Ce=ve(Qi,mi,26,U,12,1),m=0;m<U;m++)(Sn(m,t.c.length),f(t.c[m],81)).k==(fo(),Su)?Ce[m]=R[Y]-R[m]:Ce[m]=I[Y]-I[m];for(l=ve(Qi,mi,26,U,12,1),j=new M(e.b.c);j.a<j.c.c.length;)for(L=f(O(j),16),ue=new M(L.a);ue.a<ue.c.c.length;){for(te=f(O(ue),9),h=0;h<U;h++)l[h]=ge((Sn(h,t.c.length),f(t.c[h],81)).n[te.k])+ge((Sn(h,t.c.length),f(t.c[h],81)).d[te.k])+Ce[h];vne(l),s.n[te.k]=(l[1]+l[2])/2,s.d[te.k]=0}return s}function hk(e,t,n,i,s,l){var h,v,p,m,S,x,L,j,I,R,Y,q,V,U,te,ue;for(R=null,n==(Vc(),Xs)?R=e:n==wf&&(R=t),q=(L=new Wt(R.a).a.bb().mb(),new Zt(L));q.a.G();){for(Y=(S=f(q.a.H(),21),f(S.yb(),7)),V=ln(re(ie(_t,1),Ht,10,0,[Y.f.i,Y.i,Y.a])).b,ue=new Yr,h=new Yr,p=Dt(Ca((gr(),new Qn(lr(re(ie(Ze,1),Me,1,4,[Y.b,Y.e]))))));xt(p);)if(v=f(Et(p),12),Pt(ge(Nt(z(v,(le(),Js)))))==i&&ji(s,v,0)!=-1){if(v.d==Y?U=v.c:U=v.d,te=ln(re(ie(_t,1),Ht,10,0,[U.f.i,U.i,U.a])).b,(te-V<=0?0-(te-V):te-V)<.2)continue;te<V?e.a.R(U)?vn(ue,new wr(Xs,v)):vn(ue,new wr(wf,v)):e.a.R(U)?vn(h,new wr(Xs,v)):vn(h,new wr(wf,v))}if(ue.a.Y()>1)for(Le(l,new Ix(Y,ue,n)),I=(x=new Wt(ue.a).a.bb().mb(),new Zt(x));I.a.G();)j=(m=f(I.a.H(),21),f(m.yb(),27)),Tr(s,j.b);if(h.a.Y()>1)for(Le(l,new Ix(Y,h,n)),I=(x=new Wt(h.a).a.bb().mb(),new Zt(x));I.a.G();)j=(m=f(I.a.H(),21),f(m.yb(),27)),Tr(s,j.b)}}function vfe(e){var t,n,i,s,l,h,v,p,m,S,x,L,j,I,R,Y,q,V,U,te,ue,ye,Ce;for(s=0,V=0,q=(On(),new $t),i=new $t,l=new $t,Ce=new $t,nfe(e,l,Ce),t=null,Y=0,ye=0,U=!0,p=!0,L=0,I=e.length;L<I;++L){for(S=e[L],ue=new M(S.f);ue.a<ue.c.c.length;)switch(te=f(O(ue),7),te.g.e){case 2:s+=FB(te,l);break;case 4:s+=FB(te,Ce)}if(R=S.g,p&&(R==(et(),Hn)||R==er)){if(m=f(z(S,(le(),El)),9),!m){p=!1;continue}t!=m&&(t&&un(q,t,new wr(gt(Y),gt(ye))),t=m,Y=0,ye=0,U=!0),S==t&&(U=!1),U?(Y+=f(z(S,lv),24).a,un(i,S,gt(Y))):(ye+=f(z(S,lv),24).a,un(i,S,gt(ye)))}}if(t&&un(q,t,new wr(gt(Y),gt(ye))),p)for(v=null,h=0,n=0,U=!0,x=0,j=e.length;x<j;++x)switch(S=e[x],R=S.g,R.e){case 0:h=f(li(fi(i.d,S)),24).a,n=f(f(li(fi(q.d,S)),27).b,24).a,v=S,U=!1;break;case 3:h=f(li(fi(i.d,S)),24).a,m=f(z(S,(le(),El)),9),m!=v&&(n=f(f(li(fi(q.d,m)),27).a,24).a,v=m,U=!0);break;default:V+=U?h:n-h}return s+V}function gfe(e){var t,n,i,s,l,h,v,p,m,S,x,L,j,I,R,Y,q,V,U;for(x=(On(),new $t),m=new cg,i=new M(e.a.a.b);i.a<i.c.c.length;)if(t=f(O(i),25),xe(t,93))S=f(t,93).b,ra(x.d,S,t);else if(xe(t,82))for(l=(I=new Wt(f(t,82).d.a).a.bb().mb(),new Zt(I));l.a.G();)s=(h=f(l.a.H(),21),f(h.yb(),12)),pt(m,s,t);for(n=new M(e.a.a.b);n.a<n.c.c.length;)if(t=f(O(n),25),xe(t,93)){for(S=f(t,93).b,p=Dt(En(S));xt(p);)if(v=f(Et(p),12),!Zc(v)&&(Y=v.c,U=v.d,!((we(),ns).kb(v.c.g)&&ns.kb(v.d.g)))){if(q=f(Kt(x,v.d.f),25),Sh(Kf(Xf(Qf(Zf(new Ol,0),100),e.c[t.f.d]),e.c[q.f.d])),Y.g==qe&&cM((fa(),Y))){for(j=f(Ia(m,v),18).mb();j.G();)if(L=f(j.H(),25),L.j.d<t.j.d){if(R=e.c[L.f.d],V=e.c[t.f.d],R==V)continue;Sh(Kf(Xf(Qf(Zf(new Ol,1),100),R),V))}}if(U.g==Be&&uM((fa(),U))){for(j=f(Ia(m,v),18).mb();j.G();)if(L=f(j.H(),25),L.j.d>t.j.d){if(R=e.c[t.f.d],V=e.c[L.f.d],R==V)continue;Sh(Kf(Xf(Qf(Zf(new Ol,1),100),R),V))}}}}}function Uz(e,t){var n,i,s,l,h,v,p,m,S,x,L,j,I;switch(h=new IM(e),v=Wc(Lo(t,h)),Fa(v,new L1),s=e.b,s.c){case 2:p=new ld(s.a),n=Ld(Lo(v,p)),Ku(n)?m=f(Xl(n),91).b:m=15,p=new ld(AC(s)),n=Ld(Lo(v,p)),Ku(n)?l=f(Xl(n),91).b:l=15,p=new ld(s.b),n=Ld(Lo(v,p)),Ku(n)?S=f(Xl(n),91).b:S=15,i=bue(e,m,l,S),vn(t,new Fd(i,e.c,e.e,e.a.c.f,s.a)),vn(t,new Fd(i,e.c,e.e,e.a.c.f,AC(s))),vn(t,new Fd(i,e.c,e.e,e.a.c.f,s.b));break;case 1:p=new ld(s.a),n=Ld(Lo(v,p)),Ku(n)?m=f(Xl(n),91).b:m=15,p=new ld(s.b),n=Ld(Lo(v,p)),Ku(n)?S=f(Xl(n),91).b:S=15,i=cue(e,m,S),vn(t,new Fd(i,e.c,e.e,e.a.c.f,s.a)),vn(t,new Fd(i,e.c,e.e,e.a.c.f,s.b));break;case 0:p=new ld(s.a),n=Ld(Lo(v,p)),Ku(n)?m=f(Xl(n),91).b:m=15,i=(x=e.b,L=pce(e.a.c,e.a.d,m),na(e.a.a,B2(L)),j=KC(e.a.b,L.a,x),I=new jg((!L.k&&(L.k=new W2(p2(L))),L.k)),T3(I),j?y3(I,j):I),vn(t,new Fd(i,e.c,e.e,e.a.c.f,s.a));break;default:throw new nn("The loopside must be defined.")}return i}function bfe(e,t,n){var i,s,l,h,v,p,m,S,x,L,j,I,R,Y,q,V,U,te,ue;for(v=new M(e.a.c);v.a<v.c.c.length;)for(l=f(O(v),16),U=new M(l.a);U.a<U.c.c.length;)V=f(O(U),9),t.f[V.k]=V,t.a[V.k]=V,t.d[V.k]=0;for(p=e.a.c,t.c==(Do(),js)&&(p=xe(p,87)?Nd(f(p,87)):xe(p,88)?f(p,88).a:xe(p,63)?new ng(p):new md(p)),h=p.mb();h.G();)for(l=f(h.H(),16),j=-1,L=l.a,t.k==(fo(),Xa)&&(j=kr,L=xe(L,87)?Nd(f(L,87)):xe(L,88)?f(L,88).a:xe(L,63)?new ng(L):new md(L)),ue=L.mb();ue.G();)if(te=f(ue.H(),9),t.c==js?x=f(_e(e.b.f,te.k),20):x=f(_e(e.b.b,te.k),20),x.Y()>0)if(i=x.Y(),m=Xn(Math.floor((i+1)/2))-1,s=Xn(Math.ceil((i+1)/2))-1,t.k==Xa)for(S=s;S>=m;S--)t.a[te.k]==te&&(R=f(x.sb(S),27),I=f(R.a,9),!Oc(n,R.b)&&j>e.b.e[I.k]&&(t.a[I.k]=te,t.f[te.k]=t.f[I.k],t.a[te.k]=t.f[te.k],j=e.b.e[I.k]));else for(S=m;S<=s;S++)t.a[te.k]==te&&(q=f(x.sb(S),27),Y=f(q.a,9),!Oc(n,q.b)&&j<e.b.e[Y.k]&&(t.a[Y.k]=te,t.f[te.k]=t.f[Y.k],t.a[te.k]=t.f[te.k],j=e.b.e[Y.k]))}function wi(){wi=c,Ns=new ms("N",0,(we(),rt),rt,0),vc=new ms("EN",1,Be,rt,1),Cu=new ms("E",2,Be,Be,0),xu=new ms("SE",3,ct,Be,1),as=new ms("S",4,ct,ct,0),pc=new ms("WS",5,qe,ct,1),bc=new ms("W",6,qe,qe,0),Ro=new ms("NW",7,rt,qe,1),is=new ms("ENW",8,Be,qe,2),gc=new ms("ESW",9,Be,qe,2),Tu=new ms("SEN",10,ct,rt,2),kl=new ms("SWN",11,ct,rt,2),pf=new ms(sf,12,fr,fr,3),E$=goe(Ns,vc,Cu,xu,as,pc,re(ie(ov,1),De,60,0,[bc,Ro,is,gc,Tu,kl])),C$=(Ta(),ol(re(ie(Ze,1),Me,1,4,[Ns,Cu,as,bc]))),S$=ol(re(ie(Ze,1),Me,1,4,[vc,xu,pc,Ro])),D$=new Gu(rt),T$=ol(re(ie(Ze,1),Me,1,4,[Be,rt])),x$=new Gu(Be),I$=ol(re(ie(Ze,1),Me,1,4,[ct,Be])),N$=new Gu(ct),B$=ol(re(ie(Ze,1),Me,1,4,[qe,ct])),R$=new Gu(qe),j$=ol(re(ie(Ze,1),Me,1,4,[rt,qe])),L$=ol(re(ie(Ze,1),Me,1,4,[Be,rt,qe])),P$=ol(re(ie(Ze,1),Me,1,4,[Be,ct,qe])),O$=ol(re(ie(Ze,1),Me,1,4,[ct,qe,rt])),M$=ol(re(ie(Ze,1),Me,1,4,[ct,Be,rt])),A$=(lh(),ev)}function Kz(e,t){var n,i,s,l,h,v,p,m,S,x,L,j,I,R,Y,q,V,U,te;if(V=0,t.e.a==0)for(Y=new M(e);Y.a<Y.c.c.length;)I=f(O(Y),9),V=je(V,I.i.a+I.j.a+I.e.c);else V=t.e.a-t.d.a;for(V-=t.d.a,R=new M(e);R.a<R.c.c.length;){switch(I=f(O(R),9),Qv(I.i,V-I.j.a),boe(I),f(z(I,(Ee(),go)),103).e){case 1:ce(I,go,(Zo(),Bp));break;case 2:ce(I,go,(Zo(),Rp))}for(q=I.j,te=new M(I.f);te.a<te.c.c.length;){for(U=f(O(te),7),Qv(U.i,q.a-U.j.a),Qv(U.a,U.j.a),Bt(U,nR(U.g)),h=f(z(U,ku),24),h&&ce(U,ku,gt(-h.a)),l=new M(U.e);l.a<l.c.c.length;){for(s=f(O(l),12),i=Jt(s.a,0);i.b!=i.d.c;)n=f(qt(i),10),n.a=V-n.a;if(m=f(z(s,Un),44),m)for(p=Jt(m,0);p.b!=p.d.c;)v=f(qt(p),10),v.a=V-v.a;for(L=new M(s.b);L.a<L.c.c.length;)S=f(O(L),33),Qv(S.i,V-S.j.a)}for(j=new M(U.c);j.a<j.c.c.length;)S=f(O(j),33),Qv(S.i,-S.j.a)}for(I.g==(et(),Cn)&&(ce(I,(le(),_r),nR(f(z(I,_r),32))),Sse(I)),x=new M(I.c);x.a<x.c.c.length;)S=f(O(x),33),Qv(S.i,q.a-S.j.a)}}function pfe(e,t){var n,i,s,l,h,v,p,m,S,x,L,j,I,R,Y,q,V,U,te;if(V=0,t.e.b==0)for(Y=new M(e);Y.a<Y.c.c.length;)I=f(O(Y),9),V=je(V,I.i.b+I.j.b+I.e.a);else V=t.e.b-t.d.b;for(V-=t.d.b,R=new M(e);R.a<R.c.c.length;){switch(I=f(O(R),9),Jv(I.i,V-I.j.b),poe(I),f(z(I,(Ee(),go)),103).e){case 3:ce(I,go,(Zo(),Op));break;case 4:ce(I,go,(Zo(),zp))}for(q=I.j,te=new M(I.f);te.a<te.c.c.length;){for(U=f(O(te),7),Jv(U.i,q.b-U.j.b),Jv(U.a,U.j.b),Bt(U,rR(U.g)),h=f(z(U,ku),24),h&&ce(U,ku,gt(-h.a)),l=new M(U.e);l.a<l.c.c.length;){for(s=f(O(l),12),i=Jt(s.a,0);i.b!=i.d.c;)n=f(qt(i),10),n.b=V-n.b;if(m=f(z(s,Un),44),m)for(p=Jt(m,0);p.b!=p.d.c;)v=f(qt(p),10),v.b=V-v.b;for(L=new M(s.b);L.a<L.c.c.length;)S=f(O(L),33),Jv(S.i,V-S.j.b)}for(j=new M(U.c);j.a<j.c.c.length;)S=f(O(j),33),Jv(S.i,-S.j.b)}for(I.g==(et(),Cn)&&(ce(I,(le(),_r),rR(f(z(I,_r),32))),_ae(I)),x=new M(I.c);x.a<x.c.c.length;)S=f(O(x),33),Jv(S.i,q.b-S.j.b)}}function wfe(e,t,n){var i,s,l,h,v,p,m,S,x,L,j;if(i=new Ya(t.e.i.a,t.e.i.b,t.e.j.a,t.e.j.b),s=new iy,e.c)for(h=new M(Yg(t));h.a<h.c.c.length;)l=f(O(h),129),s.d=l.e.i.a+t.e.i.a,s.e=l.e.i.b+t.e.i.b,s.c=l.e.j.a,s.b=l.e.j.b,qg(i,s);for(S=new M(tc(t));S.a<S.c.c.length;){if(m=f(O(S),161),x=m.e.i.a+t.e.i.a,L=m.e.i.b+t.e.i.b,e.e&&(s.d=x,s.e=L,s.c=m.e.j.a,s.b=m.e.j.b,qg(i,s)),e.d)for(h=new M(Fg(m));h.a<h.c.c.length;)l=f(O(h),129),s.d=l.e.i.a+x,s.e=l.e.i.b+L,s.c=l.e.j.a,s.b=l.e.j.b,qg(i,s);if(e.b){if(j=new ot(-n,-n),He(nr(t,(Ee(),kb)))===He((bh(),xb)))for(h=new M(Fg(m));h.a<h.c.c.length;)l=f(O(h),129),j.a+=l.e.j.a+n,j.b+=l.e.j.b+n;j.a=je(j.a,0),j.b=je(j.b,0),mz(i,Vue(m),que(m),t,m,j,n)}}e.b&&mz(i,(Qt(),Qt(),yc),yc,t,null,null,n),p=new U4((v=f(t.e,9).e,new Vo(v.d,v.b,v.a,v.c))),p.d=t.e.i.b-i.e,p.a=i.e+i.b-(t.e.i.b+t.e.j.b),p.b=t.e.i.a-i.d,p.c=i.d+i.c-(t.e.i.a+t.e.j.a),f(t.e,9).e.b=p.b,f(t.e,9).e.d=p.d,f(t.e,9).e.c=p.c,f(t.e,9).e.a=p.a}function Zz(){Zz=c,St=new cg,pt(St,(we(),Hp),qr),pt(St,Hh,Ba),pt(St,Hh,qr),pt(St,Rh,Aa),pt(St,Rh,qr),pt(St,Bh,Ra),pt(St,Bh,qr),pt(St,zh,pa),pt(St,zh,qr),pt(St,ns,Eu),pt(St,ns,Ra),pt(St,ns,pa),pt(St,ns,qr),pt(St,Eu,ns),pt(St,Eu,Ba),pt(St,Eu,Aa),pt(St,Eu,qr),pt(St,vf,vf),pt(St,vf,Ra),pt(St,vf,Ba),pt(St,bl,bl),pt(St,bl,Ra),pt(St,bl,Aa),pt(St,pl,pl),pt(St,pl,pa),pt(St,pl,Ba),pt(St,gl,gl),pt(St,gl,pa),pt(St,gl,Aa),pt(St,Ra,Bh),pt(St,Ra,ns),pt(St,Ra,vf),pt(St,Ra,bl),pt(St,Ra,Ra),pt(St,Ra,Ba),pt(St,Ra,Aa),pt(St,Ra,qr),pt(St,pa,zh),pt(St,pa,ns),pt(St,pa,pl),pt(St,pa,gl),pt(St,pa,pa),pt(St,pa,Ba),pt(St,pa,Aa),pt(St,pa,qr),pt(St,Ba,Hh),pt(St,Ba,Eu),pt(St,Ba,vf),pt(St,Ba,pl),pt(St,Ba,Ra),pt(St,Ba,pa),pt(St,Ba,Ba),pt(St,Ba,qr),pt(St,Aa,Rh),pt(St,Aa,Eu),pt(St,Aa,bl),pt(St,Aa,gl),pt(St,Aa,Ra),pt(St,Aa,pa),pt(St,Aa,Aa),pt(St,Aa,qr),pt(St,qr,Hp),pt(St,qr,Hh),pt(St,qr,Rh),pt(St,qr,Bh),pt(St,qr,zh),pt(St,qr,ns),pt(St,qr,Eu),pt(St,qr,Ra),pt(St,qr,pa),pt(St,qr,Ba),pt(St,qr,Aa),pt(St,qr,qr)}function Xz(e,t,n){var i,s,l,h,v,p,m,S,x,L,j,I,R,Y,q;if(n.n[t.k]==null){p=!0,n.n[t.k]=0,h=t,q=n.k==(fo(),Su)?Hr:ki;do s=e.b.e[h.k],l=h.d.a.c.length,v=h.g,n.k==Su&&s>0||n.k==Xa&&s<l-1?(n.k==Xa?m=f(_e(h.d.a,s+1),9):m=f(_e(h.d.a,s-1),9),x=n.f[m.k],S=m.g,Xz(e,x,n),q=e.e.Ic(q,t,h),n.i[t.k]==t&&(n.i[t.k]=n.i[x.k]),n.i[t.k]==n.i[x.k]?(Y=Py(e.d,v,S),n.k==Xa?(i=ge(n.n[t.k]),j=ge(n.n[x.k])+ge(n.d[m.k])-m.e.d-Y-h.e.a-h.j.b-ge(n.d[h.k]),p?(p=!1,n.n[t.k]=j<q?j:q):n.n[t.k]=i<(j<q?j:q)?i:j<q?j:q):(i=ge(n.n[t.k]),j=ge(n.n[x.k])+ge(n.d[m.k])+m.j.b+m.e.a+Y+h.e.d-ge(n.d[h.k]),p?(p=!1,n.n[t.k]=j>q?j:q):n.n[t.k]=i>(j>q?j:q)?i:j>q?j:q)):(Y=e.d.f,R=sR(e,n.i[t.k]),L=sR(e,n.i[x.k]),n.k==Xa?(I=ge(n.n[t.k])+ge(n.d[h.k])+h.j.b+h.e.a+Y-(ge(n.n[x.k])+ge(n.d[m.k])-m.e.d),GO(R,L,I)):(I=ge(n.n[t.k])+ge(n.d[h.k])-h.e.d-ge(n.n[x.k])-ge(n.d[m.k])-m.j.b-m.e.a-Y,GO(R,L,I)))):q=e.e.Ic(q,t,h),h=n.a[h.k];while(h!=t);Aee(e.e,t)}}function mfe(e,t,n,i){var s,l,h,v,p,m,S,x,L,j,I,R,Y,q,V;if(L=!1,x=!1,gs(f(z(i,(Ee(),dt)),28))){h=!1,v=!1;e:for(I=new M(i.f);I.a<I.c.c.length;)for(j=f(O(I),7),Y=Dt(Ca((gr(),new Qn(lr(re(ie(Ze,1),Me,1,4,[new cd(j),new $f(j)]))))));xt(Y);)if(R=f(Et(Y),7),!Pt(ge(Nt(z(R.f,tv))))){if(j.g==(we(),rt)){h=!0;break e}if(j.g==ct){v=!0;break e}}L=v&&!h,x=h&&!v}if(!L&&!x&&i.c.c.length!=0){for(S=0,m=new M(i.c);m.a<m.c.c.length;)p=f(O(m),33),S+=p.i.b+p.j.b/2;S/=i.c.c.length,V=S>=i.j.b/2}else V=!x;V?(q=f(z(i,(le(),hv)),20),q?L?l=q:(s=f(z(i,cv),20),s?q.Y()<=s.Y()?l=q:l=s:(l=new Se,ce(i,cv,l))):(l=new Se,ce(i,hv,l))):(s=f(z(i,(le(),cv)),20),s?x?l=s:(q=f(z(i,hv),20),q?s.Y()<=q.Y()?l=s:l=q:(l=new Se,ce(i,hv,l))):(l=new Se,ce(i,cv,l))),l.ib(e),ce(e,(le(),ow),n),t.d==n?(kn(t,null),n.b.c.length+n.e.c.length==0&&cn(n,null)):(Bn(t,null),n.b.c.length+n.e.c.length==0&&cn(n,null)),Hs(t.a)}function yfe(e,t){var n,i,s,l,h,v,p,m,S,x,L,j,I,R,Y,q,V,U;for(n=new I8(t),n.a||lce(t),m=zue(t),p=new cg,Y=new QB,R=new M(t.b);R.a<R.c.c.length;)for(I=f(O(R),9),s=Dt(En(I));xt(s);)i=f(Et(s),12),(i.c.f.g==(et(),Cn)||i.d.f.g==Cn)&&(S=Ble(e,i,m,Y),pt(p,H2(S.d),S.a));for(h=new Se,U=f(z(n.c,(le(),Ef)),18).mb();U.G();){switch(V=f(U.H(),32),j=Y.c[V.e],L=Y.b[V.e],v=Y.a[V.e],l=null,q=null,V.e){case 4:l=new Ya(e.d.a,j,m.b.a-e.d.a,L-j),q=new Ya(e.d.a,j,v,L-j),lu(m,new ot(l.d+l.c,l.e)),lu(m,new ot(l.d+l.c,l.e+l.b));break;case 2:l=new Ya(m.a.a,j,e.c.a-m.a.a,L-j),q=new Ya(e.c.a-v,j,v,L-j),lu(m,new ot(l.d,l.e)),lu(m,new ot(l.d,l.e+l.b));break;case 1:l=new Ya(j,e.d.b,L-j,m.b.b-e.d.b),q=new Ya(j,e.d.b,L-j,v),lu(m,new ot(l.d,l.e+l.b)),lu(m,new ot(l.d+l.c,l.e+l.b));break;case 3:l=new Ya(j,m.a.b,L-j,e.c.b-m.a.b),q=new Ya(j,e.c.b-v,L-j,v),lu(m,new ot(l.d,l.e)),lu(m,new ot(l.d+l.c,l.e))}l&&(x=new Lj,x.d=V,x.b=l,x.c=q,x.a=k3(f(Ia(p,H2(V)),18)),h.c[h.c.length]=x)}return Tn(n.b,h),n.d=Sae(Sle(m)),n}function kfe(){var e=["\\u0000","\\u0001","\\u0002","\\u0003","\\u0004","\\u0005","\\u0006","\\u0007","\\b","\\t","\\n","\\u000B","\\f","\\r","\\u000E","\\u000F","\\u0010","\\u0011","\\u0012","\\u0013","\\u0014","\\u0015","\\u0016","\\u0017","\\u0018","\\u0019","\\u001A","\\u001B","\\u001C","\\u001D","\\u001E","\\u001F"];return e[34]='\\"',e[92]="\\\\",e[173]="\\u00ad",e[1536]="\\u0600",e[1537]="\\u0601",e[1538]="\\u0602",e[1539]="\\u0603",e[1757]="\\u06dd",e[1807]="\\u070f",e[6068]="\\u17b4",e[6069]="\\u17b5",e[8203]="\\u200b",e[8204]="\\u200c",e[8205]="\\u200d",e[8206]="\\u200e",e[8207]="\\u200f",e[8232]="\\u2028",e[8233]="\\u2029",e[8234]="\\u202a",e[8235]="\\u202b",e[8236]="\\u202c",e[8237]="\\u202d",e[8238]="\\u202e",e[8288]="\\u2060",e[8289]="\\u2061",e[8290]="\\u2062",e[8291]="\\u2063",e[8292]="\\u2064",e[8298]="\\u206a",e[8299]="\\u206b",e[8300]="\\u206c",e[8301]="\\u206d",e[8302]="\\u206e",e[8303]="\\u206f",e[65279]="\\ufeff",e[65529]="\\ufff9",e[65530]="\\ufffa",e[65531]="\\ufffb",e}function Efe(e){var t,n,i,s,l,h,v,p,m,S,x,L,j,I,R,Y,q,V,U,te,ue,ye;for(t=0,q=!0,ye=null,i=0;i<e.length;i++)if(l=e[i],Y=l.g,Y==(et(),Hn))ye=l,q=!1;else if(Y==er){if(xe(z(l,(le(),lt)),12)||(n=f(z(l,lt),9),ye!=n&&(ye=n,q=!0),!gi(f(z(n,(Ee(),dt)),28))))continue;for(L=null,I=null,U=new M(l.f);U.a<U.c.c.length;)V=f(O(U),7),V.b.c.length==0?V.e.c.length==0||(I=f(z(V,lt),7)):L=f(z(V,lt),7);for(s=i+1;s<e.length&&(h=e[s],x=h.g,x!=Hn);s++)if(x==er){if(He(z(h,lt))!==He(n))break;for(v=null,m=null,ue=new M(h.f);ue.a<ue.c.c.length;)te=f(O(ue),7),te.b.c.length==0?te.e.c.length==0||(m=f(z(te,lt),7)):v=f(z(te,lt),7);q?(j=!1,R=!1,I&&v&&I.k<v.k&&(++t,R=!0),L&&m&&L.k>m.k&&(++t,j=!0),I&&m&&I.k>m.k&&(++t,R=!0),L&&v&&L.k<v.k&&(++t,j=!0),j&&R&&L==I&&--t):(p=!1,S=!1,L&&m&&L.k<m.k&&(++t,S=!0),I&&v&&I.k>v.k&&(++t,p=!0),L&&v&&L.k<v.k&&(++t,p=!0),I&&m&&I.k>m.k&&(++t,S=!0),p&&S&&v==m&&--t)}}return t}function Sfe(e){var t,n,i,s,l,h,v,p,m,S,x,L,j,I,R,Y,q,V,U,te,ue,ye,Ce,be,Ne,Ue;for(U=e.a,te=0,ue=U.length;te<ue;++te){for(V=U[te],m=kr,S=kr,I=new M(V.f);I.a<I.c.c.length;)L=f(O(I),9),h=L.d?ji(L.d.a,L,0):-1,h>0?(x=f(_e(L.d.a,h-1),9),be=Eg(e.b,L,x),Y=L.i.b-L.e.d-(x.i.b+x.j.b+x.e.a+be)):Y=L.i.b-L.e.d,m=Y<m?Y:m,h<L.d.a.c.length-1?(x=f(_e(L.d.a,h+1),9),be=Eg(e.b,L,x),q=x.i.b-x.e.d-(L.i.b+L.j.b+L.e.a+be)):q=2*L.i.b,S=q<S?q:S;for(p=kr,l=!1,s=f(_e(V.f,0),9),Ue=new M(s.f);Ue.a<Ue.c.c.length;)for(Ne=f(O(Ue),7),R=s.i.b+Ne.i.b+Ne.a.b,i=new M(Ne.b);i.a<i.c.c.length;)n=f(O(i),12),ye=n.c,t=ye.f.i.b+ye.i.b+ye.a.b-R,(t<=0?0-t:t)<(p<=0?0-p:p)&&(t<=0?0-t:t)<(t<0?m:S)&&(p=t,l=!0);for(v=f(_e(V.f,V.f.c.length-1),9),Ce=new M(v.f);Ce.a<Ce.c.c.length;)for(ye=f(O(Ce),7),R=v.i.b+ye.i.b+ye.a.b,i=new M(ye.e);i.a<i.c.c.length;)n=f(O(i),12),Ne=n.d,t=Ne.f.i.b+Ne.i.b+Ne.a.b-R,(t<=0?0-t:t)<(p<=0?0-p:p)&&(t<=0?0-t:t)<(t<0?m:S)&&(p=t,l=!0);if(l&&p!=0)for(j=new M(V.f);j.a<j.c.c.length;)L=f(O(j),9),L.i.b+=p}}function Cfe(e,t){var n,i,s,l,h,v,p,m,S,x,L,j,I,R,Y,q,V,U,te,ue,ye,Ce,be,Ne,Ue;return x=mce(Or(e,(we(),Hp)),t),I=Qc(Or(e,Bh),t),te=Qc(Or(e,zh),t),be=np(Or(e,Hh),t),L=np(Or(e,Rh),t),V=Qc(Or(e,vf),t),R=Qc(Or(e,bl),t),ye=Qc(Or(e,pl),t),ue=Qc(Or(e,gl),t),Ne=np(Or(e,Eu),t),q=Qc(Or(e,ns),t),U=Qc(Or(e,Ra),t),Ce=Qc(Or(e,pa),t),Ue=np(Or(e,Ba),t),j=np(Or(e,Aa),t),Y=Qc(Or(e,qr),t),n=gh(re(ie(Qi,1),mi,26,12,[V.a,be.a,ye.a,Ue.a])),i=gh(re(ie(Qi,1),mi,26,12,[I.a,x.a,te.a,Y.a])),s=q.a,l=gh(re(ie(Qi,1),mi,26,12,[R.a,L.a,ue.a,j.a])),m=gh(re(ie(Qi,1),mi,26,12,[V.b,I.b,R.b,U.b])),p=gh(re(ie(Qi,1),mi,26,12,[be.b,x.b,L.b,Y.b])),S=Ne.b,v=gh(re(ie(Qi,1),mi,26,12,[ye.b,te.b,ue.b,Ce.b])),ys(Or(e,Hp),n+s,m+S),ys(Or(e,qr),n+s,m+S),ys(Or(e,Bh),n+s,0),ys(Or(e,zh),n+s,m+S+p),ys(Or(e,Hh),0,m+S),ys(Or(e,Rh),n+s+i,m+S),ys(Or(e,bl),n+s+i,0),ys(Or(e,pl),0,m+S+p),ys(Or(e,gl),n+s+i,m+S+p),ys(Or(e,Eu),0,m),ys(Or(e,ns),n,0),ys(Or(e,pa),0,m+S+p),ys(Or(e,Aa),n+s+i,0),h=new Fr,h.a=gh(re(ie(Qi,1),mi,26,12,[n+i+s+l,Ne.a,U.a,Ce.a])),h.b=gh(re(ie(Qi,1),mi,26,12,[m+p+S+v,q.b,Ue.b,j.b])),h}function xfe(e,t){var n,i,s,l,h,v,p,m,S,x,L,j,I,R;if(i=new xi,m=null,I=e.c,j=I.f.g,j!=(et(),Hn)&&j!=er)throw new nn("The target node of the edge must be a normal node or a northSouthPort.");for(j==er&&(L=f(z(I,(le(),lt)),7),m=new ot(ln(re(ie(_t,1),Ht,10,0,[L.f.i,L.i,L.a])).a,ln(re(ie(_t,1),Ht,10,0,[I.f.i,I.i,I.a])).b),I=L),Wm(i,ln(re(ie(_t,1),Ht,10,0,[I.f.i,I.i,I.a]))),h=je(5,l8(I.f,I.g)),x=new Fc(_d(I.g)),x.a*=h,x.b*=h,an(i,dn(x,ln(re(ie(_t,1),Ht,10,0,[I.f.i,I.i,I.a])))),m&&mr(i,m,i.c.b,i.c),l=e,p=e,v=null,n=!1;l;)s=l.a,s.b!=0&&(n?(an(i,Fo(dn(v,(ut(s.b!=0),f(s.a.a.c,10))),.5)),n=!1):n=!0,v=Ga((ut(s.b!=0),f(s.c.b.c,10))),na(i,s),Hs(s)),p=l,l=f(li(fi(t.d,l)),12);R=p.d,R.f.g==er&&(L=f(z(R,(le(),lt)),7),an(i,new ot(ln(re(ie(_t,1),Ht,10,0,[L.f.i,L.i,L.a])).a,ln(re(ie(_t,1),Ht,10,0,[R.f.i,R.i,R.a])).b)),R=L),h=je(5,l8(R.f,R.g)),x=new Fc(_d(R.g)),Fo(x,h),an(i,dn(x,ln(re(ie(_t,1),Ht,10,0,[R.f.i,R.i,R.a])))),Wm(i,ln(re(ie(_t,1),Ht,10,0,[R.f.i,R.i,R.a]))),S=new xx(i),na(e.a,B2(S))}function Tfe(e){var t,n,i,s,l,h,v,p,m,S,x,L,j,I;if(He(z(e.c,(Ee(),dt)))===He((zn(),ts))||He(z(e.c,dt))===He(ii)){for(S=new M(e.c.f);S.a<S.c.c.length;)if(m=f(O(S),7),m.g==(we(),rt)||m.g==ct)return!1}for(i=Dt(En(e.c));xt(i);)if(n=f(Et(i),12),n.c.f==n.d.f)return!1;if(gs(f(z(e.c,dt),28))){for(j=new Se,p=Jn(e.c,(we(),qe)).mb();p.G();)h=f(p.H(),7),Le(j,Ca((gr(),new Qn(lr(re(ie(Ze,1),Me,1,4,[h.b,h.e]))))));for(I=(vt(j),new nh(j)),j=new Se,v=Jn(e.c,Be).mb();v.G();)h=f(v.H(),7),Le(j,Ca((gr(),new Qn(lr(re(ie(Ze,1),Me,1,4,[h.b,h.e]))))));t=(vt(j),new nh(j))}else I=Dr(e.c),t=En(e.c);return l=!Lg(En(e.c)),s=!Lg(Dr(e.c)),!l&&!s?!1:l?s?s2((_n(),new Go($o(bs(I.a,new T)))))==1&&(x=(vt(I),f(BC(new Go($o(bs(I.a,new T)))),12)).c.f,x.g==(et(),hn)&&f(z(x,(le(),Oi)),7).f!=e.c)?(e.e=2,!0):s2(new Go($o(bs(t.a,new T))))==1&&(L=(vt(t),f(BC(new Go($o(bs(t.a,new T)))),12)).d.f,L.g==(et(),hn)&&f(z(L,(le(),Si)),7).f!=e.c)?(e.e=3,!0):!1:(e.e=0,!0):(e.e=1,!0)}function Lfe(e,t,n){var i,s,l,h,v,p,m,S,x,L,j,I,R,Y,q;if(i=new Se,s=kr,l=kr,h=kr,n)for(s=e.e.a,R=new M(t.f);R.a<R.c.c.length;)for(I=f(O(R),7),p=new M(I.e);p.a<p.c.c.length;)v=f(O(p),12),v.a.b!=0&&(S=f(ky(v.a),10),S.a<s&&(l=s-S.a,h=kr,i.c=ve(Ze,Me,1,0,4,1),s=S.a),S.a<=s&&(i.c[i.c.length]=v,v.a.b>1&&(h=Xt(h,ni(f(Hd(v.a,1),10).b-S.b)))));else for(R=new M(t.f);R.a<R.c.c.length;)for(I=f(O(R),7),p=new M(I.b);p.a<p.c.c.length;)v=f(O(p),12),v.a.b!=0&&(L=f(o0(v.a),10),L.a>s&&(l=L.a-s,h=kr,i.c=ve(Ze,Me,1,0,4,1),s=L.a),L.a>=s&&(i.c[i.c.length]=v,v.a.b>1&&(h=Xt(h,ni(f(Hd(v.a,v.a.b-2),10).b-L.b)))));if(i.c.length!=0&&l>t.j.a/2&&h>t.j.b/2){for(j=new Yn,cn(j,t),Bt(j,(we(),rt)),j.i.a=t.j.a/2,q=new Yn,cn(q,t),Bt(q,ct),q.i.a=t.j.a/2,q.i.b=t.j.b,p=new M(i);p.a<p.c.c.length;)v=f(O(p),12),n?(m=f(e3(v.a),10),Y=v.a.b==0?Di(v.d):f(ky(v.a),10),Y.b>=m.b?Bn(v,q):Bn(v,j)):(m=f(ine(v.a),10),Y=v.a.b==0?Di(v.c):f(o0(v.a),10),Y.b>=m.b?kn(v,q):kn(v,j)),x=f(z(v,(Ee(),Un)),44),x&&Hg(x,m,!0);t.i.a=s-t.j.a/2}}function Pfe(e,t){var n,i,s,l,h,v,p,m,S,x,L,j,I,R,Y,q,V,U;for(q=new Se,V=new Se,U=new Se,l=new M(t);l.a<l.c.c.length;)s=f(O(l),75),s.k>50?q.c[q.c.length]=s:s.k>0?V.c[V.c.length]=s:U.c[U.c.length]=s;if(V.c.length==1&&q.c.length==0&&(Tn(q,V),V.c=ve(Ze,Me,1,0,4,1)),q.c.length!=0&&qo(dy(e.a),(wi(),Ns))&&qo(dy(e.a),(wi(),as))?Uae(e,q):Tn(V,q),V.c.length==0||Kae(e,V),U.c.length!=0){if(n=vy(e.a),n.c!=0)for(S=new M(U),p=(vt(n),G4(new EI(n).a));S.a<S.c.c.length;){for(s=f(O(S),75);S.a<S.c.c.length&&s.a.a.Y()<2;)s=f(O(S),75);s.a.a.Y()>1&&(R=f(eC(p),60),$d(s,R,!0),Dd(S),TO(e.a,R))}for(L=U.c.length,i=oce(e),j=new Se,h=L/L4(e.a).c|0,v=0;v<h;v++)Tn(j,L4(e.a));switch(I=L%L4(e.a).c,I>3&&(Tn(j,(wi(),wi(),S$)),I-=4),I){case 3:Le(j,Xg(i));case 2:Y=vp(Xg(i));do Y=vp(Y);while(!qo(dy(e.a),Y));j.c[j.c.length]=Y,Y=vx(Xg(i));do Y=vx(Y);while(!qo(dy(e.a),Y));j.c[j.c.length]=Y;break;case 1:Le(j,Xg(i))}for(x=new M(j),m=new M(U);x.a<x.c.c.length&&m.a<m.c.c.length;)$d(f(O(m),75),f(O(x),60),!0)}}function Dfe(e,t){var n,i,s,l,h,v,p,m,S,x,L,j,I,R,Y,q,V,U,te,ue,ye;for(S=t.c.c.length,e.a=ve(Er,Nr,51,S,0,2),e.b=ve(Er,Nr,51,S,0,2),e.k=ve(Er,Nr,51,S,0,2),p=ve(Kn,Wn,26,S,12,1),h=ve(Fb,lb,26,S,13,1),e.c=ve(Fb,lb,26,S,13,1),e.d=ve(Fb,lb,26,S,13,1),q=0,ue=0,L=new fn(t.c,0);L.b<L.d.Y();)for(m=(ut(L.b<L.d.Y()),f(L.d.sb(L.c=L.b++),16)),x=L.b-1,j=m.a.c.length,e.a[x]=ve(Er,Ii,9,j,0,1),e.k[x]=ve(Er,Ii,9,j,0,1),e.b[x]=ve(Er,Ii,9,j,0,1),p[x]=0,h[x]=!1,V=new fn(m.a,0);V.b<V.d.Y();){for(Y=(ut(V.b<V.d.Y()),f(V.d.sb(V.c=V.b++),9)),e.b[x][V.b-1]=Y,Y.k=q++,I=f(z(Y,(le(),El)),9),I&&uk(e.g,I,Y,null),te=new M(Y.f);te.a<te.c.c.length;){for(U=f(O(te),7),U.k=ue++,l=new M(U.e);l.a<l.c.c.length;)s=f(O(l),12),s.d.f.d==m&&++p[x];U.g==(we(),Be)?U.e.c.length+U.b.c.length>1&&(e.c[x]=!0):U.g==qe&&U.e.c.length+U.b.c.length>1&&(e.d[x]=!0)}Y.g==(et(),er)&&(++p[x],h[x]=!0)}for(n=!0,R=!0,v=0;v<e.d.length-1;v++)i=e.c[v]||e.d[v+1],n=n&i,R=R&!i;e.j=ve(gw,xp,26,ue,12,1),ye=ve(Kn,Wn,26,ue,12,1),n||(e.i=new HM(p,h,ye),e.f=e.i),R||(e.e=new _M(p,h,ye),e.f=e.e)}function Qz(e,t,n){var i,s,l,h,v,p,m,S,x,L,j,I,R,Y,q,V,U,te,ue,ye,Ce,be;for(e.d=new ot(ki,ki),e.c=new ot(Hr,Hr),L=t.mb();L.G();)for(S=f(L.H(),55),U=new M(S.b);U.a<U.c.c.length;)V=f(O(U),9),e.d.a=Xt(e.d.a,V.i.a-V.e.b),e.d.b=Xt(e.d.b,V.i.b-V.e.d),e.c.a=je(e.c.a,V.i.a+V.j.a+V.e.c),e.c.b=je(e.c.b,V.i.b+V.j.b+V.e.a);for(v=new yj,x=t.mb();x.G();)S=f(x.H(),55),i=yfe(e,S),Le(v.a,i),i.a=i.a|!f(z(i.c,(le(),Ef)),18).V();for(e.b=(E2(),be=new ae,be.f=new pR(n),be.b=Tle(be.f,v),be),Ele((I=e.b,new f0,I)),e.e=new Fr,e.a=e.b.f.e,h=new M(v.a);h.a<h.c.c.length;)for(s=f(O(h),347),te=Fne(e.b,s),sce(s.c,te.a,te.b),Y=new M(s.c.b);Y.a<Y.c.c.length;)R=f(O(Y),9),R.g==(et(),Cn)&&(q=nx(e,R.i,f(z(R,(le(),_r)),32)),dn(zs(R.i),q));for(l=new M(v.a);l.a<l.c.c.length;)for(s=f(O(l),347),m=new M(Yae(s));m.a<m.c.c.length;)for(p=f(O(m),12),Ce=new xy(p.a),s0(Ce,0,Di(p.c)),an(Ce,Di(p.d)),j=null,ye=Jt(Ce,0);ye.b!=ye.d.c;){if(ue=f(qt(ye),10),!j){j=ue;continue}MA(j.a,ue.a)?(e.e.a=Xt(e.e.a,j.a),e.a.a=je(e.a.a,j.a)):MA(j.b,ue.b)&&(e.e.b=Xt(e.e.b,j.b),e.a.b=je(e.a.b,j.b)),j=ue}yy(e.e),dn(e.a,e.e)}function Jz(e,t,n,i,s){var l,h,v,p,m,S,x,L,j,I,R,Y,q,V,U,te,ue,ye,Ce,be,Ne,Ue,Xe;for(R=new Ni(t.b),te=new Ni(t.b),L=new Ni(t.b),be=new Ni(t.b),Y=new Ni(t.b),Ce=Jt(t,0);Ce.b!=Ce.d.c;)for(ue=f(qt(Ce),7),v=new M(ue.e);v.a<v.c.c.length;)if(l=f(O(v),12),l.c.f==l.d.f){if(ue.g==l.d.g){be.c[be.c.length]=l;continue}else if(ue.g==(we(),rt)&&l.d.g==ct){Y.c[Y.c.length]=l;continue}}for(p=new M(Y);p.a<p.c.c.length;)l=f(O(p),12),yce(e,l,n,i,(we(),Be));for(h=new M(be);h.a<h.c.c.length;)l=f(O(h),12),Ne=new Va(e),_a(Ne,(et(),er)),ce(Ne,(Ee(),dt),(zn(),ii)),ce(Ne,(le(),lt),l),Ue=new Yn,ce(Ue,lt,l.d),Bt(Ue,(we(),qe)),cn(Ue,Ne),Xe=new Yn,ce(Xe,lt,l.c),Bt(Xe,Be),cn(Xe,Ne),ce(l.c,Is,Ne),ce(l.d,Is,Ne),Bn(l,null),kn(l,null),n.c[n.c.length]=Ne,ce(Ne,lv,gt(2));for(ye=Jt(t,0);ye.b!=ye.d.c;)ue=f(qt(ye),7),m=ue.b.c.length>0,q=ue.e.c.length>0,m&&q?L.c[L.c.length]=ue:m?R.c[R.c.length]=ue:q&&(te.c[te.c.length]=ue);for(I=new M(R);I.a<I.c.c.length;)j=f(O(I),7),Le(s,jx(e,j,null,n));for(U=new M(te);U.a<U.c.c.length;)V=f(O(U),7),Le(s,jx(e,null,V,n));for(x=new M(L);x.a<x.c.c.length;)S=f(O(x),7),Le(s,jx(e,S,S,n))}function eH(e,t){var n,i,s,l,h,v,p,m,S,x,L,j,I,R,Y,q,V,U,te,ue,ye,Ce;for(te=new qn(t.d),p=new Se,U=new M(t.b);U.a<U.c.c.length;)if(q=f(O(U),9),j=f(Kt(e.j,q),69),j){for(gp(e,q,j,te),ye=new M(q.f);ye.a<ye.c.c.length;)if(ue=f(O(ye),7),I=f(Kt(e.n,ue),69),I&&(gp(e,ue,I,uE),Hee(I,(Ee(),Eb),new $c(Fte(ue.g)))),He(z(q,(Ee(),kb)))!==He((bh(),Jk)))for(Y=new M(ue.c);Y.a<Y.c.c.length;)R=f(O(Y),33),L=f(Kt(e.f,R),69),gp(e,R,L,uE);if(f(z(q,(Ee(),ia)),86).Y()!=0)for(Y=new M(q.c);Y.a<Y.c.c.length;)R=f(O(Y),33),L=f(Kt(e.f,R),69),gp(e,R,L,uE);for(v=Dt(En(q));xt(v);)l=f(Et(v),12),wh(l.d.f,q)||(p.c[p.c.length]=l)}if(Ce=f(z(t,(le(),Cl)),9),Ce)for(v=Dt(En(Ce));xt(v);)l=f(Et(v),12),wh(l.d.f,Ce)&&(p.c[p.c.length]=l);for(h=new M(p);h.a<h.c.c.length;)for(l=f(O(h),12),x=f(Kt(e.b,l),69),Zle(e,l,x,te),Y=new M(l.b);Y.a<Y.c.c.length;)R=f(O(Y),33),L=f(Kt(e.f,R),69),gp(e,R,L,te);for(n=(i=f(z(t,ss),15).a,new ot(t.e.a+t.a.b+t.a.c+2*i,t.e.b+t.a.d+t.a.a+2*i)),S=f(z(t,Cl),9),S&&(S.j.a=n.a,S.j.b=n.b),m=f(z(t,ZT),69),qa(e,m,Ek,n.a),qa(e,m,Sk,n.b),V=new M(t.b);V.a<V.c.c.length;)q=f(O(V),9),s=f(z(q,Sl),55),s&&eH(e,s)}function jfe(e,t){var n,i,s,l,h,v,p,m,S,x,L,j,I,R,Y,q,V,U,te,ue,ye,Ce,be,Ne,Ue,Xe,it,st;for(Xe=new Ur,be=new Ur,q=-1,p=new M(e);p.a<p.c.c.length;){for(h=f(O(p),77),h.i=q--,x=0,ue=0,l=new M(h.j);l.a<l.c.c.length;)i=f(O(l),117),ue+=i.c;for(s=new M(h.d);s.a<s.c.c.length;)i=f(O(s),117),x+=i.c;h.e=x,h.k=ue,ue==0?mr(be,h,be.c.b,be.c):x==0&&mr(Xe,h,Xe.c.b,Xe.c)}for(st=new Ry((Yo(),e)),L=e.c.length,Y=L+1,V=L-1,I=new Se;st.a.Y()!=0;){for(;be.b!=0;)Ce=(ut(be.b!=0),f(_s(be,be.a.a),77)),st.a.eb(Ce)!=null,Ce.i=V--,dx(Ce,Xe,be);for(;Xe.b!=0;)Ne=(ut(Xe.b!=0),f(_s(Xe,Xe.a.a),77)),st.a.eb(Ne)!=null,Ne.i=Y++,dx(Ne,Xe,be);for(R=qs,m=(U=new Wt(st.a).a.bb().mb(),new Zt(U));m.a.G();)h=(S=f(m.a.H(),21),f(S.yb(),77)),te=h.k-h.e,te>=R&&(te>R&&(I.c=ve(Ze,Me,1,0,4,1),R=te),I.c[I.c.length]=h);I.c.length!=0&&(j=f(_e(I,RC(t,I.c.length)),77),st.a.eb(j)!=null,j.i=Y++,dx(j,Xe,be),I.c=ve(Ze,Me,1,0,4,1))}for(ye=e.c.length+1,v=new M(e);v.a<v.c.c.length;)h=f(O(v),77),h.i<L&&(h.i+=ye);for(Ue=new M(e);Ue.a<Ue.c.c.length;)for(Ne=f(O(Ue),77),n=new fn(Ne.j,0);n.b<n.d.Y();)i=(ut(n.b<n.d.Y()),f(n.d.sb(n.c=n.b++),117)),it=i.b,Ne.i>it.i&&(Po(n),Tr(it.d,i),i.c>0&&(i.a=it,Le(it.j,i),i.b=Ne,Le(Ne.d,i)))}function Nfe(e){var t,n,i;for(i=new E0(new O1(e.c).a);i0(i.a);)switch(n=(i.b=Kc(i.a),new X1(i.c,i.b)),t=f(n.b.b[n.a.e],62),f(n.a,67).e){case 0:t.d=0,t.e=-(t.b+e.d);break;case 1:t.d=(e.e.e.j.a-t.c)/2,t.e=-(t.b+e.d);break;case 2:t.d=e.e.e.j.a-t.c,t.e=-(t.b+e.d);break;case 3:t.d=0,t.e=e.e.e.j.b+e.d;break;case 4:t.d=(e.e.e.j.a-t.c)/2,t.e=e.e.e.j.b+e.d;break;case 5:t.d=e.e.e.j.a-t.c,t.e=e.e.e.j.b+e.d;break;case 6:t.d=-(t.c+e.d),t.e=0;break;case 7:t.d=-(t.c+e.d),t.e=(e.e.e.j.b-t.b)/2;break;case 8:t.d=-(t.c+e.d),t.e=e.e.e.j.b-t.b;break;case 9:t.d=e.e.e.j.a+e.d,t.e=0;break;case 10:t.d=e.e.e.j.a+e.d,t.e=(e.e.e.j.b-t.b)/2;break;case 11:t.d=e.e.e.j.a+e.d,t.e=e.e.e.j.b-t.b;break;case 12:t.d=e.q.b+e.d,t.e=e.q.d+e.d;break;case 13:t.d=(e.e.e.j.a-t.c)/2,t.e=e.q.d+e.d;break;case 14:t.d=e.e.e.j.a-e.q.c-t.c-e.d,t.e=e.q.d+e.d;break;case 15:t.d=e.q.b+e.d,t.e=(e.e.e.j.b-t.b)/2;break;case 16:t.d=(e.e.e.j.a-t.c)/2,t.e=(e.e.e.j.b-t.b)/2;break;case 17:t.d=e.e.e.j.a-e.q.c-t.c-e.d,t.e=(e.e.e.j.b-t.b)/2;break;case 18:t.d=e.q.b+e.d,t.e=e.e.e.j.b-e.q.a-t.b-e.d;break;case 19:t.d=(e.e.e.j.a-t.c)/2,t.e=e.e.e.j.b-e.q.a-t.b-e.d;break;case 20:t.d=e.e.e.j.a-e.q.c-t.c-e.d,t.e=e.e.e.j.b-e.q.a-t.b-e.d}}function Ife(e,t){var n,i,s,l,h,v,p,m,S,x,L,j,I,R,Y,q,V,U,te,ue,ye,Ce,be,Ne,Ue,Xe,it,st,Tt;for(Xe=new Ur,be=new Ur,I=-1,V=new M(e);V.a<V.c.c.length;){for(Y=f(O(V),80),Y.d=I--,p=0,ue=0,l=new M(Y.e);l.a<l.c.c.length;)i=f(O(l),118),ue+=i.c;for(s=new M(Y.b);s.a<s.c.c.length;)i=f(O(s),118),p+=i.c;Y.c=p,Y.f=ue,ue==0?mr(be,Y,be.c.b,be.c):p==0&&mr(Xe,Y,Xe.c.b,Xe.c)}for(st=(Tt=new n4,dC(Tt,e),Tt),m=e.c.length,R=m-1,j=m+1,x=new Se;st.a.c!=0;){for(;be.b!=0;)Ce=(ut(be.b!=0),f(_s(be,be.a.a),80)),xg(st.a,Ce)!=null,Ce.d=R--,hx(Ce,Xe,be);for(;Xe.b!=0;)Ne=(ut(Xe.b!=0),f(_s(Xe,Xe.a.a),80)),xg(st.a,Ne)!=null,Ne.d=j++,hx(Ne,Xe,be);for(L=qs,U=(v=new kg(new mg(new I1(st.a).a).b),new M1(v));ey(U.a.a);)Y=(h=Cy(U.a),f(h.yb(),80)),te=Y.f-Y.c,te>=L&&(te>L&&(x.c=ve(Ze,Me,1,0,4,1),L=te),x.c[x.c.length]=Y);x.c.length!=0&&(S=f(_e(x,RC(t,x.c.length)),80),xg(st.a,S)!=null,S.d=j++,hx(S,Xe,be),x.c=ve(Ze,Me,1,0,4,1))}for(ye=e.c.length+1,q=new M(e);q.a<q.c.c.length;)Y=f(O(q),80),Y.d<m&&(Y.d+=ye);for(Ue=new M(e);Ue.a<Ue.c.c.length;)for(Ne=f(O(Ue),80),n=new fn(Ne.e,0);n.b<n.d.Y();)i=(ut(n.b<n.d.Y()),f(n.d.sb(n.c=n.b++),118)),it=i.b,Ne.d>it.d&&(Po(n),Tr(it.b,i),i.c>0&&(i.a=it,Le(it.e,i),i.b=Ne,Le(Ne.b,i)))}function Mfe(e){switch(e.e){case 14:return new ft;case 37:return new gn;case 8:return new Uj;case 30:return new Kj;case 38:return new ht;case 3:return new Rt;case 47:case 1:return new Lm((U0(),fL));case 4:return new Lt;case 49:return new yt;case 23:return new pm;case 13:return new Mt;case 34:return new Pn;case 40:return new Vt;case 35:return new ne;case 44:return new jI;case 28:return new Ie;case 39:return new Je;case 27:return new Ye;case 6:return new Fe;case 31:return new tr;case 9:return new p9;case 43:return new Dn;case 17:return new rr;case 18:return new ci;case 29:return new w9;case 11:return new Bu;case 12:return new fs;case 36:return new hs;case 46:case 0:return new Lm((U0(),lL));case 41:return new zo;case 15:return new Ha;case 33:return new au;case 42:return new Nc;case 22:return new Ml;case 19:return new Gt;case 10:return new oa;case 7:return new Ic;case 24:return new ao;case 21:return new Sa;case 16:return new od;case 45:return new Rs;case 26:return new T1;case 20:return new lm;case 25:return new fm;case 5:return new Wv;case 32:return new sd;case 48:case 2:return new Lm((U0(),cL));default:throw new nn("No implementation is available for the layout processor "+(e.d!=null?e.d:""+e.e))}}function Ofe(e){var t,n,i,s,l,h,v;if(n=e.e.e.j,e.b?t=f(nr(e.e,(Ee(),bb)),65):t=new Vo(e.k,e.k,e.k,e.k),s=n.a,(e.b||e.g[1]!=(ec(),Ds))&&(s-=t.b+t.c),l=n.a,(e.b||e.g[3]!=(ec(),Ds))&&(l-=t.b+t.c),h=n.b,(e.b||e.g[4]!=(ec(),Ds))&&(h-=t.d+t.a),i=n.b,(e.b||e.g[2]!=(ec(),Ds))&&(i-=t.d+t.a),Vf(e,(we(),rt))==(ec(),Ds))e.j[1]=(s-Wf(e,rt))/Bm(e,rt),e.f=e.b?t.b+(Uf(e,rt)==1?e.j[1]:0):e.j[1];else switch(e.j[1]=e.k,v=Wf(e,rt)+e.j[1]*(Uf(e,rt)-1),Vf(e,rt).e){case 2:e.f=t.b;break;case 3:e.f=t.b+(s-v)/2;break;case 4:e.f=n.a-v-t.c}if(Vf(e,ct)==Ds)e.j[3]=(l-Wf(e,ct))/Bm(e,ct),e.r=n.a-(e.b?t.c+(Uf(e,ct)==1?e.j[3]:0):e.j[3]);else switch(e.j[3]=e.k,v=Wf(e,ct)+e.j[3]*(Uf(e,ct)-1),Vf(e,ct).e){case 2:e.r=v+t.b;break;case 3:e.r=n.a-(l-v)/2-t.c;break;case 4:e.r=n.a-t.c}if(Vf(e,qe)==Ds)e.j[4]=(h-Wf(e,qe))/Bm(e,qe),e.s=n.b-(e.b?t.a+(Uf(e,qe)==1?e.j[4]:0):e.j[4]);else switch(e.j[4]=e.k,v=Wf(e,qe)+e.j[4]*(Uf(e,qe)-1),Vf(e,qe).e){case 2:e.s=v+t.d;break;case 3:e.s=n.b-(h-v)/2-t.a;break;case 4:e.s=n.b-t.a}if(Vf(e,Be)==Ds)e.j[2]=(i-Wf(e,Be))/Bm(e,Be),e.a=e.b?t.d+(Uf(e,Be)==1?e.j[2]:0):e.j[2];else switch(e.j[2]=e.k,v=Wf(e,Be)+e.j[2]*(Uf(e,Be)-1),Vf(e,Be).e){case 2:e.a=t.d;break;case 3:e.a=t.d+(i-v)/2;break;case 4:e.a=n.b-v-t.a}}function tH(e,t,n){var i,s,l,h,v,p,m,S,x,L,j,I,R,Y,q,V,U,te,ue,ye,Ce,be,Ne,Ue,Xe,it,st,Tt;for(it=0,h=0,x=t[0].d,be=n[0].d,I=0,Y=n.length;I<Y;++I)if(L=n[I],gi(f(z(L,(Ee(),dt)),28))){for(V=0,ue=new M(L.f);ue.a<ue.c.c.length&&(te=f(O(ue),7),te.g==(we(),rt));)for(l=new M(te.b);l.a<l.c.c.length;)if(s=f(O(l),12),s.c.f.d==x){++V;break}for(U=0,Ce=new fn(L.f,L.f.c.length);Ce.b>0;){for(te=(ut(Ce.b>0),f(Ce.a.sb(Ce.c=--Ce.b),7)),ye=0,l=new M(te.b);l.a<l.c.c.length;)s=f(O(l),12),s.c.f.d==x&&++ye;ye>0&&(te.g==(we(),rt)?(e.a[te.k]=it,++it):(e.a[te.k]=it+V+U,++U),h+=ye)}it+=U}else{for(q=0,ue=new M(L.f);ue.a<ue.c.c.length;){for(te=f(O(ue),7),l=new M(te.b);l.a<l.c.c.length;)s=f(O(l),12),s.c.f.d==x&&++q;e.a[te.k]=it}q>0&&(++it,h+=q)}for(Ne=ve(Kn,Wn,26,h,12,1),p=0,j=0,R=t.length;j<R;++j)if(L=t[j],gi(f(z(L,(Ee(),dt)),28)))for(ue=new M(L.f);ue.a<ue.c.c.length;)for(te=f(O(ue),7),Ue=p,l=new M(te.e);l.a<l.c.c.length;)s=f(O(l),12),Xe=s.d,Xe.f.d==be&&yR(Ne,Ue,p++,e.a[Xe.k]);else for(Ue=p,ue=new M(L.f);ue.a<ue.c.c.length;)for(te=f(O(ue),7),l=new M(te.e);l.a<l.c.c.length;)s=f(O(l),12),Xe=s.d,Xe.f.d==be&&yR(Ne,Ue,p++,e.a[Xe.k]);for(v=1;v<it;)v*=2;for(Tt=2*v-1,v-=1,st=ve(Kn,Wn,26,Tt,12,1),i=0,S=0;S<h;S++)for(m=Ne[S]+v,++st[m];m>0;)m%2>0&&(i+=st[m+1]),m=(m-1)/2|0,++st[m];return i}function nH(e,t){var n,i,s,l,h,v,p,m,S,x,L,j,I,R,Y,q,V,U,te,ue,ye,Ce,be,Ne,Ue,Xe,it,st,Tt,xn;for(It(t,"Compound graph postprocessor",1),n=Pt(ge(Nt(z(e,(zt(),s5))))),v=f(z(e,(le(),E6)),144),x=new Yr,ye=v.W().mb();ye.G();){for(ue=f(ye.H(),12),h=new Fu(v.U(ue)),Fa(h,new PS(e)),Xe=Xie((Sn(0,h.c.length),f(h.c[0],114))),st=tR(f(_e(h,h.c.length-1),114)),Hs(ue.a),Ne=Xe.f,wh(st.f,Ne)?be=f(z(Ne,Sl),55):be=Li(Ne),I=f(z(ue,(Ee(),Un)),44),YM(h,yG)?I?Hs(I):(I=new xi,ce(ue,Un,I)):I&&ce(ue,Un,null),Y=null,l=new M(h);l.a<l.c.c.length;){for(s=f(O(l),114),te=new Fr,sx(te,s.a,be),q=s.b,i=new xi,C2(i,0,q.a),Zu(i,te),Ue=new qn(Di(q.c)),it=new qn(Di(q.d)),Ue.a+=te.a,Ue.b+=te.b,it.a+=te.a,it.b+=te.b,Y&&(i.b==0?U=it:U=(ut(i.b!=0),f(i.a.a.c,10)),Tt=ni(Y.a-U.a)>mu,xn=ni(Y.b-U.b)>mu,(!n&&Tt&&xn||n&&(Tt||xn))&&an(ue.a,Ue)),na(ue.a,i),i.b==0?Y=Ue:Y=(ut(i.b!=0),f(i.c.b.c,10)),V=f(z(q,Un),44),V&&(j=new xi,C2(j,0,V),Zu(j,te),na(I,j)),tR(s)==st&&(Li(st.f)!=s.a&&(te=new Fr,sx(te,Li(st.f),be)),ce(ue,a5,te)),R=new fn(q.b,0);R.b<R.d.Y();)p=(ut(R.b<R.d.Y()),f(R.d.sb(R.c=R.b++),33)),He(z(p,P6))===He(ue)&&(sx(p.i,Li(q.c.f),be),Po(R),Le(ue.b,p));x.a.db(q,x)}Bn(ue,Xe),kn(ue,st)}for(S=(Ce=new Wt(x.a).a.bb().mb(),new Zt(Ce));S.a.G();)m=(L=f(S.a.H(),21),f(L.yb(),12)),Bn(m,null),kn(m,null);Ct(t)}function Afe(e){var t,n,i,s,l,h,v,p,m,S,x,L,j,I,R,Y,q,V,U,te,ue,ye,Ce,be,Ne,Ue,Xe,it,st,Tt;if(Ne=f(z(e,(Ee(),dt)),28),Ne!=(zn(),Ao)&&Ne!=cc){for(R=e.c,I=R.c.length,x=new Ni((hi(I+2,Zx),vh(Pr(Pr(5,I+2),(I+2)/10|0)))),Y=new Ni((hi(I+2,Zx),vh(Pr(Pr(5,I+2),(I+2)/10|0)))),Le(x,new $t),Le(x,new $t),Le(Y,new Se),Le(Y,new Se),Ce=new Yr,t=0;t<I;t++)for(n=(Sn(t,R.c.length),f(R.c[t],16)),Ue=(Sn(t,x.c.length),f(x.c[t],57)),q=(On(),new $t),x.c[x.c.length]=q,it=(Sn(t,Y.c.length),f(Y.c[t],20)),U=new Se,Y.c[Y.c.length]=U,s=new M(n.a);s.a<s.c.c.length;){for(i=f(O(s),9),m=Dt(Dr(i));xt(m);)v=f(Et(m),12),st=v.c.f,VR(st)&&(Ce.a.db(st,Ce),Xe=f(Ue.cb(z(st,(le(),lt))),9),Xe||(Xe=sB(e,st),Ue.db(z(st,lt),Xe),it.ib(Xe)),Bn(v,f(_e(Xe.f,1),7)));for(p=Dt(En(i));xt(p);)v=f(Et(p),12),Tt=v.d.f,VR(Tt)&&(Ce.a.db(Tt,Ce),V=f(Kt(q,z(Tt,(le(),lt))),9),V||(V=sB(e,Tt),un(q,z(Tt,lt),V),U.c[U.c.length]=V),kn(v,f(_e(V.f,0),7)))}for(L=0;L<Y.c.length;L++)if(te=(Sn(L,Y.c.length),f(Y.c[L],20)),!te.V())for(L==0?(j=new qc(e),Xc(0,R.c.length),dg(R.c,0,j)):L==x.c.length-1?(j=new qc(e),R.c[R.c.length]=j):j=(Sn(L-1,R.c.length),f(R.c[L-1],16)),h=te.mb();h.G();)l=f(h.H(),9),Ar(l,j);for(ye=(be=new Wt(Ce.a).a.bb().mb(),new Zt(be));ye.a.G();)ue=(S=f(ye.a.H(),21),f(S.yb(),9)),Ar(ue,null)}}function Rfe(e,t){var n,i,s,l,h,v,p,m,S,x,L,j,I,R,Y,q,V,U,te,ue,ye,Ce,be,Ne,Ue,Xe,it,st,Tt,xn,Nn;for(Tt=new Se,I=new M(t.c);I.a<I.c.c.length;)for(L=f(O(I),16),ue=new M(L.a);ue.a<ue.c.c.length;){for(te=f(O(ue),9),te.k=-1,x=qs,be=qs,Ue=new M(te.f);Ue.a<Ue.c.c.length;){for(Ne=f(O(Ue),7),s=new M(Ne.b);s.a<s.c.c.length;)n=f(O(s),12),Xe=f(z(n,(le(),Qa)),24).a,x=x>Xe?x:Xe;for(i=new M(Ne.e);i.a<i.c.c.length;)n=f(O(i),12),Xe=f(z(n,(le(),Qa)),24).a,be=be>Xe?be:Xe}ce(te,Qp,gt(x)),ce(te,Jp,gt(be))}for(q=0,j=new M(t.c);j.a<j.c.c.length;)for(L=f(O(j),16),ue=new M(L.a);ue.a<ue.c.c.length;)te=f(O(ue),9),te.k<0&&(st=new YS,st.b=q++,Dx(e,te,st),Tt.c[Tt.c.length]=st);for(Ce=zc(Tt.c.length),S=zc(Tt.c.length),h=0;h<Tt.c.length;h++)Le(Ce,new Se),Le(S,gt(0));for(Jle(t,Tt,Ce,S),xn=f(Vn(Tt,ve(r$,HH,111,Tt.c.length,0,1)),625),ye=f(Vn(Ce,ve(qfe,{3:1,5:1,6:1,672:1},20,Ce.c.length,0,1)),672),m=ve(Kn,Wn,26,S.c.length,12,1),v=0;v<m.length;v++)m[v]=(Sn(v,S.c.length),f(S.c[v],24)).a;for(V=0,U=new Se,p=0;p<xn.length;p++)m[p]==0&&Le(U,xn[p]);for(Y=ve(Kn,Wn,26,xn.length,12,1);U.c.length!=0;)for(st=f(Zl(U,0),111),Y[st.b]=V++;!ye[st.b].V();)Nn=f(ye[st.b].vb(0),111),--m[Nn.b],m[Nn.b]==0&&(U.c[U.c.length]=Nn);for(e.a=ve(r$,HH,111,xn.length,0,1),l=0;l<xn.length;l++)for(R=xn[l],it=Y[l],e.a[it]=R,R.b=it,ue=new M(R.f);ue.a<ue.c.c.length;)te=f(O(ue),9),te.k=it;return e.a}function Bfe(e,t){var n,i,s,l,h,v,p,m,S,x,L,j,I,R,Y,q,V,U,te,ue,ye,Ce,be,Ne;for(It(t,"Fixed Layout",1),p=f(z(e,(Ee(),hf)),122),R=0,Y=0,U=new M(e.b);U.a<U.c.c.length;){for(q=f(O(U),9),be=f(z(q,Oh),10),be&&(q.i.a=be.a,q.i.b=be.b,f(z(q,uc),86).kb((gu(),Tb))&&(Ne=f(z(q,rv),15).a,m=f(z(q,nv),15).a,Ne>0&&m>0&&Ax(q,new ot(Ne,m),!0))),R=je(R,q.i.a+q.j.a),Y=je(Y,q.i.b+q.j.b),j=new M(q.c);j.a<j.c.c.length;)x=f(O(j),33),be=f(z(x,Oh),10),be&&(x.i.a=be.a,x.i.b=be.b),R=je(R,q.i.a+x.i.a+x.j.a),Y=je(Y,q.i.b+x.i.b+x.j.b);for(ue=new M(q.f);ue.a<ue.c.c.length;)for(te=f(O(ue),7),be=f(z(te,Oh),10),be&&(te.i.a=be.a,te.i.b=be.b),ye=q.i.a+te.i.a,Ce=q.i.b+te.i.b,R=je(R,ye+te.j.a),Y=je(Y,Ce+te.j.b),L=new M(te.c);L.a<L.c.c.length;)x=f(O(L),33),be=f(z(x,Oh),10),be&&(x.i.a=be.a,x.i.b=be.b),R=je(R,ye+x.i.a+x.j.a),Y=je(Y,Ce+x.i.b+x.j.b);for(v=Dt(En(q));xt(v);)l=f(Et(v),12),I=zz(l),R=je(R,I.a),Y=je(Y,I.b);for(h=Dt(Dr(q));xt(h);)l=f(Et(h),12),He(z(l.c.f,(le(),Sl)))!==He(e)&&(I=zz(l),R=je(R,I.a),Y=je(Y,I.b))}if(p==(du(),ff))for(V=new M(e.b);V.a<V.c.c.length;)for(q=f(O(V),9),h=Dt(En(q));xt(h);)l=f(Et(h),12),S=sfe(l),S.b==0?ce(l,Un,null):ce(l,Un,S);e.e.a=R,e.e.b=Y,ce(e,uc,(gu(),i=f(Gi(iv),11),new ri(i,f(Ti(i,i.length),11),0))),s=f(z(e,(le(),Cl)),9),s&&ce(s,uc,(n=f(Gi(iv),11),new ri(n,f(Ti(n,n.length),11),0))),Ct(t)}function zfe(e,t){var n,i,s,l,h,v,p,m,S,x,L,j,I,R,Y,q,V,U,te,ue,ye,Ce,be,Ne,Ue,Xe,it;if(!gi(f(z(t,(Ee(),dt)),28))){if(t.f.c.length>1){Ce=ve(lhe,Nr,15,e.a.length,0,1),m=zc(e.a.length),R=0,I=0,n=2*t.d.a.c.length+1;e:for(ye=new M(t.f);ye.a<ye.c.c.length;){if(ue=f(O(ye),7),q=ue.g==(we(),rt)||ue.g==ct,it=0,q){if(be=f(z(ue,(le(),Is)),9),!be)continue;for(L=!1,te=!1,Ue=new M(be.f);Ue.a<Ue.c.c.length;)Ne=f(O(Ue),7),He(z(Ne,lt))===He(ue)&&(Ne.e.c.length==0?Ne.b.c.length==0||(L=!0):te=!0);L&&!te?it=ue.g==rt?-(be.d?ji(be.d.a,be,0):-1):n-(be.d?ji(be.d.a,be,0):-1):te&&!L?it=(be.d?ji(be.d.a,be,0):-1)+1:L&&te&&(it=ue.g==rt?0:n/2)}else{for(U=new M(ue.e);U.a<U.c.c.length;)if(V=f(O(U),12),s=V.d,s.f.d==t.d){m.c[m.c.length]=ue;continue e}else it+=e.a[s.k];for(x=new M(ue.b);x.a<x.c.c.length;)if(S=f(O(x),12),s=S.c,s.f.d==t.d){m.c[m.c.length]=ue;continue e}else it-=e.a[s.k]}ue.b.c.length+ue.e.c.length>0?(Ce[ue.k]=new Ut(it/(ue.b.c.length+ue.e.c.length)),R=nte(R,Ce[ue.k].a),I=fN(I,Ce[ue.k].a)):q&&(Ce[ue.k]=new Ut(it))}for(Y=(t.d?ji(t.d.a,t,0):-1)+1,j=t.d.a.c.length+1,p=new M(m);p.a<p.c.c.length;){for(v=f(O(p),7),it=0,h=0,l=Dt(Ca((gr(),new Qn(lr(re(ie(Ze,1),Me,1,4,[new cd(v),new $f(v)]))))));xt(l);)s=f(Et(l),7),s.f.d==t.d&&(it+=lM(s.f)+1,++h);i=it/h,Xe=v.g,Xe==(we(),Be)?i<Y?Ce[v.k]=new Ut(R-i):Ce[v.k]=new Ut(I+(j-i)):Xe==qe&&(i<Y?Ce[v.k]=new Ut(I+i):Ce[v.k]=new Ut(R-(j-i)))}Fa(t.f,new nj(Ce))}ce(t,dt,(zn(),Ah))}}function Hfe(e){var t,n,i,s,l,h,v,p,m,S,x,L,j,I,R,Y,q,V,U,te,ue,ye,Ce,be,Ne;for(be=new Se,e.a.b.c=ve(Ze,Me,1,0,4,1),te=(On(),new $t),q=new M(e.d.c);q.a<q.c.c.length;)for(R=f(O(q),16),U=new M(R.a);U.a<U.c.c.length;){if(V=f(O(U),9),Pt(ge(Nt(z(V,(Ee(),tv)))))&&!Lg(Wg(V))){v=f(I0(Wg(V)),12),ue=v.c.f,ue==V&&(ue=v.d.f),ye=new wr(ue,uu(Ga(V.i),ue.i)),un(e.b,V,ye);continue}l=new uz(V,e.d),Le(e.a.b,l),ra(te.d,V,l)}for(Y=new M(e.d.c);Y.a<Y.c.c.length;)for(R=f(O(Y),16),U=new M(R.a);U.a<U.c.c.length;){for(V=f(O(U),9),l=f(li(fi(te.d,V)),25),S=Dt(En(V));xt(S);)if(p=f(Et(S),12),i=Jt(p.a,0),x=!0,I=null,i.b!=i.d.c){for(t=f(qt(i),10),p.c.g==(we(),rt)&&(Ne=new Qg(t,new ot(t.a,l.j.e),l,p),Ne.c=!0,be.c[be.c.length]=Ne),p.c.g==ct&&(Ne=new Qg(t,new ot(t.a,l.j.e+l.j.b),l,p),Ne.d=!0,be.c[be.c.length]=Ne);i.b!=i.d.c;)n=f(qt(i),10),W3(t.b,n.b)||(I=new Qg(t,n,null,p),be.c[be.c.length]=I,x&&(x=!1,n.b<l.j.e?I.c=!0:n.b>l.j.e+l.j.b?I.d=!0:(I.d=!0,I.c=!0))),i.b!=i.d.c&&(t=n);I&&(h=f(Kt(te,p.d.f),25),t.b<h.j.e?I.c=!0:t.b>h.j.e+h.j.b?I.d=!0:(I.d=!0,I.c=!0))}for(m=Dt(Dr(V));xt(m);)p=f(Et(m),12),p.a.b!=0&&(t=f(o0(p.a),10),p.d.g==(we(),rt)&&(Ne=new Qg(t,new ot(t.a,l.j.e),l,p),Ne.c=!0,be.c[be.c.length]=Ne),p.d.g==ct&&(Ne=new Qg(t,new ot(t.a,l.j.e+l.j.b),l,p),Ne.d=!0,be.c[be.c.length]=Ne))}if(be.c.length!=0){for(Qt(),Fa(be,null),j=(Sn(0,be.c.length),f(be.c[0],142)),s=new ox(j,e.d),L=1;L<be.c.length;L++)Ce=(Sn(L,be.c.length),f(be.c[L],142)),W3(s.j.d,Ce.j)&&!(NC(s.j.e+s.j.b,Ce.k)||NC(Ce.n,s.j.e))?Iz(s,Ce):(Le(e.a.b,s),s=new ox(Ce,e.d));Le(e.a.b,s)}be.c=ve(Ze,Me,1,0,4,1),Gue(e)}function Bx(e,t,n,i,s,l){var h,v,p,m,S,x,L,j,I,R,Y,q,V,U,te,ue,ye,Ce,be,Ne,Ue,Xe,it,st,Tt,xn,Nn,Bi,Ji;for(v=f(_e(e.d.c.c,i),16),Nn=new Yr,I=new Yr,j=0;j<v.a.c.length;++j)V=f(_e(v.a,j),9),j<n?(Ue=Nn.a.db(V,Nn),Ue==null):j>n&&(Ne=I.a.db(V,I),Ne==null);for(Bi=new Yr,R=new Yr,te=(it=new Wt(Nn.a).a.bb().mb(),new Zt(it));te.a.G();)for(V=(x=f(te.a.H(),21),f(x.yb(),9)),h=t==1?En(V):Dr(V),m=(_n(),new Go($o(bs(h.a,new T))));xt(m);)p=f(Et(m),12),ea(V.d)!=ea(p.d.f.d)&&vn(Bi,p.d.f);for(ue=(st=new Wt(I.a).a.bb().mb(),new Zt(st));ue.a.G();)for(V=(x=f(ue.a.H(),21),f(x.yb(),9)),h=t==1?En(V):Dr(V),m=(_n(),new Go($o(bs(h.a,new T))));xt(m);)p=f(Et(m),12),ea(V.d)!=ea(p.d.f.d)&&vn(R,p.d.f);for(EG&&$l(),be=f(_e(e.d.c.c,i+(t==1?1:-1)),16),Y=qs,q=kr,L=0;L<be.a.c.length;L++)V=f(_e(be.a,L),9),Bi.a.R(V)?Y=Y>L?Y:L:R.a.R(V)&&(q=q<L?q:L);if(Y<q){for(ye=(Tt=new Wt(Bi.a).a.bb().mb(),new Zt(Tt));ye.a.G();){for(V=(x=f(ye.a.H(),21),f(x.yb(),9)),S=Dt(En(V));xt(S);)if(p=f(Et(S),12),ea(V.d)==ea(p.d.f.d))return null;for(m=Dt(Dr(V));xt(m);)if(p=f(Et(m),12),ea(V.d)==ea(p.c.f.d))return null}for(Ce=(Xe=new Wt(R.a).a.bb().mb(),new Zt(Xe));Ce.a.G();){for(V=(x=f(Ce.a.H(),21),f(x.yb(),9)),S=Dt(En(V));xt(S);)if(p=f(Et(S),12),ea(V.d)==ea(p.d.f.d))return null;for(m=Dt(Dr(V));xt(m);)if(p=f(Et(m),12),ea(V.d)==ea(p.c.f.d))return null}for(Nn.a.Y()==0?Ji=0:I.a.Y()==0?Ji=be.a.c.length:Ji=Y+1,U=new M(v.a);U.a<U.c.c.length;)if(V=f(O(U),9),V.g==(et(),er))return null;return l==1?H0(re(ie(Mk,1),Nr,24,0,[gt(Ji)])):t==1&&i==s-2||t==0&&i==1?H0(re(ie(Mk,1),Nr,24,0,[gt(Ji)])):(xn=Bx(e,t,Ji,i+(t==1?1:-1),s,l-1),xn&&t==1&&xn.rb(0,gt(Ji)),xn)}return null}function _fe(e,t){var n,i,s,l,h,v,p,m,S,x,L,j,I,R,Y,q,V,U;if(JC(t),j=(Ee(),yb).b,!(j in t.a&&Mn(t,j).ic().a)){if(p=Mn(t,"source"),m=Mn(t,"sourcePort"),S=Mn(t,"target"),x=Mn(t,"targetPort"),p){if(!p.lc())throw new ps("Invalid format of an edge's 'source' property. It must be a string.",p,t)}else throw new ps("Edges must contain a 'source' property.",null,t);if(S){if(!S.lc())throw new ps("Invalid format of an edge's 'target' property. It must be a string.",S,t)}else throw new ps("Edges must contain a 'target' property.",null,t);Y=null,V=null;try{R=f(j0(e.i,p.lc().a),9),m&&m.lc()&&(Y=f(j0(e.k,m.lc().a),7)),q=f(j0(e.i,S.lc().a),9),x&&x.lc()&&(V=f(j0(e.k,x.lc().a),7))}catch(te){throw te=Kr(te),xe(te,76)?new wg("An edge's 'source', 'target', 'sourcePort', and 'targetPort' properties have to be strings.",t):Zr(te)}if(!Pt(ge(e.g))){if(!R||!q)return;if(Li(R)!=Li(q))return}if(!R||!q)throw new wg("An edge's source or target node could not be resolved.",t);if(I=Li(R),i=new ws,ce(i,(le(),lt),t),h=f(Mn(t,"id"),97),N0(e.a,h.a,i),un(e.b,i,t),op(t,i),rx(e,t,i,I),s=f(z(I,Vr),18),R==q&&s.ib((br(),iw)),!Y)Y=Pz(R,new Fr,(cr(),ai),I);else if(Y.f!=R)throw new Om("Inconsistent source port reference found.");if(!V)V=Pz(q,new Fr,(cr(),Ri),I);else if(V.f!=q)throw new Om("Inconsistent target port reference found.");if(Bn(i,Y),kn(i,V),(Vl(Ca((gr(),new Qn(lr(re(ie(Ze,1),Me,1,4,[Y.b,Y.e]))))))>1||Vl(Ca(new Qn(lr(re(ie(Ze,1),Me,1,4,[V.b,V.e])))))>1)&&s.ib((br(),rw)),He(z(I,(zt(),cw)))===He((Pg(),jE))&&!(kk in t.a)){n=new xi;try{for(v=Mn(t,kk).hc(),l=0;l<v.a.length;++l)L=Uu(v,l).kc(),U=new ot(Mn(L,"x").jc().a,Mn(L,"y").jc().a),mr(n,U,n.c.b,n.c);ce(i,T6,n)}catch(te){throw te=Kr(te),xe(te,54)?new wg("Invalid format of an edges 'bendPoints' property.",t):Zr(te)}}ce(i,Un,null)}}function jr(){jr=c,LL=new rn("LEFT_DIR_PREPROCESSOR",0),gL=new rn("DOWN_DIR_PREPROCESSOR",1),HL=new rn("UP_DIR_PREPROCESSOR",2),dL=new rn("COMMENT_PREPROCESSOR",3),mE=new rn("EDGE_AND_LAYER_CONSTRAINT_EDGE_REVERSER",4),RL=new rn("SPLINE_SELF_LOOP_PREPROCESSOR",5),yE=new rn("INTERACTIVE_EXTERNAL_PORT_POSITIONER",6),NL=new rn("PARTITION_PREPROCESSOR",7),pE=new rn("BIG_NODES_PREPROCESSOR",8),Fp=new rn("LABEL_DUMMY_INSERTER",9),jL=new rn("PARTITION_POSTPROCESSOR",10),DL=new rn("NODE_PROMOTION",11),Wp=new rn("LAYER_CONSTRAINT_PROCESSOR",12),pL=new rn("HIERARCHICAL_PORT_CONSTRAINT_PROCESSOR",13),bE=new rn("BIG_NODES_INTERMEDIATEPROCESSOR",14),SE=new rn("LONG_EDGE_SPLITTER",15),xE=new rn("PORT_SIDE_PROCESSOR",16),Vp=new rn("LABEL_DUMMY_SWITCHER",17),CL=new rn("LABEL_MANAGEMENT_PROCESSOR",18),Yp=new rn("INVERTED_PORT_PROCESSOR",19),OL=new rn("SELF_LOOP_PROCESSOR",20),CE=new rn("PORT_LIST_SORTER",21),Kp=new rn("NORTH_SOUTH_PORT_PREPROCESSOR",22),bL=new rn("GREEDY_SWITCH",23),IL=new rn("PORT_DISTRIBUTER",24),AL=new rn("SPLINE_SELF_LOOP_POSITIONER",25),ML=new rn("SAUSAGE_COMPACTION",26),kE=new rn("IN_LAYER_CONSTRAINT_PROCESSOR",27),kL=new rn("HYPEREDGE_DUMMY_MERGER",28),Gh=new rn("LABEL_SIDE_SELECTOR",29),wE=new rn("BIG_NODES_SPLITTER",30),SL=new rn("LABEL_AND_NODE_SIZE_PROCESSOR",31),BL=new rn("SPLINE_SELF_LOOP_ROUTER",32),PL=new rn("NODE_MARGIN_CALCULATOR",33),wL=new rn("HIERARCHICAL_PORT_DUMMY_SIZE_PROCESSOR",34),av=new rn("HIERARCHICAL_PORT_POSITION_PROCESSOR",35),xL=new rn("LAYER_SIZE_AND_GRAPH_HEIGHT_CALCULATOR",36),Nb=new rn("BIG_NODES_POSTPROCESSOR",37),hL=new rn("COMMENT_POSTPROCESSOR",38),EL=new rn("HYPERNODE_PROCESSOR",39),mL=new rn("HIERARCHICAL_PORT_ORTHOGONAL_EDGE_ROUTER",40),EE=new rn("LONG_EDGE_JOINER",41),Up=new rn("NORTH_SOUTH_PORT_POSTPROCESSOR",42),qp=new rn("LABEL_DUMMY_REMOVER",43),yL=new rn("HORIZONTAL_COMPACTOR",44),TE=new rn("REVERSED_EDGE_RESTORER",45),TL=new rn("LEFT_DIR_POSTPROCESSOR",46),vL=new rn("DOWN_DIR_POSTPROCESSOR",47),zL=new rn("UP_DIR_POSTPROCESSOR",48),$p=new rn("END_LABEL_PROCESSOR",49)}function le(){le=c;var e,t;lt=new Zn("origin"),Q$=new Zn("processingConfiguration"),D6=new Zn("processors"),k6=new nt("compoundNode",(yn(),yn(),Rn)),J$=new nt("insideConnections",Rn),Sl=new Zn("nestedLGraph"),Cl=new Zn("parentLNode"),T6=new Zn("originalBendpoints"),L6=new Zn("originalDummyNodePosition"),P6=new Zn("originalLabelEdge"),j6=new Zn("representedLabels"),bo=new nt("labelSide",(Yi(),Db)),Js=new nt("reversed",Rn),qh=new Zn("random"),Oi=new nt("longEdgeSource",null),Si=new nt("longEdgeTarget",null),e5=new nt("edgeConstraint",(ph(),a6)),El=new Zn("inLayerLayoutUnit"),Qs=new nt("inLayerConstraint",(ks(),aw)),Fh=new nt("inLayerSuccessorConstraint",new Se),Is=new Zn("portDummy"),lv=new nt("crossingHint",gt(0)),Vr=new nt("graphProperties",(t=f(Gi(f6),11),new ri(t,f(Ti(t,t.length),11),0))),_r=new nt("externalPortSide",(we(),fr)),x6=new nt("externalPortSize",new Fr),sw=new Zn("externalPortReplacedDummy"),Ef=new nt("externalPortConnections",(e=f(Gi(Mr),11),new ri(e,f(Ti(e,e.length),11),0))),Lu=new nt(yH,0),m6=new Zn("barycenterAssociates"),hv=new Zn("TopSideComments"),cv=new Zn("BottomSideComments"),ow=new Zn("CommentConnectionPort"),t5=new nt("inputCollect",Rn),n5=new nt("outputCollect",Rn),S6=new nt("cyclic",Rn),zb=new nt("bigNodeOriginalSize",new Ut(0)),wc=new nt("bigNodeInitial",Rn),y6=new nt("de.cau.cs.kieler.klay.layered.bigNodeLabels",new Se),JE=new nt("de.cau.cs.kieler.klay.layered.postProcess",null),E6=new Zn("crossHierarchyMap"),a5=new Zn("targetOffset"),eY=new nt("splineLabelSize",new Fr),Hb=new nt("splineLoopSide",(wi(),pf)),i5=new nt("splineSelfLoopComponents",new Se),N6=new nt("splineSelfLoopMargins",new A1),xl=new Zn("spacings"),uw=new nt("partitionConstraint",Rn),fv=new y0((Ee(),vl),new Ut(0)),Ai=new m0(FT,new Ut(20),new Ut(1)),r5=new m0(GT,new Ut(10),new Ut(1)),ss=new m0(RT,new Ut(12),new Ut(0)),Qa=new y0($T,gt(0)),Yh=new m0(E_,new Ut(PH),new Ut(0)),C6=new y0(hf,(du(),ff))}function zt(){zt=c,fw=new nt("de.cau.cs.kieler.klay.layered.nodePromotion",(rl(),Zp)),R6=new M0("de.cau.cs.kieler.klay.layered.nodePromotionBoundary",gt(0),gt(0),gt(100)),B6=new nt(mH,gt(1)),vv=new Ul("de.cau.cs.kieler.klay.layered.inLayerSpacingFactor",new Ut(1),new Ut(0)),eu=new nt("de.cau.cs.kieler.klay.layered.edgeSpacingFactor",new Ut(.5)),rY=new nt("de.cau.cs.kieler.klay.layered.edgeNodeSpacingFactor",new Ut(fT)),h5=new nt("de.cau.cs.kieler.klay.layered.distributeNodes",(yn(),yn(),Rn)),bv=new nt("de.cau.cs.kieler.klay.layered.wideNodesOnMultipleLayers",(hu(),dw)),f5=new nt("de.cau.cs.kieler.klay.layered.cycleBreaking",(D0(),PE)),g5=new nt("de.cau.cs.kieler.klay.layered.nodeLayering",(_0(),DE)),cw=new nt("de.cau.cs.kieler.klay.layered.crossMin",(Pg(),NE)),d5=new nt("de.cau.cs.kieler.klay.layered.greedySwitch",(nb(),XE)),b5=new nt("de.cau.cs.kieler.klay.layered.nodePlace",(rp(),IE)),M6=new M0("de.cau.cs.kieler.klay.layered.linearSegmentsDeflectionDampening",new Ut(lT),new Ut(0),new Ut(1)),lw=new nt("de.cau.cs.kieler.klay.layered.fixedAlignment",(Vg(),WE)),Vh=new nt("de.cau.cs.kieler.klay.layered.edgeLabelSideSelection",(ap(),nw)),I6=new nt(wH,Rn),gv=new Ul("de.cau.cs.kieler.klay.layered.thoroughness",gt(10),gt(1)),Sr=new nt("de.cau.cs.kieler.klay.layered.layerConstraint",(Fi(),Sf)),O6=new nt("de.cau.cs.kieler.klay.layered.mergeEdges",Rn),A6=new nt("de.cau.cs.kieler.klay.layered.mergeHierarchyEdges",oi),v5=new nt("de.cau.cs.kieler.klay.layered.interactiveReferencePoint",(O0(),QE)),Gb=new nt("de.cau.cs.kieler.klay.layered.feedBackEdges",Rn),s5=new nt("de.cau.cs.kieler.klay.layered.unnecessaryBendpoints",Rn),l5=new nt("de.cau.cs.kieler.klay.layered.contentAlignment",(Gd(),Ft(_E,re(ie(GE,1),De,123,0,[RE])))),z6=new nt("de.cau.cs.kieler.klay.layered.sausageFolding",Rn),m5=new nt("de.cau.cs.kieler.klay.layered.splines.selfLoopPlacement",(Q0(),y5)),u5=new nt("de.cau.cs.kieler.klay.layered.nodeplace.compactionStrategy",(Mg(),ME)),p5=new nt("de.cau.cs.kieler.klay.layered.northOrSouthPort",Rn),hw=new nt("de.cau.cs.kieler.klay.layered.postCompaction",(Yd(),Ob)),w5=new nt("de.cau.cs.kieler.klay.layered.postCompaction.constraints",(R0(),LE)),c5=new nt("de.cau.cs.kieler.klay.layered.components.compact",Rn)}function dk(){dk=c,nG=new Pi("OUT_T_L",0,(gr(),new fu(Ft((pu(),Zi),re(ie(Ln,1),De,41,0,[ba,Wi])))),(o2(),lc)),tG=new Pi("OUT_T_C",1,new Qn(lr(re(ie(Ze,1),Me,1,4,[Ft(Zi,re(ie(Ln,1),De,41,0,[ba,Ka])),Ft(Zi,re(ie(Ln,1),De,41,0,[ba,Ka,Ui]))]))),_h),rG=new Pi("OUT_T_R",2,new fu(Ft(Zi,re(ie(Ln,1),De,41,0,[ba,Ki]))),fc),W_=new Pi("OUT_B_L",3,new fu(Ft(Zi,re(ie(Ln,1),De,41,0,[va,Wi]))),lc),V_=new Pi("OUT_B_C",4,new Qn(lr(re(ie(Ze,1),Me,1,4,[Ft(Zi,re(ie(Ln,1),De,41,0,[va,Ka])),Ft(Zi,re(ie(Ln,1),De,41,0,[va,Ka,Ui]))]))),_h),U_=new Pi("OUT_B_R",5,new fu(Ft(Zi,re(ie(Ln,1),De,41,0,[va,Ki]))),fc),X_=new Pi("OUT_L_T",6,new fu(Ft(Zi,re(ie(Ln,1),De,41,0,[Wi,ba,Ui]))),fc),Z_=new Pi("OUT_L_C",7,new Qn(lr(re(ie(Ze,1),Me,1,4,[Ft(Zi,re(ie(Ln,1),De,41,0,[Wi,ga])),Ft(Zi,re(ie(Ln,1),De,41,0,[Wi,ga,Ui]))]))),fc),K_=new Pi("OUT_L_B",8,new fu(Ft(Zi,re(ie(Ln,1),De,41,0,[Wi,va,Ui]))),fc),eG=new Pi("OUT_R_T",9,new fu(Ft(Zi,re(ie(Ln,1),De,41,0,[Ki,ba,Ui]))),lc),J_=new Pi("OUT_R_C",10,new Qn(lr(re(ie(Ze,1),Me,1,4,[Ft(Zi,re(ie(Ln,1),De,41,0,[Ki,ga])),Ft(Zi,re(ie(Ln,1),De,41,0,[Ki,ga,Ui]))]))),lc),Q_=new Pi("OUT_R_B",11,new fu(Ft(Zi,re(ie(Ln,1),De,41,0,[Ki,va,Ui]))),lc),F_=new Pi("IN_T_L",12,new Qn(lr(re(ie(Ze,1),Me,1,4,[Ft(Ei,re(ie(Ln,1),De,41,0,[ba,Wi])),Ft(Ei,re(ie(Ln,1),De,41,0,[ba,Wi,Ui]))]))),lc),Y_=new Pi("IN_T_C",13,new Qn(lr(re(ie(Ze,1),Me,1,4,[Ft(Ei,re(ie(Ln,1),De,41,0,[ba,Ka])),Ft(Ei,re(ie(Ln,1),De,41,0,[ba,Ka,Ui]))]))),_h),q_=new Pi("IN_T_R",14,new Qn(lr(re(ie(Ze,1),Me,1,4,[Ft(Ei,re(ie(Ln,1),De,41,0,[ba,Ki])),Ft(Ei,re(ie(Ln,1),De,41,0,[ba,Ki,Ui]))]))),fc),G_=new Pi("IN_C_L",15,new Qn(lr(re(ie(Ze,1),Me,1,4,[Ft(Ei,re(ie(Ln,1),De,41,0,[ga,Wi])),Ft(Ei,re(ie(Ln,1),De,41,0,[ga,Wi,Ui]))]))),lc),__=new Pi("IN_C_C",16,new Qn(lr(re(ie(Ze,1),Me,1,4,[Ft(Ei,re(ie(Ln,1),De,41,0,[ga,Ka])),Ft(Ei,re(ie(Ln,1),De,41,0,[ga,Ka,Ui]))]))),_h),$_=new Pi("IN_C_R",17,new Qn(lr(re(ie(Ze,1),Me,1,4,[Ft(Ei,re(ie(Ln,1),De,41,0,[ga,Ki])),Ft(Ei,re(ie(Ln,1),De,41,0,[ga,Ki,Ui]))]))),fc),z_=new Pi("IN_B_L",18,new Qn(lr(re(ie(Ze,1),Me,1,4,[Ft(Ei,re(ie(Ln,1),De,41,0,[va,Wi])),Ft(Ei,re(ie(Ln,1),De,41,0,[va,Wi,Ui]))]))),lc),B_=new Pi("IN_B_C",19,new Qn(lr(re(ie(Ze,1),Me,1,4,[Ft(Ei,re(ie(Ln,1),De,41,0,[va,Ka])),Ft(Ei,re(ie(Ln,1),De,41,0,[va,Ka,Ui]))]))),_h),H_=new Pi("IN_B_R",20,new Qn(lr(re(ie(Ze,1),Me,1,4,[Ft(Ei,re(ie(Ln,1),De,41,0,[va,Ki])),Ft(Ei,re(ie(Ln,1),De,41,0,[va,Ki,Ui]))]))),fc),sE=new Pi(sf,21,db,null)}function rH(e,t,n){var i,s,l,h,v,p,m,S,x,L,j,I,R,Y,q,V,U,te,ue,ye,Ce,be,Ne,Ue,Xe,it,st,Tt,xn,Nn,Bi,Ji,kc,Ec,qb,tu,si,zi,nu,Gr,Qr,Ja,Sc,Ms,Du,Tl,us,ju,wv,po,Nu,wo,wa,Iu,mv;for(Tl=0,it=0,xn=t.length;it<xn;++it)if(Ue=t[it],gi(f(z(Ue,(Ee(),dt)),28)))for(zi=new M(Ue.f);zi.a<zi.c.c.length;){for(si=f(O(zi),7),Gr=0,v=new M(si.e);v.a<v.c.c.length;)h=f(O(v),12),Ue.d!=h.d.f.d&&++Gr;Gr>0&&(e.a[si.k]=Tl++)}else{for(Bi=0,zi=new M(Ue.f);zi.a<zi.c.c.length;){for(si=f(O(zi),7),v=new M(si.e);v.a<v.c.c.length;)h=f(O(v),12),Ue.d!=h.d.f.d&&++Bi;e.a[si.k]=Tl}Bi>0&&++Tl}for(Nu=0,st=0,Nn=n.length;st<Nn;++st)if(Ue=n[st],gi(f(z(Ue,(Ee(),dt)),28))){for(Ji=0,zi=new M(Ue.f);zi.a<zi.c.c.length&&(si=f(O(zi),7),si.g==(we(),rt));)for(v=new M(si.b);v.a<v.c.c.length;)if(h=f(O(v),12),Ue.d!=h.c.f.d){++Ji;break}for(Ec=0,Qr=new fn(Ue.f,Ue.f.c.length);Qr.b>0;){for(si=(ut(Qr.b>0),f(Qr.a.sb(Qr.c=--Qr.b),7)),Gr=0,v=new M(si.b);v.a<v.c.c.length;)h=f(O(v),12),Ue.d!=h.c.f.d&&++Gr;Gr>0&&(si.g==(we(),rt)?(e.a[si.k]=Nu,++Nu):(e.a[si.k]=Nu+Ji+Ec,++Ec))}Nu+=Ec}else{for(Bi=0,zi=new M(Ue.f);zi.a<zi.c.c.length;){for(si=f(O(zi),7),v=new M(si.b);v.a<v.c.c.length;)h=f(O(v),12),Ue.d!=h.c.f.d&&++Bi;e.a[si.k]=Nu}Bi>0&&++Nu}for(nu=(On(),new $t),j=new $i,Xe=0,Tt=t.length;Xe<Tt;++Xe)for(Ue=t[Xe],wv=new M(Ue.f);wv.a<wv.c.c.length;)for(ju=f(O(wv),7),v=new M(ju.e);v.a<v.c.c.length;)if(h=f(O(v),12),wa=h.d,Ue.d!=wa.f.d)if(us=f(li(fi(nu.d,ju)),197),wo=f(li(fi(nu.d,wa)),197),!us&&!wo)L=new iM,j.a.db(L,j),Le(L.a,h),Le(L.d,ju),ra(nu.d,ju,L),Le(L.d,wa),ra(nu.d,wa,L);else if(!us)Le(wo.a,h),Le(wo.d,ju),ra(nu.d,ju,wo);else if(!wo)Le(us.a,h),Le(us.d,wa),ra(nu.d,wa,us);else if(us==wo)Le(us.a,h);else{for(Le(us.a,h),tu=new M(wo.d);tu.a<tu.c.c.length;)qb=f(O(tu),7),ra(nu.d,qb,us);Tn(us.a,wo.a),Tn(us.d,wo.d),j.a.eb(wo)!=null}for(I=f(Y2(j,ve(the,{674:1,3:1,5:1,6:1},197,j.a.Y(),0,1)),674),Ne=t[0].d,Du=n[0].d,S=0,x=I.length;S<x;++S)for(m=I[S],m.e=Tl,m.f=Nu,zi=new M(m.d);zi.a<zi.c.c.length;)si=f(O(zi),7),Ja=e.a[si.k],si.f.d==Ne?(Ja<m.e&&(m.e=Ja),Ja>m.b&&(m.b=Ja)):si.f.d==Du&&(Ja<m.f&&(m.f=Ja),Ja>m.c&&(m.c=Ja));for(yh(I,0,I.length,(Hl(),Hl(),Cf)),po=ve(Kn,Wn,26,I.length,12,1),i=ve(Kn,Wn,26,Nu+1,12,1),Y=0;Y<I.length;Y++)po[Y]=I[Y].f,i[po[Y]]=1;for(l=0,q=0;q<i.length;q++)i[q]==1?i[q]=l:--l;for(Sc=0,V=0;V<po.length;V++)po[V]+=i[po[V]],Sc=ti(Sc,po[V]+1);for(p=1;p<Sc;)p*=2;for(mv=2*p-1,p-=1,Iu=ve(Kn,Wn,26,mv,12,1),s=0,Ce=0;Ce<po.length;Ce++)for(ye=po[Ce]+p,++Iu[ye];ye>0;)ye%2>0&&(s+=Iu[ye+1]),ye=(ye-1)/2|0,++Iu[ye];for(be=ve(e$,Me,156,I.length*2,0,1),U=0;U<I.length;U++)be[2*U]=new P0(I[U],I[U].e,I[U].b,(A0(),Rb)),be[2*U+1]=new P0(I[U],I[U].b,I[U].e,Ab);for(yh(be,0,be.length,Cf),kc=0,te=0;te<be.length;te++)switch(be[te].d.e){case 0:++kc;break;case 1:--kc,s+=kc}for(Ms=ve(e$,Me,156,I.length*2,0,1),ue=0;ue<I.length;ue++)Ms[2*ue]=new P0(I[ue],I[ue].f,I[ue].c,(A0(),Rb)),Ms[2*ue+1]=new P0(I[ue],I[ue].c,I[ue].f,Ab);for(yh(Ms,0,Ms.length,Cf),kc=0,R=0;R<Ms.length;R++)switch(Ms[R].d.e){case 0:++kc;break;case 1:--kc,s+=kc}return s}function Ee(){Ee=c;var e,t;k_=new nt("de.cau.cs.kieler.animate",(yn(),yn(),oi)),new nt("de.cau.cs.kieler.minAnimTime",gt(400)),new nt("de.cau.cs.kieler.maxAnimTime",gt(4e3)),new nt("de.cau.cs.kieler.animTimeFactor",gt(100)),bb=new nt("de.cau.cs.kieler.additionalPortSpace",null),tv=new nt("de.cau.cs.kieler.commentBox",Rn),new Zn("de.cau.cs.kieler.diagramType"),da=new nt("de.cau.cs.kieler.edgeLabelPlacement",(Es(),Gk)),BT=new nt("de.cau.cs.kieler.edgeType",(cp(),Fk)),C_=new Zn("de.cau.cs.kieler.fontName"),x_=new nt("de.cau.cs.kieler.fontSize",gt(0)),wb=new nt("de.cau.cs.kieler.hypernode",Rn),Un=new nt("de.cau.cs.kieler.junctionPoints",new xi),new nt("de.cau.cs.kieler.layoutAncestors",Rn),mb=new nt("de.cau.cs.kieler.margins",new A1),nv=new Ul("de.cau.cs.kieler.minHeight",new Ut(0),new Ut(0)),rv=new Ul("de.cau.cs.kieler.minWidth",new Ut(0),new Ut(0)),yb=new nt("de.cau.cs.kieler.noLayout",Rn),vl=new Zn("de.cau.cs.kieler.offset"),yu=new Zn("de.cau.cs.kieler.klay.layered.portAnchor"),ku=new Zn("de.cau.cs.kieler.portIndex"),Eb=new nt("de.cau.cs.kieler.portSide",(we(),fr)),new nt("de.cau.cs.kieler.progressBar",Rn),new nt("de.cau.cs.kieler.resetConfig",oi),new nt("de.cau.cs.kieler.scaleFactor",new Ut(1)),es=new nt("de.cau.cs.kieler.thickness",new Ut(1)),new nt("de.cau.cs.kieler.zoomToFit",Rn),AT=new Zn("de.cau.cs.kieler.algorithm"),go=new nt("de.cau.cs.kieler.alignment",(Zo(),_k)),E_=new nt("de.cau.cs.kieler.aspectRatio",new Ut(0)),Vk=new Zn("de.cau.cs.kieler.bendPoints"),RT=new nt("de.cau.cs.kieler.borderSpacing",new Ut(-1)),pb=new nt(wH,Rn),Oo=new nt("de.cau.cs.kieler.direction",($n(),Mo)),hf=new nt("de.cau.cs.kieler.edgeRouting",(du(),Yk)),S_=new nt("de.cau.cs.kieler.expandNodes",Rn),zT=new nt("de.cau.cs.kieler.hierarchyHandling",(K0(),qk)),T_=new nt("de.cau.cs.kieler.interactive",Rn),Mh=new Ul("de.cau.cs.kieler.labelSpacing",new Ut(3),new Ut(0)),HT=new nt("de.cau.cs.kieler.layoutHierarchy",Rn),ia=new nt("de.cau.cs.kieler.nodeLabelPlacement",(pu(),t=f(Gi(Ln),11),new ri(t,f(Ti(t,t.length),11),0))),dt=new nt("de.cau.cs.kieler.portConstraints",(zn(),cc)),kb=new nt("de.cau.cs.kieler.portLabelPlacement",(bh(),xb)),GT=new Ul("de.cau.cs.kieler.portSpacing",new Ut(-1),new Ut(0)),Wk=new nt("de.cau.cs.kieler.portAlignment",(ec(),Ds)),Kk=new nt("de.cau.cs.kieler.portAlignment.north",df),Zk=new nt("de.cau.cs.kieler.portAlignment.south",df),Xk=new nt("de.cau.cs.kieler.portAlignment.west",df),Uk=new nt("de.cau.cs.kieler.portAlignment.east",df),Oh=new Zn("de.cau.cs.kieler.position"),$T=new Zn("de.cau.cs.kieler.priority"),new Zn(mH),Qk=new nt("de.cau.cs.kieler.selfLoopInside",Rn),YT=new Zn("de.cau.cs.kieler.separateConnComp"),uc=new nt("de.cau.cs.kieler.sizeConstraint",(gu(),e=f(Gi(iv),11),new ri(e,f(Ti(e,e.length),11),0))),Sb=new nt("de.cau.cs.kieler.sizeOptions",Ft((Eh(),Pb),re(ie(oE,1),De,139,0,[rE]))),FT=new Ul("de.cau.cs.kieler.spacing",new Ut(-1),new Ut(0)),L_=new nt("de.cau.cs.kieler.layoutPartitions",Rn),_T=new Zn("de.cau.cs.kieler.partition")}function Gfe(e,t,n,i){Oz();var s,l,h,v,p,m,S,x,L,j,I,R,Y,q,V;if(!(!i&&(e.n?e.n:(Qt(),Qt(),Y6)).R(new XN(t)))){if(f(nL.a,18).kb(t)){if(!n.lc())throw new Co(xH+t+uf+n+").");j=f(f(nL.b,57).cb(t),79),I=n.lc().a,ce(e,j,I);return}else if(f(tL.a,18).kb(t))try{if(!n.jc())throw new Yj;j=f(f(tL.b,57).cb(t),79),q=gt(Rue((mn(),""+n.jc().a))),ce(e,j,q);return}catch(U){throw U=Kr(U),xe(U,130)?new Co("Invalid integer format for property '"+t+uf+n+")."):Zr(U)}else if(f(XT.a,18).kb(t)){if(!n.ic())throw new Co(xH+t+uf+n+").");j=f(f(XT.b,57).cb(t),79),q=(yn(),n.ic().a?oi:Rn),ce(e,j,q);return}else if(f(eL.a,18).kb(t)){if(!n.jc())throw new Co("Invalid float format for property '"+t+uf+n+").");j=f(f(eL.b,57).cb(t),79),q=new fj(n.jc().a),ce(e,j,q);return}else if(f(JT.a,18).kb(t)){if(!n.lc())throw new Co(rT+t+uf+n+").");S=n.lc().a,x=null;try{Gn((Ee(),Eb),t)?x=(we(),f(Br((pA(),O_),S),32)):Gn(go,t)?x=(Zo(),f(Br((xA(),f_),S),103)):Gn(Oo,t)?x=($n(),f(Br((bA(),h_),S),59)):Gn(hf,t)?x=(du(),f(Br((oA(),b_),S),122)):Gn(zT,t)?x=(K0(),f(Br((ZO(),y_),S),166)):Gn(Wk,t)||Gn(Uk,t)||Gn(Kk,t)||Gn(Zk,t)||Gn(Xk,t)?x=(ec(),f(Br((wA(),D_),S),100)):Gn(dt,t)?x=(zn(),f(Br((LA(),N_),S),28)):Gn(kb,t)?x=(bh(),f(Br((KO(),M_),S),149)):Gn(BT,t)?x=(cp(),f(Br((TA(),w_),S),133)):Gn(da,t)?x=(Es(),f(Br((aA(),v_),S),107)):Gn((zt(),f5),t)?x=(D0(),f(Br((BO(),BG),S),193)):Gn(g5,t)?x=(_0(),f(Br((XO(),GG),S),173)):Gn(Vh,t)?x=(ap(),f(Br((zA(),q$),S),115)):Gn(u5,t)?x=(Mg(),f(Br((cA(),l$),S),194)):Gn(cw,t)?x=(Pg(),f(Br((HO(),ZG),S),192)):Gn(fw,t)?x=(rl(),f(Br((RA(),LG),S),109)):Gn(b5,t)?x=(rp(),f(Br((BA(),o$),S),141)):Gn(hw,t)?x=(Yd(),f(Br((PA(),NG),S),125)):Gn(w5,t)?x=(R0(),f(Br((zO(),DG),S),175)):Gn(lw,t)?x=(Vg(),f(Br((ZA(),W$),S),124)):Gn(d5,t)?x=(nb(),f(Br((vR(),K$),S),110)):Gn(Sr,t)?x=(Fi(),f(Br((HA(),nY),S),85)):Gn(m5,t)?x=(Q0(),f(Br((SA(),aY),S),153)):Gn(bv,t)?x=(hu(),f(Br((CA(),sY),S),172)):Gn(v5,t)&&(x=(O0(),f(Br((lA(),X$),S),174)))}catch(U){throw U=Kr(U),xe(U,54)?new Co(rT+t+uf+n+")."):Zr(U)}j=f(f(JT.b,57).cb(t),79),ce(e,j,x);return}else if(f(QT.a,18).kb(t)){if(!n.lc())throw new Co(rT+t+uf+n+").");for(m=n.lc().a,R=null,p=pp(m,"[\\[\\]\\s,]+"),h=0,v=p.length;h<v;++h)l=p[h],gg(Jc(l))!=0&&(Gn((Ee(),ia),t)?(!R&&(R=(s=f(Gi(Ln),11),new ri(s,f(Ti(s,s.length),11),0))),di(R,(pu(),f(Br((FA(),P_),l),41)))):Gn(uc,t)?(!R&&(R=(s=f(Gi(iv),11),new ri(s,f(Ti(s,s.length),11),0))),di(R,(gu(),f(Br((uA(),A_),l),150)))):Gn(Sb,t)?(!R&&(R=(s=f(Gi(oE),11),new ri(s,f(Ti(s,s.length),11),0))),di(R,(Eh(),f(Br((sA(),R_),l),139)))):Gn((zt(),l5),t)&&(!R&&(R=(s=f(Gi(GE),11),new ri(s,f(Ti(s,s.length),11),0))),di(R,(Gd(),f(Br((KA(),Y$),l),123)))));j=f(f(QT.b,57).cb(t),79),ce(e,j,R);return}else if(f(_p.a,18).kb(t)){if(!n.lc())throw new Co("Invalid _other_ format for property '"+t+uf+n+").");if(Gn((Ee(),Oh),t)||Gn(yu,t))try{Y=new Fr,Uce(Y,n.lc().a),j=f(f(_p.b,57).cb(t),79),ce(e,j,Y);return}catch(U){throw U=Kr(U),xe(U,29)?new Co("Invalid KVector format for property '"+t+"' "+n+"."):Zr(U)}else if(Gn(Vk,t)||Gn(Un,t))try{V=new xi,Ece(V,n.lc().a),j=f(f(_p.b,57).cb(t),79),ce(e,j,V);return}catch(U){throw U=Kr(U),xe(U,29)?new Co("Invalid KVectorChain format for property '"+t+"' "+n+"."):Zr(U)}else if(Gn(mb,t)||Gn(bb,t))try{L=new A1,nle(L,n.lc().a),j=f(f(_p.b,57).cb(t),79),ce(e,j,L);return}catch(U){throw U=Kr(U),xe(U,29)?new Co("Invalid Margins format for property '"+t+"' "+n+"."):Zr(U)}}else if(f(oG.a,18).kb(t))return;throw new Co("Unsupported layout option '"+t+uf+n+").")}}var mp="object",Nr={3:1,8:1,5:1,6:1},zx={3:1,46:1},Ys={3:1,54:1,46:1},Fs="null",vk="anonymous",Hx="Unknown",iH="function",kr=2147483647,aH={181:1,3:1,54:1,46:1},rb=65536,Ts=65535,oH={3:1,54:1,29:1,46:1},gk='For input string: "',qs=-2147483648,Ir={56:1},_x={23:1,145:1,185:1},mi={3:1,5:1},Gx="Invalid UTF8 sequence",sH="fromIndex: ",zr="java.lang",$x="com.google.gwt.core.client",yp="com.google.gwt.core.client.impl",kp="java.io",Yx="java.nio.charset",Fx="javaemul.internal",No="com.google.common.base",uH="%s (%s) must not be negative",Me={3:1,5:1,6:1},cH="negative size: ",De={3:1,8:1,5:1,11:1,6:1},Ep={68:1,136:1,3:1,23:1,17:1},qd={108:1,35:1},Re="com.google.common.collect",bk={108:1,35:1,96:1},ib={144:1,3:1},ir={35:1},Th={57:1},wt="java.util",Vd={22:1,19:1},vi={22:1,19:1,18:1},Lh={22:1,19:1,20:1},pk={22:1,19:1,20:1,63:1},Ph={35:1,96:1},qx={22:1,19:1,18:1,137:1},ab={21:1},lH="AbstractMapEntry",Vx={207:1,22:1,19:1},Wx={159:1,3:1,23:1,17:1},Ux=1073741824,rc={22:1},Kx={3:1,22:1,19:1},Dh={87:1,3:1,22:1,19:1,20:1,63:1},jh={3:1,57:1},Nh={3:1,22:1,19:1,18:1},yi={64:1},Zx="arraySize",ul="initialArraySize",Xx={64:1,188:1,3:1,23:1,17:1},Qx="occurrences",Wn={52:1,3:1,5:1},Jx={205:1,3:1,23:1,17:1},ob=1e-4,af="com.google.gwt.json.client",Wa=4194303,ic=1048575,of=4194304,ac=17592186044416,wk=-17592186044416,fH=`([{"' 	\r
-`,hH=`)]}"' 	\r
-`,dH="The given string contains parts that cannot be parsed as numbers.",vH="de.cau.cs.kieler.core.math",eT=-17976931348623157e292,Sp="de.cau.cs.kieler.core.properties",gH={79:1,23:1},bH="de.cau.cs.kieler.core.util",pH="de.cau.cs.kieler.kiml",Wd="LEFT",Ud="RIGHT",Cp="CENTER",Vs="de.cau.cs.kieler.kiml.options",sf="UNDEFINED",Kd="NONE",wH="de.cau.cs.kieler.debugMode",mH="de.cau.cs.kieler.randomSeed",Zd="de.cau.cs.kieler.kiml.util.nodespacing",tT="de.cau.cs.kieler.kiml.util.labelspacing",yH="portRatioOrPosition",kH="NodeMarginCalculator",nT="bottom",EH={286:1,121:1,3:1,5:1},sb="undefined",mk="text",SH="stacktrace",Ht={34:1,3:1,8:1,5:1,6:1},yk="properties",kk="bendPoints",CH="junctionPoints",Ek="width",Sk="height",Ck="padding",Xd="children",Ii={38:1,39:1,42:1,51:1,71:1,3:1,8:1,5:1,6:1},xk="de.cau.cs.kieler.klay.gwt.client.layout",xH="Invalid boolean format for property '",uf="' (",rT="Invalid enum format for property '",iT="de.cau.cs.kieler.klay.layered",TH="Layered layout",ki=1/0,Hr=-1/0,ub="de.cau.cs.kieler.klay.layered.compaction.components",Qd="de.cau.cs.kieler.klay.layered.compaction.oned",LH=" instance has been finished already.",cf="de.cau.cs.kieler.klay.layered.compaction.oned.algs",Ws="de.cau.cs.kieler.klay.layered.compaction.recthull",vo={68:1},Ls="de.cau.cs.kieler.klay.layered.components",aT={3:1,5:1,22:1,13:1,19:1,20:1,63:1},PH=1.600000023841858,mu=.001,pn={31:1},cb="de.cau.cs.kieler.klay.layered.compound",qi={38:1,39:1,47:1,42:1,3:1,8:1,5:1,6:1},Xr="de.cau.cs.kieler.klay.layered.graph",DH="Port side is undefined",bt="de.cau.cs.kieler.klay.layered.intermediate",jH="Big nodes pre-processing",NH=34028234663852886e22,IH={38:1,39:1,42:1,346:1,71:1,3:1,8:1,5:1,6:1},oT="Node '",MH="' has its layer constraint set to FIRST or FIRST_SEPARATE, but has ",OH="at least one incoming edge. Connections between nodes with these ",sT="layer constraints are not supported.",Xo=17976931348623157e292,AH="Odd port side processing",xp={250:1,3:1,5:1},oc=1e-8,Io="de.cau.cs.kieler.klay.layered.intermediate.compaction",Ma="de.cau.cs.kieler.klay.layered.intermediate.greedyswitch",lb={227:1,3:1,5:1},Jd="de.cau.cs.kieler.klay.layered.networksimplex",Tk="INTERACTIVE",uT="de.cau.cs.kieler.klay.layered.p1cycles",Qo={106:1,31:1},Tp="de.cau.cs.kieler.klay.layered.p2layers",RH="NETWORK_SIMPLEX",sc="de.cau.cs.kieler.klay.layered.p3order",Lk=5960464477539063e-23,cT="Port type is undefined",lT=.30000001192092896,fT=.699999988079071,BH=.8999999761581421,zH="de.cau.cs.kieler.klay.layered.p3order.constraints",fb="de.cau.cs.kieler.klay.layered.p3order.counting",hb="de.cau.cs.kieler.klay.layered.p4nodes",HH={625:1,3:1,5:1,6:1},Jo="de.cau.cs.kieler.klay.layered.p4nodes.bk",cl="de.cau.cs.kieler.klay.layered.p5edges",ll="de.cau.cs.kieler.klay.layered.p5edges.splines",fl=1e-6,Lp=-1e-6,_H="The list of vectors may not be empty.",Pk=.09999999999999998,Us="de.cau.cs.kieler.klay.layered.properties",hl="_gwt_modCount",GH={3:1,22:1,19:1,20:1,63:1},$H={3:1,5:1,57:1},YH={3:1,5:1,22:1,19:1,50:1,18:1},Dk="delete",jk=15525485,hT=16777216,dT=16777215,FH={3:1,5:1,22:1,19:1,20:1,63:1},Nk={3:1,23:1,17:1,138:1},w,Pp,Ik;noe(),A(1,null,{},d),w.t=function(t){return this===t},w.u=function(){return this.$c},w.v=function(){return su(this)},w.w=function(){return PO(this)},w.toString=function(){return this.w()},A(46,1,zx),w.bc=function(){return this.f},w.w=function(){var t,n;return t=_1(this.$c),n=this.bc(),n!=null?t+": "+n:t},A(54,46,Ys),A(72,54,Ys,Bs),A(164,72,{164:1,3:1,54:1,46:1},vA),w.bc=function(){return fse(this),this.c},w.cc=function(){return He(this.b)===He(Dp)?null:this.b};var Dp,vT;A(642,1,{}),A(356,642,{},b),w.dc=function(t,n){var i={},s=[];t.__gwt$backingJsError={fnStack:s};for(var l=arguments.callee.caller;l;){var h=(Bd(),l.name||(l.name=Kie(l.toString())));s.push(h);var v=":"+h,p=i[v];if(p){var m,S;for(m=0,S=p.length;m<S;m++)if(p[m]===l)return}(p||(i[v]=[])).push(l),l=l.caller}},w.ec=function(t){var n,i,s,l,h;for(s=(Bd(),h=t.__gwt$backingJsError,h&&h.fnStack?h.fnStack:[]),i=s.length,l=ve(cY,Nr,146,i,0,1),n=0;n<i;n++)l[n]=new Zy(s[n],null,-1);return l},A(643,642,{}),w.dc=function(t,n){function i(l){if(!("stack"in l))try{throw l}catch{}return l}var s;typeof n=="string"?s=i(new Error(n.replace(`
-`," "))):n&&typeof n==mp&&"stack"in n?s=n:s=i(new Error),t.__gwt$backingJsError=s},w.fc=function(t,n,i,s){return new Zy(n,t+"@"+s,i<0?-1:i)},w.ec=function(t){var n,i,s,l,h,v,p;if(l=(Bd(),p=t.__gwt$backingJsError,p&&p.stack?p.stack.split(`
-`):[]),h=ve(cY,Nr,146,0,0,1),n=0,s=l.length,s==0)return h;for(v=Gz(this,l[0]),Ho(v.d,vk)||(h[n++]=v),i=1;i<s;i++)h[n++]=Gz(this,l[i]);return h},A(357,643,{},h9),w.fc=function(t,n,i,s){return new Zy(n,t,-1)};var qH,VH,WH;A(181,54,aH),A(351,181,aH,$ee),A(288,1,{},yC),w.Oc=function(t){var n;return n=new yC,n.g=4,t>1?n.c=OO(this,t-1):n.c=this,n},w.Pc=function(){return Gl(this),this.b},w.Qc=function(){return _1(this)},w.Rc=function(){return vN(this)},w.Sc=function(){return(this.g&4)!=0},w.Tc=function(){return(this.g&1)!=0},w.w=function(){return(this.g&2?"interface ":this.g&1?"":"class ")+(Gl(this),this.n)},w.g=0,A(119,72,{3:1,119:1,54:1,46:1},Cj),A(29,72,oH,dd,nn),A(95,72,Ys,$S,_o),A(231,1,{3:1,231:1});var gT;A(24,231,{3:1,23:1,24:1,231:1},jS),w.F=function(t){return Tte(this,f(t,24))},w.t=function(t){return xe(t,24)&&f(t,24).a==this.a},w.v=function(){return this.a},w.w=function(){return G1(this.a)},w.a=0,WH={3:1,345:1,23:1,2:1},A(350,1,Ir,ud),w.$b=function(t,n){return eie(oh(t),oh(n))},A(257,95,Ys,ite),A(145,1,{23:1,145:1}),w.F=function(t){return xte(this,f(t,145))},w.t=function(t){var n;return t===this?!0:xe(t,145)?(n=f(t,145),Ho(this.a,n.a)):!1},w.v=function(){return G2(this.a)},w.w=function(){return this.a},A(358,29,oH,Nne),A(256,29,{3:1,54:1,29:1,46:1,256:1},jne),A(185,145,_x),A(289,185,_x,ate),w.Zc=function(t,n,i){var s,l;for(s=ve(bY,mi,26,i,12,1),l=0;l<i;++l)s[l]=t[n+l]&255&Ts;return s},A(355,185,_x,Cte),w.Zc=function(t,n,i){var s,l,h,v,p,m,S,x;for(h=0,S=0;S<i;){if(++h,l=t[n+S],(l&192)==128)throw new nn(Gx);if(!(l&128))++S;else if((l&224)==192)S+=2;else if((l&240)==224)S+=3;else if((l&248)==240)S+=4;else throw new nn(Gx);if(S>i)throw new _o(Gx)}for(v=ve(bY,mi,26,h,12,1),x=0,p=0,m=0;m<i;){for(l=t[n+m++],l&128?(l&224)==192?(p=2,l&=31):(l&240)==224?(p=3,l&=15):(l&248)==240?(p=4,l&=7):(l&252)==248&&(p=5,l&=3):(p=1,l&=127);--p>0;){if(s=t[n+m++],(s&192)!=128)throw new nn("Invalid UTF8 sequence at "+(n+m-1)+", byte="+(s>>>0).toString(16));l=l<<6|s&63}x+=Ooe(l,v,x)}return v};var Ze=G(zr,"Object",1),$fe=G(zr,"Throwable",46);G(zr,"Exception",54),G(zr,"RuntimeException",72),G($x,"JavaScriptException",164),G(yp,"StackTraceCreator/Collector",642),G(yp,"StackTraceCreator/CollectorLegacy",356),G(yp,"StackTraceCreator/CollectorModern",643),G(yp,"StackTraceCreator/CollectorModernNoSourceMap",357),G(kp,"IOException",181),G(kp,"UnsupportedEncodingException",351),G(zr,"Class",288),G(zr,"ClassCastException",119),G(zr,"IllegalArgumentException",29),G(zr,"IndexOutOfBoundsException",95),G(zr,"Number",231);var Mk=G(zr,"Integer",24),Ok=G(zr,"String",2);G(zr,"String/1",350),G(zr,"StringIndexOutOfBoundsException",257),G(Yx,"Charset",145),G(Yx,"IllegalCharsetNameException",358),G(Yx,"UnsupportedCharsetException",256),G(Fx,"EmulatedCharset",185),G(Fx,"EmulatedCharset/LatinCharset",289),G(Fx,"EmulatedCharset/UtfCharset",355),A(669,1,{3:1}),G(No,"Optional",669),A(601,669,{3:1},g),w.t=function(t){return t===this},w.v=function(){return 2040732332},w.w=function(){return"Optional.absent()"},w.A=function(t){return vt(t),tg(),Ak};var Ak;G(No,"Absent",601);var Yfe=w0(No,"Function");A(208,1,{},B1),w.C=function(t){return rO(t)},G(No,"Joiner",208),A(363,208,{},NM),w.C=function(t){return a0(this,t)},G(No,"Joiner/1",363),A(362,1,{},XI),G(No,"Joiner/MapJoiner",362);var Ffe=w0(No,"Predicate"),UH;A(244,1,{68:1,244:1,3:1},L9),w.D=function(t){var n;for(n=0;n<this.a.a.length;n++)if(!f(FM(this.a,n),68).D(t))return!1;return!0},w.t=function(t){var n;return xe(t,244)?(n=f(t,244),DB(this.a,n.a)):!1},w.v=function(){return IR(this.a)+306654252},w.w=function(){return"Predicates.and("+O4((U1(),UH),new Yf(this.a))+")"},G(No,"Predicates/AndPredicate",244),A(246,1,{68:1,246:1,3:1},TN),w.D=function(t){try{return this.a.kb(t)}catch(n){if(n=Kr(n),xe(n,76))return!1;if(xe(n,119))return!1;throw Zr(n)}},w.t=function(t){var n;return xe(t,246)?(n=f(t,246),this.a.t(n.a)):!1},w.v=function(){return this.a.v()},w.w=function(){return"Predicates.in("+this.a+")"},G(No,"Predicates/InPredicate",246),A(245,1,{68:1,245:1,3:1},P9),w.D=function(t){return jo(this.a,t)},w.t=function(t){var n;return xe(t,245)?(n=f(t,245),jo(this.a,n.a)):!1},w.v=function(){return Ko(this.a)},w.w=function(){return"Predicates.equalTo("+this.a+")"},G(No,"Predicates/IsEqualToPredicate",245),A(17,1,{3:1,23:1,17:1}),w.F=function(t){return qee(this,f(t,17))},w.t=function(t){return this===t},w.v=function(){return su(this)},w.w=function(){return c0(this)},w.e=0;var on=G(zr,"Enum",17);A(136,17,Ep);var KH,ZH,bT,XH,jp=At(No,"Predicates/ObjectPredicate",136,on,Ere);A(591,136,Ep,dM),w.D=function(t){return!0},w.w=function(){return"Predicates.alwaysTrue()"},At(No,"Predicates/ObjectPredicate/1",591,jp,null),A(592,136,Ep,vM),w.D=function(t){return!1},w.w=function(){return"Predicates.alwaysFalse()"},At(No,"Predicates/ObjectPredicate/2",592,jp,null),A(593,136,Ep,II),w.D=function(t){return t==null},w.w=function(){return"Predicates.isNull()"},At(No,"Predicates/ObjectPredicate/3",593,jp,null),A(594,136,Ep,GI),w.D=function(t){return t!=null},w.w=function(){return"Predicates.notNull()"},At(No,"Predicates/ObjectPredicate/4",594,jp,null),A(177,669,{177:1,3:1},j1),w.t=function(t){var n;return xe(t,177)?(n=f(t,177),jo(this.a,n.a)):!1},w.v=function(){return 1502476572+Ko(this.a)},w.w=function(){return"Optional.of("+this.a+")"},w.A=function(t){return new j1(e2(t.B(this.a),"the Function passed to Optional.transform() must not return null."))},G(No,"Present",177),A(108,1,qd),w.I=function(){jee()},G(Re,"UnmodifiableIterator",108),A(651,108,bk),w.J=function(t){throw new Fn},w.O=function(t){throw new Fn},G(Re,"UnmodifiableListIterator",651),A(378,651,bk),w.G=function(){return this.b<this.c},w.K=function(){return this.b>0},w.H=function(){if(this.b>=this.c)throw new sa;return gN(this,this.b++)},w.L=function(){return this.b},w.M=function(){if(this.b<=0)throw new sa;return gN(this,--this.b)},w.N=function(){return this.b-1},w.b=0,w.c=0,G(Re,"AbstractIndexedListIterator",378),A(428,108,qd),w.G=function(){return Ku(this)},w.H=function(){return Xl(this)},w.d=1,G(Re,"AbstractIterator",428),A(653,1,{144:1}),w.P=function(){var t;return t=this.f,t||(this.f=this.S())},w.T=function(){return new $m(this.P())},w.t=function(t){return mC(this,t)},w.v=function(){return this.P().v()},w.V=function(){return this.Y()==0},w.W=function(){return Hy(this)},w.w=function(){return this.P().w()},G(Re,"AbstractMultimap",653),A(294,653,ib),w.Q=function(){OC(this)},w.R=function(t){return dh(this.b,t)},w.S=function(){return new Ym(this,this.b)},w.T=function(){return new qI(this,this.b)},w.$=function(){return doe(this.Z())},w.U=function(t){return Ia(this,t)},w.X=function(t){return ek(this,t)},w.Y=function(){return this.c},w.c=0,G(Re,"AbstractMapBasedMultimap",294),A(600,294,ib),w.Z=function(){return new Ni(this.a)},w.$=function(){return gr(),gr(),db},w.U=function(t){return f(Ia(this,t),20)},w.X=function(t){return f(ek(this,t),20)},w.P=function(){var t;return t=this.f,t||(this.f=new Ym(this,this.b))},w.t=function(t){return mC(this,t)},G(Re,"AbstractListMultimap",600),A(388,1,ir),w.G=function(){return this.b.b||this.d.G()},w.H=function(){var t;return this.d.G()||(t=Rd(this.b),t.yb(),this.a=f(t.zb(),19),this.d=this.a.mb()),this.d.H()},w.I=function(){this.d.I(),this.a.V()&&V3(this.b),--this.c.c},G(Re,"AbstractMapBasedMultimap/Itr",388),A(389,388,ir,QA),G(Re,"AbstractMapBasedMultimap/1",389),A(638,1,Th),w.Q=function(){this.bb().Q()},w._=function(t){return F2(this,t)},w.R=function(t){return!!WC(this,t,!1)},w.ab=function(t){var n,i,s;for(i=this.bb().mb();i.G();)if(n=f(i.H(),21),s=n.zb(),He(t)===He(s)||t!=null&&jo(t,s))return!0;return!1},w.t=function(t){return oB(this,t)},w.cb=function(t){return li(WC(this,t,!1))},w.v=function(){return gC(this.bb())},w.V=function(){return this.Y()==0},w.W=function(){return new Wt(this)},w.db=function(t,n){throw new qf("Put not supported on this map")},w.eb=function(t){return li(WC(this,t,!0))},w.Y=function(){return this.bb().Y()},w.w=function(){return Q8(this)},w.fb=function(){return new Kv(this)},G(wt,"AbstractMap",638),A(654,638,Th),w.bb=function(){return h3(this)},w.W=function(){var t;return t=this.d,t||(this.d=new $m(this))},w.fb=function(){return oO(this)},G(Re,"Maps/ViewCachingAbstractMap",654),A(262,654,Th,Ym),w.cb=function(t){return jie(this,t)},w.eb=function(t){return kae(this,t)},w.Q=function(){this.a==this.b.b?OC(this.b):S0(new N3(this))},w.R=function(t){return T8(this.a,t)},w.hb=function(){return new D9(this)},w.gb=function(){return this.hb()},w.t=function(t){return this===t||oB(this.a,t)},w.v=function(){return gC(new ou(this.a))},w.W=function(){return Hy(this.b)},w.Y=function(){return W1(this.a)},w.w=function(){return Q8(this.a)},G(Re,"AbstractMapBasedMultimap/AsMap",262),A(640,1,Vd),w.ib=function(t){return Zre()},w.jb=function(t){return na(this,t)},w.Q=function(){T0(this)},w.kb=function(t){return Hg(this,t,!1)},w.lb=function(t){return Xu(this,t)},w.V=function(){return this.Y()==0},w.nb=function(t){return Hg(this,t,!0)},w.ob=function(){return this.pb(ve(Ze,Me,1,this.Y(),4,1))},w.pb=function(t){return Y2(this,t)},w.w=function(){return nc(this)},G(wt,"AbstractCollection",640),A(641,640,vi),w.t=function(t){return c8(this,t)},w.v=function(){return gC(this)},G(wt,"AbstractSet",641),A(649,641,vi),G(Re,"Sets/ImprovedAbstractSet",649),A(655,649,vi),w.Q=function(){this.qb().Q()},w.kb=function(t){return h8(this,t)},w.V=function(){return this.qb().V()},w.nb=function(t){var n;return this.kb(t)?(n=f(t,21),this.qb().W().nb(n.yb())):!1},w.Y=function(){return this.qb().Y()},G(Re,"Maps/EntrySet",655),A(387,655,vi,D9),w.kb=function(t){return L8(new ou(this.a.a),t)},w.mb=function(){return new N3(this.a)},w.qb=function(){return this.a},w.nb=function(t){var n;return L8(new ou(this.a.a),t)?(n=f(t,21),sie(this.a.b,n.yb()),!0):!1},G(Re,"AbstractMapBasedMultimap/AsMap/AsMapEntries",387),A(299,1,ir,N3),w.H=function(){var t;return t=Rd(this.b),this.a=f(t.zb(),19),Lie(this.c,t)},w.G=function(){return this.b.b},w.I=function(){V3(this.b),this.c.b.c-=this.a.Y(),this.a.Q()},G(Re,"AbstractMapBasedMultimap/AsMap/AsMapIterator",299),A(260,649,vi,$m),w.Q=function(){this.b.Q()},w.kb=function(t){return this.b.R(t)},w.V=function(){return this.b.V()},w.mb=function(){return On(),Dy(this.b.bb().mb(),(n0(),Rk))},w.nb=function(t){return this.b.R(t)?(this.b.eb(t),!0):!1},w.Y=function(){return this.b.Y()},G(Re,"Maps/KeySet",260),A(386,260,vi,qI),w.Q=function(){var t;S0((t=this.b.bb().mb(),new u4(this,t)))},w.lb=function(t){return this.b.W().lb(t)},w.t=function(t){return this===t||this.b.W().t(t)},w.v=function(){return this.b.W().v()},w.mb=function(){var t;return t=this.b.bb().mb(),new u4(this,t)},w.nb=function(t){var n,i;return i=0,n=f(this.b.eb(t),19),n&&(i=n.Y(),n.Q(),this.a.c-=i),i>0},G(Re,"AbstractMapBasedMultimap/KeySet",386),A(300,1,ir,u4),w.G=function(){return this.c.G()},w.H=function(){return this.a=f(this.c.H(),21),this.a.yb()},w.I=function(){var t;Jl(!!this.a),t=f(this.a.zb(),19),this.c.I(),this.b.a.c-=t.Y(),t.Q()},G(Re,"AbstractMapBasedMultimap/KeySet/1",300),A(216,640,Vd,Ng),w.ib=function(t){return Rie(this,t)},w.jb=function(t){return zae(this,t)},w.Q=function(){Hre(this)},w.kb=function(t){return Na(this),this.d.kb(t)},w.lb=function(t){return Na(this),this.d.lb(t)},w.t=function(t){return ere(this,t)},w.v=function(){return Na(this),this.d.v()},w.mb=function(){return Na(this),new n3(this)},w.nb=function(t){return Qre(this,t)},w.Y=function(){return Na(this),this.d.Y()},w.w=function(){return Na(this),ha(this.d)},G(Re,"AbstractMapBasedMultimap/WrappedCollection",216);var qfe=w0(wt,"List");A(297,216,Lh,v3),w.rb=function(t,n){var i;Na(this),i=this.d.V(),f(this.d,20).rb(t,n),++this.a.c,i&&d0(this)},w.sb=function(t){return Na(this),f(this.d,20).sb(t)},w.tb=function(){return Na(this),new DI(this)},w.ub=function(t){return Na(this),new mO(this,t)},w.vb=function(t){var n;return Na(this),n=f(this.d,20).vb(t),--this.a.c,C0(this),n},w.wb=function(t,n){return Na(this),f(this.d,20).wb(t,n)},w.xb=function(t,n){return Na(this),B3(this.a,this.e,f(this.d,20).xb(t,n),this.b?this.b:this)},G(Re,"AbstractMapBasedMultimap/WrappedList",297),A(385,297,pk,oM),G(Re,"AbstractMapBasedMultimap/RandomAccessWrappedList",385),A(189,1,ir,n3),w.G=function(){return uh(this),this.b.G()},w.H=function(){return uh(this),this.b.H()},w.I=function(){this.b.I(),--this.d.f.c,C0(this.d)},G(Re,"AbstractMapBasedMultimap/WrappedCollection/WrappedIterator",189),A(298,189,Ph,DI,mO),w.J=function(t){var n;n=yte(this.a)==0,(uh(this),f(this.b,96)).J(t),++this.a.a.c,n&&d0(this.a)},w.K=function(){return(uh(this),f(this.b,96)).K()},w.L=function(){return(uh(this),f(this.b,96)).L()},w.M=function(){return(uh(this),f(this.b,96)).M()},w.N=function(){return(uh(this),f(this.b,96)).N()},w.O=function(t){(uh(this),f(this.b,96)).O(t)},G(Re,"AbstractMapBasedMultimap/WrappedList/WrappedListIterator",298),A(295,216,vi,$4),G(Re,"AbstractMapBasedMultimap/WrappedSet",295),A(296,216,qx,Y4),G(Re,"AbstractMapBasedMultimap/WrappedSortedSet",296),A(668,1,ab),w.t=function(t){var n;return xe(t,21)?(n=f(t,21),Wl(this.yb(),n.yb())&&Wl(this.zb(),n.zb())):!1},w.v=function(){var t,n;return t=this.yb(),n=this.zb(),(t==null?0:Ko(t))^(n==null?0:Ko(n))},w.Ab=function(t){throw new Fn},w.w=function(){return this.yb()+"="+this.zb()},G(Re,lH,668),A(390,640,Vd,j9),w.Q=function(){OC(this.a)},w.kb=function(t){return Dae(this.a,t)},w.mb=function(){return new QA(this.a)},w.Y=function(){return this.a.c},G(Re,"AbstractMultimap/Values",390),A(656,640,Vx),w.ib=function(t){return this.Bb(t,1),!0},w.Bb=function(t,n){throw new Fn},w.jb=function(t){return sse(this,t)},w.Q=function(){S0(this.Eb())},w.kb=function(t){return this.Cb(t)>0},w.Cb=function(t){var n,i;for(i=ch(this).mb();i.G();)if(n=f(i.H(),83),Wl(n.Zb(),t))return n.Yb();return 0},w.gb=function(){return new N9(this)},w.bb=function(){return ch(this)},w.t=function(t){return Kse(this,t)},w.v=function(){return ch(this).v()},w.V=function(){return ch(this).V()},w.mb=function(){return Ff(),new MN(this,ch(this).mb())},w.nb=function(t){return this.Fb(t,1)>0},w.Fb=function(t,n){throw new Fn},w.Gb=function(t,n){var i,s;return Ff(),hi(n,"count"),i=this.Cb(t),s=n-i,s>0?this.Bb(t,s):s<0&&this.Fb(t,-s),i},w.Hb=function(t,n,i){return Iae(this,t,n,i)},w.Y=function(){return vae(this)},w.w=function(){return ha(ch(this))},G(Re,"AbstractMultiset",656),A(657,649,vi),w.Q=function(){this.Ib().Q()},w.kb=function(t){var n,i;return xe(t,83)?(i=f(t,83),i.Yb()<=0?!1:(n=this.Ib().Cb(i.Zb()),n==i.Yb())):!1},w.nb=function(t){var n,i,s,l;return xe(t,83)&&(i=f(t,83),n=i.Zb(),s=i.Yb(),s!=0)?(l=this.Ib(),l.Hb(n,s,0)):!1},G(Re,"Multisets/EntrySet",657),A(396,657,vi,N9),w.mb=function(){return this.a.Eb()},w.Ib=function(){return this.a},w.Y=function(){return this.a.Db()},G(Re,"AbstractMultiset/EntrySet",396),A(384,294,ib),w.Z=function(){return new Gm(y2(this.a))},w.$=function(){return Ta(),lh(),ev},w.U=function(t){return f(Ia(this,t),18)},w.X=function(t){return f(ek(this,t),18)},w.P=function(){var t;return t=this.f,t||(this.f=new Ym(this,this.b))},w.t=function(t){return mC(this,t)},G(Re,"AbstractSetMultimap",384),A(342,656,Vx),G(Re,"AbstractSortedMultiset",342),A(280,600,ib,Ty),w.a=0,G(Re,"ArrayListMultimap",280),A(159,17,Wx);var Np,Ua,pT=At(Re,"BoundType",159,on,Rne);A(623,159,Wx,vI),At(Re,"BoundType/1",623,pT,null),A(624,159,Wx,xI),At(Re,"BoundType/2",624,pT,null);var wT;A(234,1,rc),w.w=function(){return Kre(this.c.mb())},G(Re,"FluentIterable",234),A(170,234,rc,nh),w.mb=function(){return Dt(this)},G(Re,"FluentIterable/2",170),A(664,1,{}),w.w=function(){return ha(Da(this.a.d).b)},G(Re,"ForwardingObject",664),A(665,664,Vd),w.ib=function(t){return Da(this.a.d),Pj()},w.jb=function(t){return Da(this.a.d),Dj()},w.Q=function(){Da(this.a.d),jj()},w.kb=function(t){return p4(Da(this.a.d),t)},w.lb=function(t){return qN(Da(this.a.d),t)},w.V=function(){return Da(this.a.d).b.V()},w.mb=function(){var t;return t=Da(this.a.d).b.mb(),new OS(t)},w.nb=function(t){return Da(this.a.d),Nj()},w.Y=function(){return Da(this.a.d).b.Y()},w.ob=function(){return SO(Da(this.a.d))},w.pb=function(t){return P3(Da(this.a.d),t)},G(Re,"ForwardingCollection",665),A(660,640,Kx),w.mb=function(){return this.Kb()},w.ib=function(t){return Tee()},w.jb=function(t){return Lee()},w.Q=function(){Pee()},w.kb=function(t){return t!=null&&Hg(this,t,!1)},w.Jb=function(){switch(this.Y()){case 0:return gr(),gr(),db;case 1:return gr(),new fu(this.Kb().H());default:return new eO(this,this.ob())}},w.nb=function(t){return Dee()},G(Re,"ImmutableCollection",660),A(316,660,Kx,ZS),w.mb=function(){return Ad(this.a.mb())},w.kb=function(t){return t!=null&&this.a.kb(t)},w.lb=function(t){return this.a.lb(t)},w.V=function(){return this.a.V()},w.Kb=function(){return Ad(this.a.mb())},w.Y=function(){return this.a.Y()},w.ob=function(){return this.a.ob()},w.pb=function(t){return this.a.pb(t)},w.w=function(){return ha(this.a)},G(Re,"ForwardingImmutableCollection",316),A(87,660,Dh),w.mb=function(){return this.Kb()},w.tb=function(){return this.Lb(0)},w.ub=function(t){return this.Lb(t)},w.xb=function(t,n){return this.Mb(t,n)},w.rb=function(t,n){throw new Fn},w.t=function(t){return tue(this,t)},w.v=function(){return uae(this)},w.Kb=function(){return this.Lb(0)},w.Lb=function(t){return A4(this,t)},w.vb=function(t){throw new Fn},w.wb=function(t,n){throw new Fn},w.Mb=function(t,n){var i;return W0((i=new BN(this),new n2(i,t,n)))};var db;G(Re,"ImmutableList",87),A(667,87,Dh),w.mb=function(){return Ad(this.Nb().mb())},w.xb=function(t,n){return W0(this.Nb().xb(t,n))},w.kb=function(t){return bM(this,t)},w.lb=function(t){return this.Nb().lb(t)},w.t=function(t){return this.Nb().t(t)},w.sb=function(t){return cI(this,t)},w.v=function(){return this.Nb().v()},w.V=function(){return this.Nb().V()},w.Kb=function(){return Ad(this.Nb().mb())},w.Y=function(){return this.Nb().Y()},w.Mb=function(t,n){return W0(this.Nb().xb(t,n))},w.ob=function(){return this.Nb().pb(ve(Ze,Me,1,this.Nb().Y(),4,1))},w.pb=function(t){return this.Nb().pb(t)},w.w=function(){return ha(this.Nb())},G(Re,"ForwardingImmutableList",667),A(524,1,jh),w.bb=function(){return Yc(this)},w.W=function(){return XM(this)},w.fb=function(){return this.Rb()},w.Q=function(){throw new Fn},w.R=function(t){return this.cb(t)!=null},w.ab=function(t){return this.Rb().kb(t)},w.Pb=function(){return new Rj(this)},w.Qb=function(){return new Bj(this)},w.t=function(t){return Nae(this,t)},w.v=function(){return Yc(this).v()},w.V=function(){return this.Y()==0},w.db=function(t,n){return Nee()},w.eb=function(t){throw new Fn},w.w=function(){var t;return On(),t=jd(Iie(this.Y()),123),Hae(JH,t,Yc(this).mb()),t.a+="}",t.a},w.Rb=function(){return this.g?this.g:this.g=this.Qb()},w.e=null,w.f=null,w.g=null,G(Re,"ImmutableMap",524),A(320,524,jh),w.R=function(t){return T8(this.d,t)},w.ab=function(t){return FN(this.d,t)},w.Ob=function(){return CC(new I9(this))},w.Pb=function(){return CC(dO(this.d))},w.Qb=function(){return Ta(),new ZS(gO(this.d))},w.t=function(t){return SN(this.d,t)},w.cb=function(t){return t==null?null:Gg(this.d,t)},w.v=function(){return this.d.c.v()},w.V=function(){return this.d.c.V()},w.Y=function(){return this.d.c.Y()},w.w=function(){return ha(this.d.c)},G(Re,"ForwardingImmutableMap",320),A(666,665,vi),w.t=function(t){return t===this||EN(Da(this.a.d),t)},w.v=function(){return Da(this.a.d).b.v()},G(Re,"ForwardingSet",666),A(523,666,vi,I9),w.kb=function(t){if(xe(t,21)&&f(t,21).yb()==null)return!1;try{return p4(Da(this.a.d),t)}catch(n){if(n=Kr(n),xe(n,119))return!1;throw Zr(n)}},w.pb=function(t){var n;return n=P3(Da(this.a.d),t),Da(this.a.d).b.Y()<n.length&&$a(n,Da(this.a.d).b.Y(),null),n},G(Re,"ForwardingImmutableMap/1",523),A(663,660,Nh),w.mb=function(){return this.Kb()},w.t=function(t){return dB(this,t)},w.v=function(){return Jie(this)},G(Re,"ImmutableSet",663),A(315,663,Nh),w.mb=function(){return Ad(new fd(this.a.b.mb()))},w.kb=function(t){return t!=null&&gte(this.a,t)},w.lb=function(t){return bte(this.a,t)},w.v=function(){return this.a.b.v()},w.V=function(){return this.a.b.V()},w.Kb=function(){return Ad(new fd(this.a.b.mb()))},w.Y=function(){return this.a.b.Y()},w.ob=function(){return this.a.b.ob()},w.pb=function(t){return pte(this.a,t)},w.w=function(){return ha(this.a.b)},G(Re,"ForwardingImmutableSet",315),A(178,1,{178:1,3:1},fp),w.t=function(t){var n;return xe(t,178)?(n=f(t,178),this.a.t(n.a)&&this.b==n.b&&this.c==n.c&&this.d==n.d&&this.f==n.f&&Wl(this.e,n.e)&&Wl(this.g,n.g)):!1},w.v=function(){return x2(re(ie(Ze,1),Me,1,4,[this.a,this.e,this.d,this.g,this.f]))},w.w=function(){return jd(Yu(jd(Yu(jd(co(Yu(new wd,this.a),":"),this.d==(xo(),Np)?91:40),this.b?this.e:"-∞"),44),this.c?this.g:"∞"),this.f==Np?93:41).a},w.b=!1,w.c=!1,G(Re,"GeneralRange",178),A(215,384,ib,cg),w.a=2,G(Re,"HashMultimap",215),A(661,87,Dh),w.kb=function(t){return this.Sb().kb(t)},w.V=function(){return this.Sb().V()},w.Y=function(){return this.Sb().Y()},G(Re,"ImmutableAsList",661),A(275,320,jh),w.Rb=function(){return this.Ub()},w.fb=function(){return this.Ub()},w.Ub=function(){return XM(this.Tb())},G(Re,"ImmutableBiMap",275),A(341,668,{3:1,21:1},c4),w.yb=function(){return this.a},w.zb=function(){return this.b},w.Ab=function(t){throw new Fn},G(Re,"ImmutableEntry",341),A(436,315,Nh,Fj),G(Re,"ImmutableEnumSet",436),A(379,378,bk,aO),G(Re,"ImmutableList/1",379),A(266,108,qd,Em),w.G=function(){return this.a.G()},w.H=function(){return f(this.a.H(),21).yb()},G(Re,"ImmutableMap/1",266),A(670,663,Nh),w.mb=function(){var t;return t=Yc(this.a).Kb(),new Em(t)},w.Jb=function(){return new KS(this)},w.Kb=function(){var t;return(t=this.c,t||(this.c=new KS(this))).Kb()},G(Re,"ImmutableSet/Indexed",670),A(606,670,Nh,Rj),w.mb=function(){var t;return t=Yc(this.a).Kb(),new Em(t)},w.kb=function(t){return this.a.R(t)},w.Kb=function(){var t;return t=Yc(this.a).Kb(),new Em(t)},w.Y=function(){return this.a.Y()},G(Re,"ImmutableMapKeySet",606),A(604,660,Kx,Bj),w.mb=function(){return new My(this)},w.kb=function(t){return t!=null&&(_n(),_n(),MR(new My(this),(U1(),t==null?(C3(),bT):new P9(t)))!=-1)},w.Jb=function(){var t;return t=ZM(Yc(this.a)),new AI(this,t)},w.Kb=function(){return new My(this)},w.Y=function(){return this.a.Y()},G(Re,"ImmutableMapValues",604),A(282,108,qd,My),w.G=function(){return this.a.G()},w.H=function(){return f(this.a.H(),21).zb()},G(Re,"ImmutableMapValues/1",282),A(605,661,Dh,AI),w.Sb=function(){return this.a},w.sb=function(t){return f(this.b.sb(t),21).zb()},G(Re,"ImmutableMapValues/2",605),A(311,661,Dh,KS),w.Sb=function(){return this.a},w.sb=function(t){return Lne(this.a,t)},G(Re,"ImmutableSet/Indexed/1",311),A(414,234,rc,EI),w.mb=function(){return G4(this.a)},w.w=function(){return nc(this.a)+" (cycled)"},G(Re,"Iterables/1",414),A(105,1,yi,T),w.B=function(t){return f(t,22).mb()},G(Re,"Iterables/12",105),A(415,234,rc,RM),w.mb=function(){return Ld(this)},G(Re,"Iterables/4",415),A(416,234,rc,BM),w.mb=function(){return $o(this)},G(Re,"Iterables/5",416);var QH,mT;A(424,651,bk,P),w.G=function(){return!1},w.K=function(){return!1},w.H=function(){throw new sa},w.L=function(){return 0},w.M=function(){throw new sa},w.N=function(){return-1},G(Re,"Iterators/1",424),A(264,108,qd,Sm),w.G=function(){return!this.a},w.H=function(){if(this.a)throw new sa;return this.a=!0,this.b},w.a=!1,G(Re,"Iterators/11",264),A(425,1,ir,N),w.G=function(){return!1},w.H=function(){throw new sa},w.I=function(){Jl(!1)},G(Re,"Iterators/2",425),A(426,108,qd,M9),w.G=function(){return this.a.G()},w.H=function(){return this.a.H()},G(Re,"Iterators/3",426),A(427,1,ir,pM),w.G=function(){return this.a.G()||this.b.mb().G()},w.H=function(){return eC(this)},w.I=function(){this.a.I()},G(Re,"Iterators/4",427),A(429,428,qd,PN),G(Re,"Iterators/6",429),A(261,1,ir),w.G=function(){return this.b.G()},w.H=function(){return UN(this)},w.I=function(){this.b.I()},G(Re,"TransformedIterator",261),A(430,261,ir,YI),w.Vb=function(t){return lN(this,t)},G(Re,"Iterators/7",430),A(313,1,ir),w.G=function(){return xt(this)},w.H=function(){return Et(this)},w.I=function(){Jl(!!this.c),this.c.I(),this.c=null},G(Re,"MultitransformedIterator",313),A(90,313,{90:1,35:1},Go),w.Wb=function(t){return f(t,35)},G(Re,"Iterators/ConcatenatedIterator",90),A(314,313,ir,QS),w.Wb=function(t){return Qie(f(t,35))},G(Re,"Iterators/ConcatenatedIterator/1",314),A(329,653,ib,m4),w.U=function(t){return new Fm(this,t)},w.X=function(t){return z3(this,t)},w.Q=function(){w3(this)},w.R=function(t){return f4(this,t)},w.S=function(){return new w4(this)},w.T=function(){return new O9(this)},w.V=function(){return!this.a},w.Y=function(){return this.d},w.c=0,w.d=0,G(Re,"LinkedListMultimap",329),A(647,640,Lh),w.rb=function(t,n){throw new qf("Add not supported on this list")},w.ib=function(t){return this.rb(this.Y(),t),!0},w.Q=function(){this.Xb(0,this.Y())},w.t=function(t){return DB(this,t)},w.v=function(){return IR(this)},w.mb=function(){return new Yf(this)},w.tb=function(){return this.ub(0)},w.ub=function(t){return new fn(this,t)},w.vb=function(t){throw new qf("Remove not supported on this list")},w.Xb=function(t,n){var i,s;for(s=this.ub(t),i=t;i<n;++i)s.H(),s.I()},w.wb=function(t,n){throw new qf("Set not supported on this list")},w.xb=function(t,n){return new n2(this,t,n)},w.d=0,G(wt,"AbstractList",647),A(648,647,Lh),w.rb=function(t,n){s0(this,t,n)},w.sb=function(t){return Hd(this,t)},w.mb=function(){return this.ub(0)},w.vb=function(t){return zC(this,t)},w.wb=function(t,n){var i,s;i=this.ub(t);try{return s=i.H(),i.O(n),s}catch(l){throw l=Kr(l),xe(l,74)?new _o("Can't set element "+t):Zr(l)}},G(wt,"AbstractSequentialList",648),A(276,648,Lh,Fm),w.ub=function(t){return R4(this,t)},w.Y=function(){var t;return t=f(Kt(this.a.b,this.b),126),t?t.a:0},G(Re,"LinkedListMultimap/1",276),A(330,648,Lh,TS),w.ub=function(t){return new V8(this.a,t)},w.Y=function(){return this.a.d},G(Re,"LinkedListMultimap/1EntriesImpl",330),A(563,649,vi,O9),w.kb=function(t){return f4(this.a,t)},w.mb=function(){return new JA(this.a)},w.nb=function(t){return!z3(this.a,t).a.V()},w.Y=function(){return W1(this.a.b)},G(Re,"LinkedListMultimap/1KeySetImpl",563),A(562,1,ir,JA),w.G=function(){return W4(this),!!this.c},w.H=function(){W4(this),e0(this.c),this.a=this.c,vn(this.d,this.a.a);do this.c=this.c.b;while(this.c&&!vn(this.d,this.c.a));return this.a.a},w.I=function(){W4(this),Jl(!!this.a),S0(new l2(this.e,this.a.a)),this.a=null,this.b=this.e.c},w.b=0,G(Re,"LinkedListMultimap/DistinctKeyIterator",562),A(126,1,{126:1},L3),w.a=0,G(Re,"LinkedListMultimap/KeyList",126),A(560,668,ab,DN),w.yb=function(){return this.a},w.zb=function(){return this.f},w.Ab=function(t){var n;return n=this.f,this.f=t,n},G(Re,"LinkedListMultimap/Node",560),A(561,1,Ph,V8),w.J=function(t){f(t,21),Iee()},w.H=function(){return FO(this)},w.M=function(){return qO(this)},w.O=function(t){f(t,21),Mee()},w.G=function(){return l0(this),!!this.c},w.K=function(){return l0(this),!!this.e},w.L=function(){return this.d},w.N=function(){return this.d-1},w.I=function(){l0(this),Jl(!!this.a),this.a!=this.c?(this.e=this.a.d,--this.d):this.c=this.a.b,kB(this.f,this.a),this.a=null,this.b=this.f.c},w.b=0,w.d=0,G(Re,"LinkedListMultimap/NodeIterator",561),A(241,1,Ph,l2,bB),w.J=function(t){this.e=uk(this.f,this.b,t,this.c),++this.d,this.a=null},w.G=function(){return!!this.c},w.K=function(){return!!this.e},w.H=function(){return t2(this)},w.L=function(){return this.d},w.M=function(){return RO(this)},w.N=function(){return this.d-1},w.I=function(){Jl(!!this.a),this.a!=this.c?(this.e=this.a.e,--this.d):this.c=this.a.c,kB(this.f,this.a),this.a=null},w.O=function(t){J1(!!this.a),this.a.f=t},w.d=0,G(Re,"LinkedListMultimap/ValueForKeyIterator",241),A(419,647,Lh),w.rb=function(t,n){this.a.rb(t,n)},w.kb=function(t){return this.a.kb(t)},w.sb=function(t){return this.a.sb(t)},w.vb=function(t){return this.a.vb(t)},w.wb=function(t,n){return this.a.wb(t,n)},w.Y=function(){return this.a.Y()},G(Re,"Lists/AbstractListWrapper",419),A(420,419,pk),G(Re,"Lists/RandomAccessListWrapper",420),A(422,420,pk,BN),w.ub=function(t){return this.a.ub(t)},G(Re,"Lists/1",422),A(88,647,{88:1,22:1,19:1,20:1},md),w.rb=function(t,n){this.a.rb(sh(this,t),n)},w.Q=function(){this.a.Q()},w.sb=function(t){return this.a.sb(p3(this,t))},w.mb=function(){return _O(this,0)},w.ub=function(t){return _O(this,t)},w.vb=function(t){return this.a.vb(p3(this,t))},w.Xb=function(t,n){(jO(t,n,this.a.Y()),w2(this.a.xb(sh(this,n),sh(this,t)))).Q()},w.wb=function(t,n){return this.a.wb(p3(this,t),n)},w.Y=function(){return this.a.Y()},w.xb=function(t,n){return jO(t,n,this.a.Y()),w2(this.a.xb(sh(this,n),sh(this,t)))},G(Re,"Lists/ReverseList",88),A(220,88,{88:1,22:1,19:1,20:1,63:1},ng),G(Re,"Lists/RandomAccessReverseList",220),A(421,1,Ph,IN),w.J=function(t){this.c.J(t),this.c.M(),this.a=!1},w.G=function(){return this.c.K()},w.K=function(){return this.c.G()},w.H=function(){if(!this.c.K())throw new sa;return this.a=!0,this.c.M()},w.L=function(){return sh(this.b,this.c.L())},w.M=function(){if(!this.c.G())throw new sa;return this.a=!0,this.c.H()},w.N=function(){return sh(this.b,this.c.L())-1},w.I=function(){Jl(this.a),this.c.I(),this.a=!1},w.O=function(t){J1(this.a),this.c.O(t)},w.a=!1,G(Re,"Lists/ReverseList/1",421);var JH;A(376,261,ir,FI),w.Vb=function(t){return On(),new c4(t,lI(this.a,t))},G(Re,"Maps/1",376),A(188,17,Xx);var Rk,yT,kT=At(Re,"Maps/EntryFunction",188,on,Ane);A(374,188,Xx,WN),w.B=function(t){return f(t,21).yb()},At(Re,"Maps/EntryFunction/1",374,kT,null),A(375,188,Xx,yI),w.B=function(t){return f(t,21).zb()},At(Re,"Maps/EntryFunction/2",375,kT,null),A(373,640,Vd,zN),w.Q=function(){this.a.Q()},w.kb=function(t){return this.a.ab(t)},w.V=function(){return this.a.V()},w.mb=function(){return uO(this)},w.nb=function(t){var n,i;try{return Hg(this,t,!0)}catch(s){if(s=Kr(s),xe(s,45)){for(i=this.a.bb().mb();i.G();)if(n=f(i.H(),21),Wl(t,n.zb()))return this.a.eb(n.yb()),!0;return!1}else throw Zr(s)}},w.Y=function(){return this.a.Y()},G(Re,"Maps/Values",373),A(301,654,Th,w4),w.cb=function(t){return this.a.R(t)?this.a.U(t):null},w.eb=function(t){return this.a.R(t)?this.a.X(t):null},w.Q=function(){this.a.Q()},w.R=function(t){return this.a.R(t)},w.hb=function(){return new A9(this)},w.gb=function(){return this.hb()},w.V=function(){return this.a.V()},w.W=function(){return this.a.W()},w.Y=function(){return this.a.W().Y()},G(Re,"Multimaps/AsMap",301),A(393,655,vi,A9),w.mb=function(){return ane(this.a.a.W(),new R9(this))},w.qb=function(){return this.a},w.nb=function(t){var n;return h8(this,t)?(n=f(t,21),zee(this.a,n.yb()),!0):!1},G(Re,"Multimaps/AsMap/EntrySet",393),A(395,1,yi,R9),w.B=function(t){return lI(this,t)},G(Re,"Multimaps/AsMap/EntrySet/1",395),A(391,656,Vx,B9),w.Q=function(){w3(this.a)},w.kb=function(t){return f4(this.a,t)},w.Cb=function(t){var n;return n=f(Gg(ql(this.a),t),19),n?n.Y():0},w.gb=function(){return new H9(this)},w.Db=function(){return ql(this.a).Y()},w.Eb=function(){return new JS(h3(ql(this.a)).mb())},w.mb=function(){return nO(this)},w.Fb=function(t,n){var i,s,l,h,v;if(hi(n,Qx),n==0)return v=f(Gg(ql(this.a),t),19),v?v.Y():0;if(h=f(Gg(ql(this.a),t),19),!h)return 0;if(l=h.Y(),n>=l)h.Q();else for(s=h.mb(),i=0;i<n;i++)s.H(),s.I();return l},G(Re,"Multimaps/Keys",391),A(302,261,ir,JS),w.Vb=function(t){return new z9(f(t,21))},G(Re,"Multimaps/Keys/1",302),A(658,1,{83:1}),w.t=function(t){var n;return xe(t,83)?(n=f(t,83),this.Yb()==n.Yb()&&Wl(this.Zb(),n.Zb())):!1},w.v=function(){var t;return t=this.Zb(),(t==null?0:Ko(t))^this.Yb()},w.w=function(){return tA(this)},G(Re,"Multisets/AbstractEntry",658),A(394,658,{83:1},z9),w.Yb=function(){return f(this.a.zb(),19).Y()},w.Zb=function(){return this.a.yb()},G(Re,"Multimaps/Keys/1/1",394),A(392,657,vi,H9),w.kb=function(t){var n,i;return xe(t,83)?(i=f(t,83),n=f(ql(this.a.a).cb(i.Zb()),19),!!n&&n.Y()==i.Yb()):!1},w.V=function(){return!this.a.a.a},w.mb=function(){return new JS(h3(ql(this.a.a)).mb())},w.Ib=function(){return this.a},w.nb=function(t){var n,i;return xe(t,83)&&(i=f(t,83),n=f(ql(this.a.a).cb(i.Zb()),19),n&&n.Y()==i.Yb())?(n.Q(),!0):!1},w.Y=function(){return ql(this.a.a).Y()},G(Re,"Multimaps/Keys/KeysEntrySet",392),A(659,1,Ir),G(Re,"Ordering",659),A(398,659,Ir,k),w.$b=function(t,n){return $te(f(t,83),f(n,83))},G(Re,"Multisets/1",398),A(397,658,{83:1,3:1},zM),w.Yb=function(){return this.a},w.Zb=function(){return this.b},w.a=0,G(Re,"Multisets/ImmutableEntry",397),A(303,1,ir,MN),w.G=function(){return this.d>0||this.c.G()},w.H=function(){if(!(this.d>0||this.c.G()))throw new sa;return this.d==0&&(this.b=f(this.c.H(),83),this.f=this.d=this.b.Yb()),--this.d,this.a=!0,this.b.Zb()},w.I=function(){Jl(this.a),this.f==1?this.c.I():this.e.Fb(this.b.Zb(),1)>0,--this.f,this.a=!1},w.a=!1,w.d=0,w.f=0,G(Re,"Multisets/MultisetIteratorImpl",303),A(622,659,{3:1,56:1},E),w.$b=function(t,n){return Qte(f(t,23),f(n,23))},w.w=function(){return"Ordering.natural()"};var e_;G(Re,"NaturalOrdering",622),A(343,661,Dh,eO),w.ub=function(t){return A4(this.b,t)},w.Sb=function(){return this.a},w.sb=function(t){return cI(this.b,t)},w.Lb=function(t){return A4(this.b,t)},G(Re,"RegularImmutableAsList",343),A(559,275,jh,lO),w.Tb=function(){return this.a};var t_;G(Re,"RegularImmutableBiMap",559),A(53,667,Dh,Qn),w.Nb=function(){return this.a},G(Re,"RegularImmutableList",53),A(321,320,jh,e4),G(Re,"RegularImmutableMap",321),A(265,315,Nh,ny);var ev;G(Re,"RegularImmutableSet",265),A(650,641,vi),G(Re,"Sets/SetView",650),A(377,650,vi,yM),w.kb=function(t){return Oc(this.b,t)&&Oc(this.c,t)},w.lb=function(t){return Xu(this.b,t)&&Xu(this.c,t)},w.V=function(){return g2(this)},w.mb=function(){var t;return Fl((t=new Wt(this.b.a).a.bb().mb(),new Zt(t)),this.a)},w.Y=function(){var t;return s2(Fl((t=new Wt(this.b.a).a.bb().mb(),new Zt(t)),this.a))},G(Re,"Sets/2",377),A(328,275,jh,$O,jA),w.fb=function(){return Ta(),new Gu(this.c)},w.Tb=function(){var t;return t=this.a,t||(this.a=new jA(this.c,this.b,this))},w.Ub=function(){return Ta(),new Gu(this.c)},G(Re,"SingletonImmutableBiMap",328),A(127,667,Dh,fu),w.Nb=function(){return this.a},G(Re,"SingletonImmutableList",127),A(135,663,Nh,Gu),w.mb=function(){return _n(),new Sm(this.a)},w.kb=function(t){return jo(this.a,t)},w.Kb=function(){return _n(),new Sm(this.a)},w.Y=function(){return 1},G(Re,"SingletonImmutableSet",135),A(285,342,{207:1,3:1,22:1,19:1},O3,x8),w.Bb=function(t,n){return hp(this,t,n)},w.Cb=function(t){return sp(this,t)},w.Db=function(){return vh(wC(this,(r0(),ET)))},w.Eb=function(){return new VI(this)},w.Fb=function(t,n){return cx(this,t,n)},w.Gb=function(t,n){return K8(this,t,n)},w.Hb=function(t,n,i){var s,l,h;return hi(i,"newCount"),hi(n,"oldCount"),th(yg(this.b,t)),h=this.c.a,h?(l=ve(Kn,Wn,26,1,12,1),s=Lx(h,this.d,t,n,i,l),k0(this.c,h,s),l[0]==n):n==0?(i>0&&hp(this,t,i),!0):!1},w.Y=function(){return vh(wC(this,(r0(),Bk)))},G(Re,"TreeMultiset",285),A(619,658,{83:1},ON),w.Yb=function(){var t;return t=this.b.c,t==0?sp(this.a,this.b.b):t},w.Zb=function(){return this.b.b},G(Re,"TreeMultiset/1",619),A(620,1,ir,VI),w.H=function(){return jae(this)},w.G=function(){return xR(this)},w.I=function(){Jl(!!this.b),K8(this.c,this.b.b.b,0),this.b=null},G(Re,"TreeMultiset/2",620),A(205,17,Jx);var ET,Bk,ST=At(Re,"TreeMultiset/Aggregate",205,on,Bne);A(617,205,Jx,gI),w._b=function(t){return t.c},w.ac=function(t){return t?t.j:0},At(Re,"TreeMultiset/Aggregate/1",617,ST,null),A(618,205,Jx,_I),w._b=function(t){return 1},w.ac=function(t){return t?t.a:0},At(Re,"TreeMultiset/Aggregate/2",618,ST,null),A(206,658,{83:1,206:1},q0),w.Yb=function(){return this.c},w.Zb=function(){return this.b},w.w=function(){return Ff(),tA(new zM(this.b,this.c))},w.a=0,w.c=0,w.d=0,w.j=0,G(Re,"TreeMultiset/AvlNode",206),A(616,1,{},C),G(Re,"TreeMultiset/Reference",616);var Vfe=G($x,"JavaScriptObject$",0),zk;A(628,1,{}),G($x,"Scheduler",628);var Ip=0,n_=0,Mp=-1;A(360,628,{},y);var CT;G(yp,"SchedulerImpl",360),A(646,1,{}),w.hc=function(){return null},w.ic=function(){return null},w.jc=function(){return null},w.kc=function(){return null},w.lc=function(){return null},G(af,"JSONValue",646),A(214,646,{214:1},RS,_9),w.t=function(t){return xe(t,214)?this.a==f(t,214).a:!1},w.gc=function(){return pee},w.v=function(){return su(this.a)},w.hc=function(){return this},w.w=function(){var t,n,i;for(i=new pd("["),n=0,t=this.a.length;n<t;n++)n>0&&(i.a+=","),Yu(i,Uu(this,n));return i.a+="]",i.a},G(af,"JSONArray",214),A(292,646,{},LS),w.gc=function(){return wee},w.ic=function(){return this},w.w=function(){return zI(this.a)},w.a=!1;var r_,i_;G(af,"JSONBoolean",292),A(371,72,Ys,qj),G(af,"JSONException",371),A(435,646,{},D),w.gc=function(){return See},w.w=function(){return Fs};var a_;G(af,"JSONNull",435),A(104,646,{104:1},Cm),w.t=function(t){return xe(t,104)?this.a==f(t,104).a:!1},w.gc=function(){return mee},w.v=function(){return Xn(ge(this.a))},w.jc=function(){return this},w.w=function(){return this.a+""},w.a=0,G(af,"JSONNumber",104),A(69,646,{69:1},Al,xm),w.t=function(t){return xe(t,69)?this.a==f(t,69).a:!1},w.gc=function(){return yee},w.v=function(){return su(this.a)},w.kc=function(){return this},w.w=function(){var t,n,i,s,l,h;for(h=new pd("{"),t=!0,l=cR(this,ve(Ok,Nr,2,0,5,1)),i=0,s=l.length;i<s;++i)n=l[i],t?t=!1:h.a+=", ",co(h,jB(n)),h.a+=":",Yu(h,Mn(this,n));return h.a+="}",h.a},G(af,"JSONObject",69),A(361,641,vi,RN),w.kb=function(t){return To(t)&&Qee(this.a,oh(t))},w.mb=function(){return new Yf(new uo(this.b))},w.Y=function(){return this.b.length},G(af,"JSONObject/1",361);var Hk;A(97,646,{97:1},$c),w.t=function(t){return xe(t,97)?Ho(this.a,f(t,97).a):!1},w.gc=function(){return kee},w.v=function(){return G2(this.a)},w.lc=function(){return this},w.w=function(){return jB(this.a)},G(af,"JSONString",97);var o_,s_,xT;A(186,1,{},f0,q4),w.b=!1,w.c=0,w.d=-1,w.e=0,w.f=!1,w.j=0,G("de.cau.cs.kieler.core.alg","BasicProgressMonitor",186),A(10,1,{10:1,286:1,3:1,5:1},Fr,Fc,ot,qn),w.t=function(t){return uR(this,t)},w.v=function(){return Xn(ge(this.a))+$oe(Xn(ge(this.b)))},w.w=function(){return"("+this.a+","+this.b+")"},w.a=0,w.b=0;var _t=G(vH,"KVector",10);A(58,648,{3:1,5:1,22:1,19:1,58:1,20:1},Ur),w.ib=function(t){return an(this,t)},w.Q=function(){Hs(this)},w.ub=function(t){return Jt(this,t)},w.Y=function(){return this.b},w.b=0,G(wt,"LinkedList",58),A(44,58,{44:1,286:1,3:1,5:1,22:1,19:1,58:1,20:1},xi,xy),w.w=function(){var t,n,i;for(t=new pd("("),n=Jt(this,0);n.b!=n.d.c;)i=f(qt(n),10),co(t,i.a+","+i.b),n.b!=n.d.c&&(t.a+="; ");return t.a+=")",t.a},G(vH,"KVectorChain",44);var lf=w0(Sp,"IProperty");A(131,1,{179:1,131:1,3:1},H),G(Sp,"MapPropertyHolder",131),A(14,1,gH,y0,m0,Zn,nt,Ul,M0),w.F=function(t){return Mte(this,f(t,79))},w.t=function(t){return E3(this,t)},w.mc=function(){return this.b},w.nc=function(){return this.c},w.oc=function(){return this.d},w.v=function(){return G2(this.b)},w.w=function(){return this.b};var u_,c_;G(Sp,"Property",14),A(366,1,{23:1},_),w.F=function(t){return-1},G(Sp,"Property/1",366),A(367,1,{23:1},B),w.F=function(t){return 1},G(Sp,"Property/2",367),A(27,1,{27:1,22:1},wr),w.t=function(t){var n,i,s;return xe(t,27)?(i=f(t,27),n=this.a==null?i.a==null:jo(this.a,i.a),s=this.b==null?i.b==null:jo(this.b,i.b),n&&s):!1},w.v=function(){var t,n,i,s,l,h;return i=this.a==null?0:Ko(this.a),t=i&Ts,n=i&-65536,h=this.b==null?0:Ko(this.b),s=h&Ts,l=h&-65536,t^l>>16&Ts|n^s<<16},w.mb=function(){return new G9(this)},w.w=function(){return this.a==null&&this.b==null?"pair(null,null)":this.a==null?"pair(null,"+ha(this.b)+")":this.b==null?"pair("+ha(this.a)+",null)":"pair("+ha(this.a)+","+ha(this.b)+")"},G(bH,"Pair",27),A(431,1,ir,G9),w.G=function(){return!this.c&&(!this.b&&this.a.a!=null||this.a.b!=null)},w.H=function(){if(!this.c&&!this.b&&this.a.a!=null)return this.b=!0,this.a.a;if(!this.c&&this.a.b!=null)return this.c=!0,this.a.b;throw new sa},w.I=function(){throw this.c&&this.a.b!=null?this.a.b=null:this.b&&this.a.a!=null&&(this.a.a=null),new eg},w.b=!1,w.c=!1,G(bH,"Pair/1",431),A(228,72,Ys,R1),G(pH,"UnsupportedConfigurationException",228),A(99,72,Ys,Co),G(pH,"UnsupportedGraphException",99);var TT;A(103,17,{103:1,3:1,23:1,17:1},yd);var _k,Op,Ap,Rp,Bp,zp,l_=At(Vs,"Alignment",103,on,qre),f_;A(59,17,{59:1,3:1,23:1,17:1},og);var Ps,Oa,Vi,Mo,Ks,vb=At(Vs,"Direction",59,on,xre),h_;A(107,17,{107:1,3:1,23:1,17:1},$1);var gb,dl,Ih,Gk,d_=At(Vs,"EdgeLabelPlacement",107,on,wre),v_;A(122,17,{122:1,3:1,23:1,17:1},Y1);var ff,LT,$k,Yk,g_=At(Vs,"EdgeRouting",122,on,mre),b_;A(133,17,{133:1,3:1,23:1,17:1},kd);var PT,DT,jT,NT,Fk,IT,p_=At(Vs,"EdgeType",133,on,Vre),w_;A(166,17,{166:1,3:1,23:1,17:1},Um);var MT,qk,OT,m_=At(Vs,"HierarchyHandling",166,on,Une),y_,bb,AT,go,k_,E_,Vk,RT,tv,pb,Oo,da,hf,BT,S_,C_,x_,zT,wb,T_,Un,Mh,HT,L_,mb,nv,rv,ia,yb,vl,_T,Wk,Uk,Kk,Zk,Xk,yu,dt,ku,kb,Eb,GT,Oh,$T,Qk,YT,uc,Sb,FT,es;A(41,17,{41:1,3:1,23:1,17:1},Ac);var Ka,Wi,Ui,Ki,Ei,Zi,va,ga,ba,Ln=At(Vs,"NodeLabelPlacement",41,on,kie),P_;A(100,17,{100:1,3:1,23:1,17:1},sg);var qT,VT,WT,Ds,df,UT=At(Vs,"PortAlignment",100,on,Yre),D_;A(28,17,{28:1,3:1,23:1,17:1},Ed);var Ah,ii,ts,Cb,Ao,cc,j_=At(Vs,"PortConstraints",28,on,Fre),N_;A(149,17,{149:1,3:1,23:1,17:1},Km);var Jk,eE,xb,I_=At(Vs,"PortLabelPlacement",149,on,Kne),M_;A(32,17,{32:1,3:1,23:1,17:1},ug);var Be,rt,Rh,gl,pa,Eu,Hp,Bh,bl,Aa,qr,Ra,ns,Ba,vf,zh,pl,Hh,ct,fr,qe,Mr=At(Vs,"PortSide",32,on,Cre),O_;A(150,17,{150:1,3:1,23:1,17:1},F1);var Tb,tE,nE,Lb,iv=At(Vs,"SizeConstraint",150,on,kre),A_;A(139,17,{139:1,3:1,23:1,17:1},q1);var rE,iE,Pb,aE,oE=At(Vs,"SizeOptions",139,on,yre),R_;A(62,1,{62:1},iy,Ya),w.t=function(t){var n;return t==null||!xe(t,62)?!1:(n=f(t,62),la(this.d,n.d)&&la(this.e,n.e)&&la(this.c,n.c)&&la(this.b,n.b))},w.v=function(){return x2(re(ie(Ze,1),Me,1,4,[this.d,this.e,this.c,this.b]))},w.w=function(){return"Rect[x="+this.d+",y="+this.e+",w="+this.c+",h="+this.b+"]"},w.b=0,w.c=0,w.d=0,w.e=0,G(Zd,"Rectangle",62),A(283,62,{283:1,62:1},Sj),w.a=0,G(tT,"LabelGroup",283),A(67,17,{67:1,3:1,23:1,17:1},Pi);var B_,z_,H_,__,G_,$_,Y_,F_,q_,V_,W_,U_,K_,Z_,X_,Q_,J_,eG,tG,nG,rG,sE,iG=At(tT,"LabelLocation",67,on,jC);A(225,17,{225:1,3:1,23:1,17:1},Zm);var _h,lc,fc,Wfe=At(tT,"TextAlignment",225,on,Zne),gf;A(589,1,{},Nz),w.a=0,w.b=!1,w.d=0,w.f=0,w.k=0,w.r=0,w.s=0,G(Zd,"LabelAndNodeSizeProcessor/NodeData",589),A(171,17,{171:1,3:1,23:1,17:1},Xm);var rs,Zs,aG,Db,Ufe=At(Zd,"LabelSide",171,on,Wne);A(590,1,{},$9),w.b=!0,w.c=!0,w.d=!0,w.e=!0,G(Zd,kH,590),A(121,1,EH),w.t=function(t){var n;return xe(t,121)?(n=f(t,121),this.d==n.d&&this.a==n.a&&this.b==n.b&&this.c==n.c):!1},w.v=function(){var t,n;return t=Xn(ge(this.b))<<16,t|=Xn(ge(this.a))&Ts,n=Xn(ge(this.c))<<16,n|=Xn(ge(this.d))&Ts,t^n},w.w=function(){return"[top="+this.d+",left="+this.b+",bottom="+this.a+",right="+this.c+"]"},w.a=0,w.b=0,w.c=0,w.d=0,G(Zd,"Spacing",121),A(232,121,EH,_S,sM,fM),G(Zd,"Spacing/Insets",232),A(65,121,{286:1,121:1,65:1,3:1,5:1},A1,Vo,U4),G(Zd,"Spacing/Margins",65),A(364,1,{},O8),w.c=!1,w.d=null,w.g=null;var KT,ZT,uE;G(xk,"JsonGraphImporter",364);var XT,QT,JT,eL,tL,oG,_p,nL,rL;A(417,14,gH,XN),G(xk,"LayoutOptionResolver/DummyProperty",417),A(348,1,{},g9);var iL;G(xk,"RecursiveLGraphLayout",348),A(73,99,{73:1,3:1,54:1,46:1},Om,wg,ps);var sG=G(xk,"UnsupportedJsonGraphException",73);A(380,1,{},fO);var uG,cG;G(iT,"GraphConfigurator",380),A(49,1,{},An),G(iT,"IntermediateProcessingConfiguration",49),A(365,1,{},rA),G(iT,"KlayLayered",365),A(577,1,{},pR),w.i=0;var lG;G(ub,"ComponentsToCGraphTransformer",577);var fG;A(578,1,{},Z),w.tc=function(t,n){return Xt(t.wc(),n.wc())},w.uc=function(t,n){return Xt(t.xc(),n.xc())},G(ub,"ComponentsToCGraphTransformer/1",578),A(25,1,{25:1}),w.k=0,w.o=null,w.p=!0,w.r=Hr;var Gp=G(Qd,"CNode",25);A(198,25,{198:1,25:1},I4,aC),w.vc=function(){this.b.d=this.j.d,this.b.e=this.j.e},w.wc=function(){return this.a!=null?ge(this.a):this.c.i},w.xc=function(){return this.a!=null?ge(this.a):this.c.i},w.w=function(){return""},G(ub,"ComponentsToCGraphTransformer/CRectNode",198),A(549,1,{},ae);var cE,lE;G(ub,"OneDimensionalComponentsCompaction",549),A(550,1,yi,oe),w.B=function(t){return E2(),yn(),f(f(t,27).a,25).f.f!=0?oi:Rn},G(ub,"OneDimensionalComponentsCompaction/lambda$0$Type",550),A(551,1,yi,J),w.B=function(t){return E2(),yn(),LC(f(f(t,27).a,25).n,f(f(t,27).b,59))||f(f(t,27).a,25).f.f!=0&&LC(f(f(t,27).a,25).n,f(f(t,27).b,59))?oi:Rn},G(ub,"OneDimensionalComponentsCompaction/lambda$1$Type",551),A(324,1,{},g3),G(Qd,"CGraph",324),A(78,1,{78:1},ep),w.b=0,w.c=0,w.d=0,w.f=0,w.i=!0,w.j=Hr,G(Qd,"CGroup",78),A(470,1,{},fe),w.tc=function(t,n){return je(t.wc(),n.wc())},w.uc=function(t,n){return je(t.xc(),n.xc())},G(Qd,"ISpacingsHandler/1",470),A(323,1,{},ix),w.e=!1;var hG,dG,vG,fE=G(Qd,"OneDimensionalCompactor",323);A(554,1,yi,F),w.B=function(t){return By(),yn(),f(f(t,27).a,25).f.f!=0?oi:Rn},G(Qd,"OneDimensionalCompactor/lambda$0$Type",554),A(335,1,{},t3),w.a=!1,w.b=!1,w.c=!1,w.d=!1,G(Qd,"Quadruplet",335),A(587,1,{},W),w.Cc=function(t){var n,i,s,l,h,v,p,m,S,x,L,j,I,R,Y,q,V,U;for(x=ki,s=new M(t.a.b);s.a<s.c.c.length;)n=f(O(s),25),x=Xt(x,n.f.g.j.d+n.g.a);for(q=new Ur,p=new M(t.a.a);p.a<p.c.c.length;)v=f(O(p),78),v.j=x,v.f==0&&mr(q,v,q.c.b,q.c);for(;q.b!=0;){for(v=f(q.b==0?null:(ut(q.b!=0),_s(q,q.a.a)),78),l=v.g.j.d,I=(Y=new Wt(v.a.a).a.bb().mb(),new Zt(Y));I.a.G();)L=(h=f(I.a.H(),21),f(h.yb(),25)),U=v.j+L.g.a,L.f.i||L.j.d<U?L.r=U:L.r=L.j.d;for(l-=v.g.r,v.b+=l,t.d==($n(),Vi)||t.d==Ps?v.c+=l:v.c-=l,j=(R=new Wt(v.a.a).a.bb().mb(),new Zt(R));j.a.G();)for(L=(h=f(j.a.H(),21),f(h.yb(),25)),S=L.i.mb();S.G();)m=f(S.H(),25),Bl(t.d)?V=t.g.tc(L,m):V=t.g.uc(L,m),m.f.j=je(m.f.j,L.r+L.j.c+V-m.g.a),m.p||(m.f.j=je(m.f.j,m.j.d-m.g.a)),--m.f.f,m.f.f==0&&an(q,m.f)}for(i=new M(t.a.b);i.a<i.c.c.length;)n=f(O(i),25),n.j.d=n.r},G(cf,"LongestPathCompaction",587),A(588,1,{},Q),w.Dc=function(t){var n,i,s,l,h,v,p;for(i=new M(t.a.b);i.a<i.c.c.length;)n=f(O(i),25),n.i.Q();for(l=new M(t.a.b);l.a<l.c.c.length;)for(s=f(O(l),25),v=new M(t.a.b);v.a<v.c.c.length;)h=f(O(v),25),s!=h&&(s.f&&s.f==h.f||(Bl(t.d)?p=t.g.uc(s,h):p=t.g.tc(s,h),s!=h.o&&(h.j.d>s.j.d||s.j.d==h.j.d&&s.j.c<h.j.c)&&roe(h.j.e+h.j.b+p,s.j.e)&&NC(h.j.e,s.j.e+s.j.b+p)&&s.i.ib(h)))},G(cf,"QuadraticConstraintCalculation",588),A(317,1,{},r3),w.Dc=function(t){this.b=t,tk(this,new K,new ee)},G(cf,"ScanlineConstraintCalculator",317);var jb=w0(Ws,"Scanline/EventHandler");A(464,1,{160:1},wO),w.Ec=function(t){Hue(this,f(t,235))},G(cf,"ScanlineConstraintCalculator/ConstraintsScanlineHandler",464),A(465,1,Ir,X),w.$b=function(t,n){return yr((f(t,25).j.d+f(t,25).j.c)/2,(f(n,25).j.d+f(n,25).j.c)/2)},G(cf,"ScanlineConstraintCalculator/ConstraintsScanlineHandler/lambda$0$Type",465),A(235,1,{235:1},h4),w.a=!1,G(cf,"ScanlineConstraintCalculator/Timestamp",235),A(466,1,Ir,$),w.$b=function(t,n){return Zoe(t,n)},G(cf,"ScanlineConstraintCalculator/lambda$0$Type",466),A(467,1,vo,K),w.D=function(t){return!0},G(cf,"ScanlineConstraintCalculator/lambda$1$Type",467),A(468,1,yi,ee),w.B=function(t){return 0},G(cf,"ScanlineConstraintCalculator/lambda$2$Type",468),A(48,1,{48:1},Jf,Q4),w.t=function(t){var n;return t==null||Kfe!=Od(t)?!1:(n=f(t,48),la(this.c,n.c)&&la(this.d,n.d))},w.v=function(){return x2(re(ie(Ze,1),Me,1,4,[this.c,this.d]))},w.w=function(){return"("+this.c+", "+this.d+(this.a?"cx":"")+this.b+")"},w.a=!0,w.c=0,w.d=0;var Kfe=G(Ws,"Point",48);A(201,17,{201:1,3:1,23:1,17:1},V1);var hc,wl,bf,ml,Zfe=At(Ws,"Point/Quadrant",201,on,Sre);A(569,1,{},wj),w.b=null,w.c=null,w.d=null,w.e=null,w.f=null;var gG,bG,pG,wG,mG;G(Ws,"RectilinearConvexHull",569),A(243,1,{160:1},tp),w.Ec=function(t){pie(this,f(t,48))},w.b=0;var aL;G(Ws,"RectilinearConvexHull/MaximalElementsEventHandler",243),A(571,1,Ir,se),w.$b=function(t,n){return sO(t,n)},G(Ws,"RectilinearConvexHull/MaximalElementsEventHandler/lambda$0$Type",571),A(570,1,{160:1},dA),w.Ec=function(t){Tue(this,f(t,48))},w.a=0,w.b=null,w.c=null,w.d=null,w.e=null,G(Ws,"RectilinearConvexHull/RectangleEventHandler",570),A(572,1,Ir,pe),w.$b=function(t,n){return Id(),f(t,48).c==f(n,48).c?yr(f(n,48).d,f(t,48).d):yr(f(t,48).c,f(n,48).c)},G(Ws,"RectilinearConvexHull/lambda$0$Type",572),A(573,1,Ir,he),w.$b=function(t,n){return Id(),f(t,48).c==f(n,48).c?yr(f(t,48).d,f(n,48).d):yr(f(t,48).c,f(n,48).c)},G(Ws,"RectilinearConvexHull/lambda$1$Type",573),A(574,1,Ir,de),w.$b=function(t,n){return Id(),f(t,48).c==f(n,48).c?yr(f(n,48).d,f(t,48).d):yr(f(n,48).c,f(t,48).c)},G(Ws,"RectilinearConvexHull/lambda$2$Type",574),A(575,1,Ir,ke),w.$b=function(t,n){return Id(),f(t,48).c==f(n,48).c?yr(f(t,48).d,f(n,48).d):yr(f(n,48).c,f(t,48).c)},G(Ws,"RectilinearConvexHull/lambda$3$Type",575),A(576,1,Ir,Pe),w.$b=function(t,n){return yse(t,n)},G(Ws,"RectilinearConvexHull/lambda$4$Type",576),A(469,1,{},JO),G(Ws,"Scanline",469),A(662,1,{}),G(Ls,"AbstractGraphPlacer",662),A(222,1,{222:1},gM);var St;G(Ls,"ComponentGroup",222),A(434,662,{},mj),w.Fc=function(t,n){var i,s,l,h,v,p,m,S,x,L,j,I,R;if(this.a.c=ve(Ze,Me,1,0,4,1),n.b.c=ve(Ze,Me,1,0,4,1),t.V()){n.e.a=0,n.e.b=0;return}for(h=f(t.sb(0),55),vu(n,h),l=t.mb();l.G();)s=f(l.H(),55),$ae(this,s);for(I=new Fr,R=2*f(z(h,(le(),Ai)),15).a,m=new M(this.a);m.a<m.c.c.length;)v=f(O(m),222),S=Cfe(v,R),ys(m3(v.a),I.a,I.b),I.a+=S.a,I.b+=S.b;if(n.e.a=I.a-R,n.e.b=I.b-R,Pt(ge(Nt(z(h,(zt(),c5)))))&&He(z(h,(Ee(),hf)))===He((du(),ff))){for(j=t.mb();j.G();)x=f(j.H(),55),tb(x,x.d.a,x.d.b);for(i=new Ae,Qz(i,t,R),L=t.mb();L.G();)x=f(L.H(),55),dn(zs(x.d),i.e);dn(zs(n.e),i.a)}for(p=new M(this.a);p.a<p.c.c.length;)v=f(O(p),222),yA(n,m3(v.a))},G(Ls,"ComponentGroupGraphPlacer",434),A(322,1,{},Ae),G(Ls,"ComponentsCompactor",322),A(13,647,aT,Se,Ni,Fu),w.rb=function(t,n){Gc(this,t,n)},w.ib=function(t){return Le(this,t)},w.jb=function(t){return Tn(this,t)},w.Q=function(){this.c=ve(Ze,Me,1,0,4,1)},w.kb=function(t){return ji(this,t,0)!=-1},w.sb=function(t){return _e(this,t)},w.V=function(){return this.c.length==0},w.mb=function(){return new M(this)},w.vb=function(t){return Zl(this,t)},w.nb=function(t){return Tr(this,t)},w.Xb=function(t,n){AO(this,t,n)},w.wb=function(t,n){return Uc(this,t,n)},w.Y=function(){return this.c.length},w.ob=function(){return UI(this)},w.pb=function(t){return Vn(this,t)},G(wt,"ArrayList",13),A(532,13,aT,eA),w.ib=function(t){return zd(this,f(t,48))},G(Ls,"ComponentsCompactor/Hullpoints",532),A(529,1,{347:1},I8),w.a=!1,G(Ls,"ComponentsCompactor/InternalComponent",529),A(528,1,rc,yj),w.mb=function(){return new M(this.a)},G(Ls,"ComponentsCompactor/InternalConnectedComponents",528),A(531,1,{251:1},SB),w.zc=function(){return null},w.Ac=function(){return this.a},w.yc=function(){return H2(this.d)},w.Bc=function(){return this.b},G(Ls,"ComponentsCompactor/InternalExternalExtension",531),A(530,1,{251:1},Lj),w.Ac=function(){return this.a},w.yc=function(){return H2(this.d)},w.zc=function(){return this.c},w.Bc=function(){return this.b},G(Ls,"ComponentsCompactor/InternalUnionExternalExtension",530),A(534,1,{},QB),G(Ls,"ComponentsCompactor/OuterSegments",534),A(533,1,{},kj),G(Ls,"ComponentsCompactor/Segments",533),A(381,1,{},JI),G(Ls,"ComponentsProcessor",381),A(432,662,{},Te),w.Fc=function(t,n){var i,s,l,h,v,p,m,S,x,L,j,I,R,Y,q,V,U,te,ue,ye,Ce,be;if(t.Y()==1){te=f(t.sb(0),55),te!=n&&(n.b.c=ve(Ze,Me,1,0,4,1),dz(n,te,0,0),vu(n,te),GM(n.a,te.a),n.e.a=te.e.a,n.e.b=te.e.b);return}else if(t.V()){n.b.c=ve(Ze,Me,1,0,4,1),n.e.a=0,n.e.b=0;return}for(p=t.mb();p.G();){for(h=f(p.H(),55),q=0,R=new M(h.b);R.a<R.c.c.length;)I=f(O(R),9),q+=f(z(I,(le(),Qa)),24).a;h.k=q}for(Fa(t,new Oe),l=f(t.sb(0),55),n.b.c=ve(Ze,Me,1,0,4,1),vu(n,l),j=0,ye=0,m=t.mb();m.G();)h=f(m.H(),55),U=h.e,j=je(j,U.a),ye+=U.a*U.b;for(j=je(j,Math.sqrt(ye)*f(z(n,(le(),Yh)),15).a),ue=PH*f(z(n,Ai),15).a,Ce=0,be=0,L=0,i=ue,v=t.mb();v.G();)h=f(v.H(),55),U=h.e,Ce+U.a>j&&(Ce=0,be+=L+ue,L=0),Y=h.d,tb(h,Ce+Y.a,be+Y.b),Y.a=0,Y.b=0,i=je(i,Ce+U.a),L=je(L,U.b),Ce+=U.a+ue;if(n.e.a=i,n.e.b=be+L,V=f(z(n,Ai),15).a,Pt(ge(Nt(z(l,(zt(),c5)))))){for(s=new Ae,Qz(s,t,V),x=t.mb();x.G();)S=f(x.H(),55),dn(zs(S.d),s.e);dn(zs(n.e),s.a)}yA(n,t)},G(Ls,"SimpleRowGraphPlacer",432),A(433,1,Ir,Oe),w.$b=function(t,n){return hae(f(t,55),f(n,55))},G(Ls,"SimpleRowGraphPlacer/1",433),A(369,1,pn,b9),w.sc=function(t,n){nH(t,n)};var yG;G(cb,"CompoundGraphPostprocessor",369),A(370,1,vo,ze),w.D=function(t){var n;return n=f(z(f(t,114).b,(Ee(),Un)),44),!!n&&n.b!=0},G(cb,"CompoundGraphPostprocessor/1",370),A(368,1,pn,sI),w.sc=function(t,n){k8(this,t,n)},G(cb,"CompoundGraphPreprocessor",368),A(187,1,{187:1},QR),w.c=!1,G(cb,"CompoundGraphPreprocessor/ExternalPort",187),A(114,1,{114:1},h0),w.w=function(){return c0(this.c)+":"+YA(this.b)},G(cb,"CrossHierarchyEdge",114),A(310,1,Ir,PS),w.$b=function(t,n){return Yoe(this,f(t,114),f(n,114))},G(cb,"CrossHierarchyEdgeComparator",310),A(147,131,{179:1,131:1,147:1,3:1}),w.k=0,G(Xr,"LGraphElement",147),A(12,147,{179:1,131:1,12:1,147:1,3:1},ws),w.w=function(){return YA(this)};var Xi=G(Xr,"LEdge",12);A(55,147,{179:1,131:1,55:1,147:1,3:1,22:1},nC),w.mb=function(){return new M(this.c)},w.w=function(){return this.c.c.length==0?"G-unlayered"+nc(this.b):this.b.c.length==0?"G-layered"+nc(this.c):"G[layerless"+nc(this.b)+", layers"+nc(this.c)+"]"};var Xfe=G(Xr,"LGraph",55);A(273,1,{}),w.pc=function(){return this.e.j},G(Xr,"LGraphAdapters/AbstractLShapeAdapter",273),A(240,1,{627:1},N1),w.b=null,G(Xr,"LGraphAdapters/LEdgeAdapter",240),A(325,1,{},d4),w.pc=function(){return this.a.e},w.b=null,w.c=!1,G(Xr,"LGraphAdapters/LGraphAdapter",325),A(224,273,{129:1,224:1},Tm),G(Xr,"LGraphAdapters/LLabelAdapter",224),A(555,273,{626:1},_N),w.a=null,w.b=null,w.c=!1,G(Xr,"LGraphAdapters/LNodeAdapter",555),A(556,273,{161:1},GN),w.a=null,w.b=null,w.c=null,w.d=!1,G(Xr,"LGraphAdapters/LPortAdapter",556),A(557,1,Ir,We),w.$b=function(t,n){return ece(f(t,7),f(n,7))},G(Xr,"LGraphAdapters/PortComparator",557),A(168,1,{168:1},km,yO),w.t=function(t){var n;return xe(t,168)?(n=f(t,168),this.d==n.d&&this.a==n.a&&this.b==n.b&&this.c==n.c):!1},w.v=function(){var t,n;return t=Xn(ge(this.b))<<16,t|=Xn(ge(this.a))&Ts,n=Xn(ge(this.c))<<16,n|=Xn(ge(this.d))&Ts,t^n},w.w=function(){return"Insets[top="+this.d+",left="+this.b+",bottom="+this.a+",right="+this.c+"]"},w.a=0,w.b=0,w.c=0,w.d=0,G(Xr,"LInsets",168),A(165,147,{179:1,131:1,147:1,165:1,3:1}),G(Xr,"LShape",165),A(33,165,{179:1,131:1,147:1,33:1,165:1,3:1},P4),w.w=function(){return this.a==null?"l_"+this.k:"l_"+this.a},G(Xr,"LLabel",33),A(9,165,{179:1,131:1,147:1,9:1,165:1,3:1},Va),w.w=function(){return LO(this)};var Er=G(Xr,"LNode",9);A(132,17,{132:1,3:1,23:1,17:1},Sd);var Mi,Cn,Za,hn,Hn,er,oL=At(Xr,"LNode/NodeType",132,on,Wre);A(7,165,{179:1,131:1,147:1,7:1,165:1,3:1},Yn),w.w=function(){var t;return t=gA(this),t==null?"p_"+this.k:"p_"+t};var hE,sL,dE,uL,vE,gE,kG=G(Xr,"LPort",7);A(399,1,vo,$e),w.D=function(t){return cM(t)},G(Xr,"LPort/1",399),A(400,1,vo,Ge),w.D=function(t){return uM(t)},G(Xr,"LPort/2",400),A(401,1,vo,me),w.D=function(t){return f(t,7).g==(we(),rt)},G(Xr,"LPort/3",401),A(402,1,vo,Ve),w.D=function(t){return f(t,7).g==(we(),Be)},G(Xr,"LPort/4",402),A(403,1,vo,Ke),w.D=function(t){return f(t,7).g==(we(),ct)},G(Xr,"LPort/5",403),A(404,1,vo,at),w.D=function(t){return f(t,7).g==(we(),qe)},G(Xr,"LPort/6",404),A(190,1,rc,cd),w.mb=function(){var t;return t=new M(this.a.b),new Y9(t)},G(Xr,"LPort/7",190),A(405,1,ir,Y9),w.H=function(){return f(O(this.a),12).c},w.G=function(){return Bc(this.a)},w.I=function(){Dd(this.a)},G(Xr,"LPort/7/1",405),A(169,1,rc,$f),w.mb=function(){var t;return t=new M(this.a.e),new DS(t)},G(Xr,"LPort/8",169),A(304,1,ir,DS),w.H=function(){return f(O(this.a),12).d},w.G=function(){return Bc(this.a)},w.I=function(){Dd(this.a)},G(Xr,"LPort/8/1",304),A(16,147,{179:1,131:1,147:1,16:1,3:1,22:1},qc),w.mb=function(){return new M(this.a)},w.w=function(){return"L_"+ji(this.b.c,this,0)+nc(this.a)},G(Xr,"Layer",16),A(437,1,pn,ft),w.sc=function(t,n){var i,s,l,h,v,p,m;for(It(n,"Big nodes intermediate-processing",1),this.a=t,h=new M(this.a.c);h.a<h.c.c.length;)for(l=f(O(h),16),m=ca(l.a),i=Lo(m,new tn),p=Fl(i.b.mb(),i.a);Ku(p);)v=f(Xl(p),9),He(z(v,(zt(),Sr)))===He((Fi(),dv))||He(z(v,Sr))===He(Pu)?(s=bx(this,v,!1),ce(s,Sr,f(z(v,Sr),85)),ce(v,Sr,Sf)):bx(this,v,!0);Ct(n)},G(bt,"BigNodesIntermediateProcessor",437),A(438,1,vo,tn),w.D=function(t){return aie(f(t,9))},G(bt,"BigNodesIntermediateProcessor/1",438),A(582,1,yi,F9),w.B=function(t){var n;return eae((n=this,t0(t),n))},G(bt,"BigNodesLabelHandler/CompoundFunction",582),A(332,1,{},$C),w.a=0,w.e=null,w.f=0,G(bt,"BigNodesLabelHandler/Handler",332),A(583,1,yi,q9),w.B=function(t){var n;return hse((n=this,t0(t),n))},G(bt,"BigNodesLabelHandler/Handler/1",583),A(584,1,yi,$N),w.B=function(t){var n;return Ene((n=this,t0(t),n))},G(bt,"BigNodesLabelHandler/Handler/2",584),A(585,1,yi,YN),w.B=function(t){var n;return Kle((n=this,t0(t),n))},G(bt,"BigNodesLabelHandler/Handler/3",585),A(439,1,pn,gn),w.sc=function(t,n){var i,s,l,h,v,p,m,S,x,L,j,I,R,Y;for(It(n,"Big nodes post-processing",1),this.a=t,p=new M(this.a.c);p.a<p.c.c.length;)for(v=f(O(p),16),i=Lo(v.a,new mt),S=Fl(i.b.mb(),i.a);Ku(S);){for(m=f(Xl(S),9),L=f(z(m,(le(),zb)),15),h=AB(this,m),Y=new Se,R=Jn(h,(we(),Be)).mb();R.G();)j=f(R.H(),7),Y.c[Y.c.length]=j,x=j.i.a-h.j.a,j.i.a=L.a+x;for(m.j.a=L.a,I=new M(Y);I.a<I.c.c.length;)j=f(O(I),7),cn(j,m);this.a.e.a<m.i.a+m.j.a&&(this.a.e.a=m.i.a+m.j.a),l=f(z(m,y6),20),Tn(m.c,l),s=f(z(m,JE),64),s&&s.B(null)}Ct(n)},G(bt,"BigNodesPostProcessor",439),A(440,1,vo,mt),w.D=function(t){return oie(f(t,9))},G(bt,"BigNodesPostProcessor/1",440),A(441,1,pn,Uj),w.sc=function(t,n){var i,s,l,h,v,p,m,S,x,L,j,I;for(It(n,jH,1),this.c=t,L=this.c.b,l=0,m=new M(L);m.a<m.c.c.length;)v=f(O(m),9),v.k=l++;for(this.d=f(z(this.c,(le(),Ai)),15).a,this.a=f(z(this.c,(Ee(),Oo)),59),this.b=L.c.length,h=NH,S=new M(L);S.a<S.c.c.length;)v=f(O(S),9),v.g==(et(),Hn)&&v.j.a<h&&(h=v.j.a);for(h=50>h?50:h,i=new Se,I=h+this.d,x=new M(L);x.a<x.c.c.length;)if(v=f(O(x),9),v.g==(et(),Hn)&&v.j.a>I){for(j=1,s=v.j.a;s>h;)++j,s=(v.j.a-(j-1)*this.d)/j;Le(i,new iA(this,v,j,s))}for(p=new M(i);p.a<p.c.c.length;)v=f(O(p),267),Lce(v.d)&&ife(v);Ct(n)},w.b=0,w.d=0,G(bt,"BigNodesPreProcessor",441),A(267,1,{267:1},iA),w.a=0,w.c=0,G(bt,"BigNodesPreProcessor/BigNode",267),A(442,1,pn,Kj),w.sc=function(t,n){var i,s,l,h,v,p,m,S,x,L,j,I,R,Y;for(It(n,jH,1),EG=Pt(ge(Nt(z(t,(Ee(),pb))))),this.c=t,I=new Se,v=new M(t.c);v.a<v.c.c.length;)h=f(O(v),16),Tn(I,h.a);for(l=0,x=new M(I);x.a<x.c.c.length;)m=f(O(x),9),m.k=l++;for(this.d=f(z(this.c,(le(),Ai)),15).a,this.a=f(z(this.c,Oo),59),this.b=I.c.length,p=NH,L=new M(I);L.a<L.c.c.length;)m=f(O(L),9),m.g==(et(),Hn)&&m.j.a<p&&(p=m.j.a);for(p=50>p?50:p,i=new Se,Y=p+this.d,j=new M(I);j.a<j.c.c.length;)if(m=f(O(j),9),m.g==(et(),Hn)&&m.j.a>Y){for(R=1,s=m.j.a;s>p;)++R,s=(m.j.a-(R-1)*this.d)/R;Le(i,new xO(this,m,R))}for(S=new M(i);S.a<S.c.c.length;)m=f(O(S),268),Tfe(m)&&tle(m);Ct(n)},w.b=0,w.d=0;var EG=!1;G(bt,"BigNodesSplitter",442),A(268,1,{268:1},xO),w.a=0,w.e=4,G(bt,"BigNodesSplitter/BigNode",268),A(443,1,pn,ht),w.sc=function(t,n){var i,s,l,h,v,p,m,S;for(It(n,"Comment post-processing",1),m=f(z(t,(le(),Ai)),15).a,h=new M(t.c);h.a<h.c.c.length;){for(l=f(O(h),16),s=new Se,p=new M(l.a);p.a<p.c.c.length;)v=f(O(p),9),S=f(z(v,hv),20),i=f(z(v,cv),20),(S||i)&&(Xle(v,S,i,m),S&&Tn(s,S),i&&Tn(s,i));Tn(l.a,s)}Ct(n)},G(bt,"CommentPostprocessor",443),A(444,1,pn,Rt),w.sc=function(t,n){var i,s,l,h,v,p,m,S,x,L,j,I,R,Y,q;for(It(n,"Comment pre-processing",1),p=new M(t.b);p.a<p.c.c.length;)if(v=f(O(p),9),Pt(ge(Nt(z(v,(Ee(),tv)))))){for(s=0,i=null,m=null,I=new M(v.f);I.a<I.c.c.length;)L=f(O(I),7),s+=L.b.c.length+L.e.c.length,L.b.c.length==1&&(i=f(_e(L.b,0),12),m=i.c),L.e.c.length==1&&(i=f(_e(L.e,0),12),m=i.d);if(s==1&&m.b.c.length+m.e.c.length==1&&!Pt(ge(Nt(z(m.f,tv)))))mfe(v,i,m,m.f),Dd(p);else{for(q=new Se,j=new M(v.f);j.a<j.c.c.length;){for(L=f(O(j),7),x=new M(L.e);x.a<x.c.c.length;)S=f(O(x),12),S.d.e.c.length==0||(q.c[q.c.length]=S);for(h=new M(L.b);h.a<h.c.c.length;)l=f(O(h),12),l.c.b.c.length==0||(q.c[q.c.length]=l)}for(Y=new M(q);Y.a<Y.c.c.length;)R=f(O(Y),12),wu(R,!0)}}Ct(n)},G(bt,"CommentPreprocessor",444),A(445,1,pn,Lt),w.sc=function(t,n){var i,s,l,h,v,p,m,S,x,L;for(It(n,"Edge and layer constraint edge reversal",1),S=new M(t.b);S.a<S.c.c.length;){switch(m=f(O(S),9),v=f(z(m,(zt(),Sr)),85),h=null,v.e){case 1:case 2:h=(ph(),Bb);break;case 3:case 4:h=(ph(),tw)}if(h)ce(m,(le(),e5),(ph(),Bb)),h==tw?Nx(m,v,(cr(),ai)):h==Bb&&Nx(m,v,(cr(),Ri));else if(gs(f(z(m,(Ee(),dt)),28))&&m.f.c.length!=0){for(i=!0,L=new M(m.f);L.a<L.c.c.length;){if(x=f(O(L),7),!(x.g==(we(),Be)&&x.b.c.length-x.e.c.length>0||x.g==qe&&x.b.c.length-x.e.c.length<0)){i=!1;break}if(x.g==qe){for(l=new M(x.e);l.a<l.c.c.length;)if(s=f(O(l),12),p=f(z(s.d.f,Sr),85),p==(Fi(),dv)||p==Pu){i=!1;break}}if(x.g==Be){for(l=new M(x.b);l.a<l.c.c.length;)if(s=f(O(l),12),p=f(z(s.c.f,Sr),85),p==(Fi(),_b)||p==mc){i=!1;break}}}i&&Nx(m,v,(cr(),o5))}}Ct(n)},G(bt,"EdgeAndLayerConstraintEdgeReverser",445),A(446,1,pn,yt),w.sc=function(t,n){var i,s,l,h,v,p,m,S,x,L;for(It(n,"End label placement",1),v=f(z(t,(Ee(),Mh)),15).a,this.a=(On(),new $t),this.c=new $t,this.b=new $t,m=new M(t.c);m.a<m.c.c.length;)for(p=f(O(m),16),x=new M(p.a);x.a<x.c.c.length;)for(S=f(O(x),9),s=Dt(En(S));xt(s);)for(i=f(Et(s),12),h=new M(i.b);h.a<h.c.c.length;)l=f(O(h),33),(He(z(l,da))===He((Es(),Ih))||He(z(l,da))===He(dl))&&(L=null,He(z(l,da))===He(Ih)?L=i.c:He(z(l,da))===He(dl)&&(L=i.d),dh(this.a,L.f)||un(this.a,L.f,0),dh(this.c,L.f)||un(this.c,L.f,0),dh(this.b,L)||un(this.b,L,0),He(z(l,(le(),bo)))===He((Yi(),rs))?ale(l,L,v):ile(l,L,v));Ct(n)},G(bt,"EndLabelProcessor",446),A(269,1,pn,Lm),w.sc=function(t,n){var i,s,l,h,v;for(It(n,"Graph transformation ("+this.a+")",1),l=Wc(t.b),s=new M(t.c);s.a<s.c.c.length;)i=f(O(s),16),Tn(l,i.a);switch(this.a.e){case 0:Kz(l,t);break;case 1:Yz(l),v=f(z(t,(zt(),Vh)),115),v&&ce(t,Vh,i8(v)),lo(t.d),lo(t.e);break;case 2:Kz(l,t),pfe(l,t),Yz(l),h=f(z(t,(zt(),Vh)),115),h&&ce(t,Vh,i8(h)),lo(t.d),lo(t.e)}Ct(n)},G(bt,"GraphTransformer",269),A(221,17,{221:1,3:1,23:1,17:1},Qm);var cL,lL,fL,Qfe=At(bt,"GraphTransformer/Mode",221,on,Xne);A(448,1,pn,Mt),w.sc=function(t,n){It(n,"Hierarchical port constraint processing",1),coe(t),Afe(t),Ct(n)},G(bt,"HierarchicalPortConstraintProcessor",448),A(449,1,Ir,In),w.$b=function(t,n){return woe(f(t,9),f(n,9))},G(bt,"HierarchicalPortConstraintProcessor/NodeComparator",449),A(450,1,pn,Pn),w.sc=function(t,n){var i,s,l,h,v,p,m,S,x,L;for(It(n,"Hierarchical port dummy size processing",1),m=new Se,L=new Se,p=f(z(t,(le(),Ai)),15).a,x=p*f(z(t,(zt(),eu)),15).a,i=x*2,l=new M(t.c);l.a<l.c.c.length;){for(s=f(O(l),16),m.c=ve(Ze,Me,1,0,4,1),L.c=ve(Ze,Me,1,0,4,1),v=new M(s.a);v.a<v.c.c.length;)h=f(O(v),9),h.g==(et(),Cn)&&(S=f(z(h,_r),32),S==(we(),rt)?m.c[m.c.length]=h:S==ct&&(L.c[L.c.length]=h));xB(m,!0,i),xB(L,!1,i)}Ct(n)},G(bt,"HierarchicalPortDummySizeProcessor",450),A(451,1,pn,Vt),w.sc=function(t,n){var i,s,l,h;It(n,"Orthogonally routing hierarchical port edges",1),this.a=0,i=Fce(t),Ule(t,i),Mle(this,t,i),cfe(t),s=f(z(t,(Ee(),dt)),28),l=t.c,qz((Sn(0,l.c.length),f(l.c[0],16)),s,t),qz(f(_e(l,l.c.length-1),16),s,t),h=t.c,Tz((Sn(0,h.c.length),f(h.c[0],16))),Tz(f(_e(h,h.c.length-1),16)),Ct(n)},w.a=0,G(bt,"HierarchicalPortOrthogonalEdgeRouter",451),A(452,1,Ir,sr),w.$b=function(t,n){return Ote(f(t,9),f(n,9))},G(bt,"HierarchicalPortOrthogonalEdgeRouter/1",452),A(453,1,Ir,Qe),w.$b=function(t,n){return mie(f(t,9),f(n,9))},G(bt,"HierarchicalPortOrthogonalEdgeRouter/2",453),A(454,1,pn,ne),w.sc=function(t,n){var i;It(n,"Hierarchical port position processing",1),i=t.c,i.c.length>0&&yz((Sn(0,i.c.length),f(i.c[0],16)),t),i.c.length>1&&yz(f(_e(i,i.c.length-1),16),t),Ct(n)},G(bt,"HierarchicalPortPositionProcessor",454),A(471,1,pn,Ie),w.sc=function(t,n){var i,s,l,h,v,p,m,S,x,L,j,I,R,Y;for(It(n,"Hyperedge merging",1),I=new fn(t.c,0);I.b<I.d.Y();)if(j=(ut(I.b<I.d.Y()),f(I.d.sb(I.c=I.b++),16)),Y=j.a,Y.c.length!=0)for(p=null,L=null,R=0;R<Y.c.length;R++)i=(Sn(R,Y.c.length),f(Y.c[R],9)),v=i.g,v==(et(),hn)&&L==hn&&(l=f(z(i,(le(),Oi)),7),S=f(z(p,Oi),7),h=f(z(i,Si),7),x=f(z(p,Si),7),s=!!l||!!h,m=!!S||!!x,s&&m&&(l==S||h==x)&&(Bue(i,p,l==S,h==x),Sn(R,Y.c.length),o4(Y.c,R,1),--R,i=p,v=L)),p=i,L=v;Ct(n)},G(bt,"HyperedgeDummyMerger",471),A(472,1,pn,Je),w.sc=function(t,n){var i,s,l,h,v,p,m,S,x,L;for(It(n,"Hypernodes processing",1),l=new M(t.c);l.a<l.c.c.length;)for(s=f(O(l),16),p=new M(s.a);p.a<p.c.c.length;)if(v=f(O(p),9),Pt(ge(Nt(z(v,(Ee(),wb)))))&&v.f.c.length<=2){for(L=0,x=0,i=0,h=0,S=new M(v.f);S.a<S.c.c.length;)switch(m=f(O(S),7),m.g.e){case 1:++L;break;case 2:++x;break;case 3:++i;break;case 4:++h}L==0&&i==0&&Lfe(t,v,h<=x)}Ct(n)},G(bt,"HypernodesProcessor",472),A(473,1,pn,Ye),w.sc=function(t,n){var i,s,l,h,v,p,m,S,x;for(It(n,"Layer constraint edge reversal",1),v=new M(t.c);v.a<v.c.c.length;){for(h=f(O(v),16),x=-1,i=new Se,S=f(Vn(h.a,ve(Er,Ii,9,h.a.c.length,0,1)),51),l=0;l<S.length;l++)s=f(z(S[l],(le(),Qs)),140),x==-1?s!=(ks(),kf)&&(x=l):s==(ks(),kf)&&(Ar(S[l],null),kh(S[l],x++,h)),s==(ks(),$h)&&Le(i,S[l]);for(m=new M(i);m.a<m.c.c.length;)p=f(O(m),9),Ar(p,null),Ar(p,h)}Ct(n)},G(bt,"InLayerConstraintProcessor",473),A(474,1,pn,Fe),w.sc=function(t,n){var i,s,l,h,v,p;if(f(z(t,(le(),Vr)),18).kb((br(),os))){for(p=new M(t.b);p.a<p.c.c.length;)h=f(O(p),9),h.g==(et(),Hn)&&(l=f(z(h,(Ee(),mb)),65),this.c=Xt(this.c,h.i.a-l.b),this.a=je(this.a,h.i.a+h.j.a+l.c),this.d=Xt(this.d,h.i.b-l.d),this.b=je(this.b,h.i.b+h.j.b+l.a));for(v=new M(t.b);v.a<v.c.c.length;)if(h=f(O(v),9),h.g!=(et(),Hn))switch(h.g.e){case 2:if(s=f(z(h,(zt(),Sr)),85),s==(Fi(),mc)){h.i.a=this.c-10,g8(h,new bn).A(new V9(h));break}if(s==Pu){h.i.a=this.a+10,g8(h,new tt).A(new W9(h));break}if(i=f(z(h,Qs),140),i==(ks(),kf)){Mz(h).A(new U9(h)),h.i.b=this.d-10;break}if(i==$h){Mz(h).A(new K9(h)),h.i.b=this.b+10;break}break;default:throw new nn("The node type "+h.g+" is not supported by the "+Jfe)}}},w.a=Hr,w.b=Hr,w.c=ki,w.d=ki;var Jfe=G(bt,"InteractiveExternalPortPositioner",474);A(475,1,yi,bn),w.B=function(t){return f(t,12).d.f},G(bt,"InteractiveExternalPortPositioner/lambda$0$Type",475),A(476,1,yi,V9),w.B=function(t){return Ate(this.a,t)},G(bt,"InteractiveExternalPortPositioner/lambda$1$Type",476),A(477,1,yi,tt),w.B=function(t){return f(t,12).c.f},G(bt,"InteractiveExternalPortPositioner/lambda$2$Type",477),A(478,1,yi,W9),w.B=function(t){return Rte(this.a,t)},G(bt,"InteractiveExternalPortPositioner/lambda$3$Type",478),A(479,1,yi,U9),w.B=function(t){return Vte(this.a,t)},G(bt,"InteractiveExternalPortPositioner/lambda$4$Type",479),A(480,1,yi,K9),w.B=function(t){return Wte(this.a,t)},G(bt,"InteractiveExternalPortPositioner/lambda$5$Type",480),A(37,17,{37:1,3:1,23:1,17:1},rn);var bE,Nb,pE,wE,hL,dL,vL,gL,mE,$p,bL,pL,wL,mL,av,yL,kL,EL,yE,Yp,kE,SL,Fp,qp,Vp,CL,Gh,Wp,xL,TL,LL,EE,SE,PL,DL,Up,Kp,jL,NL,IL,CE,xE,TE,ML,OL,AL,RL,BL,zL,HL,SG=At(bt,"IntermediateProcessorStrategy",37,on,Rse);A(503,1,pn,Gt),w.sc=function(t,n){var i,s,l,h,v,p,m,S,x,L,j,I,R,Y,q,V,U;for(It(n,"Inverted port preprocessing",1),S=t.c,m=new fn(S,0),i=null,U=new Se;m.b<m.d.Y();){for(V=i,i=(ut(m.b<m.d.Y()),f(m.d.sb(m.c=m.b++),16)),j=new M(U);j.a<j.c.c.length;)x=f(O(j),9),Ar(x,V);for(U.c=ve(Ze,Me,1,0,4,1),I=new M(i.a);I.a<I.c.c.length;)if(x=f(O(I),9),x.g==(et(),Hn)&&gs(f(z(x,(Ee(),dt)),28))){for(q=gx(x,(cr(),Ri),(we(),Be)).mb();q.G();)for(R=f(q.H(),7),p=R.b,v=f(Vn(p,ve(Xi,qi,12,p.c.length,0,1)),47),l=0,h=v.length;l<h;++l)s=v[l],Ace(t,R,s,U);for(Y=gx(x,ai,qe).mb();Y.G();)for(R=f(Y.H(),7),p=R.e,v=f(Vn(p,ve(Xi,qi,12,p.c.length,0,1)),47),l=0,h=v.length;l<h;++l)s=v[l],Due(t,R,s,U)}}for(L=new M(U);L.a<L.c.c.length;)x=f(O(L),9),Ar(x,i);Ct(n)},G(bt,"InvertedPortProcessor",503),A(481,1,pn,tr),w.sc=function(t,n){It(n,"Node and Port Label Placement and Node Sizing",1),Cee((jm(),jm(),new d4(t,!1))),Ct(n)},G(bt,"LabelAndNodeSizeProcessor",481),A(482,1,pn,p9),w.sc=function(t,n){var i,s,l,h,v,p,m,S,x,L,j,I,R,Y,q,V,U,te;for(It(n,"Label dummy insertions",1),j=new Se,x=f(z(t,(Ee(),Mh)),15).a,L=f(z(t,Oo),59),R=new M(t.b);R.a<R.c.c.length;)for(I=f(O(R),9),q=new M(I.f);q.a<q.c.c.length;)for(Y=f(O(q),7),p=new M(Y.e);p.a<p.c.c.length;)if(v=f(O(p),12),v.c.f!=v.d.f&&YM(v.b,CG)){for(U=zc(v.b.c.length),i=new Va(t),_a(i,(et(),Za)),ce(i,(le(),lt),v),ce(i,j6,U),ce(i,dt,(zn(),ii)),ce(i,Oi,v.c),ce(i,Si,v.d),j.c[j.c.length]=i,XB(v,i),te=f(z(v,es),15).a,te<0&&(te=0,ce(v,es,new Ut(te))),V=Math.floor(te/2),l=new M(i.f);l.a<l.c.c.length;)s=f(O(l),7),s.i.b=V;for(h=i.j,m=new fn(v.b,0);m.b<m.d.Y();)S=(ut(m.b<m.d.Y()),f(m.d.sb(m.c=m.b++),33)),He(z(S,da))===He((Es(),gb))&&(L==($n(),Ks)||L==Ps?(h.a+=S.j.a+x,h.b=je(h.b,S.j.b)):(h.a=je(h.a,S.j.a),h.b+=S.j.b+x),U.c[U.c.length]=S,Po(m));(L==($n(),Ks)||L==Ps)&&(h.a-=x),h.b+=x+te}Tn(t.b,j),Ct(n)};var CG;G(bt,"LabelDummyInserter",482),A(483,1,vo,vr),w.D=function(t){return He(z(f(t,33),(Ee(),da)))===He((Es(),gb))},G(bt,"LabelDummyInserter/1",483),A(484,1,pn,Dn),w.sc=function(t,n){var i,s,l,h,v,p,m,S,x,L,j;for(It(n,"Label dummy removal",1),l=f(z(t,(Ee(),Mh)),15).a,p=f(z(t,Oo),59),v=new M(t.c);v.a<v.c.c.length;)for(h=f(O(v),16),S=new fn(h.a,0);S.b<S.d.Y();)m=(ut(S.b<S.d.Y()),f(S.d.sb(S.c=S.b++),9)),m.g==(et(),Za)&&(x=f(z(m,(le(),lt)),12),j=f(z(x,es),15).a,i=new qn(m.i),He(z(m,bo))===He((Yi(),Zs))&&(i.b+=j+l),s=new ot(m.j.a,m.j.b-j-l),L=f(z(m,j6),20),p==($n(),Ks)||p==Ps?Aae(L,i,l,s,He(z(m,bo))!==He(rs)):Tae(L,i,l,s),Tn(x.b,L),Rz(m,!1),Po(S));Ct(n)},G(bt,"LabelDummyRemover",484),A(485,1,pn,rr),w.sc=function(t,n){var i,s,l,h,v,p,m,S,x,L,j,I,R,Y,q,V,U;for(It(n,"Label dummy switching",1),i=new Se,L=new Se,p=new Se,I=new Se,v=new M(t.c);v.a<v.c.c.length;)for(h=f(O(v),16),x=new M(h.a);x.a<x.c.c.length;)if(S=f(O(x),9),S.g==(et(),Za)){i.c[i.c.length]=S,p.c=ve(Ze,Me,1,0,4,1),I.c=ve(Ze,Me,1,0,4,1),Y=S;do Y=f(Et(Dt(Dr(Y))),12).c.f,Y.g==hn&&(p.c[p.c.length]=Y);while(Y.g==hn);U=S;do U=f(Et(Dt(En(U))),12).d.f,U.g==hn&&(I.c[I.c.length]=U);while(U.g==hn);m=p.c.length,R=I.c.length,m>R+1?(j=(m+R)/2|0,Le(L,new wr(S,(Sn(j,p.c.length),f(p.c[j],9))))):R>m+1&&(j=((R-m)/2|0)-1,Le(L,new wr(S,(Sn(j,I.c.length),f(I.c[j],9)))))}for(V=new M(L);V.a<V.c.c.length;)q=f(O(V),27),cle(f(q.a,9),f(q.b,9));for(l=new M(i);l.a<l.c.c.length;)s=f(O(l),9),GR(s,new wn,(le(),Si)),GR(s,new jn,Oi);Ct(n)},G(bt,"LabelDummySwitcher",485),A(486,1,yi,wn),w.B=function(t){return f(Et(Dt(Dr(f(t,9)))),12).c.f},G(bt,"LabelDummySwitcher/lambda$0$Type",486),A(487,1,yi,jn),w.B=function(t){return f(Et(Dt(En(f(t,9)))),12).d.f},G(bt,"LabelDummySwitcher/lambda$1$Type",487),A(488,1,pn,ci),w.sc=function(t,n){It(n,"Label management",1),t0(z(t,(F3(),TT))),Ct(n)},G(bt,"LabelManagementProcessor",488),A(489,1,pn,w9),w.sc=function(t,n){var i,s,l,h,v,p,m,S,x,L,j,I,R,Y;switch(m=f(z(t,(zt(),Vh)),115),It(n,"Label side selection ("+m+")",1),S=(vt(t),new nh(t)),m.e){case 0:Dse(S);break;case 1:Pse(S);break;case 2:mue(S);break;case 3:wue(S);break;case 4:qle(S)}for(p=new M(t.c);p.a<p.c.c.length;)for(v=f(O(p),16),s=new M(v.a);s.a<s.c.c.length;){for(i=f(O(s),9),I=new M(i.f);I.a<I.c.c.length;)for(L=f(O(I),7),h=new M(L.c);h.a<h.c.c.length;)l=f(O(h),33),He(z(l,(le(),bo)))===He((Yi(),Db))&&ce(l,bo,xG);if(i.g==(et(),Za)&&He(z(i,(le(),bo)))===He((Yi(),rs)))for(x=f(z(i,lt),12),Y=f(z(x,(Ee(),es)),15).a,R=i.j.b-Math.ceil(Y/2),j=new M(i.f);j.a<j.c.c.length;)L=f(O(j),7),L.i.b=R}Ct(n)};var xG;G(bt,"LabelSideSelector",489),A(490,1,Ir,aa),w.$b=function(t,n){return One(f(t,7),f(n,7))},G(bt,"LabelSideSelector/1",490),A(495,1,pn,fs),w.sc=function(t,n){var i,s,l,h,v,p,m,S,x,L,j,I,R,Y,q,V,U,te;if(It(n,"Layer constraint application",1),S=t.c,S.c.length==0){Ct(n);return}for(h=(Sn(0,S.c.length),f(S.c[0],16)),v=f(_e(S,S.c.length-1),16),U=new qc(t),te=new qc(t),m=new M(S);m.a<m.c.c.length;)for(p=f(O(m),16),Y=f(Vn(p.a,ve(Er,Ii,9,p.a.c.length,0,1)),51),j=0,R=Y.length;j<R;++j)switch(L=Y[j],i=f(z(L,(zt(),Sr)),85),i.e){case 1:Ar(L,h),cz(L,!1);break;case 2:Ar(L,U),cz(L,!0);break;case 3:Ar(L,v),bz(L);break;case 4:Ar(L,te),bz(L)}if(S.c.length>=2){for(x=!0,q=(Sn(1,S.c.length),f(S.c[1],16)),I=new M(h.a);I.a<I.c.c.length;){if(L=f(O(I),9),He(z(L,(zt(),Sr)))===He((Fi(),Sf))){x=!1;break}for(l=Dt(En(L));xt(l);)if(s=f(Et(l),12),s.d.f.d==q){x=!1;break}if(!x)break}if(x){for(Y=f(Vn(h.a,ve(Er,Ii,9,h.a.c.length,0,1)),51),j=0,R=Y.length;j<R;++j)L=Y[j],Ar(L,q);Tr(S,h)}}if(S.c.length>=2){for(x=!0,V=f(_e(S,S.c.length-2),16),I=new M(v.a);I.a<I.c.c.length;){if(L=f(O(I),9),He(z(L,(zt(),Sr)))===He((Fi(),Sf))){x=!1;break}for(l=Dt(Dr(L));xt(l);)if(s=f(Et(l),12),s.c.f.d==V){x=!1;break}if(!x)break}if(x){for(Y=f(Vn(v.a,ve(Er,Ii,9,v.a.c.length,0,1)),51),j=0,R=Y.length;j<R;++j)L=Y[j],Ar(L,V);Tr(S,v)}}S.c.length==1&&(Sn(0,S.c.length),f(S.c[0],16)).a.c.length==0&&Zl(S,0),U.a.c.length==0||(Xc(0,S.c.length),dg(S.c,0,U)),te.a.c.length==0||(S.c[S.c.length]=te),Ct(n)},G(bt,"LayerConstraintProcessor",495),A(496,1,pn,hs),w.sc=function(t,n){var i,s,l,h,v,p,m,S,x,L,j,I,R;for(It(n,"Layer size calculation",1),S=Xo,m=5e-324,v=new M(t.c);v.a<v.c.c.length;)if(h=f(O(v),16),p=h.c,p.a=0,p.b=0,h.a.c.length!=0){for(L=new M(h.a);L.a<L.c.c.length;)x=f(O(L),9),I=x.j,j=x.e,p.a=je(p.a,I.a+j.b+j.c);s=f(_e(h.a,0),9),R=s.i.b-s.e.d,l=f(_e(h.a,h.a.c.length-1),9),i=l.i.b+l.j.b+l.e.a,p.b=i-R,S=S<R?S:R,m=m>i?m:i}t.e.b=m-S,t.d.b-=S,Ct(n)},G(bt,"LayerSizeAndGraphHeightCalculator",496),A(497,1,pn,zo),w.sc=function(t,n){var i,s,l,h,v;for(It(n,"Edge joining",1),i=Pt(ge(Nt(z(t,(zt(),s5))))),l=new M(t.c);l.a<l.c.c.length;)for(s=f(O(l),16),v=new fn(s.a,0);v.b<v.d.Y();)h=(ut(v.b<v.d.Y()),f(v.d.sb(v.c=v.b++),9)),h.g==(et(),hn)&&(Rz(h,i),Po(v));Ct(n)},G(bt,"LongEdgeJoiner",497),A(498,1,pn,Ha),w.sc=function(t,n){var i,s,l,h,v,p,m,S,x,L,j,I;if(It(n,"Edge splitting",1),t.c.c.length<=2){Ct(n);return}for(h=new fn(t.c,0),v=(ut(h.b<h.d.Y()),f(h.d.sb(h.c=h.b++),16));h.b<h.d.Y();)for(l=v,v=(ut(h.b<h.d.Y()),f(h.d.sb(h.c=h.b++),16)),m=new M(l.a);m.a<m.c.c.length;)for(p=f(O(m),9),x=new M(p.f);x.a<x.c.c.length;)for(S=f(O(x),7),s=new M(S.e);s.a<s.c.c.length;)i=f(O(s),12),j=i.d,L=j.f.d,L!=l&&L!=v&&XB(i,(I=new Va(t),_a(I,(et(),hn)),ce(I,(le(),lt),i),ce(I,(Ee(),dt),(zn(),ii)),Ar(I,v),I));Ct(n)},G(bt,"LongEdgeSplitter",498),A(499,1,pn,au),w.sc=function(t,n){var i,s,l,h,v,p,m,S;for(It(n,"Node margin calculation",1),i=new $9((jm(),new d4(t,!0))),Zae(i),p=f(z(t,(le(),Ai)),15).a,l=new M(t.c);l.a<l.c.c.length;)for(s=f(O(l),16),v=new M(s.a);v.a<v.c.c.length;)h=f(O(v),9),gce(h,p),m=h.e,S=f(z(h,N6),65),m.b=je(m.b,S.b),m.c=je(m.c,S.c),m.a=je(m.a,S.a),m.d=je(m.d,S.d);Ct(n)},G(bt,kH,499),A(491,1,pn,Bu),w.sc=function(t,n){var i,s,l,h,v,p,m,S,x,L;switch(It(n,"Node promotion heuristic",1),this.g=t,ufe(this),this.q=f(z(t,(zt(),fw)),109),S=f(z(this.g,R6),24).a,l=new Il,this.q.e){case 2:case 1:xh(this,l);break;case 3:for(this.q=(rl(),Xp),xh(this,l),p=0,v=new M(this.a);v.a<v.c.c.length;)h=f(O(v),24),p=ti(p,h.a);p>this.j&&(this.q=Ib,xh(this,l));break;case 4:for(this.q=(rl(),Xp),xh(this,l),m=0,s=new M(this.b);s.a<s.c.c.length;)i=Ot(O(s)),m=je(m,(ur(i),i));m>this.k&&(this.q=Mb,xh(this,l));break;case 6:L=Xn(K1(this.f.length*S/100)),xh(this,new Z9(L));break;case 5:x=Xn(K1(this.d*S/100)),xh(this,new X9(x));break;default:xh(this,l)}_ue(this,t),Ct(n)},w.d=0,w.e=0,w.i=0,w.j=0,w.k=0,w.n=0,G(bt,"NodePromotion",491),A(492,1,yi,Il),w.B=function(t){return yn(),yn(),oi},G(bt,"NodePromotion/lambda$0$Type",492),A(493,1,yi,Z9),w.B=function(t){return xne(this.a,t)},w.a=0,G(bt,"NodePromotion/lambda$1$Type",493),A(494,1,yi,X9),w.B=function(t){return Tne(this.a,t)},w.a=0,G(bt,"NodePromotion/lambda$2$Type",494),A(109,17,{109:1,3:1,23:1,17:1},zl);var _L,Ib,GL,$L,Mb,YL,Zp,Xp,TG=At(bt,"NodePromotionStrategy",109,on,yie),LG;A(500,1,pn,Nc),w.sc=function(t,n){var i,s,l,h,v,p,m,S,x,L,j,I,R,Y,q,V,U,te,ue;for(It(n,AH,1),I=f(z(t,(Ee(),hf)),122),l=new M(t.c);l.a<l.c.c.length;)for(s=f(O(l),16),m=f(Vn(s.a,ve(Er,Ii,9,s.a.c.length,0,1)),51),v=0,p=m.length;v<p;++v)if(h=m[v],h.g==(et(),er)){if(I==(du(),$k))for(x=new M(h.f);x.a<x.c.c.length;)S=f(O(x),7),S.b.c.length==0||Doe(S),S.e.c.length==0||joe(S);else if(xe(z(h,(le(),lt)),12))Y=f(z(h,lt),12),q=f(Jn(h,(we(),qe)).mb().H(),7),V=f(Jn(h,Be).mb().H(),7),U=f(z(q,lt),7),te=f(z(V,lt),7),Bn(Y,te),kn(Y,U),ue=new qn(V.f.i),ue.a=ln(re(ie(_t,1),Ht,10,0,[te.f.i,te.i,te.a])).a,an(Y.a,ue),ue=new qn(q.f.i),ue.a=ln(re(ie(_t,1),Ht,10,0,[U.f.i,U.i,U.a])).a,an(Y.a,ue);else{if(h.f.c.length>=2){for(R=!0,L=new M(h.f),i=f(O(L),7);L.a<L.c.c.length;)if(j=i,i=f(O(L),7),!jo(z(j,lt),z(i,lt))){R=!1;break}}else R=!1;for(x=new M(h.f);x.a<x.c.c.length;)S=f(O(x),7),S.b.c.length==0||Wue(S,R),S.e.c.length==0||Uue(S,R)}Ar(h,null)}Ct(n)},G(bt,"NorthSouthPortPostprocessor",500),A(501,1,pn,Ml),w.sc=function(t,n){var i,s,l,h,v,p,m,S,x,L,j,I,R,Y,q,V,U,te,ue;for(It(n,AH,1),R=new Se,ue=new Se,S=new M(t.c);S.a<S.c.c.length;)for(m=f(O(S),16),q=-1,I=f(Vn(m.a,ve(Er,Ii,9,m.a.c.length,0,1)),51),L=0,j=I.length;L<j;++L)if(x=I[L],++q,!!(x.g==(et(),Hn)&&gs(f(z(x,(Ee(),dt)),28)))){for(gi(f(z(x,(Ee(),dt)),28))||Pue(x),ce(x,(le(),El),x),R.c=ve(Ze,Me,1,0,4,1),ue.c=ve(Ze,Me,1,0,4,1),i=new Se,te=new Ur,dC(te,Jn(x,(we(),rt))),Jz(t,te,R,ue,i),p=q,h=new M(R);h.a<h.c.c.length;)s=f(O(h),9),kh(s,p,m),++q,ce(s,El,x),v=f(_e(s.f,0),7),Y=f(z(v,lt),7),Pt(ge(Nt(z(Y,(zt(),p5)))))||f(z(s,Fh),20).ib(x);for(Hs(te),U=Jn(x,ct).mb();U.G();)V=f(U.H(),7),mr(te,V,te.a,te.a.a);for(Jz(t,te,ue,null,i),l=new M(ue);l.a<l.c.c.length;)s=f(O(l),9),kh(s,++q,m),ce(s,El,x),v=f(_e(s.f,0),7),Y=f(z(v,lt),7),Pt(ge(Nt(z(Y,(zt(),p5)))))||f(z(x,Fh),20).ib(s);i.c.length==0||ce(x,m6,i)}Ct(n)},G(bt,"NorthSouthPortPreprocessor",501),A(502,1,Ir,ad),w.$b=function(t,n){var i,s;return i=t.g,s=n.g,i!=s?i.e-s.e:t.k==n.k?0:i==(we(),rt)?t.k-n.k:n.k-t.k},G(bt,"NorthSouthPortPreprocessor/lambda$0$Type",502),A(504,1,pn,oa),w.sc=function(t,n){var i,s,l,h,v,p;for(It(n,"Removing partition constraint edges",1),s=new M(t.c);s.a<s.c.c.length;)for(i=f(O(s),16),h=new M(i.a);h.a<h.c.c.length;)for(l=f(O(h),9),p=new M(l.f);p.a<p.c.c.length;)v=f(O(p),7),Pt(ge(Nt(z(v,(le(),uw)))))&&Dd(p);Ct(n)},G(bt,"PartitionPostprocessor",504),A(505,1,pn,Ic),w.sc=function(t,n){var i,s,l,h,v,p,m,S,x,L;for(It(n,"Adding partition constraint edges",1),this.a=new Se,p=new M(t.b);p.a<p.c.c.length;)h=f(O(p),9),l=f(z(h,(Ee(),_T)),24),Die(this,l.a).ib(h);for(s=0;s<this.a.c.length-1;s++)for(v=f(_e(this.a,s),20).mb();v.G();)for(h=f(v.H(),9),x=new Yn,cn(x,h),Bt(x,(we(),Be)),ce(x,(le(),uw),(yn(),yn(),oi)),S=f(_e(this.a,s+1),20).mb();S.G();)m=f(S.H(),9),L=new Yn,cn(L,m),Bt(L,qe),ce(L,uw,oi),i=new ws,ce(i,uw,oi),ce(i,(Ee(),$T),gt(20)),Bn(i,x),kn(i,L);this.a=null,Ct(n)},G(bt,"PartitionPreprocessor",505),A(506,1,pn,ao),w.sc=function(t,n){var i,s,l,h,v,p,m,S,x,L,j,I,R,Y;for(It(n,"Port distribution",1),i=vB(t),I=0,x=0,l=0,v=i.length;l<v;++l)for(s=i[l],m=0,S=s.length;m<S;++m)for(p=s[m],p.k=x++,j=new M(p.f);j.a<j.c.c.length;)L=f(O(j),7),L.k=I++;for(h=new M(t.c);h.a<h.c.c.length;)s=f(O(h),16),uue(s);Y=f(z(t,(le(),qh)),154),R=rf(Y,1)!=0?new Am(ve(gw,xp,26,I,12,1)):new t4(ve(gw,xp,26,I,12,1)),F8(R,i),Ct(n)},G(bt,"PortDistributionProcessor",506),A(507,1,pn,Sa),w.sc=function(t,n){var i,s,l,h,v;for(It(n,"Port order processing",1),v=new oo,s=new M(t.c);s.a<s.c.c.length;)for(i=f(O(s),16),h=new M(i.a);h.a<h.c.c.length;)l=f(O(h),9),gs(f(z(l,(Ee(),dt)),28))&&Fa(l.f,v);Ct(n)},G(bt,"PortListSorter",507),A(508,1,Ir,oo),w.$b=function(t,n){return kce(f(t,7),f(n,7))},G(bt,"PortListSorter/PortComparator",508),A(509,1,pn,od),w.sc=function(t,n){var i,s,l,h,v;for(It(n,"Port side processing",1),v=new M(t.b);v.a<v.c.c.length;)l=f(O(v),9),wB(l);for(s=new M(t.c);s.a<s.c.c.length;)for(i=f(O(s),16),h=new M(i.a);h.a<h.c.c.length;)l=f(O(h),9),wB(l);Ct(n)},G(bt,"PortSideProcessor",509),A(510,1,pn,Rs),w.sc=function(t,n){var i,s,l,h,v,p,m,S,x,L;for(It(n,"Restoring reversed edges",1),p=new M(t.c);p.a<p.c.c.length;)for(v=f(O(p),16),S=new M(v.a);S.a<S.c.c.length;)for(m=f(O(S),9),L=new M(m.f);L.a<L.c.c.length;)for(x=f(O(L),7),h=f(Vn(x.e,ve(Xi,qi,12,x.e.c.length,0,1)),47),s=0,l=h.length;s<l;++s)i=h[s],Pt(ge(Nt(z(i,(le(),Js)))))&&wu(i,!1);Ct(n)},G(bt,"ReversedEdgeRestorer",510),A(511,1,pn,T1),w.sc=function(t,n){var i,s,l,h,v,p,m,S,x,L,j,I,R,Y,q,V,U,te,ue,ye,Ce,be,Ne,Ue,Xe,it,st,Tt,xn,Nn;if(It(n,"Sausage Folding",1),this.b=f(z(t,(le(),Ai)),15).a,this.a=this.b*f(z(t,(zt(),vv)),15).a,R=Ose(this,t),I=t.c.c.length,Y=mse(this,t),st=I*Y,l=f(z(t,(Ee(),Oo)),59),l==($n(),Oa)||l==Vi||l==Mo?s=f(z(t,Yh),15).a:s=1/f(z(t,Yh),15).a,i=st/R,s>i){Ct(n);return}Xe=0,h=Xo;do++Xe,i=st/Xe/(R*Xe),j=h,h=i-s<=0?0-(i-s):i-s;while(i>s);for(j<h&&--Xe,Ne=I/(1>Xe?1:Xe)|0,S=Ne,ue=Ne,Nn=!0;S<I;){L=f(_e(t.c,S),16),Ue=!0,U=null,te=null;e:for(xn=new M(L.a);xn.a<xn.c.c.length;)for(Tt=f(O(xn),9),p=Dt(Dr(Tt));xt(p);){if(v=f(Et(p),12),U&&U!=Tt){Ue=!1;break e}if(U=Tt,it=v.c.f,te&&te!=it){Ue=!1;break e}te=it}if(Nn&&Ue&&(ue=0,Nn=!1),S!=ue){for(ye=f(_e(t.c,ue),16),V=new M(Wc(L.a));V.a<V.c.c.length;)if(q=f(O(V),9),kh(q,ye.a.c.length,ye),ue==0)for(p=new M(Wc(Dr(q)));p.a<p.c.c.length;)for(v=f(O(p),12),wu(v,!0),ce(t,S6,(yn(),yn(),oi)),$ce(t,v),m=new Se,_ce(t,v.c,v,m),be=new M(m);be.a<be.c.c.length;)Ce=f(O(be),9),kh(Ce,ye.a.c.length-1,ye)}ue>=Ne&&(Nn=!0),++ue,++S}for(x=new fn(t.c,0);x.b<x.d.Y();)L=(ut(x.b<x.d.Y()),f(x.d.sb(x.c=x.b++),16)),L.a.c.length==0&&Po(x);Ct(n)},w.a=0,w.b=0,G(bt,"SausageFolding",511),A(512,1,pn,lm),w.sc=function(t,n){var i,s,l,h,v,p,m,S,x,L,j,I,R,Y,q,V,U;for(It(n,"Self-loop processing",1),i=new Se,x=new M(t.c);x.a<x.c.c.length;){for(S=f(O(x),16),i.c=ve(Ze,Me,1,0,4,1),j=new M(S.a);j.a<j.c.c.length;)for(L=f(O(j),9),R=new M(L.f);R.a<R.c.c.length;)for(I=f(O(R),7),m=f(Vn(I.e,ve(Xi,qi,12,I.e.c.length,0,1)),47),v=0,p=m.length;v<p;++v)h=m[v],h.c.f==h.d.f&&(Y=h.c,V=h.d,q=Y.g,U=V.g,((q==(we(),rt)||q==ct)&&U==qe||q==ct&&U==rt||q==Be&&U!=Be)&&wu(h,!1),q==Be&&U==qe?Le(i,$B(t,h,V,Y)):q==qe&&U==Be&&Le(i,$B(t,h,Y,V)));for(l=new M(i);l.a<l.c.c.length;)s=f(O(l),9),Ar(s,S)}Ct(n)},G(bt,"SelfLoopProcessor",512),A(513,1,pn,fm),w.sc=function(t,n){var i,s,l,h,v,p,m,S,x,L,j,I,R;for(It(n,"Spline SelfLoop positioning",1),x=f(z(t,(zt(),m5)),153),S=new M(t.c);S.a<S.c.c.length;)for(m=f(O(S),16),j=new M(m.a);j.a<j.c.c.length;){for(L=f(O(j),9),v=f(z(L,(le(),i5)),20),p=new Se,l=v.mb();l.G();)i=f(l.H(),75),Ioe(i),(I=k3(i.g),na(I,i.i),I).a.Y()==0?p.c[p.c.length]=i:(Wce(i),i.g.a.Y()==0||_le(i));switch(x.e){case 0:R=new kI(L),aae(R),Pfe(R,p);break;case 2:for(h=new M(p);h.a<h.c.c.length;)i=f(O(h),75),$d(i,(wi(),Ns),!0);break;case 1:for(s=new M(p);s.a<s.c.c.length;)i=f(O(s),75),$d(i,(wi(),Ns),!0)}switch(x.e){case 0:case 1:dce(v);break;case 2:hce(v)}}Ct(n)},G(bt,"SplineSelfLoopPositioner",513),A(515,1,{},kI),G(bt,"SplineSelfLoopPositioner/DistributedLoopSidesCalculator",515),A(516,1,{},az),w.d=!0,G(bt,"SplineSelfLoopPositioner/DistributedLoopSidesCalculator/SortedLoopSides",516),A(116,1,{116:1},sN),w.a=0,w.b=0,G(bt,"SplineSelfLoopPositioner/DistributedLoopSidesCalculator/SortedLoopSides/SizeOfSide",116),A(318,1,{},kx);var yl;G(bt,"SplineSelfLoopPositioner/PortReadder",318),A(514,1,Ir,Gf),w.$b=function(t,n){return Ste(f(t,75),f(n,75))},G(bt,"SplineSelfLoopPositioner/TextWidthComparator",514),A(517,1,pn,Wv),w.sc=function(t,n){var i,s,l,h,v,p,m,S,x,L,j,I,R,Y,q,V,U;for(It(n,"Spline SelfLoop pre-processing.",1),x=new $i,j=new M(t.b);j.a<j.c.c.length;){for(L=f(O(j),9),eoe(L),x.a.Q(),p=Dt(En(L));xt(p);)h=f(Et(p),12),Zc(h)&&(I=x.a.db(h,x),I==null);for(v=(R=new Wt(x.a).a.bb().mb(),new Zt(R));v.a.G();)h=(m=f(v.a.H(),21),f(m.yb(),12)),V=h.c.g,U=h.d.g,(V==(we(),rt)&&(U==Be||U==ct)||V==Be&&U==ct||V==ct&&U==qe||V==qe&&(U==rt||U==Be))&&wu(h,!1);if(i=Zse(x,L),ce(L,(le(),i5),i),!gi(f(z(L,(Ee(),dt)),28))){for(q=new Yr,l=new M(i);l.a<l.c.c.length;)s=f(O(l),75),na(q,Jy(s)),na(q,s.i);for(S=new fn(L.f,0);S.b<S.d.Y();)Y=(ut(S.b<S.d.Y()),f(S.d.sb(S.c=S.b++),7)),q.a.R(Y)&&Po(S)}}Ct(n)},G(bt,"SplineSelfLoopPreProcessor",517),A(518,1,pn,sd),w.sc=function(t,n){var i,s,l,h,v,p,m,S,x,L,j,I,R,Y,q,V,U,te,ue,ye,Ce,be,Ne,Ue,Xe,it,st,Tt,xn;for(It(n,"Spline SelfLoop routing",1),Xe=new P1,j=new M(t.c);j.a<j.c.c.length;)for(L=f(O(j),16),U=new M(L.a);U.a<U.c.c.length;){for(V=f(O(U),9),ue=V.f,I=new $i,s=f(z(V,(le(),i5)),20).mb();s.G();)i=f(s.H(),75),na(I,i.a);for(ye=new Se,v=(te=new Wt(I.a).a.bb().mb(),new Zt(te));v.a.G();){for(h=(p=f(v.a.H(),21),f(p.yb(),12)),Ne=h.c,st=h.d,x=new M(h.c.f.f),be=0,it=0,m=0,S=0;m<2;)l=f(O(x),7),Ne==l&&(be=S,++m),st==l&&(it=S,++m),++S;Ce=f(z(h,Hb),60),Ue=Ce==(wi(),Ro)||Ce==is?ue.c.length-(it-be<0?-(it-be):it-be)+1:it-be<0?-(it-be):it-be,Le(ye,new QO(be,it,Ue,Ce,h))}if(Fa(ye,Xe),Y=new Yr,R=new M(ye),R.a<R.c.c.length){for(q=Uz(f(O(R),195),Y);R.a<R.c.c.length;)rC(q,Uz(f(O(R),195),Y));ce(V,N6,(Tt=new A1,xn=new fB(V.j.a,V.j.b),Tt.d=je(0,xn.d-q.d),Tt.b=je(0,xn.b-q.b),Tt.a=je(0,q.a-xn.a),Tt.c=je(0,q.c-xn.c),Tt))}}Ct(n)},G(bt,"SplineSelfLoopRouter",518),A(91,1,{91:1},Fd),w.w=function(){return this.b+": "+this.d+" -> "+this.a+" "+c0(this.c)},w.a=0,w.b=0,w.d=0,G(bt,"SplineSelfLoopRouter/LoopPadding",91),A(521,1,vo,IM),w.D=function(t){return Soe(this,f(t,91))},w.a=0,w.c=0,G(bt,"SplineSelfLoopRouter/LoopPadding/EnclosingPredicate",521),A(520,1,Ir,L1),w.$b=function(t,n){return Ete(f(t,91),f(n,91))},G(bt,"SplineSelfLoopRouter/LoopPadding/MarginComparator",520),A(196,1,vo,ld),w.D=function(t){return f(t,91).c==this.a},G(bt,"SplineSelfLoopRouter/LoopPadding/PortSidePredicate",196),A(195,1,{195:1},QO),w.c=0,w.d=0,w.e=0,G(bt,"SplineSelfLoopRouter/SelfLoopEdge",195),A(519,1,Ir,P1),w.$b=function(t,n){return Vee(f(t,195),f(n,195))},G(bt,"SplineSelfLoopRouter/SelfLoopEdge/StepSizeComparator",519),A(82,25,{25:1,82:1},ox),w.vc=function(){var t,n,i,s;for(n=Jt(this.a,0);n.b!=n.d.c;)t=f(qt(n),10),t.a=this.j.d;for(s=Jt(this.c,0);s.b!=s.d.c;)i=f(qt(s),10),i.a=this.j.d},w.wc=function(){return this.b},w.xc=function(){return this.e},w.w=function(){return nc(new Wt(this.d.a))},w.b=0,w.e=0,G(Io,"CLEdge",82),A(93,25,{25:1,93:1},uz),w.vc=function(){this.b.i.a=this.j.d+this.b.e.b},w.wc=function(){return this.b.g==(et(),Cn)?0:this.a},w.xc=function(){return this.b.g==(et(),Cn)?0:this.c},w.w=function(){return ha(z(this.b,(le(),lt)))},w.a=0,w.c=0,G(Io,"CLNode",93),A(175,17,{175:1,3:1,23:1,17:1},v4);var FL,LE,PG=At(Io,"ConstraintCalculationStrategy",175,on,zne),DG;A(125,17,{125:1,3:1,23:1,17:1},Cd);var qL,VL,WL,UL,Ob,KL,jG=At(Io,"GraphCompactionStrategy",125,on,Ure),NG;A(455,1,pn,jI),w.sc=function(t,n){var i,s,l;if(s=f(z(t,(zt(),hw)),125),s!=(Yd(),Ob)){switch(It(n,"Horizontal Compaction",1),this.a=t,l=new uI,i=new ix(Zue(l,t)),eN(i,this.b),f(z(t,w5),175).e){case 1:Jj(i,IG);break;default:Jj(i,(By(),dG))}switch(s.e){case 1:$s(i);break;case 2:$s(xs(i,($n(),Vi)));break;case 3:$s(ag(xs($s(i),($n(),Vi))));break;case 4:$s(ag(Rm(xs($s(i),($n(),Vi)),new hm)));break;case 5:$s(Yee(i,MG))}xs(i,($n(),Oa)),i.e=!0,vce(l),Ct(n)}};var IG,MG;G(Io,"HorizontalGraphCompactor",455),A(462,1,{},Q9),w.tc=function(t,n){var i,s,l;return xe(t,82)&&xe(n,82)&&!g2(iC(f(t,82).d,f(n,82).d))||(i=null,xe(t,93)&&(i=f(t,93).b),s=null,xe(n,93)&&(s=f(n,93).b),i&&i.g==(et(),Cn)||s&&s.g==(et(),Cn))?0:(l=f(z(this.a.a,(le(),xl)),134),my(l,i?i.g:(et(),hn),s?s.g:(et(),hn)))},w.uc=function(t,n){return xe(t,82)&&xe(n,82)&&!g2(iC(f(t,82).d,f(n,82).d))?1:Xt(t.xc(),n.xc())},G(Io,"HorizontalGraphCompactor/1",462),A(456,317,{},MM),w.Dc=function(t){var n,i,s;for(this.b=t,tk(this,new dm,this.a),tk(this,new vm,this.a),n=ki,s=new M(this.b.a.b);s.a<s.c.c.length;)i=f(O(s),25),!(xe(i,93)&&f(i,93).b.g==(et(),Cn))&&(n=Xt(n,ge(pN(this.a,i))));n==ki&&(n=0),tk(this,new gm,new ej(n))},G(Io,"HorizontalGraphCompactor/EdgeAwareScanlineConstraintCalculation",456),A(457,1,yi,J9),w.B=function(t){return pN(this,t)},G(Io,"HorizontalGraphCompactor/EdgeAwareScanlineConstraintCalculation/lambda$0$Type",457),A(458,1,vo,dm),w.D=function(t){return xe(f(t,25),82)},G(Io,"HorizontalGraphCompactor/EdgeAwareScanlineConstraintCalculation/lambda$1$Type",458),A(459,1,vo,vm),w.D=function(t){return xe(f(t,25),93)},G(Io,"HorizontalGraphCompactor/EdgeAwareScanlineConstraintCalculation/lambda$2$Type",459),A(460,1,vo,gm),w.D=function(t){return!0},G(Io,"HorizontalGraphCompactor/EdgeAwareScanlineConstraintCalculation/lambda$3$Type",460),A(461,1,yi,ej),w.B=function(t){return this.a},w.a=0,G(Io,"HorizontalGraphCompactor/EdgeAwareScanlineConstraintCalculation/lambda$4$Type",461),A(463,1,yi,hm),w.B=function(t){return N4(),yn(),LC(f(f(t,27).a,25).n,f(f(t,27).b,59))?Rn:oi},G(Io,"HorizontalGraphCompactor/lambda$0$Type",463),A(553,1,{},uI),w.c=!1,G(Io,"LGraphToCGraphTransformer",553),A(552,1,{},bm),w.Cc=function(t){var n,i,s,l,h;for(this.a=t,this.d=new Nm,this.c=ve(ZL,Me,61,this.a.a.a.c.length,0,1),this.b=0,i=new M(this.a.a.a);i.a<i.c.c.length;)n=f(O(i),78),n.d=this.b,h=pg(kN(a4(new hd,this.b),n),this.d),this.c[this.b]=h,++this.b;for(kle(this),gfe(this),gue(this),wx(K4(this.d),new f0),l=new M(this.a.a.b);l.a<l.c.c.length;)s=f(O(l),25),s.r=this.c[s.f.d].e+s.g.a,s.j.d=s.r},w.b=0,G(Io,"NetworkSimplexCompaction",552),A(142,1,{142:1,23:1},Qg),w.F=function(t){return wie(this,f(t,142))},w.c=!1,w.d=!0,w.i=0,w.j=0,w.k=0,w.n=0,G(Io,"VerticalSegment",142),A(586,1,{},dI),w.e=!1,G(Ma,"AllCrossingsCounter",586),A(339,1,{}),G(Ma,"BetweenLayerEdgeAllCrossingsCounter",339),A(613,1,{},U8),w.c=0,w.e=0,w.i=0,G(Ma,"BetweenLayerEdgeTwoNodeCrossingsCounter",613),A(284,1,{284:1},fR),w.w=function(){return"AdjacencyList [node="+this.d+", adjacencies= "+this.a+"]"},w.b=0,w.c=0,w.f=0,G(Ma,"BetweenLayerEdgeTwoNodeCrossingsCounter/AdjacencyList",284),A(128,1,{128:1,23:1},ZI),w.F=function(t){return lne(this,f(t,128))},w.w=function(){return"Adjacency [position="+this.c+", cardinality="+this.a+", currentCardinality="+this.b+"]"},w.a=0,w.b=0,w.c=0,G(Ma,"BetweenLayerEdgeTwoNodeCrossingsCounter/AdjacencyList/Adjacency",128),A(610,339,{},Vj),w.Gc=function(t,n){var i,s,l,h,v,p,m,S,x,L,j,I,R,Y,q,V,U,te,ue,ye,Ce,be,Ne,Ue,Xe,it,st,Tt,xn,Nn,Bi,Ji,kc,Ec,qb,tu,si,zi,nu,Gr,Qr,Ja,Sc,Ms,Du,Tl,us,ju,wv,po,Nu,wo,wa,Iu,mv,xf,Tf,Cc,yv,C5,wY;for(wo=0,xn=0,Ji=t.length;xn<Ji;++xn)if(st=t[xn],gi(f(z(st,(Ee(),dt)),28)))for(Qr=new M(st.f);Qr.a<Qr.c.c.length;){for(Gr=f(O(Qr),7),Sc=0,v=new M(Gr.e);v.a<v.c.c.length;)h=f(O(v),12),st.d!=h.d.f.d&&++Sc;Sc>0&&(this.a[Gr.k]=wo++)}else{for(Ec=0,Qr=new M(st.f);Qr.a<Qr.c.c.length;){for(Gr=f(O(Qr),7),v=new M(Gr.e);v.a<v.c.c.length;)h=f(O(v),12),st.d!=h.d.f.d&&++Ec;this.a[Gr.k]=wo}Ec>0&&++wo}for(Tf=0,Nn=0,kc=n.length;Nn<kc;++Nn)if(st=n[Nn],gi(f(z(st,(Ee(),dt)),28))){for(qb=0,Qr=new M(st.f);Qr.a<Qr.c.c.length&&(Gr=f(O(Qr),7),Gr.g==(we(),rt));)for(v=new M(Gr.b);v.a<v.c.c.length;)if(h=f(O(v),12),st.d!=h.c.f.d){++qb;break}for(si=0,Ms=new fn(st.f,st.f.c.length);Ms.b>0;){for(Gr=(ut(Ms.b>0),f(Ms.a.sb(Ms.c=--Ms.b),7)),Sc=0,v=new M(Gr.b);v.a<v.c.c.length;)h=f(O(v),12),st.d!=h.c.f.d&&++Sc;Sc>0&&(Gr.g==(we(),rt)?(this.a[Gr.k]=Tf,++Tf):(this.a[Gr.k]=Tf+qb+si,++si))}Tf+=si}else{for(Ec=0,Qr=new M(st.f);Qr.a<Qr.c.c.length;){for(Gr=f(O(Qr),7),v=new M(Gr.b);v.a<v.c.c.length;)h=f(O(v),12),st.d!=h.c.f.d&&++Ec;this.a[Gr.k]=Tf}Ec>0&&++Tf}for(Ja=new $t,Y=new Yr,Tt=0,Bi=t.length;Tt<Bi;++Tt)for(st=t[Tt],mv=new M(st.f);mv.a<mv.c.c.length;)for(Iu=f(O(mv),7),v=new M(Iu.e);v.a<v.c.c.length;)if(h=f(O(v),12),yv=h.d,st.d!=yv.f.d)if(wa=f(li(fi(Ja.d,Iu)),204),Cc=f(li(fi(Ja.d,yv)),204),!wa&&!Cc)R=new QI,Y.a.db(R,Y),an(R.a,h),an(R.e,Iu),ra(Ja.d,Iu,R),an(R.e,yv),ra(Ja.d,yv,R);else if(!wa)an(Cc.a,h),an(Cc.e,Iu),ra(Ja.d,Iu,Cc);else if(!Cc)an(wa.a,h),an(wa.e,yv),ra(Ja.d,yv,wa);else if(wa==Cc)an(wa.a,h);else{for(an(wa.a,h),nu=Jt(Cc.e,0);nu.b!=nu.d.c;)zi=f(qt(nu),7),ra(Ja.d,zi,wa);na(wa.a,Cc.a),na(wa.e,Cc.e),Y.a.eb(Cc)!=null}for(q=f(Y2(Y,ve(ehe,{675:1,3:1,5:1,6:1},204,Y.a.Y(),0,1)),675),it=t[0].d,Nu=n[0].d,j=0,I=q.length;j<I;++j)for(L=q[j],L.f=wo,L.g=Tf,Qr=Jt(L.e,0);Qr.b!=Qr.d.c;)Gr=f(qt(Qr),7),Du=this.a[Gr.k],Gr.f.d==it?(Du<L.f&&(L.f=Du,L.b=su(Gr)),Du>L.c&&(L.c=Du)):Gr.f.d==Nu&&(Du<L.g&&(L.g=Du),Du>L.d&&(L.d=Du));for(yh(q,0,q.length,(Hl(),Hl(),Cf)),xf=ve(Kn,Wn,26,q.length,12,1),i=ve(Kn,Wn,26,Tf+1,12,1),U=0;U<q.length;U++)xf[U]=q[U].g,i[xf[U]]=1;for(l=0,te=0;te<i.length;te++)i[te]==1?i[te]=l:--l;for(Tl=0,ue=0;ue<xf.length;ue++)xf[ue]+=i[xf[ue]],Tl=ti(Tl,xf[ue]+1);for(x=1;x<Tl;)x*=2;for(wY=2*x-1,x-=1,C5=ve(Kn,Wn,26,wY,12,1),s=0,m=0,S=xf.length;m<S;++m)for(p=xf[m],Ce=p+x,++C5[Ce];Ce>0;)Ce%2>0&&(s+=C5[Ce+1]),Ce=(Ce-1)/2|0,++C5[Ce];for(Xe=ve(OG,Me,158,q.length*2,0,1),ye=0;ye<q.length;ye++)Xe[2*ye]=new L0(q[ye],q[ye].f,q[ye].c,0),Xe[2*ye+1]=new L0(q[ye],q[ye].c,q[ye].f,1);for(yh(Xe,0,Xe.length,Cf),tu=0,Ne=0,Ue=Xe.length;Ne<Ue;++Ne)switch(be=Xe[Ne],be.d){case 0:++tu;break;case 1:--tu,s+=tu}for(po=ve(OG,Me,158,q.length*2,0,1),V=0;V<q.length;V++)po[2*V]=new L0(q[V],q[V].g,q[V].d,0),po[2*V+1]=new L0(q[V],q[V].d,q[V].g,1);for(yh(po,0,po.length,Cf),tu=0,ju=0,wv=po.length;ju<wv;++ju)switch(us=po[ju],us.d){case 0:++tu;break;case 1:--tu,s+=tu}return s},G(Ma,"BetweenLayerHyperedgeAllCrossingsCounter",610),A(204,1,{204:1,23:1},QI),w.F=function(t){return aoe(this,f(t,204))},w.b=0,w.c=0,w.d=0,w.f=0,w.g=0;var ehe=G(Ma,"BetweenLayerHyperedgeAllCrossingsCounter/Hyperedge",204);A(158,1,{158:1,23:1},L0),w.F=function(t){return Wse(this,f(t,158))},w.b=0,w.c=0,w.d=0;var OG=G(Ma,"BetweenLayerHyperedgeAllCrossingsCounter/HyperedgeCorner",158);A(611,339,{},Wj),w.Gc=function(t,n){var i,s,l,h,v,p,m,S,x,L,j,I,R,Y,q,V,U,te,ue,ye,Ce,be,Ne;for(Ne=0,h=0,p=t[0].d,ue=n[0].d,x=0,j=n.length;x<j;++x)if(m=n[x],gi(f(z(m,(Ee(),dt)),28))){for(R=0,V=new M(m.f);V.a<V.c.c.length&&(q=f(O(V),7),q.g==(we(),rt));)for(l=new M(q.b);l.a<l.c.c.length;)if(s=f(O(l),12),s.c.f.d==p){++R;break}for(Y=0,te=new fn(m.f,m.f.c.length);te.b>0;){for(q=(ut(te.b>0),f(te.a.sb(te.c=--te.b),7)),U=0,l=new M(q.b);l.a<l.c.c.length;)s=f(O(l),12),s.c.f.d==p&&++U;U>0&&(q.g==(we(),rt)?(this.a[q.k]=Ne,++Ne):(this.a[q.k]=Ne+R+Y,++Y),h+=U)}Ne+=Y}else{for(I=0,V=new M(m.f);V.a<V.c.c.length;){for(q=f(O(V),7),l=new M(q.b);l.a<l.c.c.length;)s=f(O(l),12),s.c.f.d==p&&++I;this.a[q.k]=Ne}I>0&&(++Ne,h+=I)}for(ye=ve(Kn,Wn,26,h,12,1),v=0,S=0,L=t.length;S<L;++S)if(m=t[S],gi(f(z(m,(Ee(),dt)),28)))for(V=new M(m.f);V.a<V.c.c.length;)for(q=f(O(V),7),Ce=v,l=new M(q.e);l.a<l.c.c.length;)s=f(O(l),12),be=s.d,be.f.d==ue&&mR(ye,Ce,v++,this.a[be.k]);else for(Ce=v,V=new M(m.f);V.a<V.c.c.length;)for(q=f(O(V),7),l=new M(q.e);l.a<l.c.c.length;)s=f(O(l),12),be=s.d,be.f.d==ue&&mR(ye,Ce,v++,this.a[be.k]);return i=Cse(Ne,h,ye),i},G(Ma,"BetweenLayerStraightEdgeAllCrossingsCounter",611),A(338,1,{},ZC),w.b=0,w.e=!1,G(Ma,"CrossingMatrixFiller",338),A(447,1,pn,pm),w.sc=function(t,n){var i,s,l,h;if(It(n,"Greedy switch crossing reduction",1),this.e=f(z(t,(zt(),d5)),110),i=t.c.c.length,i<2||this.e==(nb(),ZE)){Ct(n);return}ele(this,t),this.e.b?(this.e.a?xC(this):U3(this),s=_oe(this),l=this.e.a?this.c:V2(this.b,this.d),this.i=!this.i,this.d=this.g,this.e.a?xC(this):U3(this),h=this.e.a?this.c:V2(this.b,this.d),l<=h&&hC(this,s)):this.e.a?xC(this):U3(this),Fse(this,this.a),Ct(n)},w.c=0,w.i=!0,G(Ma,"GreedySwitchProcessor",447),A(340,1,{},PC),G(Ma,"InLayerEdgeAllCrossingsCounter",340),A(614,340,{},hM),w.b=0,w.d=0,G(Ma,"InLayerEdgeTwoNodeCrossingCounter",614),A(226,1,{226:1,23:1},S3),w.F=function(t){return Coe(this,f(t,226))},w.w=function(){return"ComparableEdgeAndPort [port="+this.b+", edge="+this.a+", portPosition="+this.c+"]"},w.c=0,G(Ma,"InLayerEdgeTwoNodeCrossingCounter/ComparableEdgeAndPort",226),A(612,1,{},z8),w.e=!0,w.f=0,w.g=0,w.k=!1,G(Ma,"NorthSouthEdgeAllCrossingsCounter",612),A(615,1,{},bR),w.b=0,w.d=0,w.e=!1,G(Ma,"NorthSouthEdgeNeighbouringNodeCrossingsCounter",615),A(143,1,rc,_c),w.mb=function(){return il(this)},w.b=0,G(Ma,"PortIterable",143),A(344,1,ir,M3),w.H=function(){return f(JM(this.a),7)},w.G=function(){return this.a.b>0},w.I=function(){throw new Fn},G(Ma,"PortIterable/1",344),A(336,1,{},VC),G(Ma,"SwitchDecider",336),A(89,1,{89:1},so),w.w=function(){return"NEdge[id="+this.b+" w="+this.f+" d="+this.a+"]"},w.a=1,w.b=0,w.e=!1,w.f=0;var AG=G(Jd,"NEdge",89);A(157,1,{},Ol),G(Jd,"NEdge/NEdgeBuilder",157),A(278,1,{},Nm),G(Jd,"NGraph",278),A(61,1,{61:1},nA),w.b=0,w.d=-1,w.e=0,w.i=-1,w.j=!1;var ZL=G(Jd,"NNode",61);A(333,13,aT,GS),w.rb=function(t,n){++this.d,Xc(t,this.c.length),dg(this.c,t,n)},w.ib=function(t){return Wu(this,t)},w.jb=function(t){return++this.d,Tn(this,t)},w.Q=function(){++this.d,this.c=ve(Ze,Me,1,0,4,1)},w.vb=function(t){return++this.d,Zl(this,t)},w.nb=function(t){return D4(this,t)},G(Jd,"NNode/ChangeAwareArrayList",333),A(199,1,{},hd),G(Jd,"NNode/NNodeBuilder",199),A(595,1,{},Uv),w.a=!1,w.f=kr,w.j=0,G(Jd,"NetworkSimplex",595),A(193,17,{180:1,193:1,3:1,23:1,17:1},g4),w.rc=function(){switch(this.e){case 0:return new CM;case 1:return new v9;default:throw new nn("No implementation is available for the cycle breaker "+(this.d!=null?this.d:""+this.e))}};var PE,XL,RG=At(uT,"CycleBreakingStrategy",193,on,Hne),BG;A(539,1,Qo,CM),w.qc=function(t){return zG},w.sc=function(t,n){var i,s,l,h,v,p,m,S,x,L,j,I,R,Y,q,V,U,te,ue,ye,Ce,be,Ne,Ue,Xe,it,st,Tt,xn,Nn;for(It(n,"Greedy cycle removal",1),V=t.b,Nn=V.c.length,this.a=ve(Kn,Wn,26,Nn,12,1),this.c=ve(Kn,Wn,26,Nn,12,1),this.b=ve(Kn,Wn,26,Nn,12,1),p=0,Y=new M(V);Y.a<Y.c.c.length;){for(I=f(O(Y),9),I.k=p,Ce=new M(I.f);Ce.a<Ce.c.c.length;){for(ue=f(O(Ce),7),h=new M(ue.b);h.a<h.c.c.length;)i=f(O(h),12),i.c.f!=I&&(Ue=f(z(i,(le(),Qa)),24).a,this.a[p]+=Ue>0?Ue+1:1);for(l=new M(ue.e);l.a<l.c.c.length;)i=f(O(l),12),i.d.f!=I&&(Ue=f(z(i,(le(),Qa)),24).a,this.c[p]+=Ue>0?Ue+1:1)}this.c[p]==0?an(this.d,I):this.a[p]==0&&an(this.e,I),++p}for(j=-1,L=1,S=new Se,Xe=f(z(t,(le(),qh)),154);Nn>0;){for(;this.d.b!=0;)st=f(e3(this.d),9),this.b[st.k]=j--,yx(this,st),--Nn;for(;this.e.b!=0;)Tt=f(e3(this.e),9),this.b[Tt.k]=L++,yx(this,Tt),--Nn;if(Nn>0){for(x=qs,q=new M(V);q.a<q.c.c.length;)I=f(O(q),9),this.b[I.k]==0&&(U=this.c[I.k]-this.a[I.k],U>=x&&(U>x&&(S.c=ve(Ze,Me,1,0,4,1),x=U),S.c[S.c.length]=I));m=f(_e(S,RC(Xe,S.c.length)),9),this.b[m.k]=L++,yx(this,m),--Nn}}for(it=V.c.length+1,p=0;p<V.c.length;p++)this.b[p]<0&&(this.b[p]+=it);for(R=new M(V);R.a<R.c.c.length;)for(I=f(O(R),9),Ne=f(Vn(I.f,ve(kG,IH,7,I.f.c.length,0,1)),346),ye=0,be=Ne.length;ye<be;++ye)for(ue=Ne[ye],te=f(Vn(ue.e,ve(Xi,qi,12,ue.e.c.length,0,1)),47),s=0,v=te.length;s<v;++s)i=te[s],xn=i.d.f.k,this.b[I.k]>this.b[xn]&&(wu(i,!0),ce(t,S6,(yn(),yn(),oi)));this.a=null,this.c=null,this.b=null,Hs(this.e),Hs(this.d),Ct(n)};var zG;G(uT,"GreedyCycleBreaker",539),A(540,1,Qo,v9),w.qc=function(t){return HG},w.sc=function(t,n){var i,s,l,h,v,p,m,S,x,L,j,I,R,Y;for(It(n,"Interactive cycle breaking",1),x=new Se,j=new M(t.b);j.a<j.c.c.length;)for(L=f(O(j),9),L.k=1,I=YC(L).a,S=Ss(L,(cr(),ai)).mb();S.G();)for(m=f(S.H(),7),l=new M(m.e);l.a<l.c.c.length;)i=f(O(l),12),R=i.d.f,R!=L&&(Y=YC(R).a,Y<I&&(x.c[x.c.length]=i));for(h=new M(x);h.a<h.c.c.length;)i=f(O(h),12),wu(i,!0);for(x.c=ve(Ze,Me,1,0,4,1),p=new M(t.b);p.a<p.c.c.length;)v=f(O(p),9),v.k>0&&lB(this,v,x);for(s=new M(x);s.a<s.c.c.length;)i=f(O(s),12),wu(i,!0);x.c=ve(Ze,Me,1,0,4,1),Ct(n)};var HG;G(uT,"InteractiveCycleBreaker",540),A(543,1,Qo,D1),w.qc=function(t){return pi(Vu(new An,(jr(),yE)),Wp)},w.sc=function(t,n){var i,s,l,h,v,p,m,S,x,L,j,I,R,Y;for(It(n,"Interactive node layering",1),i=new Se,L=new M(t.b);L.a<L.c.c.length;){for(S=f(O(L),9),p=S.i.a,v=p+S.j.a,v=p+1>v?p+1:v,Y=new fn(i,0),s=null;Y.b<Y.d.Y();)if(I=(ut(Y.b<Y.d.Y()),f(Y.d.sb(Y.c=Y.b++),239)),I.c>=v){ut(Y.b>0),Y.a.sb(Y.c=--Y.b);break}else I.a>p&&(s?(Tn(s.b,I.b),s.a=je(s.a,I.a),Po(Y)):(Le(I.b,S),I.c=Xt(I.c,p),I.a=je(I.a,v),s=I));s||(s=new Ej,s.c=p,s.a=v,cu(Y,s),Le(s.b,S))}for(h=t.c,m=0,R=new M(i);R.a<R.c.c.length;)for(I=f(O(R),239),l=new qc(t),l.k=m++,h.c[h.c.length]=l,j=new M(I.b);j.a<j.c.c.length;)S=f(O(j),9),Ar(S,l),S.k=0;for(x=new M(t.b);x.a<x.c.c.length;)S=f(O(x),9),S.k==0&&rz(this,S,t);for(;(Sn(0,h.c.length),f(h.c[0],16)).a.c.length==0;)Sn(0,h.c.length),h.c.splice(0,1);t.b.c=ve(Ze,Me,1,0,4,1),Ct(n)},G(Tp,"InteractiveLayerer",543),A(239,1,{239:1},Ej),w.a=0,w.c=0,G(Tp,"InteractiveLayerer/LayerSpan",239),A(173,17,{180:1,173:1,3:1,23:1,17:1},Jm),w.rc=function(){switch(this.e){case 0:return new SI;case 1:return new d9;case 2:return new D1;default:throw new nn("No implementation is available for the layerer "+(this.d!=null?this.d:""+this.e))}};var QL,JL,DE,_G=At(Tp,"LayeringStrategy",173,on,Qne),GG;A(542,1,Qo,d9),w.qc=function(t){var n;return n=g0($G),Pt(ge(Nt(z(t,(zt(),h5)))))||He(z(t,bv))===He((hu(),pv))?Lr(n,YG):He(z(t,bv))===He((hu(),$b))&&Lr(n,FG),Pt(ge(Nt(z(t,z6))))&&Pa(n,(jr(),ML)),n},w.sc=function(t,n){var i,s,l,h,v;for(It(n,"Longest path layering",1),this.a=t,v=this.a.b,this.b=ve(Kn,Wn,26,v.c.length,12,1),i=0,h=new M(v);h.a<h.c.c.length;)s=f(O(h),9),s.k=i,this.b[i]=-1,++i;for(l=new M(v);l.a<l.c.c.length;)s=f(O(l),9),zB(this,s);v.c=ve(Ze,Me,1,0,4,1),this.a=null,this.b=null,Ct(n)};var $G,YG,FG;G(Tp,"LongestPathLayerer",542),A(541,1,Qo,SI),w.qc=function(t){var n;return n=g0(qG),Pt(ge(Nt(z(t,(zt(),h5)))))||He(z(t,bv))===He((hu(),pv))?(Lr(n,VG),this.d=(hu(),pv)):He(z(t,bv))===He((hu(),$b))&&(Lr(n,WG),this.d=$b),n},w.sc=function(t,n){var i,s,l,h,v,p,m,S,x,L;if(It(n,"Network simplex layering",1),this.b=t,L=f(z(t,(zt(),gv)),24).a*4,x=this.b.b,x.c.length<1){Ct(n);return}for(s=Jt(bce(this,x),0);s.b!=s.d.c;)for(i=f(qt(s),20),h=L*Xn(nI(i.Y())),l=fce(i),wx(tN(Fee(nN(K4(l),h),this.b),this.d==(hu(),pv)),Ql(n,1)),p=this.b.c,S=new M(l.a);S.a<S.c.c.length;){for(m=f(O(S),61);p.c.length<=m.e;)Gc(p,p.c.length,new qc(this.b));v=f(m.f,9),Ar(v,f(_e(p,m.e),16))}x.c=ve(Ze,Me,1,0,4,1),this.a=null,this.b=null,this.c=null,Ct(n)};var qG,VG,WG;G(Tp,"NetworkSimplexLayerer",541),A(326,1,{}),G(sc,"AbstractPortDistributor",326),A(558,1,Ir,nj),w.$b=function(t,n){return foe(this,f(t,7),f(n,7))},G(sc,"AbstractPortDistributor/1",558),A(564,1,{},NA),G(sc,"BarycenterHeuristic",564),A(272,1,{272:1},aj),w.b=0,w.d=0,w.e=!1;var UG=G(sc,"BarycenterHeuristic/BarycenterState",272);A(565,1,Ir,rj),w.$b=function(t,n){return use(this.a,t,n)},G(sc,"BarycenterHeuristic/lambda$0$Type",565),A(192,17,{180:1,192:1,3:1,23:1,17:1},b4),w.rc=function(){switch(this.e){case 0:return new mN;case 1:return new m9;default:throw new nn("No implementation is available for the crossing minimizer "+(this.d!=null?this.d:""+this.e))}};var jE,NE,KG=At(sc,"CrossingMinimizationStrategy",192,on,_ne),ZG;A(526,1,Qo,m9),w.qc=function(t){var n;return n=g0(XG),f(z(t,(le(),Vr)),18).kb((br(),mf))&&pi(n,(jr(),CE)),n},w.sc=function(t,n){var i,s,l,h,v,p,m,S,x,L,j,I,R;for(It(n,"Interactive crossing minimization",1),j=0,l=new M(t.c);l.a<l.c.c.length;){for(s=f(O(l),16),i=0,S=0,m=new M(s.a);m.a<m.c.c.length;)for(v=f(O(m),9),v.i.a>0&&(i+=v.i.a+v.j.a/2,++S),L=new M(v.f);L.a<L.c.c.length;)x=f(O(L),7),x.k=j++;for(i/=S,R=ve(Qi,mi,26,s.a.c.length,12,1),h=0,p=new M(s.a);p.a<p.c.c.length;)v=f(O(p),9),v.k=h++,R[v.k]=Ple(v,i),v.g==(et(),hn)&&ce(v,(le(),L6),R[v.k]);Fa(s.a,new ij(R))}I=new Am(ve(gw,xp,26,j,12,1)),F8(I,vB(t)),Ct(n)};var XG;G(sc,"InteractiveCrossingMinimizer",526),A(527,1,Ir,ij),w.$b=function(t,n){return nse(this,f(t,9),f(n,9))},G(sc,"InteractiveCrossingMinimizer/1",527),A(525,1,Qo,mN),w.qc=function(t){var n;return n=g0(QG),f(z(t,(le(),Vr)),18).kb((br(),mf))&&pi(n,(jr(),CE)),n},w.sc=function(t,n){var i,s,l,h,v,p,m,S,x,L,j,I,R,Y,q,V,U,te,ue,ye,Ce,be,Ne,Ue,Xe,it,st,Tt;if(It(n,"Layer sweep crossing minimization",1),it=f(z(t,(le(),qh)),154),q=t.c.c.length,q<2){Ct(n);return}for(Dfe(this,t),s=kr,Tt=f(z(t,(zt(),gv)),24).a,i=ve(UG,Nr,671,t.c.c.length,0,2),j=0,Y=new M(t.c);Y.a<Y.c.c.length;){for(R=f(O(Y),16),R.k=j,i[j]=ve(UG,{671:1,3:1,5:1,6:1},272,R.a.c.length,0,1),I=0,ye=new M(R.a);ye.a<ye.c.c.length;)ue=f(O(ye),9),ue.k=I,i[j][I]=new aj(ue),++I;++j}for(l=new EB(i,this.g),h=new NA(i,l,it,this.j),be=new Am(this.j),te=new t4(this.j),st=0;st<Tt&&s>0;st++){x=rf(it,1)!=0,S=x?0:q-1,m=this.b[S],Ue=rf(it,1)!=0?be:te,TC(m,h,x,!1,!0),v=kr,p=!0;do{if(uC(this.b,this.k),Xe=v,v=0,v+=Z3(this.f,m,S),x){for(V=1;V<q;V++)L=this.b[V],$3(Ue,m,(cr(),ai)),TC(L,h,!0,!p,!1),v+=Z3(this.f,L,V),this.d[V]||this.c[V-1]?v+=rH(this.e,m,L):v+=tH(this.i,m,L),m=L;S=q-1}else{for(V=q-2;V>=0;V--)L=this.b[V],$3(Ue,m,(cr(),Ri)),TC(L,h,!1,!p,!1),v+=Z3(this.f,L,V),this.c[V]||this.d[V+1]?v+=rH(this.e,L,m):v+=tH(this.i,L,m),m=L;S=0}p=!1,x=!x}while(v<Xe&&v>0);(v<s||Xe<s)&&(v<=Xe?(uC(this.b,this.a),s=v):(uC(this.k,this.a),s=Xe))}for(U=new fn(t.c,0);U.b<U.d.Y();)for(R=(ut(U.b<U.d.Y()),f(U.d.sb(U.c=U.b++),16)),Ne=this.a[U.b-1],Ce=new fn(R.a,0);Ce.b<Ce.d.Y();)ut(Ce.b<Ce.d.Y()),Ce.d.sb(Ce.c=Ce.b++),Z4(Ce,Ne[Ce.b-1]);this.j=null,this.a=null,this.b=null,this.k=null,this.i=null,this.e=null,this.c=null,this.d=null,w3(this.g),Ct(n)};var QG;G(sc,"LayerSweepCrossingMinimizer",525),A(327,326,{},t4),w.Hc=function(t,n,i){var s,l,h,v,p,m,S,x,L,j,I,R;if(j=this.a,gi(f(z(t,(Ee(),dt)),28)))switch(i.e){case 1:{for(l=0,p=0,L=new M(t.f);L.a<L.c.c.length;)S=f(O(L),7),S.b.c.length!=0&&(++l,S.g==(we(),rt)&&++p);for(m=n+p,R=n+l,x=Ss(t,(cr(),Ri)).mb();x.G();)S=f(x.H(),7),S.g==(we(),rt)?(j[S.k]=m,--m):(j[S.k]=R,--R);return l}case 2:{for(I=0,x=Ss(t,(cr(),ai)).mb();x.G();)S=f(x.H(),7),++I,j[S.k]=n+I;return I}default:throw new dd}else{for(v=4,h=0,L=Ss(t,i).mb();L.G();)S=f(L.H(),7),s=_B(i,S.g),v=v<s-1?v:s-1,h=h>s?h:s;if(h>v){for(x=Ss(t,i).mb();x.G();)S=f(x.H(),7),j[S.k]=n+_B(i,S.g)-v;return h-v}return 0}},G(sc,"LayerTotalPortDistributor",327),A(274,326,{},Am),w.Hc=function(t,n,i){var s,l,h,v,p,m,S,x,L,j,I;if(L=this.a,gi(f(z(t,(Ee(),dt)),28)))switch(i.e){case 1:{for(l=0,h=0,x=new M(t.f);x.a<x.c.c.length;)m=f(O(x),7),m.b.c.length!=0&&(++l,m.g==(we(),rt)&&++h);for(s=1/(l+1),v=n+h*s,I=n+1-s,S=Ss(t,(cr(),Ri)).mb();S.G();)m=f(S.H(),7),m.g==(we(),rt)?(L[m.k]=v,v-=s):(L[m.k]=I,I-=s);break}case 2:{for(p=0,x=new M(t.f);x.a<x.c.c.length;)m=f(O(x),7),m.e.c.length==0||++p;for(s=1/(p+1),j=n+s,S=Ss(t,(cr(),ai)).mb();S.G();)m=f(S.H(),7),L[m.k]=j,j+=s;break}default:throw new nn(cT)}else for(S=Ss(t,i).mb();S.G();)m=f(S.H(),7),L[m.k]=n+Eue(i,m.g);return 1},G(sc,"NodeRelativePortDistributor",274),A(566,1,{},EB),G(zH,"ForsterConstraintResolver",566),A(102,1,{102:1},pO,Bz),w.w=function(){var t,n;for(n=new wd,n.a+="[",t=0;t<this.d.length;t++)co(n,LO(this.d[t])),xa(this.g,this.d[0]).a!=null&&co(co((n.a+="<",n),CN(ge(xa(this.g,this.d[0]).a))),">"),t<this.d.length-1&&(n.a+=", ");return n.a+="]",n.a},w.a=0,w.c=0,w.f=0;var JG=G(zH,"ForsterConstraintResolver/ConstraintGroup",102);A(331,1,{}),G(fb,"AbstractCrossingsCounter",331),A(568,331,{},HM),G(fb,"BarthJuengerMutzelCrossingsCounter",568),A(567,331,{},_M),G(fb,"HyperedgeCrossingsCounter",567),A(197,1,{197:1,23:1},iM),w.F=function(t){return yoe(this,f(t,197))},w.b=0,w.c=0,w.e=0,w.f=0;var the=G(fb,"HyperedgeCrossingsCounter/Hyperedge",197);A(156,1,{156:1,23:1},P0),w.F=function(t){return vue(this,f(t,156))},w.b=0,w.c=0;var e$=G(fb,"HyperedgeCrossingsCounter/HyperedgeCorner",156);A(242,17,{242:1,3:1,23:1,17:1},y4);var Ab,Rb,nhe=At(fb,"HyperedgeCrossingsCounter/HyperedgeCorner/Type",242,on,sre);A(545,1,Qo,y9),w.qc=function(t){return f(z(t,(le(),Vr)),18).kb((br(),os))?t$:null},w.sc=function(t,n){var i,s;for(It(n,"Interactive node placement",1),this.a=f(z(t,(le(),xl)),134),s=new M(t.c);s.a<s.c.c.length;)i=f(O(s),16),Aue(this,i);Ct(n)};var t$;G(hb,"InteractiveNodePlacer",545),A(546,1,Qo,k9),w.qc=function(t){return f(z(t,(le(),Vr)),18).kb((br(),os))?n$:null},w.sc=function(t,n){It(n,"Linear segments node placement",1),this.b=f(z(t,(le(),xl)),134),Rfe(this,t),zce(this,t),hle(this,t),Sfe(this),this.a=null,this.b=null,Ct(n)};var n$,Qp,Jp;G(hb,"LinearSegmentsNodePlacer",546),A(111,1,{111:1,23:1},YS),w.F=function(t){return Jee(this,f(t,111))},w.t=function(t){var n;return xe(t,111)?(n=f(t,111),this.b==n.b):!1},w.v=function(){return this.b},w.w=function(){return"ls"+nc(this.f)},w.a=0,w.b=0,w.c=-1,w.d=-1,w.i=0;var r$=G(hb,"LinearSegmentsNodePlacer/LinearSegment",111);A(548,1,Qo,E9),w.qc=function(t){return f(z(t,(le(),Vr)),18).kb((br(),os))?i$:null},w.sc=function(t,n){var i,s,l,h,v,p,m,S,x,L,j,I,R,Y,q,V,U,te,ue,ye,Ce,be,Ne,Ue,Xe,it,st,Tt,xn,Nn;for(Tt=f(z(t,(le(),xl)),134),ue=(On(),new $t),te=0,l=new Nm,m=new M(t.c);m.a<m.c.c.length;)for(v=f(O(m),16),Xe=null,Ue=null,I=new M(v.a);I.a<I.c.c.length;)j=f(O(I),9),++te,U=pg(new hd,l),U.f=j,ra(ue.d,j,U),j.e.d=K1(j.e.d),Ue&&(V=new so,V.f=0,V.a=Xn(T4(Xe.e.d+Xe.j.b+Xe.e.a+Eg(Tt,f(Ue.f,9),j))),V.c=Ue,V.d=U,Wu(Ue.g,V),Wu(U.c,V)),Xe=j,Ue=U;for(S=new M(t.c);S.a<S.c.c.length;)for(v=f(O(S),16),I=new M(v.a);I.a<I.c.c.length;)for(j=f(O(I),9),be=new M(j.f);be.a<be.c.c.length;)Ce=f(O(be),7),Nn=Ce.i.b+Ce.a.b,Nn!=Math.floor(Nn)&&(ye=Nn-Bre(Fie(Math.round(Nn))),Ce.i.b-=ye);for(p=new M(t.c);p.a<p.c.c.length;)for(v=f(O(p),16),I=new M(v.a);I.a<I.c.c.length;)for(j=f(O(I),9),L=Dt(En(j));xt(L);)x=f(Et(L),12),!Zc(x)&&x.d.f.d!=v&&(st=x.c.f.e.d+x.c.i.b+x.c.a.b,xn=x.d.f.e.d+x.d.i.b+x.d.a.b,i=xn-st,Ne=Xn(i),s=pg(new hd,l),R=new so,R.f=A8(x),R.a=Ne>0?Ne:0,R.c=s,R.d=f(Kt(ue,x.c.f),61),Wu(R.c.g,R),Wu(R.d.c,R),it=new so,it.f=A8(x),it.a=Ne<0?-Ne:0,it.c=s,it.d=f(Kt(ue,x.d.f),61),Wu(it.c.g,it),Wu(it.d.c,it));for(h=f(z(t,(zt(),gv)),24).a*Xn(Math.sqrt(te)),wx(tN(nN(K4(l),h),!1),Ql(n,1)),q=new M(l.a);q.a<q.c.c.length;)Y=f(O(q),61),Y.f!=null&&(j=f(Y.f,9),j.i.b=Y.e+j.e.d)};var i$;G(hb,"NetworkSimplexPlacer",548),A(141,17,{180:1,141:1,3:1,23:1,17:1},lg),w.rc=function(){switch(this.e){case 0:return new S9;case 1:return new y9;case 2:return new k9;case 3:return new iI;case 4:return new E9;default:throw new nn("No implementation is available for the node placer "+(this.d!=null?this.d:""+this.e))}};var IE,e6,t6,n6,r6,a$=At(hb,"NodePlacementStrategy",141,on,fie),o$;A(544,1,Qo,S9),w.qc=function(t){return f(z(t,(le(),Vr)),18).kb((br(),os))?s$:null},w.sc=function(t,n){var i,s,l,h,v,p,m,S,x,L;for(It(n,"Simple node placement",1),L=f(z(t,(le(),xl)),134),p=0,h=new M(t.c);h.a<h.c.c.length;){for(s=f(O(h),16),v=s.c,v.b=0,i=null,S=new M(s.a);S.a<S.c.c.length;)m=f(O(S),9),i&&(v.b+=my(L,m.g,i.g)*L.d),v.b+=m.e.d+m.j.b+m.e.a,i=m;p=je(p,v.b)}for(l=new M(t.c);l.a<l.c.c.length;)for(s=f(O(l),16),v=s.c,x=(p-v.b)/2,i=null,S=new M(s.a);S.a<S.c.c.length;)m=f(O(S),9),i&&(x+=my(L,m.g,i.g)*L.d),x+=m.e.d,m.i.b=x,x+=m.j.b+m.e.a,i=m;Ct(n)};var s$;G(hb,"SimpleNodePlacer",544),A(81,1,{81:1},al),w.w=function(){var t;return t="",this.c==(Do(),dc)?t+=Ud:this.c==js&&(t+=Wd),this.k==(fo(),Su)?t+="DOWN":this.k==Xa?t+="UP":t+="BALANCED",t},G(Jo,"BKAlignedLayout",81),A(248,17,{248:1,3:1,23:1,17:1},k4);var js,dc,rhe=At(Jo,"BKAlignedLayout/HDirection",248,on,ure);A(247,17,{247:1,3:1,23:1,17:1},E4);var Su,Xa,ihe=At(Jo,"BKAlignedLayout/VDirection",247,on,cre);A(596,1,{},JN),G(Jo,"BKAligner",596),A(599,1,{},Y8),G(Jo,"BKCompactor",599),A(279,1,{279:1},ds),w.a=0,G(Jo,"BKCompactor/ClassEdge",279),A(200,1,{200:1},Tj),w.a=0,w.b=0,G(Jo,"BKCompactor/ClassNode",200),A(547,1,Qo,iI),w.qc=function(t){return f(z(t,(le(),Vr)),18).kb((br(),os))?u$:null},w.sc=function(t,n){var i,s,l,h,v,p,m,S,x,L,j,I,R,Y,q,V,U,te;switch(It(n,"Brandes & Koepf node placement",1),this.b=t,this.d=Bce(t),this.a=Pt(ge(Nt(z(t,(zt(),I6))))),this.e=He(z(t,lw))===He((Vg(),VE)),Lle(this,t),I=(hi(4,ul),new Ni(4)),f(z(t,lw),124).e){case 3:R=new al(t,this.d.d,(fo(),Su),(Do(),js)),I.c[I.c.length]=R;break;case 1:Y=new al(t,this.d.d,(fo(),Xa),(Do(),js)),I.c[I.c.length]=Y;break;case 4:U=new al(t,this.d.d,(fo(),Su),(Do(),dc)),I.c[I.c.length]=U;break;case 2:te=new al(t,this.d.d,(fo(),Xa),(Do(),dc)),I.c[I.c.length]=te;break;default:R=new al(t,this.d.d,(fo(),Su),(Do(),js)),Y=new al(t,this.d.d,Xa,js),U=new al(t,this.d.d,Su,dc),te=new al(t,this.d.d,Xa,dc),I.c[I.c.length]=U,I.c[I.c.length]=te,I.c[I.c.length]=R,I.c[I.c.length]=Y}for(i=new JN(t,this.d),h=new M(I);h.a<h.c.c.length;)s=f(O(h),81),bfe(i,s,this.c),qce(s);for(x=new Y8(t,this.d),v=new M(I);v.a<v.c.c.length;)s=f(O(v),81),efe(x,s);if(this.a)for(p=new M(I);p.a<p.c.c.length;)s=f(O(p),81),$l(),s+""+nk(s);if(S=null,this.e&&(m=dfe(this,I,this.d.d),gz(this,t,m)&&(S=m)),!S)for(p=new M(I);p.a<p.c.c.length;)s=f(O(p),81),gz(this,t,s)&&(!S||nk(S)>nk(s))&&(S=s);for(!S&&(S=(Sn(0,I.c.length),f(I.c[0],81))),j=new M(t.c);j.a<j.c.c.length;)for(L=f(O(j),16),V=new M(L.a);V.a<V.c.c.length;)q=f(O(V),9),q.i.b=ge(S.n[q.k])+ge(S.d[q.k]);for(this.a&&($l(),""+OB(S),""+Cue(S)),l=new M(I);l.a<l.c.c.length;)s=f(O(l),81),s.f=null,s.b=null,s.a=null,s.d=null,s.i=null,s.g=null,s.n=null;nae(this.d),this.c.a.Q(),Ct(n)},w.a=!1,w.e=!1;var u$;G(Jo,"BKNodePlacer",547),A(194,17,{194:1,3:1,23:1,17:1},S4);var ME,OE,c$=At(Jo,"CompactionStrategy",194,on,lre),l$;A(597,1,{},wm),w.d=0,G(Jo,"NeighborhoodInformation",597),A(598,1,Ir,sj),w.$b=function(t,n){return tae(this,f(t,27),f(n,27))},G(Jo,"NeighborhoodInformation/NeighborComparator",598),A(334,1,{}),G(Jo,"ThresholdStrategy",334),A(602,334,{},_j),w.Ic=function(t,n,i){return this.a.k==(fo(),Xa)?ki:Hr},w.Jc=function(){},G(Jo,"ThresholdStrategy/NullThresholdStrategy",602),A(249,1,{249:1},eI),w.c=!1,w.d=!1,G(Jo,"ThresholdStrategy/Postprocessable",249),A(603,334,{},Gj),w.Ic=function(t,n,i){var s,l,h;return l=n==i,s=this.a.a[i.k]==n,l||s?(h=t,this.a.c==(Do(),dc)?(l&&(h=ck(this,n,!0)),(h==1/0||h==-1/0)&&s&&(h=ck(this,i,!1))):(l&&(h=ck(this,n,!0)),(h==1/0||h==-1/0)&&s&&(h=ck(this,i,!1))),h):t},w.Jc=function(){for(var t,n,i,s;this.d.b!=0;)s=f(Jne(this.d),249),i=oz(this,s),i.a&&(t=i.a,this.c.a[t.c.f.d.k]!==this.c.a[t.d.f.d.k]&&(n=RB(this,s),n||fI(this.e,s)));for(;this.e.a.c.length!=0;)RB(this,f(AR(this.e),249))},G(Jo,"ThresholdStrategy/SimpleThresholdStrategy",603),A(423,1,{180:1},i9),w.rc=function(){switch(this.a.e){case 1:return new aI;case 3:return new x9;default:return new C9}},G(cl,"EdgeRouterFactory",423),A(538,1,Qo,C9),w.qc=function(t){var n,i;return i=f(z(t,(le(),Vr)),18),n=new An,i.kb((br(),rw))&&(Lr(n,v$),Lr(n,i6)),(i.kb(mf)||Pt(ge(Nt(z(t,(zt(),Gb))))))&&(Lr(n,i6),i.kb(yf)&&Lr(n,b$)),i.kb(os)&&Lr(n,d$),i.kb(iw)&&Lr(n,p$),i.kb(KE)&&Lr(n,g$),i.kb(sv)&&Lr(n,f$),i.kb(uv)&&Lr(n,h$),n},w.sc=function(t,n){var i,s,l,h,v,p,m,S,x,L,j,I,R;It(n,"Orthogonal edge routing",1),j=f(z(t,(le(),xl)),134),Pt(ge(Nt(z(t,(Ee(),pb))))),x=new U2(0,j.a),R=0,h=new fn(t.c,0),v=null,p=null;do m=h.b<h.d.Y()?(ut(h.b<h.d.Y()),f(h.d.sb(h.c=h.b++),16)):null,S=m?m.a:null,v&&(Mx(v,R),R+=v.c.a),I=v?R+j.b:R,L=Tx(x,t,p,S,I),s=!v||hy(p,(ip(),ew)),l=!m||hy(S,(ip(),ew)),L>0?(i=j.b+(L-1)*j.a,m&&(i+=j.b),i<j.f&&!s&&!l&&(i=j.f),R+=i):!s&&!l&&(R+=j.f),v=m,p=S;while(m);t.e.a=R,Ct(n)};var f$,h$,d$,v$,g$,i6,b$,p$;G(cl,"OrthogonalEdgeRouter",538),A(277,1,{},U2),w.a=0,w.c=0,G(cl,"OrthogonalRoutingGenerator",277),A(118,1,{118:1},Y0),w.w=function(){return this.a+"->"+this.b},w.c=0,G(cl,"OrthogonalRoutingGenerator/Dependency",118),A(80,1,{80:1,23:1},wR),w.F=function(t){return ete(this,f(t,80))},w.t=function(t){var n;return xe(t,80)?(n=f(t,80),this.d==n.d):!1},w.v=function(){return this.d},w.w=function(){var t,n,i,s;for(t=new pd("{"),s=new M(this.g);s.a<s.c.c.length;)i=f(O(s),7),n=B0(i.f),n==null&&(n="n"+lM(i.f)),t.a+=""+n,s.a<s.c.c.length&&(t.a+=",");return t.a+="}",t.a},w.a=NaN,w.c=0,w.d=0,w.f=0,w.i=0,w.k=NaN,G(cl,"OrthogonalRoutingGenerator/HyperNode",80),A(580,1,{},uj),w.Kc=function(t,n){var i,s,l,h,v,p,m,S,x,L;for(L=n+t.i*this.a.c,p=new M(t.g);p.a<p.c.c.length;)for(v=f(O(p),7),m=ln(re(ie(_t,1),Ht,10,0,[v.f.i,v.i,v.a])).a,s=new M(v.e);s.a<s.c.c.length;)i=f(O(s),12),S=i.d,x=ln(re(ie(_t,1),Ht,10,0,[S.f.i,S.i,S.a])).a,(m-x<=0?0-(m-x):m-x)>mu&&(l=new ot(m,L),an(i.a,l),eb(this.a,i,t,l,!1),h=new ot(x,L),an(i.a,h),eb(this.a,i,t,h,!1))},w.Lc=function(t){return t.f.i.a+t.i.a+t.a.a},w.Mc=function(){return we(),ct},w.Nc=function(){return we(),rt},G(cl,"OrthogonalRoutingGenerator/NorthToSouthRoutingStrategy",580),A(581,1,{},cj),w.Kc=function(t,n){var i,s,l,h,v,p,m,S,x,L;for(L=n-t.i*this.a.c,p=new M(t.g);p.a<p.c.c.length;)for(v=f(O(p),7),m=ln(re(ie(_t,1),Ht,10,0,[v.f.i,v.i,v.a])).a,s=new M(v.e);s.a<s.c.c.length;)i=f(O(s),12),S=i.d,x=ln(re(ie(_t,1),Ht,10,0,[S.f.i,S.i,S.a])).a,(m-x<=0?0-(m-x):m-x)>mu&&(l=new ot(m,L),an(i.a,l),eb(this.a,i,t,l,!1),h=new ot(x,L),an(i.a,h),eb(this.a,i,t,h,!1))},w.Lc=function(t){return t.f.i.a+t.i.a+t.a.a},w.Mc=function(){return we(),rt},w.Nc=function(){return we(),ct},G(cl,"OrthogonalRoutingGenerator/SouthToNorthRoutingStrategy",581),A(579,1,{},lj),w.Kc=function(t,n){var i,s,l,h,v,p,m,S,x,L;for(L=n+t.i*this.a.c,p=new M(t.g);p.a<p.c.c.length;)for(v=f(O(p),7),m=ln(re(ie(_t,1),Ht,10,0,[v.f.i,v.i,v.a])).b,s=new M(v.e);s.a<s.c.c.length;)i=f(O(s),12),S=i.d,x=ln(re(ie(_t,1),Ht,10,0,[S.f.i,S.i,S.a])).b,(m-x<=0?0-(m-x):m-x)>mu&&(l=new ot(L,m),an(i.a,l),eb(this.a,i,t,l,!0),h=new ot(L,x),an(i.a,h),eb(this.a,i,t,h,!0))},w.Lc=function(t){return t.f.i.b+t.i.b+t.a.b},w.Mc=function(){return we(),Be},w.Nc=function(){return we(),qe},G(cl,"OrthogonalRoutingGenerator/WestToEastRoutingStrategy",579),A(535,1,Qo,aI),w.qc=function(t){var n,i;return i=f(z(t,(le(),Vr)),18),n=new An,(i.kb((br(),mf))||Pt(ge(Nt(z(t,(zt(),Gb))))))&&(Lr(n,y$),i.kb(yf)&&Lr(n,k$)),i.kb(sv)&&Lr(n,w$),i.kb(uv)&&Lr(n,m$),n},w.sc=function(t,n){var i,s,l,h,v,p,m,S,x,L,j,I,R,Y,q,V,U,te,ue,ye;for(It(n,"Polyline edge routing",1),L=f(z(t,(le(),Ai)),15).a,i=f(z(t,(zt(),eu)),15).a,q=0,t.c.c.length!=0&&(V=BB(f(_e(t.c,0),16)),q=.4*i*V),h=new fn(t.c,0);h.b<h.d.Y();){for(l=(ut(h.b<h.d.Y()),f(h.d.sb(h.c=h.b++),16)),s=hy(l,ew),s&&q>0&&(q-=L),Mx(l,q),m=0,x=new M(l.a);x.a<x.c.c.length;){for(S=f(O(x),9),p=0,I=Dt(En(S));xt(I);)j=f(Et(I),12),R=Di(j.c).b,Y=Di(j.d).b,l==j.d.f.d&&(U=j.c,te=j.d,ue=(ln(re(ie(_t,1),Ht,10,0,[U.f.i,U.i,U.a])).b+ln(re(ie(_t,1),Ht,10,0,[te.f.i,te.i,te.a])).b)/2,U.g==(we(),Be)?ye=new ot(q+U.f.d.c.a+.4*i*(R-Y<=0?0-(R-Y):R-Y),ue):ye=new ot(q-.4*i*(R-Y<=0?0-(R-Y):R-Y),ue),s0(j.a,0,ye),j.c.g==qe&&(R=0,Y=0)),p=p>(Y-R<=0?0-(Y-R):Y-R)?p:Y-R<=0?0-(Y-R):Y-R;switch(S.g.e){case 0:case 4:case 1:case 3:Kce(this,S,q)}m=m>p?m:p}h.b<h.d.Y()&&(V=BB((ut(h.b<h.d.Y()),f(h.d.sb(h.c=h.b++),16))),m=m>V?m:V,ut(h.b>0),h.a.sb(h.c=--h.b)),v=.4*i*m,!s&&h.b<h.d.Y()&&(v+=L),q+=l.c.a+v}this.a.a.Q(),t.e.a=q,Ct(n)};var w$,m$,y$,k$,ew;G(cl,"PolylineEdgeRouter",535),A(536,1,vo,a9),w.D=function(t){return hR(f(t,9))},G(cl,"PolylineEdgeRouter/1",536),A(75,1,{75:1},XR),w.w=function(){var t,n,i,s;for(i=new wd,this.e&&co(co(i,c0(this.e)),": "),n=Jt(Jy(this),0);n.b!=n.d.c;)t=f(qt(n),7),co(co(jd(co(i,(s=gA(t),s==null?"p_"+t.k:"p_"+s)),32),c0(t.g))," / ");return Dte(i,gg(i.a)-2-1)},w.j=0,w.k=0,G(ll,"ConnectedSelfLoopComponent",75),A(60,17,{60:1,3:1,23:1,17:1},ms),w.c=0;var E$,S$,C$,Cu,vc,is,gc,Ns,Ro,as,xu,Tu,x$,T$,L$,P$,D$,j$,N$,I$,M$,O$,A$,R$,B$,kl,pf,bc,pc,ov=At(ll,"LoopSide",60,on,pC);A(203,1,{},w8,xx,MC),w.w=function(){return this.b.w()},w.c=0,w.d=!1,w.e=!1,w.f=!1,w.i=0,w.j=0,G(ll,"NubSpline",203),A(92,1,{92:1},Qy,JB),G(ll,"NubSpline/PolarCP",92),A(281,203,{},Uy),G(ll,"NubsSelfLoop",281),A(112,1,{},fB,R8,jg,W2,K2),w.a=eT,w.b=Xo,w.c=eT,w.d=Xo,G(ll,"Rectangle",112),A(537,1,Qo,x9),w.qc=function(t){var n,i;return n=new An,i=f(z(t,(le(),Vr)),18),i.kb((br(),iw))&&Lr(n,$$),i.kb(sv)&&Lr(n,z$),(i.kb(mf)||Pt(ge(Nt(z(t,(zt(),Gb))))))&&(Lr(n,_$),i.kb(yf)&&Lr(n,G$)),i.kb(uv)&&Lr(n,H$),n},w.sc=function(t,n){var i,s,l,h,v,p,m,S,x,L,j,I,R,Y,q,V,U,te,ue,ye,Ce,be,Ne,Ue,Xe,it,st,Tt,xn,Nn,Bi,Ji;It(n,"Spline edge routing",1),ue=f(z(t,(le(),Ai)),15).a,this.a=ue*f(z(t,(zt(),eu)),15).a,Ji=0,q=new M(t.c),V=null,Nn=(On(),new $t),xn=new Se,m=!0,S=!0;do{for(be=q.a<q.c.c.length?f(O(q),16):null,j=new Se,v=new Se,U=new $i,Ue=new $i,st=new $i,hfe(new wr(V,be),new wr(U,Ue),v,Nn,xn,st),hk(U,Ue,(Vc(),Xs),!0,v,j),hk(U,Ue,Xs,!1,v,j),hk(U,Ue,wf,!0,v,j),hk(U,Ue,wf,!1,v,j),xce(v,U,Ue,j),Tt=new fn(j,0);Tt.b<Tt.d.Y();)for(x=(ut(Tt.b<Tt.d.Y()),f(Tt.d.sb(Tt.c=Tt.b++),77)),Bi=new fn(j,Tt.b);Bi.b<Bi.d.Y();)L=(ut(Bi.b<Bi.d.Y()),f(Bi.d.sb(Bi.c=Bi.b++),77)),afe(x,L);if(jfe(j,f(z(t,qh),154)),jle(j),Ne=Ji+10,be){for(S=!be||hy(be.a,(ip(),ew)),te=-1,l=new M(j);l.a<l.c.c.length;)i=f(O(l),77),te=ti(te,i.n);++te,te>0?(I=(te+1)*this.a,I<ue&&!m&&!S&&(I=ue),Ne+=I):m||S||d8(V)||d8(be)||(Ne+=ue),Mx(be,Ne)}for(it=(Ce=new Wt(st.a).a.bb().mb(),new Zt(Ce));it.a.G();)for(Xe=(p=f(it.a.H(),21),f(p.yb(),12)),ye=Xe.c.f.i,Zu(Xe.a,ye),Y=new M(Xe.b);Y.a<Y.c.c.length;)R=f(O(Y),33),dn(R.i,ye);for(h=new M(j);h.a<h.c.c.length;)i=f(O(h),77),i.f?$se(i,Ji):Rce(this,i,Ji,Ne);if(be)Ji=Ne+be.c.a+10;else{for(te=-1,l=new M(j);l.a<l.c.c.length;)i=f(O(l),77),te=ti(te,i.n);te>=0&&(Ji+=(te+2)*this.a)}V=be,m=S}while(be);for(s=new M(xn);s.a<s.c.c.length;)i=f(O(s),12),xfe(i,Nn);t.e.a=Ji,Ct(n)},w.a=3;var z$,H$,_$,G$,$$;G(ll,"SplineEdgeRouter",537),A(117,1,{117:1},z0),w.w=function(){return this.a+" ->("+this.c+") "+this.b},w.c=0,G(ll,"SplineEdgeRouter/Dependency",117),A(223,17,{223:1,3:1,23:1,17:1},C4);var Xs,wf,ahe=At(ll,"SplineEdgeRouter/SideToProcess",223,on,ore);A(77,1,{77:1,23:1},pB,Ix),w.F=function(t){return tte(this,f(t,77))},w.a=0,w.b=0,w.e=0,w.f=!1,w.i=0,w.k=0,w.n=0,w.p=0,G(ll,"SplineEdgeRouter/SplineHyperEdge",77),A(123,17,{123:1,3:1,23:1,17:1},xd);var AE,RE,BE,zE,HE,_E,GE=At(Us,"ContentAlignment",123,on,Eie),Y$;A(218,17,{218:1,3:1,23:1,17:1},ay);var tw,a6,Bb,ohe=At(Us,"EdgeConstraint",218,on,Lre);A(115,17,{115:1,3:1,23:1,17:1},fg);var $E,nw,YE,FE,qE,F$=At(Us,"EdgeLabelSideSelection",115,on,hie),q$;A(124,17,{124:1,3:1,23:1,17:1},Td);var VE,o6,s6,WE,u6,c6,V$=At(Us,"FixedAlignment",124,on,Sie),W$;A(113,17,{113:1,3:1,23:1,17:1},$u);var sv,UE,uv,os,rw,KE,mf,yf,l6,iw,f6=At(Us,"GraphProperties",113,on,rae);A(110,17,{110:1,3:1,23:1,17:1},Kl),w.a=!1,w.b=!1,w.c=!1;var ZE,h6,d6,v6,g6,XE,b6,p6,U$=At(Us,"GreedySwitchType",110,on,Gie),K$;A(140,17,{140:1,3:1,23:1,17:1},oy);var $h,aw,kf,she=At(Us,"InLayerConstraint",140,on,Tre);A(174,17,{174:1,3:1,23:1,17:1},x4);var QE,w6,Z$=At(Us,"InteractiveReferencePoint",174,on,fre),X$,Yh,m6,y6,JE,wc,zb,ss,cv,ow,k6,Q$,lv,E6,S6,e5,C6,Ef,sw,_r,x6,Vr,t5,J$,Qs,El,Fh,bo,Oi,Si,Sl,fv,lt,T6,L6,P6,n5,Cl,uw,Is,Lu,r5,Qa,D6,qh,j6,Js,Ai,xl,eY,Hb,i5,N6,a5,hv;A(85,17,{85:1,3:1,23:1,17:1},hg);var _b,mc,dv,Pu,Sf,tY=At(Us,"LayerConstraint",85,on,die),nY;A(219,17,{219:1,3:1,23:1,17:1},sy);var Ri,ai,o5,uhe=At(Us,"PortType",219,on,Pre),s5,u5,c5,l5,cw,f5,I6,h5,Vh,rY,eu,Gb,lw,d5,v5,Sr,M6,O6,A6,g5,b5,fw,R6,p5,vv,hw,w5,B6,z6,m5,gv,bv;A(153,17,{153:1,3:1,23:1,17:1},uy);var H6,_6,y5,iY=At(Us,"SelfLoopPlacement",153,on,Dre),aY;A(134,1,{134:1},Vz),w.a=0,w.b=0,w.c=0,w.d=0,w.e=0,w.f=0,G(Us,"Spacings",134),A(172,17,{172:1,3:1,23:1,17:1},cy);var pv,$b,dw,oY=At(Us,"WideNodesStrategy",172,on,jre),sY;A(644,1,{}),G(kp,"OutputStream",644),A(645,644,{}),G(kp,"FilterOutputStream",645),A(291,645,{},xS),G(kp,"PrintStream",291),A(255,1,{}),w.w=function(){return this.a},G(zr,"AbstractStringBuilder",255),A(621,95,Ys,$j),G(zr,"ArrayIndexOutOfBoundsException",621),A(290,72,Ys,xj,iN),G(zr,"ArrayStoreException",290),A(252,46,zx),G(zr,"Error",252),A(84,252,zx,HS,f2),G(zr,"AssertionError",84),qH={3:1,349:1,23:1};var Rn,oi,che=G(zr,"Boolean",349);VH={3:1,23:1,184:1,231:1};var Yb=G(zr,"Double",184);A(15,231,{3:1,23:1,15:1,231:1},fj,Ut),w.F=function(t){return jte(this,f(t,15))},w.t=function(t){return xe(t,15)&&f(t,15).a==this.a},w.v=function(){return Xn(this.a)},w.w=function(){return fte(this.a)},w.a=0;var lhe=G(zr,"Float",15);A(101,72,Ys,eg,zu),G(zr,"IllegalStateException",101);var G6,uY;A(608,72,Ys,aN),G(zr,"NegativeArraySizeException",608),A(76,72,{3:1,54:1,76:1,46:1},vd,rg),G(zr,"NullPointerException",76),A(130,29,{3:1,54:1,29:1,130:1,46:1},Yj,H1),G(zr,"NumberFormatException",130),A(146,1,{3:1,146:1},Zy),w.t=function(t){var n;return xe(t,146)?(n=f(t,146),this.c==n.c&&la(this.d,n.d)&&la(this.a,n.a)&&la(this.b,n.b)):!1},w.v=function(){return x2(re(ie(Ze,1),Me,1,4,[gt(this.c),this.a,this.d,this.b]))},w.w=function(){return this.a+"."+this.d+"("+(this.b!=null?this.b:"Unknown Source")+(this.c>=0?":"+this.c:"")+")"},w.c=0;var cY=G(zr,"StackTraceElement",146);A(98,255,{345:1},wd,Hm,pd),G(zr,"StringBuilder",98);var lY,$6;A(45,72,{3:1,54:1,46:1,45:1},Fn,qf),G(zr,"UnsupportedOperationException",45),A(213,638,Th),w.Q=function(){ho(this)},w.R=function(t){return dh(this,t)},w.ab=function(t){return _R(this,t,this.e)||_R(this,t,this.d)},w.bb=function(){return new ou(this)},w.cb=function(t){return Kt(this,t)},w.db=function(t,n){return un(this,t,n)},w.eb=function(t){return Yl(this,t)},w.Y=function(){return W1(this)},G(wt,"AbstractHashMap",213),A(120,641,vi,ou),w.Q=function(){this.a.Q()},w.kb=function(t){return R3(this,t)},w.mb=function(){return new ef(this.a)},w.nb=function(t){var n;return R3(this,t)?(n=f(t,21).yb(),this.a.eb(n),!0):!1},w.Y=function(){return this.a.Y()},G(wt,"AbstractHashMap/EntrySet",120),A(148,1,ir,ef),w.H=function(){return Rd(this)},w.G=function(){return this.b},w.I=function(){V3(this)},w.b=!1,G(wt,"AbstractHashMap/EntrySetIterator",148),A(162,1,ir,Yf),w.G=function(){return this.b<this.d.Y()},w.H=function(){return ut(this.G()),this.d.sb(this.c=this.b++)},w.I=function(){Po(this)},w.b=0,w.c=-1,G(wt,"AbstractList/IteratorImpl",162),A(43,162,Ph,fn),w.J=function(t){cu(this,t)},w.K=function(){return this.b>0},w.L=function(){return this.b},w.M=function(){return JM(this)},w.N=function(){return this.b-1},w.O=function(t){Z4(this,t)},G(wt,"AbstractList/ListIteratorImpl",43),A(258,647,Lh,n2),w.rb=function(t,n){Xc(t,this.b),this.c.rb(this.a+t,n),++this.b},w.sb=function(t){return Sn(t,this.b),this.c.sb(this.a+t)},w.vb=function(t){var n;return Sn(t,this.b),n=this.c.vb(this.a+t),--this.b,n},w.wb=function(t,n){return Sn(t,this.b),this.c.wb(this.a+t,n)},w.Y=function(){return this.b},w.a=0,w.b=0,G(wt,"AbstractList/SubList",258),A(36,641,vi,Wt),w.Q=function(){this.a.Q()},w.kb=function(t){return this.a.R(t)},w.mb=function(){var t;return t=this.a.bb().mb(),new Zt(t)},w.nb=function(t){return this.a.R(t)?(this.a.eb(t),!0):!1},w.Y=function(){return this.a.Y()},G(wt,"AbstractMap/1",36),A(40,1,ir,Zt),w.G=function(){return this.a.G()},w.H=function(){var t;return t=f(this.a.H(),21),t.yb()},w.I=function(){this.a.I()},G(wt,"AbstractMap/1/1",40),A(211,640,Vd,Kv),w.Q=function(){this.a.Q()},w.kb=function(t){return this.a.ab(t)},w.mb=function(){var t;return t=this.a.bb().mb(),new Zv(t)},w.Y=function(){return this.a.Y()},G(wt,"AbstractMap/2",211),A(212,1,ir,Zv),w.G=function(){return this.a.G()},w.H=function(){var t;return t=f(this.a.H(),21),t.zb()},w.I=function(){this.a.I()},G(wt,"AbstractMap/2/1",212),A(210,1,{210:1,21:1}),w.t=function(t){var n;return xe(t,21)?(n=f(t,21),la(this.d,n.yb())&&la(this.e,n.zb())):!1},w.yb=function(){return this.d},w.zb=function(){return this.e},w.v=function(){return py(this.d)^py(this.e)},w.Ab=function(t){return J4(this,t)},w.w=function(){return this.d+"="+this.e},G(wt,"AbstractMap/AbstractEntry",210),A(163,210,{210:1,163:1,21:1},Q1),G(wt,"AbstractMap/SimpleEntry",163),A(652,1,ab),w.t=function(t){var n;return xe(t,21)?(n=f(t,21),la(this.yb(),n.yb())&&la(this.zb(),n.zb())):!1},w.v=function(){return py(this.yb())^py(this.zb())},w.w=function(){return this.yb()+"="+this.zb()},G(wt,lH,652),A(639,638,Th),w._=function(t){return EA(this,t)},w.R=function(t){return ly(this,t)},w.bb=function(){return new IS(this)},w.cb=function(t){return li(kC(this,t))},w.W=function(){return new I1(this)},G(wt,"AbstractNavigableMap",639),A(287,641,vi,IS),w.kb=function(t){return xe(t,21)&&EA(this.b,f(t,21))},w.mb=function(){return new kg(this.b)},w.nb=function(t){var n;return xe(t,21)?(n=f(t,21),DA(this.b,n)):!1},w.Y=function(){return this.b.c},G(wt,"AbstractNavigableMap/EntrySet",287),A(229,641,qx,I1),w.Q=function(){z1(this.a)},w.kb=function(t){return ly(this.a,t)},w.mb=function(){var t;return t=new kg(new mg(this.a).b),new M1(t)},w.nb=function(t){return ly(this.a,t)?(xg(this.a,t),!0):!1},w.Y=function(){return this.a.c},G(wt,"AbstractNavigableMap/NavigableKeySet",229),A(230,1,ir,M1),w.G=function(){return ey(this.a.a)},w.H=function(){var t;return t=Cy(this.a),t.yb()},w.I=function(){OM(this.a)},G(wt,"AbstractNavigableMap/NavigableKeySet/1",230),A(4,1,ir,M),w.G=function(){return Bc(this)},w.H=function(){return O(this)},w.I=function(){Dd(this)},w.a=0,w.b=-1,G(wt,"ArrayList/1",4),A(94,647,GH,uo),w.kb=function(t){return Uie(this,t)!=-1},w.sb=function(t){return FM(this,t)},w.wb=function(t,n){var i;return i=(Sn(t,this.a.length),this.a[t]),$a(this.a,t,n),i},w.Y=function(){return this.a.length},w.ob=function(){return B8(this,ve(Ze,Me,1,this.a.length,4,1))},w.pb=function(t){return B8(this,t)},G(wt,"Arrays/ArrayList",94);var yc,Y6,k5;A(413,1,Ir,hj),w.$b=function(t,n){return sO(n,t)},G(wt,"Collections/2",413),A(406,647,GH,o9),w.kb=function(t){return!1},w.sb=function(t){return Sn(t,0),null},w.mb=function(){return Qt(),ry(),E5},w.tb=function(){return Qt(),ry(),E5},w.Y=function(){return 0},G(wt,"Collections/EmptyList",406),A(407,1,Ph,s9),w.J=function(t){throw new Fn},w.G=function(){return!1},w.K=function(){return!1},w.H=function(){throw new sa},w.L=function(){return 0},w.M=function(){throw new sa},w.N=function(){return-1},w.I=function(){throw new eg},w.O=function(t){throw new eg};var E5;G(wt,"Collections/EmptyListIterator",407),A(409,638,jh,u9),w.R=function(t){return!1},w.ab=function(t){return!1},w.bb=function(){return Qt(),k5},w.cb=function(t){return null},w.W=function(){return Qt(),k5},w.Y=function(){return 0},w.fb=function(){return Qt(),yc},G(wt,"Collections/EmptyMap",409),A(408,641,Nh,c9),w.kb=function(t){return!1},w.mb=function(){return Qt(),ry(),E5},w.Y=function(){return 0},G(wt,"Collections/EmptySet",408),A(410,1,Ir,l9),w.$b=function(t,n){return cte(f(t,23),f(n,23))};var fY;G(wt,"Collections/ReverseComparator",410),A(411,647,{3:1,22:1,19:1,20:1},dj),w.kb=function(t){return la(this.a,t)},w.sb=function(t){return Sn(t,1),this.a},w.Y=function(){return 1},G(wt,"Collections/SingletonList",411),A(217,1,Vd,Xv),w.ib=function(t){return Pj()},w.jb=function(t){return Dj()},w.Q=function(){jj()},w.kb=function(t){return this.b.kb(t)},w.lb=function(t){return this.b.lb(t)},w.V=function(){return this.b.V()},w.mb=function(){return new fd(this.b.mb())},w.nb=function(t){return Nj()},w.Y=function(){return this.b.Y()},w.ob=function(){return this.b.ob()},w.pb=function(t){return this.b.pb(t)},w.w=function(){return ha(this.b)},G(wt,"Collections/UnmodifiableCollection",217),A(152,1,ir,fd),w.G=function(){return this.b.G()},w.H=function(){return this.b.H()},w.I=function(){Oee()},G(wt,"Collections/UnmodifiableCollectionIterator",152),A(233,217,Lh,u0),w.rb=function(t,n){throw new Fn},w.t=function(t){return this.a.t(t)},w.sb=function(t){return this.a.sb(t)},w.v=function(){return this.a.v()},w.V=function(){return this.a.V()},w.tb=function(){return new z4(this.a.ub(0))},w.ub=function(t){return new z4(this.a.ub(t))},w.vb=function(t){throw new Fn},w.wb=function(t,n){throw new Fn},w.xb=function(t,n){return new u0(this.a.xb(t,n))},G(wt,"Collections/UnmodifiableList",233),A(309,152,Ph,z4),w.J=function(t){throw new Fn},w.K=function(){return this.a.K()},w.L=function(){return this.a.L()},w.M=function(){return this.a.M()},w.N=function(){return this.a.N()},w.O=function(t){throw new Fn},G(wt,"Collections/UnmodifiableListIterator",309),A(305,1,Th,MS),w.Q=function(){throw new Fn},w.R=function(t){return this.c.R(t)},w.ab=function(t){return FN(this,t)},w.bb=function(){return Da(this)},w.t=function(t){return SN(this,t)},w.cb=function(t){return this.c.cb(t)},w.v=function(){return this.c.v()},w.V=function(){return this.c.V()},w.W=function(){return dO(this)},w.db=function(t,n){throw new Fn},w.eb=function(t){throw new Fn},w.Y=function(){return this.c.Y()},w.w=function(){return ha(this.c)},w.fb=function(){return gO(this)},G(wt,"Collections/UnmodifiableMap",305),A(151,217,vi,Rl),w.t=function(t){return EN(this,t)},w.v=function(){return this.b.v()},G(wt,"Collections/UnmodifiableSet",151),A(412,151,vi,dN),w.kb=function(t){return p4(this,t)},w.lb=function(t){return qN(this,t)},w.mb=function(){var t;return t=this.b.mb(),new OS(t)},w.ob=function(){return SO(this)},w.pb=function(t){return P3(this,t)},G(wt,"Collections/UnmodifiableMap/UnmodifiableEntrySet",412),A(263,1,ir,OS),w.H=function(){return new AS(f(this.a.H(),21))},w.G=function(){return this.a.G()},w.I=function(){throw new Fn},G(wt,"Collections/UnmodifiableMap/UnmodifiableEntrySet/1",263),A(306,1,ab,AS),w.t=function(t){return this.a.t(t)},w.yb=function(){return this.a.yb()},w.zb=function(){return this.a.zb()},w.v=function(){return this.a.v()},w.Ab=function(t){throw new Fn},w.w=function(){return ha(this.a)},G(wt,"Collections/UnmodifiableMap/UnmodifiableEntrySet/UnmodifiableEntry",306),A(307,233,pk,i4),G(wt,"Collections/UnmodifiableRandomAccessList",307),A(308,151,qx,H4),w.t=function(t){return this.a.t(t)},w.v=function(){return this.a.v()},G(wt,"Collections/UnmodifiableSortedSet",308);var Cf;A(522,1,Ir,f9),w.$b=function(t,n){return ur(t),ur(n),cC(f(t,23),n)},G(wt,"Comparators/1",522),A(202,72,Ys,gd),G(wt,"ConcurrentModificationException",202),A(609,72,Ys,Hj),G(wt,"EmptyStackException",609),A(319,638,Th,DC),w.db=function(t,n){return X4(this,t,n)},w.Q=function(){hO(this)},w.R=function(t){return f3(this.a,t)},w.ab=function(t){var n,i;for(i=new eh(this.a);i.a<i.c.a.length;)if(n=Kc(i),la(t,this.b[n.e]))return!0;return!1},w.bb=function(){return new O1(this)},w.cb=function(t){return fh(this,t)},w.eb=function(t){return A3(this,t)},w.Y=function(){return this.a.c},G(wt,"EnumMap",319),A(236,641,vi,O1),w.Q=function(){hO(this.a)},w.kb=function(t){return VO(this,t)},w.mb=function(){return new E0(this.a)},w.nb=function(t){var n;return VO(this,t)?(n=f(t,21).yb(),A3(this.a,n),!0):!1},w.Y=function(){return this.a.a.c},G(wt,"EnumMap/EntrySet",236),A(237,1,ir,E0),w.H=function(){return this.b=Kc(this.a),new X1(this.c,this.b)},w.G=function(){return i0(this.a)},w.I=function(){_l(!!this.b),A3(this.c,this.b),this.b=null},G(wt,"EnumMap/EntrySetIterator",237),A(238,652,ab,X1),w.yb=function(){return this.a},w.zb=function(){return this.b.b[this.a.e]},w.Ab=function(t){return $y(this.b,this.a.e,t)},G(wt,"EnumMap/MapEntry",238),A(86,641,{22:1,19:1,86:1,18:1}),G(wt,"EnumSet",86),A(66,86,{22:1,19:1,86:1,66:1,18:1},ri),w.ib=function(t){return di(this,f(t,17))},w.kb=function(t){return f3(this,t)},w.mb=function(){return new eh(this)},w.nb=function(t){return UM(this,t)},w.Y=function(){return this.c},w.c=0,G(wt,"EnumSet/EnumSetImpl",66),A(167,1,ir,eh),w.H=function(){return Kc(this)},w.G=function(){return i0(this)},w.I=function(){_l(this.b!=-1),$a(this.c.b,this.b,null),--this.c.c,this.b=-1},w.a=-1,w.b=-1,G(wt,"EnumSet/EnumSetImpl/IteratorImpl",167),A(30,213,$H,$t,ty,hI),w.Uc=function(t,n){return He(t)===He(n)||t!=null&&jo(t,n)},w.Vc=function(t){var n;return n=Ko(t),n|0},G(wt,"HashMap",30),A(50,641,YH,Yr,Gm,l3),w.ib=function(t){return vn(this,t)},w.Q=function(){this.a.Q()},w.Wc=function(){return new l3(this)},w.kb=function(t){return Oc(this,t)},w.V=function(){return this.a.Y()==0},w.mb=function(){var t;return t=new Wt(this.a).a.bb().mb(),new Zt(t)},w.nb=function(t){return wy(this,t)},w.Y=function(){return this.a.Y()},w.w=function(){return nc(new Wt(this.a))},G(wt,"HashSet",50),A(418,1,rc,LI),w.mb=function(){return new j3(this)},w.c=0,G(wt,"InternalHashCodeMap",418),A(312,1,ir,j3),w.H=function(){return this.d=this.a[this.c++],this.d},w.G=function(){var t;return this.c<this.a.length?!0:(t=this.b.next(),t.done?!1:(this.a=t.value[1],this.c=0,!0))},w.I=function(){rk(this.e,this.d.yb()),this.c!=0&&--this.c},w.c=0,w.d=null,G(wt,"InternalHashCodeMap/1",312);var hY;A(382,1,rc,PI),w.mb=function(){return new _3(this)},w.c=0,w.d=0,G(wt,"InternalStringMap",382),A(293,1,ir,_3),w.H=function(){return this.c=this.a,this.a=this.b.next(),new jM(this.d,this.c,this.d.d)},w.G=function(){return!this.a.done},w.I=function(){TR(this.d,this.c.value[0])},G(wt,"InternalStringMap/1",293),A(383,652,ab,jM),w.yb=function(){return this.b.value[0]},w.zb=function(){return this.a.d!=this.c?rI(this.a,this.b.value[0]):this.b.value[1]},w.Ab=function(t){return I2(this.a,this.b.value[0],t)},w.c=0,G(wt,"InternalStringMap/2",383),A(155,30,$H,Md,IA),w.Q=function(){kM(this)},w.R=function(t){return dh(this.c,t)},w.ab=function(t){var n;for(n=this.b.a;n!=this.b;){if(la(n.e,t))return!0;n=n.a}return!1},w.bb=function(){return new Pm(this)},w.cb=function(t){return h2(this,t)},w.db=function(t,n){return $g(this,t,n)},w.eb=function(t){return X3(this,t)},w.Y=function(){return W1(this.c)},w.a=!1,G(wt,"LinkedHashMap",155),A(176,163,{210:1,163:1,176:1,21:1},aM,a3),G(wt,"LinkedHashMap/ChainEntry",176),A(270,641,vi,Pm),w.Q=function(){kM(this.a)},w.kb=function(t){return WO(this,t)},w.mb=function(){return new Wy(this)},w.nb=function(t){var n;return WO(this,t)?(n=f(t,21).yb(),X3(this.a,n),!0):!1},w.Y=function(){return W1(this.a.c)},G(wt,"LinkedHashMap/EntrySet",270),A(271,1,ir,Wy),w.H=function(){return q3(this)},w.G=function(){return this.b!=this.c.a.b},w.I=function(){_l(!!this.a),_y(this.c.a.c,this),s3(this.a),Yl(this.c.a.c,this.a.d),B4(this.c.a.c,this),this.a=null},G(wt,"LinkedHashMap/EntrySet/EntryIterator",271),A(70,50,YH,$i,KI,Ry),w.Wc=function(){return new Ry(this)},G(wt,"LinkedHashSet",70),A(372,1,Ph,DM),w.J=function(t){Cg(this,t)},w.G=function(){return this.b!=this.d.c},w.K=function(){return this.b.b!=this.d.a},w.H=function(){return qt(this)},w.L=function(){return this.a},w.M=function(){return Tg(this)},w.N=function(){return this.a-1},w.I=function(){tC(this)},w.O=function(t){_l(!!this.c),this.c.c=t},w.a=0,w.c=null,G(wt,"LinkedList/ListIteratorImpl",372),A(259,1,{},mm),G(wt,"LinkedList/Node",259),A(74,72,{3:1,54:1,46:1,74:1},sa),G(wt,"NoSuchElementException",74),A(154,1,{154:1},e8,_A),w.a=0,w.b=0;var F6,q6,fhe=0;G(wt,"Random",154),A(607,647,FH),w.rb=function(t,n){b0(t,this.a.c.length+1),Gc(this.a,t,n)},w.ib=function(t){return Le(this.a,t)},w.jb=function(t){return Tn(this.a,t)},w.Q=function(){this.a.c=ve(Ze,Me,1,0,4,1)},w.kb=function(t){return ji(this.a,t,0)!=-1},w.lb=function(t){return Xu(this.a,t)},w.sb=function(t){return b0(t,this.a.c.length),_e(this.a,t)},w.V=function(){return this.a.c.length==0},w.mb=function(){return new M(this.a)},w.vb=function(t){return b0(t,this.a.c.length),Zl(this.a,t)},w.Xb=function(t,n){AO(this.a,t,n)},w.wb=function(t,n){return b0(t,this.a.c.length),Uc(this.a,t,n)},w.Y=function(){return this.a.c.length},w.xb=function(t,n){return new n2(this.a,t,n)},w.ob=function(){return UI(this.a)},w.pb=function(t){return Vn(this.a,t)},w.w=function(){return nc(this.a)},G(wt,"Vector",607),A(337,607,FH,FS),G(wt,"Stack",337),A(253,639,jh,VN,I3),w.Q=function(){z1(this)},w.bb=function(){return new mg(this)},w.db=function(t,n){return OR(this,t,n)},w.eb=function(t){return xg(this,t)},w.Y=function(){return this.c},w.c=0,G(wt,"TreeMap",253),A(182,1,ir,kg),w.H=function(){return Cy(this)},w.G=function(){return ey(this.a)},w.I=function(){OM(this)},G(wt,"TreeMap/EntryIterator",182),A(209,287,vi,mg),w.Q=function(){z1(this.a)},G(wt,"TreeMap/EntrySet",209),A(183,163,{210:1,163:1,21:1,183:1},c2),w.b=!1;var hhe=G(wt,"TreeMap/Node",183);A(254,1,{},ym),w.w=function(){return"State: mv="+this.c+" value="+this.d+" done="+this.a+" found="+this.b},w.a=!1,w.b=!1,w.c=!1,G(wt,"TreeMap/State",254),A(138,17,Nk,Z1),w.Xc=function(){return!1},w.Yc=function(){return!1};var V6,dY,vY,gY,S5=At(wt,"TreeMap/SubMapType",138,on,tie);A(352,138,Nk,MI),w.Yc=function(){return!0},At(wt,"TreeMap/SubMapType/1",352,S5,null),A(353,138,Nk,HI),w.Xc=function(){return!0},w.Yc=function(){return!0},At(wt,"TreeMap/SubMapType/2",353,S5,null),A(354,138,Nk,OI),w.Xc=function(){return!0},At(wt,"TreeMap/SubMapType/3",354,S5,null),A(191,641,{3:1,22:1,19:1,18:1,137:1,191:1},n4,xN),w.ib=function(t){return b3(this,t)},w.Q=function(){z1(this.a)},w.kb=function(t){return ly(this.a,t)},w.mb=function(){var t;return t=new kg(new mg(new I1(this.a).a).b),new M1(t)},w.nb=function(t){return nM(this,t)},w.Y=function(){return this.a.c},G(wt,"TreeSet",191);var dhe=0,W6,U6=0,vw,Kn=x0("int","I"),Fb=x0("boolean","Z"),bY=x0("char","C"),Qi=x0("double","D"),gw=x0("float","F"),bw=Gre,pY=pY=ise;Wie(dee),lae("permProps",[[["locale","default"],["user.agent","gecko1_8"]]]),pY(null,"klay",null)})()}(yS)),yS.exports}(function(a,r){(function(c,d){a.exports=d($Q())})(xc,function(u){return function(c){var d={};function g(b){if(d[b])return d[b].exports;var y=d[b]={i:b,l:!1,exports:{}};return c[b].call(y.exports,y,y.exports,g),y.l=!0,y.exports}return g.m=c,g.c=d,g.i=function(b){return b},g.d=function(b,y,k){g.o(b,y)||Object.defineProperty(b,y,{configurable:!1,enumerable:!0,get:k})},g.n=function(b){var y=b&&b.__esModule?function(){return b.default}:function(){return b};return g.d(y,"a",y),y},g.o=function(b,y){return Object.prototype.hasOwnProperty.call(b,y)},g.p="",g(g.s=3)}([function(c,d,g){var b=g(4),y=g(1),k=g(2),E={addUnnecessaryBendpoints:"de.cau.cs.kieler.klay.layered.unnecessaryBendpoints",alignment:"de.cau.cs.kieler.alignment",aspectRatio:"de.cau.cs.kieler.aspectRatio",borderSpacing:"borderSpacing",compactComponents:"de.cau.cs.kieler.klay.layered.components.compact",compactionStrategy:"de.cau.cs.kieler.klay.layered.nodeplace.compactionStrategy",contentAlignment:"de.cau.cs.kieler.klay.layered.contentAlignment",crossingMinimization:"de.cau.cs.kieler.klay.layered.crossMin",cycleBreaking:"de.cau.cs.kieler.klay.layered.cycleBreaking",debugMode:"de.cau.cs.kieler.debugMode",direction:"de.cau.cs.kieler.direction",edgeLabelSideSelection:"de.cau.cs.kieler.klay.layered.edgeLabelSideSelection",edgeRouting:"de.cau.cs.kieler.edgeRouting",edgeSpacingFactor:"de.cau.cs.kieler.klay.layered.edgeSpacingFactor",feedbackEdges:"de.cau.cs.kieler.klay.layered.feedBackEdges",fixedAlignment:"de.cau.cs.kieler.klay.layered.fixedAlignment",greedySwitchCrossingMinimization:"de.cau.cs.kieler.klay.layered.greedySwitch",hierarchyHandling:"de.cau.cs.kieler.hierarchyHandling",inLayerSpacingFactor:"de.cau.cs.kieler.klay.layered.inLayerSpacingFactor",interactiveReferencePoint:"de.cau.cs.kieler.klay.layered.interactiveReferencePoint",layerConstraint:"de.cau.cs.kieler.klay.layered.layerConstraint",layoutHierarchy:"de.cau.cs.kieler.layoutHierarchy",linearSegmentsDeflectionDampening:"de.cau.cs.kieler.klay.layered.linearSegmentsDeflectionDampening",mergeEdges:"de.cau.cs.kieler.klay.layered.mergeEdges",mergeHierarchyCrossingEdges:"de.cau.cs.kieler.klay.layered.mergeHierarchyEdges",noLayout:"de.cau.cs.kieler.noLayout",nodeLabelPlacement:"de.cau.cs.kieler.nodeLabelPlacement",nodeLayering:"de.cau.cs.kieler.klay.layered.nodeLayering",nodePlacement:"de.cau.cs.kieler.klay.layered.nodePlace",portAlignment:"de.cau.cs.kieler.portAlignment",portAlignmentEastern:"de.cau.cs.kieler.portAlignment.east",portAlignmentNorth:"de.cau.cs.kieler.portAlignment.north",portAlignmentSouth:"de.cau.cs.kieler.portAlignment.south",portAlignmentWest:"de.cau.cs.kieler.portAlignment.west",portConstraints:"de.cau.cs.kieler.portConstraints",portLabelPlacement:"de.cau.cs.kieler.portLabelPlacement",portOffset:"de.cau.cs.kieler.offset",portSide:"de.cau.cs.kieler.portSide",portSpacing:"de.cau.cs.kieler.portSpacing",postCompaction:"de.cau.cs.kieler.klay.layered.postCompaction",priority:"de.cau.cs.kieler.priority",randomizationSeed:"de.cau.cs.kieler.randomSeed",routeSelfLoopInside:"de.cau.cs.kieler.selfLoopInside",separateConnectedComponents:"de.cau.cs.kieler.separateConnComp",sizeConstraint:"de.cau.cs.kieler.sizeConstraint",sizeOptions:"de.cau.cs.kieler.sizeOptions",spacing:"de.cau.cs.kieler.spacing",splineSelfLoopPlacement:"de.cau.cs.kieler.klay.layered.splines.selfLoopPlacement",thoroughness:"de.cau.cs.kieler.klay.layered.thoroughness",wideNodesOnMultipleLayers:"de.cau.cs.kieler.klay.layered.wideNodesOnMultipleLayers"},C=function($){for(var F=Object.keys($),W={},Q=0;Q<F.length;Q++){var X=F[Q],K=E[X],ee=$[X];W[K]=ee}return W},T={interactiveReferencePoint:"CENTER"},P=function($){for(var F=$.parent(),W=$.scratch("klay"),Q={x:W.x,y:W.y};F.nonempty();){var X=F.scratch("klay");Q.x+=X.x,Q.y+=X.y,F=F.parent()}return Q},N=function($,F){var W=$.layoutDimensions(F),Q=$.numericStyle("padding"),X={_cyEle:$,id:$.id(),padding:{top:Q,left:Q,bottom:Q,right:Q}};return $.isParent()||(X.width=W.w,X.height=W.h),$.scratch("klay",X),X},D=function($,F){var W={_cyEle:$,id:$.id(),source:$.data("source"),target:$.data("target"),properties:{}},Q=F.priority($);return Q!=null&&(W.properties.priority=Q),$.scratch("klay",W),W},H=function($,F,W){for(var Q=[],X=[],K={},ee={id:"root",children:[],edges:[]},Z=0;Z<$.length;Z++){var ae=$[Z],oe=N(ae,W);Q.push(oe),K[ae.id()]=oe}for(var J=0;J<F.length;J++){var fe=F[J],se=D(fe,W);X.push(se),K[fe.id()]=se}for(var pe=0;pe<Q.length;pe++){var he=Q[pe],de=he._cyEle;if(!de.isChild())ee.children.push(he);else{var ke=de.parent(),Pe=K[ke.id()],Ae=Pe.children=Pe.children||[];Ae.push(he)}}for(var Te=0;Te<X.length;Te++){var Oe=X[Te],ze=Oe._cyEle;ze.source().parent(),ze.target().parent(),ee.edges.push(Oe)}return ee};function _(B){var $=B.klay;this.options=y({},k,B),this.options.klay=y({},k.klay,$,T)}_.prototype.run=function(){var B=this,$=this.options,F=$.eles,W=F.nodes(),Q=F.edges(),X=H(W,Q,$);return b.layout({graph:X,options:C($.klay),success:function(){},error:function(ee){throw ee}}),W.filter(function(K){return!K.isParent()}).layoutPositions(B,$,P),this},_.prototype.stop=function(){return this},_.prototype.destroy=function(){return this},c.exports=_},function(c,d,g){c.exports=Object.assign!=null?Object.assign.bind(Object):function(b){for(var y=arguments.length,k=Array(y>1?y-1:0),E=1;E<y;E++)k[E-1]=arguments[E];return k.filter(function(C){return C!=null}).forEach(function(C){Object.keys(C).forEach(function(T){return b[T]=C[T]})}),b}},function(c,d,g){var b={nodeDimensionsIncludeLabels:!1,fit:!0,padding:20,animate:!1,animateFilter:function(k,E){return!0},animationDuration:500,animationEasing:void 0,transform:function(k,E){return E},ready:void 0,stop:void 0,klay:{addUnnecessaryBendpoints:!1,aspectRatio:1.6,borderSpacing:20,compactComponents:!1,crossingMinimization:"LAYER_SWEEP",cycleBreaking:"GREEDY",direction:"UNDEFINED",edgeRouting:"ORTHOGONAL",edgeSpacingFactor:.5,feedbackEdges:!1,fixedAlignment:"NONE",inLayerSpacingFactor:1,layoutHierarchy:!1,linearSegmentsDeflectionDampening:.3,mergeEdges:!1,mergeHierarchyCrossingEdges:!0,nodeLayering:"NETWORK_SIMPLEX",nodePlacement:"BRANDES_KOEPF",randomizationSeed:1,routeSelfLoopInside:!1,separateConnectedComponents:!0,spacing:20,thoroughness:7},priority:function(k){return null}};c.exports=b},function(c,d,g){var b=g(0),y=function(E){E&&E("layout","klay",b)};typeof cytoscape<"u"&&y(cytoscape),c.exports=y},function(c,d){c.exports=u}])})})(WD);var YQ=WD.exports;const FQ=kv(YQ);function id(a){var r=-1,u=a==null?0:a.length;for(this.clear();++r<u;){var c=a[r];this.set(c[0],c[1])}}function qQ(){this.size=0,this.__data__={hash:new Hash,map:new(Map||ListCache),string:new Hash}}function VQ(a){var r=getMapData(this,a).delete(a);return this.size-=r?1:0,r}function WQ(a){return getMapData(this,a).get(a)}function UQ(a){return getMapData(this,a).has(a)}function KQ(a,r){var u=getMapData(this,a),c=u.size;return u.set(a,r),this.size+=u.size==c?0:1,this}id.prototype.clear=qQ,id.prototype.delete=VQ,id.prototype.get=WQ,id.prototype.has=UQ,id.prototype.set=KQ;const ZQ="Expected a function";function kS(a,r){if(typeof a!="function"||r!=null&&typeof r!="function")throw new TypeError(ZQ);var u=function(){var c=arguments,d=r?r.apply(this,c):c[0],g=u.cache;if(g.has(d))return g.get(d);var b=a.apply(this,c);return u.cache=g.set(d,b)||g,b};return u.cache=new(kS.Cache||id),u}kS.Cache=id;const KD=function(){var a="Expected a function",r=Math.max,u=Date.now,c=u||function(){return new Date().getTime()};function d(b,y,k){var E,C,T,P,N,D,H,_=0,B=!1,$=!0;if(typeof b!="function")throw new TypeError(a);if(y=y<0?0:+y||0,k===!0){var F=!0;$=!1}else g(k)&&(F=!!k.leading,B="maxWait"in k&&r(+k.maxWait||0,y),$="trailing"in k?!!k.trailing:$);function W(){D&&clearTimeout(D),C&&clearTimeout(C),_=0,C=D=H=void 0}function Q(Z,ae){ae&&clearTimeout(ae),C=D=H=void 0,Z&&(_=c(),T=b.apply(N,E),!D&&!C&&(E=N=void 0))}function X(){var Z=y-(c()-P);Z<=0||Z>y?Q(H,C):D=setTimeout(X,Z)}function K(){Q($,D)}function ee(){if(E=arguments,P=c(),N=this,H=$&&(D||!F),B===!1)var Z=F&&!D;else{!C&&!F&&(_=P);var ae=B-(P-_),oe=ae<=0||ae>B;oe?(C&&(C=clearTimeout(C)),_=P,T=b.apply(N,E)):C||(C=setTimeout(K,ae))}return oe&&D?D=clearTimeout(D):!D&&y!==B&&(D=setTimeout(X,y)),Z&&(oe=!0,T=b.apply(N,E)),oe&&!D&&!C&&(E=N=void 0),T}return ee.cancel=W,ee}function g(b){var y=typeof b;return!!b&&(y==="object"||y==="function")}return d}(),XQ=function(a,r,u){var c=!0,d=!0;return u===!1?c=!1:typeof u==typeof{}&&(c="leading"in u?u.leading:c,d="trailing"in u?u.trailing:d),u=u||{},u.leading=c,u.maxWait=r,u.trailing=d,KD(a,r,u)},ZD={},QQ=Object.getPrototypeOf,JQ=ZD.toString,ES=ZD.hasOwnProperty,XD=ES.toString,eJ=XD.call(Object),QD=function(r){return typeof r=="function"&&typeof r.nodeType!="number"},tJ=(a,r,u)=>((a<<16)+(r<<8)+u).toString(16).padStart(6,"0"),nJ=document.querySelectorAll.bind(document);function SS(a){let r,u;return!a||JQ.call(a)!=="[object Object]"?!1:(r=QQ(a),r?(u=ES.call(r,"constructor")&&r.constructor,typeof u=="function"&&XD.call(u)===eJ):!0)}function JD(){let a,r,u,c,d,g,b=arguments[0]||{},y=1,k=arguments.length,E=!1;for(typeof b=="boolean"&&(E=b,b=arguments[y]||{},y++),typeof b!="object"&&!QD(b)&&(b={}),y===k&&(b=this,y--);y<k;y++)if((a=arguments[y])!=null)for(r in a)u=b[r],c=a[r],b!==c&&(E&&c&&(SS(c)||(d=Array.isArray(c)))?(d?(d=!1,g=u&&Array.isArray(u)?u:[]):g=u&&SS(u)?u:{},b[r]=JD(E,g,c)):c!==void 0&&(b[r]=c));return b}function rJ(a){return document.getElementById(a)}function iJ(a,r,u){const c=function(){u(),a.removeEventListener(r,c)};a.addEventListener(r,c)}function aJ(a){if(a&&a.nodeType===1&&window.Node&&a instanceof Node)return!0}function oJ(a,r){if(typeof r=="string"){var u=a.ownerDocument.defaultView;return u.getComputedStyle(a,null)[r]}else if(typeof r=="object")for(var c in r)a.style[c]=r[c]}function sJ(a,r){a.classList.add(r)}function uJ(a,r){a.classList.remove(r)}function cJ(a,r){return a.classList.contains(r)}function lJ(a){const r=a.getBoundingClientRect();return{top:r.top+window.pageYOffset-document.documentElement.clientTop,left:r.left+window.pageXOffset-document.documentElement.clientLeft}}function fJ(){function a(){return Math.floor((1+Math.random())*65536).toString(16).substring(1)}return a()+a()+"-"+a()+"-"+a()+"-"+a()+"-"+a()+a()+a()}const xr={hasOwn:ES,isFunction:QD,query:nJ,isPlainObject:SS,extend:JD,css:oJ,addClass:sJ,removeClass:uJ,hasClass:cJ,offset:lJ,once:iJ,$:rJ,isNode:aJ,debounce:KD,throttle:XQ,RGBToHex:tJ,memoize:kS,guid:fJ};class hJ{constructor(){this.events={}}on(r,u,c,...d){typeof this.events[r]>"u"&&(this.events[r]=[]),this.events[r].push({scope:c,callback:u,args:d})}off(r,u,c){if(typeof this.events[r]>"u")return;const d=g=>g.scope!==c||g.callback!==u;this.events[r]=this.events[r].filter(d)}has(r,u,c){if(typeof this.events[r]>"u")return!1;let d=this.events[r].length;if(u===void 0&&c===void 0)return d>0;const g=b=>{const y=c?b.scope===c:!0,k=b.callback===u;if(y&&k)return!0};return this.events[r].some(g)}emit(r,u,...c){if(typeof this.events[r]>"u")return;let d={type:r,target:u};const g=this.events[r].slice();for(const b of g)b&&b.callback&&b.callback.apply(b.scope,[d,...c,...b.args])}debug(){let r="";for(const[u,c]of Object.entries(this.events))for(const d of c){let g=d.scope&&d.scope.constructor.name||"Anonymous";r+=`${g} listening for "${u}"
-`}return r}}class dJ{constructor(r,u){this.cy=r;let c={stackOrder:-1,gridSpacing:35,strokeStyle:"#eeeeee",lineWidth:1,lineDash:[5,8],zoomDash:!0,panGrid:!0,snapToGrid:!0,drawGrid:!0};this._options=xr.extend(!0,{},c,u),this._init(),this._initEvents()}_init(){this._container=this.cy.container(),this.canvas=document.createElement("canvas"),this.ctx=this.canvas.getContext("2d"),this._container.append(this.canvas)}_initEvents(){window.addEventListener("resize",()=>this._resizeCanvas()),this.cy.ready(()=>{this._resizeCanvas(),this._options.snapToGrid&&this.snapAll(),this.cy.on("zoom",()=>this._drawGrid()),this.cy.on("pan",()=>this._drawGrid()),this.cy.on("free",r=>this._nodeFreed(r)),this.cy.on("add",r=>this._nodeAdded(r))})}_resizeCanvas(){let r=this._container.getBoundingClientRect();this.canvas.height=r.height,this.canvas.width=r.width,this.canvas.style.position="absolute",this.canvas.style.top=0,this.canvas.style.left=0,this.canvas.style.zIndex=this._options.stackOrder,setTimeout(()=>{let u=xr.offset(this.canvas),c=xr.offset(this._container);this.canvas.style.top=-(u.top-c.top),this.canvas.style.left=-(u.left-c.left),this._drawGrid()},0)}_drawGrid(){if(this.clear(),!this._options.drawGrid)return;let r=this.cy.zoom(),u=this._container.getBoundingClientRect(),c=u.width,d=u.height,g=this._options.gridSpacing*r,b=this.cy.pan(),y=b.x%g,k=b.y%g;if(this.ctx.strokeStyle=this._options.strokeStyle,this.ctx.lineWidth=this._options.lineWidth,this._options.zoomDash){let E=this._options.lineDash.slice();for(let C=0;C<E.length;C++)E[C]=this._options.lineDash[C]*r;this.ctx.setLineDash(E)}else this.ctx.setLineDash(this._options.lineDash);this._options.panGrid?this.ctx.lineDashOffset=-b.y:this.ctx.lineDashOffset=0;for(let E=y;E<c;E+=g)this.ctx.beginPath(),this.ctx.moveTo(E,0),this.ctx.lineTo(E,d),this.ctx.stroke();this._options.panGrid?this.ctx.lineDashOffset=-b.x:this.ctx.lineDashOffset=0;for(let E=k;E<d;E+=g)this.ctx.beginPath(),this.ctx.moveTo(0,E),this.ctx.lineTo(c,E),this.ctx.stroke()}_nodeFreed(r){this._options.snapToGrid&&this.snapNode(r.target)}_nodeAdded(r){this._options.snapToGrid&&this.snapNode(r.target)}snapNode(r){let u=r.position(),c=Math.floor(u.x/this._options.gridSpacing),d=Math.floor(u.y/this._options.gridSpacing);r.position({x:(c+.5)*this._options.gridSpacing,y:(d+.5)*this._options.gridSpacing})}snapAll(){this.cy.nodes().each(r=>{this.snapNode(r)})}refresh(){this._resizeCanvas()}snapOn(){this._options.snapToGrid=!0,this.snapAll(),this.cy.trigger("cyeditor.snapgridon")}snapOff(){this._options.snapToGrid=!1,this.cy.trigger("cyeditor.snapgridoff")}gridOn(){this._options.drawGrid=!0,this._drawGrid(),this.cy.trigger("cyeditor.gridon")}gridOff(){this._options.drawGrid=!1,this._drawGrid(),this.cy.trigger("cyeditor.gridoff")}clear(){let r=this._container.getBoundingClientRect(),u=r.width,c=r.height;this.ctx.clearRect(0,0,u,c)}}const e9=a=>{a&&a("core","snapToGrid",function(r){return new dJ(this,r)})};let vJ={container:!1,viewLiveFramerate:0,dblClickDelay:200,removeCustomContainer:!0,rerenderDelay:500};class gJ{constructor(r,u){this.cy=r,this._options=xr.extend({},vJ,u),this._init(r,u)}_init(){this._cyListeners=[],this._contianer=this.cy.container(),this.boundingBox=this.bb();let r=this._contianer.getBoundingClientRect();this.width=r.width,this.height=r.height,this._initPanel(),this._initThumbnail(),this._initView(),this._initOverlay()}_addCyListener(r,u){this._cyListeners.push({events:r,handler:u}),this.cy.on(r,u)}_removeCyListeners(){let r=this.cy;this._cyListeners.forEach(function(u){r.off(u.events,u.handler)}),r.offRender(this._onRenderHandler)}_initPanel(){let r=this._options;if(r.container){if(typeof r.container=="string"?this.$panel=xr.query(r.container)[0]:xr.isNode(r.container)&&(this.$panel=r.container),!this.$panel){console.error("There is no any element matching your container");return}}else this.$panel=document.createElement("div"),document.body.appendChild(this.$panel);this.$panel.classList.add("cytoscape-navigator"),this._setupPanel(),this._addCyListener("resize",this.resize.bind(this))}_setupPanel(){let r=this.$panel.getBoundingClientRect();this.panelWidth=r.width,this.panelHeight=r.height}_initThumbnail(){this.$thumbnail=document.createElement("img"),this.$panel.appendChild(this.$thumbnail),this._setupThumbnailSizes(),this._updateThumbnailImage()}_setupThumbnailSizes(){this.boundingBox=this.bb(),this.thumbnailZoom=Math.min(this.panelHeight/this.boundingBox.h,this.panelWidth/this.boundingBox.w),this.thumbnailPan={x:(this.panelWidth-this.thumbnailZoom*(this.boundingBox.x1+this.boundingBox.x2))/2,y:(this.panelHeight-this.thumbnailZoom*(this.boundingBox.y1+this.boundingBox.y2))/2}}_checkThumbnailSizesAndUpdate(){let r=this.thumbnailZoom,u=this.thumbnailPan.x,c=this.thumbnailPan.y;this._setupThumbnailSizes(),this._updateThumbnailImage(),(r!==this.thumbnailZoom||u!==this.thumbnailPan.x||c!==this.thumbnailPan.y)&&this._setupView()}_initView(){this.$view=document.createElement("div"),this.$view.className="cytoscape-navigatorView",this.$panel.appendChild(this.$view);let r=window.getComputedStyle(this.$view);this.viewBorderTop=parseInt(r["border-top-width"],10),this.viewBorderRight=parseInt(r["border-right-width"],10),this.viewBorderBottom=parseInt(r["border-bottom-width"],10),this.viewBorderLeft=parseInt(r["border-left-width"],10),this.viewBorderHorizontal=this.viewBorderLeft+this.viewBorderRight,this.viewBorderVertical=this.viewBorderTop+this.viewBorderBottom,this._setupView(),this._addCyListener("zoom pan",this._setupView.bind(this))}_setupView(){if(this.viewLocked)return;let r=this.cy.zoom(),u=this.cy.pan();this.viewW=this.width/r*this.thumbnailZoom,this.viewX=-u.x*this.viewW/this.width+this.thumbnailPan.x-this.viewBorderLeft,this.viewH=this.height/r*this.thumbnailZoom,this.viewY=-u.y*this.viewH/this.height+this.thumbnailPan.y-this.viewBorderTop,this.$view.style.width=this.viewW+"px",this.$view.style.height=this.viewH+"px",this.$view.style.position="absolute",this.$view.style.left=this.viewX+"px",this.$view.style.top=this.viewY+"px"}_initOverlay(){this.$overlay=document.createElement("div"),this.$overlay.className="cytoscape-navigatorOverlay",this.$panel.appendChild(this.$overlay),this.overlayHookPointX=0,this.overlayHookPointY=0,this._initEventsHandling()}_initEventsHandling(){let r=["mousedown","mousewheel","DOMMouseScroll","touchstart"],u=["mouseup","mouseout","mousemove","touchmove","touchend"],c=g=>{let b=xr.extend({},g);if(b.type==="touchstart"&&(b.offsetX=this.viewX+this.viewW/2,b.offsetY=this.viewY+this.viewH/2),b.offsetX===void 0||b.offsetY===void 0){let y=xr.offset(b.target);b.offsetX=b.pageX-y.left,b.offsetY=b.pageY-y.top}return b.type==="mousedown"||b.type==="touchstart"?this._eventMoveStart(b):(b.type==="mousewheel"||b.type==="DOMMouseScroll")&&this._eventZoom(b),g.preventDefault(),!1},d=g=>{let b=xr.extend({},g);if(this.overlayInMovement){if(b.type==="touchend"?(b.offsetX=this.viewX+this.viewW/2,b.offsetY=this.viewY+this.viewH/2):b.type==="touchmove"&&(b.pageX=b.touches[0].pageX,b.pageY=b.touches[0].pageY),b.target&&(b.offsetX===void 0||b.offsetY===void 0)){let y=xr.offset(b.target);b.offsetX=b.pageX-y.left,b.offsetY=b.pageY-y.top}if(b.target&&b.target!==this.$overlay){let y=xr.offset(b.target),k=xr.offset(this.$overlay);if(y&&k)b.offsetX=b.offsetX-k.left+y.left,b.offsetY=b.offsetY-k.top+y.top;else return!1}return b.type==="mousemove"||b.type==="touchmove"?this._eventMove(b):(b.type==="mouseup"||b.type==="touchend")&&this._eventMoveEnd(b),g.preventDefault(),!1}};r.forEach(g=>{this.$overlay.addEventListener(g,c)}),u.forEach(g=>{window.addEventListener(g,d)}),this._removeEventsHandling=()=>{u.forEach(g=>{window.removeEventListener(g,d)}),r.forEach(g=>{this.$overlay.addEventListener(g,c)})}}_eventMoveStart(r){let u=new Date().getTime();this.overlayLastMoveStartTime&&this.overlayLastMoveStartTime+this._options.dblClickDelay>u?(this.overlayLastMoveStartTime=0,this.overlayInMovement=!0,this.overlayHookPointX=this.viewW/2,this.overlayHookPointY=this.viewH/2,this._options.viewLiveFramerate!==!1?this._eventMove({offsetX:this.panelWidth/2,offsetY:this.panelHeight/2}):this._eventMoveEnd({offsetX:this.panelWidth/2,offsetY:this.panelHeight/2}),this.cy.reset(),this.overlayInMovement=!1):(this.overlayLastMoveStartTime=u,this.overlayInMovement=!0,this.viewLocked=!0,r.offsetX>=this.viewX&&r.offsetX<=this.viewX+this.viewW&&r.offsetY>=this.viewY&&r.offsetY<=this.viewY+this.viewH?(this.overlayHookPointX=r.offsetX-this.viewX,this.overlayHookPointY=r.offsetY-this.viewY):(this.overlayHookPointX=this.viewW/2,this.overlayHookPointY=this.viewH/2,this._eventMove(r)))}_eventMove(r){this._checkMousePosition(r),this.overlayInMovement&&(this.viewX=r.offsetX-this.overlayHookPointX,this.viewY=r.offsetY-this.overlayHookPointY,this.$view.style.left=this.viewX+"px",this.$view.style.top=this.viewY+"px",this._options.viewLiveFramerate!==!1&&(this._options.viewLiveFramerate===0?this._moveCy():this.overlayTimeout||(this.overlayTimeout=setTimeout(()=>{this._moveCy(),this.overlayTimeout=!1},1e3/this._options.viewLiveFramerate))))}_checkMousePosition(r){r.offsetX>this.viewX&&r.offsetX<this.viewX+this.viewBorderHorizontal+this.viewW&&r.offsetY>this.viewY&&r.offsetY<this.viewY+this.viewBorderVertical+this.viewH?this.$panel.classList.add("mouseover-view"):this.$panel.classList.remove("mouseover-view")}_eventMoveEnd(r){this.viewLocked=!1,this.$panel.classList.remove("mouseover-view"),this.overlayInMovement&&(this._eventMove(r),this._options.viewLiveFramerate===!1&&this._moveCy(),this.overlayInMovement=!1)}_eventZoom(r){let u=Math.pow(10,r.wheelDeltaY/1e3||r.wheelDelta/1e3||r.detail/-32),c={left:r.offsetX,top:r.offsetY};this.cy.zoomingEnabled()&&this._zoomCy(u,c)}_updateThumbnailImage(){if(this._thumbnailUpdating)return;this._thumbnailUpdating=!0;let r=()=>{this._checkThumbnailSizesAndUpdate(),this._setupView();let u=this.$thumbnail;if(!u)return;let c=this.panelWidth,d=this.panelHeight,g=this.boundingBox,b=Math.min(c/g.w,d/g.h),y={x:(c-b*g.w)/2,y:(d-b*g.h)/2},k=this.cy.png({full:!0,scale:b});k.indexOf("image/png")<0?u.removeAttribute("src"):u.setAttribute("src",k),u.style.position="absolute",u.style.left=y.x+"px",u.style.top=y.y+"px"};this._onRenderHandler=xr.throttle(r,this._options.rerenderDelay),this.cy.onRender(this._onRenderHandler)}_moveCy(){this.cy.pan({x:-(this.viewX+this.viewBorderLeft-this.thumbnailPan.x)*this.width/this.viewW,y:-(this.viewY+this.viewBorderLeft-this.thumbnailPan.y)*this.height/this.viewH})}_zoomCy(r){let u={x:this.width/2,y:this.height/2};this.cy.zoom({level:this.cy.zoom()*r,renderedPosition:u})}destroy(){if(this._removeCyListeners(),this._removeEventsHandling(),this._options.container&&!this._options.removeCustomContainer){let r=this.$panel.childNodes;for(let u=r.length-1;u>=0;u--)this.$panel.removeChild(r[u])}else this.$panel.parentNode.removeChild(this.$panel)}resize(){let r=this._contianer.getBoundingClientRect();this.width=r.width,this.height=r.height,this._setupPanel(),this._checkThumbnailSizesAndUpdate(),this._setupView()}bb(){let r=this.cy.elements().boundingBox();return r.w===0||r.h===0?{x1:0,x2:1/0,y1:0,y2:1/0,w:1/0,h:1/0}:r}}const bJ=a=>{a&&a("core","navigator",function(r){return new gJ(this,r)})},pJ={preview:!0,hoverDelay:150,handleNodes:"node",snap:!1,snapThreshold:50,snapFrequency:15,noEdgeEventsInDraw:!1,disableBrowserGestures:!0,handlePosition:function(a){return"middle top"},handleInDrawMode:!1,edgeType:function(a,r){return"flat"},loopAllowed:function(a){return!1},nodeLoopOffset:-50,nodeParams:function(a,r){return{}},edgeParams:function(a,r,u){return{}},ghostEdgeParams:function(){return{}},show:function(a){},hide:function(a){},start:function(a){},complete:function(a,r,u){},stop:function(a){},cancel:function(a,r){},hoverover:function(a,r){},hoverout:function(a,r){},previewon:function(a,r,u){},previewoff:function(a,r,u){},drawon:function(){},drawoff:function(){}};function wJ(){if(this.saveGestureState(),this.cy.zoomingEnabled(!1).panningEnabled(!1).boxSelectionEnabled(!1),this.options.disableBrowserGestures){let a=this.windowListenerOptions;window.addEventListener("touchstart",this.preventDefault,a),window.addEventListener("touchmove",this.preventDefault,a),window.addEventListener("wheel",this.preventDefault,a)}return this}function mJ(){if(this.cy.zoomingEnabled(this.lastZoomingEnabled).panningEnabled(this.lastPanningEnabled).boxSelectionEnabled(this.lastBoxSelectionEnabled),this.options.disableBrowserGestures){let a=this.windowListenerOptions;window.removeEventListener("touchstart",this.preventDefault,a),window.removeEventListener("touchmove",this.preventDefault,a),window.removeEventListener("wheel",this.preventDefault,a)}return this}function yJ(){let{cy:a}=this;return this.lastPanningEnabled=a.panningEnabled(),this.lastZoomingEnabled=a.zoomingEnabled(),this.lastBoxSelectionEnabled=a.boxSelectionEnabled(),this}const kJ={disableGestures:wJ,resetGestures:mJ,saveGestureState:yJ};function EJ(){let{cy:a,options:r}=this;return this.addListener(a,"drag",()=>{this.grabbingNode=!0}),this.addListener(a,"free",()=>{this.grabbingNode=!1}),this.addListener(a,"mouseover","node",u=>{this.show(u.target)}),this.addListener(a,"tap","node",u=>{let c=u.target;c.same(this.handleNode)||this.show(c)}),this.addListener(a,"position","node",u=>{u.target.same(this.sourceNode)&&this.hide()}),this.addListener(a,"tapstart","node",u=>{let c=u.target;c.same(this.handleNode)?this.start(this.sourceNode):this.drawMode?this.start(c):c.same(this.sourceNode)&&this.hide()}),this.addListener(a,"tapdrag",u=>{this.update(u.position)}),this.addListener(a,"tapdragover","node",u=>{this.preview(u.target)}),this.addListener(a,"tapdragout","node",u=>{r.snap&&u.target.same(this.targetNode)||this.unpreview(u.target)}),this.addListener(a,"tapend",()=>{this.stop()}),this.addListener(a,"remove",u=>{u.target.same(this.sourceNode)&&this.hide()}),this}const SJ={addCytoscapeListeners:EJ},CJ=a=>typeof a=="string";function cm(a,r,u){let c={};return Object.assign(c,r,a),Object.assign(c.data,r.data,a.data),CJ(r.classes)?c.classes=r.classes+" "+u:Array.isArray(r.classes)?c.classes=r.classes.join(" ")+" "+u:c.classes=u,c}function xJ(a=!1){let{cy:r,options:u,presumptiveTargets:c,previewEles:d,active:g}=this,b=this.sourceNode,y=this.targetNode,k=a?"eh-preview":"",E=r.collection(),C=u.edgeType(b,y);if(!g||!C||a&&!u.preview)return;if(!y||y.size()===0){d.remove(),this.emit("cancel",this.mp(),b,c);return}if(!a&&u.preview){d.removeClass("eh-preview").style("events",""),this.emit("complete",this.mp(),b,y,d);return}let T=b.position(),P=y.position(),N;if(b.same(y)?N={x:T.x+u.nodeLoopOffset,y:T.y+u.nodeLoopOffset}:N={x:(T.x+P.x)/2,y:(T.y+P.y)/2},C==="node"){let D=r.add(cm({group:"nodes",position:N},u.nodeParams(b,y),k)),H=r.add(cm({group:"edges",data:{source:b.id(),target:D.id()}},u.edgeParams(b,y,0),k)),_=r.add(cm({group:"edges",data:{source:D.id(),target:y.id()}},u.edgeParams(b,y,1),k));E=E.merge(D).merge(H).merge(_)}else{let D=r.add(cm({group:"edges",data:{source:b.id(),target:y.id()}},u.edgeParams(b,y,0),k));E=E.merge(D)}return a?(this.previewEles=E,E.style("events","no")):(E.style("events",""),this.emit("complete",this.mp(),b,y,E)),this}function TJ(){return this.makeEdges(!0),this}function LJ(){return this.previewEles.nonempty()&&this.previewEles.inside()}function PJ(){return this.previewShown()&&this.previewEles.remove(),this}function DJ(){return this.handleNode.nonempty()&&this.handleNode.inside()}function jJ(){return this.handleShown()&&this.handleNode.remove(),this}function NJ(a){let{options:r,cy:u}=this,c=typeof r.handlePosition=="string"?()=>r.handlePosition:r.handlePosition,d=a.position(),g=a.outerHeight(),b=a.outerWidth(),y=0,k=0,E=c(a).toLowerCase().split(/\s+/),C=E[0],T=E[1];C==="left"?y=-(b/2):C==="right"&&(y=b/2),T==="top"?k=-(g/2):T==="bottom"&&(k=g/2);let P=this.hx=d.x+y,N=this.hy=d.y+k,D={x:P,y:N};return this.handleShown()?this.handleNode.position(D):u.batch(()=>{this.handleNode=u.add({classes:"eh-handle",position:D,grabbable:!1,selectable:!1}),this.handleNode.style("z-index",9007199254740991)}),this}function IJ(){let{sourceNode:a,ghostNode:r,cy:u,mx:c,my:d,options:g}=this,b=c,y=d,k,E;if(a)return(!r||r.length===0||r.removed())&&(E=this.ghostEles=u.collection(),u.batch(()=>{r=this.ghostNode=u.add({group:"nodes",classes:"eh-ghost eh-ghost-node",position:{x:0,y:0}}),r.style({"background-color":"blue",width:1e-4,height:1e-4,opacity:0,events:"no"});let C=g.ghostEdgeParams();k=u.add(Object.assign({},C,{group:"edges",data:Object.assign({},C.data,{source:a.id(),target:r.id()})})),k.addClass("eh-ghost eh-ghost-edge"),k.style({events:"no"})}),E.merge(r).merge(k)),r.position({x:b,y}),this}const MJ={makeEdges:xJ,makePreview:TJ,removePreview:PJ,previewShown:LJ,updateEdge:IJ,handleShown:DJ,setHandleFor:NJ,removeHandle:jJ};function OJ(a){const{options:r,previewEles:u,ghostEles:c,handleNode:d}=this,g=N=>u.anySame(N),b=N=>c.anySame(N),y=N=>N.filter(r.handleNodes).length>0,k=N=>d.same(N),E=N=>g(N)||k(N)||b(N),{enabled:C,active:T,grabbingNode:P}=this;return C&&!T&&!P&&(a==null||!E(a)&&y(a))}function AJ(a){return this.canStartOn(a)&&this.drawMode}function RJ(a){return this.canStartOn(a)&&!this.drawMode}function BJ(a){let{options:r,drawMode:u}=this;if(!(!this.canStartOn(a)||u&&!r.handleInDrawMode))return this.sourceNode=a,this.setHandleFor(a),this.emit("show",this.hp(),this.sourceNode),this}function zJ(){return this.removeHandle(),this.emit("hide",this.hp(),this.sourceNode),this}function HJ(a){this.canStartOn(a)&&(this.active=!0,this.sourceNode=a,this.sourceNode.addClass("eh-source"),this.disableGestures(),this.disableEdgeEvents(),this.emit("start",this.hp(),a))}function _J(a){if(!this.active)return;let r=a;return this.mx=r.x,this.my=r.y,this.updateEdge(),this.throttledSnap(),this}function GJ(){if(!this.active||!this.options.snap)return!1;let a=this.cy,r=this.targetNode,u=this.options.snapThreshold,c=N=>{let H=b(N)+u;return H*H},d=this.mp(),g=(N,D)=>(D.x-N.x)*(D.x-N.x)+(D.y-N.y)*(D.y-N.y),b=N=>(N.outerWidth()+N.outerHeight())/4,y=xr.memoize(N=>g(N.position(),d),N=>N.id()),k=N=>y(N)<=c(N),E=(N,D)=>y(N)-y(D),C=!1,T=a.nodes(k).sort(E),P=!1;r.nonempty()&&!k(r)&&this.unpreview(r);for(let N=0;N<T.length;N++){let D=T[N];if(D.same(r)||this.preview(D,C)){P=!0;break}}return P}function $J(a,r=!0){let{options:u,sourceNode:c,ghostNode:d,ghostEles:g,presumptiveTargets:b,previewEles:y,active:k}=this,E=c,C=a.same(E),T=u.loopAllowed(a),P=a.same(d),N=!u.edgeType(E,a),D=a.same(this.handleNode),H=a.same(this.targetNode);if(!k||D||P||N||H||C&&!T)return!1;this.targetNode.nonempty()&&this.unpreview(this.targetNode),clearTimeout(this.previewTimeout);let _=()=>{this.targetNode=a,b.merge(a),a.addClass("eh-presumptive-target"),a.addClass("eh-target"),this.emit("hoverover",this.mp(),E,a),u.preview&&(a.addClass("eh-preview"),g.addClass("eh-preview-active"),c.addClass("eh-preview-active"),a.addClass("eh-preview-active"),this.makePreview(),this.emit("previewon",this.mp(),E,a,y))};return r&&u.hoverDelay>0?this.previewTimeout=setTimeout(_,u.hoverDelay):_(),!0}function YJ(a){if(!this.active||a.same(this.handleNode))return;let{previewTimeout:r,sourceNode:u,previewEles:c,ghostEles:d,cy:g}=this;clearTimeout(r),this.previewTimeout=null;let b=u;return a.removeClass("eh-preview eh-target eh-presumptive-target eh-preview-active"),d.removeClass("eh-preview-active"),u.removeClass("eh-preview-active"),this.targetNode=g.collection(),this.removePreview(b,a),this.emit("hoverout",this.mp(),b,a),this.emit("previewoff",this.mp(),b,a,c),this}function FJ(){if(!this.active)return;let{sourceNode:a,targetNode:r,ghostEles:u,presumptiveTargets:c}=this;return clearTimeout(this.previewTimeout),a.removeClass("eh-source"),r.removeClass("eh-target eh-preview eh-hover"),c.removeClass("eh-presumptive-target"),this.makeEdges(),this.removeHandle(),u.remove(),this.clearCollections(),this.resetGestures(),this.enableEdgeEvents(),this.active=!1,this.emit("stop",this.mp(),a),this}const qJ={show:BJ,hide:zJ,start:HJ,update:_J,preview:$J,unpreview:YJ,stop:FJ,snap:GJ,canStartOn:OJ,canStartDrawModeOn:AJ,canStartNonDrawModeOn:RJ};function VJ(){return this.addCytoscapeListeners(),this.addListener(this.cy,"destroy",()=>this.destroy()),this}function WJ(){for(let a=this.listeners.length-1;a>=0;a--){let r=this.listeners[a];this.removeListener(r.target,r.event,r.selector,r.callback,r.options)}return this}function t9(a,r,u,c,d){return typeof u!="string"&&(c=u,d=c,u=null),d==null&&(d=!1),{target:a,event:r,selector:u,callback:c,options:d}}function n9(a){return a instanceof Element}function UJ(a,r,u,c,d){let g=t9(a,r,u,c,d);return this.listeners.push(g),n9(g.target)?g.target.addEventListener(g.event,g.callback,g.options):g.selector?g.target.addListener(g.event,g.selector,g.callback,g.options):g.target.addListener(g.event,g.callback,g.options),this}function KJ(a,r,u,c,d){let g=t9(a,r,u,c,d);for(let b=this.listeners.length-1;b>=0;b--){let y=this.listeners[b];if(g.target===y.target&&g.event===y.event&&(g.selector==null||g.selector===y.selector)&&(g.callback==null||g.callback===y.callback)){this.listeners.splice(b,1),n9(g.target)?g.target.removeEventListener(g.event,g.callback,g.options):g.selector?g.target.removeListener(g.event,g.selector,g.callback,g.options):g.target.removeListener(g.event,g.callback,g.options);break}}return this}function ZJ(a,r,...u){let{options:c,cy:d}=this;d.emit({type:`eh${a}`,position:r},u);let g=c[a];return g!=null&&g(...u),this}const XJ={addListener:UJ,addListeners:VJ,removeListener:KJ,removeListeners:WJ,emit:ZJ};class r9{constructor(r,u){this.cy=r,this.listeners=[],this.enabled=!0,this.drawMode=!1,this.active=!1,this.grabbingNode=!1,this.handleNode=r.collection(),this.clearCollections(),this.hx=0,this.hy=0,this.hr=0,this.mx=0,this.my=0,this.options=Object.assign({},pJ,u),this.saveGestureState(),this.addListeners(),this.throttledSnap=xr.throttle(this.snap.bind(this),1e3/u.snapFrequency),this.preventDefault=d=>d.preventDefault();let c=!1;try{let d=Object.defineProperty({},"passive",{get:function(){c=!0}});window.addEventListener("test",null,d)}catch{}c?this.windowListenerOptions={capture:!0,passive:!1}:this.windowListenerOptions=!0}destroy(){this.removeListeners()}setOptions(r){Object.assign(this.options,r)}mp(){return{x:this.mx,y:this.my}}hp(){return{x:this.hx,y:this.hy}}clearCollections(){this.previewEles=this.cy.collection(),this.ghostEles=this.cy.collection(),this.ghostNode=this.cy.collection(),this.sourceNode=this.cy.collection(),this.targetNode=this.cy.collection(),this.presumptiveTargets=this.cy.collection()}enable(){return this.enabled=!0,this.emit("enable"),this}disable(){return this.enabled=!1,this.emit("disable"),this}toggleDrawMode(r){let{cy:u,options:c}=this;return this.drawMode=r??!this.drawMode,this.drawMode?(this.prevUngrabifyState=u.autoungrabify(),u.autoungrabify(!0),!c.handleInDrawMode&&this.handleShown()&&this.hide(),this.emit("drawon")):(u.autoungrabify(this.prevUngrabifyState),this.emit("drawoff")),this}enableDrawMode(){return this.toggleDrawMode(!0)}disableDrawMode(){return this.toggleDrawMode(!1)}disableEdgeEvents(){return this.options.noEdgeEventsInDraw&&this.cy.edges().style("events","no"),this}enableEdgeEvents(){return this.options.noEdgeEventsInDraw&&this.cy.edges().style("events",""),this}}let QJ=r9.prototype,JJ=a=>Object.assign(QJ,a);[kJ,SJ,MJ,qJ,XJ].forEach(JJ);const eee=a=>{a&&a("core","edgehandles",function(r){return new r9(this,r)})},tee={container:!1,addWhenDrop:!0,nodeTypes:[]};class nee{constructor(r,u){this.cy=r,this._options=Object.assign({},tee,u),this._options.nodeTypes.forEach(c=>{c.width=c.width||76,c.height=c.height||76,c.category=c.category||"other"}),!(this._options.nodeTypes.length<1)&&(this._initShapePanel(),this._initShapeItems(),this._initEvents())}_initShapeItems(){let r=this._options.nodeTypes.filter(g=>g.type&&g.image);r.forEach(g=>{g._id=xr.guid()});let u={},c=[];r.forEach(g=>{g.category?u[g.category]?u[g.category].push(g):u[g.category]=[g]:c.push(g)}),c.length&&(u.other=c);let d=Object.keys(u).map(g=>{let b=u[g].map(y=>`<div class="shape-item" draggable="true" data-id="${y._id}"><img src="${y.image}" draggable="false"/><span>${y.name}</span></div>`).join("");return`<div class="category">
-                  <div class="panel-title">${g}</div>
-                  <div class="shapes">${b}</div>
-                </div>`}).join("");this._shapePanel.innerHTML=d}_initEvents(){let r=this.cy.container(),u=c=>{c.preventDefault()};xr.query(".shape-item").forEach(c=>{c.addEventListener("dragstart",d=>{d.dataTransfer.setData("id",d.target.getAttribute("data-id"))})}),r.addEventListener("drop",c=>{let d=c.dataTransfer.getData("id");if(c.target.compareDocumentPosition(r)===10){let b={x:c.offsetX,y:c.offsetY};const y=this._options.nodeTypes.find(k=>k._id===d);y&&this._addNodeToCy(y,b)}}),r.addEventListener("dragenter",u),r.addEventListener("dragover",u)}_addNodeToCy({type:r,width:u,height:c,bg:d,name:g="",points:b,image:y},k){let E={type:r,name:g,bg:d,width:u,height:c};E.image=y;let C={group:"nodes",data:E,position:k};b&&(C.data.points=b),this._options.addWhenDrop&&this.cy.trigger("cyeditor.addnode",C)}_initShapePanel(){let{_options:r}=this;r.container?(typeof r.container=="string"?this._shapePanel=xr.query(r.container)[0]:xr.isNode(r.container)&&(this._shapePanel=r.container),this._shapePanel||console.error("There is no any element matching your container")):(this._shapePanel=document.createElement("div"),document.body.appendChild(this._shapePanel))}}const ree=a=>{a&&a("core","dragAddNodes",function(r){return new nee(this,r)})},iee={menus:[{id:"remove",content:"remove",disabled:!1,divider:!0},{id:"hide",content:"hide",disabled:!1}],beforeShow:()=>!0,beforeClose:()=>!0};class aee{constructor(r,u){this.cy=r,this._options=Object.assign({},iee,u),this._listeners={},this._init()}_init(){this._initContainer(),this._initDom(),this._initEvents()}_initContainer(){this._container=this.cy.container(),this.ctxmenu=document.createElement("div"),this.ctxmenu.className="cy-editor-ctx-menu",this._container.append(this.ctxmenu)}_initDom(){let r="";this._options.menus.forEach(u=>{r+=`<div class="ctx-menu-item ${u.disabled?"ctx-menu-item-disabled":""}" data-menu-item="${u.id}">${u.content}</div>`}),this.ctxmenu.innerHTML=r}_initEvents(){this._listeners.eventCyTap=r=>{let u=r.renderedPosition||r.cyRenderedPosition,c=u.x,d=u.y;xr.css(this.ctxmenu,{top:d+"px",left:c+"px"}),this.show(r)},this._listeners.eventTapstart=r=>{this.close(r)},this._listeners.click=r=>{const u=r.target.getAttribute("data-menu-item"),c=this._options.menus.find(d=>d.id===u);this.cy.trigger("cyeditor.ctxmenu",c)},this.ctxmenu.addEventListener("mousedown",this._listeners.click),this.cy.on("cxttap",this._listeners.eventCyTap),this.cy.on("tapstart",this._listeners.eventTapstart)}disable(r,u=!0){xr.query(`.cy-editor-ctx-menu [data-menu-item=${r}]`).forEach(d=>{u?xr.addClass(d,"ctx-menu-item-disabled"):xr.removeClass(d,"ctx-menu-item-disabled")})}changeMenus(r){this._options.menus=r,this._initDom()}show(r){if(typeof this._options.beforeShow=="function"&&!this.isShow){const u=this._options.beforeShow(r,this._options.menus.slice(0));if(!u)return;if(u&&u.then){u.then(c=>{c&&(xr.css(this.ctxmenu,{display:"block"}),this.isShow=!0)});return}Array.isArray(u)&&this.changeMenus(u),xr.css(this.ctxmenu,{display:"block"}),this.isShow=!0}}close(r){if(typeof this._options.beforeShow=="function"&&this.isShow){const u=this._options.beforeClose(r);u===!0?(xr.css(this.ctxmenu,{display:"none"}),this.isShow=!1):u.then&&u.then(()=>{xr.css(this.ctxmenu,{display:"none"}),this.isShow=!1})}}destroyCxtMenu(){this.ctxmenu.removeEventListener("mousedown",this._listeners.click),this.cy.off("tapstart",this._listeners.eventTapstart),this.cy.off("cxttap",this._listeners.eventCyTap)}}const oee=a=>{a&&a("core","contextMenu",function(r){return new aee(this,r)})};class see{constructor(r,u={}){this._cy=r,this._params=u,this._node_dom={};let c=r.container();if(u.dom_container)this._nodes_dom_container=u.dom_container;else{let d=document.createElement("div");d.style.position="absolute",d.style.zIndex=10,c.querySelector("canvas").parentNode.appendChild(d),this._nodes_dom_container=d}this._resize_observer=new ResizeObserver(d=>{for(let g of d){let b=g.target,y=b.__cy_id;r.getElementById(y).style({width:b.offsetWidth,height:b.offsetHeight,shape:"rectangle"})}}),r.on("add","node",d=>{this._add_node(d.target)});for(let d of r.nodes())this._add_node(d);r.on("pan zoom",d=>{let g=r.pan(),b=r.zoom(),y="translate("+g.x+"px,"+g.y+"px) scale("+b+")";this._nodes_dom_container.style.msTransform=y,this._nodes_dom_container.style.transform=y}),r.on("position bounds","node",d=>{let g=d.target,b=g.id();if(!this._node_dom[b])return;let y=this._node_dom[b],k=`translate(-50%, -50%) translate(${g.position("x").toFixed(2)}px, ${g.position("y").toFixed(2)}px)`;y.style.webkitTransform=k,y.style.msTransform=k,y.style.transform=k,y.style.display="inline",y.style.position="absolute",y.style["z-index"]=10})}_add_node(r){let u=r.data();u.dom&&(this._nodes_dom_container.appendChild(u.dom),u.dom.__cy_id=r.id(),this._node_dom[r.id()]=u.dom,this._resize_observer.observe(u.dom))}node_dom(r){return this._node_dom[r]}}const uee=a=>{a&&a("core","domNode",function(r,u){return new see(this,r,u)})},cee=[{selector:".eh-handle",style:{"background-color":"red",width:12,height:12,shape:"ellipse","overlay-opacity":0,"border-width":12,"border-opacity":0,"background-opacity":.5}},{selector:".eh-hover",style:{"background-color":"red","background-opacity":.5}},{selector:".eh-source",style:{"border-width":2,"border-color":"red"}},{selector:".eh-target",style:{"border-width":2,"border-color":"red"}},{selector:".eh-preview, .eh-ghost-edge",style:{"background-color":"red","line-color":"red","target-arrow-color":"red","source-arrow-color":"red"}},{selector:".eh-ghost-edge.eh-preview-active",style:{opacity:0}}],lee=[{type:"rectangle",image:"data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiBhcmlhLWhpZGRlbj0idHJ1ZSIgcm9sZT0iaW1nIiBjbGFzcz0iaWNvbmlmeSBpY29uaWZ5LS1sb2dvcyIgd2lkdGg9IjMxLjg4IiBoZWlnaHQ9IjMyIiBwcmVzZXJ2ZUFzcGVjdFJhdGlvPSJ4TWlkWU1pZCBtZWV0IiB2aWV3Qm94PSIwIDAgMjU2IDI1NyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJJY29uaWZ5SWQxODEzMDg4ZmUxZmJjMDFmYjQ2NiIgeDE9Ii0uODI4JSIgeDI9IjU3LjYzNiUiIHkxPSI3LjY1MiUiIHkyPSI3OC40MTElIj48c3RvcCBvZmZzZXQ9IjAlIiBzdG9wLWNvbG9yPSIjNDFEMUZGIj48L3N0b3A+PHN0b3Agb2Zmc2V0PSIxMDAlIiBzdG9wLWNvbG9yPSIjQkQzNEZFIj48L3N0b3A+PC9saW5lYXJHcmFkaWVudD48bGluZWFyR3JhZGllbnQgaWQ9Ikljb25pZnlJZDE4MTMwODhmZTFmYmMwMWZiNDY3IiB4MT0iNDMuMzc2JSIgeDI9IjUwLjMxNiUiIHkxPSIyLjI0MiUiIHkyPSI4OS4wMyUiPjxzdG9wIG9mZnNldD0iMCUiIHN0b3AtY29sb3I9IiNGRkVBODMiPjwvc3RvcD48c3RvcCBvZmZzZXQ9IjguMzMzJSIgc3RvcC1jb2xvcj0iI0ZGREQzNSI+PC9zdG9wPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iI0ZGQTgwMCI+PC9zdG9wPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxwYXRoIGZpbGw9InVybCgjSWNvbmlmeUlkMTgxMzA4OGZlMWZiYzAxZmI0NjYpIiBkPSJNMjU1LjE1MyAzNy45MzhMMTM0Ljg5NyAyNTIuOTc2Yy0yLjQ4MyA0LjQ0LTguODYyIDQuNDY2LTExLjM4Mi4wNDhMLjg3NSAzNy45NThjLTIuNzQ2LTQuODE0IDEuMzcxLTEwLjY0NiA2LjgyNy05LjY3bDEyMC4zODUgMjEuNTE3YTYuNTM3IDYuNTM3IDAgMCAwIDIuMzIyLS4wMDRsMTE3Ljg2Ny0yMS40ODNjNS40MzgtLjk5MSA5LjU3NCA0Ljc5NiA2Ljg3NyA5LjYyWiI+PC9wYXRoPjxwYXRoIGZpbGw9InVybCgjSWNvbmlmeUlkMTgxMzA4OGZlMWZiYzAxZmI0NjcpIiBkPSJNMTg1LjQzMi4wNjNMOTYuNDQgMTcuNTAxYTMuMjY4IDMuMjY4IDAgMCAwLTIuNjM0IDMuMDE0bC01LjQ3NCA5Mi40NTZhMy4yNjggMy4yNjggMCAwIDAgMy45OTcgMy4zNzhsMjQuNzc3LTUuNzE4YzIuMzE4LS41MzUgNC40MTMgMS41MDcgMy45MzYgMy44MzhsLTcuMzYxIDM2LjA0N2MtLjQ5NSAyLjQyNiAxLjc4MiA0LjUgNC4xNTEgMy43OGwxNS4zMDQtNC42NDljMi4zNzItLjcyIDQuNjUyIDEuMzYgNC4xNSAzLjc4OGwtMTEuNjk4IDU2LjYyMWMtLjczMiAzLjU0MiAzLjk3OSA1LjQ3MyA1Ljk0MyAyLjQzN2wxLjMxMy0yLjAyOGw3Mi41MTYtMTQ0LjcyYzEuMjE1LTIuNDIzLS44OC01LjE4Ni0zLjU0LTQuNjcybC0yNS41MDUgNC45MjJjLTIuMzk2LjQ2Mi00LjQzNS0xLjc3LTMuNzU5LTQuMTE0bDE2LjY0Ni01Ny43MDVjLjY3Ny0yLjM1LTEuMzctNC41ODMtMy43NjktNC4xMTNaIj48L3BhdGg+PC9zdmc+",bg:"#999",width:150,height:40,name:"矩形",category:"基础形状"}],fee=[{selector:"node[type]",style:{shape:"data(type)",label:"data(type)",height:"data(height)",width:"data(width)","text-valign":"center","text-halign":"center"}},{selector:"node[points]",style:{"shape-polygon-points":"data(points)",label:`polygon
-(custom points)`,"text-wrap":"wrap"}},{selector:"node[name]",style:{content:""}},{selector:"node[image]",style:{"background-opacity":0,"background-fit":"cover","background-image":a=>a.data("image")||{value:""}}},{selector:"node[bg]",style:{"background-opacity":.45,"background-color":"data(bg)","border-width":1,"border-opacity":.8,"border-color":"data(bg)"}},{selector:"node:active",style:{"overlay-color":"#0169D9","overlay-padding":8,"overlay-opacity":.25}},{selector:"node:selected",style:{"overlay-color":"#0169D9","overlay-padding":8,"overlay-opacity":.25}}],CS={cy:{layout:{name:"concentric",fit:!1,concentric:function(a){return 0},minNodeSpacing:100},styleEnabled:!0,style:[...[{selector:"edge",style:{"curve-style":"bezier","target-arrow-shape":"triangle",width:1}},{selector:"edge[lineType]",style:{"curve-style":"data(lineType)"}},{selector:"edge[lineColor]",style:{"target-arrow-shape":"triangle",width:1,"line-color":"data(lineColor)","source-arrow-color":"data(lineColor)","target-arrow-color":"data(lineColor)","mid-source-arrow-color":"data(lineColor)","mid-target-arrow-color":"data(lineColor)"}},{selector:"edge[lineColor]:active",style:{"overlay-color":"#0169D9","overlay-padding":2,"overlay-opacity":.25,"line-color":"data(lineColor)","source-arrow-color":"data(lineColor)","target-arrow-color":"data(lineColor)","mid-source-arrow-color":"data(lineColor)","mid-target-arrow-color":"data(lineColor)"}},{selector:"edge[lineColor]:selected",style:{"overlay-color":"#0169D9","overlay-padding":2,"overlay-opacity":.25,"line-color":"data(lineColor)","source-arrow-color":"data(lineColor)","target-arrow-color":"data(lineColor)","mid-source-arrow-color":"data(lineColor)","mid-target-arrow-color":"data(lineColor)"}}],...fee,...cee],minZoom:.1,maxZoom:10},editor:{container:"",zoomRate:.2,lineType:"bezier",dragAddNodes:!0,snapGrid:!0,contextMenu:!0,navigator:!0,nodeTypes:lee,beforeAdd(a){return!0},afterAdd(a){}}},x1={node:{type:"rectangle",bg:"#999",name:"",width:150,height:40,image:""},edge:{lineColor:"#999"}};_f.use(eee),_f.use(bJ),_f.use(e9),_f.use(ree),_f.use(oee),_f.use(uee),_f.use(FQ);class hee extends hJ{constructor(r=CS){return super(),this._plugins={},this._listeners={},this._initOptions(r),this._initDom(),this._initCy(),this._initPlugin(),this._initEvents(),{editor:this,cy:this.cy}}_initOptions(r={}){this.editorOptions=Object.assign({},CS.editor,r.editor);const{zoomRate:u}=this.editorOptions;this._handleOptonsChange={snapGrid:this._snapGridChange,lineType:this._lineTypeChange},r.editor.nodeTypes&&this.setOption("nodeTypes",r.editor.nodeTypes),(u<=0||u>=1)&&console.error("zoomRate must be float number, greater than 0 and less than 1"),this.cyOptions=Object.assign({},CS.cy,r.cy);const{elements:c}=this.cyOptions;c&&(Array.isArray(c.nodes)&&c.nodes.forEach(d=>{d.data=Object.assign({},x1.node,d.data)}),Array.isArray(c.edges)&&c.edges.forEach(d=>{d.data=Object.assign({},x1.edge,d.data)}))}_initCy(){this.cyOptions.container=xr.query("#cy")[0],this.cy=_f(this.cyOptions),this.cy.domNode()}_initDom(){let{dragAddNodes:r,navigator:u,container:c}=this.editorOptions,d=r?'<div class="left"></div>':"",g=u?'<div class="panel-title">导航器</div><div class="thumb"></div>':"",b="";u&&(b=`<div class="tool-overlay">${g}</div>`);let y=`${d}<div id="cy"></div> ${b}
-`,k;if(c){if(typeof c=="string"?k=xr.query(c)[0]:xr.isNode(c)&&(k=c),k.className="cy-editor-container",k.classList.contains("cy-editor-container")||(k.className=k.className+" cy-editor-container"),!k){console.error("There is no any element matching your container");return}}else k=document.createElement("div"),k.className="cy-editor-container",document.body.appendChild(k);k.innerHTML=y}_initEvents(){const{edgehandles:r}=this._plugins;this._listeners.hoverout=u=>{r&&(r.active=!0,r.stop(u))},this._listeners.select=u=>{this._doAction},this._listeners.addEles=(u,c)=>{if(c.position){let b={pan:this.cy.pan(),zoom:this.cy.zoom()},y=(c.position.x-b.pan.x)/b.zoom,k=(c.position.y-b.pan.y)/b.zoom;c.position={x:y,y:k}}if(!this._hook("beforeAdd",c,!0))return;let d;this.editorOptions.getDomNode&&(d=this.editorOptions.getDomNode(c.data));const g=Object.assign({},x1.node,{data:d?{...c.data,dom:d}:{...c.data},position:c.position});this.cy.add(g),this._hook("afterAdd",c),this.emit("change",c,this)},this.cy.on("click",this._listeners.hoverout).on("select",this._listeners.select).on("cyeditor.addnode",this._listeners.addEles),this.emit("ready")}_initPlugin(){const{dragAddNodes:r,contextMenu:u,snapGrid:c,navigator:d}=this.editorOptions;this._plugins.edgehandles=this.cy.edgehandles({snap:!1,handlePosition(){return"middle middle"},edgeParams:this._edgeParams.bind(this)}),r&&(this._plugins.dragAddNodes=this.cy.dragAddNodes({container:".cy-editor-container .left",nodeTypes:this.editorOptions.nodeTypes})),c&&(this._plugins.cySnapToGrid=this.cy.snapToGrid()),d&&this.cy.navigator({container:".cy-editor-container .thumb"}),u&&(this._plugins.contextMenu=this.cy.contextMenu(u))}_snapGridChange(){this._plugins.cySnapToGrid&&(this.editorOptions.snapGrid?(this._plugins.cySnapToGrid.gridOn(),this._plugins.cySnapToGrid.snapOn()):(this._plugins.cySnapToGrid.gridOff(),this._plugins.cySnapToGrid.snapOff()))}_edgeParams(){return{data:{lineType:this.editorOptions.lineType}}}_lineTypeChange(r){let u=this.cy.$("edge:selected");u.length<1&&(u=this.cy.$("edge")),u.forEach(c=>{c.data({lineType:r})})}_hook(r,u,c=!1){if(typeof this.editorOptions[r]=="function"){const d=this.editorOptions[r](u);return c?d:!0}}doCommand(r,u){switch(u.command){case"gridon":this.toggleGrid();break;case"zoomin":this.zoom(1);break;case"zoomout":this.zoom(-1);break;case"fit":this.fit();break;case"delete":this.deleteSelected();break;case"boxselect":this.cy.userPanningEnabled(!u.selected),this.cy.boxSelectionEnabled(u.selected);break}}setOption(r,u){typeof r=="string"?(this.editorOptions[r]=u,typeof this._handleOptonsChange[r]=="function"&&this._handleOptonsChange[r].call(this,u)):typeof r=="object"&&Object.assign(this.editorOptions,r);let{dragAddNodes:c,navigator:d}=this.editorOptions;c&&this.cy&&(this._plugins.dragAddNodes=this.cy.dragAddNodes({container:".cy-editor-container .left",nodeTypes:this.editorOptions.nodeTypes})),e9&&this.cy&&(this._plugins.cySnapToGrid=this.cy.snapToGrid())}deleteSelected(){let r=this.cy.$(":selected");r.length&&this.cy.remove(r)}async save(){try{let r=await this.cy.png({output:"blob-promise"});if(window.navigator.msSaveBlob)window.navigator.msSaveBlob(r,`chart-${Date.now()}.png`);else{let u=document.createElement("a");u.download=`chart-${Date.now()}.png`,u.href=window.URL.createObjectURL(r),u.click()}}catch(r){console.log(r)}}fit(){this._fit_status?(this.cy.viewport({zoom:this._fit_status.zoom,pan:this._fit_status.pan}),this._fit_status=null):(this._fit_status={pan:this.cy.pan(),zoom:this.cy.zoom()},this.cy.fit())}zoom(r=1,u){u=u||this.editorOptions.zoomRate;let c=this.cy.width(),d=this.cy.height(),g=this.cy.zoom()+u*r,b=this.cy.pan();b.x=b.x+-1*c*u*r/2,b.y=b.y+-1*d*u*r/2,this.cy.viewport({zoom:g,pan:b})}toggleGrid(){this._plugins.cySnapToGrid?this.setOption("snapGrid",!this.editorOptions.snapGrid):console.warn("Can not `toggleGrid`, please check the initialize option")}jpg(r={}){return this.cy.png(r)}png(r){return this.cy.png(r)}json(r=!1,u){u=u||["boxSelectionEnabled","elements","pan","panningEnabled","userPanningEnabled","userZoomingEnabled","zoom","zoomingEnabled"];let c={};if(typeof r=="boolean"){let d=this.cy.json(r);return u.forEach(g=>{c[g]=d[g]}),c}return typeof r=="object"&&(c={},r.elements&&(Array.isArray(r.elements.nodes)&&r.elements.nodes.forEach(d=>{let g;this.editorOptions.getDomNode&&(g=this.editorOptions.getDomNode(d.data)),d.data=Object.assign({},x1.node,{...d.data,dom:g})}),Array.isArray(r.elements.edges)&&r.elements.edges.forEach(d=>{d.data=Object.assign({},x1.edge,d.data)})),u.forEach(d=>{c[d]=r[d]})),this.cy.json(c)}data(r,u){return this.cy.data(r,u)}removeData(r){this.cy.removeData(r)}destroy(){this.cy.removeAllListeners(),this.cy.destroy()}}return hee});
diff --git a/web/packages/cyeditor/index.scss b/web/packages/cyeditor/index.scss
index 2b2302892..7e3666f96 100644
--- a/web/packages/cyeditor/index.scss
+++ b/web/packages/cyeditor/index.scss
@@ -178,6 +178,14 @@
   box-shadow: 0px 4px 8px 0px rgba(2, 16, 31, 0.1);
   display: none;
   padding: 0;
+  .designer-menu-li-icon {
+    display: inline-block;
+    vertical-align: middle;
+    height: 16px;
+    width: 16px;
+    margin-top: -1px;
+    @include font-color($text-color, $dark-text-color);
+  }
 }
 .cy-editor-ctx-menu .ctx-menu-item {
   height: 30px;
diff --git a/web/packages/cyeditor/package.json b/web/packages/cyeditor/package.json
index 0f09d4bef..e9f7722bb 100644
--- a/web/packages/cyeditor/package.json
+++ b/web/packages/cyeditor/package.json
@@ -2,7 +2,7 @@
   "name": "@dataspherestudio/cyeditor",
   "version": "0.0.1",
   "dependencies": {
-    "cytoscape": "^3.7.0",
+    "cytoscape": "3.27.0",
     "cytoscape-klay": "^3.1.4"
   },
   "devDependencies": {},
diff --git a/web/packages/dataGovernance/module/common/tabCard/index.vue b/web/packages/dataGovernance/module/common/tabCard/index.vue
index 64220e6c5..467202e2a 100644
--- a/web/packages/dataGovernance/module/common/tabCard/index.vue
+++ b/web/packages/dataGovernance/module/common/tabCard/index.vue
@@ -210,7 +210,7 @@ export default {
   }
 }
 .content-html {
-  /deep/ span {
+  ::v-deep span {
     color: #3495F7;
   }
 }
diff --git a/web/packages/dataGovernance/view/fieldInfo/index.vue b/web/packages/dataGovernance/view/fieldInfo/index.vue
index 01fb2dbc2..5113732bb 100644
--- a/web/packages/dataGovernance/view/fieldInfo/index.vue
+++ b/web/packages/dataGovernance/view/fieldInfo/index.vue
@@ -303,7 +303,7 @@ export default {
   overflow-y: auto;
   max-height: 200px;
   div {
-    /deep/ span {
+    ::v-deep span {
       font-weight: bold;
       margin-right: 6px;
     }
diff --git a/web/packages/dataService/module/common/navMenu.vue b/web/packages/dataService/module/common/navMenu.vue
index 2fccb3688..8c7bafab9 100644
--- a/web/packages/dataService/module/common/navMenu.vue
+++ b/web/packages/dataService/module/common/navMenu.vue
@@ -166,7 +166,7 @@ export default {
     width: 50px;
     height: 44px;
   }
-  /deep/.ivu-tooltip-inner {
+  ::v-deep.ivu-tooltip-inner {
     background-color: rgba(70, 76, 91, 1);
   }
 }
diff --git a/web/packages/dataService/module/dataManagement/index.vue b/web/packages/dataService/module/dataManagement/index.vue
index 29373538f..c3093e63b 100644
--- a/web/packages/dataService/module/dataManagement/index.vue
+++ b/web/packages/dataService/module/dataManagement/index.vue
@@ -33,12 +33,12 @@ export default {
   height: 100%;
   margin-left: 304px;
   transition: margin-left 0.3s;
-  /deep/ .monitor-chart-modal {
+  ::v-deep .monitor-chart-modal {
     left: 304px;
   }
   &.ds-main-content-fold {
     margin-left: 54px;
-    /deep/ .monitor-chart-modal {
+    ::v-deep .monitor-chart-modal {
       left: 54px;
     }
   }
diff --git a/web/packages/dolphinScheduler/assets/styles/workflow.scss b/web/packages/dolphinScheduler/assets/styles/workflow.scss
index a44e9eed7..213a3fec7 100644
--- a/web/packages/dolphinScheduler/assets/styles/workflow.scss
+++ b/web/packages/dolphinScheduler/assets/styles/workflow.scss
@@ -162,7 +162,7 @@
       position: relative;
       flex: 1;
       .tabs-content {
-        /deep/ .ivu-tabs-tab {
+        ::v-deep .ivu-tabs-tab {
           font-size: $font-size-large;
         }
       }
diff --git a/web/packages/dolphinScheduler/components/tabList/index.scss b/web/packages/dolphinScheduler/components/tabList/index.scss
index 390a5676e..247165b24 100644
--- a/web/packages/dolphinScheduler/components/tabList/index.scss
+++ b/web/packages/dolphinScheduler/components/tabList/index.scss
@@ -36,7 +36,7 @@
         min-width: 320px;
         .ivu-breadcrumb {
           font-size: 21px;
-          /deep/.ivu-breadcrumb-item-separator {
+          ::v-deep.ivu-breadcrumb-item-separator {
             // color: rgba(0,0,0,0.65);
             @include font-color($light-text-color, $dark-text-color);
           }
diff --git a/web/packages/dss/module/footer/guide.vue b/web/packages/dss/module/footer/guide.vue
index be24682a9..776027fc1 100644
--- a/web/packages/dss/module/footer/guide.vue
+++ b/web/packages/dss/module/footer/guide.vue
@@ -450,7 +450,7 @@ export default {
           font-size: 16px;
           @include font-color(#333, $dark-text-color);
         }
-        /deep/.ivu-input {
+        ::v-deep.ivu-input {
           text-indent: 24px;
         }
       }
@@ -580,7 +580,7 @@ export default {
             height: auto;
             opacity: 1;
             transform: translateY(0);
-            /deep/img {
+            ::v-deepimg {
               display: block;
               border: 0;
               max-width: 100%;
diff --git a/web/packages/dss/module/footer/libraryDetail.vue b/web/packages/dss/module/footer/libraryDetail.vue
index 89426df99..2a2025734 100644
--- a/web/packages/dss/module/footer/libraryDetail.vue
+++ b/web/packages/dss/module/footer/libraryDetail.vue
@@ -68,33 +68,33 @@ export default {
   .library-detail-content {
     padding: 0 15px 15px;
     @include font-color(#666, $dark-text-color);
-    /deep/img {
+    ::v-deepimg {
       display: block;
       border: 0;
       max-width: 100%;
       cursor: pointer;
     }
-    /deep/h1 {
+    ::v-deeph1 {
       font-size: 18px;
       margin: 6px 0;
     }
-    /deep/h2 {
+    ::v-deeph2 {
       font-size: 16px;
       margin: 6px 0;
     }
-    /deep/h3 {
+    ::v-deeph3 {
       font-size: 14px;
       margin: 6px 0;
     }
-    /deep/h4 {
+    ::v-deeph4 {
       font-size: 12px;
       margin: 6px 0;
     }
-    /deep/h5 {
+    ::v-deeph5 {
       font-size: 12px;
       margin: 6px 0;
     }
-    p /deep/p {
+    p ::v-deepp {
       margin: 5px;
     }
   }
diff --git a/web/packages/dss/module/header/index.scss b/web/packages/dss/module/header/index.scss
index 1a038e4dd..168402d1c 100644
--- a/web/packages/dss/module/header/index.scss
+++ b/web/packages/dss/module/header/index.scss
@@ -87,7 +87,7 @@
             }
         }
     }
-    /deep/ .ivu-select-dropdown {
+    ::v-deep .ivu-select-dropdown {
         padding: 0;
         margin: 0;
     }
diff --git a/web/packages/dss/vue.config.js b/web/packages/dss/vue.config.js
index 3c7e4b04b..192340e70 100644
--- a/web/packages/dss/vue.config.js
+++ b/web/packages/dss/vue.config.js
@@ -208,7 +208,13 @@ module.exports = {
         lessOptions: {
           javascriptEnabled: true
         }
-      }
+      },
+      scss: {
+        implementation: require('sass'),
+        sassOptions: {
+          fiber: false,
+        },
+      },
     }
   },
   chainWebpack: (config) => {
diff --git a/web/packages/editor/editor.vue b/web/packages/editor/editor.vue
index 36778970f..f76dcbf5f 100644
--- a/web/packages/editor/editor.vue
+++ b/web/packages/editor/editor.vue
@@ -473,7 +473,7 @@ export default {
 
       const action_10 =this.editor.addAction({
         id: 'newdbsuggest',
-        label: this.$t('message.common.monacoMenu.newdbcomplition'),
+        label: this.$t('message.common.monacoMenu.openLanguageServe'),
         keybindings: [],
         keybindingContext: null,
         contextMenuGroupId: 'control',
diff --git a/web/packages/editorLsp/editor.vue b/web/packages/editorLsp/editor.vue
index d83ac2e5f..215b4da33 100644
--- a/web/packages/editorLsp/editor.vue
+++ b/web/packages/editorLsp/editor.vue
@@ -461,7 +461,7 @@ export default {
       });
       const action_10 = this.editor.addAction({
         id: 'newdbsuggest',
-        label: this.$t('message.common.monacoMenu.dbcomplition'),
+        label: this.$t('message.common.monacoMenu.closeLanguageServe'),
         keybindings: [],
         keybindingContext: null,
         contextMenuGroupId: 'control',
diff --git a/web/packages/editorLsp/package.json b/web/packages/editorLsp/package.json
index 5c5691ed3..bfbf8e7db 100644
--- a/web/packages/editorLsp/package.json
+++ b/web/packages/editorLsp/package.json
@@ -3,7 +3,6 @@
   "version": "1.1.19",
   "dependencies": {
     "@dataspherestudio/shared": "^1.1.19",
-    "monaco-languageclient": "0.13.0",
     "reconnecting-websocket": "4.4.0",
     "vscode-ws-jsonrpc": "0.2.0"
   }
diff --git a/web/packages/exts/open-source/scriptis/apiPublish/index.vue b/web/packages/exts/open-source/scriptis/apiPublish/index.vue
index 56d517644..b4bafcc95 100644
--- a/web/packages/exts/open-source/scriptis/apiPublish/index.vue
+++ b/web/packages/exts/open-source/scriptis/apiPublish/index.vue
@@ -566,7 +566,7 @@ export default {
     },
     // 判断是否符合脚本类型
     showScriptsType() {
-      return [ 'spark', 'hive' ].includes(this.script.scriptType)
+      return [ 'spark', 'hive', 'hql' ].includes(this.script.scriptType)
     }
   },
   watch: {
@@ -626,6 +626,7 @@ export default {
     // 获取当前工作空间当前用户的api列表
     getApiList() {
       api.fetch('/dss/apiservice/getUserServices', {
+        type: this.script.application,
         workspaceId: this.$route.query.workspaceId
       }, {
         method: 'get',
diff --git a/web/packages/scriptis/components/importToHive/index.vue b/web/packages/scriptis/components/importToHive/index.vue
index 126645b0e..520eaa2f6 100644
--- a/web/packages/scriptis/components/importToHive/index.vue
+++ b/web/packages/scriptis/components/importToHive/index.vue
@@ -431,6 +431,7 @@ export default {
           { label: this.$t('message.scripts.importToHive.FH'), value: ';' },
           { label: this.$t('message.scripts.importToHive.ZBF'), value: '\\t' },
           { label: this.$t('message.scripts.importToHive.KG'), value: '%20' },
+          { label: this.$t('message.scripts.hiveTableExport.SX'), value: '|' },
         ],
         chartset: [
           { label: 'utf-8', value: 'utf-8' },
diff --git a/web/packages/scriptis/module/hdfsSidebar/hdfsSidebar.vue b/web/packages/scriptis/module/hdfsSidebar/hdfsSidebar.vue
index 352fefce1..f90fa3d98 100644
--- a/web/packages/scriptis/module/hdfsSidebar/hdfsSidebar.vue
+++ b/web/packages/scriptis/module/hdfsSidebar/hdfsSidebar.vue
@@ -709,6 +709,8 @@ export default {
         separator = '%5Ct';
       } else if (option.separator === '%20') {
         separator = ' ';
+      } else if (option.separator === '|') {
+        separator = '%5C%7C';
       }
       const encoding = type ? '' : option.chartset;
       const fieldDelimiter = type ? '' : separator;
@@ -759,7 +761,12 @@ export default {
       if (secondStep.partition && secondStep.partitionValue) {
         isPartition = true;
       }
-      const separator = firstStep.separator === '%20' ? ' ' : firstStep.separator;
+      let separator = firstStep.separator;
+      if (firstStep.separator === '%20') {
+        separator = ' ';
+      } else if (firstStep.separator === '|') {
+        separator = '\\|';
+      }
       if (firstStep.quote) {
         escapeQuotes = true;
         quote = firstStep.quote;
diff --git a/web/packages/scriptis/module/hiveSidebar/hiveTableExport/index.scss b/web/packages/scriptis/module/hiveSidebar/hiveTableExport/index.scss
index b3f6af32f..1d56b5bdc 100644
--- a/web/packages/scriptis/module/hiveSidebar/hiveTableExport/index.scss
+++ b/web/packages/scriptis/module/hiveSidebar/hiveTableExport/index.scss
@@ -14,7 +14,13 @@
  * limitations under the License.
  *
  */
-
+.full-btn {
+    float: right;
+    margin-right: 30px;
+    padding-top: 5px;
+    cursor: pointer;
+    color: #2d8cf0
+};
 .we-table-export-minus {
     float: right;
     font-size: 24px;
@@ -30,7 +36,7 @@
     position: relative;
 
     .we-table-export-step {
-        margin-left: 20px;
+        // margin-left: 20px;
     }
 
     .v-step-progress {
@@ -51,7 +57,8 @@
         overflow-y: auto;
 
         .item-width {
-            width: 360px;
+            width: 96%;
+            // width: 360px;
         }
     }
 }
diff --git a/web/packages/scriptis/module/hiveSidebar/hiveTableExport/index.vue b/web/packages/scriptis/module/hiveSidebar/hiveTableExport/index.vue
index 83ecbe736..0f7c4c162 100644
--- a/web/packages/scriptis/module/hiveSidebar/hiveTableExport/index.vue
+++ b/web/packages/scriptis/module/hiveSidebar/hiveTableExport/index.vue
@@ -1,10 +1,16 @@
 <template>
   <Modal
     v-model="show"
-    :width="width">
-    <p slot="header">
+    :width="width"
+    :fullscreen="modal.isFullScreen"
+  >
+    <div slot="header">
       <span>{{ $t('message.scripts.hiveTableExport.DCB') }}</span>
-    </p>
+      <span @click="fullScreenModal" class="full-btn">
+        <Icon :type="modal.isFullScreen?'md-contract':'md-expand'" />
+        {{modal.isFullScreen?$t('message.scripts.cancelfullscreen'):$t('message.scripts.fullscreen')}}
+      </span>
+    </div>
     <div class="we-table-export">
       <template>
         <Steps
@@ -28,7 +34,9 @@
           :model="stepOne"
           :rules="stepOnerules"
           :label-width="80"
-          class="we-table-export-form" >
+          class="we-table-export-form"
+          :style="modal.isFullScreen ? { height: '790px' } : {}"
+        >
           <FormItem
             :label="$t('message.scripts.hiveTableExport.SJKM')"
             prop="dbName">
@@ -136,6 +144,7 @@
             prop="chartset">
             <Select
               v-model="stepOne.chartset"
+              class="item-width"
               :placeholder="$t('message.scripts.hiveTableExport.XZBMGS')">
               <Option
                 v-for="(item) in libs.chartset"
@@ -148,6 +157,7 @@
             :label="$t('message.scripts.hiveTableExport.KZTH')"
             prop="nullValue">
             <Select
+              class="item-width"
               v-model="stepOne.nullValue">
               <Option
                 v-for="(item, index) in libs.replacementList"
@@ -167,14 +177,16 @@
           :model="stepTwo"
           :rules="stepTworules"
           :label-width="80"
-          class="we-table-export-form">
+          class="we-table-export-form"
+          :style="modal.isFullScreen ? { height: '790px' } : {}"
+        >
           <FormItem
             :label="$t('message.scripts.hiveTableExport.LX')"
             prop="type">
             <Select
               v-model="stepTwo.type"
               :placeholder="$t('message.scripts.hiveTableExport.QXZLX')"
-              style="width: 378px;"
+              class="item-width"
               @on-change="handleTypeChange">
               <Option
                 v-for="(item) in libs.types"
@@ -186,13 +198,16 @@
           <FormItem
             :label="$t('message.scripts.hiveTableExport.DCZ')"
             prop="path">
-            <directory-dialog
-              :tree="tree"
-              :load-data-fn="loadDataFn"
-              :filter-node="filterNode"
-              :path="stepTwo.path"
-              :fs-type="stepTwo.type"
-              @set-node="setNode"/>
+            <div class="item-width">
+              <directory-dialog
+                :tree="tree"
+                :load-data-fn="loadDataFn"
+                :filter-node="filterNode"
+                :path="stepTwo.path"
+                :fs-type="stepTwo.type"
+                :height="modal.isFullScreen ? 500 : 120"
+                @set-node="setNode"/>
+            </div>
           </FormItem>
           <FormItem
             :label="$t('message.scripts.hiveTableExport.WJM')"
@@ -200,7 +215,8 @@
             <Input
               v-model="stepTwo.fileName"
               :placeholder="$t('message.scripts.hiveTableExport.TRDCWJMC')"
-              style="width: 350px;">
+              style="width: 94%"
+            >
             </Input>
             <span>.{{ stepOne.exportType }}</span>
           </FormItem>
@@ -278,6 +294,9 @@ export default {
       }
     };
     return {
+      modal: {
+        isFullScreen: false,
+      },
       show: false,
       stepActive: 0,
       isLoading: false,
@@ -313,6 +332,7 @@ export default {
           { label: this.$t('message.scripts.hiveTableExport.FH'), value: ';' },
           { label: this.$t('message.scripts.hiveTableExport.ZBF'), value: '\\t' },
           { label: this.$t('message.scripts.hiveTableExport.KG'), value: '%20' },
+          { label: this.$t('message.scripts.hiveTableExport.SX'), value: '|' },
         ],
         exportTypes: [
           { label: 'xlsx', value: 'xlsx' },
@@ -399,6 +419,9 @@ export default {
     },
   },
   methods: {
+    fullScreenModal() {
+      this.modal.isFullScreen = !this.modal.isFullScreen
+    },
     async open() {
       if (this.isLoading) {
         this.$Message.warning(this.$t('message.scripts.hiveTableExport.CBDC'));
diff --git a/web/packages/scriptis/module/workSidebar/workSidebar.vue b/web/packages/scriptis/module/workSidebar/workSidebar.vue
index a3e2d9653..a8a4158fb 100644
--- a/web/packages/scriptis/module/workSidebar/workSidebar.vue
+++ b/web/packages/scriptis/module/workSidebar/workSidebar.vue
@@ -172,6 +172,9 @@ import mixin from '@dataspherestudio/shared/common/service/mixin';
 import plugin from '@dataspherestudio/shared/common/util/plugin'
 import module from './index';
 import move from './move';
+import {
+  Notice
+} from 'iview';
 const PREFIX = 'file://';
 export default {
   name: 'WorkSidebar',
@@ -394,8 +397,24 @@ export default {
         this.openToTABAction(node.data);
       }
     },
+    validFileName(input) {
+      var pattern = /^[\u4E00-\u9FA5a-zA-Z0-9_.]+$/;
+      const msg = '当前脚本名称不符合规范（仅支持中文、大小写字母、数字和下划线），可能会影响脚本的执行，请修改脚本名称!';
+      if (!pattern.test(input)) {
+        Notice.error({
+          name: 'validFileName' + input,
+          duration: 6,
+          closable: true,
+          title: this.$t('message.common.errTitle'),
+          desc: msg,
+        });
+      }
+    },
     openToTABAction(node, openCallBack) {
       const openNode = node || this.currentNode.data;
+      if (openNode && openNode.name) {
+        this.validFileName(openNode.name)
+      }
       const path = openNode.path;
       const source = openNode.copy ? this.path : '';
       this.dispatch('Workbench:openFile', {
@@ -1058,6 +1077,8 @@ export default {
         separator = '%5Ct';
       } else if (option.separator === '%20') {
         separator = ' ';
+      } else if (option.separator === '|') {
+        separator = '%5C%7C';
       }
       const encoding = type ? '' : option.chartset;
       const fieldDelimiter = type ? '' : separator;
@@ -1108,7 +1129,12 @@ export default {
       if (secondStep.partition && secondStep.partitionValue) {
         isPartition = true;
       }
-      const separator = firstStep.separator === '%20' ? ' ' : firstStep.separator;
+      let separator = firstStep.separator;
+      if (firstStep.separator === '%20') {
+        separator = ' ';
+      } else if (firstStep.separator === '|') {
+        separator = '\\|';
+      }
       if (firstStep.quote) {
         escapeQuotes = true;
         quote = firstStep.quote;
diff --git a/web/packages/scriptis/module/workbench/container.vue b/web/packages/scriptis/module/workbench/container.vue
index cfbf0789f..6bf80da7f 100644
--- a/web/packages/scriptis/module/workbench/container.vue
+++ b/web/packages/scriptis/module/workbench/container.vue
@@ -266,24 +266,28 @@ export default {
       plugin.clear('copilot_web_listener_queryStructure')
     },
     initListenerCopilotEvent() {
-      plugin.emitHook('get_copilot_web_listener_event_class', 'table').then(eventClass => {
-        const tableEvent = new eventClass({
-          dispatch: this.dispatch,
-          $t: this.$t
-        })
-        plugin.on('copilot_web_listener_viewTableData', ({ tableName }) => {
-          tableEvent.queryTable(tableName)
-        })
-        plugin.on('copilot_web_listener_queryStructure', ({ tableName }) => {
-          const [dbName, fileName] = tableName.split('.')
-          const filenamePath = `${this.$t('message.scripts.hiveTableDesc.tableDetail')}(${fileName})`;
-          tableEvent.describeTable({
-            dbName,
-            fileName,
-            filenamePath
+      try {
+        plugin.emitHook('get_copilot_web_listener_event_class', 'table').then(eventClass => {
+          const tableEvent = new eventClass({
+            dispatch: this.dispatch,
+            $t: this.$t
+          })
+          plugin.on('copilot_web_listener_viewTableData', ({ tableName }) => {
+            tableEvent.queryTable(tableName)
+          })
+          plugin.on('copilot_web_listener_queryStructure', ({ tableName }) => {
+            const [dbName, fileName] = tableName.split('.')
+            const filenamePath = `${this.$t('message.scripts.hiveTableDesc.tableDetail')}(${fileName})`;
+            tableEvent.describeTable({
+              dbName,
+              fileName,
+              filenamePath
+            })
           })
         })
-      })
+      } catch (error) {
+        console.log(error)
+      }
       
     },
     init() {
@@ -1218,7 +1222,7 @@ export default {
 <style lang="scss" scoped>
 @import "@dataspherestudio/shared/common/style/variables.scss";
 .workbench {
-  /deep/.ivu-tabs.ivu-tabs-card {
+  ::v-deep.ivu-tabs.ivu-tabs-card {
     border-top: $border-width-base $border-style-base #dcdee2;
     @include border-color($border-color-base, $dark-border-color-base);
     .ivu-tabs-bar .ivu-tabs-tab {
diff --git a/web/packages/scriptis/module/workbench/createTable/components/importTable.vue b/web/packages/scriptis/module/workbench/createTable/components/importTable.vue
index ab15f34a0..be9f6b24c 100644
--- a/web/packages/scriptis/module/workbench/createTable/components/importTable.vue
+++ b/web/packages/scriptis/module/workbench/createTable/components/importTable.vue
@@ -116,6 +116,8 @@ export default {
         separator = '%5Ct';
       } else if (option.separator === '%20') {
         separator = ' ';
+      } else if (option.separator === '|') {
+        separator = '%5C%7C';
       }
       const encoding = this.source.importType === 'xlsx' ? '' : option.chartset;
       const fieldDelimiter = this.source.importType === 'xlsx' ? '' : separator;
diff --git a/web/packages/scriptis/module/workbench/createTable/components/importTable_csv.vue b/web/packages/scriptis/module/workbench/createTable/components/importTable_csv.vue
index dbf24c7e9..2dee6128c 100644
--- a/web/packages/scriptis/module/workbench/createTable/components/importTable_csv.vue
+++ b/web/packages/scriptis/module/workbench/createTable/components/importTable_csv.vue
@@ -148,6 +148,7 @@ export default {
           { label: `${this.$t('message.scripts.createTable.FH')}(;)`, value: ';' },
           { label: `${this.$t('message.scripts.createTable.ZBF')}(\\t)`, value: '\\t' },
           { label: this.$t('message.scripts.createTable.KG'), value: '%20' },
+          { label: this.$t('message.scripts.hiveTableExport.SX'), value: '|' },
         ],
         chartset: [
           { label: 'utf-8', value: 'utf-8' },
diff --git a/web/packages/scriptis/module/workbench/createTable/index.vue b/web/packages/scriptis/module/workbench/createTable/index.vue
index 887a3af62..ec1d2ff4a 100644
--- a/web/packages/scriptis/module/workbench/createTable/index.vue
+++ b/web/packages/scriptis/module/workbench/createTable/index.vue
@@ -342,16 +342,23 @@ export default {
       if (!isXls) {
         delete source.table.sheet
       }
+      let fieldDelimiter = source.table.separator;
+      if (source.table.separator === '%20') {
+        fieldDelimiter = ' ';
+      } else if (source.table.separator === '|') {
+        fieldDelimiter = '\\|';
+      }
       const sourceP = {
         path,
         pathType: source.table.type,
         hasHeader: source.table.isHasHeader,
         encoding: isXls ? '' : source.table.chartset,
-        fieldDelimiter: isXls ? '' : source.table.separator,
+        fieldDelimiter: isXls ? '' : fieldDelimiter,
         sheet: source.table.sheet &&  source.table.sheet.toString(),
         quote,
         escapeQuotes,
       };
+
       const importInfo = {
         importType: ['hive', 'csv', 'xlsx'].indexOf(source.importType),
         args: isHive ? {
diff --git a/web/packages/scriptis/module/workbench/script/editor.vue b/web/packages/scriptis/module/workbench/script/editor.vue
index 3379da33d..6224954fe 100644
--- a/web/packages/scriptis/module/workbench/script/editor.vue
+++ b/web/packages/scriptis/module/workbench/script/editor.vue
@@ -201,7 +201,7 @@ export default {
       let validRepeat = await this.validateRepeat();
       this.$refs.editor.deltaDecorations(selectCode, () => {
         if (!validRepeat) return this.$Message.warning(this.$t('message.scripts.editorDetail.warning.invalidArgs'));
-        if (this.loading) return this.$Message.warning(this.$t('message.scripts.constants.warning.api'));
+        if (this.loading || this.killing) return this.$Message.warning(this.$t('message.scripts.constants.warning.api'));
         if (!selectCode) {
           return this.$Message.warning(this.$t('message.scripts.editorDetail.warning.emptyCode'));
         }
@@ -219,10 +219,10 @@ export default {
       });
     },
     stop() {
-      if (this.loading) return this.$Message.warning(this.$t('message.scripts.constants.warning.api'));
-      this.loading = true;
+      if (this.killing) return this.$Message.warning(this.$t('message.scripts.constants.warning.api'));
+      this.killing = true;
       this.$emit('on-stop', () => {
-        this.loading = false;
+        this.killing = false;
       });
     },
     async save() {
@@ -291,7 +291,7 @@ export default {
 @import '@dataspherestudio/shared/common/style/variables.scss';
   .editor {
     height: 100%;
-    /deep/.we-panel.we-panel-horizontal .we-panel-dash  {
+    ::v-deep.we-panel.we-panel-horizontal .we-panel-dash  {
       // 防止被外层.we-panel.we-panel-vertical .we-panel-dash覆盖
       cursor: ew-resize;
     }
diff --git a/web/packages/scriptis/module/workbench/script/field.vue b/web/packages/scriptis/module/workbench/script/field.vue
index 473ecdce0..a8a0a2fce 100644
--- a/web/packages/scriptis/module/workbench/script/field.vue
+++ b/web/packages/scriptis/module/workbench/script/field.vue
@@ -1,15 +1,28 @@
 <template>
-    <div class="field">
-        <!-- {{codePrecheckRes}} -->
-        <template v-if="codePrecheckRes && codePrecheckRes.checkData && codePrecheckRes.checkData.length > 0">
-            <p class="item-content" v-for="(item,index) in codePrecheckRes.checkData" :key="index">{{item.detailMessage}}</p>
-        </template>
-    </div>
+  <div class="field" :style="{ height: resultHeight + 'px' }">
+    <template v-if="codePrecheckRes && codePrecheckRes.checkData && codePrecheckRes.checkData.length > 0">
+      <p class="item-content" v-for="(item,index) in codePrecheckRes.checkData" :key="index">
+        {{item.detailMessage}}
+      </p>
+    </template>
+  </div>
 </template>
 <script>
 export default {
-    props: {
-        codePrecheckRes: Object,
+  props: {
+    codePrecheckRes: Object,
+    scriptViewState: Object,
   },
+  computed: {
+    resultHeight() {
+      return this.scriptViewState.bottomContentHeight - 36
+    },
+  }
+};
+</script>
+<style lang="scss" scoped>
+.field {
+  position: relative;
+  overflow: auto;
 }
-</script>
\ No newline at end of file
+</style>
diff --git a/web/packages/scriptis/module/workbench/script/script.vue b/web/packages/scriptis/module/workbench/script/script.vue
index be47fc8fc..acd9bfab8 100644
--- a/web/packages/scriptis/module/workbench/script/script.vue
+++ b/web/packages/scriptis/module/workbench/script/script.vue
@@ -94,6 +94,7 @@
           <field
             v-if="bottomTab.show_fieldDetail"
             :codePrecheckRes="script.codePrecheckRes"
+            :script-view-state="scriptViewState"
           />
           <template v-for="(comp, index) in extComponents">
             <component
@@ -193,7 +194,7 @@ export default {
       postType: 'http',
       saveLoading: false,
       extComponents,
-      isShowFieldDetailTab: false
+      isShowFieldDetailTab: false,
     };
   },
   mixins: [mixin],
@@ -772,6 +773,7 @@ export default {
             'path': this.execute.currentResultPath,
             'current': 1,
             'size': 20,
+            tipMsg: ret.tipMsg,
             hugeData: !!ret.hugeData
           };
           this.$set(this.execute.resultList[0], 'result', storeResult);
@@ -995,7 +997,7 @@ export default {
           formData.append('type', 'union');
           const codePrecheckRes = await api.fetch('/validator/code-precheck',formData,'post');
           // 如果拿到代码审查结果时，代码已运行完成，则不进行操作
-          if (!this.script.progress || !this.script.progress.costTime) {
+          if (this.$refs.progressTab && (!this.script.progress || !this.script.progress.costTime)) {
             this.script.codePrecheckRes = codePrecheckRes;
             this.$refs.progressTab.updateCodePreCheck(codePrecheckRes);
           }
@@ -1106,7 +1108,7 @@ export default {
               params: this.script.params
             }
 
-          });
+          }, false);
           this.work.unsave = false;
           // 提交最新的内容，更新script.data和script.oldData
           this.script.oldData = this.script.data;
@@ -1251,18 +1253,33 @@ export default {
         const url = '/filesystem/openFile';
         api.fetch(url, {
           path: resultPath,
+          enableLimit: true,
           pageSize,
         }, 'get')
           .then((ret) => {
             let result = {}
-            if (ret.metadata && ret.metadata.length >= 500) {
+            if (ret.display_prohibited) {
               result = {
                 'headRows': [],
                 'bodyRows': [],
                 'total': ret.totalLine,
                 'type': ret.type,
                 'path': resultPath,
-                hugeData: true
+                hugeData: true,
+                tipMsg: localStorage.getItem("locale") === "en" ? ret.en_msg : ret.zh_msg
+              };
+            } else if (ret.column_limit_display) {
+              result = {
+                tipMsg: localStorage.getItem("locale") === "en" ? ret.en_msg : ret.zh_msg,
+                'headRows': ret.metadata,
+                'bodyRows': ret.fileContent,
+                // 如果totalLine是null，就显示为0
+                'total': ret.totalLine ? ret.totalLine : 0,
+                // 如果内容为null,就显示暂无数据
+                'type': ret.fileContent ? ret.type : 0,
+                'path': resultPath,
+                'current': 1,
+                'size': 20,
               };
             } else {
               result = {
@@ -1407,17 +1424,28 @@ export default {
           api.fetch(url2, {
             path: currentResultPath,
             page: 1,
+            enableLimit: true,
             pageSize: 5000,
           }, 'get').then((ret) => {
             let tmpResult
-            if (ret.metadata && ret.metadata.length >= 500) {
-              tmpResult = {
+            if (ret.display_prohibited) {
+              result = {
                 'headRows': [],
                 'bodyRows': [],
                 'total': ret.totalLine,
                 'type': ret.type,
                 'path': currentResultPath,
-                hugeData: true
+                hugeData: true,
+                tipMsg: localStorage.getItem("locale") === "en" ? ret.en_msg : ret.zh_msg
+              };
+            } else if (ret.column_limit_display) {
+              tmpResult = {
+                tipMsg: localStorage.getItem("locale") === "en" ? ret.en_msg : ret.zh_msg,
+                'headRows': ret.metadata,
+                'bodyRows': ret.fileContent,
+                'total': ret.totalLine,
+                'type': ret.type,
+                'path': currentResultPath,
               };
             } else {
               tmpResult = {
diff --git a/web/packages/scriptis/module/workbench/tableDetails/components/statistics.vue b/web/packages/scriptis/module/workbench/tableDetails/components/statistics.vue
index 5aa0753e2..d018a9b9e 100644
--- a/web/packages/scriptis/module/workbench/tableDetails/components/statistics.vue
+++ b/web/packages/scriptis/module/workbench/tableDetails/components/statistics.vue
@@ -186,7 +186,7 @@ export default {
       width: 100%;
       .statistics-card {
           height: 100%;
-          /deep/
+          ::v-deep
           .ivu-card-body {
               height: calc(100% - 52px);
           }
diff --git a/web/packages/scriptis/module/workbench/tableDetails/index.vue b/web/packages/scriptis/module/workbench/tableDetails/index.vue
index 9417c7bcf..9c119ff7c 100644
--- a/web/packages/scriptis/module/workbench/tableDetails/index.vue
+++ b/web/packages/scriptis/module/workbench/tableDetails/index.vue
@@ -232,7 +232,7 @@ export default {
   animation: ani-demo-spin 1s linear infinite;
 }
 .table-detail-tabs {
-  /deep/
+  ::v-deep
   .ivu-tabs-bar {
     .ivu-tabs-nav-container {
       font-size: $tag-font-size;
diff --git a/web/packages/scriptis/view/audit/index.scss b/web/packages/scriptis/view/audit/index.scss
index b44af6ddb..22a714719 100644
--- a/web/packages/scriptis/view/audit/index.scss
+++ b/web/packages/scriptis/view/audit/index.scss
@@ -29,7 +29,7 @@ td.table-name-column {
     cursor: pointer;
   }
 }
-/deep/.table-project-column {
+::v-deep.table-project-column {
   text-align: center;
   .ivu-table-cell {
     display: inline-block;
@@ -44,7 +44,7 @@ td.table-project-column {
   padding: 10px 0;
 }
 
-/deep/.addTagClass {
+::v-deep.addTagClass {
   position: relative;
   z-index: 99;
 }
diff --git a/web/packages/shared/common/i18n/en.json b/web/packages/shared/common/i18n/en.json
index 8a8ba593a..b2a7d79e2 100644
--- a/web/packages/shared/common/i18n/en.json
+++ b/web/packages/shared/common/i18n/en.json
@@ -210,6 +210,8 @@
         "DKZDHH": "Auto Break",
         "newdbcomplition": "DB/Table suggest-Beta",
         "dbcomplition": "DB/Table suggest-Release",
+        "closeLanguageServe": "Turn off the language server switch [Beta]",
+        "openLanguageServe": "Turn on the language server switch [Beta]",
         "GBZDHH": "Close auto break",
         "GYFSYGWYF": "This is highly dangerous syntax, please be cautious!"
       },
diff --git a/web/packages/shared/common/i18n/zh.json b/web/packages/shared/common/i18n/zh.json
index 54a9b70e2..365298648 100644
--- a/web/packages/shared/common/i18n/zh.json
+++ b/web/packages/shared/common/i18n/zh.json
@@ -211,6 +211,8 @@
         "DKZDHH": "自动换行",
         "newdbcomplition": "库表联想-Beta",
         "dbcomplition": "库表联想-Release",
+        "closeLanguageServe": "关闭语言服务器开关[Beta]",
+        "openLanguageServe": "打开语言服务器开关[Beta]",
         "GBZDHH": "关闭自动换行",
         "GYFSYGWYF": "该语法属于高危语法，请谨慎操作！"
       },
diff --git a/web/packages/shared/common/service/execute.js b/web/packages/shared/common/service/execute.js
index 94dcc735d..b5083f8bf 100644
--- a/web/packages/shared/common/service/execute.js
+++ b/web/packages/shared/common/service/execute.js
@@ -196,12 +196,15 @@ Execute.prototype.restore = function({ execID, taskID }) {
   this.trigger('execute:queryState');
 };
 
-Execute.prototype.halfExecute = function({ execID, taskID, openLog }) {
+Execute.prototype.halfExecute = function({ execID, taskID, openLog, isQueryHistory }) {
   this.id = execID;
   this.taskID = taskID;
   this.run = true;
   this.postType = 'http';
   this.openLog = openLog
+  if (isQueryHistory) {
+    return this.queryStatus({ isKill: false });
+  }
   this.trigger('execute:queryState');
 };
 
@@ -327,58 +330,65 @@ Execute.prototype.queryProgress = function() {
 };
 
 Execute.prototype.queryLog = function() {
-  const fromLine = this.fromLine
-  // dpms: /#/product/100199/bug/detail/222584
-  if ( this.openLog && ['Succeed', 'Failed', 'Cancelled', 'Timeout'].indexOf(this.status) !== -1) {
-    if (this.resultsetInfo) {
-      return api.fetch('/filesystem/openLog', {
-        path: this.resultsetInfo.logPath
-      }, 'get').then((rst) => {
-        if (rst) {
-          this.trigger('log', rst.log);
+  try {
+    const fromLine = this.fromLine
+    // dpms: /#/product/100199/bug/detail/222584
+    if ( this.openLog && ['Succeed', 'Failed', 'Cancelled', 'Timeout'].indexOf(this.status) !== -1) {
+      if (this.resultsetInfo) {
+        return api.fetch('/filesystem/openLog', {
+          path: this.resultsetInfo.logPath
+        }, 'get').then((rst) => {
+          if (rst) {
+            this.trigger('log', rst.log);
+          }
+          return Promise.resolve();
+        }).catch(() => {
           return Promise.resolve();
+        });
+      } else {
+        const taskUrl = this.getResultUrl !== 'filesystem' ? this.getResultUrl : 'jobhistory';
+        return api.fetch(`/${taskUrl}/${this.taskID}/get`, 'get')
+          .then((rst) => {
+            if (rst.task) {
+              this.resultsetInfo = rst.task;
+              return api.fetch('/filesystem/openLog', {
+                path: this.resultsetInfo.logPath
+              }, 'get').then((rst) => {
+                if (rst) {
+                  this.trigger('log', rst.log);
+                }
+                return Promise.resolve();
+              }).catch(() => {
+                return Promise.resolve();
+              });
+            }
+            return Promise.resolve();
+          })
+      }
+    }
+
+    return api.fetch(`/entrance/${this.id}/log`, {
+      fromLine,
+      size: -1,
+    }, 'get')
+      .then((rst) => {
+        this.fromLine = rst.fromLine;
+        this.handleLines = this.handleLines || {}
+        if (this.handleLines[fromLine+'_'+this.fromLine] && this.fromLine) {
+          return  Promise.resolve();
+        } else if(this.fromLine) {
+          this.handleLines[fromLine+'_'+this.fromLine] = 1
         }
+        this.trigger('log', rst.log);
+        return Promise.resolve();
       }).catch(() => {
         return Promise.resolve();
       });
-    } else {
-      const taskUrl = this.getResultUrl !== 'filesystem' ? this.getResultUrl : 'jobhistory';
-      return api.fetch(`/${taskUrl}/${this.taskID}/get`, 'get')
-        .then((rst) => {
-          if (rst.task) {
-            this.resultsetInfo = rst.task;
-            return api.fetch('/filesystem/openLog', {
-              path: this.resultsetInfo.logPath
-            }, 'get').then((rst) => {
-              if (rst) {
-                this.trigger('log', rst.log);
-                return Promise.resolve();
-              }
-            }).catch(() => {
-              return Promise.resolve();
-            });
-          }
-        })
-    }
+  } catch (error) {
+    console.error('---queryLog---', error)
+    return Promise.resolve();
   }
-
-  return api.fetch(`/entrance/${this.id}/log`, {
-    fromLine,
-    size: -1,
-  }, 'get')
-    .then((rst) => {
-      this.fromLine = rst.fromLine;
-      this.handleLines = this.handleLines || {}
-      if (this.handleLines[fromLine+'_'+this.fromLine] && this.fromLine) {
-        return  Promise.resolve();
-      } else if(this.fromLine) {
-        this.handleLines[fromLine+'_'+this.fromLine] = 1
-      }
-      this.trigger('log', rst.log);
-      return Promise.resolve();
-    }).catch(() => {
-      return Promise.resolve();
-    });
+  
 };
 
 Execute.prototype.getResultPath = function() {
@@ -468,6 +478,7 @@ Execute.prototype.getFirstResult = function() {
     let params = {
       path: this.currentResultPath,
       pageSize,
+      enableLimit: true,
     }
     // 如果是api执行需要带上taskId
     if (this.getResultUrl !== 'filesystem') {
@@ -477,13 +488,19 @@ Execute.prototype.getFirstResult = function() {
     const pageSize = 5000;
     api.fetch(url, params, 'get')
       .then((rst) => {
-        if (rst.metadata && rst.metadata.length >= 500) {
+        if (rst.display_prohibited) {
           this.trigger('result', {
             metadata: [],
             fileContent: [],
             type: rst.type,
             totalLine: rst.totalLine,
-            hugeData: true
+            hugeData: true,
+            tipMsg: localStorage.getItem("locale") === "en" ? rst.en_msg : rst.zh_msg
+          });
+        } else if (rst.column_limit_display) {
+          this.trigger('result', {
+            ...rst,
+            tipMsg: localStorage.getItem("locale") === "en" ? rst.en_msg : rst.zh_msg
           });
         } else {
           this.trigger('result', rst);
diff --git a/web/packages/shared/components/consoleComponent/console.vue b/web/packages/shared/components/consoleComponent/console.vue
index 1a8d95801..6c130a189 100644
--- a/web/packages/shared/components/consoleComponent/console.vue
+++ b/web/packages/shared/components/consoleComponent/console.vue
@@ -6,6 +6,7 @@
       <div class="workbench-tab-wrapper">
         <div class="workbench-tab">
           <div
+            v-if="!isHistory"
             :class="{active: scriptViewState.showPanel == 'progress'}"
             class="workbench-tab-item"
             @click="showPanelTab('progress')">
@@ -19,18 +20,25 @@
             <span>{{ $t('message.common.tabs.result') }}</span>
           </div>
           <div
-            v-if="isLogShow"
+            v-if="isLogShow || isHistory"
             :class="{active: scriptViewState.showPanel == 'log'}"
             class="workbench-tab-item"
             @click="showPanelTab('log')">
             <span>{{ $t('message.common.tabs.log') }}</span>
           </div>
+          <div
+            v-if="!isHistory"
+            :class="{active: scriptViewState.showPanel == 'history'}"
+            class="workbench-tab-item"
+            @click="showPanelTab('history')">
+            <span>{{ $t('message.common.tabs.history') }}</span>
+          </div>
         </div>
       </div>
       <div
         class="workbench-container">
         <we-progress
-          v-if="scriptViewState.showPanel == 'progress'"
+          v-if="scriptViewState.showPanel == 'progress' && !isHistory"
           :script="script"
           :execute="execute"
           :script-view-state="scriptViewState"
@@ -51,6 +59,13 @@
           :logs="script.log"
           :log-line="script.logLine"
           :script-view-state="scriptViewState"/>
+        <History
+          v-if="scriptViewState.showPanel == 'history'"
+          :history="historyList"
+          :run-type="script.runType"
+          :script-view-state="scriptViewState"
+          @viewHistory="viewHistory"
+        />
       </div>
     </div>
   </div>
@@ -62,6 +77,7 @@ import storage from '@dataspherestudio/shared/common/helper/storage';
 import {debounce, isUndefined, isEmpty, last} from 'lodash';
 import {Script} from './modal.js';
 import result from './result.vue';
+import History from './history.vue'
 import log from './log.vue';
 import weProgress from './progress.vue';
 import Execute from '@dataspherestudio/shared/common/service/execute';
@@ -71,6 +87,7 @@ export default {
     result,
     log,
     weProgress,
+    History
   },
   mixins: [mixin],
   props: {
@@ -90,13 +107,21 @@ export default {
     getResultUrl: {
       type: String,
       defalut: `filesystem`
+    },
+    isHistory: {
+      type: Boolean,
+      default: false
+    },
+    historyList: {
+      type: Array,
+      default: () => []
     }
   },
   data() {
     return {
       execute: null,
       scriptViewState: {
-        showPanel: 'progress',
+        showPanel: this.isHistory ? 'result' : 'progress',
         cacheLogScroll: 0,
         bottomContentHeight: this.height || '250'
       },
@@ -113,6 +138,7 @@ export default {
         log: { all: '', error: '', warning: '', info: '' },
         logLine: 1,
         resultList: null,
+        history: []
       },
     }
   },
@@ -138,16 +164,31 @@ export default {
   mounted() {
   },
   methods: {
+    viewHistory(...rest) {
+      this.$emit('viewHistory', ...rest)
+    },
     killExecute(flag = false) {
-      this.execute.trigger('stop');
-      if (flag) {
-        this.execute.trigger('kill');
+      if (this.execute) {
+        this.execute.trigger('stop');
+        if (flag) {
+          this.execute.trigger('kill');
+        }
       }
+
     },
     createScript() {
+      // 历史服务中work无runtype字段，使用文件后缀名截取
+      let runType = this.work.runType
+      if (!runType && this.work.filename) {
+        const fileParts = this.work.filename.split('.');
+        if (fileParts.length > 1) {
+          runType = fileParts[fileParts.length - 1];
+        }
+      }
       this.script = new Script({
         id: this.work.id,
         title: this.work.name,
+        runType: runType,
         scriptViewState: this.scriptViewState,
       });
     },
@@ -181,6 +222,8 @@ export default {
           isRestore: true,
           id: this.work.id,
           nodeId: this.work.key || undefined,
+          openLog: this.isHistory,
+          isQueryHistory: this.isHistory
         }
         this.execute.halfExecute(option);
         this.monitoringData();
@@ -211,7 +254,8 @@ export default {
           'path': this.execute.currentResultPath,
           'current': 1,
           'size': 20,
-          hugeData: !!ret.hugeData
+          hugeData: !!ret.hugeData,
+          tipMsg: ret.tipMsg
         };
         if (this.execute.resultList[0]) {
           this.$set(this.execute.resultList[0], 'result', storeResult);
@@ -277,8 +321,13 @@ export default {
       });
       this.execute.on('status', (status) => {
         this.script.status = status;
+        if(['Failed', 'Cancelled', 'Timeout'].includes(status) && this.isHistory) {
+          this.openPanel('log')
+        }
       });
       this.execute.on('querySuccess', ({ type, task }) => {
+        if (this.isHistory) return;
+        this.$emit("updateHistory", task)
         const costTime = util.convertTimestamp(task.costTime);
         this.script.progress = {
           ...this.script.progress,
@@ -323,9 +372,13 @@ export default {
       this.execute.on('costTime', (time) => {
         this.script.progress.costTime = util.convertTimestamp(time);
       });
+      this.execute.on('history', (info) => {
+        if (this.isHistory) return;
+        this.$emit("updateHistory", info)
+      })
     },
     resetQuery() {
-      this.showPanelTab('progress');
+      this.showPanelTab(this.isHistory ? 'result' : 'progress');
       this.isLogShow = false;
       this.localLog = {
         log: { all: '', error: '', warning: '', info: '' },
@@ -390,14 +443,32 @@ export default {
         }, 'get')
           .then((ret) => {
             let result = {}
-            if (ret.metadata && ret.metadata.length >= 500) {
+            if (ret.display_prohibited) {
               result = {
                 'headRows': [],
                 'bodyRows': [],
                 'total': ret.totalLine,
                 'type': ret.type,
                 'path': resultPath,
-                hugeData: true
+                hugeData: true,
+                tipMsg: localStorage.getItem("locale") === "en" ? ret.en_msg : ret.zh_msg
+              };
+            } else if (ret.column_limit_display) {
+              result = {
+                tipMsg: localStorage.getItem("locale") === "en" ? ret.en_msg : ret.zh_msg,
+                'headRows': ret.metadata,
+                'bodyRows': ret.fileContent,
+                // 如果totalLine是null，就显示为0
+                'total': ret.totalLine ? ret.totalLine : 0,
+                // 如果内容为null,就显示暂无数据
+                'type': ret.fileContent ? ret.type : 0,
+                'cache': {
+                  offsetX: 0,
+                  offsetY: 0,
+                },
+                'path': resultPath,
+                'current': 1,
+                'size': 20,
               };
             } else {
               result = {
@@ -495,6 +566,7 @@ export default {
     border-top: $border-width-base $border-style-base $border-color-base;
     @include border-color($border-color-base, $dark-border-color-base);
     @include bg-color($light-base-color, $dark-base-color);
+    flex: 1;
     .workbench-tabs {
       position: $relative;
       height: 100%;
diff --git a/web/packages/shared/components/consoleComponent/history.vue b/web/packages/shared/components/consoleComponent/history.vue
new file mode 100644
index 000000000..05888d122
--- /dev/null
+++ b/web/packages/shared/components/consoleComponent/history.vue
@@ -0,0 +1,344 @@
+<template>
+  <div
+    class="workbench-history">
+    <history-table
+      ref="globalHistory"
+      :columns="column"
+      :data="list"
+      :height="height"
+      :no-data-text="$t('message.scripts.emptyText')"
+      size="small"
+      border
+      stripe/>
+    <Page
+      class="workbench-history-page"
+      :total="PageTotal"
+      :page-size-opts="page.sizeOpts"
+      :page-size="page.size"
+      :current="page.current"
+      show-sizer
+      show-total
+      size="small"
+      @on-change="change"
+      @on-page-size-change="changeSize"/>
+  </div>
+</template>
+<script>
+import axios from 'axios';
+import api from '@dataspherestudio/shared/common/service/api';
+import util from '@dataspherestudio/shared/common/util';
+import storage from '@dataspherestudio/shared/common/helper/storage';
+import table from '@dataspherestudio/shared/components/virtualTable';
+import mixin from '@dataspherestudio/shared/common/service/mixin';
+const EXECUTE_COMPLETE_TYPE = ['Succeed', 'Failed', 'Cancelled', 'Timeout'];
+export default {
+  components: {
+    historyTable: table.historyTable,
+  },
+  mixins: [mixin],
+  props: {
+    history: {
+      type: Array,
+      required: true,
+    },
+    runType: String,
+    node: Object,
+    scriptViewState: Object
+  },
+  data() {
+    return {
+      column: [],
+      page: {
+        start: 0,
+        end: 10,
+        current: 1,
+        size: 10,
+        sizeOpts: [10, 20, 30, 50],
+      },
+      costTimeout: null,
+      API_PATH: process.env.VUE_APP_MN_CONFIG_PREFIX || `http://${window.location.host}/api/rest_j/v1/`,
+    };
+  },
+  computed: {
+    PageTotal() {
+      return this.history.length;
+    },
+    firstRecord() {
+      return this.history && this.history[0];
+    },
+    list() {
+      return this.history.slice(this.page.start, this.page.end);
+    },
+    height() {
+      return this.scriptViewState.bottomContentHeight - 34 - 35 // 减去tab及分页高度
+    }
+  },
+  watch: {
+    // 时间发生改变的时候去使用超时器，每隔5秒更新历史的时间
+    // 'firstRecord.runningTime'() {
+    //   this.setInitCostTime();
+    // },
+    // 完成状态时清除定时器，防止最终数据被修改
+    'firstRecord.status'(val) {
+      if (EXECUTE_COMPLETE_TYPE.indexOf(val) !== -1) {
+        clearTimeout(this.costTimeout);
+      }
+    }
+  },
+  mounted() {
+    this.initData();
+  },
+  beforeDestroy() {
+    clearTimeout(this.costTimeout);
+    this.costTimeout = null;
+  },
+  methods: {
+    initData() {
+      this.pageingData();
+      // this.setInitCostTime();
+      const baseinfo = storage.get('baseInfo', 'local')
+      this.column = [
+        {
+          width: 50,
+          align: 'center',
+          renderType: 'index',
+        }, {
+          title: this.$t('message.scripts.history.columns.taskID.title'),
+          key: 'taskID',
+          align: 'center',
+          width: 80,
+        }, {
+          title: this.$t('message.scripts.history.columns.runningTime.title'),
+          key: 'costTime',
+          align: 'center',
+          width: 80,
+          renderType: 'convertTime',
+        }, {
+          title: this.$t('message.scripts.history.columns.createDate.title'),
+          key: 'createdTime',
+          align: 'center',
+          width: 100,
+          renderType: 'formatTime',
+        }, {
+          title: this.$t('message.scripts.history.columns.status.title'),
+          key: 'status',
+          align: 'center',
+          width: 120,
+          renderType: 'tag',
+        }, {
+          title: this.$t('message.scripts.history.columns.data.title'),
+          key: 'executionCode',
+          align: 'center',
+          // 溢出以...显示
+          ellipsis: true,
+          // renderType: 'tooltip',
+        }, {
+          title: this.$t('message.scripts.history.columns.failedReason.title'),
+          key: 'errDesc',
+          align: 'center',
+          className: 'history-failed',
+          width: 220,
+          renderType: 'a'
+        }, {
+          title: this.$t('message.scripts.history.columns.control.title'),
+          key: 'control',
+          fixed: 'right',
+          align: 'center',
+          width: 140,
+          className: 'history-control',
+          renderType: 'button',
+          renderParams: [{
+            label: this.$t('message.scripts.history.columns.control.view'),
+            action: this.viewHistory,
+          }, {
+            label: this.$t('message.scripts.history.columns.control.download'),
+            action: this.downloadLog,
+          }, {
+            label: this.$t('message.scripts.history.columns.control.noticeopen'),
+            action: this.subscribe,
+            isHide: (data) => {
+              // 任务状态为：已提交/排队中/资源申请中/运行/超时/重试时
+              const status = ["Submitted","Inited","Scheduled","Running","Timeout","WaitForRetry"].indexOf(data.status) > -1
+              return baseinfo.enableTaskNotice !== false && status && data.subscribed !== 1
+            }
+          }, {
+            label: this.$t('message.scripts.history.columns.control.noticeclose'),
+            action: this.subscribe,
+            isHide: (data) => {
+              // 任务状态为：已提交/排队中/资源申请中/运行/超时/重试时
+              const status = ["Submitted","Inited","Scheduled","Running","Timeout","WaitForRetry"].indexOf(data.status) > -1
+              return baseinfo.enableTaskNotice !== false && data.subscribed === 1 && status
+            }
+          }, {
+            label: this.$t('message.scripts.solution'),
+            action: this.viewFAQ,
+            style: { color: '#ed4014'},
+            isHide: (data)=> { return window.$APP_CONF && window.$APP_CONF.error_report && data && data.solution && data.solution.solutionUrl}
+          }, {
+            label: this.$t('message.scripts.reporterror'),
+            action: this.report,
+            style: { color: '#ed4014'},
+            isHide: (data)=> { return window.$APP_CONF && window.$APP_CONF.error_report && data && data.status === 'Failed' && (!data.solution || !data.solution.solutionUrl)}
+          }],
+        },
+      ];
+    },
+
+    setInitCostTime() {
+      if (this.history.length) {
+        if (this.history && EXECUTE_COMPLETE_TYPE.indexOf(this.history[0].status) === -1) {
+          clearTimeout(this.costTimeout);
+          this.costTimeout = setTimeout(() => {
+            this.$set(this.history[0], 'costTime', new Date().getTime() - this.history[0].createdTime);
+          }, 5000);
+        }
+      }
+    },
+
+    async viewHistory(params) {
+      const supportModes = this.getSupportModes();
+      const match = supportModes.find((s) => s.rule.test(params.row.fileName));
+      const ext = match ? match.ext : '.hql';
+      const name = `history_item_${params.row.taskID}${ext}`;
+      const md5Id = util.md5(name);
+      this.$emit('viewHistory', {
+        id: md5Id, // 唯一标识，就算文件名修改，它都能标识它是它
+        taskID: params.row.taskID,
+        execID: params.row.execID || params.row.strongerExecId,
+        filename: name,
+        filepath: '',
+        // saveAs表示临时脚本，需要关闭或保存时另存
+        saveAs: true,
+        code: params.row.data,
+        type: 'historyScript',
+        addWay: 'follow',
+        currentNodeKey: this.node ? this.node.key : '',
+        // status:params.row.status,
+      }, (f) => {
+        if (f) {
+          this.$Message.success(this.$t('message.scripts.history.success.open'));
+        }
+      });
+    },
+    // 日志下载
+    async downloadLog(params) {
+      const name = params.row.taskID + '__' + Date.now() + '.log';
+      if (!params.row.logPath) {
+        await api.fetch(`/jobhistory/${params.row.taskID}/get`, 'get').then((rst) => {
+          this.$set(params.row, 'logPath', rst.task.logPath);
+        });
+      }
+      axios.post(this.API_PATH + 'filesystem/download', {
+        path: params.row.logPath,
+      }).then((rst) => {
+        const link = document.createElement('a');
+        const blob = new Blob([rst.data], { type: rst.headers['content-type'] });
+        link.href = window.URL.createObjectURL(blob);
+        link.download = name;
+        let event = null;
+        if (window.MouseEvent) {
+          event = new MouseEvent('click');
+        } else {
+          event = document.createEvent('MouseEvents');
+        }
+        const flag = link.dispatchEvent(event);
+        this.$nextTick(() => {
+          if (flag) {
+            this.$Message.success(this.$t('message.scripts.history.success.download'));
+          }
+        });
+      }).catch((err) => {
+        this.$Message.error(err.message);
+      });
+    },
+    change(page) {
+      this.page.current = page;
+      this.pageingData();
+    },
+    changeSize(size) {
+      this.page.size = size;
+      this.page.current = 1;
+      this.pageingData();
+    },
+    pageingData() {
+      this.page.start = (this.page.current - 1) * this.page.size;
+      this.page.end = this.page.start + this.page.size;
+    },
+    parsingLanguaue() {
+      const supportTypes = this.getSupportModes();
+      const match = supportTypes.find((s) => s.runType === this.runType);
+      if (!match) {
+        return '';
+      }
+      if (match.lang === 'hql') {
+        return 'sql';
+      }
+      return match.lang;
+    },
+    // 查看问题
+    viewFAQ({ row }) {
+      row.solution && window.open(row.solution.solutionUrl, '_blank')
+    },
+    // 订阅通知
+    subscribe(params) {
+      if (this.changeSubscribeStatus) return this.$Message.warning(this.$t('message.scripts.optlimit'))
+      this.changeSubscribeStatus = true;
+      const taskId = params.row.taskID;
+      const action = params.row.subscribed ? 'cancel' : 'add';
+      const scriptName = this.node ? this.node.title : params.row.fileName
+      api.fetch(`/dss/scriptis/task/subscribe`, {action, taskId, scriptName}, 'get').then(() => {
+        const index = this.history.findIndex(it => it.taskID === params.row.taskID)
+        if (index > -1) {
+          this.$set(this.history, index, {...this.history[index], subscribed: params.row.subscribed ? 0 : 1})
+        }
+        this.$Message.warning(action === 'add' ? this.$t('message.scripts.optsuccess') :this.$t('message.scripts.cancelOptSuccess'))
+      }).finally(() => {
+        setTimeout(() => {
+          this.changeSubscribeStatus = false
+        }, 5000);
+      });
+    },
+    // 导出问题
+    async report({row}) {
+      const res = await api.fetch(`/jobhistory/${row.taskID}/get`, 'get') || { task: {}}
+      if (res.task && (res.task.errCode || res.task.errDesc)) {
+        api.fetch('/dss/guide/solution/reportProblem', {
+          requestUrl: `/jobhistory/${row.taskID}/get`,
+          queryParams: {},
+          requestBody: {},
+          requestHeaders: {},
+          responseBody: {
+            taskID: row.taskID,
+            errCode: res.task.errCode,
+            errDesc: res.task.errDesc
+          }
+        }).then(()=>{
+          this.$Message.success(this.$t('message.scripts.reported'))
+        })
+      }
+    }
+  },
+};
+</script>
+<style lang="scss" scoped>
+@import '@dataspherestudio/shared/common/style/variables.scss';
+.workbench-history {
+
+  .workbench-history-page {
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      height: 30px;
+      padding-top: 5px;
+  }
+  .history-failed {
+      color: $error-color;
+  }
+  .history-control {
+      .ivu-table-cell {
+          padding: 0;
+      }
+  }
+}
+</style>
+
diff --git a/web/packages/shared/components/consoleComponent/modal.js b/web/packages/shared/components/consoleComponent/modal.js
index 75dcd3a9c..46fbc4b66 100644
--- a/web/packages/shared/components/consoleComponent/modal.js
+++ b/web/packages/shared/components/consoleComponent/modal.js
@@ -48,5 +48,6 @@ export class Script {
     this.status = option.status ? option.status : 'Inited';
     // script视图状态
     this.scriptViewState = {};
+    this.runType = option.runType;
   }
 }
diff --git a/web/packages/shared/components/consoleComponent/result.vue b/web/packages/shared/components/consoleComponent/result.vue
index 57e792390..95bae25ed 100644
--- a/web/packages/shared/components/consoleComponent/result.vue
+++ b/web/packages/shared/components/consoleComponent/result.vue
@@ -80,16 +80,17 @@
         v-if="result.hugeData"
         :style="{ height: resultHeight + 'px', padding: '15px' }"
       >
-        {{ $t('message.common.resulttip')
-        }}<a
-          :href="`/#/results?workspaceId=${
-            $route.query.workspaceId
-          }&resultPath=${resultPath}&fileName=${
-            script.fileName || script.ti
-          }&from=${$route.name}&taskID=${taskID}`"
-          target="_blank"
-        >{{ $t('message.common.viewSet') }}</a
-        >
+        <p v-if="result.tipMsg">{{ result.tipMsg }}</p>
+        <p v-else>{{ $t('message.common.resulttip')}}
+          <a
+            :href="`/#/results?workspaceId=${
+              $route.query.workspaceId
+            }&resultPath=${resultPath}&fileName=${
+              script.fileName || script.ti
+            }&from=${$route.name}&taskID=${taskID}`"
+            target="_blank"
+          >{{ $t('message.common.viewSet') }}</a>
+        </p>
       </div>
     </div>
     <!-- resultType: 2 visual|dataWrangler -->
@@ -131,6 +132,7 @@
       >
       </result-set-list>
       <div class="page" v-if="resultType === '2' && !result.hugeData">
+        <p v-if="result.tipMsg" :title="result.tipMsg" style="margin-right: 20px;max-width: calc(100% - 250px);overflow: hidden;text-overflow: ellipsis;">{{ result.tipMsg }}</p>
         <Page
           :transfer="true"
           ref="page"
@@ -149,6 +151,25 @@
         }}</span>
       </div>
     </div>
+    <Modal
+      v-model="modal.show"
+      :width="600"
+      :fullscreen="modal.isFullScreen"
+      closable
+      footer-hide
+      class='modal-detail'
+    >
+      <div slot="header">
+        <span>{{$t('message.common.detail')}}</span>
+        <span @click="fullScreenModal" class="full-btn">
+          <Icon :type="modal.isFullScreen?'md-contract':'md-expand'" />
+          {{modal.isFullScreen?$t('message.scripts.cancelfullscreen'):$t('message.scripts.fullscreen')}}
+        </span>
+      </div>
+      <div class='modal-content'>
+        {{modal.content}}
+      </div>
+    </Modal>
   </div>
 </template>
 <script>
@@ -191,6 +212,11 @@ export default {
   mixins: [mixin],
   data() {
     return {
+      modal: {
+        show: false,
+        isFullScreen: false,
+        content: '',
+      },
       data: {
         headRows: [],
         bodyRows: [],
@@ -374,28 +400,14 @@ export default {
         cb()
       }
     },
+    fullScreenModal() {
+      this.modal.isFullScreen = !this.modal.isFullScreen
+    },
     handleTdContextmenu({ content }) {
       if (content.split(/\n/).length > 1) {
-        this.$Modal.info({
-          title: this.$t('message.common.detail'),
-          closable: true,
-          width: 600,
-          render: (h) => {
-            return h(
-              'div',
-              {
-                style: {
-                  'word-break': 'break-all',
-                  'line-height': '20px',
-                  'white-space': 'pre-line',
-                  'max-height': '500px',
-                  overflow: 'auto',
-                },
-              },
-              content
-            )
-          },
-        })
+        this.modal.show = true;
+        this.modal.content = content;
+        this.modal.isFullScreen = false;
       }
     },
     arraySortByName(list, valueType, key) {
@@ -610,7 +622,7 @@ export default {
       if (this.script.resultList && this.script.resultList[resultSet])
         this.$set(this.script.resultList[resultSet], 'result', tmpResult)
       this.dispatch('IndexedDB:updateResult', {
-        tabId: this.script.id,
+        tabId: this.script.id || this.work.id,
         resultSet: resultSet,
         showPanel: this.scriptViewState.showPanel,
         ...this.script.resultList,
@@ -817,11 +829,12 @@ export default {
     text-align: center;
     padding-left: 10px;
     align-items: center;
-    justify-content: center;
+    justify-content: space-between;
     .page {
+      width: 100%;
       display: flex;
       align-items: center;
-      justify-content: center;
+      justify-content: space-evenly;
     }
     .set {
       width: 90px;
@@ -835,7 +848,7 @@ export default {
 .result-normal-table .columnClass {
   height: 30px;
   line-height: 1.25;
-  /deep/.ivu-table-cell {
+  ::v-deep.ivu-table-cell {
     display: -webkit-box;
     -webkit-box-orient: vertical;
     -webkit-line-clamp: 2;
@@ -853,6 +866,25 @@ export default {
     }
   }
 }
+.modal-detail {
+  .full-btn {
+    float: right;
+    margin-right: 30px;
+    padding-top: 5px;
+    cursor: pointer;
+    color: #2d8cf0
+  };
+  .modal-content {
+    word-break: break-all;
+    line-height: 20px;
+    white-space: pre-line;
+    max-height: 500px;
+    overflow: auto;
+    margin-top: -16px;
+    font-size: 14px;
+    color: #515a6e;
+  }
+}
 </style>
 <style>
 .result-table-content .list-view-item div[title='NULL'],
diff --git a/web/packages/shared/components/consoleComponent/resultsExport.vue b/web/packages/shared/components/consoleComponent/resultsExport.vue
index 57c7beddc..534a82c14 100644
--- a/web/packages/shared/components/consoleComponent/resultsExport.vue
+++ b/web/packages/shared/components/consoleComponent/resultsExport.vue
@@ -16,7 +16,7 @@
         ref="resultsExport"
         :model="exportOption"
         :rules="rules"
-        :label-width="80">
+        :label-width="110">
         <FormItem
           :label="$t('message.common.resultsExport.formItems.name.label')"
           prop="name">
@@ -38,6 +38,39 @@
             <Radio label="2">Excel</Radio>
           </RadioGroup>
         </FormItem>
+        <FormItem
+          :label="$t('message.common.toolbar.coding')"
+          prop="coding">
+          <RadioGroup v-model="exportOption.coding">
+            <Radio label="1">UTF-8</Radio>
+            <Radio label="2">GBK</Radio>
+          </RadioGroup>
+        </FormItem>
+        <FormItem
+          :label="$t('message.common.toolbar.replace')"
+          prop="nullValue">
+          <RadioGroup v-model="exportOption.nullValue">
+            <Radio label="1">NULL</Radio>
+            <Radio label="2">{{
+              $t('message.common.toolbar.emptyString')
+            }}</Radio>
+          </RadioGroup>
+        </FormItem>
+        <FormItem
+          v-if="exportOption.format == 1"
+          :label="$t('message.common.toolbar.selectsplit')"
+          prop="splitChar">
+          <RadioGroup v-model="exportOption.splitChar">
+            <Radio
+              v-for="item in splitList"
+              :label="item.value"
+              :name="item.value"
+              :key="item.value"
+            >
+              {{ item.label }}
+            </Radio>
+          </RadioGroup>
+        </FormItem>
         <FormItem
           v-if="exportOption.format == 2"
           :label="$t('message.common.toolbar.autoformat')"
@@ -102,6 +135,10 @@ export default {
         name: '',
         path: '',
         format: '1',
+        coding: '1',
+        nullValue: '1',
+        splitChar: '1',
+        keepNewline: '0',
         autoFormat: false
       },
       fileTree: [],
@@ -117,6 +154,13 @@ export default {
           { required: true, message: this.$t('message.common.resultsExport.rules.path.required'), trigger: 'change' },
         ],
       },
+      splitList: [
+        { label: this.$t('message.scripts.hiveTableExport.DH'), value: '1', data: ',' },
+        { label: this.$t('message.scripts.hiveTableExport.FH'), value: '2', data: ';' },
+        { label: this.$t('message.scripts.hiveTableExport.ZBF'), value: '3', data: '\t' },
+        // { label: this.$t('message.scripts.hiveTableExport.KG'), value: '4', data: ' ' },
+        { label: this.$t('message.scripts.hiveTableExport.SX'), value: '5', data: '|' },
+      ],
     };
   },
   computed: {
@@ -202,11 +246,26 @@ export default {
         noLoadCache: true,
         code
       }
+      const nullValue = this.exportOption.nullValue === '1' ? 'NULL' : 'BLANK'
+      const charset = this.exportOption.coding === '1' ? 'utf-8' : 'gbk'
+      const splitChar = (this.splitList.find(it => it.value == this.exportOption.splitChar) || {} ).data
       if (this.exportOption.format === '2') {
         params.params =  {
           configuration: {
             runtime: {
-              'wds.linkis.pipeline.export.excel.auto_format.enable': this.exportOption.autoFormat
+              'wds.linkis.pipeline.export.excel.auto_format.enable': this.exportOption.autoFormat,
+              "pipeline.output.charset": charset, //结果集导出字符集
+              "pipeline.output.shuffle.null.type": nullValue, //空值替换
+            }
+          }
+        }
+      } else if(this.exportOption.format === '1') {
+        params.params =  {
+          configuration: {
+            runtime: {
+              "pipeline.field.split": splitChar, //csv分隔符
+              "pipeline.output.charset": charset, //结果集导出字符集
+              "pipeline.output.shuffle.null.type": nullValue, //空值替换
             }
           }
         }
@@ -242,6 +301,10 @@ export default {
         name: '',
         path: '',
         format: '1',
+        coding: '1',
+        nullValue: '1',
+        splitChar: '1',
+        keepNewline: '0',
       };
       this.fileTree = [];
     },
@@ -266,6 +329,9 @@ export default {
         width: 100%;
         display: inline-block;
     }
+    .ivu-form-item {
+        margin-bottom: 8px;
+    }
 }
 .full-btn {
   float: right;
diff --git a/web/packages/shared/components/consoleComponent/tableRow.vue b/web/packages/shared/components/consoleComponent/tableRow.vue
index c3fa8faf0..a1430ae32 100644
--- a/web/packages/shared/components/consoleComponent/tableRow.vue
+++ b/web/packages/shared/components/consoleComponent/tableRow.vue
@@ -2,6 +2,7 @@
   <Modal
     v-model="show"
     width="700"
+    :fullscreen="modal.isFullScreen"
     class="table-row">
     <div
       slot="header">
@@ -12,6 +13,10 @@
           class="table-row-input"
           v-model="searchText"
           :placeholder="$t('message.common.tableRow.search')"></Input>
+        <span @click="fullScreenModal" class="full-btn">
+          <Icon :type="modal.isFullScreen?'md-contract':'md-expand'" />
+          {{modal.isFullScreen?$t('message.scripts.cancelfullscreen'):$t('message.scripts.fullscreen')}}
+        </span>
       </div>
     </div>
     <div :class="{'noselectable': baseinfo.resCopyEnable === false}">
@@ -19,9 +24,10 @@
         border
         highlight-row
         outer-sort
-        :tableHeight="400"
+        :tableHeight="modal.isFullScreen ? 790:400"
         :columns="columns"
         :tableList="filterRow"
+        :isOffset="false"
         class="table-row-table">
       </wb-table>
     </div>
@@ -49,6 +55,9 @@ export default {
   data() {
     return {
       show: false,
+      modal: {
+        isFullScreen: false,
+      },
       columns: [{
         type: 'index',
         title: '#',
@@ -78,6 +87,9 @@ export default {
     },
   },
   methods: {
+    fullScreenModal() {
+      this.modal.isFullScreen = !this.modal.isFullScreen
+    },
     open() {
       this.show = true;
       this.format();
@@ -108,6 +120,13 @@ export default {
         width: 200px;
         float: right;
       }
+    .full-btn {
+      float: right;
+      margin-right: 30px;
+      padding-top: 5px;
+      cursor: pointer;
+      color: #2d8cf0
+    };
     }
     .table-row-table {
       .ivu-table th {
diff --git a/web/packages/shared/components/consoleComponent/toolbar.vue b/web/packages/shared/components/consoleComponent/toolbar.vue
index 216d1176f..0bd6e1a5e 100644
--- a/web/packages/shared/components/consoleComponent/toolbar.vue
+++ b/web/packages/shared/components/consoleComponent/toolbar.vue
@@ -1,31 +1,51 @@
 <template>
-  <div
-    class="we-toolbar-wrap">
-    <ul
-      ref="toolbar"
-      class="we-toolbar">
-      <li @click="changeViewType('table')" :class="{'we-toolbar-active': activeTool === 'table'}">
-        <Icon type="ios-grid" :size="iconSize"/>
-        <span v-if="isIconLabelShow" :title="$t('message.common.toolbar.analysis')" class="v-toolbar-icon">{{$t('message.common.toolbar.resultGroup')}}</span>
+  <div class="we-toolbar-wrap">
+    <ul ref="toolbar" class="we-toolbar">
+      <li
+        @click="changeViewType('table')"
+        :class="{ 'we-toolbar-active': activeTool === 'table' }"
+      >
+        <Icon type="ios-grid" :size="iconSize" />
+        <span
+          v-if="isIconLabelShow"
+          :title="$t('message.common.toolbar.analysis')"
+          class="v-toolbar-icon"
+        >{{ $t('message.common.toolbar.resultGroup') }}</span
+        >
       </li>
-      <template v-for="(comp, index) in extComponents">
-        <component
-          :key="comp.name + index"
-          :is="comp.component"
-          :script="script"
-          :class="{'we-toolbar-active': activeTool === comp.name}"
-          @event-from-ext="eventFromExt"
+      <li
+        v-if="activeTool === 'table' && toolbarShow.filter"
+        @click="openPopup('filter')"
+        :title="$t('message.common.toolbar.resultGroupLineFilter')"
+      >
+        <SvgIcon
+          :style="{ 'font-size': '20px' }"
+          icon-class="export"
+          color="#515a6e"
         />
-      </template>
+        <span class="v-toolbar-icon" v-if="isIconLabelShow">{{
+          $t('message.common.toolbar.lineFilter')
+        }}</span>
+      </li>
       <li v-if="toolbarShow.download">
         <Poptip
           :transfer="true"
           :width="380"
           v-model="popup.download"
-          placement="right">
+          placement="right-end"
+        >
           <div @click.stop="openPopup('download')">
-            <SvgIcon :style="{ 'font-size': '20px' }" icon-class="download" color="#515a6e" />
-            <span v-if="isIconLabelShow" :title="$t('message.common.download')" class="v-toolbar-icon">{{ $t('message.common.download') }}</span>
+            <SvgIcon
+              :style="{ 'font-size': '20px' }"
+              icon-class="download"
+              color="#515a6e"
+            />
+            <span
+              v-if="isIconLabelShow"
+              :title="$t('message.common.download')"
+              class="v-toolbar-icon"
+            >{{ $t('message.common.download') }}</span
+            >
           </div>
           <div slot="content">
             <div>
@@ -37,10 +57,7 @@
                   <Col span="10">
                     <Radio label="1">CSV</Radio>
                   </Col>
-                  <Col
-                    v-if="resultType === '2'"
-                    span="10"
-                    offset="4">
+                  <Col v-if="resultType === '2'" span="10" offset="4">
                     <Radio label="2">Excel</Radio>
                   </Col>
                 </RadioGroup>
@@ -55,9 +72,7 @@
                   <Col span="10">
                     <Radio label="1">UTF-8</Radio>
                   </Col>
-                  <Col
-                    span="10"
-                    offset="4">
+                  <Col span="10" offset="4">
                     <Radio label="2">GBK</Radio>
                   </Col>
                 </RadioGroup>
@@ -65,29 +80,27 @@
             </div>
             <div>
               <Row class="row-item">
-                {{$t('message.common.toolbar.replace')}}
+                {{ $t('message.common.toolbar.replace') }}
               </Row>
               <Row class="row-item">
                 <RadioGroup v-model="download.nullValue">
                   <Col span="10">
                     <Radio label="1">NULL</Radio>
                   </Col>
-                  <Col
-                    span="10"
-                    offset="4">
-                    <Radio label="2">{{$t('message.common.toolbar.emptyString')}}</Radio>
+                  <Col span="10" offset="4">
+                    <Radio label="2">{{
+                      $t('message.common.toolbar.emptyString')
+                    }}</Radio>
                   </Col>
                 </RadioGroup>
               </Row>
             </div>
             <div v-if="download.format == 1">
               <Row class="row-item">
-                {{$t('message.common.toolbar.selectsplit')}}
+                {{ $t('message.common.toolbar.selectsplit') }}
               </Row>
               <Row class="row-item">
-                <RadioGroup
-                  v-model="download.splitChar"
-                >
+                <RadioGroup v-model="download.splitChar">
                   <Radio
                     v-for="item in splitList"
                     :label="item.value"
@@ -101,100 +114,108 @@
             </div>
             <div>
               <Row class="row-item">
-                {{$t('message.common.toolbar.keepNewline')}}
+                {{ $t('message.common.toolbar.keepNewline') }}
               </Row>
               <Row class="row-item">
-                <RadioGroup
-                  v-model="download.keepNewline"
-                >
-                  <Radio
-                    name="1"
-                    label="1"
-                  >
+                <RadioGroup v-model="download.keepNewline">
+                  <Radio name="1" label="1">
                     {{ $t('message.scripts.Yes') }}
                   </Radio>
-                  <Radio
-                    name="0"
-                    label="0"
-                  >
+                  <Radio name="0" label="0">
                     {{ $t('message.scripts.No') }}
                   </Radio>
                 </RadioGroup>
               </Row>
             </div>
+            <Row class="row-item" v-if="download.format == 2">
+              <Checkbox v-model="autoFormat">{{
+                $t('message.common.toolbar.autoformat')
+              }}</Checkbox>
+            </Row>
             <div v-if="isAll || +download.format === 1">
               <Row class="row-item">
-                {{$t('message.common.toolbar.downloadMode')}}
+                {{ $t('message.common.toolbar.downloadMode') }}
               </Row>
               <Row class="row-item">
-                <Checkbox v-model="allDownload">{{$t('message.common.toolbar.all')}}</Checkbox>
-                <span>({{$t('message.common.resultsExport.resultSetNum', { num: resultList.length })}})</span>
+                <Checkbox v-model="allDownload">{{
+                  $t('message.common.toolbar.all')
+                }}</Checkbox>
+                <span
+                >({{
+                  $t('message.common.resultsExport.resultSetNum', {
+                    num: resultList.length,
+                  })
+                }})</span
+                >
               </Row>
             </div>
-            <Row class="row-item" v-if="download.format == 2">
-              <Checkbox v-model="autoFormat">{{$t('message.common.toolbar.autoformat')}}</Checkbox>
-            </Row>
             <Row class="confirm row-item">
               <Col span="10">
-                <Button @click="cancelPopup('download')">{{$t('message.common.cancel')}}</Button>
+                <Button @click="cancelPopup('download')">{{
+                  $t('message.common.cancel')
+                }}</Button>
               </Col>
-              <Col
-                span="10"
-                offset="4">
-                <Button
-                  type="primary"
-                  @click="confirm('download')">{{ $t('message.common.submit') }}</Button>
+              <Col span="10" offset="4">
+                <Button type="primary" @click="confirm('download')">{{
+                  $t('message.common.submit')
+                }}</Button>
               </Col>
             </Row>
           </div>
         </Poptip>
       </li>
-      <li
-        @click="openPopup('export')"
-        v-if="toolbarShow.export">
-        <SvgIcon :style="{ 'font-size': '20px' }" icon-class="export" color="#515a6e"/>
-        <span
-          class="v-toolbar-icon"
-          v-if="isIconLabelShow">{{ $t('message.common.toolbar.export') }}</span>
+      <li @click="openPopup('export')" v-if="toolbarShow.export">
+        <SvgIcon
+          :style="{ 'font-size': '20px' }"
+          icon-class="export"
+          color="#515a6e"
+        />
+        <span class="v-toolbar-icon" v-if="isIconLabelShow">{{
+          $t('message.common.toolbar.export')
+        }}</span>
       </li>
       <li
         @click="openPopup('rowView')"
         v-if="row"
-        :title="$t('message.common.toolbar.rowToColumnTitle')">
-        <SvgIcon :style="{ 'font-size': '20px' }" icon-class="transform" color="#515a6e"/>
-        <span v-if="isIconLabelShow" class="v-toolbar-icon">{{$t('message.common.toolbar.rowToColumn')}}</span>
-      </li>
-      <li
-        v-if="activeTool === 'table'"
-        @click="openPopup('filter')"
-        :title="$t('message.common.toolbar.resultGroupLineFilter')">
-        <SvgIcon :style="{ 'font-size': '20px' }" icon-class="export" color="#515a6e"/>
-        <span
-          class="v-toolbar-icon"
-          v-if="isIconLabelShow">{{$t('message.common.toolbar.lineFilter')}}</span>
+        :title="$t('message.common.toolbar.rowToColumnTitle')"
+      >
+        <SvgIcon
+          :style="{ 'font-size': '20px' }"
+          icon-class="transform"
+          color="#515a6e"
+        />
+        <span v-if="isIconLabelShow" class="v-toolbar-icon">{{
+          $t('message.common.toolbar.rowToColumn')
+        }}</span>
       </li>
+      <template v-for="(comp, index) in extComponents">
+        <component
+          :key="comp.name + index"
+          :is="comp.component"
+          :script="script"
+          :class="{ 'we-toolbar-active': activeTool === comp.name }"
+          @event-from-ext="eventFromExt"
+        />
+      </template>
     </ul>
     <results-export
       ref="exportToShare"
       :script="script"
       :dispatch="dispatch"
-      :current-path="currentPath">
+      :current-path="currentPath"
+    >
     </results-export>
-    <table-row
-      ref="tableRow"
-      :baseinfo="baseinfo"
-      :row="row">
-    </table-row>
+    <table-row ref="tableRow" :baseinfo="baseinfo" :row="row"> </table-row>
   </div>
 </template>
 <script>
-import moment from 'moment';
-import elementResizeEvent from '@dataspherestudio/shared/common/helper/elementResizeEvent';
-import resultsExport from './resultsExport.vue';
-import tableRow from './tableRow.vue';
-import mixin from '@dataspherestudio/shared/common/service/mixin';
-import api from '@dataspherestudio/shared/common/service/api';
-import storage from '@dataspherestudio/shared/common/helper/storage';
+import moment from 'moment'
+import elementResizeEvent from '@dataspherestudio/shared/common/helper/elementResizeEvent'
+import resultsExport from './resultsExport.vue'
+import tableRow from './tableRow.vue'
+import mixin from '@dataspherestudio/shared/common/service/mixin'
+import api from '@dataspherestudio/shared/common/service/api'
+import storage from '@dataspherestudio/shared/common/helper/storage'
 import plugin from '@dataspherestudio/shared/common/util/plugin'
 
 const extComponents = plugin.emitHook('script_result_toolbar') || []
@@ -217,19 +238,19 @@ export default {
     },
     dispatch: {
       type: Function,
-      required: true
+      required: true,
     },
     getResultUrl: {
       type: String,
-      defalut: `filesystem`
+      defalut: `filesystem`,
     },
     work: {
-      type: Object
+      type: Object,
     },
     resultType: {
       type: String,
-      defalut: ''
-    }
+      defalut: '',
+    },
   },
   data() {
     return {
@@ -245,7 +266,7 @@ export default {
         coding: '1',
         nullValue: '1',
         splitChar: '1',
-        keepNewline: '0'
+        keepNewline: '0',
       },
       isIconLabelShow: true,
       iconSize: 14,
@@ -258,27 +279,50 @@ export default {
         { label: this.$t('message.scripts.hiveTableExport.ZBF'), value: '3' },
         { label: this.$t('message.scripts.hiveTableExport.KG'), value: '4' },
         { label: this.$t('message.scripts.hiveTableExport.SX'), value: '5' },
-      ]
-    };
+      ],
+    }
   },
   computed: {
     isAll() {
-      return ['hql', 'sql'].includes(this.script.runType) && this.download.format === '2';
+      return (
+        ['hql', 'sql'].includes(this.script.runType) &&
+        this.download.format === '2' && this.getResultUrl !== 'dss/apiservice'
+      )
     },
     toolbarShow() {
-      let isScriptis = this.$route.name === 'Home' || (this.$route.name === 'results' && this.$route.query.from === 'Home')
-      return  {
-        export: this.baseinfo.exportResEnable !== false && isScriptis && this.activeTool === 'table' && this.resultType === '2',
-        download: this.activeTool === 'table' && this.baseinfo.downloadResEnable  !== false,
+      let isScriptis =
+        this.$route.name === 'Home' ||
+        (this.$route.name === 'results' && this.$route.query.from === 'Home')
+      let canDownload = true
+      let canFilter = true
+      try {
+        // display_prohibited、column_limit_display的结果集不支持下载
+        if (this.script.resultList[this.script.resultSet].result.tipMsg) {
+          canDownload = false
+          canFilter = false
+        }
+      } catch (error) {
+        //
+      }
+      return {
+        filter: canFilter,
+        export:
+          this.baseinfo.exportResEnable !== false &&
+          isScriptis &&
+          this.activeTool === 'table' &&
+          this.resultType === '2',
+        download:
+          this.activeTool === 'table' &&
+          this.baseinfo.downloadResEnable !== false && canDownload,
       }
     },
     resultList() {
-      return this.script.resultList || [];
-    }
+      return this.script.resultList || []
+    },
   },
   mounted() {
-    this.baseinfo = storage.get("baseInfo", "local") || {}
-    elementResizeEvent.bind(this.$el, this.resize);
+    this.baseinfo = storage.get('baseInfo', 'local') || {}
+    elementResizeEvent.bind(this.$el, this.resize)
   },
   methods: {
     openPopup(type) {
@@ -288,39 +332,37 @@ export default {
           coding: '1',
           nullValue: '1',
           splitChar: '1',
-          keepNewline: '0'
+          keepNewline: '0',
         }
       }
       if (type === 'export') {
-        this.$refs.exportToShare.open();
+        this.$refs.exportToShare.open()
       } else if (type === 'rowView') {
-        this.$refs.tableRow.open();
+        this.$refs.tableRow.open()
       } else if (type === 'filter') {
-        this.$emit('on-filter');
+        this.$emit('on-filter')
       } else {
-        this.popup[type] = true;
+        this.popup[type] = true
       }
     },
     cancelPopup(type) {
-      this.popup[type] = false;
+      this.popup[type] = false
     },
     confirm(type) {
-      this[`${type}Confirm`]();
-      this.cancelPopup(type);
+      this[`${type}Confirm`]()
+      this.cancelPopup(type)
     },
     pause(msec) {
-      return new Promise(
-        (resolve) => {
-          setTimeout(resolve, msec || 1000);
-        }
-      );
+      return new Promise((resolve) => {
+        setTimeout(resolve, msec || 1000)
+      })
     },
     async downloadAll(list, cb) {
-      const current = list.slice(0, 10);
-      cb && cb(current);
-      list = list.slice(10, list.length);
-      if(list.length > 0) {
-        await this.pause();
+      const current = list.slice(0, 10)
+      cb && cb(current)
+      list = list.slice(10, list.length)
+      if (list.length > 0) {
+        await this.pause()
         this.downloadAll(list, cb)
       }
     },
@@ -329,95 +371,141 @@ export default {
         title: this.$t('message.common.Prompt'),
         content: this.$t('message.common.safetips'),
         onOk: async () => {
-          const splitor = this.download.format === '1' ? 'csv' : 'xlsx';
-          const charset = this.download.coding === '1' ? 'utf-8' : 'gbk';
-          const nullValue = this.download.nullValue === '1' ? 'NULL' : 'BLANK';
-          const keepNewline = this.download.keepNewline === '1' ? 'true' : 'false';
-          const timestamp = moment.unix(moment().unix()).format('MMDDHHmm');
+          const splitor = this.download.format === '1' ? 'csv' : 'xlsx'
+          const charset = this.download.coding === '1' ? 'utf-8' : 'gbk'
+          const nullValue = this.download.nullValue === '1' ? 'NULL' : 'BLANK'
+          const keepNewline =
+            this.download.keepNewline === '1' ? 'true' : 'false'
+          const timestamp = moment.unix(moment().unix()).format('MMDDHHmm')
           let fileName = ''
-          if ( this.script.fileName && this.script.fileName !== 'undefined') {
+          if (this.script.fileName && this.script.fileName !== 'undefined') {
             fileName = this.script.fileName
-          } else if(this.script.title && this.script.title !== 'undefined') {
+          } else if (this.script.title && this.script.title !== 'undefined') {
             fileName = this.script.title
           }
-          const filename = `Result_${fileName}_${timestamp}`;
-          let temPath = this.currentPath;
-          let querys = `&charset=${charset}&outputFileType=${splitor}&nullValue=${nullValue}&autoFormat=${this.autoFormat}&keepNewline=${keepNewline}`;
+          const filename = `Result_${fileName}_${timestamp}`
+          let temPath = this.currentPath
+          let querys = `&charset=${charset}&outputFileType=${splitor}&nullValue=${nullValue}&autoFormat=${this.autoFormat}&keepNewline=${keepNewline}`
           // 如果是api执行页获取结果集，需要带上taskId
-          if(this.getResultUrl !== 'filesystem') {
+          if (this.getResultUrl !== 'filesystem') {
             querys += `&taskId=${this.work.taskID}`
           } else {
-            const res = await api.fetch('/dss/scriptis/userLimits', 'get');
-            if(res && res.userLimits && res.userLimits.downloadCount) {
-              querys+= `&limit=${res.userLimits.downloadCount}`
+            const res = await api.fetch('/dss/scriptis/userLimits', 'get')
+            if (res && res.userLimits && res.userLimits.downloadCount) {
+              querys += `&limit=${res.userLimits.downloadCount}`
             }
           }
-          const splitChar = [',',';','\t',' ','|'][this.download.splitChar - 1] || ','
-          if(this.download.format == 1) {
+          const splitChar =
+            [',', ';', '\t', ' ', '|'][this.download.splitChar - 1] || ','
+          if (this.download.format == 1) {
             querys += `&csvSeparator=${encodeURIComponent(splitChar)}`
           }
           // 下载之前条用心跳接口确认是否登录
-          await api.fetch('/user/heartbeat', 'get');
+          await api.fetch('/user/heartbeat', 'get')
           // 全量下载和下载当前结果集
-          let apiPath = `${this.getResultUrl}/resultsetToExcel`;
-          let flag = false;
+          let apiPath = `${this.getResultUrl}/resultsetToExcel`
+          let flag = false
           if (this.allDownload && +this.download.format == 1) {
-            const eventList = [];
+            const eventList = []
             this.downloadAll(this.resultList, (items) => {
-              for(let index = 0; index < items.length; index++) {
-                const item = items[index];
-                const name = `ResultSet${Number(item.path.substring(temPath.lastIndexOf('/')).split('.')[0].split('_')[1]) + 1}`
+              for (let index = 0; index < items.length; index++) {
+                const item = items[index]
+                // 数据服务的文件path序号从1开始，script的文件path序号从0开始 无法统一，命名序号直接写死，从1开始递增
+                // const name = `ResultSet${
+                //   Number(
+                //     item.path
+                //       .substring(temPath.lastIndexOf('/'))
+                //       .split('.')[0]
+                //       .split('_')[1]
+                //   )+1
+                // }`
+                const name = `ResultSet${index + 1}`
                 const queryStr = `${querys}&outputFileName=${name}&path=${item.path}`
-                let url = `${window.location.protocol}//${window.location.host}/api/rest_j/v1/${apiPath}?` + queryStr;
-                eventList.push(this.downloadFile(url, item.path));
+                let url =
+                  `${window.location.protocol}//${window.location.host}/api/rest_j/v1/${apiPath}?` +
+                  queryStr
+                eventList.push(this.downloadFile(url, item.path))
               }
             })
-            if(eventList.filter(Boolean).length === this.resultList.length) {
-              flag = true;
+            if (eventList.filter(Boolean).length === this.resultList.length) {
+              flag = true
             }
-          } else if(this.isAll && this.allDownload && +this.download.format == 2) {
-            temPath = temPath.substring(0, temPath.lastIndexOf('/'));
+          } else if (
+            this.isAll &&
+            this.allDownload &&
+            +this.download.format == 2
+          ) {
+            // 只有script中支持excel的全量下载，数据服务不支持
+            temPath = temPath.substring(0, temPath.lastIndexOf('/'))
             apiPath = `${this.getResultUrl}/resultsetsToExcel`
             querys += `&outputFileName=${filename}&path=${temPath}`
-            let url = `${window.location.protocol}//${window.location.host}/api/rest_j/v1/${apiPath}?` + querys
-            flag = this.downloadFile(url, temPath);
+            let url =
+              `${window.location.protocol}//${window.location.host}/api/rest_j/v1/${apiPath}?` +
+              querys
+            flag = this.downloadFile(url, temPath)
           } else {
             querys += `&outputFileName=${filename}&path=${temPath}`
-            let url = `${window.location.protocol}//${window.location.host}/api/rest_j/v1/${apiPath}?` + querys
-            flag = this.downloadFile(url, temPath);
+            let url =
+              `${window.location.protocol}//${window.location.host}/api/rest_j/v1/${apiPath}?` +
+              querys
+            flag = this.downloadFile(url, temPath)
           }
           this.$nextTick(() => {
             if (flag) {
-              this.$Message.success(this.$t('message.common.toolbar.success.download'));
+              this.$Message.success(
+                this.$t('message.common.toolbar.success.download')
+              )
             }
-          });
-        }
-      });
+          })
+        },
+      })
     },
     downloadFile(url, temPath) {
       // 下载记录日志
-      api.fetch('/dss/scriptis/audit/download/save', {
-        creator: this.baseinfo.username,
-        tenant: this.baseinfo.proxyUserName,
-        path: temPath,
-        sql: this.script.executionCode || '',
-        createTime: Date.now()
-      }, 'post').catch(()=>{});
-      const link = document.createElement('a');
-      link.setAttribute('href', url);
-      link.setAttribute('download', '');
-      const evObj = document.createEvent('MouseEvents');
-      evObj.initMouseEvent('click', true, true, window, 0, 0, 0, 0, 0, false, false, true, false, 0, null);
-      return link.dispatchEvent(evObj);
+      api
+        .fetch(
+          '/dss/scriptis/audit/download/save',
+          {
+            creator: this.baseinfo.username,
+            tenant: this.baseinfo.proxyUserName,
+            path: temPath,
+            sql: this.script.executionCode || '',
+            createTime: Date.now(),
+          },
+          'post'
+        )
+        .catch(() => {})
+      const link = document.createElement('a')
+      link.setAttribute('href', url)
+      link.setAttribute('download', '')
+      const evObj = document.createEvent('MouseEvents')
+      evObj.initMouseEvent(
+        'click',
+        true,
+        true,
+        window,
+        0,
+        0,
+        0,
+        0,
+        0,
+        false,
+        false,
+        true,
+        false,
+        0,
+        null
+      )
+      return link.dispatchEvent(evObj)
     },
     resize() {
-      const height = window.getComputedStyle(this.$refs.toolbar).height;
+      const height = window.getComputedStyle(this.$refs.toolbar).height
       if (parseInt(height) <= 190) {
-        this.isIconLabelShow = false;
-        this.iconSize = 20;
+        this.isIconLabelShow = false
+        this.iconSize = 20
       } else {
-        this.isIconLabelShow = true;
-        this.iconSize = 14;
+        this.isIconLabelShow = true
+        this.iconSize = 14
       }
     },
     changeViewType(type, viewType = 'table') {
@@ -430,45 +518,46 @@ export default {
       if (evt && evt.callFn && typeof this[evt.callFn] === 'function') {
         this[evt.callFn](...evt.params)
       }
-    }
+    },
   },
   beforeDestroy() {
-    elementResizeEvent.unbind(this.$el, this.resize);
+    elementResizeEvent.unbind(this.$el, this.resize)
   },
-};
+}
 </script>
 <style lang="scss" scoped>
 @import '@dataspherestudio/shared/common/style/variables.scss';
-  .we-toolbar-wrap {
-    width: $toolbarWidth;
+.we-toolbar-wrap {
+  width: $toolbarWidth;
+  height: 100%;
+  word-break: break-all;
+  position: $absolute;
+  left: 40px;
+  margin-left: -$toolbarWidth;
+  @include bg-color($light-base-color, $dark-menu-base-color);
+  .we-toolbar {
+    width: 100%;
     height: 100%;
-    word-break: break-all;
-    position: $absolute;
-    left: 40px;
-    margin-left: -$toolbarWidth;
-    @include bg-color($light-base-color, $dark-menu-base-color);
-    .we-toolbar {
-      width: 100%;
-      height: 100%;
-      border-right: 1px solid #dcdee2;
-      @include border-color($border-color-base, $dark-menu-base-color);
-      padding-top: 10px;
-      li {
-        padding-bottom: 20px;
-        text-align: center;
-        cursor: pointer;
-      }
-      span {
-        display: block;
-        line-height: 24px
-      }
+    border-right: 1px solid #dcdee2;
+    @include border-color($border-color-base, $dark-menu-base-color);
+    padding-top: 10px;
+    li {
+      padding-bottom: 20px;
+      text-align: center;
+      cursor: pointer;
     }
-    .we-toolbar-active {
-      i,span {
-        @include font-color($primary-color, $dark-primary-color);
-      }
+    span {
+      display: block;
+      line-height: 24px;
     }
   }
+  .we-toolbar-active {
+    i,
+    span {
+      @include font-color($primary-color, $dark-primary-color);
+    }
+  }
+}
 </style>
 <style>
 .ivu-poptip-body-content .row-item {
diff --git a/web/packages/shared/components/resourceSimple/index.vue b/web/packages/shared/components/resourceSimple/index.vue
index 7bc1d319f..55b0094c4 100644
--- a/web/packages/shared/components/resourceSimple/index.vue
+++ b/web/packages/shared/components/resourceSimple/index.vue
@@ -136,11 +136,11 @@ export default {
         this.$refs.engine.getEngineData();
       });
     },
-    getQueue() {
+    getQueue(type) {
       this.switcher = 'queue';
       this.getPointList();
       this.$nextTick(() => {
-        this.$refs.queue.getQueueList();
+        this.$refs.queue.getQueueList(type);
       });
     },
     open() {
@@ -151,7 +151,7 @@ export default {
       } else if (this.switcher === 'session') {
         this.getEngines();
       } else {
-        this.getQueue();
+        this.getQueue('current');
       }
     },
     close() {
diff --git a/web/packages/shared/components/resourceSimple/queue.vue b/web/packages/shared/components/resourceSimple/queue.vue
index b4cb219fe..547c63835 100644
--- a/web/packages/shared/components/resourceSimple/queue.vue
+++ b/web/packages/shared/components/resourceSimple/queue.vue
@@ -105,7 +105,7 @@ export default {
     };
   },
   methods: {
-    getQueueList() {
+    getQueueList(type) {
       this.loading = true;
       // 获取队列资源使用状态
       api.fetch('/linkisManager/rm/queues').then((res) => {
@@ -121,6 +121,10 @@ export default {
             this.queueList.push(obj)
           })
         });
+        if (type === 'current' && this.current) {
+          this.getQueueInfo(this.current);
+          return;
+        }
         this.current = this.queueList[0] ? this.queueList[0].text : '';
         this.getQueueInfo(this.queueList[0].text);
       }).catch(() => {
diff --git a/web/packages/shared/components/table/table.vue b/web/packages/shared/components/table/table.vue
index ecda28491..5e38b7a8b 100644
--- a/web/packages/shared/components/table/table.vue
+++ b/web/packages/shared/components/table/table.vue
@@ -179,7 +179,11 @@ export default {
       default(){
         return 16
       }
-    }
+    },
+    isOffset: {
+      type: Boolean,
+      default: true,
+    },
   },
   data() {
     return {
@@ -552,7 +556,7 @@ export default {
     // 判断是否出现竖直滚动条
     scrollBarWidthCalc() {
       let bottomDiv = this.$el.querySelector("#bottomDiv");
-      return  bottomDiv && bottomDiv.scrollHeight > bottomDiv.clientHeight ? this.scrollBarWidth : 0
+      return  bottomDiv && bottomDiv.scrollHeight > bottomDiv.clientHeight && this.isOffset ? this.scrollBarWidth : 0
     },
     mousedown(e) {
       if (e && e.target && e.target.dataset.colIndex) {
diff --git a/web/packages/workflows/assets/styles/workflow.scss b/web/packages/workflows/assets/styles/workflow.scss
index 77ded9282..25bff54ab 100644
--- a/web/packages/workflows/assets/styles/workflow.scss
+++ b/web/packages/workflows/assets/styles/workflow.scss
@@ -177,7 +177,7 @@
       position: relative;
       flex: 1;
       .tabs-content {
-        /deep/ .ivu-tabs-tab {
+        ::v-deep .ivu-tabs-tab {
           font-size: $font-size-large;
         }
       }
diff --git a/web/packages/workflows/module/common/tabList/index.scss b/web/packages/workflows/module/common/tabList/index.scss
index 42c73306c..778c692ed 100644
--- a/web/packages/workflows/module/common/tabList/index.scss
+++ b/web/packages/workflows/module/common/tabList/index.scss
@@ -36,7 +36,7 @@
         min-width: 320px;
         .ivu-breadcrumb {
           font-size: 21px;
-          /deep/.ivu-breadcrumb-item-separator {
+          ::v-deep.ivu-breadcrumb-item-separator {
             // color: rgba(0,0,0,0.65);
             @include font-color($light-text-color, $dark-text-color);
           }
diff --git a/web/packages/workflows/module/ide/index.vue b/web/packages/workflows/module/ide/index.vue
index 49fd76c64..c8a80d189 100644
--- a/web/packages/workflows/module/ide/index.vue
+++ b/web/packages/workflows/module/ide/index.vue
@@ -156,8 +156,9 @@ export default {
     resize() {
       this.navHeight = window.innerHeight;
     },
-    'IDE:saveNode'(args) {
+    'IDE:saveNode'(args, showTips = true) {
       if (args.node && this.node.key === args.node.key) {
+        args.showTips = showTips;
         this.$emit('save', args);
       }
     },
diff --git a/web/packages/workflows/module/process/component/console.vue b/web/packages/workflows/module/process/component/console.vue
index b246b79b0..6b408badb 100644
--- a/web/packages/workflows/module/process/component/console.vue
+++ b/web/packages/workflows/module/process/component/console.vue
@@ -215,7 +215,8 @@ export default {
           'path': this.execute.currentResultPath,
           'current': 1,
           'size': 20,
-          hugeData: !!ret.hugeData
+          hugeData: !!ret.hugeData,
+          tipMsg: ret.tipMsg
         };
         if (this.execute.resultList[0]) {
           this.$set(this.execute.resultList[0], 'result', storeResult);
@@ -400,19 +401,38 @@ export default {
         const url = '/filesystem/openFile';
         api.fetch(url, {
           path: resultPath,
+          enableLimit: true,
           pageSize,
         }, 'get')
           .then((ret) => {
             let result =  {}
-            if (ret.metadata && ret.metadata.length >= 500) {
+            if (ret.display_prohibited) {
               result = {
                 'headRows': [],
                 'bodyRows': [],
                 'total': ret.totalLine,
                 'type': ret.type,
                 'path': resultPath,
-                hugeData: true
-              }
+                hugeData: true,
+                tipMsg: localStorage.getItem("locale") === "en" ? ret.en_msg : ret.zh_msg
+              };
+            } else if (ret.column_limit_display) {
+              result = {
+                tipMsg: localStorage.getItem("locale") === "en" ? ret.en_msg : ret.zh_msg,
+                'headRows': ret.metadata,
+                'bodyRows': ret.fileContent,
+                // 如果totalLine是null，就显示为0
+                'total': ret.totalLine ? ret.totalLine : 0,
+                // 如果内容为null,就显示暂无数据
+                'type': ret.fileContent ? ret.type : 0,
+                'cache': {
+                  offsetX: 0,
+                  offsetY: 0,
+                },
+                'path': resultPath,
+                'current': 1,
+                'size': 20,
+              };
             } else {
               result = {
                 'headRows': ret.metadata,
diff --git a/web/packages/workflows/module/process/component/designtoolbar.vue b/web/packages/workflows/module/process/component/designtoolbar.vue
index 006c6bfd0..0f9ecb0e3 100644
--- a/web/packages/workflows/module/process/component/designtoolbar.vue
+++ b/web/packages/workflows/module/process/component/designtoolbar.vue
@@ -41,7 +41,7 @@
           </div>
           <div class="devider" />
           <div
-            v-if="!workflowIsExecutor"
+            v-if="!workflowIsExecutor && viewMode !== 'table'"
             :title="$t('message.workflow.process.run')"
             class="button"
             @click="handleClick('clickswitch')"
@@ -49,9 +49,9 @@
             <SvgIcon class="icon" icon-class="stop" color="#666" />
             <span>{{ $t('message.workflow.process.run') }}</span>
           </div>
-          <div class="devider" v-if="!workflowIsExecutor" />
+          <div class="devider" v-if="!workflowIsExecutor && viewMode !== 'table'" />
           <div
-            v-if="!workflowIsExecutor"
+            v-if="!workflowIsExecutor && viewMode !== 'table'"
             :title="$t('message.workflow.process.run')"
             class="button"
             @click="handleClick('clickswitch', 'select')"
@@ -60,7 +60,7 @@
             <span>{{ $t('message.workflow.SelectRun') }}</span>
           </div>
           <div
-            v-if="workflowIsExecutor"
+            v-if="workflowIsExecutor && viewMode !== 'table'"
             :title="$t('message.workflow.process.stop')"
             class="button"
             @click="handleClick('clickswitch')"
@@ -73,16 +73,16 @@
             />
             <span>{{ $t('message.workflow.process.stop') }}</span>
           </div>
-          <div class="devider" v-if="needReRun" />
+          <div class="devider" v-if="needReRun && viewMode !== 'table'" />
           <div
-            v-if="!workflowIsExecutor && needReRun"
+            v-if="!workflowIsExecutor && needReRun && viewMode !== 'table'"
             class="button"
             @click="handleClick('reRun')"
           >
             <Icon class="icon" type="ios-refresh" color="#666" size="18" />
             <span>{{ $t('message.workflow.Rerun') }}</span>
           </div>
-          <div class="devider" />
+          <div class="devider" v-if="viewMode !== 'table'" />
           <div
             :title="$t('message.workflow.process.save')"
             class="button"
diff --git a/web/packages/workflows/module/process/component/nodeparameter.vue b/web/packages/workflows/module/process/component/nodeparameter.vue
index 060aeaa8a..571194d25 100644
--- a/web/packages/workflows/module/process/component/nodeparameter.vue
+++ b/web/packages/workflows/module/process/component/nodeparameter.vue
@@ -194,6 +194,7 @@ export default {
         }
       })
       this.isRefTemplate = this.currentNode.ecConfTemplateId ? '1':'0'
+      jobParams['ec-conf-templateId'] = this.currentNode.ecConfTemplateId
       this.$set(this.currentNode, 'jobParams', jobParams);
     }
   },
@@ -218,17 +219,22 @@ export default {
           if(v.workflowDefault) {
             this.$set(this.currentNode, 'ecConfTemplateName', v.templateName);
             this.$set(this.currentNode, 'ecConfTemplateId', v.templateId);
-            this.currentNode.jobParams['ec.conf.templateId'] = v.templateId
+            this.currentNode.jobParams['ec-conf-templateId'] = v.templateId
             this.currentNode.params.configuration['startup']['ec.conf.templateId'] = v.templateId
           }
         })
+      } else if (this.currentNode.ecConfTemplateName) {
+        this.currentNode.jobParams['ec-conf-templateId'] = this.currentNode.ecConfTemplateId
+      }
+      if (v === '0') {
+        delete this.currentNode.jobParams['ec-conf-templateId']
       }
     },
     // 选择参数模板
     handleTemplateSelect(templateObj) {
       this.$set(this.currentNode, 'ecConfTemplateName', templateObj.templateName);
       this.$set(this.currentNode, 'ecConfTemplateId', templateObj.templateId);
-      this.currentNode.jobParams['ec.conf.templateId'] = templateObj.templateId
+      this.currentNode.jobParams['ec-conf-templateId'] = templateObj.templateId
       this.currentNode.params.configuration['startup']['ec.conf.templateId'] = templateObj.templateId
     },
     // 打开选择参数模板的抽屉
@@ -453,10 +459,10 @@ export default {
         if (this.isRefTemplate === '0') {
           delete this.currentNode.ecConfTemplateId
           delete this.currentNode.ecConfTemplateName
-          delete this.currentNode.jobParams['ec.conf.templateId']
+          delete this.currentNode.jobParams['ec-conf-templateId']
           delete this.currentNode.params.configuration['startup']['ec.conf.templateId']
         } else {
-          this.currentNode.jobParams['ec.conf.templateId'] = this.currentNode.ecConfTemplateId
+          this.currentNode.jobParams['ec-conf-templateId'] = this.currentNode.ecConfTemplateId
           this.currentNode.params.configuration['startup']['ec.conf.templateId'] = this.currentNode.ecConfTemplateId
         }
       });
@@ -520,21 +526,36 @@ export default {
       }
     },
     /**
-     * 检查数据是否符合条件
+     * 检查数据是否符合条件，仅支持runtime starup参数配置时控制
+     *  ${params.configuration.runtime['only.receive.today']}=='true'
+     *  !${params.configuration.startup['ec.conf.templateId']}
      * @param {*} data
      * @param {*} condition
      * @returns
      */
     checkShow(item) {
       const data = this.currentNode
-      if (item.condition && this.isRefTemplate == 1) {
+      if (item.condition) {
+        let condition = item.condition
+        // condition 示例：
+        // ${params.configuration.runtime['only.receive.today']}
+        // !${params.configuration.startup['ec.conf.templateId']}
+        // 后端配置根据params路径位置写规则
+        // 前端编辑参数存在jobParams，需要转换，以上示例转换如下
+        // ${jobParams['only-receive-today']}
+        // !${jobParams['ec-conf-templateId']}
+        if (condition.indexOf('params.configuration') > 0) {
+          condition = condition.replace(/params\.configuration\.runtime/g,'jobParams').replace(/params\.configuration\.startup/g,'jobParams')
+          condition = this.poinToLink(condition)
+        }
         let Fn = Function
-        let fn = item.condition.replace(/\${([^}]+)}/g, function (a, b) {
+        let fn = condition.replace(/\${([^}]+)}/g, function (a, b) {
           return `__node__data.${b}`
         })
         try {
           return new Fn('__node__data', 'return ' + fn)(data);
         } catch (e) {
+          console.log(e)
           //
         }
       }
diff --git a/web/packages/workflows/module/process/index.vue b/web/packages/workflows/module/process/index.vue
index 18a0433e2..f4e4444b9 100644
--- a/web/packages/workflows/module/process/index.vue
+++ b/web/packages/workflows/module/process/index.vue
@@ -219,7 +219,7 @@ export default {
         this.choose(active);
       }
     },
-    check(node) {
+    check(node, showTips = true) {
       if (node) {
         let boolean = true;
         this.tabs.map(item => {
@@ -233,12 +233,12 @@ export default {
             boolean = true;
           }
         });
-        if (!boolean) {
+        if (!boolean && showTips) {
           this.$Message.warning(this.$t("message.workflow.process.index.CCXE"));
         }
         return boolean;
       } else {
-        if (this.tabs.length > 10) {
+        if (this.tabs.length > 10 && showTips) {
           this.$Message.warning(this.$t("message.workflow.process.index.CCXE"));
           return false;
         }
@@ -387,9 +387,10 @@ export default {
       }
     },
     saveIDE(index, args) {
-      if (!this.check()) {
+      if (!this.check(null, args[0].showTips)) {
         return;
       }
+      delete args[0].showTips;
       if (args[0].data) {
         this.tabs[index].data = args[0].data;
       }
diff --git a/web/packages/workflows/module/process/module.vue b/web/packages/workflows/module/process/module.vue
index 02771756e..322ea927d 100644
--- a/web/packages/workflows/module/process/module.vue
+++ b/web/packages/workflows/module/process/module.vue
@@ -859,8 +859,8 @@ export default {
         this.props = json.props;
         this.scheduleParams = json.scheduleParams || {};
       }
-      if (json.config) {
-        json.config.type && (this.viewMode = json.config.type)
+      if (json.config && json.config.type != 'table') {
+        this.viewMode = json.config.type
       }
       this.$nextTick(() => {
         this.loading = false;
@@ -954,8 +954,8 @@ export default {
       clearTimeout(this.timerClick);
       this.timerClick = setTimeout(() => {
         if (this.workflowIsExecutor) return;
-        this.initNode(arg);
         this.nodebaseinfoShow = true;
+        this.initNode(arg);
         this.$emit('node-click', arg);
       }, 200);
     },
@@ -1108,11 +1108,13 @@ export default {
           onOk: () => {
             this.saveModal = false;
             let json = JSON.parse(JSON.stringify(this.json));
-            json.nodes.forEach((node) => {
-              this.$refs.process.setNodeRunState(node.key, {
-                borderColor: '#6A85A7',
+            if (this.viewMode !== 'table' && this.$refs.process) {
+              json.nodes.forEach((node) => {
+                this.$refs.process.setNodeRunState(node.key, {
+                  borderColor: '#6A85A7',
+                })
               })
-            })
+            }
             this.autoSave(this.$t('message.workflow.Manually'), false);
           },
           onCancel: () => {
@@ -1121,11 +1123,13 @@ export default {
       } else {
         this.saveModal = false;
         let json = JSON.parse(JSON.stringify(this.json));
-        json.nodes.forEach((node) => {
-          this.$refs.process.setNodeRunState(node.key, {
-            borderColor: '#6A85A7',
+        if (this.viewMode !== 'table' && this.$refs.process) {
+          json.nodes.forEach((node) => {
+            this.$refs.process.setNodeRunState(node.key, {
+              borderColor: '#6A85A7',
+            })
           })
-        })
+        }
         this.autoSave(this.$t('message.workflow.Manually'), false);
       }
     },
@@ -1182,7 +1186,7 @@ export default {
       // 拖拽模式保存
       json.config = {
         ...json.config,
-        type: this.viewMode
+        type: this.viewMode === 'table' ? this.preDragViewMode || 'vueprocess' : this.viewMode
       }
       if (flage) return this.$Message.warning(this.$t('message.workflow.validNameDesc'));
       const isFiveNode = json.nodes.filter((item) => {
@@ -1234,7 +1238,7 @@ export default {
           this.$Notice.success({
             desc: this.$t('message.workflow.process.autoSaveWorkflow'),
           });
-        }
+        }        
         this.jsonChange = false;
         // 保存成功后去更新tab的工作流数据
         this.$emit('updateWorkflowList');
@@ -2569,6 +2573,7 @@ export default {
           }
         })
       } else if(mode || this.preDragViewMode) {
+
         this.viewMode = mode || this.preDragViewMode
         if (this.viewMode !== 'table') {
           this.preDragViewMode = this.viewMode
@@ -2591,10 +2596,6 @@ export default {
               element.layout.y = element.layout.y + y * -1
             });
           }
-          // 新模式切换旧模式，连线类型修改
-          this.json.edges.forEach(element => {
-            element.linkType = 'curve'
-          });
         }
         this.originalData = this.json;
       }
diff --git a/web/packages/workflows/view/workflow/importModal.vue b/web/packages/workflows/view/workflow/importModal.vue
index 38a12f9ec..fad545c4c 100644
--- a/web/packages/workflows/view/workflow/importModal.vue
+++ b/web/packages/workflows/view/workflow/importModal.vue
@@ -91,9 +91,9 @@ export default {
       this.$refs['formRef'].validate(async (valid) => {
         if (valid) {
           try {
-            await this.importAction()
+            const res = await this.importAction();
             // this.$Message.success()
-            this.$emit('finish', this.project)
+            this.$emit('finish', this.project, res.importOrcId)
             this.$emit('_changeVisible', false)
             this.$refs['formRef'].resetFields()
           } catch (error) {
diff --git a/web/packages/workflows/view/workflow/index.vue b/web/packages/workflows/view/workflow/index.vue
index 9bcbf6aaa..21216061e 100644
--- a/web/packages/workflows/view/workflow/index.vue
+++ b/web/packages/workflows/view/workflow/index.vue
@@ -1,163 +1,177 @@
 <template>
-  <div class="workflow-wrap">
-    <div class="workflow-nav-tree" :class="{ 'tree-fold': treeFold }">
-      <div class="workflow-nav-tree-switch" @click="handleTreeToggle">
-        <span class="project-nav-tree-top-t-icon">
-          <SvgIcon
-            icon-class="dev_center_flod"
-            style="opacity: 0.65"
-          />
-        </span>
-      </div>
-      <div class="project-nav-tree">
-        <div class="project-nav-tree-top">
-          <div class="project-nav-tree-top-t">
-            <span class="project-nav-tree-top-t-txt">{{ $t('message.workflow.Project') }}</span>
-            <div class="project-nav-tree-top-t-icon">
-              <SvgIcon class="icon sort-icon" icon-class="xinzeng" style="display: inline-flex;margin-top: 4px;" @click="createProject" />
-              <Dropdown class="sort-icon" @on-click="filerSort($event,'sort')">
-                <SvgIcon class="icon" :icon-class="filterBar.sort ==='name' ? 'text-sort' : 'down'" style="display: inline-flex;font-size:14px"/>
-                <DropdownMenu slot="list">
-                  <DropdownItem
-                    v-for="(item) in sortTypeList"
-                    :name="item.value"
-                    :key="item.value"
-                  >{{ item.lable}}</DropdownItem>
-                </DropdownMenu>
-              </Dropdown>
-              <Dropdown class="projcat-icon" @on-click="filerSort($event,'filter')">
-                <Icon :type="{all: 'ios-funnel-outline',owner:'ios-person-add',share:'md-share'}[filterBar.cat] " class="icon" size="16"></Icon>
-                <DropdownMenu slot="list">
-                  <DropdownItem
-                    name="all"
-                    key="all"
-                  >{{ $t('message.workflow.AllProj') }}</DropdownItem>
-                  <DropdownItem
-                    name="owner"
-                    key="owner"
-                  >{{ $t('message.workflow.Individual') }}</DropdownItem>
-                  <DropdownItem
-                    name="share"
-                    key="share"
-                  >{{ $t('message.workflow.ShareProj') }}</DropdownItem>
-                </DropdownMenu>
-              </Dropdown>
+  <div class="workflow-wrap workflow-drag-wrap">
+    <we-panel
+      diretion="horizontal">
+      <we-panel-item
+        :index="1"
+        :width="panelWidth"
+        :min="minPanelWidth"
+        :max="maxPanelWidth"
+        @on-change="handlePanelChange"
+        class="left-panel">
+        <div class="workflow-nav-tree" :class="{ 'tree-fold': treeFold }">
+          <div class="workflow-nav-tree-switch" @click="handleTreeToggle">
+            <span class="project-nav-tree-top-t-icon">
               <SvgIcon
                 icon-class="dev_center_flod"
-                class="icon"
-                style="opacity: 0.65;margin-top: 2px;"
-                @click="handleTreeToggle"
+                style="opacity: 0.65"
               />
+            </span>
+          </div>
+          <div class="project-nav-tree">
+            <div class="project-nav-tree-top">
+              <div class="project-nav-tree-top-t">
+                <span class="project-nav-tree-top-t-txt">{{ $t('message.workflow.Project') }}</span>
+                <div class="project-nav-tree-top-t-icon">
+                  <SvgIcon class="icon sort-icon" icon-class="xinzeng" style="display: inline-flex;margin-top: 4px;" @click="createProject" />
+                  <Dropdown class="sort-icon" @on-click="filerSort($event,'sort')">
+                    <SvgIcon class="icon" :icon-class="filterBar.sort ==='name' ? 'text-sort' : 'down'" style="display: inline-flex;font-size:14px"/>
+                    <DropdownMenu slot="list">
+                      <DropdownItem
+                        v-for="(item) in sortTypeList"
+                        :name="item.value"
+                        :key="item.value"
+                      >{{ item.lable}}</DropdownItem>
+                    </DropdownMenu>
+                  </Dropdown>
+                  <Dropdown class="projcat-icon" @on-click="filerSort($event,'filter')">
+                    <Icon :type="{all: 'ios-funnel-outline',owner:'ios-person-add',share:'md-share'}[filterBar.cat] " class="icon" size="16"></Icon>
+                    <DropdownMenu slot="list">
+                      <DropdownItem
+                        name="all"
+                        key="all"
+                      >{{ $t('message.workflow.AllProj') }}</DropdownItem>
+                      <DropdownItem
+                        name="owner"
+                        key="owner"
+                      >{{ $t('message.workflow.Individual') }}</DropdownItem>
+                      <DropdownItem
+                        name="share"
+                        key="share"
+                      >{{ $t('message.workflow.ShareProj') }}</DropdownItem>
+                    </DropdownMenu>
+                  </Dropdown>
+                  <SvgIcon
+                    icon-class="dev_center_flod"
+                    class="icon"
+                    style="opacity: 0.65;margin-top: 2px;"
+                    @click="handleTreeToggle"
+                  />
+                </div>
+              </div>
             </div>
+            <virtual-tree
+              class="tree-container"
+              keyText="id"
+              :size="32"
+              :list="projectsTree"
+              :render="renderNode"
+              :open="openNode"
+              :height="height - 30"
+              @we-open-node="openNodeChange"
+              @we-click="handleTreeClick" />
+            <Spin v-show="loadingTree" size="large" fix />
           </div>
-        </div>
-        <virtual-tree
-          class="tree-container"
-          keyText="id"
-          :size="32"
-          :list="projectsTree"
-          :render="renderNode"
-          :open="openNode"
-          :height="height - 30"
-          @we-open-node="openNodeChange"
-          @we-click="handleTreeClick" />
-        <Spin v-show="loadingTree" size="large" fix />
-      </div>
-      <WorkflowModal
-        :treeModalShow="treeModalShow"
-        :currentTreeProject="currentTreeProject"
-        :orchestratorModeList="orchestratorModeList"
-        :currentMode="currentMode"
-        :selectOrchestratorList="selectOrchestratorList"
-        :projectNameList="formatProjectNameList"
-        @on-tree-modal-cancel="handleTreeModalCancel"
-        @on-tree-modal-confirm="handleTreeModalConfirm"
-      >
-      </WorkflowModal>
-    </div>
-
-    <WorkflowTabList
-      :class="{ 'tree-fold': treeFold }"
-      :treeFold="treeFold"
-      :loading="loading"
-      :modeOfKey="modeOfKey"
-      :buttonText="selectDevprocess"
-      :bottomTapList="tabList"
-      :modeName="modeName"
-      :currentTab="current"
-      @bandleTapTab="onTabClick"
-      @handleTabRemove="onTabRemove"
-      @handleChangeButton="handleChangeButton"
-    >
-      <template v-if="modeOfKey === DEVPROCESS.DEVELOPMENTCENTER">
-        <div
-          class="workflowListContainer"
-          v-show="(tabList.length < 1 && projectsTree.length > 0)"
-        >
-          <Workflow
-            class="workflowListLeft"
-            ref="workflow"
-            :refreshFlow="refreshFlow"
-            :projectData="currentProjectData"
+          <WorkflowModal
+            :treeModalShow="treeModalShow"
+            :currentTreeProject="currentTreeProject"
             :orchestratorModeList="orchestratorModeList"
             :currentMode="currentMode"
             :selectOrchestratorList="selectOrchestratorList"
-            :projectsTree="projectsTree"
-            :top-tab-list="tabList"
-            :create-project-handler="createProject"
-            @open-workflow="openWorkflow"
-            @delete-workflow="deleteWorkflow"
-            @rollback="onRollBack"
+            :projectNameList="formatProjectNameList"
+            @on-tree-modal-cancel="handleTreeModalCancel"
             @on-tree-modal-confirm="handleTreeModalConfirm"
           >
-          </Workflow>
+          </WorkflowModal>
         </div>
-
-        <template
-          v-for="(item, index) in tabList.filter(
-            (i) => i.type === DEVPROCESS.DEVELOPMENTCENTER
-          )"
+      </we-panel-item>
+      <we-panel-item
+        :index="2"
+        class="center-panel">
+        <WorkflowTabList
+          :class="{ 'tree-fold': treeFold }"
+          :treeFold="treeFold"
+          :loading="loading"
+          :modeOfKey="modeOfKey"
+          :buttonText="selectDevprocess"
+          :bottomTapList="tabList"
+          :modeName="modeName"
+          :currentTab="current"
+          @bandleTapTab="onTabClick"
+          @handleTabRemove="onTabRemove"
+          @handleChangeButton="handleChangeButton"
         >
-          <commonIframe
-            v-if="item.url && item.isIframe"
-            v-show="item.tabId === current.tabId"
-            :key="item.name"
-            :url="current.url"
-          ></commonIframe>
-          <process
-            v-else-if="item.orchestratorMode.startsWith(ORCHESTRATORMODES.WORKFLOW) && item.tabId === current.tabId"
-            :key="item.tabId"
-            :query="item.query"
-            @updateWorkflowList="updateWorkflowList"
-            @isChange="isChange(index, arguments)"
-            @close="onTabRemove(item.tabId, false)"
-            @open="reopen(item)"
-            @release="(p)=>{openItemAction({...p, name: `${item.name}(${$t('message.workflow.historicalVersion')})`})}"
-          ></process>
+          <template v-if="modeOfKey === DEVPROCESS.DEVELOPMENTCENTER">
+            <div
+              class="workflowListContainer"
+              v-show="(tabList.length < 1 && projectsTree.length > 0)"
+            >
+              <Workflow
+                class="workflowListLeft"
+                ref="workflow"
+                :refreshFlow="refreshFlow"
+                :projectData="currentProjectData"
+                :orchestratorModeList="orchestratorModeList"
+                :currentMode="currentMode"
+                :selectOrchestratorList="selectOrchestratorList"
+                :projectsTree="projectsTree"
+                :top-tab-list="tabList"
+                :create-project-handler="createProject"
+                @open-workflow="openWorkflow"
+                @delete-workflow="deleteWorkflow"
+                @rollback="onRollBack"
+                @on-tree-modal-confirm="handleTreeModalConfirm"
+              >
+              </Workflow>
+            </div>
+
+            <template
+              v-for="(item, index) in tabList.filter(
+                (i) => i.type === DEVPROCESS.DEVELOPMENTCENTER
+              )"
+            >
+              <commonIframe
+                v-if="item.url && item.isIframe"
+                v-show="item.tabId === current.tabId"
+                :key="item.name"
+                :url="current.url"
+              ></commonIframe>
+              <process
+                v-else-if="item.orchestratorMode.startsWith(ORCHESTRATORMODES.WORKFLOW) && item.tabId === current.tabId"
+                :key="item.tabId"
+                :query="item.query"
+                @updateWorkflowList="updateWorkflowList"
+                @isChange="isChange(index, arguments)"
+                @close="onTabRemove(item.tabId, false)"
+                @open="reopen(item)"
+                @release="(p)=>{openItemAction({...p, name: `${item.name}(${$t('message.workflow.historicalVersion')})`})}"
+              ></process>
+              <template v-else>
+                <!-- 其他模式 -->
+              </template>
+            </template>
+          </template>
+          <template v-if="modeOfKey === 'streamis_prod'">
+            <Streamis class="streamisContainer" :project-name="$route.query.projectName"/>
+          </template>
           <template v-else>
-            <!-- 其他模式 -->
+            <!-- 其他应用流程 -->
           </template>
-        </template>
-      </template>
-      <template v-if="modeOfKey === 'streamis_prod'">
-        <Streamis class="streamisContainer" :project-name="$route.query.projectName"/>
-      </template>
-      <template v-else>
-        <!-- 其他应用流程 -->
-      </template>
-    </WorkflowTabList>
-    <ProjectForm
-      ref="projectForm"
-      :action-type="actionType"
-      :project-data="currentProjectData"
-      :applicationAreaMap="applicationAreaMap"
-      :classify-list="cacheData"
-      :framework="true"
-      :workspace-users="workspaceUsers"
-      :orchestratorModeList="orchestratorModeList"
-      @getDevProcessData="getDevProcessData"
-      @confirm="ProjectConfirm"
-    ></ProjectForm>
+        </WorkflowTabList>
+        <ProjectForm
+          ref="projectForm"
+          :action-type="actionType"
+          :project-data="currentProjectData"
+          :applicationAreaMap="applicationAreaMap"
+          :classify-list="cacheData"
+          :framework="true"
+          :workspace-users="workspaceUsers"
+          :orchestratorModeList="orchestratorModeList"
+          @getDevProcessData="getDevProcessData"
+          @confirm="ProjectConfirm"
+        ></ProjectForm>
+      </we-panel-item>
+    </we-panel>
 
     <!-- 删除项目弹窗 -->
     <Modal
@@ -301,7 +315,11 @@ export default {
         accessUsers: [],
         releaseUsers: [],
         editUsers: []
-      }
+      },
+      panelWidth: 250,
+      minPanelWidth: 250,
+      maxPanelWidth: 375,
+      currentPanelWidth: 250
     }
   },
   filters,
@@ -401,8 +419,18 @@ export default {
       };
       this.$refs.projectForm.showProject(this.currentProjectData, 'add')
     },
+    handlePanelChange(data) {
+      if (data.width >= this.minPanelWidth && data.width <= this.maxPanelWidth) {
+        this.currentPanelWidth = data.width;
+      }
+    },
     handleTreeToggle() {
       this.treeFold = !this.treeFold;
+      if (this.treeFold) {
+        this.panelWidth = 1;
+      } else {
+        this.panelWidth = this.currentPanelWidth;
+      }
       setTimeout(()=>{
         eventbus.emit('workflow.fold.left.tree');
       }, 800)
@@ -450,11 +478,15 @@ export default {
       });
     },
     // 获取工程的数据
-    async getProjectData(callback) {
-      const data = await this.fetchProjectDataById()
-      this.currentProjectData = data
-      this.getSelectDevProcess();
-      this.getSelectOrchestratorList();
+    async getProjectData(callback, id) {
+      const data = await this.fetchProjectDataById(id)
+      if (data) {
+        this.currentProjectData = data
+        this.getSelectDevProcess();
+        this.getSelectOrchestratorList();
+      } else {
+        // 获取工程数据失败
+      }
       this.loading = false;
       if (callback) {
         callback()
@@ -474,13 +506,15 @@ export default {
           "post"
         )
         .then((res) => {
-          const project = res.projects[0];
-          setVirtualRoles(project, this.getUserName());
-          const data = {
-            ...res.projects[0],
-            canWrite: project.canWrite(),
-          };
-          return data;
+          if (res.projects.length) {
+            const project = res.projects[0];
+            setVirtualRoles(project, this.getUserName());
+            const data = {
+              ...res.projects[0],
+              canWrite: project.canWrite(),
+            };
+            return data;
+          }
         })
     },
     // 获取所有project展示tree
@@ -528,9 +562,12 @@ export default {
           resolve(flow);
         });
     },
-    importSended(target){
+    importSended(target, orchestratorId){
       this.getFlow({id: target.id, name: target.name}, (flows) => {
         this.reFreshTreeData({id: target.id, name: target.name}, flows)
+        this.tabList = this.tabList.filter(item => {
+          return item.query.orchestratorId !== orchestratorId
+        }) 
       })
     },
     handleTreeModal(project) {
@@ -672,6 +709,17 @@ export default {
         sure: false,
         ifDelOtherSys: this.ifDelOtherSys,
       };
+      const afterDelete = () => {
+        if (this.deleteProjectItem.id == this.currentProjectData.id) {
+          setTimeout(() => {
+            this.$router.go(-1);
+          }, 1000);
+        } else {
+          this.projectsTree  = this.projectsTree.filter((item) => {
+            return item.id != this.deleteProjectItem.id;
+          })
+        }
+      };
       api
         .fetch(`${this.$API_PATH.PROJECT_PATH}deleteProject`, params, "post")
         .then((res) => {
@@ -697,9 +745,7 @@ export default {
                         "message.workflow.success"
                       )}`
                     );
-                    setTimeout(() => {
-                      this.$router.go(0);
-                    }, 1000);
+                    afterDelete()
                   })
                   .catch(() => {
                     this.loading = false;
@@ -713,9 +759,7 @@ export default {
                 name: this.deleteProjectItem.name,
               })
             );
-            setTimeout(() => {
-              this.$router.go(0);
-            }, 1000);
+            afterDelete()
           }
         })
         .catch(() => {
@@ -980,7 +1024,7 @@ export default {
           )
           .then(() => {
             typeof callback == "function" && callback(true);
-            this.getProjectData();
+            this.getProjectData(() => {}, projectData.id);
             this.$Message.success(
               this.$t("message.common.projectDetail.eidtorProjectSuccess", {
                 name: projectData.name,
@@ -1590,9 +1634,28 @@ export default {
   font-size: 12px;
   @include font-color($light-text-color, $dark-text-color);
 }
+
+.workflow-drag-wrap {
+  .workflow-nav-tree {
+    position: unset;
+    width: 100%;
+    &.tree-fold {
+      position: fixed;
+    }
+    .project-nav-tree-top {
+      width: 100%;
+    }
+    .project-nav-tree {
+      width: 100%;
+    }
+  }
+  .workflowTabContainer {
+    margin-left: 0px;
+  }
+}
 </style>
 <style lang="scss">
-.workflow-wrap {
+.workflow-drag-wrap {
   .tree-container {
     .tree-info,.tree-add {
       display: none
@@ -1600,15 +1663,32 @@ export default {
     .node-item {
       height: 32px;
       line-height: 32px;
+      .node-name {
+        max-width: 100%;
+        display: inline-block;
+        vertical-align: top;
+      }
       &:hover {
+        .node-name {
+          max-width: 100%;
+          width: calc(100% - 64px);
+          display: inline-block;
+          vertical-align: top;
+        }
         .tree-info,.tree-add{
           display: block
         }
       }
-      .node-name {
-        max-width: 72%;
-        display: inline-block;
-        vertical-align: top;
+      &:not(.level-1):hover {
+        .node-name {
+          max-width: 100%;
+          width: calc(100% - 36px);
+          display: inline-block;
+          vertical-align: top;
+        }
+        .tree-info,.tree-add{
+          display: block
+        }
       }
     }
   }
diff --git a/web/packages/workspace/i18n/en.json b/web/packages/workspace/i18n/en.json
index 9bcd05217..88268d2f6 100644
--- a/web/packages/workspace/i18n/en.json
+++ b/web/packages/workspace/i18n/en.json
@@ -313,6 +313,9 @@
       "disableReq": "Please disable the rule first",
       "edit": "Edit",
       "deletesuccess": "Delete successfully",
+      "yes": "Yes",
+      "no": "No",
+      "crossCluster": "Whether it is a cross-cluster queue",
       "ruleform": {
         "edittitle": "Edit rules",
         "addtitle": "Add rules",
@@ -341,7 +344,8 @@
         "createUser": "Creator",
         "createTime": "Create time",
         "modifyTime": "Modify time",
-        "modifyUser": "Modifier"
+        "modifyUser": "Modifier",
+        "plsselectCross": "Select whether to cross-cluster"
       },
       "selectfirst": "Please select!",
       "hasBusy": "If an engine with busy status is selected, forcing it to stop will cause the running tasks on that engine to fail, so it is recommended to check with the engine creator before stopping.",
diff --git a/web/packages/workspace/i18n/zh.json b/web/packages/workspace/i18n/zh.json
index 6fd1a9970..9fe4fce85 100644
--- a/web/packages/workspace/i18n/zh.json
+++ b/web/packages/workspace/i18n/zh.json
@@ -313,6 +313,9 @@
       "disableReq": "请先禁用规则",
       "edit": "编辑",
       "deletesuccess": "删除成功",
+      "yes": "是",
+      "no": "否",
+      "crossCluster": "是否为跨集群队列",
       "ruleform": {
         "edittitle": "编辑释放规则",
         "addtitle": "新增释放规则",
@@ -341,7 +344,8 @@
         "createUser": "创建人",
         "createTime": "创建时间",
         "modifyTime": "修改时间",
-        "modifyUser": "修改人"
+        "modifyUser": "修改人",
+        "plsselectCross": "请选择是否为跨集群队列"
       },
       "selectfirst": "请先选择",
       "hasBusy": "存在状态为繁忙的引擎被选中，强制停止会导致该引擎上正在运行的任务失败，建议停止前与引擎创建者确认。",
diff --git a/web/packages/workspace/module/appProcess/index.vue b/web/packages/workspace/module/appProcess/index.vue
index 5a182a3fd..fcee68b17 100644
--- a/web/packages/workspace/module/appProcess/index.vue
+++ b/web/packages/workspace/module/appProcess/index.vue
@@ -134,7 +134,7 @@ export default {
       top: 50%;
       right: -40px;
       font-size: 30px;
-      /deep/.svg-icon {
+      ::v-deep.svg-icon {
         height: 20px;
       }
     }
diff --git a/web/packages/workspace/module/bankHome/index.scss b/web/packages/workspace/module/bankHome/index.scss
index 846639928..8be0e1446 100644
--- a/web/packages/workspace/module/bankHome/index.scss
+++ b/web/packages/workspace/module/bankHome/index.scss
@@ -325,7 +325,7 @@
         $workspace-body-bg-color,
         $dark-workspace-body-bg-color
       );
-      /deep/.ivu-tabs-nav {
+      ::v-deep.ivu-tabs-nav {
         @include font-color(
           $workspace-title-color,
           $dark-workspace-title-color
diff --git a/web/packages/workspace/module/management/module/productsettings.vue b/web/packages/workspace/module/management/module/productsettings.vue
index 1d2cfc42b..a5a39bb8f 100644
--- a/web/packages/workspace/module/management/module/productsettings.vue
+++ b/web/packages/workspace/module/management/module/productsettings.vue
@@ -154,7 +154,7 @@ export default {
       width: 100%;
       text-align: center;
       padding: 10px 19px;
-      /deep/ th.columnClass {
+      ::v-deep th.columnClass {
         // background-color: #515a6e;
         @include bg-color(#515a6e, #f3f3f3);
         // color: #FFF;
diff --git a/web/packages/workspace/module/managementPlatform/index.vue b/web/packages/workspace/module/managementPlatform/index.vue
index 9610f9c5a..44ac77176 100644
--- a/web/packages/workspace/module/managementPlatform/index.vue
+++ b/web/packages/workspace/module/managementPlatform/index.vue
@@ -469,7 +469,7 @@ $per-border-color: #dee4ec;
     width: 50px;
     height: 44px;
   }
-  /deep/.ivu-tooltip-inner {
+  ::v-deep.ivu-tooltip-inner {
     background-color: rgba(70, 76, 91, 1);
   }
 }
diff --git a/web/packages/workspace/module/newHome/index.scss b/web/packages/workspace/module/newHome/index.scss
index 75ef10abe..d0e970a06 100644
--- a/web/packages/workspace/module/newHome/index.scss
+++ b/web/packages/workspace/module/newHome/index.scss
@@ -69,7 +69,7 @@
           align-items: center;
           .header-search {
             flex: 50%;
-            /deep/.ivu-input {
+            ::v-deep.ivu-input {
               @include bg-color($workspace-body-bg-color, $dark-workspace-body-bg-color);
               @include border-color($border-color-base, $dark-border-color-base);
             }
@@ -83,7 +83,7 @@
           // color: $text-desc-color;
           @include font-color($light-text-color, $dark-text-color);
           cursor: pointer;
-          /deep/.visualCatesIcon {
+          ::v-deep.visualCatesIcon {
             @include font-color($light-text-color, $dark-text-color);
           }
         }
diff --git a/web/packages/workspace/module/newProject/module/projectItem.vue b/web/packages/workspace/module/newProject/module/projectItem.vue
index e98cfe21b..fdf7d62c6 100644
--- a/web/packages/workspace/module/newProject/module/projectItem.vue
+++ b/web/packages/workspace/module/newProject/module/projectItem.vue
@@ -277,7 +277,7 @@ export default {
             .menu-bar {
               position: relative;
               flex-basis: 40px;
-              /deep/.ivu-btn {
+              ::v-deep.ivu-btn {
                 @include bg-color($workspace-body-bg-color, $dark-workspace-body-bg-color);
                 @include border-color($border-color-base, $dark-border-color-base);
                 @include font-color($light-text-color, $dark-text-color);
diff --git a/web/packages/workspace/module/permissions/module/departManagement.vue b/web/packages/workspace/module/permissions/module/departManagement.vue
index efc84acb1..8e1a88749 100644
--- a/web/packages/workspace/module/permissions/module/departManagement.vue
+++ b/web/packages/workspace/module/permissions/module/departManagement.vue
@@ -619,10 +619,10 @@ export default {
     // padding-bottom: 0px;
     border-bottom: 1px solid #dee4ec;
     @include border-color($border-color-base, $dark-border-color-base);
-    /deep/.ivu-form-item-label {
+    ::v-deep.ivu-form-item-label {
       @include font-color($workspace-title-color, $dark-workspace-title-color);
     }
-    /deep/.ivu-input {
+    ::v-deep.ivu-input {
       @include bg-color(
         $workspace-body-bg-color,
         $dark-workspace-body-bg-color
diff --git a/web/packages/workspace/view/enginekill/index.vue b/web/packages/workspace/view/enginekill/index.vue
index dffe02703..56734ed58 100644
--- a/web/packages/workspace/view/enginekill/index.vue
+++ b/web/packages/workspace/view/enginekill/index.vue
@@ -16,26 +16,44 @@
         <Input v-model="searchBar.name" @on-enter="doQuery" />
       </FormItem>
       <FormItem
-        prop="yarnQueue"
-        :label="$t('message.enginelist.queue')"
-        :label-width="50"
+        prop="crossCluster"
+        :label="$t('message.enginelist.crossCluster')"
+        :label-width="120"
       >
         <Select
           style="width:150px"
-          v-model="searchBar.yarnQueue"
-          filterable
+          v-model="searchBar.crossCluster"
+          :placeholder="$t('message.enginelist.ruleform.plsselect')"
           clearable
-          @on-change="doQuery"
+          @on-change="handleCrossCluster($event, 'search')"
         >
-          <Option
-            v-for="(item) in queues"
-            :label="item"
-            :title="item"
-            :value="item"
-            :key="item"
-          />
+          <Option :label="$t('message.enginelist.yes')" value="true" />
+          <Option :label="$t('message.enginelist.no')" value="false" />
         </Select>
       </FormItem>
+      <FormItem
+        prop="yarnQueue"
+        :label="$t('message.enginelist.queue')"
+        :label-width="50"
+      >
+        <div @click="handleQueueFocus(searchBar.crossCluster)">
+          <Select
+            style="width:150px"
+            v-model="searchBar.yarnQueue"
+            filterable
+            clearable
+            @on-change="doQuery"
+          >
+            <Option
+              v-for="(item) in searchQueues"
+              :label="item"
+              :title="item"
+              :value="item"
+              :key="item"
+            />
+          </Select>
+        </div>
+      </FormItem>
       <FormItem
         prop="status"
         :label="$t('message.enginelist.status')"
@@ -99,6 +117,9 @@
         <div class="row-item">
           {{ $t('message.enginelist.ruleform.queue')}}：{{ item.queue }}
         </div>
+        <div class="row-item">
+          {{ $t('message.enginelist.crossCluster')}}：{{ item.crossCluster ? $t('message.enginelist.yes') : $t('message.enginelist.no') }}
+        </div>
         <div>
           <div class="row-item inline-block">
             {{ $t('message.enginelist.ruleform.trigger')}}：{{ formatConditions(item.triggerConditionConf.conditions) }}
@@ -150,14 +171,14 @@
     />
     <Modal
       v-model="showModal"
-      :width="600"
+      :width="640"
       :title="isEdit ? $t('message.enginelist.ruleform.edittitle') : $t('message.enginelist.ruleform.addtitle')"
     >
       <Form
         ref="ruleForm"
-        label-position="left"
+        label-position="right"
         class="engine_kill_rule_form"
-        :label-width="80"
+        :label-width="120"
         :model="formData"
         :rules="formValid"
       >
@@ -180,25 +201,42 @@
           />
         </FormItem>
         <FormItem
-          :label="$t('message.enginelist.ruleform.queue')"
-          prop="queue"
+          :label="$t('message.enginelist.crossCluster')"
+          prop="crossCluster"
         >
           <Select
-            v-model="formData.queue"
+            v-model="formData.crossCluster"
             style="width:150px"
-            filterable
             :disabled="isEdit"
-            :placeholder="$t('message.enginelist.ruleform.selectqueue')"
+            :placeholder="$t('message.enginelist.ruleform.plsselect')"
+            @on-change="handleCrossCluster"
           >
-            <Option
-              v-for="(item) in queues"
-              :label="item"
-              :value="item"
-              :title="item"
-              :key="item"
-            />
+            <Option :label="$t('message.enginelist.yes')" value="true" />
+            <Option :label="$t('message.enginelist.no')" value="false" />
           </Select>
         </FormItem>
+        <FormItem
+          :label="$t('message.enginelist.ruleform.queue')"
+          prop="queue"
+        >
+          <div @click="handleQueueFocus(formData.crossCluster)">
+            <Select
+              v-model="formData.queue"
+              style="width:150px"
+              filterable
+              :disabled="isEdit"
+              :placeholder="$t('message.enginelist.ruleform.selectqueue')"
+            >
+              <Option
+                v-for="(item) in queues"
+                :label="item"
+                :value="item"
+                :title="item"
+                :key="item"
+              />
+            </Select>
+          </div>
+        </FormItem>
         <!-- 触发条件 -->
         <FormItem
           :label="$t('message.enginelist.ruleform.conditionSet')"
@@ -380,7 +418,8 @@ export default {
       searchBar: {
         status: '',
         name: '',
-        yarnQueue: ''
+        yarnQueue: '',
+        crossCluster: ''
       },
       showModal: false,
       list: [],
@@ -388,6 +427,7 @@ export default {
         strategyId: '',
         name: '',
         description: '',
+        crossCluster: '',
         triggerConditionConf: {
           relation: "or",
           conditions: [{
@@ -421,6 +461,7 @@ export default {
         }
       },
       queues: [],
+      searchQueues: [],
       levels: ['MINOR', 'WARNING'],
       durations: [
         { value: '1', label: "1min" },
@@ -508,6 +549,13 @@ export default {
         description: [
           { message: `${this.$t("message.enginelist.ruleform.rulelength")}128`, max: 128 },
         ],
+        crossCluster: [
+          {
+            required: true,
+            message: this.$t("message.enginelist.ruleform.plsselectCross"),
+            trigger: "change",
+          },
+        ],
         queue: [
           {
             required: true,
@@ -570,7 +618,6 @@ export default {
   filters,
   mounted() {
     this.doQuery()
-    this.getQueueList()
   },
   methods: {
     doQuery() {
@@ -585,6 +632,9 @@ export default {
           if (this.searchBar.status) {
             resItem = item.status == this.searchBar.status
           }
+          if (this.searchBar.crossCluster) {
+            resItem = resItem && this.searchBar.crossCluster === String(!!item.crossCluster);
+          }
           if (this.searchBar.yarnQueue && this.searchBar.yarnQueue.trim()) {
             resItem = resItem && this.searchBar.yarnQueue.trim() === item.queue
           }
@@ -595,22 +645,45 @@ export default {
         })
       })
     },
-    getQueueList() {
+    handleCrossCluster(crossCluster, type, queue) {
+      if (type === 'search') {
+        this.searchBar.yarnQueue = '';
+        this.searchQueues = [];
+        this.doQuery();
+      } else {
+        this.formData.queue = '';
+        this.queues = [];
+      }
+      if (!crossCluster) return;
       const params = {
         workspaceId: this.$route.query.workspaceId,
+        crossCluster
       }
       api.fetch(`${this.$API_PATH.WORKSPACE_PATH}getQueueList`, params, 'get').then((res) => {
-        this.queues = res.queueList || []
+        if(type === 'search') {
+          this.searchQueues = res.queueList || [];
+        } else {
+          this.queues = res.queueList || [];
+          if (queue && !this.queues.includes(queue)) {
+            this.queues.push(queue)
+          }
+        }
       })
     },
+    handleQueueFocus(val) {
+      if (!val) {
+        this.$Message.warning(this.$t("message.enginelist.ruleform.plsselectCross"));
+      }
+    },
     add() {
       this.isEdit = false
       this.getUserList()
-      this.getQueueList()
+      this.queues = []
       this.formData = {
         strategyId: '',
         name: '',
         description: '',
+        crossCluster: '',
         triggerConditionConf: {
           relation: "or",
           conditions: [{
@@ -659,6 +732,7 @@ export default {
         strategyId: this.formData.strategyId,
         name: this.formData.name,
         description: this.formData.description,
+        crossCluster: this.formData.crossCluster === 'true' ? true : false,
         triggerConditionConf: {
           relation: this.formData.triggerConditionConf.relation,
           conditions: [...this.formData.triggerConditionConf.conditions]
@@ -733,16 +807,19 @@ export default {
     },
     edit(item) {
       item = JSON.parse(JSON.stringify(item))
+      item.crossCluster = String(!!item.crossCluster);
       this.getUserList()
+      this.handleCrossCluster(item.crossCluster, 'edit', item.queue);
       if (item.status) {
         return this.$Message.warning(this.$t("message.enginelist.disableReq"))
       }
       this.isEdit = true;
-      this.ruleItemValid = ''
+      this.ruleItemValid = '';
       const data = {
         strategyId: item.strategyId,
         name: item.name,
         description: item.description,
+        crossCluster: item.crossCluster,
         triggerConditionConf: {
           relation: item.triggerConditionConf.relation,
           conditions: [...item.triggerConditionConf.conditions]
@@ -916,7 +993,7 @@ export default {
   margin-top: 20px;
 }
 .condition-row {
-  margin-left: 80px;
+  margin-left: 110px;
   @include bg-color(#eee, #000a17);
   padding: 20px;
   margin-bottom: 10px;

From 6e010207bbd17d295105e2d98559deb11e4e35c9 Mon Sep 17 00:00:00 2001
From: xlinliu <arionliu@webank.com>
Date: Wed, 17 Apr 2024 14:12:24 +0800
Subject: [PATCH 044/302] fix

---
 .../webank/wedatasphere/dss/common/utils/DSSCommonUtils.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dss-commons/dss-common/src/main/java/com/webank/wedatasphere/dss/common/utils/DSSCommonUtils.java b/dss-commons/dss-common/src/main/java/com/webank/wedatasphere/dss/common/utils/DSSCommonUtils.java
index fd04be0f7..72fd0186e 100644
--- a/dss-commons/dss-common/src/main/java/com/webank/wedatasphere/dss/common/utils/DSSCommonUtils.java
+++ b/dss-commons/dss-common/src/main/java/com/webank/wedatasphere/dss/common/utils/DSSCommonUtils.java
@@ -68,7 +68,7 @@ public class DSSCommonUtils {
     public static final String DSS_LABELS_KEY = "labels";
     public static final String DSS_EXECUTE_BY_PROXY_USER_KEY = "execByProxyUser";
 
-    public static final CommonVars<String> DSS_HOME = CommonVars.apply("DSS_HOME", "");
+    public static final CommonVars<String> DSS_HOME = CommonVars.apply("DSS_HOME", "/appcom/Install/dss");
 
     public static long parseToLong(Object val) {
         if (val instanceof Double) {

From eadf995f79d5545548fad1aaa2f6501571ed11ab Mon Sep 17 00:00:00 2001
From: zhaobincai <zhaobincai@webank.com>
Date: Wed, 17 Apr 2024 17:05:43 +0800
Subject: [PATCH 045/302] workflow submit(todo : serialize workflow without
 thirdly appconn)

---
 .../entity/request/SubmitFlowRequest.java     | 42 +++++++++++++++
 .../dss/workflow/restful/FlowRestfulApi.java  | 16 ++++++
 .../dss/workflow/service/DSSFlowService.java  |  4 ++
 .../service/impl/DSSFlowServiceImpl.java      | 54 +++++++++++++++++++
 4 files changed, 116 insertions(+)
 create mode 100644 dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/entity/request/SubmitFlowRequest.java

diff --git a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/entity/request/SubmitFlowRequest.java b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/entity/request/SubmitFlowRequest.java
new file mode 100644
index 000000000..51b0ee2e1
--- /dev/null
+++ b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/entity/request/SubmitFlowRequest.java
@@ -0,0 +1,42 @@
+package com.webank.wedatasphere.dss.workflow.entity.request;
+
+import com.webank.wedatasphere.dss.common.label.LabelRouteVO;
+
+public class SubmitFlowRequest {
+    private Long flowId;
+    private String dssLabel;
+    private LabelRouteVO labels;
+    private String projectName;
+
+    public Long getFlowId() {
+        return flowId;
+    }
+
+    public void setFlowId(Long flowId) {
+        this.flowId = flowId;
+    }
+
+    public String getDssLabel() {
+        return dssLabel;
+    }
+
+    public void setDssLabel(String dssLabel) {
+        this.dssLabel = dssLabel;
+    }
+
+    public LabelRouteVO getLabels() {
+        return labels;
+    }
+
+    public void setLabels(LabelRouteVO labels) {
+        this.labels = labels;
+    }
+
+    public String getProjectName() {
+        return projectName;
+    }
+
+    public void setProjectName(String projectName) {
+        this.projectName = projectName;
+    }
+}
diff --git a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/restful/FlowRestfulApi.java b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/restful/FlowRestfulApi.java
index 2e8fa292c..bafa371a9 100644
--- a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/restful/FlowRestfulApi.java
+++ b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/restful/FlowRestfulApi.java
@@ -29,6 +29,7 @@
 import com.webank.wedatasphere.dss.common.utils.DSSExceptionUtils;
 import com.webank.wedatasphere.dss.contextservice.service.ContextService;
 import com.webank.wedatasphere.dss.contextservice.service.impl.ContextServiceImpl;
+import com.webank.wedatasphere.dss.git.common.protocol.GitTree;
 import com.webank.wedatasphere.dss.orchestrator.common.protocol.ResponseConvertOrchestrator;
 import com.webank.wedatasphere.dss.standard.app.sso.Workspace;
 import com.webank.wedatasphere.dss.standard.sso.utils.SSOHelper;
@@ -370,4 +371,19 @@ public Message deleteFlowEditLock(HttpServletRequest req, @PathVariable("flowEdi
         return Message.ok();
     }
 
+    @RequestMapping(value = "submitFlow", method = RequestMethod.POST)
+    public Message submitFlow(@RequestBody SubmitFlowRequest submitFlowRequest) {
+        Workspace workspace = SSOHelper.getWorkspace(httpServletRequest);
+        String userName = SecurityFilter.getLoginUsername(httpServletRequest);
+        //若工作流已经被其他用户抢锁，则当前用户不能再保存成功
+        String ticketId = Arrays.stream(httpServletRequest.getCookies()).filter(cookie -> DSSWorkFlowConstant.BDP_USER_TICKET_ID.equals(cookie.getName()))
+                .findFirst().map(Cookie::getValue).get();
+        DSSFlowEditLock flowEditLock = lockMapper.getFlowEditLockByID(submitFlowRequest.getFlowId());
+        if (flowEditLock != null && !flowEditLock.getOwner().equals(ticketId)) {
+            return Message.error("当前工作流被用户" + flowEditLock.getUsername() + "已锁定编辑，您编辑的内容不能再被保存。如有疑问，请与" + flowEditLock.getUsername() + "确认");
+        }
+        GitTree gitTree = flowService.submitFlow(submitFlowRequest, userName, workspace);
+        return Message.ok().data("tree", gitTree);
+    }
+
 }
diff --git a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/service/DSSFlowService.java b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/service/DSSFlowService.java
index a001f038a..fcf63b03b 100644
--- a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/service/DSSFlowService.java
+++ b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/service/DSSFlowService.java
@@ -18,8 +18,10 @@
 
 import com.webank.wedatasphere.dss.common.exception.DSSErrorException;
 import com.webank.wedatasphere.dss.common.label.DSSLabel;
+import com.webank.wedatasphere.dss.git.common.protocol.GitTree;
 import com.webank.wedatasphere.dss.standard.app.sso.Workspace;
 import com.webank.wedatasphere.dss.workflow.common.entity.DSSFlow;
+import com.webank.wedatasphere.dss.workflow.entity.request.SubmitFlowRequest;
 import com.webank.wedatasphere.dss.workflow.entity.vo.ExtraToolBarsVO;
 import org.apache.linkis.common.exception.ErrorException;
 
@@ -72,4 +74,6 @@ DSSFlow copyRootFlow(Long rootFlowId, String userName, Workspace workspace,
     boolean checkIsExistSameFlow(String jsonFlow);
 
     List<String> checkIsSave(Long parentFlowID, String jsonFlow);
+
+    GitTree submitFlow(SubmitFlowRequest flowRequest, String username, Workspace workspace);
 }
diff --git a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/service/impl/DSSFlowServiceImpl.java b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/service/impl/DSSFlowServiceImpl.java
index a37b52eff..8cf0bd696 100644
--- a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/service/impl/DSSFlowServiceImpl.java
+++ b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/service/impl/DSSFlowServiceImpl.java
@@ -31,13 +31,20 @@
 import com.webank.wedatasphere.dss.common.exception.DSSErrorException;
 import com.webank.wedatasphere.dss.common.exception.DSSRuntimeException;
 import com.webank.wedatasphere.dss.common.label.DSSLabel;
+import com.webank.wedatasphere.dss.common.label.EnvDSSLabel;
 import com.webank.wedatasphere.dss.common.utils.DSSCommonUtils;
 import com.webank.wedatasphere.dss.common.utils.IoUtils;
 import com.webank.wedatasphere.dss.common.utils.MapUtils;
+import com.webank.wedatasphere.dss.common.utils.RpcAskUtils;
 import com.webank.wedatasphere.dss.contextservice.service.ContextService;
 import com.webank.wedatasphere.dss.contextservice.service.impl.ContextServiceImpl;
+import com.webank.wedatasphere.dss.git.common.protocol.GitTree;
+import com.webank.wedatasphere.dss.git.common.protocol.request.GitDiffRequest;
+import com.webank.wedatasphere.dss.git.common.protocol.response.GitDiffResponse;
+import com.webank.wedatasphere.dss.sender.service.DSSSenderServiceFactory;
 import com.webank.wedatasphere.dss.standard.app.development.utils.DSSJobContentConstant;
 import com.webank.wedatasphere.dss.standard.app.sso.Workspace;
+import com.webank.wedatasphere.dss.workflow.WorkFlowManager;
 import com.webank.wedatasphere.dss.workflow.common.entity.DSSFlow;
 import com.webank.wedatasphere.dss.workflow.common.entity.DSSFlowRelation;
 import com.webank.wedatasphere.dss.workflow.common.parser.NodeParser;
@@ -52,6 +59,7 @@
 import com.webank.wedatasphere.dss.workflow.dao.NodeInfoMapper;
 import com.webank.wedatasphere.dss.workflow.entity.CommonAppConnNode;
 import com.webank.wedatasphere.dss.workflow.entity.NodeInfo;
+import com.webank.wedatasphere.dss.workflow.entity.request.SubmitFlowRequest;
 import com.webank.wedatasphere.dss.workflow.entity.vo.ExtraToolBarsVO;
 import com.webank.wedatasphere.dss.workflow.io.export.NodeExportService;
 import com.webank.wedatasphere.dss.workflow.io.input.NodeInputService;
@@ -68,6 +76,7 @@
 import org.apache.linkis.common.exception.ErrorException;
 import org.apache.linkis.cs.client.utils.SerializeHelper;
 import org.apache.linkis.cs.common.utils.CSCommonUtils;
+import org.apache.linkis.rpc.Sender;
 import org.apache.linkis.server.BDPJettyServerHelper;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -113,6 +122,9 @@ public class DSSFlowServiceImpl implements DSSFlowService {
     @Autowired
     private SaveFlowHook saveFlowHook;
 
+    @Autowired
+    private WorkFlowManager workFlowManager;
+
     private static ContextService contextService = ContextServiceImpl.getInstance();
 
     private static final String TOKEN = CommonVars.apply("wds.dss.workspace.token", "BML-AUTH").getValue();
@@ -767,4 +779,46 @@ private void persistenceFlowRelation(Long flowID, Long parentFlowID) {
         }
     }
 
+    @Override
+    public GitTree submitFlow(SubmitFlowRequest flowRequest, String username, Workspace workspace) {
+        // todo 1. 去除第三方节点实体的zip包——resource/工作流名/appconn-resource文件夹，并上传到bml
+
+        // 2. 将序列化好的工作流文件包提交给git服务，并拿到diff文件列表结果,
+        DSSFlow dssFlow = flowMapper.selectFlowByID(flowRequest.getFlowId());
+        BmlResource bmlResource = null;
+        try {
+
+            DSSProject projectInfo = DSSFlowEditLockManager.getProjectInfo(dssFlow.getProjectId());
+            List<DSSLabel> dssLabelList = new ArrayList<>();
+            dssLabelList.add(new EnvDSSLabel(flowRequest.getLabels().getRoute()));
+            bmlResource = workFlowManager.exportWorkflowNew(username, flowRequest.getFlowId(), projectInfo.getId(), flowRequest.getProjectName(), workspace, dssLabelList);
+        } catch (DSSErrorException e) {
+            logger.error("getProjectInfo failed by:", e);
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+
+
+        // todo 3. diff（第一步补充后，使用去掉第三方节点的zip包上传到bml，替换下方的BML）
+        GitDiffResponse diff = diff(dssFlow.getName(), bmlResource, username, workspace.getWorkspaceId(), flowRequest.getProjectName());
+        if (diff == null) {
+            logger.info("change is empty");
+            return null;
+        }
+
+        //4. 返回文件列表
+        return diff.getTree();
+    }
+
+    private GitDiffResponse diff(String path, BmlResource bmlResource, String username, Long workspaceId, String projectName) {
+        Sender gitSender = DSSSenderServiceFactory.getOrCreateServiceInstance().getGitSender();
+        Map<String, BmlResource> file = new HashMap<>();
+        file.put(path, bmlResource);
+        GitDiffRequest request1 = new GitDiffRequest(workspaceId, projectName, file, username);
+        logger.info("-------=======================begin to diff {}=======================-------", request1.getProjectName());
+        GitDiffResponse responseWorkflowValidNode = RpcAskUtils.processAskException(gitSender.ask(request1), GitDiffResponse.class, GitDiffRequest.class);
+        logger.info("-------=======================End to diff testGit1=======================-------: {}", responseWorkflowValidNode);
+        return responseWorkflowValidNode;
+    }
+
 }

From 32aaf55966b6776b259a058d656d6c268e799860 Mon Sep 17 00:00:00 2001
From: xlinliu <arionliu@webank.com>
Date: Wed, 17 Apr 2024 20:17:45 +0800
Subject: [PATCH 046/302] ExportService and ImportService

---
 .../dss/common/utils/DSSCommonUtils.java      |   2 +-
 .../entity/request/OrchestratorRequest.java   |   8 +
 .../DSSFrameworkOrchestratorRestful.java      |   5 +-
 .../server/service/OrchestratorService.java   |   2 +-
 .../service/impl/OrchestratorServiceImpl.java |   2 +-
 .../dss-framework-project-server/pom.xml      |   5 +
 .../entity/OrchestratorBatchImportInfo.java   |  45 ++++
 .../request/ExportAllOrchestratorsReqest.java |  53 +++++
 .../entity/response/BatchExportResult.java    |  42 ++++
 .../project/entity/response/ExportResult.java |  55 +++++
 .../project/service/DSSProjectService.java    |  28 ++-
 .../project/service/ExportService.java        |  62 ++++++
 .../project/service/ImportService.java        |  56 +++++
 .../service/impl/DSSProjectServiceImpl.java   |  60 +++++-
 .../service/impl/ExportServiceImpl.java       | 169 +++++++++++++++
 .../service/impl/ImportServiceImpl.java       | 194 ++++++++++++++++++
 .../common/ref/OrchestratorRefConstant.java   |   4 +
 17 files changed, 774 insertions(+), 18 deletions(-)
 create mode 100644 dss-framework/dss-framework-project-server/src/main/java/com/webank/wedatasphere/dss/framework/project/entity/OrchestratorBatchImportInfo.java
 create mode 100644 dss-framework/dss-framework-project-server/src/main/java/com/webank/wedatasphere/dss/framework/project/entity/request/ExportAllOrchestratorsReqest.java
 create mode 100644 dss-framework/dss-framework-project-server/src/main/java/com/webank/wedatasphere/dss/framework/project/entity/response/BatchExportResult.java
 create mode 100644 dss-framework/dss-framework-project-server/src/main/java/com/webank/wedatasphere/dss/framework/project/entity/response/ExportResult.java
 create mode 100644 dss-framework/dss-framework-project-server/src/main/java/com/webank/wedatasphere/dss/framework/project/service/ExportService.java
 create mode 100644 dss-framework/dss-framework-project-server/src/main/java/com/webank/wedatasphere/dss/framework/project/service/ImportService.java
 create mode 100644 dss-framework/dss-framework-project-server/src/main/java/com/webank/wedatasphere/dss/framework/project/service/impl/ExportServiceImpl.java
 create mode 100644 dss-framework/dss-framework-project-server/src/main/java/com/webank/wedatasphere/dss/framework/project/service/impl/ImportServiceImpl.java

diff --git a/dss-commons/dss-common/src/main/java/com/webank/wedatasphere/dss/common/utils/DSSCommonUtils.java b/dss-commons/dss-common/src/main/java/com/webank/wedatasphere/dss/common/utils/DSSCommonUtils.java
index fd04be0f7..72fd0186e 100644
--- a/dss-commons/dss-common/src/main/java/com/webank/wedatasphere/dss/common/utils/DSSCommonUtils.java
+++ b/dss-commons/dss-common/src/main/java/com/webank/wedatasphere/dss/common/utils/DSSCommonUtils.java
@@ -68,7 +68,7 @@ public class DSSCommonUtils {
     public static final String DSS_LABELS_KEY = "labels";
     public static final String DSS_EXECUTE_BY_PROXY_USER_KEY = "execByProxyUser";
 
-    public static final CommonVars<String> DSS_HOME = CommonVars.apply("DSS_HOME", "");
+    public static final CommonVars<String> DSS_HOME = CommonVars.apply("DSS_HOME", "/appcom/Install/dss");
 
     public static long parseToLong(Object val) {
         if (val instanceof Double) {
diff --git a/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/entity/request/OrchestratorRequest.java b/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/entity/request/OrchestratorRequest.java
index 3c22462cb..10e70ba6e 100644
--- a/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/entity/request/OrchestratorRequest.java
+++ b/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/entity/request/OrchestratorRequest.java
@@ -42,6 +42,14 @@ public class OrchestratorRequest {
      */
     private LabelRouteVO labels;
 
+    public OrchestratorRequest() {
+    }
+
+    public OrchestratorRequest(Long workspaceId, Long projectId) {
+        this.workspaceId = workspaceId;
+        this.projectId = projectId;
+    }
+
     public LabelRouteVO getLabels() {
         return labels;
     }
diff --git a/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/restful/DSSFrameworkOrchestratorRestful.java b/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/restful/DSSFrameworkOrchestratorRestful.java
index f982e439e..88f934901 100644
--- a/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/restful/DSSFrameworkOrchestratorRestful.java
+++ b/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/restful/DSSFrameworkOrchestratorRestful.java
@@ -19,11 +19,9 @@
 import com.webank.wedatasphere.dss.appconn.manager.utils.AppConnManagerUtils;
 import com.webank.wedatasphere.dss.common.auditlog.OperateTypeEnum;
 import com.webank.wedatasphere.dss.common.auditlog.TargetTypeEnum;
-import com.webank.wedatasphere.dss.common.exception.DSSErrorException;
 import com.webank.wedatasphere.dss.common.label.DSSLabel;
 import com.webank.wedatasphere.dss.common.label.EnvDSSLabel;
 import com.webank.wedatasphere.dss.common.utils.AuditLogUtils;
-import com.webank.wedatasphere.dss.orchestrator.common.entity.DSSOrchestratorCopyInfo;
 import com.webank.wedatasphere.dss.orchestrator.common.entity.OrchestratorVo;
 import com.webank.wedatasphere.dss.orchestrator.server.constant.OrchestratorLevelEnum;
 import com.webank.wedatasphere.dss.orchestrator.server.entity.request.*;
@@ -41,7 +39,6 @@
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
-import scala.tools.nsc.typechecker.Implicits;
 
 import javax.annotation.PostConstruct;
 import javax.servlet.http.HttpServletRequest;
@@ -95,7 +92,7 @@ public Message getAllOrchestrator(@RequestBody OrchestratorRequest orchestratorR
         try {
             String username = SecurityFilter.getLoginUsername(httpServletRequest);
             LOGGER.info("user {} begin to geyAllOrchestrator, requestBody:{}", username, orchestratorRequest);
-            return Message.ok("获取编排模式成功").data("page", orchestratorService.getListByPage(orchestratorRequest, username));
+            return Message.ok("获取编排模式成功").data("page", orchestratorService.getOrchestratorInfos(orchestratorRequest, username));
         } catch (Exception e) {
             LOGGER.error("getAllOrchestratorError ", e);
             return Message.error("获取编排模式失败:" + e.getMessage());
diff --git a/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/OrchestratorService.java b/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/OrchestratorService.java
index 711b79f65..9f3acac93 100644
--- a/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/OrchestratorService.java
+++ b/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/OrchestratorService.java
@@ -133,7 +133,7 @@ String rollbackOrchestrator(String username, Long projectId, String projectName,
 
     Long isExistSameNameBeforeUpdate(OrchestratorModifyRequest orchestratorModifRequest) throws DSSFrameworkErrorException;
 
-    List<OrchestratorBaseInfo> getListByPage(OrchestratorRequest orchestratorRequest, String username);
+    List<OrchestratorBaseInfo> getOrchestratorInfos(OrchestratorRequest orchestratorRequest, String username);
 
     ResponseOrchestratorInfos queryOrchestratorInfos(RequestOrchestratorInfos requestOrchestratorInfos);
 
diff --git a/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/impl/OrchestratorServiceImpl.java b/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/impl/OrchestratorServiceImpl.java
index c87bd4640..97275a3f1 100644
--- a/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/impl/OrchestratorServiceImpl.java
+++ b/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/impl/OrchestratorServiceImpl.java
@@ -440,7 +440,7 @@ public Long isExistSameNameBeforeUpdate(OrchestratorModifyRequest orchestratorMo
      * @return list of OrchestratorBaseInfo
      */
     @Override
-    public List<OrchestratorBaseInfo> getListByPage(OrchestratorRequest orchestratorRequest, String username) {
+    public List<OrchestratorBaseInfo> getOrchestratorInfos(OrchestratorRequest orchestratorRequest, String username) {
         List<DSSOrchestratorInfo> list = orchestratorMapper.queryOrchestratorInfos(new HashMap<String, Object>() {{
             put("workspace_id", orchestratorRequest.getWorkspaceId());
             put("project_id", orchestratorRequest.getProjectId());
diff --git a/dss-framework/dss-framework-project-server/pom.xml b/dss-framework/dss-framework-project-server/pom.xml
index 89d321c5e..32d93420e 100644
--- a/dss-framework/dss-framework-project-server/pom.xml
+++ b/dss-framework/dss-framework-project-server/pom.xml
@@ -212,6 +212,11 @@
                 </exclusion>
             </exclusions>
         </dependency>
+        <dependency>
+            <groupId>com.webank.wedatasphere.dss</groupId>
+            <artifactId>dss-framework-orchestrator-server</artifactId>
+            <version>${dss.version}</version>
+        </dependency>
     </dependencies>
 
     <build>
diff --git a/dss-framework/dss-framework-project-server/src/main/java/com/webank/wedatasphere/dss/framework/project/entity/OrchestratorBatchImportInfo.java b/dss-framework/dss-framework-project-server/src/main/java/com/webank/wedatasphere/dss/framework/project/entity/OrchestratorBatchImportInfo.java
new file mode 100644
index 000000000..4beb52a97
--- /dev/null
+++ b/dss-framework/dss-framework-project-server/src/main/java/com/webank/wedatasphere/dss/framework/project/entity/OrchestratorBatchImportInfo.java
@@ -0,0 +1,45 @@
+package com.webank.wedatasphere.dss.framework.project.entity;
+
+import com.webank.wedatasphere.dss.orchestrator.server.entity.vo.OrchestratorBaseInfo;
+
+import java.util.List;
+
+/**
+ * 批量导入编排的信息记录
+ * Author: xlinliu
+ * Date: 2022/9/14
+ */
+public class OrchestratorBatchImportInfo {
+    /**
+     * 来源编排信息
+     */
+    List<OrchestratorBaseInfo> from;
+    /**
+     * 导入后的编排信息
+     */
+    List<OrchestratorBaseInfo> to;
+
+    public OrchestratorBatchImportInfo() {
+    }
+
+    public OrchestratorBatchImportInfo(List<OrchestratorBaseInfo> from, List<OrchestratorBaseInfo> to) {
+        this.from = from;
+        this.to = to;
+    }
+
+    public List<OrchestratorBaseInfo> getFrom() {
+        return from;
+    }
+
+    public void setFrom(List<OrchestratorBaseInfo> from) {
+        this.from = from;
+    }
+
+    public List<OrchestratorBaseInfo> getTo() {
+        return to;
+    }
+
+    public void setTo(List<OrchestratorBaseInfo> to) {
+        this.to = to;
+    }
+}
diff --git a/dss-framework/dss-framework-project-server/src/main/java/com/webank/wedatasphere/dss/framework/project/entity/request/ExportAllOrchestratorsReqest.java b/dss-framework/dss-framework-project-server/src/main/java/com/webank/wedatasphere/dss/framework/project/entity/request/ExportAllOrchestratorsReqest.java
new file mode 100644
index 000000000..8879f4426
--- /dev/null
+++ b/dss-framework/dss-framework-project-server/src/main/java/com/webank/wedatasphere/dss/framework/project/entity/request/ExportAllOrchestratorsReqest.java
@@ -0,0 +1,53 @@
+package com.webank.wedatasphere.dss.framework.project.entity.request;
+
+import javax.validation.constraints.NotNull;
+import java.util.List;
+
+/**
+ * Author: xlinliu
+ * Date: 2024/4/15
+ */
+public class ExportAllOrchestratorsReqest {
+
+    /**
+     * 项目id
+     */
+    @NotNull
+    private Long projectId;
+
+    /**
+     * 环境标签
+     */
+    @NotNull
+    private String labels;
+
+
+    /**
+     * 导出备注
+     */
+    private String comment;
+
+    public Long getProjectId() {
+        return projectId;
+    }
+
+    public void setProjectId(Long projectId) {
+        this.projectId = projectId;
+    }
+
+    public String getLabels() {
+        return labels;
+    }
+
+    public void setLabels(String labels) {
+        this.labels = labels;
+    }
+
+    public String getComment() {
+        return comment;
+    }
+
+    public void setComment(String comment) {
+        this.comment = comment;
+    }
+}
diff --git a/dss-framework/dss-framework-project-server/src/main/java/com/webank/wedatasphere/dss/framework/project/entity/response/BatchExportResult.java b/dss-framework/dss-framework-project-server/src/main/java/com/webank/wedatasphere/dss/framework/project/entity/response/BatchExportResult.java
new file mode 100644
index 000000000..43d50c490
--- /dev/null
+++ b/dss-framework/dss-framework-project-server/src/main/java/com/webank/wedatasphere/dss/framework/project/entity/response/BatchExportResult.java
@@ -0,0 +1,42 @@
+package com.webank.wedatasphere.dss.framework.project.entity.response;
+
+import com.webank.wedatasphere.dss.common.entity.BmlResource;
+
+import java.util.List;
+
+/**
+ * Author: xlinliu
+ * Date: 2022/9/9
+ */
+public class BatchExportResult {
+    /**
+     * 导出文件上传后的bml资源
+     */
+    private BmlResource bmlResource;
+
+    /**
+     * 导出文件的md5校验码
+     */
+    private String checkSum;
+
+    public BatchExportResult(BmlResource bmlResource, String checkSum) {
+        this.bmlResource = bmlResource;
+        this.checkSum = checkSum;
+    }
+
+    public BmlResource getBmlResource() {
+        return bmlResource;
+    }
+
+    public void setBmlResource(BmlResource bmlResource) {
+        this.bmlResource = bmlResource;
+    }
+
+    public String getCheckSum() {
+        return checkSum;
+    }
+
+    public void setCheckSum(String checkSum) {
+        this.checkSum = checkSum;
+    }
+}
diff --git a/dss-framework/dss-framework-project-server/src/main/java/com/webank/wedatasphere/dss/framework/project/entity/response/ExportResult.java b/dss-framework/dss-framework-project-server/src/main/java/com/webank/wedatasphere/dss/framework/project/entity/response/ExportResult.java
new file mode 100644
index 000000000..ba00588da
--- /dev/null
+++ b/dss-framework/dss-framework-project-server/src/main/java/com/webank/wedatasphere/dss/framework/project/entity/response/ExportResult.java
@@ -0,0 +1,55 @@
+/*
+ *
+ *  * Copyright 2019 WeBank
+ *  *
+ *  * Licensed under the Apache License, Version 2.0 (the "License");
+ *  *  you may not use this file except in compliance with the License.
+ *  * You may obtain a copy of the License at
+ *  *
+ *  * http://www.apache.org/licenses/LICENSE-2.0
+ *  *
+ *  * 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.
+ *
+ */
+
+package com.webank.wedatasphere.dss.framework.project.entity.response;
+
+import com.webank.wedatasphere.dss.common.entity.BmlResource;
+
+/**
+ * created by cooperyang on 2021/1/25
+ * Description:
+ */
+public class ExportResult {
+
+    private BmlResource bmlResource;
+    /**
+     * 导出编排的版本id
+     */
+    private Long orchestratorVersionId;
+
+    public ExportResult(BmlResource bmlResource, Long orchestratorVersionId) {
+        this.bmlResource = bmlResource;
+        this.orchestratorVersionId = orchestratorVersionId;
+    }
+
+    public BmlResource getBmlResource() {
+        return bmlResource;
+    }
+
+    public void setBmlResource(BmlResource bmlResource) {
+        this.bmlResource = bmlResource;
+    }
+
+    public Long getOrchestratorVersionId() {
+        return orchestratorVersionId;
+    }
+
+    public void setOrchestratorVersionId(Long orchestratorVersionId) {
+        this.orchestratorVersionId = orchestratorVersionId;
+    }
+}
diff --git a/dss-framework/dss-framework-project-server/src/main/java/com/webank/wedatasphere/dss/framework/project/service/DSSProjectService.java b/dss-framework/dss-framework-project-server/src/main/java/com/webank/wedatasphere/dss/framework/project/service/DSSProjectService.java
index a8781eca5..25994cd81 100644
--- a/dss-framework/dss-framework-project-server/src/main/java/com/webank/wedatasphere/dss/framework/project/service/DSSProjectService.java
+++ b/dss-framework/dss-framework-project-server/src/main/java/com/webank/wedatasphere/dss/framework/project/service/DSSProjectService.java
@@ -17,21 +17,21 @@
 package com.webank.wedatasphere.dss.framework.project.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.webank.wedatasphere.dss.common.entity.BmlResource;
 import com.webank.wedatasphere.dss.common.label.DSSLabel;
+import com.webank.wedatasphere.dss.common.label.EnvDSSLabel;
 import com.webank.wedatasphere.dss.framework.project.entity.DSSProjectDO;
-import com.webank.wedatasphere.dss.framework.project.entity.request.ProjectCreateRequest;
-import com.webank.wedatasphere.dss.framework.project.entity.request.ProjectDeleteRequest;
-import com.webank.wedatasphere.dss.framework.project.entity.request.ProjectModifyRequest;
-import com.webank.wedatasphere.dss.framework.project.entity.request.ProjectQueryRequest;
+import com.webank.wedatasphere.dss.framework.project.entity.OrchestratorBatchImportInfo;
+import com.webank.wedatasphere.dss.framework.project.entity.request.*;
 import com.webank.wedatasphere.dss.framework.project.entity.response.ProjectResponse;
 import com.webank.wedatasphere.dss.framework.project.entity.vo.ProjectInfoVo;
 import com.webank.wedatasphere.dss.framework.project.exception.DSSProjectErrorException;
-import com.webank.wedatasphere.dss.orchestrator.common.protocol.RequestProjectImportOrchestrator;
 import com.webank.wedatasphere.dss.standard.app.sso.Workspace;
 import com.webank.wedatasphere.dss.standard.common.desc.AppInstance;
 
 import java.util.List;
 import java.util.Map;
+import java.util.function.Consumer;
 
 public interface DSSProjectService  extends IService<DSSProjectDO> {
 
@@ -80,5 +80,23 @@ public interface DSSProjectService  extends IService<DSSProjectDO> {
      */
     List<ProjectResponse> getDeletedProjects(ProjectQueryRequest projectRequest);
 
+    /**
+     * 批量导出工程内的所有编排
+     */
+    void exportAllOrchestrators(ExportAllOrchestratorsReqest exportAllOrchestratorsReqest, String username, String proxyUser, Workspace workspace) throws Exception;
+
+    /**
+     * 批量导入编排到指定工程
+     * @param  projectInfo 要导入的目标工程
+     * @param importResource 导入的编排资源
+     * @param username 导入人
+     * @param checkCode  校验码
+     * @param packageInfo 导入包路径或者文件名
+     * @param envLabel 环境标签
+     * @param workspace 导入工作空间
+
+     */
+    void importAllOrchestrators(ProjectInfoVo projectInfo, BmlResource importResource, String username,
+                             String checkCode, String packageInfo, EnvDSSLabel envLabel, Workspace workspace) throws Exception;
 
 }
diff --git a/dss-framework/dss-framework-project-server/src/main/java/com/webank/wedatasphere/dss/framework/project/service/ExportService.java b/dss-framework/dss-framework-project-server/src/main/java/com/webank/wedatasphere/dss/framework/project/service/ExportService.java
new file mode 100644
index 000000000..44ab303db
--- /dev/null
+++ b/dss-framework/dss-framework-project-server/src/main/java/com/webank/wedatasphere/dss/framework/project/service/ExportService.java
@@ -0,0 +1,62 @@
+/*
+ *
+ *  * Copyright 2019 WeBank
+ *  *
+ *  * Licensed under the Apache License, Version 2.0 (the "License");
+ *  *  you may not use this file except in compliance with the License.
+ *  * You may obtain a copy of the License at
+ *  *
+ *  * http://www.apache.org/licenses/LICENSE-2.0
+ *  *
+ *  * 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.
+ *
+ */
+
+package com.webank.wedatasphere.dss.framework.project.service;
+
+import com.webank.wedatasphere.dss.common.label.DSSLabel;
+import com.webank.wedatasphere.dss.framework.project.entity.response.BatchExportResult;
+import com.webank.wedatasphere.dss.framework.project.entity.response.ExportResult;
+import com.webank.wedatasphere.dss.orchestrator.common.entity.OrchestratorInfo;
+import com.webank.wedatasphere.dss.orchestrator.server.entity.vo.OrchestratorBaseInfo;
+import com.webank.wedatasphere.dss.standard.app.sso.Workspace;
+import org.apache.linkis.common.exception.ErrorException;
+
+import java.util.List;
+
+/**
+ * created by cooperyang on 2020/12/9
+ * Description: 专门使用导出的
+ */
+public interface ExportService {
+
+    /**
+     * 导出一个编排到bml
+     * @param releaseUser 导出人
+     * @param projectId 项目id
+     * @param projectName 项目名
+     * @param dssLabel 标签
+     * @param workspace 工作孔家
+     * @return 编排的导出结果
+     * @throws ErrorException
+     */
+    ExportResult export(String releaseUser, Long projectId, OrchestratorInfo orchestrator,
+                        String projectName, DSSLabel dssLabel, Workspace workspace) throws ErrorException;
+
+    /**
+     * 批量导出编排,打包到一起生成一个bml文件
+     * @param orchestrators 需要导出的编排们
+     */
+    BatchExportResult batchExport(String userName, Long projectId, List<OrchestratorBaseInfo> orchestrators,
+                                  String projectName, DSSLabel dssLabel, Workspace workspace) throws ErrorException;
+
+
+
+    Long addVersionAfterPublish(String releaseUser, Long projectId, Long orchestratorId, Long orchestratorVersionId,
+                        String projectName, Workspace workspace, DSSLabel dssLabel,String comment) throws ErrorException;
+
+}
diff --git a/dss-framework/dss-framework-project-server/src/main/java/com/webank/wedatasphere/dss/framework/project/service/ImportService.java b/dss-framework/dss-framework-project-server/src/main/java/com/webank/wedatasphere/dss/framework/project/service/ImportService.java
new file mode 100644
index 000000000..8357b4494
--- /dev/null
+++ b/dss-framework/dss-framework-project-server/src/main/java/com/webank/wedatasphere/dss/framework/project/service/ImportService.java
@@ -0,0 +1,56 @@
+/*
+ *
+ *  * Copyright 2019 WeBank
+ *  *
+ *  * Licensed under the Apache License, Version 2.0 (the "License");
+ *  *  you may not use this file except in compliance with the License.
+ *  * You may obtain a copy of the License at
+ *  *
+ *  * http://www.apache.org/licenses/LICENSE-2.0
+ *  *
+ *  * 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.
+ *
+ */
+
+package com.webank.wedatasphere.dss.framework.project.service;
+
+import com.webank.wedatasphere.dss.common.label.DSSLabel;
+import com.webank.wedatasphere.dss.framework.project.entity.OrchestratorBatchImportInfo;
+import com.webank.wedatasphere.dss.common.entity.BmlResource;
+import com.webank.wedatasphere.dss.orchestrator.server.entity.vo.OrchestratorBaseInfo;
+import com.webank.wedatasphere.dss.standard.app.sso.Workspace;
+import org.apache.linkis.common.exception.ErrorException;
+
+import java.util.List;
+
+/**
+ * created by cooperyang on 2020/12/9
+ * Description: 导入的操作都在此处进行
+ * 导入需要携带
+ * 1.工程需要的zip包，应该是是需要bml的resourceid和version就可以
+ */
+public interface ImportService {
+
+
+    /**
+     * 通过发布的导入,只需要将resourceId和version给到nextLabel的OrcFramework
+     */
+    OrchestratorBaseInfo importOrc(String orchestratorName, String releaseUser, Long projectId, String projectName,
+                                   BmlResource bmlResource, DSSLabel dssLabel, String workspaceName, Workspace workspace) throws ErrorException;
+
+    /**
+     * 批量导入编排
+     * @param userName 导入人用户名
+     * @param bmlResource 导入的资源
+     * @param checkCode 校验码
+     * @param dssLabel 标签
+     * @param workspace 导入的工作空间
+     * @return 导入的编排信息
+     */
+    OrchestratorBatchImportInfo batchImportOrc(String userName, Long projectId, String projectName, BmlResource bmlResource,
+                                               String checkCode, DSSLabel dssLabel, Workspace workspace)throws ErrorException;
+}
diff --git a/dss-framework/dss-framework-project-server/src/main/java/com/webank/wedatasphere/dss/framework/project/service/impl/DSSProjectServiceImpl.java b/dss-framework/dss-framework-project-server/src/main/java/com/webank/wedatasphere/dss/framework/project/service/impl/DSSProjectServiceImpl.java
index 057570d65..d0e9d0e31 100644
--- a/dss-framework/dss-framework-project-server/src/main/java/com/webank/wedatasphere/dss/framework/project/service/impl/DSSProjectServiceImpl.java
+++ b/dss-framework/dss-framework-project-server/src/main/java/com/webank/wedatasphere/dss/framework/project/service/impl/DSSProjectServiceImpl.java
@@ -19,11 +19,15 @@
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.google.common.util.concurrent.ThreadFactoryBuilder;
 import com.webank.wedatasphere.dss.appconn.core.AppConn;
 import com.webank.wedatasphere.dss.appconn.manager.AppConnManager;
 import com.webank.wedatasphere.dss.common.entity.BmlResource;
 import com.webank.wedatasphere.dss.common.exception.DSSErrorException;
+import com.webank.wedatasphere.dss.common.exception.DSSRuntimeException;
 import com.webank.wedatasphere.dss.common.label.DSSLabel;
+import com.webank.wedatasphere.dss.common.label.EnvDSSLabel;
+import com.webank.wedatasphere.dss.common.utils.DSSCommonUtils;
 import com.webank.wedatasphere.dss.common.utils.DSSExceptionUtils;
 import com.webank.wedatasphere.dss.common.utils.RpcAskUtils;
 import com.webank.wedatasphere.dss.framework.project.conf.ProjectConf;
@@ -32,21 +36,24 @@
 import com.webank.wedatasphere.dss.framework.project.dao.DSSProjectMapper;
 import com.webank.wedatasphere.dss.framework.project.dao.DSSProjectUserMapper;
 import com.webank.wedatasphere.dss.framework.project.entity.DSSProjectDO;
+import com.webank.wedatasphere.dss.framework.project.entity.OrchestratorBatchImportInfo;
 import com.webank.wedatasphere.dss.framework.project.entity.po.ProjectRelationPo;
-import com.webank.wedatasphere.dss.framework.project.entity.request.ProjectCreateRequest;
-import com.webank.wedatasphere.dss.framework.project.entity.request.ProjectDeleteRequest;
-import com.webank.wedatasphere.dss.framework.project.entity.request.ProjectModifyRequest;
-import com.webank.wedatasphere.dss.framework.project.entity.request.ProjectQueryRequest;
+import com.webank.wedatasphere.dss.framework.project.entity.request.*;
+import com.webank.wedatasphere.dss.framework.project.entity.response.BatchExportResult;
 import com.webank.wedatasphere.dss.framework.project.entity.response.ProjectResponse;
 import com.webank.wedatasphere.dss.framework.project.entity.vo.ProjectInfoVo;
 import com.webank.wedatasphere.dss.framework.project.entity.vo.QueryProjectVo;
 import com.webank.wedatasphere.dss.framework.project.exception.DSSProjectErrorException;
 import com.webank.wedatasphere.dss.framework.project.service.DSSProjectService;
-import com.webank.wedatasphere.dss.framework.project.service.DSSProjectUserService;
+import com.webank.wedatasphere.dss.framework.project.service.ExportService;
+import com.webank.wedatasphere.dss.framework.project.service.ImportService;
 import com.webank.wedatasphere.dss.framework.project.utils.ProjectStringUtils;
 import com.webank.wedatasphere.dss.git.common.protocol.request.GitArchiveProjectRequest;
 import com.webank.wedatasphere.dss.git.common.protocol.request.GitCreateProjectRequest;
 import com.webank.wedatasphere.dss.git.common.protocol.response.GitArchivePorjectResponse;
+import com.webank.wedatasphere.dss.orchestrator.server.entity.request.OrchestratorRequest;
+import com.webank.wedatasphere.dss.orchestrator.server.entity.vo.OrchestratorBaseInfo;
+import com.webank.wedatasphere.dss.orchestrator.server.service.OrchestratorService;
 import com.webank.wedatasphere.dss.sender.service.DSSSenderServiceFactory;
 import com.webank.wedatasphere.dss.standard.app.sso.Workspace;
 import com.webank.wedatasphere.dss.standard.app.structure.project.ProjectDeletionOperation;
@@ -55,12 +62,15 @@
 import com.webank.wedatasphere.dss.standard.common.desc.AppInstance;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.exception.ExceptionUtils;
 import org.apache.linkis.rpc.Sender;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 
 import java.util.*;
+import java.util.concurrent.*;
+import java.util.function.Consumer;
 import java.util.stream.Collectors;
 
 import static com.webank.wedatasphere.dss.framework.project.utils.ProjectOperationUtils.tryProjectOperation;
@@ -70,13 +80,28 @@ public class DSSProjectServiceImpl extends ServiceImpl<DSSProjectMapper, DSSProj
     @Autowired
     private DSSProjectMapper projectMapper;
     @Autowired
-    private DSSProjectUserService projectUserService;
+    private ExportService exportService;
     @Autowired
     private DSSProjectUserMapper projectUserMapper;
+    @Autowired
+    private OrchestratorService orchestratorService;
+    @Autowired
+    private DSSProjectService projectService;
+    @Autowired
+    private ImportService importService;
+
+
+
 
     public static final String MODE_SPLIT = ",";
     public static final String KEY_SPLIT = "-";
     private final String SUPPORT_ABILITY = ProjectConf.SUPPORT_ABILITY.getValue();
+    private final ThreadFactory projectOperateThreadFactory = new ThreadFactoryBuilder()
+            .setNameFormat("dss-project-operate-thread-%d")
+            .setDaemon(false)
+            .build();
+    private final ExecutorService projectOperateThreadPool = new ThreadPoolExecutor(5, 200, 0L, TimeUnit.MILLISECONDS,
+            new LinkedBlockingQueue<Runnable>(1024), projectOperateThreadFactory, new ThreadPoolExecutor.AbortPolicy());
 
     @Override
     public DSSProjectDO createProject(String username, ProjectCreateRequest projectCreateRequest) {
@@ -393,6 +418,29 @@ public List<ProjectResponse> getDeletedProjects(ProjectQueryRequest projectReque
             projectResponse.setReleaseUsers(CollectionUtils.isEmpty(releaseUsers) ? new ArrayList<>() : releaseUsers.stream().distinct().collect(Collectors.toList()));
         }
         return projectResponseList;
+    }
+    @Override
+    public void exportAllOrchestrators(ExportAllOrchestratorsReqest exportAllOrchestratorsReqest,
+                                       String username, String proxyUser, Workspace workspace) throws Exception {
+        Long projectId=exportAllOrchestratorsReqest.getProjectId();
+        EnvDSSLabel envLabel = new EnvDSSLabel(exportAllOrchestratorsReqest.getLabels());
+        List<OrchestratorBaseInfo> orchestrators = orchestratorService.getOrchestratorInfos(
+                new OrchestratorRequest(workspace.getWorkspaceId(), exportAllOrchestratorsReqest.getProjectId())
+                , exportAllOrchestratorsReqest.getLabels());
+        ProjectInfoVo projectVO=projectService.getProjectInfoById(projectId);
+       exportService.batchExport(username, projectId, orchestrators, projectVO.getProjectName(), envLabel, workspace);
+    }
+
+    @Override
+    public void importAllOrchestrators(ProjectInfoVo projectInfo, BmlResource importResource, String username,
+                                    String checkCode, String packageInfo, EnvDSSLabel envLabel, Workspace workspace) throws Exception {
+
+    importService.batchImportOrc(username, projectInfo.getId(),
+                        projectInfo.getProjectName(), importResource, checkCode, envLabel, workspace);
+
+
+
+
     }
 
 }
diff --git a/dss-framework/dss-framework-project-server/src/main/java/com/webank/wedatasphere/dss/framework/project/service/impl/ExportServiceImpl.java b/dss-framework/dss-framework-project-server/src/main/java/com/webank/wedatasphere/dss/framework/project/service/impl/ExportServiceImpl.java
new file mode 100644
index 000000000..4899828b9
--- /dev/null
+++ b/dss-framework/dss-framework-project-server/src/main/java/com/webank/wedatasphere/dss/framework/project/service/impl/ExportServiceImpl.java
@@ -0,0 +1,169 @@
+/*
+ *
+ *  * Copyright 2019 WeBank
+ *  *
+ *  * Licensed under the Apache License, Version 2.0 (the "License");
+ *  *  you may not use this file except in compliance with the License.
+ *  * You may obtain a copy of the License at
+ *  *
+ *  * http://www.apache.org/licenses/LICENSE-2.0
+ *  *
+ *  * 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.
+ *
+ */
+
+package com.webank.wedatasphere.dss.framework.project.service.impl;
+
+import com.google.gson.Gson;
+import com.webank.wedatasphere.dss.appconn.core.AppConn;
+import com.webank.wedatasphere.dss.appconn.core.ext.OnlyDevelopmentAppConn;
+import com.webank.wedatasphere.dss.appconn.manager.AppConnManager;
+import com.webank.wedatasphere.dss.common.exception.DSSRuntimeException;
+import com.webank.wedatasphere.dss.common.label.DSSLabel;
+import com.webank.wedatasphere.dss.common.utils.*;
+import com.webank.wedatasphere.dss.framework.common.exception.DSSFrameworkErrorException;
+import com.webank.wedatasphere.dss.common.entity.BmlResource;
+import com.webank.wedatasphere.dss.framework.project.entity.response.BatchExportResult;
+import com.webank.wedatasphere.dss.framework.project.entity.response.ExportResult;
+import com.webank.wedatasphere.dss.framework.project.service.ExportService;
+import com.webank.wedatasphere.dss.orchestrator.common.entity.OrchestratorInfo;
+import com.webank.wedatasphere.dss.orchestrator.common.protocol.RequestAddVersionAfterPublish;
+import com.webank.wedatasphere.dss.orchestrator.common.ref.OrchestratorRefConstant;
+import com.webank.wedatasphere.dss.common.service.BMLService;
+import com.webank.wedatasphere.dss.orchestrator.server.entity.vo.OrchestratorBaseInfo;
+import com.webank.wedatasphere.dss.sender.service.DSSSenderServiceFactory;
+import com.webank.wedatasphere.dss.standard.app.development.operation.RefExportOperation;
+import com.webank.wedatasphere.dss.standard.app.development.ref.ExportResponseRef;
+import com.webank.wedatasphere.dss.standard.app.development.ref.ImportRequestRef;
+import com.webank.wedatasphere.dss.standard.app.development.ref.impl.ThirdlyRequestRef;
+import com.webank.wedatasphere.dss.standard.app.development.service.RefExportService;
+import com.webank.wedatasphere.dss.standard.app.development.standard.DevelopmentIntegrationStandard;
+import com.webank.wedatasphere.dss.standard.app.sso.Workspace;
+import com.webank.wedatasphere.dss.standard.common.desc.AppInstance;
+import org.apache.linkis.common.exception.ErrorException;
+
+import java.io.*;
+import java.nio.charset.StandardCharsets;
+import java.util.*;
+
+import org.apache.linkis.rpc.Sender;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.stereotype.Service;
+import org.apache.commons.codec.digest.DigestUtils;
+
+/**
+ * created by cooperyang on 2020/12/9
+ * Description:
+ */
+@Service
+public class ExportServiceImpl implements ExportService {
+    private final String metaFileName = "meta.json";
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(ExportServiceImpl.class);
+
+    private static final String ORCHESTRATOR_FRAMEWORK_NAME = "orchestrator-framework";
+    @Autowired
+    @Qualifier("projectBmlService")
+    private BMLService bmlService;
+
+
+    @Override
+    @SuppressWarnings("ConstantConditions")
+    public ExportResult export(String releaseUser, Long projectId, OrchestratorInfo orchestrator,
+                               String projectName, DSSLabel dssLabel, Workspace workspace) throws ErrorException {
+        LOGGER.info("begin to export projectId {} orchestratorId {} orchestratorVersionId {} for user {}", projectId,
+                orchestrator.getOrchestratorId(), orchestrator.getOrchestratorVersionId(), releaseUser);
+        //获取到orchestratorFramework的appconn
+        AppConn appConn = AppConnManager.getAppConnManager().getAppConn(ORCHESTRATOR_FRAMEWORK_NAME);
+        //2.通过Label拿到对应的Service
+        DevelopmentIntegrationStandard developmentIntegrationStandard = ((OnlyDevelopmentAppConn) appConn).getOrCreateDevelopmentStandard();
+        if (developmentIntegrationStandard == null) {
+            LOGGER.error("orchestrator framework development is null");
+            DSSExceptionUtils.dealErrorException(60021, "orchestrator framework development is null", DSSFrameworkErrorException.class);
+        }
+        List<DSSLabel> dssLabelList = new ArrayList<>();
+        dssLabelList.add(dssLabel);
+        AppInstance appInstance = appConn.getAppDesc().getAppInstancesByLabels(dssLabelList).get(0);
+        RefExportService refExportService = developmentIntegrationStandard.getRefExportService(appInstance);
+        RefExportOperation<ThirdlyRequestRef.RefJobContentRequestRefImpl> refExportOperation = refExportService.getRefExportOperation();
+        ThirdlyRequestRef.RefJobContentRequestRefImpl requestRef = new ThirdlyRequestRef.RefJobContentRequestRefImpl();
+        Long orchestratorId = orchestrator.getOrchestratorId();
+        Long orchestratorVersionId = orchestrator.getOrchestratorVersionId();
+        requestRef.setRefJobContent(MapUtils.newCommonMap(OrchestratorRefConstant.ORCHESTRATOR_ID_KEY, orchestratorId,
+                OrchestratorRefConstant.ORCHESTRATOR_VERSION_ID_KEY, orchestratorVersionId));
+        requestRef.setDSSLabels(Collections.singletonList(dssLabel));
+        requestRef.setRefProjectId(projectId);
+        requestRef.setUserName(releaseUser);
+        requestRef.setWorkspace(workspace);
+        requestRef.setProjectName(projectName);
+        ExportResponseRef responseRef = refExportOperation.exportRef(requestRef);
+        BmlResource bmlResource = new BmlResource((String) responseRef.getResourceMap().get(ImportRequestRef.RESOURCE_ID_KEY),
+                (String) responseRef.getResourceMap().get(ImportRequestRef.RESOURCE_VERSION_KEY));
+        return new ExportResult(bmlResource, (Long) responseRef.getResourceMap().get(OrchestratorRefConstant.ORCHESTRATOR_VERSION_ID_KEY));
+
+    }
+
+    @Override
+    public BatchExportResult batchExport(String userName, Long projectId, List<OrchestratorBaseInfo> orchestrators,
+                                         String projectName, DSSLabel dssLabel, Workspace workspace) throws ErrorException {
+        if(orchestrators==null||orchestrators.isEmpty()){
+            throw new DSSRuntimeException("workflow list is empty,nothing to export.(导出的工作流列表为空，没有任何工作流可以导出)");
+        }
+        String exportSaveBasePath = IoUtils.generateIOPath(userName, projectName, "");
+        //写入元数据
+        String metaInfoPath=exportSaveBasePath+ File.separator+"meta.json";
+        String metaInfo=new Gson().toJson(orchestrators);
+        try(OutputStream metaOutStream=IoUtils.generateExportOutputStream(metaInfoPath)) {
+            metaOutStream.write(metaInfo.getBytes(StandardCharsets.UTF_8));
+        } catch (IOException e) {
+            LOGGER.error("write meta failed",e);
+            throw new RuntimeException(e);
+        }
+        for (OrchestratorBaseInfo orchestrator : orchestrators) {
+            OrchestratorInfo orchestratorInfo = new OrchestratorInfo(orchestrator.getOrchestratorId(), orchestrator.getOrchestratorVersionId());
+            BmlResource bmlOneOrc= export(userName, projectId, orchestratorInfo,
+                    projectName, dssLabel, workspace)
+                    .getBmlResource();
+            String orcPath=exportSaveBasePath+orchestrator.getOrchestratorName()+".zip";
+            bmlService.downloadToLocalPath(userName,bmlOneOrc.getResourceId(),bmlOneOrc.getVersion(),orcPath);
+        }
+        String zipFile = ZipHelper.zip(exportSaveBasePath);
+        LOGGER.info("export zip file locate at {}",zipFile);
+        //先上传
+        InputStream inputStream = bmlService.readLocalResourceFile(userName, zipFile);
+        BmlResource bmlResource= bmlService.upload(userName, inputStream, projectName + ".OrcsExport", projectName);
+        //上传完之后，计算上传后二进制流的md5
+        String checkCode;
+        try(InputStream zipInputStream=(InputStream)bmlService.download(userName,
+                bmlResource.getResourceId(),
+                bmlResource.getVersion()).get("is")) {
+            checkCode=  DigestUtils.md5Hex(zipInputStream);
+        } catch (IOException e) {
+            LOGGER.error("md5 sum failed",e);
+            throw new DSSRuntimeException(e.getMessage());
+        }
+        LOGGER.info("export zip file upload to bmlResourceId:{} bmlResourceVersion:{}",
+                bmlResource.getResourceId(),bmlResource.getVersion());
+        return new BatchExportResult(bmlResource,checkCode);
+    }
+
+    @Override
+    public Long addVersionAfterPublish(String releaseUser, Long projectId, Long orchestratorId,
+                                       Long orchestratorVersionId, String projectName, Workspace workspace,
+                                       DSSLabel dssLabel, String comment) {
+        List<DSSLabel> dssLabelList = new ArrayList<>();
+        dssLabelList.add(dssLabel);
+        RequestAddVersionAfterPublish requestAddVersionAfterPublish = new RequestAddVersionAfterPublish(releaseUser, workspace,
+                orchestratorId, orchestratorVersionId, projectName, dssLabelList, comment);
+        Sender sender = DSSSenderServiceFactory.getOrCreateServiceInstance().getOrcSender(dssLabelList);
+        return RpcAskUtils.processAskException(sender.ask(requestAddVersionAfterPublish), Long.class, RequestAddVersionAfterPublish.class);
+    }
+
+}
diff --git a/dss-framework/dss-framework-project-server/src/main/java/com/webank/wedatasphere/dss/framework/project/service/impl/ImportServiceImpl.java b/dss-framework/dss-framework-project-server/src/main/java/com/webank/wedatasphere/dss/framework/project/service/impl/ImportServiceImpl.java
new file mode 100644
index 000000000..dc57ce939
--- /dev/null
+++ b/dss-framework/dss-framework-project-server/src/main/java/com/webank/wedatasphere/dss/framework/project/service/impl/ImportServiceImpl.java
@@ -0,0 +1,194 @@
+/*
+ *
+ *  * Copyright 2019 WeBank
+ *  *
+ *  * Licensed under the Apache License, Version 2.0 (the "License");
+ *  *  you may not use this file except in compliance with the License.
+ *  * You may obtain a copy of the License at
+ *  *
+ *  * http://www.apache.org/licenses/LICENSE-2.0
+ *  *
+ *  * 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.
+ *
+ */
+
+package com.webank.wedatasphere.dss.framework.project.service.impl;
+
+
+import com.google.gson.Gson;
+import com.google.gson.reflect.TypeToken;
+import com.webank.wedatasphere.dss.appconn.core.AppConn;
+import com.webank.wedatasphere.dss.appconn.core.ext.OnlyDevelopmentAppConn;
+import com.webank.wedatasphere.dss.appconn.manager.AppConnManager;
+import com.webank.wedatasphere.dss.common.exception.DSSRuntimeException;
+import com.webank.wedatasphere.dss.common.label.DSSLabel;
+import com.webank.wedatasphere.dss.common.utils.DSSExceptionUtils;
+import com.webank.wedatasphere.dss.common.utils.IoUtils;
+import com.webank.wedatasphere.dss.common.utils.MapUtils;
+import com.webank.wedatasphere.dss.common.utils.ZipHelper;
+import com.webank.wedatasphere.dss.framework.common.exception.DSSFrameworkErrorException;
+import com.webank.wedatasphere.dss.framework.project.entity.OrchestratorBatchImportInfo;
+import com.webank.wedatasphere.dss.common.entity.BmlResource;
+import com.webank.wedatasphere.dss.framework.project.service.ImportService;
+import com.webank.wedatasphere.dss.orchestrator.common.ref.OrchestratorRefConstant;
+import com.webank.wedatasphere.dss.common.service.BMLService;
+import com.webank.wedatasphere.dss.orchestrator.server.entity.vo.OrchestratorBaseInfo;
+import com.webank.wedatasphere.dss.standard.app.development.operation.RefImportOperation;
+import com.webank.wedatasphere.dss.standard.app.development.ref.ImportRequestRef;
+import com.webank.wedatasphere.dss.standard.app.development.ref.RefJobContentResponseRef;
+import com.webank.wedatasphere.dss.standard.app.development.ref.impl.ThirdlyRequestRef;
+import com.webank.wedatasphere.dss.standard.app.development.service.RefImportService;
+import com.webank.wedatasphere.dss.standard.app.development.standard.DevelopmentIntegrationStandard;
+import com.webank.wedatasphere.dss.standard.app.sso.Workspace;
+import com.webank.wedatasphere.dss.standard.common.desc.AppInstance;
+import org.apache.commons.codec.digest.DigestUtils;
+import org.apache.commons.io.FileUtils;
+import org.apache.commons.io.FilenameUtils;
+import org.apache.linkis.common.exception.ErrorException;
+
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.lang.reflect.Type;
+import java.util.*;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipFile;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.stereotype.Service;
+
+/**
+ * created by cooperyang on 2020/12/9
+ * Description:
+ */
+@Service
+public class ImportServiceImpl implements ImportService {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(ImportServiceImpl.class);
+
+    private static final String ORC_FRAMEWORK_NAME = "orchestrator-framework";
+
+    @Autowired
+    @Qualifier("projectBmlService")
+    private BMLService bmlService;
+
+    @Override
+    @SuppressWarnings("ConstantConditions")
+    public OrchestratorBaseInfo importOrc(String orchestratorName, String releaseUser,Long projectId, String projectName,
+                                                   BmlResource bmlResource, DSSLabel dssLabel, String workspaceName, Workspace workspace) throws ErrorException {
+        //导入之后我们应该拿到的是导入之后的orchestrator的内容,这样我们在做同步到调度中心的时候才是同步的生产中心的内容
+        LOGGER.info("Begin to import orc for project {} and orc resource is {}", projectName, bmlResource);
+        OrchestratorBaseInfo orchestratorReleaseInfo =null;
+        AppConn appConn = AppConnManager.getAppConnManager().getAppConn(ORC_FRAMEWORK_NAME);
+        DevelopmentIntegrationStandard standard = ((OnlyDevelopmentAppConn)appConn).getOrCreateDevelopmentStandard();
+        if (standard == null) {
+            LOGGER.error("developStandard is null, can not do import operation");
+            DSSExceptionUtils.dealErrorException(60045, "developStandard is null, can not do import operation", DSSFrameworkErrorException.class);
+        }
+        List<DSSLabel> dssLabelList = Collections.singletonList(dssLabel);
+        AppInstance appInstance = appConn.getAppDesc().getAppInstancesByLabels(dssLabelList).get(0);
+        RefImportService refImportService = standard.getRefImportService(appInstance);
+        RefImportOperation<ThirdlyRequestRef.ImportRequestRefImpl> refImportOperation = refImportService.getRefImportOperation();
+            try {
+                ThirdlyRequestRef.ImportRequestRefImpl importRequestRef = new ThirdlyRequestRef.ImportRequestRefImpl();
+
+                importRequestRef.setResourceMap(MapUtils.newCommonMap(
+                        ImportRequestRef.RESOURCE_ID_KEY, bmlResource.getResourceId(), ImportRequestRef.RESOURCE_VERSION_KEY, bmlResource.getVersion()));
+                importRequestRef.setDSSLabels(Collections.singletonList(dssLabel));
+                importRequestRef.setRefProjectId(projectId);
+                importRequestRef.setUserName(releaseUser);
+                importRequestRef.setProjectName(projectName);
+                importRequestRef.setName(orchestratorName);
+                importRequestRef.setWorkspace(workspace);
+                RefJobContentResponseRef responseRef = refImportOperation.importRef(importRequestRef);
+                Long refOrcId = (Long) responseRef.getRefJobContent().get(OrchestratorRefConstant.ORCHESTRATOR_ID_KEY);
+                String orchestratorVersion=(String) responseRef.getRefJobContent().get(OrchestratorRefConstant.ORCHESTRATOR_VERSION_KEY);
+                LOGGER.info("Succeed to get responseRef for projectInfo {}, refOrcId is {}.", projectName, refOrcId);
+                //从返回的的内容中搞到导入之后的orc的信息
+                orchestratorReleaseInfo=new OrchestratorBaseInfo();
+                orchestratorReleaseInfo.setOrchestratorId(refOrcId);
+                orchestratorReleaseInfo.setOrchestratorName(orchestratorName);
+            } catch (Exception e) {
+                DSSExceptionUtils.dealErrorException(60035, "Failed to import Ref for project: " + e.getMessage(), e, DSSFrameworkErrorException.class);
+            }
+        return orchestratorReleaseInfo;
+    }
+
+    @Override
+    public OrchestratorBatchImportInfo batchImportOrc(String userName, Long projectId, String projectName,
+                                                      BmlResource bmlResource, String checkCode,
+                                                      DSSLabel dssLabel, Workspace workspace)
+            throws ErrorException{
+        //先核对md5
+        String md5code;
+        try(InputStream zipInputStream=(InputStream)bmlService.download(userName,
+                bmlResource.getResourceId(),
+                bmlResource.getVersion()).get("is")) {
+            md5code=  DigestUtils.md5Hex(zipInputStream);
+        } catch (IOException e) {
+            LOGGER.error("md5 sum failed",e);
+            throw new DSSRuntimeException(e.getMessage());
+        }
+        if(!md5code.equals(checkCode)){
+            LOGGER.error("checkCode does not match the upload file。input code:{},real code:{}",checkCode,md5code);
+            throw new DSSRuntimeException("checkCode does not match the upload file,please check your upload file and checkCode");
+        }
+        //下载到本地处理
+        String importSaveBasePath = IoUtils.generateIOPath(userName, "","");
+        String importFile=importSaveBasePath+File.separator+projectName+".zip";
+        LOGGER.info("import zip file locate at {}",importFile);
+        //下载压缩包
+        bmlService.downloadToLocalPath(userName, bmlResource.getResourceId(), bmlResource.getVersion(), importFile);
+        try{
+            String  originProjectName=readImportZipProjectName(importFile);
+            if(!projectName.equals(originProjectName)){
+                String msg=String.format("target project name must be same with origin project name.origin project name:%s,target project name:%s(导入的目标工程名必须与导出时源工程名保持一致。源工程名：%s，目标工程名：%s)"
+                        ,originProjectName,projectName,originProjectName,projectName);
+                throw new DSSRuntimeException(msg);
+            }
+        }catch (IOException e){
+            throw new DSSRuntimeException("upload file format error(导入包格式错误)");
+        }
+        //解压
+        String unzipImportFile= ZipHelper.unzip(importFile);
+        LOGGER.info("import unziped file locate at {}",unzipImportFile);
+        //解析元数据
+        String metaInfoPath=unzipImportFile+ File.separator+"meta.json";
+        String metaJson = bmlService.readLocalTextFile(userName, metaInfoPath);
+        Type type=new TypeToken<List<OrchestratorBaseInfo>>(){}.getType();
+        List<OrchestratorBaseInfo> importOrcs=new Gson().fromJson(metaJson,type);
+
+        Iterator<File> iterator= FileUtils.iterateFiles(new File(unzipImportFile),new String[]{"zip"},false);
+        List<OrchestratorBaseInfo> importResultInfo = new ArrayList<>();
+        while (iterator.hasNext()){
+            File orcZipFile=iterator.next();
+            InputStream inputStream = bmlService.readLocalResourceFile(userName, orcZipFile.getAbsolutePath());
+            BmlResource uploadResult = bmlService.upload(userName, inputStream,
+                    orcZipFile.getName() , projectName);
+            String orcName = FilenameUtils.getBaseName(orcZipFile.getName());
+            OrchestratorBaseInfo importInfo = importOrc(orcName, userName, projectId, projectName, uploadResult, dssLabel, workspace.getWorkspaceName(), workspace);
+            importResultInfo.add(importInfo);
+        }
+        return new OrchestratorBatchImportInfo(importOrcs,importResultInfo);
+    }
+    private String readImportZipProjectName(String zipFilePath) throws IOException {
+        try(ZipFile zipFile =new ZipFile(zipFilePath)){
+            Enumeration<? extends ZipEntry> entries =zipFile.entries();
+            if(entries.hasMoreElements()){
+                String projectName=entries.nextElement().getName();
+                while (projectName.endsWith(File.separator)){
+                    projectName = projectName.substring(0, projectName.length() - 1);
+                }
+                return projectName;
+            }
+        }
+        throw new IOException();
+    }
+}
diff --git a/dss-orchestrator/dss-orchestrator-common/src/main/java/com/webank/wedatasphere/dss/orchestrator/common/ref/OrchestratorRefConstant.java b/dss-orchestrator/dss-orchestrator-common/src/main/java/com/webank/wedatasphere/dss/orchestrator/common/ref/OrchestratorRefConstant.java
index 6504ef7c6..aed36f76b 100644
--- a/dss-orchestrator/dss-orchestrator-common/src/main/java/com/webank/wedatasphere/dss/orchestrator/common/ref/OrchestratorRefConstant.java
+++ b/dss-orchestrator/dss-orchestrator-common/src/main/java/com/webank/wedatasphere/dss/orchestrator/common/ref/OrchestratorRefConstant.java
@@ -7,6 +7,10 @@
  */
 public interface OrchestratorRefConstant {
 
+    String ORCHESTRATOR_ID_LIST_KEY = "orchestratorIdList";
+    String ORCHESTRATOR_VERSION_ID_KEY = "orchestratorVersionId";
+    String ORCHESTRATOR_ADD_VERSION_FLAG_KEY = "addOrcVersionFlag";
+
     String DSS_ORCHESTRATOR_INFO_KEY = "dssOrchestratorInfo";
 
     /*************************************************************/

From b4564569170d592ae4120f23b4771fd9d06f1262 Mon Sep 17 00:00:00 2001
From: qweqnotallow <747839893@qq.com>
Date: Fri, 19 Apr 2024 14:21:15 +0800
Subject: [PATCH 047/302] =?UTF-8?q?workflow=20submit=20fix(move=20diff/sub?=
 =?UTF-8?q?mit=20to=20orchestrator-server=E3=80=81fix=20git=20diff/submit)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dss-framework-orchestrator-server/pom.xml |  5 ++
 .../request/OrchestratorSubmitRequest.java    | 22 ++++-
 .../DSSFrameworkOrchestratorRestful.java      | 19 ++++
 .../service/OrchestratorFrameworkService.java |  5 ++
 .../OrchestratorFrameworkServiceImpl.java     | 87 +++++++++++++++++++
 .../dss/git/config/GitServerConfig.java       |  2 +
 .../impl/DSSGitProjectManagerServiceImpl.java |  3 +-
 .../DSSGitWorkflowManagerServiceImpl.java     |  6 +-
 .../dss/git/utils/DSSGitUtils.java            |  2 +
 .../wedatasphere/dss/git/utils/FileUtils.java | 80 ++++++++++++++++-
 .../dss/workflow/restful/FlowRestfulApi.java  | 15 ----
 .../dss/workflow/service/DSSFlowService.java  |  4 -
 .../service/impl/DSSFlowServiceImpl.java      | 50 -----------
 13 files changed, 224 insertions(+), 76 deletions(-)
 rename dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/entity/request/SubmitFlowRequest.java => dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/entity/request/OrchestratorSubmitRequest.java (61%)

diff --git a/dss-framework/dss-framework-orchestrator-server/pom.xml b/dss-framework/dss-framework-orchestrator-server/pom.xml
index cf6dab9da..acdf06790 100644
--- a/dss-framework/dss-framework-orchestrator-server/pom.xml
+++ b/dss-framework/dss-framework-orchestrator-server/pom.xml
@@ -29,6 +29,11 @@
     <artifactId>dss-framework-orchestrator-server</artifactId>
 
     <dependencies>
+        <dependency>
+            <groupId>com.webank.wedatasphere.dss</groupId>
+            <artifactId>dss-git-common</artifactId>
+            <version>${dss.version}</version>
+        </dependency>
         <dependency>
             <groupId>com.webank.wedatasphere.dss</groupId>
             <artifactId>dss-framework-common</artifactId>
diff --git a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/entity/request/SubmitFlowRequest.java b/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/entity/request/OrchestratorSubmitRequest.java
similarity index 61%
rename from dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/entity/request/SubmitFlowRequest.java
rename to dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/entity/request/OrchestratorSubmitRequest.java
index 51b0ee2e1..2095061b7 100644
--- a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/entity/request/SubmitFlowRequest.java
+++ b/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/entity/request/OrchestratorSubmitRequest.java
@@ -1,12 +1,14 @@
-package com.webank.wedatasphere.dss.workflow.entity.request;
+package com.webank.wedatasphere.dss.orchestrator.server.entity.request;
 
 import com.webank.wedatasphere.dss.common.label.LabelRouteVO;
 
-public class SubmitFlowRequest {
+public class OrchestratorSubmitRequest {
     private Long flowId;
     private String dssLabel;
     private LabelRouteVO labels;
     private String projectName;
+    private String comment;
+    private Long orchestratorId;
 
     public Long getFlowId() {
         return flowId;
@@ -39,4 +41,20 @@ public String getProjectName() {
     public void setProjectName(String projectName) {
         this.projectName = projectName;
     }
+
+    public String getComment() {
+        return comment;
+    }
+
+    public void setComment(String comment) {
+        this.comment = comment;
+    }
+
+    public Long getOrchestratorId() {
+        return orchestratorId;
+    }
+
+    public void setOrchestratorId(Long orchestratorId) {
+        this.orchestratorId = orchestratorId;
+    }
 }
diff --git a/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/restful/DSSFrameworkOrchestratorRestful.java b/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/restful/DSSFrameworkOrchestratorRestful.java
index 88f934901..7ff989bf0 100644
--- a/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/restful/DSSFrameworkOrchestratorRestful.java
+++ b/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/restful/DSSFrameworkOrchestratorRestful.java
@@ -22,6 +22,7 @@
 import com.webank.wedatasphere.dss.common.label.DSSLabel;
 import com.webank.wedatasphere.dss.common.label.EnvDSSLabel;
 import com.webank.wedatasphere.dss.common.utils.AuditLogUtils;
+import com.webank.wedatasphere.dss.git.common.protocol.GitTree;
 import com.webank.wedatasphere.dss.orchestrator.common.entity.OrchestratorVo;
 import com.webank.wedatasphere.dss.orchestrator.server.constant.OrchestratorLevelEnum;
 import com.webank.wedatasphere.dss.orchestrator.server.entity.request.*;
@@ -269,4 +270,22 @@ public Message getVersionByOrchestratorId(@RequestBody QueryOrchestratorVersion
         List list = orchestratorService.getVersionByOrchestratorId(queryOrchestratorVersion.getOrchestratorId());
         return Message.ok().data("list", list);
     }
+
+    @RequestMapping(value = "diffFlow", method = RequestMethod.POST)
+    public Message diff(@RequestBody OrchestratorSubmitRequest submitFlowRequest) {
+        Workspace workspace = SSOHelper.getWorkspace(httpServletRequest);
+        String userName = SecurityFilter.getLoginUsername(httpServletRequest);
+
+        GitTree gitTree = orchestratorFrameworkService.diffFlow(submitFlowRequest, userName, workspace);
+        return Message.ok().data("tree", gitTree);
+    }
+
+    @RequestMapping(value = "submitFlow", method = RequestMethod.POST)
+    public Message submitFlow(@RequestBody OrchestratorSubmitRequest submitFlowRequest) {
+        Workspace workspace = SSOHelper.getWorkspace(httpServletRequest);
+        String userName = SecurityFilter.getLoginUsername(httpServletRequest);
+
+        orchestratorFrameworkService.submitFlow(submitFlowRequest, userName, workspace);
+        return Message.ok();
+    }
 }
diff --git a/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/OrchestratorFrameworkService.java b/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/OrchestratorFrameworkService.java
index 3d56192a9..40cea50ad 100644
--- a/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/OrchestratorFrameworkService.java
+++ b/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/OrchestratorFrameworkService.java
@@ -17,6 +17,7 @@
 package com.webank.wedatasphere.dss.orchestrator.server.service;
 
 import com.webank.wedatasphere.dss.common.exception.DSSErrorException;
+import com.webank.wedatasphere.dss.git.common.protocol.GitTree;
 import com.webank.wedatasphere.dss.orchestrator.common.entity.DSSOrchestratorCopyInfo;
 import com.webank.wedatasphere.dss.orchestrator.server.entity.request.*;
 import com.webank.wedatasphere.dss.orchestrator.server.entity.vo.CommonOrchestratorVo;
@@ -45,4 +46,8 @@ public interface OrchestratorFrameworkService {
     Boolean getOrchestratorCopyStatus(Long sourceOrchestratorId);
 
     DSSOrchestratorCopyInfo getOrchestratorCopyInfoById(String copyInfoId);
+
+    GitTree diffFlow(OrchestratorSubmitRequest flowRequest, String username, Workspace workspace);
+
+    void submitFlow(OrchestratorSubmitRequest flowRequest, String username, Workspace workspace);
 }
diff --git a/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/impl/OrchestratorFrameworkServiceImpl.java b/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/impl/OrchestratorFrameworkServiceImpl.java
index 43c14c028..6d60fa0e6 100644
--- a/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/impl/OrchestratorFrameworkServiceImpl.java
+++ b/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/impl/OrchestratorFrameworkServiceImpl.java
@@ -29,15 +29,23 @@
 import com.webank.wedatasphere.dss.appconn.scheduler.structure.orchestration.ref.RefOrchestrationContentRequestRef;
 import com.webank.wedatasphere.dss.appconn.scheduler.utils.OrchestrationOperationUtils;
 import com.webank.wedatasphere.dss.common.constant.project.ProjectUserPrivEnum;
+import com.webank.wedatasphere.dss.common.entity.BmlResource;
 import com.webank.wedatasphere.dss.common.entity.project.DSSProject;
 import com.webank.wedatasphere.dss.common.exception.DSSErrorException;
 import com.webank.wedatasphere.dss.common.label.DSSLabel;
 import com.webank.wedatasphere.dss.common.label.EnvDSSLabel;
+import com.webank.wedatasphere.dss.common.protocol.RequestExportWorkflow;
+import com.webank.wedatasphere.dss.common.protocol.ResponseExportWorkflow;
 import com.webank.wedatasphere.dss.common.protocol.project.*;
 import com.webank.wedatasphere.dss.common.utils.DSSCommonUtils;
 import com.webank.wedatasphere.dss.common.utils.DSSExceptionUtils;
 import com.webank.wedatasphere.dss.common.utils.RpcAskUtils;
 import com.webank.wedatasphere.dss.framework.common.exception.DSSFrameworkErrorException;
+import com.webank.wedatasphere.dss.git.common.protocol.GitTree;
+import com.webank.wedatasphere.dss.git.common.protocol.request.GitCommitRequest;
+import com.webank.wedatasphere.dss.git.common.protocol.request.GitDiffRequest;
+import com.webank.wedatasphere.dss.git.common.protocol.response.GitCommitResponse;
+import com.webank.wedatasphere.dss.git.common.protocol.response.GitDiffResponse;
 import com.webank.wedatasphere.dss.orchestrator.common.entity.DSSOrchestratorCopyInfo;
 import com.webank.wedatasphere.dss.orchestrator.common.entity.DSSOrchestratorInfo;
 import com.webank.wedatasphere.dss.orchestrator.common.entity.DSSOrchestratorRefOrchestration;
@@ -422,4 +430,83 @@ private static boolean hasProjectEditPriv(Long projectId, String username) {
         return hasEditPriv || projectUserAuthResponse.getProjectOwner().equals(username);
     }
 
+    @Override
+    public GitTree diffFlow(OrchestratorSubmitRequest flowRequest, String username, Workspace workspace) {
+        DSSOrchestratorInfo orchestrator = orchestratorMapper.getOrchestrator(flowRequest.getOrchestratorId());
+        BmlResource bmlResource = uploadWorkflowToGit(flowRequest, username, workspace, orchestrator);
+
+        // todo 3. diff（第一步补充后，使用去掉第三方节点的zip包上传到bml，替换下方的BML）
+        GitDiffResponse diff = diff(orchestrator.getName(), bmlResource, username, workspace.getWorkspaceId(), flowRequest.getProjectName());
+        if (diff == null) {
+            LOGGER.info("change is empty");
+            return null;
+        }
+
+        //4. 返回文件列表
+        return diff.getTree();
+    }
+
+    private GitDiffResponse diff(String path, BmlResource bmlResource, String username, Long workspaceId, String projectName) {
+        Sender gitSender = DSSSenderServiceFactory.getOrCreateServiceInstance().getGitSender();
+        Map<String, BmlResource> file = new HashMap<>();
+        file.put(path, bmlResource);
+        GitDiffRequest request1 = new GitDiffRequest(workspaceId, projectName, file, username);
+        LOGGER.info("-------=======================begin to diff {}=======================-------", request1.getProjectName());
+        GitDiffResponse responseWorkflowValidNode = RpcAskUtils.processAskException(gitSender.ask(request1), GitDiffResponse.class, GitDiffRequest.class);
+        LOGGER.info("-------=======================End to diff testGit1=======================-------: {}", responseWorkflowValidNode);
+        return responseWorkflowValidNode;
+    }
+
+
+    private BmlResource uploadWorkflowToGit(OrchestratorSubmitRequest flowRequest, String username, Workspace workspace, DSSOrchestratorInfo orchestrator) {
+        // todo 1. 去除第三方节点实体的zip包——resource/工作流名/appconn-resource文件夹，并上传到bml
+
+        // 2. 将序列化好的工作流文件包提交给git服务，并拿到diff文件列表结果,
+        long flowId = flowRequest.getFlowId();
+
+        Long projectId = orchestrator.getProjectId();
+        String projectName = flowRequest.getProjectName();
+        List<DSSLabel> dssLabelList = new ArrayList<>();
+        dssLabelList.add(new EnvDSSLabel(flowRequest.getLabels().getRoute()));
+        RequestExportWorkflow requestExportWorkflow = new RequestExportWorkflow(username,
+                flowId,
+                projectId,
+                projectName,
+                DSSCommonUtils.COMMON_GSON.toJson(workspace),
+                dssLabelList);
+        Sender sender = DSSSenderServiceFactory.getOrCreateServiceInstance().getWorkflowSender(dssLabelList);
+        ResponseExportWorkflow responseExportWorkflow = RpcAskUtils.processAskException(sender.ask(requestExportWorkflow),
+                ResponseExportWorkflow.class, RequestExportWorkflow.class);
+        Map<String, Object> resourceMap = new HashMap<>(2);
+        BmlResource bmlResource = new BmlResource(responseExportWorkflow.resourceId(), responseExportWorkflow.version());
+
+        return bmlResource;
+    }
+
+    @Override
+    public void submitFlow(OrchestratorSubmitRequest flowRequest, String username, Workspace workspace) {
+        DSSOrchestratorInfo orchestrator = orchestratorMapper.getOrchestrator(flowRequest.getOrchestratorId());
+        BmlResource bmlResource = uploadWorkflowToGit(flowRequest, username, workspace, orchestrator);
+
+        // todo 3. diff（第一步补充后，使用去掉第三方节点的zip包上传到bml，替换下方的BML）
+        GitCommitResponse commit = push(orchestrator.getName(), bmlResource, username, workspace.getWorkspaceId(), flowRequest.getProjectName(), flowRequest.getComment());
+        if (commit == null) {
+            LOGGER.error("change is empty");
+        }
+
+        //4. 返回文件列表
+        return ;
+    }
+
+    private GitCommitResponse push (String path, BmlResource bmlResource, String username, Long workspaceId, String projectName, String comment) {
+        LOGGER.info("-------=======================begin to add testGit1=======================-------");
+        Sender gitSender = DSSSenderServiceFactory.getOrCreateServiceInstance().getGitSender();
+        Map<String, BmlResource> file = new HashMap<>();
+        file.put(path, bmlResource);
+        GitCommitRequest request1 = new GitCommitRequest(workspaceId, projectName, file, comment, username);
+        GitCommitResponse responseWorkflowValidNode = RpcAskUtils.processAskException(gitSender.ask(request1), GitCommitResponse.class, GitCommitRequest.class);
+        LOGGER.info("-------=======================End to add testGit1=======================-------: {}", responseWorkflowValidNode);
+        return responseWorkflowValidNode;
+    }
+
 }
diff --git a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/config/GitServerConfig.java b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/config/GitServerConfig.java
index 4edfc36d0..b7863cdba 100644
--- a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/config/GitServerConfig.java
+++ b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/config/GitServerConfig.java
@@ -11,5 +11,7 @@ public class GitServerConfig {
 
     public static final CommonVars<Integer> GIT_THREAD_NUM = CommonVars.apply("wds.dss.git.thread.num", 23);
 
+    public static final CommonVars<String> GIT_SERVER_META_PATH = CommonVars.apply("wds.dss.git.server.meta.path", ".metaConf");
+
     public static final CommonVars<String> GIT_THREAD_NAME = CommonVars.apply("wds.dss.git.thread.name", "gitServer-Thread-");
 }
diff --git a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitProjectManagerServiceImpl.java b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitProjectManagerServiceImpl.java
index 871bfb322..27e28e700 100644
--- a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitProjectManagerServiceImpl.java
+++ b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitProjectManagerServiceImpl.java
@@ -43,7 +43,8 @@ public GitCreateProjectResponse create(GitCreateProjectRequest request) {
             // Http请求Git，创建project
             DSSGitUtils.init(request.getProjectName(), gitUser);
             // 解压BML文件到本地 todo 对接Server时放开调试
-            FileUtils.removeAndUpdate(bmlService, request.getProjectName(), request.getBmlResource(), request.getUsername());
+            FileUtils.removeProject(request.getProjectName());
+            FileUtils.update(bmlService, request.getProjectName(), request.getBmlResource(), request.getUsername());
             // 本地创建Git项目
             DSSGitUtils.create(request.getProjectName(), gitUser);
             // 获取git项目
diff --git a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitWorkflowManagerServiceImpl.java b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitWorkflowManagerServiceImpl.java
index 53d9887e1..4454dd894 100644
--- a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitWorkflowManagerServiceImpl.java
+++ b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitWorkflowManagerServiceImpl.java
@@ -56,7 +56,8 @@ public GitDiffResponse diff(GitDiffRequest request) {
             // 解压BML文件到本地 todo 对接Server时放开调试
             Map<String, BmlResource> bmlResourceMap = request.getBmlResourceMap();
             for (Map.Entry<String, BmlResource> entry : bmlResourceMap.entrySet()) {
-                FileUtils.removeAndUpdate(bmlService, entry.getKey(), entry.getValue(), request.getUsername());
+                FileUtils.removeFlowNode(entry.getKey(), request.getProjectName());
+                FileUtils.update(bmlService, entry.getKey(), entry.getValue(), request.getUsername());
             }
             diff = DSSGitUtils.diff(request.getProjectName());
             // 重置本地
@@ -90,7 +91,8 @@ public GitCommitResponse commit(GitCommitRequest request) {
             // 解压BML文件到本地 todo 对接Server时放开调试
             Map<String, BmlResource> bmlResourceMap = request.getBmlResourceMap();
             for (Map.Entry<String, BmlResource> entry : bmlResourceMap.entrySet()) {
-                FileUtils.removeAndUpdate(bmlService, entry.getKey(), entry.getValue(), request.getUsername());
+                FileUtils.removeFlowNode(entry.getKey(), request.getProjectName());
+                FileUtils.update(bmlService, entry.getKey(), entry.getValue(), request.getUsername());
             }
             // 提交
             DSSGitUtils.push(repository, request.getProjectName(), gitUser, request.getComment());
diff --git a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/utils/DSSGitUtils.java b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/utils/DSSGitUtils.java
index 9751f4847..4c9c6c6b2 100644
--- a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/utils/DSSGitUtils.java
+++ b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/utils/DSSGitUtils.java
@@ -537,4 +537,6 @@ public static String generateGitPath(String projectName) {
 
 
 
+
+
 }
diff --git a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/utils/FileUtils.java b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/utils/FileUtils.java
index 83dcfbfc1..633ca6532 100644
--- a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/utils/FileUtils.java
+++ b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/utils/FileUtils.java
@@ -7,6 +7,8 @@
 import com.webank.wedatasphere.dss.common.service.BMLService;
 import com.webank.wedatasphere.dss.common.utils.ZipHelper;
 import com.webank.wedatasphere.dss.git.config.GitServerConfig;
+import org.apache.commons.lang.StringUtils;
+import org.apache.poi.util.IOUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -130,8 +132,25 @@ public static File newFile(File destinationDir, ZipEntry zipEntry) throws IOExce
         return destFile;
     }
 
-    public static void removeAndUpdate (BMLService bmlService, String path,  BmlResource bmlResource, String username) {
-        FileUtils.removeDirectory("/" + FileUtils.normalizePath(GitServerConfig.GIT_SERVER_PATH.getValue()) + "/" +path);
+    public static void removeFlowNode(String path, String projectName) {
+        // 删除node节点
+        String flowNodePathPre =  FileUtils.normalizePath(GitServerConfig.GIT_SERVER_PATH.getValue()) + File.separator + projectName ;
+        String flowNodePath = File.separator + FileUtils.normalizePath(flowNodePathPre) + File.separator + path;
+        String flowNodeMetaPath = File.separator + FileUtils.normalizePath(flowNodePathPre) + File.separator + FileUtils.normalizePath(GitServerConfig.GIT_SERVER_META_PATH.getValue()) + File.separator + path;
+        // 1.删除工作流节点代码
+        removeDirectory(flowNodePath);
+        // 2. 删除工作流节点对应.metaConf文件
+        removeDirectory(flowNodeMetaPath);
+    }
+
+    public static void removeProject(String path) {
+        // 删除node节点
+        String projectPath =  File.separator + FileUtils.normalizePath(GitServerConfig.GIT_SERVER_PATH.getValue()) + File.separator + path ;
+        // 1.删除项目
+        removeDirectory(projectPath);
+    }
+
+    public static void update(BMLService bmlService, String path,  BmlResource bmlResource, String username) {
         try {
             downloadAndUnzipBMLResource(bmlService, path, bmlResource, username, "/" + FileUtils.normalizePath(GitServerConfig.GIT_SERVER_PATH.getValue()));
         }catch (DSSErrorException e) {
@@ -181,4 +200,61 @@ public static String normalizePath(String path) {
         
         return path;
     }
+
+    public static String unzip(String dirPath,boolean deleteOriginZip)throws DSSErrorException {
+        File file = new File(dirPath);
+        if(!file.exists()){
+            logger.error("{} 不存在, 不能解压zip文件", dirPath);
+            throw new DSSErrorException(90001,dirPath + " does not exist, can not unzip");
+        }
+        //先用简单的方法，调用新进程进行压缩
+        String[] strArr = dirPath.split(File.separator);
+        String shortPath = new File(dirPath).getName();
+        String workPath = dirPath.substring(0, dirPath.length() - shortPath.length() - 1);
+        List<String> list = new ArrayList<>();
+        list.add("unzip");
+        list.add("-o");
+        String longZipFilePath = dirPath.replace(".zip","");
+        list.add(shortPath);
+        ProcessBuilder processBuilder = new ProcessBuilder(list);
+        processBuilder.redirectErrorStream(true);
+        processBuilder.directory(new File(workPath));
+        BufferedReader infoReader = null;
+        BufferedReader errorReader = null;
+        try{
+            Process process = processBuilder.start();
+            infoReader = new BufferedReader(new InputStreamReader(process.getInputStream()));
+            errorReader = new BufferedReader(new InputStreamReader(process.getErrorStream()));
+            String infoLine = null;
+            while((infoLine = infoReader.readLine()) != null){
+                logger.info("process output: {} ", infoLine);
+            }
+            String errorLine = null;
+            StringBuilder errMsg = new StringBuilder();
+            while((errorLine = errorReader.readLine()) != null){
+                if (StringUtils.isNotEmpty(errorLine)){
+                    errMsg.append(errorLine).append("\n");
+                }
+                logger.error("process error: {} ", errorLine);
+            }
+            int exitCode = process.waitFor();
+            if (exitCode != 0){
+                throw new DSSErrorException(90007,errMsg.toString());
+            }
+            if(deleteOriginZip){
+                file.delete();
+            }
+        }catch(final Exception e){
+            logger.error("{} 解压缩 zip 文件失败, reason: ", e);
+            DSSErrorException exception = new DSSErrorException(90009,dirPath + " to zip file failed");
+            exception.initCause(e);
+            throw exception;
+        } finally {
+
+            logger.info("生成解压目录{}", longZipFilePath);
+            IOUtils.closeQuietly(infoReader);
+            IOUtils.closeQuietly(errorReader);
+        }
+        return longZipFilePath;
+    }
 }
diff --git a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/restful/FlowRestfulApi.java b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/restful/FlowRestfulApi.java
index bafa371a9..818565567 100644
--- a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/restful/FlowRestfulApi.java
+++ b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/restful/FlowRestfulApi.java
@@ -371,19 +371,4 @@ public Message deleteFlowEditLock(HttpServletRequest req, @PathVariable("flowEdi
         return Message.ok();
     }
 
-    @RequestMapping(value = "submitFlow", method = RequestMethod.POST)
-    public Message submitFlow(@RequestBody SubmitFlowRequest submitFlowRequest) {
-        Workspace workspace = SSOHelper.getWorkspace(httpServletRequest);
-        String userName = SecurityFilter.getLoginUsername(httpServletRequest);
-        //若工作流已经被其他用户抢锁，则当前用户不能再保存成功
-        String ticketId = Arrays.stream(httpServletRequest.getCookies()).filter(cookie -> DSSWorkFlowConstant.BDP_USER_TICKET_ID.equals(cookie.getName()))
-                .findFirst().map(Cookie::getValue).get();
-        DSSFlowEditLock flowEditLock = lockMapper.getFlowEditLockByID(submitFlowRequest.getFlowId());
-        if (flowEditLock != null && !flowEditLock.getOwner().equals(ticketId)) {
-            return Message.error("当前工作流被用户" + flowEditLock.getUsername() + "已锁定编辑，您编辑的内容不能再被保存。如有疑问，请与" + flowEditLock.getUsername() + "确认");
-        }
-        GitTree gitTree = flowService.submitFlow(submitFlowRequest, userName, workspace);
-        return Message.ok().data("tree", gitTree);
-    }
-
 }
diff --git a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/service/DSSFlowService.java b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/service/DSSFlowService.java
index fcf63b03b..a001f038a 100644
--- a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/service/DSSFlowService.java
+++ b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/service/DSSFlowService.java
@@ -18,10 +18,8 @@
 
 import com.webank.wedatasphere.dss.common.exception.DSSErrorException;
 import com.webank.wedatasphere.dss.common.label.DSSLabel;
-import com.webank.wedatasphere.dss.git.common.protocol.GitTree;
 import com.webank.wedatasphere.dss.standard.app.sso.Workspace;
 import com.webank.wedatasphere.dss.workflow.common.entity.DSSFlow;
-import com.webank.wedatasphere.dss.workflow.entity.request.SubmitFlowRequest;
 import com.webank.wedatasphere.dss.workflow.entity.vo.ExtraToolBarsVO;
 import org.apache.linkis.common.exception.ErrorException;
 
@@ -74,6 +72,4 @@ DSSFlow copyRootFlow(Long rootFlowId, String userName, Workspace workspace,
     boolean checkIsExistSameFlow(String jsonFlow);
 
     List<String> checkIsSave(Long parentFlowID, String jsonFlow);
-
-    GitTree submitFlow(SubmitFlowRequest flowRequest, String username, Workspace workspace);
 }
diff --git a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/service/impl/DSSFlowServiceImpl.java b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/service/impl/DSSFlowServiceImpl.java
index 8cf0bd696..04fbe5414 100644
--- a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/service/impl/DSSFlowServiceImpl.java
+++ b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/service/impl/DSSFlowServiceImpl.java
@@ -31,17 +31,11 @@
 import com.webank.wedatasphere.dss.common.exception.DSSErrorException;
 import com.webank.wedatasphere.dss.common.exception.DSSRuntimeException;
 import com.webank.wedatasphere.dss.common.label.DSSLabel;
-import com.webank.wedatasphere.dss.common.label.EnvDSSLabel;
 import com.webank.wedatasphere.dss.common.utils.DSSCommonUtils;
 import com.webank.wedatasphere.dss.common.utils.IoUtils;
 import com.webank.wedatasphere.dss.common.utils.MapUtils;
-import com.webank.wedatasphere.dss.common.utils.RpcAskUtils;
 import com.webank.wedatasphere.dss.contextservice.service.ContextService;
 import com.webank.wedatasphere.dss.contextservice.service.impl.ContextServiceImpl;
-import com.webank.wedatasphere.dss.git.common.protocol.GitTree;
-import com.webank.wedatasphere.dss.git.common.protocol.request.GitDiffRequest;
-import com.webank.wedatasphere.dss.git.common.protocol.response.GitDiffResponse;
-import com.webank.wedatasphere.dss.sender.service.DSSSenderServiceFactory;
 import com.webank.wedatasphere.dss.standard.app.development.utils.DSSJobContentConstant;
 import com.webank.wedatasphere.dss.standard.app.sso.Workspace;
 import com.webank.wedatasphere.dss.workflow.WorkFlowManager;
@@ -59,7 +53,6 @@
 import com.webank.wedatasphere.dss.workflow.dao.NodeInfoMapper;
 import com.webank.wedatasphere.dss.workflow.entity.CommonAppConnNode;
 import com.webank.wedatasphere.dss.workflow.entity.NodeInfo;
-import com.webank.wedatasphere.dss.workflow.entity.request.SubmitFlowRequest;
 import com.webank.wedatasphere.dss.workflow.entity.vo.ExtraToolBarsVO;
 import com.webank.wedatasphere.dss.workflow.io.export.NodeExportService;
 import com.webank.wedatasphere.dss.workflow.io.input.NodeInputService;
@@ -76,7 +69,6 @@
 import org.apache.linkis.common.exception.ErrorException;
 import org.apache.linkis.cs.client.utils.SerializeHelper;
 import org.apache.linkis.cs.common.utils.CSCommonUtils;
-import org.apache.linkis.rpc.Sender;
 import org.apache.linkis.server.BDPJettyServerHelper;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -779,46 +771,4 @@ private void persistenceFlowRelation(Long flowID, Long parentFlowID) {
         }
     }
 
-    @Override
-    public GitTree submitFlow(SubmitFlowRequest flowRequest, String username, Workspace workspace) {
-        // todo 1. 去除第三方节点实体的zip包——resource/工作流名/appconn-resource文件夹，并上传到bml
-
-        // 2. 将序列化好的工作流文件包提交给git服务，并拿到diff文件列表结果,
-        DSSFlow dssFlow = flowMapper.selectFlowByID(flowRequest.getFlowId());
-        BmlResource bmlResource = null;
-        try {
-
-            DSSProject projectInfo = DSSFlowEditLockManager.getProjectInfo(dssFlow.getProjectId());
-            List<DSSLabel> dssLabelList = new ArrayList<>();
-            dssLabelList.add(new EnvDSSLabel(flowRequest.getLabels().getRoute()));
-            bmlResource = workFlowManager.exportWorkflowNew(username, flowRequest.getFlowId(), projectInfo.getId(), flowRequest.getProjectName(), workspace, dssLabelList);
-        } catch (DSSErrorException e) {
-            logger.error("getProjectInfo failed by:", e);
-        } catch (Exception e) {
-            throw new RuntimeException(e);
-        }
-
-
-        // todo 3. diff（第一步补充后，使用去掉第三方节点的zip包上传到bml，替换下方的BML）
-        GitDiffResponse diff = diff(dssFlow.getName(), bmlResource, username, workspace.getWorkspaceId(), flowRequest.getProjectName());
-        if (diff == null) {
-            logger.info("change is empty");
-            return null;
-        }
-
-        //4. 返回文件列表
-        return diff.getTree();
-    }
-
-    private GitDiffResponse diff(String path, BmlResource bmlResource, String username, Long workspaceId, String projectName) {
-        Sender gitSender = DSSSenderServiceFactory.getOrCreateServiceInstance().getGitSender();
-        Map<String, BmlResource> file = new HashMap<>();
-        file.put(path, bmlResource);
-        GitDiffRequest request1 = new GitDiffRequest(workspaceId, projectName, file, username);
-        logger.info("-------=======================begin to diff {}=======================-------", request1.getProjectName());
-        GitDiffResponse responseWorkflowValidNode = RpcAskUtils.processAskException(gitSender.ask(request1), GitDiffResponse.class, GitDiffRequest.class);
-        logger.info("-------=======================End to diff testGit1=======================-------: {}", responseWorkflowValidNode);
-        return responseWorkflowValidNode;
-    }
-
 }

From 04c9765e8fbcf522d39b0dda2faae56d92b2fc0d Mon Sep 17 00:00:00 2001
From: qweqnotallow <747839893@qq.com>
Date: Mon, 22 Apr 2024 11:17:21 +0800
Subject: [PATCH 048/302] workflow submit fix(add lock status)

---
 .../DSSFrameworkOrchestratorRestful.java      | 23 +++++++++
 .../OrchestratorFrameworkServiceImpl.java     | 15 +++++-
 .../protocol/RequestPushOrchestrator.java     | 21 ++++++++
 .../protocol/ResponsePushOrchestrator.java    | 21 ++++++++
 .../common/protocol/RequestLockWorkflow.java  | 43 ++++++++++++++++
 .../common/protocol/ResponseLockWorkflow.java | 34 +++++++++++++
 .../dss/workflow/DefaultWorkFlowManager.java  | 51 +++++++++++++++++--
 .../dss/workflow/WorkFlowManager.java         |  9 ++--
 .../receiver/DSSWorkflowChooser.scala         |  4 +-
 .../receiver/DSSWorkflowReceiver.scala        |  8 ++-
 10 files changed, 220 insertions(+), 9 deletions(-)
 create mode 100644 dss-orchestrator/dss-orchestrator-common/src/main/java/com/webank/wedatasphere/dss/orchestrator/common/protocol/RequestPushOrchestrator.java
 create mode 100644 dss-orchestrator/dss-orchestrator-common/src/main/java/com/webank/wedatasphere/dss/orchestrator/common/protocol/ResponsePushOrchestrator.java
 create mode 100644 dss-orchestrator/orchestrators/dss-workflow/dss-workflow-common/src/main/java/com/webank/wedatasphere/dss/workflow/common/protocol/RequestLockWorkflow.java
 create mode 100644 dss-orchestrator/orchestrators/dss-workflow/dss-workflow-common/src/main/java/com/webank/wedatasphere/dss/workflow/common/protocol/ResponseLockWorkflow.java

diff --git a/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/restful/DSSFrameworkOrchestratorRestful.java b/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/restful/DSSFrameworkOrchestratorRestful.java
index 7ff989bf0..c2a63bdac 100644
--- a/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/restful/DSSFrameworkOrchestratorRestful.java
+++ b/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/restful/DSSFrameworkOrchestratorRestful.java
@@ -22,6 +22,7 @@
 import com.webank.wedatasphere.dss.common.label.DSSLabel;
 import com.webank.wedatasphere.dss.common.label.EnvDSSLabel;
 import com.webank.wedatasphere.dss.common.utils.AuditLogUtils;
+import com.webank.wedatasphere.dss.common.utils.RpcAskUtils;
 import com.webank.wedatasphere.dss.git.common.protocol.GitTree;
 import com.webank.wedatasphere.dss.orchestrator.common.entity.OrchestratorVo;
 import com.webank.wedatasphere.dss.orchestrator.server.constant.OrchestratorLevelEnum;
@@ -31,8 +32,11 @@
 import com.webank.wedatasphere.dss.orchestrator.server.entity.vo.OrchestratorUnlockVo;
 import com.webank.wedatasphere.dss.orchestrator.server.service.OrchestratorFrameworkService;
 import com.webank.wedatasphere.dss.orchestrator.server.service.OrchestratorService;
+import com.webank.wedatasphere.dss.sender.service.DSSSenderServiceFactory;
 import com.webank.wedatasphere.dss.standard.app.sso.Workspace;
 import com.webank.wedatasphere.dss.standard.sso.utils.SSOHelper;
+import com.webank.wedatasphere.dss.workflow.common.protocol.RequestLockWorkflow;
+import com.webank.wedatasphere.dss.workflow.common.protocol.ResponseLockWorkflow;
 import org.apache.commons.math3.util.Pair;
 import org.apache.linkis.server.Message;
 import org.apache.linkis.server.security.SecurityFilter;
@@ -43,6 +47,7 @@
 
 import javax.annotation.PostConstruct;
 import javax.servlet.http.HttpServletRequest;
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
@@ -275,7 +280,15 @@ public Message getVersionByOrchestratorId(@RequestBody QueryOrchestratorVersion
     public Message diff(@RequestBody OrchestratorSubmitRequest submitFlowRequest) {
         Workspace workspace = SSOHelper.getWorkspace(httpServletRequest);
         String userName = SecurityFilter.getLoginUsername(httpServletRequest);
+        List<DSSLabel> dssLabelList = new ArrayList<>();
+        dssLabelList.add(new EnvDSSLabel(submitFlowRequest.getLabels().getRoute()));
 
+        RequestLockWorkflow requestLockWorkflow = new RequestLockWorkflow(userName, httpServletRequest.getCookies(), submitFlowRequest.getFlowId());
+        ResponseLockWorkflow responseLockWorkflow = RpcAskUtils.processAskException(DSSSenderServiceFactory.getOrCreateServiceInstance()
+                .getWorkflowSender(dssLabelList).ask(requestLockWorkflow), ResponseLockWorkflow.class, RequestLockWorkflow.class);
+        if (responseLockWorkflow.getUnlockStatus() == ResponseLockWorkflow.LOCK_FAILED) {
+            return Message.error("当前工作流被用户" + responseLockWorkflow.getLockOwner() + "已锁定编辑，您编辑的内容不能再被保存。如有疑问，请与" + responseLockWorkflow.getLockOwner() + "确认");
+        }
         GitTree gitTree = orchestratorFrameworkService.diffFlow(submitFlowRequest, userName, workspace);
         return Message.ok().data("tree", gitTree);
     }
@@ -285,6 +298,16 @@ public Message submitFlow(@RequestBody OrchestratorSubmitRequest submitFlowReque
         Workspace workspace = SSOHelper.getWorkspace(httpServletRequest);
         String userName = SecurityFilter.getLoginUsername(httpServletRequest);
 
+        List<DSSLabel> dssLabelList = new ArrayList<>();
+        dssLabelList.add(new EnvDSSLabel(submitFlowRequest.getLabels().getRoute()));
+
+        RequestLockWorkflow requestLockWorkflow = new RequestLockWorkflow(userName, httpServletRequest.getCookies(), submitFlowRequest.getFlowId());
+        ResponseLockWorkflow responseLockWorkflow = RpcAskUtils.processAskException(DSSSenderServiceFactory.getOrCreateServiceInstance()
+                .getWorkflowSender(dssLabelList).ask(requestLockWorkflow), ResponseLockWorkflow.class, RequestLockWorkflow.class);
+        if (responseLockWorkflow.getUnlockStatus() == ResponseLockWorkflow.LOCK_FAILED) {
+            return Message.error("当前工作流被用户" + responseLockWorkflow.getLockOwner() + "已锁定编辑，您编辑的内容不能再被保存。如有疑问，请与" + responseLockWorkflow.getLockOwner() + "确认");
+        }
+
         orchestratorFrameworkService.submitFlow(submitFlowRequest, userName, workspace);
         return Message.ok();
     }
diff --git a/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/impl/OrchestratorFrameworkServiceImpl.java b/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/impl/OrchestratorFrameworkServiceImpl.java
index 6d60fa0e6..3c52d2977 100644
--- a/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/impl/OrchestratorFrameworkServiceImpl.java
+++ b/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/impl/OrchestratorFrameworkServiceImpl.java
@@ -50,6 +50,8 @@
 import com.webank.wedatasphere.dss.orchestrator.common.entity.DSSOrchestratorInfo;
 import com.webank.wedatasphere.dss.orchestrator.common.entity.DSSOrchestratorRefOrchestration;
 import com.webank.wedatasphere.dss.orchestrator.common.entity.OrchestratorVo;
+import com.webank.wedatasphere.dss.orchestrator.common.protocol.RequestPushOrchestrator;
+import com.webank.wedatasphere.dss.orchestrator.common.protocol.ResponsePushOrchestrator;
 import com.webank.wedatasphere.dss.orchestrator.core.DSSOrchestrator;
 import com.webank.wedatasphere.dss.orchestrator.core.exception.DSSOrchestratorErrorException;
 import com.webank.wedatasphere.dss.orchestrator.core.type.DSSOrchestratorRelation;
@@ -495,7 +497,7 @@ public void submitFlow(OrchestratorSubmitRequest flowRequest, String username, W
         }
 
         //4. 返回文件列表
-        return ;
+        updateLockStatus(flowRequest);
     }
 
     private GitCommitResponse push (String path, BmlResource bmlResource, String username, Long workspaceId, String projectName, String comment) {
@@ -509,4 +511,15 @@ private GitCommitResponse push (String path, BmlResource bmlResource, String use
         return responseWorkflowValidNode;
     }
 
+    private void updateLockStatus(OrchestratorSubmitRequest flowRequest) {
+        LOGGER.info("-------=======================begin to update testGit1=======================------- {}", flowRequest.getFlowId());
+        List<DSSLabel> dssLabelList = new ArrayList<>();
+        dssLabelList.add(new EnvDSSLabel(flowRequest.getLabels().getRoute()));
+        RequestPushOrchestrator requestPushOrchestrator = new RequestPushOrchestrator(flowRequest.getFlowId());
+        Sender sender = DSSSenderServiceFactory.getOrCreateServiceInstance().getWorkflowSender(dssLabelList);
+        ResponsePushOrchestrator responsePushOrchestrator = RpcAskUtils.processAskException(sender.ask(requestPushOrchestrator),
+                ResponsePushOrchestrator.class, RequestPushOrchestrator.class);
+        LOGGER.info("-------=======================End to update testGit1=======================------- {}", flowRequest.getFlowId());
+    }
+
 }
diff --git a/dss-orchestrator/dss-orchestrator-common/src/main/java/com/webank/wedatasphere/dss/orchestrator/common/protocol/RequestPushOrchestrator.java b/dss-orchestrator/dss-orchestrator-common/src/main/java/com/webank/wedatasphere/dss/orchestrator/common/protocol/RequestPushOrchestrator.java
new file mode 100644
index 000000000..b33371a68
--- /dev/null
+++ b/dss-orchestrator/dss-orchestrator-common/src/main/java/com/webank/wedatasphere/dss/orchestrator/common/protocol/RequestPushOrchestrator.java
@@ -0,0 +1,21 @@
+package com.webank.wedatasphere.dss.orchestrator.common.protocol;
+
+
+public class RequestPushOrchestrator {
+    private Long flowId;
+
+    public RequestPushOrchestrator(Long flowId) {
+        this.flowId = flowId;
+    }
+
+    public RequestPushOrchestrator() {
+    }
+
+    public Long getFlowId() {
+        return flowId;
+    }
+
+    public void setFlowId(Long flowId) {
+        this.flowId = flowId;
+    }
+}
diff --git a/dss-orchestrator/dss-orchestrator-common/src/main/java/com/webank/wedatasphere/dss/orchestrator/common/protocol/ResponsePushOrchestrator.java b/dss-orchestrator/dss-orchestrator-common/src/main/java/com/webank/wedatasphere/dss/orchestrator/common/protocol/ResponsePushOrchestrator.java
new file mode 100644
index 000000000..51193164e
--- /dev/null
+++ b/dss-orchestrator/dss-orchestrator-common/src/main/java/com/webank/wedatasphere/dss/orchestrator/common/protocol/ResponsePushOrchestrator.java
@@ -0,0 +1,21 @@
+package com.webank.wedatasphere.dss.orchestrator.common.protocol;
+
+
+public class ResponsePushOrchestrator {
+    private String status;
+
+    public ResponsePushOrchestrator(String status) {
+        this.status = status;
+    }
+
+    public ResponsePushOrchestrator() {
+    }
+
+    public String getStatus() {
+        return status;
+    }
+
+    public void setStatus(String status) {
+        this.status = status;
+    }
+}
diff --git a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-common/src/main/java/com/webank/wedatasphere/dss/workflow/common/protocol/RequestLockWorkflow.java b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-common/src/main/java/com/webank/wedatasphere/dss/workflow/common/protocol/RequestLockWorkflow.java
new file mode 100644
index 000000000..e581e2b42
--- /dev/null
+++ b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-common/src/main/java/com/webank/wedatasphere/dss/workflow/common/protocol/RequestLockWorkflow.java
@@ -0,0 +1,43 @@
+package com.webank.wedatasphere.dss.workflow.common.protocol;
+
+
+import javax.servlet.http.Cookie;
+
+public class RequestLockWorkflow {
+    public RequestLockWorkflow() {
+    }
+
+    private String username;
+    private Cookie[] cookies;
+    private Long flowId;
+
+    public RequestLockWorkflow(String username, Cookie[] cookies, Long flowId) {
+        this.username = username;
+        this.cookies = cookies;
+        this.flowId = flowId;
+    }
+
+    public String getUsername() {
+        return username;
+    }
+
+    public void setUsername(String username) {
+        this.username = username;
+    }
+
+    public Cookie[] getCookies() {
+        return cookies;
+    }
+
+    public void setCookies(Cookie[] cookies) {
+        this.cookies = cookies;
+    }
+
+    public Long getFlowId() {
+        return flowId;
+    }
+
+    public void setFlowId(Long flowId) {
+        this.flowId = flowId;
+    }
+}
diff --git a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-common/src/main/java/com/webank/wedatasphere/dss/workflow/common/protocol/ResponseLockWorkflow.java b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-common/src/main/java/com/webank/wedatasphere/dss/workflow/common/protocol/ResponseLockWorkflow.java
new file mode 100644
index 000000000..6b951aa17
--- /dev/null
+++ b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-common/src/main/java/com/webank/wedatasphere/dss/workflow/common/protocol/ResponseLockWorkflow.java
@@ -0,0 +1,34 @@
+package com.webank.wedatasphere.dss.workflow.common.protocol;
+
+
+public class ResponseLockWorkflow {
+    public static final int LOCK_SUCCESS = 0;
+    public static final int LOCK_FAILED = 1;
+
+    private int unlockStatus;
+    private String lockOwner;
+
+    public ResponseLockWorkflow(int unlockStatus, String lockOwner) {
+        this.unlockStatus = unlockStatus;
+        this.lockOwner = lockOwner;
+    }
+
+    public ResponseLockWorkflow() {
+    }
+
+    public int getUnlockStatus() {
+        return unlockStatus;
+    }
+
+    public void setUnlockStatus(int unlockStatus) {
+        this.unlockStatus = unlockStatus;
+    }
+
+    public String getLockOwner() {
+        return lockOwner;
+    }
+
+    public void setLockOwner(String lockOwner) {
+        this.lockOwner = lockOwner;
+    }
+}
diff --git a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/DefaultWorkFlowManager.java b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/DefaultWorkFlowManager.java
index 0629e3444..7b1bb33be 100644
--- a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/DefaultWorkFlowManager.java
+++ b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/DefaultWorkFlowManager.java
@@ -31,7 +31,9 @@
 import com.webank.wedatasphere.dss.common.utils.IoUtils;
 import com.webank.wedatasphere.dss.common.utils.ZipHelper;
 import com.webank.wedatasphere.dss.orchestrator.common.protocol.RequestConvertOrchestrations;
+import com.webank.wedatasphere.dss.orchestrator.common.protocol.RequestPushOrchestrator;
 import com.webank.wedatasphere.dss.orchestrator.common.protocol.ResponseOperateOrchestrator;
+import com.webank.wedatasphere.dss.orchestrator.common.protocol.ResponsePushOrchestrator;
 import com.webank.wedatasphere.dss.orchestrator.converter.standard.operation.DSSToRelConversionOperation;
 import com.webank.wedatasphere.dss.orchestrator.converter.standard.ref.DSSToRelConversionRequestRef;
 import com.webank.wedatasphere.dss.orchestrator.converter.standard.ref.OrchestrationToRelConversionRequestRef;
@@ -43,9 +45,7 @@
 import com.webank.wedatasphere.dss.workflow.common.entity.DSSFlow;
 import com.webank.wedatasphere.dss.workflow.common.entity.DSSFlowRelation;
 import com.webank.wedatasphere.dss.workflow.common.parser.WorkFlowParser;
-import com.webank.wedatasphere.dss.workflow.common.protocol.RequestSubFlowContextIds;
-import com.webank.wedatasphere.dss.workflow.common.protocol.ResponseSubFlowContextIds;
-import com.webank.wedatasphere.dss.workflow.common.protocol.ResponseUnlockWorkflow;
+import com.webank.wedatasphere.dss.workflow.common.protocol.*;
 import com.webank.wedatasphere.dss.workflow.constant.DSSWorkFlowConstant;
 import com.webank.wedatasphere.dss.workflow.dao.LockMapper;
 import com.webank.wedatasphere.dss.workflow.entity.DSSFlowEditLock;
@@ -68,6 +68,7 @@
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.stereotype.Component;
 
+import javax.servlet.http.Cookie;
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.*;
@@ -435,6 +436,50 @@ private String readImportZipProjectName(String zipFilePath) throws IOException {
         throw new IOException();
     }
 
+    @Override
+    public ResponseLockWorkflow lockWorkFlow(RequestLockWorkflow requestLockWorkflow) throws DSSErrorException {
+        Cookie[] cookies = requestLockWorkflow.getCookies();
+        Long flowID = requestLockWorkflow.getFlowId();
+        String username =requestLockWorkflow.getUsername();
+        //若工作流已经被其他用户抢锁，则当前用户不能再保存成功
+        String ticketId = Arrays.stream(cookies).filter(cookie -> DSSWorkFlowConstant.BDP_USER_TICKET_ID.equals(cookie.getName()))
+                .findFirst().map(Cookie::getValue).get();
+        DSSFlowEditLock flowEditLock = lockMapper.getFlowEditLockByID(flowID);
+        if (flowEditLock != null) {
+            DSSFlow dssFlow = flowService.getFlow(flowID);
+            // 尝试获取工作流编辑锁
+            try {
+                //只有父工作流才有锁，子工作流复用父工作流的锁
+                if(dssFlow.getRootFlow()) {
+                    DSSFlowEditLockManager.tryAcquireLock(dssFlow, username, ticketId);
+                }
+            } catch (DSSErrorException e) {
+                if (DSSWorkFlowConstant.EDIT_LOCK_ERROR_CODE == e.getErrCode()) {
+                    logger.error(e.getDesc());
+                    return new ResponseLockWorkflow(ResponseLockWorkflow.LOCK_FAILED, flowEditLock.getOwner());
+                }
+                throw e;
+            }
+        }
+        return new ResponseLockWorkflow(ResponseLockWorkflow.LOCK_SUCCESS, null);
+    }
+
+
+    @Override
+    public ResponsePushOrchestrator updateLockStatus(RequestPushOrchestrator requestPushOrchestrator) {
+        String status = lockMapper.selectStatusByFlowId(requestPushOrchestrator.getFlowId());
+        logger.info("status is :" +  status);
+        logger.info("flowId is :" +  requestPushOrchestrator.getFlowId());
+        if (StringUtils.isEmpty(status)) {
+            lockMapper.insertFlowStatus(requestPushOrchestrator.getFlowId(), DSSWorkFlowConstant.FLOW_STATUS_PUSH);
+        } else {
+            lockMapper.updateFlowStatus(requestPushOrchestrator.getFlowId(), DSSWorkFlowConstant.FLOW_STATUS_PUSH);
+        }
+
+        status = lockMapper.selectStatusByFlowId(requestPushOrchestrator.getFlowId());
+        return new ResponsePushOrchestrator(status);
+    }
+
 }
 
 
diff --git a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/WorkFlowManager.java b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/WorkFlowManager.java
index cfae4c644..d99c5b3b2 100644
--- a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/WorkFlowManager.java
+++ b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/WorkFlowManager.java
@@ -22,12 +22,12 @@
 import com.webank.wedatasphere.dss.common.exception.DSSErrorException;
 import com.webank.wedatasphere.dss.common.label.DSSLabel;
 import com.webank.wedatasphere.dss.orchestrator.common.protocol.RequestConvertOrchestrations;
+import com.webank.wedatasphere.dss.orchestrator.common.protocol.RequestPushOrchestrator;
 import com.webank.wedatasphere.dss.orchestrator.common.protocol.ResponseOperateOrchestrator;
+import com.webank.wedatasphere.dss.orchestrator.common.protocol.ResponsePushOrchestrator;
 import com.webank.wedatasphere.dss.standard.app.sso.Workspace;
 import com.webank.wedatasphere.dss.workflow.common.entity.DSSFlow;
-import com.webank.wedatasphere.dss.workflow.common.protocol.RequestSubFlowContextIds;
-import com.webank.wedatasphere.dss.workflow.common.protocol.ResponseSubFlowContextIds;
-import com.webank.wedatasphere.dss.workflow.common.protocol.ResponseUnlockWorkflow;
+import com.webank.wedatasphere.dss.workflow.common.protocol.*;
 import com.webank.wedatasphere.dss.workflow.entity.DSSFlowImportParam;
 import org.apache.linkis.common.exception.ErrorException;
 
@@ -160,4 +160,7 @@ List<DSSFlow> importWorkflow(String userName,
      */
     ResponseSubFlowContextIds getSubFlowContextIdsByFlowIds(RequestSubFlowContextIds requestSubFlowContextIds) throws ErrorException;
 
+    ResponseLockWorkflow lockWorkFlow(RequestLockWorkflow requestLockWorkflow) throws DSSErrorException;
+
+    ResponsePushOrchestrator updateLockStatus(RequestPushOrchestrator requestPushOrchestrator);
 }
diff --git a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/scala/com/webank/wedatasphere/dss/workflow/receiver/DSSWorkflowChooser.scala b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/scala/com/webank/wedatasphere/dss/workflow/receiver/DSSWorkflowChooser.scala
index 7501faf90..c2eeb3f65 100644
--- a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/scala/com/webank/wedatasphere/dss/workflow/receiver/DSSWorkflowChooser.scala
+++ b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/scala/com/webank/wedatasphere/dss/workflow/receiver/DSSWorkflowChooser.scala
@@ -19,7 +19,7 @@ package com.webank.wedatasphere.dss.workflow.receiver
 import com.webank.wedatasphere.dss.common.protocol.{RequestDeleteWorkflow, RequestExportWorkflow, RequestQueryWorkFlow, RequestUpdateWorkflow}
 import com.webank.wedatasphere.dss.orchestrator.common.protocol._
 import com.webank.wedatasphere.dss.workflow.WorkFlowManager
-import com.webank.wedatasphere.dss.workflow.common.protocol.{RequestCopyWorkflow, RequestCreateWorkflow, RequestDeleteBmlSource, RequestImportWorkflow, RequestSubFlowContextIds, RequestUnlockWorkflow}
+import com.webank.wedatasphere.dss.workflow.common.protocol.{RequestCopyWorkflow, RequestCreateWorkflow, RequestDeleteBmlSource, RequestImportWorkflow, RequestLockWorkflow, RequestSubFlowContextIds, RequestUnlockWorkflow}
 import org.apache.linkis.rpc.{RPCMessageEvent, Receiver, ReceiverChooser}
 
 import javax.annotation.PostConstruct
@@ -50,6 +50,8 @@ class DSSWorkflowChooser extends ReceiverChooser {
     case _: RequestConvertOrchestrations => receiver
     case _: RequestSubFlowContextIds => receiver
     case _: RequestDeleteBmlSource => receiver
+    case _: RequestLockWorkflow => receiver
+    case _: RequestPushOrchestrator => receiver
 
     case _ => None
   }
diff --git a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/scala/com/webank/wedatasphere/dss/workflow/receiver/DSSWorkflowReceiver.scala b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/scala/com/webank/wedatasphere/dss/workflow/receiver/DSSWorkflowReceiver.scala
index 4db4617bf..464305817 100644
--- a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/scala/com/webank/wedatasphere/dss/workflow/receiver/DSSWorkflowReceiver.scala
+++ b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/scala/com/webank/wedatasphere/dss/workflow/receiver/DSSWorkflowReceiver.scala
@@ -20,7 +20,7 @@ import com.webank.wedatasphere.dss.common.entity.BmlResource
 import com.webank.wedatasphere.dss.common.exception.DSSErrorException
 import com.webank.wedatasphere.dss.common.protocol._
 import com.webank.wedatasphere.dss.common.utils.DSSCommonUtils
-import com.webank.wedatasphere.dss.orchestrator.common.protocol.RequestConvertOrchestrations
+import com.webank.wedatasphere.dss.orchestrator.common.protocol.{RequestConvertOrchestrations, RequestPushOrchestrator}
 import com.webank.wedatasphere.dss.standard.app.sso.Workspace
 import com.webank.wedatasphere.dss.workflow.WorkFlowManager
 import com.webank.wedatasphere.dss.workflow.common.entity.DSSFlow
@@ -107,6 +107,12 @@ class DSSWorkflowReceiver(workflowManager: WorkFlowManager)  extends Receiver {
     case requestWorkflowIdList : RequestSubFlowContextIds =>
       workflowManager.getSubFlowContextIdsByFlowIds(requestWorkflowIdList)
 
+    case requestLockWorkflow: RequestLockWorkflow =>
+      workflowManager.lockWorkFlow(requestLockWorkflow)
+
+    case requestPushOrchestrator: RequestPushOrchestrator =>
+      workflowManager.updateLockStatus(requestPushOrchestrator)
+
     case _ => throw new DSSErrorException(90000, "Not support protocol " + message)
   }
 

From 6c733f0ebe9567823ab2cd96798f9b36e54df3c7 Mon Sep 17 00:00:00 2001
From: xlinliu <arionliu@webank.com>
Date: Fri, 19 Apr 2024 15:50:51 +0800
Subject: [PATCH 049/302] batchExport and batchImportOrc

---
 .../dss/common/utils/ZipHelper.java           |  51 +++++++-
 .../entity/vo/OrchestratorBaseInfo.java       |  72 +++++++++++
 .../service/impl/ExportServiceImpl.java       |  17 +--
 .../service/impl/ImportServiceImpl.java       |  54 ++++++--
 .../utils/ExportAndImportSupportUtils.java    | 122 ++++++++++++++++++
 .../publish/io/input/MetaInputService.java    |   9 +-
 .../io/input/impl/MetaInputServiceImpl.java   |   5 +-
 7 files changed, 301 insertions(+), 29 deletions(-)
 create mode 100644 dss-framework/dss-framework-project-server/src/main/java/com/webank/wedatasphere/dss/framework/project/utils/ExportAndImportSupportUtils.java

diff --git a/dss-commons/dss-common/src/main/java/com/webank/wedatasphere/dss/common/utils/ZipHelper.java b/dss-commons/dss-common/src/main/java/com/webank/wedatasphere/dss/common/utils/ZipHelper.java
index 75172dc14..a1fa36726 100644
--- a/dss-commons/dss-common/src/main/java/com/webank/wedatasphere/dss/common/utils/ZipHelper.java
+++ b/dss-commons/dss-common/src/main/java/com/webank/wedatasphere/dss/common/utils/ZipHelper.java
@@ -24,11 +24,11 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.InputStreamReader;
+import java.io.*;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipInputStream;
 
 public class ZipHelper {
 
@@ -126,11 +126,52 @@ public static String zip(String dirPath, boolean deleteOriginDir)throws DSSError
      * @return 解压后的文件夹名
      * @throws DSSErrorException 解压出现异常
      */
-
+    @Deprecated
     public static String unzip(String dirPath)throws DSSErrorException{
         return unzip(dirPath, false);
     }
-
+    /**
+     * 解压一个zip文件
+     * @param zipFilePath zip文件的全路径名
+     * @destDirectory 解压到的目的地
+     * @return 解压后的文件夹名
+     * @throws DSSErrorException 解压出现异常
+     */
+    public static void unzipFile(String zipFilePath, String destDirectory, boolean deleteOriginZip) throws DSSErrorException {
+        File destDir = new File(destDirectory);
+        // 使用 try-with-resources 确保资源被自动关闭
+        File zipFile = new File(zipFilePath);
+        try (ZipInputStream zis = new ZipInputStream(new FileInputStream(zipFilePath))) {
+            byte[] buffer = new byte[1024];
+            ZipEntry zipEntry = zis.getNextEntry();
+            while (zipEntry != null) {
+                File newFile = new File(destDir, zipEntry.getName());
+                if (zipEntry.isDirectory()) {
+                    newFile.mkdirs();
+                } else {
+                    // 为解压后的文件创建文件输出流
+                    try (FileOutputStream fos = new FileOutputStream(newFile)) {
+                        int len;
+                        while ((len = zis.read(buffer)) > 0) {
+                            fos.write(buffer, 0, len);
+                        }
+                    }
+                }
+                zipEntry = zis.getNextEntry();
+            }
+            zis.closeEntry();
+        }catch(final Exception e){
+            logger.error(" 解压缩 zip 文件失败, reason: ", e);
+            DSSErrorException exception = new DSSErrorException(90009, "unzip" + zipFilePath + " to " + destDirectory + "zip file failed");
+            exception.initCause(e);
+            throw exception;
+        }
+        // 如果指定删除原zip文件
+        if (deleteOriginZip) {
+            new File(zipFilePath).delete();
+        }
+    }
+    @Deprecated
     public static String unzip(String dirPath,boolean deleteOriginZip)throws DSSErrorException {
         File file = new File(dirPath);
         if(!file.exists()){
diff --git a/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/entity/vo/OrchestratorBaseInfo.java b/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/entity/vo/OrchestratorBaseInfo.java
index 953307bec..570b4ff24 100644
--- a/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/entity/vo/OrchestratorBaseInfo.java
+++ b/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/entity/vo/OrchestratorBaseInfo.java
@@ -16,6 +16,9 @@
 
 package com.webank.wedatasphere.dss.orchestrator.server.entity.vo;
 
+import com.webank.wedatasphere.dss.orchestrator.common.entity.DSSOrchestratorInfo;
+
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 
@@ -34,6 +37,10 @@ public class OrchestratorBaseInfo {
      * 工程id
      */
     private Long projectId;
+    /**
+     * 工作流的唯一id，不同环境里，同一个工作流保持一致，用来判断是否是同一个工作流。
+     */
+    private String uuid;
 
     /**
      * 编排模式id（工作流,调用orchestrator服务返回的orchestratorId）
@@ -148,6 +155,14 @@ public void setProjectId(Long projectId) {
         this.projectId = projectId;
     }
 
+    public String getUuid() {
+        return uuid;
+    }
+
+    public void setUuid(String uuid) {
+        this.uuid = uuid;
+    }
+
     public Long getOrchestratorId() {
         return orchestratorId;
     }
@@ -251,4 +266,61 @@ public String getOrchestratorLevel() {
     public void setOrchestratorLevel(String orchestratorLevel) {
         this.orchestratorLevel = orchestratorLevel;
     }
+
+    public static OrchestratorBaseInfo convertFrom(DSSOrchestratorInfo dssInfo){
+        OrchestratorBaseInfo baseInfo = new OrchestratorBaseInfo();
+
+        // 直接对应的属性
+        baseInfo.setId(dssInfo.getId());
+        baseInfo.setProjectId(dssInfo.getProjectId());
+        baseInfo.setWorkspaceId(dssInfo.getWorkspaceId());
+        baseInfo.setOrchestratorName(dssInfo.getName());
+        baseInfo.setDescription(dssInfo.getDesc());
+        baseInfo.setUses(dssInfo.getUses());
+        baseInfo.setCreateUser(dssInfo.getCreator());
+        baseInfo.setCreateTime(dssInfo.getCreateTime());
+        baseInfo.setUpdateUser(dssInfo.getUpdateUser());
+        baseInfo.setUpdateTime(dssInfo.getUpdateTime());
+
+        // 可能需要根据实际情况调整的属性
+        baseInfo.setOrchestratorMode(dssInfo.getOrchestratorMode());
+        baseInfo.setOrchestratorLevel(dssInfo.getOrchestratorLevel());
+
+        // DSSOrchestratorInfo中的orchestratorWay可能需要映射到OrchestratorBaseInfo的orchestratorWays列表中
+        List<String> orchestratorWays = new ArrayList<>();
+        orchestratorWays.add(dssInfo.getOrchestratorWay());
+        baseInfo.setOrchestratorWays(orchestratorWays);
+        return baseInfo;
+    }
+
+    public DSSOrchestratorInfo convertToDSSOrchestratorInfo() {
+        OrchestratorBaseInfo baseInfo=this;
+        DSSOrchestratorInfo dssInfo = new DSSOrchestratorInfo();
+
+        // 直接对应的属性
+        dssInfo.setId(baseInfo.getId());
+        dssInfo.setProjectId(baseInfo.getProjectId());
+        dssInfo.setWorkspaceId(baseInfo.getWorkspaceId());
+        dssInfo.setName(baseInfo.getOrchestratorName());
+        dssInfo.setDesc(baseInfo.getDescription());
+        dssInfo.setUses(baseInfo.getUses());
+        dssInfo.setCreator(baseInfo.getCreateUser());
+        dssInfo.setCreateTime(baseInfo.getCreateTime());
+        dssInfo.setUpdateUser(baseInfo.getUpdateUser());
+        dssInfo.setUpdateTime(baseInfo.getUpdateTime());
+        dssInfo.setUUID(baseInfo.getUuid());
+
+        // 可能需要根据实际情况调整的属性
+        dssInfo.setOrchestratorMode(baseInfo.getOrchestratorMode());
+        dssInfo.setOrchestratorLevel(baseInfo.getOrchestratorLevel());
+
+        // 处理没有直接对应的字段
+        if (baseInfo.getOrchestratorWays() != null && !baseInfo.getOrchestratorWays().isEmpty()) {
+            // 取第一个作为orchestratorWay，这需要根据实际情况来决定是否合适
+            dssInfo.setOrchestratorWay(baseInfo.getOrchestratorWays().get(0));
+        }
+
+        return dssInfo;
+    }
+
 }
diff --git a/dss-framework/dss-framework-project-server/src/main/java/com/webank/wedatasphere/dss/framework/project/service/impl/ExportServiceImpl.java b/dss-framework/dss-framework-project-server/src/main/java/com/webank/wedatasphere/dss/framework/project/service/impl/ExportServiceImpl.java
index 4899828b9..37184c01a 100644
--- a/dss-framework/dss-framework-project-server/src/main/java/com/webank/wedatasphere/dss/framework/project/service/impl/ExportServiceImpl.java
+++ b/dss-framework/dss-framework-project-server/src/main/java/com/webank/wedatasphere/dss/framework/project/service/impl/ExportServiceImpl.java
@@ -44,6 +44,7 @@
 import com.webank.wedatasphere.dss.standard.app.development.standard.DevelopmentIntegrationStandard;
 import com.webank.wedatasphere.dss.standard.app.sso.Workspace;
 import com.webank.wedatasphere.dss.standard.common.desc.AppInstance;
+import org.apache.commons.io.FileUtils;
 import org.apache.linkis.common.exception.ErrorException;
 
 import java.io.*;
@@ -116,16 +117,7 @@ public BatchExportResult batchExport(String userName, Long projectId, List<Orche
         if(orchestrators==null||orchestrators.isEmpty()){
             throw new DSSRuntimeException("workflow list is empty,nothing to export.(导出的工作流列表为空，没有任何工作流可以导出)");
         }
-        String exportSaveBasePath = IoUtils.generateIOPath(userName, projectName, "");
-        //写入元数据
-        String metaInfoPath=exportSaveBasePath+ File.separator+"meta.json";
-        String metaInfo=new Gson().toJson(orchestrators);
-        try(OutputStream metaOutStream=IoUtils.generateExportOutputStream(metaInfoPath)) {
-            metaOutStream.write(metaInfo.getBytes(StandardCharsets.UTF_8));
-        } catch (IOException e) {
-            LOGGER.error("write meta failed",e);
-            throw new RuntimeException(e);
-        }
+        String exportSaveBasePath = IoUtils.generateTempIOPath(userName);
         for (OrchestratorBaseInfo orchestrator : orchestrators) {
             OrchestratorInfo orchestratorInfo = new OrchestratorInfo(orchestrator.getOrchestratorId(), orchestrator.getOrchestratorVersionId());
             BmlResource bmlOneOrc= export(userName, projectId, orchestratorInfo,
@@ -133,8 +125,10 @@ public BatchExportResult batchExport(String userName, Long projectId, List<Orche
                     .getBmlResource();
             String orcPath=exportSaveBasePath+orchestrator.getOrchestratorName()+".zip";
             bmlService.downloadToLocalPath(userName,bmlOneOrc.getResourceId(),bmlOneOrc.getVersion(),orcPath);
+            ZipHelper.unzipFile(orcPath, exportSaveBasePath,true);
         }
-        String zipFile = ZipHelper.zip(exportSaveBasePath);
+        String projectPath = IoUtils.addFileSeparator(exportSaveBasePath, projectName);
+        String zipFile = ZipHelper.zip(projectPath,true);
         LOGGER.info("export zip file locate at {}",zipFile);
         //先上传
         InputStream inputStream = bmlService.readLocalResourceFile(userName, zipFile);
@@ -151,6 +145,7 @@ public BatchExportResult batchExport(String userName, Long projectId, List<Orche
         }
         LOGGER.info("export zip file upload to bmlResourceId:{} bmlResourceVersion:{}",
                 bmlResource.getResourceId(),bmlResource.getVersion());
+        FileUtils.deleteQuietly(new File(zipFile));
         return new BatchExportResult(bmlResource,checkCode);
     }
 
diff --git a/dss-framework/dss-framework-project-server/src/main/java/com/webank/wedatasphere/dss/framework/project/service/impl/ImportServiceImpl.java b/dss-framework/dss-framework-project-server/src/main/java/com/webank/wedatasphere/dss/framework/project/service/impl/ImportServiceImpl.java
index dc57ce939..179ab990a 100644
--- a/dss-framework/dss-framework-project-server/src/main/java/com/webank/wedatasphere/dss/framework/project/service/impl/ImportServiceImpl.java
+++ b/dss-framework/dss-framework-project-server/src/main/java/com/webank/wedatasphere/dss/framework/project/service/impl/ImportServiceImpl.java
@@ -34,8 +34,11 @@
 import com.webank.wedatasphere.dss.framework.project.entity.OrchestratorBatchImportInfo;
 import com.webank.wedatasphere.dss.common.entity.BmlResource;
 import com.webank.wedatasphere.dss.framework.project.service.ImportService;
+import com.webank.wedatasphere.dss.framework.project.utils.ExportAndImportSupportUtils;
+import com.webank.wedatasphere.dss.orchestrator.common.entity.DSSOrchestratorInfo;
 import com.webank.wedatasphere.dss.orchestrator.common.ref.OrchestratorRefConstant;
 import com.webank.wedatasphere.dss.common.service.BMLService;
+import com.webank.wedatasphere.dss.orchestrator.publish.io.input.MetaInputService;
 import com.webank.wedatasphere.dss.orchestrator.server.entity.vo.OrchestratorBaseInfo;
 import com.webank.wedatasphere.dss.standard.app.development.operation.RefImportOperation;
 import com.webank.wedatasphere.dss.standard.app.development.ref.ImportRequestRef;
@@ -54,7 +57,12 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.lang.reflect.Type;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
 import java.util.*;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipFile;
 
@@ -64,6 +72,8 @@
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.stereotype.Service;
 
+import static com.webank.wedatasphere.dss.common.utils.IoUtils.FLOW_META_DIRECTORY_NAME;
+
 /**
  * created by cooperyang on 2020/12/9
  * Description:
@@ -78,6 +88,8 @@ public class ImportServiceImpl implements ImportService {
     @Autowired
     @Qualifier("projectBmlService")
     private BMLService bmlService;
+    @Autowired
+    private MetaInputService metaInputService;
 
     @Override
     @SuppressWarnings("ConstantConditions")
@@ -141,8 +153,9 @@ public OrchestratorBatchImportInfo batchImportOrc(String userName, Long projectI
             throw new DSSRuntimeException("checkCode does not match the upload file,please check your upload file and checkCode");
         }
         //下载到本地处理
-        String importSaveBasePath = IoUtils.generateIOPath(userName, "","");
+        String importSaveBasePath = IoUtils.generateTempIOPath(userName);
         String importFile=importSaveBasePath+File.separator+projectName+".zip";
+
         LOGGER.info("import zip file locate at {}",importFile);
         //下载压缩包
         bmlService.downloadToLocalPath(userName, bmlResource.getResourceId(), bmlResource.getVersion(), importFile);
@@ -157,18 +170,32 @@ public OrchestratorBatchImportInfo batchImportOrc(String userName, Long projectI
             throw new DSSRuntimeException("upload file format error(导入包格式错误)");
         }
         //解压
-        String unzipImportFile= ZipHelper.unzip(importFile);
-        LOGGER.info("import unziped file locate at {}",unzipImportFile);
+        ZipHelper.unzipFile(importFile,importSaveBasePath,true);
+        String projectPath = IoUtils.addFileSeparator(importSaveBasePath, projectName);
+        LOGGER.info("import unziped file locate at {}",projectPath);
         //解析元数据
-        String metaInfoPath=unzipImportFile+ File.separator+"meta.json";
-        String metaJson = bmlService.readLocalTextFile(userName, metaInfoPath);
-        Type type=new TypeToken<List<OrchestratorBaseInfo>>(){}.getType();
-        List<OrchestratorBaseInfo> importOrcs=new Gson().fromJson(metaJson,type);
+        String metaPath = IoUtils.addFileSeparator(projectPath, FLOW_META_DIRECTORY_NAME);
+        List<OrchestratorBaseInfo> importOrcMetas;
+        try (Stream<Path> paths = Files.walk(Paths.get(metaPath), 1)) {
+            importOrcMetas = paths.filter(Files::isDirectory)  // 确保它是一个目录
+                    .filter(path -> !path.equals(Paths.get(metaPath)))  // 排除根目录本身
+                    .map(path -> path.toAbsolutePath().toString())
+                    .map(metaInputService::importOrchestratorNew)
+                    .map(OrchestratorBaseInfo::convertFrom)
+                    .collect(Collectors.toList());
+        } catch (IOException e) {
+            throw new DSSRuntimeException("read import package failed,please check package struct(导入包格式错误，请检查导入包格式）");
+        }
+        String separateTargetPath = IoUtils.generateTempIOPath(userName);
+        //分离各个工作流
+        Map<String, Path> flowProjectPaths = ExportAndImportSupportUtils.separateFlows(importSaveBasePath, projectName, separateTargetPath);
+
+
 
-        Iterator<File> iterator= FileUtils.iterateFiles(new File(unzipImportFile),new String[]{"zip"},false);
         List<OrchestratorBaseInfo> importResultInfo = new ArrayList<>();
-        while (iterator.hasNext()){
-            File orcZipFile=iterator.next();
+        for (Path path : flowProjectPaths.values()) {
+            String zipFilePath = ZipHelper.zip(path.toAbsolutePath().toString());
+            File orcZipFile=new File(zipFilePath);
             InputStream inputStream = bmlService.readLocalResourceFile(userName, orcZipFile.getAbsolutePath());
             BmlResource uploadResult = bmlService.upload(userName, inputStream,
                     orcZipFile.getName() , projectName);
@@ -176,7 +203,11 @@ public OrchestratorBatchImportInfo batchImportOrc(String userName, Long projectI
             OrchestratorBaseInfo importInfo = importOrc(orcName, userName, projectId, projectName, uploadResult, dssLabel, workspace.getWorkspaceName(), workspace);
             importResultInfo.add(importInfo);
         }
-        return new OrchestratorBatchImportInfo(importOrcs,importResultInfo);
+        //清理文件
+        FileUtils.deleteQuietly(new File(importSaveBasePath));
+        FileUtils.deleteQuietly(new File(separateTargetPath));
+
+        return new OrchestratorBatchImportInfo(importOrcMetas,importResultInfo);
     }
     private String readImportZipProjectName(String zipFilePath) throws IOException {
         try(ZipFile zipFile =new ZipFile(zipFilePath)){
@@ -191,4 +222,5 @@ private String readImportZipProjectName(String zipFilePath) throws IOException {
         }
         throw new IOException();
     }
+
 }
diff --git a/dss-framework/dss-framework-project-server/src/main/java/com/webank/wedatasphere/dss/framework/project/utils/ExportAndImportSupportUtils.java b/dss-framework/dss-framework-project-server/src/main/java/com/webank/wedatasphere/dss/framework/project/utils/ExportAndImportSupportUtils.java
new file mode 100644
index 000000000..bad6bde84
--- /dev/null
+++ b/dss-framework/dss-framework-project-server/src/main/java/com/webank/wedatasphere/dss/framework/project/utils/ExportAndImportSupportUtils.java
@@ -0,0 +1,122 @@
+package com.webank.wedatasphere.dss.framework.project.utils;
+import com.webank.wedatasphere.dss.common.utils.IoUtils;
+
+import java.io.File;
+import java.io.IOException;
+import java.nio.file.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 支持导入导出的工具类
+ * Author: xlinliu
+ * Date: 2024/4/19
+ */
+public class ExportAndImportSupportUtils {
+    private static final String EXTERNAL_RESOURCES = ".external-resources";
+    private static final String META_CONF = ".metaConf";
+
+    /**
+     * 分离一个工作流导出包，得到各个工作流的导出包
+     * @param sourceDir 原始导出包的的路劲，路径下存在至少一个项目名，项目下有两个以上的工作流
+     * @param projectName 项目名
+     * @param targetDir 指定分离后的工作流导出包位置路径。导出后，这个路径下会出现以各工作流名命名的文件夹，这些文件夹下都只有一个工作流导出包。
+     * @return 分离后的导出包路径，key是工作流名，value是一个项目文件夹。此时项目文件夹里只有一个工作流。
+     */
+    public static Map<String,Path> separateFlows(String sourceDir, String projectName, String targetDir) {
+
+        // 检测工作流目录
+        List<String> workflowNames = detectWorkflowNames(new File(sourceDir, projectName));
+        Map<String, Path> workFlowProjectPaths = new HashMap<>(workflowNames.size());
+        for (String workflow : workflowNames) {
+            try {
+                // 创建新的工作流项目目录
+                String newWorkflowDir = IoUtils.addFileSeparator(targetDir,workflow,projectName) ;
+                new File(newWorkflowDir).mkdirs();
+
+                // 复制项目中的所有文件到新的工作流项目目录
+                copyProjectFiles(new File(sourceDir, projectName), newWorkflowDir);
+
+                // 复制 EXTERNAL_RESOURCES
+                copyDirectory(new File(sourceDir, projectName + File.separator + EXTERNAL_RESOURCES).getPath(), newWorkflowDir + File.separator + EXTERNAL_RESOURCES);
+
+                // 复制 META_CONF，仅包括指定工作流的子目录
+                copyWorkflowMetaConf(new File(sourceDir, projectName + File.separator + META_CONF).getPath(), newWorkflowDir + File.separator + META_CONF, workflow);
+
+                // 复制工作流的代码目录
+                String workflowDir = new File(sourceDir, projectName + File.separator + workflow).getPath();
+                copyDirectory(workflowDir, newWorkflowDir + File.separator + workflow);
+                workFlowProjectPaths.put(workflow, Paths.get(newWorkflowDir));
+            } catch (IOException e) {
+                System.err.println("Error while copying workflow " + workflow + ": " + e.getMessage());
+                e.printStackTrace();
+            }
+
+
+        }
+
+        return workFlowProjectPaths;
+    }
+
+    // 复制整个目录
+    private static void copyDirectory(String sourceDirectory, String destinationDirectory) throws IOException {
+        Files.walk(Paths.get(sourceDirectory))
+                .forEach(source -> {
+                    Path destination = Paths.get(destinationDirectory, source.toString().substring(sourceDirectory.length()));
+                    try {
+                        if (Files.isDirectory(source)) {
+                            Files.createDirectories(destination);
+                        } else {
+                            Files.copy(source, destination, StandardCopyOption.REPLACE_EXISTING);
+                        }
+                    } catch (IOException e) {
+                        e.printStackTrace();
+                    }
+                });
+    }
+
+    // 检测工作流目录
+    private static List<String> detectWorkflowNames(File projectDir) {
+        List<String> workflowNames = new ArrayList<>();
+        File[] projectSubFolders = projectDir.listFiles();
+        if (projectSubFolders != null) {
+            for (File file : projectSubFolders) {
+                if (file.isDirectory() && !file.getName().equals(EXTERNAL_RESOURCES) && !file.getName().equals(META_CONF)) {
+                    workflowNames.add(file.getName());
+                }
+            }
+        }
+        return workflowNames;
+    }
+
+    // 复制项目目录中的所有文件
+    private static void copyProjectFiles(File sourceDir, String destinationDir) throws IOException {
+        File[] files = sourceDir.listFiles();
+        if (files != null) {
+            for (File file : files) {
+                if (file.isFile()) { // 确保只复制文件
+                    Path destination = Paths.get(destinationDir, file.getName());
+                    Files.copy(file.toPath(), destination, StandardCopyOption.REPLACE_EXISTING);
+                }
+            }
+        }
+    }
+
+    // 专门为 META_CONF 文件夹的复制，只包括特定工作流的子目录
+    private static void copyWorkflowMetaConf(String sourceDir, String destinationDir, String workflow) throws IOException {
+        File sourceMetaConfDir = new File(sourceDir);
+        File[] filesAndDirs = sourceMetaConfDir.listFiles();
+        if (filesAndDirs != null) {
+            for (File item : filesAndDirs) {
+                if (item.isDirectory() && item.getName().equals(workflow)) {
+                    copyDirectory(item.getPath(), Paths.get(destinationDir, item.getName()).toString());
+                } else if (item.isFile()) {
+                    Files.copy(item.toPath(), Paths.get(destinationDir, item.getName()), StandardCopyOption.REPLACE_EXISTING);
+                }
+            }
+        }
+    }
+
+}
diff --git a/dss-framework/framework-plugins/dss-framework-orchestrator-publish/src/main/java/com/webank/wedatasphere/dss/orchestrator/publish/io/input/MetaInputService.java b/dss-framework/framework-plugins/dss-framework-orchestrator-publish/src/main/java/com/webank/wedatasphere/dss/orchestrator/publish/io/input/MetaInputService.java
index f8b66af03..89a356d78 100644
--- a/dss-framework/framework-plugins/dss-framework-orchestrator-publish/src/main/java/com/webank/wedatasphere/dss/orchestrator/publish/io/input/MetaInputService.java
+++ b/dss-framework/framework-plugins/dss-framework-orchestrator-publish/src/main/java/com/webank/wedatasphere/dss/orchestrator/publish/io/input/MetaInputService.java
@@ -32,7 +32,14 @@ public interface MetaInputService {
 
 
     List<DSSOrchestratorInfo> importOrchestrator(String basePath) throws IOException;
-    DSSOrchestratorInfo importOrchestratorNew(String flowMetaPath) throws IOException;
+
+    /**
+     * 读取编排元数据
+     * @param flowMetaPath 工作流的元数据目录，比如/temp/projectName/.metaconf/demoflow/
+     * @return
+     * @throws IOException
+     */
+    DSSOrchestratorInfo importOrchestratorNew(String flowMetaPath) ;
 
     List<DSSFlow> inputFlow(String basePath) throws IOException;
 
diff --git a/dss-framework/framework-plugins/dss-framework-orchestrator-publish/src/main/java/com/webank/wedatasphere/dss/orchestrator/publish/io/input/impl/MetaInputServiceImpl.java b/dss-framework/framework-plugins/dss-framework-orchestrator-publish/src/main/java/com/webank/wedatasphere/dss/orchestrator/publish/io/input/impl/MetaInputServiceImpl.java
index 124b00561..07c8e2d74 100644
--- a/dss-framework/framework-plugins/dss-framework-orchestrator-publish/src/main/java/com/webank/wedatasphere/dss/orchestrator/publish/io/input/impl/MetaInputServiceImpl.java
+++ b/dss-framework/framework-plugins/dss-framework-orchestrator-publish/src/main/java/com/webank/wedatasphere/dss/orchestrator/publish/io/input/impl/MetaInputServiceImpl.java
@@ -20,6 +20,7 @@
 import com.google.gson.Gson;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParser;
+import com.webank.wedatasphere.dss.common.exception.DSSRuntimeException;
 import com.webank.wedatasphere.dss.common.utils.IoUtils;
 import com.webank.wedatasphere.dss.orchestrator.common.entity.DSSOrchestratorInfo;
 import com.webank.wedatasphere.dss.orchestrator.publish.io.input.MetaInputService;
@@ -43,13 +44,15 @@ public class MetaInputServiceImpl implements MetaInputService {
     private final String fileName = "meta.txt";
 
     @Override
-    public DSSOrchestratorInfo importOrchestratorNew( String flowMetaPath) throws IOException {
+    public DSSOrchestratorInfo importOrchestratorNew( String flowMetaPath)  {
         File flowMetaFile = new File(flowMetaPath + File.separator + FLOW_META_FILE_NAME);
         JsonParser jsonParser = new JsonParser();
         Gson gson = new Gson();
         try (FileReader reader = new FileReader(flowMetaFile)) {
             JsonObject jsonObject = jsonParser.parse(reader).getAsJsonObject();
             return gson.fromJson(jsonObject.get(ORCHESTRATOR_META_KEY), DSSOrchestratorInfo.class);
+        }catch (IOException e){
+            throw new DSSRuntimeException(100000, "read flowMeta file failed,path" + flowMetaPath, e);
         }
     }
     @Override

From d5e6c7b9687ebdf487d44b393b419b9498cc6b87 Mon Sep 17 00:00:00 2001
From: xlinliu <arionliu@webank.com>
Date: Mon, 22 Apr 2024 11:33:51 +0800
Subject: [PATCH 050/302] refactor batchExport

---
 .../project/service/DSSProjectService.java    |  8 ++---
 .../project/service/ExportService.java        |  3 +-
 .../service/impl/DSSProjectServiceImpl.java   | 31 ++++++++++++++++---
 .../service/impl/ExportServiceImpl.java       | 24 ++------------
 4 files changed, 34 insertions(+), 32 deletions(-)

diff --git a/dss-framework/dss-framework-project-server/src/main/java/com/webank/wedatasphere/dss/framework/project/service/DSSProjectService.java b/dss-framework/dss-framework-project-server/src/main/java/com/webank/wedatasphere/dss/framework/project/service/DSSProjectService.java
index 25994cd81..73c0397b8 100644
--- a/dss-framework/dss-framework-project-server/src/main/java/com/webank/wedatasphere/dss/framework/project/service/DSSProjectService.java
+++ b/dss-framework/dss-framework-project-server/src/main/java/com/webank/wedatasphere/dss/framework/project/service/DSSProjectService.java
@@ -21,7 +21,6 @@
 import com.webank.wedatasphere.dss.common.label.DSSLabel;
 import com.webank.wedatasphere.dss.common.label.EnvDSSLabel;
 import com.webank.wedatasphere.dss.framework.project.entity.DSSProjectDO;
-import com.webank.wedatasphere.dss.framework.project.entity.OrchestratorBatchImportInfo;
 import com.webank.wedatasphere.dss.framework.project.entity.request.*;
 import com.webank.wedatasphere.dss.framework.project.entity.response.ProjectResponse;
 import com.webank.wedatasphere.dss.framework.project.entity.vo.ProjectInfoVo;
@@ -31,7 +30,6 @@
 
 import java.util.List;
 import java.util.Map;
-import java.util.function.Consumer;
 
 public interface DSSProjectService  extends IService<DSSProjectDO> {
 
@@ -83,7 +81,7 @@ public interface DSSProjectService  extends IService<DSSProjectDO> {
     /**
      * 批量导出工程内的所有编排
      */
-    void exportAllOrchestrators(ExportAllOrchestratorsReqest exportAllOrchestratorsReqest, String username, String proxyUser, Workspace workspace) throws Exception;
+    BmlResource exportProject(ExportAllOrchestratorsReqest exportAllOrchestratorsReqest, String username, String proxyUser, Workspace workspace) throws Exception;
 
     /**
      * 批量导入编排到指定工程
@@ -96,7 +94,7 @@ public interface DSSProjectService  extends IService<DSSProjectDO> {
      * @param workspace 导入工作空间
 
      */
-    void importAllOrchestrators(ProjectInfoVo projectInfo, BmlResource importResource, String username,
-                             String checkCode, String packageInfo, EnvDSSLabel envLabel, Workspace workspace) throws Exception;
+    void importProject(ProjectInfoVo projectInfo, BmlResource importResource, String username,
+                       String checkCode, String packageInfo, EnvDSSLabel envLabel, Workspace workspace) throws Exception;
 
 }
diff --git a/dss-framework/dss-framework-project-server/src/main/java/com/webank/wedatasphere/dss/framework/project/service/ExportService.java b/dss-framework/dss-framework-project-server/src/main/java/com/webank/wedatasphere/dss/framework/project/service/ExportService.java
index 44ab303db..4aaab4e2a 100644
--- a/dss-framework/dss-framework-project-server/src/main/java/com/webank/wedatasphere/dss/framework/project/service/ExportService.java
+++ b/dss-framework/dss-framework-project-server/src/main/java/com/webank/wedatasphere/dss/framework/project/service/ExportService.java
@@ -50,8 +50,9 @@ ExportResult export(String releaseUser, Long projectId, OrchestratorInfo orchest
     /**
      * 批量导出编排,打包到一起生成一个bml文件
      * @param orchestrators 需要导出的编排们
+     * @return 编排导出后的目录。目录下是一个个编排
      */
-    BatchExportResult batchExport(String userName, Long projectId, List<OrchestratorBaseInfo> orchestrators,
+    String batchExport(String userName, Long projectId, List<OrchestratorBaseInfo> orchestrators,
                                   String projectName, DSSLabel dssLabel, Workspace workspace) throws ErrorException;
 
 
diff --git a/dss-framework/dss-framework-project-server/src/main/java/com/webank/wedatasphere/dss/framework/project/service/impl/DSSProjectServiceImpl.java b/dss-framework/dss-framework-project-server/src/main/java/com/webank/wedatasphere/dss/framework/project/service/impl/DSSProjectServiceImpl.java
index d0e9d0e31..5375599e7 100644
--- a/dss-framework/dss-framework-project-server/src/main/java/com/webank/wedatasphere/dss/framework/project/service/impl/DSSProjectServiceImpl.java
+++ b/dss-framework/dss-framework-project-server/src/main/java/com/webank/wedatasphere/dss/framework/project/service/impl/DSSProjectServiceImpl.java
@@ -27,9 +27,11 @@
 import com.webank.wedatasphere.dss.common.exception.DSSRuntimeException;
 import com.webank.wedatasphere.dss.common.label.DSSLabel;
 import com.webank.wedatasphere.dss.common.label.EnvDSSLabel;
+import com.webank.wedatasphere.dss.common.service.BMLService;
 import com.webank.wedatasphere.dss.common.utils.DSSCommonUtils;
 import com.webank.wedatasphere.dss.common.utils.DSSExceptionUtils;
 import com.webank.wedatasphere.dss.common.utils.RpcAskUtils;
+import com.webank.wedatasphere.dss.common.utils.ZipHelper;
 import com.webank.wedatasphere.dss.framework.project.conf.ProjectConf;
 import com.webank.wedatasphere.dss.framework.project.contant.ProjectServerResponse;
 import com.webank.wedatasphere.dss.common.constant.project.ProjectUserPrivEnum;
@@ -61,13 +63,17 @@
 import com.webank.wedatasphere.dss.standard.app.structure.project.ref.RefProjectContentRequestRef;
 import com.webank.wedatasphere.dss.standard.common.desc.AppInstance;
 import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.io.FileUtils;
 import org.apache.commons.lang.StringUtils;
 import org.apache.commons.lang3.exception.ExceptionUtils;
 import org.apache.linkis.rpc.Sender;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
 
+import java.io.File;
+import java.io.InputStream;
 import java.util.*;
 import java.util.concurrent.*;
 import java.util.function.Consumer;
@@ -89,6 +95,9 @@ public class DSSProjectServiceImpl extends ServiceImpl<DSSProjectMapper, DSSProj
     private DSSProjectService projectService;
     @Autowired
     private ImportService importService;
+    @Autowired
+    @Qualifier("projectBmlService")
+    private BMLService bmlService;
 
 
 
@@ -420,20 +429,32 @@ public List<ProjectResponse> getDeletedProjects(ProjectQueryRequest projectReque
         return projectResponseList;
     }
     @Override
-    public void exportAllOrchestrators(ExportAllOrchestratorsReqest exportAllOrchestratorsReqest,
-                                       String username, String proxyUser, Workspace workspace) throws Exception {
+    public BmlResource exportProject(ExportAllOrchestratorsReqest exportAllOrchestratorsReqest,
+                                     String username, String proxyUser, Workspace workspace) throws Exception {
         Long projectId=exportAllOrchestratorsReqest.getProjectId();
         EnvDSSLabel envLabel = new EnvDSSLabel(exportAllOrchestratorsReqest.getLabels());
         List<OrchestratorBaseInfo> orchestrators = orchestratorService.getOrchestratorInfos(
                 new OrchestratorRequest(workspace.getWorkspaceId(), exportAllOrchestratorsReqest.getProjectId())
                 , exportAllOrchestratorsReqest.getLabels());
         ProjectInfoVo projectVO=projectService.getProjectInfoById(projectId);
-       exportService.batchExport(username, projectId, orchestrators, projectVO.getProjectName(), envLabel, workspace);
+        String projectName = projectVO.getProjectName();
+        String projectPath = exportService.batchExport(username, projectId, orchestrators, projectName, envLabel, workspace);
+        String zipFile = ZipHelper.zip(projectPath,true);
+        LOGGER.info("export project file locate at {}",zipFile);
+        //先上传
+        InputStream inputStream = bmlService.readLocalResourceFile(username, zipFile);
+        BmlResource bmlResource= bmlService.upload(username, inputStream, projectName + ".OrcsExport", projectName);
+
+        LOGGER.info("export zip file upload to bmlResourceId:{} bmlResourceVersion:{}",
+                bmlResource.getResourceId(),bmlResource.getVersion());
+        FileUtils.deleteQuietly(new File(zipFile));
+        return bmlResource;
+
     }
 
     @Override
-    public void importAllOrchestrators(ProjectInfoVo projectInfo, BmlResource importResource, String username,
-                                    String checkCode, String packageInfo, EnvDSSLabel envLabel, Workspace workspace) throws Exception {
+    public void importProject(ProjectInfoVo projectInfo, BmlResource importResource, String username,
+                              String checkCode, String packageInfo, EnvDSSLabel envLabel, Workspace workspace) throws Exception {
 
     importService.batchImportOrc(username, projectInfo.getId(),
                         projectInfo.getProjectName(), importResource, checkCode, envLabel, workspace);
diff --git a/dss-framework/dss-framework-project-server/src/main/java/com/webank/wedatasphere/dss/framework/project/service/impl/ExportServiceImpl.java b/dss-framework/dss-framework-project-server/src/main/java/com/webank/wedatasphere/dss/framework/project/service/impl/ExportServiceImpl.java
index 37184c01a..bd331bb2e 100644
--- a/dss-framework/dss-framework-project-server/src/main/java/com/webank/wedatasphere/dss/framework/project/service/impl/ExportServiceImpl.java
+++ b/dss-framework/dss-framework-project-server/src/main/java/com/webank/wedatasphere/dss/framework/project/service/impl/ExportServiceImpl.java
@@ -112,7 +112,7 @@ public ExportResult export(String releaseUser, Long projectId, OrchestratorInfo
     }
 
     @Override
-    public BatchExportResult batchExport(String userName, Long projectId, List<OrchestratorBaseInfo> orchestrators,
+    public String batchExport(String userName, Long projectId, List<OrchestratorBaseInfo> orchestrators,
                                          String projectName, DSSLabel dssLabel, Workspace workspace) throws ErrorException {
         if(orchestrators==null||orchestrators.isEmpty()){
             throw new DSSRuntimeException("workflow list is empty,nothing to export.(导出的工作流列表为空，没有任何工作流可以导出)");
@@ -125,28 +125,10 @@ public BatchExportResult batchExport(String userName, Long projectId, List<Orche
                     .getBmlResource();
             String orcPath=exportSaveBasePath+orchestrator.getOrchestratorName()+".zip";
             bmlService.downloadToLocalPath(userName,bmlOneOrc.getResourceId(),bmlOneOrc.getVersion(),orcPath);
+            LOGGER.info("export orchestrator file locate at {}",orcPath);
             ZipHelper.unzipFile(orcPath, exportSaveBasePath,true);
         }
-        String projectPath = IoUtils.addFileSeparator(exportSaveBasePath, projectName);
-        String zipFile = ZipHelper.zip(projectPath,true);
-        LOGGER.info("export zip file locate at {}",zipFile);
-        //先上传
-        InputStream inputStream = bmlService.readLocalResourceFile(userName, zipFile);
-        BmlResource bmlResource= bmlService.upload(userName, inputStream, projectName + ".OrcsExport", projectName);
-        //上传完之后，计算上传后二进制流的md5
-        String checkCode;
-        try(InputStream zipInputStream=(InputStream)bmlService.download(userName,
-                bmlResource.getResourceId(),
-                bmlResource.getVersion()).get("is")) {
-            checkCode=  DigestUtils.md5Hex(zipInputStream);
-        } catch (IOException e) {
-            LOGGER.error("md5 sum failed",e);
-            throw new DSSRuntimeException(e.getMessage());
-        }
-        LOGGER.info("export zip file upload to bmlResourceId:{} bmlResourceVersion:{}",
-                bmlResource.getResourceId(),bmlResource.getVersion());
-        FileUtils.deleteQuietly(new File(zipFile));
-        return new BatchExportResult(bmlResource,checkCode);
+        return IoUtils.addFileSeparator(exportSaveBasePath, projectName);
     }
 
     @Override

From f2f94c55f7299b5027c05bd470f889c84f857475 Mon Sep 17 00:00:00 2001
From: xlinliu <arionliu@webank.com>
Date: Mon, 22 Apr 2024 18:09:25 +0800
Subject: [PATCH 051/302] refactor batchImport

---
 .../dss/common/utils/ZipHelper.java           | 15 ++++++
 .../project/service/ImportService.java        |  4 +-
 .../service/impl/DSSProjectServiceImpl.java   | 32 +++++++++---
 .../service/impl/ImportServiceImpl.java       | 51 +------------------
 4 files changed, 44 insertions(+), 58 deletions(-)

diff --git a/dss-commons/dss-common/src/main/java/com/webank/wedatasphere/dss/common/utils/ZipHelper.java b/dss-commons/dss-common/src/main/java/com/webank/wedatasphere/dss/common/utils/ZipHelper.java
index a1fa36726..687860493 100644
--- a/dss-commons/dss-common/src/main/java/com/webank/wedatasphere/dss/common/utils/ZipHelper.java
+++ b/dss-commons/dss-common/src/main/java/com/webank/wedatasphere/dss/common/utils/ZipHelper.java
@@ -26,8 +26,10 @@
 
 import java.io.*;
 import java.util.ArrayList;
+import java.util.Enumeration;
 import java.util.List;
 import java.util.zip.ZipEntry;
+import java.util.zip.ZipFile;
 import java.util.zip.ZipInputStream;
 
 public class ZipHelper {
@@ -227,6 +229,19 @@ public static String unzip(String dirPath,boolean deleteOriginZip)throws DSSErro
         }
         return longZipFilePath;
     }
+    public static String readImportZipProjectName(String zipFilePath) throws IOException {
+        try(ZipFile zipFile =new ZipFile(zipFilePath)){
+            Enumeration<? extends ZipEntry> entries =zipFile.entries();
+            if(entries.hasMoreElements()){
+                String projectName=entries.nextElement().getName();
+                while (projectName.endsWith(File.separator)){
+                    projectName = projectName.substring(0, projectName.length() - 1);
+                }
+                return projectName;
+            }
+        }
+        throw new IOException();
+    }
 
     private static boolean deleteDir(File dir) {
         if (dir.isDirectory()) {
diff --git a/dss-framework/dss-framework-project-server/src/main/java/com/webank/wedatasphere/dss/framework/project/service/ImportService.java b/dss-framework/dss-framework-project-server/src/main/java/com/webank/wedatasphere/dss/framework/project/service/ImportService.java
index 8357b4494..10f8e0666 100644
--- a/dss-framework/dss-framework-project-server/src/main/java/com/webank/wedatasphere/dss/framework/project/service/ImportService.java
+++ b/dss-framework/dss-framework-project-server/src/main/java/com/webank/wedatasphere/dss/framework/project/service/ImportService.java
@@ -45,12 +45,12 @@ OrchestratorBaseInfo importOrc(String orchestratorName, String releaseUser, Long
     /**
      * 批量导入编排
      * @param userName 导入人用户名
-     * @param bmlResource 导入的资源
+     * @param projectPath 导入的资源目录文件夹路径
      * @param checkCode 校验码
      * @param dssLabel 标签
      * @param workspace 导入的工作空间
      * @return 导入的编排信息
      */
-    OrchestratorBatchImportInfo batchImportOrc(String userName, Long projectId, String projectName, BmlResource bmlResource,
+    OrchestratorBatchImportInfo batchImportOrc(String userName, Long projectId, String projectName, String projectPath,
                                                String checkCode, DSSLabel dssLabel, Workspace workspace)throws ErrorException;
 }
diff --git a/dss-framework/dss-framework-project-server/src/main/java/com/webank/wedatasphere/dss/framework/project/service/impl/DSSProjectServiceImpl.java b/dss-framework/dss-framework-project-server/src/main/java/com/webank/wedatasphere/dss/framework/project/service/impl/DSSProjectServiceImpl.java
index 5375599e7..28dc2e303 100644
--- a/dss-framework/dss-framework-project-server/src/main/java/com/webank/wedatasphere/dss/framework/project/service/impl/DSSProjectServiceImpl.java
+++ b/dss-framework/dss-framework-project-server/src/main/java/com/webank/wedatasphere/dss/framework/project/service/impl/DSSProjectServiceImpl.java
@@ -28,10 +28,7 @@
 import com.webank.wedatasphere.dss.common.label.DSSLabel;
 import com.webank.wedatasphere.dss.common.label.EnvDSSLabel;
 import com.webank.wedatasphere.dss.common.service.BMLService;
-import com.webank.wedatasphere.dss.common.utils.DSSCommonUtils;
-import com.webank.wedatasphere.dss.common.utils.DSSExceptionUtils;
-import com.webank.wedatasphere.dss.common.utils.RpcAskUtils;
-import com.webank.wedatasphere.dss.common.utils.ZipHelper;
+import com.webank.wedatasphere.dss.common.utils.*;
 import com.webank.wedatasphere.dss.framework.project.conf.ProjectConf;
 import com.webank.wedatasphere.dss.framework.project.contant.ProjectServerResponse;
 import com.webank.wedatasphere.dss.common.constant.project.ProjectUserPrivEnum;
@@ -62,6 +59,7 @@
 import com.webank.wedatasphere.dss.standard.app.structure.project.ProjectService;
 import com.webank.wedatasphere.dss.standard.app.structure.project.ref.RefProjectContentRequestRef;
 import com.webank.wedatasphere.dss.standard.common.desc.AppInstance;
+import org.apache.commons.codec.digest.DigestUtils;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.lang.StringUtils;
@@ -73,6 +71,7 @@
 import org.springframework.beans.factory.annotation.Qualifier;
 
 import java.io.File;
+import java.io.IOException;
 import java.io.InputStream;
 import java.util.*;
 import java.util.concurrent.*;
@@ -455,9 +454,28 @@ public BmlResource exportProject(ExportAllOrchestratorsReqest exportAllOrchestra
     @Override
     public void importProject(ProjectInfoVo projectInfo, BmlResource importResource, String username,
                               String checkCode, String packageInfo, EnvDSSLabel envLabel, Workspace workspace) throws Exception {
-
-    importService.batchImportOrc(username, projectInfo.getId(),
-                        projectInfo.getProjectName(), importResource, checkCode, envLabel, workspace);
+        String projectName = projectInfo.getProjectName();
+        //下载到本地处理
+        String importSaveBasePath = IoUtils.generateTempIOPath(username);
+        String importFile=importSaveBasePath+File.separator+projectName+".zip";
+        LOGGER.info("import zip file locate at {}",importFile);
+        //下载压缩包
+        bmlService.downloadToLocalPath(username, importResource.getResourceId(), importResource.getVersion(), importFile);
+        try{
+            String  originProjectName=ZipHelper.readImportZipProjectName(importFile);
+            if(!projectName.equals(originProjectName)){
+                String msg=String.format("target project name must be same with origin project name.origin project name:%s,target project name:%s(导入的目标工程名必须与导出时源工程名保持一致。源工程名：%s，目标工程名：%s)"
+                        ,originProjectName,projectName,originProjectName,projectName);
+                throw new DSSRuntimeException(msg);
+            }
+        }catch (IOException e){
+            throw new DSSRuntimeException("upload file format error(导入包格式错误)");
+        }
+        //解压
+        ZipHelper.unzipFile(importFile,importSaveBasePath,true);
+        String projectPath = IoUtils.addFileSeparator(importSaveBasePath, projectName);
+        importService.batchImportOrc(username, projectInfo.getId(),
+                        projectInfo.getProjectName(), projectPath, checkCode, envLabel, workspace);
 
 
 
diff --git a/dss-framework/dss-framework-project-server/src/main/java/com/webank/wedatasphere/dss/framework/project/service/impl/ImportServiceImpl.java b/dss-framework/dss-framework-project-server/src/main/java/com/webank/wedatasphere/dss/framework/project/service/impl/ImportServiceImpl.java
index 179ab990a..ffba8f1cd 100644
--- a/dss-framework/dss-framework-project-server/src/main/java/com/webank/wedatasphere/dss/framework/project/service/impl/ImportServiceImpl.java
+++ b/dss-framework/dss-framework-project-server/src/main/java/com/webank/wedatasphere/dss/framework/project/service/impl/ImportServiceImpl.java
@@ -134,44 +134,10 @@ public OrchestratorBaseInfo importOrc(String orchestratorName, String releaseUse
     }
 
     @Override
-    public OrchestratorBatchImportInfo batchImportOrc(String userName, Long projectId, String projectName,
-                                                      BmlResource bmlResource, String checkCode,
+    public OrchestratorBatchImportInfo batchImportOrc(String userName, Long projectId, String projectName, String projectPath, String checkCode,
                                                       DSSLabel dssLabel, Workspace workspace)
             throws ErrorException{
-        //先核对md5
-        String md5code;
-        try(InputStream zipInputStream=(InputStream)bmlService.download(userName,
-                bmlResource.getResourceId(),
-                bmlResource.getVersion()).get("is")) {
-            md5code=  DigestUtils.md5Hex(zipInputStream);
-        } catch (IOException e) {
-            LOGGER.error("md5 sum failed",e);
-            throw new DSSRuntimeException(e.getMessage());
-        }
-        if(!md5code.equals(checkCode)){
-            LOGGER.error("checkCode does not match the upload file。input code:{},real code:{}",checkCode,md5code);
-            throw new DSSRuntimeException("checkCode does not match the upload file,please check your upload file and checkCode");
-        }
-        //下载到本地处理
-        String importSaveBasePath = IoUtils.generateTempIOPath(userName);
-        String importFile=importSaveBasePath+File.separator+projectName+".zip";
-
-        LOGGER.info("import zip file locate at {}",importFile);
-        //下载压缩包
-        bmlService.downloadToLocalPath(userName, bmlResource.getResourceId(), bmlResource.getVersion(), importFile);
-        try{
-            String  originProjectName=readImportZipProjectName(importFile);
-            if(!projectName.equals(originProjectName)){
-                String msg=String.format("target project name must be same with origin project name.origin project name:%s,target project name:%s(导入的目标工程名必须与导出时源工程名保持一致。源工程名：%s，目标工程名：%s)"
-                        ,originProjectName,projectName,originProjectName,projectName);
-                throw new DSSRuntimeException(msg);
-            }
-        }catch (IOException e){
-            throw new DSSRuntimeException("upload file format error(导入包格式错误)");
-        }
-        //解压
-        ZipHelper.unzipFile(importFile,importSaveBasePath,true);
-        String projectPath = IoUtils.addFileSeparator(importSaveBasePath, projectName);
+        String importSaveBasePath = Paths.get(projectPath).getParent().toString();
         LOGGER.info("import unziped file locate at {}",projectPath);
         //解析元数据
         String metaPath = IoUtils.addFileSeparator(projectPath, FLOW_META_DIRECTORY_NAME);
@@ -209,18 +175,5 @@ public OrchestratorBatchImportInfo batchImportOrc(String userName, Long projectI
 
         return new OrchestratorBatchImportInfo(importOrcMetas,importResultInfo);
     }
-    private String readImportZipProjectName(String zipFilePath) throws IOException {
-        try(ZipFile zipFile =new ZipFile(zipFilePath)){
-            Enumeration<? extends ZipEntry> entries =zipFile.entries();
-            if(entries.hasMoreElements()){
-                String projectName=entries.nextElement().getName();
-                while (projectName.endsWith(File.separator)){
-                    projectName = projectName.substring(0, projectName.length() - 1);
-                }
-                return projectName;
-            }
-        }
-        throw new IOException();
-    }
 
 }

From d9ea8ec5872ffb84e85378d960140e43a170b4fa Mon Sep 17 00:00:00 2001
From: xlinliu <arionliu@webank.com>
Date: Mon, 22 Apr 2024 19:48:45 +0800
Subject: [PATCH 052/302] exportProjectMeta

---
 .../service/impl/DSSProjectServiceImpl.java   | 31 +++++++++++++++----
 .../publish/io/export/MetaExportService.java  |  2 +-
 2 files changed, 26 insertions(+), 7 deletions(-)

diff --git a/dss-framework/dss-framework-project-server/src/main/java/com/webank/wedatasphere/dss/framework/project/service/impl/DSSProjectServiceImpl.java b/dss-framework/dss-framework-project-server/src/main/java/com/webank/wedatasphere/dss/framework/project/service/impl/DSSProjectServiceImpl.java
index 28dc2e303..9beaa9c71 100644
--- a/dss-framework/dss-framework-project-server/src/main/java/com/webank/wedatasphere/dss/framework/project/service/impl/DSSProjectServiceImpl.java
+++ b/dss-framework/dss-framework-project-server/src/main/java/com/webank/wedatasphere/dss/framework/project/service/impl/DSSProjectServiceImpl.java
@@ -20,6 +20,9 @@
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.google.common.util.concurrent.ThreadFactoryBuilder;
+import com.google.gson.Gson;
+import com.google.gson.JsonObject;
+import com.google.gson.JsonParser;
 import com.webank.wedatasphere.dss.appconn.core.AppConn;
 import com.webank.wedatasphere.dss.appconn.manager.AppConnManager;
 import com.webank.wedatasphere.dss.common.entity.BmlResource;
@@ -50,6 +53,7 @@
 import com.webank.wedatasphere.dss.git.common.protocol.request.GitArchiveProjectRequest;
 import com.webank.wedatasphere.dss.git.common.protocol.request.GitCreateProjectRequest;
 import com.webank.wedatasphere.dss.git.common.protocol.response.GitArchivePorjectResponse;
+import com.webank.wedatasphere.dss.orchestrator.common.entity.DSSOrchestratorInfo;
 import com.webank.wedatasphere.dss.orchestrator.server.entity.request.OrchestratorRequest;
 import com.webank.wedatasphere.dss.orchestrator.server.entity.vo.OrchestratorBaseInfo;
 import com.webank.wedatasphere.dss.orchestrator.server.service.OrchestratorService;
@@ -70,12 +74,9 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
+import java.io.*;
 import java.util.*;
 import java.util.concurrent.*;
-import java.util.function.Consumer;
 import java.util.stream.Collectors;
 
 import static com.webank.wedatasphere.dss.framework.project.utils.ProjectOperationUtils.tryProjectOperation;
@@ -103,6 +104,7 @@ public class DSSProjectServiceImpl extends ServiceImpl<DSSProjectMapper, DSSProj
 
     public static final String MODE_SPLIT = ",";
     public static final String KEY_SPLIT = "-";
+    public static final String PROJECT_META_FILE_NAME = ".projectmeta";
     private final String SUPPORT_ABILITY = ProjectConf.SUPPORT_ABILITY.getValue();
     private final ThreadFactory projectOperateThreadFactory = new ThreadFactoryBuilder()
             .setNameFormat("dss-project-operate-thread-%d")
@@ -435,9 +437,10 @@ public BmlResource exportProject(ExportAllOrchestratorsReqest exportAllOrchestra
         List<OrchestratorBaseInfo> orchestrators = orchestratorService.getOrchestratorInfos(
                 new OrchestratorRequest(workspace.getWorkspaceId(), exportAllOrchestratorsReqest.getProjectId())
                 , exportAllOrchestratorsReqest.getLabels());
-        ProjectInfoVo projectVO=projectService.getProjectInfoById(projectId);
-        String projectName = projectVO.getProjectName();
+        DSSProjectDO projectDO=projectService.getProjectById(projectId);
+        String projectName = projectDO.getName();
         String projectPath = exportService.batchExport(username, projectId, orchestrators, projectName, envLabel, workspace);
+        exportProjectMeta(projectDO, projectPath);
         String zipFile = ZipHelper.zip(projectPath,true);
         LOGGER.info("export project file locate at {}",zipFile);
         //先上传
@@ -480,6 +483,22 @@ public void importProject(ProjectInfoVo projectInfo, BmlResource importResource,
 
 
 
+    }
+
+    /**
+     * 导出项目元数据
+     * @param projectDO 项目元数据
+     * @param projectPath 项目目录
+     * @throws IOException
+     */
+    private  void exportProjectMeta(  DSSProjectDO projectDO, String projectPath) throws IOException {
+        File projectMetaFile = new File(projectPath + File.separator + PROJECT_META_FILE_NAME);
+        Gson gson = new Gson();
+        // 文件不存在，直接创建并写入orchestratorInfo信息
+        try (FileWriter writer = new FileWriter(projectMetaFile)) {
+            gson.toJson(projectDO, writer);
+        }
+
     }
 
 }
diff --git a/dss-framework/framework-plugins/dss-framework-orchestrator-publish/src/main/java/com/webank/wedatasphere/dss/orchestrator/publish/io/export/MetaExportService.java b/dss-framework/framework-plugins/dss-framework-orchestrator-publish/src/main/java/com/webank/wedatasphere/dss/orchestrator/publish/io/export/MetaExportService.java
index 4a34b276d..a1af87a92 100644
--- a/dss-framework/framework-plugins/dss-framework-orchestrator-publish/src/main/java/com/webank/wedatasphere/dss/orchestrator/publish/io/export/MetaExportService.java
+++ b/dss-framework/framework-plugins/dss-framework-orchestrator-publish/src/main/java/com/webank/wedatasphere/dss/orchestrator/publish/io/export/MetaExportService.java
@@ -35,7 +35,7 @@ public interface MetaExportService {
      * @throws IOException
      */
     void export(DSSOrchestratorInfo dssOrchestratorInfo, String savePath) throws IOException;
-    void exportNew(DSSOrchestratorInfo dssOrchestratorInfo, String savePath) throws IOException;
+    void exportNew(DSSOrchestratorInfo dssOrchestratorInfo, String flowMetaPath) throws IOException;
 
     void exportFlowBaseInfo(List<DSSFlow> allDSSFlows, List<DSSFlowRelation> allFlowRelations, String savePath) throws IOException;
 

From a2a5faeafca1418bb37348c33944a0876eba6fde Mon Sep 17 00:00:00 2001
From: qweqnotallow <747839893@qq.com>
Date: Tue, 23 Apr 2024 21:12:16 +0800
Subject: [PATCH 053/302] =?UTF-8?q?git=20unzip=E3=80=81checkProject=20fix?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/webank/wedatasphere/dss/git/utils/DSSGitUtils.java    | 4 ++--
 .../java/com/webank/wedatasphere/dss/git/utils/FileUtils.java | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/utils/DSSGitUtils.java b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/utils/DSSGitUtils.java
index 4c9c6c6b2..55d4bee39 100644
--- a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/utils/DSSGitUtils.java
+++ b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/utils/DSSGitUtils.java
@@ -231,7 +231,7 @@ public static boolean checkProjectName(String name, GitUserEntity gitUser) throw
             retry += 1;
             try {
                 allProjectName = getAllProjectName(gitUser);
-                return !allProjectName.contains(name);
+                return allProjectName.contains(name);
             } catch (DSSErrorException e) {
                 logger.info("getAllProjectName failed, try again");
                 if (retry >= 3) {
@@ -240,7 +240,7 @@ public static boolean checkProjectName(String name, GitUserEntity gitUser) throw
                 }
             }
         }
-        return !allProjectName.contains(name);
+        return allProjectName.contains(name);
 
     }
 
diff --git a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/utils/FileUtils.java b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/utils/FileUtils.java
index 633ca6532..0c7c72f3a 100644
--- a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/utils/FileUtils.java
+++ b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/utils/FileUtils.java
@@ -105,7 +105,7 @@ public static String unzipFile(String zipFile) {
 
         String longZipFilePath = "";
         try {
-            longZipFilePath = ZipHelper.unzip(zipFile);
+            longZipFilePath = unzip(zipFile, true);
             File file = new File(zipFile);
             logger.info("开始删除目录 {}", zipFile);
             if (file.delete()){

From 9985230377de3c494a3e021124d56639f5eaf3b7 Mon Sep 17 00:00:00 2001
From: qweqnotallow <747839893@qq.com>
Date: Tue, 23 Apr 2024 21:17:35 +0800
Subject: [PATCH 054/302] git create Project \ update ProjectName

---
 .../impl/DSSFrameworkProjectServiceImpl.java  | 41 ++++++++++++++++++-
 1 file changed, 40 insertions(+), 1 deletion(-)

diff --git a/dss-framework/dss-framework-project-server/src/main/java/com/webank/wedatasphere/dss/framework/project/service/impl/DSSFrameworkProjectServiceImpl.java b/dss-framework/dss-framework-project-server/src/main/java/com/webank/wedatasphere/dss/framework/project/service/impl/DSSFrameworkProjectServiceImpl.java
index 9d93f8bc6..c121d0fab 100644
--- a/dss-framework/dss-framework-project-server/src/main/java/com/webank/wedatasphere/dss/framework/project/service/impl/DSSFrameworkProjectServiceImpl.java
+++ b/dss-framework/dss-framework-project-server/src/main/java/com/webank/wedatasphere/dss/framework/project/service/impl/DSSFrameworkProjectServiceImpl.java
@@ -20,12 +20,14 @@
 import com.webank.wedatasphere.dss.appconn.core.ext.OnlyStructureAppConn;
 import com.webank.wedatasphere.dss.common.entity.BmlResource;
 import com.webank.wedatasphere.dss.common.entity.project.DSSProject;
+import com.webank.wedatasphere.dss.common.utils.DSSCommonUtils;
 import com.webank.wedatasphere.dss.common.utils.DSSExceptionUtils;
 import com.webank.wedatasphere.dss.common.utils.RpcAskUtils;
 import com.webank.wedatasphere.dss.framework.project.conf.ProjectConf;
 import com.webank.wedatasphere.dss.framework.project.contant.ProjectServerResponse;
 import com.webank.wedatasphere.dss.framework.project.entity.DSSProjectDO;
 import com.webank.wedatasphere.dss.framework.project.entity.DSSProjectUser;
+import com.webank.wedatasphere.dss.framework.project.entity.request.ExportAllOrchestratorsReqest;
 import com.webank.wedatasphere.dss.framework.project.entity.request.ProjectCreateRequest;
 import com.webank.wedatasphere.dss.framework.project.entity.request.ProjectDeleteRequest;
 import com.webank.wedatasphere.dss.framework.project.entity.request.ProjectModifyRequest;
@@ -37,9 +39,11 @@
 import com.webank.wedatasphere.dss.framework.project.service.DSSProjectUserService;
 import com.webank.wedatasphere.dss.git.common.protocol.request.GitArchiveProjectRequest;
 import com.webank.wedatasphere.dss.git.common.protocol.request.GitCheckProjectRequest;
+import com.webank.wedatasphere.dss.git.common.protocol.request.GitCommitRequest;
 import com.webank.wedatasphere.dss.git.common.protocol.request.GitCreateProjectRequest;
 import com.webank.wedatasphere.dss.git.common.protocol.response.GitArchivePorjectResponse;
 import com.webank.wedatasphere.dss.git.common.protocol.response.GitCheckProjectResponse;
+import com.webank.wedatasphere.dss.git.common.protocol.response.GitCommitResponse;
 import com.webank.wedatasphere.dss.git.common.protocol.response.GitCreateProjectResponse;
 import com.webank.wedatasphere.dss.sender.service.DSSSenderServiceFactory;
 import com.webank.wedatasphere.dss.standard.app.sso.Workspace;
@@ -108,7 +112,6 @@ public DSSProjectVo createProject(ProjectCreateRequest projectCreateRequest, Str
             DSSExceptionUtils.dealErrorException(60021,"project bussiness is too long. the length must be less than " + MAX_PROJECT_BUSSINESS_SIZE, DSSProjectErrorException.class);
         }
 
-        this.checkProjectName(projectCreateRequest.getName(), workspace, username);
         // 对于接入git的项目校验项目名称
         if(projectCreateRequest.getAssociateGit() != null && projectCreateRequest.getAssociateGit()) {
             checkGitName(projectCreateRequest.getName(), workspace, username);
@@ -117,6 +120,16 @@ public DSSProjectVo createProject(ProjectCreateRequest projectCreateRequest, Str
         Map<AppInstance, Long> projectMap = createAppConnProject(projectCreateRequest, workspace, username);
         //3.保存dss_project
         DSSProjectDO project = dssProjectService.createProject(username, projectCreateRequest);
+        // 对于接入git的项目校验项目名称
+        if(projectCreateRequest.getAssociateGit() != null && projectCreateRequest.getAssociateGit()) {
+            checkGitName(projectCreateRequest.getName(), workspace, username);
+            ExportAllOrchestratorsReqest exportAllOrchestratorsReqest = new ExportAllOrchestratorsReqest();
+            exportAllOrchestratorsReqest.setProjectId(project.getId());
+            exportAllOrchestratorsReqest.setComment("test");
+            exportAllOrchestratorsReqest.setLabels(DSSCommonUtils.ENV_LABEL_VALUE_DEV);
+            BmlResource bmlResource = dssProjectService.exportProject(exportAllOrchestratorsReqest, username, "", workspace);
+            createProject(workspace.getWorkspaceId(), project.getName(), bmlResource, username);
+        }
         //4.保存dss_project_user 工程与用户关系
         projectUserService.saveProjectUser(project.getId(), username, projectCreateRequest, workspace);
         //5.保存dss工程与其他工程的对应关系,应该都是以id来作为标识
@@ -130,6 +143,15 @@ public DSSProjectVo createProject(ProjectCreateRequest projectCreateRequest, Str
         return dssProjectVo;
     }
 
+    private void createProject(Long workspaceId, String projectName, BmlResource bmlResource,String username) {
+        Sender gitSender = DSSSenderServiceFactory.getOrCreateServiceInstance().getGitSender();
+        GitCreateProjectRequest request1 = new GitCreateProjectRequest(workspaceId, projectName, bmlResource, username);
+        LOGGER.info("-------=======================begin to create project: {}=======================-------", projectName);
+        Object ask = gitSender.ask(request1);
+        GitCreateProjectResponse responseWorkflowValidNode = RpcAskUtils.processAskException(ask, GitCreateProjectResponse.class, GitCreateProjectResponse.class);
+        LOGGER.info("-------=======================End to create project: {}=======================-------: {}", projectName, responseWorkflowValidNode);
+    }
+
 
     @Override
     public void checkProjectName(String name, Workspace workspace, String username) throws DSSProjectErrorException {
@@ -171,6 +193,12 @@ public void modifyProject(ProjectModifyRequest projectModifyRequest, DSSProjectD
         // 校验接入git
         if (dbProject.getAssociateGit() != null) {
             checkAssociateGit(projectModifyRequest, dbProject, username, workspace);
+            ExportAllOrchestratorsReqest exportAllOrchestratorsReqest = new ExportAllOrchestratorsReqest();
+            exportAllOrchestratorsReqest.setProjectId(dbProject.getId());
+            exportAllOrchestratorsReqest.setComment("test");
+            exportAllOrchestratorsReqest.setLabels(DSSCommonUtils.ENV_LABEL_VALUE_DEV);
+            BmlResource bmlResource = dssProjectService.exportProject(exportAllOrchestratorsReqest, username, "", workspace);
+            updateProject(workspace.getWorkspaceId(), dbProject.getName(), bmlResource, username);
         }
 
         //调用第三方的工程修改接口
@@ -189,6 +217,17 @@ public void modifyProject(ProjectModifyRequest projectModifyRequest, DSSProjectD
         dssProjectService.modifyProject(username, projectModifyRequest);
     }
 
+    private void updateProject(Long workspaceId, String projectName,BmlResource bmlResource, String username ) {
+        Sender gitSender = DSSSenderServiceFactory.getOrCreateServiceInstance().getGitSender();
+        Map<String, BmlResource> file = new HashMap<>();
+        // 测试数据 key表示项目名、value为项目BmlResource资源
+        file.put(".metaConf", bmlResource);
+        GitCommitRequest request1 = new GitCommitRequest(workspaceId, projectName, file, "update Project by" + username, username);
+        LOGGER.info("-------=======================begin to update project: {}=======================-------", projectName);
+        GitCommitResponse responseWorkflowValidNode = RpcAskUtils.processAskException(gitSender.ask(request1), GitCommitResponse.class, GitCommitRequest.class);
+        LOGGER.info("-------=======================End to update project: {}=======================-------: {}", projectName, responseWorkflowValidNode);
+    }
+
     /**
      * 统一修改各个接入的第三方的系统的工程状态信息，修改 dss_project 调用。
      */

From ba946e1f7232b71b0c172d003aa83856758a2a3b Mon Sep 17 00:00:00 2001
From: xlinliu <arionliu@webank.com>
Date: Tue, 23 Apr 2024 21:23:14 +0800
Subject: [PATCH 055/302] prettyJson

---
 .../dss/common/utils/DSSCommonUtils.java      | 20 ++++++++++++++++++-
 .../service/impl/DSSProjectServiceImpl.java   |  4 +++-
 .../io/export/impl/MetaExportServiceImpl.java | 13 ++++++++----
 .../io/export/impl/MetaExportServiceImpl.java |  1 +
 .../impl/WorkFlowExportServiceImpl.java       |  5 ++++-
 5 files changed, 36 insertions(+), 7 deletions(-)

diff --git a/dss-commons/dss-common/src/main/java/com/webank/wedatasphere/dss/common/utils/DSSCommonUtils.java b/dss-commons/dss-common/src/main/java/com/webank/wedatasphere/dss/common/utils/DSSCommonUtils.java
index 72fd0186e..8435b4dc4 100644
--- a/dss-commons/dss-common/src/main/java/com/webank/wedatasphere/dss/common/utils/DSSCommonUtils.java
+++ b/dss-commons/dss-common/src/main/java/com/webank/wedatasphere/dss/common/utils/DSSCommonUtils.java
@@ -16,7 +16,10 @@
 
 package com.webank.wedatasphere.dss.common.utils;
 
+import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.ObjectWriter;
+import com.fasterxml.jackson.databind.SerializationFeature;
 import com.google.common.reflect.TypeToken;
 import com.google.gson.*;
 import com.webank.wedatasphere.dss.common.entity.node.DSSNode;
@@ -25,8 +28,11 @@
 import org.apache.linkis.common.conf.CommonVars;
 import org.apache.linkis.common.utils.JsonUtils;
 
+import java.io.IOException;
 import java.util.Date;
+import java.util.LinkedHashMap;
 import java.util.List;
+import java.util.Map;
 import java.util.stream.Collectors;
 
 public class DSSCommonUtils {
@@ -61,7 +67,8 @@ public class DSSCommonUtils {
             .registerTypeAdapter(Date.class, (JsonDeserializer<Date>) (json, typeOfT, context) -> new Date(json.getAsLong()))
             .create();
 
-    public static final ObjectMapper JACKSON = JsonUtils.jackson();
+    public static final ObjectMapper JACKSON = JsonUtils.jackson().enable(SerializationFeature.ORDER_MAP_ENTRIES_BY_KEYS);
+    public static final ObjectWriter JACKSON_WRITER =JACKSON.writerWithDefaultPrettyPrinter();
 
     public static final String ENV_LABEL_VALUE_DEV = "dev";
 
@@ -69,6 +76,17 @@ public class DSSCommonUtils {
     public static final String DSS_EXECUTE_BY_PROXY_USER_KEY = "execByProxyUser";
 
     public static final CommonVars<String> DSS_HOME = CommonVars.apply("DSS_HOME", "/appcom/Install/dss");
+    public static String prettyJson(String originJson) throws IOException {
+        ObjectMapper mapper = new ObjectMapper();
+        // 配置 ObjectMapper 以美化输出，并按键排序
+        mapper.enable(SerializationFeature.INDENT_OUTPUT);
+        mapper.configure(SerializationFeature.ORDER_MAP_ENTRIES_BY_KEYS, true);
+
+        // 反序列化 JSON 到 Map，Jackson 默认使用 HashMap
+        Map<String, Object> map = mapper.readValue(originJson, Map.class);
+
+        return mapper.writeValueAsString(map);
+    }
 
     public static long parseToLong(Object val) {
         if (val instanceof Double) {
diff --git a/dss-framework/dss-framework-project-server/src/main/java/com/webank/wedatasphere/dss/framework/project/service/impl/DSSProjectServiceImpl.java b/dss-framework/dss-framework-project-server/src/main/java/com/webank/wedatasphere/dss/framework/project/service/impl/DSSProjectServiceImpl.java
index 9beaa9c71..88a531a65 100644
--- a/dss-framework/dss-framework-project-server/src/main/java/com/webank/wedatasphere/dss/framework/project/service/impl/DSSProjectServiceImpl.java
+++ b/dss-framework/dss-framework-project-server/src/main/java/com/webank/wedatasphere/dss/framework/project/service/impl/DSSProjectServiceImpl.java
@@ -496,7 +496,9 @@ private  void exportProjectMeta(  DSSProjectDO projectDO, String projectPath) th
         Gson gson = new Gson();
         // 文件不存在，直接创建并写入orchestratorInfo信息
         try (FileWriter writer = new FileWriter(projectMetaFile)) {
-            gson.toJson(projectDO, writer);
+            String jsonStr = gson.toJson(projectDO);
+            jsonStr = DSSCommonUtils.prettyJson(jsonStr);
+            writer.write(jsonStr);
         }
 
     }
diff --git a/dss-framework/framework-plugins/dss-framework-orchestrator-publish/src/main/java/com/webank/wedatasphere/dss/orchestrator/publish/io/export/impl/MetaExportServiceImpl.java b/dss-framework/framework-plugins/dss-framework-orchestrator-publish/src/main/java/com/webank/wedatasphere/dss/orchestrator/publish/io/export/impl/MetaExportServiceImpl.java
index 4f0092ca0..0f49e23cd 100644
--- a/dss-framework/framework-plugins/dss-framework-orchestrator-publish/src/main/java/com/webank/wedatasphere/dss/orchestrator/publish/io/export/impl/MetaExportServiceImpl.java
+++ b/dss-framework/framework-plugins/dss-framework-orchestrator-publish/src/main/java/com/webank/wedatasphere/dss/orchestrator/publish/io/export/impl/MetaExportServiceImpl.java
@@ -20,6 +20,7 @@
 import com.google.gson.Gson;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParser;
+import com.webank.wedatasphere.dss.common.utils.DSSCommonUtils;
 import com.webank.wedatasphere.dss.common.utils.IoUtils;
 import com.webank.wedatasphere.dss.orchestrator.common.entity.DSSOrchestratorInfo;
 import com.webank.wedatasphere.dss.orchestrator.publish.io.export.MetaExportService;
@@ -61,15 +62,19 @@ public void exportNew(DSSOrchestratorInfo dssOrchestratorInfo, String flowMetaPa
 
             // 写回修改后的内容
             try (FileWriter writer = new FileWriter(flowMetaFile)) {
-                gson.toJson(jsonObject, writer);
-            } // try-with-resources会自动关闭writer
+                String jsonStr = gson.toJson(jsonObject);
+                jsonStr = DSSCommonUtils.prettyJson(jsonStr);
+                writer.write(jsonStr);
+            }
 
             System.out.println("JSON文件已更新并保存。");
         } else {
             // 文件不存在，直接创建并写入orchestratorInfo信息
             try (FileWriter writer = new FileWriter(flowMetaFile)) {
-                gson.toJson(dssOrchestratorInfo, writer);
-            } // try-with-resources会自动关闭writer
+                String jsonStr = gson.toJson(dssOrchestratorInfo);
+                jsonStr = DSSCommonUtils.prettyJson(jsonStr);
+                writer.write(jsonStr);
+            }
         }
     }
     @Override
diff --git a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/io/export/impl/MetaExportServiceImpl.java b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/io/export/impl/MetaExportServiceImpl.java
index c6df01590..96175346a 100644
--- a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/io/export/impl/MetaExportServiceImpl.java
+++ b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/io/export/impl/MetaExportServiceImpl.java
@@ -50,6 +50,7 @@ public void exportFlowBaseInfoNew(List<DSSFlow> allDSSFlows, List<DSSFlowRelatio
             flowMetaMap.put(FLOW_META_KEY, allDSSFlows);
             flowMetaMap.put(FLOW_RELATION_META_KEY, allFlowRelations);
             String flowMetaStr = DSSCommonUtils.COMMON_GSON.toJson(flowMetaMap);
+            flowMetaStr = DSSCommonUtils.prettyJson(flowMetaStr);
             org.apache.commons.io.IOUtils.write(flowMetaStr,outputStream,"UTF-8");
         }
     }
diff --git a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/io/export/impl/WorkFlowExportServiceImpl.java b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/io/export/impl/WorkFlowExportServiceImpl.java
index cd0e945d4..7544281b7 100644
--- a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/io/export/impl/WorkFlowExportServiceImpl.java
+++ b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/io/export/impl/WorkFlowExportServiceImpl.java
@@ -26,6 +26,7 @@
 import com.webank.wedatasphere.dss.common.exception.DSSErrorException;
 import com.webank.wedatasphere.dss.common.exception.DSSRuntimeException;
 import com.webank.wedatasphere.dss.common.label.DSSLabel;
+import com.webank.wedatasphere.dss.common.utils.DSSCommonUtils;
 import com.webank.wedatasphere.dss.common.utils.IoUtils;
 import com.webank.wedatasphere.dss.common.utils.ZipHelper;
 import com.webank.wedatasphere.dss.standard.app.sso.Workspace;
@@ -308,6 +309,7 @@ private String extractAndExportParams(String flowJson,String flowCodePath) throw
             String nodeName = Optional.ofNullable(node.get("title")).map(JsonElement::getAsString).orElse(null);
             String nodeParamsPath = IoUtils.addFileSeparator(flowCodePath, nodeName, NODE_PARAMS_FILE_NAME);
             String paramsJson = gson.toJson(params);
+            paramsJson = DSSCommonUtils.prettyJson(paramsJson);
             try (
 
                     OutputStream outputStream = IoUtils.generateExportOutputStream(nodeParamsPath )
@@ -318,7 +320,8 @@ private String extractAndExportParams(String flowJson,String flowCodePath) throw
             }
 
         }
-        return gson.toJson(jsonObject);
+        String flowJsonWithoutParams = gson.toJson(jsonObject);
+        return DSSCommonUtils.prettyJson(flowJsonWithoutParams) ;
 
     }
     @Override

From c644228ac7c35115d57a6baf286aed4fe2ca243d Mon Sep 17 00:00:00 2001
From: xlinliu <arionliu@webank.com>
Date: Tue, 23 Apr 2024 21:37:02 +0800
Subject: [PATCH 056/302] support auto disabled

---
 .../appconn/schedulis/constant/AzkabanConstant.java    |  1 +
 .../dss/appconn/schedulis/linkisjob/LinkisJob.java     | 10 ++++++++++
 .../schedulis/linkisjob/LinkisJobConverter.java        |  4 +++-
 3 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/dss-appconn/appconns/dss-schedulis-appconn/src/main/java/com/webank/wedatasphere/dss/appconn/schedulis/constant/AzkabanConstant.java b/dss-appconn/appconns/dss-schedulis-appconn/src/main/java/com/webank/wedatasphere/dss/appconn/schedulis/constant/AzkabanConstant.java
index 821c3a6d0..87d5265a0 100644
--- a/dss-appconn/appconns/dss-schedulis-appconn/src/main/java/com/webank/wedatasphere/dss/appconn/schedulis/constant/AzkabanConstant.java
+++ b/dss-appconn/appconns/dss-schedulis-appconn/src/main/java/com/webank/wedatasphere/dss/appconn/schedulis/constant/AzkabanConstant.java
@@ -29,5 +29,6 @@ public class AzkabanConstant {
     public final static  String FLOW_CONTEXT_ID = "wds.linkis.flow.contextID=";
     public final static String LINKIS_VERSION = "linkis.version";
     public final static String JOB_COMMENT = "comment";
+    public final static String AUTO_DISABLED = "auto.disabled";
 
 }
diff --git a/dss-appconn/appconns/dss-schedulis-appconn/src/main/java/com/webank/wedatasphere/dss/appconn/schedulis/linkisjob/LinkisJob.java b/dss-appconn/appconns/dss-schedulis-appconn/src/main/java/com/webank/wedatasphere/dss/appconn/schedulis/linkisjob/LinkisJob.java
index 76e7ef885..2d269872f 100644
--- a/dss-appconn/appconns/dss-schedulis-appconn/src/main/java/com/webank/wedatasphere/dss/appconn/schedulis/linkisjob/LinkisJob.java
+++ b/dss-appconn/appconns/dss-schedulis-appconn/src/main/java/com/webank/wedatasphere/dss/appconn/schedulis/linkisjob/LinkisJob.java
@@ -23,6 +23,8 @@ public class LinkisJob {
     private String type;
     private String linkistype;
     private String proxyUser;
+
+    private String autoDisabled;
     private String dependencies;
     private Map<String, String> conf;
     private String command;
@@ -60,6 +62,14 @@ public void setProxyUser(String proxyUser) {
         this.proxyUser = proxyUser;
     }
 
+    public String getAutoDisabled() {
+        return autoDisabled;
+    }
+
+    public void setAutoDisabled(String autoDisabled) {
+        this.autoDisabled = autoDisabled;
+    }
+
     public String getDependencies() {
         return dependencies;
     }
diff --git a/dss-appconn/appconns/dss-schedulis-appconn/src/main/java/com/webank/wedatasphere/dss/appconn/schedulis/linkisjob/LinkisJobConverter.java b/dss-appconn/appconns/dss-schedulis-appconn/src/main/java/com/webank/wedatasphere/dss/appconn/schedulis/linkisjob/LinkisJobConverter.java
index f175b6ca3..c60882d50 100644
--- a/dss-appconn/appconns/dss-schedulis-appconn/src/main/java/com/webank/wedatasphere/dss/appconn/schedulis/linkisjob/LinkisJobConverter.java
+++ b/dss-appconn/appconns/dss-schedulis-appconn/src/main/java/com/webank/wedatasphere/dss/appconn/schedulis/linkisjob/LinkisJobConverter.java
@@ -70,6 +70,7 @@ private String convertJobToString(LinkisJob job){
         map.put(WorkflowConstant.PROXY_USER,job.getProxyUser());
         map.put(AzkabanConstant.JOB_COMMAND,job.getCommand());
         map.put(AzkabanConstant.JOB_COMMENT,job.getComment());
+        map.put(AzkabanConstant.AUTO_DISABLED,job.getAutoDisabled());
         Map<String, Object> labels = new HashMap<>(1);
         labels.put("route", SchedulerConf.JOB_LABEL.getValue());
         map.put(AzkabanConstant.JOB_LABELS, DSSCommonUtils.COMMON_GSON.toJson(labels));
@@ -114,7 +115,8 @@ private void convertConfiguration(WorkflowNode workflowNode, LinkisJob job){
             configuration.forEach((k,v)-> {
                 if(null!=v) {
                     v.forEach((k2, v2) -> {
-                        if(null !=v2) {job.getConf().put(confprefix + k + "." + k2, v2.toString());}
+                        if(AzkabanConstant.AUTO_DISABLED.equals(k2) && null !=v2){job.setAutoDisabled(v2.toString());}
+                        else if(null !=v2) {job.getConf().put(confprefix + k + "." + k2, v2.toString());}
                     });
                 }
             });

From a64b405f1ad83ed5f8f4905835faef98ece2e910 Mon Sep 17 00:00:00 2001
From: xlinliu <arionliu@webank.com>
Date: Wed, 24 Apr 2024 15:26:12 +0800
Subject: [PATCH 057/302] Revert "prettyJson"

This reverts commit ba946e1f7232b71b0c172d003aa83856758a2a3b.
---
 .../dss/common/utils/DSSCommonUtils.java      | 20 +------------------
 .../service/impl/DSSProjectServiceImpl.java   |  7 +++----
 .../io/export/impl/MetaExportServiceImpl.java | 16 ++++++---------
 .../io/export/impl/MetaExportServiceImpl.java |  4 ++--
 .../impl/WorkFlowExportServiceImpl.java       |  7 ++-----
 5 files changed, 14 insertions(+), 40 deletions(-)

diff --git a/dss-commons/dss-common/src/main/java/com/webank/wedatasphere/dss/common/utils/DSSCommonUtils.java b/dss-commons/dss-common/src/main/java/com/webank/wedatasphere/dss/common/utils/DSSCommonUtils.java
index 8435b4dc4..72fd0186e 100644
--- a/dss-commons/dss-common/src/main/java/com/webank/wedatasphere/dss/common/utils/DSSCommonUtils.java
+++ b/dss-commons/dss-common/src/main/java/com/webank/wedatasphere/dss/common/utils/DSSCommonUtils.java
@@ -16,10 +16,7 @@
 
 package com.webank.wedatasphere.dss.common.utils;
 
-import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.ObjectWriter;
-import com.fasterxml.jackson.databind.SerializationFeature;
 import com.google.common.reflect.TypeToken;
 import com.google.gson.*;
 import com.webank.wedatasphere.dss.common.entity.node.DSSNode;
@@ -28,11 +25,8 @@
 import org.apache.linkis.common.conf.CommonVars;
 import org.apache.linkis.common.utils.JsonUtils;
 
-import java.io.IOException;
 import java.util.Date;
-import java.util.LinkedHashMap;
 import java.util.List;
-import java.util.Map;
 import java.util.stream.Collectors;
 
 public class DSSCommonUtils {
@@ -67,8 +61,7 @@ public class DSSCommonUtils {
             .registerTypeAdapter(Date.class, (JsonDeserializer<Date>) (json, typeOfT, context) -> new Date(json.getAsLong()))
             .create();
 
-    public static final ObjectMapper JACKSON = JsonUtils.jackson().enable(SerializationFeature.ORDER_MAP_ENTRIES_BY_KEYS);
-    public static final ObjectWriter JACKSON_WRITER =JACKSON.writerWithDefaultPrettyPrinter();
+    public static final ObjectMapper JACKSON = JsonUtils.jackson();
 
     public static final String ENV_LABEL_VALUE_DEV = "dev";
 
@@ -76,17 +69,6 @@ public class DSSCommonUtils {
     public static final String DSS_EXECUTE_BY_PROXY_USER_KEY = "execByProxyUser";
 
     public static final CommonVars<String> DSS_HOME = CommonVars.apply("DSS_HOME", "/appcom/Install/dss");
-    public static String prettyJson(String originJson) throws IOException {
-        ObjectMapper mapper = new ObjectMapper();
-        // 配置 ObjectMapper 以美化输出，并按键排序
-        mapper.enable(SerializationFeature.INDENT_OUTPUT);
-        mapper.configure(SerializationFeature.ORDER_MAP_ENTRIES_BY_KEYS, true);
-
-        // 反序列化 JSON 到 Map，Jackson 默认使用 HashMap
-        Map<String, Object> map = mapper.readValue(originJson, Map.class);
-
-        return mapper.writeValueAsString(map);
-    }
 
     public static long parseToLong(Object val) {
         if (val instanceof Double) {
diff --git a/dss-framework/dss-framework-project-server/src/main/java/com/webank/wedatasphere/dss/framework/project/service/impl/DSSProjectServiceImpl.java b/dss-framework/dss-framework-project-server/src/main/java/com/webank/wedatasphere/dss/framework/project/service/impl/DSSProjectServiceImpl.java
index 88a531a65..04b1ce081 100644
--- a/dss-framework/dss-framework-project-server/src/main/java/com/webank/wedatasphere/dss/framework/project/service/impl/DSSProjectServiceImpl.java
+++ b/dss-framework/dss-framework-project-server/src/main/java/com/webank/wedatasphere/dss/framework/project/service/impl/DSSProjectServiceImpl.java
@@ -21,6 +21,7 @@
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.google.common.util.concurrent.ThreadFactoryBuilder;
 import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParser;
 import com.webank.wedatasphere.dss.appconn.core.AppConn;
@@ -493,12 +494,10 @@ public void importProject(ProjectInfoVo projectInfo, BmlResource importResource,
      */
     private  void exportProjectMeta(  DSSProjectDO projectDO, String projectPath) throws IOException {
         File projectMetaFile = new File(projectPath + File.separator + PROJECT_META_FILE_NAME);
-        Gson gson = new Gson();
+        Gson gson = new GsonBuilder().setPrettyPrinting().create();
         // 文件不存在，直接创建并写入orchestratorInfo信息
         try (FileWriter writer = new FileWriter(projectMetaFile)) {
-            String jsonStr = gson.toJson(projectDO);
-            jsonStr = DSSCommonUtils.prettyJson(jsonStr);
-            writer.write(jsonStr);
+            gson.toJson(projectDO, writer);
         }
 
     }
diff --git a/dss-framework/framework-plugins/dss-framework-orchestrator-publish/src/main/java/com/webank/wedatasphere/dss/orchestrator/publish/io/export/impl/MetaExportServiceImpl.java b/dss-framework/framework-plugins/dss-framework-orchestrator-publish/src/main/java/com/webank/wedatasphere/dss/orchestrator/publish/io/export/impl/MetaExportServiceImpl.java
index 0f49e23cd..2b17c14b2 100644
--- a/dss-framework/framework-plugins/dss-framework-orchestrator-publish/src/main/java/com/webank/wedatasphere/dss/orchestrator/publish/io/export/impl/MetaExportServiceImpl.java
+++ b/dss-framework/framework-plugins/dss-framework-orchestrator-publish/src/main/java/com/webank/wedatasphere/dss/orchestrator/publish/io/export/impl/MetaExportServiceImpl.java
@@ -18,9 +18,9 @@
 
 
 import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParser;
-import com.webank.wedatasphere.dss.common.utils.DSSCommonUtils;
 import com.webank.wedatasphere.dss.common.utils.IoUtils;
 import com.webank.wedatasphere.dss.orchestrator.common.entity.DSSOrchestratorInfo;
 import com.webank.wedatasphere.dss.orchestrator.publish.io.export.MetaExportService;
@@ -46,7 +46,7 @@ public class MetaExportServiceImpl implements MetaExportService {
     @Override
     public void exportNew(DSSOrchestratorInfo dssOrchestratorInfo, String flowMetaPath) throws IOException {
         File flowMetaFile = new File(flowMetaPath + File.separator + FLOW_META_FILE_NAME);
-        Gson gson = new Gson();
+        Gson gson = new GsonBuilder().setPrettyPrinting().create();
 
         if (flowMetaFile.exists()) {
             // 初始化JsonObject为null
@@ -62,19 +62,15 @@ public void exportNew(DSSOrchestratorInfo dssOrchestratorInfo, String flowMetaPa
 
             // 写回修改后的内容
             try (FileWriter writer = new FileWriter(flowMetaFile)) {
-                String jsonStr = gson.toJson(jsonObject);
-                jsonStr = DSSCommonUtils.prettyJson(jsonStr);
-                writer.write(jsonStr);
-            }
+                gson.toJson(jsonObject, writer);
+            } // try-with-resources会自动关闭writer
 
             System.out.println("JSON文件已更新并保存。");
         } else {
             // 文件不存在，直接创建并写入orchestratorInfo信息
             try (FileWriter writer = new FileWriter(flowMetaFile)) {
-                String jsonStr = gson.toJson(dssOrchestratorInfo);
-                jsonStr = DSSCommonUtils.prettyJson(jsonStr);
-                writer.write(jsonStr);
-            }
+                gson.toJson(dssOrchestratorInfo, writer);
+            } // try-with-resources会自动关闭writer
         }
     }
     @Override
diff --git a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/io/export/impl/MetaExportServiceImpl.java b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/io/export/impl/MetaExportServiceImpl.java
index 96175346a..5b1c7a05e 100644
--- a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/io/export/impl/MetaExportServiceImpl.java
+++ b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/io/export/impl/MetaExportServiceImpl.java
@@ -16,6 +16,7 @@
 
 package com.webank.wedatasphere.dss.workflow.io.export.impl;
 
+import com.google.gson.GsonBuilder;
 import com.webank.wedatasphere.dss.common.utils.DSSCommonUtils;
 import com.webank.wedatasphere.dss.common.utils.IoUtils;
 import com.webank.wedatasphere.dss.workflow.common.entity.DSSFlow;
@@ -49,8 +50,7 @@ public void exportFlowBaseInfoNew(List<DSSFlow> allDSSFlows, List<DSSFlowRelatio
             Map<String, Object> flowMetaMap = new HashMap<>(2);
             flowMetaMap.put(FLOW_META_KEY, allDSSFlows);
             flowMetaMap.put(FLOW_RELATION_META_KEY, allFlowRelations);
-            String flowMetaStr = DSSCommonUtils.COMMON_GSON.toJson(flowMetaMap);
-            flowMetaStr = DSSCommonUtils.prettyJson(flowMetaStr);
+            String flowMetaStr = new GsonBuilder().setPrettyPrinting().create().toJson(flowMetaMap);
             org.apache.commons.io.IOUtils.write(flowMetaStr,outputStream,"UTF-8");
         }
     }
diff --git a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/io/export/impl/WorkFlowExportServiceImpl.java b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/io/export/impl/WorkFlowExportServiceImpl.java
index 7544281b7..e3f080ba5 100644
--- a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/io/export/impl/WorkFlowExportServiceImpl.java
+++ b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/io/export/impl/WorkFlowExportServiceImpl.java
@@ -26,7 +26,6 @@
 import com.webank.wedatasphere.dss.common.exception.DSSErrorException;
 import com.webank.wedatasphere.dss.common.exception.DSSRuntimeException;
 import com.webank.wedatasphere.dss.common.label.DSSLabel;
-import com.webank.wedatasphere.dss.common.utils.DSSCommonUtils;
 import com.webank.wedatasphere.dss.common.utils.IoUtils;
 import com.webank.wedatasphere.dss.common.utils.ZipHelper;
 import com.webank.wedatasphere.dss.standard.app.sso.Workspace;
@@ -302,14 +301,13 @@ private String extractAndExportParams(String flowJson,String flowCodePath) throw
         JsonParser parser = new JsonParser();
         JsonObject jsonObject = parser.parse(flowJson).getAsJsonObject();
         JsonArray nodeJsonArray = jsonObject.getAsJsonArray("nodes");
-        Gson gson = new Gson();
+        Gson gson = new GsonBuilder().setPrettyPrinting().create();
         for (JsonElement element : nodeJsonArray) {
             JsonObject node = element.getAsJsonObject();
             JsonElement params = node.remove("params");
             String nodeName = Optional.ofNullable(node.get("title")).map(JsonElement::getAsString).orElse(null);
             String nodeParamsPath = IoUtils.addFileSeparator(flowCodePath, nodeName, NODE_PARAMS_FILE_NAME);
             String paramsJson = gson.toJson(params);
-            paramsJson = DSSCommonUtils.prettyJson(paramsJson);
             try (
 
                     OutputStream outputStream = IoUtils.generateExportOutputStream(nodeParamsPath )
@@ -320,8 +318,7 @@ private String extractAndExportParams(String flowJson,String flowCodePath) throw
             }
 
         }
-        String flowJsonWithoutParams = gson.toJson(jsonObject);
-        return DSSCommonUtils.prettyJson(flowJsonWithoutParams) ;
+        return gson.toJson(jsonObject);
 
     }
     @Override

From cf8172e6bc63ec02370a1bfdf56f71964336bd94 Mon Sep 17 00:00:00 2001
From: qweqnotallow <747839893@qq.com>
Date: Wed, 24 Apr 2024 16:43:52 +0800
Subject: [PATCH 058/302] server create Project fix

---
 .../service/impl/DSSProjectServiceImpl.java   | 21 +++++++++++++++++--
 .../service/impl/ExportServiceImpl.java       |  3 ---
 2 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/dss-framework/dss-framework-project-server/src/main/java/com/webank/wedatasphere/dss/framework/project/service/impl/DSSProjectServiceImpl.java b/dss-framework/dss-framework-project-server/src/main/java/com/webank/wedatasphere/dss/framework/project/service/impl/DSSProjectServiceImpl.java
index 88a531a65..6502fbede 100644
--- a/dss-framework/dss-framework-project-server/src/main/java/com/webank/wedatasphere/dss/framework/project/service/impl/DSSProjectServiceImpl.java
+++ b/dss-framework/dss-framework-project-server/src/main/java/com/webank/wedatasphere/dss/framework/project/service/impl/DSSProjectServiceImpl.java
@@ -75,6 +75,9 @@
 import org.springframework.beans.factory.annotation.Qualifier;
 
 import java.io.*;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
 import java.util.*;
 import java.util.concurrent.*;
 import java.util.stream.Collectors;
@@ -491,8 +494,22 @@ public void importProject(ProjectInfoVo projectInfo, BmlResource importResource,
      * @param projectPath 项目目录
      * @throws IOException
      */
-    private  void exportProjectMeta(  DSSProjectDO projectDO, String projectPath) throws IOException {
-        File projectMetaFile = new File(projectPath + File.separator + PROJECT_META_FILE_NAME);
+    private  void exportProjectMeta(  DSSProjectDO projectDO, String projectPath) throws Exception {
+        String path = projectPath + File.separator + PROJECT_META_FILE_NAME;
+        File projectMetaFile = new File(path);
+        if (!projectMetaFile.exists()) {
+            try {
+                Path filePath = Paths.get(path);
+                // 确保父级路径存在
+                Files.createDirectories(filePath.getParent());
+                // 创建文件
+                Files.createFile(filePath);
+                LOGGER.info("create success");
+            } catch (Exception e) {
+                LOGGER.error("create File {} failed, the reason is : {}", path, e);
+                throw new Exception("create File failed");
+            }
+        }
         Gson gson = new Gson();
         // 文件不存在，直接创建并写入orchestratorInfo信息
         try (FileWriter writer = new FileWriter(projectMetaFile)) {
diff --git a/dss-framework/dss-framework-project-server/src/main/java/com/webank/wedatasphere/dss/framework/project/service/impl/ExportServiceImpl.java b/dss-framework/dss-framework-project-server/src/main/java/com/webank/wedatasphere/dss/framework/project/service/impl/ExportServiceImpl.java
index bd331bb2e..e19876285 100644
--- a/dss-framework/dss-framework-project-server/src/main/java/com/webank/wedatasphere/dss/framework/project/service/impl/ExportServiceImpl.java
+++ b/dss-framework/dss-framework-project-server/src/main/java/com/webank/wedatasphere/dss/framework/project/service/impl/ExportServiceImpl.java
@@ -114,9 +114,6 @@ public ExportResult export(String releaseUser, Long projectId, OrchestratorInfo
     @Override
     public String batchExport(String userName, Long projectId, List<OrchestratorBaseInfo> orchestrators,
                                          String projectName, DSSLabel dssLabel, Workspace workspace) throws ErrorException {
-        if(orchestrators==null||orchestrators.isEmpty()){
-            throw new DSSRuntimeException("workflow list is empty,nothing to export.(导出的工作流列表为空，没有任何工作流可以导出)");
-        }
         String exportSaveBasePath = IoUtils.generateTempIOPath(userName);
         for (OrchestratorBaseInfo orchestrator : orchestrators) {
             OrchestratorInfo orchestratorInfo = new OrchestratorInfo(orchestrator.getOrchestratorId(), orchestrator.getOrchestratorVersionId());

From b7f641a35627c26963102f4f8843706dd5310bdc Mon Sep 17 00:00:00 2001
From: qweqnotallow <747839893@qq.com>
Date: Wed, 24 Apr 2024 16:48:04 +0800
Subject: [PATCH 059/302] server create Project fix2

---
 .../project/service/impl/DSSProjectServiceImpl.java          | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/dss-framework/dss-framework-project-server/src/main/java/com/webank/wedatasphere/dss/framework/project/service/impl/DSSProjectServiceImpl.java b/dss-framework/dss-framework-project-server/src/main/java/com/webank/wedatasphere/dss/framework/project/service/impl/DSSProjectServiceImpl.java
index 84e5d86b2..696ae3004 100644
--- a/dss-framework/dss-framework-project-server/src/main/java/com/webank/wedatasphere/dss/framework/project/service/impl/DSSProjectServiceImpl.java
+++ b/dss-framework/dss-framework-project-server/src/main/java/com/webank/wedatasphere/dss/framework/project/service/impl/DSSProjectServiceImpl.java
@@ -495,8 +495,9 @@ public void importProject(ProjectInfoVo projectInfo, BmlResource importResource,
      * @param projectPath 项目目录
      * @throws IOException
      */
-    private  void exportProjectMeta(  DSSProjectDO projectDO, String projectPath) throws IOException {
-        File projectMetaFile = new File(projectPath + File.separator + PROJECT_META_FILE_NAME);
+    private  void exportProjectMeta(  DSSProjectDO projectDO, String projectPath) throws Exception {
+        String path = projectPath + File.separator + PROJECT_META_FILE_NAME;
+        File projectMetaFile = new File(path);
         if (!projectMetaFile.exists()) {
             try {
                 Path filePath = Paths.get(path);

From 51cc1cba2c1926c6e2d5e30bc6458152c726cf27 Mon Sep 17 00:00:00 2001
From: qweqnotallow <747839893@qq.com>
Date: Wed, 24 Apr 2024 16:49:48 +0800
Subject: [PATCH 060/302] git createProject comment fix

---
 .../dss/git/service/impl/DSSGitProjectManagerServiceImpl.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitProjectManagerServiceImpl.java b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitProjectManagerServiceImpl.java
index 27e28e700..4daa8f61a 100644
--- a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitProjectManagerServiceImpl.java
+++ b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitProjectManagerServiceImpl.java
@@ -53,7 +53,7 @@ public GitCreateProjectResponse create(GitCreateProjectRequest request) {
             // 关联远端Git
             DSSGitUtils.remote(repository, request.getProjectName(), gitUser);
             // 提交
-            DSSGitUtils.push(repository, request.getProjectName(), gitUser, "init project: " + request.getProjectName());
+            DSSGitUtils.push(repository, request.getProjectName(), gitUser, "init project: " + request.getProjectName() + "by " + request.getUsername());
             return new GitCreateProjectResponse();
         } catch (Exception e) {
             logger.error("create project failed, the reason is: ", e);

From 9467aa7637c65b0641e677f546b48cd3214b5075 Mon Sep 17 00:00:00 2001
From: qweqnotallow <747839893@qq.com>
Date: Thu, 25 Apr 2024 15:02:56 +0800
Subject: [PATCH 061/302] server--git status lock fix

---
 .../wedatasphere/dss/workflow/lock/DSSFlowEditLockManager.java   | 1 +
 1 file changed, 1 insertion(+)

diff --git a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/lock/DSSFlowEditLockManager.java b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/lock/DSSFlowEditLockManager.java
index 222f51e99..37735bbb4 100644
--- a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/lock/DSSFlowEditLockManager.java
+++ b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/lock/DSSFlowEditLockManager.java
@@ -274,6 +274,7 @@ public static void init() {
             synchronized (DSSFlowEditLockManager.class) {
                 if (!isInit) {
                     lockMapper = DataWorkCloudApplication.getApplicationContext().getBean(LockMapper.class);
+                    flowMapper = DataWorkCloudApplication.getApplicationContext().getBean(FlowMapper.class);
                     isInit = true;
                 }
             }

From 3b7f15d81c3bce5aa7aced05150a699fbb63b22d Mon Sep 17 00:00:00 2001
From: qweqnotallow <747839893@qq.com>
Date: Thu, 25 Apr 2024 17:25:47 +0800
Subject: [PATCH 062/302] server--check git fix

---
 .../project/service/impl/DSSFrameworkProjectServiceImpl.java  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dss-framework/dss-framework-project-server/src/main/java/com/webank/wedatasphere/dss/framework/project/service/impl/DSSFrameworkProjectServiceImpl.java b/dss-framework/dss-framework-project-server/src/main/java/com/webank/wedatasphere/dss/framework/project/service/impl/DSSFrameworkProjectServiceImpl.java
index c121d0fab..0500c4801 100644
--- a/dss-framework/dss-framework-project-server/src/main/java/com/webank/wedatasphere/dss/framework/project/service/impl/DSSFrameworkProjectServiceImpl.java
+++ b/dss-framework/dss-framework-project-server/src/main/java/com/webank/wedatasphere/dss/framework/project/service/impl/DSSFrameworkProjectServiceImpl.java
@@ -191,7 +191,7 @@ public void modifyProject(ProjectModifyRequest projectModifyRequest, DSSProjectD
             DSSExceptionUtils.dealErrorException(ProjectServerResponse.PROJECT_NOT_EDIT_NAME.getCode(), ProjectServerResponse.PROJECT_NOT_EDIT_NAME.getMsg(), DSSProjectErrorException.class);
         }
         // 校验接入git
-        if (dbProject.getAssociateGit() != null) {
+        if (projectModifyRequest.getAssociateGit() != null) {
             checkAssociateGit(projectModifyRequest, dbProject, username, workspace);
             ExportAllOrchestratorsReqest exportAllOrchestratorsReqest = new ExportAllOrchestratorsReqest();
             exportAllOrchestratorsReqest.setProjectId(dbProject.getId());
@@ -388,7 +388,7 @@ private void checkAssociateGit(ProjectModifyRequest projectModifyRequest, DSSPro
             throw new DSSProjectErrorException(71000, "项目接入git后无法取消");
         }
         // 对于首次接入git的项目需要校验项目名称并且进行git初始化
-        if (!dbProject.getAssociateGit() && projectModifyRequest.getAssociateGit() && projectModifyRequest.getAssociateGit()!= null && projectModifyRequest.getAssociateGit()) {
+        if ((dbProject.getAssociateGit() == null || !dbProject.getAssociateGit()) && projectModifyRequest.getAssociateGit() && projectModifyRequest.getAssociateGit()!= null && projectModifyRequest.getAssociateGit()) {
             checkGitName(projectModifyRequest.getName(), workspace, username);
             // todo resource version Info
             // initGitProject(workspace.getWorkspaceId(), projectCreateRequest.getName(),);

From a16a34f8bf0b6d37b76e4c4e8ba7ed37129b3a69 Mon Sep 17 00:00:00 2001
From: SunpengWan <825559776@qq.com>
Date: Fri, 26 Apr 2024 10:30:03 +0800
Subject: [PATCH 063/302] update gson and postgresql package version to 2.8.9
 and 42.3.9

---
 dss-apps/dss-apiservice-server/pom.xml | 2 +-
 pom.xml                                | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dss-apps/dss-apiservice-server/pom.xml b/dss-apps/dss-apiservice-server/pom.xml
index b677f34f2..44a22b715 100644
--- a/dss-apps/dss-apiservice-server/pom.xml
+++ b/dss-apps/dss-apiservice-server/pom.xml
@@ -143,7 +143,7 @@
         <dependency>
             <groupId>org.postgresql</groupId>
             <artifactId>postgresql</artifactId>
-            <version>42.3.3</version>
+            <version>42.3.9</version>
         </dependency>
         <dependency>
             <groupId>org.apache.linkis</groupId>
diff --git a/pom.xml b/pom.xml
index 3df428933..1e015152e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -45,7 +45,7 @@
         <scala.version>2.11.12</scala.version>
         <jdk.compile.version>1.8</jdk.compile.version>
         <maven.version>3.3.3</maven.version>
-        <gson.version>2.8.5</gson.version>
+        <gson.version>2.8.9</gson.version>
         <fasterxml.jackson.version>2.14.1</fasterxml.jackson.version>
         <math3.version>3.1.1</math3.version>
         <httpclient.version>4.5.4</httpclient.version>

From 18db64d900bc4a305c469d7b3f3765a4d7db1d7f Mon Sep 17 00:00:00 2001
From: xlinliu <arionliu@webank.com>
Date: Fri, 26 Apr 2024 14:22:27 +0800
Subject: [PATCH 064/302] datachecker remove mask db query

---
 .../datachecker/connector/DataCheckerDao.java | 60 +------------------
 .../connector/DataDruidFactory.java           | 15 -----
 2 files changed, 2 insertions(+), 73 deletions(-)

diff --git a/dss-appconn/appconns/dss-datachecker-appconn/src/main/java/com/webank/wedatasphere/dss/appconn/datachecker/connector/DataCheckerDao.java b/dss-appconn/appconns/dss-datachecker-appconn/src/main/java/com/webank/wedatasphere/dss/appconn/datachecker/connector/DataCheckerDao.java
index d48abbc91..739d0eb13 100644
--- a/dss-appconn/appconns/dss-datachecker-appconn/src/main/java/com/webank/wedatasphere/dss/appconn/datachecker/connector/DataCheckerDao.java
+++ b/dss-appconn/appconns/dss-datachecker-appconn/src/main/java/com/webank/wedatasphere/dss/appconn/datachecker/connector/DataCheckerDao.java
@@ -54,13 +54,6 @@ public class DataCheckerDao {
     private static final String SQL_SOURCE_TYPE_JOB_PARTITION =
             "SELECT * FROM DBS d JOIN TBLS t ON t.DB_ID = d.DB_ID JOIN PARTITIONS p ON p.TBL_ID = t.TBL_ID WHERE d.NAME=? AND t.TBL_NAME=? AND p.PART_NAME=?";
 
-    private static final String SQL_SOURCE_TYPE_BDP =
-            "SELECT * FROM desktop_bdapimport WHERE bdap_db_name = ? AND bdap_table_name = ? AND target_partition_name = ? AND status = '1';";
-
-    private static final String SQL_SOURCE_TYPE_BDP_WITH_TIME_CONDITION =
-            "SELECT * FROM desktop_bdapimport WHERE bdap_db_name = ? AND bdap_table_name = ? AND target_partition_name = ? " +
-                    "AND (UNIX_TIMESTAMP() - UNIX_TIMESTAMP(STR_TO_DATE(modify_time, '%Y-%m-%d %H:%i:%s'))) <= ? AND status = '1';";
-
     private static final String SQL_DOPS_CHECK_TABLE =
             "SELECT * FROM dops_clean_task_list WHERE db_name = ? AND tb_name = ? AND part_name is null AND task_state NOT IN (10,13) order by order_id desc limit 1";
     private static final String SQL_DOPS_CHECK_PARTITION =
@@ -72,7 +65,6 @@ public class DataCheckerDao {
     private static final String MASK_SOURCE_TYPE = "maskdb";
 
     private static DataSource jobDS;
-    private static DataSource bdpDS;
 
     private static DataSource dopsDS;
     private static volatile DataCheckerDao instance;
@@ -96,13 +88,6 @@ public boolean validateTableStatusFunction(Properties props, Logger log, DataChe
                 return false;
             }
         }
-        if (bdpDS == null) {
-            bdpDS = DataDruidFactory.getBDPInstance(props, log);
-            if (bdpDS == null) {
-                log.warn("Error getting job Druid DataSource instance");
-                return false;
-            }
-        }
         boolean systemCheck = Boolean.valueOf(props.getProperty(DataChecker.QUALITIS_SWITCH));
         if (systemCheck && dopsDS == null) {
             dopsDS = DataDruidFactory.getDopsInstance(props, log);//通过alibaba的druid数据库连接池获取JOB数据库连接
@@ -134,13 +119,12 @@ public boolean validateTableStatusFunction(Properties props, Logger log, DataChe
         });
         QualitisUtil qualitisUtil = new QualitisUtil(props);
         try (Connection jobConn = jobDS.getConnection();
-             Connection bdpConn = bdpDS.getConnection();
              Connection dopsConn = dopsDS != null ? dopsDS.getConnection() : null) {
             List<Boolean> allCheckRes = dataObjectList
                     .parallelStream()
                     .map(proObjectMap -> {
                         log.info("Begin to Check dataObject:" + proObjectMap.entrySet().toString());
-                        boolean checkRes = getDataCheckResult(proObjectMap, jobConn, bdpConn, dopsConn, props, log,action,qualitisUtil);
+                        boolean checkRes = getDataCheckResult(proObjectMap, jobConn, dopsConn, props, log,action,qualitisUtil);
                         if (null != action.getExecutionRequestRefContext()) {
                             if (checkRes) {
                                 action.getExecutionRequestRefContext().appendLog("Database table partition info : " + proObjectMap.get(DataChecker.DATA_OBJECT) + " has arrived");
@@ -178,7 +162,6 @@ public boolean validateTableStatusFunction(Properties props, Logger log, DataChe
 
     private boolean getDataCheckResult(Map<String, String> proObjectMap,
                                        Connection jobConn,
-                                       Connection bdpConn,
                                        Connection dopsConn,
                                        Properties props,
                                        Logger log,
@@ -231,7 +214,7 @@ private boolean getDataCheckResult(Map<String, String> proObjectMap,
                 }
                 log.info("start to check maskis");
                 proObjectMap.put(DataChecker.SOURCE_TYPE, MASK_SOURCE_TYPE);
-                normalCheck= (getBdpTotalCount(dataObject, bdpConn, log, props) > 0 || "success".equals(fetchMaskCode(dataObject, log, props).get("maskStatus")));
+                normalCheck= "success".equals(fetchMaskCode(dataObject, log, props).get("maskStatus"));
                 if (null != action.getExecutionRequestRefContext()){
                     action.getExecutionRequestRefContext().appendLog(dataObjectStr+" check maskis end,check result:"+normalCheck);
                 }
@@ -316,25 +299,6 @@ private PreparedStatement getJobStatement(Connection conn, CheckDataObject dataO
         }
     }
 
-    /**
-     * 构造查询maskis的查询
-     */
-    private PreparedStatement getBdpStatement(Connection conn, CheckDataObject dataObject, String timeScape) throws SQLException {
-        PreparedStatement pstmt = null;
-        if (timeScape.equals("NULL")) {
-            pstmt = conn.prepareCall(SQL_SOURCE_TYPE_BDP);
-        } else {
-            pstmt = conn.prepareCall(SQL_SOURCE_TYPE_BDP_WITH_TIME_CONDITION);
-            pstmt.setInt(4, Integer.valueOf(timeScape) * 3600);
-        }
-        if (dataObject.getPartitionName() == null) {
-            dataObject.setPartitionName("");
-        }
-        pstmt.setString(1, dataObject.getDbName());
-        pstmt.setString(2, dataObject.getTableName());
-        pstmt.setString(3, dataObject.getPartitionName());
-        return pstmt;
-    }
 
     /**
      * 构造查询dops库的查询
@@ -414,26 +378,6 @@ private long getJobTotalCount(CheckDataObject dataObject, Connection conn, Logge
         }
     }
 
-    /**
-     * 查mask db
-     */
-    private long getBdpTotalCount(CheckDataObject dataObject, Connection conn, Logger log, Properties props) {
-        String timeScape = props.getOrDefault(DataChecker.TIME_SCAPE, "NULL").toString();
-        log.info("-------------------------------------- search bdp data ");
-        log.info("-------------------------------------- dataObject: " + dataObject.toString());
-        try (PreparedStatement pstmt = getBdpStatement(conn, dataObject, timeScape)) {
-            ResultSet rs = pstmt.executeQuery();
-            long ret = 0L;
-            while (rs.next()) {
-                ret ++;
-            }
-//            long ret=rs.last() ? rs.getRow() : 0;
-            log.info("-------------------------------------- bdp data result:"+ret);
-            return ret;
-        } catch (SQLException e) {
-            return 0;
-        }
-    }
 
     /**
      * - 返回0表示未找到任何记录 ；
diff --git a/dss-appconn/appconns/dss-datachecker-appconn/src/main/java/com/webank/wedatasphere/dss/appconn/datachecker/connector/DataDruidFactory.java b/dss-appconn/appconns/dss-datachecker-appconn/src/main/java/com/webank/wedatasphere/dss/appconn/datachecker/connector/DataDruidFactory.java
index e91ef5b32..be89365de 100644
--- a/dss-appconn/appconns/dss-datachecker-appconn/src/main/java/com/webank/wedatasphere/dss/appconn/datachecker/connector/DataDruidFactory.java
+++ b/dss-appconn/appconns/dss-datachecker-appconn/src/main/java/com/webank/wedatasphere/dss/appconn/datachecker/connector/DataDruidFactory.java
@@ -25,7 +25,6 @@
 
 public class DataDruidFactory {
 	private static volatile DruidDataSource jobInstance;
-    private static volatile DruidDataSource bdpInstance;
 
     private static volatile DruidDataSource dopsInstance;
     private static volatile DruidDataSource msgInstance;
@@ -44,20 +43,6 @@ public static DruidDataSource getJobInstance(Properties props, Logger log) {
         }
         return jobInstance;
     }
-    public static DruidDataSource getBDPInstance(Properties props, Logger log) {
-        if (bdpInstance == null ) {
-            synchronized (DataDruidFactory.class) {
-                if(bdpInstance == null) {
-                    try {
-                        bdpInstance = createDataSource(props, log, "BDP");
-                    } catch (Exception e) {
-                        throw new RuntimeException("Error creating BDP Druid DataSource", e);
-                    }
-                }
-            }
-        }
-        return bdpInstance;
-    }
 
     public static DruidDataSource getDopsInstance(Properties props, Logger log) {
         if (dopsInstance == null) {

From 4e3d6c5d86552c15bbee2e8a6b9b5e81f2989a8d Mon Sep 17 00:00:00 2001
From: xlinliu <arionliu@webank.com>
Date: Fri, 26 Apr 2024 14:29:15 +0800
Subject: [PATCH 065/302] remove autoLoadAppConnManager of orchestrator-server
 and workflow-server

---
 .../server/restful/DSSFrameworkOrchestratorRestful.java      | 5 -----
 .../wedatasphere/dss/workflow/restful/FlowRestfulApi.java    | 4 ----
 2 files changed, 9 deletions(-)

diff --git a/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/restful/DSSFrameworkOrchestratorRestful.java b/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/restful/DSSFrameworkOrchestratorRestful.java
index f982e439e..e4265e7f5 100644
--- a/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/restful/DSSFrameworkOrchestratorRestful.java
+++ b/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/restful/DSSFrameworkOrchestratorRestful.java
@@ -61,11 +61,6 @@ public class DSSFrameworkOrchestratorRestful {
     @Autowired
     private HttpServletRequest httpServletRequest;
 
-    @PostConstruct
-    public void init() {
-        AppConnManagerUtils.autoLoadAppConnManager();
-    }
-
     /**
      * 创建编排模式
      *
diff --git a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/restful/FlowRestfulApi.java b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/restful/FlowRestfulApi.java
index 2e8fa292c..9913ea575 100644
--- a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/restful/FlowRestfulApi.java
+++ b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/restful/FlowRestfulApi.java
@@ -85,10 +85,6 @@ public class FlowRestfulApi {
     @Autowired
     private HttpServletRequest httpServletRequest;
 
-    @PostConstruct
-    public void init() {
-        AppConnManagerUtils.autoLoadAppConnManager();
-    }
 
     /**
      * 添加subflow节点

From 600f802b7a4d9edda522ffb9d8a848521a9c6a4f Mon Sep 17 00:00:00 2001
From: SunpengWan <825559776@qq.com>
Date: Fri, 26 Apr 2024 15:36:28 +0800
Subject: [PATCH 066/302] update pom version to 1.4.0-SNAPSHOT

---
 assembly/dss-package/pom.xml                                  | 2 +-
 assembly/pom.xml                                              | 2 +-
 dss-appconn/appconns/dss-datachecker-appconn/pom.xml          | 4 ++--
 dss-appconn/appconns/dss-dolphinscheduler-appconn/pom.xml     | 2 +-
 dss-appconn/appconns/dss-eventchecker-appconn/pom.xml         | 2 +-
 dss-appconn/appconns/dss-schedulis-appconn/pom.xml            | 2 +-
 dss-appconn/appconns/dss-scriptis-appconn/pom.xml             | 2 +-
 dss-appconn/appconns/dss-sendemail-appconn/pom.xml            | 2 +-
 .../dss-sendemail-appconn/sendemail-appconn-core/pom.xml      | 2 +-
 dss-appconn/appconns/dss-sso-appconn/pom.xml                  | 2 +-
 dss-appconn/appconns/dss-workflow-appconn/pom.xml             | 2 +-
 dss-appconn/dss-appconn-core/pom.xml                          | 2 +-
 dss-appconn/dss-appconn-loader/pom.xml                        | 2 +-
 .../dss-appconn-manager/dss-appconn-manager-client/pom.xml    | 2 +-
 .../dss-appconn-manager/dss-appconn-manager-core/pom.xml      | 2 +-
 dss-appconn/dss-appconn-manager/pom.xml                       | 2 +-
 dss-appconn/dss-scheduler-appconn/pom.xml                     | 2 +-
 dss-appconn/linkis-appconn-engineplugin/pom.xml               | 2 +-
 dss-appconn/pom.xml                                           | 2 +-
 dss-apps/dss-apiservice-server/pom.xml                        | 2 +-
 dss-apps/dss-apps-server/pom.xml                              | 2 +-
 dss-apps/dss-data-api/pom.xml                                 | 2 +-
 dss-apps/dss-data-governance/pom.xml                          | 2 +-
 dss-apps/dss-scriptis-server/pom.xml                          | 2 +-
 dss-apps/dss-user-guide/dss-user-guide-server/pom.xml         | 2 +-
 dss-apps/dss-user-guide/pom.xml                               | 2 +-
 dss-apps/pom.xml                                              | 2 +-
 dss-commons/dss-common/pom.xml                                | 2 +-
 dss-commons/dss-contextservice/pom.xml                        | 2 +-
 dss-commons/dss-sender-service/pom.xml                        | 2 +-
 dss-commons/pom.xml                                           | 2 +-
 dss-framework/dss-appconn-framework/pom.xml                   | 2 +-
 dss-framework/dss-framework-admin-service/pom.xml             | 2 +-
 dss-framework/dss-framework-common/pom.xml                    | 2 +-
 dss-framework/dss-framework-orchestrator-server/pom.xml       | 2 +-
 dss-framework/dss-framework-project-server/pom.xml            | 2 +-
 dss-framework/dss-framework-proxy-user-service/pom.xml        | 2 +-
 dss-framework/dss-framework-workspace-server/pom.xml          | 2 +-
 .../framework-plugins/dss-framework-migrate-server/pom.xml    | 2 +-
 .../dss-framework-orchestrator-publish/pom.xml                | 2 +-
 dss-framework/pom.xml                                         | 2 +-
 dss-orchestrator/dss-orchestrator-common/pom.xml              | 2 +-
 dss-orchestrator/dss-orchestrator-conversion-standard/pom.xml | 2 +-
 dss-orchestrator/dss-orchestrator-core/pom.xml                | 2 +-
 dss-orchestrator/dss-orchestrator-db/pom.xml                  | 2 +-
 dss-orchestrator/dss-orchestrator-loader/pom.xml              | 2 +-
 .../dss-workflow/dss-flow-execution-server/pom.xml            | 2 +-
 .../dss-workflow/dss-linkis-node-execution/pom.xml            | 2 +-
 .../orchestrators/dss-workflow/dss-workflow-common/pom.xml    | 2 +-
 .../dss-workflow/dss-workflow-conversion-standard/pom.xml     | 2 +-
 .../orchestrators/dss-workflow/dss-workflow-sdk/pom.xml       | 2 +-
 .../orchestrators/dss-workflow/dss-workflow-server/pom.xml    | 2 +-
 dss-orchestrator/orchestrators/dss-workflow/pom.xml           | 2 +-
 dss-orchestrator/pom.xml                                      | 2 +-
 dss-server/pom.xml                                            | 2 +-
 .../development-process-standard-execution/pom.xml            | 2 +-
 .../development-standard/development-process-standard/pom.xml | 2 +-
 dss-standard/dss-standard-common/pom.xml                      | 2 +-
 dss-standard/pom.xml                                          | 2 +-
 .../sso-standard/origin-sso-integration-standard/pom.xml      | 2 +-
 .../sso-standard/spring-origin-sso-integration-plugin/pom.xml | 2 +-
 dss-standard/sso-standard/sso-integration-standard/pom.xml    | 2 +-
 dss-standard/structure-standard/dss-project-plugin/pom.xml    | 2 +-
 dss-standard/structure-standard/dss-role-plugin/pom.xml       | 2 +-
 .../dss-structure-integration-standard/pom.xml                | 2 +-
 .../spring-origin-dss-project-plugin/pom.xml                  | 2 +-
 plugins/azkaban/linkis-jobtype/pom.xml                        | 2 +-
 .../dolphinscheduler/dolphinscheduler-prod-metrics/pom.xml    | 2 +-
 plugins/dolphinscheduler/dss-dolphinscheduler-client/pom.xml  | 2 +-
 plugins/dolphinscheduler/dss-dolphinscheduler-token/pom.xml   | 2 +-
 plugins/dolphinscheduler/pom.xml                              | 2 +-
 plugins/linkis/dss-gateway-support/pom.xml                    | 2 +-
 pom.xml                                                       | 4 ++--
 73 files changed, 75 insertions(+), 75 deletions(-)

diff --git a/assembly/dss-package/pom.xml b/assembly/dss-package/pom.xml
index 6674406cd..16aa70bfd 100644
--- a/assembly/dss-package/pom.xml
+++ b/assembly/dss-package/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.4.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/assembly/pom.xml b/assembly/pom.xml
index d72a246dd..c873e4653 100644
--- a/assembly/pom.xml
+++ b/assembly/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.4.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <packaging>pom</packaging>
diff --git a/dss-appconn/appconns/dss-datachecker-appconn/pom.xml b/dss-appconn/appconns/dss-datachecker-appconn/pom.xml
index d01eb0de3..5095c93b5 100644
--- a/dss-appconn/appconns/dss-datachecker-appconn/pom.xml
+++ b/dss-appconn/appconns/dss-datachecker-appconn/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.4.0-SNAPSHOT</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
@@ -54,7 +54,7 @@
         <dependency>
             <groupId>com.webank.wedatasphere.dss</groupId>
             <artifactId>dss-origin-sso-integration-standard</artifactId>
-            <version>1.3.0-SNAPSHOT</version>
+            <version>1.4.0-SNAPSHOT</version>
             <exclusions>
                 <exclusion>
                     <groupId>org.apache.linkis</groupId>
diff --git a/dss-appconn/appconns/dss-dolphinscheduler-appconn/pom.xml b/dss-appconn/appconns/dss-dolphinscheduler-appconn/pom.xml
index 3965bc416..b84e42a8e 100644
--- a/dss-appconn/appconns/dss-dolphinscheduler-appconn/pom.xml
+++ b/dss-appconn/appconns/dss-dolphinscheduler-appconn/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.4.0-SNAPSHOT</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-appconn/appconns/dss-eventchecker-appconn/pom.xml b/dss-appconn/appconns/dss-eventchecker-appconn/pom.xml
index 2133f507e..850894386 100644
--- a/dss-appconn/appconns/dss-eventchecker-appconn/pom.xml
+++ b/dss-appconn/appconns/dss-eventchecker-appconn/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.4.0-SNAPSHOT</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-appconn/appconns/dss-schedulis-appconn/pom.xml b/dss-appconn/appconns/dss-schedulis-appconn/pom.xml
index 7b0f868e2..f6f5e83c0 100644
--- a/dss-appconn/appconns/dss-schedulis-appconn/pom.xml
+++ b/dss-appconn/appconns/dss-schedulis-appconn/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.4.0-SNAPSHOT</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-appconn/appconns/dss-scriptis-appconn/pom.xml b/dss-appconn/appconns/dss-scriptis-appconn/pom.xml
index e53aab1f8..f3eb99bdd 100644
--- a/dss-appconn/appconns/dss-scriptis-appconn/pom.xml
+++ b/dss-appconn/appconns/dss-scriptis-appconn/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.4.0-SNAPSHOT</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-appconn/appconns/dss-sendemail-appconn/pom.xml b/dss-appconn/appconns/dss-sendemail-appconn/pom.xml
index 0ebc2ff87..e12271f9a 100644
--- a/dss-appconn/appconns/dss-sendemail-appconn/pom.xml
+++ b/dss-appconn/appconns/dss-sendemail-appconn/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.4.0-SNAPSHOT</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-appconn/appconns/dss-sendemail-appconn/sendemail-appconn-core/pom.xml b/dss-appconn/appconns/dss-sendemail-appconn/sendemail-appconn-core/pom.xml
index d6a285758..4fcdeb10d 100644
--- a/dss-appconn/appconns/dss-sendemail-appconn/sendemail-appconn-core/pom.xml
+++ b/dss-appconn/appconns/dss-sendemail-appconn/sendemail-appconn-core/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.4.0-SNAPSHOT</version>
         <relativePath>../../../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-appconn/appconns/dss-sso-appconn/pom.xml b/dss-appconn/appconns/dss-sso-appconn/pom.xml
index 1134ea21c..61dcaed54 100644
--- a/dss-appconn/appconns/dss-sso-appconn/pom.xml
+++ b/dss-appconn/appconns/dss-sso-appconn/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.4.0-SNAPSHOT</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-appconn/appconns/dss-workflow-appconn/pom.xml b/dss-appconn/appconns/dss-workflow-appconn/pom.xml
index 2c677dbbc..c8beb5b4b 100644
--- a/dss-appconn/appconns/dss-workflow-appconn/pom.xml
+++ b/dss-appconn/appconns/dss-workflow-appconn/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.4.0-SNAPSHOT</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-appconn/dss-appconn-core/pom.xml b/dss-appconn/dss-appconn-core/pom.xml
index bf52e5be3..9288453e0 100644
--- a/dss-appconn/dss-appconn-core/pom.xml
+++ b/dss-appconn/dss-appconn-core/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.4.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-appconn/dss-appconn-loader/pom.xml b/dss-appconn/dss-appconn-loader/pom.xml
index c175d6356..5f2c96a50 100644
--- a/dss-appconn/dss-appconn-loader/pom.xml
+++ b/dss-appconn/dss-appconn-loader/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.4.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-appconn/dss-appconn-manager/dss-appconn-manager-client/pom.xml b/dss-appconn/dss-appconn-manager/dss-appconn-manager-client/pom.xml
index 1d21c6dd1..abc89db91 100644
--- a/dss-appconn/dss-appconn-manager/dss-appconn-manager-client/pom.xml
+++ b/dss-appconn/dss-appconn-manager/dss-appconn-manager-client/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <artifactId>dss</artifactId>
     <groupId>com.webank.wedatasphere.dss</groupId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.4.0-SNAPSHOT</version>
     <relativePath>../../../pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
diff --git a/dss-appconn/dss-appconn-manager/dss-appconn-manager-core/pom.xml b/dss-appconn/dss-appconn-manager/dss-appconn-manager-core/pom.xml
index c3c700044..a3c9a77d9 100644
--- a/dss-appconn/dss-appconn-manager/dss-appconn-manager-core/pom.xml
+++ b/dss-appconn/dss-appconn-manager/dss-appconn-manager-core/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <artifactId>dss</artifactId>
     <groupId>com.webank.wedatasphere.dss</groupId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.4.0-SNAPSHOT</version>
     <relativePath>../../../pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
diff --git a/dss-appconn/dss-appconn-manager/pom.xml b/dss-appconn/dss-appconn-manager/pom.xml
index 0109b84df..c0446b73c 100644
--- a/dss-appconn/dss-appconn-manager/pom.xml
+++ b/dss-appconn/dss-appconn-manager/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <artifactId>dss</artifactId>
     <groupId>com.webank.wedatasphere.dss</groupId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.4.0-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
diff --git a/dss-appconn/dss-scheduler-appconn/pom.xml b/dss-appconn/dss-scheduler-appconn/pom.xml
index 2b68bdfb1..8af05cd20 100644
--- a/dss-appconn/dss-scheduler-appconn/pom.xml
+++ b/dss-appconn/dss-scheduler-appconn/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.4.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-appconn/linkis-appconn-engineplugin/pom.xml b/dss-appconn/linkis-appconn-engineplugin/pom.xml
index 5dee47a82..f92ec4939 100644
--- a/dss-appconn/linkis-appconn-engineplugin/pom.xml
+++ b/dss-appconn/linkis-appconn-engineplugin/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.4.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-appconn/pom.xml b/dss-appconn/pom.xml
index 7263fc63b..f4ef30de2 100644
--- a/dss-appconn/pom.xml
+++ b/dss-appconn/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.4.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-apps/dss-apiservice-server/pom.xml b/dss-apps/dss-apiservice-server/pom.xml
index 44a22b715..067de7f2c 100644
--- a/dss-apps/dss-apiservice-server/pom.xml
+++ b/dss-apps/dss-apiservice-server/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.4.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-apps/dss-apps-server/pom.xml b/dss-apps/dss-apps-server/pom.xml
index 2b2f7a7e0..0e90117d8 100644
--- a/dss-apps/dss-apps-server/pom.xml
+++ b/dss-apps/dss-apps-server/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.4.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-apps/dss-data-api/pom.xml b/dss-apps/dss-data-api/pom.xml
index 495848168..6418d5529 100644
--- a/dss-apps/dss-data-api/pom.xml
+++ b/dss-apps/dss-data-api/pom.xml
@@ -6,7 +6,7 @@
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
         <relativePath>../../pom.xml</relativePath>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.4.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>dss-data-api</artifactId>
diff --git a/dss-apps/dss-data-governance/pom.xml b/dss-apps/dss-data-governance/pom.xml
index 518d5c4b5..3f58ac305 100644
--- a/dss-apps/dss-data-governance/pom.xml
+++ b/dss-apps/dss-data-governance/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.4.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-apps/dss-scriptis-server/pom.xml b/dss-apps/dss-scriptis-server/pom.xml
index a19355c4e..4c8c89b21 100644
--- a/dss-apps/dss-scriptis-server/pom.xml
+++ b/dss-apps/dss-scriptis-server/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.4.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/dss-apps/dss-user-guide/dss-user-guide-server/pom.xml b/dss-apps/dss-user-guide/dss-user-guide-server/pom.xml
index 6abe4623b..f3f3f74b2 100644
--- a/dss-apps/dss-user-guide/dss-user-guide-server/pom.xml
+++ b/dss-apps/dss-user-guide/dss-user-guide-server/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>dss-user-guide</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.4.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-apps/dss-user-guide/pom.xml b/dss-apps/dss-user-guide/pom.xml
index b846084dc..4acf24981 100644
--- a/dss-apps/dss-user-guide/pom.xml
+++ b/dss-apps/dss-user-guide/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.4.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-apps/pom.xml b/dss-apps/pom.xml
index ba57e2bca..c9216e973 100644
--- a/dss-apps/pom.xml
+++ b/dss-apps/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.4.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-commons/dss-common/pom.xml b/dss-commons/dss-common/pom.xml
index 25c083351..c11c9b56e 100644
--- a/dss-commons/dss-common/pom.xml
+++ b/dss-commons/dss-common/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <artifactId>dss-commons</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.4.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>dss-common</artifactId>
diff --git a/dss-commons/dss-contextservice/pom.xml b/dss-commons/dss-contextservice/pom.xml
index 609ca270d..3e402fdbb 100644
--- a/dss-commons/dss-contextservice/pom.xml
+++ b/dss-commons/dss-contextservice/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss-commons</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.4.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>dss-contextservice</artifactId>
diff --git a/dss-commons/dss-sender-service/pom.xml b/dss-commons/dss-sender-service/pom.xml
index 7da4725fe..0a4ad14f1 100644
--- a/dss-commons/dss-sender-service/pom.xml
+++ b/dss-commons/dss-sender-service/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss-commons</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.4.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-commons/pom.xml b/dss-commons/pom.xml
index a80e4fba5..836f5021e 100644
--- a/dss-commons/pom.xml
+++ b/dss-commons/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.4.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-framework/dss-appconn-framework/pom.xml b/dss-framework/dss-appconn-framework/pom.xml
index bfb9babb3..848664766 100644
--- a/dss-framework/dss-appconn-framework/pom.xml
+++ b/dss-framework/dss-appconn-framework/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.4.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-framework/dss-framework-admin-service/pom.xml b/dss-framework/dss-framework-admin-service/pom.xml
index a28b224d0..8cb0f1c02 100644
--- a/dss-framework/dss-framework-admin-service/pom.xml
+++ b/dss-framework/dss-framework-admin-service/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.4.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/dss-framework/dss-framework-common/pom.xml b/dss-framework/dss-framework-common/pom.xml
index 1fa4aed33..95da643a7 100644
--- a/dss-framework/dss-framework-common/pom.xml
+++ b/dss-framework/dss-framework-common/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.4.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-framework/dss-framework-orchestrator-server/pom.xml b/dss-framework/dss-framework-orchestrator-server/pom.xml
index cbc2b1fc1..686eb4e23 100644
--- a/dss-framework/dss-framework-orchestrator-server/pom.xml
+++ b/dss-framework/dss-framework-orchestrator-server/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.4.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-framework/dss-framework-project-server/pom.xml b/dss-framework/dss-framework-project-server/pom.xml
index ec328f17c..d40dc3e02 100644
--- a/dss-framework/dss-framework-project-server/pom.xml
+++ b/dss-framework/dss-framework-project-server/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.4.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-framework/dss-framework-proxy-user-service/pom.xml b/dss-framework/dss-framework-proxy-user-service/pom.xml
index 15b287af3..6f2bc3acf 100644
--- a/dss-framework/dss-framework-proxy-user-service/pom.xml
+++ b/dss-framework/dss-framework-proxy-user-service/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>dss-framework</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.4.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/dss-framework/dss-framework-workspace-server/pom.xml b/dss-framework/dss-framework-workspace-server/pom.xml
index 4fad67608..de599f111 100644
--- a/dss-framework/dss-framework-workspace-server/pom.xml
+++ b/dss-framework/dss-framework-workspace-server/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.4.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-framework/framework-plugins/dss-framework-migrate-server/pom.xml b/dss-framework/framework-plugins/dss-framework-migrate-server/pom.xml
index 748dd085e..e50467f80 100644
--- a/dss-framework/framework-plugins/dss-framework-migrate-server/pom.xml
+++ b/dss-framework/framework-plugins/dss-framework-migrate-server/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.4.0-SNAPSHOT</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-framework/framework-plugins/dss-framework-orchestrator-publish/pom.xml b/dss-framework/framework-plugins/dss-framework-orchestrator-publish/pom.xml
index 870d2aeb7..265a1eae3 100644
--- a/dss-framework/framework-plugins/dss-framework-orchestrator-publish/pom.xml
+++ b/dss-framework/framework-plugins/dss-framework-orchestrator-publish/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.4.0-SNAPSHOT</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-framework/pom.xml b/dss-framework/pom.xml
index ccf70b32c..3bc9f0d5c 100644
--- a/dss-framework/pom.xml
+++ b/dss-framework/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.4.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-orchestrator/dss-orchestrator-common/pom.xml b/dss-orchestrator/dss-orchestrator-common/pom.xml
index 0a1cc58e8..80f8c5cc6 100644
--- a/dss-orchestrator/dss-orchestrator-common/pom.xml
+++ b/dss-orchestrator/dss-orchestrator-common/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.4.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-orchestrator/dss-orchestrator-conversion-standard/pom.xml b/dss-orchestrator/dss-orchestrator-conversion-standard/pom.xml
index 03b599b76..db2a14fa1 100644
--- a/dss-orchestrator/dss-orchestrator-conversion-standard/pom.xml
+++ b/dss-orchestrator/dss-orchestrator-conversion-standard/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <artifactId>dss-orchestrator</artifactId>
     <groupId>com.webank.wedatasphere.dss</groupId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.4.0-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
diff --git a/dss-orchestrator/dss-orchestrator-core/pom.xml b/dss-orchestrator/dss-orchestrator-core/pom.xml
index 0800a82b3..82144eee5 100644
--- a/dss-orchestrator/dss-orchestrator-core/pom.xml
+++ b/dss-orchestrator/dss-orchestrator-core/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.4.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-orchestrator/dss-orchestrator-db/pom.xml b/dss-orchestrator/dss-orchestrator-db/pom.xml
index c08ab2c26..704058daa 100644
--- a/dss-orchestrator/dss-orchestrator-db/pom.xml
+++ b/dss-orchestrator/dss-orchestrator-db/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.4.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-orchestrator/dss-orchestrator-loader/pom.xml b/dss-orchestrator/dss-orchestrator-loader/pom.xml
index def0b8abf..d22795426 100644
--- a/dss-orchestrator/dss-orchestrator-loader/pom.xml
+++ b/dss-orchestrator/dss-orchestrator-loader/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.4.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-orchestrator/orchestrators/dss-workflow/dss-flow-execution-server/pom.xml b/dss-orchestrator/orchestrators/dss-workflow/dss-flow-execution-server/pom.xml
index 96b081036..01852a155 100644
--- a/dss-orchestrator/orchestrators/dss-workflow/dss-flow-execution-server/pom.xml
+++ b/dss-orchestrator/orchestrators/dss-workflow/dss-flow-execution-server/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.4.0-SNAPSHOT</version>
         <relativePath>../../../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-orchestrator/orchestrators/dss-workflow/dss-linkis-node-execution/pom.xml b/dss-orchestrator/orchestrators/dss-workflow/dss-linkis-node-execution/pom.xml
index 2ffc52852..4a425891e 100644
--- a/dss-orchestrator/orchestrators/dss-workflow/dss-linkis-node-execution/pom.xml
+++ b/dss-orchestrator/orchestrators/dss-workflow/dss-linkis-node-execution/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.4.0-SNAPSHOT</version>
         <relativePath>../../../../pom.xml</relativePath>
     </parent>
     
diff --git a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-common/pom.xml b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-common/pom.xml
index cd49c91df..2e125e97d 100644
--- a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-common/pom.xml
+++ b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-common/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.4.0-SNAPSHOT</version>
         <relativePath>../../../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-conversion-standard/pom.xml b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-conversion-standard/pom.xml
index 8c42962f9..c51ed75d6 100644
--- a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-conversion-standard/pom.xml
+++ b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-conversion-standard/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <artifactId>dss-workflow</artifactId>
     <groupId>com.webank.wedatasphere.dss</groupId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.4.0-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
diff --git a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-sdk/pom.xml b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-sdk/pom.xml
index 0e0cab938..1be26678a 100644
--- a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-sdk/pom.xml
+++ b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-sdk/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss-workflow</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.4.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/pom.xml b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/pom.xml
index e13d9ea48..744b16541 100644
--- a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/pom.xml
+++ b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.4.0-SNAPSHOT</version>
         <relativePath>../../../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-orchestrator/orchestrators/dss-workflow/pom.xml b/dss-orchestrator/orchestrators/dss-workflow/pom.xml
index 6c2c41c59..e6d41cf0f 100644
--- a/dss-orchestrator/orchestrators/dss-workflow/pom.xml
+++ b/dss-orchestrator/orchestrators/dss-workflow/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.4.0-SNAPSHOT</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-orchestrator/pom.xml b/dss-orchestrator/pom.xml
index d382731d5..1ddb1076c 100644
--- a/dss-orchestrator/pom.xml
+++ b/dss-orchestrator/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.4.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-server/pom.xml b/dss-server/pom.xml
index fd3087ebd..6f44bb486 100644
--- a/dss-server/pom.xml
+++ b/dss-server/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.4.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-standard/development-standard/development-process-standard-execution/pom.xml b/dss-standard/development-standard/development-process-standard-execution/pom.xml
index bdbdc445c..1038a86cb 100644
--- a/dss-standard/development-standard/development-process-standard-execution/pom.xml
+++ b/dss-standard/development-standard/development-process-standard-execution/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <artifactId>dss</artifactId>
     <groupId>com.webank.wedatasphere.dss</groupId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.4.0-SNAPSHOT</version>
     <relativePath>../../../pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
diff --git a/dss-standard/development-standard/development-process-standard/pom.xml b/dss-standard/development-standard/development-process-standard/pom.xml
index e1d9fc919..f80a3f6c2 100644
--- a/dss-standard/development-standard/development-process-standard/pom.xml
+++ b/dss-standard/development-standard/development-process-standard/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <artifactId>dss</artifactId>
     <groupId>com.webank.wedatasphere.dss</groupId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.4.0-SNAPSHOT</version>
     <relativePath>../../../pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
diff --git a/dss-standard/dss-standard-common/pom.xml b/dss-standard/dss-standard-common/pom.xml
index d38704d2d..545f60e87 100644
--- a/dss-standard/dss-standard-common/pom.xml
+++ b/dss-standard/dss-standard-common/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <artifactId>dss</artifactId>
     <groupId>com.webank.wedatasphere.dss</groupId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.4.0-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
diff --git a/dss-standard/pom.xml b/dss-standard/pom.xml
index 4d9c40b2f..a6d5c622c 100644
--- a/dss-standard/pom.xml
+++ b/dss-standard/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <artifactId>dss</artifactId>
     <groupId>com.webank.wedatasphere.dss</groupId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.4.0-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
diff --git a/dss-standard/sso-standard/origin-sso-integration-standard/pom.xml b/dss-standard/sso-standard/origin-sso-integration-standard/pom.xml
index b1de51004..bfa1ff9ae 100644
--- a/dss-standard/sso-standard/origin-sso-integration-standard/pom.xml
+++ b/dss-standard/sso-standard/origin-sso-integration-standard/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <artifactId>dss</artifactId>
     <groupId>com.webank.wedatasphere.dss</groupId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.4.0-SNAPSHOT</version>
     <relativePath>../../../pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
diff --git a/dss-standard/sso-standard/spring-origin-sso-integration-plugin/pom.xml b/dss-standard/sso-standard/spring-origin-sso-integration-plugin/pom.xml
index 59a80b2b0..3710cbb1f 100644
--- a/dss-standard/sso-standard/spring-origin-sso-integration-plugin/pom.xml
+++ b/dss-standard/sso-standard/spring-origin-sso-integration-plugin/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <artifactId>dss</artifactId>
     <groupId>com.webank.wedatasphere.dss</groupId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.4.0-SNAPSHOT</version>
     <relativePath>../../../pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
diff --git a/dss-standard/sso-standard/sso-integration-standard/pom.xml b/dss-standard/sso-standard/sso-integration-standard/pom.xml
index f2d1da996..e8810b36a 100644
--- a/dss-standard/sso-standard/sso-integration-standard/pom.xml
+++ b/dss-standard/sso-standard/sso-integration-standard/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <artifactId>dss</artifactId>
     <groupId>com.webank.wedatasphere.dss</groupId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.4.0-SNAPSHOT</version>
     <relativePath>../../../pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
diff --git a/dss-standard/structure-standard/dss-project-plugin/pom.xml b/dss-standard/structure-standard/dss-project-plugin/pom.xml
index 70fd9bbaf..ced6b625c 100644
--- a/dss-standard/structure-standard/dss-project-plugin/pom.xml
+++ b/dss-standard/structure-standard/dss-project-plugin/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <artifactId>dss</artifactId>
     <groupId>com.webank.wedatasphere.dss</groupId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.4.0-SNAPSHOT</version>
     <relativePath>../../../pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
diff --git a/dss-standard/structure-standard/dss-role-plugin/pom.xml b/dss-standard/structure-standard/dss-role-plugin/pom.xml
index e89f24515..d51742eb3 100644
--- a/dss-standard/structure-standard/dss-role-plugin/pom.xml
+++ b/dss-standard/structure-standard/dss-role-plugin/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <artifactId>dss</artifactId>
     <groupId>com.webank.wedatasphere.dss</groupId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.4.0-SNAPSHOT</version>
     <relativePath>../../../pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
diff --git a/dss-standard/structure-standard/dss-structure-integration-standard/pom.xml b/dss-standard/structure-standard/dss-structure-integration-standard/pom.xml
index a77589b06..5739644a5 100644
--- a/dss-standard/structure-standard/dss-structure-integration-standard/pom.xml
+++ b/dss-standard/structure-standard/dss-structure-integration-standard/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <artifactId>dss</artifactId>
     <groupId>com.webank.wedatasphere.dss</groupId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.4.0-SNAPSHOT</version>
     <relativePath>../../../pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
diff --git a/dss-standard/structure-standard/spring-origin-dss-project-plugin/pom.xml b/dss-standard/structure-standard/spring-origin-dss-project-plugin/pom.xml
index add113d17..445eb6e01 100644
--- a/dss-standard/structure-standard/spring-origin-dss-project-plugin/pom.xml
+++ b/dss-standard/structure-standard/spring-origin-dss-project-plugin/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <artifactId>dss</artifactId>
     <groupId>com.webank.wedatasphere.dss</groupId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.4.0-SNAPSHOT</version>
     <relativePath>../../../pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
diff --git a/plugins/azkaban/linkis-jobtype/pom.xml b/plugins/azkaban/linkis-jobtype/pom.xml
index 4f315b1d5..911f69123 100644
--- a/plugins/azkaban/linkis-jobtype/pom.xml
+++ b/plugins/azkaban/linkis-jobtype/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.4.0-SNAPSHOT</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
     <artifactId>linkis-jobtype</artifactId>
diff --git a/plugins/dolphinscheduler/dolphinscheduler-prod-metrics/pom.xml b/plugins/dolphinscheduler/dolphinscheduler-prod-metrics/pom.xml
index 7ba8ad2ba..ed7f4242c 100644
--- a/plugins/dolphinscheduler/dolphinscheduler-prod-metrics/pom.xml
+++ b/plugins/dolphinscheduler/dolphinscheduler-prod-metrics/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <artifactId>dss-plugin-dolphinscheduler</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.4.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/plugins/dolphinscheduler/dss-dolphinscheduler-client/pom.xml b/plugins/dolphinscheduler/dss-dolphinscheduler-client/pom.xml
index 86efe3cc3..111f0cc35 100644
--- a/plugins/dolphinscheduler/dss-dolphinscheduler-client/pom.xml
+++ b/plugins/dolphinscheduler/dss-dolphinscheduler-client/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <artifactId>dss-plugin-dolphinscheduler</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.4.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/plugins/dolphinscheduler/dss-dolphinscheduler-token/pom.xml b/plugins/dolphinscheduler/dss-dolphinscheduler-token/pom.xml
index 8d01963a3..662af2bb8 100644
--- a/plugins/dolphinscheduler/dss-dolphinscheduler-token/pom.xml
+++ b/plugins/dolphinscheduler/dss-dolphinscheduler-token/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <artifactId>dss-plugin-dolphinscheduler</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.4.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/plugins/dolphinscheduler/pom.xml b/plugins/dolphinscheduler/pom.xml
index b9e7d6c4d..2475423bb 100644
--- a/plugins/dolphinscheduler/pom.xml
+++ b/plugins/dolphinscheduler/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <artifactId>dss</artifactId>
     <groupId>com.webank.wedatasphere.dss</groupId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.4.0-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
diff --git a/plugins/linkis/dss-gateway-support/pom.xml b/plugins/linkis/dss-gateway-support/pom.xml
index a1a55c5e2..9be8eb18b 100644
--- a/plugins/linkis/dss-gateway-support/pom.xml
+++ b/plugins/linkis/dss-gateway-support/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.4.0-SNAPSHOT</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/pom.xml b/pom.xml
index 1e015152e..d5f0ee182 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
     <packaging>pom</packaging>
     <groupId>com.webank.wedatasphere.dss</groupId>
     <artifactId>dss</artifactId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.4.0-SNAPSHOT</version>
 
     <modules>
         <module>dss-commons</module>
@@ -40,7 +40,7 @@
     </modules>
 
     <properties>
-        <dss.version>1.3.0-SNAPSHOT</dss.version>
+        <dss.version>1.4.0-SNAPSHOT</dss.version>
         <linkis.version>1.3.0-wds-SNAPSHOT</linkis.version>
         <scala.version>2.11.12</scala.version>
         <jdk.compile.version>1.8</jdk.compile.version>

From 0d5a0fe27d1b27c4449f6e53d4ef8c7409fb3e8a Mon Sep 17 00:00:00 2001
From: SunpengWan <825559776@qq.com>
Date: Fri, 26 Apr 2024 15:39:36 +0800
Subject: [PATCH 067/302] update pom version to 1.4.0-SNAPSHOT

---
 dss-apps/dss-data-api/dss-api-sql-template/pom.xml              | 2 +-
 dss-apps/dss-data-api/dss-data-api-server/pom.xml               | 2 +-
 dss-apps/dss-data-governance/dss-data-asset-server/pom.xml      | 2 +-
 .../dss-data-governance/dss-data-classification-server/pom.xml  | 2 +-
 dss-apps/dss-data-governance/dss-data-governance-common/pom.xml | 2 +-
 dss-apps/dss-data-governance/dss-data-governance-server/pom.xml | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/dss-apps/dss-data-api/dss-api-sql-template/pom.xml b/dss-apps/dss-data-api/dss-api-sql-template/pom.xml
index 7e11ed57d..f7caf18a4 100644
--- a/dss-apps/dss-data-api/dss-api-sql-template/pom.xml
+++ b/dss-apps/dss-data-api/dss-api-sql-template/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.4.0-SNAPSHOT</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-apps/dss-data-api/dss-data-api-server/pom.xml b/dss-apps/dss-data-api/dss-data-api-server/pom.xml
index 5e750f390..e4a1ab481 100644
--- a/dss-apps/dss-data-api/dss-data-api-server/pom.xml
+++ b/dss-apps/dss-data-api/dss-data-api-server/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.4.0-SNAPSHOT</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-apps/dss-data-governance/dss-data-asset-server/pom.xml b/dss-apps/dss-data-governance/dss-data-asset-server/pom.xml
index 228230a27..4547f4025 100644
--- a/dss-apps/dss-data-governance/dss-data-asset-server/pom.xml
+++ b/dss-apps/dss-data-governance/dss-data-asset-server/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.4.0-SNAPSHOT</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-apps/dss-data-governance/dss-data-classification-server/pom.xml b/dss-apps/dss-data-governance/dss-data-classification-server/pom.xml
index 81d514854..60190c7b5 100644
--- a/dss-apps/dss-data-governance/dss-data-classification-server/pom.xml
+++ b/dss-apps/dss-data-governance/dss-data-classification-server/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.4.0-SNAPSHOT</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-apps/dss-data-governance/dss-data-governance-common/pom.xml b/dss-apps/dss-data-governance/dss-data-governance-common/pom.xml
index 37fc5b070..39c5f1684 100644
--- a/dss-apps/dss-data-governance/dss-data-governance-common/pom.xml
+++ b/dss-apps/dss-data-governance/dss-data-governance-common/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.4.0-SNAPSHOT</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-apps/dss-data-governance/dss-data-governance-server/pom.xml b/dss-apps/dss-data-governance/dss-data-governance-server/pom.xml
index 47017b4d4..37f939a0f 100644
--- a/dss-apps/dss-data-governance/dss-data-governance-server/pom.xml
+++ b/dss-apps/dss-data-governance/dss-data-governance-server/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.4.0-SNAPSHOT</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

From 9ace5d59cc463db7e7660fc1e5de9971fa17105f Mon Sep 17 00:00:00 2001
From: qweqnotallow <747839893@qq.com>
Date: Fri, 26 Apr 2024 17:53:27 +0800
Subject: [PATCH 068/302] git server add associateGit; framework server remove
 associateGit

---
 .../dss-framework-workspace-server/pom.xml    |  7 +++
 .../restful/DSSWorkspaceRestful.java          | 38 ++++++++----
 .../service/DSSWorkspaceGitService.java       | 10 ---
 .../impl/DSSWorkspaceGitServiceImpl.java      | 33 ----------
 .../protocol}/GitUserEntity.java              | 47 +++++++++-----
 .../protocol/request/GitUserInfoRequest.java  | 26 ++++++++
 .../request/GitUserUpdateRequest.java         | 25 ++++++++
 .../response/GitUserInfoResponse.java         | 16 +++++
 .../response/GitUserUpdateResponse.java       | 23 +++++++
 dss-git/dss-git-server/pom.xml                |  8 ++-
 .../dss/git/constant/DSSGitConstant.java      |  2 +
 .../dss/git}/dao/DSSWorkspaceGitMapper.java   |  7 ++-
 .../git}/dao/impl/DSSWorkspaceGitMapper.xml   | 33 +++++++---
 .../git/service/DSSWorkspaceGitService.java   | 17 ++++++
 .../impl/DSSGitProjectManagerServiceImpl.java | 11 ++--
 .../DSSGitWorkflowManagerServiceImpl.java     | 15 ++---
 .../impl/DSSWorkspaceGitServiceImpl.java      | 61 +++++++++++++++++++
 .../dss/git/utils/DSSGitUtils.java            |  4 +-
 .../receiver/DSSGitChooser.scala              | 13 ++--
 .../receiver/DSSGitReceiver.scala             | 13 ++--
 20 files changed, 304 insertions(+), 105 deletions(-)
 delete mode 100644 dss-framework/dss-framework-workspace-server/src/main/java/com/webank/wedatasphere/dss/framework/workspace/service/DSSWorkspaceGitService.java
 delete mode 100644 dss-framework/dss-framework-workspace-server/src/main/java/com/webank/wedatasphere/dss/framework/workspace/service/impl/DSSWorkspaceGitServiceImpl.java
 rename {dss-framework/dss-framework-workspace-server/src/main/java/com/webank/wedatasphere/dss/framework/workspace/bean => dss-git/dss-git-common/src/main/java/com.webank.wedatasphere.dss.git.common/protocol}/GitUserEntity.java (71%)
 create mode 100644 dss-git/dss-git-common/src/main/java/com.webank.wedatasphere.dss.git.common/protocol/request/GitUserInfoRequest.java
 create mode 100644 dss-git/dss-git-common/src/main/java/com.webank.wedatasphere.dss.git.common/protocol/request/GitUserUpdateRequest.java
 create mode 100644 dss-git/dss-git-common/src/main/java/com.webank.wedatasphere.dss.git.common/protocol/response/GitUserInfoResponse.java
 create mode 100644 dss-git/dss-git-common/src/main/java/com.webank.wedatasphere.dss.git.common/protocol/response/GitUserUpdateResponse.java
 rename {dss-framework/dss-framework-workspace-server/src/main/java/com/webank/wedatasphere/dss/framework/workspace => dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git}/dao/DSSWorkspaceGitMapper.java (64%)
 rename {dss-framework/dss-framework-workspace-server/src/main/java/com/webank/wedatasphere/dss/framework/workspace => dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git}/dao/impl/DSSWorkspaceGitMapper.xml (52%)
 create mode 100644 dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/DSSWorkspaceGitService.java
 create mode 100644 dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSWorkspaceGitServiceImpl.java

diff --git a/dss-framework/dss-framework-workspace-server/pom.xml b/dss-framework/dss-framework-workspace-server/pom.xml
index 8ce86cd04..592aee6ca 100644
--- a/dss-framework/dss-framework-workspace-server/pom.xml
+++ b/dss-framework/dss-framework-workspace-server/pom.xml
@@ -45,6 +45,13 @@
             <scope>provided</scope>
         </dependency>
 
+        <dependency>
+            <groupId>com.webank.wedatasphere.dss</groupId>
+            <artifactId>dss-git-common</artifactId>
+            <version>${dss.version}</version>
+            <scope>provided</scope>
+        </dependency>
+
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-lang3</artifactId>
diff --git a/dss-framework/dss-framework-workspace-server/src/main/java/com/webank/wedatasphere/dss/framework/workspace/restful/DSSWorkspaceRestful.java b/dss-framework/dss-framework-workspace-server/src/main/java/com/webank/wedatasphere/dss/framework/workspace/restful/DSSWorkspaceRestful.java
index 62a441d60..de0cea7d4 100644
--- a/dss-framework/dss-framework-workspace-server/src/main/java/com/webank/wedatasphere/dss/framework/workspace/restful/DSSWorkspaceRestful.java
+++ b/dss-framework/dss-framework-workspace-server/src/main/java/com/webank/wedatasphere/dss/framework/workspace/restful/DSSWorkspaceRestful.java
@@ -21,30 +21,37 @@
 import com.webank.wedatasphere.dss.common.exception.DSSErrorException;
 import com.webank.wedatasphere.dss.common.utils.AuditLogUtils;
 import com.webank.wedatasphere.dss.common.utils.DSSCommonUtils;
+import com.webank.wedatasphere.dss.common.utils.RpcAskUtils;
 import com.webank.wedatasphere.dss.framework.admin.service.DssAdminUserService;
 import com.webank.wedatasphere.dss.framework.workspace.bean.DSSWorkspace;
-import com.webank.wedatasphere.dss.framework.workspace.bean.GitUserEntity;
 import com.webank.wedatasphere.dss.framework.workspace.bean.dto.response.WorkspaceFavoriteVo;
 import com.webank.wedatasphere.dss.framework.workspace.bean.dto.response.WorkspaceMenuVo;
 import com.webank.wedatasphere.dss.framework.workspace.bean.request.CreateWorkspaceRequest;
 import com.webank.wedatasphere.dss.framework.workspace.bean.vo.DSSWorkspaceHomePageVO;
 import com.webank.wedatasphere.dss.framework.workspace.bean.vo.DSSWorkspaceOverviewVO;
 import com.webank.wedatasphere.dss.framework.workspace.bean.vo.DSSWorkspaceVO;
-import com.webank.wedatasphere.dss.framework.workspace.service.DSSWorkspaceGitService;
 import com.webank.wedatasphere.dss.framework.workspace.service.DSSWorkspaceRoleService;
 import com.webank.wedatasphere.dss.framework.workspace.service.DSSWorkspaceService;
 import com.webank.wedatasphere.dss.framework.workspace.util.WorkspaceDBHelper;
 import com.webank.wedatasphere.dss.framework.workspace.util.WorkspaceUtils;
+import com.webank.wedatasphere.dss.git.common.protocol.GitUserEntity;
+import com.webank.wedatasphere.dss.git.common.protocol.request.GitUserInfoRequest;
+import com.webank.wedatasphere.dss.git.common.protocol.request.GitUserUpdateRequest;
+import com.webank.wedatasphere.dss.git.common.protocol.response.GitUserInfoResponse;
+import com.webank.wedatasphere.dss.git.common.protocol.response.GitUserUpdateResponse;
+import com.webank.wedatasphere.dss.sender.service.DSSSenderServiceFactory;
 import com.webank.wedatasphere.dss.standard.app.sso.Workspace;
 import com.webank.wedatasphere.dss.standard.common.exception.AppStandardWarnException;
 import com.webank.wedatasphere.dss.standard.sso.utils.SSOHelper;
 import org.apache.linkis.common.exception.ErrorException;
+import org.apache.linkis.rpc.Sender;
 import org.apache.linkis.server.Message;
 import org.apache.linkis.server.security.SecurityFilter;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
+import org.springframework.util.StringUtils;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
@@ -74,9 +81,6 @@ public class DSSWorkspaceRestful {
     @Autowired
     private HttpServletResponse httpServletResponse;
 
-    @Autowired
-    private DSSWorkspaceGitService dssWorkspaceGitService;
-
     @RequestMapping(path = "createWorkspace", method = RequestMethod.POST)
     public Message createWorkspace(@RequestBody CreateWorkspaceRequest createWorkspaceRequest) throws ErrorException {
         String userName = SecurityFilter.getLoginUsername(httpServletRequest);
@@ -339,17 +343,29 @@ public Message deleteFavorite(@PathVariable("workspaceId") Long workspaceId, @Pa
         return Message.ok().data("favoriteId", favoriteId);
     }
 
-    @RequestMapping(path = "/workspaces/git", method = RequestMethod.POST)
-    public Message associateGit(@RequestBody GitUserEntity gitUser) {
+    @RequestMapping(path = "git", method = RequestMethod.POST)
+    public Message associateGit(@RequestBody com.webank.wedatasphere.dss.git.common.protocol.GitUserEntity gitUser) {
         String username = SecurityFilter.getLoginUsername(httpServletRequest);
-        dssWorkspaceGitService.associateGit(gitUser, username);
+        if (StringUtils.isEmpty(gitUser.getType())) {
+            return Message.error("需指定当前帐号配置读写权限");
+        }
+        Sender gitSender = DSSSenderServiceFactory.getOrCreateServiceInstance().getGitSender();
+        GitUserUpdateRequest gitUserUpdateRequest = new GitUserUpdateRequest();
+        gitUserUpdateRequest.setGitUser(gitUser);
+        gitUserUpdateRequest.setUsername(username);
+        GitUserUpdateResponse response = RpcAskUtils.processAskException(gitSender.ask(gitUserUpdateRequest), GitUserUpdateResponse.class, GitUserUpdateRequest.class);
         return Message.ok();
     }
 
-    @RequestMapping(path = "/workspaces/git", method = RequestMethod.GET)
-    public Message selectGit(@RequestParam Long workspaceId) {
+    @RequestMapping(path = "git", method = RequestMethod.GET)
+    public Message selectGit(@RequestParam Long workspaceId, @RequestParam String type) {
         String username = SecurityFilter.getLoginUsername(httpServletRequest);
-        GitUserEntity gitUser = dssWorkspaceGitService.selectGit(workspaceId);
+        Sender gitSender = DSSSenderServiceFactory.getOrCreateServiceInstance().getGitSender();
+        GitUserInfoRequest gitUserInfoRequest = new GitUserInfoRequest();
+        gitUserInfoRequest.setWorkspaceId(workspaceId);
+        gitUserInfoRequest.setType(type);
+        GitUserInfoResponse response = RpcAskUtils.processAskException(gitSender.ask(gitUserInfoRequest), GitUserInfoResponse.class, GitUserInfoRequest.class);
+        GitUserEntity gitUser = response.getGitUser();
         return Message.ok().data("gitUser", gitUser);
     }
 
diff --git a/dss-framework/dss-framework-workspace-server/src/main/java/com/webank/wedatasphere/dss/framework/workspace/service/DSSWorkspaceGitService.java b/dss-framework/dss-framework-workspace-server/src/main/java/com/webank/wedatasphere/dss/framework/workspace/service/DSSWorkspaceGitService.java
deleted file mode 100644
index 8248d79ac..000000000
--- a/dss-framework/dss-framework-workspace-server/src/main/java/com/webank/wedatasphere/dss/framework/workspace/service/DSSWorkspaceGitService.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package com.webank.wedatasphere.dss.framework.workspace.service;
-
-import com.webank.wedatasphere.dss.framework.workspace.bean.GitUserEntity;
-
-public interface DSSWorkspaceGitService {
-
-    void associateGit(GitUserEntity gitUser, String userName);
-
-    GitUserEntity selectGit(Long workspaceId);
-}
diff --git a/dss-framework/dss-framework-workspace-server/src/main/java/com/webank/wedatasphere/dss/framework/workspace/service/impl/DSSWorkspaceGitServiceImpl.java b/dss-framework/dss-framework-workspace-server/src/main/java/com/webank/wedatasphere/dss/framework/workspace/service/impl/DSSWorkspaceGitServiceImpl.java
deleted file mode 100644
index 0ce4e3c4d..000000000
--- a/dss-framework/dss-framework-workspace-server/src/main/java/com/webank/wedatasphere/dss/framework/workspace/service/impl/DSSWorkspaceGitServiceImpl.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package com.webank.wedatasphere.dss.framework.workspace.service.impl;
-
-import com.webank.wedatasphere.dss.framework.workspace.bean.GitUserEntity;
-import com.webank.wedatasphere.dss.framework.workspace.dao.DSSWorkspaceGitMapper;
-import com.webank.wedatasphere.dss.framework.workspace.service.DSSWorkspaceGitService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-@Service
-public class DSSWorkspaceGitServiceImpl implements DSSWorkspaceGitService {
-
-    @Autowired
-    private DSSWorkspaceGitMapper workspaceGitMapper;
-
-
-    @Override
-    public void associateGit(GitUserEntity gitUser, String userName) {
-        // 不存在则更新，存在则新增
-        GitUserEntity oldGitUserDo = selectGit(gitUser.getWorkspaceId());
-        gitUser.setUpdateBy(userName);
-        if (oldGitUserDo == null) {
-            gitUser.setCreateBy(userName);
-            workspaceGitMapper.insert(gitUser);
-        }else {
-            workspaceGitMapper.update(gitUser);
-        }
-    }
-
-    @Override
-    public GitUserEntity selectGit(Long workspaceId) {
-        return workspaceGitMapper.selectByWorkspaceId(workspaceId);
-    }
-}
diff --git a/dss-framework/dss-framework-workspace-server/src/main/java/com/webank/wedatasphere/dss/framework/workspace/bean/GitUserEntity.java b/dss-git/dss-git-common/src/main/java/com.webank.wedatasphere.dss.git.common/protocol/GitUserEntity.java
similarity index 71%
rename from dss-framework/dss-framework-workspace-server/src/main/java/com/webank/wedatasphere/dss/framework/workspace/bean/GitUserEntity.java
rename to dss-git/dss-git-common/src/main/java/com.webank.wedatasphere.dss.git.common/protocol/GitUserEntity.java
index 0f5961118..7d177c641 100644
--- a/dss-framework/dss-framework-workspace-server/src/main/java/com/webank/wedatasphere/dss/framework/workspace/bean/GitUserEntity.java
+++ b/dss-git/dss-git-common/src/main/java/com.webank.wedatasphere.dss.git.common/protocol/GitUserEntity.java
@@ -1,4 +1,4 @@
-package com.webank.wedatasphere.dss.framework.workspace.bean;
+package com.webank.wedatasphere.dss.git.common.protocol;
 
 
 import java.util.Date;
@@ -7,30 +7,21 @@ public class GitUserEntity {
     private Long id;
     private Long workspaceId;
     private String gitUser;
+    private String gitPassword;
+    private String gitUrl;
     private String gitToken;
     private Date createTime;
     private Date updateTime;
     private String createBy;
     private String updateBy;
+    /**
+     * read-只读、write-编辑权限
+     */
+    private String type;
 
     public GitUserEntity() {
     }
 
-    public GitUserEntity(Long workspaceId, String gitUser, String gitToken, String updateBy) {
-        this.workspaceId = workspaceId;
-        this.gitUser = gitUser;
-        this.gitToken = gitToken;
-        this.updateBy = updateBy;
-    }
-
-    public GitUserEntity(Long workspaceId, String gitUser, String gitToken, String createBy, String updateBy) {
-        this.workspaceId = workspaceId;
-        this.gitUser = gitUser;
-        this.gitToken = gitToken;
-        this.createBy = createBy;
-        this.updateBy = updateBy;
-    }
-
     public Long getId() {
         return id;
     }
@@ -94,4 +85,28 @@ public String getUpdateBy() {
     public void setUpdateBy(String updateBy) {
         this.updateBy = updateBy;
     }
+
+    public String getGitPassword() {
+        return gitPassword;
+    }
+
+    public void setGitPassword(String gitPassword) {
+        this.gitPassword = gitPassword;
+    }
+
+    public String getGitUrl() {
+        return gitUrl;
+    }
+
+    public void setGitUrl(String gitUrl) {
+        this.gitUrl = gitUrl;
+    }
+
+    public String getType() {
+        return type;
+    }
+
+    public void setType(String type) {
+        this.type = type;
+    }
 }
diff --git a/dss-git/dss-git-common/src/main/java/com.webank.wedatasphere.dss.git.common/protocol/request/GitUserInfoRequest.java b/dss-git/dss-git-common/src/main/java/com.webank.wedatasphere.dss.git.common/protocol/request/GitUserInfoRequest.java
new file mode 100644
index 000000000..cce0ae3d2
--- /dev/null
+++ b/dss-git/dss-git-common/src/main/java/com.webank.wedatasphere.dss.git.common/protocol/request/GitUserInfoRequest.java
@@ -0,0 +1,26 @@
+package com.webank.wedatasphere.dss.git.common.protocol.request;
+
+/**
+ * @author zhaobincai
+ * @date 2024/4/26 15:17
+ */
+public class GitUserInfoRequest {
+    private Long workspaceId;
+    private String type;
+
+    public Long getWorkspaceId() {
+        return workspaceId;
+    }
+
+    public void setWorkspaceId(Long workspaceId) {
+        this.workspaceId = workspaceId;
+    }
+
+    public String getType() {
+        return type;
+    }
+
+    public void setType(String type) {
+        this.type = type;
+    }
+}
diff --git a/dss-git/dss-git-common/src/main/java/com.webank.wedatasphere.dss.git.common/protocol/request/GitUserUpdateRequest.java b/dss-git/dss-git-common/src/main/java/com.webank.wedatasphere.dss.git.common/protocol/request/GitUserUpdateRequest.java
new file mode 100644
index 000000000..d3d577b9d
--- /dev/null
+++ b/dss-git/dss-git-common/src/main/java/com.webank.wedatasphere.dss.git.common/protocol/request/GitUserUpdateRequest.java
@@ -0,0 +1,25 @@
+package com.webank.wedatasphere.dss.git.common.protocol.request;
+
+import com.webank.wedatasphere.dss.git.common.protocol.GitUserEntity;
+
+
+public class GitUserUpdateRequest {
+    private GitUserEntity gitUser;
+    private String username;
+
+    public GitUserEntity getGitUser() {
+        return gitUser;
+    }
+
+    public void setGitUser(GitUserEntity gitUser) {
+        this.gitUser = gitUser;
+    }
+
+    public String getUsername() {
+        return username;
+    }
+
+    public void setUsername(String username) {
+        this.username = username;
+    }
+}
diff --git a/dss-git/dss-git-common/src/main/java/com.webank.wedatasphere.dss.git.common/protocol/response/GitUserInfoResponse.java b/dss-git/dss-git-common/src/main/java/com.webank.wedatasphere.dss.git.common/protocol/response/GitUserInfoResponse.java
new file mode 100644
index 000000000..b31a09ab4
--- /dev/null
+++ b/dss-git/dss-git-common/src/main/java/com.webank.wedatasphere.dss.git.common/protocol/response/GitUserInfoResponse.java
@@ -0,0 +1,16 @@
+package com.webank.wedatasphere.dss.git.common.protocol.response;
+
+import com.webank.wedatasphere.dss.git.common.protocol.GitUserEntity;
+
+
+public class GitUserInfoResponse {
+    private GitUserEntity gitUser;
+
+    public GitUserEntity getGitUser() {
+        return gitUser;
+    }
+
+    public void setGitUser(GitUserEntity gitUser) {
+        this.gitUser = gitUser;
+    }
+}
diff --git a/dss-git/dss-git-common/src/main/java/com.webank.wedatasphere.dss.git.common/protocol/response/GitUserUpdateResponse.java b/dss-git/dss-git-common/src/main/java/com.webank.wedatasphere.dss.git.common/protocol/response/GitUserUpdateResponse.java
new file mode 100644
index 000000000..46dc2b068
--- /dev/null
+++ b/dss-git/dss-git-common/src/main/java/com.webank.wedatasphere.dss.git.common/protocol/response/GitUserUpdateResponse.java
@@ -0,0 +1,23 @@
+package com.webank.wedatasphere.dss.git.common.protocol.response;
+
+
+public class GitUserUpdateResponse {
+    private int status;
+    private String msg;
+
+    public int getStatus() {
+        return status;
+    }
+
+    public void setStatus(int status) {
+        this.status = status;
+    }
+
+    public String getMsg() {
+        return msg;
+    }
+
+    public void setMsg(String msg) {
+        this.msg = msg;
+    }
+}
diff --git a/dss-git/dss-git-server/pom.xml b/dss-git/dss-git-server/pom.xml
index ed9370e1f..f1795d519 100644
--- a/dss-git/dss-git-server/pom.xml
+++ b/dss-git/dss-git-server/pom.xml
@@ -12,10 +12,16 @@
     <artifactId>dss-git-server</artifactId>
 
     <dependencies>
+        <dependency>
+            <groupId>org.apache.linkis</groupId>
+            <artifactId>linkis-mybatis</artifactId>
+            <version>${linkis.version}</version>
+            <scope>provided</scope>
+        </dependency>
         <dependency>
             <groupId>com.webank.wedatasphere.dss</groupId>
             <artifactId>dss-common</artifactId>
-            <version>1.1.0.20-gitflow-SNAPSHOT</version>
+            <version>${dss.version}</version>
         </dependency>
         <dependency>
             <groupId>com.webank.wedatasphere.dss</groupId>
diff --git a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/constant/DSSGitConstant.java b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/constant/DSSGitConstant.java
index 543f8420f..1aae9b250 100644
--- a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/constant/DSSGitConstant.java
+++ b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/constant/DSSGitConstant.java
@@ -8,4 +8,6 @@
 public class DSSGitConstant {
     public static String GIT_PATH_PRE = File.separator + FileUtils.normalizePath(GitServerConfig.GIT_SERVER_PATH.getValue()) + File.separator;
     public static String GIT_PATH_SUFFIX = File.separator + ".git";
+    public static String GIT_ACCESS_WRITE_TYPE = "write";
+    public static String GIT_ACCESS_READ_TYPE = "read";
 }
diff --git a/dss-framework/dss-framework-workspace-server/src/main/java/com/webank/wedatasphere/dss/framework/workspace/dao/DSSWorkspaceGitMapper.java b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/dao/DSSWorkspaceGitMapper.java
similarity index 64%
rename from dss-framework/dss-framework-workspace-server/src/main/java/com/webank/wedatasphere/dss/framework/workspace/dao/DSSWorkspaceGitMapper.java
rename to dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/dao/DSSWorkspaceGitMapper.java
index ec2ec55cd..30d2cb180 100644
--- a/dss-framework/dss-framework-workspace-server/src/main/java/com/webank/wedatasphere/dss/framework/workspace/dao/DSSWorkspaceGitMapper.java
+++ b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/dao/DSSWorkspaceGitMapper.java
@@ -1,6 +1,7 @@
-package com.webank.wedatasphere.dss.framework.workspace.dao;
+package com.webank.wedatasphere.dss.git.dao;
+
+import com.webank.wedatasphere.dss.git.common.protocol.GitUserEntity;
 
-import com.webank.wedatasphere.dss.framework.workspace.bean.GitUserEntity;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -10,5 +11,5 @@ public interface DSSWorkspaceGitMapper {
 
     void update(GitUserEntity gitUserDO);
 
-    GitUserEntity selectByWorkspaceId(@Param("workspaceId") Long workspaceId);
+    GitUserEntity selectByWorkspaceId(@Param("workspaceId") Long workspaceId, @Param("type") String type);
 }
diff --git a/dss-framework/dss-framework-workspace-server/src/main/java/com/webank/wedatasphere/dss/framework/workspace/dao/impl/DSSWorkspaceGitMapper.xml b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/dao/impl/DSSWorkspaceGitMapper.xml
similarity index 52%
rename from dss-framework/dss-framework-workspace-server/src/main/java/com/webank/wedatasphere/dss/framework/workspace/dao/impl/DSSWorkspaceGitMapper.xml
rename to dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/dao/impl/DSSWorkspaceGitMapper.xml
index f852192ae..ad68bc2cb 100644
--- a/dss-framework/dss-framework-workspace-server/src/main/java/com/webank/wedatasphere/dss/framework/workspace/dao/impl/DSSWorkspaceGitMapper.xml
+++ b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/dao/impl/DSSWorkspaceGitMapper.xml
@@ -16,20 +16,35 @@
   -->
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
 
-<mapper namespace="com.webank.wedatasphere.dss.framework.workspace.dao.DSSWorkspaceGitMapper">
-    <insert id="insert" parameterType="com.webank.wedatasphere.dss.framework.workspace.bean.GitUserEntity">
-        insert into dss_workspace_associate_git (workspace_id, git_user, git_token, create_time, update_time, create_by, update_by)
-        VALUES (#{workspaceId}, #{gitUser}, #{gitToken}, now(), now(), #{createBy}, #{updateBy})
+<mapper namespace="com.webank.wedatasphere.dss.git.dao.DSSWorkspaceGitMapper">
+    <insert id="insert" parameterType="com.webank.wedatasphere.dss.git.common.protocol.GitUserEntity">
+        insert into dss_workspace_associate_git (workspace_id, git_user, git_password, git_token, git_url, create_time, update_time, create_by, update_by, type)
+        VALUES (#{workspaceId}, #{gitUser}, #{gitPassword}, #{gitToken}, #{gitUrl}, now(), now(), #{createBy}, #{updateBy}, #{type})
     </insert>
 
-    <update id="update" parameterType="com.webank.wedatasphere.dss.framework.workspace.bean.GitUserEntity">
-        update dss_workspace_associate_git set git_user = #{gitUser}, git_token = #{gitToken} , update_time = now(), update_by = #{updateBy}
-        where workspace_id = #{workspaceId}
+    <update id="update" parameterType="com.webank.wedatasphere.dss.git.common.protocol.GitUserEntity">
+        update dss_workspace_associate_git
+        <set>
+            <if test="gitUser != null">
+                git_user = #{gitUser},
+            </if>
+            <if test="gitPassword != null">
+                git_password = #{gitPassword},
+            </if>
+            <if test="gitToken != null">
+                git_token = #{gitToken},
+            </if>
+            <if test="gitUrl != null">
+                git_url = #{gitUrl},
+            </if>
+            update_by = #{updateBy},
+        </set>
+        where workspace_id = #{workspaceId} and type = #{type}
     </update>
 
-    <select id="selectByWorkspaceId" resultType="com.webank.wedatasphere.dss.framework.workspace.bean.GitUserEntity">
+    <select id="selectByWorkspaceId" resultType="com.webank.wedatasphere.dss.git.common.protocol.GitUserEntity">
         select id, workspace_id, git_user, git_token, create_time, update_time, create_by, update_by
         from dss_workspace_associate_git
-        where workspace_id = #{workspaceId}
+        where workspace_id = #{workspaceId} and `type` = #{type}
     </select>
 </mapper>
\ No newline at end of file
diff --git a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/DSSWorkspaceGitService.java b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/DSSWorkspaceGitService.java
new file mode 100644
index 000000000..7aaa40827
--- /dev/null
+++ b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/DSSWorkspaceGitService.java
@@ -0,0 +1,17 @@
+package com.webank.wedatasphere.dss.git.service;
+
+import com.webank.wedatasphere.dss.common.exception.DSSErrorException;
+import com.webank.wedatasphere.dss.git.common.protocol.GitUserEntity;
+import com.webank.wedatasphere.dss.git.common.protocol.request.GitUserUpdateRequest;
+import com.webank.wedatasphere.dss.git.common.protocol.request.GitUserInfoRequest;
+import com.webank.wedatasphere.dss.git.common.protocol.response.GitUserUpdateResponse;
+import com.webank.wedatasphere.dss.git.common.protocol.response.GitUserInfoResponse;
+
+public interface DSSWorkspaceGitService {
+
+    GitUserUpdateResponse associateGit(GitUserUpdateRequest gitUserCreateRequest) throws DSSErrorException;
+
+    GitUserInfoResponse selectGitUserInfo(GitUserInfoRequest gitUserInfoRequest) throws DSSErrorException;
+
+    GitUserEntity selectGit(Long workspaceId, String type);
+}
diff --git a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitProjectManagerServiceImpl.java b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitProjectManagerServiceImpl.java
index 4daa8f61a..60d4af33b 100644
--- a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitProjectManagerServiceImpl.java
+++ b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitProjectManagerServiceImpl.java
@@ -2,12 +2,13 @@
 
 import com.webank.wedatasphere.dss.common.exception.DSSErrorException;
 import com.webank.wedatasphere.dss.common.service.BMLService;
-import com.webank.wedatasphere.dss.framework.workspace.bean.GitUserEntity;
-import com.webank.wedatasphere.dss.framework.workspace.service.DSSWorkspaceGitService;
+import com.webank.wedatasphere.dss.git.common.protocol.GitUserEntity;
 import com.webank.wedatasphere.dss.git.common.protocol.request.*;
 import com.webank.wedatasphere.dss.git.common.protocol.response.*;
 import com.webank.wedatasphere.dss.git.config.GitServerConfig;
+import com.webank.wedatasphere.dss.git.constant.DSSGitConstant;
 import com.webank.wedatasphere.dss.git.service.DSSGitProjectManagerService;
+import com.webank.wedatasphere.dss.git.service.DSSWorkspaceGitService;
 import com.webank.wedatasphere.dss.git.utils.DSSGitUtils;
 import com.webank.wedatasphere.dss.git.utils.FileUtils;
 import org.eclipse.jgit.lib.Repository;
@@ -34,7 +35,7 @@ public class DSSGitProjectManagerServiceImpl  implements DSSGitProjectManagerSer
     @Override
     public GitCreateProjectResponse create(GitCreateProjectRequest request) {
         logger.info("-------=======================beginning to create testGit1=======================-------");
-        GitUserEntity gitUser = dssWorkspaceGitService.selectGit(request.getWorkspaceId());
+        GitUserEntity gitUser = dssWorkspaceGitService.selectGit(request.getWorkspaceId(), DSSGitConstant.GIT_ACCESS_WRITE_TYPE);
         if (gitUser == null) {
             logger.error("the workspace : {} don't associate with git", request.getWorkspaceId());
             return null;
@@ -64,7 +65,7 @@ public GitCreateProjectResponse create(GitCreateProjectRequest request) {
 
     @Override
     public GitArchivePorjectResponse archive(GitArchiveProjectRequest request) {
-        GitUserEntity gitUser = dssWorkspaceGitService.selectGit(request.getWorkspaceId());
+        GitUserEntity gitUser = dssWorkspaceGitService.selectGit(request.getWorkspaceId(), DSSGitConstant.GIT_ACCESS_WRITE_TYPE);
         if (gitUser == null) {
             logger.error("the workspace : {} don't associate with git", request.getWorkspaceId());
             return null;
@@ -78,7 +79,7 @@ public GitArchivePorjectResponse archive(GitArchiveProjectRequest request) {
 
     @Override
     public GitCheckProjectResponse checkProject(GitCheckProjectRequest request) throws DSSErrorException {
-        GitUserEntity gitUser = dssWorkspaceGitService.selectGit(request.getWorkspaceId());
+        GitUserEntity gitUser = dssWorkspaceGitService.selectGit(request.getWorkspaceId(), DSSGitConstant.GIT_ACCESS_WRITE_TYPE);
         if (gitUser == null) {
             logger.error("the workspace : {} don't associate with git", request.getWorkspaceId());
             return null;
diff --git a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitWorkflowManagerServiceImpl.java b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitWorkflowManagerServiceImpl.java
index 4454dd894..6cdab6a4f 100644
--- a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitWorkflowManagerServiceImpl.java
+++ b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitWorkflowManagerServiceImpl.java
@@ -2,12 +2,13 @@
 
 import com.webank.wedatasphere.dss.common.entity.BmlResource;
 import com.webank.wedatasphere.dss.common.service.BMLService;
-import com.webank.wedatasphere.dss.framework.workspace.bean.GitUserEntity;
-import com.webank.wedatasphere.dss.framework.workspace.service.DSSWorkspaceGitService;
+import com.webank.wedatasphere.dss.git.common.protocol.GitUserEntity;
 import com.webank.wedatasphere.dss.git.common.protocol.request.*;
 import com.webank.wedatasphere.dss.git.common.protocol.response.*;
 import com.webank.wedatasphere.dss.git.config.GitServerConfig;
+import com.webank.wedatasphere.dss.git.constant.DSSGitConstant;
 import com.webank.wedatasphere.dss.git.service.DSSGitWorkflowManagerService;
+import com.webank.wedatasphere.dss.git.service.DSSWorkspaceGitService;
 import com.webank.wedatasphere.dss.git.utils.DSSGitUtils;
 import com.webank.wedatasphere.dss.git.utils.FileUtils;
 import org.apache.commons.lang.StringUtils;
@@ -38,7 +39,7 @@ public class DSSGitWorkflowManagerServiceImpl implements DSSGitWorkflowManagerSe
     private BMLService bmlService;
     @Override
     public GitDiffResponse diff(GitDiffRequest request) {
-        GitUserEntity gitUser = dssWorkspaceGitService.selectGit(request.getWorkspaceId());
+        GitUserEntity gitUser = dssWorkspaceGitService.selectGit(request.getWorkspaceId(), DSSGitConstant.GIT_ACCESS_WRITE_TYPE);
         if (gitUser == null) {
             logger.error("the workspace : {} don't associate with git", request.getWorkspaceId());
             return null;
@@ -73,7 +74,7 @@ public GitDiffResponse diff(GitDiffRequest request) {
 
     @Override
     public GitCommitResponse commit(GitCommitRequest request) {
-        GitUserEntity gitUser = dssWorkspaceGitService.selectGit(request.getWorkspaceId());
+        GitUserEntity gitUser = dssWorkspaceGitService.selectGit(request.getWorkspaceId(), DSSGitConstant.GIT_ACCESS_WRITE_TYPE);
         if (gitUser == null) {
             logger.error("the workspace : {} don't associate with git", request.getWorkspaceId());
             return null;
@@ -225,7 +226,7 @@ private List<String> process(List<String> commands) {
 
     @Override
     public GitDeleteResponse delete(GitDeleteRequest request) {
-        GitUserEntity gitUser = dssWorkspaceGitService.selectGit(request.getWorkspaceId());
+        GitUserEntity gitUser = dssWorkspaceGitService.selectGit(request.getWorkspaceId(), DSSGitConstant.GIT_ACCESS_WRITE_TYPE);
         if (gitUser == null) {
             logger.error("the workspace : {} don't associate with git", request.getWorkspaceId());
             return null;
@@ -263,7 +264,7 @@ public GitDeleteResponse delete(GitDeleteRequest request) {
 
     @Override
     public GitFileContentResponse getFileContent(GitFileContentRequest request) {
-        GitUserEntity gitUser = dssWorkspaceGitService.selectGit(request.getWorkspaceId());
+        GitUserEntity gitUser = dssWorkspaceGitService.selectGit(request.getWorkspaceId(), DSSGitConstant.GIT_ACCESS_WRITE_TYPE);
         if (gitUser == null) {
             logger.error("the workspace : {} don't associate with git", request.getWorkspaceId());
             return null;
@@ -297,7 +298,7 @@ public GitFileContentResponse getFileContent(GitFileContentRequest request) {
 
     @Override
     public GitHistoryResponse getHistory(GitHistoryRequest request) {
-        GitUserEntity gitUser = dssWorkspaceGitService.selectGit(request.getWorkspaceId());
+        GitUserEntity gitUser = dssWorkspaceGitService.selectGit(request.getWorkspaceId(), DSSGitConstant.GIT_ACCESS_WRITE_TYPE);
         if (gitUser == null) {
             logger.error("the workspace : {} don't associate with git", request.getWorkspaceId());
             return null;
diff --git a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSWorkspaceGitServiceImpl.java b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSWorkspaceGitServiceImpl.java
new file mode 100644
index 000000000..67725140b
--- /dev/null
+++ b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSWorkspaceGitServiceImpl.java
@@ -0,0 +1,61 @@
+package com.webank.wedatasphere.dss.git.service.impl;
+
+import com.webank.wedatasphere.dss.common.exception.DSSErrorException;
+import com.webank.wedatasphere.dss.git.common.protocol.GitUserEntity;
+import com.webank.wedatasphere.dss.git.common.protocol.request.GitUserUpdateRequest;
+import com.webank.wedatasphere.dss.git.common.protocol.request.GitUserInfoRequest;
+import com.webank.wedatasphere.dss.git.common.protocol.response.GitUserUpdateResponse;
+import com.webank.wedatasphere.dss.git.common.protocol.response.GitUserInfoResponse;
+import com.webank.wedatasphere.dss.git.dao.DSSWorkspaceGitMapper;
+import com.webank.wedatasphere.dss.git.service.DSSWorkspaceGitService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+@Service
+public class DSSWorkspaceGitServiceImpl implements DSSWorkspaceGitService {
+
+    @Autowired
+    private DSSWorkspaceGitMapper workspaceGitMapper;
+
+
+    @Override
+    public GitUserUpdateResponse associateGit(GitUserUpdateRequest gitUserCreateRequest) throws DSSErrorException {
+        if (gitUserCreateRequest == null) {
+            throw  new DSSErrorException(010101, "gitUserCreateRequest is null");
+        }
+        GitUserEntity gitUser = gitUserCreateRequest.getGitUser();
+        String userName = gitUserCreateRequest.getUsername();
+        // 不存在则更新，存在则新增
+        GitUserEntity oldGitUserDo = selectGit(gitUser.getWorkspaceId(), gitUser.getType());
+        gitUser.setUpdateBy(userName);
+        if (oldGitUserDo == null) {
+            gitUser.setCreateBy(userName);
+            workspaceGitMapper.insert(gitUser);
+        }else {
+            workspaceGitMapper.update(gitUser);
+        }
+
+        return new GitUserUpdateResponse();
+    }
+
+
+    @Override
+    public GitUserInfoResponse selectGitUserInfo(GitUserInfoRequest gitUserInfoRequest) throws DSSErrorException {
+        if (gitUserInfoRequest == null) {
+            throw  new DSSErrorException(010101, "gitUserCreateRequest is null");
+        }
+        Long workspaceId = gitUserInfoRequest.getWorkspaceId();
+        String type = gitUserInfoRequest.getType();
+        GitUserEntity gitUserEntity = selectGit(workspaceId, type);
+
+        GitUserInfoResponse gitUserInfoResponse = new GitUserInfoResponse();
+        gitUserInfoResponse.setGitUser(gitUserEntity);
+        return gitUserInfoResponse;
+    }
+
+    @Override
+    public GitUserEntity selectGit(Long workspaceId, String type) {
+        return workspaceGitMapper.selectByWorkspaceId(workspaceId, type);
+    }
+
+}
diff --git a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/utils/DSSGitUtils.java b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/utils/DSSGitUtils.java
index 55d4bee39..99843079c 100644
--- a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/utils/DSSGitUtils.java
+++ b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/utils/DSSGitUtils.java
@@ -1,8 +1,8 @@
 package com.webank.wedatasphere.dss.git.utils;
 
 import com.webank.wedatasphere.dss.common.exception.DSSErrorException;
-import com.webank.wedatasphere.dss.framework.workspace.bean.GitUserEntity;
 import com.webank.wedatasphere.dss.git.common.protocol.GitTree;
+import com.webank.wedatasphere.dss.git.common.protocol.GitUserEntity;
 import com.webank.wedatasphere.dss.git.common.protocol.request.GitBaseRequest;
 import com.webank.wedatasphere.dss.git.common.protocol.request.GitRevertRequest;
 import com.webank.wedatasphere.dss.git.common.protocol.response.GitDiffResponse;
@@ -324,7 +324,7 @@ public static Set<String> status(String projectName) {
             tree.addAll(status.getConflicting());
 
             return tree;
-        } catch (IOException | org.eclipse.jgit.api.errors.GitAPIException e) {
+        } catch (IOException | GitAPIException e) {
             logger.error("get git status Failed, the reason is : ", e);
             return new HashSet<>();
         }
diff --git a/dss-git/dss-git-server/src/main/scala/com.webank.wedatasphere.dss.git/receiver/DSSGitChooser.scala b/dss-git/dss-git-server/src/main/scala/com.webank.wedatasphere.dss.git/receiver/DSSGitChooser.scala
index fc187f481..c7f4fda28 100644
--- a/dss-git/dss-git-server/src/main/scala/com.webank.wedatasphere.dss.git/receiver/DSSGitChooser.scala
+++ b/dss-git/dss-git-server/src/main/scala/com.webank.wedatasphere.dss.git/receiver/DSSGitChooser.scala
@@ -14,10 +14,10 @@
  *
  */
 
-package com.webank.wedatasphere.dss.git.server.receiver
+package com.webank.wedatasphere.dss.git.receiver
 
-import com.webank.wedatasphere.dss.git.common.protocol.request.{GitArchiveProjectRequest, GitBaseRequest, GitCheckProjectRequest, GitCommitRequest, GitCreateProjectRequest, GitDeleteRequest, GitDiffRequest, GitFileContentRequest, GitHistoryRequest, GitRemoveRequest, GitRevertRequest, GitSearchRequest}
-import com.webank.wedatasphere.dss.git.service.{DSSGitProjectManagerService, DSSGitWorkflowManagerService}
+import com.webank.wedatasphere.dss.git.common.protocol.request.{GitArchiveProjectRequest, GitBaseRequest, GitCheckProjectRequest, GitCommitRequest, GitCreateProjectRequest, GitDeleteRequest, GitDiffRequest, GitFileContentRequest, GitHistoryRequest, GitRemoveRequest, GitRevertRequest, GitSearchRequest, GitUserInfoRequest, GitUserUpdateRequest}
+import com.webank.wedatasphere.dss.git.service.{DSSGitProjectManagerService, DSSGitWorkflowManagerService, DSSWorkspaceGitService}
 
 import javax.annotation.PostConstruct
 import org.apache.linkis.rpc.{RPCMessageEvent, Receiver, ReceiverChooser}
@@ -34,10 +34,13 @@ class DSSGitChooser extends ReceiverChooser {
   @Autowired
   var gitWorkflowManagerService: DSSGitWorkflowManagerService = _
 
+  @Autowired
+  var workspaceGitService: DSSWorkspaceGitService = _
+
   var receiver: Option[DSSGitReceiver] = _
 
   @PostConstruct
-  def init(): Unit = receiver = Some(new DSSGitReceiver(gitProjectManagerService, gitWorkflowManagerService))
+  def init(): Unit = receiver = Some(new DSSGitReceiver(gitProjectManagerService, gitWorkflowManagerService, workspaceGitService))
 
   override def chooseReceiver(event: RPCMessageEvent): Option[Receiver] = event.message match {
     case _: GitCreateProjectRequest => receiver
@@ -49,6 +52,8 @@ class DSSGitChooser extends ReceiverChooser {
     case _: GitFileContentRequest => receiver
     case _: GitDeleteRequest => receiver
     case _: GitHistoryRequest => receiver
+    case _: GitUserUpdateRequest => receiver
+    case _: GitUserInfoRequest => receiver
     case _ => None
   }
 }
\ No newline at end of file
diff --git a/dss-git/dss-git-server/src/main/scala/com.webank.wedatasphere.dss.git/receiver/DSSGitReceiver.scala b/dss-git/dss-git-server/src/main/scala/com.webank.wedatasphere.dss.git/receiver/DSSGitReceiver.scala
index 264707a01..6dd8d1d24 100644
--- a/dss-git/dss-git-server/src/main/scala/com.webank.wedatasphere.dss.git/receiver/DSSGitReceiver.scala
+++ b/dss-git/dss-git-server/src/main/scala/com.webank.wedatasphere.dss.git/receiver/DSSGitReceiver.scala
@@ -14,10 +14,10 @@
  *
  */
 
-package com.webank.wedatasphere.dss.git.server.receiver
+package com.webank.wedatasphere.dss.git.receiver
 
-import com.webank.wedatasphere.dss.git.common.protocol.request.{GitArchiveProjectRequest, GitCheckProjectRequest, GitCommitRequest, GitCreateProjectRequest, GitDeleteRequest, GitDiffRequest, GitFileContentRequest, GitHistoryRequest, GitRevertRequest, GitSearchRequest}
-import com.webank.wedatasphere.dss.git.service.{DSSGitProjectManagerService, DSSGitWorkflowManagerService}
+import com.webank.wedatasphere.dss.git.common.protocol.request.{GitArchiveProjectRequest, GitCheckProjectRequest, GitCommitRequest, GitCreateProjectRequest, GitDeleteRequest, GitDiffRequest, GitFileContentRequest, GitHistoryRequest, GitRevertRequest, GitSearchRequest, GitUserInfoRequest, GitUserUpdateRequest}
+import com.webank.wedatasphere.dss.git.service.{DSSGitProjectManagerService, DSSGitWorkflowManagerService, DSSWorkspaceGitService}
 import org.apache.linkis.rpc.{Receiver, Sender}
 import org.slf4j.{Logger, LoggerFactory}
 import org.springframework.stereotype.Component
@@ -25,7 +25,8 @@ import org.springframework.stereotype.Component
 import java.util
 import scala.concurrent.duration.Duration
 
-class DSSGitReceiver(gitProjectManagerService: DSSGitProjectManagerService, gitWorkflowManagerService: DSSGitWorkflowManagerService) extends Receiver {
+class DSSGitReceiver(gitProjectManagerService: DSSGitProjectManagerService, gitWorkflowManagerService: DSSGitWorkflowManagerService,
+                     workspaceGitService: DSSWorkspaceGitService) extends Receiver {
 
   override def receive(message: Any, sender: Sender): Unit = {}
 
@@ -48,6 +49,10 @@ class DSSGitReceiver(gitProjectManagerService: DSSGitProjectManagerService, gitW
       gitWorkflowManagerService.getFileContent(gitFileContentRequest)
     case gitHistoryRequest: GitHistoryRequest =>
       gitWorkflowManagerService.getHistory(gitHistoryRequest)
+    case gitUserUpdateRequest: GitUserUpdateRequest =>
+      workspaceGitService.associateGit(gitUserUpdateRequest)
+    case gitUserInfoRequest: GitUserInfoRequest =>
+      workspaceGitService.selectGitUserInfo(gitUserInfoRequest)
     case _ => None
   }
 

From 05a56ccfcffa99014d765f6c8c7276df10cbbbe1 Mon Sep 17 00:00:00 2001
From: qweqnotallow <747839893@qq.com>
Date: Sun, 28 Apr 2024 10:17:31 +0800
Subject: [PATCH 069/302] git server add associateGit fix

---
 .../wedatasphere/dss/git/dao/impl/DSSWorkspaceGitMapper.xml     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/dao/impl/DSSWorkspaceGitMapper.xml b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/dao/impl/DSSWorkspaceGitMapper.xml
index ad68bc2cb..679ce3039 100644
--- a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/dao/impl/DSSWorkspaceGitMapper.xml
+++ b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/dao/impl/DSSWorkspaceGitMapper.xml
@@ -43,7 +43,7 @@
     </update>
 
     <select id="selectByWorkspaceId" resultType="com.webank.wedatasphere.dss.git.common.protocol.GitUserEntity">
-        select id, workspace_id, git_user, git_token, create_time, update_time, create_by, update_by
+        select id, workspace_id, git_user, git_token, create_time, update_time, create_by, update_by, type
         from dss_workspace_associate_git
         where workspace_id = #{workspaceId} and `type` = #{type}
     </select>

From 2052ac2bff096a99945d467efe845c729ec6a119 Mon Sep 17 00:00:00 2001
From: SunpengWan <825559776@qq.com>
Date: Sun, 28 Apr 2024 17:52:44 +0800
Subject: [PATCH 070/302] update guava version to 33.1.0-jre

---
 dss-appconn/appconns/dss-dolphinscheduler-appconn/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dss-appconn/appconns/dss-dolphinscheduler-appconn/pom.xml b/dss-appconn/appconns/dss-dolphinscheduler-appconn/pom.xml
index b84e42a8e..2e254788f 100644
--- a/dss-appconn/appconns/dss-dolphinscheduler-appconn/pom.xml
+++ b/dss-appconn/appconns/dss-dolphinscheduler-appconn/pom.xml
@@ -81,7 +81,7 @@
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
-            <version>28.2-android</version>
+            <version>33.1.0-jre</version>
         </dependency>
 
 

From 56e991a91842ad9919f0274231e70a3f7983fc57 Mon Sep 17 00:00:00 2001
From: qweqnotallow <747839893@qq.com>
Date: Sun, 28 Apr 2024 18:08:48 +0800
Subject: [PATCH 071/302] git server search fix

---
 .../request/OrchestratorSubmitRequest.java    |  9 --
 .../DSSFrameworkOrchestratorRestful.java      |  2 +-
 .../restful/DSSWorkspaceRestful.java          |  2 +-
 .../protocol/request/GitSearchRequest.java    | 40 ++++-----
 .../dss/git/config/GitServerConfig.java       |  2 +
 .../DSSGitWorkflowManagerServiceImpl.java     | 89 +++++--------------
 .../dss/git/utils/DSSGitUtils.java            | 14 ++-
 7 files changed, 53 insertions(+), 105 deletions(-)

diff --git a/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/entity/request/OrchestratorSubmitRequest.java b/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/entity/request/OrchestratorSubmitRequest.java
index 2095061b7..13e42481f 100644
--- a/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/entity/request/OrchestratorSubmitRequest.java
+++ b/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/entity/request/OrchestratorSubmitRequest.java
@@ -4,7 +4,6 @@
 
 public class OrchestratorSubmitRequest {
     private Long flowId;
-    private String dssLabel;
     private LabelRouteVO labels;
     private String projectName;
     private String comment;
@@ -18,14 +17,6 @@ public void setFlowId(Long flowId) {
         this.flowId = flowId;
     }
 
-    public String getDssLabel() {
-        return dssLabel;
-    }
-
-    public void setDssLabel(String dssLabel) {
-        this.dssLabel = dssLabel;
-    }
-
     public LabelRouteVO getLabels() {
         return labels;
     }
diff --git a/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/restful/DSSFrameworkOrchestratorRestful.java b/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/restful/DSSFrameworkOrchestratorRestful.java
index c2a63bdac..b0d24a3a1 100644
--- a/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/restful/DSSFrameworkOrchestratorRestful.java
+++ b/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/restful/DSSFrameworkOrchestratorRestful.java
@@ -290,7 +290,7 @@ public Message diff(@RequestBody OrchestratorSubmitRequest submitFlowRequest) {
             return Message.error("当前工作流被用户" + responseLockWorkflow.getLockOwner() + "已锁定编辑，您编辑的内容不能再被保存。如有疑问，请与" + responseLockWorkflow.getLockOwner() + "确认");
         }
         GitTree gitTree = orchestratorFrameworkService.diffFlow(submitFlowRequest, userName, workspace);
-        return Message.ok().data("tree", gitTree);
+        return Message.ok().data("tree", gitTree.getChildren());
     }
 
     @RequestMapping(value = "submitFlow", method = RequestMethod.POST)
diff --git a/dss-framework/dss-framework-workspace-server/src/main/java/com/webank/wedatasphere/dss/framework/workspace/restful/DSSWorkspaceRestful.java b/dss-framework/dss-framework-workspace-server/src/main/java/com/webank/wedatasphere/dss/framework/workspace/restful/DSSWorkspaceRestful.java
index de0cea7d4..325459010 100644
--- a/dss-framework/dss-framework-workspace-server/src/main/java/com/webank/wedatasphere/dss/framework/workspace/restful/DSSWorkspaceRestful.java
+++ b/dss-framework/dss-framework-workspace-server/src/main/java/com/webank/wedatasphere/dss/framework/workspace/restful/DSSWorkspaceRestful.java
@@ -344,7 +344,7 @@ public Message deleteFavorite(@PathVariable("workspaceId") Long workspaceId, @Pa
     }
 
     @RequestMapping(path = "git", method = RequestMethod.POST)
-    public Message associateGit(@RequestBody com.webank.wedatasphere.dss.git.common.protocol.GitUserEntity gitUser) {
+    public Message associateGit(@RequestBody GitUserEntity gitUser) {
         String username = SecurityFilter.getLoginUsername(httpServletRequest);
         if (StringUtils.isEmpty(gitUser.getType())) {
             return Message.error("需指定当前帐号配置读写权限");
diff --git a/dss-git/dss-git-common/src/main/java/com.webank.wedatasphere.dss.git.common/protocol/request/GitSearchRequest.java b/dss-git/dss-git-common/src/main/java/com.webank.wedatasphere.dss.git.common/protocol/request/GitSearchRequest.java
index 8292b7bc5..3859d78a4 100644
--- a/dss-git/dss-git-common/src/main/java/com.webank.wedatasphere.dss.git.common/protocol/request/GitSearchRequest.java
+++ b/dss-git/dss-git-common/src/main/java/com.webank.wedatasphere.dss.git.common/protocol/request/GitSearchRequest.java
@@ -19,31 +19,12 @@ public class GitSearchRequest extends GitBaseRequest{
      * 搜索条件：节点类型（后缀）
      */
     private List<String> type;
-    /**
-     * 分页条件：第一页无需关心，下一页需携带上一页最后一个文件名
-     */
-    private String currentPageLastFile;
+    private Integer pageSize;
+    private Integer pageNow;
 
     public GitSearchRequest() {
     }
 
-    public GitSearchRequest(List<String> path, String searchContent, String fileName, List<String> type, String currentPageLastFile) {
-        this.path = path;
-        this.searchContent = searchContent;
-        this.fileName = fileName;
-        this.type = type;
-        this.currentPageLastFile = currentPageLastFile;
-    }
-
-    public GitSearchRequest(Long workspaceId, String projectName, List<String> path, String searchContent, String fileName, List<String> type, String currentPageLastFile) {
-        super(workspaceId, projectName);
-        this.path = path;
-        this.searchContent = searchContent;
-        this.fileName = fileName;
-        this.type = type;
-        this.currentPageLastFile = currentPageLastFile;
-    }
-
 
     public List<String> getPath() {
         return path;
@@ -77,11 +58,20 @@ public void setType(List<String> type) {
         this.type = type;
     }
 
-    public String getCurrentPageLastFile() {
-        return currentPageLastFile;
+
+    public Integer getPageSize() {
+        return pageSize;
+    }
+
+    public void setPageSize(Integer pageSize) {
+        this.pageSize = pageSize;
+    }
+
+    public Integer getPageNow() {
+        return pageNow;
     }
 
-    public void setCurrentPageLastFile(String currentPageLastFile) {
-        this.currentPageLastFile = currentPageLastFile;
+    public void setPageNow(Integer pageNow) {
+        this.pageNow = pageNow;
     }
 }
diff --git a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/config/GitServerConfig.java b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/config/GitServerConfig.java
index b7863cdba..0dd8b548f 100644
--- a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/config/GitServerConfig.java
+++ b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/config/GitServerConfig.java
@@ -13,5 +13,7 @@ public class GitServerConfig {
 
     public static final CommonVars<String> GIT_SERVER_META_PATH = CommonVars.apply("wds.dss.git.server.meta.path", ".metaConf");
 
+    public static final CommonVars<Integer> GIT_SEARCH_RESULT_LIMIT = CommonVars.apply("wds.dss.git.search.limit", 30);
+
     public static final CommonVars<String> GIT_THREAD_NAME = CommonVars.apply("wds.dss.git.thread.name", "gitServer-Thread-");
 }
diff --git a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitWorkflowManagerServiceImpl.java b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitWorkflowManagerServiceImpl.java
index 6cdab6a4f..c032b94a0 100644
--- a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitWorkflowManagerServiceImpl.java
+++ b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitWorkflowManagerServiceImpl.java
@@ -1,6 +1,7 @@
 package com.webank.wedatasphere.dss.git.service.impl;
 
 import com.webank.wedatasphere.dss.common.entity.BmlResource;
+import com.webank.wedatasphere.dss.common.exception.DSSErrorException;
 import com.webank.wedatasphere.dss.common.service.BMLService;
 import com.webank.wedatasphere.dss.git.common.protocol.GitUserEntity;
 import com.webank.wedatasphere.dss.git.common.protocol.request.*;
@@ -56,11 +57,13 @@ public GitDiffResponse diff(GitDiffRequest request) {
             DSSGitUtils.pull(repository, request.getProjectName(), gitUser);
             // 解压BML文件到本地 todo 对接Server时放开调试
             Map<String, BmlResource> bmlResourceMap = request.getBmlResourceMap();
+            List<String> fileList = new ArrayList<>();
             for (Map.Entry<String, BmlResource> entry : bmlResourceMap.entrySet()) {
+                fileList.add(entry.getKey());
                 FileUtils.removeFlowNode(entry.getKey(), request.getProjectName());
                 FileUtils.update(bmlService, entry.getKey(), entry.getValue(), request.getUsername());
             }
-            diff = DSSGitUtils.diff(request.getProjectName());
+            diff = DSSGitUtils.diff(request.getProjectName(), fileList);
             // 重置本地
             DSSGitUtils.reset(request.getProjectName());
         } catch (Exception e) {
@@ -109,7 +112,7 @@ public GitCommitResponse commit(GitCommitRequest request) {
     }
 
     @Override
-    public GitSearchResponse search(GitSearchRequest request) {
+    public GitSearchResponse search(GitSearchRequest request) throws DSSErrorException {
         String gitDir = "/" + FileUtils.normalizePath(GitServerConfig.GIT_SERVER_PATH.getValue()) + "/" + request.getProjectName() + "/.git";
         String workTree = "/" + FileUtils.normalizePath(GitServerConfig.GIT_SERVER_PATH.getValue()) + "/" + request.getProjectName() ;
         List<String> gitCommands = new ArrayList<>(Arrays.asList(
@@ -117,80 +120,36 @@ public GitSearchResponse search(GitSearchRequest request) {
         ));
         logger.info(gitCommands.toString());
         List<String> fileList = process(gitCommands);
+        int start = (request.getPageNow()-1) * request.getPageSize();
+        int end = (start + request.getPageSize()) >= request.getPageSize()? request.getPageSize() : start + request.getPageSize();
+        if (request.getPageNow() < 0 || start >= fileList.size()) {
+            throw new DSSErrorException(0101001, "当前请求页" + request.getPageNow() + "超出搜索指定范围");
+        }
+        final List<String> subList = fileList.subList(start, end);
         List<String> filePathList = new ArrayList<>();
-        for (String file : fileList) {
+        for (String file : subList) {
             filePathList.add("/" + FileUtils.normalizePath(GitServerConfig.GIT_SERVER_PATH.getValue())+ "/" + request.getProjectName() + "/" + file);
         }
 
-        List<String> fileCommands = new ArrayList<>(Arrays.asList(
-                "wc", "-l"
-        ));
-
-        fileCommands.addAll(filePathList);
-
-        List<String> process = process(fileCommands);
-        Map<String, Integer> map =new LinkedHashMap<>();
-        for (String content: process) {
-            String[] split = content.trim().split("\\s+");
-            logger.info("content : {}", content);
-            logger.info("split 0 : {}", split[0]);
-            logger.info("split 1 : {}", split[1]);
-            if (split.length == 2) {
-                int line = Integer.parseInt(split[0]);
-                if (line == 0) {
-                    line ++;
-                }
-                String fileName = split[1];
-                if(fileName.equals("total")) {
-                    continue;
-                }
-                map.put(fileName, line);
-            }
-        }
-        List<String> currentFiles = new ArrayList<>();
-         {
-        int total = 0;
-        boolean flag = StringUtils.isEmpty(request.getCurrentPageLastFile());
-        logger.info("flag before: {}", flag);
-        for(Map.Entry<String, Integer> entry: map.entrySet()) {
-            logger.info("entry key : {}", entry.getKey());
-            logger.info("entry value : {}", entry.getValue());
-            logger.info("flag 1111111: {}", flag);
-            if (total + entry.getValue() >= 1000) {
-                break;
-            }
-            if (!StringUtils.isEmpty(request.getCurrentPageLastFile()) && request.getCurrentPageLastFile().equals(entry.getKey())) {
-                flag = true;
-                continue;
-            }
-            if (flag) {
-                total += entry.getValue();
-                currentFiles.add(entry.getKey());
-            }
-        }
-        }
 
 
-        List<String> gitCurrentCommands = new ArrayList<>(Arrays.asList(
+        List<String> gitBaseCommand = new ArrayList<>(Arrays.asList(
                 "git", "--git-dir=" + gitDir, "--work-tree=" + workTree, "grep", "-n", request.getSearchContent()
         ));
-        gitCurrentCommands.addAll(currentFiles);
-        logger.info(gitCurrentCommands.toString());
-        List<String> fileCurrentList = process(gitCurrentCommands);
         Map<String, List<String>> result = new LinkedHashMap<>();
-        for (String fileContent : fileCurrentList) {
-            String[] split = fileContent.split(":", 2);
 
-            String fileName = split[0];
-            String fileSearchContent = split[1];
-            if (result.containsKey(fileName)) {
-                result.get(fileName).add(fileSearchContent);
-            }else {
-                List<String> content = new ArrayList<>();
-                content.add(fileSearchContent);
-                result.put(fileName, content);
-            }
+        for (String file : filePathList) {
+            List<String> gitSearchCommand = new ArrayList<>();
+            gitSearchCommand.addAll(gitBaseCommand);
+            gitSearchCommand.add(file);
+            logger.info(gitSearchCommand.toString());
+
+            final List<String> searchResult = process(gitSearchCommand);
+            final List<String> subSearchResult = searchResult.size() > GitServerConfig.GIT_SEARCH_RESULT_LIMIT.getValue()? searchResult.subList(0, GitServerConfig.GIT_SEARCH_RESULT_LIMIT.getValue()) : searchResult;
+
+            result.put(file, subSearchResult);
         }
+
         return new GitSearchResponse(result, fileList.size());
     }
 
diff --git a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/utils/DSSGitUtils.java b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/utils/DSSGitUtils.java
index 99843079c..3a88e5283 100644
--- a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/utils/DSSGitUtils.java
+++ b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/utils/DSSGitUtils.java
@@ -137,9 +137,9 @@ public static void pull(Repository repository, String projectName, GitUserEntity
         }
     }
 
-    public static GitDiffResponse diff(String projectName) {
+    public static GitDiffResponse diff(String projectName, List<String> fileList) {
 
-        Set<String> status = status(projectName);
+        Set<String> status = status(projectName, fileList);
         GitTree root = new GitTree("");
         for (String statu : status) {
             root.addChild(statu);
@@ -296,12 +296,18 @@ public static List<String> parseProjectNames(String json) throws org.json.JSONEx
         return projectNames;
     }
 
-    public static Set<String> status(String projectName) {
+    public static Set<String> status(String projectName, List<String> fileList) {
         File repoDir = new File(File.separator + FileUtils.normalizePath(GitServerConfig.GIT_SERVER_PATH.getValue()) + File.separator + projectName + File.separator +".git"); // 修改为你的仓库路径
 
         try (Repository repository = new FileRepositoryBuilder().setGitDir(repoDir).build()) {
             Git git = new Git(repository);
-            Status status = git.status().call();
+            StatusCommand statusCommand = git.status();
+            // 仅关注当前diff改动涉及的文件夹
+            for (String file : fileList) {
+                statusCommand.addPath(file);
+            }
+
+            Status status = statusCommand.call();
 
             logger.info("Modified files:");
             logger.info("Modified files: {} , \nUntracked files: {}, \nAdded to index: {}, \nChanged files: {}, \nRemoved files: {}, \nMissing files: {}, \nConflicting files: {} ",

From 628d345cf872ca8c8023e403a9b789607e17d87b Mon Sep 17 00:00:00 2001
From: qweqnotallow <747839893@qq.com>
Date: Sun, 28 Apr 2024 20:43:47 +0800
Subject: [PATCH 072/302] git server search fix1

---
 .../dss/git/service/impl/DSSGitWorkflowManagerServiceImpl.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitWorkflowManagerServiceImpl.java b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitWorkflowManagerServiceImpl.java
index c032b94a0..305d9579c 100644
--- a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitWorkflowManagerServiceImpl.java
+++ b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitWorkflowManagerServiceImpl.java
@@ -121,7 +121,7 @@ public GitSearchResponse search(GitSearchRequest request) throws DSSErrorExcepti
         logger.info(gitCommands.toString());
         List<String> fileList = process(gitCommands);
         int start = (request.getPageNow()-1) * request.getPageSize();
-        int end = (start + request.getPageSize()) >= request.getPageSize()? request.getPageSize() : start + request.getPageSize();
+        int end = Math.min((start + request.getPageSize()), fileList.size());
         if (request.getPageNow() < 0 || start >= fileList.size()) {
             throw new DSSErrorException(0101001, "当前请求页" + request.getPageNow() + "超出搜索指定范围");
         }

From 19b77e4748f13218fb31abb5d382cf8def54aa5b Mon Sep 17 00:00:00 2001
From: SunpengWan <825559776@qq.com>
Date: Mon, 29 Apr 2024 09:26:01 +0800
Subject: [PATCH 073/302] SchedulisProjectSearchOperation add a line log

---
 dss-appconn/appconns/dss-dolphinscheduler-appconn/pom.xml        | 1 -
 .../schedulis/operation/SchedulisProjectSearchOperation.java     | 1 +
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/dss-appconn/appconns/dss-dolphinscheduler-appconn/pom.xml b/dss-appconn/appconns/dss-dolphinscheduler-appconn/pom.xml
index 2e254788f..9bce9a681 100644
--- a/dss-appconn/appconns/dss-dolphinscheduler-appconn/pom.xml
+++ b/dss-appconn/appconns/dss-dolphinscheduler-appconn/pom.xml
@@ -18,7 +18,6 @@
             <groupId>com.webank.wedatasphere.dss</groupId>
             <artifactId>dss-scheduler-appconn</artifactId>
             <version>${dss.version}</version>
-
             <scope>provided</scope>
         </dependency>
 
diff --git a/dss-appconn/appconns/dss-schedulis-appconn/src/main/java/com/webank/wedatasphere/dss/appconn/schedulis/operation/SchedulisProjectSearchOperation.java b/dss-appconn/appconns/dss-schedulis-appconn/src/main/java/com/webank/wedatasphere/dss/appconn/schedulis/operation/SchedulisProjectSearchOperation.java
index b15e20d30..7514853d6 100644
--- a/dss-appconn/appconns/dss-schedulis-appconn/src/main/java/com/webank/wedatasphere/dss/appconn/schedulis/operation/SchedulisProjectSearchOperation.java
+++ b/dss-appconn/appconns/dss-schedulis-appconn/src/main/java/com/webank/wedatasphere/dss/appconn/schedulis/operation/SchedulisProjectSearchOperation.java
@@ -28,6 +28,7 @@ public ProjectResponseRef searchProject(RefProjectContentRequestRef.RefProjectCo
         params.put("project", requestRef.getProjectName());
         params.put("ajax", "fetchprojectflows");
         try {
+            logger.info("request url from Schedulis is: {}.", queryUrl);
             String responseBody = SchedulisHttpUtils.getHttpGetResult(queryUrl, params, ssoRequestOperation, requestRef.getWorkspace());
             logger.info("responseBody from Schedulis is: {}.", responseBody);
             Map<String,Object> map = DSSCommonUtils.COMMON_GSON.fromJson(responseBody, new TypeToken<Map<String,Object>>(){}.getType());

From e359766e9701e046c1a6ea63a944f3bc91b93c2b Mon Sep 17 00:00:00 2001
From: xlinliu <arionliu@webank.com>
Date: Mon, 29 Apr 2024 11:18:46 +0800
Subject: [PATCH 074/302] fix appconn refresh failed

---
 .../service/AppConnResourceServiceImpl.java        |  1 +
 .../manager/impl/AbstractAppConnManager.java       | 14 +++++++++-----
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/dss-appconn/dss-appconn-manager/dss-appconn-manager-client/src/main/java/com/webank/wedatasphere/dss/appconn/manager/service/AppConnResourceServiceImpl.java b/dss-appconn/dss-appconn-manager/dss-appconn-manager-client/src/main/java/com/webank/wedatasphere/dss/appconn/manager/service/AppConnResourceServiceImpl.java
index 2f16d6fdb..b4e9a4b31 100644
--- a/dss-appconn/dss-appconn-manager/dss-appconn-manager-client/src/main/java/com/webank/wedatasphere/dss/appconn/manager/service/AppConnResourceServiceImpl.java
+++ b/dss-appconn/dss-appconn-manager/dss-appconn-manager-client/src/main/java/com/webank/wedatasphere/dss/appconn/manager/service/AppConnResourceServiceImpl.java
@@ -157,6 +157,7 @@ public String getAppConnHome(AppConnInfo appConnInfo) {
 
     private void deleteFile(File file, String errorMsg) {
         try {
+            LOGGER.info("delete appconn file:{}", file.getAbsolutePath());
             FileUtils.forceDelete(file);
         } catch (IOException e) {
             if(StringUtils.isNotEmpty(errorMsg)) {
diff --git a/dss-appconn/dss-appconn-manager/dss-appconn-manager-core/src/main/java/com/webank/wedatasphere/dss/appconn/manager/impl/AbstractAppConnManager.java b/dss-appconn/dss-appconn-manager/dss-appconn-manager-core/src/main/java/com/webank/wedatasphere/dss/appconn/manager/impl/AbstractAppConnManager.java
index 45631314a..c811e515c 100644
--- a/dss-appconn/dss-appconn-manager/dss-appconn-manager-core/src/main/java/com/webank/wedatasphere/dss/appconn/manager/impl/AbstractAppConnManager.java
+++ b/dss-appconn/dss-appconn-manager/dss-appconn-manager-core/src/main/java/com/webank/wedatasphere/dss/appconn/manager/impl/AbstractAppConnManager.java
@@ -61,6 +61,8 @@ public abstract class AbstractAppConnManager implements AppConnManager {
     private AppConnRefreshThread appConnRefreshThread;
 
     private static volatile AppConnManager appConnManager;
+
+    private static volatile boolean appConnManagerInited = false;
     private static boolean lazyLoad = false;
 
     public static void setLazyLoad() {
@@ -68,11 +70,11 @@ public static void setLazyLoad() {
     }
 
     public static AppConnManager getAppConnManager() {
-        if (appConnManager != null) {
+        if (appConnManagerInited) {
             return appConnManager;
         }
         synchronized (AbstractAppConnManager.class) {
-            if (appConnManager == null) {
+            if (!appConnManagerInited) {
                 //appconn-manager-core包无法引入manager-client包，会有maven循环依赖，这里通过反射获取client的实现类
                 //ismanager=false时，获取client端的AppConnManager实现类，ismanager=true时，获取appconn-framework端的AppConnManager实现类。
                 if (Objects.equals(AppConnManagerCoreConf.IS_APPCONN_MANAGER.getValue(), AppConnManagerCoreConf.hostname)
@@ -88,6 +90,7 @@ public static AppConnManager getAppConnManager() {
                 LOGGER.info("The instance of AppConnManager is {}.", appConnManager.getClass().getName());
                 appConnManager.init();
             }
+            appConnManagerInited = true;
             return appConnManager;
         }
     }
@@ -102,6 +105,7 @@ public void init() {
             loadAppConns();
             isLoaded = true;
         }
+        LOGGER.info("AppConnManager init successfully");
     }
 
     protected abstract AppConnInfoService createAppConnInfoService();
@@ -118,9 +122,6 @@ protected void loadAppConns() {
             LOGGER.warn("No AppConnInfos returned, ignore it.");
             return;
         }
-        long refreshInterval = AppInstanceConstants.APP_CONN_REFRESH_INTERVAL.getValue().toLong();
-        appConnRefreshThread = new AppConnRefreshThread(this, appConnInfos);
-        Utils.defaultScheduler().scheduleAtFixedRate(appConnRefreshThread, refreshInterval, refreshInterval, TimeUnit.MILLISECONDS);
         Map<String, AppConn> appConns = new HashMap<>();
         Consumer<AppConnInfo> loadAndAdd = DSSExceptionUtils.handling(appConnInfo -> {
             AppConn appConn = loadAppConn(appConnInfo);
@@ -151,6 +152,9 @@ protected void loadAppConns() {
             appConnList = Collections.unmodifiableList(new ArrayList<>(appConns.values()));
         }
         LOGGER.info("Inited all AppConns, the AppConn list are {}.", this.appConns.keySet());
+        long refreshInterval = AppInstanceConstants.APP_CONN_REFRESH_INTERVAL.getValue().toLong();
+        appConnRefreshThread = new AppConnRefreshThread(this, appConnInfos);
+        Utils.defaultScheduler().scheduleAtFixedRate(appConnRefreshThread, refreshInterval, refreshInterval, TimeUnit.MILLISECONDS);
     }
 
     protected AppConn loadAppConn(AppConnInfo appConnInfo) throws Exception {

From 475558a24ee782e0ce8ae21cec7d9032de8bdeaf Mon Sep 17 00:00:00 2001
From: qweqnotallow <747839893@qq.com>
Date: Mon, 29 Apr 2024 19:15:22 +0800
Subject: [PATCH 075/302] git server search fix2

---
 .../DSSGitWorkflowManagerServiceImpl.java     | 55 ++++++++++++++++++-
 1 file changed, 52 insertions(+), 3 deletions(-)

diff --git a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitWorkflowManagerServiceImpl.java b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitWorkflowManagerServiceImpl.java
index 305d9579c..7ad4211b6 100644
--- a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitWorkflowManagerServiceImpl.java
+++ b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitWorkflowManagerServiceImpl.java
@@ -20,6 +20,7 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
 
 import java.io.BufferedReader;
 import java.io.File;
@@ -27,6 +28,7 @@
 import java.io.InputStreamReader;
 import java.util.*;
 import java.util.concurrent.TimeUnit;
+import java.util.stream.Collectors;
 
 @Service
 public class DSSGitWorkflowManagerServiceImpl implements DSSGitWorkflowManagerService {
@@ -118,8 +120,56 @@ public GitSearchResponse search(GitSearchRequest request) throws DSSErrorExcepti
         List<String> gitCommands = new ArrayList<>(Arrays.asList(
                 "git", "--git-dir=" + gitDir, "--work-tree=" + workTree, "grep", "-l", request.getSearchContent()
         ));
+        List<String> workflowNode = request.getPath();
+        String fileName = request.getFileName();
+        List<String> typeList = request.getType();
+        List<String> path = new ArrayList<>();
+        if (!CollectionUtils.isEmpty(workflowNode)) {
+            if (!StringUtils.isEmpty(fileName)) {
+                workflowNode = workflowNode.stream().map(s -> s + "/*" + fileName + "*").collect(Collectors.toList());
+                if (!CollectionUtils.isEmpty(typeList)) {
+                    for (String workflow : workflowNode) {
+                        for (String type : typeList) {
+                            path.add(workflow + "." + type);
+                        }
+                    }
+                }
+            }else if (!CollectionUtils.isEmpty(typeList)) {
+                for (String workflow : workflowNode) {
+                    for (String type : typeList) {
+                        path.add(workflow + "/**/*." + type);
+                    }
+                }
+            }
+
+            if (CollectionUtils.isEmpty(path)) {
+                path = workflowNode;
+            }
+        }else if (!StringUtils.isEmpty(fileName)) {
+            if (!CollectionUtils.isEmpty(typeList)) {
+                for (String type : typeList) {
+                    path.add("/*" + fileName + "*/." + type);
+                }
+            }else {
+                path.add("/*" + fileName + "*");
+            }
+        }else if (!CollectionUtils.isEmpty(typeList)) {
+            for (String type : typeList) {
+                path.add("*." + type);
+            }
+        }
+
+        if (!CollectionUtils.isEmpty(path)) {
+            gitCommands.add("--");
+            gitCommands.addAll(path);
+        }
         logger.info(gitCommands.toString());
         List<String> fileList = process(gitCommands);
+        Map<String, List<String>> result = new LinkedHashMap<>();
+
+        if (CollectionUtils.isEmpty(fileList)) {
+            return new GitSearchResponse(result, 0);
+        }
         int start = (request.getPageNow()-1) * request.getPageSize();
         int end = Math.min((start + request.getPageSize()), fileList.size());
         if (request.getPageNow() < 0 || start >= fileList.size()) {
@@ -136,11 +186,10 @@ public GitSearchResponse search(GitSearchRequest request) throws DSSErrorExcepti
         List<String> gitBaseCommand = new ArrayList<>(Arrays.asList(
                 "git", "--git-dir=" + gitDir, "--work-tree=" + workTree, "grep", "-n", request.getSearchContent()
         ));
-        Map<String, List<String>> result = new LinkedHashMap<>();
+
 
         for (String file : filePathList) {
-            List<String> gitSearchCommand = new ArrayList<>();
-            gitSearchCommand.addAll(gitBaseCommand);
+            List<String> gitSearchCommand = new ArrayList<>(gitBaseCommand);
             gitSearchCommand.add(file);
             logger.info(gitSearchCommand.toString());
 

From d80710cd6a905c67a91ecdefb60269da984567ed Mon Sep 17 00:00:00 2001
From: qweqnotallow <747839893@qq.com>
Date: Mon, 29 Apr 2024 19:59:40 +0800
Subject: [PATCH 076/302] git server search fix3(logger)

---
 .../git/service/impl/DSSGitWorkflowManagerServiceImpl.java   | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitWorkflowManagerServiceImpl.java b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitWorkflowManagerServiceImpl.java
index 7ad4211b6..c84129e31 100644
--- a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitWorkflowManagerServiceImpl.java
+++ b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitWorkflowManagerServiceImpl.java
@@ -114,7 +114,7 @@ public GitCommitResponse commit(GitCommitRequest request) {
     }
 
     @Override
-    public GitSearchResponse search(GitSearchRequest request) throws DSSErrorException {
+    public GitSearchResponse search(GitSearchRequest request) {
         String gitDir = "/" + FileUtils.normalizePath(GitServerConfig.GIT_SERVER_PATH.getValue()) + "/" + request.getProjectName() + "/.git";
         String workTree = "/" + FileUtils.normalizePath(GitServerConfig.GIT_SERVER_PATH.getValue()) + "/" + request.getProjectName() ;
         List<String> gitCommands = new ArrayList<>(Arrays.asList(
@@ -173,7 +173,8 @@ public GitSearchResponse search(GitSearchRequest request) throws DSSErrorExcepti
         int start = (request.getPageNow()-1) * request.getPageSize();
         int end = Math.min((start + request.getPageSize()), fileList.size());
         if (request.getPageNow() < 0 || start >= fileList.size()) {
-            throw new DSSErrorException(0101001, "当前请求页" + request.getPageNow() + "超出搜索指定范围");
+            logger.error("当前请求页" + request.getPageNow() + "超出搜索指定范围");
+            return new GitSearchResponse(result, 0);
         }
         final List<String> subList = fileList.subList(start, end);
         List<String> filePathList = new ArrayList<>();

From 9d023a4d5dac7d79cf170f48ebb3c7ea62711f9f Mon Sep 17 00:00:00 2001
From: xlinliu <arionliu@webank.com>
Date: Tue, 30 Apr 2024 14:23:24 +0800
Subject: [PATCH 077/302] support auto.disabled

---
 .../flow/execution/entrance/utils/FlowExecutionUtils.scala | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/dss-orchestrator/orchestrators/dss-workflow/dss-flow-execution-server/src/main/scala/com/webank/wedatasphere/dss/flow/execution/entrance/utils/FlowExecutionUtils.scala b/dss-orchestrator/orchestrators/dss-workflow/dss-flow-execution-server/src/main/scala/com/webank/wedatasphere/dss/flow/execution/entrance/utils/FlowExecutionUtils.scala
index 00a3d65a7..ddc30ad09 100644
--- a/dss-orchestrator/orchestrators/dss-workflow/dss-flow-execution-server/src/main/scala/com/webank/wedatasphere/dss/flow/execution/entrance/utils/FlowExecutionUtils.scala
+++ b/dss-orchestrator/orchestrators/dss-workflow/dss-flow-execution-server/src/main/scala/com/webank/wedatasphere/dss/flow/execution/entrance/utils/FlowExecutionUtils.scala
@@ -40,6 +40,13 @@ import scala.collection.JavaConverters.asScalaBufferConverter
 object FlowExecutionUtils {
 
   def isSkippedNode(node: WorkflowNode, paramsMap: java.util.Map[String, Any]): Boolean = {
+    val skip = Option(node.getDSSNode).map(_.getParams).map(_.get("configuration"))
+      .map(_.asInstanceOf[java.util.Map[String, Object]].get("special"))
+      .map(_.asInstanceOf[java.util.Map[String, Object]].get("auto.disabled"))
+      .map(_.toString).exists("true".equalsIgnoreCase)
+    if (skip) {
+      return true
+    }
     val executeStrategy = paramsMap.get("executeStrategy")
     if (executeStrategy != null) {
       return StrategyFactory.getNodeSkipStrategy(executeStrategy.toString).isSkippedNode(node, paramsMap, isReversedChoose = false)

From 9cfd511385a19eb474ddf551adf1b7ad93380559 Mon Sep 17 00:00:00 2001
From: xlinliu <arionliu@webank.com>
Date: Tue, 30 Apr 2024 14:44:38 +0800
Subject: [PATCH 078/302] update query.frequency to 1m

---
 .../wedatasphere/dss/appconn/datachecker/DataChecker.java   | 2 +-
 .../dss/appconn/datachecker/connector/DataCheckerDao.java   | 2 +-
 .../dss/appconn/eventchecker/entity/EventChecker.java       | 6 +++---
 .../appconn/eventchecker/service/AbstractEventCheck.java    | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/dss-appconn/appconns/dss-datachecker-appconn/src/main/java/com/webank/wedatasphere/dss/appconn/datachecker/DataChecker.java b/dss-appconn/appconns/dss-datachecker-appconn/src/main/java/com/webank/wedatasphere/dss/appconn/datachecker/DataChecker.java
index bf5716ba0..bd4e9433c 100644
--- a/dss-appconn/appconns/dss-datachecker-appconn/src/main/java/com/webank/wedatasphere/dss/appconn/datachecker/DataChecker.java
+++ b/dss-appconn/appconns/dss-datachecker-appconn/src/main/java/com/webank/wedatasphere/dss/appconn/datachecker/DataChecker.java
@@ -62,7 +62,7 @@ public DataChecker(Properties p, DataCheckerExecutionAction action) {
         maxWaitTime = Long.valueOf(p.getProperty(DataChecker.WAIT_TIME, "1")) * 3600 * 1000;
         //test over time
 //        maxWaitTime = Long.valueOf(p.getProperty(DataChecker.WAIT_TIME, "1")) * 120 * 1000;
-        queryFrequency = Integer.valueOf(p.getProperty(DataChecker.QUERY_FREQUENCY, "30000"));
+        queryFrequency = Integer.valueOf(p.getProperty(DataChecker.QUERY_FREQUENCY, "60000"));
 
     }
 
diff --git a/dss-appconn/appconns/dss-datachecker-appconn/src/main/java/com/webank/wedatasphere/dss/appconn/datachecker/connector/DataCheckerDao.java b/dss-appconn/appconns/dss-datachecker-appconn/src/main/java/com/webank/wedatasphere/dss/appconn/datachecker/connector/DataCheckerDao.java
index 739d0eb13..c2275aa1b 100644
--- a/dss-appconn/appconns/dss-datachecker-appconn/src/main/java/com/webank/wedatasphere/dss/appconn/datachecker/connector/DataCheckerDao.java
+++ b/dss-appconn/appconns/dss-datachecker-appconn/src/main/java/com/webank/wedatasphere/dss/appconn/datachecker/connector/DataCheckerDao.java
@@ -107,7 +107,7 @@ public boolean validateTableStatusFunction(Properties props, Logger log, DataChe
         }
         log.info("(DataChecker info) database table partition info : " + dataCheckerInfo);
         long waitTime = Long.valueOf(props.getProperty(DataChecker.WAIT_TIME, "1")) * 3600 * 1000;
-        int queryFrequency = Integer.valueOf(props.getProperty(DataChecker.QUERY_FREQUENCY, "30000"));
+        int queryFrequency = Integer.valueOf(props.getProperty(DataChecker.QUERY_FREQUENCY, "60000"));
 //		String timeScape = props.getProperty(DataChecker.TIME_SCAPE, "NULL");
         log.info("(DataChecker info) wait time : " + waitTime);
         log.info("(DataChecker info) query frequency : " + queryFrequency);
diff --git a/dss-appconn/appconns/dss-eventchecker-appconn/src/main/java/com/webank/wedatasphere/dss/appconn/eventchecker/entity/EventChecker.java b/dss-appconn/appconns/dss-eventchecker-appconn/src/main/java/com/webank/wedatasphere/dss/appconn/eventchecker/entity/EventChecker.java
index 1854973ae..525c19861 100644
--- a/dss-appconn/appconns/dss-eventchecker-appconn/src/main/java/com/webank/wedatasphere/dss/appconn/eventchecker/entity/EventChecker.java
+++ b/dss-appconn/appconns/dss-eventchecker-appconn/src/main/java/com/webank/wedatasphere/dss/appconn/eventchecker/entity/EventChecker.java
@@ -67,10 +67,10 @@ public EventChecker(Properties p, EventCheckerExecutionAction action) {
 		String waitTime = p.getProperty(EventChecker.WAIT_TIME, "1");
 		Double doubleWaitTime = Double.valueOf(waitTime) * 3600 * 1000;
 		maxWaitTime = Long.valueOf(doubleWaitTime.longValue());
-		String query_frequency = p.getProperty(EventChecker.QUERY_FREQUENCY, "30000");
+		String query_frequency = p.getProperty(EventChecker.QUERY_FREQUENCY, "60000");
 		queryFrequency = Integer.valueOf(query_frequency);
-		if(queryFrequency <10000){
-			queryFrequency = 10000;
+		if(queryFrequency <60000){
+			queryFrequency = 60000;
 		}
 	}
 
diff --git a/dss-appconn/appconns/dss-eventchecker-appconn/src/main/java/com/webank/wedatasphere/dss/appconn/eventchecker/service/AbstractEventCheck.java b/dss-appconn/appconns/dss-eventchecker-appconn/src/main/java/com/webank/wedatasphere/dss/appconn/eventchecker/service/AbstractEventCheck.java
index 23ed8576f..8d51d4cf1 100644
--- a/dss-appconn/appconns/dss-eventchecker-appconn/src/main/java/com/webank/wedatasphere/dss/appconn/eventchecker/service/AbstractEventCheck.java
+++ b/dss-appconn/appconns/dss-eventchecker-appconn/src/main/java/com/webank/wedatasphere/dss/appconn/eventchecker/service/AbstractEventCheck.java
@@ -70,7 +70,7 @@ void initECParams(Properties props){
         runDate = props.getProperty("run_date");
         userTime = props.getProperty(EventChecker.USER_TIME);
         waitTime = props.getProperty(EventChecker.WAIT_TIME, "1");
-        query_frequency = props.getProperty(EventChecker.QUERY_FREQUENCY, "30000");
+        query_frequency = props.getProperty(EventChecker.QUERY_FREQUENCY, "60000");
         afterSend = props.getProperty(EventChecker.AFTERSEND);
     }
 

From 3eea73c0d85ab2b720062207f348effa0284ae15 Mon Sep 17 00:00:00 2001
From: qweqnotallow <747839893@qq.com>
Date: Tue, 30 Apr 2024 15:03:29 +0800
Subject: [PATCH 079/302] workflow server/ orchestrator server lock fix

---
 .../OrchestratorFrameworkServiceImpl.java     | 17 ++---------
 .../common/entity/DSSOrchestratorInfo.java    | 14 +++++++++
 .../protocol/RequestPushOrchestrator.java     | 21 -------------
 .../protocol/ResponsePushOrchestrator.java    | 21 -------------
 .../common/ref/OrchestratorRefConstant.java   |  6 ++++
 .../db/dao/OrchestratorMapper.java            |  6 ++++
 .../db/dao/impl/orchestratorMapper.xml        | 18 +++++++++++
 .../dss/workflow/DefaultWorkFlowManager.java  | 18 -----------
 .../dss/workflow/WorkFlowManager.java         |  5 +---
 .../constant/DSSWorkFlowConstant.java         |  7 +----
 .../dss/workflow/dao/LockMapper.java          |  6 ++--
 .../dss/workflow/dao/impl/lockMapper.xml      | 17 ++++++-----
 .../workflow/lock/DSSFlowEditLockManager.java | 30 ++++++++-----------
 .../service/impl/DSSFlowServiceImpl.java      | 10 ++-----
 .../service/impl/PublishServiceImpl.java      | 11 ++-----
 .../receiver/DSSWorkflowChooser.scala         |  1 -
 .../receiver/DSSWorkflowReceiver.scala        |  5 +---
 17 files changed, 81 insertions(+), 132 deletions(-)
 delete mode 100644 dss-orchestrator/dss-orchestrator-common/src/main/java/com/webank/wedatasphere/dss/orchestrator/common/protocol/RequestPushOrchestrator.java
 delete mode 100644 dss-orchestrator/dss-orchestrator-common/src/main/java/com/webank/wedatasphere/dss/orchestrator/common/protocol/ResponsePushOrchestrator.java

diff --git a/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/impl/OrchestratorFrameworkServiceImpl.java b/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/impl/OrchestratorFrameworkServiceImpl.java
index 3c52d2977..d51c17548 100644
--- a/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/impl/OrchestratorFrameworkServiceImpl.java
+++ b/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/impl/OrchestratorFrameworkServiceImpl.java
@@ -50,8 +50,7 @@
 import com.webank.wedatasphere.dss.orchestrator.common.entity.DSSOrchestratorInfo;
 import com.webank.wedatasphere.dss.orchestrator.common.entity.DSSOrchestratorRefOrchestration;
 import com.webank.wedatasphere.dss.orchestrator.common.entity.OrchestratorVo;
-import com.webank.wedatasphere.dss.orchestrator.common.protocol.RequestPushOrchestrator;
-import com.webank.wedatasphere.dss.orchestrator.common.protocol.ResponsePushOrchestrator;
+import com.webank.wedatasphere.dss.orchestrator.common.ref.OrchestratorRefConstant;
 import com.webank.wedatasphere.dss.orchestrator.core.DSSOrchestrator;
 import com.webank.wedatasphere.dss.orchestrator.core.exception.DSSOrchestratorErrorException;
 import com.webank.wedatasphere.dss.orchestrator.core.type.DSSOrchestratorRelation;
@@ -60,6 +59,7 @@
 import com.webank.wedatasphere.dss.orchestrator.db.dao.OrchestratorCopyJobMapper;
 import com.webank.wedatasphere.dss.orchestrator.db.dao.OrchestratorMapper;
 import com.webank.wedatasphere.dss.orchestrator.loader.OrchestratorManager;
+import com.webank.wedatasphere.dss.orchestrator.server.constant.DSSOrchestratorConstant;
 import com.webank.wedatasphere.dss.orchestrator.server.entity.request.*;
 import com.webank.wedatasphere.dss.orchestrator.server.entity.vo.CommonOrchestratorVo;
 import com.webank.wedatasphere.dss.orchestrator.server.entity.vo.OrchestratorCopyHistory;
@@ -497,7 +497,7 @@ public void submitFlow(OrchestratorSubmitRequest flowRequest, String username, W
         }
 
         //4. 返回文件列表
-        updateLockStatus(flowRequest);
+        orchestratorMapper.updateOrchestratorStatus(flowRequest.getOrchestratorId(), OrchestratorRefConstant.FLOW_STATUS_PUSH);
     }
 
     private GitCommitResponse push (String path, BmlResource bmlResource, String username, Long workspaceId, String projectName, String comment) {
@@ -511,15 +511,4 @@ private GitCommitResponse push (String path, BmlResource bmlResource, String use
         return responseWorkflowValidNode;
     }
 
-    private void updateLockStatus(OrchestratorSubmitRequest flowRequest) {
-        LOGGER.info("-------=======================begin to update testGit1=======================------- {}", flowRequest.getFlowId());
-        List<DSSLabel> dssLabelList = new ArrayList<>();
-        dssLabelList.add(new EnvDSSLabel(flowRequest.getLabels().getRoute()));
-        RequestPushOrchestrator requestPushOrchestrator = new RequestPushOrchestrator(flowRequest.getFlowId());
-        Sender sender = DSSSenderServiceFactory.getOrCreateServiceInstance().getWorkflowSender(dssLabelList);
-        ResponsePushOrchestrator responsePushOrchestrator = RpcAskUtils.processAskException(sender.ask(requestPushOrchestrator),
-                ResponsePushOrchestrator.class, RequestPushOrchestrator.class);
-        LOGGER.info("-------=======================End to update testGit1=======================------- {}", flowRequest.getFlowId());
-    }
-
 }
diff --git a/dss-orchestrator/dss-orchestrator-common/src/main/java/com/webank/wedatasphere/dss/orchestrator/common/entity/DSSOrchestratorInfo.java b/dss-orchestrator/dss-orchestrator-common/src/main/java/com/webank/wedatasphere/dss/orchestrator/common/entity/DSSOrchestratorInfo.java
index 2035ae912..b76be10f1 100644
--- a/dss-orchestrator/dss-orchestrator-common/src/main/java/com/webank/wedatasphere/dss/orchestrator/common/entity/DSSOrchestratorInfo.java
+++ b/dss-orchestrator/dss-orchestrator-common/src/main/java/com/webank/wedatasphere/dss/orchestrator/common/entity/DSSOrchestratorInfo.java
@@ -86,6 +86,11 @@ public class DSSOrchestratorInfo implements DSSOrchestration {
      */
     private Date updateTime;
 
+    /**
+     * 工作流状态：save-已保存 push-已提交 publish-已发布
+     */
+    private String status;
+
     public DSSOrchestratorInfo() {
 
     }
@@ -293,6 +298,15 @@ public String toString() {
                 ", secondaryType='" + secondaryType + '\'' +
                 ", linkedAppConnNames=" + linkedAppConnNames +
                 ", comment='" + comment + '\'' +
+                ", status='" + status + '\'' +
                 '}';
     }
+
+    public String getStatus() {
+        return status;
+    }
+
+    public void setStatus(String status) {
+        this.status = status;
+    }
 }
diff --git a/dss-orchestrator/dss-orchestrator-common/src/main/java/com/webank/wedatasphere/dss/orchestrator/common/protocol/RequestPushOrchestrator.java b/dss-orchestrator/dss-orchestrator-common/src/main/java/com/webank/wedatasphere/dss/orchestrator/common/protocol/RequestPushOrchestrator.java
deleted file mode 100644
index b33371a68..000000000
--- a/dss-orchestrator/dss-orchestrator-common/src/main/java/com/webank/wedatasphere/dss/orchestrator/common/protocol/RequestPushOrchestrator.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package com.webank.wedatasphere.dss.orchestrator.common.protocol;
-
-
-public class RequestPushOrchestrator {
-    private Long flowId;
-
-    public RequestPushOrchestrator(Long flowId) {
-        this.flowId = flowId;
-    }
-
-    public RequestPushOrchestrator() {
-    }
-
-    public Long getFlowId() {
-        return flowId;
-    }
-
-    public void setFlowId(Long flowId) {
-        this.flowId = flowId;
-    }
-}
diff --git a/dss-orchestrator/dss-orchestrator-common/src/main/java/com/webank/wedatasphere/dss/orchestrator/common/protocol/ResponsePushOrchestrator.java b/dss-orchestrator/dss-orchestrator-common/src/main/java/com/webank/wedatasphere/dss/orchestrator/common/protocol/ResponsePushOrchestrator.java
deleted file mode 100644
index 51193164e..000000000
--- a/dss-orchestrator/dss-orchestrator-common/src/main/java/com/webank/wedatasphere/dss/orchestrator/common/protocol/ResponsePushOrchestrator.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package com.webank.wedatasphere.dss.orchestrator.common.protocol;
-
-
-public class ResponsePushOrchestrator {
-    private String status;
-
-    public ResponsePushOrchestrator(String status) {
-        this.status = status;
-    }
-
-    public ResponsePushOrchestrator() {
-    }
-
-    public String getStatus() {
-        return status;
-    }
-
-    public void setStatus(String status) {
-        this.status = status;
-    }
-}
diff --git a/dss-orchestrator/dss-orchestrator-common/src/main/java/com/webank/wedatasphere/dss/orchestrator/common/ref/OrchestratorRefConstant.java b/dss-orchestrator/dss-orchestrator-common/src/main/java/com/webank/wedatasphere/dss/orchestrator/common/ref/OrchestratorRefConstant.java
index aed36f76b..31c751f6c 100644
--- a/dss-orchestrator/dss-orchestrator-common/src/main/java/com/webank/wedatasphere/dss/orchestrator/common/ref/OrchestratorRefConstant.java
+++ b/dss-orchestrator/dss-orchestrator-common/src/main/java/com/webank/wedatasphere/dss/orchestrator/common/ref/OrchestratorRefConstant.java
@@ -38,5 +38,11 @@ public interface OrchestratorRefConstant {
 
     //workflow node suffix input by the user during workflow replication.
     String ORCHESTRATION_NODE_SUFFIX = "nodeSuffix";
+    /**
+     * 工作流状态：save-已发布 push-已提交 publish-已保存
+     */
+    public static final String FLOW_STATUS_SAVE = "save";
+    public static final String FLOW_STATUS_PUSH = "push";
+    public static final String FLOW_STATUS_PUBLISH = "publish";
 
 }
diff --git a/dss-orchestrator/dss-orchestrator-db/src/main/java/com/webank/wedatasphere/dss/orchestrator/db/dao/OrchestratorMapper.java b/dss-orchestrator/dss-orchestrator-db/src/main/java/com/webank/wedatasphere/dss/orchestrator/db/dao/OrchestratorMapper.java
index b95f7df7c..73a127e91 100644
--- a/dss-orchestrator/dss-orchestrator-db/src/main/java/com/webank/wedatasphere/dss/orchestrator/db/dao/OrchestratorMapper.java
+++ b/dss-orchestrator/dss-orchestrator-db/src/main/java/com/webank/wedatasphere/dss/orchestrator/db/dao/OrchestratorMapper.java
@@ -126,4 +126,10 @@ DSSOrchestratorVersion getOrcVersionByIdAndOrcVersionId(@Param("orchestratorId")
     List<DSSOrchestratorVersion> getHistoryOrcVersion(@Param("remainVersion") int remainVersion);
 
     void batchUpdateOrcInfo(@Param("list") List<DSSOrchestratorVersion> historyOrcVersion);
+
+    void updateOrchestratorStatus(@Param("id") Long id, @Param("status") String status);
+
+    String selectOrchestratorStatus(@Param("id") Long id);
+
+    List<Long> selectOrchestratorByStatus(@Param("status") String status);
 }
diff --git a/dss-orchestrator/dss-orchestrator-db/src/main/java/com/webank/wedatasphere/dss/orchestrator/db/dao/impl/orchestratorMapper.xml b/dss-orchestrator/dss-orchestrator-db/src/main/java/com/webank/wedatasphere/dss/orchestrator/db/dao/impl/orchestratorMapper.xml
index 77e8669fd..dee09cd53 100644
--- a/dss-orchestrator/dss-orchestrator-db/src/main/java/com/webank/wedatasphere/dss/orchestrator/db/dao/impl/orchestratorMapper.xml
+++ b/dss-orchestrator/dss-orchestrator-db/src/main/java/com/webank/wedatasphere/dss/orchestrator/db/dao/impl/orchestratorMapper.xml
@@ -274,4 +274,22 @@
             #{item.id}
         </foreach>
     </update>
+
+    <update id="updateOrchestratorStatus">
+        update dss_orchestrator
+        <set>
+            `status` = #{status}
+        </set>
+        where `id` = #{id}
+    </update>
+
+    <select id="selectOrchestratorStatus" resultType="java.lang.String">
+        select `status` from dss_orchestrator where `id` = #{id}
+    </select>
+
+    <select id="selectOrchestratorByStatus" resultType="java.lang.Long">
+        select id from dss_orchestrator where `status` = #{status}
+    </select>
+
+
 </mapper>
\ No newline at end of file
diff --git a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/DefaultWorkFlowManager.java b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/DefaultWorkFlowManager.java
index 7b1bb33be..22e176523 100644
--- a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/DefaultWorkFlowManager.java
+++ b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/DefaultWorkFlowManager.java
@@ -31,9 +31,7 @@
 import com.webank.wedatasphere.dss.common.utils.IoUtils;
 import com.webank.wedatasphere.dss.common.utils.ZipHelper;
 import com.webank.wedatasphere.dss.orchestrator.common.protocol.RequestConvertOrchestrations;
-import com.webank.wedatasphere.dss.orchestrator.common.protocol.RequestPushOrchestrator;
 import com.webank.wedatasphere.dss.orchestrator.common.protocol.ResponseOperateOrchestrator;
-import com.webank.wedatasphere.dss.orchestrator.common.protocol.ResponsePushOrchestrator;
 import com.webank.wedatasphere.dss.orchestrator.converter.standard.operation.DSSToRelConversionOperation;
 import com.webank.wedatasphere.dss.orchestrator.converter.standard.ref.DSSToRelConversionRequestRef;
 import com.webank.wedatasphere.dss.orchestrator.converter.standard.ref.OrchestrationToRelConversionRequestRef;
@@ -72,8 +70,6 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.*;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipFile;
@@ -465,20 +461,6 @@ public ResponseLockWorkflow lockWorkFlow(RequestLockWorkflow requestLockWorkflow
     }
 
 
-    @Override
-    public ResponsePushOrchestrator updateLockStatus(RequestPushOrchestrator requestPushOrchestrator) {
-        String status = lockMapper.selectStatusByFlowId(requestPushOrchestrator.getFlowId());
-        logger.info("status is :" +  status);
-        logger.info("flowId is :" +  requestPushOrchestrator.getFlowId());
-        if (StringUtils.isEmpty(status)) {
-            lockMapper.insertFlowStatus(requestPushOrchestrator.getFlowId(), DSSWorkFlowConstant.FLOW_STATUS_PUSH);
-        } else {
-            lockMapper.updateFlowStatus(requestPushOrchestrator.getFlowId(), DSSWorkFlowConstant.FLOW_STATUS_PUSH);
-        }
-
-        status = lockMapper.selectStatusByFlowId(requestPushOrchestrator.getFlowId());
-        return new ResponsePushOrchestrator(status);
-    }
 
 }
 
diff --git a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/WorkFlowManager.java b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/WorkFlowManager.java
index d99c5b3b2..1d328d8d6 100644
--- a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/WorkFlowManager.java
+++ b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/WorkFlowManager.java
@@ -22,9 +22,7 @@
 import com.webank.wedatasphere.dss.common.exception.DSSErrorException;
 import com.webank.wedatasphere.dss.common.label.DSSLabel;
 import com.webank.wedatasphere.dss.orchestrator.common.protocol.RequestConvertOrchestrations;
-import com.webank.wedatasphere.dss.orchestrator.common.protocol.RequestPushOrchestrator;
 import com.webank.wedatasphere.dss.orchestrator.common.protocol.ResponseOperateOrchestrator;
-import com.webank.wedatasphere.dss.orchestrator.common.protocol.ResponsePushOrchestrator;
 import com.webank.wedatasphere.dss.standard.app.sso.Workspace;
 import com.webank.wedatasphere.dss.workflow.common.entity.DSSFlow;
 import com.webank.wedatasphere.dss.workflow.common.protocol.*;
@@ -33,7 +31,6 @@
 
 import java.io.IOException;
 import java.util.List;
-import java.util.Map;
 
 public interface WorkFlowManager {
 
@@ -162,5 +159,5 @@ List<DSSFlow> importWorkflow(String userName,
 
     ResponseLockWorkflow lockWorkFlow(RequestLockWorkflow requestLockWorkflow) throws DSSErrorException;
 
-    ResponsePushOrchestrator updateLockStatus(RequestPushOrchestrator requestPushOrchestrator);
+
 }
diff --git a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/constant/DSSWorkFlowConstant.java b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/constant/DSSWorkFlowConstant.java
index 9167d8634..a0c2c8a34 100644
--- a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/constant/DSSWorkFlowConstant.java
+++ b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/constant/DSSWorkFlowConstant.java
@@ -60,10 +60,5 @@ public class DSSWorkFlowConstant {
      * 仅仅用于兼容老的、已经创建的工作量，用于自动路由到一个默认的调度系统。
      */
     public static final CommonVars<String> DEFAULT_SCHEDULER_APP_CONN = CommonVars.apply("wds.dss.workflow.scheduler.default", "schedulis");
-    /**
-     * 工作流状态：save-已发布 push-已提交 publish-已保存
-     */
-    public static final String FLOW_STATUS_SAVE = "save";
-    public static final String FLOW_STATUS_PUSH = "push";
-    public static final String FLOW_STATUS_PUBLISH = "publish";
+
 }
diff --git a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/dao/LockMapper.java b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/dao/LockMapper.java
index ec741e671..ea78e06f1 100644
--- a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/dao/LockMapper.java
+++ b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/dao/LockMapper.java
@@ -57,9 +57,9 @@ Boolean flowNotExistEditLock(@Param("flowID") Long flowID,
 
     void insertFlowStatus(@Param("flowID") Long flowID, @Param("status") String status);
 
-    void updateFlowStatus(@Param("flowID") Long flowID, @Param("status") String status);
+    void updateOrchestratorStatus(@Param("flowID") Long flowID, @Param("status") String status);
 
-    List<String> selectFlowIdByStatus( @Param("status") String status);
+    List<String> selectOrchestratorByStatus( @Param("status") String status);
 
-    String selectStatusByFlowId(@Param("flowID") Long flowID);
+    String selectOrchestratorStatus(@Param("flowID") Long flowID);
 }
diff --git a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/dao/impl/lockMapper.xml b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/dao/impl/lockMapper.xml
index 3a78c3bd3..a0d99aa1d 100644
--- a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/dao/impl/lockMapper.xml
+++ b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/dao/impl/lockMapper.xml
@@ -87,17 +87,20 @@
         (#{flowID}, #{status}, NOW(), NOW())
     </insert>
 
-    <update id="updateFlowStatus">
-        update dss_workflow_status set `status` = #{status}, `update_time` = NOW()
-        where `flow_id` = #{flowID}
+    <update id="updateOrchestratorStatus">
+        update dss_orchestrator
+        <set>
+            `status` = #{status}
+        </set>
+        where `id` = #{id}
     </update>
 
-    <select id="selectFlowIdByStatus" resultType="java.lang.String">
-        select `flow_id` from dss_workflow_status where `status` = #{status}
+    <select id="selectOrchestratorStatus" resultType="java.lang.String">
+        select `status` from dss_orchestrator where `id` = #{id}
     </select>
 
-    <select id="selectStatusByFlowId" resultType="java.lang.String">
-        select `status` from dss_workflow_status where `flow_id` = #{flowID} order by update_time desc limit 1
+    <select id="selectOrchestratorByStatus" resultType="java.lang.Long">
+        select id from dss_orchestrator where `status` = #{status}
     </select>
 
 </mapper>
\ No newline at end of file
diff --git a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/lock/DSSFlowEditLockManager.java b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/lock/DSSFlowEditLockManager.java
index 37735bbb4..f20c4e6d2 100644
--- a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/lock/DSSFlowEditLockManager.java
+++ b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/lock/DSSFlowEditLockManager.java
@@ -23,6 +23,7 @@
 import com.webank.wedatasphere.dss.common.utils.RpcAskUtils;
 import com.webank.wedatasphere.dss.git.common.protocol.request.GitCommitRequest;
 import com.webank.wedatasphere.dss.git.common.protocol.response.GitCommitResponse;
+import com.webank.wedatasphere.dss.orchestrator.common.ref.OrchestratorRefConstant;
 import com.webank.wedatasphere.dss.sender.service.DSSSenderServiceFactory;
 import com.webank.wedatasphere.dss.workflow.common.entity.DSSFlow;
 import com.webank.wedatasphere.dss.workflow.constant.DSSWorkFlowConstant;
@@ -33,7 +34,6 @@
 import org.apache.linkis.common.utils.Utils;
 import org.apache.commons.lang.StringUtils;
 import org.apache.linkis.rpc.Sender;
-import org.apache.poi.util.StringUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.dao.DuplicateKeyException;
@@ -45,9 +45,6 @@
 import java.util.concurrent.Delayed;
 import java.util.concurrent.TimeUnit;
 
-import static com.webank.wedatasphere.dss.workflow.constant.DSSWorkFlowConstant.FLOW_STATUS_PUSH;
-import static com.webank.wedatasphere.dss.workflow.constant.DSSWorkFlowConstant.FLOW_STATUS_SAVE;
-
 
 /**
  * 工作流编辑分布式锁
@@ -73,15 +70,12 @@ protected DSSFlowEditLockManager() {
         LOGGER.info("unLockEvents移除定时线程开启...");
         LOGGER.info("编辑锁超时时间为：{} ms", DSSWorkFlowConstant.DSS_FLOW_EDIT_LOCK_TIMEOUT.getValue());
         init();
-        //程序重启时，删除所有编辑锁
-        List<String> publishList = lockMapper.selectFlowIdByStatus(DSSWorkFlowConstant.FLOW_STATUS_PUBLISH);
-        List<String> pushList = lockMapper.selectFlowIdByStatus(DSSWorkFlowConstant.FLOW_STATUS_PUSH);
-        List<String> result = new ArrayList<>();
-        result.addAll(publishList);
-        result.addAll(pushList);
-        if (!CollectionUtils.isEmpty(result)) {
-            lockMapper.deleteExpectAfterSave(result);
+        // 对于工作流状态为已保存的，不自动解锁，该工作流的锁永不过期
+        List<String> saveList = lockMapper.selectOrchestratorByStatus(OrchestratorRefConstant.FLOW_STATUS_SAVE);
+        if (!CollectionUtils.isEmpty(saveList)) {
+            lockMapper.deleteExpectAfterSave(saveList);
         }else {
+            //程序重启时，删除所有编辑锁
             lockMapper.deleteALL();
         }
         Utils.defaultScheduler().scheduleAtFixedRate(() -> {
@@ -200,10 +194,10 @@ public static void deleteLock(String flowEditLock) throws DSSErrorException {
                     DSSProject projectInfo = getProjectInfo(dssFlow.getProjectId());
                     // 对于接入Git的项目，工作流解锁加入额外处理
                     if (projectInfo.getAssociateGit()) {
-                        String status = lockMapper.selectStatusByFlowId(dssFlowEditLock.getFlowID());
-                        if (!StringUtils.isEmpty(status) && DSSWorkFlowConstant.FLOW_STATUS_SAVE.equals(status)) {
-//                        pushProject(projectInfo.getName(), projectInfo.getWorkspaceId(), "resurce", "version", "path", projectInfo.getUsername(), "comment");
-                            lockMapper.insertFlowStatus(dssFlow.getId(), FLOW_STATUS_PUSH);
+                        String status = lockMapper.selectOrchestratorStatus(dssFlowEditLock.getFlowID());
+                        if (!StringUtils.isEmpty(status) && OrchestratorRefConstant.FLOW_STATUS_SAVE.equals(status)) {
+                            pushProject(projectInfo.getName(), new Long(projectInfo.getWorkspaceId()), dssFlow.getResourceId(), dssFlow.getBmlVersion(), dssFlow.getName(), projectInfo.getUsername(), "force unlock");
+                            lockMapper.updateOrchestratorStatus(dssFlow.getId(), OrchestratorRefConstant.FLOW_STATUS_PUSH);
                         }
                     }
                     lockMapper.clearExpire(sdf.get().format(new Date(System.currentTimeMillis() - DSSWorkFlowConstant.DSS_FLOW_EDIT_LOCK_TIMEOUT.getValue())), dssFlowEditLock.getFlowID());
@@ -262,8 +256,8 @@ public static String updateLock(String lock) throws DSSErrorException {
     }
 
     public static boolean isLockExpire(DSSFlowEditLock flowEditLock) {
-        String status = lockMapper.selectStatusByFlowId(flowEditLock.getFlowID());
-        if (StringUtils.isEmpty(status) && DSSWorkFlowConstant.FLOW_STATUS_SAVE.equals(status)) {
+        String status = lockMapper.selectOrchestratorStatus(flowEditLock.getFlowID());
+        if (StringUtils.isEmpty(status) && OrchestratorRefConstant.FLOW_STATUS_SAVE.equals(status)) {
             return false;
         }
         return System.currentTimeMillis() - flowEditLock.getUpdateTime().getTime() >= DSSWorkFlowConstant.DSS_FLOW_EDIT_LOCK_TIMEOUT.getValue();
diff --git a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/service/impl/DSSFlowServiceImpl.java b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/service/impl/DSSFlowServiceImpl.java
index 04fbe5414..4f3b332a0 100644
--- a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/service/impl/DSSFlowServiceImpl.java
+++ b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/service/impl/DSSFlowServiceImpl.java
@@ -36,6 +36,7 @@
 import com.webank.wedatasphere.dss.common.utils.MapUtils;
 import com.webank.wedatasphere.dss.contextservice.service.ContextService;
 import com.webank.wedatasphere.dss.contextservice.service.impl.ContextServiceImpl;
+import com.webank.wedatasphere.dss.orchestrator.common.ref.OrchestratorRefConstant;
 import com.webank.wedatasphere.dss.standard.app.development.utils.DSSJobContentConstant;
 import com.webank.wedatasphere.dss.standard.app.sso.Workspace;
 import com.webank.wedatasphere.dss.workflow.WorkFlowManager;
@@ -316,13 +317,8 @@ public String saveFlow(Long flowID,
         try {
             DSSProject projectInfo = DSSFlowEditLockManager.getProjectInfo(dssFlow.getProjectId());
             //仅对接入Git的项目 更新状态为 保存
-            if (projectInfo.getAssociateGit()) {
-                String status = lockMapper.selectStatusByFlowId(flowID);
-                if (StringUtils.isEmpty(status)) {
-                    lockMapper.insertFlowStatus(flowID, FLOW_STATUS_SAVE);
-                } else {
-                    lockMapper.updateFlowStatus(flowID, FLOW_STATUS_SAVE);
-                }
+            if (projectInfo.getAssociateGit() != null && projectInfo.getAssociateGit()) {
+                lockMapper.updateOrchestratorStatus(flowID, OrchestratorRefConstant.FLOW_STATUS_SAVE);
             }
         } catch (DSSErrorException e) {
             logger.error("getProjectInfo failed by:", e);
diff --git a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/service/impl/PublishServiceImpl.java b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/service/impl/PublishServiceImpl.java
index 42351d267..834259aea 100644
--- a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/service/impl/PublishServiceImpl.java
+++ b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/service/impl/PublishServiceImpl.java
@@ -26,6 +26,7 @@
 import com.webank.wedatasphere.dss.orchestrator.common.protocol.RequestFrameworkConvertOrchestration;
 import com.webank.wedatasphere.dss.orchestrator.common.protocol.RequestFrameworkConvertOrchestrationStatus;
 import com.webank.wedatasphere.dss.orchestrator.common.protocol.ResponseConvertOrchestrator;
+import com.webank.wedatasphere.dss.orchestrator.common.ref.OrchestratorRefConstant;
 import com.webank.wedatasphere.dss.sender.service.DSSSenderServiceFactory;
 import com.webank.wedatasphere.dss.standard.app.sso.Workspace;
 import com.webank.wedatasphere.dss.standard.common.desc.AppInstance;
@@ -33,7 +34,6 @@
 import com.webank.wedatasphere.dss.workflow.common.parser.WorkFlowParser;
 import com.webank.wedatasphere.dss.workflow.constant.DSSWorkFlowConstant;
 import com.webank.wedatasphere.dss.workflow.dao.LockMapper;
-import com.webank.wedatasphere.dss.workflow.lock.DSSFlowEditLockManager;
 import com.webank.wedatasphere.dss.workflow.service.DSSFlowService;
 import com.webank.wedatasphere.dss.workflow.service.PublishService;
 import org.apache.commons.lang.StringUtils;
@@ -102,13 +102,8 @@ public String submitPublish(String convertUser, Long workflowId,
                 throw new DSSErrorException(50311, response.getResponse().getMessage());
             }
             //仅对接入Git的项目更新状态为 发布-publish
-            if (dssProject.getAssociateGit()) {
-                String status = lockMapper.selectStatusByFlowId(workflowId);
-                if (StringUtils.isEmpty(status)) {
-                    lockMapper.insertFlowStatus(workflowId, DSSWorkFlowConstant.FLOW_STATUS_PUBLISH);
-                } else {
-                    lockMapper.updateFlowStatus(workflowId,DSSWorkFlowConstant.FLOW_STATUS_PUBLISH);
-                }
+            if (dssProject.getAssociateGit() != null && dssProject.getAssociateGit()) {
+                lockMapper.updateOrchestratorStatus(workflowId,OrchestratorRefConstant.FLOW_STATUS_PUBLISH);
             }
 
             return response.getId();
diff --git a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/scala/com/webank/wedatasphere/dss/workflow/receiver/DSSWorkflowChooser.scala b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/scala/com/webank/wedatasphere/dss/workflow/receiver/DSSWorkflowChooser.scala
index c2eeb3f65..28625b71c 100644
--- a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/scala/com/webank/wedatasphere/dss/workflow/receiver/DSSWorkflowChooser.scala
+++ b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/scala/com/webank/wedatasphere/dss/workflow/receiver/DSSWorkflowChooser.scala
@@ -51,7 +51,6 @@ class DSSWorkflowChooser extends ReceiverChooser {
     case _: RequestSubFlowContextIds => receiver
     case _: RequestDeleteBmlSource => receiver
     case _: RequestLockWorkflow => receiver
-    case _: RequestPushOrchestrator => receiver
 
     case _ => None
   }
diff --git a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/scala/com/webank/wedatasphere/dss/workflow/receiver/DSSWorkflowReceiver.scala b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/scala/com/webank/wedatasphere/dss/workflow/receiver/DSSWorkflowReceiver.scala
index 464305817..9c8276dcd 100644
--- a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/scala/com/webank/wedatasphere/dss/workflow/receiver/DSSWorkflowReceiver.scala
+++ b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/scala/com/webank/wedatasphere/dss/workflow/receiver/DSSWorkflowReceiver.scala
@@ -20,7 +20,7 @@ import com.webank.wedatasphere.dss.common.entity.BmlResource
 import com.webank.wedatasphere.dss.common.exception.DSSErrorException
 import com.webank.wedatasphere.dss.common.protocol._
 import com.webank.wedatasphere.dss.common.utils.DSSCommonUtils
-import com.webank.wedatasphere.dss.orchestrator.common.protocol.{RequestConvertOrchestrations, RequestPushOrchestrator}
+import com.webank.wedatasphere.dss.orchestrator.common.protocol.RequestConvertOrchestrations
 import com.webank.wedatasphere.dss.standard.app.sso.Workspace
 import com.webank.wedatasphere.dss.workflow.WorkFlowManager
 import com.webank.wedatasphere.dss.workflow.common.entity.DSSFlow
@@ -110,9 +110,6 @@ class DSSWorkflowReceiver(workflowManager: WorkFlowManager)  extends Receiver {
     case requestLockWorkflow: RequestLockWorkflow =>
       workflowManager.lockWorkFlow(requestLockWorkflow)
 
-    case requestPushOrchestrator: RequestPushOrchestrator =>
-      workflowManager.updateLockStatus(requestPushOrchestrator)
-
     case _ => throw new DSSErrorException(90000, "Not support protocol " + message)
   }
 

From 2e2e3967466009e0e9d865fe1a9398350b328522 Mon Sep 17 00:00:00 2001
From: qweqnotallow <747839893@qq.com>
Date: Tue, 30 Apr 2024 15:04:20 +0800
Subject: [PATCH 080/302] clear OrchestratorFrameworkServiceImpl info

---
 .../protocol/request/GitUserInfoRequest.java                 | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/dss-git/dss-git-common/src/main/java/com.webank.wedatasphere.dss.git.common/protocol/request/GitUserInfoRequest.java b/dss-git/dss-git-common/src/main/java/com.webank.wedatasphere.dss.git.common/protocol/request/GitUserInfoRequest.java
index cce0ae3d2..215abc9bc 100644
--- a/dss-git/dss-git-common/src/main/java/com.webank.wedatasphere.dss.git.common/protocol/request/GitUserInfoRequest.java
+++ b/dss-git/dss-git-common/src/main/java/com.webank.wedatasphere.dss.git.common/protocol/request/GitUserInfoRequest.java
@@ -1,9 +1,6 @@
 package com.webank.wedatasphere.dss.git.common.protocol.request;
 
-/**
- * @author zhaobincai
- * @date 2024/4/26 15:17
- */
+
 public class GitUserInfoRequest {
     private Long workspaceId;
     private String type;

From fd9c3d54e193713ac38cb483ef2c0cb2c529584a Mon Sep 17 00:00:00 2001
From: xlinliu <arionliu@webank.com>
Date: Tue, 30 Apr 2024 15:40:10 +0800
Subject: [PATCH 081/302] fix

---
 .../entrance/utils/FlowExecutionUtils.scala    | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/dss-orchestrator/orchestrators/dss-workflow/dss-flow-execution-server/src/main/scala/com/webank/wedatasphere/dss/flow/execution/entrance/utils/FlowExecutionUtils.scala b/dss-orchestrator/orchestrators/dss-workflow/dss-flow-execution-server/src/main/scala/com/webank/wedatasphere/dss/flow/execution/entrance/utils/FlowExecutionUtils.scala
index ddc30ad09..f7f482d34 100644
--- a/dss-orchestrator/orchestrators/dss-workflow/dss-flow-execution-server/src/main/scala/com/webank/wedatasphere/dss/flow/execution/entrance/utils/FlowExecutionUtils.scala
+++ b/dss-orchestrator/orchestrators/dss-workflow/dss-flow-execution-server/src/main/scala/com/webank/wedatasphere/dss/flow/execution/entrance/utils/FlowExecutionUtils.scala
@@ -40,10 +40,20 @@ import scala.collection.JavaConverters.asScalaBufferConverter
 object FlowExecutionUtils {
 
   def isSkippedNode(node: WorkflowNode, paramsMap: java.util.Map[String, Any]): Boolean = {
-    val skip = Option(node.getDSSNode).map(_.getParams).map(_.get("configuration"))
-      .map(_.asInstanceOf[java.util.Map[String, Object]].get("special"))
-      .map(_.asInstanceOf[java.util.Map[String, Object]].get("auto.disabled"))
-      .map(_.toString).exists("true".equalsIgnoreCase)
+    val skip = Option(node.getDSSNode)
+      .flatMap(node => Option(node.getParams))
+      .flatMap(params => Option(params.get("configuration")))
+      .flatMap {
+        case config: java.util.Map[_, _] => Option(config.get("special"))
+        case _ => None
+      }
+      .flatMap {
+        case special: java.util.Map[_, _] => Option(special.get("auto.disabled"))
+        case _ => None
+      }
+      .map(_.toString)
+      .exists("true".equalsIgnoreCase)
+
     if (skip) {
       return true
     }

From c767aa50a3f7d51f34f79d16939510eaac9b8226 Mon Sep 17 00:00:00 2001
From: qweqnotallow <747839893@qq.com>
Date: Tue, 30 Apr 2024 17:10:33 +0800
Subject: [PATCH 082/302] get git Url cookie

---
 .../dss-framework-orchestrator-server/pom.xml | 21 +++++
 .../server/conf/OrchestratorConf.java         |  5 ++
 .../constant/DSSOrchestratorConstant.java     |  1 +
 .../DSSFrameworkOrchestratorRestful.java      | 49 ++++++++++++
 .../server/service/OrchestratorService.java   |  3 +
 .../service/impl/OrchestratorServiceImpl.java | 76 +++++++++++++++++++
 .../protocol/constant/GitConstant.java        |  7 ++
 .../protocol/util/UrlUtils.java               | 18 +++++
 .../impl/DSSGitProjectManagerServiceImpl.java |  7 +-
 .../DSSGitWorkflowManagerServiceImpl.java     | 11 +--
 10 files changed, 190 insertions(+), 8 deletions(-)
 create mode 100644 dss-git/dss-git-common/src/main/java/com.webank.wedatasphere.dss.git.common/protocol/constant/GitConstant.java
 create mode 100644 dss-git/dss-git-common/src/main/java/com.webank.wedatasphere.dss.git.common/protocol/util/UrlUtils.java

diff --git a/dss-framework/dss-framework-orchestrator-server/pom.xml b/dss-framework/dss-framework-orchestrator-server/pom.xml
index acdf06790..107ab9601 100644
--- a/dss-framework/dss-framework-orchestrator-server/pom.xml
+++ b/dss-framework/dss-framework-orchestrator-server/pom.xml
@@ -29,6 +29,27 @@
     <artifactId>dss-framework-orchestrator-server</artifactId>
 
     <dependencies>
+        <dependency>
+            <groupId>com.webank.wedatasphere.dss</groupId>
+            <artifactId>dss-git-common</artifactId>
+            <version>${dss.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.seleniumhq.selenium</groupId>
+            <artifactId>selenium-java</artifactId>
+            <version>3.9.1</version>
+            <scope>provided</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>com.google.guava</groupId>
+                    <artifactId>guava</artifactId>
+                </exclusion>
+                <exclusion>
+                    <artifactId>httpclient</artifactId>
+                    <groupId>org.apache.httpcomponents</groupId>
+                </exclusion>
+            </exclusions>
+        </dependency>
         <dependency>
             <groupId>com.webank.wedatasphere.dss</groupId>
             <artifactId>dss-git-common</artifactId>
diff --git a/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/conf/OrchestratorConf.java b/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/conf/OrchestratorConf.java
index 4ab4f9867..43d7cc5ba 100644
--- a/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/conf/OrchestratorConf.java
+++ b/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/conf/OrchestratorConf.java
@@ -25,4 +25,9 @@ public class OrchestratorConf {
     public static final CommonVars<String> DSS_CS_CLEAR_ENV = CommonVars.apply("wds.dss.server.cs.clear.env", "DEV");
     public static final  CommonVars<String> DSS_CS_CLEAR_CRON = CommonVars.apply("wds.dss.server.scheduling.clear.cs.cron", "");
 
+    public static final CommonVars<String> GIT_USER = CommonVars.apply("wds.dss.server.git.user", "user_login");
+    public static final CommonVars<String> GIT_PASSWD = CommonVars.apply("wds.dss.server.git.password", "user_password");
+    public static final CommonVars<String> GIT_SUBMIT = CommonVars.apply("wds.dss.server.git.submit", "input[class='btn btn-success qa-sign-in-button']");
+    public static final CommonVars<String> GIT_TIME = CommonVars.apply("wds.dss.server.git.time", "1");
+    public static final CommonVars<String> GIT_DOMAIN_URL = CommonVars.apply("wds.dss.server.git.url", ***REMOVED***
 }
diff --git a/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/constant/DSSOrchestratorConstant.java b/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/constant/DSSOrchestratorConstant.java
index 9fe2c841f..6b5d7b616 100644
--- a/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/constant/DSSOrchestratorConstant.java
+++ b/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/constant/DSSOrchestratorConstant.java
@@ -21,4 +21,5 @@ public class DSSOrchestratorConstant {
 
     //每次提交linkis清理数量控制在10个以下，超了接口就会返回超时
     public static final int MAX_CLEAR_SIZE = 10;
+    public static final String CHROME_DRIVER_PATH = "chromedriver";
 }
diff --git a/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/restful/DSSFrameworkOrchestratorRestful.java b/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/restful/DSSFrameworkOrchestratorRestful.java
index b0d24a3a1..a9b642a5f 100644
--- a/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/restful/DSSFrameworkOrchestratorRestful.java
+++ b/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/restful/DSSFrameworkOrchestratorRestful.java
@@ -24,7 +24,12 @@
 import com.webank.wedatasphere.dss.common.utils.AuditLogUtils;
 import com.webank.wedatasphere.dss.common.utils.RpcAskUtils;
 import com.webank.wedatasphere.dss.git.common.protocol.GitTree;
+import com.webank.wedatasphere.dss.git.common.protocol.constant.GitConstant;
+import com.webank.wedatasphere.dss.git.common.protocol.request.GitUserInfoRequest;
+import com.webank.wedatasphere.dss.git.common.protocol.response.GitUserInfoResponse;
+import com.webank.wedatasphere.dss.git.common.protocol.util.UrlUtils;
 import com.webank.wedatasphere.dss.orchestrator.common.entity.OrchestratorVo;
+import com.webank.wedatasphere.dss.orchestrator.server.conf.OrchestratorConf;
 import com.webank.wedatasphere.dss.orchestrator.server.constant.OrchestratorLevelEnum;
 import com.webank.wedatasphere.dss.orchestrator.server.entity.request.*;
 import com.webank.wedatasphere.dss.orchestrator.server.entity.vo.CommonOrchestratorVo;
@@ -38,6 +43,7 @@
 import com.webank.wedatasphere.dss.workflow.common.protocol.RequestLockWorkflow;
 import com.webank.wedatasphere.dss.workflow.common.protocol.ResponseLockWorkflow;
 import org.apache.commons.math3.util.Pair;
+import org.apache.linkis.rpc.Sender;
 import org.apache.linkis.server.Message;
 import org.apache.linkis.server.security.SecurityFilter;
 import org.slf4j.Logger;
@@ -47,9 +53,11 @@
 
 import javax.annotation.PostConstruct;
 import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
+import java.util.concurrent.ExecutionException;
 
 @RequestMapping(path = "/dss/framework/orchestrator", produces = {"application/json"})
 @RestController
@@ -311,4 +319,45 @@ public Message submitFlow(@RequestBody OrchestratorSubmitRequest submitFlowReque
         orchestratorFrameworkService.submitFlow(submitFlowRequest, userName, workspace);
         return Message.ok();
     }
+
+    @RequestMapping(path = "gitUrl", method = RequestMethod.GET)
+    public Message gitUrl(@RequestParam(required = true, name = "projectName") String projectName,
+                          @RequestParam(required = false, name = "workflowName") String workflowName,
+                          HttpServletResponse response) {
+        Workspace workspace = SSOHelper.getWorkspace(httpServletRequest);
+        String userName = SecurityFilter.getLoginUsername(httpServletRequest);
+
+        Sender sender = DSSSenderServiceFactory.getOrCreateServiceInstance().getGitSender();
+        GitUserInfoRequest gitUserInfoRequest = new GitUserInfoRequest();
+        gitUserInfoRequest.setWorkspaceId(workspace.getWorkspaceId());
+        gitUserInfoRequest.setType(GitConstant.GIT_ACCESS_WRITE_TYPE);
+
+        GitUserInfoResponse infoResponse = RpcAskUtils.processAskException(sender.ask(gitUserInfoRequest), GitUserInfoResponse.class, GitUserInfoRequest.class);
+        String gitUsername = infoResponse.getGitUser().getGitUser();
+        String gitPassword = infoResponse.getGitUser().getGitPassword();
+        String authenToken = "";
+        try {
+            authenToken = orchestratorService.getAuthenToken(gitUsername, gitPassword);
+        } catch (ExecutionException e) {
+            LOGGER.error("git登陆失败，原因为: ", e);
+            return Message.error("git登陆失败，请检查git节点配置的用户名/密码");
+        }
+        // 获取顶级域名
+        String domainIp = UrlUtils.normalizeIp(OrchestratorConf.GIT_DOMAIN_URL.getValue());
+        int lastDotIndex = domainIp.lastIndexOf(".");
+        String topDomain = "";
+        if (lastDotIndex != -1) {
+            int secondToLastIndexOf = domainIp.substring(0, lastDotIndex).lastIndexOf(".");
+            if (secondToLastIndexOf != -1) {
+                topDomain = domainIp.substring(secondToLastIndexOf);
+            }
+        }
+        String cookie = "_gitlab_session=" + authenToken + ";path=/; Domain="+ topDomain +"; HttpOnly; +";
+        LOGGER.info("Cookie is {}", cookie);
+        response.setHeader("Access-Control-Allow-Origin", topDomain);
+        response.addHeader("Set-Cookie", cookie);
+
+        return Message.ok();
+
+    }
 }
diff --git a/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/OrchestratorService.java b/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/OrchestratorService.java
index 9f3acac93..cc52ac063 100644
--- a/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/OrchestratorService.java
+++ b/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/OrchestratorService.java
@@ -32,6 +32,7 @@
 import com.webank.wedatasphere.dss.standard.app.sso.Workspace;
 
 import java.util.List;
+import java.util.concurrent.ExecutionException;
 
 
 public interface OrchestratorService {
@@ -139,4 +140,6 @@ String rollbackOrchestrator(String username, Long projectId, String projectName,
 
     void batchClearContextId();
 
+    String getAuthenToken(String gitUsername, String gitPassword) throws ExecutionException;
+
 }
diff --git a/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/impl/OrchestratorServiceImpl.java b/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/impl/OrchestratorServiceImpl.java
index 97275a3f1..f19ef5d60 100644
--- a/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/impl/OrchestratorServiceImpl.java
+++ b/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/impl/OrchestratorServiceImpl.java
@@ -29,6 +29,7 @@
 import com.webank.wedatasphere.dss.common.utils.RpcAskUtils;
 import com.webank.wedatasphere.dss.contextservice.service.ContextService;
 import com.webank.wedatasphere.dss.framework.common.exception.DSSFrameworkErrorException;
+import com.webank.wedatasphere.dss.git.common.protocol.util.UrlUtils;
 import com.webank.wedatasphere.dss.orchestrator.common.entity.DSSOrchestratorInfo;
 import com.webank.wedatasphere.dss.orchestrator.common.entity.DSSOrchestratorVersion;
 import com.webank.wedatasphere.dss.orchestrator.common.entity.OrchestratorVo;
@@ -66,6 +67,10 @@
 import org.apache.linkis.cs.client.ContextClient;
 import org.apache.linkis.cs.client.builder.ContextClientFactory;
 import org.apache.linkis.rpc.Sender;
+import org.openqa.selenium.*;
+import org.openqa.selenium.chrome.ChromeDriver;
+import org.openqa.selenium.chrome.ChromeDriverService;
+import org.openqa.selenium.chrome.ChromeOptions;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.BeanUtils;
@@ -73,8 +78,11 @@
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.io.File;
 import java.time.LocalDateTime;
 import java.util.*;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.TimeUnit;
 import java.util.function.BiFunction;
 import java.util.function.Consumer;
 import java.util.function.Function;
@@ -543,4 +551,72 @@ public void batchClearContextId() {
         }
     }
 
+    @Override
+    public String getAuthenToken(String gitUsername, String gitPassword) throws ExecutionException {
+        // 启动chromedriver
+        String url = "";
+        WebDriver driver = generateChromeDriver(this.getClass().getClassLoader().getResource(DSSOrchestratorConstant.CHROME_DRIVER_PATH).getPath(), null);
+        String token = "";
+        try {
+            //设置超时时间
+            driver.manage().timeouts().implicitlyWait(Long.parseLong(OrchestratorConf.GIT_TIME.getValue()), TimeUnit.SECONDS);
+            driver.manage().window().maximize();
+            driver.manage().window().setSize(new Dimension(1920, 1080));
+            driver.get(UrlUtils.normalizeIp(url));
+            WebElement elementUserName = driver.findElement(By.id(OrchestratorConf.GIT_USER.getValue()));
+            WebElement elementPassWord = driver.findElement(By.id(OrchestratorConf.GIT_PASSWD.getValue()));
+            WebElement elementBtn = driver.findElement(By.cssSelector(OrchestratorConf.GIT_SUBMIT.getValue()));
+            elementUserName.sendKeys(gitUsername);
+            elementPassWord.sendKeys(gitPassword);
+            elementBtn.submit();
+            driver.navigate().refresh();
+            LOGGER.info("for user getting... " + UrlUtils.normalizeIp(OrchestratorConf.GIT_DOMAIN_URL.getValue()));
+            Set<Cookie> cookies = driver.manage().getCookies();
+            LOGGER.info("cookies： {}", cookies.toString());
+            for (Cookie cookie:cookies) {
+                if (cookie.getName().equals("_gitlab_session"))
+                {
+                    token = cookie.getValue();
+                    break;
+                }
+            }
+            LOGGER.info("driver cookies: {}", token);
+        } catch (Exception e) {
+            LOGGER.info("error bescause: ", e);
+        } finally {
+            driver.manage().deleteAllCookies();
+            driver.quit();
+        }
+        return token;
+    }
+
+
+    private WebDriver generateChromeDriver(String path, Proxy seleniumProxy) throws ExecutionException {
+        File file = new File(path);
+        if (!file.canExecute() && !file.setExecutable(true)) {
+            throw new ExecutionException(new Exception(path + "is not executable!"));
+        }
+
+        System.setProperty(ChromeDriverService.CHROME_DRIVER_EXE_PROPERTY, path);
+
+        ChromeOptions options = new ChromeOptions();
+        options.setProxy(seleniumProxy);
+        options.addArguments("headless");
+        options.addArguments("no-sandbox");
+        options.addArguments("disable-gpu");
+        options.addArguments("--disable-notifications");
+        options.addArguments("--disable-popup-blocking");
+        options.addArguments("disable-features=NetworkService");
+        options.addArguments("ignore-certificate-errors");
+        options.addArguments("silent");
+        options.addArguments("--disable-application-cache");
+
+        options.addArguments("disable-dev-shm-usage");
+        options.addArguments("remote-debugging-port=9012");
+
+
+
+        return new ChromeDriver(options);
+    }
+
 }
\ No newline at end of file
diff --git a/dss-git/dss-git-common/src/main/java/com.webank.wedatasphere.dss.git.common/protocol/constant/GitConstant.java b/dss-git/dss-git-common/src/main/java/com.webank.wedatasphere.dss.git.common/protocol/constant/GitConstant.java
new file mode 100644
index 000000000..61d21882e
--- /dev/null
+++ b/dss-git/dss-git-common/src/main/java/com.webank.wedatasphere.dss.git.common/protocol/constant/GitConstant.java
@@ -0,0 +1,7 @@
+package com.webank.wedatasphere.dss.git.common.protocol.constant;
+
+
+public class GitConstant {
+    public static String GIT_ACCESS_WRITE_TYPE = "write";
+    public static String GIT_ACCESS_READ_TYPE = "read";
+}
diff --git a/dss-git/dss-git-common/src/main/java/com.webank.wedatasphere.dss.git.common/protocol/util/UrlUtils.java b/dss-git/dss-git-common/src/main/java/com.webank.wedatasphere.dss.git.common/protocol/util/UrlUtils.java
new file mode 100644
index 000000000..fc785cfd4
--- /dev/null
+++ b/dss-git/dss-git-common/src/main/java/com.webank.wedatasphere.dss.git.common/protocol/util/UrlUtils.java
@@ -0,0 +1,18 @@
+package com.webank.wedatasphere.dss.git.common.protocol.util;
+
+import java.io.File;
+
+
+public class UrlUtils {
+
+    public static String normalizeIp(String ip) {
+        ip = ip.trim();
+        if(!ip.contains("http")) {
+            ip = "http://" + ip;
+        }
+        while(ip.endsWith("/")) {
+            ip = ip.substring(0, ip.length()-1);
+        }
+        return ip;
+    }
+}
diff --git a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitProjectManagerServiceImpl.java b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitProjectManagerServiceImpl.java
index 60d4af33b..ad83eaa9c 100644
--- a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitProjectManagerServiceImpl.java
+++ b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitProjectManagerServiceImpl.java
@@ -3,6 +3,7 @@
 import com.webank.wedatasphere.dss.common.exception.DSSErrorException;
 import com.webank.wedatasphere.dss.common.service.BMLService;
 import com.webank.wedatasphere.dss.git.common.protocol.GitUserEntity;
+import com.webank.wedatasphere.dss.git.common.protocol.constant.GitConstant;
 import com.webank.wedatasphere.dss.git.common.protocol.request.*;
 import com.webank.wedatasphere.dss.git.common.protocol.response.*;
 import com.webank.wedatasphere.dss.git.config.GitServerConfig;
@@ -35,7 +36,7 @@ public class DSSGitProjectManagerServiceImpl  implements DSSGitProjectManagerSer
     @Override
     public GitCreateProjectResponse create(GitCreateProjectRequest request) {
         logger.info("-------=======================beginning to create testGit1=======================-------");
-        GitUserEntity gitUser = dssWorkspaceGitService.selectGit(request.getWorkspaceId(), DSSGitConstant.GIT_ACCESS_WRITE_TYPE);
+        GitUserEntity gitUser = dssWorkspaceGitService.selectGit(request.getWorkspaceId(), GitConstant.GIT_ACCESS_WRITE_TYPE);
         if (gitUser == null) {
             logger.error("the workspace : {} don't associate with git", request.getWorkspaceId());
             return null;
@@ -65,7 +66,7 @@ public GitCreateProjectResponse create(GitCreateProjectRequest request) {
 
     @Override
     public GitArchivePorjectResponse archive(GitArchiveProjectRequest request) {
-        GitUserEntity gitUser = dssWorkspaceGitService.selectGit(request.getWorkspaceId(), DSSGitConstant.GIT_ACCESS_WRITE_TYPE);
+        GitUserEntity gitUser = dssWorkspaceGitService.selectGit(request.getWorkspaceId(), GitConstant.GIT_ACCESS_WRITE_TYPE);
         if (gitUser == null) {
             logger.error("the workspace : {} don't associate with git", request.getWorkspaceId());
             return null;
@@ -79,7 +80,7 @@ public GitArchivePorjectResponse archive(GitArchiveProjectRequest request) {
 
     @Override
     public GitCheckProjectResponse checkProject(GitCheckProjectRequest request) throws DSSErrorException {
-        GitUserEntity gitUser = dssWorkspaceGitService.selectGit(request.getWorkspaceId(), DSSGitConstant.GIT_ACCESS_WRITE_TYPE);
+        GitUserEntity gitUser = dssWorkspaceGitService.selectGit(request.getWorkspaceId(), GitConstant.GIT_ACCESS_WRITE_TYPE);
         if (gitUser == null) {
             logger.error("the workspace : {} don't associate with git", request.getWorkspaceId());
             return null;
diff --git a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitWorkflowManagerServiceImpl.java b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitWorkflowManagerServiceImpl.java
index c84129e31..d3afb9193 100644
--- a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitWorkflowManagerServiceImpl.java
+++ b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitWorkflowManagerServiceImpl.java
@@ -4,6 +4,7 @@
 import com.webank.wedatasphere.dss.common.exception.DSSErrorException;
 import com.webank.wedatasphere.dss.common.service.BMLService;
 import com.webank.wedatasphere.dss.git.common.protocol.GitUserEntity;
+import com.webank.wedatasphere.dss.git.common.protocol.constant.GitConstant;
 import com.webank.wedatasphere.dss.git.common.protocol.request.*;
 import com.webank.wedatasphere.dss.git.common.protocol.response.*;
 import com.webank.wedatasphere.dss.git.config.GitServerConfig;
@@ -42,7 +43,7 @@ public class DSSGitWorkflowManagerServiceImpl implements DSSGitWorkflowManagerSe
     private BMLService bmlService;
     @Override
     public GitDiffResponse diff(GitDiffRequest request) {
-        GitUserEntity gitUser = dssWorkspaceGitService.selectGit(request.getWorkspaceId(), DSSGitConstant.GIT_ACCESS_WRITE_TYPE);
+        GitUserEntity gitUser = dssWorkspaceGitService.selectGit(request.getWorkspaceId(), GitConstant.GIT_ACCESS_WRITE_TYPE);
         if (gitUser == null) {
             logger.error("the workspace : {} don't associate with git", request.getWorkspaceId());
             return null;
@@ -79,7 +80,7 @@ public GitDiffResponse diff(GitDiffRequest request) {
 
     @Override
     public GitCommitResponse commit(GitCommitRequest request) {
-        GitUserEntity gitUser = dssWorkspaceGitService.selectGit(request.getWorkspaceId(), DSSGitConstant.GIT_ACCESS_WRITE_TYPE);
+        GitUserEntity gitUser = dssWorkspaceGitService.selectGit(request.getWorkspaceId(), GitConstant.GIT_ACCESS_WRITE_TYPE);
         if (gitUser == null) {
             logger.error("the workspace : {} don't associate with git", request.getWorkspaceId());
             return null;
@@ -235,7 +236,7 @@ private List<String> process(List<String> commands) {
 
     @Override
     public GitDeleteResponse delete(GitDeleteRequest request) {
-        GitUserEntity gitUser = dssWorkspaceGitService.selectGit(request.getWorkspaceId(), DSSGitConstant.GIT_ACCESS_WRITE_TYPE);
+        GitUserEntity gitUser = dssWorkspaceGitService.selectGit(request.getWorkspaceId(), GitConstant.GIT_ACCESS_WRITE_TYPE);
         if (gitUser == null) {
             logger.error("the workspace : {} don't associate with git", request.getWorkspaceId());
             return null;
@@ -273,7 +274,7 @@ public GitDeleteResponse delete(GitDeleteRequest request) {
 
     @Override
     public GitFileContentResponse getFileContent(GitFileContentRequest request) {
-        GitUserEntity gitUser = dssWorkspaceGitService.selectGit(request.getWorkspaceId(), DSSGitConstant.GIT_ACCESS_WRITE_TYPE);
+        GitUserEntity gitUser = dssWorkspaceGitService.selectGit(request.getWorkspaceId(), GitConstant.GIT_ACCESS_WRITE_TYPE);
         if (gitUser == null) {
             logger.error("the workspace : {} don't associate with git", request.getWorkspaceId());
             return null;
@@ -307,7 +308,7 @@ public GitFileContentResponse getFileContent(GitFileContentRequest request) {
 
     @Override
     public GitHistoryResponse getHistory(GitHistoryRequest request) {
-        GitUserEntity gitUser = dssWorkspaceGitService.selectGit(request.getWorkspaceId(), DSSGitConstant.GIT_ACCESS_WRITE_TYPE);
+        GitUserEntity gitUser = dssWorkspaceGitService.selectGit(request.getWorkspaceId(), GitConstant.GIT_ACCESS_WRITE_TYPE);
         if (gitUser == null) {
             logger.error("the workspace : {} don't associate with git", request.getWorkspaceId());
             return null;

From d5150ae96ef8f70caa3af305bf5515146bfb0e75 Mon Sep 17 00:00:00 2001
From: qweqnotallow <747839893@qq.com>
Date: Tue, 30 Apr 2024 17:54:45 +0800
Subject: [PATCH 083/302] get git Url cookie fix

---
 dss-framework/dss-framework-orchestrator-server/pom.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/dss-framework/dss-framework-orchestrator-server/pom.xml b/dss-framework/dss-framework-orchestrator-server/pom.xml
index 107ab9601..64849214f 100644
--- a/dss-framework/dss-framework-orchestrator-server/pom.xml
+++ b/dss-framework/dss-framework-orchestrator-server/pom.xml
@@ -38,7 +38,6 @@
             <groupId>org.seleniumhq.selenium</groupId>
             <artifactId>selenium-java</artifactId>
             <version>3.9.1</version>
-            <scope>provided</scope>
             <exclusions>
                 <exclusion>
                     <groupId>com.google.guava</groupId>

From ef272d6d1ac4ce07452e40ba0316e7a2710e065a Mon Sep 17 00:00:00 2001
From: nullpoint12138 <zhouxuannihao@qq.com>
Date: Tue, 30 Apr 2024 18:32:06 +0800
Subject: [PATCH 084/302] =?UTF-8?q?1.4.0=E7=BC=96=E6=8E=92=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E6=98=AF=E5=90=A6=E9=BB=98=E8=AE=A4=E5=BC=95=E7=94=A8?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5,=E8=8E=B7=E5=8F=96=E5=B7=A5=E4=BD=9C?=
 =?UTF-8?q?=E7=A9=BA=E9=97=B4=E6=89=80=E6=9C=89=E5=91=98=E5=B7=A5=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E9=83=A8=E9=97=A8=E7=A7=91=E5=AE=A4=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../request/OrchestratorCreateRequest.java    | 10 ++++++
 .../request/OrchestratorModifyRequest.java    | 10 ++++++
 .../OrchestratorFrameworkServiceImpl.java     |  2 ++
 .../bean/vo/DSSWorkspaceUsersVo.java          | 23 ++++---------
 .../workspace/bean/vo/DepartmentUserVo.java   | 33 +++++++++++++++++++
 .../restful/DSSWorkspaceUserRestful.java      |  9 ++---
 .../service/DSSWorkspaceUserService.java      |  3 +-
 .../impl/DSSWorkspaceUserServiceImpl.java     | 26 +++++++++++++--
 .../common/entity/DSSOrchestratorInfo.java    | 13 ++++++++
 .../db/dao/impl/orchestratorMapper.xml        |  6 ++--
 10 files changed, 107 insertions(+), 28 deletions(-)
 create mode 100644 dss-framework/dss-framework-workspace-server/src/main/java/com/webank/wedatasphere/dss/framework/workspace/bean/vo/DepartmentUserVo.java

diff --git a/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/entity/request/OrchestratorCreateRequest.java b/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/entity/request/OrchestratorCreateRequest.java
index d374b668c..7c63b2c59 100644
--- a/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/entity/request/OrchestratorCreateRequest.java
+++ b/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/entity/request/OrchestratorCreateRequest.java
@@ -52,6 +52,8 @@ public class OrchestratorCreateRequest extends OrchestratorRequest {
 
     private String workspaceName;
 
+    private String isDefaultReference;
+
     public OrchestratorCreateRequest() {
     }
 
@@ -130,6 +132,14 @@ public void setOrchestratorLevel(String orchestratorLevel) {
         this.orchestratorLevel = orchestratorLevel;
     }
 
+    public String getIsDefaultReference() {
+        return isDefaultReference;
+    }
+
+    public void setIsDefaultReference(String isDefaultReference) {
+        this.isDefaultReference = isDefaultReference;
+    }
+
     @Override
     public String toString() {
         return "OrchestratorCreateRequest{" +
diff --git a/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/entity/request/OrchestratorModifyRequest.java b/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/entity/request/OrchestratorModifyRequest.java
index fb62a9fac..b38bc74d4 100644
--- a/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/entity/request/OrchestratorModifyRequest.java
+++ b/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/entity/request/OrchestratorModifyRequest.java
@@ -47,6 +47,8 @@ public class OrchestratorModifyRequest extends OrchestratorRequest {
 
     private List<String> dssLabels;
 
+    private String isDefaultReference;
+
     public Long getId() {
         return id;
     }
@@ -117,4 +119,12 @@ public String getOrchestratorLevel() {
     public void setOrchestratorLevel(String orchestratorLevel) {
         this.orchestratorLevel = orchestratorLevel;
     }
+
+    public String getIsDefaultReference() {
+        return isDefaultReference;
+    }
+
+    public void setIsDefaultReference(String isDefaultReference) {
+        this.isDefaultReference = isDefaultReference;
+    }
 }
diff --git a/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/impl/OrchestratorFrameworkServiceImpl.java b/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/impl/OrchestratorFrameworkServiceImpl.java
index 43c14c028..cd072f265 100644
--- a/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/impl/OrchestratorFrameworkServiceImpl.java
+++ b/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/impl/OrchestratorFrameworkServiceImpl.java
@@ -156,6 +156,7 @@ public CommonOrchestratorVo createOrchestrator(String username, OrchestratorCrea
         dssOrchestratorInfo.setOrchestratorWay(OrchestratorUtils.getModeStr(orchestratorCreateRequest.getOrchestratorWays()));
         dssOrchestratorInfo.setOrchestratorMode(orchestratorCreateRequest.getOrchestratorMode());
         dssOrchestratorInfo.setOrchestratorLevel(orchestratorCreateRequest.getOrchestratorLevel());
+        dssOrchestratorInfo.setIsDefaultReference(orchestratorCreateRequest.getIsDefaultReference());
         //1.去orchestratorFramework创建编排模式
         LOGGER.info("{} begins to create a orchestrator {}.", username, orchestratorCreateRequest);
         List<DSSLabel> dssLabels = Collections.singletonList(new EnvDSSLabel(orchestratorCreateRequest.getLabels().getRoute()));
@@ -255,6 +256,7 @@ public CommonOrchestratorVo modifyOrchestrator(String username, OrchestratorModi
         dssOrchestratorInfo.setOrchestratorWay(OrchestratorUtils.getModeStr(orchestratorModifyRequest.getOrchestratorWays()));
         dssOrchestratorInfo.setOrchestratorLevel(orchestratorModifyRequest.getOrchestratorLevel());
         dssOrchestratorInfo.setUses(orchestratorModifyRequest.getUses());
+        dssOrchestratorInfo.setIsDefaultReference(orchestratorCreateRequest.getIsDefaultReference());
         //1.如果调度系统要求同步创建工作流，向调度系统发送更新工作流的请求
         tryOrchestrationOperation(dssLabels, false, username, dssProject.getName(), workspace, dssOrchestratorInfo,
                 OrchestrationService::getOrchestrationUpdateOperation,
diff --git a/dss-framework/dss-framework-workspace-server/src/main/java/com/webank/wedatasphere/dss/framework/workspace/bean/vo/DSSWorkspaceUsersVo.java b/dss-framework/dss-framework-workspace-server/src/main/java/com/webank/wedatasphere/dss/framework/workspace/bean/vo/DSSWorkspaceUsersVo.java
index 82a562dc0..5d6bb09ac 100644
--- a/dss-framework/dss-framework-workspace-server/src/main/java/com/webank/wedatasphere/dss/framework/workspace/bean/vo/DSSWorkspaceUsersVo.java
+++ b/dss-framework/dss-framework-workspace-server/src/main/java/com/webank/wedatasphere/dss/framework/workspace/bean/vo/DSSWorkspaceUsersVo.java
@@ -4,33 +4,22 @@
 
 public class DSSWorkspaceUsersVo {
 
-    private List<String> editUsers;
 
-    private List<String> accessUsers;
+    private List<DepartmentUserVo> editUsers;
 
-    private List<String> releaseUsers;
+    private List<DepartmentUserVo> accessUsers;
 
-    public List<String> getAccessUsers() {
-        return accessUsers;
-    }
-
-    public List<String> getEditUsers() {
-        return editUsers;
-    }
-
-    public List<String> getReleaseUsers() {
-        return releaseUsers;
-    }
+    private List<DepartmentUserVo> releaseUsers;
 
-    public void setAccessUsers(List<String> accessUsers) {
+    public void setAccessUsers(List<DepartmentUserVo> accessUsers) {
         this.accessUsers = accessUsers;
     }
 
-    public void setReleaseUsers(List<String> releaseUsers) {
+    public void setReleaseUsers(List<DepartmentUserVo> releaseUsers) {
         this.releaseUsers = releaseUsers;
     }
 
-    public void setEditUsers(List<String> editUsers) {
+    public void setEditUsers(List<DepartmentUserVo> editUsers) {
         this.editUsers = editUsers;
     }
 }
diff --git a/dss-framework/dss-framework-workspace-server/src/main/java/com/webank/wedatasphere/dss/framework/workspace/bean/vo/DepartmentUserVo.java b/dss-framework/dss-framework-workspace-server/src/main/java/com/webank/wedatasphere/dss/framework/workspace/bean/vo/DepartmentUserVo.java
new file mode 100644
index 000000000..3238651d6
--- /dev/null
+++ b/dss-framework/dss-framework-workspace-server/src/main/java/com/webank/wedatasphere/dss/framework/workspace/bean/vo/DepartmentUserVo.java
@@ -0,0 +1,33 @@
+package com.webank.wedatasphere.dss.framework.workspace.bean.vo;
+
+import java.util.List;
+
+public class DepartmentUserVo {
+    private String name;
+    private String department;
+    private String office;
+
+    public String getOffice() {
+        return office;
+    }
+
+    public void setOffice(String office) {
+        this.office = office;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getDepartment() {
+        return department;
+    }
+
+    public void setDepartment(String department) {
+        this.department = department;
+    }
+}
diff --git a/dss-framework/dss-framework-workspace-server/src/main/java/com/webank/wedatasphere/dss/framework/workspace/restful/DSSWorkspaceUserRestful.java b/dss-framework/dss-framework-workspace-server/src/main/java/com/webank/wedatasphere/dss/framework/workspace/restful/DSSWorkspaceUserRestful.java
index 52d75a14d..7b2c30781 100644
--- a/dss-framework/dss-framework-workspace-server/src/main/java/com/webank/wedatasphere/dss/framework/workspace/restful/DSSWorkspaceUserRestful.java
+++ b/dss-framework/dss-framework-workspace-server/src/main/java/com/webank/wedatasphere/dss/framework/workspace/restful/DSSWorkspaceUserRestful.java
@@ -23,10 +23,7 @@
 import com.webank.wedatasphere.dss.framework.workspace.bean.request.DeleteWorkspaceUserRequest;
 import com.webank.wedatasphere.dss.framework.workspace.bean.request.RevokeUserRole;
 import com.webank.wedatasphere.dss.framework.workspace.bean.request.UpdateWorkspaceUserRequest;
-import com.webank.wedatasphere.dss.framework.workspace.bean.vo.DSSWorkspaceRoleVO;
-import com.webank.wedatasphere.dss.framework.workspace.bean.vo.DSSWorkspaceUserVO;
-import com.webank.wedatasphere.dss.framework.workspace.bean.vo.DSSWorkspaceUsersVo;
-import com.webank.wedatasphere.dss.framework.workspace.bean.vo.StaffInfoVO;
+import com.webank.wedatasphere.dss.framework.workspace.bean.vo.*;
 import com.webank.wedatasphere.dss.framework.workspace.service.DSSWorkspaceRoleCheckService;
 import com.webank.wedatasphere.dss.framework.workspace.service.DSSWorkspaceService;
 import com.webank.wedatasphere.dss.framework.workspace.service.DSSWorkspaceUserService;
@@ -113,8 +110,8 @@ public Message getAllWorkspaceUsers() {
     @RequestMapping(path = "existUserInWorkspace", method = RequestMethod.GET)
     public Message existUserInWorkspace(@RequestParam(WORKSPACE_ID_STR) int workspaceId, @RequestParam("queryUserName") String queryUserName) {
         String username = SecurityFilter.getLoginUsername(httpServletRequest);
-        List<String> users = dssWorkspaceUserService.getAllWorkspaceUsers(workspaceId);
-        boolean existFlag = users.stream().anyMatch(user -> user.equalsIgnoreCase(queryUserName));
+        List<DepartmentUserVo> users = dssWorkspaceUserService.getAllWorkspaceUsers(workspaceId);
+        boolean existFlag = users.stream().anyMatch(user -> user.getName().equalsIgnoreCase(queryUserName));
         LOGGER.info("Check exist user result:" + existFlag + ", query user  is " + queryUserName + ",workSpace id is " + workspaceId);
         return Message.ok().data("existFlag", existFlag);
     }
diff --git a/dss-framework/dss-framework-workspace-server/src/main/java/com/webank/wedatasphere/dss/framework/workspace/service/DSSWorkspaceUserService.java b/dss-framework/dss-framework-workspace-server/src/main/java/com/webank/wedatasphere/dss/framework/workspace/service/DSSWorkspaceUserService.java
index c3b3e95fe..c283a21eb 100644
--- a/dss-framework/dss-framework-workspace-server/src/main/java/com/webank/wedatasphere/dss/framework/workspace/service/DSSWorkspaceUserService.java
+++ b/dss-framework/dss-framework-workspace-server/src/main/java/com/webank/wedatasphere/dss/framework/workspace/service/DSSWorkspaceUserService.java
@@ -19,6 +19,7 @@
 
 import com.webank.wedatasphere.dss.common.entity.PageInfo;
 import com.webank.wedatasphere.dss.framework.workspace.bean.vo.DSSWorkspaceRoleVO;
+import com.webank.wedatasphere.dss.framework.workspace.bean.vo.DepartmentUserVo;
 import com.webank.wedatasphere.dss.framework.workspace.bean.vo.StaffInfoVO;
 
 import java.util.List;
@@ -49,7 +50,7 @@ public interface DSSWorkspaceUserService {
 
     List<StaffInfoVO> listAllDSSUsers();
 
-    List<String> getAllWorkspaceUsers(long workspaceId);
+    List<DepartmentUserVo> getAllWorkspaceUsers(long workspaceId);
     PageInfo<String> getAllWorkspaceUsersPage(long workspaceId, Integer pageNow, Integer pageSize);
 
     List<Integer> getUserWorkspaceIds(String userName);
diff --git a/dss-framework/dss-framework-workspace-server/src/main/java/com/webank/wedatasphere/dss/framework/workspace/service/impl/DSSWorkspaceUserServiceImpl.java b/dss-framework/dss-framework-workspace-server/src/main/java/com/webank/wedatasphere/dss/framework/workspace/service/impl/DSSWorkspaceUserServiceImpl.java
index 4bde06b77..577796a88 100644
--- a/dss-framework/dss-framework-workspace-server/src/main/java/com/webank/wedatasphere/dss/framework/workspace/service/impl/DSSWorkspaceUserServiceImpl.java
+++ b/dss-framework/dss-framework-workspace-server/src/main/java/com/webank/wedatasphere/dss/framework/workspace/service/impl/DSSWorkspaceUserServiceImpl.java
@@ -22,6 +22,7 @@
 import com.webank.wedatasphere.dss.framework.workspace.bean.DSSWorkspaceUser;
 import com.webank.wedatasphere.dss.framework.workspace.bean.StaffInfo;
 import com.webank.wedatasphere.dss.framework.workspace.bean.vo.DSSWorkspaceRoleVO;
+import com.webank.wedatasphere.dss.framework.workspace.bean.vo.DepartmentUserVo;
 import com.webank.wedatasphere.dss.framework.workspace.bean.vo.StaffInfoVO;
 import com.webank.wedatasphere.dss.framework.workspace.dao.DSSWorkspaceUserMapper;
 import com.webank.wedatasphere.dss.framework.workspace.service.DSSWorkspaceAddUserHook;
@@ -115,8 +116,29 @@ private StaffInfoVO staffToDSSUser(StaffInfo staffInfo){
     }
 
     @Override
-    public List<String> getAllWorkspaceUsers(long workspaceId) {
-        return dssWorkspaceUserMapper.getAllWorkspaceUsers(workspaceId);
+    public List<DepartmentUserVo> getAllWorkspaceUsers(long workspaceId) {
+        return dssWorkspaceUserMapper.getAllWorkspaceUsers(workspaceId).stream().map(
+                        workspaceUser -> changeToUserVO(workspaceUser))
+                .collect(Collectors.toList());
+    }
+
+    private DepartmentUserVo changeToUserVO(String userName) {
+        DepartmentUserVo vo = new DepartmentUserVo();
+        vo.setName(userName);
+        String orgFullName = staffInfoGetter.getFullOrgNameByUsername(userName);
+        if (org.apache.commons.lang3.StringUtils.isNotEmpty(orgFullName)) {
+            try {
+                String departmentName = orgFullName.split(WorkspaceServerConstant.DEFAULT_STAFF_SPLIT)[0];
+                String officeName = orgFullName.split(WorkspaceServerConstant.DEFAULT_STAFF_SPLIT)[1];
+                vo.setDepartment(departmentName);
+                vo.setOffice(officeName);
+            } catch (Exception e) {
+                //LOGGER.warn("fail to get department and office {} ", e.getMessage());
+                vo.setDepartment(WorkspaceServerConstant.DEFAULT_DEPARTMENT);
+                vo.setOffice(WorkspaceServerConstant.DEFAULT_OFFICE);
+            }
+        }
+        return vo;
     }
 
     @Override
diff --git a/dss-orchestrator/dss-orchestrator-common/src/main/java/com/webank/wedatasphere/dss/orchestrator/common/entity/DSSOrchestratorInfo.java b/dss-orchestrator/dss-orchestrator-common/src/main/java/com/webank/wedatasphere/dss/orchestrator/common/entity/DSSOrchestratorInfo.java
index 2035ae912..d05620aea 100644
--- a/dss-orchestrator/dss-orchestrator-common/src/main/java/com/webank/wedatasphere/dss/orchestrator/common/entity/DSSOrchestratorInfo.java
+++ b/dss-orchestrator/dss-orchestrator-common/src/main/java/com/webank/wedatasphere/dss/orchestrator/common/entity/DSSOrchestratorInfo.java
@@ -86,6 +86,11 @@ public class DSSOrchestratorInfo implements DSSOrchestration {
      */
     private Date updateTime;
 
+    /**
+     * 是否默认引用资源参数模板
+     */
+    private String isDefaultReference;
+
     public DSSOrchestratorInfo() {
 
     }
@@ -277,6 +282,14 @@ public void setUpdateTime(Date updateTime) {
         this.updateTime = updateTime;
     }
 
+    public String getIsDefaultReference() {
+        return isDefaultReference;
+    }
+
+    public void setIsDefaultReference(String isDefaultReference) {
+        this.isDefaultReference = isDefaultReference;
+    }
+
     @Override
     public String toString() {
         return "DSSOrchestratorInfo{" +
diff --git a/dss-orchestrator/dss-orchestrator-db/src/main/java/com/webank/wedatasphere/dss/orchestrator/db/dao/impl/orchestratorMapper.xml b/dss-orchestrator/dss-orchestrator-db/src/main/java/com/webank/wedatasphere/dss/orchestrator/db/dao/impl/orchestratorMapper.xml
index 77e8669fd..44f46ea34 100644
--- a/dss-orchestrator/dss-orchestrator-db/src/main/java/com/webank/wedatasphere/dss/orchestrator/db/dao/impl/orchestratorMapper.xml
+++ b/dss-orchestrator/dss-orchestrator-db/src/main/java/com/webank/wedatasphere/dss/orchestrator/db/dao/impl/orchestratorMapper.xml
@@ -22,7 +22,7 @@
 
     <sql id="orchestrator_main">
         id,`name`,`type`,`desc`,`creator`,`create_time`,`project_id`,`uses`,`appconn_name`,`uuid`,`secondary_type` ,
-        `workspace_id`,`orchestrator_mode`,`orchestrator_way`,`orchestrator_level`,`update_user`,`update_time`
+        `workspace_id`,`orchestrator_mode`,`orchestrator_way`,`orchestrator_level`,`update_user`,`update_time`,`is_default_reference`
     </sql>
 
     <sql id="orchestrator_version">
@@ -49,7 +49,8 @@
         VALUES
         (#{id},#{name},#{type},#{desc},#{creator},#{createTime},#{projectId},#{uses},#{appConnName},
         #{uuid},#{secondaryType},
-        #{workspaceId},#{orchestratorMode},#{orchestratorWay},#{orchestratorLevel},#{updateUser},#{updateTime})
+        #{workspaceId},#{orchestratorMode},#{orchestratorWay},#{orchestratorLevel},#{updateUser},#{updateTime}
+        ,#{isDefaultReference})
     </insert>
 
     <update id="updateOrchestrator"
@@ -64,6 +65,7 @@
             <if test="orchestratorLevel != null">`orchestrator_level`=#{orchestratorLevel},</if>
             <if test="updateUser != null">`update_user`=#{updateUser},</if>
             <if test="updateTime != null">`update_time`=#{updateTime},</if>
+            <if test="isDefaultReference != null">`is_default_reference`=#{isDefaultReference},</if>
         </trim>
         WHERE id = #{id}
     </update>

From 2581b2ed33c68cec102d30bdfda196114c3060ff Mon Sep 17 00:00:00 2001
From: qweqnotallow <747839893@qq.com>
Date: Mon, 6 May 2024 10:52:50 +0800
Subject: [PATCH 085/302] git search/server fix

---
 .../DSSFrameworkProjectRestfulApi.java        | 14 ++++++++
 .../protocol/GitSearchResult.java             | 32 +++++++++++++++++++
 .../protocol/response/GitSearchResponse.java  | 10 +++---
 .../DSSGitWorkflowManagerServiceImpl.java     |  8 +++--
 4 files changed, 58 insertions(+), 6 deletions(-)
 create mode 100644 dss-git/dss-git-common/src/main/java/com.webank.wedatasphere.dss.git.common/protocol/GitSearchResult.java

diff --git a/dss-framework/dss-framework-project-server/src/main/java/com/webank/wedatasphere/dss/framework/project/restful/DSSFrameworkProjectRestfulApi.java b/dss-framework/dss-framework-project-server/src/main/java/com/webank/wedatasphere/dss/framework/project/restful/DSSFrameworkProjectRestfulApi.java
index 598e05100..c6f000e95 100644
--- a/dss-framework/dss-framework-project-server/src/main/java/com/webank/wedatasphere/dss/framework/project/restful/DSSFrameworkProjectRestfulApi.java
+++ b/dss-framework/dss-framework-project-server/src/main/java/com/webank/wedatasphere/dss/framework/project/restful/DSSFrameworkProjectRestfulApi.java
@@ -20,6 +20,7 @@
 import com.webank.wedatasphere.dss.common.auditlog.TargetTypeEnum;
 import com.webank.wedatasphere.dss.common.utils.AuditLogUtils;
 import com.webank.wedatasphere.dss.common.utils.DSSExceptionUtils;
+import com.webank.wedatasphere.dss.common.utils.RpcAskUtils;
 import com.webank.wedatasphere.dss.framework.project.conf.ProjectConf;
 import com.webank.wedatasphere.dss.framework.project.entity.DSSProjectDO;
 import com.webank.wedatasphere.dss.framework.project.entity.request.ProjectCreateRequest;
@@ -34,11 +35,15 @@
 import com.webank.wedatasphere.dss.framework.project.service.ProjectHttpRequestHook;
 import com.webank.wedatasphere.dss.framework.project.utils.ApplicationArea;
 import com.webank.wedatasphere.dss.framework.proxy.exception.DSSProxyUserErrorException;
+import com.webank.wedatasphere.dss.git.common.protocol.request.GitSearchRequest;
+import com.webank.wedatasphere.dss.git.common.protocol.response.GitSearchResponse;
+import com.webank.wedatasphere.dss.sender.service.DSSSenderServiceFactory;
 import com.webank.wedatasphere.dss.standard.app.sso.Workspace;
 import com.webank.wedatasphere.dss.standard.sso.utils.SSOHelper;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.exception.ExceptionUtils;
 import org.apache.linkis.common.exception.WarnException;
+import org.apache.linkis.rpc.Sender;
 import org.apache.linkis.server.Message;
 import org.apache.linkis.server.security.SecurityFilter;
 import org.slf4j.Logger;
@@ -311,5 +316,14 @@ public Message getDeletedProjects(HttpServletRequest request, @Valid @RequestBod
         return Message.ok("获取工作空间已删除的工程成功").data("projects", dssProjectVos);
     }
 
+    @RequestMapping(path = "searchGit", method = RequestMethod.POST)
+    public Message searchGit(HttpServletRequest request, @RequestBody GitSearchRequest searchRequest) {
+        String username = SecurityFilter.getLoginUsername(request);
+        Sender sender = DSSSenderServiceFactory.getOrCreateServiceInstance().getGitSender();
+        GitSearchResponse gitSearchResponse = RpcAskUtils.processAskException(sender.ask(searchRequest), GitSearchResponse.class, GitSearchRequest.class);
+
+        return Message.ok().data("data", gitSearchResponse);
+    }
+
 
 }
diff --git a/dss-git/dss-git-common/src/main/java/com.webank.wedatasphere.dss.git.common/protocol/GitSearchResult.java b/dss-git/dss-git-common/src/main/java/com.webank.wedatasphere.dss.git.common/protocol/GitSearchResult.java
new file mode 100644
index 000000000..f42a96244
--- /dev/null
+++ b/dss-git/dss-git-common/src/main/java/com.webank.wedatasphere.dss.git.common/protocol/GitSearchResult.java
@@ -0,0 +1,32 @@
+package com.webank.wedatasphere.dss.git.common.protocol;
+
+import java.util.List;
+
+public class GitSearchResult {
+    private String path;
+    private List<String> keyLines;
+
+    public GitSearchResult() {
+    }
+
+    public GitSearchResult(String path, List<String> keyLines) {
+        this.path = path;
+        this.keyLines = keyLines;
+    }
+
+    public String getPath() {
+        return path;
+    }
+
+    public void setPath(String path) {
+        this.path = path;
+    }
+
+    public List<String> getKeyLines() {
+        return keyLines;
+    }
+
+    public void setKeyLines(List<String> keyLines) {
+        this.keyLines = keyLines;
+    }
+}
diff --git a/dss-git/dss-git-common/src/main/java/com.webank.wedatasphere.dss.git.common/protocol/response/GitSearchResponse.java b/dss-git/dss-git-common/src/main/java/com.webank.wedatasphere.dss.git.common/protocol/response/GitSearchResponse.java
index 27165fb69..846a01479 100644
--- a/dss-git/dss-git-common/src/main/java/com.webank.wedatasphere.dss.git.common/protocol/response/GitSearchResponse.java
+++ b/dss-git/dss-git-common/src/main/java/com.webank.wedatasphere.dss.git.common/protocol/response/GitSearchResponse.java
@@ -1,14 +1,16 @@
 package com.webank.wedatasphere.dss.git.common.protocol.response;
 
 
+import com.webank.wedatasphere.dss.git.common.protocol.GitSearchResult;
+
 import java.util.List;
 import java.util.Map;
 
 public class GitSearchResponse{
-    private Map<String, List<String>> result;
+    private List<GitSearchResult> result;
     private Integer total;
 
-    public GitSearchResponse(Map<String, List<String>> result, Integer total) {
+    public GitSearchResponse(List<GitSearchResult> result, Integer total) {
         this.result = result;
         this.total = total;
     }
@@ -16,11 +18,11 @@ public GitSearchResponse(Map<String, List<String>> result, Integer total) {
     public GitSearchResponse() {
     }
 
-    public Map<String, List<String>> getResult() {
+    public List<GitSearchResult> getResult() {
         return result;
     }
 
-    public void setResult(Map<String, List<String>> result) {
+    public void setResult(List<GitSearchResult> result) {
         this.result = result;
     }
 
diff --git a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitWorkflowManagerServiceImpl.java b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitWorkflowManagerServiceImpl.java
index d3afb9193..2beb3c389 100644
--- a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitWorkflowManagerServiceImpl.java
+++ b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitWorkflowManagerServiceImpl.java
@@ -3,6 +3,7 @@
 import com.webank.wedatasphere.dss.common.entity.BmlResource;
 import com.webank.wedatasphere.dss.common.exception.DSSErrorException;
 import com.webank.wedatasphere.dss.common.service.BMLService;
+import com.webank.wedatasphere.dss.git.common.protocol.GitSearchResult;
 import com.webank.wedatasphere.dss.git.common.protocol.GitUserEntity;
 import com.webank.wedatasphere.dss.git.common.protocol.constant.GitConstant;
 import com.webank.wedatasphere.dss.git.common.protocol.request.*;
@@ -166,7 +167,7 @@ public GitSearchResponse search(GitSearchRequest request) {
         }
         logger.info(gitCommands.toString());
         List<String> fileList = process(gitCommands);
-        Map<String, List<String>> result = new LinkedHashMap<>();
+        List<GitSearchResult> result = new ArrayList<>();
 
         if (CollectionUtils.isEmpty(fileList)) {
             return new GitSearchResponse(result, 0);
@@ -177,6 +178,7 @@ public GitSearchResponse search(GitSearchRequest request) {
             logger.error("当前请求页" + request.getPageNow() + "超出搜索指定范围");
             return new GitSearchResponse(result, 0);
         }
+        // subList 截断的List及子集 不允许List变更
         final List<String> subList = fileList.subList(start, end);
         List<String> filePathList = new ArrayList<>();
         for (String file : subList) {
@@ -195,12 +197,14 @@ public GitSearchResponse search(GitSearchRequest request) {
             gitSearchCommand.add(file);
             logger.info(gitSearchCommand.toString());
 
+            // subList 截断的List及子集 不允许List变更
             final List<String> searchResult = process(gitSearchCommand);
             final List<String> subSearchResult = searchResult.size() > GitServerConfig.GIT_SEARCH_RESULT_LIMIT.getValue()? searchResult.subList(0, GitServerConfig.GIT_SEARCH_RESULT_LIMIT.getValue()) : searchResult;
 
-            result.put(file, subSearchResult);
+            result.add(new GitSearchResult(file, subSearchResult));
         }
 
+
         return new GitSearchResponse(result, fileList.size());
     }
 

From d337679a1a739ccc99e94c0b03a4d0d12d5a6c06 Mon Sep 17 00:00:00 2001
From: nullpoint12138 <zhouxuannihao@qq.com>
Date: Mon, 6 May 2024 11:45:36 +0800
Subject: [PATCH 086/302] fix coding error

---
 .../server/service/impl/OrchestratorFrameworkServiceImpl.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/impl/OrchestratorFrameworkServiceImpl.java b/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/impl/OrchestratorFrameworkServiceImpl.java
index cd072f265..de0146a92 100644
--- a/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/impl/OrchestratorFrameworkServiceImpl.java
+++ b/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/impl/OrchestratorFrameworkServiceImpl.java
@@ -256,7 +256,7 @@ public CommonOrchestratorVo modifyOrchestrator(String username, OrchestratorModi
         dssOrchestratorInfo.setOrchestratorWay(OrchestratorUtils.getModeStr(orchestratorModifyRequest.getOrchestratorWays()));
         dssOrchestratorInfo.setOrchestratorLevel(orchestratorModifyRequest.getOrchestratorLevel());
         dssOrchestratorInfo.setUses(orchestratorModifyRequest.getUses());
-        dssOrchestratorInfo.setIsDefaultReference(orchestratorCreateRequest.getIsDefaultReference());
+        dssOrchestratorInfo.setIsDefaultReference(orchestratorModifyRequest.getIsDefaultReference());
         //1.如果调度系统要求同步创建工作流，向调度系统发送更新工作流的请求
         tryOrchestrationOperation(dssLabels, false, username, dssProject.getName(), workspace, dssOrchestratorInfo,
                 OrchestrationService::getOrchestrationUpdateOperation,

From b0505a9c8d0b0fa88370dec8ba5072bf2406633f Mon Sep 17 00:00:00 2001
From: nullpoint12138 <zhouxuannihao@qq.com>
Date: Mon, 6 May 2024 12:22:33 +0800
Subject: [PATCH 087/302] fix error

---
 .../vo/DSSWorkspaceUsersDepartmentVo.java     | 25 +++++++++++++++++++
 .../bean/vo/DSSWorkspaceUsersVo.java          | 12 ++++-----
 .../restful/DSSWorkspaceUserRestful.java      | 12 ++++-----
 .../service/DSSWorkspaceUserService.java      |  5 +++-
 .../impl/DSSWorkspaceUserServiceImpl.java     |  7 +++++-
 5 files changed, 47 insertions(+), 14 deletions(-)
 create mode 100644 dss-framework/dss-framework-workspace-server/src/main/java/com/webank/wedatasphere/dss/framework/workspace/bean/vo/DSSWorkspaceUsersDepartmentVo.java

diff --git a/dss-framework/dss-framework-workspace-server/src/main/java/com/webank/wedatasphere/dss/framework/workspace/bean/vo/DSSWorkspaceUsersDepartmentVo.java b/dss-framework/dss-framework-workspace-server/src/main/java/com/webank/wedatasphere/dss/framework/workspace/bean/vo/DSSWorkspaceUsersDepartmentVo.java
new file mode 100644
index 000000000..67197d1fe
--- /dev/null
+++ b/dss-framework/dss-framework-workspace-server/src/main/java/com/webank/wedatasphere/dss/framework/workspace/bean/vo/DSSWorkspaceUsersDepartmentVo.java
@@ -0,0 +1,25 @@
+package com.webank.wedatasphere.dss.framework.workspace.bean.vo;
+
+import java.util.List;
+
+public class DSSWorkspaceUsersDepartmentVo {
+
+
+    private List<DepartmentUserVo> editUsers;
+
+    private List<DepartmentUserVo> accessUsers;
+
+    private List<DepartmentUserVo> releaseUsers;
+
+    public void setAccessUsers(List<DepartmentUserVo> accessUsers) {
+        this.accessUsers = accessUsers;
+    }
+
+    public void setReleaseUsers(List<DepartmentUserVo> releaseUsers) {
+        this.releaseUsers = releaseUsers;
+    }
+
+    public void setEditUsers(List<DepartmentUserVo> editUsers) {
+        this.editUsers = editUsers;
+    }
+}
diff --git a/dss-framework/dss-framework-workspace-server/src/main/java/com/webank/wedatasphere/dss/framework/workspace/bean/vo/DSSWorkspaceUsersVo.java b/dss-framework/dss-framework-workspace-server/src/main/java/com/webank/wedatasphere/dss/framework/workspace/bean/vo/DSSWorkspaceUsersVo.java
index 5d6bb09ac..e42f097f1 100644
--- a/dss-framework/dss-framework-workspace-server/src/main/java/com/webank/wedatasphere/dss/framework/workspace/bean/vo/DSSWorkspaceUsersVo.java
+++ b/dss-framework/dss-framework-workspace-server/src/main/java/com/webank/wedatasphere/dss/framework/workspace/bean/vo/DSSWorkspaceUsersVo.java
@@ -5,21 +5,21 @@
 public class DSSWorkspaceUsersVo {
 
 
-    private List<DepartmentUserVo> editUsers;
+    private List<String> editUsers;
 
-    private List<DepartmentUserVo> accessUsers;
+    private List<String> accessUsers;
 
-    private List<DepartmentUserVo> releaseUsers;
+    private List<String> releaseUsers;
 
-    public void setAccessUsers(List<DepartmentUserVo> accessUsers) {
+    public void setAccessUsers(List<String> accessUsers) {
         this.accessUsers = accessUsers;
     }
 
-    public void setReleaseUsers(List<DepartmentUserVo> releaseUsers) {
+    public void setReleaseUsers(List<String> releaseUsers) {
         this.releaseUsers = releaseUsers;
     }
 
-    public void setEditUsers(List<DepartmentUserVo> editUsers) {
+    public void setEditUsers(List<String> editUsers) {
         this.editUsers = editUsers;
     }
 }
diff --git a/dss-framework/dss-framework-workspace-server/src/main/java/com/webank/wedatasphere/dss/framework/workspace/restful/DSSWorkspaceUserRestful.java b/dss-framework/dss-framework-workspace-server/src/main/java/com/webank/wedatasphere/dss/framework/workspace/restful/DSSWorkspaceUserRestful.java
index 7b2c30781..d5013e1df 100644
--- a/dss-framework/dss-framework-workspace-server/src/main/java/com/webank/wedatasphere/dss/framework/workspace/restful/DSSWorkspaceUserRestful.java
+++ b/dss-framework/dss-framework-workspace-server/src/main/java/com/webank/wedatasphere/dss/framework/workspace/restful/DSSWorkspaceUserRestful.java
@@ -95,14 +95,14 @@ public Message getWorkspaceUsers( @RequestParam(WORKSPACE_ID_STR) String workspa
 
     @RequestMapping(path = "getAllWorkspaceUsers", method = RequestMethod.GET)
     public Message getAllWorkspaceUsers() {
-        DSSWorkspaceUsersVo dssWorkspaceUsersVo = new DSSWorkspaceUsersVo();
+        DSSWorkspaceUsersDepartmentVo dssWorkspaceUsersVo = new DSSWorkspaceUsersDepartmentVo();
         // workspaceId改为从cookie取
         int workspaceId = (int) SSOHelper.getWorkspace(httpServletRequest).getWorkspaceId();
-        dssWorkspaceUsersVo.setAccessUsers(dssWorkspaceUserService.getAllWorkspaceUsers(workspaceId));
+        dssWorkspaceUsersVo.setAccessUsers(dssWorkspaceUserService.getAllWorkspaceUsersDepartment(workspaceId));
 //        dssWorkspaceUsersVo.setEditUsers(dssWorkspaceUserService.getWorkspaceEditUsers(workspaceId));
 //        dssWorkspaceUsersVo.setReleaseUsers(dssWorkspaceUserService.getWorkspaceReleaseUsers(workspaceId));
-        dssWorkspaceUsersVo.setEditUsers(dssWorkspaceUserService.getAllWorkspaceUsers(workspaceId));
-        dssWorkspaceUsersVo.setReleaseUsers(dssWorkspaceUserService.getAllWorkspaceUsers(workspaceId));
+        dssWorkspaceUsersVo.setEditUsers(dssWorkspaceUserService.getAllWorkspaceUsersDepartment(workspaceId));
+        dssWorkspaceUsersVo.setReleaseUsers(dssWorkspaceUserService.getAllWorkspaceUsersDepartment(workspaceId));
         return Message.ok().data("users", dssWorkspaceUsersVo);
     }
 
@@ -110,8 +110,8 @@ public Message getAllWorkspaceUsers() {
     @RequestMapping(path = "existUserInWorkspace", method = RequestMethod.GET)
     public Message existUserInWorkspace(@RequestParam(WORKSPACE_ID_STR) int workspaceId, @RequestParam("queryUserName") String queryUserName) {
         String username = SecurityFilter.getLoginUsername(httpServletRequest);
-        List<DepartmentUserVo> users = dssWorkspaceUserService.getAllWorkspaceUsers(workspaceId);
-        boolean existFlag = users.stream().anyMatch(user -> user.getName().equalsIgnoreCase(queryUserName));
+        List<String> users = dssWorkspaceUserService.getAllWorkspaceUsers(workspaceId);
+        boolean existFlag = users.stream().anyMatch(user -> user.equalsIgnoreCase(queryUserName));
         LOGGER.info("Check exist user result:" + existFlag + ", query user  is " + queryUserName + ",workSpace id is " + workspaceId);
         return Message.ok().data("existFlag", existFlag);
     }
diff --git a/dss-framework/dss-framework-workspace-server/src/main/java/com/webank/wedatasphere/dss/framework/workspace/service/DSSWorkspaceUserService.java b/dss-framework/dss-framework-workspace-server/src/main/java/com/webank/wedatasphere/dss/framework/workspace/service/DSSWorkspaceUserService.java
index c283a21eb..1d87c12df 100644
--- a/dss-framework/dss-framework-workspace-server/src/main/java/com/webank/wedatasphere/dss/framework/workspace/service/DSSWorkspaceUserService.java
+++ b/dss-framework/dss-framework-workspace-server/src/main/java/com/webank/wedatasphere/dss/framework/workspace/service/DSSWorkspaceUserService.java
@@ -50,7 +50,10 @@ public interface DSSWorkspaceUserService {
 
     List<StaffInfoVO> listAllDSSUsers();
 
-    List<DepartmentUserVo> getAllWorkspaceUsers(long workspaceId);
+    List<String> getAllWorkspaceUsers(long workspaceId);
+
+    List<DepartmentUserVo> getAllWorkspaceUsersDepartment(long workspaceId) ;
+
     PageInfo<String> getAllWorkspaceUsersPage(long workspaceId, Integer pageNow, Integer pageSize);
 
     List<Integer> getUserWorkspaceIds(String userName);
diff --git a/dss-framework/dss-framework-workspace-server/src/main/java/com/webank/wedatasphere/dss/framework/workspace/service/impl/DSSWorkspaceUserServiceImpl.java b/dss-framework/dss-framework-workspace-server/src/main/java/com/webank/wedatasphere/dss/framework/workspace/service/impl/DSSWorkspaceUserServiceImpl.java
index 577796a88..139bbb321 100644
--- a/dss-framework/dss-framework-workspace-server/src/main/java/com/webank/wedatasphere/dss/framework/workspace/service/impl/DSSWorkspaceUserServiceImpl.java
+++ b/dss-framework/dss-framework-workspace-server/src/main/java/com/webank/wedatasphere/dss/framework/workspace/service/impl/DSSWorkspaceUserServiceImpl.java
@@ -116,7 +116,12 @@ private StaffInfoVO staffToDSSUser(StaffInfo staffInfo){
     }
 
     @Override
-    public List<DepartmentUserVo> getAllWorkspaceUsers(long workspaceId) {
+    public List<String> getAllWorkspaceUsers(long workspaceId) {
+        return dssWorkspaceUserMapper.getAllWorkspaceUsers(workspaceId);
+    }
+
+    @Override
+    public List<DepartmentUserVo> getAllWorkspaceUsersDepartment(long workspaceId) {
         return dssWorkspaceUserMapper.getAllWorkspaceUsers(workspaceId).stream().map(
                         workspaceUser -> changeToUserVO(workspaceUser))
                 .collect(Collectors.toList());

From 9f64253c854a7efe87b4b9acfb625695ca6c7d58 Mon Sep 17 00:00:00 2001
From: nullpoint12138 <zhouxuannihao@qq.com>
Date: Mon, 6 May 2024 13:47:11 +0800
Subject: [PATCH 088/302] add Serializable

---
 .../workspace/bean/vo/DSSWorkspaceUsersDepartmentVo.java     | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/dss-framework/dss-framework-workspace-server/src/main/java/com/webank/wedatasphere/dss/framework/workspace/bean/vo/DSSWorkspaceUsersDepartmentVo.java b/dss-framework/dss-framework-workspace-server/src/main/java/com/webank/wedatasphere/dss/framework/workspace/bean/vo/DSSWorkspaceUsersDepartmentVo.java
index 67197d1fe..9a328469a 100644
--- a/dss-framework/dss-framework-workspace-server/src/main/java/com/webank/wedatasphere/dss/framework/workspace/bean/vo/DSSWorkspaceUsersDepartmentVo.java
+++ b/dss-framework/dss-framework-workspace-server/src/main/java/com/webank/wedatasphere/dss/framework/workspace/bean/vo/DSSWorkspaceUsersDepartmentVo.java
@@ -1,10 +1,11 @@
 package com.webank.wedatasphere.dss.framework.workspace.bean.vo;
 
+import java.io.Serializable;
 import java.util.List;
 
-public class DSSWorkspaceUsersDepartmentVo {
-
+public class DSSWorkspaceUsersDepartmentVo implements Serializable {
 
+    private static final long serialVersionUID=1L;
     private List<DepartmentUserVo> editUsers;
 
     private List<DepartmentUserVo> accessUsers;

From a264031379a49c9216cdf3eee5e3019ef43e2fd5 Mon Sep 17 00:00:00 2001
From: nullpoint12138 <zhouxuannihao@qq.com>
Date: Mon, 6 May 2024 16:07:58 +0800
Subject: [PATCH 089/302] add serializable

---
 .../server/entity/vo/OrchestratorBaseInfo.java         | 10 ++++++++++
 .../server/service/impl/OrchestratorServiceImpl.java   |  1 +
 .../framework/workspace/bean/vo/DepartmentUserVo.java  |  4 +++-
 3 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/entity/vo/OrchestratorBaseInfo.java b/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/entity/vo/OrchestratorBaseInfo.java
index 953307bec..87b622312 100644
--- a/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/entity/vo/OrchestratorBaseInfo.java
+++ b/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/entity/vo/OrchestratorBaseInfo.java
@@ -94,6 +94,8 @@ public class OrchestratorBaseInfo {
 
     private String orchestratorLevel;
 
+    private String isDefaultReference;
+
     private boolean flowEditLockExist = false;
 
     public Boolean getEditable() {
@@ -251,4 +253,12 @@ public String getOrchestratorLevel() {
     public void setOrchestratorLevel(String orchestratorLevel) {
         this.orchestratorLevel = orchestratorLevel;
     }
+
+    public String getIsDefaultReference() {
+        return isDefaultReference;
+    }
+
+    public void setIsDefaultReference(String isDefaultReference) {
+        this.isDefaultReference = isDefaultReference;
+    }
 }
diff --git a/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/impl/OrchestratorServiceImpl.java b/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/impl/OrchestratorServiceImpl.java
index c87bd4640..3dbe29552 100644
--- a/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/impl/OrchestratorServiceImpl.java
+++ b/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/impl/OrchestratorServiceImpl.java
@@ -469,6 +469,7 @@ public List<OrchestratorBaseInfo> getListByPage(OrchestratorRequest orchestrator
                 orchestratorBaseInfo.setOrchestratorId(dssOrchestratorInfo.getId());
                 orchestratorBaseInfo.setEditable(isEditable || isReleasable);
                 orchestratorBaseInfo.setReleasable(isReleasable);
+                orchestratorBaseInfo.setIsDefaultReference(dssOrchestratorInfo.getIsDefaultReference());
                 retList.add(orchestratorBaseInfo);
             }
         }
diff --git a/dss-framework/dss-framework-workspace-server/src/main/java/com/webank/wedatasphere/dss/framework/workspace/bean/vo/DepartmentUserVo.java b/dss-framework/dss-framework-workspace-server/src/main/java/com/webank/wedatasphere/dss/framework/workspace/bean/vo/DepartmentUserVo.java
index 3238651d6..2de4a915a 100644
--- a/dss-framework/dss-framework-workspace-server/src/main/java/com/webank/wedatasphere/dss/framework/workspace/bean/vo/DepartmentUserVo.java
+++ b/dss-framework/dss-framework-workspace-server/src/main/java/com/webank/wedatasphere/dss/framework/workspace/bean/vo/DepartmentUserVo.java
@@ -1,8 +1,10 @@
 package com.webank.wedatasphere.dss.framework.workspace.bean.vo;
 
+import java.io.Serializable;
 import java.util.List;
 
-public class DepartmentUserVo {
+public class DepartmentUserVo implements Serializable {
+    private static final long serialVersionUID=1L;
     private String name;
     private String department;
     private String office;

From 303c612043c25c64374dffaf5cef0615dd2640cd Mon Sep 17 00:00:00 2001
From: nullpoint12138 <zhouxuannihao@qq.com>
Date: Mon, 6 May 2024 17:08:10 +0800
Subject: [PATCH 090/302] add getter;

---
 .../bean/vo/DSSWorkspaceUsersDepartmentVo.java       | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/dss-framework/dss-framework-workspace-server/src/main/java/com/webank/wedatasphere/dss/framework/workspace/bean/vo/DSSWorkspaceUsersDepartmentVo.java b/dss-framework/dss-framework-workspace-server/src/main/java/com/webank/wedatasphere/dss/framework/workspace/bean/vo/DSSWorkspaceUsersDepartmentVo.java
index 9a328469a..93a73bbf6 100644
--- a/dss-framework/dss-framework-workspace-server/src/main/java/com/webank/wedatasphere/dss/framework/workspace/bean/vo/DSSWorkspaceUsersDepartmentVo.java
+++ b/dss-framework/dss-framework-workspace-server/src/main/java/com/webank/wedatasphere/dss/framework/workspace/bean/vo/DSSWorkspaceUsersDepartmentVo.java
@@ -23,4 +23,16 @@ public void setReleaseUsers(List<DepartmentUserVo> releaseUsers) {
     public void setEditUsers(List<DepartmentUserVo> editUsers) {
         this.editUsers = editUsers;
     }
+
+    public List<DepartmentUserVo> getEditUsers() {
+        return editUsers;
+    }
+
+    public List<DepartmentUserVo> getAccessUsers() {
+        return accessUsers;
+    }
+
+    public List<DepartmentUserVo> getReleaseUsers() {
+        return releaseUsers;
+    }
 }

From fc961fb1edaaec0b1b0e65bce43a5dbd51f197ef Mon Sep 17 00:00:00 2001
From: nullpoint12138 <zhouxuannihao@qq.com>
Date: Mon, 6 May 2024 18:24:39 +0800
Subject: [PATCH 091/302] add method getAllDepartments

---
 .../workspace/restful/DSSWorkspaceRestful.java       | 12 ++++++++++++
 .../workspace/service/DSSWorkspaceService.java       |  2 ++
 .../service/impl/DSSWorkspaceServiceImpl.java        |  7 +++++++
 3 files changed, 21 insertions(+)

diff --git a/dss-framework/dss-framework-workspace-server/src/main/java/com/webank/wedatasphere/dss/framework/workspace/restful/DSSWorkspaceRestful.java b/dss-framework/dss-framework-workspace-server/src/main/java/com/webank/wedatasphere/dss/framework/workspace/restful/DSSWorkspaceRestful.java
index 06fe1e841..a73a0f6d0 100644
--- a/dss-framework/dss-framework-workspace-server/src/main/java/com/webank/wedatasphere/dss/framework/workspace/restful/DSSWorkspaceRestful.java
+++ b/dss-framework/dss-framework-workspace-server/src/main/java/com/webank/wedatasphere/dss/framework/workspace/restful/DSSWorkspaceRestful.java
@@ -101,6 +101,18 @@ public Message listAllDepartments(@RequestParam(value = WORKSPACE_ID_STR, requir
         return Message.ok().data("departmentWithOffices", departments);
     }
 
+    /**
+     * 返回所有department
+     *
+     * @param workspaceId
+     * @return
+     */
+    @RequestMapping(path = "getAllDepartments", method = RequestMethod.GET)
+    public Message getAllDepartments(@RequestParam(value = WORKSPACE_ID_STR, required = false) String workspaceId) {
+        List<String> departments = dssWorkspaceService.getAllDepartments();
+        return Message.ok().data("departments", departments);
+    }
+
     /**
      * 绑定工作空间和部门-科室关系
      *
diff --git a/dss-framework/dss-framework-workspace-server/src/main/java/com/webank/wedatasphere/dss/framework/workspace/service/DSSWorkspaceService.java b/dss-framework/dss-framework-workspace-server/src/main/java/com/webank/wedatasphere/dss/framework/workspace/service/DSSWorkspaceService.java
index 4d57123d0..530787c0c 100644
--- a/dss-framework/dss-framework-workspace-server/src/main/java/com/webank/wedatasphere/dss/framework/workspace/service/DSSWorkspaceService.java
+++ b/dss-framework/dss-framework-workspace-server/src/main/java/com/webank/wedatasphere/dss/framework/workspace/service/DSSWorkspaceService.java
@@ -81,6 +81,8 @@ List<DSSWorkspaceUserVO> getWorkspaceUsers(String workspaceId, String department
 
     List<String> getAllDepartmentWithOffices();
 
+    List<String> getAllDepartments();
+
     void associateDepartments(Long workspaceId, String departments, String roles,String user) throws DSSErrorException;
 
     DSSWorkspaceAssociateDepartments getAssociateDepartmentsInfo(Long workspaceId);
diff --git a/dss-framework/dss-framework-workspace-server/src/main/java/com/webank/wedatasphere/dss/framework/workspace/service/impl/DSSWorkspaceServiceImpl.java b/dss-framework/dss-framework-workspace-server/src/main/java/com/webank/wedatasphere/dss/framework/workspace/service/impl/DSSWorkspaceServiceImpl.java
index 8da745db4..e0497e22a 100644
--- a/dss-framework/dss-framework-workspace-server/src/main/java/com/webank/wedatasphere/dss/framework/workspace/service/impl/DSSWorkspaceServiceImpl.java
+++ b/dss-framework/dss-framework-workspace-server/src/main/java/com/webank/wedatasphere/dss/framework/workspace/service/impl/DSSWorkspaceServiceImpl.java
@@ -437,6 +437,13 @@ public List<String> getAllDepartmentWithOffices() {
         return allDepartments;
     }
 
+    @Override
+    public List<String> getAllDepartments() {
+        List<String> allDepartments = staffInfoGetter.getAllDepartments().stream()
+                .map(department->department.split(WorkspaceServerConstant.DEFAULT_STAFF_SPLIT)[0]).distinct().collect(Collectors.toList());
+        return allDepartments;
+    }
+
     @Override
     public void associateDepartments(Long workspaceId, String departments, String roles, String user) throws DSSErrorException {
         List<Integer> userRoles = dssWorkspaceUserMapper.getRoleInWorkspace(workspaceId.intValue(), user);

From a7aaa5f3a5760750b550ba85054b08a66671abf7 Mon Sep 17 00:00:00 2001
From: nullpoint12138 <zhouxuannihao@qq.com>
Date: Tue, 7 May 2024 10:40:22 +0800
Subject: [PATCH 092/302] add interface getAllWorkspaceUsersWithDepartment;

---
 .../restful/DSSWorkspaceUserRestful.java      | 21 +++++++++++++++----
 1 file changed, 17 insertions(+), 4 deletions(-)

diff --git a/dss-framework/dss-framework-workspace-server/src/main/java/com/webank/wedatasphere/dss/framework/workspace/restful/DSSWorkspaceUserRestful.java b/dss-framework/dss-framework-workspace-server/src/main/java/com/webank/wedatasphere/dss/framework/workspace/restful/DSSWorkspaceUserRestful.java
index d5013e1df..b489c4780 100644
--- a/dss-framework/dss-framework-workspace-server/src/main/java/com/webank/wedatasphere/dss/framework/workspace/restful/DSSWorkspaceUserRestful.java
+++ b/dss-framework/dss-framework-workspace-server/src/main/java/com/webank/wedatasphere/dss/framework/workspace/restful/DSSWorkspaceUserRestful.java
@@ -95,17 +95,30 @@ public Message getWorkspaceUsers( @RequestParam(WORKSPACE_ID_STR) String workspa
 
     @RequestMapping(path = "getAllWorkspaceUsers", method = RequestMethod.GET)
     public Message getAllWorkspaceUsers() {
-        DSSWorkspaceUsersDepartmentVo dssWorkspaceUsersVo = new DSSWorkspaceUsersDepartmentVo();
+        DSSWorkspaceUsersVo dssWorkspaceUsersVo = new DSSWorkspaceUsersVo();
         // workspaceId改为从cookie取
         int workspaceId = (int) SSOHelper.getWorkspace(httpServletRequest).getWorkspaceId();
-        dssWorkspaceUsersVo.setAccessUsers(dssWorkspaceUserService.getAllWorkspaceUsersDepartment(workspaceId));
+        dssWorkspaceUsersVo.setAccessUsers(dssWorkspaceUserService.getAllWorkspaceUsers(workspaceId));
 //        dssWorkspaceUsersVo.setEditUsers(dssWorkspaceUserService.getWorkspaceEditUsers(workspaceId));
 //        dssWorkspaceUsersVo.setReleaseUsers(dssWorkspaceUserService.getWorkspaceReleaseUsers(workspaceId));
-        dssWorkspaceUsersVo.setEditUsers(dssWorkspaceUserService.getAllWorkspaceUsersDepartment(workspaceId));
-        dssWorkspaceUsersVo.setReleaseUsers(dssWorkspaceUserService.getAllWorkspaceUsersDepartment(workspaceId));
+        dssWorkspaceUsersVo.setEditUsers(dssWorkspaceUserService.getAllWorkspaceUsers(workspaceId));
+        dssWorkspaceUsersVo.setReleaseUsers(dssWorkspaceUserService.getAllWorkspaceUsers(workspaceId));
         return Message.ok().data("users", dssWorkspaceUsersVo);
     }
 
+    @RequestMapping(path = "getAllWorkspaceUsersWithDepartment", method = RequestMethod.GET)
+    public Message getAllWorkspaceUsersWithDepartment() {
+        DSSWorkspaceUsersDepartmentVo dSSWorkspaceUsersDepartmentVo = new DSSWorkspaceUsersDepartmentVo();
+        // workspaceId改为从cookie取
+        int workspaceId = (int) SSOHelper.getWorkspace(httpServletRequest).getWorkspaceId();
+        dSSWorkspaceUsersDepartmentVo.setAccessUsers(dssWorkspaceUserService.getAllWorkspaceUsersDepartment(workspaceId));
+//        dssWorkspaceUsersVo.setEditUsers(dssWorkspaceUserService.getWorkspaceEditUsers(workspaceId));
+//        dssWorkspaceUsersVo.setReleaseUsers(dssWorkspaceUserService.getWorkspaceReleaseUsers(workspaceId));
+        dSSWorkspaceUsersDepartmentVo.setEditUsers(dssWorkspaceUserService.getAllWorkspaceUsersDepartment(workspaceId));
+        dSSWorkspaceUsersDepartmentVo.setReleaseUsers(dssWorkspaceUserService.getAllWorkspaceUsersDepartment(workspaceId));
+        return Message.ok().data("users", dSSWorkspaceUsersDepartmentVo);
+    }
+
 
     @RequestMapping(path = "existUserInWorkspace", method = RequestMethod.GET)
     public Message existUserInWorkspace(@RequestParam(WORKSPACE_ID_STR) int workspaceId, @RequestParam("queryUserName") String queryUserName) {

From 2aecca40019f799460157c9d9d636c7699e9064f Mon Sep 17 00:00:00 2001
From: qweqnotallow <747839893@qq.com>
Date: Tue, 7 May 2024 10:56:50 +0800
Subject: [PATCH 093/302] git project export fix

---
 .../restful/DSSFrameworkOrchestratorRestful.java     | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/restful/DSSFrameworkOrchestratorRestful.java b/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/restful/DSSFrameworkOrchestratorRestful.java
index a9b642a5f..9fa6aabf0 100644
--- a/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/restful/DSSFrameworkOrchestratorRestful.java
+++ b/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/restful/DSSFrameworkOrchestratorRestful.java
@@ -360,4 +360,16 @@ public Message gitUrl(@RequestParam(required = true, name = "projectName") Strin
         return Message.ok();
 
     }
+
+    @RequestMapping(value = "submitFlow/status", method = RequestMethod.GET)
+    public Message submitFlow(@RequestParam Long orchestratorId) {
+        Workspace workspace = SSOHelper.getWorkspace(httpServletRequest);
+        String userName = SecurityFilter.getLoginUsername(httpServletRequest);
+
+        String orchestratorStatus = orchestratorFrameworkService.getOrchestratorStatus(orchestratorId);
+
+        
+
+        return Message.ok();
+    }
 }

From 5dd580d14a8f9b7ebc1659a244ef4d1fc82c9325 Mon Sep 17 00:00:00 2001
From: qweqnotallow <747839893@qq.com>
Date: Tue, 7 May 2024 10:57:29 +0800
Subject: [PATCH 094/302] git project export fix

---
 .../project/service/DSSProjectService.java    |  5 ++-
 .../impl/DSSFrameworkProjectServiceImpl.java  | 43 +++++++++++--------
 .../service/impl/DSSProjectServiceImpl.java   | 29 ++++++++++++-
 3 files changed, 58 insertions(+), 19 deletions(-)

diff --git a/dss-framework/dss-framework-project-server/src/main/java/com/webank/wedatasphere/dss/framework/project/service/DSSProjectService.java b/dss-framework/dss-framework-project-server/src/main/java/com/webank/wedatasphere/dss/framework/project/service/DSSProjectService.java
index 73c0397b8..833d43386 100644
--- a/dss-framework/dss-framework-project-server/src/main/java/com/webank/wedatasphere/dss/framework/project/service/DSSProjectService.java
+++ b/dss-framework/dss-framework-project-server/src/main/java/com/webank/wedatasphere/dss/framework/project/service/DSSProjectService.java
@@ -37,7 +37,7 @@ public interface DSSProjectService  extends IService<DSSProjectDO> {
     DSSProjectDO createProject(String username, ProjectCreateRequest projectCreateRequest);
 
 
-    void modifyProject(String username, ProjectModifyRequest modifyRequest) throws DSSProjectErrorException;
+    DSSProjectDO modifyProject(String username, ProjectModifyRequest modifyRequest) throws DSSProjectErrorException;
 
     /**
      * 旧工程导入到新环境的，修改新环境工程相关字段
@@ -97,4 +97,7 @@ public interface DSSProjectService  extends IService<DSSProjectDO> {
     void importProject(ProjectInfoVo projectInfo, BmlResource importResource, String username,
                        String checkCode, String packageInfo, EnvDSSLabel envLabel, Workspace workspace) throws Exception;
 
+    BmlResource exportOnlyProjectMeta(ExportAllOrchestratorsReqest exportAllOrchestratorsReqest,
+                                  String username, String proxyUser, Workspace workspace) throws Exception;
+
 }
diff --git a/dss-framework/dss-framework-project-server/src/main/java/com/webank/wedatasphere/dss/framework/project/service/impl/DSSFrameworkProjectServiceImpl.java b/dss-framework/dss-framework-project-server/src/main/java/com/webank/wedatasphere/dss/framework/project/service/impl/DSSFrameworkProjectServiceImpl.java
index 0500c4801..f4da6dfa8 100644
--- a/dss-framework/dss-framework-project-server/src/main/java/com/webank/wedatasphere/dss/framework/project/service/impl/DSSFrameworkProjectServiceImpl.java
+++ b/dss-framework/dss-framework-project-server/src/main/java/com/webank/wedatasphere/dss/framework/project/service/impl/DSSFrameworkProjectServiceImpl.java
@@ -20,9 +20,7 @@
 import com.webank.wedatasphere.dss.appconn.core.ext.OnlyStructureAppConn;
 import com.webank.wedatasphere.dss.common.entity.BmlResource;
 import com.webank.wedatasphere.dss.common.entity.project.DSSProject;
-import com.webank.wedatasphere.dss.common.utils.DSSCommonUtils;
-import com.webank.wedatasphere.dss.common.utils.DSSExceptionUtils;
-import com.webank.wedatasphere.dss.common.utils.RpcAskUtils;
+import com.webank.wedatasphere.dss.common.utils.*;
 import com.webank.wedatasphere.dss.framework.project.conf.ProjectConf;
 import com.webank.wedatasphere.dss.framework.project.contant.ProjectServerResponse;
 import com.webank.wedatasphere.dss.framework.project.entity.DSSProjectDO;
@@ -56,6 +54,7 @@
 import com.webank.wedatasphere.dss.standard.common.desc.AppInstance;
 import com.webank.wedatasphere.dss.standard.common.exception.operation.ExternalOperationFailedException;
 import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.io.FileUtils;
 import org.apache.commons.lang.StringUtils;
 import org.apache.commons.lang.exception.ExceptionUtils;
 import org.apache.linkis.common.conf.CommonVars;
@@ -68,6 +67,8 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.io.File;
+import java.io.InputStream;
 import java.util.*;
 import java.util.function.BiFunction;
 import java.util.function.Function;
@@ -190,16 +191,6 @@ public void modifyProject(ProjectModifyRequest projectModifyRequest, DSSProjectD
         if (!dbProject.getName().equalsIgnoreCase(projectModifyRequest.getName())) {
             DSSExceptionUtils.dealErrorException(ProjectServerResponse.PROJECT_NOT_EDIT_NAME.getCode(), ProjectServerResponse.PROJECT_NOT_EDIT_NAME.getMsg(), DSSProjectErrorException.class);
         }
-        // 校验接入git
-        if (projectModifyRequest.getAssociateGit() != null) {
-            checkAssociateGit(projectModifyRequest, dbProject, username, workspace);
-            ExportAllOrchestratorsReqest exportAllOrchestratorsReqest = new ExportAllOrchestratorsReqest();
-            exportAllOrchestratorsReqest.setProjectId(dbProject.getId());
-            exportAllOrchestratorsReqest.setComment("test");
-            exportAllOrchestratorsReqest.setLabels(DSSCommonUtils.ENV_LABEL_VALUE_DEV);
-            BmlResource bmlResource = dssProjectService.exportProject(exportAllOrchestratorsReqest, username, "", workspace);
-            updateProject(workspace.getWorkspaceId(), dbProject.getName(), bmlResource, username);
-        }
 
         //调用第三方的工程修改接口
         dbProject.setUsername(username);
@@ -214,7 +205,27 @@ public void modifyProject(ProjectModifyRequest projectModifyRequest, DSSProjectD
         projectUserService.modifyProjectUser(dbProject, projectModifyRequest, username, workspace);
 
         //3.修改dss_project DSS基本工程信息
-        dssProjectService.modifyProject(username, projectModifyRequest);
+        DSSProjectDO dssProjectDO = dssProjectService.modifyProject(username, projectModifyRequest);
+
+        // 校验接入git
+        if (projectModifyRequest.getAssociateGit() != null) {
+            checkAssociateGit(projectModifyRequest, dbProject, username, workspace);
+            ExportAllOrchestratorsReqest exportAllOrchestratorsReqest = new ExportAllOrchestratorsReqest();
+            exportAllOrchestratorsReqest.setProjectId(dbProject.getId());
+            exportAllOrchestratorsReqest.setComment("test");
+            exportAllOrchestratorsReqest.setLabels(DSSCommonUtils.ENV_LABEL_VALUE_DEV);
+
+            BmlResource bmlResource;
+            if (dbProject.getAssociateGit() != null && dbProject.getAssociateGit()) {
+                // 对于首次转为接入git的项目，要进行整个项目的导入导出
+                bmlResource = dssProjectService.exportProject(exportAllOrchestratorsReqest, username, "", workspace);
+            }else {
+                // 对于已接入git的项目，只更新元数据即可
+                bmlResource = dssProjectService.exportOnlyProjectMeta(exportAllOrchestratorsReqest, username, "", workspace);
+            }
+            updateProject(workspace.getWorkspaceId(), dbProject.getName(), bmlResource, username);
+        }
+
     }
 
     private void updateProject(Long workspaceId, String projectName,BmlResource bmlResource, String username ) {
@@ -384,14 +395,12 @@ private void initGitProject(Long workspaceId, String projectName, String resourc
 
     private void checkAssociateGit(ProjectModifyRequest projectModifyRequest, DSSProjectDO dbProject, String username, Workspace workspace) throws DSSProjectErrorException {
         // 对于已经接入git的项目不允许进行取消
-        if (dbProject.getAssociateGit() && !projectModifyRequest.getAssociateGit()) {
+        if (dbProject.getAssociateGit()!=null && dbProject.getAssociateGit() && !projectModifyRequest.getAssociateGit()) {
             throw new DSSProjectErrorException(71000, "项目接入git后无法取消");
         }
         // 对于首次接入git的项目需要校验项目名称并且进行git初始化
         if ((dbProject.getAssociateGit() == null || !dbProject.getAssociateGit()) && projectModifyRequest.getAssociateGit() && projectModifyRequest.getAssociateGit()!= null && projectModifyRequest.getAssociateGit()) {
             checkGitName(projectModifyRequest.getName(), workspace, username);
-            // todo resource version Info
-            // initGitProject(workspace.getWorkspaceId(), projectCreateRequest.getName(),);
         }
     }
 
diff --git a/dss-framework/dss-framework-project-server/src/main/java/com/webank/wedatasphere/dss/framework/project/service/impl/DSSProjectServiceImpl.java b/dss-framework/dss-framework-project-server/src/main/java/com/webank/wedatasphere/dss/framework/project/service/impl/DSSProjectServiceImpl.java
index 696ae3004..f55d0a3ee 100644
--- a/dss-framework/dss-framework-project-server/src/main/java/com/webank/wedatasphere/dss/framework/project/service/impl/DSSProjectServiceImpl.java
+++ b/dss-framework/dss-framework-project-server/src/main/java/com/webank/wedatasphere/dss/framework/project/service/impl/DSSProjectServiceImpl.java
@@ -139,7 +139,7 @@ public DSSProjectDO createProject(String username, ProjectCreateRequest projectC
 
     //修改dss_project工程字段
     @Override
-    public void modifyProject(String username, ProjectModifyRequest projectModifyRequest) throws DSSProjectErrorException {
+    public DSSProjectDO modifyProject(String username, ProjectModifyRequest projectModifyRequest) throws DSSProjectErrorException {
         //校验当前登录用户是否含有修改权限
 //        projectUserService.isEditProjectAuth(projectModifyRequest.getId(), username);
         DSSProjectDO project = new DSSProjectDO();
@@ -159,6 +159,8 @@ public void modifyProject(String username, ProjectModifyRequest projectModifyReq
         updateWrapper.eq("id", projectModifyRequest.getId());
         updateWrapper.eq("workspace_id", projectModifyRequest.getWorkspaceId());
         projectMapper.update(project, updateWrapper);
+
+        return project;
     }
 
     /**
@@ -519,4 +521,29 @@ private  void exportProjectMeta(  DSSProjectDO projectDO, String projectPath) th
 
     }
 
+    @Override
+    public BmlResource exportOnlyProjectMeta(ExportAllOrchestratorsReqest exportAllOrchestratorsReqest,
+                                         String username, String proxyUser, Workspace workspace) throws Exception {
+        Long projectId=exportAllOrchestratorsReqest.getProjectId();
+        EnvDSSLabel envLabel = new EnvDSSLabel(exportAllOrchestratorsReqest.getLabels());
+        List<OrchestratorBaseInfo> orchestrators = orchestratorService.getOrchestratorInfos(
+                new OrchestratorRequest(workspace.getWorkspaceId(), exportAllOrchestratorsReqest.getProjectId())
+                , exportAllOrchestratorsReqest.getLabels());
+        DSSProjectDO projectDO=projectService.getProjectById(projectId);
+        String projectName = projectDO.getName();
+        String exportSaveBasePath = IoUtils.generateTempIOPath(username);
+        String projectPath = IoUtils.addFileSeparator(exportSaveBasePath, projectName);
+        exportProjectMeta(projectDO, projectPath);
+        String zipFile = ZipHelper.zip(projectPath,true);
+        LOGGER.info("export project file locate at {}",zipFile);
+        //先上传
+        InputStream inputStream = bmlService.readLocalResourceFile(username, zipFile);
+        BmlResource bmlResource= bmlService.upload(username, inputStream, projectName + ".OrcsExport", projectName);
+
+        LOGGER.info("export zip file upload to bmlResourceId:{} bmlResourceVersion:{}",
+                bmlResource.getResourceId(),bmlResource.getVersion());
+        FileUtils.deleteQuietly(new File(zipFile));
+        return bmlResource;
+    }
+
 }

From 0fb8b5e065a5b754c3ae238308154ca8fafa90f4 Mon Sep 17 00:00:00 2001
From: qweqnotallow <747839893@qq.com>
Date: Tue, 7 May 2024 10:58:24 +0800
Subject: [PATCH 095/302] git project export fix1

---
 .../service/OrchestratorFrameworkService.java |  2 ++
 .../OrchestratorFrameworkServiceImpl.java     | 28 ++++++++++++++-----
 .../common/ref/OrchestratorRefConstant.java   |  6 ++++
 3 files changed, 29 insertions(+), 7 deletions(-)

diff --git a/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/OrchestratorFrameworkService.java b/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/OrchestratorFrameworkService.java
index 40cea50ad..808bc6e9e 100644
--- a/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/OrchestratorFrameworkService.java
+++ b/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/OrchestratorFrameworkService.java
@@ -50,4 +50,6 @@ public interface OrchestratorFrameworkService {
     GitTree diffFlow(OrchestratorSubmitRequest flowRequest, String username, Workspace workspace);
 
     void submitFlow(OrchestratorSubmitRequest flowRequest, String username, Workspace workspace);
+
+    String getOrchestratorStatus(Long orchestratorId);
 }
diff --git a/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/impl/OrchestratorFrameworkServiceImpl.java b/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/impl/OrchestratorFrameworkServiceImpl.java
index d51c17548..78a0df5bc 100644
--- a/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/impl/OrchestratorFrameworkServiceImpl.java
+++ b/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/impl/OrchestratorFrameworkServiceImpl.java
@@ -487,17 +487,26 @@ private BmlResource uploadWorkflowToGit(OrchestratorSubmitRequest flowRequest, S
 
     @Override
     public void submitFlow(OrchestratorSubmitRequest flowRequest, String username, Workspace workspace) {
+        //todo 1. 异步提交，开始提交状态 save->pushing->push
+        orchestratorMapper.updateOrchestratorStatus(flowRequest.getOrchestratorId(), OrchestratorRefConstant.FLOW_STATUS_PUSHING);
+        //2. 获取编排信息
         DSSOrchestratorInfo orchestrator = orchestratorMapper.getOrchestrator(flowRequest.getOrchestratorId());
+        //3. 获取上传工作流信息
         BmlResource bmlResource = uploadWorkflowToGit(flowRequest, username, workspace, orchestrator);
-
         // todo 3. diff（第一步补充后，使用去掉第三方节点的zip包上传到bml，替换下方的BML）
-        GitCommitResponse commit = push(orchestrator.getName(), bmlResource, username, workspace.getWorkspaceId(), flowRequest.getProjectName(), flowRequest.getComment());
-        if (commit == null) {
-            LOGGER.error("change is empty");
+        //4. 调用git服务上传
+        try {
+            GitCommitResponse commit = push(orchestrator.getName(), bmlResource, username, workspace.getWorkspaceId(), flowRequest.getProjectName(), flowRequest.getComment());
+            if (commit == null) {
+                LOGGER.info("change is empty");
+                orchestratorMapper.updateOrchestratorStatus(flowRequest.getOrchestratorId(), OrchestratorRefConstant.FLOW_STATUS_PUSH_FAILED);
+            }
+            //5. 返回文件列表
+            orchestratorMapper.updateOrchestratorStatus(flowRequest.getOrchestratorId(), OrchestratorRefConstant.FLOW_STATUS_PUSH);
+        } catch (Exception e) {
+            LOGGER.error("push failed, the reason is : ", e);
+            orchestratorMapper.updateOrchestratorStatus(flowRequest.getOrchestratorId(), OrchestratorRefConstant.FLOW_STATUS_PUSH_FAILED);
         }
-
-        //4. 返回文件列表
-        orchestratorMapper.updateOrchestratorStatus(flowRequest.getOrchestratorId(), OrchestratorRefConstant.FLOW_STATUS_PUSH);
     }
 
     private GitCommitResponse push (String path, BmlResource bmlResource, String username, Long workspaceId, String projectName, String comment) {
@@ -511,4 +520,9 @@ private GitCommitResponse push (String path, BmlResource bmlResource, String use
         return responseWorkflowValidNode;
     }
 
+    @Override
+    public String getOrchestratorStatus(Long orchestratorId) {
+        return orchestratorMapper.selectOrchestratorStatus(orchestratorId);
+    }
+
 }
diff --git a/dss-orchestrator/dss-orchestrator-common/src/main/java/com/webank/wedatasphere/dss/orchestrator/common/ref/OrchestratorRefConstant.java b/dss-orchestrator/dss-orchestrator-common/src/main/java/com/webank/wedatasphere/dss/orchestrator/common/ref/OrchestratorRefConstant.java
index 31c751f6c..493d77eff 100644
--- a/dss-orchestrator/dss-orchestrator-common/src/main/java/com/webank/wedatasphere/dss/orchestrator/common/ref/OrchestratorRefConstant.java
+++ b/dss-orchestrator/dss-orchestrator-common/src/main/java/com/webank/wedatasphere/dss/orchestrator/common/ref/OrchestratorRefConstant.java
@@ -42,7 +42,13 @@ public interface OrchestratorRefConstant {
      * 工作流状态：save-已发布 push-已提交 publish-已保存
      */
     public static final String FLOW_STATUS_SAVE = "save";
+
+    public static final String FLOW_STATUS_PUSHING = "pushing";
+
+    public static final String FLOW_STATUS_PUSH_FAILED = "push_failed";
+
     public static final String FLOW_STATUS_PUSH = "push";
+
     public static final String FLOW_STATUS_PUBLISH = "publish";
 
 }

From a02442d7b7a6c302952de63e619c2f98457b51e2 Mon Sep 17 00:00:00 2001
From: nullpoint12138 <zhouxuannihao@qq.com>
Date: Tue, 7 May 2024 11:35:46 +0800
Subject: [PATCH 096/302] fix

---
 .../workspace/bean/vo/DSSWorkspaceUsersVo.java       | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/dss-framework/dss-framework-workspace-server/src/main/java/com/webank/wedatasphere/dss/framework/workspace/bean/vo/DSSWorkspaceUsersVo.java b/dss-framework/dss-framework-workspace-server/src/main/java/com/webank/wedatasphere/dss/framework/workspace/bean/vo/DSSWorkspaceUsersVo.java
index e42f097f1..c25d3d535 100644
--- a/dss-framework/dss-framework-workspace-server/src/main/java/com/webank/wedatasphere/dss/framework/workspace/bean/vo/DSSWorkspaceUsersVo.java
+++ b/dss-framework/dss-framework-workspace-server/src/main/java/com/webank/wedatasphere/dss/framework/workspace/bean/vo/DSSWorkspaceUsersVo.java
@@ -22,4 +22,16 @@ public void setReleaseUsers(List<String> releaseUsers) {
     public void setEditUsers(List<String> editUsers) {
         this.editUsers = editUsers;
     }
+
+    public List<String> getEditUsers() {
+        return editUsers;
+    }
+
+    public List<String> getAccessUsers() {
+        return accessUsers;
+    }
+
+    public List<String> getReleaseUsers() {
+        return releaseUsers;
+    }
 }

From fd24972096ea1d6db14214b352c40e04dd783180 Mon Sep 17 00:00:00 2001
From: qweqnotallow <747839893@qq.com>
Date: Tue, 7 May 2024 14:28:06 +0800
Subject: [PATCH 097/302] server submitFlow add threadPool and status

---
 .../entity/vo/OrchestratorBaseInfo.java       |  8 ++++
 .../OrchestratorFrameworkServiceImpl.java     | 45 +++++++++++--------
 .../service/impl/OrchestratorServiceImpl.java |  8 ++++
 3 files changed, 43 insertions(+), 18 deletions(-)

diff --git a/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/entity/vo/OrchestratorBaseInfo.java b/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/entity/vo/OrchestratorBaseInfo.java
index 570b4ff24..eae4577ac 100644
--- a/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/entity/vo/OrchestratorBaseInfo.java
+++ b/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/entity/vo/OrchestratorBaseInfo.java
@@ -130,6 +130,7 @@ public void setReleasable(Boolean releasable) {
      */
     private Boolean releasable;
 
+    private String status;
 
     public Long getId() {
         return id;
@@ -323,4 +324,11 @@ public DSSOrchestratorInfo convertToDSSOrchestratorInfo() {
         return dssInfo;
     }
 
+    public String getStatus() {
+        return status;
+    }
+
+    public void setStatus(String status) {
+        this.status = status;
+    }
 }
diff --git a/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/impl/OrchestratorFrameworkServiceImpl.java b/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/impl/OrchestratorFrameworkServiceImpl.java
index 78a0df5bc..961fab991 100644
--- a/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/impl/OrchestratorFrameworkServiceImpl.java
+++ b/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/impl/OrchestratorFrameworkServiceImpl.java
@@ -126,6 +126,13 @@ public class OrchestratorFrameworkServiceImpl implements OrchestratorFrameworkSe
     private final ExecutorService orchestratorCopyThreadPool = new ThreadPoolExecutor(0, 200, 60L, TimeUnit.SECONDS,
             new LinkedBlockingQueue<>(1024), orchestratorCopyThreadFactory, new ThreadPoolExecutor.AbortPolicy());
 
+    private final ThreadFactory pushOrchestratorThreadFactory = new ThreadFactoryBuilder()
+            .setNameFormat("orchestrator-push-git-thread-%d")
+            .setDaemon(false)
+            .build();
+
+    private final ExecutorService pushOrchestratorThreadPool = new ThreadPoolExecutor(0, 20, 120L, TimeUnit.SECONDS,
+            new LinkedBlockingQueue<>(1024), pushOrchestratorThreadFactory, new ThreadPoolExecutor.AbortPolicy());
     /**
      * 1.拿到的dss orchestrator的appconn
      * 2.然后创建
@@ -487,26 +494,28 @@ private BmlResource uploadWorkflowToGit(OrchestratorSubmitRequest flowRequest, S
 
     @Override
     public void submitFlow(OrchestratorSubmitRequest flowRequest, String username, Workspace workspace) {
-        //todo 1. 异步提交，开始提交状态 save->pushing->push
-        orchestratorMapper.updateOrchestratorStatus(flowRequest.getOrchestratorId(), OrchestratorRefConstant.FLOW_STATUS_PUSHING);
-        //2. 获取编排信息
-        DSSOrchestratorInfo orchestrator = orchestratorMapper.getOrchestrator(flowRequest.getOrchestratorId());
-        //3. 获取上传工作流信息
-        BmlResource bmlResource = uploadWorkflowToGit(flowRequest, username, workspace, orchestrator);
-        // todo 3. diff（第一步补充后，使用去掉第三方节点的zip包上传到bml，替换下方的BML）
-        //4. 调用git服务上传
-        try {
-            GitCommitResponse commit = push(orchestrator.getName(), bmlResource, username, workspace.getWorkspaceId(), flowRequest.getProjectName(), flowRequest.getComment());
-            if (commit == null) {
-                LOGGER.info("change is empty");
+        pushOrchestratorThreadPool.submit(() ->{
+            //1. 异步提交，开始提交状态 save->pushing->push
+            orchestratorMapper.updateOrchestratorStatus(flowRequest.getOrchestratorId(), OrchestratorRefConstant.FLOW_STATUS_PUSHING);
+            //2. 获取编排信息
+            DSSOrchestratorInfo orchestrator = orchestratorMapper.getOrchestrator(flowRequest.getOrchestratorId());
+            //3. 获取上传工作流信息
+            BmlResource bmlResource = uploadWorkflowToGit(flowRequest, username, workspace, orchestrator);
+            // todo 3. diff（第一步补充后，使用去掉第三方节点的zip包上传到bml，替换下方的BML）
+            //4. 调用git服务上传
+            try {
+                GitCommitResponse commit = push(orchestrator.getName(), bmlResource, username, workspace.getWorkspaceId(), flowRequest.getProjectName(), flowRequest.getComment());
+                if (commit == null) {
+                    LOGGER.info("change is empty");
+                    orchestratorMapper.updateOrchestratorStatus(flowRequest.getOrchestratorId(), OrchestratorRefConstant.FLOW_STATUS_PUSH_FAILED);
+                }
+                //5. 返回文件列表
+                orchestratorMapper.updateOrchestratorStatus(flowRequest.getOrchestratorId(), OrchestratorRefConstant.FLOW_STATUS_PUSH);
+            } catch (Exception e) {
+                LOGGER.error("push failed, the reason is : ", e);
                 orchestratorMapper.updateOrchestratorStatus(flowRequest.getOrchestratorId(), OrchestratorRefConstant.FLOW_STATUS_PUSH_FAILED);
             }
-            //5. 返回文件列表
-            orchestratorMapper.updateOrchestratorStatus(flowRequest.getOrchestratorId(), OrchestratorRefConstant.FLOW_STATUS_PUSH);
-        } catch (Exception e) {
-            LOGGER.error("push failed, the reason is : ", e);
-            orchestratorMapper.updateOrchestratorStatus(flowRequest.getOrchestratorId(), OrchestratorRefConstant.FLOW_STATUS_PUSH_FAILED);
-        }
+        });
     }
 
     private GitCommitResponse push (String path, BmlResource bmlResource, String username, Long workspaceId, String projectName, String comment) {
diff --git a/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/impl/OrchestratorServiceImpl.java b/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/impl/OrchestratorServiceImpl.java
index f19ef5d60..faa9caa1f 100644
--- a/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/impl/OrchestratorServiceImpl.java
+++ b/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/impl/OrchestratorServiceImpl.java
@@ -77,6 +77,7 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.StringUtils;
 
 import java.io.File;
 import java.time.LocalDateTime;
@@ -477,6 +478,13 @@ public List<OrchestratorBaseInfo> getOrchestratorInfos(OrchestratorRequest orche
                 orchestratorBaseInfo.setOrchestratorId(dssOrchestratorInfo.getId());
                 orchestratorBaseInfo.setEditable(isEditable || isReleasable);
                 orchestratorBaseInfo.setReleasable(isReleasable);
+                if (!StringUtils.isEmpty(dssOrchestratorInfo.getStatus()) && dssOrchestratorInfo.getStatus().equals(OrchestratorRefConstant.FLOW_STATUS_PUSHING)
+                        && dssOrchestratorInfo.getStatus().equals(OrchestratorRefConstant.FLOW_STATUS_PUSH_FAILED)) {
+                    orchestratorBaseInfo.setStatus(OrchestratorRefConstant.FLOW_STATUS_SAVE);
+                } else {
+                    orchestratorBaseInfo.setStatus(dssOrchestratorInfo.getStatus());
+                }
+
                 retList.add(orchestratorBaseInfo);
             }
         }

From 5bdd73c170886175441e5d58b06b2db9d3c18618 Mon Sep 17 00:00:00 2001
From: qweqnotallow <747839893@qq.com>
Date: Tue, 7 May 2024 14:57:12 +0800
Subject: [PATCH 098/302] server jump to gitUrl fix

---
 .../DSSFrameworkOrchestratorRestful.java      | 22 +++++++++++++------
 .../server/service/OrchestratorService.java   |  2 +-
 .../service/impl/OrchestratorServiceImpl.java |  6 ++---
 3 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/restful/DSSFrameworkOrchestratorRestful.java b/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/restful/DSSFrameworkOrchestratorRestful.java
index 9fa6aabf0..ca9715d46 100644
--- a/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/restful/DSSFrameworkOrchestratorRestful.java
+++ b/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/restful/DSSFrameworkOrchestratorRestful.java
@@ -332,15 +332,16 @@ public Message gitUrl(@RequestParam(required = true, name = "projectName") Strin
         gitUserInfoRequest.setWorkspaceId(workspace.getWorkspaceId());
         gitUserInfoRequest.setType(GitConstant.GIT_ACCESS_WRITE_TYPE);
 
-        GitUserInfoResponse infoResponse = RpcAskUtils.processAskException(sender.ask(gitUserInfoRequest), GitUserInfoResponse.class, GitUserInfoRequest.class);
-        String gitUsername = infoResponse.getGitUser().getGitUser();
-        String gitPassword = infoResponse.getGitUser().getGitPassword();
+        GitUserInfoResponse readInfoResponse = RpcAskUtils.processAskException(sender.ask(gitUserInfoRequest), GitUserInfoResponse.class, GitUserInfoRequest.class);
+        String gitUsername = readInfoResponse.getGitUser().getGitUser();
+        String gitPassword = readInfoResponse.getGitUser().getGitPassword();
+        String gitUrlPre = UrlUtils.normalizeIp(readInfoResponse.getGitUser().getGitUrl());
         String authenToken = "";
         try {
-            authenToken = orchestratorService.getAuthenToken(gitUsername, gitPassword);
+            authenToken = orchestratorService.getAuthenToken(gitUrlPre, gitUsername, gitPassword);
         } catch (ExecutionException e) {
             LOGGER.error("git登陆失败，原因为: ", e);
-            return Message.error("git登陆失败，请检查git节点配置的用户名/密码");
+            return Message.error("git登陆失败，请检查git节点配置的用户名/密码/url");
         }
         // 获取顶级域名
         String domainIp = UrlUtils.normalizeIp(OrchestratorConf.GIT_DOMAIN_URL.getValue());
@@ -356,8 +357,15 @@ public Message gitUrl(@RequestParam(required = true, name = "projectName") Strin
         LOGGER.info("Cookie is {}", cookie);
         response.setHeader("Access-Control-Allow-Origin", topDomain);
         response.addHeader("Set-Cookie", cookie);
-
-        return Message.ok();
+        // 获取命名空间
+        GitUserInfoRequest gitWriteUserRequest = new GitUserInfoRequest();
+        gitWriteUserRequest.setWorkspaceId(workspace.getWorkspaceId());
+        gitWriteUserRequest.setType(GitConstant.GIT_ACCESS_WRITE_TYPE);
+        GitUserInfoResponse writeInfoResponse = RpcAskUtils.processAskException(sender.ask(gitWriteUserRequest), GitUserInfoResponse.class, GitUserInfoRequest.class);
+        String namespace = writeInfoResponse.getGitUser().getGitUser();
+        // 拼接跳转的url
+        String gitUrl = gitUrlPre + "/" + namespace + "/" + projectName + "/" + workflowName;
+        return Message.ok().data("gitUrl", UrlUtils.normalizeIp(gitUrl));
 
     }
 
diff --git a/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/OrchestratorService.java b/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/OrchestratorService.java
index cc52ac063..fc830c98d 100644
--- a/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/OrchestratorService.java
+++ b/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/OrchestratorService.java
@@ -140,6 +140,6 @@ String rollbackOrchestrator(String username, Long projectId, String projectName,
 
     void batchClearContextId();
 
-    String getAuthenToken(String gitUsername, String gitPassword) throws ExecutionException;
+    String getAuthenToken(String gitUrl, String gitUsername, String gitPassword) throws ExecutionException;
 
 }
diff --git a/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/impl/OrchestratorServiceImpl.java b/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/impl/OrchestratorServiceImpl.java
index faa9caa1f..a4c6ee98b 100644
--- a/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/impl/OrchestratorServiceImpl.java
+++ b/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/impl/OrchestratorServiceImpl.java
@@ -560,9 +560,9 @@ public void batchClearContextId() {
     }
 
     @Override
-    public String getAuthenToken(String gitUsername, String gitPassword) throws ExecutionException {
+    public String getAuthenToken(String gitUrlPre, String gitUsername, String gitPassword) throws ExecutionException {
         // 启动chromedriver
-        String url = "";
+//        String url = "";
         WebDriver driver = generateChromeDriver(this.getClass().getClassLoader().getResource(DSSOrchestratorConstant.CHROME_DRIVER_PATH).getPath(), null);
         String token = "";
         try {
@@ -570,7 +570,7 @@ public String getAuthenToken(String gitUsername, String gitPassword) throws Exec
             driver.manage().timeouts().implicitlyWait(Long.parseLong(OrchestratorConf.GIT_TIME.getValue()), TimeUnit.SECONDS);
             driver.manage().window().maximize();
             driver.manage().window().setSize(new Dimension(1920, 1080));
-            driver.get(UrlUtils.normalizeIp(url));
+            driver.get(UrlUtils.normalizeIp(gitUrlPre));
             WebElement elementUserName = driver.findElement(By.id(OrchestratorConf.GIT_USER.getValue()));
             WebElement elementPassWord = driver.findElement(By.id(OrchestratorConf.GIT_PASSWD.getValue()));
             WebElement elementBtn = driver.findElement(By.cssSelector(OrchestratorConf.GIT_SUBMIT.getValue()));

From b3ab34bb750b55e81eb9e8cf78b75506031f9764 Mon Sep 17 00:00:00 2001
From: qweqnotallow <747839893@qq.com>
Date: Tue, 7 May 2024 16:20:33 +0800
Subject: [PATCH 099/302] =?UTF-8?q?git=20add=20CurrentCommit/server?=
 =?UTF-8?q?=EF=BC=9A=20orchestrator=20version=20info=20add=20commitId?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../DSSFrameworkOrchestratorRestful.java      |  2 --
 .../request/GitCurrentCommitRequest.java      | 25 +++++++++++++++++
 .../service/DSSGitWorkflowManagerService.java |  2 ++
 .../DSSGitWorkflowManagerServiceImpl.java     | 28 +++++++++++++++++++
 .../receiver/DSSGitChooser.scala              |  3 +-
 .../receiver/DSSGitReceiver.scala             |  4 ++-
 .../common/entity/DSSOrchestratorVersion.java | 13 +++++++++
 .../dss/workflow/dao/LockMapper.java          |  2 ++
 .../dss/workflow/dao/impl/lockMapper.xml      |  8 ++++++
 .../service/impl/PublishServiceImpl.java      |  8 ++++++
 10 files changed, 91 insertions(+), 4 deletions(-)
 create mode 100644 dss-git/dss-git-common/src/main/java/com.webank.wedatasphere.dss.git.common/protocol/request/GitCurrentCommitRequest.java

diff --git a/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/restful/DSSFrameworkOrchestratorRestful.java b/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/restful/DSSFrameworkOrchestratorRestful.java
index ca9715d46..55d696f50 100644
--- a/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/restful/DSSFrameworkOrchestratorRestful.java
+++ b/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/restful/DSSFrameworkOrchestratorRestful.java
@@ -375,9 +375,7 @@ public Message submitFlow(@RequestParam Long orchestratorId) {
         String userName = SecurityFilter.getLoginUsername(httpServletRequest);
 
         String orchestratorStatus = orchestratorFrameworkService.getOrchestratorStatus(orchestratorId);
-
         
-
         return Message.ok();
     }
 }
diff --git a/dss-git/dss-git-common/src/main/java/com.webank.wedatasphere.dss.git.common/protocol/request/GitCurrentCommitRequest.java b/dss-git/dss-git-common/src/main/java/com.webank.wedatasphere.dss.git.common/protocol/request/GitCurrentCommitRequest.java
new file mode 100644
index 000000000..e05550c68
--- /dev/null
+++ b/dss-git/dss-git-common/src/main/java/com.webank.wedatasphere.dss.git.common/protocol/request/GitCurrentCommitRequest.java
@@ -0,0 +1,25 @@
+package com.webank.wedatasphere.dss.git.common.protocol.request;
+
+public class GitCurrentCommitRequest extends GitBaseRequest{
+    private String username;
+
+    public GitCurrentCommitRequest(String username) {
+        this.username = username;
+    }
+
+    public GitCurrentCommitRequest(Long workspaceId, String projectName, String username) {
+        super(workspaceId, projectName);
+        this.username = username;
+    }
+
+    public GitCurrentCommitRequest() {
+    }
+
+    public String getUsername() {
+        return username;
+    }
+
+    public void setUsername(String username) {
+        this.username = username;
+    }
+}
diff --git a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/DSSGitWorkflowManagerService.java b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/DSSGitWorkflowManagerService.java
index 08822a741..65e830383 100644
--- a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/DSSGitWorkflowManagerService.java
+++ b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/DSSGitWorkflowManagerService.java
@@ -18,4 +18,6 @@ public interface DSSGitWorkflowManagerService {
     GitFileContentResponse getFileContent(GitFileContentRequest request);
 
     GitHistoryResponse getHistory(GitHistoryRequest request);
+
+    GitCommitResponse getCurrentCommit(GitCurrentCommitRequest request);
 }
diff --git a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitWorkflowManagerServiceImpl.java b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitWorkflowManagerServiceImpl.java
index 2beb3c389..f5e6d4592 100644
--- a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitWorkflowManagerServiceImpl.java
+++ b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitWorkflowManagerServiceImpl.java
@@ -350,4 +350,32 @@ private Repository getRepository(File repoDir, String projectName, GitUserEntity
         }
         return repository;
     }
+
+    @Override
+    public GitCommitResponse getCurrentCommit(GitCurrentCommitRequest request) {
+        GitUserEntity gitUser = dssWorkspaceGitService.selectGit(request.getWorkspaceId(), GitConstant.GIT_ACCESS_WRITE_TYPE);
+        if (gitUser == null) {
+            logger.error("the workspace : {} don't associate with git", request.getWorkspaceId());
+            return null;
+        }
+        Repository repository = null;
+        GitCommitResponse commitResponse = null;
+        try {
+            // 拼接.git路径
+            String gitPath = DSSGitUtils.generateGitPath(request.getProjectName());
+            // 获取git仓库
+            File repoDir = new File(gitPath);
+            repository = getRepository(repoDir, request.getProjectName(), gitUser);
+            // 本地保持最新状态
+            DSSGitUtils.pull(repository, request.getProjectName(), gitUser);
+
+            commitResponse = DSSGitUtils.getCurrentCommit(repository);
+
+        } catch (Exception e) {
+            logger.error("pull failed, the reason is ",e);
+        } finally {
+            repository.close();
+        }
+        return commitResponse;
+    }
 }
diff --git a/dss-git/dss-git-server/src/main/scala/com.webank.wedatasphere.dss.git/receiver/DSSGitChooser.scala b/dss-git/dss-git-server/src/main/scala/com.webank.wedatasphere.dss.git/receiver/DSSGitChooser.scala
index c7f4fda28..f2c73d689 100644
--- a/dss-git/dss-git-server/src/main/scala/com.webank.wedatasphere.dss.git/receiver/DSSGitChooser.scala
+++ b/dss-git/dss-git-server/src/main/scala/com.webank.wedatasphere.dss.git/receiver/DSSGitChooser.scala
@@ -16,7 +16,7 @@
 
 package com.webank.wedatasphere.dss.git.receiver
 
-import com.webank.wedatasphere.dss.git.common.protocol.request.{GitArchiveProjectRequest, GitBaseRequest, GitCheckProjectRequest, GitCommitRequest, GitCreateProjectRequest, GitDeleteRequest, GitDiffRequest, GitFileContentRequest, GitHistoryRequest, GitRemoveRequest, GitRevertRequest, GitSearchRequest, GitUserInfoRequest, GitUserUpdateRequest}
+import com.webank.wedatasphere.dss.git.common.protocol.request.{GitArchiveProjectRequest, GitBaseRequest, GitCheckProjectRequest, GitCommitRequest, GitCreateProjectRequest, GitCurrentCommitRequest, GitDeleteRequest, GitDiffRequest, GitFileContentRequest, GitHistoryRequest, GitRemoveRequest, GitRevertRequest, GitSearchRequest, GitUserInfoRequest, GitUserUpdateRequest}
 import com.webank.wedatasphere.dss.git.service.{DSSGitProjectManagerService, DSSGitWorkflowManagerService, DSSWorkspaceGitService}
 
 import javax.annotation.PostConstruct
@@ -54,6 +54,7 @@ class DSSGitChooser extends ReceiverChooser {
     case _: GitHistoryRequest => receiver
     case _: GitUserUpdateRequest => receiver
     case _: GitUserInfoRequest => receiver
+    case _: GitCurrentCommitRequest => receiver
     case _ => None
   }
 }
\ No newline at end of file
diff --git a/dss-git/dss-git-server/src/main/scala/com.webank.wedatasphere.dss.git/receiver/DSSGitReceiver.scala b/dss-git/dss-git-server/src/main/scala/com.webank.wedatasphere.dss.git/receiver/DSSGitReceiver.scala
index 6dd8d1d24..8fc754f42 100644
--- a/dss-git/dss-git-server/src/main/scala/com.webank.wedatasphere.dss.git/receiver/DSSGitReceiver.scala
+++ b/dss-git/dss-git-server/src/main/scala/com.webank.wedatasphere.dss.git/receiver/DSSGitReceiver.scala
@@ -16,7 +16,7 @@
 
 package com.webank.wedatasphere.dss.git.receiver
 
-import com.webank.wedatasphere.dss.git.common.protocol.request.{GitArchiveProjectRequest, GitCheckProjectRequest, GitCommitRequest, GitCreateProjectRequest, GitDeleteRequest, GitDiffRequest, GitFileContentRequest, GitHistoryRequest, GitRevertRequest, GitSearchRequest, GitUserInfoRequest, GitUserUpdateRequest}
+import com.webank.wedatasphere.dss.git.common.protocol.request.{GitArchiveProjectRequest, GitCheckProjectRequest, GitCommitRequest, GitCreateProjectRequest, GitCurrentCommitRequest, GitDeleteRequest, GitDiffRequest, GitFileContentRequest, GitHistoryRequest, GitRevertRequest, GitSearchRequest, GitUserInfoRequest, GitUserUpdateRequest}
 import com.webank.wedatasphere.dss.git.service.{DSSGitProjectManagerService, DSSGitWorkflowManagerService, DSSWorkspaceGitService}
 import org.apache.linkis.rpc.{Receiver, Sender}
 import org.slf4j.{Logger, LoggerFactory}
@@ -53,6 +53,8 @@ class DSSGitReceiver(gitProjectManagerService: DSSGitProjectManagerService, gitW
       workspaceGitService.associateGit(gitUserUpdateRequest)
     case gitUserInfoRequest: GitUserInfoRequest =>
       workspaceGitService.selectGitUserInfo(gitUserInfoRequest)
+    case gitCurrentCommitRequest: GitCurrentCommitRequest =>
+      gitWorkflowManagerService.getCurrentCommit(gitCurrentCommitRequest)
     case _ => None
   }
 
diff --git a/dss-orchestrator/dss-orchestrator-common/src/main/java/com/webank/wedatasphere/dss/orchestrator/common/entity/DSSOrchestratorVersion.java b/dss-orchestrator/dss-orchestrator-common/src/main/java/com/webank/wedatasphere/dss/orchestrator/common/entity/DSSOrchestratorVersion.java
index 1175731d9..3c7b4c112 100644
--- a/dss-orchestrator/dss-orchestrator-common/src/main/java/com/webank/wedatasphere/dss/orchestrator/common/entity/DSSOrchestratorVersion.java
+++ b/dss-orchestrator/dss-orchestrator-common/src/main/java/com/webank/wedatasphere/dss/orchestrator/common/entity/DSSOrchestratorVersion.java
@@ -72,6 +72,10 @@ public class DSSOrchestratorVersion {
      * 有效标示 0:无效；1：有效，默认是有效
      */
     private Integer validFlag;
+    /**
+     * 项目发布当前版本的commitId
+     */
+    private String commitId;
 
 
     public Long getId() {
@@ -205,6 +209,15 @@ public String toString() {
                 ", content='" + content + '\'' +
                 ", contextId='" + contextId + '\'' +
                 ", validFlag='" + validFlag + '\'' +
+                ", commitId='" + commitId + '\'' +
                 '}';
     }
+
+    public String getCommitId() {
+        return commitId;
+    }
+
+    public void setCommitId(String commitId) {
+        this.commitId = commitId;
+    }
 }
diff --git a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/dao/LockMapper.java b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/dao/LockMapper.java
index ea78e06f1..baf751f22 100644
--- a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/dao/LockMapper.java
+++ b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/dao/LockMapper.java
@@ -62,4 +62,6 @@ Boolean flowNotExistEditLock(@Param("flowID") Long flowID,
     List<String> selectOrchestratorByStatus( @Param("status") String status);
 
     String selectOrchestratorStatus(@Param("flowID") Long flowID);
+
+    void updateOrchestratorVersionCommitId(@Param("commitId")String commitId, @Param("workflowId")Long flowID);
 }
diff --git a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/dao/impl/lockMapper.xml b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/dao/impl/lockMapper.xml
index a0d99aa1d..4091f2dea 100644
--- a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/dao/impl/lockMapper.xml
+++ b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/dao/impl/lockMapper.xml
@@ -103,4 +103,12 @@
         select id from dss_orchestrator where `status` = #{status}
     </select>
 
+    <update id="updateOrchestratorVersionCommitId">
+        update dss_orchestrator_version_info
+        <set>
+            `commit_id` = #{commitId}
+        </set>
+        where `app_id` = #{flowID}
+    </update>
+
 </mapper>
\ No newline at end of file
diff --git a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/service/impl/PublishServiceImpl.java b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/service/impl/PublishServiceImpl.java
index 834259aea..2c4ad2a1a 100644
--- a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/service/impl/PublishServiceImpl.java
+++ b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/service/impl/PublishServiceImpl.java
@@ -23,6 +23,8 @@
 import com.webank.wedatasphere.dss.common.protocol.project.ProjectInfoRequest;
 import com.webank.wedatasphere.dss.common.utils.DSSExceptionUtils;
 import com.webank.wedatasphere.dss.common.utils.RpcAskUtils;
+import com.webank.wedatasphere.dss.git.common.protocol.request.GitCurrentCommitRequest;
+import com.webank.wedatasphere.dss.git.common.protocol.response.GitCommitResponse;
 import com.webank.wedatasphere.dss.orchestrator.common.protocol.RequestFrameworkConvertOrchestration;
 import com.webank.wedatasphere.dss.orchestrator.common.protocol.RequestFrameworkConvertOrchestrationStatus;
 import com.webank.wedatasphere.dss.orchestrator.common.protocol.ResponseConvertOrchestrator;
@@ -104,6 +106,12 @@ public String submitPublish(String convertUser, Long workflowId,
             //仅对接入Git的项目更新状态为 发布-publish
             if (dssProject.getAssociateGit() != null && dssProject.getAssociateGit()) {
                 lockMapper.updateOrchestratorStatus(workflowId,OrchestratorRefConstant.FLOW_STATUS_PUBLISH);
+                // 获取当前文件Commit
+                Sender sender = DSSSenderServiceFactory.getOrCreateServiceInstance().getGitSender();
+                GitCurrentCommitRequest currentCommitRequest = new GitCurrentCommitRequest(workspace.getWorkspaceId(), dssProject.getName(), convertUser);
+                GitCommitResponse gitCommitResponse = RpcAskUtils.processAskException(sender.ask(currentCommitRequest), GitCommitResponse.class, GitCurrentCommitRequest.class);
+                // 更新commitId
+                lockMapper.updateOrchestratorVersionCommitId(gitCommitResponse.getCommitId(), dssFlow.getId());
             }
 
             return response.getId();

From bfcd29b7af7bf7ec05b02d0ce7e4f93f8679f8bf Mon Sep 17 00:00:00 2001
From: qweqnotallow <747839893@qq.com>
Date: Tue, 7 May 2024 16:55:57 +0800
Subject: [PATCH 100/302] git add CurrentCommit fix1

---
 .../request/GitCurrentCommitRequest.java      | 22 +++++++++++++----
 .../DSSGitWorkflowManagerServiceImpl.java     |  2 +-
 .../dss/git/utils/DSSGitUtils.java            | 24 +++++++++++++++++++
 3 files changed, 42 insertions(+), 6 deletions(-)

diff --git a/dss-git/dss-git-common/src/main/java/com.webank.wedatasphere.dss.git.common/protocol/request/GitCurrentCommitRequest.java b/dss-git/dss-git-common/src/main/java/com.webank.wedatasphere.dss.git.common/protocol/request/GitCurrentCommitRequest.java
index e05550c68..be53533c4 100644
--- a/dss-git/dss-git-common/src/main/java/com.webank.wedatasphere.dss.git.common/protocol/request/GitCurrentCommitRequest.java
+++ b/dss-git/dss-git-common/src/main/java/com.webank.wedatasphere.dss.git.common/protocol/request/GitCurrentCommitRequest.java
@@ -2,17 +2,21 @@
 
 public class GitCurrentCommitRequest extends GitBaseRequest{
     private String username;
+    private String filepath;
 
-    public GitCurrentCommitRequest(String username) {
-        this.username = username;
+
+    public GitCurrentCommitRequest() {
     }
 
-    public GitCurrentCommitRequest(Long workspaceId, String projectName, String username) {
-        super(workspaceId, projectName);
+    public GitCurrentCommitRequest(String username, String filepath) {
         this.username = username;
+        this.filepath = filepath;
     }
 
-    public GitCurrentCommitRequest() {
+    public GitCurrentCommitRequest(Long workspaceId, String projectName, String username, String filepath) {
+        super(workspaceId, projectName);
+        this.username = username;
+        this.filepath = filepath;
     }
 
     public String getUsername() {
@@ -22,4 +26,12 @@ public String getUsername() {
     public void setUsername(String username) {
         this.username = username;
     }
+
+    public String getFilepath() {
+        return filepath;
+    }
+
+    public void setFilepath(String filepath) {
+        this.filepath = filepath;
+    }
 }
diff --git a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitWorkflowManagerServiceImpl.java b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitWorkflowManagerServiceImpl.java
index f5e6d4592..dd01803cf 100644
--- a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitWorkflowManagerServiceImpl.java
+++ b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitWorkflowManagerServiceImpl.java
@@ -369,7 +369,7 @@ public GitCommitResponse getCurrentCommit(GitCurrentCommitRequest request) {
             // 本地保持最新状态
             DSSGitUtils.pull(repository, request.getProjectName(), gitUser);
 
-            commitResponse = DSSGitUtils.getCurrentCommit(repository);
+            commitResponse = DSSGitUtils.getLatestCommit(repository, request.getFilepath());
 
         } catch (Exception e) {
             logger.error("pull failed, the reason is ",e);
diff --git a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/utils/DSSGitUtils.java b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/utils/DSSGitUtils.java
index 3a88e5283..57bc99325 100644
--- a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/utils/DSSGitUtils.java
+++ b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/utils/DSSGitUtils.java
@@ -497,6 +497,30 @@ public static GitCommitResponse getCurrentCommit(Repository repository) {
         }
     }
 
+    public static GitCommitResponse getLatestCommit(Repository repository, String filePath) {
+        GitCommitResponse commitResponse = new GitCommitResponse();
+        try (Git git = new Git(repository)) {
+            // 获取文件的提交历史
+            Iterable<org.eclipse.jgit.revwalk.RevCommit> logs = git.log()
+                    .addPath(filePath)
+                    .call();
+
+            // 获取最近的一个提交
+            RevCommit latestCommit = logs.iterator().next();
+            commitResponse.setCommitId(latestCommit.getId().getName());
+            SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+            commitResponse.setCommitTime(sdf.format(latestCommit.getAuthorIdent().getWhen()));
+            commitResponse.setComment(latestCommit.getShortMessage());
+            commitResponse.setCommitUser(latestCommit.getAuthorIdent().getName());
+
+            logger.info("最近的提交ID: " + latestCommit.getId().getName());
+            return commitResponse; // 返回commitId字符串
+        } catch (GitAPIException e) {
+            logger.error("get latestCommitId failed, the reason is: ", e);
+            return null;
+        }
+    }
+
     public static GitHistoryResponse listCommitsBetween(Repository repository, String startCommitId, String endCommitId) throws Exception {
         List<GitCommitResponse> gitCommitResponseList = new ArrayList<>();
 

From a77a424a55521ef8ce18c0c9a5d4286c1ea761f5 Mon Sep 17 00:00:00 2001
From: qweqnotallow <747839893@qq.com>
Date: Tue, 7 May 2024 16:58:02 +0800
Subject: [PATCH 101/302] git add CurrentCommit fix2

---
 .../dss/workflow/service/impl/PublishServiceImpl.java           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/service/impl/PublishServiceImpl.java b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/service/impl/PublishServiceImpl.java
index 2c4ad2a1a..60ca09a18 100644
--- a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/service/impl/PublishServiceImpl.java
+++ b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/service/impl/PublishServiceImpl.java
@@ -108,7 +108,7 @@ public String submitPublish(String convertUser, Long workflowId,
                 lockMapper.updateOrchestratorStatus(workflowId,OrchestratorRefConstant.FLOW_STATUS_PUBLISH);
                 // 获取当前文件Commit
                 Sender sender = DSSSenderServiceFactory.getOrCreateServiceInstance().getGitSender();
-                GitCurrentCommitRequest currentCommitRequest = new GitCurrentCommitRequest(workspace.getWorkspaceId(), dssProject.getName(), convertUser);
+                GitCurrentCommitRequest currentCommitRequest = new GitCurrentCommitRequest(workspace.getWorkspaceId(), dssProject.getName(), convertUser, dssFlow.getName());
                 GitCommitResponse gitCommitResponse = RpcAskUtils.processAskException(sender.ask(currentCommitRequest), GitCommitResponse.class, GitCurrentCommitRequest.class);
                 // 更新commitId
                 lockMapper.updateOrchestratorVersionCommitId(gitCommitResponse.getCommitId(), dssFlow.getId());

From dd982f4d035e5d8001931bf7cf22636bb555a90c Mon Sep 17 00:00:00 2001
From: qweqnotallow <747839893@qq.com>
Date: Tue, 7 May 2024 20:18:28 +0800
Subject: [PATCH 102/302] git add history/server add /publish/history

---
 .../DSSFrameworkOrchestratorRestful.java      | 13 +++++++-
 .../service/OrchestratorFrameworkService.java |  3 ++
 .../OrchestratorFrameworkServiceImpl.java     | 14 +++++++++
 .../protocol/request/GitHistoryRequest.java   | 31 ++++++-------------
 .../DSSGitWorkflowManagerServiceImpl.java     | 17 ++++++++--
 .../dss/git/utils/DSSGitUtils.java            | 31 +++++++++----------
 6 files changed, 68 insertions(+), 41 deletions(-)

diff --git a/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/restful/DSSFrameworkOrchestratorRestful.java b/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/restful/DSSFrameworkOrchestratorRestful.java
index 55d696f50..7fa2c701e 100644
--- a/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/restful/DSSFrameworkOrchestratorRestful.java
+++ b/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/restful/DSSFrameworkOrchestratorRestful.java
@@ -26,6 +26,7 @@
 import com.webank.wedatasphere.dss.git.common.protocol.GitTree;
 import com.webank.wedatasphere.dss.git.common.protocol.constant.GitConstant;
 import com.webank.wedatasphere.dss.git.common.protocol.request.GitUserInfoRequest;
+import com.webank.wedatasphere.dss.git.common.protocol.response.GitHistoryResponse;
 import com.webank.wedatasphere.dss.git.common.protocol.response.GitUserInfoResponse;
 import com.webank.wedatasphere.dss.git.common.protocol.util.UrlUtils;
 import com.webank.wedatasphere.dss.orchestrator.common.entity.OrchestratorVo;
@@ -375,7 +376,17 @@ public Message submitFlow(@RequestParam Long orchestratorId) {
         String userName = SecurityFilter.getLoginUsername(httpServletRequest);
 
         String orchestratorStatus = orchestratorFrameworkService.getOrchestratorStatus(orchestratorId);
-        
+
         return Message.ok();
     }
+
+    @RequestMapping(value = "publish/history", method = RequestMethod.GET)
+    public Message getHistory(@RequestParam Long orchestratorId, @RequestParam String projectName) {
+        Workspace workspace = SSOHelper.getWorkspace(httpServletRequest);
+        String userName = SecurityFilter.getLoginUsername(httpServletRequest);
+
+        GitHistoryResponse history = orchestratorFrameworkService.getHistory(workspace.getWorkspaceId(), orchestratorId, projectName);
+
+        return Message.ok().data("history", history);
+    }
 }
diff --git a/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/OrchestratorFrameworkService.java b/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/OrchestratorFrameworkService.java
index 808bc6e9e..3fa855141 100644
--- a/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/OrchestratorFrameworkService.java
+++ b/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/OrchestratorFrameworkService.java
@@ -18,6 +18,7 @@
 
 import com.webank.wedatasphere.dss.common.exception.DSSErrorException;
 import com.webank.wedatasphere.dss.git.common.protocol.GitTree;
+import com.webank.wedatasphere.dss.git.common.protocol.response.GitHistoryResponse;
 import com.webank.wedatasphere.dss.orchestrator.common.entity.DSSOrchestratorCopyInfo;
 import com.webank.wedatasphere.dss.orchestrator.server.entity.request.*;
 import com.webank.wedatasphere.dss.orchestrator.server.entity.vo.CommonOrchestratorVo;
@@ -52,4 +53,6 @@ public interface OrchestratorFrameworkService {
     void submitFlow(OrchestratorSubmitRequest flowRequest, String username, Workspace workspace);
 
     String getOrchestratorStatus(Long orchestratorId);
+
+    GitHistoryResponse getHistory(Long workspaceId, Long orchestratorId, String projectName);
 }
diff --git a/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/impl/OrchestratorFrameworkServiceImpl.java b/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/impl/OrchestratorFrameworkServiceImpl.java
index 961fab991..cef18c574 100644
--- a/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/impl/OrchestratorFrameworkServiceImpl.java
+++ b/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/impl/OrchestratorFrameworkServiceImpl.java
@@ -44,8 +44,10 @@
 import com.webank.wedatasphere.dss.git.common.protocol.GitTree;
 import com.webank.wedatasphere.dss.git.common.protocol.request.GitCommitRequest;
 import com.webank.wedatasphere.dss.git.common.protocol.request.GitDiffRequest;
+import com.webank.wedatasphere.dss.git.common.protocol.request.GitHistoryRequest;
 import com.webank.wedatasphere.dss.git.common.protocol.response.GitCommitResponse;
 import com.webank.wedatasphere.dss.git.common.protocol.response.GitDiffResponse;
+import com.webank.wedatasphere.dss.git.common.protocol.response.GitHistoryResponse;
 import com.webank.wedatasphere.dss.orchestrator.common.entity.DSSOrchestratorCopyInfo;
 import com.webank.wedatasphere.dss.orchestrator.common.entity.DSSOrchestratorInfo;
 import com.webank.wedatasphere.dss.orchestrator.common.entity.DSSOrchestratorRefOrchestration;
@@ -534,4 +536,16 @@ public String getOrchestratorStatus(Long orchestratorId) {
         return orchestratorMapper.selectOrchestratorStatus(orchestratorId);
     }
 
+    @Override
+    public GitHistoryResponse getHistory(Long workspaceId, Long orchestratorId, String projectName) {
+        DSSOrchestratorInfo orchestrator = orchestratorMapper.getOrchestrator(orchestratorId);
+        String workflowName = orchestrator.getName();
+
+        Sender sender = DSSSenderServiceFactory.getOrCreateServiceInstance().getGitSender();
+        GitHistoryRequest historyRequest = new GitHistoryRequest(workspaceId, projectName, workflowName);
+        GitHistoryResponse gitHistoryResponse = RpcAskUtils.processAskException(sender.ask(historyRequest), GitHistoryResponse.class, GitHistoryRequest.class);
+
+        return gitHistoryResponse;
+    }
+
 }
diff --git a/dss-git/dss-git-common/src/main/java/com.webank.wedatasphere.dss.git.common/protocol/request/GitHistoryRequest.java b/dss-git/dss-git-common/src/main/java/com.webank.wedatasphere.dss.git.common/protocol/request/GitHistoryRequest.java
index 8e8be1ab3..39d4d8d64 100644
--- a/dss-git/dss-git-common/src/main/java/com.webank.wedatasphere.dss.git.common/protocol/request/GitHistoryRequest.java
+++ b/dss-git/dss-git-common/src/main/java/com.webank.wedatasphere.dss.git.common/protocol/request/GitHistoryRequest.java
@@ -1,19 +1,7 @@
 package com.webank.wedatasphere.dss.git.common.protocol.request;
 
 public class GitHistoryRequest extends GitBaseRequest{
-    private String startCommitId;
-    private String endCommitId;
-
-    public GitHistoryRequest(String startCommitId, String endCommitId) {
-        this.startCommitId = startCommitId;
-        this.endCommitId = endCommitId;
-    }
-
-    public GitHistoryRequest(Long workspaceId, String projectName, String startCommitId, String endCommitId) {
-        super(workspaceId, projectName);
-        this.startCommitId = startCommitId;
-        this.endCommitId = endCommitId;
-    }
+    private String filePath;
 
     public GitHistoryRequest() {
     }
@@ -22,19 +10,20 @@ public GitHistoryRequest(Long workspaceId, String projectName) {
         super(workspaceId, projectName);
     }
 
-    public String getStartCommitId() {
-        return startCommitId;
+    public GitHistoryRequest(String filePath) {
+        this.filePath = filePath;
     }
 
-    public void setStartCommitId(String startCommitId) {
-        this.startCommitId = startCommitId;
+    public GitHistoryRequest(Long workspaceId, String projectName, String filePath) {
+        super(workspaceId, projectName);
+        this.filePath = filePath;
     }
 
-    public String getEndCommitId() {
-        return endCommitId;
+    public String getFilePath() {
+        return filePath;
     }
 
-    public void setEndCommitId(String endCommitId) {
-        this.endCommitId = endCommitId;
+    public void setFilePath(String filePath) {
+        this.filePath = filePath;
     }
 }
diff --git a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitWorkflowManagerServiceImpl.java b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitWorkflowManagerServiceImpl.java
index dd01803cf..e0a9d9086 100644
--- a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitWorkflowManagerServiceImpl.java
+++ b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitWorkflowManagerServiceImpl.java
@@ -329,7 +329,12 @@ public GitHistoryResponse getHistory(GitHistoryRequest request) {
             // 本地保持最新状态
             DSSGitUtils.pull(repository, request.getProjectName(), gitUser);
 
-            response = DSSGitUtils.listCommitsBetween(repository, request.getStartCommitId(), request.getEndCommitId());
+            List<GitCommitResponse> latestCommit = DSSGitUtils.getLatestCommit(repository, request.getFilePath(), 5);
+            if (CollectionUtils.isEmpty(latestCommit)) {
+                logger.error("get Commit failed, the reason is null");
+            }else {
+                response.setResponses(latestCommit);
+            }
 
         } catch (Exception e) {
             logger.error("pull failed, the reason is ",e);
@@ -369,13 +374,19 @@ public GitCommitResponse getCurrentCommit(GitCurrentCommitRequest request) {
             // 本地保持最新状态
             DSSGitUtils.pull(repository, request.getProjectName(), gitUser);
 
-            commitResponse = DSSGitUtils.getLatestCommit(repository, request.getFilepath());
+            List<GitCommitResponse> latestCommit = DSSGitUtils.getLatestCommit(repository, request.getFilepath(), 1);
+            if (CollectionUtils.isEmpty(latestCommit)) {
+                logger.error("get latestCommit failed, the reason is null");
+            } else {
+                commitResponse = latestCommit.get(0);
+                return commitResponse;
+            }
 
         } catch (Exception e) {
             logger.error("pull failed, the reason is ",e);
         } finally {
             repository.close();
         }
-        return commitResponse;
+        return null;
     }
 }
diff --git a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/utils/DSSGitUtils.java b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/utils/DSSGitUtils.java
index 57bc99325..326dad604 100644
--- a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/utils/DSSGitUtils.java
+++ b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/utils/DSSGitUtils.java
@@ -497,24 +497,23 @@ public static GitCommitResponse getCurrentCommit(Repository repository) {
         }
     }
 
-    public static GitCommitResponse getLatestCommit(Repository repository, String filePath) {
-        GitCommitResponse commitResponse = new GitCommitResponse();
-        try (Git git = new Git(repository)) {
-            // 获取文件的提交历史
-            Iterable<org.eclipse.jgit.revwalk.RevCommit> logs = git.log()
-                    .addPath(filePath)
-                    .call();
+    public static List<GitCommitResponse> getLatestCommit(Repository repository, String filePath, Integer num) {
+        List<GitCommitResponse> commitResponseList = new ArrayList<>();
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 
-            // 获取最近的一个提交
-            RevCommit latestCommit = logs.iterator().next();
-            commitResponse.setCommitId(latestCommit.getId().getName());
-            SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-            commitResponse.setCommitTime(sdf.format(latestCommit.getAuthorIdent().getWhen()));
-            commitResponse.setComment(latestCommit.getShortMessage());
-            commitResponse.setCommitUser(latestCommit.getAuthorIdent().getName());
+        try (Git git = new Git(repository)) {
+            Iterable<RevCommit> commits = git.log().addPath(filePath).setMaxCount(num).call();
+            for (RevCommit commit : commits) {
+                GitCommitResponse commitResponse = new GitCommitResponse();
+                commitResponse.setCommitId(commit.getId().getName());
+                commitResponse.setCommitTime(sdf.format(commit.getAuthorIdent().getWhen()));
+                commitResponse.setComment(commit.getShortMessage());
+                commitResponse.setCommitUser(commit.getAuthorIdent().getName());
+                logger.info("提交ID: " + commit.getId().getName());
+                commitResponseList.add(commitResponse);
+            }
 
-            logger.info("最近的提交ID: " + latestCommit.getId().getName());
-            return commitResponse; // 返回commitId字符串
+            return commitResponseList;
         } catch (GitAPIException e) {
             logger.error("get latestCommitId failed, the reason is: ", e);
             return null;

From 4b303424530b22d5fd318acd84a58f3e972ea3dd Mon Sep 17 00:00:00 2001
From: qweqnotallow <747839893@qq.com>
Date: Wed, 8 May 2024 14:42:34 +0800
Subject: [PATCH 103/302] git createProject/modifyProject fix

---
 .../impl/DSSFrameworkProjectServiceImpl.java  | 23 ++++++++-----------
 1 file changed, 9 insertions(+), 14 deletions(-)

diff --git a/dss-framework/dss-framework-project-server/src/main/java/com/webank/wedatasphere/dss/framework/project/service/impl/DSSFrameworkProjectServiceImpl.java b/dss-framework/dss-framework-project-server/src/main/java/com/webank/wedatasphere/dss/framework/project/service/impl/DSSFrameworkProjectServiceImpl.java
index f4da6dfa8..edf81bc51 100644
--- a/dss-framework/dss-framework-project-server/src/main/java/com/webank/wedatasphere/dss/framework/project/service/impl/DSSFrameworkProjectServiceImpl.java
+++ b/dss-framework/dss-framework-project-server/src/main/java/com/webank/wedatasphere/dss/framework/project/service/impl/DSSFrameworkProjectServiceImpl.java
@@ -121,9 +121,8 @@ public DSSProjectVo createProject(ProjectCreateRequest projectCreateRequest, Str
         Map<AppInstance, Long> projectMap = createAppConnProject(projectCreateRequest, workspace, username);
         //3.保存dss_project
         DSSProjectDO project = dssProjectService.createProject(username, projectCreateRequest);
-        // 对于接入git的项目校验项目名称
+        // 同步项目信息至git
         if(projectCreateRequest.getAssociateGit() != null && projectCreateRequest.getAssociateGit()) {
-            checkGitName(projectCreateRequest.getName(), workspace, username);
             ExportAllOrchestratorsReqest exportAllOrchestratorsReqest = new ExportAllOrchestratorsReqest();
             exportAllOrchestratorsReqest.setProjectId(project.getId());
             exportAllOrchestratorsReqest.setComment("test");
@@ -192,6 +191,11 @@ public void modifyProject(ProjectModifyRequest projectModifyRequest, DSSProjectD
             DSSExceptionUtils.dealErrorException(ProjectServerResponse.PROJECT_NOT_EDIT_NAME.getCode(), ProjectServerResponse.PROJECT_NOT_EDIT_NAME.getMsg(), DSSProjectErrorException.class);
         }
 
+        // 校验接入git
+        if (projectModifyRequest.getAssociateGit() != null) {
+            checkAssociateGit(projectModifyRequest, dbProject, username, workspace);
+        }
+
         //调用第三方的工程修改接口
         dbProject.setUsername(username);
         dbProject.setApplicationArea(Integer.valueOf(projectModifyRequest.getApplicationArea()));
@@ -207,25 +211,16 @@ public void modifyProject(ProjectModifyRequest projectModifyRequest, DSSProjectD
         //3.修改dss_project DSS基本工程信息
         DSSProjectDO dssProjectDO = dssProjectService.modifyProject(username, projectModifyRequest);
 
-        // 校验接入git
+        // 同步项目配置元数据到git
         if (projectModifyRequest.getAssociateGit() != null) {
-            checkAssociateGit(projectModifyRequest, dbProject, username, workspace);
             ExportAllOrchestratorsReqest exportAllOrchestratorsReqest = new ExportAllOrchestratorsReqest();
             exportAllOrchestratorsReqest.setProjectId(dbProject.getId());
-            exportAllOrchestratorsReqest.setComment("test");
+            exportAllOrchestratorsReqest.setComment("update Project");
             exportAllOrchestratorsReqest.setLabels(DSSCommonUtils.ENV_LABEL_VALUE_DEV);
 
-            BmlResource bmlResource;
-            if (dbProject.getAssociateGit() != null && dbProject.getAssociateGit()) {
-                // 对于首次转为接入git的项目，要进行整个项目的导入导出
-                bmlResource = dssProjectService.exportProject(exportAllOrchestratorsReqest, username, "", workspace);
-            }else {
-                // 对于已接入git的项目，只更新元数据即可
-                bmlResource = dssProjectService.exportOnlyProjectMeta(exportAllOrchestratorsReqest, username, "", workspace);
-            }
+            BmlResource bmlResource = dssProjectService.exportOnlyProjectMeta(exportAllOrchestratorsReqest, username, "", workspace);
             updateProject(workspace.getWorkspaceId(), dbProject.getName(), bmlResource, username);
         }
-
     }
 
     private void updateProject(Long workspaceId, String projectName,BmlResource bmlResource, String username ) {

From 5945472448147bb5a91e59a5291713ed73660ffc Mon Sep 17 00:00:00 2001
From: qweqnotallow <747839893@qq.com>
Date: Wed, 8 May 2024 15:12:47 +0800
Subject: [PATCH 104/302] git server remove gitUrl

---
 .../orchestrator/server/conf/OrchestratorConf.java   |  6 ------
 .../restful/DSSFrameworkOrchestratorRestful.java     |  9 +++++----
 .../server/service/impl/OrchestratorServiceImpl.java | 12 ++++++------
 .../protocol/GitUserEntity.java                      |  9 ---------
 .../protocol}/config/GitServerConfig.java            |  7 +++++--
 .../dss/git/constant/DSSGitConstant.java             |  4 +---
 .../dss/git/dao/impl/DSSWorkspaceGitMapper.xml       |  7 ++-----
 .../impl/DSSGitProjectManagerServiceImpl.java        | 10 +++++-----
 .../impl/DSSGitWorkflowManagerServiceImpl.java       |  4 +---
 .../dss/git/thread/GitServerThreadFactory.java       |  2 +-
 .../dss/git/thread/GitServerThreadPool.java          |  7 -------
 .../wedatasphere/dss/git/utils/DSSGitUtils.java      |  2 +-
 .../webank/wedatasphere/dss/git/utils/FileUtils.java |  3 +--
 13 files changed, 28 insertions(+), 54 deletions(-)
 rename dss-git/{dss-git-server/src/main/java/com/webank/wedatasphere/dss/git => dss-git-common/src/main/java/com.webank.wedatasphere.dss.git.common/protocol}/config/GitServerConfig.java (60%)

diff --git a/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/conf/OrchestratorConf.java b/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/conf/OrchestratorConf.java
index 43d7cc5ba..4dae761ad 100644
--- a/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/conf/OrchestratorConf.java
+++ b/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/conf/OrchestratorConf.java
@@ -24,10 +24,4 @@ public class OrchestratorConf {
     public static final CommonVars<Integer> DSS_PUBLISH_MAX_VERSION = CommonVars.apply("wds.dss.publish.max.remain.version", 30);
     public static final CommonVars<String> DSS_CS_CLEAR_ENV = CommonVars.apply("wds.dss.server.cs.clear.env", "DEV");
     public static final  CommonVars<String> DSS_CS_CLEAR_CRON = CommonVars.apply("wds.dss.server.scheduling.clear.cs.cron", "");
-
-    public static final CommonVars<String> GIT_USER = CommonVars.apply("wds.dss.server.git.user", "user_login");
-    public static final CommonVars<String> GIT_PASSWD = CommonVars.apply("wds.dss.server.git.password", "user_password");
-    public static final CommonVars<String> GIT_SUBMIT = CommonVars.apply("wds.dss.server.git.submit", "input[class='btn btn-success qa-sign-in-button']");
-    public static final CommonVars<String> GIT_TIME = CommonVars.apply("wds.dss.server.git.time", "1");
-    public static final CommonVars<String> GIT_DOMAIN_URL = CommonVars.apply("wds.dss.server.git.url", ***REMOVED***
 }
diff --git a/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/restful/DSSFrameworkOrchestratorRestful.java b/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/restful/DSSFrameworkOrchestratorRestful.java
index 7fa2c701e..1c3fb7c04 100644
--- a/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/restful/DSSFrameworkOrchestratorRestful.java
+++ b/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/restful/DSSFrameworkOrchestratorRestful.java
@@ -24,6 +24,7 @@
 import com.webank.wedatasphere.dss.common.utils.AuditLogUtils;
 import com.webank.wedatasphere.dss.common.utils.RpcAskUtils;
 import com.webank.wedatasphere.dss.git.common.protocol.GitTree;
+import com.webank.wedatasphere.dss.git.common.protocol.config.GitServerConfig;
 import com.webank.wedatasphere.dss.git.common.protocol.constant.GitConstant;
 import com.webank.wedatasphere.dss.git.common.protocol.request.GitUserInfoRequest;
 import com.webank.wedatasphere.dss.git.common.protocol.response.GitHistoryResponse;
@@ -331,12 +332,12 @@ public Message gitUrl(@RequestParam(required = true, name = "projectName") Strin
         Sender sender = DSSSenderServiceFactory.getOrCreateServiceInstance().getGitSender();
         GitUserInfoRequest gitUserInfoRequest = new GitUserInfoRequest();
         gitUserInfoRequest.setWorkspaceId(workspace.getWorkspaceId());
-        gitUserInfoRequest.setType(GitConstant.GIT_ACCESS_WRITE_TYPE);
+        gitUserInfoRequest.setType(GitConstant.GIT_ACCESS_READ_TYPE);
 
         GitUserInfoResponse readInfoResponse = RpcAskUtils.processAskException(sender.ask(gitUserInfoRequest), GitUserInfoResponse.class, GitUserInfoRequest.class);
         String gitUsername = readInfoResponse.getGitUser().getGitUser();
         String gitPassword = readInfoResponse.getGitUser().getGitPassword();
-        String gitUrlPre = UrlUtils.normalizeIp(readInfoResponse.getGitUser().getGitUrl());
+        String gitUrlPre = UrlUtils.normalizeIp(GitServerConfig.GIT_URL_PRE.getValue());
         String authenToken = "";
         try {
             authenToken = orchestratorService.getAuthenToken(gitUrlPre, gitUsername, gitPassword);
@@ -344,8 +345,8 @@ public Message gitUrl(@RequestParam(required = true, name = "projectName") Strin
             LOGGER.error("git登陆失败，原因为: ", e);
             return Message.error("git登陆失败，请检查git节点配置的用户名/密码/url");
         }
-        // 获取顶级域名
-        String domainIp = UrlUtils.normalizeIp(OrchestratorConf.GIT_DOMAIN_URL.getValue());
+        // 获取顶级域名 eg: ***REMOVED*** -> weoa.com
+        String domainIp = UrlUtils.normalizeIp(GitServerConfig.GIT_URL_PRE.getValue());
         int lastDotIndex = domainIp.lastIndexOf(".");
         String topDomain = "";
         if (lastDotIndex != -1) {
diff --git a/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/impl/OrchestratorServiceImpl.java b/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/impl/OrchestratorServiceImpl.java
index a4c6ee98b..304a087b5 100644
--- a/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/impl/OrchestratorServiceImpl.java
+++ b/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/impl/OrchestratorServiceImpl.java
@@ -29,6 +29,7 @@
 import com.webank.wedatasphere.dss.common.utils.RpcAskUtils;
 import com.webank.wedatasphere.dss.contextservice.service.ContextService;
 import com.webank.wedatasphere.dss.framework.common.exception.DSSFrameworkErrorException;
+import com.webank.wedatasphere.dss.git.common.protocol.config.GitServerConfig;
 import com.webank.wedatasphere.dss.git.common.protocol.util.UrlUtils;
 import com.webank.wedatasphere.dss.orchestrator.common.entity.DSSOrchestratorInfo;
 import com.webank.wedatasphere.dss.orchestrator.common.entity.DSSOrchestratorVersion;
@@ -562,23 +563,22 @@ public void batchClearContextId() {
     @Override
     public String getAuthenToken(String gitUrlPre, String gitUsername, String gitPassword) throws ExecutionException {
         // 启动chromedriver
-//        String url = "";
         WebDriver driver = generateChromeDriver(this.getClass().getClassLoader().getResource(DSSOrchestratorConstant.CHROME_DRIVER_PATH).getPath(), null);
         String token = "";
         try {
             //设置超时时间
-            driver.manage().timeouts().implicitlyWait(Long.parseLong(OrchestratorConf.GIT_TIME.getValue()), TimeUnit.SECONDS);
+            driver.manage().timeouts().implicitlyWait(Long.parseLong(GitServerConfig.GIT_TIME.getValue()), TimeUnit.SECONDS);
             driver.manage().window().maximize();
             driver.manage().window().setSize(new Dimension(1920, 1080));
             driver.get(UrlUtils.normalizeIp(gitUrlPre));
-            WebElement elementUserName = driver.findElement(By.id(OrchestratorConf.GIT_USER.getValue()));
-            WebElement elementPassWord = driver.findElement(By.id(OrchestratorConf.GIT_PASSWD.getValue()));
-            WebElement elementBtn = driver.findElement(By.cssSelector(OrchestratorConf.GIT_SUBMIT.getValue()));
+            WebElement elementUserName = driver.findElement(By.id(GitServerConfig.GIT_USER.getValue()));
+            WebElement elementPassWord = driver.findElement(By.id(GitServerConfig.GIT_PASSWD.getValue()));
+            WebElement elementBtn = driver.findElement(By.cssSelector(GitServerConfig.GIT_SUBMIT.getValue()));
             elementUserName.sendKeys(gitUsername);
             elementPassWord.sendKeys(gitPassword);
             elementBtn.submit();
             driver.navigate().refresh();
-            LOGGER.info("for user getting... " + UrlUtils.normalizeIp(OrchestratorConf.GIT_DOMAIN_URL.getValue()));
+            LOGGER.info("for user getting... " + UrlUtils.normalizeIp(GitServerConfig.GIT_URL_PRE.getValue()));
             Set<Cookie> cookies = driver.manage().getCookies();
             LOGGER.info("cookies： {}", cookies.toString());
             for (Cookie cookie:cookies) {
diff --git a/dss-git/dss-git-common/src/main/java/com.webank.wedatasphere.dss.git.common/protocol/GitUserEntity.java b/dss-git/dss-git-common/src/main/java/com.webank.wedatasphere.dss.git.common/protocol/GitUserEntity.java
index 7d177c641..8ab73b1a6 100644
--- a/dss-git/dss-git-common/src/main/java/com.webank.wedatasphere.dss.git.common/protocol/GitUserEntity.java
+++ b/dss-git/dss-git-common/src/main/java/com.webank.wedatasphere.dss.git.common/protocol/GitUserEntity.java
@@ -8,7 +8,6 @@ public class GitUserEntity {
     private Long workspaceId;
     private String gitUser;
     private String gitPassword;
-    private String gitUrl;
     private String gitToken;
     private Date createTime;
     private Date updateTime;
@@ -94,14 +93,6 @@ public void setGitPassword(String gitPassword) {
         this.gitPassword = gitPassword;
     }
 
-    public String getGitUrl() {
-        return gitUrl;
-    }
-
-    public void setGitUrl(String gitUrl) {
-        this.gitUrl = gitUrl;
-    }
-
     public String getType() {
         return type;
     }
diff --git a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/config/GitServerConfig.java b/dss-git/dss-git-common/src/main/java/com.webank.wedatasphere.dss.git.common/protocol/config/GitServerConfig.java
similarity index 60%
rename from dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/config/GitServerConfig.java
rename to dss-git/dss-git-common/src/main/java/com.webank.wedatasphere.dss.git.common/protocol/config/GitServerConfig.java
index 0dd8b548f..7f401c398 100644
--- a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/config/GitServerConfig.java
+++ b/dss-git/dss-git-common/src/main/java/com.webank.wedatasphere.dss.git.common/protocol/config/GitServerConfig.java
@@ -1,4 +1,4 @@
-package com.webank.wedatasphere.dss.git.config;
+package com.webank.wedatasphere.dss.git.common.protocol.config;
 
 import org.apache.linkis.common.conf.CommonVars;
 
@@ -15,5 +15,8 @@ public class GitServerConfig {
 
     public static final CommonVars<Integer> GIT_SEARCH_RESULT_LIMIT = CommonVars.apply("wds.dss.git.search.limit", 30);
 
-    public static final CommonVars<String> GIT_THREAD_NAME = CommonVars.apply("wds.dss.git.thread.name", "gitServer-Thread-");
+    public static final CommonVars<String> GIT_USER = CommonVars.apply("wds.dss.server.git.user", "user_login");
+    public static final CommonVars<String> GIT_PASSWD = CommonVars.apply("wds.dss.server.git.password", "user_password");
+    public static final CommonVars<String> GIT_SUBMIT = CommonVars.apply("wds.dss.server.git.submit", "input[class='btn btn-success qa-sign-in-button']");
+    public static final CommonVars<String> GIT_TIME = CommonVars.apply("wds.dss.server.git.time", "1");
 }
diff --git a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/constant/DSSGitConstant.java b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/constant/DSSGitConstant.java
index 1aae9b250..7a7b3a5a0 100644
--- a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/constant/DSSGitConstant.java
+++ b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/constant/DSSGitConstant.java
@@ -1,6 +1,6 @@
 package com.webank.wedatasphere.dss.git.constant;
 
-import com.webank.wedatasphere.dss.git.config.GitServerConfig;
+import com.webank.wedatasphere.dss.git.common.protocol.config.GitServerConfig;
 import com.webank.wedatasphere.dss.git.utils.FileUtils;
 
 import java.io.File;
@@ -8,6 +8,4 @@
 public class DSSGitConstant {
     public static String GIT_PATH_PRE = File.separator + FileUtils.normalizePath(GitServerConfig.GIT_SERVER_PATH.getValue()) + File.separator;
     public static String GIT_PATH_SUFFIX = File.separator + ".git";
-    public static String GIT_ACCESS_WRITE_TYPE = "write";
-    public static String GIT_ACCESS_READ_TYPE = "read";
 }
diff --git a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/dao/impl/DSSWorkspaceGitMapper.xml b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/dao/impl/DSSWorkspaceGitMapper.xml
index 679ce3039..b13004145 100644
--- a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/dao/impl/DSSWorkspaceGitMapper.xml
+++ b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/dao/impl/DSSWorkspaceGitMapper.xml
@@ -18,8 +18,8 @@
 
 <mapper namespace="com.webank.wedatasphere.dss.git.dao.DSSWorkspaceGitMapper">
     <insert id="insert" parameterType="com.webank.wedatasphere.dss.git.common.protocol.GitUserEntity">
-        insert into dss_workspace_associate_git (workspace_id, git_user, git_password, git_token, git_url, create_time, update_time, create_by, update_by, type)
-        VALUES (#{workspaceId}, #{gitUser}, #{gitPassword}, #{gitToken}, #{gitUrl}, now(), now(), #{createBy}, #{updateBy}, #{type})
+        insert into dss_workspace_associate_git (workspace_id, git_user, git_password, git_token, create_time, update_time, create_by, update_by, type)
+        VALUES (#{workspaceId}, #{gitUser}, #{gitPassword}, #{gitToken}, now(), now(), #{createBy}, #{updateBy}, #{type})
     </insert>
 
     <update id="update" parameterType="com.webank.wedatasphere.dss.git.common.protocol.GitUserEntity">
@@ -34,9 +34,6 @@
             <if test="gitToken != null">
                 git_token = #{gitToken},
             </if>
-            <if test="gitUrl != null">
-                git_url = #{gitUrl},
-            </if>
             update_by = #{updateBy},
         </set>
         where workspace_id = #{workspaceId} and type = #{type}
diff --git a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitProjectManagerServiceImpl.java b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitProjectManagerServiceImpl.java
index ad83eaa9c..94ccae518 100644
--- a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitProjectManagerServiceImpl.java
+++ b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitProjectManagerServiceImpl.java
@@ -6,8 +6,7 @@
 import com.webank.wedatasphere.dss.git.common.protocol.constant.GitConstant;
 import com.webank.wedatasphere.dss.git.common.protocol.request.*;
 import com.webank.wedatasphere.dss.git.common.protocol.response.*;
-import com.webank.wedatasphere.dss.git.config.GitServerConfig;
-import com.webank.wedatasphere.dss.git.constant.DSSGitConstant;
+import com.webank.wedatasphere.dss.git.common.protocol.config.GitServerConfig;
 import com.webank.wedatasphere.dss.git.service.DSSGitProjectManagerService;
 import com.webank.wedatasphere.dss.git.service.DSSWorkspaceGitService;
 import com.webank.wedatasphere.dss.git.utils.DSSGitUtils;
@@ -41,17 +40,18 @@ public GitCreateProjectResponse create(GitCreateProjectRequest request) {
             logger.error("the workspace : {} don't associate with git", request.getWorkspaceId());
             return null;
         }
+        Repository repository;
         try {
             // Http请求Git，创建project
             DSSGitUtils.init(request.getProjectName(), gitUser);
-            // 解压BML文件到本地 todo 对接Server时放开调试
+            // 解压BML文件到本地
             FileUtils.removeProject(request.getProjectName());
             FileUtils.update(bmlService, request.getProjectName(), request.getBmlResource(), request.getUsername());
             // 本地创建Git项目
             DSSGitUtils.create(request.getProjectName(), gitUser);
             // 获取git项目
             File repoDir = new File(File.separator + FileUtils.normalizePath(GitServerConfig.GIT_SERVER_PATH.getValue()) + File.separator + request.getProjectName() + File.separator +".git");
-            Repository repository = new FileRepositoryBuilder().setGitDir(repoDir).build();
+            repository = new FileRepositoryBuilder().setGitDir(repoDir).build();
             // 关联远端Git
             DSSGitUtils.remote(repository, request.getProjectName(), gitUser);
             // 提交
@@ -73,7 +73,7 @@ public GitArchivePorjectResponse archive(GitArchiveProjectRequest request) {
         }
         // 远程归档
         DSSGitUtils.archive(request.getProjectName(), gitUser);
-        // 删除本地项目（todo 多节点）
+        // 删除本地项目
         DSSGitUtils.archiveLocal(request.getProjectName());
         return null;
     }
diff --git a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitWorkflowManagerServiceImpl.java b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitWorkflowManagerServiceImpl.java
index e0a9d9086..e8e871a62 100644
--- a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitWorkflowManagerServiceImpl.java
+++ b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitWorkflowManagerServiceImpl.java
@@ -1,15 +1,13 @@
 package com.webank.wedatasphere.dss.git.service.impl;
 
 import com.webank.wedatasphere.dss.common.entity.BmlResource;
-import com.webank.wedatasphere.dss.common.exception.DSSErrorException;
 import com.webank.wedatasphere.dss.common.service.BMLService;
 import com.webank.wedatasphere.dss.git.common.protocol.GitSearchResult;
 import com.webank.wedatasphere.dss.git.common.protocol.GitUserEntity;
 import com.webank.wedatasphere.dss.git.common.protocol.constant.GitConstant;
 import com.webank.wedatasphere.dss.git.common.protocol.request.*;
 import com.webank.wedatasphere.dss.git.common.protocol.response.*;
-import com.webank.wedatasphere.dss.git.config.GitServerConfig;
-import com.webank.wedatasphere.dss.git.constant.DSSGitConstant;
+import com.webank.wedatasphere.dss.git.common.protocol.config.GitServerConfig;
 import com.webank.wedatasphere.dss.git.service.DSSGitWorkflowManagerService;
 import com.webank.wedatasphere.dss.git.service.DSSWorkspaceGitService;
 import com.webank.wedatasphere.dss.git.utils.DSSGitUtils;
diff --git a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/thread/GitServerThreadFactory.java b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/thread/GitServerThreadFactory.java
index f70702bf3..90a0a8fd0 100644
--- a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/thread/GitServerThreadFactory.java
+++ b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/thread/GitServerThreadFactory.java
@@ -1,6 +1,6 @@
 package com.webank.wedatasphere.dss.git.thread;
 
-import com.webank.wedatasphere.dss.git.config.GitServerConfig;
+import com.webank.wedatasphere.dss.git.common.protocol.config.GitServerConfig;
 
 
 public class GitServerThreadFactory {
diff --git a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/thread/GitServerThreadPool.java b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/thread/GitServerThreadPool.java
index 8f5d0d67e..9a1c5a4a6 100644
--- a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/thread/GitServerThreadPool.java
+++ b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/thread/GitServerThreadPool.java
@@ -1,14 +1,7 @@
 package com.webank.wedatasphere.dss.git.thread;
 
-import com.webank.wedatasphere.dss.git.config.GitServerConfig;
-import org.apache.linkis.common.utils.Utils;
-import org.apache.poi.ss.formula.functions.T;
-import org.springframework.stereotype.Component;
-
 import java.util.HashMap;
-import java.util.LinkedList;
 import java.util.Map;
-import java.util.Queue;
 import java.util.concurrent.*;
 
 public class GitServerThreadPool {
diff --git a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/utils/DSSGitUtils.java b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/utils/DSSGitUtils.java
index 326dad604..ec9cd4f1b 100644
--- a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/utils/DSSGitUtils.java
+++ b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/utils/DSSGitUtils.java
@@ -8,7 +8,7 @@
 import com.webank.wedatasphere.dss.git.common.protocol.response.GitDiffResponse;
 import com.webank.wedatasphere.dss.git.common.protocol.response.GitCommitResponse;
 import com.webank.wedatasphere.dss.git.common.protocol.response.GitHistoryResponse;
-import com.webank.wedatasphere.dss.git.config.GitServerConfig;
+import com.webank.wedatasphere.dss.git.common.protocol.config.GitServerConfig;
 import com.webank.wedatasphere.dss.git.constant.DSSGitConstant;
 import org.apache.http.HttpEntity;
 import org.apache.http.client.methods.CloseableHttpResponse;
diff --git a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/utils/FileUtils.java b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/utils/FileUtils.java
index 0c7c72f3a..20da0500f 100644
--- a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/utils/FileUtils.java
+++ b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/utils/FileUtils.java
@@ -5,8 +5,7 @@
 import com.webank.wedatasphere.dss.common.exception.DSSErrorException;
 import com.webank.wedatasphere.dss.common.exception.DSSRuntimeException;
 import com.webank.wedatasphere.dss.common.service.BMLService;
-import com.webank.wedatasphere.dss.common.utils.ZipHelper;
-import com.webank.wedatasphere.dss.git.config.GitServerConfig;
+import com.webank.wedatasphere.dss.git.common.protocol.config.GitServerConfig;
 import org.apache.commons.lang.StringUtils;
 import org.apache.poi.util.IOUtils;
 import org.slf4j.Logger;

From 3b70f49f4341dc00bddb31bb3fe71a4022be6dd7 Mon Sep 17 00:00:00 2001
From: qweqnotallow <747839893@qq.com>
Date: Wed, 8 May 2024 16:25:18 +0800
Subject: [PATCH 105/302] deleteLock add username

---
 .../service/impl/DSSFrameworkProjectServiceImpl.java      | 2 +-
 .../wedatasphere/dss/git/constant/DSSGitConstant.java     | 2 ++
 .../git/service/impl/DSSGitProjectManagerServiceImpl.java | 4 +++-
 .../service/impl/DSSGitWorkflowManagerServiceImpl.java    | 8 +++++---
 .../wedatasphere/dss/workflow/DefaultWorkFlowManager.java | 2 +-
 .../dss/workflow/lock/DSSFlowEditLockManager.java         | 4 ++--
 .../wedatasphere/dss/workflow/restful/FlowRestfulApi.java | 3 ++-
 7 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/dss-framework/dss-framework-project-server/src/main/java/com/webank/wedatasphere/dss/framework/project/service/impl/DSSFrameworkProjectServiceImpl.java b/dss-framework/dss-framework-project-server/src/main/java/com/webank/wedatasphere/dss/framework/project/service/impl/DSSFrameworkProjectServiceImpl.java
index edf81bc51..6a0ae7323 100644
--- a/dss-framework/dss-framework-project-server/src/main/java/com/webank/wedatasphere/dss/framework/project/service/impl/DSSFrameworkProjectServiceImpl.java
+++ b/dss-framework/dss-framework-project-server/src/main/java/com/webank/wedatasphere/dss/framework/project/service/impl/DSSFrameworkProjectServiceImpl.java
@@ -228,7 +228,7 @@ private void updateProject(Long workspaceId, String projectName,BmlResource bmlR
         Map<String, BmlResource> file = new HashMap<>();
         // 测试数据 key表示项目名、value为项目BmlResource资源
         file.put(".metaConf", bmlResource);
-        GitCommitRequest request1 = new GitCommitRequest(workspaceId, projectName, file, "update Project by" + username, username);
+        GitCommitRequest request1 = new GitCommitRequest(workspaceId, projectName, file, "update Project", username);
         LOGGER.info("-------=======================begin to update project: {}=======================-------", projectName);
         GitCommitResponse responseWorkflowValidNode = RpcAskUtils.processAskException(gitSender.ask(request1), GitCommitResponse.class, GitCommitRequest.class);
         LOGGER.info("-------=======================End to update project: {}=======================-------: {}", projectName, responseWorkflowValidNode);
diff --git a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/constant/DSSGitConstant.java b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/constant/DSSGitConstant.java
index 7a7b3a5a0..bfd483849 100644
--- a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/constant/DSSGitConstant.java
+++ b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/constant/DSSGitConstant.java
@@ -8,4 +8,6 @@
 public class DSSGitConstant {
     public static String GIT_PATH_PRE = File.separator + FileUtils.normalizePath(GitServerConfig.GIT_SERVER_PATH.getValue()) + File.separator;
     public static String GIT_PATH_SUFFIX = File.separator + ".git";
+
+    public static String GIT_USERNAME_FLAG = " by: ";
 }
diff --git a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitProjectManagerServiceImpl.java b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitProjectManagerServiceImpl.java
index 94ccae518..f36718629 100644
--- a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitProjectManagerServiceImpl.java
+++ b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitProjectManagerServiceImpl.java
@@ -7,6 +7,7 @@
 import com.webank.wedatasphere.dss.git.common.protocol.request.*;
 import com.webank.wedatasphere.dss.git.common.protocol.response.*;
 import com.webank.wedatasphere.dss.git.common.protocol.config.GitServerConfig;
+import com.webank.wedatasphere.dss.git.constant.DSSGitConstant;
 import com.webank.wedatasphere.dss.git.service.DSSGitProjectManagerService;
 import com.webank.wedatasphere.dss.git.service.DSSWorkspaceGitService;
 import com.webank.wedatasphere.dss.git.utils.DSSGitUtils;
@@ -55,7 +56,8 @@ public GitCreateProjectResponse create(GitCreateProjectRequest request) {
             // 关联远端Git
             DSSGitUtils.remote(repository, request.getProjectName(), gitUser);
             // 提交
-            DSSGitUtils.push(repository, request.getProjectName(), gitUser, "init project: " + request.getProjectName() + "by " + request.getUsername());
+            String comment = "init project: " + request.getProjectName() + DSSGitConstant.GIT_USERNAME_FLAG + request.getUsername();
+            DSSGitUtils.push(repository, request.getProjectName(), gitUser, comment);
             return new GitCreateProjectResponse();
         } catch (Exception e) {
             logger.error("create project failed, the reason is: ", e);
diff --git a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitWorkflowManagerServiceImpl.java b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitWorkflowManagerServiceImpl.java
index e8e871a62..b63f87717 100644
--- a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitWorkflowManagerServiceImpl.java
+++ b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitWorkflowManagerServiceImpl.java
@@ -8,6 +8,7 @@
 import com.webank.wedatasphere.dss.git.common.protocol.request.*;
 import com.webank.wedatasphere.dss.git.common.protocol.response.*;
 import com.webank.wedatasphere.dss.git.common.protocol.config.GitServerConfig;
+import com.webank.wedatasphere.dss.git.constant.DSSGitConstant;
 import com.webank.wedatasphere.dss.git.service.DSSGitWorkflowManagerService;
 import com.webank.wedatasphere.dss.git.service.DSSWorkspaceGitService;
 import com.webank.wedatasphere.dss.git.utils.DSSGitUtils;
@@ -57,7 +58,7 @@ public GitDiffResponse diff(GitDiffRequest request) {
             repository = getRepository(repoDir, request.getProjectName(), gitUser);
             // 本地保持最新状态
             DSSGitUtils.pull(repository, request.getProjectName(), gitUser);
-            // 解压BML文件到本地 todo 对接Server时放开调试
+            // 解压BML文件到本地
             Map<String, BmlResource> bmlResourceMap = request.getBmlResourceMap();
             List<String> fileList = new ArrayList<>();
             for (Map.Entry<String, BmlResource> entry : bmlResourceMap.entrySet()) {
@@ -94,14 +95,15 @@ public GitCommitResponse commit(GitCommitRequest request) {
             repository = getRepository(repoDir, request.getProjectName(), gitUser);
             // 本地保持最新状态
             DSSGitUtils.pull(repository, request.getProjectName(), gitUser);
-            // 解压BML文件到本地 todo 对接Server时放开调试
+            // 解压BML文件到本地
             Map<String, BmlResource> bmlResourceMap = request.getBmlResourceMap();
             for (Map.Entry<String, BmlResource> entry : bmlResourceMap.entrySet()) {
                 FileUtils.removeFlowNode(entry.getKey(), request.getProjectName());
                 FileUtils.update(bmlService, entry.getKey(), entry.getValue(), request.getUsername());
             }
             // 提交
-            DSSGitUtils.push(repository, request.getProjectName(), gitUser, request.getComment());
+            String comment = request.getComment() + DSSGitConstant.GIT_USERNAME_FLAG + request.getUsername();
+            DSSGitUtils.push(repository, request.getProjectName(), gitUser, comment);
 
             commitResponse = DSSGitUtils.getCurrentCommit(repository);
 
diff --git a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/DefaultWorkFlowManager.java b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/DefaultWorkFlowManager.java
index 22e176523..d3594684b 100644
--- a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/DefaultWorkFlowManager.java
+++ b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/DefaultWorkFlowManager.java
@@ -195,7 +195,7 @@ public ResponseUnlockWorkflow unlockWorkflow(String userName, Long flowId, Boole
         } else if (!Boolean.TRUE.equals(confirmDelete)) {
             return new ResponseUnlockWorkflow(ResponseUnlockWorkflow.NEED_SECOND_CONFIRM, editLock.getUsername());
         }
-        DSSFlowEditLockManager.deleteLock(editLock.getLockContent());
+        DSSFlowEditLockManager.deleteLock(editLock.getLockContent(), userName);
         return new ResponseUnlockWorkflow(ResponseUnlockWorkflow.UNLOCK_SUCCESS, null);
     }
     @Override
diff --git a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/lock/DSSFlowEditLockManager.java b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/lock/DSSFlowEditLockManager.java
index f20c4e6d2..779fc4dbe 100644
--- a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/lock/DSSFlowEditLockManager.java
+++ b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/lock/DSSFlowEditLockManager.java
@@ -184,7 +184,7 @@ private static String generateLock(Long flowID, String username, String owner) t
         }
     }
 
-    public static void deleteLock(String flowEditLock) throws DSSErrorException {
+    public static void deleteLock(String flowEditLock, String username) throws DSSErrorException {
         try {
             if (StringUtils.isNotBlank(flowEditLock)) {
                 DSSFlowEditLock dssFlowEditLock = lockMapper.getFlowEditLockByLockContent(flowEditLock);
@@ -196,7 +196,7 @@ public static void deleteLock(String flowEditLock) throws DSSErrorException {
                     if (projectInfo.getAssociateGit()) {
                         String status = lockMapper.selectOrchestratorStatus(dssFlowEditLock.getFlowID());
                         if (!StringUtils.isEmpty(status) && OrchestratorRefConstant.FLOW_STATUS_SAVE.equals(status)) {
-                            pushProject(projectInfo.getName(), new Long(projectInfo.getWorkspaceId()), dssFlow.getResourceId(), dssFlow.getBmlVersion(), dssFlow.getName(), projectInfo.getUsername(), "force unlock");
+                            pushProject(projectInfo.getName(), new Long(projectInfo.getWorkspaceId()), dssFlow.getResourceId(), dssFlow.getBmlVersion(), dssFlow.getName(), username, "force unlock");
                             lockMapper.updateOrchestratorStatus(dssFlow.getId(), OrchestratorRefConstant.FLOW_STATUS_PUSH);
                         }
                     }
diff --git a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/restful/FlowRestfulApi.java b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/restful/FlowRestfulApi.java
index 818565567..6f7a8369c 100644
--- a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/restful/FlowRestfulApi.java
+++ b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/restful/FlowRestfulApi.java
@@ -367,7 +367,8 @@ public Message getExtraToolBars( @RequestBody GetExtraToolBarsRequest getExtraTo
 
     @RequestMapping(value = "/deleteFlowEditLock/{flowEditLock}", method = RequestMethod.POST)
     public Message deleteFlowEditLock(HttpServletRequest req, @PathVariable("flowEditLock") String flowEditLock) throws DSSErrorException {
-        DSSFlowEditLockManager.deleteLock(flowEditLock);
+        String userName = SecurityFilter.getLoginUsername(httpServletRequest);
+        DSSFlowEditLockManager.deleteLock(flowEditLock, userName);
         return Message.ok();
     }
 

From 7f2b6c1a71bb3e05ab70c0c91168d21567477191 Mon Sep 17 00:00:00 2001
From: qweqnotallow <747839893@qq.com>
Date: Thu, 9 May 2024 09:46:14 +0800
Subject: [PATCH 106/302] remove submitflow threadPool

---
 .../DSSFrameworkOrchestratorRestful.java      |   7 +-
 .../service/OrchestratorFrameworkService.java |   3 -
 .../service/OrchestratorPluginService.java    |   7 ++
 .../OrchestratorFrameworkServiceImpl.java     |  98 -----------------
 .../impl/OrchestratorPluginServiceImpl.java   | 100 ++++++++++++++++++
 5 files changed, 112 insertions(+), 103 deletions(-)

diff --git a/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/restful/DSSFrameworkOrchestratorRestful.java b/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/restful/DSSFrameworkOrchestratorRestful.java
index 1c3fb7c04..ffaab8d2b 100644
--- a/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/restful/DSSFrameworkOrchestratorRestful.java
+++ b/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/restful/DSSFrameworkOrchestratorRestful.java
@@ -38,6 +38,7 @@
 import com.webank.wedatasphere.dss.orchestrator.server.entity.vo.OrchestratorCopyHistory;
 import com.webank.wedatasphere.dss.orchestrator.server.entity.vo.OrchestratorUnlockVo;
 import com.webank.wedatasphere.dss.orchestrator.server.service.OrchestratorFrameworkService;
+import com.webank.wedatasphere.dss.orchestrator.server.service.OrchestratorPluginService;
 import com.webank.wedatasphere.dss.orchestrator.server.service.OrchestratorService;
 import com.webank.wedatasphere.dss.sender.service.DSSSenderServiceFactory;
 import com.webank.wedatasphere.dss.standard.app.sso.Workspace;
@@ -72,6 +73,8 @@ public class DSSFrameworkOrchestratorRestful {
     @Autowired
     private OrchestratorService orchestratorService;
     @Autowired
+    private OrchestratorPluginService orchestratorPluginService;
+    @Autowired
     private HttpServletRequest httpServletRequest;
 
     @PostConstruct
@@ -299,7 +302,7 @@ public Message diff(@RequestBody OrchestratorSubmitRequest submitFlowRequest) {
         if (responseLockWorkflow.getUnlockStatus() == ResponseLockWorkflow.LOCK_FAILED) {
             return Message.error("当前工作流被用户" + responseLockWorkflow.getLockOwner() + "已锁定编辑，您编辑的内容不能再被保存。如有疑问，请与" + responseLockWorkflow.getLockOwner() + "确认");
         }
-        GitTree gitTree = orchestratorFrameworkService.diffFlow(submitFlowRequest, userName, workspace);
+        GitTree gitTree = orchestratorPluginService.diffFlow(submitFlowRequest, userName, workspace);
         return Message.ok().data("tree", gitTree.getChildren());
     }
 
@@ -318,7 +321,7 @@ public Message submitFlow(@RequestBody OrchestratorSubmitRequest submitFlowReque
             return Message.error("当前工作流被用户" + responseLockWorkflow.getLockOwner() + "已锁定编辑，您编辑的内容不能再被保存。如有疑问，请与" + responseLockWorkflow.getLockOwner() + "确认");
         }
 
-        orchestratorFrameworkService.submitFlow(submitFlowRequest, userName, workspace);
+        orchestratorPluginService.submitFlow(submitFlowRequest, userName, workspace);
         return Message.ok();
     }
 
diff --git a/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/OrchestratorFrameworkService.java b/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/OrchestratorFrameworkService.java
index 3fa855141..6491fea48 100644
--- a/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/OrchestratorFrameworkService.java
+++ b/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/OrchestratorFrameworkService.java
@@ -48,9 +48,6 @@ public interface OrchestratorFrameworkService {
 
     DSSOrchestratorCopyInfo getOrchestratorCopyInfoById(String copyInfoId);
 
-    GitTree diffFlow(OrchestratorSubmitRequest flowRequest, String username, Workspace workspace);
-
-    void submitFlow(OrchestratorSubmitRequest flowRequest, String username, Workspace workspace);
 
     String getOrchestratorStatus(Long orchestratorId);
 
diff --git a/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/OrchestratorPluginService.java b/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/OrchestratorPluginService.java
index e15ae5050..b6079c7ce 100644
--- a/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/OrchestratorPluginService.java
+++ b/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/OrchestratorPluginService.java
@@ -16,8 +16,11 @@
 
 package com.webank.wedatasphere.dss.orchestrator.server.service;
 
+import com.webank.wedatasphere.dss.git.common.protocol.GitTree;
 import com.webank.wedatasphere.dss.orchestrator.common.protocol.RequestFrameworkConvertOrchestration;
 import com.webank.wedatasphere.dss.orchestrator.common.protocol.ResponseConvertOrchestrator;
+import com.webank.wedatasphere.dss.orchestrator.server.entity.request.OrchestratorSubmitRequest;
+import com.webank.wedatasphere.dss.standard.app.sso.Workspace;
 
 
 public interface OrchestratorPluginService {
@@ -29,4 +32,8 @@ public interface OrchestratorPluginService {
 
     ResponseConvertOrchestrator getConvertOrchestrationStatus(String id);
 
+    GitTree diffFlow(OrchestratorSubmitRequest flowRequest, String username, Workspace workspace);
+
+    void submitFlow(OrchestratorSubmitRequest flowRequest, String username, Workspace workspace);
+
 }
diff --git a/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/impl/OrchestratorFrameworkServiceImpl.java b/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/impl/OrchestratorFrameworkServiceImpl.java
index cef18c574..b04936d9b 100644
--- a/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/impl/OrchestratorFrameworkServiceImpl.java
+++ b/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/impl/OrchestratorFrameworkServiceImpl.java
@@ -127,14 +127,6 @@ public class OrchestratorFrameworkServiceImpl implements OrchestratorFrameworkSe
 
     private final ExecutorService orchestratorCopyThreadPool = new ThreadPoolExecutor(0, 200, 60L, TimeUnit.SECONDS,
             new LinkedBlockingQueue<>(1024), orchestratorCopyThreadFactory, new ThreadPoolExecutor.AbortPolicy());
-
-    private final ThreadFactory pushOrchestratorThreadFactory = new ThreadFactoryBuilder()
-            .setNameFormat("orchestrator-push-git-thread-%d")
-            .setDaemon(false)
-            .build();
-
-    private final ExecutorService pushOrchestratorThreadPool = new ThreadPoolExecutor(0, 20, 120L, TimeUnit.SECONDS,
-            new LinkedBlockingQueue<>(1024), pushOrchestratorThreadFactory, new ThreadPoolExecutor.AbortPolicy());
     /**
      * 1.拿到的dss orchestrator的appconn
      * 2.然后创建
@@ -441,96 +433,6 @@ private static boolean hasProjectEditPriv(Long projectId, String username) {
         return hasEditPriv || projectUserAuthResponse.getProjectOwner().equals(username);
     }
 
-    @Override
-    public GitTree diffFlow(OrchestratorSubmitRequest flowRequest, String username, Workspace workspace) {
-        DSSOrchestratorInfo orchestrator = orchestratorMapper.getOrchestrator(flowRequest.getOrchestratorId());
-        BmlResource bmlResource = uploadWorkflowToGit(flowRequest, username, workspace, orchestrator);
-
-        // todo 3. diff（第一步补充后，使用去掉第三方节点的zip包上传到bml，替换下方的BML）
-        GitDiffResponse diff = diff(orchestrator.getName(), bmlResource, username, workspace.getWorkspaceId(), flowRequest.getProjectName());
-        if (diff == null) {
-            LOGGER.info("change is empty");
-            return null;
-        }
-
-        //4. 返回文件列表
-        return diff.getTree();
-    }
-
-    private GitDiffResponse diff(String path, BmlResource bmlResource, String username, Long workspaceId, String projectName) {
-        Sender gitSender = DSSSenderServiceFactory.getOrCreateServiceInstance().getGitSender();
-        Map<String, BmlResource> file = new HashMap<>();
-        file.put(path, bmlResource);
-        GitDiffRequest request1 = new GitDiffRequest(workspaceId, projectName, file, username);
-        LOGGER.info("-------=======================begin to diff {}=======================-------", request1.getProjectName());
-        GitDiffResponse responseWorkflowValidNode = RpcAskUtils.processAskException(gitSender.ask(request1), GitDiffResponse.class, GitDiffRequest.class);
-        LOGGER.info("-------=======================End to diff testGit1=======================-------: {}", responseWorkflowValidNode);
-        return responseWorkflowValidNode;
-    }
-
-
-    private BmlResource uploadWorkflowToGit(OrchestratorSubmitRequest flowRequest, String username, Workspace workspace, DSSOrchestratorInfo orchestrator) {
-        // todo 1. 去除第三方节点实体的zip包——resource/工作流名/appconn-resource文件夹，并上传到bml
-
-        // 2. 将序列化好的工作流文件包提交给git服务，并拿到diff文件列表结果,
-        long flowId = flowRequest.getFlowId();
-
-        Long projectId = orchestrator.getProjectId();
-        String projectName = flowRequest.getProjectName();
-        List<DSSLabel> dssLabelList = new ArrayList<>();
-        dssLabelList.add(new EnvDSSLabel(flowRequest.getLabels().getRoute()));
-        RequestExportWorkflow requestExportWorkflow = new RequestExportWorkflow(username,
-                flowId,
-                projectId,
-                projectName,
-                DSSCommonUtils.COMMON_GSON.toJson(workspace),
-                dssLabelList);
-        Sender sender = DSSSenderServiceFactory.getOrCreateServiceInstance().getWorkflowSender(dssLabelList);
-        ResponseExportWorkflow responseExportWorkflow = RpcAskUtils.processAskException(sender.ask(requestExportWorkflow),
-                ResponseExportWorkflow.class, RequestExportWorkflow.class);
-        Map<String, Object> resourceMap = new HashMap<>(2);
-        BmlResource bmlResource = new BmlResource(responseExportWorkflow.resourceId(), responseExportWorkflow.version());
-
-        return bmlResource;
-    }
-
-    @Override
-    public void submitFlow(OrchestratorSubmitRequest flowRequest, String username, Workspace workspace) {
-        pushOrchestratorThreadPool.submit(() ->{
-            //1. 异步提交，开始提交状态 save->pushing->push
-            orchestratorMapper.updateOrchestratorStatus(flowRequest.getOrchestratorId(), OrchestratorRefConstant.FLOW_STATUS_PUSHING);
-            //2. 获取编排信息
-            DSSOrchestratorInfo orchestrator = orchestratorMapper.getOrchestrator(flowRequest.getOrchestratorId());
-            //3. 获取上传工作流信息
-            BmlResource bmlResource = uploadWorkflowToGit(flowRequest, username, workspace, orchestrator);
-            // todo 3. diff（第一步补充后，使用去掉第三方节点的zip包上传到bml，替换下方的BML）
-            //4. 调用git服务上传
-            try {
-                GitCommitResponse commit = push(orchestrator.getName(), bmlResource, username, workspace.getWorkspaceId(), flowRequest.getProjectName(), flowRequest.getComment());
-                if (commit == null) {
-                    LOGGER.info("change is empty");
-                    orchestratorMapper.updateOrchestratorStatus(flowRequest.getOrchestratorId(), OrchestratorRefConstant.FLOW_STATUS_PUSH_FAILED);
-                }
-                //5. 返回文件列表
-                orchestratorMapper.updateOrchestratorStatus(flowRequest.getOrchestratorId(), OrchestratorRefConstant.FLOW_STATUS_PUSH);
-            } catch (Exception e) {
-                LOGGER.error("push failed, the reason is : ", e);
-                orchestratorMapper.updateOrchestratorStatus(flowRequest.getOrchestratorId(), OrchestratorRefConstant.FLOW_STATUS_PUSH_FAILED);
-            }
-        });
-    }
-
-    private GitCommitResponse push (String path, BmlResource bmlResource, String username, Long workspaceId, String projectName, String comment) {
-        LOGGER.info("-------=======================begin to add testGit1=======================-------");
-        Sender gitSender = DSSSenderServiceFactory.getOrCreateServiceInstance().getGitSender();
-        Map<String, BmlResource> file = new HashMap<>();
-        file.put(path, bmlResource);
-        GitCommitRequest request1 = new GitCommitRequest(workspaceId, projectName, file, comment, username);
-        GitCommitResponse responseWorkflowValidNode = RpcAskUtils.processAskException(gitSender.ask(request1), GitCommitResponse.class, GitCommitRequest.class);
-        LOGGER.info("-------=======================End to add testGit1=======================-------: {}", responseWorkflowValidNode);
-        return responseWorkflowValidNode;
-    }
-
     @Override
     public String getOrchestratorStatus(Long orchestratorId) {
         return orchestratorMapper.selectOrchestratorStatus(orchestratorId);
diff --git a/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/impl/OrchestratorPluginServiceImpl.java b/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/impl/OrchestratorPluginServiceImpl.java
index 999b70bdd..3f89d3a3b 100644
--- a/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/impl/OrchestratorPluginServiceImpl.java
+++ b/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/impl/OrchestratorPluginServiceImpl.java
@@ -16,15 +16,24 @@
 
 package com.webank.wedatasphere.dss.orchestrator.server.service.impl;
 
+import com.webank.wedatasphere.dss.common.entity.BmlResource;
 import com.webank.wedatasphere.dss.common.entity.project.DSSProject;
 import com.webank.wedatasphere.dss.common.exception.DSSErrorException;
 import com.webank.wedatasphere.dss.common.label.DSSLabel;
 import com.webank.wedatasphere.dss.common.label.DSSLabelUtil;
+import com.webank.wedatasphere.dss.common.label.EnvDSSLabel;
 import com.webank.wedatasphere.dss.common.protocol.JobStatus;
+import com.webank.wedatasphere.dss.common.protocol.RequestExportWorkflow;
+import com.webank.wedatasphere.dss.common.protocol.ResponseExportWorkflow;
 import com.webank.wedatasphere.dss.common.protocol.project.ProjectInfoRequest;
 import com.webank.wedatasphere.dss.common.utils.DSSCommonUtils;
 import com.webank.wedatasphere.dss.common.utils.DSSExceptionUtils;
 import com.webank.wedatasphere.dss.common.utils.RpcAskUtils;
+import com.webank.wedatasphere.dss.git.common.protocol.GitTree;
+import com.webank.wedatasphere.dss.git.common.protocol.request.GitCommitRequest;
+import com.webank.wedatasphere.dss.git.common.protocol.request.GitDiffRequest;
+import com.webank.wedatasphere.dss.git.common.protocol.response.GitCommitResponse;
+import com.webank.wedatasphere.dss.git.common.protocol.response.GitDiffResponse;
 import com.webank.wedatasphere.dss.orchestrator.common.entity.DSSOrchestratorInfo;
 import com.webank.wedatasphere.dss.orchestrator.common.entity.DSSOrchestratorRefOrchestration;
 import com.webank.wedatasphere.dss.orchestrator.common.entity.DSSOrchestratorVersion;
@@ -32,6 +41,7 @@
 import com.webank.wedatasphere.dss.orchestrator.common.protocol.RequestFrameworkConvertOrchestration;
 import com.webank.wedatasphere.dss.orchestrator.common.protocol.ResponseConvertOrchestrator;
 import com.webank.wedatasphere.dss.orchestrator.common.protocol.ResponseOperateOrchestrator;
+import com.webank.wedatasphere.dss.orchestrator.common.ref.OrchestratorRefConstant;
 import com.webank.wedatasphere.dss.orchestrator.core.DSSOrchestratorContext;
 import com.webank.wedatasphere.dss.orchestrator.core.plugin.DSSOrchestratorPlugin;
 import com.webank.wedatasphere.dss.orchestrator.db.dao.OrchestratorJobMapper;
@@ -43,6 +53,7 @@
 import com.webank.wedatasphere.dss.orchestrator.publish.job.CommonUpdateConvertJobStatus;
 import com.webank.wedatasphere.dss.orchestrator.publish.job.ConversionJobEntity;
 import com.webank.wedatasphere.dss.orchestrator.publish.job.OrchestratorConversionJob;
+import com.webank.wedatasphere.dss.orchestrator.server.entity.request.OrchestratorSubmitRequest;
 import com.webank.wedatasphere.dss.orchestrator.server.service.OrchestratorPluginService;
 import com.webank.wedatasphere.dss.sender.service.DSSSenderServiceFactory;
 import com.webank.wedatasphere.dss.standard.app.sso.Workspace;
@@ -203,6 +214,95 @@ public ResponseConvertOrchestrator convertOrchestration(RequestFrameworkConvertO
         return new ResponseConvertOrchestrator(job.getId(), entity.getResponse());
     }
 
+    @Override
+    public void submitFlow(OrchestratorSubmitRequest flowRequest, String username, Workspace workspace) {
+        releaseThreadPool.submit(() ->{
+            //1. 异步提交，开始提交状态 save->pushing->push
+            orchestratorMapper.updateOrchestratorStatus(flowRequest.getOrchestratorId(), OrchestratorRefConstant.FLOW_STATUS_PUSHING);
+            //2. 获取编排信息
+            DSSOrchestratorInfo orchestrator = orchestratorMapper.getOrchestrator(flowRequest.getOrchestratorId());
+            //3. 获取上传工作流信息
+            BmlResource bmlResource = uploadWorkflowToGit(flowRequest, username, workspace, orchestrator);
+            // todo 3. diff（第一步补充后，使用去掉第三方节点的zip包上传到bml，替换下方的BML）
+            //4. 调用git服务上传
+            try {
+                GitCommitResponse commit = push(orchestrator.getName(), bmlResource, username, workspace.getWorkspaceId(), flowRequest.getProjectName(), flowRequest.getComment());
+                if (commit == null) {
+                    LOGGER.info("change is empty");
+                    orchestratorMapper.updateOrchestratorStatus(flowRequest.getOrchestratorId(), OrchestratorRefConstant.FLOW_STATUS_PUSH_FAILED);
+                }
+                //5. 返回文件列表
+                orchestratorMapper.updateOrchestratorStatus(flowRequest.getOrchestratorId(), OrchestratorRefConstant.FLOW_STATUS_PUSH);
+            } catch (Exception e) {
+                LOGGER.error("push failed, the reason is : ", e);
+                orchestratorMapper.updateOrchestratorStatus(flowRequest.getOrchestratorId(), OrchestratorRefConstant.FLOW_STATUS_PUSH_FAILED);
+            }
+        });
+    }
+
+    private GitCommitResponse push (String path, BmlResource bmlResource, String username, Long workspaceId, String projectName, String comment) {
+        LOGGER.info("-------=======================begin to add testGit1=======================-------");
+        Sender gitSender = DSSSenderServiceFactory.getOrCreateServiceInstance().getGitSender();
+        Map<String, BmlResource> file = new HashMap<>();
+        file.put(path, bmlResource);
+        GitCommitRequest request1 = new GitCommitRequest(workspaceId, projectName, file, comment, username);
+        GitCommitResponse responseWorkflowValidNode = RpcAskUtils.processAskException(gitSender.ask(request1), GitCommitResponse.class, GitCommitRequest.class);
+        LOGGER.info("-------=======================End to add testGit1=======================-------: {}", responseWorkflowValidNode);
+        return responseWorkflowValidNode;
+    }
+
+    private BmlResource uploadWorkflowToGit(OrchestratorSubmitRequest flowRequest, String username, Workspace workspace, DSSOrchestratorInfo orchestrator) {
+        // todo 1. 去除第三方节点实体的zip包——resource/工作流名/appconn-resource文件夹，并上传到bml
+
+        // 2. 将序列化好的工作流文件包提交给git服务，并拿到diff文件列表结果,
+        long flowId = flowRequest.getFlowId();
+
+        Long projectId = orchestrator.getProjectId();
+        String projectName = flowRequest.getProjectName();
+        List<DSSLabel> dssLabelList = new ArrayList<>();
+        dssLabelList.add(new EnvDSSLabel(flowRequest.getLabels().getRoute()));
+        RequestExportWorkflow requestExportWorkflow = new RequestExportWorkflow(username,
+                flowId,
+                projectId,
+                projectName,
+                DSSCommonUtils.COMMON_GSON.toJson(workspace),
+                dssLabelList);
+        Sender sender = DSSSenderServiceFactory.getOrCreateServiceInstance().getWorkflowSender(dssLabelList);
+        ResponseExportWorkflow responseExportWorkflow = RpcAskUtils.processAskException(sender.ask(requestExportWorkflow),
+                ResponseExportWorkflow.class, RequestExportWorkflow.class);
+        Map<String, Object> resourceMap = new HashMap<>(2);
+        BmlResource bmlResource = new BmlResource(responseExportWorkflow.resourceId(), responseExportWorkflow.version());
+
+        return bmlResource;
+    }
+
+    @Override
+    public GitTree diffFlow(OrchestratorSubmitRequest flowRequest, String username, Workspace workspace) {
+        DSSOrchestratorInfo orchestrator = orchestratorMapper.getOrchestrator(flowRequest.getOrchestratorId());
+        BmlResource bmlResource = uploadWorkflowToGit(flowRequest, username, workspace, orchestrator);
+
+        // todo 3. diff（第一步补充后，使用去掉第三方节点的zip包上传到bml，替换下方的BML）
+        GitDiffResponse diff = diff(orchestrator.getName(), bmlResource, username, workspace.getWorkspaceId(), flowRequest.getProjectName());
+        if (diff == null) {
+            LOGGER.info("change is empty");
+            return null;
+        }
+
+        //4. 返回文件列表
+        return diff.getTree();
+    }
+
+    private GitDiffResponse diff(String path, BmlResource bmlResource, String username, Long workspaceId, String projectName) {
+        Sender gitSender = DSSSenderServiceFactory.getOrCreateServiceInstance().getGitSender();
+        Map<String, BmlResource> file = new HashMap<>();
+        file.put(path, bmlResource);
+        GitDiffRequest request1 = new GitDiffRequest(workspaceId, projectName, file, username);
+        LOGGER.info("-------=======================begin to diff {}=======================-------", request1.getProjectName());
+        GitDiffResponse responseWorkflowValidNode = RpcAskUtils.processAskException(gitSender.ask(request1), GitDiffResponse.class, GitDiffRequest.class);
+        LOGGER.info("-------=======================End to diff testGit1=======================-------: {}", responseWorkflowValidNode);
+        return responseWorkflowValidNode;
+    }
+
     /**
      * 发布整个项目中所有未发布过的工作流。
      * 使用在先导入，后发布两步走的场景中

From eb10ae796bb9ffceb72a2de3eb4156dfdcb3cd58 Mon Sep 17 00:00:00 2001
From: xlinliu <arionliu@webank.com>
Date: Thu, 9 May 2024 15:00:52 +0800
Subject: [PATCH 107/302] optimize schedule executor

---
 conf/dss-framework-orchestrator-server.properties          | 1 -
 .../dss/apiservice/core/token/TokenStatusCheckerTask.java  | 2 +-
 .../dss/orchestrator/server/conf/OrchestratorConf.java     | 2 +-
 .../orchestrator/server/conf/OrchestratorSpringConf.java   | 7 ++++---
 .../entrance/execution/DefaultFlowExecution.scala          | 5 +++--
 5 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/conf/dss-framework-orchestrator-server.properties b/conf/dss-framework-orchestrator-server.properties
index b70b14792..d6d0a1c4d 100644
--- a/conf/dss-framework-orchestrator-server.properties
+++ b/conf/dss-framework-orchestrator-server.properties
@@ -32,7 +32,6 @@ wds.linkis.server.mybatis.typeAliasesPackage=com.webank.wedatasphere.dss.server.
 
 wds.linkis.server.mybatis.BasePackage=com.webank.wedatasphere.dss.framework.appconn.dao,com.webank.wedatasphere.dss.orchestrator.core.dao,com.webank.wedatasphere.dss.server.dao,com.webank.wedatasphere.dss.application.dao,com.webank.wedatasphere.dss.workspace.mapper,com.webank.wedatasphere.dss.workspace.common.dao,com.webank.wedatasphere.dss.workspace.common.dao,com.webank.wedatasphere.dss.orchestrator.db.dao,com.webank.wedatasphere.dss.workflow.dao,com.webank.wedatasphere.dss.framework.appconn.dao,com.webank.wedatasphere.dss.flow.execution.entrance.dao
 
-wds.dss.server.scheduling.clear.cs.cron=0 0 3 * * ?
 
 wds.dss.publish.max.remain.version=3
 
diff --git a/dss-apps/dss-apiservice-server/src/main/java/com/webank/wedatasphere/dss/apiservice/core/token/TokenStatusCheckerTask.java b/dss-apps/dss-apiservice-server/src/main/java/com/webank/wedatasphere/dss/apiservice/core/token/TokenStatusCheckerTask.java
index 95203fc07..6a9896ffb 100644
--- a/dss-apps/dss-apiservice-server/src/main/java/com/webank/wedatasphere/dss/apiservice/core/token/TokenStatusCheckerTask.java
+++ b/dss-apps/dss-apiservice-server/src/main/java/com/webank/wedatasphere/dss/apiservice/core/token/TokenStatusCheckerTask.java
@@ -38,7 +38,7 @@ public class TokenStatusCheckerTask {
     @Autowired
     ApiServiceTokenManagerDao atmd;
 
-    @Scheduled(cron = "0 0/5 * * * ?")
+    @Scheduled(cron = "0 0/10 * * * ?")
     public void doTokenStatusCheckTask() {
         // 查询启用状态的token
         List<TokenManagerVo> tokenManagerVos = atmd.queryTokenByStatus(1);
diff --git a/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/conf/OrchestratorConf.java b/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/conf/OrchestratorConf.java
index 4ab4f9867..a8b51fa8b 100644
--- a/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/conf/OrchestratorConf.java
+++ b/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/conf/OrchestratorConf.java
@@ -23,6 +23,6 @@ public class OrchestratorConf {
     public static final CommonVars<String> DSS_UPLOAD_PATH = CommonVars.apply("wds.dss.file.upload.dir", "/appcom/tmp/uploads");
     public static final CommonVars<Integer> DSS_PUBLISH_MAX_VERSION = CommonVars.apply("wds.dss.publish.max.remain.version", 30);
     public static final CommonVars<String> DSS_CS_CLEAR_ENV = CommonVars.apply("wds.dss.server.cs.clear.env", "DEV");
-    public static final  CommonVars<String> DSS_CS_CLEAR_CRON = CommonVars.apply("wds.dss.server.scheduling.clear.cs.cron", "");
+    public static final  CommonVars<String> DSS_CS_CLEAR_CRON = CommonVars.apply("wds.dss.server.scheduling.clear.cs.cron", "0 0 0/6 * * ?");
 
 }
diff --git a/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/conf/OrchestratorSpringConf.java b/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/conf/OrchestratorSpringConf.java
index 40fe3495a..ca259265f 100644
--- a/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/conf/OrchestratorSpringConf.java
+++ b/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/conf/OrchestratorSpringConf.java
@@ -16,6 +16,7 @@
 
 package com.webank.wedatasphere.dss.orchestrator.server.conf;
 
+import com.google.common.util.concurrent.ThreadFactoryBuilder;
 import com.webank.wedatasphere.dss.common.service.BMLService;
 import com.webank.wedatasphere.dss.contextservice.service.ContextService;
 import com.webank.wedatasphere.dss.contextservice.service.impl.ContextServiceImpl;
@@ -42,9 +43,9 @@ public BMLService createBmlService() {
     }
 
     @Bean
-    public ScheduledThreadPoolExecutor scheduledExecutorService() {
-        ScheduledThreadPoolExecutor executor = new ScheduledThreadPoolExecutor(3);
-        return executor;
+    public ScheduledThreadPoolExecutor dssDefaultScheduledExecutor() {
+        return new ScheduledThreadPoolExecutor(30,
+                new ThreadFactoryBuilder().setNameFormat("Dss-Default-Spring-Scheduler-Thread-%d").build());
     }
 
     @Bean
diff --git a/dss-orchestrator/orchestrators/dss-workflow/dss-flow-execution-server/src/main/scala/com/webank/wedatasphere/dss/flow/execution/entrance/execution/DefaultFlowExecution.scala b/dss-orchestrator/orchestrators/dss-workflow/dss-flow-execution-server/src/main/scala/com/webank/wedatasphere/dss/flow/execution/entrance/execution/DefaultFlowExecution.scala
index be502890b..22962a037 100644
--- a/dss-orchestrator/orchestrators/dss-workflow/dss-flow-execution-server/src/main/scala/com/webank/wedatasphere/dss/flow/execution/entrance/execution/DefaultFlowExecution.scala
+++ b/dss-orchestrator/orchestrators/dss-workflow/dss-flow-execution-server/src/main/scala/com/webank/wedatasphere/dss/flow/execution/entrance/execution/DefaultFlowExecution.scala
@@ -17,12 +17,12 @@
 package com.webank.wedatasphere.dss.flow.execution.entrance.execution
 
 import java.util.concurrent.{Executors, LinkedBlockingQueue, TimeUnit}
-
 import com.webank.wedatasphere.dss.flow.execution.entrance.conf.FlowExecutionEntranceConfiguration
 import com.webank.wedatasphere.dss.flow.execution.entrance.job.FlowEntranceJob
 import com.webank.wedatasphere.dss.flow.execution.entrance.node.{NodeExecutionState, NodeRunner}
 import com.webank.wedatasphere.dss.flow.execution.entrance.utils.FlowExecutionUtils
 import org.apache.linkis.common.utils.Logging
+import com.google.common.util.concurrent.ThreadFactoryBuilder
 import org.springframework.stereotype.Service
 
 import scala.collection.JavaConversions._
@@ -35,7 +35,8 @@ class DefaultFlowExecution extends FlowExecution with Logging {
 
   private val nodeRunnerQueue: LinkedBlockingQueue[NodeRunner] = new LinkedBlockingQueue[NodeRunner]()
 
-  private val scheduledThreadPool = Executors.newScheduledThreadPool(FlowExecutionEntranceConfiguration.FLOW_EXECUTION_SCHEDULER_POOL_SIZE.getValue)
+  private val scheduledThreadPool = Executors.newScheduledThreadPool(FlowExecutionEntranceConfiguration.FLOW_EXECUTION_SCHEDULER_POOL_SIZE.getValue,
+    new ThreadFactoryBuilder().setNameFormat("Dss-Node-Execute-Status-Poll-Thread-%d").build)
 
   private var pollerCount = 0
 

From c565ed3b462928caa1f143ca3b2b37d569e84461 Mon Sep 17 00:00:00 2001
From: qweqnotallow <747839893@qq.com>
Date: Thu, 9 May 2024 15:37:33 +0800
Subject: [PATCH 108/302] pom -> 1.5.0

---
 assembly/dss-package/pom.xml                                  | 2 +-
 assembly/pom.xml                                              | 2 +-
 dss-appconn/appconns/dss-datachecker-appconn/pom.xml          | 4 ++--
 dss-appconn/appconns/dss-dolphinscheduler-appconn/pom.xml     | 2 +-
 dss-appconn/appconns/dss-eventchecker-appconn/pom.xml         | 2 +-
 dss-appconn/appconns/dss-schedulis-appconn/pom.xml            | 2 +-
 dss-appconn/appconns/dss-scriptis-appconn/pom.xml             | 2 +-
 dss-appconn/appconns/dss-sendemail-appconn/pom.xml            | 2 +-
 .../dss-sendemail-appconn/sendemail-appconn-core/pom.xml      | 2 +-
 dss-appconn/appconns/dss-sso-appconn/pom.xml                  | 2 +-
 dss-appconn/appconns/dss-workflow-appconn/pom.xml             | 2 +-
 dss-appconn/dss-appconn-core/pom.xml                          | 2 +-
 dss-appconn/dss-appconn-loader/pom.xml                        | 2 +-
 .../dss-appconn-manager/dss-appconn-manager-client/pom.xml    | 2 +-
 .../dss-appconn-manager/dss-appconn-manager-core/pom.xml      | 2 +-
 dss-appconn/dss-appconn-manager/pom.xml                       | 2 +-
 dss-appconn/dss-scheduler-appconn/pom.xml                     | 2 +-
 dss-appconn/linkis-appconn-engineplugin/pom.xml               | 2 +-
 dss-appconn/pom.xml                                           | 2 +-
 dss-apps/dss-apiservice-server/pom.xml                        | 2 +-
 dss-apps/dss-apps-server/pom.xml                              | 2 +-
 dss-apps/dss-data-api/dss-api-sql-template/pom.xml            | 2 +-
 dss-apps/dss-data-api/dss-data-api-server/pom.xml             | 2 +-
 dss-apps/dss-data-api/pom.xml                                 | 2 +-
 dss-apps/dss-data-governance/dss-data-asset-server/pom.xml    | 2 +-
 .../dss-data-classification-server/pom.xml                    | 2 +-
 .../dss-data-governance/dss-data-governance-common/pom.xml    | 2 +-
 .../dss-data-governance/dss-data-governance-server/pom.xml    | 2 +-
 dss-apps/dss-data-governance/pom.xml                          | 2 +-
 dss-apps/dss-scriptis-server/pom.xml                          | 2 +-
 dss-apps/dss-user-guide/dss-user-guide-server/pom.xml         | 2 +-
 dss-apps/dss-user-guide/pom.xml                               | 2 +-
 dss-apps/pom.xml                                              | 2 +-
 dss-commons/dss-common/pom.xml                                | 2 +-
 dss-commons/dss-contextservice/pom.xml                        | 2 +-
 dss-commons/dss-sender-service/pom.xml                        | 2 +-
 dss-commons/pom.xml                                           | 2 +-
 dss-framework/dss-appconn-framework/pom.xml                   | 2 +-
 dss-framework/dss-framework-admin-service/pom.xml             | 2 +-
 dss-framework/dss-framework-common/pom.xml                    | 2 +-
 dss-framework/dss-framework-orchestrator-server/pom.xml       | 2 +-
 dss-framework/dss-framework-project-server/pom.xml            | 2 +-
 dss-framework/dss-framework-proxy-user-service/pom.xml        | 2 +-
 dss-framework/dss-framework-workspace-server/pom.xml          | 2 +-
 .../framework-plugins/dss-framework-migrate-server/pom.xml    | 2 +-
 .../dss-framework-orchestrator-publish/pom.xml                | 2 +-
 dss-framework/pom.xml                                         | 2 +-
 dss-git/dss-git-common/pom.xml                                | 2 +-
 dss-git/dss-git-server/pom.xml                                | 4 ++--
 dss-git/pom.xml                                               | 2 +-
 dss-orchestrator/dss-orchestrator-common/pom.xml              | 2 +-
 dss-orchestrator/dss-orchestrator-conversion-standard/pom.xml | 2 +-
 dss-orchestrator/dss-orchestrator-core/pom.xml                | 2 +-
 dss-orchestrator/dss-orchestrator-db/pom.xml                  | 2 +-
 dss-orchestrator/dss-orchestrator-loader/pom.xml              | 2 +-
 .../dss-workflow/dss-flow-execution-server/pom.xml            | 2 +-
 .../dss-workflow/dss-linkis-node-execution/pom.xml            | 2 +-
 .../orchestrators/dss-workflow/dss-workflow-common/pom.xml    | 2 +-
 .../dss-workflow/dss-workflow-conversion-standard/pom.xml     | 2 +-
 .../orchestrators/dss-workflow/dss-workflow-sdk/pom.xml       | 2 +-
 .../orchestrators/dss-workflow/dss-workflow-server/pom.xml    | 2 +-
 dss-orchestrator/orchestrators/dss-workflow/pom.xml           | 2 +-
 dss-orchestrator/pom.xml                                      | 2 +-
 dss-server/pom.xml                                            | 2 +-
 .../development-process-standard-execution/pom.xml            | 2 +-
 .../development-standard/development-process-standard/pom.xml | 2 +-
 dss-standard/dss-standard-common/pom.xml                      | 2 +-
 dss-standard/pom.xml                                          | 2 +-
 .../sso-standard/origin-sso-integration-standard/pom.xml      | 2 +-
 .../sso-standard/spring-origin-sso-integration-plugin/pom.xml | 2 +-
 dss-standard/sso-standard/sso-integration-standard/pom.xml    | 2 +-
 dss-standard/structure-standard/dss-project-plugin/pom.xml    | 2 +-
 dss-standard/structure-standard/dss-role-plugin/pom.xml       | 2 +-
 .../dss-structure-integration-standard/pom.xml                | 2 +-
 .../spring-origin-dss-project-plugin/pom.xml                  | 2 +-
 plugins/azkaban/linkis-jobtype/pom.xml                        | 2 +-
 .../dolphinscheduler/dolphinscheduler-prod-metrics/pom.xml    | 2 +-
 plugins/dolphinscheduler/dss-dolphinscheduler-client/pom.xml  | 2 +-
 plugins/dolphinscheduler/dss-dolphinscheduler-token/pom.xml   | 2 +-
 plugins/dolphinscheduler/pom.xml                              | 2 +-
 plugins/linkis/dss-gateway-support/pom.xml                    | 2 +-
 pom.xml                                                       | 4 ++--
 82 files changed, 85 insertions(+), 85 deletions(-)

diff --git a/assembly/dss-package/pom.xml b/assembly/dss-package/pom.xml
index 16aa70bfd..7607ea840 100644
--- a/assembly/dss-package/pom.xml
+++ b/assembly/dss-package/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.4.0-SNAPSHOT</version>
+        <version>1.5.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/assembly/pom.xml b/assembly/pom.xml
index c873e4653..5de3c2e08 100644
--- a/assembly/pom.xml
+++ b/assembly/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.4.0-SNAPSHOT</version>
+        <version>1.5.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <packaging>pom</packaging>
diff --git a/dss-appconn/appconns/dss-datachecker-appconn/pom.xml b/dss-appconn/appconns/dss-datachecker-appconn/pom.xml
index 5095c93b5..94ac53ec0 100644
--- a/dss-appconn/appconns/dss-datachecker-appconn/pom.xml
+++ b/dss-appconn/appconns/dss-datachecker-appconn/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.4.0-SNAPSHOT</version>
+        <version>1.5.0-SNAPSHOT</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
@@ -54,7 +54,7 @@
         <dependency>
             <groupId>com.webank.wedatasphere.dss</groupId>
             <artifactId>dss-origin-sso-integration-standard</artifactId>
-            <version>1.4.0-SNAPSHOT</version>
+            <version>1.5.0-SNAPSHOT</version>
             <exclusions>
                 <exclusion>
                     <groupId>org.apache.linkis</groupId>
diff --git a/dss-appconn/appconns/dss-dolphinscheduler-appconn/pom.xml b/dss-appconn/appconns/dss-dolphinscheduler-appconn/pom.xml
index 9bce9a681..e56b91b69 100644
--- a/dss-appconn/appconns/dss-dolphinscheduler-appconn/pom.xml
+++ b/dss-appconn/appconns/dss-dolphinscheduler-appconn/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.4.0-SNAPSHOT</version>
+        <version>1.5.0-SNAPSHOT</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-appconn/appconns/dss-eventchecker-appconn/pom.xml b/dss-appconn/appconns/dss-eventchecker-appconn/pom.xml
index 850894386..6d375adc2 100644
--- a/dss-appconn/appconns/dss-eventchecker-appconn/pom.xml
+++ b/dss-appconn/appconns/dss-eventchecker-appconn/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.4.0-SNAPSHOT</version>
+        <version>1.5.0-SNAPSHOT</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-appconn/appconns/dss-schedulis-appconn/pom.xml b/dss-appconn/appconns/dss-schedulis-appconn/pom.xml
index f6f5e83c0..5d2acc145 100644
--- a/dss-appconn/appconns/dss-schedulis-appconn/pom.xml
+++ b/dss-appconn/appconns/dss-schedulis-appconn/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.4.0-SNAPSHOT</version>
+        <version>1.5.0-SNAPSHOT</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-appconn/appconns/dss-scriptis-appconn/pom.xml b/dss-appconn/appconns/dss-scriptis-appconn/pom.xml
index f3eb99bdd..2454f4a74 100644
--- a/dss-appconn/appconns/dss-scriptis-appconn/pom.xml
+++ b/dss-appconn/appconns/dss-scriptis-appconn/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.4.0-SNAPSHOT</version>
+        <version>1.5.0-SNAPSHOT</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-appconn/appconns/dss-sendemail-appconn/pom.xml b/dss-appconn/appconns/dss-sendemail-appconn/pom.xml
index e12271f9a..adc773dac 100644
--- a/dss-appconn/appconns/dss-sendemail-appconn/pom.xml
+++ b/dss-appconn/appconns/dss-sendemail-appconn/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.4.0-SNAPSHOT</version>
+        <version>1.5.0-SNAPSHOT</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-appconn/appconns/dss-sendemail-appconn/sendemail-appconn-core/pom.xml b/dss-appconn/appconns/dss-sendemail-appconn/sendemail-appconn-core/pom.xml
index 4fcdeb10d..fb80a8bb5 100644
--- a/dss-appconn/appconns/dss-sendemail-appconn/sendemail-appconn-core/pom.xml
+++ b/dss-appconn/appconns/dss-sendemail-appconn/sendemail-appconn-core/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.4.0-SNAPSHOT</version>
+        <version>1.5.0-SNAPSHOT</version>
         <relativePath>../../../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-appconn/appconns/dss-sso-appconn/pom.xml b/dss-appconn/appconns/dss-sso-appconn/pom.xml
index 61dcaed54..44f684239 100644
--- a/dss-appconn/appconns/dss-sso-appconn/pom.xml
+++ b/dss-appconn/appconns/dss-sso-appconn/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.4.0-SNAPSHOT</version>
+        <version>1.5.0-SNAPSHOT</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-appconn/appconns/dss-workflow-appconn/pom.xml b/dss-appconn/appconns/dss-workflow-appconn/pom.xml
index c8beb5b4b..555e07756 100644
--- a/dss-appconn/appconns/dss-workflow-appconn/pom.xml
+++ b/dss-appconn/appconns/dss-workflow-appconn/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.4.0-SNAPSHOT</version>
+        <version>1.5.0-SNAPSHOT</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-appconn/dss-appconn-core/pom.xml b/dss-appconn/dss-appconn-core/pom.xml
index 9288453e0..bcb89d155 100644
--- a/dss-appconn/dss-appconn-core/pom.xml
+++ b/dss-appconn/dss-appconn-core/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.4.0-SNAPSHOT</version>
+        <version>1.5.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-appconn/dss-appconn-loader/pom.xml b/dss-appconn/dss-appconn-loader/pom.xml
index 5f2c96a50..73bd4b8a3 100644
--- a/dss-appconn/dss-appconn-loader/pom.xml
+++ b/dss-appconn/dss-appconn-loader/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.4.0-SNAPSHOT</version>
+        <version>1.5.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-appconn/dss-appconn-manager/dss-appconn-manager-client/pom.xml b/dss-appconn/dss-appconn-manager/dss-appconn-manager-client/pom.xml
index abc89db91..ae12dadfa 100644
--- a/dss-appconn/dss-appconn-manager/dss-appconn-manager-client/pom.xml
+++ b/dss-appconn/dss-appconn-manager/dss-appconn-manager-client/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <artifactId>dss</artifactId>
     <groupId>com.webank.wedatasphere.dss</groupId>
-    <version>1.4.0-SNAPSHOT</version>
+    <version>1.5.0-SNAPSHOT</version>
     <relativePath>../../../pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
diff --git a/dss-appconn/dss-appconn-manager/dss-appconn-manager-core/pom.xml b/dss-appconn/dss-appconn-manager/dss-appconn-manager-core/pom.xml
index a3c9a77d9..23535c78d 100644
--- a/dss-appconn/dss-appconn-manager/dss-appconn-manager-core/pom.xml
+++ b/dss-appconn/dss-appconn-manager/dss-appconn-manager-core/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <artifactId>dss</artifactId>
     <groupId>com.webank.wedatasphere.dss</groupId>
-    <version>1.4.0-SNAPSHOT</version>
+    <version>1.5.0-SNAPSHOT</version>
     <relativePath>../../../pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
diff --git a/dss-appconn/dss-appconn-manager/pom.xml b/dss-appconn/dss-appconn-manager/pom.xml
index c0446b73c..8133bff0f 100644
--- a/dss-appconn/dss-appconn-manager/pom.xml
+++ b/dss-appconn/dss-appconn-manager/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <artifactId>dss</artifactId>
     <groupId>com.webank.wedatasphere.dss</groupId>
-    <version>1.4.0-SNAPSHOT</version>
+    <version>1.5.0-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
diff --git a/dss-appconn/dss-scheduler-appconn/pom.xml b/dss-appconn/dss-scheduler-appconn/pom.xml
index 8af05cd20..5d718b49b 100644
--- a/dss-appconn/dss-scheduler-appconn/pom.xml
+++ b/dss-appconn/dss-scheduler-appconn/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.4.0-SNAPSHOT</version>
+        <version>1.5.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-appconn/linkis-appconn-engineplugin/pom.xml b/dss-appconn/linkis-appconn-engineplugin/pom.xml
index f92ec4939..4dfe6f4b1 100644
--- a/dss-appconn/linkis-appconn-engineplugin/pom.xml
+++ b/dss-appconn/linkis-appconn-engineplugin/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.4.0-SNAPSHOT</version>
+        <version>1.5.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-appconn/pom.xml b/dss-appconn/pom.xml
index f4ef30de2..3c1c0bf08 100644
--- a/dss-appconn/pom.xml
+++ b/dss-appconn/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.4.0-SNAPSHOT</version>
+        <version>1.5.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-apps/dss-apiservice-server/pom.xml b/dss-apps/dss-apiservice-server/pom.xml
index 067de7f2c..e31b06c35 100644
--- a/dss-apps/dss-apiservice-server/pom.xml
+++ b/dss-apps/dss-apiservice-server/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.4.0-SNAPSHOT</version>
+        <version>1.5.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-apps/dss-apps-server/pom.xml b/dss-apps/dss-apps-server/pom.xml
index 0e90117d8..16b69981f 100644
--- a/dss-apps/dss-apps-server/pom.xml
+++ b/dss-apps/dss-apps-server/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.4.0-SNAPSHOT</version>
+        <version>1.5.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-apps/dss-data-api/dss-api-sql-template/pom.xml b/dss-apps/dss-data-api/dss-api-sql-template/pom.xml
index f7caf18a4..9197eddcb 100644
--- a/dss-apps/dss-data-api/dss-api-sql-template/pom.xml
+++ b/dss-apps/dss-data-api/dss-api-sql-template/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.4.0-SNAPSHOT</version>
+        <version>1.5.0-SNAPSHOT</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-apps/dss-data-api/dss-data-api-server/pom.xml b/dss-apps/dss-data-api/dss-data-api-server/pom.xml
index e4a1ab481..13833499c 100644
--- a/dss-apps/dss-data-api/dss-data-api-server/pom.xml
+++ b/dss-apps/dss-data-api/dss-data-api-server/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.4.0-SNAPSHOT</version>
+        <version>1.5.0-SNAPSHOT</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-apps/dss-data-api/pom.xml b/dss-apps/dss-data-api/pom.xml
index 6418d5529..cfd07aa2b 100644
--- a/dss-apps/dss-data-api/pom.xml
+++ b/dss-apps/dss-data-api/pom.xml
@@ -6,7 +6,7 @@
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
         <relativePath>../../pom.xml</relativePath>
-        <version>1.4.0-SNAPSHOT</version>
+        <version>1.5.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>dss-data-api</artifactId>
diff --git a/dss-apps/dss-data-governance/dss-data-asset-server/pom.xml b/dss-apps/dss-data-governance/dss-data-asset-server/pom.xml
index 4547f4025..d4949fbcb 100644
--- a/dss-apps/dss-data-governance/dss-data-asset-server/pom.xml
+++ b/dss-apps/dss-data-governance/dss-data-asset-server/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.4.0-SNAPSHOT</version>
+        <version>1.5.0-SNAPSHOT</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-apps/dss-data-governance/dss-data-classification-server/pom.xml b/dss-apps/dss-data-governance/dss-data-classification-server/pom.xml
index 60190c7b5..9d9897e27 100644
--- a/dss-apps/dss-data-governance/dss-data-classification-server/pom.xml
+++ b/dss-apps/dss-data-governance/dss-data-classification-server/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.4.0-SNAPSHOT</version>
+        <version>1.5.0-SNAPSHOT</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-apps/dss-data-governance/dss-data-governance-common/pom.xml b/dss-apps/dss-data-governance/dss-data-governance-common/pom.xml
index 39c5f1684..7e6ce0ae9 100644
--- a/dss-apps/dss-data-governance/dss-data-governance-common/pom.xml
+++ b/dss-apps/dss-data-governance/dss-data-governance-common/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.4.0-SNAPSHOT</version>
+        <version>1.5.0-SNAPSHOT</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-apps/dss-data-governance/dss-data-governance-server/pom.xml b/dss-apps/dss-data-governance/dss-data-governance-server/pom.xml
index 37f939a0f..d5ea31ffb 100644
--- a/dss-apps/dss-data-governance/dss-data-governance-server/pom.xml
+++ b/dss-apps/dss-data-governance/dss-data-governance-server/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.4.0-SNAPSHOT</version>
+        <version>1.5.0-SNAPSHOT</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-apps/dss-data-governance/pom.xml b/dss-apps/dss-data-governance/pom.xml
index 3f58ac305..9faa587d4 100644
--- a/dss-apps/dss-data-governance/pom.xml
+++ b/dss-apps/dss-data-governance/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.4.0-SNAPSHOT</version>
+        <version>1.5.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-apps/dss-scriptis-server/pom.xml b/dss-apps/dss-scriptis-server/pom.xml
index 4c8c89b21..397f06dcc 100644
--- a/dss-apps/dss-scriptis-server/pom.xml
+++ b/dss-apps/dss-scriptis-server/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.4.0-SNAPSHOT</version>
+        <version>1.5.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/dss-apps/dss-user-guide/dss-user-guide-server/pom.xml b/dss-apps/dss-user-guide/dss-user-guide-server/pom.xml
index f3f3f74b2..552594e02 100644
--- a/dss-apps/dss-user-guide/dss-user-guide-server/pom.xml
+++ b/dss-apps/dss-user-guide/dss-user-guide-server/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>dss-user-guide</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.4.0-SNAPSHOT</version>
+        <version>1.5.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-apps/dss-user-guide/pom.xml b/dss-apps/dss-user-guide/pom.xml
index 4acf24981..2fbc510a3 100644
--- a/dss-apps/dss-user-guide/pom.xml
+++ b/dss-apps/dss-user-guide/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.4.0-SNAPSHOT</version>
+        <version>1.5.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-apps/pom.xml b/dss-apps/pom.xml
index c9216e973..35380ec38 100644
--- a/dss-apps/pom.xml
+++ b/dss-apps/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.4.0-SNAPSHOT</version>
+        <version>1.5.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-commons/dss-common/pom.xml b/dss-commons/dss-common/pom.xml
index c11c9b56e..667f9fb61 100644
--- a/dss-commons/dss-common/pom.xml
+++ b/dss-commons/dss-common/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <artifactId>dss-commons</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.4.0-SNAPSHOT</version>
+        <version>1.5.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>dss-common</artifactId>
diff --git a/dss-commons/dss-contextservice/pom.xml b/dss-commons/dss-contextservice/pom.xml
index 3e402fdbb..6c4a3af2c 100644
--- a/dss-commons/dss-contextservice/pom.xml
+++ b/dss-commons/dss-contextservice/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss-commons</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.4.0-SNAPSHOT</version>
+        <version>1.5.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>dss-contextservice</artifactId>
diff --git a/dss-commons/dss-sender-service/pom.xml b/dss-commons/dss-sender-service/pom.xml
index 0a4ad14f1..3c270bb87 100644
--- a/dss-commons/dss-sender-service/pom.xml
+++ b/dss-commons/dss-sender-service/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss-commons</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.4.0-SNAPSHOT</version>
+        <version>1.5.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-commons/pom.xml b/dss-commons/pom.xml
index 836f5021e..0a6b56722 100644
--- a/dss-commons/pom.xml
+++ b/dss-commons/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.4.0-SNAPSHOT</version>
+        <version>1.5.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-framework/dss-appconn-framework/pom.xml b/dss-framework/dss-appconn-framework/pom.xml
index 848664766..de304b515 100644
--- a/dss-framework/dss-appconn-framework/pom.xml
+++ b/dss-framework/dss-appconn-framework/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.4.0-SNAPSHOT</version>
+        <version>1.5.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-framework/dss-framework-admin-service/pom.xml b/dss-framework/dss-framework-admin-service/pom.xml
index 8cb0f1c02..04284ad36 100644
--- a/dss-framework/dss-framework-admin-service/pom.xml
+++ b/dss-framework/dss-framework-admin-service/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.4.0-SNAPSHOT</version>
+        <version>1.5.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/dss-framework/dss-framework-common/pom.xml b/dss-framework/dss-framework-common/pom.xml
index 95da643a7..7a9df017c 100644
--- a/dss-framework/dss-framework-common/pom.xml
+++ b/dss-framework/dss-framework-common/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.4.0-SNAPSHOT</version>
+        <version>1.5.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-framework/dss-framework-orchestrator-server/pom.xml b/dss-framework/dss-framework-orchestrator-server/pom.xml
index 6cd760fae..ac2ce363e 100644
--- a/dss-framework/dss-framework-orchestrator-server/pom.xml
+++ b/dss-framework/dss-framework-orchestrator-server/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.4.0-SNAPSHOT</version>
+        <version>1.5.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-framework/dss-framework-project-server/pom.xml b/dss-framework/dss-framework-project-server/pom.xml
index 59a54d910..480ae364c 100644
--- a/dss-framework/dss-framework-project-server/pom.xml
+++ b/dss-framework/dss-framework-project-server/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.4.0-SNAPSHOT</version>
+        <version>1.5.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-framework/dss-framework-proxy-user-service/pom.xml b/dss-framework/dss-framework-proxy-user-service/pom.xml
index 6f2bc3acf..7fc4341f1 100644
--- a/dss-framework/dss-framework-proxy-user-service/pom.xml
+++ b/dss-framework/dss-framework-proxy-user-service/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>dss-framework</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.4.0-SNAPSHOT</version>
+        <version>1.5.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/dss-framework/dss-framework-workspace-server/pom.xml b/dss-framework/dss-framework-workspace-server/pom.xml
index 84c9fff2f..7dfab0fef 100644
--- a/dss-framework/dss-framework-workspace-server/pom.xml
+++ b/dss-framework/dss-framework-workspace-server/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.4.0-SNAPSHOT</version>
+        <version>1.5.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-framework/framework-plugins/dss-framework-migrate-server/pom.xml b/dss-framework/framework-plugins/dss-framework-migrate-server/pom.xml
index e50467f80..df7e639d0 100644
--- a/dss-framework/framework-plugins/dss-framework-migrate-server/pom.xml
+++ b/dss-framework/framework-plugins/dss-framework-migrate-server/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.4.0-SNAPSHOT</version>
+        <version>1.5.0-SNAPSHOT</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-framework/framework-plugins/dss-framework-orchestrator-publish/pom.xml b/dss-framework/framework-plugins/dss-framework-orchestrator-publish/pom.xml
index 265a1eae3..bc4f96c6d 100644
--- a/dss-framework/framework-plugins/dss-framework-orchestrator-publish/pom.xml
+++ b/dss-framework/framework-plugins/dss-framework-orchestrator-publish/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.4.0-SNAPSHOT</version>
+        <version>1.5.0-SNAPSHOT</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-framework/pom.xml b/dss-framework/pom.xml
index 3bc9f0d5c..e2fd57cb2 100644
--- a/dss-framework/pom.xml
+++ b/dss-framework/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.4.0-SNAPSHOT</version>
+        <version>1.5.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-git/dss-git-common/pom.xml b/dss-git/dss-git-common/pom.xml
index 6031181ce..975209b38 100644
--- a/dss-git/dss-git-common/pom.xml
+++ b/dss-git/dss-git-common/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>dss-git</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.1.0.20-gitflow-SNAPSHOT</version>
+        <version>1.5.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/dss-git/dss-git-server/pom.xml b/dss-git/dss-git-server/pom.xml
index f1795d519..c25460273 100644
--- a/dss-git/dss-git-server/pom.xml
+++ b/dss-git/dss-git-server/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>dss-git</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.1.0.20-gitflow-SNAPSHOT</version>
+        <version>1.5.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -31,7 +31,7 @@
         <dependency>
             <groupId>com.webank.wedatasphere.dss</groupId>
             <artifactId>dss-git-common</artifactId>
-            <version>1.1.0.20-gitflow-SNAPSHOT</version>
+            <version>1.5.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.eclipse.jgit</groupId>
diff --git a/dss-git/pom.xml b/dss-git/pom.xml
index cdb92b9ba..92a744c81 100644
--- a/dss-git/pom.xml
+++ b/dss-git/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.1.0.20-gitflow-SNAPSHOT</version>
+        <version>1.5.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/dss-orchestrator/dss-orchestrator-common/pom.xml b/dss-orchestrator/dss-orchestrator-common/pom.xml
index 80f8c5cc6..167fc88f3 100644
--- a/dss-orchestrator/dss-orchestrator-common/pom.xml
+++ b/dss-orchestrator/dss-orchestrator-common/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.4.0-SNAPSHOT</version>
+        <version>1.5.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-orchestrator/dss-orchestrator-conversion-standard/pom.xml b/dss-orchestrator/dss-orchestrator-conversion-standard/pom.xml
index db2a14fa1..00b9f19ff 100644
--- a/dss-orchestrator/dss-orchestrator-conversion-standard/pom.xml
+++ b/dss-orchestrator/dss-orchestrator-conversion-standard/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <artifactId>dss-orchestrator</artifactId>
     <groupId>com.webank.wedatasphere.dss</groupId>
-    <version>1.4.0-SNAPSHOT</version>
+    <version>1.5.0-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
diff --git a/dss-orchestrator/dss-orchestrator-core/pom.xml b/dss-orchestrator/dss-orchestrator-core/pom.xml
index 82144eee5..53e304cd2 100644
--- a/dss-orchestrator/dss-orchestrator-core/pom.xml
+++ b/dss-orchestrator/dss-orchestrator-core/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.4.0-SNAPSHOT</version>
+        <version>1.5.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-orchestrator/dss-orchestrator-db/pom.xml b/dss-orchestrator/dss-orchestrator-db/pom.xml
index 704058daa..4c1550ccc 100644
--- a/dss-orchestrator/dss-orchestrator-db/pom.xml
+++ b/dss-orchestrator/dss-orchestrator-db/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.4.0-SNAPSHOT</version>
+        <version>1.5.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-orchestrator/dss-orchestrator-loader/pom.xml b/dss-orchestrator/dss-orchestrator-loader/pom.xml
index d22795426..7fdf098e2 100644
--- a/dss-orchestrator/dss-orchestrator-loader/pom.xml
+++ b/dss-orchestrator/dss-orchestrator-loader/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.4.0-SNAPSHOT</version>
+        <version>1.5.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-orchestrator/orchestrators/dss-workflow/dss-flow-execution-server/pom.xml b/dss-orchestrator/orchestrators/dss-workflow/dss-flow-execution-server/pom.xml
index 01852a155..4449cf600 100644
--- a/dss-orchestrator/orchestrators/dss-workflow/dss-flow-execution-server/pom.xml
+++ b/dss-orchestrator/orchestrators/dss-workflow/dss-flow-execution-server/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.4.0-SNAPSHOT</version>
+        <version>1.5.0-SNAPSHOT</version>
         <relativePath>../../../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-orchestrator/orchestrators/dss-workflow/dss-linkis-node-execution/pom.xml b/dss-orchestrator/orchestrators/dss-workflow/dss-linkis-node-execution/pom.xml
index 4a425891e..9f9acfb9e 100644
--- a/dss-orchestrator/orchestrators/dss-workflow/dss-linkis-node-execution/pom.xml
+++ b/dss-orchestrator/orchestrators/dss-workflow/dss-linkis-node-execution/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.4.0-SNAPSHOT</version>
+        <version>1.5.0-SNAPSHOT</version>
         <relativePath>../../../../pom.xml</relativePath>
     </parent>
     
diff --git a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-common/pom.xml b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-common/pom.xml
index 2e125e97d..b4b2f9b91 100644
--- a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-common/pom.xml
+++ b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-common/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.4.0-SNAPSHOT</version>
+        <version>1.5.0-SNAPSHOT</version>
         <relativePath>../../../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-conversion-standard/pom.xml b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-conversion-standard/pom.xml
index c51ed75d6..7c7b7f806 100644
--- a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-conversion-standard/pom.xml
+++ b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-conversion-standard/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <artifactId>dss-workflow</artifactId>
     <groupId>com.webank.wedatasphere.dss</groupId>
-    <version>1.4.0-SNAPSHOT</version>
+    <version>1.5.0-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
diff --git a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-sdk/pom.xml b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-sdk/pom.xml
index 1be26678a..d39926163 100644
--- a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-sdk/pom.xml
+++ b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-sdk/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss-workflow</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.4.0-SNAPSHOT</version>
+        <version>1.5.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/pom.xml b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/pom.xml
index d783f9934..28b4d055d 100644
--- a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/pom.xml
+++ b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.4.0-SNAPSHOT</version>
+        <version>1.5.0-SNAPSHOT</version>
         <relativePath>../../../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-orchestrator/orchestrators/dss-workflow/pom.xml b/dss-orchestrator/orchestrators/dss-workflow/pom.xml
index e6d41cf0f..af1a01d91 100644
--- a/dss-orchestrator/orchestrators/dss-workflow/pom.xml
+++ b/dss-orchestrator/orchestrators/dss-workflow/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.4.0-SNAPSHOT</version>
+        <version>1.5.0-SNAPSHOT</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-orchestrator/pom.xml b/dss-orchestrator/pom.xml
index 1ddb1076c..7ea53314f 100644
--- a/dss-orchestrator/pom.xml
+++ b/dss-orchestrator/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.4.0-SNAPSHOT</version>
+        <version>1.5.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-server/pom.xml b/dss-server/pom.xml
index ebd48cb99..e0ff8c349 100644
--- a/dss-server/pom.xml
+++ b/dss-server/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.4.0-SNAPSHOT</version>
+        <version>1.5.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-standard/development-standard/development-process-standard-execution/pom.xml b/dss-standard/development-standard/development-process-standard-execution/pom.xml
index 1038a86cb..3fc48d637 100644
--- a/dss-standard/development-standard/development-process-standard-execution/pom.xml
+++ b/dss-standard/development-standard/development-process-standard-execution/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <artifactId>dss</artifactId>
     <groupId>com.webank.wedatasphere.dss</groupId>
-    <version>1.4.0-SNAPSHOT</version>
+    <version>1.5.0-SNAPSHOT</version>
     <relativePath>../../../pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
diff --git a/dss-standard/development-standard/development-process-standard/pom.xml b/dss-standard/development-standard/development-process-standard/pom.xml
index f80a3f6c2..f0b2371f3 100644
--- a/dss-standard/development-standard/development-process-standard/pom.xml
+++ b/dss-standard/development-standard/development-process-standard/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <artifactId>dss</artifactId>
     <groupId>com.webank.wedatasphere.dss</groupId>
-    <version>1.4.0-SNAPSHOT</version>
+    <version>1.5.0-SNAPSHOT</version>
     <relativePath>../../../pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
diff --git a/dss-standard/dss-standard-common/pom.xml b/dss-standard/dss-standard-common/pom.xml
index 545f60e87..ce08eda46 100644
--- a/dss-standard/dss-standard-common/pom.xml
+++ b/dss-standard/dss-standard-common/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <artifactId>dss</artifactId>
     <groupId>com.webank.wedatasphere.dss</groupId>
-    <version>1.4.0-SNAPSHOT</version>
+    <version>1.5.0-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
diff --git a/dss-standard/pom.xml b/dss-standard/pom.xml
index a6d5c622c..898819ee8 100644
--- a/dss-standard/pom.xml
+++ b/dss-standard/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <artifactId>dss</artifactId>
     <groupId>com.webank.wedatasphere.dss</groupId>
-    <version>1.4.0-SNAPSHOT</version>
+    <version>1.5.0-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
diff --git a/dss-standard/sso-standard/origin-sso-integration-standard/pom.xml b/dss-standard/sso-standard/origin-sso-integration-standard/pom.xml
index bfa1ff9ae..70ba0ac2e 100644
--- a/dss-standard/sso-standard/origin-sso-integration-standard/pom.xml
+++ b/dss-standard/sso-standard/origin-sso-integration-standard/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <artifactId>dss</artifactId>
     <groupId>com.webank.wedatasphere.dss</groupId>
-    <version>1.4.0-SNAPSHOT</version>
+    <version>1.5.0-SNAPSHOT</version>
     <relativePath>../../../pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
diff --git a/dss-standard/sso-standard/spring-origin-sso-integration-plugin/pom.xml b/dss-standard/sso-standard/spring-origin-sso-integration-plugin/pom.xml
index 3710cbb1f..b13ae4660 100644
--- a/dss-standard/sso-standard/spring-origin-sso-integration-plugin/pom.xml
+++ b/dss-standard/sso-standard/spring-origin-sso-integration-plugin/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <artifactId>dss</artifactId>
     <groupId>com.webank.wedatasphere.dss</groupId>
-    <version>1.4.0-SNAPSHOT</version>
+    <version>1.5.0-SNAPSHOT</version>
     <relativePath>../../../pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
diff --git a/dss-standard/sso-standard/sso-integration-standard/pom.xml b/dss-standard/sso-standard/sso-integration-standard/pom.xml
index e8810b36a..825fed1a6 100644
--- a/dss-standard/sso-standard/sso-integration-standard/pom.xml
+++ b/dss-standard/sso-standard/sso-integration-standard/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <artifactId>dss</artifactId>
     <groupId>com.webank.wedatasphere.dss</groupId>
-    <version>1.4.0-SNAPSHOT</version>
+    <version>1.5.0-SNAPSHOT</version>
     <relativePath>../../../pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
diff --git a/dss-standard/structure-standard/dss-project-plugin/pom.xml b/dss-standard/structure-standard/dss-project-plugin/pom.xml
index ced6b625c..35809ef6f 100644
--- a/dss-standard/structure-standard/dss-project-plugin/pom.xml
+++ b/dss-standard/structure-standard/dss-project-plugin/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <artifactId>dss</artifactId>
     <groupId>com.webank.wedatasphere.dss</groupId>
-    <version>1.4.0-SNAPSHOT</version>
+    <version>1.5.0-SNAPSHOT</version>
     <relativePath>../../../pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
diff --git a/dss-standard/structure-standard/dss-role-plugin/pom.xml b/dss-standard/structure-standard/dss-role-plugin/pom.xml
index d51742eb3..671821628 100644
--- a/dss-standard/structure-standard/dss-role-plugin/pom.xml
+++ b/dss-standard/structure-standard/dss-role-plugin/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <artifactId>dss</artifactId>
     <groupId>com.webank.wedatasphere.dss</groupId>
-    <version>1.4.0-SNAPSHOT</version>
+    <version>1.5.0-SNAPSHOT</version>
     <relativePath>../../../pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
diff --git a/dss-standard/structure-standard/dss-structure-integration-standard/pom.xml b/dss-standard/structure-standard/dss-structure-integration-standard/pom.xml
index 5739644a5..545f490c7 100644
--- a/dss-standard/structure-standard/dss-structure-integration-standard/pom.xml
+++ b/dss-standard/structure-standard/dss-structure-integration-standard/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <artifactId>dss</artifactId>
     <groupId>com.webank.wedatasphere.dss</groupId>
-    <version>1.4.0-SNAPSHOT</version>
+    <version>1.5.0-SNAPSHOT</version>
     <relativePath>../../../pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
diff --git a/dss-standard/structure-standard/spring-origin-dss-project-plugin/pom.xml b/dss-standard/structure-standard/spring-origin-dss-project-plugin/pom.xml
index 445eb6e01..f6259acff 100644
--- a/dss-standard/structure-standard/spring-origin-dss-project-plugin/pom.xml
+++ b/dss-standard/structure-standard/spring-origin-dss-project-plugin/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <artifactId>dss</artifactId>
     <groupId>com.webank.wedatasphere.dss</groupId>
-    <version>1.4.0-SNAPSHOT</version>
+    <version>1.5.0-SNAPSHOT</version>
     <relativePath>../../../pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
diff --git a/plugins/azkaban/linkis-jobtype/pom.xml b/plugins/azkaban/linkis-jobtype/pom.xml
index 911f69123..6600628c1 100644
--- a/plugins/azkaban/linkis-jobtype/pom.xml
+++ b/plugins/azkaban/linkis-jobtype/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.4.0-SNAPSHOT</version>
+        <version>1.5.0-SNAPSHOT</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
     <artifactId>linkis-jobtype</artifactId>
diff --git a/plugins/dolphinscheduler/dolphinscheduler-prod-metrics/pom.xml b/plugins/dolphinscheduler/dolphinscheduler-prod-metrics/pom.xml
index ed7f4242c..222f1dc02 100644
--- a/plugins/dolphinscheduler/dolphinscheduler-prod-metrics/pom.xml
+++ b/plugins/dolphinscheduler/dolphinscheduler-prod-metrics/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <artifactId>dss-plugin-dolphinscheduler</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.4.0-SNAPSHOT</version>
+        <version>1.5.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/plugins/dolphinscheduler/dss-dolphinscheduler-client/pom.xml b/plugins/dolphinscheduler/dss-dolphinscheduler-client/pom.xml
index 111f0cc35..5b61f26e5 100644
--- a/plugins/dolphinscheduler/dss-dolphinscheduler-client/pom.xml
+++ b/plugins/dolphinscheduler/dss-dolphinscheduler-client/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <artifactId>dss-plugin-dolphinscheduler</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.4.0-SNAPSHOT</version>
+        <version>1.5.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/plugins/dolphinscheduler/dss-dolphinscheduler-token/pom.xml b/plugins/dolphinscheduler/dss-dolphinscheduler-token/pom.xml
index 662af2bb8..2d9b5a552 100644
--- a/plugins/dolphinscheduler/dss-dolphinscheduler-token/pom.xml
+++ b/plugins/dolphinscheduler/dss-dolphinscheduler-token/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <artifactId>dss-plugin-dolphinscheduler</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.4.0-SNAPSHOT</version>
+        <version>1.5.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/plugins/dolphinscheduler/pom.xml b/plugins/dolphinscheduler/pom.xml
index 2475423bb..5ba083172 100644
--- a/plugins/dolphinscheduler/pom.xml
+++ b/plugins/dolphinscheduler/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <artifactId>dss</artifactId>
     <groupId>com.webank.wedatasphere.dss</groupId>
-    <version>1.4.0-SNAPSHOT</version>
+    <version>1.5.0-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
diff --git a/plugins/linkis/dss-gateway-support/pom.xml b/plugins/linkis/dss-gateway-support/pom.xml
index 9be8eb18b..1b8e576fb 100644
--- a/plugins/linkis/dss-gateway-support/pom.xml
+++ b/plugins/linkis/dss-gateway-support/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.4.0-SNAPSHOT</version>
+        <version>1.5.0-SNAPSHOT</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/pom.xml b/pom.xml
index 09aa1296c..f7c4f040b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
     <packaging>pom</packaging>
     <groupId>com.webank.wedatasphere.dss</groupId>
     <artifactId>dss</artifactId>
-    <version>1.4.0-SNAPSHOT</version>
+    <version>1.5.0-SNAPSHOT</version>
 
     <modules>
         <module>dss-commons</module>
@@ -41,7 +41,7 @@
     </modules>
 
     <properties>
-        <dss.version>1.4.0-SNAPSHOT</dss.version>
+        <dss.version>1.5.0-SNAPSHOT</dss.version>
         <linkis.version>1.3.0-wds-SNAPSHOT</linkis.version>
         <scala.version>2.11.12</scala.version>
         <jdk.compile.version>1.8</jdk.compile.version>

From a78dc4f3e8559d6bc8387818ed05ae26200b8f7b Mon Sep 17 00:00:00 2001
From: qweqnotallow <747839893@qq.com>
Date: Thu, 9 May 2024 16:31:49 +0800
Subject: [PATCH 109/302] add OrchestratorSubmitJob

---
 .../impl/OrchestratorPluginServiceImpl.java   |  6 +-
 .../common/entity/OrchestratorSubmitJob.java  | 69 +++++++++++++++++++
 .../common/ref/OrchestratorRefConstant.java   |  6 +-
 .../db/dao/OrchestratorMapper.java            |  7 ++
 .../db/dao/impl/orchestratorMapper.xml        | 18 +++++
 5 files changed, 101 insertions(+), 5 deletions(-)
 create mode 100644 dss-orchestrator/dss-orchestrator-common/src/main/java/com/webank/wedatasphere/dss/orchestrator/common/entity/OrchestratorSubmitJob.java

diff --git a/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/impl/OrchestratorPluginServiceImpl.java b/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/impl/OrchestratorPluginServiceImpl.java
index 3f89d3a3b..af20c9c3f 100644
--- a/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/impl/OrchestratorPluginServiceImpl.java
+++ b/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/impl/OrchestratorPluginServiceImpl.java
@@ -218,7 +218,7 @@ public ResponseConvertOrchestrator convertOrchestration(RequestFrameworkConvertO
     public void submitFlow(OrchestratorSubmitRequest flowRequest, String username, Workspace workspace) {
         releaseThreadPool.submit(() ->{
             //1. 异步提交，开始提交状态 save->pushing->push
-            orchestratorMapper.updateOrchestratorStatus(flowRequest.getOrchestratorId(), OrchestratorRefConstant.FLOW_STATUS_PUSHING);
+            orchestratorMapper.updateOrchestratorSubmitJobStatus(flowRequest.getOrchestratorId(), OrchestratorRefConstant.FLOW_STATUS_PUSHING, "");
             //2. 获取编排信息
             DSSOrchestratorInfo orchestrator = orchestratorMapper.getOrchestrator(flowRequest.getOrchestratorId());
             //3. 获取上传工作流信息
@@ -229,13 +229,13 @@ public void submitFlow(OrchestratorSubmitRequest flowRequest, String username, W
                 GitCommitResponse commit = push(orchestrator.getName(), bmlResource, username, workspace.getWorkspaceId(), flowRequest.getProjectName(), flowRequest.getComment());
                 if (commit == null) {
                     LOGGER.info("change is empty");
-                    orchestratorMapper.updateOrchestratorStatus(flowRequest.getOrchestratorId(), OrchestratorRefConstant.FLOW_STATUS_PUSH_FAILED);
                 }
+                orchestratorMapper.updateOrchestratorSubmitJobStatus(flowRequest.getOrchestratorId(), OrchestratorRefConstant.FLOW_STATUS_PUSH_SUCCESS, "");
                 //5. 返回文件列表
                 orchestratorMapper.updateOrchestratorStatus(flowRequest.getOrchestratorId(), OrchestratorRefConstant.FLOW_STATUS_PUSH);
             } catch (Exception e) {
                 LOGGER.error("push failed, the reason is : ", e);
-                orchestratorMapper.updateOrchestratorStatus(flowRequest.getOrchestratorId(), OrchestratorRefConstant.FLOW_STATUS_PUSH_FAILED);
+                orchestratorMapper.updateOrchestratorSubmitJobStatus(flowRequest.getOrchestratorId(), OrchestratorRefConstant.FLOW_STATUS_PUSH_FAILED, e.toString());
             }
         });
     }
diff --git a/dss-orchestrator/dss-orchestrator-common/src/main/java/com/webank/wedatasphere/dss/orchestrator/common/entity/OrchestratorSubmitJob.java b/dss-orchestrator/dss-orchestrator-common/src/main/java/com/webank/wedatasphere/dss/orchestrator/common/entity/OrchestratorSubmitJob.java
new file mode 100644
index 000000000..f6e6b29d6
--- /dev/null
+++ b/dss-orchestrator/dss-orchestrator-common/src/main/java/com/webank/wedatasphere/dss/orchestrator/common/entity/OrchestratorSubmitJob.java
@@ -0,0 +1,69 @@
+package com.webank.wedatasphere.dss.orchestrator.common.entity;
+
+import java.util.Date;
+
+public class OrchestratorSubmitJob {
+    private Long id;
+    private Long orchestratorId;
+    private Date createTime;
+    private Date updateTime;
+    private String instanceName;
+    private String status;
+    private String errorMsg;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public Long getOrchestratorId() {
+        return orchestratorId;
+    }
+
+    public void setOrchestratorId(Long orchestratorId) {
+        this.orchestratorId = orchestratorId;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    public String getInstanceName() {
+        return instanceName;
+    }
+
+    public void setInstanceName(String instanceName) {
+        this.instanceName = instanceName;
+    }
+
+    public String getStatus() {
+        return status;
+    }
+
+    public void setStatus(String status) {
+        this.status = status;
+    }
+
+    public String getErrorMsg() {
+        return errorMsg;
+    }
+
+    public void setErrorMsg(String errorMsg) {
+        this.errorMsg = errorMsg;
+    }
+}
diff --git a/dss-orchestrator/dss-orchestrator-common/src/main/java/com/webank/wedatasphere/dss/orchestrator/common/ref/OrchestratorRefConstant.java b/dss-orchestrator/dss-orchestrator-common/src/main/java/com/webank/wedatasphere/dss/orchestrator/common/ref/OrchestratorRefConstant.java
index 493d77eff..9cbac4344 100644
--- a/dss-orchestrator/dss-orchestrator-common/src/main/java/com/webank/wedatasphere/dss/orchestrator/common/ref/OrchestratorRefConstant.java
+++ b/dss-orchestrator/dss-orchestrator-common/src/main/java/com/webank/wedatasphere/dss/orchestrator/common/ref/OrchestratorRefConstant.java
@@ -43,9 +43,11 @@ public interface OrchestratorRefConstant {
      */
     public static final String FLOW_STATUS_SAVE = "save";
 
-    public static final String FLOW_STATUS_PUSHING = "pushing";
+    public static final String FLOW_STATUS_PUSHING = "running";
 
-    public static final String FLOW_STATUS_PUSH_FAILED = "push_failed";
+    public static final String FLOW_STATUS_PUSH_FAILED = "failed";
+
+    public static final String FLOW_STATUS_PUSH_SUCCESS = "success";
 
     public static final String FLOW_STATUS_PUSH = "push";
 
diff --git a/dss-orchestrator/dss-orchestrator-db/src/main/java/com/webank/wedatasphere/dss/orchestrator/db/dao/OrchestratorMapper.java b/dss-orchestrator/dss-orchestrator-db/src/main/java/com/webank/wedatasphere/dss/orchestrator/db/dao/OrchestratorMapper.java
index 73a127e91..e65f44204 100644
--- a/dss-orchestrator/dss-orchestrator-db/src/main/java/com/webank/wedatasphere/dss/orchestrator/db/dao/OrchestratorMapper.java
+++ b/dss-orchestrator/dss-orchestrator-db/src/main/java/com/webank/wedatasphere/dss/orchestrator/db/dao/OrchestratorMapper.java
@@ -132,4 +132,11 @@ DSSOrchestratorVersion getOrcVersionByIdAndOrcVersionId(@Param("orchestratorId")
     String selectOrchestratorStatus(@Param("id") Long id);
 
     List<Long> selectOrchestratorByStatus(@Param("status") String status);
+
+    void updateOrchestratorSubmitJobStatus(@Param("orchestratorId") Long orchestratorId, @Param("status") String status, @Param("errMsg") String errMsg);
+
+    void insertOrchestratorSubmitJobStatus(OrchestratorSubmitJob orchestratorSubmitJob);
+
+    OrchestratorSubmitJob selectSubmitJobStatus(@Param("orchestratorId") Long orchestratorId);
+
 }
diff --git a/dss-orchestrator/dss-orchestrator-db/src/main/java/com/webank/wedatasphere/dss/orchestrator/db/dao/impl/orchestratorMapper.xml b/dss-orchestrator/dss-orchestrator-db/src/main/java/com/webank/wedatasphere/dss/orchestrator/db/dao/impl/orchestratorMapper.xml
index 60a9e5c9a..705e8723b 100644
--- a/dss-orchestrator/dss-orchestrator-db/src/main/java/com/webank/wedatasphere/dss/orchestrator/db/dao/impl/orchestratorMapper.xml
+++ b/dss-orchestrator/dss-orchestrator-db/src/main/java/com/webank/wedatasphere/dss/orchestrator/db/dao/impl/orchestratorMapper.xml
@@ -293,5 +293,23 @@
         select id from dss_orchestrator where `status` = #{status}
     </select>
 
+    <insert id="insertOrchestratorSubmitJob" parameterType="com.webank.wedatasphere.dss.orchestrator.common.entity.OrchestratorSubmitJob">
+        insert dss_orchestrator_submit_job_info into (orchestrator_id, create_time, update_time, instance_name, status) Values
+        (#{orchestratorId}, Now(), Now(), #{instanceName}, #{status})
+    </insert>
+
+    <update id="updateOrchestratorSubmitJobStatus">
+        update dss_orchestrator_submit_job_info
+        <set>
+            error_msg = #{errMsg} ,update_time = Now() , status = #{status}
+        </set>
+        where orchestrator_id = #{orchestratorId}
+    </update>
+
+    <select id="selectSubmitJobStatus" resultType="com.webank.wedatasphere.dss.orchestrator.common.entity.OrchestratorSubmitJob">
+        select id, orchestrator_id, create_time, update_time, instance_name, status, error_msg from dss_orchestrator_submit_job_info
+        where orchestrator_id = #{orchestratorId}
+    </select>
+
 
 </mapper>
\ No newline at end of file

From 7dfd5520153b770c78c780a084e6da3be1af4dbf Mon Sep 17 00:00:00 2001
From: qweqnotallow <747839893@qq.com>
Date: Thu, 9 May 2024 17:00:13 +0800
Subject: [PATCH 110/302] fix OrchestratorSubmitJob

---
 .../impl/OrchestratorPluginServiceImpl.java   | 28 +++++++++++--------
 1 file changed, 17 insertions(+), 11 deletions(-)

diff --git a/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/impl/OrchestratorPluginServiceImpl.java b/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/impl/OrchestratorPluginServiceImpl.java
index af20c9c3f..94201d270 100644
--- a/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/impl/OrchestratorPluginServiceImpl.java
+++ b/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/impl/OrchestratorPluginServiceImpl.java
@@ -34,10 +34,7 @@
 import com.webank.wedatasphere.dss.git.common.protocol.request.GitDiffRequest;
 import com.webank.wedatasphere.dss.git.common.protocol.response.GitCommitResponse;
 import com.webank.wedatasphere.dss.git.common.protocol.response.GitDiffResponse;
-import com.webank.wedatasphere.dss.orchestrator.common.entity.DSSOrchestratorInfo;
-import com.webank.wedatasphere.dss.orchestrator.common.entity.DSSOrchestratorRefOrchestration;
-import com.webank.wedatasphere.dss.orchestrator.common.entity.DSSOrchestratorVersion;
-import com.webank.wedatasphere.dss.orchestrator.common.entity.OrchestratorInfo;
+import com.webank.wedatasphere.dss.orchestrator.common.entity.*;
 import com.webank.wedatasphere.dss.orchestrator.common.protocol.RequestFrameworkConvertOrchestration;
 import com.webank.wedatasphere.dss.orchestrator.common.protocol.ResponseConvertOrchestrator;
 import com.webank.wedatasphere.dss.orchestrator.common.protocol.ResponseOperateOrchestrator;
@@ -46,7 +43,6 @@
 import com.webank.wedatasphere.dss.orchestrator.core.plugin.DSSOrchestratorPlugin;
 import com.webank.wedatasphere.dss.orchestrator.db.dao.OrchestratorJobMapper;
 import com.webank.wedatasphere.dss.orchestrator.db.dao.OrchestratorMapper;
-import com.webank.wedatasphere.dss.orchestrator.common.entity.OrchestratorPublishJob;
 import com.webank.wedatasphere.dss.orchestrator.publish.ConversionDSSOrchestratorPlugin;
 import com.webank.wedatasphere.dss.orchestrator.publish.ExportDSSOrchestratorPlugin;
 import com.webank.wedatasphere.dss.orchestrator.publish.conf.DSSOrchestratorConf;
@@ -217,10 +213,20 @@ public ResponseConvertOrchestrator convertOrchestration(RequestFrameworkConvertO
     @Override
     public void submitFlow(OrchestratorSubmitRequest flowRequest, String username, Workspace workspace) {
         releaseThreadPool.submit(() ->{
-            //1. 异步提交，开始提交状态 save->pushing->push
-            orchestratorMapper.updateOrchestratorSubmitJobStatus(flowRequest.getOrchestratorId(), OrchestratorRefConstant.FLOW_STATUS_PUSHING, "");
+            //1. 异步提交，更新提交状态
+            Long orchestratorId = flowRequest.getOrchestratorId();
+            OrchestratorSubmitJob orchestratorSubmitJob = orchestratorMapper.selectSubmitJobStatus(orchestratorId);
+            if (orchestratorSubmitJob == null) {
+                OrchestratorSubmitJob submitJob = new OrchestratorSubmitJob();
+                submitJob.setOrchestratorId(orchestratorId);
+                submitJob.setInstanceName(Sender.getThisInstance());
+                submitJob.setStatus(OrchestratorRefConstant.FLOW_STATUS_PUSHING);
+                orchestratorMapper.insertOrchestratorSubmitJobStatus(submitJob);
+            } else {
+                orchestratorMapper.updateOrchestratorSubmitJobStatus(orchestratorId, OrchestratorRefConstant.FLOW_STATUS_PUSHING, "");
+            }
             //2. 获取编排信息
-            DSSOrchestratorInfo orchestrator = orchestratorMapper.getOrchestrator(flowRequest.getOrchestratorId());
+            DSSOrchestratorInfo orchestrator = orchestratorMapper.getOrchestrator(orchestratorId);
             //3. 获取上传工作流信息
             BmlResource bmlResource = uploadWorkflowToGit(flowRequest, username, workspace, orchestrator);
             // todo 3. diff（第一步补充后，使用去掉第三方节点的zip包上传到bml，替换下方的BML）
@@ -230,12 +236,12 @@ public void submitFlow(OrchestratorSubmitRequest flowRequest, String username, W
                 if (commit == null) {
                     LOGGER.info("change is empty");
                 }
-                orchestratorMapper.updateOrchestratorSubmitJobStatus(flowRequest.getOrchestratorId(), OrchestratorRefConstant.FLOW_STATUS_PUSH_SUCCESS, "");
+                orchestratorMapper.updateOrchestratorSubmitJobStatus(orchestratorId, OrchestratorRefConstant.FLOW_STATUS_PUSH_SUCCESS, "");
                 //5. 返回文件列表
-                orchestratorMapper.updateOrchestratorStatus(flowRequest.getOrchestratorId(), OrchestratorRefConstant.FLOW_STATUS_PUSH);
+                orchestratorMapper.updateOrchestratorStatus(orchestratorId, OrchestratorRefConstant.FLOW_STATUS_PUSH);
             } catch (Exception e) {
                 LOGGER.error("push failed, the reason is : ", e);
-                orchestratorMapper.updateOrchestratorSubmitJobStatus(flowRequest.getOrchestratorId(), OrchestratorRefConstant.FLOW_STATUS_PUSH_FAILED, e.toString());
+                orchestratorMapper.updateOrchestratorSubmitJobStatus(orchestratorId, OrchestratorRefConstant.FLOW_STATUS_PUSH_FAILED, e.toString());
             }
         });
     }

From 3e4f85bcaad9daf57b5cc0e14c5dfd6526e8cc3d Mon Sep 17 00:00:00 2001
From: qweqnotallow <747839893@qq.com>
Date: Thu, 9 May 2024 17:08:45 +0800
Subject: [PATCH 111/302] gitUrl fix

---
 .../server/restful/DSSFrameworkOrchestratorRestful.java   | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/restful/DSSFrameworkOrchestratorRestful.java b/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/restful/DSSFrameworkOrchestratorRestful.java
index 3c6a2788b..8545b23a4 100644
--- a/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/restful/DSSFrameworkOrchestratorRestful.java
+++ b/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/restful/DSSFrameworkOrchestratorRestful.java
@@ -52,6 +52,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.StringUtils;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.PostConstruct;
@@ -364,8 +365,11 @@ public Message gitUrl(@RequestParam(required = true, name = "projectName") Strin
         GitUserInfoResponse writeInfoResponse = RpcAskUtils.processAskException(sender.ask(gitWriteUserRequest), GitUserInfoResponse.class, GitUserInfoRequest.class);
         String namespace = writeInfoResponse.getGitUser().getGitUser();
         // 拼接跳转的url
-        String gitUrl = gitUrlPre + "/" + namespace + "/" + projectName + "/" + workflowName;
-        return Message.ok().data("gitUrl", UrlUtils.normalizeIp(gitUrl));
+        String gitUrlProject = gitUrlPre + "/" + namespace + "/" + projectName;
+        if (!StringUtils.isEmpty(workflowName)) {
+            gitUrlProject +=  "/tree/master/" + workflowName;
+        }
+        return Message.ok().data("gitUrl", UrlUtils.normalizeIp(gitUrlProject));
 
     }
 

From f05426d4a7485276d6196052d141a2baf648fc3a Mon Sep 17 00:00:00 2001
From: qweqnotallow <747839893@qq.com>
Date: Fri, 10 May 2024 15:43:05 +0800
Subject: [PATCH 112/302] submitFlow status fix

---
 .../server/service/impl/OrchestratorFrameworkServiceImpl.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/impl/OrchestratorFrameworkServiceImpl.java b/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/impl/OrchestratorFrameworkServiceImpl.java
index 9c4ac3962..7697f289e 100644
--- a/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/impl/OrchestratorFrameworkServiceImpl.java
+++ b/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/impl/OrchestratorFrameworkServiceImpl.java
@@ -437,7 +437,7 @@ private static boolean hasProjectEditPriv(Long projectId, String username) {
 
     @Override
     public String getOrchestratorStatus(Long orchestratorId) {
-        return orchestratorMapper.selectOrchestratorStatus(orchestratorId);
+        return orchestratorMapper.selectSubmitJobStatus(orchestratorId);
     }
 
     @Override

From fda140bcd40183cb22352df6df7dce7aee7d3cf8 Mon Sep 17 00:00:00 2001
From: qweqnotallow <747839893@qq.com>
Date: Sat, 11 May 2024 09:37:14 +0800
Subject: [PATCH 113/302] 1.3.0->1.3.1

---
 assembly/dss-package/pom.xml                                  | 2 +-
 assembly/pom.xml                                              | 2 +-
 dss-appconn/appconns/dss-datachecker-appconn/pom.xml          | 4 ++--
 dss-appconn/appconns/dss-dolphinscheduler-appconn/pom.xml     | 2 +-
 dss-appconn/appconns/dss-eventchecker-appconn/pom.xml         | 2 +-
 dss-appconn/appconns/dss-schedulis-appconn/pom.xml            | 2 +-
 dss-appconn/appconns/dss-scriptis-appconn/pom.xml             | 2 +-
 dss-appconn/appconns/dss-sendemail-appconn/pom.xml            | 2 +-
 .../dss-sendemail-appconn/sendemail-appconn-core/pom.xml      | 2 +-
 dss-appconn/appconns/dss-sso-appconn/pom.xml                  | 2 +-
 dss-appconn/appconns/dss-workflow-appconn/pom.xml             | 2 +-
 dss-appconn/dss-appconn-core/pom.xml                          | 2 +-
 dss-appconn/dss-appconn-loader/pom.xml                        | 2 +-
 .../dss-appconn-manager/dss-appconn-manager-client/pom.xml    | 2 +-
 .../dss-appconn-manager/dss-appconn-manager-core/pom.xml      | 2 +-
 dss-appconn/dss-appconn-manager/pom.xml                       | 2 +-
 dss-appconn/dss-scheduler-appconn/pom.xml                     | 2 +-
 dss-appconn/linkis-appconn-engineplugin/pom.xml               | 2 +-
 dss-appconn/pom.xml                                           | 2 +-
 dss-apps/dss-apiservice-server/pom.xml                        | 2 +-
 dss-apps/dss-apps-server/pom.xml                              | 2 +-
 dss-apps/dss-data-api/dss-api-sql-template/pom.xml            | 2 +-
 dss-apps/dss-data-api/dss-data-api-server/pom.xml             | 2 +-
 dss-apps/dss-data-api/pom.xml                                 | 2 +-
 dss-apps/dss-data-governance/dss-data-asset-server/pom.xml    | 2 +-
 .../dss-data-classification-server/pom.xml                    | 2 +-
 .../dss-data-governance/dss-data-governance-common/pom.xml    | 2 +-
 .../dss-data-governance/dss-data-governance-server/pom.xml    | 2 +-
 dss-apps/dss-data-governance/pom.xml                          | 2 +-
 dss-apps/dss-scriptis-server/pom.xml                          | 2 +-
 dss-apps/dss-user-guide/dss-user-guide-server/pom.xml         | 2 +-
 dss-apps/dss-user-guide/pom.xml                               | 2 +-
 dss-apps/pom.xml                                              | 2 +-
 dss-commons/dss-common/pom.xml                                | 2 +-
 dss-commons/dss-contextservice/pom.xml                        | 2 +-
 dss-commons/dss-sender-service/pom.xml                        | 2 +-
 dss-commons/pom.xml                                           | 2 +-
 dss-framework/dss-appconn-framework/pom.xml                   | 2 +-
 dss-framework/dss-framework-admin-service/pom.xml             | 2 +-
 dss-framework/dss-framework-common/pom.xml                    | 2 +-
 dss-framework/dss-framework-orchestrator-server/pom.xml       | 2 +-
 dss-framework/dss-framework-project-server/pom.xml            | 2 +-
 dss-framework/dss-framework-proxy-user-service/pom.xml        | 2 +-
 dss-framework/dss-framework-workspace-server/pom.xml          | 2 +-
 .../framework-plugins/dss-framework-migrate-server/pom.xml    | 2 +-
 .../dss-framework-orchestrator-publish/pom.xml                | 2 +-
 dss-framework/pom.xml                                         | 2 +-
 dss-orchestrator/dss-orchestrator-common/pom.xml              | 2 +-
 dss-orchestrator/dss-orchestrator-conversion-standard/pom.xml | 2 +-
 dss-orchestrator/dss-orchestrator-core/pom.xml                | 2 +-
 dss-orchestrator/dss-orchestrator-db/pom.xml                  | 2 +-
 dss-orchestrator/dss-orchestrator-loader/pom.xml              | 2 +-
 .../dss-workflow/dss-flow-execution-server/pom.xml            | 2 +-
 .../dss-workflow/dss-linkis-node-execution/pom.xml            | 2 +-
 .../orchestrators/dss-workflow/dss-workflow-common/pom.xml    | 2 +-
 .../dss-workflow/dss-workflow-conversion-standard/pom.xml     | 2 +-
 .../orchestrators/dss-workflow/dss-workflow-sdk/pom.xml       | 2 +-
 .../orchestrators/dss-workflow/dss-workflow-server/pom.xml    | 2 +-
 dss-orchestrator/orchestrators/dss-workflow/pom.xml           | 2 +-
 dss-orchestrator/pom.xml                                      | 2 +-
 dss-server/pom.xml                                            | 2 +-
 .../development-process-standard-execution/pom.xml            | 2 +-
 .../development-standard/development-process-standard/pom.xml | 2 +-
 dss-standard/dss-standard-common/pom.xml                      | 2 +-
 dss-standard/pom.xml                                          | 2 +-
 .../sso-standard/origin-sso-integration-standard/pom.xml      | 2 +-
 .../sso-standard/spring-origin-sso-integration-plugin/pom.xml | 2 +-
 dss-standard/sso-standard/sso-integration-standard/pom.xml    | 2 +-
 dss-standard/structure-standard/dss-project-plugin/pom.xml    | 2 +-
 dss-standard/structure-standard/dss-role-plugin/pom.xml       | 2 +-
 .../dss-structure-integration-standard/pom.xml                | 2 +-
 .../spring-origin-dss-project-plugin/pom.xml                  | 2 +-
 plugins/azkaban/linkis-jobtype/pom.xml                        | 2 +-
 .../dolphinscheduler/dolphinscheduler-prod-metrics/pom.xml    | 2 +-
 plugins/dolphinscheduler/dss-dolphinscheduler-client/pom.xml  | 2 +-
 plugins/dolphinscheduler/dss-dolphinscheduler-token/pom.xml   | 2 +-
 plugins/dolphinscheduler/pom.xml                              | 2 +-
 plugins/linkis/dss-gateway-support/pom.xml                    | 2 +-
 pom.xml                                                       | 2 +-
 79 files changed, 80 insertions(+), 80 deletions(-)

diff --git a/assembly/dss-package/pom.xml b/assembly/dss-package/pom.xml
index 6674406cd..a6aee13ab 100644
--- a/assembly/dss-package/pom.xml
+++ b/assembly/dss-package/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.3.1</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/assembly/pom.xml b/assembly/pom.xml
index d72a246dd..6406c7f9c 100644
--- a/assembly/pom.xml
+++ b/assembly/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.3.1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <packaging>pom</packaging>
diff --git a/dss-appconn/appconns/dss-datachecker-appconn/pom.xml b/dss-appconn/appconns/dss-datachecker-appconn/pom.xml
index d01eb0de3..646eb4834 100644
--- a/dss-appconn/appconns/dss-datachecker-appconn/pom.xml
+++ b/dss-appconn/appconns/dss-datachecker-appconn/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.3.1</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
@@ -54,7 +54,7 @@
         <dependency>
             <groupId>com.webank.wedatasphere.dss</groupId>
             <artifactId>dss-origin-sso-integration-standard</artifactId>
-            <version>1.3.0-SNAPSHOT</version>
+            <version>1.3.1</version>
             <exclusions>
                 <exclusion>
                     <groupId>org.apache.linkis</groupId>
diff --git a/dss-appconn/appconns/dss-dolphinscheduler-appconn/pom.xml b/dss-appconn/appconns/dss-dolphinscheduler-appconn/pom.xml
index 3965bc416..57618c57d 100644
--- a/dss-appconn/appconns/dss-dolphinscheduler-appconn/pom.xml
+++ b/dss-appconn/appconns/dss-dolphinscheduler-appconn/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.3.1</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-appconn/appconns/dss-eventchecker-appconn/pom.xml b/dss-appconn/appconns/dss-eventchecker-appconn/pom.xml
index 2133f507e..0655804fd 100644
--- a/dss-appconn/appconns/dss-eventchecker-appconn/pom.xml
+++ b/dss-appconn/appconns/dss-eventchecker-appconn/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.3.1</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-appconn/appconns/dss-schedulis-appconn/pom.xml b/dss-appconn/appconns/dss-schedulis-appconn/pom.xml
index 7b0f868e2..36beb2de0 100644
--- a/dss-appconn/appconns/dss-schedulis-appconn/pom.xml
+++ b/dss-appconn/appconns/dss-schedulis-appconn/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.3.1</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-appconn/appconns/dss-scriptis-appconn/pom.xml b/dss-appconn/appconns/dss-scriptis-appconn/pom.xml
index e53aab1f8..bb2441d15 100644
--- a/dss-appconn/appconns/dss-scriptis-appconn/pom.xml
+++ b/dss-appconn/appconns/dss-scriptis-appconn/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.3.1</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-appconn/appconns/dss-sendemail-appconn/pom.xml b/dss-appconn/appconns/dss-sendemail-appconn/pom.xml
index 0ebc2ff87..1b2e6a0f5 100644
--- a/dss-appconn/appconns/dss-sendemail-appconn/pom.xml
+++ b/dss-appconn/appconns/dss-sendemail-appconn/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.3.1</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-appconn/appconns/dss-sendemail-appconn/sendemail-appconn-core/pom.xml b/dss-appconn/appconns/dss-sendemail-appconn/sendemail-appconn-core/pom.xml
index d6a285758..c7838c6e2 100644
--- a/dss-appconn/appconns/dss-sendemail-appconn/sendemail-appconn-core/pom.xml
+++ b/dss-appconn/appconns/dss-sendemail-appconn/sendemail-appconn-core/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.3.1</version>
         <relativePath>../../../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-appconn/appconns/dss-sso-appconn/pom.xml b/dss-appconn/appconns/dss-sso-appconn/pom.xml
index 1134ea21c..b501f6764 100644
--- a/dss-appconn/appconns/dss-sso-appconn/pom.xml
+++ b/dss-appconn/appconns/dss-sso-appconn/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.3.1</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-appconn/appconns/dss-workflow-appconn/pom.xml b/dss-appconn/appconns/dss-workflow-appconn/pom.xml
index 2c677dbbc..fda55ae81 100644
--- a/dss-appconn/appconns/dss-workflow-appconn/pom.xml
+++ b/dss-appconn/appconns/dss-workflow-appconn/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.3.1</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-appconn/dss-appconn-core/pom.xml b/dss-appconn/dss-appconn-core/pom.xml
index bf52e5be3..5e3dbc100 100644
--- a/dss-appconn/dss-appconn-core/pom.xml
+++ b/dss-appconn/dss-appconn-core/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.3.1</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-appconn/dss-appconn-loader/pom.xml b/dss-appconn/dss-appconn-loader/pom.xml
index c175d6356..37cdd3bff 100644
--- a/dss-appconn/dss-appconn-loader/pom.xml
+++ b/dss-appconn/dss-appconn-loader/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.3.1</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-appconn/dss-appconn-manager/dss-appconn-manager-client/pom.xml b/dss-appconn/dss-appconn-manager/dss-appconn-manager-client/pom.xml
index 1d21c6dd1..8767900e1 100644
--- a/dss-appconn/dss-appconn-manager/dss-appconn-manager-client/pom.xml
+++ b/dss-appconn/dss-appconn-manager/dss-appconn-manager-client/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <artifactId>dss</artifactId>
     <groupId>com.webank.wedatasphere.dss</groupId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.3.1</version>
     <relativePath>../../../pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
diff --git a/dss-appconn/dss-appconn-manager/dss-appconn-manager-core/pom.xml b/dss-appconn/dss-appconn-manager/dss-appconn-manager-core/pom.xml
index c3c700044..efb0fec39 100644
--- a/dss-appconn/dss-appconn-manager/dss-appconn-manager-core/pom.xml
+++ b/dss-appconn/dss-appconn-manager/dss-appconn-manager-core/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <artifactId>dss</artifactId>
     <groupId>com.webank.wedatasphere.dss</groupId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.3.1</version>
     <relativePath>../../../pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
diff --git a/dss-appconn/dss-appconn-manager/pom.xml b/dss-appconn/dss-appconn-manager/pom.xml
index 0109b84df..7513df4c1 100644
--- a/dss-appconn/dss-appconn-manager/pom.xml
+++ b/dss-appconn/dss-appconn-manager/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <artifactId>dss</artifactId>
     <groupId>com.webank.wedatasphere.dss</groupId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.3.1</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
diff --git a/dss-appconn/dss-scheduler-appconn/pom.xml b/dss-appconn/dss-scheduler-appconn/pom.xml
index 2b68bdfb1..de171808c 100644
--- a/dss-appconn/dss-scheduler-appconn/pom.xml
+++ b/dss-appconn/dss-scheduler-appconn/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.3.1</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-appconn/linkis-appconn-engineplugin/pom.xml b/dss-appconn/linkis-appconn-engineplugin/pom.xml
index 5dee47a82..5a953803b 100644
--- a/dss-appconn/linkis-appconn-engineplugin/pom.xml
+++ b/dss-appconn/linkis-appconn-engineplugin/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.3.1</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-appconn/pom.xml b/dss-appconn/pom.xml
index 7263fc63b..199287adf 100644
--- a/dss-appconn/pom.xml
+++ b/dss-appconn/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.3.1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-apps/dss-apiservice-server/pom.xml b/dss-apps/dss-apiservice-server/pom.xml
index b677f34f2..3e24bc130 100644
--- a/dss-apps/dss-apiservice-server/pom.xml
+++ b/dss-apps/dss-apiservice-server/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.3.1</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-apps/dss-apps-server/pom.xml b/dss-apps/dss-apps-server/pom.xml
index 2b2f7a7e0..efad715ff 100644
--- a/dss-apps/dss-apps-server/pom.xml
+++ b/dss-apps/dss-apps-server/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.3.1</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-apps/dss-data-api/dss-api-sql-template/pom.xml b/dss-apps/dss-data-api/dss-api-sql-template/pom.xml
index 7e11ed57d..a86591033 100644
--- a/dss-apps/dss-data-api/dss-api-sql-template/pom.xml
+++ b/dss-apps/dss-data-api/dss-api-sql-template/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.3.1</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-apps/dss-data-api/dss-data-api-server/pom.xml b/dss-apps/dss-data-api/dss-data-api-server/pom.xml
index 5e750f390..014757c76 100644
--- a/dss-apps/dss-data-api/dss-data-api-server/pom.xml
+++ b/dss-apps/dss-data-api/dss-data-api-server/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.3.1</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-apps/dss-data-api/pom.xml b/dss-apps/dss-data-api/pom.xml
index 495848168..437577e4d 100644
--- a/dss-apps/dss-data-api/pom.xml
+++ b/dss-apps/dss-data-api/pom.xml
@@ -6,7 +6,7 @@
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
         <relativePath>../../pom.xml</relativePath>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.3.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>dss-data-api</artifactId>
diff --git a/dss-apps/dss-data-governance/dss-data-asset-server/pom.xml b/dss-apps/dss-data-governance/dss-data-asset-server/pom.xml
index 228230a27..f1725b0af 100644
--- a/dss-apps/dss-data-governance/dss-data-asset-server/pom.xml
+++ b/dss-apps/dss-data-governance/dss-data-asset-server/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.3.1</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-apps/dss-data-governance/dss-data-classification-server/pom.xml b/dss-apps/dss-data-governance/dss-data-classification-server/pom.xml
index 81d514854..7cd077816 100644
--- a/dss-apps/dss-data-governance/dss-data-classification-server/pom.xml
+++ b/dss-apps/dss-data-governance/dss-data-classification-server/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.3.1</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-apps/dss-data-governance/dss-data-governance-common/pom.xml b/dss-apps/dss-data-governance/dss-data-governance-common/pom.xml
index 37fc5b070..cc1a8b32e 100644
--- a/dss-apps/dss-data-governance/dss-data-governance-common/pom.xml
+++ b/dss-apps/dss-data-governance/dss-data-governance-common/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.3.1</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-apps/dss-data-governance/dss-data-governance-server/pom.xml b/dss-apps/dss-data-governance/dss-data-governance-server/pom.xml
index 47017b4d4..0a9ba2e8a 100644
--- a/dss-apps/dss-data-governance/dss-data-governance-server/pom.xml
+++ b/dss-apps/dss-data-governance/dss-data-governance-server/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.3.1</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-apps/dss-data-governance/pom.xml b/dss-apps/dss-data-governance/pom.xml
index 518d5c4b5..49474d0c8 100644
--- a/dss-apps/dss-data-governance/pom.xml
+++ b/dss-apps/dss-data-governance/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.3.1</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-apps/dss-scriptis-server/pom.xml b/dss-apps/dss-scriptis-server/pom.xml
index a19355c4e..f8a09f766 100644
--- a/dss-apps/dss-scriptis-server/pom.xml
+++ b/dss-apps/dss-scriptis-server/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.3.1</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/dss-apps/dss-user-guide/dss-user-guide-server/pom.xml b/dss-apps/dss-user-guide/dss-user-guide-server/pom.xml
index 6abe4623b..3aa3e804a 100644
--- a/dss-apps/dss-user-guide/dss-user-guide-server/pom.xml
+++ b/dss-apps/dss-user-guide/dss-user-guide-server/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>dss-user-guide</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.3.1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-apps/dss-user-guide/pom.xml b/dss-apps/dss-user-guide/pom.xml
index b846084dc..751c1a043 100644
--- a/dss-apps/dss-user-guide/pom.xml
+++ b/dss-apps/dss-user-guide/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.3.1</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-apps/pom.xml b/dss-apps/pom.xml
index ba57e2bca..b72f39ccc 100644
--- a/dss-apps/pom.xml
+++ b/dss-apps/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.3.1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-commons/dss-common/pom.xml b/dss-commons/dss-common/pom.xml
index 25c083351..53aa0e0dd 100644
--- a/dss-commons/dss-common/pom.xml
+++ b/dss-commons/dss-common/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <artifactId>dss-commons</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.3.1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>dss-common</artifactId>
diff --git a/dss-commons/dss-contextservice/pom.xml b/dss-commons/dss-contextservice/pom.xml
index 609ca270d..390dff340 100644
--- a/dss-commons/dss-contextservice/pom.xml
+++ b/dss-commons/dss-contextservice/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss-commons</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.3.1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>dss-contextservice</artifactId>
diff --git a/dss-commons/dss-sender-service/pom.xml b/dss-commons/dss-sender-service/pom.xml
index 7da4725fe..69d399445 100644
--- a/dss-commons/dss-sender-service/pom.xml
+++ b/dss-commons/dss-sender-service/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss-commons</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.3.1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-commons/pom.xml b/dss-commons/pom.xml
index a80e4fba5..7d15851b1 100644
--- a/dss-commons/pom.xml
+++ b/dss-commons/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.3.1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-framework/dss-appconn-framework/pom.xml b/dss-framework/dss-appconn-framework/pom.xml
index bfb9babb3..0cedcd358 100644
--- a/dss-framework/dss-appconn-framework/pom.xml
+++ b/dss-framework/dss-appconn-framework/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.3.1</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-framework/dss-framework-admin-service/pom.xml b/dss-framework/dss-framework-admin-service/pom.xml
index a28b224d0..3c8e17d09 100644
--- a/dss-framework/dss-framework-admin-service/pom.xml
+++ b/dss-framework/dss-framework-admin-service/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.3.1</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/dss-framework/dss-framework-common/pom.xml b/dss-framework/dss-framework-common/pom.xml
index 1fa4aed33..c9af8ed3f 100644
--- a/dss-framework/dss-framework-common/pom.xml
+++ b/dss-framework/dss-framework-common/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.3.1</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-framework/dss-framework-orchestrator-server/pom.xml b/dss-framework/dss-framework-orchestrator-server/pom.xml
index cbc2b1fc1..788636b97 100644
--- a/dss-framework/dss-framework-orchestrator-server/pom.xml
+++ b/dss-framework/dss-framework-orchestrator-server/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.3.1</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-framework/dss-framework-project-server/pom.xml b/dss-framework/dss-framework-project-server/pom.xml
index ec328f17c..083a22d9f 100644
--- a/dss-framework/dss-framework-project-server/pom.xml
+++ b/dss-framework/dss-framework-project-server/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.3.1</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-framework/dss-framework-proxy-user-service/pom.xml b/dss-framework/dss-framework-proxy-user-service/pom.xml
index 15b287af3..ece336df4 100644
--- a/dss-framework/dss-framework-proxy-user-service/pom.xml
+++ b/dss-framework/dss-framework-proxy-user-service/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>dss-framework</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.3.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/dss-framework/dss-framework-workspace-server/pom.xml b/dss-framework/dss-framework-workspace-server/pom.xml
index 4fad67608..b3d31d389 100644
--- a/dss-framework/dss-framework-workspace-server/pom.xml
+++ b/dss-framework/dss-framework-workspace-server/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.3.1</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-framework/framework-plugins/dss-framework-migrate-server/pom.xml b/dss-framework/framework-plugins/dss-framework-migrate-server/pom.xml
index 748dd085e..55786bdd5 100644
--- a/dss-framework/framework-plugins/dss-framework-migrate-server/pom.xml
+++ b/dss-framework/framework-plugins/dss-framework-migrate-server/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.3.1</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-framework/framework-plugins/dss-framework-orchestrator-publish/pom.xml b/dss-framework/framework-plugins/dss-framework-orchestrator-publish/pom.xml
index 870d2aeb7..d2c182b6f 100644
--- a/dss-framework/framework-plugins/dss-framework-orchestrator-publish/pom.xml
+++ b/dss-framework/framework-plugins/dss-framework-orchestrator-publish/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.3.1</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-framework/pom.xml b/dss-framework/pom.xml
index ccf70b32c..85db110bb 100644
--- a/dss-framework/pom.xml
+++ b/dss-framework/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.3.1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-orchestrator/dss-orchestrator-common/pom.xml b/dss-orchestrator/dss-orchestrator-common/pom.xml
index 0a1cc58e8..1b9a5831a 100644
--- a/dss-orchestrator/dss-orchestrator-common/pom.xml
+++ b/dss-orchestrator/dss-orchestrator-common/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.3.1</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-orchestrator/dss-orchestrator-conversion-standard/pom.xml b/dss-orchestrator/dss-orchestrator-conversion-standard/pom.xml
index 03b599b76..eff898b40 100644
--- a/dss-orchestrator/dss-orchestrator-conversion-standard/pom.xml
+++ b/dss-orchestrator/dss-orchestrator-conversion-standard/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <artifactId>dss-orchestrator</artifactId>
     <groupId>com.webank.wedatasphere.dss</groupId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.3.1</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
diff --git a/dss-orchestrator/dss-orchestrator-core/pom.xml b/dss-orchestrator/dss-orchestrator-core/pom.xml
index 0800a82b3..24f7d8f03 100644
--- a/dss-orchestrator/dss-orchestrator-core/pom.xml
+++ b/dss-orchestrator/dss-orchestrator-core/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.3.1</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-orchestrator/dss-orchestrator-db/pom.xml b/dss-orchestrator/dss-orchestrator-db/pom.xml
index c08ab2c26..1a4d7af22 100644
--- a/dss-orchestrator/dss-orchestrator-db/pom.xml
+++ b/dss-orchestrator/dss-orchestrator-db/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.3.1</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-orchestrator/dss-orchestrator-loader/pom.xml b/dss-orchestrator/dss-orchestrator-loader/pom.xml
index def0b8abf..cc9971ab1 100644
--- a/dss-orchestrator/dss-orchestrator-loader/pom.xml
+++ b/dss-orchestrator/dss-orchestrator-loader/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.3.1</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-orchestrator/orchestrators/dss-workflow/dss-flow-execution-server/pom.xml b/dss-orchestrator/orchestrators/dss-workflow/dss-flow-execution-server/pom.xml
index 96b081036..372e304d3 100644
--- a/dss-orchestrator/orchestrators/dss-workflow/dss-flow-execution-server/pom.xml
+++ b/dss-orchestrator/orchestrators/dss-workflow/dss-flow-execution-server/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.3.1</version>
         <relativePath>../../../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-orchestrator/orchestrators/dss-workflow/dss-linkis-node-execution/pom.xml b/dss-orchestrator/orchestrators/dss-workflow/dss-linkis-node-execution/pom.xml
index 2ffc52852..74db7a589 100644
--- a/dss-orchestrator/orchestrators/dss-workflow/dss-linkis-node-execution/pom.xml
+++ b/dss-orchestrator/orchestrators/dss-workflow/dss-linkis-node-execution/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.3.1</version>
         <relativePath>../../../../pom.xml</relativePath>
     </parent>
     
diff --git a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-common/pom.xml b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-common/pom.xml
index cd49c91df..896afd38f 100644
--- a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-common/pom.xml
+++ b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-common/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.3.1</version>
         <relativePath>../../../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-conversion-standard/pom.xml b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-conversion-standard/pom.xml
index 8c42962f9..9fb1569b7 100644
--- a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-conversion-standard/pom.xml
+++ b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-conversion-standard/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <artifactId>dss-workflow</artifactId>
     <groupId>com.webank.wedatasphere.dss</groupId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.3.1</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
diff --git a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-sdk/pom.xml b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-sdk/pom.xml
index 0e0cab938..aeb44ff21 100644
--- a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-sdk/pom.xml
+++ b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-sdk/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss-workflow</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.3.1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/pom.xml b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/pom.xml
index e13d9ea48..a523f9a08 100644
--- a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/pom.xml
+++ b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.3.1</version>
         <relativePath>../../../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-orchestrator/orchestrators/dss-workflow/pom.xml b/dss-orchestrator/orchestrators/dss-workflow/pom.xml
index 6c2c41c59..39c6f4f45 100644
--- a/dss-orchestrator/orchestrators/dss-workflow/pom.xml
+++ b/dss-orchestrator/orchestrators/dss-workflow/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.3.1</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-orchestrator/pom.xml b/dss-orchestrator/pom.xml
index d382731d5..8b527ae4d 100644
--- a/dss-orchestrator/pom.xml
+++ b/dss-orchestrator/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.3.1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-server/pom.xml b/dss-server/pom.xml
index fd3087ebd..853e8e434 100644
--- a/dss-server/pom.xml
+++ b/dss-server/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.3.1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-standard/development-standard/development-process-standard-execution/pom.xml b/dss-standard/development-standard/development-process-standard-execution/pom.xml
index bdbdc445c..eaed31c81 100644
--- a/dss-standard/development-standard/development-process-standard-execution/pom.xml
+++ b/dss-standard/development-standard/development-process-standard-execution/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <artifactId>dss</artifactId>
     <groupId>com.webank.wedatasphere.dss</groupId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.3.1</version>
     <relativePath>../../../pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
diff --git a/dss-standard/development-standard/development-process-standard/pom.xml b/dss-standard/development-standard/development-process-standard/pom.xml
index e1d9fc919..1ae425afe 100644
--- a/dss-standard/development-standard/development-process-standard/pom.xml
+++ b/dss-standard/development-standard/development-process-standard/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <artifactId>dss</artifactId>
     <groupId>com.webank.wedatasphere.dss</groupId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.3.1</version>
     <relativePath>../../../pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
diff --git a/dss-standard/dss-standard-common/pom.xml b/dss-standard/dss-standard-common/pom.xml
index d38704d2d..f3e9c9246 100644
--- a/dss-standard/dss-standard-common/pom.xml
+++ b/dss-standard/dss-standard-common/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <artifactId>dss</artifactId>
     <groupId>com.webank.wedatasphere.dss</groupId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.3.1</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
diff --git a/dss-standard/pom.xml b/dss-standard/pom.xml
index 4d9c40b2f..6f1c3a99e 100644
--- a/dss-standard/pom.xml
+++ b/dss-standard/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <artifactId>dss</artifactId>
     <groupId>com.webank.wedatasphere.dss</groupId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.3.1</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
diff --git a/dss-standard/sso-standard/origin-sso-integration-standard/pom.xml b/dss-standard/sso-standard/origin-sso-integration-standard/pom.xml
index b1de51004..8e4001d8c 100644
--- a/dss-standard/sso-standard/origin-sso-integration-standard/pom.xml
+++ b/dss-standard/sso-standard/origin-sso-integration-standard/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <artifactId>dss</artifactId>
     <groupId>com.webank.wedatasphere.dss</groupId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.3.1</version>
     <relativePath>../../../pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
diff --git a/dss-standard/sso-standard/spring-origin-sso-integration-plugin/pom.xml b/dss-standard/sso-standard/spring-origin-sso-integration-plugin/pom.xml
index 59a80b2b0..6f05c66e9 100644
--- a/dss-standard/sso-standard/spring-origin-sso-integration-plugin/pom.xml
+++ b/dss-standard/sso-standard/spring-origin-sso-integration-plugin/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <artifactId>dss</artifactId>
     <groupId>com.webank.wedatasphere.dss</groupId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.3.1</version>
     <relativePath>../../../pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
diff --git a/dss-standard/sso-standard/sso-integration-standard/pom.xml b/dss-standard/sso-standard/sso-integration-standard/pom.xml
index f2d1da996..96b0d1a08 100644
--- a/dss-standard/sso-standard/sso-integration-standard/pom.xml
+++ b/dss-standard/sso-standard/sso-integration-standard/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <artifactId>dss</artifactId>
     <groupId>com.webank.wedatasphere.dss</groupId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.3.1</version>
     <relativePath>../../../pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
diff --git a/dss-standard/structure-standard/dss-project-plugin/pom.xml b/dss-standard/structure-standard/dss-project-plugin/pom.xml
index 70fd9bbaf..87fc4e7b2 100644
--- a/dss-standard/structure-standard/dss-project-plugin/pom.xml
+++ b/dss-standard/structure-standard/dss-project-plugin/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <artifactId>dss</artifactId>
     <groupId>com.webank.wedatasphere.dss</groupId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.3.1</version>
     <relativePath>../../../pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
diff --git a/dss-standard/structure-standard/dss-role-plugin/pom.xml b/dss-standard/structure-standard/dss-role-plugin/pom.xml
index e89f24515..941beaf75 100644
--- a/dss-standard/structure-standard/dss-role-plugin/pom.xml
+++ b/dss-standard/structure-standard/dss-role-plugin/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <artifactId>dss</artifactId>
     <groupId>com.webank.wedatasphere.dss</groupId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.3.1</version>
     <relativePath>../../../pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
diff --git a/dss-standard/structure-standard/dss-structure-integration-standard/pom.xml b/dss-standard/structure-standard/dss-structure-integration-standard/pom.xml
index a77589b06..05ace87d6 100644
--- a/dss-standard/structure-standard/dss-structure-integration-standard/pom.xml
+++ b/dss-standard/structure-standard/dss-structure-integration-standard/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <artifactId>dss</artifactId>
     <groupId>com.webank.wedatasphere.dss</groupId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.3.1</version>
     <relativePath>../../../pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
diff --git a/dss-standard/structure-standard/spring-origin-dss-project-plugin/pom.xml b/dss-standard/structure-standard/spring-origin-dss-project-plugin/pom.xml
index add113d17..bda87e95f 100644
--- a/dss-standard/structure-standard/spring-origin-dss-project-plugin/pom.xml
+++ b/dss-standard/structure-standard/spring-origin-dss-project-plugin/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <artifactId>dss</artifactId>
     <groupId>com.webank.wedatasphere.dss</groupId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.3.1</version>
     <relativePath>../../../pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
diff --git a/plugins/azkaban/linkis-jobtype/pom.xml b/plugins/azkaban/linkis-jobtype/pom.xml
index 4f315b1d5..48c8ea480 100644
--- a/plugins/azkaban/linkis-jobtype/pom.xml
+++ b/plugins/azkaban/linkis-jobtype/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.3.1</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
     <artifactId>linkis-jobtype</artifactId>
diff --git a/plugins/dolphinscheduler/dolphinscheduler-prod-metrics/pom.xml b/plugins/dolphinscheduler/dolphinscheduler-prod-metrics/pom.xml
index 7ba8ad2ba..cead7ad8e 100644
--- a/plugins/dolphinscheduler/dolphinscheduler-prod-metrics/pom.xml
+++ b/plugins/dolphinscheduler/dolphinscheduler-prod-metrics/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <artifactId>dss-plugin-dolphinscheduler</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.3.1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/plugins/dolphinscheduler/dss-dolphinscheduler-client/pom.xml b/plugins/dolphinscheduler/dss-dolphinscheduler-client/pom.xml
index 86efe3cc3..48422d3fd 100644
--- a/plugins/dolphinscheduler/dss-dolphinscheduler-client/pom.xml
+++ b/plugins/dolphinscheduler/dss-dolphinscheduler-client/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <artifactId>dss-plugin-dolphinscheduler</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.3.1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/plugins/dolphinscheduler/dss-dolphinscheduler-token/pom.xml b/plugins/dolphinscheduler/dss-dolphinscheduler-token/pom.xml
index 8d01963a3..10c4145fd 100644
--- a/plugins/dolphinscheduler/dss-dolphinscheduler-token/pom.xml
+++ b/plugins/dolphinscheduler/dss-dolphinscheduler-token/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <artifactId>dss-plugin-dolphinscheduler</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.3.1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/plugins/dolphinscheduler/pom.xml b/plugins/dolphinscheduler/pom.xml
index b9e7d6c4d..cd81b27db 100644
--- a/plugins/dolphinscheduler/pom.xml
+++ b/plugins/dolphinscheduler/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <artifactId>dss</artifactId>
     <groupId>com.webank.wedatasphere.dss</groupId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.3.1</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
diff --git a/plugins/linkis/dss-gateway-support/pom.xml b/plugins/linkis/dss-gateway-support/pom.xml
index a1a55c5e2..60f3e5c73 100644
--- a/plugins/linkis/dss-gateway-support/pom.xml
+++ b/plugins/linkis/dss-gateway-support/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.3.1</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/pom.xml b/pom.xml
index 3df428933..733ee92a1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
     <packaging>pom</packaging>
     <groupId>com.webank.wedatasphere.dss</groupId>
     <artifactId>dss</artifactId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.3.1</version>
 
     <modules>
         <module>dss-commons</module>

From a19d3c6d1a52d3e3559500949ae02a6faeb5a403 Mon Sep 17 00:00:00 2001
From: qweqnotallow <747839893@qq.com>
Date: Sat, 11 May 2024 09:48:44 +0800
Subject: [PATCH 114/302] mlss fix

---
 .../workflow/opertion/WorkflowRefCopyOperation.java       | 6 +++++-
 .../service/impl/OrchestratorFrameworkServiceImpl.java    | 8 +++++++-
 pom.xml                                                   | 2 +-
 3 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/dss-appconn/appconns/dss-workflow-appconn/src/main/java/com/webank/wedatasphere/dss/appconn/workflow/opertion/WorkflowRefCopyOperation.java b/dss-appconn/appconns/dss-workflow-appconn/src/main/java/com/webank/wedatasphere/dss/appconn/workflow/opertion/WorkflowRefCopyOperation.java
index de702dd62..ebb4a1991 100644
--- a/dss-appconn/appconns/dss-workflow-appconn/src/main/java/com/webank/wedatasphere/dss/appconn/workflow/opertion/WorkflowRefCopyOperation.java
+++ b/dss-appconn/appconns/dss-workflow-appconn/src/main/java/com/webank/wedatasphere/dss/appconn/workflow/opertion/WorkflowRefCopyOperation.java
@@ -16,6 +16,7 @@
 
 package com.webank.wedatasphere.dss.appconn.workflow.opertion;
 
+import com.webank.wedatasphere.dss.common.label.DSSLabel;
 import com.webank.wedatasphere.dss.common.utils.RpcAskUtils;
 import com.webank.wedatasphere.dss.orchestrator.common.ref.OrchestratorRefConstant;
 import com.webank.wedatasphere.dss.sender.service.DSSSenderServiceFactory;
@@ -28,6 +29,7 @@
 import org.apache.linkis.rpc.Sender;
 
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 import java.util.Optional;
 
@@ -54,7 +56,9 @@ public RefJobContentResponseRef copyRef(ThirdlyRequestRef.CopyWitContextRequestR
                 workflowCopyRequestRef.getWorkspace(), appId, contextIdStr,
                 projectName, version, description, workflowCopyRequestRef.getDSSLabels(),
                 targetProjectId, (String) nodeSuffix.orElse(null), (String) newFlowName.orElse(null));
-        ResponseCopyWorkflow responseCopyWorkflow = RpcAskUtils.processAskException(sender.ask(requestCopyWorkflow),
+        List<DSSLabel> dssLabels = workflowCopyRequestRef.getDSSLabels();
+        Sender tempSend = DSSSenderServiceFactory.getOrCreateServiceInstance().getWorkflowSender(dssLabels);
+        ResponseCopyWorkflow responseCopyWorkflow = RpcAskUtils.processAskException(tempSend.ask(requestCopyWorkflow),
                 ResponseCopyWorkflow.class, RequestCopyWorkflow.class);
         Map<String, Object> refJobContent = new HashMap<>(2);
         refJobContent.put(OrchestratorRefConstant.ORCHESTRATION_ID_KEY, responseCopyWorkflow.getDssFlow().getId());
diff --git a/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/impl/OrchestratorFrameworkServiceImpl.java b/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/impl/OrchestratorFrameworkServiceImpl.java
index 43c14c028..44cc09f9a 100644
--- a/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/impl/OrchestratorFrameworkServiceImpl.java
+++ b/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/impl/OrchestratorFrameworkServiceImpl.java
@@ -325,9 +325,15 @@ public String copyOrchestrator(String username, OrchestratorCopyRequest orchestr
         } else if (orchestratorCopyRequest.getWorkflowNodeSuffix().length() > 10) {
             DSSExceptionUtils.dealErrorException(6014, "The node suffix length can not exceed 10. (节点后缀长度不能超过10)", DSSOrchestratorErrorException.class);
         }
+        String dssLabel = null;
+        if (orchestratorCopyRequest.getLabels()!= null && orchestratorCopyRequest.getLabels().getRoute() != null) {
+            dssLabel = orchestratorCopyRequest.getLabels().getRoute();
+        } else {
+            dssLabel = DSSCommonUtils.ENV_LABEL_VALUE_DEV;
+        }
         OrchestratorCopyVo orchestratorCopyVo = new OrchestratorCopyVo.Builder(username, sourceProject.getId(), sourceProject.getName(), targetProject.getId(),
                 targetProject.getName(), sourceOrchestratorInfo, orchestratorCopyRequest.getTargetOrchestratorName(),
-                orchestratorCopyRequest.getWorkflowNodeSuffix(), new EnvDSSLabel(DSSCommonUtils.ENV_LABEL_VALUE_DEV),
+                orchestratorCopyRequest.getWorkflowNodeSuffix(), new EnvDSSLabel(dssLabel),
                 workspace, Sender.getThisInstance()).setCopyTaskId(null).build();
         OrchestratorCopyJob orchestratorCopyJob = new OrchestratorCopyJob();
         orchestratorCopyJob.setOrchestratorCopyVo(orchestratorCopyVo);
diff --git a/pom.xml b/pom.xml
index 733ee92a1..647ac6efc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -40,7 +40,7 @@
     </modules>
 
     <properties>
-        <dss.version>1.3.0-SNAPSHOT</dss.version>
+        <dss.version>1.3.1</dss.version>
         <linkis.version>1.3.0-wds-SNAPSHOT</linkis.version>
         <scala.version>2.11.12</scala.version>
         <jdk.compile.version>1.8</jdk.compile.version>

From 95dadb6ff41cabb28c063c94401b9882bc5ab50f Mon Sep 17 00:00:00 2001
From: qweqnotallow <747839893@qq.com>
Date: Sat, 11 May 2024 10:11:09 +0800
Subject: [PATCH 115/302] Revert "1.3.0->1.3.1"

This reverts commit fda140bcd40183cb22352df6df7dce7aee7d3cf8.
---
 assembly/dss-package/pom.xml                                  | 2 +-
 assembly/pom.xml                                              | 2 +-
 dss-appconn/appconns/dss-datachecker-appconn/pom.xml          | 4 ++--
 dss-appconn/appconns/dss-dolphinscheduler-appconn/pom.xml     | 2 +-
 dss-appconn/appconns/dss-eventchecker-appconn/pom.xml         | 2 +-
 dss-appconn/appconns/dss-schedulis-appconn/pom.xml            | 2 +-
 dss-appconn/appconns/dss-scriptis-appconn/pom.xml             | 2 +-
 dss-appconn/appconns/dss-sendemail-appconn/pom.xml            | 2 +-
 .../dss-sendemail-appconn/sendemail-appconn-core/pom.xml      | 2 +-
 dss-appconn/appconns/dss-sso-appconn/pom.xml                  | 2 +-
 dss-appconn/appconns/dss-workflow-appconn/pom.xml             | 2 +-
 dss-appconn/dss-appconn-core/pom.xml                          | 2 +-
 dss-appconn/dss-appconn-loader/pom.xml                        | 2 +-
 .../dss-appconn-manager/dss-appconn-manager-client/pom.xml    | 2 +-
 .../dss-appconn-manager/dss-appconn-manager-core/pom.xml      | 2 +-
 dss-appconn/dss-appconn-manager/pom.xml                       | 2 +-
 dss-appconn/dss-scheduler-appconn/pom.xml                     | 2 +-
 dss-appconn/linkis-appconn-engineplugin/pom.xml               | 2 +-
 dss-appconn/pom.xml                                           | 2 +-
 dss-apps/dss-apiservice-server/pom.xml                        | 2 +-
 dss-apps/dss-apps-server/pom.xml                              | 2 +-
 dss-apps/dss-data-api/dss-api-sql-template/pom.xml            | 2 +-
 dss-apps/dss-data-api/dss-data-api-server/pom.xml             | 2 +-
 dss-apps/dss-data-api/pom.xml                                 | 2 +-
 dss-apps/dss-data-governance/dss-data-asset-server/pom.xml    | 2 +-
 .../dss-data-classification-server/pom.xml                    | 2 +-
 .../dss-data-governance/dss-data-governance-common/pom.xml    | 2 +-
 .../dss-data-governance/dss-data-governance-server/pom.xml    | 2 +-
 dss-apps/dss-data-governance/pom.xml                          | 2 +-
 dss-apps/dss-scriptis-server/pom.xml                          | 2 +-
 dss-apps/dss-user-guide/dss-user-guide-server/pom.xml         | 2 +-
 dss-apps/dss-user-guide/pom.xml                               | 2 +-
 dss-apps/pom.xml                                              | 2 +-
 dss-commons/dss-common/pom.xml                                | 2 +-
 dss-commons/dss-contextservice/pom.xml                        | 2 +-
 dss-commons/dss-sender-service/pom.xml                        | 2 +-
 dss-commons/pom.xml                                           | 2 +-
 dss-framework/dss-appconn-framework/pom.xml                   | 2 +-
 dss-framework/dss-framework-admin-service/pom.xml             | 2 +-
 dss-framework/dss-framework-common/pom.xml                    | 2 +-
 dss-framework/dss-framework-orchestrator-server/pom.xml       | 2 +-
 dss-framework/dss-framework-project-server/pom.xml            | 2 +-
 dss-framework/dss-framework-proxy-user-service/pom.xml        | 2 +-
 dss-framework/dss-framework-workspace-server/pom.xml          | 2 +-
 .../framework-plugins/dss-framework-migrate-server/pom.xml    | 2 +-
 .../dss-framework-orchestrator-publish/pom.xml                | 2 +-
 dss-framework/pom.xml                                         | 2 +-
 dss-orchestrator/dss-orchestrator-common/pom.xml              | 2 +-
 dss-orchestrator/dss-orchestrator-conversion-standard/pom.xml | 2 +-
 dss-orchestrator/dss-orchestrator-core/pom.xml                | 2 +-
 dss-orchestrator/dss-orchestrator-db/pom.xml                  | 2 +-
 dss-orchestrator/dss-orchestrator-loader/pom.xml              | 2 +-
 .../dss-workflow/dss-flow-execution-server/pom.xml            | 2 +-
 .../dss-workflow/dss-linkis-node-execution/pom.xml            | 2 +-
 .../orchestrators/dss-workflow/dss-workflow-common/pom.xml    | 2 +-
 .../dss-workflow/dss-workflow-conversion-standard/pom.xml     | 2 +-
 .../orchestrators/dss-workflow/dss-workflow-sdk/pom.xml       | 2 +-
 .../orchestrators/dss-workflow/dss-workflow-server/pom.xml    | 2 +-
 dss-orchestrator/orchestrators/dss-workflow/pom.xml           | 2 +-
 dss-orchestrator/pom.xml                                      | 2 +-
 dss-server/pom.xml                                            | 2 +-
 .../development-process-standard-execution/pom.xml            | 2 +-
 .../development-standard/development-process-standard/pom.xml | 2 +-
 dss-standard/dss-standard-common/pom.xml                      | 2 +-
 dss-standard/pom.xml                                          | 2 +-
 .../sso-standard/origin-sso-integration-standard/pom.xml      | 2 +-
 .../sso-standard/spring-origin-sso-integration-plugin/pom.xml | 2 +-
 dss-standard/sso-standard/sso-integration-standard/pom.xml    | 2 +-
 dss-standard/structure-standard/dss-project-plugin/pom.xml    | 2 +-
 dss-standard/structure-standard/dss-role-plugin/pom.xml       | 2 +-
 .../dss-structure-integration-standard/pom.xml                | 2 +-
 .../spring-origin-dss-project-plugin/pom.xml                  | 2 +-
 plugins/azkaban/linkis-jobtype/pom.xml                        | 2 +-
 .../dolphinscheduler/dolphinscheduler-prod-metrics/pom.xml    | 2 +-
 plugins/dolphinscheduler/dss-dolphinscheduler-client/pom.xml  | 2 +-
 plugins/dolphinscheduler/dss-dolphinscheduler-token/pom.xml   | 2 +-
 plugins/dolphinscheduler/pom.xml                              | 2 +-
 plugins/linkis/dss-gateway-support/pom.xml                    | 2 +-
 pom.xml                                                       | 2 +-
 79 files changed, 80 insertions(+), 80 deletions(-)

diff --git a/assembly/dss-package/pom.xml b/assembly/dss-package/pom.xml
index a6aee13ab..6674406cd 100644
--- a/assembly/dss-package/pom.xml
+++ b/assembly/dss-package/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.3.1</version>
+        <version>1.3.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/assembly/pom.xml b/assembly/pom.xml
index 6406c7f9c..d72a246dd 100644
--- a/assembly/pom.xml
+++ b/assembly/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.3.1</version>
+        <version>1.3.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <packaging>pom</packaging>
diff --git a/dss-appconn/appconns/dss-datachecker-appconn/pom.xml b/dss-appconn/appconns/dss-datachecker-appconn/pom.xml
index 646eb4834..d01eb0de3 100644
--- a/dss-appconn/appconns/dss-datachecker-appconn/pom.xml
+++ b/dss-appconn/appconns/dss-datachecker-appconn/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.3.1</version>
+        <version>1.3.0-SNAPSHOT</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
@@ -54,7 +54,7 @@
         <dependency>
             <groupId>com.webank.wedatasphere.dss</groupId>
             <artifactId>dss-origin-sso-integration-standard</artifactId>
-            <version>1.3.1</version>
+            <version>1.3.0-SNAPSHOT</version>
             <exclusions>
                 <exclusion>
                     <groupId>org.apache.linkis</groupId>
diff --git a/dss-appconn/appconns/dss-dolphinscheduler-appconn/pom.xml b/dss-appconn/appconns/dss-dolphinscheduler-appconn/pom.xml
index 57618c57d..3965bc416 100644
--- a/dss-appconn/appconns/dss-dolphinscheduler-appconn/pom.xml
+++ b/dss-appconn/appconns/dss-dolphinscheduler-appconn/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.3.1</version>
+        <version>1.3.0-SNAPSHOT</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-appconn/appconns/dss-eventchecker-appconn/pom.xml b/dss-appconn/appconns/dss-eventchecker-appconn/pom.xml
index 0655804fd..2133f507e 100644
--- a/dss-appconn/appconns/dss-eventchecker-appconn/pom.xml
+++ b/dss-appconn/appconns/dss-eventchecker-appconn/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.3.1</version>
+        <version>1.3.0-SNAPSHOT</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-appconn/appconns/dss-schedulis-appconn/pom.xml b/dss-appconn/appconns/dss-schedulis-appconn/pom.xml
index 36beb2de0..7b0f868e2 100644
--- a/dss-appconn/appconns/dss-schedulis-appconn/pom.xml
+++ b/dss-appconn/appconns/dss-schedulis-appconn/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.3.1</version>
+        <version>1.3.0-SNAPSHOT</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-appconn/appconns/dss-scriptis-appconn/pom.xml b/dss-appconn/appconns/dss-scriptis-appconn/pom.xml
index bb2441d15..e53aab1f8 100644
--- a/dss-appconn/appconns/dss-scriptis-appconn/pom.xml
+++ b/dss-appconn/appconns/dss-scriptis-appconn/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.3.1</version>
+        <version>1.3.0-SNAPSHOT</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-appconn/appconns/dss-sendemail-appconn/pom.xml b/dss-appconn/appconns/dss-sendemail-appconn/pom.xml
index 1b2e6a0f5..0ebc2ff87 100644
--- a/dss-appconn/appconns/dss-sendemail-appconn/pom.xml
+++ b/dss-appconn/appconns/dss-sendemail-appconn/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.3.1</version>
+        <version>1.3.0-SNAPSHOT</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-appconn/appconns/dss-sendemail-appconn/sendemail-appconn-core/pom.xml b/dss-appconn/appconns/dss-sendemail-appconn/sendemail-appconn-core/pom.xml
index c7838c6e2..d6a285758 100644
--- a/dss-appconn/appconns/dss-sendemail-appconn/sendemail-appconn-core/pom.xml
+++ b/dss-appconn/appconns/dss-sendemail-appconn/sendemail-appconn-core/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.3.1</version>
+        <version>1.3.0-SNAPSHOT</version>
         <relativePath>../../../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-appconn/appconns/dss-sso-appconn/pom.xml b/dss-appconn/appconns/dss-sso-appconn/pom.xml
index b501f6764..1134ea21c 100644
--- a/dss-appconn/appconns/dss-sso-appconn/pom.xml
+++ b/dss-appconn/appconns/dss-sso-appconn/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.3.1</version>
+        <version>1.3.0-SNAPSHOT</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-appconn/appconns/dss-workflow-appconn/pom.xml b/dss-appconn/appconns/dss-workflow-appconn/pom.xml
index fda55ae81..2c677dbbc 100644
--- a/dss-appconn/appconns/dss-workflow-appconn/pom.xml
+++ b/dss-appconn/appconns/dss-workflow-appconn/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.3.1</version>
+        <version>1.3.0-SNAPSHOT</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-appconn/dss-appconn-core/pom.xml b/dss-appconn/dss-appconn-core/pom.xml
index 5e3dbc100..bf52e5be3 100644
--- a/dss-appconn/dss-appconn-core/pom.xml
+++ b/dss-appconn/dss-appconn-core/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.3.1</version>
+        <version>1.3.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-appconn/dss-appconn-loader/pom.xml b/dss-appconn/dss-appconn-loader/pom.xml
index 37cdd3bff..c175d6356 100644
--- a/dss-appconn/dss-appconn-loader/pom.xml
+++ b/dss-appconn/dss-appconn-loader/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.3.1</version>
+        <version>1.3.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-appconn/dss-appconn-manager/dss-appconn-manager-client/pom.xml b/dss-appconn/dss-appconn-manager/dss-appconn-manager-client/pom.xml
index 8767900e1..1d21c6dd1 100644
--- a/dss-appconn/dss-appconn-manager/dss-appconn-manager-client/pom.xml
+++ b/dss-appconn/dss-appconn-manager/dss-appconn-manager-client/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <artifactId>dss</artifactId>
     <groupId>com.webank.wedatasphere.dss</groupId>
-    <version>1.3.1</version>
+    <version>1.3.0-SNAPSHOT</version>
     <relativePath>../../../pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
diff --git a/dss-appconn/dss-appconn-manager/dss-appconn-manager-core/pom.xml b/dss-appconn/dss-appconn-manager/dss-appconn-manager-core/pom.xml
index efb0fec39..c3c700044 100644
--- a/dss-appconn/dss-appconn-manager/dss-appconn-manager-core/pom.xml
+++ b/dss-appconn/dss-appconn-manager/dss-appconn-manager-core/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <artifactId>dss</artifactId>
     <groupId>com.webank.wedatasphere.dss</groupId>
-    <version>1.3.1</version>
+    <version>1.3.0-SNAPSHOT</version>
     <relativePath>../../../pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
diff --git a/dss-appconn/dss-appconn-manager/pom.xml b/dss-appconn/dss-appconn-manager/pom.xml
index 7513df4c1..0109b84df 100644
--- a/dss-appconn/dss-appconn-manager/pom.xml
+++ b/dss-appconn/dss-appconn-manager/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <artifactId>dss</artifactId>
     <groupId>com.webank.wedatasphere.dss</groupId>
-    <version>1.3.1</version>
+    <version>1.3.0-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
diff --git a/dss-appconn/dss-scheduler-appconn/pom.xml b/dss-appconn/dss-scheduler-appconn/pom.xml
index de171808c..2b68bdfb1 100644
--- a/dss-appconn/dss-scheduler-appconn/pom.xml
+++ b/dss-appconn/dss-scheduler-appconn/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.3.1</version>
+        <version>1.3.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-appconn/linkis-appconn-engineplugin/pom.xml b/dss-appconn/linkis-appconn-engineplugin/pom.xml
index 5a953803b..5dee47a82 100644
--- a/dss-appconn/linkis-appconn-engineplugin/pom.xml
+++ b/dss-appconn/linkis-appconn-engineplugin/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.3.1</version>
+        <version>1.3.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-appconn/pom.xml b/dss-appconn/pom.xml
index 199287adf..7263fc63b 100644
--- a/dss-appconn/pom.xml
+++ b/dss-appconn/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.3.1</version>
+        <version>1.3.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-apps/dss-apiservice-server/pom.xml b/dss-apps/dss-apiservice-server/pom.xml
index 3e24bc130..b677f34f2 100644
--- a/dss-apps/dss-apiservice-server/pom.xml
+++ b/dss-apps/dss-apiservice-server/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.3.1</version>
+        <version>1.3.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-apps/dss-apps-server/pom.xml b/dss-apps/dss-apps-server/pom.xml
index efad715ff..2b2f7a7e0 100644
--- a/dss-apps/dss-apps-server/pom.xml
+++ b/dss-apps/dss-apps-server/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.3.1</version>
+        <version>1.3.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-apps/dss-data-api/dss-api-sql-template/pom.xml b/dss-apps/dss-data-api/dss-api-sql-template/pom.xml
index a86591033..7e11ed57d 100644
--- a/dss-apps/dss-data-api/dss-api-sql-template/pom.xml
+++ b/dss-apps/dss-data-api/dss-api-sql-template/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.3.1</version>
+        <version>1.3.0-SNAPSHOT</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-apps/dss-data-api/dss-data-api-server/pom.xml b/dss-apps/dss-data-api/dss-data-api-server/pom.xml
index 014757c76..5e750f390 100644
--- a/dss-apps/dss-data-api/dss-data-api-server/pom.xml
+++ b/dss-apps/dss-data-api/dss-data-api-server/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.3.1</version>
+        <version>1.3.0-SNAPSHOT</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-apps/dss-data-api/pom.xml b/dss-apps/dss-data-api/pom.xml
index 437577e4d..495848168 100644
--- a/dss-apps/dss-data-api/pom.xml
+++ b/dss-apps/dss-data-api/pom.xml
@@ -6,7 +6,7 @@
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
         <relativePath>../../pom.xml</relativePath>
-        <version>1.3.1</version>
+        <version>1.3.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>dss-data-api</artifactId>
diff --git a/dss-apps/dss-data-governance/dss-data-asset-server/pom.xml b/dss-apps/dss-data-governance/dss-data-asset-server/pom.xml
index f1725b0af..228230a27 100644
--- a/dss-apps/dss-data-governance/dss-data-asset-server/pom.xml
+++ b/dss-apps/dss-data-governance/dss-data-asset-server/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.3.1</version>
+        <version>1.3.0-SNAPSHOT</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-apps/dss-data-governance/dss-data-classification-server/pom.xml b/dss-apps/dss-data-governance/dss-data-classification-server/pom.xml
index 7cd077816..81d514854 100644
--- a/dss-apps/dss-data-governance/dss-data-classification-server/pom.xml
+++ b/dss-apps/dss-data-governance/dss-data-classification-server/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.3.1</version>
+        <version>1.3.0-SNAPSHOT</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-apps/dss-data-governance/dss-data-governance-common/pom.xml b/dss-apps/dss-data-governance/dss-data-governance-common/pom.xml
index cc1a8b32e..37fc5b070 100644
--- a/dss-apps/dss-data-governance/dss-data-governance-common/pom.xml
+++ b/dss-apps/dss-data-governance/dss-data-governance-common/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.3.1</version>
+        <version>1.3.0-SNAPSHOT</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-apps/dss-data-governance/dss-data-governance-server/pom.xml b/dss-apps/dss-data-governance/dss-data-governance-server/pom.xml
index 0a9ba2e8a..47017b4d4 100644
--- a/dss-apps/dss-data-governance/dss-data-governance-server/pom.xml
+++ b/dss-apps/dss-data-governance/dss-data-governance-server/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.3.1</version>
+        <version>1.3.0-SNAPSHOT</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-apps/dss-data-governance/pom.xml b/dss-apps/dss-data-governance/pom.xml
index 49474d0c8..518d5c4b5 100644
--- a/dss-apps/dss-data-governance/pom.xml
+++ b/dss-apps/dss-data-governance/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.3.1</version>
+        <version>1.3.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-apps/dss-scriptis-server/pom.xml b/dss-apps/dss-scriptis-server/pom.xml
index f8a09f766..a19355c4e 100644
--- a/dss-apps/dss-scriptis-server/pom.xml
+++ b/dss-apps/dss-scriptis-server/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.3.1</version>
+        <version>1.3.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/dss-apps/dss-user-guide/dss-user-guide-server/pom.xml b/dss-apps/dss-user-guide/dss-user-guide-server/pom.xml
index 3aa3e804a..6abe4623b 100644
--- a/dss-apps/dss-user-guide/dss-user-guide-server/pom.xml
+++ b/dss-apps/dss-user-guide/dss-user-guide-server/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>dss-user-guide</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.3.1</version>
+        <version>1.3.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-apps/dss-user-guide/pom.xml b/dss-apps/dss-user-guide/pom.xml
index 751c1a043..b846084dc 100644
--- a/dss-apps/dss-user-guide/pom.xml
+++ b/dss-apps/dss-user-guide/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.3.1</version>
+        <version>1.3.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-apps/pom.xml b/dss-apps/pom.xml
index b72f39ccc..ba57e2bca 100644
--- a/dss-apps/pom.xml
+++ b/dss-apps/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.3.1</version>
+        <version>1.3.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-commons/dss-common/pom.xml b/dss-commons/dss-common/pom.xml
index 53aa0e0dd..25c083351 100644
--- a/dss-commons/dss-common/pom.xml
+++ b/dss-commons/dss-common/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <artifactId>dss-commons</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.3.1</version>
+        <version>1.3.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>dss-common</artifactId>
diff --git a/dss-commons/dss-contextservice/pom.xml b/dss-commons/dss-contextservice/pom.xml
index 390dff340..609ca270d 100644
--- a/dss-commons/dss-contextservice/pom.xml
+++ b/dss-commons/dss-contextservice/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss-commons</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.3.1</version>
+        <version>1.3.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>dss-contextservice</artifactId>
diff --git a/dss-commons/dss-sender-service/pom.xml b/dss-commons/dss-sender-service/pom.xml
index 69d399445..7da4725fe 100644
--- a/dss-commons/dss-sender-service/pom.xml
+++ b/dss-commons/dss-sender-service/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss-commons</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.3.1</version>
+        <version>1.3.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-commons/pom.xml b/dss-commons/pom.xml
index 7d15851b1..a80e4fba5 100644
--- a/dss-commons/pom.xml
+++ b/dss-commons/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.3.1</version>
+        <version>1.3.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-framework/dss-appconn-framework/pom.xml b/dss-framework/dss-appconn-framework/pom.xml
index 0cedcd358..bfb9babb3 100644
--- a/dss-framework/dss-appconn-framework/pom.xml
+++ b/dss-framework/dss-appconn-framework/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.3.1</version>
+        <version>1.3.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-framework/dss-framework-admin-service/pom.xml b/dss-framework/dss-framework-admin-service/pom.xml
index 3c8e17d09..a28b224d0 100644
--- a/dss-framework/dss-framework-admin-service/pom.xml
+++ b/dss-framework/dss-framework-admin-service/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.3.1</version>
+        <version>1.3.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/dss-framework/dss-framework-common/pom.xml b/dss-framework/dss-framework-common/pom.xml
index c9af8ed3f..1fa4aed33 100644
--- a/dss-framework/dss-framework-common/pom.xml
+++ b/dss-framework/dss-framework-common/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.3.1</version>
+        <version>1.3.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-framework/dss-framework-orchestrator-server/pom.xml b/dss-framework/dss-framework-orchestrator-server/pom.xml
index 788636b97..cbc2b1fc1 100644
--- a/dss-framework/dss-framework-orchestrator-server/pom.xml
+++ b/dss-framework/dss-framework-orchestrator-server/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.3.1</version>
+        <version>1.3.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-framework/dss-framework-project-server/pom.xml b/dss-framework/dss-framework-project-server/pom.xml
index 083a22d9f..ec328f17c 100644
--- a/dss-framework/dss-framework-project-server/pom.xml
+++ b/dss-framework/dss-framework-project-server/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.3.1</version>
+        <version>1.3.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-framework/dss-framework-proxy-user-service/pom.xml b/dss-framework/dss-framework-proxy-user-service/pom.xml
index ece336df4..15b287af3 100644
--- a/dss-framework/dss-framework-proxy-user-service/pom.xml
+++ b/dss-framework/dss-framework-proxy-user-service/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>dss-framework</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.3.1</version>
+        <version>1.3.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/dss-framework/dss-framework-workspace-server/pom.xml b/dss-framework/dss-framework-workspace-server/pom.xml
index b3d31d389..4fad67608 100644
--- a/dss-framework/dss-framework-workspace-server/pom.xml
+++ b/dss-framework/dss-framework-workspace-server/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.3.1</version>
+        <version>1.3.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-framework/framework-plugins/dss-framework-migrate-server/pom.xml b/dss-framework/framework-plugins/dss-framework-migrate-server/pom.xml
index 55786bdd5..748dd085e 100644
--- a/dss-framework/framework-plugins/dss-framework-migrate-server/pom.xml
+++ b/dss-framework/framework-plugins/dss-framework-migrate-server/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.3.1</version>
+        <version>1.3.0-SNAPSHOT</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-framework/framework-plugins/dss-framework-orchestrator-publish/pom.xml b/dss-framework/framework-plugins/dss-framework-orchestrator-publish/pom.xml
index d2c182b6f..870d2aeb7 100644
--- a/dss-framework/framework-plugins/dss-framework-orchestrator-publish/pom.xml
+++ b/dss-framework/framework-plugins/dss-framework-orchestrator-publish/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.3.1</version>
+        <version>1.3.0-SNAPSHOT</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-framework/pom.xml b/dss-framework/pom.xml
index 85db110bb..ccf70b32c 100644
--- a/dss-framework/pom.xml
+++ b/dss-framework/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.3.1</version>
+        <version>1.3.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-orchestrator/dss-orchestrator-common/pom.xml b/dss-orchestrator/dss-orchestrator-common/pom.xml
index 1b9a5831a..0a1cc58e8 100644
--- a/dss-orchestrator/dss-orchestrator-common/pom.xml
+++ b/dss-orchestrator/dss-orchestrator-common/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.3.1</version>
+        <version>1.3.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-orchestrator/dss-orchestrator-conversion-standard/pom.xml b/dss-orchestrator/dss-orchestrator-conversion-standard/pom.xml
index eff898b40..03b599b76 100644
--- a/dss-orchestrator/dss-orchestrator-conversion-standard/pom.xml
+++ b/dss-orchestrator/dss-orchestrator-conversion-standard/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <artifactId>dss-orchestrator</artifactId>
     <groupId>com.webank.wedatasphere.dss</groupId>
-    <version>1.3.1</version>
+    <version>1.3.0-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
diff --git a/dss-orchestrator/dss-orchestrator-core/pom.xml b/dss-orchestrator/dss-orchestrator-core/pom.xml
index 24f7d8f03..0800a82b3 100644
--- a/dss-orchestrator/dss-orchestrator-core/pom.xml
+++ b/dss-orchestrator/dss-orchestrator-core/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.3.1</version>
+        <version>1.3.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-orchestrator/dss-orchestrator-db/pom.xml b/dss-orchestrator/dss-orchestrator-db/pom.xml
index 1a4d7af22..c08ab2c26 100644
--- a/dss-orchestrator/dss-orchestrator-db/pom.xml
+++ b/dss-orchestrator/dss-orchestrator-db/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.3.1</version>
+        <version>1.3.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-orchestrator/dss-orchestrator-loader/pom.xml b/dss-orchestrator/dss-orchestrator-loader/pom.xml
index cc9971ab1..def0b8abf 100644
--- a/dss-orchestrator/dss-orchestrator-loader/pom.xml
+++ b/dss-orchestrator/dss-orchestrator-loader/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.3.1</version>
+        <version>1.3.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-orchestrator/orchestrators/dss-workflow/dss-flow-execution-server/pom.xml b/dss-orchestrator/orchestrators/dss-workflow/dss-flow-execution-server/pom.xml
index 372e304d3..96b081036 100644
--- a/dss-orchestrator/orchestrators/dss-workflow/dss-flow-execution-server/pom.xml
+++ b/dss-orchestrator/orchestrators/dss-workflow/dss-flow-execution-server/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.3.1</version>
+        <version>1.3.0-SNAPSHOT</version>
         <relativePath>../../../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-orchestrator/orchestrators/dss-workflow/dss-linkis-node-execution/pom.xml b/dss-orchestrator/orchestrators/dss-workflow/dss-linkis-node-execution/pom.xml
index 74db7a589..2ffc52852 100644
--- a/dss-orchestrator/orchestrators/dss-workflow/dss-linkis-node-execution/pom.xml
+++ b/dss-orchestrator/orchestrators/dss-workflow/dss-linkis-node-execution/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.3.1</version>
+        <version>1.3.0-SNAPSHOT</version>
         <relativePath>../../../../pom.xml</relativePath>
     </parent>
     
diff --git a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-common/pom.xml b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-common/pom.xml
index 896afd38f..cd49c91df 100644
--- a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-common/pom.xml
+++ b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-common/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.3.1</version>
+        <version>1.3.0-SNAPSHOT</version>
         <relativePath>../../../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-conversion-standard/pom.xml b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-conversion-standard/pom.xml
index 9fb1569b7..8c42962f9 100644
--- a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-conversion-standard/pom.xml
+++ b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-conversion-standard/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <artifactId>dss-workflow</artifactId>
     <groupId>com.webank.wedatasphere.dss</groupId>
-    <version>1.3.1</version>
+    <version>1.3.0-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
diff --git a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-sdk/pom.xml b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-sdk/pom.xml
index aeb44ff21..0e0cab938 100644
--- a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-sdk/pom.xml
+++ b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-sdk/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss-workflow</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.3.1</version>
+        <version>1.3.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/pom.xml b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/pom.xml
index a523f9a08..e13d9ea48 100644
--- a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/pom.xml
+++ b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.3.1</version>
+        <version>1.3.0-SNAPSHOT</version>
         <relativePath>../../../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-orchestrator/orchestrators/dss-workflow/pom.xml b/dss-orchestrator/orchestrators/dss-workflow/pom.xml
index 39c6f4f45..6c2c41c59 100644
--- a/dss-orchestrator/orchestrators/dss-workflow/pom.xml
+++ b/dss-orchestrator/orchestrators/dss-workflow/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.3.1</version>
+        <version>1.3.0-SNAPSHOT</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-orchestrator/pom.xml b/dss-orchestrator/pom.xml
index 8b527ae4d..d382731d5 100644
--- a/dss-orchestrator/pom.xml
+++ b/dss-orchestrator/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.3.1</version>
+        <version>1.3.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-server/pom.xml b/dss-server/pom.xml
index 853e8e434..fd3087ebd 100644
--- a/dss-server/pom.xml
+++ b/dss-server/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.3.1</version>
+        <version>1.3.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-standard/development-standard/development-process-standard-execution/pom.xml b/dss-standard/development-standard/development-process-standard-execution/pom.xml
index eaed31c81..bdbdc445c 100644
--- a/dss-standard/development-standard/development-process-standard-execution/pom.xml
+++ b/dss-standard/development-standard/development-process-standard-execution/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <artifactId>dss</artifactId>
     <groupId>com.webank.wedatasphere.dss</groupId>
-    <version>1.3.1</version>
+    <version>1.3.0-SNAPSHOT</version>
     <relativePath>../../../pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
diff --git a/dss-standard/development-standard/development-process-standard/pom.xml b/dss-standard/development-standard/development-process-standard/pom.xml
index 1ae425afe..e1d9fc919 100644
--- a/dss-standard/development-standard/development-process-standard/pom.xml
+++ b/dss-standard/development-standard/development-process-standard/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <artifactId>dss</artifactId>
     <groupId>com.webank.wedatasphere.dss</groupId>
-    <version>1.3.1</version>
+    <version>1.3.0-SNAPSHOT</version>
     <relativePath>../../../pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
diff --git a/dss-standard/dss-standard-common/pom.xml b/dss-standard/dss-standard-common/pom.xml
index f3e9c9246..d38704d2d 100644
--- a/dss-standard/dss-standard-common/pom.xml
+++ b/dss-standard/dss-standard-common/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <artifactId>dss</artifactId>
     <groupId>com.webank.wedatasphere.dss</groupId>
-    <version>1.3.1</version>
+    <version>1.3.0-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
diff --git a/dss-standard/pom.xml b/dss-standard/pom.xml
index 6f1c3a99e..4d9c40b2f 100644
--- a/dss-standard/pom.xml
+++ b/dss-standard/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <artifactId>dss</artifactId>
     <groupId>com.webank.wedatasphere.dss</groupId>
-    <version>1.3.1</version>
+    <version>1.3.0-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
diff --git a/dss-standard/sso-standard/origin-sso-integration-standard/pom.xml b/dss-standard/sso-standard/origin-sso-integration-standard/pom.xml
index 8e4001d8c..b1de51004 100644
--- a/dss-standard/sso-standard/origin-sso-integration-standard/pom.xml
+++ b/dss-standard/sso-standard/origin-sso-integration-standard/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <artifactId>dss</artifactId>
     <groupId>com.webank.wedatasphere.dss</groupId>
-    <version>1.3.1</version>
+    <version>1.3.0-SNAPSHOT</version>
     <relativePath>../../../pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
diff --git a/dss-standard/sso-standard/spring-origin-sso-integration-plugin/pom.xml b/dss-standard/sso-standard/spring-origin-sso-integration-plugin/pom.xml
index 6f05c66e9..59a80b2b0 100644
--- a/dss-standard/sso-standard/spring-origin-sso-integration-plugin/pom.xml
+++ b/dss-standard/sso-standard/spring-origin-sso-integration-plugin/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <artifactId>dss</artifactId>
     <groupId>com.webank.wedatasphere.dss</groupId>
-    <version>1.3.1</version>
+    <version>1.3.0-SNAPSHOT</version>
     <relativePath>../../../pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
diff --git a/dss-standard/sso-standard/sso-integration-standard/pom.xml b/dss-standard/sso-standard/sso-integration-standard/pom.xml
index 96b0d1a08..f2d1da996 100644
--- a/dss-standard/sso-standard/sso-integration-standard/pom.xml
+++ b/dss-standard/sso-standard/sso-integration-standard/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <artifactId>dss</artifactId>
     <groupId>com.webank.wedatasphere.dss</groupId>
-    <version>1.3.1</version>
+    <version>1.3.0-SNAPSHOT</version>
     <relativePath>../../../pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
diff --git a/dss-standard/structure-standard/dss-project-plugin/pom.xml b/dss-standard/structure-standard/dss-project-plugin/pom.xml
index 87fc4e7b2..70fd9bbaf 100644
--- a/dss-standard/structure-standard/dss-project-plugin/pom.xml
+++ b/dss-standard/structure-standard/dss-project-plugin/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <artifactId>dss</artifactId>
     <groupId>com.webank.wedatasphere.dss</groupId>
-    <version>1.3.1</version>
+    <version>1.3.0-SNAPSHOT</version>
     <relativePath>../../../pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
diff --git a/dss-standard/structure-standard/dss-role-plugin/pom.xml b/dss-standard/structure-standard/dss-role-plugin/pom.xml
index 941beaf75..e89f24515 100644
--- a/dss-standard/structure-standard/dss-role-plugin/pom.xml
+++ b/dss-standard/structure-standard/dss-role-plugin/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <artifactId>dss</artifactId>
     <groupId>com.webank.wedatasphere.dss</groupId>
-    <version>1.3.1</version>
+    <version>1.3.0-SNAPSHOT</version>
     <relativePath>../../../pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
diff --git a/dss-standard/structure-standard/dss-structure-integration-standard/pom.xml b/dss-standard/structure-standard/dss-structure-integration-standard/pom.xml
index 05ace87d6..a77589b06 100644
--- a/dss-standard/structure-standard/dss-structure-integration-standard/pom.xml
+++ b/dss-standard/structure-standard/dss-structure-integration-standard/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <artifactId>dss</artifactId>
     <groupId>com.webank.wedatasphere.dss</groupId>
-    <version>1.3.1</version>
+    <version>1.3.0-SNAPSHOT</version>
     <relativePath>../../../pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
diff --git a/dss-standard/structure-standard/spring-origin-dss-project-plugin/pom.xml b/dss-standard/structure-standard/spring-origin-dss-project-plugin/pom.xml
index bda87e95f..add113d17 100644
--- a/dss-standard/structure-standard/spring-origin-dss-project-plugin/pom.xml
+++ b/dss-standard/structure-standard/spring-origin-dss-project-plugin/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <artifactId>dss</artifactId>
     <groupId>com.webank.wedatasphere.dss</groupId>
-    <version>1.3.1</version>
+    <version>1.3.0-SNAPSHOT</version>
     <relativePath>../../../pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
diff --git a/plugins/azkaban/linkis-jobtype/pom.xml b/plugins/azkaban/linkis-jobtype/pom.xml
index 48c8ea480..4f315b1d5 100644
--- a/plugins/azkaban/linkis-jobtype/pom.xml
+++ b/plugins/azkaban/linkis-jobtype/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.3.1</version>
+        <version>1.3.0-SNAPSHOT</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
     <artifactId>linkis-jobtype</artifactId>
diff --git a/plugins/dolphinscheduler/dolphinscheduler-prod-metrics/pom.xml b/plugins/dolphinscheduler/dolphinscheduler-prod-metrics/pom.xml
index cead7ad8e..7ba8ad2ba 100644
--- a/plugins/dolphinscheduler/dolphinscheduler-prod-metrics/pom.xml
+++ b/plugins/dolphinscheduler/dolphinscheduler-prod-metrics/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <artifactId>dss-plugin-dolphinscheduler</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.3.1</version>
+        <version>1.3.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/plugins/dolphinscheduler/dss-dolphinscheduler-client/pom.xml b/plugins/dolphinscheduler/dss-dolphinscheduler-client/pom.xml
index 48422d3fd..86efe3cc3 100644
--- a/plugins/dolphinscheduler/dss-dolphinscheduler-client/pom.xml
+++ b/plugins/dolphinscheduler/dss-dolphinscheduler-client/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <artifactId>dss-plugin-dolphinscheduler</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.3.1</version>
+        <version>1.3.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/plugins/dolphinscheduler/dss-dolphinscheduler-token/pom.xml b/plugins/dolphinscheduler/dss-dolphinscheduler-token/pom.xml
index 10c4145fd..8d01963a3 100644
--- a/plugins/dolphinscheduler/dss-dolphinscheduler-token/pom.xml
+++ b/plugins/dolphinscheduler/dss-dolphinscheduler-token/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <artifactId>dss-plugin-dolphinscheduler</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.3.1</version>
+        <version>1.3.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/plugins/dolphinscheduler/pom.xml b/plugins/dolphinscheduler/pom.xml
index cd81b27db..b9e7d6c4d 100644
--- a/plugins/dolphinscheduler/pom.xml
+++ b/plugins/dolphinscheduler/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <artifactId>dss</artifactId>
     <groupId>com.webank.wedatasphere.dss</groupId>
-    <version>1.3.1</version>
+    <version>1.3.0-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
diff --git a/plugins/linkis/dss-gateway-support/pom.xml b/plugins/linkis/dss-gateway-support/pom.xml
index 60f3e5c73..a1a55c5e2 100644
--- a/plugins/linkis/dss-gateway-support/pom.xml
+++ b/plugins/linkis/dss-gateway-support/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.3.1</version>
+        <version>1.3.0-SNAPSHOT</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/pom.xml b/pom.xml
index 647ac6efc..77db7beac 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
     <packaging>pom</packaging>
     <groupId>com.webank.wedatasphere.dss</groupId>
     <artifactId>dss</artifactId>
-    <version>1.3.1</version>
+    <version>1.3.0-SNAPSHOT</version>
 
     <modules>
         <module>dss-commons</module>

From 92d1d07506f981217e0065f23388828fe42a7369 Mon Sep 17 00:00:00 2001
From: qweqnotallow <747839893@qq.com>
Date: Sat, 11 May 2024 10:11:52 +0800
Subject: [PATCH 116/302] mlss fix1 pom

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 77db7beac..3df428933 100644
--- a/pom.xml
+++ b/pom.xml
@@ -40,7 +40,7 @@
     </modules>
 
     <properties>
-        <dss.version>1.3.1</dss.version>
+        <dss.version>1.3.0-SNAPSHOT</dss.version>
         <linkis.version>1.3.0-wds-SNAPSHOT</linkis.version>
         <scala.version>2.11.12</scala.version>
         <jdk.compile.version>1.8</jdk.compile.version>

From 613113ae128761352baf0b99495bc4bcf05cb1c8 Mon Sep 17 00:00:00 2001
From: qweqnotallow <747839893@qq.com>
Date: Sat, 11 May 2024 10:15:47 +0800
Subject: [PATCH 117/302] submitFlow status fix1

---
 .../service/impl/OrchestratorFrameworkServiceImpl.java    | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/impl/OrchestratorFrameworkServiceImpl.java b/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/impl/OrchestratorFrameworkServiceImpl.java
index 7697f289e..6d031f06e 100644
--- a/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/impl/OrchestratorFrameworkServiceImpl.java
+++ b/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/impl/OrchestratorFrameworkServiceImpl.java
@@ -48,10 +48,7 @@
 import com.webank.wedatasphere.dss.git.common.protocol.response.GitCommitResponse;
 import com.webank.wedatasphere.dss.git.common.protocol.response.GitDiffResponse;
 import com.webank.wedatasphere.dss.git.common.protocol.response.GitHistoryResponse;
-import com.webank.wedatasphere.dss.orchestrator.common.entity.DSSOrchestratorCopyInfo;
-import com.webank.wedatasphere.dss.orchestrator.common.entity.DSSOrchestratorInfo;
-import com.webank.wedatasphere.dss.orchestrator.common.entity.DSSOrchestratorRefOrchestration;
-import com.webank.wedatasphere.dss.orchestrator.common.entity.OrchestratorVo;
+import com.webank.wedatasphere.dss.orchestrator.common.entity.*;
 import com.webank.wedatasphere.dss.orchestrator.common.ref.OrchestratorRefConstant;
 import com.webank.wedatasphere.dss.orchestrator.core.DSSOrchestrator;
 import com.webank.wedatasphere.dss.orchestrator.core.exception.DSSOrchestratorErrorException;
@@ -437,7 +434,8 @@ private static boolean hasProjectEditPriv(Long projectId, String username) {
 
     @Override
     public String getOrchestratorStatus(Long orchestratorId) {
-        return orchestratorMapper.selectSubmitJobStatus(orchestratorId);
+        OrchestratorSubmitJob orchestratorSubmitJob = orchestratorMapper.selectSubmitJobStatus(orchestratorId);
+        return orchestratorSubmitJob.getStatus();
     }
 
     @Override

From 5dc7ec35c0d96c60ecc82e929cdf5e54f2c41aa8 Mon Sep 17 00:00:00 2001
From: qweqnotallow <747839893@qq.com>
Date: Sat, 11 May 2024 11:19:10 +0800
Subject: [PATCH 118/302] 1.3.0 -> 1.3.1

---
 assembly/dss-package/pom.xml                                  | 2 +-
 assembly/pom.xml                                              | 2 +-
 dss-appconn/appconns/dss-datachecker-appconn/pom.xml          | 4 ++--
 dss-appconn/appconns/dss-dolphinscheduler-appconn/pom.xml     | 2 +-
 dss-appconn/appconns/dss-eventchecker-appconn/pom.xml         | 2 +-
 dss-appconn/appconns/dss-schedulis-appconn/pom.xml            | 2 +-
 dss-appconn/appconns/dss-scriptis-appconn/pom.xml             | 2 +-
 dss-appconn/appconns/dss-sendemail-appconn/pom.xml            | 2 +-
 .../dss-sendemail-appconn/sendemail-appconn-core/pom.xml      | 2 +-
 dss-appconn/appconns/dss-sso-appconn/pom.xml                  | 2 +-
 dss-appconn/appconns/dss-workflow-appconn/pom.xml             | 2 +-
 dss-appconn/dss-appconn-core/pom.xml                          | 2 +-
 dss-appconn/dss-appconn-loader/pom.xml                        | 2 +-
 .../dss-appconn-manager/dss-appconn-manager-client/pom.xml    | 2 +-
 .../dss-appconn-manager/dss-appconn-manager-core/pom.xml      | 2 +-
 dss-appconn/dss-appconn-manager/pom.xml                       | 2 +-
 dss-appconn/dss-scheduler-appconn/pom.xml                     | 2 +-
 dss-appconn/linkis-appconn-engineplugin/pom.xml               | 2 +-
 dss-appconn/pom.xml                                           | 2 +-
 dss-apps/dss-apiservice-server/pom.xml                        | 2 +-
 dss-apps/dss-apps-server/pom.xml                              | 2 +-
 dss-apps/dss-data-api/dss-api-sql-template/pom.xml            | 2 +-
 dss-apps/dss-data-api/dss-data-api-server/pom.xml             | 2 +-
 dss-apps/dss-data-api/pom.xml                                 | 2 +-
 dss-apps/dss-data-governance/dss-data-asset-server/pom.xml    | 2 +-
 .../dss-data-classification-server/pom.xml                    | 2 +-
 .../dss-data-governance/dss-data-governance-common/pom.xml    | 2 +-
 .../dss-data-governance/dss-data-governance-server/pom.xml    | 2 +-
 dss-apps/dss-data-governance/pom.xml                          | 2 +-
 dss-apps/dss-scriptis-server/pom.xml                          | 2 +-
 dss-apps/dss-user-guide/dss-user-guide-server/pom.xml         | 2 +-
 dss-apps/dss-user-guide/pom.xml                               | 2 +-
 dss-apps/pom.xml                                              | 2 +-
 dss-commons/dss-common/pom.xml                                | 2 +-
 dss-commons/dss-contextservice/pom.xml                        | 2 +-
 dss-commons/dss-sender-service/pom.xml                        | 2 +-
 dss-commons/pom.xml                                           | 2 +-
 dss-framework/dss-appconn-framework/pom.xml                   | 2 +-
 dss-framework/dss-framework-admin-service/pom.xml             | 2 +-
 dss-framework/dss-framework-common/pom.xml                    | 2 +-
 dss-framework/dss-framework-orchestrator-server/pom.xml       | 2 +-
 dss-framework/dss-framework-project-server/pom.xml            | 2 +-
 dss-framework/dss-framework-proxy-user-service/pom.xml        | 2 +-
 dss-framework/dss-framework-workspace-server/pom.xml          | 2 +-
 .../framework-plugins/dss-framework-migrate-server/pom.xml    | 2 +-
 .../dss-framework-orchestrator-publish/pom.xml                | 2 +-
 dss-framework/pom.xml                                         | 2 +-
 dss-orchestrator/dss-orchestrator-common/pom.xml              | 2 +-
 dss-orchestrator/dss-orchestrator-conversion-standard/pom.xml | 2 +-
 dss-orchestrator/dss-orchestrator-core/pom.xml                | 2 +-
 dss-orchestrator/dss-orchestrator-db/pom.xml                  | 2 +-
 dss-orchestrator/dss-orchestrator-loader/pom.xml              | 2 +-
 .../dss-workflow/dss-flow-execution-server/pom.xml            | 2 +-
 .../dss-workflow/dss-linkis-node-execution/pom.xml            | 2 +-
 .../orchestrators/dss-workflow/dss-workflow-common/pom.xml    | 2 +-
 .../dss-workflow/dss-workflow-conversion-standard/pom.xml     | 2 +-
 .../orchestrators/dss-workflow/dss-workflow-sdk/pom.xml       | 2 +-
 .../orchestrators/dss-workflow/dss-workflow-server/pom.xml    | 2 +-
 dss-orchestrator/orchestrators/dss-workflow/pom.xml           | 2 +-
 dss-orchestrator/pom.xml                                      | 2 +-
 dss-server/pom.xml                                            | 2 +-
 .../development-process-standard-execution/pom.xml            | 2 +-
 .../development-standard/development-process-standard/pom.xml | 2 +-
 dss-standard/dss-standard-common/pom.xml                      | 2 +-
 dss-standard/pom.xml                                          | 2 +-
 .../sso-standard/origin-sso-integration-standard/pom.xml      | 2 +-
 .../sso-standard/spring-origin-sso-integration-plugin/pom.xml | 2 +-
 dss-standard/sso-standard/sso-integration-standard/pom.xml    | 2 +-
 dss-standard/structure-standard/dss-project-plugin/pom.xml    | 2 +-
 dss-standard/structure-standard/dss-role-plugin/pom.xml       | 2 +-
 .../dss-structure-integration-standard/pom.xml                | 2 +-
 .../spring-origin-dss-project-plugin/pom.xml                  | 2 +-
 plugins/azkaban/linkis-jobtype/pom.xml                        | 2 +-
 .../dolphinscheduler/dolphinscheduler-prod-metrics/pom.xml    | 2 +-
 plugins/dolphinscheduler/dss-dolphinscheduler-client/pom.xml  | 2 +-
 plugins/dolphinscheduler/dss-dolphinscheduler-token/pom.xml   | 2 +-
 plugins/dolphinscheduler/pom.xml                              | 2 +-
 plugins/linkis/dss-gateway-support/pom.xml                    | 2 +-
 pom.xml                                                       | 4 ++--
 79 files changed, 81 insertions(+), 81 deletions(-)

diff --git a/assembly/dss-package/pom.xml b/assembly/dss-package/pom.xml
index 6674406cd..96879dca2 100644
--- a/assembly/dss-package/pom.xml
+++ b/assembly/dss-package/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.3.1-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/assembly/pom.xml b/assembly/pom.xml
index d72a246dd..3443fd762 100644
--- a/assembly/pom.xml
+++ b/assembly/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.3.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <packaging>pom</packaging>
diff --git a/dss-appconn/appconns/dss-datachecker-appconn/pom.xml b/dss-appconn/appconns/dss-datachecker-appconn/pom.xml
index d01eb0de3..5bb4aa849 100644
--- a/dss-appconn/appconns/dss-datachecker-appconn/pom.xml
+++ b/dss-appconn/appconns/dss-datachecker-appconn/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.3.1-SNAPSHOT</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
@@ -54,7 +54,7 @@
         <dependency>
             <groupId>com.webank.wedatasphere.dss</groupId>
             <artifactId>dss-origin-sso-integration-standard</artifactId>
-            <version>1.3.0-SNAPSHOT</version>
+            <version>1.3.1-SNAPSHOT</version>
             <exclusions>
                 <exclusion>
                     <groupId>org.apache.linkis</groupId>
diff --git a/dss-appconn/appconns/dss-dolphinscheduler-appconn/pom.xml b/dss-appconn/appconns/dss-dolphinscheduler-appconn/pom.xml
index 3965bc416..a3bd6811b 100644
--- a/dss-appconn/appconns/dss-dolphinscheduler-appconn/pom.xml
+++ b/dss-appconn/appconns/dss-dolphinscheduler-appconn/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.3.1-SNAPSHOT</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-appconn/appconns/dss-eventchecker-appconn/pom.xml b/dss-appconn/appconns/dss-eventchecker-appconn/pom.xml
index 2133f507e..0a66490bd 100644
--- a/dss-appconn/appconns/dss-eventchecker-appconn/pom.xml
+++ b/dss-appconn/appconns/dss-eventchecker-appconn/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.3.1-SNAPSHOT</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-appconn/appconns/dss-schedulis-appconn/pom.xml b/dss-appconn/appconns/dss-schedulis-appconn/pom.xml
index 7b0f868e2..7ec10e1bb 100644
--- a/dss-appconn/appconns/dss-schedulis-appconn/pom.xml
+++ b/dss-appconn/appconns/dss-schedulis-appconn/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.3.1-SNAPSHOT</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-appconn/appconns/dss-scriptis-appconn/pom.xml b/dss-appconn/appconns/dss-scriptis-appconn/pom.xml
index e53aab1f8..1fe6b3b59 100644
--- a/dss-appconn/appconns/dss-scriptis-appconn/pom.xml
+++ b/dss-appconn/appconns/dss-scriptis-appconn/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.3.1-SNAPSHOT</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-appconn/appconns/dss-sendemail-appconn/pom.xml b/dss-appconn/appconns/dss-sendemail-appconn/pom.xml
index 0ebc2ff87..7ce817859 100644
--- a/dss-appconn/appconns/dss-sendemail-appconn/pom.xml
+++ b/dss-appconn/appconns/dss-sendemail-appconn/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.3.1-SNAPSHOT</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-appconn/appconns/dss-sendemail-appconn/sendemail-appconn-core/pom.xml b/dss-appconn/appconns/dss-sendemail-appconn/sendemail-appconn-core/pom.xml
index d6a285758..0258c0ef6 100644
--- a/dss-appconn/appconns/dss-sendemail-appconn/sendemail-appconn-core/pom.xml
+++ b/dss-appconn/appconns/dss-sendemail-appconn/sendemail-appconn-core/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.3.1-SNAPSHOT</version>
         <relativePath>../../../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-appconn/appconns/dss-sso-appconn/pom.xml b/dss-appconn/appconns/dss-sso-appconn/pom.xml
index 1134ea21c..579079220 100644
--- a/dss-appconn/appconns/dss-sso-appconn/pom.xml
+++ b/dss-appconn/appconns/dss-sso-appconn/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.3.1-SNAPSHOT</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-appconn/appconns/dss-workflow-appconn/pom.xml b/dss-appconn/appconns/dss-workflow-appconn/pom.xml
index 2c677dbbc..700766192 100644
--- a/dss-appconn/appconns/dss-workflow-appconn/pom.xml
+++ b/dss-appconn/appconns/dss-workflow-appconn/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.3.1-SNAPSHOT</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-appconn/dss-appconn-core/pom.xml b/dss-appconn/dss-appconn-core/pom.xml
index bf52e5be3..967f2bd16 100644
--- a/dss-appconn/dss-appconn-core/pom.xml
+++ b/dss-appconn/dss-appconn-core/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.3.1-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-appconn/dss-appconn-loader/pom.xml b/dss-appconn/dss-appconn-loader/pom.xml
index c175d6356..e082dbdb6 100644
--- a/dss-appconn/dss-appconn-loader/pom.xml
+++ b/dss-appconn/dss-appconn-loader/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.3.1-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-appconn/dss-appconn-manager/dss-appconn-manager-client/pom.xml b/dss-appconn/dss-appconn-manager/dss-appconn-manager-client/pom.xml
index 1d21c6dd1..27984cc5c 100644
--- a/dss-appconn/dss-appconn-manager/dss-appconn-manager-client/pom.xml
+++ b/dss-appconn/dss-appconn-manager/dss-appconn-manager-client/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <artifactId>dss</artifactId>
     <groupId>com.webank.wedatasphere.dss</groupId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.3.1-SNAPSHOT</version>
     <relativePath>../../../pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
diff --git a/dss-appconn/dss-appconn-manager/dss-appconn-manager-core/pom.xml b/dss-appconn/dss-appconn-manager/dss-appconn-manager-core/pom.xml
index c3c700044..d8917efaf 100644
--- a/dss-appconn/dss-appconn-manager/dss-appconn-manager-core/pom.xml
+++ b/dss-appconn/dss-appconn-manager/dss-appconn-manager-core/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <artifactId>dss</artifactId>
     <groupId>com.webank.wedatasphere.dss</groupId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.3.1-SNAPSHOT</version>
     <relativePath>../../../pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
diff --git a/dss-appconn/dss-appconn-manager/pom.xml b/dss-appconn/dss-appconn-manager/pom.xml
index 0109b84df..0a5ae8beb 100644
--- a/dss-appconn/dss-appconn-manager/pom.xml
+++ b/dss-appconn/dss-appconn-manager/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <artifactId>dss</artifactId>
     <groupId>com.webank.wedatasphere.dss</groupId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.3.1-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
diff --git a/dss-appconn/dss-scheduler-appconn/pom.xml b/dss-appconn/dss-scheduler-appconn/pom.xml
index 2b68bdfb1..1d9c1f645 100644
--- a/dss-appconn/dss-scheduler-appconn/pom.xml
+++ b/dss-appconn/dss-scheduler-appconn/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.3.1-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-appconn/linkis-appconn-engineplugin/pom.xml b/dss-appconn/linkis-appconn-engineplugin/pom.xml
index 5dee47a82..5a3ca6b2a 100644
--- a/dss-appconn/linkis-appconn-engineplugin/pom.xml
+++ b/dss-appconn/linkis-appconn-engineplugin/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.3.1-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-appconn/pom.xml b/dss-appconn/pom.xml
index 7263fc63b..65a6bf00b 100644
--- a/dss-appconn/pom.xml
+++ b/dss-appconn/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.3.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-apps/dss-apiservice-server/pom.xml b/dss-apps/dss-apiservice-server/pom.xml
index b677f34f2..d48f43c3b 100644
--- a/dss-apps/dss-apiservice-server/pom.xml
+++ b/dss-apps/dss-apiservice-server/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.3.1-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-apps/dss-apps-server/pom.xml b/dss-apps/dss-apps-server/pom.xml
index 2b2f7a7e0..0b04bcc94 100644
--- a/dss-apps/dss-apps-server/pom.xml
+++ b/dss-apps/dss-apps-server/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.3.1-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-apps/dss-data-api/dss-api-sql-template/pom.xml b/dss-apps/dss-data-api/dss-api-sql-template/pom.xml
index 7e11ed57d..c3c7975e8 100644
--- a/dss-apps/dss-data-api/dss-api-sql-template/pom.xml
+++ b/dss-apps/dss-data-api/dss-api-sql-template/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.3.1-SNAPSHOT</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-apps/dss-data-api/dss-data-api-server/pom.xml b/dss-apps/dss-data-api/dss-data-api-server/pom.xml
index 5e750f390..a13351892 100644
--- a/dss-apps/dss-data-api/dss-data-api-server/pom.xml
+++ b/dss-apps/dss-data-api/dss-data-api-server/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.3.1-SNAPSHOT</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-apps/dss-data-api/pom.xml b/dss-apps/dss-data-api/pom.xml
index 495848168..07a1aa22e 100644
--- a/dss-apps/dss-data-api/pom.xml
+++ b/dss-apps/dss-data-api/pom.xml
@@ -6,7 +6,7 @@
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
         <relativePath>../../pom.xml</relativePath>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.3.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>dss-data-api</artifactId>
diff --git a/dss-apps/dss-data-governance/dss-data-asset-server/pom.xml b/dss-apps/dss-data-governance/dss-data-asset-server/pom.xml
index 228230a27..992c8cb9f 100644
--- a/dss-apps/dss-data-governance/dss-data-asset-server/pom.xml
+++ b/dss-apps/dss-data-governance/dss-data-asset-server/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.3.1-SNAPSHOT</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-apps/dss-data-governance/dss-data-classification-server/pom.xml b/dss-apps/dss-data-governance/dss-data-classification-server/pom.xml
index 81d514854..5abee52e6 100644
--- a/dss-apps/dss-data-governance/dss-data-classification-server/pom.xml
+++ b/dss-apps/dss-data-governance/dss-data-classification-server/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.3.1-SNAPSHOT</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-apps/dss-data-governance/dss-data-governance-common/pom.xml b/dss-apps/dss-data-governance/dss-data-governance-common/pom.xml
index 37fc5b070..857f007a7 100644
--- a/dss-apps/dss-data-governance/dss-data-governance-common/pom.xml
+++ b/dss-apps/dss-data-governance/dss-data-governance-common/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.3.1-SNAPSHOT</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-apps/dss-data-governance/dss-data-governance-server/pom.xml b/dss-apps/dss-data-governance/dss-data-governance-server/pom.xml
index 47017b4d4..661e45b10 100644
--- a/dss-apps/dss-data-governance/dss-data-governance-server/pom.xml
+++ b/dss-apps/dss-data-governance/dss-data-governance-server/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.3.1-SNAPSHOT</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-apps/dss-data-governance/pom.xml b/dss-apps/dss-data-governance/pom.xml
index 518d5c4b5..6e8510f5d 100644
--- a/dss-apps/dss-data-governance/pom.xml
+++ b/dss-apps/dss-data-governance/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.3.1-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-apps/dss-scriptis-server/pom.xml b/dss-apps/dss-scriptis-server/pom.xml
index a19355c4e..84b13cd79 100644
--- a/dss-apps/dss-scriptis-server/pom.xml
+++ b/dss-apps/dss-scriptis-server/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.3.1-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/dss-apps/dss-user-guide/dss-user-guide-server/pom.xml b/dss-apps/dss-user-guide/dss-user-guide-server/pom.xml
index 6abe4623b..22b407746 100644
--- a/dss-apps/dss-user-guide/dss-user-guide-server/pom.xml
+++ b/dss-apps/dss-user-guide/dss-user-guide-server/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>dss-user-guide</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.3.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-apps/dss-user-guide/pom.xml b/dss-apps/dss-user-guide/pom.xml
index b846084dc..886b6d2d2 100644
--- a/dss-apps/dss-user-guide/pom.xml
+++ b/dss-apps/dss-user-guide/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.3.1-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-apps/pom.xml b/dss-apps/pom.xml
index ba57e2bca..af2b93ec0 100644
--- a/dss-apps/pom.xml
+++ b/dss-apps/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.3.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-commons/dss-common/pom.xml b/dss-commons/dss-common/pom.xml
index 25c083351..b3e246b57 100644
--- a/dss-commons/dss-common/pom.xml
+++ b/dss-commons/dss-common/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <artifactId>dss-commons</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.3.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>dss-common</artifactId>
diff --git a/dss-commons/dss-contextservice/pom.xml b/dss-commons/dss-contextservice/pom.xml
index 609ca270d..06a92167c 100644
--- a/dss-commons/dss-contextservice/pom.xml
+++ b/dss-commons/dss-contextservice/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss-commons</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.3.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>dss-contextservice</artifactId>
diff --git a/dss-commons/dss-sender-service/pom.xml b/dss-commons/dss-sender-service/pom.xml
index 7da4725fe..fad485c11 100644
--- a/dss-commons/dss-sender-service/pom.xml
+++ b/dss-commons/dss-sender-service/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss-commons</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.3.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-commons/pom.xml b/dss-commons/pom.xml
index a80e4fba5..38bf27bea 100644
--- a/dss-commons/pom.xml
+++ b/dss-commons/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.3.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-framework/dss-appconn-framework/pom.xml b/dss-framework/dss-appconn-framework/pom.xml
index bfb9babb3..3deeed99d 100644
--- a/dss-framework/dss-appconn-framework/pom.xml
+++ b/dss-framework/dss-appconn-framework/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.3.1-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-framework/dss-framework-admin-service/pom.xml b/dss-framework/dss-framework-admin-service/pom.xml
index a28b224d0..5cf8a2757 100644
--- a/dss-framework/dss-framework-admin-service/pom.xml
+++ b/dss-framework/dss-framework-admin-service/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.3.1-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/dss-framework/dss-framework-common/pom.xml b/dss-framework/dss-framework-common/pom.xml
index 1fa4aed33..0d513149d 100644
--- a/dss-framework/dss-framework-common/pom.xml
+++ b/dss-framework/dss-framework-common/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.3.1-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-framework/dss-framework-orchestrator-server/pom.xml b/dss-framework/dss-framework-orchestrator-server/pom.xml
index cbc2b1fc1..5b9f2b2e7 100644
--- a/dss-framework/dss-framework-orchestrator-server/pom.xml
+++ b/dss-framework/dss-framework-orchestrator-server/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.3.1-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-framework/dss-framework-project-server/pom.xml b/dss-framework/dss-framework-project-server/pom.xml
index ec328f17c..3962f7751 100644
--- a/dss-framework/dss-framework-project-server/pom.xml
+++ b/dss-framework/dss-framework-project-server/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.3.1-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-framework/dss-framework-proxy-user-service/pom.xml b/dss-framework/dss-framework-proxy-user-service/pom.xml
index 15b287af3..81a5a20c3 100644
--- a/dss-framework/dss-framework-proxy-user-service/pom.xml
+++ b/dss-framework/dss-framework-proxy-user-service/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>dss-framework</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.3.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/dss-framework/dss-framework-workspace-server/pom.xml b/dss-framework/dss-framework-workspace-server/pom.xml
index 4fad67608..ebd7e7fda 100644
--- a/dss-framework/dss-framework-workspace-server/pom.xml
+++ b/dss-framework/dss-framework-workspace-server/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.3.1-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-framework/framework-plugins/dss-framework-migrate-server/pom.xml b/dss-framework/framework-plugins/dss-framework-migrate-server/pom.xml
index 748dd085e..1e043cea2 100644
--- a/dss-framework/framework-plugins/dss-framework-migrate-server/pom.xml
+++ b/dss-framework/framework-plugins/dss-framework-migrate-server/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.3.1-SNAPSHOT</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-framework/framework-plugins/dss-framework-orchestrator-publish/pom.xml b/dss-framework/framework-plugins/dss-framework-orchestrator-publish/pom.xml
index 870d2aeb7..8a2f45d34 100644
--- a/dss-framework/framework-plugins/dss-framework-orchestrator-publish/pom.xml
+++ b/dss-framework/framework-plugins/dss-framework-orchestrator-publish/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.3.1-SNAPSHOT</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-framework/pom.xml b/dss-framework/pom.xml
index ccf70b32c..461bde4f4 100644
--- a/dss-framework/pom.xml
+++ b/dss-framework/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.3.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-orchestrator/dss-orchestrator-common/pom.xml b/dss-orchestrator/dss-orchestrator-common/pom.xml
index 0a1cc58e8..db1849cc8 100644
--- a/dss-orchestrator/dss-orchestrator-common/pom.xml
+++ b/dss-orchestrator/dss-orchestrator-common/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.3.1-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-orchestrator/dss-orchestrator-conversion-standard/pom.xml b/dss-orchestrator/dss-orchestrator-conversion-standard/pom.xml
index 03b599b76..0798c184d 100644
--- a/dss-orchestrator/dss-orchestrator-conversion-standard/pom.xml
+++ b/dss-orchestrator/dss-orchestrator-conversion-standard/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <artifactId>dss-orchestrator</artifactId>
     <groupId>com.webank.wedatasphere.dss</groupId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.3.1-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
diff --git a/dss-orchestrator/dss-orchestrator-core/pom.xml b/dss-orchestrator/dss-orchestrator-core/pom.xml
index 0800a82b3..88a6382bc 100644
--- a/dss-orchestrator/dss-orchestrator-core/pom.xml
+++ b/dss-orchestrator/dss-orchestrator-core/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.3.1-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-orchestrator/dss-orchestrator-db/pom.xml b/dss-orchestrator/dss-orchestrator-db/pom.xml
index c08ab2c26..2cc240479 100644
--- a/dss-orchestrator/dss-orchestrator-db/pom.xml
+++ b/dss-orchestrator/dss-orchestrator-db/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.3.1-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-orchestrator/dss-orchestrator-loader/pom.xml b/dss-orchestrator/dss-orchestrator-loader/pom.xml
index def0b8abf..05abd7437 100644
--- a/dss-orchestrator/dss-orchestrator-loader/pom.xml
+++ b/dss-orchestrator/dss-orchestrator-loader/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.3.1-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-orchestrator/orchestrators/dss-workflow/dss-flow-execution-server/pom.xml b/dss-orchestrator/orchestrators/dss-workflow/dss-flow-execution-server/pom.xml
index 96b081036..65585491e 100644
--- a/dss-orchestrator/orchestrators/dss-workflow/dss-flow-execution-server/pom.xml
+++ b/dss-orchestrator/orchestrators/dss-workflow/dss-flow-execution-server/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.3.1-SNAPSHOT</version>
         <relativePath>../../../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-orchestrator/orchestrators/dss-workflow/dss-linkis-node-execution/pom.xml b/dss-orchestrator/orchestrators/dss-workflow/dss-linkis-node-execution/pom.xml
index 2ffc52852..552f9c373 100644
--- a/dss-orchestrator/orchestrators/dss-workflow/dss-linkis-node-execution/pom.xml
+++ b/dss-orchestrator/orchestrators/dss-workflow/dss-linkis-node-execution/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.3.1-SNAPSHOT</version>
         <relativePath>../../../../pom.xml</relativePath>
     </parent>
     
diff --git a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-common/pom.xml b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-common/pom.xml
index cd49c91df..9324ac8ec 100644
--- a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-common/pom.xml
+++ b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-common/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.3.1-SNAPSHOT</version>
         <relativePath>../../../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-conversion-standard/pom.xml b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-conversion-standard/pom.xml
index 8c42962f9..2b37c7feb 100644
--- a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-conversion-standard/pom.xml
+++ b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-conversion-standard/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <artifactId>dss-workflow</artifactId>
     <groupId>com.webank.wedatasphere.dss</groupId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.3.1-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
diff --git a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-sdk/pom.xml b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-sdk/pom.xml
index 0e0cab938..68256a7b2 100644
--- a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-sdk/pom.xml
+++ b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-sdk/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss-workflow</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.3.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/pom.xml b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/pom.xml
index e13d9ea48..26ea7412c 100644
--- a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/pom.xml
+++ b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.3.1-SNAPSHOT</version>
         <relativePath>../../../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-orchestrator/orchestrators/dss-workflow/pom.xml b/dss-orchestrator/orchestrators/dss-workflow/pom.xml
index 6c2c41c59..875ea161a 100644
--- a/dss-orchestrator/orchestrators/dss-workflow/pom.xml
+++ b/dss-orchestrator/orchestrators/dss-workflow/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.3.1-SNAPSHOT</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-orchestrator/pom.xml b/dss-orchestrator/pom.xml
index d382731d5..5d3f03b98 100644
--- a/dss-orchestrator/pom.xml
+++ b/dss-orchestrator/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.3.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-server/pom.xml b/dss-server/pom.xml
index fd3087ebd..faac9511c 100644
--- a/dss-server/pom.xml
+++ b/dss-server/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.3.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/dss-standard/development-standard/development-process-standard-execution/pom.xml b/dss-standard/development-standard/development-process-standard-execution/pom.xml
index bdbdc445c..85563c512 100644
--- a/dss-standard/development-standard/development-process-standard-execution/pom.xml
+++ b/dss-standard/development-standard/development-process-standard-execution/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <artifactId>dss</artifactId>
     <groupId>com.webank.wedatasphere.dss</groupId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.3.1-SNAPSHOT</version>
     <relativePath>../../../pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
diff --git a/dss-standard/development-standard/development-process-standard/pom.xml b/dss-standard/development-standard/development-process-standard/pom.xml
index e1d9fc919..f03915c0c 100644
--- a/dss-standard/development-standard/development-process-standard/pom.xml
+++ b/dss-standard/development-standard/development-process-standard/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <artifactId>dss</artifactId>
     <groupId>com.webank.wedatasphere.dss</groupId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.3.1-SNAPSHOT</version>
     <relativePath>../../../pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
diff --git a/dss-standard/dss-standard-common/pom.xml b/dss-standard/dss-standard-common/pom.xml
index d38704d2d..4b2e05752 100644
--- a/dss-standard/dss-standard-common/pom.xml
+++ b/dss-standard/dss-standard-common/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <artifactId>dss</artifactId>
     <groupId>com.webank.wedatasphere.dss</groupId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.3.1-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
diff --git a/dss-standard/pom.xml b/dss-standard/pom.xml
index 4d9c40b2f..79b043e3a 100644
--- a/dss-standard/pom.xml
+++ b/dss-standard/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <artifactId>dss</artifactId>
     <groupId>com.webank.wedatasphere.dss</groupId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.3.1-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
diff --git a/dss-standard/sso-standard/origin-sso-integration-standard/pom.xml b/dss-standard/sso-standard/origin-sso-integration-standard/pom.xml
index b1de51004..109565485 100644
--- a/dss-standard/sso-standard/origin-sso-integration-standard/pom.xml
+++ b/dss-standard/sso-standard/origin-sso-integration-standard/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <artifactId>dss</artifactId>
     <groupId>com.webank.wedatasphere.dss</groupId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.3.1-SNAPSHOT</version>
     <relativePath>../../../pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
diff --git a/dss-standard/sso-standard/spring-origin-sso-integration-plugin/pom.xml b/dss-standard/sso-standard/spring-origin-sso-integration-plugin/pom.xml
index 59a80b2b0..2997aa0a8 100644
--- a/dss-standard/sso-standard/spring-origin-sso-integration-plugin/pom.xml
+++ b/dss-standard/sso-standard/spring-origin-sso-integration-plugin/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <artifactId>dss</artifactId>
     <groupId>com.webank.wedatasphere.dss</groupId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.3.1-SNAPSHOT</version>
     <relativePath>../../../pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
diff --git a/dss-standard/sso-standard/sso-integration-standard/pom.xml b/dss-standard/sso-standard/sso-integration-standard/pom.xml
index f2d1da996..d3dd0469b 100644
--- a/dss-standard/sso-standard/sso-integration-standard/pom.xml
+++ b/dss-standard/sso-standard/sso-integration-standard/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <artifactId>dss</artifactId>
     <groupId>com.webank.wedatasphere.dss</groupId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.3.1-SNAPSHOT</version>
     <relativePath>../../../pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
diff --git a/dss-standard/structure-standard/dss-project-plugin/pom.xml b/dss-standard/structure-standard/dss-project-plugin/pom.xml
index 70fd9bbaf..aa09b0798 100644
--- a/dss-standard/structure-standard/dss-project-plugin/pom.xml
+++ b/dss-standard/structure-standard/dss-project-plugin/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <artifactId>dss</artifactId>
     <groupId>com.webank.wedatasphere.dss</groupId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.3.1-SNAPSHOT</version>
     <relativePath>../../../pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
diff --git a/dss-standard/structure-standard/dss-role-plugin/pom.xml b/dss-standard/structure-standard/dss-role-plugin/pom.xml
index e89f24515..482d17af4 100644
--- a/dss-standard/structure-standard/dss-role-plugin/pom.xml
+++ b/dss-standard/structure-standard/dss-role-plugin/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <artifactId>dss</artifactId>
     <groupId>com.webank.wedatasphere.dss</groupId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.3.1-SNAPSHOT</version>
     <relativePath>../../../pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
diff --git a/dss-standard/structure-standard/dss-structure-integration-standard/pom.xml b/dss-standard/structure-standard/dss-structure-integration-standard/pom.xml
index a77589b06..3e51b51f5 100644
--- a/dss-standard/structure-standard/dss-structure-integration-standard/pom.xml
+++ b/dss-standard/structure-standard/dss-structure-integration-standard/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <artifactId>dss</artifactId>
     <groupId>com.webank.wedatasphere.dss</groupId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.3.1-SNAPSHOT</version>
     <relativePath>../../../pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
diff --git a/dss-standard/structure-standard/spring-origin-dss-project-plugin/pom.xml b/dss-standard/structure-standard/spring-origin-dss-project-plugin/pom.xml
index add113d17..34a4e78ae 100644
--- a/dss-standard/structure-standard/spring-origin-dss-project-plugin/pom.xml
+++ b/dss-standard/structure-standard/spring-origin-dss-project-plugin/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <artifactId>dss</artifactId>
     <groupId>com.webank.wedatasphere.dss</groupId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.3.1-SNAPSHOT</version>
     <relativePath>../../../pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
diff --git a/plugins/azkaban/linkis-jobtype/pom.xml b/plugins/azkaban/linkis-jobtype/pom.xml
index 4f315b1d5..ab4191634 100644
--- a/plugins/azkaban/linkis-jobtype/pom.xml
+++ b/plugins/azkaban/linkis-jobtype/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.3.1-SNAPSHOT</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
     <artifactId>linkis-jobtype</artifactId>
diff --git a/plugins/dolphinscheduler/dolphinscheduler-prod-metrics/pom.xml b/plugins/dolphinscheduler/dolphinscheduler-prod-metrics/pom.xml
index 7ba8ad2ba..a0337147f 100644
--- a/plugins/dolphinscheduler/dolphinscheduler-prod-metrics/pom.xml
+++ b/plugins/dolphinscheduler/dolphinscheduler-prod-metrics/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <artifactId>dss-plugin-dolphinscheduler</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.3.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/plugins/dolphinscheduler/dss-dolphinscheduler-client/pom.xml b/plugins/dolphinscheduler/dss-dolphinscheduler-client/pom.xml
index 86efe3cc3..f0911192d 100644
--- a/plugins/dolphinscheduler/dss-dolphinscheduler-client/pom.xml
+++ b/plugins/dolphinscheduler/dss-dolphinscheduler-client/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <artifactId>dss-plugin-dolphinscheduler</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.3.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/plugins/dolphinscheduler/dss-dolphinscheduler-token/pom.xml b/plugins/dolphinscheduler/dss-dolphinscheduler-token/pom.xml
index 8d01963a3..0b0cc4265 100644
--- a/plugins/dolphinscheduler/dss-dolphinscheduler-token/pom.xml
+++ b/plugins/dolphinscheduler/dss-dolphinscheduler-token/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <artifactId>dss-plugin-dolphinscheduler</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.3.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/plugins/dolphinscheduler/pom.xml b/plugins/dolphinscheduler/pom.xml
index b9e7d6c4d..b0f76aac2 100644
--- a/plugins/dolphinscheduler/pom.xml
+++ b/plugins/dolphinscheduler/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <artifactId>dss</artifactId>
     <groupId>com.webank.wedatasphere.dss</groupId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.3.1-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
diff --git a/plugins/linkis/dss-gateway-support/pom.xml b/plugins/linkis/dss-gateway-support/pom.xml
index a1a55c5e2..0d2471106 100644
--- a/plugins/linkis/dss-gateway-support/pom.xml
+++ b/plugins/linkis/dss-gateway-support/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.3.1-SNAPSHOT</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/pom.xml b/pom.xml
index 3df428933..91ea4afe2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
     <packaging>pom</packaging>
     <groupId>com.webank.wedatasphere.dss</groupId>
     <artifactId>dss</artifactId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.3.1-SNAPSHOT</version>
 
     <modules>
         <module>dss-commons</module>
@@ -40,7 +40,7 @@
     </modules>
 
     <properties>
-        <dss.version>1.3.0-SNAPSHOT</dss.version>
+        <dss.version>1.3.1-SNAPSHOT</dss.version>
         <linkis.version>1.3.0-wds-SNAPSHOT</linkis.version>
         <scala.version>2.11.12</scala.version>
         <jdk.compile.version>1.8</jdk.compile.version>

From 87dda8b3ea5bd9799f40da7084adfb96a384cae9 Mon Sep 17 00:00:00 2001
From: qweqnotallow <747839893@qq.com>
Date: Sat, 11 May 2024 11:34:50 +0800
Subject: [PATCH 119/302] git server fix : removeDir

---
 .../com/webank/wedatasphere/dss/git/utils/FileUtils.java     | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/utils/FileUtils.java b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/utils/FileUtils.java
index 20da0500f..466834d5b 100644
--- a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/utils/FileUtils.java
+++ b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/utils/FileUtils.java
@@ -71,6 +71,11 @@ public static void addDirectory (String directory) {
 
     public static void removeDirectory (String removeDirectoryPath) {
         try {
+            File file = new File(removeDirectoryPath);
+            if (!file.exists()) {
+                logger.info("file {} not exist", removeDirectoryPath);
+                return;
+            }
             Path dirToBeDeleted = Paths.get(removeDirectoryPath);
             // 使用Files.walk收集所有路径，然后按照逆序排序，确保文件/子文件夹在其父文件夹之前被删除
             Files.walk(dirToBeDeleted)

From f4e2543ec2a7230293a934575650b59776fb1939 Mon Sep 17 00:00:00 2001
From: qweqnotallow <747839893@qq.com>
Date: Sat, 11 May 2024 11:39:17 +0800
Subject: [PATCH 120/302] dss server fix : createProject add associateGit

---
 .../framework/project/service/impl/DSSProjectServiceImpl.java    | 1 +
 1 file changed, 1 insertion(+)

diff --git a/dss-framework/dss-framework-project-server/src/main/java/com/webank/wedatasphere/dss/framework/project/service/impl/DSSProjectServiceImpl.java b/dss-framework/dss-framework-project-server/src/main/java/com/webank/wedatasphere/dss/framework/project/service/impl/DSSProjectServiceImpl.java
index f55d0a3ee..2313a6315 100644
--- a/dss-framework/dss-framework-project-server/src/main/java/com/webank/wedatasphere/dss/framework/project/service/impl/DSSProjectServiceImpl.java
+++ b/dss-framework/dss-framework-project-server/src/main/java/com/webank/wedatasphere/dss/framework/project/service/impl/DSSProjectServiceImpl.java
@@ -130,6 +130,7 @@ public DSSProjectDO createProject(String username, ProjectCreateRequest projectC
         project.setUpdateTime(new Date());
         project.setDescription(projectCreateRequest.getDescription());
         project.setApplicationArea(projectCreateRequest.getApplicationArea());
+        project.setAssociateGit(projectCreateRequest.getAssociateGit());
         //开发流程，编排模式组拼接 前后进行英文逗号接口
         project.setDevProcess(ProjectStringUtils.getModeStr(projectCreateRequest.getDevProcessList()));
         project.setOrchestratorMode(ProjectStringUtils.getModeStr(projectCreateRequest.getOrchestratorModeList()));

From 9f04e4669a8b7acb3f1b8a8ec6dcfa30bec564be Mon Sep 17 00:00:00 2001
From: qweqnotallow <747839893@qq.com>
Date: Sat, 11 May 2024 11:44:01 +0800
Subject: [PATCH 121/302] dss server fix : modifyProject add associateGit

---
 .../framework/project/service/impl/DSSProjectServiceImpl.java    | 1 +
 1 file changed, 1 insertion(+)

diff --git a/dss-framework/dss-framework-project-server/src/main/java/com/webank/wedatasphere/dss/framework/project/service/impl/DSSProjectServiceImpl.java b/dss-framework/dss-framework-project-server/src/main/java/com/webank/wedatasphere/dss/framework/project/service/impl/DSSProjectServiceImpl.java
index 2313a6315..b5291e33a 100644
--- a/dss-framework/dss-framework-project-server/src/main/java/com/webank/wedatasphere/dss/framework/project/service/impl/DSSProjectServiceImpl.java
+++ b/dss-framework/dss-framework-project-server/src/main/java/com/webank/wedatasphere/dss/framework/project/service/impl/DSSProjectServiceImpl.java
@@ -155,6 +155,7 @@ public DSSProjectDO modifyProject(String username, ProjectModifyRequest projectM
         project.setOrchestratorMode(ProjectStringUtils.getModeStr(projectModifyRequest.getOrchestratorModeList()));
         project.setBusiness(projectModifyRequest.getBusiness());
         project.setProduct(projectModifyRequest.getProduct());
+        project.setAssociateGit(projectModifyRequest.getAssociateGit());
 
         UpdateWrapper<DSSProjectDO> updateWrapper = new UpdateWrapper<>();
         updateWrapper.eq("id", projectModifyRequest.getId());

From 9de827137ee29ed1c6f926bb52d87f946f087ed9 Mon Sep 17 00:00:00 2001
From: qweqnotallow <747839893@qq.com>
Date: Sat, 11 May 2024 15:16:03 +0800
Subject: [PATCH 122/302] dss server fix : submit status sql fix

---
 .../dss/orchestrator/db/dao/impl/orchestratorMapper.xml     | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/dss-orchestrator/dss-orchestrator-db/src/main/java/com/webank/wedatasphere/dss/orchestrator/db/dao/impl/orchestratorMapper.xml b/dss-orchestrator/dss-orchestrator-db/src/main/java/com/webank/wedatasphere/dss/orchestrator/db/dao/impl/orchestratorMapper.xml
index 705e8723b..3c588fbc5 100644
--- a/dss-orchestrator/dss-orchestrator-db/src/main/java/com/webank/wedatasphere/dss/orchestrator/db/dao/impl/orchestratorMapper.xml
+++ b/dss-orchestrator/dss-orchestrator-db/src/main/java/com/webank/wedatasphere/dss/orchestrator/db/dao/impl/orchestratorMapper.xml
@@ -278,7 +278,7 @@
     </update>
 
     <update id="updateOrchestratorStatus">
-        update dss_orchestrator
+        update dss_orchestrator_info
         <set>
             `status` = #{status}
         </set>
@@ -286,11 +286,11 @@
     </update>
 
     <select id="selectOrchestratorStatus" resultType="java.lang.String">
-        select `status` from dss_orchestrator where `id` = #{id}
+        select `status` from dss_orchestrator_info where `id` = #{id}
     </select>
 
     <select id="selectOrchestratorByStatus" resultType="java.lang.Long">
-        select id from dss_orchestrator where `status` = #{status}
+        select id from dss_orchestrator_info where `status` = #{status}
     </select>
 
     <insert id="insertOrchestratorSubmitJob" parameterType="com.webank.wedatasphere.dss.orchestrator.common.entity.OrchestratorSubmitJob">

From dee362c0e3bf62c75d63a3de641a03629bf55c12 Mon Sep 17 00:00:00 2001
From: qweqnotallow <747839893@qq.com>
Date: Sat, 11 May 2024 17:13:43 +0800
Subject: [PATCH 123/302] git server search : add target
 pattern(.metaConf/.properties)

---
 .../protocol/config/GitServerConfig.java      |  4 ++
 .../DSSGitWorkflowManagerServiceImpl.java     | 40 ++++++++++++++++++-
 2 files changed, 42 insertions(+), 2 deletions(-)

diff --git a/dss-git/dss-git-common/src/main/java/com.webank.wedatasphere.dss.git.common/protocol/config/GitServerConfig.java b/dss-git/dss-git-common/src/main/java/com.webank.wedatasphere.dss.git.common/protocol/config/GitServerConfig.java
index 7f401c398..3d3706f1e 100644
--- a/dss-git/dss-git-common/src/main/java/com.webank.wedatasphere.dss.git.common/protocol/config/GitServerConfig.java
+++ b/dss-git/dss-git-common/src/main/java/com.webank.wedatasphere.dss.git.common/protocol/config/GitServerConfig.java
@@ -19,4 +19,8 @@ public class GitServerConfig {
     public static final CommonVars<String> GIT_PASSWD = CommonVars.apply("wds.dss.server.git.password", "user_password");
     public static final CommonVars<String> GIT_SUBMIT = CommonVars.apply("wds.dss.server.git.submit", "input[class='btn btn-success qa-sign-in-button']");
     public static final CommonVars<String> GIT_TIME = CommonVars.apply("wds.dss.server.git.time", "1");
+
+    public static final CommonVars<String> GIT_SEARCH_EXCLUDE_DIRECTORY = CommonVars.apply("wds.dss.server.git.search.exclude.dir", ".metaConf");
+
+    public static final CommonVars<String> GIT_SEARCH_EXCLUDE_FILE = CommonVars.apply("wds.dss.server.git.search.exclude.file", ".properties");
 }
diff --git a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitWorkflowManagerServiceImpl.java b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitWorkflowManagerServiceImpl.java
index b63f87717..162e60e6e 100644
--- a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitWorkflowManagerServiceImpl.java
+++ b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitWorkflowManagerServiceImpl.java
@@ -172,6 +172,37 @@ public GitSearchResponse search(GitSearchRequest request) {
         if (CollectionUtils.isEmpty(fileList)) {
             return new GitSearchResponse(result, 0);
         }
+
+        String excludeDirectory = GitServerConfig.GIT_SEARCH_EXCLUDE_DIRECTORY.getValue();
+        String excludeFile = GitServerConfig.GIT_SEARCH_EXCLUDE_FILE.getValue();
+
+        List<String> excludeDirList = StringUtils.isEmpty(excludeDirectory)? new ArrayList<>() : Arrays.asList(excludeDirectory.split(","));
+        List<String> excludeFileList = StringUtils.isEmpty(excludeFile)? new ArrayList<>() : Arrays.asList(excludeFile.split(","));
+
+        Set<String> excludeResult = new HashSet<>();
+        for (String file : fileList) {
+            //排除指定文件夹下的内容
+            for (String excludeDir : excludeDirList) {
+                if (file.startsWith(excludeDir)) {
+                    excludeResult.add(file);
+                    break;
+                }
+            }
+            // 排除指定文件下的内容
+            for (String exclude : excludeFileList) {
+                if (file.endsWith("/" + exclude)) {
+                    excludeResult.add(file);
+                }
+            }
+        }
+
+        if (!CollectionUtils.isEmpty(excludeResult)) {
+            fileList.removeAll(excludeResult);
+            if (CollectionUtils.isEmpty(fileList)) {
+                return new GitSearchResponse(result, 0);
+            }
+        }
+
         int start = (request.getPageNow()-1) * request.getPageSize();
         int end = Math.min((start + request.getPageSize()), fileList.size());
         if (request.getPageNow() < 0 || start >= fileList.size()) {
@@ -179,7 +210,7 @@ public GitSearchResponse search(GitSearchRequest request) {
             return new GitSearchResponse(result, 0);
         }
         // subList 截断的List及子集 不允许List变更
-        final List<String> subList = fileList.subList(start, end);
+        List<String> subList = new ArrayList<>(fileList.subList(start, end));
         List<String> filePathList = new ArrayList<>();
         for (String file : subList) {
             filePathList.add("/" + FileUtils.normalizePath(GitServerConfig.GIT_SERVER_PATH.getValue())+ "/" + request.getProjectName() + "/" + file);
@@ -199,7 +230,12 @@ public GitSearchResponse search(GitSearchRequest request) {
 
             // subList 截断的List及子集 不允许List变更
             final List<String> searchResult = process(gitSearchCommand);
-            final List<String> subSearchResult = searchResult.size() > GitServerConfig.GIT_SEARCH_RESULT_LIMIT.getValue()? searchResult.subList(0, GitServerConfig.GIT_SEARCH_RESULT_LIMIT.getValue()) : searchResult;
+            List<String> subSearchResult = null;
+            if (searchResult.size() > GitServerConfig.GIT_SEARCH_RESULT_LIMIT.getValue()) {
+                subSearchResult = new ArrayList<>(searchResult.subList(0, GitServerConfig.GIT_SEARCH_RESULT_LIMIT.getValue()));
+            } else {
+                subSearchResult = searchResult;
+            }
 
             result.add(new GitSearchResult(file, subSearchResult));
         }

From 9dceb87b2993dfad3f3768c1051a93ec9d9c8178 Mon Sep 17 00:00:00 2001
From: qweqnotallow <747839893@qq.com>
Date: Sat, 11 May 2024 18:00:03 +0800
Subject: [PATCH 124/302] git server: sql fix

---
 .../wedatasphere/dss/workflow/dao/impl/lockMapper.xml       | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/dao/impl/lockMapper.xml b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/dao/impl/lockMapper.xml
index 4091f2dea..727424854 100644
--- a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/dao/impl/lockMapper.xml
+++ b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/dao/impl/lockMapper.xml
@@ -88,7 +88,7 @@
     </insert>
 
     <update id="updateOrchestratorStatus">
-        update dss_orchestrator
+        update dss_orchestrator_info
         <set>
             `status` = #{status}
         </set>
@@ -96,11 +96,11 @@
     </update>
 
     <select id="selectOrchestratorStatus" resultType="java.lang.String">
-        select `status` from dss_orchestrator where `id` = #{id}
+        select `status` from dss_orchestrator_info where `id` = #{id}
     </select>
 
     <select id="selectOrchestratorByStatus" resultType="java.lang.Long">
-        select id from dss_orchestrator where `status` = #{status}
+        select id from dss_orchestrator_info where `status` = #{status}
     </select>
 
     <update id="updateOrchestratorVersionCommitId">

From 7862b385b07680b0151c3af9d5c56d3cfd651f94 Mon Sep 17 00:00:00 2001
From: qweqnotallow <747839893@qq.com>
Date: Mon, 13 May 2024 16:13:58 +0800
Subject: [PATCH 125/302] dss server fix: sql

---
 .../DSSFrameworkOrchestratorRestful.java      |  2 +-
 .../impl/OrchestratorPluginServiceImpl.java   | 32 +++++++++----------
 .../db/dao/OrchestratorMapper.java            |  2 +-
 .../db/dao/impl/orchestratorMapper.xml        | 10 +++---
 .../dss/workflow/dao/LockMapper.java          |  2 +-
 5 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/restful/DSSFrameworkOrchestratorRestful.java b/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/restful/DSSFrameworkOrchestratorRestful.java
index 8545b23a4..521b5cc2d 100644
--- a/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/restful/DSSFrameworkOrchestratorRestful.java
+++ b/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/restful/DSSFrameworkOrchestratorRestful.java
@@ -380,7 +380,7 @@ public Message submitFlow(@RequestParam Long orchestratorId) {
 
         String orchestratorStatus = orchestratorFrameworkService.getOrchestratorStatus(orchestratorId);
 
-        return Message.ok();
+        return Message.ok().data("status", orchestratorStatus);
     }
 
     @RequestMapping(value = "publish/history", method = RequestMethod.GET)
diff --git a/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/impl/OrchestratorPluginServiceImpl.java b/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/impl/OrchestratorPluginServiceImpl.java
index 94201d270..21e3503ff 100644
--- a/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/impl/OrchestratorPluginServiceImpl.java
+++ b/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/impl/OrchestratorPluginServiceImpl.java
@@ -215,23 +215,23 @@ public void submitFlow(OrchestratorSubmitRequest flowRequest, String username, W
         releaseThreadPool.submit(() ->{
             //1. 异步提交，更新提交状态
             Long orchestratorId = flowRequest.getOrchestratorId();
-            OrchestratorSubmitJob orchestratorSubmitJob = orchestratorMapper.selectSubmitJobStatus(orchestratorId);
-            if (orchestratorSubmitJob == null) {
-                OrchestratorSubmitJob submitJob = new OrchestratorSubmitJob();
-                submitJob.setOrchestratorId(orchestratorId);
-                submitJob.setInstanceName(Sender.getThisInstance());
-                submitJob.setStatus(OrchestratorRefConstant.FLOW_STATUS_PUSHING);
-                orchestratorMapper.insertOrchestratorSubmitJobStatus(submitJob);
-            } else {
-                orchestratorMapper.updateOrchestratorSubmitJobStatus(orchestratorId, OrchestratorRefConstant.FLOW_STATUS_PUSHING, "");
-            }
-            //2. 获取编排信息
-            DSSOrchestratorInfo orchestrator = orchestratorMapper.getOrchestrator(orchestratorId);
-            //3. 获取上传工作流信息
-            BmlResource bmlResource = uploadWorkflowToGit(flowRequest, username, workspace, orchestrator);
-            // todo 3. diff（第一步补充后，使用去掉第三方节点的zip包上传到bml，替换下方的BML）
-            //4. 调用git服务上传
             try {
+                OrchestratorSubmitJob orchestratorSubmitJob = orchestratorMapper.selectSubmitJobStatus(orchestratorId);
+                if (orchestratorSubmitJob == null) {
+                    OrchestratorSubmitJob submitJob = new OrchestratorSubmitJob();
+                    submitJob.setOrchestratorId(orchestratorId);
+                    submitJob.setInstanceName(Sender.getThisInstance());
+                    submitJob.setStatus(OrchestratorRefConstant.FLOW_STATUS_PUSHING);
+                    orchestratorMapper.insertOrchestratorSubmitJob(submitJob);
+                } else {
+                    orchestratorMapper.updateOrchestratorSubmitJobStatus(orchestratorId, OrchestratorRefConstant.FLOW_STATUS_PUSHING, "");
+                }
+                //2. 获取编排信息
+                DSSOrchestratorInfo orchestrator = orchestratorMapper.getOrchestrator(orchestratorId);
+                //3. 获取上传工作流信息
+                BmlResource bmlResource = uploadWorkflowToGit(flowRequest, username, workspace, orchestrator);
+                // todo 3. diff（第一步补充后，使用去掉第三方节点的zip包上传到bml，替换下方的BML）
+                //4. 调用git服务上传
                 GitCommitResponse commit = push(orchestrator.getName(), bmlResource, username, workspace.getWorkspaceId(), flowRequest.getProjectName(), flowRequest.getComment());
                 if (commit == null) {
                     LOGGER.info("change is empty");
diff --git a/dss-orchestrator/dss-orchestrator-db/src/main/java/com/webank/wedatasphere/dss/orchestrator/db/dao/OrchestratorMapper.java b/dss-orchestrator/dss-orchestrator-db/src/main/java/com/webank/wedatasphere/dss/orchestrator/db/dao/OrchestratorMapper.java
index e65f44204..1e8d9d359 100644
--- a/dss-orchestrator/dss-orchestrator-db/src/main/java/com/webank/wedatasphere/dss/orchestrator/db/dao/OrchestratorMapper.java
+++ b/dss-orchestrator/dss-orchestrator-db/src/main/java/com/webank/wedatasphere/dss/orchestrator/db/dao/OrchestratorMapper.java
@@ -135,7 +135,7 @@ DSSOrchestratorVersion getOrcVersionByIdAndOrcVersionId(@Param("orchestratorId")
 
     void updateOrchestratorSubmitJobStatus(@Param("orchestratorId") Long orchestratorId, @Param("status") String status, @Param("errMsg") String errMsg);
 
-    void insertOrchestratorSubmitJobStatus(OrchestratorSubmitJob orchestratorSubmitJob);
+    void insertOrchestratorSubmitJob(OrchestratorSubmitJob orchestratorSubmitJob);
 
     OrchestratorSubmitJob selectSubmitJobStatus(@Param("orchestratorId") Long orchestratorId);
 
diff --git a/dss-orchestrator/dss-orchestrator-db/src/main/java/com/webank/wedatasphere/dss/orchestrator/db/dao/impl/orchestratorMapper.xml b/dss-orchestrator/dss-orchestrator-db/src/main/java/com/webank/wedatasphere/dss/orchestrator/db/dao/impl/orchestratorMapper.xml
index 3c588fbc5..4119d109f 100644
--- a/dss-orchestrator/dss-orchestrator-db/src/main/java/com/webank/wedatasphere/dss/orchestrator/db/dao/impl/orchestratorMapper.xml
+++ b/dss-orchestrator/dss-orchestrator-db/src/main/java/com/webank/wedatasphere/dss/orchestrator/db/dao/impl/orchestratorMapper.xml
@@ -290,24 +290,24 @@
     </select>
 
     <select id="selectOrchestratorByStatus" resultType="java.lang.Long">
-        select id from dss_orchestrator_info where `status` = #{status}
+        select `id` from dss_orchestrator_info where `status` = #{status}
     </select>
 
     <insert id="insertOrchestratorSubmitJob" parameterType="com.webank.wedatasphere.dss.orchestrator.common.entity.OrchestratorSubmitJob">
-        insert dss_orchestrator_submit_job_info into (orchestrator_id, create_time, update_time, instance_name, status) Values
+        insert into dss_orchestrator_submit_job_info (`orchestrator_id`, `create_time`, `update_time`, `instance_name`, `status`) values
         (#{orchestratorId}, Now(), Now(), #{instanceName}, #{status})
     </insert>
 
     <update id="updateOrchestratorSubmitJobStatus">
         update dss_orchestrator_submit_job_info
         <set>
-            error_msg = #{errMsg} ,update_time = Now() , status = #{status}
+            `error_msg` = #{errMsg} ,`update_time` = Now() , `status` = #{status}
         </set>
-        where orchestrator_id = #{orchestratorId}
+        where `orchestrator_id` = #{orchestratorId}
     </update>
 
     <select id="selectSubmitJobStatus" resultType="com.webank.wedatasphere.dss.orchestrator.common.entity.OrchestratorSubmitJob">
-        select id, orchestrator_id, create_time, update_time, instance_name, status, error_msg from dss_orchestrator_submit_job_info
+        select `id`, `orchestrator_id`, `create_time`, `update_time`, instance_name, status, error_msg from dss_orchestrator_submit_job_info
         where orchestrator_id = #{orchestratorId}
     </select>
 
diff --git a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/dao/LockMapper.java b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/dao/LockMapper.java
index baf751f22..33182b6f3 100644
--- a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/dao/LockMapper.java
+++ b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/dao/LockMapper.java
@@ -61,7 +61,7 @@ Boolean flowNotExistEditLock(@Param("flowID") Long flowID,
 
     List<String> selectOrchestratorByStatus( @Param("status") String status);
 
-    String selectOrchestratorStatus(@Param("flowID") Long flowID);
+    String selectOrchestratorStatus(@Param("id") Long id);
 
     void updateOrchestratorVersionCommitId(@Param("commitId")String commitId, @Param("workflowId")Long flowID);
 }

From fe18e8f3575c8700e1b6b72c69899c097cda65c0 Mon Sep 17 00:00:00 2001
From: v_xuanzhou <zhouxuannihao@qq.com>
Date: Mon, 13 May 2024 16:17:35 +0800
Subject: [PATCH 126/302] Modify mapper's * to fields

---
 .../db/dao/impl/orchestratorMapper.xml        | 33 +++++++++++++------
 1 file changed, 23 insertions(+), 10 deletions(-)

diff --git a/dss-orchestrator/dss-orchestrator-db/src/main/java/com/webank/wedatasphere/dss/orchestrator/db/dao/impl/orchestratorMapper.xml b/dss-orchestrator/dss-orchestrator-db/src/main/java/com/webank/wedatasphere/dss/orchestrator/db/dao/impl/orchestratorMapper.xml
index 44f46ea34..21a1d3feb 100644
--- a/dss-orchestrator/dss-orchestrator-db/src/main/java/com/webank/wedatasphere/dss/orchestrator/db/dao/impl/orchestratorMapper.xml
+++ b/dss-orchestrator/dss-orchestrator-db/src/main/java/com/webank/wedatasphere/dss/orchestrator/db/dao/impl/orchestratorMapper.xml
@@ -35,12 +35,16 @@
 
     <select id="getOrchestrator"
             resultType="com.webank.wedatasphere.dss.orchestrator.common.entity.DSSOrchestratorInfo">
-        SELECT * FROM `dss_orchestrator_info` WHERE id = #{id}
+        SELECT
+        <include refid="orchestrator_main"/>
+        FROM `dss_orchestrator_info` WHERE id = #{id}
     </select>
 
     <select id="getOrchestratorByUUID"
             resultType="com.webank.wedatasphere.dss.orchestrator.common.entity.DSSOrchestratorInfo">
-        SELECT * FROM `dss_orchestrator_info` WHERE uuid = #{uuid}
+        SELECT
+        <include refid="orchestrator_main"/>
+        FROM `dss_orchestrator_info` WHERE uuid = #{uuid}
     </select>
 
     <insert id="addOrchestrator" useGeneratedKeys="true" keyProperty="id"
@@ -105,7 +109,7 @@
     <select id="getLatestOrchestratorVersionById"
             resultType="com.webank.wedatasphere.dss.orchestrator.common.entity.DSSOrchestratorVersion">
         SELECT
-        *
+        <include refid="orchestrator_version"/>
         FROM
         `dss_orchestrator_version_info`
         WHERE
@@ -117,7 +121,7 @@
     <select id="getLatestOrchestratorVersionByIdAndValidFlag"
             resultType="com.webank.wedatasphere.dss.orchestrator.common.entity.DSSOrchestratorVersion">
         SELECT
-        *
+        <include refid="orchestrator_version"/>
         FROM
         `dss_orchestrator_version_info`
         WHERE
@@ -130,7 +134,7 @@
     <select id="getOrchestratorVersion"
             resultType="com.webank.wedatasphere.dss.orchestrator.common.entity.DSSOrchestratorVersion">
         SELECT
-        *
+        <include refid="orchestrator_version"/>
         FROM
         `dss_orchestrator_version_info`
         WHERE
@@ -156,7 +160,9 @@
 
     <select id="getVersionByOrchestratorId"
             resultType="com.webank.wedatasphere.dss.orchestrator.common.entity.DSSOrchestratorVersion">
-        SELECT * FROM dss_orchestrator_version_info
+        SELECT
+        <include refid="orchestrator_version"/>
+        FROM dss_orchestrator_version_info
         WHERE orchestrator_id = #{orchestratorId} and valid_flag = 1 and context_id != ''
         ORDER BY id DESC
     </select>
@@ -186,7 +192,9 @@
     </resultMap>
 
     <select id="getOrchestratorVersions" resultMap="orchestrator_version_info_result_map">
-        select * from `dss_orchestrator_version_info` where `project_id` = #{projectId} and `orchestrator_id` =
+        select
+        <include refid="orchestrator_version"/>
+        from `dss_orchestrator_version_info` where `project_id` = #{projectId} and `orchestrator_id` =
         #{orchestratorId} and valid_flag = 1
     </select>
 
@@ -202,7 +210,9 @@
 
 
     <select id="getVersionByOrchestratorIdAndVersion" resultMap="orchestrator_version_info_result_map">
-        SELECT * FROM dss_orchestrator_version_info
+        SELECT
+        <include refid="orchestrator_version"/>
+        FROM dss_orchestrator_version_info
         WHERE orchestrator_id = #{orchestratorId} and version = #{version} and valid_flag = 1
         ORDER BY app_id DESC limit 1
     </select>
@@ -215,7 +225,9 @@
 
     <select id="queryOrchestratorInfos" parameterType="java.util.Map"
             resultType="com.webank.wedatasphere.dss.orchestrator.common.entity.DSSOrchestratorInfo">
-        select * from dss_orchestrator_info
+        select
+        <include refid="orchestrator_main"/>
+        from dss_orchestrator_info
         <where>
             <if test="params.workspace_id != null">
                 workspace_id=#{params.workspace_id}
@@ -237,7 +249,8 @@
 
     <select id="getRefOrchestrationId"
             resultType="com.webank.wedatasphere.dss.orchestrator.common.entity.DSSOrchestratorRefOrchestration">
-        select *
+        select
+        <include refid="orchestrator_ref_orchestration"/>
         from dss_orchestrator_ref_orchestration_relation
         where orchestrator_id = #{orchestratorId}
     </select>

From 00389a9c77954faa9c33d642d4410678f1a50972 Mon Sep 17 00:00:00 2001
From: qweqnotallow <747839893@qq.com>
Date: Tue, 14 May 2024 09:35:24 +0800
Subject: [PATCH 127/302] git server : rename attr

---
 .../protocol/request/GitSearchRequest.java    | 30 +++++++++----------
 .../DSSGitWorkflowManagerServiceImpl.java     |  6 ++--
 2 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/dss-git/dss-git-common/src/main/java/com.webank.wedatasphere.dss.git.common/protocol/request/GitSearchRequest.java b/dss-git/dss-git-common/src/main/java/com.webank.wedatasphere.dss.git.common/protocol/request/GitSearchRequest.java
index 3859d78a4..818cfbd49 100644
--- a/dss-git/dss-git-common/src/main/java/com.webank.wedatasphere.dss.git.common/protocol/request/GitSearchRequest.java
+++ b/dss-git/dss-git-common/src/main/java/com.webank.wedatasphere.dss.git.common/protocol/request/GitSearchRequest.java
@@ -6,7 +6,7 @@ public class GitSearchRequest extends GitBaseRequest{
     /**
      * 搜索条件：工作流（相对路径）
      */
-    private List<String> path;
+    private List<String> workflowNameList;
     /**
      * 搜索条件：关键字
      */
@@ -14,11 +14,11 @@ public class GitSearchRequest extends GitBaseRequest{
     /**
      * 搜索条件：文件名
      */
-    private String fileName;
+    private String nodeName;
     /**
      * 搜索条件：节点类型（后缀）
      */
-    private List<String> type;
+    private List<String> typeList;
     private Integer pageSize;
     private Integer pageNow;
 
@@ -26,12 +26,12 @@ public GitSearchRequest() {
     }
 
 
-    public List<String> getPath() {
-        return path;
+    public List<String> getWorkflowNameList() {
+        return workflowNameList;
     }
 
-    public void setPath(List<String> path) {
-        this.path = path;
+    public void setWorkflowNameList(List<String> workflowNameList) {
+        this.workflowNameList = workflowNameList;
     }
 
     public String getSearchContent() {
@@ -42,20 +42,20 @@ public void setSearchContent(String searchContent) {
         this.searchContent = searchContent;
     }
 
-    public String getFileName() {
-        return fileName;
+    public String getNodeName() {
+        return nodeName;
     }
 
-    public void setFileName(String fileName) {
-        this.fileName = fileName;
+    public void setNodeName(String nodeName) {
+        this.nodeName = nodeName;
     }
 
-    public List<String> getType() {
-        return type;
+    public List<String> getTypeList() {
+        return typeList;
     }
 
-    public void setType(List<String> type) {
-        this.type = type;
+    public void setTypeList(List<String> typeList) {
+        this.typeList = typeList;
     }
 
 
diff --git a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitWorkflowManagerServiceImpl.java b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitWorkflowManagerServiceImpl.java
index 162e60e6e..0dc72109b 100644
--- a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitWorkflowManagerServiceImpl.java
+++ b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitWorkflowManagerServiceImpl.java
@@ -122,9 +122,9 @@ public GitSearchResponse search(GitSearchRequest request) {
         List<String> gitCommands = new ArrayList<>(Arrays.asList(
                 "git", "--git-dir=" + gitDir, "--work-tree=" + workTree, "grep", "-l", request.getSearchContent()
         ));
-        List<String> workflowNode = request.getPath();
-        String fileName = request.getFileName();
-        List<String> typeList = request.getType();
+        List<String> workflowNode = request.getWorkflowNameList();
+        String fileName = request.getNodeName();
+        List<String> typeList = request.getTypeList();
         List<String> path = new ArrayList<>();
         if (!CollectionUtils.isEmpty(workflowNode)) {
             if (!StringUtils.isEmpty(fileName)) {

From 63c6549001d8784ee8115c1c0100c63e75fae412 Mon Sep 17 00:00:00 2001
From: qweqnotallow <747839893@qq.com>
Date: Tue, 14 May 2024 09:57:37 +0800
Subject: [PATCH 128/302] git server : sql fix

---
 .../com/webank/wedatasphere/dss/workflow/dao/LockMapper.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/dao/LockMapper.java b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/dao/LockMapper.java
index 33182b6f3..f4c3fc4c7 100644
--- a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/dao/LockMapper.java
+++ b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/dao/LockMapper.java
@@ -57,7 +57,7 @@ Boolean flowNotExistEditLock(@Param("flowID") Long flowID,
 
     void insertFlowStatus(@Param("flowID") Long flowID, @Param("status") String status);
 
-    void updateOrchestratorStatus(@Param("flowID") Long flowID, @Param("status") String status);
+    void updateOrchestratorStatus(@Param("id") Long id, @Param("status") String status);
 
     List<String> selectOrchestratorByStatus( @Param("status") String status);
 

From 20602e32fe283d1099fba985ede00b2900babb79 Mon Sep 17 00:00:00 2001
From: qweqnotallow <747839893@qq.com>
Date: Tue, 14 May 2024 16:06:11 +0800
Subject: [PATCH 129/302] git server add : checkout and remove

---
 .../OrchestratorFrameworkServiceImpl.java     |  8 ++
 .../service/impl/OrchestratorServiceImpl.java | 27 +++++++
 .../protocol/request/GitRemoveRequest.java    | 26 ++++++-
 .../protocol/request/GitRevertRequest.java    | 20 +++--
 .../protocol/response/GitRemoveResponse.java  | 17 +++++
 .../protocol/response/GitRevertResponse.java  | 21 ++++++
 .../service/DSSGitWorkflowManagerService.java |  5 ++
 .../DSSGitWorkflowManagerServiceImpl.java     | 73 +++++++++++++++++++
 .../dss/git/utils/DSSGitUtils.java            | 18 ++---
 .../receiver/DSSGitChooser.scala              |  2 +
 .../receiver/DSSGitReceiver.scala             |  6 +-
 11 files changed, 206 insertions(+), 17 deletions(-)
 create mode 100644 dss-git/dss-git-common/src/main/java/com.webank.wedatasphere.dss.git.common/protocol/response/GitRemoveResponse.java
 create mode 100644 dss-git/dss-git-common/src/main/java/com.webank.wedatasphere.dss.git.common/protocol/response/GitRevertResponse.java

diff --git a/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/impl/OrchestratorFrameworkServiceImpl.java b/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/impl/OrchestratorFrameworkServiceImpl.java
index 6d031f06e..46ce24dfa 100644
--- a/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/impl/OrchestratorFrameworkServiceImpl.java
+++ b/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/impl/OrchestratorFrameworkServiceImpl.java
@@ -45,9 +45,11 @@
 import com.webank.wedatasphere.dss.git.common.protocol.request.GitCommitRequest;
 import com.webank.wedatasphere.dss.git.common.protocol.request.GitDiffRequest;
 import com.webank.wedatasphere.dss.git.common.protocol.request.GitHistoryRequest;
+import com.webank.wedatasphere.dss.git.common.protocol.request.GitRemoveRequest;
 import com.webank.wedatasphere.dss.git.common.protocol.response.GitCommitResponse;
 import com.webank.wedatasphere.dss.git.common.protocol.response.GitDiffResponse;
 import com.webank.wedatasphere.dss.git.common.protocol.response.GitHistoryResponse;
+import com.webank.wedatasphere.dss.git.common.protocol.response.GitRemoveResponse;
 import com.webank.wedatasphere.dss.orchestrator.common.entity.*;
 import com.webank.wedatasphere.dss.orchestrator.common.ref.OrchestratorRefConstant;
 import com.webank.wedatasphere.dss.orchestrator.core.DSSOrchestrator;
@@ -290,6 +292,12 @@ public CommonOrchestratorVo deleteOrchestrator(String username, OrchestratorDele
                     (structureOperation, structureRequestRef) -> ((OrchestrationDeletionOperation) structureOperation)
                             .deleteOrchestration((RefOrchestrationContentRequestRef) structureRequestRef), "delete");
         }
+        // git删除成功之后再删除库表记录
+        Sender sender = DSSSenderServiceFactory.getOrCreateServiceInstance().getGitSender();
+        List<String> path = new ArrayList<>();
+        path.add(orchestratorInfo.getName());
+        GitRemoveRequest removeRequest = new GitRemoveRequest(workspace.getWorkspaceId(), dssProject.getName(), path, username);
+        GitRemoveResponse gitRemoveResponse = RpcAskUtils.processAskException(sender.ask(removeRequest), GitRemoveResponse.class, GitRemoveRequest.class);
 
         orchestratorService.deleteOrchestrator(username, workspace, dssProject.getName(), orchestratorInfo.getId(), dssLabels);
         orchestratorOperateService.deleteTemplateOperate(orchestratorInfo.getId());
diff --git a/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/impl/OrchestratorServiceImpl.java b/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/impl/OrchestratorServiceImpl.java
index 8d8e028d1..5659c4a05 100644
--- a/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/impl/OrchestratorServiceImpl.java
+++ b/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/impl/OrchestratorServiceImpl.java
@@ -22,6 +22,7 @@
 import com.webank.wedatasphere.dss.common.label.DSSLabel;
 import com.webank.wedatasphere.dss.common.label.DSSLabelUtil;
 import com.webank.wedatasphere.dss.common.label.EnvDSSLabel;
+import com.webank.wedatasphere.dss.common.label.LabelRouteVO;
 import com.webank.wedatasphere.dss.common.protocol.project.ProjectUserAuthRequest;
 import com.webank.wedatasphere.dss.common.protocol.project.ProjectUserAuthResponse;
 import com.webank.wedatasphere.dss.common.utils.DSSExceptionUtils;
@@ -30,6 +31,9 @@
 import com.webank.wedatasphere.dss.contextservice.service.ContextService;
 import com.webank.wedatasphere.dss.framework.common.exception.DSSFrameworkErrorException;
 import com.webank.wedatasphere.dss.git.common.protocol.config.GitServerConfig;
+import com.webank.wedatasphere.dss.git.common.protocol.request.GitCommitRequest;
+import com.webank.wedatasphere.dss.git.common.protocol.request.GitRevertRequest;
+import com.webank.wedatasphere.dss.git.common.protocol.response.GitRevertResponse;
 import com.webank.wedatasphere.dss.git.common.protocol.util.UrlUtils;
 import com.webank.wedatasphere.dss.orchestrator.common.entity.DSSOrchestratorInfo;
 import com.webank.wedatasphere.dss.orchestrator.common.entity.DSSOrchestratorVersion;
@@ -49,8 +53,10 @@
 import com.webank.wedatasphere.dss.orchestrator.server.constant.DSSOrchestratorConstant;
 import com.webank.wedatasphere.dss.orchestrator.server.entity.request.OrchestratorModifyRequest;
 import com.webank.wedatasphere.dss.orchestrator.server.entity.request.OrchestratorRequest;
+import com.webank.wedatasphere.dss.orchestrator.server.entity.request.OrchestratorSubmitRequest;
 import com.webank.wedatasphere.dss.orchestrator.server.entity.vo.OrchestratorBaseInfo;
 import com.webank.wedatasphere.dss.orchestrator.server.entity.vo.OrchestratorUnlockVo;
+import com.webank.wedatasphere.dss.orchestrator.server.service.OrchestratorPluginService;
 import com.webank.wedatasphere.dss.orchestrator.server.service.OrchestratorService;
 import com.webank.wedatasphere.dss.sender.service.DSSSenderServiceFactory;
 import com.webank.wedatasphere.dss.standard.app.development.operation.*;
@@ -102,6 +108,8 @@ public class OrchestratorServiceImpl implements OrchestratorService {
     private ContextService contextService;
     @Autowired
     AddOrchestratorVersionHook addOrchestratorVersionHook;
+    @Autowired
+    private OrchestratorPluginService orchestratorPluginService;
 
     private static final int VALID_FLAG = 1;
 
@@ -362,6 +370,13 @@ public String rollbackOrchestrator(String userName, Long projectId, String proje
         List<DSSLabel> labels = new ArrayList<>();
         labels.add(dssLabel);
         DSSOrchestratorInfo dssOrchestratorInfo = orchestratorMapper.getOrchestrator(orchestratorId);
+        //git回滚
+        if (!StringUtils.isEmpty(oldOrcVersion.getCommitId())) {
+            Sender sender = DSSSenderServiceFactory.getOrCreateServiceInstance().getGitSender();
+            GitRevertRequest gitRevertRequest = new GitRevertRequest(workspace.getWorkspaceId(), projectName, oldOrcVersion.getCommitId(), dssOrchestratorInfo.getName(), userName);
+            GitRevertResponse gitRevertResponse = RpcAskUtils.processAskException(sender.ask(gitRevertRequest), GitRevertResponse.class, GitRevertRequest.class);
+        }
+
         String newVersion = OrchestratorUtils.increaseVersion(latestVersion);
         DSSOrchestratorVersion dssOrchestratorVersion = new DSSOrchestratorVersion();
         String comment = "回滚工作流到版本:" + version;
@@ -401,6 +416,18 @@ public String rollbackOrchestrator(String userName, Long projectId, String proje
         orchestratorMapper.addOrchestratorVersion(dssOrchestratorVersion);
         addOrchestratorVersionHook.afterAdd(dssOrchestratorVersion, Collections.singletonMap(OrchestratorRefConstant.ORCHESTRATION_FLOWID_PARAMCONF_TEMPLATEID_TUPLES_KEY,paramConfTemplateIds));
 //        synProjectOrchestratorVersionId(dssOrchestratorVersion, labels);
+
+        //若之前版本未进行git回滚，则自动提交回滚后的工作流至git
+        if (StringUtils.isEmpty(oldOrcVersion.getCommitId())) {
+            Sender sender = DSSSenderServiceFactory.getOrCreateServiceInstance().getGitSender();
+            OrchestratorSubmitRequest submitRequest = new OrchestratorSubmitRequest();
+            submitRequest.setFlowId(dssOrchestratorVersion.getAppId());
+            submitRequest.setOrchestratorId(dssOrchestratorVersion.getOrchestratorId());
+            submitRequest.setProjectName(projectName);
+            submitRequest.setComment("rollback workflow: " + dssOrchestratorInfo.getName());
+            orchestratorPluginService.submitFlow(submitRequest, userName, workspace);
+        }
+
         return dssOrchestratorVersion.getVersion();
     }
 
diff --git a/dss-git/dss-git-common/src/main/java/com.webank.wedatasphere.dss.git.common/protocol/request/GitRemoveRequest.java b/dss-git/dss-git-common/src/main/java/com.webank.wedatasphere.dss.git.common/protocol/request/GitRemoveRequest.java
index c2aabb529..c0ab56dd4 100644
--- a/dss-git/dss-git-common/src/main/java/com.webank.wedatasphere.dss.git.common/protocol/request/GitRemoveRequest.java
+++ b/dss-git/dss-git-common/src/main/java/com.webank.wedatasphere.dss.git.common/protocol/request/GitRemoveRequest.java
@@ -5,9 +5,33 @@
 public class GitRemoveRequest extends GitBaseRequest{
     private List<String> path;
 
-    public GitRemoveRequest(Long workspaceId, String projectName, List<String> path) {
+    public String getUsername() {
+        return username;
+    }
+
+    public void setUsername(String username) {
+        this.username = username;
+    }
+
+    private String username;
+
+
+    public GitRemoveRequest(List<String> path, String username) {
+        this.path = path;
+        this.username = username;
+    }
+
+    public GitRemoveRequest(Long workspaceId, String projectName, List<String> path, String username) {
         super(workspaceId, projectName);
         this.path = path;
+        this.username = username;
+    }
+
+    public GitRemoveRequest() {
+    }
+
+    public GitRemoveRequest(Long workspaceId, String projectName) {
+        super(workspaceId, projectName);
     }
 
     public List<String> getPath() {
diff --git a/dss-git/dss-git-common/src/main/java/com.webank.wedatasphere.dss.git.common/protocol/request/GitRevertRequest.java b/dss-git/dss-git-common/src/main/java/com.webank.wedatasphere.dss.git.common/protocol/request/GitRevertRequest.java
index 8602978c2..2b42b27f7 100644
--- a/dss-git/dss-git-common/src/main/java/com.webank.wedatasphere.dss.git.common/protocol/request/GitRevertRequest.java
+++ b/dss-git/dss-git-common/src/main/java/com.webank.wedatasphere.dss.git.common/protocol/request/GitRevertRequest.java
@@ -1,16 +1,26 @@
 package com.webank.wedatasphere.dss.git.common.protocol.request;
 
 
-import java.util.List;
 
 public class GitRevertRequest extends GitBaseRequest{
     private String commitId;
-    private List<String> path;
+    private String path;
 
-    public GitRevertRequest(Long workspaceId, String projectName, String commitId, List<String> path) {
+    public String getUsername() {
+        return username;
+    }
+
+    public void setUsername(String username) {
+        this.username = username;
+    }
+
+    private String username;
+
+    public GitRevertRequest(Long workspaceId, String projectName, String commitId, String path, String username) {
         super(workspaceId, projectName);
         this.commitId = commitId;
         this.path = path;
+        this.username = username;
     }
 
     public GitRevertRequest() {
@@ -24,11 +34,11 @@ public void setCommitId(String commitId) {
         this.commitId = commitId;
     }
 
-    public List<String> getPath() {
+    public String getPath() {
         return path;
     }
 
-    public void setPath(List<String> path) {
+    public void setPath(String path) {
         this.path = path;
     }
 }
diff --git a/dss-git/dss-git-common/src/main/java/com.webank.wedatasphere.dss.git.common/protocol/response/GitRemoveResponse.java b/dss-git/dss-git-common/src/main/java/com.webank.wedatasphere.dss.git.common/protocol/response/GitRemoveResponse.java
new file mode 100644
index 000000000..46624d977
--- /dev/null
+++ b/dss-git/dss-git-common/src/main/java/com.webank.wedatasphere.dss.git.common/protocol/response/GitRemoveResponse.java
@@ -0,0 +1,17 @@
+package com.webank.wedatasphere.dss.git.common.protocol.response;
+
+public class GitRemoveResponse {
+    private String commitId;
+
+    public GitRemoveResponse(String commitId) {
+        this.commitId = commitId;
+    }
+
+    public String getCommitId() {
+        return commitId;
+    }
+
+    public void setCommitId(String commitId) {
+        this.commitId = commitId;
+    }
+}
diff --git a/dss-git/dss-git-common/src/main/java/com.webank.wedatasphere.dss.git.common/protocol/response/GitRevertResponse.java b/dss-git/dss-git-common/src/main/java/com.webank.wedatasphere.dss.git.common/protocol/response/GitRevertResponse.java
new file mode 100644
index 000000000..a83a08925
--- /dev/null
+++ b/dss-git/dss-git-common/src/main/java/com.webank.wedatasphere.dss.git.common/protocol/response/GitRevertResponse.java
@@ -0,0 +1,21 @@
+package com.webank.wedatasphere.dss.git.common.protocol.response;
+
+
+public class GitRevertResponse {
+    private String commitId;
+
+    public GitRevertResponse(String commitId) {
+        this.commitId = commitId;
+    }
+
+    public GitRevertResponse() {
+    }
+
+    public String getCommitId() {
+        return commitId;
+    }
+
+    public void setCommitId(String commitId) {
+        this.commitId = commitId;
+    }
+}
diff --git a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/DSSGitWorkflowManagerService.java b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/DSSGitWorkflowManagerService.java
index 65e830383..8d447e6b3 100644
--- a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/DSSGitWorkflowManagerService.java
+++ b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/DSSGitWorkflowManagerService.java
@@ -4,6 +4,7 @@
 import com.webank.wedatasphere.dss.git.common.protocol.request.*;
 import com.webank.wedatasphere.dss.git.common.protocol.response.*;
 
+import java.io.IOException;
 import java.util.concurrent.ExecutionException;
 
 public interface DSSGitWorkflowManagerService {
@@ -20,4 +21,8 @@ public interface DSSGitWorkflowManagerService {
     GitHistoryResponse getHistory(GitHistoryRequest request);
 
     GitCommitResponse getCurrentCommit(GitCurrentCommitRequest request);
+
+    GitRevertResponse gitCheckOut(GitRevertRequest request) throws IOException;
+
+    GitRemoveResponse removeFile(GitRemoveRequest request);
 }
diff --git a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitWorkflowManagerServiceImpl.java b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitWorkflowManagerServiceImpl.java
index 0dc72109b..177f8125c 100644
--- a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitWorkflowManagerServiceImpl.java
+++ b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitWorkflowManagerServiceImpl.java
@@ -425,4 +425,77 @@ public GitCommitResponse getCurrentCommit(GitCurrentCommitRequest request) {
         }
         return null;
     }
+
+    @Override
+    public GitRevertResponse gitCheckOut(GitRevertRequest request) throws IOException {
+        GitUserEntity gitUser = dssWorkspaceGitService.selectGit(request.getWorkspaceId(), GitConstant.GIT_ACCESS_WRITE_TYPE);
+        if (gitUser == null) {
+            logger.error("the workspace : {} don't associate with git", request.getWorkspaceId());
+            return null;
+        }
+        Repository repository = null;
+        GitCommitResponse commitResponse = null;
+        try {
+            // 拼接.git路径
+            String gitPath = DSSGitUtils.generateGitPath(request.getProjectName());
+            // 获取git仓库
+            File repoDir = new File(gitPath);
+            repository = getRepository(repoDir, request.getProjectName(), gitUser);
+            // 本地保持最新状态
+            DSSGitUtils.pull(repository, request.getProjectName(), gitUser);
+            // 回滚
+            DSSGitUtils.checkoutTargetCommit(request);
+            // push
+            DSSGitUtils.push(repository, request.getProjectName(), gitUser, "revert by : " + request.getUsername());
+
+            List<GitCommitResponse> latestCommit = DSSGitUtils.getLatestCommit(repository, request.getPath(), 1);
+            if (CollectionUtils.isEmpty(latestCommit)) {
+                logger.error("get latestCommit failed, the reason is null");
+            } else {
+                commitResponse = latestCommit.get(0);
+                return new GitRevertResponse(commitResponse.getCommitId());
+            }
+
+        } catch (Exception e) {
+            logger.error("checkOut failed, the reason is ",e);
+        } finally {
+            repository.close();
+        }
+        return null;
+    }
+
+    @Override
+    public GitRemoveResponse removeFile(GitRemoveRequest request) {
+        GitUserEntity gitUser = dssWorkspaceGitService.selectGit(request.getWorkspaceId(), GitConstant.GIT_ACCESS_WRITE_TYPE);
+        if (gitUser == null) {
+            logger.error("the workspace : {} don't associate with git", request.getWorkspaceId());
+            return null;
+        }
+        Repository repository = null;
+        GitCommitResponse commitResponse = null;
+        try {
+            // 拼接.git路径
+            String gitPath = DSSGitUtils.generateGitPath(request.getProjectName());
+            // 获取git仓库
+            File repoDir = new File(gitPath);
+            repository = getRepository(repoDir, request.getProjectName(), gitUser);
+            // 本地保持最新状态
+            DSSGitUtils.pull(repository, request.getProjectName(), gitUser);
+            // 同步删除对应节点
+            for (String path : request.getPath()) {
+                FileUtils.removeFlowNode(path, request.getProjectName());
+            }
+            // 提交
+            String comment = "delete workflowNode " + request.getPath().toString() + DSSGitConstant.GIT_USERNAME_FLAG + request.getUsername();
+            DSSGitUtils.push(repository, request.getProjectName(), gitUser, comment);
+
+            commitResponse = DSSGitUtils.getCurrentCommit(repository);
+
+        } catch (Exception e) {
+            logger.error("pull failed, the reason is ",e);
+        } finally {
+            repository.close();
+        }
+        return new GitRemoveResponse(commitResponse.getCommitId());
+    }
 }
diff --git a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/utils/DSSGitUtils.java b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/utils/DSSGitUtils.java
index ec9cd4f1b..723781c32 100644
--- a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/utils/DSSGitUtils.java
+++ b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/utils/DSSGitUtils.java
@@ -204,7 +204,7 @@ public static void reset(String projectName) {
         }
     }
 
-    public static void checkoutTargetCommit(GitRevertRequest request) {
+    public static void checkoutTargetCommit(GitRevertRequest request) throws GitAPIException, IOException {
         File repoDir = new File(File.separator + FileUtils.normalizePath(GitServerConfig.GIT_SERVER_PATH.getValue()) + File.separator + request.getProjectName()+ File.separator + ".git");
         String commitId = request.getCommitId(); // 替换为目标commit的完整哈希值
 
@@ -214,13 +214,14 @@ public static void checkoutTargetCommit(GitRevertRequest request) {
             // 检出（回滚）指定commit的文件版本
             git.checkout()
                     .setStartPoint(commitId)
-                    .addPaths(request.getPath())
+                    .addPath(request.getPath())
                     .call();
 
             logger.info("File " + repoDir.getAbsolutePath() + " has been rolled back to the version at commit: " + commitId);
 
         } catch (GitAPIException | IOException e) {
-            e.printStackTrace();
+            logger.error("check out failed by : ", e);
+            throw e;
         }
     }
 
@@ -391,7 +392,6 @@ public static void updateLocal(GitBaseRequest request, String filePath) {
             logger.error("get remote repos Failed, the reason is : ", e);
         }
         try (Git git = new Git(repository)) {
-//            git.reset().addPath(filePath).call();
             git.reset().addPath(filePath).setMode(ResetCommand.ResetType.HARD).setRef("origin/master").call();
             logger.info("File has been unstaged: " + filePath);
         } catch (GitAPIException e) {
@@ -468,7 +468,6 @@ public static void getCommitId(String projectName, int num) {
                 logger.info("Commit Time: " + commitTime);
                 logger.info("Commit Message: " + commitMessage);
                 logger.info("Commit Author: " + commitAuthor);
-                logger.info("-----------------------------------");
             }
         } catch (IOException | GitAPIException e) {
             logger.error("get git log failed, the reason is: ", e);
@@ -544,11 +543,10 @@ public static GitHistoryResponse listCommitsBetween(Repository repository, Strin
                 commitResponse.setComment(commit.getShortMessage());
                 commitResponse.setCommitUser(commit.getAuthorIdent().getName());
                 gitCommitResponseList.add(commitResponse);
-                System.out.println("Commit Hash: " + commit.getName()); // 提交的Hash值
-                System.out.println("Commit Time: " + authorIdent.getWhen()); // 提交时间
-                System.out.println("Commit Message: " + commit.getFullMessage()); // 提交信息
-                System.out.println("Author: " + authorIdent.getName() + " <" + authorIdent.getEmailAddress() + ">"); // 提交人
-                System.out.println("-----------------------------------------------------");
+                logger.info("Commit Hash: " + commit.getName()); // 提交的Hash值
+                logger.info("Commit Time: " + authorIdent.getWhen()); // 提交时间
+                logger.info("Commit Message: " + commit.getFullMessage()); // 提交信息
+                logger.info("Author: " + authorIdent.getName() + " <" + authorIdent.getEmailAddress() + ">"); // 提交人
             }
         }
         GitHistoryResponse historyResponse = new GitHistoryResponse();
diff --git a/dss-git/dss-git-server/src/main/scala/com.webank.wedatasphere.dss.git/receiver/DSSGitChooser.scala b/dss-git/dss-git-server/src/main/scala/com.webank.wedatasphere.dss.git/receiver/DSSGitChooser.scala
index f2c73d689..9feec5353 100644
--- a/dss-git/dss-git-server/src/main/scala/com.webank.wedatasphere.dss.git/receiver/DSSGitChooser.scala
+++ b/dss-git/dss-git-server/src/main/scala/com.webank.wedatasphere.dss.git/receiver/DSSGitChooser.scala
@@ -55,6 +55,8 @@ class DSSGitChooser extends ReceiverChooser {
     case _: GitUserUpdateRequest => receiver
     case _: GitUserInfoRequest => receiver
     case _: GitCurrentCommitRequest => receiver
+    case _: GitRevertRequest => receiver
+    case _: GitRemoveRequest => receiver
     case _ => None
   }
 }
\ No newline at end of file
diff --git a/dss-git/dss-git-server/src/main/scala/com.webank.wedatasphere.dss.git/receiver/DSSGitReceiver.scala b/dss-git/dss-git-server/src/main/scala/com.webank.wedatasphere.dss.git/receiver/DSSGitReceiver.scala
index 8fc754f42..edf44767a 100644
--- a/dss-git/dss-git-server/src/main/scala/com.webank.wedatasphere.dss.git/receiver/DSSGitReceiver.scala
+++ b/dss-git/dss-git-server/src/main/scala/com.webank.wedatasphere.dss.git/receiver/DSSGitReceiver.scala
@@ -16,7 +16,7 @@
 
 package com.webank.wedatasphere.dss.git.receiver
 
-import com.webank.wedatasphere.dss.git.common.protocol.request.{GitArchiveProjectRequest, GitCheckProjectRequest, GitCommitRequest, GitCreateProjectRequest, GitCurrentCommitRequest, GitDeleteRequest, GitDiffRequest, GitFileContentRequest, GitHistoryRequest, GitRevertRequest, GitSearchRequest, GitUserInfoRequest, GitUserUpdateRequest}
+import com.webank.wedatasphere.dss.git.common.protocol.request.{GitArchiveProjectRequest, GitCheckProjectRequest, GitCommitRequest, GitCreateProjectRequest, GitCurrentCommitRequest, GitDeleteRequest, GitDiffRequest, GitFileContentRequest, GitHistoryRequest, GitRemoveRequest, GitRevertRequest, GitSearchRequest, GitUserInfoRequest, GitUserUpdateRequest}
 import com.webank.wedatasphere.dss.git.service.{DSSGitProjectManagerService, DSSGitWorkflowManagerService, DSSWorkspaceGitService}
 import org.apache.linkis.rpc.{Receiver, Sender}
 import org.slf4j.{Logger, LoggerFactory}
@@ -55,6 +55,10 @@ class DSSGitReceiver(gitProjectManagerService: DSSGitProjectManagerService, gitW
       workspaceGitService.selectGitUserInfo(gitUserInfoRequest)
     case gitCurrentCommitRequest: GitCurrentCommitRequest =>
       gitWorkflowManagerService.getCurrentCommit(gitCurrentCommitRequest)
+    case gitRevertRequest: GitRevertRequest =>
+      gitWorkflowManagerService.gitCheckOut(gitRevertRequest)
+    case gitRemoveRequest: GitRemoveRequest =>
+      gitWorkflowManagerService.removeFile(gitRemoveRequest)
     case _ => None
   }
 

From 5ac692dfe51a992033475bb745109b1f22fbd0ab Mon Sep 17 00:00:00 2001
From: qweqnotallow <747839893@qq.com>
Date: Tue, 14 May 2024 17:34:07 +0800
Subject: [PATCH 130/302] git server add : rename git server delete: gitRemove
 gitRevert -> gitCommit

---
 .../server/service/OrchestratorService.java   |  3 +-
 .../OrchestratorFrameworkServiceImpl.java     | 14 +-----
 .../service/impl/OrchestratorServiceImpl.java | 14 ++++--
 .../protocol/request/GitRenameRequest.java    | 49 +++++++++++++++++++
 .../protocol/response/GitRemoveResponse.java  | 17 -------
 .../protocol/response/GitRevertResponse.java  | 21 --------
 .../service/DSSGitWorkflowManagerService.java |  6 ++-
 .../DSSGitWorkflowManagerServiceImpl.java     | 44 +++++++++++++++--
 .../wedatasphere/dss/git/utils/FileUtils.java | 16 ++++++
 .../receiver/DSSGitChooser.scala              |  3 +-
 .../receiver/DSSGitReceiver.scala             |  4 +-
 11 files changed, 126 insertions(+), 65 deletions(-)
 create mode 100644 dss-git/dss-git-common/src/main/java/com.webank.wedatasphere.dss.git.common/protocol/request/GitRenameRequest.java
 delete mode 100644 dss-git/dss-git-common/src/main/java/com.webank.wedatasphere.dss.git.common/protocol/response/GitRemoveResponse.java
 delete mode 100644 dss-git/dss-git-common/src/main/java/com.webank.wedatasphere.dss.git.common/protocol/response/GitRevertResponse.java

diff --git a/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/OrchestratorService.java b/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/OrchestratorService.java
index fc830c98d..1990621b5 100644
--- a/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/OrchestratorService.java
+++ b/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/OrchestratorService.java
@@ -17,6 +17,7 @@
 package com.webank.wedatasphere.dss.orchestrator.server.service;
 
 
+import com.webank.wedatasphere.dss.common.entity.project.DSSProject;
 import com.webank.wedatasphere.dss.common.exception.DSSErrorException;
 import com.webank.wedatasphere.dss.common.label.DSSLabel;
 import com.webank.wedatasphere.dss.framework.common.exception.DSSFrameworkErrorException;
@@ -132,7 +133,7 @@ String rollbackOrchestrator(String username, Long projectId, String projectName,
     //**** new method
     void isExistSameNameBeforeCreate(Long workspaceId, Long projectId, String orchestratorName) throws DSSFrameworkErrorException;
 
-    Long isExistSameNameBeforeUpdate(OrchestratorModifyRequest orchestratorModifRequest) throws DSSFrameworkErrorException;
+    Long isExistSameNameBeforeUpdate(OrchestratorModifyRequest orchestratorModifRequest, DSSProject dssProject, String username) throws DSSFrameworkErrorException;
 
     List<OrchestratorBaseInfo> getOrchestratorInfos(OrchestratorRequest orchestratorRequest, String username);
 
diff --git a/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/impl/OrchestratorFrameworkServiceImpl.java b/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/impl/OrchestratorFrameworkServiceImpl.java
index 46ce24dfa..18c426c1f 100644
--- a/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/impl/OrchestratorFrameworkServiceImpl.java
+++ b/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/impl/OrchestratorFrameworkServiceImpl.java
@@ -29,29 +29,20 @@
 import com.webank.wedatasphere.dss.appconn.scheduler.structure.orchestration.ref.RefOrchestrationContentRequestRef;
 import com.webank.wedatasphere.dss.appconn.scheduler.utils.OrchestrationOperationUtils;
 import com.webank.wedatasphere.dss.common.constant.project.ProjectUserPrivEnum;
-import com.webank.wedatasphere.dss.common.entity.BmlResource;
 import com.webank.wedatasphere.dss.common.entity.project.DSSProject;
 import com.webank.wedatasphere.dss.common.exception.DSSErrorException;
 import com.webank.wedatasphere.dss.common.label.DSSLabel;
 import com.webank.wedatasphere.dss.common.label.EnvDSSLabel;
-import com.webank.wedatasphere.dss.common.protocol.RequestExportWorkflow;
-import com.webank.wedatasphere.dss.common.protocol.ResponseExportWorkflow;
 import com.webank.wedatasphere.dss.common.protocol.project.*;
 import com.webank.wedatasphere.dss.common.utils.DSSCommonUtils;
 import com.webank.wedatasphere.dss.common.utils.DSSExceptionUtils;
 import com.webank.wedatasphere.dss.common.utils.RpcAskUtils;
 import com.webank.wedatasphere.dss.framework.common.exception.DSSFrameworkErrorException;
-import com.webank.wedatasphere.dss.git.common.protocol.GitTree;
-import com.webank.wedatasphere.dss.git.common.protocol.request.GitCommitRequest;
-import com.webank.wedatasphere.dss.git.common.protocol.request.GitDiffRequest;
 import com.webank.wedatasphere.dss.git.common.protocol.request.GitHistoryRequest;
 import com.webank.wedatasphere.dss.git.common.protocol.request.GitRemoveRequest;
 import com.webank.wedatasphere.dss.git.common.protocol.response.GitCommitResponse;
-import com.webank.wedatasphere.dss.git.common.protocol.response.GitDiffResponse;
 import com.webank.wedatasphere.dss.git.common.protocol.response.GitHistoryResponse;
-import com.webank.wedatasphere.dss.git.common.protocol.response.GitRemoveResponse;
 import com.webank.wedatasphere.dss.orchestrator.common.entity.*;
-import com.webank.wedatasphere.dss.orchestrator.common.ref.OrchestratorRefConstant;
 import com.webank.wedatasphere.dss.orchestrator.core.DSSOrchestrator;
 import com.webank.wedatasphere.dss.orchestrator.core.exception.DSSOrchestratorErrorException;
 import com.webank.wedatasphere.dss.orchestrator.core.type.DSSOrchestratorRelation;
@@ -60,7 +51,6 @@
 import com.webank.wedatasphere.dss.orchestrator.db.dao.OrchestratorCopyJobMapper;
 import com.webank.wedatasphere.dss.orchestrator.db.dao.OrchestratorMapper;
 import com.webank.wedatasphere.dss.orchestrator.loader.OrchestratorManager;
-import com.webank.wedatasphere.dss.orchestrator.server.constant.DSSOrchestratorConstant;
 import com.webank.wedatasphere.dss.orchestrator.server.entity.request.*;
 import com.webank.wedatasphere.dss.orchestrator.server.entity.vo.CommonOrchestratorVo;
 import com.webank.wedatasphere.dss.orchestrator.server.entity.vo.OrchestratorCopyHistory;
@@ -246,7 +236,7 @@ public CommonOrchestratorVo modifyOrchestrator(String username, OrchestratorModi
         DSSProject dssProject = validateOperation(orchestratorModifyRequest.getProjectId(), username);
         workspace.setWorkspaceName(dssProject.getWorkspaceName());
         //是否存在相同的编排名称 //todo 返回orchestratorInfo而不是id
-        Long orchestratorId = orchestratorService.isExistSameNameBeforeUpdate(orchestratorModifyRequest);
+        Long orchestratorId = orchestratorService.isExistSameNameBeforeUpdate(orchestratorModifyRequest, dssProject, username);
         LOGGER.info("{} begins to update a orchestrator {}.", username, orchestratorModifyRequest.getOrchestratorName());
         List<DSSLabel> dssLabels = Collections.singletonList(new EnvDSSLabel(orchestratorModifyRequest.getLabels().getRoute()));
         DSSOrchestratorRelation dssOrchestratorRelation = DSSOrchestratorRelationManager.getDSSOrchestratorRelationByMode(orchestratorModifyRequest.getOrchestratorMode());
@@ -297,7 +287,7 @@ public CommonOrchestratorVo deleteOrchestrator(String username, OrchestratorDele
         List<String> path = new ArrayList<>();
         path.add(orchestratorInfo.getName());
         GitRemoveRequest removeRequest = new GitRemoveRequest(workspace.getWorkspaceId(), dssProject.getName(), path, username);
-        GitRemoveResponse gitRemoveResponse = RpcAskUtils.processAskException(sender.ask(removeRequest), GitRemoveResponse.class, GitRemoveRequest.class);
+        GitCommitResponse gitRemoveResponse = RpcAskUtils.processAskException(sender.ask(removeRequest), GitCommitResponse.class, GitRemoveRequest.class);
 
         orchestratorService.deleteOrchestrator(username, workspace, dssProject.getName(), orchestratorInfo.getId(), dssLabels);
         orchestratorOperateService.deleteTemplateOperate(orchestratorInfo.getId());
diff --git a/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/impl/OrchestratorServiceImpl.java b/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/impl/OrchestratorServiceImpl.java
index 5659c4a05..07a2c5360 100644
--- a/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/impl/OrchestratorServiceImpl.java
+++ b/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/impl/OrchestratorServiceImpl.java
@@ -18,11 +18,11 @@
 
 import com.google.common.collect.Lists;
 import com.webank.wedatasphere.dss.common.constant.project.ProjectUserPrivEnum;
+import com.webank.wedatasphere.dss.common.entity.project.DSSProject;
 import com.webank.wedatasphere.dss.common.exception.DSSErrorException;
 import com.webank.wedatasphere.dss.common.label.DSSLabel;
 import com.webank.wedatasphere.dss.common.label.DSSLabelUtil;
 import com.webank.wedatasphere.dss.common.label.EnvDSSLabel;
-import com.webank.wedatasphere.dss.common.label.LabelRouteVO;
 import com.webank.wedatasphere.dss.common.protocol.project.ProjectUserAuthRequest;
 import com.webank.wedatasphere.dss.common.protocol.project.ProjectUserAuthResponse;
 import com.webank.wedatasphere.dss.common.utils.DSSExceptionUtils;
@@ -31,9 +31,9 @@
 import com.webank.wedatasphere.dss.contextservice.service.ContextService;
 import com.webank.wedatasphere.dss.framework.common.exception.DSSFrameworkErrorException;
 import com.webank.wedatasphere.dss.git.common.protocol.config.GitServerConfig;
-import com.webank.wedatasphere.dss.git.common.protocol.request.GitCommitRequest;
+import com.webank.wedatasphere.dss.git.common.protocol.request.GitRenameRequest;
 import com.webank.wedatasphere.dss.git.common.protocol.request.GitRevertRequest;
-import com.webank.wedatasphere.dss.git.common.protocol.response.GitRevertResponse;
+import com.webank.wedatasphere.dss.git.common.protocol.response.GitCommitResponse;
 import com.webank.wedatasphere.dss.git.common.protocol.util.UrlUtils;
 import com.webank.wedatasphere.dss.orchestrator.common.entity.DSSOrchestratorInfo;
 import com.webank.wedatasphere.dss.orchestrator.common.entity.DSSOrchestratorVersion;
@@ -70,6 +70,7 @@
 import com.webank.wedatasphere.dss.standard.common.entity.ref.ResponseRef;
 import com.webank.wedatasphere.dss.standard.common.exception.operation.ExternalOperationWarnException;
 import com.webank.wedatasphere.dss.workflow.common.protocol.*;
+import io.protostuff.Rpc;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.linkis.cs.client.ContextClient;
 import org.apache.linkis.cs.client.builder.ContextClientFactory;
@@ -374,7 +375,7 @@ public String rollbackOrchestrator(String userName, Long projectId, String proje
         if (!StringUtils.isEmpty(oldOrcVersion.getCommitId())) {
             Sender sender = DSSSenderServiceFactory.getOrCreateServiceInstance().getGitSender();
             GitRevertRequest gitRevertRequest = new GitRevertRequest(workspace.getWorkspaceId(), projectName, oldOrcVersion.getCommitId(), dssOrchestratorInfo.getName(), userName);
-            GitRevertResponse gitRevertResponse = RpcAskUtils.processAskException(sender.ask(gitRevertRequest), GitRevertResponse.class, GitRevertRequest.class);
+            GitCommitResponse gitRevertResponse = RpcAskUtils.processAskException(sender.ask(gitRevertRequest), GitCommitResponse.class, GitRevertRequest.class);
         }
 
         String newVersion = OrchestratorUtils.increaseVersion(latestVersion);
@@ -457,7 +458,7 @@ public void isExistSameNameBeforeCreate(Long workspaceId, Long projectId, String
 
     //是否存在相同的编排名称,如果不存在相同的编排名称則返回编排id
     @Override
-    public Long isExistSameNameBeforeUpdate(OrchestratorModifyRequest orchestratorModifRequest) throws DSSFrameworkErrorException {
+    public Long isExistSameNameBeforeUpdate(OrchestratorModifyRequest orchestratorModifRequest, DSSProject dssProject, String username) throws DSSFrameworkErrorException {
         DSSOrchestratorInfo orchestratorInfo = orchestratorMapper.getOrchestrator(orchestratorModifRequest.getId());
         if (orchestratorInfo == null) {
             DSSFrameworkErrorException.dealErrorException(60000, "编排模式ID=" + orchestratorModifRequest.getId() + "不存在");
@@ -465,6 +466,9 @@ public Long isExistSameNameBeforeUpdate(OrchestratorModifyRequest orchestratorMo
         //若修改了编排名称，检查是否存在相同的编排名称
         if (!orchestratorModifRequest.getOrchestratorName().equals(orchestratorInfo.getName())) {
             isExistSameNameBeforeCreate(orchestratorModifRequest.getWorkspaceId(), orchestratorModifRequest.getProjectId(), orchestratorModifRequest.getOrchestratorName());
+            Sender sender = DSSSenderServiceFactory.getOrCreateServiceInstance().getGitSender();
+            GitRenameRequest renameRequest = new GitRenameRequest(orchestratorInfo.getWorkspaceId(), dssProject.getName(), orchestratorInfo.getName(), orchestratorModifRequest.getOrchestratorName(), username);
+            GitCommitResponse gitCommitResponse = RpcAskUtils.processAskException(sender.ask(renameRequest), GitCommitResponse.class, GitRenameRequest.class);
         }
         return orchestratorInfo.getId();
     }
diff --git a/dss-git/dss-git-common/src/main/java/com.webank.wedatasphere.dss.git.common/protocol/request/GitRenameRequest.java b/dss-git/dss-git-common/src/main/java/com.webank.wedatasphere.dss.git.common/protocol/request/GitRenameRequest.java
new file mode 100644
index 000000000..93a099d43
--- /dev/null
+++ b/dss-git/dss-git-common/src/main/java/com.webank.wedatasphere.dss.git.common/protocol/request/GitRenameRequest.java
@@ -0,0 +1,49 @@
+package com.webank.wedatasphere.dss.git.common.protocol.request;
+
+public class GitRenameRequest extends GitBaseRequest{
+    private String oldName;
+
+    private String name;
+
+    private String username;
+
+    public GitRenameRequest(String oldName, String name, String username) {
+        this.oldName = oldName;
+        this.name = name;
+        this.username = username;
+    }
+
+    public GitRenameRequest(Long workspaceId, String projectName, String oldName, String name, String username) {
+        super(workspaceId, projectName);
+        this.oldName = oldName;
+        this.name = name;
+        this.username = username;
+    }
+
+    public GitRenameRequest() {
+    }
+
+    public String getOldName() {
+        return oldName;
+    }
+
+    public void setOldName(String oldName) {
+        this.oldName = oldName;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getUsername() {
+        return username;
+    }
+
+    public void setUsername(String username) {
+        this.username = username;
+    }
+}
diff --git a/dss-git/dss-git-common/src/main/java/com.webank.wedatasphere.dss.git.common/protocol/response/GitRemoveResponse.java b/dss-git/dss-git-common/src/main/java/com.webank.wedatasphere.dss.git.common/protocol/response/GitRemoveResponse.java
deleted file mode 100644
index 46624d977..000000000
--- a/dss-git/dss-git-common/src/main/java/com.webank.wedatasphere.dss.git.common/protocol/response/GitRemoveResponse.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package com.webank.wedatasphere.dss.git.common.protocol.response;
-
-public class GitRemoveResponse {
-    private String commitId;
-
-    public GitRemoveResponse(String commitId) {
-        this.commitId = commitId;
-    }
-
-    public String getCommitId() {
-        return commitId;
-    }
-
-    public void setCommitId(String commitId) {
-        this.commitId = commitId;
-    }
-}
diff --git a/dss-git/dss-git-common/src/main/java/com.webank.wedatasphere.dss.git.common/protocol/response/GitRevertResponse.java b/dss-git/dss-git-common/src/main/java/com.webank.wedatasphere.dss.git.common/protocol/response/GitRevertResponse.java
deleted file mode 100644
index a83a08925..000000000
--- a/dss-git/dss-git-common/src/main/java/com.webank.wedatasphere.dss.git.common/protocol/response/GitRevertResponse.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package com.webank.wedatasphere.dss.git.common.protocol.response;
-
-
-public class GitRevertResponse {
-    private String commitId;
-
-    public GitRevertResponse(String commitId) {
-        this.commitId = commitId;
-    }
-
-    public GitRevertResponse() {
-    }
-
-    public String getCommitId() {
-        return commitId;
-    }
-
-    public void setCommitId(String commitId) {
-        this.commitId = commitId;
-    }
-}
diff --git a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/DSSGitWorkflowManagerService.java b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/DSSGitWorkflowManagerService.java
index 8d447e6b3..4b78d51a3 100644
--- a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/DSSGitWorkflowManagerService.java
+++ b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/DSSGitWorkflowManagerService.java
@@ -22,7 +22,9 @@ public interface DSSGitWorkflowManagerService {
 
     GitCommitResponse getCurrentCommit(GitCurrentCommitRequest request);
 
-    GitRevertResponse gitCheckOut(GitRevertRequest request) throws IOException;
+    GitCommitResponse gitCheckOut(GitRevertRequest request) throws IOException;
 
-    GitRemoveResponse removeFile(GitRemoveRequest request);
+    GitCommitResponse removeFile(GitRemoveRequest request);
+
+    GitCommitResponse rename(GitRenameRequest request);
 }
diff --git a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitWorkflowManagerServiceImpl.java b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitWorkflowManagerServiceImpl.java
index 177f8125c..a9e86d028 100644
--- a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitWorkflowManagerServiceImpl.java
+++ b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitWorkflowManagerServiceImpl.java
@@ -427,7 +427,7 @@ public GitCommitResponse getCurrentCommit(GitCurrentCommitRequest request) {
     }
 
     @Override
-    public GitRevertResponse gitCheckOut(GitRevertRequest request) throws IOException {
+    public GitCommitResponse gitCheckOut(GitRevertRequest request) throws IOException {
         GitUserEntity gitUser = dssWorkspaceGitService.selectGit(request.getWorkspaceId(), GitConstant.GIT_ACCESS_WRITE_TYPE);
         if (gitUser == null) {
             logger.error("the workspace : {} don't associate with git", request.getWorkspaceId());
@@ -452,8 +452,7 @@ public GitRevertResponse gitCheckOut(GitRevertRequest request) throws IOExceptio
             if (CollectionUtils.isEmpty(latestCommit)) {
                 logger.error("get latestCommit failed, the reason is null");
             } else {
-                commitResponse = latestCommit.get(0);
-                return new GitRevertResponse(commitResponse.getCommitId());
+                return commitResponse;
             }
 
         } catch (Exception e) {
@@ -465,7 +464,7 @@ public GitRevertResponse gitCheckOut(GitRevertRequest request) throws IOExceptio
     }
 
     @Override
-    public GitRemoveResponse removeFile(GitRemoveRequest request) {
+    public GitCommitResponse removeFile(GitRemoveRequest request) {
         GitUserEntity gitUser = dssWorkspaceGitService.selectGit(request.getWorkspaceId(), GitConstant.GIT_ACCESS_WRITE_TYPE);
         if (gitUser == null) {
             logger.error("the workspace : {} don't associate with git", request.getWorkspaceId());
@@ -496,6 +495,41 @@ public GitRemoveResponse removeFile(GitRemoveRequest request) {
         } finally {
             repository.close();
         }
-        return new GitRemoveResponse(commitResponse.getCommitId());
+        return commitResponse;
+    }
+
+    @Override
+    public GitCommitResponse rename(GitRenameRequest request) {
+        GitUserEntity gitUser = dssWorkspaceGitService.selectGit(request.getWorkspaceId(), GitConstant.GIT_ACCESS_WRITE_TYPE);
+        if (gitUser == null) {
+            logger.error("the workspace : {} don't associate with git", request.getWorkspaceId());
+            return null;
+        }
+        Repository repository = null;
+        GitCommitResponse commitResponse = null;
+        try {
+            // 拼接.git路径
+            String gitPath = DSSGitUtils.generateGitPath(request.getProjectName());
+            // 获取git仓库
+            File repoDir = new File(gitPath);
+            repository = getRepository(repoDir, request.getProjectName(), gitUser);
+            // 本地保持最新状态
+            DSSGitUtils.pull(repository, request.getProjectName(), gitUser);
+            // 同步删除对应节点
+            String olfFilePath = File.separator + FileUtils.normalizePath(GitServerConfig.GIT_SERVER_PATH.getValue()) + File.separator + FileUtils.normalizePath(request.getOldName());
+            String filePath = File.separator + FileUtils.normalizePath(GitServerConfig.GIT_SERVER_PATH.getValue()) + File.separator + FileUtils.normalizePath(request.getName());;
+            FileUtils.renameFile(olfFilePath, filePath);
+            // 提交
+            String comment = "rename workflowNode " + request.getName() + DSSGitConstant.GIT_USERNAME_FLAG + request.getUsername();
+            DSSGitUtils.push(repository, request.getProjectName(), gitUser, comment);
+
+            commitResponse = DSSGitUtils.getCurrentCommit(repository);
+
+        } catch (Exception e) {
+            logger.error("pull failed, the reason is ",e);
+        } finally {
+            repository.close();
+        }
+        return commitResponse;
     }
 }
diff --git a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/utils/FileUtils.java b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/utils/FileUtils.java
index 466834d5b..73c1c1bf7 100644
--- a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/utils/FileUtils.java
+++ b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/utils/FileUtils.java
@@ -261,4 +261,20 @@ public static String unzip(String dirPath,boolean deleteOriginZip)throws DSSErro
         }
         return longZipFilePath;
     }
+
+    public static void renameFile(String oldFileName, String fileName) {
+        File oldFile = new File(oldFileName);
+        File file = new File(fileName);
+        // 检查原文件夹是否存在
+        if (oldFile.exists()) {
+            // 尝试重命名文件夹
+            if (oldFile.renameTo(file)) {
+                logger.info("Folder renamed successfully.");
+            } else {
+                logger.error("Failed to rename folder.");
+            }
+        } else {
+            logger.error("Folder does not exist.");
+        }
+    }
 }
diff --git a/dss-git/dss-git-server/src/main/scala/com.webank.wedatasphere.dss.git/receiver/DSSGitChooser.scala b/dss-git/dss-git-server/src/main/scala/com.webank.wedatasphere.dss.git/receiver/DSSGitChooser.scala
index 9feec5353..e0d362dd3 100644
--- a/dss-git/dss-git-server/src/main/scala/com.webank.wedatasphere.dss.git/receiver/DSSGitChooser.scala
+++ b/dss-git/dss-git-server/src/main/scala/com.webank.wedatasphere.dss.git/receiver/DSSGitChooser.scala
@@ -16,7 +16,7 @@
 
 package com.webank.wedatasphere.dss.git.receiver
 
-import com.webank.wedatasphere.dss.git.common.protocol.request.{GitArchiveProjectRequest, GitBaseRequest, GitCheckProjectRequest, GitCommitRequest, GitCreateProjectRequest, GitCurrentCommitRequest, GitDeleteRequest, GitDiffRequest, GitFileContentRequest, GitHistoryRequest, GitRemoveRequest, GitRevertRequest, GitSearchRequest, GitUserInfoRequest, GitUserUpdateRequest}
+import com.webank.wedatasphere.dss.git.common.protocol.request.{GitArchiveProjectRequest, GitBaseRequest, GitCheckProjectRequest, GitCommitRequest, GitCreateProjectRequest, GitCurrentCommitRequest, GitDeleteRequest, GitDiffRequest, GitFileContentRequest, GitHistoryRequest, GitRemoveRequest, GitRenameRequest, GitRevertRequest, GitSearchRequest, GitUserInfoRequest, GitUserUpdateRequest}
 import com.webank.wedatasphere.dss.git.service.{DSSGitProjectManagerService, DSSGitWorkflowManagerService, DSSWorkspaceGitService}
 
 import javax.annotation.PostConstruct
@@ -57,6 +57,7 @@ class DSSGitChooser extends ReceiverChooser {
     case _: GitCurrentCommitRequest => receiver
     case _: GitRevertRequest => receiver
     case _: GitRemoveRequest => receiver
+    case _: GitRenameRequest => receiver
     case _ => None
   }
 }
\ No newline at end of file
diff --git a/dss-git/dss-git-server/src/main/scala/com.webank.wedatasphere.dss.git/receiver/DSSGitReceiver.scala b/dss-git/dss-git-server/src/main/scala/com.webank.wedatasphere.dss.git/receiver/DSSGitReceiver.scala
index edf44767a..4d2990977 100644
--- a/dss-git/dss-git-server/src/main/scala/com.webank.wedatasphere.dss.git/receiver/DSSGitReceiver.scala
+++ b/dss-git/dss-git-server/src/main/scala/com.webank.wedatasphere.dss.git/receiver/DSSGitReceiver.scala
@@ -16,7 +16,7 @@
 
 package com.webank.wedatasphere.dss.git.receiver
 
-import com.webank.wedatasphere.dss.git.common.protocol.request.{GitArchiveProjectRequest, GitCheckProjectRequest, GitCommitRequest, GitCreateProjectRequest, GitCurrentCommitRequest, GitDeleteRequest, GitDiffRequest, GitFileContentRequest, GitHistoryRequest, GitRemoveRequest, GitRevertRequest, GitSearchRequest, GitUserInfoRequest, GitUserUpdateRequest}
+import com.webank.wedatasphere.dss.git.common.protocol.request.{GitArchiveProjectRequest, GitCheckProjectRequest, GitCommitRequest, GitCreateProjectRequest, GitCurrentCommitRequest, GitDeleteRequest, GitDiffRequest, GitFileContentRequest, GitHistoryRequest, GitRemoveRequest, GitRenameRequest, GitRevertRequest, GitSearchRequest, GitUserInfoRequest, GitUserUpdateRequest}
 import com.webank.wedatasphere.dss.git.service.{DSSGitProjectManagerService, DSSGitWorkflowManagerService, DSSWorkspaceGitService}
 import org.apache.linkis.rpc.{Receiver, Sender}
 import org.slf4j.{Logger, LoggerFactory}
@@ -59,6 +59,8 @@ class DSSGitReceiver(gitProjectManagerService: DSSGitProjectManagerService, gitW
       gitWorkflowManagerService.gitCheckOut(gitRevertRequest)
     case gitRemoveRequest: GitRemoveRequest =>
       gitWorkflowManagerService.removeFile(gitRemoveRequest)
+    case gitRenameRequest: GitRenameRequest =>
+      gitWorkflowManagerService.rename(gitRenameRequest)
     case _ => None
   }
 

From 410832aadc3c761088ebc566210c8456fef36cf0 Mon Sep 17 00:00:00 2001
From: qweqnotallow <747839893@qq.com>
Date: Tue, 14 May 2024 19:25:39 +0800
Subject: [PATCH 131/302] dss-server : publish git server-> dss server

---
 .../service/impl/OrchestratorServiceImpl.java |  2 +-
 .../service/impl/PublishServiceImpl.java      | 20 ++++++++++++-------
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/impl/OrchestratorServiceImpl.java b/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/impl/OrchestratorServiceImpl.java
index 07a2c5360..86df8e00b 100644
--- a/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/impl/OrchestratorServiceImpl.java
+++ b/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/impl/OrchestratorServiceImpl.java
@@ -468,7 +468,7 @@ public Long isExistSameNameBeforeUpdate(OrchestratorModifyRequest orchestratorMo
             isExistSameNameBeforeCreate(orchestratorModifRequest.getWorkspaceId(), orchestratorModifRequest.getProjectId(), orchestratorModifRequest.getOrchestratorName());
             Sender sender = DSSSenderServiceFactory.getOrCreateServiceInstance().getGitSender();
             GitRenameRequest renameRequest = new GitRenameRequest(orchestratorInfo.getWorkspaceId(), dssProject.getName(), orchestratorInfo.getName(), orchestratorModifRequest.getOrchestratorName(), username);
-            GitCommitResponse gitCommitResponse = RpcAskUtils.processAskException(sender.ask(renameRequest), GitCommitResponse.class, GitRenameRequest.class);
+            RpcAskUtils.processAskException(sender.ask(renameRequest), GitCommitResponse.class, GitRenameRequest.class);
         }
         return orchestratorInfo.getId();
     }
diff --git a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/service/impl/PublishServiceImpl.java b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/service/impl/PublishServiceImpl.java
index 60ca09a18..02ed2a93e 100644
--- a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/service/impl/PublishServiceImpl.java
+++ b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/service/impl/PublishServiceImpl.java
@@ -90,6 +90,16 @@ public String submitPublish(String convertUser, Long workflowId,
             if (dssProject.getWorkspaceId() != workspace.getWorkspaceId()) {
                 DSSExceptionUtils.dealErrorException(63335, "工作流所在工作空间和cookie中不一致，请刷新页面后，再次发布！", DSSErrorException.class);
             }
+            //仅对接入Git的项目更新状态为 发布-publish
+            GitCommitResponse gitCommitResponse = null;
+            if (dssProject.getAssociateGit() != null && dssProject.getAssociateGit()) {
+                // 获取当前文件Commit
+                Sender sender = DSSSenderServiceFactory.getOrCreateServiceInstance().getGitSender();
+                GitCurrentCommitRequest currentCommitRequest = new GitCurrentCommitRequest(workspace.getWorkspaceId(), dssProject.getName(), convertUser, dssFlow.getName());
+                gitCommitResponse = RpcAskUtils.processAskException(sender.ask(currentCommitRequest), GitCommitResponse.class, GitCurrentCommitRequest.class);
+                // 更新commitId
+                lockMapper.updateOrchestratorStatus(workflowId, OrchestratorRefConstant.FLOW_STATUS_PUSH);
+            }
             String schedulerAppConnName = workFlowParser.getValueWithKey(dssFlow.getFlowJson(), DSSWorkFlowConstant.SCHEDULER_APP_CONN_NAME);
             if (StringUtils.isBlank(schedulerAppConnName)) {
                 // 向下兼容老版本
@@ -103,15 +113,11 @@ public String submitPublish(String convertUser, Long workflowId,
             if (response.getResponse().isFailed()) {
                 throw new DSSErrorException(50311, response.getResponse().getMessage());
             }
-            //仅对接入Git的项目更新状态为 发布-publish
-            if (dssProject.getAssociateGit() != null && dssProject.getAssociateGit()) {
-                lockMapper.updateOrchestratorStatus(workflowId,OrchestratorRefConstant.FLOW_STATUS_PUBLISH);
-                // 获取当前文件Commit
-                Sender sender = DSSSenderServiceFactory.getOrCreateServiceInstance().getGitSender();
-                GitCurrentCommitRequest currentCommitRequest = new GitCurrentCommitRequest(workspace.getWorkspaceId(), dssProject.getName(), convertUser, dssFlow.getName());
-                GitCommitResponse gitCommitResponse = RpcAskUtils.processAskException(sender.ask(currentCommitRequest), GitCommitResponse.class, GitCurrentCommitRequest.class);
+            if (gitCommitResponse != null) {
                 // 更新commitId
                 lockMapper.updateOrchestratorVersionCommitId(gitCommitResponse.getCommitId(), dssFlow.getId());
+                // 更新工作流状态
+                lockMapper.updateOrchestratorStatus(workflowId, OrchestratorRefConstant.FLOW_STATUS_PUBLISH);
             }
 
             return response.getId();

From e25bd658f51d8d689a11ae8fef38460ccd99ae24 Mon Sep 17 00:00:00 2001
From: qweqnotallow <747839893@qq.com>
Date: Tue, 14 May 2024 20:13:19 +0800
Subject: [PATCH 132/302] dss-server : git revert after dss revert

---
 .../service/impl/OrchestratorServiceImpl.java | 31 ++++++++++---------
 1 file changed, 17 insertions(+), 14 deletions(-)

diff --git a/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/impl/OrchestratorServiceImpl.java b/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/impl/OrchestratorServiceImpl.java
index 86df8e00b..20dcd52af 100644
--- a/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/impl/OrchestratorServiceImpl.java
+++ b/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/impl/OrchestratorServiceImpl.java
@@ -371,12 +371,6 @@ public String rollbackOrchestrator(String userName, Long projectId, String proje
         List<DSSLabel> labels = new ArrayList<>();
         labels.add(dssLabel);
         DSSOrchestratorInfo dssOrchestratorInfo = orchestratorMapper.getOrchestrator(orchestratorId);
-        //git回滚
-        if (!StringUtils.isEmpty(oldOrcVersion.getCommitId())) {
-            Sender sender = DSSSenderServiceFactory.getOrCreateServiceInstance().getGitSender();
-            GitRevertRequest gitRevertRequest = new GitRevertRequest(workspace.getWorkspaceId(), projectName, oldOrcVersion.getCommitId(), dssOrchestratorInfo.getName(), userName);
-            GitCommitResponse gitRevertResponse = RpcAskUtils.processAskException(sender.ask(gitRevertRequest), GitCommitResponse.class, GitRevertRequest.class);
-        }
 
         String newVersion = OrchestratorUtils.increaseVersion(latestVersion);
         DSSOrchestratorVersion dssOrchestratorVersion = new DSSOrchestratorVersion();
@@ -418,15 +412,24 @@ public String rollbackOrchestrator(String userName, Long projectId, String proje
         addOrchestratorVersionHook.afterAdd(dssOrchestratorVersion, Collections.singletonMap(OrchestratorRefConstant.ORCHESTRATION_FLOWID_PARAMCONF_TEMPLATEID_TUPLES_KEY,paramConfTemplateIds));
 //        synProjectOrchestratorVersionId(dssOrchestratorVersion, labels);
 
-        //若之前版本未进行git回滚，则自动提交回滚后的工作流至git
-        if (StringUtils.isEmpty(oldOrcVersion.getCommitId())) {
+        try {
             Sender sender = DSSSenderServiceFactory.getOrCreateServiceInstance().getGitSender();
-            OrchestratorSubmitRequest submitRequest = new OrchestratorSubmitRequest();
-            submitRequest.setFlowId(dssOrchestratorVersion.getAppId());
-            submitRequest.setOrchestratorId(dssOrchestratorVersion.getOrchestratorId());
-            submitRequest.setProjectName(projectName);
-            submitRequest.setComment("rollback workflow: " + dssOrchestratorInfo.getName());
-            orchestratorPluginService.submitFlow(submitRequest, userName, workspace);
+            //若之前版本未进行git回滚，则自动提交回滚后的工作流至git
+            if (StringUtils.isEmpty(oldOrcVersion.getCommitId())) {
+                OrchestratorSubmitRequest submitRequest = new OrchestratorSubmitRequest();
+                submitRequest.setFlowId(dssOrchestratorVersion.getAppId());
+                submitRequest.setOrchestratorId(dssOrchestratorVersion.getOrchestratorId());
+                submitRequest.setProjectName(projectName);
+                submitRequest.setComment("rollback workflow: " + dssOrchestratorInfo.getName());
+                orchestratorPluginService.submitFlow(submitRequest, userName, workspace);
+            } else {
+                GitRevertRequest gitRevertRequest = new GitRevertRequest(workspace.getWorkspaceId(), projectName, oldOrcVersion.getCommitId(), dssOrchestratorInfo.getName(), userName);
+                RpcAskUtils.processAskException(sender.ask(gitRevertRequest), GitCommitResponse.class, GitRevertRequest.class);
+            }
+            orchestratorMapper.updateOrchestratorStatus(orchestratorId, OrchestratorRefConstant.FLOW_STATUS_PUSH);
+        } catch (Exception e) {
+            LOGGER.error("git revert failed, the reason is :", e);
+            orchestratorMapper.updateOrchestratorStatus(orchestratorId, OrchestratorRefConstant.FLOW_STATUS_SAVE);
         }
 
         return dssOrchestratorVersion.getVersion();

From 784a232f168dea7b8e18a3560f07ccba8f57ce03 Mon Sep 17 00:00:00 2001
From: qweqnotallow <747839893@qq.com>
Date: Tue, 14 May 2024 21:09:18 +0800
Subject: [PATCH 133/302] dss-server : dss remove after git remove

---
 .../OrchestratorFrameworkServiceImpl.java     | 20 ++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/impl/OrchestratorFrameworkServiceImpl.java b/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/impl/OrchestratorFrameworkServiceImpl.java
index 18c426c1f..a0b73a471 100644
--- a/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/impl/OrchestratorFrameworkServiceImpl.java
+++ b/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/impl/OrchestratorFrameworkServiceImpl.java
@@ -43,6 +43,7 @@
 import com.webank.wedatasphere.dss.git.common.protocol.response.GitCommitResponse;
 import com.webank.wedatasphere.dss.git.common.protocol.response.GitHistoryResponse;
 import com.webank.wedatasphere.dss.orchestrator.common.entity.*;
+import com.webank.wedatasphere.dss.orchestrator.common.ref.OrchestratorRefConstant;
 import com.webank.wedatasphere.dss.orchestrator.core.DSSOrchestrator;
 import com.webank.wedatasphere.dss.orchestrator.core.exception.DSSOrchestratorErrorException;
 import com.webank.wedatasphere.dss.orchestrator.core.type.DSSOrchestratorRelation;
@@ -282,13 +283,18 @@ public CommonOrchestratorVo deleteOrchestrator(String username, OrchestratorDele
                     (structureOperation, structureRequestRef) -> ((OrchestrationDeletionOperation) structureOperation)
                             .deleteOrchestration((RefOrchestrationContentRequestRef) structureRequestRef), "delete");
         }
-        // git删除成功之后再删除库表记录
-        Sender sender = DSSSenderServiceFactory.getOrCreateServiceInstance().getGitSender();
-        List<String> path = new ArrayList<>();
-        path.add(orchestratorInfo.getName());
-        GitRemoveRequest removeRequest = new GitRemoveRequest(workspace.getWorkspaceId(), dssProject.getName(), path, username);
-        GitCommitResponse gitRemoveResponse = RpcAskUtils.processAskException(sender.ask(removeRequest), GitCommitResponse.class, GitRemoveRequest.class);
-
+        try {
+            // git删除成功之后再删除库表记录
+            Sender sender = DSSSenderServiceFactory.getOrCreateServiceInstance().getGitSender();
+            List<String> path = new ArrayList<>();
+            path.add(orchestratorInfo.getName());
+            GitRemoveRequest removeRequest = new GitRemoveRequest(workspace.getWorkspaceId(), dssProject.getName(), path, username);
+            RpcAskUtils.processAskException(sender.ask(removeRequest), GitCommitResponse.class, GitRemoveRequest.class);
+            orchestratorMapper.updateOrchestratorStatus(orchestratorDeleteRequest.getId(), OrchestratorRefConstant.FLOW_STATUS_PUSH);
+        } catch (Exception e) {
+            LOGGER.error("git remove failed, the reason is: ", e);
+            orchestratorMapper.updateOrchestratorStatus(orchestratorDeleteRequest.getId(), OrchestratorRefConstant.FLOW_STATUS_SAVE);
+        }
         orchestratorService.deleteOrchestrator(username, workspace, dssProject.getName(), orchestratorInfo.getId(), dssLabels);
         orchestratorOperateService.deleteTemplateOperate(orchestratorInfo.getId());
         LOGGER.info("delete orchestrator {} by orchestrator framework succeed.", orchestratorInfo.getName());

From 21e0ee5b0f8dabb2a1d4144eb7019610e56977b6 Mon Sep 17 00:00:00 2001
From: qweqnotallow <747839893@qq.com>
Date: Thu, 16 May 2024 10:09:19 +0800
Subject: [PATCH 134/302] git server: rename fix

---
 .../git/service/impl/DSSGitWorkflowManagerServiceImpl.java    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitWorkflowManagerServiceImpl.java b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitWorkflowManagerServiceImpl.java
index a9e86d028..63dca3cb7 100644
--- a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitWorkflowManagerServiceImpl.java
+++ b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitWorkflowManagerServiceImpl.java
@@ -516,8 +516,8 @@ public GitCommitResponse rename(GitRenameRequest request) {
             // 本地保持最新状态
             DSSGitUtils.pull(repository, request.getProjectName(), gitUser);
             // 同步删除对应节点
-            String olfFilePath = File.separator + FileUtils.normalizePath(GitServerConfig.GIT_SERVER_PATH.getValue()) + File.separator + FileUtils.normalizePath(request.getOldName());
-            String filePath = File.separator + FileUtils.normalizePath(GitServerConfig.GIT_SERVER_PATH.getValue()) + File.separator + FileUtils.normalizePath(request.getName());;
+            String olfFilePath = File.separator + FileUtils.normalizePath(GitServerConfig.GIT_SERVER_PATH.getValue()) + File.separator + request.getProjectName() + File.separator +  FileUtils.normalizePath(request.getOldName());
+            String filePath = File.separator + FileUtils.normalizePath(GitServerConfig.GIT_SERVER_PATH.getValue()) + File.separator + request.getProjectName() + File.separator +  FileUtils.normalizePath(request.getName());;
             FileUtils.renameFile(olfFilePath, filePath);
             // 提交
             String comment = "rename workflowNode " + request.getName() + DSSGitConstant.GIT_USERNAME_FLAG + request.getUsername();

From 27e61bdfc8cda09cdb22228df28cbcbed2565242 Mon Sep 17 00:00:00 2001
From: ryanlei <ryanlei@webank.com>
Date: Thu, 16 May 2024 10:56:47 +0800
Subject: [PATCH 135/302] feat: dev 1.4.0 changes

---
 .../module/apiServicesExecute/result.vue      |  20 ++-
 ...2\344\274\240\346\240\274\345\274\217.txt" |  64 ---------
 web/packages/dss/public/streamis/flinkJar.zip | Bin 21674 -> 0 bytes
 .../open-source/scriptis/apiPublish/index.vue |  12 +-
 .../dbDetails/components/tableList.vue        |  84 ++++++++++--
 .../module/workbench/script/script.vue        |  15 +-
 web/packages/shared/common/i18n/zh.json       |   1 +
 web/packages/shared/common/service/api.js     |  47 +++++--
 .../shared/common/service/apiCache.js         |   2 +-
 .../consoleComponent/resultsExport.vue        |   2 +-
 .../components/consoleComponent/toolbar.vue   |  22 ++-
 .../components/vue-process/nodeView.vue       |   1 +
 .../shared/components/vue-process/noder.vue   |  11 +-
 .../components/vue-process/style/index.scss   |   4 +
 web/packages/shared/package.json              |   2 +-
 .../process/component/designtoolbar.vue       |   2 +-
 .../process/component/nodeparameter.vue       | 129 ++++++++++++++----
 .../component/templateSelectDrawer.vue        |  38 +++++-
 .../module/process/cyeditor/convert.js        |   1 +
 .../module/process/cyeditor/index.vue         |  12 ++
 .../workflows/module/process/module.vue       |  65 ++++++++-
 .../workflows/module/workflow/index.vue       |  35 +++--
 .../module/workflow/module/workflowForm.vue   |  24 +++-
 .../workflow/module/workflowFormNew.vue       |  24 +++-
 .../module/workflow/module/workflowModal.vue  |   3 +-
 web/packages/workflows/view/layout.vue        |   2 +-
 web/packages/workflows/view/process/index.vue |  82 ++++++++++-
 .../workflows/view/workflow/index.vue         |  16 ++-
 web/packages/workspace/i18n/en.json           |   3 +-
 web/packages/workspace/i18n/zh.json           |   4 +-
 30 files changed, 544 insertions(+), 183 deletions(-)
 delete mode 100644 "web/packages/dss/public/streamis/Streamis\346\265\201\345\274\217\345\272\224\347\224\250ZIP\345\214\205\344\270\212\344\274\240\346\240\274\345\274\217.txt"
 delete mode 100644 web/packages/dss/public/streamis/flinkJar.zip

diff --git a/web/packages/apiServices/module/apiServicesExecute/result.vue b/web/packages/apiServices/module/apiServicesExecute/result.vue
index 024b9d1c1..759b6d8fb 100644
--- a/web/packages/apiServices/module/apiServicesExecute/result.vue
+++ b/web/packages/apiServices/module/apiServicesExecute/result.vue
@@ -155,15 +155,13 @@ export default {
     },
     // 验证发布和更新的默认值是否满足条件
     verificationValue (row) {
+      const method = this.workInfo.method || '';
       let flag;
-      if(row.defaultValue.length > 1024 && Number(row.type) !== 4) {
-        this.$Message.error({ content: this.$t('message.apiServices.more1024') });
-        flag = true;
-      } else if(row.type == 4 && row.defaultValue.split('\n').length > 5000) {
-        this.$Message.error({ content: this.$t('message.apiServices.moreline') });
+      if (method.toUpperCase() === 'GET' && row.defaultValue.length > 500) {
+        this.$Message.error({ content: '不能超过500字符' });
         flag = true;
       } else {
-        flag = false
+        flag = false;
       }
       console.warn(row)
       this.$set(this.tip, row.name, flag)
@@ -211,6 +209,14 @@ export default {
         if (this.showConditionList.length > 0) {
           this.$refs.searchFrom.validate(valid => {
             if (valid) {
+              const method = this.workInfo.method || '';
+              if (method.toUpperCase() === 'GET') {
+                const conditionStr = this.showConditionList.map(item => item.defaultValue).filter(item => item).join('');
+                if (conditionStr.length > 3000) {
+                  this.$Message.error({ content: '输入内容总长度不能超过3000字符' });
+                  return;
+                }
+              }
               this.executAction();
             } else {
               console.log(this.showConditionList)
@@ -337,6 +343,8 @@ export default {
     margin: 0 25px;
     .content-top {
       padding: 25px;
+      max-height: 600px;
+      overflow-y: auto;
       .alert-bar {
         margin-left: 15px;
       }
diff --git "a/web/packages/dss/public/streamis/Streamis\346\265\201\345\274\217\345\272\224\347\224\250ZIP\345\214\205\344\270\212\344\274\240\346\240\274\345\274\217.txt" "b/web/packages/dss/public/streamis/Streamis\346\265\201\345\274\217\345\272\224\347\224\250ZIP\345\214\205\344\270\212\344\274\240\346\240\274\345\274\217.txt"
deleted file mode 100644
index 098bf4437..000000000
--- "a/web/packages/dss/public/streamis/Streamis\346\265\201\345\274\217\345\272\224\347\224\250ZIP\345\214\205\344\270\212\344\274\240\346\240\274\345\274\217.txt"
+++ /dev/null
@@ -1,64 +0,0 @@
-流式应用物料包是指的按照Streamis打包规范，将元数据信息(流式应用描述信息),流式应用代码，流式应用使用到的物料等内容打包成zip包。其具体格式如下：
-
-xxx.zip
-    ├── meta.json
-    ├── test.sql
-    ├── test.jar
-    ├── file3
-	
-其中，meta.json格式为：
-{
-	"projectName": "",  # 项目名
-	"jobName": "",   # 作业名
-	"jobType": "flink.sql",		# 目前只支持flink.sql、flink.jar
-	"tags": "",   # 应用标签
-	"description": ""    # 作业描述,
-	"jobContent": {
-		# 不同的jobType，其内容各不相同，具体请往下看
-	}
-}
-
-如果jobType为"flink.sql"，则jobContent为：
-{
-	"type": ""  # file, bml or sql
-	"sql": "select 1",
-	"file": "test.sql",
-	"resourceId": "",
-	"version": ""
-}
-其中，如果type为"file"，则只识别file字段；如果type为"sql"，则只识别sql字段；如果type为"bml"，则只识别resourceId和version字段。
-
-
-如果jobType为"flink.jar"，则jobContent为：
-
-{
-	"main.class.jar": "",   # string。main class的jar，如：test.jar
-	"main.class": "",		# main class，如 com.webank.Test
-	"args": "",				# main class 的入参，即main函数的args，请以空格为分隔符
-	"hdfs.jars"； [],   	# 依赖的HDFS jars，如：hdfs:///user/enjoyyin/test1.jar
-	"dependency.jars": [],	# 依赖的jars，如：test2.jar
-	"resources": []			# 依赖的资源文件，如：test.properties
-}
-
-
-也支持直接requestBody为JSON的方式创建新Job，或者是更新Job版本，requestBody格式跟meta.json一模一样，只是相关的文件是工程级别的文件。
-
-
-上传文件：
-/api/rest_j/v1/streamis/project/files/upload  
-{
-	"fileName": "",
-	"version": "",
-	"projectName": "",
-	"updateWhenExists": false
-}
-mutildata带上文件字节流
-
-/api/rest_j/v1/streamis/project/files/list
-/api/rest_j/v1/streamis/project/files/delete
-
-/api/rest_j/v1/streamis/job/upload
-带上zip
-
-/api/rest_j/v1/streamis/job/createOrUpdate
-requestBody为zip的meta.json
\ No newline at end of file
diff --git a/web/packages/dss/public/streamis/flinkJar.zip b/web/packages/dss/public/streamis/flinkJar.zip
deleted file mode 100644
index 80b64c836c3cc3955c215e4ba6bef7fb767152b9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 21674
zcmV(#K;*wrO9KQH000080HTgPQ}T4jC67`70H|aD02TlM0A_Mwb!22^bY)|7X>V>V
zFfK7JYGHD;S_Mp8!4}2cS=>IwDX#svyD#qUEU>sc6n867ic{RXxD|JIcPZ{r_?qu7
zFS#!-FF7YOlQZ|85fyn@H~<t95)xEHv>*`bPaXgi9F(G@x+t@(k`$|=sFJLdBv742
zQR;OV3Q96=1SNzG0Dm9!BJTeS(f18~IgPHANCs~2wOpd|aQ0}IpYHusTXK4xifPZQ
zkW`Jjx?_d3zRDKTLr&IUUU#ko2S{ff6Smn}DUW+Ul@~RCJ2@sRq$dKH2tzVTPx5Sa
zH#IDqXrJXYweId-m$C|%PSqG}!G`IuVF~4I-Fp38U@p4iC35VkJ}q(XCN-H$I2CzB
zB&-vGk>p=Dz3$iX_dACC>-a;*V4;2k{LOEe-@N_|Soaq|>|ckyqZOAe2a6Nf(a8er
zYGdJ22~>1kVMA+w*1}?dX%IOEz&43TkhSrM#=_rW6}|UXw_nC*l>bb<fFAyOulj0T
zkKZ~M@jah{VuR{ya&o+1Fm7P%po-3Dw~Z5?*z85jYX*z{0D6z^H^u`cYxojuy<BLr
zsX)!c`o<t#T*jGUqFP5X_}wm~Hm;A{j8@`M;fphLM=Tw>qLk*jxv2cRiGfOxD7GH4
zk}+6-MBlak!?b>|3ZT@7QfSI}NRdTdwkRtE+hR||10}XnLj2Z!9Ys&s^i)J3m8KeT
zElx8|KYmQRi}l@Ans69_lN?ko7fI*%c*ormw{YMzhHiBAX`nI@Puy-&O-o{MdBp_z
zTKnuTV(+OU*ZGw^*Y%(cNP7cYzvLzdFdlpw*{eHgNw^OdcNpF?cW%xbr?q!e%8$s_
zqnXk@o;%khJid5^YNJ#n+DKL#;ur4pSNQoLD{fV~QKlbAcJSsdQ_Y+Omvm_c#U1-T
zLlVuDC*&MEdZ{OQwXZen#vRdP%AJI!)wAyxYdspD^aol$C>}P1(>F&@ID^}v3PGx5
zzP2$QA{=3kwEKAnpVDlSHnsY49YQkcC8Xxnm#%Q~X5+0>jFJ%)nJXyDXo7w@C8LVE
zz?$Oc7=7$}V}Tko4=NbJQKY}brt!UAlZo5mBEL~<(hhYksYoLvW<v7f&d$fif&&lM
zhzW*9Eyxfqhug5D9PN;$V^(prFu%_)x2r_(rJnjA<@i>kkiTu7gV0UACpn<KTbbbT
z!Nb~{6rFpmVm%-|8x)^qEZpqEm9I$g!U`c$3C%qS0D)Leo~D=K%}$B-4{}MK9>Iy-
zFUaF2h7%eW1iz8&1p4c%>#sG-2>*|?j`r(tak2oJgDspK!LENL_kV<?`U|WS*u>3T
z!ot<U%+<ybB<E<#VrFmR;?k&fq=l;mcoP(*jiHi<t8jyrME^yx+X4gt&rR4x{9Z$E
zMS33_ftJ&mL$tPXt<k4)Z5HHibeeBu8lOGme;)A)`&0fYPq5vQ7Df(EV&s>jt><Uw
z9X{u+k2@PDozU9R<&4C&(vpB5D0gM_SG=`QJY|O>RtXS{vcvuY6pXJbG>>d?a2FX-
z15;l&OQXP%r~SCl0$+m*=mJA$^UARfH4-I^pu+W^X)HzjN1@cF>mq7lYW6;1Y-Z@^
zKyiTGU<Vlq(KaDbdmr+QWx8d<lbFLTAS;AXV(5rOQ69@J#`N(-X@{f5-k~mm_Zgwc
z{ikrenBakgXMwuKADkR$(Po(qHLlWy4g=`tU{6g)yeb(;xI^QLAhxN3bFXPBGFjy9
zwJ14Hb1K?^!9YzC_5_nhQlYgHG=~>$g=qL1`-*J1*C)Cs3CIFhMUYd!8=NvWZeA>#
zGf|vFQRtqWPJTlUR%C^1zC(({6W79)X1LE;;?!+2!+i6Ip8_OR#EAEZVXN3le_F-G
z#XfwRcRTrW+A;G^QJjlQ*AJId`#RR_8X&_;{!U9cKR}4hJ8h5$T=w?HyYw#p2N7^Z
ziCSVgx*)jZ@b%a&5gULo^MS!sV6NcWI~+Za{hO_J$Xy`PfTPoqkY1q)nzEL%Fim_+
z%@H<Hnvy7N?<r&i7nV%mN0?Ff%&y7mI3IHDNWy|DCkwZhY$Nff8ntdtVx=veaAqK~
zWIvFf=c$7dePYWCp4HkDo0VPtw8kMle{6=V=STgmf)}!3Rafm*<_CiyPRUtJ%VA8e
zMNi4@a$>{Y6SQj(P^GD06CK@gn>oDBFw${e8p)Bf;&akD&bfhU_Ak(_E-`v5(1`5s
zICZ;!dGyvgizu+tNJTkwLB6ha5fqN;{28WV3x-8ak|t~=NoG-JB=(qCsAqs!s9O>}
zcUwT*GaJZ(*^c^SOxK?%{5~oV!q%Q_{h$z)nxNKW3!(NH5#PZr6dAXE&<9uN8p7K=
zh{*xp+goXKlnK~=dN(wNPnVf0Xij}XgfCesIxN;cKQX&J^>WbBL+d+K<J9viV*@_<
zWoe3(s@bT<>M}Xe@|mojd4~KJi$Y{L@tMv!^IprD7E15eNpoB287d>kN89lNs^lk)
znx#j%!OXFl^kTY^Z3bP82$VK!k4^kk<7t3_4sVW|AFP4RmJ?&h$EfOy#wf=NW^tb&
zZN(p|gnHEMD?Ta<fR@QfyQIQ-B|2R+PQ>q%ag^Q}DA~q1SspmjNw`mgGi@N<U^Kbq
zTHJTyj!&8VGD^yQLPlWS=3k29ur;is3c7OXcu|izZ7Urs;S?>d&68eE>F_9NrR80-
zpgLr;MqTIv=A2Gu)#bw;`3kB8r#J7S73NdgD?!slVR=a{_FSnvKb^nK*imZag^QUv
zeu=kwdU4JsFQgazxUHR*m6A0Vw%*hGjd8<Ho3GcmXAQy+l492S&@Mpf{z>1`%faMW
z`#eqYI}UFWzDIrBg%y;IKy~vztx^Al1_8>QDEx-a1GzB6pfy`U`_bc=^h`V@!|pEB
z9v62i2dKpi3&lT=t<T=)7g@CN`Drwy6BMH4IV^19PwPLn(m+uP?W}}E=NmuZ_DU&!
z$#H3%M6fud$O(eH%ilzSca!@(>B-JcaXcx~`Mhg{ok41Lw4%_;R;hrI9=p(0g~JA0
zeyF!iNr0=PluZsx-WAf2X39N}l@54~PQjaLdDa^J$c<ibILQq-VB^$I3Yo6G;)4;v
zDC$*-WP6Xu{DD8BZhYS)1vmd)#IP}2#4pzryUR$+TC2U+Wv@@zvpU=geHk*VrD@Xg
zh~KkOPzLYH5=T1HTyj&1O}c|Y1kH474mSq*6iX-8%>7E+%OcXHv;(}R$sS!^iwY{(
zLonQ-mo|D*)_RdmW673_hI!kR4ZAzHbgH|g{!Q%Co%@#d4#OsA7R#((0^H9O>c#CW
zfEOL4`vzYk{Z4{M3@4q{r~R-rsC@!9ah9!fDD)G0dr%i8F7h``F+sEt9_@o}H#k;g
zmfKC+;FFLM0mv-sS*i(>FhJiKJ#RzWl=t;`+!Rp~+PdhC1Mn6CkFuPhd&`?oT|d%#
zv-XgvnfegWH33mjJ<Rum|8YMxCmi$h;|>)0Bj#_aRJ>s^n+5_DR5#W?s!|kxze+iR
ze^;UAv~9FV2k_eAIl0i##eT8#i(fVY7_N|@cO<1GQ1ML@MPWafI#cr}W)&0Z-nhoM
z`j|8HC+<+Y^H?dLQpeSQXf2@Dw8zp++HnEL2|twV0{umllt6Q6y}yt`!csE-FnN32
z?(KHcp;cY}^z*Il+5-yl;v3;z&jObEy9zP<12g*G8Fu^bFkAiaR^^M{#W?k9_Z0vk
ztyp<arQQRx#gGGT-@NU`BC`Zx;toP_LEo<rN%rk3u>_YEM<?&uXE)2iy9=g-T?^%x
zI33s;1s4-^MK@!F?pu1(+bhH!RAJ}CXXiE#9j+I!=&Y!-@M(@D<B&bXrh~ZKd!&!h
zL7zYq=wiL-1L$;iduw7yhg2a3L%T~=-CMPJs>^rk0x#8VINo(9vytn;EIb0UKJGOE
z*7glrUu=ij)u{5YbzvN2CzNSoVoa3uA{hqUt>_n#XXHx+d9h^*LO*FOQS5JG^Y0Ox
z%pYu?xuFXs30P(G;>2wg;|vH+)S}%x(Fyj8@jE<v2@LR@avU`?>{V}n{IP6OBI4z{
z0TC%&$tv7omR)HKuRB5>q2Q(^y_=;IOtvT4%?5XH;wY^Ib;X${)UL{I414-#9A3ws
zn#bemS{^=TQ*Ns=I0g99XwSHmoT|_BiiNXH88DHhS(_5|@=m+%A<_&PIkbsX#^}f6
zWpw0F0)pb)rW(1DI-2O0qjR`f=ypvl6H~g;$H4_3G3|pp#UOT^9ag%clPB6XBk0_1
z@4h5LCR?z;6gRC^dmj8!SlZ?<w>XqO%TAU(HX9?w#RQa-@nnVyF;C$ngvIXy_8`Bw
zVWx6uWq|i*JYnqph4XZawW81`*tzucwPZx~9z~u8GK6Jk@Dfcjwe5#A<qOOTMEi77
zaiM(1Dww$~oTsG7x+b?|1((E8+$;&0@{i3B;~)dxJ&8>v1U9DN+YIcOLi7P_Yx+bp
zm^TP_;d>m1>$-hQ=u>+=Q=3!EQPQQrfTzl>4h}1X*qG%F-=$iXTSK<W7*mN}%rL@7
zVTY8J;780*_vTve39{5yU~jxOB-}+TPZRzUC(PM^#J+i;5ig5ThgI8UhNy#m>>{{p
zazFoz9_z?n`y1tW%t<=6`-W`=sASLA=@B&SEzmzoOs}fUb90seI;lEP+HBXm3DBD*
zYi_dIk(3Fi8)t`lo2egY#AJ=XVqxF5@S8cVpMwrqYHnAAnVAYwMrv?8eHlvb6bQ6?
zsEyOQ#63FYCKK+P;Cj&?V7+LGL%jGR;61c9S4MjDP}E>Q5JK!<w6pLK+cl3TjZfCu
zcMkUn<avSxacmDgd=OlpyhPNWzmO&i=*e}<?v07#b(S13Dty3SpJyvEGbA?bv-qkv
zc^S7`>hARmH~nO(fWAGon@Waaz9)8ir<*h!g)bgJcUa{(c~mA+e>k4oHM+?*-Qut|
z)1|YN^aKy)b)|-#-rk}0DoT#FV|1G(h(FKE%{Ka_x$`3-vR~^izJ4^T4q8)j#fAEO
z>XE*-s<iJ$8Adviu29k@hP`>V2#xBlFs4E}{k2`|MHNQN_lP(du;*c@$cT6N<(-=$
z3e3vjbQIrsFMj%T>K#Pn)+;}PKz+&VQ(bw0nj6NXyfFg<4n=|q<bXCzZ*59lZ!-?(
z9P^e@vn#yBb1Xi0N$YA_J#kE-O!Baql_M=+ori%|PSW?WijbLDMEQBaL}}1+{$7XW
z$|q7vjkTuto0>b8?kl*@`pkbt1f=;HHvj6os6(o_mjFR@vFwNm5%U&&YYn^)w7N0>
znItL9Gkt1aCKy#06-=`C9JR|gd{3~n5q4m4RN^Z#gsBQ*O~M2tP;Lmm1bh@k7J|>6
z+V}d%n>u6yFYbQUgZ;YTg76_q=~nXGgmeVc9~S!+2C+Kt)Yb11PhuaN%pUYvTyg}a
zfuk)}uBfafm{3DpZtjzo#>mm|oNH`?5$=jgZ{z7Nraw400jWwH#}yNE4Vzk=vY~8C
zkEAf62Zjt-_4W>d9m7{GxbSOKv&cF(kJL_6vbn?#R#_WjdoZp+9;z<%(*Q5b%I5=>
zR&+Pk&hU6c@t;RtT%=Jvl1r@)7#<Bgk_3~3H4URXN;b`VsajK%?GjbnRH)XB;v=L@
ztj35Q<YychQbmh{q8{lXmUFRF<q+wmp*iW<<CRE)?}qZB=!9KsG8~8qL<c5PwxRDS
zO74L6f^o<KL0m$yR!*9=*GLP_tWBmLn^bMHF6bASma>`Ic%qfJQ&6^<{9=;umWT@$
zz~e{T>`!q3$cRo3i*`=l+>ZT#%B!QRwdXr<%C-C{Ozx1?oK912=unzMw0sJ6FhcVt
z{3&2?YP4T%(C!hARuvxgHiHqxO&r=2_SPA`El3k+D*>wpXNabCT#VYnIlCva^s>WF
zMF4L5UeaJQ7NkbG!99otvI-Sy3S4V`SVaP{h+7ddMDUOIg3KYTxoR~Y`=kWM-*6^N
zhbMDl!o>;w!W^jGN|stace@%86rAr9`O<gRmSx>{Mhh}mx;#AC`qc9Y-zLpmwduvP
z?Oihz0|s4)X6#s%q~Oqm=-zF2{-(a`-W4PzBSJyt5&on4j`^p%H4Y~37NCD?5ljBp
zaLeB~1oPjoWB)xi=6}leZ;)5~1v%HhOYY?8z~bp(Kc}tgxbgwVzX|#cv1%%!>0=@F
z59o-B`9Rj%+B2RZO80NAixKe5QyjRFvq|ct1&0BhL{UjJda^U^+wQEGm68|{oEyB^
zL>w>U*9brF1x&^2GYDlzKP5UVQ9U@aXjzKmQ2}*6W)QQ$d;RjWvJv)!d6Y~yg5Ose
zT2b1h9{LU@G_=AZAu-%O?f%dyAxfA2imURIzEfW@O@XjE_JuvhMc>{rVrmF2$=9<%
z6u{JneF(E6G67qH4i$o5A5NJm3(g|X2IJ=n^hA>G6vJ!MJKZn1*ESX(S?1F8g5&jc
zJ`fPE^I^pePJBTy5WI~alE)&vi2#8fj(u8r3iRF;QifUbkA(_KF!37G6Q=Gll)MXW
z952@u*1j(XQl^Iob2TbqHQPpE+amlF%}r=zf7HRU=OM|}75Dp^^aaf1iK%TkMn_H<
zeMKQL+&~-kQ`HGRgXLT3zOlSSy0M8IFPy5RF4I!YvlMjCyI&IDxJh~>r;sV6nrwoA
zP=WbfgH8f;^^XZJb^^I$@q+_P+XE+<s8`OuE}R{@qqHtyKk@PEY8K1rrCU5-#i57e
z1<|*XrMW(A6DS<}UUG2Qen>1Swz)GEsO%>@3)6c(D{P}nq*WYQQCuk;uZfhdn!(Ir
zh!in*27&l5%vTpTr$SzXlwZG`dliTZkEXU+BvNAPFy3H_NBBvdXIkgKou7<sRtB6>
zV9F2GBaYeGnA=|W59g3m<id68cjWf=#CYplhlsM1-uMW@*o`;jc(PL2Epzfv$IA*F
zLP&2avN1QrFG>k4IV``T9wp|WhRhR&E3zu2FkR^g=rZVjXXgxrQ3x01j^j`#>c~$#
z!m?Ay+ijomJIxL4_G?#Vg$p^ihCz!3eMJdbv$6^MLPVknWH}p@{<NOSefqg#2%g&&
z1SlZ#l0LT~)c&QuN~vpTf_0a9*a>k)DD-$*RFF0ja&Kn8MSGNWfX)TiT_cnFciMMJ
z89*rteBgPm@hXr*Q@+`3ZzD1QeB6l~a#xDSrA{;Y@Xgp)ob>MSQ_Xu<3E(kn^A}sa
ziR>r3K&yik19d5QONv41;Y<PV%dckX6DE_)Yel8{Z~Br-%ZzdsS9eV|ZwyirK7dDL
zUAWZjJ|-(CHA(e)&3OAC_bj$SKcYON{ojLpehl_`Io3zBV4_VFKK$$}VKEjyA8>ah
zSYs7xEPY)?al80xQAHMPi`t0HX)PG`2*~a{V2_R;Op*kYqwq>pTO{^3jWZE3D5LD^
zvFIoI^LEs_4bbs;_yIi|1nsd7$kl$1<#k^mv`D9J5Y9ZTL9g(-y$?=;85=Y@QYJ&#
z`OyDaRwO(qcs|ArrU*+rjNDSbPE7A9Plf7$U2p1L*rLeoZV^AYS|4e)g$@%iOvmpc
z?gNGM;6od(d4ttIY=0hCb@rKpTyrItPoUj!MHCJ*2}u(Jrik8bk)7N`8W!+f(tJgg
zId3m9YzS4H$By<RW2gfLX-0kY(AjAUU9!!5G0Y0(;mI_Nc36(NrB+MYFwb{Sw7e1U
zsPCGIE6W29g%EbT`})ig%4=W$;gE;}&4M%xUILqd+1t<NXFg2p@i!yI_|3TM&YJd1
zgSj3<YksT+NFluT4_f_IQ)P*9gU3pk8XRU}K5Y7vrWr_t2x@R$Z3Rl3R@DayGsJ<c
z_72R0O^GT`HF_WW)n7neyT(sj%Xzy|+?Ki)T#K0VyN5~@h*?BzNbiHdF)5#qxnuKo
zb!8P8vDL+42R>JnQcgmG>0i1?SXVcGAzR206pF-4AQMpevUR@L6+6D*1Z3cCDY5Ck
z7)NZ!Cpci3^WJ?H;sMUlZM|=EU>vnUrv4>NBkIiojxH3Aj>Z^z2lpC&sFkzBIl#xh
z9uXh!u0ta^0%;WxoN`Eu!*ZJ-Y+xpS#SM?a==h1a4BH9YLJ9=0Vk3N_Gpl{R-y!YJ
z>4YD!kR+<tz|TdJF?#X^oVFA^xoF4hsiHEm*+I-6O>3UTR=V3V--CRO%YbWry!i<l
z1@bXnGJgWp=<V_nUqZ0c-z1UU{#s|Og>h=A70;cA&X<UsN5+kXFgCZRGJ+8kf@(ve
z_k0mFAbKsK0_^(HSvH=Y+_#uzpt#kM+vB!2@GXJ$&0vSWCwzx9&M#x=bVg+fI6?Ut
zz`GLZS5m7C+r&)I#RFeebVowD7!@>S_r2ux7^(>mlOOV4I(XsLcX>#m<h0NC#dj-9
zI<$2#q}xxeERnWPN;U6t$RU2RAL3V7d+u}gxLs?$vjRMXZRN>%PFKIco7wM2XL9F@
zV7~SkQZZB0U`ii;0Q&kuO35kKhb%blcz)V1F1t3(G>(H+-z|=d$71`bsJl~WM7nzs
z>4#^BX*W*084Qwmh>PHzVc$(n-&KFs_qv$T8%Fe{G(%xwPi)6g*c3|^Hy3}4Tr9pP
z9MrXpu`l&Qw404+hncFvs!-pxDzWcmYw)4`!n`cSaLsWT<RHXPkJdWuG_65IKGI}T
z`CO;&H-r}ZH4lAX4wDwKsK~4ePs+z-CM5gj_O{L=aIC(}vN~)Meg0y~u_>6my)2P2
zVr9S4PET-NXJeRNP+LuMANNBj*D_)?ftYRhKCg8-AC|!6D=+oI2-zvsOZJPbI~w&b
z7cxAYc0==};a`=g$rZSP2kGM=53s}DnCAAXU*okUp}JPylNY}K8{%&q#SL_R+QqNE
zQy=j^vMc=miKF=A(H78Mc}$*Jj!9NgRi;e+LXk;+Y-djm0}&hoL<Ph!;h~LH#xPaJ
zFaxqf!~rpAF=$@R!)nn{oY&X(=r@7cH~BBqFcW~4hWzi-DJio_v%5H7NLjT^Rb?%8
zO~J_c48Qe8A7~(hCckc{>pwJJaK8>mu+_h1)=+<sF>x|6v$puRpxA#7wY0YZ+5KAt
zWPgjm!^Gas)f(*RW@Y_vkx~CMGBZa9hkw(_zW*0FEkLd|u3rBZHP63CEo%R3wf%0R
zE)}S#jH?O|tj;+~;RDbcMg8I<g@T?jl&U&b5HXHSq9i(Ui+6)KKbxy9e;?sar}3WQ
z+N=aFvqXXOUeAVk%)O#CJu}Ow`I*nTf40w=7pHJQz$=0=F{W4ownI>8#$q2{3?m_`
z38^;{ZiYG=o*35DFF+sNbThJgR&gxDyR9q<7a7Hk$49fq1wxFXL2NR}{AO$oG-GX-
zHErK402G(Z(E^EuIs5Ynte>_|e@R1Ul}1>c<j!7x4WoR3=C{Ie-TK4{`oY(nZ!o@p
z)6o9S>cEZaJY(F&Z;B&ooGB!mJ3BRICEa?kXjyhz6FxTZvSE}t_-sCj-#7OJf5Pha
zwvvqM$EXwquA82UEebXk!2?<)Lqv(kf@gP;+!Gs|OIu3$n6#qS;MO8TiS>Rxnt^Tu
zM&&+DgUT=q!AyT0Los^u?11E_C=3bphCG8lhgFk|2P1gGWs;@$kaAOe7nHNF83TUd
z>r!&^7Bj<ylHvFSyJ4Amv+ztP_0$StecbvbQ!;Czee%>M2VbZ3=@jvWoM{~L0_!F!
z>uNigQ8Z89OJtz%=_@a>Gsm-t%8RLnlm8eZ`X&K`=$U7{d!#$iVCj|xe_vc+`Ll$9
zD+2co!z{@kHPavWX}Ax4ibceyg{>~fb=t<FVYpVj2D9NZZ$uu3<x5tDuDl4Qx51a|
z-8a3{>nP!#`>MQ$>C8Sq$RXZDuQH~^0D^G0$26bBdo~4bE&WjPd(sQ6?@FVT+V^H%
zy?kF7;M2&XJA;@swuQ0cG`8Yro{8%^ao#X&6l+L}?l<uON6gd#VRA2^8KGc!snV|q
z@T#`>1;3R3+MOY9T8a>$AXajT@bwW2`Iizx6fDW#@ak|ZJ12{bJw@5tg3HN!e;JG~
zCsA0P!22_J7#rp*6@4ngTJf=KH0g;HMO{RLg1SV-8)|S?gmq+S*$29dGL;o0%_&{U
z2S3<-1v1Mw_Wh4pML(f`GmG4SpS!nzJ&k1l;mNJQzc-82!6qOVliz0X-_50*lno$>
z24J9b1XL&6QkViGS&6SJFD@3TS%`=7GZB!*1>gb{%^lO&52cy&(q{3+?F4KAH|7XP
z-K5lt$;fhjFC4+76V0t-j=mR^2cLb;+7Eok<4=v=1m4KHNSmmTOekZ1fv=-)QTx5g
zf^6X(B#wj+B$XiciTB$(?e1qjkhHNeWhh#;4!(!jU|7xYu>rmv(>z|NWZvei18;qS
z$k6n9<FMrz-d<Gj7y4^#vO*h|xjJSKogm_@b@eYr*<`@(%WR7*kCQ!z`WDJ2d2^!i
zU&5;{12m%VJ5*hwH5I#4vw>@hQBm}OvE70si*uSzK#|}#ZMWmrKJ#vdbTWRM<*GgZ
z)YVdyR$7#*y~SvNP}*4WFKcS;T6lFwCB$c?Dtk-&>R78m4bxll4l8W@SGd%yDW;J5
zI%{?!W@~>{0va)j*gf)Sx_3G_cObCCbFGdOLCHDLhE%EfK&F^!aKd;UFRWcdH8J(e
zX9grZ$;!jj_-)I<O+K%0wo9!jQl>Kw;{xx08NHk1-Dq5;tv{OAG(37`0b9M*5X7F%
z!8X2)*Jis3>sxC4`i7@3z21dzrdo40>uOK@fJ9NhIPJXA1?!u?sm^;l)}pb@UXIeg
z{Nlfs-9!VMyG<EAQOe1QJ65ZgFEpy)nM}v(Hy#Ym9<X4<<7U>t;XWQ5ic^!_F-3G-
z{yMTX!!Q<AnuPzcXh#3S`b2GftL{Wu;wz|1(6oBV{hM#w;F|I`J;4ccVM+(L1;)oY
zN|x9ad7A<9o6HQfw{k|jnPP@^!V?EK$NQgrYBe)C*6jmFZ$e6Belg#U>T&Wh<D#HH
zQ%xgyrtHeiNSv_K3s_Pcl^7&xhRut-5TzLHHuB0K6glHq$q=u@D@>AKUFy6!XZ9R6
z#9i$?WWu6-r^EcxKLCq3sXN|($nJzeye>g_fZYd>auVf>PfjI$7}qhgm9!nLl#3mL
zH5Zg7Hw0rotah4i4zQeg8l7DO=6%`}KugXl9N$E!8er;gXc+`!hWu)f32wFk!RLti
z?jices5mE>zy27V$r_OkjCuaWOo~10$2%awpqNntoTax2i)+I;tWGiSLLAiAJlmjT
zS=K?hD6@r8rsuW~T*J@rxgYyUkf;yu$zYECw=v<gnjJZBp6?iFn_Uab3*)EDoDm`>
zbHx_?1B=f_yezZp!A-!><l^pD$q(<<BUb=CAvCL$%v9`j0)e!a;bqrp-?Q=p2B~SB
zBP&9X4psLYM~^)Z_zu`2JbseS??Iq}-5XfTYD9NfTQB$pU)4}O6B1u2<9>K(__S9p
z1IKJ<JSOg66D}U?&){P!tq4iuc$~7$xY)RSduBA|BLofXHg_j^(POySo?Nsld>m@`
zKh;(Z>Ye{Y{Y@5nzcp)0`fFR|kMzH=2`-LqV6%VEV~PEH)PIuTfWQ6oyEIp+uIPx%
zj^zhR2GtkZ%H-{l$iY&RYHMt#(c=_G0RVYr%%Y?@u~`{s%Yzh>s}J(oQ6k%j7X?`L
zE5*MkLY%Fc_C7th%(C+77Y^`yhTi-oG4xp|B-)3P@GL^RCj=@BnjB%#l>R;ir#RWk
zF3duEWk>18f-#5iHk)nLrdOr5N9HqHXsuc~Z#x;nU6e^tL8_a6GqiFW{q~I+nmqH@
zLOV{Tc@o%gG3j`?URxu^%jFVr6O0Eo%EILZ_9^hYl1n0OCtO*%Wj}|0?6<C+$d4Gf
zU*q!Q1%3&}E%@n))5oXS7*%mci$4{#HGH+0*z%Lqh9l)}Puuwb-P!*$P5n61XSvjF
z4!#>kBZrb0gMyhOXx9l^y*FxEdb+ieP8#kNYB~YD`P3!y1uHmVpNaTi_Wlr59sy1P
z2d3rt;tAwz23%~=8g-ywe1(>8dnNh-wjQ68%MB8sp=~V$dUiN8FRAU0(JH-y*-l^L
zQS+EG?aEiuX&-<jG}YnD<%xvsZ56yMnT<f9miBMA{%NR*9vqS5m(68)O>3jaPCH`z
z{ZLu-)Ab@n(RxVEVfL9)sM>ktbIgphhBSqW{xSA@M;<jEMzvi^HJ-se>8q`B4l?+Q
z`P|$Us@1;7@pcfUroh`(7g%1fPx5xqJK%b<L2;*?bwc~QR12|adde5{-)L?ypLPiD
z*P<JO`$w9S_>VOw>uLcu`NN5FQJRhuK$39aEqN_RkRymXlnS~TZq*(s>lac%ShTBI
z%b{ijC|KWR>!@*gT8GZ;ao(vICaM9{1)v;7E=6|HpyBWw`&yYOeCvFtdae{J>*R*3
zORNr&ylRYX?TVi_jNUp5e7q0p<x3`@Gs4eTJ$n(65&a;Dj^1D0KCZ2se(Mz??N*)V
z>jw?gJHxb}x=+UnQ2?^RK?YUKjN;jMn`l{=O%*&220L#%FBq0CX)91Vb<0E>_aTm&
zt(70l-C{j>4SekT7|OE(b`<2Dhipd%vz8=hlqYPd0xK+EuWHjOh@)(%%N_9i<XP`x
z66fx==2cdl?MhEpZcme}j4o1?pBhhmbYhJd4_|GzD2a!KBq}BAmIZ&BP8@bv)U{lW
zkO3Z_uTG7$3mu*<8uKS(657r=LQ14c_TIg2dDXoFKmR-djnH1V;%&9$R%U!tcm6`W
zVLP_Wvqr3&Uqf7(I5!x->wDx_M@(*?78~rL7c^I&7%f=0>>Fv7NBd1Ds4-oeC+kPo
z{Hvl4-m0WU=6HSvO*z?P+I^ZL!QoS|rNcLSj)Mvn-kd$1(y1K$W=>o9rpMf{QN$%K
z-M*OD9;qk`?#4-lfe07Rfmn|<&xzP;9PmtSN>!iMcQqTqOl|T{bfRU637ou{G9<b^
z+IfAP>^=@O$X<CZDqQMhh6Lzy<M9&ZcIh(oNZ+i<blKL(F{N(j3CHXlvKT1&adexj
zc+|fM@Cm=`Hpm^NCN_)xZp7SO1Z<67rbIUE{Y>4xR7ylF*%wJ99*@}Tz5I($y!pH|
zTvW+XvZc+Y5RPmGZumx?%Di9V>r*V?k_6}I`i4wp%UOQ<6oNi9KX3kyP@b@*mYq=1
zCbD7PSfz!t97$ln=%ur`Bso)EyyER90bAZiibE3XVAY%op65daovB;q{F63g+1!Ba
zr6o=}Zu<M%P>_0JV}RQw3i9KYIc%z70sJrY?1E>k=Vx$cPvVExDvC}_4Z`6fIx}oP
z<FYq|qc`ei{a`S`7=Ot9^(74<T{Cf4npO87Utpqo^k*Sy)+j7hj*;9o8u#iv-z)P~
zan$SM$}6875cr=@7O}F6=|Zrt`zBj;YUy!|zE|AB<fMYWL*eE2(8`szbhrU)NPHH5
z1P1?D%-b{($lnwd*zJEt5$cLSA(xB~9=L#zP%u0Y=F&d^a%D>)O(}T3ai}PUJ%-5Q
z#c8R^tjzCAHWusZi1wAc2_BN*Z&FE&-ajC0OrLn|5l<R+cw<|uB9;|7Jm>BNyW0Ur
zjSXD#j^K!IHng&v>~zof3tTNf4C?l%1Xy<&6cqk)L`eOG+x`T?zo^sX*$&s)xl!>k
zaT-^VGa6CoyLo`(m;evI)^}izoDInlS!yE}rbGVQU3o8k#}%45(a(eR5T@1W=S?Z>
zGigi)%$iPJ`y!!Aj>hPk%3L9&M|;!^hh@zDWF9C%KYPrCH6@@=@JI4G-=vfh86w08
zFLR#>5#2q3$co<6m;RYk<)F_Z44LP|i>vH`UcY?&l4FxuO>@oUjgO$zgYA?Z$jNpE
zryo?1;IkzJJ%P<h&*PWzXu*cA^sv>(oT36RwW%p!7MF=75PhI<9%fl~QyqA48N4S)
zM}pr4>2m%M-{XTKgzU2gCa3OhL=>87zy7lGi)Rsb1ANudE(J6xnk%;GRgEo#(SAbp
zED#<>!)nK%kXb@%x;SGyeA<d8N*27991Cpu;H~XJ&h7!AuKt20#R=K#{^ngotQQKK
zOhKVMhS4}*ZbFwB+Q2(7i5Rl&lZC!*Gr7`FzeP-jZ=du#?VB+^;eBEKD#8kePpa-c
z^e2Ka#UNI1Lgk(=M%!P@JIMPRQe4H0j^}ve4>JxBwLG@L6M}KXsmik}^a4$&W7yyc
z2%=;NEl@ZJq>|a@0jv6i$~|zvi^V}%OI|H}1!1jK7~;(+X%#w`zV|gi$aa0RMO!X2
z1lXL9bjDS+iv)t#LO?!q&?mBYvAXcD+SCNoC_9xyl2{>(TH#1%q*Z{$Rj)Q-bteKR
zi;PW{?O~_x%B^9fZgiKT$^H3D|HMs}tznsNgZ@<2V3NII^x)Ru_XQ4Ta_baSkn&~@
zO{WDXi|ozy?$pa*A37~iL-TE$u&5JBGl#0vf{R7cCXdS=ZMVZ#)W&|lSLd%Sfj%-4
zh(t>cj<+v$DA>-aXm;QI;uX;SV_QzeskK>+7Lo-~V}a;pOh>fFcl+#K9SvayU*5#c
z^YN)3EXL@1=RRisWHjW=t$zEh-*a(Yf2#iVZK^f&|4)JZohhSc|9yc}Yz4uvV`VGK
zoIxbE8EsLHwG-*7h~d;wB%p<B2oK0J+{`JqHs~Lqgcy4UQW@$Ca;B=JI2Sgq;k$l)
zp)3i`PprvZx_T_XE}U)EGp(!TYqsm#w@(2XY#Gr_Eb3}Zioh0w;21Wy4waX&7OvwF
z%{nc*rsv|DGwl?)*52+&lzYNkI?op+&z}Hxf6HIO;Uamh6fw!?X|60EhF@IfM)|_^
zz_xhBh_rcoMlJWc>~ewd1!sw`ZV-MmSRGX30j<B;#)JMxgQfZ34wjmUtA&D%gN>_&
z`JelXN(}>-87Y9E9UVRoPbh6@0&N0Jkvk0b5u%Z^;xA|_f$8oz3uK-vALN<d$&<^5
zcd>5f-V|Y46q7x%1J@r_$;PVyA+;;%-#ORk)_v|jyG$5X8ooU*2tx@;Ge-zi?W=S(
zGUZlL^s%oJO1`X&Z_%bPr!f0wisR$`Xt&sE3ggGuWcH<D!!PSf1c}4v?f3|5+TfhP
zglTM`QXNU6AGy!@i&3&2dwxcNqqU9SHM8-c8fYv}L^0n*9D!L<v>HfO<yC<xi3m+O
zx!ptA;jkER$&c##x?Lkt6y7yh);Y#BU>8?%=C<;yR;~gnt}Kb-+PG_QcXtc!?(PuW
zU4pwyupof|L4&&mcXxM(1lOINHJI7W?(A;&IeofMpSt(I?qBb{s&}ijs0s&ZQ<4!Z
zeG(!`-5oPA#d4ETU?Oe%#HTZAQHqWqtw3&z$yyEu7?c4Eg|{8iwA^3k6|dgTp1T~A
zPb^1i`mZiq%*(VbU-5EZGzlurUkZ5SScxi|O{&uY{Pjf=9!s)Zu0A|E?U~;bjQ}R;
zTr7c0lL4niE#d?^G`!iuSsK!)Qs-=H9^6;gS~1GZhD?IRj;9>O_$Uy|@b;%CtSVwk
zhUx~)@x#lf#=XkDD~3|2Qs1iWQflCNhXbH1jKd|4b;i5m+Xn<E<4hZT9OVNBviJEf
zqwu0_ZPR9Z-3zAmceEqF?(8Le#1+t+TKvutWx-prZI7Jb?iCq<-a4|0qYOUs@Qef{
z-3B+e=Mgul%KKTiF{_uHLi0v-Eu_naM;GH%>f5ZnJTcomgEtrzBsbS&e-t13rE2yT
zTRMYN(m_Rk#37eqvHD@e`NveyiL&p49Qx69R=||HpL#iEjR52VaBiFh3?m;P2QDeA
zvO1x}@Y#A1Eao>dHZszE!=@fOPsQ8TsG_i<dpST;>NlBe4@8C>Sh2)50enoewsieI
zWuvaGyXgmndTS_6;dwnen>2tETk+>GB!4}RdaTXcskQCRLa<Zqk0N<c%Ni22qYZk@
zshRD2Zz_C5bFSFGUSsGIT~h^fQk{L7&oU4cQ=f~>DQzR2wa_ZKgt)-4#NF0yxMNo7
zY@TQ57BFTb{Mz0Yq&(f3Z>4y?%_widT~sd^F~iI(C$!P+IjzfL=V&i1w+tx5biSNK
zMw4g(&5-b$gkCUvxH!0lH3gRA?XE}5Abk|cv^?s=`Ljo70+PICL4kmBAb;l3lK-_w
zE84nB*w{HciP}0?8#w*di&d?aa77S(g1OagG(eDre;9)4opHpn?gXVqK&=mVff6CI
zDCBi9EzuqgXEiyJ+@?`I2l}?t`;1YM7OJT7-RIGGx?r3H!a_(E&wbe6cfZ@uI?1{}
zJY9VTvqRG&^ROTM7J@mtM#Fc|4n}slTkB7WVx7vy7@&colgfNnnT#r(nmSu0CyiRE
zuRs1NPYU8>?_3FV5JDAD!sHY}WY<tf_I~Vgd%2SZG~H}3<GV>=z4E)IFJY?Rd?Py)
zfl~-wQ7u9ME#0)OUB_t-yiM7{?MZL8u$ZWABpg&=!MY4llC(tlDdw98GQU=^^Qze_
zA~e*M4*2U)Ct3HFD|=bM7HMD3>6U5@#h|z?(yBFDW)LRfX&Q;k-QpM*eA$z%RR2;E
zp`TRlNwQCQ2k+j~&#y_|SxwdS&GRY<D$s}4PMFx=<k>(_^_}Gm0+lw>hiW~v_>K{L
zaHj`>xiZ^PXbDD_Tt{k^Q5AQYCe|sX;J5@_V+PP1R(8`ZQB=QsCpGGD?nT(<w0d*N
zb8%W&A;P3|nb4wM6{LkNNuRxXnGMWPP4Q5S7_~$5KImYa&n;TP9ab6C_$j2G7T!`E
zs9*Ak9PD@Eh>I2AvFit8dC49^HlDT$$;un=tKmg>TX)FjHC=sqp7s19TARB-Pux2r
z1X!PwD5^|#y!BGD()IEdoP%KpS;JLDP`9FS8l8F*6z{^xNjc`eJ$3N8%aM{dq|}{p
z-NBV;+yFjm)%!(2oM_a?7{KbSNd+H%ZeoMgTle=br}YB0F~EaY(RDIeughwYtS*XC
zE=FfN6L3UCXH#I3pMlg4{xKR;8sy425bJpkQpphNidpa+vte5AwIQ7&YS(G3&w&Fj
zMSd_LsLCAqaU|#wVo<;2p0$Cn5PWHbjq(Rd&h~Zrg`P}?Rib;n_;Bz-c4Y91)ucm>
zq>v03Jd$Eiz4bVXV?mkvg-O_$%Y{}|wFF`R2>ZsKwU7luP?~d)7?k(CP=ahFx)xU-
zXRe3<$*}o7nl&GjtgW`|<3+Vz#KO+t{Jv;jB}WXf2ZN{JqIrk=#X4GAo20D)?8tf;
z9kFH`dMW+5=b%&4xT_xtTU2Dv%#u>YN8%**y+w3r$TKqUQgvY4b?e9GgCiMuxmXw2
zsN)9S>W6UU$7Zbl5Pbp+gNtqt=-@093$^qS0}jD-sltmbAHf6mPgt!XaZkYeQ!ykm
ztY_HPYtsq((ZaY|jpQs)NyZ>|cz6=y9OwbHOgwKFJMAouF?#S9T;s50pMihimvU!y
zP8_PHxt^>?W<5KtDZIHrh@{^8q{qE$7d5B%`7|n2!q;k}y@?U#&{H@&p}8sYI&7Lm
zp;1U26iF1fM%v~EtI=g#haI_Tc6Cjc47f$|*&<$>xKNO38SEfm=K{C2!zd@zIRn*b
zD+HgveR#_l{|55c4BZ051~(WG&=T~|rYy?;bjtdpN0@?t1X$YE%*@0=&e`cVQ((Tb
zmeQmECa+d@P7Zvi>sj!uP*UhdjkYlAXIU{*VRyX^Wb}z;*{_0+8V8YekiBNUiJK`h
z6gAsHjLiKfJ}Eykc~@<Go^Q`l+G&!t0UN5&B13?6wiAw2XAAq;4qlAw^Y)InkTIB|
zhDZ|lWf2s~nk_~ACi?W4(KPSSaLR_b5KtKXjtl_aQPaDCJUBdXU0j<H8&5bqFrs2c
z)ZI_<rv8Rh35S5k!Mjp@OdD}hU9w>~q?R3=oQi%vl`Z9znTE<$tNv7j6_6k3*L8t)
zSdulHEt~7n^Wjd&R_?7fY&G9Ern07WWTdGXsktm2-r`EOs-`oE6TQzUx_E!w(2%q2
zF_`&9Q*y!jJd{0%kQ1{2Aw@2Ij5Y@og6gsnoSA2(zgD(*1`9%E!b^s&6W;?vf>;+?
zPs|oeRvCNIE5(yg&A-l+s0c*rGv+pMUW-rhW(XI$&iogg#ZLBl)2x<j5$bJp?(CZm
zPW~Y+Wz7Wtjh=(*ne^o*`;~al1F2)@V!l}^Yya?ucU)m!l|+*#SqIiLPHEi?PgDw`
zY$7_x1L_kB>WY#$)D%Td$3R5ZZE9*$<lSAGSYnKtJq)6_LrIJ=Qce|38cB?C3-6xo
z+i__UD?@vqv(4fel@W5Vx)@;vcJ3^jq`(%vOZTKDYKkN}Y(`<OqoVobsX+~{-j};%
z1#ZXo+FO6UE{;bOx#O0ng24=kAWTcy_rb6WoFO3|#`_vqe8DS99V05b**>LK5yN)D
z;T<vK22Z}HH3DLX{CPqTTy|4B%WJkLkNrGchUWw4k8e(F!S-6GG=gS`5f@i@VD`&G
z+Cv$5h`aV3cUZS{@(@x@9|L%EoHZvN1BEWR?_lP{oJ&7TPAu&a?AFHVXp=2aHhi(R
zFRmQ{-fD(7aBv`&65hfV$q#dNAj&T~puh0#5MXbghxbz)S?6kbG%k{dC11oPvjT`j
zp|^G1Ms|v6Ili%cPm=caOl3inYvr5M$)(?~($-!3Zl@o=xELqI&peFdk9gRx$K*=C
zy!%^(@Mp(DeX7leg9E0<P(T6)wg84ES}|`)Ob?hu>ZM}lqqC=k-4B+iMbmv0+XLw0
z<9>Wph$gqF2Q-IHge(vDbFSWw%+r5v^YMKK)`xH;V@mC7Z?{IFl&<aQN%ZF?(<p#j
zV(s6}^1p|`XD|j`mpUnf;g8MoXlib6*JY?4^`sip-d8!95rG+gV<euemc{Ip%-d!O
zd2%;YpmSBMvW|f{AyV|oM~JWCf$HsG^R+I6HiZ<a?##P)oxWYO+DPEsiE&E09??;>
z9&aH4%t#EYJ0rmrvpPk!M+i&H6F9AE<u-HCYG2$3;DtQ<(OS#KD5Ystx)zZk@R=}$
zbt3SF^=YX|AKX(Q{Rxhim-PH$^Yd4%J27O%z!or?$yCgfuRL@()37mEID?#$4JYk}
z@(|gGr=jlq7`$Czl;a%b$2;B64BS$vZNEd*>Bt&Tzf14rY?B=B#uKv=%YwjXtVYLU
zpAjh_`VxNFC>M3(Rt5++vpqyP2+%k`XeCZIE^Lo}D<~5@g?XntOPNiUtnwBjURhId
zV3H@doxz@ql;6v?t+>2lLc_|<CSVVP#wmAD2pxlVC|5t*e4Vk7RLN}HdL8CYLd@)0
z8o*O?1|YrLk*m!zxLWlbWw?HxFxcZFaxNrLjJcv(ASVbu(SAxbO;c^`I_j4Yt`aVG
zj>#c+UEo(XKkW}CJux3$CG}Sg;se6s#K#+s6?(du>LP%f28c_FuTd@Nk2hqBnt<S4
zNMp$EqJJHKoLrERV>^z#nwrC?Xz8m7nQ=01_Lr*Gl!3h1aNuz6qK*kr>*JR2yeB8=
zxsH1XP6mq>5JGRK0Nx_X_AhV*pk|dR!JubCgnANb5uK%@PUAf~lMwqlT0M{}qTGvr
z{50zunT3@H-;D;JhejNt0x!xZP%wEDJ~JwQB$9+H2&XVs3gwg77wm~|biQc6P%c7=
z$vQ5q$Mxga)vx%+hWYX@F0}H>h14oj6koa!;!A~-w8UExStXHWO)ba89yFip@;QeB
zB@2jxOco2A-LT57;L^7i!VNZL2_d8v1a%M<eRKrjkC(hDE&iX3UGG$73RoqM=BswU
zXP#zs!=5*^iO>&bBA+@Jaedb1`LV^H=)B;xad>+u^dRGsR}Fc7c{sbu(_qdHcuZF-
zzq)_ao?vq{sw>A{8EEnFhdnJn_0f#zK9Fo~(a@niO=161<L2r}&R0?nYwzmq>FRj7
zPV1vHrldA_`MCT&1mOk_`o@y3Ou3Ys*U!P`sq-E45ArnVx&#?wO;T>gb_qxmEplVE
zun8x$a^#vyL#JXy)yo-WqcA-TT~t0T3wHGutaDGo%tAXUm9SyK5|w_TR*>77$i>VX
z*;H&kbGMO1qc4r?>hwl(sMIpP6&_7Ef%C2dF!Ipo2kQh|97mDU&jpXo8IIJ!nYdt9
zjWx*VE?ORai-bx7)+WSd5*J~}Mj?<S$4RlI6407{SZf;eJ?)^nf~B~&a1eMU7BGaR
zFmJFG8`~$>>WtJnzD`t^?l+S>XU`oP^g6h8HMp74?2pIPvLiC~7mu%Zh%wWfh>F>7
z2<d%StWv85y4E;Drpn=dawUWymV}n=-EBsF3Zu~%q2_K-+2dK7joKceRt<fW9Y625
zuP!H<Z!o#S&V&A>Z9W#bwCU0)CQ(z?k=F8+G`#iZ>hhG{f*W+lpbJuPa}A<`>keqi
zI0+V6a7)x#KTt7%ntXzpH(}71ZBtsiUGpI&Q)fpv<avw?p%Ggl8O`0x4fp`5dKw-L
zxJBz27o4XXiyXLNn`COHLJOJ_YJVDEOw(4Sv?OTz;++iobD&mr!Gs-)ga#UJNz+%X
ze$?2&T;>3Cr!V%dXL-z*6}@K;)r1`RAcrAK#Dcm2e)+(M@=KTM3-0=S1uU;6t0(Xr
zyW++p_y@dtBP$Ai%XgYLl}r8b)$q_D3get!iot%lw%E^==!zBY;@XV7*(vr;(&Fj5
zMnYJMBX1mG<ABWk%E=)|#$jde+V_s-;dgDmP|<eV?fo$FWx1M!rZ`%cnn<;SBBssv
zJLzOJ1gY46sMOQ|j^z<w?vp|J&fk>}GL8ybk;s>5{4L1OMjyhBqZ3C927ks_l@p+@
z)h8sVMZW<8pN(&_*fmmtn2pz&fw7Sg(W+MQgP26g=qjZjMs45#vSK3u*&LCbI~r(d
zvl;GTzlEe$P~M9ekE=XSxx@}3(kB$ZhiWN&DX5`hb>AVyADH8vA2!eji|GI|HAB<@
z3$H9FaC9~{FA$`aVRtrn1NH610CB=YsktGRMAQmtTW83ojJpTa7*N^igbVs_mAB28
z3~4Q=;?3pQsx^we56UgosFdayT%un}Ea77zm&uuyAacPsKP8kl0%T`_glm&Y(ZYzn
z#Eln{OXfHy7A4HC5+&Ya`_63kaw00REz)C;k!u&`D<Gh<okMrqZGRAtHJ)RuhVk*0
zyd{zf2Ub{ZpONviX14+2=5YgC5gZpuOYq=BGbipmN6|!Tmfk*@w~RwU6E<1E-}KIF
zPi0Nru=xJnWLkG<<AbR#`s_W_V1+nqtlta}CdOV+lodtv75c2RFkjDzmYzQPmZ)04
zy!q#jd}G4<rj2<;)Jp1A&?hM_V4?#E40ZuZK~2@KL}(6>?1eMii14hg%IZRr#c@y2
zF8r!|rqprowngcgFh2+jnp#)m*ey9YDQ{c!CZA1A_QeFc6|ofc>Id#?yyfXs&@LYw
zkA#n}OS(c4`Y3ZmAy2n`QA>OjA}{<V&R|rO=>4=6_*F8|==ALoOHj;>GmlGO`>0~p
zl3!@d@pyqD<bW0GHxzkM5pj6Q-TO}@P6u^J8=pI@r9iKC9HIi*rT8Io%Xc@*#lP4s
z)}7z@YlL0)bx-#m%$t%)RpBO~DNDp*i4z3+jeOe(#Q@?AR04IJbx<5Wo5zvj&aya^
z7H4rNP-t;?C|=y%DYDoCEmCB0mm<ZByA~+0Kyg^4*aD@vyX^IMbNAjmb9c#1zLR9;
zk>sEJk>|53nuDqQ$uyESTlXq<dfdu1?QWGew0<#r`p6?9Ugn5W%z5YQ7mTMwj5-|c
zXtt}O`pv!b0QYeOxY2-dHP7o0j&}TvX)CF_<ClZVGD%2=ZV!oz%A4b#yosspF66;7
zgRO_pI;UiZ)V<T|gvX$xN#>&y1*J=esx#Q-cUFWbAuo~FQzC8Jn-YQ<8W0}_f>yT%
znU?S2xK;}}MSjG6kDQP|*B}V+<>_zAL<WDdZ_1XJFn$#N!$4j&^y+5dD5oE7CUc_K
zGRLfl936;AkDC@KJNZ~5a;1x^FkYX<e@<<L_IzlN{e<(f-j!D!N^!x;ehCfDe?Ua&
zZetelp-COe5cW)x$0se2+f`8yrbx{#OfomDo|@r&AL^s@@W_mHD92rbiYoyQ5XK5@
z`owc{SAxZq0w+;MQLeDJ=BJaNiOrT(AqY5|{S@SnzAe}#G#a?N-V7T4<7>Ax&t%Q(
zar9EY=xr<`2qK{DOEF-f&6fE&fZ|yUsaxrE$9?63SW8h%4rck#)QkDPMl?}gWeZl0
zEoEK{BMDh|Rv5;yj@Ua!$q5CJ<RVOFiPv{4vwTxH)R6dn9pr+2o%HvuM1wvlj4Nxp
zdX&U|z=4!Mx<92t+w`@8)$zx<7HN9_0$N&(S8mL*j7Iiq7OHM{q1?clNNER8Q+Y0c
zxDA2>6yTKuZ49>U>o(%Qdgzw_YVMJuztNEmSc$uNQl11R2S&F{jR@4zdxfFN?Prni
zyVwjqMJc(Y;<81HCS`A`mL`FSg;r_W<p{HNpuawZ&U$Yzwi2Soam03L8`BDoiC6@S
zN~q(1AI@Ve_`|{sWS!vDbC+bMjM1a|9LdQA@qgAmd}J)Gx92$$n03*$CzpNLzu-N0
zak6>6sUrDM{uWX?)yL&l6~6d5ADCo*kL56~ob}$3Oi=B$eYb4msLn_idmP70-00Zn
zUq8M1sHkce2G(3*_o`xx2j$uhCD9S9E)@GUDYry}E=bRL*9sOowZ4*Kfa8ebyqHpG
z#&X<l7(x^WTszJYIFkENJMRJE;euTD7QGJ?%$ZgGW2}UxG8w6CJ$w+UuqE^?I0NOo
z5{U$YMU}`kA6hGhZz&4uG#x`;udwItokh<W8n$biChCBp8UseFtY+@+4YC(;DoYm%
zCAwxFr8V=3``43SG|XqXq^g<Nc$=yVEZ^I<iSu@eaNNeF=@rap_DxIvVg376#EP;A
zrS*Hp-FMx`zGNNnbL|&9<FE66Q*Na-@f!dM%cPxHIqD0Rhu~#&-z~;{?{xwY{IYhf
z_|#*(U9|}UG#U6*J3fdQ`Jbuce+z{iPEKMY-PDANm6I4|<H%Z7Zdf_VRSM+N*E25h
zb_C>;se&><eLk2{IHyU}@vh;fGd9&^=0kq{x*0UNTA^;xQhRTnkH#1@6Llky_j7is
zS!BAIA1h^yi2LIb)}aCBk3q=DW9uw%R#XYQJB5~G(cYczFXvmR*}x#*FK^}9095m7
zxjjlADkTpQWqR=<N?oEcl;w;g+Q>Qwf(-54Iz0m?w|oRX<k;m!own*Ju~gb~v8xuu
zv}28DDf2`&i$t)w4mOlP*4s9aj`Isih_XHfqIca1U&W#8FAW3)rt#(!Sxl2Xz9Oog
z&@^tz5PRV^#89{zd^aFu(#a9vO!F@BXAoxY!Iot7o<N%i%o3*px2|v!=a;mL$Zmcu
z)ZJ-Lzjp8&mT(fbj@YG#uT0W1|G9G^`D0wqF__Lz{?9Ljx8_w0yKhkxQ&5lXsYQ9?
zwf!SzAY3#iond_CHQg17!-H0KxJCTMmCbtHgAwxzVJF*zpg{OIK5N%<0^fm~dONry
zJ)IzTIm?G}I{WWK`2+u)O5kMB<;ci``q+C&Q1>B)a$*9Oc4ciM%p6CI!*Y=h1vVLk
zJ;ZVrQ9k>;eJ!|C;u*WcrTwI<!!!r@%rB?&jlJ9!+|b2ewqicG?8MP2_=%yh<zZ#0
z&Bl(L)TCv{51szn@zF!(1FW>WTux@9&K6t;=p#2-r^<I(+SLrr^~X_b#>*K}9Zd7-
zOB^M1eZwaI1i4r~Q5R2W0=&T@6$gXkRMw{yU+TL^tgo|!$_vi)wkE^;YtKYK&fw)$
zz29oIb>PWx6_i_{3p^+yK&=stfL|D3#Jnru6joO=7bVaU+MwZN9hLJ6>UxmRB5=}|
zuR6?o(rWlQbZx=FNFl-%A#I61e|4i++L#L~sD5$+a}$}0<I~rpLr++avFdExkNQKY
zb)4v01>nL&<4hQDM3#9h)a@$Be-5x?J9Z^K^oISUUcvSaXFvmsuOG;{7!kG~mHE=7
zUfH|2#(Yh2kCC@rL2!0tXU><xQ2*2$X%Y*<K_2a)*#>yzgfMZ$ZRbQ&`^<`>?A8G`
zLB6i_#Bwu}(zS@R>+lQD<wPlGOgA$c@uS`^pDu`Mi7>$4GQVEk+D;mTO%wto&b@Kq
zSk^RtzllTnVtksb)EEuXT<Evp#>jB&!_ZGj$4t#yu4iYz_ZJ^5TskJrSs01@x(ANt
z;i@zBS8^&O!o>c32M~Unn#rnF=LZEp9XMjMVb_mbwunPWN*}$sEJ0ea`A7<gD#N~=
z<@BcfqS^(}8zzss<9{x{wWb_r$h(uN#V<eLT$yWa><)dszclHEJ(^edXei2dRZ<K~
z_fm@3CiQecA)3y}vlbl-l+TT?#+k?Zy_+;+Wn;&C_jcy_AWek>4iMXRsGnWn$Euo9
z$W0WU@|7M}KnAYV3(NYAK)Y(Q6es))p?Ta6B!s7sHAzh;vcJYyP0hrm5ktBvZgud(
zTi5K6S2Xj|0Jho9s+{1;2kVuq8I(0#hoL=2Ou8TaVzWwkUk)6iYTinV1VZErJ&aqj
z%y4NX&3hGF(eoIb*{33W<Fzlwpsr(?^F5q^urFI=`Kv*xmjy+j<Zi+?2cY6Op!0PJ
zy03T+$NI>iWCXd$M8Dhi5skZtMS}f8==E~kYgT2|b4`qTbSb;=Ql8Gbb=JrtD4mZ1
zsUnl$(ziHX;UIvkSxuX<A0J8sE#8Z8mGq6{UTq%SVSY9>lhbyUspNDB;=9<2^Wu@S
zf27!5G;eVL&1!Q5z^l(Xoc`>$>9*7`BZErSw_+E|WR1?&0ZuLh?r#K%F-K!aTWj!r
zR@k2~N?g^B%Z*QVV=lL8TzuJDI=29<#Pg!vWhEB%s#^xgR*NRQh>Oto=JGmiHDP!J
zqc|Yf>bdYqK7Xbbpzy1;{-J0I8vTQW)#{tiEs(rq-Bgwm;LGj_-pG5*UM`bZ`9?tK
z_*aj;rmprT=z_?bw#g^R=|g2fS9<{C0yQeOV)}2pFQQAMnkELarm}hlvRBm+QQGB}
zkw5dr{v2v|C_xC>)%C2%?aS40p6T;^+w}^uX!!b#Eb+5M<J9I(#rEKvi%Iu*;0^r_
zFgYXY#;^JX;o)stN>_N~upc+ruL>nhpI$r?<N14hZE7;oMh~f=s9xPglG7*YWC>w5
zN;ka0fDG|0<O}prtVzl><5RJh9G|y>kWY<?AU|m-(3GR0DXY{F_gt9v3TbnS{`opv
z{W2=0*5t@uMbiA}?%3cI)~~T=92|MD1F8%0Kj*5!6^vA>5$04<-7FQgio{yt1vIML
zT#e@$&JHbQaO!8ozS2iFU%KfNg~Z@O{)7oLeWDc<TYDMzgp`AruH>c3gtr*m@5M9-
zM1lg~KQ4aUa|!k1vb_!;P5Rt#vZ1j|Sm6Xc(l4q1gd=L&GHK(Yw?Ad(Bvv;#>)PVw
zTuBsQs7;hJKuvWXQ$x^Y_%3HZZ99NpWJ13#Z1LyCG)Ym|Ppl8bNADOkQ&)AV{&Y5l
zbkBdP&6~}Z(SjMNRok(^o<|o4-9dv*79u6TE1iBFHPHyBv<G-#_Cs&gN^gRay!ID@
zlCH0p&6v}KOMbQGheARJB}39?nQnr9W>$w&t(bY{c!zW*#T-lY-e0C($^A~b;>mpX
zmPJ&4Fu$H;x4T<O?#ZsXhkRRseRP4_li}=BBbByEEM&kX2q8B|jANNlalq*=g;4F0
zrpwk8W{#POt!a|(GV|ezCCO`vAC6)QY*-3(X>V#-RJI|mN0Ad<N-F3<eZ$bj717<n
ze^9##9)!zm)&+$yIjEwx6eS2@!412@FK=Me)TQ{a*`%c@7JNs!08dj8O=jv#)ulpW
zU1)S8*`ta>a4-CgrpdV*?`>5t+J+Zl5oP#$nqh&qK3HvXXPbZ)P=rCVKns8kw7xOy
z$gNr~)+B{;%s!C|UUEBsBww{^^V&PpV#@a*OA+4@8;qAU2T~et4zyr!8V6A%cVWet
z@{|_sgffcZVN#27x_xu1Of0%W<tVHR+Z4lkZNdG8>t&+m6y%GQkSh$}72U(}D!G(C
zf_^$|ERV0Rk!Ha8*s!$-wU|P(LrVZAEG;!sU4-E=JOySX8k3ufwTfRcuFN755kcQ&
zk(E#T>~y`kU?^y$1E7eN1yW`&5E1Y>=gn9L4OvFh*j>o1M)~H;#^vK0JUWvktl2zX
zejo1UaQ8r-O_%FtsVkXuR4$)HYlm}&z5Dpur?@&vV&keIG1OXd$!I^8Q&^CLZU<@r
zNKW2gH>!nfPYSD9S>bqdnV`+O3mwYmN@FyQ-}zKUZ^7^!!+$UgGMYVy($^%wTm-Og
z#%d|#5b><(&u2TOY59+|+kGcGsXVu&Pfv2-6-H1?;xx+{V+Wp`43RI(fkw>N)g4_p
zMLAeQeuhGyDtzb4R<~QMlf_X6Pu;S<nE<kwI2LGlGfXsf%L017xy~kk`jD0R9i-8`
zqoBmbo()f7Ie}i@fOmU;y~Om9>uPE_QWsF6Z_TRn>6o)4DmG^fC&~V37QBj-U!8LE
zkjDbl*E&nhgy5~&!pX=bQO-$tn&%1Y;CBAM1%k>E*U2jIh;u(h$39GP-eb=-R?CW;
z-|8)Nr>{bPDxCMppV$71VJP*oiuir-a596Le*GOFDz-OJf+J(@Ah4NDN2hc#O#uag
zBc<DMMJ5bOg=<%}0OAQ;m12tA(L}g|;38sqhM~TxqcZMSx>11=lx2;Uq!<J4m4P89
z()bPC1MiUhHDwQi%b>@Q)A10pRs?}gUyq&S#e28JhDh5_UMqmTSuAszBpxCsMWdTJ
zPwng3l39uBJsSgk?{Tx-x85w}8*Iyrj1f@m+L!ee4ML{~Aua@vls!aAIT}V1eRtuS
zUF^fZCX`?$;=J&Xw2=qlzr{}a*)@_Lmai}#1pD|lGgcipl$Rvn#3??T{p;$;emWmU
zcUH0vl5cO#S28j6U78<An|j7#@dpaF_$B1~JApN8rGfKa7!GkxWTZ(>esZJe<bjr4
zPkTiefv828VkuxLgO<5e@TTr_)xxdSiSu4uH=w&9$(n=j#+Eh1TTIj<ubi?LFT&qE
z9vFNiD{gA5QPmYcjoU92+n@?~HYho6-W<cmQbLFpjCWuM+X?-Yz2#qm<&a&2lKTU=
zJh=2DwQ)YW8yi-DrmmW*%hccJKG;fBMaeQ`i)yeoW#IPE5LLVF5GcRuMT9T~O%te-
z^^Fggx&Rq*9Kxv>atH%+7*!bI9K+O$%=Hq^hQYLLNR^MuE5&<vJXSsTx)E6TVYn9w
zK*VuwFmkEvW^U80k?ZO0$mlE7J7C{~N=mw|SqL9^F#x!mO2vO7u}l0Qpw|mJcb$ZH
z9Rxew)-%$df>g|Fk!AY(Zm4F>>;C7sCjw(VE|u2}9xpo4@T8t{*Pg~Gk*OX;XA_?n
zLgMA_aq)l{e-eNLJrUfu7<V=+Z%0A)_Y$~|@VGuVo+q2PZ>~X~xO0$U8xkD^W@4IT
zM`q(CA-1UZBZcVK+e%j&_#ykeM6Ep%Xvp%{s~|7a&iwoWBw5TBP)B4n<O3yAKz2_*
z3WR)tFyrtG!Fs4y%{T<|vOYaWds2Wr9v?x{<wD=ohy>ywiHGo*w|eqvO_8eW)<~)u
zvsdXo7{P`&%on%@$OKfRdfwv%)|s{f&qIt`45DZIKKtfAU*Jh5_UZkg${jN8)XniR
zWc)^(v+^z`G3qqLI`D-*^0v&ZVvWhnq#t861WZsP*N%LWFA3~o@_dTyL^>0K%dtrV
zyWVfyq1T4M7ay~=I(0PMJ1qsa9?`u+DCoMZZ--VNY!FzdK$Y&^V;`!Xrr=BsNw5tU
z50Xb)PU5}++f=F+^mMPeVP_v$Bg~6LUD7~L=<$4H+&$r6C-Fa=MGC;pe93zryUgTi
zrfb*$I>_fKJu8k6j9Irs>Q60V{k%<UKZMS-*NH=(Vs6rRUL5eamOkxhgrI5u3t?$4
zZ}|>VnuoRX7hPG0ih_dkS6ytpEw~-M++1A}>c&x}$UcIjeWB$$YY&Apq#vbA06#L?
z7JiIvjq5tg7V4|`VZ<pHp7Xz??;kh#?7n;)_<DzXq(u3{SfP@nw!&EG9LQND?y{Jx
z7BAj0cIV3gelW%?xFCB;pF#N<IdovyA1%jkWGGOF7(?CCnO$fJ%XMeP2i%&Ymp;>-
zdTpGrzicrh6rS)GT!ABKqy40SB0#dQsQ%HbTOwA9PahY%`1s~Nq2foq8w_teOb>gW
zL5_<@INwufqaQ%oy~oE+Wv5*CBt}<hK}qsbBMEr`k{rDdR&ckCC#By)P1~M6Bh*wu
zMUy}w`<wayh4f_lyZ%pO_|NhG1AOBC*FGu=C5o<T$tXn=92F~%rz3pgfArt|{O@!B
xcR&4qfujGqg?~4VWG!s?$K-$OZwrzt-9b32rV0k;Kk=dc?frjs>fJxH{{X7u!xR7j

diff --git a/web/packages/exts/open-source/scriptis/apiPublish/index.vue b/web/packages/exts/open-source/scriptis/apiPublish/index.vue
index b4bafcc95..6eac89868 100644
--- a/web/packages/exts/open-source/scriptis/apiPublish/index.vue
+++ b/web/packages/exts/open-source/scriptis/apiPublish/index.vue
@@ -600,14 +600,12 @@ export default {
     // 验证发布和更新的默认值是否满足条件
     verificationValue (row) {
       let flag;
-      if(row.defaultValue.length > 1024) {
-        this.$Message.error({ content: this.$t('message.ext.opensource.longer1024') });
-        flag = true;
-      } else if(row.paramType === 4 && row.defaultValue.split('\n').length > 1000) {
-        this.$Message.error({ content: this.$t('message.ext.opensource.rowlimit') });
+      const method = this.updateApiData.id ? this.updateApiData.requestType : this.addApiData.requestType;
+      if (method.toUpperCase() === 'GET' && row.defaultValue.length > 500) {
+        this.$Message.error({ content: '不能超过500字符' });
         flag = true;
       } else {
-        flag = false
+        flag = false;
       }
       this.$set(this.tip, row.paramName, flag)
     },
@@ -825,6 +823,7 @@ export default {
     },
     saveApiOk() {
       if (this.saveLoading) return;
+      if(Object.values(this.tip).some(i => i)) return this.$Message.error({ content: this.$t('message.apiServices.outlimit') });
       this.$emit('on-save');
       this.$refs['addApi'].validate((valid) => {
         if (valid) {
@@ -881,6 +880,7 @@ export default {
     },
     updateApiOk() {
       if (this.saveLoading) return;
+      if(Object.values(this.tip).some(i => i)) return this.$Message.error({ content: this.$t('message.apiServices.outlimit') });
       this.$emit('on-save');
 
       this.$refs['updateApi'].validate((valid) => {
diff --git a/web/packages/scriptis/module/workbench/dbDetails/components/tableList.vue b/web/packages/scriptis/module/workbench/dbDetails/components/tableList.vue
index 94d9a1ad5..036d7b9cd 100644
--- a/web/packages/scriptis/module/workbench/dbDetails/components/tableList.vue
+++ b/web/packages/scriptis/module/workbench/dbDetails/components/tableList.vue
@@ -1,6 +1,6 @@
 <template>
   <div>
-    <div class="search-header">
+    <div class="search-header" v-if="!isAdminMode">
       <!-- <Input v-model="tableOwner" class="searce-item margin-right" placeholder="请输入用户名">
       </Input> -->
       <Input v-model="tableName" class="searce-item margin-right" :placeholder="$t('message.scripts.plstablename')">
@@ -16,10 +16,9 @@
         <Option value="1">{{ $t('message.scripts.tablecreateby') }}</Option>
       </Select>
       <Button class="margin-right" type="primary" @click="handleGetTables">{{ $t('message.scripts.Search') }}</Button>
-      <Button class="margin-right" type="primary" :title="$t('message.scripts.realsearchTip')" @click="handleGetTables(true)">{{ $t('message.scripts.searchnow') }}</Button>
       <Button class="margin-right" type="success" @click="copyTableName">{{ $t('message.scripts.copytbanme') }}</Button>
       <Button class="margin-right" type="error" @click="deleteSome">{{ $t('message.scripts.batchdel') }}</Button>
-      <Dropdown @on-click="dropdownClick">
+      <Dropdown class="margin-right" @on-click="dropdownClick">
         <Button type="primary">
           {{ $t('message.apiServices.query.more') }}
           <Icon type="ios-arrow-down"></Icon>
@@ -32,6 +31,38 @@
           </DropdownMenu>
         </template>
       </Dropdown>
+      <Button v-if="isWorkspaceAdmin && isContainDb" type="text" @click="changeViewMode(true)">切换管理员视图</Button>
+    </div>
+    <div class="search-header" v-else>
+      <Input v-model="tableName" class="searce-item margin-right" :placeholder="$t('message.scripts.plstablename')">
+      </Input>
+      <Select v-model="orderBy" class="searce-item margin-right">
+        <Option value="1">{{ $t('message.scripts.defaultsort') }}</Option>
+        <Option value="2">{{ $t('message.scripts.ordersize') }}</Option>
+        <Option value='3'>{{ $t('message.scripts.ordercreatetime') }}</Option>
+        <Option value="4">{{ $t('message.scripts.orderaccesstime') }}</Option>
+      </Select>
+      <!-- <Select v-model="isTableOwner" class="searce-item margin-right">
+        <Option value="0">{{ $t('message.scripts.owntable') }}</Option>
+        <Option value="1">{{ $t('message.scripts.tablecreateby') }}</Option>
+      </Select> -->
+      <Input v-model="tableOwner" class="searce-item margin-right" placeholder="请输入表属主">
+      </Input>
+      <Button class="margin-right" type="primary" @click="handleGetTables">{{ $t('message.scripts.Search') }}</Button>
+      <Button class="margin-right" type="success" @click="copyTableName">{{ $t('message.scripts.copytbanme') }}</Button>
+      <Dropdown class="margin-right" @on-click="dropdownClick">
+        <Button type="primary">
+          {{ $t('message.apiServices.query.more') }}
+          <Icon type="ios-arrow-down"></Icon>
+        </Button>
+        <template #list>
+          <DropdownMenu>
+            <DropdownItem v-if="canTransfer" name="transfer">{{ $t('message.scripts.transfer') }}</DropdownItem>
+            <DropdownItem name="download">{{ $t('message.scripts.download') }}</DropdownItem>
+          </DropdownMenu>
+        </template>
+      </Dropdown>
+      <Button type="text" @click="changeViewMode(false)">切换普通视图</Button>
     </div>
     <div class="table-data" style="position:relative">
       <div class="field-list-header" id="dbtbheader" :class="{'ovy': searchColList.length > maxSize}">
@@ -70,7 +101,7 @@
             <Checkbox
               v-model="item.selected"
               @on-change="changeCheckList"
-              :disabled="item.tableOwner !== getUserName()"
+              :disabled="!isAdminMode && item.tableOwner !== getUserName()"
             /></div>
           <div class="field-list-item" style="width: 50px">{{ pageData.pageSize * (pageData.currentPage - 1) + index + 1 }}</div>
           <div
@@ -246,8 +277,11 @@ export default {
       })
       return list
     },
+    isContainDb() {
+      return /(_bak|_work)$/.test(this.dbName)
+    },
     canTransfer() {
-      return this.$APP_CONF.table_transfer && /(_bak|_work)$/.test(this.dbName)
+      return this.$APP_CONF.table_transfer && this.isContainDb
     },
     columnCalc() {
       return this.columns.map((item, index) => {
@@ -348,6 +382,8 @@ export default {
       showRename: false,
       databaseList: [],
       renameScript: '',
+      isAdminMode: false,
+      isWorkspaceAdmin: false, // 工作空间管理员
     }
   },
   mounted() {
@@ -357,27 +393,30 @@ export default {
     formatValue(item, field) {
       return utils.formatValue(item, field);
     },
-    handleGetTables(isreal) {
+    handleGetTables() {
       this.selectAll = false;
       this.pageData.currentPage = 1;
-      this.isRealTime = isreal === true
       this.getDbTables();
     },
     // 获取库表
     getDbTables() {
       const params = {
         dbName: this.dbName,
-        isTableOwner: this.isTableOwner,
         tableName: this.tableName,
         orderBy: this.orderBy,
         pageSize: this.pageData.pageSize,
         currentPage: this.pageData.currentPage
       }
-      if (this.isRealTime) params.isRealTime = true
+      if (this.isAdminMode)  {
+        params.tableOwner = this.tableOwner
+      } else {
+        params.isTableOwner = this.isTableOwner
+      }
       this.loading = true;
       api.fetch('/dss/datapipe/datasource/getTableMetaDataInfo', params, 'get').then((rst) => {
         this.searchColList = rst.tableList;
         this.pageData.total = rst.total;
+        this.isWorkspaceAdmin = rst.isWorkspaceAdmin;
         this.loading = false;
         this.$emit('tableListChange', this.searchColList)
       }).catch(() => {
@@ -402,9 +441,12 @@ export default {
         dbName: this.dbName,
         orderBy: this.orderBy,
         tableName: this.tableName,
-        isTableOwner: this.isTableOwner
       }
-      if (this.isRealTime) params.isRealTime = true
+      if (this.isAdminMode) {
+        params.tableOwner = this.tableOwner
+      } else {
+        params.isTableOwner = this.isTableOwner
+      }
       api.fetch('/dss/datapipe/datasource/getTablesName', params, 'get').then((rst) => {
         let tablesName = rst.tablesName;
         this.loading = false;
@@ -427,12 +469,15 @@ export default {
     download() {
       const params = {
         dbName: this.dbName,
-        isTableOwner: this.isTableOwner,
         tableName: this.tableName,
         orderBy: this.orderBy,
         exactTableName: false
       }
-      if (this.isRealTime) params.isRealTime = true
+      if (this.isAdminMode) {
+        params.tableOwner = this.tableOwner
+      } else {
+        params.isTableOwner = this.isTableOwner
+      }
       const paramsStr = qs.stringify(params)
       window.open("/api/rest_j/v1/dss/datapipe/datasource/downloadTableMetaData?" + paramsStr, '_blank');
     },
@@ -458,6 +503,11 @@ export default {
         return
       }
       if (this.confirmModalType == 'transfer') {
+        const tableOwners = [...new Set(toDeleted.map(item => item.tableOwner))];
+        if (this.isAdminMode && tableOwners.length > 1) {
+          this.$Message.warning({ content: '每次仅支持转移一位用户的表' });
+          return
+        }
         // 批量转移
         this.showTransferForm = true
         this.showConfirmModal = false
@@ -519,10 +569,16 @@ export default {
         item.selected = v
       })
     },
+    changeViewMode(val) {
+      this.changeCheckAll(false);
+      this.isAdminMode = val;
+      this.tableOwner = '';
+      this.handleGetTables();
+    },
     changeCheckAll(v) {
       const u = this.getUserName()
       this.searchColList = this.searchColList.map(item => {
-        item.selected = v && item.tableOwner === u
+        item.selected = v && (this.isAdminMode || item.tableOwner === u)
         return item
       })
     },
diff --git a/web/packages/scriptis/module/workbench/script/script.vue b/web/packages/scriptis/module/workbench/script/script.vue
index acd9bfab8..11e4da293 100644
--- a/web/packages/scriptis/module/workbench/script/script.vue
+++ b/web/packages/scriptis/module/workbench/script/script.vue
@@ -985,17 +985,20 @@ export default {
         });
         // 只有hive或者spark引擎类型才会调用代码关联审查 置于末尾，不影响其余事件
         if ((this.script.application === 'spark' && this.script.runType === 'sql') || (this.script.application === 'hive' && this.script.runType === 'hql')) {
-          var formData = new FormData();
           const variable = isEmpty(this.script.params.variable) ? {} : util.convertArrayToObject(this.script.params.variable);
           let params = {
             'variable': variable,
             'configuration': {}
           };
-          formData.append('params', JSON.stringify(params));
-          formData.append('code', this.script.executionCode);
-          formData.append('engineType', this.script.application);
-          formData.append('type', 'union');
-          const codePrecheckRes = await api.fetch('/validator/code-precheck',formData,'post');
+          const codePrecheckRes = await api.fetch('/validator/code-precheck', {
+            params: JSON.stringify(params),
+            code: this.script.executionCode,
+            engineType: this.script.application,
+            type: 'union'
+          }, {
+            method: 'post',
+            useFormQuery: true,
+          });
           // 如果拿到代码审查结果时，代码已运行完成，则不进行操作
           if (this.$refs.progressTab && (!this.script.progress || !this.script.progress.costTime)) {
             this.script.codePrecheckRes = codePrecheckRes;
diff --git a/web/packages/shared/common/i18n/zh.json b/web/packages/shared/common/i18n/zh.json
index 365298648..77fda4f26 100644
--- a/web/packages/shared/common/i18n/zh.json
+++ b/web/packages/shared/common/i18n/zh.json
@@ -484,6 +484,7 @@
         "Username": "用户名",
         "Password": "密码",
         "inputPassword": "请输入密码",
+        "inputPasswordNext": "PIN+TOKEN(测试环境使用静态密码)",
         "Prompt": "提示",
         "noPrompt": "不再提示",
         "adjustcolwidth": "当前列宽已调整，是否重置列宽？",
diff --git a/web/packages/shared/common/service/api.js b/web/packages/shared/common/service/api.js
index e305ffe99..530ad2e10 100644
--- a/web/packages/shared/common/service/api.js
+++ b/web/packages/shared/common/service/api.js
@@ -32,13 +32,13 @@ import i18n from '../i18n'
 // 什么一个数组用于存储每个请求的取消函数和标识
 let pending = [];
 let cancelConfig = null;
-let CancelToken = axios.CancelToken;
+const abortController = new AbortController();
 let removePending = (config) => {
   for (let p = 0; p < pending.length; p++) {
     const params = JSON.stringify(config.params);
     // 如果存在则执行取消操作
     if (pending[p].u === config.url + '&' + config.method + '&' + params) {
-      // pending[p].f();// 执行取消操作
+      // pending[p]['controller'].abort();// 执行取消操作
       pending.splice(p, 1); // 移除记录
     }
   }
@@ -53,6 +53,16 @@ let cutReq = (config) => {
   }
 };
 
+let getErrorMsg = (message) => {
+  let msg;
+  if (message === 'Request failed with status code 414') {
+    msg = 'URL长度超出最大限制';
+  } else if (message === 'Request failed with status code 413') {
+    msg = '请求体内容超出最大限制';
+  }
+  return msg;
+}
+
 const instance = axios.create({
   baseURL: process.env.VUE_APP_MN_CONFIG_PREFIX || `${location.protocol}//${window.location.host}/api/rest_j/v1/`,
   timeout: 600000,
@@ -98,15 +108,13 @@ instance.interceptors.request.use((config) => {
     return config;
   } else {
     const params = JSON.stringify(config.params);
+    pending.push({
+      u: config.url + '&' + config.method + '&' + params,
+      controller: abortController,
+    });
     // 用于正常请求出现错误时移除
     cancelConfig = config;
-    config.cancelToken = new CancelToken((c) => {
-      // 添加标识和取消函数
-      pending.push({
-        u: config.url + '&' + config.method + '&' + params,
-        f: c,
-      });
-    });
+    config.signal = abortController.signal;
     return config;
   }
 }, (error) => {
@@ -121,11 +129,22 @@ instance.interceptors.response.use((response) => {
   removePending(response.config);
   return response;
 }, (error) => {
-  error.config.metadata.endTime = Date.now()
-  const duration = error.config.metadata.endTime - error.config.metadata.sartTime
-  if (window.$Wa && duration > 2000) window.$Wa.log(`接口耗时 ${duration}: ${error.config.url}`);
+  if (error.config) {
+    error.config.metadata.endTime = Date.now()
+    const duration = error.config.metadata.endTime - error.config.metadata.sartTime
+    if (window.$Wa && duration > 2000) window.$Wa.log(`接口耗时 ${duration}: ${error.config.url}`);
+  }
   // 出现接口异常或者超时时的判断
-  if ((error.message && error.message.indexOf('timeout') >= 0) || (error.request && error.request.status !== 200)) {
+  if (error.code === 'ERR_BAD_REQUEST' && getErrorMsg(error.message)) {
+    if (!error.response) error.response = {};
+    error.response.data = {
+      message: getErrorMsg(error.message),
+      method: '',
+      status: 1,
+      data: {solution: null}
+    }
+    return error.response;
+  } else if ((error.message && error.message.indexOf('timeout') >= 0) || (error.request && error.request.status !== 200)) {
     for (let p in pending) {
       if (pending[p].u === cancelConfig.url + '&' + cancelConfig.method + '&' + JSON.stringify(cancelConfig.params)) {
         pending.splice(p, 1); // 移除记录
@@ -133,7 +152,7 @@ instance.interceptors.response.use((response) => {
     }
     // 优先返回后台返回的错误信息，其次是接口返回
     return error.response || error;
-  } else if (axios.Cancel) {
+  } else if (axios.isCancel(error)) {
     // 如果是pengding状态，弹出提示！
     return {
       // data: { message: '接口请求中！请稍后……' },
diff --git a/web/packages/shared/common/service/apiCache.js b/web/packages/shared/common/service/apiCache.js
index 52e152b87..f12dc200f 100644
--- a/web/packages/shared/common/service/apiCache.js
+++ b/web/packages/shared/common/service/apiCache.js
@@ -41,7 +41,7 @@ export default (options = {}) => async config => {
   if (!responsePromise) {
     responsePromise = (async () => {
       try {
-        const response = await axios.defaults.adapter(config)
+        const response = await axios.getAdapter(['xhr', 'http'])(config)
         return Promise.resolve(response)
       } catch (reason) {
         cache.clear(index)
diff --git a/web/packages/shared/components/consoleComponent/resultsExport.vue b/web/packages/shared/components/consoleComponent/resultsExport.vue
index 534a82c14..c3cfcb3f9 100644
--- a/web/packages/shared/components/consoleComponent/resultsExport.vue
+++ b/web/packages/shared/components/consoleComponent/resultsExport.vue
@@ -165,7 +165,7 @@ export default {
   },
   computed: {
     allDisbled() {
-      return ['hql', 'sql', 'py'].includes(this.script.runType);
+      return ['hql', 'sql', 'py', 'tsql'].includes(this.script.runType);
     }
   },
   methods: {
diff --git a/web/packages/shared/components/consoleComponent/toolbar.vue b/web/packages/shared/components/consoleComponent/toolbar.vue
index 0bd6e1a5e..e15a9ef9a 100644
--- a/web/packages/shared/components/consoleComponent/toolbar.vue
+++ b/web/packages/shared/components/consoleComponent/toolbar.vue
@@ -132,7 +132,7 @@
                 $t('message.common.toolbar.autoformat')
               }}</Checkbox>
             </Row>
-            <div v-if="isAll || +download.format === 1">
+            <div v-if="isApiAll || isNotApiAll || +download.format === 1">
               <Row class="row-item">
                 {{ $t('message.common.toolbar.downloadMode') }}
               </Row>
@@ -283,12 +283,15 @@ export default {
     }
   },
   computed: {
-    isAll() {
+    isNotApiAll() {
       return (
-        ['hql', 'sql'].includes(this.script.runType) &&
+        ['hql', 'sql', 'tsql'].includes(this.script.runType) &&
         this.download.format === '2' && this.getResultUrl !== 'dss/apiservice'
       )
     },
+    isApiAll() {
+      return this.download.format === '2' && this.getResultUrl === 'dss/apiservice'
+    },
     toolbarShow() {
       let isScriptis =
         this.$route.name === 'Home' ||
@@ -431,7 +434,7 @@ export default {
               flag = true
             }
           } else if (
-            this.isAll &&
+            this.isNotApiAll &&
             this.allDownload &&
             +this.download.format == 2
           ) {
@@ -443,6 +446,17 @@ export default {
               `${window.location.protocol}//${window.location.host}/api/rest_j/v1/${apiPath}?` +
               querys
             flag = this.downloadFile(url, temPath)
+          } else if (
+            this.isApiAll &&
+            this.allDownload && 
+            +this.download.format == 2
+          ) {
+            temPath = temPath.substring(0, temPath.lastIndexOf('/'))
+            querys += `&outputFileName=${filename}&path=${temPath}&isFullExcel=true`
+            let url =
+              `${window.location.protocol}//${window.location.host}/api/rest_j/v1/${apiPath}?` +
+              querys
+            flag = this.downloadFile(url, temPath)
           } else {
             querys += `&outputFileName=${filename}&path=${temPath}`
             let url =
diff --git a/web/packages/shared/components/vue-process/nodeView.vue b/web/packages/shared/components/vue-process/nodeView.vue
index b1bcf0cad..07cfa23ac 100644
--- a/web/packages/shared/components/vue-process/nodeView.vue
+++ b/web/packages/shared/components/vue-process/nodeView.vue
@@ -28,6 +28,7 @@
         :anchor-size="node.anchorSize"
         :image="node.image"
         :selected="node.selected"
+        :disabled="node.disabled"
         :run-state="node.runState"
         :node-anchors="node.nodeAnchors"
         @operat-node="operatNode" />
diff --git a/web/packages/shared/components/vue-process/noder.vue b/web/packages/shared/components/vue-process/noder.vue
index e2c1cb395..d5fa96c08 100644
--- a/web/packages/shared/components/vue-process/noder.vue
+++ b/web/packages/shared/components/vue-process/noder.vue
@@ -3,7 +3,7 @@
     :style="getNodeStyle"
     :title="title"
     class="node-box"
-    :class="{'node-selected': isChoose}"
+    :class="{'node-disabled': isDisabled, 'node-selected': isChoose}"
     @click="click"
     @dblclick="dblclick"
     @mousedown.stop="mousedown"
@@ -112,6 +112,10 @@ export default {
       type: Boolean,
       default: false
     },
+    disabled: {
+      type: Boolean,
+      default: false
+    },
     nodeAnchors: {
       type: Array,
       dafault: () => []
@@ -121,10 +125,13 @@ export default {
     return {
       component: null,
       currentBorderColor: this.borderColor,
-      isChoose: this.selected
+      isChoose: this.selected,
     };
   },
   computed: {
+    isDisabled() {
+      return this.disabled;
+    },
     getNodeStyle() {
       let styelObj
       if (this.state.mapMode && this.nodeType !== 'canvas') {
diff --git a/web/packages/shared/components/vue-process/style/index.scss b/web/packages/shared/components/vue-process/style/index.scss
index 90bb81b5b..0800d1ab9 100644
--- a/web/packages/shared/components/vue-process/style/index.scss
+++ b/web/packages/shared/components/vue-process/style/index.scss
@@ -634,6 +634,10 @@
      box-shadow: 1px 4px 6px 1px rgba(106,133,167,0.30);
      border-radius: 4px;
    }
+   .node-disabled {
+     background-color: #fafafa;
+     color: #cfd0d3;
+  }
  }
 
  .designer-menu {
diff --git a/web/packages/shared/package.json b/web/packages/shared/package.json
index 3c660d6c3..c194c4271 100644
--- a/web/packages/shared/package.json
+++ b/web/packages/shared/package.json
@@ -2,6 +2,6 @@
   "name": "@dataspherestudio/shared",
   "version": "1.1.19",
   "dependencies": {
-    "dexie": "2.0.4"
+    "dexie": "3.0.4"
   }
 }
diff --git a/web/packages/workflows/module/process/component/designtoolbar.vue b/web/packages/workflows/module/process/component/designtoolbar.vue
index 0f9ecb0e3..0c283d840 100644
--- a/web/packages/workflows/module/process/component/designtoolbar.vue
+++ b/web/packages/workflows/module/process/component/designtoolbar.vue
@@ -228,7 +228,7 @@ export default {
           {
             projectId: +this.$route.query.projectID,
             workflowId: this.flowId,
-            labels: { route: this.getCurrentDsslabels() },
+            labels: { route: this.getCurrentDsslabels() || 'dev' },
           },
           'post'
         )
diff --git a/web/packages/workflows/module/process/component/nodeparameter.vue b/web/packages/workflows/module/process/component/nodeparameter.vue
index 571194d25..431ec8c34 100644
--- a/web/packages/workflows/module/process/component/nodeparameter.vue
+++ b/web/packages/workflows/module/process/component/nodeparameter.vue
@@ -22,6 +22,7 @@
           <Select
             v-model="currentNode[item.key]"
             :placeholder="item.desc"
+            clearable
             :multiple="item.uiType === 'MultiSelect'">
             <Option v-for="subItem in JSON.parse(item.value)" :value="subItem" :key="subItem">{{subItem}}</Option>
           </Select>
@@ -30,6 +31,7 @@
           <Select
             v-model="currentNode[item.key]"
             :placeholder="item.desc"
+            clearable
             multiple>
             <Option v-for="(subItem,index) in conditionBindList(item)" :value="subItem.key" :key="index">{{ subItem.name }}</Option>
           </Select>
@@ -41,7 +43,7 @@
     </div>
     <Form v-if="curNodeParamsList.length > 0 && currentNode.jobParams" label-position="top"
       ref="parameterForm"  class="node-parameter-bar" :model="currentNode" :rules="ruleValidate">
-      <FormItem label="是否引用参数模板">
+      <FormItem label="是否引用资源参数模板">
         <Select
           v-model="isRefTemplate" @on-change="handleRefTemplateChange">
           <Option value="1">是</Option>
@@ -49,13 +51,13 @@
         </Select>
       </FormItem>
       <template v-if="isRefTemplate === '1'">
-        <FormItem label="参数模板名称" prop="ecConfTemplateName">
-          <Input v-model="currentNode.ecConfTemplateName" placeholder="请选择参数模板名称" readonly @on-focus="openTemplateDrawer"></Input>
+        <FormItem label="资源参数模板名称" prop="ecConfTemplateName">
+          <Input v-model="currentNode.ecConfTemplateName" placeholder="请选择资源参数模板名称" readonly @on-focus="openTemplateDrawer"></Input>
         </FormItem>
       </template>
       <template>
         <template v-for="item in curNodeParamsList">
-          <template v-if="checkShow(item) && (item.position === 'runtime' || item.position === 'startup')">
+          <template v-if="checkShow(item) && ['runtime', 'startup', 'special'].includes(item.position)">
             <FormItem v-if="['Input', 'Text', 'Disable'].includes(item.uiType)" :rules="paramsValid(item)" :key="poinToLink(item.key)" :label="item.lableName" :prop="'jobParams.'+ poinToLink(item.key)">
               <Input v-model="currentNode.jobParams[poinToLink(item.key)]" :type="filterFormType(item.uiType)" :rows="6"
                 :placeholder="item.desc" :disabled="item.uiType === 'Disable'"
@@ -65,6 +67,7 @@
               <Select
                 v-model="currentNode.jobParams[poinToLink(item.key)]"
                 :placeholder="item.desc"
+                clearable
                 :multiple="item.uiType === 'MultiSelect'">
                 <Option v-for="subItem in JSON.parse(item.value)" :value="subItem" :key="subItem">{{subItem}}</Option>
               </Select>
@@ -73,6 +76,7 @@
               <Select
                 v-model="currentNode.jobParams[poinToLink(item.key)]"
                 :placeholder="item.desc"
+                clearable
                 multiple>
                 <Option v-for="(subItem,index) in conditionBindList(item)" :value="subItem.key" :key="index">{{ subItem.name }}</Option>
               </Select>
@@ -100,7 +104,7 @@
 <script>
 import resource from './resource.vue';
 import weTag from '@dataspherestudio/shared/components/tag/index.vue'
-import { isEmpty } from 'lodash';
+import { isEmpty, cloneDeep } from 'lodash';
 import templateSelectDrawer from './templateSelectDrawer.vue'
 import { useData } from './useData.js';
 const {
@@ -141,7 +145,11 @@ export default {
     consoleParams: {
       type: Array,
       default: () => []
-    }
+    },
+    tabs: {
+      type: Array,
+      default: () => [],
+    },
   },
   data() {
     return {
@@ -156,7 +164,9 @@ export default {
         ecConfTemplateName: [
           { required: true, message: '请选择参数模板', trigger: 'change' }
         ],
-      }
+      },
+      valueSemicolonValidReg: /^((check\.object|source\.type)\.\w+?=[^;\s]+?;\s*)+$/, // 校验分号分割
+      valueWordwrapValidReg: /^((check\.object|source\.type)\.\w+?=[^;\s]+?\s+)+$/, // 校验换行符分割
     };
   },
   watch: {
@@ -177,7 +187,7 @@ export default {
       this.curNodeParamsList.map((item) => {
         // 多选框是数组值
         const defaultValue = ['MultiBinding'].includes(item.uiType) ? JSON.parse(item.defaultValue) : this.consoleParamsDefault(item.defaultValue, item.key, this.consoleParams);
-        if ((item.position === 'runtime' || item.position === 'startup') && this.currentNode.params) {
+        if (['runtime', 'startup', 'special'].includes(item.position) && this.currentNode.params) {
           const value = this.currentNode.params.configuration[item.position][item.key] ? this.currentNode.params.configuration[item.position][item.key] : defaultValue;
           jobParams[this.poinToLink(item.key)] = value;
         } else if (item.uiType === 'Upload') {
@@ -193,7 +203,12 @@ export default {
           }
         }
       })
-      this.isRefTemplate = this.currentNode.ecConfTemplateId ? '1':'0'
+      // eslint-disable-next-line no-extra-boolean-cast
+      if(!!this.currentNode.ecConfTemplateId) {
+        this.isRefTemplate = '1'
+      } else {
+        this.isRefTemplate = '0'
+      }
       jobParams['ec-conf-templateId'] = this.currentNode.ecConfTemplateId
       this.$set(this.currentNode, 'jobParams', jobParams);
     }
@@ -299,6 +314,28 @@ export default {
     poinToLink(key) {
       return key.replace(/\./g, '-');
     },
+    jobDescVaid(value) {
+      let valid = false;
+      let type = '';
+      if (this.valueSemicolonValidReg.test(value) || this.valueSemicolonValidReg.test(value + ';')) {
+        valid = true;
+        type = 'semicolon';
+      } else if (this.valueWordwrapValidReg.test(value) || this.valueWordwrapValidReg.test(value + '\n')) {
+        valid = true;
+        type = 'wordwrap';
+      }
+      return { valid, type };
+    },
+    getJobDescDuplication(value) {
+      const trimVal = (value || '').trim()
+      const type = this.jobDescVaid(trimVal).type;
+      let divide = type === 'wordwrap' ? /\s/ : ';';
+      const matches = trimVal.split(divide).map(item => item.trim()).filter(item => item);
+      if (type === 'wordwrap') {
+        divide = '\n'
+      }
+      return { matches, divide };
+    },
     // 各参数的校验规则
     paramsValid(param) {
       // 自定义函数的方法先写这里
@@ -328,14 +365,26 @@ export default {
       };
       // eslint-disable-next-line no-unused-vars
       const validateJobDesc = (rule, value, callback) => {
+        const trimVal = (value || '').trim();
+        if (trimVal && !this.jobDescVaid(trimVal).valid) {
+          callback(new Error(rule.message));
+        } else {
+          callback();
+        }
+      }
+
+      // eslint-disable-next-line no-unused-vars
+      const validateJobDescDuplication = (rule, value, callback) => {
         let tmp = {}
         let hasDuplicate = false
         if (value) {
-          value.split('\n').filter(it => it).map(it => it.trim().split('=')[0]).forEach(it => {
-            if (tmp[it]) {
+          const { matches } = this.getJobDescDuplication(value);
+          matches.forEach(it => {
+            const key = it.split('=')[0]
+            if (tmp[key]) {
               hasDuplicate = true
             } else {
-              tmp[it] = 1
+              tmp[key] = 1
             }
           })
         }
@@ -378,7 +427,7 @@ export default {
           } else if (item.validateType === 'Function') {
             temRule.push({
               // 只有和上面定义的函数名相同才让执行
-              validator: ['validatorTitle', 'validateJson', 'validateJobDesc'].includes(item.validateRange) ? eval(item.validateRange) : () => {},
+              validator: ['validatorTitle', 'validateJson', 'validateJobDesc', 'validateJobDescDuplication'].includes(item.validateRange) ? eval(item.validateRange) : () => {},
               message: item.message,
               trigger: item.trigger || 'blur'
             })
@@ -449,9 +498,14 @@ export default {
         // 没有值降默认值回填
         if (this.currentNode.jobParams && this.currentNode.params.configuration) {
           this.curNodeParamsList.map((item) => {
-            if ((item.position === 'runtime' || item.position === 'startup') && this.currentNode.params) {
+            if (['runtime', 'startup', 'special'].includes(item.position) && this.currentNode.params) {
               const value = this.currentNode.jobParams[this.poinToLink(item.key)] ? this.currentNode.jobParams[this.poinToLink(item.key)] : item.defaultValue;
-              this.currentNode.params.configuration[item.position][item.key] = value;
+              if (item.key && ['job.desc'].includes(item.key)) {
+                const { matches, divide } = this.getJobDescDuplication(value);
+                this.currentNode.params.configuration[item.position][item.key] = matches.join(divide);
+              } else {
+                this.currentNode.params.configuration[item.position][item.key] = value;
+              }
             }
           })
         }
@@ -467,6 +521,21 @@ export default {
         }
       });
     },
+    getCurrentNode() {
+      const param = cloneDeep(this.currentNode);
+      if (param.jobParams && param.params.configuration) {
+        this.curNodeParamsList.map((item) => {
+          if (['runtime', 'startup', 'special'].includes(item.position) && param.params) {
+            const value = param.jobParams[this.poinToLink(item.key)] ? param.jobParams[this.poinToLink(item.key)] : item.defaultValue;
+            if (item.key && ['job.desc'].includes(item.key)) {
+              const { matches, divide } = this.getJobDescDuplication(value);
+              param.params.configuration[item.position][item.key] = matches.join(divide);
+            }
+          }
+        })
+      }
+      return param;
+    },
     validFrom(cb) {
       this.$refs.baseInfoForm.validate((baseInfoValid) => {
         if (baseInfoValid) {
@@ -474,14 +543,16 @@ export default {
             this.$refs.parameterForm.validate((valid) => {
               if (valid) {
                 cb()
-                this.$emit('saveNode', this.currentNode);
+                const tempNode = this.getCurrentNode();
+                this.$emit('saveNode', tempNode);
               } else {
                 this.$Message.warning(this.$t('message.workflow.process.nodeParameter.BCSB'));
               }
             });
           } else {
             cb()
-            this.$emit('saveNode', this.currentNode);
+            const tempNode = this.getCurrentNode();
+            this.$emit('saveNode', tempNode);
           }
         } else {
           this.$Message.warning(this.$t('message.workflow.process.nodeParameter.JDBDXTXBHF'));
@@ -515,7 +586,8 @@ export default {
         };
       });
       this.resourcesAction();
-      this.$emit('saveNode', this.currentNode);
+      const tempNode = this.getCurrentNode();
+      this.$emit('saveNode', tempNode);
     },
     filterFormType(val) {
       switch (val) {
@@ -533,9 +605,9 @@ export default {
      * @param {*} condition
      * @returns
      */
-    checkShow(item) {
-      const data = this.currentNode
-      if (item.condition) {
+    checkShow(item, nodeData) {
+      let data = nodeData || this.currentNode
+      if (typeof item.condition === 'string' && item.condition) {
         let condition = item.condition
         // condition 示例：
         // ${params.configuration.runtime['only.receive.today']}
@@ -544,10 +616,16 @@ export default {
         // 前端编辑参数存在jobParams，需要转换，以上示例转换如下
         // ${jobParams['only-receive-today']}
         // !${jobParams['ec-conf-templateId']}
-        if (condition.indexOf('params.configuration') > 0) {
-          condition = condition.replace(/params\.configuration\.runtime/g,'jobParams').replace(/params\.configuration\.startup/g,'jobParams')
-          condition = this.poinToLink(condition)
+        if (nodeData) {
+          // module.vue click 触发，条件检查使用params.configuration.runtime这种路径
+        } else {
+          // 参数面板点击触发，条件检查使用jobParams这种路径
+          if (condition.indexOf('params.configuration') > 0) {
+            condition = condition.replace(/params\.configuration\.runtime/g,'jobParams').replace(/params\.configuration\.startup/g,'jobParams')
+            condition = this.poinToLink(condition)
+          }
         }
+
         let Fn = Function
         let fn = condition.replace(/\${([^}]+)}/g, function (a, b) {
           return `__node__data.${b}`
@@ -559,6 +637,9 @@ export default {
           //
         }
       }
+      if (typeof item.condition === 'boolean') {
+        return item.condition
+      }
       return true
     }
   },
diff --git a/web/packages/workflows/module/process/component/templateSelectDrawer.vue b/web/packages/workflows/module/process/component/templateSelectDrawer.vue
index 8713b9da2..b74e48b68 100644
--- a/web/packages/workflows/module/process/component/templateSelectDrawer.vue
+++ b/web/packages/workflows/module/process/component/templateSelectDrawer.vue
@@ -7,11 +7,15 @@
     v-model="showDrawer"
     @on-close="submitCancel"
   >
-    <Collapse v-model="activePanelArray" @on-change="handlePanelChange">
-      <Panel :name="item.templateId" v-for="(item,index) in templateList" :key="item.templateId">
-        <Radio v-model="radioData[index]" :true-value="true" :false-value="false" @on-change="handleRadioChange" style="width:85%;overflow: hidden;text-overflow: ellipsis;">
-          <span :title="item.templateName">{{item.templateName}}</span>
-        </Radio>
+    <Collapse :value="activePanelArray" @on-change="handlePanelChange" class="collapse-panel">
+      <Panel hide-arrow :name="item.templateId" v-for="(item,index) in templateList" :key="item.templateId">
+        <div class="tpl-item" @click.stop="()=>{}">
+          <Icon type="ios-arrow-down" class="tpl-item-icon" @click.stop="handlePanelChange([item.templateId], 'expand')" ></Icon>
+          <Radio v-model="radioData[index]" :true-value="true" :false-value="false" @on-change="handleRadioChange" style="width:85%;overflow: hidden;text-overflow: ellipsis;">
+            <span :title="item.templateName">{{item.templateName}}</span>
+          </Radio>
+        </div>
+
         <div slot="content">
           <div v-for="(confItem,confIndex) in item.conf" :key="confIndex">
             <span>{{confItem.key}}</span>:&nbsp;<span style="color: black">{{confItem.configValue}}</span>
@@ -78,7 +82,14 @@ export default {
       })
       this.cacheRadioData = JSON.parse(JSON.stringify(this.radioData))
     },
-    async handlePanelChange(vArray) {
+    async handlePanelChange(vArray, type) {
+      if (type == 'expand') {
+        if (this.activePanelArray.indexOf(vArray[0]) > -1) {
+          this.activePanelArray.splice(this.activePanelArray.indexOf(vArray[0]), 1)
+        } else {
+          this.activePanelArray.push(vArray[0])
+        }
+      }
       vArray.forEach(async (v)=> {
         const index = this.templateList.findIndex(item => {
           return item.templateId == v
@@ -126,4 +137,19 @@ export default {
         text-align: right;
         background: #fff;
     }
+    .tpl-item {
+      width: 100%;
+      .tpl-item-icon {
+        margin-right: 5px;
+        opacity: 0;
+        &:hover {
+          opacity: 1;
+        }
+      }
+    }
+    ::v-deep .collapse-panel .ivu-collapse-header {
+      padding-left: 8px;
+    }
+    
+
 </style>
diff --git a/web/packages/workflows/module/process/cyeditor/convert.js b/web/packages/workflows/module/process/cyeditor/convert.js
index 7cd711a4c..6fb00bc32 100644
--- a/web/packages/workflows/module/process/cyeditor/convert.js
+++ b/web/packages/workflows/module/process/cyeditor/convert.js
@@ -24,6 +24,7 @@ export default function convertFlowJson(flowjson) {
         }
       }
       item.selected = element.selected;
+      item.disabled = element.disabled;
       elements.nodes.push(item)
     })
     const hasNode = (target) => {
diff --git a/web/packages/workflows/module/process/cyeditor/index.vue b/web/packages/workflows/module/process/cyeditor/index.vue
index 1941ada2a..3a7f7208c 100644
--- a/web/packages/workflows/module/process/cyeditor/index.vue
+++ b/web/packages/workflows/module/process/cyeditor/index.vue
@@ -411,6 +411,18 @@ export default {
         pan,
         zoom: this.zoomSize
       })
+
+      // 设置禁用的样式
+      cy.style().selector('.disabled-node').style({
+        'background-color': '#fafafa',
+        'color': '#cfd0d3'
+      })
+      data.nodes.forEach(function(nodeItem) {
+        var node = cy.getElementById(nodeItem.data.id);
+        if (nodeItem.disabled) {
+          node.addClass('disabled-node');
+        }
+      });
     },
     updataNodeStatuStyle() {
       if (!this.$refs.nodestaus || !this.instance) return
diff --git a/web/packages/workflows/module/process/module.vue b/web/packages/workflows/module/process/module.vue
index 322ea927d..4cbc2c496 100644
--- a/web/packages/workflows/module/process/module.vue
+++ b/web/packages/workflows/module/process/module.vue
@@ -122,6 +122,7 @@
           :readonly="myReadonly"
           :nodes="json && json.nodes"
           :consoleParams="consoleParams"
+          :tabs="tabs"
           @saveNode="saveNode"
         ></nodeParameter>
       </div>
@@ -354,6 +355,11 @@ import NodePath from './component/nodePath.vue';
 import cyeditor from './cyeditor/index.vue'
 import DesignToolbar from './component/designtoolbar.vue';
 import { hasCycle } from './utils';
+import { useData } from './component/useData.js';
+
+const {
+  getTemplateDatas,
+} = useData();
 
 export default {
   components: {
@@ -679,6 +685,22 @@ export default {
     window.removeEventListener('resize', this.resizeConsole, false);
   },
   methods: {
+    // 获取当前节点对应的模板信息
+    async getTemplateDataByProject(jobType) {
+      const params = {
+        projectId: this.$route.query.projectID,
+        orchestratorId: this.$route.query.flowId,
+        jobType,
+      }
+      const res = await getTemplateDatas(params);
+      let templateList = [];
+      res.forEach(e=> {
+        e.child.forEach(d => {
+          templateList.push(Object.assign(d))
+        })
+      });
+      return templateList;
+    },
     resizeConsole: debounce(function() {
       this.consoleHeight = this.$el ? this.$el.clientHeight / 2 : 250
     }, 300),
@@ -898,6 +920,10 @@ export default {
         json = JSON.parse(json);
         if (json.nodes && Array.isArray(json.nodes)) {
           json.nodes = json.nodes.map((node) => {
+            node.disabled = false;
+            if (node.params && node.params.configuration && node.params.configuration.special) {
+              node.disabled = node.params.configuration.special['auto.disabled'] === 'true';
+            }
             node.type = node.jobType;
             delete node.jobType;
             return node;
@@ -973,6 +999,20 @@ export default {
       } else {
         // 为node信息添加modelType字段方便脚本格式判断
         arg[0].modelType = ext[arg[0].type];
+        // dpms  /product/100199/story/detail/365928 配置了模板则传递参数时根据配置过滤
+        if (arg[0].params && arg[0].params.configuration && arg[0].params.configuration.startup["ec.conf.templateId"]) {
+          arg[0].nodeUiVOS.forEach((item) => {
+            let show = this.$refs.nodeParameter.checkShow(item, arg[0]);
+            if (show === false) {
+              if (typeof item.condition === 'string' && item.condition && item.condition.indexOf('configuration.startup') > -1) {
+                delete arg[0].params.configuration.startup[item.key];
+              }
+              if (typeof item.condition === 'string' && item.condition && item.condition.indexOf('configuration.runtime') > -1) {
+                delete arg[0].params.configuration.runtime[item.key];
+              }
+            }
+          })
+        }
         this.$emit('node-dblclick', arg);
       }
     },
@@ -1059,6 +1099,10 @@ export default {
           item.businessTag = node.businessTag;
           item.modifyUser = this.getUserName();
           item.modifyTime = Date.now();
+          item.disabled = false;
+          if (item.params && node.params.configuration && node.params.configuration.special) {
+            item.disabled = node.params.configuration.special['auto.disabled'] === 'true';
+          }
         }
         item.selected = item.key === node.key
         return item;
@@ -1683,11 +1727,12 @@ export default {
         cb(false);
       });
     },
-    addNode(node) {
+    async addNode(node) {
       // 关闭右侧弹窗
       this.nodebaseinfoShow = false;
       // 新拖入的节点，自动生成新的不重复名称,给名称后面加四位随机数
       node = this.bindNodeBasicInfo(node);
+      const templateList = await this.getTemplateDataByProject(node.type);
       this.clickCurrentNode = JSON.parse(JSON.stringify(node));
       this.clickCurrentNode.title = this.clickCurrentNode.title + '_' + Math.round(Math.random()*10000);
       // 弹窗提示由后台控制
@@ -1701,6 +1746,24 @@ export default {
             subItem.title = this.clickCurrentNode.title;
             subItem.modifyUser = this.getUserName();
             subItem.modifyTime = Date.now();
+            // 对于新增节点根据默认值情况做赋值
+            if (this.tabs[0].data.isDefaultReference === '1') {
+              templateList.forEach((v) => {
+                if(v.workflowDefault) {
+                  subItem.ecConfTemplateId = v.templateId;
+                  subItem.ecConfTemplateName = v.templateName;
+                  subItem.params = {
+                    configuration: {
+                      special: {},
+                      runtime: {},
+                      startup: {
+                        'ec.conf.templateId': v.templateId,
+                      }
+                    }
+                  }
+                }
+              });
+            }
           }
           return subItem;
         });
diff --git a/web/packages/workflows/module/workflow/index.vue b/web/packages/workflows/module/workflow/index.vue
index c38079acf..1e090bb54 100644
--- a/web/packages/workflows/module/workflow/index.vue
+++ b/web/packages/workflows/module/workflow/index.vue
@@ -332,23 +332,29 @@ export default {
           id,
           description,
           uses,
-          labels
+          labels,
+          isDefaultReference,
         } = data;
+        const params = {
+          workspaceId,
+          projectId,
+          orchestratorName,
+          // orchestratorId,
+          orchestratorMode,
+          orchestratorWays,
+          id,
+          description,
+          uses,
+          labels,
+          isDefaultReference
+        }
+        if (!data.templateIds || data.templateIds.length === 0) {
+          delete params.isDefaultReference
+        }
         api
           .fetch(
             `${this.$API_PATH.ORCHESTRATOR_PATH}modifyOrchestrator`,
-            {
-              workspaceId,
-              projectId,
-              orchestratorName,
-              // orchestratorId,
-              orchestratorMode,
-              orchestratorWays,
-              id,
-              description,
-              uses,
-              labels
-            },
+            params,
             "post"
           )
           .then(() => {
@@ -436,7 +442,8 @@ export default {
         orchestratorMode: "",
         orchestratorWays: null,
         projectId: this.$route.query.projectID,
-        workspaceId: this.$route.query.workspaceId
+        workspaceId: this.$route.query.workspaceId,
+        isDefaultReference: "0",
       };
     },
     // 修改编排
diff --git a/web/packages/workflows/module/workflow/module/workflowForm.vue b/web/packages/workflows/module/workflow/module/workflowForm.vue
index 29cb6467a..5537bc45e 100644
--- a/web/packages/workflows/module/workflow/module/workflowForm.vue
+++ b/web/packages/workflows/module/workflow/module/workflowForm.vue
@@ -4,7 +4,7 @@
     :title="actionType === 'add' ? $t('message.orchestratorModes.createOrchestrator') : $t('message.orchestratorModes.modeifyOrchestrator')"
     :closable="false">
     <Form
-      :label-width="100"
+      :label-width="118"
       ref="projectForm"
       :model="workflowDataCurrent"
       :rules="formValid"
@@ -80,7 +80,7 @@
           :placeholder="$t('message.workflow.inputWorkflowDesc')"></Input>
       </FormItem>
       <FormItem
-        :label="$t('message.Project.defaultTemplate')"
+        :label="$t('message.Project.defaultResTemplate')"
         prop="templateIds"
         v-if="!$APP_CONF.open_source"
       >
@@ -90,6 +90,16 @@
           </OptionGroup>
         </Select>
       </FormItem>
+      <FormItem
+        :label="$t('message.Project.isQuoteTemplate')"
+        prop="isDefaultReference"
+        v-if="!$APP_CONF.open_source && workflowDataCurrent.templateIds && workflowDataCurrent.templateIds.length > 0"
+      >
+        <RadioGroup v-model="workflowDataCurrent.isDefaultReference">
+          <Radio label="1"><span>是</span></Radio>
+          <Radio label="0"><span>否</span></Radio>
+        </RadioGroup>
+      </FormItem>
     </Form>
     <div slot="footer">
       <Button
@@ -177,6 +187,9 @@ export default {
           { required: true, message: this.$t('message.workflow.enterDesc'), trigger: 'blur' },
           { message: `${this.$t('message.workflow.descLength')}200`, max: 200 },
         ],
+        isDefaultReference: [
+          { required: true, message: this.$t('message.enginelist.ruleform.plsselect'), trigger: 'blur' },
+        ],
         orchestratorMode: [
           { required: true, trigger: 'blur', message: this.$t('message.workflow.orchestratorMode') }
         ]
@@ -228,12 +241,12 @@ export default {
           orchestratorId: this.workflowDataCurrent.orchestratorId
         }
         this.initTemplates = await getTemplateDatas(params);
-        // this.defaultTemplates = JSON.parse(JSON.stringify(this.initTemplates)) 
+        // this.defaultTemplates = JSON.parse(JSON.stringify(this.initTemplates))
         this.handleTemplateIdsChange(this.workflowDataCurrent.templateIds)
       }
     },
     handleTemplateIdsChange(vArray) {
-      this.defaultTemplates = JSON.parse(JSON.stringify(this.initTemplates)) 
+      this.defaultTemplates = JSON.parse(JSON.stringify(this.initTemplates))
       vArray.forEach(v => {
         const curType = this.searchValueType(v);
         this.defaultTemplates.forEach((type,index) => {
@@ -274,6 +287,9 @@ export default {
         currentData.orchestratorWays = currentData.orchestratorWayArray;
         delete currentData.orchestratorWayArray;
       }
+      if (!workflowDataCurrent.templateIds || workflowDataCurrent.templateIds.length === 0) {
+        delete currentData.isDefaultReference
+      }
       return currentData;
     },
     Ok() {
diff --git a/web/packages/workflows/module/workflow/module/workflowFormNew.vue b/web/packages/workflows/module/workflow/module/workflowFormNew.vue
index b742ca9f4..61045522a 100644
--- a/web/packages/workflows/module/workflow/module/workflowFormNew.vue
+++ b/web/packages/workflows/module/workflow/module/workflowFormNew.vue
@@ -1,6 +1,6 @@
 <template>
   <Form
-    :label-width="100"
+    :label-width="118"
     ref="projectForm"
     :model="workflowDataCurrent"
     :rules="formValid"
@@ -85,7 +85,7 @@
         :placeholder="$t('message.workflow.inputWorkflowDesc')"></Input>
     </FormItem>
     <FormItem
-      :label="$t('message.Project.defaultTemplate')"
+      :label="$t('message.Project.defaultResTemplate')"
       prop="templateIds"
       v-if="!$APP_CONF.open_source"
     >
@@ -95,6 +95,16 @@
         </OptionGroup>
       </Select>
     </FormItem>
+    <FormItem
+      :label="$t('message.Project.isQuoteTemplate')"
+      prop="isDefaultReference"
+      v-if="!$APP_CONF.open_source && workflowDataCurrent.templateIds && workflowDataCurrent.templateIds.length > 0"
+    >
+      <RadioGroup v-model="workflowDataCurrent.isDefaultReference">
+        <Radio label="1"><span>是</span></Radio>
+        <Radio label="0"><span>否</span></Radio>
+      </RadioGroup>
+    </FormItem>
     <Form-item>
       <Button
         type="text"
@@ -179,6 +189,9 @@ export default {
           { required: true, message: this.$t('message.workflow.enterDesc'), trigger: 'blur' },
           { message: `${this.$t('message.workflow.descLength')}200`, max: 200 },
         ],
+        isDefaultReference: [
+          { required: true, message: this.$t('message.enginelist.ruleform.plsselect'), trigger: 'blur' },
+        ],
         orchestratorMode: [
           { required: true, trigger: 'blur', message: this.$t('message.workflow.orchestratorMode') }
         ]
@@ -207,11 +220,11 @@ export default {
         }
         const res = await getTemplateDatas(params);
         this.initTemplates = res;
-        this.defaultTemplates = JSON.parse(JSON.stringify(this.initTemplates)) 
+        this.defaultTemplates = JSON.parse(JSON.stringify(this.initTemplates))
       }
     },
     handleTemplateIdsChange(vArray) {
-      this.defaultTemplates = JSON.parse(JSON.stringify(this.initTemplates)) 
+      this.defaultTemplates = JSON.parse(JSON.stringify(this.initTemplates))
       vArray.forEach(v => {
         const curType = this.searchValueType(v);
         this.defaultTemplates.forEach((type,index) => {
@@ -253,6 +266,9 @@ export default {
         delete currentData.orchestratorWayArray;
       }
       currentData['projectId'] = currentData['projectId'] + '';
+      if (!workflowDataCurrent.templateIds || workflowDataCurrent.templateIds.length === 0) {
+        delete currentData.isDefaultReference
+      }
       return currentData;
     },
     Ok() {
diff --git a/web/packages/workflows/module/workflow/module/workflowModal.vue b/web/packages/workflows/module/workflow/module/workflowModal.vue
index c2213733d..65baee3e4 100644
--- a/web/packages/workflows/module/workflow/module/workflowModal.vue
+++ b/web/packages/workflows/module/workflow/module/workflowModal.vue
@@ -115,7 +115,8 @@ export default {
         orchestratorMode: '',
         orchestratorWays: null,
         projectId: String(this.currentTreeProject ? this.currentTreeProject.id : this.$route.query.projectID),
-        workspaceId: this.$route.query.workspaceId
+        workspaceId: this.$route.query.workspaceId,
+        isDefaultReference: "0"
       };
     },
     initUpload() {
diff --git a/web/packages/workflows/view/layout.vue b/web/packages/workflows/view/layout.vue
index e4e39b959..328d17137 100644
--- a/web/packages/workflows/view/layout.vue
+++ b/web/packages/workflows/view/layout.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="layout-body" :class="{'hide-header': ismicroModule}">
     <layout-header
-      v-if="!ismicroModule"
+      v-if="!ismicroModule && !$route.query.noHeader"
       @clear-session="clearSession"/>
     <router-view/>
     <layout-footer/>
diff --git a/web/packages/workflows/view/process/index.vue b/web/packages/workflows/view/process/index.vue
index 4e18f0a5a..edf9102de 100644
--- a/web/packages/workflows/view/process/index.vue
+++ b/web/packages/workflows/view/process/index.vue
@@ -1,15 +1,93 @@
 <template>
-  <process :query="$route.query"></process>
+  <process v-if="query.appId" :query="query"></process>
+  <Spin v-else fix></Spin>
 </template>
 <script>
 import process from '@/workflows/module/process';
+import api from '@dataspherestudio/shared/common/service/api';
+
+// 工作流编辑区单独页面
+
 export default {
   components: {
     process: process.component,
   },
   data() {
     return {
+      query: {}
     };
   },
+  methods: {
+    openOrchestrator(params) {
+      api
+        .fetch(
+          `${this.$API_PATH.ORCHESTRATOR_PATH}openOrchestrator`,
+          {
+            orchestratorId: params.orchestratorId,
+            labels: { route: params.label },
+            workspaceName: params.workspaceName,
+          },
+          "post"
+        )
+        .then((openOrchestrator) => {
+          let paramsquery = {};
+          if (openOrchestrator) {
+            paramsquery = {
+              appId: openOrchestrator.OrchestratorVo.dssOrchestratorVersion.appId,
+              version: openOrchestrator.OrchestratorVo.dssOrchestratorVersion.id,
+              orchestratorVersionId: openOrchestrator.OrchestratorVo.dssOrchestratorVersion.id
+            }
+            this.query = {
+              ...paramsquery,
+              ...params
+            }
+          } else {
+            return this.$Message.warning(
+              this.$t("message.orchestratorModes.FailedOpenOrchestrator")
+            );
+          }
+        });
+    },
+    getAllOrchestrator() {
+      return api
+        .fetch(
+          `${this.$API_PATH.ORCHESTRATOR_PATH}getAllOrchestrator`,
+          {
+            workspaceId: this.$route.query.workspaceId,
+            orchestratorMode: this.$route.query.orchestratorMode || 'pom_work_flow',
+            projectId: this.$route.query.projectID,
+          },
+          "post"
+        )
+        .then((res) => {
+          const flow = res.page.find((f) => {
+            return f.orchestratorId == this.$route.query.orchestratorId;
+          });
+          return flow
+        });
+    }
+  },
+  async mounted() {
+    // query参数
+    // noHeader=1
+    // label=dev
+    // workspaceId=271
+    // projectName=copy_128
+    // projectID=3742
+    // orchestratorId=10684
+
+    // ***REMOVED***
+    let flow = {}
+    try {
+      flow = await this.getAllOrchestrator() || {};
+    } catch (error) {
+      //
+    }
+    this.openOrchestrator({
+      ...this.$route.query,
+      editable: flow.editable,
+      releaseable: flow.releaseable
+    });
+  }
 };
-</script>
\ No newline at end of file
+</script>
diff --git a/web/packages/workflows/view/workflow/index.vue b/web/packages/workflows/view/workflow/index.vue
index 21216061e..78898749d 100644
--- a/web/packages/workflows/view/workflow/index.vue
+++ b/web/packages/workflows/view/workflow/index.vue
@@ -1085,6 +1085,7 @@ export default {
                 // 编排的版本id
                 params.version = params.orchestratorVersionId =
                   openOrchestrator.OrchestratorVo.dssOrchestratorVersion.id;
+                params.isDefaultReference = openOrchestrator.OrchestratorVo.dssOrchestratorInfo.isDefaultReference;
                 this.openItemAction(params);
               } else {
                 return this.$Message.warning(
@@ -1148,12 +1149,19 @@ export default {
         tabId: `${params.id}${params.version}`, // 相同编排的不同版本
         isChange: false,
         orchestratorMode: params.orchestratorMode, // 后面根据具体的编排模式确认类型字段
-        type: DEVPROCESS.DEVELOPMENTCENTER
+        type: DEVPROCESS.DEVELOPMENTCENTER,
+        isDefaultReference: params.isDefaultReference
       };
-      const hasIn = this.tabList.find(it=>it.tabId === this.current.tabId)
-      if(!hasIn){
-        this.tabList.push(this.current);
+      const hasInIndex = this.tabList.findIndex(it=>it.tabId === this.current.tabId)
+      if(hasInIndex !== -1) {
+        this.tabList.splice(hasInIndex,1);
       }
+      this.tabList.push(this.current);
+      // 下述写法，工作流数据未及时更新
+      //  const hasIn = this.tabList.find(it=>it.tabId === this.current.tabId)
+      // if(!hasIn){
+      //   this.tabList.push(this.current);
+      // }
     },
     onTabRemove(tabId, del) {
       let index = "";
diff --git a/web/packages/workspace/i18n/en.json b/web/packages/workspace/i18n/en.json
index 88268d2f6..7bf493c10 100644
--- a/web/packages/workspace/i18n/en.json
+++ b/web/packages/workspace/i18n/en.json
@@ -377,7 +377,8 @@
       "config": "config",
       "deleteSuccess": "{ name } Delete Success",
       "paramsTemplate": "Params Template",
-      "defaultTemplate": "Default Template"
+      "defaultTemplate": "Default Template",
+      "defaultResTemplate": "Default Res Template"
     },
     "permissions": {
       "departManagement": "Department management",
diff --git a/web/packages/workspace/i18n/zh.json b/web/packages/workspace/i18n/zh.json
index 9fe4fce85..5057abf6c 100644
--- a/web/packages/workspace/i18n/zh.json
+++ b/web/packages/workspace/i18n/zh.json
@@ -377,7 +377,9 @@
       "config": "配置",
       "deleteSuccess": "{name}删除成功",
       "paramsTemplate": "可用参数模板",
-      "defaultTemplate": "默认参数模板"
+      "defaultTemplate": "默认参数模板",
+      "defaultResTemplate": "默认资源参数模板",
+      "isQuoteTemplate": "新增节点是否默认引用资源参数模板"
     },
     "permissions": {
       "departManagement": "部门管理",

From c3924306888a0caa7aa8b8d4ec462b429031a7fa Mon Sep 17 00:00:00 2001
From: qweqnotallow <747839893@qq.com>
Date: Thu, 16 May 2024 16:16:11 +0800
Subject: [PATCH 136/302] dss-server: getAllProjects add associateGit

---
 .../framework/project/dao/impl/DSSProjectMapper.xml   |  1 +
 .../project/entity/response/ProjectResponse.java      | 11 +++++++++++
 .../framework/project/entity/vo/QueryProjectVo.java   | 10 ++++++++++
 .../project/service/impl/DSSProjectServiceImpl.java   |  1 +
 4 files changed, 23 insertions(+)

diff --git a/dss-framework/dss-framework-project-server/src/main/java/com/webank/wedatasphere/dss/framework/project/dao/impl/DSSProjectMapper.xml b/dss-framework/dss-framework-project-server/src/main/java/com/webank/wedatasphere/dss/framework/project/dao/impl/DSSProjectMapper.xml
index fb1e37b25..7e5b39998 100644
--- a/dss-framework/dss-framework-project-server/src/main/java/com/webank/wedatasphere/dss/framework/project/dao/impl/DSSProjectMapper.xml
+++ b/dss-framework/dss-framework-project-server/src/main/java/com/webank/wedatasphere/dss/framework/project/dao/impl/DSSProjectMapper.xml
@@ -80,6 +80,7 @@
         b.product,b.source,b.isArchive,b.create_time createTime,b.update_time updateTime,
         b.dev_process devProcess,b.orchestrator_mode orchestratorMode,
         b.visible visible,
+        b.associate_git associateGit,
         GROUP_CONCAT(CONCAT(a.project_id,'-',a.priv,'-',a.username)) pusername
         FROM dss_project_user a
         LEFT JOIN dss_project b ON a.project_id = b.id AND a.workspace_id=b.workspace_id
diff --git a/dss-framework/dss-framework-project-server/src/main/java/com/webank/wedatasphere/dss/framework/project/entity/response/ProjectResponse.java b/dss-framework/dss-framework-project-server/src/main/java/com/webank/wedatasphere/dss/framework/project/entity/response/ProjectResponse.java
index e049ffde4..47ff488e6 100644
--- a/dss-framework/dss-framework-project-server/src/main/java/com/webank/wedatasphere/dss/framework/project/entity/response/ProjectResponse.java
+++ b/dss-framework/dss-framework-project-server/src/main/java/com/webank/wedatasphere/dss/framework/project/entity/response/ProjectResponse.java
@@ -80,6 +80,8 @@ public void setEditable(Boolean editable) {
      */
     private List<String> orchestratorModeList;
 
+    private Boolean associateGit;
+
     public Date getCreateTime() {
         return createTime;
     }
@@ -228,6 +230,15 @@ public String toString() {
                 ", devProcessList=" + devProcessList +
                 ", orchestratorModeList=" + orchestratorModeList +
                 ", editable=" + editable +
+                ", associateGit=" + associateGit +
                 '}';
     }
+
+    public Boolean getAssociateGit() {
+        return associateGit;
+    }
+
+    public void setAssociateGit(Boolean associateGit) {
+        this.associateGit = associateGit;
+    }
 }
diff --git a/dss-framework/dss-framework-project-server/src/main/java/com/webank/wedatasphere/dss/framework/project/entity/vo/QueryProjectVo.java b/dss-framework/dss-framework-project-server/src/main/java/com/webank/wedatasphere/dss/framework/project/entity/vo/QueryProjectVo.java
index 687b6d361..6e46e3a06 100644
--- a/dss-framework/dss-framework-project-server/src/main/java/com/webank/wedatasphere/dss/framework/project/entity/vo/QueryProjectVo.java
+++ b/dss-framework/dss-framework-project-server/src/main/java/com/webank/wedatasphere/dss/framework/project/entity/vo/QueryProjectVo.java
@@ -42,6 +42,8 @@ public class QueryProjectVo implements Serializable {
 
     private Integer visible;
 
+    private Boolean associateGit;
+
 
     public Long getId() {
         return id;
@@ -162,4 +164,12 @@ public Integer getVisible() {
     public void setVisible(Integer visible) {
         this.visible = visible;
     }
+
+    public Boolean getAssociateGit() {
+        return associateGit;
+    }
+
+    public void setAssociateGit(Boolean associateGit) {
+        this.associateGit = associateGit;
+    }
 }
diff --git a/dss-framework/dss-framework-project-server/src/main/java/com/webank/wedatasphere/dss/framework/project/service/impl/DSSProjectServiceImpl.java b/dss-framework/dss-framework-project-server/src/main/java/com/webank/wedatasphere/dss/framework/project/service/impl/DSSProjectServiceImpl.java
index b5291e33a..be988ea84 100644
--- a/dss-framework/dss-framework-project-server/src/main/java/com/webank/wedatasphere/dss/framework/project/service/impl/DSSProjectServiceImpl.java
+++ b/dss-framework/dss-framework-project-server/src/main/java/com/webank/wedatasphere/dss/framework/project/service/impl/DSSProjectServiceImpl.java
@@ -234,6 +234,7 @@ public List<ProjectResponse> getListByParam(ProjectQueryRequest projectRequest)
             projectResponse.setArchive(projectVo.getArchive());
             projectResponse.setCreateTime(projectVo.getCreateTime());
             projectResponse.setUpdateTime(projectVo.getUpdateTime());
+            projectResponse.setAssociateGit(projectVo.getAssociateGit());
             projectResponse.setDevProcessList(ProjectStringUtils.convertList(projectVo.getDevProcess()));
             projectResponse.setOrchestratorModeList(ProjectStringUtils.convertList(projectVo.getOrchestratorMode()));
             projectResponseList.add(projectResponse);

From 21592fa967f4c7d68f553bde5b68b7001d09939e Mon Sep 17 00:00:00 2001
From: qweqnotallow <747839893@qq.com>
Date: Thu, 16 May 2024 16:24:25 +0800
Subject: [PATCH 137/302] dss-server: getAllProjects add associateGit sql fix

---
 .../dss/framework/project/dao/impl/DSSProjectMapper.xml          | 1 +
 1 file changed, 1 insertion(+)

diff --git a/dss-framework/dss-framework-project-server/src/main/java/com/webank/wedatasphere/dss/framework/project/dao/impl/DSSProjectMapper.xml b/dss-framework/dss-framework-project-server/src/main/java/com/webank/wedatasphere/dss/framework/project/dao/impl/DSSProjectMapper.xml
index 7e5b39998..7544aeed7 100644
--- a/dss-framework/dss-framework-project-server/src/main/java/com/webank/wedatasphere/dss/framework/project/dao/impl/DSSProjectMapper.xml
+++ b/dss-framework/dss-framework-project-server/src/main/java/com/webank/wedatasphere/dss/framework/project/dao/impl/DSSProjectMapper.xml
@@ -40,6 +40,7 @@
         b.product,b.source,b.isArchive,b.create_time createTime,b.update_time updateTime,
         b.dev_process devProcess,b.orchestrator_mode orchestratorMode,
         b.visible visible,
+        b.associate_git associateGit,
         GROUP_CONCAT(CONCAT(a.project_id,'-',a.priv,'-',a.username)) pusername
         FROM dss_project_user a
         LEFT JOIN dss_project b ON a.project_id = b.id AND a.workspace_id=b.workspace_id

From 7bea67e5766dbfc8552c34038e62d3502989fb98 Mon Sep 17 00:00:00 2001
From: qweqnotallow <747839893@qq.com>
Date: Thu, 16 May 2024 20:12:39 +0800
Subject: [PATCH 138/302] dss-server: publish  sql fix

---
 .../com/webank/wedatasphere/dss/workflow/dao/LockMapper.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/dao/LockMapper.java b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/dao/LockMapper.java
index f4c3fc4c7..4cc11f5a1 100644
--- a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/dao/LockMapper.java
+++ b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/dao/LockMapper.java
@@ -63,5 +63,5 @@ Boolean flowNotExistEditLock(@Param("flowID") Long flowID,
 
     String selectOrchestratorStatus(@Param("id") Long id);
 
-    void updateOrchestratorVersionCommitId(@Param("commitId")String commitId, @Param("workflowId")Long flowID);
+    void updateOrchestratorVersionCommitId(@Param("commitId")String commitId, @Param("flowID")Long flowID);
 }

From 0aac3c784247e514e26aae4acaf4bc611975ab5e Mon Sep 17 00:00:00 2001
From: qweqnotallow <747839893@qq.com>
Date: Fri, 17 May 2024 11:02:04 +0800
Subject: [PATCH 139/302] dss-server: rollback labels fix

---
 .../server/restful/DSSFrameworkOrchestratorRestful.java  | 5 +++--
 .../orchestrator/server/service/OrchestratorService.java | 3 ++-
 .../server/service/impl/OrchestratorServiceImpl.java     | 9 +++++----
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/restful/DSSFrameworkOrchestratorRestful.java b/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/restful/DSSFrameworkOrchestratorRestful.java
index 521b5cc2d..080b30116 100644
--- a/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/restful/DSSFrameworkOrchestratorRestful.java
+++ b/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/restful/DSSFrameworkOrchestratorRestful.java
@@ -21,6 +21,7 @@
 import com.webank.wedatasphere.dss.common.auditlog.TargetTypeEnum;
 import com.webank.wedatasphere.dss.common.label.DSSLabel;
 import com.webank.wedatasphere.dss.common.label.EnvDSSLabel;
+import com.webank.wedatasphere.dss.common.label.LabelRouteVO;
 import com.webank.wedatasphere.dss.common.utils.AuditLogUtils;
 import com.webank.wedatasphere.dss.common.utils.RpcAskUtils;
 import com.webank.wedatasphere.dss.git.common.protocol.GitTree;
@@ -241,10 +242,10 @@ public Message rollbackOrchestrator(HttpServletRequest request, @RequestBody Rol
         Long projectId = rollbackOrchestratorRequest.getProjectId();
         String projectName = rollbackOrchestratorRequest.getProjectName();
         Workspace workspace = SSOHelper.getWorkspace(request);
-        DSSLabel envDSSLabel = new EnvDSSLabel(rollbackOrchestratorRequest.getLabels().getRoute());
+        LabelRouteVO labels = rollbackOrchestratorRequest.getLabels();
         try {
             LOGGER.info("user {} begin to rollbackOrchestrator, params:{}", username, rollbackOrchestratorRequest);
-            String newVersion = orchestratorService.rollbackOrchestrator(username, projectId, projectName, orchestratorId, version, envDSSLabel, workspace);
+            String newVersion = orchestratorService.rollbackOrchestrator(username, projectId, projectName, orchestratorId, version, labels, workspace);
             Message message = Message.ok("回滚版本成功").data("newVersion", newVersion);
             return message;
         } catch (final Throwable t) {
diff --git a/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/OrchestratorService.java b/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/OrchestratorService.java
index 1990621b5..346151aba 100644
--- a/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/OrchestratorService.java
+++ b/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/OrchestratorService.java
@@ -20,6 +20,7 @@
 import com.webank.wedatasphere.dss.common.entity.project.DSSProject;
 import com.webank.wedatasphere.dss.common.exception.DSSErrorException;
 import com.webank.wedatasphere.dss.common.label.DSSLabel;
+import com.webank.wedatasphere.dss.common.label.LabelRouteVO;
 import com.webank.wedatasphere.dss.framework.common.exception.DSSFrameworkErrorException;
 import com.webank.wedatasphere.dss.orchestrator.common.entity.DSSOrchestratorInfo;
 import com.webank.wedatasphere.dss.orchestrator.common.entity.DSSOrchestratorVersion;
@@ -128,7 +129,7 @@ OrchestratorUnlockVo unlockOrchestrator(String userName,
     List<DSSOrchestratorVersion> getOrchestratorVersions(String username, Long projectId, Long orchestratorId);
 
     String rollbackOrchestrator(String username, Long projectId, String projectName,
-                                Long orchestratorId, String version, DSSLabel dssLabel, Workspace workspace) throws Exception;
+                                Long orchestratorId, String version, LabelRouteVO labels, Workspace workspace) throws Exception;
 
     //**** new method
     void isExistSameNameBeforeCreate(Long workspaceId, Long projectId, String orchestratorName) throws DSSFrameworkErrorException;
diff --git a/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/impl/OrchestratorServiceImpl.java b/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/impl/OrchestratorServiceImpl.java
index 20dcd52af..c99727aa5 100644
--- a/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/impl/OrchestratorServiceImpl.java
+++ b/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/impl/OrchestratorServiceImpl.java
@@ -23,6 +23,7 @@
 import com.webank.wedatasphere.dss.common.label.DSSLabel;
 import com.webank.wedatasphere.dss.common.label.DSSLabelUtil;
 import com.webank.wedatasphere.dss.common.label.EnvDSSLabel;
+import com.webank.wedatasphere.dss.common.label.LabelRouteVO;
 import com.webank.wedatasphere.dss.common.protocol.project.ProjectUserAuthRequest;
 import com.webank.wedatasphere.dss.common.protocol.project.ProjectUserAuthResponse;
 import com.webank.wedatasphere.dss.common.utils.DSSExceptionUtils;
@@ -362,14 +363,13 @@ public List<DSSOrchestratorVersion> getOrchestratorVersions(String username, Lon
     @Override
     @Transactional(rollbackFor = Exception.class)
     public String rollbackOrchestrator(String userName, Long projectId, String projectName,
-                                       Long orchestratorId, String version, DSSLabel dssLabel, Workspace workspace) throws Exception {
+                                       Long orchestratorId, String version, LabelRouteVO labels, Workspace workspace) throws Exception {
         //1.新建一个版本
         //2.然后将version的版本内容进行去workflow进行cp
         //3.然后把生产的内容进行update到数据库
         DSSOrchestratorVersion oldOrcVersion=orchestratorMapper.getLatestOrchestratorVersionByIdAndValidFlag(orchestratorId, 1);
         String latestVersion = oldOrcVersion.getVersion();
-        List<DSSLabel> labels = new ArrayList<>();
-        labels.add(dssLabel);
+        DSSLabel envDSSLabel = new EnvDSSLabel(labels.getRoute());
         DSSOrchestratorInfo dssOrchestratorInfo = orchestratorMapper.getOrchestrator(orchestratorId);
 
         String newVersion = OrchestratorUtils.increaseVersion(latestVersion);
@@ -390,7 +390,7 @@ public String rollbackOrchestrator(String userName, Long projectId, String proje
         String contextId = contextService.createContextID(workspace.getWorkspaceName(), projectName, dssOrchestratorInfo.getName(), dssOrchestratorVersion.getVersion(), userName);
         dssOrchestratorVersion.setContextId(contextId);
         LOGGER.info("Create a new ContextId {} for rollback the orchestration {} to version {}.", contextId, dssOrchestratorInfo.getName(), version);
-        RefJobContentResponseRef responseRef = tryRefOperation(dssOrchestratorInfo, userName, workspace, Collections.singletonList(dssLabel), null,
+        RefJobContentResponseRef responseRef = tryRefOperation(dssOrchestratorInfo, userName, workspace, Collections.singletonList(envDSSLabel), null,
                 developmentService -> ((RefCRUDService) developmentService).getRefCopyOperation(),
                 dssContextRequestRef -> dssContextRequestRef.setContextId(contextId),
                 projectRefRequestRef -> projectRefRequestRef.setRefProjectId(dssOrchestratorInfo.getProjectId()).setProjectName(projectName),
@@ -420,6 +420,7 @@ public String rollbackOrchestrator(String userName, Long projectId, String proje
                 submitRequest.setFlowId(dssOrchestratorVersion.getAppId());
                 submitRequest.setOrchestratorId(dssOrchestratorVersion.getOrchestratorId());
                 submitRequest.setProjectName(projectName);
+                submitRequest.setLabels(labels);
                 submitRequest.setComment("rollback workflow: " + dssOrchestratorInfo.getName());
                 orchestratorPluginService.submitFlow(submitRequest, userName, workspace);
             } else {

From e3f3c637a149843bd4738191816b003c1441c2b6 Mon Sep 17 00:00:00 2001
From: qweqnotallow <747839893@qq.com>
Date: Fri, 17 May 2024 15:40:43 +0800
Subject: [PATCH 140/302] git-server: add conflict

---
 .../dss/git/utils/DSSGitUtils.java             | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/utils/DSSGitUtils.java b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/utils/DSSGitUtils.java
index 723781c32..6ceb01751 100644
--- a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/utils/DSSGitUtils.java
+++ b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/utils/DSSGitUtils.java
@@ -130,6 +130,24 @@ public static void pull(Repository repository, String projectName, GitUserEntity
                 logger.info("Pull successful!");
             } else {
                 logger.info("Pull failed: " + result.toString());
+                // 冲突时以远程仓库为准
+                if (result.getMergeResult().getConflicts() != null) {
+                    logger.info("Conflicts occurred. Resolving with remote as priority...");
+                    result.getMergeResult().getConflicts().keySet().forEach(path -> {
+                        try {
+                            // 检出冲突文件的远程版本
+                            git.checkout().setStartPoint("origin/" + result.getFetchResult().getTrackingRefUpdates().iterator().next().getRemoteName())
+                                    .addPath(path)
+                                    .call();
+                            // 添加解决后的文件到暂存区
+                            git.add().addFilepattern(path).call();
+                        } catch (GitAPIException e) {
+                            e.printStackTrace();
+                        }
+                    });
+                    // 提交合并
+                    git.commit().setMessage("Merge resolved with remote as priority").call();
+                }
             }
 
         } catch (Exception e) {

From 3bb769def241561ac91b750ecd35ea0cafc4f27c Mon Sep 17 00:00:00 2001
From: qweqnotallow <747839893@qq.com>
Date: Fri, 17 May 2024 16:13:44 +0800
Subject: [PATCH 141/302] git-server: unzip fix

---
 .../java/com/webank/wedatasphere/dss/git/utils/FileUtils.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/utils/FileUtils.java b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/utils/FileUtils.java
index 73c1c1bf7..b00209ff9 100644
--- a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/utils/FileUtils.java
+++ b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/utils/FileUtils.java
@@ -109,7 +109,7 @@ public static String unzipFile(String zipFile) {
 
         String longZipFilePath = "";
         try {
-            longZipFilePath = unzip(zipFile, true);
+            longZipFilePath = unzip(zipFile, false);
             File file = new File(zipFile);
             logger.info("开始删除目录 {}", zipFile);
             if (file.delete()){

From a2bc4a646ad8b91b928ea4f5fbf7605f97bcec4a Mon Sep 17 00:00:00 2001
From: qweqnotallow <747839893@qq.com>
Date: Fri, 17 May 2024 16:14:50 +0800
Subject: [PATCH 142/302] git-server: unzip fix

---
 .../wedatasphere/dss/git/utils/FileUtils.java    | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/utils/FileUtils.java b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/utils/FileUtils.java
index b00209ff9..062f9830d 100644
--- a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/utils/FileUtils.java
+++ b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/utils/FileUtils.java
@@ -109,14 +109,7 @@ public static String unzipFile(String zipFile) {
 
         String longZipFilePath = "";
         try {
-            longZipFilePath = unzip(zipFile, false);
-            File file = new File(zipFile);
-            logger.info("开始删除目录 {}", zipFile);
-            if (file.delete()){
-                logger.info("结束删除目录 {} 成功", zipFile);
-            }else{
-                logger.info("删除目录 {} 失败", zipFile);
-            }
+            longZipFilePath = unzip(zipFile, true);
         } catch (Exception e) {
             logger.error("unzip failed, the reason is ");
         }
@@ -246,7 +239,12 @@ public static String unzip(String dirPath,boolean deleteOriginZip)throws DSSErro
                 throw new DSSErrorException(90007,errMsg.toString());
             }
             if(deleteOriginZip){
-                file.delete();
+                logger.info("开始删除目录 {}", file);
+                if (file.delete()){
+                    logger.info("结束删除目录 {} 成功", file);
+                }else{
+                    logger.info("删除目录 {} 失败", file);
+                }
             }
         }catch(final Exception e){
             logger.error("{} 解压缩 zip 文件失败, reason: ", e);

From 63e88575531b1937ae2b77283f9122272864d870 Mon Sep 17 00:00:00 2001
From: qweqnotallow <747839893@qq.com>
Date: Fri, 17 May 2024 17:17:00 +0800
Subject: [PATCH 143/302] add workflow server to orchestrator server

---
 .../dss-framework-orchestrator-server/pom.xml |  5 +++
 .../DSSFrameworkOrchestratorRestful.java      | 26 +++++++-----
 .../OrchestratorFrameworkServiceImpl.java     |  7 +++-
 .../impl/OrchestratorPluginServiceImpl.java   |  6 ++-
 .../service/impl/OrchestratorServiceImpl.java |  7 +++-
 .../wedatasphere/dss/git/utils/FileUtils.java |  2 +-
 .../db/dao/OrchestratorMapper.java            |  6 ---
 .../db/dao/impl/orchestratorMapper.xml        | 16 --------
 .../dss/workflow/DefaultWorkFlowManager.java  | 40 +++----------------
 .../dss/workflow/WorkFlowManager.java         |  2 -
 .../receiver/DSSWorkflowChooser.scala         |  1 -
 .../receiver/DSSWorkflowReceiver.scala        |  3 --
 12 files changed, 42 insertions(+), 79 deletions(-)

diff --git a/dss-framework/dss-framework-orchestrator-server/pom.xml b/dss-framework/dss-framework-orchestrator-server/pom.xml
index ac2ce363e..de0b1f30a 100644
--- a/dss-framework/dss-framework-orchestrator-server/pom.xml
+++ b/dss-framework/dss-framework-orchestrator-server/pom.xml
@@ -54,6 +54,11 @@
             <artifactId>dss-git-common</artifactId>
             <version>${dss.version}</version>
         </dependency>
+        <dependency>
+            <groupId>com.webank.wedatasphere.dss</groupId>
+            <artifactId>dss-workflow-server</artifactId>
+            <version>${dss.version}</version>
+        </dependency>
         <dependency>
             <groupId>com.webank.wedatasphere.dss</groupId>
             <artifactId>dss-framework-common</artifactId>
diff --git a/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/restful/DSSFrameworkOrchestratorRestful.java b/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/restful/DSSFrameworkOrchestratorRestful.java
index 080b30116..212b13a59 100644
--- a/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/restful/DSSFrameworkOrchestratorRestful.java
+++ b/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/restful/DSSFrameworkOrchestratorRestful.java
@@ -46,6 +46,9 @@
 import com.webank.wedatasphere.dss.standard.sso.utils.SSOHelper;
 import com.webank.wedatasphere.dss.workflow.common.protocol.RequestLockWorkflow;
 import com.webank.wedatasphere.dss.workflow.common.protocol.ResponseLockWorkflow;
+import com.webank.wedatasphere.dss.workflow.constant.DSSWorkFlowConstant;
+import com.webank.wedatasphere.dss.workflow.dao.LockMapper;
+import com.webank.wedatasphere.dss.workflow.entity.DSSFlowEditLock;
 import org.apache.commons.math3.util.Pair;
 import org.apache.linkis.rpc.Sender;
 import org.apache.linkis.server.Message;
@@ -57,6 +60,7 @@
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.PostConstruct;
+import javax.servlet.http.Cookie;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.util.ArrayList;
@@ -78,6 +82,8 @@ public class DSSFrameworkOrchestratorRestful {
     private OrchestratorPluginService orchestratorPluginService;
     @Autowired
     private HttpServletRequest httpServletRequest;
+    @Autowired
+    private LockMapper lockMapper;
 
     /**
      * 创建编排模式
@@ -293,11 +299,11 @@ public Message diff(@RequestBody OrchestratorSubmitRequest submitFlowRequest) {
         List<DSSLabel> dssLabelList = new ArrayList<>();
         dssLabelList.add(new EnvDSSLabel(submitFlowRequest.getLabels().getRoute()));
 
-        RequestLockWorkflow requestLockWorkflow = new RequestLockWorkflow(userName, httpServletRequest.getCookies(), submitFlowRequest.getFlowId());
-        ResponseLockWorkflow responseLockWorkflow = RpcAskUtils.processAskException(DSSSenderServiceFactory.getOrCreateServiceInstance()
-                .getWorkflowSender(dssLabelList).ask(requestLockWorkflow), ResponseLockWorkflow.class, RequestLockWorkflow.class);
-        if (responseLockWorkflow.getUnlockStatus() == ResponseLockWorkflow.LOCK_FAILED) {
-            return Message.error("当前工作流被用户" + responseLockWorkflow.getLockOwner() + "已锁定编辑，您编辑的内容不能再被保存。如有疑问，请与" + responseLockWorkflow.getLockOwner() + "确认");
+        String ticketId = Arrays.stream(httpServletRequest.getCookies()).filter(cookie -> DSSWorkFlowConstant.BDP_USER_TICKET_ID.equals(cookie.getName()))
+                .findFirst().map(Cookie::getValue).get();
+        DSSFlowEditLock flowEditLock = lockMapper.getFlowEditLockByID(submitFlowRequest.getFlowId());
+        if (flowEditLock != null && !flowEditLock.getOwner().equals(ticketId)) {
+            return Message.error("当前工作流被用户" + flowEditLock.getUsername() + "已锁定编辑，您编辑的内容不能再被保存。如有疑问，请与" + flowEditLock.getUsername() + "确认");
         }
         GitTree gitTree = orchestratorPluginService.diffFlow(submitFlowRequest, userName, workspace);
         return Message.ok().data("tree", gitTree.getChildren());
@@ -311,11 +317,11 @@ public Message submitFlow(@RequestBody OrchestratorSubmitRequest submitFlowReque
         List<DSSLabel> dssLabelList = new ArrayList<>();
         dssLabelList.add(new EnvDSSLabel(submitFlowRequest.getLabels().getRoute()));
 
-        RequestLockWorkflow requestLockWorkflow = new RequestLockWorkflow(userName, httpServletRequest.getCookies(), submitFlowRequest.getFlowId());
-        ResponseLockWorkflow responseLockWorkflow = RpcAskUtils.processAskException(DSSSenderServiceFactory.getOrCreateServiceInstance()
-                .getWorkflowSender(dssLabelList).ask(requestLockWorkflow), ResponseLockWorkflow.class, RequestLockWorkflow.class);
-        if (responseLockWorkflow.getUnlockStatus() == ResponseLockWorkflow.LOCK_FAILED) {
-            return Message.error("当前工作流被用户" + responseLockWorkflow.getLockOwner() + "已锁定编辑，您编辑的内容不能再被保存。如有疑问，请与" + responseLockWorkflow.getLockOwner() + "确认");
+        String ticketId = Arrays.stream(httpServletRequest.getCookies()).filter(cookie -> DSSWorkFlowConstant.BDP_USER_TICKET_ID.equals(cookie.getName()))
+                .findFirst().map(Cookie::getValue).get();
+        DSSFlowEditLock flowEditLock = lockMapper.getFlowEditLockByID(submitFlowRequest.getFlowId());
+        if (flowEditLock != null && !flowEditLock.getOwner().equals(ticketId)) {
+            return Message.error("当前工作流被用户" + flowEditLock.getUsername() + "已锁定编辑，您编辑的内容不能再被保存。如有疑问，请与" + flowEditLock.getUsername() + "确认");
         }
 
         orchestratorPluginService.submitFlow(submitFlowRequest, userName, workspace);
diff --git a/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/impl/OrchestratorFrameworkServiceImpl.java b/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/impl/OrchestratorFrameworkServiceImpl.java
index a0b73a471..9de2bf59c 100644
--- a/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/impl/OrchestratorFrameworkServiceImpl.java
+++ b/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/impl/OrchestratorFrameworkServiceImpl.java
@@ -69,6 +69,7 @@
 import com.webank.wedatasphere.dss.standard.common.desc.AppInstance;
 import com.webank.wedatasphere.dss.standard.common.entity.ref.ResponseRef;
 import com.webank.wedatasphere.dss.standard.common.exception.operation.ExternalOperationWarnException;
+import com.webank.wedatasphere.dss.workflow.dao.LockMapper;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang.StringUtils;
 import org.apache.commons.math3.util.Pair;
@@ -106,6 +107,8 @@ public class OrchestratorFrameworkServiceImpl implements OrchestratorFrameworkSe
     private OrchestratorCopyEnv orchestratorCopyEnv;
     @Autowired
     private OrchestratorOperateService orchestratorOperateService;
+    @Autowired
+    private LockMapper lockMapper;
 
     private static final int MAX_DESC_LENGTH = 250;
     private static final int MAX_NAME_LENGTH = 128;
@@ -290,10 +293,10 @@ public CommonOrchestratorVo deleteOrchestrator(String username, OrchestratorDele
             path.add(orchestratorInfo.getName());
             GitRemoveRequest removeRequest = new GitRemoveRequest(workspace.getWorkspaceId(), dssProject.getName(), path, username);
             RpcAskUtils.processAskException(sender.ask(removeRequest), GitCommitResponse.class, GitRemoveRequest.class);
-            orchestratorMapper.updateOrchestratorStatus(orchestratorDeleteRequest.getId(), OrchestratorRefConstant.FLOW_STATUS_PUSH);
+            lockMapper.updateOrchestratorStatus(orchestratorDeleteRequest.getId(), OrchestratorRefConstant.FLOW_STATUS_PUSH);
         } catch (Exception e) {
             LOGGER.error("git remove failed, the reason is: ", e);
-            orchestratorMapper.updateOrchestratorStatus(orchestratorDeleteRequest.getId(), OrchestratorRefConstant.FLOW_STATUS_SAVE);
+            lockMapper.updateOrchestratorStatus(orchestratorDeleteRequest.getId(), OrchestratorRefConstant.FLOW_STATUS_SAVE);
         }
         orchestratorService.deleteOrchestrator(username, workspace, dssProject.getName(), orchestratorInfo.getId(), dssLabels);
         orchestratorOperateService.deleteTemplateOperate(orchestratorInfo.getId());
diff --git a/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/impl/OrchestratorPluginServiceImpl.java b/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/impl/OrchestratorPluginServiceImpl.java
index 21e3503ff..5d212dec3 100644
--- a/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/impl/OrchestratorPluginServiceImpl.java
+++ b/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/impl/OrchestratorPluginServiceImpl.java
@@ -53,6 +53,7 @@
 import com.webank.wedatasphere.dss.orchestrator.server.service.OrchestratorPluginService;
 import com.webank.wedatasphere.dss.sender.service.DSSSenderServiceFactory;
 import com.webank.wedatasphere.dss.standard.app.sso.Workspace;
+import com.webank.wedatasphere.dss.workflow.dao.LockMapper;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.exception.ExceptionUtils;
 import org.apache.linkis.common.utils.ByteTimeUtils;
@@ -83,6 +84,9 @@ public class OrchestratorPluginServiceImpl implements OrchestratorPluginService
     @Autowired
     private CommonUpdateConvertJobStatus commonUpdateConvertJobStatus;
 
+    @Autowired
+    private LockMapper lockMapper;
+
     private ExecutorService releaseThreadPool = Utils.newCachedThreadPool(50, "Convert-Orchestration-Thread-", true);
 
     @Override
@@ -238,7 +242,7 @@ public void submitFlow(OrchestratorSubmitRequest flowRequest, String username, W
                 }
                 orchestratorMapper.updateOrchestratorSubmitJobStatus(orchestratorId, OrchestratorRefConstant.FLOW_STATUS_PUSH_SUCCESS, "");
                 //5. 返回文件列表
-                orchestratorMapper.updateOrchestratorStatus(orchestratorId, OrchestratorRefConstant.FLOW_STATUS_PUSH);
+                lockMapper.updateOrchestratorStatus(orchestratorId, OrchestratorRefConstant.FLOW_STATUS_PUSH);
             } catch (Exception e) {
                 LOGGER.error("push failed, the reason is : ", e);
                 orchestratorMapper.updateOrchestratorSubmitJobStatus(orchestratorId, OrchestratorRefConstant.FLOW_STATUS_PUSH_FAILED, e.toString());
diff --git a/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/impl/OrchestratorServiceImpl.java b/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/impl/OrchestratorServiceImpl.java
index c99727aa5..7b77be9c6 100644
--- a/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/impl/OrchestratorServiceImpl.java
+++ b/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/impl/OrchestratorServiceImpl.java
@@ -71,6 +71,7 @@
 import com.webank.wedatasphere.dss.standard.common.entity.ref.ResponseRef;
 import com.webank.wedatasphere.dss.standard.common.exception.operation.ExternalOperationWarnException;
 import com.webank.wedatasphere.dss.workflow.common.protocol.*;
+import com.webank.wedatasphere.dss.workflow.dao.LockMapper;
 import io.protostuff.Rpc;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.linkis.cs.client.ContextClient;
@@ -112,6 +113,8 @@ public class OrchestratorServiceImpl implements OrchestratorService {
     AddOrchestratorVersionHook addOrchestratorVersionHook;
     @Autowired
     private OrchestratorPluginService orchestratorPluginService;
+    @Autowired
+    private LockMapper lockMapper;
 
     private static final int VALID_FLAG = 1;
 
@@ -427,10 +430,10 @@ public String rollbackOrchestrator(String userName, Long projectId, String proje
                 GitRevertRequest gitRevertRequest = new GitRevertRequest(workspace.getWorkspaceId(), projectName, oldOrcVersion.getCommitId(), dssOrchestratorInfo.getName(), userName);
                 RpcAskUtils.processAskException(sender.ask(gitRevertRequest), GitCommitResponse.class, GitRevertRequest.class);
             }
-            orchestratorMapper.updateOrchestratorStatus(orchestratorId, OrchestratorRefConstant.FLOW_STATUS_PUSH);
+            lockMapper.updateOrchestratorStatus(orchestratorId, OrchestratorRefConstant.FLOW_STATUS_PUSH);
         } catch (Exception e) {
             LOGGER.error("git revert failed, the reason is :", e);
-            orchestratorMapper.updateOrchestratorStatus(orchestratorId, OrchestratorRefConstant.FLOW_STATUS_SAVE);
+            lockMapper.updateOrchestratorStatus(orchestratorId, OrchestratorRefConstant.FLOW_STATUS_SAVE);
         }
 
         return dssOrchestratorVersion.getVersion();
diff --git a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/utils/FileUtils.java b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/utils/FileUtils.java
index 062f9830d..396a0baa5 100644
--- a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/utils/FileUtils.java
+++ b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/utils/FileUtils.java
@@ -247,7 +247,7 @@ public static String unzip(String dirPath,boolean deleteOriginZip)throws DSSErro
                 }
             }
         }catch(final Exception e){
-            logger.error("{} 解压缩 zip 文件失败, reason: ", e);
+            logger.error( file + " 解压缩 zip 文件失败, reason: ", e);
             DSSErrorException exception = new DSSErrorException(90009,dirPath + " to zip file failed");
             exception.initCause(e);
             throw exception;
diff --git a/dss-orchestrator/dss-orchestrator-db/src/main/java/com/webank/wedatasphere/dss/orchestrator/db/dao/OrchestratorMapper.java b/dss-orchestrator/dss-orchestrator-db/src/main/java/com/webank/wedatasphere/dss/orchestrator/db/dao/OrchestratorMapper.java
index 1e8d9d359..413e955b9 100644
--- a/dss-orchestrator/dss-orchestrator-db/src/main/java/com/webank/wedatasphere/dss/orchestrator/db/dao/OrchestratorMapper.java
+++ b/dss-orchestrator/dss-orchestrator-db/src/main/java/com/webank/wedatasphere/dss/orchestrator/db/dao/OrchestratorMapper.java
@@ -127,12 +127,6 @@ DSSOrchestratorVersion getOrcVersionByIdAndOrcVersionId(@Param("orchestratorId")
 
     void batchUpdateOrcInfo(@Param("list") List<DSSOrchestratorVersion> historyOrcVersion);
 
-    void updateOrchestratorStatus(@Param("id") Long id, @Param("status") String status);
-
-    String selectOrchestratorStatus(@Param("id") Long id);
-
-    List<Long> selectOrchestratorByStatus(@Param("status") String status);
-
     void updateOrchestratorSubmitJobStatus(@Param("orchestratorId") Long orchestratorId, @Param("status") String status, @Param("errMsg") String errMsg);
 
     void insertOrchestratorSubmitJob(OrchestratorSubmitJob orchestratorSubmitJob);
diff --git a/dss-orchestrator/dss-orchestrator-db/src/main/java/com/webank/wedatasphere/dss/orchestrator/db/dao/impl/orchestratorMapper.xml b/dss-orchestrator/dss-orchestrator-db/src/main/java/com/webank/wedatasphere/dss/orchestrator/db/dao/impl/orchestratorMapper.xml
index 18747e8d1..1eb63d625 100644
--- a/dss-orchestrator/dss-orchestrator-db/src/main/java/com/webank/wedatasphere/dss/orchestrator/db/dao/impl/orchestratorMapper.xml
+++ b/dss-orchestrator/dss-orchestrator-db/src/main/java/com/webank/wedatasphere/dss/orchestrator/db/dao/impl/orchestratorMapper.xml
@@ -290,22 +290,6 @@
         </foreach>
     </update>
 
-    <update id="updateOrchestratorStatus">
-        update dss_orchestrator_info
-        <set>
-            `status` = #{status}
-        </set>
-        where `id` = #{id}
-    </update>
-
-    <select id="selectOrchestratorStatus" resultType="java.lang.String">
-        select `status` from dss_orchestrator_info where `id` = #{id}
-    </select>
-
-    <select id="selectOrchestratorByStatus" resultType="java.lang.Long">
-        select `id` from dss_orchestrator_info where `status` = #{status}
-    </select>
-
     <insert id="insertOrchestratorSubmitJob" parameterType="com.webank.wedatasphere.dss.orchestrator.common.entity.OrchestratorSubmitJob">
         insert into dss_orchestrator_submit_job_info (`orchestrator_id`, `create_time`, `update_time`, `instance_name`, `status`) values
         (#{orchestratorId}, Now(), Now(), #{instanceName}, #{status})
diff --git a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/DefaultWorkFlowManager.java b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/DefaultWorkFlowManager.java
index d3594684b..2c5ea92b3 100644
--- a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/DefaultWorkFlowManager.java
+++ b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/DefaultWorkFlowManager.java
@@ -419,11 +419,11 @@ private ResponseOperateOrchestrator convert(RequestConvertOrchestrations request
     }
 
     private String readImportZipProjectName(String zipFilePath) throws IOException {
-        try(ZipFile zipFile =new ZipFile(zipFilePath)){
-            Enumeration<? extends ZipEntry> entries =zipFile.entries();
-            if(entries.hasMoreElements()){
-                String name=entries.nextElement().getName();
-                if(name.endsWith("\\")||name.endsWith("/")){
+        try (ZipFile zipFile = new ZipFile(zipFilePath)) {
+            Enumeration<? extends ZipEntry> entries = zipFile.entries();
+            if (entries.hasMoreElements()) {
+                String name = entries.nextElement().getName();
+                if (name.endsWith("\\") || name.endsWith("/")) {
                     name = name.substring(0, name.length() - 1);
                 }
                 return name;
@@ -432,36 +432,6 @@ private String readImportZipProjectName(String zipFilePath) throws IOException {
         throw new IOException();
     }
 
-    @Override
-    public ResponseLockWorkflow lockWorkFlow(RequestLockWorkflow requestLockWorkflow) throws DSSErrorException {
-        Cookie[] cookies = requestLockWorkflow.getCookies();
-        Long flowID = requestLockWorkflow.getFlowId();
-        String username =requestLockWorkflow.getUsername();
-        //若工作流已经被其他用户抢锁，则当前用户不能再保存成功
-        String ticketId = Arrays.stream(cookies).filter(cookie -> DSSWorkFlowConstant.BDP_USER_TICKET_ID.equals(cookie.getName()))
-                .findFirst().map(Cookie::getValue).get();
-        DSSFlowEditLock flowEditLock = lockMapper.getFlowEditLockByID(flowID);
-        if (flowEditLock != null) {
-            DSSFlow dssFlow = flowService.getFlow(flowID);
-            // 尝试获取工作流编辑锁
-            try {
-                //只有父工作流才有锁，子工作流复用父工作流的锁
-                if(dssFlow.getRootFlow()) {
-                    DSSFlowEditLockManager.tryAcquireLock(dssFlow, username, ticketId);
-                }
-            } catch (DSSErrorException e) {
-                if (DSSWorkFlowConstant.EDIT_LOCK_ERROR_CODE == e.getErrCode()) {
-                    logger.error(e.getDesc());
-                    return new ResponseLockWorkflow(ResponseLockWorkflow.LOCK_FAILED, flowEditLock.getOwner());
-                }
-                throw e;
-            }
-        }
-        return new ResponseLockWorkflow(ResponseLockWorkflow.LOCK_SUCCESS, null);
-    }
-
-
-
 }
 
 
diff --git a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/WorkFlowManager.java b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/WorkFlowManager.java
index 1d328d8d6..71aa846bb 100644
--- a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/WorkFlowManager.java
+++ b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/WorkFlowManager.java
@@ -157,7 +157,5 @@ List<DSSFlow> importWorkflow(String userName,
      */
     ResponseSubFlowContextIds getSubFlowContextIdsByFlowIds(RequestSubFlowContextIds requestSubFlowContextIds) throws ErrorException;
 
-    ResponseLockWorkflow lockWorkFlow(RequestLockWorkflow requestLockWorkflow) throws DSSErrorException;
-
 
 }
diff --git a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/scala/com/webank/wedatasphere/dss/workflow/receiver/DSSWorkflowChooser.scala b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/scala/com/webank/wedatasphere/dss/workflow/receiver/DSSWorkflowChooser.scala
index 28625b71c..aca280966 100644
--- a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/scala/com/webank/wedatasphere/dss/workflow/receiver/DSSWorkflowChooser.scala
+++ b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/scala/com/webank/wedatasphere/dss/workflow/receiver/DSSWorkflowChooser.scala
@@ -50,7 +50,6 @@ class DSSWorkflowChooser extends ReceiverChooser {
     case _: RequestConvertOrchestrations => receiver
     case _: RequestSubFlowContextIds => receiver
     case _: RequestDeleteBmlSource => receiver
-    case _: RequestLockWorkflow => receiver
 
     case _ => None
   }
diff --git a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/scala/com/webank/wedatasphere/dss/workflow/receiver/DSSWorkflowReceiver.scala b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/scala/com/webank/wedatasphere/dss/workflow/receiver/DSSWorkflowReceiver.scala
index 9c8276dcd..4db4617bf 100644
--- a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/scala/com/webank/wedatasphere/dss/workflow/receiver/DSSWorkflowReceiver.scala
+++ b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/scala/com/webank/wedatasphere/dss/workflow/receiver/DSSWorkflowReceiver.scala
@@ -107,9 +107,6 @@ class DSSWorkflowReceiver(workflowManager: WorkFlowManager)  extends Receiver {
     case requestWorkflowIdList : RequestSubFlowContextIds =>
       workflowManager.getSubFlowContextIdsByFlowIds(requestWorkflowIdList)
 
-    case requestLockWorkflow: RequestLockWorkflow =>
-      workflowManager.lockWorkFlow(requestLockWorkflow)
-
     case _ => throw new DSSErrorException(90000, "Not support protocol " + message)
   }
 

From c0b2b66869f2d8aa194fc9a77ddeb50df303ad1b Mon Sep 17 00:00:00 2001
From: ryanlei <ryanlei@webank.com>
Date: Fri, 17 May 2024 17:40:50 +0800
Subject: [PATCH 144/302] fix: fix en text

---
 web/packages/scriptis/i18n/common/en.json            |  9 ++++++++-
 web/packages/scriptis/i18n/common/zh.json            |  9 ++++++++-
 .../workbench/dbDetails/components/tableList.vue     | 12 ++++++------
 web/packages/shared/common/style/overwrite.scss      |  5 +++++
 web/packages/shared/components/vue-process/noder.vue |  6 +++++-
 .../shared/components/vue-process/style/index.scss   |  8 ++++----
 .../workflows/module/process/cyeditor/index.vue      |  8 ++++++--
 .../workflows/module/process/cyeditor/styles.js      |  8 ++++++--
 8 files changed, 48 insertions(+), 17 deletions(-)

diff --git a/web/packages/scriptis/i18n/common/en.json b/web/packages/scriptis/i18n/common/en.json
index bb0687ff4..babf8b9c8 100644
--- a/web/packages/scriptis/i18n/common/en.json
+++ b/web/packages/scriptis/i18n/common/en.json
@@ -14,6 +14,9 @@
       "saveErr": "Save failed!",
       "createdTitle": "Table creation guide",
       "saveToWidget": "Save widget to solution",
+      "query": {
+        "more": "More"
+      },
       "contextMenu": {
         "openToTab": "Open as a tab",
         "copyPath": "Copy path",
@@ -193,7 +196,11 @@
         "YES": "Yes",
         "GSHJX": "Formatted to",
         "ZJXYGE": "The format required by the component",
-        "FZBZDXX": "Copy table field information"
+        "FZBZDXX": "Copy table field information",
+        "QHPTST": "Switch common view",
+        "QHGLYST": "Switch administrator view",
+        "QSRBSZ": "Please enter the table owner",
+        "MCJZCZYYWYH": "Only one user's table can be transferred at a time"
       },
       "logView": {
         "taskId": "Task ID：",
diff --git a/web/packages/scriptis/i18n/common/zh.json b/web/packages/scriptis/i18n/common/zh.json
index 8cbce1401..33825a3b3 100644
--- a/web/packages/scriptis/i18n/common/zh.json
+++ b/web/packages/scriptis/i18n/common/zh.json
@@ -14,6 +14,9 @@
       "saveErr": "保存失败！",
       "createdTitle": "建表向导",
       "saveToWidget": "保存widget到解决方案",
+      "query": {
+        "more": "更多"
+      },
       "contextMenu": {
         "openToTab": "打开到侧边",
         "copyPath": "复制路径",
@@ -193,7 +196,11 @@
         "YES": "对",
         "GSHJX": "进行格式化成",
         "ZJXYGE": "组件需要的格式",
-        "FZBZDXX": "复制表字段信息"
+        "FZBZDXX": "复制表字段信息",
+        "QHPTST": "切换普通视图",
+        "QHGLYST": "切换管理员视图",
+        "QSRBSZ": "请输入表属主",
+        "MCJZCZYYWYH": "每次仅支持转移一位用户的表"
       },
       "logView": {
         "taskId": "任务ID：",
diff --git a/web/packages/scriptis/module/workbench/dbDetails/components/tableList.vue b/web/packages/scriptis/module/workbench/dbDetails/components/tableList.vue
index 036d7b9cd..7b62eaa4c 100644
--- a/web/packages/scriptis/module/workbench/dbDetails/components/tableList.vue
+++ b/web/packages/scriptis/module/workbench/dbDetails/components/tableList.vue
@@ -20,7 +20,7 @@
       <Button class="margin-right" type="error" @click="deleteSome">{{ $t('message.scripts.batchdel') }}</Button>
       <Dropdown class="margin-right" @on-click="dropdownClick">
         <Button type="primary">
-          {{ $t('message.apiServices.query.more') }}
+          {{ $t('message.scripts.query.more') }}
           <Icon type="ios-arrow-down"></Icon>
         </Button>
         <template #list>
@@ -31,7 +31,7 @@
           </DropdownMenu>
         </template>
       </Dropdown>
-      <Button v-if="isWorkspaceAdmin && isContainDb" type="text" @click="changeViewMode(true)">切换管理员视图</Button>
+      <Button v-if="isWorkspaceAdmin && isContainDb" type="text" @click="changeViewMode(true)">{{ $t('message.scripts.tableDetails.QHGLYST') }}</Button>
     </div>
     <div class="search-header" v-else>
       <Input v-model="tableName" class="searce-item margin-right" :placeholder="$t('message.scripts.plstablename')">
@@ -46,13 +46,13 @@
         <Option value="0">{{ $t('message.scripts.owntable') }}</Option>
         <Option value="1">{{ $t('message.scripts.tablecreateby') }}</Option>
       </Select> -->
-      <Input v-model="tableOwner" class="searce-item margin-right" placeholder="请输入表属主">
+      <Input v-model="tableOwner" class="searce-item margin-right" :placeholder="$t('message.scripts.tableDetails.QSRBSZ')">
       </Input>
       <Button class="margin-right" type="primary" @click="handleGetTables">{{ $t('message.scripts.Search') }}</Button>
       <Button class="margin-right" type="success" @click="copyTableName">{{ $t('message.scripts.copytbanme') }}</Button>
       <Dropdown class="margin-right" @on-click="dropdownClick">
         <Button type="primary">
-          {{ $t('message.apiServices.query.more') }}
+          {{ $t('message.scripts.query.more') }}
           <Icon type="ios-arrow-down"></Icon>
         </Button>
         <template #list>
@@ -62,7 +62,7 @@
           </DropdownMenu>
         </template>
       </Dropdown>
-      <Button type="text" @click="changeViewMode(false)">切换普通视图</Button>
+      <Button type="text" @click="changeViewMode(false)">{{ $t('message.scripts.tableDetails.QHPTST') }}</Button>
     </div>
     <div class="table-data" style="position:relative">
       <div class="field-list-header" id="dbtbheader" :class="{'ovy': searchColList.length > maxSize}">
@@ -505,7 +505,7 @@ export default {
       if (this.confirmModalType == 'transfer') {
         const tableOwners = [...new Set(toDeleted.map(item => item.tableOwner))];
         if (this.isAdminMode && tableOwners.length > 1) {
-          this.$Message.warning({ content: '每次仅支持转移一位用户的表' });
+          this.$Message.warning({ content: this.$t('message.scripts.tableDetails.MCJZCZYYWYH')  });
           return
         }
         // 批量转移
diff --git a/web/packages/shared/common/style/overwrite.scss b/web/packages/shared/common/style/overwrite.scss
index f35698e48..cd685ba6c 100644
--- a/web/packages/shared/common/style/overwrite.scss
+++ b/web/packages/shared/common/style/overwrite.scss
@@ -474,6 +474,11 @@
   .progress-label {
     color: $dark-text-color !important;
   }
+  .designer div.node-disabled {
+    background-color: #515a6e;
+    color: #cfd0d34d;
+    border-radius: 4px;
+  }
   .designer div.node-selected {
     background: rgba(222, 232, 244, 0.62);
     box-shadow: 1px 4px 6px 1px rgba(106, 141, 185, 0.65);
diff --git a/web/packages/shared/components/vue-process/noder.vue b/web/packages/shared/components/vue-process/noder.vue
index d5fa96c08..14be7b614 100644
--- a/web/packages/shared/components/vue-process/noder.vue
+++ b/web/packages/shared/components/vue-process/noder.vue
@@ -116,6 +116,10 @@ export default {
       type: Boolean,
       default: false
     },
+    disabledBorderColor: {
+      type: String,
+      default: '#6a85a766'
+    },
     nodeAnchors: {
       type: Array,
       dafault: () => []
@@ -270,7 +274,7 @@ export default {
       let ctx = this.canvasCtx;
       ctx.clearRect(0, 0, ctx.canvas.width, ctx.canvas.height);
       ctx.lineWidth = this.borderWidth * this.state.baseOptions.pageSize;
-      ctx.strokeStyle = this.currentBorderColor;
+      ctx.strokeStyle = this.isDisabled ? this.disabledBorderColor : this.currentBorderColor;
       ctx.lineCap = 'round'
       ctx.lineJoin = 'round'
       this.roundedRect(
diff --git a/web/packages/shared/components/vue-process/style/index.scss b/web/packages/shared/components/vue-process/style/index.scss
index 0800d1ab9..2339cec92 100644
--- a/web/packages/shared/components/vue-process/style/index.scss
+++ b/web/packages/shared/components/vue-process/style/index.scss
@@ -627,6 +627,10 @@
      z-index: 999;
      display: none;
    }
+   .node-disabled {
+      background-color: #fafafa;
+      color: #cfd0d3;
+   }
    .node-selected {
      // box-shadow: 0 0 8px #3399ff;
      // background-color: rgba(0, 0, 0, .2) !important;
@@ -634,10 +638,6 @@
      box-shadow: 1px 4px 6px 1px rgba(106,133,167,0.30);
      border-radius: 4px;
    }
-   .node-disabled {
-     background-color: #fafafa;
-     color: #cfd0d3;
-  }
  }
 
  .designer-menu {
diff --git a/web/packages/workflows/module/process/cyeditor/index.vue b/web/packages/workflows/module/process/cyeditor/index.vue
index 3a7f7208c..c67987aff 100644
--- a/web/packages/workflows/module/process/cyeditor/index.vue
+++ b/web/packages/workflows/module/process/cyeditor/index.vue
@@ -413,9 +413,10 @@ export default {
       })
 
       // 设置禁用的样式
+      const nodeThemeColor = getThemeColorConsants()
       cy.style().selector('.disabled-node').style({
-        'background-color': '#fafafa',
-        'color': '#cfd0d3'
+        'background-color': nodeThemeColor.nodeDisabledBg,
+        'color': nodeThemeColor.nodeDisabledColor
       })
       data.nodes.forEach(function(nodeItem) {
         var node = cy.getElementById(nodeItem.data.id);
@@ -568,6 +569,9 @@ export default {
       this.instance.cy.style().selector('node[name]').style({
         'background-color': themeColor.nodeBg,
         'color': themeColor.nodeColor
+      }).selector('.disabled-node').style({
+        'background-color': themeColor.nodeDisabledBg,
+        'color': themeColor.nodeDisabledColor
       }).update()
     },
     nodeScroolIntoView(id) {
diff --git a/web/packages/workflows/module/process/cyeditor/styles.js b/web/packages/workflows/module/process/cyeditor/styles.js
index 77fa1e981..3f2a5f4f7 100644
--- a/web/packages/workflows/module/process/cyeditor/styles.js
+++ b/web/packages/workflows/module/process/cyeditor/styles.js
@@ -3,10 +3,14 @@ export function getThemeColorConsants(theme) {
   const isDark = themeInfo == 'dark'
   const themeColor = isDark ? {
     nodeBg: '#2a303c',
-    nodeColor: 'rgba(255,255,255,0.65)'
+    nodeColor: 'rgba(255,255,255,0.65)',
+    nodeDisabledBg: '#515a6f',
+    nodeDisabledColor: '#999'
   } : {
     nodeBg: '#eee',
-    nodeColor: '#1E232D'
+    nodeColor: '#1E232D',
+    nodeDisabledBg: '#fafafa',
+    nodeDisabledColor: '#cfd0d3'
   }
   return themeColor
 }

From 8a63f2fc1d90900577675b7b7647dc4a9ee1ee6d Mon Sep 17 00:00:00 2001
From: qweqnotallow <747839893@qq.com>
Date: Fri, 17 May 2024 20:02:43 +0800
Subject: [PATCH 145/302] add workflow server to orchestrator server

---
 .../DSSGitWorkflowManagerServiceImpl.java     | 34 ++++++++++++-------
 .../dss/git/utils/DSSGitUtils.java            | 32 +++++++++++++++++
 2 files changed, 53 insertions(+), 13 deletions(-)

diff --git a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitWorkflowManagerServiceImpl.java b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitWorkflowManagerServiceImpl.java
index 63dca3cb7..b4e3a0db0 100644
--- a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitWorkflowManagerServiceImpl.java
+++ b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitWorkflowManagerServiceImpl.java
@@ -56,11 +56,11 @@ public GitDiffResponse diff(GitDiffRequest request) {
             // 获取git仓库
             File repoDir = new File(gitPath);
             repository = getRepository(repoDir, request.getProjectName(), gitUser);
-            // 本地保持最新状态
-            DSSGitUtils.pull(repository, request.getProjectName(), gitUser);
             // 解压BML文件到本地
             Map<String, BmlResource> bmlResourceMap = request.getBmlResourceMap();
-            List<String> fileList = new ArrayList<>();
+            List<String> fileList = new ArrayList<>(bmlResourceMap.keySet());
+            // 本地保持最新状态
+            DSSGitUtils.pullTargetFile(repository, request.getProjectName(), gitUser, fileList);
             for (Map.Entry<String, BmlResource> entry : bmlResourceMap.entrySet()) {
                 fileList.add(entry.getKey());
                 FileUtils.removeFlowNode(entry.getKey(), request.getProjectName());
@@ -93,10 +93,11 @@ public GitCommitResponse commit(GitCommitRequest request) {
             // 获取git仓库
             File repoDir = new File(gitPath);
             repository = getRepository(repoDir, request.getProjectName(), gitUser);
-            // 本地保持最新状态
-            DSSGitUtils.pull(repository, request.getProjectName(), gitUser);
             // 解压BML文件到本地
             Map<String, BmlResource> bmlResourceMap = request.getBmlResourceMap();
+            List<String> fileList = new ArrayList<>(bmlResourceMap.keySet());
+            // 本地保持最新状态
+            DSSGitUtils.pullTargetFile(repository, request.getProjectName(), gitUser, fileList);
             for (Map.Entry<String, BmlResource> entry : bmlResourceMap.entrySet()) {
                 FileUtils.removeFlowNode(entry.getKey(), request.getProjectName());
                 FileUtils.update(bmlService, entry.getKey(), entry.getValue(), request.getUsername());
@@ -289,8 +290,9 @@ public GitDeleteResponse delete(GitDeleteRequest request) {
             // 获取git仓库
             File repoDir = new File(gitPath);
             repository = getRepository(repoDir, request.getProjectName(), gitUser);
+            List<String> fileList = request.getDeleteFileList();
             // 本地保持最新状态
-            DSSGitUtils.pull(repository, request.getProjectName(), gitUser);
+            DSSGitUtils.pullTargetFile(repository, request.getProjectName(), gitUser, fileList);
             List<String> deleteFileList = request.getDeleteFileList();
             for (String path : deleteFileList) {
                 File file = new File(path);
@@ -327,8 +329,9 @@ public GitFileContentResponse getFileContent(GitFileContentRequest request) {
             // 获取git仓库
             File repoDir = new File(gitPath);
             repository = getRepository(repoDir, request.getProjectName(), gitUser);
+            List<String> fileList = Collections.singletonList(request.getFilePath());
             // 本地保持最新状态
-            DSSGitUtils.pull(repository, request.getProjectName(), gitUser);
+            DSSGitUtils.pullTargetFile(repository, request.getProjectName(), gitUser, fileList);
 
             String content = DSSGitUtils.getTargetCommitFileContent(request.getProjectName(), request.getCommitId(), request.getFilePath());
             String fullpath = File.separator + FileUtils.normalizePath(GitServerConfig.GIT_SERVER_PATH.getValue()) + File.separator + FileUtils.normalizePath(request.getFilePath());
@@ -362,8 +365,9 @@ public GitHistoryResponse getHistory(GitHistoryRequest request) {
             // 获取git仓库
             File repoDir = new File(gitPath);
             repository = getRepository(repoDir, request.getProjectName(), gitUser);
+            List<String> fileList = Collections.singletonList(request.getFilePath());
             // 本地保持最新状态
-            DSSGitUtils.pull(repository, request.getProjectName(), gitUser);
+            DSSGitUtils.pullTargetFile(repository, request.getProjectName(), gitUser, fileList);
 
             List<GitCommitResponse> latestCommit = DSSGitUtils.getLatestCommit(repository, request.getFilePath(), 5);
             if (CollectionUtils.isEmpty(latestCommit)) {
@@ -407,8 +411,9 @@ public GitCommitResponse getCurrentCommit(GitCurrentCommitRequest request) {
             // 获取git仓库
             File repoDir = new File(gitPath);
             repository = getRepository(repoDir, request.getProjectName(), gitUser);
+            List<String> fileList = Collections.singletonList(request.getFilepath());
             // 本地保持最新状态
-            DSSGitUtils.pull(repository, request.getProjectName(), gitUser);
+            DSSGitUtils.pullTargetFile(repository, request.getProjectName(), gitUser, fileList);
 
             List<GitCommitResponse> latestCommit = DSSGitUtils.getLatestCommit(repository, request.getFilepath(), 1);
             if (CollectionUtils.isEmpty(latestCommit)) {
@@ -441,8 +446,9 @@ public GitCommitResponse gitCheckOut(GitRevertRequest request) throws IOExceptio
             // 获取git仓库
             File repoDir = new File(gitPath);
             repository = getRepository(repoDir, request.getProjectName(), gitUser);
+            List<String> fileList = Collections.singletonList(request.getPath());
             // 本地保持最新状态
-            DSSGitUtils.pull(repository, request.getProjectName(), gitUser);
+            DSSGitUtils.pullTargetFile(repository, request.getProjectName(), gitUser, fileList);
             // 回滚
             DSSGitUtils.checkoutTargetCommit(request);
             // push
@@ -478,8 +484,9 @@ public GitCommitResponse removeFile(GitRemoveRequest request) {
             // 获取git仓库
             File repoDir = new File(gitPath);
             repository = getRepository(repoDir, request.getProjectName(), gitUser);
+            List<String> fileList = request.getPath();
             // 本地保持最新状态
-            DSSGitUtils.pull(repository, request.getProjectName(), gitUser);
+            DSSGitUtils.pullTargetFile(repository, request.getProjectName(), gitUser, fileList);
             // 同步删除对应节点
             for (String path : request.getPath()) {
                 FileUtils.removeFlowNode(path, request.getProjectName());
@@ -513,11 +520,12 @@ public GitCommitResponse rename(GitRenameRequest request) {
             // 获取git仓库
             File repoDir = new File(gitPath);
             repository = getRepository(repoDir, request.getProjectName(), gitUser);
-            // 本地保持最新状态
-            DSSGitUtils.pull(repository, request.getProjectName(), gitUser);
             // 同步删除对应节点
             String olfFilePath = File.separator + FileUtils.normalizePath(GitServerConfig.GIT_SERVER_PATH.getValue()) + File.separator + request.getProjectName() + File.separator +  FileUtils.normalizePath(request.getOldName());
             String filePath = File.separator + FileUtils.normalizePath(GitServerConfig.GIT_SERVER_PATH.getValue()) + File.separator + request.getProjectName() + File.separator +  FileUtils.normalizePath(request.getName());;
+            List<String> fileList = Collections.singletonList(olfFilePath);
+            // 本地保持最新状态
+            DSSGitUtils.pullTargetFile(repository, request.getProjectName(), gitUser, fileList);
             FileUtils.renameFile(olfFilePath, filePath);
             // 提交
             String comment = "rename workflowNode " + request.getName() + DSSGitConstant.GIT_USERNAME_FLAG + request.getUsername();
diff --git a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/utils/DSSGitUtils.java b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/utils/DSSGitUtils.java
index 6ceb01751..9feb854fa 100644
--- a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/utils/DSSGitUtils.java
+++ b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/utils/DSSGitUtils.java
@@ -17,6 +17,7 @@
 import org.apache.http.impl.client.HttpClients;
 import org.apache.http.util.EntityUtils;
 import org.eclipse.jgit.api.*;
+import org.eclipse.jgit.api.errors.CheckoutConflictException;
 import org.eclipse.jgit.api.errors.GitAPIException;
 import org.eclipse.jgit.lib.*;
 import org.eclipse.jgit.revwalk.RevCommit;
@@ -31,6 +32,7 @@
 import org.json.JSONObject;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.util.CollectionUtils;
 
 import java.io.*;
 import java.net.HttpURLConnection;
@@ -155,6 +157,36 @@ public static void pull(Repository repository, String projectName, GitUserEntity
         }
     }
 
+    public static void pullTargetFile(Repository repository, String projectName, GitUserEntity gitUser, List<String> paths) {
+        try {
+            if (CollectionUtils.isEmpty(paths)) {
+                return ;
+            }
+
+            // Opening the repository
+            Git git = new Git(repository);
+            // 拉取最新提交记录，但不进行合并
+            git.fetch().call();
+            // 设置需要更新的文件或文件夹路径
+            try {
+                git.checkout()
+                        .setStartPoint("origin/master")
+                        .addPaths(paths)
+                        .call();
+            } catch (CheckoutConflictException e) {
+                logger.info("Conflicts occurred, resetting local changes to match remote...");
+                git.reset()
+                        .setMode(ResetCommand.ResetType.HARD)
+                        .setRef("refs/remotes/origin/master")
+                        .call();
+                logger.info("reset success");
+            }
+
+        } catch (GitAPIException e) {
+            e.printStackTrace();
+        }
+    }
+
     public static GitDiffResponse diff(String projectName, List<String> fileList) {
 
         Set<String> status = status(projectName, fileList);

From 7a85be66e9fab973dd52d9f3b591878f60bc9407 Mon Sep 17 00:00:00 2001
From: qweqnotallow <747839893@qq.com>
Date: Mon, 20 May 2024 15:17:53 +0800
Subject: [PATCH 146/302] git server: rename fix

---
 .../protocol/response/GitArchivePorjectResponse.java |  6 +++++-
 .../impl/DSSGitWorkflowManagerServiceImpl.java       | 12 +++++++++---
 .../wedatasphere/dss/git/utils/DSSGitUtils.java      |  3 +--
 3 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/dss-git/dss-git-common/src/main/java/com.webank.wedatasphere.dss.git.common/protocol/response/GitArchivePorjectResponse.java b/dss-git/dss-git-common/src/main/java/com.webank.wedatasphere.dss.git.common/protocol/response/GitArchivePorjectResponse.java
index 88884222a..c3dc80508 100644
--- a/dss-git/dss-git-common/src/main/java/com.webank.wedatasphere.dss.git.common/protocol/response/GitArchivePorjectResponse.java
+++ b/dss-git/dss-git-common/src/main/java/com.webank.wedatasphere.dss.git.common/protocol/response/GitArchivePorjectResponse.java
@@ -1,7 +1,7 @@
 package com.webank.wedatasphere.dss.git.common.protocol.response;
 
 
-public class GitArchivePorjectResponse{
+public class GitArchivePorjectResponse extends GitBaseResponse {
     private String projectName;
 
     public GitArchivePorjectResponse(String projectName) {
@@ -11,6 +11,10 @@ public GitArchivePorjectResponse(String projectName) {
     public GitArchivePorjectResponse() {
     }
 
+    public GitArchivePorjectResponse(String status, int index, String message) {
+        super(status, index, message);
+    }
+
     public String getProjectName() {
         return projectName;
     }
diff --git a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitWorkflowManagerServiceImpl.java b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitWorkflowManagerServiceImpl.java
index b4e3a0db0..dbe24ca00 100644
--- a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitWorkflowManagerServiceImpl.java
+++ b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitWorkflowManagerServiceImpl.java
@@ -521,12 +521,18 @@ public GitCommitResponse rename(GitRenameRequest request) {
             File repoDir = new File(gitPath);
             repository = getRepository(repoDir, request.getProjectName(), gitUser);
             // 同步删除对应节点
-            String olfFilePath = File.separator + FileUtils.normalizePath(GitServerConfig.GIT_SERVER_PATH.getValue()) + File.separator + request.getProjectName() + File.separator +  FileUtils.normalizePath(request.getOldName());
-            String filePath = File.separator + FileUtils.normalizePath(GitServerConfig.GIT_SERVER_PATH.getValue()) + File.separator + request.getProjectName() + File.separator +  FileUtils.normalizePath(request.getName());;
-            List<String> fileList = Collections.singletonList(olfFilePath);
+            String olfFilePath = File.separator + FileUtils.normalizePath(GitServerConfig.GIT_SERVER_PATH.getValue()) + File.separator + request.getProjectName() + File.separator + FileUtils.normalizePath(request.getOldName());
+            String filePath = File.separator + FileUtils.normalizePath(GitServerConfig.GIT_SERVER_PATH.getValue()) + File.separator + request.getProjectName() + File.separator + FileUtils.normalizePath(request.getName());
+
+            String oldFileMetaPath = File.separator + FileUtils.normalizePath(GitServerConfig.GIT_SERVER_PATH.getValue()) + File.separator + request.getProjectName() + File.separator + FileUtils.normalizePath(GitServerConfig.GIT_SERVER_META_PATH.getValue()) + File.separator + FileUtils.normalizePath(request.getOldName());
+            String fileMetaPath = File.separator + FileUtils.normalizePath(GitServerConfig.GIT_SERVER_PATH.getValue()) + File.separator + request.getProjectName() + File.separator + FileUtils.normalizePath(GitServerConfig.GIT_SERVER_META_PATH.getValue()) + File.separator + FileUtils.normalizePath(request.getName());
+            List<String> fileList = new ArrayList<>();
+            fileList.add(oldFileMetaPath);
+            fileList.add(olfFilePath);
             // 本地保持最新状态
             DSSGitUtils.pullTargetFile(repository, request.getProjectName(), gitUser, fileList);
             FileUtils.renameFile(olfFilePath, filePath);
+            FileUtils.renameFile(oldFileMetaPath, fileMetaPath);
             // 提交
             String comment = "rename workflowNode " + request.getName() + DSSGitConstant.GIT_USERNAME_FLAG + request.getUsername();
             DSSGitUtils.push(repository, request.getProjectName(), gitUser, comment);
diff --git a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/utils/DSSGitUtils.java b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/utils/DSSGitUtils.java
index 9feb854fa..c5f0a43e5 100644
--- a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/utils/DSSGitUtils.java
+++ b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/utils/DSSGitUtils.java
@@ -278,7 +278,7 @@ public static void checkoutTargetCommit(GitRevertRequest request) throws GitAPIE
     public static boolean checkProjectName(String name, GitUserEntity gitUser) throws DSSErrorException {
         int retry = 0;
         List<String> allProjectName = new ArrayList<>();
-        while (retry < 3) {
+        while (true) {
             retry += 1;
             try {
                 allProjectName = getAllProjectName(gitUser);
@@ -291,7 +291,6 @@ public static boolean checkProjectName(String name, GitUserEntity gitUser) throw
                 }
             }
         }
-        return allProjectName.contains(name);
 
     }
 

From 0f72eb46fa2354a7c2081a8e86d21b0e756f1a9b Mon Sep 17 00:00:00 2001
From: qweqnotallow <747839893@qq.com>
Date: Mon, 20 May 2024 16:47:56 +0800
Subject: [PATCH 147/302] git server: search Result fix

---
 .../DSSFrameworkOrchestratorRestful.java      |  1 +
 .../protocol/GitSearchLine.java               | 30 +++++++++++++++++++
 .../protocol/GitSearchResult.java             |  8 ++---
 .../DSSGitWorkflowManagerServiceImpl.java     | 30 +++++++++++++++++--
 4 files changed, 62 insertions(+), 7 deletions(-)
 create mode 100644 dss-git/dss-git-common/src/main/java/com.webank.wedatasphere.dss.git.common/protocol/GitSearchLine.java

diff --git a/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/restful/DSSFrameworkOrchestratorRestful.java b/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/restful/DSSFrameworkOrchestratorRestful.java
index 212b13a59..cf4c09a8c 100644
--- a/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/restful/DSSFrameworkOrchestratorRestful.java
+++ b/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/restful/DSSFrameworkOrchestratorRestful.java
@@ -331,6 +331,7 @@ public Message submitFlow(@RequestBody OrchestratorSubmitRequest submitFlowReque
     @RequestMapping(path = "gitUrl", method = RequestMethod.GET)
     public Message gitUrl(@RequestParam(required = true, name = "projectName") String projectName,
                           @RequestParam(required = false, name = "workflowName") String workflowName,
+                          @RequestParam(required = false, name = "workflowNodeName") String workflowNodeName,
                           HttpServletResponse response) {
         Workspace workspace = SSOHelper.getWorkspace(httpServletRequest);
         String userName = SecurityFilter.getLoginUsername(httpServletRequest);
diff --git a/dss-git/dss-git-common/src/main/java/com.webank.wedatasphere.dss.git.common/protocol/GitSearchLine.java b/dss-git/dss-git-common/src/main/java/com.webank.wedatasphere.dss.git.common/protocol/GitSearchLine.java
new file mode 100644
index 000000000..659070ef5
--- /dev/null
+++ b/dss-git/dss-git-common/src/main/java/com.webank.wedatasphere.dss.git.common/protocol/GitSearchLine.java
@@ -0,0 +1,30 @@
+package com.webank.wedatasphere.dss.git.common.protocol;
+
+public class GitSearchLine {
+    private Integer number;
+    private String line;
+
+    public GitSearchLine(Integer number, String line) {
+        this.number = number;
+        this.line = line;
+    }
+
+    public GitSearchLine() {
+    }
+
+    public Integer getNumber() {
+        return number;
+    }
+
+    public void setNumber(Integer number) {
+        this.number = number;
+    }
+
+    public String getLine() {
+        return line;
+    }
+
+    public void setLine(String line) {
+        this.line = line;
+    }
+}
diff --git a/dss-git/dss-git-common/src/main/java/com.webank.wedatasphere.dss.git.common/protocol/GitSearchResult.java b/dss-git/dss-git-common/src/main/java/com.webank.wedatasphere.dss.git.common/protocol/GitSearchResult.java
index f42a96244..a1e7258be 100644
--- a/dss-git/dss-git-common/src/main/java/com.webank.wedatasphere.dss.git.common/protocol/GitSearchResult.java
+++ b/dss-git/dss-git-common/src/main/java/com.webank.wedatasphere.dss.git.common/protocol/GitSearchResult.java
@@ -4,12 +4,12 @@
 
 public class GitSearchResult {
     private String path;
-    private List<String> keyLines;
+    private List<GitSearchLine> keyLines;
 
     public GitSearchResult() {
     }
 
-    public GitSearchResult(String path, List<String> keyLines) {
+    public GitSearchResult(String path, List<GitSearchLine> keyLines) {
         this.path = path;
         this.keyLines = keyLines;
     }
@@ -22,11 +22,11 @@ public void setPath(String path) {
         this.path = path;
     }
 
-    public List<String> getKeyLines() {
+    public List<GitSearchLine> getKeyLines() {
         return keyLines;
     }
 
-    public void setKeyLines(List<String> keyLines) {
+    public void setKeyLines(List<GitSearchLine> keyLines) {
         this.keyLines = keyLines;
     }
 }
diff --git a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitWorkflowManagerServiceImpl.java b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitWorkflowManagerServiceImpl.java
index dbe24ca00..29ffe53f1 100644
--- a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitWorkflowManagerServiceImpl.java
+++ b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitWorkflowManagerServiceImpl.java
@@ -2,6 +2,7 @@
 
 import com.webank.wedatasphere.dss.common.entity.BmlResource;
 import com.webank.wedatasphere.dss.common.service.BMLService;
+import com.webank.wedatasphere.dss.git.common.protocol.GitSearchLine;
 import com.webank.wedatasphere.dss.git.common.protocol.GitSearchResult;
 import com.webank.wedatasphere.dss.git.common.protocol.GitUserEntity;
 import com.webank.wedatasphere.dss.git.common.protocol.constant.GitConstant;
@@ -229,16 +230,39 @@ public GitSearchResponse search(GitSearchRequest request) {
             gitSearchCommand.add(file);
             logger.info(gitSearchCommand.toString());
 
-            // subList 截断的List及子集 不允许List变更
-            final List<String> searchResult = process(gitSearchCommand);
+            List<String> searchResult = process(gitSearchCommand);
             List<String> subSearchResult = null;
             if (searchResult.size() > GitServerConfig.GIT_SEARCH_RESULT_LIMIT.getValue()) {
                 subSearchResult = new ArrayList<>(searchResult.subList(0, GitServerConfig.GIT_SEARCH_RESULT_LIMIT.getValue()));
             } else {
                 subSearchResult = searchResult;
             }
+            List<GitSearchLine> keyLines = new ArrayList<>();
+            for (String resultLine : subSearchResult) {
+                // 找到第一个冒号的位置
+                int colonIndex = resultLine.indexOf(':');
+
+                // 如果存在冒号，去除它之前的所有内容 /testGit/test/.sql:1:test -> 1:test
+                if (colonIndex != -1 && colonIndex + 1 < resultLine.length()) {
+                    resultLine = resultLine.substring(colonIndex + 1);
+                    // 找到第二个冒号位置
+                    int colonIndexSec = resultLine.indexOf(':');
+                    if (colonIndexSec != -1 && colonIndexSec + 1 < resultLine.length()) {
+                        Integer num = Integer.valueOf(resultLine.substring(0, colonIndexSec));
+                        String line = resultLine.substring(colonIndexSec + 1);
+                        // 只添加符合要求的结果
+                        GitSearchLine searchLine = new GitSearchLine(num, line);
+                        keyLines.add(searchLine);
+                    }
+                }
+            }
+            // 处理文件路径 /data/GitInstall/testGit/test/.sql -> testGit/test/.sql
+            String pre = "/" + FileUtils.normalizePath(GitServerConfig.GIT_SERVER_PATH.getValue())+ "/";
+            if (file.startsWith(pre)) {
+                file = file.substring(pre.length());
+            }
 
-            result.add(new GitSearchResult(file, subSearchResult));
+            result.add(new GitSearchResult(file, keyLines));
         }
 
 

From 2e23315094ef28236082c9c341becb6c22d25320 Mon Sep 17 00:00:00 2001
From: qweqnotallow <747839893@qq.com>
Date: Mon, 20 May 2024 17:14:54 +0800
Subject: [PATCH 148/302] git server: try catch fix

---
 .../impl/DSSGitProjectManagerServiceImpl.java |   9 +-
 .../DSSGitWorkflowManagerServiceImpl.java     | 147 +++++++-----------
 2 files changed, 62 insertions(+), 94 deletions(-)

diff --git a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitProjectManagerServiceImpl.java b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitProjectManagerServiceImpl.java
index f36718629..4c9d17a61 100644
--- a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitProjectManagerServiceImpl.java
+++ b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitProjectManagerServiceImpl.java
@@ -41,7 +41,7 @@ public GitCreateProjectResponse create(GitCreateProjectRequest request) {
             logger.error("the workspace : {} don't associate with git", request.getWorkspaceId());
             return null;
         }
-        Repository repository;
+        Repository repository = null;
         try {
             // Http请求Git，创建project
             DSSGitUtils.init(request.getProjectName(), gitUser);
@@ -51,7 +51,8 @@ public GitCreateProjectResponse create(GitCreateProjectRequest request) {
             // 本地创建Git项目
             DSSGitUtils.create(request.getProjectName(), gitUser);
             // 获取git项目
-            File repoDir = new File(File.separator + FileUtils.normalizePath(GitServerConfig.GIT_SERVER_PATH.getValue()) + File.separator + request.getProjectName() + File.separator +".git");
+            String gitPath = DSSGitUtils.generateGitPath(request.getProjectName());
+            File repoDir = new File(gitPath);
             repository = new FileRepositoryBuilder().setGitDir(repoDir).build();
             // 关联远端Git
             DSSGitUtils.remote(repository, request.getProjectName(), gitUser);
@@ -62,6 +63,10 @@ public GitCreateProjectResponse create(GitCreateProjectRequest request) {
         } catch (Exception e) {
             logger.error("create project failed, the reason is: ", e);
 //            throw new DSSErrorException(010001, "create project failed");
+        } finally {
+            if (repository != null) {
+                repository.close();
+            }
         }
         return null;
     }
diff --git a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitWorkflowManagerServiceImpl.java b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitWorkflowManagerServiceImpl.java
index 29ffe53f1..772e6c232 100644
--- a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitWorkflowManagerServiceImpl.java
+++ b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitWorkflowManagerServiceImpl.java
@@ -50,13 +50,11 @@ public GitDiffResponse diff(GitDiffRequest request) {
             return null;
         }
         GitDiffResponse diff = null;
-        Repository repository = null;
-        try {
-            // 拼接.git路径
-            String gitPath = DSSGitUtils.generateGitPath(request.getProjectName());
-            // 获取git仓库
-            File repoDir = new File(gitPath);
-            repository = getRepository(repoDir, request.getProjectName(), gitUser);
+        // 拼接.git路径
+        String gitPath = DSSGitUtils.generateGitPath(request.getProjectName());
+        // 获取git仓库
+        File repoDir = new File(gitPath);
+        try (Repository repository = getRepository(repoDir, request.getProjectName(), gitUser)){
             // 解压BML文件到本地
             Map<String, BmlResource> bmlResourceMap = request.getBmlResourceMap();
             List<String> fileList = new ArrayList<>(bmlResourceMap.keySet());
@@ -72,8 +70,6 @@ public GitDiffResponse diff(GitDiffRequest request) {
             DSSGitUtils.reset(request.getProjectName());
         } catch (Exception e) {
             logger.error("pull failed, the reason is ",e);
-        }finally {
-            repository.close();
         }
         return diff;
 
@@ -86,14 +82,13 @@ public GitCommitResponse commit(GitCommitRequest request) {
             logger.error("the workspace : {} don't associate with git", request.getWorkspaceId());
             return null;
         }
-        Repository repository = null;
         GitCommitResponse commitResponse = null;
-        try {
-            // 拼接.git路径
-            String gitPath = DSSGitUtils.generateGitPath(request.getProjectName());
-            // 获取git仓库
-            File repoDir = new File(gitPath);
-            repository = getRepository(repoDir, request.getProjectName(), gitUser);
+        // 拼接.git路径
+        String gitPath = DSSGitUtils.generateGitPath(request.getProjectName());
+        // 获取git仓库
+        File repoDir = new File(gitPath);
+
+        try (Repository repository = getRepository(repoDir, request.getProjectName(), gitUser)){
             // 解压BML文件到本地
             Map<String, BmlResource> bmlResourceMap = request.getBmlResourceMap();
             List<String> fileList = new ArrayList<>(bmlResourceMap.keySet());
@@ -108,19 +103,16 @@ public GitCommitResponse commit(GitCommitRequest request) {
             DSSGitUtils.push(repository, request.getProjectName(), gitUser, comment);
 
             commitResponse = DSSGitUtils.getCurrentCommit(repository);
-
         } catch (Exception e) {
             logger.error("pull failed, the reason is ",e);
-        } finally {
-            repository.close();
         }
         return commitResponse;
     }
 
     @Override
     public GitSearchResponse search(GitSearchRequest request) {
-        String gitDir = "/" + FileUtils.normalizePath(GitServerConfig.GIT_SERVER_PATH.getValue()) + "/" + request.getProjectName() + "/.git";
-        String workTree = "/" + FileUtils.normalizePath(GitServerConfig.GIT_SERVER_PATH.getValue()) + "/" + request.getProjectName() ;
+        String gitDir = DSSGitUtils.generateGitPath(request.getProjectName());
+        String workTree = DSSGitConstant.GIT_PATH_PRE + request.getProjectName() ;
         List<String> gitCommands = new ArrayList<>(Arrays.asList(
                 "git", "--git-dir=" + gitDir, "--work-tree=" + workTree, "grep", "-l", request.getSearchContent()
         ));
@@ -183,16 +175,16 @@ public GitSearchResponse search(GitSearchRequest request) {
 
         Set<String> excludeResult = new HashSet<>();
         for (String file : fileList) {
-            //排除指定文件夹下的内容
+            //排除指定文件夹下的内容 (.metaConf)
             for (String excludeDir : excludeDirList) {
                 if (file.startsWith(excludeDir)) {
                     excludeResult.add(file);
                     break;
                 }
             }
-            // 排除指定文件下的内容
+            // 排除指定文件下的内容(.properties)
             for (String exclude : excludeFileList) {
-                if (file.endsWith("/" + exclude)) {
+                if (file.endsWith(File.separator + exclude)) {
                     excludeResult.add(file);
                 }
             }
@@ -215,7 +207,7 @@ public GitSearchResponse search(GitSearchRequest request) {
         List<String> subList = new ArrayList<>(fileList.subList(start, end));
         List<String> filePathList = new ArrayList<>();
         for (String file : subList) {
-            filePathList.add("/" + FileUtils.normalizePath(GitServerConfig.GIT_SERVER_PATH.getValue())+ "/" + request.getProjectName() + "/" + file);
+            filePathList.add(DSSGitConstant.GIT_PATH_PRE + request.getProjectName() + File.separator + file);
         }
 
 
@@ -257,9 +249,8 @@ public GitSearchResponse search(GitSearchRequest request) {
                 }
             }
             // 处理文件路径 /data/GitInstall/testGit/test/.sql -> testGit/test/.sql
-            String pre = "/" + FileUtils.normalizePath(GitServerConfig.GIT_SERVER_PATH.getValue())+ "/";
-            if (file.startsWith(pre)) {
-                file = file.substring(pre.length());
+            if (file.startsWith(DSSGitConstant.GIT_PATH_PRE)) {
+                file = file.substring(DSSGitConstant.GIT_PATH_PRE.length());
             }
 
             result.add(new GitSearchResult(file, keyLines));
@@ -306,14 +297,12 @@ public GitDeleteResponse delete(GitDeleteRequest request) {
             logger.error("the workspace : {} don't associate with git", request.getWorkspaceId());
             return null;
         }
-        Repository repository = null;
         GitDeleteResponse deleteResponse = null;
-        try {
-            // 拼接.git路径
-            String gitPath = DSSGitUtils.generateGitPath(request.getProjectName());
-            // 获取git仓库
-            File repoDir = new File(gitPath);
-            repository = getRepository(repoDir, request.getProjectName(), gitUser);
+        // 拼接.git路径
+        String gitPath = DSSGitUtils.generateGitPath(request.getProjectName());
+        // 获取git仓库
+        File repoDir = new File(gitPath);
+        try (Repository repository = getRepository(repoDir, request.getProjectName(), gitUser)){
             List<String> fileList = request.getDeleteFileList();
             // 本地保持最新状态
             DSSGitUtils.pullTargetFile(repository, request.getProjectName(), gitUser, fileList);
@@ -332,8 +321,6 @@ public GitDeleteResponse delete(GitDeleteRequest request) {
             DSSGitUtils.push(repository, request.getProjectName(), gitUser,"delete " + request.getDeleteFileList());
         } catch (Exception e) {
             logger.error("pull failed, the reason is ",e);
-        } finally {
-            repository.close();
         }
         return null;
     }
@@ -345,14 +332,12 @@ public GitFileContentResponse getFileContent(GitFileContentRequest request) {
             logger.error("the workspace : {} don't associate with git", request.getWorkspaceId());
             return null;
         }
-        Repository repository = null;
         GitFileContentResponse contentResponse = null;
-        try {
-            // 拼接.git路径
-            String gitPath = DSSGitUtils.generateGitPath(request.getProjectName());
-            // 获取git仓库
-            File repoDir = new File(gitPath);
-            repository = getRepository(repoDir, request.getProjectName(), gitUser);
+        // 拼接.git路径
+        String gitPath = DSSGitUtils.generateGitPath(request.getProjectName());
+        // 获取git仓库
+        File repoDir = new File(gitPath);
+        try (Repository repository = getRepository(repoDir, request.getProjectName(), gitUser)){
             List<String> fileList = Collections.singletonList(request.getFilePath());
             // 本地保持最新状态
             DSSGitUtils.pullTargetFile(repository, request.getProjectName(), gitUser, fileList);
@@ -367,8 +352,6 @@ public GitFileContentResponse getFileContent(GitFileContentRequest request) {
             return contentResponse;
         } catch (Exception e) {
             logger.error("pull failed, the reason is ",e);
-        } finally {
-            repository.close();
         }
        return null;
     }
@@ -380,15 +363,13 @@ public GitHistoryResponse getHistory(GitHistoryRequest request) {
             logger.error("the workspace : {} don't associate with git", request.getWorkspaceId());
             return null;
         }
-
-        Repository repository = null;
         GitHistoryResponse response = new GitHistoryResponse();
-        try {
-            // 拼接.git路径
-            String gitPath = DSSGitUtils.generateGitPath(request.getProjectName());
-            // 获取git仓库
-            File repoDir = new File(gitPath);
-            repository = getRepository(repoDir, request.getProjectName(), gitUser);
+        // 拼接.git路径
+        String gitPath = DSSGitUtils.generateGitPath(request.getProjectName());
+        // 获取git仓库
+        File repoDir = new File(gitPath);
+        try (Repository repository = getRepository(repoDir, request.getProjectName(), gitUser)){
+
             List<String> fileList = Collections.singletonList(request.getFilePath());
             // 本地保持最新状态
             DSSGitUtils.pullTargetFile(repository, request.getProjectName(), gitUser, fileList);
@@ -402,8 +383,6 @@ public GitHistoryResponse getHistory(GitHistoryRequest request) {
 
         } catch (Exception e) {
             logger.error("pull failed, the reason is ",e);
-        } finally {
-            repository.close();
         }
         return response;
     }
@@ -427,14 +406,12 @@ public GitCommitResponse getCurrentCommit(GitCurrentCommitRequest request) {
             logger.error("the workspace : {} don't associate with git", request.getWorkspaceId());
             return null;
         }
-        Repository repository = null;
         GitCommitResponse commitResponse = null;
-        try {
-            // 拼接.git路径
-            String gitPath = DSSGitUtils.generateGitPath(request.getProjectName());
-            // 获取git仓库
-            File repoDir = new File(gitPath);
-            repository = getRepository(repoDir, request.getProjectName(), gitUser);
+        // 拼接.git路径
+        String gitPath = DSSGitUtils.generateGitPath(request.getProjectName());
+        // 获取git仓库
+        File repoDir = new File(gitPath);
+        try (Repository repository = getRepository(repoDir, request.getProjectName(), gitUser);){
             List<String> fileList = Collections.singletonList(request.getFilepath());
             // 本地保持最新状态
             DSSGitUtils.pullTargetFile(repository, request.getProjectName(), gitUser, fileList);
@@ -449,8 +426,6 @@ public GitCommitResponse getCurrentCommit(GitCurrentCommitRequest request) {
 
         } catch (Exception e) {
             logger.error("pull failed, the reason is ",e);
-        } finally {
-            repository.close();
         }
         return null;
     }
@@ -462,14 +437,12 @@ public GitCommitResponse gitCheckOut(GitRevertRequest request) throws IOExceptio
             logger.error("the workspace : {} don't associate with git", request.getWorkspaceId());
             return null;
         }
-        Repository repository = null;
         GitCommitResponse commitResponse = null;
-        try {
-            // 拼接.git路径
-            String gitPath = DSSGitUtils.generateGitPath(request.getProjectName());
-            // 获取git仓库
-            File repoDir = new File(gitPath);
-            repository = getRepository(repoDir, request.getProjectName(), gitUser);
+        // 拼接.git路径
+        String gitPath = DSSGitUtils.generateGitPath(request.getProjectName());
+        // 获取git仓库
+        File repoDir = new File(gitPath);
+        try (Repository repository = getRepository(repoDir, request.getProjectName(), gitUser)){
             List<String> fileList = Collections.singletonList(request.getPath());
             // 本地保持最新状态
             DSSGitUtils.pullTargetFile(repository, request.getProjectName(), gitUser, fileList);
@@ -487,8 +460,6 @@ public GitCommitResponse gitCheckOut(GitRevertRequest request) throws IOExceptio
 
         } catch (Exception e) {
             logger.error("checkOut failed, the reason is ",e);
-        } finally {
-            repository.close();
         }
         return null;
     }
@@ -500,14 +471,12 @@ public GitCommitResponse removeFile(GitRemoveRequest request) {
             logger.error("the workspace : {} don't associate with git", request.getWorkspaceId());
             return null;
         }
-        Repository repository = null;
         GitCommitResponse commitResponse = null;
-        try {
-            // 拼接.git路径
-            String gitPath = DSSGitUtils.generateGitPath(request.getProjectName());
-            // 获取git仓库
-            File repoDir = new File(gitPath);
-            repository = getRepository(repoDir, request.getProjectName(), gitUser);
+        // 拼接.git路径
+        String gitPath = DSSGitUtils.generateGitPath(request.getProjectName());
+        // 获取git仓库
+        File repoDir = new File(gitPath);
+        try (Repository repository = getRepository(repoDir, request.getProjectName(), gitUser)){
             List<String> fileList = request.getPath();
             // 本地保持最新状态
             DSSGitUtils.pullTargetFile(repository, request.getProjectName(), gitUser, fileList);
@@ -523,8 +492,6 @@ public GitCommitResponse removeFile(GitRemoveRequest request) {
 
         } catch (Exception e) {
             logger.error("pull failed, the reason is ",e);
-        } finally {
-            repository.close();
         }
         return commitResponse;
     }
@@ -536,14 +503,12 @@ public GitCommitResponse rename(GitRenameRequest request) {
             logger.error("the workspace : {} don't associate with git", request.getWorkspaceId());
             return null;
         }
-        Repository repository = null;
         GitCommitResponse commitResponse = null;
-        try {
-            // 拼接.git路径
-            String gitPath = DSSGitUtils.generateGitPath(request.getProjectName());
-            // 获取git仓库
-            File repoDir = new File(gitPath);
-            repository = getRepository(repoDir, request.getProjectName(), gitUser);
+        // 拼接.git路径
+        String gitPath = DSSGitUtils.generateGitPath(request.getProjectName());
+        // 获取git仓库
+        File repoDir = new File(gitPath);
+        try (Repository repository = getRepository(repoDir, request.getProjectName(), gitUser)){
             // 同步删除对应节点
             String olfFilePath = File.separator + FileUtils.normalizePath(GitServerConfig.GIT_SERVER_PATH.getValue()) + File.separator + request.getProjectName() + File.separator + FileUtils.normalizePath(request.getOldName());
             String filePath = File.separator + FileUtils.normalizePath(GitServerConfig.GIT_SERVER_PATH.getValue()) + File.separator + request.getProjectName() + File.separator + FileUtils.normalizePath(request.getName());
@@ -565,8 +530,6 @@ public GitCommitResponse rename(GitRenameRequest request) {
 
         } catch (Exception e) {
             logger.error("pull failed, the reason is ",e);
-        } finally {
-            repository.close();
         }
         return commitResponse;
     }

From 5b25dad99f0d5c086e0a8768113b979787d87d8f Mon Sep 17 00:00:00 2001
From: qweqnotallow <747839893@qq.com>
Date: Mon, 20 May 2024 17:50:59 +0800
Subject: [PATCH 149/302] dss server: exportAllSubFlowNew null fix

---
 .../dss/workflow/io/export/impl/WorkFlowExportServiceImpl.java | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/io/export/impl/WorkFlowExportServiceImpl.java b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/io/export/impl/WorkFlowExportServiceImpl.java
index e3f080ba5..ba3c312dd 100644
--- a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/io/export/impl/WorkFlowExportServiceImpl.java
+++ b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/io/export/impl/WorkFlowExportServiceImpl.java
@@ -302,6 +302,9 @@ private String extractAndExportParams(String flowJson,String flowCodePath) throw
         JsonObject jsonObject = parser.parse(flowJson).getAsJsonObject();
         JsonArray nodeJsonArray = jsonObject.getAsJsonArray("nodes");
         Gson gson = new GsonBuilder().setPrettyPrinting().create();
+        if (nodeJsonArray == null) {
+            return gson.toJson(jsonObject);
+        }
         for (JsonElement element : nodeJsonArray) {
             JsonObject node = element.getAsJsonObject();
             JsonElement params = node.remove("params");

From ffcd5a24466d1e2290b2a7c8c68bb60b8ab204c1 Mon Sep 17 00:00:00 2001
From: qweqnotallow <747839893@qq.com>
Date: Mon, 20 May 2024 17:57:44 +0800
Subject: [PATCH 150/302] git server: pull fix

---
 .../impl/DSSGitWorkflowManagerServiceImpl.java | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitWorkflowManagerServiceImpl.java b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitWorkflowManagerServiceImpl.java
index 772e6c232..03d2525f9 100644
--- a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitWorkflowManagerServiceImpl.java
+++ b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitWorkflowManagerServiceImpl.java
@@ -59,7 +59,7 @@ public GitDiffResponse diff(GitDiffRequest request) {
             Map<String, BmlResource> bmlResourceMap = request.getBmlResourceMap();
             List<String> fileList = new ArrayList<>(bmlResourceMap.keySet());
             // 本地保持最新状态
-            DSSGitUtils.pullTargetFile(repository, request.getProjectName(), gitUser, fileList);
+            DSSGitUtils.pull(repository, request.getProjectName(), gitUser);
             for (Map.Entry<String, BmlResource> entry : bmlResourceMap.entrySet()) {
                 fileList.add(entry.getKey());
                 FileUtils.removeFlowNode(entry.getKey(), request.getProjectName());
@@ -93,7 +93,7 @@ public GitCommitResponse commit(GitCommitRequest request) {
             Map<String, BmlResource> bmlResourceMap = request.getBmlResourceMap();
             List<String> fileList = new ArrayList<>(bmlResourceMap.keySet());
             // 本地保持最新状态
-            DSSGitUtils.pullTargetFile(repository, request.getProjectName(), gitUser, fileList);
+            DSSGitUtils.pull(repository, request.getProjectName(), gitUser);
             for (Map.Entry<String, BmlResource> entry : bmlResourceMap.entrySet()) {
                 FileUtils.removeFlowNode(entry.getKey(), request.getProjectName());
                 FileUtils.update(bmlService, entry.getKey(), entry.getValue(), request.getUsername());
@@ -305,7 +305,7 @@ public GitDeleteResponse delete(GitDeleteRequest request) {
         try (Repository repository = getRepository(repoDir, request.getProjectName(), gitUser)){
             List<String> fileList = request.getDeleteFileList();
             // 本地保持最新状态
-            DSSGitUtils.pullTargetFile(repository, request.getProjectName(), gitUser, fileList);
+            DSSGitUtils.pull(repository, request.getProjectName(), gitUser);
             List<String> deleteFileList = request.getDeleteFileList();
             for (String path : deleteFileList) {
                 File file = new File(path);
@@ -340,7 +340,7 @@ public GitFileContentResponse getFileContent(GitFileContentRequest request) {
         try (Repository repository = getRepository(repoDir, request.getProjectName(), gitUser)){
             List<String> fileList = Collections.singletonList(request.getFilePath());
             // 本地保持最新状态
-            DSSGitUtils.pullTargetFile(repository, request.getProjectName(), gitUser, fileList);
+            DSSGitUtils.pull(repository, request.getProjectName(), gitUser);
 
             String content = DSSGitUtils.getTargetCommitFileContent(request.getProjectName(), request.getCommitId(), request.getFilePath());
             String fullpath = File.separator + FileUtils.normalizePath(GitServerConfig.GIT_SERVER_PATH.getValue()) + File.separator + FileUtils.normalizePath(request.getFilePath());
@@ -372,7 +372,7 @@ public GitHistoryResponse getHistory(GitHistoryRequest request) {
 
             List<String> fileList = Collections.singletonList(request.getFilePath());
             // 本地保持最新状态
-            DSSGitUtils.pullTargetFile(repository, request.getProjectName(), gitUser, fileList);
+            DSSGitUtils.pull(repository, request.getProjectName(), gitUser);
 
             List<GitCommitResponse> latestCommit = DSSGitUtils.getLatestCommit(repository, request.getFilePath(), 5);
             if (CollectionUtils.isEmpty(latestCommit)) {
@@ -414,7 +414,7 @@ public GitCommitResponse getCurrentCommit(GitCurrentCommitRequest request) {
         try (Repository repository = getRepository(repoDir, request.getProjectName(), gitUser);){
             List<String> fileList = Collections.singletonList(request.getFilepath());
             // 本地保持最新状态
-            DSSGitUtils.pullTargetFile(repository, request.getProjectName(), gitUser, fileList);
+            DSSGitUtils.pull(repository, request.getProjectName(), gitUser);
 
             List<GitCommitResponse> latestCommit = DSSGitUtils.getLatestCommit(repository, request.getFilepath(), 1);
             if (CollectionUtils.isEmpty(latestCommit)) {
@@ -445,7 +445,7 @@ public GitCommitResponse gitCheckOut(GitRevertRequest request) throws IOExceptio
         try (Repository repository = getRepository(repoDir, request.getProjectName(), gitUser)){
             List<String> fileList = Collections.singletonList(request.getPath());
             // 本地保持最新状态
-            DSSGitUtils.pullTargetFile(repository, request.getProjectName(), gitUser, fileList);
+            DSSGitUtils.pull(repository, request.getProjectName(), gitUser);
             // 回滚
             DSSGitUtils.checkoutTargetCommit(request);
             // push
@@ -479,7 +479,7 @@ public GitCommitResponse removeFile(GitRemoveRequest request) {
         try (Repository repository = getRepository(repoDir, request.getProjectName(), gitUser)){
             List<String> fileList = request.getPath();
             // 本地保持最新状态
-            DSSGitUtils.pullTargetFile(repository, request.getProjectName(), gitUser, fileList);
+            DSSGitUtils.pull(repository, request.getProjectName(), gitUser);
             // 同步删除对应节点
             for (String path : request.getPath()) {
                 FileUtils.removeFlowNode(path, request.getProjectName());
@@ -519,7 +519,7 @@ public GitCommitResponse rename(GitRenameRequest request) {
             fileList.add(oldFileMetaPath);
             fileList.add(olfFilePath);
             // 本地保持最新状态
-            DSSGitUtils.pullTargetFile(repository, request.getProjectName(), gitUser, fileList);
+            DSSGitUtils.pull(repository, request.getProjectName(), gitUser);
             FileUtils.renameFile(olfFilePath, filePath);
             FileUtils.renameFile(oldFileMetaPath, fileMetaPath);
             // 提交

From c93648e5e3e5fd3429db108683a5bbc224619386 Mon Sep 17 00:00:00 2001
From: qweqnotallow <747839893@qq.com>
Date: Mon, 20 May 2024 18:02:15 +0800
Subject: [PATCH 151/302] git server: pull fix

---
 .../service/impl/DSSGitWorkflowManagerServiceImpl.java    | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitWorkflowManagerServiceImpl.java b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitWorkflowManagerServiceImpl.java
index 03d2525f9..011dea7a0 100644
--- a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitWorkflowManagerServiceImpl.java
+++ b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitWorkflowManagerServiceImpl.java
@@ -100,6 +100,8 @@ public GitCommitResponse commit(GitCommitRequest request) {
             }
             // 提交
             String comment = request.getComment() + DSSGitConstant.GIT_USERNAME_FLAG + request.getUsername();
+            // 提交前再次pull， 降低多节点同时提交不同工作流任务导致冲突频率
+            DSSGitUtils.pull(repository, request.getProjectName(), gitUser);
             DSSGitUtils.push(repository, request.getProjectName(), gitUser, comment);
 
             commitResponse = DSSGitUtils.getCurrentCommit(repository);
@@ -317,6 +319,8 @@ public GitDeleteResponse delete(GitDeleteRequest request) {
                     }
                 }
             }
+            // 提交前再次pull， 降低多节点同时提交不同工作流任务导致冲突频率
+            DSSGitUtils.pull(repository, request.getProjectName(), gitUser);
             // 提交
             DSSGitUtils.push(repository, request.getProjectName(), gitUser,"delete " + request.getDeleteFileList());
         } catch (Exception e) {
@@ -486,6 +490,8 @@ public GitCommitResponse removeFile(GitRemoveRequest request) {
             }
             // 提交
             String comment = "delete workflowNode " + request.getPath().toString() + DSSGitConstant.GIT_USERNAME_FLAG + request.getUsername();
+            // 提交前再次pull， 降低多节点同时提交不同工作流任务导致冲突频率
+            DSSGitUtils.pull(repository, request.getProjectName(), gitUser);
             DSSGitUtils.push(repository, request.getProjectName(), gitUser, comment);
 
             commitResponse = DSSGitUtils.getCurrentCommit(repository);
@@ -524,6 +530,8 @@ public GitCommitResponse rename(GitRenameRequest request) {
             FileUtils.renameFile(oldFileMetaPath, fileMetaPath);
             // 提交
             String comment = "rename workflowNode " + request.getName() + DSSGitConstant.GIT_USERNAME_FLAG + request.getUsername();
+            // 提交前再次pull， 降低多节点同时提交不同工作流任务导致冲突频率
+            DSSGitUtils.pull(repository, request.getProjectName(), gitUser);
             DSSGitUtils.push(repository, request.getProjectName(), gitUser, comment);
 
             commitResponse = DSSGitUtils.getCurrentCommit(repository);

From 2a971f6af29f0228b77414e4fd79c1e1e51fe284 Mon Sep 17 00:00:00 2001
From: qweqnotallow <747839893@qq.com>
Date: Mon, 20 May 2024 20:13:31 +0800
Subject: [PATCH 152/302] dss server: add type

---
 .../restful/DSSFrameworkOrchestratorRestful.java       | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/restful/DSSFrameworkOrchestratorRestful.java b/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/restful/DSSFrameworkOrchestratorRestful.java
index cf4c09a8c..1f7c57d93 100644
--- a/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/restful/DSSFrameworkOrchestratorRestful.java
+++ b/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/restful/DSSFrameworkOrchestratorRestful.java
@@ -400,4 +400,14 @@ public Message getHistory(@RequestParam Long orchestratorId, @RequestParam Strin
 
         return Message.ok().data("history", history);
     }
+
+    @RequestMapping(value = "allType", method = RequestMethod.GET)
+    public Message allType(@RequestParam Long orchestratorId, @RequestParam String projectName) {
+        Workspace workspace = SSOHelper.getWorkspace(httpServletRequest);
+        String userName = SecurityFilter.getLoginUsername(httpServletRequest);
+
+        List<String> type = Arrays.asList(".sql",".hql",".jdbc", ".py", ".python", ".scala", ".sh");
+
+        return Message.ok().data("type", type);
+    }
 }

From 40cff8c5df2878fa9acfd1eb8bb744682f390c35 Mon Sep 17 00:00:00 2001
From: qweqnotallow <747839893@qq.com>
Date: Tue, 21 May 2024 09:36:28 +0800
Subject: [PATCH 153/302] dss server: add type

---
 .../server/restful/DSSFrameworkOrchestratorRestful.java         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/restful/DSSFrameworkOrchestratorRestful.java b/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/restful/DSSFrameworkOrchestratorRestful.java
index 1f7c57d93..756a04251 100644
--- a/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/restful/DSSFrameworkOrchestratorRestful.java
+++ b/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/restful/DSSFrameworkOrchestratorRestful.java
@@ -402,7 +402,7 @@ public Message getHistory(@RequestParam Long orchestratorId, @RequestParam Strin
     }
 
     @RequestMapping(value = "allType", method = RequestMethod.GET)
-    public Message allType(@RequestParam Long orchestratorId, @RequestParam String projectName) {
+    public Message allType(HttpServletRequest req) {
         Workspace workspace = SSOHelper.getWorkspace(httpServletRequest);
         String userName = SecurityFilter.getLoginUsername(httpServletRequest);
 

From b1f00c0d6df062ce9523982f83b3ddc5eb369c1f Mon Sep 17 00:00:00 2001
From: qweqnotallow <747839893@qq.com>
Date: Tue, 21 May 2024 11:20:54 +0800
Subject: [PATCH 154/302] dss server: add orchestrator/orchestrator_version to
 BMLResource

---
 .../server/service/OrchestratorService.java   |  3 +++
 .../service/impl/OrchestratorServiceImpl.java | 10 ++++++++++
 .../receiver/DSSOrchestratorChooser.scala     |  1 +
 .../receiver/DSSOrchestratorReceiver.scala    |  5 ++++-
 .../service/impl/DSSProjectServiceImpl.java   |  2 +-
 .../RequestQuertByAppIdOrchestrator.java      | 20 +++++++++++++++++++
 .../workflow/io/export/MetaExportService.java |  3 ++-
 .../io/export/impl/MetaExportServiceImpl.java |  9 ++++++++-
 .../impl/WorkFlowExportServiceImpl.java       | 18 ++++++++++++++++-
 9 files changed, 66 insertions(+), 5 deletions(-)
 create mode 100644 dss-orchestrator/dss-orchestrator-common/src/main/java/com/webank/wedatasphere/dss/orchestrator/common/protocol/RequestQuertByAppIdOrchestrator.java

diff --git a/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/OrchestratorService.java b/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/OrchestratorService.java
index 346151aba..39baeac40 100644
--- a/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/OrchestratorService.java
+++ b/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/OrchestratorService.java
@@ -24,6 +24,7 @@
 import com.webank.wedatasphere.dss.framework.common.exception.DSSFrameworkErrorException;
 import com.webank.wedatasphere.dss.orchestrator.common.entity.DSSOrchestratorInfo;
 import com.webank.wedatasphere.dss.orchestrator.common.entity.DSSOrchestratorVersion;
+import com.webank.wedatasphere.dss.orchestrator.common.entity.OrchestratorInfo;
 import com.webank.wedatasphere.dss.orchestrator.common.entity.OrchestratorVo;
 import com.webank.wedatasphere.dss.orchestrator.common.protocol.RequestOrchestratorInfos;
 import com.webank.wedatasphere.dss.orchestrator.common.protocol.ResponseOrchestratorInfos;
@@ -144,4 +145,6 @@ String rollbackOrchestrator(String username, Long projectId, String projectName,
 
     String getAuthenToken(String gitUrl, String gitUsername, String gitPassword) throws ExecutionException;
 
+    OrchestratorVo getOrchestratorByAppId(Long appId);
+
 }
diff --git a/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/impl/OrchestratorServiceImpl.java b/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/impl/OrchestratorServiceImpl.java
index 7b77be9c6..c03ee7457 100644
--- a/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/impl/OrchestratorServiceImpl.java
+++ b/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/impl/OrchestratorServiceImpl.java
@@ -38,6 +38,7 @@
 import com.webank.wedatasphere.dss.git.common.protocol.util.UrlUtils;
 import com.webank.wedatasphere.dss.orchestrator.common.entity.DSSOrchestratorInfo;
 import com.webank.wedatasphere.dss.orchestrator.common.entity.DSSOrchestratorVersion;
+import com.webank.wedatasphere.dss.orchestrator.common.entity.OrchestratorInfo;
 import com.webank.wedatasphere.dss.orchestrator.common.entity.OrchestratorVo;
 import com.webank.wedatasphere.dss.orchestrator.common.protocol.RequestOrchestratorInfos;
 import com.webank.wedatasphere.dss.orchestrator.common.protocol.RequestProjectUpdateOrcVersion;
@@ -666,4 +667,13 @@ private WebDriver generateChromeDriver(String path, Proxy seleniumProxy) throws
         return new ChromeDriver(options);
     }
 
+    @Override
+    public OrchestratorVo getOrchestratorByAppId(Long appId) {
+        OrchestratorInfo orcInfoByAppId = orchestratorMapper.getOrcInfoByAppId(appId);
+        if (orcInfoByAppId == null) {
+            return null;
+        }
+        return getOrchestratorVoById(orcInfoByAppId.getOrchestratorId());
+    }
+
 }
\ No newline at end of file
diff --git a/dss-framework/dss-framework-orchestrator-server/src/main/scala/com/webank/wedatasphere/dss/orchestrator/server/receiver/DSSOrchestratorChooser.scala b/dss-framework/dss-framework-orchestrator-server/src/main/scala/com/webank/wedatasphere/dss/orchestrator/server/receiver/DSSOrchestratorChooser.scala
index b26472b07..60966f99c 100644
--- a/dss-framework/dss-framework-orchestrator-server/src/main/scala/com/webank/wedatasphere/dss/orchestrator/server/receiver/DSSOrchestratorChooser.scala
+++ b/dss-framework/dss-framework-orchestrator-server/src/main/scala/com/webank/wedatasphere/dss/orchestrator/server/receiver/DSSOrchestratorChooser.scala
@@ -52,6 +52,7 @@ class DSSOrchestratorChooser extends ReceiverChooser {
     case _: RequestOrchestratorVersion => receiver
     case _: RequestOrchestratorInfos => receiver
     case _: RequestQueryByIdOrchestrator => receiver
+    case _: RequestQuertByAppIdOrchestrator => receiver
     case _ => None
   }
 }
\ No newline at end of file
diff --git a/dss-framework/dss-framework-orchestrator-server/src/main/scala/com/webank/wedatasphere/dss/orchestrator/server/receiver/DSSOrchestratorReceiver.scala b/dss-framework/dss-framework-orchestrator-server/src/main/scala/com/webank/wedatasphere/dss/orchestrator/server/receiver/DSSOrchestratorReceiver.scala
index 6044b61da..c504e4bb1 100644
--- a/dss-framework/dss-framework-orchestrator-server/src/main/scala/com/webank/wedatasphere/dss/orchestrator/server/receiver/DSSOrchestratorReceiver.scala
+++ b/dss-framework/dss-framework-orchestrator-server/src/main/scala/com/webank/wedatasphere/dss/orchestrator/server/receiver/DSSOrchestratorReceiver.scala
@@ -90,13 +90,16 @@ class DSSOrchestratorReceiver(orchestratorService: OrchestratorService, orchestr
     case requestQueryByIdOrchestrator: RequestQueryByIdOrchestrator => {
       val orcVersionId = requestQueryByIdOrchestrator.getOrcVersionId
       val orchestratorId = requestQueryByIdOrchestrator.getOrchestratorId
-      if (orchestratorId != null) {
+      if (orcVersionId != null) {
         orchestratorService.getOrchestratorVoByIdAndOrcVersionId(orchestratorId, orcVersionId)
       } else {
         orchestratorService.getOrchestratorVoById(orchestratorId)
       }
     }
 
+    case requestQuertByAppIdOrchestrator: RequestQuertByAppIdOrchestrator =>
+      orchestratorService.getOrchestratorByAppId(requestQuertByAppIdOrchestrator.getAppId)
+
     case _ => throw new DSSErrorException(90000, "Not support message type " + message)
   }
 
diff --git a/dss-framework/dss-framework-project-server/src/main/java/com/webank/wedatasphere/dss/framework/project/service/impl/DSSProjectServiceImpl.java b/dss-framework/dss-framework-project-server/src/main/java/com/webank/wedatasphere/dss/framework/project/service/impl/DSSProjectServiceImpl.java
index be988ea84..cd51059d0 100644
--- a/dss-framework/dss-framework-project-server/src/main/java/com/webank/wedatasphere/dss/framework/project/service/impl/DSSProjectServiceImpl.java
+++ b/dss-framework/dss-framework-project-server/src/main/java/com/webank/wedatasphere/dss/framework/project/service/impl/DSSProjectServiceImpl.java
@@ -500,7 +500,7 @@ public void importProject(ProjectInfoVo projectInfo, BmlResource importResource,
      * @param projectPath 项目目录
      * @throws IOException
      */
-    private  void exportProjectMeta(  DSSProjectDO projectDO, String projectPath) throws Exception {
+    private  void exportProjectMeta(DSSProjectDO projectDO, String projectPath) throws Exception {
         String path = projectPath + File.separator + PROJECT_META_FILE_NAME;
         File projectMetaFile = new File(path);
         if (!projectMetaFile.exists()) {
diff --git a/dss-orchestrator/dss-orchestrator-common/src/main/java/com/webank/wedatasphere/dss/orchestrator/common/protocol/RequestQuertByAppIdOrchestrator.java b/dss-orchestrator/dss-orchestrator-common/src/main/java/com/webank/wedatasphere/dss/orchestrator/common/protocol/RequestQuertByAppIdOrchestrator.java
new file mode 100644
index 000000000..24c197d6b
--- /dev/null
+++ b/dss-orchestrator/dss-orchestrator-common/src/main/java/com/webank/wedatasphere/dss/orchestrator/common/protocol/RequestQuertByAppIdOrchestrator.java
@@ -0,0 +1,20 @@
+package com.webank.wedatasphere.dss.orchestrator.common.protocol;
+
+public class RequestQuertByAppIdOrchestrator {
+    private Long appId;
+
+    public RequestQuertByAppIdOrchestrator(Long appId) {
+        this.appId = appId;
+    }
+
+    public RequestQuertByAppIdOrchestrator() {
+    }
+
+    public Long getAppId() {
+        return appId;
+    }
+
+    public void setAppId(Long appId) {
+        this.appId = appId;
+    }
+}
diff --git a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/io/export/MetaExportService.java b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/io/export/MetaExportService.java
index 47a47ff09..2181f14bb 100644
--- a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/io/export/MetaExportService.java
+++ b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/io/export/MetaExportService.java
@@ -16,6 +16,7 @@
 
 package com.webank.wedatasphere.dss.workflow.io.export;
 
+import com.webank.wedatasphere.dss.orchestrator.common.entity.OrchestratorVo;
 import com.webank.wedatasphere.dss.workflow.common.entity.DSSFlow;
 import com.webank.wedatasphere.dss.workflow.common.entity.DSSFlowRelation;
 
@@ -26,6 +27,6 @@ public interface MetaExportService {
 
 
     void exportFlowBaseInfo(List<DSSFlow> allDSSFlows, List<DSSFlowRelation> allFlowRelations, String savePath) throws IOException;
-    void exportFlowBaseInfoNew(List<DSSFlow> allDSSFlows, List<DSSFlowRelation> allFlowRelations, String savePath) throws IOException;
+    void exportFlowBaseInfoNew(OrchestratorVo orchestratorVo, List<DSSFlow> allDSSFlows, List<DSSFlowRelation> allFlowRelations, String savePath) throws IOException;
 
 }
diff --git a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/io/export/impl/MetaExportServiceImpl.java b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/io/export/impl/MetaExportServiceImpl.java
index 5b1c7a05e..019ea3ec0 100644
--- a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/io/export/impl/MetaExportServiceImpl.java
+++ b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/io/export/impl/MetaExportServiceImpl.java
@@ -19,10 +19,13 @@
 import com.google.gson.GsonBuilder;
 import com.webank.wedatasphere.dss.common.utils.DSSCommonUtils;
 import com.webank.wedatasphere.dss.common.utils.IoUtils;
+import com.webank.wedatasphere.dss.orchestrator.common.entity.OrchestratorVo;
+import com.webank.wedatasphere.dss.sender.service.DSSSenderServiceFactory;
 import com.webank.wedatasphere.dss.workflow.common.entity.DSSFlow;
 import com.webank.wedatasphere.dss.workflow.common.entity.DSSFlowRelation;
 import com.webank.wedatasphere.dss.workflow.io.export.MetaExportService;
 import com.webank.wedatasphere.dss.workflow.io.export.MetaWriter;
+import org.apache.linkis.rpc.Sender;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;
@@ -38,11 +41,13 @@ public class MetaExportServiceImpl implements MetaExportService {
     public static final String FLOW_META_FILE_NAME = ".flowmeta";
     public static final String FLOW_META_KEY = "dss_flow";
     public static final String FLOW_RELATION_META_KEY = "dss_flow_relation";
+    public static final String ORCHESTRATOR_META_KEY = "dss_orchestrator";
+    public static final String ORCHESTRATOR_VERSION_META_KEY = "dss_orchestrator_version";
 
     private final String fileName = "meta.txt";
 
     @Override
-    public void exportFlowBaseInfoNew(List<DSSFlow> allDSSFlows, List<DSSFlowRelation> allFlowRelations, String savePath) throws IOException {
+    public void exportFlowBaseInfoNew(OrchestratorVo orchestratorVo, List<DSSFlow> allDSSFlows, List<DSSFlowRelation> allFlowRelations, String savePath) throws IOException {
 
         try (
                 OutputStream outputStream = IoUtils.generateExportOutputStream(savePath + File.separator + FLOW_META_FILE_NAME)
@@ -50,6 +55,8 @@ public void exportFlowBaseInfoNew(List<DSSFlow> allDSSFlows, List<DSSFlowRelatio
             Map<String, Object> flowMetaMap = new HashMap<>(2);
             flowMetaMap.put(FLOW_META_KEY, allDSSFlows);
             flowMetaMap.put(FLOW_RELATION_META_KEY, allFlowRelations);
+            flowMetaMap.put(ORCHESTRATOR_META_KEY, orchestratorVo.getDssOrchestratorInfo());
+            flowMetaMap.put(ORCHESTRATOR_VERSION_META_KEY, orchestratorVo.getDssOrchestratorVersion());
             String flowMetaStr = new GsonBuilder().setPrettyPrinting().create().toJson(flowMetaMap);
             org.apache.commons.io.IOUtils.write(flowMetaStr,outputStream,"UTF-8");
         }
diff --git a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/io/export/impl/WorkFlowExportServiceImpl.java b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/io/export/impl/WorkFlowExportServiceImpl.java
index ba3c312dd..af069b4a2 100644
--- a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/io/export/impl/WorkFlowExportServiceImpl.java
+++ b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/io/export/impl/WorkFlowExportServiceImpl.java
@@ -23,11 +23,20 @@
 import com.webank.wedatasphere.dss.common.entity.node.DSSEdge;
 import com.webank.wedatasphere.dss.common.entity.node.DSSNode;
 import com.webank.wedatasphere.dss.common.entity.node.Node;
+import com.webank.wedatasphere.dss.common.entity.project.DSSProject;
 import com.webank.wedatasphere.dss.common.exception.DSSErrorException;
 import com.webank.wedatasphere.dss.common.exception.DSSRuntimeException;
 import com.webank.wedatasphere.dss.common.label.DSSLabel;
+import com.webank.wedatasphere.dss.common.protocol.project.ProjectInfoRequest;
 import com.webank.wedatasphere.dss.common.utils.IoUtils;
+import com.webank.wedatasphere.dss.common.utils.RpcAskUtils;
 import com.webank.wedatasphere.dss.common.utils.ZipHelper;
+import com.webank.wedatasphere.dss.orchestrator.common.entity.OrchestratorVo;
+import com.webank.wedatasphere.dss.orchestrator.common.protocol.RequestOrchestratorInfos;
+import com.webank.wedatasphere.dss.orchestrator.common.protocol.RequestQuertByAppIdOrchestrator;
+import com.webank.wedatasphere.dss.orchestrator.common.protocol.RequestQueryByIdOrchestrator;
+import com.webank.wedatasphere.dss.orchestrator.common.protocol.ResponseOrchestratorInfos;
+import com.webank.wedatasphere.dss.sender.service.DSSSenderServiceFactory;
 import com.webank.wedatasphere.dss.standard.app.sso.Workspace;
 import com.webank.wedatasphere.dss.workflow.common.entity.DSSFlow;
 import com.webank.wedatasphere.dss.workflow.common.entity.DSSFlowRelation;
@@ -43,6 +52,7 @@
 import com.webank.wedatasphere.dss.workflow.service.DSSFlowService;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang.StringUtils;
+import org.apache.linkis.rpc.Sender;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -92,6 +102,9 @@ public class WorkFlowExportServiceImpl implements WorkFlowExportService {
     @Autowired
     private DSSFlowService flowService;
 
+    protected Sender getOrchestratorSender() {
+        return DSSSenderServiceFactory.getOrCreateServiceInstance().getOrcSender();
+    }
 
 
     @Override
@@ -105,11 +118,14 @@ public String exportFlowInfoNew(Long dssProjectId, String projectName, long root
         //生成rootflow及所有子flow的Relations
         List<Long> flowIds = dssFlowList.stream().map(DSSFlow::getId).collect(Collectors.toList());
         List<DSSFlowRelation> flowRelations = flowIds.isEmpty() ? new ArrayList<>() : flowMapper.listFlowRelation(flowIds);
+        // 生成rootflow orchestrator信息
+        OrchestratorVo orchestratorVo = RpcAskUtils.processAskException(getOrchestratorSender().ask(new RequestQuertByAppIdOrchestrator(rootFlowId)),
+                OrchestratorVo.class, RequestQueryByIdOrchestrator.class);
         // /appcom/tmp/dss/yyyyMMddHHmmssSSS/projectxxx
         String projectPath = IoUtils.generateProjectIOPath(userName, projectName);
         // /appcom/tmp/dss/yyyyMMddHHmmssSSS/projectxxx/.flowmeta/flow_all_type_node/
         String flowMetaPath = IoUtils.generateFlowMetaIOPath(projectPath, rootFlow.getName());
-        metaExportService.exportFlowBaseInfoNew(dssFlowList, flowRelations, flowMetaPath);
+        metaExportService.exportFlowBaseInfoNew(orchestratorVo, dssFlowList, flowRelations, flowMetaPath);
         logger.info(userName + "-开始导出Flow：" + rootFlow.getName());
         List<DSSFlow> dssFlows = new ArrayList<>();
         for (DSSFlow dssFlow : dssFlowList) {

From 066ec8132712ecc4e853732e76f456bce13700fd Mon Sep 17 00:00:00 2001
From: qweqnotallow <747839893@qq.com>
Date: Tue, 21 May 2024 17:46:03 +0800
Subject: [PATCH 155/302] git server : add error exception

---
 .../protocol/exception/GitErrorException.java |  15 ++
 .../response/GitArchivePorjectResponse.java   |   6 +-
 .../DSSGitWorkflowManagerServiceImpl.java     |   6 +-
 .../dss/git/utils/DSSGitUtils.java            | 245 ++++++++----------
 4 files changed, 122 insertions(+), 150 deletions(-)
 create mode 100644 dss-git/dss-git-common/src/main/java/com.webank.wedatasphere.dss.git.common/protocol/exception/GitErrorException.java

diff --git a/dss-git/dss-git-common/src/main/java/com.webank.wedatasphere.dss.git.common/protocol/exception/GitErrorException.java b/dss-git/dss-git-common/src/main/java/com.webank.wedatasphere.dss.git.common/protocol/exception/GitErrorException.java
new file mode 100644
index 000000000..9d1fa4a8f
--- /dev/null
+++ b/dss-git/dss-git-common/src/main/java/com.webank.wedatasphere.dss.git.common/protocol/exception/GitErrorException.java
@@ -0,0 +1,15 @@
+package com.webank.wedatasphere.dss.git.common.protocol.exception;
+
+import com.webank.wedatasphere.dss.common.exception.DSSErrorException;
+
+public class GitErrorException extends DSSErrorException {
+
+    public GitErrorException(int errCode, String desc) {
+        super(errCode, desc);
+    }
+
+    public GitErrorException(int errCode, String desc, Throwable cause) {
+        super(errCode, desc);
+        initCause(cause);
+    }
+}
diff --git a/dss-git/dss-git-common/src/main/java/com.webank.wedatasphere.dss.git.common/protocol/response/GitArchivePorjectResponse.java b/dss-git/dss-git-common/src/main/java/com.webank.wedatasphere.dss.git.common/protocol/response/GitArchivePorjectResponse.java
index c3dc80508..88884222a 100644
--- a/dss-git/dss-git-common/src/main/java/com.webank.wedatasphere.dss.git.common/protocol/response/GitArchivePorjectResponse.java
+++ b/dss-git/dss-git-common/src/main/java/com.webank.wedatasphere.dss.git.common/protocol/response/GitArchivePorjectResponse.java
@@ -1,7 +1,7 @@
 package com.webank.wedatasphere.dss.git.common.protocol.response;
 
 
-public class GitArchivePorjectResponse extends GitBaseResponse {
+public class GitArchivePorjectResponse{
     private String projectName;
 
     public GitArchivePorjectResponse(String projectName) {
@@ -11,10 +11,6 @@ public GitArchivePorjectResponse(String projectName) {
     public GitArchivePorjectResponse() {
     }
 
-    public GitArchivePorjectResponse(String status, int index, String message) {
-        super(status, index, message);
-    }
-
     public String getProjectName() {
         return projectName;
     }
diff --git a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitWorkflowManagerServiceImpl.java b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitWorkflowManagerServiceImpl.java
index 011dea7a0..91ae4885b 100644
--- a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitWorkflowManagerServiceImpl.java
+++ b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitWorkflowManagerServiceImpl.java
@@ -67,7 +67,7 @@ public GitDiffResponse diff(GitDiffRequest request) {
             }
             diff = DSSGitUtils.diff(request.getProjectName(), fileList);
             // 重置本地
-            DSSGitUtils.reset(request.getProjectName());
+            DSSGitUtils.reset(repository, request.getProjectName());
         } catch (Exception e) {
             logger.error("pull failed, the reason is ",e);
         }
@@ -346,7 +346,7 @@ public GitFileContentResponse getFileContent(GitFileContentRequest request) {
             // 本地保持最新状态
             DSSGitUtils.pull(repository, request.getProjectName(), gitUser);
 
-            String content = DSSGitUtils.getTargetCommitFileContent(request.getProjectName(), request.getCommitId(), request.getFilePath());
+            String content = DSSGitUtils.getTargetCommitFileContent(repository, request.getProjectName(), request.getCommitId(), request.getFilePath());
             String fullpath = File.separator + FileUtils.normalizePath(GitServerConfig.GIT_SERVER_PATH.getValue()) + File.separator + FileUtils.normalizePath(request.getFilePath());
             File file = new File(fullpath);
             String fileName = file.getName();
@@ -451,7 +451,7 @@ public GitCommitResponse gitCheckOut(GitRevertRequest request) throws IOExceptio
             // 本地保持最新状态
             DSSGitUtils.pull(repository, request.getProjectName(), gitUser);
             // 回滚
-            DSSGitUtils.checkoutTargetCommit(request);
+            DSSGitUtils.checkoutTargetCommit(repository, request);
             // push
             DSSGitUtils.push(repository, request.getProjectName(), gitUser, "revert by : " + request.getUsername());
 
diff --git a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/utils/DSSGitUtils.java b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/utils/DSSGitUtils.java
index c5f0a43e5..2575dc591 100644
--- a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/utils/DSSGitUtils.java
+++ b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/utils/DSSGitUtils.java
@@ -3,12 +3,14 @@
 import com.webank.wedatasphere.dss.common.exception.DSSErrorException;
 import com.webank.wedatasphere.dss.git.common.protocol.GitTree;
 import com.webank.wedatasphere.dss.git.common.protocol.GitUserEntity;
+import com.webank.wedatasphere.dss.git.common.protocol.exception.GitErrorException;
 import com.webank.wedatasphere.dss.git.common.protocol.request.GitBaseRequest;
 import com.webank.wedatasphere.dss.git.common.protocol.request.GitRevertRequest;
 import com.webank.wedatasphere.dss.git.common.protocol.response.GitDiffResponse;
 import com.webank.wedatasphere.dss.git.common.protocol.response.GitCommitResponse;
 import com.webank.wedatasphere.dss.git.common.protocol.response.GitHistoryResponse;
 import com.webank.wedatasphere.dss.git.common.protocol.config.GitServerConfig;
+import com.webank.wedatasphere.dss.git.common.protocol.util.UrlUtils;
 import com.webank.wedatasphere.dss.git.constant.DSSGitConstant;
 import org.apache.http.HttpEntity;
 import org.apache.http.client.methods.CloseableHttpResponse;
@@ -48,7 +50,7 @@
 public class DSSGitUtils {
     private static final Logger logger = LoggerFactory.getLogger(DSSGitUtils.class);
 
-    public static void init(String projectName, GitUserEntity gitUserDO) throws DSSErrorException {
+    public static void init(String projectName, GitUserEntity gitUserDO) {
         if (checkProjectName(projectName, gitUserDO)) {
             try {
                 URL url = new URL(GitServerConfig.GIT_URL_PRE.getValue() + GitServerConfig.GIT_RESTFUL_API_CREATE_PROJECTS.getValue());
@@ -71,28 +73,30 @@ public static void init(String projectName, GitUserEntity gitUserDO) throws DSSE
                 connection.disconnect();
                 logger.info("init success");
             } catch (Exception e) {
-               logger.error("init failed by ", e);
+               throw new GitErrorException(80001, "git init failed, the reason is: ", e);
             }
         } else {
-            logger.info("projectName {} already exists", projectName);
+            throw new GitErrorException(80001, "git init failed, the reason is: projectName " + projectName +" already exists");
         }
     }
 
     public static void remote(Repository repository, String projectName, GitUserEntity gitUser) {
-        File repoDir = new File(File.separator + FileUtils.normalizePath(GitServerConfig.GIT_SERVER_PATH.getValue()) + File.separator + projectName + File.separator + ".git");
-
+        // 拼接git remote Url
+        String remoteUrl = GitServerConfig.GIT_URL_PRE.getValue() + gitUser.getGitUser() + File.separator + projectName + ".git";
         try {
             Git git = new Git(repository);
 
             // 添加远程仓库引用
             git.remoteAdd()
                     .setName("origin")
-                    .setUri(new URIish(GitServerConfig.GIT_URL_PRE.getValue() + gitUser.getGitUser() + File.separator + projectName +".git"))
+                    .setUri(new URIish(remoteUrl))
                     .call();
 
             logger.info("remote success");
-        } catch (GitAPIException | URISyntaxException e) {
-            logger.error("remote failed by : ", e);
+        } catch (URISyntaxException e) {
+            throw new GitErrorException(80001, "connect Uri " + remoteUrl +" failed, the reason is: ", e);
+        } catch (GitAPIException  e) {
+            throw new GitErrorException(80001, "remote git failed, the reason is: ", e);
         }
 
     }
@@ -101,7 +105,7 @@ public static void remote(Repository repository, String projectName, GitUserEnti
     public static void create(String projectName, GitUserEntity gitUserDO) {
         logger.info("start success");
         File repoDir = new File(File.separator + FileUtils.normalizePath(GitServerConfig.GIT_SERVER_PATH.getValue()) + File.separator + projectName); // 指定仓库的目录
-        File respo = new File(File.separator + FileUtils.normalizePath(GitServerConfig.GIT_SERVER_PATH.getValue()) + File.separator +  projectName + File.separator +".git");
+        File respo = new File(generateGitPath(projectName));
         if (!respo.exists()) {
             try {
                 // 初始化仓库
@@ -113,47 +117,42 @@ public static void create(String projectName, GitUserEntity gitUserDO) {
 
                 git.close(); // 不再需要时关闭Git对象
             } catch (GitAPIException e) {
-                logger.error("gitCreate failed by : ", e);
+                throw new GitErrorException(80001, "git Create failed, the reason is: ", e);
             }
+        } else {
+            logger.info(respo + " already exists");
         }
     }
 
     public static void pull(Repository repository, String projectName, GitUserEntity gitUser) {
         try {
-            // Opening the repository
             Git git = new Git(repository);
 
-            // Pulling changes from the remote repository
-            PullCommand pullCmd = git.pull().setCredentialsProvider(new UsernamePasswordCredentialsProvider(gitUser.getGitUser(), gitUser.getGitToken()));
-            PullResult result = pullCmd.call();
-
-            // Checking the pull result
-            if(result.isSuccessful()) {
-                logger.info("Pull successful!");
-            } else {
-                logger.info("Pull failed: " + result.toString());
-                // 冲突时以远程仓库为准
-                if (result.getMergeResult().getConflicts() != null) {
-                    logger.info("Conflicts occurred. Resolving with remote as priority...");
-                    result.getMergeResult().getConflicts().keySet().forEach(path -> {
-                        try {
-                            // 检出冲突文件的远程版本
-                            git.checkout().setStartPoint("origin/" + result.getFetchResult().getTrackingRefUpdates().iterator().next().getRemoteName())
-                                    .addPath(path)
-                                    .call();
-                            // 添加解决后的文件到暂存区
-                            git.add().addFilepattern(path).call();
-                        } catch (GitAPIException e) {
-                            e.printStackTrace();
-                        }
-                    });
-                    // 提交合并
-                    git.commit().setMessage("Merge resolved with remote as priority").call();
+            int i = 1;
+            while (true) {
+                i += 1;
+                // 拉取远程仓库更新至本地
+                PullCommand pullCmd = git.pull().setCredentialsProvider(new UsernamePasswordCredentialsProvider(gitUser.getGitUser(), gitUser.getGitToken()));
+                PullResult result = pullCmd.call();
+
+                // 成功直接返回，失败清空本地修改重试最多3次
+                if (result.isSuccessful()) {
+                    logger.info("Pull successful!");
+                    break;
+                } else if (i <= 3){
+                    logger.info("Pull failed : " + result.toString());
+                    // 冲突时以远程仓库为准
+                    if (result.getMergeResult().getConflicts() != null) {
+                        logger.info("Conflicts occurred. Resolving with remote as priority...");
+                        // 丢失本地修改，处理冲突
+                        reset(repository, projectName);
+                    }
+                }else {
+                    throw new GitErrorException(80001, "git pull failed");
                 }
             }
-
         } catch (Exception e) {
-            logger.error("pull failed, the reason is ",e);
+            throw new GitErrorException(80001, "git pull failed, the reason is: ", e);
         }
     }
 
@@ -232,46 +231,43 @@ public static void push(Repository repository, String projectName, GitUserEntity
 
             logger.info("Changes pushed to remote repository.");
         } catch (GitAPIException e) {
-            logger.error("push failed, the reeason is ", e);
+            reset(repository, projectName);
+            throw new GitErrorException(80001, "git push failed, the reason is: ", e);
         }
     }
 
 
-    public static void reset(String projectName) {
-        String repoPath = File.separator + FileUtils.normalizePath(GitServerConfig.GIT_SERVER_PATH.getValue()) + File.separator + projectName + File.separator + ".git"; // 仓库路径
-        try (Repository repository = new FileRepositoryBuilder()
-                .setGitDir(new File(repoPath))
-                .build();
-             Git git = new Git(repository)) {
+    public static void reset(Repository repository, String projectName) {
+        try {
+            Git git = new Git(repository);
 
             git.reset().setMode(ResetCommand.ResetType.HARD).call();
 
             git.clean().setForce(true).setCleanDirectories(true).call();
 
-            logger.info("File has been unstaged: " + projectName);
-        } catch (GitAPIException | IOException e) {
-            logger.error("reset failed, the reason is ", e);
+            logger.info("git reset success : " + projectName);
+        } catch (GitAPIException e) {
+            throw new GitErrorException(80001, "git reset failed, the reason is: ", e);
         }
     }
 
-    public static void checkoutTargetCommit(GitRevertRequest request) throws GitAPIException, IOException {
+    public static void checkoutTargetCommit(Repository repository, GitRevertRequest request) throws GitAPIException, IOException {
         File repoDir = new File(File.separator + FileUtils.normalizePath(GitServerConfig.GIT_SERVER_PATH.getValue()) + File.separator + request.getProjectName()+ File.separator + ".git");
         String commitId = request.getCommitId(); // 替换为目标commit的完整哈希值
 
-        try (Repository repository = new FileRepositoryBuilder().setGitDir(repoDir).build();
-             Git git = new Git(repository)) {
-
+        try {
+            Git git = new Git(repository);
             // 检出（回滚）指定commit的文件版本
             git.checkout()
                     .setStartPoint(commitId)
                     .addPath(request.getPath())
                     .call();
 
+            logger.info("git check out success");
             logger.info("File " + repoDir.getAbsolutePath() + " has been rolled back to the version at commit: " + commitId);
 
-        } catch (GitAPIException | IOException e) {
-            logger.error("check out failed by : ", e);
-            throw e;
+        } catch (GitAPIException e) {
+            throw new GitErrorException(80001, "git check out failed, the reason is: ", e);
         }
     }
 
@@ -286,8 +282,7 @@ public static boolean checkProjectName(String name, GitUserEntity gitUser) throw
             } catch (DSSErrorException e) {
                 logger.info("getAllProjectName failed, try again");
                 if (retry >= 3) {
-                    logger.error("getAllProjectName failed, the reason is: ", e);
-                    throw new DSSErrorException(01001, "getAllProjectName failed");
+                    throw new GitErrorException(80001, "getAllProjectName failed, the reason is: ", e);
                 }
             }
         }
@@ -300,7 +295,7 @@ public static List<String> getAllProjectName(GitUserEntity gitUserDO) throws DSS
 
         List<String> projectNames = new ArrayList<>();
         do {
-        String gitLabUrl = "***REMOVED***/api/v4/projects?per_page=100&page=" + page; // 修改为你的GitLab实例的URL
+        String gitLabUrl = UrlUtils.normalizeIp(GitServerConfig.GIT_URL_PRE.getValue()) + "/api/v4/projects?per_page=100&page=" + page; // 修改为你的GitLab实例的URL
         // 创建HttpClient实例
         try (CloseableHttpClient httpClient = HttpClients.createDefault()) {
             // 创建HttpGet请求
@@ -320,13 +315,11 @@ public static List<String> getAllProjectName(GitUserEntity gitUserDO) throws DSS
                 logger.info("projectNames is: {}", projectNames.toString());
                 // 添加到总项目列表中
                 allProjectNames.addAll(projectNames);
-            } catch (Exception e) {
-                logger.error("getProjectsName failed, the reason is JSON: ", e);
-                throw new DSSErrorException(010001, "json 解析失败");
             }
         } catch (IOException e) {
-            logger.info("getProjectsName failed, the reason is: ", e);
-            throw new DSSErrorException(010001, "Internal error，网络请求失败");
+            throw new GitErrorException(80001, "getProjectsName failed, the reason is ", e);
+        } catch (Exception e) {
+            throw new GitErrorException(80001, "getProjectsName failed, the reason is JSON: ", e);
         }
             page++;
         } while (projectNames.size() > 0);
@@ -381,15 +374,14 @@ public static Set<String> status(String projectName, List<String> fileList) {
 
             return tree;
         } catch (IOException | GitAPIException e) {
-            logger.error("get git status Failed, the reason is : ", e);
-            return new HashSet<>();
+            throw new GitErrorException(80001, "git status failed, the reason is : ", e);
         }
     }
 
     public static void archive(String projectName, GitUserEntity gitUserDO) {
         try {
             String projectUrlEncoded = java.net.URLEncoder.encode(gitUserDO.getGitUser() + "/" + projectName, "UTF-8");
-            URL url = new URL("***REMOVED***/api/v4/projects/" + projectUrlEncoded + "/archive");
+            URL url = new URL(GitServerConfig.GIT_URL_PRE + "/api/v4/projects/" + projectUrlEncoded + "/archive");
             HttpURLConnection conn = (HttpURLConnection) url.openConnection();
             conn.setRequestMethod("POST");
             conn.setRequestProperty("PRIVATE-TOKEN", gitUserDO.getGitToken());
@@ -410,7 +402,7 @@ public static void archive(String projectName, GitUserEntity gitUserDO) {
             logger.info(response.toString());
 
         } catch (Exception e) {
-            logger.error("archive failed by : ", e);
+            throw new GitErrorException(80001, "git archive failed, the reason is : ", e);
         }
     }
 
@@ -427,82 +419,56 @@ public static void archiveLocal(String projectName) {
             // 删除本地文件
             FileUtils.removeDirectory(File.separator + FileUtils.normalizePath(GitServerConfig.GIT_SERVER_PATH.getValue()) + File.separator + projectName);
             logger.info("Remote 'origin' removed successfully.");
-        } catch (GitAPIException | IOException e) {
-            logger.error("revert remote failed, the reason is: ",e);
-        }
-    }
-
-    public static void updateLocal(GitBaseRequest request, String filePath) {
-        File repoDir = new File(File.separator + FileUtils.normalizePath(GitServerConfig.GIT_SERVER_PATH.getValue()) + File.separator + request.getProjectName() + File.separator + ".git");
-        Repository repository = null;
-        try {
-            repository = new FileRepositoryBuilder().setGitDir(repoDir).build();
-        } catch (IOException e) {
-            logger.error("get remote repos Failed, the reason is : ", e);
-        }
-        try (Git git = new Git(repository)) {
-            git.reset().addPath(filePath).setMode(ResetCommand.ResetType.HARD).setRef("origin/master").call();
-            logger.info("File has been unstaged: " + filePath);
         } catch (GitAPIException e) {
-            logger.error("updateLocal repos Failed, the reason is : ", e);
+            throw new GitErrorException(80001, "git archive failed, the reason is : ", e);
+        } catch (IOException e) {
+            throw new GitErrorException(80001, "archive failed, the reason is : ", e);
         }
     }
 
-    public static String getTargetCommitFileContent(String projectName, String commitId, String filePath) {
-        String repoPath = File.separator + FileUtils.normalizePath(GitServerConfig.GIT_SERVER_PATH.getValue()) + File.separator + projectName + File.separator +".git";
+    public static String getTargetCommitFileContent(Repository repository, String projectName, String commitId, String filePath) {
         String content = "";
         try {
-            FileRepositoryBuilder repositoryBuilder = new FileRepositoryBuilder();
-            try (Repository repository = repositoryBuilder.setGitDir(new File(repoPath))
-                    .readEnvironment()
-                    .findGitDir()
-                    .build()) {
-
-                ObjectId lastCommitId = repository.resolve(commitId);
-
-                // Instantiate a RevWalk to walk over commits based on some criteria
-                try (RevWalk revWalk = new RevWalk(repository)) {
-                    RevCommit commit = revWalk.parseCommit(lastCommitId);
-                    RevTree tree = commit.getTree();
-                    logger.info("Having tree: " + tree);
-
-                    // Now use a TreeWalk to iterate over all files in the Tree recursively
-                    // You can set filters to narrow down the results if needed
-                    try (TreeWalk treeWalk = new TreeWalk(repository)) {
-                        treeWalk.addTree(tree);
-                        treeWalk.setRecursive(true);
-                        treeWalk.setFilter(PathFilter.create(filePath));
-                        if (!treeWalk.next()) {
-                            throw new IllegalStateException("Did not find expected file '" + filePath + "'");
-                        }
-
-                        ObjectId objectId = treeWalk.getObjectId(0);
-                        try {
-                            ObjectLoader loader = repository.open(objectId);
-                            byte[] bytes = loader.getBytes();
-                            content = new String(bytes);
-                            logger.info("File content: " + content);
-                        } catch (Exception e) {
-                            logger.error("getFileContent Failed, the reason is: ", e);
-                        }
+            // 获取最新的commitId
+            ObjectId lastCommitId = repository.resolve(commitId);
+            // 获取提交记录
+            try (RevWalk revWalk = new RevWalk(repository)) {
+                RevCommit commit = revWalk.parseCommit(lastCommitId);
+                RevTree tree = commit.getTree();
+                logger.info("Having tree: " + tree);
+                // 遍历获取最近提交记录
+                try (TreeWalk treeWalk = new TreeWalk(repository)) {
+                    treeWalk.addTree(tree);
+                    treeWalk.setRecursive(true);
+                    treeWalk.setFilter(PathFilter.create(filePath));
+                    if (!treeWalk.next()) {
+                        throw new IllegalStateException("Did not find expected file '" + filePath + "'");
                     }
 
-                    revWalk.dispose();
+                    ObjectId objectId = treeWalk.getObjectId(0);
+                    try {
+                        ObjectLoader loader = repository.open(objectId);
+                        byte[] bytes = loader.getBytes();
+                        content = new String(bytes);
+                        logger.info("File content: " + content);
+                    } catch (Exception e) {
+                        logger.error("getFileContent Failed, the reason is: ", e);
+                    }
                 }
+                revWalk.dispose();
             }
         } catch (IOException e) {
-            logger.error("getFileContent Failed, the reason is: ", e);
+            throw new GitErrorException(80001, "getFileContent failed, the reason is : ", e);
         }
         return content;
     }
 
-    public static void getCommitId(String projectName, int num) {
+    public static void getCommitId(Repository repository, String projectName, int num) {
         // 获取当前CommitId，
         File repoDir = new File(File.separator + FileUtils.normalizePath(GitServerConfig.GIT_SERVER_PATH.getValue()) + File.separator + projectName + File.separator +".git");
 
-        try (Repository repository = new FileRepositoryBuilder().setGitDir(repoDir).build();
-             Git git = new Git(repository)) {
-
+        try {
+            Git git = new Git(repository);
             Iterable<RevCommit> commits = git.log().setMaxCount(num).call();
             SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 
@@ -518,8 +484,8 @@ public static void getCommitId(String projectName, int num) {
                 logger.info("Commit Message: " + commitMessage);
                 logger.info("Commit Author: " + commitAuthor);
             }
-        } catch (IOException | GitAPIException e) {
-            logger.error("get git log failed, the reason is: ", e);
+        } catch (GitAPIException e) {
+            throw new GitErrorException(80001, "git log failed, the reason is : ", e);
         }
     }
 
@@ -540,8 +506,7 @@ public static GitCommitResponse getCurrentCommit(Repository repository) {
                 return commitResponse; // 返回commitId字符串
             }
         } catch (IOException e) {
-            logger.error("get current commit failed, the reason is : ", e);
-            return null;
+            throw new GitErrorException(80001, "get current commit failed, the reason is : ", e);
         }
     }
 
@@ -563,26 +528,20 @@ public static List<GitCommitResponse> getLatestCommit(Repository repository, Str
 
             return commitResponseList;
         } catch (GitAPIException e) {
-            logger.error("get latestCommitId failed, the reason is: ", e);
-            return null;
+            throw new GitErrorException(80001, "get latestCommitId failed, the reason is : ", e);
         }
     }
 
-    public static GitHistoryResponse listCommitsBetween(Repository repository, String startCommitId, String endCommitId) throws Exception {
+    public static GitHistoryResponse listCommitsBetween(Repository repository, String oldCommitId, String newCommitId) throws Exception {
         List<GitCommitResponse> gitCommitResponseList = new ArrayList<>();
 
-        ObjectId start = repository.resolve(startCommitId);
-        ObjectId end = repository.resolve(endCommitId);
-
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         try (RevWalk walk = new RevWalk(repository)) {
-            RevCommit startCommit = walk.parseCommit(start);
-            RevCommit endCommit = walk.parseCommit(end);
+            Git git = new Git(repository);
 
-            walk.markStart(startCommit);
-            if (endCommit.getParentCount() > 0) {  // Check if endCommit has any parents
-                walk.markUninteresting(walk.parseCommit(endCommit.getParent(0))); // Mark parent of end commit as uninteresting
-            }
+            Iterable<RevCommit> commits = git.log()
+                    .addRange(repository.resolve(oldCommitId), repository.resolve(newCommitId))
+                    .call();
 
             for (RevCommit commit : walk) {
                 PersonIdent authorIdent = commit.getAuthorIdent(); // 获取提交人信息
@@ -597,6 +556,8 @@ public static GitHistoryResponse listCommitsBetween(Repository repository, Strin
                 logger.info("Commit Message: " + commit.getFullMessage()); // 提交信息
                 logger.info("Author: " + authorIdent.getName() + " <" + authorIdent.getEmailAddress() + ">"); // 提交人
             }
+        } catch (Exception e) {
+            throw new GitErrorException(80001, "get log between " + oldCommitId + " and " + newCommitId + "failed, the reason is : ", e);
         }
         GitHistoryResponse historyResponse = new GitHistoryResponse();
         historyResponse.setResponses(gitCommitResponseList);

From 26badcc48c85aa641d6ded3a9158e187c516ef26 Mon Sep 17 00:00:00 2001
From: qweqnotallow <747839893@qq.com>
Date: Wed, 22 May 2024 09:31:52 +0800
Subject: [PATCH 156/302] git server : add exception

---
 .../request/GitCommitInfoBetweenRequest.java  | 47 +++++++++++++++++++
 .../DSSGitWorkflowManagerServiceImpl.java     | 28 ++++++++---
 .../dss/git/utils/DSSGitUtils.java            |  3 +-
 3 files changed, 71 insertions(+), 7 deletions(-)
 create mode 100644 dss-git/dss-git-common/src/main/java/com.webank.wedatasphere.dss.git.common/protocol/request/GitCommitInfoBetweenRequest.java

diff --git a/dss-git/dss-git-common/src/main/java/com.webank.wedatasphere.dss.git.common/protocol/request/GitCommitInfoBetweenRequest.java b/dss-git/dss-git-common/src/main/java/com.webank.wedatasphere.dss.git.common/protocol/request/GitCommitInfoBetweenRequest.java
new file mode 100644
index 000000000..0860f8abd
--- /dev/null
+++ b/dss-git/dss-git-common/src/main/java/com.webank.wedatasphere.dss.git.common/protocol/request/GitCommitInfoBetweenRequest.java
@@ -0,0 +1,47 @@
+package com.webank.wedatasphere.dss.git.common.protocol.request;
+
+public class GitCommitInfoBetweenRequest extends GitBaseRequest{
+    private String oldCommitId;
+    private String newCommitId;
+    private String dirName;
+
+    public GitCommitInfoBetweenRequest(String oldCommitId, String newCommitId, String dirName) {
+        this.oldCommitId = oldCommitId;
+        this.newCommitId = newCommitId;
+        this.dirName = dirName;
+    }
+
+    public GitCommitInfoBetweenRequest(Long workspaceId, String projectName, String oldCommitId, String newCommitId, String dirName) {
+        super(workspaceId, projectName);
+        this.oldCommitId = oldCommitId;
+        this.newCommitId = newCommitId;
+        this.dirName = dirName;
+    }
+
+    public GitCommitInfoBetweenRequest() {
+    }
+
+    public String getOldCommitId() {
+        return oldCommitId;
+    }
+
+    public void setOldCommitId(String oldCommitId) {
+        this.oldCommitId = oldCommitId;
+    }
+
+    public String getNewCommitId() {
+        return newCommitId;
+    }
+
+    public void setNewCommitId(String newCommitId) {
+        this.newCommitId = newCommitId;
+    }
+
+    public String getDirName() {
+        return dirName;
+    }
+
+    public void setDirName(String dirName) {
+        this.dirName = dirName;
+    }
+}
diff --git a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitWorkflowManagerServiceImpl.java b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitWorkflowManagerServiceImpl.java
index 91ae4885b..75cad15f1 100644
--- a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitWorkflowManagerServiceImpl.java
+++ b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitWorkflowManagerServiceImpl.java
@@ -91,7 +91,6 @@ public GitCommitResponse commit(GitCommitRequest request) {
         try (Repository repository = getRepository(repoDir, request.getProjectName(), gitUser)){
             // 解压BML文件到本地
             Map<String, BmlResource> bmlResourceMap = request.getBmlResourceMap();
-            List<String> fileList = new ArrayList<>(bmlResourceMap.keySet());
             // 本地保持最新状态
             DSSGitUtils.pull(repository, request.getProjectName(), gitUser);
             for (Map.Entry<String, BmlResource> entry : bmlResourceMap.entrySet()) {
@@ -305,7 +304,6 @@ public GitDeleteResponse delete(GitDeleteRequest request) {
         // 获取git仓库
         File repoDir = new File(gitPath);
         try (Repository repository = getRepository(repoDir, request.getProjectName(), gitUser)){
-            List<String> fileList = request.getDeleteFileList();
             // 本地保持最新状态
             DSSGitUtils.pull(repository, request.getProjectName(), gitUser);
             List<String> deleteFileList = request.getDeleteFileList();
@@ -342,7 +340,6 @@ public GitFileContentResponse getFileContent(GitFileContentRequest request) {
         // 获取git仓库
         File repoDir = new File(gitPath);
         try (Repository repository = getRepository(repoDir, request.getProjectName(), gitUser)){
-            List<String> fileList = Collections.singletonList(request.getFilePath());
             // 本地保持最新状态
             DSSGitUtils.pull(repository, request.getProjectName(), gitUser);
 
@@ -416,7 +413,6 @@ public GitCommitResponse getCurrentCommit(GitCurrentCommitRequest request) {
         // 获取git仓库
         File repoDir = new File(gitPath);
         try (Repository repository = getRepository(repoDir, request.getProjectName(), gitUser);){
-            List<String> fileList = Collections.singletonList(request.getFilepath());
             // 本地保持最新状态
             DSSGitUtils.pull(repository, request.getProjectName(), gitUser);
 
@@ -447,7 +443,6 @@ public GitCommitResponse gitCheckOut(GitRevertRequest request) throws IOExceptio
         // 获取git仓库
         File repoDir = new File(gitPath);
         try (Repository repository = getRepository(repoDir, request.getProjectName(), gitUser)){
-            List<String> fileList = Collections.singletonList(request.getPath());
             // 本地保持最新状态
             DSSGitUtils.pull(repository, request.getProjectName(), gitUser);
             // 回滚
@@ -481,7 +476,6 @@ public GitCommitResponse removeFile(GitRemoveRequest request) {
         // 获取git仓库
         File repoDir = new File(gitPath);
         try (Repository repository = getRepository(repoDir, request.getProjectName(), gitUser)){
-            List<String> fileList = request.getPath();
             // 本地保持最新状态
             DSSGitUtils.pull(repository, request.getProjectName(), gitUser);
             // 同步删除对应节点
@@ -541,4 +535,26 @@ public GitCommitResponse rename(GitRenameRequest request) {
         }
         return commitResponse;
     }
+
+    public GitHistoryResponse getHistory(GitCommitInfoBetweenRequest request) {
+        GitUserEntity gitUser = dssWorkspaceGitService.selectGit(request.getWorkspaceId(), GitConstant.GIT_ACCESS_WRITE_TYPE);
+        if (gitUser == null) {
+            logger.error("the workspace : {} don't associate with git", request.getWorkspaceId());
+            return null;
+        }
+        GitHistoryResponse response = new GitHistoryResponse();
+        // 拼接.git路径
+        String gitPath = DSSGitUtils.generateGitPath(request.getProjectName());
+        // 获取git仓库
+        File repoDir = new File(gitPath);
+        try (Repository repository = getRepository(repoDir, request.getProjectName(), gitUser)){
+            // 本地保持最新状态
+            DSSGitUtils.pull(repository, request.getProjectName(), gitUser);
+
+            response = DSSGitUtils.listCommitsBetween(repository, request.getOldCommitId(), request.getNewCommitId(), request.getDirName());
+        } catch (Exception e) {
+            logger.error("pull failed, the reason is ",e);
+        }
+        return response;
+    }
 }
diff --git a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/utils/DSSGitUtils.java b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/utils/DSSGitUtils.java
index 2575dc591..2ae3b588f 100644
--- a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/utils/DSSGitUtils.java
+++ b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/utils/DSSGitUtils.java
@@ -532,7 +532,7 @@ public static List<GitCommitResponse> getLatestCommit(Repository repository, Str
         }
     }
 
-    public static GitHistoryResponse listCommitsBetween(Repository repository, String oldCommitId, String newCommitId) throws Exception {
+    public static GitHistoryResponse listCommitsBetween(Repository repository, String oldCommitId, String newCommitId, String path) throws Exception {
         List<GitCommitResponse> gitCommitResponseList = new ArrayList<>();
 
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
@@ -541,6 +541,7 @@ public static GitHistoryResponse listCommitsBetween(Repository repository, Strin
 
             Iterable<RevCommit> commits = git.log()
                     .addRange(repository.resolve(oldCommitId), repository.resolve(newCommitId))
+                    .addPath(path)
                     .call();
 
             for (RevCommit commit : walk) {

From eb35e5ca0ba8fc90fc03a3cc0e5ee160ed8759b4 Mon Sep 17 00:00:00 2001
From: qweqnotallow <747839893@qq.com>
Date: Thu, 23 May 2024 09:34:39 +0800
Subject: [PATCH 157/302] git server : password token encrypt

---
 .../protocol/config/GitServerConfig.java      |  2 +
 .../protocol/request/GitUserInfoRequest.java  | 12 ++++
 .../impl/DSSWorkspaceGitServiceImpl.java      | 62 ++++++++++++++++++-
 3 files changed, 74 insertions(+), 2 deletions(-)

diff --git a/dss-git/dss-git-common/src/main/java/com.webank.wedatasphere.dss.git.common/protocol/config/GitServerConfig.java b/dss-git/dss-git-common/src/main/java/com.webank.wedatasphere.dss.git.common/protocol/config/GitServerConfig.java
index 3d3706f1e..0fcccc9f0 100644
--- a/dss-git/dss-git-common/src/main/java/com.webank.wedatasphere.dss.git.common/protocol/config/GitServerConfig.java
+++ b/dss-git/dss-git-common/src/main/java/com.webank.wedatasphere.dss.git.common/protocol/config/GitServerConfig.java
@@ -23,4 +23,6 @@ public class GitServerConfig {
     public static final CommonVars<String> GIT_SEARCH_EXCLUDE_DIRECTORY = CommonVars.apply("wds.dss.server.git.search.exclude.dir", ".metaConf");
 
     public static final CommonVars<String> GIT_SEARCH_EXCLUDE_FILE = CommonVars.apply("wds.dss.server.git.search.exclude.file", ".properties");
+
+    public static final CommonVars<String> LINKIS_MYSQL_PUB_KEY = CommonVars.apply("wds.linkis.mysql.pub.key", "abc");
 }
diff --git a/dss-git/dss-git-common/src/main/java/com.webank.wedatasphere.dss.git.common/protocol/request/GitUserInfoRequest.java b/dss-git/dss-git-common/src/main/java/com.webank.wedatasphere.dss.git.common/protocol/request/GitUserInfoRequest.java
index 215abc9bc..aa170f2db 100644
--- a/dss-git/dss-git-common/src/main/java/com.webank.wedatasphere.dss.git.common/protocol/request/GitUserInfoRequest.java
+++ b/dss-git/dss-git-common/src/main/java/com.webank.wedatasphere.dss.git.common/protocol/request/GitUserInfoRequest.java
@@ -4,6 +4,10 @@
 public class GitUserInfoRequest {
     private Long workspaceId;
     private String type;
+    /**
+     * 密码 token 是否解密 true-解密
+     */
+    private Boolean decrypt;
 
     public Long getWorkspaceId() {
         return workspaceId;
@@ -20,4 +24,12 @@ public String getType() {
     public void setType(String type) {
         this.type = type;
     }
+
+    public Boolean getDecrypt() {
+        return decrypt;
+    }
+
+    public void setDecrypt(Boolean decrypt) {
+        this.decrypt = decrypt;
+    }
 }
diff --git a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSWorkspaceGitServiceImpl.java b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSWorkspaceGitServiceImpl.java
index 67725140b..536f86aa9 100644
--- a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSWorkspaceGitServiceImpl.java
+++ b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSWorkspaceGitServiceImpl.java
@@ -2,15 +2,29 @@
 
 import com.webank.wedatasphere.dss.common.exception.DSSErrorException;
 import com.webank.wedatasphere.dss.git.common.protocol.GitUserEntity;
+import com.webank.wedatasphere.dss.git.common.protocol.config.GitServerConfig;
+import com.webank.wedatasphere.dss.git.common.protocol.constant.GitConstant;
 import com.webank.wedatasphere.dss.git.common.protocol.request.GitUserUpdateRequest;
 import com.webank.wedatasphere.dss.git.common.protocol.request.GitUserInfoRequest;
 import com.webank.wedatasphere.dss.git.common.protocol.response.GitUserUpdateResponse;
 import com.webank.wedatasphere.dss.git.common.protocol.response.GitUserInfoResponse;
+import com.webank.wedatasphere.dss.git.constant.DSSGitConstant;
 import com.webank.wedatasphere.dss.git.dao.DSSWorkspaceGitMapper;
 import com.webank.wedatasphere.dss.git.service.DSSWorkspaceGitService;
+import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import javax.crypto.BadPaddingException;
+import javax.crypto.Cipher;
+import javax.crypto.IllegalBlockSizeException;
+import javax.crypto.NoSuchPaddingException;
+import javax.crypto.spec.SecretKeySpec;
+import java.security.InvalidKeyException;
+import java.security.Key;
+import java.security.NoSuchAlgorithmException;
+import java.util.Arrays;
+
 @Service
 public class DSSWorkspaceGitServiceImpl implements DSSWorkspaceGitService {
 
@@ -21,13 +35,22 @@ public class DSSWorkspaceGitServiceImpl implements DSSWorkspaceGitService {
     @Override
     public GitUserUpdateResponse associateGit(GitUserUpdateRequest gitUserCreateRequest) throws DSSErrorException {
         if (gitUserCreateRequest == null) {
-            throw  new DSSErrorException(010101, "gitUserCreateRequest is null");
+            throw new DSSErrorException(010101, "gitUserCreateRequest is null");
         }
         GitUserEntity gitUser = gitUserCreateRequest.getGitUser();
         String userName = gitUserCreateRequest.getUsername();
         // 不存在则更新，存在则新增
         GitUserEntity oldGitUserDo = selectGit(gitUser.getWorkspaceId(), gitUser.getType());
         gitUser.setUpdateBy(userName);
+        // 密码 token 加密处理
+        if (!StringUtils.isEmpty(gitUser.getGitPassword())) {
+            String encryptPassword = generateKeys(gitUser.getGitPassword(), Cipher.ENCRYPT_MODE);
+            gitUser.setGitPassword(encryptPassword);
+        }
+        if (!StringUtils.isEmpty(gitUser.getGitToken())) {
+            String encryptToken = generateKeys(gitUser.getGitToken(), Cipher.ENCRYPT_MODE);
+            gitUser.setGitToken(encryptToken);
+        }
         if (oldGitUserDo == null) {
             gitUser.setCreateBy(userName);
             workspaceGitMapper.insert(gitUser);
@@ -47,6 +70,18 @@ public GitUserInfoResponse selectGitUserInfo(GitUserInfoRequest gitUserInfoReque
         Long workspaceId = gitUserInfoRequest.getWorkspaceId();
         String type = gitUserInfoRequest.getType();
         GitUserEntity gitUserEntity = selectGit(workspaceId, type);
+        Boolean decrypt = gitUserInfoRequest.getDecrypt();
+        if (decrypt != null && decrypt) {
+            // 密码 token 解密处理
+            if (!StringUtils.isEmpty(gitUserEntity.getGitPassword())) {
+                String encryptPassword = generateKeys(gitUserEntity.getGitPassword(), Cipher.DECRYPT_MODE);
+                gitUserEntity.setGitPassword(encryptPassword);
+            }
+            if (!StringUtils.isEmpty(gitUserEntity.getGitToken())) {
+                String encryptToken = generateKeys(gitUserEntity.getGitToken(), Cipher.DECRYPT_MODE);
+                gitUserEntity.setGitToken(encryptToken);
+            }
+        }
 
         GitUserInfoResponse gitUserInfoResponse = new GitUserInfoResponse();
         gitUserInfoResponse.setGitUser(gitUserEntity);
@@ -55,7 +90,30 @@ public GitUserInfoResponse selectGitUserInfo(GitUserInfoRequest gitUserInfoReque
 
     @Override
     public GitUserEntity selectGit(Long workspaceId, String type) {
-        return workspaceGitMapper.selectByWorkspaceId(workspaceId, type);
+        GitUserEntity gitUserEntity = workspaceGitMapper.selectByWorkspaceId(workspaceId, type);
+        String decryptPassword = generateKeys(gitUserEntity.getGitToken(), Cipher.DECRYPT_MODE);
+        gitUserEntity.setGitToken(decryptPassword);
+        return gitUserEntity;
+    }
+
+    private String generateKeys(String password, int mode) {
+        // 定义一个字符串作为密钥源
+        String keyString = GitServerConfig.LINKIS_MYSQL_PUB_KEY.getValue();
+        if (keyString.length() < 16) {
+            throw new DSSErrorException(800001, "密钥长度必须大于16位");
+        }
+        try {
+            // 确保密钥长度合适，AES 密钥长度为 128 位 (16 字节)
+            byte[] keyBytes = keyString.substring(0, 16).getBytes();
+            Key key = new SecretKeySpec(keyBytes, "AES");
+            // 加密Cipher对象
+            Cipher encryptCipher = Cipher.getInstance("AES");
+            encryptCipher.init(mode, key);
+            byte[] encrypted = encryptCipher.doFinal(password.getBytes());
+            return Arrays.toString(encrypted);
+        } catch (Exception e) {
+            throw new DSSErrorException(800001, "加密失败");
+        }
     }
 
 }

From 9d27271ac08ebfdcaf7b1901a593efb7e0a6ce0d Mon Sep 17 00:00:00 2001
From: ryanlei <ryanlei@webank.com>
Date: Thu, 23 May 2024 16:46:19 +0800
Subject: [PATCH 158/302] fix: rm lerna

---
 web/README-DEV.md     |    7 +-
 web/lerna.json        |   12 -
 web/package-lock.json | 1175 +++++++++++++++++++++++++++++++++++++++--
 web/package.json      |   30 +-
 4 files changed, 1134 insertions(+), 90 deletions(-)
 delete mode 100644 web/lerna.json

diff --git a/web/README-DEV.md b/web/README-DEV.md
index fe46c3a05..7546f57bf 100644
--- a/web/README-DEV.md
+++ b/web/README-DEV.md
@@ -33,7 +33,6 @@
 - 子应用可以配置自己的layout需要在应用router模块导出配置subAppRoutes
 - 子应用支持使用自己的header，需要在config.json里配置模块路径
 - 各应用需要使用iView作为UI库，并提供路由，国际化等配置写入config.json
-- 各应用间不要相互直接依赖，确有依赖通过lerna管理
 - 可复用组件，资源需要合理放置，packages/shared 共享组件方法，修改需要注意影响
 - 各应用路由应以应用名做统一前缀
 - 各应用之间需要事件通信，应当在config.json 里声明对应module文件路径
@@ -51,11 +50,7 @@
 
 ```
 # 安装依赖
-lerna bootstrap 
-# 添加依赖通过lerna add 添加
-lerna add <package>[@version]
-# 指定组件添加依赖
-lerna add <package>[@version] --@scope=@dataspherestudio/workspace
+npm i
 # 开发启动DSS
 npm run serve
 # 运行部分模块子应用，支持通过module组合。如科管版本：
diff --git a/web/lerna.json b/web/lerna.json
deleted file mode 100644
index 7e9ca0719..000000000
--- a/web/lerna.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "packages": [
-    "packages/*"
-  ],
-  "command": {
-    "bootstrap": {
-      "hoist": true
-    }
-  },
-  "npmClient": "npm",
-  "version": "1.1.6"
-}
diff --git a/web/package-lock.json b/web/package-lock.json
index b73e82c40..0565f7887 100644
--- a/web/package-lock.json
+++ b/web/package-lock.json
@@ -1,13 +1,28 @@
 {
     "name": "dataspherestudio",
-    "version": "1.1.6",
+    "version": "1.1.20",
     "lockfileVersion": 2,
     "requires": true,
     "packages": {
         "": {
             "name": "dataspherestudio",
-            "version": "1.1.6",
+            "version": "1.1.20",
             "hasInstallScript": true,
+            "workspaces": [
+                "packages/apiServices",
+                "packages/cyeditor",
+                "packages/dataGovernance",
+                "packages/dss",
+                "packages/editor",
+                "packages/editorLsp",
+                "packages/exts",
+                "packages/scheduleCenter",
+                "packages/dolphinScheduler",
+                "packages/scriptis",
+                "packages/shared",
+                "packages/workflows",
+                "packages/workspace"
+            ],
             "dependencies": {
                 "axios": "0.21.1",
                 "babel-polyfill": "6.26.0",
@@ -20,6 +35,7 @@
                 "md5": "2.3.0",
                 "moment": "2.29.1",
                 "monaco-editor": "0.19.3",
+                "monaco-languageclient": "^0.13.0",
                 "qs": "6.9.4",
                 "svgo": "1.3.0",
                 "vue": "2.6.12",
@@ -47,8 +63,8 @@
                 "less-loader": "6.1.0",
                 "lint-staged": "8.2.1",
                 "monaco-editor-webpack-plugin": "1.8.2",
-                "node-sass": "6.0.1",
                 "patch-package": "6.2.2",
+                "sass": "1.49.0",
                 "sass-loader": "10.2.1",
                 "speed-measure-webpack-plugin": "1.5.0",
                 "svg-sprite-loader": "5.0.0",
@@ -1336,7 +1352,6 @@
             "version": "7.17.9",
             "resolved": "https://registry.npmmirror.com/@babel/runtime/-/runtime-7.17.9.tgz",
             "integrity": "sha512-lSiBBvodq29uShpWGNbgFdKYNiFDo5/HIYsaCEY9ff4sb10x9jizo2+pRrSyF4jKZCXqgzuqBOQKbUm90gQwJg==",
-            "dev": true,
             "dependencies": {
                 "regenerator-runtime": "^0.13.4"
             },
@@ -1428,6 +1443,54 @@
                 "node": ">=6.9.0"
             }
         },
+        "node_modules/@dataspherestudio/apiServices": {
+            "resolved": "packages/apiServices",
+            "link": true
+        },
+        "node_modules/@dataspherestudio/cyeditor": {
+            "resolved": "packages/cyeditor",
+            "link": true
+        },
+        "node_modules/@dataspherestudio/dataGovernance": {
+            "resolved": "packages/dataGovernance",
+            "link": true
+        },
+        "node_modules/@dataspherestudio/dolphinScheduler": {
+            "resolved": "packages/dolphinScheduler",
+            "link": true
+        },
+        "node_modules/@dataspherestudio/dss": {
+            "resolved": "packages/dss",
+            "link": true
+        },
+        "node_modules/@dataspherestudio/editor": {
+            "resolved": "packages/editor",
+            "link": true
+        },
+        "node_modules/@dataspherestudio/editor-lsp": {
+            "resolved": "packages/editorLsp",
+            "link": true
+        },
+        "node_modules/@dataspherestudio/exts": {
+            "resolved": "packages/exts",
+            "link": true
+        },
+        "node_modules/@dataspherestudio/scriptis": {
+            "resolved": "packages/scriptis",
+            "link": true
+        },
+        "node_modules/@dataspherestudio/shared": {
+            "resolved": "packages/shared",
+            "link": true
+        },
+        "node_modules/@dataspherestudio/workflows": {
+            "resolved": "packages/workflows",
+            "link": true
+        },
+        "node_modules/@dataspherestudio/workspace": {
+            "resolved": "packages/workspace",
+            "link": true
+        },
         "node_modules/@gar/promisify": {
             "version": "1.1.3",
             "resolved": "https://registry.npmmirror.com/@gar/promisify/-/promisify-1.1.3.tgz",
@@ -6009,6 +6072,24 @@
                 "@octokit/openapi-types": "^11.2.0"
             }
         },
+        "node_modules/@riophae/vue-treeselect": {
+            "version": "0.4.0",
+            "resolved": "https://registry.npmjs.org/@riophae/vue-treeselect/-/vue-treeselect-0.4.0.tgz",
+            "integrity": "sha512-J4atYmBqXQmiPFK/0B5sXKjtnGc21mBJEiyKIDZwk0Q9XuynVFX6IJ4EpaLmUgL5Tve7HAS7wkiGGSti6Uaxcg==",
+            "dependencies": {
+                "@babel/runtime": "^7.3.1",
+                "babel-helper-vue-jsx-merge-props": "^2.0.3",
+                "easings-css": "^1.0.0",
+                "fuzzysearch": "^1.0.3",
+                "is-promise": "^2.1.0",
+                "lodash": "^4.0.0",
+                "material-colors": "^1.2.6",
+                "watch-size": "^2.0.0"
+            },
+            "peerDependencies": {
+                "vue": "^2.2.0"
+            }
+        },
         "node_modules/@samverschueren/stream-to-observable": {
             "version": "0.3.1",
             "resolved": "https://registry.npmmirror.com/@samverschueren/stream-to-observable/-/stream-to-observable-0.3.1.tgz",
@@ -7172,6 +7253,8 @@
             "resolved": "https://registry.npmmirror.com/amdefine/-/amdefine-1.0.1.tgz",
             "integrity": "sha512-S2Hw0TtNkMJhIabBwIojKL9YHO5T0n5eNqWJ7Lrlel/zDbftQpxpapi8tZs3X1HWa+u+QeydGmzzNU0m09+Rcg==",
             "dev": true,
+            "optional": true,
+            "peer": true,
             "engines": {
                 "node": ">=0.4.2"
             }
@@ -7245,7 +7328,7 @@
             "version": "3.1.2",
             "resolved": "https://registry.npmmirror.com/anymatch/-/anymatch-3.1.2.tgz",
             "integrity": "sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg==",
-            "optional": true,
+            "devOptional": true,
             "dependencies": {
                 "normalize-path": "^3.0.0",
                 "picomatch": "^2.0.4"
@@ -7549,6 +7632,8 @@
             "resolved": "https://registry.npmmirror.com/async-foreach/-/async-foreach-0.1.3.tgz",
             "integrity": "sha512-VUeSMD8nEGBWaZK4lizI1sf3yEC7pnAQ/mrI7pC2fBz2s/tq5jWWEngTwaf0Gruu/OoXRGLGg1XFqpYBiGTYJA==",
             "dev": true,
+            "optional": true,
+            "peer": true,
             "engines": {
                 "node": "*"
             }
@@ -7730,6 +7815,11 @@
                 "eslint": ">= 4.12.1"
             }
         },
+        "node_modules/babel-helper-vue-jsx-merge-props": {
+            "version": "2.0.3",
+            "resolved": "https://registry.npmjs.org/babel-helper-vue-jsx-merge-props/-/babel-helper-vue-jsx-merge-props-2.0.3.tgz",
+            "integrity": "sha512-gsLiKK7Qrb7zYJNgiXKpXblxbV5ffSwR0f5whkPAaBAR4fhi6bwRZxX9wBlIc5M/v8CCkXUbXZL4N/nSE97cqg=="
+        },
         "node_modules/babel-loader": {
             "version": "8.2.5",
             "resolved": "https://registry.npmmirror.com/babel-loader/-/babel-loader-8.2.5.tgz",
@@ -7955,6 +8045,12 @@
                 "@babel/core": "^7.0.0-0"
             }
         },
+        "node_modules/babel-plugin-transform-remove-console": {
+            "version": "6.9.4",
+            "resolved": "https://registry.npmjs.org/babel-plugin-transform-remove-console/-/babel-plugin-transform-remove-console-6.9.4.tgz",
+            "integrity": "sha512-88blrUrMX3SPiGkT1GnvVY8E/7A+k6oj3MNvUtTIxJflFzXTw1bHkuJ/y039ouhFMp2prRn5cQGzokViYi1dsg==",
+            "dev": true
+        },
         "node_modules/babel-polyfill": {
             "version": "6.26.0",
             "resolved": "https://registry.npmmirror.com/babel-polyfill/-/babel-polyfill-6.26.0.tgz",
@@ -8110,7 +8206,7 @@
             "version": "2.2.0",
             "resolved": "https://registry.npmmirror.com/binary-extensions/-/binary-extensions-2.2.0.tgz",
             "integrity": "sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==",
-            "optional": true,
+            "devOptional": true,
             "engines": {
                 "node": ">=8"
             }
@@ -8230,6 +8326,14 @@
             "resolved": "https://registry.npmmirror.com/boolbase/-/boolbase-1.0.0.tgz",
             "integrity": "sha512-JZOSA7Mo9sNGB8+UjSgzdLtokWAky1zbztM3WRLCbZ70/3cTANmQmOdR7y2g+J0e2WXywy1yS468tY+IruqEww=="
         },
+        "node_modules/bootstrap": {
+            "version": "3.4.1",
+            "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-3.4.1.tgz",
+            "integrity": "sha512-yN5oZVmRCwe5aKwzRj6736nSmKDX7pLYwsXiCj/EYmo16hODaBiT4En5btW/jhBF/seV+XMx3aYwukYC3A49DA==",
+            "engines": {
+                "node": ">=6"
+            }
+        },
         "node_modules/brace-expansion": {
             "version": "1.1.11",
             "resolved": "https://registry.npmmirror.com/brace-expansion/-/brace-expansion-1.1.11.tgz",
@@ -8815,7 +8919,7 @@
             "version": "3.5.3",
             "resolved": "https://registry.npmmirror.com/chokidar/-/chokidar-3.5.3.tgz",
             "integrity": "sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==",
-            "optional": true,
+            "devOptional": true,
             "dependencies": {
                 "anymatch": "~3.1.2",
                 "braces": "~3.0.2",
@@ -8836,7 +8940,7 @@
             "version": "3.0.2",
             "resolved": "https://registry.npmmirror.com/braces/-/braces-3.0.2.tgz",
             "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
-            "optional": true,
+            "devOptional": true,
             "dependencies": {
                 "fill-range": "^7.0.1"
             },
@@ -8848,7 +8952,7 @@
             "version": "7.0.1",
             "resolved": "https://registry.npmmirror.com/fill-range/-/fill-range-7.0.1.tgz",
             "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
-            "optional": true,
+            "devOptional": true,
             "dependencies": {
                 "to-regex-range": "^5.0.1"
             },
@@ -8860,7 +8964,7 @@
             "version": "7.0.0",
             "resolved": "https://registry.npmmirror.com/is-number/-/is-number-7.0.0.tgz",
             "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
-            "optional": true,
+            "devOptional": true,
             "engines": {
                 "node": ">=0.12.0"
             }
@@ -8869,7 +8973,7 @@
             "version": "5.0.1",
             "resolved": "https://registry.npmmirror.com/to-regex-range/-/to-regex-range-5.0.1.tgz",
             "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
-            "optional": true,
+            "devOptional": true,
             "dependencies": {
                 "is-number": "^7.0.0"
             },
@@ -9159,6 +9263,16 @@
             "dev": true,
             "optional": true
         },
+        "node_modules/clipboard": {
+            "version": "2.0.8",
+            "resolved": "https://registry.npmjs.org/clipboard/-/clipboard-2.0.8.tgz",
+            "integrity": "sha512-Y6WO0unAIQp5bLmk1zdThRhgJt/x3ks6f30s3oE3H1mgIEU33XyQjEf8gsf6DxC7NPX8Y1SsNWjUjL/ywLnnbQ==",
+            "dependencies": {
+                "good-listener": "^1.2.2",
+                "select": "^1.1.2",
+                "tiny-emitter": "^2.0.0"
+            }
+        },
         "node_modules/clipboardy": {
             "version": "2.3.0",
             "resolved": "https://registry.npmmirror.com/clipboardy/-/clipboardy-2.3.0.tgz",
@@ -11092,6 +11206,11 @@
                 "node": ">=4"
             }
         },
+        "node_modules/cssfilter": {
+            "version": "0.0.10",
+            "resolved": "https://registry.npmjs.org/cssfilter/-/cssfilter-0.0.10.tgz",
+            "integrity": "sha512-FAaLDaplstoRsDR8XGYH51znUN0UY7nMc6Z9/fvE8EXGwvJE9hu7W2vHwx1+bd6gCYnln9nLbzxFTrcO9YQDZw=="
+        },
         "node_modules/cssnano": {
             "version": "4.1.11",
             "resolved": "https://registry.npmmirror.com/cssnano/-/cssnano-4.1.11.tgz",
@@ -11231,6 +11350,39 @@
             "resolved": "https://registry.npmmirror.com/cyclist/-/cyclist-1.0.1.tgz",
             "integrity": "sha512-NJGVKPS81XejHcLhaLJS7plab0fK3slPh11mESeeDq2W4ZI5kUKK/LRRdVDvjJseojbPB7ZwjnyOybg3Igea/A=="
         },
+        "node_modules/cytoscape": {
+            "version": "3.27.0",
+            "resolved": "https://registry.npmjs.org/cytoscape/-/cytoscape-3.27.0.tgz",
+            "integrity": "sha512-pPZJilfX9BxESwujODz5pydeGi+FBrXq1rcaB1mfhFXXFJ9GjE6CNndAk+8jPzoXGD+16LtSS4xlYEIUiW4Abg==",
+            "dependencies": {
+                "heap": "^0.2.6",
+                "lodash": "^4.17.21"
+            },
+            "engines": {
+                "node": ">=0.10"
+            }
+        },
+        "node_modules/cytoscape-klay": {
+            "version": "3.1.4",
+            "resolved": "https://registry.npmjs.org/cytoscape-klay/-/cytoscape-klay-3.1.4.tgz",
+            "integrity": "sha512-VwPj0VR25GPfy6qXVQRi/MYlZM/zkdvRhHlgqbM//lSvstgM6fhp3ik/uM8Wr8nlhskfqz/M1fIDmR6UckbS2A==",
+            "dependencies": {
+                "klayjs": "^0.4.1"
+            },
+            "peerDependencies": {
+                "cytoscape": "^3.2.0"
+            }
+        },
+        "node_modules/cytoscape/node_modules/lodash": {
+            "version": "4.17.21",
+            "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
+            "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg=="
+        },
+        "node_modules/d3": {
+            "version": "3.5.17",
+            "resolved": "https://registry.npmjs.org/d3/-/d3-3.5.17.tgz",
+            "integrity": "sha512-yFk/2idb8OHPKkbAL8QaOaqENNoMhIaSHZerk3oQsECwkObkCpJyjYwCe+OHiq6UEdhe1m8ZGARRRO3ljFjlKg=="
+        },
         "node_modules/d3-dispatch": {
             "version": "2.0.0",
             "resolved": "https://registry.npmmirror.com/d3-dispatch/-/d3-dispatch-2.0.0.tgz",
@@ -11301,6 +11453,11 @@
                 "node": "*"
             }
         },
+        "node_modules/dayjs": {
+            "version": "1.10.7",
+            "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.10.7.tgz",
+            "integrity": "sha512-P6twpd70BcPK34K26uJ1KT3wlhpuOAPoMwJzpsIWUxHZ7wpmbdZL/hQqBDfz7hGurYSa5PhzdhDHtt319hL3ig=="
+        },
         "node_modules/de-indent": {
             "version": "1.0.2",
             "resolved": "https://registry.npmmirror.com/de-indent/-/de-indent-1.0.2.tgz",
@@ -11672,6 +11829,11 @@
                 "node": ">=0.4.0"
             }
         },
+        "node_modules/delegate": {
+            "version": "3.2.0",
+            "resolved": "https://registry.npmjs.org/delegate/-/delegate-3.2.0.tgz",
+            "integrity": "sha512-IofjkYBZaZivn0V8nnsMJGBr4jVLxHDheKSW88PyxS5QC4Vo9ZbZVvhzlSxY87fVq3STR6r+4cGepyHkcWOQSw=="
+        },
         "node_modules/delegates": {
             "version": "1.0.0",
             "resolved": "https://registry.npmmirror.com/delegates/-/delegates-1.0.0.tgz",
@@ -11727,6 +11889,14 @@
             "integrity": "sha512-T0NIuQpnTvFDATNuHN5roPwSBG83rFsuO+MXXH9/3N1eFbn4wcPjttvjMLEPWJ0RGUYgQE7cGgS3tNxbqCGM7g==",
             "dev": true
         },
+        "node_modules/dexie": {
+            "version": "3.0.4",
+            "resolved": "https://registry.npmjs.org/dexie/-/dexie-3.0.4.tgz",
+            "integrity": "sha512-rwS3k8BBstjGFJAS/yjYrsRZucqitnrP3NBhqghl9ihWcWABlT3I5f2dZV9T3pmXGAP7G9p1q00g/axcsuOT8A==",
+            "engines": {
+                "node": ">=6.0"
+            }
+        },
         "node_modules/dezalgo": {
             "version": "1.0.4",
             "resolved": "https://registry.npmmirror.com/dezalgo/-/dezalgo-1.0.4.tgz",
@@ -11903,6 +12073,11 @@
             "integrity": "sha512-YXQl1DSa4/PQyRfgrv6aoNjhasp/p4qs9FjJ4q4cQk+8m4r6k4ZSiEyytKG8f8W9gi8WsQtIObNmKd+tMzNTmA==",
             "dev": true
         },
+        "node_modules/dt-sql-parser": {
+            "version": "1.2.1",
+            "resolved": "https://registry.npmjs.org/dt-sql-parser/-/dt-sql-parser-1.2.1.tgz",
+            "integrity": "sha512-bp6Rtm8N3m2Z3tavtKGo8J5ffaPQdPodYV2xGi9f6IsWbHzOkpNBxHlORcWtnSLtA/JvZcvImQxgbkdaGiv5cw=="
+        },
         "node_modules/duplexer": {
             "version": "0.1.2",
             "resolved": "https://registry.npmmirror.com/duplexer/-/duplexer-0.1.2.tgz",
@@ -11920,6 +12095,11 @@
                 "stream-shift": "^1.0.0"
             }
         },
+        "node_modules/easings-css": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmjs.org/easings-css/-/easings-css-1.0.0.tgz",
+            "integrity": "sha512-7Uq7NdazNfVtr0RNmPAys8it0zKCuaqxJStYKEl72D3j4gbvXhhaM7iWNbqhA4C94ygCye6VuyhzBRQC4szeBg=="
+        },
         "node_modules/easy-stack": {
             "version": "1.0.1",
             "resolved": "https://registry.npmmirror.com/easy-stack/-/easy-stack-1.0.1.tgz",
@@ -14225,6 +14405,11 @@
             "integrity": "sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==",
             "dev": true
         },
+        "node_modules/fuzzysearch": {
+            "version": "1.0.3",
+            "resolved": "https://registry.npmjs.org/fuzzysearch/-/fuzzysearch-1.0.3.tgz",
+            "integrity": "sha512-s+kNWQuI3mo9OALw0HJ6YGmMbLqEufCh2nX/zzV5CrICQ/y4AwPxM+6TIiF9ItFCHXFCyM/BfCCmN57NTIJuPg=="
+        },
         "node_modules/g-status": {
             "version": "2.0.2",
             "resolved": "https://registry.npmmirror.com/g-status/-/g-status-2.0.2.tgz",
@@ -14316,6 +14501,8 @@
             "resolved": "https://registry.npmmirror.com/gaze/-/gaze-1.1.3.tgz",
             "integrity": "sha512-BRdNm8hbWzFzWHERTrejLqwHDfS4GibPoq5wjTPIoJHoBtKGPg3xAFfxmM+9ztbXelxcf2hwQcaz1PtmFeue8g==",
             "dev": true,
+            "optional": true,
+            "peer": true,
             "dependencies": {
                 "globule": "^1.0.0"
             },
@@ -14660,8 +14847,7 @@
         "node_modules/glob-to-regexp": {
             "version": "0.3.0",
             "resolved": "https://registry.npmmirror.com/glob-to-regexp/-/glob-to-regexp-0.3.0.tgz",
-            "integrity": "sha512-Iozmtbqv0noj0uDDqoL0zNq0VBEfK2YFoMAZoxJe4cwphvLR+JskfF30QhXHOR4m3KrE6NLRYw+U9MRXvifyig==",
-            "dev": true
+            "integrity": "sha512-Iozmtbqv0noj0uDDqoL0zNq0VBEfK2YFoMAZoxJe4cwphvLR+JskfF30QhXHOR4m3KrE6NLRYw+U9MRXvifyig=="
         },
         "node_modules/glob2base": {
             "version": "0.0.12",
@@ -14717,6 +14903,8 @@
             "resolved": "https://registry.npmmirror.com/globule/-/globule-1.3.3.tgz",
             "integrity": "sha512-mb1aYtDbIjTu4ShMB85m3UzjX9BVKe9WCzsnfMSZk+K5GpIbBOexgg4PPCt5eHDEG5/ZQAUX2Kct02zfiPLsKg==",
             "dev": true,
+            "optional": true,
+            "peer": true,
             "dependencies": {
                 "glob": "~7.1.1",
                 "lodash": "~4.17.10",
@@ -14731,6 +14919,8 @@
             "resolved": "https://registry.npmmirror.com/glob/-/glob-7.1.7.tgz",
             "integrity": "sha512-OvD9ENzPLbegENnYP5UUfJIirTg4+XwMWGaQfQTY0JenxNvvIKP3U3/tAQSPIu/lHxXYSZmpXlUHeqAIdKzBLQ==",
             "dev": true,
+            "optional": true,
+            "peer": true,
             "dependencies": {
                 "fs.realpath": "^1.0.0",
                 "inflight": "^1.0.4",
@@ -14748,6 +14938,8 @@
             "resolved": "https://registry.npmmirror.com/minimatch/-/minimatch-3.0.8.tgz",
             "integrity": "sha512-6FsRAQsxQ61mw+qP1ZzbL9Bc78x2p5OqNgNpnoAFLTrX8n5Kxph0CsnhmKKNXTWjXqU5L0pGPR7hYk+XWZr60Q==",
             "dev": true,
+            "optional": true,
+            "peer": true,
             "dependencies": {
                 "brace-expansion": "^1.1.7"
             },
@@ -14755,6 +14947,14 @@
                 "node": "*"
             }
         },
+        "node_modules/good-listener": {
+            "version": "1.2.2",
+            "resolved": "https://registry.npmjs.org/good-listener/-/good-listener-1.2.2.tgz",
+            "integrity": "sha512-goW1b+d9q/HIwbVYZzZ6SsTr4IgE+WA44A0GmPIQstuOrgsFcT7VEJ48nmr9GaRtNu0XTKacFLGnBPAM6Afouw==",
+            "dependencies": {
+                "delegate": "^3.1.2"
+            }
+        },
         "node_modules/graceful-fs": {
             "version": "4.2.10",
             "resolved": "https://registry.npmmirror.com/graceful-fs/-/graceful-fs-4.2.10.tgz",
@@ -15018,12 +15218,26 @@
                 "he": "bin/he"
             }
         },
+        "node_modules/heap": {
+            "version": "0.2.7",
+            "resolved": "https://registry.npmjs.org/heap/-/heap-0.2.7.tgz",
+            "integrity": "sha512-2bsegYkkHO+h/9MGbn6KWcE45cHZgPANo5LXF7EvWdT0yT2EguSVO1nDgU5c8+ZOPwp2vMNa7YFsJhVcDR9Sdg=="
+        },
         "node_modules/hex-color-regex": {
             "version": "1.1.0",
             "resolved": "https://registry.npmmirror.com/hex-color-regex/-/hex-color-regex-1.1.0.tgz",
             "integrity": "sha512-l9sfDFsuqtOqKDsQdqrMRk0U85RZc0RtOR9yPI7mRVOa4FsR/BVnZ0shmQRM96Ji99kYZP/7hn1cedc1+ApsTQ==",
             "dev": true
         },
+        "node_modules/highlight.js": {
+            "version": "9.18.3",
+            "resolved": "https://registry.npmjs.org/highlight.js/-/highlight.js-9.18.3.tgz",
+            "integrity": "sha512-zBZAmhSupHIl5sITeMqIJnYCDfAEc3Gdkqj65wC1lpI468MMQeeQkhcIAvk+RylAkxrCcI9xy9piHiXeQ1BdzQ==",
+            "deprecated": "Version no longer supported. Upgrade to @latest",
+            "engines": {
+                "node": "*"
+            }
+        },
         "node_modules/hmac-drbg": {
             "version": "1.0.1",
             "resolved": "https://registry.npmmirror.com/hmac-drbg/-/hmac-drbg-1.0.1.tgz",
@@ -15553,6 +15767,12 @@
                 "node": ">=0.10.0"
             }
         },
+        "node_modules/immutable": {
+            "version": "4.3.6",
+            "resolved": "https://registry.npmjs.org/immutable/-/immutable-4.3.6.tgz",
+            "integrity": "sha512-Ju0+lEMyzMVZarkTn/gqRpdqd5dOPaz1mCZ0SH3JV6iFw81PldE/PEB1hWVEA288HPt4WXW8O7AWxB10M+03QQ==",
+            "dev": true
+        },
         "node_modules/import-cwd": {
             "version": "2.1.0",
             "resolved": "https://registry.npmmirror.com/import-cwd/-/import-cwd-2.1.0.tgz",
@@ -15962,7 +16182,7 @@
             "version": "2.1.0",
             "resolved": "https://registry.npmmirror.com/is-binary-path/-/is-binary-path-2.1.0.tgz",
             "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==",
-            "optional": true,
+            "devOptional": true,
             "dependencies": {
                 "binary-extensions": "^2.0.0"
             },
@@ -16306,8 +16526,7 @@
         "node_modules/is-promise": {
             "version": "2.2.2",
             "resolved": "https://registry.npmmirror.com/is-promise/-/is-promise-2.2.2.tgz",
-            "integrity": "sha512-+lP4/6lKUBfQjZ2pdxThZvLUAafmZb8OAxFb8XXtiQmS35INgr85hdOGoEs124ez1FCnZJt6jau/T+alh58QFQ==",
-            "dev": true
+            "integrity": "sha512-+lP4/6lKUBfQjZ2pdxThZvLUAafmZb8OAxFb8XXtiQmS35INgr85hdOGoEs124ez1FCnZJt6jau/T+alh58QFQ=="
         },
         "node_modules/is-regex": {
             "version": "1.1.4",
@@ -16489,8 +16708,7 @@
         "node_modules/jquery": {
             "version": "3.6.0",
             "resolved": "https://registry.npmmirror.com/jquery/-/jquery-3.6.0.tgz",
-            "integrity": "sha512-JVzAR/AjBvVt2BmYhxRCSYysDsPcssdmTFnzyLEts9qNwmjmu4JTAMYubEfwVOSwpQ1I1sKKFcxhZCI2buerfw==",
-            "peer": true
+            "integrity": "sha512-JVzAR/AjBvVt2BmYhxRCSYysDsPcssdmTFnzyLEts9qNwmjmu4JTAMYubEfwVOSwpQ1I1sKKFcxhZCI2buerfw=="
         },
         "node_modules/js-base64": {
             "version": "2.6.4",
@@ -16691,6 +16909,11 @@
                 "graceful-fs": "^4.1.11"
             }
         },
+        "node_modules/klayjs": {
+            "version": "0.4.1",
+            "resolved": "https://registry.npmjs.org/klayjs/-/klayjs-0.4.1.tgz",
+            "integrity": "sha512-WUNxuO7O79TEkxCj6OIaK5TJBkaWaR/IKNTakgV9PwDn+mrr63MLHed34AcE2yTaDntgO6l0zGFIzhcoTeroTA=="
+        },
         "node_modules/klona": {
             "version": "2.0.5",
             "resolved": "https://registry.npmmirror.com/klona/-/klona-2.0.5.tgz",
@@ -18013,12 +18236,25 @@
                 "node": ">=4"
             }
         },
+        "node_modules/material-colors": {
+            "version": "1.2.6",
+            "resolved": "https://registry.npmjs.org/material-colors/-/material-colors-1.2.6.tgz",
+            "integrity": "sha512-6qE4B9deFBIa9YSpOc9O0Sgc43zTeVYbgDT5veRKSlB2+ZuHNoVVxA1L/ckMUayV9Ay9y7Z/SZCLcGteW9i7bg=="
+        },
         "node_modules/math-random": {
             "version": "1.0.4",
             "resolved": "https://registry.npmmirror.com/math-random/-/math-random-1.0.4.tgz",
             "integrity": "sha512-rUxjysqif/BZQH2yhd5Aaq7vXMSx9NdEsQcyA07uEzIvxgI7zIr33gGsh+RU0/XjmQpCW7RsVof1vlkvQVCK5A==",
             "dev": true
         },
+        "node_modules/mavon-editor": {
+            "version": "2.10.4",
+            "resolved": "https://registry.npmjs.org/mavon-editor/-/mavon-editor-2.10.4.tgz",
+            "integrity": "sha512-CFsBLkgt/KZBDg+SJYe2fyYv4zClY149PiwpH0rDAiiP4ae1XNs0GC8nBsoTeipsHcebDLN1QMkt3bUsnMDjQw==",
+            "dependencies": {
+                "xss": "^1.0.6"
+            }
+        },
         "node_modules/md5": {
             "version": "2.3.0",
             "resolved": "https://registry.npmmirror.com/md5/-/md5-2.3.0.tgz",
@@ -18829,6 +19065,25 @@
                 "node": "*"
             }
         },
+        "node_modules/moment-timezone": {
+            "version": "0.5.45",
+            "resolved": "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.45.tgz",
+            "integrity": "sha512-HIWmqA86KcmCAhnMAN0wuDOARV/525R2+lOLotuGFzn4HO+FH+/645z2wx0Dt3iDv6/p61SIvKnDstISainhLQ==",
+            "dependencies": {
+                "moment": "^2.29.4"
+            },
+            "engines": {
+                "node": "*"
+            }
+        },
+        "node_modules/moment-timezone/node_modules/moment": {
+            "version": "2.30.1",
+            "resolved": "https://registry.npmjs.org/moment/-/moment-2.30.1.tgz",
+            "integrity": "sha512-uEmtNhbDOrWPFS+hdjFCBfy9f2YoyzRpwcl+DqpC6taX21FzsTLQVbMV/W7PzNSX6x/bhC1zA3c2UQ5NzH6how==",
+            "engines": {
+                "node": "*"
+            }
+        },
         "node_modules/monaco-editor": {
             "version": "0.19.3",
             "resolved": "https://registry.npmmirror.com/monaco-editor/-/monaco-editor-0.19.3.tgz",
@@ -18847,6 +19102,20 @@
                 "webpack": "^4.5.0"
             }
         },
+        "node_modules/monaco-languageclient": {
+            "version": "0.13.0",
+            "resolved": "https://registry.npmjs.org/monaco-languageclient/-/monaco-languageclient-0.13.0.tgz",
+            "integrity": "sha512-aCwd33dTitwV5QwY56rpYHwzEGXei8TZ+yvZcvP3gEMd6Mizr8m3pOuoknDi2SUfLuNAHS6+ulvLgZlNQB5awg==",
+            "dependencies": {
+                "glob-to-regexp": "^0.3.0",
+                "vscode-jsonrpc": "^5.0.0",
+                "vscode-languageclient": "^6.0.0",
+                "vscode-uri": "^2.1.1"
+            },
+            "engines": {
+                "vscode": "^1.41.0"
+            }
+        },
         "node_modules/move-concurrently": {
             "version": "1.0.1",
             "resolved": "https://registry.npmmirror.com/move-concurrently/-/move-concurrently-1.0.1.tgz",
@@ -18972,7 +19241,7 @@
             "version": "2.15.0",
             "resolved": "https://registry.npmmirror.com/nan/-/nan-2.15.0.tgz",
             "integrity": "sha512-8ZtvEnA2c5aYCZYd1cvgdnU6cqwixRoYg70xPLWUws5ORTa/lnw+u4amixRS/Ac5U5mQVgp9pnlSUnbNWFaWZQ==",
-            "devOptional": true
+            "optional": true
         },
         "node_modules/nanomatch": {
             "version": "1.2.13",
@@ -19183,6 +19452,8 @@
             "integrity": "sha512-f+Rbqt92Ful9gX0cGtdYwjTrWAaGURgaK5rZCWOgCNyGWusFYHhbqCCBoFBeat+HKETOU02AyTxNhJV0YZf2jQ==",
             "dev": true,
             "hasInstallScript": true,
+            "optional": true,
+            "peer": true,
             "dependencies": {
                 "async-foreach": "^0.1.3",
                 "chalk": "^1.1.1",
@@ -19212,6 +19483,8 @@
             "resolved": "https://registry.npmmirror.com/ansi-regex/-/ansi-regex-2.1.1.tgz",
             "integrity": "sha512-TIGnTpdo+E3+pCyAluZvtED5p5wCqLdezCyhPZzKPcxvFplEt4i+W7OONCKgeZFT3+y5NZZfOOS/Bdcanm1MYA==",
             "dev": true,
+            "optional": true,
+            "peer": true,
             "engines": {
                 "node": ">=0.10.0"
             }
@@ -19221,6 +19494,8 @@
             "resolved": "https://registry.npmmirror.com/ansi-styles/-/ansi-styles-2.2.1.tgz",
             "integrity": "sha512-kmCevFghRiWM7HB5zTPULl4r9bVFSWjz62MhqizDGUrq2NWuNMQyuv4tHHoKJHs69M/MF64lEcHdYIocrdWQYA==",
             "dev": true,
+            "optional": true,
+            "peer": true,
             "engines": {
                 "node": ">=0.10.0"
             }
@@ -19230,6 +19505,8 @@
             "resolved": "https://registry.npmmirror.com/chalk/-/chalk-1.1.3.tgz",
             "integrity": "sha512-U3lRVLMSlsCfjqYPbLyVv11M9CPW4I728d6TCKMAOJueEeB9/8o+eSsMnxPJD+Q+K909sdESg7C+tIkoH6on1A==",
             "dev": true,
+            "optional": true,
+            "peer": true,
             "dependencies": {
                 "ansi-styles": "^2.2.1",
                 "escape-string-regexp": "^1.0.2",
@@ -19246,6 +19523,8 @@
             "resolved": "https://registry.npmmirror.com/chownr/-/chownr-2.0.0.tgz",
             "integrity": "sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==",
             "dev": true,
+            "optional": true,
+            "peer": true,
             "engines": {
                 "node": ">=10"
             }
@@ -19255,6 +19534,8 @@
             "resolved": "https://registry.npmmirror.com/cross-spawn/-/cross-spawn-7.0.3.tgz",
             "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
             "dev": true,
+            "optional": true,
+            "peer": true,
             "dependencies": {
                 "path-key": "^3.1.0",
                 "shebang-command": "^2.0.0",
@@ -19269,6 +19550,8 @@
             "resolved": "https://registry.npmmirror.com/find-up/-/find-up-4.1.0.tgz",
             "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
             "dev": true,
+            "optional": true,
+            "peer": true,
             "dependencies": {
                 "locate-path": "^5.0.0",
                 "path-exists": "^4.0.0"
@@ -19282,6 +19565,8 @@
             "resolved": "https://registry.npmmirror.com/fs-minipass/-/fs-minipass-2.1.0.tgz",
             "integrity": "sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg==",
             "dev": true,
+            "optional": true,
+            "peer": true,
             "dependencies": {
                 "minipass": "^3.0.0"
             },
@@ -19294,6 +19579,8 @@
             "resolved": "https://registry.npmmirror.com/get-stdin/-/get-stdin-4.0.1.tgz",
             "integrity": "sha512-F5aQMywwJ2n85s4hJPTT9RPxGmubonuB10MNYo17/xph174n2MIR33HRguhzVag10O/npM7SPk73LMZNP+FaWw==",
             "dev": true,
+            "optional": true,
+            "peer": true,
             "engines": {
                 "node": ">=0.10.0"
             }
@@ -19303,6 +19590,8 @@
             "resolved": "https://registry.npmmirror.com/hosted-git-info/-/hosted-git-info-4.1.0.tgz",
             "integrity": "sha512-kyCuEOWjJqZuDbRHzL8V93NzQhwIB71oFWSyzVo+KPZI+pnQPPxucdkrOZvkLRnrf5URsQM+IJ09Dw29cRALIA==",
             "dev": true,
+            "optional": true,
+            "peer": true,
             "dependencies": {
                 "lru-cache": "^6.0.0"
             },
@@ -19315,6 +19604,8 @@
             "resolved": "https://registry.npmmirror.com/locate-path/-/locate-path-5.0.0.tgz",
             "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
             "dev": true,
+            "optional": true,
+            "peer": true,
             "dependencies": {
                 "p-locate": "^4.1.0"
             },
@@ -19327,6 +19618,8 @@
             "resolved": "https://registry.npmmirror.com/lru-cache/-/lru-cache-6.0.0.tgz",
             "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
             "dev": true,
+            "optional": true,
+            "peer": true,
             "dependencies": {
                 "yallist": "^4.0.0"
             },
@@ -19339,6 +19632,8 @@
             "resolved": "https://registry.npmmirror.com/meow/-/meow-9.0.0.tgz",
             "integrity": "sha512-+obSblOQmRhcyBt62furQqRAQpNyWXo8BuQ5bN7dG8wmwQ+vwHKp/rCFD4CrTP8CsDQD1sjoZ94K417XEUk8IQ==",
             "dev": true,
+            "optional": true,
+            "peer": true,
             "dependencies": {
                 "@types/minimist": "^1.2.0",
                 "camelcase-keys": "^6.2.2",
@@ -19362,6 +19657,8 @@
             "resolved": "https://registry.npmmirror.com/minipass/-/minipass-3.3.4.tgz",
             "integrity": "sha512-I9WPbWHCGu8W+6k1ZiGpPu0GkoKBeorkfKNuAFBNS1HNFJvke82sxvI5bzcCNpWPorkOO5QQ+zomzzwRxejXiw==",
             "dev": true,
+            "optional": true,
+            "peer": true,
             "dependencies": {
                 "yallist": "^4.0.0"
             },
@@ -19374,6 +19671,8 @@
             "resolved": "https://registry.npmmirror.com/minizlib/-/minizlib-2.1.2.tgz",
             "integrity": "sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==",
             "dev": true,
+            "optional": true,
+            "peer": true,
             "dependencies": {
                 "minipass": "^3.0.0",
                 "yallist": "^4.0.0"
@@ -19387,6 +19686,8 @@
             "resolved": "https://registry.npmmirror.com/mkdirp/-/mkdirp-1.0.4.tgz",
             "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==",
             "dev": true,
+            "optional": true,
+            "peer": true,
             "bin": {
                 "mkdirp": "bin/cmd.js"
             },
@@ -19399,6 +19700,8 @@
             "resolved": "https://registry.npmmirror.com/node-gyp/-/node-gyp-7.1.2.tgz",
             "integrity": "sha512-CbpcIo7C3eMu3dL1c3d0xw449fHIGALIJsRP4DDPHpyiW8vcriNY7ubh9TE4zEKfSxscY7PjeFnshE7h75ynjQ==",
             "dev": true,
+            "optional": true,
+            "peer": true,
             "dependencies": {
                 "env-paths": "^2.2.0",
                 "glob": "^7.1.4",
@@ -19423,6 +19726,8 @@
             "resolved": "https://registry.npmmirror.com/nopt/-/nopt-5.0.0.tgz",
             "integrity": "sha512-Tbj67rffqceeLpcRXrT7vKAN8CwfPeIBgM7E6iBkmKLV7bEMwpGgYLGv0jACUsECaa/vuxP0IjEont6umdMgtQ==",
             "dev": true,
+            "optional": true,
+            "peer": true,
             "dependencies": {
                 "abbrev": "1"
             },
@@ -19438,6 +19743,8 @@
             "resolved": "https://registry.npmmirror.com/normalize-package-data/-/normalize-package-data-3.0.3.tgz",
             "integrity": "sha512-p2W1sgqij3zMMyRC067Dg16bfzVH+w7hyegmpIvZ4JNjqtGOVAIvLmjBx3yP7YTe9vKJgkoNOPjwQGogDoMXFA==",
             "dev": true,
+            "optional": true,
+            "peer": true,
             "dependencies": {
                 "hosted-git-info": "^4.0.1",
                 "is-core-module": "^2.5.0",
@@ -19453,6 +19760,8 @@
             "resolved": "https://registry.npmmirror.com/p-locate/-/p-locate-4.1.0.tgz",
             "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
             "dev": true,
+            "optional": true,
+            "peer": true,
             "dependencies": {
                 "p-limit": "^2.2.0"
             },
@@ -19465,6 +19774,8 @@
             "resolved": "https://registry.npmmirror.com/path-exists/-/path-exists-4.0.0.tgz",
             "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
             "dev": true,
+            "optional": true,
+            "peer": true,
             "engines": {
                 "node": ">=8"
             }
@@ -19474,6 +19785,8 @@
             "resolved": "https://registry.npmmirror.com/path-key/-/path-key-3.1.1.tgz",
             "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
             "dev": true,
+            "optional": true,
+            "peer": true,
             "engines": {
                 "node": ">=8"
             }
@@ -19483,6 +19796,8 @@
             "resolved": "https://registry.npmmirror.com/read-pkg-up/-/read-pkg-up-7.0.1.tgz",
             "integrity": "sha512-zK0TB7Xd6JpCLmlLmufqykGE+/TlOePD6qKClNW7hHDKFh/J7/7gCWGR7joEQEW1bKq3a3yUZSObOoWLFQ4ohg==",
             "dev": true,
+            "optional": true,
+            "peer": true,
             "dependencies": {
                 "find-up": "^4.1.0",
                 "read-pkg": "^5.2.0",
@@ -19497,6 +19812,8 @@
             "resolved": "https://registry.npmmirror.com/type-fest/-/type-fest-0.8.1.tgz",
             "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==",
             "dev": true,
+            "optional": true,
+            "peer": true,
             "engines": {
                 "node": ">=8"
             }
@@ -19506,6 +19823,8 @@
             "resolved": "https://registry.npmmirror.com/rimraf/-/rimraf-3.0.2.tgz",
             "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
             "dev": true,
+            "optional": true,
+            "peer": true,
             "dependencies": {
                 "glob": "^7.1.3"
             },
@@ -19518,6 +19837,8 @@
             "resolved": "https://registry.npmmirror.com/semver/-/semver-7.3.8.tgz",
             "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==",
             "dev": true,
+            "optional": true,
+            "peer": true,
             "dependencies": {
                 "lru-cache": "^6.0.0"
             },
@@ -19533,6 +19854,8 @@
             "resolved": "https://registry.npmmirror.com/shebang-command/-/shebang-command-2.0.0.tgz",
             "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
             "dev": true,
+            "optional": true,
+            "peer": true,
             "dependencies": {
                 "shebang-regex": "^3.0.0"
             },
@@ -19545,6 +19868,8 @@
             "resolved": "https://registry.npmmirror.com/shebang-regex/-/shebang-regex-3.0.0.tgz",
             "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
             "dev": true,
+            "optional": true,
+            "peer": true,
             "engines": {
                 "node": ">=8"
             }
@@ -19554,6 +19879,8 @@
             "resolved": "https://registry.npmmirror.com/strip-ansi/-/strip-ansi-3.0.1.tgz",
             "integrity": "sha512-VhumSSbBqDTP8p2ZLKj40UjBCV4+v8bUSEpUb4KjRgWk9pbqGF4REFj6KEagidb2f/M6AzC0EmFyDNGaw9OCzg==",
             "dev": true,
+            "optional": true,
+            "peer": true,
             "dependencies": {
                 "ansi-regex": "^2.0.0"
             },
@@ -19566,6 +19893,8 @@
             "resolved": "https://registry.npmmirror.com/supports-color/-/supports-color-2.0.0.tgz",
             "integrity": "sha512-KKNVtd6pCYgPIKU4cp2733HWYCpplQhddZLBUryaAHou723x+FRzQ5Df824Fj+IyyuiQTRoub4SnIFfIcrp70g==",
             "dev": true,
+            "optional": true,
+            "peer": true,
             "engines": {
                 "node": ">=0.8.0"
             }
@@ -19575,6 +19904,8 @@
             "resolved": "https://registry.npmmirror.com/tar/-/tar-6.1.12.tgz",
             "integrity": "sha512-jU4TdemS31uABHd+Lt5WEYJuzn+TJTCBLljvIAHZOz6M9Os5pJ4dD+vRFLxPa/n3T0iEFzpi+0x1UfuDZYbRMw==",
             "dev": true,
+            "optional": true,
+            "peer": true,
             "dependencies": {
                 "chownr": "^2.0.0",
                 "fs-minipass": "^2.0.0",
@@ -19592,6 +19923,8 @@
             "resolved": "https://registry.npmmirror.com/type-fest/-/type-fest-0.18.1.tgz",
             "integrity": "sha512-OIAYXk8+ISY+qTOwkHtKqzAuxchoMiD9Udx+FSGQDuiRR+PJKJHc2NJAXlbhkGwTt/4/nKZxELY1w3ReWOL8mw==",
             "dev": true,
+            "optional": true,
+            "peer": true,
             "engines": {
                 "node": ">=10"
             }
@@ -19601,6 +19934,8 @@
             "resolved": "https://registry.npmmirror.com/which/-/which-2.0.2.tgz",
             "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
             "dev": true,
+            "optional": true,
+            "peer": true,
             "dependencies": {
                 "isexe": "^2.0.0"
             },
@@ -19615,7 +19950,9 @@
             "version": "4.0.0",
             "resolved": "https://registry.npmmirror.com/yallist/-/yallist-4.0.0.tgz",
             "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
-            "dev": true
+            "dev": true,
+            "optional": true,
+            "peer": true
         },
         "node_modules/nopt": {
             "version": "4.0.3",
@@ -22553,7 +22890,7 @@
             "version": "3.6.0",
             "resolved": "https://registry.npmmirror.com/readdirp/-/readdirp-3.6.0.tgz",
             "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==",
-            "optional": true,
+            "devOptional": true,
             "dependencies": {
                 "picomatch": "^2.2.1"
             },
@@ -22561,6 +22898,11 @@
                 "node": ">=8.10.0"
             }
         },
+        "node_modules/reconnecting-websocket": {
+            "version": "4.4.0",
+            "resolved": "https://registry.npmjs.org/reconnecting-websocket/-/reconnecting-websocket-4.4.0.tgz",
+            "integrity": "sha512-D2E33ceRPga0NvTDhJmphEgJ7FUYF0v4lr1ki0csq06OdlxKfugGzN0dSkxM/NfqCxYELK4KcaTOUOjTV6Dcng=="
+        },
         "node_modules/redent": {
             "version": "3.0.0",
             "resolved": "https://registry.npmmirror.com/redent/-/redent-3.0.0.tgz",
@@ -22607,8 +22949,7 @@
         "node_modules/regenerator-runtime": {
             "version": "0.13.9",
             "resolved": "https://registry.npmmirror.com/regenerator-runtime/-/regenerator-runtime-0.13.9.tgz",
-            "integrity": "sha512-p3VT+cOEgxFsRRA9X4lkI1E+k2/CtnKtU4gcxyaCUreilL/vqI6CdZ3wxVUx3UOUg+gnUOQQcRI7BmSI656MYA==",
-            "dev": true
+            "integrity": "sha512-p3VT+cOEgxFsRRA9X4lkI1E+k2/CtnKtU4gcxyaCUreilL/vqI6CdZ3wxVUx3UOUg+gnUOQQcRI7BmSI656MYA=="
         },
         "node_modules/regenerator-transform": {
             "version": "0.15.0",
@@ -23170,11 +23511,30 @@
             "resolved": "https://registry.npmmirror.com/safer-buffer/-/safer-buffer-2.1.2.tgz",
             "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
         },
+        "node_modules/sass": {
+            "version": "1.49.0",
+            "resolved": "https://registry.npmjs.org/sass/-/sass-1.49.0.tgz",
+            "integrity": "sha512-TVwVdNDj6p6b4QymJtNtRS2YtLJ/CqZriGg0eIAbAKMlN8Xy6kbv33FsEZSF7FufFFM705SQviHjjThfaQ4VNw==",
+            "dev": true,
+            "dependencies": {
+                "chokidar": ">=3.0.0 <4.0.0",
+                "immutable": "^4.0.0",
+                "source-map-js": ">=0.6.2 <2.0.0"
+            },
+            "bin": {
+                "sass": "sass.js"
+            },
+            "engines": {
+                "node": ">=8.9.0"
+            }
+        },
         "node_modules/sass-graph": {
             "version": "2.2.5",
             "resolved": "https://registry.npmmirror.com/sass-graph/-/sass-graph-2.2.5.tgz",
             "integrity": "sha512-VFWDAHOe6mRuT4mZRd4eKE+d8Uedrk6Xnh7Sh9b4NGufQLQjOrvf/MQoOdx+0s92L89FeyUUNfU597j/3uNpag==",
             "dev": true,
+            "optional": true,
+            "peer": true,
             "dependencies": {
                 "glob": "^7.0.0",
                 "lodash": "^4.0.0",
@@ -23189,13 +23549,17 @@
             "version": "7.0.3",
             "resolved": "https://registry.npmmirror.com/emoji-regex/-/emoji-regex-7.0.3.tgz",
             "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==",
-            "dev": true
+            "dev": true,
+            "optional": true,
+            "peer": true
         },
         "node_modules/sass-graph/node_modules/string-width": {
             "version": "3.1.0",
             "resolved": "https://registry.npmmirror.com/string-width/-/string-width-3.1.0.tgz",
             "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
             "dev": true,
+            "optional": true,
+            "peer": true,
             "dependencies": {
                 "emoji-regex": "^7.0.1",
                 "is-fullwidth-code-point": "^2.0.0",
@@ -23210,6 +23574,8 @@
             "resolved": "https://registry.npmmirror.com/yargs/-/yargs-13.3.2.tgz",
             "integrity": "sha512-AX3Zw5iPruN5ie6xGRIDgqkT+ZhnRlZMLMHAs8tg7nRruy2Nb+i5o9bwghAogtM08q1dpr2LVoS8KSTMYpWXUw==",
             "dev": true,
+            "optional": true,
+            "peer": true,
             "dependencies": {
                 "cliui": "^5.0.0",
                 "find-up": "^3.0.0",
@@ -23228,6 +23594,8 @@
             "resolved": "https://registry.npmmirror.com/yargs-parser/-/yargs-parser-13.1.2.tgz",
             "integrity": "sha512-3lbsNRf/j+A4QuSZfDRA7HRSfWrzO0YjqTJd5kjAq37Zep1CEgaYmrH9Q3GwPiB9cHyd1Y1UwggGhJGoxipbzg==",
             "dev": true,
+            "optional": true,
+            "peer": true,
             "dependencies": {
                 "camelcase": "^5.0.0",
                 "decamelize": "^1.2.0"
@@ -23362,6 +23730,8 @@
             "resolved": "https://registry.npmmirror.com/scss-tokenizer/-/scss-tokenizer-0.2.3.tgz",
             "integrity": "sha512-dYE8LhncfBUar6POCxMTm0Ln+erjeczqEvCJib5/7XNkdw1FkUGgwMPY360FY0FgPWQxHWCx29Jl3oejyGLM9Q==",
             "dev": true,
+            "optional": true,
+            "peer": true,
             "dependencies": {
                 "js-base64": "^2.1.8",
                 "source-map": "^0.4.2"
@@ -23372,6 +23742,8 @@
             "resolved": "https://registry.npmmirror.com/source-map/-/source-map-0.4.4.tgz",
             "integrity": "sha512-Y8nIfcb1s/7DcobUz1yOO1GSp7gyL+D9zLHDehT7iRESqGSxjJ448Sg7rvfgsRJCnKLdSl11uGf0s9X80cH0/A==",
             "dev": true,
+            "optional": true,
+            "peer": true,
             "dependencies": {
                 "amdefine": ">=0.0.4"
             },
@@ -23379,6 +23751,11 @@
                 "node": ">=0.8.0"
             }
         },
+        "node_modules/select": {
+            "version": "1.1.2",
+            "resolved": "https://registry.npmjs.org/select/-/select-1.1.2.tgz",
+            "integrity": "sha512-OwpTSOfy6xSs1+pwcNrv0RBMOzI39Lp3qQKUTPVVPRjCdNa5JH/oPRiqsesIskK8TVgmRiHwO4KXlV2Li9dANA=="
+        },
         "node_modules/select-hose": {
             "version": "2.0.0",
             "resolved": "https://registry.npmmirror.com/select-hose/-/select-hose-2.0.0.tgz",
@@ -23968,6 +24345,11 @@
                 "node": ">=0.10.0"
             }
         },
+        "node_modules/sortablejs": {
+            "version": "1.10.2",
+            "resolved": "https://registry.npmjs.org/sortablejs/-/sortablejs-1.10.2.tgz",
+            "integrity": "sha512-YkPGufevysvfwn5rfdlGyrGjt7/CRHwvRPogD/lC+TnvcN29jDpCifKP+rBqf+LRldfXSTh+0CGLcSg0VIxq3A=="
+        },
         "node_modules/source-list-map": {
             "version": "2.0.1",
             "resolved": "https://registry.npmmirror.com/source-list-map/-/source-list-map-2.0.1.tgz",
@@ -23981,6 +24363,15 @@
                 "node": ">=0.10.0"
             }
         },
+        "node_modules/source-map-js": {
+            "version": "1.2.0",
+            "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.0.tgz",
+            "integrity": "sha512-itJW8lvSA0TXEphiRoawsCksnlf8SyvmFzIhltqAHluXd88pkCd+cXJVHTDwdCr0IzwptSm035IHQktUu1QUMg==",
+            "dev": true,
+            "engines": {
+                "node": ">=0.10.0"
+            }
+        },
         "node_modules/source-map-resolve": {
             "version": "0.5.3",
             "resolved": "https://registry.npmmirror.com/source-map-resolve/-/source-map-resolve-0.5.3.tgz",
@@ -24369,6 +24760,8 @@
             "resolved": "https://registry.npmmirror.com/stdout-stream/-/stdout-stream-1.4.1.tgz",
             "integrity": "sha512-j4emi03KXqJWcIeF8eIXkjMFN1Cmb8gUlDYGeBALLPo5qdyTfA9bOtl8m33lRoC+vFMkP3gl0WsDr6+gzxbbTA==",
             "dev": true,
+            "optional": true,
+            "peer": true,
             "dependencies": {
                 "readable-stream": "^2.0.1"
             }
@@ -25332,6 +25725,11 @@
             "integrity": "sha512-qsdtZH+vMoCARQtyod4imc2nIJwg9Cc7lPRrw9CzF8ZKR0khdr8+2nX80PBhET3tcyTtJDxAffGh2rXH4tyU8A==",
             "dev": true
         },
+        "node_modules/tiny-emitter": {
+            "version": "2.1.0",
+            "resolved": "https://registry.npmjs.org/tiny-emitter/-/tiny-emitter-2.1.0.tgz",
+            "integrity": "sha512-NB6Dk1A9xgQPMoGqC5CVXn123gWyte215ONT5Pp5a0yt4nlEoO1ZWeCwpncaekPHXO60i47ihFnZPiRPjRMq4Q=="
+        },
         "node_modules/tinycolor2": {
             "version": "1.4.2",
             "resolved": "https://registry.npmmirror.com/tinycolor2/-/tinycolor2-1.4.2.tgz",
@@ -25474,6 +25872,8 @@
             "resolved": "https://registry.npmmirror.com/true-case-path/-/true-case-path-1.0.3.tgz",
             "integrity": "sha512-m6s2OdQe5wgpFMC+pAJ+q9djG82O2jcHPOI6RNg1yy9rCYR+WD6Nbpl32fDpfC56nirdRy+opFa/Vk7HYhqaew==",
             "dev": true,
+            "optional": true,
+            "peer": true,
             "dependencies": {
                 "glob": "^7.1.2"
             }
@@ -26018,6 +26418,61 @@
             "resolved": "https://registry.npmmirror.com/vm-browserify/-/vm-browserify-1.1.2.tgz",
             "integrity": "sha512-2ham8XPWTONajOR0ohOKOHXkm3+gaBmGut3SRuu75xLd/RRaY6vqgh8NBYYk7+RW3u5AtzPQZG8F10LHkl0lAQ=="
         },
+        "node_modules/vscode-jsonrpc": {
+            "version": "5.0.1",
+            "resolved": "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-5.0.1.tgz",
+            "integrity": "sha512-JvONPptw3GAQGXlVV2utDcHx0BiY34FupW/kI6mZ5x06ER5DdPG/tXWMVHjTNULF5uKPOUUD0SaXg5QaubJL0A==",
+            "engines": {
+                "node": ">=8.0.0 || >=10.0.0"
+            }
+        },
+        "node_modules/vscode-languageclient": {
+            "version": "6.1.4",
+            "resolved": "https://registry.npmjs.org/vscode-languageclient/-/vscode-languageclient-6.1.4.tgz",
+            "integrity": "sha512-EUOU+bJu6axmt0RFNo3nrglQLPXMfanbYViJee3Fbn2VuQoX0ZOI4uTYhSRvYLP2vfwTP/juV62P/mksCdTZMA==",
+            "dependencies": {
+                "semver": "^6.3.0",
+                "vscode-languageserver-protocol": "3.15.3"
+            },
+            "engines": {
+                "vscode": "^1.41.0"
+            }
+        },
+        "node_modules/vscode-languageclient/node_modules/semver": {
+            "version": "6.3.1",
+            "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
+            "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
+            "bin": {
+                "semver": "bin/semver.js"
+            }
+        },
+        "node_modules/vscode-languageserver-protocol": {
+            "version": "3.15.3",
+            "resolved": "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.15.3.tgz",
+            "integrity": "sha512-zrMuwHOAQRhjDSnflWdJG+O2ztMWss8GqUUB8dXLR/FPenwkiBNkMIJJYfSN6sgskvsF0rHAoBowNQfbyZnnvw==",
+            "dependencies": {
+                "vscode-jsonrpc": "^5.0.1",
+                "vscode-languageserver-types": "3.15.1"
+            }
+        },
+        "node_modules/vscode-languageserver-types": {
+            "version": "3.15.1",
+            "resolved": "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.15.1.tgz",
+            "integrity": "sha512-+a9MPUQrNGRrGU630OGbYVQ+11iOIovjCkqxajPa9w57Sd5ruK8WQNsslzpa0x/QJqC8kRc2DUxWjIFwoNm4ZQ=="
+        },
+        "node_modules/vscode-uri": {
+            "version": "2.1.2",
+            "resolved": "https://registry.npmjs.org/vscode-uri/-/vscode-uri-2.1.2.tgz",
+            "integrity": "sha512-8TEXQxlldWAuIODdukIb+TR5s+9Ds40eSJrw+1iDDA9IFORPjMELarNQE3myz5XIkWWpdprmJjm1/SxMlWOC8A=="
+        },
+        "node_modules/vscode-ws-jsonrpc": {
+            "version": "0.2.0",
+            "resolved": "https://registry.npmjs.org/vscode-ws-jsonrpc/-/vscode-ws-jsonrpc-0.2.0.tgz",
+            "integrity": "sha512-NE9HNRgPjCaPyTJvIudcpyIWPImxwRDtuTX16yks7SAiZgSXigxAiZOvSvVBGmD1G/OMfrFo6BblOtjVR9DdVA==",
+            "dependencies": {
+                "vscode-jsonrpc": "^5.0.0"
+            }
+        },
         "node_modules/vue": {
             "version": "2.6.12",
             "resolved": "https://registry.npmmirror.com/vue/-/vue-2.6.12.tgz",
@@ -26152,6 +26607,14 @@
             "integrity": "sha512-4gDntzrifFnCEvyoO8PqyJDmguXgVPxKiIxrBKjIowvL9l+N66196+72XVYR8BBf1Uv1Fgt3bGevJ+sEmxfZzw==",
             "dev": true
         },
+        "node_modules/vuedraggable": {
+            "version": "2.24.3",
+            "resolved": "https://registry.npmjs.org/vuedraggable/-/vuedraggable-2.24.3.tgz",
+            "integrity": "sha512-6/HDXi92GzB+Hcs9fC6PAAozK1RLt1ewPTLjK0anTYguXLAeySDmcnqE8IC0xa7shvSzRjQXq3/+dsZ7ETGF3g==",
+            "dependencies": {
+                "sortablejs": "1.10.2"
+            }
+        },
         "node_modules/vuescroll": {
             "version": "4.16.1",
             "resolved": "https://registry.npmmirror.com/vuescroll/-/vuescroll-4.16.1.tgz",
@@ -26160,6 +26623,11 @@
                 "vue": "^2.0.0"
             }
         },
+        "node_modules/watch-size": {
+            "version": "2.0.0",
+            "resolved": "https://registry.npmjs.org/watch-size/-/watch-size-2.0.0.tgz",
+            "integrity": "sha512-M92R89dNoTPWyCD+HuUEDdhaDnh9jxPGOwlDc0u51jAgmjUvzqaEMynXSr3BaWs+QdHYk4KzibPy1TFtjLmOZQ=="
+        },
         "node_modules/watchpack": {
             "version": "1.7.5",
             "resolved": "https://registry.npmmirror.com/watchpack/-/watchpack-1.7.5.tgz",
@@ -27225,6 +27693,21 @@
                 "async-limiter": "~1.0.0"
             }
         },
+        "node_modules/xss": {
+            "version": "1.0.15",
+            "resolved": "https://registry.npmjs.org/xss/-/xss-1.0.15.tgz",
+            "integrity": "sha512-FVdlVVC67WOIPvfOwhoMETV72f6GbW7aOabBC3WxN/oUdoEMDyLz4OgRv5/gck2ZeNqEQu+Tb0kloovXOfpYVg==",
+            "dependencies": {
+                "commander": "^2.20.3",
+                "cssfilter": "0.0.10"
+            },
+            "bin": {
+                "xss": "bin/xss"
+            },
+            "engines": {
+                "node": ">= 0.10.0"
+            }
+        },
         "node_modules/xtend": {
             "version": "4.0.2",
             "resolved": "https://registry.npmmirror.com/xtend/-/xtend-4.0.2.tgz",
@@ -27474,6 +27957,115 @@
             "version": "4.3.2",
             "resolved": "https://registry.npmmirror.com/zrender/-/zrender-4.3.2.tgz",
             "integrity": "sha512-bIusJLS8c4DkIcdiK+s13HiQ/zjQQVgpNohtd8d94Y2DnJqgM1yjh/jpDb8DoL6hd7r8Awagw8e3qK/oLaWr3g=="
+        },
+        "packages/apiServices": {
+            "name": "@dataspherestudio/apiServices",
+            "version": "1.1.19",
+            "dependencies": {
+                "@dataspherestudio/shared": "^1.1.19"
+            }
+        },
+        "packages/cyeditor": {
+            "name": "@dataspherestudio/cyeditor",
+            "version": "0.0.1",
+            "dependencies": {
+                "cytoscape": "3.27.0",
+                "cytoscape-klay": "^3.1.4"
+            },
+            "devDependencies": {}
+        },
+        "packages/dataGovernance": {
+            "name": "@dataspherestudio/dataGovernance",
+            "version": "1.1.19",
+            "dependencies": {
+                "@dataspherestudio/shared": "^1.1.19",
+                "clipboard": "2.0.8",
+                "jquery": "3.6.0"
+            }
+        },
+        "packages/dolphinScheduler": {
+            "name": "@dataspherestudio/dolphinScheduler",
+            "version": "1.1.19",
+            "dependencies": {
+                "@dataspherestudio/shared": "^1.1.19",
+                "bootstrap": "^3.4.1",
+                "d3": "3.5.17",
+                "dayjs": "1.10.7",
+                "moment-timezone": "^0.5.34"
+            }
+        },
+        "packages/dss": {
+            "name": "@dataspherestudio/dss",
+            "version": "1.1.19",
+            "dependencies": {
+                "@dataspherestudio/scriptis": "^1.1.19",
+                "@dataspherestudio/shared": "^1.1.19"
+            },
+            "devDependencies": {
+                "@vue/cli-plugin-babel": "3.12.1",
+                "@vue/cli-plugin-eslint": "3.12.1",
+                "@vue/cli-service": "3.12.1",
+                "@vue/eslint-config-standard": "4.0.0",
+                "babel-plugin-transform-remove-console": "6.9.4"
+            }
+        },
+        "packages/editor": {
+            "name": "@dataspherestudio/editor",
+            "version": "1.1.19",
+            "dependencies": {
+                "@dataspherestudio/shared": "^1.1.19",
+                "dt-sql-parser": "1.2.1"
+            }
+        },
+        "packages/editorLsp": {
+            "name": "@dataspherestudio/editor-lsp",
+            "version": "1.1.19",
+            "dependencies": {
+                "@dataspherestudio/shared": "^1.1.19",
+                "reconnecting-websocket": "4.4.0",
+                "vscode-ws-jsonrpc": "0.2.0"
+            }
+        },
+        "packages/exts": {
+            "name": "@dataspherestudio/exts",
+            "version": "1.1.19",
+            "dependencies": {
+                "@dataspherestudio/shared": "^1.1.19"
+            }
+        },
+        "packages/scriptis": {
+            "name": "@dataspherestudio/scriptis",
+            "version": "1.1.19",
+            "dependencies": {
+                "@dataspherestudio/shared": "^1.1.19",
+                "vuedraggable": "2.24.3"
+            }
+        },
+        "packages/shared": {
+            "name": "@dataspherestudio/shared",
+            "version": "1.1.19",
+            "dependencies": {
+                "dexie": "3.0.4"
+            }
+        },
+        "packages/workflows": {
+            "name": "@dataspherestudio/workflows",
+            "version": "1.1.19",
+            "dependencies": {
+                "@dataspherestudio/cyeditor": "^0.0.1",
+                "@dataspherestudio/scriptis": "^1.1.19",
+                "@dataspherestudio/shared": "^1.1.19"
+            }
+        },
+        "packages/workspace": {
+            "name": "@dataspherestudio/workspace",
+            "version": "1.1.19",
+            "dependencies": {
+                "@dataspherestudio/shared": "^1.1.19",
+                "@riophae/vue-treeselect": "0.4.0",
+                "highlight.js": "9.18.3",
+                "mavon-editor": "2.10.4"
+            }
         }
     },
     "dependencies": {
@@ -28379,7 +28971,6 @@
             "version": "7.17.9",
             "resolved": "https://registry.npmmirror.com/@babel/runtime/-/runtime-7.17.9.tgz",
             "integrity": "sha512-lSiBBvodq29uShpWGNbgFdKYNiFDo5/HIYsaCEY9ff4sb10x9jizo2+pRrSyF4jKZCXqgzuqBOQKbUm90gQwJg==",
-            "dev": true,
             "requires": {
                 "regenerator-runtime": "^0.13.4"
             }
@@ -28450,6 +29041,100 @@
                 "to-fast-properties": "^2.0.0"
             }
         },
+        "@dataspherestudio/apiServices": {
+            "version": "file:packages/apiServices",
+            "requires": {
+                "@dataspherestudio/shared": "^1.1.19"
+            }
+        },
+        "@dataspherestudio/cyeditor": {
+            "version": "file:packages/cyeditor",
+            "requires": {
+                "cytoscape": "3.27.0",
+                "cytoscape-klay": "^3.1.4"
+            }
+        },
+        "@dataspherestudio/dataGovernance": {
+            "version": "file:packages/dataGovernance",
+            "requires": {
+                "@dataspherestudio/shared": "^1.1.19",
+                "clipboard": "2.0.8",
+                "jquery": "3.6.0"
+            }
+        },
+        "@dataspherestudio/dolphinScheduler": {
+            "version": "file:packages/dolphinScheduler",
+            "requires": {
+                "@dataspherestudio/shared": "^1.1.19",
+                "bootstrap": "^3.4.1",
+                "d3": "3.5.17",
+                "dayjs": "1.10.7",
+                "moment-timezone": "^0.5.34"
+            }
+        },
+        "@dataspherestudio/dss": {
+            "version": "file:packages/dss",
+            "requires": {
+                "@dataspherestudio/scriptis": "^1.1.19",
+                "@dataspherestudio/shared": "^1.1.19",
+                "@vue/cli-plugin-babel": "3.12.1",
+                "@vue/cli-plugin-eslint": "3.12.1",
+                "@vue/cli-service": "3.12.1",
+                "@vue/eslint-config-standard": "4.0.0",
+                "babel-plugin-transform-remove-console": "6.9.4"
+            }
+        },
+        "@dataspherestudio/editor": {
+            "version": "file:packages/editor",
+            "requires": {
+                "@dataspherestudio/shared": "^1.1.19",
+                "dt-sql-parser": "1.2.1"
+            }
+        },
+        "@dataspherestudio/editor-lsp": {
+            "version": "file:packages/editorLsp",
+            "requires": {
+                "@dataspherestudio/shared": "^1.1.19",
+                "reconnecting-websocket": "4.4.0",
+                "vscode-ws-jsonrpc": "0.2.0"
+            }
+        },
+        "@dataspherestudio/exts": {
+            "version": "file:packages/exts",
+            "requires": {
+                "@dataspherestudio/shared": "^1.1.19"
+            }
+        },
+        "@dataspherestudio/scriptis": {
+            "version": "file:packages/scriptis",
+            "requires": {
+                "@dataspherestudio/shared": "^1.1.19",
+                "vuedraggable": "2.24.3"
+            }
+        },
+        "@dataspherestudio/shared": {
+            "version": "file:packages/shared",
+            "requires": {
+                "dexie": "3.0.4"
+            }
+        },
+        "@dataspherestudio/workflows": {
+            "version": "file:packages/workflows",
+            "requires": {
+                "@dataspherestudio/cyeditor": "^0.0.1",
+                "@dataspherestudio/scriptis": "^1.1.19",
+                "@dataspherestudio/shared": "^1.1.19"
+            }
+        },
+        "@dataspherestudio/workspace": {
+            "version": "file:packages/workspace",
+            "requires": {
+                "@dataspherestudio/shared": "^1.1.19",
+                "@riophae/vue-treeselect": "0.4.0",
+                "highlight.js": "9.18.3",
+                "mavon-editor": "2.10.4"
+            }
+        },
         "@gar/promisify": {
             "version": "1.1.3",
             "resolved": "https://registry.npmmirror.com/@gar/promisify/-/promisify-1.1.3.tgz",
@@ -32074,6 +32759,21 @@
                 "@octokit/openapi-types": "^11.2.0"
             }
         },
+        "@riophae/vue-treeselect": {
+            "version": "0.4.0",
+            "resolved": "https://registry.npmjs.org/@riophae/vue-treeselect/-/vue-treeselect-0.4.0.tgz",
+            "integrity": "sha512-J4atYmBqXQmiPFK/0B5sXKjtnGc21mBJEiyKIDZwk0Q9XuynVFX6IJ4EpaLmUgL5Tve7HAS7wkiGGSti6Uaxcg==",
+            "requires": {
+                "@babel/runtime": "^7.3.1",
+                "babel-helper-vue-jsx-merge-props": "^2.0.3",
+                "easings-css": "^1.0.0",
+                "fuzzysearch": "^1.0.3",
+                "is-promise": "^2.1.0",
+                "lodash": "^4.0.0",
+                "material-colors": "^1.2.6",
+                "watch-size": "^2.0.0"
+            }
+        },
         "@samverschueren/stream-to-observable": {
             "version": "0.3.1",
             "resolved": "https://registry.npmmirror.com/@samverschueren/stream-to-observable/-/stream-to-observable-0.3.1.tgz",
@@ -33071,7 +33771,9 @@
             "version": "1.0.1",
             "resolved": "https://registry.npmmirror.com/amdefine/-/amdefine-1.0.1.tgz",
             "integrity": "sha512-S2Hw0TtNkMJhIabBwIojKL9YHO5T0n5eNqWJ7Lrlel/zDbftQpxpapi8tZs3X1HWa+u+QeydGmzzNU0m09+Rcg==",
-            "dev": true
+            "dev": true,
+            "optional": true,
+            "peer": true
         },
         "ansi-colors": {
             "version": "3.2.4",
@@ -33121,7 +33823,7 @@
             "version": "3.1.2",
             "resolved": "https://registry.npmmirror.com/anymatch/-/anymatch-3.1.2.tgz",
             "integrity": "sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg==",
-            "optional": true,
+            "devOptional": true,
             "requires": {
                 "normalize-path": "^3.0.0",
                 "picomatch": "^2.0.4"
@@ -33379,7 +34081,9 @@
             "version": "0.1.3",
             "resolved": "https://registry.npmmirror.com/async-foreach/-/async-foreach-0.1.3.tgz",
             "integrity": "sha512-VUeSMD8nEGBWaZK4lizI1sf3yEC7pnAQ/mrI7pC2fBz2s/tq5jWWEngTwaf0Gruu/OoXRGLGg1XFqpYBiGTYJA==",
-            "dev": true
+            "dev": true,
+            "optional": true,
+            "peer": true
         },
         "async-limiter": {
             "version": "1.0.1",
@@ -33525,6 +34229,11 @@
                 "resolve": "^1.12.0"
             }
         },
+        "babel-helper-vue-jsx-merge-props": {
+            "version": "2.0.3",
+            "resolved": "https://registry.npmjs.org/babel-helper-vue-jsx-merge-props/-/babel-helper-vue-jsx-merge-props-2.0.3.tgz",
+            "integrity": "sha512-gsLiKK7Qrb7zYJNgiXKpXblxbV5ffSwR0f5whkPAaBAR4fhi6bwRZxX9wBlIc5M/v8CCkXUbXZL4N/nSE97cqg=="
+        },
         "babel-loader": {
             "version": "8.2.5",
             "resolved": "https://registry.npmmirror.com/babel-loader/-/babel-loader-8.2.5.tgz",
@@ -33696,6 +34405,12 @@
                 "@babel/helper-define-polyfill-provider": "^0.3.1"
             }
         },
+        "babel-plugin-transform-remove-console": {
+            "version": "6.9.4",
+            "resolved": "https://registry.npmjs.org/babel-plugin-transform-remove-console/-/babel-plugin-transform-remove-console-6.9.4.tgz",
+            "integrity": "sha512-88blrUrMX3SPiGkT1GnvVY8E/7A+k6oj3MNvUtTIxJflFzXTw1bHkuJ/y039ouhFMp2prRn5cQGzokViYi1dsg==",
+            "dev": true
+        },
         "babel-polyfill": {
             "version": "6.26.0",
             "resolved": "https://registry.npmmirror.com/babel-polyfill/-/babel-polyfill-6.26.0.tgz",
@@ -33836,7 +34551,7 @@
             "version": "2.2.0",
             "resolved": "https://registry.npmmirror.com/binary-extensions/-/binary-extensions-2.2.0.tgz",
             "integrity": "sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==",
-            "optional": true
+            "devOptional": true
         },
         "bindings": {
             "version": "1.5.0",
@@ -33949,6 +34664,11 @@
             "resolved": "https://registry.npmmirror.com/boolbase/-/boolbase-1.0.0.tgz",
             "integrity": "sha512-JZOSA7Mo9sNGB8+UjSgzdLtokWAky1zbztM3WRLCbZ70/3cTANmQmOdR7y2g+J0e2WXywy1yS468tY+IruqEww=="
         },
+        "bootstrap": {
+            "version": "3.4.1",
+            "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-3.4.1.tgz",
+            "integrity": "sha512-yN5oZVmRCwe5aKwzRj6736nSmKDX7pLYwsXiCj/EYmo16hODaBiT4En5btW/jhBF/seV+XMx3aYwukYC3A49DA=="
+        },
         "brace-expansion": {
             "version": "1.1.11",
             "resolved": "https://registry.npmmirror.com/brace-expansion/-/brace-expansion-1.1.11.tgz",
@@ -34468,7 +35188,7 @@
             "version": "3.5.3",
             "resolved": "https://registry.npmmirror.com/chokidar/-/chokidar-3.5.3.tgz",
             "integrity": "sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==",
-            "optional": true,
+            "devOptional": true,
             "requires": {
                 "anymatch": "~3.1.2",
                 "braces": "~3.0.2",
@@ -34484,7 +35204,7 @@
                     "version": "3.0.2",
                     "resolved": "https://registry.npmmirror.com/braces/-/braces-3.0.2.tgz",
                     "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
-                    "optional": true,
+                    "devOptional": true,
                     "requires": {
                         "fill-range": "^7.0.1"
                     }
@@ -34493,7 +35213,7 @@
                     "version": "7.0.1",
                     "resolved": "https://registry.npmmirror.com/fill-range/-/fill-range-7.0.1.tgz",
                     "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
-                    "optional": true,
+                    "devOptional": true,
                     "requires": {
                         "to-regex-range": "^5.0.1"
                     }
@@ -34502,13 +35222,13 @@
                     "version": "7.0.0",
                     "resolved": "https://registry.npmmirror.com/is-number/-/is-number-7.0.0.tgz",
                     "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
-                    "optional": true
+                    "devOptional": true
                 },
                 "to-regex-range": {
                     "version": "5.0.1",
                     "resolved": "https://registry.npmmirror.com/to-regex-range/-/to-regex-range-5.0.1.tgz",
                     "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
-                    "optional": true,
+                    "devOptional": true,
                     "requires": {
                         "is-number": "^7.0.0"
                     }
@@ -34737,6 +35457,16 @@
             "dev": true,
             "optional": true
         },
+        "clipboard": {
+            "version": "2.0.8",
+            "resolved": "https://registry.npmjs.org/clipboard/-/clipboard-2.0.8.tgz",
+            "integrity": "sha512-Y6WO0unAIQp5bLmk1zdThRhgJt/x3ks6f30s3oE3H1mgIEU33XyQjEf8gsf6DxC7NPX8Y1SsNWjUjL/ywLnnbQ==",
+            "requires": {
+                "good-listener": "^1.2.2",
+                "select": "^1.1.2",
+                "tiny-emitter": "^2.0.0"
+            }
+        },
         "clipboardy": {
             "version": "2.3.0",
             "resolved": "https://registry.npmmirror.com/clipboardy/-/clipboardy-2.3.0.tgz",
@@ -36346,6 +37076,11 @@
             "integrity": "sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==",
             "dev": true
         },
+        "cssfilter": {
+            "version": "0.0.10",
+            "resolved": "https://registry.npmjs.org/cssfilter/-/cssfilter-0.0.10.tgz",
+            "integrity": "sha512-FAaLDaplstoRsDR8XGYH51znUN0UY7nMc6Z9/fvE8EXGwvJE9hu7W2vHwx1+bd6gCYnln9nLbzxFTrcO9YQDZw=="
+        },
         "cssnano": {
             "version": "4.1.11",
             "resolved": "https://registry.npmmirror.com/cssnano/-/cssnano-4.1.11.tgz",
@@ -36463,6 +37198,35 @@
             "resolved": "https://registry.npmmirror.com/cyclist/-/cyclist-1.0.1.tgz",
             "integrity": "sha512-NJGVKPS81XejHcLhaLJS7plab0fK3slPh11mESeeDq2W4ZI5kUKK/LRRdVDvjJseojbPB7ZwjnyOybg3Igea/A=="
         },
+        "cytoscape": {
+            "version": "3.27.0",
+            "resolved": "https://registry.npmjs.org/cytoscape/-/cytoscape-3.27.0.tgz",
+            "integrity": "sha512-pPZJilfX9BxESwujODz5pydeGi+FBrXq1rcaB1mfhFXXFJ9GjE6CNndAk+8jPzoXGD+16LtSS4xlYEIUiW4Abg==",
+            "requires": {
+                "heap": "^0.2.6",
+                "lodash": "^4.17.21"
+            },
+            "dependencies": {
+                "lodash": {
+                    "version": "4.17.21",
+                    "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
+                    "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg=="
+                }
+            }
+        },
+        "cytoscape-klay": {
+            "version": "3.1.4",
+            "resolved": "https://registry.npmjs.org/cytoscape-klay/-/cytoscape-klay-3.1.4.tgz",
+            "integrity": "sha512-VwPj0VR25GPfy6qXVQRi/MYlZM/zkdvRhHlgqbM//lSvstgM6fhp3ik/uM8Wr8nlhskfqz/M1fIDmR6UckbS2A==",
+            "requires": {
+                "klayjs": "^0.4.1"
+            }
+        },
+        "d3": {
+            "version": "3.5.17",
+            "resolved": "https://registry.npmjs.org/d3/-/d3-3.5.17.tgz",
+            "integrity": "sha512-yFk/2idb8OHPKkbAL8QaOaqENNoMhIaSHZerk3oQsECwkObkCpJyjYwCe+OHiq6UEdhe1m8ZGARRRO3ljFjlKg=="
+        },
         "d3-dispatch": {
             "version": "2.0.0",
             "resolved": "https://registry.npmmirror.com/d3-dispatch/-/d3-dispatch-2.0.0.tgz",
@@ -36524,6 +37288,11 @@
             "integrity": "sha512-jyCETtSl3VMZMWeRo7iY1FL19ges1t55hMo5yaam4Jrsm5EPL89UQkoQRyiI+Yf4k8r2ZpdngkV8hr1lIdjb3Q==",
             "dev": true
         },
+        "dayjs": {
+            "version": "1.10.7",
+            "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.10.7.tgz",
+            "integrity": "sha512-P6twpd70BcPK34K26uJ1KT3wlhpuOAPoMwJzpsIWUxHZ7wpmbdZL/hQqBDfz7hGurYSa5PhzdhDHtt319hL3ig=="
+        },
         "de-indent": {
             "version": "1.0.2",
             "resolved": "https://registry.npmmirror.com/de-indent/-/de-indent-1.0.2.tgz",
@@ -36818,6 +37587,11 @@
             "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==",
             "dev": true
         },
+        "delegate": {
+            "version": "3.2.0",
+            "resolved": "https://registry.npmjs.org/delegate/-/delegate-3.2.0.tgz",
+            "integrity": "sha512-IofjkYBZaZivn0V8nnsMJGBr4jVLxHDheKSW88PyxS5QC4Vo9ZbZVvhzlSxY87fVq3STR6r+4cGepyHkcWOQSw=="
+        },
         "delegates": {
             "version": "1.0.0",
             "resolved": "https://registry.npmmirror.com/delegates/-/delegates-1.0.0.tgz",
@@ -36863,6 +37637,11 @@
             "integrity": "sha512-T0NIuQpnTvFDATNuHN5roPwSBG83rFsuO+MXXH9/3N1eFbn4wcPjttvjMLEPWJ0RGUYgQE7cGgS3tNxbqCGM7g==",
             "dev": true
         },
+        "dexie": {
+            "version": "3.0.4",
+            "resolved": "https://registry.npmjs.org/dexie/-/dexie-3.0.4.tgz",
+            "integrity": "sha512-rwS3k8BBstjGFJAS/yjYrsRZucqitnrP3NBhqghl9ihWcWABlT3I5f2dZV9T3pmXGAP7G9p1q00g/axcsuOT8A=="
+        },
         "dezalgo": {
             "version": "1.0.4",
             "resolved": "https://registry.npmmirror.com/dezalgo/-/dezalgo-1.0.4.tgz",
@@ -37026,6 +37805,11 @@
             "integrity": "sha512-YXQl1DSa4/PQyRfgrv6aoNjhasp/p4qs9FjJ4q4cQk+8m4r6k4ZSiEyytKG8f8W9gi8WsQtIObNmKd+tMzNTmA==",
             "dev": true
         },
+        "dt-sql-parser": {
+            "version": "1.2.1",
+            "resolved": "https://registry.npmjs.org/dt-sql-parser/-/dt-sql-parser-1.2.1.tgz",
+            "integrity": "sha512-bp6Rtm8N3m2Z3tavtKGo8J5ffaPQdPodYV2xGi9f6IsWbHzOkpNBxHlORcWtnSLtA/JvZcvImQxgbkdaGiv5cw=="
+        },
         "duplexer": {
             "version": "0.1.2",
             "resolved": "https://registry.npmmirror.com/duplexer/-/duplexer-0.1.2.tgz",
@@ -37043,6 +37827,11 @@
                 "stream-shift": "^1.0.0"
             }
         },
+        "easings-css": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmjs.org/easings-css/-/easings-css-1.0.0.tgz",
+            "integrity": "sha512-7Uq7NdazNfVtr0RNmPAys8it0zKCuaqxJStYKEl72D3j4gbvXhhaM7iWNbqhA4C94ygCye6VuyhzBRQC4szeBg=="
+        },
         "easy-stack": {
             "version": "1.0.1",
             "resolved": "https://registry.npmmirror.com/easy-stack/-/easy-stack-1.0.1.tgz",
@@ -38896,6 +39685,11 @@
             "integrity": "sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==",
             "dev": true
         },
+        "fuzzysearch": {
+            "version": "1.0.3",
+            "resolved": "https://registry.npmjs.org/fuzzysearch/-/fuzzysearch-1.0.3.tgz",
+            "integrity": "sha512-s+kNWQuI3mo9OALw0HJ6YGmMbLqEufCh2nX/zzV5CrICQ/y4AwPxM+6TIiF9ItFCHXFCyM/BfCCmN57NTIJuPg=="
+        },
         "g-status": {
             "version": "2.0.2",
             "resolved": "https://registry.npmmirror.com/g-status/-/g-status-2.0.2.tgz",
@@ -38973,6 +39767,8 @@
             "resolved": "https://registry.npmmirror.com/gaze/-/gaze-1.1.3.tgz",
             "integrity": "sha512-BRdNm8hbWzFzWHERTrejLqwHDfS4GibPoq5wjTPIoJHoBtKGPg3xAFfxmM+9ztbXelxcf2hwQcaz1PtmFeue8g==",
             "dev": true,
+            "optional": true,
+            "peer": true,
             "requires": {
                 "globule": "^1.0.0"
             }
@@ -39252,8 +40048,7 @@
         "glob-to-regexp": {
             "version": "0.3.0",
             "resolved": "https://registry.npmmirror.com/glob-to-regexp/-/glob-to-regexp-0.3.0.tgz",
-            "integrity": "sha512-Iozmtbqv0noj0uDDqoL0zNq0VBEfK2YFoMAZoxJe4cwphvLR+JskfF30QhXHOR4m3KrE6NLRYw+U9MRXvifyig==",
-            "dev": true
+            "integrity": "sha512-Iozmtbqv0noj0uDDqoL0zNq0VBEfK2YFoMAZoxJe4cwphvLR+JskfF30QhXHOR4m3KrE6NLRYw+U9MRXvifyig=="
         },
         "glob2base": {
             "version": "0.0.12",
@@ -39299,6 +40094,8 @@
             "resolved": "https://registry.npmmirror.com/globule/-/globule-1.3.3.tgz",
             "integrity": "sha512-mb1aYtDbIjTu4ShMB85m3UzjX9BVKe9WCzsnfMSZk+K5GpIbBOexgg4PPCt5eHDEG5/ZQAUX2Kct02zfiPLsKg==",
             "dev": true,
+            "optional": true,
+            "peer": true,
             "requires": {
                 "glob": "~7.1.1",
                 "lodash": "~4.17.10",
@@ -39310,6 +40107,8 @@
                     "resolved": "https://registry.npmmirror.com/glob/-/glob-7.1.7.tgz",
                     "integrity": "sha512-OvD9ENzPLbegENnYP5UUfJIirTg4+XwMWGaQfQTY0JenxNvvIKP3U3/tAQSPIu/lHxXYSZmpXlUHeqAIdKzBLQ==",
                     "dev": true,
+                    "optional": true,
+                    "peer": true,
                     "requires": {
                         "fs.realpath": "^1.0.0",
                         "inflight": "^1.0.4",
@@ -39324,12 +40123,22 @@
                     "resolved": "https://registry.npmmirror.com/minimatch/-/minimatch-3.0.8.tgz",
                     "integrity": "sha512-6FsRAQsxQ61mw+qP1ZzbL9Bc78x2p5OqNgNpnoAFLTrX8n5Kxph0CsnhmKKNXTWjXqU5L0pGPR7hYk+XWZr60Q==",
                     "dev": true,
+                    "optional": true,
+                    "peer": true,
                     "requires": {
                         "brace-expansion": "^1.1.7"
                     }
                 }
             }
         },
+        "good-listener": {
+            "version": "1.2.2",
+            "resolved": "https://registry.npmjs.org/good-listener/-/good-listener-1.2.2.tgz",
+            "integrity": "sha512-goW1b+d9q/HIwbVYZzZ6SsTr4IgE+WA44A0GmPIQstuOrgsFcT7VEJ48nmr9GaRtNu0XTKacFLGnBPAM6Afouw==",
+            "requires": {
+                "delegate": "^3.1.2"
+            }
+        },
         "graceful-fs": {
             "version": "4.2.10",
             "resolved": "https://registry.npmmirror.com/graceful-fs/-/graceful-fs-4.2.10.tgz",
@@ -39541,12 +40350,22 @@
             "integrity": "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==",
             "dev": true
         },
+        "heap": {
+            "version": "0.2.7",
+            "resolved": "https://registry.npmjs.org/heap/-/heap-0.2.7.tgz",
+            "integrity": "sha512-2bsegYkkHO+h/9MGbn6KWcE45cHZgPANo5LXF7EvWdT0yT2EguSVO1nDgU5c8+ZOPwp2vMNa7YFsJhVcDR9Sdg=="
+        },
         "hex-color-regex": {
             "version": "1.1.0",
             "resolved": "https://registry.npmmirror.com/hex-color-regex/-/hex-color-regex-1.1.0.tgz",
             "integrity": "sha512-l9sfDFsuqtOqKDsQdqrMRk0U85RZc0RtOR9yPI7mRVOa4FsR/BVnZ0shmQRM96Ji99kYZP/7hn1cedc1+ApsTQ==",
             "dev": true
         },
+        "highlight.js": {
+            "version": "9.18.3",
+            "resolved": "https://registry.npmjs.org/highlight.js/-/highlight.js-9.18.3.tgz",
+            "integrity": "sha512-zBZAmhSupHIl5sITeMqIJnYCDfAEc3Gdkqj65wC1lpI468MMQeeQkhcIAvk+RylAkxrCcI9xy9piHiXeQ1BdzQ=="
+        },
         "hmac-drbg": {
             "version": "1.0.1",
             "resolved": "https://registry.npmmirror.com/hmac-drbg/-/hmac-drbg-1.0.1.tgz",
@@ -39993,6 +40812,12 @@
             "integrity": "sha512-6TDAlDPZxUFCv+fuOkIoXT/V/f3Qbq8e37p+YOiYrUv3v9cc3/6x78VdfPgFVaB9dZYeLUfKgHRebpkm/oP2VQ==",
             "dev": true
         },
+        "immutable": {
+            "version": "4.3.6",
+            "resolved": "https://registry.npmjs.org/immutable/-/immutable-4.3.6.tgz",
+            "integrity": "sha512-Ju0+lEMyzMVZarkTn/gqRpdqd5dOPaz1mCZ0SH3JV6iFw81PldE/PEB1hWVEA288HPt4WXW8O7AWxB10M+03QQ==",
+            "dev": true
+        },
         "import-cwd": {
             "version": "2.1.0",
             "resolved": "https://registry.npmmirror.com/import-cwd/-/import-cwd-2.1.0.tgz",
@@ -40330,7 +41155,7 @@
             "version": "2.1.0",
             "resolved": "https://registry.npmmirror.com/is-binary-path/-/is-binary-path-2.1.0.tgz",
             "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==",
-            "optional": true,
+            "devOptional": true,
             "requires": {
                 "binary-extensions": "^2.0.0"
             }
@@ -40587,8 +41412,7 @@
         "is-promise": {
             "version": "2.2.2",
             "resolved": "https://registry.npmmirror.com/is-promise/-/is-promise-2.2.2.tgz",
-            "integrity": "sha512-+lP4/6lKUBfQjZ2pdxThZvLUAafmZb8OAxFb8XXtiQmS35INgr85hdOGoEs124ez1FCnZJt6jau/T+alh58QFQ==",
-            "dev": true
+            "integrity": "sha512-+lP4/6lKUBfQjZ2pdxThZvLUAafmZb8OAxFb8XXtiQmS35INgr85hdOGoEs124ez1FCnZJt6jau/T+alh58QFQ=="
         },
         "is-regex": {
             "version": "1.1.4",
@@ -40735,8 +41559,7 @@
         "jquery": {
             "version": "3.6.0",
             "resolved": "https://registry.npmmirror.com/jquery/-/jquery-3.6.0.tgz",
-            "integrity": "sha512-JVzAR/AjBvVt2BmYhxRCSYysDsPcssdmTFnzyLEts9qNwmjmu4JTAMYubEfwVOSwpQ1I1sKKFcxhZCI2buerfw==",
-            "peer": true
+            "integrity": "sha512-JVzAR/AjBvVt2BmYhxRCSYysDsPcssdmTFnzyLEts9qNwmjmu4JTAMYubEfwVOSwpQ1I1sKKFcxhZCI2buerfw=="
         },
         "js-base64": {
             "version": "2.6.4",
@@ -40901,6 +41724,11 @@
                 "graceful-fs": "^4.1.11"
             }
         },
+        "klayjs": {
+            "version": "0.4.1",
+            "resolved": "https://registry.npmjs.org/klayjs/-/klayjs-0.4.1.tgz",
+            "integrity": "sha512-WUNxuO7O79TEkxCj6OIaK5TJBkaWaR/IKNTakgV9PwDn+mrr63MLHed34AcE2yTaDntgO6l0zGFIzhcoTeroTA=="
+        },
         "klona": {
             "version": "2.0.5",
             "resolved": "https://registry.npmmirror.com/klona/-/klona-2.0.5.tgz",
@@ -41966,12 +42794,25 @@
                 "escape-string-regexp": "^1.0.4"
             }
         },
+        "material-colors": {
+            "version": "1.2.6",
+            "resolved": "https://registry.npmjs.org/material-colors/-/material-colors-1.2.6.tgz",
+            "integrity": "sha512-6qE4B9deFBIa9YSpOc9O0Sgc43zTeVYbgDT5veRKSlB2+ZuHNoVVxA1L/ckMUayV9Ay9y7Z/SZCLcGteW9i7bg=="
+        },
         "math-random": {
             "version": "1.0.4",
             "resolved": "https://registry.npmmirror.com/math-random/-/math-random-1.0.4.tgz",
             "integrity": "sha512-rUxjysqif/BZQH2yhd5Aaq7vXMSx9NdEsQcyA07uEzIvxgI7zIr33gGsh+RU0/XjmQpCW7RsVof1vlkvQVCK5A==",
             "dev": true
         },
+        "mavon-editor": {
+            "version": "2.10.4",
+            "resolved": "https://registry.npmjs.org/mavon-editor/-/mavon-editor-2.10.4.tgz",
+            "integrity": "sha512-CFsBLkgt/KZBDg+SJYe2fyYv4zClY149PiwpH0rDAiiP4ae1XNs0GC8nBsoTeipsHcebDLN1QMkt3bUsnMDjQw==",
+            "requires": {
+                "xss": "^1.0.6"
+            }
+        },
         "md5": {
             "version": "2.3.0",
             "resolved": "https://registry.npmmirror.com/md5/-/md5-2.3.0.tgz",
@@ -42643,6 +43484,21 @@
             "resolved": "https://registry.npmmirror.com/moment/-/moment-2.29.1.tgz",
             "integrity": "sha512-kHmoybcPV8Sqy59DwNDY3Jefr64lK/by/da0ViFcuA4DH0vQg5Q6Ze5VimxkfQNSC+Mls/Kx53s7TjP1RhFEDQ=="
         },
+        "moment-timezone": {
+            "version": "0.5.45",
+            "resolved": "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.45.tgz",
+            "integrity": "sha512-HIWmqA86KcmCAhnMAN0wuDOARV/525R2+lOLotuGFzn4HO+FH+/645z2wx0Dt3iDv6/p61SIvKnDstISainhLQ==",
+            "requires": {
+                "moment": "^2.29.4"
+            },
+            "dependencies": {
+                "moment": {
+                    "version": "2.30.1",
+                    "resolved": "https://registry.npmjs.org/moment/-/moment-2.30.1.tgz",
+                    "integrity": "sha512-uEmtNhbDOrWPFS+hdjFCBfy9f2YoyzRpwcl+DqpC6taX21FzsTLQVbMV/W7PzNSX6x/bhC1zA3c2UQ5NzH6how=="
+                }
+            }
+        },
         "monaco-editor": {
             "version": "0.19.3",
             "resolved": "https://registry.npmmirror.com/monaco-editor/-/monaco-editor-0.19.3.tgz",
@@ -42657,6 +43513,17 @@
                 "loader-utils": "^1.2.3"
             }
         },
+        "monaco-languageclient": {
+            "version": "0.13.0",
+            "resolved": "https://registry.npmjs.org/monaco-languageclient/-/monaco-languageclient-0.13.0.tgz",
+            "integrity": "sha512-aCwd33dTitwV5QwY56rpYHwzEGXei8TZ+yvZcvP3gEMd6Mizr8m3pOuoknDi2SUfLuNAHS6+ulvLgZlNQB5awg==",
+            "requires": {
+                "glob-to-regexp": "^0.3.0",
+                "vscode-jsonrpc": "^5.0.0",
+                "vscode-languageclient": "^6.0.0",
+                "vscode-uri": "^2.1.1"
+            }
+        },
         "move-concurrently": {
             "version": "1.0.1",
             "resolved": "https://registry.npmmirror.com/move-concurrently/-/move-concurrently-1.0.1.tgz",
@@ -42768,7 +43635,7 @@
             "version": "2.15.0",
             "resolved": "https://registry.npmmirror.com/nan/-/nan-2.15.0.tgz",
             "integrity": "sha512-8ZtvEnA2c5aYCZYd1cvgdnU6cqwixRoYg70xPLWUws5ORTa/lnw+u4amixRS/Ac5U5mQVgp9pnlSUnbNWFaWZQ==",
-            "devOptional": true
+            "optional": true
         },
         "nanomatch": {
             "version": "1.2.13",
@@ -42950,6 +43817,8 @@
             "resolved": "https://registry.npmmirror.com/node-sass/-/node-sass-6.0.1.tgz",
             "integrity": "sha512-f+Rbqt92Ful9gX0cGtdYwjTrWAaGURgaK5rZCWOgCNyGWusFYHhbqCCBoFBeat+HKETOU02AyTxNhJV0YZf2jQ==",
             "dev": true,
+            "optional": true,
+            "peer": true,
             "requires": {
                 "async-foreach": "^0.1.3",
                 "chalk": "^1.1.1",
@@ -42972,19 +43841,25 @@
                     "version": "2.1.1",
                     "resolved": "https://registry.npmmirror.com/ansi-regex/-/ansi-regex-2.1.1.tgz",
                     "integrity": "sha512-TIGnTpdo+E3+pCyAluZvtED5p5wCqLdezCyhPZzKPcxvFplEt4i+W7OONCKgeZFT3+y5NZZfOOS/Bdcanm1MYA==",
-                    "dev": true
+                    "dev": true,
+                    "optional": true,
+                    "peer": true
                 },
                 "ansi-styles": {
                     "version": "2.2.1",
                     "resolved": "https://registry.npmmirror.com/ansi-styles/-/ansi-styles-2.2.1.tgz",
                     "integrity": "sha512-kmCevFghRiWM7HB5zTPULl4r9bVFSWjz62MhqizDGUrq2NWuNMQyuv4tHHoKJHs69M/MF64lEcHdYIocrdWQYA==",
-                    "dev": true
+                    "dev": true,
+                    "optional": true,
+                    "peer": true
                 },
                 "chalk": {
                     "version": "1.1.3",
                     "resolved": "https://registry.npmmirror.com/chalk/-/chalk-1.1.3.tgz",
                     "integrity": "sha512-U3lRVLMSlsCfjqYPbLyVv11M9CPW4I728d6TCKMAOJueEeB9/8o+eSsMnxPJD+Q+K909sdESg7C+tIkoH6on1A==",
                     "dev": true,
+                    "optional": true,
+                    "peer": true,
                     "requires": {
                         "ansi-styles": "^2.2.1",
                         "escape-string-regexp": "^1.0.2",
@@ -42997,13 +43872,17 @@
                     "version": "2.0.0",
                     "resolved": "https://registry.npmmirror.com/chownr/-/chownr-2.0.0.tgz",
                     "integrity": "sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==",
-                    "dev": true
+                    "dev": true,
+                    "optional": true,
+                    "peer": true
                 },
                 "cross-spawn": {
                     "version": "7.0.3",
                     "resolved": "https://registry.npmmirror.com/cross-spawn/-/cross-spawn-7.0.3.tgz",
                     "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
                     "dev": true,
+                    "optional": true,
+                    "peer": true,
                     "requires": {
                         "path-key": "^3.1.0",
                         "shebang-command": "^2.0.0",
@@ -43015,6 +43894,8 @@
                     "resolved": "https://registry.npmmirror.com/find-up/-/find-up-4.1.0.tgz",
                     "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
                     "dev": true,
+                    "optional": true,
+                    "peer": true,
                     "requires": {
                         "locate-path": "^5.0.0",
                         "path-exists": "^4.0.0"
@@ -43025,6 +43906,8 @@
                     "resolved": "https://registry.npmmirror.com/fs-minipass/-/fs-minipass-2.1.0.tgz",
                     "integrity": "sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg==",
                     "dev": true,
+                    "optional": true,
+                    "peer": true,
                     "requires": {
                         "minipass": "^3.0.0"
                     }
@@ -43033,13 +43916,17 @@
                     "version": "4.0.1",
                     "resolved": "https://registry.npmmirror.com/get-stdin/-/get-stdin-4.0.1.tgz",
                     "integrity": "sha512-F5aQMywwJ2n85s4hJPTT9RPxGmubonuB10MNYo17/xph174n2MIR33HRguhzVag10O/npM7SPk73LMZNP+FaWw==",
-                    "dev": true
+                    "dev": true,
+                    "optional": true,
+                    "peer": true
                 },
                 "hosted-git-info": {
                     "version": "4.1.0",
                     "resolved": "https://registry.npmmirror.com/hosted-git-info/-/hosted-git-info-4.1.0.tgz",
                     "integrity": "sha512-kyCuEOWjJqZuDbRHzL8V93NzQhwIB71oFWSyzVo+KPZI+pnQPPxucdkrOZvkLRnrf5URsQM+IJ09Dw29cRALIA==",
                     "dev": true,
+                    "optional": true,
+                    "peer": true,
                     "requires": {
                         "lru-cache": "^6.0.0"
                     }
@@ -43049,6 +43936,8 @@
                     "resolved": "https://registry.npmmirror.com/locate-path/-/locate-path-5.0.0.tgz",
                     "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
                     "dev": true,
+                    "optional": true,
+                    "peer": true,
                     "requires": {
                         "p-locate": "^4.1.0"
                     }
@@ -43058,6 +43947,8 @@
                     "resolved": "https://registry.npmmirror.com/lru-cache/-/lru-cache-6.0.0.tgz",
                     "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
                     "dev": true,
+                    "optional": true,
+                    "peer": true,
                     "requires": {
                         "yallist": "^4.0.0"
                     }
@@ -43067,6 +43958,8 @@
                     "resolved": "https://registry.npmmirror.com/meow/-/meow-9.0.0.tgz",
                     "integrity": "sha512-+obSblOQmRhcyBt62furQqRAQpNyWXo8BuQ5bN7dG8wmwQ+vwHKp/rCFD4CrTP8CsDQD1sjoZ94K417XEUk8IQ==",
                     "dev": true,
+                    "optional": true,
+                    "peer": true,
                     "requires": {
                         "@types/minimist": "^1.2.0",
                         "camelcase-keys": "^6.2.2",
@@ -43087,6 +43980,8 @@
                     "resolved": "https://registry.npmmirror.com/minipass/-/minipass-3.3.4.tgz",
                     "integrity": "sha512-I9WPbWHCGu8W+6k1ZiGpPu0GkoKBeorkfKNuAFBNS1HNFJvke82sxvI5bzcCNpWPorkOO5QQ+zomzzwRxejXiw==",
                     "dev": true,
+                    "optional": true,
+                    "peer": true,
                     "requires": {
                         "yallist": "^4.0.0"
                     }
@@ -43096,6 +43991,8 @@
                     "resolved": "https://registry.npmmirror.com/minizlib/-/minizlib-2.1.2.tgz",
                     "integrity": "sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==",
                     "dev": true,
+                    "optional": true,
+                    "peer": true,
                     "requires": {
                         "minipass": "^3.0.0",
                         "yallist": "^4.0.0"
@@ -43105,13 +44002,17 @@
                     "version": "1.0.4",
                     "resolved": "https://registry.npmmirror.com/mkdirp/-/mkdirp-1.0.4.tgz",
                     "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==",
-                    "dev": true
+                    "dev": true,
+                    "optional": true,
+                    "peer": true
                 },
                 "node-gyp": {
                     "version": "7.1.2",
                     "resolved": "https://registry.npmmirror.com/node-gyp/-/node-gyp-7.1.2.tgz",
                     "integrity": "sha512-CbpcIo7C3eMu3dL1c3d0xw449fHIGALIJsRP4DDPHpyiW8vcriNY7ubh9TE4zEKfSxscY7PjeFnshE7h75ynjQ==",
                     "dev": true,
+                    "optional": true,
+                    "peer": true,
                     "requires": {
                         "env-paths": "^2.2.0",
                         "glob": "^7.1.4",
@@ -43130,6 +44031,8 @@
                     "resolved": "https://registry.npmmirror.com/nopt/-/nopt-5.0.0.tgz",
                     "integrity": "sha512-Tbj67rffqceeLpcRXrT7vKAN8CwfPeIBgM7E6iBkmKLV7bEMwpGgYLGv0jACUsECaa/vuxP0IjEont6umdMgtQ==",
                     "dev": true,
+                    "optional": true,
+                    "peer": true,
                     "requires": {
                         "abbrev": "1"
                     }
@@ -43139,6 +44042,8 @@
                     "resolved": "https://registry.npmmirror.com/normalize-package-data/-/normalize-package-data-3.0.3.tgz",
                     "integrity": "sha512-p2W1sgqij3zMMyRC067Dg16bfzVH+w7hyegmpIvZ4JNjqtGOVAIvLmjBx3yP7YTe9vKJgkoNOPjwQGogDoMXFA==",
                     "dev": true,
+                    "optional": true,
+                    "peer": true,
                     "requires": {
                         "hosted-git-info": "^4.0.1",
                         "is-core-module": "^2.5.0",
@@ -43151,6 +44056,8 @@
                     "resolved": "https://registry.npmmirror.com/p-locate/-/p-locate-4.1.0.tgz",
                     "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
                     "dev": true,
+                    "optional": true,
+                    "peer": true,
                     "requires": {
                         "p-limit": "^2.2.0"
                     }
@@ -43159,19 +44066,25 @@
                     "version": "4.0.0",
                     "resolved": "https://registry.npmmirror.com/path-exists/-/path-exists-4.0.0.tgz",
                     "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
-                    "dev": true
+                    "dev": true,
+                    "optional": true,
+                    "peer": true
                 },
                 "path-key": {
                     "version": "3.1.1",
                     "resolved": "https://registry.npmmirror.com/path-key/-/path-key-3.1.1.tgz",
                     "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
-                    "dev": true
+                    "dev": true,
+                    "optional": true,
+                    "peer": true
                 },
                 "read-pkg-up": {
                     "version": "7.0.1",
                     "resolved": "https://registry.npmmirror.com/read-pkg-up/-/read-pkg-up-7.0.1.tgz",
                     "integrity": "sha512-zK0TB7Xd6JpCLmlLmufqykGE+/TlOePD6qKClNW7hHDKFh/J7/7gCWGR7joEQEW1bKq3a3yUZSObOoWLFQ4ohg==",
                     "dev": true,
+                    "optional": true,
+                    "peer": true,
                     "requires": {
                         "find-up": "^4.1.0",
                         "read-pkg": "^5.2.0",
@@ -43182,7 +44095,9 @@
                             "version": "0.8.1",
                             "resolved": "https://registry.npmmirror.com/type-fest/-/type-fest-0.8.1.tgz",
                             "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==",
-                            "dev": true
+                            "dev": true,
+                            "optional": true,
+                            "peer": true
                         }
                     }
                 },
@@ -43191,6 +44106,8 @@
                     "resolved": "https://registry.npmmirror.com/rimraf/-/rimraf-3.0.2.tgz",
                     "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
                     "dev": true,
+                    "optional": true,
+                    "peer": true,
                     "requires": {
                         "glob": "^7.1.3"
                     }
@@ -43200,6 +44117,8 @@
                     "resolved": "https://registry.npmmirror.com/semver/-/semver-7.3.8.tgz",
                     "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==",
                     "dev": true,
+                    "optional": true,
+                    "peer": true,
                     "requires": {
                         "lru-cache": "^6.0.0"
                     }
@@ -43209,6 +44128,8 @@
                     "resolved": "https://registry.npmmirror.com/shebang-command/-/shebang-command-2.0.0.tgz",
                     "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
                     "dev": true,
+                    "optional": true,
+                    "peer": true,
                     "requires": {
                         "shebang-regex": "^3.0.0"
                     }
@@ -43217,13 +44138,17 @@
                     "version": "3.0.0",
                     "resolved": "https://registry.npmmirror.com/shebang-regex/-/shebang-regex-3.0.0.tgz",
                     "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
-                    "dev": true
+                    "dev": true,
+                    "optional": true,
+                    "peer": true
                 },
                 "strip-ansi": {
                     "version": "3.0.1",
                     "resolved": "https://registry.npmmirror.com/strip-ansi/-/strip-ansi-3.0.1.tgz",
                     "integrity": "sha512-VhumSSbBqDTP8p2ZLKj40UjBCV4+v8bUSEpUb4KjRgWk9pbqGF4REFj6KEagidb2f/M6AzC0EmFyDNGaw9OCzg==",
                     "dev": true,
+                    "optional": true,
+                    "peer": true,
                     "requires": {
                         "ansi-regex": "^2.0.0"
                     }
@@ -43232,13 +44157,17 @@
                     "version": "2.0.0",
                     "resolved": "https://registry.npmmirror.com/supports-color/-/supports-color-2.0.0.tgz",
                     "integrity": "sha512-KKNVtd6pCYgPIKU4cp2733HWYCpplQhddZLBUryaAHou723x+FRzQ5Df824Fj+IyyuiQTRoub4SnIFfIcrp70g==",
-                    "dev": true
+                    "dev": true,
+                    "optional": true,
+                    "peer": true
                 },
                 "tar": {
                     "version": "6.1.12",
                     "resolved": "https://registry.npmmirror.com/tar/-/tar-6.1.12.tgz",
                     "integrity": "sha512-jU4TdemS31uABHd+Lt5WEYJuzn+TJTCBLljvIAHZOz6M9Os5pJ4dD+vRFLxPa/n3T0iEFzpi+0x1UfuDZYbRMw==",
                     "dev": true,
+                    "optional": true,
+                    "peer": true,
                     "requires": {
                         "chownr": "^2.0.0",
                         "fs-minipass": "^2.0.0",
@@ -43252,13 +44181,17 @@
                     "version": "0.18.1",
                     "resolved": "https://registry.npmmirror.com/type-fest/-/type-fest-0.18.1.tgz",
                     "integrity": "sha512-OIAYXk8+ISY+qTOwkHtKqzAuxchoMiD9Udx+FSGQDuiRR+PJKJHc2NJAXlbhkGwTt/4/nKZxELY1w3ReWOL8mw==",
-                    "dev": true
+                    "dev": true,
+                    "optional": true,
+                    "peer": true
                 },
                 "which": {
                     "version": "2.0.2",
                     "resolved": "https://registry.npmmirror.com/which/-/which-2.0.2.tgz",
                     "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
                     "dev": true,
+                    "optional": true,
+                    "peer": true,
                     "requires": {
                         "isexe": "^2.0.0"
                     }
@@ -43267,7 +44200,9 @@
                     "version": "4.0.0",
                     "resolved": "https://registry.npmmirror.com/yallist/-/yallist-4.0.0.tgz",
                     "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
-                    "dev": true
+                    "dev": true,
+                    "optional": true,
+                    "peer": true
                 }
             }
         },
@@ -45722,11 +46657,16 @@
             "version": "3.6.0",
             "resolved": "https://registry.npmmirror.com/readdirp/-/readdirp-3.6.0.tgz",
             "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==",
-            "optional": true,
+            "devOptional": true,
             "requires": {
                 "picomatch": "^2.2.1"
             }
         },
+        "reconnecting-websocket": {
+            "version": "4.4.0",
+            "resolved": "https://registry.npmjs.org/reconnecting-websocket/-/reconnecting-websocket-4.4.0.tgz",
+            "integrity": "sha512-D2E33ceRPga0NvTDhJmphEgJ7FUYF0v4lr1ki0csq06OdlxKfugGzN0dSkxM/NfqCxYELK4KcaTOUOjTV6Dcng=="
+        },
         "redent": {
             "version": "3.0.0",
             "resolved": "https://registry.npmmirror.com/redent/-/redent-3.0.0.tgz",
@@ -45766,8 +46706,7 @@
         "regenerator-runtime": {
             "version": "0.13.9",
             "resolved": "https://registry.npmmirror.com/regenerator-runtime/-/regenerator-runtime-0.13.9.tgz",
-            "integrity": "sha512-p3VT+cOEgxFsRRA9X4lkI1E+k2/CtnKtU4gcxyaCUreilL/vqI6CdZ3wxVUx3UOUg+gnUOQQcRI7BmSI656MYA==",
-            "dev": true
+            "integrity": "sha512-p3VT+cOEgxFsRRA9X4lkI1E+k2/CtnKtU4gcxyaCUreilL/vqI6CdZ3wxVUx3UOUg+gnUOQQcRI7BmSI656MYA=="
         },
         "regenerator-transform": {
             "version": "0.15.0",
@@ -46233,11 +47172,24 @@
             "resolved": "https://registry.npmmirror.com/safer-buffer/-/safer-buffer-2.1.2.tgz",
             "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
         },
+        "sass": {
+            "version": "1.49.0",
+            "resolved": "https://registry.npmjs.org/sass/-/sass-1.49.0.tgz",
+            "integrity": "sha512-TVwVdNDj6p6b4QymJtNtRS2YtLJ/CqZriGg0eIAbAKMlN8Xy6kbv33FsEZSF7FufFFM705SQviHjjThfaQ4VNw==",
+            "dev": true,
+            "requires": {
+                "chokidar": ">=3.0.0 <4.0.0",
+                "immutable": "^4.0.0",
+                "source-map-js": ">=0.6.2 <2.0.0"
+            }
+        },
         "sass-graph": {
             "version": "2.2.5",
             "resolved": "https://registry.npmmirror.com/sass-graph/-/sass-graph-2.2.5.tgz",
             "integrity": "sha512-VFWDAHOe6mRuT4mZRd4eKE+d8Uedrk6Xnh7Sh9b4NGufQLQjOrvf/MQoOdx+0s92L89FeyUUNfU597j/3uNpag==",
             "dev": true,
+            "optional": true,
+            "peer": true,
             "requires": {
                 "glob": "^7.0.0",
                 "lodash": "^4.0.0",
@@ -46249,13 +47201,17 @@
                     "version": "7.0.3",
                     "resolved": "https://registry.npmmirror.com/emoji-regex/-/emoji-regex-7.0.3.tgz",
                     "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==",
-                    "dev": true
+                    "dev": true,
+                    "optional": true,
+                    "peer": true
                 },
                 "string-width": {
                     "version": "3.1.0",
                     "resolved": "https://registry.npmmirror.com/string-width/-/string-width-3.1.0.tgz",
                     "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
                     "dev": true,
+                    "optional": true,
+                    "peer": true,
                     "requires": {
                         "emoji-regex": "^7.0.1",
                         "is-fullwidth-code-point": "^2.0.0",
@@ -46267,6 +47223,8 @@
                     "resolved": "https://registry.npmmirror.com/yargs/-/yargs-13.3.2.tgz",
                     "integrity": "sha512-AX3Zw5iPruN5ie6xGRIDgqkT+ZhnRlZMLMHAs8tg7nRruy2Nb+i5o9bwghAogtM08q1dpr2LVoS8KSTMYpWXUw==",
                     "dev": true,
+                    "optional": true,
+                    "peer": true,
                     "requires": {
                         "cliui": "^5.0.0",
                         "find-up": "^3.0.0",
@@ -46285,6 +47243,8 @@
                     "resolved": "https://registry.npmmirror.com/yargs-parser/-/yargs-parser-13.1.2.tgz",
                     "integrity": "sha512-3lbsNRf/j+A4QuSZfDRA7HRSfWrzO0YjqTJd5kjAq37Zep1CEgaYmrH9Q3GwPiB9cHyd1Y1UwggGhJGoxipbzg==",
                     "dev": true,
+                    "optional": true,
+                    "peer": true,
                     "requires": {
                         "camelcase": "^5.0.0",
                         "decamelize": "^1.2.0"
@@ -46379,6 +47339,8 @@
             "resolved": "https://registry.npmmirror.com/scss-tokenizer/-/scss-tokenizer-0.2.3.tgz",
             "integrity": "sha512-dYE8LhncfBUar6POCxMTm0Ln+erjeczqEvCJib5/7XNkdw1FkUGgwMPY360FY0FgPWQxHWCx29Jl3oejyGLM9Q==",
             "dev": true,
+            "optional": true,
+            "peer": true,
             "requires": {
                 "js-base64": "^2.1.8",
                 "source-map": "^0.4.2"
@@ -46389,12 +47351,19 @@
                     "resolved": "https://registry.npmmirror.com/source-map/-/source-map-0.4.4.tgz",
                     "integrity": "sha512-Y8nIfcb1s/7DcobUz1yOO1GSp7gyL+D9zLHDehT7iRESqGSxjJ448Sg7rvfgsRJCnKLdSl11uGf0s9X80cH0/A==",
                     "dev": true,
+                    "optional": true,
+                    "peer": true,
                     "requires": {
                         "amdefine": ">=0.0.4"
                     }
                 }
             }
         },
+        "select": {
+            "version": "1.1.2",
+            "resolved": "https://registry.npmjs.org/select/-/select-1.1.2.tgz",
+            "integrity": "sha512-OwpTSOfy6xSs1+pwcNrv0RBMOzI39Lp3qQKUTPVVPRjCdNa5JH/oPRiqsesIskK8TVgmRiHwO4KXlV2Li9dANA=="
+        },
         "select-hose": {
             "version": "2.0.0",
             "resolved": "https://registry.npmmirror.com/select-hose/-/select-hose-2.0.0.tgz",
@@ -46886,6 +47855,11 @@
                 "is-plain-obj": "^1.0.0"
             }
         },
+        "sortablejs": {
+            "version": "1.10.2",
+            "resolved": "https://registry.npmjs.org/sortablejs/-/sortablejs-1.10.2.tgz",
+            "integrity": "sha512-YkPGufevysvfwn5rfdlGyrGjt7/CRHwvRPogD/lC+TnvcN29jDpCifKP+rBqf+LRldfXSTh+0CGLcSg0VIxq3A=="
+        },
         "source-list-map": {
             "version": "2.0.1",
             "resolved": "https://registry.npmmirror.com/source-list-map/-/source-list-map-2.0.1.tgz",
@@ -46896,6 +47870,12 @@
             "resolved": "https://registry.npmmirror.com/source-map/-/source-map-0.5.7.tgz",
             "integrity": "sha512-LbrmJOMUSdEVxIKvdcJzQC+nQhe8FUZQTXQy6+I75skNgn3OoQ0DZA8YnFa7gp8tqtL3KPf1kmo0R5DoApeSGQ=="
         },
+        "source-map-js": {
+            "version": "1.2.0",
+            "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.0.tgz",
+            "integrity": "sha512-itJW8lvSA0TXEphiRoawsCksnlf8SyvmFzIhltqAHluXd88pkCd+cXJVHTDwdCr0IzwptSm035IHQktUu1QUMg==",
+            "dev": true
+        },
         "source-map-resolve": {
             "version": "0.5.3",
             "resolved": "https://registry.npmmirror.com/source-map-resolve/-/source-map-resolve-0.5.3.tgz",
@@ -47215,6 +48195,8 @@
             "resolved": "https://registry.npmmirror.com/stdout-stream/-/stdout-stream-1.4.1.tgz",
             "integrity": "sha512-j4emi03KXqJWcIeF8eIXkjMFN1Cmb8gUlDYGeBALLPo5qdyTfA9bOtl8m33lRoC+vFMkP3gl0WsDr6+gzxbbTA==",
             "dev": true,
+            "optional": true,
+            "peer": true,
             "requires": {
                 "readable-stream": "^2.0.1"
             }
@@ -48006,6 +48988,11 @@
             "integrity": "sha512-qsdtZH+vMoCARQtyod4imc2nIJwg9Cc7lPRrw9CzF8ZKR0khdr8+2nX80PBhET3tcyTtJDxAffGh2rXH4tyU8A==",
             "dev": true
         },
+        "tiny-emitter": {
+            "version": "2.1.0",
+            "resolved": "https://registry.npmjs.org/tiny-emitter/-/tiny-emitter-2.1.0.tgz",
+            "integrity": "sha512-NB6Dk1A9xgQPMoGqC5CVXn123gWyte215ONT5Pp5a0yt4nlEoO1ZWeCwpncaekPHXO60i47ihFnZPiRPjRMq4Q=="
+        },
         "tinycolor2": {
             "version": "1.4.2",
             "resolved": "https://registry.npmmirror.com/tinycolor2/-/tinycolor2-1.4.2.tgz",
@@ -48117,6 +49104,8 @@
             "resolved": "https://registry.npmmirror.com/true-case-path/-/true-case-path-1.0.3.tgz",
             "integrity": "sha512-m6s2OdQe5wgpFMC+pAJ+q9djG82O2jcHPOI6RNg1yy9rCYR+WD6Nbpl32fDpfC56nirdRy+opFa/Vk7HYhqaew==",
             "dev": true,
+            "optional": true,
+            "peer": true,
             "requires": {
                 "glob": "^7.1.2"
             }
@@ -48582,6 +49571,54 @@
             "resolved": "https://registry.npmmirror.com/vm-browserify/-/vm-browserify-1.1.2.tgz",
             "integrity": "sha512-2ham8XPWTONajOR0ohOKOHXkm3+gaBmGut3SRuu75xLd/RRaY6vqgh8NBYYk7+RW3u5AtzPQZG8F10LHkl0lAQ=="
         },
+        "vscode-jsonrpc": {
+            "version": "5.0.1",
+            "resolved": "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-5.0.1.tgz",
+            "integrity": "sha512-JvONPptw3GAQGXlVV2utDcHx0BiY34FupW/kI6mZ5x06ER5DdPG/tXWMVHjTNULF5uKPOUUD0SaXg5QaubJL0A=="
+        },
+        "vscode-languageclient": {
+            "version": "6.1.4",
+            "resolved": "https://registry.npmjs.org/vscode-languageclient/-/vscode-languageclient-6.1.4.tgz",
+            "integrity": "sha512-EUOU+bJu6axmt0RFNo3nrglQLPXMfanbYViJee3Fbn2VuQoX0ZOI4uTYhSRvYLP2vfwTP/juV62P/mksCdTZMA==",
+            "requires": {
+                "semver": "^6.3.0",
+                "vscode-languageserver-protocol": "3.15.3"
+            },
+            "dependencies": {
+                "semver": {
+                    "version": "6.3.1",
+                    "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
+                    "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA=="
+                }
+            }
+        },
+        "vscode-languageserver-protocol": {
+            "version": "3.15.3",
+            "resolved": "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.15.3.tgz",
+            "integrity": "sha512-zrMuwHOAQRhjDSnflWdJG+O2ztMWss8GqUUB8dXLR/FPenwkiBNkMIJJYfSN6sgskvsF0rHAoBowNQfbyZnnvw==",
+            "requires": {
+                "vscode-jsonrpc": "^5.0.1",
+                "vscode-languageserver-types": "3.15.1"
+            }
+        },
+        "vscode-languageserver-types": {
+            "version": "3.15.1",
+            "resolved": "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.15.1.tgz",
+            "integrity": "sha512-+a9MPUQrNGRrGU630OGbYVQ+11iOIovjCkqxajPa9w57Sd5ruK8WQNsslzpa0x/QJqC8kRc2DUxWjIFwoNm4ZQ=="
+        },
+        "vscode-uri": {
+            "version": "2.1.2",
+            "resolved": "https://registry.npmjs.org/vscode-uri/-/vscode-uri-2.1.2.tgz",
+            "integrity": "sha512-8TEXQxlldWAuIODdukIb+TR5s+9Ds40eSJrw+1iDDA9IFORPjMELarNQE3myz5XIkWWpdprmJjm1/SxMlWOC8A=="
+        },
+        "vscode-ws-jsonrpc": {
+            "version": "0.2.0",
+            "resolved": "https://registry.npmjs.org/vscode-ws-jsonrpc/-/vscode-ws-jsonrpc-0.2.0.tgz",
+            "integrity": "sha512-NE9HNRgPjCaPyTJvIudcpyIWPImxwRDtuTX16yks7SAiZgSXigxAiZOvSvVBGmD1G/OMfrFo6BblOtjVR9DdVA==",
+            "requires": {
+                "vscode-jsonrpc": "^5.0.0"
+            }
+        },
         "vue": {
             "version": "2.6.12",
             "resolved": "https://registry.npmmirror.com/vue/-/vue-2.6.12.tgz",
@@ -48697,12 +49734,25 @@
             "integrity": "sha512-4gDntzrifFnCEvyoO8PqyJDmguXgVPxKiIxrBKjIowvL9l+N66196+72XVYR8BBf1Uv1Fgt3bGevJ+sEmxfZzw==",
             "dev": true
         },
+        "vuedraggable": {
+            "version": "2.24.3",
+            "resolved": "https://registry.npmjs.org/vuedraggable/-/vuedraggable-2.24.3.tgz",
+            "integrity": "sha512-6/HDXi92GzB+Hcs9fC6PAAozK1RLt1ewPTLjK0anTYguXLAeySDmcnqE8IC0xa7shvSzRjQXq3/+dsZ7ETGF3g==",
+            "requires": {
+                "sortablejs": "1.10.2"
+            }
+        },
         "vuescroll": {
             "version": "4.16.1",
             "resolved": "https://registry.npmmirror.com/vuescroll/-/vuescroll-4.16.1.tgz",
             "integrity": "sha512-7fRsG2Yw5Z07LUz/IIu9barpmYiN9q+ZTC+CrVamvCbmsxyhz8mU1OuYFbfORysaUskioNMxTGDo+HOzeDfSyQ==",
             "requires": {}
         },
+        "watch-size": {
+            "version": "2.0.0",
+            "resolved": "https://registry.npmjs.org/watch-size/-/watch-size-2.0.0.tgz",
+            "integrity": "sha512-M92R89dNoTPWyCD+HuUEDdhaDnh9jxPGOwlDc0u51jAgmjUvzqaEMynXSr3BaWs+QdHYk4KzibPy1TFtjLmOZQ=="
+        },
         "watchpack": {
             "version": "1.7.5",
             "resolved": "https://registry.npmmirror.com/watchpack/-/watchpack-1.7.5.tgz",
@@ -49573,6 +50623,15 @@
                 "async-limiter": "~1.0.0"
             }
         },
+        "xss": {
+            "version": "1.0.15",
+            "resolved": "https://registry.npmjs.org/xss/-/xss-1.0.15.tgz",
+            "integrity": "sha512-FVdlVVC67WOIPvfOwhoMETV72f6GbW7aOabBC3WxN/oUdoEMDyLz4OgRv5/gck2ZeNqEQu+Tb0kloovXOfpYVg==",
+            "requires": {
+                "commander": "^2.20.3",
+                "cssfilter": "0.0.10"
+            }
+        },
         "xtend": {
             "version": "4.0.2",
             "resolved": "https://registry.npmmirror.com/xtend/-/xtend-4.0.2.tgz",
diff --git a/web/package.json b/web/package.json
index a06bab306..85c6f7b14 100644
--- a/web/package.json
+++ b/web/package.json
@@ -38,6 +38,7 @@
         "md5": "2.3.0",
         "moment": "2.29.1",
         "monaco-editor": "0.19.3",
+        "monaco-languageclient": "^0.13.0",
         "qs": "6.9.4",
         "svgo": "1.3.0",
         "vue": "2.6.12",
@@ -65,27 +66,28 @@
         "less-loader": "6.1.0",
         "lint-staged": "8.2.1",
         "monaco-editor-webpack-plugin": "1.8.2",
-        "node-sass": "6.0.1",
+        "patch-package": "6.2.2",
+        "sass": "1.49.0",
         "sass-loader": "10.2.1",
         "speed-measure-webpack-plugin": "1.5.0",
         "svg-sprite-loader": "5.0.0",
-        "patch-package": "6.2.2",
         "vue-cli-plugin-mockjs": "0.1.3",
         "vue-template-compiler": "2.6.12",
         "webpack-virtual-modules": "0.3.2"
     },
     "workspaces": [
-      "packages/apiServices",
-      "packages/cyeditor",
-      "packages/dataGovernance",
-      "packages/dss",
-      "packages/editor",
-      "packages/editorLsp",
-      "packages/exts",
-      "packages/scheduleCenter",
-      "packages/scriptis",
-      "packages/shared",
-      "packages/workflows",
-      "packages/workspace"
+        "packages/apiServices",
+        "packages/cyeditor",
+        "packages/dataGovernance",
+        "packages/dss",
+        "packages/editor",
+        "packages/editorLsp",
+        "packages/exts",
+        "packages/scheduleCenter",
+        "packages/dolphinScheduler",
+        "packages/scriptis",
+        "packages/shared",
+        "packages/workflows",
+        "packages/workspace"
     ]
 }

From ac1b52ff53f6a481059d5c84f01e66491e27e38d Mon Sep 17 00:00:00 2001
From: xlinliu <arionliu@webank.com>
Date: Thu, 23 May 2024 16:57:04 +0800
Subject: [PATCH 159/302] rm appconn resource zip after unzip

---
 .../dss/appconn/manager/service/AppConnResourceServiceImpl.java | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/dss-appconn/dss-appconn-manager/dss-appconn-manager-client/src/main/java/com/webank/wedatasphere/dss/appconn/manager/service/AppConnResourceServiceImpl.java b/dss-appconn/dss-appconn-manager/dss-appconn-manager-client/src/main/java/com/webank/wedatasphere/dss/appconn/manager/service/AppConnResourceServiceImpl.java
index b4e9a4b31..25a1c0ef3 100644
--- a/dss-appconn/dss-appconn-manager/dss-appconn-manager-client/src/main/java/com/webank/wedatasphere/dss/appconn/manager/service/AppConnResourceServiceImpl.java
+++ b/dss-appconn/dss-appconn-manager/dss-appconn-manager-client/src/main/java/com/webank/wedatasphere/dss/appconn/manager/service/AppConnResourceServiceImpl.java
@@ -125,6 +125,8 @@ public String getAppConnHome(AppConnInfo appConnInfo) {
         } catch (DSSErrorException e) {
             throw new AppConnHomeNotExistsWarnException(20350, "Unzip " + zipFilePath + " failed, AppConn is " + appConnName, e);
         }
+        //解压完了，zip包就没用了，删掉。
+        deleteFile(zipFilePath, "Delete the zip file " + zipFilePath.getName() + " of AppConn " + appConnName +  " failed");
 
         File oldIndexFile = AppConnIndexFileUtils.getIndexFile(appConnPath);
         // delete old index file.

From 33575d40cab3f48b603ed4877d13cbd2516df713 Mon Sep 17 00:00:00 2001
From: qweqnotallow <747839893@qq.com>
Date: Thu, 23 May 2024 21:41:51 +0800
Subject: [PATCH 160/302] git server : throw exception fix

---
 .../DSSFrameworkOrchestratorRestful.java      |  3 +-
 .../request/GitConnectTestRequest.java        | 50 +++++++++++++++++++
 .../impl/DSSWorkspaceGitServiceImpl.java      | 43 +++++++++++++---
 .../dss/git/utils/DSSGitUtils.java            | 32 ++++++------
 4 files changed, 104 insertions(+), 24 deletions(-)
 create mode 100644 dss-git/dss-git-common/src/main/java/com.webank.wedatasphere.dss.git.common/protocol/request/GitConnectTestRequest.java

diff --git a/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/restful/DSSFrameworkOrchestratorRestful.java b/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/restful/DSSFrameworkOrchestratorRestful.java
index 756a04251..3cccba2c2 100644
--- a/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/restful/DSSFrameworkOrchestratorRestful.java
+++ b/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/restful/DSSFrameworkOrchestratorRestful.java
@@ -340,7 +340,8 @@ public Message gitUrl(@RequestParam(required = true, name = "projectName") Strin
         GitUserInfoRequest gitUserInfoRequest = new GitUserInfoRequest();
         gitUserInfoRequest.setWorkspaceId(workspace.getWorkspaceId());
         gitUserInfoRequest.setType(GitConstant.GIT_ACCESS_READ_TYPE);
-
+        // 跳转git需解密处理
+        gitUserInfoRequest.setDecrypt(true);
         GitUserInfoResponse readInfoResponse = RpcAskUtils.processAskException(sender.ask(gitUserInfoRequest), GitUserInfoResponse.class, GitUserInfoRequest.class);
         String gitUsername = readInfoResponse.getGitUser().getGitUser();
         String gitPassword = readInfoResponse.getGitUser().getGitPassword();
diff --git a/dss-git/dss-git-common/src/main/java/com.webank.wedatasphere.dss.git.common/protocol/request/GitConnectTestRequest.java b/dss-git/dss-git-common/src/main/java/com.webank.wedatasphere.dss.git.common/protocol/request/GitConnectTestRequest.java
new file mode 100644
index 000000000..4e1d7dfdd
--- /dev/null
+++ b/dss-git/dss-git-common/src/main/java/com.webank.wedatasphere.dss.git.common/protocol/request/GitConnectTestRequest.java
@@ -0,0 +1,50 @@
+package com.webank.wedatasphere.dss.git.common.protocol.request;
+
+public class GitConnectTestRequest {
+    private String username;
+    private String token;
+    private String password;
+    private String type;
+
+    public GitConnectTestRequest(String username, String token, String password, String type) {
+        this.username = username;
+        this.token = token;
+        this.password = password;
+        this.type = type;
+    }
+
+    public GitConnectTestRequest() {
+    }
+
+    public String getUsername() {
+        return username;
+    }
+
+    public void setUsername(String username) {
+        this.username = username;
+    }
+
+    public String getToken() {
+        return token;
+    }
+
+    public void setToken(String token) {
+        this.token = token;
+    }
+
+    public String getPassword() {
+        return password;
+    }
+
+    public void setPassword(String password) {
+        this.password = password;
+    }
+
+    public String getType() {
+        return type;
+    }
+
+    public void setType(String type) {
+        this.type = type;
+    }
+}
diff --git a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSWorkspaceGitServiceImpl.java b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSWorkspaceGitServiceImpl.java
index 536f86aa9..ff419756a 100644
--- a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSWorkspaceGitServiceImpl.java
+++ b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSWorkspaceGitServiceImpl.java
@@ -3,26 +3,27 @@
 import com.webank.wedatasphere.dss.common.exception.DSSErrorException;
 import com.webank.wedatasphere.dss.git.common.protocol.GitUserEntity;
 import com.webank.wedatasphere.dss.git.common.protocol.config.GitServerConfig;
-import com.webank.wedatasphere.dss.git.common.protocol.constant.GitConstant;
 import com.webank.wedatasphere.dss.git.common.protocol.request.GitUserUpdateRequest;
 import com.webank.wedatasphere.dss.git.common.protocol.request.GitUserInfoRequest;
 import com.webank.wedatasphere.dss.git.common.protocol.response.GitUserUpdateResponse;
 import com.webank.wedatasphere.dss.git.common.protocol.response.GitUserInfoResponse;
-import com.webank.wedatasphere.dss.git.constant.DSSGitConstant;
+import com.webank.wedatasphere.dss.git.common.protocol.util.UrlUtils;
 import com.webank.wedatasphere.dss.git.dao.DSSWorkspaceGitMapper;
 import com.webank.wedatasphere.dss.git.service.DSSWorkspaceGitService;
 import org.apache.commons.lang.StringUtils;
+import org.apache.http.HttpResponse;
+import org.apache.http.client.methods.HttpGet;
+import org.apache.http.client.utils.URIBuilder;
+import org.apache.http.impl.client.CloseableHttpClient;
+import org.apache.http.impl.client.HttpClients;
+import org.apache.http.util.EntityUtils;
+import org.json.JSONObject;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import javax.crypto.BadPaddingException;
 import javax.crypto.Cipher;
-import javax.crypto.IllegalBlockSizeException;
-import javax.crypto.NoSuchPaddingException;
 import javax.crypto.spec.SecretKeySpec;
-import java.security.InvalidKeyException;
 import java.security.Key;
-import java.security.NoSuchAlgorithmException;
 import java.util.Arrays;
 
 @Service
@@ -116,4 +117,32 @@ private String generateKeys(String password, int mode) {
         }
     }
 
+    public boolean gitTokenTest() {
+        String token = "DxusLyPpQsjy4SVWPnKC";  // 你的 GitLab 令牌
+        String expectedUsername = "zhaobincai";  // 期望匹配的用户名
+        String apiUrl = UrlUtils.normalizeIp(GitServerConfig.GIT_URL_PRE.getValue()) + "/api/v4/user";  // GitLab API 用户信息端点
+
+        try (CloseableHttpClient client = HttpClients.createDefault()) {
+            URIBuilder builder = new URIBuilder(apiUrl);
+            HttpGet request = new HttpGet(builder.build());
+            request.setHeader("PRIVATE-TOKEN", token);
+
+            HttpResponse response = client.execute(request);
+            String jsonResponse = EntityUtils.toString(response.getEntity());
+            JSONObject userData = new JSONObject(jsonResponse);
+
+            String actualUsername = userData.getString("username");
+
+            if (response.getStatusLine().getStatusCode() == 200 && actualUsername.equals(expectedUsername)) {
+                System.out.println("Token is valid and matches the username: " + actualUsername);
+            } else {
+                System.out.println("Token is invalid or does not match the expected username.");
+            }
+        } catch (Exception e) {
+            System.out.println("Error verifying token: " + e.getMessage());
+        }
+
+        return true;
+    }
+
 }
diff --git a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/utils/DSSGitUtils.java b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/utils/DSSGitUtils.java
index 2ae3b588f..3f645ee6b 100644
--- a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/utils/DSSGitUtils.java
+++ b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/utils/DSSGitUtils.java
@@ -50,7 +50,7 @@
 public class DSSGitUtils {
     private static final Logger logger = LoggerFactory.getLogger(DSSGitUtils.class);
 
-    public static void init(String projectName, GitUserEntity gitUserDO) {
+    public static void init(String projectName, GitUserEntity gitUserDO) throws GitErrorException{
         if (checkProjectName(projectName, gitUserDO)) {
             try {
                 URL url = new URL(GitServerConfig.GIT_URL_PRE.getValue() + GitServerConfig.GIT_RESTFUL_API_CREATE_PROJECTS.getValue());
@@ -80,7 +80,7 @@ public static void init(String projectName, GitUserEntity gitUserDO) {
         }
     }
 
-    public static void remote(Repository repository, String projectName, GitUserEntity gitUser) {
+    public static void remote(Repository repository, String projectName, GitUserEntity gitUser)throws GitErrorException {
         // 拼接git remote Url
         String remoteUrl = GitServerConfig.GIT_URL_PRE.getValue() + gitUser.getGitUser() + File.separator + projectName + ".git";
         try {
@@ -102,7 +102,7 @@ public static void remote(Repository repository, String projectName, GitUserEnti
     }
 
 
-    public static void create(String projectName, GitUserEntity gitUserDO) {
+    public static void create(String projectName, GitUserEntity gitUserDO) throws GitErrorException{
         logger.info("start success");
         File repoDir = new File(File.separator + FileUtils.normalizePath(GitServerConfig.GIT_SERVER_PATH.getValue()) + File.separator + projectName); // 指定仓库的目录
         File respo = new File(generateGitPath(projectName));
@@ -124,7 +124,7 @@ public static void create(String projectName, GitUserEntity gitUserDO) {
         }
     }
 
-    public static void pull(Repository repository, String projectName, GitUserEntity gitUser) {
+    public static void pull(Repository repository, String projectName, GitUserEntity gitUser)throws GitErrorException {
         try {
             Git git = new Git(repository);
 
@@ -156,7 +156,7 @@ public static void pull(Repository repository, String projectName, GitUserEntity
         }
     }
 
-    public static void pullTargetFile(Repository repository, String projectName, GitUserEntity gitUser, List<String> paths) {
+    public static void pullTargetFile(Repository repository, String projectName, GitUserEntity gitUser, List<String> paths) throws Exception {
         try {
             if (CollectionUtils.isEmpty(paths)) {
                 return ;
@@ -208,7 +208,7 @@ static void printTree(String prefix, GitTree tree) {
 
 
 
-    public static void push(Repository repository, String projectName, GitUserEntity gitUser, String comment) {
+    public static void push(Repository repository, String projectName, GitUserEntity gitUser, String comment) throws GitErrorException{
 
         try {
             Git git = new Git(repository);
@@ -237,7 +237,7 @@ public static void push(Repository repository, String projectName, GitUserEntity
     }
 
 
-    public static void reset(Repository repository, String projectName) {
+    public static void reset(Repository repository, String projectName)throws GitErrorException {
         try {
             Git git = new Git(repository);
 
@@ -251,7 +251,7 @@ public static void reset(Repository repository, String projectName) {
         }
     }
 
-    public static void checkoutTargetCommit(Repository repository, GitRevertRequest request) throws GitAPIException, IOException {
+    public static void checkoutTargetCommit(Repository repository, GitRevertRequest request) throws GitAPIException, IOException, GitErrorException {
         File repoDir = new File(File.separator + FileUtils.normalizePath(GitServerConfig.GIT_SERVER_PATH.getValue()) + File.separator + request.getProjectName()+ File.separator + ".git");
         String commitId = request.getCommitId(); // 替换为目标commit的完整哈希值
 
@@ -339,7 +339,7 @@ public static List<String> parseProjectNames(String json) throws org.json.JSONEx
         return projectNames;
     }
 
-    public static Set<String> status(String projectName, List<String> fileList) {
+    public static Set<String> status(String projectName, List<String> fileList)throws GitErrorException {
         File repoDir = new File(File.separator + FileUtils.normalizePath(GitServerConfig.GIT_SERVER_PATH.getValue()) + File.separator + projectName + File.separator +".git"); // 修改为你的仓库路径
 
         try (Repository repository = new FileRepositoryBuilder().setGitDir(repoDir).build()) {
@@ -378,7 +378,7 @@ public static Set<String> status(String projectName, List<String> fileList) {
         }
     }
 
-    public static void archive(String projectName, GitUserEntity gitUserDO) {
+    public static void archive(String projectName, GitUserEntity gitUserDO) throws GitErrorException {
         try {
             String projectUrlEncoded = java.net.URLEncoder.encode(gitUserDO.getGitUser() + "/" + projectName, "UTF-8");
             URL url = new URL(GitServerConfig.GIT_URL_PRE + "/api/v4/projects/" + projectUrlEncoded + "/archive");
@@ -406,7 +406,7 @@ public static void archive(String projectName, GitUserEntity gitUserDO) {
         }
     }
 
-    public static void archiveLocal(String projectName) {
+    public static void archiveLocal(String projectName) throws GitErrorException{
         File repoDir = new File(File.separator + FileUtils.normalizePath(GitServerConfig.GIT_SERVER_PATH.getValue()) + File.separator + projectName + File.separator + ".git");
         if (!repoDir.exists()) {
             logger.info("file {} not exists", repoDir.getAbsolutePath());
@@ -426,7 +426,7 @@ public static void archiveLocal(String projectName) {
         }
     }
 
-    public static String getTargetCommitFileContent(Repository repository, String projectName, String commitId, String filePath) {
+    public static String getTargetCommitFileContent(Repository repository, String projectName, String commitId, String filePath) throws GitErrorException {
         String content = "";
         try {
             // 获取最新的commitId
@@ -463,7 +463,7 @@ public static String getTargetCommitFileContent(Repository repository, String pr
         return content;
     }
 
-    public static void getCommitId(Repository repository, String projectName, int num) {
+    public static void getCommitId(Repository repository, String projectName, int num)throws GitErrorException {
         // 获取当前CommitId，
         File repoDir = new File(File.separator + FileUtils.normalizePath(GitServerConfig.GIT_SERVER_PATH.getValue()) + File.separator + projectName + File.separator +".git");
 
@@ -484,12 +484,12 @@ public static void getCommitId(Repository repository, String projectName, int nu
                 logger.info("Commit Message: " + commitMessage);
                 logger.info("Commit Author: " + commitAuthor);
             }
-        } catch (GitAPIException e) {
+        } catch (Exception e) {
             throw new GitErrorException(80001, "git log failed, the reason is : ", e);
         }
     }
 
-    public static GitCommitResponse getCurrentCommit(Repository repository) {
+    public static GitCommitResponse getCurrentCommit(Repository repository) throws GitErrorException{
         GitCommitResponse commitResponse = new GitCommitResponse();
         try {
             // 获取HEAD引用
@@ -510,7 +510,7 @@ public static GitCommitResponse getCurrentCommit(Repository repository) {
         }
     }
 
-    public static List<GitCommitResponse> getLatestCommit(Repository repository, String filePath, Integer num) {
+    public static List<GitCommitResponse> getLatestCommit(Repository repository, String filePath, Integer num) throws GitErrorException{
         List<GitCommitResponse> commitResponseList = new ArrayList<>();
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 

From 24ce7614d70089ecda7d52d3d698ecf7c4156005 Mon Sep 17 00:00:00 2001
From: qweqnotallow <747839893@qq.com>
Date: Fri, 24 May 2024 09:45:42 +0800
Subject: [PATCH 161/302] git server : fix exception

---
 .../com/webank/wedatasphere/dss/git/utils/DSSGitUtils.java  | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/utils/DSSGitUtils.java b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/utils/DSSGitUtils.java
index 3f645ee6b..cad30115b 100644
--- a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/utils/DSSGitUtils.java
+++ b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/utils/DSSGitUtils.java
@@ -50,7 +50,7 @@
 public class DSSGitUtils {
     private static final Logger logger = LoggerFactory.getLogger(DSSGitUtils.class);
 
-    public static void init(String projectName, GitUserEntity gitUserDO) throws GitErrorException{
+    public static void init(String projectName, GitUserEntity gitUserDO) throws Exception{
         if (checkProjectName(projectName, gitUserDO)) {
             try {
                 URL url = new URL(GitServerConfig.GIT_URL_PRE.getValue() + GitServerConfig.GIT_RESTFUL_API_CREATE_PROJECTS.getValue());
@@ -82,7 +82,7 @@ public static void init(String projectName, GitUserEntity gitUserDO) throws GitE
 
     public static void remote(Repository repository, String projectName, GitUserEntity gitUser)throws GitErrorException {
         // 拼接git remote Url
-        String remoteUrl = GitServerConfig.GIT_URL_PRE.getValue() + gitUser.getGitUser() + File.separator + projectName + ".git";
+        String remoteUrl = UrlUtils.normalizeIp(GitServerConfig.GIT_URL_PRE.getValue()) + gitUser.getGitUser() + File.separator + projectName + ".git";
         try {
             Git git = new Git(repository);
 
@@ -186,7 +186,7 @@ public static void pullTargetFile(Repository repository, String projectName, Git
         }
     }
 
-    public static GitDiffResponse diff(String projectName, List<String> fileList) {
+    public static GitDiffResponse diff(String projectName, List<String> fileList)throws GitErrorException{
 
         Set<String> status = status(projectName, fileList);
         GitTree root = new GitTree("");

From e178140cd5140e5444d94fe4a7122dfa657a1498 Mon Sep 17 00:00:00 2001
From: qweqnotallow <747839893@qq.com>
Date: Fri, 24 May 2024 09:46:11 +0800
Subject: [PATCH 162/302] git server : fix exception

---
 .../java/com/webank/wedatasphere/dss/git/utils/DSSGitUtils.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/utils/DSSGitUtils.java b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/utils/DSSGitUtils.java
index cad30115b..4362223e9 100644
--- a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/utils/DSSGitUtils.java
+++ b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/utils/DSSGitUtils.java
@@ -50,7 +50,7 @@
 public class DSSGitUtils {
     private static final Logger logger = LoggerFactory.getLogger(DSSGitUtils.class);
 
-    public static void init(String projectName, GitUserEntity gitUserDO) throws Exception{
+    public static void init(String projectName, GitUserEntity gitUserDO) throws Exception, GitErrorException{
         if (checkProjectName(projectName, gitUserDO)) {
             try {
                 URL url = new URL(GitServerConfig.GIT_URL_PRE.getValue() + GitServerConfig.GIT_RESTFUL_API_CREATE_PROJECTS.getValue());

From 0426636a2330aef72c5d3a3dfe22a0dd288d2ef5 Mon Sep 17 00:00:00 2001
From: qweqnotallow <747839893@qq.com>
Date: Fri, 24 May 2024 10:01:48 +0800
Subject: [PATCH 163/302] git server : add gitConnect

---
 .../restful/DSSWorkspaceRestful.java          | 16 ++++++
 .../protocol/request/GitConnectRequest.java   | 30 +++++++++++
 .../request/GitConnectTestRequest.java        | 50 -------------------
 .../protocol/response/GitConnectResponse.java | 23 +++++++++
 .../git/service/DSSWorkspaceGitService.java   |  4 ++
 .../impl/DSSWorkspaceGitServiceImpl.java      | 28 +++++++----
 .../dss/git/utils/DSSGitUtils.java            |  4 +-
 .../receiver/DSSGitChooser.scala              |  3 +-
 .../receiver/DSSGitReceiver.scala             |  4 +-
 9 files changed, 99 insertions(+), 63 deletions(-)
 create mode 100644 dss-git/dss-git-common/src/main/java/com.webank.wedatasphere.dss.git.common/protocol/request/GitConnectRequest.java
 delete mode 100644 dss-git/dss-git-common/src/main/java/com.webank.wedatasphere.dss.git.common/protocol/request/GitConnectTestRequest.java
 create mode 100644 dss-git/dss-git-common/src/main/java/com.webank.wedatasphere.dss.git.common/protocol/response/GitConnectResponse.java

diff --git a/dss-framework/dss-framework-workspace-server/src/main/java/com/webank/wedatasphere/dss/framework/workspace/restful/DSSWorkspaceRestful.java b/dss-framework/dss-framework-workspace-server/src/main/java/com/webank/wedatasphere/dss/framework/workspace/restful/DSSWorkspaceRestful.java
index 7f9dc14ce..c322bc672 100644
--- a/dss-framework/dss-framework-workspace-server/src/main/java/com/webank/wedatasphere/dss/framework/workspace/restful/DSSWorkspaceRestful.java
+++ b/dss-framework/dss-framework-workspace-server/src/main/java/com/webank/wedatasphere/dss/framework/workspace/restful/DSSWorkspaceRestful.java
@@ -35,8 +35,10 @@
 import com.webank.wedatasphere.dss.framework.workspace.util.WorkspaceDBHelper;
 import com.webank.wedatasphere.dss.framework.workspace.util.WorkspaceUtils;
 import com.webank.wedatasphere.dss.git.common.protocol.GitUserEntity;
+import com.webank.wedatasphere.dss.git.common.protocol.request.GitConnectRequest;
 import com.webank.wedatasphere.dss.git.common.protocol.request.GitUserInfoRequest;
 import com.webank.wedatasphere.dss.git.common.protocol.request.GitUserUpdateRequest;
+import com.webank.wedatasphere.dss.git.common.protocol.response.GitConnectResponse;
 import com.webank.wedatasphere.dss.git.common.protocol.response.GitUserInfoResponse;
 import com.webank.wedatasphere.dss.git.common.protocol.response.GitUserUpdateResponse;
 import com.webank.wedatasphere.dss.sender.service.DSSSenderServiceFactory;
@@ -382,5 +384,19 @@ public Message selectGit(@RequestParam Long workspaceId, @RequestParam String ty
     }
 
 
+    @RequestMapping(path = "gitConnect", method = RequestMethod.GET)
+    public Message gitConnect(@RequestParam String gitUserName, @RequestParam String gitPassword) {
+        String username = SecurityFilter.getLoginUsername(httpServletRequest);
+        Sender gitSender = DSSSenderServiceFactory.getOrCreateServiceInstance().getGitSender();
+        GitConnectRequest connectRequest = new GitConnectRequest(gitUserName, gitPassword);
+        GitConnectResponse connectResponse = RpcAskUtils.processAskException(gitSender.ask(connectRequest), GitConnectResponse.class, GitConnectRequest.class);
+        if (connectResponse.getConnect()) {
+            return Message.ok().data("result", "success");
+        }else {
+            return Message.ok().data("result", "invalid");
+        }
+    }
+
+
 }
 
diff --git a/dss-git/dss-git-common/src/main/java/com.webank.wedatasphere.dss.git.common/protocol/request/GitConnectRequest.java b/dss-git/dss-git-common/src/main/java/com.webank.wedatasphere.dss.git.common/protocol/request/GitConnectRequest.java
new file mode 100644
index 000000000..ff3e9e296
--- /dev/null
+++ b/dss-git/dss-git-common/src/main/java/com.webank.wedatasphere.dss.git.common/protocol/request/GitConnectRequest.java
@@ -0,0 +1,30 @@
+package com.webank.wedatasphere.dss.git.common.protocol.request;
+
+public class GitConnectRequest {
+    private String username;
+    private String token;
+
+    public GitConnectRequest(String username, String token) {
+        this.username = username;
+        this.token = token;
+    }
+
+    public GitConnectRequest() {
+    }
+
+    public String getUsername() {
+        return username;
+    }
+
+    public void setUsername(String username) {
+        this.username = username;
+    }
+
+    public String getToken() {
+        return token;
+    }
+
+    public void setToken(String token) {
+        this.token = token;
+    }
+}
diff --git a/dss-git/dss-git-common/src/main/java/com.webank.wedatasphere.dss.git.common/protocol/request/GitConnectTestRequest.java b/dss-git/dss-git-common/src/main/java/com.webank.wedatasphere.dss.git.common/protocol/request/GitConnectTestRequest.java
deleted file mode 100644
index 4e1d7dfdd..000000000
--- a/dss-git/dss-git-common/src/main/java/com.webank.wedatasphere.dss.git.common/protocol/request/GitConnectTestRequest.java
+++ /dev/null
@@ -1,50 +0,0 @@
-package com.webank.wedatasphere.dss.git.common.protocol.request;
-
-public class GitConnectTestRequest {
-    private String username;
-    private String token;
-    private String password;
-    private String type;
-
-    public GitConnectTestRequest(String username, String token, String password, String type) {
-        this.username = username;
-        this.token = token;
-        this.password = password;
-        this.type = type;
-    }
-
-    public GitConnectTestRequest() {
-    }
-
-    public String getUsername() {
-        return username;
-    }
-
-    public void setUsername(String username) {
-        this.username = username;
-    }
-
-    public String getToken() {
-        return token;
-    }
-
-    public void setToken(String token) {
-        this.token = token;
-    }
-
-    public String getPassword() {
-        return password;
-    }
-
-    public void setPassword(String password) {
-        this.password = password;
-    }
-
-    public String getType() {
-        return type;
-    }
-
-    public void setType(String type) {
-        this.type = type;
-    }
-}
diff --git a/dss-git/dss-git-common/src/main/java/com.webank.wedatasphere.dss.git.common/protocol/response/GitConnectResponse.java b/dss-git/dss-git-common/src/main/java/com.webank.wedatasphere.dss.git.common/protocol/response/GitConnectResponse.java
new file mode 100644
index 000000000..52dbcd4cc
--- /dev/null
+++ b/dss-git/dss-git-common/src/main/java/com.webank.wedatasphere.dss.git.common/protocol/response/GitConnectResponse.java
@@ -0,0 +1,23 @@
+package com.webank.wedatasphere.dss.git.common.protocol.response;
+
+public class GitConnectResponse {
+    /**
+     * token-用户名是否匹配 true-匹配 false-不匹配
+     */
+    private Boolean connect;
+
+    public GitConnectResponse(Boolean connect) {
+        this.connect = connect;
+    }
+
+    public GitConnectResponse() {
+    }
+
+    public Boolean getConnect() {
+        return connect;
+    }
+
+    public void setConnect(Boolean connect) {
+        this.connect = connect;
+    }
+}
diff --git a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/DSSWorkspaceGitService.java b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/DSSWorkspaceGitService.java
index 7aaa40827..0c28240c9 100644
--- a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/DSSWorkspaceGitService.java
+++ b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/DSSWorkspaceGitService.java
@@ -2,8 +2,10 @@
 
 import com.webank.wedatasphere.dss.common.exception.DSSErrorException;
 import com.webank.wedatasphere.dss.git.common.protocol.GitUserEntity;
+import com.webank.wedatasphere.dss.git.common.protocol.request.GitConnectRequest;
 import com.webank.wedatasphere.dss.git.common.protocol.request.GitUserUpdateRequest;
 import com.webank.wedatasphere.dss.git.common.protocol.request.GitUserInfoRequest;
+import com.webank.wedatasphere.dss.git.common.protocol.response.GitConnectResponse;
 import com.webank.wedatasphere.dss.git.common.protocol.response.GitUserUpdateResponse;
 import com.webank.wedatasphere.dss.git.common.protocol.response.GitUserInfoResponse;
 
@@ -14,4 +16,6 @@ public interface DSSWorkspaceGitService {
     GitUserInfoResponse selectGitUserInfo(GitUserInfoRequest gitUserInfoRequest) throws DSSErrorException;
 
     GitUserEntity selectGit(Long workspaceId, String type);
+
+    GitConnectResponse gitTokenTest(GitConnectRequest connectTestRequest) throws DSSErrorException;
 }
diff --git a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSWorkspaceGitServiceImpl.java b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSWorkspaceGitServiceImpl.java
index ff419756a..20672a598 100644
--- a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSWorkspaceGitServiceImpl.java
+++ b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSWorkspaceGitServiceImpl.java
@@ -3,8 +3,10 @@
 import com.webank.wedatasphere.dss.common.exception.DSSErrorException;
 import com.webank.wedatasphere.dss.git.common.protocol.GitUserEntity;
 import com.webank.wedatasphere.dss.git.common.protocol.config.GitServerConfig;
+import com.webank.wedatasphere.dss.git.common.protocol.request.GitConnectRequest;
 import com.webank.wedatasphere.dss.git.common.protocol.request.GitUserUpdateRequest;
 import com.webank.wedatasphere.dss.git.common.protocol.request.GitUserInfoRequest;
+import com.webank.wedatasphere.dss.git.common.protocol.response.GitConnectResponse;
 import com.webank.wedatasphere.dss.git.common.protocol.response.GitUserUpdateResponse;
 import com.webank.wedatasphere.dss.git.common.protocol.response.GitUserInfoResponse;
 import com.webank.wedatasphere.dss.git.common.protocol.util.UrlUtils;
@@ -18,6 +20,8 @@
 import org.apache.http.impl.client.HttpClients;
 import org.apache.http.util.EntityUtils;
 import org.json.JSONObject;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -28,6 +32,7 @@
 
 @Service
 public class DSSWorkspaceGitServiceImpl implements DSSWorkspaceGitService {
+    private Logger logger = LoggerFactory.getLogger(this.getClass());
 
     @Autowired
     private DSSWorkspaceGitMapper workspaceGitMapper;
@@ -117,10 +122,14 @@ private String generateKeys(String password, int mode) {
         }
     }
 
-    public boolean gitTokenTest() {
-        String token = "DxusLyPpQsjy4SVWPnKC";  // 你的 GitLab 令牌
-        String expectedUsername = "zhaobincai";  // 期望匹配的用户名
-        String apiUrl = UrlUtils.normalizeIp(GitServerConfig.GIT_URL_PRE.getValue()) + "/api/v4/user";  // GitLab API 用户信息端点
+    @Override
+    public GitConnectResponse gitTokenTest(GitConnectRequest connectTestRequest)throws DSSErrorException {
+        // GitLab 令牌
+        String token = connectTestRequest.getToken();
+        // 期望匹配的用户名
+        String expectedUsername = connectTestRequest.getUsername();
+        // GitLab API 用户信息接口
+        String apiUrl = UrlUtils.normalizeIp(GitServerConfig.GIT_URL_PRE.getValue()) + "/api/v4/user";
 
         try (CloseableHttpClient client = HttpClients.createDefault()) {
             URIBuilder builder = new URIBuilder(apiUrl);
@@ -134,15 +143,16 @@ public boolean gitTokenTest() {
             String actualUsername = userData.getString("username");
 
             if (response.getStatusLine().getStatusCode() == 200 && actualUsername.equals(expectedUsername)) {
-                System.out.println("Token is valid and matches the username: " + actualUsername);
+                logger.info("Token is valid and matches the username: " + actualUsername);
+                return new GitConnectResponse(true);
             } else {
-                System.out.println("Token is invalid or does not match the expected username.");
+                logger.info("Token is invalid or does not match the expected username.");
+                return new GitConnectResponse(false);
             }
         } catch (Exception e) {
-            System.out.println("Error verifying token: " + e.getMessage());
+            logger.info("Error verifying token: " + e.getMessage());
+            throw new DSSErrorException(800001, "verifying token failed, the reason is:" + e);
         }
-
-        return true;
     }
 
 }
diff --git a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/utils/DSSGitUtils.java b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/utils/DSSGitUtils.java
index 4362223e9..10f8f65e9 100644
--- a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/utils/DSSGitUtils.java
+++ b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/utils/DSSGitUtils.java
@@ -53,7 +53,7 @@ public class DSSGitUtils {
     public static void init(String projectName, GitUserEntity gitUserDO) throws Exception, GitErrorException{
         if (checkProjectName(projectName, gitUserDO)) {
             try {
-                URL url = new URL(GitServerConfig.GIT_URL_PRE.getValue() + GitServerConfig.GIT_RESTFUL_API_CREATE_PROJECTS.getValue());
+                URL url = new URL(UrlUtils.normalizeIp(GitServerConfig.GIT_URL_PRE.getValue()) + "/" +GitServerConfig.GIT_RESTFUL_API_CREATE_PROJECTS.getValue());
                 HttpURLConnection connection = (HttpURLConnection) url.openConnection();
                 connection.setRequestMethod("POST");
                 connection.setRequestProperty("PRIVATE-TOKEN", gitUserDO.getGitToken());
@@ -82,7 +82,7 @@ public static void init(String projectName, GitUserEntity gitUserDO) throws Exce
 
     public static void remote(Repository repository, String projectName, GitUserEntity gitUser)throws GitErrorException {
         // 拼接git remote Url
-        String remoteUrl = UrlUtils.normalizeIp(GitServerConfig.GIT_URL_PRE.getValue()) + gitUser.getGitUser() + File.separator + projectName + ".git";
+        String remoteUrl = UrlUtils.normalizeIp(GitServerConfig.GIT_URL_PRE.getValue()) + "/" +gitUser.getGitUser() + File.separator + projectName + ".git";
         try {
             Git git = new Git(repository);
 
diff --git a/dss-git/dss-git-server/src/main/scala/com.webank.wedatasphere.dss.git/receiver/DSSGitChooser.scala b/dss-git/dss-git-server/src/main/scala/com.webank.wedatasphere.dss.git/receiver/DSSGitChooser.scala
index e0d362dd3..2d263bea3 100644
--- a/dss-git/dss-git-server/src/main/scala/com.webank.wedatasphere.dss.git/receiver/DSSGitChooser.scala
+++ b/dss-git/dss-git-server/src/main/scala/com.webank.wedatasphere.dss.git/receiver/DSSGitChooser.scala
@@ -16,7 +16,7 @@
 
 package com.webank.wedatasphere.dss.git.receiver
 
-import com.webank.wedatasphere.dss.git.common.protocol.request.{GitArchiveProjectRequest, GitBaseRequest, GitCheckProjectRequest, GitCommitRequest, GitCreateProjectRequest, GitCurrentCommitRequest, GitDeleteRequest, GitDiffRequest, GitFileContentRequest, GitHistoryRequest, GitRemoveRequest, GitRenameRequest, GitRevertRequest, GitSearchRequest, GitUserInfoRequest, GitUserUpdateRequest}
+import com.webank.wedatasphere.dss.git.common.protocol.request.{GitArchiveProjectRequest, GitBaseRequest, GitCheckProjectRequest, GitCommitRequest, GitConnectRequest, GitCreateProjectRequest, GitCurrentCommitRequest, GitDeleteRequest, GitDiffRequest, GitFileContentRequest, GitHistoryRequest, GitRemoveRequest, GitRenameRequest, GitRevertRequest, GitSearchRequest, GitUserInfoRequest, GitUserUpdateRequest}
 import com.webank.wedatasphere.dss.git.service.{DSSGitProjectManagerService, DSSGitWorkflowManagerService, DSSWorkspaceGitService}
 
 import javax.annotation.PostConstruct
@@ -58,6 +58,7 @@ class DSSGitChooser extends ReceiverChooser {
     case _: GitRevertRequest => receiver
     case _: GitRemoveRequest => receiver
     case _: GitRenameRequest => receiver
+    case _: GitConnectRequest => receiver
     case _ => None
   }
 }
\ No newline at end of file
diff --git a/dss-git/dss-git-server/src/main/scala/com.webank.wedatasphere.dss.git/receiver/DSSGitReceiver.scala b/dss-git/dss-git-server/src/main/scala/com.webank.wedatasphere.dss.git/receiver/DSSGitReceiver.scala
index 4d2990977..0dd1e4255 100644
--- a/dss-git/dss-git-server/src/main/scala/com.webank.wedatasphere.dss.git/receiver/DSSGitReceiver.scala
+++ b/dss-git/dss-git-server/src/main/scala/com.webank.wedatasphere.dss.git/receiver/DSSGitReceiver.scala
@@ -16,7 +16,7 @@
 
 package com.webank.wedatasphere.dss.git.receiver
 
-import com.webank.wedatasphere.dss.git.common.protocol.request.{GitArchiveProjectRequest, GitCheckProjectRequest, GitCommitRequest, GitCreateProjectRequest, GitCurrentCommitRequest, GitDeleteRequest, GitDiffRequest, GitFileContentRequest, GitHistoryRequest, GitRemoveRequest, GitRenameRequest, GitRevertRequest, GitSearchRequest, GitUserInfoRequest, GitUserUpdateRequest}
+import com.webank.wedatasphere.dss.git.common.protocol.request.{GitArchiveProjectRequest, GitCheckProjectRequest, GitCommitRequest, GitConnectRequest, GitCreateProjectRequest, GitCurrentCommitRequest, GitDeleteRequest, GitDiffRequest, GitFileContentRequest, GitHistoryRequest, GitRemoveRequest, GitRenameRequest, GitRevertRequest, GitSearchRequest, GitUserInfoRequest, GitUserUpdateRequest}
 import com.webank.wedatasphere.dss.git.service.{DSSGitProjectManagerService, DSSGitWorkflowManagerService, DSSWorkspaceGitService}
 import org.apache.linkis.rpc.{Receiver, Sender}
 import org.slf4j.{Logger, LoggerFactory}
@@ -61,6 +61,8 @@ class DSSGitReceiver(gitProjectManagerService: DSSGitProjectManagerService, gitW
       gitWorkflowManagerService.removeFile(gitRemoveRequest)
     case gitRenameRequest: GitRenameRequest =>
       gitWorkflowManagerService.rename(gitRenameRequest)
+    case gitConnectTestRequest: GitConnectRequest =>
+      workspaceGitService.gitTokenTest(gitConnectTestRequest)
     case _ => None
   }
 

From 84f11299ba389724305da8d3abbb9de0532b51bd Mon Sep 17 00:00:00 2001
From: Zhaobincai <747839893@qq.com>
Date: Fri, 24 May 2024 10:16:26 +0800
Subject: [PATCH 164/302] git server : exception fix2

---
 .../dss/git/service/DSSGitProjectManagerService.java           | 2 +-
 .../dss/git/service/impl/DSSGitProjectManagerServiceImpl.java  | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/DSSGitProjectManagerService.java b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/DSSGitProjectManagerService.java
index e46133fff..60004347b 100644
--- a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/DSSGitProjectManagerService.java
+++ b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/DSSGitProjectManagerService.java
@@ -9,7 +9,7 @@
 public interface DSSGitProjectManagerService {
     GitCreateProjectResponse create(GitCreateProjectRequest request) throws ExecutionException, InterruptedException;
 
-    GitArchivePorjectResponse archive(GitArchiveProjectRequest request) throws ExecutionException, InterruptedException;
+    GitArchivePorjectResponse archive(GitArchiveProjectRequest request) throws DSSErrorException;
 
     GitCheckProjectResponse checkProject(GitCheckProjectRequest request) throws DSSErrorException;
 
diff --git a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitProjectManagerServiceImpl.java b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitProjectManagerServiceImpl.java
index 4c9d17a61..8f01db006 100644
--- a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitProjectManagerServiceImpl.java
+++ b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitProjectManagerServiceImpl.java
@@ -4,6 +4,7 @@
 import com.webank.wedatasphere.dss.common.service.BMLService;
 import com.webank.wedatasphere.dss.git.common.protocol.GitUserEntity;
 import com.webank.wedatasphere.dss.git.common.protocol.constant.GitConstant;
+import com.webank.wedatasphere.dss.git.common.protocol.exception.GitErrorException;
 import com.webank.wedatasphere.dss.git.common.protocol.request.*;
 import com.webank.wedatasphere.dss.git.common.protocol.response.*;
 import com.webank.wedatasphere.dss.git.common.protocol.config.GitServerConfig;
@@ -72,7 +73,7 @@ public GitCreateProjectResponse create(GitCreateProjectRequest request) {
     }
 
     @Override
-    public GitArchivePorjectResponse archive(GitArchiveProjectRequest request) {
+    public GitArchivePorjectResponse archive(GitArchiveProjectRequest request) throws GitErrorException {
         GitUserEntity gitUser = dssWorkspaceGitService.selectGit(request.getWorkspaceId(), GitConstant.GIT_ACCESS_WRITE_TYPE);
         if (gitUser == null) {
             logger.error("the workspace : {} don't associate with git", request.getWorkspaceId());

From c57444d09da3e3b1d5e11d740bb85da7fb52171f Mon Sep 17 00:00:00 2001
From: Zhaobincai <747839893@qq.com>
Date: Fri, 24 May 2024 10:26:53 +0800
Subject: [PATCH 165/302] git server : pom add httpclient

---
 dss-git/dss-git-server/pom.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/dss-git/dss-git-server/pom.xml b/dss-git/dss-git-server/pom.xml
index c25460273..74f6e17e0 100644
--- a/dss-git/dss-git-server/pom.xml
+++ b/dss-git/dss-git-server/pom.xml
@@ -24,9 +24,9 @@
             <version>${dss.version}</version>
         </dependency>
         <dependency>
-            <groupId>com.webank.wedatasphere.dss</groupId>
-            <artifactId>dss-framework-workspace-server</artifactId>
-            <version>${dss.version}</version>
+            <groupId>org.apache.httpcomponents</groupId>
+            <artifactId>httpclient</artifactId>
+            <version>${httpclient.version}</version>
         </dependency>
         <dependency>
             <groupId>com.webank.wedatasphere.dss</groupId>

From a6f0079dd0085b384e8fbe00be9743efca7f2e0c Mon Sep 17 00:00:00 2001
From: ryanlei <ryanlei@webank.com>
Date: Thu, 23 May 2024 16:46:19 +0800
Subject: [PATCH 166/302] fix: rm lerna

---
 web/README-DEV.md     |    7 +-
 web/lerna.json        |   12 -
 web/package-lock.json | 1175 +++++++++++++++++++++++++++++++++++++++--
 web/package.json      |   22 +-
 4 files changed, 1137 insertions(+), 79 deletions(-)
 delete mode 100644 web/lerna.json

diff --git a/web/README-DEV.md b/web/README-DEV.md
index fe46c3a05..7546f57bf 100644
--- a/web/README-DEV.md
+++ b/web/README-DEV.md
@@ -33,7 +33,6 @@
 - 子应用可以配置自己的layout需要在应用router模块导出配置subAppRoutes
 - 子应用支持使用自己的header，需要在config.json里配置模块路径
 - 各应用需要使用iView作为UI库，并提供路由，国际化等配置写入config.json
-- 各应用间不要相互直接依赖，确有依赖通过lerna管理
 - 可复用组件，资源需要合理放置，packages/shared 共享组件方法，修改需要注意影响
 - 各应用路由应以应用名做统一前缀
 - 各应用之间需要事件通信，应当在config.json 里声明对应module文件路径
@@ -51,11 +50,7 @@
 
 ```
 # 安装依赖
-lerna bootstrap 
-# 添加依赖通过lerna add 添加
-lerna add <package>[@version]
-# 指定组件添加依赖
-lerna add <package>[@version] --@scope=@dataspherestudio/workspace
+npm i
 # 开发启动DSS
 npm run serve
 # 运行部分模块子应用，支持通过module组合。如科管版本：
diff --git a/web/lerna.json b/web/lerna.json
deleted file mode 100644
index 7e9ca0719..000000000
--- a/web/lerna.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "packages": [
-    "packages/*"
-  ],
-  "command": {
-    "bootstrap": {
-      "hoist": true
-    }
-  },
-  "npmClient": "npm",
-  "version": "1.1.6"
-}
diff --git a/web/package-lock.json b/web/package-lock.json
index b73e82c40..0565f7887 100644
--- a/web/package-lock.json
+++ b/web/package-lock.json
@@ -1,13 +1,28 @@
 {
     "name": "dataspherestudio",
-    "version": "1.1.6",
+    "version": "1.1.20",
     "lockfileVersion": 2,
     "requires": true,
     "packages": {
         "": {
             "name": "dataspherestudio",
-            "version": "1.1.6",
+            "version": "1.1.20",
             "hasInstallScript": true,
+            "workspaces": [
+                "packages/apiServices",
+                "packages/cyeditor",
+                "packages/dataGovernance",
+                "packages/dss",
+                "packages/editor",
+                "packages/editorLsp",
+                "packages/exts",
+                "packages/scheduleCenter",
+                "packages/dolphinScheduler",
+                "packages/scriptis",
+                "packages/shared",
+                "packages/workflows",
+                "packages/workspace"
+            ],
             "dependencies": {
                 "axios": "0.21.1",
                 "babel-polyfill": "6.26.0",
@@ -20,6 +35,7 @@
                 "md5": "2.3.0",
                 "moment": "2.29.1",
                 "monaco-editor": "0.19.3",
+                "monaco-languageclient": "^0.13.0",
                 "qs": "6.9.4",
                 "svgo": "1.3.0",
                 "vue": "2.6.12",
@@ -47,8 +63,8 @@
                 "less-loader": "6.1.0",
                 "lint-staged": "8.2.1",
                 "monaco-editor-webpack-plugin": "1.8.2",
-                "node-sass": "6.0.1",
                 "patch-package": "6.2.2",
+                "sass": "1.49.0",
                 "sass-loader": "10.2.1",
                 "speed-measure-webpack-plugin": "1.5.0",
                 "svg-sprite-loader": "5.0.0",
@@ -1336,7 +1352,6 @@
             "version": "7.17.9",
             "resolved": "https://registry.npmmirror.com/@babel/runtime/-/runtime-7.17.9.tgz",
             "integrity": "sha512-lSiBBvodq29uShpWGNbgFdKYNiFDo5/HIYsaCEY9ff4sb10x9jizo2+pRrSyF4jKZCXqgzuqBOQKbUm90gQwJg==",
-            "dev": true,
             "dependencies": {
                 "regenerator-runtime": "^0.13.4"
             },
@@ -1428,6 +1443,54 @@
                 "node": ">=6.9.0"
             }
         },
+        "node_modules/@dataspherestudio/apiServices": {
+            "resolved": "packages/apiServices",
+            "link": true
+        },
+        "node_modules/@dataspherestudio/cyeditor": {
+            "resolved": "packages/cyeditor",
+            "link": true
+        },
+        "node_modules/@dataspherestudio/dataGovernance": {
+            "resolved": "packages/dataGovernance",
+            "link": true
+        },
+        "node_modules/@dataspherestudio/dolphinScheduler": {
+            "resolved": "packages/dolphinScheduler",
+            "link": true
+        },
+        "node_modules/@dataspherestudio/dss": {
+            "resolved": "packages/dss",
+            "link": true
+        },
+        "node_modules/@dataspherestudio/editor": {
+            "resolved": "packages/editor",
+            "link": true
+        },
+        "node_modules/@dataspherestudio/editor-lsp": {
+            "resolved": "packages/editorLsp",
+            "link": true
+        },
+        "node_modules/@dataspherestudio/exts": {
+            "resolved": "packages/exts",
+            "link": true
+        },
+        "node_modules/@dataspherestudio/scriptis": {
+            "resolved": "packages/scriptis",
+            "link": true
+        },
+        "node_modules/@dataspherestudio/shared": {
+            "resolved": "packages/shared",
+            "link": true
+        },
+        "node_modules/@dataspherestudio/workflows": {
+            "resolved": "packages/workflows",
+            "link": true
+        },
+        "node_modules/@dataspherestudio/workspace": {
+            "resolved": "packages/workspace",
+            "link": true
+        },
         "node_modules/@gar/promisify": {
             "version": "1.1.3",
             "resolved": "https://registry.npmmirror.com/@gar/promisify/-/promisify-1.1.3.tgz",
@@ -6009,6 +6072,24 @@
                 "@octokit/openapi-types": "^11.2.0"
             }
         },
+        "node_modules/@riophae/vue-treeselect": {
+            "version": "0.4.0",
+            "resolved": "https://registry.npmjs.org/@riophae/vue-treeselect/-/vue-treeselect-0.4.0.tgz",
+            "integrity": "sha512-J4atYmBqXQmiPFK/0B5sXKjtnGc21mBJEiyKIDZwk0Q9XuynVFX6IJ4EpaLmUgL5Tve7HAS7wkiGGSti6Uaxcg==",
+            "dependencies": {
+                "@babel/runtime": "^7.3.1",
+                "babel-helper-vue-jsx-merge-props": "^2.0.3",
+                "easings-css": "^1.0.0",
+                "fuzzysearch": "^1.0.3",
+                "is-promise": "^2.1.0",
+                "lodash": "^4.0.0",
+                "material-colors": "^1.2.6",
+                "watch-size": "^2.0.0"
+            },
+            "peerDependencies": {
+                "vue": "^2.2.0"
+            }
+        },
         "node_modules/@samverschueren/stream-to-observable": {
             "version": "0.3.1",
             "resolved": "https://registry.npmmirror.com/@samverschueren/stream-to-observable/-/stream-to-observable-0.3.1.tgz",
@@ -7172,6 +7253,8 @@
             "resolved": "https://registry.npmmirror.com/amdefine/-/amdefine-1.0.1.tgz",
             "integrity": "sha512-S2Hw0TtNkMJhIabBwIojKL9YHO5T0n5eNqWJ7Lrlel/zDbftQpxpapi8tZs3X1HWa+u+QeydGmzzNU0m09+Rcg==",
             "dev": true,
+            "optional": true,
+            "peer": true,
             "engines": {
                 "node": ">=0.4.2"
             }
@@ -7245,7 +7328,7 @@
             "version": "3.1.2",
             "resolved": "https://registry.npmmirror.com/anymatch/-/anymatch-3.1.2.tgz",
             "integrity": "sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg==",
-            "optional": true,
+            "devOptional": true,
             "dependencies": {
                 "normalize-path": "^3.0.0",
                 "picomatch": "^2.0.4"
@@ -7549,6 +7632,8 @@
             "resolved": "https://registry.npmmirror.com/async-foreach/-/async-foreach-0.1.3.tgz",
             "integrity": "sha512-VUeSMD8nEGBWaZK4lizI1sf3yEC7pnAQ/mrI7pC2fBz2s/tq5jWWEngTwaf0Gruu/OoXRGLGg1XFqpYBiGTYJA==",
             "dev": true,
+            "optional": true,
+            "peer": true,
             "engines": {
                 "node": "*"
             }
@@ -7730,6 +7815,11 @@
                 "eslint": ">= 4.12.1"
             }
         },
+        "node_modules/babel-helper-vue-jsx-merge-props": {
+            "version": "2.0.3",
+            "resolved": "https://registry.npmjs.org/babel-helper-vue-jsx-merge-props/-/babel-helper-vue-jsx-merge-props-2.0.3.tgz",
+            "integrity": "sha512-gsLiKK7Qrb7zYJNgiXKpXblxbV5ffSwR0f5whkPAaBAR4fhi6bwRZxX9wBlIc5M/v8CCkXUbXZL4N/nSE97cqg=="
+        },
         "node_modules/babel-loader": {
             "version": "8.2.5",
             "resolved": "https://registry.npmmirror.com/babel-loader/-/babel-loader-8.2.5.tgz",
@@ -7955,6 +8045,12 @@
                 "@babel/core": "^7.0.0-0"
             }
         },
+        "node_modules/babel-plugin-transform-remove-console": {
+            "version": "6.9.4",
+            "resolved": "https://registry.npmjs.org/babel-plugin-transform-remove-console/-/babel-plugin-transform-remove-console-6.9.4.tgz",
+            "integrity": "sha512-88blrUrMX3SPiGkT1GnvVY8E/7A+k6oj3MNvUtTIxJflFzXTw1bHkuJ/y039ouhFMp2prRn5cQGzokViYi1dsg==",
+            "dev": true
+        },
         "node_modules/babel-polyfill": {
             "version": "6.26.0",
             "resolved": "https://registry.npmmirror.com/babel-polyfill/-/babel-polyfill-6.26.0.tgz",
@@ -8110,7 +8206,7 @@
             "version": "2.2.0",
             "resolved": "https://registry.npmmirror.com/binary-extensions/-/binary-extensions-2.2.0.tgz",
             "integrity": "sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==",
-            "optional": true,
+            "devOptional": true,
             "engines": {
                 "node": ">=8"
             }
@@ -8230,6 +8326,14 @@
             "resolved": "https://registry.npmmirror.com/boolbase/-/boolbase-1.0.0.tgz",
             "integrity": "sha512-JZOSA7Mo9sNGB8+UjSgzdLtokWAky1zbztM3WRLCbZ70/3cTANmQmOdR7y2g+J0e2WXywy1yS468tY+IruqEww=="
         },
+        "node_modules/bootstrap": {
+            "version": "3.4.1",
+            "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-3.4.1.tgz",
+            "integrity": "sha512-yN5oZVmRCwe5aKwzRj6736nSmKDX7pLYwsXiCj/EYmo16hODaBiT4En5btW/jhBF/seV+XMx3aYwukYC3A49DA==",
+            "engines": {
+                "node": ">=6"
+            }
+        },
         "node_modules/brace-expansion": {
             "version": "1.1.11",
             "resolved": "https://registry.npmmirror.com/brace-expansion/-/brace-expansion-1.1.11.tgz",
@@ -8815,7 +8919,7 @@
             "version": "3.5.3",
             "resolved": "https://registry.npmmirror.com/chokidar/-/chokidar-3.5.3.tgz",
             "integrity": "sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==",
-            "optional": true,
+            "devOptional": true,
             "dependencies": {
                 "anymatch": "~3.1.2",
                 "braces": "~3.0.2",
@@ -8836,7 +8940,7 @@
             "version": "3.0.2",
             "resolved": "https://registry.npmmirror.com/braces/-/braces-3.0.2.tgz",
             "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
-            "optional": true,
+            "devOptional": true,
             "dependencies": {
                 "fill-range": "^7.0.1"
             },
@@ -8848,7 +8952,7 @@
             "version": "7.0.1",
             "resolved": "https://registry.npmmirror.com/fill-range/-/fill-range-7.0.1.tgz",
             "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
-            "optional": true,
+            "devOptional": true,
             "dependencies": {
                 "to-regex-range": "^5.0.1"
             },
@@ -8860,7 +8964,7 @@
             "version": "7.0.0",
             "resolved": "https://registry.npmmirror.com/is-number/-/is-number-7.0.0.tgz",
             "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
-            "optional": true,
+            "devOptional": true,
             "engines": {
                 "node": ">=0.12.0"
             }
@@ -8869,7 +8973,7 @@
             "version": "5.0.1",
             "resolved": "https://registry.npmmirror.com/to-regex-range/-/to-regex-range-5.0.1.tgz",
             "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
-            "optional": true,
+            "devOptional": true,
             "dependencies": {
                 "is-number": "^7.0.0"
             },
@@ -9159,6 +9263,16 @@
             "dev": true,
             "optional": true
         },
+        "node_modules/clipboard": {
+            "version": "2.0.8",
+            "resolved": "https://registry.npmjs.org/clipboard/-/clipboard-2.0.8.tgz",
+            "integrity": "sha512-Y6WO0unAIQp5bLmk1zdThRhgJt/x3ks6f30s3oE3H1mgIEU33XyQjEf8gsf6DxC7NPX8Y1SsNWjUjL/ywLnnbQ==",
+            "dependencies": {
+                "good-listener": "^1.2.2",
+                "select": "^1.1.2",
+                "tiny-emitter": "^2.0.0"
+            }
+        },
         "node_modules/clipboardy": {
             "version": "2.3.0",
             "resolved": "https://registry.npmmirror.com/clipboardy/-/clipboardy-2.3.0.tgz",
@@ -11092,6 +11206,11 @@
                 "node": ">=4"
             }
         },
+        "node_modules/cssfilter": {
+            "version": "0.0.10",
+            "resolved": "https://registry.npmjs.org/cssfilter/-/cssfilter-0.0.10.tgz",
+            "integrity": "sha512-FAaLDaplstoRsDR8XGYH51znUN0UY7nMc6Z9/fvE8EXGwvJE9hu7W2vHwx1+bd6gCYnln9nLbzxFTrcO9YQDZw=="
+        },
         "node_modules/cssnano": {
             "version": "4.1.11",
             "resolved": "https://registry.npmmirror.com/cssnano/-/cssnano-4.1.11.tgz",
@@ -11231,6 +11350,39 @@
             "resolved": "https://registry.npmmirror.com/cyclist/-/cyclist-1.0.1.tgz",
             "integrity": "sha512-NJGVKPS81XejHcLhaLJS7plab0fK3slPh11mESeeDq2W4ZI5kUKK/LRRdVDvjJseojbPB7ZwjnyOybg3Igea/A=="
         },
+        "node_modules/cytoscape": {
+            "version": "3.27.0",
+            "resolved": "https://registry.npmjs.org/cytoscape/-/cytoscape-3.27.0.tgz",
+            "integrity": "sha512-pPZJilfX9BxESwujODz5pydeGi+FBrXq1rcaB1mfhFXXFJ9GjE6CNndAk+8jPzoXGD+16LtSS4xlYEIUiW4Abg==",
+            "dependencies": {
+                "heap": "^0.2.6",
+                "lodash": "^4.17.21"
+            },
+            "engines": {
+                "node": ">=0.10"
+            }
+        },
+        "node_modules/cytoscape-klay": {
+            "version": "3.1.4",
+            "resolved": "https://registry.npmjs.org/cytoscape-klay/-/cytoscape-klay-3.1.4.tgz",
+            "integrity": "sha512-VwPj0VR25GPfy6qXVQRi/MYlZM/zkdvRhHlgqbM//lSvstgM6fhp3ik/uM8Wr8nlhskfqz/M1fIDmR6UckbS2A==",
+            "dependencies": {
+                "klayjs": "^0.4.1"
+            },
+            "peerDependencies": {
+                "cytoscape": "^3.2.0"
+            }
+        },
+        "node_modules/cytoscape/node_modules/lodash": {
+            "version": "4.17.21",
+            "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
+            "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg=="
+        },
+        "node_modules/d3": {
+            "version": "3.5.17",
+            "resolved": "https://registry.npmjs.org/d3/-/d3-3.5.17.tgz",
+            "integrity": "sha512-yFk/2idb8OHPKkbAL8QaOaqENNoMhIaSHZerk3oQsECwkObkCpJyjYwCe+OHiq6UEdhe1m8ZGARRRO3ljFjlKg=="
+        },
         "node_modules/d3-dispatch": {
             "version": "2.0.0",
             "resolved": "https://registry.npmmirror.com/d3-dispatch/-/d3-dispatch-2.0.0.tgz",
@@ -11301,6 +11453,11 @@
                 "node": "*"
             }
         },
+        "node_modules/dayjs": {
+            "version": "1.10.7",
+            "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.10.7.tgz",
+            "integrity": "sha512-P6twpd70BcPK34K26uJ1KT3wlhpuOAPoMwJzpsIWUxHZ7wpmbdZL/hQqBDfz7hGurYSa5PhzdhDHtt319hL3ig=="
+        },
         "node_modules/de-indent": {
             "version": "1.0.2",
             "resolved": "https://registry.npmmirror.com/de-indent/-/de-indent-1.0.2.tgz",
@@ -11672,6 +11829,11 @@
                 "node": ">=0.4.0"
             }
         },
+        "node_modules/delegate": {
+            "version": "3.2.0",
+            "resolved": "https://registry.npmjs.org/delegate/-/delegate-3.2.0.tgz",
+            "integrity": "sha512-IofjkYBZaZivn0V8nnsMJGBr4jVLxHDheKSW88PyxS5QC4Vo9ZbZVvhzlSxY87fVq3STR6r+4cGepyHkcWOQSw=="
+        },
         "node_modules/delegates": {
             "version": "1.0.0",
             "resolved": "https://registry.npmmirror.com/delegates/-/delegates-1.0.0.tgz",
@@ -11727,6 +11889,14 @@
             "integrity": "sha512-T0NIuQpnTvFDATNuHN5roPwSBG83rFsuO+MXXH9/3N1eFbn4wcPjttvjMLEPWJ0RGUYgQE7cGgS3tNxbqCGM7g==",
             "dev": true
         },
+        "node_modules/dexie": {
+            "version": "3.0.4",
+            "resolved": "https://registry.npmjs.org/dexie/-/dexie-3.0.4.tgz",
+            "integrity": "sha512-rwS3k8BBstjGFJAS/yjYrsRZucqitnrP3NBhqghl9ihWcWABlT3I5f2dZV9T3pmXGAP7G9p1q00g/axcsuOT8A==",
+            "engines": {
+                "node": ">=6.0"
+            }
+        },
         "node_modules/dezalgo": {
             "version": "1.0.4",
             "resolved": "https://registry.npmmirror.com/dezalgo/-/dezalgo-1.0.4.tgz",
@@ -11903,6 +12073,11 @@
             "integrity": "sha512-YXQl1DSa4/PQyRfgrv6aoNjhasp/p4qs9FjJ4q4cQk+8m4r6k4ZSiEyytKG8f8W9gi8WsQtIObNmKd+tMzNTmA==",
             "dev": true
         },
+        "node_modules/dt-sql-parser": {
+            "version": "1.2.1",
+            "resolved": "https://registry.npmjs.org/dt-sql-parser/-/dt-sql-parser-1.2.1.tgz",
+            "integrity": "sha512-bp6Rtm8N3m2Z3tavtKGo8J5ffaPQdPodYV2xGi9f6IsWbHzOkpNBxHlORcWtnSLtA/JvZcvImQxgbkdaGiv5cw=="
+        },
         "node_modules/duplexer": {
             "version": "0.1.2",
             "resolved": "https://registry.npmmirror.com/duplexer/-/duplexer-0.1.2.tgz",
@@ -11920,6 +12095,11 @@
                 "stream-shift": "^1.0.0"
             }
         },
+        "node_modules/easings-css": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmjs.org/easings-css/-/easings-css-1.0.0.tgz",
+            "integrity": "sha512-7Uq7NdazNfVtr0RNmPAys8it0zKCuaqxJStYKEl72D3j4gbvXhhaM7iWNbqhA4C94ygCye6VuyhzBRQC4szeBg=="
+        },
         "node_modules/easy-stack": {
             "version": "1.0.1",
             "resolved": "https://registry.npmmirror.com/easy-stack/-/easy-stack-1.0.1.tgz",
@@ -14225,6 +14405,11 @@
             "integrity": "sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==",
             "dev": true
         },
+        "node_modules/fuzzysearch": {
+            "version": "1.0.3",
+            "resolved": "https://registry.npmjs.org/fuzzysearch/-/fuzzysearch-1.0.3.tgz",
+            "integrity": "sha512-s+kNWQuI3mo9OALw0HJ6YGmMbLqEufCh2nX/zzV5CrICQ/y4AwPxM+6TIiF9ItFCHXFCyM/BfCCmN57NTIJuPg=="
+        },
         "node_modules/g-status": {
             "version": "2.0.2",
             "resolved": "https://registry.npmmirror.com/g-status/-/g-status-2.0.2.tgz",
@@ -14316,6 +14501,8 @@
             "resolved": "https://registry.npmmirror.com/gaze/-/gaze-1.1.3.tgz",
             "integrity": "sha512-BRdNm8hbWzFzWHERTrejLqwHDfS4GibPoq5wjTPIoJHoBtKGPg3xAFfxmM+9ztbXelxcf2hwQcaz1PtmFeue8g==",
             "dev": true,
+            "optional": true,
+            "peer": true,
             "dependencies": {
                 "globule": "^1.0.0"
             },
@@ -14660,8 +14847,7 @@
         "node_modules/glob-to-regexp": {
             "version": "0.3.0",
             "resolved": "https://registry.npmmirror.com/glob-to-regexp/-/glob-to-regexp-0.3.0.tgz",
-            "integrity": "sha512-Iozmtbqv0noj0uDDqoL0zNq0VBEfK2YFoMAZoxJe4cwphvLR+JskfF30QhXHOR4m3KrE6NLRYw+U9MRXvifyig==",
-            "dev": true
+            "integrity": "sha512-Iozmtbqv0noj0uDDqoL0zNq0VBEfK2YFoMAZoxJe4cwphvLR+JskfF30QhXHOR4m3KrE6NLRYw+U9MRXvifyig=="
         },
         "node_modules/glob2base": {
             "version": "0.0.12",
@@ -14717,6 +14903,8 @@
             "resolved": "https://registry.npmmirror.com/globule/-/globule-1.3.3.tgz",
             "integrity": "sha512-mb1aYtDbIjTu4ShMB85m3UzjX9BVKe9WCzsnfMSZk+K5GpIbBOexgg4PPCt5eHDEG5/ZQAUX2Kct02zfiPLsKg==",
             "dev": true,
+            "optional": true,
+            "peer": true,
             "dependencies": {
                 "glob": "~7.1.1",
                 "lodash": "~4.17.10",
@@ -14731,6 +14919,8 @@
             "resolved": "https://registry.npmmirror.com/glob/-/glob-7.1.7.tgz",
             "integrity": "sha512-OvD9ENzPLbegENnYP5UUfJIirTg4+XwMWGaQfQTY0JenxNvvIKP3U3/tAQSPIu/lHxXYSZmpXlUHeqAIdKzBLQ==",
             "dev": true,
+            "optional": true,
+            "peer": true,
             "dependencies": {
                 "fs.realpath": "^1.0.0",
                 "inflight": "^1.0.4",
@@ -14748,6 +14938,8 @@
             "resolved": "https://registry.npmmirror.com/minimatch/-/minimatch-3.0.8.tgz",
             "integrity": "sha512-6FsRAQsxQ61mw+qP1ZzbL9Bc78x2p5OqNgNpnoAFLTrX8n5Kxph0CsnhmKKNXTWjXqU5L0pGPR7hYk+XWZr60Q==",
             "dev": true,
+            "optional": true,
+            "peer": true,
             "dependencies": {
                 "brace-expansion": "^1.1.7"
             },
@@ -14755,6 +14947,14 @@
                 "node": "*"
             }
         },
+        "node_modules/good-listener": {
+            "version": "1.2.2",
+            "resolved": "https://registry.npmjs.org/good-listener/-/good-listener-1.2.2.tgz",
+            "integrity": "sha512-goW1b+d9q/HIwbVYZzZ6SsTr4IgE+WA44A0GmPIQstuOrgsFcT7VEJ48nmr9GaRtNu0XTKacFLGnBPAM6Afouw==",
+            "dependencies": {
+                "delegate": "^3.1.2"
+            }
+        },
         "node_modules/graceful-fs": {
             "version": "4.2.10",
             "resolved": "https://registry.npmmirror.com/graceful-fs/-/graceful-fs-4.2.10.tgz",
@@ -15018,12 +15218,26 @@
                 "he": "bin/he"
             }
         },
+        "node_modules/heap": {
+            "version": "0.2.7",
+            "resolved": "https://registry.npmjs.org/heap/-/heap-0.2.7.tgz",
+            "integrity": "sha512-2bsegYkkHO+h/9MGbn6KWcE45cHZgPANo5LXF7EvWdT0yT2EguSVO1nDgU5c8+ZOPwp2vMNa7YFsJhVcDR9Sdg=="
+        },
         "node_modules/hex-color-regex": {
             "version": "1.1.0",
             "resolved": "https://registry.npmmirror.com/hex-color-regex/-/hex-color-regex-1.1.0.tgz",
             "integrity": "sha512-l9sfDFsuqtOqKDsQdqrMRk0U85RZc0RtOR9yPI7mRVOa4FsR/BVnZ0shmQRM96Ji99kYZP/7hn1cedc1+ApsTQ==",
             "dev": true
         },
+        "node_modules/highlight.js": {
+            "version": "9.18.3",
+            "resolved": "https://registry.npmjs.org/highlight.js/-/highlight.js-9.18.3.tgz",
+            "integrity": "sha512-zBZAmhSupHIl5sITeMqIJnYCDfAEc3Gdkqj65wC1lpI468MMQeeQkhcIAvk+RylAkxrCcI9xy9piHiXeQ1BdzQ==",
+            "deprecated": "Version no longer supported. Upgrade to @latest",
+            "engines": {
+                "node": "*"
+            }
+        },
         "node_modules/hmac-drbg": {
             "version": "1.0.1",
             "resolved": "https://registry.npmmirror.com/hmac-drbg/-/hmac-drbg-1.0.1.tgz",
@@ -15553,6 +15767,12 @@
                 "node": ">=0.10.0"
             }
         },
+        "node_modules/immutable": {
+            "version": "4.3.6",
+            "resolved": "https://registry.npmjs.org/immutable/-/immutable-4.3.6.tgz",
+            "integrity": "sha512-Ju0+lEMyzMVZarkTn/gqRpdqd5dOPaz1mCZ0SH3JV6iFw81PldE/PEB1hWVEA288HPt4WXW8O7AWxB10M+03QQ==",
+            "dev": true
+        },
         "node_modules/import-cwd": {
             "version": "2.1.0",
             "resolved": "https://registry.npmmirror.com/import-cwd/-/import-cwd-2.1.0.tgz",
@@ -15962,7 +16182,7 @@
             "version": "2.1.0",
             "resolved": "https://registry.npmmirror.com/is-binary-path/-/is-binary-path-2.1.0.tgz",
             "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==",
-            "optional": true,
+            "devOptional": true,
             "dependencies": {
                 "binary-extensions": "^2.0.0"
             },
@@ -16306,8 +16526,7 @@
         "node_modules/is-promise": {
             "version": "2.2.2",
             "resolved": "https://registry.npmmirror.com/is-promise/-/is-promise-2.2.2.tgz",
-            "integrity": "sha512-+lP4/6lKUBfQjZ2pdxThZvLUAafmZb8OAxFb8XXtiQmS35INgr85hdOGoEs124ez1FCnZJt6jau/T+alh58QFQ==",
-            "dev": true
+            "integrity": "sha512-+lP4/6lKUBfQjZ2pdxThZvLUAafmZb8OAxFb8XXtiQmS35INgr85hdOGoEs124ez1FCnZJt6jau/T+alh58QFQ=="
         },
         "node_modules/is-regex": {
             "version": "1.1.4",
@@ -16489,8 +16708,7 @@
         "node_modules/jquery": {
             "version": "3.6.0",
             "resolved": "https://registry.npmmirror.com/jquery/-/jquery-3.6.0.tgz",
-            "integrity": "sha512-JVzAR/AjBvVt2BmYhxRCSYysDsPcssdmTFnzyLEts9qNwmjmu4JTAMYubEfwVOSwpQ1I1sKKFcxhZCI2buerfw==",
-            "peer": true
+            "integrity": "sha512-JVzAR/AjBvVt2BmYhxRCSYysDsPcssdmTFnzyLEts9qNwmjmu4JTAMYubEfwVOSwpQ1I1sKKFcxhZCI2buerfw=="
         },
         "node_modules/js-base64": {
             "version": "2.6.4",
@@ -16691,6 +16909,11 @@
                 "graceful-fs": "^4.1.11"
             }
         },
+        "node_modules/klayjs": {
+            "version": "0.4.1",
+            "resolved": "https://registry.npmjs.org/klayjs/-/klayjs-0.4.1.tgz",
+            "integrity": "sha512-WUNxuO7O79TEkxCj6OIaK5TJBkaWaR/IKNTakgV9PwDn+mrr63MLHed34AcE2yTaDntgO6l0zGFIzhcoTeroTA=="
+        },
         "node_modules/klona": {
             "version": "2.0.5",
             "resolved": "https://registry.npmmirror.com/klona/-/klona-2.0.5.tgz",
@@ -18013,12 +18236,25 @@
                 "node": ">=4"
             }
         },
+        "node_modules/material-colors": {
+            "version": "1.2.6",
+            "resolved": "https://registry.npmjs.org/material-colors/-/material-colors-1.2.6.tgz",
+            "integrity": "sha512-6qE4B9deFBIa9YSpOc9O0Sgc43zTeVYbgDT5veRKSlB2+ZuHNoVVxA1L/ckMUayV9Ay9y7Z/SZCLcGteW9i7bg=="
+        },
         "node_modules/math-random": {
             "version": "1.0.4",
             "resolved": "https://registry.npmmirror.com/math-random/-/math-random-1.0.4.tgz",
             "integrity": "sha512-rUxjysqif/BZQH2yhd5Aaq7vXMSx9NdEsQcyA07uEzIvxgI7zIr33gGsh+RU0/XjmQpCW7RsVof1vlkvQVCK5A==",
             "dev": true
         },
+        "node_modules/mavon-editor": {
+            "version": "2.10.4",
+            "resolved": "https://registry.npmjs.org/mavon-editor/-/mavon-editor-2.10.4.tgz",
+            "integrity": "sha512-CFsBLkgt/KZBDg+SJYe2fyYv4zClY149PiwpH0rDAiiP4ae1XNs0GC8nBsoTeipsHcebDLN1QMkt3bUsnMDjQw==",
+            "dependencies": {
+                "xss": "^1.0.6"
+            }
+        },
         "node_modules/md5": {
             "version": "2.3.0",
             "resolved": "https://registry.npmmirror.com/md5/-/md5-2.3.0.tgz",
@@ -18829,6 +19065,25 @@
                 "node": "*"
             }
         },
+        "node_modules/moment-timezone": {
+            "version": "0.5.45",
+            "resolved": "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.45.tgz",
+            "integrity": "sha512-HIWmqA86KcmCAhnMAN0wuDOARV/525R2+lOLotuGFzn4HO+FH+/645z2wx0Dt3iDv6/p61SIvKnDstISainhLQ==",
+            "dependencies": {
+                "moment": "^2.29.4"
+            },
+            "engines": {
+                "node": "*"
+            }
+        },
+        "node_modules/moment-timezone/node_modules/moment": {
+            "version": "2.30.1",
+            "resolved": "https://registry.npmjs.org/moment/-/moment-2.30.1.tgz",
+            "integrity": "sha512-uEmtNhbDOrWPFS+hdjFCBfy9f2YoyzRpwcl+DqpC6taX21FzsTLQVbMV/W7PzNSX6x/bhC1zA3c2UQ5NzH6how==",
+            "engines": {
+                "node": "*"
+            }
+        },
         "node_modules/monaco-editor": {
             "version": "0.19.3",
             "resolved": "https://registry.npmmirror.com/monaco-editor/-/monaco-editor-0.19.3.tgz",
@@ -18847,6 +19102,20 @@
                 "webpack": "^4.5.0"
             }
         },
+        "node_modules/monaco-languageclient": {
+            "version": "0.13.0",
+            "resolved": "https://registry.npmjs.org/monaco-languageclient/-/monaco-languageclient-0.13.0.tgz",
+            "integrity": "sha512-aCwd33dTitwV5QwY56rpYHwzEGXei8TZ+yvZcvP3gEMd6Mizr8m3pOuoknDi2SUfLuNAHS6+ulvLgZlNQB5awg==",
+            "dependencies": {
+                "glob-to-regexp": "^0.3.0",
+                "vscode-jsonrpc": "^5.0.0",
+                "vscode-languageclient": "^6.0.0",
+                "vscode-uri": "^2.1.1"
+            },
+            "engines": {
+                "vscode": "^1.41.0"
+            }
+        },
         "node_modules/move-concurrently": {
             "version": "1.0.1",
             "resolved": "https://registry.npmmirror.com/move-concurrently/-/move-concurrently-1.0.1.tgz",
@@ -18972,7 +19241,7 @@
             "version": "2.15.0",
             "resolved": "https://registry.npmmirror.com/nan/-/nan-2.15.0.tgz",
             "integrity": "sha512-8ZtvEnA2c5aYCZYd1cvgdnU6cqwixRoYg70xPLWUws5ORTa/lnw+u4amixRS/Ac5U5mQVgp9pnlSUnbNWFaWZQ==",
-            "devOptional": true
+            "optional": true
         },
         "node_modules/nanomatch": {
             "version": "1.2.13",
@@ -19183,6 +19452,8 @@
             "integrity": "sha512-f+Rbqt92Ful9gX0cGtdYwjTrWAaGURgaK5rZCWOgCNyGWusFYHhbqCCBoFBeat+HKETOU02AyTxNhJV0YZf2jQ==",
             "dev": true,
             "hasInstallScript": true,
+            "optional": true,
+            "peer": true,
             "dependencies": {
                 "async-foreach": "^0.1.3",
                 "chalk": "^1.1.1",
@@ -19212,6 +19483,8 @@
             "resolved": "https://registry.npmmirror.com/ansi-regex/-/ansi-regex-2.1.1.tgz",
             "integrity": "sha512-TIGnTpdo+E3+pCyAluZvtED5p5wCqLdezCyhPZzKPcxvFplEt4i+W7OONCKgeZFT3+y5NZZfOOS/Bdcanm1MYA==",
             "dev": true,
+            "optional": true,
+            "peer": true,
             "engines": {
                 "node": ">=0.10.0"
             }
@@ -19221,6 +19494,8 @@
             "resolved": "https://registry.npmmirror.com/ansi-styles/-/ansi-styles-2.2.1.tgz",
             "integrity": "sha512-kmCevFghRiWM7HB5zTPULl4r9bVFSWjz62MhqizDGUrq2NWuNMQyuv4tHHoKJHs69M/MF64lEcHdYIocrdWQYA==",
             "dev": true,
+            "optional": true,
+            "peer": true,
             "engines": {
                 "node": ">=0.10.0"
             }
@@ -19230,6 +19505,8 @@
             "resolved": "https://registry.npmmirror.com/chalk/-/chalk-1.1.3.tgz",
             "integrity": "sha512-U3lRVLMSlsCfjqYPbLyVv11M9CPW4I728d6TCKMAOJueEeB9/8o+eSsMnxPJD+Q+K909sdESg7C+tIkoH6on1A==",
             "dev": true,
+            "optional": true,
+            "peer": true,
             "dependencies": {
                 "ansi-styles": "^2.2.1",
                 "escape-string-regexp": "^1.0.2",
@@ -19246,6 +19523,8 @@
             "resolved": "https://registry.npmmirror.com/chownr/-/chownr-2.0.0.tgz",
             "integrity": "sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==",
             "dev": true,
+            "optional": true,
+            "peer": true,
             "engines": {
                 "node": ">=10"
             }
@@ -19255,6 +19534,8 @@
             "resolved": "https://registry.npmmirror.com/cross-spawn/-/cross-spawn-7.0.3.tgz",
             "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
             "dev": true,
+            "optional": true,
+            "peer": true,
             "dependencies": {
                 "path-key": "^3.1.0",
                 "shebang-command": "^2.0.0",
@@ -19269,6 +19550,8 @@
             "resolved": "https://registry.npmmirror.com/find-up/-/find-up-4.1.0.tgz",
             "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
             "dev": true,
+            "optional": true,
+            "peer": true,
             "dependencies": {
                 "locate-path": "^5.0.0",
                 "path-exists": "^4.0.0"
@@ -19282,6 +19565,8 @@
             "resolved": "https://registry.npmmirror.com/fs-minipass/-/fs-minipass-2.1.0.tgz",
             "integrity": "sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg==",
             "dev": true,
+            "optional": true,
+            "peer": true,
             "dependencies": {
                 "minipass": "^3.0.0"
             },
@@ -19294,6 +19579,8 @@
             "resolved": "https://registry.npmmirror.com/get-stdin/-/get-stdin-4.0.1.tgz",
             "integrity": "sha512-F5aQMywwJ2n85s4hJPTT9RPxGmubonuB10MNYo17/xph174n2MIR33HRguhzVag10O/npM7SPk73LMZNP+FaWw==",
             "dev": true,
+            "optional": true,
+            "peer": true,
             "engines": {
                 "node": ">=0.10.0"
             }
@@ -19303,6 +19590,8 @@
             "resolved": "https://registry.npmmirror.com/hosted-git-info/-/hosted-git-info-4.1.0.tgz",
             "integrity": "sha512-kyCuEOWjJqZuDbRHzL8V93NzQhwIB71oFWSyzVo+KPZI+pnQPPxucdkrOZvkLRnrf5URsQM+IJ09Dw29cRALIA==",
             "dev": true,
+            "optional": true,
+            "peer": true,
             "dependencies": {
                 "lru-cache": "^6.0.0"
             },
@@ -19315,6 +19604,8 @@
             "resolved": "https://registry.npmmirror.com/locate-path/-/locate-path-5.0.0.tgz",
             "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
             "dev": true,
+            "optional": true,
+            "peer": true,
             "dependencies": {
                 "p-locate": "^4.1.0"
             },
@@ -19327,6 +19618,8 @@
             "resolved": "https://registry.npmmirror.com/lru-cache/-/lru-cache-6.0.0.tgz",
             "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
             "dev": true,
+            "optional": true,
+            "peer": true,
             "dependencies": {
                 "yallist": "^4.0.0"
             },
@@ -19339,6 +19632,8 @@
             "resolved": "https://registry.npmmirror.com/meow/-/meow-9.0.0.tgz",
             "integrity": "sha512-+obSblOQmRhcyBt62furQqRAQpNyWXo8BuQ5bN7dG8wmwQ+vwHKp/rCFD4CrTP8CsDQD1sjoZ94K417XEUk8IQ==",
             "dev": true,
+            "optional": true,
+            "peer": true,
             "dependencies": {
                 "@types/minimist": "^1.2.0",
                 "camelcase-keys": "^6.2.2",
@@ -19362,6 +19657,8 @@
             "resolved": "https://registry.npmmirror.com/minipass/-/minipass-3.3.4.tgz",
             "integrity": "sha512-I9WPbWHCGu8W+6k1ZiGpPu0GkoKBeorkfKNuAFBNS1HNFJvke82sxvI5bzcCNpWPorkOO5QQ+zomzzwRxejXiw==",
             "dev": true,
+            "optional": true,
+            "peer": true,
             "dependencies": {
                 "yallist": "^4.0.0"
             },
@@ -19374,6 +19671,8 @@
             "resolved": "https://registry.npmmirror.com/minizlib/-/minizlib-2.1.2.tgz",
             "integrity": "sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==",
             "dev": true,
+            "optional": true,
+            "peer": true,
             "dependencies": {
                 "minipass": "^3.0.0",
                 "yallist": "^4.0.0"
@@ -19387,6 +19686,8 @@
             "resolved": "https://registry.npmmirror.com/mkdirp/-/mkdirp-1.0.4.tgz",
             "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==",
             "dev": true,
+            "optional": true,
+            "peer": true,
             "bin": {
                 "mkdirp": "bin/cmd.js"
             },
@@ -19399,6 +19700,8 @@
             "resolved": "https://registry.npmmirror.com/node-gyp/-/node-gyp-7.1.2.tgz",
             "integrity": "sha512-CbpcIo7C3eMu3dL1c3d0xw449fHIGALIJsRP4DDPHpyiW8vcriNY7ubh9TE4zEKfSxscY7PjeFnshE7h75ynjQ==",
             "dev": true,
+            "optional": true,
+            "peer": true,
             "dependencies": {
                 "env-paths": "^2.2.0",
                 "glob": "^7.1.4",
@@ -19423,6 +19726,8 @@
             "resolved": "https://registry.npmmirror.com/nopt/-/nopt-5.0.0.tgz",
             "integrity": "sha512-Tbj67rffqceeLpcRXrT7vKAN8CwfPeIBgM7E6iBkmKLV7bEMwpGgYLGv0jACUsECaa/vuxP0IjEont6umdMgtQ==",
             "dev": true,
+            "optional": true,
+            "peer": true,
             "dependencies": {
                 "abbrev": "1"
             },
@@ -19438,6 +19743,8 @@
             "resolved": "https://registry.npmmirror.com/normalize-package-data/-/normalize-package-data-3.0.3.tgz",
             "integrity": "sha512-p2W1sgqij3zMMyRC067Dg16bfzVH+w7hyegmpIvZ4JNjqtGOVAIvLmjBx3yP7YTe9vKJgkoNOPjwQGogDoMXFA==",
             "dev": true,
+            "optional": true,
+            "peer": true,
             "dependencies": {
                 "hosted-git-info": "^4.0.1",
                 "is-core-module": "^2.5.0",
@@ -19453,6 +19760,8 @@
             "resolved": "https://registry.npmmirror.com/p-locate/-/p-locate-4.1.0.tgz",
             "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
             "dev": true,
+            "optional": true,
+            "peer": true,
             "dependencies": {
                 "p-limit": "^2.2.0"
             },
@@ -19465,6 +19774,8 @@
             "resolved": "https://registry.npmmirror.com/path-exists/-/path-exists-4.0.0.tgz",
             "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
             "dev": true,
+            "optional": true,
+            "peer": true,
             "engines": {
                 "node": ">=8"
             }
@@ -19474,6 +19785,8 @@
             "resolved": "https://registry.npmmirror.com/path-key/-/path-key-3.1.1.tgz",
             "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
             "dev": true,
+            "optional": true,
+            "peer": true,
             "engines": {
                 "node": ">=8"
             }
@@ -19483,6 +19796,8 @@
             "resolved": "https://registry.npmmirror.com/read-pkg-up/-/read-pkg-up-7.0.1.tgz",
             "integrity": "sha512-zK0TB7Xd6JpCLmlLmufqykGE+/TlOePD6qKClNW7hHDKFh/J7/7gCWGR7joEQEW1bKq3a3yUZSObOoWLFQ4ohg==",
             "dev": true,
+            "optional": true,
+            "peer": true,
             "dependencies": {
                 "find-up": "^4.1.0",
                 "read-pkg": "^5.2.0",
@@ -19497,6 +19812,8 @@
             "resolved": "https://registry.npmmirror.com/type-fest/-/type-fest-0.8.1.tgz",
             "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==",
             "dev": true,
+            "optional": true,
+            "peer": true,
             "engines": {
                 "node": ">=8"
             }
@@ -19506,6 +19823,8 @@
             "resolved": "https://registry.npmmirror.com/rimraf/-/rimraf-3.0.2.tgz",
             "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
             "dev": true,
+            "optional": true,
+            "peer": true,
             "dependencies": {
                 "glob": "^7.1.3"
             },
@@ -19518,6 +19837,8 @@
             "resolved": "https://registry.npmmirror.com/semver/-/semver-7.3.8.tgz",
             "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==",
             "dev": true,
+            "optional": true,
+            "peer": true,
             "dependencies": {
                 "lru-cache": "^6.0.0"
             },
@@ -19533,6 +19854,8 @@
             "resolved": "https://registry.npmmirror.com/shebang-command/-/shebang-command-2.0.0.tgz",
             "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
             "dev": true,
+            "optional": true,
+            "peer": true,
             "dependencies": {
                 "shebang-regex": "^3.0.0"
             },
@@ -19545,6 +19868,8 @@
             "resolved": "https://registry.npmmirror.com/shebang-regex/-/shebang-regex-3.0.0.tgz",
             "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
             "dev": true,
+            "optional": true,
+            "peer": true,
             "engines": {
                 "node": ">=8"
             }
@@ -19554,6 +19879,8 @@
             "resolved": "https://registry.npmmirror.com/strip-ansi/-/strip-ansi-3.0.1.tgz",
             "integrity": "sha512-VhumSSbBqDTP8p2ZLKj40UjBCV4+v8bUSEpUb4KjRgWk9pbqGF4REFj6KEagidb2f/M6AzC0EmFyDNGaw9OCzg==",
             "dev": true,
+            "optional": true,
+            "peer": true,
             "dependencies": {
                 "ansi-regex": "^2.0.0"
             },
@@ -19566,6 +19893,8 @@
             "resolved": "https://registry.npmmirror.com/supports-color/-/supports-color-2.0.0.tgz",
             "integrity": "sha512-KKNVtd6pCYgPIKU4cp2733HWYCpplQhddZLBUryaAHou723x+FRzQ5Df824Fj+IyyuiQTRoub4SnIFfIcrp70g==",
             "dev": true,
+            "optional": true,
+            "peer": true,
             "engines": {
                 "node": ">=0.8.0"
             }
@@ -19575,6 +19904,8 @@
             "resolved": "https://registry.npmmirror.com/tar/-/tar-6.1.12.tgz",
             "integrity": "sha512-jU4TdemS31uABHd+Lt5WEYJuzn+TJTCBLljvIAHZOz6M9Os5pJ4dD+vRFLxPa/n3T0iEFzpi+0x1UfuDZYbRMw==",
             "dev": true,
+            "optional": true,
+            "peer": true,
             "dependencies": {
                 "chownr": "^2.0.0",
                 "fs-minipass": "^2.0.0",
@@ -19592,6 +19923,8 @@
             "resolved": "https://registry.npmmirror.com/type-fest/-/type-fest-0.18.1.tgz",
             "integrity": "sha512-OIAYXk8+ISY+qTOwkHtKqzAuxchoMiD9Udx+FSGQDuiRR+PJKJHc2NJAXlbhkGwTt/4/nKZxELY1w3ReWOL8mw==",
             "dev": true,
+            "optional": true,
+            "peer": true,
             "engines": {
                 "node": ">=10"
             }
@@ -19601,6 +19934,8 @@
             "resolved": "https://registry.npmmirror.com/which/-/which-2.0.2.tgz",
             "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
             "dev": true,
+            "optional": true,
+            "peer": true,
             "dependencies": {
                 "isexe": "^2.0.0"
             },
@@ -19615,7 +19950,9 @@
             "version": "4.0.0",
             "resolved": "https://registry.npmmirror.com/yallist/-/yallist-4.0.0.tgz",
             "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
-            "dev": true
+            "dev": true,
+            "optional": true,
+            "peer": true
         },
         "node_modules/nopt": {
             "version": "4.0.3",
@@ -22553,7 +22890,7 @@
             "version": "3.6.0",
             "resolved": "https://registry.npmmirror.com/readdirp/-/readdirp-3.6.0.tgz",
             "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==",
-            "optional": true,
+            "devOptional": true,
             "dependencies": {
                 "picomatch": "^2.2.1"
             },
@@ -22561,6 +22898,11 @@
                 "node": ">=8.10.0"
             }
         },
+        "node_modules/reconnecting-websocket": {
+            "version": "4.4.0",
+            "resolved": "https://registry.npmjs.org/reconnecting-websocket/-/reconnecting-websocket-4.4.0.tgz",
+            "integrity": "sha512-D2E33ceRPga0NvTDhJmphEgJ7FUYF0v4lr1ki0csq06OdlxKfugGzN0dSkxM/NfqCxYELK4KcaTOUOjTV6Dcng=="
+        },
         "node_modules/redent": {
             "version": "3.0.0",
             "resolved": "https://registry.npmmirror.com/redent/-/redent-3.0.0.tgz",
@@ -22607,8 +22949,7 @@
         "node_modules/regenerator-runtime": {
             "version": "0.13.9",
             "resolved": "https://registry.npmmirror.com/regenerator-runtime/-/regenerator-runtime-0.13.9.tgz",
-            "integrity": "sha512-p3VT+cOEgxFsRRA9X4lkI1E+k2/CtnKtU4gcxyaCUreilL/vqI6CdZ3wxVUx3UOUg+gnUOQQcRI7BmSI656MYA==",
-            "dev": true
+            "integrity": "sha512-p3VT+cOEgxFsRRA9X4lkI1E+k2/CtnKtU4gcxyaCUreilL/vqI6CdZ3wxVUx3UOUg+gnUOQQcRI7BmSI656MYA=="
         },
         "node_modules/regenerator-transform": {
             "version": "0.15.0",
@@ -23170,11 +23511,30 @@
             "resolved": "https://registry.npmmirror.com/safer-buffer/-/safer-buffer-2.1.2.tgz",
             "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
         },
+        "node_modules/sass": {
+            "version": "1.49.0",
+            "resolved": "https://registry.npmjs.org/sass/-/sass-1.49.0.tgz",
+            "integrity": "sha512-TVwVdNDj6p6b4QymJtNtRS2YtLJ/CqZriGg0eIAbAKMlN8Xy6kbv33FsEZSF7FufFFM705SQviHjjThfaQ4VNw==",
+            "dev": true,
+            "dependencies": {
+                "chokidar": ">=3.0.0 <4.0.0",
+                "immutable": "^4.0.0",
+                "source-map-js": ">=0.6.2 <2.0.0"
+            },
+            "bin": {
+                "sass": "sass.js"
+            },
+            "engines": {
+                "node": ">=8.9.0"
+            }
+        },
         "node_modules/sass-graph": {
             "version": "2.2.5",
             "resolved": "https://registry.npmmirror.com/sass-graph/-/sass-graph-2.2.5.tgz",
             "integrity": "sha512-VFWDAHOe6mRuT4mZRd4eKE+d8Uedrk6Xnh7Sh9b4NGufQLQjOrvf/MQoOdx+0s92L89FeyUUNfU597j/3uNpag==",
             "dev": true,
+            "optional": true,
+            "peer": true,
             "dependencies": {
                 "glob": "^7.0.0",
                 "lodash": "^4.0.0",
@@ -23189,13 +23549,17 @@
             "version": "7.0.3",
             "resolved": "https://registry.npmmirror.com/emoji-regex/-/emoji-regex-7.0.3.tgz",
             "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==",
-            "dev": true
+            "dev": true,
+            "optional": true,
+            "peer": true
         },
         "node_modules/sass-graph/node_modules/string-width": {
             "version": "3.1.0",
             "resolved": "https://registry.npmmirror.com/string-width/-/string-width-3.1.0.tgz",
             "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
             "dev": true,
+            "optional": true,
+            "peer": true,
             "dependencies": {
                 "emoji-regex": "^7.0.1",
                 "is-fullwidth-code-point": "^2.0.0",
@@ -23210,6 +23574,8 @@
             "resolved": "https://registry.npmmirror.com/yargs/-/yargs-13.3.2.tgz",
             "integrity": "sha512-AX3Zw5iPruN5ie6xGRIDgqkT+ZhnRlZMLMHAs8tg7nRruy2Nb+i5o9bwghAogtM08q1dpr2LVoS8KSTMYpWXUw==",
             "dev": true,
+            "optional": true,
+            "peer": true,
             "dependencies": {
                 "cliui": "^5.0.0",
                 "find-up": "^3.0.0",
@@ -23228,6 +23594,8 @@
             "resolved": "https://registry.npmmirror.com/yargs-parser/-/yargs-parser-13.1.2.tgz",
             "integrity": "sha512-3lbsNRf/j+A4QuSZfDRA7HRSfWrzO0YjqTJd5kjAq37Zep1CEgaYmrH9Q3GwPiB9cHyd1Y1UwggGhJGoxipbzg==",
             "dev": true,
+            "optional": true,
+            "peer": true,
             "dependencies": {
                 "camelcase": "^5.0.0",
                 "decamelize": "^1.2.0"
@@ -23362,6 +23730,8 @@
             "resolved": "https://registry.npmmirror.com/scss-tokenizer/-/scss-tokenizer-0.2.3.tgz",
             "integrity": "sha512-dYE8LhncfBUar6POCxMTm0Ln+erjeczqEvCJib5/7XNkdw1FkUGgwMPY360FY0FgPWQxHWCx29Jl3oejyGLM9Q==",
             "dev": true,
+            "optional": true,
+            "peer": true,
             "dependencies": {
                 "js-base64": "^2.1.8",
                 "source-map": "^0.4.2"
@@ -23372,6 +23742,8 @@
             "resolved": "https://registry.npmmirror.com/source-map/-/source-map-0.4.4.tgz",
             "integrity": "sha512-Y8nIfcb1s/7DcobUz1yOO1GSp7gyL+D9zLHDehT7iRESqGSxjJ448Sg7rvfgsRJCnKLdSl11uGf0s9X80cH0/A==",
             "dev": true,
+            "optional": true,
+            "peer": true,
             "dependencies": {
                 "amdefine": ">=0.0.4"
             },
@@ -23379,6 +23751,11 @@
                 "node": ">=0.8.0"
             }
         },
+        "node_modules/select": {
+            "version": "1.1.2",
+            "resolved": "https://registry.npmjs.org/select/-/select-1.1.2.tgz",
+            "integrity": "sha512-OwpTSOfy6xSs1+pwcNrv0RBMOzI39Lp3qQKUTPVVPRjCdNa5JH/oPRiqsesIskK8TVgmRiHwO4KXlV2Li9dANA=="
+        },
         "node_modules/select-hose": {
             "version": "2.0.0",
             "resolved": "https://registry.npmmirror.com/select-hose/-/select-hose-2.0.0.tgz",
@@ -23968,6 +24345,11 @@
                 "node": ">=0.10.0"
             }
         },
+        "node_modules/sortablejs": {
+            "version": "1.10.2",
+            "resolved": "https://registry.npmjs.org/sortablejs/-/sortablejs-1.10.2.tgz",
+            "integrity": "sha512-YkPGufevysvfwn5rfdlGyrGjt7/CRHwvRPogD/lC+TnvcN29jDpCifKP+rBqf+LRldfXSTh+0CGLcSg0VIxq3A=="
+        },
         "node_modules/source-list-map": {
             "version": "2.0.1",
             "resolved": "https://registry.npmmirror.com/source-list-map/-/source-list-map-2.0.1.tgz",
@@ -23981,6 +24363,15 @@
                 "node": ">=0.10.0"
             }
         },
+        "node_modules/source-map-js": {
+            "version": "1.2.0",
+            "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.0.tgz",
+            "integrity": "sha512-itJW8lvSA0TXEphiRoawsCksnlf8SyvmFzIhltqAHluXd88pkCd+cXJVHTDwdCr0IzwptSm035IHQktUu1QUMg==",
+            "dev": true,
+            "engines": {
+                "node": ">=0.10.0"
+            }
+        },
         "node_modules/source-map-resolve": {
             "version": "0.5.3",
             "resolved": "https://registry.npmmirror.com/source-map-resolve/-/source-map-resolve-0.5.3.tgz",
@@ -24369,6 +24760,8 @@
             "resolved": "https://registry.npmmirror.com/stdout-stream/-/stdout-stream-1.4.1.tgz",
             "integrity": "sha512-j4emi03KXqJWcIeF8eIXkjMFN1Cmb8gUlDYGeBALLPo5qdyTfA9bOtl8m33lRoC+vFMkP3gl0WsDr6+gzxbbTA==",
             "dev": true,
+            "optional": true,
+            "peer": true,
             "dependencies": {
                 "readable-stream": "^2.0.1"
             }
@@ -25332,6 +25725,11 @@
             "integrity": "sha512-qsdtZH+vMoCARQtyod4imc2nIJwg9Cc7lPRrw9CzF8ZKR0khdr8+2nX80PBhET3tcyTtJDxAffGh2rXH4tyU8A==",
             "dev": true
         },
+        "node_modules/tiny-emitter": {
+            "version": "2.1.0",
+            "resolved": "https://registry.npmjs.org/tiny-emitter/-/tiny-emitter-2.1.0.tgz",
+            "integrity": "sha512-NB6Dk1A9xgQPMoGqC5CVXn123gWyte215ONT5Pp5a0yt4nlEoO1ZWeCwpncaekPHXO60i47ihFnZPiRPjRMq4Q=="
+        },
         "node_modules/tinycolor2": {
             "version": "1.4.2",
             "resolved": "https://registry.npmmirror.com/tinycolor2/-/tinycolor2-1.4.2.tgz",
@@ -25474,6 +25872,8 @@
             "resolved": "https://registry.npmmirror.com/true-case-path/-/true-case-path-1.0.3.tgz",
             "integrity": "sha512-m6s2OdQe5wgpFMC+pAJ+q9djG82O2jcHPOI6RNg1yy9rCYR+WD6Nbpl32fDpfC56nirdRy+opFa/Vk7HYhqaew==",
             "dev": true,
+            "optional": true,
+            "peer": true,
             "dependencies": {
                 "glob": "^7.1.2"
             }
@@ -26018,6 +26418,61 @@
             "resolved": "https://registry.npmmirror.com/vm-browserify/-/vm-browserify-1.1.2.tgz",
             "integrity": "sha512-2ham8XPWTONajOR0ohOKOHXkm3+gaBmGut3SRuu75xLd/RRaY6vqgh8NBYYk7+RW3u5AtzPQZG8F10LHkl0lAQ=="
         },
+        "node_modules/vscode-jsonrpc": {
+            "version": "5.0.1",
+            "resolved": "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-5.0.1.tgz",
+            "integrity": "sha512-JvONPptw3GAQGXlVV2utDcHx0BiY34FupW/kI6mZ5x06ER5DdPG/tXWMVHjTNULF5uKPOUUD0SaXg5QaubJL0A==",
+            "engines": {
+                "node": ">=8.0.0 || >=10.0.0"
+            }
+        },
+        "node_modules/vscode-languageclient": {
+            "version": "6.1.4",
+            "resolved": "https://registry.npmjs.org/vscode-languageclient/-/vscode-languageclient-6.1.4.tgz",
+            "integrity": "sha512-EUOU+bJu6axmt0RFNo3nrglQLPXMfanbYViJee3Fbn2VuQoX0ZOI4uTYhSRvYLP2vfwTP/juV62P/mksCdTZMA==",
+            "dependencies": {
+                "semver": "^6.3.0",
+                "vscode-languageserver-protocol": "3.15.3"
+            },
+            "engines": {
+                "vscode": "^1.41.0"
+            }
+        },
+        "node_modules/vscode-languageclient/node_modules/semver": {
+            "version": "6.3.1",
+            "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
+            "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
+            "bin": {
+                "semver": "bin/semver.js"
+            }
+        },
+        "node_modules/vscode-languageserver-protocol": {
+            "version": "3.15.3",
+            "resolved": "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.15.3.tgz",
+            "integrity": "sha512-zrMuwHOAQRhjDSnflWdJG+O2ztMWss8GqUUB8dXLR/FPenwkiBNkMIJJYfSN6sgskvsF0rHAoBowNQfbyZnnvw==",
+            "dependencies": {
+                "vscode-jsonrpc": "^5.0.1",
+                "vscode-languageserver-types": "3.15.1"
+            }
+        },
+        "node_modules/vscode-languageserver-types": {
+            "version": "3.15.1",
+            "resolved": "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.15.1.tgz",
+            "integrity": "sha512-+a9MPUQrNGRrGU630OGbYVQ+11iOIovjCkqxajPa9w57Sd5ruK8WQNsslzpa0x/QJqC8kRc2DUxWjIFwoNm4ZQ=="
+        },
+        "node_modules/vscode-uri": {
+            "version": "2.1.2",
+            "resolved": "https://registry.npmjs.org/vscode-uri/-/vscode-uri-2.1.2.tgz",
+            "integrity": "sha512-8TEXQxlldWAuIODdukIb+TR5s+9Ds40eSJrw+1iDDA9IFORPjMELarNQE3myz5XIkWWpdprmJjm1/SxMlWOC8A=="
+        },
+        "node_modules/vscode-ws-jsonrpc": {
+            "version": "0.2.0",
+            "resolved": "https://registry.npmjs.org/vscode-ws-jsonrpc/-/vscode-ws-jsonrpc-0.2.0.tgz",
+            "integrity": "sha512-NE9HNRgPjCaPyTJvIudcpyIWPImxwRDtuTX16yks7SAiZgSXigxAiZOvSvVBGmD1G/OMfrFo6BblOtjVR9DdVA==",
+            "dependencies": {
+                "vscode-jsonrpc": "^5.0.0"
+            }
+        },
         "node_modules/vue": {
             "version": "2.6.12",
             "resolved": "https://registry.npmmirror.com/vue/-/vue-2.6.12.tgz",
@@ -26152,6 +26607,14 @@
             "integrity": "sha512-4gDntzrifFnCEvyoO8PqyJDmguXgVPxKiIxrBKjIowvL9l+N66196+72XVYR8BBf1Uv1Fgt3bGevJ+sEmxfZzw==",
             "dev": true
         },
+        "node_modules/vuedraggable": {
+            "version": "2.24.3",
+            "resolved": "https://registry.npmjs.org/vuedraggable/-/vuedraggable-2.24.3.tgz",
+            "integrity": "sha512-6/HDXi92GzB+Hcs9fC6PAAozK1RLt1ewPTLjK0anTYguXLAeySDmcnqE8IC0xa7shvSzRjQXq3/+dsZ7ETGF3g==",
+            "dependencies": {
+                "sortablejs": "1.10.2"
+            }
+        },
         "node_modules/vuescroll": {
             "version": "4.16.1",
             "resolved": "https://registry.npmmirror.com/vuescroll/-/vuescroll-4.16.1.tgz",
@@ -26160,6 +26623,11 @@
                 "vue": "^2.0.0"
             }
         },
+        "node_modules/watch-size": {
+            "version": "2.0.0",
+            "resolved": "https://registry.npmjs.org/watch-size/-/watch-size-2.0.0.tgz",
+            "integrity": "sha512-M92R89dNoTPWyCD+HuUEDdhaDnh9jxPGOwlDc0u51jAgmjUvzqaEMynXSr3BaWs+QdHYk4KzibPy1TFtjLmOZQ=="
+        },
         "node_modules/watchpack": {
             "version": "1.7.5",
             "resolved": "https://registry.npmmirror.com/watchpack/-/watchpack-1.7.5.tgz",
@@ -27225,6 +27693,21 @@
                 "async-limiter": "~1.0.0"
             }
         },
+        "node_modules/xss": {
+            "version": "1.0.15",
+            "resolved": "https://registry.npmjs.org/xss/-/xss-1.0.15.tgz",
+            "integrity": "sha512-FVdlVVC67WOIPvfOwhoMETV72f6GbW7aOabBC3WxN/oUdoEMDyLz4OgRv5/gck2ZeNqEQu+Tb0kloovXOfpYVg==",
+            "dependencies": {
+                "commander": "^2.20.3",
+                "cssfilter": "0.0.10"
+            },
+            "bin": {
+                "xss": "bin/xss"
+            },
+            "engines": {
+                "node": ">= 0.10.0"
+            }
+        },
         "node_modules/xtend": {
             "version": "4.0.2",
             "resolved": "https://registry.npmmirror.com/xtend/-/xtend-4.0.2.tgz",
@@ -27474,6 +27957,115 @@
             "version": "4.3.2",
             "resolved": "https://registry.npmmirror.com/zrender/-/zrender-4.3.2.tgz",
             "integrity": "sha512-bIusJLS8c4DkIcdiK+s13HiQ/zjQQVgpNohtd8d94Y2DnJqgM1yjh/jpDb8DoL6hd7r8Awagw8e3qK/oLaWr3g=="
+        },
+        "packages/apiServices": {
+            "name": "@dataspherestudio/apiServices",
+            "version": "1.1.19",
+            "dependencies": {
+                "@dataspherestudio/shared": "^1.1.19"
+            }
+        },
+        "packages/cyeditor": {
+            "name": "@dataspherestudio/cyeditor",
+            "version": "0.0.1",
+            "dependencies": {
+                "cytoscape": "3.27.0",
+                "cytoscape-klay": "^3.1.4"
+            },
+            "devDependencies": {}
+        },
+        "packages/dataGovernance": {
+            "name": "@dataspherestudio/dataGovernance",
+            "version": "1.1.19",
+            "dependencies": {
+                "@dataspherestudio/shared": "^1.1.19",
+                "clipboard": "2.0.8",
+                "jquery": "3.6.0"
+            }
+        },
+        "packages/dolphinScheduler": {
+            "name": "@dataspherestudio/dolphinScheduler",
+            "version": "1.1.19",
+            "dependencies": {
+                "@dataspherestudio/shared": "^1.1.19",
+                "bootstrap": "^3.4.1",
+                "d3": "3.5.17",
+                "dayjs": "1.10.7",
+                "moment-timezone": "^0.5.34"
+            }
+        },
+        "packages/dss": {
+            "name": "@dataspherestudio/dss",
+            "version": "1.1.19",
+            "dependencies": {
+                "@dataspherestudio/scriptis": "^1.1.19",
+                "@dataspherestudio/shared": "^1.1.19"
+            },
+            "devDependencies": {
+                "@vue/cli-plugin-babel": "3.12.1",
+                "@vue/cli-plugin-eslint": "3.12.1",
+                "@vue/cli-service": "3.12.1",
+                "@vue/eslint-config-standard": "4.0.0",
+                "babel-plugin-transform-remove-console": "6.9.4"
+            }
+        },
+        "packages/editor": {
+            "name": "@dataspherestudio/editor",
+            "version": "1.1.19",
+            "dependencies": {
+                "@dataspherestudio/shared": "^1.1.19",
+                "dt-sql-parser": "1.2.1"
+            }
+        },
+        "packages/editorLsp": {
+            "name": "@dataspherestudio/editor-lsp",
+            "version": "1.1.19",
+            "dependencies": {
+                "@dataspherestudio/shared": "^1.1.19",
+                "reconnecting-websocket": "4.4.0",
+                "vscode-ws-jsonrpc": "0.2.0"
+            }
+        },
+        "packages/exts": {
+            "name": "@dataspherestudio/exts",
+            "version": "1.1.19",
+            "dependencies": {
+                "@dataspherestudio/shared": "^1.1.19"
+            }
+        },
+        "packages/scriptis": {
+            "name": "@dataspherestudio/scriptis",
+            "version": "1.1.19",
+            "dependencies": {
+                "@dataspherestudio/shared": "^1.1.19",
+                "vuedraggable": "2.24.3"
+            }
+        },
+        "packages/shared": {
+            "name": "@dataspherestudio/shared",
+            "version": "1.1.19",
+            "dependencies": {
+                "dexie": "3.0.4"
+            }
+        },
+        "packages/workflows": {
+            "name": "@dataspherestudio/workflows",
+            "version": "1.1.19",
+            "dependencies": {
+                "@dataspherestudio/cyeditor": "^0.0.1",
+                "@dataspherestudio/scriptis": "^1.1.19",
+                "@dataspherestudio/shared": "^1.1.19"
+            }
+        },
+        "packages/workspace": {
+            "name": "@dataspherestudio/workspace",
+            "version": "1.1.19",
+            "dependencies": {
+                "@dataspherestudio/shared": "^1.1.19",
+                "@riophae/vue-treeselect": "0.4.0",
+                "highlight.js": "9.18.3",
+                "mavon-editor": "2.10.4"
+            }
         }
     },
     "dependencies": {
@@ -28379,7 +28971,6 @@
             "version": "7.17.9",
             "resolved": "https://registry.npmmirror.com/@babel/runtime/-/runtime-7.17.9.tgz",
             "integrity": "sha512-lSiBBvodq29uShpWGNbgFdKYNiFDo5/HIYsaCEY9ff4sb10x9jizo2+pRrSyF4jKZCXqgzuqBOQKbUm90gQwJg==",
-            "dev": true,
             "requires": {
                 "regenerator-runtime": "^0.13.4"
             }
@@ -28450,6 +29041,100 @@
                 "to-fast-properties": "^2.0.0"
             }
         },
+        "@dataspherestudio/apiServices": {
+            "version": "file:packages/apiServices",
+            "requires": {
+                "@dataspherestudio/shared": "^1.1.19"
+            }
+        },
+        "@dataspherestudio/cyeditor": {
+            "version": "file:packages/cyeditor",
+            "requires": {
+                "cytoscape": "3.27.0",
+                "cytoscape-klay": "^3.1.4"
+            }
+        },
+        "@dataspherestudio/dataGovernance": {
+            "version": "file:packages/dataGovernance",
+            "requires": {
+                "@dataspherestudio/shared": "^1.1.19",
+                "clipboard": "2.0.8",
+                "jquery": "3.6.0"
+            }
+        },
+        "@dataspherestudio/dolphinScheduler": {
+            "version": "file:packages/dolphinScheduler",
+            "requires": {
+                "@dataspherestudio/shared": "^1.1.19",
+                "bootstrap": "^3.4.1",
+                "d3": "3.5.17",
+                "dayjs": "1.10.7",
+                "moment-timezone": "^0.5.34"
+            }
+        },
+        "@dataspherestudio/dss": {
+            "version": "file:packages/dss",
+            "requires": {
+                "@dataspherestudio/scriptis": "^1.1.19",
+                "@dataspherestudio/shared": "^1.1.19",
+                "@vue/cli-plugin-babel": "3.12.1",
+                "@vue/cli-plugin-eslint": "3.12.1",
+                "@vue/cli-service": "3.12.1",
+                "@vue/eslint-config-standard": "4.0.0",
+                "babel-plugin-transform-remove-console": "6.9.4"
+            }
+        },
+        "@dataspherestudio/editor": {
+            "version": "file:packages/editor",
+            "requires": {
+                "@dataspherestudio/shared": "^1.1.19",
+                "dt-sql-parser": "1.2.1"
+            }
+        },
+        "@dataspherestudio/editor-lsp": {
+            "version": "file:packages/editorLsp",
+            "requires": {
+                "@dataspherestudio/shared": "^1.1.19",
+                "reconnecting-websocket": "4.4.0",
+                "vscode-ws-jsonrpc": "0.2.0"
+            }
+        },
+        "@dataspherestudio/exts": {
+            "version": "file:packages/exts",
+            "requires": {
+                "@dataspherestudio/shared": "^1.1.19"
+            }
+        },
+        "@dataspherestudio/scriptis": {
+            "version": "file:packages/scriptis",
+            "requires": {
+                "@dataspherestudio/shared": "^1.1.19",
+                "vuedraggable": "2.24.3"
+            }
+        },
+        "@dataspherestudio/shared": {
+            "version": "file:packages/shared",
+            "requires": {
+                "dexie": "3.0.4"
+            }
+        },
+        "@dataspherestudio/workflows": {
+            "version": "file:packages/workflows",
+            "requires": {
+                "@dataspherestudio/cyeditor": "^0.0.1",
+                "@dataspherestudio/scriptis": "^1.1.19",
+                "@dataspherestudio/shared": "^1.1.19"
+            }
+        },
+        "@dataspherestudio/workspace": {
+            "version": "file:packages/workspace",
+            "requires": {
+                "@dataspherestudio/shared": "^1.1.19",
+                "@riophae/vue-treeselect": "0.4.0",
+                "highlight.js": "9.18.3",
+                "mavon-editor": "2.10.4"
+            }
+        },
         "@gar/promisify": {
             "version": "1.1.3",
             "resolved": "https://registry.npmmirror.com/@gar/promisify/-/promisify-1.1.3.tgz",
@@ -32074,6 +32759,21 @@
                 "@octokit/openapi-types": "^11.2.0"
             }
         },
+        "@riophae/vue-treeselect": {
+            "version": "0.4.0",
+            "resolved": "https://registry.npmjs.org/@riophae/vue-treeselect/-/vue-treeselect-0.4.0.tgz",
+            "integrity": "sha512-J4atYmBqXQmiPFK/0B5sXKjtnGc21mBJEiyKIDZwk0Q9XuynVFX6IJ4EpaLmUgL5Tve7HAS7wkiGGSti6Uaxcg==",
+            "requires": {
+                "@babel/runtime": "^7.3.1",
+                "babel-helper-vue-jsx-merge-props": "^2.0.3",
+                "easings-css": "^1.0.0",
+                "fuzzysearch": "^1.0.3",
+                "is-promise": "^2.1.0",
+                "lodash": "^4.0.0",
+                "material-colors": "^1.2.6",
+                "watch-size": "^2.0.0"
+            }
+        },
         "@samverschueren/stream-to-observable": {
             "version": "0.3.1",
             "resolved": "https://registry.npmmirror.com/@samverschueren/stream-to-observable/-/stream-to-observable-0.3.1.tgz",
@@ -33071,7 +33771,9 @@
             "version": "1.0.1",
             "resolved": "https://registry.npmmirror.com/amdefine/-/amdefine-1.0.1.tgz",
             "integrity": "sha512-S2Hw0TtNkMJhIabBwIojKL9YHO5T0n5eNqWJ7Lrlel/zDbftQpxpapi8tZs3X1HWa+u+QeydGmzzNU0m09+Rcg==",
-            "dev": true
+            "dev": true,
+            "optional": true,
+            "peer": true
         },
         "ansi-colors": {
             "version": "3.2.4",
@@ -33121,7 +33823,7 @@
             "version": "3.1.2",
             "resolved": "https://registry.npmmirror.com/anymatch/-/anymatch-3.1.2.tgz",
             "integrity": "sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg==",
-            "optional": true,
+            "devOptional": true,
             "requires": {
                 "normalize-path": "^3.0.0",
                 "picomatch": "^2.0.4"
@@ -33379,7 +34081,9 @@
             "version": "0.1.3",
             "resolved": "https://registry.npmmirror.com/async-foreach/-/async-foreach-0.1.3.tgz",
             "integrity": "sha512-VUeSMD8nEGBWaZK4lizI1sf3yEC7pnAQ/mrI7pC2fBz2s/tq5jWWEngTwaf0Gruu/OoXRGLGg1XFqpYBiGTYJA==",
-            "dev": true
+            "dev": true,
+            "optional": true,
+            "peer": true
         },
         "async-limiter": {
             "version": "1.0.1",
@@ -33525,6 +34229,11 @@
                 "resolve": "^1.12.0"
             }
         },
+        "babel-helper-vue-jsx-merge-props": {
+            "version": "2.0.3",
+            "resolved": "https://registry.npmjs.org/babel-helper-vue-jsx-merge-props/-/babel-helper-vue-jsx-merge-props-2.0.3.tgz",
+            "integrity": "sha512-gsLiKK7Qrb7zYJNgiXKpXblxbV5ffSwR0f5whkPAaBAR4fhi6bwRZxX9wBlIc5M/v8CCkXUbXZL4N/nSE97cqg=="
+        },
         "babel-loader": {
             "version": "8.2.5",
             "resolved": "https://registry.npmmirror.com/babel-loader/-/babel-loader-8.2.5.tgz",
@@ -33696,6 +34405,12 @@
                 "@babel/helper-define-polyfill-provider": "^0.3.1"
             }
         },
+        "babel-plugin-transform-remove-console": {
+            "version": "6.9.4",
+            "resolved": "https://registry.npmjs.org/babel-plugin-transform-remove-console/-/babel-plugin-transform-remove-console-6.9.4.tgz",
+            "integrity": "sha512-88blrUrMX3SPiGkT1GnvVY8E/7A+k6oj3MNvUtTIxJflFzXTw1bHkuJ/y039ouhFMp2prRn5cQGzokViYi1dsg==",
+            "dev": true
+        },
         "babel-polyfill": {
             "version": "6.26.0",
             "resolved": "https://registry.npmmirror.com/babel-polyfill/-/babel-polyfill-6.26.0.tgz",
@@ -33836,7 +34551,7 @@
             "version": "2.2.0",
             "resolved": "https://registry.npmmirror.com/binary-extensions/-/binary-extensions-2.2.0.tgz",
             "integrity": "sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==",
-            "optional": true
+            "devOptional": true
         },
         "bindings": {
             "version": "1.5.0",
@@ -33949,6 +34664,11 @@
             "resolved": "https://registry.npmmirror.com/boolbase/-/boolbase-1.0.0.tgz",
             "integrity": "sha512-JZOSA7Mo9sNGB8+UjSgzdLtokWAky1zbztM3WRLCbZ70/3cTANmQmOdR7y2g+J0e2WXywy1yS468tY+IruqEww=="
         },
+        "bootstrap": {
+            "version": "3.4.1",
+            "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-3.4.1.tgz",
+            "integrity": "sha512-yN5oZVmRCwe5aKwzRj6736nSmKDX7pLYwsXiCj/EYmo16hODaBiT4En5btW/jhBF/seV+XMx3aYwukYC3A49DA=="
+        },
         "brace-expansion": {
             "version": "1.1.11",
             "resolved": "https://registry.npmmirror.com/brace-expansion/-/brace-expansion-1.1.11.tgz",
@@ -34468,7 +35188,7 @@
             "version": "3.5.3",
             "resolved": "https://registry.npmmirror.com/chokidar/-/chokidar-3.5.3.tgz",
             "integrity": "sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==",
-            "optional": true,
+            "devOptional": true,
             "requires": {
                 "anymatch": "~3.1.2",
                 "braces": "~3.0.2",
@@ -34484,7 +35204,7 @@
                     "version": "3.0.2",
                     "resolved": "https://registry.npmmirror.com/braces/-/braces-3.0.2.tgz",
                     "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
-                    "optional": true,
+                    "devOptional": true,
                     "requires": {
                         "fill-range": "^7.0.1"
                     }
@@ -34493,7 +35213,7 @@
                     "version": "7.0.1",
                     "resolved": "https://registry.npmmirror.com/fill-range/-/fill-range-7.0.1.tgz",
                     "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
-                    "optional": true,
+                    "devOptional": true,
                     "requires": {
                         "to-regex-range": "^5.0.1"
                     }
@@ -34502,13 +35222,13 @@
                     "version": "7.0.0",
                     "resolved": "https://registry.npmmirror.com/is-number/-/is-number-7.0.0.tgz",
                     "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
-                    "optional": true
+                    "devOptional": true
                 },
                 "to-regex-range": {
                     "version": "5.0.1",
                     "resolved": "https://registry.npmmirror.com/to-regex-range/-/to-regex-range-5.0.1.tgz",
                     "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
-                    "optional": true,
+                    "devOptional": true,
                     "requires": {
                         "is-number": "^7.0.0"
                     }
@@ -34737,6 +35457,16 @@
             "dev": true,
             "optional": true
         },
+        "clipboard": {
+            "version": "2.0.8",
+            "resolved": "https://registry.npmjs.org/clipboard/-/clipboard-2.0.8.tgz",
+            "integrity": "sha512-Y6WO0unAIQp5bLmk1zdThRhgJt/x3ks6f30s3oE3H1mgIEU33XyQjEf8gsf6DxC7NPX8Y1SsNWjUjL/ywLnnbQ==",
+            "requires": {
+                "good-listener": "^1.2.2",
+                "select": "^1.1.2",
+                "tiny-emitter": "^2.0.0"
+            }
+        },
         "clipboardy": {
             "version": "2.3.0",
             "resolved": "https://registry.npmmirror.com/clipboardy/-/clipboardy-2.3.0.tgz",
@@ -36346,6 +37076,11 @@
             "integrity": "sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==",
             "dev": true
         },
+        "cssfilter": {
+            "version": "0.0.10",
+            "resolved": "https://registry.npmjs.org/cssfilter/-/cssfilter-0.0.10.tgz",
+            "integrity": "sha512-FAaLDaplstoRsDR8XGYH51znUN0UY7nMc6Z9/fvE8EXGwvJE9hu7W2vHwx1+bd6gCYnln9nLbzxFTrcO9YQDZw=="
+        },
         "cssnano": {
             "version": "4.1.11",
             "resolved": "https://registry.npmmirror.com/cssnano/-/cssnano-4.1.11.tgz",
@@ -36463,6 +37198,35 @@
             "resolved": "https://registry.npmmirror.com/cyclist/-/cyclist-1.0.1.tgz",
             "integrity": "sha512-NJGVKPS81XejHcLhaLJS7plab0fK3slPh11mESeeDq2W4ZI5kUKK/LRRdVDvjJseojbPB7ZwjnyOybg3Igea/A=="
         },
+        "cytoscape": {
+            "version": "3.27.0",
+            "resolved": "https://registry.npmjs.org/cytoscape/-/cytoscape-3.27.0.tgz",
+            "integrity": "sha512-pPZJilfX9BxESwujODz5pydeGi+FBrXq1rcaB1mfhFXXFJ9GjE6CNndAk+8jPzoXGD+16LtSS4xlYEIUiW4Abg==",
+            "requires": {
+                "heap": "^0.2.6",
+                "lodash": "^4.17.21"
+            },
+            "dependencies": {
+                "lodash": {
+                    "version": "4.17.21",
+                    "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
+                    "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg=="
+                }
+            }
+        },
+        "cytoscape-klay": {
+            "version": "3.1.4",
+            "resolved": "https://registry.npmjs.org/cytoscape-klay/-/cytoscape-klay-3.1.4.tgz",
+            "integrity": "sha512-VwPj0VR25GPfy6qXVQRi/MYlZM/zkdvRhHlgqbM//lSvstgM6fhp3ik/uM8Wr8nlhskfqz/M1fIDmR6UckbS2A==",
+            "requires": {
+                "klayjs": "^0.4.1"
+            }
+        },
+        "d3": {
+            "version": "3.5.17",
+            "resolved": "https://registry.npmjs.org/d3/-/d3-3.5.17.tgz",
+            "integrity": "sha512-yFk/2idb8OHPKkbAL8QaOaqENNoMhIaSHZerk3oQsECwkObkCpJyjYwCe+OHiq6UEdhe1m8ZGARRRO3ljFjlKg=="
+        },
         "d3-dispatch": {
             "version": "2.0.0",
             "resolved": "https://registry.npmmirror.com/d3-dispatch/-/d3-dispatch-2.0.0.tgz",
@@ -36524,6 +37288,11 @@
             "integrity": "sha512-jyCETtSl3VMZMWeRo7iY1FL19ges1t55hMo5yaam4Jrsm5EPL89UQkoQRyiI+Yf4k8r2ZpdngkV8hr1lIdjb3Q==",
             "dev": true
         },
+        "dayjs": {
+            "version": "1.10.7",
+            "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.10.7.tgz",
+            "integrity": "sha512-P6twpd70BcPK34K26uJ1KT3wlhpuOAPoMwJzpsIWUxHZ7wpmbdZL/hQqBDfz7hGurYSa5PhzdhDHtt319hL3ig=="
+        },
         "de-indent": {
             "version": "1.0.2",
             "resolved": "https://registry.npmmirror.com/de-indent/-/de-indent-1.0.2.tgz",
@@ -36818,6 +37587,11 @@
             "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==",
             "dev": true
         },
+        "delegate": {
+            "version": "3.2.0",
+            "resolved": "https://registry.npmjs.org/delegate/-/delegate-3.2.0.tgz",
+            "integrity": "sha512-IofjkYBZaZivn0V8nnsMJGBr4jVLxHDheKSW88PyxS5QC4Vo9ZbZVvhzlSxY87fVq3STR6r+4cGepyHkcWOQSw=="
+        },
         "delegates": {
             "version": "1.0.0",
             "resolved": "https://registry.npmmirror.com/delegates/-/delegates-1.0.0.tgz",
@@ -36863,6 +37637,11 @@
             "integrity": "sha512-T0NIuQpnTvFDATNuHN5roPwSBG83rFsuO+MXXH9/3N1eFbn4wcPjttvjMLEPWJ0RGUYgQE7cGgS3tNxbqCGM7g==",
             "dev": true
         },
+        "dexie": {
+            "version": "3.0.4",
+            "resolved": "https://registry.npmjs.org/dexie/-/dexie-3.0.4.tgz",
+            "integrity": "sha512-rwS3k8BBstjGFJAS/yjYrsRZucqitnrP3NBhqghl9ihWcWABlT3I5f2dZV9T3pmXGAP7G9p1q00g/axcsuOT8A=="
+        },
         "dezalgo": {
             "version": "1.0.4",
             "resolved": "https://registry.npmmirror.com/dezalgo/-/dezalgo-1.0.4.tgz",
@@ -37026,6 +37805,11 @@
             "integrity": "sha512-YXQl1DSa4/PQyRfgrv6aoNjhasp/p4qs9FjJ4q4cQk+8m4r6k4ZSiEyytKG8f8W9gi8WsQtIObNmKd+tMzNTmA==",
             "dev": true
         },
+        "dt-sql-parser": {
+            "version": "1.2.1",
+            "resolved": "https://registry.npmjs.org/dt-sql-parser/-/dt-sql-parser-1.2.1.tgz",
+            "integrity": "sha512-bp6Rtm8N3m2Z3tavtKGo8J5ffaPQdPodYV2xGi9f6IsWbHzOkpNBxHlORcWtnSLtA/JvZcvImQxgbkdaGiv5cw=="
+        },
         "duplexer": {
             "version": "0.1.2",
             "resolved": "https://registry.npmmirror.com/duplexer/-/duplexer-0.1.2.tgz",
@@ -37043,6 +37827,11 @@
                 "stream-shift": "^1.0.0"
             }
         },
+        "easings-css": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmjs.org/easings-css/-/easings-css-1.0.0.tgz",
+            "integrity": "sha512-7Uq7NdazNfVtr0RNmPAys8it0zKCuaqxJStYKEl72D3j4gbvXhhaM7iWNbqhA4C94ygCye6VuyhzBRQC4szeBg=="
+        },
         "easy-stack": {
             "version": "1.0.1",
             "resolved": "https://registry.npmmirror.com/easy-stack/-/easy-stack-1.0.1.tgz",
@@ -38896,6 +39685,11 @@
             "integrity": "sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==",
             "dev": true
         },
+        "fuzzysearch": {
+            "version": "1.0.3",
+            "resolved": "https://registry.npmjs.org/fuzzysearch/-/fuzzysearch-1.0.3.tgz",
+            "integrity": "sha512-s+kNWQuI3mo9OALw0HJ6YGmMbLqEufCh2nX/zzV5CrICQ/y4AwPxM+6TIiF9ItFCHXFCyM/BfCCmN57NTIJuPg=="
+        },
         "g-status": {
             "version": "2.0.2",
             "resolved": "https://registry.npmmirror.com/g-status/-/g-status-2.0.2.tgz",
@@ -38973,6 +39767,8 @@
             "resolved": "https://registry.npmmirror.com/gaze/-/gaze-1.1.3.tgz",
             "integrity": "sha512-BRdNm8hbWzFzWHERTrejLqwHDfS4GibPoq5wjTPIoJHoBtKGPg3xAFfxmM+9ztbXelxcf2hwQcaz1PtmFeue8g==",
             "dev": true,
+            "optional": true,
+            "peer": true,
             "requires": {
                 "globule": "^1.0.0"
             }
@@ -39252,8 +40048,7 @@
         "glob-to-regexp": {
             "version": "0.3.0",
             "resolved": "https://registry.npmmirror.com/glob-to-regexp/-/glob-to-regexp-0.3.0.tgz",
-            "integrity": "sha512-Iozmtbqv0noj0uDDqoL0zNq0VBEfK2YFoMAZoxJe4cwphvLR+JskfF30QhXHOR4m3KrE6NLRYw+U9MRXvifyig==",
-            "dev": true
+            "integrity": "sha512-Iozmtbqv0noj0uDDqoL0zNq0VBEfK2YFoMAZoxJe4cwphvLR+JskfF30QhXHOR4m3KrE6NLRYw+U9MRXvifyig=="
         },
         "glob2base": {
             "version": "0.0.12",
@@ -39299,6 +40094,8 @@
             "resolved": "https://registry.npmmirror.com/globule/-/globule-1.3.3.tgz",
             "integrity": "sha512-mb1aYtDbIjTu4ShMB85m3UzjX9BVKe9WCzsnfMSZk+K5GpIbBOexgg4PPCt5eHDEG5/ZQAUX2Kct02zfiPLsKg==",
             "dev": true,
+            "optional": true,
+            "peer": true,
             "requires": {
                 "glob": "~7.1.1",
                 "lodash": "~4.17.10",
@@ -39310,6 +40107,8 @@
                     "resolved": "https://registry.npmmirror.com/glob/-/glob-7.1.7.tgz",
                     "integrity": "sha512-OvD9ENzPLbegENnYP5UUfJIirTg4+XwMWGaQfQTY0JenxNvvIKP3U3/tAQSPIu/lHxXYSZmpXlUHeqAIdKzBLQ==",
                     "dev": true,
+                    "optional": true,
+                    "peer": true,
                     "requires": {
                         "fs.realpath": "^1.0.0",
                         "inflight": "^1.0.4",
@@ -39324,12 +40123,22 @@
                     "resolved": "https://registry.npmmirror.com/minimatch/-/minimatch-3.0.8.tgz",
                     "integrity": "sha512-6FsRAQsxQ61mw+qP1ZzbL9Bc78x2p5OqNgNpnoAFLTrX8n5Kxph0CsnhmKKNXTWjXqU5L0pGPR7hYk+XWZr60Q==",
                     "dev": true,
+                    "optional": true,
+                    "peer": true,
                     "requires": {
                         "brace-expansion": "^1.1.7"
                     }
                 }
             }
         },
+        "good-listener": {
+            "version": "1.2.2",
+            "resolved": "https://registry.npmjs.org/good-listener/-/good-listener-1.2.2.tgz",
+            "integrity": "sha512-goW1b+d9q/HIwbVYZzZ6SsTr4IgE+WA44A0GmPIQstuOrgsFcT7VEJ48nmr9GaRtNu0XTKacFLGnBPAM6Afouw==",
+            "requires": {
+                "delegate": "^3.1.2"
+            }
+        },
         "graceful-fs": {
             "version": "4.2.10",
             "resolved": "https://registry.npmmirror.com/graceful-fs/-/graceful-fs-4.2.10.tgz",
@@ -39541,12 +40350,22 @@
             "integrity": "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==",
             "dev": true
         },
+        "heap": {
+            "version": "0.2.7",
+            "resolved": "https://registry.npmjs.org/heap/-/heap-0.2.7.tgz",
+            "integrity": "sha512-2bsegYkkHO+h/9MGbn6KWcE45cHZgPANo5LXF7EvWdT0yT2EguSVO1nDgU5c8+ZOPwp2vMNa7YFsJhVcDR9Sdg=="
+        },
         "hex-color-regex": {
             "version": "1.1.0",
             "resolved": "https://registry.npmmirror.com/hex-color-regex/-/hex-color-regex-1.1.0.tgz",
             "integrity": "sha512-l9sfDFsuqtOqKDsQdqrMRk0U85RZc0RtOR9yPI7mRVOa4FsR/BVnZ0shmQRM96Ji99kYZP/7hn1cedc1+ApsTQ==",
             "dev": true
         },
+        "highlight.js": {
+            "version": "9.18.3",
+            "resolved": "https://registry.npmjs.org/highlight.js/-/highlight.js-9.18.3.tgz",
+            "integrity": "sha512-zBZAmhSupHIl5sITeMqIJnYCDfAEc3Gdkqj65wC1lpI468MMQeeQkhcIAvk+RylAkxrCcI9xy9piHiXeQ1BdzQ=="
+        },
         "hmac-drbg": {
             "version": "1.0.1",
             "resolved": "https://registry.npmmirror.com/hmac-drbg/-/hmac-drbg-1.0.1.tgz",
@@ -39993,6 +40812,12 @@
             "integrity": "sha512-6TDAlDPZxUFCv+fuOkIoXT/V/f3Qbq8e37p+YOiYrUv3v9cc3/6x78VdfPgFVaB9dZYeLUfKgHRebpkm/oP2VQ==",
             "dev": true
         },
+        "immutable": {
+            "version": "4.3.6",
+            "resolved": "https://registry.npmjs.org/immutable/-/immutable-4.3.6.tgz",
+            "integrity": "sha512-Ju0+lEMyzMVZarkTn/gqRpdqd5dOPaz1mCZ0SH3JV6iFw81PldE/PEB1hWVEA288HPt4WXW8O7AWxB10M+03QQ==",
+            "dev": true
+        },
         "import-cwd": {
             "version": "2.1.0",
             "resolved": "https://registry.npmmirror.com/import-cwd/-/import-cwd-2.1.0.tgz",
@@ -40330,7 +41155,7 @@
             "version": "2.1.0",
             "resolved": "https://registry.npmmirror.com/is-binary-path/-/is-binary-path-2.1.0.tgz",
             "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==",
-            "optional": true,
+            "devOptional": true,
             "requires": {
                 "binary-extensions": "^2.0.0"
             }
@@ -40587,8 +41412,7 @@
         "is-promise": {
             "version": "2.2.2",
             "resolved": "https://registry.npmmirror.com/is-promise/-/is-promise-2.2.2.tgz",
-            "integrity": "sha512-+lP4/6lKUBfQjZ2pdxThZvLUAafmZb8OAxFb8XXtiQmS35INgr85hdOGoEs124ez1FCnZJt6jau/T+alh58QFQ==",
-            "dev": true
+            "integrity": "sha512-+lP4/6lKUBfQjZ2pdxThZvLUAafmZb8OAxFb8XXtiQmS35INgr85hdOGoEs124ez1FCnZJt6jau/T+alh58QFQ=="
         },
         "is-regex": {
             "version": "1.1.4",
@@ -40735,8 +41559,7 @@
         "jquery": {
             "version": "3.6.0",
             "resolved": "https://registry.npmmirror.com/jquery/-/jquery-3.6.0.tgz",
-            "integrity": "sha512-JVzAR/AjBvVt2BmYhxRCSYysDsPcssdmTFnzyLEts9qNwmjmu4JTAMYubEfwVOSwpQ1I1sKKFcxhZCI2buerfw==",
-            "peer": true
+            "integrity": "sha512-JVzAR/AjBvVt2BmYhxRCSYysDsPcssdmTFnzyLEts9qNwmjmu4JTAMYubEfwVOSwpQ1I1sKKFcxhZCI2buerfw=="
         },
         "js-base64": {
             "version": "2.6.4",
@@ -40901,6 +41724,11 @@
                 "graceful-fs": "^4.1.11"
             }
         },
+        "klayjs": {
+            "version": "0.4.1",
+            "resolved": "https://registry.npmjs.org/klayjs/-/klayjs-0.4.1.tgz",
+            "integrity": "sha512-WUNxuO7O79TEkxCj6OIaK5TJBkaWaR/IKNTakgV9PwDn+mrr63MLHed34AcE2yTaDntgO6l0zGFIzhcoTeroTA=="
+        },
         "klona": {
             "version": "2.0.5",
             "resolved": "https://registry.npmmirror.com/klona/-/klona-2.0.5.tgz",
@@ -41966,12 +42794,25 @@
                 "escape-string-regexp": "^1.0.4"
             }
         },
+        "material-colors": {
+            "version": "1.2.6",
+            "resolved": "https://registry.npmjs.org/material-colors/-/material-colors-1.2.6.tgz",
+            "integrity": "sha512-6qE4B9deFBIa9YSpOc9O0Sgc43zTeVYbgDT5veRKSlB2+ZuHNoVVxA1L/ckMUayV9Ay9y7Z/SZCLcGteW9i7bg=="
+        },
         "math-random": {
             "version": "1.0.4",
             "resolved": "https://registry.npmmirror.com/math-random/-/math-random-1.0.4.tgz",
             "integrity": "sha512-rUxjysqif/BZQH2yhd5Aaq7vXMSx9NdEsQcyA07uEzIvxgI7zIr33gGsh+RU0/XjmQpCW7RsVof1vlkvQVCK5A==",
             "dev": true
         },
+        "mavon-editor": {
+            "version": "2.10.4",
+            "resolved": "https://registry.npmjs.org/mavon-editor/-/mavon-editor-2.10.4.tgz",
+            "integrity": "sha512-CFsBLkgt/KZBDg+SJYe2fyYv4zClY149PiwpH0rDAiiP4ae1XNs0GC8nBsoTeipsHcebDLN1QMkt3bUsnMDjQw==",
+            "requires": {
+                "xss": "^1.0.6"
+            }
+        },
         "md5": {
             "version": "2.3.0",
             "resolved": "https://registry.npmmirror.com/md5/-/md5-2.3.0.tgz",
@@ -42643,6 +43484,21 @@
             "resolved": "https://registry.npmmirror.com/moment/-/moment-2.29.1.tgz",
             "integrity": "sha512-kHmoybcPV8Sqy59DwNDY3Jefr64lK/by/da0ViFcuA4DH0vQg5Q6Ze5VimxkfQNSC+Mls/Kx53s7TjP1RhFEDQ=="
         },
+        "moment-timezone": {
+            "version": "0.5.45",
+            "resolved": "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.45.tgz",
+            "integrity": "sha512-HIWmqA86KcmCAhnMAN0wuDOARV/525R2+lOLotuGFzn4HO+FH+/645z2wx0Dt3iDv6/p61SIvKnDstISainhLQ==",
+            "requires": {
+                "moment": "^2.29.4"
+            },
+            "dependencies": {
+                "moment": {
+                    "version": "2.30.1",
+                    "resolved": "https://registry.npmjs.org/moment/-/moment-2.30.1.tgz",
+                    "integrity": "sha512-uEmtNhbDOrWPFS+hdjFCBfy9f2YoyzRpwcl+DqpC6taX21FzsTLQVbMV/W7PzNSX6x/bhC1zA3c2UQ5NzH6how=="
+                }
+            }
+        },
         "monaco-editor": {
             "version": "0.19.3",
             "resolved": "https://registry.npmmirror.com/monaco-editor/-/monaco-editor-0.19.3.tgz",
@@ -42657,6 +43513,17 @@
                 "loader-utils": "^1.2.3"
             }
         },
+        "monaco-languageclient": {
+            "version": "0.13.0",
+            "resolved": "https://registry.npmjs.org/monaco-languageclient/-/monaco-languageclient-0.13.0.tgz",
+            "integrity": "sha512-aCwd33dTitwV5QwY56rpYHwzEGXei8TZ+yvZcvP3gEMd6Mizr8m3pOuoknDi2SUfLuNAHS6+ulvLgZlNQB5awg==",
+            "requires": {
+                "glob-to-regexp": "^0.3.0",
+                "vscode-jsonrpc": "^5.0.0",
+                "vscode-languageclient": "^6.0.0",
+                "vscode-uri": "^2.1.1"
+            }
+        },
         "move-concurrently": {
             "version": "1.0.1",
             "resolved": "https://registry.npmmirror.com/move-concurrently/-/move-concurrently-1.0.1.tgz",
@@ -42768,7 +43635,7 @@
             "version": "2.15.0",
             "resolved": "https://registry.npmmirror.com/nan/-/nan-2.15.0.tgz",
             "integrity": "sha512-8ZtvEnA2c5aYCZYd1cvgdnU6cqwixRoYg70xPLWUws5ORTa/lnw+u4amixRS/Ac5U5mQVgp9pnlSUnbNWFaWZQ==",
-            "devOptional": true
+            "optional": true
         },
         "nanomatch": {
             "version": "1.2.13",
@@ -42950,6 +43817,8 @@
             "resolved": "https://registry.npmmirror.com/node-sass/-/node-sass-6.0.1.tgz",
             "integrity": "sha512-f+Rbqt92Ful9gX0cGtdYwjTrWAaGURgaK5rZCWOgCNyGWusFYHhbqCCBoFBeat+HKETOU02AyTxNhJV0YZf2jQ==",
             "dev": true,
+            "optional": true,
+            "peer": true,
             "requires": {
                 "async-foreach": "^0.1.3",
                 "chalk": "^1.1.1",
@@ -42972,19 +43841,25 @@
                     "version": "2.1.1",
                     "resolved": "https://registry.npmmirror.com/ansi-regex/-/ansi-regex-2.1.1.tgz",
                     "integrity": "sha512-TIGnTpdo+E3+pCyAluZvtED5p5wCqLdezCyhPZzKPcxvFplEt4i+W7OONCKgeZFT3+y5NZZfOOS/Bdcanm1MYA==",
-                    "dev": true
+                    "dev": true,
+                    "optional": true,
+                    "peer": true
                 },
                 "ansi-styles": {
                     "version": "2.2.1",
                     "resolved": "https://registry.npmmirror.com/ansi-styles/-/ansi-styles-2.2.1.tgz",
                     "integrity": "sha512-kmCevFghRiWM7HB5zTPULl4r9bVFSWjz62MhqizDGUrq2NWuNMQyuv4tHHoKJHs69M/MF64lEcHdYIocrdWQYA==",
-                    "dev": true
+                    "dev": true,
+                    "optional": true,
+                    "peer": true
                 },
                 "chalk": {
                     "version": "1.1.3",
                     "resolved": "https://registry.npmmirror.com/chalk/-/chalk-1.1.3.tgz",
                     "integrity": "sha512-U3lRVLMSlsCfjqYPbLyVv11M9CPW4I728d6TCKMAOJueEeB9/8o+eSsMnxPJD+Q+K909sdESg7C+tIkoH6on1A==",
                     "dev": true,
+                    "optional": true,
+                    "peer": true,
                     "requires": {
                         "ansi-styles": "^2.2.1",
                         "escape-string-regexp": "^1.0.2",
@@ -42997,13 +43872,17 @@
                     "version": "2.0.0",
                     "resolved": "https://registry.npmmirror.com/chownr/-/chownr-2.0.0.tgz",
                     "integrity": "sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==",
-                    "dev": true
+                    "dev": true,
+                    "optional": true,
+                    "peer": true
                 },
                 "cross-spawn": {
                     "version": "7.0.3",
                     "resolved": "https://registry.npmmirror.com/cross-spawn/-/cross-spawn-7.0.3.tgz",
                     "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
                     "dev": true,
+                    "optional": true,
+                    "peer": true,
                     "requires": {
                         "path-key": "^3.1.0",
                         "shebang-command": "^2.0.0",
@@ -43015,6 +43894,8 @@
                     "resolved": "https://registry.npmmirror.com/find-up/-/find-up-4.1.0.tgz",
                     "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
                     "dev": true,
+                    "optional": true,
+                    "peer": true,
                     "requires": {
                         "locate-path": "^5.0.0",
                         "path-exists": "^4.0.0"
@@ -43025,6 +43906,8 @@
                     "resolved": "https://registry.npmmirror.com/fs-minipass/-/fs-minipass-2.1.0.tgz",
                     "integrity": "sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg==",
                     "dev": true,
+                    "optional": true,
+                    "peer": true,
                     "requires": {
                         "minipass": "^3.0.0"
                     }
@@ -43033,13 +43916,17 @@
                     "version": "4.0.1",
                     "resolved": "https://registry.npmmirror.com/get-stdin/-/get-stdin-4.0.1.tgz",
                     "integrity": "sha512-F5aQMywwJ2n85s4hJPTT9RPxGmubonuB10MNYo17/xph174n2MIR33HRguhzVag10O/npM7SPk73LMZNP+FaWw==",
-                    "dev": true
+                    "dev": true,
+                    "optional": true,
+                    "peer": true
                 },
                 "hosted-git-info": {
                     "version": "4.1.0",
                     "resolved": "https://registry.npmmirror.com/hosted-git-info/-/hosted-git-info-4.1.0.tgz",
                     "integrity": "sha512-kyCuEOWjJqZuDbRHzL8V93NzQhwIB71oFWSyzVo+KPZI+pnQPPxucdkrOZvkLRnrf5URsQM+IJ09Dw29cRALIA==",
                     "dev": true,
+                    "optional": true,
+                    "peer": true,
                     "requires": {
                         "lru-cache": "^6.0.0"
                     }
@@ -43049,6 +43936,8 @@
                     "resolved": "https://registry.npmmirror.com/locate-path/-/locate-path-5.0.0.tgz",
                     "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
                     "dev": true,
+                    "optional": true,
+                    "peer": true,
                     "requires": {
                         "p-locate": "^4.1.0"
                     }
@@ -43058,6 +43947,8 @@
                     "resolved": "https://registry.npmmirror.com/lru-cache/-/lru-cache-6.0.0.tgz",
                     "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
                     "dev": true,
+                    "optional": true,
+                    "peer": true,
                     "requires": {
                         "yallist": "^4.0.0"
                     }
@@ -43067,6 +43958,8 @@
                     "resolved": "https://registry.npmmirror.com/meow/-/meow-9.0.0.tgz",
                     "integrity": "sha512-+obSblOQmRhcyBt62furQqRAQpNyWXo8BuQ5bN7dG8wmwQ+vwHKp/rCFD4CrTP8CsDQD1sjoZ94K417XEUk8IQ==",
                     "dev": true,
+                    "optional": true,
+                    "peer": true,
                     "requires": {
                         "@types/minimist": "^1.2.0",
                         "camelcase-keys": "^6.2.2",
@@ -43087,6 +43980,8 @@
                     "resolved": "https://registry.npmmirror.com/minipass/-/minipass-3.3.4.tgz",
                     "integrity": "sha512-I9WPbWHCGu8W+6k1ZiGpPu0GkoKBeorkfKNuAFBNS1HNFJvke82sxvI5bzcCNpWPorkOO5QQ+zomzzwRxejXiw==",
                     "dev": true,
+                    "optional": true,
+                    "peer": true,
                     "requires": {
                         "yallist": "^4.0.0"
                     }
@@ -43096,6 +43991,8 @@
                     "resolved": "https://registry.npmmirror.com/minizlib/-/minizlib-2.1.2.tgz",
                     "integrity": "sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==",
                     "dev": true,
+                    "optional": true,
+                    "peer": true,
                     "requires": {
                         "minipass": "^3.0.0",
                         "yallist": "^4.0.0"
@@ -43105,13 +44002,17 @@
                     "version": "1.0.4",
                     "resolved": "https://registry.npmmirror.com/mkdirp/-/mkdirp-1.0.4.tgz",
                     "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==",
-                    "dev": true
+                    "dev": true,
+                    "optional": true,
+                    "peer": true
                 },
                 "node-gyp": {
                     "version": "7.1.2",
                     "resolved": "https://registry.npmmirror.com/node-gyp/-/node-gyp-7.1.2.tgz",
                     "integrity": "sha512-CbpcIo7C3eMu3dL1c3d0xw449fHIGALIJsRP4DDPHpyiW8vcriNY7ubh9TE4zEKfSxscY7PjeFnshE7h75ynjQ==",
                     "dev": true,
+                    "optional": true,
+                    "peer": true,
                     "requires": {
                         "env-paths": "^2.2.0",
                         "glob": "^7.1.4",
@@ -43130,6 +44031,8 @@
                     "resolved": "https://registry.npmmirror.com/nopt/-/nopt-5.0.0.tgz",
                     "integrity": "sha512-Tbj67rffqceeLpcRXrT7vKAN8CwfPeIBgM7E6iBkmKLV7bEMwpGgYLGv0jACUsECaa/vuxP0IjEont6umdMgtQ==",
                     "dev": true,
+                    "optional": true,
+                    "peer": true,
                     "requires": {
                         "abbrev": "1"
                     }
@@ -43139,6 +44042,8 @@
                     "resolved": "https://registry.npmmirror.com/normalize-package-data/-/normalize-package-data-3.0.3.tgz",
                     "integrity": "sha512-p2W1sgqij3zMMyRC067Dg16bfzVH+w7hyegmpIvZ4JNjqtGOVAIvLmjBx3yP7YTe9vKJgkoNOPjwQGogDoMXFA==",
                     "dev": true,
+                    "optional": true,
+                    "peer": true,
                     "requires": {
                         "hosted-git-info": "^4.0.1",
                         "is-core-module": "^2.5.0",
@@ -43151,6 +44056,8 @@
                     "resolved": "https://registry.npmmirror.com/p-locate/-/p-locate-4.1.0.tgz",
                     "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
                     "dev": true,
+                    "optional": true,
+                    "peer": true,
                     "requires": {
                         "p-limit": "^2.2.0"
                     }
@@ -43159,19 +44066,25 @@
                     "version": "4.0.0",
                     "resolved": "https://registry.npmmirror.com/path-exists/-/path-exists-4.0.0.tgz",
                     "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
-                    "dev": true
+                    "dev": true,
+                    "optional": true,
+                    "peer": true
                 },
                 "path-key": {
                     "version": "3.1.1",
                     "resolved": "https://registry.npmmirror.com/path-key/-/path-key-3.1.1.tgz",
                     "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
-                    "dev": true
+                    "dev": true,
+                    "optional": true,
+                    "peer": true
                 },
                 "read-pkg-up": {
                     "version": "7.0.1",
                     "resolved": "https://registry.npmmirror.com/read-pkg-up/-/read-pkg-up-7.0.1.tgz",
                     "integrity": "sha512-zK0TB7Xd6JpCLmlLmufqykGE+/TlOePD6qKClNW7hHDKFh/J7/7gCWGR7joEQEW1bKq3a3yUZSObOoWLFQ4ohg==",
                     "dev": true,
+                    "optional": true,
+                    "peer": true,
                     "requires": {
                         "find-up": "^4.1.0",
                         "read-pkg": "^5.2.0",
@@ -43182,7 +44095,9 @@
                             "version": "0.8.1",
                             "resolved": "https://registry.npmmirror.com/type-fest/-/type-fest-0.8.1.tgz",
                             "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==",
-                            "dev": true
+                            "dev": true,
+                            "optional": true,
+                            "peer": true
                         }
                     }
                 },
@@ -43191,6 +44106,8 @@
                     "resolved": "https://registry.npmmirror.com/rimraf/-/rimraf-3.0.2.tgz",
                     "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
                     "dev": true,
+                    "optional": true,
+                    "peer": true,
                     "requires": {
                         "glob": "^7.1.3"
                     }
@@ -43200,6 +44117,8 @@
                     "resolved": "https://registry.npmmirror.com/semver/-/semver-7.3.8.tgz",
                     "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==",
                     "dev": true,
+                    "optional": true,
+                    "peer": true,
                     "requires": {
                         "lru-cache": "^6.0.0"
                     }
@@ -43209,6 +44128,8 @@
                     "resolved": "https://registry.npmmirror.com/shebang-command/-/shebang-command-2.0.0.tgz",
                     "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
                     "dev": true,
+                    "optional": true,
+                    "peer": true,
                     "requires": {
                         "shebang-regex": "^3.0.0"
                     }
@@ -43217,13 +44138,17 @@
                     "version": "3.0.0",
                     "resolved": "https://registry.npmmirror.com/shebang-regex/-/shebang-regex-3.0.0.tgz",
                     "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
-                    "dev": true
+                    "dev": true,
+                    "optional": true,
+                    "peer": true
                 },
                 "strip-ansi": {
                     "version": "3.0.1",
                     "resolved": "https://registry.npmmirror.com/strip-ansi/-/strip-ansi-3.0.1.tgz",
                     "integrity": "sha512-VhumSSbBqDTP8p2ZLKj40UjBCV4+v8bUSEpUb4KjRgWk9pbqGF4REFj6KEagidb2f/M6AzC0EmFyDNGaw9OCzg==",
                     "dev": true,
+                    "optional": true,
+                    "peer": true,
                     "requires": {
                         "ansi-regex": "^2.0.0"
                     }
@@ -43232,13 +44157,17 @@
                     "version": "2.0.0",
                     "resolved": "https://registry.npmmirror.com/supports-color/-/supports-color-2.0.0.tgz",
                     "integrity": "sha512-KKNVtd6pCYgPIKU4cp2733HWYCpplQhddZLBUryaAHou723x+FRzQ5Df824Fj+IyyuiQTRoub4SnIFfIcrp70g==",
-                    "dev": true
+                    "dev": true,
+                    "optional": true,
+                    "peer": true
                 },
                 "tar": {
                     "version": "6.1.12",
                     "resolved": "https://registry.npmmirror.com/tar/-/tar-6.1.12.tgz",
                     "integrity": "sha512-jU4TdemS31uABHd+Lt5WEYJuzn+TJTCBLljvIAHZOz6M9Os5pJ4dD+vRFLxPa/n3T0iEFzpi+0x1UfuDZYbRMw==",
                     "dev": true,
+                    "optional": true,
+                    "peer": true,
                     "requires": {
                         "chownr": "^2.0.0",
                         "fs-minipass": "^2.0.0",
@@ -43252,13 +44181,17 @@
                     "version": "0.18.1",
                     "resolved": "https://registry.npmmirror.com/type-fest/-/type-fest-0.18.1.tgz",
                     "integrity": "sha512-OIAYXk8+ISY+qTOwkHtKqzAuxchoMiD9Udx+FSGQDuiRR+PJKJHc2NJAXlbhkGwTt/4/nKZxELY1w3ReWOL8mw==",
-                    "dev": true
+                    "dev": true,
+                    "optional": true,
+                    "peer": true
                 },
                 "which": {
                     "version": "2.0.2",
                     "resolved": "https://registry.npmmirror.com/which/-/which-2.0.2.tgz",
                     "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
                     "dev": true,
+                    "optional": true,
+                    "peer": true,
                     "requires": {
                         "isexe": "^2.0.0"
                     }
@@ -43267,7 +44200,9 @@
                     "version": "4.0.0",
                     "resolved": "https://registry.npmmirror.com/yallist/-/yallist-4.0.0.tgz",
                     "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
-                    "dev": true
+                    "dev": true,
+                    "optional": true,
+                    "peer": true
                 }
             }
         },
@@ -45722,11 +46657,16 @@
             "version": "3.6.0",
             "resolved": "https://registry.npmmirror.com/readdirp/-/readdirp-3.6.0.tgz",
             "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==",
-            "optional": true,
+            "devOptional": true,
             "requires": {
                 "picomatch": "^2.2.1"
             }
         },
+        "reconnecting-websocket": {
+            "version": "4.4.0",
+            "resolved": "https://registry.npmjs.org/reconnecting-websocket/-/reconnecting-websocket-4.4.0.tgz",
+            "integrity": "sha512-D2E33ceRPga0NvTDhJmphEgJ7FUYF0v4lr1ki0csq06OdlxKfugGzN0dSkxM/NfqCxYELK4KcaTOUOjTV6Dcng=="
+        },
         "redent": {
             "version": "3.0.0",
             "resolved": "https://registry.npmmirror.com/redent/-/redent-3.0.0.tgz",
@@ -45766,8 +46706,7 @@
         "regenerator-runtime": {
             "version": "0.13.9",
             "resolved": "https://registry.npmmirror.com/regenerator-runtime/-/regenerator-runtime-0.13.9.tgz",
-            "integrity": "sha512-p3VT+cOEgxFsRRA9X4lkI1E+k2/CtnKtU4gcxyaCUreilL/vqI6CdZ3wxVUx3UOUg+gnUOQQcRI7BmSI656MYA==",
-            "dev": true
+            "integrity": "sha512-p3VT+cOEgxFsRRA9X4lkI1E+k2/CtnKtU4gcxyaCUreilL/vqI6CdZ3wxVUx3UOUg+gnUOQQcRI7BmSI656MYA=="
         },
         "regenerator-transform": {
             "version": "0.15.0",
@@ -46233,11 +47172,24 @@
             "resolved": "https://registry.npmmirror.com/safer-buffer/-/safer-buffer-2.1.2.tgz",
             "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
         },
+        "sass": {
+            "version": "1.49.0",
+            "resolved": "https://registry.npmjs.org/sass/-/sass-1.49.0.tgz",
+            "integrity": "sha512-TVwVdNDj6p6b4QymJtNtRS2YtLJ/CqZriGg0eIAbAKMlN8Xy6kbv33FsEZSF7FufFFM705SQviHjjThfaQ4VNw==",
+            "dev": true,
+            "requires": {
+                "chokidar": ">=3.0.0 <4.0.0",
+                "immutable": "^4.0.0",
+                "source-map-js": ">=0.6.2 <2.0.0"
+            }
+        },
         "sass-graph": {
             "version": "2.2.5",
             "resolved": "https://registry.npmmirror.com/sass-graph/-/sass-graph-2.2.5.tgz",
             "integrity": "sha512-VFWDAHOe6mRuT4mZRd4eKE+d8Uedrk6Xnh7Sh9b4NGufQLQjOrvf/MQoOdx+0s92L89FeyUUNfU597j/3uNpag==",
             "dev": true,
+            "optional": true,
+            "peer": true,
             "requires": {
                 "glob": "^7.0.0",
                 "lodash": "^4.0.0",
@@ -46249,13 +47201,17 @@
                     "version": "7.0.3",
                     "resolved": "https://registry.npmmirror.com/emoji-regex/-/emoji-regex-7.0.3.tgz",
                     "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==",
-                    "dev": true
+                    "dev": true,
+                    "optional": true,
+                    "peer": true
                 },
                 "string-width": {
                     "version": "3.1.0",
                     "resolved": "https://registry.npmmirror.com/string-width/-/string-width-3.1.0.tgz",
                     "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
                     "dev": true,
+                    "optional": true,
+                    "peer": true,
                     "requires": {
                         "emoji-regex": "^7.0.1",
                         "is-fullwidth-code-point": "^2.0.0",
@@ -46267,6 +47223,8 @@
                     "resolved": "https://registry.npmmirror.com/yargs/-/yargs-13.3.2.tgz",
                     "integrity": "sha512-AX3Zw5iPruN5ie6xGRIDgqkT+ZhnRlZMLMHAs8tg7nRruy2Nb+i5o9bwghAogtM08q1dpr2LVoS8KSTMYpWXUw==",
                     "dev": true,
+                    "optional": true,
+                    "peer": true,
                     "requires": {
                         "cliui": "^5.0.0",
                         "find-up": "^3.0.0",
@@ -46285,6 +47243,8 @@
                     "resolved": "https://registry.npmmirror.com/yargs-parser/-/yargs-parser-13.1.2.tgz",
                     "integrity": "sha512-3lbsNRf/j+A4QuSZfDRA7HRSfWrzO0YjqTJd5kjAq37Zep1CEgaYmrH9Q3GwPiB9cHyd1Y1UwggGhJGoxipbzg==",
                     "dev": true,
+                    "optional": true,
+                    "peer": true,
                     "requires": {
                         "camelcase": "^5.0.0",
                         "decamelize": "^1.2.0"
@@ -46379,6 +47339,8 @@
             "resolved": "https://registry.npmmirror.com/scss-tokenizer/-/scss-tokenizer-0.2.3.tgz",
             "integrity": "sha512-dYE8LhncfBUar6POCxMTm0Ln+erjeczqEvCJib5/7XNkdw1FkUGgwMPY360FY0FgPWQxHWCx29Jl3oejyGLM9Q==",
             "dev": true,
+            "optional": true,
+            "peer": true,
             "requires": {
                 "js-base64": "^2.1.8",
                 "source-map": "^0.4.2"
@@ -46389,12 +47351,19 @@
                     "resolved": "https://registry.npmmirror.com/source-map/-/source-map-0.4.4.tgz",
                     "integrity": "sha512-Y8nIfcb1s/7DcobUz1yOO1GSp7gyL+D9zLHDehT7iRESqGSxjJ448Sg7rvfgsRJCnKLdSl11uGf0s9X80cH0/A==",
                     "dev": true,
+                    "optional": true,
+                    "peer": true,
                     "requires": {
                         "amdefine": ">=0.0.4"
                     }
                 }
             }
         },
+        "select": {
+            "version": "1.1.2",
+            "resolved": "https://registry.npmjs.org/select/-/select-1.1.2.tgz",
+            "integrity": "sha512-OwpTSOfy6xSs1+pwcNrv0RBMOzI39Lp3qQKUTPVVPRjCdNa5JH/oPRiqsesIskK8TVgmRiHwO4KXlV2Li9dANA=="
+        },
         "select-hose": {
             "version": "2.0.0",
             "resolved": "https://registry.npmmirror.com/select-hose/-/select-hose-2.0.0.tgz",
@@ -46886,6 +47855,11 @@
                 "is-plain-obj": "^1.0.0"
             }
         },
+        "sortablejs": {
+            "version": "1.10.2",
+            "resolved": "https://registry.npmjs.org/sortablejs/-/sortablejs-1.10.2.tgz",
+            "integrity": "sha512-YkPGufevysvfwn5rfdlGyrGjt7/CRHwvRPogD/lC+TnvcN29jDpCifKP+rBqf+LRldfXSTh+0CGLcSg0VIxq3A=="
+        },
         "source-list-map": {
             "version": "2.0.1",
             "resolved": "https://registry.npmmirror.com/source-list-map/-/source-list-map-2.0.1.tgz",
@@ -46896,6 +47870,12 @@
             "resolved": "https://registry.npmmirror.com/source-map/-/source-map-0.5.7.tgz",
             "integrity": "sha512-LbrmJOMUSdEVxIKvdcJzQC+nQhe8FUZQTXQy6+I75skNgn3OoQ0DZA8YnFa7gp8tqtL3KPf1kmo0R5DoApeSGQ=="
         },
+        "source-map-js": {
+            "version": "1.2.0",
+            "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.0.tgz",
+            "integrity": "sha512-itJW8lvSA0TXEphiRoawsCksnlf8SyvmFzIhltqAHluXd88pkCd+cXJVHTDwdCr0IzwptSm035IHQktUu1QUMg==",
+            "dev": true
+        },
         "source-map-resolve": {
             "version": "0.5.3",
             "resolved": "https://registry.npmmirror.com/source-map-resolve/-/source-map-resolve-0.5.3.tgz",
@@ -47215,6 +48195,8 @@
             "resolved": "https://registry.npmmirror.com/stdout-stream/-/stdout-stream-1.4.1.tgz",
             "integrity": "sha512-j4emi03KXqJWcIeF8eIXkjMFN1Cmb8gUlDYGeBALLPo5qdyTfA9bOtl8m33lRoC+vFMkP3gl0WsDr6+gzxbbTA==",
             "dev": true,
+            "optional": true,
+            "peer": true,
             "requires": {
                 "readable-stream": "^2.0.1"
             }
@@ -48006,6 +48988,11 @@
             "integrity": "sha512-qsdtZH+vMoCARQtyod4imc2nIJwg9Cc7lPRrw9CzF8ZKR0khdr8+2nX80PBhET3tcyTtJDxAffGh2rXH4tyU8A==",
             "dev": true
         },
+        "tiny-emitter": {
+            "version": "2.1.0",
+            "resolved": "https://registry.npmjs.org/tiny-emitter/-/tiny-emitter-2.1.0.tgz",
+            "integrity": "sha512-NB6Dk1A9xgQPMoGqC5CVXn123gWyte215ONT5Pp5a0yt4nlEoO1ZWeCwpncaekPHXO60i47ihFnZPiRPjRMq4Q=="
+        },
         "tinycolor2": {
             "version": "1.4.2",
             "resolved": "https://registry.npmmirror.com/tinycolor2/-/tinycolor2-1.4.2.tgz",
@@ -48117,6 +49104,8 @@
             "resolved": "https://registry.npmmirror.com/true-case-path/-/true-case-path-1.0.3.tgz",
             "integrity": "sha512-m6s2OdQe5wgpFMC+pAJ+q9djG82O2jcHPOI6RNg1yy9rCYR+WD6Nbpl32fDpfC56nirdRy+opFa/Vk7HYhqaew==",
             "dev": true,
+            "optional": true,
+            "peer": true,
             "requires": {
                 "glob": "^7.1.2"
             }
@@ -48582,6 +49571,54 @@
             "resolved": "https://registry.npmmirror.com/vm-browserify/-/vm-browserify-1.1.2.tgz",
             "integrity": "sha512-2ham8XPWTONajOR0ohOKOHXkm3+gaBmGut3SRuu75xLd/RRaY6vqgh8NBYYk7+RW3u5AtzPQZG8F10LHkl0lAQ=="
         },
+        "vscode-jsonrpc": {
+            "version": "5.0.1",
+            "resolved": "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-5.0.1.tgz",
+            "integrity": "sha512-JvONPptw3GAQGXlVV2utDcHx0BiY34FupW/kI6mZ5x06ER5DdPG/tXWMVHjTNULF5uKPOUUD0SaXg5QaubJL0A=="
+        },
+        "vscode-languageclient": {
+            "version": "6.1.4",
+            "resolved": "https://registry.npmjs.org/vscode-languageclient/-/vscode-languageclient-6.1.4.tgz",
+            "integrity": "sha512-EUOU+bJu6axmt0RFNo3nrglQLPXMfanbYViJee3Fbn2VuQoX0ZOI4uTYhSRvYLP2vfwTP/juV62P/mksCdTZMA==",
+            "requires": {
+                "semver": "^6.3.0",
+                "vscode-languageserver-protocol": "3.15.3"
+            },
+            "dependencies": {
+                "semver": {
+                    "version": "6.3.1",
+                    "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
+                    "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA=="
+                }
+            }
+        },
+        "vscode-languageserver-protocol": {
+            "version": "3.15.3",
+            "resolved": "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.15.3.tgz",
+            "integrity": "sha512-zrMuwHOAQRhjDSnflWdJG+O2ztMWss8GqUUB8dXLR/FPenwkiBNkMIJJYfSN6sgskvsF0rHAoBowNQfbyZnnvw==",
+            "requires": {
+                "vscode-jsonrpc": "^5.0.1",
+                "vscode-languageserver-types": "3.15.1"
+            }
+        },
+        "vscode-languageserver-types": {
+            "version": "3.15.1",
+            "resolved": "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.15.1.tgz",
+            "integrity": "sha512-+a9MPUQrNGRrGU630OGbYVQ+11iOIovjCkqxajPa9w57Sd5ruK8WQNsslzpa0x/QJqC8kRc2DUxWjIFwoNm4ZQ=="
+        },
+        "vscode-uri": {
+            "version": "2.1.2",
+            "resolved": "https://registry.npmjs.org/vscode-uri/-/vscode-uri-2.1.2.tgz",
+            "integrity": "sha512-8TEXQxlldWAuIODdukIb+TR5s+9Ds40eSJrw+1iDDA9IFORPjMELarNQE3myz5XIkWWpdprmJjm1/SxMlWOC8A=="
+        },
+        "vscode-ws-jsonrpc": {
+            "version": "0.2.0",
+            "resolved": "https://registry.npmjs.org/vscode-ws-jsonrpc/-/vscode-ws-jsonrpc-0.2.0.tgz",
+            "integrity": "sha512-NE9HNRgPjCaPyTJvIudcpyIWPImxwRDtuTX16yks7SAiZgSXigxAiZOvSvVBGmD1G/OMfrFo6BblOtjVR9DdVA==",
+            "requires": {
+                "vscode-jsonrpc": "^5.0.0"
+            }
+        },
         "vue": {
             "version": "2.6.12",
             "resolved": "https://registry.npmmirror.com/vue/-/vue-2.6.12.tgz",
@@ -48697,12 +49734,25 @@
             "integrity": "sha512-4gDntzrifFnCEvyoO8PqyJDmguXgVPxKiIxrBKjIowvL9l+N66196+72XVYR8BBf1Uv1Fgt3bGevJ+sEmxfZzw==",
             "dev": true
         },
+        "vuedraggable": {
+            "version": "2.24.3",
+            "resolved": "https://registry.npmjs.org/vuedraggable/-/vuedraggable-2.24.3.tgz",
+            "integrity": "sha512-6/HDXi92GzB+Hcs9fC6PAAozK1RLt1ewPTLjK0anTYguXLAeySDmcnqE8IC0xa7shvSzRjQXq3/+dsZ7ETGF3g==",
+            "requires": {
+                "sortablejs": "1.10.2"
+            }
+        },
         "vuescroll": {
             "version": "4.16.1",
             "resolved": "https://registry.npmmirror.com/vuescroll/-/vuescroll-4.16.1.tgz",
             "integrity": "sha512-7fRsG2Yw5Z07LUz/IIu9barpmYiN9q+ZTC+CrVamvCbmsxyhz8mU1OuYFbfORysaUskioNMxTGDo+HOzeDfSyQ==",
             "requires": {}
         },
+        "watch-size": {
+            "version": "2.0.0",
+            "resolved": "https://registry.npmjs.org/watch-size/-/watch-size-2.0.0.tgz",
+            "integrity": "sha512-M92R89dNoTPWyCD+HuUEDdhaDnh9jxPGOwlDc0u51jAgmjUvzqaEMynXSr3BaWs+QdHYk4KzibPy1TFtjLmOZQ=="
+        },
         "watchpack": {
             "version": "1.7.5",
             "resolved": "https://registry.npmmirror.com/watchpack/-/watchpack-1.7.5.tgz",
@@ -49573,6 +50623,15 @@
                 "async-limiter": "~1.0.0"
             }
         },
+        "xss": {
+            "version": "1.0.15",
+            "resolved": "https://registry.npmjs.org/xss/-/xss-1.0.15.tgz",
+            "integrity": "sha512-FVdlVVC67WOIPvfOwhoMETV72f6GbW7aOabBC3WxN/oUdoEMDyLz4OgRv5/gck2ZeNqEQu+Tb0kloovXOfpYVg==",
+            "requires": {
+                "commander": "^2.20.3",
+                "cssfilter": "0.0.10"
+            }
+        },
         "xtend": {
             "version": "4.0.2",
             "resolved": "https://registry.npmmirror.com/xtend/-/xtend-4.0.2.tgz",
diff --git a/web/package.json b/web/package.json
index bf01e1480..d5c2c6d86 100644
--- a/web/package.json
+++ b/web/package.json
@@ -38,6 +38,7 @@
         "md5": "2.3.0",
         "moment": "2.29.1",
         "monaco-editor": "0.19.3",
+        "monaco-languageclient": "^0.13.0",
         "qs": "6.9.4",
         "svgo": "1.3.0",
         "vue": "2.6.12",
@@ -65,13 +66,28 @@
         "less-loader": "6.1.0",
         "lint-staged": "8.2.1",
         "monaco-editor-webpack-plugin": "1.8.2",
-        "node-sass": "6.0.1",
+        "patch-package": "6.2.2",
+        "sass": "1.49.0",
         "sass-loader": "10.2.1",
         "speed-measure-webpack-plugin": "1.5.0",
         "svg-sprite-loader": "5.0.0",
-        "patch-package": "6.2.2",
         "vue-cli-plugin-mockjs": "0.1.3",
         "vue-template-compiler": "2.6.12",
         "webpack-virtual-modules": "0.3.2"
-    }
+    },
+    "workspaces": [
+        "packages/apiServices",
+        "packages/cyeditor",
+        "packages/dataGovernance",
+        "packages/dss",
+        "packages/editor",
+        "packages/editorLsp",
+        "packages/exts",
+        "packages/scheduleCenter",
+        "packages/dolphinScheduler",
+        "packages/scriptis",
+        "packages/shared",
+        "packages/workflows",
+        "packages/workspace"
+    ]
 }

From e06e6e524f137f5aaa89d37293749106635861c6 Mon Sep 17 00:00:00 2001
From: Zhaobincai <747839893@qq.com>
Date: Fri, 24 May 2024 10:45:49 +0800
Subject: [PATCH 167/302] git server : gitUrlPre fix

---
 .../server/restful/DSSFrameworkOrchestratorRestful.java  | 4 ++--
 .../server/service/impl/OrchestratorServiceImpl.java     | 2 +-
 .../protocol/GitUserEntity.java                          | 9 +++++++++
 .../dss/git/dao/impl/DSSWorkspaceGitMapper.xml           | 6 +++---
 .../dss/git/service/impl/DSSWorkspaceGitServiceImpl.java | 1 +
 .../webank/wedatasphere/dss/git/utils/DSSGitUtils.java   | 8 ++++----
 6 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/restful/DSSFrameworkOrchestratorRestful.java b/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/restful/DSSFrameworkOrchestratorRestful.java
index 3cccba2c2..f11783d47 100644
--- a/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/restful/DSSFrameworkOrchestratorRestful.java
+++ b/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/restful/DSSFrameworkOrchestratorRestful.java
@@ -345,7 +345,7 @@ public Message gitUrl(@RequestParam(required = true, name = "projectName") Strin
         GitUserInfoResponse readInfoResponse = RpcAskUtils.processAskException(sender.ask(gitUserInfoRequest), GitUserInfoResponse.class, GitUserInfoRequest.class);
         String gitUsername = readInfoResponse.getGitUser().getGitUser();
         String gitPassword = readInfoResponse.getGitUser().getGitPassword();
-        String gitUrlPre = UrlUtils.normalizeIp(GitServerConfig.GIT_URL_PRE.getValue());
+        String gitUrlPre = UrlUtils.normalizeIp(readInfoResponse.getGitUser().getGitUrl());
         String authenToken = "";
         try {
             authenToken = orchestratorService.getAuthenToken(gitUrlPre, gitUsername, gitPassword);
@@ -354,7 +354,7 @@ public Message gitUrl(@RequestParam(required = true, name = "projectName") Strin
             return Message.error("git登陆失败，请检查git节点配置的用户名/密码/url");
         }
         // 获取顶级域名 eg: ***REMOVED*** -> weoa.com
-        String domainIp = UrlUtils.normalizeIp(GitServerConfig.GIT_URL_PRE.getValue());
+        String domainIp = UrlUtils.normalizeIp(gitUrlPre);
         int lastDotIndex = domainIp.lastIndexOf(".");
         String topDomain = "";
         if (lastDotIndex != -1) {
diff --git a/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/impl/OrchestratorServiceImpl.java b/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/impl/OrchestratorServiceImpl.java
index c03ee7457..c044ecda9 100644
--- a/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/impl/OrchestratorServiceImpl.java
+++ b/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/impl/OrchestratorServiceImpl.java
@@ -618,7 +618,7 @@ public String getAuthenToken(String gitUrlPre, String gitUsername, String gitPas
             elementPassWord.sendKeys(gitPassword);
             elementBtn.submit();
             driver.navigate().refresh();
-            LOGGER.info("for user getting... " + UrlUtils.normalizeIp(GitServerConfig.GIT_URL_PRE.getValue()));
+            LOGGER.info("for user getting... " + UrlUtils.normalizeIp(gitUrlPre));
             Set<Cookie> cookies = driver.manage().getCookies();
             LOGGER.info("cookies： {}", cookies.toString());
             for (Cookie cookie:cookies) {
diff --git a/dss-git/dss-git-common/src/main/java/com.webank.wedatasphere.dss.git.common/protocol/GitUserEntity.java b/dss-git/dss-git-common/src/main/java/com.webank.wedatasphere.dss.git.common/protocol/GitUserEntity.java
index 8ab73b1a6..53347503c 100644
--- a/dss-git/dss-git-common/src/main/java/com.webank.wedatasphere.dss.git.common/protocol/GitUserEntity.java
+++ b/dss-git/dss-git-common/src/main/java/com.webank.wedatasphere.dss.git.common/protocol/GitUserEntity.java
@@ -17,6 +17,7 @@ public class GitUserEntity {
      * read-只读、write-编辑权限
      */
     private String type;
+    private String gitUrl;
 
     public GitUserEntity() {
     }
@@ -100,4 +101,12 @@ public String getType() {
     public void setType(String type) {
         this.type = type;
     }
+
+    public String getGitUrl() {
+        return gitUrl;
+    }
+
+    public void setGitUrl(String gitUrl) {
+        this.gitUrl = gitUrl;
+    }
 }
diff --git a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/dao/impl/DSSWorkspaceGitMapper.xml b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/dao/impl/DSSWorkspaceGitMapper.xml
index b13004145..7ff2837f6 100644
--- a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/dao/impl/DSSWorkspaceGitMapper.xml
+++ b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/dao/impl/DSSWorkspaceGitMapper.xml
@@ -18,8 +18,8 @@
 
 <mapper namespace="com.webank.wedatasphere.dss.git.dao.DSSWorkspaceGitMapper">
     <insert id="insert" parameterType="com.webank.wedatasphere.dss.git.common.protocol.GitUserEntity">
-        insert into dss_workspace_associate_git (workspace_id, git_user, git_password, git_token, create_time, update_time, create_by, update_by, type)
-        VALUES (#{workspaceId}, #{gitUser}, #{gitPassword}, #{gitToken}, now(), now(), #{createBy}, #{updateBy}, #{type})
+        insert into dss_workspace_associate_git (workspace_id, git_user, git_password, git_token, git_url, create_time, update_time, create_by, update_by, type)
+        VALUES (#{workspaceId}, #{gitUser}, #{gitPassword}, #{gitToken}, #{gitUrl}, now(), now(), #{createBy}, #{updateBy}, #{type})
     </insert>
 
     <update id="update" parameterType="com.webank.wedatasphere.dss.git.common.protocol.GitUserEntity">
@@ -40,7 +40,7 @@
     </update>
 
     <select id="selectByWorkspaceId" resultType="com.webank.wedatasphere.dss.git.common.protocol.GitUserEntity">
-        select id, workspace_id, git_user, git_token, create_time, update_time, create_by, update_by, type
+        select id, workspace_id, git_user, git_token, git_url, create_time, update_time, create_by, update_by, type
         from dss_workspace_associate_git
         where workspace_id = #{workspaceId} and `type` = #{type}
     </select>
diff --git a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSWorkspaceGitServiceImpl.java b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSWorkspaceGitServiceImpl.java
index 20672a598..00139cd32 100644
--- a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSWorkspaceGitServiceImpl.java
+++ b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSWorkspaceGitServiceImpl.java
@@ -59,6 +59,7 @@ public GitUserUpdateResponse associateGit(GitUserUpdateRequest gitUserCreateRequ
         }
         if (oldGitUserDo == null) {
             gitUser.setCreateBy(userName);
+            gitUser.setGitUrl(UrlUtils.normalizeIp(GitServerConfig.GIT_URL_PRE.getValue()));
             workspaceGitMapper.insert(gitUser);
         }else {
             workspaceGitMapper.update(gitUser);
diff --git a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/utils/DSSGitUtils.java b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/utils/DSSGitUtils.java
index 10f8f65e9..17efdfbe5 100644
--- a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/utils/DSSGitUtils.java
+++ b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/utils/DSSGitUtils.java
@@ -53,7 +53,7 @@ public class DSSGitUtils {
     public static void init(String projectName, GitUserEntity gitUserDO) throws Exception, GitErrorException{
         if (checkProjectName(projectName, gitUserDO)) {
             try {
-                URL url = new URL(UrlUtils.normalizeIp(GitServerConfig.GIT_URL_PRE.getValue()) + "/" +GitServerConfig.GIT_RESTFUL_API_CREATE_PROJECTS.getValue());
+                URL url = new URL(UrlUtils.normalizeIp(gitUserDO.getGitUrl()) + "/" +GitServerConfig.GIT_RESTFUL_API_CREATE_PROJECTS.getValue());
                 HttpURLConnection connection = (HttpURLConnection) url.openConnection();
                 connection.setRequestMethod("POST");
                 connection.setRequestProperty("PRIVATE-TOKEN", gitUserDO.getGitToken());
@@ -82,7 +82,7 @@ public static void init(String projectName, GitUserEntity gitUserDO) throws Exce
 
     public static void remote(Repository repository, String projectName, GitUserEntity gitUser)throws GitErrorException {
         // 拼接git remote Url
-        String remoteUrl = UrlUtils.normalizeIp(GitServerConfig.GIT_URL_PRE.getValue()) + "/" +gitUser.getGitUser() + File.separator + projectName + ".git";
+        String remoteUrl = UrlUtils.normalizeIp(gitUser.getGitUrl()) + "/" +gitUser.getGitUser() + File.separator + projectName + ".git";
         try {
             Git git = new Git(repository);
 
@@ -295,7 +295,7 @@ public static List<String> getAllProjectName(GitUserEntity gitUserDO) throws DSS
 
         List<String> projectNames = new ArrayList<>();
         do {
-        String gitLabUrl = UrlUtils.normalizeIp(GitServerConfig.GIT_URL_PRE.getValue()) + "/api/v4/projects?per_page=100&page=" + page; // 修改为你的GitLab实例的URL
+        String gitLabUrl = UrlUtils.normalizeIp(gitUserDO.getGitUrl()) + "/api/v4/projects?per_page=100&page=" + page; // 修改为你的GitLab实例的URL
         // 创建HttpClient实例
         try (CloseableHttpClient httpClient = HttpClients.createDefault()) {
             // 创建HttpGet请求
@@ -381,7 +381,7 @@ public static Set<String> status(String projectName, List<String> fileList)throw
     public static void archive(String projectName, GitUserEntity gitUserDO) throws GitErrorException {
         try {
             String projectUrlEncoded = java.net.URLEncoder.encode(gitUserDO.getGitUser() + "/" + projectName, "UTF-8");
-            URL url = new URL(GitServerConfig.GIT_URL_PRE + "/api/v4/projects/" + projectUrlEncoded + "/archive");
+            URL url = new URL(gitUserDO.getGitUrl() + "/api/v4/projects/" + projectUrlEncoded + "/archive");
             HttpURLConnection conn = (HttpURLConnection) url.openConnection();
             conn.setRequestMethod("POST");
             conn.setRequestProperty("PRIVATE-TOKEN", gitUserDO.getGitToken());

From 2d3f4df7521576c76d8d2239bcf88cfe003915ec Mon Sep 17 00:00:00 2001
From: ryanlei <ryanlei@webank.com>
Date: Fri, 24 May 2024 11:00:21 +0800
Subject: [PATCH 168/302] =?UTF-8?q?fix:=20=E4=BE=A7=E8=BE=B9=E5=BD=A2?=
 =?UTF-8?q?=E7=8A=B6=E6=8E=A7=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cyeditor/cyeditor-context-menu/index.js   |  5 +-
 .../cyeditor/cyeditor-snap-grid/index.js      |  2 +-
 web/packages/cyeditor/example.js              | 99 ++++++++++++++++++-
 web/packages/cyeditor/index.js                |  4 +-
 web/packages/cyeditor/package.json            |  3 +-
 5 files changed, 108 insertions(+), 5 deletions(-)

diff --git a/web/packages/cyeditor/cyeditor-context-menu/index.js b/web/packages/cyeditor/cyeditor-context-menu/index.js
index 11b543351..05c7d6e00 100644
--- a/web/packages/cyeditor/cyeditor-context-menu/index.js
+++ b/web/packages/cyeditor/cyeditor-context-menu/index.js
@@ -61,10 +61,13 @@ class ContextMenu {
     this._listeners.eventCyTap = (event) => {
       this.renderedPos = event.renderedPosition || event.cyRenderedPosition
       let left = this.renderedPos.x
+      if (this._options.editorOptions.dragAddNodes) {
+        left += 200
+      }
       let top = this.renderedPos.y
       utils.css(this.ctxmenu, {
         top: top + 'px',
-        left: (left + 200) + 'px'
+        left: left + 'px'
       })
       this.show(event)
     }
diff --git a/web/packages/cyeditor/cyeditor-snap-grid/index.js b/web/packages/cyeditor/cyeditor-snap-grid/index.js
index 45f622421..f79d2087b 100644
--- a/web/packages/cyeditor/cyeditor-snap-grid/index.js
+++ b/web/packages/cyeditor/cyeditor-snap-grid/index.js
@@ -7,7 +7,7 @@ class SnapToGrid {
   constructor (cy, params) {
     this.cy = cy
     let defaults = {
-      stackOrder: -1,
+      stackOrder: 0,
       gridSpacing: 35,
       strokeStyle: '#eeeeee',
       lineWidth: 1.0,
diff --git a/web/packages/cyeditor/example.js b/web/packages/cyeditor/example.js
index 0734b0ec1..0b9544764 100644
--- a/web/packages/cyeditor/example.js
+++ b/web/packages/cyeditor/example.js
@@ -278,6 +278,9 @@ editor.on('addnode', ({ target }) => {
   console.log('node-add', {
     ...target,
   })
+
+  const data = editor.json()
+  console.log(data)
 })
 
 editor.on('addlink', ({ target }) => {
@@ -299,7 +302,101 @@ editor.on('dblclick', (e) => {
 // 方法API
 editor.json({
   boxSelectionEnabled: true,
-  elements: [],
+  elements: {
+    "nodes": [
+        {
+            "data": {
+                "type": "rect",
+                "name": "矩形1",
+                "bg": "#fff",
+                "width": 150,
+                "height": 40,
+                "image": "/img/vite.8e3a10e1.svg",
+                "id": "9158b849-d468-48ef-b59c-440ccd0c1009"
+            },
+            "position": {
+                "x": 262.5,
+                "y": 122.5
+            },
+            "group": "nodes",
+            "removed": false,
+            "selected": false,
+            "selectable": true,
+            "locked": false,
+            "grabbable": true,
+            "pannable": false,
+            "classes": "eh-preview-active"
+        },
+        {
+            "data": {
+                "type": "rect",
+                "name": "矩形1",
+                "bg": "#fff",
+                "width": 150,
+                "height": 40,
+                "image": "/img/vite.8e3a10e1.svg",
+                "id": "18be7b5d-4925-408f-b99b-6829038489ae"
+            },
+            "position": {
+                "x": 192.5,
+                "y": 262.5
+            },
+            "group": "nodes",
+            "removed": false,
+            "selected": false,
+            "selectable": true,
+            "locked": false,
+            "grabbable": true,
+            "pannable": false,
+            "classes": "eh-preview-active"
+        },
+        {
+            "data": {
+                "type": "rect",
+                "name": "矩形1",
+                "bg": "#fff",
+                "width": 150,
+                "height": 40,
+                "image": "/img/vite.8e3a10e1.svg",
+                "id": "86b161a5-2cac-4047-a1bd-f02514a13032"
+            },
+            "position": {
+                "x": 157.5,
+                "y": 332.5
+            },
+            "group": "nodes",
+            "removed": false,
+            "selected": false,
+            "selectable": true,
+            "locked": false,
+            "grabbable": true,
+            "pannable": false,
+            "classes": ""
+        }
+    ],
+    "edges": [
+        {
+            "data": {
+                "source": "9158b849-d468-48ef-b59c-440ccd0c1009",
+                "target": "18be7b5d-4925-408f-b99b-6829038489ae",
+                "lineType": "bezier",
+                "id": "85b93f50-0469-4c79-bb9d-e5e3c99c25cf"
+            },
+            "position": {
+                "x": 17.5,
+                "y": 17.5
+            },
+            "group": "edges",
+            "removed": false,
+            "selected": false,
+            "selectable": true,
+            "locked": false,
+            "grabbable": true,
+            "pannable": true,
+            "classes": ""
+        }
+    ]
+  },
   pan: { x: 0, y: 0 },
   panningEnabled: true,
   userPanningEnabled: true,
diff --git a/web/packages/cyeditor/index.js b/web/packages/cyeditor/index.js
index 951d52166..42ad7633e 100644
--- a/web/packages/cyeditor/index.js
+++ b/web/packages/cyeditor/index.js
@@ -218,6 +218,8 @@ class CyEditor extends EventBus {
         container: this.editorContianer.querySelector('.cy-editor-container .left'),
         nodeTypes: this.editorOptions.nodeTypes,
       })
+    } else {
+      this.editorContianer.className += ' hide_shapes_panel'
     }
 
     // snap-grid
@@ -235,7 +237,7 @@ class CyEditor extends EventBus {
 
     // context-menu
     if (contextMenu) {
-      this._plugins.contextMenu = this.cy.contextMenu(contextMenu)
+      this._plugins.contextMenu = this.cy.contextMenu({editorOptions: this.editorOptions, ...contextMenu})
     }
   }
 
diff --git a/web/packages/cyeditor/package.json b/web/packages/cyeditor/package.json
index e9f7722bb..d312b095d 100644
--- a/web/packages/cyeditor/package.json
+++ b/web/packages/cyeditor/package.json
@@ -7,6 +7,7 @@
   },
   "devDependencies": {},
   "scripts": {
-    "serve": "vue-cli-service serve example.js"
+    "serve": "vue-cli-service serve example.js",
+    "build": "vue-cli-service build --target lib --name cyeditor index.js"
   }
 }

From e64938f1fd9dc1b732e8e5830ee0ddc375c84baf Mon Sep 17 00:00:00 2001
From: Zhaobincai <747839893@qq.com>
Date: Fri, 24 May 2024 11:00:26 +0800
Subject: [PATCH 169/302] git server : exception fix

---
 .../impl/DSSGitWorkflowManagerServiceImpl.java  | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitWorkflowManagerServiceImpl.java b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitWorkflowManagerServiceImpl.java
index 75cad15f1..bddd26689 100644
--- a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitWorkflowManagerServiceImpl.java
+++ b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitWorkflowManagerServiceImpl.java
@@ -6,6 +6,7 @@
 import com.webank.wedatasphere.dss.git.common.protocol.GitSearchResult;
 import com.webank.wedatasphere.dss.git.common.protocol.GitUserEntity;
 import com.webank.wedatasphere.dss.git.common.protocol.constant.GitConstant;
+import com.webank.wedatasphere.dss.git.common.protocol.exception.GitErrorException;
 import com.webank.wedatasphere.dss.git.common.protocol.request.*;
 import com.webank.wedatasphere.dss.git.common.protocol.response.*;
 import com.webank.wedatasphere.dss.git.common.protocol.config.GitServerConfig;
@@ -390,12 +391,16 @@ public GitHistoryResponse getHistory(GitHistoryRequest request) {
 
     private Repository getRepository(File repoDir, String projectName, GitUserEntity gitUser) throws IOException {
         Repository repository = null;
-        // 当前机器不存在就新建
-        if (repoDir.exists()) {
-            repository = new FileRepositoryBuilder().setGitDir(repoDir).build();
-        } else {
-            repository = FileRepositoryBuilder.create(new File(String.valueOf(repoDir)));
-            DSSGitUtils.remote(repository, projectName, gitUser);
+        try {
+            // 当前机器不存在就新建
+            if (repoDir.exists()) {
+                repository = new FileRepositoryBuilder().setGitDir(repoDir).build();
+            } else {
+                repository = FileRepositoryBuilder.create(new File(String.valueOf(repoDir)));
+                DSSGitUtils.remote(repository, projectName, gitUser);
+            }
+        } catch (Exception e) {
+            logger.info("get repository failed, the reason is: ", e);
         }
         return repository;
     }

From 271921e258fd689a581d777fd7cd3f0dffbc5cbc Mon Sep 17 00:00:00 2001
From: Zhaobincai <747839893@qq.com>
Date: Fri, 24 May 2024 11:47:22 +0800
Subject: [PATCH 170/302] git server/dss server: fix updateStatus

---
 .../impl/OrchestratorPluginServiceImpl.java   |  7 ++++++-
 .../workflow/lock/DSSFlowEditLockManager.java | 11 +++++++++-
 .../dss/workflow/service/DSSFlowService.java  |  2 +-
 .../service/impl/DSSFlowServiceImpl.java      | 17 ++++++++++++++--
 .../service/impl/PublishServiceImpl.java      | 20 ++++++++++++++-----
 5 files changed, 47 insertions(+), 10 deletions(-)

diff --git a/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/impl/OrchestratorPluginServiceImpl.java b/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/impl/OrchestratorPluginServiceImpl.java
index 5d212dec3..fb15754f5 100644
--- a/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/impl/OrchestratorPluginServiceImpl.java
+++ b/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/impl/OrchestratorPluginServiceImpl.java
@@ -55,6 +55,7 @@
 import com.webank.wedatasphere.dss.standard.app.sso.Workspace;
 import com.webank.wedatasphere.dss.workflow.dao.LockMapper;
 import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.exception.ExceptionUtils;
 import org.apache.linkis.common.utils.ByteTimeUtils;
 import org.apache.linkis.common.utils.Utils;
@@ -216,9 +217,13 @@ public ResponseConvertOrchestrator convertOrchestration(RequestFrameworkConvertO
 
     @Override
     public void submitFlow(OrchestratorSubmitRequest flowRequest, String username, Workspace workspace) {
+        Long orchestratorId = flowRequest.getOrchestratorId();
+        String status = lockMapper.selectOrchestratorStatus(orchestratorId);
+        if (!StringUtils.isEmpty(status) && !status.equals(OrchestratorRefConstant.FLOW_STATUS_SAVE)) {
+            throw new DSSErrorException(800001, "提交前请先保存工作流");
+        }
         releaseThreadPool.submit(() ->{
             //1. 异步提交，更新提交状态
-            Long orchestratorId = flowRequest.getOrchestratorId();
             try {
                 OrchestratorSubmitJob orchestratorSubmitJob = orchestratorMapper.selectSubmitJobStatus(orchestratorId);
                 if (orchestratorSubmitJob == null) {
diff --git a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/lock/DSSFlowEditLockManager.java b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/lock/DSSFlowEditLockManager.java
index 779fc4dbe..b744c4321 100644
--- a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/lock/DSSFlowEditLockManager.java
+++ b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/lock/DSSFlowEditLockManager.java
@@ -23,6 +23,9 @@
 import com.webank.wedatasphere.dss.common.utils.RpcAskUtils;
 import com.webank.wedatasphere.dss.git.common.protocol.request.GitCommitRequest;
 import com.webank.wedatasphere.dss.git.common.protocol.response.GitCommitResponse;
+import com.webank.wedatasphere.dss.orchestrator.common.entity.OrchestratorVo;
+import com.webank.wedatasphere.dss.orchestrator.common.protocol.RequestQuertByAppIdOrchestrator;
+import com.webank.wedatasphere.dss.orchestrator.common.protocol.RequestQueryByIdOrchestrator;
 import com.webank.wedatasphere.dss.orchestrator.common.ref.OrchestratorRefConstant;
 import com.webank.wedatasphere.dss.sender.service.DSSSenderServiceFactory;
 import com.webank.wedatasphere.dss.workflow.common.entity.DSSFlow;
@@ -197,7 +200,13 @@ public static void deleteLock(String flowEditLock, String username) throws DSSEr
                         String status = lockMapper.selectOrchestratorStatus(dssFlowEditLock.getFlowID());
                         if (!StringUtils.isEmpty(status) && OrchestratorRefConstant.FLOW_STATUS_SAVE.equals(status)) {
                             pushProject(projectInfo.getName(), new Long(projectInfo.getWorkspaceId()), dssFlow.getResourceId(), dssFlow.getBmlVersion(), dssFlow.getName(), username, "force unlock");
-                            lockMapper.updateOrchestratorStatus(dssFlow.getId(), OrchestratorRefConstant.FLOW_STATUS_PUSH);
+                            Sender orcSender = DSSSenderServiceFactory.getOrCreateServiceInstance().getOrcSender();
+                            OrchestratorVo orchestratorVo = RpcAskUtils.processAskException(orcSender.ask(new RequestQuertByAppIdOrchestrator(dssFlowEditLock.getFlowID())),
+                                    OrchestratorVo.class, RequestQueryByIdOrchestrator.class);
+                            if (orchestratorVo == null) {
+                                throw new DSSErrorException(800001, "编排不存在");
+                            }
+                            lockMapper.updateOrchestratorStatus(orchestratorVo.getDssOrchestratorInfo().getId(), OrchestratorRefConstant.FLOW_STATUS_PUSH);
                         }
                     }
                     lockMapper.clearExpire(sdf.get().format(new Date(System.currentTimeMillis() - DSSWorkFlowConstant.DSS_FLOW_EDIT_LOCK_TIMEOUT.getValue())), dssFlowEditLock.getFlowID());
diff --git a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/service/DSSFlowService.java b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/service/DSSFlowService.java
index a001f038a..9f9cd7271 100644
--- a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/service/DSSFlowService.java
+++ b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/service/DSSFlowService.java
@@ -54,7 +54,7 @@ String saveFlow(Long flowId,
                     String userName,
                     String workspaceName,
                     String projectName
-    ) throws IOException;
+    ) throws IOException, DSSErrorException;
 
     DSSFlow copyRootFlow(Long rootFlowId, String userName, Workspace workspace,
                          String projectName, String version, String contextIdStr,
diff --git a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/service/impl/DSSFlowServiceImpl.java b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/service/impl/DSSFlowServiceImpl.java
index 4f3b332a0..6d932f346 100644
--- a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/service/impl/DSSFlowServiceImpl.java
+++ b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/service/impl/DSSFlowServiceImpl.java
@@ -34,9 +34,14 @@
 import com.webank.wedatasphere.dss.common.utils.DSSCommonUtils;
 import com.webank.wedatasphere.dss.common.utils.IoUtils;
 import com.webank.wedatasphere.dss.common.utils.MapUtils;
+import com.webank.wedatasphere.dss.common.utils.RpcAskUtils;
 import com.webank.wedatasphere.dss.contextservice.service.ContextService;
 import com.webank.wedatasphere.dss.contextservice.service.impl.ContextServiceImpl;
+import com.webank.wedatasphere.dss.orchestrator.common.entity.OrchestratorVo;
+import com.webank.wedatasphere.dss.orchestrator.common.protocol.RequestQuertByAppIdOrchestrator;
+import com.webank.wedatasphere.dss.orchestrator.common.protocol.RequestQueryByIdOrchestrator;
 import com.webank.wedatasphere.dss.orchestrator.common.ref.OrchestratorRefConstant;
+import com.webank.wedatasphere.dss.sender.service.DSSSenderServiceFactory;
 import com.webank.wedatasphere.dss.standard.app.development.utils.DSSJobContentConstant;
 import com.webank.wedatasphere.dss.standard.app.sso.Workspace;
 import com.webank.wedatasphere.dss.workflow.WorkFlowManager;
@@ -70,6 +75,7 @@
 import org.apache.linkis.common.exception.ErrorException;
 import org.apache.linkis.cs.client.utils.SerializeHelper;
 import org.apache.linkis.cs.common.utils.CSCommonUtils;
+import org.apache.linkis.rpc.Sender;
 import org.apache.linkis.server.BDPJettyServerHelper;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -122,6 +128,10 @@ public class DSSFlowServiceImpl implements DSSFlowService {
 
     private static final String TOKEN = CommonVars.apply("wds.dss.workspace.token", "BML-AUTH").getValue();
 
+    protected Sender getOrchestratorSender() {
+        return DSSSenderServiceFactory.getOrCreateServiceInstance().getOrcSender();
+    }
+
     @Override
     public DSSFlow getFlowByID(Long id) {
         return flowMapper.selectFlowByID(id);
@@ -273,7 +283,7 @@ public String saveFlow(Long flowID,
                            String comment,
                            String userName,
                            String workspaceName,
-                           String projectName) throws IOException{
+                           String projectName) throws IOException, DSSErrorException{
 
         DSSFlow dssFlow = flowMapper.selectFlowByID(flowID);
         String creator = dssFlow.getCreator();
@@ -318,10 +328,13 @@ public String saveFlow(Long flowID,
             DSSProject projectInfo = DSSFlowEditLockManager.getProjectInfo(dssFlow.getProjectId());
             //仅对接入Git的项目 更新状态为 保存
             if (projectInfo.getAssociateGit() != null && projectInfo.getAssociateGit()) {
-                lockMapper.updateOrchestratorStatus(flowID, OrchestratorRefConstant.FLOW_STATUS_SAVE);
+                OrchestratorVo orchestratorVo = RpcAskUtils.processAskException(getOrchestratorSender().ask(new RequestQuertByAppIdOrchestrator(flowID)),
+                        OrchestratorVo.class, RequestQueryByIdOrchestrator.class);
+                lockMapper.updateOrchestratorStatus(orchestratorVo.getDssOrchestratorInfo().getId(), OrchestratorRefConstant.FLOW_STATUS_SAVE);
             }
         } catch (DSSErrorException e) {
             logger.error("getProjectInfo failed by:", e);
+            throw new DSSErrorException(800001, "getProjectInfo failed by: " + e);
         }
         return version;
     }
diff --git a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/service/impl/PublishServiceImpl.java b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/service/impl/PublishServiceImpl.java
index 02ed2a93e..ccb5bcddf 100644
--- a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/service/impl/PublishServiceImpl.java
+++ b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/service/impl/PublishServiceImpl.java
@@ -25,9 +25,8 @@
 import com.webank.wedatasphere.dss.common.utils.RpcAskUtils;
 import com.webank.wedatasphere.dss.git.common.protocol.request.GitCurrentCommitRequest;
 import com.webank.wedatasphere.dss.git.common.protocol.response.GitCommitResponse;
-import com.webank.wedatasphere.dss.orchestrator.common.protocol.RequestFrameworkConvertOrchestration;
-import com.webank.wedatasphere.dss.orchestrator.common.protocol.RequestFrameworkConvertOrchestrationStatus;
-import com.webank.wedatasphere.dss.orchestrator.common.protocol.ResponseConvertOrchestrator;
+import com.webank.wedatasphere.dss.orchestrator.common.entity.OrchestratorVo;
+import com.webank.wedatasphere.dss.orchestrator.common.protocol.*;
 import com.webank.wedatasphere.dss.orchestrator.common.ref.OrchestratorRefConstant;
 import com.webank.wedatasphere.dss.sender.service.DSSSenderServiceFactory;
 import com.webank.wedatasphere.dss.standard.app.sso.Workspace;
@@ -92,13 +91,24 @@ public String submitPublish(String convertUser, Long workflowId,
             }
             //仅对接入Git的项目更新状态为 发布-publish
             GitCommitResponse gitCommitResponse = null;
+            OrchestratorVo orchestratorVo = null;
             if (dssProject.getAssociateGit() != null && dssProject.getAssociateGit()) {
+                orchestratorVo = RpcAskUtils.processAskException(getOrchestratorSender().ask(new RequestQuertByAppIdOrchestrator(workflowId)),
+                        OrchestratorVo.class, RequestQueryByIdOrchestrator.class);
+                if (orchestratorVo == null) {
+                    throw new DSSErrorException(800001, "编排不存在");
+                }
+                String status = lockMapper.selectOrchestratorStatus(orchestratorVo.getDssOrchestratorInfo().getId());
+                if (!org.apache.commons.lang3.StringUtils.isEmpty(status) && !status.equals(OrchestratorRefConstant.FLOW_STATUS_PUSH)) {
+                    throw new DSSErrorException(800001, "提交前请先提交工作流");
+                }
+
                 // 获取当前文件Commit
                 Sender sender = DSSSenderServiceFactory.getOrCreateServiceInstance().getGitSender();
                 GitCurrentCommitRequest currentCommitRequest = new GitCurrentCommitRequest(workspace.getWorkspaceId(), dssProject.getName(), convertUser, dssFlow.getName());
                 gitCommitResponse = RpcAskUtils.processAskException(sender.ask(currentCommitRequest), GitCommitResponse.class, GitCurrentCommitRequest.class);
                 // 更新commitId
-                lockMapper.updateOrchestratorStatus(workflowId, OrchestratorRefConstant.FLOW_STATUS_PUSH);
+                lockMapper.updateOrchestratorStatus(orchestratorVo.getDssOrchestratorInfo().getId(), OrchestratorRefConstant.FLOW_STATUS_PUSH);
             }
             String schedulerAppConnName = workFlowParser.getValueWithKey(dssFlow.getFlowJson(), DSSWorkFlowConstant.SCHEDULER_APP_CONN_NAME);
             if (StringUtils.isBlank(schedulerAppConnName)) {
@@ -117,7 +127,7 @@ public String submitPublish(String convertUser, Long workflowId,
                 // 更新commitId
                 lockMapper.updateOrchestratorVersionCommitId(gitCommitResponse.getCommitId(), dssFlow.getId());
                 // 更新工作流状态
-                lockMapper.updateOrchestratorStatus(workflowId, OrchestratorRefConstant.FLOW_STATUS_PUBLISH);
+                lockMapper.updateOrchestratorStatus(orchestratorVo.getDssOrchestratorInfo().getId(), OrchestratorRefConstant.FLOW_STATUS_PUBLISH);
             }
 
             return response.getId();

From f11fb08753bf390155e62f25d4c8c77ab0d1365e Mon Sep 17 00:00:00 2001
From: Zhaobincai <747839893@qq.com>
Date: Fri, 24 May 2024 12:54:04 +0800
Subject: [PATCH 171/302] git server: fix exception

---
 .../dss/git/service/impl/DSSWorkspaceGitServiceImpl.java        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSWorkspaceGitServiceImpl.java b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSWorkspaceGitServiceImpl.java
index 00139cd32..af3382f27 100644
--- a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSWorkspaceGitServiceImpl.java
+++ b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSWorkspaceGitServiceImpl.java
@@ -103,7 +103,7 @@ public GitUserEntity selectGit(Long workspaceId, String type) {
         return gitUserEntity;
     }
 
-    private String generateKeys(String password, int mode) {
+    private String generateKeys(String password, int mode) throws DSSErrorException{
         // 定义一个字符串作为密钥源
         String keyString = GitServerConfig.LINKIS_MYSQL_PUB_KEY.getValue();
         if (keyString.length() < 16) {

From f4d508ea0c732e42965d2d022e963ade55e4d551 Mon Sep 17 00:00:00 2001
From: Zhaobincai <747839893@qq.com>
Date: Fri, 24 May 2024 13:02:36 +0800
Subject: [PATCH 172/302] git server: fix exception1

---
 .../git/service/impl/DSSWorkspaceGitServiceImpl.java | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSWorkspaceGitServiceImpl.java b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSWorkspaceGitServiceImpl.java
index af3382f27..00c685c29 100644
--- a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSWorkspaceGitServiceImpl.java
+++ b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSWorkspaceGitServiceImpl.java
@@ -97,10 +97,14 @@ public GitUserInfoResponse selectGitUserInfo(GitUserInfoRequest gitUserInfoReque
 
     @Override
     public GitUserEntity selectGit(Long workspaceId, String type) {
-        GitUserEntity gitUserEntity = workspaceGitMapper.selectByWorkspaceId(workspaceId, type);
-        String decryptPassword = generateKeys(gitUserEntity.getGitToken(), Cipher.DECRYPT_MODE);
-        gitUserEntity.setGitToken(decryptPassword);
-        return gitUserEntity;
+        try {
+            GitUserEntity gitUserEntity = workspaceGitMapper.selectByWorkspaceId(workspaceId, type);
+            String decryptPassword = generateKeys(gitUserEntity.getGitToken(), Cipher.DECRYPT_MODE);
+            gitUserEntity.setGitToken(decryptPassword);
+            return gitUserEntity;
+        } catch (Exception e) {
+            return null;
+        }
     }
 
     private String generateKeys(String password, int mode) throws DSSErrorException{

From 89ead74bd90b01b473c5a9bb50e7d8ca94ec708b Mon Sep 17 00:00:00 2001
From: Zhaobincai <747839893@qq.com>
Date: Fri, 24 May 2024 14:20:33 +0800
Subject: [PATCH 173/302] git server: fix exception1

---
 .../dss/workflow/service/impl/DSSFlowServiceImpl.java         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/service/impl/DSSFlowServiceImpl.java b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/service/impl/DSSFlowServiceImpl.java
index 6d932f346..9768f2a57 100644
--- a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/service/impl/DSSFlowServiceImpl.java
+++ b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/service/impl/DSSFlowServiceImpl.java
@@ -283,7 +283,7 @@ public String saveFlow(Long flowID,
                            String comment,
                            String userName,
                            String workspaceName,
-                           String projectName) throws IOException, DSSErrorException{
+                           String projectName) throws IOException {
 
         DSSFlow dssFlow = flowMapper.selectFlowByID(flowID);
         String creator = dssFlow.getCreator();
@@ -334,7 +334,7 @@ public String saveFlow(Long flowID,
             }
         } catch (DSSErrorException e) {
             logger.error("getProjectInfo failed by:", e);
-            throw new DSSErrorException(800001, "getProjectInfo failed by: " + e);
+            throw new DSSRuntimeException(e.getErrCode(),"更新工作流状态失败，您可以尝试重新保存工作流！原因：" + ExceptionUtils.getRootCauseMessage(e),e);
         }
         return version;
     }

From f9df23933411d8c6e4a6c2bbf72337f61e56120a Mon Sep 17 00:00:00 2001
From: Zhaobincai <747839893@qq.com>
Date: Fri, 24 May 2024 15:42:30 +0800
Subject: [PATCH 174/302] git server: fix push

---
 .../impl/DSSGitProjectManagerServiceImpl.java      |  7 ++++++-
 .../impl/DSSGitWorkflowManagerServiceImpl.java     | 14 +++++++++-----
 .../wedatasphere/dss/git/utils/DSSGitUtils.java    | 11 +++++++----
 3 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitProjectManagerServiceImpl.java b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitProjectManagerServiceImpl.java
index 8f01db006..92167e7b5 100644
--- a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitProjectManagerServiceImpl.java
+++ b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitProjectManagerServiceImpl.java
@@ -22,6 +22,9 @@
 import org.springframework.stereotype.Service;
 
 import java.io.File;
+import java.lang.reflect.Array;
+import java.util.Arrays;
+import java.util.List;
 
 @Service
 public class DSSGitProjectManagerServiceImpl  implements DSSGitProjectManagerService {
@@ -59,7 +62,9 @@ public GitCreateProjectResponse create(GitCreateProjectRequest request) {
             DSSGitUtils.remote(repository, request.getProjectName(), gitUser);
             // 提交
             String comment = "init project: " + request.getProjectName() + DSSGitConstant.GIT_USERNAME_FLAG + request.getUsername();
-            DSSGitUtils.push(repository, request.getProjectName(), gitUser, comment);
+            // 首次创建提交项目整体
+            List<String> paths = Arrays.asList(".");
+            DSSGitUtils.push(repository, request.getProjectName(), gitUser, comment, paths);
             return new GitCreateProjectResponse();
         } catch (Exception e) {
             logger.error("create project failed, the reason is: ", e);
diff --git a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitWorkflowManagerServiceImpl.java b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitWorkflowManagerServiceImpl.java
index bddd26689..009288c35 100644
--- a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitWorkflowManagerServiceImpl.java
+++ b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitWorkflowManagerServiceImpl.java
@@ -94,7 +94,9 @@ public GitCommitResponse commit(GitCommitRequest request) {
             Map<String, BmlResource> bmlResourceMap = request.getBmlResourceMap();
             // 本地保持最新状态
             DSSGitUtils.pull(repository, request.getProjectName(), gitUser);
+            List<String> paths = new ArrayList<>();
             for (Map.Entry<String, BmlResource> entry : bmlResourceMap.entrySet()) {
+                paths.add(entry.getKey());
                 FileUtils.removeFlowNode(entry.getKey(), request.getProjectName());
                 FileUtils.update(bmlService, entry.getKey(), entry.getValue(), request.getUsername());
             }
@@ -102,7 +104,7 @@ public GitCommitResponse commit(GitCommitRequest request) {
             String comment = request.getComment() + DSSGitConstant.GIT_USERNAME_FLAG + request.getUsername();
             // 提交前再次pull， 降低多节点同时提交不同工作流任务导致冲突频率
             DSSGitUtils.pull(repository, request.getProjectName(), gitUser);
-            DSSGitUtils.push(repository, request.getProjectName(), gitUser, comment);
+            DSSGitUtils.push(repository, request.getProjectName(), gitUser, comment, paths);
 
             commitResponse = DSSGitUtils.getCurrentCommit(repository);
         } catch (Exception e) {
@@ -321,7 +323,7 @@ public GitDeleteResponse delete(GitDeleteRequest request) {
             // 提交前再次pull， 降低多节点同时提交不同工作流任务导致冲突频率
             DSSGitUtils.pull(repository, request.getProjectName(), gitUser);
             // 提交
-            DSSGitUtils.push(repository, request.getProjectName(), gitUser,"delete " + request.getDeleteFileList());
+            DSSGitUtils.push(repository, request.getProjectName(), gitUser,"delete " + request.getDeleteFileList(), request.getDeleteFileList());
         } catch (Exception e) {
             logger.error("pull failed, the reason is ",e);
         }
@@ -453,7 +455,8 @@ public GitCommitResponse gitCheckOut(GitRevertRequest request) throws IOExceptio
             // 回滚
             DSSGitUtils.checkoutTargetCommit(repository, request);
             // push
-            DSSGitUtils.push(repository, request.getProjectName(), gitUser, "revert by : " + request.getUsername());
+            List<String> paths = Arrays.asList(request.getPath());
+            DSSGitUtils.push(repository, request.getProjectName(), gitUser, "revert by : " + request.getUsername(), paths);
 
             List<GitCommitResponse> latestCommit = DSSGitUtils.getLatestCommit(repository, request.getPath(), 1);
             if (CollectionUtils.isEmpty(latestCommit)) {
@@ -491,7 +494,7 @@ public GitCommitResponse removeFile(GitRemoveRequest request) {
             String comment = "delete workflowNode " + request.getPath().toString() + DSSGitConstant.GIT_USERNAME_FLAG + request.getUsername();
             // 提交前再次pull， 降低多节点同时提交不同工作流任务导致冲突频率
             DSSGitUtils.pull(repository, request.getProjectName(), gitUser);
-            DSSGitUtils.push(repository, request.getProjectName(), gitUser, comment);
+            DSSGitUtils.push(repository, request.getProjectName(), gitUser, comment, request.getPath());
 
             commitResponse = DSSGitUtils.getCurrentCommit(repository);
 
@@ -531,7 +534,8 @@ public GitCommitResponse rename(GitRenameRequest request) {
             String comment = "rename workflowNode " + request.getName() + DSSGitConstant.GIT_USERNAME_FLAG + request.getUsername();
             // 提交前再次pull， 降低多节点同时提交不同工作流任务导致冲突频率
             DSSGitUtils.pull(repository, request.getProjectName(), gitUser);
-            DSSGitUtils.push(repository, request.getProjectName(), gitUser, comment);
+            List<String> paths = Arrays.asList(request.getName());
+            DSSGitUtils.push(repository, request.getProjectName(), gitUser, comment, paths);
 
             commitResponse = DSSGitUtils.getCurrentCommit(repository);
 
diff --git a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/utils/DSSGitUtils.java b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/utils/DSSGitUtils.java
index 17efdfbe5..1921634fb 100644
--- a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/utils/DSSGitUtils.java
+++ b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/utils/DSSGitUtils.java
@@ -208,14 +208,17 @@ static void printTree(String prefix, GitTree tree) {
 
 
 
-    public static void push(Repository repository, String projectName, GitUserEntity gitUser, String comment) throws GitErrorException{
+    public static void push(Repository repository, String projectName, GitUserEntity gitUser, String comment, List<String> paths) throws GitErrorException{
 
         try {
             Git git = new Git(repository);
             // 添加新增、更改到暂存区
-            git.add().addFilepattern(".").call(); // 添加所有更改
-            // 添加删除到暂存区
-            git.add().setUpdate(true).addFilepattern(".").call();
+            for (String path : paths) {
+                // 添加所有更改
+                git.add().addFilepattern(path).call();
+                // 添加删除到暂存区
+                git.add().setUpdate(true).addFilepattern(path).call();
+            }
 
             // 创建新的提交
             git.commit()

From 288244ce0ee87c9e40ba2841af8e8067754ae19b Mon Sep 17 00:00:00 2001
From: Zhaobincai <747839893@qq.com>
Date: Fri, 24 May 2024 15:49:07 +0800
Subject: [PATCH 175/302] dss server: fix exception2

---
 .../dss/workflow/restful/FlowRestfulApi.java         | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/restful/FlowRestfulApi.java b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/restful/FlowRestfulApi.java
index 084cca841..9bdfec982 100644
--- a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/restful/FlowRestfulApi.java
+++ b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/restful/FlowRestfulApi.java
@@ -332,10 +332,14 @@ public Message saveFlow( @RequestBody SaveFlowRequest saveFlowRequest) throws IO
         if (flowEditLock != null && !flowEditLock.getOwner().equals(ticketId)) {
             return Message.error("当前工作流被用户" + flowEditLock.getUsername() + "已锁定编辑，您编辑的内容不能再被保存。如有疑问，请与" + flowEditLock.getUsername() + "确认");
         }
-        version = flowService.saveFlow(flowID, jsonFlow, null, userName, workspaceName, projectName);
-        AuditLogUtils.printLog( username,workspace.getWorkspaceId(), workspaceName,TargetTypeEnum.WORKFLOW,
-                flowID,dssFlow.getName(),OperateTypeEnum.UPDATE,saveFlowRequest);
-        return Message.ok().data("flowVersion", version);
+        try {
+            version = flowService.saveFlow(flowID, jsonFlow, null, userName, workspaceName, projectName);
+            AuditLogUtils.printLog(username, workspace.getWorkspaceId(), workspaceName, TargetTypeEnum.WORKFLOW,
+                    flowID, dssFlow.getName(), OperateTypeEnum.UPDATE, saveFlowRequest);
+            return Message.ok().data("flowVersion", version);
+        } catch (Exception e) {
+            return Message.error("saveFlow failed, Caused by :", e);
+        }
     }
 
 

From f6b0c2e869371e2f65be5e44d204fc456916963f Mon Sep 17 00:00:00 2001
From: Zhaobincai <747839893@qq.com>
Date: Fri, 24 May 2024 16:37:40 +0800
Subject: [PATCH 176/302] dss server: fix exception
 OrchestratorPluginServiceImpl

---
 .../server/restful/DSSFrameworkOrchestratorRestful.java    | 7 ++++++-
 .../server/service/OrchestratorPluginService.java          | 3 ++-
 .../server/service/impl/OrchestratorPluginServiceImpl.java | 2 +-
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/restful/DSSFrameworkOrchestratorRestful.java b/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/restful/DSSFrameworkOrchestratorRestful.java
index f11783d47..c69608ca2 100644
--- a/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/restful/DSSFrameworkOrchestratorRestful.java
+++ b/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/restful/DSSFrameworkOrchestratorRestful.java
@@ -323,8 +323,13 @@ public Message submitFlow(@RequestBody OrchestratorSubmitRequest submitFlowReque
         if (flowEditLock != null && !flowEditLock.getOwner().equals(ticketId)) {
             return Message.error("当前工作流被用户" + flowEditLock.getUsername() + "已锁定编辑，您编辑的内容不能再被保存。如有疑问，请与" + flowEditLock.getUsername() + "确认");
         }
+        try {
+            orchestratorPluginService.submitFlow(submitFlowRequest, userName, workspace);
+        } catch (Exception e) {
+            return Message.error("提交工作流失败，请保存工作流重试，原因为：", e);
+        }
+
 
-        orchestratorPluginService.submitFlow(submitFlowRequest, userName, workspace);
         return Message.ok();
     }
 
diff --git a/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/OrchestratorPluginService.java b/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/OrchestratorPluginService.java
index b6079c7ce..1f8f6c155 100644
--- a/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/OrchestratorPluginService.java
+++ b/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/OrchestratorPluginService.java
@@ -16,6 +16,7 @@
 
 package com.webank.wedatasphere.dss.orchestrator.server.service;
 
+import com.webank.wedatasphere.dss.common.exception.DSSErrorException;
 import com.webank.wedatasphere.dss.git.common.protocol.GitTree;
 import com.webank.wedatasphere.dss.orchestrator.common.protocol.RequestFrameworkConvertOrchestration;
 import com.webank.wedatasphere.dss.orchestrator.common.protocol.ResponseConvertOrchestrator;
@@ -34,6 +35,6 @@ public interface OrchestratorPluginService {
 
     GitTree diffFlow(OrchestratorSubmitRequest flowRequest, String username, Workspace workspace);
 
-    void submitFlow(OrchestratorSubmitRequest flowRequest, String username, Workspace workspace);
+    void submitFlow(OrchestratorSubmitRequest flowRequest, String username, Workspace workspace) throws DSSErrorException;
 
 }
diff --git a/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/impl/OrchestratorPluginServiceImpl.java b/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/impl/OrchestratorPluginServiceImpl.java
index fb15754f5..8ca47144a 100644
--- a/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/impl/OrchestratorPluginServiceImpl.java
+++ b/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/impl/OrchestratorPluginServiceImpl.java
@@ -216,7 +216,7 @@ public ResponseConvertOrchestrator convertOrchestration(RequestFrameworkConvertO
     }
 
     @Override
-    public void submitFlow(OrchestratorSubmitRequest flowRequest, String username, Workspace workspace) {
+    public void submitFlow(OrchestratorSubmitRequest flowRequest, String username, Workspace workspace) throws DSSErrorException {
         Long orchestratorId = flowRequest.getOrchestratorId();
         String status = lockMapper.selectOrchestratorStatus(orchestratorId);
         if (!StringUtils.isEmpty(status) && !status.equals(OrchestratorRefConstant.FLOW_STATUS_SAVE)) {

From 1d7e042ffcd705273d55d4929dff101e5f99900b Mon Sep 17 00:00:00 2001
From: Zhaobincai <747839893@qq.com>
Date: Fri, 24 May 2024 18:05:20 +0800
Subject: [PATCH 177/302] git-server: fix priKey

---
 .../protocol/config/GitServerConfig.java                        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dss-git/dss-git-common/src/main/java/com.webank.wedatasphere.dss.git.common/protocol/config/GitServerConfig.java b/dss-git/dss-git-common/src/main/java/com.webank.wedatasphere.dss.git.common/protocol/config/GitServerConfig.java
index 0fcccc9f0..774deff49 100644
--- a/dss-git/dss-git-common/src/main/java/com.webank.wedatasphere.dss.git.common/protocol/config/GitServerConfig.java
+++ b/dss-git/dss-git-common/src/main/java/com.webank.wedatasphere.dss.git.common/protocol/config/GitServerConfig.java
@@ -24,5 +24,5 @@ public class GitServerConfig {
 
     public static final CommonVars<String> GIT_SEARCH_EXCLUDE_FILE = CommonVars.apply("wds.dss.server.git.search.exclude.file", ".properties");
 
-    public static final CommonVars<String> LINKIS_MYSQL_PUB_KEY = CommonVars.apply("wds.linkis.mysql.pub.key", "abc");
+    public static final CommonVars<String> LINKIS_MYSQL_PRI_KEY = CommonVars.apply("wds.linkis.mysql.pri.key", "abc");
 }

From 3a3cb99e694b226dd04e3d60cc1cf4284ca7777f Mon Sep 17 00:00:00 2001
From: Zhaobincai <747839893@qq.com>
Date: Fri, 24 May 2024 20:06:26 +0800
Subject: [PATCH 178/302] git-server: fix priKey

---
 .../dss/git/service/impl/DSSWorkspaceGitServiceImpl.java        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSWorkspaceGitServiceImpl.java b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSWorkspaceGitServiceImpl.java
index 00c685c29..fe40e9d55 100644
--- a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSWorkspaceGitServiceImpl.java
+++ b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSWorkspaceGitServiceImpl.java
@@ -109,7 +109,7 @@ public GitUserEntity selectGit(Long workspaceId, String type) {
 
     private String generateKeys(String password, int mode) throws DSSErrorException{
         // 定义一个字符串作为密钥源
-        String keyString = GitServerConfig.LINKIS_MYSQL_PUB_KEY.getValue();
+        String keyString = GitServerConfig.LINKIS_MYSQL_PRI_KEY.getValue();
         if (keyString.length() < 16) {
             throw new DSSErrorException(800001, "密钥长度必须大于16位");
         }

From 9ba09338aea53c44384e4bc2ad67f0dc487cba61 Mon Sep 17 00:00:00 2001
From: xlinliu <arionliu@webank.com>
Date: Mon, 27 May 2024 10:51:26 +0800
Subject: [PATCH 179/302] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E6=B5=81=E5=AF=BC?=
 =?UTF-8?q?=E5=87=BA=E6=97=B6=E7=AC=AC=E4=B8=89=E6=96=B9=E8=8A=82=E7=82=B9?=
 =?UTF-8?q?=E7=89=A9=E6=96=99=E5=8F=AF=E9=80=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../opertion/WorkflowRefExportOperation.java  |  3 ++-
 .../common/protocol/DSSProtocolObject.scala   |  3 ++-
 .../impl/OrchestratorPluginServiceImpl.java   |  3 ++-
 .../dss/workflow/DefaultWorkFlowManager.java  |  4 ++--
 .../dss/workflow/WorkFlowManager.java         |  4 +++-
 .../io/export/WorkFlowExportService.java      |  4 +++-
 .../impl/WorkFlowExportServiceImpl.java       | 19 +++++++++++--------
 .../receiver/DSSWorkflowReceiver.scala        |  3 ++-
 8 files changed, 27 insertions(+), 16 deletions(-)

diff --git a/dss-appconn/appconns/dss-workflow-appconn/src/main/java/com/webank/wedatasphere/dss/appconn/workflow/opertion/WorkflowRefExportOperation.java b/dss-appconn/appconns/dss-workflow-appconn/src/main/java/com/webank/wedatasphere/dss/appconn/workflow/opertion/WorkflowRefExportOperation.java
index 038db5913..febdcdf8a 100644
--- a/dss-appconn/appconns/dss-workflow-appconn/src/main/java/com/webank/wedatasphere/dss/appconn/workflow/opertion/WorkflowRefExportOperation.java
+++ b/dss-appconn/appconns/dss-workflow-appconn/src/main/java/com/webank/wedatasphere/dss/appconn/workflow/opertion/WorkflowRefExportOperation.java
@@ -48,7 +48,8 @@ public ExportResponseRef exportRef(ThirdlyRequestRef.RefJobContentRequestRefImpl
                 projectId,
                 projectName,
                 toJson(requestRef.getWorkspace()),
-                requestRef.getDSSLabels());
+                requestRef.getDSSLabels(),
+                true);
         Sender sender = DSSSenderServiceFactory.getOrCreateServiceInstance().getWorkflowSender(requestRef.getDSSLabels());
         ResponseExportWorkflow responseExportWorkflow = RpcAskUtils.processAskException(sender.ask(requestExportWorkflow),
                 ResponseExportWorkflow.class, RequestExportWorkflow.class);
diff --git a/dss-commons/dss-common/src/main/scala/com/webank/wedatasphere/dss/common/protocol/DSSProtocolObject.scala b/dss-commons/dss-common/src/main/scala/com/webank/wedatasphere/dss/common/protocol/DSSProtocolObject.scala
index 41e6b87c8..e895f798d 100644
--- a/dss-commons/dss-common/src/main/scala/com/webank/wedatasphere/dss/common/protocol/DSSProtocolObject.scala
+++ b/dss-commons/dss-common/src/main/scala/com/webank/wedatasphere/dss/common/protocol/DSSProtocolObject.scala
@@ -41,7 +41,8 @@ case class RequestExportWorkflow(userName: String,
                                  projectId: Long,
                                  projectName: String,
                                  workspaceStr: String,
-                                 dssLabelList: java.util.List[DSSLabel]
+                                 dssLabelList: java.util.List[DSSLabel],
+                                 exportExternalNodeAppConnResource: Boolean
                                  )
 
 case class ResponseExportWorkflow(resourceId: String, version: String, flowID: Long)
diff --git a/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/impl/OrchestratorPluginServiceImpl.java b/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/impl/OrchestratorPluginServiceImpl.java
index 8ca47144a..04f7f4516 100644
--- a/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/impl/OrchestratorPluginServiceImpl.java
+++ b/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/impl/OrchestratorPluginServiceImpl.java
@@ -281,7 +281,8 @@ private BmlResource uploadWorkflowToGit(OrchestratorSubmitRequest flowRequest, S
                 projectId,
                 projectName,
                 DSSCommonUtils.COMMON_GSON.toJson(workspace),
-                dssLabelList);
+                dssLabelList,
+                false);
         Sender sender = DSSSenderServiceFactory.getOrCreateServiceInstance().getWorkflowSender(dssLabelList);
         ResponseExportWorkflow responseExportWorkflow = RpcAskUtils.processAskException(sender.ask(requestExportWorkflow),
                 ResponseExportWorkflow.class, RequestExportWorkflow.class);
diff --git a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/DefaultWorkFlowManager.java b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/DefaultWorkFlowManager.java
index 2c5ea92b3..32cee8acf 100644
--- a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/DefaultWorkFlowManager.java
+++ b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/DefaultWorkFlowManager.java
@@ -201,9 +201,9 @@ public ResponseUnlockWorkflow unlockWorkflow(String userName, Long flowId, Boole
     @Override
     public BmlResource exportWorkflowNew(String userName, Long flowId, Long dssProjectId,
                                          String projectName, Workspace workspace,
-                                         List<DSSLabel> dssLabels) throws Exception {
+                                         List<DSSLabel> dssLabels,boolean exportExternalNodeAppConnResource) throws Exception {
         DSSFlow dssFlow = flowService.getFlowByID(flowId);
-        String exportPath = workFlowExportService.exportFlowInfoNew(dssProjectId, projectName, flowId, userName, workspace, dssLabels);
+        String exportPath = workFlowExportService.exportFlowInfoNew(dssProjectId, projectName, flowId, userName, workspace, dssLabels,exportExternalNodeAppConnResource);
         InputStream inputStream = bmlService.readLocalResourceFile(userName, exportPath);
         BmlResource bmlResource = bmlService.upload(userName, inputStream, dssFlow.getName() + ".export", projectName);
         logger.info("export workflow success.  flowId:{},bmlResource:{} .",flowId,bmlResource);
diff --git a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/WorkFlowManager.java b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/WorkFlowManager.java
index 71aa846bb..988872fb4 100644
--- a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/WorkFlowManager.java
+++ b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/WorkFlowManager.java
@@ -101,6 +101,7 @@ void deleteWorkflow(String userName,
      * @param projectName
      * @param workspace
      * @param dssLabels
+     * @param exportExternalNodeAppConnResource 是否导出第三方节点的物料
      * @return 导出的工作流，以Bml资源的形式返回
      * @throws Exception
      */
@@ -109,7 +110,8 @@ BmlResource exportWorkflowNew(String userName,
                                   Long dssProjectId,
                                   String projectName,
                                   Workspace workspace,
-                                  List<DSSLabel> dssLabels) throws Exception;
+                                  List<DSSLabel> dssLabels,
+            boolean exportExternalNodeAppConnResource) throws Exception;
     /**
      * 导出工作流
      * @param userName
diff --git a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/io/export/WorkFlowExportService.java b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/io/export/WorkFlowExportService.java
index 9a5a7deb1..e7047f6c1 100644
--- a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/io/export/WorkFlowExportService.java
+++ b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/io/export/WorkFlowExportService.java
@@ -30,10 +30,12 @@ public interface WorkFlowExportService {
      * @param userName 用户名
      * @param workspace 所属工作空间
      * @param dssLabels label列表
+     * @param exportExternalNodeAppConnResource 是否导出第三方节点的物料
      * @return 导出的工作流压缩包的文件地址
      * @throws Exception
      */
-    String exportFlowInfoNew(Long dssProjectId, String projectName, long rootFlowId, String userName, Workspace workspace, List<DSSLabel> dssLabels) throws Exception;
+    String exportFlowInfoNew(Long dssProjectId, String projectName, long rootFlowId, String userName, Workspace workspace,
+                             List<DSSLabel> dssLabels,boolean exportExternalNodeAppConnResource) throws Exception;
 
     /**
      * 将一个工作流导出成压缩包，存放到本地磁盘，并返回压缩包的路径
diff --git a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/io/export/impl/WorkFlowExportServiceImpl.java b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/io/export/impl/WorkFlowExportServiceImpl.java
index af069b4a2..301ef223d 100644
--- a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/io/export/impl/WorkFlowExportServiceImpl.java
+++ b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/io/export/impl/WorkFlowExportServiceImpl.java
@@ -108,7 +108,8 @@ protected Sender getOrchestratorSender() {
 
 
     @Override
-    public String exportFlowInfoNew(Long dssProjectId, String projectName, long rootFlowId, String userName, Workspace workspace, List<DSSLabel> dssLabels) throws Exception {
+    public String exportFlowInfoNew(Long dssProjectId, String projectName, long rootFlowId, String userName,
+                                    Workspace workspace, List<DSSLabel> dssLabels,boolean exportExternalNodeAppConnResource) throws Exception {
         //获取rootFlow,和所有子Flow
         DSSFlow rootFlow = flowMapper.selectFlowByID(rootFlowId);
         List<DSSFlow> dssFlowList = new ArrayList<>();
@@ -138,8 +139,8 @@ public String exportFlowInfoNew(Long dssProjectId, String projectName, long root
                 } else if (StringUtils.isNotBlank(flowJson)) {
                     // /appcom/tmp/dss/yyyyMMddHHmmssSSS/projectxxx/flow_all_type_node/
                     String flowCodePath = IoUtils.generateFlowCodeIOPath(projectPath, rootFlow.getName());
-                    exportFlowResourcesNew(userName, dssProjectId, projectName, flowCodePath, flowJson, dssFlow.getName(), workspace, dssLabels);
-                    exportAllSubFlowsNew(userName, dssFlow, dssProjectId, projectName, flowCodePath,flowMetaPath, workspace, dssLabels);
+                    exportFlowResourcesNew(userName, dssProjectId, projectName, flowCodePath, flowJson, dssFlow.getName(), workspace, dssLabels,exportExternalNodeAppConnResource);
+                    exportAllSubFlowsNew(userName, dssFlow, dssProjectId, projectName, flowCodePath,flowMetaPath, workspace, dssLabels,exportExternalNodeAppConnResource);
                     String flowJsonWithoutParams = extractAndExportParams(flowJson, flowCodePath);
                     try (
                             OutputStream outputStream = IoUtils.generateExportOutputStream(flowMetaFilePath )
@@ -206,7 +207,8 @@ public String exportFlowInfo(Long dssProjectId, String projectName, long rootFlo
     }
 
     private void exportAllSubFlowsNew(String userName, DSSFlow dssFlowParent, Long projectId, String projectName,
-                                      String parentFlowCodePath, String parentFlowMetaPath, Workspace workspace, List<DSSLabel> dssLabels) throws Exception {
+                                      String parentFlowCodePath, String parentFlowMetaPath, Workspace workspace,
+                                      List<DSSLabel> dssLabels,boolean exportExternalNodeAppConnResource) throws Exception {
         List<? extends DSSFlow> subFlows = dssFlowParent.getChildren();
         if (subFlows != null) {
             for (DSSFlow subFlow : subFlows) {
@@ -220,8 +222,8 @@ private void exportAllSubFlowsNew(String userName, DSSFlow dssFlowParent, Long p
                 if (!subFlow.getHasSaved()) {
                     logger.info("工作流{}从未保存过，忽略", subFlow.getName());
                 } else if (StringUtils.isNotBlank(flowJson)) {
-                    exportFlowResourcesNew(userName, projectId, projectName, subFlowCodePath, flowJson, subFlow.getName(), workspace, dssLabels);
-                    exportAllSubFlowsNew(userName, subFlow, projectId, projectName, subFlowCodePath, subFlowMetaPath, workspace, dssLabels);
+                    exportFlowResourcesNew(userName, projectId, projectName, subFlowCodePath, flowJson, subFlow.getName(), workspace, dssLabels,exportExternalNodeAppConnResource);
+                    exportAllSubFlowsNew(userName, subFlow, projectId, projectName, subFlowCodePath, subFlowMetaPath, workspace, dssLabels,exportExternalNodeAppConnResource);
                     String subFlowWithoutParams = extractAndExportParams(flowJson, subFlowCodePath);
                     try (
                             OutputStream outputStream = IoUtils.generateExportOutputStream(subFlowMetaSavePath )
@@ -270,11 +272,12 @@ private String genWorkFlowExportDir(String projectExportPath, String flowName) {
      * @param flowJson 工作流元信息
      * @param flowName 工作流明
      * @param dssLabels label列表
+     * @param exportExternalNodeAppConnResource 是否导出第三方节点的appconn资源
      * @throws Exception
      */
     private void exportFlowResourcesNew(String userName, Long projectId, String projectName,
                                         String flowCodePath, String flowJson, String flowName,
-                                        Workspace workspace, List<DSSLabel> dssLabels) throws Exception {
+                                        Workspace workspace, List<DSSLabel> dssLabels,boolean exportExternalNodeAppConnResource) throws Exception {
         if (StringUtils.isNotEmpty(flowCodePath)) {
             //导出工作流资源文件
             List<Resource> resources = workFlowParser.getWorkFlowResources(flowJson);
@@ -295,7 +298,7 @@ private void exportFlowResourcesNew(String userName, Long projectId, String proj
                         logger.error(msg);
                         throw new DSSRuntimeException(msg);
                     }
-                    if (Boolean.TRUE.equals(nodeInfo.getSupportJump()) && nodeInfo.getJumpType() == 1) {
+                    if (exportExternalNodeAppConnResource&&Boolean.TRUE.equals(nodeInfo.getSupportJump()) && nodeInfo.getJumpType() == 1) {
                         logger.info("node.getJobContent() is :{}", node.getJobContent());
                         nodeExportService.downloadAppConnResourceToLocalNew(userName, projectId, projectName, node, flowCodePath, workspace, dssLabels);
                     }
diff --git a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/scala/com/webank/wedatasphere/dss/workflow/receiver/DSSWorkflowReceiver.scala b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/scala/com/webank/wedatasphere/dss/workflow/receiver/DSSWorkflowReceiver.scala
index 4db4617bf..f91ade4b3 100644
--- a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/scala/com/webank/wedatasphere/dss/workflow/receiver/DSSWorkflowReceiver.scala
+++ b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/scala/com/webank/wedatasphere/dss/workflow/receiver/DSSWorkflowReceiver.scala
@@ -65,7 +65,8 @@ class DSSWorkflowReceiver(workflowManager: WorkFlowManager)  extends Receiver {
         reqExportFlow.projectId,
         reqExportFlow.projectName,
         DSSCommonUtils.COMMON_GSON.fromJson(reqExportFlow.workspaceStr, classOf[Workspace]),
-        reqExportFlow.dssLabelList)
+        reqExportFlow.dssLabelList,
+        reqExportFlow.exportExternalNodeAppConnResource)
       ResponseExportWorkflow(dssExportFlowResource.getResourceId, dssExportFlowResource.getVersion,
         reqExportFlow.flowID)
 

From f3ec451a37f74f017bf14a0fa69066fb9867e1b2 Mon Sep 17 00:00:00 2001
From: Zhaobincai <747839893@qq.com>
Date: Mon, 27 May 2024 11:22:38 +0800
Subject: [PATCH 180/302] git-server: fix decrypt

---
 .../git/service/impl/DSSWorkspaceGitServiceImpl.java  | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSWorkspaceGitServiceImpl.java b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSWorkspaceGitServiceImpl.java
index fe40e9d55..7d6e71fe0 100644
--- a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSWorkspaceGitServiceImpl.java
+++ b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSWorkspaceGitServiceImpl.java
@@ -99,8 +99,15 @@ public GitUserInfoResponse selectGitUserInfo(GitUserInfoRequest gitUserInfoReque
     public GitUserEntity selectGit(Long workspaceId, String type) {
         try {
             GitUserEntity gitUserEntity = workspaceGitMapper.selectByWorkspaceId(workspaceId, type);
-            String decryptPassword = generateKeys(gitUserEntity.getGitToken(), Cipher.DECRYPT_MODE);
-            gitUserEntity.setGitToken(decryptPassword);
+            // 密码 token 解密处理
+            if (!StringUtils.isEmpty(gitUserEntity.getGitPassword())) {
+                String encryptPassword = generateKeys(gitUserEntity.getGitPassword(), Cipher.DECRYPT_MODE);
+                gitUserEntity.setGitPassword(encryptPassword);
+            }
+            if (!StringUtils.isEmpty(gitUserEntity.getGitToken())) {
+                String encryptToken = generateKeys(gitUserEntity.getGitToken(), Cipher.DECRYPT_MODE);
+                gitUserEntity.setGitToken(encryptToken);
+            }
             return gitUserEntity;
         } catch (Exception e) {
             return null;

From 46c4c477b7e47678471037c9c8afd42946ce1bf6 Mon Sep 17 00:00:00 2001
From: Zhaobincai <747839893@qq.com>
Date: Mon, 27 May 2024 11:29:55 +0800
Subject: [PATCH 181/302] git-server: fix decrypt

---
 .../wedatasphere/dss/git/dao/impl/DSSWorkspaceGitMapper.xml     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/dao/impl/DSSWorkspaceGitMapper.xml b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/dao/impl/DSSWorkspaceGitMapper.xml
index 7ff2837f6..0941f462e 100644
--- a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/dao/impl/DSSWorkspaceGitMapper.xml
+++ b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/dao/impl/DSSWorkspaceGitMapper.xml
@@ -40,7 +40,7 @@
     </update>
 
     <select id="selectByWorkspaceId" resultType="com.webank.wedatasphere.dss.git.common.protocol.GitUserEntity">
-        select id, workspace_id, git_user, git_token, git_url, create_time, update_time, create_by, update_by, type
+        select id, workspace_id, git_user, git_token, git_password, git_url, create_time, update_time, create_by, update_by, type
         from dss_workspace_associate_git
         where workspace_id = #{workspaceId} and `type` = #{type}
     </select>

From 4b0dd48fab649720e470dd2bf852b31db0fd0cca Mon Sep 17 00:00:00 2001
From: Zhaobincai <747839893@qq.com>
Date: Mon, 27 May 2024 15:32:38 +0800
Subject: [PATCH 182/302] git-server: fix decrypt2

---
 .../git/service/DSSWorkspaceGitService.java   |  2 +-
 .../impl/DSSGitProjectManagerServiceImpl.java |  6 +--
 .../DSSGitWorkflowManagerServiceImpl.java     | 20 +++++-----
 .../impl/DSSWorkspaceGitServiceImpl.java      | 39 +++++++++++--------
 4 files changed, 36 insertions(+), 31 deletions(-)

diff --git a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/DSSWorkspaceGitService.java b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/DSSWorkspaceGitService.java
index 0c28240c9..f52c81629 100644
--- a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/DSSWorkspaceGitService.java
+++ b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/DSSWorkspaceGitService.java
@@ -15,7 +15,7 @@ public interface DSSWorkspaceGitService {
 
     GitUserInfoResponse selectGitUserInfo(GitUserInfoRequest gitUserInfoRequest) throws DSSErrorException;
 
-    GitUserEntity selectGit(Long workspaceId, String type);
+    GitUserEntity selectGit(Long workspaceId, String type, Boolean decrypt);
 
     GitConnectResponse gitTokenTest(GitConnectRequest connectTestRequest) throws DSSErrorException;
 }
diff --git a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitProjectManagerServiceImpl.java b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitProjectManagerServiceImpl.java
index 92167e7b5..5d7379603 100644
--- a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitProjectManagerServiceImpl.java
+++ b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitProjectManagerServiceImpl.java
@@ -40,7 +40,7 @@ public class DSSGitProjectManagerServiceImpl  implements DSSGitProjectManagerSer
     @Override
     public GitCreateProjectResponse create(GitCreateProjectRequest request) {
         logger.info("-------=======================beginning to create testGit1=======================-------");
-        GitUserEntity gitUser = dssWorkspaceGitService.selectGit(request.getWorkspaceId(), GitConstant.GIT_ACCESS_WRITE_TYPE);
+        GitUserEntity gitUser = dssWorkspaceGitService.selectGit(request.getWorkspaceId(), GitConstant.GIT_ACCESS_WRITE_TYPE, true);
         if (gitUser == null) {
             logger.error("the workspace : {} don't associate with git", request.getWorkspaceId());
             return null;
@@ -79,7 +79,7 @@ public GitCreateProjectResponse create(GitCreateProjectRequest request) {
 
     @Override
     public GitArchivePorjectResponse archive(GitArchiveProjectRequest request) throws GitErrorException {
-        GitUserEntity gitUser = dssWorkspaceGitService.selectGit(request.getWorkspaceId(), GitConstant.GIT_ACCESS_WRITE_TYPE);
+        GitUserEntity gitUser = dssWorkspaceGitService.selectGit(request.getWorkspaceId(), GitConstant.GIT_ACCESS_WRITE_TYPE, true);
         if (gitUser == null) {
             logger.error("the workspace : {} don't associate with git", request.getWorkspaceId());
             return null;
@@ -93,7 +93,7 @@ public GitArchivePorjectResponse archive(GitArchiveProjectRequest request) throw
 
     @Override
     public GitCheckProjectResponse checkProject(GitCheckProjectRequest request) throws DSSErrorException {
-        GitUserEntity gitUser = dssWorkspaceGitService.selectGit(request.getWorkspaceId(), GitConstant.GIT_ACCESS_WRITE_TYPE);
+        GitUserEntity gitUser = dssWorkspaceGitService.selectGit(request.getWorkspaceId(), GitConstant.GIT_ACCESS_WRITE_TYPE, true);
         if (gitUser == null) {
             logger.error("the workspace : {} don't associate with git", request.getWorkspaceId());
             return null;
diff --git a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitWorkflowManagerServiceImpl.java b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitWorkflowManagerServiceImpl.java
index 009288c35..1d47ac05c 100644
--- a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitWorkflowManagerServiceImpl.java
+++ b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitWorkflowManagerServiceImpl.java
@@ -45,7 +45,7 @@ public class DSSGitWorkflowManagerServiceImpl implements DSSGitWorkflowManagerSe
     private BMLService bmlService;
     @Override
     public GitDiffResponse diff(GitDiffRequest request) {
-        GitUserEntity gitUser = dssWorkspaceGitService.selectGit(request.getWorkspaceId(), GitConstant.GIT_ACCESS_WRITE_TYPE);
+        GitUserEntity gitUser = dssWorkspaceGitService.selectGit(request.getWorkspaceId(), GitConstant.GIT_ACCESS_WRITE_TYPE, true);
         if (gitUser == null) {
             logger.error("the workspace : {} don't associate with git", request.getWorkspaceId());
             return null;
@@ -78,7 +78,7 @@ public GitDiffResponse diff(GitDiffRequest request) {
 
     @Override
     public GitCommitResponse commit(GitCommitRequest request) {
-        GitUserEntity gitUser = dssWorkspaceGitService.selectGit(request.getWorkspaceId(), GitConstant.GIT_ACCESS_WRITE_TYPE);
+        GitUserEntity gitUser = dssWorkspaceGitService.selectGit(request.getWorkspaceId(), GitConstant.GIT_ACCESS_WRITE_TYPE, true);
         if (gitUser == null) {
             logger.error("the workspace : {} don't associate with git", request.getWorkspaceId());
             return null;
@@ -296,7 +296,7 @@ private List<String> process(List<String> commands) {
 
     @Override
     public GitDeleteResponse delete(GitDeleteRequest request) {
-        GitUserEntity gitUser = dssWorkspaceGitService.selectGit(request.getWorkspaceId(), GitConstant.GIT_ACCESS_WRITE_TYPE);
+        GitUserEntity gitUser = dssWorkspaceGitService.selectGit(request.getWorkspaceId(), GitConstant.GIT_ACCESS_WRITE_TYPE, true);
         if (gitUser == null) {
             logger.error("the workspace : {} don't associate with git", request.getWorkspaceId());
             return null;
@@ -332,7 +332,7 @@ public GitDeleteResponse delete(GitDeleteRequest request) {
 
     @Override
     public GitFileContentResponse getFileContent(GitFileContentRequest request) {
-        GitUserEntity gitUser = dssWorkspaceGitService.selectGit(request.getWorkspaceId(), GitConstant.GIT_ACCESS_WRITE_TYPE);
+        GitUserEntity gitUser = dssWorkspaceGitService.selectGit(request.getWorkspaceId(), GitConstant.GIT_ACCESS_WRITE_TYPE, true);
         if (gitUser == null) {
             logger.error("the workspace : {} don't associate with git", request.getWorkspaceId());
             return null;
@@ -362,7 +362,7 @@ public GitFileContentResponse getFileContent(GitFileContentRequest request) {
 
     @Override
     public GitHistoryResponse getHistory(GitHistoryRequest request) {
-        GitUserEntity gitUser = dssWorkspaceGitService.selectGit(request.getWorkspaceId(), GitConstant.GIT_ACCESS_WRITE_TYPE);
+        GitUserEntity gitUser = dssWorkspaceGitService.selectGit(request.getWorkspaceId(), GitConstant.GIT_ACCESS_WRITE_TYPE, true);
         if (gitUser == null) {
             logger.error("the workspace : {} don't associate with git", request.getWorkspaceId());
             return null;
@@ -409,7 +409,7 @@ private Repository getRepository(File repoDir, String projectName, GitUserEntity
 
     @Override
     public GitCommitResponse getCurrentCommit(GitCurrentCommitRequest request) {
-        GitUserEntity gitUser = dssWorkspaceGitService.selectGit(request.getWorkspaceId(), GitConstant.GIT_ACCESS_WRITE_TYPE);
+        GitUserEntity gitUser = dssWorkspaceGitService.selectGit(request.getWorkspaceId(), GitConstant.GIT_ACCESS_WRITE_TYPE, true);
         if (gitUser == null) {
             logger.error("the workspace : {} don't associate with git", request.getWorkspaceId());
             return null;
@@ -439,7 +439,7 @@ public GitCommitResponse getCurrentCommit(GitCurrentCommitRequest request) {
 
     @Override
     public GitCommitResponse gitCheckOut(GitRevertRequest request) throws IOException {
-        GitUserEntity gitUser = dssWorkspaceGitService.selectGit(request.getWorkspaceId(), GitConstant.GIT_ACCESS_WRITE_TYPE);
+        GitUserEntity gitUser = dssWorkspaceGitService.selectGit(request.getWorkspaceId(), GitConstant.GIT_ACCESS_WRITE_TYPE, true);
         if (gitUser == null) {
             logger.error("the workspace : {} don't associate with git", request.getWorkspaceId());
             return null;
@@ -473,7 +473,7 @@ public GitCommitResponse gitCheckOut(GitRevertRequest request) throws IOExceptio
 
     @Override
     public GitCommitResponse removeFile(GitRemoveRequest request) {
-        GitUserEntity gitUser = dssWorkspaceGitService.selectGit(request.getWorkspaceId(), GitConstant.GIT_ACCESS_WRITE_TYPE);
+        GitUserEntity gitUser = dssWorkspaceGitService.selectGit(request.getWorkspaceId(), GitConstant.GIT_ACCESS_WRITE_TYPE, true);
         if (gitUser == null) {
             logger.error("the workspace : {} don't associate with git", request.getWorkspaceId());
             return null;
@@ -506,7 +506,7 @@ public GitCommitResponse removeFile(GitRemoveRequest request) {
 
     @Override
     public GitCommitResponse rename(GitRenameRequest request) {
-        GitUserEntity gitUser = dssWorkspaceGitService.selectGit(request.getWorkspaceId(), GitConstant.GIT_ACCESS_WRITE_TYPE);
+        GitUserEntity gitUser = dssWorkspaceGitService.selectGit(request.getWorkspaceId(), GitConstant.GIT_ACCESS_WRITE_TYPE, true);
         if (gitUser == null) {
             logger.error("the workspace : {} don't associate with git", request.getWorkspaceId());
             return null;
@@ -546,7 +546,7 @@ public GitCommitResponse rename(GitRenameRequest request) {
     }
 
     public GitHistoryResponse getHistory(GitCommitInfoBetweenRequest request) {
-        GitUserEntity gitUser = dssWorkspaceGitService.selectGit(request.getWorkspaceId(), GitConstant.GIT_ACCESS_WRITE_TYPE);
+        GitUserEntity gitUser = dssWorkspaceGitService.selectGit(request.getWorkspaceId(), GitConstant.GIT_ACCESS_WRITE_TYPE, true);
         if (gitUser == null) {
             logger.error("the workspace : {} don't associate with git", request.getWorkspaceId());
             return null;
diff --git a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSWorkspaceGitServiceImpl.java b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSWorkspaceGitServiceImpl.java
index 7d6e71fe0..57d6ca916 100644
--- a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSWorkspaceGitServiceImpl.java
+++ b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSWorkspaceGitServiceImpl.java
@@ -29,6 +29,7 @@
 import javax.crypto.spec.SecretKeySpec;
 import java.security.Key;
 import java.util.Arrays;
+import java.util.Base64;
 
 @Service
 public class DSSWorkspaceGitServiceImpl implements DSSWorkspaceGitService {
@@ -46,7 +47,7 @@ public GitUserUpdateResponse associateGit(GitUserUpdateRequest gitUserCreateRequ
         GitUserEntity gitUser = gitUserCreateRequest.getGitUser();
         String userName = gitUserCreateRequest.getUsername();
         // 不存在则更新，存在则新增
-        GitUserEntity oldGitUserDo = selectGit(gitUser.getWorkspaceId(), gitUser.getType());
+        GitUserEntity oldGitUserDo = selectGit(gitUser.getWorkspaceId(), gitUser.getType(), true);
         gitUser.setUpdateBy(userName);
         // 密码 token 加密处理
         if (!StringUtils.isEmpty(gitUser.getGitPassword())) {
@@ -76,19 +77,8 @@ public GitUserInfoResponse selectGitUserInfo(GitUserInfoRequest gitUserInfoReque
         }
         Long workspaceId = gitUserInfoRequest.getWorkspaceId();
         String type = gitUserInfoRequest.getType();
-        GitUserEntity gitUserEntity = selectGit(workspaceId, type);
-        Boolean decrypt = gitUserInfoRequest.getDecrypt();
-        if (decrypt != null && decrypt) {
-            // 密码 token 解密处理
-            if (!StringUtils.isEmpty(gitUserEntity.getGitPassword())) {
-                String encryptPassword = generateKeys(gitUserEntity.getGitPassword(), Cipher.DECRYPT_MODE);
-                gitUserEntity.setGitPassword(encryptPassword);
-            }
-            if (!StringUtils.isEmpty(gitUserEntity.getGitToken())) {
-                String encryptToken = generateKeys(gitUserEntity.getGitToken(), Cipher.DECRYPT_MODE);
-                gitUserEntity.setGitToken(encryptToken);
-            }
-        }
+        GitUserEntity gitUserEntity = selectGit(workspaceId, type, gitUserInfoRequest.getDecrypt());
+
 
         GitUserInfoResponse gitUserInfoResponse = new GitUserInfoResponse();
         gitUserInfoResponse.setGitUser(gitUserEntity);
@@ -96,9 +86,15 @@ public GitUserInfoResponse selectGitUserInfo(GitUserInfoRequest gitUserInfoReque
     }
 
     @Override
-    public GitUserEntity selectGit(Long workspaceId, String type) {
+    public GitUserEntity selectGit(Long workspaceId, String type, Boolean decrypt) {
         try {
             GitUserEntity gitUserEntity = workspaceGitMapper.selectByWorkspaceId(workspaceId, type);
+            if (gitUserEntity == null) {
+                return null;
+            }
+            if (decrypt != null && !decrypt) {
+                return gitUserEntity;
+            }
             // 密码 token 解密处理
             if (!StringUtils.isEmpty(gitUserEntity.getGitPassword())) {
                 String encryptPassword = generateKeys(gitUserEntity.getGitPassword(), Cipher.DECRYPT_MODE);
@@ -120,6 +116,9 @@ private String generateKeys(String password, int mode) throws DSSErrorException{
         if (keyString.length() < 16) {
             throw new DSSErrorException(800001, "密钥长度必须大于16位");
         }
+        if (StringUtils.isEmpty(password)) {
+            throw new DSSErrorException(800001, "密码或token为空");
+        }
         try {
             // 确保密钥长度合适，AES 密钥长度为 128 位 (16 字节)
             byte[] keyBytes = keyString.substring(0, 16).getBytes();
@@ -127,8 +126,14 @@ private String generateKeys(String password, int mode) throws DSSErrorException{
             // 加密Cipher对象
             Cipher encryptCipher = Cipher.getInstance("AES");
             encryptCipher.init(mode, key);
-            byte[] encrypted = encryptCipher.doFinal(password.getBytes());
-            return Arrays.toString(encrypted);
+            if (mode == Cipher.ENCRYPT_MODE) {
+                byte[] encrypted = encryptCipher.doFinal(password.getBytes());
+                return Base64.getEncoder().encodeToString(encrypted);
+            } else {
+                byte[] decode = Base64.getDecoder().decode(password);
+                byte[] encrypted = encryptCipher.doFinal(decode);
+                return new String(encrypted);
+            }
         } catch (Exception e) {
             throw new DSSErrorException(800001, "加密失败");
         }

From d94177c89d582bd0cfc1f5e1110a80b9fb6d1197 Mon Sep 17 00:00:00 2001
From: Zhaobincai <747839893@qq.com>
Date: Mon, 27 May 2024 15:48:10 +0800
Subject: [PATCH 183/302] git-server: workspace

---
 .../dss/git/dao/DSSWorkspaceGitMapper.java          |  2 ++
 .../dss/git/dao/impl/DSSWorkspaceGitMapper.xml      |  6 ++++++
 .../service/impl/DSSWorkspaceGitServiceImpl.java    | 13 +++++++++++++
 3 files changed, 21 insertions(+)

diff --git a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/dao/DSSWorkspaceGitMapper.java b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/dao/DSSWorkspaceGitMapper.java
index 30d2cb180..ffe9ef08a 100644
--- a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/dao/DSSWorkspaceGitMapper.java
+++ b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/dao/DSSWorkspaceGitMapper.java
@@ -12,4 +12,6 @@ public interface DSSWorkspaceGitMapper {
     void update(GitUserEntity gitUserDO);
 
     GitUserEntity selectByWorkspaceId(@Param("workspaceId") Long workspaceId, @Param("type") String type);
+
+    GitUserEntity selectByUser(@Param("gitUser") String gitUser);
 }
diff --git a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/dao/impl/DSSWorkspaceGitMapper.xml b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/dao/impl/DSSWorkspaceGitMapper.xml
index 0941f462e..97cd29825 100644
--- a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/dao/impl/DSSWorkspaceGitMapper.xml
+++ b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/dao/impl/DSSWorkspaceGitMapper.xml
@@ -44,4 +44,10 @@
         from dss_workspace_associate_git
         where workspace_id = #{workspaceId} and `type` = #{type}
     </select>
+
+    <select id="selectByUser" resultType="com.webank.wedatasphere.dss.git.common.protocol.GitUserEntity">
+        select id, workspace_id, git_user, git_token, git_password, git_url, create_time, update_time, create_by, update_by, type
+        from dss_workspace_associate_git
+        where git_user = #{gitUser} and `type` = 'write'
+    </select>
 </mapper>
\ No newline at end of file
diff --git a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSWorkspaceGitServiceImpl.java b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSWorkspaceGitServiceImpl.java
index 57d6ca916..43ed98bd1 100644
--- a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSWorkspaceGitServiceImpl.java
+++ b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSWorkspaceGitServiceImpl.java
@@ -3,6 +3,8 @@
 import com.webank.wedatasphere.dss.common.exception.DSSErrorException;
 import com.webank.wedatasphere.dss.git.common.protocol.GitUserEntity;
 import com.webank.wedatasphere.dss.git.common.protocol.config.GitServerConfig;
+import com.webank.wedatasphere.dss.git.common.protocol.constant.GitConstant;
+import com.webank.wedatasphere.dss.git.common.protocol.exception.GitErrorException;
 import com.webank.wedatasphere.dss.git.common.protocol.request.GitConnectRequest;
 import com.webank.wedatasphere.dss.git.common.protocol.request.GitUserUpdateRequest;
 import com.webank.wedatasphere.dss.git.common.protocol.request.GitUserInfoRequest;
@@ -46,6 +48,14 @@ public GitUserUpdateResponse associateGit(GitUserUpdateRequest gitUserCreateRequ
         }
         GitUserEntity gitUser = gitUserCreateRequest.getGitUser();
         String userName = gitUserCreateRequest.getUsername();
+        // 工作空间--git编辑权限用户 为一一对应关系
+        if (gitUser.getType().equals(GitConstant.GIT_ACCESS_WRITE_TYPE)) {
+            GitUserEntity gitUserEntity = workspaceGitMapper.selectByUser(gitUser.getGitUser());
+            if (gitUserEntity != null) {
+                throw new DSSErrorException(010101, "该用户已配置为" + gitUserEntity.getWorkspaceId() + "工作空间的编辑用户，请更换用户");
+            }
+        }
+
         // 不存在则更新，存在则新增
         GitUserEntity oldGitUserDo = selectGit(gitUser.getWorkspaceId(), gitUser.getType(), true);
         gitUser.setUpdateBy(userName);
@@ -63,6 +73,9 @@ public GitUserUpdateResponse associateGit(GitUserUpdateRequest gitUserCreateRequ
             gitUser.setGitUrl(UrlUtils.normalizeIp(GitServerConfig.GIT_URL_PRE.getValue()));
             workspaceGitMapper.insert(gitUser);
         }else {
+            if (!oldGitUserDo.getGitUser().equals(gitUser.getGitUser())) {
+                throw new DSSErrorException(800001, "用户名不得修改");
+            }
             workspaceGitMapper.update(gitUser);
         }
 

From 5bbd998e819df69610a818a921b5224dd0f5237a Mon Sep 17 00:00:00 2001
From: Zhaobincai <747839893@qq.com>
Date: Mon, 27 May 2024 16:18:27 +0800
Subject: [PATCH 184/302] git-server: fix3 decrypt

---
 .../dss/git/service/impl/DSSWorkspaceGitServiceImpl.java        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSWorkspaceGitServiceImpl.java b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSWorkspaceGitServiceImpl.java
index 43ed98bd1..73459cf75 100644
--- a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSWorkspaceGitServiceImpl.java
+++ b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSWorkspaceGitServiceImpl.java
@@ -105,7 +105,7 @@ public GitUserEntity selectGit(Long workspaceId, String type, Boolean decrypt) {
             if (gitUserEntity == null) {
                 return null;
             }
-            if (decrypt != null && !decrypt) {
+            if (decrypt == null || !decrypt) {
                 return gitUserEntity;
             }
             // 密码 token 解密处理

From 0e2565d02fd0c5527b29a087e63d9b5a37b42764 Mon Sep 17 00:00:00 2001
From: Zhaobincai <747839893@qq.com>
Date: Mon, 27 May 2024 17:22:45 +0800
Subject: [PATCH 185/302] =?UTF-8?q?dss-server:=20=E6=A0=A1=E9=AA=8CGit?=
 =?UTF-8?q?=E6=98=AF=E5=90=A6=E7=BB=91=E5=AE=9A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/DSSFrameworkProjectServiceImpl.java  | 21 ++++++++++++-------
 .../impl/DSSGitProjectManagerServiceImpl.java |  1 -
 .../impl/DSSWorkspaceGitServiceImpl.java      |  1 -
 3 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/dss-framework/dss-framework-project-server/src/main/java/com/webank/wedatasphere/dss/framework/project/service/impl/DSSFrameworkProjectServiceImpl.java b/dss-framework/dss-framework-project-server/src/main/java/com/webank/wedatasphere/dss/framework/project/service/impl/DSSFrameworkProjectServiceImpl.java
index 6a0ae7323..d6787e680 100644
--- a/dss-framework/dss-framework-project-server/src/main/java/com/webank/wedatasphere/dss/framework/project/service/impl/DSSFrameworkProjectServiceImpl.java
+++ b/dss-framework/dss-framework-project-server/src/main/java/com/webank/wedatasphere/dss/framework/project/service/impl/DSSFrameworkProjectServiceImpl.java
@@ -35,14 +35,9 @@
 import com.webank.wedatasphere.dss.framework.project.service.DSSFrameworkProjectService;
 import com.webank.wedatasphere.dss.framework.project.service.DSSProjectService;
 import com.webank.wedatasphere.dss.framework.project.service.DSSProjectUserService;
-import com.webank.wedatasphere.dss.git.common.protocol.request.GitArchiveProjectRequest;
-import com.webank.wedatasphere.dss.git.common.protocol.request.GitCheckProjectRequest;
-import com.webank.wedatasphere.dss.git.common.protocol.request.GitCommitRequest;
-import com.webank.wedatasphere.dss.git.common.protocol.request.GitCreateProjectRequest;
-import com.webank.wedatasphere.dss.git.common.protocol.response.GitArchivePorjectResponse;
-import com.webank.wedatasphere.dss.git.common.protocol.response.GitCheckProjectResponse;
-import com.webank.wedatasphere.dss.git.common.protocol.response.GitCommitResponse;
-import com.webank.wedatasphere.dss.git.common.protocol.response.GitCreateProjectResponse;
+import com.webank.wedatasphere.dss.git.common.protocol.constant.GitConstant;
+import com.webank.wedatasphere.dss.git.common.protocol.request.*;
+import com.webank.wedatasphere.dss.git.common.protocol.response.*;
 import com.webank.wedatasphere.dss.sender.service.DSSSenderServiceFactory;
 import com.webank.wedatasphere.dss.standard.app.sso.Workspace;
 import com.webank.wedatasphere.dss.standard.app.structure.project.*;
@@ -364,6 +359,16 @@ private Map<AppInstance, Long> createAppConnProject(ProjectCreateRequest dssProj
     }
 
     private void checkGitName(String name, Workspace workspace, String username) throws DSSProjectErrorException {
+        // 校验工作空间是否完成Git账号配置
+        Sender sender = DSSSenderServiceFactory.getOrCreateServiceInstance().getGitSender();
+        GitUserInfoRequest gitUserInfoRequest = new GitUserInfoRequest();
+        gitUserInfoRequest.setWorkspaceId(workspace.getWorkspaceId());
+        gitUserInfoRequest.setType(GitConstant.GIT_ACCESS_WRITE_TYPE);
+        GitUserInfoResponse writeInfoResponse = RpcAskUtils.processAskException(sender.ask(gitUserInfoRequest), GitUserInfoResponse.class, GitUserInfoRequest.class);
+        if (writeInfoResponse.getGitUser() == null) {
+            DSSExceptionUtils.dealErrorException(60021,"工作空间管理员未完成Git账号配置", DSSProjectErrorException.class);
+        }
+        // 校验Git名称
         Sender gitSender = DSSSenderServiceFactory.getOrCreateServiceInstance().getGitSender();
         GitCheckProjectRequest request1 = new GitCheckProjectRequest(workspace.getWorkspaceId(), name, username);
         LOGGER.info("-------=======================begin to check project: {}=======================-------", name);
diff --git a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitProjectManagerServiceImpl.java b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitProjectManagerServiceImpl.java
index 5d7379603..c02cf8615 100644
--- a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitProjectManagerServiceImpl.java
+++ b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitProjectManagerServiceImpl.java
@@ -39,7 +39,6 @@ public class DSSGitProjectManagerServiceImpl  implements DSSGitProjectManagerSer
 
     @Override
     public GitCreateProjectResponse create(GitCreateProjectRequest request) {
-        logger.info("-------=======================beginning to create testGit1=======================-------");
         GitUserEntity gitUser = dssWorkspaceGitService.selectGit(request.getWorkspaceId(), GitConstant.GIT_ACCESS_WRITE_TYPE, true);
         if (gitUser == null) {
             logger.error("the workspace : {} don't associate with git", request.getWorkspaceId());
diff --git a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSWorkspaceGitServiceImpl.java b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSWorkspaceGitServiceImpl.java
index 73459cf75..941b04f2a 100644
--- a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSWorkspaceGitServiceImpl.java
+++ b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSWorkspaceGitServiceImpl.java
@@ -4,7 +4,6 @@
 import com.webank.wedatasphere.dss.git.common.protocol.GitUserEntity;
 import com.webank.wedatasphere.dss.git.common.protocol.config.GitServerConfig;
 import com.webank.wedatasphere.dss.git.common.protocol.constant.GitConstant;
-import com.webank.wedatasphere.dss.git.common.protocol.exception.GitErrorException;
 import com.webank.wedatasphere.dss.git.common.protocol.request.GitConnectRequest;
 import com.webank.wedatasphere.dss.git.common.protocol.request.GitUserUpdateRequest;
 import com.webank.wedatasphere.dss.git.common.protocol.request.GitUserInfoRequest;

From c0075e37fa2bddd194ebbd269d0cca095b2a41ce Mon Sep 17 00:00:00 2001
From: v_xuanzhou <zhouxuannihao@qq.com>
Date: Tue, 28 May 2024 10:53:08 +0800
Subject: [PATCH 186/302] =?UTF-8?q?=E5=8D=87=E7=BA=A7=E6=BC=8F=E6=B4=9E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 dss-commons/dss-common/pom.xml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/dss-commons/dss-common/pom.xml b/dss-commons/dss-common/pom.xml
index 667f9fb61..21946dbf4 100644
--- a/dss-commons/dss-common/pom.xml
+++ b/dss-commons/dss-common/pom.xml
@@ -119,6 +119,10 @@
                     <groupId>org.apache.poi</groupId>
                     <artifactId>poi-ooxml-schemas</artifactId>
                 </exclusion>
+                <exclusion>
+                    <groupId>org.apache.poi</groupId>
+                    <artifactId>poi-ooxml</artifactId>
+                </exclusion>
             </exclusions>
         </dependency>
 

From 3fd434e3dd00a4e352a250289d464517079299c4 Mon Sep 17 00:00:00 2001
From: Zhaobincai <747839893@qq.com>
Date: Tue, 28 May 2024 11:49:17 +0800
Subject: [PATCH 187/302] dss-server: add associateGit to workspaces

---
 .../workspace/bean/DSSWorkspace.java          |  8 +++++
 .../service/impl/DSSWorkspaceServiceImpl.java | 20 +++++++++++-
 .../request/GitUserInfoByRequest.java         | 31 +++++++++++++++++++
 .../response/GitUserInfoListResponse.java     | 17 ++++++++++
 .../dss/git/dao/DSSWorkspaceGitMapper.java    |  4 +++
 .../git/dao/impl/DSSWorkspaceGitMapper.xml    | 19 ++++++++++--
 .../git/service/DSSWorkspaceGitService.java   |  4 +++
 .../impl/DSSWorkspaceGitServiceImpl.java      | 17 +++++++---
 .../receiver/DSSGitChooser.scala              |  3 +-
 .../receiver/DSSGitReceiver.scala             |  4 ++-
 10 files changed, 117 insertions(+), 10 deletions(-)
 create mode 100644 dss-git/dss-git-common/src/main/java/com.webank.wedatasphere.dss.git.common/protocol/request/GitUserInfoByRequest.java
 create mode 100644 dss-git/dss-git-common/src/main/java/com.webank.wedatasphere.dss.git.common/protocol/response/GitUserInfoListResponse.java

diff --git a/dss-framework/dss-framework-workspace-server/src/main/java/com/webank/wedatasphere/dss/framework/workspace/bean/DSSWorkspace.java b/dss-framework/dss-framework-workspace-server/src/main/java/com/webank/wedatasphere/dss/framework/workspace/bean/DSSWorkspace.java
index bf9829176..cbc8c6967 100644
--- a/dss-framework/dss-framework-workspace-server/src/main/java/com/webank/wedatasphere/dss/framework/workspace/bean/DSSWorkspace.java
+++ b/dss-framework/dss-framework-workspace-server/src/main/java/com/webank/wedatasphere/dss/framework/workspace/bean/DSSWorkspace.java
@@ -33,6 +33,7 @@ public class DSSWorkspace {
     private String lastUpdateUser;
     private String workspaceType;
     private int adminPermission;
+    private Boolean associateGit;
 
     public int getAdminPermission() {
         return adminPermission;
@@ -139,4 +140,11 @@ public void setLastUpdateUser(String lastUpdateUser) {
     }
 
 
+    public Boolean getAssociateGit() {
+        return associateGit;
+    }
+
+    public void setAssociateGit(Boolean associateGit) {
+        this.associateGit = associateGit;
+    }
 }
diff --git a/dss-framework/dss-framework-workspace-server/src/main/java/com/webank/wedatasphere/dss/framework/workspace/service/impl/DSSWorkspaceServiceImpl.java b/dss-framework/dss-framework-workspace-server/src/main/java/com/webank/wedatasphere/dss/framework/workspace/service/impl/DSSWorkspaceServiceImpl.java
index e0497e22a..353512c0b 100644
--- a/dss-framework/dss-framework-workspace-server/src/main/java/com/webank/wedatasphere/dss/framework/workspace/service/impl/DSSWorkspaceServiceImpl.java
+++ b/dss-framework/dss-framework-workspace-server/src/main/java/com/webank/wedatasphere/dss/framework/workspace/service/impl/DSSWorkspaceServiceImpl.java
@@ -25,6 +25,7 @@
 import com.webank.wedatasphere.dss.appconn.manager.utils.AppInstanceConstants;
 import com.webank.wedatasphere.dss.common.exception.DSSErrorException;
 import com.webank.wedatasphere.dss.common.label.EnvDSSLabel;
+import com.webank.wedatasphere.dss.common.utils.RpcAskUtils;
 import com.webank.wedatasphere.dss.framework.admin.conf.AdminConf;
 import com.webank.wedatasphere.dss.framework.admin.service.DssAdminUserService;
 import com.webank.wedatasphere.dss.framework.common.exception.DSSFrameworkWarnException;
@@ -45,6 +46,11 @@
 import com.webank.wedatasphere.dss.framework.workspace.util.DSSWorkspaceConstant;
 import com.webank.wedatasphere.dss.framework.workspace.util.WorkspaceDBHelper;
 import com.webank.wedatasphere.dss.framework.workspace.util.WorkspaceServerConstant;
+import com.webank.wedatasphere.dss.git.common.protocol.GitUserEntity;
+import com.webank.wedatasphere.dss.git.common.protocol.constant.GitConstant;
+import com.webank.wedatasphere.dss.git.common.protocol.request.GitUserInfoByRequest;
+import com.webank.wedatasphere.dss.git.common.protocol.response.GitUserInfoListResponse;
+import com.webank.wedatasphere.dss.sender.service.DSSSenderServiceFactory;
 import com.webank.wedatasphere.dss.standard.app.sso.Workspace;
 import com.webank.wedatasphere.dss.standard.app.sso.builder.SSOUrlBuilderOperation;
 import com.webank.wedatasphere.dss.standard.common.desc.AppInstance;
@@ -53,7 +59,7 @@
 import org.apache.commons.lang.ArrayUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.linkis.common.exception.ErrorException;
-import org.apache.linkis.protocol.util.ImmutablePair;
+import org.apache.linkis.rpc.Sender;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -143,6 +149,18 @@ private void setAllRolesToWorkspaceCreator(int workspaceId, String userName) {
     @Override
     public List<DSSWorkspace> getWorkspaces(String userName) {
         List<DSSWorkspace> workspaces = dssWorkspaceMapper.getWorkspaces(userName);
+        GitUserInfoByRequest typeRequest = new GitUserInfoByRequest();
+        typeRequest.setType(GitConstant.GIT_ACCESS_WRITE_TYPE);
+        Sender gitSender = DSSSenderServiceFactory.getOrCreateServiceInstance().getGitSender();
+        GitUserInfoListResponse userInfoListResponse = RpcAskUtils.processAskException(gitSender.ask(typeRequest), GitUserInfoListResponse.class, GitUserInfoByRequest.class);
+        if (userInfoListResponse.getGitUserEntities() != null) {
+            List<GitUserEntity> gitUserEntities = userInfoListResponse.getGitUserEntities();
+            Set<Long> collect = gitUserEntities.stream().map(GitUserEntity::getWorkspaceId).collect(Collectors.toSet());
+            for (DSSWorkspace workspace : workspaces) {
+                long workspaceId = workspace.getId();
+                workspace.setAssociateGit(collect.contains(workspaceId));
+            }
+        }
         //用于展示demo的工作空间是不应该返回的,除非用户是管理员
         if (dssWorkspaceUserMapper.isAdmin(userName) == 1) {
             return workspaces;
diff --git a/dss-git/dss-git-common/src/main/java/com.webank.wedatasphere.dss.git.common/protocol/request/GitUserInfoByRequest.java b/dss-git/dss-git-common/src/main/java/com.webank.wedatasphere.dss.git.common/protocol/request/GitUserInfoByRequest.java
new file mode 100644
index 000000000..7f9c94b73
--- /dev/null
+++ b/dss-git/dss-git-common/src/main/java/com.webank.wedatasphere.dss.git.common/protocol/request/GitUserInfoByRequest.java
@@ -0,0 +1,31 @@
+package com.webank.wedatasphere.dss.git.common.protocol.request;
+
+public class GitUserInfoByRequest {
+    private String type;
+    private Long workspaceId;
+    private String gitUserName;
+
+    public String getType() {
+        return type;
+    }
+
+    public void setType(String type) {
+        this.type = type;
+    }
+
+    public Long getWorkspaceId() {
+        return workspaceId;
+    }
+
+    public void setWorkspaceId(Long workspaceId) {
+        this.workspaceId = workspaceId;
+    }
+
+    public String getGitUserName() {
+        return gitUserName;
+    }
+
+    public void setGitUserName(String gitUserName) {
+        this.gitUserName = gitUserName;
+    }
+}
diff --git a/dss-git/dss-git-common/src/main/java/com.webank.wedatasphere.dss.git.common/protocol/response/GitUserInfoListResponse.java b/dss-git/dss-git-common/src/main/java/com.webank.wedatasphere.dss.git.common/protocol/response/GitUserInfoListResponse.java
new file mode 100644
index 000000000..c7152173b
--- /dev/null
+++ b/dss-git/dss-git-common/src/main/java/com.webank.wedatasphere.dss.git.common/protocol/response/GitUserInfoListResponse.java
@@ -0,0 +1,17 @@
+package com.webank.wedatasphere.dss.git.common.protocol.response;
+
+import com.webank.wedatasphere.dss.git.common.protocol.GitUserEntity;
+
+import java.util.List;
+
+public class GitUserInfoListResponse {
+    private List<GitUserEntity> gitUserEntities;
+
+    public List<GitUserEntity> getGitUserEntities() {
+        return gitUserEntities;
+    }
+
+    public void setGitUserEntities(List<GitUserEntity> gitUserEntities) {
+        this.gitUserEntities = gitUserEntities;
+    }
+}
diff --git a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/dao/DSSWorkspaceGitMapper.java b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/dao/DSSWorkspaceGitMapper.java
index ffe9ef08a..b2a7af368 100644
--- a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/dao/DSSWorkspaceGitMapper.java
+++ b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/dao/DSSWorkspaceGitMapper.java
@@ -5,6 +5,8 @@
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 @Mapper
 public interface DSSWorkspaceGitMapper {
     void insert(GitUserEntity gitUserDO);
@@ -14,4 +16,6 @@ public interface DSSWorkspaceGitMapper {
     GitUserEntity selectByWorkspaceId(@Param("workspaceId") Long workspaceId, @Param("type") String type);
 
     GitUserEntity selectByUser(@Param("gitUser") String gitUser);
+
+    List<GitUserEntity> selectGitUser(@Param("workspaceId") Long workspaceId, @Param("type") String type, @Param("gitUser") String gitUser);
 }
diff --git a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/dao/impl/DSSWorkspaceGitMapper.xml b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/dao/impl/DSSWorkspaceGitMapper.xml
index 97cd29825..0e172bd15 100644
--- a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/dao/impl/DSSWorkspaceGitMapper.xml
+++ b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/dao/impl/DSSWorkspaceGitMapper.xml
@@ -42,12 +42,27 @@
     <select id="selectByWorkspaceId" resultType="com.webank.wedatasphere.dss.git.common.protocol.GitUserEntity">
         select id, workspace_id, git_user, git_token, git_password, git_url, create_time, update_time, create_by, update_by, type
         from dss_workspace_associate_git
-        where workspace_id = #{workspaceId} and `type` = #{type}
+        where workspace_id = #{workspaceId} and `type` = #{type} limit 1
     </select>
 
     <select id="selectByUser" resultType="com.webank.wedatasphere.dss.git.common.protocol.GitUserEntity">
         select id, workspace_id, git_user, git_token, git_password, git_url, create_time, update_time, create_by, update_by, type
         from dss_workspace_associate_git
-        where git_user = #{gitUser} and `type` = 'write'
+        where git_user = #{gitUser} and `type` = 'write' limit 1
+    </select>
+
+    <select id="selectGitUser" resultType="com.webank.wedatasphere.dss.git.common.protocol.GitUserEntity">
+        select id, workspace_id, git_user, git_token, git_password, git_url, create_time, update_time, create_by, update_by, type
+        from dss_workspace_associate_git
+        where 1=1
+        <if test="workspaceId != null">
+            and workspace_id = #{workspaceId}
+        </if>
+        <if test="type != null" >
+            and `type` = #{type}
+        </if>
+        <if test="gitUser != null" >
+            and git_user = #{gitUser}
+        </if>
     </select>
 </mapper>
\ No newline at end of file
diff --git a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/DSSWorkspaceGitService.java b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/DSSWorkspaceGitService.java
index f52c81629..cc49272e0 100644
--- a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/DSSWorkspaceGitService.java
+++ b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/DSSWorkspaceGitService.java
@@ -3,9 +3,11 @@
 import com.webank.wedatasphere.dss.common.exception.DSSErrorException;
 import com.webank.wedatasphere.dss.git.common.protocol.GitUserEntity;
 import com.webank.wedatasphere.dss.git.common.protocol.request.GitConnectRequest;
+import com.webank.wedatasphere.dss.git.common.protocol.request.GitUserInfoByRequest;
 import com.webank.wedatasphere.dss.git.common.protocol.request.GitUserUpdateRequest;
 import com.webank.wedatasphere.dss.git.common.protocol.request.GitUserInfoRequest;
 import com.webank.wedatasphere.dss.git.common.protocol.response.GitConnectResponse;
+import com.webank.wedatasphere.dss.git.common.protocol.response.GitUserInfoListResponse;
 import com.webank.wedatasphere.dss.git.common.protocol.response.GitUserUpdateResponse;
 import com.webank.wedatasphere.dss.git.common.protocol.response.GitUserInfoResponse;
 
@@ -18,4 +20,6 @@ public interface DSSWorkspaceGitService {
     GitUserEntity selectGit(Long workspaceId, String type, Boolean decrypt);
 
     GitConnectResponse gitTokenTest(GitConnectRequest connectTestRequest) throws DSSErrorException;
+
+    GitUserInfoListResponse getGitUserByType(GitUserInfoByRequest typeRequest);
 }
diff --git a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSWorkspaceGitServiceImpl.java b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSWorkspaceGitServiceImpl.java
index 941b04f2a..916f928d6 100644
--- a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSWorkspaceGitServiceImpl.java
+++ b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSWorkspaceGitServiceImpl.java
@@ -5,9 +5,11 @@
 import com.webank.wedatasphere.dss.git.common.protocol.config.GitServerConfig;
 import com.webank.wedatasphere.dss.git.common.protocol.constant.GitConstant;
 import com.webank.wedatasphere.dss.git.common.protocol.request.GitConnectRequest;
+import com.webank.wedatasphere.dss.git.common.protocol.request.GitUserInfoByRequest;
 import com.webank.wedatasphere.dss.git.common.protocol.request.GitUserUpdateRequest;
 import com.webank.wedatasphere.dss.git.common.protocol.request.GitUserInfoRequest;
 import com.webank.wedatasphere.dss.git.common.protocol.response.GitConnectResponse;
+import com.webank.wedatasphere.dss.git.common.protocol.response.GitUserInfoListResponse;
 import com.webank.wedatasphere.dss.git.common.protocol.response.GitUserUpdateResponse;
 import com.webank.wedatasphere.dss.git.common.protocol.response.GitUserInfoResponse;
 import com.webank.wedatasphere.dss.git.common.protocol.util.UrlUtils;
@@ -29,8 +31,8 @@
 import javax.crypto.Cipher;
 import javax.crypto.spec.SecretKeySpec;
 import java.security.Key;
-import java.util.Arrays;
 import java.util.Base64;
+import java.util.List;
 
 @Service
 public class DSSWorkspaceGitServiceImpl implements DSSWorkspaceGitService {
@@ -50,7 +52,7 @@ public GitUserUpdateResponse associateGit(GitUserUpdateRequest gitUserCreateRequ
         // 工作空间--git编辑权限用户 为一一对应关系
         if (gitUser.getType().equals(GitConstant.GIT_ACCESS_WRITE_TYPE)) {
             GitUserEntity gitUserEntity = workspaceGitMapper.selectByUser(gitUser.getGitUser());
-            if (gitUserEntity != null) {
+            if (gitUserEntity != null && !gitUserEntity.getWorkspaceId().equals(gitUser.getWorkspaceId())) {
                 throw new DSSErrorException(010101, "该用户已配置为" + gitUserEntity.getWorkspaceId() + "工作空间的编辑用户，请更换用户");
             }
         }
@@ -104,9 +106,6 @@ public GitUserEntity selectGit(Long workspaceId, String type, Boolean decrypt) {
             if (gitUserEntity == null) {
                 return null;
             }
-            if (decrypt == null || !decrypt) {
-                return gitUserEntity;
-            }
             // 密码 token 解密处理
             if (!StringUtils.isEmpty(gitUserEntity.getGitPassword())) {
                 String encryptPassword = generateKeys(gitUserEntity.getGitPassword(), Cipher.DECRYPT_MODE);
@@ -184,4 +183,12 @@ public GitConnectResponse gitTokenTest(GitConnectRequest connectTestRequest)thro
         }
     }
 
+    @Override
+    public GitUserInfoListResponse getGitUserByType(GitUserInfoByRequest infoByRequest) {
+        List<GitUserEntity> gitUserEntities = workspaceGitMapper.selectGitUser(infoByRequest.getWorkspaceId(), infoByRequest.getType(), infoByRequest.getGitUserName());
+        GitUserInfoListResponse gitUserInfoListResponse = new GitUserInfoListResponse();
+        gitUserInfoListResponse.setGitUserEntities(gitUserEntities);
+        return gitUserInfoListResponse;
+    }
+
 }
diff --git a/dss-git/dss-git-server/src/main/scala/com.webank.wedatasphere.dss.git/receiver/DSSGitChooser.scala b/dss-git/dss-git-server/src/main/scala/com.webank.wedatasphere.dss.git/receiver/DSSGitChooser.scala
index 2d263bea3..e138b4b87 100644
--- a/dss-git/dss-git-server/src/main/scala/com.webank.wedatasphere.dss.git/receiver/DSSGitChooser.scala
+++ b/dss-git/dss-git-server/src/main/scala/com.webank.wedatasphere.dss.git/receiver/DSSGitChooser.scala
@@ -16,7 +16,7 @@
 
 package com.webank.wedatasphere.dss.git.receiver
 
-import com.webank.wedatasphere.dss.git.common.protocol.request.{GitArchiveProjectRequest, GitBaseRequest, GitCheckProjectRequest, GitCommitRequest, GitConnectRequest, GitCreateProjectRequest, GitCurrentCommitRequest, GitDeleteRequest, GitDiffRequest, GitFileContentRequest, GitHistoryRequest, GitRemoveRequest, GitRenameRequest, GitRevertRequest, GitSearchRequest, GitUserInfoRequest, GitUserUpdateRequest}
+import com.webank.wedatasphere.dss.git.common.protocol.request.{GitArchiveProjectRequest, GitBaseRequest, GitCheckProjectRequest, GitCommitRequest, GitConnectRequest, GitCreateProjectRequest, GitCurrentCommitRequest, GitDeleteRequest, GitDiffRequest, GitFileContentRequest, GitHistoryRequest, GitRemoveRequest, GitRenameRequest, GitRevertRequest, GitSearchRequest, GitUserInfoByRequest, GitUserInfoRequest, GitUserUpdateRequest}
 import com.webank.wedatasphere.dss.git.service.{DSSGitProjectManagerService, DSSGitWorkflowManagerService, DSSWorkspaceGitService}
 
 import javax.annotation.PostConstruct
@@ -59,6 +59,7 @@ class DSSGitChooser extends ReceiverChooser {
     case _: GitRemoveRequest => receiver
     case _: GitRenameRequest => receiver
     case _: GitConnectRequest => receiver
+    case _: GitUserInfoByRequest => receiver
     case _ => None
   }
 }
\ No newline at end of file
diff --git a/dss-git/dss-git-server/src/main/scala/com.webank.wedatasphere.dss.git/receiver/DSSGitReceiver.scala b/dss-git/dss-git-server/src/main/scala/com.webank.wedatasphere.dss.git/receiver/DSSGitReceiver.scala
index 0dd1e4255..9cdef09c6 100644
--- a/dss-git/dss-git-server/src/main/scala/com.webank.wedatasphere.dss.git/receiver/DSSGitReceiver.scala
+++ b/dss-git/dss-git-server/src/main/scala/com.webank.wedatasphere.dss.git/receiver/DSSGitReceiver.scala
@@ -16,7 +16,7 @@
 
 package com.webank.wedatasphere.dss.git.receiver
 
-import com.webank.wedatasphere.dss.git.common.protocol.request.{GitArchiveProjectRequest, GitCheckProjectRequest, GitCommitRequest, GitConnectRequest, GitCreateProjectRequest, GitCurrentCommitRequest, GitDeleteRequest, GitDiffRequest, GitFileContentRequest, GitHistoryRequest, GitRemoveRequest, GitRenameRequest, GitRevertRequest, GitSearchRequest, GitUserInfoRequest, GitUserUpdateRequest}
+import com.webank.wedatasphere.dss.git.common.protocol.request.{GitArchiveProjectRequest, GitCheckProjectRequest, GitCommitRequest, GitConnectRequest, GitCreateProjectRequest, GitCurrentCommitRequest, GitDeleteRequest, GitDiffRequest, GitFileContentRequest, GitHistoryRequest, GitRemoveRequest, GitRenameRequest, GitRevertRequest, GitSearchRequest, GitUserInfoByRequest, GitUserInfoRequest, GitUserUpdateRequest}
 import com.webank.wedatasphere.dss.git.service.{DSSGitProjectManagerService, DSSGitWorkflowManagerService, DSSWorkspaceGitService}
 import org.apache.linkis.rpc.{Receiver, Sender}
 import org.slf4j.{Logger, LoggerFactory}
@@ -63,6 +63,8 @@ class DSSGitReceiver(gitProjectManagerService: DSSGitProjectManagerService, gitW
       gitWorkflowManagerService.rename(gitRenameRequest)
     case gitConnectTestRequest: GitConnectRequest =>
       workspaceGitService.gitTokenTest(gitConnectTestRequest)
+    case gitUserInfoByTypeRequest: GitUserInfoByRequest =>
+      workspaceGitService.getGitUserByType(gitUserInfoByTypeRequest)
     case _ => None
   }
 

From 6fbcef93dceef87a4aa07f25b28882d9e2513101 Mon Sep 17 00:00:00 2001
From: v_xuanzhou <zhouxuannihao@qq.com>
Date: Tue, 28 May 2024 15:48:15 +0800
Subject: [PATCH 188/302] =?UTF-8?q?=E5=8F=96=E6=B6=88poi-ooxml=E6=8E=92?=
 =?UTF-8?q?=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 dss-commons/dss-common/pom.xml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/dss-commons/dss-common/pom.xml b/dss-commons/dss-common/pom.xml
index 21946dbf4..667f9fb61 100644
--- a/dss-commons/dss-common/pom.xml
+++ b/dss-commons/dss-common/pom.xml
@@ -119,10 +119,6 @@
                     <groupId>org.apache.poi</groupId>
                     <artifactId>poi-ooxml-schemas</artifactId>
                 </exclusion>
-                <exclusion>
-                    <groupId>org.apache.poi</groupId>
-                    <artifactId>poi-ooxml</artifactId>
-                </exclusion>
             </exclusions>
         </dependency>
 

From e1ae3618e2dc1a982be9aa5bb8463ae726997530 Mon Sep 17 00:00:00 2001
From: Zhaobincai <747839893@qq.com>
Date: Tue, 28 May 2024 16:33:08 +0800
Subject: [PATCH 189/302] dss-server: fix

---
 .../webank/wedatasphere/dss/git/utils/DSSGitUtils.java   | 2 +-
 .../dss/workflow/service/impl/DSSFlowServiceImpl.java    | 9 +++++++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/utils/DSSGitUtils.java b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/utils/DSSGitUtils.java
index 1921634fb..1ff084b57 100644
--- a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/utils/DSSGitUtils.java
+++ b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/utils/DSSGitUtils.java
@@ -51,7 +51,7 @@ public class DSSGitUtils {
     private static final Logger logger = LoggerFactory.getLogger(DSSGitUtils.class);
 
     public static void init(String projectName, GitUserEntity gitUserDO) throws Exception, GitErrorException{
-        if (checkProjectName(projectName, gitUserDO)) {
+        if (!checkProjectName(projectName, gitUserDO)) {
             try {
                 URL url = new URL(UrlUtils.normalizeIp(gitUserDO.getGitUrl()) + "/" +GitServerConfig.GIT_RESTFUL_API_CREATE_PROJECTS.getValue());
                 HttpURLConnection connection = (HttpURLConnection) url.openConnection();
diff --git a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/service/impl/DSSFlowServiceImpl.java b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/service/impl/DSSFlowServiceImpl.java
index 9768f2a57..c5c7c53cc 100644
--- a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/service/impl/DSSFlowServiceImpl.java
+++ b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/service/impl/DSSFlowServiceImpl.java
@@ -293,6 +293,7 @@ public String saveFlow(Long flowID,
         String flowJsonOld = getFlowJson(userName, projectName, dssFlow);
         if (isEqualTwoJson(flowJsonOld, jsonFlow)) {
             logger.info("saveFlow is not change");
+            updateTOSaveStatus(dssFlow);
             return dssFlow.getBmlVersion();
         } else {
             logger.info("saveFlow is change");
@@ -324,11 +325,16 @@ public String saveFlow(Long flowID,
         }
         saveFlowHook.afterSave(jsonFlow,dssFlow,parentFlowID);
         String version = bmlReturnMap.get("version").toString();
+        updateTOSaveStatus(dssFlow);
+        return version;
+    }
+
+    private void updateTOSaveStatus(DSSFlow dssFlow) {
         try {
             DSSProject projectInfo = DSSFlowEditLockManager.getProjectInfo(dssFlow.getProjectId());
             //仅对接入Git的项目 更新状态为 保存
             if (projectInfo.getAssociateGit() != null && projectInfo.getAssociateGit()) {
-                OrchestratorVo orchestratorVo = RpcAskUtils.processAskException(getOrchestratorSender().ask(new RequestQuertByAppIdOrchestrator(flowID)),
+                OrchestratorVo orchestratorVo = RpcAskUtils.processAskException(getOrchestratorSender().ask(new RequestQuertByAppIdOrchestrator(dssFlow.getId())),
                         OrchestratorVo.class, RequestQueryByIdOrchestrator.class);
                 lockMapper.updateOrchestratorStatus(orchestratorVo.getDssOrchestratorInfo().getId(), OrchestratorRefConstant.FLOW_STATUS_SAVE);
             }
@@ -336,7 +342,6 @@ public String saveFlow(Long flowID,
             logger.error("getProjectInfo failed by:", e);
             throw new DSSRuntimeException(e.getErrCode(),"更新工作流状态失败，您可以尝试重新保存工作流！原因：" + ExceptionUtils.getRootCauseMessage(e),e);
         }
-        return version;
     }
 
     /**

From e9e0d5447a3ac77d85cf4d485c3b3584fc807fac Mon Sep 17 00:00:00 2001
From: Zhaobincai <747839893@qq.com>
Date: Tue, 28 May 2024 22:08:53 +0800
Subject: [PATCH 190/302] dss-server: fix createProject

---
 .../impl/DSSFrameworkProjectServiceImpl.java  | 37 +++++++++++--------
 1 file changed, 21 insertions(+), 16 deletions(-)

diff --git a/dss-framework/dss-framework-project-server/src/main/java/com/webank/wedatasphere/dss/framework/project/service/impl/DSSFrameworkProjectServiceImpl.java b/dss-framework/dss-framework-project-server/src/main/java/com/webank/wedatasphere/dss/framework/project/service/impl/DSSFrameworkProjectServiceImpl.java
index d6787e680..c20e49036 100644
--- a/dss-framework/dss-framework-project-server/src/main/java/com/webank/wedatasphere/dss/framework/project/service/impl/DSSFrameworkProjectServiceImpl.java
+++ b/dss-framework/dss-framework-project-server/src/main/java/com/webank/wedatasphere/dss/framework/project/service/impl/DSSFrameworkProjectServiceImpl.java
@@ -27,7 +27,6 @@
 import com.webank.wedatasphere.dss.framework.project.entity.DSSProjectUser;
 import com.webank.wedatasphere.dss.framework.project.entity.request.ExportAllOrchestratorsReqest;
 import com.webank.wedatasphere.dss.framework.project.entity.request.ProjectCreateRequest;
-import com.webank.wedatasphere.dss.framework.project.entity.request.ProjectDeleteRequest;
 import com.webank.wedatasphere.dss.framework.project.entity.request.ProjectModifyRequest;
 import com.webank.wedatasphere.dss.framework.project.entity.vo.DSSProjectDetailVo;
 import com.webank.wedatasphere.dss.framework.project.entity.vo.DSSProjectVo;
@@ -49,7 +48,6 @@
 import com.webank.wedatasphere.dss.standard.common.desc.AppInstance;
 import com.webank.wedatasphere.dss.standard.common.exception.operation.ExternalOperationFailedException;
 import org.apache.commons.collections4.CollectionUtils;
-import org.apache.commons.io.FileUtils;
 import org.apache.commons.lang.StringUtils;
 import org.apache.commons.lang.exception.ExceptionUtils;
 import org.apache.linkis.common.conf.CommonVars;
@@ -62,8 +60,6 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.io.File;
-import java.io.InputStream;
 import java.util.*;
 import java.util.function.BiFunction;
 import java.util.function.Function;
@@ -123,7 +119,7 @@ public DSSProjectVo createProject(ProjectCreateRequest projectCreateRequest, Str
             exportAllOrchestratorsReqest.setComment("test");
             exportAllOrchestratorsReqest.setLabels(DSSCommonUtils.ENV_LABEL_VALUE_DEV);
             BmlResource bmlResource = dssProjectService.exportProject(exportAllOrchestratorsReqest, username, "", workspace);
-            createProject(workspace.getWorkspaceId(), project.getName(), bmlResource, username);
+            createGitProject(workspace.getWorkspaceId(), project.getName(), bmlResource, username);
         }
         //4.保存dss_project_user 工程与用户关系
         projectUserService.saveProjectUser(project.getId(), username, projectCreateRequest, workspace);
@@ -138,7 +134,7 @@ public DSSProjectVo createProject(ProjectCreateRequest projectCreateRequest, Str
         return dssProjectVo;
     }
 
-    private void createProject(Long workspaceId, String projectName, BmlResource bmlResource,String username) {
+    private void createGitProject(Long workspaceId, String projectName, BmlResource bmlResource, String username) {
         Sender gitSender = DSSSenderServiceFactory.getOrCreateServiceInstance().getGitSender();
         GitCreateProjectRequest request1 = new GitCreateProjectRequest(workspaceId, projectName, bmlResource, username);
         LOGGER.info("-------=======================begin to create project: {}=======================-------", projectName);
@@ -207,14 +203,23 @@ public void modifyProject(ProjectModifyRequest projectModifyRequest, DSSProjectD
         DSSProjectDO dssProjectDO = dssProjectService.modifyProject(username, projectModifyRequest);
 
         // 同步项目配置元数据到git
-        if (projectModifyRequest.getAssociateGit() != null) {
-            ExportAllOrchestratorsReqest exportAllOrchestratorsReqest = new ExportAllOrchestratorsReqest();
-            exportAllOrchestratorsReqest.setProjectId(dbProject.getId());
-            exportAllOrchestratorsReqest.setComment("update Project");
-            exportAllOrchestratorsReqest.setLabels(DSSCommonUtils.ENV_LABEL_VALUE_DEV);
-
-            BmlResource bmlResource = dssProjectService.exportOnlyProjectMeta(exportAllOrchestratorsReqest, username, "", workspace);
-            updateProject(workspace.getWorkspaceId(), dbProject.getName(), bmlResource, username);
+        if (projectModifyRequest.getAssociateGit() != null && projectModifyRequest.getAssociateGit()) {
+            if ((dbProject.getAssociateGit() == null || !dbProject.getAssociateGit()) && projectModifyRequest.getAssociateGit()!= null && projectModifyRequest.getAssociateGit()) {
+                ExportAllOrchestratorsReqest exportAllOrchestratorsReqest = new ExportAllOrchestratorsReqest();
+                exportAllOrchestratorsReqest.setProjectId(dbProject.getId());
+                exportAllOrchestratorsReqest.setComment("test");
+                exportAllOrchestratorsReqest.setLabels(DSSCommonUtils.ENV_LABEL_VALUE_DEV);
+                BmlResource bmlResource = dssProjectService.exportProject(exportAllOrchestratorsReqest, username, "", workspace);
+                createGitProject(workspace.getWorkspaceId(), dbProject.getName(), bmlResource, username);
+            } else {
+                ExportAllOrchestratorsReqest exportAllOrchestratorsReqest = new ExportAllOrchestratorsReqest();
+                exportAllOrchestratorsReqest.setProjectId(dbProject.getId());
+                exportAllOrchestratorsReqest.setComment("update Project");
+                exportAllOrchestratorsReqest.setLabels(DSSCommonUtils.ENV_LABEL_VALUE_DEV);
+
+                BmlResource bmlResource = dssProjectService.exportOnlyProjectMeta(exportAllOrchestratorsReqest, username, "", workspace);
+                updateProject(workspace.getWorkspaceId(), dbProject.getName(), bmlResource, username);
+            }
         }
     }
 
@@ -398,8 +403,8 @@ private void checkAssociateGit(ProjectModifyRequest projectModifyRequest, DSSPro
         if (dbProject.getAssociateGit()!=null && dbProject.getAssociateGit() && !projectModifyRequest.getAssociateGit()) {
             throw new DSSProjectErrorException(71000, "项目接入git后无法取消");
         }
-        // 对于首次接入git的项目需要校验项目名称并且进行git初始化
-        if ((dbProject.getAssociateGit() == null || !dbProject.getAssociateGit()) && projectModifyRequest.getAssociateGit() && projectModifyRequest.getAssociateGit()!= null && projectModifyRequest.getAssociateGit()) {
+        // 对于首次接入git的项目需要校验项目名称
+        if ((dbProject.getAssociateGit() == null || !dbProject.getAssociateGit()) && projectModifyRequest.getAssociateGit()!= null && projectModifyRequest.getAssociateGit()) {
             checkGitName(projectModifyRequest.getName(), workspace, username);
         }
     }

From ffc08183e97dc46466b99879b97c6b7c52601425 Mon Sep 17 00:00:00 2001
From: v_xuanzhou <zhouxuannihao@qq.com>
Date: Wed, 29 May 2024 10:27:00 +0800
Subject: [PATCH 191/302] dss-server:fix getAllWorkspaceUsersDepartment

---
 .../vo/DSSWorkspaceUsersDepartmentVo.java     | 33 ++++---------------
 .../service/DSSWorkspaceUserService.java      |  3 +-
 .../impl/DSSWorkspaceUserServiceImpl.java     | 13 ++++++--
 3 files changed, 20 insertions(+), 29 deletions(-)

diff --git a/dss-framework/dss-framework-workspace-server/src/main/java/com/webank/wedatasphere/dss/framework/workspace/bean/vo/DSSWorkspaceUsersDepartmentVo.java b/dss-framework/dss-framework-workspace-server/src/main/java/com/webank/wedatasphere/dss/framework/workspace/bean/vo/DSSWorkspaceUsersDepartmentVo.java
index 93a73bbf6..524bca464 100644
--- a/dss-framework/dss-framework-workspace-server/src/main/java/com/webank/wedatasphere/dss/framework/workspace/bean/vo/DSSWorkspaceUsersDepartmentVo.java
+++ b/dss-framework/dss-framework-workspace-server/src/main/java/com/webank/wedatasphere/dss/framework/workspace/bean/vo/DSSWorkspaceUsersDepartmentVo.java
@@ -1,38 +1,19 @@
 package com.webank.wedatasphere.dss.framework.workspace.bean.vo;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.List;
-
+import java.util.Map;
+@Data
 public class DSSWorkspaceUsersDepartmentVo implements Serializable {
 
     private static final long serialVersionUID=1L;
-    private List<DepartmentUserVo> editUsers;
-
-    private List<DepartmentUserVo> accessUsers;
-
-    private List<DepartmentUserVo> releaseUsers;
-
-    public void setAccessUsers(List<DepartmentUserVo> accessUsers) {
-        this.accessUsers = accessUsers;
-    }
-
-    public void setReleaseUsers(List<DepartmentUserVo> releaseUsers) {
-        this.releaseUsers = releaseUsers;
-    }
+    private Map<String, Map<String, List<String>>> editUsers;
 
-    public void setEditUsers(List<DepartmentUserVo> editUsers) {
-        this.editUsers = editUsers;
-    }
+    private Map<String, Map<String, List<String>>> accessUsers;
 
-    public List<DepartmentUserVo> getEditUsers() {
-        return editUsers;
-    }
+    private Map<String, Map<String, List<String>>> releaseUsers;
 
-    public List<DepartmentUserVo> getAccessUsers() {
-        return accessUsers;
-    }
 
-    public List<DepartmentUserVo> getReleaseUsers() {
-        return releaseUsers;
-    }
 }
diff --git a/dss-framework/dss-framework-workspace-server/src/main/java/com/webank/wedatasphere/dss/framework/workspace/service/DSSWorkspaceUserService.java b/dss-framework/dss-framework-workspace-server/src/main/java/com/webank/wedatasphere/dss/framework/workspace/service/DSSWorkspaceUserService.java
index 1d87c12df..c50518491 100644
--- a/dss-framework/dss-framework-workspace-server/src/main/java/com/webank/wedatasphere/dss/framework/workspace/service/DSSWorkspaceUserService.java
+++ b/dss-framework/dss-framework-workspace-server/src/main/java/com/webank/wedatasphere/dss/framework/workspace/service/DSSWorkspaceUserService.java
@@ -23,6 +23,7 @@
 import com.webank.wedatasphere.dss.framework.workspace.bean.vo.StaffInfoVO;
 
 import java.util.List;
+import java.util.Map;
 
 
 public interface DSSWorkspaceUserService {
@@ -52,7 +53,7 @@ public interface DSSWorkspaceUserService {
 
     List<String> getAllWorkspaceUsers(long workspaceId);
 
-    List<DepartmentUserVo> getAllWorkspaceUsersDepartment(long workspaceId) ;
+    Map<String, Map<String, List<String>>> getAllWorkspaceUsersDepartment(long workspaceId) ;
 
     PageInfo<String> getAllWorkspaceUsersPage(long workspaceId, Integer pageNow, Integer pageSize);
 
diff --git a/dss-framework/dss-framework-workspace-server/src/main/java/com/webank/wedatasphere/dss/framework/workspace/service/impl/DSSWorkspaceUserServiceImpl.java b/dss-framework/dss-framework-workspace-server/src/main/java/com/webank/wedatasphere/dss/framework/workspace/service/impl/DSSWorkspaceUserServiceImpl.java
index 139bbb321..6e8763f54 100644
--- a/dss-framework/dss-framework-workspace-server/src/main/java/com/webank/wedatasphere/dss/framework/workspace/service/impl/DSSWorkspaceUserServiceImpl.java
+++ b/dss-framework/dss-framework-workspace-server/src/main/java/com/webank/wedatasphere/dss/framework/workspace/service/impl/DSSWorkspaceUserServiceImpl.java
@@ -18,6 +18,7 @@
 
 import com.github.pagehelper.PageHelper;
 import com.webank.wedatasphere.dss.common.entity.PageInfo;
+import com.webank.wedatasphere.dss.common.utils.MapUtils;
 import com.webank.wedatasphere.dss.framework.admin.service.DssAdminUserService;
 import com.webank.wedatasphere.dss.framework.workspace.bean.DSSWorkspaceUser;
 import com.webank.wedatasphere.dss.framework.workspace.bean.StaffInfo;
@@ -38,7 +39,9 @@
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.Date;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 import java.util.stream.Collectors;
 
 
@@ -121,10 +124,16 @@ public List<String> getAllWorkspaceUsers(long workspaceId) {
     }
 
     @Override
-    public List<DepartmentUserVo> getAllWorkspaceUsersDepartment(long workspaceId) {
-        return dssWorkspaceUserMapper.getAllWorkspaceUsers(workspaceId).stream().map(
+    public Map<String, Map<String, List<String>>> getAllWorkspaceUsersDepartment(long workspaceId) {
+        List<DepartmentUserVo> userList = dssWorkspaceUserMapper.getAllWorkspaceUsers(workspaceId).stream().map(
                         workspaceUser -> changeToUserVO(workspaceUser))
                 .collect(Collectors.toList());
+        return structureVo2Map(userList);
+    }
+
+    private Map<String, Map<String, List<String>>> structureVo2Map(List<DepartmentUserVo> userList) {
+        return userList.stream().collect(Collectors.groupingBy(DepartmentUserVo::getDepartment,
+                Collectors.groupingBy(DepartmentUserVo::getOffice, Collectors.mapping(DepartmentUserVo::getName,Collectors.toList()))));
     }
 
     private DepartmentUserVo changeToUserVO(String userName) {

From 027850878d47497bfc1670e2600ce1fb55a3e7b0 Mon Sep 17 00:00:00 2001
From: v_xuanzhou <zhouxuannihao@qq.com>
Date: Wed, 29 May 2024 14:08:03 +0800
Subject: [PATCH 192/302] dss-server:dix getAllWorkspaceUsersDepartment

---
 .../vo/DSSWorkspaceUsersDepartmentVo.java     |  6 +--
 .../bean/vo/DepartmentUserTreeVo.java         | 15 +++++++
 .../service/DSSWorkspaceUserService.java      |  5 +--
 .../impl/DSSWorkspaceUserServiceImpl.java     | 45 +++++++++++++++----
 4 files changed, 56 insertions(+), 15 deletions(-)
 create mode 100644 dss-framework/dss-framework-workspace-server/src/main/java/com/webank/wedatasphere/dss/framework/workspace/bean/vo/DepartmentUserTreeVo.java

diff --git a/dss-framework/dss-framework-workspace-server/src/main/java/com/webank/wedatasphere/dss/framework/workspace/bean/vo/DSSWorkspaceUsersDepartmentVo.java b/dss-framework/dss-framework-workspace-server/src/main/java/com/webank/wedatasphere/dss/framework/workspace/bean/vo/DSSWorkspaceUsersDepartmentVo.java
index 524bca464..5f83c0b34 100644
--- a/dss-framework/dss-framework-workspace-server/src/main/java/com/webank/wedatasphere/dss/framework/workspace/bean/vo/DSSWorkspaceUsersDepartmentVo.java
+++ b/dss-framework/dss-framework-workspace-server/src/main/java/com/webank/wedatasphere/dss/framework/workspace/bean/vo/DSSWorkspaceUsersDepartmentVo.java
@@ -9,11 +9,11 @@
 public class DSSWorkspaceUsersDepartmentVo implements Serializable {
 
     private static final long serialVersionUID=1L;
-    private Map<String, Map<String, List<String>>> editUsers;
+    private List<DepartmentUserTreeVo> editUsers;
 
-    private Map<String, Map<String, List<String>>> accessUsers;
+    private List<DepartmentUserTreeVo> accessUsers;
 
-    private Map<String, Map<String, List<String>>> releaseUsers;
+    private List<DepartmentUserTreeVo> releaseUsers;
 
 
 }
diff --git a/dss-framework/dss-framework-workspace-server/src/main/java/com/webank/wedatasphere/dss/framework/workspace/bean/vo/DepartmentUserTreeVo.java b/dss-framework/dss-framework-workspace-server/src/main/java/com/webank/wedatasphere/dss/framework/workspace/bean/vo/DepartmentUserTreeVo.java
new file mode 100644
index 000000000..768e81825
--- /dev/null
+++ b/dss-framework/dss-framework-workspace-server/src/main/java/com/webank/wedatasphere/dss/framework/workspace/bean/vo/DepartmentUserTreeVo.java
@@ -0,0 +1,15 @@
+package com.webank.wedatasphere.dss.framework.workspace.bean.vo;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+@Data
+public class DepartmentUserTreeVo implements Serializable {
+    private static final long serialVersionUID=1L;
+    private String name;
+    private String type;
+    private List<DepartmentUserTreeVo> child;
+
+}
diff --git a/dss-framework/dss-framework-workspace-server/src/main/java/com/webank/wedatasphere/dss/framework/workspace/service/DSSWorkspaceUserService.java b/dss-framework/dss-framework-workspace-server/src/main/java/com/webank/wedatasphere/dss/framework/workspace/service/DSSWorkspaceUserService.java
index c50518491..b4863eb63 100644
--- a/dss-framework/dss-framework-workspace-server/src/main/java/com/webank/wedatasphere/dss/framework/workspace/service/DSSWorkspaceUserService.java
+++ b/dss-framework/dss-framework-workspace-server/src/main/java/com/webank/wedatasphere/dss/framework/workspace/service/DSSWorkspaceUserService.java
@@ -19,11 +19,10 @@
 
 import com.webank.wedatasphere.dss.common.entity.PageInfo;
 import com.webank.wedatasphere.dss.framework.workspace.bean.vo.DSSWorkspaceRoleVO;
-import com.webank.wedatasphere.dss.framework.workspace.bean.vo.DepartmentUserVo;
+import com.webank.wedatasphere.dss.framework.workspace.bean.vo.DepartmentUserTreeVo;
 import com.webank.wedatasphere.dss.framework.workspace.bean.vo.StaffInfoVO;
 
 import java.util.List;
-import java.util.Map;
 
 
 public interface DSSWorkspaceUserService {
@@ -53,7 +52,7 @@ public interface DSSWorkspaceUserService {
 
     List<String> getAllWorkspaceUsers(long workspaceId);
 
-    Map<String, Map<String, List<String>>> getAllWorkspaceUsersDepartment(long workspaceId) ;
+    List<DepartmentUserTreeVo> getAllWorkspaceUsersDepartment(long workspaceId) ;
 
     PageInfo<String> getAllWorkspaceUsersPage(long workspaceId, Integer pageNow, Integer pageSize);
 
diff --git a/dss-framework/dss-framework-workspace-server/src/main/java/com/webank/wedatasphere/dss/framework/workspace/service/impl/DSSWorkspaceUserServiceImpl.java b/dss-framework/dss-framework-workspace-server/src/main/java/com/webank/wedatasphere/dss/framework/workspace/service/impl/DSSWorkspaceUserServiceImpl.java
index 6e8763f54..c3ae79939 100644
--- a/dss-framework/dss-framework-workspace-server/src/main/java/com/webank/wedatasphere/dss/framework/workspace/service/impl/DSSWorkspaceUserServiceImpl.java
+++ b/dss-framework/dss-framework-workspace-server/src/main/java/com/webank/wedatasphere/dss/framework/workspace/service/impl/DSSWorkspaceUserServiceImpl.java
@@ -18,11 +18,11 @@
 
 import com.github.pagehelper.PageHelper;
 import com.webank.wedatasphere.dss.common.entity.PageInfo;
-import com.webank.wedatasphere.dss.common.utils.MapUtils;
 import com.webank.wedatasphere.dss.framework.admin.service.DssAdminUserService;
 import com.webank.wedatasphere.dss.framework.workspace.bean.DSSWorkspaceUser;
 import com.webank.wedatasphere.dss.framework.workspace.bean.StaffInfo;
 import com.webank.wedatasphere.dss.framework.workspace.bean.vo.DSSWorkspaceRoleVO;
+import com.webank.wedatasphere.dss.framework.workspace.bean.vo.DepartmentUserTreeVo;
 import com.webank.wedatasphere.dss.framework.workspace.bean.vo.DepartmentUserVo;
 import com.webank.wedatasphere.dss.framework.workspace.bean.vo.StaffInfoVO;
 import com.webank.wedatasphere.dss.framework.workspace.dao.DSSWorkspaceUserMapper;
@@ -39,7 +39,6 @@
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.Date;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
@@ -63,6 +62,12 @@ public class DSSWorkspaceUserServiceImpl implements DSSWorkspaceUserService {
     @Autowired
     private DSSWorkspaceAddUserHook dssWorkspaceAddUserHook;
 
+    private static final String NODE_TYPE_DEPARTMENT = "department";
+
+    private static final String NODE_TYPE_OFFICE = "office";
+
+    private static final String NODE_TYPE_USER = "user";
+
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void addWorkspaceUser(List<Integer> roleIds, long workspaceId, String userName, String creator, String userId) {
@@ -124,16 +129,38 @@ public List<String> getAllWorkspaceUsers(long workspaceId) {
     }
 
     @Override
-    public Map<String, Map<String, List<String>>> getAllWorkspaceUsersDepartment(long workspaceId) {
+    public List<DepartmentUserTreeVo> getAllWorkspaceUsersDepartment(long workspaceId) {
         List<DepartmentUserVo> userList = dssWorkspaceUserMapper.getAllWorkspaceUsers(workspaceId).stream().map(
                         workspaceUser -> changeToUserVO(workspaceUser))
                 .collect(Collectors.toList());
-        return structureVo2Map(userList);
-    }
-
-    private Map<String, Map<String, List<String>>> structureVo2Map(List<DepartmentUserVo> userList) {
-        return userList.stream().collect(Collectors.groupingBy(DepartmentUserVo::getDepartment,
-                Collectors.groupingBy(DepartmentUserVo::getOffice, Collectors.mapping(DepartmentUserVo::getName,Collectors.toList()))));
+        return structureVo2Tree(userList);
+    }
+
+    private List<DepartmentUserTreeVo> structureVo2Tree(List<DepartmentUserVo> userList) {
+      Map<String, Map<String, List<DepartmentUserTreeVo>>> userMap = userList.stream().collect(Collectors.groupingBy(DepartmentUserVo::getDepartment,
+                Collectors.groupingBy(DepartmentUserVo::getOffice, Collectors.mapping(user->{
+                    DepartmentUserTreeVo treeNode = new DepartmentUserTreeVo();
+                    treeNode.setName(user.getName());
+                    treeNode.setType(NODE_TYPE_USER);
+                    return treeNode;
+                }, Collectors.toList()))));
+        return userMap.keySet().stream().map(key->{
+            DepartmentUserTreeVo treeNode = new DepartmentUserTreeVo();
+            treeNode.setName(key);
+            treeNode.setType(NODE_TYPE_DEPARTMENT);
+            treeNode.setChild(buildTree4Office(userMap.get(key)));
+            return treeNode;
+        }).collect(Collectors.toList());
+    }
+
+    private List<DepartmentUserTreeVo> buildTree4Office(Map<String,List<DepartmentUserTreeVo>> officeMap){
+        return officeMap.keySet().stream().map(key->{
+            DepartmentUserTreeVo treeNode = new DepartmentUserTreeVo();
+            treeNode.setName(key);
+            treeNode.setType(NODE_TYPE_OFFICE);
+            treeNode.setChild(officeMap.get(key));
+            return treeNode;
+        }).collect(Collectors.toList());
     }
 
     private DepartmentUserVo changeToUserVO(String userName) {

From c8d31a91307cde0463d7c8690c9cb1719ecf9553 Mon Sep 17 00:00:00 2001
From: Zhaobincai <747839893@qq.com>
Date: Wed, 29 May 2024 14:50:11 +0800
Subject: [PATCH 193/302] dss-server: fix orchestrator status

---
 .../impl/OrchestratorPluginServiceImpl.java   |  2 +-
 .../service/impl/OrchestratorServiceImpl.java |  7 +---
 .../db/dao/impl/orchestratorMapper.xml        |  2 +-
 .../workflow/lock/DSSFlowEditLockManager.java | 35 ++++++++++++-------
 .../service/impl/DSSFlowServiceImpl.java      |  1 -
 5 files changed, 25 insertions(+), 22 deletions(-)

diff --git a/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/impl/OrchestratorPluginServiceImpl.java b/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/impl/OrchestratorPluginServiceImpl.java
index 04f7f4516..1dfa37905 100644
--- a/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/impl/OrchestratorPluginServiceImpl.java
+++ b/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/impl/OrchestratorPluginServiceImpl.java
@@ -220,7 +220,7 @@ public void submitFlow(OrchestratorSubmitRequest flowRequest, String username, W
         Long orchestratorId = flowRequest.getOrchestratorId();
         String status = lockMapper.selectOrchestratorStatus(orchestratorId);
         if (!StringUtils.isEmpty(status) && !status.equals(OrchestratorRefConstant.FLOW_STATUS_SAVE)) {
-            throw new DSSErrorException(800001, "提交前请先保存工作流");
+            return ;
         }
         releaseThreadPool.submit(() ->{
             //1. 异步提交，更新提交状态
diff --git a/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/impl/OrchestratorServiceImpl.java b/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/impl/OrchestratorServiceImpl.java
index c044ecda9..2c63157d3 100644
--- a/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/impl/OrchestratorServiceImpl.java
+++ b/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/impl/OrchestratorServiceImpl.java
@@ -519,12 +519,7 @@ public List<OrchestratorBaseInfo> getOrchestratorInfos(OrchestratorRequest orche
                 orchestratorBaseInfo.setEditable(isEditable || isReleasable);
                 orchestratorBaseInfo.setReleasable(isReleasable);
                 orchestratorBaseInfo.setIsDefaultReference(dssOrchestratorInfo.getIsDefaultReference());
-                if (!StringUtils.isEmpty(dssOrchestratorInfo.getStatus()) && dssOrchestratorInfo.getStatus().equals(OrchestratorRefConstant.FLOW_STATUS_PUSHING)
-                        && dssOrchestratorInfo.getStatus().equals(OrchestratorRefConstant.FLOW_STATUS_PUSH_FAILED)) {
-                    orchestratorBaseInfo.setStatus(OrchestratorRefConstant.FLOW_STATUS_SAVE);
-                } else {
-                    orchestratorBaseInfo.setStatus(dssOrchestratorInfo.getStatus());
-                }
+                orchestratorBaseInfo.setStatus(dssOrchestratorInfo.getStatus());
 
                 retList.add(orchestratorBaseInfo);
             }
diff --git a/dss-orchestrator/dss-orchestrator-db/src/main/java/com/webank/wedatasphere/dss/orchestrator/db/dao/impl/orchestratorMapper.xml b/dss-orchestrator/dss-orchestrator-db/src/main/java/com/webank/wedatasphere/dss/orchestrator/db/dao/impl/orchestratorMapper.xml
index 1eb63d625..227390c59 100644
--- a/dss-orchestrator/dss-orchestrator-db/src/main/java/com/webank/wedatasphere/dss/orchestrator/db/dao/impl/orchestratorMapper.xml
+++ b/dss-orchestrator/dss-orchestrator-db/src/main/java/com/webank/wedatasphere/dss/orchestrator/db/dao/impl/orchestratorMapper.xml
@@ -22,7 +22,7 @@
 
     <sql id="orchestrator_main">
         id,`name`,`type`,`desc`,`creator`,`create_time`,`project_id`,`uses`,`appconn_name`,`uuid`,`secondary_type` ,
-        `workspace_id`,`orchestrator_mode`,`orchestrator_way`,`orchestrator_level`,`update_user`,`update_time`,`is_default_reference`
+        `workspace_id`,`orchestrator_mode`,`orchestrator_way`,`orchestrator_level`,`update_user`,`update_time`,`is_default_reference`,`status`
     </sql>
 
     <sql id="orchestrator_version">
diff --git a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/lock/DSSFlowEditLockManager.java b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/lock/DSSFlowEditLockManager.java
index b744c4321..d06871dd8 100644
--- a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/lock/DSSFlowEditLockManager.java
+++ b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/lock/DSSFlowEditLockManager.java
@@ -23,6 +23,7 @@
 import com.webank.wedatasphere.dss.common.utils.RpcAskUtils;
 import com.webank.wedatasphere.dss.git.common.protocol.request.GitCommitRequest;
 import com.webank.wedatasphere.dss.git.common.protocol.response.GitCommitResponse;
+import com.webank.wedatasphere.dss.orchestrator.common.entity.DSSOrchestratorInfo;
 import com.webank.wedatasphere.dss.orchestrator.common.entity.OrchestratorVo;
 import com.webank.wedatasphere.dss.orchestrator.common.protocol.RequestQuertByAppIdOrchestrator;
 import com.webank.wedatasphere.dss.orchestrator.common.protocol.RequestQueryByIdOrchestrator;
@@ -192,24 +193,21 @@ public static void deleteLock(String flowEditLock, String username) throws DSSEr
             if (StringUtils.isNotBlank(flowEditLock)) {
                 DSSFlowEditLock dssFlowEditLock = lockMapper.getFlowEditLockByLockContent(flowEditLock);
                 if (dssFlowEditLock != null) {
+                    Long flowID = dssFlowEditLock.getFlowID();
                     // 获取当前项目信息
-                    DSSFlow dssFlow = flowMapper.selectFlowByID(dssFlowEditLock.getFlowID());
+                    DSSFlow dssFlow = flowMapper.selectFlowByID(flowID);
                     DSSProject projectInfo = getProjectInfo(dssFlow.getProjectId());
                     // 对于接入Git的项目，工作流解锁加入额外处理
                     if (projectInfo.getAssociateGit()) {
-                        String status = lockMapper.selectOrchestratorStatus(dssFlowEditLock.getFlowID());
+                        DSSOrchestratorInfo orchestratorInfo = getOrchestratorInfo(flowID);
+                        String status = lockMapper.selectOrchestratorStatus(flowID);
                         if (!StringUtils.isEmpty(status) && OrchestratorRefConstant.FLOW_STATUS_SAVE.equals(status)) {
                             pushProject(projectInfo.getName(), new Long(projectInfo.getWorkspaceId()), dssFlow.getResourceId(), dssFlow.getBmlVersion(), dssFlow.getName(), username, "force unlock");
-                            Sender orcSender = DSSSenderServiceFactory.getOrCreateServiceInstance().getOrcSender();
-                            OrchestratorVo orchestratorVo = RpcAskUtils.processAskException(orcSender.ask(new RequestQuertByAppIdOrchestrator(dssFlowEditLock.getFlowID())),
-                                    OrchestratorVo.class, RequestQueryByIdOrchestrator.class);
-                            if (orchestratorVo == null) {
-                                throw new DSSErrorException(800001, "编排不存在");
-                            }
-                            lockMapper.updateOrchestratorStatus(orchestratorVo.getDssOrchestratorInfo().getId(), OrchestratorRefConstant.FLOW_STATUS_PUSH);
+
+                            lockMapper.updateOrchestratorStatus(orchestratorInfo.getId(), OrchestratorRefConstant.FLOW_STATUS_PUSH);
                         }
                     }
-                    lockMapper.clearExpire(sdf.get().format(new Date(System.currentTimeMillis() - DSSWorkFlowConstant.DSS_FLOW_EDIT_LOCK_TIMEOUT.getValue())), dssFlowEditLock.getFlowID());
+                    lockMapper.clearExpire(sdf.get().format(new Date(System.currentTimeMillis() - DSSWorkFlowConstant.DSS_FLOW_EDIT_LOCK_TIMEOUT.getValue())), flowID);
                 }
             }
         } catch (Exception e) {
@@ -229,6 +227,16 @@ public static DSSProject getProjectInfo(Long projectId) throws DSSErrorException
         return dssProject;
     }
 
+    public static DSSOrchestratorInfo getOrchestratorInfo(Long flowID) throws  DSSErrorException{
+        Sender orcSender = DSSSenderServiceFactory.getOrCreateServiceInstance().getOrcSender();
+        OrchestratorVo orchestratorVo = RpcAskUtils.processAskException(orcSender.ask(new RequestQuertByAppIdOrchestrator(flowID)),
+                OrchestratorVo.class, RequestQueryByIdOrchestrator.class);
+        if (orchestratorVo == null) {
+            throw new DSSErrorException(800001, "编排不存在");
+        }
+        return orchestratorVo.getDssOrchestratorInfo();
+    }
+
     public static void pushProject(String projectName, Long workspaceId, String resource, String version, String path, String username, String comment) {
         LOGGER.info("-------=======================begin to add testGit1=======================-------");
         Sender gitSender = DSSSenderServiceFactory.getOrCreateServiceInstance().getGitSender();
@@ -264,9 +272,10 @@ public static String updateLock(String lock) throws DSSErrorException {
         }
     }
 
-    public static boolean isLockExpire(DSSFlowEditLock flowEditLock) {
-        String status = lockMapper.selectOrchestratorStatus(flowEditLock.getFlowID());
-        if (StringUtils.isEmpty(status) && OrchestratorRefConstant.FLOW_STATUS_SAVE.equals(status)) {
+    public static boolean isLockExpire(DSSFlowEditLock flowEditLock) throws DSSErrorException{
+        DSSOrchestratorInfo orchestratorInfo = getOrchestratorInfo(flowEditLock.getFlowID());
+        String status = lockMapper.selectOrchestratorStatus(orchestratorInfo.getId());
+        if (!StringUtils.isEmpty(status) && OrchestratorRefConstant.FLOW_STATUS_SAVE.equals(status)) {
             return false;
         }
         return System.currentTimeMillis() - flowEditLock.getUpdateTime().getTime() >= DSSWorkFlowConstant.DSS_FLOW_EDIT_LOCK_TIMEOUT.getValue();
diff --git a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/service/impl/DSSFlowServiceImpl.java b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/service/impl/DSSFlowServiceImpl.java
index c5c7c53cc..244b080b1 100644
--- a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/service/impl/DSSFlowServiceImpl.java
+++ b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/service/impl/DSSFlowServiceImpl.java
@@ -293,7 +293,6 @@ public String saveFlow(Long flowID,
         String flowJsonOld = getFlowJson(userName, projectName, dssFlow);
         if (isEqualTwoJson(flowJsonOld, jsonFlow)) {
             logger.info("saveFlow is not change");
-            updateTOSaveStatus(dssFlow);
             return dssFlow.getBmlVersion();
         } else {
             logger.info("saveFlow is change");

From 8995a2ea72df5f5bbaceee109ac2f077fbf0679e Mon Sep 17 00:00:00 2001
From: ryanlei <ryanlei@webank.com>
Date: Fri, 24 May 2024 15:09:59 +0800
Subject: [PATCH 194/302] feat: add next-web

---
 next-web/.commitlintrc                        |  49 ++
 next-web/.env                                 |   1 +
 next-web/.env.development                     |   1 +
 next-web/.eslintignore                        |   2 +
 next-web/.eslintrc.json                       |  23 +
 next-web/.gitignore                           |  23 +
 next-web/.jsconfig.json                       |   8 +
 next-web/.prettierrc                          |  12 +
 next-web/README.md                            |  43 ++
 next-web/config/dss.js                        |  30 +
 next-web/config/workspace.js                  |   1 +
 next-web/index.html                           |  13 +
 next-web/package.json                         |  78 +++
 next-web/packages/dss/package.json            |   7 +
 next-web/packages/dss/router.js               |   0
 next-web/packages/shared/index.ts             |   3 +
 next-web/packages/shared/package.json         |  11 +
 next-web/packages/shared/requst.ts            | 238 +++++++
 next-web/packages/workspace/i18n/en.json      |  65 ++
 next-web/packages/workspace/i18n/zh.json      |  66 ++
 .../workspace/module/announcement/api.ts      |  10 +
 .../module/announcement/editAnnouncement.vue  | 129 ++++
 .../workspace/module/announcement/index.vue   | 318 +++++++++
 .../workspace/module/components/NavHeader.vue |  89 +++
 .../workspace/module/hooks/usePagination.ts   |  98 +++
 .../workspace/module/hooks/useTableConfig.ts  |  21 +
 .../workspace/module/resourceTmlManage/api.ts | 267 ++++++++
 .../resourceTmlManage/applicationRule/api.ts  |  18 +
 .../applicationRule/editRule.vue              | 382 +++++++++++
 .../applicationRule/executionRecord.vue       | 230 +++++++
 .../applicationRule/hooks/useDataList.ts      | 130 ++++
 .../applicationRule/index.vue                 | 496 ++++++++++++++
 .../applicationRule/viewUsers.vue             | 140 ++++
 .../resourceTmlManage/component/appDrawer.vue | 157 +++++
 .../component/permissionUserDrawer.vue        | 137 ++++
 .../component/templateOperateDrawer.vue       | 582 ++++++++++++++++
 .../component/workFlowDrawer.vue              | 186 +++++
 .../resourceTmlManage/hooks/useDataList.ts    | 158 +++++
 .../module/resourceTmlManage/hooks/utils.ts   |  27 +
 .../module/resourceTmlManage/index.vue        | 467 +++++++++++++
 .../module/resourceTmlManage/layout.vue       |   4 +
 .../module/workFlow/advanceModal.vue          | 148 ++++
 .../packages/workspace/module/workFlow/api.ts |   6 +
 .../module/workFlow/hooks/useDataList.ts      |  65 ++
 .../module/workFlow/hooks/useDataUtils.ts     |  83 +++
 .../module/workFlow/hooks/useTemplateList.ts  |  36 +
 .../workspace/module/workFlow/index.vue       | 638 ++++++++++++++++++
 .../workspace/module/workFlow/nodeDrawer.vue  | 283 ++++++++
 next-web/packages/workspace/package.json      |   9 +
 next-web/packages/workspace/router.js         |  64 ++
 next-web/packages/workspace/view/layout.vue   |   6 +
 next-web/public/vite.svg                      |   1 +
 next-web/src/App.vue                          |  20 +
 next-web/src/assets/vue.svg                   |   1 +
 next-web/src/base.less                        |  75 ++
 next-web/src/i18n.ts                          |  26 +
 next-web/src/main.ts                          |  65 ++
 next-web/src/router.ts                        |  35 +
 next-web/src/vite-env.d.ts                    |   1 +
 next-web/tsconfig.json                        |  46 ++
 next-web/tsconfig.node.json                   |  12 +
 next-web/types/index.d.ts                     |  23 +
 next-web/types/modules.d.ts                   |  16 +
 next-web/types/shims-vue.d.ts                 |   5 +
 next-web/vite-plugin/vite-dynamic-module.ts   | 108 +++
 next-web/vite-plugin/vite-host.ts             |  25 +
 next-web/vite.config.ts                       |  54 ++
 67 files changed, 6571 insertions(+)
 create mode 100644 next-web/.commitlintrc
 create mode 100644 next-web/.env
 create mode 100644 next-web/.env.development
 create mode 100644 next-web/.eslintignore
 create mode 100644 next-web/.eslintrc.json
 create mode 100644 next-web/.gitignore
 create mode 100644 next-web/.jsconfig.json
 create mode 100644 next-web/.prettierrc
 create mode 100644 next-web/README.md
 create mode 100644 next-web/config/dss.js
 create mode 100644 next-web/config/workspace.js
 create mode 100644 next-web/index.html
 create mode 100644 next-web/package.json
 create mode 100644 next-web/packages/dss/package.json
 create mode 100644 next-web/packages/dss/router.js
 create mode 100644 next-web/packages/shared/index.ts
 create mode 100644 next-web/packages/shared/package.json
 create mode 100644 next-web/packages/shared/requst.ts
 create mode 100644 next-web/packages/workspace/i18n/en.json
 create mode 100644 next-web/packages/workspace/i18n/zh.json
 create mode 100644 next-web/packages/workspace/module/announcement/api.ts
 create mode 100644 next-web/packages/workspace/module/announcement/editAnnouncement.vue
 create mode 100644 next-web/packages/workspace/module/announcement/index.vue
 create mode 100644 next-web/packages/workspace/module/components/NavHeader.vue
 create mode 100644 next-web/packages/workspace/module/hooks/usePagination.ts
 create mode 100644 next-web/packages/workspace/module/hooks/useTableConfig.ts
 create mode 100644 next-web/packages/workspace/module/resourceTmlManage/api.ts
 create mode 100644 next-web/packages/workspace/module/resourceTmlManage/applicationRule/api.ts
 create mode 100644 next-web/packages/workspace/module/resourceTmlManage/applicationRule/editRule.vue
 create mode 100644 next-web/packages/workspace/module/resourceTmlManage/applicationRule/executionRecord.vue
 create mode 100644 next-web/packages/workspace/module/resourceTmlManage/applicationRule/hooks/useDataList.ts
 create mode 100644 next-web/packages/workspace/module/resourceTmlManage/applicationRule/index.vue
 create mode 100644 next-web/packages/workspace/module/resourceTmlManage/applicationRule/viewUsers.vue
 create mode 100644 next-web/packages/workspace/module/resourceTmlManage/component/appDrawer.vue
 create mode 100644 next-web/packages/workspace/module/resourceTmlManage/component/permissionUserDrawer.vue
 create mode 100644 next-web/packages/workspace/module/resourceTmlManage/component/templateOperateDrawer.vue
 create mode 100644 next-web/packages/workspace/module/resourceTmlManage/component/workFlowDrawer.vue
 create mode 100644 next-web/packages/workspace/module/resourceTmlManage/hooks/useDataList.ts
 create mode 100644 next-web/packages/workspace/module/resourceTmlManage/hooks/utils.ts
 create mode 100644 next-web/packages/workspace/module/resourceTmlManage/index.vue
 create mode 100644 next-web/packages/workspace/module/resourceTmlManage/layout.vue
 create mode 100644 next-web/packages/workspace/module/workFlow/advanceModal.vue
 create mode 100644 next-web/packages/workspace/module/workFlow/api.ts
 create mode 100644 next-web/packages/workspace/module/workFlow/hooks/useDataList.ts
 create mode 100644 next-web/packages/workspace/module/workFlow/hooks/useDataUtils.ts
 create mode 100644 next-web/packages/workspace/module/workFlow/hooks/useTemplateList.ts
 create mode 100644 next-web/packages/workspace/module/workFlow/index.vue
 create mode 100644 next-web/packages/workspace/module/workFlow/nodeDrawer.vue
 create mode 100644 next-web/packages/workspace/package.json
 create mode 100644 next-web/packages/workspace/router.js
 create mode 100644 next-web/packages/workspace/view/layout.vue
 create mode 100644 next-web/public/vite.svg
 create mode 100644 next-web/src/App.vue
 create mode 100644 next-web/src/assets/vue.svg
 create mode 100644 next-web/src/base.less
 create mode 100644 next-web/src/i18n.ts
 create mode 100644 next-web/src/main.ts
 create mode 100644 next-web/src/router.ts
 create mode 100644 next-web/src/vite-env.d.ts
 create mode 100644 next-web/tsconfig.json
 create mode 100644 next-web/tsconfig.node.json
 create mode 100644 next-web/types/index.d.ts
 create mode 100644 next-web/types/modules.d.ts
 create mode 100644 next-web/types/shims-vue.d.ts
 create mode 100644 next-web/vite-plugin/vite-dynamic-module.ts
 create mode 100644 next-web/vite-plugin/vite-host.ts
 create mode 100644 next-web/vite.config.ts

diff --git a/next-web/.commitlintrc b/next-web/.commitlintrc
new file mode 100644
index 000000000..cda374c83
--- /dev/null
+++ b/next-web/.commitlintrc
@@ -0,0 +1,49 @@
+{
+  "extends": [
+    "@commitlint/config-conventional"
+  ],
+  "rules": {
+    "type-enum": [
+      2,
+      "always",
+      [
+        "build",
+        "chore",
+        "ci",
+        "docs",
+        "feat",
+        "fix",
+        "perf",
+        "refactor",
+        "revert",
+        "style",
+        "test"
+      ]
+    ],
+    "type-case": [
+      0
+    ],
+    "type-empty": [
+      0
+    ],
+    "scope-empty": [
+      0
+    ],
+    "scope-case": [
+      0
+    ],
+    "subject-full-stop": [
+      0,
+      "never"
+    ],
+    "subject-case": [
+      0,
+      "never"
+    ],
+    "header-max-length": [
+      0,
+      "always",
+      72
+    ]
+  }
+}
diff --git a/next-web/.env b/next-web/.env
new file mode 100644
index 000000000..903fa8e22
--- /dev/null
+++ b/next-web/.env
@@ -0,0 +1 @@
+VITE_REQUEST_PREFIX=/api/rest_j/v1/ 
\ No newline at end of file
diff --git a/next-web/.env.development b/next-web/.env.development
new file mode 100644
index 000000000..903fa8e22
--- /dev/null
+++ b/next-web/.env.development
@@ -0,0 +1 @@
+VITE_REQUEST_PREFIX=/api/rest_j/v1/ 
\ No newline at end of file
diff --git a/next-web/.eslintignore b/next-web/.eslintignore
new file mode 100644
index 000000000..76add878f
--- /dev/null
+++ b/next-web/.eslintignore
@@ -0,0 +1,2 @@
+node_modules
+dist
\ No newline at end of file
diff --git a/next-web/.eslintrc.json b/next-web/.eslintrc.json
new file mode 100644
index 000000000..68b1f7f95
--- /dev/null
+++ b/next-web/.eslintrc.json
@@ -0,0 +1,23 @@
+{
+  "parser": "vue-eslint-parser",
+  "parserOptions": {
+    "ecmaVersion": "latest",
+    "sourceType": "module",
+    "jsx": true,
+    "parser": "@typescript-eslint/parser"
+  },
+
+  "plugins": ["@typescript-eslint", "prettier"],
+
+  "extends": [
+    "plugin:@typescript-eslint/recommended",
+    "plugin:vue/vue3-recommended",
+    "plugin:prettier/recommended"
+  ],
+
+  "rules": {
+    "@typescript-eslint/ban-ts-comment": "warn",
+    "vue/multi-word-component-names": "off",
+    "no-unused-vars": "off"
+  }
+}
diff --git a/next-web/.gitignore b/next-web/.gitignore
new file mode 100644
index 000000000..8e1d0f2da
--- /dev/null
+++ b/next-web/.gitignore
@@ -0,0 +1,23 @@
+# Logs
+logs
+*.log
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+pnpm-debug.log*
+lerna-debug.log*
+package-lock.json
+node_modules
+dist
+dist-ssr
+*.local
+
+# Editor directories and files
+.vscode/*
+.idea
+.DS_Store
+*.suo
+*.ntvs*
+*.njsproj
+*.sln
+*.sw?
diff --git a/next-web/.jsconfig.json b/next-web/.jsconfig.json
new file mode 100644
index 000000000..eb1b272dc
--- /dev/null
+++ b/next-web/.jsconfig.json
@@ -0,0 +1,8 @@
+{
+  "compilerOptions": {
+    "baseUrl": ".",
+    "paths": {
+      "@dataspherestudio": ["./packages/"]
+    }
+  }
+}
diff --git a/next-web/.prettierrc b/next-web/.prettierrc
new file mode 100644
index 000000000..78075da4e
--- /dev/null
+++ b/next-web/.prettierrc
@@ -0,0 +1,12 @@
+{
+  "trailingComma": "es5",
+  "tabWidth": 2,
+  "semi": true,
+  "singleQuote": true,
+  "overrides": [
+    {
+      "files": [".prettierrc",".commitlintrc"],
+      "options": { "parser": "json" }
+    }
+  ]
+}
diff --git a/next-web/README.md b/next-web/README.md
new file mode 100644
index 000000000..3e6e4de7e
--- /dev/null
+++ b/next-web/README.md
@@ -0,0 +1,43 @@
+# DSS Template
+
+vue3、vite、fes-design，是否使用 TS
+
+新版 DSS 初始化项目，原 DSS 项目已有功能逐步迁移
+
+## 本地开发及接口调试：
+
+```
+lerna bootstrap
+wnpm run prepare
+wnpm run dev
+```
+
+### 方式一
+
+本地开发请求后端接口通过配置 vite proxy 来进行，cookie 可以从 dss 登录接口后 set-cookie 里取
+
+### 方式二
+
+浏览器插件 SwitchyOmega 配置规则，非接口的资源转发至 http://localhost:5173，开发时访问目标域名即可
+网址正则示例：
+^http://sit.dss.bdap.weoa.com(?!/api)._
+^http://***REMOVED***:8088(?!/api)._
+
+## 代码提交规范
+
+请执行 wnpm run prepare 配置好提交前 eslint 检测及 commit 信息规范校验的 git hook
+
+## 项目结构
+
+```
+├─dist              # 构建后静态资源
+├─node_modules
+├─exts              # 扩展插件
+└─packages          # 各应用模块
+    ├─dss
+    ├─shared
+    └─workspace      # 工作空间管理
+
+```
+
+### 其它
diff --git a/next-web/config/dss.js b/next-web/config/dss.js
new file mode 100644
index 000000000..d3f59a53a
--- /dev/null
+++ b/next-web/config/dss.js
@@ -0,0 +1,30 @@
+export default {
+  apps: {
+    workspace: {
+      routes: 'workspace/router',
+      module: 'workspace/module',
+      i18n: {
+        en: 'workspace/i18n/en.json',
+        'zh-CN': 'workspace/i18n/zh.json',
+      },
+    },
+  },
+  exts: {},
+  conf: {
+    app_name: 'DataSphere Studio',
+    // app_logo: 'src/assets/images/dssLogo.png',
+    user_guide: '',
+    // hide_view_tb_detail: true,
+    // hide_view_db_detail: true,
+    watermark: {
+      show: false,
+      template: '${username} ${time}',
+      timeupdate: 60000,
+    },
+    // lsp_service: {
+    //   sql: "${protocol}//${host}/server",
+    //   py: "${protocol}//${host}/python",
+    // },
+  },
+  version: '1.1.12',
+};
diff --git a/next-web/config/workspace.js b/next-web/config/workspace.js
new file mode 100644
index 000000000..ff8b4c563
--- /dev/null
+++ b/next-web/config/workspace.js
@@ -0,0 +1 @@
+export default {};
diff --git a/next-web/index.html b/next-web/index.html
new file mode 100644
index 000000000..e8974504c
--- /dev/null
+++ b/next-web/index.html
@@ -0,0 +1,13 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="UTF-8" />
+    <link rel="icon" type="image/svg+xml" href="/vite.svg" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <title></title>
+  </head>
+  <body>
+    <div id="app"></div>
+    <script type="module" src="/src/main.ts"></script>
+  </body>
+</html>
diff --git a/next-web/package.json b/next-web/package.json
new file mode 100644
index 000000000..01eea0971
--- /dev/null
+++ b/next-web/package.json
@@ -0,0 +1,78 @@
+{
+  "name": "dataspherestudio",
+  "private": true,
+  "version": "0.0.0",
+  "type": "module",
+  "scripts": {
+    "dev": "vite",
+    "build": "vite build",
+    "preview": "vite preview",
+    "prepare": "cd .. && husky install next-web/.husky",
+    "lint": "eslint . --ext .vue,.js,.ts,.jsx,.tsx",
+    "lint:fix": "eslint . --ext .vue,.js,.ts,.jsx,.tsx --fix",
+    "lint-staged": "lint-staged",
+    "format": "prettier --write ./**/*.{vue,ts,tsx,js,jsx,css,less,scss,json,md}",
+    "commit": "git-cz",
+    "typecheck": "vue-tsc --noEmit"
+  },
+  "dependencies": {
+    "@fesjs/fes-design": "^0.7.28",
+    "@fesjs/traction-widget": "1.9.1",
+    "@vueuse/core": "^10.2.0",
+    "dev-ip": "^1.0.1",
+    "lodash-es": "^4.17.21",
+    "vue": "^3.2.47",
+    "vue-i18n": "^9.3.0-beta.19",
+    "vue-router": "^4.2.2"
+  },
+  "devDependencies": {
+    "@commitlint/config-conventional": "^15.0.0",
+    "@types/node": "^20.3.1",
+    "@typescript-eslint/eslint-plugin": "^5.59.11",
+    "@typescript-eslint/parser": "^5.59.11",
+    "@vitejs/plugin-vue": "^4.1.0",
+    "@vue/tsconfig": "^0.4.0",
+    "commitlint": "^15.0.0",
+    "cz-conventional-changelog": "^3.3.0",
+    "eslint": "^8.41.0",
+    "eslint-config-prettier": "^8.8.0",
+    "eslint-plugin-prettier": "^4.2.1",
+    "eslint-plugin-vue": "^9.14.1",
+    "husky": "^7.0.4",
+    "less": "^4.1.2",
+    "less-loader": "^10.2.0",
+    "lint-staged": "^12.1.2",
+    "prettier": "^2.8.8",
+    "typescript": "^5.1.3",
+    "vite": "^4.3.9",
+    "vite-plugin-eslint": "^1.8.1",
+    "vue-eslint-parser": "^9.3.0",
+    "vue-tsc": "^1.6.5"
+  },
+  "config": {
+    "commitizen": {
+      "path": "./next-web/node_modules/cz-conventional-changelog"
+    }
+  },
+  "lint-staged": {
+    "*.{js,jsx,vue,ts,tsx}": [
+      "eslint --fix",
+      "prettier --write"
+    ],
+    "*.{scss,less,css,html,md,json}": [
+      "prettier --write"
+    ]
+  },
+  "husky": {
+    "hooks": {
+      "pre-commit": "npm run lint-staged",
+      "commit-msg": "commitlint -E $HUSKY_GIT_PARAMS"
+    }
+  },
+  "workspaces": [
+    "packages/cyeditor",
+    "packages/dss",
+    "packages/shared",
+    "packages/workspace"
+  ]
+}
diff --git a/next-web/packages/dss/package.json b/next-web/packages/dss/package.json
new file mode 100644
index 000000000..a1be21712
--- /dev/null
+++ b/next-web/packages/dss/package.json
@@ -0,0 +1,7 @@
+{
+  "name": "@dataspherestudio/dss",
+  "version": "0.0.1",
+  "dependencies": {},
+  "devDependencies": {},
+  "scripts": {}
+}
diff --git a/next-web/packages/dss/router.js b/next-web/packages/dss/router.js
new file mode 100644
index 000000000..e69de29bb
diff --git a/next-web/packages/shared/index.ts b/next-web/packages/shared/index.ts
new file mode 100644
index 000000000..23e56d7ec
--- /dev/null
+++ b/next-web/packages/shared/index.ts
@@ -0,0 +1,3 @@
+import request from './requst';
+
+export { request };
diff --git a/next-web/packages/shared/package.json b/next-web/packages/shared/package.json
new file mode 100644
index 000000000..49c6bd6fb
--- /dev/null
+++ b/next-web/packages/shared/package.json
@@ -0,0 +1,11 @@
+{
+  "name": "@dataspherestudio/shared",
+  "version": "0.0.1",
+  "dependencies": {
+    "axios": "1.6.4"
+  },
+  "main": "./index.js",
+  "module": "./index.js",
+  "devDependencies": {},
+  "scripts": {}
+}
diff --git a/next-web/packages/shared/requst.ts b/next-web/packages/shared/requst.ts
new file mode 100644
index 000000000..949ad3eaa
--- /dev/null
+++ b/next-web/packages/shared/requst.ts
@@ -0,0 +1,238 @@
+import type { AxiosInstance, AxiosRequestConfig, AxiosResponse } from 'axios';
+import axios from 'axios';
+
+const pending: { u: string; c: AbortController }[] = [];
+const removePending = (config: AxiosRequestConfig) => {
+  for (let p = 0; p < pending.length; p++) {
+    const key = getReqestKey(config);
+    // 如果存在则执行取消操作
+    if (pending[p].u === key) {
+      pending[p].c.abort(); //执行取消操作
+      pending.splice(p, 1); // 移除记录
+    }
+  }
+};
+
+function getReqestKey(config: AxiosRequestConfig) {
+  const params = JSON.stringify(config.params);
+  return config.url + '&' + config.method + '&' + params;
+}
+
+function cutReq(config: AxiosRequestConfig) {
+  for (let p = 0; p < pending.length; p++) {
+    if (pending[p].u === getReqestKey(config)) {
+      return true;
+    }
+  }
+}
+
+const instance = axios.create({
+  baseURL:
+    import.meta.env.VITE_REQUEST_PREFIX ||
+    `${location.protocol}//${window.location.host}`,
+  timeout: 600000,
+  withCredentials: true,
+  headers: {
+    'Content-Type': 'application/json;charset=UTF-8',
+  },
+});
+
+// request拦截器
+instance.interceptors.request.use(
+  (config) => {
+    const flag = cutReq(config);
+    if (flag === true) {
+      // 取消第二次相同请求
+      removePending(config);
+      return config;
+    }
+    const abortController = new AbortController();
+    const key = getReqestKey(config);
+    pending.push({ u: key, c: abortController });
+    config.signal = abortController.signal;
+    return config;
+  },
+  (err) => {
+    return Promise.reject(err);
+  }
+);
+// response拦截器
+instance.interceptors.response.use(
+  (response) => {
+    removePending(response.config);
+    return response;
+  },
+  (error) => {
+    if (axios.isCancel(error)) {
+      return {};
+    }
+    return Promise.reject(error);
+  }
+);
+
+// 参数处理
+const param = function (url: string, data?: object, option?: FetchOptions) {
+  if (typeof option === 'string') {
+    option = {
+      method: option,
+    };
+  }
+  if (option && option.method) {
+    if (
+      option.method == 'get' ||
+      option.method == 'delete' ||
+      option.method == 'head' ||
+      option.method == 'options'
+    ) {
+      option.params = data;
+    }
+    if (
+      option.method == 'post' ||
+      option.method == 'put' ||
+      option.method == 'patch'
+    ) {
+      option.data = data;
+    }
+  } else {
+    option = {
+      method: 'get',
+      params: data,
+    };
+  }
+
+  option.url = url;
+  return instance.request(option);
+};
+
+// 请求返回数据处理
+const success = function (response: AxiosResponse) {
+  let data;
+  if (response) {
+    if (response.status === 401 && api.error[response.status]) {
+      api.error[response.status](response);
+    }
+    if (typeof response.data === 'string' && response.data) {
+      try {
+        data = JSON.parse(response.data);
+      } catch (err) {
+        throw new Error('接口返回数据格式错误');
+      }
+    } else if (response.data) {
+      data = response.data;
+    }
+  } else {
+    throw new Error('接口返回数据格式错误');
+  }
+  if (data && data.status !== 0) {
+    if (api.error[data.status]) {
+      api.error[data.status](response);
+      throw new Error('');
+    } else {
+      throw new Error(data.message || '');
+    }
+  }
+  return data || {};
+};
+
+// 错误处理
+const fail = function (error: { response: any; code?: any }) {
+  const response = error.response;
+  if (error?.code == 'ERR_CANCELED') return;
+  if (response && api.error[response.status]) {
+    api.error[response.status](response);
+  } else {
+    if (response && response.data) {
+      //
+    }
+  }
+  throw error;
+};
+
+/**
+ * 请求方法
+ * @param {*} url 接口路径
+ * @param {*} data 请求参数
+ * @param {*} option 配置
+ * @returns promise
+ * usages：
+ * fetch('https://dss-open.wedatasphere.com/api/rest_j/v1/user/publicKey')
+ * fetch('https://dss-open.wedatasphere.com/api/rest_j/v1/user/publicKey', {}, 'get')
+ * fetch('/user/XX', {}, 'post')
+ * fetch('/user/XX', {}, {axios config options})
+ */
+function fetch(url: string, data?: object, option?: FetchOptions) {
+  return param(url, data, option)
+    .then(success, fail)
+    .then(function (response) {
+      return response;
+    })
+    .catch(function (error) {
+      api.showErrorMsg(error);
+      throw error;
+    });
+}
+
+type FetchOptions = string | AxiosRequestConfig;
+
+/**
+ * 定义接口返回的固定格式
+ */
+export interface ResponseResult<T = any> {
+  status: number;
+  method: string;
+  message: string;
+  data: T;
+}
+
+export type ApiRequest = {
+  instance: AxiosInstance;
+  setError: (option: any) => void;
+  fetch: (
+    url: string,
+    data?: any,
+    option?: FetchOptions
+  ) => Promise<ResponseResult<any>>;
+  error: Record<string, (res: any) => void>;
+  showErrorMsg: (error: Error) => void;
+};
+
+const api: ApiRequest = {
+  instance: instance,
+  error: {
+    '-1': function (res) {
+      if (res.data && res.data.enableSSO && res.data.SSOURL) {
+        return window.location.replace(res.data.SSOURL);
+      }
+      if (window.location.href.indexOf('/#/login') < 0) {
+        if (self != top) {
+          window.parent.location.href = '/#/login';
+        } else {
+          window.location.href = '/#/login';
+        }
+      }
+    },
+    '401': function () {
+      if (window.location.href.indexOf('/#/login') < 0) {
+        if (self != top) {
+          window.parent.location.href = '/#/login';
+        } else {
+          window.location.href = '/#/login';
+        }
+      }
+    },
+  },
+  setError: function ({ error, showErrorMsg }) {
+    if (error && typeof error === 'object') {
+      Object.assign(api.error, error);
+    }
+    if (showErrorMsg) {
+      api.showErrorMsg = showErrorMsg;
+    }
+  },
+  showErrorMsg: function (err) {
+    // empty
+  },
+  fetch,
+};
+
+export default api;
diff --git a/next-web/packages/workspace/i18n/en.json b/next-web/packages/workspace/i18n/en.json
new file mode 100644
index 000000000..e4abbac3b
--- /dev/null
+++ b/next-web/packages/workspace/i18n/en.json
@@ -0,0 +1,65 @@
+{
+  "common": {
+    "search": "Search",
+    "reset": "Reset",
+    "moreAction": "More Action",
+    "more": "More",
+    "createUser": "Create User",
+    "createTime": "Create Time",
+    "updateUser": "Update User",
+    "updateTime": "Update Time",
+    "action": "Action",
+    "edit": "Edit",
+    "delete": "Delete",
+    "pleaseInput": "Please Input",
+    "pleaseSelect": "Please Select",
+    "pleaseFillIn": "Please FillIn",
+    "userName": "UserName",
+    "save": "Save"
+  },
+  "workspace": {
+    "tmlName": "Template Name",
+    "engineType": "Engine Type",
+    "relateUser": "Relate User",
+    "createTml": "Create Template",
+    "tmlApplyRule": "Template Apply Rule",
+    "visibility": "Visibility",
+    "visibleUserCount": "Visible User Count",
+    "visibleUser": "Visible User",
+    "allUser": "All User",
+    "specifyUser": "Specify User",
+    "resParams": "Resource Params",
+    "tmlDes": "Template Description",
+    "workFlowRefList": "WorkFlow Reference List",
+    "appRefList": "APP Reference List",
+    "overwriteUser": "Overwrite User",
+    "appName": "App Name",
+    "overwriteScope": "Overwrite Scope",
+    "appRefTable": "App Ref Table",
+    "addTemplate": "Add Template",
+    "editTemplate": "Edit Template",
+    "projectName": "Project Name",
+    "workFlowName": "WorkFlow Name"
+  },
+  "announcement": {
+    "addAnnouncement": "Add announcement",
+    "expired": "Expired",
+    "inEffect": " In effect",
+    "notActivated": "Not activated",
+    "delete": "Delete",
+    "announcementMessageManage": "Announcement message management",
+    "announcementId": "Announcement ID",
+    "announcementContent": "Announcement content",
+    "announcementStartTime": "Announcement start time",
+    "announcementEndTime": "Announcement end time",
+    "announcementStatus": "Announcement status",
+    "creator": "Create user",
+    "createTime": "Creation time",
+    "operation": "Operation",
+    "pleaseEnter": "Please enter",
+    "pleaseSelect": "Please select",
+    "startTime": "Start time",
+    "endTime": "End time",
+    "addAnnouncementMessage": "The announcement was added successfully!"
+  }
+}
diff --git a/next-web/packages/workspace/i18n/zh.json b/next-web/packages/workspace/i18n/zh.json
new file mode 100644
index 000000000..7da431a48
--- /dev/null
+++ b/next-web/packages/workspace/i18n/zh.json
@@ -0,0 +1,66 @@
+{
+  "common": {
+    "search": "查询",
+    "reset": "重置",
+    "moreAction": "更多操作",
+    "more": "更多",
+    "createUser": "创建人",
+    "createTime": "创建时间",
+    "updateUser": "更新人",
+    "updateTime": "更新时间",
+    "action": "操作",
+    "edit": "编辑",
+    "delete": "删除",
+    "pleaseInput": "请输入",
+    "pleaseSelect": "请选择",
+    "pleaseFillIn": "请填写",
+    "userName": "用户名",
+    "save": "保存",
+    "notEmpty": "不能为空"
+  },
+  "workSpace": {
+    "tmlName": "模板名称",
+    "engineType": "引擎类型",
+    "relateUser": "关联用户",
+    "createTml": "创建模板",
+    "tmlApplyRule": "模板应用规则",
+    "visibility": "可见范围",
+    "visibleUserCount": "可见用户数",
+    "visibleUser": "可见用户",
+    "allUser": "全部用户",
+    "specifyUser": "指定用户",
+    "resParams": "资源参数",
+    "tmlDes": "模板描述",
+    "workFlowRefList": "工作流引用列表",
+    "appRefList": "应用引用列表",
+    "overwriteUser": "覆盖用户",
+    "appName": "应用名称",
+    "overwriteScope": "覆盖范围",
+    "appRefTable": "应用引用列表",
+    "addTemplate": "新建模板",
+    "editTemplate": "编辑模板",
+    "projectName": "项目名称",
+    "workFlowName": "工作流名称"
+  },
+  "announcement": {
+    "addAnnouncement": "新增公告",
+    "expired": "已过期",
+    "inEffect": "生效中",
+    "notActivated": "未生效",
+    "delete": "删除",
+    "announcementMessageManage": "公告消息管理",
+    "announcementId": "公告ID",
+    "announcementContent": "公告内容",
+    "announcementStartTime": "公告起始时间",
+    "announcementEndTime": "公告结束时间",
+    "announcementStatus": "公告状态",
+    "creator": "创建人",
+    "createTime": "创建时间",
+    "operation": "操作",
+    "pleaseEnter": "请输入",
+    "pleaseSelect": "请选择",
+    "startTime": "起始时间",
+    "endTime": "结束时间",
+    "addAnnouncementMessage": "新增公告成功！"
+  }
+}
diff --git a/next-web/packages/workspace/module/announcement/api.ts b/next-web/packages/workspace/module/announcement/api.ts
new file mode 100644
index 000000000..034cad0c2
--- /dev/null
+++ b/next-web/packages/workspace/module/announcement/api.ts
@@ -0,0 +1,10 @@
+export default {
+  getNoticeList: 'dss/framework/workspace/notice/list', // 获取公告接口
+  deleteNotice: 'dss/framework/workspace/notice/delete', // 删除公告
+  createNotice: 'dss/framework/workspace/notice/create', //新增公告
+  scripts: {
+    getNoticeList: 'dss/scriptis/notice/list', // 获取公告接口
+    deleteNotice: 'dss/scriptis/notice/delete', // 删除公告
+    createNotice: 'dss/scriptis/notice/create', //新增公告
+  },
+};
diff --git a/next-web/packages/workspace/module/announcement/editAnnouncement.vue b/next-web/packages/workspace/module/announcement/editAnnouncement.vue
new file mode 100644
index 000000000..30504ca86
--- /dev/null
+++ b/next-web/packages/workspace/module/announcement/editAnnouncement.vue
@@ -0,0 +1,129 @@
+<template>
+  <FForm
+    ref="formRef"
+    :label-width="100"
+    label-position="right"
+    :model="formData"
+    :rules="formRules"
+  >
+    <FFormItem :label="$t('announcement.announcementContent')" prop="content">
+      <FInput
+        v-model="formData.content"
+        type="textarea"
+        :placeholder="$t('announcement.pleaseEnter')"
+        clearable
+        show-word-limit
+        :maxlength="500"
+        :autosize="{ minRows: 3, maxRows: 3 }"
+      />
+    </FFormItem>
+    <FFormItem
+      :label="$t('announcement.announcementStartTime')"
+      prop="startTime"
+    >
+      <FDatePicker
+        v-model="formData.startTime"
+        type="datetime"
+        :hour-step="1"
+        :minute-step="1"
+        :second-step="1"
+        :min-date="new Date()"
+        :placeholder="$t('announcement.startTime')"
+        default-time="00:00:00"
+      />
+    </FFormItem>
+    <FFormItem :label="$t('announcement.announcementEndTime')" prop="endTime">
+      <FDatePicker
+        v-model="formData.endTime"
+        type="datetime"
+        :hour-step="1"
+        :minute-step="1"
+        :second-step="1"
+        :min-date="endMinDate"
+        :placeholder="$t('announcement.endTime')"
+        default-time="00:00:00"
+      />
+    </FFormItem>
+  </FForm>
+</template>
+<script lang="ts" setup>
+import { ref, computed, onMounted } from 'vue';
+import { useI18n } from 'vue-i18n';
+import { FForm, FMessage } from '@fesjs/fes-design';
+import { request } from '@dataspherestudio/shared';
+
+const { t: $t } = useI18n();
+interface FormDataType {
+  content: string;
+  startTime: string;
+  endTime: string;
+}
+
+const props = defineProps({
+  api: {
+    type: Object,
+    default: () => ({}),
+  },
+});
+const init = (): FormDataType => ({
+  content: '',
+  startTime: '',
+  endTime: '',
+});
+const formData = ref<FormDataType>(init());
+
+onMounted(() => {
+  formData.value = init();
+});
+
+const formRules = computed(() => ({
+  content: [
+    {
+      required: true,
+      message: $t('announcement.pleaseEnter'),
+      trigger: ['input', 'blur'],
+    },
+  ],
+  startTime: [
+    {
+      required: true,
+      message: $t('announcement.pleaseSelect'),
+      trigger: ['change', 'blur'],
+    },
+  ],
+  endTime: [
+    {
+      required: true,
+      message: $t('announcement.pleaseSelect'),
+      trigger: ['change', 'blur'],
+    },
+    {
+      validator: (rule: unknown, value: number) => {
+        if (!formData.value.startTime || value > +formData.value.startTime) {
+          return true;
+        }
+        return false;
+      },
+      message: '结束时间必须大于起始时间',
+      trigger: ['change', 'blur'],
+    },
+  ],
+}));
+
+const endMinDate = computed(() => formData.value.startTime || new Date());
+
+// 自身校验
+const formRef = ref<InstanceType<typeof FForm> | null>(null);
+async function submit() {
+  await formRef.value?.validate();
+  const param = {
+    content: formData.value.content,
+    startTime: formData.value.startTime,
+    endTime: formData.value.endTime,
+  };
+  await request.fetch(props.api.createNotice, param, 'post');
+  FMessage.success($t('announcement.addAnnouncementMessage'));
+}
+
+defineExpose({ submit });
+</script>
diff --git a/next-web/packages/workspace/module/announcement/index.vue b/next-web/packages/workspace/module/announcement/index.vue
new file mode 100644
index 000000000..59ac85847
--- /dev/null
+++ b/next-web/packages/workspace/module/announcement/index.vue
@@ -0,0 +1,318 @@
+<template>
+  <BTablePage
+    :is-loading="isLoading"
+    action-type="loading"
+    class="dss-table-page"
+  >
+    <template #operate>
+      <FButton type="primary" @click="handleEdit">{{
+        $t('announcement.addAnnouncement')
+      }}</FButton>
+    </template>
+    <template #table>
+      <FTable ref="tableRef" :data="tableList" @sort-change="tableSort">
+        <template v-for="(item, index) in tableColumns">
+          <FTable-column
+            v-if="item.type === 'text'"
+            :key="item.prop + index"
+            :label="item.label"
+            :prop="item.prop"
+            :ellipsis="item.ellipsis"
+            :min-width="item.minWidth"
+            :formatter="item.formatter"
+          />
+          <FTable-column
+            v-else-if="item.type === 'time'"
+            :key="'time' + index"
+            :label="item.label"
+            :prop="item.prop"
+            :ellipsis="item.ellipsis"
+            :min-width="item.minWidth"
+            :formatter="item.formatter"
+            :sortable="item.sortable"
+          />
+          <FTable-column
+            v-else-if="item.type === 'link'"
+            v-slot="{ row }"
+            :key="'link' + index"
+            :label="item.label"
+            :prop="item.prop"
+            :ellipsis="item.ellipsis"
+            :min-width="item.minWidth"
+            :formatter="item.formatter"
+          >
+            <span v-if="+row.status === 2" style="color: #93949b">{{
+              $t('announcement.expired')
+            }}</span>
+            <span v-else-if="+row.status === 1" style="color: #00cb91">{{
+              $t('announcement.inEffect')
+            }}</span>
+            <span v-else style="color: #0f1222">{{
+              $t('announcement.notActivated')
+            }}</span>
+          </FTable-column>
+          <FTable-column
+            v-else-if="item.type === 'action'"
+            v-slot="{ row }"
+            :key="item.prop"
+            :label="item.label"
+            :min-width="item.minWidth"
+            fixed="right"
+          >
+            <span
+              v-if="+row.status !== 2"
+              style="color: #ff4d4f; cursor: pointer"
+              @click="handleDelete(row)"
+              >{{ $t('announcement.delete') }}</span
+            >
+            <span v-else style="color: #b7b7bc; cursor: not-allowed">{{
+              $t('announcement.delete')
+            }}</span>
+          </FTable-column>
+        </template>
+      </FTable>
+    </template>
+    <template #pagination>
+      <FPagination
+        show-total
+        :page-size="pagination.pageSize"
+        :current-page="pagination.pageNow"
+        show-size-changer
+        :page-size-option="[10, 20, 50, 100]"
+        :total-count="pagination.totalCount"
+        @change="handlePageChange"
+      >
+      </FPagination>
+    </template>
+  </BTablePage>
+
+  <!-- 动态组件 -->
+  <FModal
+    v-model:show="showEdit"
+    :title="$t('announcement.addAnnouncement')"
+    :mask-closable="false"
+    display-directive="if"
+    @ok="handleOk"
+    @cancel="handleCancel"
+  >
+    <EditAnnouncement ref="editRef" :api="announceApi" />
+  </FModal>
+</template>
+<script lang="ts" setup>
+import { onMounted, ref, computed } from 'vue';
+import { useI18n } from 'vue-i18n';
+import { request } from '@dataspherestudio/shared';
+import { FModal, FMessage } from '@fesjs/fes-design';
+import {
+  usePagination,
+  type PaginationAndParams,
+} from '../hooks/usePagination';
+import EditAnnouncement from './editAnnouncement.vue';
+import api from './api';
+import { useRoute } from 'vue-router';
+
+type ObjectType = Record<string, unknown>;
+const { t: $t } = useI18n();
+const route = useRoute();
+
+const init = () => ({
+  sortBy: 'createTime',
+  orderBy: 'descend',
+});
+const searchForm = ref(init());
+const announceApi = computed(() =>
+  route.query.env === 'scripts' ? api['scripts'] : api
+);
+
+// 查询参数
+const params = computed(() => ({
+  ...searchForm.value,
+}));
+
+/**
+ * @description: 获取table数据
+ * @return {*}
+ */
+const tableList = ref<ObjectType[]>([]);
+async function loadTable(param: PaginationAndParams) {
+  const parametter = {
+    sortBy: param.sortBy,
+    orderBy: param.orderBy,
+    pageSize: param.pageSize,
+    currentPage: param.pageNow,
+  };
+  const res = await request.fetch(announceApi.value.getNoticeList, parametter);
+  tableList.value = res.data?.noticeList || [];
+  return {
+    totalPage: Math.ceil(res.data.total / (param.pageSize as number)),
+    totalCount: res.data.total,
+    pageNow: param.pageNow,
+  };
+}
+
+/**
+ * @description: 分页查询事件
+ * @return {*}
+ */
+const {
+  isLoading,
+  pagination,
+  handleInit,
+  handleCurrent,
+  handleCurrentChange,
+  fillText,
+  fillTimeText,
+} = usePagination(params, loadTable);
+
+async function handleSearch() {
+  await handleInit();
+  tableRef.value?.sort(searchForm.value.sortBy, searchForm.value.orderBy);
+}
+
+async function handlePageChange(currentPage: number, pageSize: number) {
+  await handleCurrentChange(currentPage, pageSize);
+  tableRef.value?.sort(searchForm.value.sortBy, searchForm.value.orderBy);
+}
+
+// 判断排序参数是否和上次相同
+const compareSortParams = (prop: string, order: string) => {
+  return prop === searchForm.value.sortBy && order === searchForm.value.orderBy;
+};
+
+// 表格排序
+const tableRef: any = ref(null);
+const tableSort = async (sortParam: { prop: string; order: string }) => {
+  const tempOrder = sortParam.order ? sortParam.order : 'descend';
+  if (!compareSortParams(sortParam.prop, tempOrder)) {
+    searchForm.value.sortBy = sortParam.prop;
+    searchForm.value.orderBy = tempOrder;
+    await handleCurrent();
+    tableRef.value?.sort(searchForm.value.sortBy, searchForm.value.orderBy);
+  }
+};
+
+onMounted(() => {
+  handleSearch();
+});
+
+// 编辑
+type EditAnnouncementType = InstanceType<typeof EditAnnouncement>;
+const editRef = ref<EditAnnouncementType | null>(null);
+const showEdit = ref(false);
+function handleEdit() {
+  showEdit.value = true;
+}
+
+function handleCancel() {
+  showEdit.value = false;
+}
+
+async function handleOk() {
+  if (editRef.value) {
+    await editRef.value.submit();
+    handleCancel();
+    handleSearch();
+  }
+}
+
+// 删除
+function handleDelete(row: ObjectType) {
+  FModal.confirm({
+    title: '确认',
+    content: `确认将公告【${row.id}】删除吗？`,
+    onOk: async () => {
+      try {
+        await request.fetch(
+          announceApi.value.deleteNotice,
+          { noticeId: row.id },
+          'post'
+        );
+        FMessage.success('公告删除成功!');
+        handleSearch();
+        return Promise.resolve();
+      } catch (err) {
+        console.warn(err);
+      }
+    },
+    onCancel() {
+      return Promise.resolve();
+    },
+  });
+}
+
+// 设置表格
+const tableColumns = ref([
+  {
+    type: 'text',
+    prop: 'id',
+    label: $t('announcement.announcementId'),
+    ellipsis: true,
+    minWidth: 116,
+    formatter: fillText,
+  },
+  {
+    type: 'text',
+    prop: 'content',
+    label: $t('announcement.announcementContent'),
+    ellipsis: true,
+    minWidth: 400,
+    formatter: fillText,
+  },
+  {
+    type: 'time',
+    prop: 'startTime',
+    label: $t('announcement.announcementStartTime'),
+    ellipsis: true,
+    minWidth: 182,
+    sortable: true,
+    formatter: fillTimeText,
+  },
+  {
+    type: 'time',
+    prop: 'endTime',
+    label: $t('announcement.announcementEndTime'),
+    ellipsis: true,
+    minWidth: 182,
+    sortable: true,
+    formatter: fillTimeText,
+  },
+  {
+    type: 'link',
+    prop: 'status',
+    label: $t('announcement.announcementStatus'),
+    ellipsis: true,
+    minWidth: 88,
+    formatter: fillText,
+  },
+  {
+    type: 'text',
+    prop: 'createUser',
+    label: $t('announcement.creator'),
+    ellipsis: true,
+    minWidth: 120,
+    formatter: fillText,
+  },
+  {
+    type: 'time',
+    prop: 'createTime',
+    label: $t('announcement.createTime'),
+    ellipsis: true,
+    minWidth: 182,
+    sortable: true,
+    formatter: fillTimeText,
+  },
+  {
+    type: 'action',
+    prop: 'action',
+    label: $t('announcement.operation'),
+    minWidth: 60,
+  },
+]);
+</script>
+<style lang="less" scoped>
+.dss-table-page {
+  :deep(.fes-divider) {
+    display: none;
+  }
+}
+</style>
diff --git a/next-web/packages/workspace/module/components/NavHeader.vue b/next-web/packages/workspace/module/components/NavHeader.vue
new file mode 100644
index 000000000..30f10cf8b
--- /dev/null
+++ b/next-web/packages/workspace/module/components/NavHeader.vue
@@ -0,0 +1,89 @@
+<template>
+  <ul class="nav-container">
+    <li class="nav-container__back isOperate" @click="back">
+      <LeftOutlined class="font_active" />
+    </li>
+    <li class="nav-container__title font_active">
+      {{ title }}
+    </li>
+  </ul>
+</template>
+<script lang="ts" setup>
+import { computed } from 'vue';
+import { useRouter } from 'vue-router';
+import { LeftOutlined } from '@fesjs/fes-design/icon';
+
+const props = defineProps({
+  title: {
+    // 标题
+    type: String,
+    default: '',
+  },
+  direcBackPath: {
+    type: String,
+    default: '',
+  },
+});
+
+// 菜单标题
+const title = computed(() => props.title);
+const router = useRouter();
+
+// 返回上一级
+const back = () => {
+  // 微应用的跳转
+  if (window?.__MICRO_APP_ENVIRONMENT__) {
+    if (
+      window.history.length &&
+      window.history.length > 1 &&
+      !props.direcBackPath
+    ) {
+      window.history.go(-1);
+    } else {
+      const path = `${window.location.href.split('#')[0]}#/`;
+      window.location.href = path;
+      window.location.reload();
+    }
+    return;
+  }
+  // 普通跳转
+  if (!props.direcBackPath) {
+    // 存在输入路径的情况
+    const hasBack = window?.history?.state?.back;
+    hasBack ? router.back() : router.replace('/');
+  } else {
+    // 没有制定路径的情况
+    router.replace({ path: props.direcBackPath });
+  }
+};
+</script>
+<style lang="less">
+@activeColor: #0f1222;
+@fontSize: 16px;
+.nav-container {
+  padding-bottom: 14px;
+  font-size: 0;
+  display: flex;
+  background: #f2f2f2;
+  li {
+    height: 26px;
+    line-height: 26px;
+    font-size: @fontSize;
+    color: #93949b;
+  }
+  .isOperate {
+    cursor: pointer;
+  }
+  &__back {
+    margin-right: 6px;
+    display: inline-flex;
+    align-items: center;
+  }
+  &__title {
+    margin-right: 10px;
+  }
+  .font_active {
+    color: @activeColor;
+  }
+}
+</style>
diff --git a/next-web/packages/workspace/module/hooks/usePagination.ts b/next-web/packages/workspace/module/hooks/usePagination.ts
new file mode 100644
index 000000000..abfd46705
--- /dev/null
+++ b/next-web/packages/workspace/module/hooks/usePagination.ts
@@ -0,0 +1,98 @@
+import { ref, computed, type Ref, type ComputedRef, onMounted } from 'vue';
+import { useDateFormat } from '@vueuse/core';
+
+export type PaginationAndParams = {
+  pageNow?: number;
+  pageSize?: number;
+  totalCount?: number;
+  totalPage?: number;
+  [index: string]: any;
+};
+
+export const usePagination = (
+  param?: Ref<PaginationAndParams>,
+  cb?: (param: PaginationAndParams) => Promise<PaginationAndParams>
+) => {
+  // 分页信息初始化
+  const init = () => ({
+    pageNow: 1,
+    pageSize: 10,
+    totalCount: 0,
+    totalPage: 0,
+  });
+  const pagination = ref<PaginationAndParams>(init());
+  const isLoading = ref(false); // 加载中
+
+  // 查询参数
+  const parameter: ComputedRef<PaginationAndParams> = computed(() => ({
+    ...param?.value,
+    pageNow: pagination.value.pageNow,
+    pageSize: pagination.value.pageSize,
+  }));
+
+  // 设置分页
+  const setPagination = (params: { [index: string]: unknown } = {}): void => {
+    Object.keys(params).forEach((key: string) => {
+      pagination.value[key] = params[key];
+    });
+  };
+
+  // 回调函数
+  const callback = async () => {
+    try {
+      if (cb) {
+        isLoading.value = true;
+        const pagedata = await cb(parameter.value);
+        isLoading.value = false;
+        setPagination(pagedata);
+      }
+    } catch (error) {
+      isLoading.value = false;
+      console.log(error);
+    }
+  };
+
+  // 查询表单
+  const handleInit = async () => {
+    pagination.value.pageNow = 1;
+    await callback();
+  };
+
+  // 查询表单
+  const handleCurrent = async () => {
+    await callback();
+  };
+
+  // 分页事件
+  const handleCurrentChange = async (currentPage: number, pageSize: number) => {
+    pagination.value.pageSize = pageSize;
+    pagination.value.pageNow = currentPage;
+    await callback();
+  };
+
+  onMounted(() => {
+    pagination.value.pageSize = param?.value?.pageSize || 10;
+    pagination.value.pageNow = param?.value?.pageNow || 1;
+  });
+
+  // 表格内容filter
+  const fillText = (row: { [index: string]: unknown }) =>
+    ['null', 'undefined', ''].includes(String(row.cellValue))
+      ? '- -'
+      : row.cellValue;
+
+  // 表格内容filter
+  const fillTimeText = (row: { [index: string]: unknown }) =>
+    ['null', 'undefined', ''].includes(String(row.cellValue))
+      ? '- -'
+      : useDateFormat(row.cellValue as string, 'YYYY-MM-DD HH:mm:ss').value;
+  return {
+    isLoading,
+    pagination,
+    handleInit,
+    handleCurrent,
+    handleCurrentChange,
+    fillText,
+    fillTimeText,
+  };
+};
diff --git a/next-web/packages/workspace/module/hooks/useTableConfig.ts b/next-web/packages/workspace/module/hooks/useTableConfig.ts
new file mode 100644
index 000000000..fcd1421b4
--- /dev/null
+++ b/next-web/packages/workspace/module/hooks/useTableConfig.ts
@@ -0,0 +1,21 @@
+import { ref, computed, type Ref } from 'vue';
+type ObjectType = Record<string, unknown>;
+export const useTableConfig = (origins: Ref) => {
+  // 用于接收当前需要展示的表头的列
+  const headers = ref([]);
+  const originHeaders = computed(() =>
+    (origins.value as ObjectType[]).filter(
+      (v) => !['action', 'selection'].includes(v.type as string)
+    )
+  );
+  const showTableHeaderConfig = ref(false);
+  // 判断表头是否展示
+  const checkTColShow = (col: string) =>
+    headers.value.map((item: ObjectType) => item.prop).includes(col);
+  return {
+    headers,
+    originHeaders,
+    showTableHeaderConfig,
+    checkTColShow,
+  };
+};
diff --git a/next-web/packages/workspace/module/resourceTmlManage/api.ts b/next-web/packages/workspace/module/resourceTmlManage/api.ts
new file mode 100644
index 000000000..f0667f19e
--- /dev/null
+++ b/next-web/packages/workspace/module/resourceTmlManage/api.ts
@@ -0,0 +1,267 @@
+import { request } from '@dataspherestudio/shared';
+
+// 工作流引用列表获取工作流名称下拉框
+export function fetchworkFlowNames(templateId: string) {
+  return request
+    .fetch(
+      'dss/framework/orchestrator/getTemplateflowNames?templateId=' + templateId
+    )
+    .then((res: any) => {
+      if (!res) {
+        return {};
+      }
+      return {
+        orchestratorNames: res.data.orchestratorNames,
+      };
+    })
+    .catch((error: any) => {
+      //
+    });
+}
+// 工作流引用列表获取项目名称下拉框
+export function fetchworkFlowProjectNames(templateId: string) {
+  return request
+    .fetch(
+      'dss/framework/orchestrator/getTemplateProjectNames?templateId=' +
+        templateId
+    )
+    .then((res: any) => {
+      if (!res) {
+        return {};
+      }
+      return {
+        projectNames: res.data.projectNames,
+      };
+    })
+    .catch((error: any) => {
+      //
+    });
+}
+
+// 指定模板资源参数
+export function fetchResParams(paramString: string): Promise<{ conf: any }> {
+  const url =
+    'dss/framework/workspace/engineconf/getConfTemplateParamDetail?' +
+    paramString;
+  return new Promise((resolve, reject) => {
+    request
+      .fetch(url)
+      .then((res: any) => {
+        if (!res) {
+          resolve({ conf: {} });
+          return;
+        }
+        resolve({
+          conf: res.data.conf,
+        });
+      })
+      .catch((error: any) => {
+        reject(error);
+      });
+  });
+}
+// 模板列表数据
+export function fetchTemplateTableData(paramsString = {}) {
+  const url =
+    'dss/framework/workspace/engineconf/getConfTemplateList?' + paramsString;
+  return request
+    .fetch(url)
+    .then((res: any) => {
+      if (!res) {
+        return { data: {} };
+      }
+      return res;
+    })
+    .catch((error: any) => {
+      //
+    });
+}
+
+// 引擎类型下拉框数据
+export function fetchEngineTypes() {
+  return request
+    .fetch('dss/framework/workspace/engineconf/getEngineTypeList')
+    .then((res: any) => {
+      if (!res) {
+        return { engineTypes: {} };
+      }
+      return {
+        engineTypes: res.data.engineTypes,
+      };
+    })
+    .catch((error: any) => {
+      //
+    });
+}
+
+// 获取所有部门科室
+export function fetchDepartments() {
+  const url = 'dss/framework/workspace/getAllDepartments';
+  return request
+    .fetch(url)
+    .then((res: any) => {
+      if (!res) {
+        return { departments: [] };
+      }
+      return {
+        departments: res.data.departments,
+      };
+    })
+    .catch((error: any) => {
+      //
+    });
+}
+
+export function fetchRelateUsersDepts(workspaceId: string) {
+  const url =
+    'dss/framework/workspace/getAllWorkspaceUsersWithDepartment?workspaceId=' +
+    workspaceId;
+  return request
+    .fetch(url)
+    .then((res: any) => {
+      if (!res) {
+        return { users: {} };
+      }
+      return {
+        users: res.data.users,
+      };
+    })
+    .catch((error: any) => {
+      //
+    });
+}
+
+// 指定工作空间下所有用户下拉框数据
+export function fetchRelateUsers(workspaceId: string) {
+  const url =
+    'dss/framework/workspace/getAllWorkspaceUsers?workspaceId=' + workspaceId;
+  return request
+    .fetch(url)
+    .then((res: any) => {
+      if (!res) {
+        return { users: {} };
+      }
+      return {
+        users: res.data.users,
+      };
+    })
+    .catch((error: any) => {
+      //
+    });
+}
+
+// 指定模板下可见用户列表数据 表格和下拉框均用该接口
+export function fetchTemplateUser(paramsString: string) {
+  const url =
+    'dss/framework/workspace/engineconf/getConfTemplateUserList?' +
+    paramsString;
+  return request.fetch(url);
+}
+// 查询工作流引用列表数据
+export function fetchWorkFlows(paramsString: string): Promise<{ data: any }> {
+  const url =
+    'dss/framework/orchestrator/getTemplateWorkflowPageInfo?' + paramsString;
+  return new Promise((resolve, reject) => {
+    request
+      .fetch(url)
+      .then((res: any) => {
+        if (!res) {
+          resolve({ data: {} });
+          return;
+        }
+        resolve({
+          data: res.data,
+        });
+      })
+      .catch((error: any) => {
+        reject(error);
+      });
+  });
+}
+// 查询应用引用列表数据
+export function fetchApps(paramsString: string): Promise<{ data: any }> {
+  const url =
+    'dss/framework/workspace/engineconf/getConfTemplateApplyInfo?' +
+    paramsString;
+  return new Promise((resolve, reject) => {
+    request
+      .fetch(url)
+      .then((res: any) => {
+        if (!res) {
+          resolve({ data: {} });
+          return;
+        }
+        resolve({
+          data: res.data,
+        });
+      })
+      .catch((error: any) => {
+        reject(error);
+      });
+  });
+}
+
+// 删除模板
+export function deleteTemplate(templateId: string) {
+  const url =
+    'dss/framework/workspace/engineconf/deleteConfTemplate/' + templateId;
+  return new Promise((resolve, reject) => {
+    request
+      .fetch(url, {}, { method: 'post' })
+      .then((res: any) => {
+        if (!res) {
+          resolve({ data: {} });
+          return;
+        }
+        resolve({
+          data: res.data,
+        });
+      })
+      .catch((error: any) => {
+        reject(error);
+      });
+  });
+}
+
+// 模板名称唯一性校验
+export function fetchUniqueName(name: string) {
+  const url =
+    'dss/framework/workspace/engineconf/checkConfTemplateName?name=' + name;
+  return new Promise((resolve, reject) => {
+    request
+      .fetch(url)
+      .then((res: any) => {
+        if (!res) {
+          resolve({ data: {} });
+          return;
+        }
+        resolve({
+          data: res.data,
+        });
+      })
+      .catch((error: any) => {
+        reject(error);
+      });
+  });
+}
+
+// 创建或编辑模板
+export function fetchSaveTemplate(params: object) {
+  const url = 'dss/framework/workspace/engineconf/saveConfTemplate';
+  return new Promise((resolve, reject) => {
+    request
+      .fetch(url, JSON.stringify(params), { method: 'put' })
+      .then((res: any) => {
+        if (!res) {
+          resolve({ data: {} });
+          return;
+        }
+        resolve({
+          data: res.data,
+        });
+      })
+      .catch((error: any) => {
+        reject(error);
+      });
+  });
+}
diff --git a/next-web/packages/workspace/module/resourceTmlManage/applicationRule/api.ts b/next-web/packages/workspace/module/resourceTmlManage/applicationRule/api.ts
new file mode 100644
index 000000000..6bfd11724
--- /dev/null
+++ b/next-web/packages/workspace/module/resourceTmlManage/applicationRule/api.ts
@@ -0,0 +1,18 @@
+export default {
+  // 公共接口
+  getApplicationList: 'dss/framework/workspace/engineconf/getApplicationList', // 加载关联应用
+  getEngineTypeList: 'dss/framework/workspace/engineconf/getEngineTypeList', // 加载引擎类型
+  getEngineNameList: 'dss/framework/workspace/engineconf/getEngineNameList', // 加载引擎名
+  getConfTemplateList: 'dss/framework/workspace/engineconf/getConfTemplateList', // 加载模板名称
+  getConfTemplateUserList:
+    'dss/framework/workspace/engineconf/getConfTemplateApplyRuleUserList', // 加载覆盖用户
+  // 获取应用规则接口
+  getConfTemplateApplyRuleList:
+    'dss/framework/workspace/engineconf/getConfTemplateApplyRuleList', // 查询模板应用规则
+  saveConfTemplateApplyRule:
+    'dss/framework/workspace/engineconf/saveConfTemplateApplyRule', // 新增模板应用规则
+  deleteConfTemplateApplyRule:
+    'dss/framework/workspace/engineconf/deleteConfTemplateApplyRule', // 删除模板应用规则
+  getConfTemplateApplyHistory:
+    'dss/framework/workspace/engineconf/getConfTemplateApplyHistory', // 查询模板应用执行记录
+};
diff --git a/next-web/packages/workspace/module/resourceTmlManage/applicationRule/editRule.vue b/next-web/packages/workspace/module/resourceTmlManage/applicationRule/editRule.vue
new file mode 100644
index 000000000..0909e52a3
--- /dev/null
+++ b/next-web/packages/workspace/module/resourceTmlManage/applicationRule/editRule.vue
@@ -0,0 +1,382 @@
+<template>
+  <FForm
+    ref="formRef"
+    :label-width="100"
+    label-position="top"
+    :model="formData"
+    :rules="formRules"
+  >
+    <FFormItem label="规则类型" prop="ruleType">
+      <FSelect
+        v-model="formData.ruleType"
+        :options="ruleTypes"
+        placeholder="请选择规则类型"
+        filterable
+        clearable
+        value-field="value"
+        label-field="label"
+        @change="handleChange('rule_type')"
+      />
+    </FFormItem>
+    <FFormItem label="关联应用" prop="application">
+      <FSelect
+        v-model="formData.application"
+        :options="bindApplications"
+        placeholder="请选择关联应用"
+        filterable
+        clearable
+        value-field="valueField"
+        label-field="labelField"
+        @focus="handleSelect('bind_application')"
+        @change="handleChange('bind_application')"
+      />
+    </FFormItem>
+    <FFormItem label="引擎类型" prop="engineName">
+      <FSelect
+        v-model="formData.engineName"
+        :options="engineNames"
+        placeholder="请选择引擎类型"
+        filterable
+        clearable
+        value-field="valueField"
+        label-field="labelField"
+        @focus="handleSelect('engine_name', formData.application)"
+        @change="handleChange('engine_name')"
+      />
+    </FFormItem>
+    <FFormItem label="模板名称" prop="templateId">
+      <FSelect
+        v-model="formData.templateId"
+        :options="templateNames"
+        placeholder="请选择模板名称"
+        filterable
+        clearable
+        value-field="valueField"
+        label-field="labelField"
+        @focus="handleSelect('template_name', formData.engineName)"
+      />
+    </FFormItem>
+    <FFormItem label="覆盖范围" prop="permissionType">
+      <FSelect
+        v-model="formData.permissionType"
+        :options="overlayList"
+        placeholder="请选择覆盖范围"
+        filterable
+        clearable
+        value-field="value"
+        label-field="label"
+        :disabled="+formData.ruleType === 1"
+        @change="handleChange('permission_type')"
+      />
+    </FFormItem>
+    <FFormItem
+      v-if="+formData.permissionType === 1"
+      ref="permissionUsersRef"
+      label="覆盖用户"
+      prop="permissionUsers"
+    >
+      <FSelectCascader
+        v-model="formData.permissionUsers"
+        :data="cascadUserList"
+        placeholder="请选择覆盖用户"
+        multiple
+        :cascade="true"
+        check-strictly="child"
+        clearable
+        expand-trigger="click"
+        :show-path="false"
+      />
+      <UploadOutlined class="upload" :size="20" @click="openBatchUpload" />
+    </FFormItem>
+    <FFormItem
+      v-if="+formData.permissionType === 2"
+      label="覆盖部门"
+      prop="permissionDepartments"
+    >
+      <FSelect
+        v-model="formData.permissionDepartments"
+        :options="allDeptList"
+        placeholder="默认为全部，若指定，则只有指定部门的工作空间新用户，才会下发该规则"
+        filterable
+        clearable
+        multiple
+        collapse-tags
+        :collapse-tags-limit="2"
+      />
+    </FFormItem>
+  </FForm>
+  <FModal
+    v-model:show="showBatchUpload"
+    title="批量导入用户"
+    :mask-closable="false"
+    display-directive="if"
+    @ok="handleOkUpload"
+    @cancel="handleCancelUpload"
+  >
+    <FInput
+      v-model="batchUploadForm.batchUsers"
+      type="textarea"
+      placeholder="请输入用户名，例如: enjoyyin,owewnxu,leebai"
+    />
+  </FModal>
+</template>
+<script lang="ts" setup>
+import { UploadOutlined } from '@fesjs/fes-design/icon';
+import { ref, computed, onMounted } from 'vue';
+import { useDataList } from './hooks/useDataList';
+import { FForm, FMessage, FSelectCascader } from '@fesjs/fes-design';
+import { request } from '@dataspherestudio/shared';
+import { useDataList as useOtherDataList } from '../hooks/useDataList';
+import api from './api';
+
+const props = defineProps({
+  workspaceId: {
+    type: String,
+    required: true,
+    default: '',
+  },
+});
+const workspaceId = computed(() => props.workspaceId);
+const permissionUsersRef = ref(null);
+const {
+  bindApplications, // 关联应用
+  engineNames, // 引擎类型
+  templateNames, // 模板名称
+  ruleTypes, // 规则类型
+  overlayAreas, // 覆盖范围,
+  handleSelect,
+} = useDataList(workspaceId);
+
+const {
+  allDeptList,
+  loadAllDeptList,
+  allWorkSpaceUserDeptsList,
+  loadAllWorkSpaceUserDeptsList,
+} = useOtherDataList();
+
+interface FormDataType {
+  ruleType: string;
+  templateId: string;
+  engineName: string;
+  permissionType: string | number;
+  permissionUsers?: string[];
+  application: string;
+  permissionDepartments?: string[];
+}
+
+const init = (): FormDataType => ({
+  ruleType: '', // 规则类型
+  templateId: '', // 模板id
+  engineName: '', // 引擎类型
+  permissionType: '', // 覆盖范围
+  permissionUsers: [], // 覆盖用户
+  application: '', // 应用类型
+  permissionDepartments: [], // 覆盖部门 只有工作空间新用户会选择
+});
+const formData = ref<FormDataType>(init());
+
+onMounted(() => {
+  formData.value = init();
+});
+
+const formRules = computed(() => ({
+  ruleType: [
+    {
+      required: true,
+      message: '请选择',
+      trigger: ['change', 'blur'],
+    },
+  ],
+  templateId: [
+    {
+      required: true,
+      message: '请选择',
+      trigger: ['change', 'blur'],
+    },
+  ],
+  engineName: [
+    {
+      required: true,
+      message: '请选择',
+      trigger: ['change', 'blur'],
+    },
+  ],
+  application: [
+    {
+      required: true,
+      message: '请选择',
+      trigger: ['change', 'blur'],
+    },
+  ],
+  permissionType: [
+    {
+      required: true,
+      message: '请选择',
+      trigger: ['change', 'blur'],
+    },
+  ],
+  permissionUsers: [
+    {
+      required: true,
+      type: 'array' as const,
+      message: '请选择',
+      trigger: ['change', 'blur'],
+    },
+  ],
+}));
+
+// 自身校验
+const formRef = ref<InstanceType<typeof FForm> | null>(null);
+async function submit() {
+  await formRef.value?.validate();
+  const param: { [index: string]: any } = {
+    ruleType: formData.value.ruleType,
+    templateId: formData.value.templateId,
+    engineName: formData.value.engineName,
+    permissionType: +formData.value.permissionType,
+    application: formData.value.application,
+  };
+  if (param.permissionType === 1) {
+    param.permissionUsers = formData.value.permissionUsers || [];
+  }
+  if (formData.value.permissionDepartments.length > 0) {
+    param.permissionType = 3;
+    param.permissionDepartments = formData.value.permissionDepartments || [];
+  }
+  await request.fetch(api.saveConfTemplateApplyRule, param, 'put');
+  FMessage.success('新建规则成功!');
+}
+
+// 覆盖范围
+const overlayList = ref<Record<string, unknown>[]>([]);
+function handleChange(type: string) {
+  switch (type) {
+    case 'rule_type':
+      if (+formData.value.ruleType === 1) {
+        formData.value.permissionType = '2';
+        formData.value.permissionUsers = [];
+        formData.value.permissionDepartments = [];
+        overlayList.value = overlayAreas.value.filter(
+          (item) => item.value === '2'
+        );
+        formRef.value?.clearValidate();
+      } else {
+        formData.value.permissionType = '';
+        formData.value.permissionUsers = [];
+        formData.value.permissionDepartments = [];
+        overlayList.value = overlayAreas.value.filter(
+          (item) => item.value !== '2'
+        );
+      }
+      break;
+    case 'bind_application':
+      engineNames.value = [];
+      formData.value.engineName = '';
+      templateNames.value = [];
+      formData.value.templateId = '';
+      break;
+    case 'engine_name':
+      templateNames.value = [];
+      formData.value.templateId = '';
+      break;
+    case 'permission_type':
+      formData.value.permissionUsers = [];
+      break;
+    default:
+      break;
+  }
+}
+const batchUploadForm = ref({
+  batchUsers: '',
+  batchUserArray: [],
+});
+const showBatchUpload = ref(false);
+const openBatchUpload = () => {
+  showBatchUpload.value = true;
+  batchUploadForm.value.batchUsers = '';
+};
+const handleCancelUpload = () => {
+  showBatchUpload.value = false;
+};
+const handleOkUpload = () => {
+  batchUploadForm.value.batchUserArray =
+    batchUploadForm.value.batchUsers.split(/[,，]/);
+  const tempInsertData = batchUploadForm.value.batchUserArray.filter(
+    (element) =>
+      allWorkSpaceUserDeptsList.value.find((obj) => obj.name === element)
+  );
+  tempInsertData.forEach((element) => {
+    if (!formData.value.permissionUsers.includes(element)) {
+      formData.value.permissionUsers.push(element);
+    }
+  });
+  showBatchUpload.value = false;
+  if (formData.value.permissionUsers.length > 0) {
+    permissionUsersRef.value.clearValidate();
+  }
+};
+
+const cascadUserList = ref([]);
+interface User {
+  department: string;
+  name: string;
+  office: number;
+}
+
+interface CascadeData {
+  label: string;
+  value: string;
+  children: CascadeData[];
+}
+function convertUserDataToCascadeData(userData: User[]): CascadeData[] {
+  const cascadeData: CascadeData[] = [];
+
+  for (const user of userData) {
+    const department = user.department;
+    const name = user.name;
+
+    // 检查是否已存在对应的部门对象
+    const departmentObj = cascadeData.find((obj) => obj.label === department);
+
+    if (departmentObj) {
+      // 部门对象已存在，将当前用户对象添加到部门对象的子数组中
+      departmentObj.children.push({
+        label: name,
+        value: name,
+        children: [],
+      });
+    } else {
+      // 部门对象不存在，创建新的部门对象，并将当前用户对象添加到部门对象的子数组中
+      const newDepartmentObj: CascadeData = {
+        label: department,
+        value: department,
+        children: [
+          {
+            label: name,
+            value: name,
+            children: [],
+          },
+        ],
+      };
+      cascadeData.push(newDepartmentObj);
+    }
+  }
+
+  return cascadeData;
+}
+
+onMounted(async () => {
+  await loadAllDeptList();
+  await loadAllWorkSpaceUserDeptsList(workspaceId.value as string);
+  cascadUserList.value = convertUserDataToCascadeData(
+    allWorkSpaceUserDeptsList.value
+  );
+});
+
+defineExpose({ submit });
+</script>
+<style lang="less" scoped>
+.upload {
+  margin-left: 8px;
+}
+</style>
diff --git a/next-web/packages/workspace/module/resourceTmlManage/applicationRule/executionRecord.vue b/next-web/packages/workspace/module/resourceTmlManage/applicationRule/executionRecord.vue
new file mode 100644
index 000000000..baa75e325
--- /dev/null
+++ b/next-web/packages/workspace/module/resourceTmlManage/applicationRule/executionRecord.vue
@@ -0,0 +1,230 @@
+<template>
+  <div class="dss-drawer__table">
+    <BTablePage :is-loading="isLoading" action-type="loading">
+      <template #search>
+        <BSearch
+          v-model:form="searchForm"
+          @search="handleInit"
+          @reset="handleReset"
+        >
+          <template #form>
+            <div>
+              <FInput
+                v-model="searchForm.templateName"
+                placeholder="模板名称"
+              ></FInput>
+            </div>
+            <div>
+              <FSelect
+                v-model="searchForm.engineType"
+                :options="engineTypes"
+                placeholder="引擎类型"
+                filterable
+                clearable
+                value-field="valueField"
+                label-field="labelField"
+                @focus="handleSelect('engine_type')"
+              />
+            </div>
+            <div>
+              <FSelect
+                v-model="searchForm.username"
+                :options="allWorkSpaceUserList"
+                placeholder="覆盖用户"
+                filterable
+                clearable
+                value-field="value"
+                label-field="label"
+                @focus="loadAllWorkSpaceUserList(workspaceId as string)"
+              />
+            </div>
+            <div>
+              <FSelect
+                v-model="searchForm.application"
+                :options="bindApplications"
+                placeholder="关联应用"
+                filterable
+                clearable
+                value-field="valueField"
+                label-field="labelField"
+                @focus="handleSelect('bind_application')"
+              />
+            </div>
+          </template>
+        </BSearch>
+      </template>
+      <template #table>
+        <FTable ref="tableRef" :data="tableList">
+          <FTable-column
+            prop="templateName"
+            label="模板名称"
+            :min-width="180"
+            :formatter="fillText"
+            ellipsis
+          />
+          <FTable-column
+            prop="engineType"
+            label="引擎类型"
+            :min-width="120"
+            :formatter="fillText"
+            ellipsis
+          />
+          <FTable-column
+            prop="userName"
+            label="覆盖用户人"
+            :min-width="120"
+            :formatter="fillText"
+            ellipsis
+          />
+          <FTable-column
+            prop="application"
+            label="关联应用"
+            :min-width="130"
+            :formatter="fillText"
+            ellipsis
+          />
+          <FTable-column
+            v-slot="{ row }"
+            prop="status"
+            label="执行状态"
+            :min-width="88"
+            :formatter="fillText"
+            ellipsis
+          >
+            <span v-if="+row.status === 2" style="color: #f75f56"
+              >执行失败</span
+            >
+            <span v-else-if="+row.status === 1" style="color: #00cb91"
+              >执行成功</span
+            >
+            <span v-else style="color: #0f1222">未执行</span>
+          </FTable-column>
+          <FTable-column
+            prop="executeUser"
+            label="执行人"
+            :min-width="120"
+            :formatter="fillText"
+            ellipsis
+          />
+          <FTable-column
+            prop="executeTime"
+            label="执行时间"
+            :min-width="182"
+            :formatter="fillTimeText"
+            ellipsis
+          />
+        </FTable>
+      </template>
+      <template #pagination>
+        <FPagination
+          show-total
+          :page-size="pagination.pageSize"
+          :current-page="pagination.pageNow"
+          show-size-changer
+          :page-size-option="[10, 20, 50, 100]"
+          :total-count="pagination.totalCount"
+          @change="handleCurrentChange"
+        ></FPagination>
+      </template>
+    </BTablePage>
+  </div>
+</template>
+<script lang="ts" setup>
+import { onMounted, ref, computed } from 'vue';
+import { usePagination } from '../../hooks/usePagination';
+import { useDataList } from './hooks/useDataList';
+import { useDataList as useOtherDataList } from '../hooks/useDataList';
+import { request } from '@dataspherestudio/shared';
+import api from './api';
+import type { ComputedRef } from 'vue';
+import type { PaginationAndParams } from '../../hooks/usePagination';
+
+const props = defineProps({
+  workspaceId: {
+    type: String,
+    required: true,
+    default: '',
+  },
+});
+
+const {
+  bindApplications, // 关联应用
+  engineTypes, // 引擎类型
+  handleSelect,
+  jsonFilter,
+} = useDataList();
+const workspaceId = computed(() => props.workspaceId);
+const { allWorkSpaceUserList, loadAllWorkSpaceUserList } = useOtherDataList();
+
+interface FormType {
+  templateName: string;
+  engineType: string;
+  username: string;
+  application: string;
+}
+
+const init = (): FormType => ({
+  templateName: '',
+  engineType: '',
+  username: '',
+  application: '',
+});
+const searchForm = ref(init());
+
+// 查询参数
+const params: ComputedRef<PaginationAndParams> = computed(() => ({
+  ...searchForm.value,
+}));
+
+/**
+ * @description: 获取table数据
+ * @return {*}
+ */
+const tableList = ref([]);
+async function loadTable(param: PaginationAndParams) {
+  const parametter = jsonFilter({
+    ...param,
+    workspaceId: workspaceId.value,
+  });
+  const res = await request.fetch(api.getConfTemplateApplyHistory, parametter);
+  tableList.value = res.data?.records;
+  return {
+    totalPage: Math.ceil(res.data.total / (param.pageSize as number)),
+    totalCount: res.data.total,
+    pageNow: param.pageNow,
+  };
+}
+
+/**
+ * @description: 分页查询事件
+ * @return {*}
+ */
+const {
+  isLoading,
+  pagination,
+  handleInit,
+  handleCurrentChange,
+  fillText,
+  fillTimeText,
+} = usePagination(params, loadTable);
+
+/**
+ * @description: 重置
+ * @return {*}
+ */
+function handleReset() {
+  searchForm.value = init();
+  handleInit();
+}
+
+onMounted(() => {
+  handleInit();
+});
+</script>
+<style lang="less">
+.dss-drawer__table {
+  .wd-table-page {
+    padding: 0 0;
+  }
+}
+</style>
diff --git a/next-web/packages/workspace/module/resourceTmlManage/applicationRule/hooks/useDataList.ts b/next-web/packages/workspace/module/resourceTmlManage/applicationRule/hooks/useDataList.ts
new file mode 100644
index 000000000..fda07fa53
--- /dev/null
+++ b/next-web/packages/workspace/module/resourceTmlManage/applicationRule/hooks/useDataList.ts
@@ -0,0 +1,130 @@
+import { ref, type ComputedRef } from 'vue';
+import api from '../api';
+import { useDateFormat } from '@vueuse/core';
+import { request } from '@dataspherestudio/shared';
+import { FMessage } from '@fesjs/fes-design';
+const maxPageSize = 10000;
+
+type ObjectType = Record<string, unknown>;
+
+export const useDataList = (workspaceId?: ComputedRef) => {
+  const bindApplications = ref([]); // 关联应用
+  const engineTypes = ref([]); // 引擎类型
+  const engineNames = ref([]); // 引擎名
+  const templateNames = ref([]); // 模板名称
+  const ruleTypes = ref([
+    { value: '1', label: '工作空间新用户规则' },
+    { value: '0', label: '临时规则' },
+  ]); // 规则类型
+  const overlayAreas = ref([
+    { value: '0', label: '全部用户' },
+    { value: '1', label: '指定用户' },
+    { value: '2', label: '工作空间新用户' },
+  ]); // 覆盖范围
+
+  // 加载关联应用
+  async function loadBindApplications() {
+    const res = await request.fetch(api.getApplicationList, {});
+    bindApplications.value = (res.data?.applications || []).map(
+      (item: string) => ({
+        valueField: item,
+        labelField: item,
+      })
+    );
+  }
+
+  // 加载引擎类型
+  async function loadEngineTypes(application?: string) {
+    const res = await request.fetch(api.getEngineTypeList, { application });
+    engineTypes.value = (res.data?.engineTypes || []).map((item: string) => ({
+      valueField: item,
+      labelField: item,
+    }));
+  }
+
+  // 加载引擎名
+  async function loadEngineNames(application?: string) {
+    if (!application) {
+      FMessage.warn('请先选择关联应用');
+      return;
+    }
+    const res = await request.fetch(api.getEngineNameList, { application });
+    engineNames.value = (res.data?.engineTypes || []).map((item: string) => ({
+      valueField: item,
+      labelField: item,
+    }));
+  }
+
+  // 加载模板名称
+  async function loadTemplateNames(engineName?: string) {
+    if (!engineName) {
+      FMessage.warn('请先选择引擎类型');
+      return;
+    }
+    const param = {
+      workspaceId: workspaceId?.value,
+      engineName,
+      pageNow: 1,
+      pageSize: maxPageSize,
+    };
+    const res = await request.fetch(api.getConfTemplateList, param);
+    templateNames.value = (res.data?.templateList || []).map(
+      (item: ObjectType) => ({
+        valueField: item.templateId,
+        labelField: item.name,
+      })
+    );
+  }
+
+  // 函数映射关系
+  const loadMap = {
+    bind_application: loadBindApplications,
+    engine_type: loadEngineTypes,
+    engine_name: loadEngineNames,
+    template_name: loadTemplateNames,
+  };
+
+  function handleSelect(type: keyof typeof loadMap, data?: string): void {
+    const handler = loadMap[type];
+    handler(data);
+  }
+
+  // 过滤出有值的对象
+  function jsonFilter(obj: ObjectType): ObjectType {
+    if (obj.toString().toLowerCase() !== '[object object]') {
+      return {};
+    }
+    const result: ObjectType = {};
+    Object.keys(obj).forEach((key: string) => {
+      if (obj[key]) {
+        result[key as keyof typeof obj] = obj[key];
+      }
+    });
+    return result;
+  }
+
+  // 表格内容filter
+  const fillText = (row: ObjectType) =>
+    ['null', 'undefined', ''].includes(String(row.cellValue))
+      ? '- -'
+      : row.cellValue;
+
+  // 表格内容filter
+  const fillTimeText = (row: ObjectType) =>
+    ['null', 'undefined', ''].includes(String(row.cellValue))
+      ? '- -'
+      : useDateFormat(row.cellValue as string, 'YYYY-MM-DD HH:mm:ss').value;
+
+  return {
+    bindApplications, // 关联应用
+    engineTypes, // 引擎类型
+    engineNames, // 引擎名
+    templateNames, // 模板名称
+    ruleTypes, // 规则类型
+    overlayAreas, // 覆盖范围
+    handleSelect,
+    jsonFilter,
+    fillText,
+    fillTimeText,
+  };
+};
diff --git a/next-web/packages/workspace/module/resourceTmlManage/applicationRule/index.vue b/next-web/packages/workspace/module/resourceTmlManage/applicationRule/index.vue
new file mode 100644
index 000000000..3f36fc3d5
--- /dev/null
+++ b/next-web/packages/workspace/module/resourceTmlManage/applicationRule/index.vue
@@ -0,0 +1,496 @@
+<template>
+  <NavHeader :title="pageTitle" :nav-list="navList"></NavHeader>
+  <BTablePage :is-loading="isLoading" action-type="loading">
+    <template #search>
+      <BSearch
+        v-model:form="searchForm"
+        @search="handleSearch"
+        @reset="handleReset"
+      >
+        <template #form>
+          <div>
+            <span class="condition-label">模板名称</span>
+            <FInput
+              v-model="searchForm.templateName"
+              placeholder="请输入"
+            ></FInput>
+          </div>
+          <div>
+            <span class="condition-label">引擎类型</span>
+            <FSelect
+              v-model="searchForm.engineType"
+              :options="engineTypes"
+              placeholder="请选择"
+              filterable
+              clearable
+              value-field="valueField"
+              label-field="labelField"
+              @focus="handleSelect('engine_type')"
+            />
+          </div>
+          <div>
+            <span class="condition-label">规则类型</span>
+            <FSelect
+              v-model="searchForm.ruleType"
+              :options="ruleTypes"
+              placeholder="请选择"
+              filterable
+              clearable
+            />
+          </div>
+          <div>
+            <span class="condition-label">覆盖用户</span>
+            <FSelect
+              v-model="searchForm.user"
+              :options="allWorkSpaceUserList"
+              placeholder="请选择"
+              filterable
+              clearable
+              value-field="value"
+              label-field="label"
+              @focus="loadAllWorkSpaceUserList(workspaceId as string)"
+            />
+          </div>
+          <div>
+            <span class="condition-label">关联应用</span>
+            <FSelect
+              v-model="searchForm.application"
+              :options="bindApplications"
+              placeholder="请选择"
+              filterable
+              clearable
+              value-field="valueField"
+              label-field="labelField"
+              @focus="handleSelect('bind_application')"
+            />
+          </div>
+        </template>
+      </BSearch>
+    </template>
+    <template #operate>
+      <FButton type="primary" @click="handleDrawer('add_rule')"
+        >新建规则</FButton
+      >
+      <FButton @click="handleDrawer('execution_record')">规则执行记录</FButton>
+    </template>
+    <template #table>
+      <FTable ref="tableRef" :data="tableList" @sort-change="tableSort">
+        <FTable-column
+          prop="ruleId"
+          label="规则ID"
+          :min-width="116"
+          :formatter="fillText"
+          ellipsis
+        />
+        <FTable-column
+          v-slot="{ row }"
+          prop="ruleType"
+          label="规则类型"
+          :min-width="166"
+          :formatter="fillText"
+          ellipsis
+        >
+          <span v-if="+row.ruleType === 1">工作空间新用户规则</span>
+          <span v-else>临时规则</span>
+        </FTable-column>
+        <FTable-column
+          prop="templateName"
+          label="模板名称"
+          :min-width="180"
+          :formatter="fillText"
+          ellipsis
+        />
+        <FTable-column
+          prop="engineType"
+          label="引擎类型"
+          :min-width="120"
+          :formatter="fillText"
+          ellipsis
+        />
+        <FTable-column
+          v-slot="{ row }"
+          prop="permissionType"
+          label="覆盖范围"
+          :min-width="130"
+          :formatter="fillText"
+          ellipsis
+        >
+          <span v-if="+row.permissionType === 3">覆盖部门</span>
+          <span v-else-if="+row.permissionType === 2">工作空间新用户</span>
+          <span v-else-if="+row.permissionType === 1">指定用户</span>
+          <span v-else>全部用户</span>
+        </FTable-column>
+        <FTable-column
+          v-slot="{ row }"
+          prop="permissionUserCount"
+          label="覆盖用户数"
+          :min-width="102"
+          :formatter="fillText"
+          ellipsis
+        >
+          <span
+            v-if="row.permissionUserCount"
+            style="color: #5384ff; cursor: pointer"
+            @click="handleDrawer('view_users', row)"
+            >{{ row.permissionUserCount }}</span
+          >
+          <span v-else style="color: #5384ff">- -</span>
+        </FTable-column>
+        <FTable-column
+          prop="application"
+          label="关联应用"
+          :min-width="140"
+          :formatter="fillText"
+          ellipsis
+        />
+        <FTable-column
+          v-slot="{ row }"
+          prop="status"
+          label="执行状态"
+          :min-width="88"
+          :formatter="fillText"
+          ellipsis
+        >
+          <span v-if="+row.status === 3" style="color: #f75f56">部分失败</span>
+          <span v-else-if="+row.status === 2" style="color: #f75f56"
+            >执行失败</span
+          >
+          <span v-else-if="+row.status === 1" style="color: #00cb91"
+            >执行成功</span
+          >
+          <span v-else style="color: #0f1222">未执行</span>
+        </FTable-column>
+        <FTable-column
+          prop="executeTime"
+          label="最近执行时间"
+          sortable
+          :min-width="182"
+          :formatter="fillTimeText"
+          ellipsis
+        />
+        <FTable-column
+          prop="executeUser"
+          label="最近执行人"
+          :min-width="120"
+          :formatter="fillText"
+          ellipsis
+        />
+        <FTable-column
+          prop="creator"
+          label="创建人"
+          :min-width="120"
+          :formatter="fillText"
+          ellipsis
+        />
+        <FTable-column
+          prop="createTime"
+          label="创建时间"
+          sortable
+          :min-width="182"
+          :formatter="fillTimeText"
+          ellipsis
+        />
+        <FTable-column
+          v-slot="{ row }"
+          label="操作"
+          :min-width="60"
+          fixed="right"
+        >
+          <span
+            v-if="row.ruleType === 1"
+            style="color: #ff4d4f; cursor: pointer"
+            @click="handleDelete(row)"
+            >删除</span
+          >
+          <span v-else>--</span>
+        </FTable-column>
+      </FTable>
+    </template>
+    <template #pagination>
+      <FPagination
+        show-total
+        :page-size="pagination.pageSize"
+        :current-page="pagination.pageNow"
+        show-size-changer
+        :page-size-option="[10, 20, 50, 100]"
+        :total-count="pagination.totalCount"
+        @change="handlePageChange"
+      >
+      </FPagination>
+    </template>
+  </BTablePage>
+
+  <!-- 动态组件 -->
+  <FDrawer
+    v-model:show="drawerConfig.show"
+    :title="drawerConfig.title"
+    :footer="drawerConfig.footer"
+    width="50%"
+    :mask-closable="false"
+    display-directive="if"
+    @ok="handleOk"
+    @cancel="handleCancel"
+  >
+    <component
+      :is="dynamicComponent"
+      :ref="(el: any) => {
+      dynamicRef = el;
+    }
+      "
+      :form="currentRow"
+      :workspace-id="workspaceId"
+    />
+    <template #footer>
+      <FSpace>
+        <FButton type="primary" @click="handleOk">{{
+          drawerConfig.btnText
+        }}</FButton>
+        <FButton @click="handleCancel">取消</FButton>
+      </FSpace>
+    </template>
+  </FDrawer>
+</template>
+<script lang="ts" setup>
+import {
+  onMounted,
+  ref,
+  computed,
+  shallowRef,
+  nextTick,
+  type Component,
+} from 'vue';
+import { useRoute } from 'vue-router';
+import { request } from '@dataspherestudio/shared';
+import { FModal, FMessage } from '@fesjs/fes-design';
+import { usePagination } from '../../hooks/usePagination';
+import { useDataList } from './hooks/useDataList';
+import { useDataList as useOtherDataList } from '../hooks/useDataList';
+import NavHeader from '../../components/NavHeader.vue';
+import EditRule from './editRule.vue';
+import ExecutionRecord from './executionRecord.vue';
+import ViewUsers from './viewUsers.vue';
+import api from './api';
+
+import type { PaginationAndParams } from '../../hooks/usePagination';
+type ObjectType = Record<string, unknown>;
+
+const route = useRoute();
+const {
+  bindApplications, // 关联应用
+  engineTypes, // 引擎类型
+  handleSelect,
+  jsonFilter,
+  ruleTypes,
+} = useDataList();
+
+const workspaceId = computed(() => route.query.workspaceId);
+const { allWorkSpaceUserList, loadAllWorkSpaceUserList } = useOtherDataList();
+const pageTitle = '模版应用规则';
+const navList = ref<ObjectType[]>([]);
+
+const init = () => ({
+  templateName: '',
+  engineType: '',
+  user: '',
+  application: '',
+  ruleType: '',
+  sortBy: 'createTime',
+  orderBy: 'descend',
+});
+const searchForm = ref(init());
+
+// 查询参数
+const params = computed(() => ({
+  ...searchForm.value,
+}));
+
+/**
+ * @description: 获取table数据
+ * @return {*}
+ */
+const tableList = ref<ObjectType[]>([]);
+async function loadTable(param: PaginationAndParams) {
+  const parametter = jsonFilter({
+    ...param,
+    workspaceId: workspaceId.value,
+  });
+  const res = await request.fetch(
+    `${api.getConfTemplateApplyRuleList}`,
+    parametter
+  );
+  tableList.value = res.data?.ruleList || [];
+  return {
+    totalPage: Math.ceil(res.data.total / (param.pageSize as number)),
+    totalCount: res.data.total,
+    pageNow: param.pageNow,
+  };
+}
+
+/**
+ * @description: 分页查询事件
+ * @return {*}
+ */
+const {
+  isLoading,
+  pagination,
+  handleInit,
+  handleCurrent,
+  handleCurrentChange,
+  fillText,
+  fillTimeText,
+} = usePagination(params, loadTable);
+
+/**
+ * @description: 重置
+ * @return {*}
+ */
+async function handleSearch() {
+  await handleInit();
+  tableRef.value?.sort(searchForm.value.sortBy, searchForm.value.orderBy);
+}
+
+/**
+ * @description: 重置
+ * @return {*}
+ */
+async function handleReset() {
+  await nextTick();
+  searchForm.value = init();
+  handleSearch();
+}
+
+async function handlePageChange(currentPage: number, pageSize: number) {
+  await handleCurrentChange(currentPage, pageSize);
+  tableRef.value?.sort(searchForm.value.sortBy, searchForm.value.orderBy);
+}
+
+// 判断排序参数是否和上次相同
+const compareSortParams = (prop: string, order: string) => {
+  return prop === searchForm.value.sortBy && order === searchForm.value.orderBy;
+};
+
+// 表格排序
+const tableRef: any = ref(null);
+const tableSort = async (sortParam: { prop: string; order: string }) => {
+  const tempOrder = sortParam.order ? sortParam.order : 'descend';
+  if (!compareSortParams(sortParam.prop, tempOrder)) {
+    searchForm.value.sortBy = sortParam.prop;
+    searchForm.value.orderBy = tempOrder;
+    await handleCurrent();
+    tableRef.value?.sort(searchForm.value.sortBy, searchForm.value.orderBy);
+  }
+};
+onMounted(() => {
+  handleSearch();
+});
+
+// drawer相关操作
+const editOptions = shallowRef([
+  {
+    value: 'add_rule',
+    label: '新建规则',
+    footer: true,
+    btnText: '新建规则并执行',
+    component: EditRule,
+  },
+  {
+    value: 'execution_record',
+    label: '规则执行记录',
+    footer: false,
+    component: ExecutionRecord,
+  },
+  {
+    value: 'view_users',
+    label: '覆盖用户列表',
+    footer: false,
+    component: ViewUsers,
+  },
+]);
+
+// 点击drawer添加和编辑
+const currentRow = ref<ObjectType | null>(null);
+const dynamicComponent = shallowRef<Component | null>(null);
+const drawerConfig = ref({
+  show: false,
+  footer: false,
+  title: '',
+  btnText: '',
+});
+
+interface DynamicItemType {
+  value: string;
+  label: string;
+  footer: boolean;
+  btnText: string;
+  component: Component;
+}
+// 显示drawer
+function handleDrawer(key: string, row?: ObjectType) {
+  const current = editOptions.value.find(
+    (item) => item.value === key
+  ) as DynamicItemType;
+  const { component, label, footer, btnText } = current;
+  dynamicComponent.value = component;
+  drawerConfig.value = {
+    show: true,
+    footer,
+    title: label,
+    btnText,
+  };
+  if (row) {
+    currentRow.value = row;
+    drawerConfig.value.title = `${label}(${row.ruleId})`;
+  }
+}
+
+// 表单确认
+type EditRuleType = InstanceType<typeof EditRule>;
+const dynamicRef = ref<EditRuleType | null>(null);
+
+// 取消重置组件和drawer
+function handleCancel() {
+  currentRow.value = null;
+  dynamicRef.value = null;
+  dynamicComponent.value = null;
+  drawerConfig.value = {
+    show: false,
+    footer: false,
+    title: '',
+    btnText: '',
+  };
+}
+
+// 确定操作
+async function handleOk() {
+  if (dynamicRef.value) {
+    await dynamicRef.value.submit();
+    handleCancel();
+    handleSearch();
+  }
+}
+
+// 删除
+function handleDelete(row: ObjectType) {
+  FModal.confirm({
+    title: '确认',
+    content: `确认将规则【${row.ruleId}】删除吗？`,
+    onOk: async () => {
+      try {
+        await request.fetch(
+          `${api.deleteConfTemplateApplyRule}/${row.ruleId}`,
+          {},
+          'post'
+        );
+        FMessage.success('规则删除成功!');
+        handleSearch();
+        return Promise.resolve();
+      } catch (err) {
+        console.warn(err);
+      }
+    },
+    onCancel() {
+      return Promise.resolve();
+    },
+  });
+}
+</script>
diff --git a/next-web/packages/workspace/module/resourceTmlManage/applicationRule/viewUsers.vue b/next-web/packages/workspace/module/resourceTmlManage/applicationRule/viewUsers.vue
new file mode 100644
index 000000000..46362c56f
--- /dev/null
+++ b/next-web/packages/workspace/module/resourceTmlManage/applicationRule/viewUsers.vue
@@ -0,0 +1,140 @@
+<template>
+  <div class="dss-drawer__table">
+    <BTablePage :is-loading="isLoading" action-type="loading">
+      <template #search>
+        <BSearch
+          v-model:form="searchForm"
+          @search="handleSearch"
+          @reset="handleReset"
+        >
+          <template #form>
+            <div>
+              <FSelect
+                v-model="searchForm.username"
+                :options="allWorkSpaceUserList"
+                placeholder="用户名"
+                filterable
+                clearable
+                value-field="value"
+                label-field="label"
+                @focus="loadAllWorkSpaceUserList(workspaceId as string)"
+              />
+            </div>
+          </template>
+        </BSearch>
+      </template>
+      <template #table>
+        <FTable ref="tableRef" :data="tableList">
+          <FTable-column
+            prop="name"
+            label="用户名"
+            :formatter="fillText"
+            ellipsis
+          />
+        </FTable>
+      </template>
+      <template #pagination>
+        <FPagination
+          show-total
+          :page-size="pagination.pageSize"
+          :current-page="pagination.pageNow"
+          show-size-changer
+          :page-size-option="[10, 20, 50, 100]"
+          :total-count="pagination.totalCount"
+          @change="handleCurrentChange"
+        ></FPagination>
+      </template>
+    </BTablePage>
+  </div>
+</template>
+<script lang="ts" setup>
+import { onMounted, ref, computed } from 'vue';
+import { usePagination } from '../../hooks/usePagination';
+import { useDataList } from './hooks/useDataList';
+import { useDataList as useOtherDataList } from '../hooks/useDataList';
+import { request } from '@dataspherestudio/shared';
+import api from './api';
+import type { PaginationAndParams } from '../../hooks/usePagination';
+
+const props = defineProps({
+  form: {
+    type: Object,
+    defualt: () => ({}),
+    required: true,
+  },
+  workspaceId: {
+    type: String,
+    required: true,
+    default: '',
+  },
+});
+const workspaceId = computed(() => props.workspaceId);
+const { jsonFilter, fillText } = useDataList();
+const { allWorkSpaceUserList, loadAllWorkSpaceUserList } = useOtherDataList();
+
+interface FormType {
+  username: string;
+}
+
+const init = (): FormType => ({
+  username: '',
+});
+const searchForm = ref(init());
+
+// 查询参数
+const params = computed(() => ({
+  ...searchForm.value,
+}));
+
+/**
+ * @description: 获取table数据
+ * @return {*}
+ */
+const tableList = ref([]);
+async function loadTable(param: PaginationAndParams) {
+  const parametter = jsonFilter({
+    ...param,
+    ruleId: props.form.ruleId,
+    workspaceId: workspaceId.value,
+  });
+  const res = await request.fetch(api.getConfTemplateUserList, parametter);
+  tableList.value = res.data?.users;
+  return {
+    totalPage: Math.ceil(res.data.total / (param.pageSize as number)),
+    totalCount: res.data.total,
+    pageNow: param.pageNow,
+  };
+}
+
+/**
+ * @description: 分页查询事件
+ * @return {*}
+ */
+const { isLoading, pagination, handleInit, handleCurrentChange } =
+  usePagination(params, loadTable);
+
+// 查询
+function handleSearch() {
+  handleInit();
+}
+
+/**
+ * @description: 重置
+ * @return {*}
+ */
+function handleReset() {
+  searchForm.value = init();
+  handleInit();
+}
+
+onMounted(() => {
+  handleSearch();
+});
+</script>
+<style lang="less">
+.dss-drawer__table {
+  .wd-table-page {
+    padding: 0 0;
+  }
+}
+</style>
diff --git a/next-web/packages/workspace/module/resourceTmlManage/component/appDrawer.vue b/next-web/packages/workspace/module/resourceTmlManage/component/appDrawer.vue
new file mode 100644
index 000000000..a79640638
--- /dev/null
+++ b/next-web/packages/workspace/module/resourceTmlManage/component/appDrawer.vue
@@ -0,0 +1,157 @@
+<template>
+  <FDrawer
+    v-model:show="drawerShow"
+    :title="`${t('workSpace.appRefTable')}(${templateObj.name})`"
+    :mask-closable="false"
+    display-directive="if"
+    width="50%"
+    @cancel="closeDrawer"
+  >
+    <BTablePage
+      :is-loading="isLoading"
+      :action-type="actionType"
+      layout="drawer"
+      :is-divider="false"
+    >
+      <template #search>
+        <BSearch
+          v-model:form="searchForm"
+          @search="getAppList"
+          @reset="getAppList"
+        >
+          <template #form>
+            <FSelect
+              v-model="searchForm.username"
+              :placeholder="t('workSpace.overwriteUser')"
+              :options="allWorkSpaceUserList"
+              filterable
+              clearable
+            >
+            </FSelect>
+          </template>
+        </BSearch>
+      </template>
+      <template #table>
+        <f-table :data="appList" class="table-container">
+          <f-table-column
+            prop="application"
+            :label="t('workSpace.appName')"
+            :width="120"
+            ellipsis
+          />
+          <f-table-column
+            prop="permissionUsers"
+            :label="t('workSpace.overwriteUser')"
+            :width="500"
+            ellipsis
+          >
+            <template #default="{ row }">
+              <FEllipsis v-if="row.permissionUsers">
+                {{ row.permissionUsers }}
+                <template #tooltip>
+                  <div style="max-width: 500px; word-wrap: break-word">
+                    {{ row.permissionUsers }}
+                  </div>
+                </template>
+              </FEllipsis>
+              <div v-else>--</div>
+            </template>
+          </f-table-column>
+        </f-table>
+      </template>
+      <template #pagination>
+        <FPagination
+          v-model:currentPage="pagination.current"
+          v-model:pageSize="pagination.size"
+          show-size-changer
+          show-total
+          :total-count="pagination.total"
+          @change="getAppList"
+          @page-size-change="getAppList"
+        />
+      </template>
+    </BTablePage>
+  </FDrawer>
+</template>
+<script lang="ts" setup>
+import { onMounted, computed, ref, reactive, type Ref } from 'vue';
+import { useI18n } from 'vue-i18n';
+import { fetchApps } from '../api';
+import { useDataList } from '../hooks/useDataList';
+import { utils } from '../hooks/utils';
+
+const { t } = useI18n();
+const isLoading = ref(false);
+const actionType = ref('loading');
+type ApplyInfo = {
+  application: string;
+  permissionUsers: string;
+};
+const appList: Ref<ApplyInfo[]> = ref([]);
+const searchForm = reactive({
+  username: '',
+});
+const pagination = reactive({
+  current: 1,
+  size: 10,
+  total: 0,
+});
+const { allWorkSpaceUserList, loadAllWorkSpaceUserList } = useDataList();
+const props = defineProps({
+  show: {
+    type: Boolean,
+    required: true,
+    default: false,
+  },
+  templateObj: {
+    type: Object,
+    required: true,
+  },
+  workPlaceId: {
+    type: String,
+    required: true,
+  },
+});
+const { paramsObjectToString } = utils();
+const emit = defineEmits(['update:show']);
+const drawerShow = computed({
+  get: () => props.show,
+  set: (value) => {
+    emit('update:show', value);
+  },
+});
+const closeDrawer = () => {
+  emit('update:show', false);
+};
+const getAppList = async () => {
+  const params = {
+    pageNow: pagination.current,
+    pageSize: pagination.size,
+    templateId: props.templateObj.templateId,
+    username: searchForm.username,
+  };
+  const strParams = paramsObjectToString(params);
+  try {
+    isLoading.value = true;
+    actionType.value = 'loading';
+    const res = await fetchApps(strParams);
+    appList.value = res.data.applyInfo.forEach((v: any) => {
+      v.permissionUsers = v.permissionUsers.join(',');
+    });
+    appList.value = res.data.applyInfo;
+    pagination.total = res.data.total;
+    if (pagination.total === 0) {
+      actionType.value = 'emptyQueryResult';
+    }
+    isLoading.value = false;
+  } catch (error) {
+    console.log(error);
+    isLoading.value = false;
+  }
+};
+
+onMounted(async () => {
+  await getAppList();
+  await loadAllWorkSpaceUserList(props.workPlaceId);
+});
+</script>
diff --git a/next-web/packages/workspace/module/resourceTmlManage/component/permissionUserDrawer.vue b/next-web/packages/workspace/module/resourceTmlManage/component/permissionUserDrawer.vue
new file mode 100644
index 000000000..80725620b
--- /dev/null
+++ b/next-web/packages/workspace/module/resourceTmlManage/component/permissionUserDrawer.vue
@@ -0,0 +1,137 @@
+<template>
+  <FDrawer
+    v-model:show="drawerShow"
+    :title="`可见用户列表（${templateObj.name})`"
+    :mask-closable="false"
+    display-directive="if"
+    width="50%"
+    @cancel="closeDrawer"
+  >
+    <BTablePage
+      :is-loading="isLoading"
+      :action-type="actionType"
+      layout="drawer"
+      :is-divider="false"
+    >
+      <template #search>
+        <BSearch
+          v-model:form="searchForm"
+          @search="getUserList"
+          @reset="getUserList"
+        >
+          <template #form>
+            <FSelect
+              v-model="searchForm.username"
+              :placeholder="$t('common.userName')"
+              :options="allWorkSpaceUserList"
+              filterable
+              clearable
+            >
+            </FSelect>
+          </template>
+        </BSearch>
+      </template>
+      <template #table>
+        <f-table :data="userList" class="table-container">
+          <f-table-column
+            prop="name"
+            :label="$t('common.userName')"
+            :width="180"
+            ellipsis
+          />
+        </f-table>
+      </template>
+      <template #pagination>
+        <FPagination
+          v-model:currentPage="pagination.current"
+          v-model:pageSize="pagination.size"
+          show-size-changer
+          show-total
+          :total-count="pagination.total"
+          @change="getUserList"
+          @page-size-change="getUserList"
+        />
+      </template>
+    </BTablePage>
+  </FDrawer>
+</template>
+<script lang="ts" setup>
+import { onMounted, computed, ref, reactive, type Ref } from 'vue';
+import { useI18n } from 'vue-i18n';
+import { fetchTemplateUser } from '../api';
+import { useDataList } from '../hooks/useDataList';
+import { utils } from '../hooks/utils';
+
+const { t: $t } = useI18n();
+const isLoading = ref(false);
+const actionType = ref('loading');
+type User = {
+  name: string;
+};
+const userList: Ref<User[]> = ref([]);
+const searchForm = reactive({
+  username: '',
+});
+const pagination = reactive({
+  current: 1,
+  size: 10,
+  total: 0,
+});
+const { allWorkSpaceUserList, loadAllWorkSpaceUserList } = useDataList();
+const { paramsObjectToString } = utils();
+const props = defineProps({
+  show: {
+    type: Boolean,
+    required: true,
+    default: false,
+  },
+  templateObj: {
+    type: Object,
+    required: true,
+  },
+  workPlaceId: {
+    type: String,
+    required: true,
+  },
+});
+
+const emit = defineEmits(['update:show']);
+const drawerShow = computed({
+  get: () => props.show,
+  set: (value) => {
+    emit('update:show', value);
+  },
+});
+const closeDrawer = () => {
+  console.log('closeDrawer');
+  emit('update:show', false);
+};
+const getUserList = async () => {
+  const params = {
+    pageNow: pagination.current,
+    pageSize: pagination.size,
+    templateId: props.templateObj.templateId,
+    username: searchForm.username,
+  };
+  const strParams = paramsObjectToString(params);
+  try {
+    isLoading.value = true;
+    actionType.value = 'loading';
+    const res = await fetchTemplateUser(strParams);
+    userList.value = res.data.users;
+    pagination.total = res.data.total;
+    if (pagination.total === 0) {
+      actionType.value = 'emptyQueryResult';
+    }
+    isLoading.value = false;
+  } catch (error) {
+    console.log(error);
+    isLoading.value = false;
+  }
+};
+
+onMounted(async () => {
+  await getUserList();
+  await loadAllWorkSpaceUserList(props.workPlaceId);
+});
+</script>
diff --git a/next-web/packages/workspace/module/resourceTmlManage/component/templateOperateDrawer.vue b/next-web/packages/workspace/module/resourceTmlManage/component/templateOperateDrawer.vue
new file mode 100644
index 000000000..9ad9d0f22
--- /dev/null
+++ b/next-web/packages/workspace/module/resourceTmlManage/component/templateOperateDrawer.vue
@@ -0,0 +1,582 @@
+<template>
+  <FDrawer
+    v-model:show="drawerShow"
+    :title="
+      mode === 'add' ? t('workSpace.addTemplate') : t('workSpace.editTemplate')
+    "
+    :mask-closable="false"
+    display-directive="if"
+    width="50%"
+    :footer="true"
+    ok-text="保存"
+    content-class="operate-template"
+    @cancel="closeDrawer"
+    @ok="saveTemplate"
+  >
+    <div class="title">基础信息</div>
+    <FForm
+      ref="templateFormRef"
+      label-position="top"
+      :model="templateForm"
+      :rules="templateFormRules"
+    >
+      <FFormItem :label="t('workSpace.tmlName')" prop="name">
+        <FInput
+          v-model="templateForm.name"
+          :placeholder="t('common.pleaseInput') + t('workSpace.tmlName')"
+          :disabled="mode === 'edit'"
+        />
+      </FFormItem>
+      <FFormItem :label="t('workSpace.engineType')" prop="engineType">
+        <FSelect
+          v-model="templateForm.engineType"
+          :placeholder="t('common.pleaseSelect') + t('workSpace.engineType')"
+          :options="engineList"
+          clearable
+          filterable
+          :disabled="mode === 'edit'"
+          @change="getResParamsDetails('engineType', $event)"
+        >
+        </FSelect>
+      </FFormItem>
+      <FFormItem :label="t('workSpace.visibility')" prop="permissionType">
+        <FSelect
+          v-model="templateForm.permissionType"
+          :placeholder="t('common.pleaseSelect') + t('workSpace.visibility')"
+          :options="permissionTypeList"
+          clearable
+          filterable
+          @change="handlePermissionTypeChange"
+        >
+        </FSelect>
+      </FFormItem>
+      <FFormItem
+        v-if="templateForm.permissionType === 1"
+        :label="t('workSpace.visibleUser')"
+        prop="permissionUsers"
+      >
+        <FSelect
+          v-model="templateForm.permissionUsers"
+          :placeholder="t('common.pleaseSelect') + t('workSpace.visibleUser')"
+          :options="allWorkSpaceUserList"
+          clearable
+          filterable
+          multiple
+          :collapse-tags="true"
+          :collapse-tags-limit="5"
+        >
+        </FSelect>
+      </FFormItem>
+      <FFormItem :label="t('workSpace.tmlDes')" prop="description">
+        <FInput
+          v-model="templateForm.description"
+          type="textarea"
+          :placeholder="t('common.pleaseFillIn') + t('workSpace.tmlDes')"
+          :maxlength="128"
+        />
+      </FFormItem>
+    </FForm>
+    <div class="title">
+      资源参数<span class="tip">(不同引擎类型对应不同属性参数)</span>
+    </div>
+    <FForm label-position="top" :model="templateForm.paramDetails">
+      <FFormItem
+        v-for="(curResParam, index) in curResParams"
+        :key="curResParam.key"
+        :label="
+          (curResParam.name ? curResParam.name : '') +
+          '[' +
+          curResParam.key +
+          ']'
+        "
+        style="margin-bottom: 0px"
+        :class="curResParam.require ? 'rule-valid-style' : ''"
+      >
+        <FForm
+          :ref="
+            (el) => {
+              if (el) resParamsRefs[index] = el;
+            }
+          "
+          layout="inline"
+          :inline-item-width="380"
+          :model="templateForm.paramDetails[index]"
+          class="inline-res-form"
+          @submit.prevent
+        >
+          <FFormItem
+            prop="configValue"
+            :rules="[
+              {
+                required: curResParam.require,
+                message: '参数默认值不能为空',
+                type: 'string',
+                trigger: ['blur', 'change'],
+              },
+              {
+                validator: (rule: any, value :string) => {
+                  return regValidate(value, curResParam);
+                },
+                trigger: ['blur', 'change'],
+                message: curResParam.description,
+              },
+              {
+                validator: (rule: any, value: string) => {
+                  return compareConfigValue(
+                    value,
+                    curResParam,
+                    templateForm.paramDetails[index]
+                  );
+                },
+                trigger: ['blur', 'change'],
+                message: '默认值与上限值需同时填写，且小于等于上限值',
+              },
+            ]"
+          >
+            <FInput
+              v-if="curResParam.validateType !== 'OFT'"
+              v-model="templateForm.paramDetails[index].configValue"
+              :placeholder="
+                curResParam.defaultValue
+                  ? '默认值:' + curResParam.defaultValue
+                  : '无默认值'
+              "
+              :title="curResParam.description"
+            >
+              <template #prepend>默认值</template>
+            </FInput>
+            <div v-else class="form-group">
+              <div class="select-prepend">默认值</div>
+              <FSelect
+                v-model="templateForm.paramDetails[index].configValue"
+                :options="computeOFT(curResParam.validateRange)"
+                :placeholder="
+                  curResParam.defaultValue
+                    ? '默认值:' + curResParam.defaultValue
+                    : '无默认值'
+                "
+                :title="curResParam.description"
+              >
+              </FSelect>
+            </div>
+          </FFormItem>
+          <FFormItem
+            v-if="
+              curResParam.boundaryType === 2 || curResParam.boundaryType === 3
+            "
+            prop="maxValue"
+            :rules="[
+              { 
+                required: curResParam.require,
+                message: '参数上限值不能为空',
+                type: 'string' 
+              },
+              {
+                validator: (rule: any, value: string) => {
+                  return regValidate(value, curResParam);
+                },
+                trigger: ['blur', 'change'],
+                message: curResParam.description,
+              },
+            ]"
+          >
+            <FInput
+              v-model="templateForm.paramDetails[index].maxValue"
+              :placeholder="
+                curResParam.defaultValue
+                  ? '默认值:' + curResParam.defaultValue
+                  : '无默认值'
+              "
+              :title="curResParam.description"
+              @change="handleMaxValueChange(index)"
+            >
+              <template #prepend>上限值</template>
+            </FInput>
+          </FFormItem>
+        </FForm>
+      </FFormItem>
+    </FForm>
+  </FDrawer>
+</template>
+<script lang="ts" setup>
+import { onMounted, computed, ref, reactive } from 'vue';
+import { useI18n } from 'vue-i18n';
+import { useDataList } from '../hooks/useDataList';
+import { fetchResParams, fetchUniqueName, fetchSaveTemplate } from '../api';
+import { FMessage, FForm } from '@fesjs/fes-design';
+import { utils } from '../hooks/utils';
+import { fetchTemplateUser } from '../api';
+import { cloneDeep } from 'lodash-es';
+
+type FormRefType = typeof FForm | null;
+const resParamsRefs = ref<any[]>([]);
+const templateFormRef = ref<FormRefType>(null);
+type ParamDetail = {
+  key: string;
+  maxValue: string;
+  configValue: string;
+};
+type TemplateFormType = {
+  name: string;
+  permissionType: number;
+  engineType: string;
+  description: string;
+  paramDetails: ParamDetail[];
+  templateId: string | null;
+  permissionUsers?: string[] | null;
+};
+
+const { paramsObjectToString } = utils();
+const templateForm = reactive<TemplateFormType>({
+  name: '',
+  templateId: '',
+  permissionType: 0,
+  engineType: '',
+  description: '',
+  permissionUsers: [],
+  paramDetails: [],
+});
+const curResParams = ref<any[]>([]);
+const {
+  allWorkSpaceUserList,
+  engineList,
+  permissionTypeList,
+  loadAllWorkSpaceUserList,
+  loadEngineList,
+} = useDataList();
+const editInitUsers = ref<string[]>([]);
+const props = defineProps({
+  // add - 新增模板，edit - 编辑模板
+  mode: {
+    type: String,
+    required: true,
+  },
+  show: {
+    type: Boolean,
+    required: true,
+    default: false,
+  },
+  templateObj: {
+    type: Object,
+    required: true,
+  },
+  workPlaceId: {
+    type: String,
+    required: true,
+  },
+});
+const { t } = useI18n();
+const emit = defineEmits(['update:show', 'updateTemplateTable']);
+const drawerShow = computed({
+  get: () => props.show,
+  set: (value) => {
+    emit('update:show', value);
+  },
+});
+
+// 输入上限值时，对默认值做校验
+const handleMaxValueChange = (index: number) => {
+  resParamsRefs.value[index].validate();
+};
+// 默认值与最大值的比较条件 默认值是输入框的形式且有上限值且上限值已填写
+const compareConfigValue = (
+  value: string,
+  curResParam: any,
+  paramDetail: ParamDetail
+) => {
+  if (!curResParam.require && !value && !paramDetail.maxValue) {
+    return true;
+  } else if (
+    !curResParam.require &&
+    curResParam.validateType !== 'OFT' &&
+    (curResParam.boundaryType === 2 || curResParam.boundaryType === 3)
+  ) {
+    if (value && paramDetail.maxValue) {
+      // 过滤单位提取数字比较，当数字0或-1表示无限大，不做比较
+      const max = paramDetail.maxValue.match(/\d+(\.\d+)?/g);
+      const vmatch = value.match(/\d+(\.\d+)?/g);
+      if (max && vmatch) {
+        const maxValue = Number(max[0]);
+        const configValue = Number(vmatch[0]);
+        if (maxValue === 0 || maxValue === -1 || configValue <= maxValue) {
+          return true;
+        }
+      }
+    }
+    return false;
+  }
+  if (value && curResParam.validateType !== 'OFT' && paramDetail.maxValue) {
+    // 过滤单位提取数字比较，当数字0或-1表示无限大，不做比较
+    const max = paramDetail.maxValue.match(/\d+(\.\d+)?/g);
+    const vmatch = value.match(/\d+(\.\d+)?/g);
+    if (max && vmatch) {
+      const maxValue = Number(max[0]);
+      const configValue = Number(vmatch[0]);
+      if (maxValue === 0 || maxValue === -1 || configValue <= maxValue) {
+        return true;
+      }
+    }
+    return false;
+  }
+  return true;
+};
+const regValidate = (value: string, curResParam: any) => {
+  if (!curResParam.require && !value) {
+    return true;
+  }
+  if (curResParam.validateType === 'Regex') {
+    const reg = new RegExp(curResParam.validateRange);
+    return reg.test(value);
+  }
+  if (curResParam.validateType === 'NumInterval') {
+    const numReg = curResParam.validateRange
+      .slice(1, curResParam.validateRange.length - 1)
+      .split(',');
+    if (
+      Number(value) <= Number(numReg[1]) &&
+      Number(value) >= Number(numReg[0])
+    ) {
+      return true;
+    }
+    return false;
+  }
+  return true;
+};
+const computeOFT = (v: string) => {
+  const vArray = v.slice(2, v.length - 2).split('","');
+  const optionsArray = vArray.map((v: string) => {
+    if (v === '\\\\t') {
+      v = '\\t';
+    }
+    return {
+      label: v,
+      value: v,
+    };
+  });
+  return optionsArray || [];
+};
+
+const submitFormValid = async () => {
+  try {
+    const formValidArray = [
+      ...resParamsRefs.value.map((item) => item?.validate()),
+      templateFormRef.value?.validate(),
+    ];
+    const result = await Promise.all(formValidArray);
+    console.log('表单验证成功: ', result);
+    return true;
+  } catch (error) {
+    console.log('表单验证失败: ', error);
+    return false;
+  }
+};
+
+const saveTemplate = async () => {
+  try {
+    if (await submitFormValid()) {
+      const paramsObject = cloneDeep(templateForm);
+      // 只有ermissionType=1时，选择为指定用户时，才传permissionUsers
+      if (paramsObject.permissionType === 0) {
+        delete paramsObject.permissionUsers;
+      }
+      // 与编辑最初用户列表做比较，若无修改，permissionUsers传null
+      else if (props.mode === 'edit') {
+        const compare1 = editInitUsers.value.sort().join(',');
+        const compare2 = paramsObject.permissionUsers?.sort().join(',');
+        if (compare1 === compare2) {
+          paramsObject.permissionUsers = null;
+        }
+      }
+      // 新增操作，templateId为null
+      if (props.mode === 'add') {
+        paramsObject.templateId = null;
+      }
+      await fetchSaveTemplate(paramsObject);
+      FMessage.success('保存成功!');
+      emit('updateTemplateTable');
+      closeDrawer();
+    }
+  } catch (err) {
+    console.error(err);
+  }
+};
+const closeDrawer = () => {
+  emit('update:show', false);
+};
+const templateFormRules = computed(() => ({
+  name: [
+    { required: true, message: t('common.notEmpty') },
+    {
+      pattern: /^[\u4e00-\u9fa5a-z0-9_]{0,128}$/gi,
+      message: '请输入中文、英文、数字、下划线,最长不超过128字符',
+    },
+    {
+      trigger: ['blur'],
+      validator: (
+        rule: any,
+        value: string,
+        callback: (error?: string | Error) => void
+      ) => {
+        if (!value) {
+          callback(t('common.notEmpty'));
+        }
+        if (props.mode === 'add') {
+          fetchUniqueName(value).then((result: any) => {
+            if (result.data.repeat) {
+              callback('该模板名称已存在');
+            } else {
+              callback();
+            }
+          });
+          return;
+        }
+        callback();
+      },
+    },
+  ],
+  engineType: [
+    {
+      required: true,
+      message: t('common.notEmpty'),
+      trigger: ['blur', 'change'],
+    },
+  ],
+  permissionType: [
+    {
+      required: true,
+      type: 'number' as const,
+      message: t('common.notEmpty'),
+      trigger: ['blur', 'change'],
+    },
+  ],
+  permissionUsers: [
+    {
+      required: true,
+      type: 'array' as const,
+      message: t('common.notEmpty'),
+      trigger: ['blur', 'change'],
+    },
+  ],
+}));
+// 获取参数ui的值
+const getResParamsDetails = async (key: string, value: string) => {
+  try {
+    const params = key + '=' + value;
+    const res = await fetchResParams(params);
+    curResParams.value = res.conf;
+    templateForm.paramDetails = [];
+    curResParams.value.forEach((item) => {
+      const obj = {
+        key: item.key,
+        maxValue: item.maxValue,
+        configValue: item.configValue,
+      };
+      templateForm.paramDetails.push(obj);
+    });
+    resParamsRefs.value.map((item) => item?.clearValidate());
+  } catch (err) {
+    console.error(err);
+  }
+};
+
+const handlePermissionTypeChange = async (v: number) => {
+  if (allWorkSpaceUserList.value.length === 0 && v === 1) {
+    // 工作空间ID看怎么拿
+    await loadAllWorkSpaceUserList(props.workPlaceId);
+  }
+  templateForm.permissionUsers = [];
+};
+
+// 拉取用户数据
+const getUserDetail = async () => {
+  const params = {
+    pageNow: 1,
+    pageSize: 999999,
+    templateId: templateForm.templateId,
+  };
+  const strParams = paramsObjectToString(params);
+  try {
+    const res = await fetchTemplateUser(strParams);
+    templateForm.permissionUsers = res.data.users.map((v: { name: string }) => {
+      return v.name;
+    });
+    editInitUsers.value = cloneDeep(templateForm.permissionUsers) as string[];
+  } catch (error) {
+    console.log(error);
+  }
+};
+
+const editInitData = async () => {
+  console.log('editInitData', props.templateObj);
+  templateForm.templateId = props.templateObj.templateId;
+  templateForm.name = props.templateObj.name;
+  templateForm.engineType = props.templateObj.engineType;
+  templateForm.permissionType = props.templateObj.permissionType;
+  templateForm.description = props.templateObj.description;
+  if (templateForm.permissionType === 1) {
+    await loadAllWorkSpaceUserList(props.workPlaceId);
+    await getUserDetail();
+  }
+  // 参数ui赋值
+  await getResParamsDetails('templateId', templateForm.templateId as string);
+};
+
+onMounted(async () => {
+  await loadEngineList();
+  // 编辑时，根据打开的模板请求对应参数
+  if (props.mode === 'edit') {
+    await editInitData();
+  }
+});
+</script>
+<style lang="less" scoped>
+.operate-template {
+  .inline-res-form {
+    margin-bottom: 8px;
+    .fes-form-item {
+      margin-bottom: 8px;
+    }
+  }
+  .rule-valid-style {
+    :deep(.fes-form-item-label::before) {
+      display: inline-block;
+      margin-top: 2px;
+      margin-right: 4px;
+      color: var(--f-danger-color);
+      content: '*';
+    }
+  }
+  .form-group {
+    display: inline-table;
+    width: 100%;
+    line-height: normal;
+    border-collapse: separate;
+    border-spacing: 0;
+    .select-prepend {
+      position: relative;
+      display: table-cell;
+      box-sizing: border-box;
+      width: 1px;
+      padding: 0 20px;
+      color: #93949c;
+      white-space: nowrap;
+      vertical-align: middle;
+      background-color: #f8f8f8;
+      border: 1px solid #cfd0d3;
+      border-radius: 4px;
+      border-right: 0;
+      border-top-right-radius: 0;
+      border-bottom-right-radius: 0;
+    }
+  }
+  .title {
+    font-weight: 550;
+    color: #0f1222;
+    margin-bottom: 16px;
+    .tip {
+      color: #93949b;
+      font-weight: 400;
+    }
+  }
+}
+</style>
diff --git a/next-web/packages/workspace/module/resourceTmlManage/component/workFlowDrawer.vue b/next-web/packages/workspace/module/resourceTmlManage/component/workFlowDrawer.vue
new file mode 100644
index 000000000..0e162212b
--- /dev/null
+++ b/next-web/packages/workspace/module/resourceTmlManage/component/workFlowDrawer.vue
@@ -0,0 +1,186 @@
+<template>
+  <FDrawer
+    v-model:show="drawerShow"
+    :title="`${t('workSpace.workFlowRefList')}(${templateObj.name})`"
+    :mask-closable="false"
+    display-directive="if"
+    width="50%"
+    @cancel="closeDrawer"
+  >
+    <BTablePage
+      :is-loading="isLoading"
+      :action-type="actionType"
+      layout="drawer"
+      :is-divider="false"
+    >
+      <template #search>
+        <BSearch
+          v-model:form="searchForm"
+          @search="getWorkFlowList"
+          @reset="getWorkFlowList"
+        >
+          <template #form>
+            <FSelect
+              v-model="searchForm.projectName"
+              :placeholder="t('workSpace.projectName')"
+              :options="projectNameList"
+              filterable
+              clearable
+            >
+            </FSelect>
+            <FSelect
+              v-model="searchForm.orchestratorName"
+              :placeholder="t('workSpace.workFlowName')"
+              :options="workflowNameList"
+              filterable
+              clearable
+            >
+            </FSelect>
+          </template>
+        </BSearch>
+      </template>
+      <template #table>
+        <f-table :data="workFlowList" class="table-container">
+          <f-table-column
+            prop="projectName"
+            :label="t('workSpace.projectName')"
+            :width="360"
+            ellipsis
+          />
+          <f-table-column
+            prop="orchestratorName"
+            :label="t('workSpace.workFlowName')"
+            :width="360"
+            ellipsis
+          >
+            <template #default="{ row = {} }">
+              <span
+                class="a-link"
+                href="javascript:void(0);"
+                @click="jumpToWorkFlowDec(row)"
+                >{{ row.orchestratorName }}</span
+              >
+            </template>
+          </f-table-column>
+        </f-table>
+      </template>
+      <template #pagination>
+        <FPagination
+          v-model:currentPage="pagination.current"
+          v-model:pageSize="pagination.size"
+          show-size-changer
+          show-total
+          :total-count="pagination.total"
+          @change="getWorkFlowList"
+          @page-size-change="getWorkFlowList"
+        />
+      </template>
+    </BTablePage>
+  </FDrawer>
+</template>
+<script lang="ts" setup>
+import { onMounted, computed, ref, reactive, type Ref } from 'vue';
+import { useI18n } from 'vue-i18n';
+import { fetchWorkFlows } from '../api';
+import { useDataList } from '../hooks/useDataList';
+import { utils } from '../hooks/utils';
+
+const { t } = useI18n();
+const isLoading = ref(false);
+const actionType = ref('loading');
+type workFlowInfo = {
+  id: number;
+  projectId: string;
+  projectName: string;
+  orchestratorId: number;
+  orchestratorName: string;
+  templateId: string;
+};
+const workFlowList: Ref<workFlowInfo[]> = ref([]);
+const searchForm = reactive({
+  projectName: '',
+  orchestratorName: '',
+});
+const pagination = reactive({
+  current: 1,
+  size: 10,
+  total: 0,
+});
+const {
+  projectNameList,
+  workflowNameList,
+  loadworkFlowProjectNames,
+  loadworkFlowNames,
+} = useDataList();
+const props = defineProps({
+  show: {
+    type: Boolean,
+    required: true,
+    default: false,
+  },
+  templateObj: {
+    type: Object,
+    required: true,
+  },
+  workPlaceId: {
+    type: String,
+    required: true,
+  },
+});
+const { paramsObjectToString } = utils();
+const emit = defineEmits(['update:show']);
+const drawerShow = computed({
+  get: () => props.show,
+  set: (value) => {
+    emit('update:show', value);
+  },
+});
+const closeDrawer = () => {
+  emit('update:show', false);
+};
+const getWorkFlowList = async () => {
+  const params = {
+    pageNow: pagination.current,
+    pageSize: pagination.size,
+    templateId: props.templateObj.templateId,
+    projectName: searchForm.projectName,
+    orchestratorName: searchForm.orchestratorName,
+  };
+  const strParams = paramsObjectToString(params);
+  try {
+    isLoading.value = true;
+    actionType.value = 'loading';
+    const res = await fetchWorkFlows(strParams);
+    workFlowList.value = res.data.pageInfo;
+    pagination.total = res.data.total;
+    if (pagination.total === 0) {
+      actionType.value = 'emptyQueryResult';
+    }
+    isLoading.value = false;
+  } catch (error) {
+    console.log(error);
+    isLoading.value = false;
+  }
+};
+
+const jumpToWorkFlowDec = (row: any) => {
+  console.log('jumpToWorkFlowDec', row);
+  const baseUrl = window.location.href.split('next-web')[0] + '#/workflow?';
+  const params =
+    'workspaceId=' +
+    props.workPlaceId +
+    '&projectID=' +
+    row.projectId +
+    '&projectName=' +
+    row.projectName +
+    '&flowId=' +
+    row.orchestratorId;
+  const url = baseUrl + params;
+  window.open(url);
+};
+onMounted(async () => {
+  await getWorkFlowList();
+  await loadworkFlowProjectNames(props.templateObj.templateId);
+  await loadworkFlowNames(props.templateObj.templateId);
+});
+</script>
diff --git a/next-web/packages/workspace/module/resourceTmlManage/hooks/useDataList.ts b/next-web/packages/workspace/module/resourceTmlManage/hooks/useDataList.ts
new file mode 100644
index 000000000..f1dc14c09
--- /dev/null
+++ b/next-web/packages/workspace/module/resourceTmlManage/hooks/useDataList.ts
@@ -0,0 +1,158 @@
+import { ref } from 'vue';
+import {
+  fetchTemplateUser,
+  fetchRelateUsers,
+  fetchRelateUsersDepts,
+  fetchEngineTypes,
+  fetchworkFlowProjectNames,
+  fetchworkFlowNames,
+  fetchDepartments,
+} from '../api';
+import { utils } from '../hooks/utils';
+import { useDateFormat } from '@vueuse/core';
+
+export const useDataList = () => {
+  const templateUserList = ref([]);
+  const allWorkSpaceUserList = ref([]);
+  const allWorkSpaceUserDeptsList = ref([]);
+  const allDeptList = ref([]);
+  const engineList = ref([]);
+  const projectNameList = ref([]);
+  const workflowNameList = ref([]);
+  const permissionTypeList = ref([
+    {
+      value: 0,
+      label: '全部用户',
+    },
+    {
+      value: 1,
+      label: '指定用户',
+    },
+  ]);
+  const { paramsObjectToString } = utils();
+
+  const loadworkFlowNames = async (templateId: string) => {
+    try {
+      const data = await fetchworkFlowNames(templateId);
+      workflowNameList.value = data?.orchestratorNames.map((v: string) => ({
+        value: v,
+        label: v,
+      }));
+    } catch (error) {
+      console.log(error);
+    }
+  };
+
+  const loadworkFlowProjectNames = async (templateId: string) => {
+    try {
+      const data = await fetchworkFlowProjectNames(templateId);
+      projectNameList.value = data?.projectNames.map((v: string) => ({
+        value: v,
+        label: v,
+      }));
+    } catch (error) {
+      console.log(error);
+    }
+  };
+
+  const loadEngineList = async () => {
+    try {
+      const data = await fetchEngineTypes();
+      engineList.value = data?.engineTypes.map((v: string) => ({
+        value: v,
+        label: v,
+      }));
+    } catch (error) {
+      console.log(error);
+    }
+  };
+
+  const loadAllWorkSpaceUserList = async (workspaceId: string) => {
+    try {
+      const data = await fetchRelateUsers(workspaceId);
+      allWorkSpaceUserList.value = data?.users.accessUsers.map((v: string) => ({
+        value: v,
+        label: v,
+      }));
+    } catch (error) {
+      console.log(error);
+    }
+  };
+
+  const loadAllWorkSpaceUserDeptsList = async (workspaceId: string) => {
+    try {
+      const data = await fetchRelateUsersDepts(workspaceId);
+      if (data && data.users && data.users.accessUsers) {
+        allWorkSpaceUserDeptsList.value = data.users.accessUsers.map(
+          (v: any) => v
+        );
+      } else {
+        allWorkSpaceUserDeptsList.value = [];
+      }
+    } catch (error) {
+      console.log(error);
+    }
+  };
+
+  const loadAllDeptList = async () => {
+    try {
+      const data = await fetchDepartments();
+      allDeptList.value = data?.departments.map((v: string) => ({
+        value: v,
+        label: v,
+      }));
+    } catch (error) {
+      console.log(error);
+    }
+  };
+
+  const loadTemplateUserList = async (templateId: string, name: string) => {
+    const params = {
+      pageNow: 1,
+      pageSize: 50,
+      templateId: templateId,
+      username: name,
+    };
+    const strParams = paramsObjectToString(params);
+    try {
+      const res = await fetchTemplateUser(strParams);
+      templateUserList.value = res.data.users.map((v: { name: string }) => ({
+        value: v.name,
+        label: v.name,
+      }));
+    } catch (error) {
+      console.log(error);
+    }
+  };
+  // 表格内容filter
+  const fillText = (row: ObjectType) =>
+    ['null', 'undefined', ''].includes(String(row.cellValue))
+      ? '- -'
+      : row.cellValue;
+
+  // 表格内容filter
+  const fillTimeText = (row: ObjectType) =>
+    ['null', 'undefined', ''].includes(String(row.cellValue))
+      ? '- -'
+      : useDateFormat(row.cellValue as string, 'YYYY-MM-DD HH:mm:ss').value;
+
+  return {
+    templateUserList,
+    allWorkSpaceUserList,
+    engineList,
+    permissionTypeList,
+    projectNameList,
+    workflowNameList,
+    allDeptList,
+    allWorkSpaceUserDeptsList,
+    loadAllWorkSpaceUserDeptsList,
+    loadAllDeptList,
+    loadTemplateUserList,
+    loadAllWorkSpaceUserList,
+    loadEngineList,
+    loadworkFlowProjectNames,
+    loadworkFlowNames,
+    fillText,
+    fillTimeText,
+  };
+};
diff --git a/next-web/packages/workspace/module/resourceTmlManage/hooks/utils.ts b/next-web/packages/workspace/module/resourceTmlManage/hooks/utils.ts
new file mode 100644
index 000000000..1bb22a468
--- /dev/null
+++ b/next-web/packages/workspace/module/resourceTmlManage/hooks/utils.ts
@@ -0,0 +1,27 @@
+export const utils = () => {
+  // 值为数组、对象前的情况未处理
+  const paramsObjectToString = (params: object) => {
+    const strArray: string[] = [];
+    for (const [key, value] of Object.entries(params)) {
+      // console.log(`Key: ${key}, Value: ${value}`);
+      if (value) {
+        strArray.push(key + '=' + value);
+      }
+    }
+    const strParams = strArray.join('&');
+    return strParams;
+  };
+
+  // 时间戳转为yy-MM-dd hh:mm:ss
+  const convertTimeStampToYMDHMS = (time: number | string) => {
+    let timeStr = new Date(Number(time)).toLocaleString('zh', {
+      hour12: false,
+    });
+    timeStr = timeStr.replace(/\//g, '-');
+    return timeStr;
+  };
+  return {
+    paramsObjectToString,
+    convertTimeStampToYMDHMS,
+  };
+};
diff --git a/next-web/packages/workspace/module/resourceTmlManage/index.vue b/next-web/packages/workspace/module/resourceTmlManage/index.vue
new file mode 100644
index 000000000..e9b13a136
--- /dev/null
+++ b/next-web/packages/workspace/module/resourceTmlManage/index.vue
@@ -0,0 +1,467 @@
+<template>
+  <BTablePage :is-loading="isLoading" :action-type="actionType">
+    <template #search>
+      <BSearch
+        v-model:form="searchForm"
+        @search="fetchTableDataMain"
+        @reset="handleReset"
+      >
+        <template #form>
+          <div>
+            <span class="condition-label">{{ t('workSpace.tmlName') }}</span>
+            <FInput
+              v-model="searchForm.name"
+              :placeholder="t('common.pleaseInput')"
+              clearable
+            >
+            </FInput>
+          </div>
+          <div>
+            <span class="condition-label">{{ t('workSpace.engineType') }}</span>
+            <FSelect
+              v-model="searchForm.engineType"
+              :placeholder="t('common.pleaseSelect')"
+              :options="engineList"
+              clearable
+              filterable
+            >
+            </FSelect>
+          </div>
+          <div>
+            <span class="condition-label">{{ t('workSpace.relateUser') }}</span>
+            <FSelect
+              v-model="searchForm.user"
+              :placeholder="t('common.pleaseSelect')"
+              :options="allWorkSpaceUserList"
+              clearable
+              filterable
+            >
+            </FSelect>
+          </div>
+        </template>
+      </BSearch>
+    </template>
+    <template #operate>
+      <FButton type="primary" @click="openAddTemplate">{{
+        t('workSpace.createTml')
+      }}</FButton>
+      <FButton @click="jumpToRule">{{ t('workSpace.tmlApplyRule') }}</FButton>
+      <!-- <FButton>{{ t('common.moreAction') }}</FButton> -->
+    </template>
+    <template #table>
+      <f-table
+        ref="templateTableRef"
+        :data="templateList"
+        class="table-container"
+        @sort-change="tableSort"
+      >
+        <f-table-column
+          prop="name"
+          :label="t('workSpace.tmlName')"
+          :width="180"
+          ellipsis
+        />
+        <f-table-column
+          prop="engineType"
+          :label="t('workSpace.engineType')"
+          :width="120"
+          ellipsis
+        />
+        <f-table-column
+          prop="permissionType"
+          :label="t('workSpace.visibility')"
+          :width="88"
+          ellipsis
+        >
+          <template #default="{ row }">
+            {{ row.permissionType === 0 ? '全部用户' : '指定用户' }}
+          </template>
+        </f-table-column>
+        <f-table-column
+          prop="permissionUserCount"
+          :label="t('workSpace.visibleUserCount')"
+          :width="102"
+          ellipsis
+        >
+          <template #default="{ row = {} }">
+            <span
+              class="a-link"
+              href="javascript:void(0);"
+              @click="openUserDrawer(row)"
+              >{{ row.permissionUserCount }}</span
+            >
+          </template>
+        </f-table-column>
+        <f-table-column
+          v-slot="{ row = {} }"
+          :label="t('workSpace.resParams')"
+          :width="88"
+          ellipsis
+        >
+          <FTooltip
+            popper-class="res-tooltip-style"
+            mode="popover"
+            placement="bottom"
+          >
+            <div class="a-link" @mouseover="getResParamsDetails(row)">查看</div>
+            <template #content>
+              <div class="card-wrapper">
+                <FCard
+                  header="资源参数"
+                  :divider="false"
+                  :bordered="false"
+                  shadow="never"
+                  :body-style="{ padding: '16px 0 0 0' }"
+                >
+                  <div v-for="(obj, key) in row?.paramsDetails" :key="key">
+                    <span style="color: #63656f"
+                      >{{ obj.name }}[{{ obj.key }}]：</span
+                    >
+                    <span>默认值：{{ obj.configValue }}</span
+                    >&nbsp;&nbsp;
+                    <span
+                      v-if="obj?.boundaryType === 2 || obj?.boundaryType === 3"
+                      >上限值：{{ obj.maxValue }}</span
+                    >
+                  </div>
+                </FCard>
+              </div>
+            </template>
+          </FTooltip>
+        </f-table-column>
+        <f-table-column
+          prop="description"
+          :label="t('workSpace.tmlDes')"
+          :width="180"
+          ellipsis
+        >
+          <template #default="{ row }">
+            <FEllipsis v-if="row.description">
+              {{ row.description }}
+              <template #tooltip>
+                <div style="max-width: 500px; word-wrap: break-word">
+                  {{ row.description }}
+                </div>
+              </template>
+            </FEllipsis>
+            <div v-else>--</div>
+          </template>
+        </f-table-column>
+        <f-table-column
+          prop="creator"
+          :label="t('common.createUser')"
+          :width="120"
+          ellipsis
+        />
+        <f-table-column
+          prop="createTime"
+          :label="t('common.createTime')"
+          :width="182"
+          ellipsis
+          sortable
+          :formatter="fillTimeText"
+        />
+        <f-table-column
+          prop="modifier"
+          :label="t('common.updateUser')"
+          :width="120"
+          ellipsis
+        />
+        <f-table-column
+          prop="modifyTime"
+          :label="t('common.updateTime')"
+          :width="182"
+          ellipsis
+          sortable
+          :formatter="fillTimeText"
+        />
+        <f-table-column
+          v-slot="{ row }"
+          :label="t('common.action')"
+          align="center"
+          fixed="right"
+          :width="60"
+          ellipsis
+        >
+          <FDropdown
+            :options="tableMoreOptions"
+            trigger="focus"
+            @click="clickTableMore($event, row)"
+          >
+            <FButton class="table-operation-item">
+              <template #icon> <MoreCircleOutlined /> </template>
+            </FButton>
+          </FDropdown>
+        </f-table-column>
+      </f-table>
+    </template>
+    <template #pagination>
+      <FPagination
+        v-model:currentPage="pagination.current"
+        v-model:pageSize="pagination.size"
+        show-size-changer
+        show-total
+        :total-count="pagination.total"
+        @change="fetchTableDataMain"
+        @page-size-change="fetchTableDataMain"
+      />
+    </template>
+  </BTablePage>
+  <PermissionUserDrawer
+    v-if="userDrawerShow"
+    v-model:show="userDrawerShow"
+    :template-obj="curTemplateObj"
+    :work-place-id="curWorkPlaceId"
+  >
+  </PermissionUserDrawer>
+  <AppDrawer
+    v-if="appDrawerShow"
+    v-model:show="appDrawerShow"
+    :template-obj="curTemplateObj"
+    :work-place-id="curWorkPlaceId"
+  >
+  </AppDrawer>
+  <WorkFlowDrawer
+    v-if="workFlowDrawerShow"
+    v-model:show="workFlowDrawerShow"
+    :template-obj="curTemplateObj"
+    :work-place-id="curWorkPlaceId"
+  >
+  </WorkFlowDrawer>
+  <TemplateOperateDrawer
+    v-if="operateDrawerShow"
+    v-model:show="operateDrawerShow"
+    :template-obj="curTemplateObj"
+    :mode="curMode"
+    :work-place-id="curWorkPlaceId"
+    @update-template-table="fetchTableDataMain"
+  ></TemplateOperateDrawer>
+</template>
+<script setup lang="ts">
+import { useI18n } from 'vue-i18n';
+import { BTablePage, BSearch } from '@fesjs/traction-widget';
+import { onMounted, ref, reactive } from 'vue';
+import { useRouter, useRoute } from 'vue-router';
+import { MoreCircleOutlined } from '@fesjs/fes-design/icon';
+import PermissionUserDrawer from './component/permissionUserDrawer.vue';
+import AppDrawer from './component/appDrawer.vue';
+import WorkFlowDrawer from './component/workFlowDrawer.vue';
+import TemplateOperateDrawer from './component/templateOperateDrawer.vue';
+import { FMessage, FModal, FTable } from '@fesjs/fes-design';
+import { deleteTemplate } from './api';
+import { useDataList } from './hooks/useDataList';
+import { fetchTemplateTableData, fetchResParams } from './api';
+import { utils } from './hooks/utils';
+
+const router = useRouter();
+const route = useRoute();
+const { t } = useI18n();
+const pagination = reactive({
+  current: 1,
+  size: 10,
+  total: 0,
+});
+const templateTableRef = ref<typeof FTable>();
+const templateList = ref([]);
+const searchForm = reactive({
+  name: '',
+  engineType: '',
+  user: '',
+  sortBy: 'createTime',
+  orderBy: 'descend',
+});
+const isLoading = ref(false);
+const actionType = ref<'loading' | 'emptyQueryResult'>('loading');
+const userDrawerShow = ref(false);
+const appDrawerShow = ref(false);
+const workFlowDrawerShow = ref(false);
+const operateDrawerShow = ref(false);
+const curMode = ref('add');
+const curWorkPlaceId = ref('');
+const curTemplateObj = ref({});
+
+const {
+  allWorkSpaceUserList,
+  engineList,
+  loadAllWorkSpaceUserList,
+  loadEngineList,
+  fillTimeText,
+} = useDataList();
+
+const { paramsObjectToString, convertTimeStampToYMDHMS } = utils();
+// 表格里的“更多”下拉弹框
+const tableMoreOptions = ref([
+  {
+    value: 'appRefList',
+    label: t('workSpace.appRefList'),
+  },
+  {
+    value: 'workFlowRefList',
+    label: t('workSpace.workFlowRefList'),
+  },
+  {
+    value: 'edit',
+    label: t('common.edit'),
+  },
+  {
+    value: 'delete',
+    label: t('common.delete'),
+  },
+]);
+
+// 更多操作
+const clickTableMore = async (
+  value: string,
+  row: { name: string; templateId: string }
+) => {
+  console.log('clickTableMore-row: ', row);
+  curTemplateObj.value = row;
+  // 打开应用抽屉
+  if (value === 'appRefList') {
+    appDrawerShow.value = true;
+  } else if (value === 'workFlowRefList') {
+    workFlowDrawerShow.value = true;
+  } else if (value === 'edit') {
+    curMode.value = 'edit';
+    operateDrawerShow.value = true;
+  } else if (value === 'delete') {
+    FModal.confirm({
+      title: '提示',
+      content: `确认删除【${row.name}】模板？`,
+      okText: '确定',
+      cancelText: '取消',
+      closable: true,
+      onOk: async () => {
+        try {
+          await deleteTemplate(row.templateId);
+          await fetchTableDataMain();
+          FMessage.success('删除成功');
+        } catch (err) {
+          console.error(err);
+        }
+      },
+    });
+  }
+};
+
+// 打开新增模板
+const openAddTemplate = () => {
+  curMode.value = 'add';
+  operateDrawerShow.value = true;
+};
+
+// 跳转到模板应用规则
+const jumpToRule = () => {
+  console.log('jumpToRule');
+  router.push({
+    path: '/workspace/resourceTmlManage/applicationRule',
+    query: {
+      workspaceId: curWorkPlaceId.value,
+    },
+  });
+};
+
+// 打开用户抽屉
+const openUserDrawer = (row: object) => {
+  console.log('openUserDrawer', row);
+  curTemplateObj.value = row;
+  userDrawerShow.value = true;
+};
+
+// 查询模板对应资源参数信息
+const getResParamsDetails = async (row: {
+  templateId: string;
+  engineType: string;
+  paramsDetails: object;
+}) => {
+  try {
+    const params = {
+      templateId: row.templateId,
+      engineType: row.engineType,
+    };
+    const strParams = paramsObjectToString(params);
+    const res = await fetchResParams(strParams);
+    row.paramsDetails = res.conf;
+  } catch (err) {
+    console.error(err);
+  }
+};
+
+// 获取表格数据
+const fetchTableData = async () => {
+  const params = {
+    workspaceId: curWorkPlaceId.value,
+    pageNow: pagination.current,
+    pageSize: pagination.size,
+    engineType: searchForm.engineType,
+    name: searchForm.name,
+    user: searchForm.user,
+    sortBy: searchForm.sortBy,
+    orderBy: searchForm.orderBy,
+  };
+  const strParams = paramsObjectToString(params);
+  isLoading.value = true;
+  actionType.value = 'loading';
+  try {
+    const res = await fetchTemplateTableData(strParams);
+    templateList.value = res.data.templateList;
+    pagination.total = res.data.total;
+    if (pagination.total === 0) {
+      actionType.value = 'emptyQueryResult';
+    }
+    isLoading.value = false;
+  } catch (err) {
+    console.error(err);
+    isLoading.value = false;
+  }
+};
+// 获取表格后刷新排序状态
+const fetchTableDataMain = async () => {
+  await fetchTableData();
+  if (templateList.value.length > 0 && templateTableRef.value) {
+    templateTableRef.value?.sort(searchForm.sortBy, searchForm.orderBy);
+  }
+};
+
+// 重置操作
+const handleReset = () => {
+  pagination.current = 1;
+  fetchTableDataMain();
+};
+
+// 判断排序参数是否和上次相同
+const compareSortParams = (prop: string, order: string) => {
+  if (prop !== searchForm.sortBy || order !== searchForm.orderBy) {
+    return false;
+  }
+  return true;
+};
+
+// 表格排序
+const tableSort = async (sortParam: { prop: string; order: string }) => {
+  const tempOrder = sortParam.order ? sortParam.order : 'descend';
+  if (!compareSortParams(sortParam.prop, tempOrder)) {
+    searchForm.sortBy = sortParam.prop;
+    searchForm.orderBy = tempOrder;
+    await fetchTableDataMain();
+  }
+};
+onMounted(async () => {
+  curWorkPlaceId.value = route.query.workspaceId as string;
+  await fetchTableDataMain();
+  loadAllWorkSpaceUserList(curWorkPlaceId.value);
+  loadEngineList();
+});
+</script>
+<style lang="less" scoped>
+.res-tooltip-style {
+  color: #0f1222;
+  background-color: #ffff;
+}
+.card-wrapper {
+  min-width: 541px;
+  :deep(.fes-card__header) {
+    padding: 0;
+  }
+}
+</style>
diff --git a/next-web/packages/workspace/module/resourceTmlManage/layout.vue b/next-web/packages/workspace/module/resourceTmlManage/layout.vue
new file mode 100644
index 000000000..94e71a535
--- /dev/null
+++ b/next-web/packages/workspace/module/resourceTmlManage/layout.vue
@@ -0,0 +1,4 @@
+<template>
+  <router-view></router-view>
+</template>
+<script setup lang="ts"></script>
diff --git a/next-web/packages/workspace/module/workFlow/advanceModal.vue b/next-web/packages/workspace/module/workFlow/advanceModal.vue
new file mode 100644
index 000000000..5620ffca0
--- /dev/null
+++ b/next-web/packages/workspace/module/workFlow/advanceModal.vue
@@ -0,0 +1,148 @@
+<template>
+  <FModal
+    v-model:show="showModal"
+    title="高级筛选"
+    display-directive="if"
+    ok-text="确定"
+    :mask-closable="false"
+    @ok="handleOk"
+  >
+    <FForm ref="filterForm" :label-width="90" label-position="right">
+      <FFormItem label="节点名称">
+        <FSelect
+          v-model="formData.nodeName"
+          :options="allNodeList"
+          placeholder="请选择"
+          filterable
+          clearable
+          value-field="title"
+          label-field="title"
+        />
+      </FFormItem>
+      <FFormItem label="节点类型">
+        <FSelect
+          v-model="formData.nodeType"
+          :options="nodeTypes"
+          placeholder="请选择"
+          filterable
+          clearable
+          multiple
+          collapse-tags
+          :collapse-tags-limit="2"
+          value-field="value"
+          label-field="label"
+        />
+      </FFormItem>
+      <FFormItem label="资源参数模板">
+        <FSelectCascader
+          v-model="formData.templateId"
+          class="select-cascader"
+          placeholder="请选择"
+          :data="templateData"
+          clearable
+          remote
+          :emit-path="false"
+          expand-trigger="click"
+          :show-path="false"
+          :load-data="loadTemplates"
+        ></FSelectCascader>
+      </FFormItem>
+      <FFormItem label="更新人">
+        <FSelect
+          v-model="formData.modifyUser"
+          :options="userList"
+          placeholder="请选择"
+          filterable
+          clearable
+          value-field="value"
+          label-field="label"
+        />
+      </FFormItem>
+      <FFormItem label="修改时间">
+        <FDatePicker
+          v-model="formData.updateTimes"
+          type="datetimerange"
+          format="yyyy/MM/dd HH:mm:ss"
+          clearable
+        />
+      </FFormItem>
+    </FForm>
+  </FModal>
+</template>
+
+<script setup>
+import { ref, computed, defineProps, defineEmits, watch, inject } from 'vue';
+// import { useI18n } from '@fesjs/fes';
+import { cloneDeep } from 'lodash-es';
+import { useTemplateList } from './hooks/useTemplateList';
+
+const emits = defineEmits(['success', 'update:show']);
+const props = defineProps({
+  show: {
+    type: Boolean,
+    default: false,
+  },
+  form: {
+    type: Object,
+    default: () => ({}),
+  },
+});
+
+// 默认筛选参数
+const formData = ref({
+  nodeName: '',
+  nodeType: [],
+  modifyUser: '',
+  templateId: '',
+  updateTimes: [],
+});
+
+// 控制弹窗显示
+const showModal = computed({
+  get: () => {
+    return props.show;
+  },
+  set: (val) => {
+    emits('update:show', val);
+  },
+});
+
+watch(
+  () => showModal.value,
+  (show) => {
+    if (show) {
+      formData.value = cloneDeep(props.form);
+    }
+  }
+);
+
+/**
+ * @description: 确认筛选
+ * @return {*}
+ */
+const handleOk = () => {
+  showModal.value = false;
+  emits('success', formData.value);
+};
+
+const nodeTypes = inject('nodeTypes');
+const templateList = inject('templateList');
+const userList = inject('userList');
+const allNodeList = inject('allNodeList');
+
+const { templateData, createData, loadTemplates } =
+  useTemplateList(templateList);
+
+watch(
+  () => templateList.value,
+  (list) => {
+    const arr = Array.from([
+      ...new Set(list.map((item) => item.engineType)),
+    ]).map((v) => ({ value: v, label: v }));
+    templateData.value = createData(arr);
+  },
+  { immediate: true, deep: true }
+);
+</script>
+
+<style lang="less" scoped></style>
diff --git a/next-web/packages/workspace/module/workFlow/api.ts b/next-web/packages/workspace/module/workFlow/api.ts
new file mode 100644
index 000000000..28b365e46
--- /dev/null
+++ b/next-web/packages/workspace/module/workFlow/api.ts
@@ -0,0 +1,6 @@
+export default {
+  getFlowList: 'dss/workflow/get', // 获取工作流
+  getNodeTypes: 'dss/workflow/listNodeType', // 获取节点类型
+  getAllWorkspaceUsers: 'dss/framework/workspace/getAllWorkspaceUsers', // 获取用户
+  getConfTemplateList: 'dss/framework/workspace/engineconf/getConfTemplateList', // 工作空间参数模板
+};
diff --git a/next-web/packages/workspace/module/workFlow/hooks/useDataList.ts b/next-web/packages/workspace/module/workFlow/hooks/useDataList.ts
new file mode 100644
index 000000000..2e2b6d18c
--- /dev/null
+++ b/next-web/packages/workspace/module/workFlow/hooks/useDataList.ts
@@ -0,0 +1,65 @@
+import { ref } from 'vue';
+import { request } from '@dataspherestudio/shared';
+import api from '../api';
+type ObjectType = Record<string, unknown>;
+
+export const useDataList = () => {
+  const nodeTypes = ref([]);
+  const templateList = ref<ObjectType[]>([]);
+  const userList = ref([]);
+
+  // 获取节点类型
+  async function getNodeTypes(param: ObjectType) {
+    await request
+      .fetch(api.getNodeTypes, { labels: param.labels })
+      .then((res) => {
+        nodeTypes.value = (res.data.nodeTypes || [])
+          .map((item: ObjectType) => item.children)
+          .flat()
+          .map((item: ObjectType) => ({ label: item.title, value: item.type }));
+      });
+  }
+
+  async function getConfTemplateList(param: ObjectType, pageNow = 1) {
+    await request
+      .fetch(api.getConfTemplateList, {
+        workspaceId: param.workspaceId,
+        pageNow,
+        pageSize: 10000,
+      })
+      .then((res) => {
+        const list = (res.data.templateList || []).map((item: ObjectType) => ({
+          engineType: item.engineType,
+          label: item.name,
+          value: item.templateId,
+        }));
+        templateList.value = [...templateList.value, ...list];
+        if (pageNow * 10000 < res.data.total) {
+          getConfTemplateList(param, pageNow + 1);
+        }
+      });
+  }
+
+  // 获取用户
+  function getUserList(param: ObjectType) {
+    request
+      .fetch(api.getAllWorkspaceUsers, {
+        workspaceId: param.workspaceId,
+      })
+      .then((res) => {
+        userList.value = res.data.users.accessUsers.map((item: ObjectType) => ({
+          value: item,
+          label: item,
+        }));
+      });
+  }
+
+  return {
+    nodeTypes,
+    templateList,
+    userList,
+    getNodeTypes,
+    getConfTemplateList,
+    getUserList,
+  };
+};
diff --git a/next-web/packages/workspace/module/workFlow/hooks/useDataUtils.ts b/next-web/packages/workspace/module/workFlow/hooks/useDataUtils.ts
new file mode 100644
index 000000000..d498c726b
--- /dev/null
+++ b/next-web/packages/workspace/module/workFlow/hooks/useDataUtils.ts
@@ -0,0 +1,83 @@
+import { ref } from 'vue';
+type ObjectType = Record<string, unknown>;
+
+export const useDataUtils = () => {
+  // 按照条件过滤
+  function filterate(item: ObjectType, param: ObjectType) {
+    const validList = [];
+    if (param['nodeName']) {
+      const valid1 = item.title === param['nodeName'];
+      validList.push(valid1);
+    }
+    if (param['nodeType'] && (param['nodeType'] as string[]).length > 0) {
+      const valid2 = (param['nodeType'] as string[]).includes(
+        item.jobType as string
+      );
+      validList.push(valid2);
+    }
+    if (param['templateId']) {
+      const valid3 = item.ecConfTemplateId === param['templateId'];
+      validList.push(valid3);
+    }
+    if (param['modifyUser']) {
+      const valid4 = item.modifyUser === param['modifyUser'];
+      validList.push(valid4);
+    }
+    if (param['updateTimes'] && (param['updateTimes'] as number[]).length > 0) {
+      const [startTime, endTime] = param['updateTimes'] as number[];
+      const valid5 =
+        (item.modifyTime as number) >= startTime &&
+        (item.modifyTime as number) <= endTime;
+      validList.push(valid5);
+    }
+    return !validList.some((valid) => valid === false);
+  }
+
+  const timer = ref<number | undefined>();
+
+  function handleNodeClick(
+    node: ObjectType | null,
+    action: string,
+    flowId: string | number
+  ) {
+    if (timer.value) {
+      window.clearTimeout(timer.value);
+    }
+    timer.value = window.setTimeout(() => {
+      window.parent.postMessage(
+        JSON.stringify({
+          action,
+          flowId,
+          type: 'dss-nextweb',
+          node,
+        }),
+        '*'
+      );
+    }, 300);
+  }
+
+  function handleNodeDblClick(
+    node: ObjectType,
+    action: string,
+    flowId: string | number
+  ) {
+    if (timer.value) {
+      clearTimeout(timer.value);
+    }
+    window.parent.postMessage(
+      JSON.stringify({
+        action,
+        flowId,
+        type: 'dss-nextweb',
+        node,
+      }),
+      '*'
+    );
+  }
+
+  return {
+    filterate,
+    handleNodeClick,
+    handleNodeDblClick,
+  };
+};
diff --git a/next-web/packages/workspace/module/workFlow/hooks/useTemplateList.ts b/next-web/packages/workspace/module/workFlow/hooks/useTemplateList.ts
new file mode 100644
index 000000000..91dd6ee39
--- /dev/null
+++ b/next-web/packages/workspace/module/workFlow/hooks/useTemplateList.ts
@@ -0,0 +1,36 @@
+import { ref } from 'vue';
+type ObjectType = Record<string, unknown>;
+export const useTemplateList = (templates: { [key: string]: any }) => {
+  const templateData = ref<ObjectType[]>([]);
+
+  function createData(data: ObjectType[]): ObjectType[] | undefined {
+    if (!data) return;
+    return data.map((v) => ({
+      label: v.label,
+      value: v.value,
+      scopeBus: v.scopeBus,
+      children: createData(v.children as ObjectType[]),
+      prefix: null,
+      suffix: null,
+    }));
+  }
+
+  const loadTemplates = async (node: ObjectType) => {
+    if (!node) {
+      return Promise.resolve([]);
+    }
+    const list = templates.value
+      .filter((item: ObjectType) => item.engineType === node.value)
+      .map((item: ObjectType) => {
+        item.isLeaf = true;
+        return item;
+      });
+    return Promise.resolve(list);
+  };
+
+  return {
+    templateData,
+    createData,
+    loadTemplates,
+  };
+};
diff --git a/next-web/packages/workspace/module/workFlow/index.vue b/next-web/packages/workspace/module/workFlow/index.vue
new file mode 100644
index 000000000..29a91fd1d
--- /dev/null
+++ b/next-web/packages/workspace/module/workFlow/index.vue
@@ -0,0 +1,638 @@
+<template>
+  <BTablePage
+    :is-loading="isLoading"
+    action-type="loading"
+    class="dss-table-page"
+  >
+    <template #search>
+      <div class="table-header">
+        <BSearch
+          v-model:form="searchForm"
+          v-model:advanceForm="advanceForm"
+          :is-advance="true"
+          @search="handleSearch"
+          @reset="handleReset"
+          @advance="showAdvance = true"
+        >
+          <template #form>
+            <div>
+              <span class="condition-label">节点名称</span>
+              <FSelect
+                v-model="searchForm.nodeName"
+                :options="allNodes"
+                placeholder="请选择"
+                filterable
+                clearable
+                value-field="title"
+                label-field="title"
+              />
+            </div>
+            <div>
+              <span class="condition-label">节点类型</span>
+              <FSelect
+                v-model="searchForm.nodeType"
+                :options="nodeTypes"
+                placeholder="请选择"
+                filterable
+                clearable
+                multiple
+                collapse-tags
+                :collapse-tags-limit="1"
+                value-field="value"
+                label-field="label"
+              />
+            </div>
+            <!-- <div>
+            <span class="condition-label">创建人</span>
+            <FSelect
+              v-model="searchForm.ruleType"
+              :options="creatorList"
+              placeholder="请选择"
+              filterable
+              clearable
+            />
+          </div> -->
+          </template>
+        </BSearch>
+        <FSpace>
+          <FDropdown
+            trigger="click"
+            :options="pageOptions"
+            @click="handleDropDown"
+          >
+            <FButton>更多操作</FButton>
+          </FDropdown>
+        </FSpace>
+      </div>
+    </template>
+    <template #table>
+      <FTable ref="tableRef" :data="tableList" @sort-change="tableSort">
+        <template v-for="(item, index) in tableColumns">
+          <FTable-column
+            v-if="item.type === 'text'"
+            :key="(item.prop as string) + index"
+            :label="item.label"
+            :prop="item.prop"
+            :ellipsis="item.ellipsis"
+            :min-width="item.minWidth"
+            :formatter="item.formatter"
+            :visible="checkTColShow(item.prop as string)"
+          />
+          <FTable-column
+            v-else-if="item.type === 'time'"
+            :key="'time' + index"
+            :label="item.label"
+            :prop="item.prop"
+            :ellipsis="item.ellipsis"
+            :min-width="item.minWidth"
+            :formatter="item.formatter"
+            :sortable="item.sortable"
+            :visible="checkTColShow(item.prop as string)"
+          />
+          <FTable-column
+            v-else-if="item.type === 'link'"
+            v-slot="{ row }"
+            :key="'link' + index"
+            :label="item.label"
+            :prop="item.prop"
+            :ellipsis="item.ellipsis"
+            :min-width="item.minWidth"
+            :visible="checkTColShow(item.prop as string)"
+            :col-style="{ color: '#5384FF', cursor: 'pointer' }"
+          >
+            <span
+              @click="
+                handleNodeClick(row, 'node_params', queryParam.flowId as string)
+              "
+              @dblclick="
+                handleNodeDblClick(
+                  row,
+                  'open_node',
+                  queryParam.flowId as string
+                )
+              "
+              >{{ row.title }}</span
+            >
+          </FTable-column>
+          <FTable-column
+            v-else-if="item.type === 'node'"
+            v-slot="{ row }"
+            :key="'node' + index"
+            :label="item.label"
+            :prop="item.prop"
+            :min-width="item.minWidth"
+            :visible="checkTColShow(item.prop as string)"
+            :col-style="{ position: 'relative' }"
+          >
+            <div
+              class="dss-column-hover"
+              @mouseenter="handleMouse(row, item.prop as string)"
+              @mouseleave="handleMouse(row, '')"
+            >
+              <span
+                :class="[
+                  'column-ellipis',
+                  row.hoverKey === item.prop ? 'hover' : '',
+                ]"
+              >
+                <FEllipsis>{{ row[item.prop as string] || '- -' }}</FEllipsis>
+              </span>
+              <span
+                v-if="row[item.prop as string] && row.hoverKey === item.prop"
+                class="column-icon"
+                @click="handleBtnClick(item.prop as string, 'nodeDrawer', row)"
+              >
+                <MoreCircleOutlined />
+              </span>
+            </div>
+          </FTable-column>
+          <FTable-column
+            v-else-if="item.type === 'action'"
+            :key="item.prop"
+            :label="item.label"
+            :min-width="item.minWidth"
+            fixed="right"
+          >
+            <FDropdown
+              placement="bottom-end"
+              :options="moreOperations"
+              trigger="click"
+              disabled
+            >
+              <span style="color: #5384ff; cursor: pointer">
+                <MoreCircleOutlined />
+              </span>
+            </FDropdown>
+          </FTable-column>
+        </template>
+      </FTable>
+    </template>
+    <template #pagination>
+      <FPagination
+        show-total
+        :page-size="pagination.pageSize"
+        :current-page="pagination.pageNow"
+        show-size-changer
+        :page-size-option="[10, 20, 50, 100]"
+        :total-count="pagination.totalCount"
+        @change="handlePageChange"
+      >
+      </FPagination>
+    </template>
+  </BTablePage>
+
+  <!-- 高级筛选 -->
+  <AdvanceModal
+    ref="advanceRef"
+    v-model:show="showAdvance"
+    :form="advanceForm"
+    @success="handleAdvanceSearch"
+  />
+
+  <!-- 设置表格 -->
+  <BTableHeaderConfig
+    v-model:headers="headers"
+    v-model:show="showTableHeaderConfig"
+    :origin-headers="originHeaders"
+    type="example"
+  />
+
+  <!-- 通用编辑 -->
+  <component
+    :is="currentComp"
+    v-model:show="currentShow"
+    :config="currentConfig"
+    :form="currentForm"
+    @success="handleSearch"
+  />
+</template>
+<script lang="ts" setup>
+import {
+  onMounted,
+  onUnmounted,
+  ref,
+  computed,
+  provide,
+  defineAsyncComponent,
+  nextTick,
+  type Component,
+  type Ref,
+} from 'vue';
+import { useI18n } from 'vue-i18n';
+import { request } from '@dataspherestudio/shared';
+import { MoreCircleOutlined } from '@fesjs/fes-design/icon';
+import {
+  usePagination,
+  type PaginationAndParams,
+} from '../hooks/usePagination';
+import { useTableConfig } from '../hooks/useTableConfig';
+import AdvanceModal from './advanceModal.vue';
+import { getUrlParams } from '@fesjs/traction-widget';
+import { useDataList } from './hooks/useDataList';
+import { useDataUtils } from './hooks/useDataUtils';
+import api from './api';
+import { FSpace } from '@fesjs/fes-design';
+
+type ObjectType = Record<string, unknown>;
+const { t: $t } = useI18n();
+const queryParam = ref<ObjectType>({
+  projectId: '',
+  flowId: '',
+  workspaceId: '',
+  labels: '',
+});
+const allNodes = ref<ObjectType[]>([]);
+const {
+  nodeTypes,
+  templateList,
+  userList,
+  getNodeTypes,
+  getConfTemplateList,
+  getUserList,
+} = useDataList();
+
+provide(
+  'nodeTypes',
+  computed(() => nodeTypes.value)
+);
+provide(
+  'templateList',
+  computed(() => templateList.value)
+);
+provide(
+  'userList',
+  computed(() => userList.value)
+);
+provide(
+  'allNodeList',
+  computed(() => allNodes.value)
+);
+
+const init = () => ({
+  nodeName: '',
+  nodeType: [],
+  sortBy: 'createTime',
+  orderBy: 'descend',
+});
+const searchForm = ref(init());
+
+// 高级筛选
+const initAdvance = () => ({
+  nodeName: '',
+  nodeType: [],
+  modifyUser: '',
+  templateId: '',
+  updateTimes: [],
+});
+const advanceForm = ref<ObjectType>(initAdvance());
+const showAdvance = ref<boolean>(false);
+const searchType = ref<string>('common');
+
+// 查询参数
+const params = computed(() => {
+  if (searchType.value === 'common') {
+    return { ...searchForm.value };
+  }
+  return {
+    ...advanceForm.value,
+    sortBy: searchForm.value.sortBy,
+    orderBy: searchForm.value.orderBy,
+  };
+});
+
+function deconstruction(edges: ObjectType[], nodes: ObjectType[]) {
+  const nodeMap: ObjectType = {};
+  nodes.forEach((item: ObjectType) => {
+    const job =
+      nodeTypes.value.find((v: ObjectType) => v.value === item.jobType) || {};
+    item.jobText = (job as ObjectType).label || '';
+    item.hoverKey = '';
+    nodeMap[item.key as string] = {
+      key: item.key,
+      bindViewKey: item.bindViewKey,
+      createTime: item.createTime,
+      ecConfTemplateId: item.ecConfTemplateId,
+      ecConfTemplateName: item.ecConfTemplateName,
+      desc: item.desc,
+      id: item.id,
+      jobContent: item.jobContent,
+      jobType: item.jobType,
+      jobText: item.jobText,
+      layout: item.layout,
+      modifyTime: item.modifyTime,
+      modifyUser: item.modifyUser,
+      params: item.params,
+      resources: item.resources,
+      selected: item.selected,
+      title: item.title,
+    };
+  });
+  const newNodes = nodes.map((item: ObjectType) => {
+    item.preNodeList = edges
+      .filter((edge: ObjectType) => edge.target === item.key)
+      .map((edge: ObjectType) => nodeMap[edge.source as string]);
+    item.preNode = (item.preNodeList as ObjectType[])
+      .map((item: ObjectType) => item.title)
+      .join(',');
+    item.nextNodeList = edges
+      .filter((edge: ObjectType) => edge.source === item.key)
+      .map((edge: ObjectType) => nodeMap[edge.target as string]);
+    item.nextNode = (item.nextNodeList as ObjectType[])
+      .map((item: ObjectType) => item.title)
+      .join(',');
+    nodeMap[item.key as string] = item;
+    return item;
+  });
+  return newNodes;
+}
+
+/**
+ * @description: 获取table数据
+ * @return {*}
+ */
+const tableList = ref<ObjectType[]>([]);
+const { filterate, handleNodeClick, handleNodeDblClick } = useDataUtils();
+async function loadTable(param: PaginationAndParams) {
+  const res = await request.fetch(api.getFlowList, {
+    isNotHaveLock: true,
+    flowId: queryParam.value.flowId,
+    labels: queryParam.value.labels,
+  });
+  const { edges, nodes } = JSON.parse(res.data.flow.flowJson);
+  allNodes.value = deconstruction(edges, nodes)
+    .filter((item: ObjectType) => filterate(item, param))
+    .sort((a: { [key: string]: any }, b: { [key: string]: any }) => {
+      const { orderBy, sortBy } = searchForm.value;
+      if (orderBy === 'descend') {
+        return b[sortBy] - a[sortBy];
+      } else {
+        return a[sortBy] - b[sortBy];
+      }
+    });
+  const pageNow = param.pageNow as number;
+  const pageSize = param.pageSize as number;
+  const start = (pageNow - 1) * pageSize;
+  tableList.value = allNodes.value.slice(start, start + pageSize);
+  const total = allNodes.value.length;
+  return {
+    totalPage: Math.ceil(total / pageSize),
+    totalCount: total,
+    pageNow: pageNow,
+  };
+}
+
+// 分页查询事件
+const {
+  isLoading,
+  pagination,
+  handleInit,
+  handleCurrent,
+  handleCurrentChange,
+  fillText,
+  fillTimeText,
+} = usePagination(params, loadTable);
+
+async function handleSearch() {
+  searchType.value = 'common';
+  advanceForm.value = initAdvance();
+  await handleInit();
+  tableRef.value?.sort(searchForm.value.sortBy, searchForm.value.orderBy);
+}
+
+// 高级筛选查询
+async function handleAdvanceSearch(data: ObjectType) {
+  searchType.value = 'advance';
+  searchForm.value = init();
+  advanceForm.value = { ...data };
+  await handleInit();
+  tableRef.value?.sort(searchForm.value.sortBy, searchForm.value.orderBy);
+}
+
+async function handleReset() {
+  await nextTick();
+  searchForm.value = init();
+  handleSearch();
+}
+
+async function handlePageChange(currentPage: number, pageSize: number) {
+  await handleCurrentChange(currentPage, pageSize);
+  tableRef.value?.sort(searchForm.value.sortBy, searchForm.value.orderBy);
+}
+
+// 判断排序参数是否和上次相同
+const compareSortParams = (prop: string, order: string) => {
+  return prop === searchForm.value.sortBy && order === searchForm.value.orderBy;
+};
+
+// 表格排序
+const tableRef: Ref = ref(null);
+const tableSort = async (sortParam: { prop: string; order: string }) => {
+  const tempOrder = sortParam.order ? sortParam.order : 'descend';
+  if (!compareSortParams(sortParam.prop, tempOrder)) {
+    searchForm.value.sortBy = sortParam.prop;
+    searchForm.value.orderBy = tempOrder;
+    await handleCurrent();
+    tableRef.value?.sort(searchForm.value.sortBy, searchForm.value.orderBy);
+  }
+};
+
+onMounted(async () => {
+  queryParam.value = (getUrlParams() as ObjectType) || {};
+  await getNodeTypes(queryParam.value);
+  getConfTemplateList(queryParam.value);
+  getUserList(queryParam.value);
+  handleSearch();
+  window.addEventListener('message', (event) => {
+    const { type } = JSON.parse(event?.data || '{}');
+    if (type === 'dss_change_node') {
+      console.log('dss_change_node');
+      handleSearch();
+    }
+  });
+});
+
+onUnmounted(() => {
+  window.removeEventListener('message', () => {
+    console.log('卸载监听');
+  });
+});
+
+const pageOptions = [
+  {
+    value: '1',
+    label: '节点路径关系查询',
+  },
+  {
+    value: '3',
+    label: '设置表格',
+  },
+];
+
+// 更多操作点击
+function handleDropDown(index: string) {
+  switch (+index) {
+    case 1:
+      handleNodeClick(
+        null,
+        'node_dependance',
+        queryParam.value.flowId as string
+      );
+      break;
+    case 3:
+      showTableHeaderConfig.value = !showTableHeaderConfig.value;
+      break;
+    default:
+      break;
+  }
+}
+
+function handleMouse(item: ObjectType, key: string) {
+  item.hoverKey = key;
+}
+
+const moreOperations = ref([]);
+
+const componentMap: { [key: string]: Component } = {
+  nodeDrawer: defineAsyncComponent(() => import('./nodeDrawer.vue')),
+};
+const currentShow = ref<ObjectType | null>(null);
+const currentForm = ref<ObjectType | null>(null);
+const currentConfig = ref<ObjectType>({ type: 'add' });
+const currentComp = ref<Component | null>(null);
+
+// 编辑
+function handleBtnClick(type: string, name: string, row: ObjectType | null) {
+  currentShow.value = { [name]: true };
+  currentConfig.value = { type, flowId: queryParam.value.flowId };
+  currentComp.value = componentMap[name];
+  currentForm.value = { ...row };
+}
+
+// 设置表格
+const tableColumns = ref<ObjectType[]>([
+  {
+    type: 'link',
+    prop: 'title',
+    label: '节点名称',
+    ellipsis: true,
+    minWidth: 160,
+    formatter: fillText,
+  },
+  {
+    type: 'text',
+    prop: 'jobText',
+    label: '节点类型',
+    ellipsis: true,
+    minWidth: 120,
+    formatter: fillText,
+  },
+  {
+    type: 'node',
+    prop: 'preNode',
+    label: '上游一级节点',
+    ellipsis: true,
+    minWidth: 160,
+    formatter: fillText,
+  },
+  {
+    type: 'node',
+    prop: 'nextNode',
+    label: '下游一级节点',
+    ellipsis: true,
+    minWidth: 160,
+    formatter: fillText,
+  },
+  {
+    type: 'text',
+    prop: 'ecConfTemplateName',
+    label: '资源参数模板',
+    ellipsis: true,
+    minWidth: 180,
+    formatter: fillText,
+  },
+  // {
+  //   type: 'text',
+  //   prop: 'createUser',
+  //   label: $t('announcement.creator'),
+  //   ellipsis: true,
+  //   minWidth: 120,
+  //   formatter: fillText,
+  // },
+  {
+    type: 'time',
+    prop: 'createTime',
+    label: $t('announcement.createTime'),
+    ellipsis: true,
+    minWidth: 182,
+    sortable: true,
+    formatter: fillTimeText,
+  },
+  {
+    type: 'text',
+    prop: 'modifyUser',
+    label: '更新人',
+    ellipsis: true,
+    minWidth: 120,
+    formatter: fillText,
+  },
+  {
+    type: 'time',
+    prop: 'modifyTime',
+    label: '更新时间',
+    ellipsis: true,
+    minWidth: 182,
+    sortable: true,
+    formatter: fillTimeText,
+  },
+  {
+    type: 'action',
+    prop: 'action',
+    label: $t('announcement.operation'),
+    minWidth: 60,
+  },
+]);
+
+const { headers, originHeaders, showTableHeaderConfig, checkTColShow } =
+  useTableConfig(tableColumns);
+</script>
+<style lang="less" scoped>
+.dss-table-page {
+  .table-header {
+    display: flex;
+    justify-content: space-between;
+  }
+
+  :deep(.fes-divider) {
+    display: none;
+  }
+
+  .dss-column-hover {
+    height: 54px;
+    display: flex;
+    align-items: center;
+    position: absolute;
+    width: calc(100% - 32px);
+    top: 0;
+    left: 16px;
+
+    .column-ellipis {
+      display: inline-block;
+      vertical-align: text-bottom;
+      margin-right: 5px;
+      max-width: 100%;
+
+      &.hover {
+        max-width: calc(100% - 20px);
+      }
+    }
+
+    .column-icon {
+      cursor: pointer;
+      display: inline-block;
+      height: 19px;
+      width: 20px;
+      color: #93949b;
+    }
+  }
+}
+</style>
diff --git a/next-web/packages/workspace/module/workFlow/nodeDrawer.vue b/next-web/packages/workspace/module/workFlow/nodeDrawer.vue
new file mode 100644
index 000000000..9e015e234
--- /dev/null
+++ b/next-web/packages/workspace/module/workFlow/nodeDrawer.vue
@@ -0,0 +1,283 @@
+<template>
+  <FDrawer
+    v-model:show="showModal"
+    :title="title"
+    width="50%"
+    :mask-closable="false"
+    display-directive="if"
+    content-class="customModalStyle"
+  >
+    <BTablePage :is-loading="isLoading" action-type="loading">
+      <template #search>
+        <BSearch
+          v-model:form="searchForm"
+          @search="handleSearch"
+          @reset="handleReset"
+        >
+          <template #form>
+            <div>
+              <FSelect
+                v-model="searchForm.nodeType"
+                :options="nodeTypes"
+                placeholder="节点类型"
+                filterable
+                clearable
+                multiple
+                collapse-tags
+                :collapse-tags-limit="1"
+                value-field="value"
+                label-field="label"
+              />
+            </div>
+            <div>
+              <FSelect
+                v-model="searchForm.nodeName"
+                :options="allNodes"
+                placeholder="节点名称"
+                filterable
+                clearable
+                value-field="title"
+                label-field="title"
+              />
+            </div>
+            <div>
+              <FSelect
+                v-model="searchForm.modifyUser"
+                :options="userList"
+                placeholder="更新人"
+                filterable
+                clearable
+                value-field="value"
+                label-field="label"
+              />
+            </div>
+          </template>
+        </BSearch>
+      </template>
+      <template #table>
+        <FTable ref="tableRef" :data="tableList" @sort-change="tableSort">
+          <FTable-column
+            v-slot="{ row }"
+            prop="title"
+            label="节点名称"
+            :min-width="160"
+            :formatter="fillText"
+            ellipsis
+            :col-style="{ color: '#5384FF', cursor: 'pointer' }"
+          >
+            <span
+              @click="
+                handleNodeClick(
+                  row,
+                  'node_params',
+                  props.config.flowId as string
+                )
+              "
+              @dblclick="
+                handleNodeDblClick(
+                  row,
+                  'open_node',
+                  props.config.flowId as string
+                )
+              "
+              >{{ row.title }}</span
+            >
+          </FTable-column>
+          <FTable-column
+            prop="jobText"
+            label="节点类型"
+            :min-width="120"
+            :formatter="fillText"
+            ellipsis
+          >
+          </FTable-column>
+          <FTable-column
+            prop="createTime"
+            label="创建时间"
+            :min-width="182"
+            :formatter="fillTimeText"
+            ellipsis
+            sortable
+          />
+          <FTable-column
+            prop="modifyUser"
+            label="更新人"
+            :min-width="120"
+            :formatter="fillText"
+            ellipsis
+          />
+          <FTable-column
+            prop="modifyTime"
+            label="更新时间"
+            :min-width="182"
+            :formatter="fillTimeText"
+            ellipsis
+            sortable
+          />
+          <FTable-column label="操作" :min-width="60" fixed="right">
+            <FDropdown
+              placement="bottom-end"
+              :options="moreOperations"
+              trigger="click"
+              disabled
+            >
+              <span style="color: #5384ff; cursor: pointer"
+                ><MoreCircleOutlined
+              /></span>
+            </FDropdown>
+          </FTable-column>
+        </FTable>
+      </template>
+      <template #pagination>
+        <FPagination
+          show-total
+          :page-size="pagination.pageSize"
+          :current-page="pagination.pageNow"
+          show-size-changer
+          :page-size-option="[10, 20, 50, 100]"
+          :total-count="pagination.totalCount"
+          @change="handlePageChange"
+        >
+        </FPagination>
+      </template>
+    </BTablePage>
+  </FDrawer>
+</template>
+<script lang="ts" setup name="nodeDrawer">
+import { ref, computed, watch, inject, nextTick, type Ref } from 'vue';
+import { MoreCircleOutlined } from '@fesjs/fes-design/icon';
+import { useDataUtils } from './hooks/useDataUtils';
+import {
+  usePagination,
+  type PaginationAndParams,
+} from '../hooks/usePagination';
+type ObjectType = Record<string, unknown>;
+const emits = defineEmits(['update:show']);
+const props = defineProps({
+  show: {
+    type: Object,
+    default: null,
+  },
+  config: {
+    type: Object,
+    default: () => ({}),
+  },
+  form: {
+    type: Object,
+    default: () => ({}),
+  },
+});
+const titleMap: { [key: string]: string } = {
+  preNode: '的上游一级节点',
+  nextNode: '的下游一级节点',
+};
+const title = computed(
+  () => `${props.form.title}${titleMap[props.config.type]}`
+);
+const showModal = computed({
+  get() {
+    return !!props.show?.nodeDrawer;
+  },
+  set(val) {
+    emits('update:show', { nodeDrawer: val });
+  },
+});
+
+const init = () => ({
+  nodeName: '',
+  nodeType: [],
+  modifyUser: '',
+  sortBy: 'createTime',
+  orderBy: 'descend',
+});
+const searchForm = ref(init());
+const nodeTypes = inject('nodeTypes');
+const userList = inject('userList');
+
+const { filterate, handleNodeClick, handleNodeDblClick } = useDataUtils();
+const allNodes = ref([]);
+const tableList = ref<ObjectType[]>([]);
+async function loadTable(param: PaginationAndParams) {
+  allNodes.value = props.form[`${props.config.type}List`];
+  const newNodes = allNodes.value.filter((item: ObjectType) =>
+    filterate(item, param)
+  );
+  const pageNow = param.pageNow as number;
+  const pageSize = param.pageSize as number;
+  const start = (pageNow - 1) * pageSize;
+  tableList.value = newNodes.slice(start, start + pageSize);
+  const total = newNodes.length;
+  return {
+    totalPage: Math.ceil(total / pageSize),
+    totalCount: total,
+    pageNow: pageNow,
+  };
+}
+
+/**
+ * @description: 分页查询事件
+ * @return {*}
+ */
+const {
+  isLoading,
+  pagination,
+  handleInit,
+  handleCurrent,
+  handleCurrentChange,
+  fillText,
+  fillTimeText,
+} = usePagination(searchForm, loadTable);
+
+async function handleSearch() {
+  await handleInit();
+  tableRef.value?.sort(searchForm.value.sortBy, searchForm.value.orderBy);
+}
+
+async function handleReset() {
+  await nextTick();
+  searchForm.value = init();
+  handleSearch();
+}
+
+async function handlePageChange(currentPage: number, pageSize: number) {
+  await handleCurrentChange(currentPage, pageSize);
+  tableRef.value?.sort(searchForm.value.sortBy, searchForm.value.orderBy);
+}
+
+// 判断排序参数是否和上次相同
+const compareSortParams = (prop: string, order: string) => {
+  return prop === searchForm.value.sortBy && order === searchForm.value.orderBy;
+};
+
+// 表格排序
+const tableRef: Ref = ref(null);
+const tableSort = async (sortParam: { prop: string; order: string }) => {
+  const tempOrder = sortParam.order ? sortParam.order : 'descend';
+  if (!compareSortParams(sortParam.prop, tempOrder)) {
+    searchForm.value.sortBy = sortParam.prop;
+    searchForm.value.orderBy = tempOrder;
+    await handleCurrent();
+    tableRef.value?.sort(searchForm.value.sortBy, searchForm.value.orderBy);
+  }
+};
+
+const moreOperations = ref([]);
+
+watch(
+  () => showModal.value,
+  async (show) => {
+    if (show) {
+      await nextTick();
+      handleSearch();
+    }
+  },
+  { immediate: true }
+);
+</script>
+<style lang="less">
+.customModalStyle {
+  .wd-table-page {
+    padding: 0 0;
+  }
+}
+</style>
diff --git a/next-web/packages/workspace/package.json b/next-web/packages/workspace/package.json
new file mode 100644
index 000000000..b150f7879
--- /dev/null
+++ b/next-web/packages/workspace/package.json
@@ -0,0 +1,9 @@
+{
+  "name": "@dataspherestudio/workspace",
+  "version": "0.0.1",
+  "dependencies": {
+    "@dataspherestudio/shared": "^0.0.1"
+  },
+  "devDependencies": {},
+  "scripts": {}
+}
diff --git a/next-web/packages/workspace/router.js b/next-web/packages/workspace/router.js
new file mode 100644
index 000000000..983e537a1
--- /dev/null
+++ b/next-web/packages/workspace/router.js
@@ -0,0 +1,64 @@
+const routes = [
+  {
+    path: '/workspace',
+    name: 'workspace',
+    meta: {
+      title: 'Workspace',
+      publicPage: true,
+    },
+    component: () => import('./view/layout.vue'),
+    redirect: '/workspace/resourceTmlManage',
+    children: [
+      {
+        path: 'resourceTmlManage',
+        name: 'resourceTmlManage',
+        meta: {
+          title: 'Resource Template',
+          publicPage: true,
+        },
+        component: () => import('./module/resourceTmlManage/layout.vue'),
+        children: [
+          {
+            path: '',
+            name: 'resourceTmlManage',
+            meta: {
+              title: 'Resource Template',
+              publicPage: true,
+            },
+            component: () => import('./module/resourceTmlManage/index.vue'),
+          },
+          {
+            path: 'applicationRule',
+            name: 'applicationRule',
+            meta: {
+              title: 'Application Rule',
+              publicPage: true,
+            },
+            component: () =>
+              import('./module/resourceTmlManage/applicationRule/index.vue'),
+          },
+        ],
+      },
+      {
+        path: 'announcement',
+        name: 'announcement',
+        meta: {
+          title: 'Announcement',
+          publicPage: true,
+        },
+        component: () => import('./module/announcement/index.vue'),
+      },
+      {
+        path: 'workflow',
+        name: 'workflow',
+        meta: {
+          title: 'Workflow',
+          publicPage: true,
+        },
+        component: () => import('./module/workFlow/index.vue'),
+      },
+    ],
+  },
+];
+
+export default routes;
diff --git a/next-web/packages/workspace/view/layout.vue b/next-web/packages/workspace/view/layout.vue
new file mode 100644
index 000000000..32ca531e9
--- /dev/null
+++ b/next-web/packages/workspace/view/layout.vue
@@ -0,0 +1,6 @@
+<template>
+  <div>
+    <!-- <div>workspace</div> -->
+    <router-view></router-view>
+  </div>
+</template>
diff --git a/next-web/public/vite.svg b/next-web/public/vite.svg
new file mode 100644
index 000000000..e7b8dfb1b
--- /dev/null
+++ b/next-web/public/vite.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" aria-hidden="true" role="img" class="iconify iconify--logos" width="31.88" height="32" preserveAspectRatio="xMidYMid meet" viewBox="0 0 256 257"><defs><linearGradient id="IconifyId1813088fe1fbc01fb466" x1="-.828%" x2="57.636%" y1="7.652%" y2="78.411%"><stop offset="0%" stop-color="#41D1FF"></stop><stop offset="100%" stop-color="#BD34FE"></stop></linearGradient><linearGradient id="IconifyId1813088fe1fbc01fb467" x1="43.376%" x2="50.316%" y1="2.242%" y2="89.03%"><stop offset="0%" stop-color="#FFEA83"></stop><stop offset="8.333%" stop-color="#FFDD35"></stop><stop offset="100%" stop-color="#FFA800"></stop></linearGradient></defs><path fill="url(#IconifyId1813088fe1fbc01fb466)" d="M255.153 37.938L134.897 252.976c-2.483 4.44-8.862 4.466-11.382.048L.875 37.958c-2.746-4.814 1.371-10.646 6.827-9.67l120.385 21.517a6.537 6.537 0 0 0 2.322-.004l117.867-21.483c5.438-.991 9.574 4.796 6.877 9.62Z"></path><path fill="url(#IconifyId1813088fe1fbc01fb467)" d="M185.432.063L96.44 17.501a3.268 3.268 0 0 0-2.634 3.014l-5.474 92.456a3.268 3.268 0 0 0 3.997 3.378l24.777-5.718c2.318-.535 4.413 1.507 3.936 3.838l-7.361 36.047c-.495 2.426 1.782 4.5 4.151 3.78l15.304-4.649c2.372-.72 4.652 1.36 4.15 3.788l-11.698 56.621c-.732 3.542 3.979 5.473 5.943 2.437l1.313-2.028l72.516-144.72c1.215-2.423-.88-5.186-3.54-4.672l-25.505 4.922c-2.396.462-4.435-1.77-3.759-4.114l16.646-57.705c.677-2.35-1.37-4.583-3.769-4.113Z"></path></svg>
\ No newline at end of file
diff --git a/next-web/src/App.vue b/next-web/src/App.vue
new file mode 100644
index 000000000..52ed022a9
--- /dev/null
+++ b/next-web/src/App.vue
@@ -0,0 +1,20 @@
+<script setup lang="ts"></script>
+
+<template>
+  <router-view></router-view>
+</template>
+
+<style scoped>
+.logo {
+  height: 6em;
+  padding: 1.5em;
+  will-change: filter;
+  transition: filter 300ms;
+}
+.logo:hover {
+  filter: drop-shadow(0 0 2em #646cffaa);
+}
+.logo.vue:hover {
+  filter: drop-shadow(0 0 2em #42b883aa);
+}
+</style>
diff --git a/next-web/src/assets/vue.svg b/next-web/src/assets/vue.svg
new file mode 100644
index 000000000..770e9d333
--- /dev/null
+++ b/next-web/src/assets/vue.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" aria-hidden="true" role="img" class="iconify iconify--logos" width="37.07" height="36" preserveAspectRatio="xMidYMid meet" viewBox="0 0 256 198"><path fill="#41B883" d="M204.8 0H256L128 220.8L0 0h97.92L128 51.2L157.44 0h47.36Z"></path><path fill="#41B883" d="m0 0l128 220.8L256 0h-51.2L128 132.48L50.56 0H0Z"></path><path fill="#35495E" d="M50.56 0L128 133.12L204.8 0h-47.36L128 51.2L97.92 0H50.56Z"></path></svg>
\ No newline at end of file
diff --git a/next-web/src/base.less b/next-web/src/base.less
new file mode 100644
index 000000000..d8c5a1e9f
--- /dev/null
+++ b/next-web/src/base.less
@@ -0,0 +1,75 @@
+* {
+  box-sizing: border-box;
+  font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', 'PingFang SC',
+    'Hiragino Sans GB', 'Microsoft YaHei', 'Helvetica Neue', Helvetica, Arial,
+    sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol',
+    'JinbiaoSong', 'JinbiaoSongExt';
+}
+html {
+  height: 100%;
+}
+body {
+  margin: 0;
+  padding: 0;
+  height: 100%;
+  color: #0f1222;
+  font-size: 14px;
+}
+
+h1,
+h2,
+h3,
+h4,
+h5,
+h6,
+p {
+  margin: 0;
+  padding: 0;
+}
+
+a {
+  text-decoration: none;
+  color: #5384ff;
+}
+
+ul {
+  padding: 0;
+  margin: 0;
+  list-style: none;
+}
+
+#app {
+  height: 100%;
+}
+
+.table-container {
+  .table-operation-item {
+    padding: 0;
+    width: 100%;
+    min-width: 100%;
+    border: 0;
+    font-family: PingFangSC-Regular;
+    font-size: 14px;
+    color: #5384ff;
+    letter-spacing: 0;
+    line-height: 22px;
+    font-weight: 400;
+    &:hover {
+      color: #5384ff;
+    }
+  }
+}
+
+.a-link {
+  cursor: pointer;
+}
+.fes-ellipsis {
+  .a-link {
+    color: #5384ff;
+  }
+}
+.fes-popper {
+  .a-link {
+    color: #fff;
+  }
+}
diff --git a/next-web/src/i18n.ts b/next-web/src/i18n.ts
new file mode 100644
index 000000000..d88cde150
--- /dev/null
+++ b/next-web/src/i18n.ts
@@ -0,0 +1,26 @@
+import { createI18n } from 'vue-i18n';
+import Apps from 'virtual-app-module';
+import { merge } from 'lodash';
+
+const messages = {
+  en: {},
+  'zh-CN': {},
+};
+
+Apps.appsI18n.forEach((appI18n: any) => {
+  Promise.all([appI18n['zh-CN'], appI18n['en']]).then((item) => {
+    const msgconf = {
+      'zh-CN': item[0].default,
+      en: item[1].default,
+    };
+    merge(messages, msgconf);
+  });
+});
+
+const i18n = createI18n({
+  legacy: false,
+  locale: 'zh-CN',
+  messages,
+});
+
+export default i18n;
diff --git a/next-web/src/main.ts b/next-web/src/main.ts
new file mode 100644
index 000000000..cd48633a3
--- /dev/null
+++ b/next-web/src/main.ts
@@ -0,0 +1,65 @@
+import { createApp } from 'vue';
+import router from './router';
+import i18n from './i18n';
+import App from './App.vue';
+import {
+  FSpace,
+  FMessage,
+  FInput,
+  FButton,
+  FTable,
+  FPagination,
+  FSelect,
+  FTableColumn,
+  FDropdown,
+  FTooltip,
+  FCard,
+  FEllipsis,
+  FModal,
+  FDrawer,
+  FForm,
+  FDatePicker,
+  FSelectCascader,
+} from '@fesjs/fes-design';
+import {
+  BTablePage,
+  BSearch,
+  BTableHeaderConfig,
+} from '@fesjs/traction-widget';
+import { request } from '@dataspherestudio/shared';
+import './base.less';
+// 设置请求错误提示
+request.setError({
+  showErrorMsg: function (error: any) {
+    FMessage.error(error.message || '这是一条消息');
+  },
+});
+
+router().then((router) => {
+  const app = createApp(App);
+  app.use(BTablePage);
+  app.use(BSearch);
+  app.use(BTableHeaderConfig);
+  app.use(FDrawer);
+  app.use(FSpace);
+  // @ts-ignore
+  app.use(FMessage);
+  app.use(FInput);
+  app.use(FButton);
+  app.use(FTable);
+  app.use(FPagination);
+  app.use(FSelect);
+  app.use(FTableColumn);
+  app.use(FDropdown);
+  app.use(FTooltip);
+  app.use(FCard);
+  app.use(FEllipsis);
+  app.use(FModal);
+  app.use(FForm);
+  app.use(FSpace);
+  app.use(FDatePicker);
+  app.use(FSelectCascader);
+  app.use(i18n);
+  app.use(router);
+  app.mount('#app');
+});
diff --git a/next-web/src/router.ts b/next-web/src/router.ts
new file mode 100644
index 000000000..2748fc167
--- /dev/null
+++ b/next-web/src/router.ts
@@ -0,0 +1,35 @@
+import type { RouteRecordRaw } from 'vue-router';
+import { createRouter, createWebHashHistory } from 'vue-router';
+
+import Apps from 'virtual-app-module';
+
+console.log(Apps.appsRoutes);
+function initRoutes() {
+  return Promise.all(Object.values(Apps.appsRoutes)).then((route) => {
+    let routes: RouteRecordRaw[] = [];
+    //@ts-ignore
+    route.forEach((it) => (routes = routes.concat(it.default)));
+    return routes;
+  });
+}
+
+export default async function init() {
+  const routes: RouteRecordRaw[] = await initRoutes();
+  const router = createRouter({
+    history: createWebHashHistory(),
+    routes: routes,
+  });
+
+  // 全局前置守卫
+  router.beforeEach((to, from, next) => {
+    next();
+  });
+
+  router.afterEach((to) => {
+    const _title = to.meta.title as string;
+    if (_title) {
+      window.document.title = _title;
+    }
+  });
+  return router;
+}
diff --git a/next-web/src/vite-env.d.ts b/next-web/src/vite-env.d.ts
new file mode 100644
index 000000000..11f02fe2a
--- /dev/null
+++ b/next-web/src/vite-env.d.ts
@@ -0,0 +1 @@
+/// <reference types="vite/client" />
diff --git a/next-web/tsconfig.json b/next-web/tsconfig.json
new file mode 100644
index 000000000..e649c6cd9
--- /dev/null
+++ b/next-web/tsconfig.json
@@ -0,0 +1,46 @@
+{
+  "extends": "@vue/tsconfig/tsconfig.dom.json",
+  "compilerOptions": {
+    "target": "ES2020",
+
+    "typeRoots": ["./node_modules/@types", "./types"],
+    "paths": {
+      "@/*": ["./*"],
+      "@dataspherestudio/*": ["./packages/*"]
+    },
+
+    /* Bundler mode */
+    "moduleResolution": "bundler",
+    "allowImportingTsExtensions": true,
+    "resolveJsonModule": true,
+    "isolatedModules": true,
+    "noEmit": true,
+    "jsx": "preserve",
+
+    /* Linting */
+    "strict": true,
+    "noUnusedLocals": true,
+    "noUnusedParameters": false,
+    "noFallthroughCasesInSwitch": true
+  },
+  "include": [
+    "src/**/*.ts",
+    "src/**/*.d.ts",
+    "src/**/*.tsx",
+    "src/**/*.vue",
+    "packages/**/*.ts",
+    "packages/**/*.d.ts",
+    "packages/**/*.tsx",
+    "packages/**/*.vue",
+    "exts/**/*.ts",
+    "exts/**/*.d.ts",
+    "exts/**/*.tsx",
+    "exts/**/*.vue",
+    "types/**/*.d.ts"
+  ],
+  "references": [
+    {
+      "path": "./tsconfig.node.json"
+    }
+  ]
+}
diff --git a/next-web/tsconfig.node.json b/next-web/tsconfig.node.json
new file mode 100644
index 000000000..49b0ac29c
--- /dev/null
+++ b/next-web/tsconfig.node.json
@@ -0,0 +1,12 @@
+{
+  "compilerOptions": {
+    "target": "es2020",
+    "composite": true,
+    "skipLibCheck": true,
+    "module": "ESNext",
+    "moduleResolution": "bundler",
+    "allowSyntheticDefaultImports": true
+  },
+
+  "include": ["vite.config.ts", "vite-plugin/*.ts", "types/**/*.d.ts"]
+}
diff --git a/next-web/types/index.d.ts b/next-web/types/index.d.ts
new file mode 100644
index 000000000..91e74db7f
--- /dev/null
+++ b/next-web/types/index.d.ts
@@ -0,0 +1,23 @@
+declare type AppModule = 'workspace';
+
+declare type ConfigOfApps = {
+  routes: string;
+  module: string;
+  i18n: {
+    en: string;
+    'zh-CN': string;
+  };
+};
+
+declare type AppConf = {
+  apps: {
+    [key in AppModule]: ConfigOfApps;
+  };
+  exts: object;
+  conf: object;
+  version: string;
+};
+
+declare interface Window {
+  __MICRO_APP_ENVIRONMENT__: any;
+}
diff --git a/next-web/types/modules.d.ts b/next-web/types/modules.d.ts
new file mode 100644
index 000000000..6ccf7e259
--- /dev/null
+++ b/next-web/types/modules.d.ts
@@ -0,0 +1,16 @@
+declare module 'virtual-app-module' {
+  import type { RouteRecordRaw } from 'vue-router';
+  type AppModuleType = 'dss' | 'workspace' | 'scriptis';
+
+  let exts: object;
+  let appsRoutes: {
+    [key in AppModuleType]: RouteRecordRaw[];
+  };
+  let appsI18n: [];
+  let conf: {
+    [key: string]: any;
+  };
+  let gitInfo: {
+    [key: string]: any;
+  };
+}
diff --git a/next-web/types/shims-vue.d.ts b/next-web/types/shims-vue.d.ts
new file mode 100644
index 000000000..798e8fcfa
--- /dev/null
+++ b/next-web/types/shims-vue.d.ts
@@ -0,0 +1,5 @@
+declare module '*.vue' {
+  import { defineComponent } from 'vue';
+  const component: ReturnType<typeof defineComponent>;
+  export default component;
+}
diff --git a/next-web/vite-plugin/vite-dynamic-module.ts b/next-web/vite-plugin/vite-dynamic-module.ts
new file mode 100644
index 000000000..cd7314a0e
--- /dev/null
+++ b/next-web/vite-plugin/vite-dynamic-module.ts
@@ -0,0 +1,108 @@
+import child_process from 'child_process';
+
+// 默认打包DSS
+let configFile = `dss.js`;
+if (process.env.npm_config_configfile) {
+  configFile = `.${process.env.npm_config_configfile}`;
+}
+
+const config = await import(`./config/${configFile}`);
+const { apps = {}, exts = {}, conf = {}, version } = config.default as AppConf;
+
+if (version) {
+  process.env.VUE_APP_VERSION = version;
+}
+
+const appsRoutes: string[] = [];
+const appsI18n: string[] = [];
+const confs: string[] = [];
+
+Object.entries(apps).forEach((item) => {
+  // 处理路由
+  const conf = item[1] as ConfigOfApps;
+  if (conf.routes) {
+    appsRoutes.push(`${item[0]}: import('@/packages/${conf.routes}')`);
+  }
+  // 处理国际化
+  if (conf.i18n) {
+    appsI18n.push(`{
+      'zh-CN': import('@/packages/${conf.i18n['zh-CN']}'),
+      'en': import('@/packages/${conf.i18n['en']}')
+    }`);
+  }
+});
+
+// 扩展模块
+const extsMoule: string[] = [];
+Object.keys(exts).forEach((item, index) => {
+  extsMoule[index] = `
+    '${item}': {
+      'module': import('@/exts/${exts[item].module}'),
+      'options': ${JSON.stringify(exts[item].options)}
+    }
+  `;
+  // 扩展模块国际化文件
+  if (exts[item].i18n) {
+    appsI18n.push(`{
+      'zh-CN': import('@/exts/${exts[item].i18n['zh-CN']}'),
+      'en': import('@/exts/${exts[item].i18n['en']}')
+    }`);
+  }
+});
+
+// config
+Object.keys(conf).forEach((item) => {
+  if (['app_logo'].includes(item)) {
+    confs.push(`${item}: import('@/${conf[item]}')`);
+  } else if (typeof conf[item] == 'string') {
+    confs.push(`${item}: '${conf[item]}'`);
+  } else if (typeof conf[item] == 'object') {
+    confs.push(`${item}: ${JSON.stringify(conf[item])}`);
+  } else {
+    confs.push(`${item}: ${conf[item]}`);
+  }
+});
+
+const gitInfo: { branchName: string; gitUrl: string; commitInfo: string } = {
+  branchName: '',
+  gitUrl: '',
+  commitInfo: '',
+};
+try {
+  // 当前构建分支信息
+  gitInfo.branchName = child_process
+    .execSync('git branch --show-current')
+    .toString();
+  gitInfo.gitUrl = child_process.execSync('git remote -v').toString();
+  const commitInfo = child_process.execSync('git branch -vv').toString();
+  gitInfo.commitInfo = commitInfo
+    .split(/[\r\n]/)
+    .filter((item) => item.indexOf('*') > -1)
+    .join('');
+} catch (e) {
+  /* empty */
+}
+
+export default function dynamicPlugin() {
+  const virtualModuleId = 'virtual-app-module';
+  const resolvedVirtualModuleId = '\0' + virtualModuleId;
+  return {
+    name: 'virtual-module-plugin',
+    resolveId(id) {
+      if (id === virtualModuleId) {
+        return resolvedVirtualModuleId;
+      }
+    },
+    load(id) {
+      if (id === resolvedVirtualModuleId) {
+        return `export default {
+            exts: {${extsMoule.join(',')}},
+            appsRoutes: {${appsRoutes.join(',')}},
+            appsI18n: [${appsI18n.join(',')}],
+            conf: {${confs.join(',')}},
+            gitInfo: ${JSON.stringify(gitInfo)}
+          };`;
+      }
+    },
+  };
+}
diff --git a/next-web/vite-plugin/vite-host.ts b/next-web/vite-plugin/vite-host.ts
new file mode 100644
index 000000000..15f775f52
--- /dev/null
+++ b/next-web/vite-plugin/vite-host.ts
@@ -0,0 +1,25 @@
+import devip from 'dev-ip';
+import { Plugin } from 'vite';
+
+export default function vitePluginHost(): Plugin {
+  return {
+    name: 'vite-plugin-host',
+    apply: 'serve',
+    config: () => ({
+      server: {
+        host: '0.0.0.0',
+        hmr: {
+          host: devip()[0],
+          port: 5173,
+        },
+      },
+    }),
+    configureServer(server) {
+      server.middlewares.use((req, _, next) => {
+        // @ts-ignore
+        req.url = req._parsedUrl.path;
+        next();
+      });
+    },
+  };
+}
diff --git a/next-web/vite.config.ts b/next-web/vite.config.ts
new file mode 100644
index 000000000..2f32f9377
--- /dev/null
+++ b/next-web/vite.config.ts
@@ -0,0 +1,54 @@
+import { resolve } from 'path';
+import vue from '@vitejs/plugin-vue';
+import { ConfigEnv, defineConfig, loadEnv, UserConfig } from 'vite';
+import host from './vite-plugin/vite-host';
+import eslintPlugin from 'vite-plugin-eslint';
+import virtualModule from './vite-plugin/vite-dynamic-module';
+
+// https://vitejs.dev/config/
+export default defineConfig(({ command, mode }: ConfigEnv): UserConfig => {
+  // 根据当前工作目录中的 `mode` 加载 .env 文件
+  // 设置第三个参数为 '' 来加载所有环境变量，而不管是否有 `VITE_` 前缀。
+  const env = loadEnv(mode, process.cwd(), '');
+  console.log(env, command, mode);
+  return {
+    define: {},
+    plugins: [host(), vue(), virtualModule(), eslintPlugin()],
+    resolve: {
+      alias: {
+        '@': resolve(__dirname, './'),
+        '@dataspherestudio': resolve(__dirname, './packages'),
+      },
+    },
+    css: {
+      preprocessorOptions: {
+        less: {
+          javascriptEnabled: true,
+        },
+      },
+    },
+    server: {
+      https: false,
+      proxy: {
+        '/api': {
+          target: 'http://***REMOVED***:8088',
+          // target: ***REMOVED***
+          // target: ***REMOVED***
+          secure: false,
+          changeOrigin: true,
+          followRedirects: true,
+          headers: {
+            cookie: '',
+            // cookie:
+            // 'linkis_user_session_ticket_id_v1=FmzyJmP2DGUzEo5Hy/D0OqyinoWZ4+L52vOV55MqIl4=; workspaceId=104; workspaceName=bdapWorkspace_move',
+            TokenCode: 'admin-kmsnd',
+            TokenUser: 'stacyyan',
+            TokenAlive: 'true',
+          },
+        },
+      },
+    },
+    base: './',
+    build: { target: 'chrome66' },
+  };
+});

From 93087a4f6633be2f731cbf9a269cf9952ce6db6e Mon Sep 17 00:00:00 2001
From: v_xuanzhou <zhouxuannihao@qq.com>
Date: Wed, 29 May 2024 15:08:27 +0800
Subject: [PATCH 195/302] dss-server:Upgrade jar version

---
 dss-commons/dss-common/pom.xml | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/dss-commons/dss-common/pom.xml b/dss-commons/dss-common/pom.xml
index 667f9fb61..139edd738 100644
--- a/dss-commons/dss-common/pom.xml
+++ b/dss-commons/dss-common/pom.xml
@@ -30,6 +30,7 @@
     <properties>
         <mysql.connector.version>5.1.49</mysql.connector.version>
         <jersey.version>2.30.1</jersey.version>
+        <commons-compress.version>1.21</commons-compress.version>
     </properties>
 
     <dependencies>
@@ -119,6 +120,10 @@
                     <groupId>org.apache.poi</groupId>
                     <artifactId>poi-ooxml-schemas</artifactId>
                 </exclusion>
+                <exclusion>
+                    <groupId>org.apache.commons</groupId>
+                    <artifactId>commons-compress</artifactId>
+                </exclusion>
             </exclusions>
         </dependency>
 
@@ -155,6 +160,11 @@
             <version>${mysql.connector.version}</version>
             <!--                <scope>test</scope>-->
         </dependency>
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-compress</artifactId>
+            <version>${commons-compress.version}</version>
+        </dependency>
     </dependencies>
 
     <build>

From 8b82809aa5828ba4c8b2c679514bbbc0816cc885 Mon Sep 17 00:00:00 2001
From: Zhaobincai <747839893@qq.com>
Date: Wed, 29 May 2024 15:16:11 +0800
Subject: [PATCH 196/302] dss-server: fix allType

---
 .../server/restful/DSSFrameworkOrchestratorRestful.java         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/restful/DSSFrameworkOrchestratorRestful.java b/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/restful/DSSFrameworkOrchestratorRestful.java
index c69608ca2..7d2d30c87 100644
--- a/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/restful/DSSFrameworkOrchestratorRestful.java
+++ b/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/restful/DSSFrameworkOrchestratorRestful.java
@@ -412,7 +412,7 @@ public Message allType(HttpServletRequest req) {
         Workspace workspace = SSOHelper.getWorkspace(httpServletRequest);
         String userName = SecurityFilter.getLoginUsername(httpServletRequest);
 
-        List<String> type = Arrays.asList(".sql",".hql",".jdbc", ".py", ".python", ".scala", ".sh");
+        List<String> type = Arrays.asList("sql","hql","jdbc", "py", "python", "scala", "sh");
 
         return Message.ok().data("type", type);
     }

From 91d5e050b46420a783e97dac0c8aae44954c2a61 Mon Sep 17 00:00:00 2001
From: Zhaobincai <747839893@qq.com>
Date: Wed, 29 May 2024 16:32:04 +0800
Subject: [PATCH 197/302] dss-server: fix selectOrchestrator

---
 .../dss/orchestrator/db/dao/impl/orchestratorMapper.xml   | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/dss-orchestrator/dss-orchestrator-db/src/main/java/com/webank/wedatasphere/dss/orchestrator/db/dao/impl/orchestratorMapper.xml b/dss-orchestrator/dss-orchestrator-db/src/main/java/com/webank/wedatasphere/dss/orchestrator/db/dao/impl/orchestratorMapper.xml
index 227390c59..441632411 100644
--- a/dss-orchestrator/dss-orchestrator-db/src/main/java/com/webank/wedatasphere/dss/orchestrator/db/dao/impl/orchestratorMapper.xml
+++ b/dss-orchestrator/dss-orchestrator-db/src/main/java/com/webank/wedatasphere/dss/orchestrator/db/dao/impl/orchestratorMapper.xml
@@ -22,7 +22,7 @@
 
     <sql id="orchestrator_main">
         id,`name`,`type`,`desc`,`creator`,`create_time`,`project_id`,`uses`,`appconn_name`,`uuid`,`secondary_type` ,
-        `workspace_id`,`orchestrator_mode`,`orchestrator_way`,`orchestrator_level`,`update_user`,`update_time`,`is_default_reference`,`status`
+        `workspace_id`,`orchestrator_mode`,`orchestrator_way`,`orchestrator_level`,`update_user`,`update_time`,`is_default_reference`
     </sql>
 
     <sql id="orchestrator_version">
@@ -36,14 +36,14 @@
     <select id="getOrchestrator"
             resultType="com.webank.wedatasphere.dss.orchestrator.common.entity.DSSOrchestratorInfo">
         SELECT
-        <include refid="orchestrator_main"/>
+        <include refid="orchestrator_main"/>,`status`
         FROM `dss_orchestrator_info` WHERE id = #{id}
     </select>
 
     <select id="getOrchestratorByUUID"
             resultType="com.webank.wedatasphere.dss.orchestrator.common.entity.DSSOrchestratorInfo">
         SELECT
-        <include refid="orchestrator_main"/>
+        <include refid="orchestrator_main"/>, `status`
         FROM `dss_orchestrator_info` WHERE uuid = #{uuid}
     </select>
 
@@ -226,7 +226,7 @@
     <select id="queryOrchestratorInfos" parameterType="java.util.Map"
             resultType="com.webank.wedatasphere.dss.orchestrator.common.entity.DSSOrchestratorInfo">
         select
-        <include refid="orchestrator_main"/>
+        <include refid="orchestrator_main"/>, `status`
         from dss_orchestrator_info
         <where>
             <if test="params.workspace_id != null">

From 4f4bf424cb6d80e11db84886407eae08b2447c52 Mon Sep 17 00:00:00 2001
From: Zhaobincai <747839893@qq.com>
Date: Wed, 29 May 2024 16:47:30 +0800
Subject: [PATCH 198/302] git-server: unlimit searchResult

---
 .../service/impl/DSSGitWorkflowManagerServiceImpl.java   | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitWorkflowManagerServiceImpl.java b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitWorkflowManagerServiceImpl.java
index 1d47ac05c..e5c7c5088 100644
--- a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitWorkflowManagerServiceImpl.java
+++ b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitWorkflowManagerServiceImpl.java
@@ -227,14 +227,9 @@ public GitSearchResponse search(GitSearchRequest request) {
             logger.info(gitSearchCommand.toString());
 
             List<String> searchResult = process(gitSearchCommand);
-            List<String> subSearchResult = null;
-            if (searchResult.size() > GitServerConfig.GIT_SEARCH_RESULT_LIMIT.getValue()) {
-                subSearchResult = new ArrayList<>(searchResult.subList(0, GitServerConfig.GIT_SEARCH_RESULT_LIMIT.getValue()));
-            } else {
-                subSearchResult = searchResult;
-            }
+
             List<GitSearchLine> keyLines = new ArrayList<>();
-            for (String resultLine : subSearchResult) {
+            for (String resultLine : searchResult) {
                 // 找到第一个冒号的位置
                 int colonIndex = resultLine.indexOf(':');
 

From 70d656c5b5f6d1060918ddb0639d9b574519f736 Mon Sep 17 00:00:00 2001
From: Zhaobincai <747839893@qq.com>
Date: Wed, 29 May 2024 17:09:30 +0800
Subject: [PATCH 199/302] git-server: fix gitHistory

---
 .../dss/git/utils/DSSGitUtils.java            | 41 ++++++++++++++++---
 1 file changed, 36 insertions(+), 5 deletions(-)

diff --git a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/utils/DSSGitUtils.java b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/utils/DSSGitUtils.java
index 1ff084b57..032196106 100644
--- a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/utils/DSSGitUtils.java
+++ b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/utils/DSSGitUtils.java
@@ -12,6 +12,7 @@
 import com.webank.wedatasphere.dss.git.common.protocol.config.GitServerConfig;
 import com.webank.wedatasphere.dss.git.common.protocol.util.UrlUtils;
 import com.webank.wedatasphere.dss.git.constant.DSSGitConstant;
+import org.apache.commons.lang.StringUtils;
 import org.apache.http.HttpEntity;
 import org.apache.http.client.methods.CloseableHttpResponse;
 import org.apache.http.client.methods.HttpGet;
@@ -45,6 +46,8 @@
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
 
 public class DSSGitUtils {
@@ -504,15 +507,37 @@ public static GitCommitResponse getCurrentCommit(Repository repository) throws G
                 walk.dispose();
                 commitResponse.setCommitId(commit.getId().getName());
                 commitResponse.setCommitTime(sdf.format(commit.getAuthorIdent().getWhen()));
-                commitResponse.setComment(commit.getShortMessage());
-                commitResponse.setCommitUser(commit.getAuthorIdent().getName());
-                return commitResponse; // 返回commitId字符串
+                String shortMessage = commit.getShortMessage();
+                commitResponse.setComment(shortMessage);
+                String userName = getUserName(shortMessage);
+                if (userName != null) {
+                    commitResponse.setCommitUser(userName);
+                } else {
+                    commitResponse.setCommitUser(commit.getAuthorIdent().getName());
+                }
+                // 返回commitId字符串
+                return commitResponse;
             }
         } catch (IOException e) {
             throw new GitErrorException(80001, "get current commit failed, the reason is : ", e);
         }
     }
 
+    public static String getUserName(String shortMessage) {
+        if (StringUtils.isEmpty(shortMessage)) {
+            return null;
+        }
+        Pattern pattern = Pattern.compile("by :\\s*(\\w+)");
+        Matcher matcher = pattern.matcher(shortMessage);
+
+        if (matcher.find()) {
+            // group(1) 是第一个括号中匹配到的内容
+            return matcher.group(1);
+        } else {
+            return null;
+        }
+    }
+
     public static List<GitCommitResponse> getLatestCommit(Repository repository, String filePath, Integer num) throws GitErrorException{
         List<GitCommitResponse> commitResponseList = new ArrayList<>();
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
@@ -523,8 +548,14 @@ public static List<GitCommitResponse> getLatestCommit(Repository repository, Str
                 GitCommitResponse commitResponse = new GitCommitResponse();
                 commitResponse.setCommitId(commit.getId().getName());
                 commitResponse.setCommitTime(sdf.format(commit.getAuthorIdent().getWhen()));
-                commitResponse.setComment(commit.getShortMessage());
-                commitResponse.setCommitUser(commit.getAuthorIdent().getName());
+                String shortMessage = commit.getShortMessage();
+                commitResponse.setComment(shortMessage);
+                String userName = getUserName(shortMessage);
+                if (userName != null) {
+                    commitResponse.setCommitUser(userName);
+                } else {
+                    commitResponse.setCommitUser(commit.getAuthorIdent().getName());
+                }
                 logger.info("提交ID: " + commit.getId().getName());
                 commitResponseList.add(commitResponse);
             }

From 4f7f80505cfc90e82b0c2c301c0855bba69a4a91 Mon Sep 17 00:00:00 2001
From: Zhaobincai <747839893@qq.com>
Date: Wed, 29 May 2024 17:16:18 +0800
Subject: [PATCH 200/302] dss-server: rollback unlock by system

---
 .../server/service/impl/OrchestratorServiceImpl.java            | 2 +-
 .../wedatasphere/dss/workflow/lock/DSSFlowEditLockManager.java  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/impl/OrchestratorServiceImpl.java b/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/impl/OrchestratorServiceImpl.java
index 2c63157d3..0973b1c48 100644
--- a/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/impl/OrchestratorServiceImpl.java
+++ b/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/impl/OrchestratorServiceImpl.java
@@ -428,7 +428,7 @@ public String rollbackOrchestrator(String userName, Long projectId, String proje
                 submitRequest.setComment("rollback workflow: " + dssOrchestratorInfo.getName());
                 orchestratorPluginService.submitFlow(submitRequest, userName, workspace);
             } else {
-                GitRevertRequest gitRevertRequest = new GitRevertRequest(workspace.getWorkspaceId(), projectName, oldOrcVersion.getCommitId(), dssOrchestratorInfo.getName(), userName);
+                GitRevertRequest gitRevertRequest = new GitRevertRequest(workspace.getWorkspaceId(), projectName, oldOrcVersion.getCommitId(), dssOrchestratorInfo.getName(), "system");
                 RpcAskUtils.processAskException(sender.ask(gitRevertRequest), GitCommitResponse.class, GitRevertRequest.class);
             }
             lockMapper.updateOrchestratorStatus(orchestratorId, OrchestratorRefConstant.FLOW_STATUS_PUSH);
diff --git a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/lock/DSSFlowEditLockManager.java b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/lock/DSSFlowEditLockManager.java
index d06871dd8..ad140e32e 100644
--- a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/lock/DSSFlowEditLockManager.java
+++ b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/lock/DSSFlowEditLockManager.java
@@ -202,7 +202,7 @@ public static void deleteLock(String flowEditLock, String username) throws DSSEr
                         DSSOrchestratorInfo orchestratorInfo = getOrchestratorInfo(flowID);
                         String status = lockMapper.selectOrchestratorStatus(flowID);
                         if (!StringUtils.isEmpty(status) && OrchestratorRefConstant.FLOW_STATUS_SAVE.equals(status)) {
-                            pushProject(projectInfo.getName(), new Long(projectInfo.getWorkspaceId()), dssFlow.getResourceId(), dssFlow.getBmlVersion(), dssFlow.getName(), username, "force unlock");
+                            pushProject(projectInfo.getName(), new Long(projectInfo.getWorkspaceId()), dssFlow.getResourceId(), dssFlow.getBmlVersion(), dssFlow.getName(), "system", "force unlock");
 
                             lockMapper.updateOrchestratorStatus(orchestratorInfo.getId(), OrchestratorRefConstant.FLOW_STATUS_PUSH);
                         }

From ceba9603dce21eee93f00b055718d7e2cd84ab5f Mon Sep 17 00:00:00 2001
From: Zhaobincai <747839893@qq.com>
Date: Wed, 29 May 2024 18:01:51 +0800
Subject: [PATCH 201/302] dss-server: fix unlock

---
 .../wedatasphere/dss/workflow/lock/DSSFlowEditLockManager.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/lock/DSSFlowEditLockManager.java b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/lock/DSSFlowEditLockManager.java
index ad140e32e..2b4806cb4 100644
--- a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/lock/DSSFlowEditLockManager.java
+++ b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/lock/DSSFlowEditLockManager.java
@@ -200,7 +200,7 @@ public static void deleteLock(String flowEditLock, String username) throws DSSEr
                     // 对于接入Git的项目，工作流解锁加入额外处理
                     if (projectInfo.getAssociateGit()) {
                         DSSOrchestratorInfo orchestratorInfo = getOrchestratorInfo(flowID);
-                        String status = lockMapper.selectOrchestratorStatus(flowID);
+                        String status = lockMapper.selectOrchestratorStatus(orchestratorInfo.getId());
                         if (!StringUtils.isEmpty(status) && OrchestratorRefConstant.FLOW_STATUS_SAVE.equals(status)) {
                             pushProject(projectInfo.getName(), new Long(projectInfo.getWorkspaceId()), dssFlow.getResourceId(), dssFlow.getBmlVersion(), dssFlow.getName(), "system", "force unlock");
 

From af4effdb915d7291833535d548ef1104bf423c7c Mon Sep 17 00:00:00 2001
From: Zhaobincai <747839893@qq.com>
Date: Thu, 30 May 2024 00:58:11 +0800
Subject: [PATCH 202/302] dss-server: fix unlock

---
 .../service/OrchestratorPluginService.java    |  2 +
 .../impl/OrchestratorPluginServiceImpl.java   | 66 +++++++++--------
 .../service/impl/OrchestratorServiceImpl.java |  3 +-
 .../receiver/DSSOrchestratorChooser.scala     |  1 +
 .../receiver/DSSOrchestratorReceiver.scala    | 11 +++
 .../impl/DSSGitProjectManagerServiceImpl.java |  3 +-
 .../DSSGitWorkflowManagerServiceImpl.java     |  8 ++-
 .../wedatasphere/dss/git/utils/FileUtils.java | 21 +++---
 .../RequestSubmitOrchestratorSync.java        | 71 +++++++++++++++++++
 .../protocol/RequestUnlockWorkflow.java       | 19 +++++
 .../dss-workflow/dss-workflow-server/pom.xml  |  6 ++
 .../dss/workflow/DefaultWorkFlowManager.java  |  4 +-
 .../dss/workflow/WorkFlowManager.java         |  2 +-
 .../workflow/lock/DSSFlowEditLockManager.java | 42 ++++++-----
 .../dss/workflow/restful/FlowRestfulApi.java  |  3 +-
 .../receiver/DSSWorkflowReceiver.scala        |  2 +-
 16 files changed, 197 insertions(+), 67 deletions(-)
 create mode 100644 dss-orchestrator/dss-orchestrator-common/src/main/java/com/webank/wedatasphere/dss/orchestrator/common/protocol/RequestSubmitOrchestratorSync.java

diff --git a/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/OrchestratorPluginService.java b/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/OrchestratorPluginService.java
index 1f8f6c155..a4db1a80c 100644
--- a/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/OrchestratorPluginService.java
+++ b/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/OrchestratorPluginService.java
@@ -18,6 +18,7 @@
 
 import com.webank.wedatasphere.dss.common.exception.DSSErrorException;
 import com.webank.wedatasphere.dss.git.common.protocol.GitTree;
+import com.webank.wedatasphere.dss.git.common.protocol.response.GitCommitResponse;
 import com.webank.wedatasphere.dss.orchestrator.common.protocol.RequestFrameworkConvertOrchestration;
 import com.webank.wedatasphere.dss.orchestrator.common.protocol.ResponseConvertOrchestrator;
 import com.webank.wedatasphere.dss.orchestrator.server.entity.request.OrchestratorSubmitRequest;
@@ -37,4 +38,5 @@ public interface OrchestratorPluginService {
 
     void submitFlow(OrchestratorSubmitRequest flowRequest, String username, Workspace workspace) throws DSSErrorException;
 
+    GitCommitResponse submitWorkflowToBML(OrchestratorSubmitRequest flowRequest, String username, Workspace workspace);
 }
diff --git a/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/impl/OrchestratorPluginServiceImpl.java b/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/impl/OrchestratorPluginServiceImpl.java
index 1dfa37905..7ef1f2944 100644
--- a/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/impl/OrchestratorPluginServiceImpl.java
+++ b/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/impl/OrchestratorPluginServiceImpl.java
@@ -225,36 +225,44 @@ public void submitFlow(OrchestratorSubmitRequest flowRequest, String username, W
         releaseThreadPool.submit(() ->{
             //1. 异步提交，更新提交状态
             try {
-                OrchestratorSubmitJob orchestratorSubmitJob = orchestratorMapper.selectSubmitJobStatus(orchestratorId);
-                if (orchestratorSubmitJob == null) {
-                    OrchestratorSubmitJob submitJob = new OrchestratorSubmitJob();
-                    submitJob.setOrchestratorId(orchestratorId);
-                    submitJob.setInstanceName(Sender.getThisInstance());
-                    submitJob.setStatus(OrchestratorRefConstant.FLOW_STATUS_PUSHING);
-                    orchestratorMapper.insertOrchestratorSubmitJob(submitJob);
-                } else {
-                    orchestratorMapper.updateOrchestratorSubmitJobStatus(orchestratorId, OrchestratorRefConstant.FLOW_STATUS_PUSHING, "");
-                }
-                //2. 获取编排信息
-                DSSOrchestratorInfo orchestrator = orchestratorMapper.getOrchestrator(orchestratorId);
-                //3. 获取上传工作流信息
-                BmlResource bmlResource = uploadWorkflowToGit(flowRequest, username, workspace, orchestrator);
-                // todo 3. diff（第一步补充后，使用去掉第三方节点的zip包上传到bml，替换下方的BML）
-                //4. 调用git服务上传
-                GitCommitResponse commit = push(orchestrator.getName(), bmlResource, username, workspace.getWorkspaceId(), flowRequest.getProjectName(), flowRequest.getComment());
-                if (commit == null) {
-                    LOGGER.info("change is empty");
-                }
-                orchestratorMapper.updateOrchestratorSubmitJobStatus(orchestratorId, OrchestratorRefConstant.FLOW_STATUS_PUSH_SUCCESS, "");
-                //5. 返回文件列表
-                lockMapper.updateOrchestratorStatus(orchestratorId, OrchestratorRefConstant.FLOW_STATUS_PUSH);
-            } catch (Exception e) {
-                LOGGER.error("push failed, the reason is : ", e);
-                orchestratorMapper.updateOrchestratorSubmitJobStatus(orchestratorId, OrchestratorRefConstant.FLOW_STATUS_PUSH_FAILED, e.toString());
-            }
+                submitWorkflowToBML(flowRequest, username, workspace);
+            }  catch (Exception e) {
+            LOGGER.error("push failed, the reason is : ", e);
+            orchestratorMapper.updateOrchestratorSubmitJobStatus(orchestratorId, OrchestratorRefConstant.FLOW_STATUS_PUSH_FAILED, e.toString());
+        }
         });
     }
 
+    @Override
+    public GitCommitResponse submitWorkflowToBML(OrchestratorSubmitRequest flowRequest, String username, Workspace workspace) {
+        Long orchestratorId = flowRequest.getOrchestratorId();
+        OrchestratorSubmitJob orchestratorSubmitJob = orchestratorMapper.selectSubmitJobStatus(orchestratorId);
+        if (orchestratorSubmitJob == null) {
+            OrchestratorSubmitJob submitJob = new OrchestratorSubmitJob();
+            submitJob.setOrchestratorId(orchestratorId);
+            submitJob.setInstanceName(Sender.getThisInstance());
+            submitJob.setStatus(OrchestratorRefConstant.FLOW_STATUS_PUSHING);
+            orchestratorMapper.insertOrchestratorSubmitJob(submitJob);
+        } else {
+            orchestratorMapper.updateOrchestratorSubmitJobStatus(orchestratorId, OrchestratorRefConstant.FLOW_STATUS_PUSHING, "");
+        }
+        //2. 获取编排信息
+        DSSOrchestratorInfo orchestrator = orchestratorMapper.getOrchestrator(orchestratorId);
+        //3. 获取上传工作流信息
+        BmlResource bmlResource = uploadWorkflowToGit(flowRequest, username, workspace, orchestrator);
+        // todo 3. diff（第一步补充后，使用去掉第三方节点的zip包上传到bml，替换下方的BML）
+        //4. 调用git服务上传
+        GitCommitResponse commit = push(orchestrator.getName(), bmlResource, username, workspace.getWorkspaceId(), flowRequest.getProjectName(), flowRequest.getComment());
+        if (commit == null) {
+            LOGGER.info("change is empty");
+        }
+        orchestratorMapper.updateOrchestratorSubmitJobStatus(orchestratorId, OrchestratorRefConstant.FLOW_STATUS_PUSH_SUCCESS, "");
+        //5. 返回文件列表
+        lockMapper.updateOrchestratorStatus(orchestratorId, OrchestratorRefConstant.FLOW_STATUS_PUSH);
+        return commit;
+    }
+
+
     private GitCommitResponse push (String path, BmlResource bmlResource, String username, Long workspaceId, String projectName, String comment) {
         LOGGER.info("-------=======================begin to add testGit1=======================-------");
         Sender gitSender = DSSSenderServiceFactory.getOrCreateServiceInstance().getGitSender();
@@ -267,9 +275,7 @@ private GitCommitResponse push (String path, BmlResource bmlResource, String use
     }
 
     private BmlResource uploadWorkflowToGit(OrchestratorSubmitRequest flowRequest, String username, Workspace workspace, DSSOrchestratorInfo orchestrator) {
-        // todo 1. 去除第三方节点实体的zip包——resource/工作流名/appconn-resource文件夹，并上传到bml
-
-        // 2. 将序列化好的工作流文件包提交给git服务，并拿到diff文件列表结果,
+       // 1. 将序列化好的工作流文件包提交给git服务，并拿到diff文件列表结果,
         long flowId = flowRequest.getFlowId();
 
         Long projectId = orchestrator.getProjectId();
diff --git a/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/impl/OrchestratorServiceImpl.java b/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/impl/OrchestratorServiceImpl.java
index 0973b1c48..6e62998a9 100644
--- a/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/impl/OrchestratorServiceImpl.java
+++ b/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/impl/OrchestratorServiceImpl.java
@@ -73,7 +73,6 @@
 import com.webank.wedatasphere.dss.standard.common.exception.operation.ExternalOperationWarnException;
 import com.webank.wedatasphere.dss.workflow.common.protocol.*;
 import com.webank.wedatasphere.dss.workflow.dao.LockMapper;
-import io.protostuff.Rpc;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.linkis.cs.client.ContextClient;
 import org.apache.linkis.cs.client.builder.ContextClientFactory;
@@ -276,7 +275,7 @@ public OrchestratorUnlockVo unlockOrchestrator(String userName,
         DSSOrchestratorVersion dssOrchestratorVersion = orchestratorMapper.getLatestOrchestratorVersionByIdAndValidFlag(orchestratorInfoId, VALID_FLAG);
         LOGGER.info("user {} try to unlock the project {} 's orchestration(such as DSS workflow) {} of orchestrator {} in version {}.",
                 userName, projectName, dssOrchestratorVersion.getAppId(), dssOrchestratorInfo.getName(), dssOrchestratorVersion.getVersion());
-        RequestUnlockWorkflow requestUnlockWorkflow = new RequestUnlockWorkflow(userName, dssOrchestratorVersion.getAppId(), confirmDelete);
+        RequestUnlockWorkflow requestUnlockWorkflow = new RequestUnlockWorkflow(userName, dssOrchestratorVersion.getAppId(), confirmDelete,  workspace);
         ResponseUnlockWorkflow responseUnlockWorkflow = RpcAskUtils.processAskException(DSSSenderServiceFactory.getOrCreateServiceInstance()
                 .getWorkflowSender(dssLabels).ask(requestUnlockWorkflow), ResponseUnlockWorkflow.class, RequestUnlockWorkflow.class);
         switch (responseUnlockWorkflow.getUnlockStatus()) {
diff --git a/dss-framework/dss-framework-orchestrator-server/src/main/scala/com/webank/wedatasphere/dss/orchestrator/server/receiver/DSSOrchestratorChooser.scala b/dss-framework/dss-framework-orchestrator-server/src/main/scala/com/webank/wedatasphere/dss/orchestrator/server/receiver/DSSOrchestratorChooser.scala
index 60966f99c..84e3b5cd6 100644
--- a/dss-framework/dss-framework-orchestrator-server/src/main/scala/com/webank/wedatasphere/dss/orchestrator/server/receiver/DSSOrchestratorChooser.scala
+++ b/dss-framework/dss-framework-orchestrator-server/src/main/scala/com/webank/wedatasphere/dss/orchestrator/server/receiver/DSSOrchestratorChooser.scala
@@ -53,6 +53,7 @@ class DSSOrchestratorChooser extends ReceiverChooser {
     case _: RequestOrchestratorInfos => receiver
     case _: RequestQueryByIdOrchestrator => receiver
     case _: RequestQuertByAppIdOrchestrator => receiver
+    case _: RequestSubmitOrchestratorSync => receiver
     case _ => None
   }
 }
\ No newline at end of file
diff --git a/dss-framework/dss-framework-orchestrator-server/src/main/scala/com/webank/wedatasphere/dss/orchestrator/server/receiver/DSSOrchestratorReceiver.scala b/dss-framework/dss-framework-orchestrator-server/src/main/scala/com/webank/wedatasphere/dss/orchestrator/server/receiver/DSSOrchestratorReceiver.scala
index c504e4bb1..1646445e5 100644
--- a/dss-framework/dss-framework-orchestrator-server/src/main/scala/com/webank/wedatasphere/dss/orchestrator/server/receiver/DSSOrchestratorReceiver.scala
+++ b/dss-framework/dss-framework-orchestrator-server/src/main/scala/com/webank/wedatasphere/dss/orchestrator/server/receiver/DSSOrchestratorReceiver.scala
@@ -23,6 +23,7 @@ import com.webank.wedatasphere.dss.orchestrator.common.protocol._
 import com.webank.wedatasphere.dss.orchestrator.core.DSSOrchestratorContext
 import com.webank.wedatasphere.dss.orchestrator.publish.entity.OrchestratorExportResult
 import com.webank.wedatasphere.dss.orchestrator.publish.{ExportDSSOrchestratorPlugin, ImportDSSOrchestratorPlugin}
+import com.webank.wedatasphere.dss.orchestrator.server.entity.request.OrchestratorSubmitRequest
 import com.webank.wedatasphere.dss.orchestrator.server.service.{OrchestratorPluginService, OrchestratorService}
 import org.apache.linkis.rpc.{Receiver, Sender}
 import org.slf4j.{Logger, LoggerFactory}
@@ -99,6 +100,16 @@ class DSSOrchestratorReceiver(orchestratorService: OrchestratorService, orchestr
 
     case requestQuertByAppIdOrchestrator: RequestQuertByAppIdOrchestrator =>
       orchestratorService.getOrchestratorByAppId(requestQuertByAppIdOrchestrator.getAppId)
+    case requestSubmitOrchestratorSync: RequestSubmitOrchestratorSync =>
+      val request = new OrchestratorSubmitRequest()
+      request.setOrchestratorId(requestSubmitOrchestratorSync.getOrchestratorId)
+      request.setProjectName(requestSubmitOrchestratorSync.getProjectName)
+      request.setFlowId(requestSubmitOrchestratorSync.getFlowId)
+      request.setLabels(request.getLabels)
+      request.setComment(request.getComment)
+      val username = requestSubmitOrchestratorSync.getUsername
+      val workspace = requestSubmitOrchestratorSync.getWorkspace
+      orchestratorPluginService.submitWorkflowToBML(request, username, workspace)
 
     case _ => throw new DSSErrorException(90000, "Not support message type " + message)
   }
diff --git a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitProjectManagerServiceImpl.java b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitProjectManagerServiceImpl.java
index c02cf8615..96018cccb 100644
--- a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitProjectManagerServiceImpl.java
+++ b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitProjectManagerServiceImpl.java
@@ -49,8 +49,9 @@ public GitCreateProjectResponse create(GitCreateProjectRequest request) {
             // Http请求Git，创建project
             DSSGitUtils.init(request.getProjectName(), gitUser);
             // 解压BML文件到本地
+            FileUtils.downloadBMLResource(bmlService, request.getProjectName(), request.getBmlResource(), request.getUsername());
             FileUtils.removeProject(request.getProjectName());
-            FileUtils.update(bmlService, request.getProjectName(), request.getBmlResource(), request.getUsername());
+            FileUtils.unzipBMLResource(request.getProjectName());
             // 本地创建Git项目
             DSSGitUtils.create(request.getProjectName(), gitUser);
             // 获取git项目
diff --git a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitWorkflowManagerServiceImpl.java b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitWorkflowManagerServiceImpl.java
index e5c7c5088..ae3393118 100644
--- a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitWorkflowManagerServiceImpl.java
+++ b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitWorkflowManagerServiceImpl.java
@@ -63,8 +63,10 @@ public GitDiffResponse diff(GitDiffRequest request) {
             DSSGitUtils.pull(repository, request.getProjectName(), gitUser);
             for (Map.Entry<String, BmlResource> entry : bmlResourceMap.entrySet()) {
                 fileList.add(entry.getKey());
+                // 解压BML文件到本地
+                FileUtils.downloadBMLResource(bmlService, entry.getKey(), entry.getValue(), request.getUsername());
                 FileUtils.removeFlowNode(entry.getKey(), request.getProjectName());
-                FileUtils.update(bmlService, entry.getKey(), entry.getValue(), request.getUsername());
+                FileUtils.unzipBMLResource(entry.getKey());
             }
             diff = DSSGitUtils.diff(request.getProjectName(), fileList);
             // 重置本地
@@ -97,8 +99,10 @@ public GitCommitResponse commit(GitCommitRequest request) {
             List<String> paths = new ArrayList<>();
             for (Map.Entry<String, BmlResource> entry : bmlResourceMap.entrySet()) {
                 paths.add(entry.getKey());
+                // 解压BML文件到本地
+                FileUtils.downloadBMLResource(bmlService, entry.getKey(), entry.getValue(), request.getUsername());
                 FileUtils.removeFlowNode(entry.getKey(), request.getProjectName());
-                FileUtils.update(bmlService, entry.getKey(), entry.getValue(), request.getUsername());
+                FileUtils.unzipBMLResource(entry.getKey());
             }
             // 提交
             String comment = request.getComment() + DSSGitConstant.GIT_USERNAME_FLAG + request.getUsername();
diff --git a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/utils/FileUtils.java b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/utils/FileUtils.java
index 396a0baa5..f99ac06dc 100644
--- a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/utils/FileUtils.java
+++ b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/utils/FileUtils.java
@@ -147,26 +147,25 @@ public static void removeProject(String path) {
         removeDirectory(projectPath);
     }
 
-    public static void update(BMLService bmlService, String path,  BmlResource bmlResource, String username) {
-        try {
-            downloadAndUnzipBMLResource(bmlService, path, bmlResource, username, "/" + FileUtils.normalizePath(GitServerConfig.GIT_SERVER_PATH.getValue()));
-        }catch (DSSErrorException e) {
-            logger.error("unzip BML Resource Failed, the reason is : ", e);
-        }
-    }
-
-    private static void downloadAndUnzipBMLResource(BMLService bmlService, String path,BmlResource bmlResource, String userName, String dirPath) throws DSSErrorException {
+    public static void downloadBMLResource(BMLService bmlService, String path,  BmlResource bmlResource, String username) {
         //下载到本地处理
-        String importFile=dirPath + File.separator + path + ".zip";
+        String dirPath = "/" + FileUtils.normalizePath(GitServerConfig.GIT_SERVER_PATH.getValue());
+        String importFile = dirPath + File.separator + path + ".zip";
         logger.info("import zip file locate at {}",importFile);
 
         try{
             //下载压缩包
-            bmlService.downloadToLocalPath(userName, bmlResource.getResourceId(), bmlResource.getVersion(), importFile);
+            bmlService.downloadToLocalPath(username, bmlResource.getResourceId(), bmlResource.getVersion(), importFile);
         }catch (Exception e){
             logger.error("download failed, the reason is :", e);
             throw new DSSRuntimeException("upload file format error(导入包格式错误)");
         }
+    }
+
+    public static void unzipBMLResource(String path) throws DSSErrorException {
+        //下载到本地处理
+        String dirPath = "/" + FileUtils.normalizePath(GitServerConfig.GIT_SERVER_PATH.getValue());
+        String importFile= dirPath + File.separator + path + ".zip";
         //解压
         String unzipImportFile= FileUtils.unzipFile(importFile);
         logger.info("import unziped file locate at {}",unzipImportFile);
diff --git a/dss-orchestrator/dss-orchestrator-common/src/main/java/com/webank/wedatasphere/dss/orchestrator/common/protocol/RequestSubmitOrchestratorSync.java b/dss-orchestrator/dss-orchestrator-common/src/main/java/com/webank/wedatasphere/dss/orchestrator/common/protocol/RequestSubmitOrchestratorSync.java
new file mode 100644
index 000000000..89eb86b6c
--- /dev/null
+++ b/dss-orchestrator/dss-orchestrator-common/src/main/java/com/webank/wedatasphere/dss/orchestrator/common/protocol/RequestSubmitOrchestratorSync.java
@@ -0,0 +1,71 @@
+package com.webank.wedatasphere.dss.orchestrator.common.protocol;
+
+import com.webank.wedatasphere.dss.common.label.LabelRouteVO;
+import com.webank.wedatasphere.dss.standard.app.sso.Workspace;
+
+
+public class RequestSubmitOrchestratorSync {
+    private Long flowId;
+    private LabelRouteVO labels;
+    private String projectName;
+    private String comment;
+    private Long orchestratorId;
+    private String username;
+    private Workspace workspace;
+
+    public String getUsername() {
+        return username;
+    }
+
+    public void setUsername(String username) {
+        this.username = username;
+    }
+
+    public Workspace getWorkspace() {
+        return workspace;
+    }
+
+    public void setWorkspace(Workspace workspace) {
+        this.workspace = workspace;
+    }
+
+    public Long getFlowId() {
+        return flowId;
+    }
+
+    public void setFlowId(Long flowId) {
+        this.flowId = flowId;
+    }
+
+    public LabelRouteVO getLabels() {
+        return labels;
+    }
+
+    public void setLabels(LabelRouteVO labels) {
+        this.labels = labels;
+    }
+
+    public String getProjectName() {
+        return projectName;
+    }
+
+    public void setProjectName(String projectName) {
+        this.projectName = projectName;
+    }
+
+    public String getComment() {
+        return comment;
+    }
+
+    public void setComment(String comment) {
+        this.comment = comment;
+    }
+
+    public Long getOrchestratorId() {
+        return orchestratorId;
+    }
+
+    public void setOrchestratorId(Long orchestratorId) {
+        this.orchestratorId = orchestratorId;
+    }
+}
diff --git a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-common/src/main/java/com/webank/wedatasphere/dss/workflow/common/protocol/RequestUnlockWorkflow.java b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-common/src/main/java/com/webank/wedatasphere/dss/workflow/common/protocol/RequestUnlockWorkflow.java
index 492eb467b..bae910f39 100644
--- a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-common/src/main/java/com/webank/wedatasphere/dss/workflow/common/protocol/RequestUnlockWorkflow.java
+++ b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-common/src/main/java/com/webank/wedatasphere/dss/workflow/common/protocol/RequestUnlockWorkflow.java
@@ -1,16 +1,27 @@
 package com.webank.wedatasphere.dss.workflow.common.protocol;
 
+import com.webank.wedatasphere.dss.standard.app.sso.Workspace;
+
 public class RequestUnlockWorkflow {
     private String username;
     private Long flowId;
     private Boolean confirmDelete;
 
+    private Workspace workspace;
+
     public RequestUnlockWorkflow(String username, Long flowId, boolean confirmDelete) {
         this.username = username;
         this.flowId = flowId;
         this.confirmDelete = confirmDelete;
     }
 
+    public RequestUnlockWorkflow(String username, Long flowId, Boolean confirmDelete, Workspace workspace) {
+        this.username = username;
+        this.flowId = flowId;
+        this.confirmDelete = confirmDelete;
+        this.workspace = workspace;
+    }
+
     public String getUsername() {
         return username;
     }
@@ -34,4 +45,12 @@ public Boolean getConfirmDelete() {
     public void setConfirmDelete(Boolean confirmDelete) {
         this.confirmDelete = confirmDelete;
     }
+
+    public Workspace getWorkspace() {
+        return workspace;
+    }
+
+    public void setWorkspace(Workspace workspace) {
+        this.workspace = workspace;
+    }
 }
diff --git a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/pom.xml b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/pom.xml
index 28b4d055d..d9968c4e9 100644
--- a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/pom.xml
+++ b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/pom.xml
@@ -34,6 +34,12 @@
             <version>${dss.version}</version>
             <scope>provided</scope>
         </dependency>
+        <dependency>
+            <groupId>com.webank.wedatasphere.dss</groupId>
+            <artifactId>dss-orchestrator-common</artifactId>
+            <version>${dss.version}</version>
+            <scope>provided</scope>
+        </dependency>
         <dependency>
             <groupId>com.webank.wedatasphere.dss</groupId>
             <artifactId>dss-common</artifactId>
diff --git a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/DefaultWorkFlowManager.java b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/DefaultWorkFlowManager.java
index 32cee8acf..1566ccd48 100644
--- a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/DefaultWorkFlowManager.java
+++ b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/DefaultWorkFlowManager.java
@@ -188,14 +188,14 @@ public void deleteWorkflow(String userName, Long flowId) throws DSSErrorExceptio
     }
 
     @Override
-    public ResponseUnlockWorkflow unlockWorkflow(String userName, Long flowId, Boolean confirmDelete) throws DSSErrorException {
+    public ResponseUnlockWorkflow unlockWorkflow(String userName, Long flowId, Boolean confirmDelete, Workspace workspace) throws DSSErrorException {
         DSSFlowEditLock editLock = lockMapper.getFlowEditLockByID(flowId);
         if (editLock == null) {
             return new ResponseUnlockWorkflow(ResponseUnlockWorkflow.NONEED_UNLOCK, null);
         } else if (!Boolean.TRUE.equals(confirmDelete)) {
             return new ResponseUnlockWorkflow(ResponseUnlockWorkflow.NEED_SECOND_CONFIRM, editLock.getUsername());
         }
-        DSSFlowEditLockManager.deleteLock(editLock.getLockContent(), userName);
+        DSSFlowEditLockManager.deleteLock(editLock.getLockContent(), workspace);
         return new ResponseUnlockWorkflow(ResponseUnlockWorkflow.UNLOCK_SUCCESS, null);
     }
     @Override
diff --git a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/WorkFlowManager.java b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/WorkFlowManager.java
index 988872fb4..89c4cd90d 100644
--- a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/WorkFlowManager.java
+++ b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/WorkFlowManager.java
@@ -92,7 +92,7 @@ void updateWorkflow(String userName,
     void deleteWorkflow(String userName,
                         Long flowID) throws DSSErrorException;
 
-    ResponseUnlockWorkflow unlockWorkflow(String userName, Long flowId, Boolean confirmDelete) throws DSSErrorException;
+    ResponseUnlockWorkflow unlockWorkflow(String userName, Long flowId, Boolean confirmDelete, Workspace workspace) throws DSSErrorException;
     /**
      * 导出工作流
      * @param userName
diff --git a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/lock/DSSFlowEditLockManager.java b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/lock/DSSFlowEditLockManager.java
index 2b4806cb4..a67cf8dc7 100644
--- a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/lock/DSSFlowEditLockManager.java
+++ b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/lock/DSSFlowEditLockManager.java
@@ -19,16 +19,20 @@
 import com.webank.wedatasphere.dss.common.entity.BmlResource;
 import com.webank.wedatasphere.dss.common.entity.project.DSSProject;
 import com.webank.wedatasphere.dss.common.exception.DSSErrorException;
+import com.webank.wedatasphere.dss.common.label.LabelRouteVO;
 import com.webank.wedatasphere.dss.common.protocol.project.ProjectInfoRequest;
 import com.webank.wedatasphere.dss.common.utils.RpcAskUtils;
 import com.webank.wedatasphere.dss.git.common.protocol.request.GitCommitRequest;
 import com.webank.wedatasphere.dss.git.common.protocol.response.GitCommitResponse;
 import com.webank.wedatasphere.dss.orchestrator.common.entity.DSSOrchestratorInfo;
+import com.webank.wedatasphere.dss.orchestrator.common.entity.DSSOrchestratorVersion;
 import com.webank.wedatasphere.dss.orchestrator.common.entity.OrchestratorVo;
 import com.webank.wedatasphere.dss.orchestrator.common.protocol.RequestQuertByAppIdOrchestrator;
 import com.webank.wedatasphere.dss.orchestrator.common.protocol.RequestQueryByIdOrchestrator;
+import com.webank.wedatasphere.dss.orchestrator.common.protocol.RequestSubmitOrchestratorSync;
 import com.webank.wedatasphere.dss.orchestrator.common.ref.OrchestratorRefConstant;
 import com.webank.wedatasphere.dss.sender.service.DSSSenderServiceFactory;
+import com.webank.wedatasphere.dss.standard.app.sso.Workspace;
 import com.webank.wedatasphere.dss.workflow.common.entity.DSSFlow;
 import com.webank.wedatasphere.dss.workflow.constant.DSSWorkFlowConstant;
 import com.webank.wedatasphere.dss.workflow.dao.FlowMapper;
@@ -188,7 +192,7 @@ private static String generateLock(Long flowID, String username, String owner) t
         }
     }
 
-    public static void deleteLock(String flowEditLock, String username) throws DSSErrorException {
+    public static void deleteLock(String flowEditLock, Workspace workspace) throws DSSErrorException {
         try {
             if (StringUtils.isNotBlank(flowEditLock)) {
                 DSSFlowEditLock dssFlowEditLock = lockMapper.getFlowEditLockByLockContent(flowEditLock);
@@ -199,12 +203,11 @@ public static void deleteLock(String flowEditLock, String username) throws DSSEr
                     DSSProject projectInfo = getProjectInfo(dssFlow.getProjectId());
                     // 对于接入Git的项目，工作流解锁加入额外处理
                     if (projectInfo.getAssociateGit()) {
-                        DSSOrchestratorInfo orchestratorInfo = getOrchestratorInfo(flowID);
+                        OrchestratorVo orchestratorVo = getOrchestratorInfo(flowID);
+                        DSSOrchestratorInfo orchestratorInfo = orchestratorVo.getDssOrchestratorInfo();
                         String status = lockMapper.selectOrchestratorStatus(orchestratorInfo.getId());
                         if (!StringUtils.isEmpty(status) && OrchestratorRefConstant.FLOW_STATUS_SAVE.equals(status)) {
-                            pushProject(projectInfo.getName(), new Long(projectInfo.getWorkspaceId()), dssFlow.getResourceId(), dssFlow.getBmlVersion(), dssFlow.getName(), "system", "force unlock");
-
-                            lockMapper.updateOrchestratorStatus(orchestratorInfo.getId(), OrchestratorRefConstant.FLOW_STATUS_PUSH);
+                            submitOrchestrator(orchestratorInfo.getId(), flowID, workspace);
                         }
                     }
                     lockMapper.clearExpire(sdf.get().format(new Date(System.currentTimeMillis() - DSSWorkFlowConstant.DSS_FLOW_EDIT_LOCK_TIMEOUT.getValue())), flowID);
@@ -227,25 +230,31 @@ public static DSSProject getProjectInfo(Long projectId) throws DSSErrorException
         return dssProject;
     }
 
-    public static DSSOrchestratorInfo getOrchestratorInfo(Long flowID) throws  DSSErrorException{
+    public static OrchestratorVo getOrchestratorInfo(Long flowID) throws  DSSErrorException{
         Sender orcSender = DSSSenderServiceFactory.getOrCreateServiceInstance().getOrcSender();
         OrchestratorVo orchestratorVo = RpcAskUtils.processAskException(orcSender.ask(new RequestQuertByAppIdOrchestrator(flowID)),
                 OrchestratorVo.class, RequestQueryByIdOrchestrator.class);
         if (orchestratorVo == null) {
             throw new DSSErrorException(800001, "编排不存在");
         }
-        return orchestratorVo.getDssOrchestratorInfo();
+        return orchestratorVo;
     }
 
-    public static void pushProject(String projectName, Long workspaceId, String resource, String version, String path, String username, String comment) {
+    public static void submitOrchestrator(Long orchestratorId, Long flowId, Workspace workspace) {
         LOGGER.info("-------=======================begin to add testGit1=======================-------");
-        Sender gitSender = DSSSenderServiceFactory.getOrCreateServiceInstance().getGitSender();
-        Map<String, BmlResource> file = new HashMap<>();
-        // 测试数据 key表示项目名、value为项目BmlResource资源
-        file.put(path, new BmlResource(resource, version));
-        GitCommitRequest request1 = new GitCommitRequest(workspaceId, projectName, file, comment, username);
-        GitCommitResponse responseWorkflowValidNode = RpcAskUtils.processAskException(gitSender.ask(request1), GitCommitResponse.class, GitCommitRequest.class);
-        LOGGER.info("-------=======================End to add testGit1=======================-------: {}", responseWorkflowValidNode);
+        Sender orcSender = DSSSenderServiceFactory.getOrCreateServiceInstance().getOrcSender();
+        // 同步提交编排至BML以及push到git
+        RequestSubmitOrchestratorSync submitOrchestratorSync = new RequestSubmitOrchestratorSync();
+        submitOrchestratorSync.setOrchestratorId(orchestratorId);
+        submitOrchestratorSync.setFlowId(flowId);
+        submitOrchestratorSync.setComment("force unlock");
+        LabelRouteVO labelRouteVO = new LabelRouteVO();
+        labelRouteVO.setRoute("dev");
+        submitOrchestratorSync.setLabels(labelRouteVO);
+        submitOrchestratorSync.setUsername("system");
+        submitOrchestratorSync.setWorkspace(workspace);
+        GitCommitResponse responseWorkflowValidNode = RpcAskUtils.processAskException(orcSender.ask(submitOrchestratorSync), GitCommitResponse.class, RequestSubmitOrchestratorSync.class);
+        LOGGER.info("-------=======================End to add submit=======================-------: {}", responseWorkflowValidNode);
     }
 
 
@@ -273,7 +282,8 @@ public static String updateLock(String lock) throws DSSErrorException {
     }
 
     public static boolean isLockExpire(DSSFlowEditLock flowEditLock) throws DSSErrorException{
-        DSSOrchestratorInfo orchestratorInfo = getOrchestratorInfo(flowEditLock.getFlowID());
+        OrchestratorVo orchestratorVo = getOrchestratorInfo(flowEditLock.getFlowID());
+        DSSOrchestratorInfo orchestratorInfo = orchestratorVo.getDssOrchestratorInfo();
         String status = lockMapper.selectOrchestratorStatus(orchestratorInfo.getId());
         if (!StringUtils.isEmpty(status) && OrchestratorRefConstant.FLOW_STATUS_SAVE.equals(status)) {
             return false;
diff --git a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/restful/FlowRestfulApi.java b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/restful/FlowRestfulApi.java
index 9bdfec982..5f42d7603 100644
--- a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/restful/FlowRestfulApi.java
+++ b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/restful/FlowRestfulApi.java
@@ -368,7 +368,8 @@ public Message getExtraToolBars( @RequestBody GetExtraToolBarsRequest getExtraTo
     @RequestMapping(value = "/deleteFlowEditLock/{flowEditLock}", method = RequestMethod.POST)
     public Message deleteFlowEditLock(HttpServletRequest req, @PathVariable("flowEditLock") String flowEditLock) throws DSSErrorException {
         String userName = SecurityFilter.getLoginUsername(httpServletRequest);
-        DSSFlowEditLockManager.deleteLock(flowEditLock, userName);
+        Workspace workspace = SSOHelper.getWorkspace(httpServletRequest);
+        DSSFlowEditLockManager.deleteLock(flowEditLock, workspace);
         return Message.ok();
     }
 
diff --git a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/scala/com/webank/wedatasphere/dss/workflow/receiver/DSSWorkflowReceiver.scala b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/scala/com/webank/wedatasphere/dss/workflow/receiver/DSSWorkflowReceiver.scala
index f91ade4b3..c727ed718 100644
--- a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/scala/com/webank/wedatasphere/dss/workflow/receiver/DSSWorkflowReceiver.scala
+++ b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/scala/com/webank/wedatasphere/dss/workflow/receiver/DSSWorkflowReceiver.scala
@@ -56,7 +56,7 @@ class DSSWorkflowReceiver(workflowManager: WorkFlowManager)  extends Receiver {
       new ResponseDeleteWorkflow(JobStatus.Success)
 
     case reqUnlockWorkflow: RequestUnlockWorkflow =>
-      workflowManager.unlockWorkflow(reqUnlockWorkflow.getUsername, reqUnlockWorkflow.getFlowId, reqUnlockWorkflow.getConfirmDelete)
+      workflowManager.unlockWorkflow(reqUnlockWorkflow.getUsername, reqUnlockWorkflow.getFlowId, reqUnlockWorkflow.getConfirmDelete, reqUnlockWorkflow.getWorkspace)
 
     case reqExportFlow: RequestExportWorkflow =>
       val dssExportFlowResource: BmlResource = workflowManager.exportWorkflowNew(

From 309a66e9d0f409468971d727fe9ccca75c292264 Mon Sep 17 00:00:00 2001
From: Zhaobincai <747839893@qq.com>
Date: Thu, 30 May 2024 01:16:52 +0800
Subject: [PATCH 203/302] dss-server: add workspaceId in path

---
 .../impl/DSSGitProjectManagerServiceImpl.java | 15 ++++----
 .../DSSGitWorkflowManagerServiceImpl.java     | 36 ++++++++++---------
 .../dss/git/utils/DSSGitUtils.java            | 24 ++++++-------
 .../wedatasphere/dss/git/utils/FileUtils.java | 26 +++++++-------
 4 files changed, 53 insertions(+), 48 deletions(-)

diff --git a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitProjectManagerServiceImpl.java b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitProjectManagerServiceImpl.java
index 96018cccb..fb2353697 100644
--- a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitProjectManagerServiceImpl.java
+++ b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitProjectManagerServiceImpl.java
@@ -39,9 +39,10 @@ public class DSSGitProjectManagerServiceImpl  implements DSSGitProjectManagerSer
 
     @Override
     public GitCreateProjectResponse create(GitCreateProjectRequest request) {
-        GitUserEntity gitUser = dssWorkspaceGitService.selectGit(request.getWorkspaceId(), GitConstant.GIT_ACCESS_WRITE_TYPE, true);
+        Long workspaceId = request.getWorkspaceId();
+        GitUserEntity gitUser = dssWorkspaceGitService.selectGit(workspaceId, GitConstant.GIT_ACCESS_WRITE_TYPE, true);
         if (gitUser == null) {
-            logger.error("the workspace : {} don't associate with git", request.getWorkspaceId());
+            logger.error("the workspace : {} don't associate with git", workspaceId);
             return null;
         }
         Repository repository = null;
@@ -49,11 +50,11 @@ public GitCreateProjectResponse create(GitCreateProjectRequest request) {
             // Http请求Git，创建project
             DSSGitUtils.init(request.getProjectName(), gitUser);
             // 解压BML文件到本地
-            FileUtils.downloadBMLResource(bmlService, request.getProjectName(), request.getBmlResource(), request.getUsername());
-            FileUtils.removeProject(request.getProjectName());
-            FileUtils.unzipBMLResource(request.getProjectName());
+            FileUtils.downloadBMLResource(bmlService, request.getProjectName(), request.getBmlResource(), request.getUsername(), workspaceId);
+            FileUtils.removeProject(request.getProjectName(), workspaceId);
+            FileUtils.unzipBMLResource(request.getProjectName(), workspaceId);
             // 本地创建Git项目
-            DSSGitUtils.create(request.getProjectName(), gitUser);
+            DSSGitUtils.create(request.getProjectName(), gitUser, workspaceId);
             // 获取git项目
             String gitPath = DSSGitUtils.generateGitPath(request.getProjectName());
             File repoDir = new File(gitPath);
@@ -87,7 +88,7 @@ public GitArchivePorjectResponse archive(GitArchiveProjectRequest request) throw
         // 远程归档
         DSSGitUtils.archive(request.getProjectName(), gitUser);
         // 删除本地项目
-        DSSGitUtils.archiveLocal(request.getProjectName());
+        DSSGitUtils.archiveLocal(request.getProjectName(), request.getWorkspaceId());
         return null;
     }
 
diff --git a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitWorkflowManagerServiceImpl.java b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitWorkflowManagerServiceImpl.java
index ae3393118..b6215ff2d 100644
--- a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitWorkflowManagerServiceImpl.java
+++ b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitWorkflowManagerServiceImpl.java
@@ -45,9 +45,10 @@ public class DSSGitWorkflowManagerServiceImpl implements DSSGitWorkflowManagerSe
     private BMLService bmlService;
     @Override
     public GitDiffResponse diff(GitDiffRequest request) {
-        GitUserEntity gitUser = dssWorkspaceGitService.selectGit(request.getWorkspaceId(), GitConstant.GIT_ACCESS_WRITE_TYPE, true);
+        Long workspaceId = request.getWorkspaceId();
+        GitUserEntity gitUser = dssWorkspaceGitService.selectGit(workspaceId, GitConstant.GIT_ACCESS_WRITE_TYPE, true);
         if (gitUser == null) {
-            logger.error("the workspace : {} don't associate with git", request.getWorkspaceId());
+            logger.error("the workspace : {} don't associate with git", workspaceId);
             return null;
         }
         GitDiffResponse diff = null;
@@ -64,11 +65,11 @@ public GitDiffResponse diff(GitDiffRequest request) {
             for (Map.Entry<String, BmlResource> entry : bmlResourceMap.entrySet()) {
                 fileList.add(entry.getKey());
                 // 解压BML文件到本地
-                FileUtils.downloadBMLResource(bmlService, entry.getKey(), entry.getValue(), request.getUsername());
-                FileUtils.removeFlowNode(entry.getKey(), request.getProjectName());
-                FileUtils.unzipBMLResource(entry.getKey());
+                FileUtils.downloadBMLResource(bmlService, entry.getKey(), entry.getValue(), request.getUsername(), workspaceId);
+                FileUtils.removeFlowNode(entry.getKey(), request.getProjectName(), workspaceId);
+                FileUtils.unzipBMLResource(entry.getKey(), workspaceId);
             }
-            diff = DSSGitUtils.diff(request.getProjectName(), fileList);
+            diff = DSSGitUtils.diff(request.getProjectName(), fileList, workspaceId);
             // 重置本地
             DSSGitUtils.reset(repository, request.getProjectName());
         } catch (Exception e) {
@@ -80,9 +81,10 @@ public GitDiffResponse diff(GitDiffRequest request) {
 
     @Override
     public GitCommitResponse commit(GitCommitRequest request) {
-        GitUserEntity gitUser = dssWorkspaceGitService.selectGit(request.getWorkspaceId(), GitConstant.GIT_ACCESS_WRITE_TYPE, true);
+        Long workspaceId = request.getWorkspaceId();
+        GitUserEntity gitUser = dssWorkspaceGitService.selectGit(workspaceId, GitConstant.GIT_ACCESS_WRITE_TYPE, true);
         if (gitUser == null) {
-            logger.error("the workspace : {} don't associate with git", request.getWorkspaceId());
+            logger.error("the workspace : {} don't associate with git", workspaceId);
             return null;
         }
         GitCommitResponse commitResponse = null;
@@ -100,9 +102,9 @@ public GitCommitResponse commit(GitCommitRequest request) {
             for (Map.Entry<String, BmlResource> entry : bmlResourceMap.entrySet()) {
                 paths.add(entry.getKey());
                 // 解压BML文件到本地
-                FileUtils.downloadBMLResource(bmlService, entry.getKey(), entry.getValue(), request.getUsername());
-                FileUtils.removeFlowNode(entry.getKey(), request.getProjectName());
-                FileUtils.unzipBMLResource(entry.getKey());
+                FileUtils.downloadBMLResource(bmlService, entry.getKey(), entry.getValue(), request.getUsername(), workspaceId);
+                FileUtils.removeFlowNode(entry.getKey(), request.getProjectName(), workspaceId);
+                FileUtils.unzipBMLResource(entry.getKey(), workspaceId);
             }
             // 提交
             String comment = request.getComment() + DSSGitConstant.GIT_USERNAME_FLAG + request.getUsername();
@@ -346,7 +348,7 @@ public GitFileContentResponse getFileContent(GitFileContentRequest request) {
             DSSGitUtils.pull(repository, request.getProjectName(), gitUser);
 
             String content = DSSGitUtils.getTargetCommitFileContent(repository, request.getProjectName(), request.getCommitId(), request.getFilePath());
-            String fullpath = File.separator + FileUtils.normalizePath(GitServerConfig.GIT_SERVER_PATH.getValue()) + File.separator + FileUtils.normalizePath(request.getFilePath());
+            String fullpath = File.separator + FileUtils.normalizePath(GitServerConfig.GIT_SERVER_PATH.getValue()) + File.separator + request.getWorkspaceId() + File.separator + FileUtils.normalizePath(request.getFilePath());
             File file = new File(fullpath);
             String fileName = file.getName();
             BmlResource bmlResource = FileUtils.uploadResourceToBML(bmlService, gitUser.getGitUser(), content, fileName, request.getProjectName());
@@ -487,7 +489,7 @@ public GitCommitResponse removeFile(GitRemoveRequest request) {
             DSSGitUtils.pull(repository, request.getProjectName(), gitUser);
             // 同步删除对应节点
             for (String path : request.getPath()) {
-                FileUtils.removeFlowNode(path, request.getProjectName());
+                FileUtils.removeFlowNode(path, request.getProjectName(), request.getWorkspaceId());
             }
             // 提交
             String comment = "delete workflowNode " + request.getPath().toString() + DSSGitConstant.GIT_USERNAME_FLAG + request.getUsername();
@@ -517,11 +519,11 @@ public GitCommitResponse rename(GitRenameRequest request) {
         File repoDir = new File(gitPath);
         try (Repository repository = getRepository(repoDir, request.getProjectName(), gitUser)){
             // 同步删除对应节点
-            String olfFilePath = File.separator + FileUtils.normalizePath(GitServerConfig.GIT_SERVER_PATH.getValue()) + File.separator + request.getProjectName() + File.separator + FileUtils.normalizePath(request.getOldName());
-            String filePath = File.separator + FileUtils.normalizePath(GitServerConfig.GIT_SERVER_PATH.getValue()) + File.separator + request.getProjectName() + File.separator + FileUtils.normalizePath(request.getName());
+            String olfFilePath = File.separator + FileUtils.normalizePath(GitServerConfig.GIT_SERVER_PATH.getValue()) + File.separator + request.getWorkspaceId() + File.separator + request.getProjectName() + File.separator + FileUtils.normalizePath(request.getOldName());
+            String filePath = File.separator + FileUtils.normalizePath(GitServerConfig.GIT_SERVER_PATH.getValue()) + File.separator + request.getWorkspaceId() + File.separator + request.getProjectName() + File.separator + FileUtils.normalizePath(request.getName());
 
-            String oldFileMetaPath = File.separator + FileUtils.normalizePath(GitServerConfig.GIT_SERVER_PATH.getValue()) + File.separator + request.getProjectName() + File.separator + FileUtils.normalizePath(GitServerConfig.GIT_SERVER_META_PATH.getValue()) + File.separator + FileUtils.normalizePath(request.getOldName());
-            String fileMetaPath = File.separator + FileUtils.normalizePath(GitServerConfig.GIT_SERVER_PATH.getValue()) + File.separator + request.getProjectName() + File.separator + FileUtils.normalizePath(GitServerConfig.GIT_SERVER_META_PATH.getValue()) + File.separator + FileUtils.normalizePath(request.getName());
+            String oldFileMetaPath = File.separator + FileUtils.normalizePath(GitServerConfig.GIT_SERVER_PATH.getValue()) + File.separator + request.getWorkspaceId() + File.separator + request.getProjectName() + File.separator + FileUtils.normalizePath(GitServerConfig.GIT_SERVER_META_PATH.getValue()) + File.separator + FileUtils.normalizePath(request.getOldName());
+            String fileMetaPath = File.separator + FileUtils.normalizePath(GitServerConfig.GIT_SERVER_PATH.getValue()) + File.separator + request.getWorkspaceId() + File.separator + request.getProjectName() + File.separator + FileUtils.normalizePath(GitServerConfig.GIT_SERVER_META_PATH.getValue()) + File.separator + FileUtils.normalizePath(request.getName());
             List<String> fileList = new ArrayList<>();
             fileList.add(oldFileMetaPath);
             fileList.add(olfFilePath);
diff --git a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/utils/DSSGitUtils.java b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/utils/DSSGitUtils.java
index 032196106..c6462c4bc 100644
--- a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/utils/DSSGitUtils.java
+++ b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/utils/DSSGitUtils.java
@@ -105,9 +105,9 @@ public static void remote(Repository repository, String projectName, GitUserEnti
     }
 
 
-    public static void create(String projectName, GitUserEntity gitUserDO) throws GitErrorException{
+    public static void create(String projectName, GitUserEntity gitUserDO, Long workspaceId) throws GitErrorException{
         logger.info("start success");
-        File repoDir = new File(File.separator + FileUtils.normalizePath(GitServerConfig.GIT_SERVER_PATH.getValue()) + File.separator + projectName); // 指定仓库的目录
+        File repoDir = new File(File.separator + FileUtils.normalizePath(GitServerConfig.GIT_SERVER_PATH.getValue()) + File.separator + workspaceId + File.separator + projectName); // 指定仓库的目录
         File respo = new File(generateGitPath(projectName));
         if (!respo.exists()) {
             try {
@@ -189,9 +189,9 @@ public static void pullTargetFile(Repository repository, String projectName, Git
         }
     }
 
-    public static GitDiffResponse diff(String projectName, List<String> fileList)throws GitErrorException{
+    public static GitDiffResponse diff(String projectName, List<String> fileList, Long workspaceId)throws GitErrorException{
 
-        Set<String> status = status(projectName, fileList);
+        Set<String> status = status(projectName, fileList, workspaceId);
         GitTree root = new GitTree("");
         for (String statu : status) {
             root.addChild(statu);
@@ -258,7 +258,7 @@ public static void reset(Repository repository, String projectName)throws GitErr
     }
 
     public static void checkoutTargetCommit(Repository repository, GitRevertRequest request) throws GitAPIException, IOException, GitErrorException {
-        File repoDir = new File(File.separator + FileUtils.normalizePath(GitServerConfig.GIT_SERVER_PATH.getValue()) + File.separator + request.getProjectName()+ File.separator + ".git");
+        File repoDir = new File(File.separator + FileUtils.normalizePath(GitServerConfig.GIT_SERVER_PATH.getValue()) + File.separator + request.getWorkspaceId() + File.separator + request.getProjectName()+ File.separator + ".git");
         String commitId = request.getCommitId(); // 替换为目标commit的完整哈希值
 
         try {
@@ -345,8 +345,8 @@ public static List<String> parseProjectNames(String json) throws org.json.JSONEx
         return projectNames;
     }
 
-    public static Set<String> status(String projectName, List<String> fileList)throws GitErrorException {
-        File repoDir = new File(File.separator + FileUtils.normalizePath(GitServerConfig.GIT_SERVER_PATH.getValue()) + File.separator + projectName + File.separator +".git"); // 修改为你的仓库路径
+    public static Set<String> status(String projectName, List<String> fileList, Long workspaceId)throws GitErrorException {
+        File repoDir = new File(File.separator + FileUtils.normalizePath(GitServerConfig.GIT_SERVER_PATH.getValue()) + File.separator + workspaceId + File.separator + projectName + File.separator +".git"); // 修改为你的仓库路径
 
         try (Repository repository = new FileRepositoryBuilder().setGitDir(repoDir).build()) {
             Git git = new Git(repository);
@@ -412,8 +412,8 @@ public static void archive(String projectName, GitUserEntity gitUserDO) throws G
         }
     }
 
-    public static void archiveLocal(String projectName) throws GitErrorException{
-        File repoDir = new File(File.separator + FileUtils.normalizePath(GitServerConfig.GIT_SERVER_PATH.getValue()) + File.separator + projectName + File.separator + ".git");
+    public static void archiveLocal(String projectName, Long workspaceId) throws GitErrorException{
+        File repoDir = new File(File.separator + FileUtils.normalizePath(GitServerConfig.GIT_SERVER_PATH.getValue()) + File.separator + workspaceId + File.separator + projectName + File.separator + ".git");
         if (!repoDir.exists()) {
             logger.info("file {} not exists", repoDir.getAbsolutePath());
             return ;
@@ -423,7 +423,7 @@ public static void archiveLocal(String projectName) throws GitErrorException{
             // 删除名为"origin"的远程仓库配置
             git.remoteRemove().setRemoteName("origin").call();
             // 删除本地文件
-            FileUtils.removeDirectory(File.separator + FileUtils.normalizePath(GitServerConfig.GIT_SERVER_PATH.getValue()) + File.separator + projectName);
+            FileUtils.removeDirectory(File.separator + FileUtils.normalizePath(GitServerConfig.GIT_SERVER_PATH.getValue()) + File.separator + workspaceId + File.separator +  projectName);
             logger.info("Remote 'origin' removed successfully.");
         } catch (GitAPIException e) {
             throw new GitErrorException(80001, "git archive failed, the reason is : ", e);
@@ -469,9 +469,9 @@ public static String getTargetCommitFileContent(Repository repository, String pr
         return content;
     }
 
-    public static void getCommitId(Repository repository, String projectName, int num)throws GitErrorException {
+    public static void getCommitId(Repository repository, String projectName, int num, Long workspaceId)throws GitErrorException {
         // 获取当前CommitId，
-        File repoDir = new File(File.separator + FileUtils.normalizePath(GitServerConfig.GIT_SERVER_PATH.getValue()) + File.separator + projectName + File.separator +".git");
+        File repoDir = new File(File.separator + FileUtils.normalizePath(GitServerConfig.GIT_SERVER_PATH.getValue()) + File.separator + workspaceId + File.separator +  projectName + File.separator +".git");
 
         try {
             Git git = new Git(repository);
diff --git a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/utils/FileUtils.java b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/utils/FileUtils.java
index f99ac06dc..16fdf1e79 100644
--- a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/utils/FileUtils.java
+++ b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/utils/FileUtils.java
@@ -23,9 +23,9 @@
 public class FileUtils {
     private static final Logger logger = LoggerFactory.getLogger(DSSGitUtils.class);
 
-    public static void addFiles(String projectName) {
+    public static void addFiles(String projectName, Long workspaceId) {
 
-        String filePath = "/" + FileUtils.normalizePath(GitServerConfig.GIT_SERVER_PATH.getValue()) + "/" + projectName +"/file1.txt";
+        String filePath = "/" + FileUtils.normalizePath(GitServerConfig.GIT_SERVER_PATH.getValue()) + "/" + workspaceId + File.separator +  projectName +"/file1.txt";
         List<String> lines = Arrays.asList("The first line", "The second line");
 
         try {
@@ -52,8 +52,8 @@ public static void removeFiles (String filePath) {
         }
     }
 
-    public static void addDirectory (String directory) {
-        String filePath = "/" + FileUtils.normalizePath(GitServerConfig.GIT_SERVER_PATH.getValue()) + "/testGit1/file1.txt";
+    public static void addDirectory (String directory, Long workspaceId) {
+        String filePath = "/" + FileUtils.normalizePath(GitServerConfig.GIT_SERVER_PATH.getValue()) + workspaceId + File.separator +  "/testGit1/file1.txt";
         List<String> lines = Arrays.asList("The first line", "The second line");
 
         try {
@@ -129,9 +129,9 @@ public static File newFile(File destinationDir, ZipEntry zipEntry) throws IOExce
         return destFile;
     }
 
-    public static void removeFlowNode(String path, String projectName) {
+    public static void removeFlowNode(String path, String projectName, Long workspaceId) {
         // 删除node节点
-        String flowNodePathPre =  FileUtils.normalizePath(GitServerConfig.GIT_SERVER_PATH.getValue()) + File.separator + projectName ;
+        String flowNodePathPre =  FileUtils.normalizePath(GitServerConfig.GIT_SERVER_PATH.getValue()) + File.separator + workspaceId + File.separator +  projectName ;
         String flowNodePath = File.separator + FileUtils.normalizePath(flowNodePathPre) + File.separator + path;
         String flowNodeMetaPath = File.separator + FileUtils.normalizePath(flowNodePathPre) + File.separator + FileUtils.normalizePath(GitServerConfig.GIT_SERVER_META_PATH.getValue()) + File.separator + path;
         // 1.删除工作流节点代码
@@ -140,20 +140,22 @@ public static void removeFlowNode(String path, String projectName) {
         removeDirectory(flowNodeMetaPath);
     }
 
-    public static void removeProject(String path) {
+    public static void removeProject(String path, Long workspaceId) {
         // 删除node节点
-        String projectPath =  File.separator + FileUtils.normalizePath(GitServerConfig.GIT_SERVER_PATH.getValue()) + File.separator + path ;
+        String projectPath =  File.separator + FileUtils.normalizePath(GitServerConfig.GIT_SERVER_PATH.getValue()) + File.separator + workspaceId + File.separator +  path ;
         // 1.删除项目
         removeDirectory(projectPath);
     }
 
-    public static void downloadBMLResource(BMLService bmlService, String path,  BmlResource bmlResource, String username) {
+    public static void downloadBMLResource(BMLService bmlService, String path,  BmlResource bmlResource, String username, Long workspaceId) {
         //下载到本地处理
         String dirPath = "/" + FileUtils.normalizePath(GitServerConfig.GIT_SERVER_PATH.getValue());
-        String importFile = dirPath + File.separator + path + ".zip";
+        String importFile = dirPath + File.separator + workspaceId + File.separator +  path + ".zip";
         logger.info("import zip file locate at {}",importFile);
 
         try{
+            // 确保父目录存在
+            Files.createDirectories(Paths.get(importFile).getParent());
             //下载压缩包
             bmlService.downloadToLocalPath(username, bmlResource.getResourceId(), bmlResource.getVersion(), importFile);
         }catch (Exception e){
@@ -162,10 +164,10 @@ public static void downloadBMLResource(BMLService bmlService, String path,  BmlR
         }
     }
 
-    public static void unzipBMLResource(String path) throws DSSErrorException {
+    public static void unzipBMLResource(String path, Long workspaceId) throws DSSErrorException {
         //下载到本地处理
         String dirPath = "/" + FileUtils.normalizePath(GitServerConfig.GIT_SERVER_PATH.getValue());
-        String importFile= dirPath + File.separator + path + ".zip";
+        String importFile= dirPath + File.separator + workspaceId + File.separator +  path + ".zip";
         //解压
         String unzipImportFile= FileUtils.unzipFile(importFile);
         logger.info("import unziped file locate at {}",unzipImportFile);

From 62c139a0d8d1d8a7117e234166a23cf4a6746f5f Mon Sep 17 00:00:00 2001
From: Zhaobincai <747839893@qq.com>
Date: Thu, 30 May 2024 01:18:37 +0800
Subject: [PATCH 204/302] dss-server: add limit in workspaceUser

---
 .../wedatasphere/dss/git/dao/impl/DSSWorkspaceGitMapper.xml   | 2 +-
 .../dss/git/service/impl/DSSWorkspaceGitServiceImpl.java      | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/dao/impl/DSSWorkspaceGitMapper.xml b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/dao/impl/DSSWorkspaceGitMapper.xml
index 0e172bd15..6648b7648 100644
--- a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/dao/impl/DSSWorkspaceGitMapper.xml
+++ b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/dao/impl/DSSWorkspaceGitMapper.xml
@@ -48,7 +48,7 @@
     <select id="selectByUser" resultType="com.webank.wedatasphere.dss.git.common.protocol.GitUserEntity">
         select id, workspace_id, git_user, git_token, git_password, git_url, create_time, update_time, create_by, update_by, type
         from dss_workspace_associate_git
-        where git_user = #{gitUser} and `type` = 'write' limit 1
+        where git_user = #{gitUser} limit 1
     </select>
 
     <select id="selectGitUser" resultType="com.webank.wedatasphere.dss.git.common.protocol.GitUserEntity">
diff --git a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSWorkspaceGitServiceImpl.java b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSWorkspaceGitServiceImpl.java
index 916f928d6..5fa6ff883 100644
--- a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSWorkspaceGitServiceImpl.java
+++ b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSWorkspaceGitServiceImpl.java
@@ -52,8 +52,8 @@ public GitUserUpdateResponse associateGit(GitUserUpdateRequest gitUserCreateRequ
         // 工作空间--git编辑权限用户 为一一对应关系
         if (gitUser.getType().equals(GitConstant.GIT_ACCESS_WRITE_TYPE)) {
             GitUserEntity gitUserEntity = workspaceGitMapper.selectByUser(gitUser.getGitUser());
-            if (gitUserEntity != null && !gitUserEntity.getWorkspaceId().equals(gitUser.getWorkspaceId())) {
-                throw new DSSErrorException(010101, "该用户已配置为" + gitUserEntity.getWorkspaceId() + "工作空间的编辑用户，请更换用户");
+            if (gitUserEntity != null) {
+                throw new DSSErrorException(010101, "该用户已配置为" + gitUserEntity.getWorkspaceId() + "工作空间的读写或只读用户，请更换用户");
             }
         }
 

From 2e1d829cb7d40ea854276fc8a39b2a7bbf4b2bed Mon Sep 17 00:00:00 2001
From: Zhaobincai <747839893@qq.com>
Date: Thu, 30 May 2024 09:24:40 +0800
Subject: [PATCH 205/302] dss-server: fix submitOrchestrator

---
 .../server/receiver/DSSOrchestratorReceiver.scala             | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dss-framework/dss-framework-orchestrator-server/src/main/scala/com/webank/wedatasphere/dss/orchestrator/server/receiver/DSSOrchestratorReceiver.scala b/dss-framework/dss-framework-orchestrator-server/src/main/scala/com/webank/wedatasphere/dss/orchestrator/server/receiver/DSSOrchestratorReceiver.scala
index 1646445e5..5e5c3f6ea 100644
--- a/dss-framework/dss-framework-orchestrator-server/src/main/scala/com/webank/wedatasphere/dss/orchestrator/server/receiver/DSSOrchestratorReceiver.scala
+++ b/dss-framework/dss-framework-orchestrator-server/src/main/scala/com/webank/wedatasphere/dss/orchestrator/server/receiver/DSSOrchestratorReceiver.scala
@@ -105,8 +105,8 @@ class DSSOrchestratorReceiver(orchestratorService: OrchestratorService, orchestr
       request.setOrchestratorId(requestSubmitOrchestratorSync.getOrchestratorId)
       request.setProjectName(requestSubmitOrchestratorSync.getProjectName)
       request.setFlowId(requestSubmitOrchestratorSync.getFlowId)
-      request.setLabels(request.getLabels)
-      request.setComment(request.getComment)
+      request.setLabels(requestSubmitOrchestratorSync.getLabels)
+      request.setComment(requestSubmitOrchestratorSync.getComment)
       val username = requestSubmitOrchestratorSync.getUsername
       val workspace = requestSubmitOrchestratorSync.getWorkspace
       orchestratorPluginService.submitWorkflowToBML(request, username, workspace)

From a39a28807674ae2f58d3c1b8279489706cdbd12f Mon Sep 17 00:00:00 2001
From: Zhaobincai <747839893@qq.com>
Date: Thu, 30 May 2024 09:34:45 +0800
Subject: [PATCH 206/302] dss-server: fix submitOrchestrator

---
 .../dss/workflow/lock/DSSFlowEditLockManager.java            | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/lock/DSSFlowEditLockManager.java b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/lock/DSSFlowEditLockManager.java
index a67cf8dc7..495d1e59e 100644
--- a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/lock/DSSFlowEditLockManager.java
+++ b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/lock/DSSFlowEditLockManager.java
@@ -207,7 +207,7 @@ public static void deleteLock(String flowEditLock, Workspace workspace) throws D
                         DSSOrchestratorInfo orchestratorInfo = orchestratorVo.getDssOrchestratorInfo();
                         String status = lockMapper.selectOrchestratorStatus(orchestratorInfo.getId());
                         if (!StringUtils.isEmpty(status) && OrchestratorRefConstant.FLOW_STATUS_SAVE.equals(status)) {
-                            submitOrchestrator(orchestratorInfo.getId(), flowID, workspace);
+                            submitOrchestrator(orchestratorInfo.getId(), flowID, workspace, projectInfo.getName());
                         }
                     }
                     lockMapper.clearExpire(sdf.get().format(new Date(System.currentTimeMillis() - DSSWorkFlowConstant.DSS_FLOW_EDIT_LOCK_TIMEOUT.getValue())), flowID);
@@ -240,7 +240,7 @@ public static OrchestratorVo getOrchestratorInfo(Long flowID) throws  DSSErrorEx
         return orchestratorVo;
     }
 
-    public static void submitOrchestrator(Long orchestratorId, Long flowId, Workspace workspace) {
+    public static void submitOrchestrator(Long orchestratorId, Long flowId, Workspace workspace, String projectName) {
         LOGGER.info("-------=======================begin to add testGit1=======================-------");
         Sender orcSender = DSSSenderServiceFactory.getOrCreateServiceInstance().getOrcSender();
         // 同步提交编排至BML以及push到git
@@ -248,6 +248,7 @@ public static void submitOrchestrator(Long orchestratorId, Long flowId, Workspac
         submitOrchestratorSync.setOrchestratorId(orchestratorId);
         submitOrchestratorSync.setFlowId(flowId);
         submitOrchestratorSync.setComment("force unlock");
+        submitOrchestratorSync.setProjectName(projectName);
         LabelRouteVO labelRouteVO = new LabelRouteVO();
         labelRouteVO.setRoute("dev");
         submitOrchestratorSync.setLabels(labelRouteVO);

From 4f427114000d75956a0a23c7380154c6e51ec1f9 Mon Sep 17 00:00:00 2001
From: Zhaobincai <747839893@qq.com>
Date: Thu, 30 May 2024 10:01:36 +0800
Subject: [PATCH 207/302] dss-server: fix commitMessage

---
 .../webank/wedatasphere/dss/git/utils/DSSGitUtils.java | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/utils/DSSGitUtils.java b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/utils/DSSGitUtils.java
index c6462c4bc..a8c626eac 100644
--- a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/utils/DSSGitUtils.java
+++ b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/utils/DSSGitUtils.java
@@ -527,12 +527,12 @@ public static String getUserName(String shortMessage) {
         if (StringUtils.isEmpty(shortMessage)) {
             return null;
         }
-        Pattern pattern = Pattern.compile("by :\\s*(\\w+)");
-        Matcher matcher = pattern.matcher(shortMessage);
 
-        if (matcher.find()) {
-            // group(1) 是第一个括号中匹配到的内容
-            return matcher.group(1);
+        int lastIndexOf = shortMessage.lastIndexOf(DSSGitConstant.GIT_PATH_SUFFIX);
+
+        if (lastIndexOf != -1) {
+            String username = shortMessage.substring(lastIndexOf + DSSGitConstant.GIT_PATH_SUFFIX.length());
+            return username;
         } else {
             return null;
         }

From a42ff299310b84bc9312b7ed53e19330ab893038 Mon Sep 17 00:00:00 2001
From: Zhaobincai <747839893@qq.com>
Date: Thu, 30 May 2024 10:46:20 +0800
Subject: [PATCH 208/302] git-server: fix user

---
 .../dss/git/service/impl/DSSWorkspaceGitServiceImpl.java        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSWorkspaceGitServiceImpl.java b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSWorkspaceGitServiceImpl.java
index 5fa6ff883..6ac407a3d 100644
--- a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSWorkspaceGitServiceImpl.java
+++ b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSWorkspaceGitServiceImpl.java
@@ -74,7 +74,7 @@ public GitUserUpdateResponse associateGit(GitUserUpdateRequest gitUserCreateRequ
             gitUser.setGitUrl(UrlUtils.normalizeIp(GitServerConfig.GIT_URL_PRE.getValue()));
             workspaceGitMapper.insert(gitUser);
         }else {
-            if (!oldGitUserDo.getGitUser().equals(gitUser.getGitUser())) {
+            if (GitConstant.GIT_ACCESS_WRITE_TYPE.equals(gitUser.getType()) && !oldGitUserDo.getGitUser().equals(gitUser.getGitUser())) {
                 throw new DSSErrorException(800001, "用户名不得修改");
             }
             workspaceGitMapper.update(gitUser);

From 87822f1113c927a26a17200b98490ab169ddcb2e Mon Sep 17 00:00:00 2001
From: Zhaobincai <747839893@qq.com>
Date: Thu, 30 May 2024 14:24:34 +0800
Subject: [PATCH 209/302] git-server: fix user

---
 .../service/impl/DSSWorkspaceGitServiceImpl.java    | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSWorkspaceGitServiceImpl.java b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSWorkspaceGitServiceImpl.java
index 6ac407a3d..1abc43c2e 100644
--- a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSWorkspaceGitServiceImpl.java
+++ b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSWorkspaceGitServiceImpl.java
@@ -50,13 +50,12 @@ public GitUserUpdateResponse associateGit(GitUserUpdateRequest gitUserCreateRequ
         GitUserEntity gitUser = gitUserCreateRequest.getGitUser();
         String userName = gitUserCreateRequest.getUsername();
         // 工作空间--git编辑权限用户 为一一对应关系
-        if (gitUser.getType().equals(GitConstant.GIT_ACCESS_WRITE_TYPE)) {
-            GitUserEntity gitUserEntity = workspaceGitMapper.selectByUser(gitUser.getGitUser());
-            if (gitUserEntity != null) {
-                throw new DSSErrorException(010101, "该用户已配置为" + gitUserEntity.getWorkspaceId() + "工作空间的读写或只读用户，请更换用户");
-            }
+        GitUserEntity gitUserEntity = workspaceGitMapper.selectByUser(gitUser.getGitUser());
+        if (gitUserEntity != null) {
+            throw new DSSErrorException(010101, "该用户已配置为" + gitUserEntity.getWorkspaceId() + "工作空间的读写或只读用户，请更换用户");
         }
 
+
         // 不存在则更新，存在则新增
         GitUserEntity oldGitUserDo = selectGit(gitUser.getWorkspaceId(), gitUser.getType(), true);
         gitUser.setUpdateBy(userName);
@@ -156,6 +155,10 @@ public GitConnectResponse gitTokenTest(GitConnectRequest connectTestRequest)thro
         String token = connectTestRequest.getToken();
         // 期望匹配的用户名
         String expectedUsername = connectTestRequest.getUsername();
+        GitUserEntity gitUserEntity = workspaceGitMapper.selectByUser(expectedUsername);
+        if (gitUserEntity != null) {
+            throw new DSSErrorException(010101, "该用户已配置为" + gitUserEntity.getWorkspaceId() + "工作空间的读写或只读用户，请更换用户");
+        }
         // GitLab API 用户信息接口
         String apiUrl = UrlUtils.normalizeIp(GitServerConfig.GIT_URL_PRE.getValue()) + "/api/v4/user";
 

From ea8da3abd9740e2338f3b922f1863a15f478a397 Mon Sep 17 00:00:00 2001
From: Zhaobincai <747839893@qq.com>
Date: Thu, 30 May 2024 15:41:38 +0800
Subject: [PATCH 210/302] git-server: fix user

---
 .../service/impl/OrchestratorPluginServiceImpl.java    |  2 +-
 .../git/service/impl/DSSWorkspaceGitServiceImpl.java   | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/impl/OrchestratorPluginServiceImpl.java b/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/impl/OrchestratorPluginServiceImpl.java
index 7ef1f2944..9059fd79f 100644
--- a/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/impl/OrchestratorPluginServiceImpl.java
+++ b/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/impl/OrchestratorPluginServiceImpl.java
@@ -220,7 +220,7 @@ public void submitFlow(OrchestratorSubmitRequest flowRequest, String username, W
         Long orchestratorId = flowRequest.getOrchestratorId();
         String status = lockMapper.selectOrchestratorStatus(orchestratorId);
         if (!StringUtils.isEmpty(status) && !status.equals(OrchestratorRefConstant.FLOW_STATUS_SAVE)) {
-            return ;
+            throw new DSSErrorException(800001, "工作流无改动或改动未提交，请确认改动并保存再进行提交");
         }
         releaseThreadPool.submit(() ->{
             //1. 异步提交，更新提交状态
diff --git a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSWorkspaceGitServiceImpl.java b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSWorkspaceGitServiceImpl.java
index 1abc43c2e..aaea1ad7b 100644
--- a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSWorkspaceGitServiceImpl.java
+++ b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSWorkspaceGitServiceImpl.java
@@ -49,11 +49,6 @@ public GitUserUpdateResponse associateGit(GitUserUpdateRequest gitUserCreateRequ
         }
         GitUserEntity gitUser = gitUserCreateRequest.getGitUser();
         String userName = gitUserCreateRequest.getUsername();
-        // 工作空间--git编辑权限用户 为一一对应关系
-        GitUserEntity gitUserEntity = workspaceGitMapper.selectByUser(gitUser.getGitUser());
-        if (gitUserEntity != null) {
-            throw new DSSErrorException(010101, "该用户已配置为" + gitUserEntity.getWorkspaceId() + "工作空间的读写或只读用户，请更换用户");
-        }
 
 
         // 不存在则更新，存在则新增
@@ -69,6 +64,11 @@ public GitUserUpdateResponse associateGit(GitUserUpdateRequest gitUserCreateRequ
             gitUser.setGitToken(encryptToken);
         }
         if (oldGitUserDo == null) {
+            // 工作空间--git编辑权限用户 为一一对应关系
+            GitUserEntity gitUserEntity = workspaceGitMapper.selectByUser(gitUser.getGitUser());
+            if (gitUserEntity != null) {
+                throw new DSSErrorException(010101, "该用户已配置为" + gitUserEntity.getWorkspaceId() + "工作空间的读写或只读用户，请更换用户");
+            }
             gitUser.setCreateBy(userName);
             gitUser.setGitUrl(UrlUtils.normalizeIp(GitServerConfig.GIT_URL_PRE.getValue()));
             workspaceGitMapper.insert(gitUser);

From 0a178d352cf324faab9c15d1d696b132772d65bf Mon Sep 17 00:00:00 2001
From: Zhaobincai <747839893@qq.com>
Date: Thu, 30 May 2024 17:34:35 +0800
Subject: [PATCH 211/302] git-server: fix createProject path

---
 .../impl/DSSGitProjectManagerServiceImpl.java |  2 +-
 .../DSSGitWorkflowManagerServiceImpl.java     | 22 +++++++++----------
 .../impl/DSSWorkspaceGitServiceImpl.java      | 10 ++++-----
 .../dss/git/utils/DSSGitUtils.java            |  6 ++---
 4 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitProjectManagerServiceImpl.java b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitProjectManagerServiceImpl.java
index fb2353697..1265915b0 100644
--- a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitProjectManagerServiceImpl.java
+++ b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitProjectManagerServiceImpl.java
@@ -56,7 +56,7 @@ public GitCreateProjectResponse create(GitCreateProjectRequest request) {
             // 本地创建Git项目
             DSSGitUtils.create(request.getProjectName(), gitUser, workspaceId);
             // 获取git项目
-            String gitPath = DSSGitUtils.generateGitPath(request.getProjectName());
+            String gitPath = DSSGitUtils.generateGitPath(request.getProjectName(), workspaceId);
             File repoDir = new File(gitPath);
             repository = new FileRepositoryBuilder().setGitDir(repoDir).build();
             // 关联远端Git
diff --git a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitWorkflowManagerServiceImpl.java b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitWorkflowManagerServiceImpl.java
index b6215ff2d..be1a64f9c 100644
--- a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitWorkflowManagerServiceImpl.java
+++ b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitWorkflowManagerServiceImpl.java
@@ -53,7 +53,7 @@ public GitDiffResponse diff(GitDiffRequest request) {
         }
         GitDiffResponse diff = null;
         // 拼接.git路径
-        String gitPath = DSSGitUtils.generateGitPath(request.getProjectName());
+        String gitPath = DSSGitUtils.generateGitPath(request.getProjectName(), workspaceId);
         // 获取git仓库
         File repoDir = new File(gitPath);
         try (Repository repository = getRepository(repoDir, request.getProjectName(), gitUser)){
@@ -89,7 +89,7 @@ public GitCommitResponse commit(GitCommitRequest request) {
         }
         GitCommitResponse commitResponse = null;
         // 拼接.git路径
-        String gitPath = DSSGitUtils.generateGitPath(request.getProjectName());
+        String gitPath = DSSGitUtils.generateGitPath(request.getProjectName(), workspaceId);
         // 获取git仓库
         File repoDir = new File(gitPath);
 
@@ -121,7 +121,7 @@ public GitCommitResponse commit(GitCommitRequest request) {
 
     @Override
     public GitSearchResponse search(GitSearchRequest request) {
-        String gitDir = DSSGitUtils.generateGitPath(request.getProjectName());
+        String gitDir = DSSGitUtils.generateGitPath(request.getProjectName(), request.getWorkspaceId());
         String workTree = DSSGitConstant.GIT_PATH_PRE + request.getProjectName() ;
         List<String> gitCommands = new ArrayList<>(Arrays.asList(
                 "git", "--git-dir=" + gitDir, "--work-tree=" + workTree, "grep", "-l", request.getSearchContent()
@@ -304,7 +304,7 @@ public GitDeleteResponse delete(GitDeleteRequest request) {
         }
         GitDeleteResponse deleteResponse = null;
         // 拼接.git路径
-        String gitPath = DSSGitUtils.generateGitPath(request.getProjectName());
+        String gitPath = DSSGitUtils.generateGitPath(request.getProjectName(), request.getWorkspaceId());
         // 获取git仓库
         File repoDir = new File(gitPath);
         try (Repository repository = getRepository(repoDir, request.getProjectName(), gitUser)){
@@ -340,7 +340,7 @@ public GitFileContentResponse getFileContent(GitFileContentRequest request) {
         }
         GitFileContentResponse contentResponse = null;
         // 拼接.git路径
-        String gitPath = DSSGitUtils.generateGitPath(request.getProjectName());
+        String gitPath = DSSGitUtils.generateGitPath(request.getProjectName(), request.getWorkspaceId());
         // 获取git仓库
         File repoDir = new File(gitPath);
         try (Repository repository = getRepository(repoDir, request.getProjectName(), gitUser)){
@@ -370,7 +370,7 @@ public GitHistoryResponse getHistory(GitHistoryRequest request) {
         }
         GitHistoryResponse response = new GitHistoryResponse();
         // 拼接.git路径
-        String gitPath = DSSGitUtils.generateGitPath(request.getProjectName());
+        String gitPath = DSSGitUtils.generateGitPath(request.getProjectName(), request.getWorkspaceId());
         // 获取git仓库
         File repoDir = new File(gitPath);
         try (Repository repository = getRepository(repoDir, request.getProjectName(), gitUser)){
@@ -417,7 +417,7 @@ public GitCommitResponse getCurrentCommit(GitCurrentCommitRequest request) {
         }
         GitCommitResponse commitResponse = null;
         // 拼接.git路径
-        String gitPath = DSSGitUtils.generateGitPath(request.getProjectName());
+        String gitPath = DSSGitUtils.generateGitPath(request.getProjectName(), request.getWorkspaceId());
         // 获取git仓库
         File repoDir = new File(gitPath);
         try (Repository repository = getRepository(repoDir, request.getProjectName(), gitUser);){
@@ -447,7 +447,7 @@ public GitCommitResponse gitCheckOut(GitRevertRequest request) throws IOExceptio
         }
         GitCommitResponse commitResponse = null;
         // 拼接.git路径
-        String gitPath = DSSGitUtils.generateGitPath(request.getProjectName());
+        String gitPath = DSSGitUtils.generateGitPath(request.getProjectName(), request.getWorkspaceId());
         // 获取git仓库
         File repoDir = new File(gitPath);
         try (Repository repository = getRepository(repoDir, request.getProjectName(), gitUser)){
@@ -481,7 +481,7 @@ public GitCommitResponse removeFile(GitRemoveRequest request) {
         }
         GitCommitResponse commitResponse = null;
         // 拼接.git路径
-        String gitPath = DSSGitUtils.generateGitPath(request.getProjectName());
+        String gitPath = DSSGitUtils.generateGitPath(request.getProjectName(), request.getWorkspaceId());
         // 获取git仓库
         File repoDir = new File(gitPath);
         try (Repository repository = getRepository(repoDir, request.getProjectName(), gitUser)){
@@ -514,7 +514,7 @@ public GitCommitResponse rename(GitRenameRequest request) {
         }
         GitCommitResponse commitResponse = null;
         // 拼接.git路径
-        String gitPath = DSSGitUtils.generateGitPath(request.getProjectName());
+        String gitPath = DSSGitUtils.generateGitPath(request.getProjectName(), request.getWorkspaceId());
         // 获取git仓库
         File repoDir = new File(gitPath);
         try (Repository repository = getRepository(repoDir, request.getProjectName(), gitUser)){
@@ -554,7 +554,7 @@ public GitHistoryResponse getHistory(GitCommitInfoBetweenRequest request) {
         }
         GitHistoryResponse response = new GitHistoryResponse();
         // 拼接.git路径
-        String gitPath = DSSGitUtils.generateGitPath(request.getProjectName());
+        String gitPath = DSSGitUtils.generateGitPath(request.getProjectName(), request.getWorkspaceId());
         // 获取git仓库
         File repoDir = new File(gitPath);
         try (Repository repository = getRepository(repoDir, request.getProjectName(), gitUser)){
diff --git a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSWorkspaceGitServiceImpl.java b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSWorkspaceGitServiceImpl.java
index aaea1ad7b..33cd0cab6 100644
--- a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSWorkspaceGitServiceImpl.java
+++ b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSWorkspaceGitServiceImpl.java
@@ -63,9 +63,9 @@ public GitUserUpdateResponse associateGit(GitUserUpdateRequest gitUserCreateRequ
             String encryptToken = generateKeys(gitUser.getGitToken(), Cipher.ENCRYPT_MODE);
             gitUser.setGitToken(encryptToken);
         }
+        GitUserEntity gitUserEntity = workspaceGitMapper.selectByUser(gitUser.getGitUser());
         if (oldGitUserDo == null) {
-            // 工作空间--git编辑权限用户 为一一对应关系
-            GitUserEntity gitUserEntity = workspaceGitMapper.selectByUser(gitUser.getGitUser());
+            // 工作空间--git用户 为一一对应关系
             if (gitUserEntity != null) {
                 throw new DSSErrorException(010101, "该用户已配置为" + gitUserEntity.getWorkspaceId() + "工作空间的读写或只读用户，请更换用户");
             }
@@ -76,6 +76,9 @@ public GitUserUpdateResponse associateGit(GitUserUpdateRequest gitUserCreateRequ
             if (GitConstant.GIT_ACCESS_WRITE_TYPE.equals(gitUser.getType()) && !oldGitUserDo.getGitUser().equals(gitUser.getGitUser())) {
                 throw new DSSErrorException(800001, "用户名不得修改");
             }
+            if (gitUserEntity != null && (!gitUserEntity.getWorkspaceId().equals(gitUser.getWorkspaceId()) || !gitUserEntity.getType().equals(gitUser.getType()))) {
+                throw new DSSErrorException(010101, "该用户已配置为" + gitUserEntity.getWorkspaceId() + "工作空间的读写或只读用户，请更换用户");
+            }
             workspaceGitMapper.update(gitUser);
         }
 
@@ -156,9 +159,6 @@ public GitConnectResponse gitTokenTest(GitConnectRequest connectTestRequest)thro
         // 期望匹配的用户名
         String expectedUsername = connectTestRequest.getUsername();
         GitUserEntity gitUserEntity = workspaceGitMapper.selectByUser(expectedUsername);
-        if (gitUserEntity != null) {
-            throw new DSSErrorException(010101, "该用户已配置为" + gitUserEntity.getWorkspaceId() + "工作空间的读写或只读用户，请更换用户");
-        }
         // GitLab API 用户信息接口
         String apiUrl = UrlUtils.normalizeIp(GitServerConfig.GIT_URL_PRE.getValue()) + "/api/v4/user";
 
diff --git a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/utils/DSSGitUtils.java b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/utils/DSSGitUtils.java
index a8c626eac..3ac6035c7 100644
--- a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/utils/DSSGitUtils.java
+++ b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/utils/DSSGitUtils.java
@@ -108,7 +108,7 @@ public static void remote(Repository repository, String projectName, GitUserEnti
     public static void create(String projectName, GitUserEntity gitUserDO, Long workspaceId) throws GitErrorException{
         logger.info("start success");
         File repoDir = new File(File.separator + FileUtils.normalizePath(GitServerConfig.GIT_SERVER_PATH.getValue()) + File.separator + workspaceId + File.separator + projectName); // 指定仓库的目录
-        File respo = new File(generateGitPath(projectName));
+        File respo = new File(generateGitPath(projectName, workspaceId));
         if (!respo.exists()) {
             try {
                 // 初始化仓库
@@ -599,9 +599,9 @@ public static GitHistoryResponse listCommitsBetween(Repository repository, Strin
         return historyResponse;
     }
 
-    public static String generateGitPath(String projectName) {
+    public static String generateGitPath(String projectName, Long workspaceId) {
         // eg ： /data/GitInstall/testGit/.git
-        return DSSGitConstant.GIT_PATH_PRE + projectName + DSSGitConstant.GIT_PATH_SUFFIX;
+        return DSSGitConstant.GIT_PATH_PRE + workspaceId + File.separator + projectName + DSSGitConstant.GIT_PATH_SUFFIX;
     }
 
 

From 0d9f99e411839aa49c3981a96697835651084e54 Mon Sep 17 00:00:00 2001
From: Zhaobincai <747839893@qq.com>
Date: Thu, 30 May 2024 17:56:28 +0800
Subject: [PATCH 212/302] git-server: fix createProject path

---
 .../dss/git/service/impl/DSSGitProjectManagerServiceImpl.java  | 3 +--
 .../com/webank/wedatasphere/dss/git/utils/DSSGitUtils.java     | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitProjectManagerServiceImpl.java b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitProjectManagerServiceImpl.java
index 1265915b0..8ff053bd2 100644
--- a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitProjectManagerServiceImpl.java
+++ b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitProjectManagerServiceImpl.java
@@ -69,13 +69,12 @@ public GitCreateProjectResponse create(GitCreateProjectRequest request) {
             return new GitCreateProjectResponse();
         } catch (Exception e) {
             logger.error("create project failed, the reason is: ", e);
-//            throw new DSSErrorException(010001, "create project failed");
+            throw new DSSErrorException(010001, "create project failed, the reason is: " + e);
         } finally {
             if (repository != null) {
                 repository.close();
             }
         }
-        return null;
     }
 
     @Override
diff --git a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/utils/DSSGitUtils.java b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/utils/DSSGitUtils.java
index 3ac6035c7..ef5d9430d 100644
--- a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/utils/DSSGitUtils.java
+++ b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/utils/DSSGitUtils.java
@@ -601,7 +601,7 @@ public static GitHistoryResponse listCommitsBetween(Repository repository, Strin
 
     public static String generateGitPath(String projectName, Long workspaceId) {
         // eg ： /data/GitInstall/testGit/.git
-        return DSSGitConstant.GIT_PATH_PRE + workspaceId + File.separator + projectName + DSSGitConstant.GIT_PATH_SUFFIX;
+        return DSSGitConstant.GIT_PATH_PRE + workspaceId + File.separator + projectName + File.separator + DSSGitConstant.GIT_PATH_SUFFIX;
     }
 
 

From e506799e16018d00e2b62d81a15a772917d2a6f5 Mon Sep 17 00:00:00 2001
From: Zhaobincai <747839893@qq.com>
Date: Thu, 30 May 2024 18:06:13 +0800
Subject: [PATCH 213/302] dss-server: add exception in submitFlow/status

---
 .../restful/DSSFrameworkOrchestratorRestful.java  | 15 ++++++++++++---
 .../service/OrchestratorFrameworkService.java     |  3 ++-
 .../impl/OrchestratorFrameworkServiceImpl.java    |  5 ++---
 3 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/restful/DSSFrameworkOrchestratorRestful.java b/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/restful/DSSFrameworkOrchestratorRestful.java
index 7d2d30c87..bf7427894 100644
--- a/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/restful/DSSFrameworkOrchestratorRestful.java
+++ b/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/restful/DSSFrameworkOrchestratorRestful.java
@@ -31,7 +31,9 @@
 import com.webank.wedatasphere.dss.git.common.protocol.response.GitHistoryResponse;
 import com.webank.wedatasphere.dss.git.common.protocol.response.GitUserInfoResponse;
 import com.webank.wedatasphere.dss.git.common.protocol.util.UrlUtils;
+import com.webank.wedatasphere.dss.orchestrator.common.entity.OrchestratorSubmitJob;
 import com.webank.wedatasphere.dss.orchestrator.common.entity.OrchestratorVo;
+import com.webank.wedatasphere.dss.orchestrator.common.ref.OrchestratorRefConstant;
 import com.webank.wedatasphere.dss.orchestrator.server.conf.OrchestratorConf;
 import com.webank.wedatasphere.dss.orchestrator.server.constant.OrchestratorLevelEnum;
 import com.webank.wedatasphere.dss.orchestrator.server.entity.request.*;
@@ -392,9 +394,16 @@ public Message submitFlow(@RequestParam Long orchestratorId) {
         Workspace workspace = SSOHelper.getWorkspace(httpServletRequest);
         String userName = SecurityFilter.getLoginUsername(httpServletRequest);
 
-        String orchestratorStatus = orchestratorFrameworkService.getOrchestratorStatus(orchestratorId);
-
-        return Message.ok().data("status", orchestratorStatus);
+        OrchestratorSubmitJob orchestratorSubmitJob = orchestratorFrameworkService.getOrchestratorStatus(orchestratorId);
+        // 未提交
+        if (orchestratorSubmitJob == null) {
+            return Message.error("该编排未开始提交");
+        }
+        String status = orchestratorSubmitJob.getStatus();
+        if (OrchestratorRefConstant.FLOW_STATUS_PUSH_FAILED.equals(status)) {
+            return Message.error("提交失败，原因为：" + orchestratorSubmitJob.getErrorMsg());
+        }
+        return Message.ok().data("status", status);
     }
 
     @RequestMapping(value = "publish/history", method = RequestMethod.GET)
diff --git a/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/OrchestratorFrameworkService.java b/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/OrchestratorFrameworkService.java
index 6491fea48..75d924b87 100644
--- a/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/OrchestratorFrameworkService.java
+++ b/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/OrchestratorFrameworkService.java
@@ -20,6 +20,7 @@
 import com.webank.wedatasphere.dss.git.common.protocol.GitTree;
 import com.webank.wedatasphere.dss.git.common.protocol.response.GitHistoryResponse;
 import com.webank.wedatasphere.dss.orchestrator.common.entity.DSSOrchestratorCopyInfo;
+import com.webank.wedatasphere.dss.orchestrator.common.entity.OrchestratorSubmitJob;
 import com.webank.wedatasphere.dss.orchestrator.server.entity.request.*;
 import com.webank.wedatasphere.dss.orchestrator.server.entity.vo.CommonOrchestratorVo;
 import com.webank.wedatasphere.dss.orchestrator.server.entity.vo.OrchestratorCopyHistory;
@@ -49,7 +50,7 @@ public interface OrchestratorFrameworkService {
     DSSOrchestratorCopyInfo getOrchestratorCopyInfoById(String copyInfoId);
 
 
-    String getOrchestratorStatus(Long orchestratorId);
+    OrchestratorSubmitJob getOrchestratorStatus(Long orchestratorId);
 
     GitHistoryResponse getHistory(Long workspaceId, Long orchestratorId, String projectName);
 }
diff --git a/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/impl/OrchestratorFrameworkServiceImpl.java b/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/impl/OrchestratorFrameworkServiceImpl.java
index 151369d17..ce2e2262b 100644
--- a/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/impl/OrchestratorFrameworkServiceImpl.java
+++ b/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/impl/OrchestratorFrameworkServiceImpl.java
@@ -446,9 +446,8 @@ private static boolean hasProjectEditPriv(Long projectId, String username) {
     }
 
     @Override
-    public String getOrchestratorStatus(Long orchestratorId) {
-        OrchestratorSubmitJob orchestratorSubmitJob = orchestratorMapper.selectSubmitJobStatus(orchestratorId);
-        return orchestratorSubmitJob.getStatus();
+    public OrchestratorSubmitJob getOrchestratorStatus(Long orchestratorId) {
+        return orchestratorMapper.selectSubmitJobStatus(orchestratorId);
     }
 
     @Override

From cb1ed30ed9a4a4d5abb19d64fe57d94dea2a2aac Mon Sep 17 00:00:00 2001
From: Zhaobincai <747839893@qq.com>
Date: Thu, 30 May 2024 19:14:18 +0800
Subject: [PATCH 214/302] dss-server: add exception in submitFlow/status

---
 .../dss/git/service/impl/DSSGitProjectManagerServiceImpl.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitProjectManagerServiceImpl.java b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitProjectManagerServiceImpl.java
index 8ff053bd2..bbddbf876 100644
--- a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitProjectManagerServiceImpl.java
+++ b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitProjectManagerServiceImpl.java
@@ -38,7 +38,7 @@ public class DSSGitProjectManagerServiceImpl  implements DSSGitProjectManagerSer
     private BMLService bmlService;
 
     @Override
-    public GitCreateProjectResponse create(GitCreateProjectRequest request) {
+    public GitCreateProjectResponse create(GitCreateProjectRequest request) throws DSSErrorException{
         Long workspaceId = request.getWorkspaceId();
         GitUserEntity gitUser = dssWorkspaceGitService.selectGit(workspaceId, GitConstant.GIT_ACCESS_WRITE_TYPE, true);
         if (gitUser == null) {

From 02c52811c1bc9e489b82f828d46cf41f555741d4 Mon Sep 17 00:00:00 2001
From: Zhaobincai <747839893@qq.com>
Date: Thu, 30 May 2024 19:24:04 +0800
Subject: [PATCH 215/302] dss-server: add exception in submitFlow/status

---
 .../dss/git/service/DSSGitProjectManagerService.java            | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/DSSGitProjectManagerService.java b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/DSSGitProjectManagerService.java
index 60004347b..7079573f3 100644
--- a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/DSSGitProjectManagerService.java
+++ b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/DSSGitProjectManagerService.java
@@ -7,7 +7,7 @@
 import java.util.concurrent.ExecutionException;
 
 public interface DSSGitProjectManagerService {
-    GitCreateProjectResponse create(GitCreateProjectRequest request) throws ExecutionException, InterruptedException;
+    GitCreateProjectResponse create(GitCreateProjectRequest request) throws DSSErrorException;
 
     GitArchivePorjectResponse archive(GitArchiveProjectRequest request) throws DSSErrorException;
 

From b1ba02a93c9fd8615e04d4b961b13eb12b47a429 Mon Sep 17 00:00:00 2001
From: Zhaobincai <747839893@qq.com>
Date: Thu, 30 May 2024 20:27:15 +0800
Subject: [PATCH 216/302] dss-server: fix rollback

---
 .../server/service/impl/OrchestratorServiceImpl.java       | 2 +-
 .../git/service/impl/DSSGitWorkflowManagerServiceImpl.java | 7 ++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/impl/OrchestratorServiceImpl.java b/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/impl/OrchestratorServiceImpl.java
index 6e62998a9..12c8262b7 100644
--- a/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/impl/OrchestratorServiceImpl.java
+++ b/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/impl/OrchestratorServiceImpl.java
@@ -430,7 +430,7 @@ public String rollbackOrchestrator(String userName, Long projectId, String proje
                 GitRevertRequest gitRevertRequest = new GitRevertRequest(workspace.getWorkspaceId(), projectName, oldOrcVersion.getCommitId(), dssOrchestratorInfo.getName(), "system");
                 RpcAskUtils.processAskException(sender.ask(gitRevertRequest), GitCommitResponse.class, GitRevertRequest.class);
             }
-            lockMapper.updateOrchestratorStatus(orchestratorId, OrchestratorRefConstant.FLOW_STATUS_PUSH);
+            lockMapper.updateOrchestratorStatus(orchestratorId, OrchestratorRefConstant.FLOW_STATUS_PUBLISH);
         } catch (Exception e) {
             LOGGER.error("git revert failed, the reason is :", e);
             lockMapper.updateOrchestratorStatus(orchestratorId, OrchestratorRefConstant.FLOW_STATUS_SAVE);
diff --git a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitWorkflowManagerServiceImpl.java b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitWorkflowManagerServiceImpl.java
index be1a64f9c..bc1cdc485 100644
--- a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitWorkflowManagerServiceImpl.java
+++ b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitWorkflowManagerServiceImpl.java
@@ -399,8 +399,13 @@ private Repository getRepository(File repoDir, String projectName, GitUserEntity
             if (repoDir.exists()) {
                 repository = new FileRepositoryBuilder().setGitDir(repoDir).build();
             } else {
-                repository = FileRepositoryBuilder.create(new File(String.valueOf(repoDir)));
+                // 本地创建Git项目
+                DSSGitUtils.create(projectName, gitUser, gitUser.getWorkspaceId());
+                // 获取git项目
+                String gitPath = DSSGitUtils.generateGitPath(projectName, gitUser.getWorkspaceId());
+                repository = new FileRepositoryBuilder().setGitDir(repoDir).build();
                 DSSGitUtils.remote(repository, projectName, gitUser);
+                DSSGitUtils.pull(repository, projectName, gitUser);
             }
         } catch (Exception e) {
             logger.info("get repository failed, the reason is: ", e);

From f9449824cf86c99868604238a2d34be4c021de36 Mon Sep 17 00:00:00 2001
From: v_xuanzhou <zhouxuannihao@qq.com>
Date: Fri, 31 May 2024 10:03:57 +0800
Subject: [PATCH 217/302] dss-server:fix DepartmentUserTreeVo add nodeId

---
 .../workspace/bean/vo/DepartmentUserTreeVo.java          | 1 +
 .../service/impl/DSSWorkspaceUserServiceImpl.java        | 9 +++++++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/dss-framework/dss-framework-workspace-server/src/main/java/com/webank/wedatasphere/dss/framework/workspace/bean/vo/DepartmentUserTreeVo.java b/dss-framework/dss-framework-workspace-server/src/main/java/com/webank/wedatasphere/dss/framework/workspace/bean/vo/DepartmentUserTreeVo.java
index 768e81825..54546c43d 100644
--- a/dss-framework/dss-framework-workspace-server/src/main/java/com/webank/wedatasphere/dss/framework/workspace/bean/vo/DepartmentUserTreeVo.java
+++ b/dss-framework/dss-framework-workspace-server/src/main/java/com/webank/wedatasphere/dss/framework/workspace/bean/vo/DepartmentUserTreeVo.java
@@ -8,6 +8,7 @@
 @Data
 public class DepartmentUserTreeVo implements Serializable {
     private static final long serialVersionUID=1L;
+    private Integer id;
     private String name;
     private String type;
     private List<DepartmentUserTreeVo> child;
diff --git a/dss-framework/dss-framework-workspace-server/src/main/java/com/webank/wedatasphere/dss/framework/workspace/service/impl/DSSWorkspaceUserServiceImpl.java b/dss-framework/dss-framework-workspace-server/src/main/java/com/webank/wedatasphere/dss/framework/workspace/service/impl/DSSWorkspaceUserServiceImpl.java
index c3ae79939..a04cfb432 100644
--- a/dss-framework/dss-framework-workspace-server/src/main/java/com/webank/wedatasphere/dss/framework/workspace/service/impl/DSSWorkspaceUserServiceImpl.java
+++ b/dss-framework/dss-framework-workspace-server/src/main/java/com/webank/wedatasphere/dss/framework/workspace/service/impl/DSSWorkspaceUserServiceImpl.java
@@ -41,6 +41,7 @@
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.atomic.AtomicReference;
 import java.util.stream.Collectors;
 
 
@@ -137,25 +138,29 @@ public List<DepartmentUserTreeVo> getAllWorkspaceUsersDepartment(long workspaceI
     }
 
     private List<DepartmentUserTreeVo> structureVo2Tree(List<DepartmentUserVo> userList) {
+      AtomicReference<Integer> id = new AtomicReference<>(0);
       Map<String, Map<String, List<DepartmentUserTreeVo>>> userMap = userList.stream().collect(Collectors.groupingBy(DepartmentUserVo::getDepartment,
                 Collectors.groupingBy(DepartmentUserVo::getOffice, Collectors.mapping(user->{
                     DepartmentUserTreeVo treeNode = new DepartmentUserTreeVo();
+                    treeNode.setId(id.getAndSet(id.get() + 1));
                     treeNode.setName(user.getName());
                     treeNode.setType(NODE_TYPE_USER);
                     return treeNode;
                 }, Collectors.toList()))));
         return userMap.keySet().stream().map(key->{
             DepartmentUserTreeVo treeNode = new DepartmentUserTreeVo();
+            treeNode.setId(id.getAndSet(id.get() + 1));
             treeNode.setName(key);
             treeNode.setType(NODE_TYPE_DEPARTMENT);
-            treeNode.setChild(buildTree4Office(userMap.get(key)));
+            treeNode.setChild(buildTree4Office(userMap.get(key),id));
             return treeNode;
         }).collect(Collectors.toList());
     }
 
-    private List<DepartmentUserTreeVo> buildTree4Office(Map<String,List<DepartmentUserTreeVo>> officeMap){
+    private List<DepartmentUserTreeVo> buildTree4Office(Map<String,List<DepartmentUserTreeVo>> officeMap,AtomicReference<Integer> id){
         return officeMap.keySet().stream().map(key->{
             DepartmentUserTreeVo treeNode = new DepartmentUserTreeVo();
+            treeNode.setId(id.getAndSet(id.get() + 1));
             treeNode.setName(key);
             treeNode.setType(NODE_TYPE_OFFICE);
             treeNode.setChild(officeMap.get(key));

From d2bace19452f508510f705b5d690334080bd62bc Mon Sep 17 00:00:00 2001
From: Zhaobincai <747839893@qq.com>
Date: Fri, 31 May 2024 11:37:07 +0800
Subject: [PATCH 218/302] git-server: fix exception dss-server: add errMessage

---
 .../DSSFrameworkOrchestratorRestful.java      |  2 +-
 .../OrchestratorFrameworkServiceImpl.java     |  2 +
 .../service/impl/OrchestratorServiceImpl.java |  2 +-
 .../service/DSSGitWorkflowManagerService.java | 21 ++++----
 .../DSSGitWorkflowManagerServiceImpl.java     | 53 ++++++++++++-------
 .../receiver/DSSGitChooser.scala              |  4 +-
 .../receiver/DSSGitReceiver.scala             |  6 +--
 .../db/dao/impl/orchestratorMapper.xml        |  2 +-
 .../service/impl/PublishServiceImpl.java      |  4 +-
 9 files changed, 59 insertions(+), 37 deletions(-)

diff --git a/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/restful/DSSFrameworkOrchestratorRestful.java b/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/restful/DSSFrameworkOrchestratorRestful.java
index bf7427894..db3193aa9 100644
--- a/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/restful/DSSFrameworkOrchestratorRestful.java
+++ b/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/restful/DSSFrameworkOrchestratorRestful.java
@@ -328,7 +328,7 @@ public Message submitFlow(@RequestBody OrchestratorSubmitRequest submitFlowReque
         try {
             orchestratorPluginService.submitFlow(submitFlowRequest, userName, workspace);
         } catch (Exception e) {
-            return Message.error("提交工作流失败，请保存工作流重试，原因为：", e);
+            return Message.error("提交工作流失败，请保存工作流重试，原因为："+  e.getMessage());
         }
 
 
diff --git a/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/impl/OrchestratorFrameworkServiceImpl.java b/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/impl/OrchestratorFrameworkServiceImpl.java
index ce2e2262b..8089c9529 100644
--- a/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/impl/OrchestratorFrameworkServiceImpl.java
+++ b/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/impl/OrchestratorFrameworkServiceImpl.java
@@ -453,6 +453,8 @@ public OrchestratorSubmitJob getOrchestratorStatus(Long orchestratorId) {
     @Override
     public GitHistoryResponse getHistory(Long workspaceId, Long orchestratorId, String projectName) {
         DSSOrchestratorInfo orchestrator = orchestratorMapper.getOrchestrator(orchestratorId);
+        List<DSSOrchestratorVersion> versionByOrchestratorId = orchestratorMapper.getVersionByOrchestratorId(orchestratorId);
+
         String workflowName = orchestrator.getName();
 
         Sender sender = DSSSenderServiceFactory.getOrCreateServiceInstance().getGitSender();
diff --git a/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/impl/OrchestratorServiceImpl.java b/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/impl/OrchestratorServiceImpl.java
index 12c8262b7..4b0a1bfcf 100644
--- a/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/impl/OrchestratorServiceImpl.java
+++ b/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/impl/OrchestratorServiceImpl.java
@@ -425,7 +425,7 @@ public String rollbackOrchestrator(String userName, Long projectId, String proje
                 submitRequest.setProjectName(projectName);
                 submitRequest.setLabels(labels);
                 submitRequest.setComment("rollback workflow: " + dssOrchestratorInfo.getName());
-                orchestratorPluginService.submitFlow(submitRequest, userName, workspace);
+                orchestratorPluginService.submitWorkflowToBML(submitRequest, userName, workspace);
             } else {
                 GitRevertRequest gitRevertRequest = new GitRevertRequest(workspace.getWorkspaceId(), projectName, oldOrcVersion.getCommitId(), dssOrchestratorInfo.getName(), "system");
                 RpcAskUtils.processAskException(sender.ask(gitRevertRequest), GitCommitResponse.class, GitRevertRequest.class);
diff --git a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/DSSGitWorkflowManagerService.java b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/DSSGitWorkflowManagerService.java
index 4b78d51a3..c38fad63a 100644
--- a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/DSSGitWorkflowManagerService.java
+++ b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/DSSGitWorkflowManagerService.java
@@ -1,6 +1,7 @@
 package com.webank.wedatasphere.dss.git.service;
 
 
+import com.webank.wedatasphere.dss.common.exception.DSSErrorException;
 import com.webank.wedatasphere.dss.git.common.protocol.request.*;
 import com.webank.wedatasphere.dss.git.common.protocol.response.*;
 
@@ -8,23 +9,25 @@
 import java.util.concurrent.ExecutionException;
 
 public interface DSSGitWorkflowManagerService {
-    GitDiffResponse diff(GitDiffRequest request) throws ExecutionException, InterruptedException;
+    GitDiffResponse diff(GitDiffRequest request) throws DSSErrorException;
 
-    GitCommitResponse commit(GitCommitRequest request) throws ExecutionException, InterruptedException;
+    GitCommitResponse commit(GitCommitRequest request) throws DSSErrorException;
 
-    GitSearchResponse search(GitSearchRequest request);
+    GitSearchResponse search(GitSearchRequest request) throws DSSErrorException;
 
-    GitDeleteResponse delete(GitDeleteRequest request) throws ExecutionException, InterruptedException;
+    GitDeleteResponse delete(GitDeleteRequest request) throws DSSErrorException;
 
-    GitFileContentResponse getFileContent(GitFileContentRequest request);
+    GitFileContentResponse getFileContent(GitFileContentRequest request) throws DSSErrorException;
 
-    GitHistoryResponse getHistory(GitHistoryRequest request);
+    GitHistoryResponse getHistory(GitHistoryRequest request) throws DSSErrorException;
 
-    GitCommitResponse getCurrentCommit(GitCurrentCommitRequest request);
+    GitCommitResponse getCurrentCommit(GitCurrentCommitRequest request) throws DSSErrorException;
 
     GitCommitResponse gitCheckOut(GitRevertRequest request) throws IOException;
 
-    GitCommitResponse removeFile(GitRemoveRequest request);
+    GitCommitResponse removeFile(GitRemoveRequest request) throws DSSErrorException;
 
-    GitCommitResponse rename(GitRenameRequest request);
+    GitCommitResponse rename(GitRenameRequest request) throws DSSErrorException;
+
+    GitHistoryResponse getHistory(GitCommitInfoBetweenRequest request) throws DSSErrorException;
 }
diff --git a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitWorkflowManagerServiceImpl.java b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitWorkflowManagerServiceImpl.java
index bc1cdc485..37466ecc1 100644
--- a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitWorkflowManagerServiceImpl.java
+++ b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitWorkflowManagerServiceImpl.java
@@ -1,6 +1,7 @@
 package com.webank.wedatasphere.dss.git.service.impl;
 
 import com.webank.wedatasphere.dss.common.entity.BmlResource;
+import com.webank.wedatasphere.dss.common.exception.DSSErrorException;
 import com.webank.wedatasphere.dss.common.service.BMLService;
 import com.webank.wedatasphere.dss.git.common.protocol.GitSearchLine;
 import com.webank.wedatasphere.dss.git.common.protocol.GitSearchResult;
@@ -80,7 +81,7 @@ public GitDiffResponse diff(GitDiffRequest request) {
     }
 
     @Override
-    public GitCommitResponse commit(GitCommitRequest request) {
+    public GitCommitResponse commit(GitCommitRequest request) throws DSSErrorException {
         Long workspaceId = request.getWorkspaceId();
         GitUserEntity gitUser = dssWorkspaceGitService.selectGit(workspaceId, GitConstant.GIT_ACCESS_WRITE_TYPE, true);
         if (gitUser == null) {
@@ -115,6 +116,7 @@ public GitCommitResponse commit(GitCommitRequest request) {
             commitResponse = DSSGitUtils.getCurrentCommit(repository);
         } catch (Exception e) {
             logger.error("pull failed, the reason is ",e);
+            throw new DSSErrorException(010001, "commit workflow failed, the reason is: " + e);
         }
         return commitResponse;
     }
@@ -296,7 +298,7 @@ private List<String> process(List<String> commands) {
     }
 
     @Override
-    public GitDeleteResponse delete(GitDeleteRequest request) {
+    public GitDeleteResponse delete(GitDeleteRequest request) throws DSSErrorException {
         GitUserEntity gitUser = dssWorkspaceGitService.selectGit(request.getWorkspaceId(), GitConstant.GIT_ACCESS_WRITE_TYPE, true);
         if (gitUser == null) {
             logger.error("the workspace : {} don't associate with git", request.getWorkspaceId());
@@ -326,13 +328,14 @@ public GitDeleteResponse delete(GitDeleteRequest request) {
             // 提交
             DSSGitUtils.push(repository, request.getProjectName(), gitUser,"delete " + request.getDeleteFileList(), request.getDeleteFileList());
         } catch (Exception e) {
-            logger.error("pull failed, the reason is ",e);
+            logger.error("delete failed, the reason is ",e);
+            throw new DSSErrorException(010001, "delete workflow failed, the reason is: " + e);
         }
         return null;
     }
 
     @Override
-    public GitFileContentResponse getFileContent(GitFileContentRequest request) {
+    public GitFileContentResponse getFileContent(GitFileContentRequest request) throws DSSErrorException {
         GitUserEntity gitUser = dssWorkspaceGitService.selectGit(request.getWorkspaceId(), GitConstant.GIT_ACCESS_WRITE_TYPE, true);
         if (gitUser == null) {
             logger.error("the workspace : {} don't associate with git", request.getWorkspaceId());
@@ -356,13 +359,12 @@ public GitFileContentResponse getFileContent(GitFileContentRequest request) {
             contentResponse.setBmlResource(bmlResource);
             return contentResponse;
         } catch (Exception e) {
-            logger.error("pull failed, the reason is ",e);
+            throw new DSSErrorException(010001, "getFileContent failed, the reason is: " + e);
         }
-       return null;
     }
 
     @Override
-    public GitHistoryResponse getHistory(GitHistoryRequest request) {
+    public GitHistoryResponse getHistory(GitHistoryRequest request) throws DSSErrorException {
         GitUserEntity gitUser = dssWorkspaceGitService.selectGit(request.getWorkspaceId(), GitConstant.GIT_ACCESS_WRITE_TYPE, true);
         if (gitUser == null) {
             logger.error("the workspace : {} don't associate with git", request.getWorkspaceId());
@@ -387,12 +389,12 @@ public GitHistoryResponse getHistory(GitHistoryRequest request) {
             }
 
         } catch (Exception e) {
-            logger.error("pull failed, the reason is ",e);
+            throw new DSSErrorException(010001, "getHistory failed, the reason is: " + e);
         }
         return response;
     }
 
-    private Repository getRepository(File repoDir, String projectName, GitUserEntity gitUser) throws IOException {
+    private Repository getRepository(File repoDir, String projectName, GitUserEntity gitUser) throws DSSErrorException {
         Repository repository = null;
         try {
             // 当前机器不存在就新建
@@ -409,12 +411,13 @@ private Repository getRepository(File repoDir, String projectName, GitUserEntity
             }
         } catch (Exception e) {
             logger.info("get repository failed, the reason is: ", e);
+            throw new DSSErrorException(010001, "get repository failed, the reason is: " + e);
         }
         return repository;
     }
 
     @Override
-    public GitCommitResponse getCurrentCommit(GitCurrentCommitRequest request) {
+    public GitCommitResponse getCurrentCommit(GitCurrentCommitRequest request) throws DSSErrorException {
         GitUserEntity gitUser = dssWorkspaceGitService.selectGit(request.getWorkspaceId(), GitConstant.GIT_ACCESS_WRITE_TYPE, true);
         if (gitUser == null) {
             logger.error("the workspace : {} don't associate with git", request.getWorkspaceId());
@@ -438,13 +441,14 @@ public GitCommitResponse getCurrentCommit(GitCurrentCommitRequest request) {
             }
 
         } catch (Exception e) {
-            logger.error("pull failed, the reason is ",e);
+            logger.error("getCurrentCommit, the reason is ",e);
+            throw new DSSErrorException(010001, "getCurrentCommit failed, the reason is: " + e);
         }
         return null;
     }
 
     @Override
-    public GitCommitResponse gitCheckOut(GitRevertRequest request) throws IOException {
+    public GitCommitResponse gitCheckOut(GitRevertRequest request) throws DSSErrorException {
         GitUserEntity gitUser = dssWorkspaceGitService.selectGit(request.getWorkspaceId(), GitConstant.GIT_ACCESS_WRITE_TYPE, true);
         if (gitUser == null) {
             logger.error("the workspace : {} don't associate with git", request.getWorkspaceId());
@@ -473,12 +477,13 @@ public GitCommitResponse gitCheckOut(GitRevertRequest request) throws IOExceptio
 
         } catch (Exception e) {
             logger.error("checkOut failed, the reason is ",e);
+            throw new DSSErrorException(010001, "checkOut failed, the reason is: " + e);
         }
         return null;
     }
 
     @Override
-    public GitCommitResponse removeFile(GitRemoveRequest request) {
+    public GitCommitResponse removeFile(GitRemoveRequest request) throws DSSErrorException {
         GitUserEntity gitUser = dssWorkspaceGitService.selectGit(request.getWorkspaceId(), GitConstant.GIT_ACCESS_WRITE_TYPE, true);
         if (gitUser == null) {
             logger.error("the workspace : {} don't associate with git", request.getWorkspaceId());
@@ -506,12 +511,13 @@ public GitCommitResponse removeFile(GitRemoveRequest request) {
 
         } catch (Exception e) {
             logger.error("pull failed, the reason is ",e);
+            throw new DSSErrorException(010001, "removeFile failed, the reason is: " + e);
         }
         return commitResponse;
     }
 
     @Override
-    public GitCommitResponse rename(GitRenameRequest request) {
+    public GitCommitResponse rename(GitRenameRequest request) throws DSSErrorException {
         GitUserEntity gitUser = dssWorkspaceGitService.selectGit(request.getWorkspaceId(), GitConstant.GIT_ACCESS_WRITE_TYPE, true);
         if (gitUser == null) {
             logger.error("the workspace : {} don't associate with git", request.getWorkspaceId());
@@ -546,12 +552,14 @@ public GitCommitResponse rename(GitRenameRequest request) {
             commitResponse = DSSGitUtils.getCurrentCommit(repository);
 
         } catch (Exception e) {
-            logger.error("pull failed, the reason is ",e);
+            logger.error("rename failed, the reason is ",e);
+            throw new DSSErrorException(010001, "rename failed, the reason is: " + e);
         }
         return commitResponse;
     }
 
-    public GitHistoryResponse getHistory(GitCommitInfoBetweenRequest request) {
+    @Override
+    public GitHistoryResponse getHistory(GitCommitInfoBetweenRequest request) throws DSSErrorException {
         GitUserEntity gitUser = dssWorkspaceGitService.selectGit(request.getWorkspaceId(), GitConstant.GIT_ACCESS_WRITE_TYPE, true);
         if (gitUser == null) {
             logger.error("the workspace : {} don't associate with git", request.getWorkspaceId());
@@ -565,10 +573,19 @@ public GitHistoryResponse getHistory(GitCommitInfoBetweenRequest request) {
         try (Repository repository = getRepository(repoDir, request.getProjectName(), gitUser)){
             // 本地保持最新状态
             DSSGitUtils.pull(repository, request.getProjectName(), gitUser);
-
-            response = DSSGitUtils.listCommitsBetween(repository, request.getOldCommitId(), request.getNewCommitId(), request.getDirName());
+            if (StringUtils.isEmpty(request.getOldCommitId())) {
+                List<GitCommitResponse> latestCommit = DSSGitUtils.getLatestCommit(repository, request.getDirName(), 5);
+                if (CollectionUtils.isEmpty(latestCommit)) {
+                    logger.error("get Commit failed, the reason is null");
+                }else {
+                    response.setResponses(latestCommit);
+                }
+            } else {
+                response = DSSGitUtils.listCommitsBetween(repository, request.getOldCommitId(), request.getNewCommitId(), request.getDirName());
+            }
         } catch (Exception e) {
             logger.error("pull failed, the reason is ",e);
+            throw new DSSErrorException(010001, "getHistory failed, the reason is: " + e);
         }
         return response;
     }
diff --git a/dss-git/dss-git-server/src/main/scala/com.webank.wedatasphere.dss.git/receiver/DSSGitChooser.scala b/dss-git/dss-git-server/src/main/scala/com.webank.wedatasphere.dss.git/receiver/DSSGitChooser.scala
index e138b4b87..36b9b7306 100644
--- a/dss-git/dss-git-server/src/main/scala/com.webank.wedatasphere.dss.git/receiver/DSSGitChooser.scala
+++ b/dss-git/dss-git-server/src/main/scala/com.webank.wedatasphere.dss.git/receiver/DSSGitChooser.scala
@@ -16,7 +16,7 @@
 
 package com.webank.wedatasphere.dss.git.receiver
 
-import com.webank.wedatasphere.dss.git.common.protocol.request.{GitArchiveProjectRequest, GitBaseRequest, GitCheckProjectRequest, GitCommitRequest, GitConnectRequest, GitCreateProjectRequest, GitCurrentCommitRequest, GitDeleteRequest, GitDiffRequest, GitFileContentRequest, GitHistoryRequest, GitRemoveRequest, GitRenameRequest, GitRevertRequest, GitSearchRequest, GitUserInfoByRequest, GitUserInfoRequest, GitUserUpdateRequest}
+import com.webank.wedatasphere.dss.git.common.protocol.request.{GitArchiveProjectRequest, GitBaseRequest, GitCheckProjectRequest, GitCommitInfoBetweenRequest, GitCommitRequest, GitConnectRequest, GitCreateProjectRequest, GitCurrentCommitRequest, GitDeleteRequest, GitDiffRequest, GitFileContentRequest, GitHistoryRequest, GitRemoveRequest, GitRenameRequest, GitRevertRequest, GitSearchRequest, GitUserInfoByRequest, GitUserInfoRequest, GitUserUpdateRequest}
 import com.webank.wedatasphere.dss.git.service.{DSSGitProjectManagerService, DSSGitWorkflowManagerService, DSSWorkspaceGitService}
 
 import javax.annotation.PostConstruct
@@ -51,7 +51,7 @@ class DSSGitChooser extends ReceiverChooser {
     case _: GitSearchRequest => receiver
     case _: GitFileContentRequest => receiver
     case _: GitDeleteRequest => receiver
-    case _: GitHistoryRequest => receiver
+    case _: GitCommitInfoBetweenRequest => receiver
     case _: GitUserUpdateRequest => receiver
     case _: GitUserInfoRequest => receiver
     case _: GitCurrentCommitRequest => receiver
diff --git a/dss-git/dss-git-server/src/main/scala/com.webank.wedatasphere.dss.git/receiver/DSSGitReceiver.scala b/dss-git/dss-git-server/src/main/scala/com.webank.wedatasphere.dss.git/receiver/DSSGitReceiver.scala
index 9cdef09c6..54920df2a 100644
--- a/dss-git/dss-git-server/src/main/scala/com.webank.wedatasphere.dss.git/receiver/DSSGitReceiver.scala
+++ b/dss-git/dss-git-server/src/main/scala/com.webank.wedatasphere.dss.git/receiver/DSSGitReceiver.scala
@@ -16,7 +16,7 @@
 
 package com.webank.wedatasphere.dss.git.receiver
 
-import com.webank.wedatasphere.dss.git.common.protocol.request.{GitArchiveProjectRequest, GitCheckProjectRequest, GitCommitRequest, GitConnectRequest, GitCreateProjectRequest, GitCurrentCommitRequest, GitDeleteRequest, GitDiffRequest, GitFileContentRequest, GitHistoryRequest, GitRemoveRequest, GitRenameRequest, GitRevertRequest, GitSearchRequest, GitUserInfoByRequest, GitUserInfoRequest, GitUserUpdateRequest}
+import com.webank.wedatasphere.dss.git.common.protocol.request.{GitArchiveProjectRequest, GitCheckProjectRequest, GitCommitInfoBetweenRequest, GitCommitRequest, GitConnectRequest, GitCreateProjectRequest, GitCurrentCommitRequest, GitDeleteRequest, GitDiffRequest, GitFileContentRequest, GitHistoryRequest, GitRemoveRequest, GitRenameRequest, GitRevertRequest, GitSearchRequest, GitUserInfoByRequest, GitUserInfoRequest, GitUserUpdateRequest}
 import com.webank.wedatasphere.dss.git.service.{DSSGitProjectManagerService, DSSGitWorkflowManagerService, DSSWorkspaceGitService}
 import org.apache.linkis.rpc.{Receiver, Sender}
 import org.slf4j.{Logger, LoggerFactory}
@@ -47,8 +47,8 @@ class DSSGitReceiver(gitProjectManagerService: DSSGitProjectManagerService, gitW
       gitWorkflowManagerService.delete(gitDeleteRequest)
     case gitFileContentRequest: GitFileContentRequest =>
       gitWorkflowManagerService.getFileContent(gitFileContentRequest)
-    case gitHistoryRequest: GitHistoryRequest =>
-      gitWorkflowManagerService.getHistory(gitHistoryRequest)
+    case gitCommitInfoBetweenRequest: GitCommitInfoBetweenRequest =>
+      gitWorkflowManagerService.getHistory(gitCommitInfoBetweenRequest)
     case gitUserUpdateRequest: GitUserUpdateRequest =>
       workspaceGitService.associateGit(gitUserUpdateRequest)
     case gitUserInfoRequest: GitUserInfoRequest =>
diff --git a/dss-orchestrator/dss-orchestrator-db/src/main/java/com/webank/wedatasphere/dss/orchestrator/db/dao/impl/orchestratorMapper.xml b/dss-orchestrator/dss-orchestrator-db/src/main/java/com/webank/wedatasphere/dss/orchestrator/db/dao/impl/orchestratorMapper.xml
index 441632411..5b127b2c6 100644
--- a/dss-orchestrator/dss-orchestrator-db/src/main/java/com/webank/wedatasphere/dss/orchestrator/db/dao/impl/orchestratorMapper.xml
+++ b/dss-orchestrator/dss-orchestrator-db/src/main/java/com/webank/wedatasphere/dss/orchestrator/db/dao/impl/orchestratorMapper.xml
@@ -121,7 +121,7 @@
     <select id="getLatestOrchestratorVersionByIdAndValidFlag"
             resultType="com.webank.wedatasphere.dss.orchestrator.common.entity.DSSOrchestratorVersion">
         SELECT
-        <include refid="orchestrator_version"/>
+        <include refid="orchestrator_version"/>,`commit_id`
         FROM
         `dss_orchestrator_version_info`
         WHERE
diff --git a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/service/impl/PublishServiceImpl.java b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/service/impl/PublishServiceImpl.java
index ccb5bcddf..98be4ae38 100644
--- a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/service/impl/PublishServiceImpl.java
+++ b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/service/impl/PublishServiceImpl.java
@@ -99,8 +99,8 @@ public String submitPublish(String convertUser, Long workflowId,
                     throw new DSSErrorException(800001, "编排不存在");
                 }
                 String status = lockMapper.selectOrchestratorStatus(orchestratorVo.getDssOrchestratorInfo().getId());
-                if (!org.apache.commons.lang3.StringUtils.isEmpty(status) && !status.equals(OrchestratorRefConstant.FLOW_STATUS_PUSH)) {
-                    throw new DSSErrorException(800001, "提交前请先提交工作流");
+                if (OrchestratorRefConstant.FLOW_STATUS_SAVE.equals(status)) {
+                    throw new DSSErrorException(800001, "发布前请先提交工作流");
                 }
 
                 // 获取当前文件Commit

From c0a360d918f5ac02021fe6a48d3c9dd5c9083ddf Mon Sep 17 00:00:00 2001
From: Zhaobincai <747839893@qq.com>
Date: Fri, 31 May 2024 11:38:19 +0800
Subject: [PATCH 219/302] dss-server: fix submitFlow

---
 .../server/service/impl/OrchestratorServiceImpl.java            | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/impl/OrchestratorServiceImpl.java b/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/impl/OrchestratorServiceImpl.java
index 4b0a1bfcf..12c8262b7 100644
--- a/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/impl/OrchestratorServiceImpl.java
+++ b/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/impl/OrchestratorServiceImpl.java
@@ -425,7 +425,7 @@ public String rollbackOrchestrator(String userName, Long projectId, String proje
                 submitRequest.setProjectName(projectName);
                 submitRequest.setLabels(labels);
                 submitRequest.setComment("rollback workflow: " + dssOrchestratorInfo.getName());
-                orchestratorPluginService.submitWorkflowToBML(submitRequest, userName, workspace);
+                orchestratorPluginService.submitFlow(submitRequest, userName, workspace);
             } else {
                 GitRevertRequest gitRevertRequest = new GitRevertRequest(workspace.getWorkspaceId(), projectName, oldOrcVersion.getCommitId(), dssOrchestratorInfo.getName(), "system");
                 RpcAskUtils.processAskException(sender.ask(gitRevertRequest), GitCommitResponse.class, GitRevertRequest.class);

From e98d83fab76a0782db0ef2db74b6bd2bd248ef2b Mon Sep 17 00:00:00 2001
From: Zhaobincai <747839893@qq.com>
Date: Fri, 31 May 2024 11:51:58 +0800
Subject: [PATCH 220/302] dss-server: fix archive

---
 .../framework/project/service/impl/DSSProjectServiceImpl.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dss-framework/dss-framework-project-server/src/main/java/com/webank/wedatasphere/dss/framework/project/service/impl/DSSProjectServiceImpl.java b/dss-framework/dss-framework-project-server/src/main/java/com/webank/wedatasphere/dss/framework/project/service/impl/DSSProjectServiceImpl.java
index cd51059d0..05caf6ec9 100644
--- a/dss-framework/dss-framework-project-server/src/main/java/com/webank/wedatasphere/dss/framework/project/service/impl/DSSProjectServiceImpl.java
+++ b/dss-framework/dss-framework-project-server/src/main/java/com/webank/wedatasphere/dss/framework/project/service/impl/DSSProjectServiceImpl.java
@@ -360,7 +360,7 @@ private void archiveGitProject(String username, ProjectDeleteRequest projectDele
             GitArchiveProjectRequest request1 = new GitArchiveProjectRequest(workspace.getWorkspaceId(), dssProjectDO.getName(), username);
             LOGGER.info("-------=======================begin to archive project: {}=======================-------", dssProjectDO.getName());
             Object ask = gitSender.ask(request1);
-            GitArchivePorjectResponse responseWorkflowValidNode = RpcAskUtils.processAskException(ask, GitArchivePorjectResponse.class, GitCreateProjectRequest.class);
+            GitArchivePorjectResponse responseWorkflowValidNode = RpcAskUtils.processAskException(ask, GitArchivePorjectResponse.class, GitArchiveProjectRequest.class);
             LOGGER.info("-------=======================End to archive project: {}=======================-------: {}", dssProjectDO.getName(), responseWorkflowValidNode);
         }
     }

From a00968fab37c6e96105d6e60d952c9f8875076b2 Mon Sep 17 00:00:00 2001
From: Zhaobincai <747839893@qq.com>
Date: Fri, 31 May 2024 14:15:43 +0800
Subject: [PATCH 221/302] git-server:fix exception

---
 .../dss/git/service/DSSGitWorkflowManagerService.java           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/DSSGitWorkflowManagerService.java b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/DSSGitWorkflowManagerService.java
index c38fad63a..56cfa5401 100644
--- a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/DSSGitWorkflowManagerService.java
+++ b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/DSSGitWorkflowManagerService.java
@@ -23,7 +23,7 @@ public interface DSSGitWorkflowManagerService {
 
     GitCommitResponse getCurrentCommit(GitCurrentCommitRequest request) throws DSSErrorException;
 
-    GitCommitResponse gitCheckOut(GitRevertRequest request) throws IOException;
+    GitCommitResponse gitCheckOut(GitRevertRequest request) throws DSSErrorException;
 
     GitCommitResponse removeFile(GitRemoveRequest request) throws DSSErrorException;
 

From d0c9b219990ae3e369d9277b78eb505af0e16568 Mon Sep 17 00:00:00 2001
From: Zhaobincai <747839893@qq.com>
Date: Fri, 31 May 2024 14:29:06 +0800
Subject: [PATCH 222/302] git-server:fix git pull

---
 .../com/webank/wedatasphere/dss/git/utils/DSSGitUtils.java     | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/utils/DSSGitUtils.java b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/utils/DSSGitUtils.java
index ef5d9430d..a03af3c4f 100644
--- a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/utils/DSSGitUtils.java
+++ b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/utils/DSSGitUtils.java
@@ -155,7 +155,8 @@ public static void pull(Repository repository, String projectName, GitUserEntity
                 }
             }
         } catch (Exception e) {
-            throw new GitErrorException(80001, "git pull failed, the reason is: ", e);
+            // 丢失本地修改，处理冲突
+            reset(repository, projectName);
         }
     }
 

From 043f355765511f0e11bef4874895c5e66e3c3d60 Mon Sep 17 00:00:00 2001
From: Zhaobincai <747839893@qq.com>
Date: Fri, 31 May 2024 14:37:27 +0800
Subject: [PATCH 223/302] git-server:fix history

---
 .../receiver/DSSGitChooser.scala                                | 1 +
 .../receiver/DSSGitReceiver.scala                               | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/dss-git/dss-git-server/src/main/scala/com.webank.wedatasphere.dss.git/receiver/DSSGitChooser.scala b/dss-git/dss-git-server/src/main/scala/com.webank.wedatasphere.dss.git/receiver/DSSGitChooser.scala
index 36b9b7306..5f7b72880 100644
--- a/dss-git/dss-git-server/src/main/scala/com.webank.wedatasphere.dss.git/receiver/DSSGitChooser.scala
+++ b/dss-git/dss-git-server/src/main/scala/com.webank.wedatasphere.dss.git/receiver/DSSGitChooser.scala
@@ -51,6 +51,7 @@ class DSSGitChooser extends ReceiverChooser {
     case _: GitSearchRequest => receiver
     case _: GitFileContentRequest => receiver
     case _: GitDeleteRequest => receiver
+    case _: GitHistoryRequest => receiver
     case _: GitCommitInfoBetweenRequest => receiver
     case _: GitUserUpdateRequest => receiver
     case _: GitUserInfoRequest => receiver
diff --git a/dss-git/dss-git-server/src/main/scala/com.webank.wedatasphere.dss.git/receiver/DSSGitReceiver.scala b/dss-git/dss-git-server/src/main/scala/com.webank.wedatasphere.dss.git/receiver/DSSGitReceiver.scala
index 54920df2a..a4658cf02 100644
--- a/dss-git/dss-git-server/src/main/scala/com.webank.wedatasphere.dss.git/receiver/DSSGitReceiver.scala
+++ b/dss-git/dss-git-server/src/main/scala/com.webank.wedatasphere.dss.git/receiver/DSSGitReceiver.scala
@@ -47,6 +47,8 @@ class DSSGitReceiver(gitProjectManagerService: DSSGitProjectManagerService, gitW
       gitWorkflowManagerService.delete(gitDeleteRequest)
     case gitFileContentRequest: GitFileContentRequest =>
       gitWorkflowManagerService.getFileContent(gitFileContentRequest)
+    case gitHistoryRequest: GitHistoryRequest =>
+      gitWorkflowManagerService.getHistory(gitHistoryRequest)
     case gitCommitInfoBetweenRequest: GitCommitInfoBetweenRequest =>
       gitWorkflowManagerService.getHistory(gitCommitInfoBetweenRequest)
     case gitUserUpdateRequest: GitUserUpdateRequest =>

From def2544c834bae04fd9d8a9d421a78b60c894c7f Mon Sep 17 00:00:00 2001
From: Zhaobincai <747839893@qq.com>
Date: Fri, 31 May 2024 14:46:17 +0800
Subject: [PATCH 224/302] git-server:fix username

---
 .../com/webank/wedatasphere/dss/git/utils/DSSGitUtils.java    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/utils/DSSGitUtils.java b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/utils/DSSGitUtils.java
index a03af3c4f..a5caffdbd 100644
--- a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/utils/DSSGitUtils.java
+++ b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/utils/DSSGitUtils.java
@@ -529,10 +529,10 @@ public static String getUserName(String shortMessage) {
             return null;
         }
 
-        int lastIndexOf = shortMessage.lastIndexOf(DSSGitConstant.GIT_PATH_SUFFIX);
+        int lastIndexOf = shortMessage.lastIndexOf(DSSGitConstant.GIT_USERNAME_FLAG);
 
         if (lastIndexOf != -1) {
-            String username = shortMessage.substring(lastIndexOf + DSSGitConstant.GIT_PATH_SUFFIX.length());
+            String username = shortMessage.substring(lastIndexOf + DSSGitConstant.GIT_USERNAME_FLAG.length());
             return username;
         } else {
             return null;

From 9bfa8b867d6767f581b3e87e91fbe976437e4b4d Mon Sep 17 00:00:00 2001
From: Zhaobincai <747839893@qq.com>
Date: Fri, 31 May 2024 14:52:28 +0800
Subject: [PATCH 225/302] git-server:fix comment

---
 .../com/webank/wedatasphere/dss/git/utils/DSSGitUtils.java   | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/utils/DSSGitUtils.java b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/utils/DSSGitUtils.java
index a5caffdbd..5a9d0809c 100644
--- a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/utils/DSSGitUtils.java
+++ b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/utils/DSSGitUtils.java
@@ -509,12 +509,15 @@ public static GitCommitResponse getCurrentCommit(Repository repository) throws G
                 commitResponse.setCommitId(commit.getId().getName());
                 commitResponse.setCommitTime(sdf.format(commit.getAuthorIdent().getWhen()));
                 String shortMessage = commit.getShortMessage();
-                commitResponse.setComment(shortMessage);
+
                 String userName = getUserName(shortMessage);
                 if (userName != null) {
                     commitResponse.setCommitUser(userName);
+                    int userNameIndex = shortMessage.lastIndexOf(userName);
+                    commitResponse.setComment(shortMessage.substring(0, userNameIndex));
                 } else {
                     commitResponse.setCommitUser(commit.getAuthorIdent().getName());
+                    commitResponse.setComment(shortMessage);
                 }
                 // 返回commitId字符串
                 return commitResponse;

From e6956e859b2431d163a90e16cf965c79fe79e7d6 Mon Sep 17 00:00:00 2001
From: Zhaobincai <747839893@qq.com>
Date: Fri, 31 May 2024 14:58:49 +0800
Subject: [PATCH 226/302] git-server:fix comment add limit 100

---
 .../dss/git/service/impl/DSSGitWorkflowManagerServiceImpl.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitWorkflowManagerServiceImpl.java b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitWorkflowManagerServiceImpl.java
index 37466ecc1..707a2e7e1 100644
--- a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitWorkflowManagerServiceImpl.java
+++ b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitWorkflowManagerServiceImpl.java
@@ -381,7 +381,7 @@ public GitHistoryResponse getHistory(GitHistoryRequest request) throws DSSErrorE
             // 本地保持最新状态
             DSSGitUtils.pull(repository, request.getProjectName(), gitUser);
 
-            List<GitCommitResponse> latestCommit = DSSGitUtils.getLatestCommit(repository, request.getFilePath(), 5);
+            List<GitCommitResponse> latestCommit = DSSGitUtils.getLatestCommit(repository, request.getFilePath(), 100);
             if (CollectionUtils.isEmpty(latestCommit)) {
                 logger.error("get Commit failed, the reason is null");
             }else {

From 22e942141670c838494b5ce7dd202ae8c01d0424 Mon Sep 17 00:00:00 2001
From: Zhaobincai <747839893@qq.com>
Date: Fri, 31 May 2024 17:40:06 +0800
Subject: [PATCH 227/302] git-server:fix workTree

---
 .../dss/git/service/impl/DSSGitWorkflowManagerServiceImpl.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitWorkflowManagerServiceImpl.java b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitWorkflowManagerServiceImpl.java
index 707a2e7e1..d969e506e 100644
--- a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitWorkflowManagerServiceImpl.java
+++ b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitWorkflowManagerServiceImpl.java
@@ -124,7 +124,7 @@ public GitCommitResponse commit(GitCommitRequest request) throws DSSErrorExcepti
     @Override
     public GitSearchResponse search(GitSearchRequest request) {
         String gitDir = DSSGitUtils.generateGitPath(request.getProjectName(), request.getWorkspaceId());
-        String workTree = DSSGitConstant.GIT_PATH_PRE + request.getProjectName() ;
+        String workTree = DSSGitConstant.GIT_PATH_PRE + request.getWorkspaceId()+ File.separator +request.getProjectName() ;
         List<String> gitCommands = new ArrayList<>(Arrays.asList(
                 "git", "--git-dir=" + gitDir, "--work-tree=" + workTree, "grep", "-l", request.getSearchContent()
         ));

From 8d65a1ef722c627d2742d444078b3ad0973dc420 Mon Sep 17 00:00:00 2001
From: Zhaobincai <747839893@qq.com>
Date: Fri, 31 May 2024 21:08:50 +0800
Subject: [PATCH 228/302] git-server:fix metaConf

---
 .../impl/DSSFrameworkProjectServiceImpl.java  |  2 +-
 .../protocol/config/GitServerConfig.java      |  2 --
 .../protocol/constant/GitConstant.java        |  1 +
 .../DSSGitWorkflowManagerServiceImpl.java     | 24 ++++++++++++-------
 .../dss/git/utils/DSSGitUtils.java            |  2 +-
 5 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/dss-framework/dss-framework-project-server/src/main/java/com/webank/wedatasphere/dss/framework/project/service/impl/DSSFrameworkProjectServiceImpl.java b/dss-framework/dss-framework-project-server/src/main/java/com/webank/wedatasphere/dss/framework/project/service/impl/DSSFrameworkProjectServiceImpl.java
index c20e49036..750b6e696 100644
--- a/dss-framework/dss-framework-project-server/src/main/java/com/webank/wedatasphere/dss/framework/project/service/impl/DSSFrameworkProjectServiceImpl.java
+++ b/dss-framework/dss-framework-project-server/src/main/java/com/webank/wedatasphere/dss/framework/project/service/impl/DSSFrameworkProjectServiceImpl.java
@@ -227,7 +227,7 @@ private void updateProject(Long workspaceId, String projectName,BmlResource bmlR
         Sender gitSender = DSSSenderServiceFactory.getOrCreateServiceInstance().getGitSender();
         Map<String, BmlResource> file = new HashMap<>();
         // 测试数据 key表示项目名、value为项目BmlResource资源
-        file.put(".metaConf", bmlResource);
+        file.put(GitConstant.GIT_SERVER_META_PATH , bmlResource);
         GitCommitRequest request1 = new GitCommitRequest(workspaceId, projectName, file, "update Project", username);
         LOGGER.info("-------=======================begin to update project: {}=======================-------", projectName);
         GitCommitResponse responseWorkflowValidNode = RpcAskUtils.processAskException(gitSender.ask(request1), GitCommitResponse.class, GitCommitRequest.class);
diff --git a/dss-git/dss-git-common/src/main/java/com.webank.wedatasphere.dss.git.common/protocol/config/GitServerConfig.java b/dss-git/dss-git-common/src/main/java/com.webank.wedatasphere.dss.git.common/protocol/config/GitServerConfig.java
index 774deff49..09bff3f5a 100644
--- a/dss-git/dss-git-common/src/main/java/com.webank.wedatasphere.dss.git.common/protocol/config/GitServerConfig.java
+++ b/dss-git/dss-git-common/src/main/java/com.webank.wedatasphere.dss.git.common/protocol/config/GitServerConfig.java
@@ -11,8 +11,6 @@ public class GitServerConfig {
 
     public static final CommonVars<Integer> GIT_THREAD_NUM = CommonVars.apply("wds.dss.git.thread.num", 23);
 
-    public static final CommonVars<String> GIT_SERVER_META_PATH = CommonVars.apply("wds.dss.git.server.meta.path", ".metaConf");
-
     public static final CommonVars<Integer> GIT_SEARCH_RESULT_LIMIT = CommonVars.apply("wds.dss.git.search.limit", 30);
 
     public static final CommonVars<String> GIT_USER = CommonVars.apply("wds.dss.server.git.user", "user_login");
diff --git a/dss-git/dss-git-common/src/main/java/com.webank.wedatasphere.dss.git.common/protocol/constant/GitConstant.java b/dss-git/dss-git-common/src/main/java/com.webank.wedatasphere.dss.git.common/protocol/constant/GitConstant.java
index 61d21882e..cc672b9a5 100644
--- a/dss-git/dss-git-common/src/main/java/com.webank.wedatasphere.dss.git.common/protocol/constant/GitConstant.java
+++ b/dss-git/dss-git-common/src/main/java/com.webank.wedatasphere.dss.git.common/protocol/constant/GitConstant.java
@@ -4,4 +4,5 @@
 public class GitConstant {
     public static String GIT_ACCESS_WRITE_TYPE = "write";
     public static String GIT_ACCESS_READ_TYPE = "read";
+    public static String GIT_SERVER_META_PATH = ".metaConf";
 }
diff --git a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitWorkflowManagerServiceImpl.java b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitWorkflowManagerServiceImpl.java
index d969e506e..b99a0c7db 100644
--- a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitWorkflowManagerServiceImpl.java
+++ b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitWorkflowManagerServiceImpl.java
@@ -107,6 +107,9 @@ public GitCommitResponse commit(GitCommitRequest request) throws DSSErrorExcepti
                 FileUtils.removeFlowNode(entry.getKey(), request.getProjectName(), workspaceId);
                 FileUtils.unzipBMLResource(entry.getKey(), workspaceId);
             }
+            String metaConfPath = GitConstant.GIT_SERVER_META_PATH + File.separator + request.getProjectName();
+            paths.add(metaConfPath);
+            paths.remove(GitConstant.GIT_SERVER_META_PATH );
             // 提交
             String comment = request.getComment() + DSSGitConstant.GIT_USERNAME_FLAG + request.getUsername();
             // 提交前再次pull， 降低多节点同时提交不同工作流任务导致冲突频率
@@ -124,7 +127,7 @@ public GitCommitResponse commit(GitCommitRequest request) throws DSSErrorExcepti
     @Override
     public GitSearchResponse search(GitSearchRequest request) {
         String gitDir = DSSGitUtils.generateGitPath(request.getProjectName(), request.getWorkspaceId());
-        String workTree = DSSGitConstant.GIT_PATH_PRE + request.getWorkspaceId()+ File.separator +request.getProjectName() ;
+        String workTree = DSSGitConstant.GIT_PATH_PRE + request.getWorkspaceId() + File.separator + request.getProjectName() ;
         List<String> gitCommands = new ArrayList<>(Arrays.asList(
                 "git", "--git-dir=" + gitDir, "--work-tree=" + workTree, "grep", "-l", request.getSearchContent()
         ));
@@ -219,7 +222,7 @@ public GitSearchResponse search(GitSearchRequest request) {
         List<String> subList = new ArrayList<>(fileList.subList(start, end));
         List<String> filePathList = new ArrayList<>();
         for (String file : subList) {
-            filePathList.add(DSSGitConstant.GIT_PATH_PRE + request.getProjectName() + File.separator + file);
+            filePathList.add(DSSGitConstant.GIT_PATH_PRE + request.getWorkspaceId() + File.separator +request.getProjectName() + File.separator + file);
         }
 
 
@@ -529,12 +532,13 @@ public GitCommitResponse rename(GitRenameRequest request) throws DSSErrorExcepti
         // 获取git仓库
         File repoDir = new File(gitPath);
         try (Repository repository = getRepository(repoDir, request.getProjectName(), gitUser)){
-            // 同步删除对应节点
-            String olfFilePath = File.separator + FileUtils.normalizePath(GitServerConfig.GIT_SERVER_PATH.getValue()) + File.separator + request.getWorkspaceId() + File.separator + request.getProjectName() + File.separator + FileUtils.normalizePath(request.getOldName());
-            String filePath = File.separator + FileUtils.normalizePath(GitServerConfig.GIT_SERVER_PATH.getValue()) + File.separator + request.getWorkspaceId() + File.separator + request.getProjectName() + File.separator + FileUtils.normalizePath(request.getName());
-
-            String oldFileMetaPath = File.separator + FileUtils.normalizePath(GitServerConfig.GIT_SERVER_PATH.getValue()) + File.separator + request.getWorkspaceId() + File.separator + request.getProjectName() + File.separator + FileUtils.normalizePath(GitServerConfig.GIT_SERVER_META_PATH.getValue()) + File.separator + FileUtils.normalizePath(request.getOldName());
-            String fileMetaPath = File.separator + FileUtils.normalizePath(GitServerConfig.GIT_SERVER_PATH.getValue()) + File.separator + request.getWorkspaceId() + File.separator + request.getProjectName() + File.separator + FileUtils.normalizePath(GitServerConfig.GIT_SERVER_META_PATH.getValue()) + File.separator + FileUtils.normalizePath(request.getName());
+            // 同步删除对应节点 eg: /data/GitInstall/224/testGit/flowGitOld -> /data/GitInstall/224/testGit/flowGitNew
+            String projectPath = generateProjectPath(request.getWorkspaceId(), request.getProjectName());
+            String olfFilePath = projectPath + File.separator + FileUtils.normalizePath(request.getOldName());
+            String filePath = projectPath + File.separator + FileUtils.normalizePath(request.getName());
+            // 同步删除对应节点 eg: /data/GitInstall/224/testGit/.metaConf/flowGitOld -> /data/GitInstall/224/testGit/.metaConf/flowGitNew
+            String oldFileMetaPath = projectPath + File.separator + FileUtils.normalizePath(GitConstant.GIT_SERVER_META_PATH) + File.separator + FileUtils.normalizePath(request.getOldName());
+            String fileMetaPath = projectPath + File.separator + FileUtils.normalizePath(GitConstant.GIT_SERVER_META_PATH) + File.separator + FileUtils.normalizePath(request.getName());
             List<String> fileList = new ArrayList<>();
             fileList.add(oldFileMetaPath);
             fileList.add(olfFilePath);
@@ -558,6 +562,10 @@ public GitCommitResponse rename(GitRenameRequest request) throws DSSErrorExcepti
         return commitResponse;
     }
 
+    private String generateProjectPath(Long workspaceId, String projectName) {
+        return DSSGitConstant.GIT_PATH_PRE + workspaceId + File.separator + projectName;
+    }
+
     @Override
     public GitHistoryResponse getHistory(GitCommitInfoBetweenRequest request) throws DSSErrorException {
         GitUserEntity gitUser = dssWorkspaceGitService.selectGit(request.getWorkspaceId(), GitConstant.GIT_ACCESS_WRITE_TYPE, true);
diff --git a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/utils/DSSGitUtils.java b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/utils/DSSGitUtils.java
index 5a9d0809c..3ed47e649 100644
--- a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/utils/DSSGitUtils.java
+++ b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/utils/DSSGitUtils.java
@@ -604,7 +604,7 @@ public static GitHistoryResponse listCommitsBetween(Repository repository, Strin
     }
 
     public static String generateGitPath(String projectName, Long workspaceId) {
-        // eg ： /data/GitInstall/testGit/.git
+        // eg ： /data/GitInstall/224/testGit/.git
         return DSSGitConstant.GIT_PATH_PRE + workspaceId + File.separator + projectName + File.separator + DSSGitConstant.GIT_PATH_SUFFIX;
     }
 

From 107272f84469535da2d3128d6d3e8cc664e25bea Mon Sep 17 00:00:00 2001
From: Zhaobincai <747839893@qq.com>
Date: Fri, 31 May 2024 21:13:20 +0800
Subject: [PATCH 229/302] git-server:fix metaConf

---
 .../protocol/config/GitServerConfig.java                 | 2 +-
 .../service/impl/DSSGitWorkflowManagerServiceImpl.java   | 9 +++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/dss-git/dss-git-common/src/main/java/com.webank.wedatasphere.dss.git.common/protocol/config/GitServerConfig.java b/dss-git/dss-git-common/src/main/java/com.webank.wedatasphere.dss.git.common/protocol/config/GitServerConfig.java
index 09bff3f5a..a3dae454d 100644
--- a/dss-git/dss-git-common/src/main/java/com.webank.wedatasphere.dss.git.common/protocol/config/GitServerConfig.java
+++ b/dss-git/dss-git-common/src/main/java/com.webank.wedatasphere.dss.git.common/protocol/config/GitServerConfig.java
@@ -20,7 +20,7 @@ public class GitServerConfig {
 
     public static final CommonVars<String> GIT_SEARCH_EXCLUDE_DIRECTORY = CommonVars.apply("wds.dss.server.git.search.exclude.dir", ".metaConf");
 
-    public static final CommonVars<String> GIT_SEARCH_EXCLUDE_FILE = CommonVars.apply("wds.dss.server.git.search.exclude.file", ".properties");
+    public static final CommonVars<String> GIT_SEARCH_EXCLUDE_FILE = CommonVars.apply("wds.dss.server.git.search.exclude.file", ".properties,.projectmeta");
 
     public static final CommonVars<String> LINKIS_MYSQL_PRI_KEY = CommonVars.apply("wds.linkis.mysql.pri.key", "abc");
 }
diff --git a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitWorkflowManagerServiceImpl.java b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitWorkflowManagerServiceImpl.java
index b99a0c7db..1736d2315 100644
--- a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitWorkflowManagerServiceImpl.java
+++ b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitWorkflowManagerServiceImpl.java
@@ -127,7 +127,8 @@ public GitCommitResponse commit(GitCommitRequest request) throws DSSErrorExcepti
     @Override
     public GitSearchResponse search(GitSearchRequest request) {
         String gitDir = DSSGitUtils.generateGitPath(request.getProjectName(), request.getWorkspaceId());
-        String workTree = DSSGitConstant.GIT_PATH_PRE + request.getWorkspaceId() + File.separator + request.getProjectName() ;
+        String gitPathPre = DSSGitConstant.GIT_PATH_PRE;
+        String workTree = gitPathPre + request.getWorkspaceId() + File.separator + request.getProjectName() ;
         List<String> gitCommands = new ArrayList<>(Arrays.asList(
                 "git", "--git-dir=" + gitDir, "--work-tree=" + workTree, "grep", "-l", request.getSearchContent()
         ));
@@ -222,7 +223,7 @@ public GitSearchResponse search(GitSearchRequest request) {
         List<String> subList = new ArrayList<>(fileList.subList(start, end));
         List<String> filePathList = new ArrayList<>();
         for (String file : subList) {
-            filePathList.add(DSSGitConstant.GIT_PATH_PRE + request.getWorkspaceId() + File.separator +request.getProjectName() + File.separator + file);
+            filePathList.add(gitPathPre + request.getWorkspaceId() + File.separator +request.getProjectName() + File.separator + file);
         }
 
 
@@ -259,8 +260,8 @@ public GitSearchResponse search(GitSearchRequest request) {
                 }
             }
             // 处理文件路径 /data/GitInstall/testGit/test/.sql -> testGit/test/.sql
-            if (file.startsWith(DSSGitConstant.GIT_PATH_PRE)) {
-                file = file.substring(DSSGitConstant.GIT_PATH_PRE.length());
+            if (file.startsWith(gitPathPre)) {
+                file = file.substring(gitPathPre.length());
             }
 
             result.add(new GitSearchResult(file, keyLines));

From 667f6382393bd2275e7724eba07502c035ad6d30 Mon Sep 17 00:00:00 2001
From: Zhaobincai <747839893@qq.com>
Date: Fri, 31 May 2024 21:21:46 +0800
Subject: [PATCH 230/302] git-server:fix metaConf2

---
 .../java/com/webank/wedatasphere/dss/git/utils/FileUtils.java  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/utils/FileUtils.java b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/utils/FileUtils.java
index 16fdf1e79..91f646d75 100644
--- a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/utils/FileUtils.java
+++ b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/utils/FileUtils.java
@@ -6,6 +6,7 @@
 import com.webank.wedatasphere.dss.common.exception.DSSRuntimeException;
 import com.webank.wedatasphere.dss.common.service.BMLService;
 import com.webank.wedatasphere.dss.git.common.protocol.config.GitServerConfig;
+import com.webank.wedatasphere.dss.git.common.protocol.constant.GitConstant;
 import org.apache.commons.lang.StringUtils;
 import org.apache.poi.util.IOUtils;
 import org.slf4j.Logger;
@@ -133,7 +134,7 @@ public static void removeFlowNode(String path, String projectName, Long workspac
         // 删除node节点
         String flowNodePathPre =  FileUtils.normalizePath(GitServerConfig.GIT_SERVER_PATH.getValue()) + File.separator + workspaceId + File.separator +  projectName ;
         String flowNodePath = File.separator + FileUtils.normalizePath(flowNodePathPre) + File.separator + path;
-        String flowNodeMetaPath = File.separator + FileUtils.normalizePath(flowNodePathPre) + File.separator + FileUtils.normalizePath(GitServerConfig.GIT_SERVER_META_PATH.getValue()) + File.separator + path;
+        String flowNodeMetaPath = File.separator + FileUtils.normalizePath(flowNodePathPre) + File.separator + FileUtils.normalizePath(GitConstant.GIT_SERVER_META_PATH) + File.separator + path;
         // 1.删除工作流节点代码
         removeDirectory(flowNodePath);
         // 2. 删除工作流节点对应.metaConf文件

From 38d24b3550f2720017bae97df803215c16cca11b Mon Sep 17 00:00:00 2001
From: Zhaobincai <747839893@qq.com>
Date: Mon, 3 Jun 2024 11:14:44 +0800
Subject: [PATCH 231/302] git-server:fix history

---
 .../OrchestratorFrameworkServiceImpl.java     | 25 ++++++++---
 .../DSSGitWorkflowManagerServiceImpl.java     |  2 +-
 .../dss/git/utils/DSSGitUtils.java            | 45 +++++++++----------
 .../db/dao/impl/orchestratorMapper.xml        |  2 +-
 4 files changed, 42 insertions(+), 32 deletions(-)

diff --git a/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/impl/OrchestratorFrameworkServiceImpl.java b/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/impl/OrchestratorFrameworkServiceImpl.java
index 8089c9529..d8e9353f1 100644
--- a/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/impl/OrchestratorFrameworkServiceImpl.java
+++ b/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/impl/OrchestratorFrameworkServiceImpl.java
@@ -38,6 +38,7 @@
 import com.webank.wedatasphere.dss.common.utils.DSSExceptionUtils;
 import com.webank.wedatasphere.dss.common.utils.RpcAskUtils;
 import com.webank.wedatasphere.dss.framework.common.exception.DSSFrameworkErrorException;
+import com.webank.wedatasphere.dss.git.common.protocol.request.GitCommitInfoBetweenRequest;
 import com.webank.wedatasphere.dss.git.common.protocol.request.GitHistoryRequest;
 import com.webank.wedatasphere.dss.git.common.protocol.request.GitRemoveRequest;
 import com.webank.wedatasphere.dss.git.common.protocol.response.GitCommitResponse;
@@ -454,14 +455,26 @@ public OrchestratorSubmitJob getOrchestratorStatus(Long orchestratorId) {
     public GitHistoryResponse getHistory(Long workspaceId, Long orchestratorId, String projectName) {
         DSSOrchestratorInfo orchestrator = orchestratorMapper.getOrchestrator(orchestratorId);
         List<DSSOrchestratorVersion> versionByOrchestratorId = orchestratorMapper.getVersionByOrchestratorId(orchestratorId);
-
+        if (CollectionUtils.isEmpty(versionByOrchestratorId)) {
+            return new GitHistoryResponse();
+        }
         String workflowName = orchestrator.getName();
-
         Sender sender = DSSSenderServiceFactory.getOrCreateServiceInstance().getGitSender();
-        GitHistoryRequest historyRequest = new GitHistoryRequest(workspaceId, projectName, workflowName);
-        GitHistoryResponse gitHistoryResponse = RpcAskUtils.processAskException(sender.ask(historyRequest), GitHistoryResponse.class, GitHistoryRequest.class);
-
-        return gitHistoryResponse;
+        GitHistoryResponse historyResponse = null;
+        // 当前未有版本发布
+        if (versionByOrchestratorId.size() == 1 || versionByOrchestratorId.get(1).getCommitId() == null) {
+            GitHistoryRequest historyRequest = new GitHistoryRequest(workspaceId, projectName, workflowName);
+            historyResponse = RpcAskUtils.processAskException(sender.ask(historyRequest), GitHistoryResponse.class, GitHistoryRequest.class);
+        } else {
+            GitCommitInfoBetweenRequest commitInfoBetweenRequest = new GitCommitInfoBetweenRequest();
+            commitInfoBetweenRequest.setNewCommitId(versionByOrchestratorId.get(0).getCommitId());
+            commitInfoBetweenRequest.setOldCommitId(versionByOrchestratorId.get(1).getCommitId());
+            commitInfoBetweenRequest.setProjectName(projectName);
+            commitInfoBetweenRequest.setDirName(workflowName);
+            commitInfoBetweenRequest.setWorkspaceId(workspaceId);
+            historyResponse = RpcAskUtils.processAskException(sender.ask(commitInfoBetweenRequest), GitHistoryResponse.class, GitCommitInfoBetweenRequest.class);
+        }
+        return historyResponse;
     }
 
 }
diff --git a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitWorkflowManagerServiceImpl.java b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitWorkflowManagerServiceImpl.java
index 1736d2315..bbe54104e 100644
--- a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitWorkflowManagerServiceImpl.java
+++ b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitWorkflowManagerServiceImpl.java
@@ -583,7 +583,7 @@ public GitHistoryResponse getHistory(GitCommitInfoBetweenRequest request) throws
             // 本地保持最新状态
             DSSGitUtils.pull(repository, request.getProjectName(), gitUser);
             if (StringUtils.isEmpty(request.getOldCommitId())) {
-                List<GitCommitResponse> latestCommit = DSSGitUtils.getLatestCommit(repository, request.getDirName(), 5);
+                List<GitCommitResponse> latestCommit = DSSGitUtils.getLatestCommit(repository, request.getDirName(), 100);
                 if (CollectionUtils.isEmpty(latestCommit)) {
                     logger.error("get Commit failed, the reason is null");
                 }else {
diff --git a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/utils/DSSGitUtils.java b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/utils/DSSGitUtils.java
index 3ed47e649..18a706f08 100644
--- a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/utils/DSSGitUtils.java
+++ b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/utils/DSSGitUtils.java
@@ -510,15 +510,7 @@ public static GitCommitResponse getCurrentCommit(Repository repository) throws G
                 commitResponse.setCommitTime(sdf.format(commit.getAuthorIdent().getWhen()));
                 String shortMessage = commit.getShortMessage();
 
-                String userName = getUserName(shortMessage);
-                if (userName != null) {
-                    commitResponse.setCommitUser(userName);
-                    int userNameIndex = shortMessage.lastIndexOf(userName);
-                    commitResponse.setComment(shortMessage.substring(0, userNameIndex));
-                } else {
-                    commitResponse.setCommitUser(commit.getAuthorIdent().getName());
-                    commitResponse.setComment(shortMessage);
-                }
+                getUserName(shortMessage, commitResponse, commit);
                 // 返回commitId字符串
                 return commitResponse;
             }
@@ -527,18 +519,21 @@ public static GitCommitResponse getCurrentCommit(Repository repository) throws G
         }
     }
 
-    public static String getUserName(String shortMessage) {
+    public static void getUserName(String shortMessage, GitCommitResponse commitResponse, RevCommit commit) {
         if (StringUtils.isEmpty(shortMessage)) {
-            return null;
+            return ;
         }
 
         int lastIndexOf = shortMessage.lastIndexOf(DSSGitConstant.GIT_USERNAME_FLAG);
 
         if (lastIndexOf != -1) {
             String username = shortMessage.substring(lastIndexOf + DSSGitConstant.GIT_USERNAME_FLAG.length());
-            return username;
+            String comment = shortMessage.substring(0, lastIndexOf);
+            commitResponse.setCommitUser(username);
+            commitResponse.setComment(comment);
         } else {
-            return null;
+            commitResponse.setCommitUser(commit.getCommitterIdent().getName());
+            commitResponse.setComment(shortMessage);
         }
     }
 
@@ -553,13 +548,7 @@ public static List<GitCommitResponse> getLatestCommit(Repository repository, Str
                 commitResponse.setCommitId(commit.getId().getName());
                 commitResponse.setCommitTime(sdf.format(commit.getAuthorIdent().getWhen()));
                 String shortMessage = commit.getShortMessage();
-                commitResponse.setComment(shortMessage);
-                String userName = getUserName(shortMessage);
-                if (userName != null) {
-                    commitResponse.setCommitUser(userName);
-                } else {
-                    commitResponse.setCommitUser(commit.getAuthorIdent().getName());
-                }
+                getUserName(shortMessage, commitResponse, commit);
                 logger.info("提交ID: " + commit.getId().getName());
                 commitResponseList.add(commitResponse);
             }
@@ -576,19 +565,27 @@ public static GitHistoryResponse listCommitsBetween(Repository repository, Strin
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         try (RevWalk walk = new RevWalk(repository)) {
             Git git = new Git(repository);
+            ObjectId commitIdNow = null;
+            if (newCommitId == null) {
+                ObjectId head = repository.resolve("HEAD");
+                commitIdNow = walk.parseCommit(head);
+            } else {
+                commitIdNow = repository.resolve(newCommitId);
+            }
+
 
             Iterable<RevCommit> commits = git.log()
-                    .addRange(repository.resolve(oldCommitId), repository.resolve(newCommitId))
+                    .addRange(repository.resolve(oldCommitId), commitIdNow)
                     .addPath(path)
                     .call();
 
-            for (RevCommit commit : walk) {
+            for (RevCommit commit : commits) {
                 PersonIdent authorIdent = commit.getAuthorIdent(); // 获取提交人信息
                 GitCommitResponse commitResponse = new GitCommitResponse();
                 commitResponse.setCommitId(commit.getId().getName());
                 commitResponse.setCommitTime(sdf.format(commit.getAuthorIdent().getWhen()));
-                commitResponse.setComment(commit.getShortMessage());
-                commitResponse.setCommitUser(commit.getAuthorIdent().getName());
+                String shortMessage = commit.getShortMessage();
+                getUserName(shortMessage, commitResponse, commit);
                 gitCommitResponseList.add(commitResponse);
                 logger.info("Commit Hash: " + commit.getName()); // 提交的Hash值
                 logger.info("Commit Time: " + authorIdent.getWhen()); // 提交时间
diff --git a/dss-orchestrator/dss-orchestrator-db/src/main/java/com/webank/wedatasphere/dss/orchestrator/db/dao/impl/orchestratorMapper.xml b/dss-orchestrator/dss-orchestrator-db/src/main/java/com/webank/wedatasphere/dss/orchestrator/db/dao/impl/orchestratorMapper.xml
index 5b127b2c6..f00d78704 100644
--- a/dss-orchestrator/dss-orchestrator-db/src/main/java/com/webank/wedatasphere/dss/orchestrator/db/dao/impl/orchestratorMapper.xml
+++ b/dss-orchestrator/dss-orchestrator-db/src/main/java/com/webank/wedatasphere/dss/orchestrator/db/dao/impl/orchestratorMapper.xml
@@ -161,7 +161,7 @@
     <select id="getVersionByOrchestratorId"
             resultType="com.webank.wedatasphere.dss.orchestrator.common.entity.DSSOrchestratorVersion">
         SELECT
-        <include refid="orchestrator_version"/>
+        <include refid="orchestrator_version"/>, commit_id
         FROM dss_orchestrator_version_info
         WHERE orchestrator_id = #{orchestratorId} and valid_flag = 1 and context_id != ''
         ORDER BY id DESC

From abbc0e2edf7c6350667ee64da3bf3d6c40a3581f Mon Sep 17 00:00:00 2001
From: Zhaobincai <747839893@qq.com>
Date: Mon, 3 Jun 2024 16:19:51 +0800
Subject: [PATCH 232/302] git-server:fix commitId

---
 .../server/service/impl/OrchestratorPluginServiceImpl.java       | 1 +
 1 file changed, 1 insertion(+)

diff --git a/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/impl/OrchestratorPluginServiceImpl.java b/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/impl/OrchestratorPluginServiceImpl.java
index 9059fd79f..fdc5ee441 100644
--- a/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/impl/OrchestratorPluginServiceImpl.java
+++ b/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/impl/OrchestratorPluginServiceImpl.java
@@ -259,6 +259,7 @@ public GitCommitResponse submitWorkflowToBML(OrchestratorSubmitRequest flowReque
         orchestratorMapper.updateOrchestratorSubmitJobStatus(orchestratorId, OrchestratorRefConstant.FLOW_STATUS_PUSH_SUCCESS, "");
         //5. 返回文件列表
         lockMapper.updateOrchestratorStatus(orchestratorId, OrchestratorRefConstant.FLOW_STATUS_PUSH);
+        lockMapper.updateOrchestratorVersionCommitId(commit.getCommitId(), flowRequest.getFlowId());
         return commit;
     }
 

From 6bf6088b6248670f338ad95571f1647c97df2949 Mon Sep 17 00:00:00 2001
From: Zhaobincai <747839893@qq.com>
Date: Mon, 3 Jun 2024 16:45:02 +0800
Subject: [PATCH 233/302] git-server:fix exclude

---
 .../dss/git/service/impl/DSSGitWorkflowManagerServiceImpl.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitWorkflowManagerServiceImpl.java b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitWorkflowManagerServiceImpl.java
index bbe54104e..64b3462a2 100644
--- a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitWorkflowManagerServiceImpl.java
+++ b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitWorkflowManagerServiceImpl.java
@@ -200,7 +200,7 @@ public GitSearchResponse search(GitSearchRequest request) {
             }
             // 排除指定文件下的内容(.properties)
             for (String exclude : excludeFileList) {
-                if (file.endsWith(File.separator + exclude)) {
+                if (file.endsWith(exclude)) {
                     excludeResult.add(file);
                 }
             }

From a1d74f468fb09996ec862bc9328ae13a4facbbb0 Mon Sep 17 00:00:00 2001
From: Zhaobincai <747839893@qq.com>
Date: Mon, 3 Jun 2024 17:06:06 +0800
Subject: [PATCH 234/302] git-server:fix history

---
 .../service/impl/OrchestratorFrameworkServiceImpl.java      | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/impl/OrchestratorFrameworkServiceImpl.java b/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/impl/OrchestratorFrameworkServiceImpl.java
index d8e9353f1..2d0cf49f8 100644
--- a/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/impl/OrchestratorFrameworkServiceImpl.java
+++ b/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/impl/OrchestratorFrameworkServiceImpl.java
@@ -293,8 +293,12 @@ public CommonOrchestratorVo deleteOrchestrator(String username, OrchestratorDele
             List<String> path = new ArrayList<>();
             path.add(orchestratorInfo.getName());
             GitRemoveRequest removeRequest = new GitRemoveRequest(workspace.getWorkspaceId(), dssProject.getName(), path, username);
-            RpcAskUtils.processAskException(sender.ask(removeRequest), GitCommitResponse.class, GitRemoveRequest.class);
+            GitCommitResponse commitResponse = RpcAskUtils.processAskException(sender.ask(removeRequest), GitCommitResponse.class, GitRemoveRequest.class);
             lockMapper.updateOrchestratorStatus(orchestratorDeleteRequest.getId(), OrchestratorRefConstant.FLOW_STATUS_PUSH);
+            DSSOrchestratorVersion versionById = orchestratorMapper.getLatestOrchestratorVersionById(orchestratorInfo.getId());
+            if (versionById != null) {
+                lockMapper.updateOrchestratorVersionCommitId(commitResponse.getCommitId(), versionById.getOrchestratorId());
+            }
         } catch (Exception e) {
             LOGGER.error("git remove failed, the reason is: ", e);
             lockMapper.updateOrchestratorStatus(orchestratorDeleteRequest.getId(), OrchestratorRefConstant.FLOW_STATUS_SAVE);

From 317362ccff9d3eed5dd20b67a33f6f44635d1a01 Mon Sep 17 00:00:00 2001
From: Zhaobincai <747839893@qq.com>
Date: Mon, 3 Jun 2024 21:19:00 +0800
Subject: [PATCH 235/302] git-server:fix subflow

---
 .../dss/workflow/service/impl/DSSFlowServiceImpl.java       | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/service/impl/DSSFlowServiceImpl.java b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/service/impl/DSSFlowServiceImpl.java
index 244b080b1..28311e5f8 100644
--- a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/service/impl/DSSFlowServiceImpl.java
+++ b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/service/impl/DSSFlowServiceImpl.java
@@ -324,7 +324,11 @@ public String saveFlow(Long flowID,
         }
         saveFlowHook.afterSave(jsonFlow,dssFlow,parentFlowID);
         String version = bmlReturnMap.get("version").toString();
-        updateTOSaveStatus(dssFlow);
+        // 对子工作流无需更新状态
+        if (parentFlowID == null) {
+            updateTOSaveStatus(dssFlow);
+        }
+
         return version;
     }
 

From ed4d449e4915c2c7de0d4bea36509c71300899f3 Mon Sep 17 00:00:00 2001
From: Zhaobincai <747839893@qq.com>
Date: Mon, 3 Jun 2024 21:24:05 +0800
Subject: [PATCH 236/302] git-server:fix workspaceId

---
 .../git/service/impl/DSSGitWorkflowManagerServiceImpl.java  | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitWorkflowManagerServiceImpl.java b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitWorkflowManagerServiceImpl.java
index 64b3462a2..d06ac54e0 100644
--- a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitWorkflowManagerServiceImpl.java
+++ b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitWorkflowManagerServiceImpl.java
@@ -127,8 +127,8 @@ public GitCommitResponse commit(GitCommitRequest request) throws DSSErrorExcepti
     @Override
     public GitSearchResponse search(GitSearchRequest request) {
         String gitDir = DSSGitUtils.generateGitPath(request.getProjectName(), request.getWorkspaceId());
-        String gitPathPre = DSSGitConstant.GIT_PATH_PRE;
-        String workTree = gitPathPre + request.getWorkspaceId() + File.separator + request.getProjectName() ;
+        String gitPathPre = DSSGitConstant.GIT_PATH_PRE + request.getWorkspaceId() + File.separator;
+        String workTree = gitPathPre + request.getProjectName() ;
         List<String> gitCommands = new ArrayList<>(Arrays.asList(
                 "git", "--git-dir=" + gitDir, "--work-tree=" + workTree, "grep", "-l", request.getSearchContent()
         ));
@@ -223,7 +223,7 @@ public GitSearchResponse search(GitSearchRequest request) {
         List<String> subList = new ArrayList<>(fileList.subList(start, end));
         List<String> filePathList = new ArrayList<>();
         for (String file : subList) {
-            filePathList.add(gitPathPre + request.getWorkspaceId() + File.separator +request.getProjectName() + File.separator + file);
+            filePathList.add(gitPathPre + request.getProjectName() + File.separator + file);
         }
 
 

From e4a5d21eaa02c8155f3e2263dcf57d78d4faf0b4 Mon Sep 17 00:00:00 2001
From: Zhaobincai <747839893@qq.com>
Date: Tue, 4 Jun 2024 10:02:23 +0800
Subject: [PATCH 237/302] git-server:fix search

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index f7c4f040b..9dd3b39cd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -42,7 +42,7 @@
 
     <properties>
         <dss.version>1.5.0-SNAPSHOT</dss.version>
-        <linkis.version>1.3.0-wds-SNAPSHOT</linkis.version>
+        <linkis.version>1.4.0</linkis.version>
         <scala.version>2.11.12</scala.version>
         <jdk.compile.version>1.8</jdk.compile.version>
         <maven.version>3.3.3</maven.version>

From 388b4507c025881a997a44d354f340e42bd75041 Mon Sep 17 00:00:00 2001
From: v_xuanzhou <zhouxuannihao@qq.com>
Date: Tue, 4 Jun 2024 10:09:32 +0800
Subject: [PATCH 238/302] dss-server:fix DepartmentUserTreeVo add Construction

---
 .../bean/vo/DepartmentUserTreeVo.java         |  6 ++
 .../impl/DSSWorkspaceUserServiceImpl.java     | 63 +++++++------------
 2 files changed, 30 insertions(+), 39 deletions(-)

diff --git a/dss-framework/dss-framework-workspace-server/src/main/java/com/webank/wedatasphere/dss/framework/workspace/bean/vo/DepartmentUserTreeVo.java b/dss-framework/dss-framework-workspace-server/src/main/java/com/webank/wedatasphere/dss/framework/workspace/bean/vo/DepartmentUserTreeVo.java
index 54546c43d..0009cbd3f 100644
--- a/dss-framework/dss-framework-workspace-server/src/main/java/com/webank/wedatasphere/dss/framework/workspace/bean/vo/DepartmentUserTreeVo.java
+++ b/dss-framework/dss-framework-workspace-server/src/main/java/com/webank/wedatasphere/dss/framework/workspace/bean/vo/DepartmentUserTreeVo.java
@@ -13,4 +13,10 @@ public class DepartmentUserTreeVo implements Serializable {
     private String type;
     private List<DepartmentUserTreeVo> child;
 
+    public DepartmentUserTreeVo(Integer id, String name, String type, List<DepartmentUserTreeVo> child){
+        this.id = id;
+        this.name = name;
+        this.type = type;
+        this.child = child;
+    }
 }
diff --git a/dss-framework/dss-framework-workspace-server/src/main/java/com/webank/wedatasphere/dss/framework/workspace/service/impl/DSSWorkspaceUserServiceImpl.java b/dss-framework/dss-framework-workspace-server/src/main/java/com/webank/wedatasphere/dss/framework/workspace/service/impl/DSSWorkspaceUserServiceImpl.java
index a04cfb432..79e7d7371 100644
--- a/dss-framework/dss-framework-workspace-server/src/main/java/com/webank/wedatasphere/dss/framework/workspace/service/impl/DSSWorkspaceUserServiceImpl.java
+++ b/dss-framework/dss-framework-workspace-server/src/main/java/com/webank/wedatasphere/dss/framework/workspace/service/impl/DSSWorkspaceUserServiceImpl.java
@@ -77,7 +77,7 @@ public void addWorkspaceUser(List<Integer> roleIds, long workspaceId, String use
         for (Integer roleId : roleIds) {
             dssWorkspaceUserMapper.insertUserRoleInWorkspace((int) workspaceId, roleId, new Date(), userName, creator, userId == null ? null : Long.parseLong(userId), creator);
         }
-        dssWorkspaceAddUserHook.afterAdd(userName,workspaceId);
+        dssWorkspaceAddUserHook.afterAdd(userName, workspaceId);
     }
 
     @Override
@@ -86,7 +86,7 @@ public void updateWorkspaceUser(List<Integer> roles, long workspaceId, String us
         //获取用户创建时间
         DSSWorkspaceUser workspaceUsers = dssWorkspaceUserMapper.getWorkspaceUsers(String.valueOf(workspaceId), userName, null).stream().findFirst().get();
         dssWorkspaceUserMapper.removeAllRolesForUser(userName, workspaceId);
-        roles.forEach(role ->{
+        roles.forEach(role -> {
             dssWorkspaceUserMapper.insertUserRoleInWorkspace(workspaceId, role, workspaceUsers.getJoinTime(), userName, workspaceUsers.getCreator(), 0L, creator);
         });
     }
@@ -104,16 +104,16 @@ public List<StaffInfoVO> listAllDSSUsers() {
         return staffInfos.stream().map(this::staffToDSSUser).collect(Collectors.toList());
     }
 
-    private StaffInfoVO staffToDSSUser(StaffInfo staffInfo){
+    private StaffInfoVO staffToDSSUser(StaffInfo staffInfo) {
         StaffInfoVO staffInfoVO = new StaffInfoVO();
         String orgFullName = staffInfo.getOrgFullName();
-        if (StringUtils.isNotEmpty(orgFullName)){
-            try{
+        if (StringUtils.isNotEmpty(orgFullName)) {
+            try {
                 String departmentName = orgFullName.split(WorkspaceServerConstant.DEFAULT_STAFF_SPLIT)[0];
                 String officeName = orgFullName.split(WorkspaceServerConstant.DEFAULT_STAFF_SPLIT)[1];
                 staffInfoVO.setDepartment(departmentName);
                 staffInfoVO.setOffice(officeName);
-            }catch(Exception e){
+            } catch (Exception e) {
                 //LOGGER.warn("fail to get department and office {} ", e.getMessage());
                 staffInfoVO.setDepartment(WorkspaceServerConstant.DEFAULT_DEPARTMENT);
                 staffInfoVO.setOffice(WorkspaceServerConstant.DEFAULT_OFFICE);
@@ -132,40 +132,25 @@ public List<String> getAllWorkspaceUsers(long workspaceId) {
     @Override
     public List<DepartmentUserTreeVo> getAllWorkspaceUsersDepartment(long workspaceId) {
         List<DepartmentUserVo> userList = dssWorkspaceUserMapper.getAllWorkspaceUsers(workspaceId).stream().map(
-                        workspaceUser -> changeToUserVO(workspaceUser))
+                        this::changeToUserVO)
                 .collect(Collectors.toList());
         return structureVo2Tree(userList);
     }
 
     private List<DepartmentUserTreeVo> structureVo2Tree(List<DepartmentUserVo> userList) {
-      AtomicReference<Integer> id = new AtomicReference<>(0);
-      Map<String, Map<String, List<DepartmentUserTreeVo>>> userMap = userList.stream().collect(Collectors.groupingBy(DepartmentUserVo::getDepartment,
-                Collectors.groupingBy(DepartmentUserVo::getOffice, Collectors.mapping(user->{
-                    DepartmentUserTreeVo treeNode = new DepartmentUserTreeVo();
-                    treeNode.setId(id.getAndSet(id.get() + 1));
-                    treeNode.setName(user.getName());
-                    treeNode.setType(NODE_TYPE_USER);
-                    return treeNode;
-                }, Collectors.toList()))));
-        return userMap.keySet().stream().map(key->{
-            DepartmentUserTreeVo treeNode = new DepartmentUserTreeVo();
-            treeNode.setId(id.getAndSet(id.get() + 1));
-            treeNode.setName(key);
-            treeNode.setType(NODE_TYPE_DEPARTMENT);
-            treeNode.setChild(buildTree4Office(userMap.get(key),id));
-            return treeNode;
-        }).collect(Collectors.toList());
-    }
-
-    private List<DepartmentUserTreeVo> buildTree4Office(Map<String,List<DepartmentUserTreeVo>> officeMap,AtomicReference<Integer> id){
-        return officeMap.keySet().stream().map(key->{
-            DepartmentUserTreeVo treeNode = new DepartmentUserTreeVo();
-            treeNode.setId(id.getAndSet(id.get() + 1));
-            treeNode.setName(key);
-            treeNode.setType(NODE_TYPE_OFFICE);
-            treeNode.setChild(officeMap.get(key));
-            return treeNode;
-        }).collect(Collectors.toList());
+        AtomicReference<Integer> id = new AtomicReference<>(0);
+        Map<String, Map<String, List<DepartmentUserTreeVo>>> userMap = userList.stream().collect(Collectors.groupingBy(DepartmentUserVo::getDepartment,
+                Collectors.groupingBy(DepartmentUserVo::getOffice, Collectors.mapping(user ->
+                        new DepartmentUserTreeVo(id.getAndSet(id.get() + 1), user.getName(), NODE_TYPE_USER, null), Collectors.toList()))));
+        return userMap.keySet().stream().map(key ->
+                new DepartmentUserTreeVo(id.getAndSet(id.get() + 1), key, NODE_TYPE_DEPARTMENT, buildTree4Office(userMap.get(key), id))
+        ).collect(Collectors.toList());
+    }
+
+    private List<DepartmentUserTreeVo> buildTree4Office(Map<String, List<DepartmentUserTreeVo>> officeMap, AtomicReference<Integer> id) {
+        return officeMap.keySet().stream().map(key ->
+                new DepartmentUserTreeVo(id.getAndSet(id.get() + 1), key, NODE_TYPE_OFFICE, officeMap.get(key))
+        ).collect(Collectors.toList());
     }
 
     private DepartmentUserVo changeToUserVO(String userName) {
@@ -189,8 +174,8 @@ private DepartmentUserVo changeToUserVO(String userName) {
 
     @Override
     public PageInfo<String> getAllWorkspaceUsersPage(long workspaceId, Integer pageNow, Integer pageSize) {
-        PageHelper.startPage(pageNow,pageSize);
-        List<String> dos= dssWorkspaceUserMapper.getAllWorkspaceUsers(workspaceId);
+        PageHelper.startPage(pageNow, pageSize);
+        List<String> dos = dssWorkspaceUserMapper.getAllWorkspaceUsers(workspaceId);
         com.github.pagehelper.PageInfo<String> doPage = new com.github.pagehelper.PageInfo<>(dos);
         return new PageInfo<>(doPage.getList(), doPage.getTotal());
     }
@@ -212,8 +197,8 @@ public List<String> getWorkspaceReleaseUsers(int workspaceId) {
     }
 
     @Override
-    public Long getCountByUsername(String username,int workspaceId){
-        return dssWorkspaceUserMapper.getCountByUsername(username,workspaceId);
+    public Long getCountByUsername(String username, int workspaceId) {
+        return dssWorkspaceUserMapper.getCountByUsername(username, workspaceId);
     }
 
     @Override

From 756a3fd9a9ca8d2ed5b9fcbac1a3885d745eda50 Mon Sep 17 00:00:00 2001
From: Zhaobincai <747839893@qq.com>
Date: Tue, 4 Jun 2024 10:15:30 +0800
Subject: [PATCH 239/302] git-server:fix search

---
 .../service/impl/DSSGitWorkflowManagerServiceImpl.java | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitWorkflowManagerServiceImpl.java b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitWorkflowManagerServiceImpl.java
index d06ac54e0..7c0680ae4 100644
--- a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitWorkflowManagerServiceImpl.java
+++ b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitWorkflowManagerServiceImpl.java
@@ -130,7 +130,7 @@ public GitSearchResponse search(GitSearchRequest request) {
         String gitPathPre = DSSGitConstant.GIT_PATH_PRE + request.getWorkspaceId() + File.separator;
         String workTree = gitPathPre + request.getProjectName() ;
         List<String> gitCommands = new ArrayList<>(Arrays.asList(
-                "git", "--git-dir=" + gitDir, "--work-tree=" + workTree, "grep", "-l", request.getSearchContent()
+                "git", "--git-dir=" + gitDir, "--work-tree=" + workTree, "grep", "-F", "-l", request.getSearchContent()
         ));
         List<String> workflowNode = request.getWorkflowNameList();
         String fileName = request.getNodeName();
@@ -138,7 +138,7 @@ public GitSearchResponse search(GitSearchRequest request) {
         List<String> path = new ArrayList<>();
         if (!CollectionUtils.isEmpty(workflowNode)) {
             if (!StringUtils.isEmpty(fileName)) {
-                workflowNode = workflowNode.stream().map(s -> s + "/*" + fileName + "*").collect(Collectors.toList());
+                workflowNode = workflowNode.stream().map(s -> s + "*" + fileName + "*").collect(Collectors.toList());
                 if (!CollectionUtils.isEmpty(typeList)) {
                     for (String workflow : workflowNode) {
                         for (String type : typeList) {
@@ -160,10 +160,10 @@ public GitSearchResponse search(GitSearchRequest request) {
         }else if (!StringUtils.isEmpty(fileName)) {
             if (!CollectionUtils.isEmpty(typeList)) {
                 for (String type : typeList) {
-                    path.add("/*" + fileName + "*/." + type);
+                    path.add("*" + fileName + "*/." + type);
                 }
             }else {
-                path.add("/*" + fileName + "*");
+                path.add("*" + fileName + "*");
             }
         }else if (!CollectionUtils.isEmpty(typeList)) {
             for (String type : typeList) {
@@ -229,7 +229,7 @@ public GitSearchResponse search(GitSearchRequest request) {
 
 
         List<String> gitBaseCommand = new ArrayList<>(Arrays.asList(
-                "git", "--git-dir=" + gitDir, "--work-tree=" + workTree, "grep", "-n", request.getSearchContent()
+                "git", "--git-dir=" + gitDir, "--work-tree=" + workTree, "grep", "-F", "-n", request.getSearchContent()
         ));
 
 

From 75d785cc28252c5c12ebc29815472ba6e28a56dc Mon Sep 17 00:00:00 2001
From: Zhaobincai <747839893@qq.com>
Date: Tue, 4 Jun 2024 11:36:35 +0800
Subject: [PATCH 240/302] dss-server:fix rollback

---
 .../entity/vo/OrchestratorRollBackGitVo.java  | 43 +++++++++++++
 .../DSSFrameworkOrchestratorRestful.java      | 10 ++-
 .../server/service/OrchestratorService.java   |  7 ++-
 .../service/impl/OrchestratorServiceImpl.java | 62 +++++++++++++------
 pom.xml                                       |  2 +-
 5 files changed, 99 insertions(+), 25 deletions(-)
 create mode 100644 dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/entity/vo/OrchestratorRollBackGitVo.java

diff --git a/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/entity/vo/OrchestratorRollBackGitVo.java b/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/entity/vo/OrchestratorRollBackGitVo.java
new file mode 100644
index 000000000..d78a0826c
--- /dev/null
+++ b/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/entity/vo/OrchestratorRollBackGitVo.java
@@ -0,0 +1,43 @@
+package com.webank.wedatasphere.dss.orchestrator.server.entity.vo;
+
+import com.webank.wedatasphere.dss.orchestrator.common.entity.DSSOrchestratorInfo;
+import com.webank.wedatasphere.dss.orchestrator.common.entity.DSSOrchestratorVersion;
+
+public class OrchestratorRollBackGitVo {
+    private DSSOrchestratorVersion oldOrcVersion;
+    private DSSOrchestratorVersion dssOrchestratorVersion;
+    private DSSOrchestratorInfo dssOrchestratorInfo;
+    private String version;
+
+    public DSSOrchestratorVersion getOldOrcVersion() {
+        return oldOrcVersion;
+    }
+
+    public void setOldOrcVersion(DSSOrchestratorVersion oldOrcVersion) {
+        this.oldOrcVersion = oldOrcVersion;
+    }
+
+    public DSSOrchestratorVersion getDssOrchestratorVersion() {
+        return dssOrchestratorVersion;
+    }
+
+    public void setDssOrchestratorVersion(DSSOrchestratorVersion dssOrchestratorVersion) {
+        this.dssOrchestratorVersion = dssOrchestratorVersion;
+    }
+
+    public DSSOrchestratorInfo getDssOrchestratorInfo() {
+        return dssOrchestratorInfo;
+    }
+
+    public void setDssOrchestratorInfo(DSSOrchestratorInfo dssOrchestratorInfo) {
+        this.dssOrchestratorInfo = dssOrchestratorInfo;
+    }
+
+    public String getVersion() {
+        return version;
+    }
+
+    public void setVersion(String version) {
+        this.version = version;
+    }
+}
diff --git a/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/restful/DSSFrameworkOrchestratorRestful.java b/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/restful/DSSFrameworkOrchestratorRestful.java
index db3193aa9..96e478d8d 100644
--- a/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/restful/DSSFrameworkOrchestratorRestful.java
+++ b/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/restful/DSSFrameworkOrchestratorRestful.java
@@ -39,6 +39,7 @@
 import com.webank.wedatasphere.dss.orchestrator.server.entity.request.*;
 import com.webank.wedatasphere.dss.orchestrator.server.entity.vo.CommonOrchestratorVo;
 import com.webank.wedatasphere.dss.orchestrator.server.entity.vo.OrchestratorCopyHistory;
+import com.webank.wedatasphere.dss.orchestrator.server.entity.vo.OrchestratorRollBackGitVo;
 import com.webank.wedatasphere.dss.orchestrator.server.entity.vo.OrchestratorUnlockVo;
 import com.webank.wedatasphere.dss.orchestrator.server.service.OrchestratorFrameworkService;
 import com.webank.wedatasphere.dss.orchestrator.server.service.OrchestratorPluginService;
@@ -253,8 +254,13 @@ public Message rollbackOrchestrator(HttpServletRequest request, @RequestBody Rol
         LabelRouteVO labels = rollbackOrchestratorRequest.getLabels();
         try {
             LOGGER.info("user {} begin to rollbackOrchestrator, params:{}", username, rollbackOrchestratorRequest);
-            String newVersion = orchestratorService.rollbackOrchestrator(username, projectId, projectName, orchestratorId, version, labels, workspace);
-            Message message = Message.ok("回滚版本成功").data("newVersion", newVersion);
+            OrchestratorRollBackGitVo rollbackOrchestrator = orchestratorService.rollbackOrchestrator(username, projectId, projectName, orchestratorId, version, labels, workspace);
+            try {
+                orchestratorService.rollbackOrchestratorGit(rollbackOrchestrator, username, projectId, projectName, orchestratorId, labels, workspace);
+            } catch (Exception e) {
+                return Message.ok("回滚版本成功,git回滚失败，请重新保存并提交工作流").data("newVersion", rollbackOrchestrator.getVersion());
+            }
+            Message message = Message.ok("回滚版本成功").data("newVersion", rollbackOrchestrator.getVersion());
             return message;
         } catch (final Throwable t) {
             LOGGER.error("Failed to rollback orchestrator for user {} orchestratorId {}, projectId {} version {}",
diff --git a/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/OrchestratorService.java b/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/OrchestratorService.java
index 39baeac40..c817df62f 100644
--- a/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/OrchestratorService.java
+++ b/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/OrchestratorService.java
@@ -31,6 +31,7 @@
 import com.webank.wedatasphere.dss.orchestrator.server.entity.request.OrchestratorModifyRequest;
 import com.webank.wedatasphere.dss.orchestrator.server.entity.request.OrchestratorRequest;
 import com.webank.wedatasphere.dss.orchestrator.server.entity.vo.OrchestratorBaseInfo;
+import com.webank.wedatasphere.dss.orchestrator.server.entity.vo.OrchestratorRollBackGitVo;
 import com.webank.wedatasphere.dss.orchestrator.server.entity.vo.OrchestratorUnlockVo;
 import com.webank.wedatasphere.dss.standard.app.sso.Workspace;
 
@@ -129,9 +130,11 @@ OrchestratorUnlockVo unlockOrchestrator(String userName,
 
     List<DSSOrchestratorVersion> getOrchestratorVersions(String username, Long projectId, Long orchestratorId);
 
-    String rollbackOrchestrator(String username, Long projectId, String projectName,
-                                Long orchestratorId, String version, LabelRouteVO labels, Workspace workspace) throws Exception;
+    OrchestratorRollBackGitVo rollbackOrchestrator(String username, Long projectId, String projectName,
+                                                   Long orchestratorId, String version, LabelRouteVO labels, Workspace workspace) throws Exception;
 
+    void rollbackOrchestratorGit(OrchestratorRollBackGitVo rollBackGitVo, String userName, Long projectId, String projectName,
+                                 Long orchestratorId, LabelRouteVO labels, Workspace workspace) throws Exception;
     //**** new method
     void isExistSameNameBeforeCreate(Long workspaceId, Long projectId, String orchestratorName) throws DSSFrameworkErrorException;
 
diff --git a/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/impl/OrchestratorServiceImpl.java b/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/impl/OrchestratorServiceImpl.java
index 12c8262b7..afe9a12c3 100644
--- a/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/impl/OrchestratorServiceImpl.java
+++ b/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/impl/OrchestratorServiceImpl.java
@@ -57,6 +57,7 @@
 import com.webank.wedatasphere.dss.orchestrator.server.entity.request.OrchestratorRequest;
 import com.webank.wedatasphere.dss.orchestrator.server.entity.request.OrchestratorSubmitRequest;
 import com.webank.wedatasphere.dss.orchestrator.server.entity.vo.OrchestratorBaseInfo;
+import com.webank.wedatasphere.dss.orchestrator.server.entity.vo.OrchestratorRollBackGitVo;
 import com.webank.wedatasphere.dss.orchestrator.server.entity.vo.OrchestratorUnlockVo;
 import com.webank.wedatasphere.dss.orchestrator.server.service.OrchestratorPluginService;
 import com.webank.wedatasphere.dss.orchestrator.server.service.OrchestratorService;
@@ -73,6 +74,7 @@
 import com.webank.wedatasphere.dss.standard.common.exception.operation.ExternalOperationWarnException;
 import com.webank.wedatasphere.dss.workflow.common.protocol.*;
 import com.webank.wedatasphere.dss.workflow.dao.LockMapper;
+import com.webank.wedatasphere.dss.workflow.lock.DSSFlowEditLockManager;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.linkis.cs.client.ContextClient;
 import org.apache.linkis.cs.client.builder.ContextClientFactory;
@@ -365,7 +367,7 @@ public List<DSSOrchestratorVersion> getOrchestratorVersions(String username, Lon
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public String rollbackOrchestrator(String userName, Long projectId, String projectName,
+    public OrchestratorRollBackGitVo rollbackOrchestrator(String userName, Long projectId, String projectName,
                                        Long orchestratorId, String version, LabelRouteVO labels, Workspace workspace) throws Exception {
         //1.新建一个版本
         //2.然后将version的版本内容进行去workflow进行cp
@@ -415,28 +417,48 @@ public String rollbackOrchestrator(String userName, Long projectId, String proje
         addOrchestratorVersionHook.afterAdd(dssOrchestratorVersion, Collections.singletonMap(OrchestratorRefConstant.ORCHESTRATION_FLOWID_PARAMCONF_TEMPLATEID_TUPLES_KEY,paramConfTemplateIds));
 //        synProjectOrchestratorVersionId(dssOrchestratorVersion, labels);
 
-        try {
-            Sender sender = DSSSenderServiceFactory.getOrCreateServiceInstance().getGitSender();
-            //若之前版本未进行git回滚，则自动提交回滚后的工作流至git
-            if (StringUtils.isEmpty(oldOrcVersion.getCommitId())) {
-                OrchestratorSubmitRequest submitRequest = new OrchestratorSubmitRequest();
-                submitRequest.setFlowId(dssOrchestratorVersion.getAppId());
-                submitRequest.setOrchestratorId(dssOrchestratorVersion.getOrchestratorId());
-                submitRequest.setProjectName(projectName);
-                submitRequest.setLabels(labels);
-                submitRequest.setComment("rollback workflow: " + dssOrchestratorInfo.getName());
-                orchestratorPluginService.submitFlow(submitRequest, userName, workspace);
-            } else {
-                GitRevertRequest gitRevertRequest = new GitRevertRequest(workspace.getWorkspaceId(), projectName, oldOrcVersion.getCommitId(), dssOrchestratorInfo.getName(), "system");
-                RpcAskUtils.processAskException(sender.ask(gitRevertRequest), GitCommitResponse.class, GitRevertRequest.class);
+        OrchestratorRollBackGitVo rollBackGitVo =new OrchestratorRollBackGitVo();
+        rollBackGitVo.setOldOrcVersion(oldOrcVersion);
+        rollBackGitVo.setDssOrchestratorInfo(dssOrchestratorInfo);
+        rollBackGitVo.setDssOrchestratorVersion(dssOrchestratorVersion);
+        rollBackGitVo.setVersion(dssOrchestratorVersion.getVersion());
+
+        return rollBackGitVo;
+    }
+
+    @Override
+    public void rollbackOrchestratorGit(OrchestratorRollBackGitVo rollBackGitVo, String userName, Long projectId, String projectName,
+                                        Long orchestratorId, LabelRouteVO labels, Workspace workspace) throws Exception{
+        if (rollBackGitVo == null) {
+            return;
+        }
+        DSSOrchestratorVersion oldOrcVersion = rollBackGitVo.getOldOrcVersion();
+        DSSOrchestratorInfo dssOrchestratorInfo = rollBackGitVo.getDssOrchestratorInfo();
+        DSSOrchestratorVersion dssOrchestratorVersion = rollBackGitVo.getDssOrchestratorVersion();
+        DSSProject projectInfo = DSSFlowEditLockManager.getProjectInfo(projectId);
+        if (projectInfo.getAssociateGit() != null && projectInfo.getAssociateGit()) {
+            try {
+                Sender sender = DSSSenderServiceFactory.getOrCreateServiceInstance().getGitSender();
+                //若之前版本未进行git回滚，则自动提交回滚后的工作流至git
+                if (StringUtils.isEmpty(oldOrcVersion.getCommitId())) {
+                    OrchestratorSubmitRequest submitRequest = new OrchestratorSubmitRequest();
+                    submitRequest.setFlowId(dssOrchestratorVersion.getAppId());
+                    submitRequest.setOrchestratorId(dssOrchestratorVersion.getOrchestratorId());
+                    submitRequest.setProjectName(projectName);
+                    submitRequest.setLabels(labels);
+                    submitRequest.setComment("rollback workflow: " + dssOrchestratorInfo.getName());
+                    orchestratorPluginService.submitWorkflowToBML(submitRequest, userName, workspace);
+                } else {
+                    GitRevertRequest gitRevertRequest = new GitRevertRequest(workspace.getWorkspaceId(), projectName, oldOrcVersion.getCommitId(), dssOrchestratorInfo.getName(), "system");
+                    RpcAskUtils.processAskException(sender.ask(gitRevertRequest), GitCommitResponse.class, GitRevertRequest.class);
+                }
+                lockMapper.updateOrchestratorStatus(orchestratorId, OrchestratorRefConstant.FLOW_STATUS_PUBLISH);
+            } catch (Exception e) {
+                lockMapper.updateOrchestratorStatus(orchestratorId, OrchestratorRefConstant.FLOW_STATUS_SAVE);
+                throw e;
             }
-            lockMapper.updateOrchestratorStatus(orchestratorId, OrchestratorRefConstant.FLOW_STATUS_PUBLISH);
-        } catch (Exception e) {
-            LOGGER.error("git revert failed, the reason is :", e);
-            lockMapper.updateOrchestratorStatus(orchestratorId, OrchestratorRefConstant.FLOW_STATUS_SAVE);
         }
 
-        return dssOrchestratorVersion.getVersion();
     }
 
 
diff --git a/pom.xml b/pom.xml
index 9dd3b39cd..f7c4f040b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -42,7 +42,7 @@
 
     <properties>
         <dss.version>1.5.0-SNAPSHOT</dss.version>
-        <linkis.version>1.4.0</linkis.version>
+        <linkis.version>1.3.0-wds-SNAPSHOT</linkis.version>
         <scala.version>2.11.12</scala.version>
         <jdk.compile.version>1.8</jdk.compile.version>
         <maven.version>3.3.3</maven.version>

From b7f47306e9e7df06cdbbb028f4ca522a7f04af88 Mon Sep 17 00:00:00 2001
From: Zhaobincai <747839893@qq.com>
Date: Tue, 4 Jun 2024 21:48:38 +0800
Subject: [PATCH 241/302] dss-server:fix history

---
 .../impl/OrchestratorFrameworkServiceImpl.java       | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/impl/OrchestratorFrameworkServiceImpl.java b/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/impl/OrchestratorFrameworkServiceImpl.java
index 2d0cf49f8..97820a38a 100644
--- a/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/impl/OrchestratorFrameworkServiceImpl.java
+++ b/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/impl/OrchestratorFrameworkServiceImpl.java
@@ -471,8 +471,16 @@ public GitHistoryResponse getHistory(Long workspaceId, Long orchestratorId, Stri
             historyResponse = RpcAskUtils.processAskException(sender.ask(historyRequest), GitHistoryResponse.class, GitHistoryRequest.class);
         } else {
             GitCommitInfoBetweenRequest commitInfoBetweenRequest = new GitCommitInfoBetweenRequest();
-            commitInfoBetweenRequest.setNewCommitId(versionByOrchestratorId.get(0).getCommitId());
-            commitInfoBetweenRequest.setOldCommitId(versionByOrchestratorId.get(1).getCommitId());
+            String newCommitId = versionByOrchestratorId.get(0).getCommitId();
+            commitInfoBetweenRequest.setNewCommitId(newCommitId);
+            String oldCommitId = null;
+            for (DSSOrchestratorVersion version : versionByOrchestratorId) {
+                if (version.getCommitId()!= null && !version.getCommitId().equals(newCommitId)) {
+                    oldCommitId = version.getCommitId();
+                    break;
+                }
+            }
+            commitInfoBetweenRequest.setOldCommitId(oldCommitId);
             commitInfoBetweenRequest.setProjectName(projectName);
             commitInfoBetweenRequest.setDirName(workflowName);
             commitInfoBetweenRequest.setWorkspaceId(workspaceId);

From 0e83be2017c729267c0ddee4b449fd1e4cf594e6 Mon Sep 17 00:00:00 2001
From: Zhaobincai <747839893@qq.com>
Date: Tue, 4 Jun 2024 21:59:11 +0800
Subject: [PATCH 242/302] dss-server:fix rename

---
 .../git/service/impl/DSSGitWorkflowManagerServiceImpl.java | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitWorkflowManagerServiceImpl.java b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitWorkflowManagerServiceImpl.java
index 7c0680ae4..610ce4073 100644
--- a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitWorkflowManagerServiceImpl.java
+++ b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitWorkflowManagerServiceImpl.java
@@ -551,7 +551,12 @@ public GitCommitResponse rename(GitRenameRequest request) throws DSSErrorExcepti
             String comment = "rename workflowNode " + request.getName() + DSSGitConstant.GIT_USERNAME_FLAG + request.getUsername();
             // 提交前再次pull， 降低多节点同时提交不同工作流任务导致冲突频率
             DSSGitUtils.pull(repository, request.getProjectName(), gitUser);
-            List<String> paths = Arrays.asList(request.getName());
+            List<String> paths = new ArrayList<>();
+            paths.add(olfFilePath);
+            paths.add(oldFileMetaPath);
+
+            paths.add(filePath);
+            paths.add(fileMetaPath);
             DSSGitUtils.push(repository, request.getProjectName(), gitUser, comment, paths);
 
             commitResponse = DSSGitUtils.getCurrentCommit(repository);

From e15420645c1f675efdda3df44ffc757510ca51aa Mon Sep 17 00:00:00 2001
From: Zhaobincai <747839893@qq.com>
Date: Tue, 4 Jun 2024 22:02:40 +0800
Subject: [PATCH 243/302] dss-server:fix archive

---
 .../dss/git/service/impl/DSSGitProjectManagerServiceImpl.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitProjectManagerServiceImpl.java b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitProjectManagerServiceImpl.java
index bbddbf876..80cd5157f 100644
--- a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitProjectManagerServiceImpl.java
+++ b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitProjectManagerServiceImpl.java
@@ -88,7 +88,7 @@ public GitArchivePorjectResponse archive(GitArchiveProjectRequest request) throw
         DSSGitUtils.archive(request.getProjectName(), gitUser);
         // 删除本地项目
         DSSGitUtils.archiveLocal(request.getProjectName(), request.getWorkspaceId());
-        return null;
+        return new GitArchivePorjectResponse();
     }
 
     @Override

From 8c06b9cc61c429a20e0bd7c69be0e36ba39f219e Mon Sep 17 00:00:00 2001
From: Zhaobincai <747839893@qq.com>
Date: Wed, 5 Jun 2024 09:37:01 +0800
Subject: [PATCH 244/302] dss-server:fix rollback

---
 .../server/service/impl/OrchestratorServiceImpl.java           | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/impl/OrchestratorServiceImpl.java b/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/impl/OrchestratorServiceImpl.java
index afe9a12c3..4f9c77896 100644
--- a/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/impl/OrchestratorServiceImpl.java
+++ b/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/impl/OrchestratorServiceImpl.java
@@ -450,7 +450,8 @@ public void rollbackOrchestratorGit(OrchestratorRollBackGitVo rollBackGitVo, Str
                     orchestratorPluginService.submitWorkflowToBML(submitRequest, userName, workspace);
                 } else {
                     GitRevertRequest gitRevertRequest = new GitRevertRequest(workspace.getWorkspaceId(), projectName, oldOrcVersion.getCommitId(), dssOrchestratorInfo.getName(), "system");
-                    RpcAskUtils.processAskException(sender.ask(gitRevertRequest), GitCommitResponse.class, GitRevertRequest.class);
+                    GitCommitResponse gitCommitResponse = RpcAskUtils.processAskException(sender.ask(gitRevertRequest), GitCommitResponse.class, GitRevertRequest.class);
+                    lockMapper.updateOrchestratorVersionCommitId(gitCommitResponse.getCommitId(), dssOrchestratorVersion.getAppId());
                 }
                 lockMapper.updateOrchestratorStatus(orchestratorId, OrchestratorRefConstant.FLOW_STATUS_PUBLISH);
             } catch (Exception e) {

From a28ed5e5cc5f239848d6abc84caf4bf3ff068eee Mon Sep 17 00:00:00 2001
From: Zhaobincai <747839893@qq.com>
Date: Wed, 5 Jun 2024 09:59:44 +0800
Subject: [PATCH 245/302] dss-server:fix rollback2

---
 .../server/service/impl/OrchestratorServiceImpl.java             | 1 +
 1 file changed, 1 insertion(+)

diff --git a/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/impl/OrchestratorServiceImpl.java b/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/impl/OrchestratorServiceImpl.java
index 4f9c77896..5d8295b87 100644
--- a/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/impl/OrchestratorServiceImpl.java
+++ b/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/impl/OrchestratorServiceImpl.java
@@ -452,6 +452,7 @@ public void rollbackOrchestratorGit(OrchestratorRollBackGitVo rollBackGitVo, Str
                     GitRevertRequest gitRevertRequest = new GitRevertRequest(workspace.getWorkspaceId(), projectName, oldOrcVersion.getCommitId(), dssOrchestratorInfo.getName(), "system");
                     GitCommitResponse gitCommitResponse = RpcAskUtils.processAskException(sender.ask(gitRevertRequest), GitCommitResponse.class, GitRevertRequest.class);
                     lockMapper.updateOrchestratorVersionCommitId(gitCommitResponse.getCommitId(), dssOrchestratorVersion.getAppId());
+                    lockMapper.updateOrchestratorStatus(orchestratorId, OrchestratorRefConstant.FLOW_STATUS_PUSH);
                 }
                 lockMapper.updateOrchestratorStatus(orchestratorId, OrchestratorRefConstant.FLOW_STATUS_PUBLISH);
             } catch (Exception e) {

From c6e16f5b5913af44d7e2b1f25abf507798932f09 Mon Sep 17 00:00:00 2001
From: Zhaobincai <747839893@qq.com>
Date: Wed, 5 Jun 2024 10:39:16 +0800
Subject: [PATCH 246/302] dss-server:fix archive

---
 .../framework/project/service/impl/DSSProjectServiceImpl.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dss-framework/dss-framework-project-server/src/main/java/com/webank/wedatasphere/dss/framework/project/service/impl/DSSProjectServiceImpl.java b/dss-framework/dss-framework-project-server/src/main/java/com/webank/wedatasphere/dss/framework/project/service/impl/DSSProjectServiceImpl.java
index 05caf6ec9..bafa3bfe8 100644
--- a/dss-framework/dss-framework-project-server/src/main/java/com/webank/wedatasphere/dss/framework/project/service/impl/DSSProjectServiceImpl.java
+++ b/dss-framework/dss-framework-project-server/src/main/java/com/webank/wedatasphere/dss/framework/project/service/impl/DSSProjectServiceImpl.java
@@ -353,7 +353,7 @@ public void deleteProject(String username, ProjectDeleteRequest projectDeleteReq
     }
 
     private void archiveGitProject(String username, ProjectDeleteRequest projectDeleteRequest, Workspace workspace, DSSProjectDO dssProjectDO) {
-        if (dssProjectDO.getAssociateGit()) {
+        if ( dssProjectDO.getAssociateGit() != null && dssProjectDO.getAssociateGit()) {
             Sender gitSender = DSSSenderServiceFactory.getOrCreateServiceInstance().getGitSender();
             Map<String, BmlResource> file = new HashMap<>();
             // 测试数据 key表示项目名、value为项目BmlResource资源

From 2f98fbbc7b52605a51331a5f135b507aba3914d9 Mon Sep 17 00:00:00 2001
From: Zhaobincai <747839893@qq.com>
Date: Wed, 5 Jun 2024 10:52:29 +0800
Subject: [PATCH 247/302] dss-server:fix commit

---
 .../git/service/impl/DSSGitWorkflowManagerServiceImpl.java    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitWorkflowManagerServiceImpl.java b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitWorkflowManagerServiceImpl.java
index 610ce4073..92360a047 100644
--- a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitWorkflowManagerServiceImpl.java
+++ b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitWorkflowManagerServiceImpl.java
@@ -106,9 +106,9 @@ public GitCommitResponse commit(GitCommitRequest request) throws DSSErrorExcepti
                 FileUtils.downloadBMLResource(bmlService, entry.getKey(), entry.getValue(), request.getUsername(), workspaceId);
                 FileUtils.removeFlowNode(entry.getKey(), request.getProjectName(), workspaceId);
                 FileUtils.unzipBMLResource(entry.getKey(), workspaceId);
+                String metaConfPath = GitConstant.GIT_SERVER_META_PATH + File.separator + entry.getKey();
+                paths.add(metaConfPath);
             }
-            String metaConfPath = GitConstant.GIT_SERVER_META_PATH + File.separator + request.getProjectName();
-            paths.add(metaConfPath);
             paths.remove(GitConstant.GIT_SERVER_META_PATH );
             // 提交
             String comment = request.getComment() + DSSGitConstant.GIT_USERNAME_FLAG + request.getUsername();

From 65eca7839eba9f632dd51e4ad2fdaa1602a00bb3 Mon Sep 17 00:00:00 2001
From: Zhaobincai <747839893@qq.com>
Date: Wed, 5 Jun 2024 11:36:23 +0800
Subject: [PATCH 248/302] dss-server:fix commit

---
 .../dss/git/service/impl/DSSGitWorkflowManagerServiceImpl.java   | 1 -
 1 file changed, 1 deletion(-)

diff --git a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitWorkflowManagerServiceImpl.java b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitWorkflowManagerServiceImpl.java
index 92360a047..cbcaadf49 100644
--- a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitWorkflowManagerServiceImpl.java
+++ b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitWorkflowManagerServiceImpl.java
@@ -109,7 +109,6 @@ public GitCommitResponse commit(GitCommitRequest request) throws DSSErrorExcepti
                 String metaConfPath = GitConstant.GIT_SERVER_META_PATH + File.separator + entry.getKey();
                 paths.add(metaConfPath);
             }
-            paths.remove(GitConstant.GIT_SERVER_META_PATH );
             // 提交
             String comment = request.getComment() + DSSGitConstant.GIT_USERNAME_FLAG + request.getUsername();
             // 提交前再次pull， 降低多节点同时提交不同工作流任务导致冲突频率

From 140bd39c55124399ee98affd84804cde4ccb711b Mon Sep 17 00:00:00 2001
From: Zhaobincai <747839893@qq.com>
Date: Wed, 5 Jun 2024 11:49:24 +0800
Subject: [PATCH 249/302] dss-server:fix projectmeta

---
 .../project/service/impl/DSSFrameworkProjectServiceImpl.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dss-framework/dss-framework-project-server/src/main/java/com/webank/wedatasphere/dss/framework/project/service/impl/DSSFrameworkProjectServiceImpl.java b/dss-framework/dss-framework-project-server/src/main/java/com/webank/wedatasphere/dss/framework/project/service/impl/DSSFrameworkProjectServiceImpl.java
index 750b6e696..6ecdd9b83 100644
--- a/dss-framework/dss-framework-project-server/src/main/java/com/webank/wedatasphere/dss/framework/project/service/impl/DSSFrameworkProjectServiceImpl.java
+++ b/dss-framework/dss-framework-project-server/src/main/java/com/webank/wedatasphere/dss/framework/project/service/impl/DSSFrameworkProjectServiceImpl.java
@@ -227,7 +227,7 @@ private void updateProject(Long workspaceId, String projectName,BmlResource bmlR
         Sender gitSender = DSSSenderServiceFactory.getOrCreateServiceInstance().getGitSender();
         Map<String, BmlResource> file = new HashMap<>();
         // 测试数据 key表示项目名、value为项目BmlResource资源
-        file.put(GitConstant.GIT_SERVER_META_PATH , bmlResource);
+        file.put(".projectmeta", bmlResource);
         GitCommitRequest request1 = new GitCommitRequest(workspaceId, projectName, file, "update Project", username);
         LOGGER.info("-------=======================begin to update project: {}=======================-------", projectName);
         GitCommitResponse responseWorkflowValidNode = RpcAskUtils.processAskException(gitSender.ask(request1), GitCommitResponse.class, GitCommitRequest.class);

From 2574201b3dced9d46ec61e948b32a805e088cd59 Mon Sep 17 00:00:00 2001
From: Zhaobincai <747839893@qq.com>
Date: Wed, 5 Jun 2024 14:24:07 +0800
Subject: [PATCH 250/302] dss-server:fix rename

---
 .../DSSGitWorkflowManagerServiceImpl.java     | 20 ++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitWorkflowManagerServiceImpl.java b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitWorkflowManagerServiceImpl.java
index cbcaadf49..8a977e457 100644
--- a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitWorkflowManagerServiceImpl.java
+++ b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitWorkflowManagerServiceImpl.java
@@ -533,12 +533,14 @@ public GitCommitResponse rename(GitRenameRequest request) throws DSSErrorExcepti
         File repoDir = new File(gitPath);
         try (Repository repository = getRepository(repoDir, request.getProjectName(), gitUser)){
             // 同步删除对应节点 eg: /data/GitInstall/224/testGit/flowGitOld -> /data/GitInstall/224/testGit/flowGitNew
-            String projectPath = generateProjectPath(request.getWorkspaceId(), request.getProjectName());
-            String olfFilePath = projectPath + File.separator + FileUtils.normalizePath(request.getOldName());
-            String filePath = projectPath + File.separator + FileUtils.normalizePath(request.getName());
+            String projectPath = generateProjectPath(request.getWorkspaceId(), request.getProjectName()) + File.separator;
+            String olfFilePath = projectPath + FileUtils.normalizePath(request.getOldName());
+            String filePath = projectPath + FileUtils.normalizePath(request.getName());
             // 同步删除对应节点 eg: /data/GitInstall/224/testGit/.metaConf/flowGitOld -> /data/GitInstall/224/testGit/.metaConf/flowGitNew
-            String oldFileMetaPath = projectPath + File.separator + FileUtils.normalizePath(GitConstant.GIT_SERVER_META_PATH) + File.separator + FileUtils.normalizePath(request.getOldName());
-            String fileMetaPath = projectPath + File.separator + FileUtils.normalizePath(GitConstant.GIT_SERVER_META_PATH) + File.separator + FileUtils.normalizePath(request.getName());
+            String metaPath = FileUtils.normalizePath(GitConstant.GIT_SERVER_META_PATH) + File.separator + FileUtils.normalizePath(request.getOldName());
+            String oldFileMetaPath = projectPath  + metaPath;
+            String oldMetaPath = FileUtils.normalizePath(GitConstant.GIT_SERVER_META_PATH) + File.separator + FileUtils.normalizePath(request.getName());
+            String fileMetaPath = projectPath + oldMetaPath;
             List<String> fileList = new ArrayList<>();
             fileList.add(oldFileMetaPath);
             fileList.add(olfFilePath);
@@ -551,11 +553,11 @@ public GitCommitResponse rename(GitRenameRequest request) throws DSSErrorExcepti
             // 提交前再次pull， 降低多节点同时提交不同工作流任务导致冲突频率
             DSSGitUtils.pull(repository, request.getProjectName(), gitUser);
             List<String> paths = new ArrayList<>();
-            paths.add(olfFilePath);
-            paths.add(oldFileMetaPath);
+            paths.add(FileUtils.normalizePath(request.getOldName()));
+            paths.add(FileUtils.normalizePath(request.getName()));
 
-            paths.add(filePath);
-            paths.add(fileMetaPath);
+            paths.add(metaPath);
+            paths.add(oldMetaPath);
             DSSGitUtils.push(repository, request.getProjectName(), gitUser, comment, paths);
 
             commitResponse = DSSGitUtils.getCurrentCommit(repository);

From ea06200b14213c1ec2fcc2ed477764a2db3a6cc6 Mon Sep 17 00:00:00 2001
From: Zhaobincai <747839893@qq.com>
Date: Wed, 5 Jun 2024 17:57:06 +0800
Subject: [PATCH 251/302] dss-server:fix export

---
 .../DSSGitWorkflowManagerServiceImpl.java     |  2 +-
 .../dss/workflow/DefaultWorkFlowManager.java  |  4 ++--
 .../impl/WorkFlowExportServiceImpl.java       | 20 ++++++++++---------
 3 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitWorkflowManagerServiceImpl.java b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitWorkflowManagerServiceImpl.java
index 8a977e457..b10d1f927 100644
--- a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitWorkflowManagerServiceImpl.java
+++ b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitWorkflowManagerServiceImpl.java
@@ -475,7 +475,7 @@ public GitCommitResponse gitCheckOut(GitRevertRequest request) throws DSSErrorEx
             if (CollectionUtils.isEmpty(latestCommit)) {
                 logger.error("get latestCommit failed, the reason is null");
             } else {
-                return commitResponse;
+                return latestCommit.get(0);
             }
 
         } catch (Exception e) {
diff --git a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/DefaultWorkFlowManager.java b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/DefaultWorkFlowManager.java
index 1566ccd48..726e82831 100644
--- a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/DefaultWorkFlowManager.java
+++ b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/DefaultWorkFlowManager.java
@@ -261,8 +261,8 @@ public List<DSSFlow> importWorkflowNew(String userName,
         //这里其实只会有1个元素
         List<DSSFlow> rootFlows = dwsFlowRelationList.stream().filter(DSSFlow::getRootFlow).collect(Collectors.toList());
         for (DSSFlow rootFlow : rootFlows) {
-            String flowCodePath0=IoUtils.addFileSeparator(projectPath,  rootFlow.getName());
-            String flowMetaPath0=IoUtils.addFileSeparator(projectPath, FLOW_META_DIRECTORY_NAME, rootFlow.getName());
+            String flowCodePath0=IoUtils.addFileSeparator(projectPath,  flowName);
+            String flowMetaPath0=IoUtils.addFileSeparator(projectPath, FLOW_META_DIRECTORY_NAME, flowName);
             workFlowInputService.inputWorkFlowNew(dssFlowImportParam.getUserName(),
                     rootFlow,
                     projectName,
diff --git a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/io/export/impl/WorkFlowExportServiceImpl.java b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/io/export/impl/WorkFlowExportServiceImpl.java
index 301ef223d..27629ba00 100644
--- a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/io/export/impl/WorkFlowExportServiceImpl.java
+++ b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/io/export/impl/WorkFlowExportServiceImpl.java
@@ -31,6 +31,7 @@
 import com.webank.wedatasphere.dss.common.utils.IoUtils;
 import com.webank.wedatasphere.dss.common.utils.RpcAskUtils;
 import com.webank.wedatasphere.dss.common.utils.ZipHelper;
+import com.webank.wedatasphere.dss.orchestrator.common.entity.DSSOrchestratorInfo;
 import com.webank.wedatasphere.dss.orchestrator.common.entity.OrchestratorVo;
 import com.webank.wedatasphere.dss.orchestrator.common.protocol.RequestOrchestratorInfos;
 import com.webank.wedatasphere.dss.orchestrator.common.protocol.RequestQuertByAppIdOrchestrator;
@@ -119,27 +120,28 @@ public String exportFlowInfoNew(Long dssProjectId, String projectName, long root
         //生成rootflow及所有子flow的Relations
         List<Long> flowIds = dssFlowList.stream().map(DSSFlow::getId).collect(Collectors.toList());
         List<DSSFlowRelation> flowRelations = flowIds.isEmpty() ? new ArrayList<>() : flowMapper.listFlowRelation(flowIds);
-        // 生成rootflow orchestrator信息
-        OrchestratorVo orchestratorVo = RpcAskUtils.processAskException(getOrchestratorSender().ask(new RequestQuertByAppIdOrchestrator(rootFlowId)),
-                OrchestratorVo.class, RequestQueryByIdOrchestrator.class);
         // /appcom/tmp/dss/yyyyMMddHHmmssSSS/projectxxx
         String projectPath = IoUtils.generateProjectIOPath(userName, projectName);
         // /appcom/tmp/dss/yyyyMMddHHmmssSSS/projectxxx/.flowmeta/flow_all_type_node/
-        String flowMetaPath = IoUtils.generateFlowMetaIOPath(projectPath, rootFlow.getName());
-        metaExportService.exportFlowBaseInfoNew(orchestratorVo, dssFlowList, flowRelations, flowMetaPath);
-        logger.info(userName + "-开始导出Flow：" + rootFlow.getName());
         List<DSSFlow> dssFlows = new ArrayList<>();
         for (DSSFlow dssFlow : dssFlowList) {
             if (dssFlow.getRootFlow()) {
+                // 生成rootflow orchestrator信息
+                OrchestratorVo orchestratorVo = RpcAskUtils.processAskException(getOrchestratorSender().ask(new RequestQuertByAppIdOrchestrator(dssFlow.getId())),
+                        OrchestratorVo.class, RequestQueryByIdOrchestrator.class);
+                DSSOrchestratorInfo dssOrchestratorInfo = orchestratorVo.getDssOrchestratorInfo();
+                String flowMetaPath = IoUtils.generateFlowMetaIOPath(projectPath, dssOrchestratorInfo.getName());
+                metaExportService.exportFlowBaseInfoNew(orchestratorVo, dssFlowList, flowRelations, flowMetaPath);
+                logger.info(userName + "-开始导出Flow：" + dssOrchestratorInfo.getName());
                 String flowMetaFilePath = IoUtils.addFileSeparator(flowMetaPath, FLOW_FILE_NAME);
                 //导出工作流json文件
                 String flowJson = bmlService.readTextFromBML(userName, dssFlow.getResourceId(), dssFlow.getBmlVersion());
                 if (!dssFlow.getHasSaved()) {
-                    logger.info("工作流{}从未保存过，忽略", dssFlow.getName());
+                    logger.info("工作流{}从未保存过，忽略", dssOrchestratorInfo.getName());
                 } else if (StringUtils.isNotBlank(flowJson)) {
                     // /appcom/tmp/dss/yyyyMMddHHmmssSSS/projectxxx/flow_all_type_node/
-                    String flowCodePath = IoUtils.generateFlowCodeIOPath(projectPath, rootFlow.getName());
-                    exportFlowResourcesNew(userName, dssProjectId, projectName, flowCodePath, flowJson, dssFlow.getName(), workspace, dssLabels,exportExternalNodeAppConnResource);
+                    String flowCodePath = IoUtils.generateFlowCodeIOPath(projectPath, dssOrchestratorInfo.getName());
+                    exportFlowResourcesNew(userName, dssProjectId, projectName, flowCodePath, flowJson, dssOrchestratorInfo.getName(), workspace, dssLabels,exportExternalNodeAppConnResource);
                     exportAllSubFlowsNew(userName, dssFlow, dssProjectId, projectName, flowCodePath,flowMetaPath, workspace, dssLabels,exportExternalNodeAppConnResource);
                     String flowJsonWithoutParams = extractAndExportParams(flowJson, flowCodePath);
                     try (

From bf9a66b269d6a12ac3b36aab0f0c783a482ac9e9 Mon Sep 17 00:00:00 2001
From: Zhaobincai <747839893@qq.com>
Date: Wed, 5 Jun 2024 19:13:30 +0800
Subject: [PATCH 252/302] dss-server:fix rollback1

---
 .../server/service/impl/OrchestratorServiceImpl.java   | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/impl/OrchestratorServiceImpl.java b/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/impl/OrchestratorServiceImpl.java
index 5d8295b87..699775265 100644
--- a/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/impl/OrchestratorServiceImpl.java
+++ b/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/impl/OrchestratorServiceImpl.java
@@ -72,7 +72,9 @@
 import com.webank.wedatasphere.dss.standard.common.desc.AppInstance;
 import com.webank.wedatasphere.dss.standard.common.entity.ref.ResponseRef;
 import com.webank.wedatasphere.dss.standard.common.exception.operation.ExternalOperationWarnException;
+import com.webank.wedatasphere.dss.workflow.common.entity.DSSFlow;
 import com.webank.wedatasphere.dss.workflow.common.protocol.*;
+import com.webank.wedatasphere.dss.workflow.dao.FlowMapper;
 import com.webank.wedatasphere.dss.workflow.dao.LockMapper;
 import com.webank.wedatasphere.dss.workflow.lock.DSSFlowEditLockManager;
 import org.apache.commons.collections.CollectionUtils;
@@ -117,6 +119,8 @@ public class OrchestratorServiceImpl implements OrchestratorService {
     private OrchestratorPluginService orchestratorPluginService;
     @Autowired
     private LockMapper lockMapper;
+    @Autowired
+    private FlowMapper flowMapper;
 
     private static final int VALID_FLAG = 1;
 
@@ -438,6 +442,11 @@ public void rollbackOrchestratorGit(OrchestratorRollBackGitVo rollBackGitVo, Str
         DSSProject projectInfo = DSSFlowEditLockManager.getProjectInfo(projectId);
         if (projectInfo.getAssociateGit() != null && projectInfo.getAssociateGit()) {
             try {
+                DSSFlow dssFlow = flowMapper.selectFlowByID(dssOrchestratorVersion.getAppId());
+                if (!dssFlow.getName().equals(dssOrchestratorInfo.getName())) {
+                    lockMapper.updateOrchestratorStatus(orchestratorId, OrchestratorRefConstant.FLOW_STATUS_SAVE);
+                    return ;
+                }
                 Sender sender = DSSSenderServiceFactory.getOrCreateServiceInstance().getGitSender();
                 //若之前版本未进行git回滚，则自动提交回滚后的工作流至git
                 if (StringUtils.isEmpty(oldOrcVersion.getCommitId())) {
@@ -452,7 +461,6 @@ public void rollbackOrchestratorGit(OrchestratorRollBackGitVo rollBackGitVo, Str
                     GitRevertRequest gitRevertRequest = new GitRevertRequest(workspace.getWorkspaceId(), projectName, oldOrcVersion.getCommitId(), dssOrchestratorInfo.getName(), "system");
                     GitCommitResponse gitCommitResponse = RpcAskUtils.processAskException(sender.ask(gitRevertRequest), GitCommitResponse.class, GitRevertRequest.class);
                     lockMapper.updateOrchestratorVersionCommitId(gitCommitResponse.getCommitId(), dssOrchestratorVersion.getAppId());
-                    lockMapper.updateOrchestratorStatus(orchestratorId, OrchestratorRefConstant.FLOW_STATUS_PUSH);
                 }
                 lockMapper.updateOrchestratorStatus(orchestratorId, OrchestratorRefConstant.FLOW_STATUS_PUBLISH);
             } catch (Exception e) {

From 56d37daec698aa9df2c7fdbbf863c767b02ddad6 Mon Sep 17 00:00:00 2001
From: Zhaobincai <747839893@qq.com>
Date: Wed, 5 Jun 2024 19:34:51 +0800
Subject: [PATCH 253/302] dss-server:fix updateTOSaveStatus

---
 .../workflow/service/impl/DSSFlowServiceImpl.java    | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/service/impl/DSSFlowServiceImpl.java b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/service/impl/DSSFlowServiceImpl.java
index 28311e5f8..0d8cdeeb0 100644
--- a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/service/impl/DSSFlowServiceImpl.java
+++ b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/service/impl/DSSFlowServiceImpl.java
@@ -324,20 +324,22 @@ public String saveFlow(Long flowID,
         }
         saveFlowHook.afterSave(jsonFlow,dssFlow,parentFlowID);
         String version = bmlReturnMap.get("version").toString();
-        // 对子工作流无需更新状态
+        // 对子工作流,需更新父工作流状态，以便提交
         if (parentFlowID == null) {
-            updateTOSaveStatus(dssFlow);
+            updateTOSaveStatus(dssFlow.getProjectId(), dssFlow.getId());
+        } else {
+            updateTOSaveStatus(dssFlow.getProjectId(), parentFlowID);
         }
 
         return version;
     }
 
-    private void updateTOSaveStatus(DSSFlow dssFlow) {
+    private void updateTOSaveStatus(Long projectId, Long flowID) {
         try {
-            DSSProject projectInfo = DSSFlowEditLockManager.getProjectInfo(dssFlow.getProjectId());
+            DSSProject projectInfo = DSSFlowEditLockManager.getProjectInfo(projectId);
             //仅对接入Git的项目 更新状态为 保存
             if (projectInfo.getAssociateGit() != null && projectInfo.getAssociateGit()) {
-                OrchestratorVo orchestratorVo = RpcAskUtils.processAskException(getOrchestratorSender().ask(new RequestQuertByAppIdOrchestrator(dssFlow.getId())),
+                OrchestratorVo orchestratorVo = RpcAskUtils.processAskException(getOrchestratorSender().ask(new RequestQuertByAppIdOrchestrator(flowID)),
                         OrchestratorVo.class, RequestQueryByIdOrchestrator.class);
                 lockMapper.updateOrchestratorStatus(orchestratorVo.getDssOrchestratorInfo().getId(), OrchestratorRefConstant.FLOW_STATUS_SAVE);
             }

From 1294b1f30e315528b0ebd45a243c13dca4fa50e4 Mon Sep 17 00:00:00 2001
From: Zhaobincai <747839893@qq.com>
Date: Wed, 5 Jun 2024 19:36:53 +0800
Subject: [PATCH 254/302] dss-server:fix updateTOSaveStatus

---
 .../dss/workflow/service/impl/DSSFlowServiceImpl.java      | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/service/impl/DSSFlowServiceImpl.java b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/service/impl/DSSFlowServiceImpl.java
index 0d8cdeeb0..a6192da32 100644
--- a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/service/impl/DSSFlowServiceImpl.java
+++ b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/service/impl/DSSFlowServiceImpl.java
@@ -325,11 +325,8 @@ public String saveFlow(Long flowID,
         saveFlowHook.afterSave(jsonFlow,dssFlow,parentFlowID);
         String version = bmlReturnMap.get("version").toString();
         // 对子工作流,需更新父工作流状态，以便提交
-        if (parentFlowID == null) {
-            updateTOSaveStatus(dssFlow.getProjectId(), dssFlow.getId());
-        } else {
-            updateTOSaveStatus(dssFlow.getProjectId(), parentFlowID);
-        }
+        Long updateFlowId = parentFlowID == null? dssFlow.getId():parentFlowID;
+        updateTOSaveStatus(dssFlow.getProjectId(), updateFlowId);
 
         return version;
     }

From 181db0c0c47ef9ae364f7440792abfbc526ad3d1 Mon Sep 17 00:00:00 2001
From: Zhaobincai <747839893@qq.com>
Date: Wed, 5 Jun 2024 19:39:38 +0800
Subject: [PATCH 255/302] dss-server:fix search

---
 .../git/service/impl/DSSGitWorkflowManagerServiceImpl.java  | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitWorkflowManagerServiceImpl.java b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitWorkflowManagerServiceImpl.java
index b10d1f927..7dfb45427 100644
--- a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitWorkflowManagerServiceImpl.java
+++ b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitWorkflowManagerServiceImpl.java
@@ -222,7 +222,7 @@ public GitSearchResponse search(GitSearchRequest request) {
         List<String> subList = new ArrayList<>(fileList.subList(start, end));
         List<String> filePathList = new ArrayList<>();
         for (String file : subList) {
-            filePathList.add(gitPathPre + request.getProjectName() + File.separator + file);
+            filePathList.add(workTree + File.separator + file);
         }
 
 
@@ -259,8 +259,8 @@ public GitSearchResponse search(GitSearchRequest request) {
                 }
             }
             // 处理文件路径 /data/GitInstall/testGit/test/.sql -> testGit/test/.sql
-            if (file.startsWith(gitPathPre)) {
-                file = file.substring(gitPathPre.length());
+            if (file.startsWith(workTree + File.separator)) {
+                file = file.substring(gitPathPre.length() + File.separator.length());
             }
 
             result.add(new GitSearchResult(file, keyLines));

From 8baa803dd42dbb70ef3dc8efc467d41b2ed7a36a Mon Sep 17 00:00:00 2001
From: Zhaobincai <747839893@qq.com>
Date: Wed, 5 Jun 2024 23:12:21 +0800
Subject: [PATCH 256/302] dss-server:fix rollback

---
 .../OrchestratorFrameworkServiceImpl.java     | 32 ++++++++-----------
 1 file changed, 14 insertions(+), 18 deletions(-)

diff --git a/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/impl/OrchestratorFrameworkServiceImpl.java b/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/impl/OrchestratorFrameworkServiceImpl.java
index 97820a38a..b1dc13762 100644
--- a/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/impl/OrchestratorFrameworkServiceImpl.java
+++ b/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/impl/OrchestratorFrameworkServiceImpl.java
@@ -466,26 +466,22 @@ public GitHistoryResponse getHistory(Long workspaceId, Long orchestratorId, Stri
         Sender sender = DSSSenderServiceFactory.getOrCreateServiceInstance().getGitSender();
         GitHistoryResponse historyResponse = null;
         // 当前未有版本发布
-        if (versionByOrchestratorId.size() == 1 || versionByOrchestratorId.get(1).getCommitId() == null) {
-            GitHistoryRequest historyRequest = new GitHistoryRequest(workspaceId, projectName, workflowName);
-            historyResponse = RpcAskUtils.processAskException(sender.ask(historyRequest), GitHistoryResponse.class, GitHistoryRequest.class);
-        } else {
-            GitCommitInfoBetweenRequest commitInfoBetweenRequest = new GitCommitInfoBetweenRequest();
-            String newCommitId = versionByOrchestratorId.get(0).getCommitId();
-            commitInfoBetweenRequest.setNewCommitId(newCommitId);
-            String oldCommitId = null;
-            for (DSSOrchestratorVersion version : versionByOrchestratorId) {
-                if (version.getCommitId()!= null && !version.getCommitId().equals(newCommitId)) {
-                    oldCommitId = version.getCommitId();
-                    break;
-                }
+        GitCommitInfoBetweenRequest commitInfoBetweenRequest = new GitCommitInfoBetweenRequest();
+        String newCommitId = versionByOrchestratorId.get(0).getCommitId();
+        commitInfoBetweenRequest.setNewCommitId(newCommitId);
+        String oldCommitId = null;
+        for (DSSOrchestratorVersion version : versionByOrchestratorId) {
+            if (version.getCommitId()!= null && !version.getCommitId().equals(newCommitId)) {
+                oldCommitId = version.getCommitId();
+                break;
             }
-            commitInfoBetweenRequest.setOldCommitId(oldCommitId);
-            commitInfoBetweenRequest.setProjectName(projectName);
-            commitInfoBetweenRequest.setDirName(workflowName);
-            commitInfoBetweenRequest.setWorkspaceId(workspaceId);
-            historyResponse = RpcAskUtils.processAskException(sender.ask(commitInfoBetweenRequest), GitHistoryResponse.class, GitCommitInfoBetweenRequest.class);
         }
+        commitInfoBetweenRequest.setOldCommitId(oldCommitId);
+        commitInfoBetweenRequest.setProjectName(projectName);
+        commitInfoBetweenRequest.setDirName(workflowName);
+        commitInfoBetweenRequest.setWorkspaceId(workspaceId);
+        historyResponse = RpcAskUtils.processAskException(sender.ask(commitInfoBetweenRequest), GitHistoryResponse.class, GitCommitInfoBetweenRequest.class);
+
         return historyResponse;
     }
 

From 1ac79e180a69fd38eba5b5b147880461f765be9c Mon Sep 17 00:00:00 2001
From: Zhaobincai <747839893@qq.com>
Date: Wed, 5 Jun 2024 23:18:09 +0800
Subject: [PATCH 257/302] dss-server:fix search1

---
 .../dss/git/service/impl/DSSGitWorkflowManagerServiceImpl.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitWorkflowManagerServiceImpl.java b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitWorkflowManagerServiceImpl.java
index 7dfb45427..460fd74fb 100644
--- a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitWorkflowManagerServiceImpl.java
+++ b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitWorkflowManagerServiceImpl.java
@@ -260,7 +260,7 @@ public GitSearchResponse search(GitSearchRequest request) {
             }
             // 处理文件路径 /data/GitInstall/testGit/test/.sql -> testGit/test/.sql
             if (file.startsWith(workTree + File.separator)) {
-                file = file.substring(gitPathPre.length() + File.separator.length());
+                file = file.substring(workTree.length() + File.separator.length());
             }
 
             result.add(new GitSearchResult(file, keyLines));

From 37a2f435a364521f29da5793808c2a9011049448 Mon Sep 17 00:00:00 2001
From: Zhaobincai <747839893@qq.com>
Date: Thu, 6 Jun 2024 10:03:12 +0800
Subject: [PATCH 258/302] dss-server:fix saveFlow

---
 .../service/impl/DSSFlowServiceImpl.java      | 25 ++++++++++++++++---
 1 file changed, 22 insertions(+), 3 deletions(-)

diff --git a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/service/impl/DSSFlowServiceImpl.java b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/service/impl/DSSFlowServiceImpl.java
index a6192da32..95c824289 100644
--- a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/service/impl/DSSFlowServiceImpl.java
+++ b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/service/impl/DSSFlowServiceImpl.java
@@ -336,9 +336,12 @@ private void updateTOSaveStatus(Long projectId, Long flowID) {
             DSSProject projectInfo = DSSFlowEditLockManager.getProjectInfo(projectId);
             //仅对接入Git的项目 更新状态为 保存
             if (projectInfo.getAssociateGit() != null && projectInfo.getAssociateGit()) {
-                OrchestratorVo orchestratorVo = RpcAskUtils.processAskException(getOrchestratorSender().ask(new RequestQuertByAppIdOrchestrator(flowID)),
-                        OrchestratorVo.class, RequestQueryByIdOrchestrator.class);
-                lockMapper.updateOrchestratorStatus(orchestratorVo.getDssOrchestratorInfo().getId(), OrchestratorRefConstant.FLOW_STATUS_SAVE);
+                Long rootFlowId = getRootFlowId(flowID);
+                if (rootFlowId != null) {
+                    OrchestratorVo orchestratorVo = RpcAskUtils.processAskException(getOrchestratorSender().ask(new RequestQuertByAppIdOrchestrator(rootFlowId)),
+                            OrchestratorVo.class, RequestQueryByIdOrchestrator.class);
+                    lockMapper.updateOrchestratorStatus(orchestratorVo.getDssOrchestratorInfo().getId(), OrchestratorRefConstant.FLOW_STATUS_SAVE);
+                }
             }
         } catch (DSSErrorException e) {
             logger.error("getProjectInfo failed by:", e);
@@ -346,6 +349,22 @@ private void updateTOSaveStatus(Long projectId, Long flowID) {
         }
     }
 
+    private Long getRootFlowId(Long flowId) {
+        if (flowId == null) {
+            return null;
+        }
+        DSSFlow dssFlow = flowMapper.selectFlowByID(flowId);
+        if (dssFlow == null) {
+            return null;
+        }
+        if (dssFlow.getRootFlow()) {
+            return dssFlow.getId();
+        } else {
+            Long parentFlowID = flowMapper.getParentFlowID(flowId);
+            return getRootFlowId(parentFlowID);
+        }
+    }
+
     /**
      * 当数据库的父子工作流依赖关系和json中不一致时，该方法会删除数据库中的脏数据
      *

From 1d3387dec010c53a3e329b5c46bbd3c154c0b376 Mon Sep 17 00:00:00 2001
From: Zhaobincai <747839893@qq.com>
Date: Thu, 6 Jun 2024 10:04:28 +0800
Subject: [PATCH 259/302] dss-server:fix submitFlow

---
 .../server/service/impl/OrchestratorPluginServiceImpl.java       | 1 -
 1 file changed, 1 deletion(-)

diff --git a/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/impl/OrchestratorPluginServiceImpl.java b/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/impl/OrchestratorPluginServiceImpl.java
index fdc5ee441..9059fd79f 100644
--- a/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/impl/OrchestratorPluginServiceImpl.java
+++ b/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/impl/OrchestratorPluginServiceImpl.java
@@ -259,7 +259,6 @@ public GitCommitResponse submitWorkflowToBML(OrchestratorSubmitRequest flowReque
         orchestratorMapper.updateOrchestratorSubmitJobStatus(orchestratorId, OrchestratorRefConstant.FLOW_STATUS_PUSH_SUCCESS, "");
         //5. 返回文件列表
         lockMapper.updateOrchestratorStatus(orchestratorId, OrchestratorRefConstant.FLOW_STATUS_PUSH);
-        lockMapper.updateOrchestratorVersionCommitId(commit.getCommitId(), flowRequest.getFlowId());
         return commit;
     }
 

From 9f8f82e43a36950d97a0af92b00ec22b701483d5 Mon Sep 17 00:00:00 2001
From: Zhaobincai <747839893@qq.com>
Date: Thu, 6 Jun 2024 10:28:42 +0800
Subject: [PATCH 260/302] git-server: fix errMsg

---
 .../restful/DSSWorkspaceRestful.java          |  8 ++-
 .../response/GitUserUpdateResponse.java       | 16 ++++++
 .../impl/DSSWorkspaceGitServiceImpl.java      |  6 +-
 .../dss/git/utils/DSSGitUtils.java            | 55 ++++++++++---------
 4 files changed, 54 insertions(+), 31 deletions(-)

diff --git a/dss-framework/dss-framework-workspace-server/src/main/java/com/webank/wedatasphere/dss/framework/workspace/restful/DSSWorkspaceRestful.java b/dss-framework/dss-framework-workspace-server/src/main/java/com/webank/wedatasphere/dss/framework/workspace/restful/DSSWorkspaceRestful.java
index c322bc672..d2d494157 100644
--- a/dss-framework/dss-framework-workspace-server/src/main/java/com/webank/wedatasphere/dss/framework/workspace/restful/DSSWorkspaceRestful.java
+++ b/dss-framework/dss-framework-workspace-server/src/main/java/com/webank/wedatasphere/dss/framework/workspace/restful/DSSWorkspaceRestful.java
@@ -368,7 +368,13 @@ public Message associateGit(@RequestBody GitUserEntity gitUser) {
         gitUserUpdateRequest.setGitUser(gitUser);
         gitUserUpdateRequest.setUsername(username);
         GitUserUpdateResponse response = RpcAskUtils.processAskException(gitSender.ask(gitUserUpdateRequest), GitUserUpdateResponse.class, GitUserUpdateRequest.class);
-        return Message.ok();
+        if (0 == response.getStatus()) {
+            return Message.ok();
+        } else {
+            String errorMessage = response.getMsg();
+            String workspaceName = dssWorkspaceService.getWorkspaceName(response.getWorkspaceId());
+            return Message.error(errorMessage + " 工作空间名称为：" + workspaceName);
+        }
     }
 
     @RequestMapping(path = "git", method = RequestMethod.GET)
diff --git a/dss-git/dss-git-common/src/main/java/com.webank.wedatasphere.dss.git.common/protocol/response/GitUserUpdateResponse.java b/dss-git/dss-git-common/src/main/java/com.webank.wedatasphere.dss.git.common/protocol/response/GitUserUpdateResponse.java
index 46dc2b068..248c61fd7 100644
--- a/dss-git/dss-git-common/src/main/java/com.webank.wedatasphere.dss.git.common/protocol/response/GitUserUpdateResponse.java
+++ b/dss-git/dss-git-common/src/main/java/com.webank.wedatasphere.dss.git.common/protocol/response/GitUserUpdateResponse.java
@@ -5,6 +5,14 @@ public class GitUserUpdateResponse {
     private int status;
     private String msg;
 
+    private Long workspaceId;
+
+    public GitUserUpdateResponse(int status, String msg, Long workspaceId) {
+        this.status = status;
+        this.msg = msg;
+        this.workspaceId = workspaceId;
+    }
+
     public int getStatus() {
         return status;
     }
@@ -20,4 +28,12 @@ public String getMsg() {
     public void setMsg(String msg) {
         this.msg = msg;
     }
+
+    public Long getWorkspaceId() {
+        return workspaceId;
+    }
+
+    public void setWorkspaceId(Long workspaceId) {
+        this.workspaceId = workspaceId;
+    }
 }
diff --git a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSWorkspaceGitServiceImpl.java b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSWorkspaceGitServiceImpl.java
index 33cd0cab6..281398f38 100644
--- a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSWorkspaceGitServiceImpl.java
+++ b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSWorkspaceGitServiceImpl.java
@@ -67,7 +67,7 @@ public GitUserUpdateResponse associateGit(GitUserUpdateRequest gitUserCreateRequ
         if (oldGitUserDo == null) {
             // 工作空间--git用户 为一一对应关系
             if (gitUserEntity != null) {
-                throw new DSSErrorException(010101, "该用户已配置为" + gitUserEntity.getWorkspaceId() + "工作空间的读写或只读用户，请更换用户");
+                return new GitUserUpdateResponse(010101, "该用户已配置为" + gitUserEntity.getWorkspaceId() + "工作空间的读写或只读用户，请更换用户", gitUserEntity.getWorkspaceId());
             }
             gitUser.setCreateBy(userName);
             gitUser.setGitUrl(UrlUtils.normalizeIp(GitServerConfig.GIT_URL_PRE.getValue()));
@@ -77,12 +77,12 @@ public GitUserUpdateResponse associateGit(GitUserUpdateRequest gitUserCreateRequ
                 throw new DSSErrorException(800001, "用户名不得修改");
             }
             if (gitUserEntity != null && (!gitUserEntity.getWorkspaceId().equals(gitUser.getWorkspaceId()) || !gitUserEntity.getType().equals(gitUser.getType()))) {
-                throw new DSSErrorException(010101, "该用户已配置为" + gitUserEntity.getWorkspaceId() + "工作空间的读写或只读用户，请更换用户");
+                return new GitUserUpdateResponse(010101, "该用户已配置为" + gitUserEntity.getWorkspaceId() + "工作空间的读写或只读用户，请更换用户", gitUserEntity.getWorkspaceId());
             }
             workspaceGitMapper.update(gitUser);
         }
 
-        return new GitUserUpdateResponse();
+        return new GitUserUpdateResponse(0,"", null);
     }
 
 
diff --git a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/utils/DSSGitUtils.java b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/utils/DSSGitUtils.java
index 18a706f08..25b3f7531 100644
--- a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/utils/DSSGitUtils.java
+++ b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/utils/DSSGitUtils.java
@@ -239,7 +239,7 @@ public static void push(Repository repository, String projectName, GitUserEntity
             logger.info("Changes pushed to remote repository.");
         } catch (GitAPIException e) {
             reset(repository, projectName);
-            throw new GitErrorException(80001, "git push failed, the reason is: ", e);
+            throw new GitErrorException(80001, "提交失败，请重试或检查token是否过期", e);
         }
     }
 
@@ -274,6 +274,7 @@ public static void checkoutTargetCommit(Repository repository, GitRevertRequest
             logger.info("File " + repoDir.getAbsolutePath() + " has been rolled back to the version at commit: " + commitId);
 
         } catch (GitAPIException e) {
+            reset(repository, request.getProjectName());
             throw new GitErrorException(80001, "git check out failed, the reason is: ", e);
         }
     }
@@ -302,32 +303,32 @@ public static List<String> getAllProjectName(GitUserEntity gitUserDO) throws DSS
 
         List<String> projectNames = new ArrayList<>();
         do {
-        String gitLabUrl = UrlUtils.normalizeIp(gitUserDO.getGitUrl()) + "/api/v4/projects?per_page=100&page=" + page; // 修改为你的GitLab实例的URL
-        // 创建HttpClient实例
-        try (CloseableHttpClient httpClient = HttpClients.createDefault()) {
-            // 创建HttpGet请求
-            HttpGet request = new HttpGet(gitLabUrl);
-            // 添加认证头部
-            request.addHeader("PRIVATE-TOKEN", gitUserDO.getGitToken());
-
-            // 执行请求
-            try (CloseableHttpResponse response = httpClient.execute(request)) {
-                // 获取响应实体
-                HttpEntity entity = response.getEntity();
-                // 将响应实体转换为字符串
-                String result = EntityUtils.toString(entity);
-                // 解析项目名称
-                projectNames = parseProjectNames(result);
-                // 打印项目名称
-                logger.info("projectNames is: {}", projectNames.toString());
-                // 添加到总项目列表中
-                allProjectNames.addAll(projectNames);
+            // 修改为GitLab实例的URL
+            String gitLabUrl = UrlUtils.normalizeIp(gitUserDO.getGitUrl()) + "/api/v4/projects?per_page=100&page=" + page;
+            // 创建HttpClient实例
+            try (CloseableHttpClient httpClient = HttpClients.createDefault()) {
+                // 创建HttpGet请求
+                HttpGet request = new HttpGet(gitLabUrl);
+                // 添加认证头部
+                request.addHeader("PRIVATE-TOKEN", gitUserDO.getGitToken());
+                // 执行请求
+                try (CloseableHttpResponse response = httpClient.execute(request)) {
+                    // 获取响应实体
+                    HttpEntity entity = response.getEntity();
+                    // 将响应实体转换为字符串
+                    String result = EntityUtils.toString(entity);
+                    // 解析项目名称
+                    projectNames = parseProjectNames(result);
+                    // 打印项目名称
+                    logger.info("projectNames is: {}", projectNames.toString());
+                    // 添加到总项目列表中
+                    allProjectNames.addAll(projectNames);
+                }
+            } catch (IOException e) {
+                throw new GitErrorException(80001, "检查项目名称失败，请检查工作空间token是否过期", e);
+            } catch (Exception e) {
+                throw new GitErrorException(80001, "检查项目名称时解析JSON失败，请确认git当前是否可访问 ", e);
             }
-        } catch (IOException e) {
-            throw new GitErrorException(80001, "getProjectsName failed, the reason is ", e);
-        } catch (Exception e) {
-            throw new GitErrorException(80001, "getProjectsName failed, the reason is JSON: ", e);
-        }
             page++;
         } while (projectNames.size() > 0);
 
@@ -409,7 +410,7 @@ public static void archive(String projectName, GitUserEntity gitUserDO) throws G
             logger.info(response.toString());
 
         } catch (Exception e) {
-            throw new GitErrorException(80001, "git archive failed, the reason is : ", e);
+            throw new GitErrorException(80001, "归档失败，请检查当前token是否过期 ", e);
         }
     }
 

From eae81e26825e0b4c2137ef4de320797f66324a71 Mon Sep 17 00:00:00 2001
From: Zhaobincai <747839893@qq.com>
Date: Thu, 6 Jun 2024 11:01:30 +0800
Subject: [PATCH 261/302] add sql

---
 db/dss_ddl.sql | 32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/db/dss_ddl.sql b/db/dss_ddl.sql
index 1b52e2c60..16e3e811d 100644
--- a/db/dss_ddl.sql
+++ b/db/dss_ddl.sql
@@ -51,6 +51,7 @@ CREATE TABLE `dss_orchestrator_info` (
    `orchestrator_level` varchar(32) DEFAULT NULL COMMENT '工作流级别',
    `update_user` varchar(100) DEFAULT NULL COMMENT '更新人',
    `update_time` datetime DEFAULT CURRENT_TIMESTAMP COMMENT '更新时间',
+   `status` VARCHAR(64),
    PRIMARY KEY (`id`) USING BTREE,
    UNIQUE KEY `unique_idx_uuid` (`uuid`)
  ) ENGINE=InnoDB AUTO_INCREMENT=326 DEFAULT CHARSET=utf8mb4 ROW_FORMAT=COMPACT;
@@ -70,6 +71,7 @@ CREATE TABLE `dss_orchestrator_version_info` (
   `content` varchar(255) DEFAULT NULL,
   `context_id` varchar(200) DEFAULT NULL COMMENT '上下文ID',
   `valid_flag` INT(1) DEFAULT '1' COMMENT '版本有效标示，0:无效；1：有效',
+  `commit_id` varchar(64),
   PRIMARY KEY (`id`) USING BTREE
 ) ENGINE=InnoDB AUTO_INCREMENT=422 DEFAULT CHARSET=utf8mb4 ROW_FORMAT=COMPACT;
 
@@ -116,6 +118,7 @@ CREATE TABLE `dss_project` (
   `dev_process` varchar(200) COLLATE utf8_bin DEFAULT NULL COMMENT '开发流程，多个以英文逗号分隔，取得的值是dss_workspace_dictionary中的dic_key(parent_key=p_develop_process)',
   `orchestrator_mode` varchar(200) COLLATE utf8_bin DEFAULT NULL COMMENT '编排模式，多个以英文逗号分隔，取得的值是dss_workspace_dictionary中的dic_key(parent_key=p_arrangement_mode或下面一级)',
   `visible` tinyint(4) DEFAULT '1' COMMENT '0:已删除；1：未删除(默认)',
+  `associate_git` TINYINT DEFAULT '0' COMMENT '0:未接入git，1:已接入git',
   PRIMARY KEY (`id`)
 ) ENGINE=InnoDB AUTO_INCREMENT=313 DEFAULT CHARSET=utf8 COLLATE=utf8_bin ROW_FORMAT=COMPACT;
 
@@ -639,3 +642,32 @@ key `idx_limit_name` (`limit_name`)
 ) ENGINE = InnoDB
 DEFAULT CHARSET = utf8mb4 COLLATE=utf8mb4_bin COMMENT ='dss用户限制表';
 
+DROP TABLE IF EXISTS `dss_workspace_associate_git`;
+CREATE TABLE `dss_workspace_associate_git` (
+  `id` bigint(20) NOT NULL AUTO_INCREMENT,
+   `workspace_id` bigint(20) DEFAULT NULL,
+   `git_user`  varchar(64)  DEFAULT NULL COMMENT  'git登录用户名',
+   `git_password`  VARCHAR(255)  DEFAULT NULL COMMENT  'git登录密码，用于跳转',
+   `git_token`  varchar(255) COMMENT  '用户配置的git token',
+   `git_url` varchar(255),
+   `create_time` datetime DEFAULT NULL,
+   `update_time` datetime DEFAULT NULL,
+   `create_by` varchar(128) DEFAULT NULL,
+   `update_by` varchar(128) DEFAULT NULL,
+   `type` varchar(32) DEFAULT NULL,
+   PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin COMMENT='工作空间绑定的git信息';
+
+
+DROP TABLE IF EXISTS `dss_orchestrator_submit_job_info`;
+CREATE TABLE `dss_orchestrator_submit_job_info` (
+    `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '主键',
+    `orchestrator_id` bigint(20) NOT NULL,
+    `create_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+    `update_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '修改时间',
+    `instance_name` varchar(128) DEFAULT NULL COMMENT '提交任务的实例',
+    `status` varchar(128) DEFAULT NULL COMMENT '提交任务状态',
+    `error_msg` varchar(2048) DEFAULT NULL COMMENT '提交任务异常信息',
+    PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin COMMENT='dss_orchestrator_submit_job_info表';
+

From 56630f3942175bc7cfe53968e15f8c63f5846496 Mon Sep 17 00:00:00 2001
From: xlinliu <arionliu@webank.com>
Date: Thu, 6 Jun 2024 14:08:03 +0800
Subject: [PATCH 262/302] =?UTF-8?q?=E6=94=AF=E6=8C=81=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E6=BA=90=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../project/entity/DSSProjectDO.java          | 15 +++--
 .../entity/request/ProjectCreateRequest.java  | 14 ++++
 .../entity/request/ProjectModifyRequest.java  | 12 ++++
 .../impl/DSSFrameworkProjectServiceImpl.java  | 11 ++--
 .../service/impl/DSSProjectServiceImpl.java   | 10 ++-
 .../ref/DSSProjectContentRequestRef.java      | 26 ++++++++
 .../project/ref/DSSProjectDataSource.java     | 64 +++++++++++++++++++
 .../project/ref/ProjectUpdateRequestRef.java  | 24 +++++++
 8 files changed, 165 insertions(+), 11 deletions(-)
 create mode 100644 dss-standard/structure-standard/dss-structure-integration-standard/src/main/java/com/webank/wedatasphere/dss/standard/app/structure/project/ref/DSSProjectDataSource.java

diff --git a/dss-framework/dss-framework-project-server/src/main/java/com/webank/wedatasphere/dss/framework/project/entity/DSSProjectDO.java b/dss-framework/dss-framework-project-server/src/main/java/com/webank/wedatasphere/dss/framework/project/entity/DSSProjectDO.java
index 9f1069ae6..753002172 100644
--- a/dss-framework/dss-framework-project-server/src/main/java/com/webank/wedatasphere/dss/framework/project/entity/DSSProjectDO.java
+++ b/dss-framework/dss-framework-project-server/src/main/java/com/webank/wedatasphere/dss/framework/project/entity/DSSProjectDO.java
@@ -16,10 +16,7 @@
 
 package com.webank.wedatasphere.dss.framework.project.entity;
 
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.*;
 
 import java.io.Serializable;
 import java.util.Date;
@@ -108,6 +105,8 @@ public class DSSProjectDO implements Serializable {
      * 1-接入git 0-不接入（默认）
      */
     private Boolean associateGit;
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
+    private String dataSourceListJson;
 
     public Long getId() {
         return id;
@@ -325,6 +324,14 @@ public void setVisible(Integer visible) {
         this.visible = visible;
     }
 
+    public String getDataSourceListJson() {
+        return dataSourceListJson;
+    }
+
+    public void setDataSourceListJson(String dataSourceListJson) {
+        this.dataSourceListJson = dataSourceListJson;
+    }
+
     @Override
     public String toString() {
         return "DSSProjectDO{" +
diff --git a/dss-framework/dss-framework-project-server/src/main/java/com/webank/wedatasphere/dss/framework/project/entity/request/ProjectCreateRequest.java b/dss-framework/dss-framework-project-server/src/main/java/com/webank/wedatasphere/dss/framework/project/entity/request/ProjectCreateRequest.java
index 27492675a..1be9008b4 100644
--- a/dss-framework/dss-framework-project-server/src/main/java/com/webank/wedatasphere/dss/framework/project/entity/request/ProjectCreateRequest.java
+++ b/dss-framework/dss-framework-project-server/src/main/java/com/webank/wedatasphere/dss/framework/project/entity/request/ProjectCreateRequest.java
@@ -16,6 +16,8 @@
 
 package com.webank.wedatasphere.dss.framework.project.entity.request;
 
+import com.webank.wedatasphere.dss.standard.app.structure.project.ref.DSSProjectDataSource;
+
 import javax.validation.constraints.NotNull;
 import javax.xml.bind.annotation.XmlRootElement;
 import java.util.List;
@@ -60,6 +62,10 @@ public class ProjectCreateRequest {
      * 编码模式 list
      */
     private List<String> orchestratorModeList;
+    /**
+     * 项目上的数据源列表
+     */
+    private List<DSSProjectDataSource> dataSourceList;
 
     /**
      * 1-接入git 0-不接入（默认）
@@ -163,6 +169,14 @@ public void setOrchestratorModeList(List<String> orchestratorModeList) {
         this.orchestratorModeList = orchestratorModeList;
     }
 
+    public List<DSSProjectDataSource> getDataSourceList() {
+        return dataSourceList;
+    }
+
+    public void setDataSourceList(List<DSSProjectDataSource> dataSourceList) {
+        this.dataSourceList = dataSourceList;
+    }
+
     @Override
     public String toString() {
         return "ProjectCreateRequest{" +
diff --git a/dss-framework/dss-framework-project-server/src/main/java/com/webank/wedatasphere/dss/framework/project/entity/request/ProjectModifyRequest.java b/dss-framework/dss-framework-project-server/src/main/java/com/webank/wedatasphere/dss/framework/project/entity/request/ProjectModifyRequest.java
index c0b2994aa..575d91dec 100644
--- a/dss-framework/dss-framework-project-server/src/main/java/com/webank/wedatasphere/dss/framework/project/entity/request/ProjectModifyRequest.java
+++ b/dss-framework/dss-framework-project-server/src/main/java/com/webank/wedatasphere/dss/framework/project/entity/request/ProjectModifyRequest.java
@@ -16,6 +16,8 @@
 
 package com.webank.wedatasphere.dss.framework.project.entity.request;
 
+import com.webank.wedatasphere.dss.standard.app.structure.project.ref.DSSProjectDataSource;
+
 import javax.validation.constraints.NotNull;
 import javax.xml.bind.annotation.XmlRootElement;
 import java.util.List;
@@ -77,6 +79,7 @@ public void setWorkspaceName(String workspaceName) {
      * 编排模式 code list
      */
     private List<String> orchestratorModeList;
+    private List<DSSProjectDataSource> dataSourceList;
 
     /**
      * 1-接入git 0-不接入（默认）
@@ -179,6 +182,15 @@ public void setOrchestratorModeList(List<String> orchestratorModeList) {
         this.orchestratorModeList = orchestratorModeList;
     }
 
+
+    public List<DSSProjectDataSource> getDataSourceList() {
+        return dataSourceList;
+    }
+
+    public void setDataSourceList(List<DSSProjectDataSource> dataSourceList) {
+        this.dataSourceList = dataSourceList;
+    }
+
     @Override
     public String toString() {
         return "ProjectModifyRequest{" +
diff --git a/dss-framework/dss-framework-project-server/src/main/java/com/webank/wedatasphere/dss/framework/project/service/impl/DSSFrameworkProjectServiceImpl.java b/dss-framework/dss-framework-project-server/src/main/java/com/webank/wedatasphere/dss/framework/project/service/impl/DSSFrameworkProjectServiceImpl.java
index 6ecdd9b83..1e6206f64 100644
--- a/dss-framework/dss-framework-project-server/src/main/java/com/webank/wedatasphere/dss/framework/project/service/impl/DSSFrameworkProjectServiceImpl.java
+++ b/dss-framework/dss-framework-project-server/src/main/java/com/webank/wedatasphere/dss/framework/project/service/impl/DSSFrameworkProjectServiceImpl.java
@@ -40,10 +40,7 @@
 import com.webank.wedatasphere.dss.sender.service.DSSSenderServiceFactory;
 import com.webank.wedatasphere.dss.standard.app.sso.Workspace;
 import com.webank.wedatasphere.dss.standard.app.structure.project.*;
-import com.webank.wedatasphere.dss.standard.app.structure.project.ref.DSSProjectContentRequestRef;
-import com.webank.wedatasphere.dss.standard.app.structure.project.ref.DSSProjectPrivilege;
-import com.webank.wedatasphere.dss.standard.app.structure.project.ref.ProjectUpdateRequestRef;
-import com.webank.wedatasphere.dss.standard.app.structure.project.ref.RefProjectContentRequestRef;
+import com.webank.wedatasphere.dss.standard.app.structure.project.ref.*;
 import com.webank.wedatasphere.dss.standard.app.structure.utils.StructureOperationUtils;
 import com.webank.wedatasphere.dss.standard.common.desc.AppInstance;
 import com.webank.wedatasphere.dss.standard.common.exception.operation.ExternalOperationFailedException;
@@ -265,6 +262,7 @@ private void modifyThirdProject(ProjectModifyRequest projectModifyRequest,
             addedPrivilege = getPrivilege.apply(true);
             removedPrivilege = getPrivilege.apply(false);
         }
+        List<DSSProjectDataSource> dataSourceList = projectModifyRequest.getDataSourceList();
         Map<AppInstance, Long> appInstanceToRefProjectId = new HashMap<>(10);
         tryProjectOperation((appConn, appInstance) -> {
                 Long refProjectId = dssProjectService.getAppConnProjectId(appInstance.getId(), dbProject.getId());
@@ -277,7 +275,7 @@ private void modifyThirdProject(ProjectModifyRequest projectModifyRequest,
                     return true;
                 }
             }, workspace, projectService -> projectService.getProjectUpdateOperation(),
-            dssProjectContentRequestRef -> dssProjectContentRequestRef.setDSSProject(dssProject).setDSSProjectPrivilege(privilege).setUserName(dbProject.getUpdateBy()).setWorkspace(workspace),
+            dssProjectContentRequestRef -> dssProjectContentRequestRef.setDSSProject(dssProject).setDSSProjectPrivilege(privilege).setDSSProjectDataSources(dataSourceList).setUserName(dbProject.getUpdateBy()).setWorkspace(workspace),
             (appInstance, refProjectContentRequestRef) -> refProjectContentRequestRef.setRefProjectId(appInstanceToRefProjectId.get(appInstance)),
             (structureOperation, structureRequestRef) -> {
                 ProjectUpdateRequestRef projectUpdateRequestRef = (ProjectUpdateRequestRef) structureRequestRef;
@@ -317,10 +315,11 @@ private Map<AppInstance, Long> createAppConnProject(ProjectCreateRequest dssProj
         DSSProjectPrivilege privilege = DSSProjectPrivilege.newBuilder().setAccessUsers(dssProjectCreateRequest.getAccessUsers())
                 .setEditUsers(dssProjectCreateRequest.getEditUsers())
                 .setReleaseUsers(dssProjectCreateRequest.getReleaseUsers()).build();
+        List<DSSProjectDataSource> dataSourceList = dssProjectCreateRequest.getDataSourceList();
         try {
             tryProjectOperation(null, workspace, ProjectService::getProjectCreationOperation,
                     dssProjectContentRequestRef -> dssProjectContentRequestRef.setDSSProject(dssProject)
-                            .setDSSProjectPrivilege(privilege).setUserName(username), null,
+                            .setDSSProjectPrivilege(privilege).setDSSProjectDataSources(dataSourceList).setUserName(username), null,
                     (structureOperation, structureRequestRef) -> ((ProjectCreationOperation) structureOperation).createProject((DSSProjectContentRequestRef) structureRequestRef),
                     (pair, projectResponseRef) -> {
                         projectMap.put(pair.right, projectResponseRef.getRefProjectId());
diff --git a/dss-framework/dss-framework-project-server/src/main/java/com/webank/wedatasphere/dss/framework/project/service/impl/DSSProjectServiceImpl.java b/dss-framework/dss-framework-project-server/src/main/java/com/webank/wedatasphere/dss/framework/project/service/impl/DSSProjectServiceImpl.java
index bafa3bfe8..e223ea6f5 100644
--- a/dss-framework/dss-framework-project-server/src/main/java/com/webank/wedatasphere/dss/framework/project/service/impl/DSSProjectServiceImpl.java
+++ b/dss-framework/dss-framework-project-server/src/main/java/com/webank/wedatasphere/dss/framework/project/service/impl/DSSProjectServiceImpl.java
@@ -62,6 +62,7 @@
 import com.webank.wedatasphere.dss.standard.app.sso.Workspace;
 import com.webank.wedatasphere.dss.standard.app.structure.project.ProjectDeletionOperation;
 import com.webank.wedatasphere.dss.standard.app.structure.project.ProjectService;
+import com.webank.wedatasphere.dss.standard.app.structure.project.ref.DSSProjectDataSource;
 import com.webank.wedatasphere.dss.standard.app.structure.project.ref.RefProjectContentRequestRef;
 import com.webank.wedatasphere.dss.standard.common.desc.AppInstance;
 import org.apache.commons.codec.digest.DigestUtils;
@@ -134,6 +135,10 @@ public DSSProjectDO createProject(String username, ProjectCreateRequest projectC
         //开发流程，编排模式组拼接 前后进行英文逗号接口
         project.setDevProcess(ProjectStringUtils.getModeStr(projectCreateRequest.getDevProcessList()));
         project.setOrchestratorMode(ProjectStringUtils.getModeStr(projectCreateRequest.getOrchestratorModeList()));
+        List<DSSProjectDataSource> dataSourceList = projectCreateRequest.getDataSourceList();
+        if (dataSourceList != null && !dataSourceList.isEmpty()) {
+            project.setDataSourceListJson(DSSCommonUtils.COMMON_GSON.toJson(dataSourceList));
+        }
         projectMapper.insert(project);
         return project;
     }
@@ -156,7 +161,10 @@ public DSSProjectDO modifyProject(String username, ProjectModifyRequest projectM
         project.setBusiness(projectModifyRequest.getBusiness());
         project.setProduct(projectModifyRequest.getProduct());
         project.setAssociateGit(projectModifyRequest.getAssociateGit());
-
+        List<DSSProjectDataSource> dataSourceList = projectModifyRequest.getDataSourceList();
+        if (dataSourceList != null && !dataSourceList.isEmpty()) {
+            project.setDataSourceListJson(DSSCommonUtils.COMMON_GSON.toJson(dataSourceList));
+        }
         UpdateWrapper<DSSProjectDO> updateWrapper = new UpdateWrapper<>();
         updateWrapper.eq("id", projectModifyRequest.getId());
         updateWrapper.eq("workspace_id", projectModifyRequest.getWorkspaceId());
diff --git a/dss-standard/structure-standard/dss-structure-integration-standard/src/main/java/com/webank/wedatasphere/dss/standard/app/structure/project/ref/DSSProjectContentRequestRef.java b/dss-standard/structure-standard/dss-structure-integration-standard/src/main/java/com/webank/wedatasphere/dss/standard/app/structure/project/ref/DSSProjectContentRequestRef.java
index 64e68a2bc..a95e89fac 100644
--- a/dss-standard/structure-standard/dss-structure-integration-standard/src/main/java/com/webank/wedatasphere/dss/standard/app/structure/project/ref/DSSProjectContentRequestRef.java
+++ b/dss-standard/structure-standard/dss-structure-integration-standard/src/main/java/com/webank/wedatasphere/dss/standard/app/structure/project/ref/DSSProjectContentRequestRef.java
@@ -1,9 +1,14 @@
 package com.webank.wedatasphere.dss.standard.app.structure.project.ref;
 
+import com.google.gson.reflect.TypeToken;
 import com.webank.wedatasphere.dss.common.entity.project.DSSProject;
+import com.webank.wedatasphere.dss.common.utils.DSSCommonUtils;
 import com.webank.wedatasphere.dss.standard.app.structure.StructureRequestRef;
 import com.webank.wedatasphere.dss.standard.app.structure.StructureRequestRefImpl;
 
+import java.util.Collections;
+import java.util.List;
+
 /**
  * @author enjoyyin
  * @date 2022-03-13
@@ -34,6 +39,27 @@ default R setDSSProjectPrivilege(DSSProjectPrivilege dssProjectPrivilege) {
         return (R) this;
     }
 
+    /**
+     * DSS 工程的全量最新权数据源列表，包含了 DSS 工程所有的数据源
+     * @return DSSProjectPrivilege
+     */
+    default List<DSSProjectDataSource> getDSSProjectDataSources() {
+        String json = (String) this.getParameter("dssProjectDataSources");
+        if(json != null) {
+          return   DSSCommonUtils.COMMON_GSON.fromJson(json, new TypeToken<List<DSSProjectDataSource>>(){}.getType());
+        }
+        return Collections.emptyList();
+    }
+
+
+    default R setDSSProjectDataSources(List<DSSProjectDataSource> dssProjectDataSources) {
+        //为了让第三方组件可以不用升级dss依赖包，转成json string再存储
+        if(dssProjectDataSources != null) {
+            setParameter("dssProjectDataSources", DSSCommonUtils.COMMON_GSON.toJson(dssProjectDataSources));
+        }
+        return (R) this;
+    }
+
     class DSSProjectContentRequestRefImpl
             extends StructureRequestRefImpl<DSSProjectContentRequestRefImpl>
             implements DSSProjectContentRequestRef<DSSProjectContentRequestRefImpl> {
diff --git a/dss-standard/structure-standard/dss-structure-integration-standard/src/main/java/com/webank/wedatasphere/dss/standard/app/structure/project/ref/DSSProjectDataSource.java b/dss-standard/structure-standard/dss-structure-integration-standard/src/main/java/com/webank/wedatasphere/dss/standard/app/structure/project/ref/DSSProjectDataSource.java
new file mode 100644
index 000000000..2d8556ace
--- /dev/null
+++ b/dss-standard/structure-standard/dss-structure-integration-standard/src/main/java/com/webank/wedatasphere/dss/standard/app/structure/project/ref/DSSProjectDataSource.java
@@ -0,0 +1,64 @@
+package com.webank.wedatasphere.dss.standard.app.structure.project.ref;
+
+import java.util.Date;
+
+/**
+ * Author: xlinliu
+ * Date: 2024/6/6
+ */
+public class DSSProjectDataSource {
+    private String dataSourceName;
+    private String dataSourceDesc;
+    private Date createTime;
+    private Date modifyTime;
+    private String createUser;
+    private String dataSourceType;
+
+    public String getDataSourceName() {
+        return dataSourceName;
+    }
+
+    public void setDataSourceName(String dataSourceName) {
+        this.dataSourceName = dataSourceName;
+    }
+
+    public String getDataSourceDesc() {
+        return dataSourceDesc;
+    }
+
+    public void setDataSourceDesc(String dataSourceDesc) {
+        this.dataSourceDesc = dataSourceDesc;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public Date getModifyTime() {
+        return modifyTime;
+    }
+
+    public void setModifyTime(Date modifyTime) {
+        this.modifyTime = modifyTime;
+    }
+
+    public String getCreateUser() {
+        return createUser;
+    }
+
+    public void setCreateUser(String createUser) {
+        this.createUser = createUser;
+    }
+
+    public String getDataSourceType() {
+        return dataSourceType;
+    }
+
+    public void setDataSourceType(String dataSourceType) {
+        this.dataSourceType = dataSourceType;
+    }
+}
diff --git a/dss-standard/structure-standard/dss-structure-integration-standard/src/main/java/com/webank/wedatasphere/dss/standard/app/structure/project/ref/ProjectUpdateRequestRef.java b/dss-standard/structure-standard/dss-structure-integration-standard/src/main/java/com/webank/wedatasphere/dss/standard/app/structure/project/ref/ProjectUpdateRequestRef.java
index 618b93edf..c5c0fbfd0 100644
--- a/dss-standard/structure-standard/dss-structure-integration-standard/src/main/java/com/webank/wedatasphere/dss/standard/app/structure/project/ref/ProjectUpdateRequestRef.java
+++ b/dss-standard/structure-standard/dss-structure-integration-standard/src/main/java/com/webank/wedatasphere/dss/standard/app/structure/project/ref/ProjectUpdateRequestRef.java
@@ -1,7 +1,12 @@
 package com.webank.wedatasphere.dss.standard.app.structure.project.ref;
 
+import com.google.gson.reflect.TypeToken;
+import com.webank.wedatasphere.dss.common.utils.DSSCommonUtils;
 import com.webank.wedatasphere.dss.standard.app.structure.StructureRequestRefImpl;
 
+import java.util.Collections;
+import java.util.List;
+
 /**
  * @author enjoyyin
  * @date 2022-03-13
@@ -46,7 +51,26 @@ default R setRemovedDSSProjectPrivilege(DSSProjectPrivilege removedDSSProjectPri
         setParameter("removedDSSProjectPrivilege", removedDSSProjectPrivilege);
         return (R) this;
     }
+    /**
+     * DSS 工程的全量最新权数据源列表，包含了 DSS 工程所有的数据源
+     * 第三方组件需要根据这个列表来判断哪些数据源是新增的，哪些数据源是删除的，时刻保持同步
+     * @return DSSProjectPrivilege
+     */
+    default List<DSSProjectDataSource> getDSSProjectDataSources() {
+        String json = (String) this.getParameter("dssProjectDataSources");
+        if(json != null) {
+            return   DSSCommonUtils.COMMON_GSON.fromJson(json, new TypeToken<List<DSSProjectDataSource>>(){}.getType());
+        }
+        return Collections.emptyList();
+    }
 
+
+    default R setDSSProjectDataSources(List<DSSProjectDataSource> dssProjectDataSources) {
+        //为了让第三方组件可以不用升级dss依赖包，转成json string再存储
+        String json = DSSCommonUtils.COMMON_GSON.toJson(dssProjectDataSources);
+        setParameter("dssProjectDataSources", json);
+        return (R) this;
+    }
     class ProjectUpdateRequestRefImpl extends StructureRequestRefImpl<ProjectUpdateRequestRefImpl>
             implements ProjectUpdateRequestRef<ProjectUpdateRequestRefImpl> {}
 

From 0c30623dc8ec867b22bdc01c72638569e6a894a3 Mon Sep 17 00:00:00 2001
From: Zhaobincai <747839893@qq.com>
Date: Thu, 6 Jun 2024 14:19:17 +0800
Subject: [PATCH 263/302] fix err MSG

---
 .../java/com/webank/wedatasphere/dss/git/utils/DSSGitUtils.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/utils/DSSGitUtils.java b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/utils/DSSGitUtils.java
index 25b3f7531..4e0a74a2f 100644
--- a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/utils/DSSGitUtils.java
+++ b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/utils/DSSGitUtils.java
@@ -290,7 +290,7 @@ public static boolean checkProjectName(String name, GitUserEntity gitUser) throw
             } catch (DSSErrorException e) {
                 logger.info("getAllProjectName failed, try again");
                 if (retry >= 3) {
-                    throw new GitErrorException(80001, "getAllProjectName failed, the reason is: ", e);
+                    throw new GitErrorException(80001, "检查项目名称失败，请检查工作空间token是否过期或git服务是否可以正常访问 ", e);
                 }
             }
         }

From 12243a4cf9391eae71cf7c28a584326fe7216d62 Mon Sep 17 00:00:00 2001
From: xlinliu <arionliu@webank.com>
Date: Thu, 6 Jun 2024 17:13:46 +0800
Subject: [PATCH 264/302] =?UTF-8?q?=E5=AF=BC=E5=85=A5=E6=97=B6=E6=9B=B4?=
 =?UTF-8?q?=E6=96=B0workspaceId?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../publish/impl/ImportDSSOrchestratorPluginImpl.java           | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/dss-framework/framework-plugins/dss-framework-orchestrator-publish/src/main/java/com/webank/wedatasphere/dss/orchestrator/publish/impl/ImportDSSOrchestratorPluginImpl.java b/dss-framework/framework-plugins/dss-framework-orchestrator-publish/src/main/java/com/webank/wedatasphere/dss/orchestrator/publish/impl/ImportDSSOrchestratorPluginImpl.java
index 1551327d0..f3050a680 100644
--- a/dss-framework/framework-plugins/dss-framework-orchestrator-publish/src/main/java/com/webank/wedatasphere/dss/orchestrator/publish/impl/ImportDSSOrchestratorPluginImpl.java
+++ b/dss-framework/framework-plugins/dss-framework-orchestrator-publish/src/main/java/com/webank/wedatasphere/dss/orchestrator/publish/impl/ImportDSSOrchestratorPluginImpl.java
@@ -107,6 +107,7 @@ public DSSOrchestratorVersion importOrchestratorNew(RequestImportOrchestrator re
         //2、导入Info信息(导入冲突处理)
         DSSOrchestratorInfo importDssOrchestratorInfo = metaInputService.importOrchestratorNew(flowMetaPath);
         importDssOrchestratorInfo.setProjectId(projectId);
+        importDssOrchestratorInfo.setWorkspaceId(workspace.getWorkspaceId());
         //复制工程，直接使用新的UUID和复制后的工程ID
         if (requestImportOrchestrator.getCopyProjectId() != null
                 && StringUtils.isNotBlank(requestImportOrchestrator.getCopyProjectName())) {
@@ -236,6 +237,7 @@ public DSSOrchestratorVersion importOrchestrator(RequestImportOrchestrator reque
         List<DSSOrchestratorInfo> dssOrchestratorInfos = metaInputService.importOrchestrator(inputPath);
         DSSOrchestratorInfo importDssOrchestratorInfo = dssOrchestratorInfos.get(0);
         importDssOrchestratorInfo.setProjectId(projectId);
+        importDssOrchestratorInfo.setWorkspaceId(workspace.getWorkspaceId());
         //复制工程，直接使用新的UUID和复制后的工程ID
         if (requestImportOrchestrator.getCopyProjectId() != null
                 && StringUtils.isNotBlank(requestImportOrchestrator.getCopyProjectName())) {

From ee82d94e7b8c9b87ce6224a5f5737d772cddd04b Mon Sep 17 00:00:00 2001
From: Zhaobincai <747839893@qq.com>
Date: Thu, 6 Jun 2024 17:32:11 +0800
Subject: [PATCH 265/302] fix rollback

---
 .../impl/OrchestratorFrameworkServiceImpl.java     |  2 +-
 .../impl/OrchestratorPluginServiceImpl.java        |  2 ++
 .../workflow/service/impl/PublishServiceImpl.java  | 14 ++++++--------
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/impl/OrchestratorFrameworkServiceImpl.java b/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/impl/OrchestratorFrameworkServiceImpl.java
index b1dc13762..9044bae82 100644
--- a/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/impl/OrchestratorFrameworkServiceImpl.java
+++ b/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/impl/OrchestratorFrameworkServiceImpl.java
@@ -297,7 +297,7 @@ public CommonOrchestratorVo deleteOrchestrator(String username, OrchestratorDele
             lockMapper.updateOrchestratorStatus(orchestratorDeleteRequest.getId(), OrchestratorRefConstant.FLOW_STATUS_PUSH);
             DSSOrchestratorVersion versionById = orchestratorMapper.getLatestOrchestratorVersionById(orchestratorInfo.getId());
             if (versionById != null) {
-                lockMapper.updateOrchestratorVersionCommitId(commitResponse.getCommitId(), versionById.getOrchestratorId());
+                lockMapper.updateOrchestratorVersionCommitId(commitResponse.getCommitId(), versionById.getAppId());
             }
         } catch (Exception e) {
             LOGGER.error("git remove failed, the reason is: ", e);
diff --git a/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/impl/OrchestratorPluginServiceImpl.java b/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/impl/OrchestratorPluginServiceImpl.java
index 9059fd79f..c67cd50b8 100644
--- a/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/impl/OrchestratorPluginServiceImpl.java
+++ b/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/impl/OrchestratorPluginServiceImpl.java
@@ -259,6 +259,8 @@ public GitCommitResponse submitWorkflowToBML(OrchestratorSubmitRequest flowReque
         orchestratorMapper.updateOrchestratorSubmitJobStatus(orchestratorId, OrchestratorRefConstant.FLOW_STATUS_PUSH_SUCCESS, "");
         //5. 返回文件列表
         lockMapper.updateOrchestratorStatus(orchestratorId, OrchestratorRefConstant.FLOW_STATUS_PUSH);
+        // 更新commitId
+        lockMapper.updateOrchestratorVersionCommitId(commit.getCommitId(), flowRequest.getFlowId());
         return commit;
     }
 
diff --git a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/service/impl/PublishServiceImpl.java b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/service/impl/PublishServiceImpl.java
index 98be4ae38..0d951306c 100644
--- a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/service/impl/PublishServiceImpl.java
+++ b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/service/impl/PublishServiceImpl.java
@@ -92,13 +92,15 @@ public String submitPublish(String convertUser, Long workflowId,
             //仅对接入Git的项目更新状态为 发布-publish
             GitCommitResponse gitCommitResponse = null;
             OrchestratorVo orchestratorVo = null;
+            Long orchestratorId = null;
             if (dssProject.getAssociateGit() != null && dssProject.getAssociateGit()) {
                 orchestratorVo = RpcAskUtils.processAskException(getOrchestratorSender().ask(new RequestQuertByAppIdOrchestrator(workflowId)),
                         OrchestratorVo.class, RequestQueryByIdOrchestrator.class);
                 if (orchestratorVo == null) {
                     throw new DSSErrorException(800001, "编排不存在");
                 }
-                String status = lockMapper.selectOrchestratorStatus(orchestratorVo.getDssOrchestratorInfo().getId());
+                orchestratorId = orchestratorVo.getDssOrchestratorInfo().getId();
+                String status = lockMapper.selectOrchestratorStatus(orchestratorId);
                 if (OrchestratorRefConstant.FLOW_STATUS_SAVE.equals(status)) {
                     throw new DSSErrorException(800001, "发布前请先提交工作流");
                 }
@@ -108,7 +110,9 @@ public String submitPublish(String convertUser, Long workflowId,
                 GitCurrentCommitRequest currentCommitRequest = new GitCurrentCommitRequest(workspace.getWorkspaceId(), dssProject.getName(), convertUser, dssFlow.getName());
                 gitCommitResponse = RpcAskUtils.processAskException(sender.ask(currentCommitRequest), GitCommitResponse.class, GitCurrentCommitRequest.class);
                 // 更新commitId
-                lockMapper.updateOrchestratorStatus(orchestratorVo.getDssOrchestratorInfo().getId(), OrchestratorRefConstant.FLOW_STATUS_PUSH);
+                lockMapper.updateOrchestratorVersionCommitId(gitCommitResponse.getCommitId(), orchestratorId);
+                // 更新工作流状态
+                lockMapper.updateOrchestratorStatus(orchestratorId, OrchestratorRefConstant.FLOW_STATUS_PUBLISH);
             }
             String schedulerAppConnName = workFlowParser.getValueWithKey(dssFlow.getFlowJson(), DSSWorkFlowConstant.SCHEDULER_APP_CONN_NAME);
             if (StringUtils.isBlank(schedulerAppConnName)) {
@@ -123,12 +127,6 @@ public String submitPublish(String convertUser, Long workflowId,
             if (response.getResponse().isFailed()) {
                 throw new DSSErrorException(50311, response.getResponse().getMessage());
             }
-            if (gitCommitResponse != null) {
-                // 更新commitId
-                lockMapper.updateOrchestratorVersionCommitId(gitCommitResponse.getCommitId(), dssFlow.getId());
-                // 更新工作流状态
-                lockMapper.updateOrchestratorStatus(orchestratorVo.getDssOrchestratorInfo().getId(), OrchestratorRefConstant.FLOW_STATUS_PUBLISH);
-            }
 
             return response.getId();
         } catch (DSSErrorException e) {

From 15dddfcb63bca2cd81308f1c17c4e49fe71ac281 Mon Sep 17 00:00:00 2001
From: xlinliu <arionliu@webank.com>
Date: Fri, 7 Jun 2024 15:46:52 +0800
Subject: [PATCH 266/302] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E6=94=AF=E6=8C=81?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=95=B0=E6=8D=AE=E6=BA=90=E2=80=94=E2=80=94?=
 =?UTF-8?q?=E5=9B=9E=E6=98=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dss/framework/project/dao/DSSProjectMapper.java |  2 --
 .../framework/project/dao/impl/DSSProjectMapper.xml | 11 +++--------
 .../project/entity/response/ProjectResponse.java    | 11 +++++++++++
 .../framework/project/entity/vo/QueryProjectVo.java |  9 +++++++++
 .../project/service/impl/DSSProjectServiceImpl.java | 13 +++++++++++++
 5 files changed, 36 insertions(+), 10 deletions(-)

diff --git a/dss-framework/dss-framework-project-server/src/main/java/com/webank/wedatasphere/dss/framework/project/dao/DSSProjectMapper.java b/dss-framework/dss-framework-project-server/src/main/java/com/webank/wedatasphere/dss/framework/project/dao/DSSProjectMapper.java
index c3f9dfc19..124118663 100644
--- a/dss-framework/dss-framework-project-server/src/main/java/com/webank/wedatasphere/dss/framework/project/dao/DSSProjectMapper.java
+++ b/dss-framework/dss-framework-project-server/src/main/java/com/webank/wedatasphere/dss/framework/project/dao/DSSProjectMapper.java
@@ -32,8 +32,6 @@
 @Mapper
 public interface DSSProjectMapper extends BaseMapper<DSSProjectDO> {
 
-    void addProject(DSSProjectPo dssProjectPo);
-
     @Select("select id from dss_project where `name` = #{projectName}")
     Long getProjectIdByName(@Param("projectName") String projectName);
 
diff --git a/dss-framework/dss-framework-project-server/src/main/java/com/webank/wedatasphere/dss/framework/project/dao/impl/DSSProjectMapper.xml b/dss-framework/dss-framework-project-server/src/main/java/com/webank/wedatasphere/dss/framework/project/dao/impl/DSSProjectMapper.xml
index 7544aeed7..c82aa064b 100644
--- a/dss-framework/dss-framework-project-server/src/main/java/com/webank/wedatasphere/dss/framework/project/dao/impl/DSSProjectMapper.xml
+++ b/dss-framework/dss-framework-project-server/src/main/java/com/webank/wedatasphere/dss/framework/project/dao/impl/DSSProjectMapper.xml
@@ -23,14 +23,6 @@
         , `user_id`, `create_by_str`, `update_by_str`
     </sql>
 
-    <insert id="addProject" useGeneratedKeys="true" keyProperty="id"
-            parameterType="com.webank.wedatasphere.dss.framework.project.entity.po.DSSProjectPo">
-        INSERT INTO dss_project (<include refid="project_main"/>)
-        VALUES
-        (#{id},#{name},#{source}, #{workspaceId}, #{description},#{orgID},#{visibility},#{isTransfer},#{initialOrgID},
-        #{username},#{createTime},#{createBy},#{product},#{applicationArea},#{business},
-        #{userID},#{createByStr},#{updateByStr})
-    </insert>
 
     <select id="getListByParam"
             parameterType="com.webank.wedatasphere.dss.framework.project.entity.request.ProjectQueryRequest"
@@ -41,6 +33,7 @@
         b.dev_process devProcess,b.orchestrator_mode orchestratorMode,
         b.visible visible,
         b.associate_git associateGit,
+        b.data_source_list_json dataSourceListJson,
         GROUP_CONCAT(CONCAT(a.project_id,'-',a.priv,'-',a.username)) pusername
         FROM dss_project_user a
         LEFT JOIN dss_project b ON a.project_id = b.id AND a.workspace_id=b.workspace_id
@@ -82,6 +75,7 @@
         b.dev_process devProcess,b.orchestrator_mode orchestratorMode,
         b.visible visible,
         b.associate_git associateGit,
+        b.data_source_list_json dataSourceListJson,
         GROUP_CONCAT(CONCAT(a.project_id,'-',a.priv,'-',a.username)) pusername
         FROM dss_project_user a
         LEFT JOIN dss_project b ON a.project_id = b.id AND a.workspace_id=b.workspace_id
@@ -101,6 +95,7 @@
         b.product,b.source,b.isArchive,b.create_time createTime,b.update_time updateTime,
         b.dev_process devProcess,b.orchestrator_mode orchestratorMode,
         b.visible visible,
+        b.data_source_list_json dataSourceListJson,
         GROUP_CONCAT(CONCAT(a.project_id,'-',a.priv,'-',a.username)) pusername
         FROM dss_project_user a
         LEFT JOIN dss_project b ON a.project_id = b.id AND a.workspace_id=b.workspace_id
diff --git a/dss-framework/dss-framework-project-server/src/main/java/com/webank/wedatasphere/dss/framework/project/entity/response/ProjectResponse.java b/dss-framework/dss-framework-project-server/src/main/java/com/webank/wedatasphere/dss/framework/project/entity/response/ProjectResponse.java
index 47ff488e6..69ee71041 100644
--- a/dss-framework/dss-framework-project-server/src/main/java/com/webank/wedatasphere/dss/framework/project/entity/response/ProjectResponse.java
+++ b/dss-framework/dss-framework-project-server/src/main/java/com/webank/wedatasphere/dss/framework/project/entity/response/ProjectResponse.java
@@ -16,6 +16,8 @@
 
 package com.webank.wedatasphere.dss.framework.project.entity.response;
 
+import com.webank.wedatasphere.dss.standard.app.structure.project.ref.DSSProjectDataSource;
+
 import java.io.Serializable;
 import java.util.Date;
 import java.util.List;
@@ -44,6 +46,7 @@ public class ProjectResponse implements Serializable {
     private Date createTime;
     //工程修改时间
     private Date updateTime;
+    private List<DSSProjectDataSource> dataSourceList;
 
     public Boolean getEditable() {
         return editable;
@@ -210,6 +213,14 @@ public void setUpdateTime(Date updateTime) {
         this.updateTime = updateTime;
     }
 
+    public List<DSSProjectDataSource> getDataSourceList() {
+        return dataSourceList;
+    }
+
+    public void setDataSourceList(List<DSSProjectDataSource> dataSourceList) {
+        this.dataSourceList = dataSourceList;
+    }
+
     @Override
     public String toString() {
         return "ResponseProjectVo{" +
diff --git a/dss-framework/dss-framework-project-server/src/main/java/com/webank/wedatasphere/dss/framework/project/entity/vo/QueryProjectVo.java b/dss-framework/dss-framework-project-server/src/main/java/com/webank/wedatasphere/dss/framework/project/entity/vo/QueryProjectVo.java
index 6e46e3a06..23737a394 100644
--- a/dss-framework/dss-framework-project-server/src/main/java/com/webank/wedatasphere/dss/framework/project/entity/vo/QueryProjectVo.java
+++ b/dss-framework/dss-framework-project-server/src/main/java/com/webank/wedatasphere/dss/framework/project/entity/vo/QueryProjectVo.java
@@ -43,6 +43,7 @@ public class QueryProjectVo implements Serializable {
     private Integer visible;
 
     private Boolean associateGit;
+    private String dataSourceListJson;
 
 
     public Long getId() {
@@ -172,4 +173,12 @@ public Boolean getAssociateGit() {
     public void setAssociateGit(Boolean associateGit) {
         this.associateGit = associateGit;
     }
+
+    public String getDataSourceListJson() {
+        return dataSourceListJson;
+    }
+
+    public void setDataSourceListJson(String dataSourceListJson) {
+        this.dataSourceListJson = dataSourceListJson;
+    }
 }
diff --git a/dss-framework/dss-framework-project-server/src/main/java/com/webank/wedatasphere/dss/framework/project/service/impl/DSSProjectServiceImpl.java b/dss-framework/dss-framework-project-server/src/main/java/com/webank/wedatasphere/dss/framework/project/service/impl/DSSProjectServiceImpl.java
index e223ea6f5..ee5626f8a 100644
--- a/dss-framework/dss-framework-project-server/src/main/java/com/webank/wedatasphere/dss/framework/project/service/impl/DSSProjectServiceImpl.java
+++ b/dss-framework/dss-framework-project-server/src/main/java/com/webank/wedatasphere/dss/framework/project/service/impl/DSSProjectServiceImpl.java
@@ -24,6 +24,7 @@
 import com.google.gson.GsonBuilder;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParser;
+import com.google.gson.reflect.TypeToken;
 import com.webank.wedatasphere.dss.appconn.core.AppConn;
 import com.webank.wedatasphere.dss.appconn.manager.AppConnManager;
 import com.webank.wedatasphere.dss.common.entity.BmlResource;
@@ -245,6 +246,12 @@ public List<ProjectResponse> getListByParam(ProjectQueryRequest projectRequest)
             projectResponse.setAssociateGit(projectVo.getAssociateGit());
             projectResponse.setDevProcessList(ProjectStringUtils.convertList(projectVo.getDevProcess()));
             projectResponse.setOrchestratorModeList(ProjectStringUtils.convertList(projectVo.getOrchestratorMode()));
+            if(projectVo.getDataSourceListJson()!=null){
+                List<DSSProjectDataSource> dataSourceList = DSSCommonUtils.COMMON_GSON.fromJson(projectVo.getDataSourceListJson(),
+                        new TypeToken<List<DSSProjectDataSource>>() {
+                        }.getType());
+                projectResponse.setDataSourceList(dataSourceList);
+            }
             projectResponseList.add(projectResponse);
 
             String pusername = projectVo.getPusername();
@@ -419,6 +426,12 @@ public List<ProjectResponse> getDeletedProjects(ProjectQueryRequest projectReque
             projectResponse.setUpdateTime(projectVo.getUpdateTime());
             projectResponse.setDevProcessList(ProjectStringUtils.convertList(projectVo.getDevProcess()));
             projectResponse.setOrchestratorModeList(ProjectStringUtils.convertList(projectVo.getOrchestratorMode()));
+            if(projectVo.getDataSourceListJson()!=null){
+                List<DSSProjectDataSource> dataSourceList = DSSCommonUtils.COMMON_GSON.fromJson(projectVo.getDataSourceListJson(),
+                        new TypeToken<List<DSSProjectDataSource>>() {
+                        }.getType());
+                projectResponse.setDataSourceList(dataSourceList);
+            }
             projectResponseList.add(projectResponse);
             /**
              * 拆分有projectId +"-" + priv + "-" + username的拼接而成的字段，

From b0172ec7c54fab40bb352a2266616dbd053de480 Mon Sep 17 00:00:00 2001
From: Zhaobincai <747839893@qq.com>
Date: Fri, 7 Jun 2024 15:51:33 +0800
Subject: [PATCH 267/302] fix rollback: add system

---
 .../server/service/impl/OrchestratorServiceImpl.java            | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/impl/OrchestratorServiceImpl.java b/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/impl/OrchestratorServiceImpl.java
index 699775265..02f9fd1b5 100644
--- a/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/impl/OrchestratorServiceImpl.java
+++ b/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/impl/OrchestratorServiceImpl.java
@@ -456,7 +456,7 @@ public void rollbackOrchestratorGit(OrchestratorRollBackGitVo rollBackGitVo, Str
                     submitRequest.setProjectName(projectName);
                     submitRequest.setLabels(labels);
                     submitRequest.setComment("rollback workflow: " + dssOrchestratorInfo.getName());
-                    orchestratorPluginService.submitWorkflowToBML(submitRequest, userName, workspace);
+                    orchestratorPluginService.submitWorkflowToBML(submitRequest, "system", workspace);
                 } else {
                     GitRevertRequest gitRevertRequest = new GitRevertRequest(workspace.getWorkspaceId(), projectName, oldOrcVersion.getCommitId(), dssOrchestratorInfo.getName(), "system");
                     GitCommitResponse gitCommitResponse = RpcAskUtils.processAskException(sender.ask(gitRevertRequest), GitCommitResponse.class, GitRevertRequest.class);

From 1a78c041407ada57eb18fc1d62ac004c0bb8ff39 Mon Sep 17 00:00:00 2001
From: xlinliu <arionliu@webank.com>
Date: Fri, 7 Jun 2024 17:57:10 +0800
Subject: [PATCH 268/302] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E6=94=AF=E6=8C=81?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=95=B0=E6=8D=AE=E6=BA=90=E2=80=94=E2=80=94?=
 =?UTF-8?q?=E5=9B=9E=E6=98=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/DSSProjectServiceImpl.java      | 16 ++++------------
 .../project/ref/DSSProjectContentRequestRef.java |  6 +++---
 .../project/ref/ProjectUpdateRequestRef.java     |  6 +++---
 3 files changed, 10 insertions(+), 18 deletions(-)

diff --git a/dss-framework/dss-framework-project-server/src/main/java/com/webank/wedatasphere/dss/framework/project/service/impl/DSSProjectServiceImpl.java b/dss-framework/dss-framework-project-server/src/main/java/com/webank/wedatasphere/dss/framework/project/service/impl/DSSProjectServiceImpl.java
index ee5626f8a..b133b4982 100644
--- a/dss-framework/dss-framework-project-server/src/main/java/com/webank/wedatasphere/dss/framework/project/service/impl/DSSProjectServiceImpl.java
+++ b/dss-framework/dss-framework-project-server/src/main/java/com/webank/wedatasphere/dss/framework/project/service/impl/DSSProjectServiceImpl.java
@@ -22,8 +22,6 @@
 import com.google.common.util.concurrent.ThreadFactoryBuilder;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
-import com.google.gson.JsonObject;
-import com.google.gson.JsonParser;
 import com.google.gson.reflect.TypeToken;
 import com.webank.wedatasphere.dss.appconn.core.AppConn;
 import com.webank.wedatasphere.dss.appconn.manager.AppConnManager;
@@ -40,10 +38,8 @@
 import com.webank.wedatasphere.dss.framework.project.dao.DSSProjectMapper;
 import com.webank.wedatasphere.dss.framework.project.dao.DSSProjectUserMapper;
 import com.webank.wedatasphere.dss.framework.project.entity.DSSProjectDO;
-import com.webank.wedatasphere.dss.framework.project.entity.OrchestratorBatchImportInfo;
 import com.webank.wedatasphere.dss.framework.project.entity.po.ProjectRelationPo;
 import com.webank.wedatasphere.dss.framework.project.entity.request.*;
-import com.webank.wedatasphere.dss.framework.project.entity.response.BatchExportResult;
 import com.webank.wedatasphere.dss.framework.project.entity.response.ProjectResponse;
 import com.webank.wedatasphere.dss.framework.project.entity.vo.ProjectInfoVo;
 import com.webank.wedatasphere.dss.framework.project.entity.vo.QueryProjectVo;
@@ -53,9 +49,7 @@
 import com.webank.wedatasphere.dss.framework.project.service.ImportService;
 import com.webank.wedatasphere.dss.framework.project.utils.ProjectStringUtils;
 import com.webank.wedatasphere.dss.git.common.protocol.request.GitArchiveProjectRequest;
-import com.webank.wedatasphere.dss.git.common.protocol.request.GitCreateProjectRequest;
 import com.webank.wedatasphere.dss.git.common.protocol.response.GitArchivePorjectResponse;
-import com.webank.wedatasphere.dss.orchestrator.common.entity.DSSOrchestratorInfo;
 import com.webank.wedatasphere.dss.orchestrator.server.entity.request.OrchestratorRequest;
 import com.webank.wedatasphere.dss.orchestrator.server.entity.vo.OrchestratorBaseInfo;
 import com.webank.wedatasphere.dss.orchestrator.server.service.OrchestratorService;
@@ -66,11 +60,9 @@
 import com.webank.wedatasphere.dss.standard.app.structure.project.ref.DSSProjectDataSource;
 import com.webank.wedatasphere.dss.standard.app.structure.project.ref.RefProjectContentRequestRef;
 import com.webank.wedatasphere.dss.standard.common.desc.AppInstance;
-import org.apache.commons.codec.digest.DigestUtils;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.lang.StringUtils;
-import org.apache.commons.lang3.exception.ExceptionUtils;
 import org.apache.linkis.rpc.Sender;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -138,7 +130,7 @@ public DSSProjectDO createProject(String username, ProjectCreateRequest projectC
         project.setOrchestratorMode(ProjectStringUtils.getModeStr(projectCreateRequest.getOrchestratorModeList()));
         List<DSSProjectDataSource> dataSourceList = projectCreateRequest.getDataSourceList();
         if (dataSourceList != null && !dataSourceList.isEmpty()) {
-            project.setDataSourceListJson(DSSCommonUtils.COMMON_GSON.toJson(dataSourceList));
+            project.setDataSourceListJson(new Gson().toJson(dataSourceList));
         }
         projectMapper.insert(project);
         return project;
@@ -164,7 +156,7 @@ public DSSProjectDO modifyProject(String username, ProjectModifyRequest projectM
         project.setAssociateGit(projectModifyRequest.getAssociateGit());
         List<DSSProjectDataSource> dataSourceList = projectModifyRequest.getDataSourceList();
         if (dataSourceList != null && !dataSourceList.isEmpty()) {
-            project.setDataSourceListJson(DSSCommonUtils.COMMON_GSON.toJson(dataSourceList));
+            project.setDataSourceListJson(new Gson().toJson(dataSourceList));
         }
         UpdateWrapper<DSSProjectDO> updateWrapper = new UpdateWrapper<>();
         updateWrapper.eq("id", projectModifyRequest.getId());
@@ -247,7 +239,7 @@ public List<ProjectResponse> getListByParam(ProjectQueryRequest projectRequest)
             projectResponse.setDevProcessList(ProjectStringUtils.convertList(projectVo.getDevProcess()));
             projectResponse.setOrchestratorModeList(ProjectStringUtils.convertList(projectVo.getOrchestratorMode()));
             if(projectVo.getDataSourceListJson()!=null){
-                List<DSSProjectDataSource> dataSourceList = DSSCommonUtils.COMMON_GSON.fromJson(projectVo.getDataSourceListJson(),
+                List<DSSProjectDataSource> dataSourceList = new Gson().fromJson(projectVo.getDataSourceListJson(),
                         new TypeToken<List<DSSProjectDataSource>>() {
                         }.getType());
                 projectResponse.setDataSourceList(dataSourceList);
@@ -427,7 +419,7 @@ public List<ProjectResponse> getDeletedProjects(ProjectQueryRequest projectReque
             projectResponse.setDevProcessList(ProjectStringUtils.convertList(projectVo.getDevProcess()));
             projectResponse.setOrchestratorModeList(ProjectStringUtils.convertList(projectVo.getOrchestratorMode()));
             if(projectVo.getDataSourceListJson()!=null){
-                List<DSSProjectDataSource> dataSourceList = DSSCommonUtils.COMMON_GSON.fromJson(projectVo.getDataSourceListJson(),
+                List<DSSProjectDataSource> dataSourceList = new Gson().fromJson(projectVo.getDataSourceListJson(),
                         new TypeToken<List<DSSProjectDataSource>>() {
                         }.getType());
                 projectResponse.setDataSourceList(dataSourceList);
diff --git a/dss-standard/structure-standard/dss-structure-integration-standard/src/main/java/com/webank/wedatasphere/dss/standard/app/structure/project/ref/DSSProjectContentRequestRef.java b/dss-standard/structure-standard/dss-structure-integration-standard/src/main/java/com/webank/wedatasphere/dss/standard/app/structure/project/ref/DSSProjectContentRequestRef.java
index a95e89fac..1a9cefb37 100644
--- a/dss-standard/structure-standard/dss-structure-integration-standard/src/main/java/com/webank/wedatasphere/dss/standard/app/structure/project/ref/DSSProjectContentRequestRef.java
+++ b/dss-standard/structure-standard/dss-structure-integration-standard/src/main/java/com/webank/wedatasphere/dss/standard/app/structure/project/ref/DSSProjectContentRequestRef.java
@@ -1,8 +1,8 @@
 package com.webank.wedatasphere.dss.standard.app.structure.project.ref;
 
+import com.google.gson.Gson;
 import com.google.gson.reflect.TypeToken;
 import com.webank.wedatasphere.dss.common.entity.project.DSSProject;
-import com.webank.wedatasphere.dss.common.utils.DSSCommonUtils;
 import com.webank.wedatasphere.dss.standard.app.structure.StructureRequestRef;
 import com.webank.wedatasphere.dss.standard.app.structure.StructureRequestRefImpl;
 
@@ -46,7 +46,7 @@ default R setDSSProjectPrivilege(DSSProjectPrivilege dssProjectPrivilege) {
     default List<DSSProjectDataSource> getDSSProjectDataSources() {
         String json = (String) this.getParameter("dssProjectDataSources");
         if(json != null) {
-          return   DSSCommonUtils.COMMON_GSON.fromJson(json, new TypeToken<List<DSSProjectDataSource>>(){}.getType());
+          return   new Gson().fromJson(json, new TypeToken<List<DSSProjectDataSource>>(){}.getType());
         }
         return Collections.emptyList();
     }
@@ -55,7 +55,7 @@ default List<DSSProjectDataSource> getDSSProjectDataSources() {
     default R setDSSProjectDataSources(List<DSSProjectDataSource> dssProjectDataSources) {
         //为了让第三方组件可以不用升级dss依赖包，转成json string再存储
         if(dssProjectDataSources != null) {
-            setParameter("dssProjectDataSources", DSSCommonUtils.COMMON_GSON.toJson(dssProjectDataSources));
+            setParameter("dssProjectDataSources", new Gson().toJson(dssProjectDataSources));
         }
         return (R) this;
     }
diff --git a/dss-standard/structure-standard/dss-structure-integration-standard/src/main/java/com/webank/wedatasphere/dss/standard/app/structure/project/ref/ProjectUpdateRequestRef.java b/dss-standard/structure-standard/dss-structure-integration-standard/src/main/java/com/webank/wedatasphere/dss/standard/app/structure/project/ref/ProjectUpdateRequestRef.java
index c5c0fbfd0..b33a4b6e3 100644
--- a/dss-standard/structure-standard/dss-structure-integration-standard/src/main/java/com/webank/wedatasphere/dss/standard/app/structure/project/ref/ProjectUpdateRequestRef.java
+++ b/dss-standard/structure-standard/dss-structure-integration-standard/src/main/java/com/webank/wedatasphere/dss/standard/app/structure/project/ref/ProjectUpdateRequestRef.java
@@ -1,7 +1,7 @@
 package com.webank.wedatasphere.dss.standard.app.structure.project.ref;
 
+import com.google.gson.Gson;
 import com.google.gson.reflect.TypeToken;
-import com.webank.wedatasphere.dss.common.utils.DSSCommonUtils;
 import com.webank.wedatasphere.dss.standard.app.structure.StructureRequestRefImpl;
 
 import java.util.Collections;
@@ -59,7 +59,7 @@ default R setRemovedDSSProjectPrivilege(DSSProjectPrivilege removedDSSProjectPri
     default List<DSSProjectDataSource> getDSSProjectDataSources() {
         String json = (String) this.getParameter("dssProjectDataSources");
         if(json != null) {
-            return   DSSCommonUtils.COMMON_GSON.fromJson(json, new TypeToken<List<DSSProjectDataSource>>(){}.getType());
+            return   new Gson().fromJson(json, new TypeToken<List<DSSProjectDataSource>>(){}.getType());
         }
         return Collections.emptyList();
     }
@@ -67,7 +67,7 @@ default List<DSSProjectDataSource> getDSSProjectDataSources() {
 
     default R setDSSProjectDataSources(List<DSSProjectDataSource> dssProjectDataSources) {
         //为了让第三方组件可以不用升级dss依赖包，转成json string再存储
-        String json = DSSCommonUtils.COMMON_GSON.toJson(dssProjectDataSources);
+        String json = new Gson().toJson(dssProjectDataSources);
         setParameter("dssProjectDataSources", json);
         return (R) this;
     }

From b541cf08258718c4779808e3aba697753a23a6d2 Mon Sep 17 00:00:00 2001
From: Zhaobincai <747839893@qq.com>
Date: Fri, 7 Jun 2024 19:41:21 +0800
Subject: [PATCH 269/302] fix delete

---
 .../framework/project/service/impl/DSSProjectServiceImpl.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dss-framework/dss-framework-project-server/src/main/java/com/webank/wedatasphere/dss/framework/project/service/impl/DSSProjectServiceImpl.java b/dss-framework/dss-framework-project-server/src/main/java/com/webank/wedatasphere/dss/framework/project/service/impl/DSSProjectServiceImpl.java
index ee5626f8a..5a7bc0f8c 100644
--- a/dss-framework/dss-framework-project-server/src/main/java/com/webank/wedatasphere/dss/framework/project/service/impl/DSSProjectServiceImpl.java
+++ b/dss-framework/dss-framework-project-server/src/main/java/com/webank/wedatasphere/dss/framework/project/service/impl/DSSProjectServiceImpl.java
@@ -341,8 +341,6 @@ public void deleteProject(String username, ProjectDeleteRequest projectDeleteReq
         if(!dssProjectDO.getUsername().equalsIgnoreCase(username)){
             throw new DSSErrorException(600002, "刪除工程失敗，沒有删除权限!" );
         }
-        // 对于DSS项目进行归档
-        archiveGitProject(username, projectDeleteRequest, workspace, dssProjectDO);
         if(projectDeleteRequest.isIfDelOtherSys()) {
             LOGGER.warn("User {} requires to delete all projects with name {} in third-party AppConns.", username, dssProjectDO.getName());
             Map<AppInstance, Long> appInstanceToRefProjectId = new HashMap<>(10);
@@ -364,6 +362,8 @@ public void deleteProject(String username, ProjectDeleteRequest projectDeleteReq
                 null, "delete refProject " + dssProjectDO.getName());
         }
         projectMapper.deleteProject(projectDeleteRequest.getId());
+        // 对于DSS项目进行归档
+        archiveGitProject(username, projectDeleteRequest, workspace, dssProjectDO);
         LOGGER.warn("User {} deleted project {}.", username, dssProjectDO.getName());
     }
 

From 359d19511e730cc17bf460481b1cc49715c3a94a Mon Sep 17 00:00:00 2001
From: Zhaobincai <747839893@qq.com>
Date: Tue, 11 Jun 2024 19:41:55 +0800
Subject: [PATCH 270/302] add associate check

---
 .../OrchestratorFrameworkServiceImpl.java     | 32 +++++++++++--------
 .../service/impl/OrchestratorServiceImpl.java |  8 +++--
 2 files changed, 23 insertions(+), 17 deletions(-)

diff --git a/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/impl/OrchestratorFrameworkServiceImpl.java b/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/impl/OrchestratorFrameworkServiceImpl.java
index 9044bae82..15c26d536 100644
--- a/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/impl/OrchestratorFrameworkServiceImpl.java
+++ b/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/impl/OrchestratorFrameworkServiceImpl.java
@@ -38,6 +38,7 @@
 import com.webank.wedatasphere.dss.common.utils.DSSExceptionUtils;
 import com.webank.wedatasphere.dss.common.utils.RpcAskUtils;
 import com.webank.wedatasphere.dss.framework.common.exception.DSSFrameworkErrorException;
+import com.webank.wedatasphere.dss.git.common.protocol.exception.GitErrorException;
 import com.webank.wedatasphere.dss.git.common.protocol.request.GitCommitInfoBetweenRequest;
 import com.webank.wedatasphere.dss.git.common.protocol.request.GitHistoryRequest;
 import com.webank.wedatasphere.dss.git.common.protocol.request.GitRemoveRequest;
@@ -287,21 +288,24 @@ public CommonOrchestratorVo deleteOrchestrator(String username, OrchestratorDele
                     (structureOperation, structureRequestRef) -> ((OrchestrationDeletionOperation) structureOperation)
                             .deleteOrchestration((RefOrchestrationContentRequestRef) structureRequestRef), "delete");
         }
-        try {
-            // git删除成功之后再删除库表记录
-            Sender sender = DSSSenderServiceFactory.getOrCreateServiceInstance().getGitSender();
-            List<String> path = new ArrayList<>();
-            path.add(orchestratorInfo.getName());
-            GitRemoveRequest removeRequest = new GitRemoveRequest(workspace.getWorkspaceId(), dssProject.getName(), path, username);
-            GitCommitResponse commitResponse = RpcAskUtils.processAskException(sender.ask(removeRequest), GitCommitResponse.class, GitRemoveRequest.class);
-            lockMapper.updateOrchestratorStatus(orchestratorDeleteRequest.getId(), OrchestratorRefConstant.FLOW_STATUS_PUSH);
-            DSSOrchestratorVersion versionById = orchestratorMapper.getLatestOrchestratorVersionById(orchestratorInfo.getId());
-            if (versionById != null) {
-                lockMapper.updateOrchestratorVersionCommitId(commitResponse.getCommitId(), versionById.getAppId());
+        if (dssProject.getAssociateGit() != null && dssProject.getAssociateGit()) {
+            try {
+                // git删除成功之后再删除库表记录
+                Sender sender = DSSSenderServiceFactory.getOrCreateServiceInstance().getGitSender();
+                List<String> path = new ArrayList<>();
+                path.add(orchestratorInfo.getName());
+                GitRemoveRequest removeRequest = new GitRemoveRequest(workspace.getWorkspaceId(), dssProject.getName(), path, username);
+                GitCommitResponse commitResponse = RpcAskUtils.processAskException(sender.ask(removeRequest), GitCommitResponse.class, GitRemoveRequest.class);
+                lockMapper.updateOrchestratorStatus(orchestratorDeleteRequest.getId(), OrchestratorRefConstant.FLOW_STATUS_PUSH);
+                DSSOrchestratorVersion versionById = orchestratorMapper.getLatestOrchestratorVersionById(orchestratorInfo.getId());
+                if (versionById != null) {
+                    lockMapper.updateOrchestratorVersionCommitId(commitResponse.getCommitId(), versionById.getAppId());
+                }
+            } catch (Exception e) {
+                LOGGER.error("git remove failed, the reason is: ", e);
+                lockMapper.updateOrchestratorStatus(orchestratorDeleteRequest.getId(), OrchestratorRefConstant.FLOW_STATUS_SAVE);
+                throw new GitErrorException(800001, e.getMessage());
             }
-        } catch (Exception e) {
-            LOGGER.error("git remove failed, the reason is: ", e);
-            lockMapper.updateOrchestratorStatus(orchestratorDeleteRequest.getId(), OrchestratorRefConstant.FLOW_STATUS_SAVE);
         }
         orchestratorService.deleteOrchestrator(username, workspace, dssProject.getName(), orchestratorInfo.getId(), dssLabels);
         orchestratorOperateService.deleteTemplateOperate(orchestratorInfo.getId());
diff --git a/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/impl/OrchestratorServiceImpl.java b/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/impl/OrchestratorServiceImpl.java
index 02f9fd1b5..0a986dab4 100644
--- a/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/impl/OrchestratorServiceImpl.java
+++ b/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/impl/OrchestratorServiceImpl.java
@@ -505,9 +505,11 @@ public Long isExistSameNameBeforeUpdate(OrchestratorModifyRequest orchestratorMo
         //若修改了编排名称，检查是否存在相同的编排名称
         if (!orchestratorModifRequest.getOrchestratorName().equals(orchestratorInfo.getName())) {
             isExistSameNameBeforeCreate(orchestratorModifRequest.getWorkspaceId(), orchestratorModifRequest.getProjectId(), orchestratorModifRequest.getOrchestratorName());
-            Sender sender = DSSSenderServiceFactory.getOrCreateServiceInstance().getGitSender();
-            GitRenameRequest renameRequest = new GitRenameRequest(orchestratorInfo.getWorkspaceId(), dssProject.getName(), orchestratorInfo.getName(), orchestratorModifRequest.getOrchestratorName(), username);
-            RpcAskUtils.processAskException(sender.ask(renameRequest), GitCommitResponse.class, GitRenameRequest.class);
+            if (dssProject.getAssociateGit() != null && dssProject.getAssociateGit()) {
+                Sender sender = DSSSenderServiceFactory.getOrCreateServiceInstance().getGitSender();
+                GitRenameRequest renameRequest = new GitRenameRequest(orchestratorInfo.getWorkspaceId(), dssProject.getName(), orchestratorInfo.getName(), orchestratorModifRequest.getOrchestratorName(), username);
+                RpcAskUtils.processAskException(sender.ask(renameRequest), GitCommitResponse.class, GitRenameRequest.class);
+            }
         }
         return orchestratorInfo.getId();
     }

From 91b6a74d6e8c0934efc13ea51ee8612a4aac1550 Mon Sep 17 00:00:00 2001
From: Zhaobincai <747839893@qq.com>
Date: Wed, 12 Jun 2024 14:52:51 +0800
Subject: [PATCH 271/302] git-server: add schedule-delete local project

---
 .../dss/git/dao/DSSWorkspaceGitMapper.java    |  2 +
 .../git/dao/impl/DSSWorkspaceGitMapper.xml    |  4 +
 .../GitProjectManager.java}                   | 97 +++++++++++++------
 .../git/service/DSSWorkspaceGitService.java   | 25 -----
 .../impl/DSSGitProjectManagerServiceImpl.java | 13 +--
 .../DSSGitWorkflowManagerServiceImpl.java     | 25 +++--
 .../wedatasphere/dss/git/utils/FileUtils.java | 26 ++++-
 .../receiver/DSSGitChooser.scala              |  7 +-
 .../receiver/DSSGitReceiver.scala             | 14 +--
 9 files changed, 122 insertions(+), 91 deletions(-)
 rename dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/{service/impl/DSSWorkspaceGitServiceImpl.java => manage/GitProjectManager.java} (71%)
 delete mode 100644 dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/DSSWorkspaceGitService.java

diff --git a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/dao/DSSWorkspaceGitMapper.java b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/dao/DSSWorkspaceGitMapper.java
index b2a7af368..af3d78ed1 100644
--- a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/dao/DSSWorkspaceGitMapper.java
+++ b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/dao/DSSWorkspaceGitMapper.java
@@ -18,4 +18,6 @@ public interface DSSWorkspaceGitMapper {
     GitUserEntity selectByUser(@Param("gitUser") String gitUser);
 
     List<GitUserEntity> selectGitUser(@Param("workspaceId") Long workspaceId, @Param("type") String type, @Param("gitUser") String gitUser);
+
+    List<Long> getAllWorkspaceId();
 }
diff --git a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/dao/impl/DSSWorkspaceGitMapper.xml b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/dao/impl/DSSWorkspaceGitMapper.xml
index 6648b7648..42e51d950 100644
--- a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/dao/impl/DSSWorkspaceGitMapper.xml
+++ b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/dao/impl/DSSWorkspaceGitMapper.xml
@@ -65,4 +65,8 @@
             and git_user = #{gitUser}
         </if>
     </select>
+
+    <select id="getAllWorkspaceId" resultType="java.lang.Long">
+        select distinct workspace_id from dss_workspace_associate_git
+    </select>
 </mapper>
\ No newline at end of file
diff --git a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSWorkspaceGitServiceImpl.java b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/manage/GitProjectManager.java
similarity index 71%
rename from dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSWorkspaceGitServiceImpl.java
rename to dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/manage/GitProjectManager.java
index 281398f38..476b9c40b 100644
--- a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSWorkspaceGitServiceImpl.java
+++ b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/manage/GitProjectManager.java
@@ -1,4 +1,5 @@
-package com.webank.wedatasphere.dss.git.service.impl;
+package com.webank.wedatasphere.dss.git.manage;
+
 
 import com.webank.wedatasphere.dss.common.exception.DSSErrorException;
 import com.webank.wedatasphere.dss.git.common.protocol.GitUserEntity;
@@ -6,15 +7,16 @@
 import com.webank.wedatasphere.dss.git.common.protocol.constant.GitConstant;
 import com.webank.wedatasphere.dss.git.common.protocol.request.GitConnectRequest;
 import com.webank.wedatasphere.dss.git.common.protocol.request.GitUserInfoByRequest;
-import com.webank.wedatasphere.dss.git.common.protocol.request.GitUserUpdateRequest;
 import com.webank.wedatasphere.dss.git.common.protocol.request.GitUserInfoRequest;
+import com.webank.wedatasphere.dss.git.common.protocol.request.GitUserUpdateRequest;
 import com.webank.wedatasphere.dss.git.common.protocol.response.GitConnectResponse;
 import com.webank.wedatasphere.dss.git.common.protocol.response.GitUserInfoListResponse;
-import com.webank.wedatasphere.dss.git.common.protocol.response.GitUserUpdateResponse;
 import com.webank.wedatasphere.dss.git.common.protocol.response.GitUserInfoResponse;
+import com.webank.wedatasphere.dss.git.common.protocol.response.GitUserUpdateResponse;
 import com.webank.wedatasphere.dss.git.common.protocol.util.UrlUtils;
 import com.webank.wedatasphere.dss.git.dao.DSSWorkspaceGitMapper;
-import com.webank.wedatasphere.dss.git.service.DSSWorkspaceGitService;
+import com.webank.wedatasphere.dss.git.utils.DSSGitUtils;
+import com.webank.wedatasphere.dss.git.utils.FileUtils;
 import org.apache.commons.lang.StringUtils;
 import org.apache.http.HttpResponse;
 import org.apache.http.client.methods.HttpGet;
@@ -22,28 +24,75 @@
 import org.apache.http.impl.client.CloseableHttpClient;
 import org.apache.http.impl.client.HttpClients;
 import org.apache.http.util.EntityUtils;
+import org.apache.linkis.DataWorkCloudApplication;
+import org.apache.linkis.common.utils.Utils;
 import org.json.JSONObject;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
 
 import javax.crypto.Cipher;
 import javax.crypto.spec.SecretKeySpec;
 import java.security.Key;
 import java.util.Base64;
 import java.util.List;
+import java.util.concurrent.TimeUnit;
+
+public class GitProjectManager {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(GitProjectManager.class);
+
+    private volatile static boolean isInit;
+
+    private static DSSWorkspaceGitMapper workspaceGitMapper;
 
-@Service
-public class DSSWorkspaceGitServiceImpl implements DSSWorkspaceGitService {
-    private Logger logger = LoggerFactory.getLogger(this.getClass());
 
-    @Autowired
-    private DSSWorkspaceGitMapper workspaceGitMapper;
+    protected GitProjectManager() {
+    }
 
+    static {
+        LOGGER.info("已归档项目移除定时线程开启...");
+        init();
+        Utils.defaultScheduler().scheduleAtFixedRate(() -> {
+            try {
+                List<Long> allWorkspaceId = workspaceGitMapper.getAllWorkspaceId();
+                for (Long workspaceId : allWorkspaceId) {
+                    GitUserEntity gitUser = selectGit(workspaceId, GitConstant.GIT_ACCESS_WRITE_TYPE, true);
+                    if (gitUser == null) {
+                        break;
+                    }
+                    List<String> allGitProjectName = DSSGitUtils.getAllProjectName(gitUser);
+                    List<String> localProjectName = FileUtils.getLocalProjectName(workspaceId);
+                    LOGGER.info("localProjectName is : {}", localProjectName.toString());
+                    localProjectName.removeAll(allGitProjectName);
+                    if (localProjectName.size() > 0) {
+                        LOGGER.info("Project to delete : {}", localProjectName.toString());
+                        for (String projectName : localProjectName) {
+                            // 删除本地项目
+                            DSSGitUtils.archiveLocal(projectName, workspaceId);
+                        }
+                    } else {
+                        LOGGER.info("Nothing need to delete");
+                    }
+
+                }
+            } catch (Exception e) {
+                LOGGER.error("定时清理归档项目错误", e);
+            }
+        }, 0,1, TimeUnit.DAYS);
+    }
 
-    @Override
-    public GitUserUpdateResponse associateGit(GitUserUpdateRequest gitUserCreateRequest) throws DSSErrorException {
+    public static void init() {
+        if (!isInit) {
+            synchronized (GitProjectManager.class) {
+                if (!isInit) {
+                    workspaceGitMapper = DataWorkCloudApplication.getApplicationContext().getBean(DSSWorkspaceGitMapper.class);
+                    isInit = true;
+                }
+            }
+        }
+    }
+
+    public static GitUserUpdateResponse associateGit(GitUserUpdateRequest gitUserCreateRequest) throws DSSErrorException {
         if (gitUserCreateRequest == null) {
             throw new DSSErrorException(010101, "gitUserCreateRequest is null");
         }
@@ -85,9 +134,7 @@ public GitUserUpdateResponse associateGit(GitUserUpdateRequest gitUserCreateRequ
         return new GitUserUpdateResponse(0,"", null);
     }
 
-
-    @Override
-    public GitUserInfoResponse selectGitUserInfo(GitUserInfoRequest gitUserInfoRequest) throws DSSErrorException {
+    public static GitUserInfoResponse selectGitUserInfo(GitUserInfoRequest gitUserInfoRequest) throws DSSErrorException {
         if (gitUserInfoRequest == null) {
             throw  new DSSErrorException(010101, "gitUserCreateRequest is null");
         }
@@ -101,8 +148,7 @@ public GitUserInfoResponse selectGitUserInfo(GitUserInfoRequest gitUserInfoReque
         return gitUserInfoResponse;
     }
 
-    @Override
-    public GitUserEntity selectGit(Long workspaceId, String type, Boolean decrypt) {
+    public static GitUserEntity selectGit(Long workspaceId, String type, Boolean decrypt) {
         try {
             GitUserEntity gitUserEntity = workspaceGitMapper.selectByWorkspaceId(workspaceId, type);
             if (gitUserEntity == null) {
@@ -123,7 +169,7 @@ public GitUserEntity selectGit(Long workspaceId, String type, Boolean decrypt) {
         }
     }
 
-    private String generateKeys(String password, int mode) throws DSSErrorException{
+    private static String generateKeys(String password, int mode) throws DSSErrorException{
         // 定义一个字符串作为密钥源
         String keyString = GitServerConfig.LINKIS_MYSQL_PRI_KEY.getValue();
         if (keyString.length() < 16) {
@@ -152,8 +198,7 @@ private String generateKeys(String password, int mode) throws DSSErrorException{
         }
     }
 
-    @Override
-    public GitConnectResponse gitTokenTest(GitConnectRequest connectTestRequest)throws DSSErrorException {
+    public static GitConnectResponse gitTokenTest(GitConnectRequest connectTestRequest)throws DSSErrorException {
         // GitLab 令牌
         String token = connectTestRequest.getToken();
         // 期望匹配的用户名
@@ -174,24 +219,22 @@ public GitConnectResponse gitTokenTest(GitConnectRequest connectTestRequest)thro
             String actualUsername = userData.getString("username");
 
             if (response.getStatusLine().getStatusCode() == 200 && actualUsername.equals(expectedUsername)) {
-                logger.info("Token is valid and matches the username: " + actualUsername);
+                LOGGER.info("Token is valid and matches the username: " + actualUsername);
                 return new GitConnectResponse(true);
             } else {
-                logger.info("Token is invalid or does not match the expected username.");
+                LOGGER.info("Token is invalid or does not match the expected username.");
                 return new GitConnectResponse(false);
             }
         } catch (Exception e) {
-            logger.info("Error verifying token: " + e.getMessage());
+            LOGGER.info("Error verifying token: " + e.getMessage());
             throw new DSSErrorException(800001, "verifying token failed, the reason is:" + e);
         }
     }
 
-    @Override
-    public GitUserInfoListResponse getGitUserByType(GitUserInfoByRequest infoByRequest) {
+    public static GitUserInfoListResponse getGitUserByType(GitUserInfoByRequest infoByRequest) {
         List<GitUserEntity> gitUserEntities = workspaceGitMapper.selectGitUser(infoByRequest.getWorkspaceId(), infoByRequest.getType(), infoByRequest.getGitUserName());
         GitUserInfoListResponse gitUserInfoListResponse = new GitUserInfoListResponse();
         gitUserInfoListResponse.setGitUserEntities(gitUserEntities);
         return gitUserInfoListResponse;
     }
-
 }
diff --git a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/DSSWorkspaceGitService.java b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/DSSWorkspaceGitService.java
deleted file mode 100644
index cc49272e0..000000000
--- a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/DSSWorkspaceGitService.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package com.webank.wedatasphere.dss.git.service;
-
-import com.webank.wedatasphere.dss.common.exception.DSSErrorException;
-import com.webank.wedatasphere.dss.git.common.protocol.GitUserEntity;
-import com.webank.wedatasphere.dss.git.common.protocol.request.GitConnectRequest;
-import com.webank.wedatasphere.dss.git.common.protocol.request.GitUserInfoByRequest;
-import com.webank.wedatasphere.dss.git.common.protocol.request.GitUserUpdateRequest;
-import com.webank.wedatasphere.dss.git.common.protocol.request.GitUserInfoRequest;
-import com.webank.wedatasphere.dss.git.common.protocol.response.GitConnectResponse;
-import com.webank.wedatasphere.dss.git.common.protocol.response.GitUserInfoListResponse;
-import com.webank.wedatasphere.dss.git.common.protocol.response.GitUserUpdateResponse;
-import com.webank.wedatasphere.dss.git.common.protocol.response.GitUserInfoResponse;
-
-public interface DSSWorkspaceGitService {
-
-    GitUserUpdateResponse associateGit(GitUserUpdateRequest gitUserCreateRequest) throws DSSErrorException;
-
-    GitUserInfoResponse selectGitUserInfo(GitUserInfoRequest gitUserInfoRequest) throws DSSErrorException;
-
-    GitUserEntity selectGit(Long workspaceId, String type, Boolean decrypt);
-
-    GitConnectResponse gitTokenTest(GitConnectRequest connectTestRequest) throws DSSErrorException;
-
-    GitUserInfoListResponse getGitUserByType(GitUserInfoByRequest typeRequest);
-}
diff --git a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitProjectManagerServiceImpl.java b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitProjectManagerServiceImpl.java
index 80cd5157f..8affe59a6 100644
--- a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitProjectManagerServiceImpl.java
+++ b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitProjectManagerServiceImpl.java
@@ -7,10 +7,9 @@
 import com.webank.wedatasphere.dss.git.common.protocol.exception.GitErrorException;
 import com.webank.wedatasphere.dss.git.common.protocol.request.*;
 import com.webank.wedatasphere.dss.git.common.protocol.response.*;
-import com.webank.wedatasphere.dss.git.common.protocol.config.GitServerConfig;
 import com.webank.wedatasphere.dss.git.constant.DSSGitConstant;
+import com.webank.wedatasphere.dss.git.manage.GitProjectManager;
 import com.webank.wedatasphere.dss.git.service.DSSGitProjectManagerService;
-import com.webank.wedatasphere.dss.git.service.DSSWorkspaceGitService;
 import com.webank.wedatasphere.dss.git.utils.DSSGitUtils;
 import com.webank.wedatasphere.dss.git.utils.FileUtils;
 import org.eclipse.jgit.lib.Repository;
@@ -22,7 +21,6 @@
 import org.springframework.stereotype.Service;
 
 import java.io.File;
-import java.lang.reflect.Array;
 import java.util.Arrays;
 import java.util.List;
 
@@ -30,9 +28,6 @@
 public class DSSGitProjectManagerServiceImpl  implements DSSGitProjectManagerService {
     private Logger logger = LoggerFactory.getLogger(this.getClass());
 
-    @Autowired
-    private DSSWorkspaceGitService dssWorkspaceGitService;
-
     @Autowired
     @Qualifier("projectBmlService")
     private BMLService bmlService;
@@ -40,7 +35,7 @@ public class DSSGitProjectManagerServiceImpl  implements DSSGitProjectManagerSer
     @Override
     public GitCreateProjectResponse create(GitCreateProjectRequest request) throws DSSErrorException{
         Long workspaceId = request.getWorkspaceId();
-        GitUserEntity gitUser = dssWorkspaceGitService.selectGit(workspaceId, GitConstant.GIT_ACCESS_WRITE_TYPE, true);
+        GitUserEntity gitUser = GitProjectManager.selectGit(workspaceId, GitConstant.GIT_ACCESS_WRITE_TYPE, true);
         if (gitUser == null) {
             logger.error("the workspace : {} don't associate with git", workspaceId);
             return null;
@@ -79,7 +74,7 @@ public GitCreateProjectResponse create(GitCreateProjectRequest request) throws D
 
     @Override
     public GitArchivePorjectResponse archive(GitArchiveProjectRequest request) throws GitErrorException {
-        GitUserEntity gitUser = dssWorkspaceGitService.selectGit(request.getWorkspaceId(), GitConstant.GIT_ACCESS_WRITE_TYPE, true);
+        GitUserEntity gitUser = GitProjectManager.selectGit(request.getWorkspaceId(), GitConstant.GIT_ACCESS_WRITE_TYPE, true);
         if (gitUser == null) {
             logger.error("the workspace : {} don't associate with git", request.getWorkspaceId());
             return null;
@@ -93,7 +88,7 @@ public GitArchivePorjectResponse archive(GitArchiveProjectRequest request) throw
 
     @Override
     public GitCheckProjectResponse checkProject(GitCheckProjectRequest request) throws DSSErrorException {
-        GitUserEntity gitUser = dssWorkspaceGitService.selectGit(request.getWorkspaceId(), GitConstant.GIT_ACCESS_WRITE_TYPE, true);
+        GitUserEntity gitUser = GitProjectManager.selectGit(request.getWorkspaceId(), GitConstant.GIT_ACCESS_WRITE_TYPE, true);
         if (gitUser == null) {
             logger.error("the workspace : {} don't associate with git", request.getWorkspaceId());
             return null;
diff --git a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitWorkflowManagerServiceImpl.java b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitWorkflowManagerServiceImpl.java
index 460fd74fb..f9ca098b9 100644
--- a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitWorkflowManagerServiceImpl.java
+++ b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitWorkflowManagerServiceImpl.java
@@ -12,8 +12,8 @@
 import com.webank.wedatasphere.dss.git.common.protocol.response.*;
 import com.webank.wedatasphere.dss.git.common.protocol.config.GitServerConfig;
 import com.webank.wedatasphere.dss.git.constant.DSSGitConstant;
+import com.webank.wedatasphere.dss.git.manage.GitProjectManager;
 import com.webank.wedatasphere.dss.git.service.DSSGitWorkflowManagerService;
-import com.webank.wedatasphere.dss.git.service.DSSWorkspaceGitService;
 import com.webank.wedatasphere.dss.git.utils.DSSGitUtils;
 import com.webank.wedatasphere.dss.git.utils.FileUtils;
 import org.apache.commons.lang.StringUtils;
@@ -38,16 +38,13 @@
 public class DSSGitWorkflowManagerServiceImpl implements DSSGitWorkflowManagerService {
     private Logger logger = LoggerFactory.getLogger(this.getClass());
 
-    @Autowired
-    private DSSWorkspaceGitService dssWorkspaceGitService;
-
     @Autowired
     @Qualifier("workflowBmlService")
     private BMLService bmlService;
     @Override
     public GitDiffResponse diff(GitDiffRequest request) {
         Long workspaceId = request.getWorkspaceId();
-        GitUserEntity gitUser = dssWorkspaceGitService.selectGit(workspaceId, GitConstant.GIT_ACCESS_WRITE_TYPE, true);
+        GitUserEntity gitUser = GitProjectManager.selectGit(workspaceId, GitConstant.GIT_ACCESS_WRITE_TYPE, true);
         if (gitUser == null) {
             logger.error("the workspace : {} don't associate with git", workspaceId);
             return null;
@@ -83,7 +80,7 @@ public GitDiffResponse diff(GitDiffRequest request) {
     @Override
     public GitCommitResponse commit(GitCommitRequest request) throws DSSErrorException {
         Long workspaceId = request.getWorkspaceId();
-        GitUserEntity gitUser = dssWorkspaceGitService.selectGit(workspaceId, GitConstant.GIT_ACCESS_WRITE_TYPE, true);
+        GitUserEntity gitUser = GitProjectManager.selectGit(workspaceId, GitConstant.GIT_ACCESS_WRITE_TYPE, true);
         if (gitUser == null) {
             logger.error("the workspace : {} don't associate with git", workspaceId);
             return null;
@@ -302,7 +299,7 @@ private List<String> process(List<String> commands) {
 
     @Override
     public GitDeleteResponse delete(GitDeleteRequest request) throws DSSErrorException {
-        GitUserEntity gitUser = dssWorkspaceGitService.selectGit(request.getWorkspaceId(), GitConstant.GIT_ACCESS_WRITE_TYPE, true);
+        GitUserEntity gitUser = GitProjectManager.selectGit(request.getWorkspaceId(), GitConstant.GIT_ACCESS_WRITE_TYPE, true);
         if (gitUser == null) {
             logger.error("the workspace : {} don't associate with git", request.getWorkspaceId());
             return null;
@@ -339,7 +336,7 @@ public GitDeleteResponse delete(GitDeleteRequest request) throws DSSErrorExcepti
 
     @Override
     public GitFileContentResponse getFileContent(GitFileContentRequest request) throws DSSErrorException {
-        GitUserEntity gitUser = dssWorkspaceGitService.selectGit(request.getWorkspaceId(), GitConstant.GIT_ACCESS_WRITE_TYPE, true);
+        GitUserEntity gitUser = GitProjectManager.selectGit(request.getWorkspaceId(), GitConstant.GIT_ACCESS_WRITE_TYPE, true);
         if (gitUser == null) {
             logger.error("the workspace : {} don't associate with git", request.getWorkspaceId());
             return null;
@@ -368,7 +365,7 @@ public GitFileContentResponse getFileContent(GitFileContentRequest request) thro
 
     @Override
     public GitHistoryResponse getHistory(GitHistoryRequest request) throws DSSErrorException {
-        GitUserEntity gitUser = dssWorkspaceGitService.selectGit(request.getWorkspaceId(), GitConstant.GIT_ACCESS_WRITE_TYPE, true);
+        GitUserEntity gitUser = GitProjectManager.selectGit(request.getWorkspaceId(), GitConstant.GIT_ACCESS_WRITE_TYPE, true);
         if (gitUser == null) {
             logger.error("the workspace : {} don't associate with git", request.getWorkspaceId());
             return null;
@@ -421,7 +418,7 @@ private Repository getRepository(File repoDir, String projectName, GitUserEntity
 
     @Override
     public GitCommitResponse getCurrentCommit(GitCurrentCommitRequest request) throws DSSErrorException {
-        GitUserEntity gitUser = dssWorkspaceGitService.selectGit(request.getWorkspaceId(), GitConstant.GIT_ACCESS_WRITE_TYPE, true);
+        GitUserEntity gitUser = GitProjectManager.selectGit(request.getWorkspaceId(), GitConstant.GIT_ACCESS_WRITE_TYPE, true);
         if (gitUser == null) {
             logger.error("the workspace : {} don't associate with git", request.getWorkspaceId());
             return null;
@@ -452,7 +449,7 @@ public GitCommitResponse getCurrentCommit(GitCurrentCommitRequest request) throw
 
     @Override
     public GitCommitResponse gitCheckOut(GitRevertRequest request) throws DSSErrorException {
-        GitUserEntity gitUser = dssWorkspaceGitService.selectGit(request.getWorkspaceId(), GitConstant.GIT_ACCESS_WRITE_TYPE, true);
+        GitUserEntity gitUser = GitProjectManager.selectGit(request.getWorkspaceId(), GitConstant.GIT_ACCESS_WRITE_TYPE, true);
         if (gitUser == null) {
             logger.error("the workspace : {} don't associate with git", request.getWorkspaceId());
             return null;
@@ -487,7 +484,7 @@ public GitCommitResponse gitCheckOut(GitRevertRequest request) throws DSSErrorEx
 
     @Override
     public GitCommitResponse removeFile(GitRemoveRequest request) throws DSSErrorException {
-        GitUserEntity gitUser = dssWorkspaceGitService.selectGit(request.getWorkspaceId(), GitConstant.GIT_ACCESS_WRITE_TYPE, true);
+        GitUserEntity gitUser = GitProjectManager.selectGit(request.getWorkspaceId(), GitConstant.GIT_ACCESS_WRITE_TYPE, true);
         if (gitUser == null) {
             logger.error("the workspace : {} don't associate with git", request.getWorkspaceId());
             return null;
@@ -521,7 +518,7 @@ public GitCommitResponse removeFile(GitRemoveRequest request) throws DSSErrorExc
 
     @Override
     public GitCommitResponse rename(GitRenameRequest request) throws DSSErrorException {
-        GitUserEntity gitUser = dssWorkspaceGitService.selectGit(request.getWorkspaceId(), GitConstant.GIT_ACCESS_WRITE_TYPE, true);
+        GitUserEntity gitUser = GitProjectManager.selectGit(request.getWorkspaceId(), GitConstant.GIT_ACCESS_WRITE_TYPE, true);
         if (gitUser == null) {
             logger.error("the workspace : {} don't associate with git", request.getWorkspaceId());
             return null;
@@ -575,7 +572,7 @@ private String generateProjectPath(Long workspaceId, String projectName) {
 
     @Override
     public GitHistoryResponse getHistory(GitCommitInfoBetweenRequest request) throws DSSErrorException {
-        GitUserEntity gitUser = dssWorkspaceGitService.selectGit(request.getWorkspaceId(), GitConstant.GIT_ACCESS_WRITE_TYPE, true);
+        GitUserEntity gitUser = GitProjectManager.selectGit(request.getWorkspaceId(), GitConstant.GIT_ACCESS_WRITE_TYPE, true);
         if (gitUser == null) {
             logger.error("the workspace : {} don't associate with git", request.getWorkspaceId());
             return null;
diff --git a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/utils/FileUtils.java b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/utils/FileUtils.java
index 91f646d75..464cc0c6a 100644
--- a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/utils/FileUtils.java
+++ b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/utils/FileUtils.java
@@ -7,16 +7,15 @@
 import com.webank.wedatasphere.dss.common.service.BMLService;
 import com.webank.wedatasphere.dss.git.common.protocol.config.GitServerConfig;
 import com.webank.wedatasphere.dss.git.common.protocol.constant.GitConstant;
+import com.webank.wedatasphere.dss.git.constant.DSSGitConstant;
 import org.apache.commons.lang.StringUtils;
 import org.apache.poi.util.IOUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import java.io.*;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.nio.file.StandardOpenOption;
+import java.nio.file.*;
+import java.nio.file.attribute.BasicFileAttributes;
 import java.util.*;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipFile;
@@ -277,4 +276,23 @@ public static void renameFile(String oldFileName, String fileName) {
             logger.error("Folder does not exist.");
         }
     }
+
+    public static List<String> getLocalProjectName(Long workspaceId) throws IOException {
+        String path = DSSGitConstant.GIT_PATH_PRE + workspaceId + File.separator;
+        Path dir = Paths.get(path);
+        List<String> localProjectList = new ArrayList<>();
+        try (DirectoryStream<Path> stream = Files.newDirectoryStream(dir)) {
+            for (Path entry : stream) {
+                // 获取基本文件属性
+                BasicFileAttributes attrs = Files.readAttributes(entry, BasicFileAttributes.class);
+                if (attrs.isDirectory()) {
+                    localProjectList.add(entry.getFileName().toString());
+                }
+            }
+        } catch (IOException | DirectoryIteratorException e) {
+            logger.error("get Local Project Failed", e);
+            throw e;
+        }
+        return localProjectList;
+    }
 }
diff --git a/dss-git/dss-git-server/src/main/scala/com.webank.wedatasphere.dss.git/receiver/DSSGitChooser.scala b/dss-git/dss-git-server/src/main/scala/com.webank.wedatasphere.dss.git/receiver/DSSGitChooser.scala
index 5f7b72880..3a0407a02 100644
--- a/dss-git/dss-git-server/src/main/scala/com.webank.wedatasphere.dss.git/receiver/DSSGitChooser.scala
+++ b/dss-git/dss-git-server/src/main/scala/com.webank.wedatasphere.dss.git/receiver/DSSGitChooser.scala
@@ -17,7 +17,7 @@
 package com.webank.wedatasphere.dss.git.receiver
 
 import com.webank.wedatasphere.dss.git.common.protocol.request.{GitArchiveProjectRequest, GitBaseRequest, GitCheckProjectRequest, GitCommitInfoBetweenRequest, GitCommitRequest, GitConnectRequest, GitCreateProjectRequest, GitCurrentCommitRequest, GitDeleteRequest, GitDiffRequest, GitFileContentRequest, GitHistoryRequest, GitRemoveRequest, GitRenameRequest, GitRevertRequest, GitSearchRequest, GitUserInfoByRequest, GitUserInfoRequest, GitUserUpdateRequest}
-import com.webank.wedatasphere.dss.git.service.{DSSGitProjectManagerService, DSSGitWorkflowManagerService, DSSWorkspaceGitService}
+import com.webank.wedatasphere.dss.git.service.{DSSGitProjectManagerService, DSSGitWorkflowManagerService}
 
 import javax.annotation.PostConstruct
 import org.apache.linkis.rpc.{RPCMessageEvent, Receiver, ReceiverChooser}
@@ -34,13 +34,10 @@ class DSSGitChooser extends ReceiverChooser {
   @Autowired
   var gitWorkflowManagerService: DSSGitWorkflowManagerService = _
 
-  @Autowired
-  var workspaceGitService: DSSWorkspaceGitService = _
-
   var receiver: Option[DSSGitReceiver] = _
 
   @PostConstruct
-  def init(): Unit = receiver = Some(new DSSGitReceiver(gitProjectManagerService, gitWorkflowManagerService, workspaceGitService))
+  def init(): Unit = receiver = Some(new DSSGitReceiver(gitProjectManagerService, gitWorkflowManagerService))
 
   override def chooseReceiver(event: RPCMessageEvent): Option[Receiver] = event.message match {
     case _: GitCreateProjectRequest => receiver
diff --git a/dss-git/dss-git-server/src/main/scala/com.webank.wedatasphere.dss.git/receiver/DSSGitReceiver.scala b/dss-git/dss-git-server/src/main/scala/com.webank.wedatasphere.dss.git/receiver/DSSGitReceiver.scala
index a4658cf02..a300286cd 100644
--- a/dss-git/dss-git-server/src/main/scala/com.webank.wedatasphere.dss.git/receiver/DSSGitReceiver.scala
+++ b/dss-git/dss-git-server/src/main/scala/com.webank.wedatasphere.dss.git/receiver/DSSGitReceiver.scala
@@ -17,7 +17,8 @@
 package com.webank.wedatasphere.dss.git.receiver
 
 import com.webank.wedatasphere.dss.git.common.protocol.request.{GitArchiveProjectRequest, GitCheckProjectRequest, GitCommitInfoBetweenRequest, GitCommitRequest, GitConnectRequest, GitCreateProjectRequest, GitCurrentCommitRequest, GitDeleteRequest, GitDiffRequest, GitFileContentRequest, GitHistoryRequest, GitRemoveRequest, GitRenameRequest, GitRevertRequest, GitSearchRequest, GitUserInfoByRequest, GitUserInfoRequest, GitUserUpdateRequest}
-import com.webank.wedatasphere.dss.git.service.{DSSGitProjectManagerService, DSSGitWorkflowManagerService, DSSWorkspaceGitService}
+import com.webank.wedatasphere.dss.git.manage.GitProjectManager
+import com.webank.wedatasphere.dss.git.service.{DSSGitProjectManagerService, DSSGitWorkflowManagerService}
 import org.apache.linkis.rpc.{Receiver, Sender}
 import org.slf4j.{Logger, LoggerFactory}
 import org.springframework.stereotype.Component
@@ -25,8 +26,7 @@ import org.springframework.stereotype.Component
 import java.util
 import scala.concurrent.duration.Duration
 
-class DSSGitReceiver(gitProjectManagerService: DSSGitProjectManagerService, gitWorkflowManagerService: DSSGitWorkflowManagerService,
-                     workspaceGitService: DSSWorkspaceGitService) extends Receiver {
+class DSSGitReceiver(gitProjectManagerService: DSSGitProjectManagerService, gitWorkflowManagerService: DSSGitWorkflowManagerService) extends Receiver {
 
   override def receive(message: Any, sender: Sender): Unit = {}
 
@@ -52,9 +52,9 @@ class DSSGitReceiver(gitProjectManagerService: DSSGitProjectManagerService, gitW
     case gitCommitInfoBetweenRequest: GitCommitInfoBetweenRequest =>
       gitWorkflowManagerService.getHistory(gitCommitInfoBetweenRequest)
     case gitUserUpdateRequest: GitUserUpdateRequest =>
-      workspaceGitService.associateGit(gitUserUpdateRequest)
+      GitProjectManager.associateGit(gitUserUpdateRequest)
     case gitUserInfoRequest: GitUserInfoRequest =>
-      workspaceGitService.selectGitUserInfo(gitUserInfoRequest)
+      GitProjectManager.selectGitUserInfo(gitUserInfoRequest)
     case gitCurrentCommitRequest: GitCurrentCommitRequest =>
       gitWorkflowManagerService.getCurrentCommit(gitCurrentCommitRequest)
     case gitRevertRequest: GitRevertRequest =>
@@ -64,9 +64,9 @@ class DSSGitReceiver(gitProjectManagerService: DSSGitProjectManagerService, gitW
     case gitRenameRequest: GitRenameRequest =>
       gitWorkflowManagerService.rename(gitRenameRequest)
     case gitConnectTestRequest: GitConnectRequest =>
-      workspaceGitService.gitTokenTest(gitConnectTestRequest)
+      GitProjectManager.gitTokenTest(gitConnectTestRequest)
     case gitUserInfoByTypeRequest: GitUserInfoByRequest =>
-      workspaceGitService.getGitUserByType(gitUserInfoByTypeRequest)
+      GitProjectManager.getGitUserByType(gitUserInfoByTypeRequest)
     case _ => None
   }
 

From 336790a0724f0ecb2141d8a35d73ccd80b894a6f Mon Sep 17 00:00:00 2001
From: Zhaobincai <747839893@qq.com>
Date: Thu, 13 Jun 2024 10:06:27 +0800
Subject: [PATCH 272/302] git-server: add search Type fix

---
 .../server/restful/DSSFrameworkOrchestratorRestful.java     | 4 +---
 .../project/service/impl/DSSProjectServiceImpl.java         | 2 ++
 .../protocol/constant/GitConstant.java                      | 4 ++++
 .../git/service/impl/DSSGitWorkflowManagerServiceImpl.java  | 6 ++++++
 4 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/restful/DSSFrameworkOrchestratorRestful.java b/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/restful/DSSFrameworkOrchestratorRestful.java
index 96e478d8d..965d4be1d 100644
--- a/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/restful/DSSFrameworkOrchestratorRestful.java
+++ b/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/restful/DSSFrameworkOrchestratorRestful.java
@@ -427,8 +427,6 @@ public Message allType(HttpServletRequest req) {
         Workspace workspace = SSOHelper.getWorkspace(httpServletRequest);
         String userName = SecurityFilter.getLoginUsername(httpServletRequest);
 
-        List<String> type = Arrays.asList("sql","hql","jdbc", "py", "python", "scala", "sh");
-
-        return Message.ok().data("type", type);
+        return Message.ok().data("type", GitConstant.GIT_SERVER_SEARCH_TYPE);
     }
 }
diff --git a/dss-framework/dss-framework-project-server/src/main/java/com/webank/wedatasphere/dss/framework/project/service/impl/DSSProjectServiceImpl.java b/dss-framework/dss-framework-project-server/src/main/java/com/webank/wedatasphere/dss/framework/project/service/impl/DSSProjectServiceImpl.java
index cf315da3b..d52551dda 100644
--- a/dss-framework/dss-framework-project-server/src/main/java/com/webank/wedatasphere/dss/framework/project/service/impl/DSSProjectServiceImpl.java
+++ b/dss-framework/dss-framework-project-server/src/main/java/com/webank/wedatasphere/dss/framework/project/service/impl/DSSProjectServiceImpl.java
@@ -49,7 +49,9 @@
 import com.webank.wedatasphere.dss.framework.project.service.ImportService;
 import com.webank.wedatasphere.dss.framework.project.utils.ProjectStringUtils;
 import com.webank.wedatasphere.dss.git.common.protocol.request.GitArchiveProjectRequest;
+import com.webank.wedatasphere.dss.git.common.protocol.request.GitSearchRequest;
 import com.webank.wedatasphere.dss.git.common.protocol.response.GitArchivePorjectResponse;
+import com.webank.wedatasphere.dss.git.common.protocol.response.GitSearchResponse;
 import com.webank.wedatasphere.dss.orchestrator.server.entity.request.OrchestratorRequest;
 import com.webank.wedatasphere.dss.orchestrator.server.entity.vo.OrchestratorBaseInfo;
 import com.webank.wedatasphere.dss.orchestrator.server.service.OrchestratorService;
diff --git a/dss-git/dss-git-common/src/main/java/com.webank.wedatasphere.dss.git.common/protocol/constant/GitConstant.java b/dss-git/dss-git-common/src/main/java/com.webank.wedatasphere.dss.git.common/protocol/constant/GitConstant.java
index cc672b9a5..857deb594 100644
--- a/dss-git/dss-git-common/src/main/java/com.webank.wedatasphere.dss.git.common/protocol/constant/GitConstant.java
+++ b/dss-git/dss-git-common/src/main/java/com.webank.wedatasphere.dss.git.common/protocol/constant/GitConstant.java
@@ -1,8 +1,12 @@
 package com.webank.wedatasphere.dss.git.common.protocol.constant;
 
 
+import java.util.Arrays;
+import java.util.List;
+
 public class GitConstant {
     public static String GIT_ACCESS_WRITE_TYPE = "write";
     public static String GIT_ACCESS_READ_TYPE = "read";
     public static String GIT_SERVER_META_PATH = ".metaConf";
+    public static List<String> GIT_SERVER_SEARCH_TYPE = Arrays.asList("sql","hql","jdbc", "py", "python", "scala", "sh");
 }
diff --git a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitWorkflowManagerServiceImpl.java b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitWorkflowManagerServiceImpl.java
index f9ca098b9..394b9a0a9 100644
--- a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitWorkflowManagerServiceImpl.java
+++ b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitWorkflowManagerServiceImpl.java
@@ -122,6 +122,12 @@ public GitCommitResponse commit(GitCommitRequest request) throws DSSErrorExcepti
 
     @Override
     public GitSearchResponse search(GitSearchRequest request) {
+        if (request == null) {
+            return new GitSearchResponse();
+        }
+        if (CollectionUtils.isEmpty(request.getTypeList())) {
+            request.setTypeList(GitConstant.GIT_SERVER_SEARCH_TYPE);
+        }
         String gitDir = DSSGitUtils.generateGitPath(request.getProjectName(), request.getWorkspaceId());
         String gitPathPre = DSSGitConstant.GIT_PATH_PRE + request.getWorkspaceId() + File.separator;
         String workTree = gitPathPre + request.getProjectName() ;

From ea290971f1644915db4bef452d2ea22d2f54ce21 Mon Sep 17 00:00:00 2001
From: Zhaobincai <747839893@qq.com>
Date: Thu, 13 Jun 2024 10:07:54 +0800
Subject: [PATCH 273/302] git-server: add search fix

---
 .../service/impl/DSSGitWorkflowManagerServiceImpl.java    | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitWorkflowManagerServiceImpl.java b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitWorkflowManagerServiceImpl.java
index 394b9a0a9..fe434ee29 100644
--- a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitWorkflowManagerServiceImpl.java
+++ b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitWorkflowManagerServiceImpl.java
@@ -255,9 +255,11 @@ public GitSearchResponse search(GitSearchRequest request) {
                     if (colonIndexSec != -1 && colonIndexSec + 1 < resultLine.length()) {
                         Integer num = Integer.valueOf(resultLine.substring(0, colonIndexSec));
                         String line = resultLine.substring(colonIndexSec + 1);
-                        // 只添加符合要求的结果
-                        GitSearchLine searchLine = new GitSearchLine(num, line);
-                        keyLines.add(searchLine);
+                        if (!StringUtils.isEmpty(line)) {
+                            // 只添加符合要求的结果
+                            GitSearchLine searchLine = new GitSearchLine(num, line);
+                            keyLines.add(searchLine);
+                        }
                     }
                 }
             }

From 3899394baf9cfd29d0f29e1a53d7e8bce31af9fe Mon Sep 17 00:00:00 2001
From: Zhaobincai <747839893@qq.com>
Date: Thu, 13 Jun 2024 17:21:26 +0800
Subject: [PATCH 274/302] git-server: fix paths

---
 .../git/service/impl/DSSGitWorkflowManagerServiceImpl.java  | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitWorkflowManagerServiceImpl.java b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitWorkflowManagerServiceImpl.java
index fe434ee29..4ee3974c5 100644
--- a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitWorkflowManagerServiceImpl.java
+++ b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitWorkflowManagerServiceImpl.java
@@ -505,15 +505,19 @@ public GitCommitResponse removeFile(GitRemoveRequest request) throws DSSErrorExc
         try (Repository repository = getRepository(repoDir, request.getProjectName(), gitUser)){
             // 本地保持最新状态
             DSSGitUtils.pull(repository, request.getProjectName(), gitUser);
+            List<String> paths = new ArrayList<>();
             // 同步删除对应节点
             for (String path : request.getPath()) {
                 FileUtils.removeFlowNode(path, request.getProjectName(), request.getWorkspaceId());
+                String metaConfPath = GitConstant.GIT_SERVER_META_PATH + File.separator + path;
+                paths.add(metaConfPath);
+                paths.add(path);
             }
             // 提交
             String comment = "delete workflowNode " + request.getPath().toString() + DSSGitConstant.GIT_USERNAME_FLAG + request.getUsername();
             // 提交前再次pull， 降低多节点同时提交不同工作流任务导致冲突频率
             DSSGitUtils.pull(repository, request.getProjectName(), gitUser);
-            DSSGitUtils.push(repository, request.getProjectName(), gitUser, comment, request.getPath());
+            DSSGitUtils.push(repository, request.getProjectName(), gitUser, comment, paths);
 
             commitResponse = DSSGitUtils.getCurrentCommit(repository);
 

From b704e4c3c126b8d99c7c90cab06d59e043ae2446 Mon Sep 17 00:00:00 2001
From: Zhaobincai <747839893@qq.com>
Date: Thu, 13 Jun 2024 18:12:44 +0800
Subject: [PATCH 275/302] git-server: code Review fix

---
 .../service/impl/OrchestratorServiceImpl.java | 10 +--
 .../impl/DSSFrameworkProjectServiceImpl.java  | 17 ++--
 .../protocol/config/GitServerConfig.java      |  6 +-
 .../dss/git/manage/GitProjectManager.java     | 28 ++++---
 .../impl/DSSGitProjectManagerServiceImpl.java |  3 +-
 .../DSSGitWorkflowManagerServiceImpl.java     | 18 +++++
 .../dss/git/utils/DSSGitUtils.java            | 79 +++++++++----------
 .../wedatasphere/dss/git/utils/FileUtils.java | 10 ++-
 8 files changed, 92 insertions(+), 79 deletions(-)

diff --git a/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/impl/OrchestratorServiceImpl.java b/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/impl/OrchestratorServiceImpl.java
index 0a986dab4..489b4f1b3 100644
--- a/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/impl/OrchestratorServiceImpl.java
+++ b/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/impl/OrchestratorServiceImpl.java
@@ -450,19 +450,13 @@ public void rollbackOrchestratorGit(OrchestratorRollBackGitVo rollBackGitVo, Str
                 Sender sender = DSSSenderServiceFactory.getOrCreateServiceInstance().getGitSender();
                 //若之前版本未进行git回滚，则自动提交回滚后的工作流至git
                 if (StringUtils.isEmpty(oldOrcVersion.getCommitId())) {
-                    OrchestratorSubmitRequest submitRequest = new OrchestratorSubmitRequest();
-                    submitRequest.setFlowId(dssOrchestratorVersion.getAppId());
-                    submitRequest.setOrchestratorId(dssOrchestratorVersion.getOrchestratorId());
-                    submitRequest.setProjectName(projectName);
-                    submitRequest.setLabels(labels);
-                    submitRequest.setComment("rollback workflow: " + dssOrchestratorInfo.getName());
-                    orchestratorPluginService.submitWorkflowToBML(submitRequest, "system", workspace);
+                    lockMapper.updateOrchestratorStatus(orchestratorId, OrchestratorRefConstant.FLOW_STATUS_SAVE);
                 } else {
                     GitRevertRequest gitRevertRequest = new GitRevertRequest(workspace.getWorkspaceId(), projectName, oldOrcVersion.getCommitId(), dssOrchestratorInfo.getName(), "system");
                     GitCommitResponse gitCommitResponse = RpcAskUtils.processAskException(sender.ask(gitRevertRequest), GitCommitResponse.class, GitRevertRequest.class);
                     lockMapper.updateOrchestratorVersionCommitId(gitCommitResponse.getCommitId(), dssOrchestratorVersion.getAppId());
+                    lockMapper.updateOrchestratorStatus(orchestratorId, OrchestratorRefConstant.FLOW_STATUS_PUBLISH);
                 }
-                lockMapper.updateOrchestratorStatus(orchestratorId, OrchestratorRefConstant.FLOW_STATUS_PUBLISH);
             } catch (Exception e) {
                 lockMapper.updateOrchestratorStatus(orchestratorId, OrchestratorRefConstant.FLOW_STATUS_SAVE);
                 throw e;
diff --git a/dss-framework/dss-framework-project-server/src/main/java/com/webank/wedatasphere/dss/framework/project/service/impl/DSSFrameworkProjectServiceImpl.java b/dss-framework/dss-framework-project-server/src/main/java/com/webank/wedatasphere/dss/framework/project/service/impl/DSSFrameworkProjectServiceImpl.java
index 1e6206f64..0a2b4d67b 100644
--- a/dss-framework/dss-framework-project-server/src/main/java/com/webank/wedatasphere/dss/framework/project/service/impl/DSSFrameworkProjectServiceImpl.java
+++ b/dss-framework/dss-framework-project-server/src/main/java/com/webank/wedatasphere/dss/framework/project/service/impl/DSSFrameworkProjectServiceImpl.java
@@ -201,20 +201,15 @@ public void modifyProject(ProjectModifyRequest projectModifyRequest, DSSProjectD
 
         // 同步项目配置元数据到git
         if (projectModifyRequest.getAssociateGit() != null && projectModifyRequest.getAssociateGit()) {
+            ExportAllOrchestratorsReqest exportAllOrchestratorsReqest = new ExportAllOrchestratorsReqest();
+            exportAllOrchestratorsReqest.setProjectId(dbProject.getId());
+            exportAllOrchestratorsReqest.setComment("test");
+            exportAllOrchestratorsReqest.setLabels(DSSCommonUtils.ENV_LABEL_VALUE_DEV);
+
+            BmlResource bmlResource = dssProjectService.exportOnlyProjectMeta(exportAllOrchestratorsReqest, username, "", workspace);
             if ((dbProject.getAssociateGit() == null || !dbProject.getAssociateGit()) && projectModifyRequest.getAssociateGit()!= null && projectModifyRequest.getAssociateGit()) {
-                ExportAllOrchestratorsReqest exportAllOrchestratorsReqest = new ExportAllOrchestratorsReqest();
-                exportAllOrchestratorsReqest.setProjectId(dbProject.getId());
-                exportAllOrchestratorsReqest.setComment("test");
-                exportAllOrchestratorsReqest.setLabels(DSSCommonUtils.ENV_LABEL_VALUE_DEV);
-                BmlResource bmlResource = dssProjectService.exportProject(exportAllOrchestratorsReqest, username, "", workspace);
                 createGitProject(workspace.getWorkspaceId(), dbProject.getName(), bmlResource, username);
             } else {
-                ExportAllOrchestratorsReqest exportAllOrchestratorsReqest = new ExportAllOrchestratorsReqest();
-                exportAllOrchestratorsReqest.setProjectId(dbProject.getId());
-                exportAllOrchestratorsReqest.setComment("update Project");
-                exportAllOrchestratorsReqest.setLabels(DSSCommonUtils.ENV_LABEL_VALUE_DEV);
-
-                BmlResource bmlResource = dssProjectService.exportOnlyProjectMeta(exportAllOrchestratorsReqest, username, "", workspace);
                 updateProject(workspace.getWorkspaceId(), dbProject.getName(), bmlResource, username);
             }
         }
diff --git a/dss-git/dss-git-common/src/main/java/com.webank.wedatasphere.dss.git.common/protocol/config/GitServerConfig.java b/dss-git/dss-git-common/src/main/java/com.webank.wedatasphere.dss.git.common/protocol/config/GitServerConfig.java
index a3dae454d..0fdf49a0d 100644
--- a/dss-git/dss-git-common/src/main/java/com.webank.wedatasphere.dss.git.common/protocol/config/GitServerConfig.java
+++ b/dss-git/dss-git-common/src/main/java/com.webank.wedatasphere.dss.git.common/protocol/config/GitServerConfig.java
@@ -13,9 +13,9 @@ public class GitServerConfig {
 
     public static final CommonVars<Integer> GIT_SEARCH_RESULT_LIMIT = CommonVars.apply("wds.dss.git.search.limit", 30);
 
-    public static final CommonVars<String> GIT_USER = CommonVars.apply("wds.dss.server.git.user", "user_login");
-    public static final CommonVars<String> GIT_PASSWD = CommonVars.apply("wds.dss.server.git.password", "user_password");
-    public static final CommonVars<String> GIT_SUBMIT = CommonVars.apply("wds.dss.server.git.submit", "input[class='btn btn-success qa-sign-in-button']");
+    public static final CommonVars<String> GIT_USER = CommonVars.apply("wds.dss.server.git.user.uiid", "user_login");
+    public static final CommonVars<String> GIT_PASSWD = CommonVars.apply("wds.dss.server.git.password.uiid", "user_password");
+    public static final CommonVars<String> GIT_SUBMIT = CommonVars.apply("wds.dss.server.git.submit.uiid", "input[class='btn btn-success qa-sign-in-button']");
     public static final CommonVars<String> GIT_TIME = CommonVars.apply("wds.dss.server.git.time", "1");
 
     public static final CommonVars<String> GIT_SEARCH_EXCLUDE_DIRECTORY = CommonVars.apply("wds.dss.server.git.search.exclude.dir", ".metaConf");
diff --git a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/manage/GitProjectManager.java b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/manage/GitProjectManager.java
index 476b9c40b..d7bf4f560 100644
--- a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/manage/GitProjectManager.java
+++ b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/manage/GitProjectManager.java
@@ -214,20 +214,28 @@ public static GitConnectResponse gitTokenTest(GitConnectRequest connectTestReque
 
             HttpResponse response = client.execute(request);
             String jsonResponse = EntityUtils.toString(response.getEntity());
-            JSONObject userData = new JSONObject(jsonResponse);
 
-            String actualUsername = userData.getString("username");
 
-            if (response.getStatusLine().getStatusCode() == 200 && actualUsername.equals(expectedUsername)) {
-                LOGGER.info("Token is valid and matches the username: " + actualUsername);
-                return new GitConnectResponse(true);
-            } else {
-                LOGGER.info("Token is invalid or does not match the expected username.");
-                return new GitConnectResponse(false);
+            if (response.getStatusLine().getStatusCode() == 200) {
+                JSONObject userData = new JSONObject(jsonResponse);
+
+                String actualUsername = userData.getString("username");
+                if (actualUsername.equals(expectedUsername)) {
+                    LOGGER.info("Token is valid and matches the username: " + actualUsername);
+                    return new GitConnectResponse(true);
+                }else {
+                    LOGGER.info("Token is invalid or does not match the expected username.");
+                    return new GitConnectResponse(false);
+                }
+            } else if (response.getStatusLine().getStatusCode() == 401){
+                throw new DSSErrorException(800001, "请检查token是否正确");
             }
-        } catch (Exception e) {
+            return new GitConnectResponse(false);
+        } catch (DSSErrorException e) {
             LOGGER.info("Error verifying token: " + e.getMessage());
-            throw new DSSErrorException(800001, "verifying token failed, the reason is:" + e);
+            throw new DSSErrorException(800001, "请检查token是否正确");
+        }catch (Exception e) {
+            throw new DSSErrorException(800001, "校验token失败，请确认当前环境git是否可以正常访问" + e);
         }
     }
 
diff --git a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitProjectManagerServiceImpl.java b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitProjectManagerServiceImpl.java
index 8affe59a6..7c62a21b9 100644
--- a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitProjectManagerServiceImpl.java
+++ b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitProjectManagerServiceImpl.java
@@ -93,7 +93,8 @@ public GitCheckProjectResponse checkProject(GitCheckProjectRequest request) thro
             logger.error("the workspace : {} don't associate with git", request.getWorkspaceId());
             return null;
         }
-        boolean b = DSSGitUtils.checkProjectName(request.getProjectName(), gitUser);
+        String projectPath = gitUser.getGitUser() + "/" + request.getProjectName();
+        boolean b = DSSGitUtils.checkIfProjectExists(gitUser, projectPath);
         logger.info("checkProjectName result is : {}", b);
         return new GitCheckProjectResponse(request.getProjectName(), b);
     }
diff --git a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitWorkflowManagerServiceImpl.java b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitWorkflowManagerServiceImpl.java
index 4ee3974c5..b397d7f38 100644
--- a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitWorkflowManagerServiceImpl.java
+++ b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitWorkflowManagerServiceImpl.java
@@ -122,6 +122,22 @@ public GitCommitResponse commit(GitCommitRequest request) throws DSSErrorExcepti
 
     @Override
     public GitSearchResponse search(GitSearchRequest request) {
+        Long workspaceId = request.getWorkspaceId();
+        GitUserEntity gitUser = GitProjectManager.selectGit(workspaceId, GitConstant.GIT_ACCESS_WRITE_TYPE, true);
+        if (gitUser == null) {
+            logger.error("the workspace : {} don't associate with git", workspaceId);
+            return null;
+        }
+        // 拼接.git路径
+        String gitPath = DSSGitUtils.generateGitPath(request.getProjectName(), workspaceId);
+        // 获取git仓库
+        File repoDir = new File(gitPath);
+        try (Repository repository = getRepository(repoDir, request.getProjectName(), gitUser)){
+            // 本地保持最新状态
+            DSSGitUtils.pull(repository, request.getProjectName(), gitUser);
+        } catch (Exception e) {
+            logger.error("pull failed, the reason is ",e);
+        }
         if (request == null) {
             return new GitSearchResponse();
         }
@@ -362,6 +378,7 @@ public GitFileContentResponse getFileContent(GitFileContentRequest request) thro
             String fullpath = File.separator + FileUtils.normalizePath(GitServerConfig.GIT_SERVER_PATH.getValue()) + File.separator + request.getWorkspaceId() + File.separator + FileUtils.normalizePath(request.getFilePath());
             File file = new File(fullpath);
             String fileName = file.getName();
+            // todo 透传
             BmlResource bmlResource = FileUtils.uploadResourceToBML(bmlService, gitUser.getGitUser(), content, fileName, request.getProjectName());
             logger.info("upload success, the fileName is : {}", request.getFilePath());
             contentResponse.setBmlResource(bmlResource);
@@ -598,6 +615,7 @@ public GitHistoryResponse getHistory(GitCommitInfoBetweenRequest request) throws
             // 本地保持最新状态
             DSSGitUtils.pull(repository, request.getProjectName(), gitUser);
             if (StringUtils.isEmpty(request.getOldCommitId())) {
+                // 去掉上线
                 List<GitCommitResponse> latestCommit = DSSGitUtils.getLatestCommit(repository, request.getDirName(), 100);
                 if (CollectionUtils.isEmpty(latestCommit)) {
                     logger.error("get Commit failed, the reason is null");
diff --git a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/utils/DSSGitUtils.java b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/utils/DSSGitUtils.java
index 4e0a74a2f..cef22f48c 100644
--- a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/utils/DSSGitUtils.java
+++ b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/utils/DSSGitUtils.java
@@ -4,7 +4,6 @@
 import com.webank.wedatasphere.dss.git.common.protocol.GitTree;
 import com.webank.wedatasphere.dss.git.common.protocol.GitUserEntity;
 import com.webank.wedatasphere.dss.git.common.protocol.exception.GitErrorException;
-import com.webank.wedatasphere.dss.git.common.protocol.request.GitBaseRequest;
 import com.webank.wedatasphere.dss.git.common.protocol.request.GitRevertRequest;
 import com.webank.wedatasphere.dss.git.common.protocol.response.GitDiffResponse;
 import com.webank.wedatasphere.dss.git.common.protocol.response.GitCommitResponse;
@@ -16,6 +15,8 @@
 import org.apache.http.HttpEntity;
 import org.apache.http.client.methods.CloseableHttpResponse;
 import org.apache.http.client.methods.HttpGet;
+import org.apache.http.client.methods.HttpPost;
+import org.apache.http.entity.StringEntity;
 import org.apache.http.impl.client.CloseableHttpClient;
 import org.apache.http.impl.client.HttpClients;
 import org.apache.http.util.EntityUtils;
@@ -42,41 +43,29 @@
 import java.net.URISyntaxException;
 import java.net.URL;
 import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
+import java.util.*;
 
 public class DSSGitUtils {
     private static final Logger logger = LoggerFactory.getLogger(DSSGitUtils.class);
 
     public static void init(String projectName, GitUserEntity gitUserDO) throws Exception, GitErrorException{
-        if (!checkProjectName(projectName, gitUserDO)) {
-            try {
-                URL url = new URL(UrlUtils.normalizeIp(gitUserDO.getGitUrl()) + "/" +GitServerConfig.GIT_RESTFUL_API_CREATE_PROJECTS.getValue());
-                HttpURLConnection connection = (HttpURLConnection) url.openConnection();
-                connection.setRequestMethod("POST");
-                connection.setRequestProperty("PRIVATE-TOKEN", gitUserDO.getGitToken());
-                connection.setRequestProperty("Content-Type", "application/json");
-                connection.setDoOutput(true);
-
+        String projectPath = gitUserDO.getGitUser() + "/" + projectName;
+        if (!checkIfProjectExists(gitUserDO, projectPath)) {
+            try (CloseableHttpClient httpClient = HttpClients.createDefault()) {
+                HttpPost post = new HttpPost();
+                post.addHeader("PRIVATE-TOKEN", gitUserDO.getGitToken());
+                post.addHeader("Content-Type", "application/json");
                 String jsonInputString = String.format("{\"name\": \"%s\", \"description\": \"%s\"}", projectName, projectName);
-
-                try (OutputStream os = connection.getOutputStream()) {
-                    byte[] input = jsonInputString.getBytes("utf-8");
-                    os.write(input, 0, input.length);
+                post.setEntity(new StringEntity(jsonInputString));
+
+                try (CloseableHttpResponse response = httpClient.execute(post)) {
+                    int statusCode = response.getStatusLine().getStatusCode();
+                    if (statusCode == 200) {
+                        logger.info("init success");
+                    } else {
+                        throw new GitErrorException(80001, "创建Git项目失败，请检查工作空间token是否过期");
+                    }
                 }
-
-                int responseCode = connection.getResponseCode();
-                logger.info("Response Code : " + responseCode);
-
-                connection.disconnect();
-                logger.info("init success");
-            } catch (Exception e) {
-               throw new GitErrorException(80001, "git init failed, the reason is: ", e);
             }
         } else {
             throw new GitErrorException(80001, "git init failed, the reason is: projectName " + projectName +" already exists");
@@ -279,22 +268,28 @@ public static void checkoutTargetCommit(Repository repository, GitRevertRequest
         }
     }
 
-    public static boolean checkProjectName(String name, GitUserEntity gitUser) throws DSSErrorException {
-        int retry = 0;
-        List<String> allProjectName = new ArrayList<>();
-        while (true) {
-            retry += 1;
-            try {
-                allProjectName = getAllProjectName(gitUser);
-                return allProjectName.contains(name);
-            } catch (DSSErrorException e) {
-                logger.info("getAllProjectName failed, try again");
-                if (retry >= 3) {
-                    throw new GitErrorException(80001, "检查项目名称失败，请检查工作空间token是否过期或git服务是否可以正常访问 ", e);
+    public static boolean checkIfProjectExists(GitUserEntity gitUser, String projectPath) throws GitErrorException {
+        String url = UrlUtils.normalizeIp(gitUser.getGitUrl()) + "/projects/" + projectPath.replace("/", "%2F");
+        try (CloseableHttpClient httpClient = HttpClients.createDefault()) {
+            HttpGet request = new HttpGet(url);
+            request.addHeader("PRIVATE-TOKEN", gitUser.getGitToken());
+
+            try (CloseableHttpResponse response = httpClient.execute(request)) {
+                int statusCode = response.getStatusLine().getStatusCode();
+                if (statusCode == 200) {
+                    return true;
+                } else if (statusCode == 404) {
+                    return false;
+                } else {
+                    String responseBody = EntityUtils.toString(response.getEntity());
+                    logger.info("Unexpected response status: " + statusCode);
+                    logger.info("Response body: " + responseBody);
+                    return false;
                 }
             }
+        } catch (Exception e) {
+            throw new GitErrorException(80001, "检查项目名称失败，请检查工作空间token是否过期", e);
         }
-
     }
 
     public static List<String> getAllProjectName(GitUserEntity gitUserDO) throws DSSErrorException {
diff --git a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/utils/FileUtils.java b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/utils/FileUtils.java
index 464cc0c6a..b25d28826 100644
--- a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/utils/FileUtils.java
+++ b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/utils/FileUtils.java
@@ -5,6 +5,7 @@
 import com.webank.wedatasphere.dss.common.exception.DSSErrorException;
 import com.webank.wedatasphere.dss.common.exception.DSSRuntimeException;
 import com.webank.wedatasphere.dss.common.service.BMLService;
+import com.webank.wedatasphere.dss.common.utils.ZipHelper;
 import com.webank.wedatasphere.dss.git.common.protocol.config.GitServerConfig;
 import com.webank.wedatasphere.dss.git.common.protocol.constant.GitConstant;
 import com.webank.wedatasphere.dss.git.constant.DSSGitConstant;
@@ -158,6 +159,7 @@ public static void downloadBMLResource(BMLService bmlService, String path,  BmlR
             Files.createDirectories(Paths.get(importFile).getParent());
             //下载压缩包
             bmlService.downloadToLocalPath(username, bmlResource.getResourceId(), bmlResource.getVersion(), importFile);
+            bmlService.deleteBmlResource(username, bmlResource.getResourceId());
         }catch (Exception e){
             logger.error("download failed, the reason is :", e);
             throw new DSSRuntimeException("upload file format error(导入包格式错误)");
@@ -166,11 +168,11 @@ public static void downloadBMLResource(BMLService bmlService, String path,  BmlR
 
     public static void unzipBMLResource(String path, Long workspaceId) throws DSSErrorException {
         //下载到本地处理
-        String dirPath = "/" + FileUtils.normalizePath(GitServerConfig.GIT_SERVER_PATH.getValue());
-        String importFile= dirPath + File.separator + workspaceId + File.separator +  path + ".zip";
+        String dirPath = DSSGitConstant.GIT_PATH_PRE + workspaceId + File.separator +  path;
+        String importFile= dirPath + ".zip";
         //解压
-        String unzipImportFile= FileUtils.unzipFile(importFile);
-        logger.info("import unziped file locate at {}",unzipImportFile);
+        ZipHelper.unzipFile(importFile, dirPath, true);
+        logger.info("import unzip file locate at {}",importFile);
     }
 
     private static String readImportZipProjectName(String zipFilePath) throws IOException {

From b90377adcc8ff8f753b3d4daa843bc1c45cacd7a Mon Sep 17 00:00:00 2001
From: Zhaobincai <747839893@qq.com>
Date: Fri, 14 Jun 2024 21:56:57 +0800
Subject: [PATCH 276/302] git-server: code Review fix delete

---
 .../java/com/webank/wedatasphere/dss/git/utils/FileUtils.java    | 1 -
 1 file changed, 1 deletion(-)

diff --git a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/utils/FileUtils.java b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/utils/FileUtils.java
index b25d28826..25312547e 100644
--- a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/utils/FileUtils.java
+++ b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/utils/FileUtils.java
@@ -159,7 +159,6 @@ public static void downloadBMLResource(BMLService bmlService, String path,  BmlR
             Files.createDirectories(Paths.get(importFile).getParent());
             //下载压缩包
             bmlService.downloadToLocalPath(username, bmlResource.getResourceId(), bmlResource.getVersion(), importFile);
-            bmlService.deleteBmlResource(username, bmlResource.getResourceId());
         }catch (Exception e){
             logger.error("download failed, the reason is :", e);
             throw new DSSRuntimeException("upload file format error(导入包格式错误)");

From cab7ada3af1d883ea7d3d5efa697b20d7a16f743 Mon Sep 17 00:00:00 2001
From: Zhaobincai <747839893@qq.com>
Date: Sat, 15 Jun 2024 21:07:39 +0800
Subject: [PATCH 277/302] git-server: code Review fix check

---
 .../java/com/webank/wedatasphere/dss/git/utils/DSSGitUtils.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/utils/DSSGitUtils.java b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/utils/DSSGitUtils.java
index cef22f48c..e40927854 100644
--- a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/utils/DSSGitUtils.java
+++ b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/utils/DSSGitUtils.java
@@ -269,7 +269,7 @@ public static void checkoutTargetCommit(Repository repository, GitRevertRequest
     }
 
     public static boolean checkIfProjectExists(GitUserEntity gitUser, String projectPath) throws GitErrorException {
-        String url = UrlUtils.normalizeIp(gitUser.getGitUrl()) + "/projects/" + projectPath.replace("/", "%2F");
+        String url = UrlUtils.normalizeIp(gitUser.getGitUrl()) + "/api/v4/projects/" + projectPath.replace("/", "%2F");
         try (CloseableHttpClient httpClient = HttpClients.createDefault()) {
             HttpGet request = new HttpGet(url);
             request.addHeader("PRIVATE-TOKEN", gitUser.getGitToken());

From 47b9901fe30b80c36e4df111da62438de7b26786 Mon Sep 17 00:00:00 2001
From: Zhaobincai <747839893@qq.com>
Date: Sat, 15 Jun 2024 21:40:19 +0800
Subject: [PATCH 278/302] git-server: code Review fix create

---
 .../com/webank/wedatasphere/dss/git/utils/DSSGitUtils.java     | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/utils/DSSGitUtils.java b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/utils/DSSGitUtils.java
index e40927854..e31e66d35 100644
--- a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/utils/DSSGitUtils.java
+++ b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/utils/DSSGitUtils.java
@@ -51,8 +51,9 @@ public class DSSGitUtils {
     public static void init(String projectName, GitUserEntity gitUserDO) throws Exception, GitErrorException{
         String projectPath = gitUserDO.getGitUser() + "/" + projectName;
         if (!checkIfProjectExists(gitUserDO, projectPath)) {
+            String url = UrlUtils.normalizeIp(gitUserDO.getGitUrl()) + "/" + GitServerConfig.GIT_RESTFUL_API_CREATE_PROJECTS.getValue();
             try (CloseableHttpClient httpClient = HttpClients.createDefault()) {
-                HttpPost post = new HttpPost();
+                HttpPost post = new HttpPost(url);
                 post.addHeader("PRIVATE-TOKEN", gitUserDO.getGitToken());
                 post.addHeader("Content-Type", "application/json");
                 String jsonInputString = String.format("{\"name\": \"%s\", \"description\": \"%s\"}", projectName, projectName);

From e3c1128002ecea6b049c177497033fb11246cdd0 Mon Sep 17 00:00:00 2001
From: Zhaobincai <747839893@qq.com>
Date: Sat, 15 Jun 2024 22:41:58 +0800
Subject: [PATCH 279/302] git-server: code Review fix create1

---
 .../com/webank/wedatasphere/dss/git/utils/DSSGitUtils.java    | 2 +-
 .../java/com/webank/wedatasphere/dss/git/utils/FileUtils.java | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/utils/DSSGitUtils.java b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/utils/DSSGitUtils.java
index e31e66d35..e688214f7 100644
--- a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/utils/DSSGitUtils.java
+++ b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/utils/DSSGitUtils.java
@@ -61,7 +61,7 @@ public static void init(String projectName, GitUserEntity gitUserDO) throws Exce
 
                 try (CloseableHttpResponse response = httpClient.execute(post)) {
                     int statusCode = response.getStatusLine().getStatusCode();
-                    if (statusCode == 200) {
+                    if (statusCode == 201) {
                         logger.info("init success");
                     } else {
                         throw new GitErrorException(80001, "创建Git项目失败，请检查工作空间token是否过期");
diff --git a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/utils/FileUtils.java b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/utils/FileUtils.java
index 25312547e..770ef720c 100644
--- a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/utils/FileUtils.java
+++ b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/utils/FileUtils.java
@@ -167,8 +167,8 @@ public static void downloadBMLResource(BMLService bmlService, String path,  BmlR
 
     public static void unzipBMLResource(String path, Long workspaceId) throws DSSErrorException {
         //下载到本地处理
-        String dirPath = DSSGitConstant.GIT_PATH_PRE + workspaceId + File.separator +  path;
-        String importFile= dirPath + ".zip";
+        String dirPath = DSSGitConstant.GIT_PATH_PRE + workspaceId ;
+        String importFile= dirPath + File.separator +  path + ".zip";
         //解压
         ZipHelper.unzipFile(importFile, dirPath, true);
         logger.info("import unzip file locate at {}",importFile);

From a896dfe154ca6351e89d33744cef82c03b2fa0bd Mon Sep 17 00:00:00 2001
From: Zhaobincai <747839893@qq.com>
Date: Mon, 17 Jun 2024 01:02:08 +0800
Subject: [PATCH 280/302] git-server: add create git_user_id

---
 db/dss_ddl.sql                                |   1 +
 .../protocol/GitUserEntity.java               |  12 ++
 .../git/dao/impl/DSSWorkspaceGitMapper.xml    |  13 +-
 .../dss/git/manage/GitProjectManager.java     |  35 +++++-
 .../impl/DSSGitProjectManagerServiceImpl.java |   5 +
 .../dss/git/utils/DSSGitUtils.java            | 116 ++++++++++++++++++
 6 files changed, 172 insertions(+), 10 deletions(-)

diff --git a/db/dss_ddl.sql b/db/dss_ddl.sql
index 16e3e811d..551b4b59a 100644
--- a/db/dss_ddl.sql
+++ b/db/dss_ddl.sql
@@ -655,6 +655,7 @@ CREATE TABLE `dss_workspace_associate_git` (
    `create_by` varchar(128) DEFAULT NULL,
    `update_by` varchar(128) DEFAULT NULL,
    `type` varchar(32) DEFAULT NULL,
+   `git_user_id` varchar(32) DEFAULT NULL,
    PRIMARY KEY (`id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin COMMENT='工作空间绑定的git信息';
 
diff --git a/dss-git/dss-git-common/src/main/java/com.webank.wedatasphere.dss.git.common/protocol/GitUserEntity.java b/dss-git/dss-git-common/src/main/java/com.webank.wedatasphere.dss.git.common/protocol/GitUserEntity.java
index 53347503c..cebb61a56 100644
--- a/dss-git/dss-git-common/src/main/java/com.webank.wedatasphere.dss.git.common/protocol/GitUserEntity.java
+++ b/dss-git/dss-git-common/src/main/java/com.webank.wedatasphere.dss.git.common/protocol/GitUserEntity.java
@@ -18,6 +18,10 @@ public class GitUserEntity {
      */
     private String type;
     private String gitUrl;
+    /**
+     * 只读用户需存储git对应userId，用于设置只读权限
+     */
+    private String gitUserId;
 
     public GitUserEntity() {
     }
@@ -109,4 +113,12 @@ public String getGitUrl() {
     public void setGitUrl(String gitUrl) {
         this.gitUrl = gitUrl;
     }
+
+    public String getGitUserId() {
+        return gitUserId;
+    }
+
+    public void setGitUserId(String gitUserId) {
+        this.gitUserId = gitUserId;
+    }
 }
diff --git a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/dao/impl/DSSWorkspaceGitMapper.xml b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/dao/impl/DSSWorkspaceGitMapper.xml
index 42e51d950..197fd76c8 100644
--- a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/dao/impl/DSSWorkspaceGitMapper.xml
+++ b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/dao/impl/DSSWorkspaceGitMapper.xml
@@ -18,8 +18,8 @@
 
 <mapper namespace="com.webank.wedatasphere.dss.git.dao.DSSWorkspaceGitMapper">
     <insert id="insert" parameterType="com.webank.wedatasphere.dss.git.common.protocol.GitUserEntity">
-        insert into dss_workspace_associate_git (workspace_id, git_user, git_password, git_token, git_url, create_time, update_time, create_by, update_by, type)
-        VALUES (#{workspaceId}, #{gitUser}, #{gitPassword}, #{gitToken}, #{gitUrl}, now(), now(), #{createBy}, #{updateBy}, #{type})
+        insert into dss_workspace_associate_git (workspace_id, git_user, git_password, git_token, git_url, create_time, update_time, create_by, update_by, type, git_user_id)
+        VALUES (#{workspaceId}, #{gitUser}, #{gitPassword}, #{gitToken}, #{gitUrl}, now(), now(), #{createBy}, #{updateBy}, #{type}, #{gitUserId})
     </insert>
 
     <update id="update" parameterType="com.webank.wedatasphere.dss.git.common.protocol.GitUserEntity">
@@ -34,25 +34,28 @@
             <if test="gitToken != null">
                 git_token = #{gitToken},
             </if>
+            <if test="gitUserId != null">
+                git_user_id = #{gitUserId},
+            </if>
             update_by = #{updateBy},
         </set>
         where workspace_id = #{workspaceId} and type = #{type}
     </update>
 
     <select id="selectByWorkspaceId" resultType="com.webank.wedatasphere.dss.git.common.protocol.GitUserEntity">
-        select id, workspace_id, git_user, git_token, git_password, git_url, create_time, update_time, create_by, update_by, type
+        select id, workspace_id, git_user, git_token, git_password, git_url, create_time, update_time, create_by, update_by, type, git_user_id
         from dss_workspace_associate_git
         where workspace_id = #{workspaceId} and `type` = #{type} limit 1
     </select>
 
     <select id="selectByUser" resultType="com.webank.wedatasphere.dss.git.common.protocol.GitUserEntity">
-        select id, workspace_id, git_user, git_token, git_password, git_url, create_time, update_time, create_by, update_by, type
+        select id, workspace_id, git_user, git_token, git_password, git_url, create_time, update_time, create_by, update_by, type, git_user_id
         from dss_workspace_associate_git
         where git_user = #{gitUser} limit 1
     </select>
 
     <select id="selectGitUser" resultType="com.webank.wedatasphere.dss.git.common.protocol.GitUserEntity">
-        select id, workspace_id, git_user, git_token, git_password, git_url, create_time, update_time, create_by, update_by, type
+        select id, workspace_id, git_user, git_token, git_password, git_url, create_time, update_time, create_by, update_by, type, git_user_id
         from dss_workspace_associate_git
         where 1=1
         <if test="workspaceId != null">
diff --git a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/manage/GitProjectManager.java b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/manage/GitProjectManager.java
index d7bf4f560..da8ce55ee 100644
--- a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/manage/GitProjectManager.java
+++ b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/manage/GitProjectManager.java
@@ -32,6 +32,7 @@
 
 import javax.crypto.Cipher;
 import javax.crypto.spec.SecretKeySpec;
+import java.io.IOException;
 import java.security.Key;
 import java.util.Base64;
 import java.util.List;
@@ -92,16 +93,20 @@ public static void init() {
         }
     }
 
-    public static GitUserUpdateResponse associateGit(GitUserUpdateRequest gitUserCreateRequest) throws DSSErrorException {
+    public static GitUserUpdateResponse associateGit(GitUserUpdateRequest gitUserCreateRequest) throws DSSErrorException, IOException {
         if (gitUserCreateRequest == null) {
             throw new DSSErrorException(010101, "gitUserCreateRequest is null");
         }
         GitUserEntity gitUser = gitUserCreateRequest.getGitUser();
         String userName = gitUserCreateRequest.getUsername();
+        if (gitUser == null) {
+            throw new DSSErrorException(010101, "gitUser is null");
+        }
+        String type = gitUser.getType();
 
 
         // 不存在则更新，存在则新增
-        GitUserEntity oldGitUserDo = selectGit(gitUser.getWorkspaceId(), gitUser.getType(), true);
+        GitUserEntity oldGitUserDo = selectGit(gitUser.getWorkspaceId(), type, true);
         gitUser.setUpdateBy(userName);
         // 密码 token 加密处理
         if (!StringUtils.isEmpty(gitUser.getGitPassword())) {
@@ -116,24 +121,44 @@ public static GitUserUpdateResponse associateGit(GitUserUpdateRequest gitUserCre
         if (oldGitUserDo == null) {
             // 工作空间--git用户 为一一对应关系
             if (gitUserEntity != null) {
-                return new GitUserUpdateResponse(010101, "该用户已配置为" + gitUserEntity.getWorkspaceId() + "工作空间的读写或只读用户，请更换用户", gitUserEntity.getWorkspaceId());
+                return new GitUserUpdateResponse(80001, "该用户已配置为" + gitUserEntity.getWorkspaceId() + "工作空间的读写或只读用户，请更换用户", gitUserEntity.getWorkspaceId());
             }
             gitUser.setCreateBy(userName);
             gitUser.setGitUrl(UrlUtils.normalizeIp(GitServerConfig.GIT_URL_PRE.getValue()));
+            GitUserUpdateResponse userIdFromGit = getUserIdFromGit(gitUser, type);
+            if (userIdFromGit != null) {
+                return userIdFromGit;
+            }
             workspaceGitMapper.insert(gitUser);
         }else {
-            if (GitConstant.GIT_ACCESS_WRITE_TYPE.equals(gitUser.getType()) && !oldGitUserDo.getGitUser().equals(gitUser.getGitUser())) {
+            if (GitConstant.GIT_ACCESS_WRITE_TYPE.equals(type) && !oldGitUserDo.getGitUser().equals(gitUser.getGitUser())) {
                 throw new DSSErrorException(800001, "用户名不得修改");
             }
-            if (gitUserEntity != null && (!gitUserEntity.getWorkspaceId().equals(gitUser.getWorkspaceId()) || !gitUserEntity.getType().equals(gitUser.getType()))) {
+            if (gitUserEntity != null && (!gitUserEntity.getWorkspaceId().equals(gitUser.getWorkspaceId()) || !gitUserEntity.getType().equals(type))) {
                 return new GitUserUpdateResponse(010101, "该用户已配置为" + gitUserEntity.getWorkspaceId() + "工作空间的读写或只读用户，请更换用户", gitUserEntity.getWorkspaceId());
             }
+            GitUserUpdateResponse userIdFromGit = getUserIdFromGit(gitUser, type);
+            if (userIdFromGit != null) {
+                return userIdFromGit;
+            }
             workspaceGitMapper.update(gitUser);
         }
 
         return new GitUserUpdateResponse(0,"", null);
     }
 
+    private static GitUserUpdateResponse getUserIdFromGit(GitUserEntity gitUser, String type) throws IOException, com.webank.wedatasphere.dss.git.common.protocol.exception.GitErrorException {
+        if (GitConstant.GIT_ACCESS_READ_TYPE.equals(type)) {
+            GitUserEntity writeGitUser = selectGit(gitUser.getWorkspaceId(), GitConstant.GIT_ACCESS_WRITE_TYPE, true);
+            if (writeGitUser == null) {
+                return new GitUserUpdateResponse(80001, "配置只读用户前需首先完成该工作空间编辑用户的配置", gitUser.getWorkspaceId());
+            }
+            String userGitId = DSSGitUtils.getUserIdByUsername(writeGitUser, gitUser.getGitUser());
+            gitUser.setGitUserId(userGitId);
+        }
+        return null;
+    }
+
     public static GitUserInfoResponse selectGitUserInfo(GitUserInfoRequest gitUserInfoRequest) throws DSSErrorException {
         if (gitUserInfoRequest == null) {
             throw  new DSSErrorException(010101, "gitUserCreateRequest is null");
diff --git a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitProjectManagerServiceImpl.java b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitProjectManagerServiceImpl.java
index 7c62a21b9..d8cca455d 100644
--- a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitProjectManagerServiceImpl.java
+++ b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitProjectManagerServiceImpl.java
@@ -61,6 +61,11 @@ public GitCreateProjectResponse create(GitCreateProjectRequest request) throws D
             // 首次创建提交项目整体
             List<String> paths = Arrays.asList(".");
             DSSGitUtils.push(repository, request.getProjectName(), gitUser, comment, paths);
+            // 获取工作空间只读用户
+            GitUserEntity readGitUser = GitProjectManager.selectGit(workspaceId, GitConstant.GIT_ACCESS_READ_TYPE, true);
+            // 获取项目ProjectId
+            String projectIdByName = DSSGitUtils.getProjectIdByName(gitUser, request.getProjectName());
+            DSSGitUtils.addProjectMember(gitUser, readGitUser.getGitUserId(), projectIdByName, 20);
             return new GitCreateProjectResponse();
         } catch (Exception e) {
             logger.error("create project failed, the reason is: ", e);
diff --git a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/utils/DSSGitUtils.java b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/utils/DSSGitUtils.java
index e688214f7..d5b7782a6 100644
--- a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/utils/DSSGitUtils.java
+++ b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/utils/DSSGitUtils.java
@@ -1,5 +1,9 @@
 package com.webank.wedatasphere.dss.git.utils;
 
+import com.google.gson.JsonArray;
+import com.google.gson.JsonObject;
+import com.google.gson.JsonParser;
+import com.google.gson.JsonElement;
 import com.webank.wedatasphere.dss.common.exception.DSSErrorException;
 import com.webank.wedatasphere.dss.git.common.protocol.GitTree;
 import com.webank.wedatasphere.dss.git.common.protocol.GitUserEntity;
@@ -293,6 +297,118 @@ public static boolean checkIfProjectExists(GitUserEntity gitUser, String project
         }
     }
 
+    public static String getUserIdByUsername(GitUserEntity gitUser, String username) throws GitErrorException, IOException {
+        String url = UrlUtils.normalizeIp(gitUser.getGitUrl()) + "/api/v4/users?username=" + username;
+        BufferedReader in = null;
+        try (CloseableHttpClient httpClient = HttpClients.createDefault()) {
+            HttpGet request = new HttpGet(url);
+            request.addHeader("PRIVATE-TOKEN", gitUser.getGitToken());
+
+            try (CloseableHttpResponse response = httpClient.execute(request)) {
+                int statusCode = response.getStatusLine().getStatusCode();
+                if (statusCode == 200) {
+                    in = new BufferedReader(new InputStreamReader(response.getEntity().getContent()));
+                    String inputLine;
+                    StringBuilder content = new StringBuilder();
+
+                    while ((inputLine = in.readLine()) != null) {
+                        content.append(inputLine);
+                    }
+
+                    String responseBody = content.toString();
+                    logger.info("Response Body: " + responseBody);
+
+                    JsonArray jsonArray = JsonParser.parseString(responseBody).getAsJsonArray();
+
+                    if (jsonArray.size() > 0) {
+                        JsonObject userObject = jsonArray.get(0).getAsJsonObject();
+                        return userObject.get("id").toString();
+                    } else {
+                        throw new GitErrorException(80001, "获取userId失败，请检查该用户是否为git用户并激活");
+                    }
+                } else {
+                    throw new GitErrorException(80001, "获取userId失败，请检查编辑用户token是否过期或git服务是否正常");
+                }
+            }
+        } catch (Exception e) {
+            throw new GitErrorException(80001, "获取该git用户Id失败，原因为", e);
+        } finally {
+            if (in != null) {
+                in.close();
+            }
+        }
+    }
+
+    public static String getProjectIdByName(GitUserEntity gitUser, String projectName) throws GitErrorException{
+        String urlString = UrlUtils.normalizeIp(gitUser.getGitUrl()) + "/api/v4/projects?search=" + projectName;
+
+        try (CloseableHttpClient httpClient = HttpClients.createDefault()) {
+            HttpGet request = new HttpGet(urlString);
+            request.setHeader("PRIVATE-TOKEN", gitUser.getGitToken());
+
+            CloseableHttpResponse response = httpClient.execute(request);
+            System.out.println("Response Status Line: " + response.getStatusLine());
+
+            int responseCode = response.getStatusLine().getStatusCode();
+            if (responseCode == HttpURLConnection.HTTP_OK) {
+                BufferedReader in = new BufferedReader(new InputStreamReader(response.getEntity().getContent()));
+                String inputLine;
+                StringBuilder content = new StringBuilder();
+
+                while ((inputLine = in.readLine()) != null) {
+                    content.append(inputLine);
+                }
+
+                in.close();
+
+                String responseBody = content.toString();
+                logger.info("Response Body: " + responseBody);
+
+                JsonArray jsonArray = JsonParser.parseString(responseBody).getAsJsonArray();
+
+                if (jsonArray.size() > 0) {
+                    for (JsonElement element : jsonArray) {
+                        JsonObject projectObject = element.getAsJsonObject();
+                        if (projectObject.get("name").getAsString().equals(projectName)) {
+                            return projectObject.get("id").toString();
+                        }
+                    }
+                } else {
+                    throw new GitErrorException(80001, "项目创建失败，请稍后重试");
+                }
+            } else {
+                throw new GitErrorException(80001, "请检查编辑用户token是否过期或git服务是否正常");
+            }
+        } catch (Exception e) {
+            throw new GitErrorException(80001, "获取该项目git Id 失败，原因为", e);
+        }
+        return null;
+    }
+
+    public static boolean addProjectMember(GitUserEntity gitUser, String userId, String projectId, int accessLevel) throws GitErrorException, IOException {
+        String url = UrlUtils.normalizeIp(gitUser.getGitUrl()) + "/api/v4/projects/" + projectId + "/members";
+        try (CloseableHttpClient httpClient = HttpClients.createDefault()) {
+            HttpPost request = new HttpPost(url);
+            request.addHeader("PRIVATE-TOKEN", gitUser.getGitToken());
+            request.addHeader("Content-Type", "application/json");
+
+            String json = String.format("{\"user_id\": \"%s\", \"access_level\": \"%d\"}", userId, accessLevel);
+            request.setEntity(new StringEntity(json));
+
+            try (CloseableHttpResponse response = httpClient.execute(request)) {
+                int statusCode = response.getStatusLine().getStatusCode();
+                String responseBody = EntityUtils.toString(response.getEntity());
+                if (statusCode == 201) {
+                    return true;
+                } else {
+                    throw new GitErrorException(80001, "添加用户失败，请检查只读用户是否存在或编辑用户token是否过期");
+                }
+            }
+        } catch (Exception e) {
+            throw new GitErrorException(80001, "添加用户失败，请检查编辑用户token是否过期或git服务是否正常");
+        }
+    }
+
     public static List<String> getAllProjectName(GitUserEntity gitUserDO) throws DSSErrorException {
         int page = 1;
         List<String> allProjectNames = new ArrayList<>();

From 7a7e59baae16cb5e4787ff1673559c2e8a58f3d1 Mon Sep 17 00:00:00 2001
From: Zhaobincai <747839893@qq.com>
Date: Wed, 19 Jun 2024 10:51:41 +0800
Subject: [PATCH 281/302] git-server: add update git_user_id

---
 .../dss/git/dao/DSSWorkspaceGitMapper.java    |  5 +++
 .../git/dao/impl/DSSWorkspaceGitMapper.xml    | 10 +++++
 .../dss/git/dto/GitProjectGitInfo.java        | 40 +++++++++++++++++++
 .../dss/git/manage/GitProjectManager.java     | 26 ++++++++++--
 .../impl/DSSGitProjectManagerServiceImpl.java |  7 ++++
 .../dss/git/utils/DSSGitUtils.java            | 20 ++++++++++
 6 files changed, 104 insertions(+), 4 deletions(-)
 create mode 100644 dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/dto/GitProjectGitInfo.java

diff --git a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/dao/DSSWorkspaceGitMapper.java b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/dao/DSSWorkspaceGitMapper.java
index af3d78ed1..8ba54b4a5 100644
--- a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/dao/DSSWorkspaceGitMapper.java
+++ b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/dao/DSSWorkspaceGitMapper.java
@@ -2,6 +2,7 @@
 
 import com.webank.wedatasphere.dss.git.common.protocol.GitUserEntity;
 
+import com.webank.wedatasphere.dss.git.dto.GitProjectGitInfo;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -20,4 +21,8 @@ public interface DSSWorkspaceGitMapper {
     List<GitUserEntity> selectGitUser(@Param("workspaceId") Long workspaceId, @Param("type") String type, @Param("gitUser") String gitUser);
 
     List<Long> getAllWorkspaceId();
+
+    List<GitProjectGitInfo> getProjectIdListByWorkspaceId(@Param ("workspaceId") Long workspaceId);
+
+    void insertProjectInfo(GitProjectGitInfo projectGitInfo);
 }
diff --git a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/dao/impl/DSSWorkspaceGitMapper.xml b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/dao/impl/DSSWorkspaceGitMapper.xml
index 197fd76c8..22b1ae7b4 100644
--- a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/dao/impl/DSSWorkspaceGitMapper.xml
+++ b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/dao/impl/DSSWorkspaceGitMapper.xml
@@ -22,6 +22,16 @@
         VALUES (#{workspaceId}, #{gitUser}, #{gitPassword}, #{gitToken}, #{gitUrl}, now(), now(), #{createBy}, #{updateBy}, #{type}, #{gitUserId})
     </insert>
 
+    <insert id="insertProjectInfo" parameterType="com.webank.wedatasphere.dss.git.dto.GitProjectGitInfo">
+        insert into dss_project_associate_git (workspace_id, git_project_id, project_name)
+        values (#(workspaceId), #{gitProjectId}, #{projectName})
+    </insert>
+
+
+    <select id="getProjectIdListByWorkspaceId" resultType="com.webank.wedatasphere.dss.git.dto.GitProjectGitInfo">
+        select id, workspace_id, git_project_id, project_name from dss_project_associate_git where workspace_id = #{workspaceId}
+    </select>
+
     <update id="update" parameterType="com.webank.wedatasphere.dss.git.common.protocol.GitUserEntity">
         update dss_workspace_associate_git
         <set>
diff --git a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/dto/GitProjectGitInfo.java b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/dto/GitProjectGitInfo.java
new file mode 100644
index 000000000..fad73fb48
--- /dev/null
+++ b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/dto/GitProjectGitInfo.java
@@ -0,0 +1,40 @@
+package com.webank.wedatasphere.dss.git.dto;
+
+public class GitProjectGitInfo {
+    private Long id;
+    private Long workspaceId;
+    private String gitProjectId;
+    private String projectName;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public Long getWorkspaceId() {
+        return workspaceId;
+    }
+
+    public void setWorkspaceId(Long workspaceId) {
+        this.workspaceId = workspaceId;
+    }
+
+    public String getGitProjectId() {
+        return gitProjectId;
+    }
+
+    public void setGitProjectId(String gitProjectId) {
+        this.gitProjectId = gitProjectId;
+    }
+
+    public String getProjectName() {
+        return projectName;
+    }
+
+    public void setProjectName(String projectName) {
+        this.projectName = projectName;
+    }
+}
diff --git a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/manage/GitProjectManager.java b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/manage/GitProjectManager.java
index da8ce55ee..dd34ce049 100644
--- a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/manage/GitProjectManager.java
+++ b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/manage/GitProjectManager.java
@@ -15,6 +15,7 @@
 import com.webank.wedatasphere.dss.git.common.protocol.response.GitUserUpdateResponse;
 import com.webank.wedatasphere.dss.git.common.protocol.util.UrlUtils;
 import com.webank.wedatasphere.dss.git.dao.DSSWorkspaceGitMapper;
+import com.webank.wedatasphere.dss.git.dto.GitProjectGitInfo;
 import com.webank.wedatasphere.dss.git.utils.DSSGitUtils;
 import com.webank.wedatasphere.dss.git.utils.FileUtils;
 import org.apache.commons.lang.StringUtils;
@@ -118,14 +119,14 @@ public static GitUserUpdateResponse associateGit(GitUserUpdateRequest gitUserCre
             gitUser.setGitToken(encryptToken);
         }
         GitUserEntity gitUserEntity = workspaceGitMapper.selectByUser(gitUser.getGitUser());
+        gitUser.setGitUrl(UrlUtils.normalizeIp(GitServerConfig.GIT_URL_PRE.getValue()));
         if (oldGitUserDo == null) {
             // 工作空间--git用户 为一一对应关系
             if (gitUserEntity != null) {
                 return new GitUserUpdateResponse(80001, "该用户已配置为" + gitUserEntity.getWorkspaceId() + "工作空间的读写或只读用户，请更换用户", gitUserEntity.getWorkspaceId());
             }
             gitUser.setCreateBy(userName);
-            gitUser.setGitUrl(UrlUtils.normalizeIp(GitServerConfig.GIT_URL_PRE.getValue()));
-            GitUserUpdateResponse userIdFromGit = getUserIdFromGit(gitUser, type);
+            GitUserUpdateResponse userIdFromGit = getUserIdFromGit(gitUser, type, false, oldGitUserDo);
             if (userIdFromGit != null) {
                 return userIdFromGit;
             }
@@ -137,7 +138,7 @@ public static GitUserUpdateResponse associateGit(GitUserUpdateRequest gitUserCre
             if (gitUserEntity != null && (!gitUserEntity.getWorkspaceId().equals(gitUser.getWorkspaceId()) || !gitUserEntity.getType().equals(type))) {
                 return new GitUserUpdateResponse(010101, "该用户已配置为" + gitUserEntity.getWorkspaceId() + "工作空间的读写或只读用户，请更换用户", gitUserEntity.getWorkspaceId());
             }
-            GitUserUpdateResponse userIdFromGit = getUserIdFromGit(gitUser, type);
+            GitUserUpdateResponse userIdFromGit = getUserIdFromGit(gitUser, type, true, oldGitUserDo);
             if (userIdFromGit != null) {
                 return userIdFromGit;
             }
@@ -147,7 +148,7 @@ public static GitUserUpdateResponse associateGit(GitUserUpdateRequest gitUserCre
         return new GitUserUpdateResponse(0,"", null);
     }
 
-    private static GitUserUpdateResponse getUserIdFromGit(GitUserEntity gitUser, String type) throws IOException, com.webank.wedatasphere.dss.git.common.protocol.exception.GitErrorException {
+    private static GitUserUpdateResponse getUserIdFromGit(GitUserEntity gitUser, String type, Boolean update, GitUserEntity oldGitUser) throws IOException, com.webank.wedatasphere.dss.git.common.protocol.exception.GitErrorException {
         if (GitConstant.GIT_ACCESS_READ_TYPE.equals(type)) {
             GitUserEntity writeGitUser = selectGit(gitUser.getWorkspaceId(), GitConstant.GIT_ACCESS_WRITE_TYPE, true);
             if (writeGitUser == null) {
@@ -155,10 +156,27 @@ private static GitUserUpdateResponse getUserIdFromGit(GitUserEntity gitUser, Str
             }
             String userGitId = DSSGitUtils.getUserIdByUsername(writeGitUser, gitUser.getGitUser());
             gitUser.setGitUserId(userGitId);
+            if (update) {
+                List<GitProjectGitInfo> projectGitInfos = workspaceGitMapper.getProjectIdListByWorkspaceId(gitUser.getWorkspaceId());
+                for (GitProjectGitInfo projectGitInfo : projectGitInfos) {
+                    // 删除权限
+                    LOGGER.info("删除用户" + oldGitUser.getGitUser() + "在" + projectGitInfo.getProjectName() + "项目的只读权限");
+                    DSSGitUtils.removeProjectMember(writeGitUser, oldGitUser.getGitUserId(), projectGitInfo.getGitProjectId());
+                    LOGGER.info("删除成功");
+                    // 增加权限
+                    LOGGER.info("增加用户" + gitUser.getGitUser() + "在" + projectGitInfo.getProjectName() + "项目的只读权限");
+                    DSSGitUtils.addProjectMember(writeGitUser, userGitId, projectGitInfo.getGitProjectId(), 20);
+                    LOGGER.info("增加成功");
+                }
+            }
         }
         return null;
     }
 
+    public static void insert (GitProjectGitInfo projectGitInfo) {
+        workspaceGitMapper.insertProjectInfo(projectGitInfo);
+    }
+
     public static GitUserInfoResponse selectGitUserInfo(GitUserInfoRequest gitUserInfoRequest) throws DSSErrorException {
         if (gitUserInfoRequest == null) {
             throw  new DSSErrorException(010101, "gitUserCreateRequest is null");
diff --git a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitProjectManagerServiceImpl.java b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitProjectManagerServiceImpl.java
index d8cca455d..1905b9c41 100644
--- a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitProjectManagerServiceImpl.java
+++ b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitProjectManagerServiceImpl.java
@@ -8,6 +8,7 @@
 import com.webank.wedatasphere.dss.git.common.protocol.request.*;
 import com.webank.wedatasphere.dss.git.common.protocol.response.*;
 import com.webank.wedatasphere.dss.git.constant.DSSGitConstant;
+import com.webank.wedatasphere.dss.git.dto.GitProjectGitInfo;
 import com.webank.wedatasphere.dss.git.manage.GitProjectManager;
 import com.webank.wedatasphere.dss.git.service.DSSGitProjectManagerService;
 import com.webank.wedatasphere.dss.git.utils.DSSGitUtils;
@@ -66,6 +67,12 @@ public GitCreateProjectResponse create(GitCreateProjectRequest request) throws D
             // 获取项目ProjectId
             String projectIdByName = DSSGitUtils.getProjectIdByName(gitUser, request.getProjectName());
             DSSGitUtils.addProjectMember(gitUser, readGitUser.getGitUserId(), projectIdByName, 20);
+            // 存储projectId
+            GitProjectGitInfo projectGitInfo = new GitProjectGitInfo();
+            projectGitInfo.setGitProjectId(projectIdByName);
+            projectGitInfo.setProjectName(request.getProjectName());
+            projectGitInfo.setWorkspaceId(workspaceId);
+            GitProjectManager.insert(projectGitInfo);
             return new GitCreateProjectResponse();
         } catch (Exception e) {
             logger.error("create project failed, the reason is: ", e);
diff --git a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/utils/DSSGitUtils.java b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/utils/DSSGitUtils.java
index d5b7782a6..68f6b1d78 100644
--- a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/utils/DSSGitUtils.java
+++ b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/utils/DSSGitUtils.java
@@ -5,6 +5,7 @@
 import com.google.gson.JsonParser;
 import com.google.gson.JsonElement;
 import com.webank.wedatasphere.dss.common.exception.DSSErrorException;
+import org.apache.http.client.methods.HttpDelete;
 import com.webank.wedatasphere.dss.git.common.protocol.GitTree;
 import com.webank.wedatasphere.dss.git.common.protocol.GitUserEntity;
 import com.webank.wedatasphere.dss.git.common.protocol.exception.GitErrorException;
@@ -409,6 +410,25 @@ public static boolean addProjectMember(GitUserEntity gitUser, String userId, Str
         }
     }
 
+    public static boolean removeProjectMember(GitUserEntity gitUser, String userId, String projectId) throws GitErrorException {
+        String urlString = UrlUtils.normalizeIp(gitUser.getGitUrl()) + "/api/v4/projects/" + projectId + "/members/" + userId;
+        try (CloseableHttpClient httpClient = HttpClients.createDefault()) {
+            HttpDelete request = new HttpDelete(urlString);
+            request.addHeader("PRIVATE-TOKEN", gitUser.getGitToken());
+
+            try (CloseableHttpResponse response = httpClient.execute(request)) {
+                int responseCode = response.getStatusLine().getStatusCode();
+                if (responseCode == 204) {
+                    return true;
+                } else {
+                    throw new GitErrorException(80001, "请检查工作空间Git只读用户是否存在");
+                }
+            }
+        } catch (IOException e) {
+            throw new GitErrorException(80001, "更新用户权限失败", e);
+        }
+    }
+
     public static List<String> getAllProjectName(GitUserEntity gitUserDO) throws DSSErrorException {
         int page = 1;
         List<String> allProjectNames = new ArrayList<>();

From 1cf9630b3711ca12ff41c8425a730f90e792de4d Mon Sep 17 00:00:00 2001
From: Zhaobincai <747839893@qq.com>
Date: Wed, 19 Jun 2024 11:22:22 +0800
Subject: [PATCH 282/302] git-server: fix exception

---
 .../webank/wedatasphere/dss/git/manage/GitProjectManager.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/manage/GitProjectManager.java b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/manage/GitProjectManager.java
index dd34ce049..3bc3a4ab7 100644
--- a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/manage/GitProjectManager.java
+++ b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/manage/GitProjectManager.java
@@ -267,8 +267,8 @@ public static GitConnectResponse gitTokenTest(GitConnectRequest connectTestReque
                     LOGGER.info("Token is valid and matches the username: " + actualUsername);
                     return new GitConnectResponse(true);
                 }else {
-                    LOGGER.info("Token is invalid or does not match the expected username.");
-                    return new GitConnectResponse(false);
+                    LOGGER.info("当前token与用户名" + actualUsername + "匹配，与当前用户名" + expectedUsername + "不匹配");
+                    throw new DSSErrorException(800001, "当前用户名 token 不匹配，请检查");
                 }
             } else if (response.getStatusLine().getStatusCode() == 401){
                 throw new DSSErrorException(800001, "请检查token是否正确");

From 3a1fa7a061ed7a385c2e10050da93dddc3f81eca Mon Sep 17 00:00:00 2001
From: Zhaobincai <747839893@qq.com>
Date: Wed, 19 Jun 2024 14:47:12 +0800
Subject: [PATCH 283/302] git-server: fix exception

---
 .../wedatasphere/dss/git/dao/impl/DSSWorkspaceGitMapper.xml   | 2 +-
 .../webank/wedatasphere/dss/git/manage/GitProjectManager.java | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/dao/impl/DSSWorkspaceGitMapper.xml b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/dao/impl/DSSWorkspaceGitMapper.xml
index 22b1ae7b4..e04618536 100644
--- a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/dao/impl/DSSWorkspaceGitMapper.xml
+++ b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/dao/impl/DSSWorkspaceGitMapper.xml
@@ -24,7 +24,7 @@
 
     <insert id="insertProjectInfo" parameterType="com.webank.wedatasphere.dss.git.dto.GitProjectGitInfo">
         insert into dss_project_associate_git (workspace_id, git_project_id, project_name)
-        values (#(workspaceId), #{gitProjectId}, #{projectName})
+        values (#{workspaceId}, #{gitProjectId}, #{projectName})
     </insert>
 
 
diff --git a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/manage/GitProjectManager.java b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/manage/GitProjectManager.java
index 3bc3a4ab7..cf27dc74d 100644
--- a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/manage/GitProjectManager.java
+++ b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/manage/GitProjectManager.java
@@ -237,7 +237,7 @@ private static String generateKeys(String password, int mode) throws DSSErrorExc
                 return new String(encrypted);
             }
         } catch (Exception e) {
-            throw new DSSErrorException(800001, "加密失败");
+            throw new DSSErrorException(800001, "加密失败,原因为" + e);
         }
     }
 
@@ -276,7 +276,7 @@ public static GitConnectResponse gitTokenTest(GitConnectRequest connectTestReque
             return new GitConnectResponse(false);
         } catch (DSSErrorException e) {
             LOGGER.info("Error verifying token: " + e.getMessage());
-            throw new DSSErrorException(800001, "请检查token是否正确");
+            throw new DSSErrorException(800001, "校验失败" + e.getMessage());
         }catch (Exception e) {
             throw new DSSErrorException(800001, "校验token失败，请确认当前环境git是否可以正常访问" + e);
         }

From 262861425f7afb5613abc4aa9571b3d00e0646ab Mon Sep 17 00:00:00 2001
From: Zhaobincai <747839893@qq.com>
Date: Wed, 19 Jun 2024 17:28:37 +0800
Subject: [PATCH 284/302] git-server: fix revert

---
 .../server/service/impl/OrchestratorServiceImpl.java       | 2 +-
 .../git/service/impl/DSSGitWorkflowManagerServiceImpl.java | 2 +-
 .../dss/orchestrator/db/dao/impl/orchestratorMapper.xml    | 7 ++++---
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/impl/OrchestratorServiceImpl.java b/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/impl/OrchestratorServiceImpl.java
index 489b4f1b3..6ee525545 100644
--- a/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/impl/OrchestratorServiceImpl.java
+++ b/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/impl/OrchestratorServiceImpl.java
@@ -422,7 +422,7 @@ public OrchestratorRollBackGitVo rollbackOrchestrator(String userName, Long proj
 //        synProjectOrchestratorVersionId(dssOrchestratorVersion, labels);
 
         OrchestratorRollBackGitVo rollBackGitVo =new OrchestratorRollBackGitVo();
-        rollBackGitVo.setOldOrcVersion(oldOrcVersion);
+        rollBackGitVo.setOldOrcVersion(dbOrcVersion);
         rollBackGitVo.setDssOrchestratorInfo(dssOrchestratorInfo);
         rollBackGitVo.setDssOrchestratorVersion(dssOrchestratorVersion);
         rollBackGitVo.setVersion(dssOrchestratorVersion.getVersion());
diff --git a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitWorkflowManagerServiceImpl.java b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitWorkflowManagerServiceImpl.java
index b397d7f38..ddba63605 100644
--- a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitWorkflowManagerServiceImpl.java
+++ b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitWorkflowManagerServiceImpl.java
@@ -491,7 +491,7 @@ public GitCommitResponse gitCheckOut(GitRevertRequest request) throws DSSErrorEx
             DSSGitUtils.checkoutTargetCommit(repository, request);
             // push
             List<String> paths = Arrays.asList(request.getPath());
-            DSSGitUtils.push(repository, request.getProjectName(), gitUser, "revert by : " + request.getUsername(), paths);
+            DSSGitUtils.push(repository, request.getProjectName(), gitUser, "revert "+ DSSGitConstant.GIT_USERNAME_FLAG + request.getUsername(), paths);
 
             List<GitCommitResponse> latestCommit = DSSGitUtils.getLatestCommit(repository, request.getPath(), 1);
             if (CollectionUtils.isEmpty(latestCommit)) {
diff --git a/dss-orchestrator/dss-orchestrator-db/src/main/java/com/webank/wedatasphere/dss/orchestrator/db/dao/impl/orchestratorMapper.xml b/dss-orchestrator/dss-orchestrator-db/src/main/java/com/webank/wedatasphere/dss/orchestrator/db/dao/impl/orchestratorMapper.xml
index f00d78704..412cea964 100644
--- a/dss-orchestrator/dss-orchestrator-db/src/main/java/com/webank/wedatasphere/dss/orchestrator/db/dao/impl/orchestratorMapper.xml
+++ b/dss-orchestrator/dss-orchestrator-db/src/main/java/com/webank/wedatasphere/dss/orchestrator/db/dao/impl/orchestratorMapper.xml
@@ -26,7 +26,7 @@
     </sql>
 
     <sql id="orchestrator_version">
-        id,`orchestrator_id`,`app_id`,`source`,`version`,`comment`,`update_time`,`updater`,`project_id`,`content`,`context_id`,`valid_flag`
+        id,`orchestrator_id`,`app_id`,`source`,`version`,`comment`,`update_time`,`updater`,`project_id`,`content`,`context_id`,`valid_flag`, `commit_id`
     </sql>
 
     <sql id="orchestrator_ref_orchestration">
@@ -86,7 +86,7 @@
             parameterType="com.webank.wedatasphere.dss.orchestrator.common.entity.DSSOrchestratorVersion">
         INSERT INTO dss_orchestrator_version_info (<include refid="orchestrator_version"/>)
         VALUES
-        (#{id},#{orchestratorId},#{appId},#{source},#{version},#{comment},#{updateTime},#{updater},#{projectId},#{content},#{contextId},#{validFlag})
+        (#{id},#{orchestratorId},#{appId},#{source},#{version},#{comment},#{updateTime},#{updater},#{projectId},#{content},#{contextId},#{validFlag}, #{commitId})
     </insert>
 
 
@@ -121,7 +121,7 @@
     <select id="getLatestOrchestratorVersionByIdAndValidFlag"
             resultType="com.webank.wedatasphere.dss.orchestrator.common.entity.DSSOrchestratorVersion">
         SELECT
-        <include refid="orchestrator_version"/>,`commit_id`
+        <include refid="orchestrator_version"/>
         FROM
         `dss_orchestrator_version_info`
         WHERE
@@ -189,6 +189,7 @@
         <result column="updater" property="updater" jdbcType="LONGVARCHAR"/>
         <result column="project_id" property="projectId" jdbcType="BIGINT"/>
         <result column="content" property="content" jdbcType="LONGVARCHAR"/>
+        <result column="commit_id" property="commitId" jdbcType="LONGVARCHAR"/>
     </resultMap>
 
     <select id="getOrchestratorVersions" resultMap="orchestrator_version_info_result_map">

From 14faf0b3d3aa8469387ea7a351d36e55953fc3e7 Mon Sep 17 00:00:00 2001
From: Zhaobincai <747839893@qq.com>
Date: Thu, 20 Jun 2024 10:02:52 +0800
Subject: [PATCH 285/302] git-server: fix saveFlow exception

---
 .../dss/workflow/restful/FlowRestfulApi.java        | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/restful/FlowRestfulApi.java b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/restful/FlowRestfulApi.java
index 5f42d7603..c6db82483 100644
--- a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/restful/FlowRestfulApi.java
+++ b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/restful/FlowRestfulApi.java
@@ -332,14 +332,11 @@ public Message saveFlow( @RequestBody SaveFlowRequest saveFlowRequest) throws IO
         if (flowEditLock != null && !flowEditLock.getOwner().equals(ticketId)) {
             return Message.error("当前工作流被用户" + flowEditLock.getUsername() + "已锁定编辑，您编辑的内容不能再被保存。如有疑问，请与" + flowEditLock.getUsername() + "确认");
         }
-        try {
-            version = flowService.saveFlow(flowID, jsonFlow, null, userName, workspaceName, projectName);
-            AuditLogUtils.printLog(username, workspace.getWorkspaceId(), workspaceName, TargetTypeEnum.WORKFLOW,
-                    flowID, dssFlow.getName(), OperateTypeEnum.UPDATE, saveFlowRequest);
-            return Message.ok().data("flowVersion", version);
-        } catch (Exception e) {
-            return Message.error("saveFlow failed, Caused by :", e);
-        }
+
+        version = flowService.saveFlow(flowID, jsonFlow, null, userName, workspaceName, projectName);
+        AuditLogUtils.printLog(username, workspace.getWorkspaceId(), workspaceName, TargetTypeEnum.WORKFLOW,
+                flowID, dssFlow.getName(), OperateTypeEnum.UPDATE, saveFlowRequest);
+        return Message.ok().data("flowVersion", version);
     }
 
 

From 9cb1f155a4f8ea4e89332259acee1051397d54d2 Mon Sep 17 00:00:00 2001
From: Zhaobincai <747839893@qq.com>
Date: Thu, 20 Jun 2024 10:24:31 +0800
Subject: [PATCH 286/302] git-server: fix saveFlow exception1

---
 .../wedatasphere/dss/workflow/service/DSSFlowService.java       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/service/DSSFlowService.java b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/service/DSSFlowService.java
index 9f9cd7271..a001f038a 100644
--- a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/service/DSSFlowService.java
+++ b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/service/DSSFlowService.java
@@ -54,7 +54,7 @@ String saveFlow(Long flowId,
                     String userName,
                     String workspaceName,
                     String projectName
-    ) throws IOException, DSSErrorException;
+    ) throws IOException;
 
     DSSFlow copyRootFlow(Long rootFlowId, String userName, Workspace workspace,
                          String projectName, String version, String contextIdStr,

From bac0495d47032f5d78ffe25e563c7a9ee1c54dea Mon Sep 17 00:00:00 2001
From: Zhaobincai <747839893@qq.com>
Date: Thu, 20 Jun 2024 16:23:14 +0800
Subject: [PATCH 287/302] git-server: fix exportOrcSqlFile

---
 .../migrate/restful/DSSMigrateRestful.java    | 116 +++++++++---------
 1 file changed, 58 insertions(+), 58 deletions(-)

diff --git a/dss-framework/framework-plugins/dss-framework-migrate-server/src/main/java/com/webank/wedatasphere/dss/migrate/restful/DSSMigrateRestful.java b/dss-framework/framework-plugins/dss-framework-migrate-server/src/main/java/com/webank/wedatasphere/dss/migrate/restful/DSSMigrateRestful.java
index 4cdfd1c63..758fb2dbe 100644
--- a/dss-framework/framework-plugins/dss-framework-migrate-server/src/main/java/com/webank/wedatasphere/dss/migrate/restful/DSSMigrateRestful.java
+++ b/dss-framework/framework-plugins/dss-framework-migrate-server/src/main/java/com/webank/wedatasphere/dss/migrate/restful/DSSMigrateRestful.java
@@ -396,70 +396,70 @@ public void exportOrcSqlFile(HttpServletRequest req,
             // 下载编排文件到本地
             String zipFilePath = bmlService.downloadToLocalPath(userName, exportResponse.resourceId(), exportResponse.version(), pathRoot + "project.zip");
             // 解压下载文件
-            ZipHelper.unzip(zipFilePath);
+//            ZipHelper.unzip(zipFilePath);
             // 解压后工程文件夹路径
-            String projectBasePath = pathRoot + "default_orc";
-            // 解压工作流zip文件
-            String orcFlowZipFile = projectBasePath + File.separator + "orc_flow.zip";
-            ZipHelper.unzip(orcFlowZipFile);
-            // 解压后工作流文件夹路径
-            String flowBasePath = projectBasePath + File.separator + projectName;
-            // 读取工作流信息
-            List<DSSFlow> dssFlows = metaService.readFlow(flowBasePath);
-            // 获取工作流节点解析对象
-            JsonToFlowParser jsonToFlowParser = WorkflowFactory.INSTANCE.getJsonToFlowParser();
-            List<String> uploadResourceNewFileNameList = new ArrayList<>();
-            for (DSSFlow dssFlow : dssFlows) {
-                String workflowPath = flowBasePath + File.separator + dssFlow.getName() + File.separator;
-                String flowJsonFile = workflowPath + dssFlow.getName() + ".json";
-                String jsonContent = FileHelper.readFile(flowJsonFile);
-
-                if (StringUtils.isNotBlank(jsonContent)) {
-                    //将json读取为string，存入workflow
-                    dssFlow.setFlowJson(jsonContent);
-                    // 获取工作流节点信息
-                    Workflow workflow = jsonToFlowParser.parse(dssFlow);
-                    // 替换用户上传的资源文件名称
-                    List<Resource> uploadResources = workflow.getFlowResources();
-                    if (uploadResources != null && uploadResources.size() > 0) {
-                        for (Resource uploadResource : uploadResources) {
-                            String oldUploadResourceName = workflowPath + "resource" + File.separator + uploadResource.getResourceId() + ".re";
-                            String newUploadResourceName = workflowPath + "resource" + File.separator + uploadResource.getFileName();
-                            FileUtils.getFile(oldUploadResourceName).renameTo(new File(newUploadResourceName));
-                            uploadResourceNewFileNameList.add(newUploadResourceName);
-                        }
-                    }
-                    // 替换脚本sql文件名称为节点名称
-                    workflow.getWorkflowNodes().forEach(workflowNode -> {
-                        List<Resource> resources = workflowNode.getDSSNode().getResources();
-                        if (resources != null && resources.size() > 0) {
-                            for (Resource resource : resources) {
-                                String oldSqlFilePath = workflowPath + "resource" + File.separator + resource.getResourceId() + "_" + resource.getVersion() + ".re";
-                                String newSqlFilePath = workflowPath + "resource" + File.separator + workflowNode.getDSSNode().getName() + "_" + resource.getVersion() + ".re";
-                                FileUtils.getFile(oldSqlFilePath).renameTo(new File(newSqlFilePath));
-                            }
-                        }
-                    });
-                }
-            }
+//            String flowBasePath = pathRoot + File.separator + projectName;
+//            // 解压工作流zip文件
+//            String orcFlowZipFile = projectBasePath + File.separator + "orc_flow.zip";
+//            ZipHelper.unzip(orcFlowZipFile);
+//            // 解压后工作流文件夹路径
+//            String flowBasePath = projectBasePath + File.separator + projectName;
+//            // 读取工作流信息
+//            List<DSSFlow> dssFlows = metaService.readFlow(flowBasePath);
+//            // 获取工作流节点解析对象
+//            JsonToFlowParser jsonToFlowParser = WorkflowFactory.INSTANCE.getJsonToFlowParser();
+//            List<String> uploadResourceNewFileNameList = new ArrayList<>();
+//            for (DSSFlow dssFlow : dssFlows) {
+//                String workflowPath = flowBasePath + File.separator + dssFlow.getName() + File.separator;
+//                String flowJsonFile = workflowPath + dssFlow.getName() + ".json";
+//                String jsonContent = FileHelper.readFile(flowJsonFile);
+//
+//                if (StringUtils.isNotBlank(jsonContent)) {
+//                    //将json读取为string，存入workflow
+//                    dssFlow.setFlowJson(jsonContent);
+//                    // 获取工作流节点信息
+//                    Workflow workflow = jsonToFlowParser.parse(dssFlow);
+//                    // 替换用户上传的资源文件名称
+//                    List<Resource> uploadResources = workflow.getFlowResources();
+//                    if (uploadResources != null && uploadResources.size() > 0) {
+//                        for (Resource uploadResource : uploadResources) {
+//                            String oldUploadResourceName = workflowPath + "resource" + File.separator + uploadResource.getResourceId() + ".re";
+//                            String newUploadResourceName = workflowPath + "resource" + File.separator + uploadResource.getFileName();
+//                            FileUtils.getFile(oldUploadResourceName).renameTo(new File(newUploadResourceName));
+//                            uploadResourceNewFileNameList.add(newUploadResourceName);
+//                        }
+//                    }
+//                    // 替换脚本sql文件名称为节点名称
+//                    workflow.getWorkflowNodes().forEach(workflowNode -> {
+//                        List<Resource> resources = workflowNode.getDSSNode().getResources();
+//                        if (resources != null && resources.size() > 0) {
+//                            for (Resource resource : resources) {
+//                                String oldSqlFilePath = workflowPath + "resource" + File.separator + resource.getResourceId() + "_" + resource.getVersion() + ".re";
+//                                String newSqlFilePath = workflowPath + "resource" + File.separator + workflowNode.getDSSNode().getName() + "_" + resource.getVersion() + ".re";
+//                                FileUtils.getFile(oldSqlFilePath).renameTo(new File(newSqlFilePath));
+//                            }
+//                        }
+//                    });
+//                }
+//            }
             //删除掉无用文件，包括zip包,.json,.txt,.properties
-            List<String> fileNameList = new ArrayList<>();
-            FileHelper.getAllFileNames(pathRoot, fileNameList);
-            fileNameList.forEach(fileName -> {
-                if (fileName.endsWith(".zip") || fileName.endsWith(".json") || fileName.endsWith(".txt") || fileName.endsWith(".properties")) {
-                    // 上传的资源文件不能删除
-                    if (uploadResourceNewFileNameList.stream().noneMatch(fileName::equals)) {
-                        new File(fileName).delete();
-                    }
-                }
-            });
+//            List<String> fileNameList = new ArrayList<>();
+//            FileHelper.getAllFileNames(pathRoot, fileNameList);
+//            fileNameList.forEach(fileName -> {
+//                if (fileName.endsWith(".zip") || fileName.endsWith(".json") || fileName.endsWith(".txt") || fileName.endsWith(".properties")) {
+//                    // 上传的资源文件不能删除
+//                    if (uploadResourceNewFileNameList.stream().noneMatch(fileName::equals)) {
+//                        new File(fileName).delete();
+//                    }
+//                }
+//            });
             //将文件打成zip包并输出
-            String orcZipPath = ZipHelper.zip(flowBasePath, true);
-            try (InputStream inputStream = new FileInputStream(orcZipPath)) {
+//            String orcZipPath = ZipHelper.zip(flowBasePath, true);
+            try (InputStream inputStream = new FileInputStream(zipFilePath)) {
                 IOUtils.copy(inputStream, resp.getOutputStream());
                 resp.getOutputStream().flush();
             } catch (IOException e) {
-                LOG.error("资源文件打包下载失败，下载路径：{}", orcZipPath, e);
+                LOG.error("资源文件打包下载失败，下载路径：{}", zipFilePath, e);
                 throw new DSSErrorException(100800, "资源文件打包下载失败:原因： " + e.getMessage());
             }
         }

From 4f690853ff26b1ae92341306073e454eb1e1710f Mon Sep 17 00:00:00 2001
From: Zhaobincai <747839893@qq.com>
Date: Thu, 20 Jun 2024 16:40:43 +0800
Subject: [PATCH 288/302] git-server: fix exportOrcSqlFile1

---
 .../wedatasphere/dss/migrate/restful/DSSMigrateRestful.java   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dss-framework/framework-plugins/dss-framework-migrate-server/src/main/java/com/webank/wedatasphere/dss/migrate/restful/DSSMigrateRestful.java b/dss-framework/framework-plugins/dss-framework-migrate-server/src/main/java/com/webank/wedatasphere/dss/migrate/restful/DSSMigrateRestful.java
index 758fb2dbe..dca042480 100644
--- a/dss-framework/framework-plugins/dss-framework-migrate-server/src/main/java/com/webank/wedatasphere/dss/migrate/restful/DSSMigrateRestful.java
+++ b/dss-framework/framework-plugins/dss-framework-migrate-server/src/main/java/com/webank/wedatasphere/dss/migrate/restful/DSSMigrateRestful.java
@@ -392,9 +392,9 @@ public void exportOrcSqlFile(HttpServletRequest req,
         }
         if (null != exportResponse) {
             // 获取本地路径
-            String pathRoot = IoUtils.generateIOPath(userName, "project", "");
+            String pathRoot = IoUtils.generateIOPath(userName, projectName, "");
             // 下载编排文件到本地
-            String zipFilePath = bmlService.downloadToLocalPath(userName, exportResponse.resourceId(), exportResponse.version(), pathRoot + "project.zip");
+            String zipFilePath = bmlService.downloadToLocalPath(userName, exportResponse.resourceId(), exportResponse.version(), pathRoot + ".zip");
             // 解压下载文件
 //            ZipHelper.unzip(zipFilePath);
             // 解压后工程文件夹路径

From 49ed9b73cf228c3878eb12047431bb9f0429377b Mon Sep 17 00:00:00 2001
From: Zhaobincai <747839893@qq.com>
Date: Thu, 20 Jun 2024 17:58:33 +0800
Subject: [PATCH 289/302] git-server: add checkWorkspace to workflow

---
 .../DSSFrameworkOrchestratorRestful.java      | 31 ++++++++
 .../migrate/restful/DSSMigrateRestful.java    | 75 ++++---------------
 2 files changed, 45 insertions(+), 61 deletions(-)

diff --git a/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/restful/DSSFrameworkOrchestratorRestful.java b/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/restful/DSSFrameworkOrchestratorRestful.java
index 965d4be1d..441e0b5aa 100644
--- a/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/restful/DSSFrameworkOrchestratorRestful.java
+++ b/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/restful/DSSFrameworkOrchestratorRestful.java
@@ -19,10 +19,14 @@
 import com.webank.wedatasphere.dss.appconn.manager.utils.AppConnManagerUtils;
 import com.webank.wedatasphere.dss.common.auditlog.OperateTypeEnum;
 import com.webank.wedatasphere.dss.common.auditlog.TargetTypeEnum;
+import com.webank.wedatasphere.dss.common.entity.project.DSSProject;
+import com.webank.wedatasphere.dss.common.exception.DSSErrorException;
 import com.webank.wedatasphere.dss.common.label.DSSLabel;
 import com.webank.wedatasphere.dss.common.label.EnvDSSLabel;
 import com.webank.wedatasphere.dss.common.label.LabelRouteVO;
+import com.webank.wedatasphere.dss.common.protocol.project.ProjectInfoRequest;
 import com.webank.wedatasphere.dss.common.utils.AuditLogUtils;
+import com.webank.wedatasphere.dss.common.utils.DSSExceptionUtils;
 import com.webank.wedatasphere.dss.common.utils.RpcAskUtils;
 import com.webank.wedatasphere.dss.git.common.protocol.GitTree;
 import com.webank.wedatasphere.dss.git.common.protocol.config.GitServerConfig;
@@ -156,6 +160,12 @@ public Message deleteOrchestrator(@RequestBody OrchestratorDeleteRequest deleteR
         if (orchestratorFrameworkService.getOrchestratorCopyStatus(deleteRequest.getId())) {
             return Message.error("当前工作流正在被复制，不允许删除");
         }
+        ProjectInfoRequest projectInfoRequest = new ProjectInfoRequest();
+        projectInfoRequest.setProjectId(deleteRequest.getProjectId());
+        DSSProject dssProject = (DSSProject) DSSSenderServiceFactory.getOrCreateServiceInstance().getProjectServerSender().ask(projectInfoRequest);
+        if (dssProject.getWorkspaceId() != workspace.getWorkspaceId()) {
+            DSSExceptionUtils.dealErrorException(63335, "工作流所在工作空间和cookie中不一致，请刷新页面后，再次发布！", DSSErrorException.class);
+        }
         CommonOrchestratorVo orchestratorVo = orchestratorFrameworkService.deleteOrchestrator(username, deleteRequest, workspace);
         AuditLogUtils.printLog(username, workspace.getWorkspaceId(), workspace.getWorkspaceName(), TargetTypeEnum.ORCHESTRATOR,
                 orchestratorVo.getOrchestratorId(), orchestratorVo.getOrchestratorName(), OperateTypeEnum.DELETE, deleteRequest);
@@ -322,6 +332,9 @@ public Message submitFlow(@RequestBody OrchestratorSubmitRequest submitFlowReque
         Workspace workspace = SSOHelper.getWorkspace(httpServletRequest);
         String userName = SecurityFilter.getLoginUsername(httpServletRequest);
 
+        Long orchestratorId = submitFlowRequest.getOrchestratorId();
+        checkWorkspace(orchestratorId, workspace);
+
         List<DSSLabel> dssLabelList = new ArrayList<>();
         dssLabelList.add(new EnvDSSLabel(submitFlowRequest.getLabels().getRoute()));
 
@@ -400,6 +413,8 @@ public Message submitFlow(@RequestParam Long orchestratorId) {
         Workspace workspace = SSOHelper.getWorkspace(httpServletRequest);
         String userName = SecurityFilter.getLoginUsername(httpServletRequest);
 
+        checkWorkspace(orchestratorId, workspace);
+
         OrchestratorSubmitJob orchestratorSubmitJob = orchestratorFrameworkService.getOrchestratorStatus(orchestratorId);
         // 未提交
         if (orchestratorSubmitJob == null) {
@@ -417,11 +432,27 @@ public Message getHistory(@RequestParam Long orchestratorId, @RequestParam Strin
         Workspace workspace = SSOHelper.getWorkspace(httpServletRequest);
         String userName = SecurityFilter.getLoginUsername(httpServletRequest);
 
+        checkWorkspace(orchestratorId, workspace);
+
         GitHistoryResponse history = orchestratorFrameworkService.getHistory(workspace.getWorkspaceId(), orchestratorId, projectName);
 
         return Message.ok().data("history", history);
     }
 
+    private void checkWorkspace(Long orchestratorId, Workspace workspace) throws DSSErrorException{
+        OrchestratorVo orchestratorVoById = orchestratorService.getOrchestratorVoById(orchestratorId);
+        if (orchestratorVoById == null) {
+            DSSExceptionUtils.dealErrorException(80001, "编排不存在", DSSErrorException.class);
+        }
+        long projectId = orchestratorVoById.getDssOrchestratorInfo().getProjectId();
+        ProjectInfoRequest projectInfoRequest = new ProjectInfoRequest();
+        projectInfoRequest.setProjectId(projectId);
+        DSSProject dssProject = (DSSProject) DSSSenderServiceFactory.getOrCreateServiceInstance().getProjectServerSender().ask(projectInfoRequest);
+        if (dssProject.getWorkspaceId() != workspace.getWorkspaceId()) {
+            DSSExceptionUtils.dealErrorException(63335, "工作流所在工作空间和cookie中不一致，请刷新页面后，再次发布！", DSSErrorException.class);
+        }
+    }
+
     @RequestMapping(value = "allType", method = RequestMethod.GET)
     public Message allType(HttpServletRequest req) {
         Workspace workspace = SSOHelper.getWorkspace(httpServletRequest);
diff --git a/dss-framework/framework-plugins/dss-framework-migrate-server/src/main/java/com/webank/wedatasphere/dss/migrate/restful/DSSMigrateRestful.java b/dss-framework/framework-plugins/dss-framework-migrate-server/src/main/java/com/webank/wedatasphere/dss/migrate/restful/DSSMigrateRestful.java
index dca042480..c088e62bf 100644
--- a/dss-framework/framework-plugins/dss-framework-migrate-server/src/main/java/com/webank/wedatasphere/dss/migrate/restful/DSSMigrateRestful.java
+++ b/dss-framework/framework-plugins/dss-framework-migrate-server/src/main/java/com/webank/wedatasphere/dss/migrate/restful/DSSMigrateRestful.java
@@ -392,74 +392,27 @@ public void exportOrcSqlFile(HttpServletRequest req,
         }
         if (null != exportResponse) {
             // 获取本地路径
-            String pathRoot = IoUtils.generateIOPath(userName, projectName, "");
+            String pathRoot = IoUtils.generateIOPath(userName, "project", "");
             // 下载编排文件到本地
-            String zipFilePath = bmlService.downloadToLocalPath(userName, exportResponse.resourceId(), exportResponse.version(), pathRoot + ".zip");
+            String zipFilePath = bmlService.downloadToLocalPath(userName, exportResponse.resourceId(), exportResponse.version(), pathRoot + "project.zip");
             // 解压下载文件
-//            ZipHelper.unzip(zipFilePath);
+            ZipHelper.unzip(zipFilePath);
             // 解压后工程文件夹路径
-//            String flowBasePath = pathRoot + File.separator + projectName;
-//            // 解压工作流zip文件
-//            String orcFlowZipFile = projectBasePath + File.separator + "orc_flow.zip";
-//            ZipHelper.unzip(orcFlowZipFile);
-//            // 解压后工作流文件夹路径
-//            String flowBasePath = projectBasePath + File.separator + projectName;
-//            // 读取工作流信息
-//            List<DSSFlow> dssFlows = metaService.readFlow(flowBasePath);
-//            // 获取工作流节点解析对象
-//            JsonToFlowParser jsonToFlowParser = WorkflowFactory.INSTANCE.getJsonToFlowParser();
-//            List<String> uploadResourceNewFileNameList = new ArrayList<>();
-//            for (DSSFlow dssFlow : dssFlows) {
-//                String workflowPath = flowBasePath + File.separator + dssFlow.getName() + File.separator;
-//                String flowJsonFile = workflowPath + dssFlow.getName() + ".json";
-//                String jsonContent = FileHelper.readFile(flowJsonFile);
-//
-//                if (StringUtils.isNotBlank(jsonContent)) {
-//                    //将json读取为string，存入workflow
-//                    dssFlow.setFlowJson(jsonContent);
-//                    // 获取工作流节点信息
-//                    Workflow workflow = jsonToFlowParser.parse(dssFlow);
-//                    // 替换用户上传的资源文件名称
-//                    List<Resource> uploadResources = workflow.getFlowResources();
-//                    if (uploadResources != null && uploadResources.size() > 0) {
-//                        for (Resource uploadResource : uploadResources) {
-//                            String oldUploadResourceName = workflowPath + "resource" + File.separator + uploadResource.getResourceId() + ".re";
-//                            String newUploadResourceName = workflowPath + "resource" + File.separator + uploadResource.getFileName();
-//                            FileUtils.getFile(oldUploadResourceName).renameTo(new File(newUploadResourceName));
-//                            uploadResourceNewFileNameList.add(newUploadResourceName);
-//                        }
-//                    }
-//                    // 替换脚本sql文件名称为节点名称
-//                    workflow.getWorkflowNodes().forEach(workflowNode -> {
-//                        List<Resource> resources = workflowNode.getDSSNode().getResources();
-//                        if (resources != null && resources.size() > 0) {
-//                            for (Resource resource : resources) {
-//                                String oldSqlFilePath = workflowPath + "resource" + File.separator + resource.getResourceId() + "_" + resource.getVersion() + ".re";
-//                                String newSqlFilePath = workflowPath + "resource" + File.separator + workflowNode.getDSSNode().getName() + "_" + resource.getVersion() + ".re";
-//                                FileUtils.getFile(oldSqlFilePath).renameTo(new File(newSqlFilePath));
-//                            }
-//                        }
-//                    });
-//                }
-//            }
-            //删除掉无用文件，包括zip包,.json,.txt,.properties
-//            List<String> fileNameList = new ArrayList<>();
-//            FileHelper.getAllFileNames(pathRoot, fileNameList);
-//            fileNameList.forEach(fileName -> {
-//                if (fileName.endsWith(".zip") || fileName.endsWith(".json") || fileName.endsWith(".txt") || fileName.endsWith(".properties")) {
-//                    // 上传的资源文件不能删除
-//                    if (uploadResourceNewFileNameList.stream().noneMatch(fileName::equals)) {
-//                        new File(fileName).delete();
-//                    }
-//                }
-//            });
+            String flowBasePath = pathRoot + File.separator + projectName;
+            // 删除 .metaconf文件夹
+            String flowMetaPath = flowBasePath + ".metaConf";
+            File metaFile = new File(flowMetaPath);
+            if (metaFile.exists()) {
+                FileUtils.deleteDirectory(metaFile);
+            }
+
             //将文件打成zip包并输出
-//            String orcZipPath = ZipHelper.zip(flowBasePath, true);
-            try (InputStream inputStream = new FileInputStream(zipFilePath)) {
+            String orcZipPath = ZipHelper.zip(flowBasePath, true);
+            try (InputStream inputStream = new FileInputStream(orcZipPath)) {
                 IOUtils.copy(inputStream, resp.getOutputStream());
                 resp.getOutputStream().flush();
             } catch (IOException e) {
-                LOG.error("资源文件打包下载失败，下载路径：{}", zipFilePath, e);
+                LOG.error("资源文件打包下载失败，下载路径：{}", orcZipPath, e);
                 throw new DSSErrorException(100800, "资源文件打包下载失败:原因： " + e.getMessage());
             }
         }

From e2c66e41516beded56f81f69cb04d0c5214ef140 Mon Sep 17 00:00:00 2001
From: Zhaobincai <747839893@qq.com>
Date: Thu, 20 Jun 2024 18:55:34 +0800
Subject: [PATCH 290/302] git-server: add checkWorkspace to workflow 1

---
 .../DSSFrameworkOrchestratorRestful.java      | 21 ++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)

diff --git a/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/restful/DSSFrameworkOrchestratorRestful.java b/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/restful/DSSFrameworkOrchestratorRestful.java
index 441e0b5aa..d57a96d38 100644
--- a/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/restful/DSSFrameworkOrchestratorRestful.java
+++ b/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/restful/DSSFrameworkOrchestratorRestful.java
@@ -333,7 +333,12 @@ public Message submitFlow(@RequestBody OrchestratorSubmitRequest submitFlowReque
         String userName = SecurityFilter.getLoginUsername(httpServletRequest);
 
         Long orchestratorId = submitFlowRequest.getOrchestratorId();
-        checkWorkspace(orchestratorId, workspace);
+        try {
+            checkWorkspace(orchestratorId, workspace);
+        } catch (Exception e) {
+            LOGGER.error("check failed, the reason is: ", e);
+            return Message.error("提交失败，原因为：" + e.getMessage());
+        }
 
         List<DSSLabel> dssLabelList = new ArrayList<>();
         dssLabelList.add(new EnvDSSLabel(submitFlowRequest.getLabels().getRoute()));
@@ -413,7 +418,12 @@ public Message submitFlow(@RequestParam Long orchestratorId) {
         Workspace workspace = SSOHelper.getWorkspace(httpServletRequest);
         String userName = SecurityFilter.getLoginUsername(httpServletRequest);
 
-        checkWorkspace(orchestratorId, workspace);
+        try {
+            checkWorkspace(orchestratorId, workspace);
+        } catch (Exception e) {
+            LOGGER.error("check failed, the reason is: ", e);
+            return Message.error("提交失败，原因为：" + e.getMessage());
+        }
 
         OrchestratorSubmitJob orchestratorSubmitJob = orchestratorFrameworkService.getOrchestratorStatus(orchestratorId);
         // 未提交
@@ -432,7 +442,12 @@ public Message getHistory(@RequestParam Long orchestratorId, @RequestParam Strin
         Workspace workspace = SSOHelper.getWorkspace(httpServletRequest);
         String userName = SecurityFilter.getLoginUsername(httpServletRequest);
 
-        checkWorkspace(orchestratorId, workspace);
+        try {
+            checkWorkspace(orchestratorId, workspace);
+        } catch (Exception e) {
+            LOGGER.error("check failed, the reason is: ", e);
+            return Message.error("提交失败，原因为：" + e.getMessage());
+        }
 
         GitHistoryResponse history = orchestratorFrameworkService.getHistory(workspace.getWorkspaceId(), orchestratorId, projectName);
 

From cf762fd2f190c72c1e7da9d2c118bafbfe317863 Mon Sep 17 00:00:00 2001
From: Zhaobincai <747839893@qq.com>
Date: Thu, 20 Jun 2024 19:16:25 +0800
Subject: [PATCH 291/302] git-server: add checkWorkspace to workflow 2

---
 .../wedatasphere/dss/migrate/restful/DSSMigrateRestful.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dss-framework/framework-plugins/dss-framework-migrate-server/src/main/java/com/webank/wedatasphere/dss/migrate/restful/DSSMigrateRestful.java b/dss-framework/framework-plugins/dss-framework-migrate-server/src/main/java/com/webank/wedatasphere/dss/migrate/restful/DSSMigrateRestful.java
index c088e62bf..0dac927b1 100644
--- a/dss-framework/framework-plugins/dss-framework-migrate-server/src/main/java/com/webank/wedatasphere/dss/migrate/restful/DSSMigrateRestful.java
+++ b/dss-framework/framework-plugins/dss-framework-migrate-server/src/main/java/com/webank/wedatasphere/dss/migrate/restful/DSSMigrateRestful.java
@@ -400,7 +400,7 @@ public void exportOrcSqlFile(HttpServletRequest req,
             // 解压后工程文件夹路径
             String flowBasePath = pathRoot + File.separator + projectName;
             // 删除 .metaconf文件夹
-            String flowMetaPath = flowBasePath + ".metaConf";
+            String flowMetaPath = flowBasePath + File.separator + ".metaConf";
             File metaFile = new File(flowMetaPath);
             if (metaFile.exists()) {
                 FileUtils.deleteDirectory(metaFile);

From 1422d39615a7141a4d7186a6e3ea9f8440ee53f5 Mon Sep 17 00:00:00 2001
From: Zhaobincai <747839893@qq.com>
Date: Fri, 21 Jun 2024 10:05:05 +0800
Subject: [PATCH 292/302] git-server: fix error code

---
 .../impl/DSSGitProjectManagerServiceImpl.java | 10 ++-
 .../DSSGitWorkflowManagerServiceImpl.java     | 45 ++++++-------
 .../dss/git/utils/DSSGitUtils.java            | 67 ++++++++++---------
 3 files changed, 64 insertions(+), 58 deletions(-)

diff --git a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitProjectManagerServiceImpl.java b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitProjectManagerServiceImpl.java
index 1905b9c41..784b4ab90 100644
--- a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitProjectManagerServiceImpl.java
+++ b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitProjectManagerServiceImpl.java
@@ -23,11 +23,12 @@
 
 import java.io.File;
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.List;
 
 @Service
 public class DSSGitProjectManagerServiceImpl  implements DSSGitProjectManagerService {
-    private Logger logger = LoggerFactory.getLogger(this.getClass());
+    private final Logger logger = LoggerFactory.getLogger(this.getClass());
 
     @Autowired
     @Qualifier("projectBmlService")
@@ -60,10 +61,13 @@ public GitCreateProjectResponse create(GitCreateProjectRequest request) throws D
             // 提交
             String comment = "init project: " + request.getProjectName() + DSSGitConstant.GIT_USERNAME_FLAG + request.getUsername();
             // 首次创建提交项目整体
-            List<String> paths = Arrays.asList(".");
+            List<String> paths = Collections.singletonList(".");
             DSSGitUtils.push(repository, request.getProjectName(), gitUser, comment, paths);
             // 获取工作空间只读用户
             GitUserEntity readGitUser = GitProjectManager.selectGit(workspaceId, GitConstant.GIT_ACCESS_READ_TYPE, true);
+            if (readGitUser == null) {
+                throw new DSSErrorException(80001, "只读用户不能为空，需完成工作空间制度用户设置");
+            }
             // 获取项目ProjectId
             String projectIdByName = DSSGitUtils.getProjectIdByName(gitUser, request.getProjectName());
             DSSGitUtils.addProjectMember(gitUser, readGitUser.getGitUserId(), projectIdByName, 20);
@@ -76,7 +80,7 @@ public GitCreateProjectResponse create(GitCreateProjectRequest request) throws D
             return new GitCreateProjectResponse();
         } catch (Exception e) {
             logger.error("create project failed, the reason is: ", e);
-            throw new DSSErrorException(010001, "create project failed, the reason is: " + e);
+            throw new DSSErrorException(80001, "create project failed, the reason is: " + e);
         } finally {
             if (repository != null) {
                 repository.close();
diff --git a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitWorkflowManagerServiceImpl.java b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitWorkflowManagerServiceImpl.java
index ddba63605..2c3baaa71 100644
--- a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitWorkflowManagerServiceImpl.java
+++ b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/service/impl/DSSGitWorkflowManagerServiceImpl.java
@@ -36,7 +36,7 @@
 
 @Service
 public class DSSGitWorkflowManagerServiceImpl implements DSSGitWorkflowManagerService {
-    private Logger logger = LoggerFactory.getLogger(this.getClass());
+    private final Logger logger = LoggerFactory.getLogger(this.getClass());
 
     @Autowired
     @Qualifier("workflowBmlService")
@@ -114,8 +114,8 @@ public GitCommitResponse commit(GitCommitRequest request) throws DSSErrorExcepti
 
             commitResponse = DSSGitUtils.getCurrentCommit(repository);
         } catch (Exception e) {
-            logger.error("pull failed, the reason is ",e);
-            throw new DSSErrorException(010001, "commit workflow failed, the reason is: " + e);
+            logger.error("commit failed, the reason is ",e);
+            throw new DSSErrorException(8001, "commit workflow failed, the reason is: " + e);
         }
         return commitResponse;
     }
@@ -137,8 +137,6 @@ public GitSearchResponse search(GitSearchRequest request) {
             DSSGitUtils.pull(repository, request.getProjectName(), gitUser);
         } catch (Exception e) {
             logger.error("pull failed, the reason is ",e);
-        }
-        if (request == null) {
             return new GitSearchResponse();
         }
         if (CollectionUtils.isEmpty(request.getTypeList())) {
@@ -316,7 +314,9 @@ private List<String> process(List<String> commands) {
         } catch (IOException | InterruptedException e) {
             logger.error("grep failed ,the reason is :", e);
         } finally {
-            process.destroy();
+            if (process != null) {
+                process.destroy();
+            }
         }
         return result;
     }
@@ -353,7 +353,7 @@ public GitDeleteResponse delete(GitDeleteRequest request) throws DSSErrorExcepti
             DSSGitUtils.push(repository, request.getProjectName(), gitUser,"delete " + request.getDeleteFileList(), request.getDeleteFileList());
         } catch (Exception e) {
             logger.error("delete failed, the reason is ",e);
-            throw new DSSErrorException(010001, "delete workflow failed, the reason is: " + e);
+            throw new DSSErrorException(80001, "delete workflow failed, the reason is: " + e);
         }
         return null;
     }
@@ -365,7 +365,7 @@ public GitFileContentResponse getFileContent(GitFileContentRequest request) thro
             logger.error("the workspace : {} don't associate with git", request.getWorkspaceId());
             return null;
         }
-        GitFileContentResponse contentResponse = null;
+        GitFileContentResponse contentResponse = new GitFileContentResponse();
         // 拼接.git路径
         String gitPath = DSSGitUtils.generateGitPath(request.getProjectName(), request.getWorkspaceId());
         // 获取git仓库
@@ -384,7 +384,7 @@ public GitFileContentResponse getFileContent(GitFileContentRequest request) thro
             contentResponse.setBmlResource(bmlResource);
             return contentResponse;
         } catch (Exception e) {
-            throw new DSSErrorException(010001, "getFileContent failed, the reason is: " + e);
+            throw new DSSErrorException(80001, "getFileContent failed, the reason is: " + e);
         }
     }
 
@@ -406,7 +406,7 @@ public GitHistoryResponse getHistory(GitHistoryRequest request) throws DSSErrorE
             // 本地保持最新状态
             DSSGitUtils.pull(repository, request.getProjectName(), gitUser);
 
-            List<GitCommitResponse> latestCommit = DSSGitUtils.getLatestCommit(repository, request.getFilePath(), 100);
+            List<GitCommitResponse> latestCommit = DSSGitUtils.getLatestCommit(repository, request.getFilePath(), null);
             if (CollectionUtils.isEmpty(latestCommit)) {
                 logger.error("get Commit failed, the reason is null");
             }else {
@@ -414,7 +414,7 @@ public GitHistoryResponse getHistory(GitHistoryRequest request) throws DSSErrorE
             }
 
         } catch (Exception e) {
-            throw new DSSErrorException(010001, "getHistory failed, the reason is: " + e);
+            throw new DSSErrorException(80001, "getHistory failed, the reason is: " + e);
         }
         return response;
     }
@@ -436,7 +436,7 @@ private Repository getRepository(File repoDir, String projectName, GitUserEntity
             }
         } catch (Exception e) {
             logger.info("get repository failed, the reason is: ", e);
-            throw new DSSErrorException(010001, "get repository failed, the reason is: " + e);
+            throw new DSSErrorException(80001, "get repository failed, the reason is: " + e);
         }
         return repository;
     }
@@ -467,7 +467,7 @@ public GitCommitResponse getCurrentCommit(GitCurrentCommitRequest request) throw
 
         } catch (Exception e) {
             logger.error("getCurrentCommit, the reason is ",e);
-            throw new DSSErrorException(010001, "getCurrentCommit failed, the reason is: " + e);
+            throw new DSSErrorException(80001, "getCurrentCommit failed, the reason is: " + e);
         }
         return null;
     }
@@ -490,7 +490,7 @@ public GitCommitResponse gitCheckOut(GitRevertRequest request) throws DSSErrorEx
             // 回滚
             DSSGitUtils.checkoutTargetCommit(repository, request);
             // push
-            List<String> paths = Arrays.asList(request.getPath());
+            List<String> paths = Collections.singletonList(request.getPath());
             DSSGitUtils.push(repository, request.getProjectName(), gitUser, "revert "+ DSSGitConstant.GIT_USERNAME_FLAG + request.getUsername(), paths);
 
             List<GitCommitResponse> latestCommit = DSSGitUtils.getLatestCommit(repository, request.getPath(), 1);
@@ -502,7 +502,7 @@ public GitCommitResponse gitCheckOut(GitRevertRequest request) throws DSSErrorEx
 
         } catch (Exception e) {
             logger.error("checkOut failed, the reason is ",e);
-            throw new DSSErrorException(010001, "checkOut failed, the reason is: " + e);
+            throw new DSSErrorException(80001, "checkOut failed, the reason is: " + e);
         }
         return null;
     }
@@ -539,8 +539,8 @@ public GitCommitResponse removeFile(GitRemoveRequest request) throws DSSErrorExc
             commitResponse = DSSGitUtils.getCurrentCommit(repository);
 
         } catch (Exception e) {
-            logger.error("pull failed, the reason is ",e);
-            throw new DSSErrorException(010001, "removeFile failed, the reason is: " + e);
+            logger.error("removeFile failed, the reason is ",e);
+            throw new DSSErrorException(80001, "removeFile failed, the reason is: " + e);
         }
         return commitResponse;
     }
@@ -567,9 +567,6 @@ public GitCommitResponse rename(GitRenameRequest request) throws DSSErrorExcepti
             String oldFileMetaPath = projectPath  + metaPath;
             String oldMetaPath = FileUtils.normalizePath(GitConstant.GIT_SERVER_META_PATH) + File.separator + FileUtils.normalizePath(request.getName());
             String fileMetaPath = projectPath + oldMetaPath;
-            List<String> fileList = new ArrayList<>();
-            fileList.add(oldFileMetaPath);
-            fileList.add(olfFilePath);
             // 本地保持最新状态
             DSSGitUtils.pull(repository, request.getProjectName(), gitUser);
             FileUtils.renameFile(olfFilePath, filePath);
@@ -590,7 +587,7 @@ public GitCommitResponse rename(GitRenameRequest request) throws DSSErrorExcepti
 
         } catch (Exception e) {
             logger.error("rename failed, the reason is ",e);
-            throw new DSSErrorException(010001, "rename failed, the reason is: " + e);
+            throw new DSSErrorException(80001, "rename failed, the reason is: " + e);
         }
         return commitResponse;
     }
@@ -616,7 +613,7 @@ public GitHistoryResponse getHistory(GitCommitInfoBetweenRequest request) throws
             DSSGitUtils.pull(repository, request.getProjectName(), gitUser);
             if (StringUtils.isEmpty(request.getOldCommitId())) {
                 // 去掉上线
-                List<GitCommitResponse> latestCommit = DSSGitUtils.getLatestCommit(repository, request.getDirName(), 100);
+                List<GitCommitResponse> latestCommit = DSSGitUtils.getLatestCommit(repository, request.getDirName(), null);
                 if (CollectionUtils.isEmpty(latestCommit)) {
                     logger.error("get Commit failed, the reason is null");
                 }else {
@@ -626,8 +623,8 @@ public GitHistoryResponse getHistory(GitCommitInfoBetweenRequest request) throws
                 response = DSSGitUtils.listCommitsBetween(repository, request.getOldCommitId(), request.getNewCommitId(), request.getDirName());
             }
         } catch (Exception e) {
-            logger.error("pull failed, the reason is ",e);
-            throw new DSSErrorException(010001, "getHistory failed, the reason is: " + e);
+            logger.error("getHistory failed, the reason is ",e);
+            throw new DSSErrorException(80001, "getHistory failed, the reason is: " + e);
         }
         return response;
     }
diff --git a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/utils/DSSGitUtils.java b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/utils/DSSGitUtils.java
index 68f6b1d78..f004b7515 100644
--- a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/utils/DSSGitUtils.java
+++ b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/utils/DSSGitUtils.java
@@ -74,7 +74,7 @@ public static void init(String projectName, GitUserEntity gitUserDO) throws Exce
                 }
             }
         } else {
-            throw new GitErrorException(80001, "git init failed, the reason is: projectName " + projectName +" already exists");
+            throw new GitErrorException(80101, "git init failed, the reason is: projectName " + projectName +" already exists");
         }
     }
 
@@ -92,9 +92,9 @@ public static void remote(Repository repository, String projectName, GitUserEnti
 
             logger.info("remote success");
         } catch (URISyntaxException e) {
-            throw new GitErrorException(80001, "connect Uri " + remoteUrl +" failed, the reason is: ", e);
+            throw new GitErrorException(80102, "connect Uri " + remoteUrl +" failed, the reason is: ", e);
         } catch (GitAPIException  e) {
-            throw new GitErrorException(80001, "remote git failed, the reason is: ", e);
+            throw new GitErrorException(80102, "remote git failed, the reason is: ", e);
         }
 
     }
@@ -115,7 +115,7 @@ public static void create(String projectName, GitUserEntity gitUserDO, Long work
 
                 git.close(); // 不再需要时关闭Git对象
             } catch (GitAPIException e) {
-                throw new GitErrorException(80001, "git Create failed, the reason is: ", e);
+                throw new GitErrorException(80103, "git Create failed, the reason is: ", e);
             }
         } else {
             logger.info(respo + " already exists");
@@ -146,7 +146,7 @@ public static void pull(Repository repository, String projectName, GitUserEntity
                         reset(repository, projectName);
                     }
                 }else {
-                    throw new GitErrorException(80001, "git pull failed");
+                    throw new GitErrorException(80104, "git pull failed");
                 }
             }
         } catch (Exception e) {
@@ -234,7 +234,7 @@ public static void push(Repository repository, String projectName, GitUserEntity
             logger.info("Changes pushed to remote repository.");
         } catch (GitAPIException e) {
             reset(repository, projectName);
-            throw new GitErrorException(80001, "提交失败，请重试或检查token是否过期", e);
+            throw new GitErrorException(80105, "提交失败，请重试或检查token是否过期", e);
         }
     }
 
@@ -249,7 +249,7 @@ public static void reset(Repository repository, String projectName)throws GitErr
 
             logger.info("git reset success : " + projectName);
         } catch (GitAPIException e) {
-            throw new GitErrorException(80001, "git reset failed, the reason is: ", e);
+            throw new GitErrorException(80106, "git reset failed, the reason is: ", e);
         }
     }
 
@@ -270,7 +270,7 @@ public static void checkoutTargetCommit(Repository repository, GitRevertRequest
 
         } catch (GitAPIException e) {
             reset(repository, request.getProjectName());
-            throw new GitErrorException(80001, "git check out failed, the reason is: ", e);
+            throw new GitErrorException(80107, "git check out failed, the reason is: ", e);
         }
     }
 
@@ -294,7 +294,7 @@ public static boolean checkIfProjectExists(GitUserEntity gitUser, String project
                 }
             }
         } catch (Exception e) {
-            throw new GitErrorException(80001, "检查项目名称失败，请检查工作空间token是否过期", e);
+            throw new GitErrorException(80108, "检查项目名称失败，请检查工作空间token是否过期", e);
         }
     }
 
@@ -325,14 +325,14 @@ public static String getUserIdByUsername(GitUserEntity gitUser, String username)
                         JsonObject userObject = jsonArray.get(0).getAsJsonObject();
                         return userObject.get("id").toString();
                     } else {
-                        throw new GitErrorException(80001, "获取userId失败，请检查该用户是否为git用户并激活");
+                        throw new GitErrorException(80109, "获取userId失败，请检查该用户是否为git用户并激活");
                     }
                 } else {
-                    throw new GitErrorException(80001, "获取userId失败，请检查编辑用户token是否过期或git服务是否正常");
+                    throw new GitErrorException(80109, "获取userId失败，请检查编辑用户token是否过期或git服务是否正常");
                 }
             }
         } catch (Exception e) {
-            throw new GitErrorException(80001, "获取该git用户Id失败，原因为", e);
+            throw new GitErrorException(80109, "获取该git用户Id失败，原因为", e);
         } finally {
             if (in != null) {
                 in.close();
@@ -375,13 +375,13 @@ public static String getProjectIdByName(GitUserEntity gitUser, String projectNam
                         }
                     }
                 } else {
-                    throw new GitErrorException(80001, "项目创建失败，请稍后重试");
+                    throw new GitErrorException(80110, "项目创建失败，请稍后重试");
                 }
             } else {
-                throw new GitErrorException(80001, "请检查编辑用户token是否过期或git服务是否正常");
+                throw new GitErrorException(80110, "请检查编辑用户token是否过期或git服务是否正常");
             }
         } catch (Exception e) {
-            throw new GitErrorException(80001, "获取该项目git Id 失败，原因为", e);
+            throw new GitErrorException(80110, "获取该项目git Id 失败，原因为", e);
         }
         return null;
     }
@@ -402,11 +402,11 @@ public static boolean addProjectMember(GitUserEntity gitUser, String userId, Str
                 if (statusCode == 201) {
                     return true;
                 } else {
-                    throw new GitErrorException(80001, "添加用户失败，请检查只读用户是否存在或编辑用户token是否过期");
+                    throw new GitErrorException(80111, "添加用户失败，请检查只读用户是否存在或编辑用户token是否过期");
                 }
             }
         } catch (Exception e) {
-            throw new GitErrorException(80001, "添加用户失败，请检查编辑用户token是否过期或git服务是否正常");
+            throw new GitErrorException(80111, "添加用户失败，请检查编辑用户token是否过期或git服务是否正常");
         }
     }
 
@@ -421,11 +421,11 @@ public static boolean removeProjectMember(GitUserEntity gitUser, String userId,
                 if (responseCode == 204) {
                     return true;
                 } else {
-                    throw new GitErrorException(80001, "请检查工作空间Git只读用户是否存在");
+                    throw new GitErrorException(80112, "请检查工作空间Git只读用户是否存在");
                 }
             }
         } catch (IOException e) {
-            throw new GitErrorException(80001, "更新用户权限失败", e);
+            throw new GitErrorException(80112, "更新用户权限失败", e);
         }
     }
 
@@ -457,9 +457,9 @@ public static List<String> getAllProjectName(GitUserEntity gitUserDO) throws DSS
                     allProjectNames.addAll(projectNames);
                 }
             } catch (IOException e) {
-                throw new GitErrorException(80001, "检查项目名称失败，请检查工作空间token是否过期", e);
+                throw new GitErrorException(80113, "检查项目名称失败，请检查工作空间token是否过期", e);
             } catch (Exception e) {
-                throw new GitErrorException(80001, "检查项目名称时解析JSON失败，请确认git当前是否可访问 ", e);
+                throw new GitErrorException(80113, "检查项目名称时解析JSON失败，请确认git当前是否可访问 ", e);
             }
             page++;
         } while (projectNames.size() > 0);
@@ -514,7 +514,7 @@ public static Set<String> status(String projectName, List<String> fileList, Long
 
             return tree;
         } catch (IOException | GitAPIException e) {
-            throw new GitErrorException(80001, "git status failed, the reason is : ", e);
+            throw new GitErrorException(80114, "git status failed, the reason is : ", e);
         }
     }
 
@@ -542,7 +542,7 @@ public static void archive(String projectName, GitUserEntity gitUserDO) throws G
             logger.info(response.toString());
 
         } catch (Exception e) {
-            throw new GitErrorException(80001, "归档失败，请检查当前token是否过期 ", e);
+            throw new GitErrorException(80115, "归档失败，请检查当前token是否过期 ", e);
         }
     }
 
@@ -560,9 +560,9 @@ public static void archiveLocal(String projectName, Long workspaceId) throws Git
             FileUtils.removeDirectory(File.separator + FileUtils.normalizePath(GitServerConfig.GIT_SERVER_PATH.getValue()) + File.separator + workspaceId + File.separator +  projectName);
             logger.info("Remote 'origin' removed successfully.");
         } catch (GitAPIException e) {
-            throw new GitErrorException(80001, "git archive failed, the reason is : ", e);
+            throw new GitErrorException(80116, "git archive failed, the reason is : ", e);
         } catch (IOException e) {
-            throw new GitErrorException(80001, "archive failed, the reason is : ", e);
+            throw new GitErrorException(80116, "archive failed, the reason is : ", e);
         }
     }
 
@@ -598,7 +598,7 @@ public static String getTargetCommitFileContent(Repository repository, String pr
                 revWalk.dispose();
             }
         } catch (IOException e) {
-            throw new GitErrorException(80001, "getFileContent failed, the reason is : ", e);
+            throw new GitErrorException(80117, "getFileContent failed, the reason is : ", e);
         }
         return content;
     }
@@ -625,7 +625,7 @@ public static void getCommitId(Repository repository, String projectName, int nu
                 logger.info("Commit Author: " + commitAuthor);
             }
         } catch (Exception e) {
-            throw new GitErrorException(80001, "git log failed, the reason is : ", e);
+            throw new GitErrorException(80118, "git log failed, the reason is : ", e);
         }
     }
 
@@ -648,7 +648,7 @@ public static GitCommitResponse getCurrentCommit(Repository repository) throws G
                 return commitResponse;
             }
         } catch (IOException e) {
-            throw new GitErrorException(80001, "get current commit failed, the reason is : ", e);
+            throw new GitErrorException(80119, "get current commit failed, the reason is : ", e);
         }
     }
 
@@ -675,7 +675,12 @@ public static List<GitCommitResponse> getLatestCommit(Repository repository, Str
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 
         try (Git git = new Git(repository)) {
-            Iterable<RevCommit> commits = git.log().addPath(filePath).setMaxCount(num).call();
+            Iterable<RevCommit> commits = null;
+            if (num == null) {
+                commits = git.log().addPath(filePath).call();
+            } else {
+                commits = git.log().addPath(filePath).setMaxCount(num).call();
+            }
             for (RevCommit commit : commits) {
                 GitCommitResponse commitResponse = new GitCommitResponse();
                 commitResponse.setCommitId(commit.getId().getName());
@@ -688,7 +693,7 @@ public static List<GitCommitResponse> getLatestCommit(Repository repository, Str
 
             return commitResponseList;
         } catch (GitAPIException e) {
-            throw new GitErrorException(80001, "get latestCommitId failed, the reason is : ", e);
+            throw new GitErrorException(80120, "get latestCommitId failed, the reason is : ", e);
         }
     }
 
@@ -726,7 +731,7 @@ public static GitHistoryResponse listCommitsBetween(Repository repository, Strin
                 logger.info("Author: " + authorIdent.getName() + " <" + authorIdent.getEmailAddress() + ">"); // 提交人
             }
         } catch (Exception e) {
-            throw new GitErrorException(80001, "get log between " + oldCommitId + " and " + newCommitId + "failed, the reason is : ", e);
+            throw new GitErrorException(80121, "get log between " + oldCommitId + " and " + newCommitId + "failed, the reason is : ", e);
         }
         GitHistoryResponse historyResponse = new GitHistoryResponse();
         historyResponse.setResponses(gitCommitResponseList);

From 67e7f6c1f00535b1bbd825a7e6178bfbcb6c0880 Mon Sep 17 00:00:00 2001
From: Zhaobincai <747839893@qq.com>
Date: Fri, 21 Jun 2024 20:47:17 +0800
Subject: [PATCH 293/302] dss-server: fix export

---
 .../server/service/OrchestratorService.java   |  2 ++
 .../service/impl/OrchestratorServiceImpl.java | 24 +++++++++++++++----
 .../receiver/DSSOrchestratorChooser.scala     |  3 +++
 .../receiver/DSSOrchestratorReceiver.scala    |  8 +++++--
 .../entity/DSSOrchestratorInfoList.java       | 23 ++++++++++++++++++
 5 files changed, 53 insertions(+), 7 deletions(-)
 create mode 100644 dss-orchestrator/dss-orchestrator-common/src/main/java/com/webank/wedatasphere/dss/orchestrator/common/entity/DSSOrchestratorInfoList.java

diff --git a/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/OrchestratorService.java b/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/OrchestratorService.java
index c817df62f..024edfe1c 100644
--- a/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/OrchestratorService.java
+++ b/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/OrchestratorService.java
@@ -150,4 +150,6 @@ void rollbackOrchestratorGit(OrchestratorRollBackGitVo rollBackGitVo, String use
 
     OrchestratorVo getOrchestratorByAppId(Long appId);
 
+    List<DSSOrchestratorInfo> getOrchestratorInfoByLabel(OrchestratorRequest orchestratorRequest);
+
 }
diff --git a/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/impl/OrchestratorServiceImpl.java b/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/impl/OrchestratorServiceImpl.java
index 6ee525545..2197f035c 100644
--- a/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/impl/OrchestratorServiceImpl.java
+++ b/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/impl/OrchestratorServiceImpl.java
@@ -37,6 +37,7 @@
 import com.webank.wedatasphere.dss.git.common.protocol.response.GitCommitResponse;
 import com.webank.wedatasphere.dss.git.common.protocol.util.UrlUtils;
 import com.webank.wedatasphere.dss.orchestrator.common.entity.DSSOrchestratorInfo;
+import com.webank.wedatasphere.dss.orchestrator.common.entity.DSSOrchestratorInfoList;
 import com.webank.wedatasphere.dss.orchestrator.common.entity.DSSOrchestratorVersion;
 import com.webank.wedatasphere.dss.orchestrator.common.entity.OrchestratorInfo;
 import com.webank.wedatasphere.dss.orchestrator.common.entity.OrchestratorVo;
@@ -517,11 +518,16 @@ public Long isExistSameNameBeforeUpdate(OrchestratorModifyRequest orchestratorMo
      */
     @Override
     public List<OrchestratorBaseInfo> getOrchestratorInfos(OrchestratorRequest orchestratorRequest, String username) {
-        List<DSSOrchestratorInfo> list = orchestratorMapper.queryOrchestratorInfos(new HashMap<String, Object>() {{
-            put("workspace_id", orchestratorRequest.getWorkspaceId());
-            put("project_id", orchestratorRequest.getProjectId());
-            put("orchestrator_mode", orchestratorRequest.getOrchestratorMode());
-        }});
+        LabelRouteVO labels = orchestratorRequest.getLabels();
+        List<DSSOrchestratorInfo> list = new ArrayList<>();
+        if ("dev".equals(labels.getRoute())) {
+            list = getOrchestratorInfoByLabel(orchestratorRequest);
+        } else {
+            List<DSSLabel> dssLabelList = Arrays.asList(new EnvDSSLabel(labels.getRoute()));
+            Sender sender = DSSSenderServiceFactory.getOrCreateServiceInstance().getOrcSender(dssLabelList);
+            DSSOrchestratorInfoList orchestratorInfoList = RpcAskUtils.processAskException(sender.ask(orchestratorRequest), DSSOrchestratorInfoList.class, OrchestratorRequest.class);
+            list = orchestratorInfoList.getOrchestratorInfos();
+        }
         List<OrchestratorBaseInfo> retList = new ArrayList<>(list.size());
         if (!CollectionUtils.isEmpty(list)) {
             //todo Is used in front-end?
@@ -554,6 +560,14 @@ public List<OrchestratorBaseInfo> getOrchestratorInfos(OrchestratorRequest orche
         return retList;
     }
 
+    @Override
+    public List<DSSOrchestratorInfo> getOrchestratorInfoByLabel(OrchestratorRequest orchestratorRequest) {
+        return orchestratorMapper.queryOrchestratorInfos(new HashMap<String, Object>() {{
+            put("workspace_id", orchestratorRequest.getWorkspaceId());
+            put("project_id", orchestratorRequest.getProjectId());
+            put("orchestrator_mode", orchestratorRequest.getOrchestratorMode());
+        }});
+    }
     @Override
     public ResponseOrchestratorInfos queryOrchestratorInfos(RequestOrchestratorInfos requestOrchestratorInfos) {
         List<DSSOrchestratorInfo> orchestratorInfos = orchestratorMapper.queryOrchestratorInfos(new HashMap<String, Object>() {{
diff --git a/dss-framework/dss-framework-orchestrator-server/src/main/scala/com/webank/wedatasphere/dss/orchestrator/server/receiver/DSSOrchestratorChooser.scala b/dss-framework/dss-framework-orchestrator-server/src/main/scala/com/webank/wedatasphere/dss/orchestrator/server/receiver/DSSOrchestratorChooser.scala
index 84e3b5cd6..c2fefcdad 100644
--- a/dss-framework/dss-framework-orchestrator-server/src/main/scala/com/webank/wedatasphere/dss/orchestrator/server/receiver/DSSOrchestratorChooser.scala
+++ b/dss-framework/dss-framework-orchestrator-server/src/main/scala/com/webank/wedatasphere/dss/orchestrator/server/receiver/DSSOrchestratorChooser.scala
@@ -18,7 +18,9 @@ package com.webank.wedatasphere.dss.orchestrator.server.receiver
 
 import com.webank.wedatasphere.dss.orchestrator.common.protocol._
 import com.webank.wedatasphere.dss.orchestrator.core.DSSOrchestratorContext
+import com.webank.wedatasphere.dss.orchestrator.server.entity.request.OrchestratorRequest
 import com.webank.wedatasphere.dss.orchestrator.server.service.{OrchestratorPluginService, OrchestratorService}
+
 import javax.annotation.PostConstruct
 import org.apache.linkis.rpc.{RPCMessageEvent, Receiver, ReceiverChooser}
 import org.springframework.beans.factory.annotation.Autowired
@@ -54,6 +56,7 @@ class DSSOrchestratorChooser extends ReceiverChooser {
     case _: RequestQueryByIdOrchestrator => receiver
     case _: RequestQuertByAppIdOrchestrator => receiver
     case _: RequestSubmitOrchestratorSync => receiver
+    case _: OrchestratorRequest => receiver
     case _ => None
   }
 }
\ No newline at end of file
diff --git a/dss-framework/dss-framework-orchestrator-server/src/main/scala/com/webank/wedatasphere/dss/orchestrator/server/receiver/DSSOrchestratorReceiver.scala b/dss-framework/dss-framework-orchestrator-server/src/main/scala/com/webank/wedatasphere/dss/orchestrator/server/receiver/DSSOrchestratorReceiver.scala
index 5e5c3f6ea..53cefe64a 100644
--- a/dss-framework/dss-framework-orchestrator-server/src/main/scala/com/webank/wedatasphere/dss/orchestrator/server/receiver/DSSOrchestratorReceiver.scala
+++ b/dss-framework/dss-framework-orchestrator-server/src/main/scala/com/webank/wedatasphere/dss/orchestrator/server/receiver/DSSOrchestratorReceiver.scala
@@ -18,12 +18,12 @@ package com.webank.wedatasphere.dss.orchestrator.server.receiver
 
 import com.webank.wedatasphere.dss.common.exception.DSSErrorException
 import com.webank.wedatasphere.dss.common.protocol.{ResponseExportOrchestrator, ResponseImportOrchestrator}
-import com.webank.wedatasphere.dss.orchestrator.common.entity.OrchestratorVo
+import com.webank.wedatasphere.dss.orchestrator.common.entity.{DSSOrchestratorInfoList, OrchestratorVo}
 import com.webank.wedatasphere.dss.orchestrator.common.protocol._
 import com.webank.wedatasphere.dss.orchestrator.core.DSSOrchestratorContext
 import com.webank.wedatasphere.dss.orchestrator.publish.entity.OrchestratorExportResult
 import com.webank.wedatasphere.dss.orchestrator.publish.{ExportDSSOrchestratorPlugin, ImportDSSOrchestratorPlugin}
-import com.webank.wedatasphere.dss.orchestrator.server.entity.request.OrchestratorSubmitRequest
+import com.webank.wedatasphere.dss.orchestrator.server.entity.request.{OrchestratorRequest, OrchestratorSubmitRequest}
 import com.webank.wedatasphere.dss.orchestrator.server.service.{OrchestratorPluginService, OrchestratorService}
 import org.apache.linkis.rpc.{Receiver, Sender}
 import org.slf4j.{Logger, LoggerFactory}
@@ -111,6 +111,10 @@ class DSSOrchestratorReceiver(orchestratorService: OrchestratorService, orchestr
       val workspace = requestSubmitOrchestratorSync.getWorkspace
       orchestratorPluginService.submitWorkflowToBML(request, username, workspace)
 
+    case orchestratorRequest: OrchestratorRequest =>
+      val list = orchestratorService.getOrchestratorInfoByLabel(orchestratorRequest)
+      new DSSOrchestratorInfoList(list)
+
     case _ => throw new DSSErrorException(90000, "Not support message type " + message)
   }
 
diff --git a/dss-orchestrator/dss-orchestrator-common/src/main/java/com/webank/wedatasphere/dss/orchestrator/common/entity/DSSOrchestratorInfoList.java b/dss-orchestrator/dss-orchestrator-common/src/main/java/com/webank/wedatasphere/dss/orchestrator/common/entity/DSSOrchestratorInfoList.java
new file mode 100644
index 000000000..2d3275ddd
--- /dev/null
+++ b/dss-orchestrator/dss-orchestrator-common/src/main/java/com/webank/wedatasphere/dss/orchestrator/common/entity/DSSOrchestratorInfoList.java
@@ -0,0 +1,23 @@
+package com.webank.wedatasphere.dss.orchestrator.common.entity;
+
+
+import java.util.List;
+
+public class DSSOrchestratorInfoList {
+    private List<DSSOrchestratorInfo> orchestratorInfos;
+
+    public DSSOrchestratorInfoList(List<DSSOrchestratorInfo> orchestratorInfos) {
+        this.orchestratorInfos = orchestratorInfos;
+    }
+
+    public DSSOrchestratorInfoList() {
+    }
+
+    public List<DSSOrchestratorInfo> getOrchestratorInfos() {
+        return orchestratorInfos;
+    }
+
+    public void setOrchestratorInfos(List<DSSOrchestratorInfo> orchestratorInfos) {
+        this.orchestratorInfos = orchestratorInfos;
+    }
+}

From 5a2f3be51eccc39d145dcab21b3007b4f388d5b2 Mon Sep 17 00:00:00 2001
From: Zhaobincai <747839893@qq.com>
Date: Fri, 21 Jun 2024 21:18:55 +0800
Subject: [PATCH 294/302] dss-server: fix export1

---
 .../server/service/impl/OrchestratorServiceImpl.java            | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/impl/OrchestratorServiceImpl.java b/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/impl/OrchestratorServiceImpl.java
index 2197f035c..f3156f289 100644
--- a/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/impl/OrchestratorServiceImpl.java
+++ b/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/impl/OrchestratorServiceImpl.java
@@ -520,7 +520,7 @@ public Long isExistSameNameBeforeUpdate(OrchestratorModifyRequest orchestratorMo
     public List<OrchestratorBaseInfo> getOrchestratorInfos(OrchestratorRequest orchestratorRequest, String username) {
         LabelRouteVO labels = orchestratorRequest.getLabels();
         List<DSSOrchestratorInfo> list = new ArrayList<>();
-        if ("dev".equals(labels.getRoute())) {
+        if (labels == null || "dev".equals(labels.getRoute())) {
             list = getOrchestratorInfoByLabel(orchestratorRequest);
         } else {
             List<DSSLabel> dssLabelList = Arrays.asList(new EnvDSSLabel(labels.getRoute()));

From c4959884ddce5e14443692de5b1a4ca8b4f4b7cc Mon Sep 17 00:00:00 2001
From: Zhaobincai <747839893@qq.com>
Date: Sun, 23 Jun 2024 14:32:09 +0800
Subject: [PATCH 295/302] dss-server: fix export2

---
 .../service/impl/DSSProjectServiceImpl.java      | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/dss-framework/dss-framework-project-server/src/main/java/com/webank/wedatasphere/dss/framework/project/service/impl/DSSProjectServiceImpl.java b/dss-framework/dss-framework-project-server/src/main/java/com/webank/wedatasphere/dss/framework/project/service/impl/DSSProjectServiceImpl.java
index d52551dda..632585812 100644
--- a/dss-framework/dss-framework-project-server/src/main/java/com/webank/wedatasphere/dss/framework/project/service/impl/DSSProjectServiceImpl.java
+++ b/dss-framework/dss-framework-project-server/src/main/java/com/webank/wedatasphere/dss/framework/project/service/impl/DSSProjectServiceImpl.java
@@ -458,9 +458,11 @@ public BmlResource exportProject(ExportAllOrchestratorsReqest exportAllOrchestra
                                      String username, String proxyUser, Workspace workspace) throws Exception {
         Long projectId=exportAllOrchestratorsReqest.getProjectId();
         EnvDSSLabel envLabel = new EnvDSSLabel(exportAllOrchestratorsReqest.getLabels());
-        List<OrchestratorBaseInfo> orchestrators = orchestratorService.getOrchestratorInfos(
-                new OrchestratorRequest(workspace.getWorkspaceId(), exportAllOrchestratorsReqest.getProjectId())
-                , exportAllOrchestratorsReqest.getLabels());
+        OrchestratorRequest orchestratorRequest = new OrchestratorRequest(workspace.getWorkspaceId(), batchExportOrchestratorsRequest.getProjectId());
+        LabelRouteVO labelRouteVO = new LabelRouteVO();
+        labelRouteVO.setRoute(exportAllOrchestratorsReqest.getLabels());
+        orchestratorRequest.setLabels(labelRouteVO);
+        List<OrchestratorBaseInfo> orchestrators = orchestratorService.getOrchestratorInfos(orchestratorRequest, username);
         DSSProjectDO projectDO=projectService.getProjectById(projectId);
         String projectName = projectDO.getName();
         String projectPath = exportService.batchExport(username, projectId, orchestrators, projectName, envLabel, workspace);
@@ -544,9 +546,11 @@ public BmlResource exportOnlyProjectMeta(ExportAllOrchestratorsReqest exportAllO
                                          String username, String proxyUser, Workspace workspace) throws Exception {
         Long projectId=exportAllOrchestratorsReqest.getProjectId();
         EnvDSSLabel envLabel = new EnvDSSLabel(exportAllOrchestratorsReqest.getLabels());
-        List<OrchestratorBaseInfo> orchestrators = orchestratorService.getOrchestratorInfos(
-                new OrchestratorRequest(workspace.getWorkspaceId(), exportAllOrchestratorsReqest.getProjectId())
-                , exportAllOrchestratorsReqest.getLabels());
+        OrchestratorRequest orchestratorRequest = new OrchestratorRequest(workspace.getWorkspaceId(), batchExportOrchestratorsRequest.getProjectId());
+        LabelRouteVO labelRouteVO = new LabelRouteVO();
+        labelRouteVO.setRoute(exportAllOrchestratorsReqest.getLabels());
+        orchestratorRequest.setLabels(labelRouteVO);
+        List<OrchestratorBaseInfo> orchestrators = orchestratorService.getOrchestratorInfos(orchestratorRequest, username);
         DSSProjectDO projectDO=projectService.getProjectById(projectId);
         String projectName = projectDO.getName();
         String exportSaveBasePath = IoUtils.generateTempIOPath(username);

From 7382660038b5c4f0fdcddf3755a606281690b9f5 Mon Sep 17 00:00:00 2001
From: Zhaobincai <747839893@qq.com>
Date: Sun, 23 Jun 2024 20:48:59 +0800
Subject: [PATCH 296/302] dss-server: fix export3

---
 .../project/service/impl/DSSProjectServiceImpl.java          | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/dss-framework/dss-framework-project-server/src/main/java/com/webank/wedatasphere/dss/framework/project/service/impl/DSSProjectServiceImpl.java b/dss-framework/dss-framework-project-server/src/main/java/com/webank/wedatasphere/dss/framework/project/service/impl/DSSProjectServiceImpl.java
index 632585812..7a600fbfe 100644
--- a/dss-framework/dss-framework-project-server/src/main/java/com/webank/wedatasphere/dss/framework/project/service/impl/DSSProjectServiceImpl.java
+++ b/dss-framework/dss-framework-project-server/src/main/java/com/webank/wedatasphere/dss/framework/project/service/impl/DSSProjectServiceImpl.java
@@ -30,6 +30,7 @@
 import com.webank.wedatasphere.dss.common.exception.DSSRuntimeException;
 import com.webank.wedatasphere.dss.common.label.DSSLabel;
 import com.webank.wedatasphere.dss.common.label.EnvDSSLabel;
+import com.webank.wedatasphere.dss.common.label.LabelRouteVO;
 import com.webank.wedatasphere.dss.common.service.BMLService;
 import com.webank.wedatasphere.dss.common.utils.*;
 import com.webank.wedatasphere.dss.framework.project.conf.ProjectConf;
@@ -458,7 +459,7 @@ public BmlResource exportProject(ExportAllOrchestratorsReqest exportAllOrchestra
                                      String username, String proxyUser, Workspace workspace) throws Exception {
         Long projectId=exportAllOrchestratorsReqest.getProjectId();
         EnvDSSLabel envLabel = new EnvDSSLabel(exportAllOrchestratorsReqest.getLabels());
-        OrchestratorRequest orchestratorRequest = new OrchestratorRequest(workspace.getWorkspaceId(), batchExportOrchestratorsRequest.getProjectId());
+        OrchestratorRequest orchestratorRequest = new OrchestratorRequest(workspace.getWorkspaceId(), exportAllOrchestratorsReqest.getProjectId());
         LabelRouteVO labelRouteVO = new LabelRouteVO();
         labelRouteVO.setRoute(exportAllOrchestratorsReqest.getLabels());
         orchestratorRequest.setLabels(labelRouteVO);
@@ -546,7 +547,7 @@ public BmlResource exportOnlyProjectMeta(ExportAllOrchestratorsReqest exportAllO
                                          String username, String proxyUser, Workspace workspace) throws Exception {
         Long projectId=exportAllOrchestratorsReqest.getProjectId();
         EnvDSSLabel envLabel = new EnvDSSLabel(exportAllOrchestratorsReqest.getLabels());
-        OrchestratorRequest orchestratorRequest = new OrchestratorRequest(workspace.getWorkspaceId(), batchExportOrchestratorsRequest.getProjectId());
+        OrchestratorRequest orchestratorRequest = new OrchestratorRequest(workspace.getWorkspaceId(), exportAllOrchestratorsReqest.getProjectId());
         LabelRouteVO labelRouteVO = new LabelRouteVO();
         labelRouteVO.setRoute(exportAllOrchestratorsReqest.getLabels());
         orchestratorRequest.setLabels(labelRouteVO);

From 18e331681e970ff75f21276187ffe7069bc00a86 Mon Sep 17 00:00:00 2001
From: Zhaobincai <747839893@qq.com>
Date: Sun, 23 Jun 2024 22:06:33 +0800
Subject: [PATCH 297/302] dss-server: fix export null

---
 .../server/service/impl/OrchestratorServiceImpl.java         | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/impl/OrchestratorServiceImpl.java b/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/impl/OrchestratorServiceImpl.java
index f3156f289..ed400d84a 100644
--- a/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/impl/OrchestratorServiceImpl.java
+++ b/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/impl/OrchestratorServiceImpl.java
@@ -562,11 +562,14 @@ public List<OrchestratorBaseInfo> getOrchestratorInfos(OrchestratorRequest orche
 
     @Override
     public List<DSSOrchestratorInfo> getOrchestratorInfoByLabel(OrchestratorRequest orchestratorRequest) {
-        return orchestratorMapper.queryOrchestratorInfos(new HashMap<String, Object>() {{
+        List<DSSOrchestratorInfo> dssOrchestratorInfos = orchestratorMapper.queryOrchestratorInfos(new HashMap<String, Object>() {{
             put("workspace_id", orchestratorRequest.getWorkspaceId());
             put("project_id", orchestratorRequest.getProjectId());
             put("orchestrator_mode", orchestratorRequest.getOrchestratorMode());
         }});
+        if (dssOrchestratorInfos == null)
+            return new ArrayList<>();
+        return dssOrchestratorInfos;
     }
     @Override
     public ResponseOrchestratorInfos queryOrchestratorInfos(RequestOrchestratorInfos requestOrchestratorInfos) {

From c8f994c8d4544c9980fdb6d0390c85fa3b89267c Mon Sep 17 00:00:00 2001
From: Zhaobincai <747839893@qq.com>
Date: Sun, 23 Jun 2024 22:55:11 +0800
Subject: [PATCH 298/302] dss-server: fix export4

---
 .../workflow/io/export/impl/WorkFlowExportServiceImpl.java  | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/io/export/impl/WorkFlowExportServiceImpl.java b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/io/export/impl/WorkFlowExportServiceImpl.java
index 27629ba00..b6b503233 100644
--- a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/io/export/impl/WorkFlowExportServiceImpl.java
+++ b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/io/export/impl/WorkFlowExportServiceImpl.java
@@ -103,9 +103,6 @@ public class WorkFlowExportServiceImpl implements WorkFlowExportService {
     @Autowired
     private DSSFlowService flowService;
 
-    protected Sender getOrchestratorSender() {
-        return DSSSenderServiceFactory.getOrCreateServiceInstance().getOrcSender();
-    }
 
 
     @Override
@@ -127,7 +124,8 @@ public String exportFlowInfoNew(Long dssProjectId, String projectName, long root
         for (DSSFlow dssFlow : dssFlowList) {
             if (dssFlow.getRootFlow()) {
                 // 生成rootflow orchestrator信息
-                OrchestratorVo orchestratorVo = RpcAskUtils.processAskException(getOrchestratorSender().ask(new RequestQuertByAppIdOrchestrator(dssFlow.getId())),
+                Sender orcSender = DSSSenderServiceFactory.getOrCreateServiceInstance().getOrcSender(dssLabels);
+                OrchestratorVo orchestratorVo = RpcAskUtils.processAskException(orcSender.ask(new RequestQuertByAppIdOrchestrator(dssFlow.getId())),
                         OrchestratorVo.class, RequestQueryByIdOrchestrator.class);
                 DSSOrchestratorInfo dssOrchestratorInfo = orchestratorVo.getDssOrchestratorInfo();
                 String flowMetaPath = IoUtils.generateFlowMetaIOPath(projectPath, dssOrchestratorInfo.getName());

From 3d6824c2c87b160ac7fb86263e4b574be0ac8303 Mon Sep 17 00:00:00 2001
From: Zhaobincai <747839893@qq.com>
Date: Mon, 24 Jun 2024 17:34:47 +0800
Subject: [PATCH 299/302] dss-server: fix import

---
 .../server/entity/vo/OrchestratorBaseInfo.java       |  2 +-
 .../project/utils/ExportAndImportSupportUtils.java   | 12 ++++++++++--
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/entity/vo/OrchestratorBaseInfo.java b/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/entity/vo/OrchestratorBaseInfo.java
index 48a25a47c..228ec2255 100644
--- a/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/entity/vo/OrchestratorBaseInfo.java
+++ b/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/entity/vo/OrchestratorBaseInfo.java
@@ -282,7 +282,7 @@ public static OrchestratorBaseInfo convertFrom(DSSOrchestratorInfo dssInfo){
         OrchestratorBaseInfo baseInfo = new OrchestratorBaseInfo();
 
         // 直接对应的属性
-        baseInfo.setId(dssInfo.getId());
+        baseInfo.setOrchestratorVersionId(dssInfo.getId());
         baseInfo.setProjectId(dssInfo.getProjectId());
         baseInfo.setWorkspaceId(dssInfo.getWorkspaceId());
         baseInfo.setOrchestratorName(dssInfo.getName());
diff --git a/dss-framework/dss-framework-project-server/src/main/java/com/webank/wedatasphere/dss/framework/project/utils/ExportAndImportSupportUtils.java b/dss-framework/dss-framework-project-server/src/main/java/com/webank/wedatasphere/dss/framework/project/utils/ExportAndImportSupportUtils.java
index bad6bde84..9b808a4c3 100644
--- a/dss-framework/dss-framework-project-server/src/main/java/com/webank/wedatasphere/dss/framework/project/utils/ExportAndImportSupportUtils.java
+++ b/dss-framework/dss-framework-project-server/src/main/java/com/webank/wedatasphere/dss/framework/project/utils/ExportAndImportSupportUtils.java
@@ -1,5 +1,8 @@
 package com.webank.wedatasphere.dss.framework.project.utils;
+import com.webank.wedatasphere.dss.common.exception.DSSErrorException;
 import com.webank.wedatasphere.dss.common.utils.IoUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.io.File;
 import java.io.IOException;
@@ -15,6 +18,7 @@
  * Date: 2024/4/19
  */
 public class ExportAndImportSupportUtils {
+    private static final Logger LOGGER = LoggerFactory.getLogger(ExportAndImportSupportUtils.class);
     private static final String EXTERNAL_RESOURCES = ".external-resources";
     private static final String META_CONF = ".metaConf";
 
@@ -50,8 +54,8 @@ public static Map<String,Path> separateFlows(String sourceDir, String projectNam
                 copyDirectory(workflowDir, newWorkflowDir + File.separator + workflow);
                 workFlowProjectPaths.put(workflow, Paths.get(newWorkflowDir));
             } catch (IOException e) {
-                System.err.println("Error while copying workflow " + workflow + ": " + e.getMessage());
-                e.printStackTrace();
+                LOGGER.error("Error while copying workflow " + workflow + ": " + e);
+                throw new DSSErrorException(70001, "复制工作流失败，原因为:" + e);
             }
 
 
@@ -62,6 +66,10 @@ public static Map<String,Path> separateFlows(String sourceDir, String projectNam
 
     // 复制整个目录
     private static void copyDirectory(String sourceDirectory, String destinationDirectory) throws IOException {
+        File file = new File(sourceDirectory);
+        if (!file.exists()) {
+            return ;
+        }
         Files.walk(Paths.get(sourceDirectory))
                 .forEach(source -> {
                     Path destination = Paths.get(destinationDirectory, source.toString().substring(sourceDirectory.length()));

From b7b45e7bd036b1b12008326a3d6a9d64c0ece320 Mon Sep 17 00:00:00 2001
From: xlinliu <arionliu@webank.com>
Date: Mon, 24 Jun 2024 17:49:08 +0800
Subject: [PATCH 300/302] =?UTF-8?q?=E6=97=A5=E5=BF=97=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../project/utils/ExportAndImportSupportUtils.java         | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/dss-framework/dss-framework-project-server/src/main/java/com/webank/wedatasphere/dss/framework/project/utils/ExportAndImportSupportUtils.java b/dss-framework/dss-framework-project-server/src/main/java/com/webank/wedatasphere/dss/framework/project/utils/ExportAndImportSupportUtils.java
index 9b808a4c3..a953bc29a 100644
--- a/dss-framework/dss-framework-project-server/src/main/java/com/webank/wedatasphere/dss/framework/project/utils/ExportAndImportSupportUtils.java
+++ b/dss-framework/dss-framework-project-server/src/main/java/com/webank/wedatasphere/dss/framework/project/utils/ExportAndImportSupportUtils.java
@@ -1,5 +1,6 @@
 package com.webank.wedatasphere.dss.framework.project.utils;
 import com.webank.wedatasphere.dss.common.exception.DSSErrorException;
+import com.webank.wedatasphere.dss.common.exception.DSSRuntimeException;
 import com.webank.wedatasphere.dss.common.utils.IoUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -54,8 +55,8 @@ public static Map<String,Path> separateFlows(String sourceDir, String projectNam
                 copyDirectory(workflowDir, newWorkflowDir + File.separator + workflow);
                 workFlowProjectPaths.put(workflow, Paths.get(newWorkflowDir));
             } catch (IOException e) {
-                LOGGER.error("Error while copying workflow " + workflow + ": " + e);
-                throw new DSSErrorException(70001, "复制工作流失败，原因为:" + e);
+                LOGGER.error("Error while copying workflow directory " , e);
+                throw new DSSRuntimeException(70001, "导入多个工作流时分离工作流失败，原因为:" + e.getMessage(),e);
             }
 
 
@@ -80,7 +81,7 @@ private static void copyDirectory(String sourceDirectory, String destinationDire
                             Files.copy(source, destination, StandardCopyOption.REPLACE_EXISTING);
                         }
                     } catch (IOException e) {
-                        e.printStackTrace();
+                        throw new RuntimeException(e);
                     }
                 });
     }

From cf079b96efeb0a6c39f55df0369b0e1b9d62ae6f Mon Sep 17 00:00:00 2001
From: Zhaobincai <747839893@qq.com>
Date: Wed, 26 Jun 2024 15:51:23 +0800
Subject: [PATCH 301/302] dss-server: fix rollback

---
 .../OrchestratorFrameworkServiceImpl.java     |  3 ++-
 .../service/impl/OrchestratorServiceImpl.java | 22 ++-----------------
 2 files changed, 4 insertions(+), 21 deletions(-)

diff --git a/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/impl/OrchestratorFrameworkServiceImpl.java b/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/impl/OrchestratorFrameworkServiceImpl.java
index 15c26d536..fa8f1391c 100644
--- a/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/impl/OrchestratorFrameworkServiceImpl.java
+++ b/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/impl/OrchestratorFrameworkServiceImpl.java
@@ -474,8 +474,9 @@ public GitHistoryResponse getHistory(Long workspaceId, Long orchestratorId, Stri
         String newCommitId = versionByOrchestratorId.get(0).getCommitId();
         commitInfoBetweenRequest.setNewCommitId(newCommitId);
         String oldCommitId = null;
+        int i = 0;
         for (DSSOrchestratorVersion version : versionByOrchestratorId) {
-            if (version.getCommitId()!= null && !version.getCommitId().equals(newCommitId)) {
+            if (version.getCommitId()!= null && i++ != 0) {
                 oldCommitId = version.getCommitId();
                 break;
             }
diff --git a/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/impl/OrchestratorServiceImpl.java b/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/impl/OrchestratorServiceImpl.java
index ed400d84a..9695c41fe 100644
--- a/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/impl/OrchestratorServiceImpl.java
+++ b/dss-framework/dss-framework-orchestrator-server/src/main/java/com/webank/wedatasphere/dss/orchestrator/server/service/impl/OrchestratorServiceImpl.java
@@ -442,26 +442,8 @@ public void rollbackOrchestratorGit(OrchestratorRollBackGitVo rollBackGitVo, Str
         DSSOrchestratorVersion dssOrchestratorVersion = rollBackGitVo.getDssOrchestratorVersion();
         DSSProject projectInfo = DSSFlowEditLockManager.getProjectInfo(projectId);
         if (projectInfo.getAssociateGit() != null && projectInfo.getAssociateGit()) {
-            try {
-                DSSFlow dssFlow = flowMapper.selectFlowByID(dssOrchestratorVersion.getAppId());
-                if (!dssFlow.getName().equals(dssOrchestratorInfo.getName())) {
-                    lockMapper.updateOrchestratorStatus(orchestratorId, OrchestratorRefConstant.FLOW_STATUS_SAVE);
-                    return ;
-                }
-                Sender sender = DSSSenderServiceFactory.getOrCreateServiceInstance().getGitSender();
-                //若之前版本未进行git回滚，则自动提交回滚后的工作流至git
-                if (StringUtils.isEmpty(oldOrcVersion.getCommitId())) {
-                    lockMapper.updateOrchestratorStatus(orchestratorId, OrchestratorRefConstant.FLOW_STATUS_SAVE);
-                } else {
-                    GitRevertRequest gitRevertRequest = new GitRevertRequest(workspace.getWorkspaceId(), projectName, oldOrcVersion.getCommitId(), dssOrchestratorInfo.getName(), "system");
-                    GitCommitResponse gitCommitResponse = RpcAskUtils.processAskException(sender.ask(gitRevertRequest), GitCommitResponse.class, GitRevertRequest.class);
-                    lockMapper.updateOrchestratorVersionCommitId(gitCommitResponse.getCommitId(), dssOrchestratorVersion.getAppId());
-                    lockMapper.updateOrchestratorStatus(orchestratorId, OrchestratorRefConstant.FLOW_STATUS_PUBLISH);
-                }
-            } catch (Exception e) {
-                lockMapper.updateOrchestratorStatus(orchestratorId, OrchestratorRefConstant.FLOW_STATUS_SAVE);
-                throw e;
-            }
+            DSSFlow dssFlow = flowMapper.selectFlowByID(dssOrchestratorVersion.getAppId());
+            lockMapper.updateOrchestratorStatus(orchestratorId, OrchestratorRefConstant.FLOW_STATUS_SAVE);
         }
 
     }

From 5838dd3aa2318b641f25df3ddad270aa6470246c Mon Sep 17 00:00:00 2001
From: Zhaobincai <747839893@qq.com>
Date: Wed, 26 Jun 2024 16:57:41 +0800
Subject: [PATCH 302/302] dss-server: fix rollback

---
 .../dss/git/utils/DSSGitUtils.java            | 46 ++++++++++++-------
 1 file changed, 30 insertions(+), 16 deletions(-)

diff --git a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/utils/DSSGitUtils.java b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/utils/DSSGitUtils.java
index f004b7515..7918aa76c 100644
--- a/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/utils/DSSGitUtils.java
+++ b/dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/utils/DSSGitUtils.java
@@ -5,6 +5,7 @@
 import com.google.gson.JsonParser;
 import com.google.gson.JsonElement;
 import com.webank.wedatasphere.dss.common.exception.DSSErrorException;
+import com.webank.wedatasphere.dss.git.common.protocol.constant.GitConstant;
 import org.apache.http.client.methods.HttpDelete;
 import com.webank.wedatasphere.dss.git.common.protocol.GitTree;
 import com.webank.wedatasphere.dss.git.common.protocol.GitUserEntity;
@@ -699,8 +700,9 @@ public static List<GitCommitResponse> getLatestCommit(Repository repository, Str
 
     public static GitHistoryResponse listCommitsBetween(Repository repository, String oldCommitId, String newCommitId, String path) throws Exception {
         List<GitCommitResponse> gitCommitResponseList = new ArrayList<>();
+        Set<String> commitIdSet = new HashSet<>();
+
 
-        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         try (RevWalk walk = new RevWalk(repository)) {
             Git git = new Git(repository);
             ObjectId commitIdNow = null;
@@ -710,17 +712,32 @@ public static GitHistoryResponse listCommitsBetween(Repository repository, Strin
             } else {
                 commitIdNow = repository.resolve(newCommitId);
             }
+            // 代码改动
+            gitLogHistory(git, repository, oldCommitId, commitIdNow, path, gitCommitResponseList, commitIdSet);
+            // 元数据改动
+            gitLogHistory(git, repository, oldCommitId, commitIdNow, GitConstant.GIT_SERVER_META_PATH + File.separator + path, gitCommitResponseList, commitIdSet);
+        } catch (Exception e) {
+            throw new GitErrorException(80121, "get log between " + oldCommitId + " and " + newCommitId + "failed, the reason is : ", e);
+        }
+        GitHistoryResponse historyResponse = new GitHistoryResponse();
+        historyResponse.setResponses(gitCommitResponseList);
+        return historyResponse;
+    }
 
-
-            Iterable<RevCommit> commits = git.log()
-                    .addRange(repository.resolve(oldCommitId), commitIdNow)
-                    .addPath(path)
-                    .call();
-
-            for (RevCommit commit : commits) {
-                PersonIdent authorIdent = commit.getAuthorIdent(); // 获取提交人信息
-                GitCommitResponse commitResponse = new GitCommitResponse();
-                commitResponse.setCommitId(commit.getId().getName());
+    private static void gitLogHistory(Git git, Repository repository, String oldCommitId, ObjectId commitIdNow, String path, List<GitCommitResponse> gitCommitResponseList, Set<String> commitIdSet) throws IOException, GitAPIException {
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        Iterable<RevCommit> commits = git.log()
+                .addRange(repository.resolve(oldCommitId), commitIdNow)
+                .addPath(path)
+                .call();
+
+        for (RevCommit commit : commits) {
+            PersonIdent authorIdent = commit.getAuthorIdent(); // 获取提交人信息
+            GitCommitResponse commitResponse = new GitCommitResponse();
+            String commitId = commit.getId().getName();
+            if (!commitIdSet.contains(commitId)) {
+                commitIdSet.add(commitId);
+                commitResponse.setCommitId(commitId);
                 commitResponse.setCommitTime(sdf.format(commit.getAuthorIdent().getWhen()));
                 String shortMessage = commit.getShortMessage();
                 getUserName(shortMessage, commitResponse, commit);
@@ -730,14 +747,11 @@ public static GitHistoryResponse listCommitsBetween(Repository repository, Strin
                 logger.info("Commit Message: " + commit.getFullMessage()); // 提交信息
                 logger.info("Author: " + authorIdent.getName() + " <" + authorIdent.getEmailAddress() + ">"); // 提交人
             }
-        } catch (Exception e) {
-            throw new GitErrorException(80121, "get log between " + oldCommitId + " and " + newCommitId + "failed, the reason is : ", e);
         }
-        GitHistoryResponse historyResponse = new GitHistoryResponse();
-        historyResponse.setResponses(gitCommitResponseList);
-        return historyResponse;
     }
 
+
+
     public static String generateGitPath(String projectName, Long workspaceId) {
         // eg ： /data/GitInstall/224/testGit/.git
         return DSSGitConstant.GIT_PATH_PRE + workspaceId + File.separator + projectName + File.separator + DSSGitConstant.GIT_PATH_SUFFIX;