diff --git a/src/components/CronTab/components/Crontab-Result.vue b/src/components/CronTab/components/Crontab-Result.vue index 768dae35d..5a059d2bc 100644 --- a/src/components/CronTab/components/Crontab-Result.vue +++ b/src/components/CronTab/components/Crontab-Result.vue @@ -13,7 +13,7 @@ diff --git a/src/components/DetailCard/index.vue b/src/components/DetailCard/index.vue index 26b60441d..246f18172 100644 --- a/src/components/DetailCard/index.vue +++ b/src/components/DetailCard/index.vue @@ -2,7 +2,7 @@ - + @@ -60,6 +60,10 @@ export default { font-size: 13px; } } + + .item-value span { + word-break: break-word; + } .content { font-size: 13px; line-height: 2.5; diff --git a/src/filters/datetime.js b/src/filters/datetime.js index e5e7b1569..aff113cc7 100644 --- a/src/filters/datetime.js +++ b/src/filters/datetime.js @@ -1,7 +1,7 @@ import Vue from 'vue' -import moment from 'moment' +import { toSafeLocalDateStr } from '@/utils/common' Vue.filter('date', function(value) { - return moment(value, 'YYYY-MM-DD HH:mm:ss').format('YYYY-MM-DD HH:mm:ss') + return toSafeLocalDateStr(value) }) diff --git a/src/i18n/langs/en.json b/src/i18n/langs/en.json index 3ca213622..688ae8944 100644 --- a/src/i18n/langs/en.json +++ b/src/i18n/langs/en.json @@ -440,7 +440,7 @@ "dateCreated": "Date created", "dateFinished": "Date finished", "dateExpired": "Date expired", - "dateStart": "Date start", + "DateStart": "Date start", "deleteErrorMsg": "Delete failed", "deleteFailedMsg": "Delete failed", "deleteSelected": "Delete selected", @@ -612,7 +612,7 @@ "become": "Become", "contents": "Contents", "date": "Date", - "dateStart": "Date start", + "DateStart": "Date start", "datetime": "Datetime", "detail": "Detail", "execution": "Execution", @@ -693,7 +693,7 @@ "connect": "Connect", "databaseApp": "DatabaseApp", "KubernetesApp": "KubernetesApp", - "dateStart": "Date start", + "DateStart": "Date start", "downloadFile": "Download file", "hostName": "Hostname", "isValid": "Validity", @@ -911,7 +911,7 @@ "date": "Datetime", "dateCreated": "Date created", "dateEnd": "Date end", - "dateStart": "Date start", + "DateStart": "Date start", "docType": "Doc type", "download": "download", "downloadReplay": "Download replay", diff --git a/src/i18n/langs/ja.json b/src/i18n/langs/ja.json index 39c56ab6b..cf4694c59 100644 --- a/src/i18n/langs/ja.json +++ b/src/i18n/langs/ja.json @@ -449,7 +449,7 @@ "dateCreated": "作成日", "dateExpired": "失効日", "dateFinished": "完了日", - "dateStart": "開始日", + "DateStart": "開始日", "deleteErrorMsg": "削除に失敗しました", "deleteFailedMsg": "削除に失敗しました", "deleteSelected": "削除選択した", @@ -623,7 +623,7 @@ "become": "になる", "contents": "コンテンツ", "date": "日付", - "dateStart": "開始日", + "DateStart": "開始日", "datetime": "日付", "detail": "詳細", "execution": "実行履歴", @@ -699,7 +699,7 @@ "connect": "接続", "databaseApp": "データベースアプリケーション", "KubernetesApp": "Kubernetes", - "dateStart": "開始日", + "DateStart": "開始日", "downloadFile": "ファイルのダウンロード", "hostName": "ホスト名", "isValid": "有効", @@ -926,7 +926,7 @@ "date": "日付", "dateCreated": "作成日", "dateEnd": "終了日", - "dateStart": "開始日", + "DateStart": "開始日", "docType": "ドキュメントタイプ", "download": "ダウンロード", "downloadReplay": "ビデオをダウンロードする", diff --git a/src/i18n/langs/zh.json b/src/i18n/langs/zh.json index a5a37c62c..2b0aacbc6 100644 --- a/src/i18n/langs/zh.json +++ b/src/i18n/langs/zh.json @@ -469,7 +469,7 @@ "dateCreated": "创建日期", "dateExpired": "失效日期", "dateFinished": "完成日期", - "dateStart": "开始日期", + "DateStart": "开始日期", "deleteErrorMsg": "删除失败", "deleteFailedMsg": "删除失败", "deleteSelected": "删除所选", @@ -643,7 +643,7 @@ "become": "Become", "contents": "内容", "date": "日期", - "dateStart": "开始日期", + "DateStart": "开始日期", "datetime": "日期", "detail": "详情", "execution": "执行历史", @@ -720,7 +720,7 @@ "connect": "连接", "databaseApp": "数据库应用", "KubernetesApp": "Kubernetes", - "dateStart": "开始日期", + "DateStart": "开始日期", "downloadFile": "下载文件", "hostName": "主机名", "isValid": "有效", @@ -968,7 +968,7 @@ "date": "日期", "dateCreated": "创建日期", "dateEnd": "结束日期", - "dateStart": "开始日期", + "DateStart": "开始日期", "docType": "文档类型", "download": "下载", "downloadReplay": "下载录像", diff --git a/src/utils/common.js b/src/utils/common.js index 3fe204cef..fbad4c6af 100644 --- a/src/utils/common.js +++ b/src/utils/common.js @@ -76,21 +76,20 @@ function cleanDateStr(d) { } export function toSafeLocalDateStr(d) { - if (d === '' || d === null) { - return '' + if ([null, undefined, ''].includes(d)) { + return '-' } const date = safeDate(d) - // const date_s = date.toLocaleString(getUserLang(), { hourCycle: 'h23' }) - const date_s = - date.toLocaleDateString(getUserLang(), { hourCycle: 'h23' }) + - ' ' + - date.toLocaleTimeString(getUserLang(), { hourCycle: 'h23' }) - return date_s + return moment(date).format('L LTS') } export function forMatAction(vm, d) { d.forEach(function(item, index, arr) { - if ([vm.$t('perms.clipboardCopyPaste'), vm.$t('perms.upDownload'), vm.$t('perms.all')].includes(item)) { + if ([ + vm.$t('perms.clipboardCopyPaste'), + vm.$t('perms.upDownload'), + vm.$t('perms.all') + ].includes(item)) { arr.splice(index, 1) } }) diff --git a/src/views/applications/DatabaseApp/DatabaseAppDetail/DatabaseAppDetail.vue b/src/views/applications/DatabaseApp/DatabaseAppDetail/DatabaseAppDetail.vue index 42ca85300..134fb2259 100644 --- a/src/views/applications/DatabaseApp/DatabaseAppDetail/DatabaseAppDetail.vue +++ b/src/views/applications/DatabaseApp/DatabaseAppDetail/DatabaseAppDetail.vue @@ -48,7 +48,7 @@ export default { value: this.object.attrs.database }, { - key: this.$t('common.dateCreated'), + key: this.$t('common.DateCreated'), value: toSafeLocalDateStr(this.object.date_created) }, { diff --git a/src/views/applications/KubernetesApp/KubernetesAppDetail/KubernetesAppDetail.vue b/src/views/applications/KubernetesApp/KubernetesAppDetail/KubernetesAppDetail.vue index 470c3ab19..b0fcf357b 100644 --- a/src/views/applications/KubernetesApp/KubernetesAppDetail/KubernetesAppDetail.vue +++ b/src/views/applications/KubernetesApp/KubernetesAppDetail/KubernetesAppDetail.vue @@ -39,7 +39,7 @@ export default { value: this.object.attrs.cluster }, { - key: this.$t('common.dateCreated'), + key: this.$t('common.DateCreated'), value: toSafeLocalDateStr(this.object.date_created) }, { diff --git a/src/views/applications/RemoteApp/RemoteAppDetail/RemoteAppDetail.vue b/src/views/applications/RemoteApp/RemoteAppDetail/RemoteAppDetail.vue index 91dd0a29c..6d21f1117 100644 --- a/src/views/applications/RemoteApp/RemoteAppDetail/RemoteAppDetail.vue +++ b/src/views/applications/RemoteApp/RemoteAppDetail/RemoteAppDetail.vue @@ -44,7 +44,7 @@ export default { value: this.object.attrs.path }, { - key: this.$t('common.dateCreated'), + key: this.$t('common.DateCreated'), value: toSafeLocalDateStr(this.object.date_created) }, { diff --git a/src/views/assets/Cloud/Account/AccountDetail/AccountDetail.vue b/src/views/assets/Cloud/Account/AccountDetail/AccountDetail.vue index d747ddbc6..13a4abaeb 100644 --- a/src/views/assets/Cloud/Account/AccountDetail/AccountDetail.vue +++ b/src/views/assets/Cloud/Account/AccountDetail/AccountDetail.vue @@ -44,7 +44,7 @@ export default { value: this.object.comment }, { - key: this.$t('common.dateCreated'), + key: this.$t('common.DateCreated'), value: toSafeLocalDateStr(this.object.date_created) }, { diff --git a/src/views/myassets/index.vue b/src/views/myassets/index.vue index 9bc7c67db..5de531be8 100644 --- a/src/views/myassets/index.vue +++ b/src/views/myassets/index.vue @@ -39,9 +39,9 @@ export default { tableConfig: { url: '/api/v1/perms/users/assets/', hasTree: true, - columns: ['name', 'address', 'platform', 'category', 'type', 'comment', 'actions'], + columns: ['name', 'address', 'platform', 'category', 'accounts', 'type', 'comment', 'actions'], columnsShow: { - default: ['name', 'address', 'platform', 'actions'], + default: ['name', 'address', 'platform', 'accounts', 'actions'], min: ['name', 'address', 'actions'] }, columnsMeta: { diff --git a/src/views/myhome/components/User.vue b/src/views/myhome/components/User.vue index 1269e8cb1..df2b79e02 100644 --- a/src/views/myhome/components/User.vue +++ b/src/views/myhome/components/User.vue @@ -14,7 +14,7 @@
  • {{ $t('users.Email') }}{{ users.email }}
  • {{ $t('audits.LoginDate') }}: - {{ $moment(users.last_login, 'YYYY-MM-DD HH:mm:ss').format('YYYY-MM-DD HH:mm:ss') }} + {{ users.last_login | date }}
  • diff --git a/src/views/perms/AssetPermission/AssetPermissionCreateUpdate.vue b/src/views/perms/AssetPermission/AssetPermissionCreateUpdate.vue index 60959ab11..9975eb207 100644 --- a/src/views/perms/AssetPermission/AssetPermissionCreateUpdate.vue +++ b/src/views/perms/AssetPermission/AssetPermissionCreateUpdate.vue @@ -96,7 +96,7 @@ export default { helpText: this.$t('common.actionsTips') }, date_start: { - label: this.$t('common.dateStart') + label: this.$t('common.DateStart') }, date_expired: { label: this.$t('common.dateExpired') diff --git a/src/views/perms/AssetPermission/AssetPermissionDetail/AssetPermissionDetail.vue b/src/views/perms/AssetPermission/AssetPermissionDetail/AssetPermissionDetail.vue index 7adae44ca..f7c38eca1 100644 --- a/src/views/perms/AssetPermission/AssetPermissionDetail/AssetPermissionDetail.vue +++ b/src/views/perms/AssetPermission/AssetPermissionDetail/AssetPermissionDetail.vue @@ -12,7 +12,6 @@