Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Repair bug #901，#909，#935 #952

Merged
merged 28 commits into from
Sep 30, 2019
Merged

Repair bug #901，#909，#935 #952

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
983caaf
Merge remote-tracking branch 'upstream/dev' into dev
Sep 12, 2019
9983244
package
Sep 12, 2019
90766ca
修改工作流实例页面状态为运行时，禁止删除，删除package.json包里面的babel-runtime和jasmine-core
Sep 17, 2019
7c372b0
Merge branch 'dev' of https://github.com/analysys/EasyScheduler into dev
Sep 18, 2019
c361de1
bugfix-user-specified queue takes precedence over tenant queue (#769)
qrfxiaoge Sep 18, 2019
37b49bf
update markdown docs which can not display images normally (#806)
fancyChuan Sep 18, 2019
187b3b5
issue#728 (#746)
LiemLin Sep 18, 2019
367dc25
install-escheduler-ui.sh,monitor_server.py and install.sh scripts com…
qiaozhanwei Sep 18, 2019
a82df19
scripts name standardization (#813)
qiaozhanwei Sep 18, 2019
f29eb79
[BUG][#731]repair swagger annotation，interface path:/escheduler/proje…
chongchongzi Sep 18, 2019
5028da0
misspell words (#817)
samz406 Sep 19, 2019
166fda0
(Docs): Fixed some typo errors (#811)
0xflotus Sep 19, 2019
ff3bf73
fix singleton with volatile (#818)
wangxu0 Sep 19, 2019
b1c3f7e
Replace StringBuffer with StringBuilder inside the method (#816)
wangxu0 Sep 19, 2019
37a5682
flink task support(flink 任务支持) (#711)
LoveEvenWong Sep 19, 2019
46ff762
Merge branch 'dev' of https://github.com/analysys/EasyScheduler into dev
Sep 20, 2019
b63ea3c
1.Delete the page section console.log;
Sep 20, 2019
ec0931d
Merge branch 'dev' of https://github.com/analysys/EasyScheduler into dev
Sep 20, 2019
e1f57a1
Merge branch 'dev' of https://github.com/analysys/EasyScheduler into dev
Sep 24, 2019
57b6186
Delete the'babel-plugin-transform-remove-console'dependency package
Sep 24, 2019
a2ceaa8
Merge branch 'dev' of https://github.com/analysys/EasyScheduler into dev
Sep 24, 2019
2eaee3a
1.repair [BUG]#884,2.Add Scheduling Time Fields to Workflow Instance …
Sep 26, 2019
9b8b674
Merge branch 'dev' of https://github.com/analysys/EasyScheduler into dev
Sep 26, 2019
888c55f
Merge branch 'dev' of https://github.com/analysys/EasyScheduler into dev
Sep 27, 2019
a3a1f55
1.update logo 2.Workflow Definition Page Timing Component Replaced wi…
Sep 29, 2019
f847671
Merge branch 'dev' of https://github.com/analysys/EasyScheduler into dev
Sep 30, 2019
5ee4000
epair bug #901，#909，#935
Sep 30, 2019
1407efd
Merge branch 'dev' of https://github.com/analysys/EasyScheduler into dev
Sep 30, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion escheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/sql.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -371,7 +371,11 @@
this.sqlType = o.params.sqlType
this.connParams = o.params.connParams || ''
this.localParams = o.params.localParams || []
this.showType = o.params.showType.split(',') || []
if(o.params.showType == '') {
this.showType = []
} else {
this.showType = o.params.showType.split(',') || []
}
this.preStatements = o.params.preStatements || []
this.postStatements = o.params.postStatements || []
this.title = o.params.title || ''
Expand Down
10 changes: 8 additions & 2 deletions escheduler-ui/src/js/conf/home/pages/datasource/pages/list/_source/createDataSource.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@
</template>
</m-list-box-f>
<m-list-box-f>
<template slot="name"><b>*</b>{{$t('Database Name')}}</template>
<template slot="name"><b :class="{hidden:showdDatabase}">*</b>{{$t('Database Name')}}</template>
<template slot="content">
<x-input
type="input"
Expand Down Expand Up @@ -181,6 +181,7 @@
// btn test loading
testLoading: false,
showPrincipal: true,
showdDatabase: false,
isShowPrincipal:true
}
},
Expand Down Expand Up @@ -280,7 +281,7 @@
return false
}

if (!this.database) {
if (!this.database && this.showdDatabase == false) {
this.$message.warning(`${i18n.$t('Please enter database name')}`)
return false
}
Expand Down Expand Up @@ -339,6 +340,11 @@
}else{
this.showPrincipal = true
}
if(value == 'POSTGRESQL') {
this.showdDatabase = true;
} else {
this.showdDatabase = false;
}
}
},
created () {
Expand Down
2 changes: 1 addition & 1 deletion escheduler-ui/src/js/conf/home/pages/datasource/pages/list/_source/list.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
</td>
<td>
<span class="ellipsis">
<a href="javascript:" class="links">{{item.name}}</a>
{{item.name}}
</span>
</td>
<td>
Expand Down
3 changes: 1 addition & 2 deletions escheduler-ui/src/js/conf/home/pages/monitor/pages/servers/_source/zookeeperList.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,8 +64,7 @@
<span>{{$index + 1}}</span>
</td>
<td>
<span>
<a href="javascript:" class="links">{{item.hostname}}</a>
<span>{{item.hostname}}
</span>
</td>
<td><span>{{item.connections}}</span></td>
Expand Down
2 changes: 1 addition & 1 deletion escheduler-ui/src/js/conf/home/pages/monitor/pages/servers/statistics.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@
isLoading: false,
queueCount: {},
commandCountData: {},
color: themeData.color
color: themeData.color,
}
},
props:{},
Expand Down
2 changes: 1 addition & 1 deletion escheduler-ui/src/js/conf/home/pages/projects/pages/taskInstance/_source/list.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
<span>{{parseInt(pageNo === 1 ? ($index + 1) : (($index + 1) + (pageSize * (pageNo - 1))))}}</span>
</td>
<td>
<span class="ellipsis"><a href="javascript:" class="links">{{item.name}}</a></span>
<span class="ellipsis">{{item.name}}</span>
</td>
<td><a href="javascript:" class="links" @click="_go(item)"><span class="ellipsis">{{item.processInstanceName}}</span></a></td>
<td><span>{{item.taskType}}</span></td>
Expand Down
4 changes: 0 additions & 4 deletions escheduler-ui/src/js/conf/home/pages/security/pages/queue/_source/list.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,16 +44,12 @@
</td>
<td>
<span>
<a href="javascript:" class="links">
{{item.queueName}}
</a>
</span>
</td>
<td>
<span>
<a href="javascript:" class="links">
{{item.queue}}
</a>
</span>
</td>
<td>
Expand Down
4 changes: 0 additions & 4 deletions escheduler-ui/src/js/conf/home/pages/security/pages/tenement/_source/list.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,16 +50,12 @@
</td>
<td>
<span>
<a href="javascript:" class="links">
{{item.tenantCode}}
</a>
</span>
</td>
<td>
<span>
<a href="javascript:" class="links">
{{item.tenantName}}
</a>
</span>
</td>
<td>
Expand Down
2 changes: 1 addition & 1 deletion escheduler-ui/src/js/conf/home/pages/security/pages/users/_source/list.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
</td>
<td>
<span>
<a href="javascript:" class="links">{{item.userName || '-'}}</a>
{{item.userName || '-'}}
</span>
</td>
<td>
Expand Down
3 changes: 1 addition & 2 deletions escheduler-ui/src/js/conf/home/pages/security/pages/warningGroups/_source/list.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,7 @@
<span>{{parseInt(pageNo === 1 ? ($index + 1) : (($index + 1) + (pageSize * (pageNo - 1))))}}</span>
</td>
<td>
<span>
<a href="javascript:" class="links">{{item.groupName}}</a>
<span>{{item.groupName}}
</span>
</td>
<td><span>{{item.groupType === 'EMAIL' ? `${$t('Email')}` : `${$t('SMS')}`}}</span></td>
Expand Down
3 changes: 1 addition & 2 deletions escheduler-ui/src/js/conf/home/pages/security/pages/workerGroups/_source/list.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,7 @@
<span>{{parseInt(pageNo === 1 ? ($index + 1) : (($index + 1) + (pageSize * (pageNo - 1))))}}</span>
</td>
<td>
<span>
<a href="javascript:" class="links">{{item.name}}</a>
<span>{{item.name}}
</span>
</td>
<td>
Expand Down
3 changes: 1 addition & 2 deletions escheduler-ui/src/js/conf/home/pages/user/pages/token/_source/list.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,7 @@
<span>{{parseInt(pageNo === 1 ? ($index + 1) : (($index + 1) + (pageSize * (pageNo - 1))))}}</span>
</td>
<td>
<span>
<a href="javascript:" class="links">{{item.userName}}</a>
<span>{{item.userName}}
</span>
</td>
<td><span>{{item.token}}</span></td>
Expand Down