diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java
index aeaa624..e676df5 100644
--- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java
+++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java
@@ -73,6 +73,7 @@ public class CommonEnumUtil {
         GATEWAY(96, 9000, 0, 0, "impp-gateway", "服务网关"),
         CLOUD(97, 0, 0, 0, "i3cloud", "微服务"),
         CENTER(99, 8000, 1, 0, "icloud-server", "注册中心"),
+        SCREEN(100, 8950, 23, 0, "i3screen", "通用界面"),
 
         /**
          * 平台服务
@@ -2016,8 +2017,7 @@ public class CommonEnumUtil {
                     "?autoReconnect=true" +
                     "&useSSL=false" +
                     "&characterEncoding=utf-8" +
-                    "&allowPublicKeyRetrieval=true" +
-                    "&serverTimezone=CST";
+                    "&allowPublicKeyRetrieval=true";
         }
 
         private String getJDBCUrlOracle(String database, String host, Integer port) {
diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ScreenEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ScreenEnumUtil.java
index 9122d14..7a184e0 100644
--- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ScreenEnumUtil.java
+++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ScreenEnumUtil.java
@@ -83,4 +83,201 @@ public class ScreenEnumUtil {
         }
     }
 
+    public enum LAYOUT_TYPE {
+        SCREEN(10, "SCREEN", "Screen布局"),
+        PANEL(20, "PANEL", "Panel布局");
+
+        private Integer value;
+        private String code;
+        private String description;
+
+        LAYOUT_TYPE(Integer value, String code, String description) {
+            this.value = value;
+            this.code = code;
+            this.description = description;
+        }
+
+        public Integer getValue() {
+            return value;
+        }
+
+        public String getCode() {
+            return code;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String codeOfDescription(String code) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].code.equals(code)) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
+
+    public enum DATASOURCE_CONNECTION_STATUS {
+        SUCCESS(10, "success", "连接成功"),
+        FAILED(20, "failed", "连接失败");
+
+        private Integer value;
+        private String code;
+        private String description;
+
+        DATASOURCE_CONNECTION_STATUS(Integer value, String code, String description) {
+            this.value = value;
+            this.code = code;
+            this.description = description;
+        }
+
+        public Integer getValue() {
+            return value;
+        }
+
+        public String getCode() {
+            return code;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String codeOfDescription(String code) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].code.equals(code)) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
+
+    public enum ACTION {
+        SEARCH(10, "search", "查询"),
+        CREATE(20, "create", "保存"),
+        UPDATE(30, "update", "更新"),
+        DELETE(40, "delete", "删除"),
+        VALID(50, "valid", "查询"),
+        INVALID(60, "inValid", "查询"),
+        SEARCH_PAGER(70, "searchPager", "查询"),
+        ENUM(80, "enum", "查询"),
+        DIRECT(90, "direct", "查询"),
+        DOWNLOAD(100, "download", "查询"),
+        UPLOAD(110, "upload", "查询"),
+        INVOKE(120, "invoke", "查询");
+
+        private Integer value;
+        private String code;
+        private String description;
+
+        ACTION(Integer value, String code, String description) {
+            this.value = value;
+            this.code = code;
+            this.description = description;
+        }
+
+        public Integer getValue() {
+            return value;
+        }
+
+        public String getCode() {
+            return code;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String codeOfDescription(String code) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].code.equals(code)) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
+
+
+    public enum COMMUNICATION_TYPE {
+        HTTP(10, "HTTP", "Http"),
+        WEBSOCKET(20, "WEBSOCKET", "WebSocket");
+
+        private Integer value;
+        private String code;
+        private String description;
+
+        COMMUNICATION_TYPE(Integer value, String code, String description) {
+            this.value = value;
+            this.code = code;
+            this.description = description;
+        }
+
+        public Integer getValue() {
+            return value;
+        }
+
+        public String getCode() {
+            return code;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String codeOfDescription(String code) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].code.equals(code)) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
+
+    public enum DATA_RESOURCE_TYPE {
+        ENUM(10, "enum", "枚举"),
+        WEBSOCKET(20, "WEBSOCKET", "WebSocket");
+
+        private Integer value;
+        private String code;
+        private String description;
+
+        DATA_RESOURCE_TYPE(Integer value, String code, String description) {
+            this.value = value;
+            this.code = code;
+            this.description = description;
+        }
+
+        public Integer getValue() {
+            return value;
+        }
+
+        public String getCode() {
+            return code;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String codeOfDescription(String code) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].code.equals(code)) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
+
+
 }
diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/annotation/ReferTo.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/annotation/ReferTo.java
new file mode 100644
index 0000000..f550999
--- /dev/null
+++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/annotation/ReferTo.java
@@ -0,0 +1,28 @@
+//package cn.estsh.i3plus.pojo.screen.annotation;
+//
+//import cn.estsh.i3plus.pojo.base.enumutil.ScreenEnumUtil;
+//
+//import java.lang.annotation.Documented;
+//import java.lang.annotation.ElementType;
+//import java.lang.annotation.Retention;
+//import java.lang.annotation.RetentionPolicy;
+//import java.lang.annotation.Target;
+//
+///**
+// * @author Wynne.Lu
+// * @date 2021/3/30 下午9:11
+// * @desc
+// */
+//@Retention(RetentionPolicy.RUNTIME)
+//@Target({ElementType.FIELD)
+//@Documented
+//public @interface ReferTo {
+//
+//    ScreenEnumUtil.DATA_RESOURCE_TYPE refType() default ScreenEnumUtil.DATA_RESOURCE_TYPE.ENUM;
+//
+//    String refWhere();
+//
+//    String refField();
+//
+//
+//}
diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/AbstractScreenBean.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/BaseScreenBean.java
similarity index 74%
rename from modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/AbstractScreenBean.java
rename to modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/BaseScreenBean.java
index 4185d7c..1485a11 100644
--- a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/AbstractScreenBean.java
+++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/BaseScreenBean.java
@@ -9,8 +9,7 @@ import lombok.Data;
  * @desc
  */
 @Data
-public abstract class AbstractScreenBean extends BaseBean {
+public abstract class BaseScreenBean extends BaseBean {
     private static final long serialVersionUID = 3535186340743573771L;
 
-    private Integer version;
 }
diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrAction.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrAction.java
index 06f0f19..00dd089 100644
--- a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrAction.java
+++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrAction.java
@@ -37,4 +37,9 @@ public class ScrAction extends BaseBean implements Serializable {
     @Column(name = "ACTION_NAME")
     @ApiParam("动作名称")
     private String actionName;
+
+    @Column(name = "ACTION_TYPE")
+    @ApiParam("动作类型")
+    private String actionType;
+
 }
\ No newline at end of file
diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrPanelModel.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrComponent.java
similarity index 50%
rename from modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrPanelModel.java
rename to modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrComponent.java
index 90fe642..afa0a75 100644
--- a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrPanelModel.java
+++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrComponent.java
@@ -11,35 +11,42 @@ import lombok.NoArgsConstructor;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
+import javax.persistence.Lob;
 import javax.persistence.Table;
 import java.io.Serializable;
 
 /**
  * @author Wynne.Lu
- * @date 2021/3/22 下午8:42
+ * @date 2021/3/22 上午10:43
  * @desc
  */
 @Entity
-@Table(name = "SCR_PANEL_MODEL")
+@Table(name = "SCR_COMPONENT")
 @Data
 @EqualsAndHashCode(callSuper = true)
 @NoArgsConstructor
 @AllArgsConstructor
 @Builder
-@Api("Panel与Model的关系")
-public class ScrPanelModel extends BaseBean implements Serializable {
-    private static final long serialVersionUID = -6998319452471117206L;
+@Api("组件")
+public class ScrComponent extends BaseBean implements Serializable {
+    private static final long serialVersionUID = 3832856363595940018L;
 
-    @Column(name = "PANEL_MODEL_CODE")
-    @ApiParam("Panel与Model的关系代码")
-    private String panelModelCode;
+    @Column(name = "COMPONENT_CODE")
+    @ApiParam(value = "组件代码")
+    private String componentCode;
 
-    @Column(name = "PANEL_CODE")
-    @ApiParam("Panel代码")
-    private String panelCode;
+    @Column(name = "COMPONENT_TYPE")
+    @ApiParam(value = "组件代码")
+    private String componentType;
 
     @Column(name = "MODEL_CODE")
-    @ApiParam("Model代码")
+    @ApiParam(value = "model代码")
     private String modelCode;
 
-}
+    @Lob
+    @Column(name = "COMPONENT_PROPERTY")
+    @ApiParam(value = "组件描述")
+    private String componentProperty;
+
+
+}
\ No newline at end of file
diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrDataObject.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrDataObject.java
index 8da3aeb..83141c4 100644
--- a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrDataObject.java
+++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrDataObject.java
@@ -1,6 +1,8 @@
 package cn.estsh.i3plus.pojo.screen.bean;
 
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.AllArgsConstructor;
@@ -30,6 +32,11 @@ import java.io.Serializable;
 public class ScrDataObject extends BaseBean implements Serializable {
     private static final long serialVersionUID = -270662014158685376L;
 
+    @Column(name = "DATA_SOURCE_ID")
+    @ApiParam(value = "数据源ID", example = "-1")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long dataSourceId;
+
     @Column(name = "DATA_OBJECT_CODE")
     @ApiParam(value = "数据对象代码")
     private String dataObjectCode;
@@ -38,13 +45,13 @@ public class ScrDataObject extends BaseBean implements Serializable {
     @ApiParam(value = "数据源编码")
     private String sourceCode;
 
-    @Column(name = "DATA_OBJECT_SOURCE")
+    @Column(name = "DATA_OBJECT_SOURCE_CODE")
     @ApiParam(value = "数据名称")
-    private String dataObjectSource;
+    private String dataObjectSourceCode;
 
     @Column(name = "DATA_TYPE")
     @ApiParam(value = "数据类型")
-    private Integer dataType;
+    private String dataType;
 
     @Column(name = "DESCRIPTION")
     @ApiParam(value = "描述")
diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrDataObjectProperty.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrDataObjectProperty.java
index 4b4caad..ea1d491 100644
--- a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrDataObjectProperty.java
+++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrDataObjectProperty.java
@@ -31,27 +31,28 @@ public class ScrDataObjectProperty extends BaseBean implements Serializable {
     private static final long serialVersionUID = 6954106365899677132L;
 
     @Column(name = "DATA_OBJECT_CODE")
-    @ApiParam(value = "数据对象ID")
-    private Long dataObjectCode;
+    @ApiParam(value = "数据对象代码")
+    private String dataObjectCode;
 
     @Column(name = "FIELD_CODE")
     @ApiParam(value = "字段代码")
     private String fieldCode;
 
+    @Column(name = "DISPLAY_NAME")
+    @ApiParam(value = "字段名称")
+    private String displayName;
+
     @Column(name = "FIELD_TYPE")
     @ApiParam(value = "字段类型")
     private String fieldType;
 
-    @Column(name="IS_PRIMARY_KEY")
-    @ApiParam(value ="是否主键")
+    @Column(name = "IS_PRIMARY_KEY")
+    @ApiParam(value = "是否主键")
     private Integer isPrimaryKey;
 
-    @Column(name="IS_NULLABLE")
+    @Column(name = "IS_NULLABLE")
     @ApiParam(value = "是否允许为空")
     private Integer isNullable;
 
 
-
-
-
 }
diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrDatasource.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrDatasource.java
index bb01da4..dee82d7 100644
--- a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrDatasource.java
+++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrDatasource.java
@@ -1,6 +1,7 @@
 package cn.estsh.i3plus.pojo.screen.bean;
 
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.base.enumutil.ScreenEnumUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.AllArgsConstructor;
@@ -11,6 +12,8 @@ import lombok.NoArgsConstructor;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
+import javax.persistence.EnumType;
+import javax.persistence.Enumerated;
 import javax.persistence.Table;
 import java.io.Serializable;
 
@@ -31,43 +34,44 @@ import java.io.Serializable;
 public class ScrDatasource extends BaseBean implements Serializable {
     private static final long serialVersionUID = 2660387454249572573L;
 
-    @Column(name="SOURCE_NAME")
-    @ApiParam(value ="数据源名称")
+    @Column(name = "SOURCE_NAME")
+    @ApiParam(value = "数据源名称")
     private String sourceName;
 
-    @Column(name="SOURCE_CODE")
-    @ApiParam(value ="数据源代码")
+    @Column(name = "SOURCE_CODE")
+    @ApiParam(value = "数据源代码")
     private String sourceCode;
 
-    @Column(name="SOURCE_STATUS")
-    @ApiParam(value ="数据源状态",name = "状态：可用，不可用 看枚举当中是否存在")
-    private Integer sourceStatus;
+    @Column(name = "SOURCE_CONNECTION_STATUS")
+    @ApiParam(value = "数据源状态", name = "状态：可用，不可用 看枚举当中是否存在")
+    @Enumerated(EnumType.STRING)
+    private ScreenEnumUtil.DATASOURCE_CONNECTION_STATUS sourceConnectionStatus;
 
-    @Column(name="SOURCE_TYPE")
-    @ApiParam(value ="数据源类型",name = "CommonEnumUtil.DATA_SOURCE_TYPE")
+    @Column(name = "SOURCE_TYPE")
+    @ApiParam(value = "数据源类型", name = "CommonEnumUtil.DATA_SOURCE_TYPE")
     private Integer sourceType;
 
-    @Column(name="SOURCE_HOST")
-    @ApiParam(value ="数据源连接地址")
+    @Column(name = "SOURCE_HOST")
+    @ApiParam(value = "数据源连接地址")
     private String sourceHost;
 
-    @Column(name="SOURCE_PORT")
-    @ApiParam(value ="数据源端口")
+    @Column(name = "SOURCE_PORT")
+    @ApiParam(value = "数据源端口")
     private Integer sourcePort;
 
-    @Column(name="SOURCE_DATA_BASE_NAME")
-    @ApiParam(value ="数据库名称")
+    @Column(name = "SOURCE_DATA_BASE_NAME")
+    @ApiParam(value = "数据库名称")
     private String sourceDataBaseName;
 
-    @Column(name="SOURCE_USER_NAME")
-    @ApiParam(value ="数据库用户名称")
+    @Column(name = "SOURCE_USER_NAME")
+    @ApiParam(value = "数据库用户名称")
     private String sourceUserName;
 
-    @Column(name="SOURCE_PASSWORD")
-    @ApiParam(value ="数据库用户密码")
+    @Column(name = "SOURCE_PASSWORD")
+    @ApiParam(value = "数据库用户密码")
     private String sourcePassword;
 
-    @Column(name="SOURCE_DESCRIPTION")
-    @ApiParam(value ="数据源描述")
+    @Column(name = "SOURCE_DESCRIPTION")
+    @ApiParam(value = "数据源描述")
     private String sourceDescription;
 }
diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrEventAction.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrEventAction.java
index a442262..b26640f 100644
--- a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrEventAction.java
+++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrEventAction.java
@@ -31,7 +31,7 @@ public class ScrEventAction extends BaseBean implements Serializable {
     private static final long serialVersionUID = -6217007706865821613L;
 
     @Column(name = "EVENT_ACTION_CODE")
-    @ApiParam("事件动作代码")
+    @ApiParam("事件动作CODE")
     private String eventActionCode;
 
     @Column(name = "EVENT_ACTION_NAME")
diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrFile.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrFile.java
index c1d4994..b57e540 100644
--- a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrFile.java
+++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrFile.java
@@ -1,9 +1,60 @@
 package cn.estsh.i3plus.pojo.screen.bean;
 
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+import java.io.Serializable;
+
 /**
  * @author Wynne.Lu
  * @date 2021/3/22 下午9:59
  * @desc
  */
-public class ScrFile {
+@Entity
+@Table(name = "SCR_FILE")
+@Data
+@EqualsAndHashCode(callSuper = true)
+@NoArgsConstructor
+@AllArgsConstructor
+@Builder
+@Api("文件")
+public class ScrFile extends BaseBean implements Serializable {
+    private static final long serialVersionUID = 2343301746531746105L;
+
+    @Column(name = "FILE_NAME")
+    @ApiParam("文件名称")
+    private String fileName;
+
+    @Column(name = "FILE_URL")
+    @ApiParam("文件URL")
+    private String fileUrl;
+
+    @Column(name = "GROUP_NAME")
+    @ApiParam("组名")
+    private String groupName;
+
+    @Column(name = "FILE_ORIGIN_NAME")
+    @ApiParam("文件原名")
+    private String fileOriginName;
+
+    @Column(name = "FILE_SIZE")
+    @ApiParam("文件大小")
+    private String fileSize;
+
+    @Column(name = "FILE_TYPE")
+    @ApiParam("文件类型名称")
+    private String fileType;
+
+    @Column(name = "SYNC_TAG")
+    @ApiParam("同步标记")
+    private Integer syncTag = 0;
 }
diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrLayout.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrLayout.java
index 9e1542e..7cd0101 100644
--- a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrLayout.java
+++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrLayout.java
@@ -1,6 +1,7 @@
 package cn.estsh.i3plus.pojo.screen.bean;
 
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.base.enumutil.ScreenEnumUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.AllArgsConstructor;
@@ -11,6 +12,8 @@ import lombok.NoArgsConstructor;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
+import javax.persistence.EnumType;
+import javax.persistence.Enumerated;
 import javax.persistence.Table;
 import java.io.Serializable;
 
@@ -28,8 +31,8 @@ import java.io.Serializable;
 @Builder
 @Api("布局")
 public class ScrLayout extends BaseBean implements Serializable {
-
     private static final long serialVersionUID = 3390463604300159807L;
+
     @Column(name = "LAYOUT_CODE")
     @ApiParam("布局代码")
     private String layoutCode;
@@ -38,12 +41,9 @@ public class ScrLayout extends BaseBean implements Serializable {
     @ApiParam("布局名称")
     private String layoutName;
 
-    @Column(name = "ROW_SEQ")
-    @ApiParam("行顺序")
-    private Integer rowSeq;
-
-    @Column(name = "ROW_CODE")
-    @ApiParam("行代码")
-    private String rowCode;
+    @Column(name = "LAYOUT_TYPE")
+    @ApiParam("布局类型")
+    @Enumerated(EnumType.STRING)
+    private ScreenEnumUtil.LAYOUT_TYPE layoutType;
 
 }
diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrLayoutColumn.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrLayoutColumn.java
index f74295f..b2ff882 100644
--- a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrLayoutColumn.java
+++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrLayoutColumn.java
@@ -25,21 +25,29 @@ import java.io.Serializable;
 @EqualsAndHashCode(callSuper = true)
 @NoArgsConstructor
 @AllArgsConstructor
-//@Builder
-@Api("布局-列")
+@Builder
+@Api("布局-父类-列")
 public class ScrLayoutColumn extends BaseBean implements Serializable {
     private static final long serialVersionUID = 5001564292608042287L;
 
-    @Column(name = "COL_CODE")
+    @Column(name = "LAYOUT_CODE")
+    @ApiParam("布局代码")
+    private String layoutCode;
+
+    @Column(name = "ROW_CODE")
+    @ApiParam("列代码")
+    private String rowCode;
+
+    @Column(name = "COLUMN_CODE")
     @ApiParam("列代码")
-    private String colCode;
+    private String columnCode;
 
-    @Column(name ="COL_NAME")
-    @ApiParam("列名称")
-    private String colName;
+    @Column(name = "COLUMN_SEQ")
+    @ApiParam("列顺序")
+    private Integer columnSeq;
 
-    @Column(name ="COL_SPAN")
+    @Column(name = "COLUMN_SPAN")
     @ApiParam("列占位")
-    private Integer colSpan;
+    private Integer columnSpan;
 
 }
diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrLayoutRow.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrLayoutRow.java
index 92c2cfd..9c8e451 100644
--- a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrLayoutRow.java
+++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrLayoutRow.java
@@ -30,25 +30,21 @@ import java.io.Serializable;
 public class ScrLayoutRow extends BaseBean implements Serializable {
     private static final long serialVersionUID = 6042010183759804616L;
 
+    @Column(name = "LAYOUT_CODE")
+    @ApiParam("布局代码")
+    private String layoutCode;
+
     @Column(name = "ROW_CODE")
     @ApiParam("行代码")
     private String rowCode;
 
-    @Column(name = "ROW_NAME")
-    @ApiParam("行名称")
-    private String rowName;
-
     @Column(name = "ROW_HEIGHT")
     @ApiParam("行高")
     private Double rowHeight;
 
-    @Column(name = "COL_SEQ")
-    @ApiParam("列序号")
-    private Integer colSeq;
-
-    @Column(name = "COL_CODE")
-    @ApiParam("列代码")
-    private String colCode;
+    @Column(name = "ROW_SEQ")
+    @ApiParam("行顺序")
+    private Integer rowSeq;
 
 
 }
diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrModelField.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrModelField.java
index efc9f3a..d50cf18 100644
--- a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrModelField.java
+++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrModelField.java
@@ -38,6 +38,10 @@ public class ScrModelField extends BaseBean implements Serializable {
     @ApiParam("字段代码")
     private String fieldCode;
 
+    @Column(name = "DISPLAY_NAME")
+    @ApiParam("字段名称")
+    private String displayName;
+
     @Column(name = "IS_FUZZY_SEARCH")
     @ApiParam("是否支持模糊查询")
     private Boolean isFuzzySearch;
diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrPanel.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrPanel.java
index 12003c0..527865d 100644
--- a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrPanel.java
+++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrPanel.java
@@ -37,7 +37,7 @@ public class ScrPanel extends BaseBean implements Serializable {
     @ApiParam("Panel名称")
     private String panelName;
 
-    @Column(name = "LAYOUT_CODE")
+    @Column(name = "PANEL_LAYOUT_CODE")
     @ApiParam("布局代码")
     private String layoutCode;
 
diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrPanelLayoutColumn.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrPanelLayoutColumn.java
deleted file mode 100644
index e520792..0000000
--- a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrPanelLayoutColumn.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package cn.estsh.i3plus.pojo.screen.bean;
-
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiParam;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.NoArgsConstructor;
-
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Table;
-import java.io.Serializable;
-
-/**
- * @author Wynne.Lu
- * @date 2021/3/11 下午5:01
- * @desc
- */
-@Entity
-@Table(name = "SCR_PANEL_LAYOUT_COLUMN")
-@Data
-@EqualsAndHashCode(callSuper = true)
-@NoArgsConstructor
-@AllArgsConstructor
-@Builder
-@Api("Panel布局-列")
-public class ScrPanelLayoutColumn extends ScrLayoutColumn implements Serializable {
-    private static final long serialVersionUID = 6577099884589179886L;
-
-    @Column(name = "COMPONENT_CODE")
-    @ApiParam("组件代码")
-    private String componentCode;
-}
diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrScreen.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrScreen.java
index 659d988..13f8bfe 100644
--- a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrScreen.java
+++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrScreen.java
@@ -42,7 +42,7 @@ public class ScrScreen extends BaseBean implements Serializable {
     @ApiParam("页面版本")
     private String screenVersion;
 
-    @Column(name = "LAYOUT_CODE")
+    @Column(name = "SCREEN_LAYOUT_CODE")
     @ApiParam("布局代码")
     private String layoutCode;
 
diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrScreenLayoutColumn.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrScreenLayoutColumn.java
deleted file mode 100644
index 398c167..0000000
--- a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrScreenLayoutColumn.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package cn.estsh.i3plus.pojo.screen.bean;
-
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiParam;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.NoArgsConstructor;
-
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Table;
-import java.io.Serializable;
-
-/**
- * @author Wynne.Lu
- * @date 2021/3/11 下午5:01
- * @desc
- */
-@Entity
-@Table(name = "SCR_SCREEN_LAYOUT_COLUMN")
-@Data
-@EqualsAndHashCode(callSuper = true)
-@NoArgsConstructor
-@AllArgsConstructor
-@Builder
-@Api("Screen布局-列")
-public class ScrScreenLayoutColumn extends ScrLayoutColumn implements Serializable {
-    private static final long serialVersionUID = 4084273106415805804L;
-
-    @Column(name = "PANEL_CODE")
-    @ApiParam("Panel代码")
-    private String panelCode;
-
-}
diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrPanelModelComponent.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/rel/ScrComponentEventActionRel.java
similarity index 57%
rename from modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrPanelModelComponent.java
rename to modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/rel/ScrComponentEventActionRel.java
index e447112..eab43aa 100644
--- a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrPanelModelComponent.java
+++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/rel/ScrComponentEventActionRel.java
@@ -1,4 +1,4 @@
-package cn.estsh.i3plus.pojo.screen.bean;
+package cn.estsh.i3plus.pojo.screen.bean.rel;
 
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import io.swagger.annotations.Api;
@@ -12,31 +12,28 @@ import lombok.NoArgsConstructor;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
-import java.io.Serializable;
 
 /**
  * @author Wynne.Lu
- * @date 2021/3/22 下午8:42
+ * @date 2021/3/25 上午9:56
  * @desc
  */
 @Entity
-@Table(name = "SCR_PANEL_MODEL_COMPONENT")
+@Table(name = "SCR_COMPONENT_EVENT_ACTION_REL")
 @Data
 @EqualsAndHashCode(callSuper = true)
 @NoArgsConstructor
 @AllArgsConstructor
 @Builder
-@Api("Panel与Model组件的关系")
-public class ScrPanelModelComponent extends BaseBean implements Serializable {
-    private static final long serialVersionUID = 2011504067317832781L;
-
-    @Column(name = "PANEL_MODEL_CODE")
-    @ApiParam("Panel与Model的关系代码")
-    private String panelModelCode;
+@Api("组件事件动作")
+public class ScrComponentEventActionRel extends BaseBean {
+    private static final long serialVersionUID = 7600064730551351570L;
 
     @Column(name = "COMPONENT_CODE")
     @ApiParam("组件代码")
     private String componentCode;
 
-
+    @Column(name = "EVENT_ACTION_CODE")
+    @ApiParam("事件动作代码")
+    private String eventActionCode;
 }
diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrPanelModelField.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/rel/ScrComponentModelFieldRel.java
similarity index 65%
rename from modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrPanelModelField.java
rename to modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/rel/ScrComponentModelFieldRel.java
index 0743062..fc0521d 100644
--- a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrPanelModelField.java
+++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/rel/ScrComponentModelFieldRel.java
@@ -1,6 +1,7 @@
-package cn.estsh.i3plus.pojo.screen.bean;
+package cn.estsh.i3plus.pojo.screen.bean.rel;
 
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.screen.bean.ScrModelField;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.AllArgsConstructor;
@@ -11,8 +12,11 @@ import lombok.NoArgsConstructor;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
+import javax.persistence.OneToMany;
+import javax.persistence.OneToOne;
 import javax.persistence.Table;
 import java.io.Serializable;
+import java.util.List;
 
 /**
  * @author Wynne.Lu
@@ -20,24 +24,48 @@ import java.io.Serializable;
  * @desc
  */
 @Entity
-@Table(name = "SCR_PANEL_MODEL_FIELD")
+@Table(name = "SCR_COMPONENT_MODEL_FIELD_REL")
 @Data
 @EqualsAndHashCode(callSuper = true)
 @NoArgsConstructor
 @AllArgsConstructor
 @Builder
 @Api("Panel与Model字段的关系")
-public class ScrPanelModelField extends BaseBean implements Serializable {
+public class ScrComponentModelFieldRel extends BaseBean implements Serializable {
     private static final long serialVersionUID = -3441031841089357196L;
 
-    @Column(name = "PANEL_MODEL_CODE")
-    @ApiParam("Panel与Model的关系代码")
-    private String panelModelCode;
+    @Column(name = "PANEL_CODE")
+    @ApiParam("Panel代码")
+    private String panelCode;
+
+    @Column(name = "LAYOUT_CODE")
+    @ApiParam("布局代码")
+    private String layoutCode;
+
+    @Column(name = "ROW_CODE")
+    @ApiParam("行代码")
+    private String rowCode;
+
+    @Column(name = "COLUMN_CODE")
+    @ApiParam("列代码")
+    private String columnCode;
+
+    @Column(name = "COMPONENT_CODE")
+    @ApiParam("组件代码")
+    private String componentCode;
+
+    @Column(name = "MODEL_CODE")
+    @ApiParam("model代码")
+    private String modelCode;
 
     @Column(name = "FIELD_CODE")
     @ApiParam("字段代码")
     private String fieldCode;
 
+    @Column(name = "DISPLAY_NAME")
+    @ApiParam("字段名称")
+    private String displayName;
+
     @Column(name = "IS_FUZZY_SEARCH")
     @ApiParam("是否支持模糊查询")
     private Boolean isFuzzySearch;
@@ -82,4 +110,5 @@ public class ScrPanelModelField extends BaseBean implements Serializable {
     @ApiParam("SPEL表达式虚拟属性")
     private String spelVirtualValue;
 
+
 }
diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/rel/ScrPanelComponentRel.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/rel/ScrPanelComponentRel.java
new file mode 100644
index 0000000..c3fe551
--- /dev/null
+++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/rel/ScrPanelComponentRel.java
@@ -0,0 +1,48 @@
+package cn.estsh.i3plus.pojo.screen.bean.rel;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.screen.component.base.BaseComponent;
+import com.alibaba.fastjson.JSON;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Lob;
+import javax.persistence.Table;
+
+/**
+ * @author Wynne.Lu
+ * @date 2021/3/25 下午4:33
+ * @desc
+ */
+@Entity
+@Table(name = "SCR_PANEL_COMPONENT_REL")
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Api("Panel与组件的关系")
+public class ScrPanelComponentRel extends BaseBean {
+    private static final long serialVersionUID = 3459027655126916483L;
+
+    @Column(name = "PANEL_CODE")
+    @ApiParam("panel代码")
+    private String panelCode;
+
+    @Column(name = "LAYOUT_CODE")
+    @ApiParam("布局代码")
+    private String layoutCode;
+
+    @Column(name = "ROW_CODE")
+    @ApiParam("行代码")
+    private String rowCode;
+
+    @Column(name = "COLUMN_CODE")
+    @ApiParam("列代码")
+    private String columnCode;
+
+    @Column(name = "COMPONENT_CODE")
+    @ApiParam(value = "组件代码")
+    private String componentCode;
+}
diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/rel/ScrScreenPanelRel.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/rel/ScrScreenPanelRel.java
new file mode 100644
index 0000000..a042793
--- /dev/null
+++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/rel/ScrScreenPanelRel.java
@@ -0,0 +1,51 @@
+package cn.estsh.i3plus.pojo.screen.bean.rel;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+
+/**
+ * @author Wynne.Lu
+ * @date 2021/3/25 下午4:33
+ * @desc
+ */
+@Entity
+@Table(name = "SCR_SCREEN_PANEL_REL")
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Builder
+@EqualsAndHashCode(callSuper = true)
+@Api("Screen与Panel的关系")
+public class ScrScreenPanelRel extends BaseBean {
+    private static final long serialVersionUID = 3459027655126916483L;
+
+    @Column(name = "SCREEN_CODE")
+    @ApiParam("Screen代码")
+    private String screenCode;
+
+    @Column(name = "LAYOUT_CODE")
+    @ApiParam("布局代码")
+    private String layoutCode;
+
+    @Column(name = "ROW_CODE")
+    @ApiParam("行代码")
+    private String rowCode;
+
+    @Column(name = "COLUMN_CODE")
+    @ApiParam("列代码")
+    private String columnCode;
+
+    @Column(name = "PANEL_CODE")
+    @ApiParam(value = "panel代码")
+    private String panelCode;
+}
diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/component/base/BaseComponent.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/component/base/BaseComponent.java
new file mode 100644
index 0000000..8e45669
--- /dev/null
+++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/component/base/BaseComponent.java
@@ -0,0 +1,28 @@
+package cn.estsh.i3plus.pojo.screen.component.base;
+
+import cn.estsh.i3plus.pojo.screen.bean.BaseScreenBean;
+import lombok.Data;
+
+/**
+ * @author Wynne.Lu
+ * @date 2021/3/11 下午12:32
+ * @desc
+ */
+@Data
+public abstract class BaseComponent extends BaseScreenBean {
+
+    private static final long serialVersionUID = 6768391193506016205L;
+
+    private String componentCode;
+
+    private String modelCode;
+
+    private String cssStyle;
+
+    private Integer tabIndex;
+
+    private String componentType = this.getClass().getName();
+
+    private String communicationType;
+
+}
diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/component/base/BaseView.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/component/base/BaseView.java
new file mode 100644
index 0000000..6c3c057
--- /dev/null
+++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/component/base/BaseView.java
@@ -0,0 +1,15 @@
+package cn.estsh.i3plus.pojo.screen.component.base;
+
+import lombok.Data;
+
+/**
+ * @author Wynne.Lu
+ * @date 2021/3/11 下午12:30
+ * @desc
+ */
+@Data
+public abstract class BaseView extends BaseComponent {
+
+    private String jsEnhance;
+
+}
diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/component/base/BaseWidget.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/component/base/BaseWidget.java
new file mode 100644
index 0000000..94f45bd
--- /dev/null
+++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/component/base/BaseWidget.java
@@ -0,0 +1,13 @@
+package cn.estsh.i3plus.pojo.screen.component.base;
+
+import lombok.Data;
+
+/**
+ * @author Wynne.Lu
+ * @date 2021/3/11 下午12:30
+ * @desc
+ */
+@Data
+public abstract class BaseWidget extends BaseComponent {
+
+}
diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/component/view/ScrViewBarChart.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/component/view/ScrViewBarChart.java
new file mode 100644
index 0000000..1e65921
--- /dev/null
+++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/component/view/ScrViewBarChart.java
@@ -0,0 +1,26 @@
+package cn.estsh.i3plus.pojo.screen.component.view;
+
+import io.swagger.annotations.Api;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+
+import javax.persistence.Entity;
+import javax.persistence.Table;
+import java.util.List;
+
+/**
+ * @author Wynne.Lu
+ * @date 2021/3/11 下午12:31
+ * @desc
+ */
+@Data
+public class ScrViewBarChart extends ScrViewChart {
+    private static final long serialVersionUID = 7114030006928397461L;
+
+    private List<Object> xAxis;
+
+    private List<Object> yAxis;
+}
diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/component/view/ScrViewChart.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/component/view/ScrViewChart.java
new file mode 100644
index 0000000..c96dc80
--- /dev/null
+++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/component/view/ScrViewChart.java
@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.screen.component.view;
+
+import cn.estsh.i3plus.pojo.screen.component.base.BaseView;
+import lombok.Data;
+
+/**
+ * @author Wynne.Lu
+ * @date 2021/3/11 下午12:31
+ * @desc
+ */
+@Data
+public class ScrViewChart extends BaseView {
+    private static final long serialVersionUID = 3786868086148227665L;
+    private Integer autoRefreshInterval;
+
+}
diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/component/view/ScrViewForm.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/component/view/ScrViewForm.java
new file mode 100644
index 0000000..f0c58fd
--- /dev/null
+++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/component/view/ScrViewForm.java
@@ -0,0 +1,19 @@
+package cn.estsh.i3plus.pojo.screen.component.view;
+
+import cn.estsh.i3plus.pojo.screen.component.base.BaseView;
+import lombok.Data;
+
+import java.util.Map;
+
+/**
+ * @author Wynne.Lu
+ * @date 2021/3/11 下午12:30
+ * @desc
+ */
+@Data
+public class ScrViewForm extends BaseView {
+
+    private Map<String, String> fields;
+
+    private String action;
+}
diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/component/view/ScrViewLineChart.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/component/view/ScrViewLineChart.java
new file mode 100644
index 0000000..bb61d04
--- /dev/null
+++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/component/view/ScrViewLineChart.java
@@ -0,0 +1,18 @@
+package cn.estsh.i3plus.pojo.screen.component.view;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author Wynne.Lu
+ * @date 2021/3/11 下午12:31
+ * @desc
+ */
+@Data
+public class ScrViewLineChart extends ScrViewChart {
+
+//    private List<Object> xAxis;
+//
+//    private List<Object> yAxis;
+}
diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/component/view/ScrViewPieChart.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/component/view/ScrViewPieChart.java
new file mode 100644
index 0000000..e7a423a
--- /dev/null
+++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/component/view/ScrViewPieChart.java
@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.screen.component.view;
+
+import lombok.Data;
+
+/**
+ * @author Wynne.Lu
+ * @date 2021/3/11 下午12:31
+ * @desc
+ */
+
+@Data
+public class ScrViewPieChart extends ScrViewChart {
+    private static final long serialVersionUID = -4334873164110780274L;
+
+//    private Map<String, Double> data;
+}
diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/component/view/ScrViewTable.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/component/view/ScrViewTable.java
new file mode 100644
index 0000000..795c06e
--- /dev/null
+++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/component/view/ScrViewTable.java
@@ -0,0 +1,21 @@
+package cn.estsh.i3plus.pojo.screen.component.view;
+
+import cn.estsh.i3plus.pojo.screen.component.base.BaseView;
+import lombok.Data;
+
+/**
+ * @author Wynne.Lu
+ * @date 2021/3/11 下午12:29
+ * @desc
+ */
+@Data
+public class ScrViewTable extends BaseView {
+
+    private static final long serialVersionUID = -795585853717859678L;
+    private Integer autoRefreshInterval = 0;
+
+    private Boolean isShowChoice;
+
+    private Boolean isPagination;
+
+}
diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/component/view/ScrViewTree.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/component/view/ScrViewTree.java
new file mode 100644
index 0000000..a9f896b
--- /dev/null
+++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/component/view/ScrViewTree.java
@@ -0,0 +1,19 @@
+package cn.estsh.i3plus.pojo.screen.component.view;
+
+import cn.estsh.i3plus.pojo.screen.component.base.BaseView;
+import lombok.Data;
+
+/**
+ * @author Wynne.Lu
+ * @date 2021/3/11 下午12:30
+ * @desc
+ */
+@Data
+public class ScrViewTree extends BaseView {
+    private static final long serialVersionUID = 3615560061167536377L;
+
+    private String parentField;
+
+    private String showField;
+
+}
diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/component/widget/ScrWidgetButton.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/component/widget/ScrWidgetButton.java
new file mode 100644
index 0000000..29d7906
--- /dev/null
+++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/component/widget/ScrWidgetButton.java
@@ -0,0 +1,21 @@
+package cn.estsh.i3plus.pojo.screen.component.widget;
+
+import cn.estsh.i3plus.pojo.screen.component.base.BaseWidget;
+import lombok.Data;
+
+/**
+ * @author Wynne.Lu
+ * @date 2021/3/11 下午12:30
+ * @desc
+ */
+@Data
+public class ScrWidgetButton extends BaseWidget {
+
+    private String icon;
+
+    private String type;
+
+    private String size;
+
+    private String action;
+}
diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/component/widget/ScrWidgetCascader.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/component/widget/ScrWidgetCascader.java
new file mode 100644
index 0000000..2011a99
--- /dev/null
+++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/component/widget/ScrWidgetCascader.java
@@ -0,0 +1,13 @@
+package cn.estsh.i3plus.pojo.screen.component.widget;
+
+import cn.estsh.i3plus.pojo.screen.component.base.BaseWidget;
+import lombok.Data;
+
+/**
+ * @author Wynne.Lu
+ * @date 2021/3/11 下午12:31
+ * @desc
+ */
+@Data
+public class ScrWidgetCascader extends BaseWidget {
+}
diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/component/DatetimePicker.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/component/widget/ScrWidgetDatetimePicker.java
similarity index 64%
rename from modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/component/DatetimePicker.java
rename to modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/component/widget/ScrWidgetDatetimePicker.java
index 5dfa581..7dd274c 100644
--- a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/component/DatetimePicker.java
+++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/component/widget/ScrWidgetDatetimePicker.java
@@ -1,5 +1,6 @@
-package cn.estsh.i3plus.pojo.screen.model.component;
+package cn.estsh.i3plus.pojo.screen.component.widget;
 
+import cn.estsh.i3plus.pojo.screen.component.base.BaseWidget;
 import lombok.Data;
 
 /**
@@ -8,7 +9,7 @@ import lombok.Data;
  * @desc
  */
 @Data
-public class DatetimePicker extends AbstractWidget {
+public class ScrWidgetDatetimePicker extends BaseWidget {
 
     private String dateFormat;
 
diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/component/widget/ScrWidgetLabel.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/component/widget/ScrWidgetLabel.java
new file mode 100644
index 0000000..048f7bf
--- /dev/null
+++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/component/widget/ScrWidgetLabel.java
@@ -0,0 +1,15 @@
+package cn.estsh.i3plus.pojo.screen.component.widget;
+
+import cn.estsh.i3plus.pojo.screen.component.base.BaseWidget;
+import lombok.Data;
+
+/**
+ * @author Wynne.Lu
+ * @date 2021/3/11 下午12:31
+ * @desc
+ */
+@Data
+public class ScrWidgetLabel extends BaseWidget {
+
+    private String text;
+}
diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/Pagination.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/component/widget/ScrWidgetPagination.java
similarity index 71%
rename from modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/Pagination.java
rename to modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/component/widget/ScrWidgetPagination.java
index b0842fe..4d851ee 100644
--- a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/Pagination.java
+++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/component/widget/ScrWidgetPagination.java
@@ -1,4 +1,4 @@
-package cn.estsh.i3plus.pojo.screen.model;
+package cn.estsh.i3plus.pojo.screen.component.widget;
 
 import lombok.Data;
 
@@ -8,7 +8,7 @@ import lombok.Data;
  * @desc
  */
 @Data
-public class Pagination {
+public class ScrWidgetPagination {
 
     private Integer pageSize;
 
diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/component/Preview.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/component/widget/ScrWidgetPreview.java
similarity index 55%
rename from modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/component/Preview.java
rename to modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/component/widget/ScrWidgetPreview.java
index 45ae498..78846c3 100644
--- a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/component/Preview.java
+++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/component/widget/ScrWidgetPreview.java
@@ -1,5 +1,6 @@
-package cn.estsh.i3plus.pojo.screen.model.component;
+package cn.estsh.i3plus.pojo.screen.component.widget;
 
+import cn.estsh.i3plus.pojo.screen.component.base.BaseWidget;
 import lombok.Data;
 
 /**
@@ -8,7 +9,7 @@ import lombok.Data;
  * @desc
  */
 @Data
-public class Preview extends AbstractWidget {
+public class ScrWidgetPreview extends BaseWidget {
 
     private String type;
 
diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/component/Selector.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/component/widget/ScrWidgetSelector.java
similarity index 61%
rename from modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/component/Selector.java
rename to modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/component/widget/ScrWidgetSelector.java
index 9aadd68..4269184 100644
--- a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/component/Selector.java
+++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/component/widget/ScrWidgetSelector.java
@@ -1,5 +1,6 @@
-package cn.estsh.i3plus.pojo.screen.model.component;
+package cn.estsh.i3plus.pojo.screen.component.widget;
 
+import cn.estsh.i3plus.pojo.screen.component.base.BaseWidget;
 import lombok.Data;
 
 /**
@@ -8,7 +9,7 @@ import lombok.Data;
  * @desc
  */
 @Data
-public class Selector extends AbstractWidget {
+public class ScrWidgetSelector extends BaseWidget {
 
     private String placeholder;
 
diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/component/Text.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/component/widget/ScrWidgetText.java
similarity index 54%
rename from modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/component/Text.java
rename to modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/component/widget/ScrWidgetText.java
index c53ae78..d3ad441 100644
--- a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/component/Text.java
+++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/component/widget/ScrWidgetText.java
@@ -1,5 +1,6 @@
-package cn.estsh.i3plus.pojo.screen.model.component;
+package cn.estsh.i3plus.pojo.screen.component.widget;
 
+import cn.estsh.i3plus.pojo.screen.component.base.BaseWidget;
 import lombok.Data;
 
 /**
@@ -8,7 +9,7 @@ import lombok.Data;
  * @desc
  */
 @Data
-public class Text extends AbstractWidget {
+public class ScrWidgetText extends BaseWidget {
 
     private String placeholder;
 
diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/component/Upload.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/component/widget/ScrWidgetUpload.java
similarity index 60%
rename from modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/component/Upload.java
rename to modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/component/widget/ScrWidgetUpload.java
index 4d0260b..38dd703 100644
--- a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/component/Upload.java
+++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/component/widget/ScrWidgetUpload.java
@@ -1,5 +1,6 @@
-package cn.estsh.i3plus.pojo.screen.model.component;
+package cn.estsh.i3plus.pojo.screen.component.widget;
 
+import cn.estsh.i3plus.pojo.screen.component.base.BaseWidget;
 import lombok.Data;
 
 /**
@@ -8,7 +9,7 @@ import lombok.Data;
  * @desc
  */
 @Data
-public class Upload extends AbstractWidget {
+public class ScrWidgetUpload extends BaseWidget {
 
     private Boolean isAllowDraw;
 
diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/PanelModelField.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/PanelModelField.java
deleted file mode 100644
index 0debaa9..0000000
--- a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/PanelModelField.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package cn.estsh.i3plus.pojo.screen.model;
-
-import cn.estsh.i3plus.pojo.screen.bean.ScrModel;
-import cn.estsh.i3plus.pojo.screen.bean.ScrModelField;
-import cn.estsh.i3plus.pojo.screen.model.component.AbstractComponent;
-import lombok.Data;
-
-import java.util.List;
-
-/**
- * @author Wynne.Lu
- * @date 2021/3/11 下午1:14
- * @desc
- */
-@Data
-public class PanelModelField {
-
-    private ScrModel model;
-
-    private List<ScrModelField> modelFields;
-
-    private AbstractComponent component;
-}
diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/ScrLayoutModel.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/ScrLayoutModel.java
new file mode 100644
index 0000000..8bda5bf
--- /dev/null
+++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/ScrLayoutModel.java
@@ -0,0 +1,22 @@
+package cn.estsh.i3plus.pojo.screen.model;
+
+import cn.estsh.i3plus.pojo.screen.bean.ScrLayout;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @author Wynne.Lu
+ * @date 2021/3/27 下午6:10
+ * @desc
+ */
+@Data
+public class ScrLayoutModel implements Serializable {
+    private static final long serialVersionUID = -2767386371499251918L;
+
+    private ScrLayout layout;
+
+    private List<ScrRowColumnModel> rowColumnModels;
+
+}
diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/ScrPanelComponentCreateModel.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/ScrPanelComponentCreateModel.java
new file mode 100644
index 0000000..1e8c0cf
--- /dev/null
+++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/ScrPanelComponentCreateModel.java
@@ -0,0 +1,37 @@
+package cn.estsh.i3plus.pojo.screen.model;
+
+import cn.estsh.i3plus.pojo.screen.bean.ScrComponent;
+import cn.estsh.i3plus.pojo.screen.bean.ScrModelField;
+import cn.estsh.i3plus.pojo.screen.component.base.BaseComponent;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author Wynne.Lu
+ * @date 2021/3/28 上午12:42
+ * @desc
+ */
+@Data
+public class ScrPanelComponentCreateModel implements Serializable {
+    private static final long serialVersionUID = -5832175256726333348L;
+
+    private String panelCode;
+
+    private String layoutCode;
+
+    private String rowCode;
+
+    private String columnCode;
+
+    private Map<String, Object> baseComponent;
+
+    private String modelCode;
+
+    private List<String> eventActions;
+
+    private List<ScrModelField> modelFields;
+
+}
diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/ScrPanelComponentQueryModel.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/ScrPanelComponentQueryModel.java
new file mode 100644
index 0000000..06635a8
--- /dev/null
+++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/ScrPanelComponentQueryModel.java
@@ -0,0 +1,34 @@
+package cn.estsh.i3plus.pojo.screen.model;
+
+import cn.estsh.i3plus.pojo.screen.bean.ScrComponent;
+import cn.estsh.i3plus.pojo.screen.bean.ScrEventAction;
+import cn.estsh.i3plus.pojo.screen.bean.ScrLayout;
+import cn.estsh.i3plus.pojo.screen.bean.ScrModelField;
+import cn.estsh.i3plus.pojo.screen.bean.ScrPanel;
+import cn.estsh.i3plus.pojo.screen.bean.rel.ScrComponentModelFieldRel;
+import cn.estsh.i3plus.pojo.screen.component.base.BaseComponent;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @author Wynne.Lu
+ * @date 2021/3/28 上午12:42
+ * @desc
+ */
+@Data
+public class ScrPanelComponentQueryModel implements Serializable {
+    private static final long serialVersionUID = 4133777603151273736L;
+
+    private String rowCode;
+
+    private String columnCode;
+
+    private ScrComponent component;
+
+    private List<ScrEventAction> eventActions;
+
+    private List<ScrComponentModelFieldRel> modelFields;
+
+}
diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/ScrPanelLayoutModel.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/ScrPanelLayoutModel.java
new file mode 100644
index 0000000..0d29a73
--- /dev/null
+++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/ScrPanelLayoutModel.java
@@ -0,0 +1,20 @@
+package cn.estsh.i3plus.pojo.screen.model;
+
+import cn.estsh.i3plus.pojo.screen.bean.ScrLayout;
+import cn.estsh.i3plus.pojo.screen.bean.ScrPanel;
+
+import java.util.List;
+
+/**
+ * @author Wynne.Lu
+ * @date 2021/3/28 下午2:23
+ * @desc
+ */
+public class ScrPanelLayoutModel {
+
+    private ScrPanel panel;
+
+    private ScrLayout layout;
+
+    private List<ScrRowColumnModel> rowColumnModels;
+}
diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/ScrRowColumnModel.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/ScrRowColumnModel.java
new file mode 100644
index 0000000..f9d7d2b
--- /dev/null
+++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/ScrRowColumnModel.java
@@ -0,0 +1,20 @@
+package cn.estsh.i3plus.pojo.screen.model;
+
+import cn.estsh.i3plus.pojo.screen.bean.ScrLayoutColumn;
+import cn.estsh.i3plus.pojo.screen.bean.ScrLayoutRow;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author Wynne.Lu
+ * @date 2021/3/27 下午8:35
+ * @desc
+ */
+@Data
+public class ScrRowColumnModel {
+
+    private ScrLayoutRow row;
+
+    private List<ScrLayoutColumn> columns;
+}
diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/ScrScreenPanelCreateModel.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/ScrScreenPanelCreateModel.java
new file mode 100644
index 0000000..1937279
--- /dev/null
+++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/ScrScreenPanelCreateModel.java
@@ -0,0 +1,26 @@
+package cn.estsh.i3plus.pojo.screen.model;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @author Wynne.Lu
+ * @date 2021/3/28 上午12:42
+ * @desc
+ */
+@Data
+public class ScrScreenPanelCreateModel implements Serializable {
+    private static final long serialVersionUID = -5832175256726333348L;
+
+    private String screenCode;
+
+    private String layoutCode;
+
+    private String rowCode;
+
+    private String columnCode;
+
+    private String panelCode;
+
+}
diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/component/AbstractComponent.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/component/AbstractComponent.java
deleted file mode 100644
index 45ea88f..0000000
--- a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/component/AbstractComponent.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package cn.estsh.i3plus.pojo.screen.model.component;
-
-import cn.estsh.i3plus.pojo.screen.bean.ScrEventAction;
-import lombok.Data;
-
-import java.util.List;
-
-/**
- * @author Wynne.Lu
- * @date 2021/3/11 下午12:32
- * @desc
- */
-@Data
-public abstract class AbstractComponent extends AbstractContainer {
-
-    private static final long serialVersionUID = 6768391193506016205L;
-    private String cssStyle;
-
-    private String name;
-
-    private Integer tabIndex;
-
-    private List<ScrEventAction> eventAction;
-
-
-}
diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/component/AbstractContainer.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/component/AbstractContainer.java
deleted file mode 100644
index 7ad09b1..0000000
--- a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/component/AbstractContainer.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package cn.estsh.i3plus.pojo.screen.model.component;
-
-import cn.estsh.i3plus.pojo.base.bean.BaseBean;
-import cn.estsh.i3plus.pojo.screen.bean.ScrEventAction;
-import lombok.Data;
-
-import java.util.List;
-
-/**
- * @author Wynne.Lu
- * @date 2021/3/11 下午12:27
- * @desc
- */
-@Data
-public abstract class AbstractContainer extends BaseBean {
-    private static final long serialVersionUID = 7696523743371800661L;
-
-    private String background;
-
-    private String cssStyle;
-
-    private List<ScrEventAction> eventAction;
-
-}
diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/component/AbstractView.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/component/AbstractView.java
deleted file mode 100644
index f0cc014..0000000
--- a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/component/AbstractView.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package cn.estsh.i3plus.pojo.screen.model.component;
-
-import lombok.Data;
-
-import java.util.Map;
-
-/**
- * @author Wynne.Lu
- * @date 2021/3/11 下午12:30
- * @desc
- */
-@Data
-public abstract class AbstractView extends AbstractComponent {
-
-    private String jsEnhance;
-
-    private Map<String, String> viewTemplateMap;
-}
diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/component/AbstractWidget.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/component/AbstractWidget.java
deleted file mode 100644
index bf21cc4..0000000
--- a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/component/AbstractWidget.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package cn.estsh.i3plus.pojo.screen.model.component;
-
-import lombok.Data;
-
-/**
- * @author Wynne.Lu
- * @date 2021/3/11 下午12:30
- * @desc
- */
-@Data
-public abstract class AbstractWidget extends AbstractComponent {
-
-    private String labelText;
-
-}
diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/component/BarChart.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/component/BarChart.java
deleted file mode 100644
index 0af2b92..0000000
--- a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/component/BarChart.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package cn.estsh.i3plus.pojo.screen.model.component;
-
-import lombok.Data;
-
-import java.util.List;
-
-/**
- * @author Wynne.Lu
- * @date 2021/3/11 下午12:31
- * @desc
- */
-@Data
-public class BarChart extends Chart {
-
-    private List<Object> xAxis;
-
-    private List<Object> yAxis;
-}
diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/component/Button.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/component/Button.java
deleted file mode 100644
index 1c504e8..0000000
--- a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/component/Button.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package cn.estsh.i3plus.pojo.screen.model.component;
-
-import lombok.Data;
-
-/**
- * @author Wynne.Lu
- * @date 2021/3/11 下午12:30
- * @desc
- */
-@Data
-public class Button extends AbstractWidget {
-
-    private String icon;
-
-    private String type;
-
-    private String size;
-
-    private String onClick;
-}
diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/component/Cascader.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/component/Cascader.java
deleted file mode 100644
index b2e36ab..0000000
--- a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/component/Cascader.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package cn.estsh.i3plus.pojo.screen.model.component;
-
-import lombok.Data;
-
-/**
- * @author Wynne.Lu
- * @date 2021/3/11 下午12:31
- * @desc
- */
-@Data
-public class Cascader extends AbstractWidget{
-}
diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/component/Chart.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/component/Chart.java
deleted file mode 100644
index e105736..0000000
--- a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/component/Chart.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package cn.estsh.i3plus.pojo.screen.model.component;
-
-import lombok.Data;
-
-/**
- * @author Wynne.Lu
- * @date 2021/3/11 下午12:31
- * @desc
- */
-@Data
-public class Chart extends AbstractWidget {
-    private Integer autoRefreshInterval;
-
-}
diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/component/Form.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/component/Form.java
deleted file mode 100644
index 461c670..0000000
--- a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/component/Form.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package cn.estsh.i3plus.pojo.screen.model.component;
-
-import lombok.Data;
-
-import java.util.Map;
-
-/**
- * @author Wynne.Lu
- * @date 2021/3/11 下午12:30
- * @desc
- */
-@Data
-public class Form extends AbstractView{
-
-    private Map<String,String> fields;
-}
diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/component/Label.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/component/Label.java
deleted file mode 100644
index a54c11f..0000000
--- a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/component/Label.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package cn.estsh.i3plus.pojo.screen.model.component;
-
-import lombok.Data;
-
-/**
- * @author Wynne.Lu
- * @date 2021/3/11 下午12:31
- * @desc
- */
-@Data
-public class Label extends AbstractWidget {
-
-    private String text;
-}
diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/component/LineChart.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/component/LineChart.java
deleted file mode 100644
index 11f05c2..0000000
--- a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/component/LineChart.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package cn.estsh.i3plus.pojo.screen.model.component;
-
-import lombok.Data;
-
-import java.util.List;
-
-/**
- * @author Wynne.Lu
- * @date 2021/3/11 下午12:31
- * @desc
- */
-@Data
-public class LineChart extends Chart {
-
-    private List<Object> xAxis;
-
-    private List<Object> yAxis;
-}
diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/component/PieChart.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/component/PieChart.java
deleted file mode 100644
index 3d402f3..0000000
--- a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/component/PieChart.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package cn.estsh.i3plus.pojo.screen.model.component;
-
-import lombok.Data;
-
-import java.util.Map;
-
-/**
- * @author Wynne.Lu
- * @date 2021/3/11 下午12:31
- * @desc
- */
-
-@Data
-public class PieChart extends Chart {
-
-    private Map<String, Double> data;
-}
diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/component/Table.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/component/Table.java
deleted file mode 100644
index 8784d5f..0000000
--- a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/component/Table.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package cn.estsh.i3plus.pojo.screen.model.component;
-
-import cn.estsh.i3plus.pojo.screen.model.Pagination;
-import lombok.Data;
-
-/**
- * @author Wynne.Lu
- * @date 2021/3/11 下午12:29
- * @desc
- */
-@Data
-public class Table extends AbstractView {
-
-    private Integer autoRefreshInterval = 0;
-
-    private Boolean isShowChoice;
-
-    private Boolean isPagination;
-
-    private Pagination defaultPagination;
-
-}
diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/component/Tree.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/component/Tree.java
deleted file mode 100644
index 87f29f5..0000000
--- a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/component/Tree.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package cn.estsh.i3plus.pojo.screen.model.component;
-
-import lombok.Data;
-
-import java.util.List;
-
-/**
- * @author Wynne.Lu
- * @date 2021/3/11 下午12:30
- * @desc
- */
-@Data
-public class Tree extends AbstractView {
-
-    private String parentField;
-
-    private String showField;
-
-    private List<Object> data;
-}
diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/ScrActionRepository.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/ScrActionRepository.java
new file mode 100644
index 0000000..adeb27f
--- /dev/null
+++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/ScrActionRepository.java
@@ -0,0 +1,14 @@
+package cn.estsh.i3plus.pojo.screen.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.screen.bean.ScrAction;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : wei.peng
+ * @CreateDate : 20-5-28 下午3:39
+ * @Modify:
+ **/
+public interface ScrActionRepository extends BaseRepository<ScrAction, Long> {
+}
diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/ScrComponentRepository.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/ScrComponentRepository.java
new file mode 100644
index 0000000..cee476f
--- /dev/null
+++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/ScrComponentRepository.java
@@ -0,0 +1,15 @@
+package cn.estsh.i3plus.pojo.screen.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.screen.bean.ScrComponent;
+import cn.estsh.i3plus.pojo.screen.bean.rel.ScrPanelComponentRel;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : wei.peng
+ * @CreateDate : 20-5-28 下午3:39
+ * @Modify:
+ **/
+public interface ScrComponentRepository extends BaseRepository<ScrComponent, Long> {
+}
diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/ScrDataObjectPropertyRepository.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/ScrDataObjectPropertyRepository.java
new file mode 100644
index 0000000..d532b4c
--- /dev/null
+++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/ScrDataObjectPropertyRepository.java
@@ -0,0 +1,14 @@
+package cn.estsh.i3plus.pojo.screen.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.screen.bean.ScrDataObjectProperty;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : wei.peng
+ * @CreateDate : 20-5-28 下午3:39
+ * @Modify:
+ **/
+public interface ScrDataObjectPropertyRepository extends BaseRepository<ScrDataObjectProperty, Long> {
+}
diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/ScrDataObjectRepository.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/ScrDataObjectRepository.java
new file mode 100644
index 0000000..08bd787
--- /dev/null
+++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/ScrDataObjectRepository.java
@@ -0,0 +1,14 @@
+package cn.estsh.i3plus.pojo.screen.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.screen.bean.ScrDataObject;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : wei.peng
+ * @CreateDate : 20-5-28 下午3:39
+ * @Modify:
+ **/
+public interface ScrDataObjectRepository extends BaseRepository<ScrDataObject, Long> {
+}
diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/ScrDatasourceRepository.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/ScrDatasourceRepository.java
new file mode 100644
index 0000000..7786ddd
--- /dev/null
+++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/ScrDatasourceRepository.java
@@ -0,0 +1,14 @@
+package cn.estsh.i3plus.pojo.screen.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.screen.bean.ScrDatasource;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : wei.peng
+ * @CreateDate : 20-5-28 下午3:39
+ * @Modify:
+ **/
+public interface ScrDatasourceRepository extends BaseRepository<ScrDatasource, Long> {
+}
diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/ScrEventActionRepository.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/ScrEventActionRepository.java
new file mode 100644
index 0000000..88491b9
--- /dev/null
+++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/ScrEventActionRepository.java
@@ -0,0 +1,14 @@
+package cn.estsh.i3plus.pojo.screen.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.screen.bean.ScrEventAction;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : wei.peng
+ * @CreateDate : 20-5-28 下午3:39
+ * @Modify:
+ **/
+public interface ScrEventActionRepository extends BaseRepository<ScrEventAction, Long> {
+}
diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/ScrEventRepository.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/ScrEventRepository.java
new file mode 100644
index 0000000..b558c8c
--- /dev/null
+++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/ScrEventRepository.java
@@ -0,0 +1,14 @@
+package cn.estsh.i3plus.pojo.screen.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.screen.bean.ScrEvent;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : wei.peng
+ * @CreateDate : 20-5-28 下午3:39
+ * @Modify:
+ **/
+public interface ScrEventRepository extends BaseRepository<ScrEvent, Long> {
+}
diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/ScrFileRepository.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/ScrFileRepository.java
new file mode 100644
index 0000000..cfeba7e
--- /dev/null
+++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/ScrFileRepository.java
@@ -0,0 +1,14 @@
+package cn.estsh.i3plus.pojo.screen.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.screen.bean.ScrFile;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : wei.peng
+ * @CreateDate : 20-5-28 下午3:39
+ * @Modify:
+ **/
+public interface ScrFileRepository extends BaseRepository<ScrFile, Long> {
+}
diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/ScrLayoutColumnRepository.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/ScrLayoutColumnRepository.java
new file mode 100644
index 0000000..3255b32
--- /dev/null
+++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/ScrLayoutColumnRepository.java
@@ -0,0 +1,15 @@
+package cn.estsh.i3plus.pojo.screen.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.screen.bean.ScrLayout;
+import cn.estsh.i3plus.pojo.screen.bean.ScrLayoutColumn;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : wei.peng
+ * @CreateDate : 20-5-28 下午3:39
+ * @Modify:
+ **/
+public interface ScrLayoutColumnRepository extends BaseRepository<ScrLayoutColumn, Long> {
+}
diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/ScrLayoutRepository.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/ScrLayoutRepository.java
new file mode 100644
index 0000000..78a4c00
--- /dev/null
+++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/ScrLayoutRepository.java
@@ -0,0 +1,14 @@
+package cn.estsh.i3plus.pojo.screen.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.screen.bean.ScrLayout;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : wei.peng
+ * @CreateDate : 20-5-28 下午3:39
+ * @Modify:
+ **/
+public interface ScrLayoutRepository extends BaseRepository<ScrLayout, Long> {
+}
diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/ScrLayoutRowRepository.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/ScrLayoutRowRepository.java
new file mode 100644
index 0000000..32a5636
--- /dev/null
+++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/ScrLayoutRowRepository.java
@@ -0,0 +1,15 @@
+package cn.estsh.i3plus.pojo.screen.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.screen.bean.ScrLayout;
+import cn.estsh.i3plus.pojo.screen.bean.ScrLayoutRow;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : wei.peng
+ * @CreateDate : 20-5-28 下午3:39
+ * @Modify:
+ **/
+public interface ScrLayoutRowRepository extends BaseRepository<ScrLayoutRow, Long> {
+}
diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/ScrModelFieldConstraintRepository.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/ScrModelFieldConstraintRepository.java
new file mode 100644
index 0000000..9da83bc
--- /dev/null
+++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/ScrModelFieldConstraintRepository.java
@@ -0,0 +1,14 @@
+package cn.estsh.i3plus.pojo.screen.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.screen.bean.ScrModelFieldConstraint;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : wei.peng
+ * @CreateDate : 20-5-28 下午3:39
+ * @Modify:
+ **/
+public interface ScrModelFieldConstraintRepository extends BaseRepository<ScrModelFieldConstraint, Long> {
+}
diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/ScrModelFieldRepository.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/ScrModelFieldRepository.java
new file mode 100644
index 0000000..6effc84
--- /dev/null
+++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/ScrModelFieldRepository.java
@@ -0,0 +1,15 @@
+package cn.estsh.i3plus.pojo.screen.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.screen.bean.ScrLayoutRow;
+import cn.estsh.i3plus.pojo.screen.bean.ScrModelField;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : wei.peng
+ * @CreateDate : 20-5-28 下午3:39
+ * @Modify:
+ **/
+public interface ScrModelFieldRepository extends BaseRepository<ScrModelField, Long> {
+}
diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/ScrModelFieldVirtualRepository.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/ScrModelFieldVirtualRepository.java
new file mode 100644
index 0000000..8837d83
--- /dev/null
+++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/ScrModelFieldVirtualRepository.java
@@ -0,0 +1,15 @@
+package cn.estsh.i3plus.pojo.screen.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.screen.bean.ScrModelFieldConstraint;
+import cn.estsh.i3plus.pojo.screen.bean.ScrModelFieldVirtual;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : wei.peng
+ * @CreateDate : 20-5-28 下午3:39
+ * @Modify:
+ **/
+public interface ScrModelFieldVirtualRepository extends BaseRepository<ScrModelFieldVirtual, Long> {
+}
diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/ScrModelRepository.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/ScrModelRepository.java
new file mode 100644
index 0000000..790db09
--- /dev/null
+++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/ScrModelRepository.java
@@ -0,0 +1,14 @@
+package cn.estsh.i3plus.pojo.screen.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.screen.bean.ScrModel;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : wei.peng
+ * @CreateDate : 20-5-28 下午3:39
+ * @Modify:
+ **/
+public interface ScrModelRepository extends BaseRepository<ScrModel, Long> {
+}
diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/ScrPanelRepository.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/ScrPanelRepository.java
new file mode 100644
index 0000000..0d4ee36
--- /dev/null
+++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/ScrPanelRepository.java
@@ -0,0 +1,15 @@
+package cn.estsh.i3plus.pojo.screen.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.screen.bean.ScrAction;
+import cn.estsh.i3plus.pojo.screen.bean.ScrPanel;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : wei.peng
+ * @CreateDate : 20-5-28 下午3:39
+ * @Modify:
+ **/
+public interface ScrPanelRepository extends BaseRepository<ScrPanel, Long> {
+}
diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/ScrScreenRepository.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/ScrScreenRepository.java
new file mode 100644
index 0000000..b1a72a7
--- /dev/null
+++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/ScrScreenRepository.java
@@ -0,0 +1,14 @@
+package cn.estsh.i3plus.pojo.screen.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.screen.bean.ScrScreen;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : wei.peng
+ * @CreateDate : 20-5-28 下午3:39
+ * @Modify:
+ **/
+public interface ScrScreenRepository extends BaseRepository<ScrScreen, Long> {
+}
diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/rel/ScrComponentEventActionRelRepository.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/rel/ScrComponentEventActionRelRepository.java
new file mode 100644
index 0000000..2191440
--- /dev/null
+++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/rel/ScrComponentEventActionRelRepository.java
@@ -0,0 +1,14 @@
+package cn.estsh.i3plus.pojo.screen.repository.rel;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.screen.bean.rel.ScrComponentEventActionRel;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : wei.peng
+ * @CreateDate : 20-5-28 下午3:39
+ * @Modify:
+ **/
+public interface ScrComponentEventActionRelRepository extends BaseRepository<ScrComponentEventActionRel, Long> {
+}
diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/rel/ScrComponentModelFieldRelRepository.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/rel/ScrComponentModelFieldRelRepository.java
new file mode 100644
index 0000000..0e2dd3f
--- /dev/null
+++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/rel/ScrComponentModelFieldRelRepository.java
@@ -0,0 +1,14 @@
+package cn.estsh.i3plus.pojo.screen.repository.rel;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.screen.bean.rel.ScrComponentModelFieldRel;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : wei.peng
+ * @CreateDate : 20-5-28 下午3:39
+ * @Modify:
+ **/
+public interface ScrComponentModelFieldRelRepository extends BaseRepository<ScrComponentModelFieldRel, Long> {
+}
diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/rel/ScrPanelComponentRelRepository.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/rel/ScrPanelComponentRelRepository.java
new file mode 100644
index 0000000..0262987
--- /dev/null
+++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/rel/ScrPanelComponentRelRepository.java
@@ -0,0 +1,15 @@
+package cn.estsh.i3plus.pojo.screen.repository.rel;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.screen.bean.ScrPanel;
+import cn.estsh.i3plus.pojo.screen.bean.rel.ScrPanelComponentRel;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : wei.peng
+ * @CreateDate : 20-5-28 下午3:39
+ * @Modify:
+ **/
+public interface ScrPanelComponentRelRepository extends BaseRepository<ScrPanelComponentRel, Long> {
+}
diff --git a/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/rel/ScrScreenPanelRelRepository.java b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/rel/ScrScreenPanelRelRepository.java
new file mode 100644
index 0000000..610c14f
--- /dev/null
+++ b/modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/rel/ScrScreenPanelRelRepository.java
@@ -0,0 +1,14 @@
+package cn.estsh.i3plus.pojo.screen.repository.rel;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.screen.bean.rel.ScrScreenPanelRel;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : wei.peng
+ * @CreateDate : 20-5-28 下午3:39
+ * @Modify:
+ **/
+public interface ScrScreenPanelRelRepository extends BaseRepository<ScrScreenPanelRel, Long> {
+}