Browse Source

[1.3.6-prepare][Improvement][UI] Support more file types in file detail page #4646 #4683 (#4969)

Shiwen Cheng 4 years ago committed by GitHub
parent
commit
c4e533bd73
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 2
      dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/Constants.java
  2. 2
      dolphinscheduler-common/src/main/resources/common.properties
  3. 2
      dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/_source/common.js
  4. 10
      dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/details/index.vue
  5. 10
      dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/edit/index.vue

2
dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/Constants.java

@ -141,7 +141,7 @@ public final class Constants {
*/
public static final String RESOURCE_VIEW_SUFFIXS = "resource.view.suffixs";
public static final String RESOURCE_VIEW_SUFFIXS_DEFAULT_VALUE = "txt,log,sh,conf,cfg,py,java,sql,hql,xml,properties";
public static final String RESOURCE_VIEW_SUFFIXS_DEFAULT_VALUE = "txt,log,sh,bat,conf,cfg,py,java,sql,xml,hql,properties,json,yml,yaml,ini,js";
/**
* development.state

2
dolphinscheduler-common/src/main/resources/common.properties

@ -37,7 +37,7 @@ login.user.keytab.username=hdfs-mycluster@ESZ.COM
login.user.keytab.path=/opt/hdfs.headless.keytab
#resource.view.suffixs
#resource.view.suffixs=txt,log,sh,conf,cfg,py,java,sql,hql,xml,properties
#resource.view.suffixs=txt,log,sh,bat,conf,cfg,py,java,sql,xml,hql,properties,json,yml,yaml,ini,js
# if resource.storage.type=HDFS, the user need to have permission to create directories under the HDFS root path
hdfs.root.user=hdfs

2
dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/_source/common.js

@ -18,6 +18,6 @@
/**
* Create file type
*/
const filtTypeArr = ['txt', 'log', 'sh', 'conf', 'cfg', 'py', 'java', 'sql', 'xml', 'hql', 'properties']
const filtTypeArr = ['txt', 'log', 'sh', 'bat', 'conf', 'cfg', 'py', 'java', 'sql', 'xml', 'hql', 'properties', 'json', 'yml', 'yaml', 'ini', 'js']
export { filtTypeArr }

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

@ -25,7 +25,7 @@
<em>{{size}}</em>
</div>
</h2>
<template v-if="isNoType">
<template v-if="isViewType">
<div class="code-mirror-model" v-if="!msg">
<textarea id="code-details-mirror" name="code-details-mirror"></textarea>
@ -34,7 +34,7 @@
<m-no-data :msg="msg" v-if="msg"></m-no-data>
</template>
<template v-if="!isNoType">
<template v-if="!isViewType">
<m-no-type></m-no-type>
</template>
</div>
@ -64,7 +64,7 @@
data () {
return {
name: '',
isNoType: true,
isViewType: true,
isLoading: false,
filtTypeArr: filtTypeArr,
loadingIndex: 0,
@ -191,10 +191,10 @@
let a = fileName.substring(i, fileName.length)
this.mode = handlerSuffix[a]
this.size = bytesToSize(parseInt(fileSize))
this.isNoType = _.includes(this.filtTypeArr, _.trimStart(a, '.'))
this.isViewType = _.includes(this.filtTypeArr, _.trimStart(a, '.'))
},
mounted () {
if (this.isNoType) {
if (this.isViewType) {
// get data
this._getViewResources()
}

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

@ -21,7 +21,7 @@
<h2>
<span>{{name}}</span>
</h2>
<template v-show="isNoType">
<template v-show="isViewType">
<template v-if="!msg">
<div class="code-mirror-model">
<textarea id="code-edit-mirror" name="code-edit-mirror"></textarea>
@ -34,7 +34,7 @@
<m-no-data :msg="msg" v-if="msg"></m-no-data>
</template>
<template v-if="!isNoType">
<template v-if="!isViewType">
<m-no-type></m-no-type>
</template>
</div>
@ -64,7 +64,7 @@
data () {
return {
name: '',
isNoType: true,
isViewType: true,
isLoading: false,
filtTypeArr: filtTypeArr,
loadingIndex: 0,
@ -165,10 +165,10 @@
let a = fileName.substring(i, fileName.length)
this.mode = handlerSuffix[a]
this.size = bytesToSize(parseInt(fileSize))
this.isNoType = _.includes(this.filtTypeArr, _.trimStart(a, '.'))
this.isViewType = _.includes(this.filtTypeArr, _.trimStart(a, '.'))
},
mounted () {
if (this.isNoType) {
if (this.isViewType) {
// get data
this._getViewResources()
}

Loading…
Cancel
Save