wms / wms4_xinxiangweiliang · Commits

Commit ffd53821a5f47f3e7e8fdc1afb30483601621d4e

Authored by zhangdaiscott
1 parent 4259b8d8

小bug处理和vue3代码生成器模板完善

Inline Side-by-side
Showing 7 changed files with 22 additions and 8 deletions
ant-design-vue-jeecg/src/views/examples/list/RoleList.vue
  View file @ffd5382
@@ -32,6 +32,7 @@ @@ -32,6 +32,7 @@
32 size="default" 32 size="default"
33 :columns="columns" 33 :columns="columns"
34 :data="loadData" 34 :data="loadData"
  35 + :scroll="{}"
35 > 36 >
36 <div 37 <div
37 slot="expandedRowRender" 38 slot="expandedRowRender"
ant-design-vue-jeecg/src/views/examples/list/UserList.vue
  View file @ffd5382
@@ -31,6 +31,7 @@ @@ -31,6 +31,7 @@
31 size="default" 31 size="default"
32 :columns="columns" 32 :columns="columns"
33 :data="loadData" 33 :data="loadData"
  34 + :scroll="{}"
34 > 35 >
35 <div 36 <div
36 slot="expandedRowRender" 37 slot="expandedRowRender"
ant-design-vue-jeecg/src/views/jeecg/modules/JeecgOrderMainModal.vue
  View file @ffd5382
@@ -251,8 +251,6 @@ @@ -251,8 +251,6 @@
251 }, 251 },
252 delRowCustom (index) { 252 delRowCustom (index) {
253 console.log(index) 253 console.log(index)
254 - let all = this.orderMainModel  
255 - all['jeecgOrderCustomerList'].splice(index,1);  
256 this.orderMainModel.jeecgOrderCustomerList.splice(index,1); 254 this.orderMainModel.jeecgOrderCustomerList.splice(index,1);
257 this.$forceUpdate(); 255 this.$forceUpdate();
258 }, 256 },
@@ -263,8 +261,6 @@ @@ -263,8 +261,6 @@
263 }, 261 },
264 delRowTicket (index) { 262 delRowTicket (index) {
265 console.log(index) 263 console.log(index)
266 - let all = this.orderMainModel  
267 - all['jeecgOrderTicketList'].splice(index,1);  
268 this.orderMainModel.jeecgOrderTicketList.splice(index,1); 264 this.orderMainModel.jeecgOrderTicketList.splice(index,1);
269 this.$forceUpdate(); 265 this.$forceUpdate();
270 }, 266 },
jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template/one/java/${bussiPackage}/${entityPackage}/vue3/${entityName}__data.tsi
  View file @ffd5382
@@ -44,7 +44,11 @@ export const formSchema: FormSchema[] = [ @@ -44,7 +44,11 @@ export const formSchema: FormSchema[] = [
44 <#if po.fieldType =='date'> 44 <#if po.fieldType =='date'>
45 component: 'DatePicker' 45 component: 'DatePicker'
46 <#elseif po.fieldType =='datetime'> 46 <#elseif po.fieldType =='datetime'>
47 - component: 'TimePicker' 47 + component: 'DatePicker',
  48 + componentProps: {
  49 + showTime: true,
  50 + valueFormat: 'YYYY-MM-DD hh:mm:ss',
  51 + },
48 <#elseif "int,decimal,double,"?contains(po.fieldType)> 52 <#elseif "int,decimal,double,"?contains(po.fieldType)>
49 component: 'InputNumber' 53 component: 'InputNumber'
50 <#else> 54 <#else>
jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template/one2/java/${bussiPackage}/${entityPackage}/vue3/${entityName}__data.tsi
  View file @ffd5382
@@ -44,7 +44,11 @@ export const formSchema: FormSchema[] = [ @@ -44,7 +44,11 @@ export const formSchema: FormSchema[] = [
44 <#if po.fieldType =='date'> 44 <#if po.fieldType =='date'>
45 component: 'DatePicker' 45 component: 'DatePicker'
46 <#elseif po.fieldType =='datetime'> 46 <#elseif po.fieldType =='datetime'>
47 - component: 'TimePicker' 47 + component: 'DatePicker',
  48 + componentProps: {
  49 + showTime: true,
  50 + valueFormat: 'YYYY-MM-DD hh:mm:ss',
  51 + },
48 <#elseif "int,decimal,double,"?contains(po.fieldType)> 52 <#elseif "int,decimal,double,"?contains(po.fieldType)>
49 component: 'InputNumber' 53 component: 'InputNumber'
50 <#else> 54 <#else>
jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template/onetomany/java/${bussiPackage}/${entityPackage}/vue3/${entityName}__data.tsi
  View file @ffd5382
@@ -53,7 +53,11 @@ export const formSchema: FormSchema[] = [ @@ -53,7 +53,11 @@ export const formSchema: FormSchema[] = [
53 <#if po.fieldType =='date'> 53 <#if po.fieldType =='date'>
54 component: 'DatePicker' 54 component: 'DatePicker'
55 <#elseif po.fieldType =='datetime'> 55 <#elseif po.fieldType =='datetime'>
56 - component: 'TimePicker' 56 + component: 'DatePicker',
  57 + componentProps: {
  58 + showTime: true,
  59 + valueFormat: 'YYYY-MM-DD hh:mm:ss',
  60 + },
57 <#elseif "int,decimal,double,"?contains(po.fieldType)> 61 <#elseif "int,decimal,double,"?contains(po.fieldType)>
58 component: 'InputNumber' 62 component: 'InputNumber'
59 <#else> 63 <#else>
jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template/onetomany2/java/${bussiPackage}/${entityPackage}/vue3/${entityName}__data.tsi
  View file @ffd5382
@@ -52,7 +52,11 @@ export const formSchema: FormSchema[] = [ @@ -52,7 +52,11 @@ export const formSchema: FormSchema[] = [
52 <#if po.fieldType =='date'> 52 <#if po.fieldType =='date'>
53 component: 'DatePicker' 53 component: 'DatePicker'
54 <#elseif po.fieldType =='datetime'> 54 <#elseif po.fieldType =='datetime'>
55 - component: 'TimePicker' 55 + component: 'DatePicker',
  56 + componentProps: {
  57 + showTime: true,
  58 + valueFormat: 'YYYY-MM-DD hh:mm:ss',
  59 + },
56 <#elseif "int,decimal,double,"?contains(po.fieldType)> 60 <#elseif "int,decimal,double,"?contains(po.fieldType)>
57 component: 'InputNumber' 61 component: 'InputNumber'
58 <#else> 62 <#else>