Song/xkrs_ms
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Pre Merge pull request !56 from FungLeo/master

Browse Source
This commit is contained in:
FungLeo 2020-08-04 14:43:39 +08:00 committed by Gitee
commit e6e7ce2457
1 changed files with 21 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -54,15 +54,12 @@ export function resetForm(refName) {
} }
// 添加日期范围 // 添加日期范围
export function addDateRange(params, dateRange) { export function addDateRange (params = {}, dateRange) {
var search = params; if (dateRange != null && dateRange !== '') {
search.beginTime = ""; params.beginTime = this.dateRange[0]
search.endTime = ""; params.endTime = this.dateRange[1]
if (null != dateRange && '' != dateRange) { }
search.beginTime = this.dateRange[0]; return params
search.endTime = this.dateRange[1];
}
return search;
} }
// 回显数据字典 // 回显数据字典
@ -78,18 +75,17 @@ export function selectDictLabel(datas, value) {
} }
// 回显数据字典（字符串数组） // 回显数据字典（字符串数组）
export function selectDictLabels(datas, value, separator) { export function selectDictLabels (datas = {}, value = '', separator = ',') {
var actions = []; const actions = []
var currentSeparator = undefined === separator ? "," : separator; const temp = value.split(separator)
var temp = value.split(currentSeparator); temp.forEach((_, index) => {
Object.keys(value.split(currentSeparator)).some((val) => { Object.keys(datas).forEach(key => {
Object.keys(datas).some((key) => { if (datas[key].dictValue === temp[index].toString()) {
if (datas[key].dictValue == ('' + temp[val])) { actions.push(datas[key].dictLabel)
actions.push(datas[key].dictLabel + currentSeparator); }
} })
}) })
}) return actions.join(separator)
return actions.join('').substring(0, actions.join('').length - 1);
} }
// 通用下载方法 // 通用下载方法
@ -127,23 +123,19 @@ export function praseStrEmpty(str) {
* @param {*} children 孩子节点字段 默认 'children' * @param {*} children 孩子节点字段 默认 'children'
* @param {*} rootId 根Id 默认 0 * @param {*} rootId 根Id 默认 0
*/ */
export function handleTree(data, id, parentId, children, rootId) { export function handleTree(data = [], id = 'id', parentId = 'parentId', children = 'children', rootId = 0) {
id = id || 'id'
parentId = parentId || 'parentId'
children = children || 'children'
rootId = rootId || 0
//对源数据深度克隆 //对源数据深度克隆
const cloneData = JSON.parse(JSON.stringify(data)) const cloneData = JSON.parse(JSON.stringify(data))
//循环所有项 //循环所有项
const treeData = cloneData.filter(father => { const treeData = cloneData.filter(father => {
let branchArr = cloneData.filter(child => { const branchArr = cloneData.filter(child => {
//返回每一项的子级数组 //返回每一项的子级数组
return father[id] === child[parentId] return father[id] === child[parentId]
}); });
branchArr.length > 0 ? father.children = branchArr : ''; branchArr.length && (father.children = branchArr);
//返回第一层 //返回第一层
return father[parentId] === rootId; return father[parentId] === rootId;
}); });
return treeData != '' ? treeData : data; return treeData !== '' ? treeData : data;
} }