diff --git a/README.md b/README.md index c6f48b2bc3..edb75d4230 100644 --- a/README.md +++ b/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) diff --git a/escheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/details/index.vue b/escheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/details/index.vue index 7a3ae01913..aa45114c1f 100644 --- a/escheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/details/index.vue +++ b/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) { diff --git a/escheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/edit/index.vue b/escheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/edit/index.vue index a25b55807c..e77818b54b 100644 --- a/escheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/edit/index.vue +++ b/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) diff --git a/escheduler-ui/src/js/module/i18n/locale/en_US.js b/escheduler-ui/src/js/module/i18n/locale/en_US.js index 0a3ba357f4..912a1c6299 100644 --- a/escheduler-ui/src/js/module/i18n/locale/en_US.js +++ b/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' } diff --git a/escheduler-ui/src/js/module/i18n/locale/zh_CN.js b/escheduler-ui/src/js/module/i18n/locale/zh_CN.js index 023e487df5..8986587a57 100644 --- a/escheduler-ui/src/js/module/i18n/locale/zh_CN.js +++ b/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': '运行流程实例个数' }