ibizdev提交

app_web/src/widgets/ibzdict/main-form/main-form.less

@@ -43,7 +43,7 @@
 // 表单行间距
 .app-form{
   .app-form-item{
-    margin-bottom: 10px;
+    margin-bottom: 20px;
   }
 }
 // this is less

app_web/src/widgets/ibzdictitem/main-form/main-form.less

@@ -43,7 +43,7 @@
 // 表单行间距
 .app-form{
   .app-form-item{
-    margin-bottom: 10px;
+    margin-bottom: 20px;
   }
 }
 // this is less

ibzdict-core/src/main/java/cn/ibizlab/core/dict/filter/IBZDictItemSearchContext.java

@@ -10,6 +10,7 @@ import java.util.HashMap;
 import lombok.Data;
 import lombok.extern.slf4j.Slf4j;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.alibaba.fastjson.annotation.JSONField;
 
 import org.springframework.util.ObjectUtils;
 import org.springframework.util.StringUtils;

ibzdict-core/src/main/java/cn/ibizlab/core/dict/filter/IBZDictSearchContext.java

@@ -10,6 +10,7 @@ import java.util.HashMap;
 import lombok.Data;
 import lombok.extern.slf4j.Slf4j;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.alibaba.fastjson.annotation.JSONField;
 
 import org.springframework.util.ObjectUtils;
 import org.springframework.util.StringUtils;

ibzdict-util/src/main/java/cn/ibizlab/util/domain/DTOBase.java

@@ -14,6 +14,7 @@ import lombok.Data;
 @Data
 public class DTOBase implements Serializable {
 
+
     @JsonIgnore
     @JSONField(serialize = false)
     private Set<String> focusNull;
@@ -21,13 +22,30 @@ public class DTOBase implements Serializable {
 
     public void modify(String field,Object val) {
         if(val==null)
-            this.getFocusNull().add(field.toLowerCase());
+            this.getFocusNull(true).add(field.toLowerCase());
         else
-            this.getFocusNull().remove(field.toLowerCase());
+            this.getFocusNull(true).remove(field.toLowerCase());
     }
 
 
     public Set<String> getFocusNull() {
+        if(focusNull==null)
+            focusNull=new HashSet<>();
+        if(focusNull.size()>0 && extensionparams.containsKey("dirtyflagenable"))
+        {
+            Set<String> nocheck=new HashSet<>();
+            for(String key:focusNull)
+            {
+                if(!extensionparams.containsKey(key+"dirtyflag"))
+                    nocheck.add(key);
+            }
+            for(String key:nocheck)
+                focusNull.remove(key);
+        }
+        return focusNull;
+    }
+
+    private Set<String> getFocusNull(boolean newflag) {
         if(focusNull==null)
             focusNull=new HashSet<>();
         return focusNull;
@@ -54,3 +72,4 @@ public class DTOBase implements Serializable {
         extensionparams.put(name.toLowerCase(), value);
     }
 }
+

ibzdict-util/src/main/java/cn/ibizlab/util/domain/EntityBase.java

@@ -31,10 +31,7 @@ public class EntityBase implements Serializable {
     }
 
     public void modify(String field,Object val) {
-        if(val==null)
-            this.getFocusNull().add(field.toLowerCase());
-        else
-            this.getFocusNull().remove(field.toLowerCase());
+
     }
 
     public Serializable getDefaultKey(boolean gen) {

ibzdict-util/src/main/java/cn/ibizlab/util/domain/EntityClient.java

+package cn.ibizlab.util.domain;
+
+public class EntityClient extends EntityBase {
+
+    @Override
+    public void modify(String field,Object val) {
+        if(val==null){
+            this.getFocusNull().add(field.toLowerCase());
+            getExtensionparams().put("dirtyflagenable",true);
+            getExtensionparams().put(field.toLowerCase()+"dirtyflag",true);
+        }
+        else{
+            this.getFocusNull().remove(field.toLowerCase());
+            getExtensionparams().remove(field.toLowerCase()+"dirtyflag");
+        }
+    }
+
+}
+

ibzdict-util/src/main/java/cn/ibizlab/util/domain/EntityMP.java

@@ -16,5 +16,13 @@ public class EntityMP extends EntityBase {
         return  wrapper;
     }
 
+    @Override
+    public void modify(String field,Object val) {
+        if(val==null)
+            this.getFocusNull().add(field.toLowerCase());
+        else
+            this.getFocusNull().remove(field.toLowerCase());
+    }
+
 }
 

ibzdict-util/src/main/java/cn/ibizlab/util/domain/EntityMongo.java

+package cn.ibizlab.util.domain;
+
+public class EntityMongo extends EntityBase {
+
+
+
+}
+