diff --git a/snowy-plugin/snowy-plugin-gen/src/main/java/vip/xiaonuo/gen/modular/basic/service/impl/GenBasicServiceImpl.java b/snowy-plugin/snowy-plugin-gen/src/main/java/vip/xiaonuo/gen/modular/basic/service/impl/GenBasicServiceImpl.java index 5031603b..4a593616 100644 --- a/snowy-plugin/snowy-plugin-gen/src/main/java/vip/xiaonuo/gen/modular/basic/service/impl/GenBasicServiceImpl.java +++ b/snowy-plugin/snowy-plugin-gen/src/main/java/vip/xiaonuo/gen/modular/basic/service/impl/GenBasicServiceImpl.java @@ -557,24 +557,26 @@ public class GenBasicServiceImpl extends ServiceImpl i List genBasicCodeMobileResultList = CollectionUtil.newArrayList(); GEN_MOBILE_FILE_LIST.forEach(fileJsonObject -> { String fileTemplateName = fileJsonObject.getStr("name"); - String fileTemplatePath = ""; - if (!"page.json.btl".equals(fileTemplateName)){ - fileTemplatePath = fileJsonObject.getStr("path") + File.separator + genBasic.getModuleName(); - } + GenBasicPreviewResult.GenBasicCodeResult genBasicCodeMobileResult = new GenBasicPreviewResult.GenBasicCodeResult(); Template templateMobile = groupTemplateMobile.getTemplate(fileTemplateName); templateMobile.binding(bindingJsonObject); + String resultName = StrUtil.removeSuffix(fileTemplateName, ".btl"); if("Api.js.btl".equalsIgnoreCase(fileTemplateName)) { - resultName = StrUtil.lowerFirst(genBasic.getClassName()) + resultName; + resultName = StrUtil.toSymbolCase(genBasic.getClassName() + resultName, '-'); genBasicCodeMobileResult.setCodeFileName(resultName); - genBasicCodeMobileResult.setCodeFileWithPathName(genMobileBasicPath + fileTemplatePath + File.separator + resultName); + genBasicCodeMobileResult.setCodeFileWithPathName(genMobileBasicPath + fileJsonObject.getStr("path") + File.separator + genBasic.getModuleName() + File.separator + resultName); } else if("page.json.btl".equals(fileTemplateName)) { genBasicCodeMobileResult.setCodeFileName(resultName); - genBasicCodeMobileResult.setCodeFileWithPathName(genMobileBasicPath + fileTemplatePath + File.separator + resultName); + genBasicCodeMobileResult.setCodeFileWithPathName(genMobileBasicPath + File.separator + resultName); + } else if ("route.js.btl".equals(fileTemplateName)) { + resultName = StrUtil.toSymbolCase(genBasic.getClassName(), '-') + ".js"; + genBasicCodeMobileResult.setCodeFileName(resultName); + genBasicCodeMobileResult.setCodeFileWithPathName(genMobileBasicPath + fileJsonObject.getStr("path") + File.separator + resultName); } else { genBasicCodeMobileResult.setCodeFileName(resultName); - genBasicCodeMobileResult.setCodeFileWithPathName(genMobileBasicPath + fileTemplatePath + File.separator + genBasic.getBusName() + File.separator + resultName); + genBasicCodeMobileResult.setCodeFileWithPathName(genMobileBasicPath + fileJsonObject.getStr("path") + File.separator + genBasic.getModuleName() + File.separator + genBasic.getBusName() + File.separator + resultName); } genBasicCodeMobileResult.setCodeFileContent(templateMobile.render()); genBasicCodeMobileResultList.add(genBasicCodeMobileResult); @@ -620,6 +622,8 @@ public class GenBasicServiceImpl extends ServiceImpl i bindingJsonObject.set("className", genBasic.getClassName()); // 类首字母小写名 bindingJsonObject.set("classNameFirstLower", StrUtil.lowerFirst(genBasic.getClassName())); + // 类小写且以横线分割 + bindingJsonObject.set("classNameLowerKebab", StrUtil.toSymbolCase(genBasic.getClassName(), '-')); // 主键名 bindingJsonObject.set("dbTableKey", genBasic.getDbTableKey()); // 主键Java类型 diff --git a/snowy-plugin/snowy-plugin-gen/src/main/resources/mobile/Api.js.btl b/snowy-plugin/snowy-plugin-gen/src/main/resources/mobile/Api.js.btl index 99e93f37..349f9fd8 100644 --- a/snowy-plugin/snowy-plugin-gen/src/main/resources/mobile/Api.js.btl +++ b/snowy-plugin/snowy-plugin-gen/src/main/resources/mobile/Api.js.btl @@ -1,34 +1,36 @@ import request from '@/utils/request' -// 获取${functionName}分页 -export function ${classNameFirstLower}Page(data) { - return request({ - url: '/${moduleName}/${busName}/page', - method: 'get', - data: data - }) -} -// 提交${functionName}表单 add为false时为编辑,默认为新增 -export function ${classNameFirstLower}SubmitForm(data, add = true) { - return request({ - url: '/${moduleName}/${busName}/'+ (add ? 'add' : 'edit'), - method: 'post', - data: data - }) -} -// 删除${functionName} -export function ${classNameFirstLower}Delete(data) { - return request({ - url: '/${moduleName}/${busName}/delete', - method: 'post', - data: data - }) -} -// 获取${functionName}详情 -export function ${classNameFirstLower}Detail(data) { - return request({ - url: '/${moduleName}/${busName}/detail', - method: 'get', - data: data - }) +export default { + // 获取${functionName}分页 + ${classNameFirstLower}Page(data) { + return request({ + url: '/${moduleName}/${busName}/page', + method: 'GET', + data: data + }) + }, + // 提交${functionName}表单 add为false时为编辑,默认为新增 + ${classNameFirstLower}SubmitForm(data, add = true) { + return request({ + url: '/${moduleName}/${busName}/'+ (add ? 'add' : 'edit'), + method: 'POST', + data: data + }) + }, + // 删除${functionName} + ${classNameFirstLower}Delete(data) { + return request({ + url: '/${moduleName}/${busName}/delete', + method: 'POST', + data: data + }) + }, + // 获取${functionName}详情 + ${classNameFirstLower}Detail(data) { + return request({ + url: '/${moduleName}/${busName}/detail', + method: 'GET', + data: data + }) + }, } diff --git a/snowy-plugin/snowy-plugin-gen/src/main/resources/mobile/form.vue.btl b/snowy-plugin/snowy-plugin-gen/src/main/resources/mobile/form.vue.btl index 94d393d6..fe2cd4e1 100644 --- a/snowy-plugin/snowy-plugin-gen/src/main/resources/mobile/form.vue.btl +++ b/snowy-plugin/snowy-plugin-gen/src/main/resources/mobile/form.vue.btl @@ -1,92 +1,81 @@ + diff --git a/snowy-plugin/snowy-plugin-gen/src/main/resources/mobile/index.vue.btl b/snowy-plugin/snowy-plugin-gen/src/main/resources/mobile/index.vue.btl index 106b1bf3..56a24cd3 100644 --- a/snowy-plugin/snowy-plugin-gen/src/main/resources/mobile/index.vue.btl +++ b/snowy-plugin/snowy-plugin-gen/src/main/resources/mobile/index.vue.btl @@ -6,98 +6,82 @@ <% for(var i = 0; i < configList.~size; i++) { %> <% if(!configList[i].needTableId && configList[i].needPage) { searchCount ++; }%> <% } %> - <% if (searchCount > 0) { %> - <% for(var i = 0; i < configList.~size; i++) { %> - <% if(!configList[i].needTableId && configList[i].needPage) { row ++; %> - <% if(row <= 1) { %> - - <% } %> - <% } %> - <% } %> - - <% } %> - - - <% for(var i = 0; i < configList.~size; i++) { %> - <% if(!configList[i].needTableId && configList[i].whetherTable && configList[i].fieldNameCamelCase != 'tenantId') { %> - - - - - - ${configList[i].fieldRemark} - - - {{ item.${configList[i].fieldNameCamelCase} }} - - - <% } %> - <% } %> - + + + + + <% for(var i = 0; i < configList.~size; i++) { %> + <% if(!configList[i].needTableId && configList[i].whetherTable && configList[i].fieldNameCamelCase != 'tenantId') { %> + + + + + + ${configList[i].fieldRemark} + + + {{ item.${configList[i].fieldNameCamelCase} }} + + + <% } %> + <% } %> + + + + - - - diff --git a/snowy-plugin/snowy-plugin-gen/src/main/resources/mobile/more.vue.btl b/snowy-plugin/snowy-plugin-gen/src/main/resources/mobile/more.vue.btl index eb2ec5da..e522b945 100644 --- a/snowy-plugin/snowy-plugin-gen/src/main/resources/mobile/more.vue.btl +++ b/snowy-plugin/snowy-plugin-gen/src/main/resources/mobile/more.vue.btl @@ -1,23 +1,22 @@ diff --git a/snowy-plugin/snowy-plugin-gen/src/main/resources/mobile/page.json.btl b/snowy-plugin/snowy-plugin-gen/src/main/resources/mobile/page.json.btl index 6f5ba8e9..b867f778 100644 --- a/snowy-plugin/snowy-plugin-gen/src/main/resources/mobile/page.json.btl +++ b/snowy-plugin/snowy-plugin-gen/src/main/resources/mobile/page.json.btl @@ -5,7 +5,7 @@ "path": "pages/${moduleName}/${busName}/index", "style": { "navigationBarTitleText": "${functionName}管理", - "enablePullDownRefresh": true, + "enablePullDownRefresh": false, //#ifdef H5 "navigationStyle": "custom" //#endif @@ -29,7 +29,7 @@ "path": "index", "style": { "navigationBarTitleText": "${functionName}管理", - "enablePullDownRefresh": true, + "enablePullDownRefresh": false, //#ifdef H5 "navigationStyle": "custom" //#endif diff --git a/snowy-plugin/snowy-plugin-gen/src/main/resources/mobile/search.vue.btl b/snowy-plugin/snowy-plugin-gen/src/main/resources/mobile/search.vue.btl index e1aef573..48737964 100644 --- a/snowy-plugin/snowy-plugin-gen/src/main/resources/mobile/search.vue.btl +++ b/snowy-plugin/snowy-plugin-gen/src/main/resources/mobile/search.vue.btl @@ -6,48 +6,56 @@ <% for(var i = 0; i < configList.~size; i++) { %> <% if(!configList[i].needTableId && configList[i].needPage) { searchCount ++; }%> <% } %> - - - - + + + + <% if (searchCount > 0) { %> - + <% for(var i = 0; i < configList.~size; i++) { %> <% if(!configList[i].needTableId && configList[i].needPage) { %> <% if(configList[i].effectType == 'input' || configList[i].effectType == 'textarea') { %> - - - + + + <% } else if (configList[i].effectType == 'select' || configList[i].effectType == 'radio' || configList[i].effectType == 'checkbox') {%> - - - + + + + <% } else if (configList[i].effectType == 'inputNumber' || configList[i].effectType == 'slider') {%> + + + + <% } else if (configList[i].effectType == 'datepicker') {%> + + + <% } else {%> - - - + + + <% } %> <% } %> <% } %> - + <% } %> - - + + 重置 - - + + 确认 - - + + - +