KH/kh-device-admin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

【fix bug】form表单的全部时间选择器，在配置为日期的情况下，showType自动为天

Browse Source
This commit is contained in:
梁琦涛
2023-03-15 14:32:22 +08:00
parent 7d64a86314
commit 1054dee742
4 changed files with 22 additions and 21 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/default/one/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai
+9 -8
View File
@@ -2,6 +2,7 @@ package ${bussiPackage}.${entityPackage}.controller;
import java.util.Arrays; import java.util.Arrays;
import java.util.List; import java.util.List;
import java.util.Map;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import com.jero.common.api.vo.Result; import com.jero.common.api.vo.Result;
@@ -99,7 +100,7 @@ public class ${entityName}Controller extends JeroController<${entityName}, I${en
*/ */
@AutoLog(value = "${tableVo.ftlDescription}-编辑") @AutoLog(value = "${tableVo.ftlDescription}-编辑")
@ApiOperation(value="${tableVo.ftlDescription}-编辑", notes="${tableVo.ftlDescription}-编辑") @ApiOperation(value="${tableVo.ftlDescription}-编辑", notes="${tableVo.ftlDescription}-编辑")
@PutMapping(value = "/edit") @PostMapping(value = "/edit")
public Result<?> edit(@Validated @RequestBody ${entityName} ${entityName?uncap_first}) { public Result<?> edit(@Validated @RequestBody ${entityName} ${entityName?uncap_first}) {
${entityName?uncap_first}Service.editById(${entityName?uncap_first}); ${entityName?uncap_first}Service.editById(${entityName?uncap_first});
return Result.OK("操作成功!"); return Result.OK("操作成功!");
@@ -113,23 +114,23 @@ public class ${entityName}Controller extends JeroController<${entityName}, I${en
*/ */
@AutoLog(value = "${tableVo.ftlDescription}-通过id删除") @AutoLog(value = "${tableVo.ftlDescription}-通过id删除")
@ApiOperation(value="${tableVo.ftlDescription}-通过id删除", notes="${tableVo.ftlDescription}-通过id删除") @ApiOperation(value="${tableVo.ftlDescription}-通过id删除", notes="${tableVo.ftlDescription}-通过id删除")
@DeleteMapping(value = "/delete") @PostMapping(value = "/delete")
public Result<?> delete(@RequestParam(name="id",required=true) String id) { public Result<?> delete(@RequestBody Map<String, String> map) {
${entityName?uncap_first}Service.deleteById(id); ${entityName?uncap_first}Service.deleteById(map.get("id"));
return Result.OK("删除成功!"); return Result.OK("删除成功!");
} }
/** /**
* 批量删除 * 批量删除
* *
* @param ids * @param map
* @return * @return
*/ */
@AutoLog(value = "${tableVo.ftlDescription}-批量删除") @AutoLog(value = "${tableVo.ftlDescription}-批量删除")
@ApiOperation(value="${tableVo.ftlDescription}-批量删除", notes="${tableVo.ftlDescription}-批量删除") @ApiOperation(value="${tableVo.ftlDescription}-批量删除", notes="${tableVo.ftlDescription}-批量删除")
@DeleteMapping(value = "/deleteBatch") @PostMapping(value = "/deleteBatch")
public Result<?> deleteBatch(@RequestParam(name="ids",required=true) String ids) { public Result<?> deleteBatch(@RequestBody Map<String, String> map) {
this.${entityName?uncap_first}Service.deleteByIds(Arrays.asList(ids.split(","))); this.${entityName?uncap_first}Service.deleteByIds(Arrays.asList(map.get("ids").split(",")));
return Result.OK("批量删除成功!"); return Result.OK("批量删除成功!");
} }
jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/vue/${entityName}List.vuei
+1 -1
View File
@@ -44,7 +44,7 @@
<#elseif po.classType=='cat_tree'> <#elseif po.classType=='cat_tree'>
<#if query_field_no gt 1> </#if><j-category-select placeholder="请选择${po.filedComment}" v-model="queryParam.${po.fieldName}" pcode="${po.dictField?default("")}"/> <#if query_field_no gt 1> </#if><j-category-select placeholder="请选择${po.filedComment}" v-model="queryParam.${po.fieldName}" pcode="${po.dictField?default("")}"/>
<#elseif po.classType=='date'> <#elseif po.classType=='date'>
<#if query_field_no gt 1> </#if><j-date placeholder="请选择${po.filedComment}" v-model="queryParam.${po.fieldName}"></j-date> <#if query_field_no gt 1> </#if><j-date showType="day" placeholder="请选择${po.filedComment}" v-model="queryParam.${po.fieldName}"></j-date>
<#elseif po.classType=='datetime'> <#elseif po.classType=='datetime'>
<#if query_field_no gt 1> </#if><j-date :show-time="true" date-format="YYYY-MM-DD HH:mm:ss" placeholder="请选择${po.filedComment}" v-model="queryParam.${po.fieldName}"></j-date> <#if query_field_no gt 1> </#if><j-date :show-time="true" date-format="YYYY-MM-DD HH:mm:ss" placeholder="请选择${po.filedComment}" v-model="queryParam.${po.fieldName}"></j-date>
<#elseif po.classType=='pca'> <#elseif po.classType=='pca'>
jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/vue/modules/${entityName}Form.vuei
+3 -3
View File
@@ -31,7 +31,7 @@
<a-col :span="${form_span}"> <a-col :span="${form_span}">
<a-form-model-item label="${po.filedComment}" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="${autoStringSuffixForModel(po)}"> <a-form-model-item label="${po.filedComment}" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="${autoStringSuffixForModel(po)}">
<#if po.classType =='date'> <#if po.classType =='date'>
<j-date placeholder="请选择${po.filedComment}" v-model="model.${po.fieldName}" style="width: 100%" <#if po.readonly=='Y'>disabled</#if>/> <j-date showType="day" placeholder="请选择${po.filedComment}" v-model="model.${po.fieldName}" style="width: 100%" <#if po.readonly=='Y'>disabled</#if>/>
<#elseif po.classType =='datetime'> <#elseif po.classType =='datetime'>
<j-date placeholder="请选择${po.filedComment}" v-model="model.${po.fieldName}" :show-time="true" date-format="YYYY-MM-DD HH:mm:ss" style="width: 100%" <#if po.readonly=='Y'>disabled</#if>/> <j-date placeholder="请选择${po.filedComment}" v-model="model.${po.fieldName}" :show-time="true" date-format="YYYY-MM-DD HH:mm:ss" style="width: 100%" <#if po.readonly=='Y'>disabled</#if>/>
<#elseif po.classType =='time'> <#elseif po.classType =='time'>
@@ -248,7 +248,7 @@
that.confirmLoading = false; that.confirmLoading = false;
}) })
} }
}) })
}, },
<#if form_popup> <#if form_popup>
@@ -263,4 +263,4 @@
</#if> </#if>
} }
} }
</script> </script>
jero-boot/jero-boot-module-system/src/main/resources/jero/code-template/one/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai
+9 -9
View File
@@ -104,7 +104,7 @@ public class ${entityName}Controller extends JeroController<${entityName}, I${en
*/ */
@AutoLog(value = "${tableVo.ftlDescription}-编辑") @AutoLog(value = "${tableVo.ftlDescription}-编辑")
@ApiOperation(value="${tableVo.ftlDescription}-编辑", notes="${tableVo.ftlDescription}-编辑") @ApiOperation(value="${tableVo.ftlDescription}-编辑", notes="${tableVo.ftlDescription}-编辑")
@PutMapping(value = "/edit") @PostMapping(value = "/edit")
public Result<?> edit(@RequestBody ${entityName} ${entityName?uncap_first}) { public Result<?> edit(@RequestBody ${entityName} ${entityName?uncap_first}) {
${entityName?uncap_first}Service.editById(${entityName?uncap_first}); ${entityName?uncap_first}Service.editById(${entityName?uncap_first});
return Result.OK("操作成功!"); return Result.OK("操作成功!");
@@ -113,28 +113,28 @@ public class ${entityName}Controller extends JeroController<${entityName}, I${en
/** /**
* 通过id删除 * 通过id删除
* *
* @param id * @param map
* @return * @return
*/ */
@AutoLog(value = "${tableVo.ftlDescription}-通过id删除") @AutoLog(value = "${tableVo.ftlDescription}-通过id删除")
@ApiOperation(value="${tableVo.ftlDescription}-通过id删除", notes="${tableVo.ftlDescription}-通过id删除") @ApiOperation(value="${tableVo.ftlDescription}-通过id删除", notes="${tableVo.ftlDescription}-通过id删除")
@DeleteMapping(value = "/delete") @PostMapping(value = "/delete")
public Result<?> delete(@RequestParam(name="id",required=true) String id) { public Result<?> delete(@RequestBody Map<String, String> map) {
${entityName?uncap_first}Service.deleteById(id); ${entityName?uncap_first}Service.deleteById(map.get("id"));
return Result.OK("删除成功!"); return Result.OK("删除成功!");
} }
/** /**
* 批量删除 * 批量删除
* *
* @param ids * @param map
* @return * @return
*/ */
@AutoLog(value = "${tableVo.ftlDescription}-批量删除") @AutoLog(value = "${tableVo.ftlDescription}-批量删除")
@ApiOperation(value="${tableVo.ftlDescription}-批量删除", notes="${tableVo.ftlDescription}-批量删除") @ApiOperation(value="${tableVo.ftlDescription}-批量删除", notes="${tableVo.ftlDescription}-批量删除")
@DeleteMapping(value = "/deleteBatch") @PostMapping(value = "/deleteBatch")
public Result<?> deleteBatch(@RequestParam(name="ids",required=true) String ids) { public Result<?> deleteBatch(@RequestBody Map<String, String> map) {
this.${entityName?uncap_first}Service.deleteByIds(Arrays.asList(ids.split(","))); this.${entityName?uncap_first}Service.deleteByIds(Arrays.asList(map.get("ids").split(",")));
return Result.OK("批量删除成功！"); return Result.OK("批量删除成功！");
} }