Skip to content

Commit c14eabc

Browse files
committed
fix error log func
1 parent 5203703 commit c14eabc

11 files changed

Lines changed: 90 additions & 190 deletions

File tree

README-zh_CN.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ github 地址: https://github.com/jzfai/react-admin-template.git
4545
框架有js,ts和plus版本
4646

4747
- react js版本: [react-admin-template](https://github.com/jzfai/react-admin-template.git)
48-
- react ts版本: [react-admin-template](https://github.com/jzfai/react-admin-ts.git)
48+
- react ts版本: [react-admin-ts](https://github.com/jzfai/react-admin-ts.git)
4949
- vue3 js版本:[vue3-element-admin](https://github.com/jzfai/vue3-admin-template.git)
5050
- vue3 ts版本:[vue3-element-ts](https://github.com/jzfai/vue3-admin-ts.git)
5151
- vue3 plus版本:[vue3-element-plus](https://github.com/jzfai/vue3-admin-plus.git)

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ github 地址: https://github.com/jzfai/react-admin-template.git
3939

4040
The framework is available in js, ts and plus versions
4141
- react js version: [react-admin-template](https://github.com/jzfai/react-admin-template.git)
42-
- react ts version: [react-admin-template](https://github.com/jzfai/react-admin-ts.git)
42+
- react ts version: [react-admin-ts](https://github.com/jzfai/react-admin-ts.git)
4343
- vue3 js version:[vue3-element-admin](https://github.com/jzfai/vue3-admin-template.git)
4444
- vue3 ts version:[vue3-element-ts](https://github.com/jzfai/vue3-admin-ts.git)
4545
- vue3 plus version:[vue3-element-plus](https://github.com/jzfai/vue3-admin-plus.git)

src/hooks/reactHookTemplate.jsx

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
//template of react hooks can used for vscode or webstorm development template
2+
3+
// eslint-disable-next-line no-use-before-define
4+
import React from 'react'
5+
import { connect } from 'react-redux'
6+
import { useSelector, useDispatch } from 'react-redux'
7+
import store from '@/store'
8+
function ReactHookTemplate(props) {
9+
const [uState, setState] = React.useState({ count: 111 })
10+
//redux相关
11+
// const countNum = useSelector((state:StateTy) => state.user)
12+
// const dispatch = useDispatch()
13+
// function testChangeState() {
14+
// setState({
15+
// ...uState,
16+
// count: uState.count + 1000
17+
// })
18+
// }
19+
const testStore = () => {
20+
// console.log("修改了store", store.getState());
21+
//dispatch({type: "R_countNum", data: countNum+1000})
22+
// store.dispatch({ type: 'R_countNum', data: countNum + 1000 })
23+
//this.props.A_countNum(30000);
24+
}
25+
26+
// React.useEffect(() => {
27+
// //like ComponentDidMount
28+
// return (state: ObjTy) => {
29+
// //like ComponentUnMount
30+
// console.log(state)
31+
// }
32+
// }, [])
33+
return <div>{props.name}</div>
34+
}
35+
36+
//配置使用redux
37+
export default connect((state) => ({
38+
name: state.user.name
39+
}))(ReactHookTemplate)

src/hooks/testHooks.jsx

Lines changed: 0 additions & 42 deletions
This file was deleted.

src/layout/components/Sidebar/Logo.jsx

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,10 @@ import { connect } from 'react-redux'
55
import { CSSTransition, SwitchTransition } from 'react-transition-group'
66
/*引入本页样式*/
77
import './Logo.scss'
8+
import settings from '@/settings'
89
function Logo(props) {
9-
let title = 'react admin template'
10-
let logo = 'http://8.135.1.141/file/images/logo.svg'
10+
let title = settings.title
11+
let logo = settings.logo
1112
const renderImageTitle = () => {
1213
if (props.opened) {
1314
return (

src/layout/components/Sidebar/Logo.scss

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@
99
& .sidebar-logo-link {
1010
height: 100%;
1111
width: 100%;
12+
text-align: left;
13+
padding-left: 10px;
1214
& .sidebar-logo {
1315
width: 32px;
1416
height: 32px;

src/layout/components/Sidebar/Sidebar.jsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,12 @@ import React, { Fragment } from 'react'
44
import { connect } from 'react-redux'
55
import Logo from '@/layout/components/Sidebar/Logo'
66
import MenuItem from '@/layout/components/Sidebar/MenuItem'
7+
import settings from '@/settings'
78
function Sidebar() {
89
return (
910
<Fragment>
1011
{/*logo*/}
11-
<Logo />
12+
{settings.sidebarLogo && <Logo />}
1213
<MenuItem />
1314
</Fragment>
1415
)

src/settings.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
const setting = {
22
title: 'React Admin Template',
3+
logo: 'http://8.135.1.141/file/images/logo.svg',
34
/**
45
* @type {boolean} true | false
56
* @description Whether fix the header
@@ -60,7 +61,7 @@ const setting = {
6061
* The default is only used in the production env
6162
* If you want to also use it in dev, you can pass ['build', 'serve']
6263
*/
63-
errorLog: ['serve', 'build']
64+
errorLog: ['build']
6465
}
6566

6667
export default setting

src/utils/antUtils.js

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,15 @@
1-
import Modal from 'antd/es/modal/Modal'
1+
import { Modal } from 'antd'
22
export default {
33
antConfirm(content) {
4-
//prod has error
54
return new Promise((resolve) => {
65
Modal.confirm({
76
title: '删除',
87
content: content,
98
okText: '是',
10-
okType: 'warning',
9+
okType: 'danger',
1110
cancelText: '否',
1211
onOk: () => {
13-
resolve()
12+
resolve('')
1413
},
1514
onCancel() {
1615
console.log('Cancel')

src/utils/commonUtil.js

Lines changed: 2 additions & 116 deletions
Original file line numberDiff line numberDiff line change
@@ -1,118 +1,4 @@
11
export default {
2-
/* 时间日期*/
3-
/**
4-
* 获取星期几
5-
* @param date 日期字符串
6-
* return {String}
7-
*/
8-
dayFormat(date) {
9-
switch (new Date(date).getDay()) {
10-
case 0:
11-
return '星期日'
12-
case 1:
13-
return '星期一'
14-
case 2:
15-
return '星期二'
16-
case 3:
17-
return '星期三'
18-
case 4:
19-
return '星期四'
20-
case 5:
21-
return '星期五'
22-
case 6:
23-
return '星期六'
24-
}
25-
},
26-
/* today 是今天的时间戳(new Date().getTime()) */
27-
minStartDate(today, day) {
28-
const dayDiff = day * 24 * 60 * 60 * 1000 // day(多少天)的时间戳
29-
const minStartTime = today - dayDiff
30-
// dateTimeFormatter是第一个时间类的方法
31-
return this.dateTimeFormatter(minStartTime, 'yyyy-MM-dd')
32-
},
33-
/* 获取两个日期相差天数
34-
* */
35-
dateDiff(sDate1, sDate2) {
36-
var arrDate, objDate1, objDate2, iDays
37-
arrDate = sDate1.split('-')
38-
objDate1 = new Date(arrDate[1] + '/' + arrDate[2] + '/' + arrDate[0])
39-
arrDate = sDate2.split('-')
40-
objDate2 = new Date(arrDate[1] + '/' + arrDate[2] + '/' + arrDate[0])
41-
iDays = parseInt(Math.abs(objDate1 - objDate2) / 1000 / 60 / 60 / 24) // 相差毫秒数转成天数
42-
return iDays
43-
},
44-
/*
45-
* 获得今天周几
46-
* */
47-
getWeek() {
48-
return '星期' + '日一二三四五六'.charAt(new Date().getDay())
49-
// this.showDate=this.$momentMini(new Date()).format('YYYY年MM月DD日,')+str
50-
},
51-
/* 表单验证*/
52-
// 匹配手机
53-
mobilePhone(str) {
54-
const reg = /^0?1[0-9]{10}$/
55-
return reg.test(str)
56-
},
57-
/*
58-
* 传入一串num四个 一个空格
59-
* */
60-
toSplitNumFor(num, numToSpace) {
61-
return num.replace(/(.{4})/g, '$1 ')
62-
},
63-
// 匹配银行卡号
64-
bankCardNo(str) {
65-
const reg = /^\d{15,20}$/
66-
return reg.test(str)
67-
},
68-
// 邮箱
69-
regEmail(str) {
70-
const reg = /^([a-zA-Z]|[0-9])(\w|\-)+@[a-zA-Z0-9]+\.([a-zA-Z]{2,4})$/
71-
return reg.test(str)
72-
},
73-
// 省份证
74-
idCardNumber(str) {
75-
const reg = /(^\d{15}$)|(^\d{18}$)|(^\d{17}(\d|X|x)$)/
76-
return reg.test(str)
77-
},
78-
/* 价格精度转换*/
79-
// 乘法
80-
mul(arg1, arg2) {
81-
const r1 = arg1.toString()
82-
const r2 = arg2.toString()
83-
let m
84-
let resultVal
85-
const d = arguments[2]
86-
m = (r1.split('.')[1] ? r1.split('.')[1].length : 0) + (r2.split('.')[1] ? r2.split('.')[1].length : 0)
87-
resultVal = (Number(r1.replace('.', '')) * Number(r2.replace('.', ''))) / Math.pow(10, m)
88-
return typeof d !== 'number' ? Number(resultVal) : Number(resultVal.toFixed(parseInt(d)))
89-
},
90-
div: function (arg1, arg2) {
91-
const r1 = arg1.toString()
92-
const r2 = arg2.toString()
93-
let m
94-
let resultVal
95-
const d = arguments[2] || 2
96-
m = (r2.split('.')[1] ? r2.split('.')[1].length : 0) - (r1.split('.')[1] ? r1.split('.')[1].length : 0)
97-
resultVal = (Number(r1.replace('.', '')) / Number(r2.replace('.', ''))) * Math.pow(10, m)
98-
return typeof d !== 'number' ? Number(resultVal) : Number(resultVal.toFixed(parseInt(d)))
99-
},
100-
add: function (arg1, arg2) {
101-
arg1 = arg1.toString()
102-
arg2 = arg2.toString()
103-
const arg1Arr = arg1.split('.')
104-
const arg2Arr = arg2.split('.')
105-
const d1 = arg1Arr.length === 2 ? arg1Arr[1] : ''
106-
const d2 = arg2Arr.length === 2 ? arg2Arr[1] : ''
107-
const maxLen = Math.max(d1.length, d2.length)
108-
const m = Math.pow(10, maxLen)
109-
const result = Number(((arg1 * m + arg2 * m) / m).toFixed(maxLen))
110-
const d = arguments[2]
111-
return typeof d === 'number' ? Number(result.toFixed(d)) : result
112-
},
113-
sub: function (arg1, arg2) {
114-
return this.add(arg1, -Number(arg2), arguments[2])
115-
},
1162
/* 常用数组操作*/
1173
/*
1184
* 删除数组中的指定元素
@@ -186,7 +72,7 @@ export default {
18672
* return: arrObj查找 过后的数组
18773
* */
18874
findArrObjByKey(arrObj, objKey, value) {
189-
return arrObj[arrObj.findIndex((item) => item[objKey] == value)]
75+
return arrObj[arrObj.findIndex((item) => item[objKey] === value)]
19076
},
19177
/*
19278
* 根据arrObj 筛选arrObj2 根据arrObj objKey值查找
@@ -195,7 +81,7 @@ export default {
19581
* objKey: arrObj中对象的某一个key名称
19682
* return: arrObj2删除过后的数组
19783
* */
198-
byArrObjFindArrObj2(arrObj, arrObj2, objKey, value) {
84+
byArrObjFindArrObj2(arrObj, arrObj2, objKey) {
19985
let arrObj3 = []
20086
arrObj
20187
.map((value) => {

0 commit comments

Comments
 (0)