From a250827b374b16a1e54f37ea79f8a4394c629405 Mon Sep 17 00:00:00 2001
From: zhangdaiscott <zhangdaiscott@163.com>
Date: Sun, 25 Sep 2022 09:54:42 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A1=8C=E7=BC=96=E8=BE=91=E5=88=97=E8=A1=A8JV?=
 =?UTF-8?q?xeTable=E6=97=B6=E9=97=B4=E6=8E=A7=E4=BB=B6=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/cells/JVxeDateCell.vue        | 16 +++-------------
 .../src/components/cells/JVxeTimeCell.vue        | 15 +++------------
 src/views/demo/jeecg/JVxeTableDemo/JVxeDemo1.vue |  2 +-
 src/views/demo/jeecg/JVxeTableDemo/JVxeDemo5.vue |  2 +-
 4 files changed, 8 insertions(+), 27 deletions(-)

diff --git a/src/components/jeecg/JVxeTable/src/components/cells/JVxeDateCell.vue b/src/components/jeecg/JVxeTable/src/components/cells/JVxeDateCell.vue
index 9dc1159..f8a1b2a 100644
--- a/src/components/jeecg/JVxeTable/src/components/cells/JVxeDateCell.vue
+++ b/src/components/jeecg/JVxeTable/src/components/cells/JVxeDateCell.vue
@@ -6,6 +6,7 @@
     :showTime="isDatetime"
     dropdownClassName="j-vxe-date-picker"
     style="min-width: 0"
+    v-model:open="openPicker"
     v-bind="cellProps"
     @change="handleChange"
   />
@@ -14,7 +15,6 @@
 <script lang="ts">
   import { ref, computed, watch, defineComponent } from 'vue';
   import dayjs from 'dayjs';
-  import { dispatchEvent } from '/@/components/jeecg/JVxeTable/utils';
   import { JVxeComponent, JVxeTypes } from '/@/components/jeecg/JVxeTable/types';
   import { useJVxeComponent, useJVxeCompProps } from '/@/components/jeecg/JVxeTable/hooks';
   import { isEmpty } from '/@/utils/is';
@@ -30,6 +30,7 @@
         let format = originColumn.value.format;
         return format ? format : isDatetime.value ? 'YYYY-MM-DD HH:mm:ss' : 'YYYY-MM-DD';
       });
+      const openPicker = ref(true);
       watch(
         innerValue,
         (val) => {
@@ -51,24 +52,13 @@
         isDatetime,
         dateFormat,
         innerDateValue,
+        openPicker,
         handleChange,
       };
     },
     // 【组件增强】注释详见：JVxeComponent.Enhanced
     enhanced: {
       aopEvents: {
-        editActived({ $event, row, column }) {
-          dispatchEvent({
-            $event,
-            row,
-            column,
-            props: this.props,
-            instance: this,
-            className: '.ant-calendar-picker',
-            isClick: false,
-            handler: (el) => el.children[0].click(),
-          });
-        },
       },
     } as JVxeComponent.EnhancedPartial,
   });
diff --git a/src/components/jeecg/JVxeTable/src/components/cells/JVxeTimeCell.vue b/src/components/jeecg/JVxeTable/src/components/cells/JVxeTimeCell.vue
index 81657ba..4a6e1dc 100644
--- a/src/components/jeecg/JVxeTable/src/components/cells/JVxeTimeCell.vue
+++ b/src/components/jeecg/JVxeTable/src/components/cells/JVxeTimeCell.vue
@@ -5,6 +5,7 @@
     :format="format"
     dropdownClassName="j-vxe-time-picker"
     style="min-width: 0"
+    v-model:open="openPicker"
     v-bind="cellProps"
     @change="handleChange"
     :getPopupContainer="(node) => node.parentNode"
@@ -15,7 +16,6 @@
   import { ref, computed, watch, defineComponent } from 'vue';
   import dayjs from 'dayjs';
   import { TimePicker } from 'ant-design-vue';
-  import { dispatchEvent } from '/@/components/jeecg/JVxeTable/utils';
   import { JVxeComponent } from '/@/components/jeecg/JVxeTable/types';
   import { useJVxeComponent, useJVxeCompProps } from '/@/components/jeecg/JVxeTable/hooks';
   import { isEmpty } from '/@/utils/is';
@@ -31,6 +31,7 @@
         let format = originColumn.value.format;
         return format ? format : 'HH:mm:ss';
       });
+      const openPicker = ref(true);
       watch(
         innerValue,
         (val) => {
@@ -51,23 +52,13 @@
         cellProps,
         format,
         innerTimeValue,
+        openPicker,
         handleChange,
       };
     },
     // 【组件增强】注释详见：JVxeComponent.Enhanced
     enhanced: {
       aopEvents: {
-        editActived({ $event, row, column }) {
-          dispatchEvent({
-            $event,
-            row,
-            column,
-            props: this.props,
-            instance: this,
-            className: '.ant-time-picker-input',
-            isClick: true,
-          });
-        },
       },
     } as JVxeComponent.EnhancedPartial,
   });
diff --git a/src/views/demo/jeecg/JVxeTableDemo/JVxeDemo1.vue b/src/views/demo/jeecg/JVxeTableDemo/JVxeDemo1.vue
index 863adb6..32293bf 100644
--- a/src/views/demo/jeecg/JVxeTableDemo/JVxeDemo1.vue
+++ b/src/views/demo/jeecg/JVxeTableDemo/JVxeDemo1.vue
@@ -190,7 +190,7 @@
       key: 'datetime',
       type: JVxeTypes.datetime,
       width: 200,
-      defaultValue: '2019-4-30 14:52:22',
+      defaultValue: '2019-04-30 14:52:22',
       placeholder: '请选择',
     },
     {
diff --git a/src/views/demo/jeecg/JVxeTableDemo/JVxeDemo5.vue b/src/views/demo/jeecg/JVxeTableDemo/JVxeDemo5.vue
index 7371e7a..c756fc2 100644
--- a/src/views/demo/jeecg/JVxeTableDemo/JVxeDemo5.vue
+++ b/src/views/demo/jeecg/JVxeTableDemo/JVxeDemo5.vue
@@ -56,7 +56,7 @@
           key: 'datetime',
           type: JVxeTypes.datetime,
           width: 240,
-          defaultValue: '2019-4-30 14:52:22',
+          defaultValue: '2019-04-30 14:51:22',
           placeholder: '请选择',
         },
         {