Unverified Commit e171234f authored by millionfor's avatar millionfor Committed by GitHub
Browse files

Merge pull request #321 from millionfor/branch-1.0.2 

Branch 1.0.2
parents 0cc61f5d 0cfa35da

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

+1 −1
Original line number Diff line number Diff line
@@ -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) {

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

+2 −1
Original line number Diff line number Diff line
@@ -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)

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

+2 −2
Original line number Diff line number Diff line
@@ -453,5 +453,5 @@ export default { 
  '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 Instance Running Count': 'Process Instance Running Count'

}

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

+2 −2
Original line number Diff line number Diff line
@@ -453,5 +453,5 @@ export default { 
  'Post Statement': '后置sql',

  'Statement cannot be empty': '语句不能为空',

  'Process Define Count': '流程定义个数',

  'Process Instance Running Count':'运行流程实例个数',

  'Process Instance Running Count': '运行流程实例个数'

}

README.md

+1 −1

File changed.

Contains only whitespace changes.