This is an automated email from the ASF dual-hosted git repository.
kirs pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/incubator-dolphinscheduler.git
The following commit(s) were added to refs/heads/dev by this push:
new e24e690 [Improvement][ui]List vacancy optimization and icon icon
repair (#4286)
e24e690 is described below
commit e24e690c0b79bf7f9e66fe5c75dedcc1d266cfde
Author: break60 <[email protected]>
AuthorDate: Wed Dec 23 09:39:33 2020 +0800
[Improvement][ui]List vacancy optimization and icon icon repair (#4286)
* [Improvement][ui] List vacancy optimization and icon icon repair
---
dolphinscheduler-ui/src/js/conf/home/index.js | 1 +
.../src/js/conf/home/pages/dag/_source/config.js | 2 +-
.../home/pages/datasource/pages/list/_source/list.vue | 1 -
.../pages/definition/pages/list/_source/list.vue | 6 +++++-
.../home/pages/projects/pages/list/_source/list.vue | 6 +++++-
.../resource/pages/file/pages/list/_source/list.vue | 6 +++++-
.../pages/file/pages/subdirectory/_source/list.vue | 6 +++++-
.../resource/pages/udf/pages/function/_source/list.vue | 6 +++++-
.../resource/pages/udf/pages/resource/_source/list.vue | 6 +++++-
.../pages/security/pages/tenement/_source/list.vue | 7 +++++--
.../home/pages/security/pages/users/_source/list.vue | 6 +++++-
dolphinscheduler-ui/src/js/module/filter/filter.js | 18 ++++++++++++++++--
.../src/js/module/filter/{filter.js => filterNull.js} | 14 ++++----------
13 files changed, 62 insertions(+), 23 deletions(-)
diff --git a/dolphinscheduler-ui/src/js/conf/home/index.js
b/dolphinscheduler-ui/src/js/conf/home/index.js
index 1324705..3809f18 100644
--- a/dolphinscheduler-ui/src/js/conf/home/index.js
+++ b/dolphinscheduler-ui/src/js/conf/home/index.js
@@ -28,6 +28,7 @@ import i18n from '@/module/i18n'
import { sync } from 'vuex-router-sync'
import Chart from '@/module/ana-charts'
import '@/module/filter/formatDate'
+import '@/module/filter/filterNull'
import themeData from '@/module/echarts/themeData.json'
import Permissions from '@/module/permissions'
import 'sass/conf/home/index.scss'
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/config.js
b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/config.js
index f759496..f060549 100755
--- a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/config.js
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/config.js
@@ -150,7 +150,7 @@ const tasksState = {
id: 0,
desc: `${i18n.$t('Submitted successfully')}`,
color: '#A9A9A9',
- icoUnicode: 'fa-dot-circle-o',
+ icoUnicode: 'fa fa-dot-circle-o',
isSpin: false
},
RUNNING_EXECUTION: {
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 eaed955..cc1cc6a 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
@@ -32,7 +32,6 @@
</div>
</template>
</el-table-column>
- <el-table-column prop="description" :label="$t('Description')"
width="200"></el-table-column>
<el-table-column :label="$t('Create Time')" min-width="120">
<template slot-scope="scope">
<span>{{scope.row.createTime | formatDate}}</span>
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 3728af3..0a6c75c 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
@@ -47,7 +47,11 @@
<span>{{scope.row.updateTime | formatDate}}</span>
</template>
</el-table-column>
- <el-table-column prop="description"
:label="$t('Description')"></el-table-column>
+ <el-table-column :label="$t('Description')">
+ <template slot-scope="scope">
+ <span>{{scope.row.description | filterNull}}</span>
+ </template>
+ </el-table-column>
<el-table-column prop="modifyBy" :label="$t('Modify
User')"></el-table-column>
<el-table-column :label="$t('Timing state')">
<template slot-scope="scope">
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 21ba3a7..8d59a96 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
@@ -32,7 +32,11 @@
<el-table-column prop="userName" :label="$t('Owned
Users')"></el-table-column>
<el-table-column prop="defCount" :label="$t('Process Define
Count')"></el-table-column>
<el-table-column prop="instRunningCount" :label="$t('Process Instance
Running Count')"></el-table-column>
- <el-table-column prop="description" :label="$t('Description')"
width="200"></el-table-column>
+ <el-table-column :label="$t('Description')" width="200">
+ <template slot-scope="scope">
+ <span>{{scope.row.description | filterNull}}</span>
+ </template>
+ </el-table-column>
<el-table-column :label="$t('Create Time')" min-width="120">
<template slot-scope="scope">
<span>{{scope.row.createTime | formatDate}}</span>
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 46021ee..7d38e93 100755
---
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
@@ -35,7 +35,11 @@
</template>
</el-table-column>
<el-table-column prop="fileName" :label="$t('File
Name')"></el-table-column>
- <el-table-column prop="description" :label="$t('Description')"
width="200"></el-table-column>
+ <el-table-column :label="$t('Description')" width="200">
+ <template slot-scope="scope">
+ <span>{{scope.row.description | filterNull}}</span>
+ </template>
+ </el-table-column>
<el-table-column :label="$t('Size')">
<template slot-scope="scope">
{{_rtSize(scope.row.size)}}
diff --git
a/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/subdirectory/_source/list.vue
b/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/subdirectory/_source/list.vue
index c7d739a..8e49503 100755
---
a/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/subdirectory/_source/list.vue
+++
b/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/subdirectory/_source/list.vue
@@ -35,7 +35,11 @@
</template>
</el-table-column>
<el-table-column prop="fileName" :label="$t('File
Name')"></el-table-column>
- <el-table-column prop="description" :label="$t('Description')"
width="200"></el-table-column>
+ <el-table-column :label="$t('Description')" width="200">
+ <template slot-scope="scope">
+ <span>{{scope.row.description | filterNull}}</span>
+ </template>
+ </el-table-column>
<el-table-column :label="$t('Size')">
<template slot-scope="scope">
{{_rtSize(scope.row.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 6a98f57..32bd691 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
@@ -31,7 +31,11 @@
</el-table-column>
<el-table-column prop="className" :label="$t('Class Name')"
min-width="120"></el-table-column>
<el-table-column prop="type" :label="$t('type')"></el-table-column>
- <el-table-column prop="description" :label="$t('Description')"
min-width="150"></el-table-column>
+ <el-table-column :label="$t('Description')" min-width="150">
+ <template slot-scope="scope">
+ <span>{{scope.row.description | filterNull}}</span>
+ </template>
+ </el-table-column>
<el-table-column prop="resourceName" :label="$t('Jar Package')"
min-width="150"></el-table-column>
<el-table-column :label="$t('Update Time')" min-width="120">
<template slot-scope="scope">
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 e56ae5d..78ea592 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
@@ -40,7 +40,11 @@
{{_rtSize(scope.row.size)}}
</template>
</el-table-column>
- <el-table-column prop="description" :label="$t('Description')"
width="200"></el-table-column>
+ <el-table-column :label="$t('Description')" width="200">
+ <template slot-scope="scope">
+ <span>{{scope.row.description | filterNull}}</span>
+ </template>
+ </el-table-column>
<el-table-column :label="$t('Create Time')" min-width="120">
<template slot-scope="scope">
<span>{{scope.row.createTime | formatDate}}</span>
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 51a04af..ae3bf2c 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
@@ -20,8 +20,11 @@
<el-table :data="list" size="mini" style="width: 100%">
<el-table-column type="index" :label="$t('#')"
width="50"></el-table-column>
<el-table-column prop="tenantCode" :label="$t('Tenant Code')"
min-width="100"></el-table-column>
- <el-table-column prop="tenantName" :label="$t('Tenant Name')"
min-width="100"></el-table-column>
- <el-table-column prop="description" :label="$t('Description')"
min-width="100"></el-table-column>
+ <el-table-column :label="$t('Description')" min-width="100">
+ <template slot-scope="scope">
+ <span>{{scope.row.description | filterNull}}</span>
+ </template>
+ </el-table-column>
<el-table-column prop="queueName" :label="$t('Queue')"
min-width="80"></el-table-column>
<el-table-column :label="$t('Create Time')" min-width="120">
<template slot-scope="scope">
diff --git
a/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/users/_source/list.vue
b/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/users/_source/list.vue
index 2808aac..36b798a 100644
---
a/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/users/_source/list.vue
+++
b/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/users/_source/list.vue
@@ -28,7 +28,11 @@
<el-table-column prop="tenantCode" :label="$t('Tenant')"
min-width="120"></el-table-column>
<el-table-column prop="queue" :label="$t('Queue')"
width="90"></el-table-column>
<el-table-column prop="email" :label="$t('Email')"
min-width="200"></el-table-column>
- <el-table-column prop="phone" :label="$t('Phone')"
width="100"></el-table-column>
+ <el-table-column prop="phone" :label="$t('Phone')" width="100">
+ <template slot-scope="scope">
+ <span>{{scope.row.phone | filterNull}}</span>
+ </template>
+ </el-table-column>
<el-table-column :label="$t('State')" width="60">
<template slot-scope="scope">
{{scope.row.state === 1 ? `${$t('Enable')}` : `${$t('Disable')}`}}
diff --git a/dolphinscheduler-ui/src/js/module/filter/filter.js
b/dolphinscheduler-ui/src/js/module/filter/filter.js
index 827b9e3..af97cb8 100644
--- a/dolphinscheduler-ui/src/js/module/filter/filter.js
+++ b/dolphinscheduler-ui/src/js/module/filter/filter.js
@@ -22,9 +22,23 @@ import dayjs from 'dayjs'
*/
const formatDate = (value, fmt) => {
fmt = fmt || 'YYYY-MM-DD HH:mm:ss'
- return dayjs(value).format(fmt)
+ if (value === null) {
+ return '-'
+ } else {
+ return dayjs(value).format(fmt)
+ }
+}
+/**
+ * filter null
+ */
+const filterNull = (value) => {
+ if (value === null || value === '') {
+ return '-'
+ } else {
+ return value
+ }
}
export {
- formatDate
+ formatDate, filterNull
}
diff --git a/dolphinscheduler-ui/src/js/module/filter/filter.js
b/dolphinscheduler-ui/src/js/module/filter/filterNull.js
similarity index 81%
copy from dolphinscheduler-ui/src/js/module/filter/filter.js
copy to dolphinscheduler-ui/src/js/module/filter/filterNull.js
index 827b9e3..b5d2759 100644
--- a/dolphinscheduler-ui/src/js/module/filter/filter.js
+++ b/dolphinscheduler-ui/src/js/module/filter/filterNull.js
@@ -15,16 +15,10 @@
* limitations under the License.
*/
-import dayjs from 'dayjs'
+import Vue from 'vue'
+import { filterNull } from './filter'
/**
- * Formatting time
+ * @param {String} fmt optional, define filter null
*/
-const formatDate = (value, fmt) => {
- fmt = fmt || 'YYYY-MM-DD HH:mm:ss'
- return dayjs(value).format(fmt)
-}
-
-export {
- formatDate
-}
+Vue.filter('filterNull', filterNull)
