Skip to content

Commit dc13934

Browse files
author
puhui999
committed
项目全局使用formatDate方法移除parseTime方法
1 parent 933c710 commit dc13934

File tree

10 files changed

+26
-125
lines changed

10 files changed

+26
-125
lines changed

‎src/components/bpmnProcessDesigner/package/designer/ProcessViewer.vue

Lines changed: 7 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -280,7 +280,7 @@ const elementHover = (element) => {
280280
if (element.value.type === 'bpmn:StartEvent' && processInstance.value) {
281281
html = `<p>发起人：${processInstance.value.startUser.nickname}</p>
282282
<p>部门：${processInstance.value.startUser.deptName}</p>
283-
<p>创建时间：${parseTime(processInstance.value.createTime)}`
283+
<p>创建时间：${formatDate(processInstance.value.createTime)}`
284284
} else if (element.value.type === 'bpmn:UserTask') {
285285
// debugger
286286
let task = taskList.value.find((m) => m.id === activity.taskId) // 找到活动对应的 taskId
@@ -297,26 +297,26 @@ const elementHover = (element) => {
297297
html = `<p>审批人：${task.assigneeUser.nickname}</p>
298298
<p>部门：${task.assigneeUser.deptName}</p>
299299
<p>结果：${dataResult}</p>
300-
<p>创建时间：${parseTime(task.createTime)}</p>`
300+
<p>创建时间：${formatDate(task.createTime)}</p>`
301301
// html = `<p>审批人：${task.assigneeUser.nickname}</p>
302302
// <p>部门：${task.assigneeUser.deptName}</p>
303303
// <p>结果：${getIntDictOptions(
304304
// DICT_TYPE.BPM_PROCESS_INSTANCE_RESULT,
305305
// task.result
306306
// )}</p>
307-
// <p>创建时间：${parseTime(task.createTime)}</p>`
307+
// <p>创建时间：${formatDate(task.createTime)}</p>`
308308
if (task.endTime) {
309-
html += `<p>结束时间：${parseTime(task.endTime)}</p>`
309+
html += `<p>结束时间：${formatDate(task.endTime)}</p>`
310310
}
311311
if (task.reason) {
312312
html += `<p>审批建议：${task.reason}</p>`
313313
}
314314
} else if (element.value.type === 'bpmn:ServiceTask' && processInstance.value) {
315315
if (activity.startTime > 0) {
316-
html = `<p>创建时间：${parseTime(activity.startTime)}</p>`
316+
html = `<p>创建时间：${formatDate(activity.startTime)}</p>`
317317
}
318318
if (activity.endTime > 0) {
319-
html += `<p>结束时间：${parseTime(activity.endTime)}</p>`
319+
html += `<p>结束时间：${formatDate(activity.endTime)}</p>`
320320
}
321321
console.log(html)
322322
} else if (element.value.type === 'bpmn:EndEvent' && processInstance.value) {
@@ -333,7 +333,7 @@ const elementHover = (element) => {
333333
// processInstance.value.result
334334
// )}</p>`
335335
if (processInstance.value.endTime) {
336-
html += `<p>结束时间：${parseTime(processInstance.value.endTime)}</p>`
336+
html += `<p>结束时间：${formatDate(processInstance.value.endTime)}</p>`
337337
}
338338
}
339339
console.log(html, 'html111111111111111')
@@ -348,50 +348,6 @@ const elementOut = (element) => {
348348
toRaw(overlays.value).remove({ element })
349349
elementOverlayIds.value[element.id] = null
350350
}
351-
const parseTime = (time) => {
352-
if (!time) {
353-
return null
354-
}
355-
const format = '{y}-{m}-{d} {h}:{i}:{s}'
356-
let date
357-
if (typeof time === 'object') {
358-
date = time
359-
} else {
360-
if (typeof time === 'string' && /^[0-9]+$/.test(time)) {
361-
time = parseInt(time)
362-
} else if (typeof time === 'string') {
363-
time = time
364-
.replace(new RegExp(/-/gm), '/')
365-
.replace('T', ' ')
366-
.replace(new RegExp(/\.[\d]{3}/gm), '')
367-
}
368-
if (typeof time === 'number' && time.toString().length === 10) {
369-
time = time * 1000
370-
}
371-
date = new Date(time)
372-
}
373-
const formatObj = {
374-
y: date.getFullYear(),
375-
m: date.getMonth() + 1,
376-
d: date.getDate(),
377-
h: date.getHours(),
378-
i: date.getMinutes(),
379-
s: date.getSeconds(),
380-
a: date.getDay()
381-
}
382-
const time_str = format.replace(/{(y|m|d|h|i|s|a)+}/g, (result, key) => {
383-
let value = formatObj[key]
384-
// Note: getDay() returns 0 on Sunday
385-
if (key === 'a') {
386-
return ['日', '一', '二', '三', '四', '五', '六'][value]
387-
}
388-
if (result.length > 0 && value < 10) {
389-
value = '0' + value
390-
}
391-
return value || 0
392-
})
393-
return time_str
394-
}
395351
396352
onMounted(() => {
397353
xml.value = props.value

‎src/layout/components/Message/src/Message.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<script setup lang="ts">
2-
import { parseTime } from '@/utils/formatTime'
2+
import { formatDate } from '@/utils/formatTime'
33
import * as NotifyMessageApi from '@/api/system/notify/message'
44
55
const { push } = useRouter()
@@ -57,7 +57,7 @@ onMounted(() => {
5757
{{ item.templateNickname }}：{{ item.templateContent }}
5858
</span>
5959
<span class="message-date">
60-
{{ parseTime(item.createTime) }}
60+
{{ formatDate(item.createTime) }}
6161
</span>
6262
</div>
6363
</div>

‎src/types/auto-components.d.ts

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ declare module '@vue/runtime-core' {
2323
DictTag: typeof import('./../components/DictTag/src/DictTag.vue')['default']
2424
Echart: typeof import('./../components/Echart/src/Echart.vue')['default']
2525
Editor: typeof import('./../components/Editor/src/Editor.vue')['default']
26-
ElAutoResizer: typeof import('element-plus/es')['ElAutoResizer']
2726
ElBadge: typeof import('element-plus/es')['ElBadge']
2827
ElButton: typeof import('element-plus/es')['ElButton']
2928
ElButtonGroup: typeof import('element-plus/es')['ElButtonGroup']
@@ -53,7 +52,6 @@ declare module '@vue/runtime-core' {
5352
ElForm: typeof import('element-plus/es')['ElForm']
5453
ElFormItem: typeof import('element-plus/es')['ElFormItem']
5554
ElIcon: typeof import('element-plus/es')['ElIcon']
56-
ElImage: typeof import('element-plus/es')['ElImage']
5755
ElImageViewer: typeof import('element-plus/es')['ElImageViewer']
5856
ElInput: typeof import('element-plus/es')['ElInput']
5957
ElInputNumber: typeof import('element-plus/es')['ElInputNumber']
@@ -62,7 +60,6 @@ declare module '@vue/runtime-core' {
6260
ElPagination: typeof import('element-plus/es')['ElPagination']
6361
ElPopover: typeof import('element-plus/es')['ElPopover']
6462
ElRadio: typeof import('element-plus/es')['ElRadio']
65-
ElRadioButton: typeof import('element-plus/es')['ElRadioButton']
6663
ElRadioGroup: typeof import('element-plus/es')['ElRadioGroup']
6764
ElRow: typeof import('element-plus/es')['ElRow']
6865
ElScrollbar: typeof import('element-plus/es')['ElScrollbar']
@@ -71,14 +68,10 @@ declare module '@vue/runtime-core' {
7168
ElSwitch: typeof import('element-plus/es')['ElSwitch']
7269
ElTable: typeof import('element-plus/es')['ElTable']
7370
ElTableColumn: typeof import('element-plus/es')['ElTableColumn']
74-
ElTableV2: typeof import('element-plus/es')['ElTableV2']
7571
ElTabPane: typeof import('element-plus/es')['ElTabPane']
7672
ElTabs: typeof import('element-plus/es')['ElTabs']
7773
ElTag: typeof import('element-plus/es')['ElTag']
78-
ElTimeline: typeof import('element-plus/es')['ElTimeline']
79-
ElTimelineItem: typeof import('element-plus/es')['ElTimelineItem']
8074
ElTooltip: typeof import('element-plus/es')['ElTooltip']
81-
ElTransfer: typeof import('element-plus/es')['ElTransfer']
8275
ElTree: typeof import('element-plus/es')['ElTree']
8376
ElTreeSelect: typeof import('element-plus/es')['ElTreeSelect']
8477
ElUpload: typeof import('element-plus/es')['ElUpload']

‎src/utils/formatTime.ts

Lines changed: 1 addition & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -23,53 +23,6 @@ export function formatDate(date: Date, format?: string): string {
2323
return dayjs(date).format(format)
2424
}
2525

26-
// TODO 芋艿：稍后去掉
27-
// 日期格式化
28-
export function parseTime(time: any, pattern?: string) {
29-
if (arguments.length === 0 || !time) {
30-
return null
31-
}
32-
const format = pattern || '{y}-{m}-{d} {h}:{i}:{s}'
33-
let date
34-
if (typeof time === 'object') {
35-
date = time
36-
} else {
37-
if (typeof time === 'string' && /^[0-9]+$/.test(time)) {
38-
time = parseInt(time)
39-
} else if (typeof time === 'string') {
40-
time = time
41-
.replace(new RegExp(/-/gm), '/')
42-
.replace('T', ' ')
43-
.replace(new RegExp(/\.\d{3}/gm), '')
44-
}
45-
if (typeof time === 'number' && time.toString().length === 10) {
46-
time = time * 1000
47-
}
48-
date = new Date(time)
49-
}
50-
const formatObj = {
51-
y: date.getFullYear(),
52-
m: date.getMonth() + 1,
53-
d: date.getDate(),
54-
h: date.getHours(),
55-
i: date.getMinutes(),
56-
s: date.getSeconds(),
57-
a: date.getDay()
58-
}
59-
const time_str = format.replace(/{([ymdhisa])+}/g, (result, key) => {
60-
let value = formatObj[key]
61-
// Note: getDay() returns 0 on Sunday
62-
if (key === 'a') {
63-
return ['日', '一', '二', '三', '四', '五', '六'][value]
64-
}
65-
if (result.length > 0 && value < 10) {
66-
value = '0' + value
67-
}
68-
return value || 0
69-
})
70-
return time_str
71-
}
72-
7326
/**
7427
* 获取当前日期是第几周
7528
* @param dateTime 当前传入的日期值
@@ -87,8 +40,7 @@ export function getWeek(dateTime: Date): number {
8740
if (dayOfWeek != 0) spendDay = 7 - dayOfWeek + 1
8841
firstDay = new Date(temptTime.getFullYear(), 0, 1 + spendDay)
8942
const d = Math.ceil((temptTime.valueOf() - firstDay.valueOf()) / 86400000)
90-
const result = Math.ceil(d / 7)
91-
return result
43+
return Math.ceil(d / 7)
9244
}
9345

9446
/**

‎src/views/Profile/components/ProfileUser.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,13 +34,13 @@
3434
</li>
3535
<li class="list-group-item">
3636
<Icon icon="ep:calendar" class="mr-5px" />{{ t('profile.user.createTime') }}
37-
<div class="pull-right">{{ parseTime(userInfo?.createTime) }}</div>
37+
<div class="pull-right">{{ formatDate(userInfo?.createTime) }}</div>
3838
</li>
3939
</ul>
4040
</div>
4141
</template>
4242
<script setup lang="ts">
43-
import { parseTime } from '@/utils/formatTime'
43+
import { formatDate } from '@/utils/formatTime'
4444
import UserAvatar from './UserAvatar.vue'
4545
4646
import { getUserProfileApi, ProfileVO } from '@/api/system/user/profile'

‎src/views/bpm/processInstance/detail/ProcessInstanceTaskList.vue

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,13 @@
2020
</label>
2121
<label style="font-weight: normal" v-if="item.createTime">创建时间：</label>
2222
<label style="color: #8a909c; font-weight: normal">
23-
{{ parseTime(item?.createTime) }}
23+
{{ formatDate(item?.createTime) }}
2424
</label>
2525
<label v-if="item.endTime" style="margin-left: 30px; font-weight: normal">
2626
审批时间：
2727
</label>
2828
<label v-if="item.endTime" style="color: #8a909c; font-weight: normal">
29-
{{ parseTime(item?.endTime) }}
29+
{{ formatDate(item?.endTime) }}
3030
</label>
3131
<label v-if="item.durationInMillis" style="margin-left: 30px; font-weight: normal">
3232
耗时：
@@ -45,7 +45,7 @@
4545
</el-card>
4646
</template>
4747
<script setup lang="ts">
48-
import { parseTime, formatPast2 } from '@/utils/formatTime'
48+
import { formatDate, formatPast2 } from '@/utils/formatTime'
4949
import { propTypes } from '@/utils/propTypes'
5050
5151
defineProps({

‎src/views/infra/webSocket/index.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
<li v-for="item in getList" class="mt-2" :key="item.time">
4545
<div class="flex items-center">
4646
<span class="mr-2 text-primary font-medium">收到消息:</span>
47-
<span>{{ parseTime(item.time) }}</span>
47+
<span>{{ formatDate(item.time) }}</span>
4848
</div>
4949
<div>
5050
{{ item.res }}
@@ -56,7 +56,7 @@
5656
</div>
5757
</template>
5858
<script setup lang="ts">
59-
import { parseTime } from '@/utils/formatTime'
59+
import { formatDate } from '@/utils/formatTime'
6060
import { useUserStore } from '@/store/modules/user'
6161
import { useWebSocket } from '@vueuse/core'
6262

‎src/views/mp/components/wx-material-select/main.vue

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
</el-table-column>
4242
<el-table-column label="上传时间" align="center" prop="createTime" width="180">
4343
<template #default="scope">
44-
<span>{{ parseTime(scope.row.createTime) }}</span>
44+
<span>{{ formatDate(scope.row.createTime) }}</span>
4545
</template>
4646
</el-table-column>
4747
<el-table-column
@@ -80,7 +80,7 @@
8080
</el-table-column>
8181
<el-table-column label="上传时间" align="center" prop="createTime" width="180">
8282
<template #default="scope">
83-
<span>{{ parseTime(scope.row.createTime) }}</span>
83+
<span>{{ formatDate(scope.row.createTime) }}</span>
8484
</template>
8585
</el-table-column>
8686
<el-table-column
@@ -136,7 +136,7 @@ import WxVideoPlayer from '@/views/mp/components/wx-video-play/main.vue'
136136
import { getMaterialPage } from '@/api/mp/material'
137137
import { getFreePublishPage } from '@/api/mp/freePublish'
138138
import { getDraftPage } from '@/api/mp/draft'
139-
import { dateFormatter, parseTime } from '@/utils/formatTime'
139+
import { dateFormatter, formatDate } from '@/utils/formatTime'
140140
import { defineComponent, PropType } from 'vue'
141141
142142
export default defineComponent({
@@ -238,7 +238,7 @@ export default defineComponent({
238238
selectMaterialFun,
239239
getMaterialPageFun,
240240
getPage,
241-
parseTime,
241+
formatDate,
242242
newsTypeRef,
243243
queryParams,
244244
objDataRef,

‎src/views/mp/components/wx-msg/main.vue

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
</div>
3333
<div class="avue-comment__main">
3434
<div class="avue-comment__header">
35-
<div class="avue-comment__create_time">{{ parseTime(item.createTime) }}</div>
35+
<div class="avue-comment__create_time">{{ formatDate(item.createTime) }}</div>
3636
</div>
3737
<div
3838
class="avue-comment__body"
@@ -145,7 +145,7 @@ import { defineComponent } from 'vue'
145145
const message = useMessage() // 消息弹窗
146146
import profile from '@/assets/imgs/profile.jpg'
147147
import wechat from '@/assets/imgs/wechat.png'
148-
import { parseTime } from '@/utils/formatTime'
148+
import { formatDate } from '@/utils/formatTime'
149149
150150
export default defineComponent({
151151
components: {
@@ -286,7 +286,7 @@ export default defineComponent({
286286
return {
287287
sendMsg,
288288
loadingMore,
289-
parseTime,
289+
formatDate,
290290
scrollToBottom,
291291
objData,
292292
mp,

‎src/views/system/notify/my/MyNotifyMessageDetail.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
{{ detailData.templateNickname }}
66
</el-descriptions-item>
77
<el-descriptions-item label="发送时间">
8-
{{ formatDate(detailData.createTime, 'YYYY-MM-DD HH:mm:ss') }}
8+
{{ formatDate(detailData.createTime) }}
99
</el-descriptions-item>
1010
<el-descriptions-item label="消息类型">
1111
<dict-tag :type="DICT_TYPE.SYSTEM_NOTIFY_TEMPLATE_TYPE" :value="detailData.templateType" />
@@ -14,7 +14,7 @@
1414
<dict-tag :type="DICT_TYPE.INFRA_BOOLEAN_STRING" :value="detailData.readStatus" />
1515
</el-descriptions-item>
1616
<el-descriptions-item label="阅读时间" v-if="detailData.readStatus">
17-
{{ formatDate(detailData.readTime, 'YYYY-MM-DD HH:mm:ss') }}
17+
{{ formatDate(detailData.readTime) }}
1818
</el-descriptions-item>
1919
<el-descriptions-item label="内容">
2020
{{ detailData.templateContent }}

0 commit comments

Comments
 (0)