|
|
@@ -10,7 +10,7 @@
|
|
|
</template>
|
|
|
<template v-else>
|
|
|
<div style="height: calc(100vh - 180px);" v-loading="tabLoadFlag" element-loading-text="数据提交中" element-loading-spinner="el-icon-loading" element-loading-background="rgba(0, 0, 0, 0.8)">
|
|
|
- <node-form ref="nodeForm" :nodeForm="nodeForm" :algorithmtype="this.selectCode" />
|
|
|
+ <node-form ref="nodeForm" :nodeForm="nodeForm" :algorithmtype="selectCode" />
|
|
|
<node-table ref="nodeTable" :query-id="tableId" :type="type" @tableChange="tableChange" />
|
|
|
</div>
|
|
|
</template>
|
|
|
@@ -60,7 +60,8 @@ export default {
|
|
|
nodeForm: {},
|
|
|
tasData: [],
|
|
|
type: 'add',
|
|
|
- nodeIndex: ''
|
|
|
+ nodeIndex: '',
|
|
|
+ lowers: ['a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z']
|
|
|
}
|
|
|
},
|
|
|
watch: {
|
|
|
@@ -131,7 +132,7 @@ export default {
|
|
|
break
|
|
|
case 'nodedata':
|
|
|
//executionorder
|
|
|
- const newItems = _.orderBy([...returnData], ['executionorder'], ['asc'])
|
|
|
+ const newItems = _.orderBy([...returnData], ['targetsource'], ['asc'])
|
|
|
this.nodeItems = [...this.nodeItems, ...newItems, {
|
|
|
algorithmname: '结束',
|
|
|
isLine: false,
|
|
|
@@ -151,10 +152,15 @@ export default {
|
|
|
this.tableId = val
|
|
|
},
|
|
|
treeNodeClick (item) {
|
|
|
- const { id } = item
|
|
|
+ const { id, code } = item
|
|
|
this.tabFlag = true
|
|
|
this.groupId = id
|
|
|
this.tableId = id
|
|
|
+ if (code && (code == 'js' || code == 'JS')) {
|
|
|
+ this.selectCode = code
|
|
|
+ } else {
|
|
|
+ this.selectCode = ''
|
|
|
+ }
|
|
|
},
|
|
|
tableChange (arr) {
|
|
|
// if (this.type == 'add' && arr?.length) {
|
|
|
@@ -164,7 +170,16 @@ export default {
|
|
|
//步骤新增
|
|
|
handleAdd (obj) {
|
|
|
if (Object.keys(this.msgContent).length) {
|
|
|
- this.nodeIndex = obj.index + 1
|
|
|
+ const index = obj.index
|
|
|
+ const len = this.nodeItems.length - 2
|
|
|
+ if (len == -1 || len == index) {
|
|
|
+ this.nodeIndex = this.lowers[index] + 1
|
|
|
+ } else {
|
|
|
+ const { targetsource } = this.nodeItems[index]
|
|
|
+ if (!targetsource) return
|
|
|
+ const [a, b] = targetsource.split('')
|
|
|
+ this.nodeIndex = a + (Number(b) + 1)
|
|
|
+ }
|
|
|
this.type = 'add'
|
|
|
this.advancedDrawer = true
|
|
|
this.nodeForm = {}
|
|
|
@@ -219,7 +234,7 @@ export default {
|
|
|
data.algorithmname = sessionStorage.getItem('nodeTreeTxt') || ''
|
|
|
data.algorithmtype = this.selectCode
|
|
|
data.algorithmsourcelibraryid = this.groupId
|
|
|
- data.executionorder = this.nodeIndex
|
|
|
+ data.targetsource = this.nodeIndex
|
|
|
}
|
|
|
this.generalDataReception(event, this.formatDataNull(data), 'algorithmlibraryid')
|
|
|
},
|
