Merge branch 'master' of http://47.115.223.229:8888/yangjun/hldy_vue

src/components/Form/src/jeecg/components/JCheckbox.vue

@@ -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 != 0 && !checkboxArray.value.includes(item.value), color: item.color }));
+          checkOptions.value = res.map((item) => ({ value: item.value, label: item.text, disabled: item.status == 1 && !checkboxArray.value.includes(item.value), color: item.color }));
           //console.info('res', dictOptions.value);
         } else {
           console.error('getDictItems error: : ', res);

src/components/Form/src/jeecg/components/JDictSelectTag.vue

@@ -129,12 +129,11 @@ 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'] != 0,
+            disabled: next['status'] == 1,
             color: next['color'],
             ...omit(next, ['text', 'value', 'color']),
           });