From 7e6742182a0ff128b7a1b74ea71f6f01e16f75f3 Mon Sep 17 00:00:00 2001 From: gongzijian Date: Mon, 20 May 2019 14:18:49 +0800 Subject: [PATCH 1/3] test --- README.md | 2 +- escheduler-ui/src/js/module/i18n/locale/en_US.js | 4 ++-- escheduler-ui/src/js/module/i18n/locale/zh_CN.js | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) 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/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 e47aa84ec4..b11a412185 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': '运行流程实例个数' } From d5cacb192e97183a9935f7f6ce74481d4ca9ead2 Mon Sep 17 00:00:00 2001 From: gongzijian Date: Tue, 21 May 2019 14:55:21 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../home/pages/resource/pages/file/pages/details/index.vue | 2 +- .../conf/home/pages/resource/pages/file/pages/edit/index.vue | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) 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) From 7b1f95d06778c3c03f63cd738383513d0330f221 Mon Sep 17 00:00:00 2001 From: gongzijian Date: Tue, 21 May 2019 14:56:02 +0800 Subject: [PATCH 3/3] t --- escheduler-ui/.env | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/escheduler-ui/.env b/escheduler-ui/.env index 5cd5ba736d..54019dac9b 100644 --- a/escheduler-ui/.env +++ b/escheduler-ui/.env @@ -1,6 +1,7 @@ # 后端接口地址 -API_BASE = http://192.168.xx.xx:12345 +#API_BASE = http://192.168.220.154:12345 +API_BASE = http://192.168.221.188:12345 # 本地开发如需ip访问项目把"#"号去掉 #DEV_HOST = 192.168.xx.xx