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

ios 年月 不显示bug

Browse Source
This commit is contained in:
zhanglipeng 2021-09-08 10:35:48 +08:00
parent bb7b155dbe
commit 4fbe05ab20
2 changed files with 136 additions and 110 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
ruoyi-ui/src/utils/index.js
View File

@ -1,3 +1,5 @@
import { parseTime } from './ruoyi'
/** /**
* 表格时间格式化 * 表格时间格式化
*/ */
@ -124,19 +126,21 @@ export function param(json) {
* @returns {Object} * @returns {Object}
*/ */
export function param2Obj(url) { export function param2Obj(url) {
const search = url.split('?')[1] const search = decodeURIComponent(url.split('?')[1]).replace(/\+/g, ' ')
if (!search) { if (!search) {
return {} return {}
} }
return JSON.parse( const obj = {}
'{"' + const searchArr = search.split('&')
decodeURIComponent(search) searchArr.forEach(v => {
.replace(/"/g, '\\"') const index = v.indexOf('=')
.replace(/&/g, '","') if (index !== -1) {
.replace(/=/g, '":"') const name = v.substring(0, index)
.replace(/\+/g, ' ') + const val = v.substring(index + 1, v.length)
'"}' obj[name] = val
) }
})
return obj
} }
/** /**

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

@ -3,117 +3,140 @@
* Copyright (c) 2019 ruoyi * Copyright (c) 2019 ruoyi
*/ */
const baseURL = process.env.VUE_APP_BASE_API const baseURL = process.env.VUE_APP_BASE_API;
// 日期格式化 // 日期格式化
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}' //console.log(time, pattern);
let date const format = pattern || "{y}-{m}-{d} {h}:{i}:{s}";
if (typeof time === 'object') { //console.log(format);
date = time let date;
} else { //console.log(typeof time);
if ((typeof time === 'string') && (/^[0-9]+$/.test(time))) { if (typeof time === "object") {
time = parseInt(time) date = time;
} else if (typeof time === 'string') { } else {
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);
if ((typeof time === 'number') && (time.toString().length === 10)) { //console.log("1:" + time);
time = time * 1000 } else if (typeof time === "string") {
} time = time
date = new Date(time) .replace(new RegExp(/-/gm), "/")
} .replace("T", " ")
const formatObj = { .replace(new RegExp(/\.[\d]{3}/gm), "");
y: date.getFullYear(),
m: date.getMonth() + 1, if (time.length == 7) {
d: date.getDate(), time = time + "/01";
h: date.getHours(), }
i: date.getMinutes(), //console.log(time);
s: date.getSeconds(), }
a: date.getDay() if (typeof time === "number" && time.toString().length === 10) {
} time = time * 1000;
const time_str = format.replace(/{(y|m|d|h|i|s|a)+}/g, (result, key) => { }
let value = formatObj[key] date = new Date(time);
// Note: getDay() returns 0 on Sunday }
if (key === 'a') { return ['日', '一', '二', '三', '四', '五', '六'][value] } //console.log(date);
if (result.length > 0 && value < 10) { const formatObj = {
value = '0' + value y: date.getFullYear(),
} m: date.getMonth() + 1,
return value || 0 d: date.getDate(),
}) h: date.getHours(),
return time_str i: date.getMinutes(),
s: date.getSeconds(),
a: date.getDay()
};
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 (result.length > 0 && value < 10) {
value = "0" + value;
}
return value || 0;
});
//console.log(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) { export function addDateRange(params, dateRange) {
var search = params; var search = params;
search.beginTime = ""; search.beginTime = "";
search.endTime = ""; search.endTime = "";
if (null != dateRange && '' != dateRange) { if (null != dateRange && "" != dateRange) {
search.beginTime = this.dateRange[0]; search.beginTime = this.dateRange[0];
search.endTime = this.dateRange[1]; search.endTime = this.dateRange[1];
} }
return search; return search;
} }
// 回显数据字典 // 回显数据字典
export function selectDictLabel(datas, value) { export function selectDictLabel(datas, value) {
var actions = []; var actions = [];
Object.keys(datas).map((key) => { Object.keys(datas).map(key => {
if (datas[key].dictValue == ('' + value)) { if (datas[key].dictValue == "" + value) {
actions.push(datas[key].dictLabel); actions.push(datas[key].dictLabel);
return false; return false;
} }
}) });
return actions.join(''); return actions.join("");
} }
// 回显数据字典 // 回显数据字典
export function selectMoeDictLabel(datas, value) { export function selectMoeDictLabel(datas, value) {
var actions = []; var actions = [];
Object.keys(datas).map((key) => { Object.keys(datas).map(key => {
if (datas[key].id == ('' + value)) { if (datas[key].id == "" + value) {
actions.push(datas[key].name); actions.push(datas[key].name);
return false; return false;
} }
}) });
return actions.join(''); return actions.join("");
} }
// 通用下载方法 // 通用下载方法
export function download(fileName) { export function download(fileName) {
window.location.href = baseURL + "/common/download?fileName=" + encodeURI(fileName) + "&delete=" + true; window.location.href =
baseURL +
"/common/download?fileName=" +
encodeURI(fileName) +
"&delete=" +
true;
} }
// 字符串格式化(%s ) // 字符串格式化(%s )
export function sprintf(str) { export function sprintf(str) {
var args = arguments, flag = true, i = 1; var args = arguments,
str = str.replace(/%s/g, function () { flag = true,
var arg = args[i++]; i = 1;
if (typeof arg === 'undefined') { str = str.replace(/%s/g, function() {
flag = false; var arg = args[i++];
return ''; if (typeof arg === "undefined") {
} flag = false;
return arg; return "";
}); }
return flag ? str : ''; return arg;
});
return flag ? str : "";
} }
// 转换字符串，undefined,null等转化为"" // 转换字符串，undefined,null等转化为""
export function praseStrEmpty(str) { export function praseStrEmpty(str) {
if (!str || str == "undefined" || str == "null") { if (!str || str == "undefined" || str == "null") {
return ""; return "";
} }
return str; return str;
} }
/** /**
@ -125,22 +148,21 @@ export function praseStrEmpty(str) {
* @param {*} rootId 根Id 默认 0 * @param {*} rootId 根Id 默认 0
*/ */
export function handleTree(data, id, parentId, children, rootId) { export function handleTree(data, id, parentId, children, rootId) {
id = id || 'id' id = id || "id";
parentId = parentId || 'parentId' parentId = parentId || "parentId";
children = children || 'children' children = children || "children";
rootId = rootId || 0 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 => { let branchArr = cloneData.filter(child => {
//返回每一项的子级数组 //返回每一项的子级数组
return father[id] === child[parentId] return father[id] === child[parentId];
}); });
branchArr.length > 0 ? father.children = branchArr : ''; branchArr.length > 0 ? (father.children = branchArr) : "";
//返回第一层 //返回第一层
return father[parentId] === rootId; return father[parentId] === rootId;
}); });
return treeData != '' ? treeData : data; return treeData != "" ? treeData : data;
} }