diff --git a/src/main/java/ink/wgink/code/factory/service/FieldService.java b/src/main/java/ink/wgink/code/factory/service/FieldService.java
index 0a931a9..581c9d7 100644
--- a/src/main/java/ink/wgink/code/factory/service/FieldService.java
+++ b/src/main/java/ink/wgink/code/factory/service/FieldService.java
@@ -118,12 +118,17 @@ public class FieldService {
fieldVO.setColumnName(columnName);
fieldVO.setColumnType(field.get("COLUMN_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.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.setColumnDefault(field.get("COLUMN_DEFAULT") == null ? "" : field.get("COLUMN_DEFAULT").toString());
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.setPropertyType(getPropertyType(fieldVO.getDataType()));
fieldVO.setFormFieldType(getFormFieldType(fieldVO.getDataType()));
diff --git a/src/main/resources/template/normal/page/save.ftl b/src/main/resources/template/normal/page/save.ftl
index 49183c4..a5177a1 100644
--- a/src/main/resources/template/normal/page/save.ftl
+++ b/src/main/resources/template/normal/page/save.ftl
@@ -259,11 +259,11 @@
- <#elseif field.formFieldValue == "string">
+ <#elseif field.formFieldValue == "text">
#if>
@@ -670,7 +670,6 @@
// 初始化内容
function initData() {
- top.restAjax.get(top.restAjax.path('api/${lowerTableName}/getcurrentuseridinfo', []), {}, null, function(code, data) {
<#list fieldList! as field>
<#if field.formShow>
<#if field.formFieldValue == "date">
@@ -694,13 +693,6 @@
#if>
#if>
#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();
@@ -718,7 +710,7 @@
#if>
#if>
#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, {
time: 0,
btn: [top.dataMessage.button.yes, top.dataMessage.button.no],
diff --git a/src/main/resources/template/normal/page/update.ftl b/src/main/resources/template/normal/page/update.ftl
index b0633b7..3e17d0c 100644
--- a/src/main/resources/template/normal/page/update.ftl
+++ b/src/main/resources/template/normal/page/update.ftl
@@ -259,11 +259,11 @@
- <#elseif field.formFieldValue == "string">
+ <#elseif field.formFieldValue == "text">
#if>
@@ -689,7 +689,7 @@
// 初始化内容
function initData() {
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 = {};
for(var i in data) {
dataFormData[i] = data[i] +'';
@@ -741,7 +741,7 @@
#if>
#if>
#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, {
time: 0,
btn: [top.dataMessage.button.yes, top.dataMessage.button.no],