From bc711932f796300346456b6a4b390391c816464f Mon Sep 17 00:00:00 2001
From: zhangdaiscott <zhangdaiscott@163.com>
Date: Fri, 18 Mar 2022 22:38:45 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B0=8Fbug=E5=A4=84=E7=90=86=E5=92=8Cvue3?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81=E7=94=9F=E6=88=90=E5=99=A8=E6=A8=A1=E6=9D=BF?=
 =?UTF-8?q?=E5=AE=8C=E5=96=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ant-design-vue-jeecg/src/views/examples/list/RoleList.vue | 1 +
 ant-design-vue-jeecg/src/views/examples/list/UserList.vue | 1 +
 .../src/views/jeecg/modules/JeecgOrderMainModal.vue       | 4 ----
 ant-design-vue-jeecg/yarn.lock                            | 8 ++++----
 .../${entityPackage}/vue3/${entityName}__data.tsi         | 6 +++++-
 .../${entityPackage}/vue3/${entityName}__data.tsi         | 6 +++++-
 .../${entityPackage}/vue3/${entityName}__data.tsi         | 6 +++++-
 .../${entityPackage}/vue3/${entityName}__data.tsi         | 6 +++++-
 8 files changed, 26 insertions(+), 12 deletions(-)

diff --git a/ant-design-vue-jeecg/src/views/examples/list/RoleList.vue b/ant-design-vue-jeecg/src/views/examples/list/RoleList.vue
index 40d9327c..21dd5178 100644
--- a/ant-design-vue-jeecg/src/views/examples/list/RoleList.vue
+++ b/ant-design-vue-jeecg/src/views/examples/list/RoleList.vue
@@ -32,6 +32,7 @@
       size="default"
       :columns="columns"
       :data="loadData"
+      :scroll="{}"
     >
       <div
         slot="expandedRowRender"
diff --git a/ant-design-vue-jeecg/src/views/examples/list/UserList.vue b/ant-design-vue-jeecg/src/views/examples/list/UserList.vue
index a3b95be8..3e26ea82 100644
--- a/ant-design-vue-jeecg/src/views/examples/list/UserList.vue
+++ b/ant-design-vue-jeecg/src/views/examples/list/UserList.vue
@@ -31,6 +31,7 @@
       size="default"
       :columns="columns"
       :data="loadData"
+      :scroll="{}"
     >
       <div
         slot="expandedRowRender"
diff --git a/ant-design-vue-jeecg/src/views/jeecg/modules/JeecgOrderMainModal.vue b/ant-design-vue-jeecg/src/views/jeecg/modules/JeecgOrderMainModal.vue
index 9fd9712c..ae77184d 100644
--- a/ant-design-vue-jeecg/src/views/jeecg/modules/JeecgOrderMainModal.vue
+++ b/ant-design-vue-jeecg/src/views/jeecg/modules/JeecgOrderMainModal.vue
@@ -251,8 +251,6 @@
       },
       delRowCustom (index) {
         console.log(index)
-        let all = this.orderMainModel
-        all['jeecgOrderCustomerList'].splice(index,1);
         this.orderMainModel.jeecgOrderCustomerList.splice(index,1);
         this.$forceUpdate();
       },
@@ -263,8 +261,6 @@
       },
       delRowTicket (index) {
         console.log(index)
-        let all = this.orderMainModel
-        all['jeecgOrderTicketList'].splice(index,1);
         this.orderMainModel.jeecgOrderTicketList.splice(index,1);
         this.$forceUpdate();
       },
diff --git a/ant-design-vue-jeecg/yarn.lock b/ant-design-vue-jeecg/yarn.lock
index e71943ec..4dc67da0 100644
--- a/ant-design-vue-jeecg/yarn.lock
+++ b/ant-design-vue-jeecg/yarn.lock
@@ -895,10 +895,10 @@
     cssnano-preset-default "^4.0.0"
     postcss "^7.0.0"
 
-"@jeecg/antd-online-mini@3.0.0-RC":
-  version "3.0.0-RC"
-  resolved "https://registry.npmjs.org/@jeecg/antd-online-mini/-/antd-online-mini-3.0.0-RC.tgz#8b220234d39bfcd9b8b1ce2c78ca1bd92b86da0b"
-  integrity sha512-oNYRPsnlKUPpJKJvQSaqgX6XenDPKwFLHcLYFdrmEYnSCGU46x1p/coqea9r8lI6s1Y2Az0+xAOdwOMPnu/AtQ==
+"@jeecg/antd-online-mini@3.1.0-beta":
+  version "3.1.0-beta"
+  resolved "https://registry.npmmirror.com/@jeecg/antd-online-mini/-/antd-online-mini-3.1.0-beta.tgz#cf3e254259503405a5e83ffa6775ac9fa02fe74c"
+  integrity sha512-pW0zWzExnxjlC3e7DzGYjQibLU22K/7N0kp1ddJrGgX33Ia/wq7ELOcwn6bLzITD89RcvX1JUW/om+IJ1PxOSw==
 
 "@mrmlnc/readdir-enhanced@^2.2.1":
   version "2.2.1"
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template/one/java/${bussiPackage}/${entityPackage}/vue3/${entityName}__data.tsi b/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template/one/java/${bussiPackage}/${entityPackage}/vue3/${entityName}__data.tsi
index ca1ed3d5..8c079bdf 100644
--- a/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template/one/java/${bussiPackage}/${entityPackage}/vue3/${entityName}__data.tsi
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template/one/java/${bussiPackage}/${entityPackage}/vue3/${entityName}__data.tsi
@@ -44,7 +44,11 @@ export const formSchema: FormSchema[] = [
      <#if po.fieldType =='date'>
     component: 'DatePicker'
      <#elseif po.fieldType =='datetime'>
-    component: 'TimePicker'
+    component: 'DatePicker',
+    componentProps: {
+      showTime: true,
+      valueFormat: 'YYYY-MM-DD hh:mm:ss',
+    },
      <#elseif "int,decimal,double,"?contains(po.fieldType)>
     component: 'InputNumber'
      <#else>
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template/one2/java/${bussiPackage}/${entityPackage}/vue3/${entityName}__data.tsi b/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template/one2/java/${bussiPackage}/${entityPackage}/vue3/${entityName}__data.tsi
index ca1ed3d5..8c079bdf 100644
--- a/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template/one2/java/${bussiPackage}/${entityPackage}/vue3/${entityName}__data.tsi
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template/one2/java/${bussiPackage}/${entityPackage}/vue3/${entityName}__data.tsi
@@ -44,7 +44,11 @@ export const formSchema: FormSchema[] = [
      <#if po.fieldType =='date'>
     component: 'DatePicker'
      <#elseif po.fieldType =='datetime'>
-    component: 'TimePicker'
+    component: 'DatePicker',
+    componentProps: {
+      showTime: true,
+      valueFormat: 'YYYY-MM-DD hh:mm:ss',
+    },
      <#elseif "int,decimal,double,"?contains(po.fieldType)>
     component: 'InputNumber'
      <#else>
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template/onetomany/java/${bussiPackage}/${entityPackage}/vue3/${entityName}__data.tsi b/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template/onetomany/java/${bussiPackage}/${entityPackage}/vue3/${entityName}__data.tsi
index d60f08ac..b3e9a5d4 100644
--- a/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template/onetomany/java/${bussiPackage}/${entityPackage}/vue3/${entityName}__data.tsi
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template/onetomany/java/${bussiPackage}/${entityPackage}/vue3/${entityName}__data.tsi
@@ -53,7 +53,11 @@ export const formSchema: FormSchema[] = [
      <#if po.fieldType =='date'>
     component: 'DatePicker'
      <#elseif po.fieldType =='datetime'>
-    component: 'TimePicker'
+    component: 'DatePicker',
+    componentProps: {
+      showTime: true,
+      valueFormat: 'YYYY-MM-DD hh:mm:ss',
+    },
      <#elseif "int,decimal,double,"?contains(po.fieldType)>
     component: 'InputNumber'
      <#else>
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template/onetomany2/java/${bussiPackage}/${entityPackage}/vue3/${entityName}__data.tsi b/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template/onetomany2/java/${bussiPackage}/${entityPackage}/vue3/${entityName}__data.tsi
index 56250f22..b9db8567 100644
--- a/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template/onetomany2/java/${bussiPackage}/${entityPackage}/vue3/${entityName}__data.tsi
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template/onetomany2/java/${bussiPackage}/${entityPackage}/vue3/${entityName}__data.tsi
@@ -52,7 +52,11 @@ export const formSchema: FormSchema[] = [
      <#if po.fieldType =='date'>
     component: 'DatePicker'
      <#elseif po.fieldType =='datetime'>
-    component: 'TimePicker'
+    component: 'DatePicker',
+    componentProps: {
+      showTime: true,
+      valueFormat: 'YYYY-MM-DD hh:mm:ss',
+    },
      <#elseif "int,decimal,double,"?contains(po.fieldType)>
     component: 'InputNumber'
      <#else>