Skip to content

Dev 20190415 #169

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

Merged
millionfor merged 2 commits into from
Apr 26, 2019
Merged

Dev 20190415 #169

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dbc658b
编码问题
Apr 26, 2019
2633bbc
Merge remote-tracking branch 'upstream/dev-20190415' into dev-20190415
Apr 26, 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
2 changes: 1 addition & 1 deletion escheduler-ui/dist/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@
d="M37.3496987939662 -7 L47.3496987939662 -7 L47.3496987939662 7 L37.3496987939662 7 A38 38 0 0 1 31.359972760794346 21.46047782418268 L31.359972760794346 21.46047782418268 L38.431040572659825 28.531545636048154 L28.531545636048154 38.431040572659825 L21.46047782418268 31.359972760794346 A38 38 0 0 1 7.0000000000000036 37.3496987939662 L7.0000000000000036 37.3496987939662 L7.000000000000004 47.3496987939662 L-6.999999999999999 47.3496987939662 L-7 37.3496987939662 A38 38 0 0 1 -21.46047782418268 31.35997276079435 L-21.46047782418268 31.35997276079435 L-28.531545636048154 38.431040572659825 L-38.43104057265982 28.531545636048158 L-31.359972760794346 21.460477824182682 A38 38 0 0 1 -37.3496987939662 7.000000000000007 L-37.3496987939662 7.000000000000007 L-47.3496987939662 7.000000000000008 L-47.3496987939662 -6.9999999999999964 L-37.3496987939662 -6.999999999999997 A38 38 0 0 1 -31.35997276079435 -21.460477824182675 L-31.35997276079435 -21.460477824182675 L-38.431040572659825 -28.531545636048147 L-28.53154563604818 -38.4310405726598 L-21.4604778241827 -31.35997276079433 A38 38 0 0 1 -6.999999999999992 -37.3496987939662 L-6.999999999999992 -37.3496987939662 L-6.999999999999994 -47.3496987939662 L6.999999999999977 -47.3496987939662 L6.999999999999979 -37.3496987939662 A38 38 0 0 1 21.460477824182686 -31.359972760794342 L21.460477824182686 -31.359972760794342 L28.531545636048158 -38.43104057265982 L38.4310405726598 -28.53154563604818 L31.35997276079433 -21.4604778241827 A38 38 0 0 1 37.3496987939662 -6.999999999999995 M0 -23A23 23 0 1 0 0 23 A23 23 0 1 0 0 -23"
fill="#0097e0"></path></g></g><g transform="translate(19 19) scale(0.6)"><g transform="rotate(229.634)"><animateTransform attributeName="transform" type="rotate" values="360;0" keyTimes="0;1" dur="1s" begin="-0.0625s" repeatCount="indefinite"></animateTransform><path
d="M37.3496987939662 -7 L47.3496987939662 -7 L47.3496987939662 7 L37.3496987939662 7 A38 38 0 0 1 31.359972760794346 21.46047782418268 L31.359972760794346 21.46047782418268 L38.431040572659825 28.531545636048154 L28.531545636048154 38.431040572659825 L21.46047782418268 31.359972760794346 A38 38 0 0 1 7.0000000000000036 37.3496987939662 L7.0000000000000036 37.3496987939662 L7.000000000000004 47.3496987939662 L-6.999999999999999 47.3496987939662 L-7 37.3496987939662 A38 38 0 0 1 -21.46047782418268 31.35997276079435 L-21.46047782418268 31.35997276079435 L-28.531545636048154 38.431040572659825 L-38.43104057265982 28.531545636048158 L-31.359972760794346 21.460477824182682 A38 38 0 0 1 -37.3496987939662 7.000000000000007 L-37.3496987939662 7.000000000000007 L-47.3496987939662 7.000000000000008 L-47.3496987939662 -6.9999999999999964 L-37.3496987939662 -6.999999999999997 A38 38 0 0 1 -31.35997276079435 -21.460477824182675 L-31.35997276079435 -21.460477824182675 L-38.431040572659825 -28.531545636048147 L-28.53154563604818 -38.4310405726598 L-21.4604778241827 -31.35997276079433 A38 38 0 0 1 -6.999999999999992 -37.3496987939662 L-6.999999999999992 -37.3496987939662 L-6.999999999999994 -47.3496987939662 L6.999999999999977 -47.3496987939662 L6.999999999999979 -37.3496987939662 A38 38 0 0 1 21.460477824182686 -31.359972760794342 L21.460477824182686 -31.359972760794342 L28.531545636048158 -38.43104057265982 L38.4310405726598 -28.53154563604818 L31.35997276079433 -21.4604778241827 A38 38 0 0 1 37.3496987939662 -6.999999999999995 M0 -23A23 23 0 1 0 0 23 A23 23 0 1 0 0 -23"
fill="#7f8b95"></path></g></g></g></svg> <span class="sp1">Loading ...</span></div></div><script src="/combo/1.0.0/3rd.js?v1.0.0.1"></script><script src="/js/common.c235295.js"></script><script src="/js/home/index.1b09c2f.js"></script></body></html>
fill="#7f8b95"></path></g></g></g></svg> <span class="sp1">Loading ...</span></div></div><script src="/combo/1.0.0/3rd.js?v1.0.0.1"></script><script src="/js/common.3ac3cb4.js"></script><script src="/js/home/index.1b09c2f.js"></script></body></html>
2 changes: 2 additions & 0 deletions escheduler-ui/dist/js/14.10001b2.js
View file
Open in desktop

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions escheduler-ui/dist/js/14.10001b2.js.map
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 0 additions & 2 deletions escheduler-ui/dist/js/14.5a7aeb3.js
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion escheduler-ui/dist/js/14.5a7aeb3.js.map
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions escheduler-ui/dist/js/17.68f18e4.js → escheduler-ui/dist/js/17.6761755.js
View file
Open in desktop

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions escheduler-ui/dist/js/17.6761755.js.map
View file
Open in desktop

Large diffs are not rendered by default.

1 change: 0 additions & 1 deletion escheduler-ui/dist/js/17.68f18e4.js.map
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions escheduler-ui/dist/js/18.f3cc7a5.js → escheduler-ui/dist/js/18.3bc2e58.js
View file
Open in desktop

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions escheduler-ui/dist/js/18.3bc2e58.js.map
View file
Open in desktop

Large diffs are not rendered by default.

1 change: 0 additions & 1 deletion escheduler-ui/dist/js/18.f3cc7a5.js.map
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions escheduler-ui/dist/js/19.ca72aaa.js → escheduler-ui/dist/js/19.5ce986e.js
View file
Open in desktop

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions escheduler-ui/dist/js/19.5ce986e.js.map
View file
Open in desktop

Large diffs are not rendered by default.

1 change: 0 additions & 1 deletion escheduler-ui/dist/js/19.ca72aaa.js.map
View file
Open in desktop

This file was deleted.

6 changes: 3 additions & 3 deletions escheduler-ui/dist/js/common.c235295.js → escheduler-ui/dist/js/common.3ac3cb4.js
View file
Open in desktop

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions escheduler-ui/dist/js/common.3ac3cb4.js.map
View file
Open in desktop

Large diffs are not rendered by default.

1 change: 0 additions & 1 deletion escheduler-ui/dist/js/common.c235295.js.map
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion escheduler-ui/dist/view/login/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
<!doctype html><html><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"><meta http-equiv="Cache-Control" content="no-siteapp"><meta name="apple-mobile-web-app-capable" content="yes"><meta name="apple-mobile-web-app-title" content="标题"><meta name="apple-mobile-web-app-status-bar-style" content="black-translucent"><meta name="format-detection" content="telphone=no, email=no"><meta name="screen-orientation" content="portrait"><meta name="x5-orientation" content="portrait"><meta name="theme-color" content="#4a8dee"><meta name="msapplication-navbutton-color" content="#4a8dee"><meta name="viewport" content="width=device-width,user-scalable=no,initial-scale=1,maximum-scale=1,minimum-scale=1"><link rel="shortcut icon" href="/images/favicon.ico"><link href="/combo/1.0.0/base.css?v1.0.0.1" rel="stylesheet"><link href="/combo/1.0.0/3rd.css?v1.0.0.1" rel="stylesheet"><!--[if lt IE 9]>
<script src="/combo/1.0.0/es5.js"></script>
<![endif]--><script>let NODE_ENV = 'true'</script><title>Login - EasyScheduler</title><link href="/css/common.8ba9af7.css" rel="stylesheet"><link href="/css/login/index.5866c64.css" rel="stylesheet"></head><body><div id="app"></div><div class="login-bg"></div><script src="/combo/1.0.0/3rd.js?v1.0.0.1"></script><script src="/js/common.c235295.js"></script><script src="/js/login/index.97eaebb.js"></script></body></html>
<![endif]--><script>let NODE_ENV = 'true'</script><title>Login - EasyScheduler</title><link href="/css/common.8ba9af7.css" rel="stylesheet"><link href="/css/login/index.5866c64.css" rel="stylesheet"></head><body><div id="app"></div><div class="login-bg"></div><script src="/combo/1.0.0/3rd.js?v1.0.0.1"></script><script src="/js/common.3ac3cb4.js"></script><script src="/js/login/index.97eaebb.js"></script></body></html>
2 changes: 1 addition & 1 deletion escheduler-ui/src/js/conf/home/pages/dag/_source/udp/udp.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
</div>
<div class="content" style="padding-bottom: 10px;" v-if="checkedTimeout">
<span>
<x-input v-model="timeout" style="width: 128px;" maxlength="9">
<x-input v-model="timeout" style="width: 160px;" maxlength="9">
<span slot="append">{{$t('Minute')}}</span>
</x-input>
</span>
Expand Down
5 changes: 3 additions & 2 deletions escheduler-ui/src/js/conf/home/pages/security/pages/tenement/_source/createTenement.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,12 +114,13 @@
})
},
_verification () {
let isEn = /^\w+$/
let isEn = /^[0-9a-zA-Z_.-]{1,}$/

if (!this.tenantCode) {
this.$message.warning(`${i18n.$t('Please enter the tenant code in English')}`)
return false
}
if (!isEn.test(this.tenantCode) || this.tenantCode.split('')[0] === '_') {
if (!isEn.test(this.tenantCode) || _.startsWith(this.tenantCode, '_', 0) || _.startsWith(this.tenantCode, '.', 0)) {
this.$message.warning(`${i18n.$t('Please enter tenant code in English')}`)
return false
}
Expand Down
2 changes: 1 addition & 1 deletion escheduler-ui/src/js/module/i18n/locale/en_US.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -448,5 +448,5 @@ export default {
'Max used connections': 'Max used connections',
'Threads running connections': 'Threads running connections',
'Worker group': 'Worker group',
'Please enter a positive integer greater than 0': 'Please enter a positive integer greater than 0',
'Please enter a positive integer greater than 0': 'Please enter a positive integer greater than 0'
}
2 changes: 1 addition & 1 deletion escheduler-ui/src/js/module/i18n/locale/zh_CN.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -448,5 +448,5 @@ export default {
'Max used connections': '同时使用连接最大数',
'Threads running connections': '数据库当前活跃连接数',
'Worker group': 'Worker分组',
'Please enter a positive integer greater than 0': '请输入大于 0 的正整数',
'Please enter a positive integer greater than 0': '请输入大于 0 的正整数'
}