|
|
@@ -1,5 +1,3 @@
|
|
|
-
|
|
|
-
|
|
|
/**
|
|
|
* 通用js方法封装处理
|
|
|
* Copyright (c) 2019 ruoyi
|
|
|
@@ -8,22 +6,25 @@
|
|
|
// 日期格式化
|
|
|
export function parseTime(time, pattern) {
|
|
|
if (arguments.length === 0 || !time) {
|
|
|
- return null
|
|
|
+ return null;
|
|
|
}
|
|
|
- const format = pattern || '{y}-{m}-{d} {h}:{i}:{s}'
|
|
|
- let date
|
|
|
- if (typeof time === 'object') {
|
|
|
- date = time
|
|
|
+ const format = pattern || "{y}-{m}-{d} {h}:{i}:{s}";
|
|
|
+ let date;
|
|
|
+ if (typeof time === "object") {
|
|
|
+ date = time;
|
|
|
} else {
|
|
|
- if ((typeof time === 'string') && (/^[0-9]+$/.test(time))) {
|
|
|
- time = parseInt(time)
|
|
|
- } else if (typeof time === 'string') {
|
|
|
- time = time.replace(new RegExp(/-/gm), '/').replace('T', ' ').replace(new RegExp(/\.[\d]{3}/gm), '');
|
|
|
+ if (typeof time === "string" && /^[0-9]+$/.test(time)) {
|
|
|
+ time = parseInt(time);
|
|
|
+ } else if (typeof time === "string") {
|
|
|
+ time = time
|
|
|
+ .replace(new RegExp(/-/gm), "/")
|
|
|
+ .replace("T", " ")
|
|
|
+ .replace(new RegExp(/\.[\d]{3}/gm), "");
|
|
|
}
|
|
|
- if ((typeof time === 'number') && (time.toString().length === 10)) {
|
|
|
- time = time * 1000
|
|
|
+ if (typeof time === "number" && time.toString().length === 10) {
|
|
|
+ time = time * 1000;
|
|
|
}
|
|
|
- date = new Date(time)
|
|
|
+ date = new Date(time);
|
|
|
}
|
|
|
const formatObj = {
|
|
|
y: date.getFullYear(),
|
|
|
@@ -32,18 +33,20 @@ export function parseTime(time, pattern) {
|
|
|
h: date.getHours(),
|
|
|
i: date.getMinutes(),
|
|
|
s: date.getSeconds(),
|
|
|
- a: date.getDay()
|
|
|
- }
|
|
|
+ a: date.getDay(),
|
|
|
+ };
|
|
|
const time_str = format.replace(/{(y|m|d|h|i|s|a)+}/g, (result, key) => {
|
|
|
- let value = formatObj[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 value || 0;
|
|
|
+ });
|
|
|
+ return time_str;
|
|
|
}
|
|
|
|
|
|
// 表单重置
|
|
|
@@ -56,14 +59,19 @@ export function resetForm(refName) {
|
|
|
// 添加日期范围
|
|
|
export function addDateRange(params, dateRange, propName) {
|
|
|
let search = params;
|
|
|
- search.params = typeof (search.params) === 'object' && search.params !== null && !Array.isArray(search.params) ? search.params : {};
|
|
|
+ search.params =
|
|
|
+ typeof search.params === "object" &&
|
|
|
+ search.params !== null &&
|
|
|
+ !Array.isArray(search.params)
|
|
|
+ ? search.params
|
|
|
+ : {};
|
|
|
dateRange = Array.isArray(dateRange) ? dateRange : [];
|
|
|
- if (typeof (propName) === 'undefined') {
|
|
|
- search.params['beginTime'] = dateRange[0];
|
|
|
- search.params['endTime'] = dateRange[1];
|
|
|
+ if (typeof propName === "undefined") {
|
|
|
+ search.params["beginTime"] = dateRange[0];
|
|
|
+ search.params["endTime"] = dateRange[1];
|
|
|
} else {
|
|
|
- search.params['begin' + propName] = dateRange[0];
|
|
|
- search.params['end' + propName] = dateRange[1];
|
|
|
+ search.params["begin" + propName] = dateRange[0];
|
|
|
+ search.params["end" + propName] = dateRange[1];
|
|
|
}
|
|
|
return search;
|
|
|
}
|
|
|
@@ -75,20 +83,20 @@ export function selectDictLabel(datas, value) {
|
|
|
}
|
|
|
var actions = [];
|
|
|
Object.keys(datas).some((key) => {
|
|
|
- if (datas[key].value == ('' + value)) {
|
|
|
+ if (datas[key].value == "" + value) {
|
|
|
actions.push(datas[key].label);
|
|
|
return true;
|
|
|
}
|
|
|
- })
|
|
|
+ });
|
|
|
if (actions.length === 0) {
|
|
|
actions.push(value);
|
|
|
}
|
|
|
- return actions.join('');
|
|
|
+ return actions.join("");
|
|
|
}
|
|
|
|
|
|
// 回显数据字典（字符串、数组）
|
|
|
export function selectDictLabels(datas, value, separator) {
|
|
|
- if (value === undefined || value.length ===0) {
|
|
|
+ if (value === undefined || value.length === 0) {
|
|
|
return "";
|
|
|
}
|
|
|
if (Array.isArray(value)) {
|
|
|
@@ -100,30 +108,32 @@ export function selectDictLabels(datas, value, separator) {
|
|
|
Object.keys(value.split(currentSeparator)).some((val) => {
|
|
|
var match = false;
|
|
|
Object.keys(datas).some((key) => {
|
|
|
- if (datas[key].value == ('' + temp[val])) {
|
|
|
+ if (datas[key].value == "" + temp[val]) {
|
|
|
actions.push(datas[key].label + currentSeparator);
|
|
|
match = true;
|
|
|
}
|
|
|
- })
|
|
|
+ });
|
|
|
if (!match) {
|
|
|
actions.push(temp[val] + currentSeparator);
|
|
|
}
|
|
|
- })
|
|
|
- return actions.join('').substring(0, actions.join('').length - 1);
|
|
|
+ });
|
|
|
+ return actions.join("").substring(0, actions.join("").length - 1);
|
|
|
}
|
|
|
|
|
|
// 字符串格式化(%s )
|
|
|
export function sprintf(str) {
|
|
|
- var args = arguments, flag = true, i = 1;
|
|
|
+ var args = arguments,
|
|
|
+ flag = true,
|
|
|
+ i = 1;
|
|
|
str = str.replace(/%s/g, function () {
|
|
|
var arg = args[i++];
|
|
|
- if (typeof arg === 'undefined') {
|
|
|
+ if (typeof arg === "undefined") {
|
|
|
flag = false;
|
|
|
- return '';
|
|
|
+ return "";
|
|
|
}
|
|
|
return arg;
|
|
|
});
|
|
|
- return flag ? str : '';
|
|
|
+ return flag ? str : "";
|
|
|
}
|
|
|
|
|
|
// 转换字符串，undefined,null等转化为""
|
|
|
@@ -148,7 +158,7 @@ export function mergeRecursive(source, target) {
|
|
|
}
|
|
|
}
|
|
|
return source;
|
|
|
-};
|
|
|
+}
|
|
|
|
|
|
/**
|
|
|
* 构造树型结构数据
|
|
|
@@ -159,9 +169,9 @@ export function mergeRecursive(source, target) {
|
|
|
*/
|
|
|
export function handleTree(data, id, parentId, children) {
|
|
|
let config = {
|
|
|
- id: id || 'id',
|
|
|
- parentId: parentId || 'parentId',
|
|
|
- childrenList: children || 'children'
|
|
|
+ id: id || "id",
|
|
|
+ parentId: parentId || "parentId",
|
|
|
+ childrenList: children || "children",
|
|
|
};
|
|
|
|
|
|
var childrenListMap = {};
|
|
|
@@ -202,19 +212,23 @@ export function handleTree(data, id, parentId, children) {
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
-* 参数处理
|
|
|
-* @param {*} params 参数
|
|
|
-*/
|
|
|
+ * 参数处理
|
|
|
+ * @param {*} params 参数
|
|
|
+ */
|
|
|
export function tansParams(params) {
|
|
|
- let result = ''
|
|
|
+ let result = "";
|
|
|
for (const propName of Object.keys(params)) {
|
|
|
const value = params[propName];
|
|
|
var part = encodeURIComponent(propName) + "=";
|
|
|
- if (value !== null && value !== "" && typeof (value) !== "undefined") {
|
|
|
- if (typeof value === 'object') {
|
|
|
+ if (value !== null && value !== "" && typeof value !== "undefined") {
|
|
|
+ if (typeof value === "object") {
|
|
|
for (const key of Object.keys(value)) {
|
|
|
- if (value[key] !== null && value[key] !== "" && typeof (value[key]) !== 'undefined') {
|
|
|
- let params = propName + '[' + key + ']';
|
|
|
+ if (
|
|
|
+ value[key] !== null &&
|
|
|
+ value[key] !== "" &&
|
|
|
+ typeof value[key] !== "undefined"
|
|
|
+ ) {
|
|
|
+ let params = propName + "[" + key + "]";
|
|
|
var subPart = encodeURIComponent(params) + "=";
|
|
|
result += subPart + encodeURIComponent(value[key]) + "&";
|
|
|
}
|
|
|
@@ -224,10 +238,10 @@ export function tansParams(params) {
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
- return result
|
|
|
+ return result;
|
|
|
}
|
|
|
|
|
|
// 验证是否为blob格式
|
|
|
export function blobValidate(data) {
|
|
|
- return data.type !== 'application/json'
|
|
|
+ return data.type !== "application/json";
|
|
|
}
|
002201