JeroBoot/base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix bug 修改生成的模板不符合ESLint的问题

Browse Source
This commit is contained in:
zhaoxiao
2023-03-15 14:35:12 +08:00
parent 1054dee742
commit 6570916f48
11 changed files with 594 additions and 611 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/common/utils.ftl
+9 -9
View File
@@ -110,24 +110,24 @@
<#assign superQuery_dictText="${po.dictText}"> <#assign superQuery_dictText="${po.dictText}">
</#if> </#if>
<#if po.classType=="popup"> <#if po.classType=="popup">
<#return "{type:'${po.classType}',value:'${po.fieldName}',text:'${po.filedComment}', popup:{code:'${po.dictTable}',field:'${po.dictField?split(',')[0]}',orgFields:'${po.dictField?split(',')[0]}',destFields:'${po.dictText?split(',')[0]}'}}"> <#return "{ type: '${po.classType}', value: '${po.fieldName}', text: '${po.filedComment}', popup: {code: '${po.dictTable}', field: '${po.dictField?split(',')[0]}', orgFields: '${po.dictField?split(',')[0]}', destFields: '${po.dictText?split(',')[0]}'} }">
<#elseif po.classType=="sel_user" || po.classType=="sel_depart" || po.classType=="datetime" || po.classType=="date" || po.classType=="pca" || po.classType=="switch"> <#elseif po.classType=="sel_user" || po.classType=="sel_depart" || po.classType=="datetime" || po.classType=="date" || po.classType=="pca" || po.classType=="switch">
<#return "{type:'${po.classType}',value:'${po.fieldName}',text:'${po.filedComment}'}"> <#return "{ type: '${po.classType}', value: '${po.fieldName}', text: '${po.filedComment}' }">
<#else> <#else>
<#if po.classType=="sel_search" || po.classType=="list_multi"> <#if po.classType=="sel_search" || po.classType=="list_multi">
<#return "{type:'${po.classType}',value:'${po.fieldName}',text:'${po.filedComment}',dictTable:'${superQuery_dictTable}', dictText:'${superQuery_dictText}', dictCode:'${po.dictField}'}"> <#return "{ type: '${po.classType}', value: '${po.fieldName}', text: '${po.filedComment}', dictTable: '${superQuery_dictTable}', dictText: '${superQuery_dictText}', dictCode: '${po.dictField}' }">
<#elseif po.dictTable?? && po.dictTable!="" && po.classType!="sel_tree" && po.classType!="cat_tree" && po.classType!="link_down"> <#elseif po.dictTable?? && po.dictTable!="" && po.classType!="sel_tree" && po.classType!="cat_tree" && po.classType!="link_down">
<#return "{type:'${po.fieldDbType}',value:'${po.fieldName}',text:'${po.filedComment}',dictCode:'${po.dictTable},${po.dictText},${po.dictField}'}"> <#return "{ type: '${po.fieldDbType}', value: '${po.fieldName}', text: '${po.filedComment}', dictCode: '${po.dictTable}, ${po.dictText}, ${po.dictField}' }">
<#elseif po.dictField?? && po.classType!="sel_tree" && po.classType!="cat_tree" && po.classType!="link_down"> <#elseif po.dictField?? && po.classType!="sel_tree" && po.classType!="cat_tree" && po.classType!="link_down">
<#return "{type:'${po.fieldDbType}',value:'${po.fieldName}',text:'${po.filedComment}',dictCode:'${po.dictField}'}"> <#return "{ type: '${po.fieldDbType}', value: '${po.fieldName}', text: '${po.filedComment}', dictCode: '${po.dictField}' }">
<#elseif po.fieldDbType=="Text"> <#elseif po.fieldDbType=="Text">
<#return "{type:'string',value:'${po.fieldName}',text:'${po.filedComment}'}"> <#return "{ type: 'string', value: '${po.fieldName}', text: '${po.filedComment}' }">
<#elseif po.fieldDbType=="Blob"> <#elseif po.fieldDbType=="Blob">
<#return "{type:'byte',value:'${po.fieldName}',text:'${po.filedComment}'}"> <#return "{ type: 'byte', value: '${po.fieldName}', text: '${po.filedComment}' }">
<#elseif po.fieldDbType=="BigDecimal" || po.fieldDbType=="double"> <#elseif po.fieldDbType=="BigDecimal" || po.fieldDbType=="double">
<#return "{type:'number',value:'${po.fieldName}',text:'${po.filedComment}'}"> <#return "{ type: 'number', value: '${po.fieldName}', text: '${po.filedComment}' }">
<#else> <#else>
<#return "{type:'${po.fieldDbType}',value:'${po.fieldName}',text:'${po.filedComment}'}"> <#return "{ type: '${po.fieldDbType}', value: '${po.fieldName}', text: '${po.filedComment}' }">
</#if> </#if>
</#if> </#if>
</#function> </#function>
jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/common/validatorRulesTemplate/main.ftl
+3 -3
View File
@@ -1,5 +1,5 @@
validatorRules: { validatorRules: {
<#list columns as po> <#list columns as po>
<#include "core.ftl"> <#include "core.ftl">
</#list> </#list>
}, },
jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/vue/${entityName}List.vuei
+62 -62
View File
@@ -215,26 +215,26 @@
<script> <script>
import '@/assets/less/TableExpand.less' import '@/assets/less/TableExpand.less'
import { mixinDevice } from '@/utils/mixin' import { mixinDevice } from '@/utils/mixin'
import { JeroListMixin } from '@/mixins/JeroListMixin' import { JeroListMixin } from '@/mixins/JeroListMixin'
import ${entityName}Modal from './modules/${entityName}Modal' import ${entityName}Modal from './modules/${entityName}Modal'
<#if bpm_flag> <#if bpm_flag>
import { postAction } from '@/api/manage' import { postAction } from '@/api/manage'
</#if> </#if>
<#if list_need_category> <#if list_need_category>
import { loadCategoryData } from '@/api/api' import { loadCategoryData } from '@/api/api'
</#if> </#if>
<#if list_need_dict> <#if list_need_dict>
import {filterMultiDictText} from '@/components/dict/JDictSelectUtil' import {filterMultiDictText} from '@/components/dict/JDictSelectUtil'
</#if> </#if>
<#if list_need_pca> <#if list_need_pca>
import Area from '@/components/_util/Area' import Area from '@/components/_util/Area'
</#if> </#if>
export default { export default {
name: '${entityName}List', name: '${entityName}List',
mixins:[JeroListMixin, mixinDevice], mixins: [JeroListMixin, mixinDevice],
components: { components: {
${entityName}Modal ${entityName}Modal
}, },
@@ -246,11 +246,11 @@
{ {
title: '#', title: '#',
dataIndex: '', dataIndex: '',
key:'rowIndex', key: 'rowIndex',
width:60, width: 60,
align:"center", align: 'center',
customRender:function (t,r,index) { customRender: function (t, r, index) {
return parseInt(index)+1; return parseInt(index) + 1
} }
}, },
<#assign showColNum=0> <#assign showColNum=0>
@@ -258,15 +258,15 @@
<#if po.isShowList =='Y' && po.fieldName !='id'> <#if po.isShowList =='Y' && po.fieldName !='id'>
<#assign showColNum=showColNum+1> <#assign showColNum=showColNum+1>
{ {
title:'${po.filedComment}', title: '${po.filedComment}',
align:"center", align: 'center',
<#if po.sort=='Y'> <#if po.sort=='Y'>
sorter: true, sorter: true,
</#if> </#if>
<#if po.classType=='date'> <#if po.classType=='date'>
dataIndex: '${po.fieldName}', dataIndex: '${po.fieldName}',
customRender:function (text) { customRender: function (text) {
return !text?"":(text.length>10?text.substr(0,10):text) return !text ? '' : (text.length > 10 ? text.substr(0, 10) : text)
} }
<#elseif po.fieldDbType=='Blob'> <#elseif po.fieldDbType=='Blob'>
dataIndex: '${po.fieldName}String' dataIndex: '${po.fieldName}String'
@@ -304,34 +304,34 @@
{ {
title: '操作', title: '操作',
dataIndex: 'action', dataIndex: 'action',
align:"center", align: 'center',
<#if tableVo.extendParams.scroll=='1'> <#if tableVo.extendParams.scroll=='1'>
fixed:"right", fixed: 'right',
width:147, width: 147,
</#if> </#if>
scopedSlots: { customRender: 'action' } scopedSlots: { customRender: 'action' }
} }
], ],
url: { url: {
list: "/${entityPackage}/${entityName?uncap_first}/page", list: '/${entityPackage}/${entityName?uncap_first}/page',
delete: "/${entityPackage}/${entityName?uncap_first}/delete", delete: '/${entityPackage}/${entityName?uncap_first}/delete',
deleteBatch: "/${entityPackage}/${entityName?uncap_first}/deleteBatch", deleteBatch: '/${entityPackage}/${entityName?uncap_first}/deleteBatch',
exportXlsUrl: "/${entityPackage}/${entityName?uncap_first}/exportXls", exportXlsUrl: '/${entityPackage}/${entityName?uncap_first}/exportXls',
importExcelUrl: "${entityPackage}/${entityName?uncap_first}/importExcel", importExcelUrl: '${entityPackage}/${entityName?uncap_first}/importExcel'<#if bpm_flag>,
<#if bpm_flag>startProcess: '/act/process/extActProcess/startMutilProcess'</#if> startProcess: '/act/process/extActProcess/startMutilProcess'</#if>
}, },
<#if bpm_flag> <#if bpm_flag>
//代码生成后需手动设置流程编码 //代码生成后需手动设置流程编码
flowCode: 'dev_${tableName}_001', flowCode: 'dev_${tableName}_001',
</#if> </#if>
dictOptions:{}, dictOptions: {},
<#if list_need_pca> <#if list_need_pca>
pcaData:'', pcaData: '',
</#if> </#if>
superFieldList:[], superFieldList: []
} }
}, },
created() { created () {
<#if list_need_pca> <#if list_need_pca>
this.pcaData = new Area() this.pcaData = new Area()
</#if> </#if>
@@ -349,29 +349,29 @@
<#assign switch_extend_arr2=a> <#assign switch_extend_arr2=a>
</#if> </#if>
</#list> </#list>
this.$set(this.dictOptions, '${po.fieldName}', [{text:'是',value:'${switch_extend_arr1}'},{text:'否',value:'${switch_extend_arr2}'}]) this.$set(this.dictOptions, '${po.fieldName}', [{ text: '是', value: '${switch_extend_arr1}' }, { text: '否', value: '${switch_extend_arr2}' }])
</#if> </#if>
</#list> </#list>
</#if> </#if>
this.getSuperFieldList(); this.getSuperFieldList()
}, },
computed: { computed: {
importExcelUrl: function(){ importExcelUrl: function () {
<#noparse>return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;</#noparse> <#noparse>return `${window._CONFIG.domianURL}/${this.url.importExcelUrl}`</#noparse>
}, }
}, },
methods: { methods: {
<#if list_need_pca> <#if list_need_pca>
getPcaText(code){ getPcaText (code) {
return this.pcaData.getText(code); return this.pcaData.getText(code)
}, },
</#if> </#if>
<#if bpm_flag> <#if bpm_flag>
startProcess(record){ startProcess (record) {
this.$confirm({ this.$confirm({
title:'提示', title:'提示',
content:'确认提交流程吗?', content:'确认提交流程吗?',
onOk:()=>{ onOk: () => {
let params = { let params = {
flowCode: this.flowCode, flowCode: this.flowCode,
id: record.id, id: record.id,
@@ -379,25 +379,25 @@
formUrlMobile: '' formUrlMobile: ''
} }
postAction(this.url.startProcess, params).then(res=>{ postAction(this.url.startProcess, params).then(res=>{
if(res.success){ if (res.success) {
this.$message.success(res.message); this.$message.success(res.message)
this.loadData(); this.loadData()
this.onClearSelected(); this.onClearSelected()
}else{ } else {
this.$message.warning(res.message); this.$message.warning(res.message)
} }
}).catch((e)=>{ }).catch((e)=>{
this.$message.warning('不识别的请求!'); this.$message.warning('不识别的请求!')
}) })
} }
}) })
}, },
</#if> </#if>
initDictConfig(){ initDictConfig () {
<#list columns as po> <#list columns as po>
<#if (po.isQuery=='Y' || po.isShowList=='Y') && po.classType!='popup'> <#if (po.isQuery=='Y' || po.isShowList=='Y') && po.classType!='popup'>
<#if po.classType=='cat_tree' && list_need_category==true> <#if po.classType=='cat_tree' && list_need_category==true>
loadCategoryData({code:'${po.dictField?default("")}'}).then((res) => { loadCategoryData({ code: '${po.dictField?default("")}' }).then((res) => {
if (res.success) { if (res.success) {
this.$set(this.dictOptions, '${po.fieldName}', res.result) this.$set(this.dictOptions, '${po.fieldName}', res.result)
} }
@@ -406,17 +406,17 @@
</#if> </#if>
</#list> </#list>
}, },
getSuperFieldList(){ getSuperFieldList () {
<#include "/common/utils.ftl"> <#include "/common/utils.ftl">
let fieldList=[]; const fieldList = []
<#list columns as po> <#list columns as po>
fieldList.push(${superQueryFieldList(po)}) fieldList.push(${superQueryFieldList(po)})
</#list> </#list>
this.superFieldList = fieldList this.superFieldList = fieldList
} }
} }
} }
</script> </script>
<style scoped> <style scoped>
@import '~@assets/less/common.less'; @import '~@assets/less/common.less';
</style> </style>
jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/vue/modules/${entityName}Form.vuei
+56 -70
View File
@@ -119,29 +119,27 @@
<script> <script>
import { httpAction, getAction } from '@/api/manage' import { postAction <#if bpm_flag>, getAction </#if>} from '@/api/manage'
import { validateDuplicateValue } from '@/utils/util'
export default { export default {
name: '${entityName}Form', name: '${entityName}Form',
components: { components: {},
},
props: { props: {
<#if bpm_flag> <#if bpm_flag>
//流程表单data // 流程表单data
formData: { formData: {
type: Object, type: Object,
default: ()=>{}, default: ()=>{},
required: false required: false
}, },
//表单模式：true流程表单 false普通表单 // 表单模式：true流程表单 false普通表单
formBpm: { formBpm: {
type: Boolean, type: Boolean,
default: false, default: false,
required: false required: false
}, },
</#if> </#if>
//表单禁用 // 表单禁用
disabled: { disabled: {
type: Boolean, type: Boolean,
default: false, default: false,
@@ -150,117 +148,105 @@
}, },
data () { data () {
return { return {
model:{ model: {<#include "/common/init/initValue.ftl">},
<#include "/common/init/initValue.ftl">
},
labelCol: { labelCol: {
xs: { span: 24 }, xs: { span: 24 },
sm: { span: 5 }, sm: { span: 5 }
}, },
wrapperCol: { wrapperCol: {
xs: { span: 24 }, xs: { span: 24 },
sm: { span: 16 }, sm: { span: 16 }
}, },
confirmLoading: false, confirmLoading: false,
<#include "/common/validatorRulesTemplate/main.ftl"> <#include "/common/validatorRulesTemplate/main.ftl">
url: { url: {
add: "/${entityPackage}/${entityName?uncap_first}/add", add: '/${entityPackage}/${entityName?uncap_first}/add',
edit: "/${entityPackage}/${entityName?uncap_first}/edit", edit: '/${entityPackage}/${entityName?uncap_first}/edit',
queryById: "/${entityPackage}/${entityName?uncap_first}/queryById" queryById: '/${entityPackage}/${entityName?uncap_first}/queryById'
} }
} }
}, },
computed: { computed: {
formDisabled(){ formDisabled () {
<#if bpm_flag> <#if bpm_flag>
if(this.formBpm===true){ if (this.formBpm === true) {
if(this.formData.disabled===false){ if (this.formData.disabled === false) {
return false return false
} }
return true return true
} }
</#if> </#if>
return this.disabled return this.disabled
}, }<#if bpm_flag>,
<#if bpm_flag> showFlowSubmitButton () {
showFlowSubmitButton(){ if (this.formBpm === true) {
if(this.formBpm===true){ if (this.formData.disabled === false) {
if(this.formData.disabled===false){
return true return true
} }
} }
return false return false
} }</#if>
</#if>
}, },
created () { created () {
//备份model原始值 // 备份model原始值
this.modelDefault = JSON.parse(JSON.stringify(this.model)); this.modelDefault = JSON.parse(JSON.stringify(this.model))
<#if bpm_flag> <#if bpm_flag>
//如果是流程中表单，则需要加载流程表单data // 如果是流程中表单，则需要加载流程表单data
this.showFlowData(); this.showFlowData()
</#if> </#if>
}, },
methods: { methods: {
add () { add () {
this.edit(this.modelDefault); this.edit(this.modelDefault)
}, },
edit (record) { edit (record) {
this.model = Object.assign({}, record); this.model = Object.assign({}, record)
this.visible = true; this.visible = true
}, },
<#if bpm_flag> <#if bpm_flag>
//渲染流程表单数据 //渲染流程表单数据
showFlowData(){ showFlowData () {
if(this.formBpm === true){ if (this.formBpm === true) {
let params = {id:this.formData.dataId}; let params = {id:this.formData.dataId}
getAction(this.url.queryById,params).then((res)=>{ getAction(this.url.queryById,params).then((res) => {
if(res.success){ if(res.success){
this.edit (res.result); this.edit(res.result)
} }
}); })
} }
}, },
</#if> </#if>
submitForm () { submitForm () {
const that = this; const that = this
// 触发表单验证 // 触发表单验证
this.$refs.form.validate(valid => { this.$refs.form.validate(valid => {
if (valid) { if (valid) {
that.confirmLoading = true; that.confirmLoading = true
let httpurl = ''; let httpurl
let method = ''; if (!this.model.id) {
if(!this.model.id){ httpurl = this.url.add
httpurl+=this.url.add; } else {
method = 'post'; httpurl = this.url.edit
}else{
httpurl+=this.url.edit;
method = 'put';
} }
httpAction(httpurl,this.model,method).then((res)=>{ postAction(httpurl, this.model).then((res) => {
if(res.success){ if (res.success) {
that.$message.success(res.message); that.$message.success(res.message)
that.$emit('ok'); that.$emit('ok')
}else{ } else {
that.$message.warning(res.message); that.$message.warning(res.message)
} }
}).finally(() => { }).finally(() => {
that.confirmLoading = false; that.confirmLoading = false
}) })
} }
}) })
}, }<#if form_popup>,
<#if form_popup> popupCallback (value,row) {
popupCallback(value,row){ this.model = Object.assign(this.model, row)
this.model = Object.assign(this.model, row); }</#if><#if form_cat_tree>,
}, handleCategoryChange (value, backObj) {
</#if> this.model = Object.assign(this.model, backObj)
<#if form_cat_tree> }</#if>
handleCategoryChange(value,backObj){
this.model = Object.assign(this.model, backObj);
}
</#if>
}
} }
}
</script> </script>
jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/vue/modules/${entityName}Modal.vuei
+17 -17
View File
@@ -23,48 +23,48 @@
</template> </template>
<script> <script>
import ${entityName}Form from './${entityName}Form'
import ${entityName}Form from './${entityName}Form' export default {
export default {
name: '${entityName}Modal', name: '${entityName}Modal',
components: { components: {
${entityName}Form ${entityName}Form
}, },
data () { data () {
return { return {
title:'', title: '',
width:${modal_width}, width: ${modal_width},
visible: false, visible: false,
disableSubmit: false disableSubmit: false
} }
}, },
methods: { methods: {
add () { add () {
this.visible=true this.visible = true
this.$nextTick(()=>{ this.$nextTick(() => {
this.$refs.realForm.add(); this.$refs.realForm.add()
}) })
}, },
edit (record) { edit (record) {
this.visible=true this.visible = true
this.$nextTick(()=>{ this.$nextTick(() => {
this.$refs.realForm.edit(record); this.$refs.realForm.edit(record)
}) })
}, },
close () { close () {
this.$emit('close'); this.$emit('close')
this.visible = false; this.visible = false
}, },
handleOk () { handleOk () {
this.$refs.realForm.submitForm(); this.$refs.realForm.submitForm()
}, },
submitCallback(){ submitCallback () {
this.$emit('ok'); this.$emit('ok')
this.visible = false; this.visible = false
}, },
handleCancel () { handleCancel () {
this.close() this.close()
} }
} }
} }
</script> </script>
jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/vue/modules/${entityName}Modal__Style#Drawer.vuei
+22 -22
View File
@@ -26,60 +26,60 @@
<script> <script>
import ${entityName}Form from './${entityName}Form' import ${entityName}Form from './${entityName}Form'
export default { export default {
name: '${entityName}Modal', name: '${entityName}Modal',
components: { components: {
${entityName}Form ${entityName}Form
}, },
data () { data () {
return { return {
title:"操作", title: '操作',
width:${modal_width}, width: ${modal_width},
visible: false, visible: false,
disableSubmit: false disableSubmit: false
} }
}, },
methods: { methods: {
add () { add () {
this.visible=true this.visible = true
this.$nextTick(()=>{ this.$nextTick(() => {
this.$refs.realForm.add(); this.$refs.realForm.add()
}) })
}, },
edit (record) { edit (record) {
this.visible=true this.visible = true
this.$nextTick(()=>{ this.$nextTick(() => {
this.$refs.realForm.edit(record); this.$refs.realForm.edit(record)
}); })
}, },
close () { close () {
this.$emit('close'); this.$emit('close')
this.visible = false; this.visible = false
}, },
submitCallback(){ submitCallback () {
this.$emit('ok'); this.$emit('ok')
this.visible = false; this.visible = false
}, },
handleOk () { handleOk () {
this.$refs.realForm.submitForm(); this.$refs.realForm.submitForm()
}, },
handleCancel () { handleCancel () {
this.close() this.close()
} }
} }
} }
</script> </script>
<style lang="less" scoped> <style lang="less" scoped>
/** Button按钮间距 */ /** Button按钮间距 */
.ant-btn { .ant-btn {
margin-left: 30px; margin-left: 30px;
margin-bottom: 30px; margin-bottom: 30px;
float: right; float: right;
} }
.drawer-footer{ .drawer-footer{
position: absolute; position: absolute;
bottom: -8px; bottom: -8px;
width: 100%; width: 100%;
@@ -89,5 +89,5 @@
left: 0; left: 0;
background: #fff; background: #fff;
border-radius: 0 0 2px 2px; border-radius: 0 0 2px 2px;
} }
</style> </style>
jero-boot/jero-boot-module-system/src/main/resources/jero/code-template/one/java/${bussiPackage}/${entityPackage}/vue/${entityName}List.vuei
+24 -23
View File
@@ -104,13 +104,13 @@
</template> </template>
<script> <script>
import '@/assets/less/TableExpand.less' import '@/assets/less/TableExpand.less'
import ${entityName}Modal from './modules/${entityName}Modal' import ${entityName}Modal from './modules/${entityName}Modal'
import { JeroListMixin } from '@/mixins/JeroListMixin' import { JeroListMixin } from '@/mixins/JeroListMixin'
export default { export default {
name: "${entityName}List", name: '${entityName}List',
mixins:[JeroListMixin], mixins: [JeroListMixin],
components: { components: {
${entityName}Modal ${entityName}Modal
}, },
@@ -122,18 +122,18 @@
{ {
title: '#', title: '#',
dataIndex: '', dataIndex: '',
key:'rowIndex', key: 'rowIndex',
width:60, width: 60,
align:"center", align: 'center',
customRender:function (t,r,index) { customRender: function (t, r, index) {
return parseInt(index)+1; return parseInt(index) + 1
} }
}, },
<#list columns as po> <#list columns as po>
<#if po.fieldName !='id'> <#if po.fieldName !='id'>
{ {
title: '${po.filedComment}', title: '${po.filedComment}',
align:"center", align: 'center',
dataIndex: '${po.fieldName}' dataIndex: '${po.fieldName}'
}, },
</#if> </#if>
@@ -141,29 +141,30 @@
{ {
title: '操作', title: '操作',
dataIndex: 'action', dataIndex: 'action',
align:"center", align: 'center',
scopedSlots: { customRender: 'action' }, scopedSlots: { customRender: 'action' }
} }
], ],
url: { url: {
list: "/${entityPackage}/${entityName?uncap_first}/list", list: '/${entityPackage}/${entityName?uncap_first}/list',
delete: "/${entityPackage}/${entityName?uncap_first}/delete", delete: '/${entityPackage}/${entityName?uncap_first}/delete',
deleteBatch: "/${entityPackage}/${entityName?uncap_first}/deleteBatch", deleteBatch: '/${entityPackage}/${entityName?uncap_first}/deleteBatch',
exportXlsUrl: "${entityPackage}/${entityName?uncap_first}/exportXls", exportXlsUrl: '${entityPackage}/${entityName?uncap_first}/exportXls',
importExcelUrl: "${entityPackage}/${entityName?uncap_first}/importExcel", importExcelUrl: '${entityPackage}/${entityName?uncap_first}/importExcel',
}, },
} }
}, },
computed: { computed: {
importExcelUrl: function(){ importExcelUrl: function () {
<#noparse>return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;</#noparse> <#noparse>return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`</#noparse>
} }
}, },
methods: { methods: {
} }
} }
</script> </script>
<style scoped> <style scoped>
@import '~@assets/less/common.less'; @import '~@assets/less/common.less';
</style> </style>
jero-boot/jero-boot-module-system/src/main/resources/jero/code-template/one/java/${bussiPackage}/${entityPackage}/vue/modules/${entityName}Modal.vuei
+36 -41
View File
@@ -34,38 +34,37 @@
</template> </template>
<script> <script>
import { httpAction } from '@/api/manage' import { httpAction } from '@/api/manage'
import moment from "moment" import moment from "moment"
export default { export default {
name: "${entityName}Modal", name: "${entityName}Modal",
data () { data () {
return { return {
title:"操作", title: '操作',
visible: false, visible: false,
model: {}, model: {},
labelCol: { labelCol: {
xs: { span: 24 }, xs: { span: 24 },
sm: { span: 5 }, sm: { span: 5 }
}, },
wrapperCol: { wrapperCol: {
xs: { span: 24 }, xs: { span: 24 },
sm: { span: 16 }, sm: { span: 16 }
}, },
confirmLoading: false, confirmLoading: false,
validatorRules:{ validatorRules: {
<#list columns as po> <#list columns as po>
<#if po.fieldName !='id'> <#if po.fieldName !='id'>
<#if po.nullable =='N'> <#if po.nullable =='N'>
${po.fieldName}:[{ required: true, message: '请输入${po.filedComment}!' }], ${po.fieldName}: [{ required: true, message: '请输入${po.filedComment}!' }],
</#if> </#if>
</#if> </#if>
</#list> </#list>
}, },
url: { url: {
add: "/${entityPackage}/${entityName?uncap_first}/add", add: '/${entityPackage}/${entityName?uncap_first}/add',
edit: "/${entityPackage}/${entityName?uncap_first}/edit", edit: '/${entityPackage}/${entityName?uncap_first}/edit'
}, },
} }
}, },
@@ -73,56 +72,52 @@
}, },
methods: { methods: {
add () { add () {
//初始化默认值 // 初始化默认值
this.edit({}); this.edit({})
}, },
edit (record) { edit (record) {
this.model = Object.assign({}, record); this.model = Object.assign({}, record)
this.visible = true; this.visible = true
}, },
close () { close () {
this.$emit('close'); this.$emit('close')
this.visible = false; this.visible = false
this.$refs.form.clearValidate(); this.$refs.form.clearValidate()
}, },
handleOk () { handleOk () {
const that = this; const that = this
// 触发表单验证 // 触发表单验证
this.$refs.form.validate(valid => { this.$refs.form.validate(valid => {
if (valid) { if (valid) {
that.confirmLoading = true; that.confirmLoading = true
let httpurl = ''; let httpurl = ''
let method = ''; const method = 'post'
if(!this.model.id){ if (!this.model.id) {
httpurl+=this.url.add; httpurl = this.url.add
method = 'post'; } else {
}else{ httpurl = this.url.edit
httpurl+=this.url.edit;
method = 'put';
} }
httpAction(httpurl,this.model,method).then((res)=>{ httpAction(httpurl, this.model, method).then((res) => {
if(res.success){ if (res.success) {
that.$message.success(res.message); that.$message.success(res.message)
that.$emit('ok'); that.$emit('ok')
}else{ } else {
that.$message.warning(res.message); that.$message.warning(res.message)
} }
}).finally(() => { }).finally(() => {
that.confirmLoading = false; that.confirmLoading = false
that.close(); that.close()
}) })
}else{ } else {
return false; return false
} }
}) })
}, },
handleCancel () { handleCancel () {
this.close() this.close()
}, },
}
} }
}
</script> </script>
<style lang="less" scoped> <style lang="less" scoped>
jero-boot/jero-boot-module-system/src/main/resources/jero/code-template/one/java/${bussiPackage}/${entityPackage}/vue/modules/${entityName}Modal__Style#Drawer.vuei
+37 -42
View File
@@ -37,38 +37,37 @@
</template> </template>
<script> <script>
import { httpAction } from '@/api/manage' import { httpAction } from '@/api/manage'
import moment from "moment" import moment from 'moment'
export default { export default {
name: "${entityName}Modal", name: '${entityName}Modal',
data () { data () {
return { return {
title:"操作", title: '操作',
visible: false, visible: false,
model: {}, model: {},
labelCol: { labelCol: {
xs: { span: 24 }, xs: { span: 24 },
sm: { span: 5 }, sm: { span: 5 }
}, },
wrapperCol: { wrapperCol: {
xs: { span: 24 }, xs: { span: 24 },
sm: { span: 16 }, sm: { span: 16 }
}, },
confirmLoading: false, confirmLoading: false,
validatorRules:{ validatorRules: {
<#list columns as po> <#list columns as po>
<#if po.fieldName !='id'> <#if po.fieldName !='id'>
<#if po.nullable =='N'> <#if po.nullable =='N'>
${po.fieldName}:[{ required: true, message: '请输入${po.filedComment}!' }], ${po.fieldName}: [{ required: true, message: '请输入${po.filedComment}!' }],
</#if> </#if>
</#if> </#if>
</#list> </#list>
}, },
url: { url: {
add: "/${entityPackage}/${entityName?uncap_first}/add", add: '/${entityPackage}/${entityName?uncap_first}/add',
edit: "/${entityPackage}/${entityName?uncap_first}/edit", edit: '/${entityPackage}/${entityName?uncap_first}/edit',
}, },
} }
}, },
@@ -76,56 +75,52 @@
}, },
methods: { methods: {
add () { add () {
//初始化默认值 // 初始化默认值
this.edit({}); this.edit({})
}, },
edit (record) { edit (record) {
this.model = Object.assign({}, record); this.model = Object.assign({}, record)
this.visible = true; this.visible = true
}, },
close () { close () {
this.$emit('close'); this.$emit('close')
this.visible = false; this.visible = false
this.$refs.form.clearValidate(); this.$refs.form.clearValidate()
}, },
handleOk () { handleOk () {
const that = this; const that = this
// 触发表单验证 // 触发表单验证
this.$refs.form.validate(valid => { this.$refs.form.validate(valid => {
if (valid) { if (valid) {
that.confirmLoading = true; that.confirmLoading = true
let httpurl = ''; let httpurl = ''
let method = ''; const method = 'post'
if(!this.model.id){ if (!this.model.id) {
httpurl+=this.url.add; httpurl = this.url.add
method = 'post'; } else {
}else{ httpurl = this.url.edit
httpurl+=this.url.edit;
method = 'put';
} }
httpAction(httpurl,this.model,method).then((res)=>{ httpAction(httpurl, this.model, method).then((res) => {
if(res.success){ if (res.success){
that.$message.success(res.message); that.$message.success(res.message)
that.$emit('ok'); that.$emit('ok')
}else{ } else {
that.$message.warning(res.message); that.$message.warning(res.message)
} }
}).finally(() => { }).finally(() => {
that.confirmLoading = false; that.confirmLoading = false
that.close(); that.close()
}) })
}else{ } else {
return false; return false
} }
}) })
}, },
handleCancel () { handleCancel () {
this.close() this.close()
}, },
}
} }
}
</script> </script>
<style lang="less" scoped> <style lang="less" scoped>
jero-web/src/components/jero/JDate.vue
+6
View File
@@ -157,3 +157,9 @@ export default {
} }
} }
</script> </script>
<style scoped>
.ant-calendar-picker {
min-width: 195px;
}
</style>