@vunk/form 1.1.60 → 1.1.61

package/components/var-datetime-picker/index.js

@@ -1,5 +1,5 @@
 import { _VkfFormItemCtx, VkfFormItem } from '@vunk/form/components/form-item';
-import { defineComponent, computed, ref, resolveComponent, openBlock, createBlock, normalizeProps, guardReactiveProps, withCtx, createVNode, normalizeClass, createCommentVNode } from 'vue';
+import { defineComponent, computed, ref, resolveComponent, openBlock, createBlock, normalizeProps, guardReactiveProps, withCtx, createElementVNode, createVNode, normalizeClass, createCommentVNode } from 'vue';
 import { useComputedReadonly } from '@vunk/form/composables';
 import { Popup } from 'vant';
 import { DatePicker, TimePicker } from '@varlet/ui';
@@ -215,9 +215,11 @@ const _sfc_main = defineComponent({
     const readonly = useComputedReadonly(props2);
     const popupShow = ref(false);
     const currentTab = ref("date");
-    const preInput = (e) => {
+    const inputBlur = (e) => {
       const target = e.target;
       target.blur();
+    };
+    const preInput = () => {
       if (readonly.value)
         return;
       if (props2.modelValue && hasTime.value) {
@@ -227,6 +229,7 @@ const _sfc_main = defineComponent({
     };
     return {
       preInput,
+      inputBlur,
       popupShow,
       formItemBindProps,
       varDatePickerType,
@@ -248,16 +251,22 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
   const _component_VkfFormItem = resolveComponent("VkfFormItem");
   return openBlock(), createBlock(_component_VkfFormItem, normalizeProps(guardReactiveProps(_ctx.formItemBindProps)), {
     default: withCtx(() => [
-      createVNode(_component_ElDatePicker, {
-        "popper-class": "var-datetime-picker-el-popover",
-        "model-value": _ctx.modelValue,
-        onFocus: _ctx.preInput,
-        type: _ctx.type
-      }, null, 8, ["model-value", "onFocus", "type"]),
+      createElementVNode("div", {
+        onClickCapture: _cache[0] || (_cache[0] = (...args) => _ctx.preInput && _ctx.preInput(...args))
+      }, [
+        createVNode(_component_ElDatePicker, {
+          "popper-class": "var-datetime-picker-el-popover",
+          "model-value": _ctx.modelValue,
+          onFocus: _ctx.inputBlur,
+          type: _ctx.type,
+          readonly: _ctx.readonly,
+          "value-format": _ctx.valueFormat
+        }, null, 8, ["model-value", "onFocus", "type", "readonly", "value-format"])
+      ], 32),
       createVNode(_component_Popup, {
         position: "bottom",
         show: _ctx.popupShow,
-        "onUpdate:show": _cache[3] || (_cache[3] = ($event) => _ctx.popupShow = $event),
+        "onUpdate:show": _cache[4] || (_cache[4] = ($event) => _ctx.popupShow = $event),
         round: ""
       }, {
         default: withCtx(() => [
@@ -266,7 +275,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
               "is-hidden": !_ctx.hasTime
             }]),
             modelValue: _ctx.currentTab,
-            "onUpdate:modelValue": _cache[2] || (_cache[2] = ($event) => _ctx.currentTab = $event)
+            "onUpdate:modelValue": _cache[3] || (_cache[3] = ($event) => _ctx.currentTab = $event)
           }, {
             default: withCtx(() => [
               createVNode(_component_ElTabPane, {
@@ -278,7 +287,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
                     type: _ctx.varDatePickerType,
                     range: _ctx.isRange,
                     modelValue: _ctx.valueDate,
-                    "onUpdate:modelValue": _cache[0] || (_cache[0] = ($event) => _ctx.valueDate = $event),
+                    "onUpdate:modelValue": _cache[1] || (_cache[1] = ($event) => _ctx.valueDate = $event),
                     "allowed-dates": _ctx.allowedDates
                   }, null, 8, ["type", "range", "modelValue", "allowed-dates"])
                 ]),
@@ -292,7 +301,8 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
                 default: withCtx(() => [
                   createVNode(_component_TimePicker, {
                     modelValue: _ctx.valueTime,
-                    "onUpdate:modelValue": _cache[1] || (_cache[1] = ($event) => _ctx.valueTime = $event)
+                    "onUpdate:modelValue": _cache[2] || (_cache[2] = ($event) => _ctx.valueTime = $event),
+                    format: "24hr"
                   }, null, 8, ["modelValue"])
                 ]),
                 _: 1

package/components/var-datetime-picker/src/index.vue.d.ts

@@ -63,7 +63,8 @@ declare const _default: import("vue").DefineComponent<{
         default: string;
     };
 }, {
-    preInput: (e: FocusEvent) => void;
+    preInput: () => void;
+    inputBlur: (e: FocusEvent) => void;
     popupShow: import("vue").Ref<boolean>;
     formItemBindProps: import("vue").ComputedRef<{
         required: import("element-plus/es/utils").EpPropMergeType<BooleanConstructor, unknown, unknown> | undefined;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vunk/form",
-  "version": "1.1.60",
+  "version": "1.1.61",
   "description": "",
   "main": "index.esm.js",
   "scripts": {