From 57b49dd5fa70237274f17d00e00534420c6a77c2 Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: 星期二, 15 九月 2020 15:51:12 +0800
Subject: [PATCH] 限制系统内置参数不允许删除
---
ruoyi-ui/src/utils/ruoyi.js | 105 +++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 79 insertions(+), 26 deletions(-)
diff --git a/ruoyi-ui/src/utils/ruoyi.js b/ruoyi-ui/src/utils/ruoyi.js
index db97dcc..b79f44c 100644
--- a/ruoyi-ui/src/utils/ruoyi.js
+++ b/ruoyi-ui/src/utils/ruoyi.js
@@ -1,4 +1,4 @@
-/**
+/**
* 通用js方法封装处理
* Copyright (c) 2019 ruoyi
*/
@@ -7,23 +7,25 @@
// 日期格式化
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}'
- let date
- if (typeof time === 'object') {
+ }
+ const format = pattern || '{y}-{m}-{d} {h}:{i}:{s}'
+ let date
+ if (typeof time === 'object') {
date = time
- } else {
+ } else {
if ((typeof time === 'string') && (/^[0-9]+$/.test(time))) {
- time = parseInt(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
+ time = time * 1000
}
date = new Date(time)
- }
- const formatObj = {
+ }
+ const formatObj = {
y: date.getFullYear(),
m: date.getMonth() + 1,
d: date.getDate(),
@@ -31,22 +33,22 @@
i: date.getMinutes(),
s: date.getSeconds(),
a: date.getDay()
- }
- const time_str = format.replace(/{(y|m|d|h|i|s|a)+}/g, (result, key) => {
+ }
+ const time_str = format.replace(/{(y|m|d|h|i|s|a)+}/g, (result, key) => {
let value = formatObj[key]
// Note: getDay() returns 0 on Sunday
- if (key === 'a') { return ['日', '一', '二', '三', '四', '五', '六'][value ] }
+ if (key === 'a') { return ['日', '一', '二', '三', '四', '五', '六'][value] }
if (result.length > 0 && value < 10) {
- value = '0' + value
+ value = '0' + value
}
return value || 0
- })
- return time_str
+ })
+ return time_str
}
// 表单重置
export function resetForm(refName) {
- if (this.$refs[refName] !== undefined) {
+ if (this.$refs[refName]) {
this.$refs[refName].resetFields();
}
}
@@ -54,11 +56,11 @@
// 添加日期范围
export function addDateRange(params, dateRange) {
var search = params;
- if (null != dateRange) {
- search.params = {
- beginTime: this.dateRange[0],
- endTime: this.dateRange[1]
- };
+ search.beginTime = "";
+ search.endTime = "";
+ if (null != dateRange && '' != dateRange) {
+ search.beginTime = this.dateRange[0];
+ search.endTime = this.dateRange[1];
}
return search;
}
@@ -66,13 +68,28 @@
// 回显数据字典
export function selectDictLabel(datas, value) {
var actions = [];
- Object.keys(datas).map((key) => {
+ Object.keys(datas).some((key) => {
if (datas[key].dictValue == ('' + value)) {
actions.push(datas[key].dictLabel);
- return false;
+ return true;
}
})
return actions.join('');
+}
+
+// 回显数据字典（字符串数组）
+export function selectDictLabels(datas, value, separator) {
+ var actions = [];
+ var currentSeparator = undefined === separator ? "," : separator;
+ var temp = value.split(currentSeparator);
+ Object.keys(value.split(currentSeparator)).some((val) => {
+ Object.keys(datas).some((key) => {
+ if (datas[key].dictValue == ('' + temp[val])) {
+ actions.push(datas[key].dictLabel + currentSeparator);
+ }
+ })
+ })
+ return actions.join('').substring(0, actions.join('').length - 1);
}
// 通用下载方法
@@ -92,4 +109,40 @@
return arg;
});
return flag ? str : '';
-}
\ No newline at end of file
+}
+
+// 转换字符串，undefined,null等转化为""
+export function praseStrEmpty(str) {
+ if (!str || str == "undefined" || str == "null") {
+ return "";
+ }
+ return str;
+}
+
+/**
+ * 构造树型结构数据
+ * @param {*} data 数据源
+ * @param {*} id id字段 默认 'id'
+ * @param {*} parentId 父节点字段 默认 'parentId'
+ * @param {*} children 孩子节点字段 默认 'children'
+ * @param {*} rootId 根Id 默认 0
+ */
+export function handleTree(data, id, parentId, children, rootId) {
+ id = id || 'id'
+ parentId = parentId || 'parentId'
+ children = children || 'children'
+ rootId = rootId || Math.min.apply(Math, data.map(item => { return item[parentId] })) || 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;
+}
--
Gitblit v1.9.2