From 3e1bd8e3bc6c94ed5fc39ee7955a1aef97c68d97 Mon Sep 17 00:00:00 2001
From: fungleo <web@fengcms.com>
Date: 星期二, 21 七月 2020 10:18:56 +0800
Subject: [PATCH] 修复 utils/index.js 中不包含 parseTime 函数的 bug
---
ruoyi-ui/src/utils/ruoyi.js | 35 +++++++++++++++++++++++++++++++++--
1 files changed, 33 insertions(+), 2 deletions(-)
diff --git a/ruoyi-ui/src/utils/ruoyi.js b/ruoyi-ui/src/utils/ruoyi.js
index 602fdd6..dc18b91 100644
--- a/ruoyi-ui/src/utils/ruoyi.js
+++ b/ruoyi-ui/src/utils/ruoyi.js
@@ -7,7 +7,7 @@
// 鏃ユ湡鏍煎紡鍖�
export function parseTime(time, pattern) {
- if (arguments.length === 0) {
+ if (arguments.length === 0 || !time) {
return null
}
const format = pattern || '{y}-{m}-{d} {h}:{i}:{s}'
@@ -17,6 +17,8 @@
} else {
if ((typeof time === 'string') && (/^[0-9]+$/.test(time))) {
time = parseInt(time)
+ } else if (typeof time === 'string') {
+ time = time.replace(new RegExp(/-/gm), '/');
}
if ((typeof time === 'number') && (time.toString().length === 10)) {
time = time * 1000
@@ -100,4 +102,33 @@
return "";
}
return str;
-}
\ No newline at end of file
+}
+
+/**
+ * 鏋勯�犳爲鍨嬬粨鏋勬暟鎹�
+ * @param {*} data 鏁版嵁婧�
+ * @param {*} id id瀛楁 榛樿 'id'
+ * @param {*} parentId 鐖惰妭鐐瑰瓧娈� 榛樿 'parentId'
+ * @param {*} children 瀛╁瓙鑺傜偣瀛楁 榛樿 'children'
+ * @param {*} rootId 鏍笽d 榛樿 0
+ */
+export function handleTree(data, id, parentId, children, rootId) {
+ id = id || 'id'
+ parentId = parentId || 'parentId'
+ children = children || 'children'
+ rootId = rootId || 0
+ //瀵规簮鏁版嵁娣卞害鍏嬮殕
+ const cloneData = JSON.parse(JSON.stringify(data))
+ //寰幆鎵�鏈夐」
+ const treeData = cloneData.filter(father => {
+ let branchArr = cloneData.filter(child => {
+ //杩斿洖姣忎竴椤圭殑瀛愮骇鏁扮粍
+ return father[id] === child[parentId]
+ });
+ branchArr.length > 0 ? father.children = branchArr : '';
+ //杩斿洖绗竴灞�
+ return father[parentId] === rootId;
+ });
+ return treeData != '' ? treeData : data;
+ }
+
\ No newline at end of file
--
Gitblit v1.9.3