From ffd53821a5f47f3e7e8fdc1afb30483601621d4e Mon Sep 17 00:00:00 2001
From: zhangdaiscott <zhangdaiscott@163.com>
Date: Fri, 18 Mar 2022 22:37:09 +0800
Subject: [PATCH] 小bug处理和vue3代码生成器模板完善
---
ant-design-vue-jeecg/src/views/examples/list/RoleList.vue | 1 +
ant-design-vue-jeecg/src/views/examples/list/UserList.vue | 1 +
ant-design-vue-jeecg/src/views/jeecg/modules/JeecgOrderMainModal.vue | 4 ----
jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template/one/java/${bussiPackage}/${entityPackage}/vue3/${entityName}__data.tsi | 6 +++++-
jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template/one2/java/${bussiPackage}/${entityPackage}/vue3/${entityName}__data.tsi | 6 +++++-
jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template/onetomany/java/${bussiPackage}/${entityPackage}/vue3/${entityName}__data.tsi | 6 +++++-
jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template/onetomany2/java/${bussiPackage}/${entityPackage}/vue3/${entityName}__data.tsi | 6 +++++-
7 files changed, 22 insertions(+), 8 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 40d9327..21dd517 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 a3b95be..3e26ea8 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 9fd9712..ae77184 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/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 ca1ed3d..8c079bd 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 ca1ed3d..8c079bd 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 d60f08a..b3e9a5d 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 56250f2..b9db856 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>
--
libgit2 0.22.2