Skip to content

Commit

Permalink
1.update logo 2.Workflow Definition Page Timing Component Replaced wi…
Browse files Browse the repository at this point in the history
…th Source Code (#924)

* package

* 修改工作流实例页面状态为运行时,禁止删除,删除package.json包里面的babel-runtime和jasmine-core

* bugfix-user-specified queue takes precedence over tenant queue (#769)

Solve the problem that the user queue setting does not take effect

* update markdown docs which can not display images normally (#806)

* issue#728 (#746)

The mailSender in PasswordAuthentication() and setFrom() may not be the same in actual use, and it's best to set it up separately. please add a example about this.

* install-escheduler-ui.sh,monitor_server.py and install.sh scripts comment change to english and install-escheduler-ui.sh use escheduler change to dolphinscheduler (#812)

* service start exception modify

* master,worker start modify

* .env update

* install-escheduler-ui.sh,monitor_server.py and install.sh scripts comment change to english and install-escheduler-ui.sh use escheduler change to dolphinscheduler

* scripts name standardization (#813)

* service start exception modify

* master,worker start modify

* .env update

* install-escheduler-ui.sh,monitor_server.py and install.sh scripts comment change to english and install-escheduler-ui.sh use escheduler change to dolphinscheduler

* scripts name standardization

* [BUG][#731]repair swagger annotation,interface path:/escheduler/projects/{projectName}/process/batch-delete and /escheduler/projects/{projectName}/process/delete  (#764)

* 增加工作流导出导入功能,前端定时器表达式的秒和分钟的默认值从*修改成0

* 修改工作流导出导入功能由excel改为json减少依赖

* [BUG][#731]repair swagger annotation ,interface path:/escheduler/projects/{projectName}/process/batch-delete and /escheduler/projects/{projectName}/process/delete

* [BUG][#771] The edit timer did not assign the original data

* [FEATURE][#236] Cross-project dependency

* [FEATURE][#236] Cross-project dependency(增加跨项目依赖)

* misspell  words (#817)

* (Docs): Fixed some typo errors (#811)

* Update EasyScheduler Proposal.md

* Update frontend-deployment.md

* Update frontend-development.md

* Update 前端开发文档.md

* Update system-manual.md

* Update HttpClientTest.java

* Update 系统使用手册.md

* fix singleton with volatile (#818)

* Replace StringBuffer with StringBuilder inside the method (#816)

* flink task support(flink 任务支持) (#711)

* flink任务支持

* flink任务支持

* Update zh_CN.js

* Update FlinkArgsUtils.java

* Update .escheduler_env.sh

* 1.Delete the page section console.log;
2.Change project name;
3.Production configuration packaging clears console.log

* Delete the'babel-plugin-transform-remove-console'dependency package

* 1.repair [BUG]#884,2.Add Scheduling Time Fields to Workflow Instance List,3.Add a reminder for empty data

* 1.update logo 2.Workflow Definition Page Timing Component Replaced with Source Code
  • Loading branch information
break60 authored and qiaozhanwei committed Sep 29, 2019
1 parent 9a6052b commit 33aedeb
Show file tree
Hide file tree
Showing 34 changed files with 2,622 additions and 356 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -144,10 +144,9 @@
import _ from 'lodash'
import i18n from '@/module/i18n'
import mEmail from './email.vue'
import '~/@vue/crontab/dist/index.css'
import store from '@/conf/home/store'
import { warningTypeList } from './util'
import { vCrontab } from '~/@vue/crontab/dist'
import { vCrontab } from '@/module/components/crontab/index'
import { formatDate } from '@/module/filter/filter'
import mPriority from '@/module/components/priority/priority'
import mWorkerGroups from '@/conf/home/pages/dag/_source/formModel/_source/workerGroups'
Expand Down Expand Up @@ -291,8 +290,7 @@
this._preview()
}
},
watch: {
},
watch: {},
created () {
if(this.item.crontab !== null){
this.crontab = this.item.crontab
Expand Down
2 changes: 1 addition & 1 deletion escheduler-ui/src/js/conf/login/App.vue
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@
width: 280px;
height: 60px;
display: block;
background: url("img/login-logo.png");
background: url("img/login-logo.svg") no-repeat 23px;
margin: 0 auto;
}
}
Expand Down
Binary file removed escheduler-ui/src/js/conf/login/img/login-logo.png
Binary file not shown.
85 changes: 85 additions & 0 deletions escheduler-ui/src/js/conf/login/img/login-logo.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 6 additions & 0 deletions escheduler-ui/src/js/module/components/crontab/index.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
import vCrontab from './source/app.vue'
// import './source/index.scss'

export {
vCrontab
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
/* eslint-disable */
import _ from 'lodash'
import zh_CN from './locale/zh_CN'
import en_US from './locale/en_US'

export function localeList () {
return [
{
code: 'zh_CN',
name: '中文',
locale: zh_CN
},
{
code: 'en_US',
name: 'English',
locale: en_US
}
]
}

export function findLocale (code) {
return _.find(localeList(), ['code', code])
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@

import { findLocale } from './config'
import { template } from './util'

export default {
methods: {
$t (str, data) {
return template(findLocale(window.localeCrontab).locale[str], data)
}
}
}

Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
export default {
'秒': 'second',
'分': 'minute',
'时': 'hour',
'天': 'day',
'月': 'month',
'年': 'year',
'星期一': 'Monday',
'星期二': 'Tuesday',
'星期三': 'Wednesday',
'星期四': 'Thursday',
'星期五': 'Friday',
'星期六': 'Saturday',
'星期天': 'Sunday',
'每一秒钟': 'Every second',
'每隔': 'Every',
'秒执行 从': 'second carried out',
'秒开始': 'Start',
'具体秒数(可多选)': 'Specific second(multiple)',
'请选择具体秒数': 'Please enter a specific second',
'周期从': 'Cycle from',
'到': 'to',
'每一分钟': 'Every minute',
'分执行 从': 'minute carried out',
'分开始': 'Start',
'具体分钟数(可多选)': 'Specific minute(multiple)',
'请选择具体分钟数': 'Please enter a specific minute',
'每一小时': 'Every hour',
'小时执行 从': 'hour carried out',
'小时开始': 'Start',
'具体小时数(可多选)': 'Specific hour(multiple)',
'请选择具体小时数': 'Please enter a hour',
'每一天': 'Every day',
'周执行 从': 'week carried out',
'开始': 'Start',
'天执行 从': 'day carried out',
'天开始': 'Start',
'具体星期几(可多选)': 'Specific day of the week(multiple)',
'请选择具体周几': 'Please enter a week',
'具体天数(可多选)': 'Specific days(multiple)',
'请选择具体天数': 'Please enter a days',
'在这个月的最后一天': 'On the last day of the month',
'在这个月的最后一个工作日': 'On the last working day of the month',
'在这个月的最后一个': 'At the last of this month',
'在本月底前': 'Before the end of this month',
'最近的工作日(周一至周五)至本月': 'The most recent business day (Monday to Friday) to this month',
'在这个月的第': 'In this months',
'每一月': 'Every month',
'月执行 从': 'month carried out',
'月开始': 'Start',
'具体月数(可多选)': 'Specific months(multiple)',
'请选择具体月数': 'Please enter a months',
'每一年': 'Every year',
'年执行 从': 'year carried out',
'年开始': 'Start',
'具体年数(可多选)': 'Specific year(multiple)',
'请选择具体年数': 'Please enter a year',
'小时': 'hour',
'日': 'day'
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
export default {
'秒': '秒',
'分': '分',
'时': '时',
'天': '天',
'月': '月',
'年': '年',
'星期一': '星期一',
'星期二': '星期二',
'星期三': '星期三',
'星期四': '星期四',
'星期五': '星期五',
'星期六': '星期六',
'星期天': '星期天',
'每一秒钟': '每一秒钟',
'每隔': '每隔',
'秒执行 从': '秒执行 从',
'秒开始': '秒开始',
'具体秒数(可多选)': '具体秒数(可多选)',
'请选择具体秒数': '请选择具体秒数',
'周期从': '周期从',
'到': '到',
'每一分钟': '每一分钟',
'分执行 从': '分执行 从',
'分开始': '分开始',
'具体分钟数(可多选)': '具体分钟数(可多选)',
'请选择具体分钟数': '请选择具体分钟数',
'每一小时': '每一小时',
'小时执行 从': '小时执行 从',
'小时开始': '小时开始',
'具体小时数(可多选)': '具体小时数(可多选)',
'请选择具体小时数': '请选择具体小时数',
'每一天': '每一天',
'周执行 从': '周执行 从',
'开始': '开始',
'天执行 从': '天执行 从',
'天开始': '天开始',
'具体星期几(可多选)': '具体星期几(可多选)',
'请选择具体周几': '请选择具体周几',
'具体天数(可多选)': '具体天数(可多选)',
'请选择具体天数': '请选择具体天数',
'在这个月的最后一天': '在这个月的最后一天',
'在这个月的最后一个工作日': '在这个月的最后一个工作日',
'在这个月的最后一个': '在这个月的最后一个',
'在本月底前': '在本月底前',
'最近的工作日(周一至周五)至本月': '最近的工作日(周一至周五)至本月',
'在这个月的第': '在这个月的第',
'每一月': '每一月',
'月执行 从': '月执行 从',
'月开始': '月开始',
'具体月数(可多选)': '具体月数(可多选)',
'请选择具体月数': '请选择具体月数',
'每一年': '每一年',
'年执行 从': '年执行 从',
'年开始': '年开始',
'具体年数(可多选)': '具体年数(可多选)',
'请选择具体年数': '请选择具体年数',
'小时': '小时',
'日': '日'
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@

/**
* template
*
* @param {String} string
* @param {Array} ...args
* @return {String}
*/
const { hasOwnProperty } = {}
const RE_NARGS = /(%|)\{([0-9a-zA-Z_]+)\}/g
const hasOwn = (o, k) => hasOwnProperty.call(o, k)
const template = (string, ...args) => {
if (args.length === 1 && typeof args[0] === 'object') {
args = args[0]
}
if (!args || !args.hasOwnProperty) {
args = {}
}
return string.replace(RE_NARGS, (match, prefix, i, index) => {
let result
if (string[index - 1] === '{' &&
string[index + match.length] === '}') {
return i
} else {
result = hasOwn(args, i) ? args[i] : null
if (result === null || result === undefined) {
return ''
}
return result
}
})
}

export { template }
Loading

0 comments on commit 33aedeb

Please sign in to comment.