wezone
/
Ry-master
10
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

!47 修复和优化前端 utils 工具函数 

Merge pull request !47 from FungLeo/master
This commit is contained in:
若依 2020-07-22 13:00:51 +08:00 committed by Gitee
parent 6a84ae42a5 a09a342f58
commit 133a10ecf2
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ruoyi-ui/src/utils/index.js
View File

@ -1,3 +1,5 @@
import { parseTime } from './ruoyi'
/** /**
* 表格时间格式化 * 表格时间格式化
*/ */
@ -385,4 +387,4 @@ export function camelCase(str) {
export function isNumberStr(str) { export function isNumberStr(str) {
return /^[+-]?(0|([1-9]\d*))(\.\d+)?$/g.test(str) return /^[+-]?(0|([1-9]\d*))(\.\d+)?$/g.test(str)
} }

6
ruoyi-ui/src/utils/ruoyi.js
View File

@ -68,10 +68,10 @@ export function addDateRange(params, dateRange) {
// 回显数据字典 // 回显数据字典
export function selectDictLabel(datas, value) { export function selectDictLabel(datas, value) {
var actions = []; var actions = [];
Object.keys(datas).map((key) => { Object.keys(datas).some((key) => {
if (datas[key].dictValue == ('' + value)) { if (datas[key].dictValue == ('' + value)) {
actions.push(datas[key].dictLabel); actions.push(datas[key].dictLabel);
return false; return true;
} }
}) })
return actions.join(''); return actions.join('');
@ -131,4 +131,4 @@ export function handleTree(data, id, parentId, children, rootId) {
}); });
return treeData != '' ? treeData : data; return treeData != '' ? treeData : data;
} }