空值不进行回显数据字典
This commit is contained in:
RuoYi
parent
10ae0bce65
commit
c9d19cbe56
|
|
@ -1,3 +1,5 @@
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 通用js方法封装处理
|
* 通用js方法封装处理
|
||||||
* Copyright (c) 2019 ruoyi
|
* Copyright (c) 2019 ruoyi
|
||||||
|
|
@ -5,130 +7,133 @@
|
||||||
|
|
||||||
// 日期格式化
|
// 日期格式化
|
||||||
export function parseTime(time, pattern) {
|
export function parseTime(time, pattern) {
|
||||||
if (arguments.length === 0 || !time) {
|
if (arguments.length === 0 || !time) {
|
||||||
return null
|
return null
|
||||||
}
|
}
|
||||||
const format = pattern || '{y}-{m}-{d} {h}:{i}:{s}'
|
const format = pattern || '{y}-{m}-{d} {h}:{i}:{s}'
|
||||||
let date
|
let date
|
||||||
if (typeof time === 'object') {
|
if (typeof time === 'object') {
|
||||||
date = time
|
date = time
|
||||||
} else {
|
} else {
|
||||||
if ((typeof time === 'string') && (/^[0-9]+$/.test(time))) {
|
if ((typeof time === 'string') && (/^[0-9]+$/.test(time))) {
|
||||||
time = parseInt(time)
|
time = parseInt(time)
|
||||||
} else if (typeof time === 'string') {
|
} else if (typeof time === 'string') {
|
||||||
time = time.replace(new RegExp(/-/gm), '/').replace('T', ' ').replace(new RegExp(/\.[\d]{3}/gm),'');
|
time = time.replace(new RegExp(/-/gm), '/').replace('T', ' ').replace(new RegExp(/\.[\d]{3}/gm), '');
|
||||||
}
|
}
|
||||||
if ((typeof time === 'number') && (time.toString().length === 10)) {
|
if ((typeof time === 'number') && (time.toString().length === 10)) {
|
||||||
time = time * 1000
|
time = time * 1000
|
||||||
}
|
}
|
||||||
date = new Date(time)
|
date = new Date(time)
|
||||||
}
|
}
|
||||||
const formatObj = {
|
const formatObj = {
|
||||||
y: date.getFullYear(),
|
y: date.getFullYear(),
|
||||||
m: date.getMonth() + 1,
|
m: date.getMonth() + 1,
|
||||||
d: date.getDate(),
|
d: date.getDate(),
|
||||||
h: date.getHours(),
|
h: date.getHours(),
|
||||||
i: date.getMinutes(),
|
i: date.getMinutes(),
|
||||||
s: date.getSeconds(),
|
s: date.getSeconds(),
|
||||||
a: date.getDay()
|
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]
|
let value = formatObj[key]
|
||||||
// Note: getDay() returns 0 on Sunday
|
// Note: getDay() returns 0 on Sunday
|
||||||
if (key === 'a') { return ['日', '一', '二', '三', '四', '五', '六'][value] }
|
if (key === 'a') { return ['日', '一', '二', '三', '四', '五', '六'][value] }
|
||||||
if (result.length > 0 && value < 10) {
|
if (result.length > 0 && value < 10) {
|
||||||
value = '0' + value
|
value = '0' + value
|
||||||
}
|
}
|
||||||
return value || 0
|
return value || 0
|
||||||
})
|
})
|
||||||
return time_str
|
return time_str
|
||||||
}
|
}
|
||||||
|
|
||||||
// 表单重置
|
// 表单重置
|
||||||
export function resetForm(refName) {
|
export function resetForm(refName) {
|
||||||
if (this.$refs[refName]) {
|
if (this.$refs[refName]) {
|
||||||
this.$refs[refName].resetFields();
|
this.$refs[refName].resetFields();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// 添加日期范围
|
// 添加日期范围
|
||||||
export function addDateRange(params, dateRange, propName) {
|
export function addDateRange(params, dateRange, propName) {
|
||||||
let search = params;
|
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 : [];
|
dateRange = Array.isArray(dateRange) ? dateRange : [];
|
||||||
if (typeof (propName) === 'undefined') {
|
if (typeof (propName) === 'undefined') {
|
||||||
search.params['beginTime'] = dateRange[0];
|
search.params['beginTime'] = dateRange[0];
|
||||||
search.params['endTime'] = dateRange[1];
|
search.params['endTime'] = dateRange[1];
|
||||||
} else {
|
} else {
|
||||||
search.params['begin' + propName] = dateRange[0];
|
search.params['begin' + propName] = dateRange[0];
|
||||||
search.params['end' + propName] = dateRange[1];
|
search.params['end' + propName] = dateRange[1];
|
||||||
}
|
}
|
||||||
return search;
|
return search;
|
||||||
}
|
}
|
||||||
|
|
||||||
// 回显数据字典
|
// 回显数据字典
|
||||||
export function selectDictLabel(datas, value) {
|
export function selectDictLabel(datas, value) {
|
||||||
var actions = [];
|
var actions = [];
|
||||||
Object.keys(datas).some((key) => {
|
Object.keys(datas).some((key) => {
|
||||||
if (datas[key].value == ('' + value)) {
|
if (datas[key].value == ('' + value)) {
|
||||||
actions.push(datas[key].label);
|
actions.push(datas[key].label);
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
return actions.join('');
|
return actions.join('');
|
||||||
}
|
}
|
||||||
|
|
||||||
// 回显数据字典（字符串数组）
|
// 回显数据字典（字符串数组）
|
||||||
export function selectDictLabels(datas, value, separator) {
|
export function selectDictLabels(datas, value, separator) {
|
||||||
var actions = [];
|
if(value === undefined) {
|
||||||
var currentSeparator = undefined === separator ? "," : separator;
|
return "";
|
||||||
var temp = value.split(currentSeparator);
|
}
|
||||||
Object.keys(value.split(currentSeparator)).some((val) => {
|
var actions = [];
|
||||||
Object.keys(datas).some((key) => {
|
var currentSeparator = undefined === separator ? "," : separator;
|
||||||
if (datas[key].value == ('' + temp[val])) {
|
var temp = value.split(currentSeparator);
|
||||||
actions.push(datas[key].label + currentSeparator);
|
Object.keys(value.split(currentSeparator)).some((val) => {
|
||||||
}
|
Object.keys(datas).some((key) => {
|
||||||
})
|
if (datas[key].value == ('' + temp[val])) {
|
||||||
})
|
actions.push(datas[key].label + currentSeparator);
|
||||||
return actions.join('').substring(0, actions.join('').length - 1);
|
}
|
||||||
|
})
|
||||||
|
})
|
||||||
|
return actions.join('').substring(0, actions.join('').length - 1);
|
||||||
}
|
}
|
||||||
|
|
||||||
// 字符串格式化(%s )
|
// 字符串格式化(%s )
|
||||||
export function sprintf(str) {
|
export function sprintf(str) {
|
||||||
var args = arguments, flag = true, i = 1;
|
var args = arguments, flag = true, i = 1;
|
||||||
str = str.replace(/%s/g, function () {
|
str = str.replace(/%s/g, function () {
|
||||||
var arg = args[i++];
|
var arg = args[i++];
|
||||||
if (typeof arg === 'undefined') {
|
if (typeof arg === 'undefined') {
|
||||||
flag = false;
|
flag = false;
|
||||||
return '';
|
return '';
|
||||||
}
|
}
|
||||||
return arg;
|
return arg;
|
||||||
});
|
});
|
||||||
return flag ? str : '';
|
return flag ? str : '';
|
||||||
}
|
}
|
||||||
|
|
||||||
// 转换字符串，undefined,null等转化为""
|
// 转换字符串，undefined,null等转化为""
|
||||||
export function parseStrEmpty(str) {
|
export function parseStrEmpty(str) {
|
||||||
if (!str || str == "undefined" || str == "null") {
|
if (!str || str == "undefined" || str == "null") {
|
||||||
return "";
|
return "";
|
||||||
}
|
}
|
||||||
return str;
|
return str;
|
||||||
}
|
}
|
||||||
|
|
||||||
// 数据合并
|
// 数据合并
|
||||||
export function mergeRecursive(source, target) {
|
export function mergeRecursive(source, target) {
|
||||||
for (var p in target) {
|
for (var p in target) {
|
||||||
try {
|
try {
|
||||||
if (target[p].constructor == Object) {
|
if (target[p].constructor == Object) {
|
||||||
source[p] = mergeRecursive(source[p], target[p]);
|
source[p] = mergeRecursive(source[p], target[p]);
|
||||||
} else {
|
} else {
|
||||||
source[p] = target[p];
|
source[p] = target[p];
|
||||||
}
|
}
|
||||||
} catch(e) {
|
} catch (e) {
|
||||||
source[p] = target[p];
|
source[p] = target[p];
|
||||||
}
|
|
||||||
}
|
}
|
||||||
return source;
|
}
|
||||||
|
return source;
|
||||||
};
|
};
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
@ -139,47 +144,47 @@ export function mergeRecursive(source, target) {
|
||||||
* @param {*} children 孩子节点字段 默认 'children'
|
* @param {*} children 孩子节点字段 默认 'children'
|
||||||
*/
|
*/
|
||||||
export function handleTree(data, id, parentId, children) {
|
export function handleTree(data, id, parentId, children) {
|
||||||
let config = {
|
let config = {
|
||||||
id: id || 'id',
|
id: id || 'id',
|
||||||
parentId: parentId || 'parentId',
|
parentId: parentId || 'parentId',
|
||||||
childrenList: children || 'children'
|
childrenList: children || 'children'
|
||||||
};
|
};
|
||||||
|
|
||||||
var childrenListMap = {};
|
var childrenListMap = {};
|
||||||
var nodeIds = {};
|
var nodeIds = {};
|
||||||
var tree = [];
|
var tree = [];
|
||||||
|
|
||||||
for (let d of data) {
|
for (let d of data) {
|
||||||
let parentId = d[config.parentId];
|
let parentId = d[config.parentId];
|
||||||
if (childrenListMap[parentId] == null) {
|
if (childrenListMap[parentId] == null) {
|
||||||
childrenListMap[parentId] = [];
|
childrenListMap[parentId] = [];
|
||||||
}
|
}
|
||||||
nodeIds[d[config.id]] = d;
|
nodeIds[d[config.id]] = d;
|
||||||
childrenListMap[parentId].push(d);
|
childrenListMap[parentId].push(d);
|
||||||
}
|
}
|
||||||
|
|
||||||
for (let d of data) {
|
for (let d of data) {
|
||||||
let parentId = d[config.parentId];
|
let parentId = d[config.parentId];
|
||||||
if (nodeIds[parentId] == null) {
|
if (nodeIds[parentId] == null) {
|
||||||
tree.push(d);
|
tree.push(d);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
for (let t of tree) {
|
for (let t of tree) {
|
||||||
adaptToChildrenList(t);
|
adaptToChildrenList(t);
|
||||||
}
|
}
|
||||||
|
|
||||||
function adaptToChildrenList(o) {
|
function adaptToChildrenList(o) {
|
||||||
if (childrenListMap[o[config.id]] !== null) {
|
if (childrenListMap[o[config.id]] !== null) {
|
||||||
o[config.childrenList] = childrenListMap[o[config.id]];
|
o[config.childrenList] = childrenListMap[o[config.id]];
|
||||||
}
|
}
|
||||||
if (o[config.childrenList]) {
|
if (o[config.childrenList]) {
|
||||||
for (let c of o[config.childrenList]) {
|
for (let c of o[config.childrenList]) {
|
||||||
adaptToChildrenList(c);
|
adaptToChildrenList(c);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return tree;
|
return tree;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
@ -187,34 +192,34 @@ export function handleTree(data, id, parentId, children) {
|
||||||
* @param {*} params 参数
|
* @param {*} params 参数
|
||||||
*/
|
*/
|
||||||
export function tansParams(params) {
|
export function tansParams(params) {
|
||||||
let result = ''
|
let result = ''
|
||||||
for (const propName of Object.keys(params)) {
|
for (const propName of Object.keys(params)) {
|
||||||
const value = params[propName];
|
const value = params[propName];
|
||||||
var part = encodeURIComponent(propName) + "=";
|
var part = encodeURIComponent(propName) + "=";
|
||||||
if (value !== null && typeof (value) !== "undefined") {
|
if (value !== null && typeof (value) !== "undefined") {
|
||||||
if (typeof value === 'object') {
|
if (typeof value === 'object') {
|
||||||
for (const key of Object.keys(value)) {
|
for (const key of Object.keys(value)) {
|
||||||
if (value[key] !== null && typeof (value[key]) !== 'undefined') {
|
if (value[key] !== null && typeof (value[key]) !== 'undefined') {
|
||||||
let params = propName + '[' + key + ']';
|
let params = propName + '[' + key + ']';
|
||||||
var subPart = encodeURIComponent(params) + "=";
|
var subPart = encodeURIComponent(params) + "=";
|
||||||
result += subPart + encodeURIComponent(value[key]) + "&";
|
result += subPart + encodeURIComponent(value[key]) + "&";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
result += part + encodeURIComponent(value) + "&";
|
result += part + encodeURIComponent(value) + "&";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return result
|
return result
|
||||||
}
|
}
|
||||||
|
|
||||||
// 验证是否为blob格式
|
// 验证是否为blob格式
|
||||||
export async function blobValidate(data) {
|
export async function blobValidate(data) {
|
||||||
try {
|
try {
|
||||||
const text = await data.text();
|
const text = await data.text();
|
||||||
JSON.parse(text);
|
JSON.parse(text);
|
||||||
return false;
|
return false;
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
Loading…
Reference in New Issue