From 4fd30c495fb4c83dd1858d9af457587bebd43a0b Mon Sep 17 00:00:00 2001 From: zhangdaiscott Date: Tue, 21 Jul 2020 11:28:51 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E4=BB=A3=E7=A0=81=E7=94=9F?= =?UTF-8?q?=E6=88=90=E5=99=A8=E6=A8=A1=E6=9D=BF=E5=87=A0=E4=B8=AA=E9=97=AE?= =?UTF-8?q?=E9=A2=98=EF=BC=9A=201.=E4=B8=BB=E9=94=AE=E6=8D=A2=E6=88=90IdTy?= =?UTF-8?q?pe.ASSIGN=5FID=202.=E7=94=9F=E6=88=90=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=EF=BC=8C=E8=87=AA=E5=AE=9A=E4=B9=89=E5=AE=9E=E4=BD=93=E5=90=8D?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=8A=A5=E9=94=99=E9=97=AE=E9=A2=98=203.?= =?UTF-8?q?=E6=96=B0=E6=A8=A1=E5=BC=8F=E8=A1=A8=E5=8D=95=EF=BC=8C=E6=B5=81?= =?UTF-8?q?=E7=A8=8B=E5=8F=82=E6=95=B0=E4=B8=AA=E6=80=A7=E5=8C=96=E5=AE=9A?= =?UTF-8?q?=E4=B9=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/${entityName}.javai | 2 +- .../vue/${entityName}List.vuei | 7 +++-- .../vue/modules/${entityName}Form.vuei | 20 ++++++-------- .../vue/modules/${entityName}Modal.vuei | 6 ++--- .../${entityName}Modal__Style#Drawer.vuei | 4 +-- .../entity/${entityName}.javai | 2 +- .../${entityPackage}/entity/[1-n]Entity.javai | 2 +- .../vue/${entityName}List.vuei | 2 +- .../vue/modules/${entityName}Form.vuei | 26 ++++++++++++------- .../vue/modules/${entityName}Modal.vuei | 2 +- .../entity/${entityName}.javai | 2 +- .../entity/${entityName}.javai | 2 +- .../${entityPackage}/entity/[1-n]Entity.javai | 2 +- .../entity/${entityName}.javai | 2 +- .../${entityPackage}/entity/[1-n]Entity.javai | 2 +- 15 files changed, 42 insertions(+), 41 deletions(-) diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javai b/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javai index d8f22bf..4f5ca2a 100644 --- a/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javai +++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javai @@ -48,7 +48,7 @@ public class ${entityName} implements Serializable { /**${po.filedComment}*/ <#if po.fieldName == primaryKeyField> - @TableId(type = IdType.ID_WORKER_STR) + @TableId(type = IdType.ASSIGN_ID) <#else> <#if po.fieldDbType =='Date'> <#if po.classType=='date'> diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/vue/${entityName}List.vuei b/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/vue/${entityName}List.vuei index 3863690..8ca5a26 100644 --- a/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/vue/${entityName}List.vuei +++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/vue/${entityName}List.vuei @@ -143,7 +143,7 @@ - +
新增 @@ -234,7 +234,7 @@
- <${tableName?replace("_","-")}-modal ref="modalForm" @ok="modalFormOk"> + <${Format.humpToShortbar(entityName)}-modal ref="modalForm" @ok="modalFormOk"> @@ -247,7 +247,6 @@ <#if bpm_flag> import { postAction } from '@/api/manage' - <#if query_field_select> import JDictSelectTag from '@/components/dict/JDictSelectTag.vue' @@ -289,7 +288,7 @@ export default { - name: "${entityName}List", + name: '${entityName}List', mixins:[JeecgListMixin, mixinDevice], components: { <#if query_field_select> diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/vue/modules/${entityName}Form.vuei b/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/vue/modules/${entityName}Form.vuei index 83f903a..5e5a269 100644 --- a/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/vue/modules/${entityName}Form.vuei +++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/vue/modules/${entityName}Form.vuei @@ -168,7 +168,7 @@ export default { - name: "${entityName}Form", + name: '${entityName}Form', components: { JFormContainer, <#if form_date> @@ -218,8 +218,8 @@ default: ()=>{}, required: false }, - //表单模式：false流程表单 true普通表单 - normal: { + //表单模式：true流程表单 false普通表单 + formBpm: { type: Boolean, default: false, required: false @@ -254,25 +254,21 @@ }, computed: { formDisabled(){ - if(this.normal===false){ + if(this.formBpm===true){ if(this.formData.disabled===false){ return false - }else{ - return true } + return true } return this.disabled }, showFlowSubmitButton(){ - if(this.normal===false){ + if(this.formBpm===true){ if(this.formData.disabled===false){ return true - }else{ - return false } - }else{ - return false } + return false } }, created () { @@ -293,7 +289,7 @@ }, //渲染流程表单数据 showFlowData(){ - if(this.normal === false){ + if(this.formBpm === true){ let params = {id:this.formData.dataId}; getAction(this.url.queryById,params).then((res)=>{ if(res.success){ diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/vue/modules/${entityName}Modal.vuei b/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/vue/modules/${entityName}Modal.vuei index 794308f..9a707e0 100644 --- a/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/vue/modules/${entityName}Modal.vuei +++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/vue/modules/${entityName}Modal.vuei @@ -15,10 +15,10 @@ :visible="visible" switchFullscreen @ok="handleOk" - :okButtonProps="{ class:{'jee-hidden': disablesubmit} }" + :okButtonProps="{ class:{'jee-hidden': disableSubmit} }" @cancel="handleCancel" cancelText="关闭"> - <${tableName?replace("_","-")}-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit" normal> + <${Format.humpToShortbar(entityName)}-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"> @@ -26,7 +26,7 @@ import ${entityName}Form from './${entityName}Form' export default { - name: "${entityName}Modal", + name: '${entityName}Modal', components: { ${entityName}Form }, diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/vue/modules/${entityName}Modal__Style#Drawer.vuei b/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/vue/modules/${entityName}Modal__Style#Drawer.vuei index dbfbce7..c0a75f1 100644 --- a/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/vue/modules/${entityName}Modal__Style#Drawer.vuei +++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/vue/modules/${entityName}Modal__Style#Drawer.vuei @@ -15,7 +15,7 @@ :closable="false" @close="close" :visible="visible"> - <${tableName?replace("_","-")}-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit" normal> + <${Format.humpToShortbar(entityName)}-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit" normal>
关闭 提交 @@ -28,7 +28,7 @@ import ${entityName}Form from './${entityName}Form' export default { - name: "${entityName}Modal", + name: '${entityName}Modal', components: { ${entityName}Form }, diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/default/onetomany/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javai b/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/default/onetomany/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javai index db93896..31f478c 100644 --- a/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/default/onetomany/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javai +++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/default/onetomany/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javai @@ -42,7 +42,7 @@ public class ${entityName} implements Serializable { /**${po.filedComment}*/ <#if po.fieldName == primaryKeyField> - @TableId(type = IdType.ID_WORKER_STR) + @TableId(type = IdType.ASSIGN_ID) <#else> <#if po.fieldDbType =='Date'> <#if po.classType=='date'> diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/default/onetomany/java/${bussiPackage}/${entityPackage}/entity/[1-n]Entity.javai b/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/default/onetomany/java/${bussiPackage}/${entityPackage}/entity/[1-n]Entity.javai index 8e59725..1e559ab 100644 --- a/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/default/onetomany/java/${bussiPackage}/${entityPackage}/entity/[1-n]Entity.javai +++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/default/onetomany/java/${bussiPackage}/${entityPackage}/entity/[1-n]Entity.javai @@ -43,7 +43,7 @@ public class ${subTab.entityName} implements Serializable { /**${po.filedComment}*/ <#if po.fieldName == primaryKeyField> - @TableId(type = IdType.ID_WORKER_STR) + @TableId(type = IdType.ASSIGN_ID) <#else> <#if po.fieldDbType =='Date'> <#if po.classType=='date'> diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/default/onetomany/java/${bussiPackage}/${entityPackage}/vue/${entityName}List.vuei b/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/default/onetomany/java/${bussiPackage}/${entityPackage}/vue/${entityName}List.vuei index d873582..1a9cfe3 100644 --- a/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/default/onetomany/java/${bussiPackage}/${entityPackage}/vue/${entityName}List.vuei +++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/default/onetomany/java/${bussiPackage}/${entityPackage}/vue/${entityName}List.vuei @@ -224,7 +224,7 @@
- <${tableName?replace("_","-")}-modal ref="modalForm" @ok="modalFormOk"/> + <${Format.humpToShortbar(entityName)}-modal ref="modalForm" @ok="modalFormOk"/> diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/default/onetomany/java/${bussiPackage}/${entityPackage}/vue/modules/${entityName}Form.vuei b/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/default/onetomany/java/${bussiPackage}/${entityPackage}/vue/modules/${entityName}Form.vuei index 8420539..2f51ce5 100644 --- a/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/default/onetomany/java/${bussiPackage}/${entityPackage}/vue/modules/${entityName}Form.vuei +++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/default/onetomany/java/${bussiPackage}/${entityPackage}/vue/modules/${entityName}Form.vuei @@ -416,7 +416,7 @@ required: false }, //表单模式：false流程表单 true普通表单 - normal: { + formBpm: { type: Boolean, default: false, required: false @@ -430,25 +430,21 @@ }, computed: { formDisabled(){ - if(this.normal===false){ + if(this.formBpm===true){ if(this.formData.disabled===false){ return false - }else{ - return true } + return true } return this.disabled }, showFlowSubmitButton(){ - if(this.normal===false){ + if(this.formBpm===true){ if(this.formData.disabled===false){ return true - }else{ - return false } - }else{ - return false } + return false } }, created () { @@ -456,6 +452,16 @@ this.showFlowData(); }, methods: { + addBefore(){ + this.form.resetFields() +<#list subTables as sub><#rt/> + <#if sub.foreignRelationType =='1'> + this.$refs.${sub.entityName?uncap_first}Form.clearFormData() + <#else> + this.${sub.entityName?uncap_first}Table.dataSource=[] + + + }, getAllTable() { <#if hasOne2Many==true> let values = this.tableKeys.map(key => getRefPromise(this, key)) @@ -505,7 +511,7 @@ }, //渲染流程表单数据 showFlowData(){ - if(this.normal === false){ + if(this.formBpm === true){ let params = {id:this.formData.dataId}; getAction(this.url.queryById,params).then((res)=>{ if(res.success){ diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/default/onetomany/java/${bussiPackage}/${entityPackage}/vue/modules/${entityName}Modal.vuei b/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/default/onetomany/java/${bussiPackage}/${entityPackage}/vue/modules/${entityName}Modal.vuei index ac03246..8021bb8 100644 --- a/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/default/onetomany/java/${bussiPackage}/${entityPackage}/vue/modules/${entityName}Modal.vuei +++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/default/onetomany/java/${bussiPackage}/${entityPackage}/vue/modules/${entityName}Modal.vuei @@ -9,7 +9,7 @@ @ok="handleOk" :okButtonProps="{ class:{'jee-hidden': disableSubmit} }" @cancel="handleCancel"> - <${tableName?replace("_","-")}-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit" normal/> + <${Format.humpToShortbar(entityName)}-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"/> diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/default/tree/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javai b/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/default/tree/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javai index 2ab8d45..0d33483 100644 --- a/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/default/tree/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javai +++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/default/tree/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javai @@ -43,7 +43,7 @@ public class ${entityName} implements Serializable { /**${po.filedComment}*/ <#if po.fieldName == primaryKeyField> - @TableId(type = IdType.ID_WORKER_STR) + @TableId(type = IdType.ASSIGN_ID) <#else> <#if po.fieldDbType =='Date'> <#if po.classType=='date'> diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javai b/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javai index 32ae1a6..a3029b0 100644 --- a/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javai +++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javai @@ -42,7 +42,7 @@ public class ${entityName} implements Serializable { /**${po.filedComment}*/ <#if po.fieldName == primaryKeyField> - @TableId(type = IdType.ID_WORKER_STR) + @TableId(type = IdType.ASSIGN_ID) <#else> <#if po.fieldDbType =='Date'> <#if po.classType=='date'> diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/entity/[1-n]Entity.javai b/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/entity/[1-n]Entity.javai index e3ee689..7c1161f 100644 --- a/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/entity/[1-n]Entity.javai +++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/entity/[1-n]Entity.javai @@ -31,7 +31,7 @@ public class ${subTab.entityName} implements Serializable { <#list subTab.originalColumns as po> /**${po.filedComment}*/ <#if po.fieldName == primaryKeyField> - @TableId(type = IdType.ID_WORKER_STR) + @TableId(type = IdType.ASSIGN_ID) <#else> <#if po.fieldDbType =='Date'> <#if po.classType=='date'> diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/inner-table/onetomany/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javai b/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/inner-table/onetomany/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javai index 383f7f3..cb5ece7 100644 --- a/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/inner-table/onetomany/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javai +++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/inner-table/onetomany/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javai @@ -42,7 +42,7 @@ public class ${entityName} implements Serializable { /**${po.filedComment}*/ <#if po.fieldName == primaryKeyField> - @TableId(type = IdType.ID_WORKER_STR) + @TableId(type = IdType.ASSIGN_ID) <#else> <#if po.fieldDbType =='Date'> <#if po.classType=='date'> diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/inner-table/onetomany/java/${bussiPackage}/${entityPackage}/entity/[1-n]Entity.javai b/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/inner-table/onetomany/java/${bussiPackage}/${entityPackage}/entity/[1-n]Entity.javai index 66156f7..c58a2a2 100644 --- a/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/inner-table/onetomany/java/${bussiPackage}/${entityPackage}/entity/[1-n]Entity.javai +++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/inner-table/onetomany/java/${bussiPackage}/${entityPackage}/entity/[1-n]Entity.javai @@ -44,7 +44,7 @@ public class ${subTab.entityName} implements Serializable { /**${po.filedComment}*/ <#if po.fieldName == primaryKeyField> - @TableId(type = IdType.ID_WORKER_STR) + @TableId(type = IdType.ASSIGN_ID) <#else> <#if po.fieldDbType =='Date'> <#if po.classType=='date'> -- GitLab