Merge branch 'qin_26'

src/components/DesignForm/public/form/formItem.vue

@@ -1344,7 +1344,7 @@ const diGuiJilian = (val: any, options: any[]) => {
         :type="data.type === 'password' ? 'password' : 'text'"
         :style="getFormItemInputStyle(configStyle, 2)"
         :input-style="getFormItemInputStyle(configStyle, 3)"
-        v-if="['input', 'password'].includes(data.type) || judgeIsShow(data.name)"
+        v-if="['input', 'password'].includes(data.type) && judgeIsShow(data.name)"
         @change="onValueChange(data.type)"
         :placeholder="
           data.control.placeholder