Merge pull request #18435 from rohitwaghchaure/fix_fieldtype_for_disable_field

fix: disable field's fieldtype changed from data to check