yangjun
/
hldy_vue
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: yangjun:ac33d6bdd73ce319a1b6b4ddce71a9544b7c6996
Branches Tags
yangjun:master
..
compare: yangjun:1cf66a36b578b2e4fe170302f8eacb30ad23fbdb
Branches Tags
yangjun:master

No commits in common. "ac33d6bdd73ce319a1b6b4ddce71a9544b7c6996" and "1cf66a36b578b2e4fe170302f8eacb30ad23fbdb" have entirely different histories.
ac33d6bdd7 ... 1cf66a36b5

2 changed files with 3 additions and 2 deletions
Show Stats Expand all files Collapse all files

2
src/components/Form/src/jeecg/components/JCheckbox.vue
View File

@ -84,7 +84,7 @@ export default defineComponent({
//update-end-author:taoyan date:2022-6-21 for: 字典数据请求前将参数编码处理，但是不能直接编码，因为可能之前已经编码过了
getDictItems(temp).then((res) => {
if (res) {
checkOptions.value = res.map((item) => ({ value: item.value, label: item.text, disabled: item.status == 1 && !checkboxArray.value.includes(item.value), color: item.color }));
checkOptions.value = res.map((item) => ({ value: item.value, label: item.text, disabled: item.status != 0 && !checkboxArray.value.includes(item.value), color: item.color }));
//console.info('res', dictOptions.value);
} else {
console.error('getDictItems error: : ', res);

3
src/components/Form/src/jeecg/components/JDictSelectTag.vue
View File

@ -129,11 +129,12 @@ export default defineComponent({
const dictData = await initDictOptions(dictCode);
dictOptions.value = dictData.reduce((prev, next) => {
if (next) {
console.log(next['status'] == 1)
const value = next['value'];
prev.push({
label: next['text'] || next['label'],
value: stringToNumber ? +value : value,
disabled: next['status'] == 1,
disabled: next['status'] != 0,
color: next['color'],
...omit(next, ['text', 'value', 'color']),
});