默认值

ibzdata-core/src/main/java/cn/ibizlab/core/data/lite/DynamicModelService.java

@@ -259,6 +259,23 @@ public class DynamicModelService {
                     modes.add("query");
                 metaFieldModel.set("search_modes",String.join(",",modes));
             }
+            if((!StringUtils.isEmpty(defield.getDefaultValueType()))||(!StringUtils.isEmpty(defield.getDefaultValue())))
+            {
+                String defaultValue="";
+                if(StringUtils.isEmpty(defield.getDefaultValueType())||"NONE".equalsIgnoreCase(defield.getDefaultValueType()))
+                {
+                    defaultValue=defield.getDefaultValue();
+                }
+                else if(!StringUtils.isEmpty(defield.getDefaultValue()))
+                {
+                    defaultValue=String.format("${%1$s.%2$s}",defield.getDefaultValueType(),defield.getDefaultValue());
+                }
+                else
+                {
+                    defaultValue=String.format("${%1$s}",defield.getDefaultValueType());
+                }
+                metaFieldModel.set("default_value",defaultValue);
+            }
 
             fieldModel.setCodeName(metaFieldModel.getCodeName()).setColumnName(metaFieldModel.getFieldName()).setUnionName(metaFieldModel.getFieldUniName()).setShowName(metaFieldModel.getFieldShowName())
             .setComment(metaFieldModel.getFieldLogicName()).setField(metaFieldModel);

ibzdata-core/src/main/java/cn/ibizlab/core/data/model/POSchema.java

@@ -402,6 +402,13 @@ public class POSchema {
         @JSONField(ordinal = 11)
         private Set<String> searchModes;
 
+        public Column setDefaultValue(String defaultValue)
+        {
+            if((!StringUtils.isEmpty(defaultValue))&&(!defaultValue.startsWith("$")))
+                this.defaultValue=defaultValue;
+            return this;
+        }
+
         public Column putSearchModes(String searchModes)
         {
 

ibzdata-core/src/main/java/cn/ibizlab/core/data/model/PojoOption.java

@@ -232,11 +232,11 @@ public class PojoOption extends DataObj
         return this.set("dict",dict);
     }
     public String getDefaultValue() {
-        return this.getStringValue("defaultValue");
+        return this.getStringValue("default_value");
     }
 
     public PojoOption setDefaultValue(String defaultValue) {
-        return this.set("defaultValue",defaultValue);
+        return this.set("default_value",defaultValue);
     }
     public String getDataType() {
         return this.getStringValue("data_type");

ibzdata-core/src/main/java/cn/ibizlab/core/data/model/TransUtils.java

@@ -4,6 +4,7 @@ import cn.ibizlab.core.data.domain.POModel;
 import cn.ibizlab.core.data.lite.*;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
+import org.springframework.util.ObjectUtils;
 import org.springframework.util.StringUtils;
 
 import java.util.LinkedHashMap;
@@ -102,7 +103,7 @@ public class TransUtils {
             }
             else {
                 property.setPropertyType(PojoModel.PropertyType.valueOf(sub.getType()));
-                if(sub.getOptions()!=null&&(!StringUtils.isEmpty(sub.getOptions().getDict())))
+                if(!StringUtils.isEmpty(sub.getOptions().getDict()))
                     property.setDict(sub.getOptions().getDict());
             }
 
@@ -140,9 +141,13 @@ public class TransUtils {
                     .setOptions(new PojoOption().setAll(JSONObject.parseObject(JSON.toJSONString(fieldModel.getField()))));
 
             Object searchModes=fieldModel.getField().get("search_modes");
-            if(searchModes!=null)
+            if(!ObjectUtils.isEmpty(searchModes))
                 sub.getOptions().setSearchModes(searchModes.toString());
 
+            Object defaultValue=fieldModel.getField().get("default_value");
+            if(!ObjectUtils.isEmpty(defaultValue))
+                sub.getOptions().setDefaultValue(defaultValue.toString());
+
             sub.getOptions().remove("ext_params");
 
 

ibzdata-core/src/main/java/cn/ibizlab/core/data/service/impl/BaseDataService.java

@@ -240,12 +240,9 @@ public  class BaseDataService implements IDataService {
                         {
                             refProperties.entrySet().forEach(propEntry->{
                                 PojoSchema prop=propEntry.getValue();
-                                if(prop.getOptions()!=null)
-                                {
                                 String refFieldCodeName=prop.getOptions().getRefFieldCodeName();
                                 if((!StringUtils.isEmpty(refFieldCodeName))&&parentData.get(refFieldCodeName.toLowerCase())!=null)
                                     et.set(propEntry.getKey().toLowerCase(), parentData.get(refFieldCodeName.toLowerCase()));
-                                }
                             });
                         }