Browse Source

Merge pull request #321 from millionfor/branch-1.0.2

Branch 1.0.2
pull/2/head
millionfor 6 years ago committed by GitHub
parent
commit
e171234f2a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 2
      README.md
  2. 2
      escheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/details/index.vue
  3. 3
      escheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/edit/index.vue
  4. 4
      escheduler-ui/src/js/module/i18n/locale/en_US.js
  5. 4
      escheduler-ui/src/js/module/i18n/locale/zh_CN.js

2
README.md

@ -1,4 +1,4 @@
Easy Scheduler
Easy Scheduler
============
[![License](https://img.shields.io/badge/license-Apache%202-4EB1BA.svg)](https://www.apache.org/licenses/LICENSE-2.0.html)

2
escheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/details/index.vue

@ -79,7 +79,7 @@
this.isData = false
} else {
this.isData = true
this._handlerEditor().setValue(res.data.content)
this._handlerEditor().setValue(res.data.content + '\n')
// Initialize the plugin to prevent repeated calls
if (editor.lineCount() < 1000) {

3
escheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/edit/index.vue

@ -92,7 +92,8 @@
this.isData = false
} else {
this.isData = true
this._handlerEditor().setValue(res.data.content || '')
let content = res.data.content ? res.data.content + '\n' : ''
this._handlerEditor().setValue(content)
setTimeout(() => {
$('.code-mirror-model').scrollTop(12).scrollLeft(0)
}, 200)

4
escheduler-ui/src/js/module/i18n/locale/en_US.js

@ -452,6 +452,6 @@ export default {
'Pre Statement': 'Pre Statement',
'Post Statement': 'Post Statement',
'Statement cannot be empty': 'Statement cannot be empty',
'Process Define Count':'Process Define Count',
'Process Instance Running Count':'Process Instance Running Count',
'Process Define Count': 'Process Define Count',
'Process Instance Running Count': 'Process Instance Running Count'
}

4
escheduler-ui/src/js/module/i18n/locale/zh_CN.js

@ -452,6 +452,6 @@ export default {
'Pre Statement': '前置sql',
'Post Statement': '后置sql',
'Statement cannot be empty': '语句不能为空',
'Process Define Count':'流程定义个数',
'Process Instance Running Count':'运行流程实例个数',
'Process Define Count': '流程定义个数',
'Process Instance Running Count': '运行流程实例个数'
}

Loading…
Cancel
Save