@vunk/form 1.1.58 → 1.1.60

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

@@ -1,10 +1,9 @@
 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 { VkfDatePicker } from '@vunk/form/components/date-picker';
 import { useComputedReadonly } from '@vunk/form/composables';
 import { Popup } from 'vant';
 import { DatePicker, TimePicker } from '@varlet/ui';
-import { ElTabPane, ElTabs, dayjs } from 'element-plus';
+import { ElDatePicker, ElTabPane, ElTabs, dayjs } from 'element-plus';
 import 'vant/es/popup/style';
 import '@varlet/ui/es/date-picker/style';
 import '@varlet/ui/es/time-picker/style';
@@ -145,7 +144,7 @@ const _sfc_main = defineComponent({
   name: "VkfVarDatetimePicker",
   components: {
     VkfFormItem,
-    VkfDatePicker,
+    ElDatePicker,
     DatePicker,
     TimePicker,
     Popup,
@@ -216,7 +215,9 @@ const _sfc_main = defineComponent({
     const readonly = useComputedReadonly(props2);
     const popupShow = ref(false);
     const currentTab = ref("date");
-    const preInput = () => {
+    const preInput = (e) => {
+      const target = e.target;
+      target.blur();
       if (readonly.value)
         return;
       if (props2.modelValue && hasTime.value) {
@@ -238,7 +239,7 @@ const _sfc_main = defineComponent({
   }
 });
 function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
-  const _component_VkfDatePicker = resolveComponent("VkfDatePicker");
+  const _component_ElDatePicker = resolveComponent("ElDatePicker");
   const _component_DatePicker = resolveComponent("DatePicker");
   const _component_ElTabPane = resolveComponent("ElTabPane");
   const _component_TimePicker = resolveComponent("TimePicker");
@@ -247,7 +248,7 @@ 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_VkfDatePicker, {
+      createVNode(_component_ElDatePicker, {
         "popper-class": "var-datetime-picker-el-popover",
         "model-value": _ctx.modelValue,
         onFocus: _ctx.preInput,

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

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

package/components/var-datetime-picker/src/types.d.ts

@@ -1,5 +1,8 @@
 import { DatePickType } from 'element-plus';
 import { VarDatePickerType } from './const';
+import { VueComponentPropsType } from '@vunk/core';
+import { BasicSource } from '@vunk/form';
+import type CoreVue from './index.vue.d';
 export interface VarDatePickerTypeMedia {
     label: string;
     value: VarDatePickerType;
@@ -12,4 +15,8 @@ export interface ElDatePickerTypeMedia {
     isRange?: boolean;
     hasTime?: boolean;
 }
+export interface Source<P extends string = string> extends VueComponentPropsType<typeof CoreVue>, BasicSource {
+    prop?: P;
+    templateType: 'VkfVarDatetimePicker';
+}
 export {};

package/package.json

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