diff --git a/ruoyi-ui/src/utils/index.js b/ruoyi-ui/src/utils/index.js index 49897c99..2893bc83 100644 --- a/ruoyi-ui/src/utils/index.js +++ b/ruoyi-ui/src/utils/index.js @@ -1,3 +1,5 @@ +import { parseTime } from './ruoyi' + /** * 表格时间格式化 */ @@ -385,4 +387,4 @@ export function camelCase(str) { export function isNumberStr(str) { return /^[+-]?(0|([1-9]\d*))(\.\d+)?$/g.test(str) } - \ No newline at end of file + diff --git a/ruoyi-ui/src/utils/ruoyi.js b/ruoyi-ui/src/utils/ruoyi.js index dc18b912..decad410 100644 --- a/ruoyi-ui/src/utils/ruoyi.js +++ b/ruoyi-ui/src/utils/ruoyi.js @@ -68,10 +68,10 @@ export function addDateRange(params, dateRange) { // 回显数据字典 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(''); @@ -131,4 +131,4 @@ export function handleTree(data, id, parentId, children, rootId) { }); return treeData != '' ? treeData : data; } - \ No newline at end of file +