merge develop

This commit is contained in:
就眠儀式 2021-12-25 00:23:13 +08:00
commit 4e4cd74320
2 changed files with 22 additions and 20 deletions

View File

@ -10,7 +10,9 @@
.layui-input-block, .layui-input-block,
.layui-input-inline { .layui-input-inline {
.layui-form-danger { .layui-form-danger {
border-color: #ff5722 !important; &, .layui-input {
border-color: #ff5722 !important;
}
} }
} }
} }

View File

@ -43,23 +43,23 @@ const selectItem = inject("selectItem") as Ref<SelectItem>;
const selectHandle = function () { const selectHandle = function () {
!props.disabled && callSelectItemHandle(!selected.value); !props.disabled && callSelectItemHandle(!selected.value);
}; }
const callSelectItemHandle = function (isChecked?: boolean) { const callSelectItemHandle = function(isChecked ?: boolean){
selectItemHandle( selectItemHandle({
{ value : props.value,
value: props.value, label : props.label,
label: props.label, disabled : props.disabled
disabled: props.disabled, }, isChecked);
}, }
isChecked const selected = computed({
); get(){
}; const selectValues = selectItem.value.value;
const selected = computed(() => { if (Array.isArray(selectValues)) {
const selectValues = selectItem.value.value; return (selectValues as any[]).indexOf(props.value) > -1;
if (Array.isArray(selectValues)) { }
return (selectValues as any[]).indexOf(props.value) > -1; return selectItem.value.value === props.value
} },
return selectItem.value.value === props.value; set(val){}
}); })
onMounted(() => selected.value && callSelectItemHandle()); onMounted(() => selected.value && callSelectItemHandle())
</script> </script>