natas_hw
/
dolphinscheduler0701
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Upload file size is limited to 1G (#1056) 

* Delete third party import license

* Resource authorization add file resource and UDF resource tab

* Solve the problem that the initial value of timing is not assigned and the period cannot be selected if the second is selected.

* revert

* Modification date format and page signature

* Upgrade ANSY UI to version 0.1.46

* Flink version migration

* Upload file size is limited to 1G

* Modify description field
This commit is contained in:
break60 2019-10-18 17:57:11 +08:00 committed by qiaozhanwei
parent 1340ff68b1
commit 302ecc9e66
11 changed files with 31 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
dolphinscheduler-ui/src/js/conf/home/pages/datasource/pages/list/_source/list.vue
View File

@ -63,7 +63,10 @@
</span>
</m-tooltips-JSON>
</td>
<td><span class="ellipsis" v-tooltip="item.note">{{item.note || '-'}}</span></td>
<td>
<span v-if="item.note" class="ellipsis" v-tooltip="item.note">{{item.note}}</span>
<span v-else>-</span>
</td>
<td>
<span v-if="item.createTime">{{item.createTime | formatDate}}</span>
<span v-else>-</span>

3
dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/_source/list.vue
View File

@ -69,7 +69,8 @@
<span v-else>-</span>
</td>
<td>
<span class="ellipsis" v-tooltip="item.desc">{{item.desc || '-'}}</span>
<span v-if="item.desc" class="ellipsis" v-tooltip="item.desc">{{item.desc}}</span>
<span v-else>-</span>
</td>
<td>
<span v-if="item.scheduleReleaseState === 'OFFLINE'">{{$t('offline')}}</span>

3
dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/list/_source/list.vue
View File

@ -66,7 +66,8 @@
<span>{{item.instRunningCount}}</span>
</td>
<td>
<span class="ellipsis" v-tooltip="item.desc">{{item.desc || '-'}}</span>
<span v-if="item.desc" class="ellipsis" v-tooltip="item.desc">{{item.desc}}</span>
<span v-else>-</span>
</td>
<td>
<span v-if="item.createTime">{{item.createTime | formatDate}}</span>

3
dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/list/_source/list.vue
View File

@ -52,7 +52,8 @@
</td>
<td><span class="ellipsis">{{item.fileName}}</span></td>
<td>
<span class="ellipsis" v-tooltip="item.desc">{{item.desc || '-'}}</span>
<span v-if="item.desc" class="ellipsis" v-tooltip="item.desc">{{item.desc}}</span>
<span v-else>-</span>
</td>
<td>
<span>{{_rtSize(item.size)}}</span>

3
dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/udf/pages/function/_source/list.vue
View File

@ -67,7 +67,8 @@ v-ps<template>
<span>{{item.type}}</span>
</td>
<td>
<span class="ellipsis" v-tooltip="item.desc">{{item.desc || '-'}}</span>
<span v-if="item.desc" class="ellipsis" v-tooltip="item.desc">{{item.desc}}</span>
<span v-else>-</span>
</td>
<td>
<span>{{item.resourceName}}</span>

3
dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/udf/pages/resource/_source/list.vue
View File

@ -58,7 +58,8 @@
<span>{{_rtSize(item.size)}}</span>
</td>
<td>
<span class="ellipsis" v-tooltip="item.desc">{{item.desc || '-'}}</span>
<span v-if="item.desc" class="ellipsis" v-tooltip="item.desc">{{item.desc}}</span>
<span v-else>-</span>
</td>
<td>
<span v-if="item.createTime">{{item.createTime | formatDate}}</span>

3
dolphinscheduler-ui/src/js/conf/home/pages/security/pages/tenement/_source/list.vue
View File

@ -59,7 +59,8 @@
</span>
</td>
<td>
<span class="ellipsis" v-tooltip="item.desc">{{item.desc || '-'}}</span>
<span v-if="item.desc" class="ellipsis" v-tooltip="item.desc">{{item.desc}}</span>
<span v-else>-</span>
</td>
<td>
<span>{{item.queueName}}</span>

3
dolphinscheduler-ui/src/js/conf/home/pages/security/pages/warningGroups/_source/list.vue
View File

@ -52,7 +52,8 @@
</td>
<td><span>{{item.groupType === 'EMAIL' ? `${$t('Email')}` : `${$t('SMS')}`}}</span></td>
<td>
<span class="ellipsis" v-tooltip="item.desc">{{item.desc || '-'}}</span>
<span v-if="item.desc" class="ellipsis" v-tooltip="item.desc">{{item.desc}}</span>
<span v-else>-</span>
</td>
<td>
<span v-if="item.createTime">{{item.createTime | formatDate}}</span>

16
dolphinscheduler-ui/src/js/module/components/fileUpdate/fileUpdate.vue
View File

@ -127,13 +127,19 @@
name: this.name,
type: this.type
}).then(res => {
this._formDataUpdate().then(res => {
setTimeout(() => {
const isLt1024M = this.file.size / 1024 / 1024 < 1024
if(isLt1024M) {
this._formDataUpdate().then(res => {
setTimeout(() => {
this.$refs['popup'].spinnerLoading = false
}, 800)
}).catch(e => {
this.$refs['popup'].spinnerLoading = false
}, 800)
}).catch(e => {
})
} else {
this.$message.warning(`${i18n.$t('Upload File Size')}`)
this.$refs['popup'].spinnerLoading = false
})
}
}).catch(e => {
this.$message.error(e.msg || '')
this.$refs['popup'].spinnerLoading = false

1
dolphinscheduler-ui/src/js/module/i18n/locale/en_US.js
View File

@ -176,6 +176,7 @@ export default {
'Authorize': 'Authorize',
'File resources': 'File resources',
'UDF resources': 'UDF resources',
'Upload File Size': 'Upload File size cannot exceed 1g',
'Edit alarm group': 'Edit alarm group',
'Create alarm group': 'Create alarm group',
'Group Name': 'Group Name',

1
dolphinscheduler-ui/src/js/module/i18n/locale/zh_CN.js
View File

@ -221,6 +221,7 @@ export default {
'File Name': '文件名称',
'File Format': '文件格式',
'File Content': '文件内容',
'Upload File Size': '文件大小不能超过1G',
'Create': '创建',
'Please enter the resource content': '请输入资源内容',
'File Details': '文件详情',