1. Solution task instance page cannot jump to project home page 2. Modification of Startup Parameter Style of Workflow Instance Page 3. Pre/Post Annotations for SQL Workflow 4. Resolve data source center selection hive or spark display exception (#1028)
* 1.repair [BUG]#884;2.Add Scheduling Time Fields to Workflow Instance List;3.Add a reminder for empty data 4.Delete the'babel-plugin-transform-remove-console'dependency package * 1.update logo 2.Workflow Definition Page Timing Component Replaced with Source Code * Repair bug #901,#909,#935 * Optimizing Page License and Page Style * 1. Changing API paths; 2. Modifying statistical management naming * update favicon.ico and title * 1. Solution task instance page cannot jump to project home page 2. Modification of Startup Parameter Style of Workflow Instance Page 3. Pre/Post Annotations for SQL Workflow 4. Resolve data source center selection hive or spark display exception
This commit is contained in:
parent
19ccd4f531
commit
bfc69edc80
|
|
@ -9,6 +9,7 @@
|
|||
type="textarea"
|
||||
resize="none"
|
||||
:autosize="{minRows:1}"
|
||||
:placeholder="$t('Please enter a non-query SQL statement')"
|
||||
v-model="localStatementList[$index]"
|
||||
@on-blur="_verifProp()"
|
||||
style="width: 525px;">
|
||||
|
|
|
|||
|
|
@ -4,15 +4,15 @@
|
|||
<div class="box">
|
||||
<p class="box-hd"><i class="fa fa-chevron-circle-right"></i><b>{{$t('Startup parameter')}}</b></p>
|
||||
<ul class="box-bd">
|
||||
<li><span>{{$t('Startup type')}}:</span><span>{{_rtRunningType(startupParam.commandType)}}</span></li>
|
||||
<li><span>{{$t('Complement range')}}:</span><span v-if="startupParam.commandParam && startupParam.commandParam.complementStartDate">{{startupParam.commandParam.complementStartDate}}-{{startupParam.commandParam.complementEndDate}}</span><span v-else>-</span></li>
|
||||
<li><span>{{$t('Failure Strategy')}}:</span><span>{{startupParam.failureStrategy === 'END' ? $t('End') : $t('Continue')}}</span></li>
|
||||
<li><span>{{$t('Process priority')}}:</span><span>{{startupParam.processInstancePriority}}</span></li>
|
||||
<li><span>{{$t('Worker group')}}:</span><span v-if="workerGroupList.length">{{_rtWorkerGroupName(startupParam.workerGroupId)}}</span></li>
|
||||
<li><span>{{$t('Notification strategy')}}:</span><span>{{_rtWarningType(startupParam.warningType)}}</span></li>
|
||||
<li><span>{{$t('Notification group')}}:</span><span v-if="notifyGroupList.length">{{_rtNotifyGroupName(startupParam.warningGroupId)}}</span></li>
|
||||
<li><span>{{$t('Recipient')}}:</span><span>{{startupParam.receivers || '-'}}</span></li>
|
||||
<li><span>{{$t('Cc')}}:</span><span>{{startupParam.receiversCc || '-'}}</span></li>
|
||||
<li><span class="tab">{{$t('Startup type')}}:</span><span class="content">{{_rtRunningType(startupParam.commandType)}}</span></li>
|
||||
<li><span class="tab">{{$t('Complement range')}}:</span><span class="content" v-if="startupParam.commandParam && startupParam.commandParam.complementStartDate">{{startupParam.commandParam.complementStartDate}}-{{startupParam.commandParam.complementEndDate}}</span><span class="content" v-else>-</span></li>
|
||||
<li><span class="tab">{{$t('Failure Strategy')}}:</span><span class="content">{{startupParam.failureStrategy === 'END' ? $t('End') : $t('Continue')}}</span></li>
|
||||
<li><span class="tab">{{$t('Process priority')}}:</span><span class="content">{{startupParam.processInstancePriority}}</span></li>
|
||||
<li><span class="tab">{{$t('Worker group')}}:</span><span class="content" v-if="workerGroupList.length">{{_rtWorkerGroupName(startupParam.workerGroupId)}}</span></li>
|
||||
<li><span class="tab">{{$t('Notification strategy')}}:</span><span class="content">{{_rtWarningType(startupParam.warningType)}}</span></li>
|
||||
<li><span class="tab">{{$t('Notification group')}}:</span><span class="content" v-if="notifyGroupList.length">{{_rtNotifyGroupName(startupParam.warningGroupId)}}</span></li>
|
||||
<li><span class="tab">{{$t('Recipient')}}:</span><span class="content">{{startupParam.receivers || '-'}}</span></li>
|
||||
<li><span class="tab">{{$t('Cc')}}:</span><span class="content">{{startupParam.receiversCc || '-'}}</span></li>
|
||||
</ul>
|
||||
</div>
|
||||
</template>
|
||||
|
|
@ -111,4 +111,14 @@
|
|||
}
|
||||
}
|
||||
}
|
||||
.tab {
|
||||
font-size: 12px;
|
||||
font-weight: bold;
|
||||
}
|
||||
.content {
|
||||
font-size: 12px;
|
||||
&:hover {
|
||||
color: #47c3ff;
|
||||
}
|
||||
}
|
||||
</style>
|
||||
|
|
|
|||
|
|
@ -317,37 +317,36 @@
|
|||
})
|
||||
}
|
||||
},
|
||||
watch: {
|
||||
'type'(value){
|
||||
if((value =='HIVE'||value == 'SPARK')&&this.isShowPrincipal== true){
|
||||
this.showPrincipal = false
|
||||
}else{
|
||||
this.showPrincipal = true
|
||||
}
|
||||
if(value == 'POSTGRESQL') {
|
||||
this.showdDatabase = true;
|
||||
} else {
|
||||
this.showdDatabase = false;
|
||||
}
|
||||
}
|
||||
},
|
||||
created () {
|
||||
// Backfill
|
||||
if (this.item.id) {
|
||||
this._getEditDatasource()
|
||||
}
|
||||
|
||||
return new Promise((resolve, reject) => {
|
||||
this.store.dispatch('datasource/getKerberosStartupState').then(res => {
|
||||
this.isShowPrincipal=res
|
||||
}).catch(e => {
|
||||
this.$message.error(e.msg || '')
|
||||
reject(e)
|
||||
})
|
||||
})
|
||||
|
||||
|
||||
},
|
||||
watch: {
|
||||
type(value){
|
||||
if(value == 'POSTGRESQL') {
|
||||
this.showdDatabase = true;
|
||||
} else {
|
||||
this.showdDatabase = false;
|
||||
}
|
||||
return new Promise((resolve, reject) => {
|
||||
this.store.dispatch('datasource/getKerberosStartupState').then(res => {
|
||||
this.isShowPrincipal=res
|
||||
if((value =='HIVE'||value == 'SPARK')&&this.isShowPrincipal== true){
|
||||
this.showPrincipal = false
|
||||
}else{
|
||||
this.showPrincipal = true
|
||||
}
|
||||
}).catch(e => {
|
||||
this.$message.error(e.msg || '')
|
||||
reject(e)
|
||||
})
|
||||
})
|
||||
}
|
||||
},
|
||||
|
||||
mounted () {
|
||||
},
|
||||
components: { mPopup, mListBoxF }
|
||||
|
|
|
|||
|
|
@ -78,6 +78,10 @@
|
|||
*/
|
||||
_getList (flag) {
|
||||
this.isLoading = !flag
|
||||
if(this.searchParams.pageNo == undefined) {
|
||||
this.$router.push({ path: `/projects/index` })
|
||||
return false
|
||||
}
|
||||
this.getTaskInstanceList(this.searchParams).then(res => {
|
||||
this.taskInstanceList = []
|
||||
this.taskInstanceList = res.totalList
|
||||
|
|
|
|||
|
|
@ -133,6 +133,7 @@ export default {
|
|||
'jdbc connect parameters': 'jdbc connect parameters',
|
||||
'Test Connect': 'Test Connect',
|
||||
'Please enter resource name': 'Please enter resource name',
|
||||
'Please enter a non-query SQL statement': 'Please enter a non-query SQL statement',
|
||||
'Please enter IP/hostname': 'Please enter IP/hostname',
|
||||
'jdbc connection parameters is not a correct JSON format': 'jdbc connection parameters is not a correct JSON format',
|
||||
'#': '#',
|
||||
|
|
|
|||
|
|
@ -133,6 +133,7 @@ export default {
|
|||
'jdbc connect parameters': 'jdbc连接参数',
|
||||
'Test Connect': '测试连接',
|
||||
'Please enter resource name': '请输入数据源名称',
|
||||
'Please enter a non-query SQL statement': '请输入非查询sql语句',
|
||||
'Please enter IP/hostname': '请输入IP/主机名',
|
||||
'jdbc connection parameters is not a correct JSON format': 'jdbc连接参数不是一个正确的JSON格式',
|
||||
'#': '编号',
|
||||
|
|
|
|||
Loading…
Reference in New Issue