vxe-pc-ui 4.0.36 → 4.0.38

package/es/date-picker/src/date-picker.js

@@ -53,7 +53,7 @@ export default defineComponent({
         modelValue: [String, Number, Date],
         immediate: { type: Boolean, default: true },
         name: String,
-        type: { type: String, default: 'text' },
+        type: { type: String, default: 'date' },
         clearable: { type: Boolean, default: () => getConfig().datePicker.clearable },
         readonly: Boolean,
         disabled: Boolean,
@@ -1819,16 +1819,6 @@ export default defineComponent({
             }
             return createCommentVNode();
         };
-        const renderDatePickerIcon = () => {
-            return h('div', {
-                class: 'vxe-date-picker--control-icon',
-                onClick: datePickerOpenEvent
-            }, [
-                h('i', {
-                    class: ['vxe-date-picker--date-picker-icon', getIcon().INPUT_DATE]
-                })
-            ]);
-        };
         const renderPrefixIcon = () => {
             const { prefixIcon } = props;
             const prefixSlot = slots.prefix;
@@ -1854,40 +1844,45 @@ export default defineComponent({
             const { inputValue } = reactData;
             const suffixSlot = slots.suffix;
             const isClearable = computeIsClearable.value;
-            return isClearable || suffixSlot || suffixIcon
-                ? h('div', {
-                    class: ['vxe-date-picker--suffix', {
-                            'is--clear': isClearable && !disabled && !(inputValue === '' || XEUtils.eqNull(inputValue))
-                        }]
-                }, [
-                    isClearable
-                        ? h('div', {
-                            class: 'vxe-date-picker--clear-icon',
-                            onClick: clearValueEvent
-                        }, [
+            return h('div', {
+                class: ['vxe-date-picker--suffix', {
+                        'is--clear': isClearable && !disabled && !(inputValue === '' || XEUtils.eqNull(inputValue))
+                    }]
+            }, [
+                isClearable
+                    ? h('div', {
+                        class: 'vxe-date-picker--clear-icon',
+                        onClick: clearValueEvent
+                    }, [
+                        h('i', {
+                            class: getIcon().INPUT_CLEAR
+                        })
+                    ])
+                    : createCommentVNode(),
+                renderExtraSuffixIcon(),
+                suffixSlot || suffixIcon
+                    ? h('div', {
+                        class: 'vxe-date-picker--suffix-icon',
+                        onClick: clickSuffixEvent
+                    }, suffixSlot
+                        ? getSlotVNs(suffixSlot({}))
+                        : [
                             h('i', {
-                                class: getIcon().INPUT_CLEAR
+                                class: suffixIcon
                             })
                         ])
-                        : createCommentVNode(),
-                    renderExtraSuffixIcon(),
-                    suffixSlot || suffixIcon
-                        ? h('div', {
-                            class: 'vxe-date-picker--suffix-icon',
-                            onClick: clickSuffixEvent
-                        }, suffixSlot
-                            ? getSlotVNs(suffixSlot({}))
-                            : [
-                                h('i', {
-                                    class: suffixIcon
-                                })
-                            ])
-                        : createCommentVNode()
-                ])
-                : null;
+                    : createCommentVNode()
+            ]);
         };
         const renderExtraSuffixIcon = () => {
-            return renderDatePickerIcon();
+            return h('div', {
+                class: 'vxe-date-picker--control-icon',
+                onClick: datePickerOpenEvent
+            }, [
+                h('i', {
+                    class: ['vxe-date-picker--date-picker-icon', getIcon().DATE_PICKER_DATE]
+                })
+            ]);
         };
         datePickerMethods = {
             dispatchEvent(type, params, evnt) {

package/es/form/render/index.js

@@ -331,6 +331,9 @@ renderer.mixin({
     VxeSwitch: {
         renderItemContent: defaultItemRender
     },
+    VxeUpload: {
+        renderItemContent: defaultItemRender
+    },
     // 以下已废弃
     $input: {
         renderItemContent: oldItemRender