From 12ab8b03d9acb77848c4db9bb0451e77af60acb6 Mon Sep 17 00:00:00 2001 From: RuoYi <yzz_ivy@163.com> Date: 星期五, 17 九月 2021 15:36:54 +0800 Subject: [PATCH] 使用vue-data-dict,简化数据字典使用 --- ruoyi-ui/src/utils/ruoyi.js | 20 ++++++++++++++++++-- 1 files changed, 18 insertions(+), 2 deletions(-) diff --git a/ruoyi-ui/src/utils/ruoyi.js b/ruoyi-ui/src/utils/ruoyi.js index c136ed0..5669a43 100644 --- a/ruoyi-ui/src/utils/ruoyi.js +++ b/ruoyi-ui/src/utils/ruoyi.js @@ -72,8 +72,8 @@ export function selectDictLabel(datas, value) { var actions = []; Object.keys(datas).some((key) => { - if (datas[key].dictValue == ('' + value)) { - actions.push(datas[key].dictLabel); + if (datas[key].value == ('' + value)) { + actions.push(datas[key].label); return true; } }) @@ -122,6 +122,22 @@ return str; } +// 数据合并 +export function mergeRecursive(source, target) { + for (var p in target) { + try { + if (target[p].constructor == Object) { + source[p] = mergeRecursive(source[p], target[p]); + } else { + source[p] = target[p]; + } + } catch(e) { + source[p] = target[p]; + } + } + return source; +}; + /** * 构造树型结构数据 * @param {*} data 数据源 -- Gitblit v1.9.2