Tenlion/code-factory
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

处理BUG

Browse Source
This commit is contained in:
wanggeng888 2021-03-15 20:13:59 +08:00
parent 2c129391c9
commit 53e7800fab
3 changed files with 13 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/java/ink/wgink/code/factory/service/FieldService.java
View File

@ -118,12 +118,17 @@ public class FieldService {
fieldVO.setColumnName(columnName); fieldVO.setColumnName(columnName);
fieldVO.setColumnType(field.get("COLUMN_TYPE").toString()); fieldVO.setColumnType(field.get("COLUMN_TYPE").toString());
fieldVO.setDataType(field.get("DATA_TYPE").toString()); fieldVO.setDataType(field.get("DATA_TYPE").toString());
fieldVO.setCharacterMaximum(field.get("CHARACTER_MAXIMUM") == null ? 0 : Integer.valueOf(field.get("CHARACTER_MAXIMUM").toString())); fieldVO.setCharacterMaximum(field.get("CHARACTER_MAXIMUM_LENGTH") == null ? 0 : Integer.valueOf(field.get("CHARACTER_MAXIMUM_LENGTH").toString()));
fieldVO.setNumericPrecision(field.get("NUMERIC_PRECISION") == null ? 0 : Integer.valueOf(field.get("NUMERIC_PRECISION").toString())); fieldVO.setNumericPrecision(field.get("NUMERIC_PRECISION") == null ? 0 : Integer.valueOf(field.get("NUMERIC_PRECISION").toString()));
fieldVO.setNumericScale(field.get("NUMERIC_SCALE") == null ? 0 : Integer.valueOf(field.get("NUMERIC_SCALE").toString())); fieldVO.setNumericScale(field.get("NUMERIC_SCALE") == null ? 0 : Integer.valueOf(field.get("NUMERIC_SCALE").toString()));
fieldVO.setColumnComment(field.get("COLUMN_COMMENT") == null ? "" : field.get("COLUMN_COMMENT").toString()); fieldVO.setColumnComment(field.get("COLUMN_COMMENT") == null ? "" : field.get("COLUMN_COMMENT").toString());
fieldVO.setColumnDefault(field.get("COLUMN_DEFAULT") == null ? "" : field.get("COLUMN_DEFAULT").toString()); fieldVO.setColumnDefault(field.get("COLUMN_DEFAULT") == null ? "" : field.get("COLUMN_DEFAULT").toString());
fieldVO.setPropertyName(WStringUtil.underLine2LowerUpper(fieldVO.getColumnName())); fieldVO.setPropertyName(WStringUtil.underLine2LowerUpper(fieldVO.getColumnName()));
if (fieldVO.getNumericPrecision() != 0) {
fieldVO.setPropertyLength(fieldVO.getNumericPrecision());
} else {
fieldVO.setPropertyLength(fieldVO.getCharacterMaximum());
}
fieldVO.setNotNull(StringUtils.equalsIgnoreCase(ColumnIsNullableEnum.YES.getValue(), field.get("IS_NULLABLE").toString()) ? false : true); fieldVO.setNotNull(StringUtils.equalsIgnoreCase(ColumnIsNullableEnum.YES.getValue(), field.get("IS_NULLABLE").toString()) ? false : true);
fieldVO.setPropertyType(getPropertyType(fieldVO.getDataType())); fieldVO.setPropertyType(getPropertyType(fieldVO.getDataType()));
fieldVO.setFormFieldType(getFormFieldType(fieldVO.getDataType())); fieldVO.setFormFieldType(getFormFieldType(fieldVO.getDataType()));

14
src/main/resources/template/normal/page/save.ftl
View File

@ -259,11 +259,11 @@
<input type="text" id="${field.propertyName}SelectDepartment" class="layui-input" placeholder="请选择${field.columnComment}" data-name="${field.propertyName}" readonly style="cursor:pointer;"> <input type="text" id="${field.propertyName}SelectDepartment" class="layui-input" placeholder="请选择${field.columnComment}" data-name="${field.propertyName}" readonly style="cursor:pointer;">
</div> </div>
</div> </div>
<#elseif field.formFieldValue == "string"> <#elseif field.formFieldValue == "text">
<div class="layui-form-item"> <div class="layui-form-item">
<label class="layui-form-label">${field.columnComment}</label> <label class="layui-form-label">${field.columnComment}</label>
<div class="layui-input-block"> <div class="layui-input-block">
<input type="text" id="${field.propertyName}" name="${field.propertyName}" class="layui-input" value="${field.columnDefault}" placeholder="请输入${field.columnComment}" <#if field.verifyType?? && field.verifyType != "none">lay-verify="<#if field.verifyType == "phone">phone<#elseif field.verifyType == "email">email<#elseif field.verifyType == "url">url<#elseif field.verifyType == "number">number<#elseif field.verifyType == "date">date<#elseif field.verifyType == "identity">identity<#elseif field.verifyType == "custom">${field.propertyName}CustomVerify<#elseif field.verifyType == "required">required</#if>"</#if> <#if field.propertyLength > 0>maxlength="${field.propertyLength}"</#if>> <input type="text" id="${field.propertyName}" name="${field.propertyName}" class="layui-input" value="${field.columnDefault}" placeholder="请输入${field.columnComment}" <#if field.verifyType?? && field.verifyType != "none">lay-verify="<#if field.verifyType == "phone">phone<#elseif field.verifyType == "email">email<#elseif field.verifyType == "url">url<#elseif field.verifyType == "number">number<#elseif field.verifyType == "date">date<#elseif field.verifyType == "identity">identity<#elseif field.verifyType == "custom">${field.propertyName}CustomVerify<#elseif field.verifyType == "required">required</#if>"</#if> maxlength="${field.propertyLength}">
</div> </div>
</div> </div>
</#if> </#if>
@ -670,7 +670,6 @@
// 初始化内容 // 初始化内容
function initData() { function initData() {
top.restAjax.get(top.restAjax.path('api/${lowerTableName}/getcurrentuseridinfo', []), {}, null, function(code, data) {
<#list fieldList! as field> <#list fieldList! as field>
<#if field.formShow> <#if field.formShow>
<#if field.formFieldValue == "date"> <#if field.formFieldValue == "date">
@ -694,13 +693,6 @@
</#if> </#if>
</#if> </#if>
</#list> </#list>
}, function(code, data) {
top.dialog.msg(data.msg);
}, function() {
loadLayerIndex = top.dialog.msg(top.dataMessage.loading, {icon: 16, time: 0, shade: 0.3});
}, function() {
top.dialog.close(loadLayerIndex);
});
} }
initData(); initData();
@ -718,7 +710,7 @@
</#if> </#if>
</#if> </#if>
</#list> </#list>
top.restAjax.post(top.restAjax.path('api/${lowerTableName}/save${lowerTableName}', []), formData.field, null, function(code, data) { top.restAjax.post(top.restAjax.path('api/${lowerTableName}/save', []), formData.field, null, function(code, data) {
var layerIndex = top.dialog.msg(top.dataMessage.commitSuccess, { var layerIndex = top.dialog.msg(top.dataMessage.commitSuccess, {
time: 0, time: 0,
btn: [top.dataMessage.button.yes, top.dataMessage.button.no], btn: [top.dataMessage.button.yes, top.dataMessage.button.no],

8
src/main/resources/template/normal/page/update.ftl
View File

@ -259,11 +259,11 @@
<input type="text" id="${field.propertyName}SelectDepartment" class="layui-input" placeholder="请选择${field.columnComment}" data-name="${field.propertyName}" readonly style="cursor:pointer;"> <input type="text" id="${field.propertyName}SelectDepartment" class="layui-input" placeholder="请选择${field.columnComment}" data-name="${field.propertyName}" readonly style="cursor:pointer;">
</div> </div>
</div> </div>
<#elseif field.formFieldValue == "string"> <#elseif field.formFieldValue == "text">
<div class="layui-form-item"> <div class="layui-form-item">
<label class="layui-form-label">${field.columnComment}</label> <label class="layui-form-label">${field.columnComment}</label>
<div class="layui-input-block"> <div class="layui-input-block">
<input type="text" id="${field.propertyName}" name="${field.propertyName}" class="layui-input" value="${field.columnDefault}" placeholder="请输入${field.columnComment}" <#if field.verifyType?? && field.verifyType != "none">lay-verify="<#if field.verifyType == "phone">phone<#elseif field.verifyType == "email">email<#elseif field.verifyType == "url">url<#elseif field.verifyType == "number">number<#elseif field.verifyType == "date">date<#elseif field.verifyType == "identity">identity<#elseif field.verifyType == "custom">${field.propertyName}CustomVerify<#elseif field.verifyType == "required">required</#if>"</#if> <#if field.propertyLength > 0>maxlength="${field.propertyLength}"</#if>> <input type="text" id="${field.propertyName}" name="${field.propertyName}" class="layui-input" value="${field.columnDefault}" placeholder="请输入${field.columnComment}" <#if field.verifyType?? && field.verifyType != "none">lay-verify="<#if field.verifyType == "phone">phone<#elseif field.verifyType == "email">email<#elseif field.verifyType == "url">url<#elseif field.verifyType == "number">number<#elseif field.verifyType == "date">date<#elseif field.verifyType == "identity">identity<#elseif field.verifyType == "custom">${field.propertyName}CustomVerify<#elseif field.verifyType == "required">required</#if>"</#if> maxlength="${field.propertyLength}">
</div> </div>
</div> </div>
</#if> </#if>
@ -689,7 +689,7 @@
// 初始化内容 // 初始化内容
function initData() { function initData() {
var loadLayerIndex; var loadLayerIndex;
top.restAjax.get(top.restAjax.path('api/${lowerTableName}/get${lowerTableName}byid/{${firstLowerTableName}Id}', [${firstLowerTableName}Id]), {}, null, function(code, data) { top.restAjax.get(top.restAjax.path('api/${lowerTableName}/get/{${firstLowerTableName}Id}', [${firstLowerTableName}Id]), {}, null, function(code, data) {
var dataFormData = {}; var dataFormData = {};
for(var i in data) { for(var i in data) {
dataFormData[i] = data[i] +''; dataFormData[i] = data[i] +'';
@ -741,7 +741,7 @@
</#if> </#if>
</#if> </#if>
</#list> </#list>
top.restAjax.put(top.restAjax.path('api/${lowerTableName}/update${lowerTableName}/{${firstLowerTableName}Id}', [${firstLowerTableName}Id]), formData.field, null, function(code, data) { top.restAjax.put(top.restAjax.path('api/${lowerTableName}/update/{${firstLowerTableName}Id}', [${firstLowerTableName}Id]), formData.field, null, function(code, data) {
var layerIndex = top.dialog.msg(top.dataMessage.updateSuccess, { var layerIndex = top.dialog.msg(top.dataMessage.updateSuccess, {
time: 0, time: 0,
btn: [top.dataMessage.button.yes, top.dataMessage.button.no], btn: [top.dataMessage.button.yes, top.dataMessage.button.no],