diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/datasource/pages/list/_source/list.vue b/dolphinscheduler-ui/src/js/conf/home/pages/datasource/pages/list/_source/list.vue
index c9628f0ec8..d7cc5a4c44 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/datasource/pages/list/_source/list.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/datasource/pages/list/_source/list.vue
@@ -63,7 +63,10 @@
-
{{item.note || '-'}} |
+
+ {{item.note}}
+ -
+ |
{{item.createTime | formatDate}}
-
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/_source/list.vue b/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/_source/list.vue
index 624b37f11b..42b7e0eb95 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/_source/list.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/_source/list.vue
@@ -69,7 +69,8 @@
-
|
- {{item.desc || '-'}}
+ {{item.desc}}
+ -
|
{{$t('offline')}}
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/list/_source/list.vue b/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/list/_source/list.vue
index 725477e6e1..9c10212b83 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/list/_source/list.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/list/_source/list.vue
@@ -66,7 +66,8 @@
{{item.instRunningCount}}
|
- {{item.desc || '-'}}
+ {{item.desc}}
+ -
|
{{item.createTime | formatDate}}
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/list/_source/list.vue b/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/list/_source/list.vue
index 844f554563..782789c32b 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/list/_source/list.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/list/_source/list.vue
@@ -52,7 +52,8 @@
|
{{item.fileName}} |
- {{item.desc || '-'}}
+ {{item.desc}}
+ -
|
{{_rtSize(item.size)}}
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/udf/pages/function/_source/list.vue b/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/udf/pages/function/_source/list.vue
index 8269fa3318..835d816bfe 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/udf/pages/function/_source/list.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/udf/pages/function/_source/list.vue
@@ -67,7 +67,8 @@ v-ps
{{item.type}}
|
- {{item.desc || '-'}}
+ {{item.desc}}
+ -
|
{{item.resourceName}}
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/udf/pages/resource/_source/list.vue b/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/udf/pages/resource/_source/list.vue
index e68307cc67..2d185263bf 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/udf/pages/resource/_source/list.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/udf/pages/resource/_source/list.vue
@@ -58,7 +58,8 @@
{{_rtSize(item.size)}}
|
- {{item.desc || '-'}}
+ {{item.desc}}
+ -
|
{{item.createTime | formatDate}}
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/tenement/_source/list.vue b/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/tenement/_source/list.vue
index 101f0cabf7..7be513c844 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/tenement/_source/list.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/tenement/_source/list.vue
@@ -59,7 +59,8 @@
|
- {{item.desc || '-'}}
+ {{item.desc}}
+ -
|
{{item.queueName}}
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/warningGroups/_source/list.vue b/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/warningGroups/_source/list.vue
index 01f4fe300e..4923d40f77 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/warningGroups/_source/list.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/warningGroups/_source/list.vue
@@ -52,7 +52,8 @@
|
{{item.groupType === 'EMAIL' ? `${$t('Email')}` : `${$t('SMS')}`}} |
- {{item.desc || '-'}}
+ {{item.desc}}
+ -
|
{{item.createTime | formatDate}}
diff --git a/dolphinscheduler-ui/src/js/module/components/fileUpdate/fileUpdate.vue b/dolphinscheduler-ui/src/js/module/components/fileUpdate/fileUpdate.vue
index a8065b40ea..16f61d61c9 100644
--- a/dolphinscheduler-ui/src/js/module/components/fileUpdate/fileUpdate.vue
+++ b/dolphinscheduler-ui/src/js/module/components/fileUpdate/fileUpdate.vue
@@ -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
diff --git a/dolphinscheduler-ui/src/js/module/i18n/locale/en_US.js b/dolphinscheduler-ui/src/js/module/i18n/locale/en_US.js
index fbcb744639..7231741856 100644
--- a/dolphinscheduler-ui/src/js/module/i18n/locale/en_US.js
+++ b/dolphinscheduler-ui/src/js/module/i18n/locale/en_US.js
@@ -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',
diff --git a/dolphinscheduler-ui/src/js/module/i18n/locale/zh_CN.js b/dolphinscheduler-ui/src/js/module/i18n/locale/zh_CN.js
index abbce8db54..1120f760f6 100644
--- a/dolphinscheduler-ui/src/js/module/i18n/locale/zh_CN.js
+++ b/dolphinscheduler-ui/src/js/module/i18n/locale/zh_CN.js
@@ -221,6 +221,7 @@ export default {
'File Name': '文件名称',
'File Format': '文件格式',
'File Content': '文件内容',
+ 'Upload File Size': '文件大小不能超过1G',
'Create': '创建',
'Please enter the resource content': '请输入资源内容',
'File Details': '文件详情',
|