Parcourir la source

feat: 新增dayjs format函数

lanjianrong il y a 5 ans
Parent
commit
df585b47e1

+ 1 - 0
package.json

@@ -53,6 +53,7 @@
     "@umijs/route-utils": "^1.0.33",
     "antd": "^4.8.0",
     "classnames": "^2.2.6",
+    "dayjs": "^1.10.4",
     "lodash": "^4.17.11",
     "moment": "^2.25.3",
     "omit.js": "^2.0.2",

+ 2 - 1
src/components/PopContent/Contacts/ContanctLowerList.jsx

@@ -2,6 +2,7 @@ import { Tabs, Table, List } from 'antd'
 import React, { useEffect } from 'react'
 import { connect } from 'umi'
 import useAutoTable from '@/hooks/useAutoTable'
+import { dayjsFormat } from '@/utils/utils'
 
 const ContanctLowerList = props => {
   const { log, servicelistName,collapsed } = props
@@ -64,7 +65,7 @@ const ContanctLowerList = props => {
                     <List.Item.Meta
                       // avatar=
                       title={item.operation}
-                      description={item.date}
+                      description={ dayjsFormat(item.createTime, 'YYYY-MM-DD')}
                     />
                   </List.Item>
                 )}

+ 3 - 4
src/components/PopContent/Contacts/index.jsx

@@ -19,17 +19,16 @@ const Popcontent = props => {
   const [clientWidth, setClientWidth] = useState(document.body.clientWidth * 0.75)
   const [state, setState] = useState({
     client: {},
-    log:[],
-    log: []
+    log:[]
   })
 
   const initData = async () => {
     const {
-      data: { client = {},log={} },
+      data: { client = {},log = [] },
       code = -1
     } = await apiContactDetail(id)
     if (code === consts.RET_CODE.SUCCESS) {
-      setState({ ...state, client,log })
+      setState({ ...state, client, log })
     }
   }
   useEffect(() => {

+ 10 - 0
src/utils/utils.js

@@ -1,4 +1,5 @@
 import { parse } from 'querystring'
+import dayjs from 'dayjs'
 /* eslint no-useless-escape:0 import/prefer-default-export:0 */
 
 const reg = /(((^https?:(?:\/\/)?)(?:[-;:&=\+\$,\w]+@)?[A-Za-z0-9.-]+(?::\d+)?|(?:www.|[-;:&=\+\$,\w]+@)[A-Za-z0-9.-]+)((?:\/[\+~%\/.\w-_]*)?\??(?:[-\+=&;%@.\w_]*)#?(?:[\w]*))?)$/
@@ -21,3 +22,12 @@ export const isAntDesignProOrDev = () => {
   return isAntDesignPro()
 }
 export const getPageQuery = () => parse(window.location.href.split('?')[1])
+
+/**
+ * 日期格式化
+ * @param format - 格式
+ */
+export const dayjsFormat = (date, format = 'YYYY-MM-DD HH:mm:ss') => {
+  if (date === "0001-01-01 00:00:00" || !date) return ''
+  return dayjs(date).format(format)
+}