diff --git a/core/backend/src/main/java/io/dataease/auth/aop/DeCleanerAnnotationHandler.java b/core/backend/src/main/java/io/dataease/auth/aop/DeCleanerAnnotationHandler.java
index 0132c5559e..158f76004b 100644
--- a/core/backend/src/main/java/io/dataease/auth/aop/DeCleanerAnnotationHandler.java
+++ b/core/backend/src/main/java/io/dataease/auth/aop/DeCleanerAnnotationHandler.java
@@ -37,6 +37,9 @@ public class DeCleanerAnnotationHandler {
 
 
             switch (type.name()) {
+                case "DATA_FILL":
+                    catchProcess().cleanDataFiling(paramValue);
+                    break;
                 case "DATASOURCE":
                     catchProcess().cleanDataSource(paramValue);
                     break;
diff --git a/core/backend/src/main/java/io/dataease/auth/filter/JWTFilter.java b/core/backend/src/main/java/io/dataease/auth/filter/JWTFilter.java
index 6729d39558..be6ea53f64 100644
--- a/core/backend/src/main/java/io/dataease/auth/filter/JWTFilter.java
+++ b/core/backend/src/main/java/io/dataease/auth/filter/JWTFilter.java
@@ -92,8 +92,7 @@ public class JWTFilter extends BasicHttpAuthenticationFilter {
 
         if (isLoginAttempt(request, response) || ApiKeyHandler.isApiKeyCall(hRequest)) {
             try {
-                boolean loginSuccess = executeLogin(request, response);
-                return loginSuccess;
+                return executeLogin(request, response);
             } catch (Exception e) {
                 LogUtil.error(e);
                 if (e instanceof AuthenticationException && StringUtils.equals(e.getMessage(), expireMessage)) {
diff --git a/core/backend/src/main/java/io/dataease/auth/server/AuthServer.java b/core/backend/src/main/java/io/dataease/auth/server/AuthServer.java
index 8ec0b31781..2f594c6039 100644
--- a/core/backend/src/main/java/io/dataease/auth/server/AuthServer.java
+++ b/core/backend/src/main/java/io/dataease/auth/server/AuthServer.java
@@ -26,7 +26,6 @@ import io.dataease.plugins.xpack.ldap.dto.response.ValidateResult;
 import io.dataease.plugins.xpack.ldap.service.LdapXpackService;
 import io.dataease.plugins.xpack.oidc.service.OidcXpackService;
 import io.dataease.service.sys.SysUserService;
-
 import io.dataease.service.system.SystemParameterService;
 import io.dataease.websocket.entity.WsMessage;
 import io.dataease.websocket.service.WsService;
@@ -38,15 +37,14 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpSession;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpSession;
-
 @RestController
 public class AuthServer implements AuthApi {
 
@@ -203,11 +201,12 @@ public class AuthServer implements AuthApi {
                 result.put("defaultPwd", DEFAULT_PWD);
             }
         }
-
+        Long expireTime = System.currentTimeMillis() + JWTUtils.getExpireTime();
         TokenInfo tokenInfo = TokenInfo.builder().userId(user.getUserId()).username(username).build();
         String token = JWTUtils.sign(tokenInfo, realPwd);
         // 记录token操作时间
         result.put("token", token);
+        result.put("expireTime", expireTime);
         ServletUtils.setToken(token);
         DeLogUtils.save(SysLogConstants.OPERATE_TYPE.LOGIN, SysLogConstants.SOURCE_TYPE.USER, user.getUserId(), null, null, null);
         authUserService.unlockAccount(username, ObjectUtils.isEmpty(loginType) ? 0 : loginType);
diff --git a/core/backend/src/main/java/io/dataease/auth/service/ExtAuthService.java b/core/backend/src/main/java/io/dataease/auth/service/ExtAuthService.java
index 10bdaeda3c..263e7189d1 100644
--- a/core/backend/src/main/java/io/dataease/auth/service/ExtAuthService.java
+++ b/core/backend/src/main/java/io/dataease/auth/service/ExtAuthService.java
@@ -15,19 +15,33 @@ public interface ExtAuthService {
     AuthURD resourceTarget(String resourceId);
 
     List<AuthItem> dataSourceIdByUser(Long userId);
+
     List<AuthItem> dataSetIdByUser(Long userId);
+
     List<AuthItem> panelIdByUser(Long userId);
 
+    List<AuthItem> dataFillingIdByUser(Long userId);
+
     List<AuthItem> dataSourceIdByRole(Long roleId);
+
     List<AuthItem> dataSetIdByRole(Long roleId);
+
     List<AuthItem> panelIdByRole(Long roleId);
 
+    List<AuthItem> dataFillingIdByRole(Long roleId);
+
     List<AuthItem> dataSourceIdByDept(Long deptId);
+
     List<AuthItem> dataSetIdByDept(Long deptId);
+
     List<AuthItem> panelIdByDept(Long deptId);
 
+    List<AuthItem> dataFillingIdByDept(Long deptId);
+
     void clearUserResource(Long userId);
+
     void clearDeptResource(Long deptId);
+
     void clearRoleResource(Long roleId);
 
     List<String> parentResource(String resourceId, String type);
diff --git a/core/backend/src/main/java/io/dataease/auth/service/impl/DynamicMenuServiceImpl.java b/core/backend/src/main/java/io/dataease/auth/service/impl/DynamicMenuServiceImpl.java
index dc8b5e8954..5b3e3b6c81 100644
--- a/core/backend/src/main/java/io/dataease/auth/service/impl/DynamicMenuServiceImpl.java
+++ b/core/backend/src/main/java/io/dataease/auth/service/impl/DynamicMenuServiceImpl.java
@@ -90,7 +90,7 @@ public class DynamicMenuServiceImpl implements DynamicMenuService {
         dynamicMenuDto.setPermission(sysMenu.getPermission());
         dynamicMenuDto.setMenuSort(sysMenu.getMenuSort());
         dynamicMenuDto.setHidden(sysMenu.getHidden());
-        dynamicMenuDto.setIsPlugin(true);
+        dynamicMenuDto.setIsPlugin(!sysMenu.isUseBasicResource());
         dynamicMenuDto.setNoLayout(!!sysMenu.isNoLayout());
         return dynamicMenuDto;
     }
diff --git a/core/backend/src/main/java/io/dataease/auth/service/impl/ExtAuthServiceImpl.java b/core/backend/src/main/java/io/dataease/auth/service/impl/ExtAuthServiceImpl.java
index 1926f6e513..02e813c4ca 100644
--- a/core/backend/src/main/java/io/dataease/auth/service/impl/ExtAuthServiceImpl.java
+++ b/core/backend/src/main/java/io/dataease/auth/service/impl/ExtAuthServiceImpl.java
@@ -2,12 +2,12 @@ package io.dataease.auth.service.impl;
 
 import io.dataease.auth.entity.AuthItem;
 import io.dataease.auth.service.ExtAuthService;
-import io.dataease.commons.constants.SysAuthConstants;
-import io.dataease.plugins.common.base.domain.SysAuth;
-import io.dataease.ext.ExtAuthMapper;
 import io.dataease.commons.constants.AuthConstants;
+import io.dataease.commons.constants.SysAuthConstants;
 import io.dataease.commons.model.AuthURD;
 import io.dataease.commons.utils.LogUtil;
+import io.dataease.ext.ExtAuthMapper;
+import io.dataease.plugins.common.base.domain.SysAuth;
 import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.cache.annotation.CacheEvict;
@@ -109,6 +109,16 @@ public class ExtAuthServiceImpl implements ExtAuthService {
         );
     }
 
+    @Cacheable(value = AuthConstants.USER_DATA_FILL_NAME, key = "'user' + #userId")
+    @Override
+    public List<AuthItem> dataFillingIdByUser(Long userId) {
+        return extAuthMapper.queryAuthItems(
+                SysAuthConstants.AUTH_TARGET_TYPE_USER,
+                userId.toString(),
+                SysAuthConstants.AUTH_SOURCE_TYPE_DATA_FILLING
+        );
+    }
+
 
     @Cacheable(value = AuthConstants.ROLE_LINK_NAME, key = "'role' + #roleId")
     @Override
@@ -140,6 +150,16 @@ public class ExtAuthServiceImpl implements ExtAuthService {
         );
     }
 
+    @Cacheable(value = AuthConstants.ROLE_DATA_FILL_NAME, key = "'role' + #roleId")
+    @Override
+    public List<AuthItem> dataFillingIdByRole(Long roleId) {
+        return extAuthMapper.queryAuthItems(
+                SysAuthConstants.AUTH_TARGET_TYPE_ROLE,
+                roleId.toString(),
+                SysAuthConstants.AUTH_SOURCE_TYPE_DATA_FILLING
+        );
+    }
+
     @Cacheable(value = AuthConstants.DEPT_LINK_NAME, key = "'dept' + #deptId")
     @Override
     public List<AuthItem> dataSourceIdByDept(Long deptId) {
@@ -173,10 +193,22 @@ public class ExtAuthServiceImpl implements ExtAuthService {
         );
     }
 
+    @Cacheable(value = AuthConstants.DEPT_DATA_FILL_NAME, key = "'dept' + #deptId")
+    @Override
+    public List<AuthItem> dataFillingIdByDept(Long deptId) {
+        if (ObjectUtils.isEmpty(deptId)) return emptyResult;
+        return extAuthMapper.queryAuthItems(
+                SysAuthConstants.AUTH_TARGET_TYPE_DEPT,
+                deptId.toString(),
+                SysAuthConstants.AUTH_SOURCE_TYPE_DATA_FILLING
+        );
+    }
+
     @Caching(evict = {
             @CacheEvict(value = AuthConstants.USER_LINK_NAME, key = "'user' + #userId"),
             @CacheEvict(value = AuthConstants.USER_DATASET_NAME, key = "'user' + #userId"),
-            @CacheEvict(value = AuthConstants.USER_PANEL_NAME, key = "'user' + #userId")
+            @CacheEvict(value = AuthConstants.USER_PANEL_NAME, key = "'user' + #userId"),
+            @CacheEvict(value = AuthConstants.USER_DATA_FILL_NAME, key = "'user' + #userId")
     })
     public void clearUserResource(Long userId) {
         LogUtil.info("all permission resource of user {} is cleaning...", userId);
@@ -185,7 +217,8 @@ public class ExtAuthServiceImpl implements ExtAuthService {
     @Caching(evict = {
             @CacheEvict(value = AuthConstants.DEPT_LINK_NAME, key = "'dept' + #deptId"),
             @CacheEvict(value = AuthConstants.DEPT_DATASET_NAME, key = "'dept' + #deptId"),
-            @CacheEvict(value = AuthConstants.DEPT_PANEL_NAME, key = "'dept' + #deptId")
+            @CacheEvict(value = AuthConstants.DEPT_PANEL_NAME, key = "'dept' + #deptId"),
+            @CacheEvict(value = AuthConstants.DEPT_DATA_FILL_NAME, key = "'dept' + #deptId")
     })
     public void clearDeptResource(Long deptId) {
         LogUtil.info("all permission resource of dept {} is cleaning...", deptId);
@@ -194,7 +227,8 @@ public class ExtAuthServiceImpl implements ExtAuthService {
     @Caching(evict = {
             @CacheEvict(value = AuthConstants.ROLE_LINK_NAME, key = "'role' + #roleId"),
             @CacheEvict(value = AuthConstants.ROLE_DATASET_NAME, key = "'role' + #roleId"),
-            @CacheEvict(value = AuthConstants.ROLE_PANEL_NAME, key = "'role' + #roleId")
+            @CacheEvict(value = AuthConstants.ROLE_PANEL_NAME, key = "'role' + #roleId"),
+            @CacheEvict(value = AuthConstants.ROLE_DATA_FILL_NAME, key = "'role' + #roleId")
     })
     public void clearRoleResource(Long roleId) {
         LogUtil.info("all permission resource of role {} is cleaning...", roleId);
diff --git a/core/backend/src/main/java/io/dataease/auth/util/JWTUtils.java b/core/backend/src/main/java/io/dataease/auth/util/JWTUtils.java
index 38d4779b12..9817264a00 100644
--- a/core/backend/src/main/java/io/dataease/auth/util/JWTUtils.java
+++ b/core/backend/src/main/java/io/dataease/auth/util/JWTUtils.java
@@ -1,8 +1,8 @@
 package io.dataease.auth.util;
 
 import com.auth0.jwt.JWT;
-import com.auth0.jwt.JWTVerifier;
 import com.auth0.jwt.JWTCreator.Builder;
+import com.auth0.jwt.JWTVerifier;
 import com.auth0.jwt.algorithms.Algorithm;
 import com.auth0.jwt.interfaces.DecodedJWT;
 import com.auth0.jwt.interfaces.Verification;
@@ -10,7 +10,10 @@ import com.google.gson.Gson;
 import io.dataease.auth.entity.TokenInfo;
 import io.dataease.auth.entity.TokenInfo.TokenInfoBuilder;
 import io.dataease.commons.model.OnlineUserModel;
-import io.dataease.commons.utils.*;
+import io.dataease.commons.utils.CommonBeanFactory;
+import io.dataease.commons.utils.IPUtils;
+import io.dataease.commons.utils.ServletUtils;
+import io.dataease.commons.utils.TokenCacheUtils;
 import io.dataease.plugins.common.exception.DataEaseException;
 import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -77,6 +80,13 @@ public class JWTUtils {
         return sign(tokenInfo, secret, true);
     }
 
+    public static Long getExpireTime() {
+        if (ObjectUtils.isEmpty(expireTime)) {
+            expireTime = Objects.requireNonNull(CommonBeanFactory.getBean(Environment.class)).getProperty("dataease.login_timeout", Long.class, 480L);
+        }
+        return expireTime * 60000L;
+    }
+
     private static boolean tokenValid(OnlineUserModel model) {
         String token = model.getToken();
         // 如果已经加入黑名单 则直接返回无效
@@ -84,10 +94,7 @@ public class JWTUtils {
         if (invalid) return false;
 
         Long loginTime = model.getLoginTime();
-        if (ObjectUtils.isEmpty(expireTime)) {
-            expireTime = CommonBeanFactory.getBean(Environment.class).getProperty("dataease.login_timeout", Long.class, 480L);
-        }
-        long expireTimeMillis = expireTime * 60000L;
+        long expireTimeMillis = getExpireTime();
         // 如果当前时间减去登录时间小于超时时间则说明token未过期 返回有效状态
         return System.currentTimeMillis() - loginTime < expireTimeMillis;
 
@@ -133,10 +140,7 @@ public class JWTUtils {
                 DataEaseException.throwException("MultiLoginError1");
             }
         }
-        if (ObjectUtils.isEmpty(expireTime)) {
-            expireTime = CommonBeanFactory.getBean(Environment.class).getProperty("dataease.login_timeout", Long.class, 480L);
-        }
-        long expireTimeMillis = expireTime * 60000L;
+        long expireTimeMillis = getExpireTime();
         Date date = new Date(System.currentTimeMillis() + expireTimeMillis);
         Algorithm algorithm = Algorithm.HMAC256(secret);
         Builder builder = JWT.create()
diff --git a/core/backend/src/main/java/io/dataease/commons/constants/AuthConstants.java b/core/backend/src/main/java/io/dataease/commons/constants/AuthConstants.java
index 6bd0f2f3d6..2b273465aa 100644
--- a/core/backend/src/main/java/io/dataease/commons/constants/AuthConstants.java
+++ b/core/backend/src/main/java/io/dataease/commons/constants/AuthConstants.java
@@ -12,14 +12,17 @@ public class AuthConstants {
     public final static String USER_LINK_NAME = "user_link";
     public final static String USER_DATASET_NAME = "user_dataset";
     public final static String USER_PANEL_NAME = "user_panel";
+    public final static String USER_DATA_FILL_NAME = "user_data_fill";
 
     public final static String ROLE_LINK_NAME = "role_link";
     public final static String ROLE_DATASET_NAME = "role_dataset";
     public final static String ROLE_PANEL_NAME = "role_panel";
+    public final static String ROLE_DATA_FILL_NAME = "role_data_fill";
 
     public final static String DEPT_LINK_NAME = "dept_link";
     public final static String DEPT_DATASET_NAME = "dept_dataset";
     public final static String DEPT_PANEL_NAME = "dept_panel";
+    public final static String DEPT_DATA_FILL_NAME = "dept_data_fill";
 
 
 
diff --git a/core/backend/src/main/java/io/dataease/commons/constants/DataFillConstants.java b/core/backend/src/main/java/io/dataease/commons/constants/DataFillConstants.java
new file mode 100644
index 0000000000..f4a13f6c93
--- /dev/null
+++ b/core/backend/src/main/java/io/dataease/commons/constants/DataFillConstants.java
@@ -0,0 +1,19 @@
+package io.dataease.commons.constants;
+
+
+public class DataFillConstants {
+
+
+    public final static String DATA_FILL_NODE_TYPE_FOlDER = "folder";
+
+    public final static String DATA_FILL_NODE_TYPE_DATA_FILL = "data_fill";
+
+    public final static String OPT_TYPE_INSERT = "insert";
+
+    public final static String OPT_TYPE_UPDATE = "update";
+
+
+    public final static String DATA_FILL_GATHER_DATA_FILL_LIST = "data_fill_list";
+
+
+}
diff --git a/core/backend/src/main/java/io/dataease/commons/constants/DePermissionType.java b/core/backend/src/main/java/io/dataease/commons/constants/DePermissionType.java
index dd2368d391..d8c4a9739d 100644
--- a/core/backend/src/main/java/io/dataease/commons/constants/DePermissionType.java
+++ b/core/backend/src/main/java/io/dataease/commons/constants/DePermissionType.java
@@ -1,5 +1,5 @@
 package io.dataease.commons.constants;
 
 public enum DePermissionType {
-    DATASOURCE, DATASET, PANEL
+    DATASOURCE, DATASET, PANEL, DATA_FILL
 }
diff --git a/core/backend/src/main/java/io/dataease/commons/constants/ResourceAuthLevel.java b/core/backend/src/main/java/io/dataease/commons/constants/ResourceAuthLevel.java
index 99a389f270..de3e85a1ae 100644
--- a/core/backend/src/main/java/io/dataease/commons/constants/ResourceAuthLevel.java
+++ b/core/backend/src/main/java/io/dataease/commons/constants/ResourceAuthLevel.java
@@ -19,7 +19,12 @@ public enum ResourceAuthLevel {
 
     DATASOURCE_LEVEL_USE(1),
     DATASOURCE_LEVEL_MANAGE(3),
-    DATASOURCE_LEVEL_GRANT(15);
+    DATASOURCE_LEVEL_GRANT(15),
+
+
+    DATA_FILLING_LEVEL_USE(1),
+    DATA_FILLING_LEVEL_MANAGE(3),
+    DATA_FILLING_LEVEL_GRANT(15);
 
     private Integer level;
 
diff --git a/core/backend/src/main/java/io/dataease/commons/constants/SysAuthConstants.java b/core/backend/src/main/java/io/dataease/commons/constants/SysAuthConstants.java
index 051f273df1..c5f5485d2c 100644
--- a/core/backend/src/main/java/io/dataease/commons/constants/SysAuthConstants.java
+++ b/core/backend/src/main/java/io/dataease/commons/constants/SysAuthConstants.java
@@ -19,4 +19,6 @@ public class SysAuthConstants {
 
     public final static String AUTH_SOURCE_TYPE_DATASOURCE = "link";
 
+    public final static String AUTH_SOURCE_TYPE_DATA_FILLING = "data_fill";
+
 }
diff --git a/core/backend/src/main/java/io/dataease/commons/constants/SysLogConstants.java b/core/backend/src/main/java/io/dataease/commons/constants/SysLogConstants.java
index 6a4c0583c8..f0ed71f569 100644
--- a/core/backend/src/main/java/io/dataease/commons/constants/SysLogConstants.java
+++ b/core/backend/src/main/java/io/dataease/commons/constants/SysLogConstants.java
@@ -70,7 +70,10 @@ public class SysLogConstants {
         DRIVER(9, "SOURCE_TYPE_DRIVER"),
         DRIVER_FILE(10, "SOURCE_TYPE_DRIVER_FILE"),
         MENU(11, "SOURCE_TYPE_MENU"),
-        APIKEY(12, "SOURCE_TYPE_APIKEY");
+        APIKEY(12, "SOURCE_TYPE_APIKEY"),
+        DATA_FILL_FORM(13,"SOURCE_TYPE_DATA_FILL_FORM"),
+        DATA_FILL_DATA(14,"SOURCE_TYPE_DATA_FILL_DATA");
+
         private Integer value;
         private String name;
 
diff --git a/core/backend/src/main/java/io/dataease/commons/utils/AuthUtils.java b/core/backend/src/main/java/io/dataease/commons/utils/AuthUtils.java
index b151519d8c..2360c19fa6 100644
--- a/core/backend/src/main/java/io/dataease/commons/utils/AuthUtils.java
+++ b/core/backend/src/main/java/io/dataease/commons/utils/AuthUtils.java
@@ -29,6 +29,7 @@ public class AuthUtils {
     private static final String[] defaultPanelPermissions = { "panel_list" };
     private static final String[] defaultDataSetPermissions = { "0" };
     private static final String[] defaultLinkPermissions = { "0" };
+    private static final String[] defaultDataFillingPermissions = { "0" };
 
     private static final ThreadLocal<CurrentUserDto> USER_INFO = new ThreadLocal<CurrentUserDto>();
 
@@ -138,6 +139,18 @@ public class AuthUtils {
                 result.add(new AuthItem(item, ResourceAuthLevel.PANEL_LEVEL_MANAGE.getLevel()));
             });
             return result;
+        } else if (StringUtils.equals(DePermissionType.DATA_FILL.name().toLowerCase(), type)) {
+            Set<AuthItem> userSet = extAuthService.dataFillingIdByUser(userId).stream().collect(Collectors.toSet());
+            Set<AuthItem> roleSet = roles.stream().map(role -> extAuthService.dataFillingIdByRole(role.getId()))
+                    .flatMap(Collection::stream).collect(Collectors.toSet());
+            Set<AuthItem> deptSet = extAuthService.dataFillingIdByDept(deptId).stream().collect(Collectors.toSet());
+            result.addAll(userSet);
+            result.addAll(roleSet);
+            result.addAll(deptSet);
+            Arrays.stream(defaultDataFillingPermissions).forEach(item -> {
+                result.add(new AuthItem(item, ResourceAuthLevel.DATA_FILLING_LEVEL_MANAGE.getLevel()));
+            });
+            return result;
         }
         return result;
 
diff --git a/core/backend/src/main/java/io/dataease/controller/IndexController.java b/core/backend/src/main/java/io/dataease/controller/IndexController.java
index 4eec795d31..98d16127a8 100644
--- a/core/backend/src/main/java/io/dataease/controller/IndexController.java
+++ b/core/backend/src/main/java/io/dataease/controller/IndexController.java
@@ -71,6 +71,10 @@ public class IndexController {
             if (StringUtils.isNotEmpty(fromLink)) {
                 url = url + "&fromLink=" + fromLink;
             }
+            String ticket = request.getParameter("ticket");
+            if (StringUtils.isNotEmpty(ticket)) {
+                url = url + "&ticket=" + ticket;
+            }
             response.sendRedirect(url);
         } catch (IOException e) {
             LogUtil.error(e.getMessage());
diff --git a/core/backend/src/main/java/io/dataease/controller/datafill/DataFillController.java b/core/backend/src/main/java/io/dataease/controller/datafill/DataFillController.java
new file mode 100644
index 0000000000..902775d84c
--- /dev/null
+++ b/core/backend/src/main/java/io/dataease/controller/datafill/DataFillController.java
@@ -0,0 +1,177 @@
+package io.dataease.controller.datafill;
+
+import com.github.pagehelper.Page;
+import com.github.pagehelper.PageHelper;
+import io.dataease.commons.utils.AuthUtils;
+import io.dataease.commons.utils.PageUtils;
+import io.dataease.commons.utils.Pager;
+import io.dataease.controller.ResultHolder;
+import io.dataease.controller.request.datafill.*;
+import io.dataease.controller.response.datafill.DataFillFormTableDataResponse;
+import io.dataease.dto.datafill.DataFillCommitLogDTO;
+import io.dataease.dto.datafill.DataFillFormDTO;
+import io.dataease.dto.datafill.DataFillTaskDTO;
+import io.dataease.dto.datafill.DataFillUserTaskDTO;
+import io.dataease.plugins.common.base.domain.DataFillFormWithBLOBs;
+import io.dataease.plugins.common.dto.datafill.ExtTableField;
+import io.dataease.service.datafill.DataFillDataService;
+import io.dataease.service.datafill.DataFillLogService;
+import io.dataease.service.datafill.DataFillService;
+import io.dataease.service.datafill.DataFillTaskService;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.*;
+import springfox.documentation.annotations.ApiIgnore;
+
+import javax.annotation.Resource;
+import java.util.List;
+import java.util.Map;
+
+@ApiIgnore
+@RequestMapping("dataFilling")
+@RestController
+public class DataFillController {
+
+    @Resource
+    private DataFillService dataFillService;
+    @Resource
+    private DataFillLogService dataFillLogService;
+    @Resource
+    private DataFillTaskService dataFillTaskService;
+    @Resource
+    private DataFillDataService dataFillDataService;
+
+
+    @ApiIgnore
+    @PostMapping("/form/save")
+    public ResultHolder saveForm(@RequestBody DataFillFormWithBLOBs dataFillForm) throws Exception {
+        return dataFillService.saveForm(dataFillForm);
+    }
+
+    @ApiIgnore
+    @PostMapping("/form/update")
+    public ResultHolder updateForm(@RequestBody DataFillFormWithBLOBs dataFillForm) throws Exception {
+        return dataFillService.updateForm(dataFillForm);
+    }
+
+    @PostMapping("/manage/form/{id}")
+    public DataFillFormDTO getWithPrivileges(@PathVariable String id) throws Exception {
+        return dataFillService.getWithPrivileges(id);
+    }
+
+    @PostMapping("/form/get/{id}")
+    public DataFillFormWithBLOBs get(@PathVariable String id) throws Exception {
+        return dataFillService.get(id);
+    }
+
+    @ApiIgnore
+    @PostMapping("/form/delete/{id}")
+    public void saveForm(@PathVariable String id) throws Exception {
+        dataFillService.deleteForm(id);
+    }
+
+    @ApiOperation("查询树")
+    @PostMapping("/form/tree")
+    public List<DataFillFormDTO> tree(@RequestBody DataFillFormRequest request) {
+        return dataFillService.tree(request);
+    }
+
+    @ApiIgnore
+    @PostMapping("/form/{id}/tableData")
+    public DataFillFormTableDataResponse tableData(@PathVariable String id, @RequestBody DataFillFormTableDataRequest request) throws Exception {
+        request.setId(id);
+        return dataFillDataService.listData(request);
+    }
+
+    @ApiIgnore
+    @PostMapping("/form/fields/{id}")
+    public List<ExtTableField> listFields(@PathVariable String id) throws Exception {
+        return dataFillService.listFields(id);
+    }
+
+    @ApiIgnore
+    @PostMapping("/form/{formId}/delete/{id}")
+    public void deleteRowData(@PathVariable String formId, @PathVariable String id) throws Exception {
+        dataFillDataService.deleteRowData(formId, id);
+    }
+
+    @ApiIgnore
+    @PostMapping("/form/{formId}/rowData/save")
+    public String newRowData(@PathVariable String formId, @RequestBody Map<String, Object> data) throws Exception {
+        return dataFillDataService.updateRowData(formId, null, data, true);
+    }
+
+    @ApiIgnore
+    @PostMapping("/form/{formId}/rowData/save/{id}")
+    public String updateRowData(@PathVariable String formId, @PathVariable String id, @RequestBody Map<String, Object> data) throws Exception {
+        return dataFillDataService.updateRowData(formId, id, data, false);
+    }
+
+
+    @ApiIgnore
+    @PostMapping("/form/{formId}/commitLog/{goPage}/{pageSize}")
+    public Pager<List<DataFillCommitLogDTO>> commitLogs(@PathVariable String formId, @PathVariable int goPage, @PathVariable int pageSize, @RequestBody DataFillCommitLogSearchRequest request) {
+        Page<Object> page = PageHelper.startPage(goPage, pageSize, true);
+        List<DataFillCommitLogDTO> logs = dataFillLogService.commitLogs(formId, request);
+
+        return PageUtils.setPageInfo(page, logs);
+    }
+
+    @ApiIgnore
+    @PostMapping("/form/{formId}/task/{goPage}/{pageSize}")
+    public Pager<List<DataFillTaskDTO>> tasks(@PathVariable String formId, @PathVariable int goPage, @PathVariable int pageSize, @RequestBody DataFillTaskSearchRequest request) {
+        Page<Object> page = PageHelper.startPage(goPage, pageSize, true);
+        List<DataFillTaskDTO> tasks = dataFillTaskService.tasks(formId, request);
+
+        return PageUtils.setPageInfo(page, tasks);
+    }
+
+    @ApiIgnore
+    @PostMapping("/form/{formId}/task/save")
+    public void saveTask(@PathVariable String formId, @RequestBody DataFillTaskSearchRequest request) throws Exception {
+
+        dataFillTaskService.saveTask(formId, request);
+
+    }
+
+    @ApiIgnore
+    @PostMapping("/form/task/{taskId}/delete")
+    public void deleteTask(@PathVariable Long taskId) {
+
+        dataFillTaskService.deleteTask(taskId);
+
+    }
+
+    @ApiIgnore
+    @PostMapping("/form/task/{taskId}/enable")
+    public void enableTask(@PathVariable Long taskId) throws Exception {
+
+        dataFillTaskService.enableTask(taskId);
+
+    }
+
+    @ApiIgnore
+    @PostMapping("/form/task/{taskId}/disable")
+    public void disableTask(@PathVariable Long taskId) throws Exception {
+
+        dataFillTaskService.disableTask(taskId);
+
+    }
+
+    @ApiIgnore
+    @PostMapping("/myTask/{type}/{goPage}/{pageSize}")
+    public Pager<List<DataFillUserTaskDTO>> userTasks(@PathVariable String type, @PathVariable int goPage, @PathVariable int pageSize, @RequestBody DataFillUserTaskSearchRequest request) {
+        Long userId = AuthUtils.getUser().getUserId();
+        Page<Object> page = PageHelper.startPage(goPage, pageSize, true);
+        List<DataFillUserTaskDTO> tasks = dataFillTaskService.userTasks(userId, type, request);
+
+        return PageUtils.setPageInfo(page, tasks);
+    }
+
+
+    @ApiIgnore
+    @PostMapping("/myTask/fill/{taskId}")
+    public void userFillData(@PathVariable String taskId, @RequestBody Map<String, Object> data) throws Exception {
+        dataFillService.fillFormData(taskId, data);
+    }
+
+}
diff --git a/core/backend/src/main/java/io/dataease/controller/handler/GlobalExceptionHandler.java b/core/backend/src/main/java/io/dataease/controller/handler/GlobalExceptionHandler.java
index fcf37956f9..7a6839c874 100644
--- a/core/backend/src/main/java/io/dataease/controller/handler/GlobalExceptionHandler.java
+++ b/core/backend/src/main/java/io/dataease/controller/handler/GlobalExceptionHandler.java
@@ -2,7 +2,9 @@ package io.dataease.controller.handler;
 
 import io.dataease.controller.ResultHolder;
 import io.dataease.i18n.Translator;
+import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
+import org.apache.shiro.authc.AuthenticationException;
 import org.slf4j.LoggerFactory;
 import org.springframework.boot.web.servlet.error.ErrorAttributes;
 import org.springframework.boot.web.servlet.error.ErrorController;
@@ -49,7 +51,7 @@ public class GlobalExceptionHandler implements ErrorController {
         response.setStatus(code);
         String errorMessage = StringUtils.EMPTY;
         if (t != null) {
-            if (Logger.isDebugEnabled()) {
+            if (Logger.isDebugEnabled() && (ObjectUtils.isEmpty(t.getCause()) || !(t.getCause() instanceof AuthenticationException))) {
                 Logger.error("Fail to proceed " + errorAttributeMap.get("path"), t);
             }
             errorMessage = t.getMessage();
diff --git a/core/backend/src/main/java/io/dataease/controller/panel/api/LinkApi.java b/core/backend/src/main/java/io/dataease/controller/panel/api/LinkApi.java
index f6654d7d72..b43f21e5e6 100644
--- a/core/backend/src/main/java/io/dataease/controller/panel/api/LinkApi.java
+++ b/core/backend/src/main/java/io/dataease/controller/panel/api/LinkApi.java
@@ -84,4 +84,8 @@ public interface LinkApi {
     @ApiOperation("删除ticket")
     @PostMapping("/delTicket")
     void deleteTicket(@RequestBody TicketDelRequest request);
+
+    @ApiOperation("切换是否必填ticket")
+    @PostMapping("/enableTicket")
+    void switchRequire(@RequestBody TicketSwitchRequest request);
 }
diff --git a/core/backend/src/main/java/io/dataease/controller/panel/server/LinkServer.java b/core/backend/src/main/java/io/dataease/controller/panel/server/LinkServer.java
index a88e6e7a1f..86b7a59b99 100644
--- a/core/backend/src/main/java/io/dataease/controller/panel/server/LinkServer.java
+++ b/core/backend/src/main/java/io/dataease/controller/panel/server/LinkServer.java
@@ -9,9 +9,11 @@ import io.dataease.controller.panel.api.LinkApi;
 import io.dataease.controller.request.chart.ChartExtRequest;
 import io.dataease.controller.request.panel.link.*;
 import io.dataease.dto.panel.link.GenerateDto;
+import io.dataease.dto.panel.link.TicketDto;
 import io.dataease.dto.panel.link.ValidateDto;
 import io.dataease.plugins.common.base.domain.PanelGroupWithBLOBs;
 import io.dataease.plugins.common.base.domain.PanelLink;
+import io.dataease.plugins.common.base.domain.PanelLinkMapping;
 import io.dataease.plugins.common.base.domain.PanelLinkTicket;
 import io.dataease.service.chart.ChartViewService;
 import io.dataease.service.panel.PanelLinkService;
@@ -95,7 +97,8 @@ public class LinkServer implements LinkApi {
             dto.setValid(false);
             return dto;
         }
-        String mappingUuid = panelLinkService.getMappingUuid(one);
+        PanelLinkMapping mapping = panelLinkService.getMapping(one);
+        String mappingUuid = mapping.getUuid();
         if (!StringUtils.equals(uuid, mappingUuid)) {
             dto.setValid(false);
             return dto;
@@ -104,6 +107,10 @@ public class LinkServer implements LinkApi {
         dto.setEnablePwd(one.getEnablePwd());
         dto.setPassPwd(panelLinkService.validateHeads(one));
         dto.setExpire(panelLinkService.isExpire(one));
+
+        String ticketText = request.getTicket();
+        TicketDto ticketDto = panelLinkService.validateTicket(ticketText, mapping);
+        dto.setTicket(ticketDto);
         return dto;
     }
 
@@ -158,4 +165,9 @@ public class LinkServer implements LinkApi {
     public void deleteTicket(TicketDelRequest request) {
         panelLinkService.deleteTicket(request);
     }
+
+    @Override
+    public void switchRequire(TicketSwitchRequest request) {
+        panelLinkService.switchRequire(request);
+    }
 }
diff --git a/core/backend/src/main/java/io/dataease/controller/request/datafill/DataFillCommitLogSearchRequest.java b/core/backend/src/main/java/io/dataease/controller/request/datafill/DataFillCommitLogSearchRequest.java
new file mode 100644
index 0000000000..19f0a8d51e
--- /dev/null
+++ b/core/backend/src/main/java/io/dataease/controller/request/datafill/DataFillCommitLogSearchRequest.java
@@ -0,0 +1,18 @@
+package io.dataease.controller.request.datafill;
+
+import io.dataease.dto.datafill.DataFillCommitLogDTO;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import java.util.List;
+
+
+@Data
+@Accessors(chain = true)
+public class DataFillCommitLogSearchRequest extends DataFillCommitLogDTO {
+
+    private static final long serialVersionUID = -1067572649791328116L;
+
+    private List<String> formIds;
+
+}
diff --git a/core/backend/src/main/java/io/dataease/controller/request/datafill/DataFillFormRequest.java b/core/backend/src/main/java/io/dataease/controller/request/datafill/DataFillFormRequest.java
new file mode 100644
index 0000000000..3d922ee1ed
--- /dev/null
+++ b/core/backend/src/main/java/io/dataease/controller/request/datafill/DataFillFormRequest.java
@@ -0,0 +1,25 @@
+package io.dataease.controller.request.datafill;
+
+import io.dataease.plugins.common.base.domain.DataFillForm;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import java.util.Set;
+
+
+@Data
+@Accessors(chain=true)
+public class DataFillFormRequest extends DataFillForm {
+
+    private static final long serialVersionUID = -6752223673862214909L;
+
+    @ApiModelProperty("排序")
+    private String sort;
+    @ApiModelProperty("用户ID")
+    private String userId;
+    @ApiModelProperty("ID集合")
+    private Set<String> ids;
+    @ApiModelProperty("排除的ID")
+    private String excludedId;
+}
diff --git a/core/backend/src/main/java/io/dataease/controller/request/datafill/DataFillFormTableDataRequest.java b/core/backend/src/main/java/io/dataease/controller/request/datafill/DataFillFormTableDataRequest.java
new file mode 100644
index 0000000000..ac4cf2a85e
--- /dev/null
+++ b/core/backend/src/main/java/io/dataease/controller/request/datafill/DataFillFormTableDataRequest.java
@@ -0,0 +1,19 @@
+package io.dataease.controller.request.datafill;
+
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+
+@Data
+@Accessors(chain=true)
+public class DataFillFormTableDataRequest extends DataFillFormRequest {
+
+    private static final long serialVersionUID = -314618516232771747L;
+
+    private long currentPage;
+
+    private long pageSize;
+
+    private String primaryKeyValue;
+
+}
diff --git a/core/backend/src/main/java/io/dataease/controller/request/datafill/DataFillTaskSearchRequest.java b/core/backend/src/main/java/io/dataease/controller/request/datafill/DataFillTaskSearchRequest.java
new file mode 100644
index 0000000000..0b5e4871ed
--- /dev/null
+++ b/core/backend/src/main/java/io/dataease/controller/request/datafill/DataFillTaskSearchRequest.java
@@ -0,0 +1,14 @@
+package io.dataease.controller.request.datafill;
+
+import io.dataease.dto.datafill.DataFillTaskDTO;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+
+@Data
+@Accessors(chain = true)
+public class DataFillTaskSearchRequest extends DataFillTaskDTO {
+
+    private static final long serialVersionUID = 5881604308639714955L;
+
+}
diff --git a/core/backend/src/main/java/io/dataease/controller/request/datafill/DataFillUserTaskSearchRequest.java b/core/backend/src/main/java/io/dataease/controller/request/datafill/DataFillUserTaskSearchRequest.java
new file mode 100644
index 0000000000..7c170c46ad
--- /dev/null
+++ b/core/backend/src/main/java/io/dataease/controller/request/datafill/DataFillUserTaskSearchRequest.java
@@ -0,0 +1,14 @@
+package io.dataease.controller.request.datafill;
+
+import io.dataease.dto.datafill.DataFillUserTaskDTO;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+
+@Data
+@Accessors(chain = true)
+public class DataFillUserTaskSearchRequest extends DataFillUserTaskDTO {
+
+    private static final long serialVersionUID = 5881604308639714955L;
+
+}
diff --git a/core/backend/src/main/java/io/dataease/controller/request/panel/link/LinkValidateRequest.java b/core/backend/src/main/java/io/dataease/controller/request/panel/link/LinkValidateRequest.java
index 39ab661e36..f01f6091d9 100644
--- a/core/backend/src/main/java/io/dataease/controller/request/panel/link/LinkValidateRequest.java
+++ b/core/backend/src/main/java/io/dataease/controller/request/panel/link/LinkValidateRequest.java
@@ -9,4 +9,5 @@ public class LinkValidateRequest implements Serializable {
 
     private String link;
     private String user;
+    private String ticket;
 }
diff --git a/core/backend/src/main/java/io/dataease/controller/request/panel/link/TicketSwitchRequest.java b/core/backend/src/main/java/io/dataease/controller/request/panel/link/TicketSwitchRequest.java
new file mode 100644
index 0000000000..ff6727cbfc
--- /dev/null
+++ b/core/backend/src/main/java/io/dataease/controller/request/panel/link/TicketSwitchRequest.java
@@ -0,0 +1,13 @@
+package io.dataease.controller.request.panel.link;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+public class TicketSwitchRequest implements Serializable {
+
+    private String resourceId;
+
+    private Boolean require = false;
+}
diff --git a/core/backend/src/main/java/io/dataease/controller/response/datafill/DataFillFormTableDataResponse.java b/core/backend/src/main/java/io/dataease/controller/response/datafill/DataFillFormTableDataResponse.java
new file mode 100644
index 0000000000..0f0b755e6d
--- /dev/null
+++ b/core/backend/src/main/java/io/dataease/controller/response/datafill/DataFillFormTableDataResponse.java
@@ -0,0 +1,28 @@
+package io.dataease.controller.response.datafill;
+
+import io.dataease.plugins.common.dto.datafill.ExtTableField;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.util.List;
+
+@Data
+@Accessors(chain = true)
+public class DataFillFormTableDataResponse implements Serializable {
+
+    private static final long serialVersionUID = -6463885075511811532L;
+
+    private Object data;
+
+    private List<ExtTableField> fields;
+
+    private long total;
+
+    private long currentPage;
+
+    private long pageSize;
+
+    private String key;
+
+}
diff --git a/core/backend/src/main/java/io/dataease/dto/datafill/DataFillCommitLogDTO.java b/core/backend/src/main/java/io/dataease/dto/datafill/DataFillCommitLogDTO.java
new file mode 100644
index 0000000000..85fb8a6b1f
--- /dev/null
+++ b/core/backend/src/main/java/io/dataease/dto/datafill/DataFillCommitLogDTO.java
@@ -0,0 +1,18 @@
+package io.dataease.dto.datafill;
+
+import io.dataease.plugins.common.base.domain.DataFillCommitLog;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class DataFillCommitLogDTO extends DataFillCommitLog {
+
+    private static final long serialVersionUID = 5324275156717345584L;
+
+    private String commitByName;
+
+
+}
diff --git a/core/backend/src/main/java/io/dataease/dto/datafill/DataFillFormDTO.java b/core/backend/src/main/java/io/dataease/dto/datafill/DataFillFormDTO.java
new file mode 100644
index 0000000000..2bace84411
--- /dev/null
+++ b/core/backend/src/main/java/io/dataease/dto/datafill/DataFillFormDTO.java
@@ -0,0 +1,26 @@
+package io.dataease.dto.datafill;
+
+import io.dataease.plugins.common.base.domain.DataFillFormWithBLOBs;
+import io.dataease.plugins.common.model.ITreeBase;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class DataFillFormDTO extends DataFillFormWithBLOBs implements ITreeBase<DataFillFormDTO> {
+
+    private static final long serialVersionUID = 1428065978308162738L;
+
+    @ApiModelProperty("标签")
+    private String label;
+    @ApiModelProperty("子节点")
+    private List<DataFillFormDTO> children;
+    @ApiModelProperty("权限")
+    private String privileges;
+
+    private String creatorName;
+    private String datasourceName;
+
+
+}
diff --git a/core/backend/src/main/java/io/dataease/dto/datafill/DataFillTaskDTO.java b/core/backend/src/main/java/io/dataease/dto/datafill/DataFillTaskDTO.java
new file mode 100644
index 0000000000..17392bd4a3
--- /dev/null
+++ b/core/backend/src/main/java/io/dataease/dto/datafill/DataFillTaskDTO.java
@@ -0,0 +1,20 @@
+package io.dataease.dto.datafill;
+
+import io.dataease.plugins.common.base.domain.DataFillTaskWithBLOBs;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class DataFillTaskDTO extends DataFillTaskWithBLOBs {
+
+    private static final long serialVersionUID = 3610753131867651856L;
+
+    private String formName;
+
+    private String creatorName;
+
+
+}
diff --git a/core/backend/src/main/java/io/dataease/dto/datafill/DataFillUserTaskDTO.java b/core/backend/src/main/java/io/dataease/dto/datafill/DataFillUserTaskDTO.java
new file mode 100644
index 0000000000..8a1c1c96f4
--- /dev/null
+++ b/core/backend/src/main/java/io/dataease/dto/datafill/DataFillUserTaskDTO.java
@@ -0,0 +1,20 @@
+package io.dataease.dto.datafill;
+
+import io.dataease.plugins.common.base.domain.DataFillUserTask;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class DataFillUserTaskDTO extends DataFillUserTask {
+
+    private static final long serialVersionUID = 3610753131867651856L;
+
+    private String taskName;
+    private String formName;
+    private Long creator;
+    private String creatorName;
+
+}
diff --git a/core/backend/src/main/java/io/dataease/dto/panel/link/TicketDto.java b/core/backend/src/main/java/io/dataease/dto/panel/link/TicketDto.java
new file mode 100644
index 0000000000..e2deb6ee9b
--- /dev/null
+++ b/core/backend/src/main/java/io/dataease/dto/panel/link/TicketDto.java
@@ -0,0 +1,15 @@
+package io.dataease.dto.panel.link;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+public class TicketDto implements Serializable {
+
+    private boolean ticketValid;
+
+    private boolean ticketExp;
+
+    private String args;
+}
diff --git a/core/backend/src/main/java/io/dataease/dto/panel/link/ValidateDto.java b/core/backend/src/main/java/io/dataease/dto/panel/link/ValidateDto.java
index 827bb012cd..c6671175ce 100644
--- a/core/backend/src/main/java/io/dataease/dto/panel/link/ValidateDto.java
+++ b/core/backend/src/main/java/io/dataease/dto/panel/link/ValidateDto.java
@@ -19,4 +19,6 @@ public class ValidateDto {
     private String resourceId;
     @ApiModelProperty("用户ID")
     private String userId;
+
+    private TicketDto ticket;
 }
diff --git a/core/backend/src/main/java/io/dataease/ext/ExtDataFillFormMapper.java b/core/backend/src/main/java/io/dataease/ext/ExtDataFillFormMapper.java
new file mode 100644
index 0000000000..92595fc0e7
--- /dev/null
+++ b/core/backend/src/main/java/io/dataease/ext/ExtDataFillFormMapper.java
@@ -0,0 +1,30 @@
+package io.dataease.ext;
+
+import io.dataease.controller.request.datafill.DataFillFormRequest;
+import io.dataease.controller.request.datafill.DataFillTaskSearchRequest;
+import io.dataease.dto.datafill.DataFillCommitLogDTO;
+import io.dataease.dto.datafill.DataFillFormDTO;
+import io.dataease.dto.datafill.DataFillTaskDTO;
+import io.dataease.dto.datafill.DataFillUserTaskDTO;
+import io.dataease.plugins.common.base.domain.DataFillTask;
+
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+public interface ExtDataFillFormMapper {
+    List<DataFillFormDTO> search(DataFillFormRequest request);
+
+    Map<String, String> searchChildrenIds(String id, String type);
+
+    List<DataFillCommitLogDTO> selectLatestLogByFormDataIds(String formId, List<String> dataIds);
+
+    List<DataFillCommitLogDTO> selectDataFillLogs(String formId, String commitByName);
+
+    List<DataFillTaskDTO> selectDataFillTasks(DataFillTaskSearchRequest request);
+    List<DataFillTask> selectActiveDataFillTasks();
+
+    List<DataFillUserTaskDTO> listTodoUserTask(long userId, Date current, String taskName);
+    List<DataFillUserTaskDTO> listFinishedUserTask(long userId, String taskName);
+    List<DataFillUserTaskDTO> listExpiredUserTask(long userId, Date current, String taskName);
+}
diff --git a/core/backend/src/main/java/io/dataease/ext/ExtDataFillFormMapper.xml b/core/backend/src/main/java/io/dataease/ext/ExtDataFillFormMapper.xml
new file mode 100644
index 0000000000..a0ade02fbc
--- /dev/null
+++ b/core/backend/src/main/java/io/dataease/ext/ExtDataFillFormMapper.xml
@@ -0,0 +1,267 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="io.dataease.ext.ExtDataFillFormMapper">
+
+    <resultMap id="BaseResultMapDTO" type="io.dataease.dto.datafill.DataFillFormDTO"
+               extends="io.dataease.plugins.common.base.mapper.DataFillFormMapper.BaseResultMap">
+        <result column="label" property="label"/>
+        <result column="privileges" property="privileges"/>
+    </resultMap>
+
+
+    <select id="search" resultMap="BaseResultMapDTO">
+        select
+        id, `name`, ifnull(pid, 0) as pid, `level`, node_type, `table_name`, datasource, create_index, create_by,
+        create_time, update_by, update_time,
+        `name` as label,
+        authInfo.privileges as `privileges`
+        from (select GET_V_AUTH_MODEL_ID_P_USE (#{userId}, 'data_fill') cids) t, data_fill_form
+        left join (
+        SELECT
+        auth_source,
+        group_concat( DISTINCT sys_auth_detail.privilege_extend ) as `privileges`
+        FROM
+        (
+        `sys_auth`
+        LEFT JOIN `sys_auth_detail` ON ((
+        `sys_auth`.`id` = `sys_auth_detail`.`auth_id`
+        )))
+        WHERE
+        sys_auth_detail.privilege_value = 1
+        AND sys_auth.auth_source_type = 'data_fill'
+        AND (
+        (
+        sys_auth.auth_target_type = 'dept'
+        AND sys_auth.auth_target IN ( SELECT dept_id FROM sys_user WHERE user_id = #{userId} )
+        )
+        OR (
+        sys_auth.auth_target_type = 'user'
+        AND sys_auth.auth_target = #{userId}
+        )
+        OR (
+        sys_auth.auth_target_type = 'role'
+        AND sys_auth.auth_target IN ( SELECT role_id FROM sys_users_roles WHERE user_id = #{userId} )
+        )
+        )
+        GROUP BY
+        `sys_auth`.`auth_source`
+        ) authInfo
+        on data_fill_form.id = authInfo.auth_source
+        <where>
+            FIND_IN_SET(data_fill_form.id, cids)
+            <if test="id != null">
+                and data_fill_form.id = #{id,jdbcType=VARCHAR}
+            </if>
+            <if test="name != null and name != ''">
+                and data_fill_form.`name` like CONCAT('%', #{name},'%')
+            </if>
+            <if test="pid != null">
+                and data_fill_form.pid = #{pid,jdbcType=VARCHAR}
+            </if>
+            <if test="nodeType != null">
+                and data_fill_form.node_type = #{nodeType,jdbcType=VARCHAR}
+            </if>
+            <if test="level != null">
+                and data_fill_form.`level` = #{level,jdbcType=INTEGER}
+            </if>
+
+            <if test="createBy != null">
+                and data_fill_form.create_by = #{createBy,jdbcType=VARCHAR},
+            </if>
+            <if test="createTime != null">
+                and data_fill_form.create_time = #{createTime,jdbcType=TIMESTAMP},
+            </if>
+            <if test="updateBy != null">
+                and data_fill_form.update_by = #{updateBy,jdbcType=VARCHAR},
+            </if>
+            <if test="updateTime != null">
+                and data_fill_form.update_time = #{updateTime,jdbcType=TIMESTAMP},
+            </if>
+
+
+            <if test="excludedId != null">
+                and data_fill_form.id != #{excludedId,jdbcType=VARCHAR}
+            </if>
+
+            <if test="ids != null and ids.size() > 0">
+                and id in
+                <foreach collection="ids" item="item" separator="," open="(" close=")">
+                    #{item}
+                </foreach>
+            </if>
+        </where>
+        ORDER BY CONVERT(`name` using gbk)
+    </select>
+
+    <select id="searchChildrenIds" resultType="java.util.Map">
+        select GET_V_AUTH_MODEL_WITH_CHILDREN(#{id}, #{type}) ids
+    </select>
+
+
+    <resultMap id="BaseResultMapLogDTO" type="io.dataease.dto.datafill.DataFillCommitLogDTO"
+               extends="io.dataease.plugins.common.base.mapper.DataFillCommitLogMapper.BaseResultMap">
+        <result column="nick_name" property="commitByName"/>
+    </resultMap>
+
+    <select id="selectDataFillLogs" resultMap="BaseResultMapLogDTO">
+        SELECT t1.id,
+             t1.form_id,
+             t1.data_id,
+             t1.operate,
+             t1.commit_by,
+             t1.commit_time,
+             t2.nick_name
+        FROM (SELECT * FROM data_fill_commit_log
+            WHERE form_id = #{formId} ) t1
+        LEFT JOIN (SELECT username, nick_name FROM sys_user) t2 ON t1.commit_by = t2.username
+        <where>
+        <if test="commitByName != null" >
+           AND t2.nick_name LIKE CONCAT('%',#{commitByName},'%')
+        </if>
+        </where>
+        ORDER BY t1.commit_time DESC
+    </select>
+
+    <select id="selectLatestLogByFormDataIds" resultMap="BaseResultMapLogDTO">
+        SELECT t3.id,
+               t3.form_id,
+               t3.data_id,
+               t3.operate,
+               t3.commit_by,
+               t3.commit_time,
+               t4.nick_name
+        FROM (SELECT t1.id,
+                     t1.form_id,
+                     t1.data_id,
+                     t1.operate,
+                     t1.commit_by,
+                     t1.commit_time
+              FROM (SELECT * FROM data_fill_commit_log
+                    WHERE form_id = #{formId}
+                    <if test="dataIds != null and dataIds.size() > 0">
+                        AND data_id in
+                        <foreach collection="dataIds" item="item" separator="," open="(" close=")">
+                            #{item}
+                        </foreach>
+                    </if>
+                    ) t1
+                       INNER JOIN (SELECT MAX(commit_time) AS commit_time, form_id, data_id
+                                   FROM data_fill_commit_log
+                                   GROUP BY form_id, data_id) t2
+                                  ON t1.form_id = t2.form_id AND t1.commit_time = t2.commit_time AND t1.data_id = t2.data_id) t3
+                 LEFT JOIN (SELECT username, nick_name FROM sys_user) t4 ON t3.commit_by = t4.username
+    </select>
+
+    <resultMap id="BaseResultMapTaskDTO" type="io.dataease.dto.datafill.DataFillTaskDTO"
+               extends="io.dataease.plugins.common.base.mapper.DataFillTaskMapper.ResultMapWithBLOBs">
+        <result column="formName" property="formName"/>
+        <result column="nick_name" property="creatorName"/>
+    </resultMap>
+
+    <select id="selectDataFillTasks" resultMap="BaseResultMapTaskDTO">
+        SELECT t1.id, t1.`name`, t1.form_id, t1.start_time, t1.end_time, t1.rate_type, t1.rate_val, t1.publish_start_time,
+        t1.publish_end_time, t1.publish_range_time_type, t1.publish_range_time, t1.creator, t1.create_time,
+        t1.`status`,
+        t1.reci_users, t1.role_list, t1.org_list,
+        t2.nick_name, t3.`name` AS formName
+        FROM (SELECT * FROM data_fill_task
+        WHERE form_id = #{formId}
+        <if test="id != null">
+            and `id` = #{id,jdbcType=VARCHAR}
+        </if>
+        <if test="name != null" >
+            AND `name` LIKE CONCAT('%',#{name},'%')
+        </if>
+        ) t1
+        LEFT JOIN (SELECT user_id, nick_name FROM sys_user) t2 ON t1.creator = t2.user_id
+        LEFT JOIN (SELECT name, id FROM data_fill_form) t3 ON t1.form_id = t3.id
+        WHERE 1 = 1
+        ORDER BY t1.create_time DESC
+    </select>
+
+    <select id="selectActiveDataFillTasks" resultMap="io.dataease.plugins.common.base.mapper.DataFillTaskMapper.BaseResultMap">
+        SELECT
+            <include refid="io.dataease.plugins.common.base.mapper.DataFillTaskMapper.Base_Column_List" />
+        FROM data_fill_task
+        WHERE status = 1
+        AND ((rate_type = -1 AND publish_start_time &lt;= current_timestamp AND (publish_end_time is null OR
+        publish_end_time &gt;= current_timestamp))
+        OR
+        (rate_type != -1 AND start_time &lt;= current_timestamp AND (end_time is null OR end_time &gt;=
+        current_timestamp))
+        )
+    </select>
+
+    <resultMap id="BaseResultMapUserTaskDTO" type="io.dataease.dto.datafill.DataFillUserTaskDTO"
+               extends="io.dataease.plugins.common.base.mapper.DataFillUserTaskMapper.BaseResultMap">
+        <result column="taskName" property="taskName"/>
+        <result column="formName" property="formName"/>
+        <result column="creator" property="creator"/>
+        <result column="creatorName" property="creatorName"/>
+    </resultMap>
+
+    <select id="listTodoUserTask" resultMap="BaseResultMapUserTaskDTO">
+        SELECT
+        t1.id, t1.task_id, t1.form_id, t1.value_id, t1.`user`, t1.start_time, t1.end_time, t1.finish_time,
+        t2.`name` AS formName, t3.`name` AS taskName, t3.`creator`, t4.`nick_name` AS creatorName
+        FROM
+        (SELECT
+            <include refid="io.dataease.plugins.common.base.mapper.DataFillUserTaskMapper.Base_Column_List" />
+        FROM data_fill_user_task
+        WHERE user = #{userId}
+        AND finish_time IS NULL
+        AND start_time &lt;= #{current} AND (end_time IS NULL OR end_time &gt;= #{current})) t1
+        LEFT JOIN (SELECT id, `name` FROM data_fill_form) t2 ON t1.form_id = t2.id
+        LEFT JOIN (SELECT id, `name`, `creator` FROM data_fill_task) t3 ON t1.task_id = t3.id
+        LEFT JOIN (SELECT user_id, nick_name FROM sys_user) t4 ON t3.creator = t4.user_id
+        <where>
+            <if test="taskName != null" >
+                AND t3.`name` LIKE CONCAT('%',#{taskName},'%')
+            </if>
+        </where>
+        ORDER BY t1.end_time DESC, t1.start_time
+    </select>
+
+    <select id="listFinishedUserTask" resultMap="BaseResultMapUserTaskDTO">
+        SELECT
+        t1.id, t1.task_id, t1.form_id, t1.value_id, t1.`user`, t1.start_time, t1.end_time, t1.finish_time,
+        t2.`name` AS formName, t3.`name` AS taskName, t3.`creator`, t4.`nick_name` AS creatorName
+        FROM
+        (SELECT
+            <include refid="io.dataease.plugins.common.base.mapper.DataFillUserTaskMapper.Base_Column_List" />
+        FROM data_fill_user_task
+        WHERE user = #{userId}
+        AND finish_time IS NOT NULL) t1
+        LEFT JOIN (SELECT id, `name` FROM data_fill_form) t2 ON t1.form_id = t2.id
+        LEFT JOIN (SELECT id, `name`, `creator` FROM data_fill_task) t3 ON t1.task_id = t3.id
+        LEFT JOIN (SELECT user_id, nick_name FROM sys_user) t4 ON t3.creator = t4.user_id
+        <where>
+            <if test="taskName != null" >
+                AND t3.`name` LIKE CONCAT('%',#{taskName},'%')
+            </if>
+        </where>
+        ORDER BY t1.finish_time DESC, t1.end_time DESC, t1.start_time
+    </select>
+
+    <select id="listExpiredUserTask" resultMap="BaseResultMapUserTaskDTO">
+        SELECT
+        t1.id, t1.task_id, t1.form_id, t1.value_id, t1.`user`, t1.start_time, t1.end_time, t1.finish_time,
+        t2.`name` AS formName, t3.`name` AS taskName, t3.`creator`, t4.`nick_name` AS creatorName
+        FROM
+        (SELECT
+        <include refid="io.dataease.plugins.common.base.mapper.DataFillUserTaskMapper.Base_Column_List" />
+        FROM data_fill_user_task
+        WHERE user = #{userId}
+        AND end_time &lt;= #{current}) t1
+        LEFT JOIN (SELECT id, `name` FROM data_fill_form) t2 ON t1.form_id = t2.id
+        LEFT JOIN (SELECT id, `name`, `creator` FROM data_fill_task) t3 ON t1.task_id = t3.id
+        LEFT JOIN (SELECT user_id, nick_name FROM sys_user) t4 ON t3.creator = t4.user_id
+        <where>
+            <if test="taskName != null" >
+                AND t3.`name` LIKE CONCAT('%',#{taskName},'%')
+            </if>
+        </where>
+        ORDER BY t1.end_time DESC, t1.start_time
+    </select>
+
+</mapper>
diff --git a/core/backend/src/main/java/io/dataease/ext/ExtSysLogMapper.xml b/core/backend/src/main/java/io/dataease/ext/ExtSysLogMapper.xml
index 0a385b3cec..fbd52d7129 100644
--- a/core/backend/src/main/java/io/dataease/ext/ExtSysLogMapper.xml
+++ b/core/backend/src/main/java/io/dataease/ext/ExtSysLogMapper.xml
@@ -206,6 +206,21 @@
             </where>
         </if>
 
+        <if test="type == 13">
+            id, name
+            from data_fill_form
+            <where>
+                id in
+                <foreach collection="ids" item="id" index="index" open="(" separator="," close=")">
+                    #{id}
+                </foreach>
+                ORDER BY FIELD(id,
+                <foreach collection="ids" item="id" index="index" open="" separator="," close=")">
+                    #{id}
+                </foreach>
+            </where>
+        </if>
+
     </select>
 
 
diff --git a/core/backend/src/main/java/io/dataease/job/sechedule/strategy/TaskHandler.java b/core/backend/src/main/java/io/dataease/job/sechedule/strategy/TaskHandler.java
index fead202746..d79ac794ac 100644
--- a/core/backend/src/main/java/io/dataease/job/sechedule/strategy/TaskHandler.java
+++ b/core/backend/src/main/java/io/dataease/job/sechedule/strategy/TaskHandler.java
@@ -4,10 +4,11 @@ import io.dataease.commons.utils.CronUtils;
 import io.dataease.job.sechedule.ScheduleManager;
 import io.dataease.plugins.common.entity.GlobalTaskEntity;
 import org.apache.commons.lang3.ObjectUtils;
-import org.quartz.*;
+import org.quartz.JobDataMap;
+import org.quartz.JobKey;
+import org.quartz.TriggerKey;
 import org.springframework.beans.factory.InitializingBean;
 
-
 import java.util.Date;
 
 public abstract class TaskHandler implements InitializingBean {
diff --git a/core/backend/src/main/java/io/dataease/job/sechedule/strategy/impl/DataFillTaskHandler.java b/core/backend/src/main/java/io/dataease/job/sechedule/strategy/impl/DataFillTaskHandler.java
new file mode 100644
index 0000000000..a872339b23
--- /dev/null
+++ b/core/backend/src/main/java/io/dataease/job/sechedule/strategy/impl/DataFillTaskHandler.java
@@ -0,0 +1,184 @@
+package io.dataease.job.sechedule.strategy.impl;
+
+import io.dataease.auth.service.AuthUserService;
+import io.dataease.commons.utils.CommonBeanFactory;
+import io.dataease.commons.utils.CronUtils;
+import io.dataease.service.datafill.DataFillTaskService;
+import io.dataease.job.sechedule.ScheduleManager;
+import io.dataease.job.sechedule.strategy.TaskHandler;
+import io.dataease.plugins.common.base.domain.DataFillTaskWithBLOBs;
+import io.dataease.plugins.common.entity.GlobalTaskEntity;
+import io.dataease.plugins.common.util.SpringContextUtil;
+import org.apache.commons.lang3.ObjectUtils;
+import org.quartz.*;
+import org.springframework.stereotype.Service;
+
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Calendar;
+import java.util.Date;
+
+@Service("dataFillTaskHandler")
+public class DataFillTaskHandler extends TaskHandler implements Job {
+
+
+    @Override
+    protected JobDataMap jobDataMap(GlobalTaskEntity taskEntity) {
+        JobDataMap jobDataMap = new JobDataMap();
+        jobDataMap.put("taskEntity", taskEntity);
+
+        return jobDataMap;
+    }
+
+    @Override
+    public void resetRunningInstance(Long taskId) {
+
+    }
+
+    @Override
+    protected Boolean taskIsRunning(Long taskId) {
+        return null;
+    }
+
+    @Override
+    public void execute(JobExecutionContext context) throws JobExecutionException {
+        // 插件没有加载 空转
+        if (!CommonBeanFactory.getBean(AuthUserService.class).pluginLoaded())
+            return;
+
+        JobDataMap jobDataMap = context.getJobDetail().getJobDataMap();
+        GlobalTaskEntity taskEntity = (GlobalTaskEntity) jobDataMap.get("taskEntity");
+
+        ScheduleManager scheduleManager = SpringContextUtil.getBean(ScheduleManager.class);
+
+        DataFillTaskService dataFillTaskService = SpringContextUtil.getBean(DataFillTaskService.class);
+
+        DataFillTaskWithBLOBs task = dataFillTaskService.getTaskById(taskEntity.getTaskId());
+
+        try {
+            dataFillTaskService.createUserTasks(task, null);
+
+            if (task.getRateType() == -1) {
+                //一次性任务执行完之后需要修改为停止
+                dataFillTaskService.finishTask(task.getId());
+                removeTask(scheduleManager, taskEntity);
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+
+    }
+
+    @Override
+    public void addTask(ScheduleManager scheduleManager, GlobalTaskEntity taskEntity) throws Exception {
+
+        DataFillTaskService dataFillTaskService = SpringContextUtil.getBean(DataFillTaskService.class);
+        // 1。首先看看是否过期
+        Long endTime = taskEntity.getEndTime();
+        removeTask(scheduleManager, taskEntity);
+        if (CronUtils.taskExpire(endTime)) { // 过期了就删除任务
+            dataFillTaskService.finishTask(taskEntity.getTaskId()); //状态置为已停止
+            return;
+        }
+        if (!taskEntity.getStatus()) return;
+        JobKey jobKey = new JobKey("DATA_FILL_TASK_" + taskEntity.getTaskId().toString());
+        TriggerKey triggerKey = new TriggerKey("DATA_FILL_TASK_" + taskEntity.getTaskId());
+        Date start = new Date(taskEntity.getStartTime());
+        Date end = null;
+        if (ObjectUtils.isNotEmpty(taskEntity.getEndTime())) {
+            end = new Date(taskEntity.getEndTime());
+        }
+        Class<? extends TaskHandler> executor = this.getClass();
+        String cron = cron(taskEntity);
+        if (taskEntity.getRateType() == -1) {
+            long currentTriggerTime = System.currentTimeMillis() + 30 * 1000; //一次性的任务，确保下发成功，增加一点延时
+            if (taskEntity.getStartTime() >= currentTriggerTime) {
+                currentTriggerTime = taskEntity.getStartTime();
+                start = new Date(taskEntity.getStartTime() - 30 * 1000);
+            }
+            cron = cron(new Date(currentTriggerTime));
+        }
+        scheduleManager.addOrUpdateCronJob(jobKey, triggerKey, executor, cron, start, end, jobDataMap(taskEntity));
+    }
+
+    private static String cron(Date date) {
+        Calendar instance = Calendar.getInstance();
+        instance.setTime(date);
+
+        return instance.get(Calendar.SECOND) + " " +
+                instance.get(Calendar.MINUTE) + " " +
+                instance.get(Calendar.HOUR_OF_DAY) + " " +
+                instance.get(Calendar.DAY_OF_MONTH) + " " +
+                (instance.get(Calendar.MONTH) + 1) + " ? " +
+                instance.get(Calendar.YEAR);
+    }
+
+    private static String cron(GlobalTaskEntity taskEntity) {
+        if (taskEntity.getRateType() == -1) {
+            return taskEntity.getRateVal();
+        }
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+
+        Date date = null;
+        try {
+            date = sdf.parse(taskEntity.getRateVal());
+        } catch (ParseException e) {
+            e.printStackTrace();
+        }
+        java.util.Calendar instance = java.util.Calendar.getInstance();
+        instance.setTime(date);
+
+        if (taskEntity.getRateType() == 0) {
+            return instance.get(java.util.Calendar.SECOND) + " " +
+                    instance.get(java.util.Calendar.MINUTE) + " " +
+                    instance.get(java.util.Calendar.HOUR_OF_DAY) + " * * ?";
+        }
+        if (taskEntity.getRateType() == 1) {
+            return instance.get(java.util.Calendar.SECOND) + " " +
+                    instance.get(java.util.Calendar.MINUTE) + " " +
+                    instance.get(java.util.Calendar.HOUR_OF_DAY) + " ? * " +
+                    getWeekDayStr(instance.get(Calendar.DATE)); //这里是拿日当作周来保存的
+        }
+        if (taskEntity.getRateType() == 2) {
+            return instance.get(java.util.Calendar.SECOND) + " " +
+                    instance.get(java.util.Calendar.MINUTE) + " " +
+                    instance.get(java.util.Calendar.HOUR_OF_DAY) + " " +
+                    instance.get(Calendar.DATE) + " * ?";
+        }
+
+        return null;
+    }
+
+    private static String getWeekDayStr(int day) {
+        switch (day) {
+            case 1:
+                return "MON";
+            case 2:
+                return "TUE";
+            case 3:
+                return "WED";
+            case 4:
+                return "THU";
+            case 5:
+                return "FRI";
+            case 6:
+                return "SAT";
+            case 7:
+                return "SUN";
+        }
+        return "*";
+    }
+
+    @Override
+    public void removeTask(ScheduleManager scheduleManager, GlobalTaskEntity taskEntity) {
+        JobKey jobKey = new JobKey("DATA_FILL_TASK_" + taskEntity.getTaskId().toString());
+        TriggerKey triggerKey = new TriggerKey("DATA_FILL_TASK_" + taskEntity.getTaskId());
+        scheduleManager.removeJob(jobKey, triggerKey);
+    }
+
+    @Override
+    public void executeTask(ScheduleManager scheduleManager, GlobalTaskEntity taskEntity) throws Exception {
+        JobKey jobKey = new JobKey("DATA_FILL_TASK_" + taskEntity.getTaskId().toString());
+        scheduleManager.fireNow(jobKey);
+    }
+}
diff --git a/core/backend/src/main/java/io/dataease/listener/DataFillTaskStartListener.java b/core/backend/src/main/java/io/dataease/listener/DataFillTaskStartListener.java
new file mode 100644
index 0000000000..4606418e85
--- /dev/null
+++ b/core/backend/src/main/java/io/dataease/listener/DataFillTaskStartListener.java
@@ -0,0 +1,43 @@
+package io.dataease.listener;
+
+import io.dataease.auth.service.AuthUserService;
+import io.dataease.service.datafill.DataFillTaskService;
+import io.dataease.job.sechedule.ScheduleManager;
+import io.dataease.job.sechedule.strategy.TaskHandler;
+import io.dataease.job.sechedule.strategy.TaskStrategyFactory;
+import io.dataease.plugins.common.entity.GlobalTaskEntity;
+import io.dataease.plugins.common.util.SpringContextUtil;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.context.event.ApplicationReadyEvent;
+import org.springframework.context.ApplicationListener;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+@Component
+public class DataFillTaskStartListener implements ApplicationListener<ApplicationReadyEvent> {
+
+    @Autowired
+    private AuthUserService authUserService;
+
+    @Autowired
+    private ScheduleManager scheduleManager;
+
+    @Override
+    public void onApplicationEvent(ApplicationReadyEvent event) {
+        if (authUserService.pluginLoaded()) {
+            DataFillTaskService service = SpringContextUtil.getBean(DataFillTaskService.class);
+
+            List<GlobalTaskEntity> tasks = service.listActiveTasksGlobalTaskEntity();
+            tasks.stream().forEach(task -> {
+                TaskHandler taskHandler = TaskStrategyFactory.getInvokeStrategy(task.getTaskType());
+                try {
+                    taskHandler.resetRunningInstance(task.getTaskId());
+                    taskHandler.addTask(scheduleManager, task);
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
+            });
+        }
+    }
+}
diff --git a/core/backend/src/main/java/io/dataease/plugins/server/XOidcServer.java b/core/backend/src/main/java/io/dataease/plugins/server/XOidcServer.java
index 558e52c45a..a0f2e69173 100644
--- a/core/backend/src/main/java/io/dataease/plugins/server/XOidcServer.java
+++ b/core/backend/src/main/java/io/dataease/plugins/server/XOidcServer.java
@@ -1,17 +1,27 @@
 package io.dataease.plugins.server;
 
 
+import io.dataease.commons.utils.LogUtil;
+import io.dataease.plugins.common.exception.DataEaseException;
 import io.dataease.plugins.common.util.SpringContextUtil;
 import io.dataease.plugins.xpack.display.dto.response.SysSettingDto;
 import io.dataease.plugins.xpack.oidc.service.OidcXpackService;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 import springfox.documentation.annotations.ApiIgnore;
 
+import java.nio.charset.StandardCharsets;
+import java.security.MessageDigest;
+import java.security.SecureRandom;
+import java.util.Base64;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+
 @ApiIgnore
 @RequestMapping("/plugin/oidc")
 @RestController
@@ -31,19 +41,19 @@ public class XOidcServer {
         oidcXpackService.save(settings);
     }
 
-    @PostMapping(value="/authInfo")
+    @PostMapping(value = "/authInfo")
     public Map<String, Object> authInfo() {
         OidcXpackService oidcXpackService = SpringContextUtil.getBean(OidcXpackService.class);
         Map<String, Object> result = new HashMap<String, Object>();
         List<SysSettingDto> oidcSettings = oidcXpackService.oidcSettings();
-        
+
         Map<String, String> authParam = new HashMap<>();
         authParam.put("response_type", "code");
         authParam.put("state", "state");
-        
+
 
         oidcSettings.forEach(param -> {
-            if(StringUtils.isNotBlank(param.getParamKey())) {
+            if (StringUtils.isNotBlank(param.getParamKey())) {
                 if (StringUtils.equals(param.getParamKey(), "oidc.authEndpoint")) {
                     result.put("authEndpoint", param.getParamValue());
                 }
@@ -53,10 +63,46 @@ public class XOidcServer {
                 if (StringUtils.equals(param.getParamKey(), "oidc.clientId")) {
                     authParam.put("client_id", param.getParamValue());
                 }
+                if (StringUtils.equals(param.getParamKey(), "oidc.pkce") && StringUtils.isNotBlank(param.getParamValue())) {
+                    String pkceMethod = param.getParamValue();
+                    authParam.put("code_challenge_method", pkceMethod);
+                    if (StringUtils.equalsIgnoreCase("S256", pkceMethod)) {
+                        String verifier = generateVerifier();
+                        authParam.put("code_challenge", s256Challenge(verifier));
+                        authParam.put("state", verifier);
+                    } else if (StringUtils.equalsIgnoreCase("plain", pkceMethod)) {
+                        String verifier = generateVerifier();
+                        authParam.put("code_challenge", verifier);
+                        authParam.put("state", verifier);
+                    } else {
+                        authParam.remove("code_challenge_method");
+                    }
+                }
             }
-                      
+
         });
         result.put("authParam", authParam);
         return result;
     }
+
+    private String generateVerifier() {
+        SecureRandom sr = new SecureRandom();
+        byte[] code = new byte[32];
+        sr.nextBytes(code);
+        return Base64.getUrlEncoder().withoutPadding().encodeToString(code);
+    }
+
+    private String s256Challenge(String verifier) {
+        try {
+            byte[] bytes = verifier.getBytes(StandardCharsets.US_ASCII);
+            MessageDigest md = MessageDigest.getInstance("SHA-256");
+            md.update(bytes, 0, bytes.length);
+            byte[] digest = md.digest();
+            return org.apache.commons.codec.binary.Base64.encodeBase64URLSafeString(digest);
+        } catch (Exception e) {
+            LogUtil.error(e.getMessage());
+            DataEaseException.throwException(e.getMessage());
+        }
+        return null;
+    }
 }
diff --git a/core/backend/src/main/java/io/dataease/provider/datasource/JdbcProvider.java b/core/backend/src/main/java/io/dataease/provider/datasource/JdbcProvider.java
index 2f02c65665..dd12a8fd4a 100644
--- a/core/backend/src/main/java/io/dataease/provider/datasource/JdbcProvider.java
+++ b/core/backend/src/main/java/io/dataease/provider/datasource/JdbcProvider.java
@@ -22,6 +22,7 @@ import io.dataease.plugins.datasource.provider.DefaultJdbcProvider;
 import io.dataease.plugins.datasource.provider.ExtendedJdbcClassLoader;
 import io.dataease.plugins.datasource.provider.ProviderFactory;
 import io.dataease.plugins.datasource.query.QueryProvider;
+import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 
@@ -76,6 +77,27 @@ public class JdbcProvider extends DefaultJdbcProvider {
         }
     }
 
+    public int execWithPreparedStatement(DatasourceRequest datasourceRequest) throws Exception {
+        JdbcConfiguration jdbcConfiguration = new Gson().fromJson(datasourceRequest.getDatasource().getConfiguration(), JdbcConfiguration.class);
+        int queryTimeout = jdbcConfiguration.getQueryTimeout() > 0 ? jdbcConfiguration.getQueryTimeout() : 0;
+        try (Connection connection = getConnectionFromPool(datasourceRequest); PreparedStatement stat = getPreparedStatement(connection, queryTimeout, datasourceRequest.getQuery())) {
+
+            if (CollectionUtils.isNotEmpty(datasourceRequest.getTableFieldWithValues())) {
+                for (int i = 0; i < datasourceRequest.getTableFieldWithValues().size(); i++) {
+                    stat.setObject(i + 1, datasourceRequest.getTableFieldWithValues().get(i).getValue(), datasourceRequest.getTableFieldWithValues().get(i).getType());
+                }
+            }
+
+            return stat.executeUpdate();
+
+        } catch (SQLException e) {
+            DataEaseException.throwException(e);
+        } catch (Exception e) {
+            DataEaseException.throwException(e);
+        }
+        return 0;
+    }
+
 
     @Override
     public List<TableField> getTableFields(DatasourceRequest datasourceRequest) throws Exception {
@@ -110,6 +132,10 @@ public class JdbcProvider extends DefaultJdbcProvider {
             Set<String> primaryKeySet = new HashSet<>();
             while (primaryKeys.next()) {
                 String tableName = primaryKeys.getString("TABLE_NAME");
+                if (datasourceRequest.getDatasource().getType().equalsIgnoreCase(DatasourceTypes.mysql.name()) || datasourceRequest.getDatasource().getType().equalsIgnoreCase(DatasourceTypes.mariadb.name())) {
+                    //这里因为旧版mysql驱动问题，需要特殊处理
+                    tableName = tableName.replaceAll("`", "");
+                }
                 String database;
                 String schema = primaryKeys.getString("TABLE_SCHEM");
                 if (datasourceRequest.getDatasource().getType().equalsIgnoreCase(DatasourceTypes.pg.name()) || datasourceRequest.getDatasource().getType().equalsIgnoreCase(DatasourceTypes.ck.name())
@@ -201,6 +227,7 @@ public class JdbcProvider extends DefaultJdbcProvider {
         }
         tableField.setRemarks(remarks);
         String dbType = resultSet.getString("TYPE_NAME").toUpperCase();
+        tableField.setType(resultSet.getInt("DATA_TYPE"));
         tableField.setFieldType(dbType);
         if (dbType.equalsIgnoreCase("LONG")) {
             tableField.setFieldSize(65533);
@@ -398,7 +425,16 @@ public class JdbcProvider extends DefaultJdbcProvider {
         List<String[]> list = new LinkedList<>();
         JdbcConfiguration jdbcConfiguration = new Gson().fromJson(dsr.getDatasource().getConfiguration(), JdbcConfiguration.class);
         int queryTimeout = jdbcConfiguration.getQueryTimeout() > 0 ? jdbcConfiguration.getQueryTimeout() : 0;
-        try (Connection connection = getConnectionFromPool(dsr); Statement stat = getStatement(connection, queryTimeout); ResultSet rs = stat.executeQuery(dsr.getQuery())) {
+        try (Connection connection = getConnectionFromPool(dsr); PreparedStatement stat = getPreparedStatement(connection, queryTimeout, dsr.getQuery())) {
+
+            if (CollectionUtils.isNotEmpty(dsr.getTableFieldWithValues())) {
+                for (int i = 0; i < dsr.getTableFieldWithValues().size(); i++) {
+                    stat.setObject(i + 1, dsr.getTableFieldWithValues().get(i).getValue(), dsr.getTableFieldWithValues().get(i).getType());
+                }
+            }
+
+            ResultSet rs = stat.executeQuery();
+
             list = getDataResult(rs, dsr);
             if (dsr.isPageable() && (dsr.getDatasource().getType().equalsIgnoreCase(DatasourceTypes.sqlServer.name()) || dsr.getDatasource().getType().equalsIgnoreCase(DatasourceTypes.db2.name()))) {
                 Integer realSize = dsr.getPage() * dsr.getPageSize() < list.size() ? dsr.getPage() * dsr.getPageSize() : list.size();
@@ -584,13 +620,13 @@ public class JdbcProvider extends DefaultJdbcProvider {
             jdbcClassLoader = extendedJdbcClassLoader;
 
             DeDriver driver = deDriverMapper.selectByPrimaryKey("default-" + datasourceRequest.getDatasource().getType());
-            if(driver == null){
+            if (driver == null) {
                 for (DataSourceType value : SpringContextUtil.getApplicationContext().getBeansOfType(DataSourceType.class).values()) {
                     if (value.getType().equalsIgnoreCase(datasourceRequest.getDatasource().getType())) {
                         surpportVersions = value.getSurpportVersions();
                     }
                 }
-            }else {
+            } else {
                 surpportVersions = driver.getSurpportVersions();
             }
         } else {
diff --git a/core/backend/src/main/java/io/dataease/provider/engine/doris/DorisQueryProvider.java b/core/backend/src/main/java/io/dataease/provider/engine/doris/DorisQueryProvider.java
index 13b2c2f933..7b22212f9c 100644
--- a/core/backend/src/main/java/io/dataease/provider/engine/doris/DorisQueryProvider.java
+++ b/core/backend/src/main/java/io/dataease/provider/engine/doris/DorisQueryProvider.java
@@ -1437,7 +1437,7 @@ public class DorisQueryProvider extends QueryProvider {
                 }
             } else if (StringUtils.containsIgnoreCase(request.getOperator(), "like")) {
                 String keyword = value.get(0).toUpperCase();
-                whereValue = "'%" + keyword + "%'";
+                whereValue = formatLikeValue(keyword);
                 whereName = "upper(" + whereName + ")";
             } else if (StringUtils.containsIgnoreCase(request.getOperator(), "between")) {
                 if (request.getDatasetTableField().getDeType() == 1) {
diff --git a/core/backend/src/main/java/io/dataease/provider/engine/mysql/MysqlQueryProvider.java b/core/backend/src/main/java/io/dataease/provider/engine/mysql/MysqlQueryProvider.java
index e15e386923..50e6864457 100644
--- a/core/backend/src/main/java/io/dataease/provider/engine/mysql/MysqlQueryProvider.java
+++ b/core/backend/src/main/java/io/dataease/provider/engine/mysql/MysqlQueryProvider.java
@@ -1379,7 +1379,7 @@ public class MysqlQueryProvider extends QueryProvider {
                 }
             } else if (StringUtils.containsIgnoreCase(request.getOperator(), "like")) {
                 String keyword = value.get(0).toUpperCase();
-                whereValue = "'%" + keyword + "%'";
+                whereValue = formatLikeValue(keyword);
                 whereName = "upper(" + whereName + ")";
             } else if (StringUtils.containsIgnoreCase(request.getOperator(), "between")) {
                 if (request.getDatasetTableField().getDeType() == 1) {
diff --git a/core/backend/src/main/java/io/dataease/provider/ext/MysqlExtDDLProvider.java b/core/backend/src/main/java/io/dataease/provider/ext/MysqlExtDDLProvider.java
new file mode 100644
index 0000000000..9758993090
--- /dev/null
+++ b/core/backend/src/main/java/io/dataease/provider/ext/MysqlExtDDLProvider.java
@@ -0,0 +1,344 @@
+package io.dataease.provider.ext;
+
+import io.dataease.commons.utils.BeanUtils;
+import io.dataease.plugins.common.dto.datafill.ExtIndexField;
+import io.dataease.plugins.common.dto.datafill.ExtTableField;
+import io.dataease.plugins.common.dto.datasource.TableField;
+import io.dataease.plugins.common.request.datasource.DatasourceRequest;
+import io.dataease.plugins.datasource.provider.DefaultExtDDLProvider;
+import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.List;
+
+
+@Service("extMysqlDDLProvider")
+public class MysqlExtDDLProvider extends DefaultExtDDLProvider {
+
+    private static final String creatTableSql =
+            "CREATE TABLE `TABLE_NAME`" +
+                    "Column_Fields" + " ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE utf8mb4_general_ci;";
+
+    private static final String creatTableIndexSql =
+            "create index `INDEX_NAME` on `TABLE_NAME` (Column_Fields);";
+
+    private static final String dropTableSql = "DROP TABLE IF EXISTS `TABLE_NAME`";
+
+    @Override
+    public String dropTableSql(String table) {
+        return dropTableSql.replace("TABLE_NAME", table);
+    }
+
+    @Override
+    public String createTableSql(String table, List<ExtTableField> formFields) {
+        //check inject
+        if (checkSqlInjection(table)) {
+            throw new RuntimeException("包含SQL注入的参数，请检查参数！");
+        }
+
+        List<ExtTableField.TableField> fields = convertTableFields(true, formFields);
+        String fieldSql = convertTableFieldsString(table, fields);
+        return creatTableSql.replace("TABLE_NAME", table).replace("Column_Fields", fieldSql);
+    }
+
+
+    @Override
+    public String searchSql(String table, List<TableField> formFields, String whereSql, long limit, long offset) {
+        String baseSql = "SELECT $Column_Fields$ FROM `$TABLE_NAME$` $WHERE_SQL$ LIMIT $OFFSET_COUNT$, $LIMIT_COUNT$ ;";
+        baseSql = baseSql.replace("$TABLE_NAME$", table)
+                .replace("$OFFSET_COUNT$", Long.toString(offset))
+                .replace("$LIMIT_COUNT$", Long.toString(limit));
+        if (StringUtils.isBlank(whereSql)) {
+            baseSql = baseSql.replace("$WHERE_SQL$", "");
+        } else {
+            baseSql = baseSql.replace("$WHERE_SQL$", whereSql);
+        }
+        baseSql = baseSql.replace("$Column_Fields$", convertSearchFields(formFields));
+        return baseSql;
+    }
+
+    @Override
+    public String whereSql(String tableName, List<TableField> searchFields) {
+        StringBuilder builder = new StringBuilder("WHERE 1 = 1 ");
+        for (TableField searchField : searchFields) {
+            //目前只考虑等于
+            builder.append("AND $Column_Field$ = ? ".replace("$Column_Field$", searchField.getFieldName()));
+        }
+        return builder.toString();
+    }
+
+    @Override
+    public String countSql(String table, List<TableField> formFields, String whereSql) {
+        String baseSql = "SELECT COUNT(1) FROM `$TABLE_NAME$` $WHERE_SQL$ ;";
+        baseSql = baseSql.replace("$TABLE_NAME$", table);
+        if (StringUtils.isBlank(whereSql)) {
+            baseSql = baseSql.replace("$WHERE_SQL$", "");
+        } else {
+            baseSql = baseSql.replace("$WHERE_SQL$", whereSql);
+        }
+        return baseSql;
+    }
+
+    private String convertSearchFields(List<TableField> formFields) {
+        StringBuilder builder = new StringBuilder();
+        for (int i = 0; i < formFields.size(); i++) {
+            TableField f = formFields.get(i);
+            if (StringUtils.equalsAnyIgnoreCase(f.getFieldType(), "datetime")) {
+                //特殊处理，全部使用统一格式输出
+                builder.append("DATE_FORMAT(`").append(f.getFieldName()).append("`,'%Y-%m-%d %H:%i:%S')");
+            } else {
+                builder.append("`").append(f.getFieldName()).append("`");
+            }
+            if (i < formFields.size() - 1) {
+                builder.append(", ");
+            }
+        }
+        return builder.toString();
+    }
+
+    private List<ExtTableField.TableField> convertTableFields(boolean create, List<ExtTableField> formFields) {
+        List<ExtTableField.TableField> list = new ArrayList<>();
+        if (create) {
+            list.add(
+                    ExtTableField.TableField.builder()
+                            .columnName("id")
+                            .comment("ID")
+                            .primaryKey(true)
+                            .type(ExtTableField.BaseType.nvarchar)
+                            .size(128)
+                            .build()
+            );
+        }
+
+        for (ExtTableField formField : formFields) {
+            ExtTableField.TableField.TableFieldBuilder fieldBuilder = ExtTableField.TableField.builder()
+                    .columnName(formField.getSettings().getMapping().getColumnName())
+                    .type(formField.getSettings().getMapping().getType())
+                    .comment(formField.getSettings().getName())
+                    .required(formField.getSettings().isRequired());
+            if (StringUtils.equalsIgnoreCase(formField.getType(), "dateRange")) {
+                ExtTableField.TableField f1 = fieldBuilder
+                        .columnName(formField.getSettings().getMapping().getColumnName1())
+                        .comment(formField.getSettings().getName() + " start")
+                        .build();
+                list.add(f1);
+
+                ExtTableField.TableField f2 = BeanUtils.copyBean(new ExtTableField.TableField(), f1);
+                f2.setColumnName(formField.getSettings().getMapping().getColumnName2());
+                f2.setComment(formField.getSettings().getName() + " end");
+                list.add(f2);
+            } else {
+                list.add(fieldBuilder.build());
+            }
+        }
+
+        return list;
+    }
+
+    @Override
+    public String deleteDataByIdSql(String table, DatasourceRequest.TableFieldWithValue pk) {
+        String deleteSql = "DELETE FROM `$TABLE_NAME$` WHERE `$PRIMARY_KEY$` = ?;";
+        return deleteSql.replace("$TABLE_NAME$", table)
+                .replace("$PRIMARY_KEY$", pk.getFiledName());
+    }
+
+    private String convertFields(List<DatasourceRequest.TableFieldWithValue> fields) {
+        StringBuilder builder = new StringBuilder();
+        for (int i = 0; i < fields.size(); i++) {
+            DatasourceRequest.TableFieldWithValue f = fields.get(i);
+            builder.append("`").append(f.getFiledName()).append("`");
+            if (i < fields.size() - 1) {
+                builder.append(", ");
+            }
+        }
+
+        return builder.toString();
+    }
+
+    private String convertValueFields(List<DatasourceRequest.TableFieldWithValue> fields) {
+        StringBuilder builder = new StringBuilder();
+        for (int i = 0; i < fields.size(); i++) {
+            DatasourceRequest.TableFieldWithValue f = fields.get(i);
+            builder.append("?");
+            if (i < fields.size() - 1) {
+                builder.append(", ");
+            }
+        }
+
+        return builder.toString();
+    }
+
+    @Override
+    public String insertDataSql(String tableName, List<DatasourceRequest.TableFieldWithValue> fields) {
+        String sql = "INSERT INTO `$TABLE_NAME$`($Column_Fields$) VALUES ($Value_Fields$);";
+        return sql.replace("$TABLE_NAME$", tableName)
+                .replace("$Column_Fields$", convertFields(fields))
+                .replace("$Value_Fields$", convertValueFields(fields));
+    }
+
+    private String convertUpdateFields(List<DatasourceRequest.TableFieldWithValue> fields) {
+        StringBuilder builder = new StringBuilder();
+        for (int i = 0; i < fields.size(); i++) {
+            DatasourceRequest.TableFieldWithValue f = fields.get(i);
+            builder.append("`").append(f.getFiledName()).append("` = ?");
+            if (i < fields.size() - 1) {
+                builder.append(", ");
+            }
+        }
+
+        return builder.toString();
+    }
+
+    @Override
+    public String updateDataByIdSql(String tableName, List<DatasourceRequest.TableFieldWithValue> fields, DatasourceRequest.TableFieldWithValue pk) {
+        String sql = "UPDATE `$TABLE_NAME$` SET $Column_Fields$ WHERE `$PRIMARY_KEY$` = ?;";
+        return sql.replace("$TABLE_NAME$", tableName)
+                .replace("$Column_Fields$", convertUpdateFields(fields))
+                .replace("$PRIMARY_KEY$", pk.getFiledName());
+    }
+
+    @Override
+    public String checkUniqueValueSql(String tableName, DatasourceRequest.TableFieldWithValue field, DatasourceRequest.TableFieldWithValue pk) {
+        String sql = "SELECT COUNT(1) FROM `$TABLE_NAME$` WHERE `$Column_Field$` = ? $PRIMARY_KEY_CONDITION$;";
+
+        StringBuilder pkCondition = new StringBuilder();
+        if (pk != null) {
+            pkCondition.append("AND `").append(pk.getFiledName()).append("` != ?");
+        }
+
+        return sql.replace("$TABLE_NAME$", tableName)
+                .replace("$Column_Field$", field.getFiledName())
+                .replace("$PRIMARY_KEY_CONDITION$", pkCondition.toString());
+    }
+
+    private String convertTableFieldsString(String table, List<ExtTableField.TableField> fields) {
+        StringBuilder str = new StringBuilder();
+
+        str.append("(\n");
+
+        ExtTableField.TableField primaryKeyField = null;
+        for (ExtTableField.TableField field : fields) {
+            if (field.isPrimaryKey()) {
+                primaryKeyField = field;
+            }
+
+            //check inject
+            if (checkSqlInjection(field.getColumnName())) {
+                throw new RuntimeException("包含SQL注入的参数，请检查参数！");
+            }
+
+            //column name
+            str.append("`").append(field.getColumnName()).append("` ");
+            //type
+            switch (field.getType()) {
+                case nvarchar:
+                    str.append("NVARCHAR(");
+                    if (field.getSize() != null && field.getSize() > 0) {
+                        str.append(field.getSize());
+                    } else {
+                        str.append(256);
+                    }
+                    str.append(") ");
+                    break;
+                case number:
+                    str.append("BIGINT(");
+                    if (field.getSize() != null && field.getSize() > 0) {
+                        str.append(field.getSize());
+                    } else {
+                        str.append(20);
+                    }
+                    str.append(") ");
+                    break;
+                case decimal:
+                    str.append("DECIMAL(");
+                    if (field.getSize() != null && field.getSize() > 0) {
+                        str.append(field.getSize());
+                    } else {
+                        str.append(20);
+                    }
+                    str.append(",");
+                    if (field.getAccuracy() != null && field.getAccuracy() >= 0) {
+                        str.append(field.getAccuracy());
+                    } else {
+                        str.append(4);
+                    }
+                    str.append(") ");
+                    break;
+                case datetime:
+                    str.append("DATETIME ");
+                    break;
+                default:
+                    str.append("LONGTEXT ");
+                    break;
+            }
+
+            //必填
+            if (field.isRequired()) {
+                str.append("NOT NULL ");
+            }
+
+            //comment
+            str.append("COMMENT '").append(field.getComment()).append("' ");
+
+            //换行
+            str.append(",\n");
+
+        }
+
+        if (primaryKeyField != null) {
+            str.append("constraint ")
+                    .append(table)
+                    .append("_pk ")
+                    .append("PRIMARY KEY (")
+                    .append("`")
+                    .append(primaryKeyField.getColumnName())
+                    .append("`)");
+        }
+
+        str.append("\n)\n");
+
+        return str.toString();
+    }
+
+    @Override
+    public List<String> createTableIndexSql(String table, List<ExtIndexField> indexFields) {
+        List<String> list = new ArrayList<>();
+        for (ExtIndexField indexField : indexFields) {
+            String c = convertTableIndexSql(table, indexField);
+            if (StringUtils.isNotEmpty(c)) {
+                list.add(c);
+            }
+        }
+        return list;
+    }
+
+    private String convertTableIndexSql(String table, ExtIndexField indexField) {
+        StringBuilder column = new StringBuilder();
+        if (CollectionUtils.isEmpty(indexField.getColumns())) {
+            return null;
+        }
+
+        //check inject
+        if (checkSqlInjection(table) || checkSqlInjection(indexField.getName())) {
+            throw new RuntimeException("包含SQL注入的参数，请检查参数！");
+        }
+
+        int count = 0;
+        for (ExtIndexField.ColumnSetting indexFieldColumn : indexField.getColumns()) {
+            count++;
+            column.append("`").append(indexFieldColumn.getColumn()).append("` ");
+            if (StringUtils.equalsIgnoreCase(indexFieldColumn.getOrder(), "asc")) {
+                column.append("asc");
+            } else if (StringUtils.equalsIgnoreCase(indexFieldColumn.getOrder(), "desc")) {
+                column.append("desc");
+            }
+            if (count < indexField.getColumns().size()) {
+                column.append(", ");
+            }
+        }
+
+        return creatTableIndexSql.replace("TABLE_NAME", table).replace("INDEX_NAME", indexField.getName()).replace("Column_Fields", column.toString());
+    }
+}
diff --git a/core/backend/src/main/java/io/dataease/provider/query/ck/CKQueryProvider.java b/core/backend/src/main/java/io/dataease/provider/query/ck/CKQueryProvider.java
index a75fb8e006..f7cd5d8111 100644
--- a/core/backend/src/main/java/io/dataease/provider/query/ck/CKQueryProvider.java
+++ b/core/backend/src/main/java/io/dataease/provider/query/ck/CKQueryProvider.java
@@ -1480,7 +1480,7 @@ public class CKQueryProvider extends QueryProvider {
                 }
             } else if (StringUtils.containsIgnoreCase(request.getOperator(), "like")) {
                 String keyword = value.get(0).toUpperCase();
-                whereValue = "'%" + keyword + "%'";
+                whereValue = formatLikeValue(keyword);
                 whereName = "upper(" + whereName + ")";
             } else if (StringUtils.containsIgnoreCase(request.getOperator(), "between")) {
                 if (request.getDatasetTableField().getDeType() == DeTypeConstants.DE_TIME) {
diff --git a/core/backend/src/main/java/io/dataease/provider/query/db2/Db2QueryProvider.java b/core/backend/src/main/java/io/dataease/provider/query/db2/Db2QueryProvider.java
index b5d1bb8c3a..2dd9ea9ce1 100644
--- a/core/backend/src/main/java/io/dataease/provider/query/db2/Db2QueryProvider.java
+++ b/core/backend/src/main/java/io/dataease/provider/query/db2/Db2QueryProvider.java
@@ -1476,7 +1476,7 @@ public class Db2QueryProvider extends QueryProvider {
                 }
             } else if (StringUtils.containsIgnoreCase(request.getOperator(), "like")) {
                 String keyword = value.get(0).toUpperCase();
-                whereValue = "'%" + keyword + "%'";
+                whereValue = formatLikeValue(keyword);
                 whereName = "upper(" + whereName + ")";
             } else if (StringUtils.containsIgnoreCase(request.getOperator(), "between")) {
                 if (request.getDatasetTableField().getDeType() == DeTypeConstants.DE_TIME) {
diff --git a/core/backend/src/main/java/io/dataease/provider/query/es/EsQueryProvider.java b/core/backend/src/main/java/io/dataease/provider/query/es/EsQueryProvider.java
index 7b5e2f579b..90de48bbaf 100644
--- a/core/backend/src/main/java/io/dataease/provider/query/es/EsQueryProvider.java
+++ b/core/backend/src/main/java/io/dataease/provider/query/es/EsQueryProvider.java
@@ -1403,7 +1403,7 @@ public class EsQueryProvider extends QueryProvider {
                 }
             } else if (StringUtils.containsIgnoreCase(request.getOperator(), "like")) {
                 String keyword = value.get(0).toUpperCase();
-                whereValue = "'%" + keyword + "%'";
+                whereValue = formatLikeValue(keyword);
                 whereName = "UCASE(" + whereName + ")";
             } else if (StringUtils.containsIgnoreCase(request.getOperator(), "between")) {
                 if (request.getDatasetTableField().getDeType() == 1) {
diff --git a/core/backend/src/main/java/io/dataease/provider/query/hive/HiveQueryProvider.java b/core/backend/src/main/java/io/dataease/provider/query/hive/HiveQueryProvider.java
index cef882d2df..c5bbb6fbea 100644
--- a/core/backend/src/main/java/io/dataease/provider/query/hive/HiveQueryProvider.java
+++ b/core/backend/src/main/java/io/dataease/provider/query/hive/HiveQueryProvider.java
@@ -1360,7 +1360,7 @@ public class HiveQueryProvider extends QueryProvider {
                 }
             } else if (StringUtils.containsIgnoreCase(request.getOperator(), "like")) {
                 String keyword = value.get(0).toUpperCase();
-                whereValue = "'%" + keyword + "%'";
+                whereValue = formatLikeValue(keyword);
                 whereName = "upper(" + whereName + ")";
             } else if (StringUtils.containsIgnoreCase(request.getOperator(), "between")) {
                 if (request.getDatasetTableField().getDeType() == DeTypeConstants.DE_TIME) {
diff --git a/core/backend/src/main/java/io/dataease/provider/query/impala/ImpalaQueryProvider.java b/core/backend/src/main/java/io/dataease/provider/query/impala/ImpalaQueryProvider.java
index 854c5cb5db..3950fac6a3 100644
--- a/core/backend/src/main/java/io/dataease/provider/query/impala/ImpalaQueryProvider.java
+++ b/core/backend/src/main/java/io/dataease/provider/query/impala/ImpalaQueryProvider.java
@@ -1380,7 +1380,7 @@ public class ImpalaQueryProvider extends QueryProvider {
                 }
             } else if (StringUtils.containsIgnoreCase(request.getOperator(), "like")) {
                 String keyword = value.get(0).toUpperCase();
-                whereValue = "'%" + keyword + "%'";
+                whereValue = formatLikeValue(keyword);
                 whereName = "upper(" + whereName + ")";
             } else if (StringUtils.containsIgnoreCase(request.getOperator(), "between")) {
                 if (request.getDatasetTableField().getDeType() == DeTypeConstants.DE_TIME) {
diff --git a/core/backend/src/main/java/io/dataease/provider/query/mongodb/MongoQueryProvider.java b/core/backend/src/main/java/io/dataease/provider/query/mongodb/MongoQueryProvider.java
index 04dcd4c24f..324a71fcdf 100644
--- a/core/backend/src/main/java/io/dataease/provider/query/mongodb/MongoQueryProvider.java
+++ b/core/backend/src/main/java/io/dataease/provider/query/mongodb/MongoQueryProvider.java
@@ -1235,7 +1235,7 @@ public class MongoQueryProvider extends QueryProvider {
                 }
             } else if (StringUtils.containsIgnoreCase(request.getOperator(), "like")) {
                 String keyword = value.get(0).toUpperCase();
-                whereValue = "'%" + keyword + "%'";
+                whereValue = formatLikeValue(keyword);
                 whereName = "upper(" + whereName + ")";
             } else if (StringUtils.containsIgnoreCase(request.getOperator(), "between")) {
                 if (request.getDatasetTableField().getDeType() == DeTypeConstants.DE_TIME) {
diff --git a/core/backend/src/main/java/io/dataease/provider/query/mysql/MysqlQueryProvider.java b/core/backend/src/main/java/io/dataease/provider/query/mysql/MysqlQueryProvider.java
index 2b8f03a8d5..74fe391f29 100644
--- a/core/backend/src/main/java/io/dataease/provider/query/mysql/MysqlQueryProvider.java
+++ b/core/backend/src/main/java/io/dataease/provider/query/mysql/MysqlQueryProvider.java
@@ -1444,7 +1444,7 @@ public class MysqlQueryProvider extends QueryProvider {
                 }
             } else if (StringUtils.containsIgnoreCase(request.getOperator(), "like")) {
                 String keyword = value.get(0).toUpperCase();
-                whereValue = "'%" + keyword + "%'";
+                whereValue = formatLikeValue(keyword);
                 whereName = "upper(" + whereName + ")";
             } else if (StringUtils.containsIgnoreCase(request.getOperator(), "between")) {
                 if (request.getDatasetTableField().getDeType() == 1) {
diff --git a/core/backend/src/main/java/io/dataease/provider/query/oracle/OracleQueryProvider.java b/core/backend/src/main/java/io/dataease/provider/query/oracle/OracleQueryProvider.java
index 5e6e02dbf4..dfcc5ccbbe 100644
--- a/core/backend/src/main/java/io/dataease/provider/query/oracle/OracleQueryProvider.java
+++ b/core/backend/src/main/java/io/dataease/provider/query/oracle/OracleQueryProvider.java
@@ -1549,7 +1549,7 @@ public class OracleQueryProvider extends QueryProvider {
                 }
             } else if (StringUtils.containsIgnoreCase(request.getOperator(), "like")) {
                 String keyword = value.get(0).toUpperCase();
-                whereValue = "'%" + keyword + "%'";
+                whereValue = formatLikeValue(keyword);
                 whereName = "upper(" + whereName + ")";
             } else if (StringUtils.containsIgnoreCase(request.getOperator(), "between")) {
                 if (request.getDatasetTableField().getDeType() == 1) {
diff --git a/core/backend/src/main/java/io/dataease/provider/query/pg/PgQueryProvider.java b/core/backend/src/main/java/io/dataease/provider/query/pg/PgQueryProvider.java
index acb6a7c212..a18e0cc6f7 100644
--- a/core/backend/src/main/java/io/dataease/provider/query/pg/PgQueryProvider.java
+++ b/core/backend/src/main/java/io/dataease/provider/query/pg/PgQueryProvider.java
@@ -1400,7 +1400,7 @@ public class PgQueryProvider extends QueryProvider {
                 }
             } else if (StringUtils.containsIgnoreCase(request.getOperator(), "like")) {
                 String keyword = value.get(0).toUpperCase();
-                whereValue = "'%" + keyword + "%'";
+                whereValue = formatLikeValue(keyword);
                 whereName = "upper(" + whereName + ")";
             } else if (StringUtils.containsIgnoreCase(request.getOperator(), "between")) {
                 if (request.getDatasetTableField().getDeType() == 1) {
diff --git a/core/backend/src/main/java/io/dataease/provider/query/redshift/RedshiftQueryProvider.java b/core/backend/src/main/java/io/dataease/provider/query/redshift/RedshiftQueryProvider.java
index c9cad1148c..78c4ef1355 100644
--- a/core/backend/src/main/java/io/dataease/provider/query/redshift/RedshiftQueryProvider.java
+++ b/core/backend/src/main/java/io/dataease/provider/query/redshift/RedshiftQueryProvider.java
@@ -1386,7 +1386,7 @@ public class RedshiftQueryProvider extends QueryProvider {
                 }
             } else if (StringUtils.containsIgnoreCase(request.getOperator(), "like")) {
                 String keyword = value.get(0).toUpperCase();
-                whereValue = "'%" + keyword + "%'";
+                whereValue = formatLikeValue(keyword);
                 whereName = "upper(" + whereName + ")";
             } else if (StringUtils.containsIgnoreCase(request.getOperator(), "between")) {
                 if (request.getDatasetTableField().getDeType() == 1) {
diff --git a/core/backend/src/main/java/io/dataease/provider/query/sqlserver/SqlserverQueryProvider.java b/core/backend/src/main/java/io/dataease/provider/query/sqlserver/SqlserverQueryProvider.java
index dcc63f3a5a..37b0e78a00 100644
--- a/core/backend/src/main/java/io/dataease/provider/query/sqlserver/SqlserverQueryProvider.java
+++ b/core/backend/src/main/java/io/dataease/provider/query/sqlserver/SqlserverQueryProvider.java
@@ -1532,7 +1532,7 @@ public class SqlserverQueryProvider extends QueryProvider {
                 }
             } else if (StringUtils.containsIgnoreCase(request.getOperator(), "like")) {
                 String keyword = value.get(0).toUpperCase();
-                whereValue = "'%" + keyword + "%'";
+                whereValue = formatLikeValue(keyword);
                 whereName = "upper(" + whereName + ")";
             } else if (StringUtils.containsIgnoreCase(request.getOperator(), "between")) {
                 if (request.getDatasetTableField().getDeType() == DeTypeConstants.DE_TIME) {
diff --git a/core/backend/src/main/java/io/dataease/service/chart/ChartViewService.java b/core/backend/src/main/java/io/dataease/service/chart/ChartViewService.java
index 75fece5654..27d0fe943e 100644
--- a/core/backend/src/main/java/io/dataease/service/chart/ChartViewService.java
+++ b/core/backend/src/main/java/io/dataease/service/chart/ChartViewService.java
@@ -731,7 +731,11 @@ public class ChartViewService {
                 }
                 if (chartExtRequest.getPageSize() == null) {
                     String pageSize = (String) mapSize.get("tablePageSize");
-                    chartExtRequest.setPageSize(Math.min(Long.parseLong(pageSize), view.getResultCount().longValue()));
+                    if (StringUtils.equalsIgnoreCase(view.getResultMode(), "custom")) {
+                        chartExtRequest.setPageSize(Math.min(Long.parseLong(pageSize), view.getResultCount().longValue()));
+                    } else {
+                        chartExtRequest.setPageSize(Long.parseLong(pageSize));
+                    }
                 }
             } else {
                 if (StringUtils.equalsIgnoreCase(view.getResultMode(), "custom")) {
@@ -1856,7 +1860,7 @@ public class ChartViewService {
                 }
                 Date date = simpleDateFormat.parse(cTime);
                 calendar.setTime(date);
-                calendar.add(Calendar.DAY_OF_YEAR,6);// 加6天用一周最后一天计算周，可避免跨年的问题
+                calendar.add(Calendar.DAY_OF_YEAR, 6);// 加6天用一周最后一天计算周，可避免跨年的问题
                 calendar.add(Calendar.WEEK_OF_YEAR, -1);
                 lastTime = simpleDateFormat.format(calendar.getTime());
             }
diff --git a/core/backend/src/main/java/io/dataease/service/datafill/DataFillDataService.java b/core/backend/src/main/java/io/dataease/service/datafill/DataFillDataService.java
new file mode 100644
index 0000000000..de9a4067b0
--- /dev/null
+++ b/core/backend/src/main/java/io/dataease/service/datafill/DataFillDataService.java
@@ -0,0 +1,406 @@
+package io.dataease.service.datafill;
+
+import com.google.common.reflect.TypeToken;
+import com.google.gson.Gson;
+import io.dataease.auth.service.AuthUserService;
+import io.dataease.commons.utils.CommonBeanFactory;
+import io.dataease.controller.request.datafill.DataFillFormTableDataRequest;
+import io.dataease.controller.response.datafill.DataFillFormTableDataResponse;
+import io.dataease.dto.datafill.DataFillCommitLogDTO;
+import io.dataease.ext.ExtDataFillFormMapper;
+import io.dataease.plugins.common.base.domain.DataFillFormWithBLOBs;
+import io.dataease.plugins.common.base.domain.Datasource;
+import io.dataease.plugins.common.base.mapper.DataFillFormMapper;
+import io.dataease.plugins.common.dto.datafill.ExtTableField;
+import io.dataease.plugins.common.dto.datasource.TableField;
+import io.dataease.plugins.common.exception.DataEaseException;
+import io.dataease.plugins.common.request.datasource.DatasourceRequest;
+import io.dataease.plugins.datasource.provider.ExtDDLProvider;
+import io.dataease.plugins.datasource.provider.Provider;
+import io.dataease.plugins.datasource.provider.ProviderFactory;
+import io.dataease.provider.datasource.JdbcProvider;
+import io.dataease.service.datasource.DatasourceService;
+import io.dataease.service.sys.SysAuthService;
+import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.math.NumberUtils;
+import org.pentaho.di.core.util.UUIDUtil;
+import org.springframework.core.env.Environment;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import javax.annotation.Resource;
+import java.math.BigDecimal;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+@Service
+@Transactional(rollbackFor = Exception.class)
+public class DataFillDataService {
+
+    @Resource
+    private Environment env;
+    @Resource
+    private DataFillFormMapper dataFillFormMapper;
+    @Resource
+    private ExtDataFillFormMapper extDataFillFormMapper;
+    @Resource
+    private DatasourceService datasource;
+    @Resource
+    private SysAuthService sysAuthService;
+
+    @Resource
+    private DataFillLogService dataFillLogService;
+
+
+    private final static Gson gson = new Gson();
+
+
+    public DataFillFormTableDataResponse listData(DataFillFormTableDataRequest searchRequest) throws Exception {
+
+        DataFillFormWithBLOBs dataFillForm = dataFillFormMapper.selectByPrimaryKey(searchRequest.getId());
+
+        if (StringUtils.equals(dataFillForm.getNodeType(), "folder")) {
+            return null;
+        }
+        List<ExtTableField> fields = gson.fromJson(dataFillForm.getForms(), new TypeToken<List<ExtTableField>>() {
+        }.getType());
+
+        Datasource ds = datasource.get(dataFillForm.getDatasource());
+        Provider datasourceProvider = ProviderFactory.getProvider(ds.getType());
+
+        DatasourceRequest datasourceRequest = new DatasourceRequest();
+        datasourceRequest.setDatasource(ds);
+        datasourceRequest.setTable(dataFillForm.getTableName());
+        List<TableField> tableFields = datasourceProvider.getTableFields(datasourceRequest);
+        Map<String, ExtTableField.BaseType> extTableFieldTypeMap = new HashMap<>();
+        Map<String, TableField> tableFieldMap = new HashMap<>();
+        List<TableField> searchFields = new ArrayList<>();
+
+        String key = "";
+        TableField pk = null;
+
+        for (TableField tableField : tableFields) {
+            if (tableField.isPrimaryKey()) {
+                //先把ID放进来
+                searchFields.add(tableField);
+                key = tableField.getFieldName();
+                pk = tableField;
+            }
+            tableFieldMap.put(tableField.getFieldName(), tableField);
+        }
+
+        //核对一下字段
+        for (ExtTableField field : fields) {
+            if (StringUtils.equalsIgnoreCase(field.getType(), "dateRange")) {
+                String name1 = field.getSettings().getMapping().getColumnName1();
+                extTableFieldTypeMap.put(name1, field.getSettings().getMapping().getType());
+                TableField f1 = tableFieldMap.get(name1);
+                if (f1 != null) {
+                    //调整类型，给后面解析字段用
+                    f1.setFieldType(field.getSettings().getMapping().getType().name());
+                    searchFields.add(f1);
+                }
+                String name2 = field.getSettings().getMapping().getColumnName2();
+                extTableFieldTypeMap.put(name2, field.getSettings().getMapping().getType());
+                TableField f2 = tableFieldMap.get(name2);
+                if (f2 != null) {
+                    //调整类型，给后面解析字段用
+                    f2.setFieldType(field.getSettings().getMapping().getType().name());
+                    searchFields.add(f2);
+                }
+            } else {
+                String name = field.getSettings().getMapping().getColumnName();
+                extTableFieldTypeMap.put(name, field.getSettings().getMapping().getType());
+                TableField f = tableFieldMap.get(field.getSettings().getMapping().getColumnName());
+                if (f != null) {
+                    //调整类型，给后面解析字段用
+                    f.setFieldType(field.getSettings().getMapping().getType().name());
+                    searchFields.add(f);
+                }
+            }
+        }
+
+        ExtDDLProvider extDDLProvider = ProviderFactory.gerExtDDLProvider(ds.getType());
+
+        String whereSql = "";
+        if (StringUtils.isNoneBlank(searchRequest.getPrimaryKeyValue())) {
+            whereSql = extDDLProvider.whereSql(dataFillForm.getTableName(), List.of(pk));
+        }
+
+        String countSql = extDDLProvider.countSql(dataFillForm.getTableName(), searchFields, whereSql);
+        if (StringUtils.isNoneBlank(searchRequest.getPrimaryKeyValue())) {
+            datasourceRequest.setTableFieldWithValues(List.of(new DatasourceRequest.TableFieldWithValue()
+                    .setValue(searchRequest.getPrimaryKeyValue())
+                    .setFiledName(pk.getFieldName())
+                    .setTypeName(pk.getFieldType())
+                    .setType(pk.getType())));
+        }
+        datasourceRequest.setQuery(countSql);
+        List<String[]> countData = datasourceProvider.getData(datasourceRequest);
+        long count = NumberUtils.toLong(countData.get(0)[0]);
+
+        String searchSql = extDDLProvider.searchSql(dataFillForm.getTableName(), searchFields, whereSql, searchRequest.getPageSize(), (searchRequest.getCurrentPage() - 1) * searchRequest.getPageSize());
+        datasourceRequest.setQuery(searchSql);
+
+        List<String[]> data2 = datasourceProvider.getData(datasourceRequest);
+        List<Map<String, Object>> result = new ArrayList<>();
+        List<Map<String, Object>> resultList = new ArrayList<>();
+
+        List<String> ids = new ArrayList<>();
+
+        for (String[] strings : data2) {
+            Map<String, Object> object = new HashMap<>();
+            for (int i = 0; i < searchFields.size(); i++) {
+                TableField f = searchFields.get(i);
+                String name = f.getFieldName();
+                String data = strings[i];
+                if (data == null) {
+                    object.put(name, null);
+                    continue;
+                }
+
+                if (StringUtils.equals(key, name)) {
+                    ids.add(strings[i]);
+                }
+
+                ExtTableField.BaseType extFieldType = extTableFieldTypeMap.get(name);
+                if (extFieldType != null) {
+                    switch (extFieldType) {
+                        case number:
+                            object.put(name, NumberUtils.toLong(strings[i]));
+                            break;
+                        case decimal:
+                            object.put(name, new BigDecimal(strings[i]));
+                            break;
+                        case datetime:
+                            SimpleDateFormat sdf = new SimpleDateFormat(extDDLProvider.DEFAULT_DATE_FORMAT_STR);
+                            object.put(name, sdf.parse(strings[i]));
+                            break;
+                        default:
+                            object.put(name, strings[i]);
+                            break;
+                    }
+                } else {
+                    object.put(name, strings[i]);
+                }
+            }
+            result.add(object);
+        }
+
+
+        List<DataFillCommitLogDTO> list = new ArrayList<>();
+        if (CollectionUtils.isNotEmpty(ids)) {
+            list = extDataFillFormMapper.selectLatestLogByFormDataIds(dataFillForm.getId(), ids);
+        }
+        Map<String, DataFillCommitLogDTO> logMap = list.stream().collect(Collectors.toMap(log -> log.getFormId() + "__" + log.getDataId(), log -> log));
+
+        for (Map<String, Object> object : result) {
+            Map<String, Object> temp = new HashMap<>();
+            temp.put("data", object);
+            temp.put("logInfo", logMap.get(dataFillForm.getId() + "__" + object.get(key)));
+
+            resultList.add(temp);
+        }
+
+
+        return new DataFillFormTableDataResponse()
+                .setKey(key)
+                .setData(resultList)
+                .setFields(fields)
+                .setTotal(count)
+                .setPageSize(searchRequest.getPageSize())
+                .setCurrentPage(searchRequest.getCurrentPage());
+    }
+
+
+    public void deleteRowData(String formId, String id) throws Exception {
+        DataFillFormWithBLOBs dataFillForm = dataFillFormMapper.selectByPrimaryKey(formId);
+
+        if (StringUtils.equals(dataFillForm.getNodeType(), "folder")) {
+            return;
+        }
+        Datasource ds = datasource.get(dataFillForm.getDatasource());
+
+        ExtDDLProvider extDDLProvider = ProviderFactory.gerExtDDLProvider(ds.getType());
+
+        Provider datasourceProvider = ProviderFactory.getProvider(ds.getType());
+        DatasourceRequest datasourceRequest = new DatasourceRequest();
+        datasourceRequest.setDatasource(ds);
+        datasourceRequest.setTable(dataFillForm.getTableName());
+        List<TableField> tableFields = datasourceProvider.getTableFields(datasourceRequest).stream().filter(TableField::isPrimaryKey).collect(Collectors.toList());
+        if (CollectionUtils.isEmpty(tableFields)) {
+            throw new RuntimeException("没有主键");
+        }
+        TableField key = tableFields.get(0);
+
+        DatasourceRequest.TableFieldWithValue pk = new DatasourceRequest.TableFieldWithValue()
+                .setValue(id) //todo 有可能是数字
+                .setFiledName(key.getFieldName())
+                .setTypeName(key.getFieldType())
+                .setType(key.getType());
+
+        String deleteSql = extDDLProvider.deleteDataByIdSql(dataFillForm.getTableName(), pk);
+
+        datasourceRequest.setQuery(deleteSql);
+        datasourceRequest.setTableFieldWithValues(List.of(pk));
+
+        JdbcProvider jdbcProvider = CommonBeanFactory.getBean(JdbcProvider.class);
+        jdbcProvider.execWithPreparedStatement(datasourceRequest);
+
+        dataFillLogService.saveCommitOperation(DataFillLogService.COMMIT_OPERATE_DELETE, dataFillForm.getId(), id);
+
+    }
+
+    public String updateRowData(String formId, String rowId, Map<String, Object> data, boolean insert) throws Exception {
+        if (!CommonBeanFactory.getBean(AuthUserService.class).pluginLoaded()) {
+            DataEaseException.throwException("invalid");
+        }
+
+        if (rowId == null) {
+            insert = true;
+            //先默认主键是uuid
+            rowId = UUIDUtil.getUUIDAsString();
+        }
+
+        DataFillFormWithBLOBs dataFillForm = dataFillFormMapper.selectByPrimaryKey(formId);
+
+        List<ExtTableField> fields = gson.fromJson(dataFillForm.getForms(), new TypeToken<List<ExtTableField>>() {
+        }.getType());
+
+        Datasource ds = datasource.get(dataFillForm.getDatasource());
+        Provider datasourceProvider = ProviderFactory.getProvider(ds.getType());
+
+        DatasourceRequest datasourceRequest = new DatasourceRequest();
+        datasourceRequest.setDatasource(ds);
+        datasourceRequest.setTable(dataFillForm.getTableName());
+        List<TableField> tableFields = datasourceProvider.getTableFields(datasourceRequest);
+
+        Map<String, TableField> tableFieldMap = new HashMap<>();
+
+        List<DatasourceRequest.TableFieldWithValue> searchFields = new ArrayList<>();
+        List<DatasourceRequest.TableFieldWithValue> uniqueFields = new ArrayList<>();
+        Map<String, ExtTableField> extTableFields = new HashMap<>();
+
+        DatasourceRequest.TableFieldWithValue pk = null;
+        for (TableField tableField : tableFields) {
+            if (tableField.isPrimaryKey()) {
+                pk = new DatasourceRequest.TableFieldWithValue()
+                        .setValue(rowId)
+                        .setFiledName(tableField.getFieldName())
+                        .setTypeName(tableField.getFieldType())
+                        .setType(tableField.getType());
+                if (insert) {
+                    searchFields.add(pk);
+                }
+                continue;
+            }
+            tableFieldMap.put(tableField.getFieldName(), tableField);
+        }
+
+        for (ExtTableField field : fields) {
+            if (StringUtils.equalsIgnoreCase(field.getType(), "dateRange")) {
+                String name1 = field.getSettings().getMapping().getColumnName1();
+                String name2 = field.getSettings().getMapping().getColumnName2();
+                if (tableFieldMap.containsKey(name1) && data.containsKey(name1) && data.get(name1) != null) {
+                    DatasourceRequest.TableFieldWithValue value1 = new DatasourceRequest.TableFieldWithValue()
+                            .setValue(new java.sql.Date((long) data.get(name1)))
+                            .setFiledName(name1)
+                            .setTypeName(tableFieldMap.get(name1).getFieldType())
+                            .setType(tableFieldMap.get(name1).getType());
+                    searchFields.add(value1);
+                    extTableFields.put(name1, field);
+                }
+                if (tableFieldMap.containsKey(name2) && data.containsKey(name2) && data.get(name2) != null) {
+                    DatasourceRequest.TableFieldWithValue value2 = new DatasourceRequest.TableFieldWithValue()
+                            .setValue(new java.sql.Date((long) data.get(name2)))
+                            .setFiledName(name2)
+                            .setTypeName(tableFieldMap.get(name2).getFieldType())
+                            .setType(tableFieldMap.get(name2).getType());
+                    searchFields.add(value2);
+                    extTableFields.put(name2, field);
+                }
+            } else {
+                String name = field.getSettings().getMapping().getColumnName();
+                if (tableFieldMap.containsKey(name) && data.containsKey(name) && data.get(name) != null) {
+                    DatasourceRequest.TableFieldWithValue value = new DatasourceRequest.TableFieldWithValue()
+                            .setValue(data.get(name))
+                            .setFiledName(name)
+                            .setTypeName(tableFieldMap.get(name).getFieldType())
+                            .setType(tableFieldMap.get(name).getType());
+
+                    if (StringUtils.equalsIgnoreCase(field.getType(), "date")) {
+                        value.setValue(new java.sql.Date((long) data.get(name)));
+                    }
+                    searchFields.add(value);
+
+                    extTableFields.put(name, field);
+
+                    // 关于unique的字段判断
+                    if (field.getSettings().isUnique()) {
+
+                        uniqueFields.add(value);
+                    }
+                }
+            }
+        }
+
+        ExtDDLProvider extDDLProvider = ProviderFactory.gerExtDDLProvider(ds.getType());
+
+        if (CollectionUtils.isNotEmpty(uniqueFields)) {
+            for (DatasourceRequest.TableFieldWithValue uniqueField : uniqueFields) {
+
+                String sql = extDDLProvider.checkUniqueValueSql(dataFillForm.getTableName(), uniqueField, insert ? null : pk);
+                datasourceRequest.setQuery(sql);
+                List<DatasourceRequest.TableFieldWithValue> fs = new ArrayList<>();
+                fs.add(uniqueField);
+                if (!insert) {
+                    fs.add(pk);
+                }
+                datasourceRequest.setTableFieldWithValues(fs);
+                List<String[]> countData = datasourceProvider.getData(datasourceRequest);
+                long count = NumberUtils.toLong(countData.get(0)[0]);
+
+                if (count > 0) {
+                    DataEaseException.throwException(extTableFields.get(uniqueField.getFiledName()).getSettings().getName() + " 值不能重复");
+                }
+            }
+        }
+
+        String sql = insert ?
+                extDDLProvider.insertDataSql(dataFillForm.getTableName(), searchFields) :
+                extDDLProvider.updateDataByIdSql(dataFillForm.getTableName(), searchFields, pk);
+        datasourceRequest.setQuery(sql);
+
+        boolean skip = false;
+        if (!insert && CollectionUtils.isEmpty(searchFields)) {
+            //DataEaseException.throwException("没有修改");
+            skip = true;
+        }
+
+        JdbcProvider jdbcProvider = CommonBeanFactory.getBean(JdbcProvider.class);
+
+        // 主键在最后传进去
+        if (!insert) {
+            searchFields.add(pk);
+        }
+        datasourceRequest.setTableFieldWithValues(searchFields);
+
+        if (!skip) {
+            int result = jdbcProvider.execWithPreparedStatement(datasourceRequest);
+        }
+
+        if (insert) {
+            dataFillLogService.saveCommitOperation(DataFillLogService.COMMIT_OPERATE_INSERT, dataFillForm.getId(), rowId);
+        } else {
+            dataFillLogService.saveCommitOperation(DataFillLogService.COMMIT_OPERATE_UPDATE, dataFillForm.getId(), rowId);
+        }
+
+        return rowId;
+    }
+
+}
diff --git a/core/backend/src/main/java/io/dataease/service/datafill/DataFillLogService.java b/core/backend/src/main/java/io/dataease/service/datafill/DataFillLogService.java
new file mode 100644
index 0000000000..f14db1fe68
--- /dev/null
+++ b/core/backend/src/main/java/io/dataease/service/datafill/DataFillLogService.java
@@ -0,0 +1,51 @@
+package io.dataease.service.datafill;
+
+import io.dataease.commons.utils.AuthUtils;
+import io.dataease.controller.request.datafill.DataFillCommitLogSearchRequest;
+import io.dataease.dto.datafill.DataFillCommitLogDTO;
+import io.dataease.ext.ExtDataFillFormMapper;
+import io.dataease.plugins.common.base.domain.DataFillCommitLog;
+import io.dataease.plugins.common.base.mapper.DataFillCommitLogMapper;
+import org.pentaho.di.core.util.UUIDUtil;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import javax.annotation.Resource;
+import java.util.Date;
+import java.util.List;
+
+@Service
+@Transactional(rollbackFor = Exception.class)
+public class DataFillLogService {
+
+    @Resource
+    private ExtDataFillFormMapper extDataFillFormMapper;
+
+    @Resource
+    private DataFillCommitLogMapper dataFillCommitLogMapper;
+
+
+    public static final String COMMIT_OPERATE_INSERT = "INSERT";
+    public static final String COMMIT_OPERATE_UPDATE = "UPDATE";
+    public static final String COMMIT_OPERATE_DELETE = "DELETE";
+
+
+    public List<DataFillCommitLogDTO> commitLogs(String formId, DataFillCommitLogSearchRequest request) {
+
+
+        return extDataFillFormMapper.selectDataFillLogs(formId, request.getCommitByName());
+
+    }
+
+    public void saveCommitOperation(String operate, String formId, String dataId) {
+        DataFillCommitLog log = new DataFillCommitLog();
+        log.setId(UUIDUtil.getUUIDAsString());
+        log.setFormId(formId);
+        log.setDataId(dataId);
+        log.setCommitBy(AuthUtils.getUser().getUsername());
+        log.setOperate(operate);
+        log.setCommitTime(new Date());
+
+        dataFillCommitLogMapper.insertSelective(log);
+    }
+}
diff --git a/core/backend/src/main/java/io/dataease/service/datafill/DataFillService.java b/core/backend/src/main/java/io/dataease/service/datafill/DataFillService.java
new file mode 100644
index 0000000000..745c1eeb95
--- /dev/null
+++ b/core/backend/src/main/java/io/dataease/service/datafill/DataFillService.java
@@ -0,0 +1,334 @@
+package io.dataease.service.datafill;
+
+import com.google.common.reflect.TypeToken;
+import com.google.gson.Gson;
+import io.dataease.auth.annotation.DeCleaner;
+import io.dataease.auth.service.AuthUserService;
+import io.dataease.commons.constants.*;
+import io.dataease.commons.utils.*;
+import io.dataease.controller.ResultHolder;
+import io.dataease.controller.request.datafill.DataFillFormRequest;
+import io.dataease.dto.DatasourceDTO;
+import io.dataease.dto.datafill.DataFillFormDTO;
+import io.dataease.ext.ExtDataFillFormMapper;
+import io.dataease.i18n.Translator;
+import io.dataease.listener.util.CacheUtils;
+import io.dataease.plugins.common.base.domain.*;
+import io.dataease.plugins.common.base.mapper.DataFillFormMapper;
+import io.dataease.plugins.common.base.mapper.DataFillUserTaskMapper;
+import io.dataease.plugins.common.base.mapper.SysUserMapper;
+import io.dataease.plugins.common.dto.datafill.ExtIndexField;
+import io.dataease.plugins.common.dto.datafill.ExtTableField;
+import io.dataease.plugins.common.dto.datasource.TableField;
+import io.dataease.plugins.common.exception.DataEaseException;
+import io.dataease.plugins.common.request.datasource.DatasourceRequest;
+import io.dataease.plugins.datasource.provider.ExtDDLProvider;
+import io.dataease.plugins.datasource.provider.Provider;
+import io.dataease.plugins.datasource.provider.ProviderFactory;
+import io.dataease.provider.datasource.JdbcProvider;
+import io.dataease.service.datasource.DatasourceService;
+import io.dataease.service.sys.SysAuthService;
+import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.pentaho.di.core.util.UUIDUtil;
+import org.springframework.core.env.Environment;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.Assert;
+
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+@Service
+@Transactional(rollbackFor = Exception.class)
+public class DataFillService {
+
+    @Resource
+    private Environment env;
+    @Resource
+    private DataFillFormMapper dataFillFormMapper;
+    @Resource
+    private ExtDataFillFormMapper extDataFillFormMapper;
+    @Resource
+    private DatasourceService datasource;
+    @Resource
+    private SysAuthService sysAuthService;
+    @Resource
+    private SysUserMapper sysUserMapper;
+    @Resource
+    private DataFillTaskService dataFillTaskService;
+    @Resource
+    private DataFillDataService dataFillDataService;
+    @Resource
+    private DataFillUserTaskMapper dataFillUserTaskMapper;
+
+
+    private final static Gson gson = new Gson();
+
+
+    @DeCleaner(value = DePermissionType.DATA_FILL, key = "pid")
+    public ResultHolder saveForm(DataFillFormWithBLOBs dataFillForm) throws Exception {
+
+        if (!CommonBeanFactory.getBean(AuthUserService.class).pluginLoaded()) {
+            DataEaseException.throwException("invalid");
+        }
+
+        String uuid = UUIDUtil.getUUID().toString();
+
+        dataFillForm.setId(uuid);
+
+        checkName(uuid, dataFillForm.getName(), dataFillForm.getPid(), dataFillForm.getLevel(), dataFillForm.getNodeType(), DataFillConstants.OPT_TYPE_INSERT);
+
+        if (!StringUtils.equals(dataFillForm.getNodeType(), "folder")) {
+            List<ExtTableField> fields = gson.fromJson(dataFillForm.getForms(), new TypeToken<List<ExtTableField>>() {
+            }.getType());
+
+            List<ExtIndexField> indexes = new ArrayList<>();
+            if (dataFillForm.getCreateIndex()) {
+                indexes = gson.fromJson(dataFillForm.getTableIndexes(), new TypeToken<List<ExtIndexField>>() {
+                }.getType());
+            }
+
+            DatasourceDTO datasourceDTO = datasource.getDataSourceDetails(dataFillForm.getDatasource());
+
+            datasourceDTO.setConfiguration(new String(java.util.Base64.getDecoder().decode(datasourceDTO.getConfiguration())));
+
+            DatasourceRequest datasourceRequest = new DatasourceRequest();
+            datasourceRequest.setDatasource(datasourceDTO);
+            datasourceRequest.setQuery("SELECT VERSION()");
+
+            JdbcProvider jdbcProvider = CommonBeanFactory.getBean(JdbcProvider.class);
+            String version = jdbcProvider.getData(datasourceRequest).get(0)[0];
+
+            //拼sql
+            ExtDDLProvider extDDLProvider = ProviderFactory.gerExtDDLProvider(datasourceDTO.getType());
+            String sql = extDDLProvider.createTableSql(dataFillForm.getTableName(), fields);
+            //创建表
+            datasourceRequest.setQuery(sql);
+            jdbcProvider.exec(datasourceRequest);
+
+            if (dataFillForm.getCreateIndex()) {
+                try {
+                    List<String> sqls = extDDLProvider.createTableIndexSql(dataFillForm.getTableName(), indexes);
+
+                    for (String indexSql : sqls) {
+                        datasourceRequest.setQuery(indexSql);
+                        jdbcProvider.exec(datasourceRequest);
+                    }
+                } catch (Exception e) {
+                    // 执行到这里说明表已经建成功了，创建index出错，那就需要回滚删除创建的表
+                    datasourceRequest.setQuery(extDDLProvider.dropTableSql(dataFillForm.getTableName()));
+                    jdbcProvider.exec(datasourceRequest);
+
+                    throw e;
+                }
+
+            }
+        }
+
+        dataFillForm.setCreateBy(AuthUtils.getUser().getUsername());
+        dataFillForm.setUpdateBy(AuthUtils.getUser().getUsername());
+        Date current = new Date();
+        dataFillForm.setCreateTime(current);
+        dataFillForm.setUpdateTime(current);
+
+        dataFillFormMapper.insertSelective(dataFillForm);
+
+        // 清理权限缓存，应该不需要
+        //clearPermissionCache();
+
+        DeLogUtils.save(SysLogConstants.OPERATE_TYPE.CREATE, SysLogConstants.SOURCE_TYPE.DATA_FILL_FORM, dataFillForm.getId(), dataFillForm.getPid(), null, null);
+
+        sysAuthService.copyAuth(uuid, SysAuthConstants.AUTH_SOURCE_TYPE_DATA_FILLING);
+
+
+        return ResultHolder.success(uuid);
+    }
+
+    @DeCleaner(value = DePermissionType.DATA_FILL, key = "pid")
+    public ResultHolder updateForm(DataFillFormWithBLOBs dataFillForm) {
+
+        if (!CommonBeanFactory.getBean(AuthUserService.class).pluginLoaded()) {
+            DataEaseException.throwException("invalid");
+        }
+
+        Assert.notNull(dataFillForm.getId(), "id cannot be null");
+
+        dataFillForm.setUpdateTime(new Date());
+        dataFillFormMapper.updateByPrimaryKeySelective(dataFillForm);
+
+        DeLogUtils.save(SysLogConstants.OPERATE_TYPE.MODIFY, SysLogConstants.SOURCE_TYPE.DATA_FILL_FORM, dataFillForm.getId(), dataFillForm.getPid(), null, null);
+
+        return ResultHolder.success(dataFillForm.getId());
+    }
+
+    private void checkName(String id, String name, String pid, int level, String nodeType, String optType) {
+        DataFillFormExample example = new DataFillFormExample();
+        if (DataFillConstants.OPT_TYPE_INSERT.equalsIgnoreCase(optType)) {
+            example.createCriteria().andPidEqualTo(pid).andNameEqualTo(name).andNodeTypeEqualTo(nodeType);
+        } else if (DataFillConstants.OPT_TYPE_UPDATE.equalsIgnoreCase(optType)) {
+            example.createCriteria().andPidEqualTo(pid).andNameEqualTo(name).andIdNotEqualTo(id).andNodeTypeEqualTo(nodeType);
+        }
+
+        List<DataFillForm> checkResult = dataFillFormMapper.selectByExample(example);
+        if (CollectionUtils.isNotEmpty(checkResult)) {
+            DataEaseException.throwException(DataFillConstants.DATA_FILL_NODE_TYPE_DATA_FILL.equals(nodeType) ? Translator.get("I18N_DATA_FILL_FORM_EXIST") : Translator.get("I18N_FOlDER_EXIST"));
+        }
+    }
+
+    public List<DataFillFormDTO> tree(DataFillFormRequest request) {
+        if (!CommonBeanFactory.getBean(AuthUserService.class).pluginLoaded()) {
+            DataEaseException.throwException("invalid");
+        }
+
+        String userId = String.valueOf(AuthUtils.getUser().getUserId());
+        request.setUserId(userId);
+        List<DataFillFormDTO> list = extDataFillFormMapper.search(request);
+        return TreeUtils.mergeTree(list);
+
+    }
+
+    public DataFillFormWithBLOBs get(String id) {
+        if (!CommonBeanFactory.getBean(AuthUserService.class).pluginLoaded()) {
+            DataEaseException.throwException("invalid");
+        }
+
+        Assert.notNull(id, "id cannot be null");
+        return dataFillFormMapper.selectByPrimaryKey(id);
+    }
+
+    public DataFillFormDTO getWithPrivileges(String id) {
+        if (!CommonBeanFactory.getBean(AuthUserService.class).pluginLoaded()) {
+            DataEaseException.throwException("invalid");
+        }
+
+        Assert.notNull(id, "id cannot be null");
+        String userId = String.valueOf(AuthUtils.getUser().getUserId());
+        DataFillFormRequest request = new DataFillFormRequest();
+        request.setUserId(userId);
+        request.setId(id);
+        List<DataFillFormDTO> list = extDataFillFormMapper.search(request);
+        if (CollectionUtils.isEmpty(list)) {
+            return null;
+        }
+        DataFillFormDTO base = list.stream().filter(dto -> StringUtils.equals(dto.getId(), id)).collect(Collectors.toList()).get(0);
+        DataFillFormDTO result = new DataFillFormDTO();
+
+        BeanUtils.copyBean(result, get(id));
+
+        result.setPrivileges(base.getPrivileges());
+
+        SysUserExample userExample = new SysUserExample();
+        userExample.createCriteria().andUsernameEqualTo(result.getCreateBy());
+        List<SysUser> sysUsers = sysUserMapper.selectByExample(userExample);
+        if (CollectionUtils.isNotEmpty(sysUsers)) {
+            result.setCreatorName(sysUsers.get(0).getNickName());
+        }
+
+        Datasource d = datasource.get(result.getDatasource());
+        if (d != null) {
+            result.setDatasourceName(d.getName());
+        }
+
+        return result;
+    }
+
+    public void deleteForm(String id) throws Exception {
+        if (!CommonBeanFactory.getBean(AuthUserService.class).pluginLoaded()) {
+            DataEaseException.throwException("invalid");
+        }
+
+        Assert.notNull(id, "id cannot be null");
+        sysAuthService.checkTreeNoManageCount(SysAuthConstants.AUTH_SOURCE_TYPE_DATA_FILLING, id);
+
+        Map<String, String> stringStringMap = extDataFillFormMapper.searchChildrenIds(id, SysAuthConstants.AUTH_SOURCE_TYPE_DATA_FILLING);
+        String[] split = stringStringMap.get("ids").split(",");
+
+        DataFillFormWithBLOBs dataFillForm = dataFillFormMapper.selectByPrimaryKey(id);
+
+        List<String> ids = new ArrayList<>();
+        for (String dsId : split) {
+            if (StringUtils.isNotEmpty(dsId)) {
+                ids.add(dsId);
+            }
+        }
+        if (CollectionUtils.isNotEmpty(ids)) {
+            DataFillFormExample example = new DataFillFormExample();
+            example.createCriteria().andIdIn(ids);
+            dataFillFormMapper.deleteByExample(example);
+        }
+
+        DeLogUtils.save(SysLogConstants.OPERATE_TYPE.DELETE, SysLogConstants.SOURCE_TYPE.DATA_FILL_FORM, dataFillForm.getId(), dataFillForm.getPid(), null, null);
+
+        dataFillTaskService.deleteTaskByFormId(id);
+    }
+
+    public List<ExtTableField> listFields(String id) throws Exception {
+        DataFillFormWithBLOBs dataFillForm = dataFillFormMapper.selectByPrimaryKey(id);
+
+        if (StringUtils.equals(dataFillForm.getNodeType(), "folder")) {
+            return null;
+        }
+        return gson.fromJson(dataFillForm.getForms(), new TypeToken<List<ExtTableField>>() {
+        }.getType());
+    }
+
+
+    public void fillFormData(String userTaskId, Map<String, Object> data) throws Exception {
+        if (!CommonBeanFactory.getBean(AuthUserService.class).pluginLoaded()) {
+            DataEaseException.throwException("invalid");
+        }
+
+        DataFillUserTask task = dataFillUserTaskMapper.selectByPrimaryKey(userTaskId);
+
+        if (task == null) {
+            DataEaseException.throwException("任务不存在");
+        }
+
+        if (!AuthUtils.getUser().getUserId().equals(task.getUser())) {
+            DataEaseException.throwException("当前用户非任务用户");
+        }
+
+        if (task.getEndTime() != null) {
+            if (task.getEndTime().getTime() < System.currentTimeMillis()) {
+                DataEaseException.throwException("已经超过了任务截止时间");
+            }
+        }
+
+        String formId = task.getFormId();
+
+        String rowId = null;
+        if (StringUtils.isNotBlank(task.getValueId())) {
+            rowId = task.getValueId();
+        } else {
+            DataFillFormWithBLOBs dataFillForm = dataFillFormMapper.selectByPrimaryKey(formId);
+
+            Datasource ds = datasource.get(dataFillForm.getDatasource());
+            Provider datasourceProvider = ProviderFactory.getProvider(ds.getType());
+
+            DatasourceRequest datasourceRequest = new DatasourceRequest();
+            datasourceRequest.setDatasource(ds);
+            datasourceRequest.setTable(dataFillForm.getTableName());
+            List<TableField> tableFields = datasourceProvider.getTableFields(datasourceRequest);
+
+            for (TableField tableField : tableFields) {
+                if (tableField.isPrimaryKey()) {
+                    rowId = (String) data.get(tableField.getFieldName());
+                    break;
+                }
+            }
+        }
+
+        rowId = dataFillDataService.updateRowData(formId, rowId, data, rowId == null);
+
+        task.setValueId(rowId);
+        task.setFinishTime(new Date());
+
+        dataFillUserTaskMapper.updateByPrimaryKeySelective(task);
+    }
+
+}
diff --git a/core/backend/src/main/java/io/dataease/service/datafill/DataFillTaskService.java b/core/backend/src/main/java/io/dataease/service/datafill/DataFillTaskService.java
new file mode 100644
index 0000000000..96a0f4a93e
--- /dev/null
+++ b/core/backend/src/main/java/io/dataease/service/datafill/DataFillTaskService.java
@@ -0,0 +1,259 @@
+package io.dataease.service.datafill;
+
+import io.dataease.auth.service.AuthUserService;
+import io.dataease.commons.model.AuthURD;
+import io.dataease.commons.utils.AuthUtils;
+import io.dataease.commons.utils.CommonBeanFactory;
+import io.dataease.controller.request.datafill.DataFillTaskSearchRequest;
+import io.dataease.controller.request.datafill.DataFillUserTaskSearchRequest;
+import io.dataease.dto.datafill.DataFillTaskDTO;
+import io.dataease.dto.datafill.DataFillUserTaskDTO;
+import io.dataease.ext.ExtDataFillFormMapper;
+import io.dataease.job.sechedule.ScheduleManager;
+import io.dataease.job.sechedule.strategy.TaskHandler;
+import io.dataease.job.sechedule.strategy.TaskStrategyFactory;
+import io.dataease.plugins.common.base.domain.*;
+import io.dataease.plugins.common.base.mapper.DataFillTaskMapper;
+import io.dataease.plugins.common.base.mapper.DataFillUserTaskMapper;
+import io.dataease.plugins.common.base.mapper.SysUserMapper;
+import io.dataease.plugins.common.entity.GlobalTaskEntity;
+import io.dataease.plugins.common.exception.DataEaseException;
+import org.apache.commons.lang3.StringUtils;
+import org.pentaho.di.core.util.UUIDUtil;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import javax.annotation.Resource;
+import java.text.SimpleDateFormat;
+import java.util.*;
+import java.util.stream.Collectors;
+
+@Service
+@Transactional(rollbackFor = Exception.class)
+public class DataFillTaskService {
+
+    @Resource
+    private ExtDataFillFormMapper extDataFillFormMapper;
+
+    @Resource
+    private DataFillTaskMapper dataFillTaskMapper;
+    @Resource
+    private DataFillUserTaskMapper dataFillUserTaskMapper;
+
+    @Resource
+    private SysUserMapper sysUserMapper;
+
+    @Resource
+    private ScheduleManager scheduleManager;
+
+
+    public List<DataFillTaskDTO> tasks(String formId, DataFillTaskSearchRequest request) {
+        request.setFormId(formId);
+        return extDataFillFormMapper.selectDataFillTasks(request);
+    }
+
+    private List<DataFillTask> listActiveTasks() {
+        return extDataFillFormMapper.selectActiveDataFillTasks();
+    }
+
+    public List<GlobalTaskEntity> listActiveTasksGlobalTaskEntity() {
+        List<GlobalTaskEntity> list = new ArrayList<>();
+        List<DataFillTask> tasks = dataFillTaskMapper.selectByExample(null);
+        for (DataFillTask task : tasks) {
+            list.add(getGlobalTaskEntity(task));
+        }
+        return list;
+    }
+
+    private GlobalTaskEntity getGlobalTaskEntity(DataFillTask task) {
+        GlobalTaskEntity entity = new GlobalTaskEntity()
+                .setTaskId(task.getId())
+                .setTaskName(task.getName())
+                .setRateType(task.getRateType())
+                .setRateVal(task.getRateVal())
+                .setStatus(task.getStatus())
+                .setTaskType("dataFillTaskHandler")
+                .setCreator(task.getCreator());
+        if (task.getRateType() == -1) {
+            entity.setStartTime(task.getPublishStartTime() == null ? null : task.getPublishStartTime().getTime());
+            entity.setEndTime(task.getPublishEndTime() == null ? null : task.getPublishEndTime().getTime());
+        } else {
+            entity.setStartTime(task.getStartTime() == null ? null : task.getStartTime().getTime());
+            entity.setEndTime(task.getEndTime() == null ? null : task.getEndTime().getTime());
+        }
+        return entity;
+    }
+
+    public void saveTask(String formId, DataFillTaskSearchRequest request) throws Exception {
+        if (!CommonBeanFactory.getBean(AuthUserService.class).pluginLoaded()) {
+            DataEaseException.throwException("invalid");
+        }
+
+        request.setCreator(AuthUtils.getUser().getUserId());
+        boolean insert = false;
+        if (request.getId() == null) {
+            insert = true;
+            request.setFormId(formId);
+        }
+
+        if (insert) {
+            dataFillTaskMapper.insertSelective(request);
+        } else {
+            dataFillTaskMapper.updateByPrimaryKeySelective(request);
+        }
+
+        DataFillTaskWithBLOBs task = dataFillTaskMapper.selectByPrimaryKey(request.getId());
+
+
+        GlobalTaskEntity entity = getGlobalTaskEntity(task);
+        TaskHandler taskHandler = TaskStrategyFactory.getInvokeStrategy(entity.getTaskType());
+        taskHandler.addTask(scheduleManager, entity);
+
+    }
+
+    public DataFillTaskWithBLOBs getTaskById(Long id) {
+        return dataFillTaskMapper.selectByPrimaryKey(id);
+    }
+
+    public void finishTask(Long id) {
+        DataFillTaskWithBLOBs task = new DataFillTaskWithBLOBs();
+        task.setId(id);
+        task.setStatus(false);
+        dataFillTaskMapper.updateByPrimaryKeySelective(task);
+    }
+
+    public void deleteTaskByFormId(String formId) {
+        DataFillTaskExample example = new DataFillTaskExample();
+        example.createCriteria().andFormIdEqualTo(formId);
+        for (DataFillTask dataFillTask : dataFillTaskMapper.selectByExample(example)) {
+            deleteTask(dataFillTask.getId());
+        }
+    }
+
+    public void deleteTask(Long id) {
+
+        try {
+            GlobalTaskEntity entity = getGlobalTaskEntity(dataFillTaskMapper.selectByPrimaryKey(id));
+            TaskHandler taskHandler = TaskStrategyFactory.getInvokeStrategy(entity.getTaskType());
+            taskHandler.removeTask(scheduleManager, entity);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+
+        dataFillTaskMapper.deleteByPrimaryKey(id);
+
+        DataFillUserTaskExample example = new DataFillUserTaskExample();
+        example.createCriteria().andTaskIdEqualTo(id);
+        dataFillUserTaskMapper.deleteByExample(example);
+
+    }
+
+    public void enableTask(Long taskId) throws Exception {
+        DataFillTask task = dataFillTaskMapper.selectByPrimaryKey(taskId);
+        DataFillTaskSearchRequest request = new DataFillTaskSearchRequest();
+        request.setId(taskId);
+        request.setStatus(true);
+        saveTask(task.getFormId(), request);
+    }
+
+    public void disableTask(Long taskId) throws Exception {
+        DataFillTask task = dataFillTaskMapper.selectByPrimaryKey(taskId);
+        DataFillTaskSearchRequest request = new DataFillTaskSearchRequest();
+        request.setId(taskId);
+        request.setStatus(false);
+        saveTask(task.getFormId(), request);
+    }
+
+    public void createUserTasks(DataFillTaskWithBLOBs dataFillTask, String valueId) throws Exception {
+        String reciUsers = dataFillTask.getReciUsers();
+        List<String> accountSet = new ArrayList<>();
+        if (StringUtils.isNotBlank(reciUsers)) {
+            accountSet.addAll(Arrays.stream(reciUsers.split(",")).collect(Collectors.toSet()));
+        }
+        List<SysUser> sysUsers = new ArrayList<>();
+        if (!accountSet.isEmpty()) {
+            SysUserExample example = new SysUserExample();
+            example.createCriteria().andUsernameIn(accountSet);
+            sysUsers = sysUserMapper.selectByExample(example);
+        }
+
+
+        String roleList = dataFillTask.getRoleList();
+        String orgList = dataFillTask.getOrgList();
+        AuthURD authURD = new AuthURD();
+        if (StringUtils.isNotBlank(roleList)) {
+            authURD.setRoleIds(Arrays.stream(roleList.split(",")).map(Long::parseLong).collect(Collectors.toList()));
+        }
+        if (StringUtils.isNotBlank(orgList)) {
+            authURD.setDeptIds(Arrays.stream(orgList.split(",")).map(Long::parseLong).collect(Collectors.toList()));
+        }
+        Set<Long> ids = AuthUtils.userIdsByURD(authURD);
+
+        for (SysUser sysUser : sysUsers) {
+            ids.add(sysUser.getUserId());
+        }
+
+        Date startTime = null;
+        Date endTime = null;
+
+        if (dataFillTask.getRateType() == -1) {
+            startTime = dataFillTask.getPublishStartTime();
+            endTime = dataFillTask.getPublishEndTime();
+        } else {
+            SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+            Date val = sdf.parse(dataFillTask.getRateVal());
+            Calendar calendar = Calendar.getInstance();
+            calendar.setTime(val);
+
+            Calendar current = Calendar.getInstance();
+            calendar.set(Calendar.YEAR, current.get(Calendar.YEAR));
+            calendar.set(Calendar.MONTH, current.get(Calendar.MONTH));
+            calendar.set(Calendar.DAY_OF_MONTH, current.get(Calendar.DAY_OF_MONTH));
+
+            startTime = calendar.getTime();
+
+            if (dataFillTask.getPublishRangeTimeType() == -1) {
+                calendar.add(Calendar.HOUR_OF_DAY, dataFillTask.getPublishRangeTime());
+            } else if (dataFillTask.getPublishRangeTimeType() == 0) {
+                calendar.add(Calendar.DAY_OF_MONTH, dataFillTask.getPublishRangeTime());
+            } else if (dataFillTask.getPublishRangeTimeType() == 1) {
+                calendar.add(Calendar.WEEK_OF_YEAR, dataFillTask.getPublishRangeTime());
+            } else if (dataFillTask.getPublishRangeTimeType() == 2) {
+                calendar.add(Calendar.MONTH, dataFillTask.getPublishRangeTime());
+            }
+            endTime = calendar.getTime();
+        }
+
+        for (Long id : ids) {
+            DataFillUserTask task = new DataFillUserTask();
+            task.setId(UUIDUtil.getUUIDAsString());
+            task.setTaskId(dataFillTask.getId());
+            task.setFormId(dataFillTask.getFormId());
+            task.setUser(id);
+            task.setStartTime(startTime);
+            task.setEndTime(endTime);
+            task.setValueId(valueId);
+
+            dataFillUserTaskMapper.insertSelective(task);
+        }
+
+    }
+
+
+    public List<DataFillUserTaskDTO> userTasks(Long userId, String type, DataFillUserTaskSearchRequest request) {
+        List<DataFillUserTaskDTO> list = new ArrayList<>();
+
+        String taskName = StringUtils.isNotBlank(request.getTaskName()) ? request.getTaskName() : null;
+
+        if (StringUtils.equalsIgnoreCase(type, "finished")) {
+            list = extDataFillFormMapper.listFinishedUserTask(userId, taskName);
+        } else if (StringUtils.equalsIgnoreCase(type, "expired")) {
+            list = extDataFillFormMapper.listExpiredUserTask(userId, new Date(), taskName);
+        } else {
+            list = extDataFillFormMapper.listTodoUserTask(userId, new Date(), taskName);
+        }
+
+        return list;
+
+    }
+}
diff --git a/core/backend/src/main/java/io/dataease/service/decatch/DeCatchProcess.java b/core/backend/src/main/java/io/dataease/service/decatch/DeCatchProcess.java
index 1d1d549e92..e6603d90d5 100644
--- a/core/backend/src/main/java/io/dataease/service/decatch/DeCatchProcess.java
+++ b/core/backend/src/main/java/io/dataease/service/decatch/DeCatchProcess.java
@@ -62,6 +62,18 @@ public class DeCatchProcess {
             cleanCacheParent(resourceId.toString(), "link");
         });
     }
+    public void cleanDataFiling(Object pid) {
+        CurrentUserDto user = AuthUtils.getUser();
+        CacheUtils.remove(AuthConstants.USER_DATA_FILL_NAME, "user" + user.getUserId());
+        CacheUtils.remove(AuthConstants.DEPT_DATA_FILL_NAME, "dept" + user.getDeptId());
+        user.getRoles().forEach(role -> {
+            CacheUtils.remove(AuthConstants.ROLE_DATA_FILL_NAME, "role" + role.getId());
+        });
+
+        Optional.ofNullable(pid).ifPresent(resourceId -> {
+            cleanCacheParent(resourceId.toString(), "data_fill");
+        });
+    }
 
     private void cleanCacheParent(String pid, String type) {
         if (StringUtils.isBlank(pid) || StringUtils.isBlank(type)) {
diff --git a/core/backend/src/main/java/io/dataease/service/panel/PanelLinkService.java b/core/backend/src/main/java/io/dataease/service/panel/PanelLinkService.java
index 82cd185411..28ec8bde3d 100644
--- a/core/backend/src/main/java/io/dataease/service/panel/PanelLinkService.java
+++ b/core/backend/src/main/java/io/dataease/service/panel/PanelLinkService.java
@@ -11,6 +11,7 @@ import io.dataease.commons.utils.ServletUtils;
 import io.dataease.controller.request.panel.link.*;
 import io.dataease.dto.panel.PanelGroupDTO;
 import io.dataease.dto.panel.link.GenerateDto;
+import io.dataease.dto.panel.link.TicketDto;
 import io.dataease.ext.ExtPanelGroupMapper;
 import io.dataease.ext.ExtPanelLinkMapper;
 import io.dataease.plugins.common.base.domain.*;
@@ -128,13 +129,13 @@ public class PanelLinkService {
         }
     }
 
-    public String getMappingUuid(PanelLink link) {
+    public PanelLinkMapping getMapping(PanelLink link) {
         String resourceId = link.getResourceId();
         Long userId = link.getUserId();
         PanelLinkMappingExample example = new PanelLinkMappingExample();
         example.createCriteria().andResourceIdEqualTo(resourceId).andUserIdEqualTo(userId);
         List<PanelLinkMapping> mappings = panelLinkMappingMapper.selectByExample(example);
-        if (CollectionUtils.isNotEmpty(mappings)) return mappings.get(0).getUuid();
+        if (CollectionUtils.isNotEmpty(mappings)) return mappings.get(0);
         return null;
     }
 
@@ -291,8 +292,12 @@ public class PanelLinkService {
                 PanelLinkTicketExample example = new PanelLinkTicketExample();
                 example.createCriteria().andTicketEqualTo(ticket);
                 if (creator.isGenerateNew()) {
+                    ticketEntity.setAccessTime(null);
                     ticketEntity.setTicket(CodingUtil.shortUuid());
                 }
+                ticketEntity.setArgs(creator.getArgs());
+                ticketEntity.setExp(creator.getExp());
+                ticketEntity.setUuid(creator.getUuid());
                 panelLinkTicketMapper.updateByExample(ticketEntity, example);
                 return ticketEntity.getTicket();
             }
@@ -317,7 +322,15 @@ public class PanelLinkService {
         panelLinkTicketMapper.deleteByExample(example);
     }
 
-
+    public void switchRequire(TicketSwitchRequest request) {
+        String resourceId = request.getResourceId();
+        Boolean require = request.getRequire();
+        PanelLinkMappingExample example = new PanelLinkMappingExample();
+        example.createCriteria().andResourceIdEqualTo(resourceId).andUserIdEqualTo(AuthUtils.getUser().getUserId());
+        PanelLinkMapping mapping = new PanelLinkMapping();
+        mapping.setRequireTicket(require);
+        panelLinkMappingMapper.updateByExampleSelective(mapping, example);
+    }
 
     public PanelLinkTicket getByTicket(String ticket) {
         PanelLinkTicketExample example = new PanelLinkTicketExample();
@@ -354,4 +367,37 @@ public class PanelLinkService {
         PanelLink one = findOne(resourceId, userId);
         return convertDto(one, uuid, mapping.getRequireTicket()).getUri();
     }
+
+    public TicketDto validateTicket(String ticket, PanelLinkMapping mapping) {
+        String uuid = mapping.getUuid();
+        TicketDto ticketDto = new TicketDto();
+        if (StringUtils.isBlank(ticket)) {
+            ticketDto.setTicketValid(!mapping.getRequireTicket());
+            return ticketDto;
+        }
+        PanelLinkTicketExample example = new PanelLinkTicketExample();
+        example.createCriteria().andTicketEqualTo(ticket).andUuidEqualTo(uuid);
+        List<PanelLinkTicket> tickets = panelLinkTicketMapper.selectByExample(example);
+        if (CollectionUtils.isEmpty(tickets)) {
+            ticketDto.setTicketValid(false);
+            return ticketDto;
+        }
+        PanelLinkTicket linkTicket = tickets.get(0);
+        ticketDto.setTicketValid(true);
+        ticketDto.setArgs(linkTicket.getArgs());
+        Long accessTime = linkTicket.getAccessTime();
+        long now = System.currentTimeMillis();
+        if (ObjectUtils.isEmpty(accessTime)) {
+            accessTime = now;
+            ticketDto.setTicketExp(false);
+            linkTicket.setAccessTime(accessTime);
+            panelLinkTicketMapper.updateByPrimaryKey(linkTicket);
+            return ticketDto;
+        }
+        Long exp = linkTicket.getExp();
+        long expTime = exp * 60L * 1000L;
+        long time = now - accessTime;
+        ticketDto.setTicketExp(time > expTime);
+        return ticketDto;
+    }
 }
diff --git a/core/backend/src/main/resources/application.properties b/core/backend/src/main/resources/application.properties
index 1683cb9987..866b9e1adb 100644
--- a/core/backend/src/main/resources/application.properties
+++ b/core/backend/src/main/resources/application.properties
@@ -81,6 +81,7 @@ server.servlet.context-parameters.configurationStrategy=SYSTEM_PROPERTIES
 server.servlet.session.cookie.http-only=true
 server.servlet.session.tracking-modes=cookie
 spring.jackson.parser.allow-numeric-leading-zeros=true
+logging.level.org.apache.shiro=OFF
 
 
 
diff --git a/core/backend/src/main/resources/db/migration/V62__1.18.18.sql b/core/backend/src/main/resources/db/migration/V62__1.18.18.sql
index 4d2f74ea56..0deb306377 100644
--- a/core/backend/src/main/resources/db/migration/V62__1.18.18.sql
+++ b/core/backend/src/main/resources/db/migration/V62__1.18.18.sql
@@ -4,11 +4,12 @@
 DROP TABLE IF EXISTS `panel_link_ticket`;
 CREATE TABLE `panel_link_ticket`
 (
-    `id`     bigint       NOT NULL AUTO_INCREMENT,
-    `uuid`   varchar(255) NOT NULL,
-    `ticket` varchar(255) NOT NULL,
-    `exp`    bigint       DEFAULT NULL,
-    `args`   varchar(255) DEFAULT NULL,
+    `id`          bigint       NOT NULL AUTO_INCREMENT,
+    `uuid`        varchar(255) NOT NULL,
+    `ticket`      varchar(255) NOT NULL,
+    `exp`         bigint       DEFAULT NULL,
+    `args`        varchar(255) DEFAULT NULL,
+    `access_time` bigint       DEFAULT NULL,
     PRIMARY KEY (`id`)
 ) ENGINE = InnoDB
   AUTO_INCREMENT = 1;
diff --git a/core/backend/src/main/resources/db/migration/V63__1.18.18-data-fill.sql b/core/backend/src/main/resources/db/migration/V63__1.18.18-data-fill.sql
new file mode 100644
index 0000000000..ac15281721
--- /dev/null
+++ b/core/backend/src/main/resources/db/migration/V63__1.18.18-data-fill.sql
@@ -0,0 +1,310 @@
+DROP TABLE IF EXISTS `data_fill_form`;
+create table data_fill_form
+(
+    id            varchar(50)                            not null comment '主键ID'
+        primary key,
+    name          varchar(255)                           null comment '名称',
+    pid           varchar(255)                           null comment '父级ID',
+    level         int(10)                                null comment '层级',
+    node_type     varchar(255)                           null comment 'folder/panel 目录或文件夹',
+    table_name    varchar(255)                           null comment '表名',
+    datasource    varchar(255)                           null comment '数据源',
+    forms         longtext                               null comment '表单内容',
+    create_index  tinyint(1) default 0                   null comment '是否创建索引',
+    table_indexes longtext                               null comment '索引',
+    create_by     varchar(255)                           null comment '创建人',
+    create_time   datetime   default current_timestamp() null comment '创建时间',
+    update_by     varchar(255)                           null comment '更新人',
+    update_time   datetime   default current_timestamp() null comment '更新时间'
+)
+    comment '数据填报表单';
+
+CREATE TRIGGER `delete_auth_data_fill_form`
+    AFTER DELETE
+    ON `data_fill_form`
+    FOR EACH ROW select delete_auth_source(OLD.id, 'data_fill')
+                 into @ee;
+
+
+DROP VIEW IF EXISTS `v_auth_model`;
+CREATE ALGORITHM = UNDEFINED SQL SECURITY DEFINER VIEW `v_auth_model` AS
+SELECT `sys_user`.`user_id`                                            AS `id`,
+       concat(`sys_user`.`nick_name`, '（', `sys_user`.`username`, '）') AS `name`,
+       `sys_user`.`username`                                           AS `label`,
+       '0'                                                             AS `pid`,
+       'leaf'                                                          AS `node_type`,
+       'user'                                                          AS `model_type`,
+       'user'                                                          AS `model_inner_type`,
+       'target'                                                        AS `auth_type`,
+       `sys_user`.`create_by`                                          AS `create_by`,
+       0                                                               AS `level`,
+       0                                                               AS `mode`,
+       '0'                                                             AS `data_source_id`
+FROM `sys_user`
+WHERE (`sys_user`.`is_admin` <> 1)
+UNION ALL
+SELECT `sys_role`.`role_id`   AS `id`,
+       `sys_role`.`name`      AS `name`,
+       `sys_role`.`name`      AS `label`,
+       '0'                    AS `pid`,
+       'leaf'                 AS `node_type`,
+       'role'                 AS `model_type`,
+       'role'                 AS `model_inner_type`,
+       'target'               AS `auth_type`,
+       `sys_role`.`create_by` AS `create_by`,
+       0                      AS `level`,
+       0                      AS `mode`,
+       '0'                    AS `data_source_id`
+FROM `sys_role`
+UNION ALL
+SELECT `sys_dept`.`dept_id`                                AS `id`,
+       `sys_dept`.`name`                                   AS `name`,
+       `sys_dept`.`name`                                   AS `label`,
+       (
+               cast(`sys_dept`.`pid` AS CHAR charset utf8mb4) COLLATE utf8mb4_general_ci
+           )                                               AS `pid`,
+       IF
+           ((`sys_dept`.`sub_count` = 0), 'leaf', 'spine') AS `node_type`,
+       'dept'                                              AS `model_type`,
+       'dept'                                              AS `model_inner_type`,
+       'target'                                            AS `auth_type`,
+       `sys_dept`.`create_by`                              AS `create_by`,
+       0                                                   AS `level`,
+       0                                                   AS `mode`,
+       '0'                                                 AS `data_source_id`
+FROM `sys_dept`
+UNION ALL
+SELECT `datasource`.`id`        AS `id`,
+       `datasource`.`name`      AS `NAME`,
+       `datasource`.`name`      AS `label`,
+       '0'                      AS `pid`,
+       'leaf'                   AS `node_type`,
+       'link'                   AS `model_type`,
+       `datasource`.`type`      AS `model_inner_type`,
+       'source'                 AS `auth_type`,
+       `datasource`.`create_by` AS `create_by`,
+       0                        AS `level`,
+       0                        AS `mode`,
+       '0'                      AS `data_source_id`
+FROM `datasource`
+UNION ALL
+SELECT `dataset_group`.`id`                                            AS `id`,
+       `dataset_group`.`name`                                          AS `NAME`,
+       `dataset_group`.`name`                                          AS `label`,
+       IF
+           (isnull(`dataset_group`.`pid`), '0', `dataset_group`.`pid`) AS `pid`,
+       'spine'                                                         AS `node_type`,
+       'dataset'                                                       AS `model_type`,
+       `dataset_group`.`type`                                          AS `model_inner_type`,
+       'source'                                                        AS `auth_type`,
+       `dataset_group`.`create_by`                                     AS `create_by`,
+       `dataset_group`.`level`                                         AS `level`,
+       0                                                               AS `mode`,
+       '0'                                                             AS `data_source_id`
+FROM `dataset_group`
+UNION ALL
+SELECT `data_fill_form`.`id`                                            AS `id`,
+       `data_fill_form`.`name`                                          AS `NAME`,
+       `data_fill_form`.`name`                                          AS `label`,
+       (
+           CASE
+               `data_fill_form`.`id`
+               WHEN 'data_fill_list' THEN
+                   '0'
+               WHEN 'default_data_fill' THEN
+                   '0'
+               ELSE `data_fill_form`.`pid`
+               END
+           )                                                            AS `pid`,
+       IF
+           ((`data_fill_form`.`node_type` = 'folder'), 'spine', 'leaf') AS `node_type`,
+       'data_fill'                                                      AS `model_type`,
+       'form'                                                           AS `model_inner_type`,
+       'source'                                                         AS `auth_type`,
+       `data_fill_form`.`create_by`                                     AS `create_by`,
+       `data_fill_form`.`level`                                         AS `level`,
+       0                                                                AS `mode`,
+       '0'                                                              AS `data_source_id`
+FROM `data_fill_form`
+UNION ALL
+SELECT `dataset_table`.`id`             AS `id`,
+       `dataset_table`.`name`           AS `NAME`,
+       `dataset_table`.`name`           AS `label`,
+       `dataset_table`.`scene_id`       AS `pid`,
+       'leaf'                           AS `node_type`,
+       'dataset'                        AS `model_type`,
+       `dataset_table`.`type`           AS `model_inner_type`,
+       'source'                         AS `auth_type`,
+       `dataset_table`.`create_by`      AS `create_by`,
+       0                                AS `level`,
+       `dataset_table`.`mode`           AS `mode`,
+       `dataset_table`.`data_source_id` AS `data_source_id`
+FROM `dataset_table`
+UNION ALL
+SELECT `panel_group`.`id`                                            AS `id`,
+       `panel_group`.`name`                                          AS `NAME`,
+       `panel_group`.`name`                                          AS `label`,
+       (
+           CASE
+               `panel_group`.`id`
+               WHEN 'panel_list' THEN
+                   '0'
+               WHEN 'default_panel' THEN
+                   '0'
+               ELSE `panel_group`.`pid`
+               END
+           )                                                         AS `pid`,
+       IF
+           ((`panel_group`.`node_type` = 'folder'), 'spine', 'leaf') AS `node_type`,
+       'panel'                                                       AS `model_type`,
+       `panel_group`.`panel_type`                                    AS `model_inner_type`,
+       'source'                                                      AS `auth_type`,
+       `panel_group`.`create_by`                                     AS `create_by`,
+       0                                                             AS `level`,
+       0                                                             AS `mode`,
+       '0'                                                           AS `data_source_id`
+FROM `panel_group`
+UNION ALL
+SELECT `sys_menu`.`menu_id`                                AS `menu_id`,
+       `sys_menu`.`title`                                  AS `name`,
+       `sys_menu`.`title`                                  AS `label`,
+       `sys_menu`.`pid`                                    AS `pid`,
+       IF
+           ((`sys_menu`.`sub_count` > 0), 'spine', 'leaf') AS `node_type`,
+       'menu'                                              AS `model_type`,
+       (
+           CASE
+               `sys_menu`.`type`
+               WHEN 0 THEN
+                   'folder'
+               WHEN 1 THEN
+                   'menu'
+               WHEN 2 THEN
+                   'button'
+               END
+           )                                               AS `model_inner_type`,
+       'source'                                            AS `auth_type`,
+       `sys_menu`.`create_by`                              AS `create_by`,
+       0                                                   AS `level`,
+       0                                                   AS `mode`,
+       '0'                                                 AS `data_source_id`
+FROM `sys_menu`
+WHERE ((
+           `sys_menu`.`i_frame` <> 1
+           )
+    OR isnull(`sys_menu`.`i_frame`))
+UNION ALL
+SELECT `plugin_sys_menu`.`menu_id`                                AS `menu_id`,
+       `plugin_sys_menu`.`title`                                  AS `name`,
+       `plugin_sys_menu`.`title`                                  AS `label`,
+       `plugin_sys_menu`.`pid`                                    AS `pid`,
+       IF
+           ((`plugin_sys_menu`.`sub_count` > 0), 'spine', 'leaf') AS `node_type`,
+       'menu'                                                     AS `model_type`,
+       (
+           CASE
+               `plugin_sys_menu`.`type`
+               WHEN 0 THEN
+                   'folder'
+               WHEN 1 THEN
+                   'menu'
+               WHEN 2 THEN
+                   'button'
+               END
+           )                                                      AS `model_inner_type`,
+       'source'                                                   AS `auth_type`,
+       `plugin_sys_menu`.`create_by`                              AS `create_by`,
+       0                                                          AS `level`,
+       0                                                          AS `mode`,
+       '0'                                                        AS `data_source_id`
+FROM `plugin_sys_menu`
+WHERE ((
+           `plugin_sys_menu`.`i_frame` <> 1
+           )
+    OR isnull(`plugin_sys_menu`.`i_frame`));
+
+
+INSERT INTO `sys_auth_detail` (`id`, `auth_id`, `privilege_name`, `privilege_type`, `privilege_value`,
+                               `privilege_extend`, `remark`, `create_user`, `create_time`, `update_time`, `copy_from`,
+                               `copy_id`)
+VALUES ('data_fill_grant', 'data_fill', 'i18n_auth_grant', 15, 0, 'grant', '基础权限-授权', 'system', NULL, NULL, NULL,
+        NULL);
+INSERT INTO `sys_auth_detail` (`id`, `auth_id`, `privilege_name`, `privilege_type`, `privilege_value`,
+                               `privilege_extend`, `remark`, `create_user`, `create_time`, `update_time`, `copy_from`,
+                               `copy_id`)
+VALUES ('data_fill_manage', 'data_fill', 'i18n_auth_manage', 3, 0, 'manage', '基础权限-管理', 'system', NULL, NULL,
+        NULL, NULL);
+INSERT INTO `sys_auth_detail` (`id`, `auth_id`, `privilege_name`, `privilege_type`, `privilege_value`,
+                               `privilege_extend`, `remark`, `create_user`, `create_time`, `update_time`, `copy_from`,
+                               `copy_id`)
+VALUES ('data_fill_use', 'data_fill', 'i18n_auth_use', 1, 0, 'use', '基础权限-使用', 'system', NULL, NULL, NULL, NULL);
+
+
+
+DROP TABLE IF EXISTS `data_fill_commit_log`;
+create table data_fill_commit_log
+(
+    id          varchar(50)                          not null
+        primary key,
+    form_id     varchar(50)                          not null,
+    data_id     varchar(255)                         null,
+    operate     varchar(50)                          not null,
+    commit_by   varchar(255)                         not null,
+    commit_time datetime default current_timestamp() null
+);
+
+create index data_fill_commit_log_form_id_index
+    on data_fill_commit_log (form_id);
+
+
+DROP TABLE IF EXISTS `data_fill_task`;
+create table data_fill_task
+(
+    id                      bigint auto_increment comment '任务ID'
+        primary key,
+    name                    varchar(255)                           not null comment '任务名称',
+    form_id                 varchar(100)                           not null comment '任务ID',
+    start_time              datetime                               null comment '开始时间',
+    end_time                datetime                               null comment '结束时间',
+    rate_type               int(10)                                not null comment '频率方式',
+    rate_val                varchar(255)                           null comment '频率值',
+    publish_start_time      datetime                               null,
+    publish_end_time        datetime                               null,
+    publish_range_time_type int                                    null,
+    publish_range_time      int                                    null,
+    creator                 bigint                                 not null comment '创建者ID',
+    create_time             datetime   default current_timestamp() null comment '创建时间',
+    status                  tinyint(1) default 1                   null comment '运行状态',
+    reci_users              longtext                               null comment '接收人账号',
+    role_list               longtext                               null comment '收件角色',
+    org_list                longtext                               null comment '收件组织'
+)
+    comment '数据填报任务';
+
+create index data_fill_task_form_id_index
+    on data_fill_task (form_id);
+
+
+DROP TABLE IF EXISTS `data_fill_user_task`;
+create table data_fill_user_task
+(
+    id          varchar(50)  not null comment 'ID'
+        primary key,
+    task_id     bigint       not null comment '任务ID',
+    form_id     varchar(100) not null comment '表单ID',
+    value_id    varchar(100) null comment '表内值ID',
+    user        bigint       not null comment '用户ID',
+    start_time  datetime     null comment '开始时间',
+    end_time    datetime     null comment '结束时间',
+    finish_time datetime     null comment '完成时间'
+)
+    comment '数据填报用户任务';
+
+create index data_fill_user_task_form_id_index
+    on data_fill_user_task (form_id);
+
+create index data_fill_user_task_task_id_index
+    on data_fill_user_task (task_id);
+
+
+
diff --git a/core/backend/src/main/resources/i18n/messages_en_US.properties b/core/backend/src/main/resources/i18n/messages_en_US.properties
index 7648cb59c8..75475a6cbc 100644
--- a/core/backend/src/main/resources/i18n/messages_en_US.properties
+++ b/core/backend/src/main/resources/i18n/messages_en_US.properties
@@ -173,6 +173,7 @@ SOURCE_TYPE_DRIVER_FILE=DRIVER FILE
 SOURCE_TYPE_MENU=MENU
 SOURCE_TYPE_LINK=PUBLIC LINK
 SOURCE_TYPE_APIKEY=APIKEY
+SOURCE_TYPE_DATA_FILL_FORM=DATA FILL FORM
 I18N_OPERATE_TYPE=Operation type
 I18N_DETAIL=Operation details
 I18N_USER=Operator
@@ -237,6 +238,7 @@ I18N_DS_INVALID=Datasource is invalid
 I18N_DS_INVALID_TABLE=Datasource has invalid tables
 I18N_ACCOUNT_LOCKED=Account\u3010%s\u3011is locked(Please contact the administrator to unlock or try again in %s minutes)
 I18N_PANEL_EXIST=The current panel name already exists under this directory
+I18N_DATA_FILL_FORM_EXIST=The current data filling form name already exists under this directory
 I18N_FOlDER_EXIST=The name already exists under this directory
 I18N_DATASET_GROUP_EXIST=The current dataset grouping name already exists under this directory
 I18N_NOT_JAR=File is not jar!
diff --git a/core/backend/src/main/resources/i18n/messages_zh_CN.properties b/core/backend/src/main/resources/i18n/messages_zh_CN.properties
index 5a01acb2cf..d696368181 100644
--- a/core/backend/src/main/resources/i18n/messages_zh_CN.properties
+++ b/core/backend/src/main/resources/i18n/messages_zh_CN.properties
@@ -94,7 +94,7 @@ i18n_sql_delete_not_matching=\u589E\u91CF\u5220\u9664 SQL \u7684\u6570\u636E\u52
 i18n_cst_ds_tb_or_field_deleted=\u81EA\u5B9A\u4E49\u6570\u636E\u96C6\u6240\u5173\u8054\u6570\u636E\u88AB\u5220\u9664\u6216\u5B57\u6BB5\u53D1\u751F\u53D8\u5316\uFF0C\u65E0\u6CD5\u6B63\u5E38\u663E\u793A
 i18n_no_all_delete_privilege_folder=\u8BE5\u76EE\u5F55\u4E0B\u5B58\u5728\u6CA1\u6709\u7BA1\u7406\u6743\u9650\u6216\u67E5\u770B\u6743\u9650\u7684\u8D44\u6E90\uFF0C\u65E0\u6CD5\u5220\u9664
 i18n_excel_field_repeat=\u5B58\u5728\u91CD\u590D\u5B57\u6BB5\uFF1A
-i18n_dont_contain_key=\u5f53\u524d\u7684sql\u4e0d\u5305\u542b\u8fd9\u4e2a\u952e\uff1a
+i18n_dont_contain_key=\u5F53\u524D\u7684sql\u4E0D\u5305\u542B\u8FD9\u4E2A\u952E\uFF1A
 i18n_schema_is_empty=\u6570\u636E\u5E93 Schema \u4E3A\u7A7A
 \u7AD9\u5185\u6D88\u606F=\u6D88\u606F\u4E2D\u5FC3
 \u6240\u6709\u6D88\u606F=\u6240\u6709\u6D88\u606F
@@ -173,6 +173,7 @@ SOURCE_TYPE_DRIVER_FILE=\u9A71\u52A8\u6587\u4EF6
 SOURCE_TYPE_MENU=\u83DC\u5355
 SOURCE_TYPE_LINK=\u516C\u5171\u94FE\u63A5
 SOURCE_TYPE_APIKEY=APIKEY
+SOURCE_TYPE_DATA_FILL_FORM=\u6570\u636E\u586B\u62A5\u8868\u5355
 I18N_OPERATE_TYPE=\u64CD\u4F5C\u7C7B\u578B
 I18N_DETAIL=\u64CD\u4F5C\u8BE6\u60C5
 I18N_USER=\u64CD\u4F5C\u4EBA
@@ -237,6 +238,7 @@ I18N_DS_INVALID=\u6570\u636E\u6E90\u65E0\u6548
 I18N_DS_INVALID_TABLE=\u6570\u636E\u6E90\u4E2D\u6709\u65E0\u6548\u7684\u8868
 I18N_ACCOUNT_LOCKED=\u8D26\u53F7\u3010%s\u3011\u5DF2\u9501\u5B9A(\u8BF7\u8054\u7CFB\u7BA1\u7406\u5458\u89E3\u9501\u6216%s\u5206\u949F\u540E\u91CD\u8BD5)
 I18N_PANEL_EXIST=\u5F53\u524D\u4EEA\u8868\u677F\u540D\u79F0\u5728\u8BE5\u76EE\u5F55\u4E0B\u9762\u5DF2\u7ECF\u5B58\u5728
+I18N_DATA_FILL_FORM_EXIST=\u5F53\u524D\u6570\u636E\u586B\u62A5\u8868\u5355\u540D\u79F0\u5728\u8BE5\u76EE\u5F55\u4E0B\u9762\u5DF2\u7ECF\u5B58\u5728
 I18N_FOlDER_EXIST=\u5F53\u524D\u540D\u79F0\u5728\u8BE5\u76EE\u5F55\u4E0B\u9762\u5DF2\u7ECF\u5B58\u5728
 I18N_DATASET_GROUP_EXIST=\u5F53\u524D\u6570\u636E\u96C6\u5206\u7EC4\u540D\u79F0\u5728\u8BE5\u76EE\u5F55\u4E0B\u9762\u5DF2\u7ECF\u5B58\u5728
 I18N_NOT_JAR=\u6587\u4EF6\u4E0D\u662F jar \u5305!
@@ -268,6 +270,6 @@ I18N_PANEL_PDF_TEMPLATE_WITH_PARAMS=\u9ED8\u8BA4\u6A21\u677F(\u52A0\u4EEA\u8868\
 I18N_PANEL_PDF_TEMPLATE_ONLY_PIC=\u9ED8\u8BA4\u6A21\u677F(\u53EA\u622A\u56FE)
 I18n_name_cant_empty=\u540D\u79F0\u4E0D\u80FD\u4E3A\u7A7A\uFF01
 I18n_del_admin_tips=\u7981\u6B62\u5220\u9664admin\u8D26\u53F7
-I18N_NO_DRIVER_PERMISSION=\u6ca1\u6709\u6743\u9650\uff01
+I18N_NO_DRIVER_PERMISSION=\u6CA1\u6709\u6743\u9650\uFF01
 i18n_field_circular_error=\u5B57\u6BB5\u89E3\u6790\u9519\u8BEF\uFF0C\u53EF\u80FD\u539F\u56E0\uFF1A\u5B57\u6BB5\u5DF2\u5220\u9664\u3001\u8BA1\u7B97\u5B57\u6BB5\u5F15\u7528\u5C42\u7EA7\u8FC7\u6DF1\u3001\u5B58\u5728\u5FAA\u73AF\u5F15\u7528\u7B49\uFF0C\u8BF7\u68C0\u67E5\u8868\u8282\u70B9\u548C\u5B57\u6BB5\u5E76\u91CD\u65B0\u7F16\u8F91\u3002
 i18n_field_circular_ref=\u5B57\u6BB5\u5B58\u5728\u5FAA\u73AF\u5F15\u7528
diff --git a/core/backend/src/main/resources/i18n/messages_zh_TW.properties b/core/backend/src/main/resources/i18n/messages_zh_TW.properties
index 07f7382d4d..41fbad72ba 100644
--- a/core/backend/src/main/resources/i18n/messages_zh_TW.properties
+++ b/core/backend/src/main/resources/i18n/messages_zh_TW.properties
@@ -94,7 +94,7 @@ i18n_sql_delete_not_matching=\u589E\u91CF\u522A\u9664 sql \u7684\u6578\u64DA\u52
 i18n_cst_ds_tb_or_field_deleted=\u81EA\u5B9A\u7FA9\u6578\u64DA\u96C6\u6240\u95DC\u806F\u6578\u64DA\u88AB\u522A\u9664\u6216\u5B57\u6BB5\u767C\u751F\u8B8A\u5316\uFF0C\u7121\u6CD5\u6B63\u5E38\u986F\u793A
 i18n_no_all_delete_privilege_folder=\u8A72\u76EE\u9304\u4E0B\u5B58\u5728\u6C92\u6709\u7BA1\u7406\u6B0A\u9650\u6216\u67E5\u770B\u6B0A\u9650\u7684\u8CC7\u6E90\uFF0C\u7121\u6CD5\u522A\u9664
 i18n_excel_field_repeat=\u5B58\u5728\u91CD\u5FA9\u5B57\u6BB5\uFF1A
-i18n_dont_contain_key=\u7576\u524d\u7684sql\u4e0d\u5305\u542b\u9019\u500b\u9375\uff1a
+i18n_dont_contain_key=\u7576\u524D\u7684sql\u4E0D\u5305\u542B\u9019\u500B\u9375\uFF1A
 i18n_schema_is_empty=\u6578\u64DA\u5EAB Schema \u70BA\u7A7A
 \u7AD9\u5185\u6D88\u606F=\u6D88\u606F\u4E2D\u5FC3
 \u6240\u6709\u6D88\u606F=\u6240\u6709\u6D88\u606F
@@ -173,6 +173,7 @@ SOURCE_TYPE_DRIVER_FILE=\u9A45\u52D5\u6587\u4EF6
 SOURCE_TYPE_MENU=\u83DC\u55AE
 SOURCE_TYPE_LINK=\u516C\u5171\u93C8\u63A5
 SOURCE_TYPE_APIKEY=APIKEY
+SOURCE_TYPE_DATA_FILL_FORM=\u6578\u64DA\u586B\u5831\u8868\u55AE
 I18N_DRIVER_NOT_DELETE=\u4F7F\u7528\u4E2D\u7684\u9A45\u52D5\u4E0D\u5141\u8A31\u5220\u9664
 I18N_DRIVER_REPEAT_NAME=\u540D\u7A31\u91CD\u8907
 I18N_DRIVER_NOT_FOUND=\u672A\u627E\u5230\u9A45\u52D5
@@ -233,6 +234,7 @@ I18N_DS_INVALID=\u6578\u64DA\u6E90\u7121\u6548
 I18N_DS_INVALID_TABLE=\u6578\u64DA\u6E90\u4E2D\u6709\u7121\u6548\u7684\u8868
 I18N_ACCOUNT_LOCKED=\u8CEC\u865F\u3010%s\u3011\u5DF2\u9396\u5B9A(\u8ACB\u806F\u7CFB\u7BA1\u7406\u54E1\u89E3\u9396\u6216%s\u5206\u9418\u5F8C\u91CD\u8A66)
 I18N_PANEL_EXIST=\u7576\u524D\u5100\u9336\u95C6\u540D\u7A31\u5728\u8A72\u76EE\u9304\u4E0B\u9762\u5DF2\u7D93\u5B58\u5728
+I18N_DATA_FILL_FORM_EXIST=\u7576\u524D\u6578\u64DA\u586B\u5831\u8868\u55AE\u540D\u7A31\u5728\u8A72\u76EE\u9304\u4E0B\u9762\u5DF2\u7D93\u5B58\u5728
 I18N_FOlDER_EXIST=\u540D\u7A31\u5728\u8A72\u76EE\u9304\u4E0B\u9762\u5DF2\u7D93\u5B58\u5728
 I18N_DATASET_GROUP_EXIST=\u7576\u524D\u6578\u64DA\u96C6\u5206\u7D44\u540D\u7A31\u5728\u8A72\u76EE\u9304\u4E0B\u9762\u5DF2\u7D93\u5B58\u5728
 I18N_NOT_JAR=\u6587\u4EF6\u4E0D\u662F jar \u5305!
@@ -274,6 +276,6 @@ I18N_PANEL_PDF_TEMPLATE_ONLY_PIC=\u9ED8\u8A8D\u6A21\u677F(\u53EA\u622A\u5716)
 \u8FB9\u684610=\u908A\u6846 10
 I18n_name_cant_empty=\u540D\u7A31\u4E0D\u80FD\u70BA\u7A7A\uFF01
 I18n_del_admin_tips=\u7981\u6B62\u522A\u9664admin\u8CEC\u865F
-I18N_NO_DRIVER_PERMISSION=\u6c92\u6709\u8a31\u53ef\u6b0a\uff01
+I18N_NO_DRIVER_PERMISSION=\u6C92\u6709\u8A31\u53EF\u6B0A\uFF01
 i18n_field_circular_error=\u5B57\u6BB5\u89E3\u6790\u932F\u8AA4\uFF0C\u53EF\u80FD\u539F\u56E0\uFF1A\u5B57\u6BB5\u5DF2\u522A\u9664\u3001\u8A08\u7B97\u5B57\u6BB5\u5F15\u7528\u5C64\u7D1A\u904E\u6DF1\u3001\u5B58\u5728\u5FAA\u74B0\u5F15\u7528\u7B49\uFF0C\u8ACB\u6AA2\u67E5\u8868\u7BC0\u9EDE\u548C\u5B57\u6BB5\u4E26\u91CD\u65B0\u7DE8\u8F2F\u3002
 i18n_field_circular_ref=\u5B57\u6BB5\u5B58\u5728\u5FAA\u74B0\u5F15\u7528
diff --git a/core/frontend/package.json b/core/frontend/package.json
index 7ad64a112a..3bd7935ce3 100644
--- a/core/frontend/package.json
+++ b/core/frontend/package.json
@@ -74,6 +74,7 @@
     "svgo": "1.2.2",
     "tinymce": "^5.8.2",
     "umy-ui": "^1.1.6",
+    "uuid": "^9.0.1",
     "vant": "^2.13.2",
     "vue": "2.6.10",
     "vue-clipboard2": "0.3.1",
diff --git a/core/frontend/public/link.html b/core/frontend/public/link.html
index 2bdb7b338c..635a6d4f8d 100644
--- a/core/frontend/public/link.html
+++ b/core/frontend/public/link.html
@@ -34,6 +34,7 @@
   const terminal = getQueryVariable('terminal')
   const attachParams = getQueryVariable('attachParams')
   const fromLink = getQueryVariable('fromLink')
+  const ticket = getQueryVariable('ticket')
   const baseUrl = window.location.pathname.replace('link.html', '')
   let url = baseUrl + "#/delink?link=" + encodeURIComponent(link)
   if (terminal) {
@@ -48,6 +49,9 @@
   if (fromLink) {
     url += '&fromLink=' + fromLink
   }
+  if (ticket) {
+    url += '&ticket=' + ticket
+  }
   window.location.href = url
 </script>
 
diff --git a/core/frontend/src/api/link/index.js b/core/frontend/src/api/link/index.js
index 16a1adf659..87256278d1 100644
--- a/core/frontend/src/api/link/index.js
+++ b/core/frontend/src/api/link/index.js
@@ -50,6 +50,14 @@ export function switchEnablePwd(data) {
   })
 }
 
+export function switchEnableTicket(data) {
+  return request({
+    url: 'api/link/enableTicket',
+    method: 'post',
+    data
+  })
+}
+
 export function viewLinkLog(data) {
   return request({
     url: 'api/link/viewLog',
diff --git a/core/frontend/src/components/canvas/components/editor/Preview.vue b/core/frontend/src/components/canvas/components/editor/Preview.vue
index a47e9c757f..e95a517e29 100644
--- a/core/frontend/src/components/canvas/components/editor/Preview.vue
+++ b/core/frontend/src/components/canvas/components/editor/Preview.vue
@@ -313,7 +313,7 @@ export default {
       scaleWidth: '100',
       scaleHeight: '100',
       timer: null,
-      componentDataShow: null,
+      componentDataShow: [],
       mainWidth: '100%',
       mainHeight: '100%',
       searchCount: 0,
diff --git a/core/frontend/src/components/canvas/customComponent/UserView.vue b/core/frontend/src/components/canvas/customComponent/UserView.vue
index 5854d1fafa..904fe21254 100644
--- a/core/frontend/src/components/canvas/customComponent/UserView.vue
+++ b/core/frontend/src/components/canvas/customComponent/UserView.vue
@@ -946,6 +946,7 @@ export default {
         }
         if (this.isFirstLoad) {
           this.element.filters = this.filter.filter?.length ? JSON.parse(JSON.stringify(this.filter.filter)) : []
+          this.$store.commit('setViewInitFilter', this.element)
         }
         method(id, this.panelInfo.id, requestInfo).then(response => {
           try {
diff --git a/core/frontend/src/icons/svg/de-icon-copy.svg b/core/frontend/src/icons/svg/de-icon-copy.svg
new file mode 100644
index 0000000000..65d5576757
--- /dev/null
+++ b/core/frontend/src/icons/svg/de-icon-copy.svg
@@ -0,0 +1,3 @@
+<svg width="12" height="14" viewBox="0 0 12 14" fill="" xmlns="http://www.w3.org/2000/svg">
+<path d="M1.33333 4.33334V12.3333H8V4.33334H1.33333ZM9.33333 3.66668V13.0741C9.33333 13.4014 9.05476 13.6667 8.71111 13.6667H0.622222C0.278578 13.6667 0 13.4014 0 13.0741V3.5926C0 3.26532 0.278578 3.00001 0.622222 3.00001H8.66667C9.03486 3.00001 9.33333 3.29849 9.33333 3.66668ZM11.8047 0.528606C11.9254 0.649249 12 0.815915 12 1.00001V9.33334C12 9.51744 11.8508 9.66668 11.6667 9.66668H11C10.8159 9.66668 10.6667 9.51744 10.6667 9.33334V1.66668H4.33333C4.14924 1.66668 4 1.51744 4 1.33334V0.666677C4 0.482582 4.14924 0.333344 4.33333 0.333344H11.3333C11.5174 0.333344 11.6841 0.407963 11.8047 0.528606Z" fill=""/>
+</svg>
diff --git a/core/frontend/src/icons/svg/de-icon-info.svg b/core/frontend/src/icons/svg/de-icon-info.svg
new file mode 100644
index 0000000000..ddf29892a7
--- /dev/null
+++ b/core/frontend/src/icons/svg/de-icon-info.svg
@@ -0,0 +1,5 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="" xmlns="http://www.w3.org/2000/svg">
+<path d="M8.00008 3.66667C8.46031 3.66667 8.83341 4.03977 8.83341 4.5C8.83341 4.96023 8.46031 5.33333 8.00008 5.33333C7.53985 5.33333 7.16675 4.96023 7.16675 4.5C7.16675 4.03977 7.53985 3.66667 8.00008 3.66667Z" fill=""/>
+<path d="M8.16675 6H7.33341C7.05727 6 6.83341 6.22386 6.83341 6.5V6.83333C6.83341 7.10948 7.05727 7.33333 7.33341 7.33333H7.50008V10.6667H6.83341C6.55727 10.6667 6.33341 10.8905 6.33341 11.1667V11.5C6.33341 11.7761 6.55727 12 6.83341 12H9.50008C9.77622 12 10.0001 11.7761 10.0001 11.5V11.1667C10.0001 10.8905 9.77622 10.6667 9.50008 10.6667H8.83341V6.66667C8.83341 6.29848 8.53494 6 8.16675 6Z" fill=""/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M8.00008 15.3332C3.95008 15.3332 0.666748 12.0498 0.666748 7.99984C0.666748 3.94984 3.95008 0.666504 8.00008 0.666504C12.0501 0.666504 15.3334 3.94984 15.3334 7.99984C15.3334 12.0498 12.0501 15.3332 8.00008 15.3332ZM8.00008 13.9998C11.3138 13.9998 14.0001 11.3135 14.0001 7.99984C14.0001 4.68617 11.3138 1.99984 8.00008 1.99984C4.68642 1.99984 2.00008 4.68617 2.00008 7.99984C2.00008 11.3135 4.68642 13.9998 8.00008 13.9998Z" fill=""/>
+</svg>
diff --git a/core/frontend/src/icons/svg/icon_calendar_outlined.svg b/core/frontend/src/icons/svg/icon_calendar_outlined.svg
index c9ed63f2de..273fceaae1 100644
--- a/core/frontend/src/icons/svg/icon_calendar_outlined.svg
+++ b/core/frontend/src/icons/svg/icon_calendar_outlined.svg
@@ -1,4 +1,4 @@
 <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M4.83301 1.33398C5.10915 1.33398 5.33301 1.55784 5.33301 1.83398V2.00065H10.6663V1.83398C10.6663 1.55784 10.8902 1.33398 11.1663 1.33398H11.4997C11.7758 1.33398 11.9997 1.55784 11.9997 1.83398V2.00065H13.9997C14.3679 2.00065 14.6663 2.29913 14.6663 2.66732V14.0007C14.6663 14.3688 14.3679 14.6673 13.9997 14.6673H1.99967C1.63148 14.6673 1.33301 14.3688 1.33301 14.0007L1.33301 2.66732C1.33301 2.29913 1.63148 2.00065 1.99967 2.00065H3.99967V1.83398C3.99967 1.55784 4.22353 1.33398 4.49967 1.33398H4.83301ZM10.6663 3.33398H5.33301V3.50065C5.33301 3.77679 5.10915 4.00065 4.83301 4.00065H4.49967C4.22353 4.00065 3.99967 3.77679 3.99967 3.50065V3.33398H2.66634V13.334H13.333V3.33398H11.9997V3.50065C11.9997 3.77679 11.7758 4.00065 11.4997 4.00065H11.1663C10.8902 4.00065 10.6663 3.77679 10.6663 3.50065V3.33398ZM5.99967 6.83398C5.99967 6.55784 5.77582 6.33398 5.49967 6.33398H4.49967C4.22353 6.33398 3.99967 6.55784 3.99967 6.83398V7.83398C3.99967 8.11013 4.22353 8.33398 4.49967 8.33398H5.49967C5.77582 8.33398 5.99967 8.11013 5.99967 7.83398V6.83398ZM6.99967 6.83398C6.99967 6.55784 7.22353 6.33398 7.49967 6.33398H8.49967C8.77582 6.33398 8.99967 6.55784 8.99967 6.83398V7.83398C8.99967 8.11013 8.77582 8.33398 8.49967 8.33398H7.49967C7.22353 8.33398 6.99967 8.11013 6.99967 7.83398V6.83398ZM5.99967 9.83398C5.99967 9.55784 5.77582 9.33398 5.49967 9.33398H4.49967C4.22353 9.33398 3.99967 9.55784 3.99967 9.83398V10.834C3.99967 11.1101 4.22353 11.334 4.49967 11.334H5.49967C5.77582 11.334 5.99967 11.1101 5.99967 10.834V9.83398ZM6.99967 9.83398C6.99967 9.55784 7.22353 9.33398 7.49967 9.33398H8.49967C8.77582 9.33398 8.99967 9.55784 8.99967 9.83398V10.834C8.99967 11.1101 8.77582 11.334 8.49967 11.334H7.49967C7.22353 11.334 6.99967 11.1101 6.99967 10.834V9.83398ZM11.9997 6.83398C11.9997 6.55784 11.7758 6.33398 11.4997 6.33398H10.4997C10.2235 6.33398 9.99967 6.55784 9.99967 6.83398V7.83398C9.99967 8.11013 10.2235 8.33398 10.4997 8.33398H11.4997C11.7758 8.33398 11.9997 8.11013 11.9997 7.83398V6.83398Z" fill="#646A73"/>
-<path d="M11.9997 9.83398C11.9997 9.55784 11.7758 9.33398 11.4997 9.33398H10.4997C10.2235 9.33398 9.99967 9.55784 9.99967 9.83398V10.834C9.99967 11.1101 10.2235 11.334 10.4997 11.334H11.4997C11.7758 11.334 11.9997 11.1101 11.9997 10.834V9.83398Z" fill="#646A73"/>
+<path d="M4.83334 1.33301C5.10949 1.33301 5.33334 1.55687 5.33334 1.83301V1.99967H10.6667V1.83301C10.6667 1.55687 10.8905 1.33301 11.1667 1.33301H11.5C11.7762 1.33301 12 1.55687 12 1.83301V1.99967H14C14.3682 1.99967 14.6667 2.29815 14.6667 2.66634V13.9997C14.6667 14.3679 14.3682 14.6663 14 14.6663H2.00001C1.63182 14.6663 1.33334 14.3679 1.33334 13.9997L1.33334 2.66634C1.33334 2.29815 1.63182 1.99967 2.00001 1.99967H4.00001V1.83301C4.00001 1.55687 4.22387 1.33301 4.50001 1.33301H4.83334ZM10.6667 3.33301H5.33334V3.49967C5.33334 3.77582 5.10949 3.99967 4.83334 3.99967H4.50001C4.22387 3.99967 4.00001 3.77582 4.00001 3.49967V3.33301H2.66668V13.333H13.3333V3.33301H12V3.49967C12 3.77582 11.7762 3.99967 11.5 3.99967H11.1667C10.8905 3.99967 10.6667 3.77582 10.6667 3.49967V3.33301ZM6.00001 6.83301C6.00001 6.55687 5.77615 6.33301 5.50001 6.33301H4.50001C4.22387 6.33301 4.00001 6.55687 4.00001 6.83301V7.83301C4.00001 8.10915 4.22387 8.33301 4.50001 8.33301H5.50001C5.77615 8.33301 6.00001 8.10915 6.00001 7.83301V6.83301ZM7.00001 6.83301C7.00001 6.55687 7.22387 6.33301 7.50001 6.33301H8.50001C8.77615 6.33301 9.00001 6.55687 9.00001 6.83301V7.83301C9.00001 8.10915 8.77615 8.33301 8.50001 8.33301H7.50001C7.22387 8.33301 7.00001 8.10915 7.00001 7.83301V6.83301ZM6.00001 9.83301C6.00001 9.55687 5.77615 9.33301 5.50001 9.33301H4.50001C4.22387 9.33301 4.00001 9.55687 4.00001 9.83301V10.833C4.00001 11.1092 4.22387 11.333 4.50001 11.333H5.50001C5.77615 11.333 6.00001 11.1092 6.00001 10.833V9.83301ZM7.00001 9.83301C7.00001 9.55687 7.22387 9.33301 7.50001 9.33301H8.50001C8.77615 9.33301 9.00001 9.55687 9.00001 9.83301V10.833C9.00001 11.1092 8.77615 11.333 8.50001 11.333H7.50001C7.22387 11.333 7.00001 11.1092 7.00001 10.833V9.83301ZM12 6.83301C12 6.55687 11.7762 6.33301 11.5 6.33301H10.5C10.2239 6.33301 10 6.55687 10 6.83301V7.83301C10 8.10915 10.2239 8.33301 10.5 8.33301H11.5C11.7762 8.33301 12 8.10915 12 7.83301V6.83301Z" fill="#646A73"/>
+<path d="M12 9.83301C12 9.55687 11.7762 9.33301 11.5 9.33301H10.5C10.2239 9.33301 10 9.55687 10 9.83301V10.833C10 11.1092 10.2239 11.333 10.5 11.333H11.5C11.7762 11.333 12 11.1092 12 10.833V9.83301Z" fill="#646A73"/>
 </svg>
diff --git a/core/frontend/src/icons/svg/icon_copy_outlined.svg b/core/frontend/src/icons/svg/icon_copy_outlined.svg
new file mode 100644
index 0000000000..c33dda87c2
--- /dev/null
+++ b/core/frontend/src/icons/svg/icon_copy_outlined.svg
@@ -0,0 +1,3 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M3.33333 5.33301V13.333H10V5.33301H3.33333ZM11.3333 4.66634V14.0737C11.3333 14.401 11.0548 14.6663 10.7111 14.6663H2.62222C2.27858 14.6663 2 14.401 2 14.0737V4.59227C2 4.26499 2.27858 3.99967 2.62222 3.99967H10.6667C11.0349 3.99967 11.3333 4.29815 11.3333 4.66634ZM13.8047 1.52827C13.9254 1.64891 14 1.81558 14 1.99967V10.333C14 10.5171 13.8508 10.6663 13.6667 10.6663H13C12.8159 10.6663 12.6667 10.5171 12.6667 10.333V2.66634H6.33333C6.14924 2.66634 6 2.5171 6 2.33301V1.66634C6 1.48225 6.14924 1.33301 6.33333 1.33301H13.3333C13.5174 1.33301 13.6841 1.40763 13.8047 1.52827Z" fill="#646A73"/>
+</svg>
diff --git a/core/frontend/src/icons/svg/icon_delete-trash_outlined.svg b/core/frontend/src/icons/svg/icon_delete-trash_outlined.svg
new file mode 100644
index 0000000000..b2b5d3deda
--- /dev/null
+++ b/core/frontend/src/icons/svg/icon_delete-trash_outlined.svg
@@ -0,0 +1,3 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M5.3335 2.66634V1.99967C5.3335 1.63148 5.63197 1.33301 6.00016 1.33301H10.0002C10.3684 1.33301 10.6668 1.63148 10.6668 1.99967V2.66634H14.2395C14.3881 2.66634 14.442 2.68181 14.4963 2.71086C14.5506 2.73991 14.5933 2.78255 14.6223 2.83687C14.6514 2.89119 14.6668 2.94507 14.6668 3.09366V3.57236C14.6668 3.72095 14.6514 3.77483 14.6223 3.82915C14.5933 3.88347 14.5506 3.9261 14.4963 3.95515C14.442 3.9842 14.3881 3.99967 14.2395 3.99967H13.3335V13.9997C13.3335 14.3679 13.035 14.6663 12.6668 14.6663H3.3335C2.96531 14.6663 2.66683 14.3679 2.66683 13.9997V3.99967H1.76081C1.61222 3.99967 1.55834 3.9842 1.50402 3.95515C1.4497 3.9261 1.40707 3.88347 1.37802 3.82915C1.34897 3.77483 1.3335 3.72095 1.3335 3.57236V3.09366C1.3335 2.94507 1.34897 2.89119 1.37802 2.83687C1.40707 2.78255 1.4497 2.73991 1.50402 2.71086C1.55834 2.68181 1.61222 2.66634 1.76081 2.66634H5.3335ZM4.00016 3.99967V13.333H12.0002V3.99967H4.00016ZM6.3335 5.33301H7.00016C7.18426 5.33301 7.3335 5.48225 7.3335 5.66634V11.6663C7.3335 11.8504 7.18426 11.9997 7.00016 11.9997H6.3335C6.1494 11.9997 6.00016 11.8504 6.00016 11.6663V5.66634C6.00016 5.48225 6.1494 5.33301 6.3335 5.33301ZM9.00016 5.33301H9.66683C9.85092 5.33301 10.0002 5.48225 10.0002 5.66634V11.6663C10.0002 11.8504 9.85092 11.9997 9.66683 11.9997H9.00016C8.81607 11.9997 8.66683 11.8504 8.66683 11.6663V5.66634C8.66683 5.48225 8.81607 5.33301 9.00016 5.33301Z" fill="#646A73"/>
+</svg>
diff --git a/core/frontend/src/icons/svg/icon_down_outlined.svg b/core/frontend/src/icons/svg/icon_down_outlined.svg
new file mode 100644
index 0000000000..c44e1e87fa
--- /dev/null
+++ b/core/frontend/src/icons/svg/icon_down_outlined.svg
@@ -0,0 +1,3 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M7.99998 10.5764L13.4211 5.15525C13.5513 5.02507 13.7624 5.02507 13.8925 5.15525L14.3639 5.62665C14.4941 5.75683 14.4941 5.96788 14.3639 6.09806L8.47139 11.9906C8.21104 12.251 7.78893 12.251 7.52858 11.9906L1.63602 6.09806C1.50585 5.96788 1.50585 5.75683 1.63602 5.62665L2.10743 5.15525C2.2376 5.02507 2.44866 5.02507 2.57883 5.15525L7.99998 10.5764Z" fill="#646A73"/>
+</svg>
diff --git a/core/frontend/src/icons/svg/icon_multi-line_outlined.svg b/core/frontend/src/icons/svg/icon_multi-line_outlined.svg
new file mode 100644
index 0000000000..24c4b1cc2c
--- /dev/null
+++ b/core/frontend/src/icons/svg/icon_multi-line_outlined.svg
@@ -0,0 +1,11 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_8693_7580)">
+<path d="M1.33332 2H14.6667C15.0348 2 15.3333 2.29848 15.3333 2.66667V13.3333C15.3333 13.7015 15.0348 14 14.6667 14H1.33332C0.965133 14 0.666656 13.7015 0.666656 13.3333V2.66667C0.666656 2.29848 0.965133 2 1.33332 2ZM1.99999 3.33333V12.6667H14V3.33333H1.99999Z" fill="#646A73"/>
+<path d="M4.66667 5.02255C4.66667 4.82618 4.50748 4.66699 4.31112 4.66699H3.68889C3.49253 4.66699 3.33334 4.82618 3.33334 5.02255L3.33325 7.00033C3.33325 7.19669 3.49244 7.35588 3.68881 7.35588H4.31103C4.5074 7.35588 4.66659 7.19669 4.66659 7.00033L4.66667 5.02255Z" fill="#646A73"/>
+</g>
+<defs>
+<clipPath id="clip0_8693_7580">
+<rect width="16" height="16" fill="white"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/core/frontend/src/icons/svg/icon_radio_outlined.svg b/core/frontend/src/icons/svg/icon_radio_outlined.svg
new file mode 100644
index 0000000000..2206cec10f
--- /dev/null
+++ b/core/frontend/src/icons/svg/icon_radio_outlined.svg
@@ -0,0 +1,11 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_8693_4607)">
+<path d="M7.99999 15.3337C12.0501 15.3337 15.3333 12.0504 15.3333 8.00033C15.3333 3.95024 12.0501 0.666992 7.99999 0.666992C3.9499 0.666992 0.666656 3.95024 0.666656 8.00033C0.666656 12.0504 3.9499 15.3337 7.99999 15.3337ZM7.99999 14.0003C4.68628 14.0003 1.99999 11.314 1.99999 8.00033C1.99999 4.68662 4.68628 2.00033 7.99999 2.00033C11.3137 2.00033 14 4.68662 14 8.00033C14 11.314 11.3137 14.0003 7.99999 14.0003Z" fill="#646A73"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M8.00001 10.6663C9.47277 10.6663 10.6667 9.47243 10.6667 7.99967C10.6667 6.52692 9.47277 5.33301 8.00001 5.33301C6.52725 5.33301 5.33334 6.52692 5.33334 7.99967C5.33334 9.47243 6.52725 10.6663 8.00001 10.6663Z" fill="#646A73"/>
+</g>
+<defs>
+<clipPath id="clip0_8693_4607">
+<rect width="16" height="16" fill="white"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/core/frontend/src/icons/svg/icon_single-line_outlined.svg b/core/frontend/src/icons/svg/icon_single-line_outlined.svg
new file mode 100644
index 0000000000..5cd8e7b53d
--- /dev/null
+++ b/core/frontend/src/icons/svg/icon_single-line_outlined.svg
@@ -0,0 +1,11 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_8096_189573)">
+<path d="M1.33335 4H14.6667C15.0349 4 15.3334 4.29848 15.3334 4.66667V11.3333C15.3334 11.7015 15.0349 12 14.6667 12H1.33335C0.965164 12 0.666687 11.7015 0.666687 11.3333V4.66667C0.666687 4.29848 0.965164 4 1.33335 4ZM2.00002 5.33333V10.6667H14V5.33333H2.00002Z" fill="#646A73"/>
+<path d="M4.66665 7.02255C4.66665 6.82618 4.50746 6.66699 4.31109 6.66699H3.68887C3.4925 6.66699 3.33331 6.82618 3.33331 7.02255V8.9781C3.33331 9.17447 3.4925 9.33366 3.68887 9.33366H4.31109C4.50746 9.33366 4.66665 9.17447 4.66665 8.9781V7.02255Z" fill="#646A73"/>
+</g>
+<defs>
+<clipPath id="clip0_8096_189573">
+<rect width="16" height="16" fill="white"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/core/frontend/src/icons/svg/icon_todo_outlined.svg b/core/frontend/src/icons/svg/icon_todo_outlined.svg
new file mode 100644
index 0000000000..633b9b1ece
--- /dev/null
+++ b/core/frontend/src/icons/svg/icon_todo_outlined.svg
@@ -0,0 +1,3 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M2.66666 1.77734H13.3333C13.8242 1.77734 14.2222 2.17531 14.2222 2.66623V13.3329C14.2222 13.8238 13.8242 14.2218 13.3333 14.2218H2.66666C2.17574 14.2218 1.77777 13.8238 1.77777 13.3329V2.66623C1.77777 2.17531 2.17574 1.77734 2.66666 1.77734ZM3.1111 3.11068V12.8885H12.8889V3.11068H3.1111ZM10.5524 5.52146C10.6566 5.41732 10.8254 5.41732 10.9296 5.52146L11.4952 6.08715C11.5994 6.19129 11.5994 6.36013 11.4952 6.46427L7.47259 10.4869C7.463 10.4965 7.45285 10.5052 7.44226 10.5131L7.35921 10.5961C7.25571 10.6996 7.08815 10.7003 6.98375 10.5978L4.63634 8.29133C4.53063 8.18747 4.52988 8.01734 4.63467 7.91255L5.20034 7.34688C5.30383 7.24339 5.47139 7.24265 5.57579 7.34523L7.16611 8.90778L10.5524 5.52146Z" fill="#646A73"/>
+</svg>
diff --git a/core/frontend/src/lang/en.js b/core/frontend/src/lang/en.js
index 80d44e924f..211246d5d6 100644
--- a/core/frontend/src/lang/en.js
+++ b/core/frontend/src/lang/en.js
@@ -169,6 +169,16 @@ export default {
     default_login: 'Normal'
   },
   commons: {
+    component: {
+      input: 'Input',
+      textarea: 'Textarea',
+      select: 'Select',
+      radio: 'Radio',
+      checkbox: 'Checkbox',
+      date: 'Date Picker',
+      dateRange: 'Date Range Picker',
+      add_component_hint: 'Click or drag the component on the left to add a field'
+    },
     consanguinity: 'Consanguinity',
     collapse_navigation: 'Collapse navigation',
     operate_cancelled: 'Operation cancelled',
@@ -579,6 +589,27 @@ export default {
     logic_filter: 'Condition Filter',
     enum_filter: 'Enum Filter'
   },
+  data_fill: {
+    form: {
+      confirm_delete: 'Confirm delete? (The tables created in database will not be deleted)',
+      list: 'Form List',
+      record: 'Fill Record',
+      task_manage: 'Task Manage',
+      form_name: 'Form Name',
+      datasource: 'Datasource',
+      table: 'Table',
+      creator: 'Creator',
+      createTime: 'Create Time'
+    },
+    data: {
+      confirm_delete: 'Confirm delete?'
+    },
+    task: {
+      confirm_enable: 'Confirm enable task?',
+      confirm_disable: 'Confirm disable task?'
+    },
+    on_the_left: 'Please select a form on the left'
+  },
   detabs: {
     custom_sort: 'Custom Sort',
     eidttitle: 'Edit Title',
@@ -1470,7 +1501,7 @@ export default {
     line_type_dotted: 'Dotted',
     value_can_not_empty: 'Value can not be empty',
     value_error: 'Value illegal',
-    threshold: 'Threshold',
+    threshold: 'Conditional styles',
     threshold_range: 'Range',
     gauge_threshold_format_error: 'Format Error',
     total_cfg: 'Total Config',
@@ -1660,7 +1691,8 @@ export default {
     regression_pow: 'Power law',
     regression_loess: 'LOESS',
     regression_algo: 'Algorithm',
-    trend_line: 'Trend Line'
+    trend_line: 'Trend Line',
+    field_enum: 'Enumeration values'
   },
   dataset: {
     scope_edit: 'Effective only when editing',
@@ -2848,9 +2880,14 @@ export default {
     chart_data_range: 'View data range',
     panel_format: 'Panel format',
     simple_repeat: 'Simple repeat',
+    single_task: 'Single task',
     once_a_day: 'Once a day',
     once_a_week: 'Once a week',
     once_a_month: 'Once a month',
+    hour: 'Hour',
+    day: 'Day',
+    week: 'Week',
+    month: 'Month',
     complex_repeat: 'Complex repeat',
     pixel_tip: 'Please code custom pixel(such as 2560 * 1600) or select',
     task_type: 'Task type',
diff --git a/core/frontend/src/lang/tw.js b/core/frontend/src/lang/tw.js
index 29a8ee5cc3..56fec1cdde 100644
--- a/core/frontend/src/lang/tw.js
+++ b/core/frontend/src/lang/tw.js
@@ -169,6 +169,16 @@ export default {
     default_login: '普通登錄'
   },
   commons: {
+    component: {
+      input: '單行輸入',
+      textarea: '多行輸入',
+      select: '下拉框',
+      radio: '單選',
+      checkbox: '多選框',
+      date: '日期',
+      dateRange: '時間范圍',
+      add_component_hint: '點擊或拖拽左側組件添加字段'
+    },
     consanguinity: '血緣關係',
     collapse_navigation: '收起導航',
     operate_cancelled: '已取消操作',
@@ -579,6 +589,27 @@ export default {
     logic_filter: '條件篩選',
     enum_filter: '枚舉篩選'
   },
+  data_fill: {
+    form: {
+      confirm_delete: '確認刪除？(不會刪除已創建的數據庫表)',
+      list: '表單數據',
+      record: '提交記錄',
+      task_manage: '任務管理',
+      form_name: '表單名稱',
+      datasource: '數據源',
+      table: '數據庫表',
+      creator: '創建人',
+      createTime: '創建時間'
+    },
+    data: {
+      confirm_delete: '確認刪除?'
+    },
+    task: {
+      confirm_enable: '確認啟動任務？（單次任務會新建下發任務）',
+      confirm_disable: '確認停止任務？'
+    },
+    on_the_left: '請在左側選擇表單'
+  },
   detabs: {
     custom_sort: '自定義排序',
     eidttitle: '編輯標題',
@@ -1468,7 +1499,7 @@ export default {
     line_type_dotted: '點',
     value_can_not_empty: '值不能為空',
     value_error: '值必須為數值',
-    threshold: '閾值',
+    threshold: '條件樣式',
     threshold_range: '閾值區間',
     gauge_threshold_format_error: '格式錯誤',
     total_cfg: '總計配置',
@@ -1652,7 +1683,8 @@ export default {
     regression_pow: '冪函數',
     regression_loess: '局部加權',
     regression_algo: '算法',
-    trend_line: '趨勢線'
+    trend_line: '趨勢線',
+    field_enum: '枚舉值'
   },
   dataset: {
     scope_edit: '僅編輯時生效',
@@ -2840,9 +2872,14 @@ export default {
     chart_data_range: '視圖數據範圍',
     panel_format: '儀表板格式',
     simple_repeat: '簡單重複',
+    single_task: '單次任務',
     once_a_day: '每天',
     once_a_week: '每周',
     once_a_month: '每月',
+    hour: '小時',
+    day: '天',
+    week: '周',
+    month: '月',
     complex_repeat: '複雜重複',
     pixel_tip: '可直接輸入分辨率(例如:2560 * 1600)或者選擇',
     task_type: '任務類型',
diff --git a/core/frontend/src/lang/zh.js b/core/frontend/src/lang/zh.js
index 5d7f34c70a..0183894693 100644
--- a/core/frontend/src/lang/zh.js
+++ b/core/frontend/src/lang/zh.js
@@ -169,6 +169,16 @@ export default {
     default_login: '普通登录'
   },
   commons: {
+    component: {
+      input: '单行输入',
+      textarea: '多行输入',
+      select: '下拉框',
+      radio: '单选',
+      checkbox: '多选框',
+      date: '日期',
+      dateRange: '时间范围',
+      add_component_hint: '点击或拖拽左侧组件添加字段'
+    },
     consanguinity: '血缘关系',
     collapse_navigation: '收起导航',
     operate_cancelled: '已取消操作',
@@ -578,6 +588,27 @@ export default {
     logic_filter: '条件筛选',
     enum_filter: '枚举筛选'
   },
+  data_fill: {
+    form: {
+      confirm_delete: '确认删除？(不会删除已创建的数据库表)',
+      list: '表单数据',
+      record: '提交记录',
+      task_manage: '任务管理',
+      form_name: '表单名称',
+      datasource: '数据源',
+      table: '数据库表',
+      creator: '创建人',
+      createTime: '创建时间'
+    },
+    data: {
+      confirm_delete: '确认删除?'
+    },
+    task: {
+      confirm_enable: '确认启动任务？（单次任务会新建下发任务）',
+      confirm_disable: '确认停止任务？'
+    },
+    on_the_left: '请在左侧选择表单'
+  },
   detabs: {
     custom_sort: '自定义排序',
     eidttitle: '编辑标题',
@@ -1468,7 +1499,7 @@ export default {
     line_type_dotted: '点',
     value_can_not_empty: '值不能为空',
     value_error: '值必须为数值',
-    threshold: '阈值',
+    threshold: '条件样式',
     threshold_range: '阈值区间',
     gauge_threshold_format_error: '格式错误',
     total_cfg: '总计配置',
@@ -1652,7 +1683,8 @@ export default {
     regression_pow: '幂函数',
     regression_loess: '局部加权',
     regression_algo: '算法',
-    trend_line: '趋势线'
+    trend_line: '趋势线',
+    field_enum: '枚举值'
   },
   dataset: {
     scope_edit: '仅编辑时生效',
@@ -2843,9 +2875,14 @@ export default {
     chart_data_range: '视图数据范围',
     panel_format: '仪表板格式',
     simple_repeat: '简单重复',
+    single_task: '单次任务',
     once_a_day: '每天',
     once_a_week: '每周',
     once_a_month: '每月',
+    hour: '小时',
+    day: '天',
+    week: '周',
+    month: '月',
     complex_repeat: '复杂重复',
     pixel_tip: '可直接输入自定义分辨率(例如:2560 * 1600)或选择',
     task_type: '任务类型',
diff --git a/core/frontend/src/layout/index.vue b/core/frontend/src/layout/index.vue
index 8c29996218..82e5b27667 100644
--- a/core/frontend/src/layout/index.vue
+++ b/core/frontend/src/layout/index.vue
@@ -13,7 +13,7 @@
 
     <de-container :style="mainStyle">
       <de-aside-container
-        v-if="!sidebar.hide"
+        v-if="showSideBar"
         :is-collapse-width="sideWidth"
         type="system"
         class="le-aside-container"
@@ -65,8 +65,6 @@ import DeAsideContainer from '@/components/dataease/DeAsideContainer'
 import bus from '@/utils/bus'
 import { showMultiLoginMsg } from '@/utils/index'
 
-import { needModifyPwd, removePwdTips } from '@/api/user'
-
 export default {
   name: 'Layout',
   components: {
@@ -101,7 +99,11 @@ export default {
       return this.$store.state.settings.showSettings
     },
     fullHeightFlag() {
-      return this.$route.path.indexOf('panel') > -1 && (this.componentName === 'PanelEdit' || this.componentName === 'ChartEdit')
+      const path = this.$route.path
+      return (path.indexOf('panel') > -1 && (this.componentName === 'PanelEdit' || this.componentName === 'ChartEdit')) || (path.indexOf('/data-filling/create') > -1)
+    },
+    showSideBar() {
+      return !this.sidebar.hide && this.$route.path.indexOf('data-filling') === -1
     },
     mainStyle() {
       if (this.fullHeightFlag) {
@@ -154,20 +156,13 @@ export default {
       bus.$emit('sys-logout')
     },
     panelSwitchComponent(c) {
+      console.log(c)
       this.componentName = c.name
     },
     handleClickOutside() {
       this.$store.dispatch('app/closeSideBar', { withoutAnimation: false })
-    },
-    doNotNoti() {
-      this.buttonDisable = true
-      removePwdTips().then(res => {
-        this.showTips = false
-        this.buttonDisable = false
-      }).catch(e => {
-        this.buttonDisable = false
-      })
     }
+
   }
 }
 </script>
diff --git a/core/frontend/src/settings.js b/core/frontend/src/settings.js
index 191d0e01f2..0e829ce793 100644
--- a/core/frontend/src/settings.js
+++ b/core/frontend/src/settings.js
@@ -1,5 +1,6 @@
 module.exports = {
   TokenKey: 'Authorization',
+  TokenExpKey: 'de-login-login-exp',
   RefreshTokenKey: 'refreshauthorization',
   LinkTokenKey: 'LINK-PWD-TOKEN',
   title: 'DataEase',
diff --git a/core/frontend/src/store/index.js b/core/frontend/src/store/index.js
index 433c78b878..32d675aa4d 100644
--- a/core/frontend/src/store/index.js
+++ b/core/frontend/src/store/index.js
@@ -938,6 +938,15 @@ const data = {
       if (state.lastValidFilters[id]) {
         delete state.lastValidFilters[id]
       }
+    },
+    setViewInitFilter(state, viewInfo) {
+      if (viewInfo) {
+        state.componentData.forEach(component => {
+          if (viewInfo.id === component.id) {
+            component.filters = viewInfo.filters
+          }
+        })
+      }
     }
   },
   modules: {
diff --git a/core/frontend/src/store/modules/user.js b/core/frontend/src/store/modules/user.js
index 4bb201dd3e..66f806c407 100644
--- a/core/frontend/src/store/modules/user.js
+++ b/core/frontend/src/store/modules/user.js
@@ -1,5 +1,5 @@
 import { login, logout, deLogout, getInfo, getUIinfo, languageApi } from '@/api/user'
-import { getToken, setToken, removeToken, setSysUI } from '@/utils/auth'
+import { getToken, setToken, removeToken, setSysUI, setTokenExp } from '@/utils/auth'
 import { resetRouter } from '@/router'
 import { format } from '@/utils/formatUi'
 import { getLanguage } from '@/lang/index'
@@ -82,6 +82,7 @@ const actions = {
         commit('SET_TOKEN', data.token)
         commit('SET_LOGIN_MSG', null)
         setToken(data.token)
+        setTokenExp(data.expireTime)
         let passwordModified = true
         if (Object.prototype.hasOwnProperty.call(data, 'passwordModified')) {
           passwordModified = data.passwordModified
diff --git a/core/frontend/src/styles/index.scss b/core/frontend/src/styles/index.scss
index 4ed359da40..67f019cbd9 100644
--- a/core/frontend/src/styles/index.scss
+++ b/core/frontend/src/styles/index.scss
@@ -861,7 +861,6 @@ div:focus {
     height: 24px !important;
     line-height: 24px !important;
     margin-bottom: 9px !important;
-    font-size: 16px !important;
   }
 }
 
diff --git a/core/frontend/src/utils/auth.js b/core/frontend/src/utils/auth.js
index 680a502d86..15e0ffa8f3 100644
--- a/core/frontend/src/utils/auth.js
+++ b/core/frontend/src/utils/auth.js
@@ -2,6 +2,7 @@ import Cookies from 'js-cookie'
 import Config from '@/settings'
 import store from '@/store'
 const TokenKey = Config.TokenKey
+const TokenExpKey = Config.TokenExpKey
 
 const IdTokenKey = Config.IdTokenKey
 
@@ -22,11 +23,26 @@ export function getToken() {
 export function setToken(token) {
   return Cookies.set(TokenKey, token)
 }
+export function setTokenExp(exp) {
+  if (exp) {
+    return Cookies.set(TokenExpKey, exp)
+  }
+  return null
+}
+
+export function tokenExp() {
+  const exp = Cookies.get(TokenExpKey)
+  if (exp && exp > 3000) {
+    return new Date().getTime() > (exp - 3000)
+  }
+  return false
+}
 
 export function removeToken() {
   Cookies.remove(casSessionKey)
   Cookies.remove(IdTokenKey)
   Cookies.remove(AccessTokenKey)
+  Cookies.remove(TokenExpKey)
   return Cookies.remove(TokenKey)
 }
 
diff --git a/core/frontend/src/utils/request.js b/core/frontend/src/utils/request.js
index 9f4224a2e4..5bc5f02ba0 100644
--- a/core/frontend/src/utils/request.js
+++ b/core/frontend/src/utils/request.js
@@ -1,7 +1,7 @@
 import axios from 'axios'
 import store from '@/store'
 import { $alert, $error } from './message'
-import { getToken, getIdToken, setToken } from '@/utils/auth'
+import { getToken, getIdToken, setToken, tokenExp } from '@/utils/auth'
 import Config from '@/settings'
 import i18n from '@/lang'
 import { tryShowLoading, tryHideLoading } from './loading'
@@ -56,7 +56,6 @@ service.interceptors.request.use(
     if (idToken) {
       config.headers[Config.IdTokenKey] = idToken
     }
-
     if (store.getters.token) {
       config.headers[TokenKey] = getToken()
     }
@@ -74,7 +73,26 @@ service.interceptors.request.use(
       config.headers['Accept-Language'] = lang
     }
     config.loading && tryShowLoading(store.getters.currentPath)
-
+    if (config.headers[TokenKey]) {
+      const logoutApiList = ['/api/auth/deLogout', '/api/auth/logout']
+      if (tokenExp() && !logoutApiList.includes(config.url)) {
+        config['expCancel'] = null
+        config.cancelToken = new CancelToken(function executor(c) {
+          config['expCancel'] = c
+        })
+        const message = i18n.t('login.expires')
+        $alert(message, () => {
+          store.dispatch('user/logout').then(() => {
+            location.reload()
+          })
+        }, {
+          confirmButtonText: i18n.t('login.re_login'),
+          showClose: false
+        })
+        config.expCancel('login.expires')
+        return config
+      }
+    }
     config.cancelToken = new CancelToken(function executor(c) {
       Vue.prototype.$currentHttpRequestList.set(config.url, c)
     })
@@ -104,10 +122,12 @@ service.interceptors.response.use(response => {
   }
   return response.data
 }, error => {
-  const config = error.response && error.response.config || error.config
+  let config = error.response && error.response.config || error.config
   const headers = error.response && error.response.headers || error.response || config && config.headers
-  config.loading && tryHideLoading(store.getters.currentPath)
-
+  config?.loading && tryHideLoading(store.getters.currentPath)
+  if (!config && !headers && error.code === 'ERR_CANCELED' && error.message === 'login.expires') {
+    config = { hideMsg: true }
+  }
   let msg = ''
 
   if (error.response) {
@@ -119,7 +139,7 @@ service.interceptors.response.use(response => {
   if (msg.length > 600) {
     msg = msg.slice(0, 600)
   }
-  !config.hideMsg && (!headers['authentication-status']) && !msg?.startsWith('MultiLoginError') && $error(msg)
+  !config?.hideMsg && (!headers['authentication-status']) && !msg?.startsWith('MultiLoginError') && $error(msg)
   return Promise.reject(config.url === '/dataset/table/sqlPreview' ? msg : error)
 })
 const checkDownError = response => {
diff --git a/core/frontend/src/utils/validate.js b/core/frontend/src/utils/validate.js
index 576f91d20c..ded763ccf6 100644
--- a/core/frontend/src/utils/validate.js
+++ b/core/frontend/src/utils/validate.js
@@ -20,3 +20,4 @@ export function validUsername(str) {
 }
 
 export const PHONE_REGEX = '^1[3|4|5|7|8][0-9]{9}$'
+export const EMAIL_REGEX = '^[a-zA-Z0-9_._-]+@[a-zA-Z0-9_-]+(\\.[a-zA-Z0-9_-]+)+$'
diff --git a/core/frontend/src/views/background/index.vue b/core/frontend/src/views/background/index.vue
index 5f09dd7895..4321d6c761 100644
--- a/core/frontend/src/views/background/index.vue
+++ b/core/frontend/src/views/background/index.vue
@@ -236,7 +236,7 @@
         </el-col>
       </el-row>
 
-      <template v-if="this.curComponent.component === 'de-select'">
+      <template v-if="this.curComponent.component === 'de-select' && !this.curComponent.options.attrs.multiple">
         <el-row
           style="height: 40px;overflow: hidden;"
         >
diff --git a/core/frontend/src/views/chart/chart/table/table-info.js b/core/frontend/src/views/chart/chart/table/table-info.js
index 309f079273..87fc5ac4b7 100644
--- a/core/frontend/src/views/chart/chart/table/table-info.js
+++ b/core/frontend/src/views/chart/chart/table/table-info.js
@@ -766,12 +766,16 @@ function getConditions(chart) {
     // table item color
     let valueColor = DEFAULT_COLOR_CASE.tableFontColor
     let valueBgColor = DEFAULT_COLOR_CASE.tableItemBgColor
+    let headerColor = DEFAULT_COLOR_CASE.tableHeaderFontColor
+    let headerBgColor = DEFAULT_COLOR_CASE.tableHeaderBgColor
     if (chart.customAttr) {
       const customAttr = JSON.parse(chart.customAttr)
       // color
       if (customAttr.color) {
         const c = JSON.parse(JSON.stringify(customAttr.color))
         valueColor = c.tableFontColor
+        headerColor = c.tableHeaderFontColor
+        headerBgColor = c.tableHeaderBgColor
         const enableTableCrossBG = c.enableTableCrossBG
         if (!enableTableCrossBG) {
           valueBgColor = hexColorToRGBA(c.tableItemBgColor, c.alpha)
@@ -781,21 +785,35 @@ function getConditions(chart) {
       }
     }
 
+    const dimensionAxis = [...JSON.parse(chart.xaxis), ...JSON.parse(chart.xaxisExt)]
     const filedValueMap = getFieldValueMap(chart)
     for (let i = 0; i < conditions.length; i++) {
       const field = conditions[i]
+      let defaultTextColor = valueColor
+      let defaultBgColor = valueBgColor
+      if (chart.type === 'table-pivot') {
+        const index = dimensionAxis.findIndex(i => i.dataeaseName === field.field.dataeaseName)
+        defaultTextColor = index === -1 ? valueColor : headerColor
+        defaultBgColor = index === -1 ? valueBgColor : headerBgColor
+      }
       res.text.push({
         field: field.field.dataeaseName,
         mapping(value, rowData) {
+          if (rowData?.isTotals) {
+            return null
+          }
           return {
-            fill: mappingColor(value, valueColor, field, 'color', filedValueMap, rowData)
+            fill: mappingColor(value, defaultTextColor, field, 'color', filedValueMap, rowData)
           }
         }
       })
       res.background.push({
         field: field.field.dataeaseName,
         mapping(value, rowData) {
-          const fill = mappingColor(value, valueBgColor, field, 'backgroundColor', filedValueMap, rowData)
+          if (rowData?.isTotals) {
+            return null
+          }
+          const fill = mappingColor(value, defaultBgColor, field, 'backgroundColor', filedValueMap, rowData)
           if (fill) {
             return { fill }
           }
@@ -884,28 +902,62 @@ function mappingColor(value, defaultColor, field, type, filedValueMap, rowData)
       let tv
       if (t.field === '1') {
         tv = getValue(t.targetField, filedValueMap, rowData)
+      } else if (t.field === '2') {
+        tv = t.enumValues
       } else {
         tv = t.value
       }
       if (t.term === 'eq') {
-        if (value === tv) {
-          color = t[type]
-          flag = true
+        if (t.field === '2') {
+          const index = tv?.findIndex(v => v === value)
+          if (index !== -1) {
+            color = t[type]
+            flag = true
+          }
+        } else {
+          if (value === tv) {
+            color = t[type]
+            flag = true
+          }
         }
       } else if (t.term === 'not_eq') {
-        if (value !== tv) {
-          color = t[type]
-          flag = true
+        if (t.field === '2') {
+          const index = tv?.findIndex(v => v === value)
+          if (index === -1) {
+            color = t[type]
+            flag = true
+          }
+        } else {
+          if (value !== tv) {
+            color = t[type]
+            flag = true
+          }
         }
       } else if (t.term === 'like') {
-        if (value.includes(tv)) {
-          color = t[type]
-          flag = true
+        if (t.field === '2') {
+          const index = tv?.findIndex(v => value.includes(v))
+          if (index !== -1) {
+            color = t[type]
+            flag = true
+          }
+        } else {
+          if (value.includes(tv)) {
+            color = t[type]
+            flag = true
+          }
         }
       } else if (t.term === 'not like') {
-        if (!value.includes(tv)) {
-          color = t[type]
-          flag = true
+        if (t.field === '2') {
+          const index = tv?.findIndex(v => value.includes(v))
+          if (index === -1) {
+            color = t[type]
+            flag = true
+          }
+        } else {
+          if (!value.includes(tv)) {
+            color = t[type]
+            flag = true
+          }
         }
       } else if (t.term === 'null') {
         if (value === null || value === undefined || value === '') {
@@ -931,20 +983,41 @@ function mappingColor(value, defaultColor, field, type, filedValueMap, rowData)
         if (fieldValue) {
           tv = new Date(fieldValue.replace(/-/g, '/') + ' GMT+8').getTime()
         }
+      } else if (t.field === '2') {
+        tv = []
+        t.enumValues?.forEach(v => {
+          tv.push(new Date(v.replace(/-/g, '/') + ' GMT+8').getTime())
+        })
       } else {
         tv = new Date(t.value.replace(/-/g, '/') + ' GMT+8').getTime()
       }
 
       const v = new Date(value.replace(/-/g, '/') + ' GMT+8').getTime()
       if (t.term === 'eq') {
-        if (v === tv) {
-          color = t[type]
-          flag = true
+        if (t.field === '2') {
+          const index = tv.findIndex(val => v === val)
+          if (index !== -1) {
+            color = t[type]
+            flag = true
+          }
+        } else {
+          if (v === tv) {
+            color = t[type]
+            flag = true
+          }
         }
       } else if (t.term === 'not_eq') {
-        if (v !== tv) {
-          color = t[type]
-          flag = true
+        if (t.field === '2') {
+          const index = tv.findIndex(val => v === val)
+          if (index === -1) {
+            color = t[type]
+            flag = true
+          }
+        } else {
+          if (v !== tv) {
+            color = t[type]
+            flag = true
+          }
         }
       } else if (t.term === 'lt') {
         if (v < tv) {
diff --git a/core/frontend/src/views/chart/chart/util.js b/core/frontend/src/views/chart/chart/util.js
index 08bd5d2af8..7137f276cc 100644
--- a/core/frontend/src/views/chart/chart/util.js
+++ b/core/frontend/src/views/chart/chart/util.js
@@ -3923,3 +3923,10 @@ export function handleTableEmptyStrategy(tableData, chart) {
   }
   return newData
 }
+
+export function parseJson(target) {
+  if (Object.prototype.toString.call(target) === '[object String]') {
+    return JSON.parse(target)
+  }
+  return JSON.parse(JSON.stringify(target))
+}
diff --git a/core/frontend/src/views/chart/components/senior/Threshold.vue b/core/frontend/src/views/chart/components/senior/Threshold.vue
index 565a2b540c..b0f1ba128c 100644
--- a/core/frontend/src/views/chart/components/senior/Threshold.vue
+++ b/core/frontend/src/views/chart/components/senior/Threshold.vue
@@ -329,6 +329,10 @@
                   v-if="item.field === '1'"
                   :title="$t('chart.field_dynamic')"
                 >{{ $t('chart.field_dynamic') }}</span>
+                <span
+                  v-if="item.field === '2'"
+                  :title="$t('chart.field_enum')"
+                >{{ $t('chart.field_enum') }}</span>
               </el-col>
               <el-col
                 v-if="item.term.includes('null') || item.term.includes('empty')"
@@ -369,6 +373,23 @@
 
                 <span v-else>&nbsp;</span>
               </el-col>
+              <el-col
+                v-if="item.field === '2'"
+                :span="10"
+              >
+                <div
+                  v-if="item.enumValues && item.enumValues.length"
+                  style="display: flex; box-sizing: border-box; justify-content: start; align-items: center; overflow: hidden"
+                >
+                  <span style="display: inline"> {{ item.enumValues.join(',') }}</span>
+                  <el-tooltip
+                    v-if="item.enumValues && item.enumValues.length"
+                    :content="item.enumValues.join(',')"
+                  >
+                    <i class="el-icon-info"></i>
+                  </el-tooltip>
+                </div>
+              </el-col>
 
               <el-col :span="2">
                 <span
diff --git a/core/frontend/src/views/chart/components/senior/dialog/TableThresholdEdit.vue b/core/frontend/src/views/chart/components/senior/dialog/TableThresholdEdit.vue
index 41cab63cf1..70ee0922d0 100644
--- a/core/frontend/src/views/chart/components/senior/dialog/TableThresholdEdit.vue
+++ b/core/frontend/src/views/chart/components/senior/dialog/TableThresholdEdit.vue
@@ -76,7 +76,7 @@
             <el-select
               v-model="item.term"
               size="mini"
-              @change="changeThresholdField(item)"
+              @change="changeThresholdField(item, fieldItem)"
             >
               <el-option-group
                 v-for="(group,idx) in fieldItem.options"
@@ -99,10 +99,10 @@
               v-model="item.field"
               size="mini"
               style="margin-left: 10px;"
-              @change="changeThresholdField(item)"
+              @change="changeThresholdField(item, fieldItem)"
             >
               <el-option
-                v-for="opt in fieldTypeOptions"
+                v-for="opt in getFieldTypeOptions(fieldItem.field, item)"
                 :key="opt.value"
                 :label="opt.label"
                 :value="opt.value"
@@ -328,7 +328,26 @@
             </span>
 
           </el-col>
-
+          <el-col
+            v-if="item.field === '2'"
+            :span="12"
+            >
+            <el-select
+              v-if="!item.term.includes('null') && !item.term.includes('empty') && item.term !== 'between'"
+              v-model="item.enumValues"
+              size="mini"
+              style="margin-left: 10px; width: 100%"
+              multiple
+              clearable
+            >
+              <el-option
+                v-for="value in fieldEnumValues[fieldItem.fieldId]"
+                :key="value"
+                :value="value"
+                :label="value"
+              />
+            </el-select>
+          </el-col>
           <el-col
             :span="3"
             style="display: flex;align-items: center;justify-content: center;"
@@ -373,6 +392,8 @@
 
 <script>
 import { COLOR_PANEL } from '@/views/chart/chart/chart'
+import { post } from '@/api/dataset/dataset'
+import { parseJson } from '@/views/chart/chart/util'
 
 export default {
   name: 'TableThresholdEdit',
@@ -410,7 +431,8 @@ export default {
         max: '1',
         targetField: {},
         minField: {},
-        maxField: {}
+        maxField: {},
+        enumValues: []
       },
       summaryOptions: [{
         id: 'value',
@@ -530,9 +552,16 @@ export default {
       ],
       fieldTypeOptions: [
         { label: this.$t('chart.field_fixed'), value: '0' },
-        { label: this.$t('chart.field_dynamic'), value: '1' }
+        { label: this.$t('chart.field_dynamic'), value: '1' },
+        { label: this.$t('chart.field_enum'), value: '2' }
       ],
-      predefineColors: COLOR_PANEL
+      predefineColors: COLOR_PANEL,
+      fieldEnumValues: {}
+    }
+  },
+  computed: {
+    panelInfo() {
+      return this.$store.state.panel.panelInfo
     }
   },
   mounted() {
@@ -542,14 +571,21 @@ export default {
     init() {
       this.thresholdArr = JSON.parse(JSON.stringify(this.threshold))
       this.initFields()
-      this.thresholdArr && this.thresholdArr.forEach(ele => {
+      const enumFields = new Set([])
+      this.thresholdArr?.forEach(ele => {
         this.initOptions(ele)
         if (ele.conditions) {
           for (const item of ele.conditions) {
             this.initConditionField(item)
+            if (item.field === '2') {
+              enumFields.add(ele.fieldId)
+            }
           }
         }
       })
+      enumFields.forEach(fieldId => {
+        this.getFieldEnumValues(fieldId)
+      })
     },
     initConditionField(item) {
       // 兼容旧数据
@@ -587,30 +623,17 @@ export default {
       }
     },
     initFields() {
-      // 暂时支持指标
       if (this.chart.type === 'table-info') {
-        if (Object.prototype.toString.call(this.chart.xaxis) === '[object Array]') {
-          this.fields = JSON.parse(JSON.stringify(this.chart.xaxis))
-        } else {
-          this.fields = JSON.parse(this.chart.xaxis)
-        }
+        this.fields.splice(0, this.fields.length, ...parseJson(this.chart.xaxis))
       } else if (this.chart.type === 'table-pivot') {
-        if (Object.prototype.toString.call(this.chart.yaxis) === '[object Array]') {
-          this.fields = JSON.parse(JSON.stringify(this.chart.yaxis))
-        } else {
-          this.fields = JSON.parse(this.chart.yaxis)
-        }
+        const yAxis = parseJson(this.chart.yaxis)
+        const xAxis = parseJson(this.chart.xaxis)
+        const xAxisExt = parseJson(this.chart.xaxisExt)
+        this.fields.splice(0, this.fields.length,  ...yAxis, ...xAxis, ...xAxisExt)
       } else {
-        if (Object.prototype.toString.call(this.chart.xaxis) === '[object Array]') {
-          this.fields = this.fields.concat(JSON.parse(JSON.stringify(this.chart.xaxis)))
-        } else {
-          this.fields = this.fields.concat(JSON.parse(this.chart.xaxis))
-        }
-        if (Object.prototype.toString.call(this.chart.yaxis) === '[object Array]') {
-          this.fields = this.fields.concat(JSON.parse(JSON.stringify(this.chart.yaxis)))
-        } else {
-          this.fields = this.fields.concat(JSON.parse(this.chart.yaxis))
-        }
+        const yAxis = parseJson(this.chart.yaxis)
+        const xAxis = parseJson(this.chart.xaxis)
+        this.fields.splice(0, this.fields.length, ...yAxis, ...xAxis)
       }
 
       // 区分文本、数值、日期字段
@@ -654,24 +677,50 @@ export default {
     changeThreshold() {
       this.$emit('onTableThresholdChange', this.thresholdArr)
     },
-    changeThresholdField(item) {
-      if (item.field === '1') {
-        if (item.term === 'between') {
-          item.minField.curField = this.getQuotaField(item.minField.fieldId)
-          item.maxField.curField = this.getQuotaField(item.maxField.fieldId)
+    changeThresholdField(item, curField) {
+      switch (item.field) {
+        case '0':
           item.targetField = {}
-        } else {
-          item.targetField.curField = this.getQuotaField(item.targetField.fieldId)
           item.minField = {}
           item.maxField = {}
-        }
-      } else {
-        item.targetField = {}
-        item.minField = {}
-        item.maxField = {}
+          break
+        case '1':
+          if (item.term === 'between') {
+            item.minField.curField = this.getQuotaField(item.minField.fieldId)
+            item.maxField.curField = this.getQuotaField(item.maxField.fieldId)
+            item.targetField = {}
+          } else {
+            item.targetField.curField = this.getQuotaField(item.targetField.fieldId)
+            item.minField = {}
+            item.maxField = {}
+          }
+          break
+        case '2':
+          if (!curField?.fieldId) {
+            break
+          }
+          // 时间类型只允许相等判断
+          if (curField.field.deType === 1 && !['eq', 'not_eq'].includes(item.term)) {
+            item.field = '0'
+          }
+          this.getFieldEnumValues(curField.fieldId)
+          break
+        default:
+          break
       }
       this.changeThreshold()
     },
+    getFieldEnumValues(fieldId) {
+      if (this.fieldEnumValues[fieldId]) {
+        return
+      }
+      const fieldType = this.getFieldType(fieldId)
+      if (fieldType) {
+        post('/chart/view/getFieldData/' + this.chart.id + '/' + this.panelInfo.id + '/' + fieldId + '/' + fieldType, {}).then(response => {
+          this.$set(this.fieldEnumValues, fieldId, response.data)
+        })
+      }
+    },
     getQuotaField(id) {
       if (!id) {
         return {}
@@ -703,11 +752,60 @@ export default {
           }
         })
       }
-      // 清空 term
-      item.conditions && item.conditions.forEach(ele => {
+      // 重置 term 和 field
+      item.conditions?.forEach(ele => {
         ele.term = ''
+        if (item.field.groupType === 'q' && ele.field === '2') {
+          ele.field = '0'
+        }
+        if (item.field.groupType === 'd') {
+          if (this.chart.type === 'table-pivot' && ele.field === '1') {
+            ele.field = '0'
+          }
+          if (ele.field === '2') {
+            ele.enumValues?.splice(0)
+            this.getFieldEnumValues(item.fieldId)
+          }
+        }
       })
       this.changeThreshold()
+    },
+    getFieldType(fieldId) {
+      let index = -1
+      index = JSON.parse(this.chart.xaxis).findIndex(i => i.id === fieldId)
+      if (index !== -1) {
+        return 'xaxis'
+      }
+      index = JSON.parse(this.chart.xaxisExt).findIndex(i => i.id === fieldId)
+      if (index !== -1) {
+        return 'xaxisExt'
+      }
+    },
+    getFieldTypeOptions(field, condition) {
+      if (field.groupType === 'q') {
+        return [
+          { label: this.$t('chart.field_fixed'), value: '0' },
+          { label: this.$t('chart.field_dynamic'), value: '1' }
+        ]
+      }
+      if (field.deType === 1 && !['eq', 'not_eq'].includes(condition.term)) {
+        if (this.chart.type === 'table-pivot') {
+          return [
+            { label: this.$t('chart.field_fixed'), value: '0' }
+          ]
+        }
+        return [
+          { label: this.$t('chart.field_fixed'), value: '0' },
+          { label: this.$t('chart.field_dynamic'), value: '1' }
+        ]
+      }
+      if (this.chart.type === 'table-pivot') {
+        return [
+          { label: this.$t('chart.field_fixed'), value: '0' },
+          { label: this.$t('chart.field_enum'), value: '2' }
+        ]
+      }
+      return this.fieldTypeOptions
     }
   }
 }
diff --git a/core/frontend/src/views/dataFilling/form/CreateTask.vue b/core/frontend/src/views/dataFilling/form/CreateTask.vue
new file mode 100644
index 0000000000..b0cc52c0d7
--- /dev/null
+++ b/core/frontend/src/views/dataFilling/form/CreateTask.vue
@@ -0,0 +1,968 @@
+<template>
+  <el-container class="DataFillingSave">
+    <el-header class="de-header">
+      <div class="panel-info-area">
+        <span class="text16 margin-left12">
+          {{ id? '编辑任务': '新建任务' }}
+        </span>
+      </div>
+
+      <div style="padding-right: 20px">
+        <i
+          class="el-icon-close"
+          style="cursor: pointer"
+          @click="reset"
+        />
+      </div>
+    </el-header>
+    <el-main class="de-main">
+      <div
+        v-if="userLoadFinish && showDrawer"
+        class="new-task-form"
+      >
+        <el-form
+          ref="taskForm"
+          class="de-form-item"
+          :model="form"
+          :rules="rule"
+          size="small"
+          label-width="100px"
+        >
+          <div class="row-rules marTop0">
+            <span>{{ $t("datasource.base_info") }}</span>
+          </div>
+          <el-form-item
+            :label="$t('xpacktask.name')"
+            prop="name"
+          >
+            <el-input
+              v-model="form.name"
+              @input="setTitle"
+            />
+          </el-form-item>
+
+          <el-form-item
+            :label="$t('commons.user')"
+            prop="userValues"
+          >
+            <el-select
+              ref="userSelect"
+              v-model="form.userValues"
+              style="width: 100%"
+              filterable
+              multiple
+              :popper-append-to-body="false"
+              :placeholder="
+                $t('commons.please_select') + $t('emailtask.recipients')
+              "
+            >
+              <el-option
+                v-for="item in users"
+                :key="item.nickName"
+                :label="item.nickName"
+                :value="item.username"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item
+            :label="$t('commons.role')"
+            prop="roleList"
+          >
+            <el-select
+              ref="roleSelect"
+              v-model="form.roleList"
+              style="width: 100%"
+              filterable
+              multiple
+              :popper-append-to-body="false"
+              :placeholder="
+                $t('commons.please_select') + $t('commons.role')
+              "
+            >
+              <el-option
+                v-for="item in roleOptions"
+                :key="item.name"
+                :label="item.name"
+                :value="item.id"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item
+            :label="$t('commons.organization')"
+            prop="orgList"
+          >
+            <treeselect
+              ref="orgTreeSelect"
+              v-model="form.orgList"
+              class="email-task-tree"
+              size="mini"
+              :multiple="true"
+              :flat="true"
+              :sort-value-by="sortValueBy"
+              :options="orgTreeData"
+              :placeholder="$t('commons.please_select') + $t('commons.organization')"
+            />
+          </el-form-item>
+
+          <div class="row-rules marTop0">
+            <span>{{ $t("emailtask.send_config") }}</span>
+          </div>
+
+          <el-form-item
+            :label="$t('emailtask.rate_type')"
+            prop="rateType"
+          >
+            <el-radio-group v-model="rateType">
+              <el-radio
+                v-for="rate in rateTypeList"
+                :key="rate.label"
+                :label="rate.value"
+              >{{ $t(rate.label) }}</el-radio>
+            </el-radio-group>
+
+            <template v-if="rateType === 'single_task'">
+              <div
+                class="rate-type-time"
+                style="padding-top: 28px; padding-bottom: 0"
+              >
+                <span
+                  class="perfix"
+                  style="margin-bottom: 28px; "
+                >任务下发时间</span>
+                <el-form-item
+                  prop="publishStartTime"
+                  style="flex:1"
+                >
+                  <el-date-picker
+                    v-model="form.publishStartTime"
+                    :clearable="false"
+                    style="width: 100%"
+                    type="datetime"
+                    :picker-options="startPickerOptions"
+                    class="de-time-range"
+                    :placeholder="$t('commons.please_select')"
+                  />
+                </el-form-item>
+              </div>
+              <div
+                class="rate-type-time"
+                style="padding-top: 0; padding-bottom: 0"
+              >
+                <span
+                  class="perfix"
+                  style="margin-bottom: 28px"
+                >填报截止时间</span>
+                <el-form-item
+                  prop="publishEndTime"
+                  style="flex:1"
+                >
+                  <el-date-picker
+                    v-model="form.publishEndTime"
+                    :clearable="false"
+                    style="width: 100%"
+                    type="datetime"
+                    :picker-options="startPickerOptions"
+                    :placeholder="$t('commons.please_select')"
+                    class="de-time-range"
+                    default-time="23:59:59"
+                  />
+                </el-form-item>
+              </div>
+            </template>
+            <template v-else-if="rateType === 'simple_repeat'">
+              <div class="rate-type-time">
+
+                <el-select
+                  v-model="timeTypeValue"
+                  class="w140"
+                >
+                  <el-option
+                    v-for="item in timeType"
+                    :key="item.value"
+                    :label="$t(item.label)"
+                    :value="item.value"
+                  />
+                </el-select>
+                <el-select
+                  v-if="timeTypeValue === 1"
+                  v-model="weekTypeValue"
+                  class="w140"
+                >
+                  <el-option
+                    v-for="item in weekType"
+                    :key="item.value"
+                    :label="$t(item.label)"
+                    :value="item.value"
+                  />
+                </el-select>
+                <el-select
+                  v-if="timeTypeValue === 2"
+                  v-model="monthTypeValue"
+                  class="w140"
+                >
+                  <el-option
+                    v-for="item in monthType"
+                    :key="item.value"
+                    :label="(item.label + $t('dynamic_time.date'))"
+                    :value="item.value"
+                  />
+                </el-select>
+                <el-time-picker
+                  v-model="timePicker"
+                  :clearable="false"
+                  class="w140"
+                  :picker-options="{
+                    selectableRange: '00:00:00 - 23:59:59',
+                  }"
+                />
+                <span class="tail">{{ $t('cron.every_exec') }}</span>
+              </div>
+              <div class="rate-type-time second-row">
+                <span class="perfix">在任务下发</span>
+                <el-input-number
+                  v-model.number="form.publishRangeTime"
+                  class="w140"
+                  min="1"
+                  step="1"
+                />
+                <el-select
+                  v-model="form.publishRangeTimeType"
+                  class="w140"
+                >
+                  <el-option
+                    v-for="item in simpleTimeType"
+                    :key="item.value"
+                    :label="$t(item.label)"
+                    :value="item.value"
+                  />
+                </el-select>
+
+                <span class="tail">内完成填报</span>
+              </div>
+            </template>
+          </el-form-item>
+
+          <template v-if="rateType === 'simple_repeat'">
+            <el-form-item
+              :label="$t('emailtask.start_time')"
+              prop="startTime"
+            >
+              <el-date-picker
+                v-model="form.startTime"
+                :clearable="false"
+                class="de-time-range"
+                type="datetime"
+                :picker-options="startPickerOptions"
+                :placeholder="
+                  $t('commons.please_select') + $t('emailtask.start_time')
+                "
+              />
+            </el-form-item>
+
+            <el-form-item
+              :label="$t('emailtask.end_time')"
+              prop="endTime"
+            >
+              <el-date-picker
+                v-model="form.endTime"
+                class="de-time-range"
+                type="datetime"
+                :clearable="false"
+                :picker-options="startPickerOptions"
+                popper-class="link-date-picker-class"
+                :placeholder="$t('commons.please_select') + $t('emailtask.end_time')"
+                default-time="23:59:59"
+              />
+            </el-form-item>
+          </template>
+        </el-form>
+      </div>
+    </el-main>
+    <el-footer
+      class="de-footer"
+    >
+      <el-button @click="reset">{{ $t("commons.cancel") }}</el-button>
+      <el-button
+        type="primary"
+        @click="save"
+      >{{ $t("commons.confirm") }}
+      </el-button>
+    </el-footer>
+  </el-container>
+</template>
+
+<script>
+import { timeType, weekType, monthType, simpleTimeType } from './options'
+import { roleGrid, userListsWithOutPage } from '@/api/system/user'
+import { loadTable } from '@/api/system/dept'
+import { saveFormTasks, searchFormTasks } from '@/views/dataFilling/form/dataFilling'
+import { cloneDeep } from 'lodash-es'
+export default {
+  name: 'TaskEmailForm',
+  props: {
+    id: {
+      type: String,
+      required: false
+    },
+    formId: {
+      type: String,
+      required: true
+    },
+    showDrawer: {
+      type: Boolean,
+      required: true
+    }
+  },
+  data() {
+    return {
+      showTable: false,
+      showMedia: false,
+      formType: 'add',
+      rateType: 'single_task',
+      timeType,
+      weekType,
+      monthType,
+      simpleTimeType,
+      timeTypeValue: 1,
+      weekTypeValue: 1,
+      monthTypeValue: 1,
+      timePicker: new Date(),
+      roleOptions: [],
+      orgTreeData: [],
+      sortValueBy: 'ORDER_SELECTED',
+      form: {
+        name: '',
+        rateType: -1,
+        rateVal: undefined,
+        publishStartTime: undefined,
+        publishEndTime: undefined,
+        publishRangeTimeType: 0,
+        publishRangeTime: 1,
+        userValues: [],
+        roleList: [],
+        orgList: []
+      },
+      rule: {
+        name: [
+          {
+            required: true,
+            trigger: 'blur',
+            message: this.$t('commons.cannot_be_null')
+          },
+          {
+            min: 1,
+            max: 50,
+            message: this.$t('commons.input_limit', [1, 50]),
+            trigger: 'blur'
+          }
+        ],
+
+        userValues: [
+          {
+            required: false,
+            trigger: ['blur', 'change'],
+            validator: this.validateReci
+          }
+        ],
+
+        rateType: [
+          {
+            required: true,
+            trigger: 'blur',
+            message: this.$t('commons.cannot_be_null')
+          }
+        ],
+        rateVal: [
+          {
+            required: true,
+            trigger: 'blur',
+            message: this.$t('commons.cannot_be_null')
+          }
+        ],
+        startTime: [
+          {
+            required: true,
+            trigger: 'blur',
+            message: this.$t('commons.cannot_be_null')
+          },
+          {
+            required: true,
+            validator: this.validateMin,
+            trigger: 'blur'
+          }
+        ],
+        endTime: [
+          {
+            required: true,
+            trigger: 'blur',
+            message: this.$t('commons.cannot_be_null')
+          },
+          {
+            required: true,
+            validator: this.validateMax,
+            trigger: 'blur'
+          }
+        ],
+        publishStartTime: [
+          {
+            required: true,
+            trigger: 'blur',
+            message: this.$t('commons.cannot_be_null')
+          },
+          {
+            required: true,
+            validator: this.validatePublishMin,
+            trigger: 'blur'
+          }
+        ],
+        publishEndTime: [
+          {
+            required: true,
+            trigger: 'blur',
+            message: this.$t('commons.cannot_be_null')
+          },
+          {
+            required: true,
+            validator: this.validatePublishMax,
+            trigger: 'blur'
+          }
+        ],
+        roleList: [
+          {
+            required: false,
+            trigger: ['blur', 'change'],
+            validator: this.validateReci
+          }
+        ],
+        orgList: [
+          {
+            required: false,
+            trigger: ['blur', 'change'],
+            validator: this.validateReci
+          }
+        ]
+      },
+      roles: [],
+      originName: null,
+      panelData: [],
+      users: [],
+      radio: 'default',
+
+      rateTypeList: [
+        {
+          label: 'emailtask.single_task',
+          value: 'single_task'
+        },
+        {
+          label: 'emailtask.simple_repeat',
+          value: 'simple_repeat'
+        }
+      ],
+
+      format: '',
+      htmlContent: '',
+      previewHtml: '',
+      previewDialog: false,
+      startPickerOptions: {
+        disabledDate: (time) => {
+          return time.getTime() < Date.now() - 8.64e7
+        }
+      },
+      sourceForm: {},
+      panelLoadFinish: false,
+      userLoadFinish: false,
+      viewLoaded: false,
+      showEditor: false
+    }
+  },
+
+  computed: {},
+  watch: {
+
+  },
+  created() {
+    this.loadRoles()
+    this.loadOrgs()
+    this.loadUsers()
+  },
+  mounted() {
+    if (this.id) {
+      searchFormTasks(this.formId, { id: this.id }, 1, 10).then(res => {
+        if (res.data) {
+          const _data = res.data.listObject[0]
+
+          this.form = {
+            name: _data.name,
+            rateType: _data.rateType,
+            rateVal: _data.rateVal,
+            publishStartTime: _data.publishStartTime ? new Date(_data.publishStartTime) : undefined,
+            publishEndTime: _data.publishEndTime ? new Date(_data.publishEndTime) : undefined,
+            startTime: _data.startTime ? new Date(_data.startTime) : undefined,
+            endTime: _data.endTime ? new Date(_data.endTime) : undefined,
+            publishRangeTimeType: _data.publishRangeTimeType ? _data.publishRangeTimeType : 0,
+            publishRangeTime: _data.publishRangeTime ? _data.publishRangeTime : 1,
+            userValues: _data.reciUsers ? _data.reciUsers.split(',') : [],
+            roleList: _data.roleList ? _data.roleList.split(',') : [],
+            orgList: _data.orgList ? _data.orgList.split(',') : []
+          }
+
+          this.sourceForm = cloneDeep(this.form)
+
+          if (_data.rateType === -1) {
+            this.rateType = 'single_task'
+          } else {
+            this.rateType = 'simple_repeat'
+            this.timePicker = new Date(_data.rateVal)
+            this.timeTypeValue = _data.rateType
+
+            if (this.timeTypeValue === 1) {
+              this.weekTypeValue = this.timePicker.getDate()
+            }
+
+            if (this.timeTypeValue === 2) {
+              this.monthTypeValue = this.timePicker.getDate()
+            }
+          }
+        }
+      })
+    }
+  },
+  destroyed() {
+  },
+  methods: {
+
+    beforeClearAll(val) {
+      this.beforeClearAll()
+      return true
+    },
+    onRemarkChange(value) {
+      this.htmlContent = value
+    },
+
+    reset() {
+      this.$emit('update:showDrawer', false)
+    },
+
+    save() {
+      const request = this.form
+
+      request.rateType = -1
+
+      if (this.rateType !== 'single_task') {
+        request.rateType = this.timeTypeValue
+        let dayTime = '01'
+        if (this.timeTypeValue === 1) {
+          dayTime = `0${this.weekTypeValue}`
+        }
+
+        if (this.timeTypeValue === 2) {
+          dayTime =
+            this.monthTypeValue < 10
+              ? `0${this.monthTypeValue}`
+              : this.monthTypeValue
+        }
+        const hms = this.timePicker
+          ? new Date(this.timePicker).format('hh:mm:ss')
+          : '00:00:01'
+        request.rateVal = `2024-03-${dayTime} ${hms}`
+
+        delete request.publishStartTime
+        delete request.publishEndTime
+      } else {
+        delete request.publishRangeTimeType
+        delete request.publishRangeTime
+      }
+      const param = {
+        request: JSON.parse(JSON.stringify(request))
+      }
+
+      this.$refs.taskForm.validate((valid) => {
+        if (valid) {
+          param.request.reciUsers = null
+
+          if (param.request.userValues) {
+            const valueResult = this.resolveUserValue(param.request.userValues)
+
+            if (valueResult && valueResult.reciUsers) {
+              param.request.reciUsers = Array.isArray(valueResult.reciUsers) ? valueResult.reciUsers.join() : valueResult.reciUsers
+            }
+          }
+
+          if (param.request.roleList) {
+            param.request.roleList = Array.isArray(param.request.roleList) ? param.request.roleList.join() : param.request.roleList
+          }
+
+          if (param.request.orgList) {
+            param.request.orgList = Array.isArray(param.request.orgList) ? param.request.orgList.join() : param.request.orgList
+          }
+
+          delete param.request.userValues
+
+          if (this.id) {
+            param.request.id = this.id
+          }
+
+          saveFormTasks(this.formId, param.request).then(res => {
+            this.$emit('save-success')
+          })
+        } else {
+          return false
+        }
+      })
+    },
+
+    buildUserValue(recipients, reciUsers) {
+      const userValues = []
+      reciUsers.forEach(user => {
+        !userValues.includes(user) && userValues.push(user)
+      })
+
+      recipients.forEach(recipient => {
+        const tempUser = this.userWithEmail(recipient)
+        if (tempUser && tempUser.username) {
+          !userValues.includes(tempUser.username) && userValues.push(tempUser.username)
+        } else {
+          !userValues.includes(recipient) && userValues.push(recipient)
+        }
+      })
+      return userValues
+    },
+    userWithRecipient(recipient) {
+      for (let index = 0; index < this.users.length; index++) {
+        const element = this.users[index]
+        if (recipient === element.username) {
+          return element
+        }
+      }
+      return null
+    },
+    userWithEmail(email) {
+      for (let index = 0; index < this.users.length; index++) {
+        const element = this.users[index]
+        if (email === element.email) {
+          return element
+        }
+      }
+      return null
+    },
+    resolveUserValue(userValues) {
+      const result = {}
+      userValues.forEach(value => {
+        const user = this.userWithRecipient(value)
+        if (user) {
+          if (!result.reciUsers) {
+            result.reciUsers = []
+          }
+          result.reciUsers.push(value)
+        } else {
+          if (!result.recipients) {
+            result.recipients = []
+          }
+          result.recipients.push(value)
+        }
+      })
+      return result
+    },
+
+    loadUsers(callBack) {
+      userListsWithOutPage({}).then((res) => {
+        this.userLoadFinish = true
+        this.users = res.data
+        callBack && callBack()
+      })
+    },
+    loadRoles() {
+      roleGrid(1, 0, {}).then((res) => {
+        this.roleOptions = res.data.listObject.map(item => {
+          return {
+            id: item.roleId.toString(),
+            name: item.name
+          }
+        })
+      })
+    },
+    convertOrgNode(data) {
+      return data.map(item => {
+        const tempItem = {
+          id: item.deptId,
+          label: item.name,
+          pid: item.pid
+        }
+        if (item.hasChildren) {
+          tempItem.children = null
+        }
+        return tempItem
+      })
+    },
+    loadOrgs() {
+      loadTable({ pid: null }).then((res) => {
+        const data = this.convertOrgNode(res.data)
+        this.orgTreeData = this.buildTree(data)
+      })
+    },
+    buildTree(arrs) {
+      const idMapping = arrs.reduce((acc, el, i) => {
+        acc[el.id] = i
+        return acc
+      }, {})
+      const roots = []
+      arrs.forEach(el => {
+        // 判断根节点
+        if (el.pid === null || el.pid === 0) {
+          roots.push(el)
+          return
+        }
+        // 用映射表找到父元素
+        const parentEl = arrs[idMapping[el.pid]]
+        // 把当前元素添加到父元素的`children`数组中
+        parentEl.children = [...(parentEl.children || []), el]
+      })
+      return roots
+    },
+
+    setTitle(val) {
+      this.form.title = val
+    },
+
+    validateMin(rule, value, callback) {
+      if (this.id && value?.getTime() === this.sourceForm.startTime?.getTime()) { return callback() }
+      if (!value) return callback()
+      const val = new Date(value)
+      if (val.getTime() < Date.now() - 60 * 1000) {
+        return callback(new Error('不能小于当前时间'))
+      }
+      if (this.form.endTime) {
+        if (val.getTime() >= new Date(this.form.endTime).getTime()) {
+          return callback(new Error('不能大于结束时间'))
+        }
+      }
+      return callback()
+    },
+    validateMax(rule, value, callback) {
+      if (this.id && value?.getTime() === this.sourceForm.endTime?.getTime()) { return callback() }
+      if (!value) return callback()
+      const val = new Date(value)
+      if (val.getTime() < Date.now()) {
+        return callback(new Error('不能小于当前时间'))
+      }
+
+      if (this.form.startTime) {
+        if (val.getTime() <= new Date(this.form.startTime).getTime()) {
+          return callback(new Error('不能小于开始时间'))
+        }
+      }
+      return callback()
+    },
+    validatePublishMin(rule, value, callback) {
+      if (this.id && value?.getTime() === this.sourceForm?.publishStartTime?.getTime()) { return callback() }
+      if (!value) return callback()
+      const val = new Date(value)
+      if (val.getTime() < Date.now() - 60 * 1000) {
+        return callback(new Error('不能小于当前时间'))
+      }
+      if (this.form.publishEndTime) {
+        if (val.getTime() >= new Date(this.form.publishEndTime).getTime()) {
+          return callback(new Error('不能大于结束时间'))
+        }
+      }
+      return callback()
+    },
+    validatePublishMax(rule, value, callback) {
+      if (this.id && value?.getTime() === this.sourceForm.publishEndTime?.getTime()) { return callback() }
+      if (!value) return callback()
+      const val = new Date(value)
+      if (val.getTime() < Date.now()) {
+        return callback(new Error('不能小于当前时间'))
+      }
+
+      if (this.form.publishStartTime) {
+        if (val.getTime() <= new Date(this.form.publishStartTime).getTime()) {
+          return callback(new Error('不能小于开始时间'))
+        }
+      }
+      return callback()
+    },
+    validateWaitTime(rule, value, callback) {
+      if (value === null || typeof value === 'undefined') {
+        return callback(new Error(this.$t('commons.cannot_be_null')))
+      }
+      const reg = /^([0-9]{1,2}|30)$/
+      if (!reg.test(value)) {
+        return callback(new Error(this.$t('emailtask.wat_time_limit')))
+      }
+      callback()
+    },
+    validateReci(rule, value, callback) {
+      if ((!this.form.userValues || this.form.userValues.length === 0) &&
+        (!this.form.roleList || this.form.roleList.length === 0) &&
+        (!this.form.orgList || this.form.orgList.length === 0)) {
+        return callback(new Error('收件人、角色、组织至少选择一项'))
+      }
+      return callback()
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.inline {
+  display: flex;
+
+  .el-form-item {
+    margin-right: 30px !important;
+  }
+}
+.email-task-tree >>> .vue-treeselect__control {
+  height: 28px !important;
+}
+
+.email-task-tree >>> .vue-treeselect__menu-container {
+  z-index: 2000 !important;
+}
+
+.row-rules {
+  display: flex;
+  align-items: center;
+  position: relative;
+  font-family: PingFang SC;
+  font-size: 14px;
+  font-weight: 500;
+  line-height: 22px;
+  padding-left: 10px;
+  margin: 16px 0;
+
+  &::before {
+    content: "";
+    position: absolute;
+    left: 0;
+    top: 50%;
+    transform: translateY(-50%);
+    height: 14px;
+    width: 2px;
+    background: #3370ff;
+  }
+}
+.marTop0 {
+  margin-top: 0;
+}
+</style>
+
+<style lang="scss">
+.DataFillingSave {
+
+  height: 100%;
+
+  .de-header {
+    height: 56px !important;
+    padding: 0px !important;
+    border-bottom: 1px solid #E6E6E6;
+    background-color: var(--SiderBG, white);
+
+    display: flex;
+    flex-direction: row;
+    align-items: center;
+    justify-content: space-between
+  }
+
+  .de-footer {
+    display: flex;
+    flex-direction: row;
+    align-items: center;
+    justify-content: flex-end
+  }
+
+  .panel-info-area {
+    padding-left: 20px;
+  }
+}
+
+.new-task-form {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+  width: 100%;
+  padding-bottom: 24px;
+  & > :nth-child(1) {
+    width: 600px;
+  }
+
+  textarea {
+    height: 92px;
+    width: 100%;
+  }
+
+  .el-textarea .el-input__count {
+    font-family: PingFang SC;
+    font-size: 12px;
+    font-weight: 400;
+    color: #8f959e;
+    line-height: 20px;
+    padding: 0 12px 6px 0;
+    right: 1px;
+    bottom: 1px;
+    border-bottom-right-radius: 4px;
+  }
+}
+
+.de-time-range {
+  width: 100% !important;
+}
+
+.rate-type-time {
+  width: 100%;
+  border-radius: 4px;
+  padding: 20px;
+  background-color: var(--MainBG, #f5f6f7);
+  display: flex;
+  align-items: center;
+
+  .w140 {
+    width: 140px !important;
+    margin-right: 8px;
+  }
+
+  .el-input__inner {
+    background: var(--ContentBG, #ffffff) !important;
+  }
+
+  .w160 {
+    width: 160px !important;
+  }
+
+  .perfix {
+    font-family: PingFang SC;
+    font-size: 14px;
+    font-weight: 400;
+    color: var(--deTextPrimary, #1f2329);
+    margin-right: 8px;
+  }
+
+  .tail {
+    font-family: PingFang SC;
+    font-size: 14px;
+    font-weight: 400;
+    color: var(--deTextPrimary, #1f2329);
+  }
+}
+.second-row {
+  padding-top: 0;
+}
+
+.de-foot-layout {
+  position: absolute;
+  width: calc(100% - 48px);
+  height: 80px;
+  bottom: 0;
+  right: 24px;
+  background-color: var(--MainBG, #fff);
+  box-shadow: 0px -2px 4px rgba(0, 0, 0, 0.08);
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  .cont {
+    width: 600px;
+    text-align: right;
+  }
+}
+</style>
diff --git a/core/frontend/src/views/dataFilling/form/EditFormData.vue b/core/frontend/src/views/dataFilling/form/EditFormData.vue
new file mode 100644
index 0000000000..afa2035631
--- /dev/null
+++ b/core/frontend/src/views/dataFilling/form/EditFormData.vue
@@ -0,0 +1,451 @@
+<script>
+import { forEach, find, concat, cloneDeep } from 'lodash-es'
+import { PHONE_REGEX, EMAIL_REGEX } from '@/utils/validate'
+import { newFormRowData, saveFormRowData, userFillFormData } from '@/views/dataFilling/form/dataFilling'
+
+export default {
+  name: 'EditFormData',
+  props: {
+    id: {
+      type: String,
+      required: false
+    },
+    userTaskId: {
+      type: String,
+      required: false
+    },
+    title: {
+      type: String,
+      required: false
+    },
+    formTitle: {
+      type: String,
+      required: true
+    },
+    formId: {
+      type: String,
+      required: true
+    },
+    forms: {
+      type: Object,
+      required: true
+    },
+    data: {
+      type: Object,
+      required: false
+    },
+    showDrawer: {
+      type: Boolean,
+      required: true
+    },
+    readonly: {
+      type: Boolean,
+      required: true
+    }
+  },
+  data() {
+    const checkDateRangeRequireValidator = (rule, value, callback) => {
+      if (!value) {
+        return callback(new Error('必填'))
+      }
+      if (value.length < 2) {
+        return callback(new Error('必填'))
+      }
+      if (!value[0]) {
+        return callback(new Error('必填'))
+      }
+      if (!value[1]) {
+        return callback(new Error('必填'))
+      }
+      callback()
+    }
+    return {
+      formData: {},
+      requiredRule: { required: true, message: this.$t('commons.required'), trigger: ['blur', 'change'] },
+      dateRangeRequiredRule: { validator: checkDateRangeRequireValidator, message: this.$t('commons.required'), trigger: ['blur', 'change'] },
+      inputTypes: [
+        { type: 'text', name: '普通文本', rules: [] },
+        { type: 'number', name: '数字', rules: [] },
+        {
+          type: 'tel',
+          name: '手机号',
+          rules: [{ pattern: PHONE_REGEX, message: this.$t('user.mobile_number_format_is_incorrect'), trigger: ['blur', 'change'] }]
+        },
+        {
+          type: 'email',
+          name: '邮箱',
+          rules: [{ pattern: EMAIL_REGEX, message: this.$t('user.email_format_is_incorrect'), trigger: ['blur', 'change'] }]
+        }
+      ]
+    }
+  },
+  watch: {},
+  mounted() {
+    this.formData = []
+    forEach(this.forms, v => {
+      const f = cloneDeep(v)
+      if (f.type === 'dateRange') {
+        const _start = this.data[f.settings.mapping.columnName1]
+        const _end = this.data[f.settings.mapping.columnName2]
+        f.value = [_start, _end]
+      } else {
+        const _value = this.data[f.settings.mapping.columnName]
+        if (f.type === 'select' && f.settings.multiple || f.type === 'checkbox') {
+          if (_value) {
+            f.value = JSON.parse(_value)
+          } else {
+            f.value = []
+          }
+        } else {
+          f.value = _value
+        }
+      }
+      this.formData.push(f)
+    })
+  },
+  methods: {
+    getRules(item) {
+      let rules = []
+      if (item.settings.required) {
+        rules.push(this.requiredRule)
+        if (item.type === 'dateRange') {
+          rules.push(this.dateRangeRequiredRule)
+        }
+      }
+      if (item.type === 'input') {
+        const inputRules = find(this.inputTypes, t => t.type === item.settings.inputType).rules
+        if (inputRules) {
+          rules = concat(rules, inputRules)
+        }
+      }
+      return rules
+    },
+    closeDrawer() {
+      this.$emit('update:showDrawer', false)
+    },
+    doSave() {
+      this.$refs['mForm'].validate((valid) => {
+        if (valid) {
+          const _data = {}
+          forEach(this.formData, f => {
+            if (f.type === 'dateRange') {
+              const _start = f.settings.mapping.columnName1
+              const _end = f.settings.mapping.columnName2
+              if (f.value) {
+                if (f.value[0]) {
+                  _data[_start] = f.value[0].getTime()
+                }
+                if (f.value[1]) {
+                  _data[_end] = f.value[1].getTime()
+                }
+              }
+            } else {
+              const name = f.settings.mapping.columnName
+              if (f.type === 'select' && f.settings.multiple || f.type === 'checkbox') {
+                if (f.value) {
+                  _data[name] = JSON.stringify(f.value)
+                }
+              } else if (f.type === 'date' && f.value) {
+                _data[name] = f.value.getTime()
+              } else {
+                _data[name] = f.value
+              }
+            }
+          })
+
+          if (this.userTaskId) {
+            userFillFormData(this.userTaskId, _data).then(res => {
+              this.$emit('save-success')
+            })
+          } else {
+            if (this.id !== undefined) {
+              // update
+              saveFormRowData(this.formId, this.id, _data).then(res => {
+                this.$emit('save-success')
+              })
+            } else {
+              // insert
+              newFormRowData(this.formId, _data).then(res => {
+                this.$emit('save-success')
+              })
+            }
+          }
+        }
+      })
+    }
+  }
+
+}
+</script>
+
+<template>
+  <el-container class="DataFillingSave">
+    <el-header class="de-header">
+      <div class="panel-info-area">
+        <span class="text16 margin-left12">
+          {{ title? title: (readonly? '查看数据': '编辑数据') }}
+        </span>
+      </div>
+
+      <div style="padding-right: 20px">
+        <i
+          class="el-icon-close"
+          style="cursor: pointer"
+          @click="closeDrawer"
+        />
+      </div>
+    </el-header>
+    <el-main class="de-main">
+      <div style="width: 80%">
+        <div class="m-title">{{ formTitle }}</div>
+      </div>
+      <el-form
+        ref="mForm"
+        class="m-form"
+        label-position="top"
+        hide-required-asterisk
+        :model="formData"
+      >
+        <div
+          v-for="(item, $index) in formData"
+          :key="item.id"
+          class="m-item m-form-item"
+        >
+
+          <div class="m-label-container">
+            <span style="width: unset">
+              {{ item.settings.name }}
+              <span
+                v-if="item.settings.required"
+                style="color: red"
+              >*</span>
+            </span>
+          </div>
+          <el-form-item
+            :prop="'['+ $index +'].value'"
+            class="form-item"
+            :readonly="readonly"
+            :rules="getRules(item)"
+          >
+            <el-input
+              v-if="item.type === 'input' && item.settings.inputType !== 'number'"
+              v-model="item.value"
+              :type="item.settings.inputType"
+              :required="item.settings.required"
+              :readonly="readonly"
+              :placeholder="item.settings.placeholder"
+              size="small"
+            />
+            <el-input-number
+              v-if="item.type === 'input' && item.settings.inputType === 'number'"
+              v-model="item.value"
+              :required="item.settings.required"
+              :disabled="readonly"
+              :placeholder="item.settings.placeholder"
+              style="width: 100%"
+              controls-position="right"
+              size="small"
+            />
+            <el-input
+              v-else-if="item.type === 'textarea'"
+              v-model="item.value"
+              type="textarea"
+              :required="item.settings.required"
+              :readonly="readonly"
+              :placeholder="item.settings.placeholder"
+              size="small"
+            />
+            <el-select
+              v-else-if="item.type === 'select'"
+              v-model="item.value"
+              :required="item.settings.required"
+              :disabled="readonly"
+              :placeholder="item.settings.placeholder"
+              style="width: 100%"
+              size="small"
+              :multiple="item.settings.multiple"
+              clearable
+            >
+              <el-option
+                v-for="(x, $index) in item.settings.options"
+                :key="$index"
+                :label="x.name"
+                :value="x.value"
+              />
+            </el-select>
+            <el-radio-group
+              v-else-if="item.type === 'radio'"
+              v-model="item.value"
+              :required="item.settings.required"
+              :disabled="readonly"
+              style="width: 100%"
+              size="small"
+            >
+              <el-radio
+                v-for="(x, $index) in item.settings.options"
+                :key="$index"
+                :label="x.value"
+              >{{ x.name }}
+              </el-radio>
+            </el-radio-group>
+            <el-checkbox-group
+              v-else-if="item.type === 'checkbox'"
+              v-model="item.value"
+              :required="item.settings.required"
+              :disabled="readonly"
+              size="small"
+            >
+              <el-checkbox
+                v-for="(x, $index) in item.settings.options"
+                :key="$index"
+                :label="x.value"
+              >{{ x.name }}
+              </el-checkbox>
+            </el-checkbox-group>
+            <el-date-picker
+              v-else-if="item.type === 'date' && !item.settings.enableTime"
+              v-model="item.value"
+              :required="item.settings.required"
+              :readonly="readonly"
+              type="date"
+              :placeholder="item.settings.placeholder"
+              style="width: 100%"
+              size="small"
+            />
+            <el-date-picker
+              v-else-if="item.type === 'date' && item.settings.enableTime"
+              v-model="item.value"
+              :required="item.settings.required"
+              :readonly="readonly"
+              type="datetime"
+              :placeholder="item.settings.placeholder"
+              style="width: 100%"
+              size="small"
+            />
+            <el-date-picker
+              v-else-if="item.type === 'dateRange' && !item.settings.enableTime"
+              v-model="item.value"
+              :required="item.settings.required"
+              :readonly="readonly"
+              type="daterange"
+              :range-separator="item.settings.rangeSeparator"
+              :start-placeholder="item.settings.startPlaceholder"
+              :end-placeholder="item.settings.endPlaceholder"
+              style="width: 100%"
+              size="small"
+            />
+            <el-date-picker
+              v-else-if="item.type === 'dateRange' && item.settings.enableTime"
+              v-model="item.value"
+              :required="item.settings.required"
+              :readonly="readonly"
+              type="datetimerange"
+              :range-separator="item.settings.rangeSeparator"
+              :start-placeholder="item.settings.startPlaceholder"
+              :end-placeholder="item.settings.endPlaceholder"
+              style="width: 100%"
+              size="small"
+            />
+
+          </el-form-item>
+        </div>
+      </el-form>
+    </el-main>
+    <el-footer
+      class="de-footer"
+    >
+      <el-button @click="closeDrawer">取消</el-button>
+      <el-button
+        v-if="!readonly"
+        type="primary"
+        @click="doSave"
+      >保存
+      </el-button>
+    </el-footer>
+  </el-container>
+</template>
+
+<style  lang="scss" scoped>
+.DataFillingSave {
+
+  height: 100%;
+
+  .de-header {
+    height: 56px !important;
+    padding: 0px !important;
+    border-bottom: 1px solid #E6E6E6;
+    background-color: var(--SiderBG, white);
+
+    display: flex;
+    flex-direction: row;
+    align-items: center;
+    justify-content: space-between
+  }
+
+  .de-footer {
+    display: flex;
+    flex-direction: row;
+    align-items: center;
+    justify-content: flex-end
+  }
+
+  .panel-info-area {
+    padding-left: 20px;
+  }
+
+  .de-main {
+    display: flex;
+    align-items: center;
+    flex-direction: column;
+
+    .m-form {
+      width: 80%;
+    }
+  }
+
+  .m-title {
+    margin: 40px 20px 20px;
+
+    height: 28px;
+
+    font-weight: 500;
+    font-size: 20px;
+    line-height: 28px;
+
+    white-space: nowrap;
+    text-overflow: ellipsis;
+  }
+
+  .m-item {
+    width: 100%;
+    border: solid 1px #eee;
+    background-color: #f1f1f1;
+    border-radius: 4px;
+  }
+
+  .m-form-item {
+    margin-bottom: 10px;
+    border-radius: 4px;
+
+    border: solid 1px transparent;
+    background-color: unset;
+
+    padding: 8px 20px;
+  }
+
+  .m-label-container {
+    width: 100%;
+    display: flex;
+    flex-direction: row;
+    align-items: center;
+    justify-content: space-between;
+
+    font-weight: 500;
+    font-size: 14px;
+    line-height: 22px;
+
+    margin-bottom: 8px;
+
+  }
+}
+</style>
diff --git a/core/frontend/src/views/dataFilling/form/NoSelect.vue b/core/frontend/src/views/dataFilling/form/NoSelect.vue
new file mode 100644
index 0000000000..be2b8e51d3
--- /dev/null
+++ b/core/frontend/src/views/dataFilling/form/NoSelect.vue
@@ -0,0 +1,21 @@
+<template>
+  <el-col style="height: 100%">
+    <el-empty
+      style="padding-top: 202px"
+      :image-size="125"
+      :image="errImg"
+      :description="$t('data_fill.on_the_left')"
+    />
+  </el-col>
+</template>
+
+<script>
+export default {
+  name: 'DataHome',
+  data() {
+    return {
+      errImg: require('@/assets/None_Select_ds.png')
+    }
+  }
+}
+</script>
diff --git a/core/frontend/src/views/dataFilling/form/ViewTable.vue b/core/frontend/src/views/dataFilling/form/ViewTable.vue
new file mode 100644
index 0000000000..d6eb477ec5
--- /dev/null
+++ b/core/frontend/src/views/dataFilling/form/ViewTable.vue
@@ -0,0 +1,1064 @@
+<template>
+  <div class="view-table">
+    <el-row>
+      <el-col
+        class="de-dataset-name"
+        :span="16"
+      >
+        <span
+          class="title-text"
+          style="line-height: 26px"
+          :title="param.name"
+        >
+          {{ param.name }}
+        </span>
+        <el-divider direction="vertical" />
+        <span class="create-by">{{ $t('data_fill.form.creator') }}</span>
+        <span class="create-by">:{{ param.creatorName || 'N/A' }}</span>
+        <el-popover
+          placement="bottom"
+          width="420"
+          trigger="hover"
+          @show="showTab"
+          @hide="hideTab"
+        >
+          <div class="info-tab">
+            <div class="info-card">
+              <div class="info-item">
+                <p class="info-title">
+                  {{ $t('data_fill.form.form_name') }}
+                </p>
+                <p class="info-content">{{ param.name }}</p>
+              </div>
+              <div class="info-item">
+                <p class="info-title">
+                  {{ $t('data_fill.form.datasource') }}
+                </p>
+                <p class="info-content">{{ param.datasourceName }}</p>
+              </div>
+              <div class="info-item">
+                <p class="info-title">
+                  {{ $t('data_fill.form.table') }}
+                </p>
+                <p class="info-content">{{ param.tableName }}</p>
+              </div>
+              <div class="info-item">
+                <p class="info-title">
+                  {{ $t('data_fill.form.creator') }}
+                </p>
+                <p class="info-content">{{ param.creatorName }}</p>
+              </div>
+              <div class="info-item">
+                <p class="info-title">
+                  {{ $t('data_fill.form.createTime') }}
+                </p>
+                <p class="info-content">
+                  {{ param.createTime ? (new Date(param.createTime)).format("yyyy-MM-dd hh:mm:ss") : '' }}</p>
+              </div>
+            </div>
+          </div>
+          <svg-icon
+            slot="reference"
+            class="detail"
+            icon-class="icon_info_outlined"
+          />
+        </el-popover>
+      </el-col>
+      <el-col
+        style="text-align: right"
+        :span="8"
+      >
+        <!--  编辑 todo      -->
+      </el-col>
+    </el-row>
+
+    <el-tabs
+      v-model="tabActive"
+      class="de-tabs"
+      @tab-click="tabClick"
+    >
+      <el-tab-pane
+        :label="$t('data_fill.form.list')"
+        name="dataPreview"
+      />
+      <el-tab-pane
+        :label="$t('data_fill.form.record')"
+        :lazy="true"
+        name="record"
+      />
+      <el-tab-pane
+        :label="$t('data_fill.form.task_manage')"
+        :lazy="true"
+        name="task"
+      />
+
+    </el-tabs>
+
+    <el-container
+      v-if="tabActive === 'dataPreview'"
+      direction="vertical"
+      style="display: flex; flex-direction: column"
+    >
+
+      <template>
+        <div style="margin-bottom: 12px; height: 32px;">
+          <el-button
+            icon="el-icon-plus"
+            size="small"
+            @click="addData"
+          >添加数据</el-button>
+        </div>
+        <div style="flex: 1">
+          <grid-table
+            v-if="columns.length > 0"
+            v-loading="$store.getters.loadingMap[$store.getters.currentPath]"
+            style="width: 100%; height: 100%"
+            border
+            stripe
+            :table-data="data"
+            :columns="[]"
+            :current-row-key="paginationConfig.key"
+            :pagination="paginationConfig"
+            @size-change="handleSizeChange"
+            @current-change="handleCurrentChange"
+          >
+            <el-table-column
+              v-for="c in columns"
+              :key="c.props"
+              :prop="c.props"
+            >
+              <template
+                slot="header"
+                slot-scope="scope"
+              >
+                {{ c.label }}
+                <span v-if="c.rangeIndex === 0">(开始)</span>
+                <span v-if="c.rangeIndex === 1">(结束)</span>
+              </template>
+              <template slot-scope="scope">
+                <span
+                  v-if="c.date && scope.row.data[c.props]"
+                  style="white-space:nowrap; width: fit-content"
+                  :title="formatDate(scope.row.data[c.props], c.enableTime)"
+                >
+                  {{ formatDate(scope.row.data[c.props], c.enableTime) }}
+                </span>
+                <template v-else-if="(c.type === 'select' && c.multiple || c.type === 'checkbox') && scope.row.data[c.props]">
+                  <div
+                    v-for="(x, $index) in JSON.parse(scope.row.data[c.props])"
+                    :key="$index"
+                    style="white-space:nowrap; width: fit-content"
+                    :title="x"
+                  >
+                    {{ x }}
+                  </div>
+                </template>
+                <span
+                  v-else
+                  style="white-space:nowrap; width: fit-content"
+                  :title="scope.row.data[c.props]"
+                >
+                  {{ scope.row.data[c.props] }}
+                </span>
+              </template>
+            </el-table-column>
+            <el-table-column
+              label="最近提交人"
+              fixed="right"
+              width="100"
+            >
+              <template slot-scope="scope">
+                {{ scope.row.logInfo && scope.row.logInfo.commitByName ? scope.row.logInfo.commitByName : (scope.row.logInfo && scope.row.logInfo.commitBy ? scope.row.logInfo.commitBy : '-' ) }}
+              </template>
+            </el-table-column>
+            <el-table-column
+              label="最近提交时间"
+              fixed="right"
+              width="160"
+            >
+              <template slot-scope="scope">
+                {{ scope.row.logInfo && scope.row.logInfo.commitTime ? (new Date(scope.row.logInfo.commitTime)).format("yyyy-MM-dd hh:mm:ss") : '-' }}
+              </template>
+            </el-table-column>
+            <el-table-column
+              label="操作"
+              width="160"
+              fixed="right"
+            >
+              <template slot-scope="scope">
+                <el-button
+                  type="text"
+                  @click="updateRow(scope.row.data)"
+                >
+                  修改
+                </el-button>
+                <el-button
+                  type="text"
+                  @click="openRow(scope.row.data)"
+                >
+                  查看
+                </el-button>
+                <el-button
+                  type="text"
+                  @click="deleteRow(scope.row.data[paginationConfig.key])"
+                >
+                  删除
+                </el-button>
+              </template>
+            </el-table-column>
+          </grid-table>
+        </div>
+      </template>
+    </el-container>
+    <el-container
+      v-if="tabActive === 'record'"
+      direction="vertical"
+      style="display: flex; flex-direction: column"
+    >
+      <template>
+        <div style="margin-bottom: 12px; height: 32px;">
+          <el-row>
+            <el-col
+              :span="8"
+              :offset="16"
+            >
+              <el-input
+                ref="search"
+                v-model="operateName"
+                :placeholder="$t('user.search_by_name')"
+                prefix-icon="el-icon-search"
+                class="name-email-search"
+                size="small"
+                clearable
+                @blur="searchTableRecordData"
+                @clear="searchTableRecordData"
+              />
+            </el-col>
+          </el-row>
+        </div>
+        <div style="flex: 1">
+          <grid-table
+            v-loading="$store.getters.loadingMap[$store.getters.currentPath]"
+            style="width: 100%; height: 100%"
+            stripe
+            :table-data="records"
+            :columns="[]"
+            current-row-key="id"
+            :pagination="recordPaginationConfig"
+            @size-change="recordHandleSizeChange"
+            @current-change="recordHandleCurrentChange"
+          >
+            <el-table-column
+              key="operate"
+              prop="operate"
+              label="操作"
+            >
+              <template slot-scope="scope">
+                <template v-if="scope.row.operate === 'INSERT'">
+                  插入数据
+                </template>
+                <template v-else-if="scope.row.operate === 'UPDATE'">
+                  更新数据
+                </template>
+                <template v-else-if="scope.row.operate === 'DELETE'">
+                  删除数据
+                </template>
+                <template v-else>
+                  {{ scope.row.operate }}
+                </template>
+              </template>
+            </el-table-column>
+            <el-table-column
+              key="commitByName"
+              prop="commitByName"
+              label="操作人"
+            >
+              <template slot-scope="scope">
+                {{ scope.row.commitByName ? scope.row.commitByName: scope.row.commitBy }}
+              </template>
+            </el-table-column>
+            <el-table-column
+              key="commitTime"
+              prop="commitTime"
+              label="操作时间"
+            >
+              <template slot-scope="scope">
+                {{ new Date(scope.row.commitTime).format("yyyy-MM-dd hh:mm:ss") }}
+              </template>
+            </el-table-column>
+            <el-table-column
+              key="id"
+              label="操作"
+              prop="id"
+            >
+              <template slot-scope="scope">
+                <el-button
+                  v-if="scope.row.operate !== 'DELETE'"
+                  type="text"
+                  @click="showData(scope.row)"
+                >
+                  查看数据
+                </el-button>
+              </template>
+            </el-table-column>
+          </grid-table>
+        </div>
+      </template>
+    </el-container>
+    <el-container
+      v-if="tabActive === 'task'"
+      direction="vertical"
+      style="display: flex; flex-direction: column"
+    >
+      <template>
+        <div style="margin-bottom: 12px; height: 32px;">
+          <el-row>
+            <el-col :span="8">
+              <el-button
+                icon="el-icon-plus"
+                size="small"
+                @click="addTask"
+              >添加任务</el-button>
+            </el-col>
+            <el-col
+              :span="8"
+              :offset="8"
+            >
+              <el-input
+                ref="search"
+                v-model="taskName"
+                :placeholder="$t('commons.search_by_name')"
+                prefix-icon="el-icon-search"
+                class="name-email-search"
+                size="small"
+                clearable
+                @blur="searchFormTaskData"
+                @clear="searchFormTaskData"
+              />
+            </el-col>
+          </el-row>
+        </div>
+        <div style="flex: 1">
+          <grid-table
+            v-loading="$store.getters.loadingMap[$store.getters.currentPath]"
+            style="width: 100%; height: 100%"
+            stripe
+            :table-data="tasks"
+            :columns="[]"
+            current-row-key="id"
+            :pagination="taskPaginationConfig"
+            @size-change="taskHandleSizeChange"
+            @current-change="taskHandleCurrentChange"
+          >
+            <el-table-column
+              key="name"
+              prop="name"
+              label="名称"
+            >
+              <template slot-scope="scope">
+                {{ scope.row.name }}
+              </template>
+            </el-table-column>
+            <el-table-column
+              key="rateType"
+              prop="rateType"
+              label="任务下发模式"
+            >
+              <template slot-scope="scope">
+                {{ scope.row.rateType === -1 ? $t('emailtask.single_task') : $t('emailtask.simple_repeat') }}
+              </template>
+            </el-table-column>
+            <el-table-column
+              key="status"
+              prop="status"
+              label="任务状态"
+            >
+              <template slot-scope="scope">
+                <span :class="['de-status', `de-${taskStatusFormatter(scope.row.status)}`]">{{
+                  $t(`xpacktask.${taskStatusFormatter(scope.row.status)}`)
+                }}
+                </span>
+              </template>
+            </el-table-column>
+            <el-table-column
+              key="creatorName"
+              prop="creatorName"
+              label="创建人"
+            >
+              <template slot-scope="scope">
+                {{ scope.row.creatorName }}
+              </template>
+            </el-table-column>
+            <el-table-column
+              key="createTime"
+              prop="createTime"
+              label="创建时间"
+            >
+              <template slot-scope="scope">
+                {{ new Date(scope.row.createTime).format("yyyy-MM-dd hh:mm:ss") }}
+              </template>
+            </el-table-column>
+            <el-table-column
+              key="id"
+              label="操作"
+              prop="id"
+            >
+              <template slot-scope="scope">
+                <el-button
+                  type="text"
+                  @click="editTask(scope.row)"
+                >
+                  编辑
+                </el-button>
+                <el-button
+                  v-if="!scope.row.status"
+                  type="text"
+                  @click="enableTask(scope.row)"
+                >
+                  启动
+                </el-button>
+                <el-button
+                  v-if="scope.row.status"
+                  type="text"
+                  @click="disableTask(scope.row)"
+                >
+                  停止
+                </el-button>
+                <el-button
+                  type="text"
+                  @click="deleteTask(scope.row)"
+                >
+                  删除
+                </el-button>
+              </template>
+            </el-table-column>
+          </grid-table>
+        </div>
+      </template>
+
+    </el-container>
+
+    <el-drawer
+      :visible.sync="showDrawer"
+      direction="btt"
+      size="100%"
+      append-to-body
+      :with-header="false"
+    >
+      <edit-form-data
+        v-if="showDrawer"
+        :id="selectedDataId"
+        :data="selectedData"
+        :form-title.sync="param.name"
+        :form-id="param.id"
+        :forms.sync="forms"
+        :title.sync="createTitle"
+        :show-drawer.sync="showDrawer"
+        :readonly.sync="drawerReadonly"
+        @save-success="onSaveSuccess"
+      />
+    </el-drawer>
+
+    <el-drawer
+      :visible.sync="showTaskDrawer"
+      direction="btt"
+      size="100%"
+      append-to-body
+      :with-header="false"
+    >
+      <create-task
+        v-if="showTaskDrawer"
+        :id="selectedTaskId"
+        :form-id="param.id"
+        :show-drawer.sync="showTaskDrawer"
+        @save-success="onSaveTaskSuccess"
+      />
+    </el-drawer>
+
+  </div>
+</template>
+
+<script>
+import {
+  deleteData,
+  deleteFormTasks, disableFormTasks, enableFormTasks,
+  searchCommitLogs,
+  searchFormTasks,
+  searchTable
+} from '@/views/dataFilling/form/dataFilling'
+import GridTable from '@/components/gridTable/index.vue'
+import { forEach, forIn, includes, filter, map } from 'lodash-es'
+import EditFormData from '@/views/dataFilling/form/EditFormData.vue'
+import CreateTask from '@/views/dataFilling/form/CreateTask.vue'
+
+export default {
+  name: 'ViewTable',
+  components: { EditFormData, GridTable, CreateTask },
+  provide() {
+    return {
+      filedList: () => this.filedList
+    }
+  },
+  props: {
+    param: {
+      type: Object,
+      required: true
+    }
+  },
+  data() {
+    return {
+      operateName: '',
+      taskName: '',
+      showDrawer: false,
+      showTaskDrawer: false,
+      filedList: [],
+      data: [],
+      records: [],
+      tasks: [],
+      selectedDataId: undefined,
+      selectedTaskId: undefined,
+      selectedData: undefined,
+      createTitle: undefined,
+      drawerReadonly: true,
+      paginationConfig: {
+        currentPage: 1,
+        pageSize: 10,
+        total: 0,
+        key: ''
+      },
+      recordPaginationConfig: {
+        currentPage: 1,
+        pageSize: 10,
+        total: 0
+      },
+      taskPaginationConfig: {
+        currentPage: 1,
+        pageSize: 10,
+        total: 0
+      },
+      tabActive: 'dataPreview',
+      tableViewRowForm: {
+        row: 1000
+      },
+      tabStatus: false
+
+    }
+  },
+  computed: {
+    hideCustomDs: function() {
+      return this.$store.getters.hideCustomDs
+    },
+    forms: function() {
+      if (this.param?.forms) {
+        return JSON.parse(this.param.forms)
+      }
+      return []
+    },
+    columns: function() {
+      const _list = []
+      forEach(this.forms, f => {
+        if (f.type === 'dateRange') {
+          _list.push({
+            props: f.settings?.mapping?.columnName1,
+            label: f.settings?.name,
+            date: true,
+            enableTime: f.settings?.enableTime,
+            type: f.type,
+            multiple: !!f.settings.multiple,
+            rangeIndex: 0
+          })
+          _list.push({
+            props: f.settings?.mapping?.columnName2,
+            label: f.settings?.name,
+            date: true,
+            enableTime: f.settings?.enableTime,
+            type: f.type,
+            multiple: !!f.settings.multiple,
+            rangeIndex: 1
+          })
+        } else {
+          _list.push({
+            props: f.settings?.mapping?.columnName,
+            label: f.settings?.name,
+            date: f.type === 'date',
+            enableTime: f.type === 'date' && f.settings?.enableTime,
+            type: f.type,
+            multiple: !!f.settings.multiple
+          })
+        }
+      })
+      return _list
+    },
+    dateFormatColumns: function() {
+      return map(filter(this.columns, c => c.date), 'props')
+    }
+  },
+  watch: {
+    param: function(newValue, oldValue) {
+      this.tabActive = 'dataPreview'
+      if (newValue.id !== oldValue.id) {
+        this.data = []
+        this.records = []
+        this.tasks = []
+      }
+      this.initTable(this.param.id)
+    }
+  },
+  mounted() {
+    this.initTable(this.param.id)
+  },
+  methods: {
+
+    initTable(id) {
+      this.resetPage()
+      this.searchTableData()
+    },
+    taskStatusFormatter(status) {
+      if (status) return 'running'
+      return 'stopped'
+    },
+    searchTableData() {
+      searchTable(this.param.id, {
+        currentPage: this.paginationConfig.currentPage,
+        pageSize: this.paginationConfig.pageSize
+      }).then(res => {
+        if (res.data) {
+          this.paginationConfig.key = res.data.key
+          this.paginationConfig.total = res.data.total
+          const _data = []
+          forEach(res.data.data, d => {
+            const obj = {}
+            forIn(d.data, (value, key) => {
+              if (includes(this.dateFormatColumns, key)) {
+                if (value) {
+                  obj[key] = new Date(value)
+                } else {
+                  obj[key] = undefined
+                }
+              } else {
+                obj[key] = value
+              }
+            })
+            _data.push({
+              data: obj,
+              logInfo: d.logInfo
+            })
+          })
+          this.data = _data
+        }
+      })
+    },
+
+    searchTableRecordData() {
+      searchCommitLogs(this.param.id, { commitByName: this.operateName }, this.recordPaginationConfig.currentPage, this.recordPaginationConfig.pageSize).then(res => {
+        if (res.data) {
+          this.recordPaginationConfig.total = res.data.itemCount
+          this.records = res.data.listObject
+        }
+      })
+    },
+
+    searchFormTaskData() {
+      searchFormTasks(this.param.id, { name: this.taskName }, this.recordPaginationConfig.currentPage, this.recordPaginationConfig.pageSize).then(res => {
+        if (res.data) {
+          this.taskPaginationConfig.total = res.data.itemCount
+          this.tasks = res.data.listObject
+        }
+      })
+    },
+
+    columnsChange() {
+      const arr = this.data
+      this.data = []
+      this.$nextTick(() => {
+        this.data = arr
+      })
+    },
+
+    handleSizeChange(pageSize) {
+      this.paginationConfig.currentPage = 1
+      this.paginationConfig.pageSize = pageSize
+      this.searchTableData()
+    },
+    handleCurrentChange(currentPage) {
+      this.paginationConfig.currentPage = currentPage
+      this.searchTableData()
+    },
+    recordHandleSizeChange(pageSize) {
+      this.recordPaginationConfig.currentPage = 1
+      this.recordPaginationConfig.pageSize = pageSize
+      this.searchTableRecordData()
+    },
+    recordHandleCurrentChange(currentPage) {
+      this.recordPaginationConfig.currentPage = currentPage
+      this.searchTableRecordData()
+    },
+    taskHandleSizeChange(pageSize) {
+      this.taskPaginationConfig.currentPage = 1
+      this.taskPaginationConfig.pageSize = pageSize
+      this.searchTableRecordData()
+    },
+    taskHandleCurrentChange(currentPage) {
+      this.taskPaginationConfig.currentPage = currentPage
+      this.searchFormTaskData()
+    },
+
+    showTab() {
+      this.tabStatus = true
+    },
+    hideTab() {
+      this.tabStatus = false
+    },
+
+    resetPage() {
+      this.operateName = ''
+      this.paginationConfig = {
+        currentPage: 1,
+        pageSize: 10,
+        total: 0,
+        key: ''
+      }
+      this.recordPaginationConfig = {
+        currentPage: 1,
+        pageSize: 10,
+        total: 0
+      }
+      this.taskPaginationConfig = {
+        currentPage: 1,
+        pageSize: 10,
+        total: 0
+      }
+    },
+
+    tabClick() {
+      /* if (this.tabActive === 'dataPreview') {
+        this.initTable(this.param.id)
+      }*/
+      if (this.tabActive === 'record') {
+        this.searchTableRecordData()
+      }
+      if (this.tabActive === 'task') {
+        this.searchFormTaskData()
+      }
+    },
+
+    showData(row) {
+      searchTable(this.param.id, {
+        primaryKeyValue: row.dataId,
+        currentPage: 1,
+        pageSize: 10
+      }).then(res => {
+        if (res.data) {
+          const obj = {}
+          if (res.data.data.length === 0) {
+            this.$message({
+              message: 'ID为[' + row.dataId + ']的数据不存在',
+              type: 'warning',
+              showClose: true
+            })
+            return
+          }
+          forIn(res.data.data[0].data, (value, key) => {
+            if (includes(this.dateFormatColumns, key)) {
+              if (value) {
+                obj[key] = new Date(value)
+              } else {
+                obj[key] = undefined
+              }
+            } else {
+              obj[key] = value
+            }
+          })
+          this.openRow(obj)
+        }
+      })
+    },
+
+    openRow(data) {
+      this.selectedDataId = data.id
+      this.selectedData = data
+
+      this.showDrawer = true
+      this.drawerReadonly = true
+      this.createTitle = undefined
+    },
+    updateRow(data) {
+      this.selectedDataId = data.id
+      this.selectedData = data
+
+      this.showDrawer = true
+      this.drawerReadonly = false
+      this.createTitle = undefined
+    },
+    addData() {
+      this.selectedDataId = undefined
+      this.selectedData = {}
+
+      this.showDrawer = true
+      this.drawerReadonly = false
+      this.createTitle = '添加数据'
+    },
+    deleteRow(id) {
+      this.$confirm(
+        this.$t('data_fill.data.confirm_delete'),
+        this.$t('dataset.tips'),
+        {
+          confirmButtonText: this.$t('dataset.confirm'),
+          cancelButtonText: this.$t('dataset.cancel'),
+          type: 'warning'
+        }
+      ).then(() => {
+        deleteData(this.param.id, id).then((response) => {
+          this.searchTableData()
+        })
+      }).catch(() => {
+      })
+    },
+    formatDate(value, enableTime) {
+      if (!value) {
+        return value
+      }
+      if (enableTime) {
+        return value.format('yyyy-MM-dd hh:mm:ss')
+      } else {
+        return value.format('yyyy-MM-dd')
+      }
+    },
+
+    onSaveSuccess() {
+      this.showDrawer = false
+      this.searchTableData()
+    },
+
+    addTask() {
+      this.selectedTaskId = undefined
+      this.showTaskDrawer = true
+    },
+    editTask(row) {
+      this.selectedTaskId = row.id
+      this.showTaskDrawer = true
+    },
+    deleteTask(row) {
+      this.$confirm(
+        this.$t('data_fill.data.confirm_delete'),
+        this.$t('dataset.tips'),
+        {
+          confirmButtonText: this.$t('dataset.confirm'),
+          cancelButtonText: this.$t('dataset.cancel'),
+          type: 'warning'
+        }
+      ).then(() => {
+        deleteFormTasks(row.id).then(res => {
+          this.searchFormTaskData()
+        })
+      })
+    },
+    enableTask(row) {
+      this.$confirm(
+        this.$t('data_fill.task.confirm_enable'),
+        this.$t('dataset.tips'),
+        {
+          confirmButtonText: this.$t('dataset.confirm'),
+          cancelButtonText: this.$t('dataset.cancel'),
+          type: 'warning'
+        }
+      ).then(() => {
+        enableFormTasks(row.id).then(res => {
+          setTimeout(() => {
+            this.searchFormTaskData()
+          }, 1000)
+        })
+      })
+    },
+    disableTask(row) {
+      this.$confirm(
+        this.$t('data_fill.task.confirm_disable'),
+        this.$t('dataset.tips'),
+        {
+          confirmButtonText: this.$t('dataset.confirm'),
+          cancelButtonText: this.$t('dataset.cancel'),
+          type: 'warning'
+        }
+      ).then(() => {
+        disableFormTasks(row.id).then(res => {
+          setTimeout(() => {
+            this.searchFormTaskData()
+          }, 1000)
+        })
+      })
+    },
+
+    onSaveTaskSuccess() {
+      this.showTaskDrawer = false
+      this.searchFormTaskData()
+    }
+
+  }
+}
+</script>
+
+<style lang="scss">
+.form-tree-cont {
+  .tree-cont {
+    height: 200px;
+    width: 100%;
+    padding: 16px;
+    border-radius: 4px;
+    border: 1px solid var(--deBorderBase, #DCDFE6);
+    overflow: auto;
+
+    .content {
+      height: 100%;
+      width: 100%;
+    }
+  }
+}
+
+.icon-class {
+  color: #6c6c6c;
+}
+
+.blackTheme .icon-class {
+  color: #cccccc;
+}
+
+.tip {
+  color: #F56C6C;
+  font-size: 12px;
+}
+</style>
+<style lang="scss" scoped>
+.view-table {
+  background: rgba(255, 255, 255, 1);
+  padding: 10px 24px 48px;
+  height: 100%;
+  overflow-y: hidden;
+  width: 100%;
+  box-sizing: border-box;
+  display: flex;
+  flex-direction: column;
+
+  .de-dataset-name {
+    display: flex;
+    font-family: AlibabaPuHuiTi;
+    align-items: center;
+    margin-bottom: 12px;
+
+    .title-text {
+      font-size: 16px;
+      font-weight: 500;
+      margin-right: 8px;
+      color: var(--deTextPrimary, #1f2329);
+      display: inline-block;
+      white-space: nowrap;
+      text-overflow: ellipsis;
+      overflow: hidden;
+      max-width: 50%;
+    }
+
+    .de-tag {
+      padding: 0 6px;
+      border-radius: 2px;
+      font-size: 12px;
+      font-weight: 400;
+    }
+
+    .warning {
+      color: var(--deWarning, #ff8800);
+      background: rgba(255, 136, 0, 0.2);
+    }
+
+    .primary {
+      color: var(--primary, #3370ff);
+      background: rgba(51, 112, 255, 0.2);
+    }
+
+    .el-divider {
+      margin: 0 16px;
+      height: 18px;
+    }
+
+    .create-by {
+      font-size: 14px;
+      font-weight: 400;
+      color: var(--deTextSecondary, #606266);
+    }
+
+    .detail {
+      cursor: pointer;
+      margin-left: 10px;
+      color: var(--deTextSecondary, #606266);
+    }
+  }
+}
+
+.info-tab {
+  width: 100%;
+  padding: 0 4px;
+  font-family: AlibabaPuHuiTi;
+  box-sizing: border-box;
+
+  .title-type {
+    font-size: 14px;
+    font-weight: 500;
+    margin-bottom: 8px;
+    color: var(--deTextPrimary, #1f2329);
+  }
+
+  .info-card {
+    padding-bottom: 4px;
+    border-bottom: 1px solid rgba(31, 35, 41, 0.15);
+    margin-bottom: 12px;
+
+    .info-item {
+      font-family: AlibabaPuHuiTi;
+      font-weight: 400;
+      margin: 6px 0 12px 0;
+    }
+
+    .info-title {
+      margin: 0 !important;
+      font-weight: 600;
+      font-size: 12px;
+    }
+
+    .info-content {
+      font-size: 12px;
+      margin: 0 !important;
+    }
+  }
+
+  :last-child {
+    border: none;
+  }
+
+}
+
+.de-status {
+  position: relative;
+  margin-left: 15px;
+  &::before {
+    content: "";
+    position: absolute;
+    top: 50%;
+    left: -13px;
+    transform: translateY(-50%);
+    width: 5px;
+    height: 5px;
+    border-radius: 50%;
+  }
+}
+
+.de-running {
+  &::before {
+    background: var(--deSuccess, #67C23A);
+  }
+}
+
+.de-stopped {
+  &::before {
+    background: var(--deInfo, #909399);
+  }
+}
+
+</style>
diff --git a/core/frontend/src/views/dataFilling/form/create.vue b/core/frontend/src/views/dataFilling/form/create.vue
new file mode 100644
index 0000000000..f0a80a1086
--- /dev/null
+++ b/core/frontend/src/views/dataFilling/form/create.vue
@@ -0,0 +1,1326 @@
+<script>
+import DeContainer from '@/components/dataease/DeContainer.vue'
+import DataFillingFormSave from './save.vue'
+import clickoutside from 'element-ui/src/utils/clickoutside.js'
+import { filter, cloneDeep, find, concat } from 'lodash-es'
+import { v4 as uuidv4 } from 'uuid'
+import { PHONE_REGEX } from '@/utils/validate'
+
+export default {
+  name: 'DataFillingFormCreate',
+  components: { DeContainer, DataFillingFormSave },
+  directives: {
+    clickoutside
+  },
+  data: function() {
+    const checkDuplicateOptionValidator = (rule, value, callback) => {
+      if (!value) {
+        return callback(new Error('必填'))
+      }
+      const _list = filter(this.selectedComponentItem.settings.options, f => f.value === value)
+      if (_list.length > 1) {
+        callback(new Error('重复'))
+      }
+      callback()
+    }
+    return {
+      moveId: undefined,
+      showDrawer: false,
+      requiredRule: { required: true, message: this.$t('commons.required'), trigger: 'blur' },
+      duplicateOptionRule: { validator: checkDuplicateOptionValidator, trigger: 'blur' },
+      inputTypes: [
+        { type: 'text', name: '普通文本', rules: [] },
+        { type: 'number', name: '数字', rules: [] },
+        {
+          type: 'tel',
+          name: '手机号',
+          rules: [{ pattern: PHONE_REGEX, message: this.$t('user.mobile_number_format_is_incorrect'), trigger: 'blur' }]
+        },
+        { type: 'email', name: '邮箱', rules: [] }
+      ],
+      componentList: [
+        {
+          type: 'input',
+          typeName: this.$t('commons.component.input'),
+          icon: 'icon_single-line_outlined',
+          order: 0,
+          value: undefined,
+          id: undefined,
+          settings: {
+            name: this.$t('commons.component.input'),
+            placeholder: '',
+            required: false,
+            unique: false,
+            inputType: 'text',
+            mapping: {
+
+              columnName: undefined,
+              type: undefined
+            }
+          }
+        },
+        {
+          type: 'textarea',
+          typeName: this.$t('commons.component.textarea'),
+          icon: 'icon_multi-line_outlined',
+          order: 1,
+          value: undefined,
+          id: undefined,
+          settings: {
+            name: this.$t('commons.component.textarea'), placeholder: '', required: false,
+            mapping: {
+
+              columnName: undefined,
+              type: undefined
+            }
+          }
+        },
+        {
+          type: 'select',
+          typeName: this.$t('commons.component.select'),
+          icon: 'icon_down_outlined',
+          order: 2,
+          value: undefined,
+          id: undefined,
+          settings: {
+            name: this.$t('commons.component.select'),
+            options: [{ name: '选项1', value: '选项1' }, { name: '选项2', value: '选项2' }],
+            optionSourceType: 1,
+            placeholder: '',
+            multiple: false, required: false,
+            mapping: {
+              columnName: undefined,
+              type: undefined
+            }
+          }
+        },
+        {
+          type: 'radio',
+          typeName: this.$t('commons.component.radio'),
+          icon: 'icon_radio_outlined',
+          order: 3,
+          value: undefined,
+          id: undefined,
+          settings: {
+            name: this.$t('commons.component.radio'),
+            options: [{ name: '选项1', value: '选项1' }, { name: '选项2', value: '选项2' }],
+            optionSourceType: 1,
+            required: false,
+            mapping: {
+
+              columnName: undefined,
+              type: undefined
+            }
+          }
+        },
+        {
+          type: 'checkbox',
+          typeName: this.$t('commons.component.checkbox'),
+          icon: 'icon_todo_outlined',
+          order: 4,
+          value: [],
+          id: undefined,
+          settings: {
+            name: this.$t('commons.component.checkbox'),
+            options: [{ name: '选项1', value: '选项1' }, { name: '选项2', value: '选项2' }],
+            optionSourceType: 1,
+            required: false,
+            mapping: {
+
+              columnName: undefined,
+              type: undefined
+            }
+          }
+        },
+        {
+          type: 'date',
+          typeName: this.$t('commons.component.date'),
+          icon: 'icon_calendar_outlined',
+          order: 5,
+          value: undefined,
+          id: undefined,
+          settings: {
+            name: this.$t('commons.component.date'),
+            enableTime: false,
+            placeholder: '',
+            required: false,
+            mapping: {
+
+              columnName: undefined,
+              type: undefined
+            }
+          }
+        },
+        {
+          type: 'dateRange',
+          typeName: this.$t('commons.component.dateRange'),
+          icon: 'icon_calendar_outlined',
+          order: 6,
+          value: [],
+          id: undefined,
+          settings: {
+            name: this.$t('commons.component.dateRange'),
+            enableTime: false,
+            rangeSeparator: '-',
+            startPlaceholder: '',
+            endPlaceholder: '',
+            required: false,
+            mapping: {
+              columnName1: undefined,
+              columnName2: undefined,
+              type: undefined
+            }
+          }
+        }
+      ],
+      group: {
+        componentListGroup1: {
+          name: 'mFormGroup',
+          pull: 'clone', // B组拖拽时克隆到A组
+          put: false
+        },
+        componentListGroup2: {
+          name: 'mFormGroup',
+          pull: 'clone', // B组拖拽时克隆到A组
+          put: false
+        },
+        formGroup: {
+          name: 'mFormGroup',
+          put: true
+        }
+      },
+      formSettings: {
+        id: undefined,
+        name: '未命名表单',
+        table: undefined,
+        forms: [],
+        createIndex: false,
+        tableIndexes: [],
+        folder: undefined,
+        level: undefined
+      },
+      selectedItemId: undefined
+    }
+  },
+  computed: {
+    componentList1() {
+      return filter(this.componentList, c => c.order % 2 === 0)
+    },
+    componentList2() {
+      return filter(this.componentList, c => c.order % 2 === 1)
+    },
+    selectedComponentItem() {
+      if (this.selectedItemId) {
+        return find(this.formSettings.forms, f => f.id === this.selectedItemId)
+      }
+      return undefined
+    }
+
+  },
+  beforeDestroy() {
+  },
+  created() {
+    if (this.$route.query.folder !== undefined) {
+      this.formSettings.folder = this.$route.query.folder
+    }
+    if (this.$route.query.level !== undefined) {
+      this.formSettings.level = this.$route.query.level
+    }
+  },
+  methods: {
+    closeCreate: function() {
+      // back to forms list
+      this.$router.replace('/data-filling/forms')
+    },
+    onMoveInComponentList(e, originalEvent) {
+      if (e.relatedContext?.component?.$el?.id === 'form-drag-place') {
+        return true
+      }
+      return false
+    },
+    addInComponentList(e) {
+      console.log(e)
+    },
+    addComponent(e) {
+      this.formSettings.forms = cloneDeep(this.formSettings.forms)
+
+      this.formSettings.forms.forEach(f => {
+        if (f.order !== undefined) {
+          delete f.order
+        }
+        if (f.id === undefined) {
+          f.id = uuidv4()
+          this.selectedItemId = f.id
+          this.$nextTick(() => {
+            this.$refs['mRightForm'].validate()
+          })
+        }
+      })
+    },
+    addComponentItem(item) {
+      const _item = cloneDeep(item)
+      delete _item.order
+      _item.id = uuidv4()
+      this.formSettings.forms.push(_item)
+
+      this.selectedItemId = _item.id
+      this.$nextTick(() => {
+        this.$refs['mRightForm'].validate()
+      })
+    },
+    removeItem(item, index) {
+      this.formSettings.forms.splice(index, 1)
+    },
+    removeOption(list, index) {
+      list.splice(index, 1)
+    },
+    onOptionValueChange(item, value) {
+      item.name = value
+    },
+    copyItem(item, index) {
+      const copyItem = cloneDeep(item)
+      copyItem.id = uuidv4()
+      this.formSettings.forms.splice(index + 1, 0, copyItem)
+
+      this.selectedItemId = copyItem.id
+      this.$nextTick(() => {
+        this.$refs['mRightForm'].validate()
+      })
+    },
+    lostFocus() {
+      this.selectedItemId = undefined
+      this.$nextTick(() => {
+        this.$refs['mRightFormBase'].validate()
+      })
+    },
+    selectItem(id, showError) {
+      this.selectedItemId = id
+      this.$nextTick(() => {
+        this.$refs['mRightForm'].validate((valid, invalidFields) => {
+          if (showError && !valid) {
+            this.$message({
+              message: '组件设置错误',
+              type: 'error',
+              showClose: true
+            })
+          }
+        })
+      })
+    },
+    changeSelectMultiple(item, multiple) {
+      if (multiple) {
+        item.value = []
+      } else {
+        item.value = undefined
+      }
+    },
+    getRules(item) {
+      let rules = []
+      if (item.settings.required) {
+        rules.push(this.requiredRule)
+      }
+      if (item.type === 'input') {
+        const inputRules = find(this.inputTypes, t => t.type === item.settings.inputType.rules)
+        if (inputRules) {
+          rules = concat(rules, inputRules)
+        }
+      }
+
+      return rules
+    },
+    addOption(list) {
+      list.push({ name: '', value: '' })
+    },
+    toSave() {
+      // 校验
+      if (this.formSettings.name === undefined || this.formSettings.name.trim() === '') {
+        this.$message({
+          message: '表单名称不能为空',
+          type: 'error',
+          showClose: true
+        })
+        this.lostFocus()
+        return
+      }
+      if (this.formSettings.forms.length === 0) {
+        this.$message({
+          message: '请添加表单组件',
+          type: 'warning',
+          showClose: true
+        })
+        return
+      }
+      for (let i = 0; i < this.formSettings.forms.length; i++) {
+        const f = this.formSettings.forms[i]
+        if (f.settings.name === undefined || f.settings.name.trim() === '') {
+          this.selectItem(f.id, true)
+          return
+        }
+        if (f.type === 'dateRange') {
+          if (f.settings.rangeSeparator === undefined || f.settings.rangeSeparator.trim() === '') {
+            this.selectItem(f.id, true)
+            return
+          }
+        }
+        if (f.type === 'select' || f.type === 'radio' || f.type === 'checkbox') {
+          if (f.settings.optionSourceType === 1) {
+            if (f.settings.options.length === 0) {
+              this.selectItem(f.id)
+              this.$message({
+                message: '选项值不能为空',
+                type: 'error',
+                showClose: true
+              })
+              return
+            } else {
+              for (let j = 0; j < f.settings.options.length; j++) {
+                const o = f.settings.options[j]
+                const value = o.value
+                if (value === undefined || value === '') {
+                  this.selectItem(f.id, true)
+                  return
+                }
+                const _list = filter(f.settings.options, f => f.value === value)
+                if (_list.length > 1) {
+                  this.selectItem(f.id, true)
+                  return
+                }
+              }
+            }
+          }
+        }
+      }
+
+      this.showDrawer = true
+    }
+
+  }
+}
+</script>
+
+<template>
+  <div class="data-filling-form">
+    <el-header class="de-header">
+      <div class="panel-info-area">
+        <!--back to panelList-->
+        <svg-icon
+          icon-class="icon_left_outlined"
+          class="toolbar-icon-active icon20"
+          @click="closeCreate"
+        />
+        <span class="text16 margin-left12">
+          新建表单
+        </span>
+      </div>
+
+      <el-button
+        style="margin-right: 20px"
+        @click="toSave"
+      >{{ $t('commons.save') }}</el-button>
+    </el-header>
+    <de-container class="form-main-container">
+      <div class="tools-window-left">
+        <el-header class="sub-title-header">组件</el-header>
+        <div style="width: 100%; display: flex;">
+          <div style="flex: 1; padding:8px 4px 8px 8px;">
+            <draggable
+              v-model="componentList1"
+              :options="{group: group.componentListGroup1}"
+              animation="300"
+              ghost-class="ghostClass"
+              chosen-class="chosenClass"
+              :move="onMoveInComponentList"
+            >
+              <transition-group>
+                <div
+                  v-for="(item, $index) in componentList1"
+                  :key="item.type"
+                  class="m-item base-component-item"
+                  @click="addComponentItem(item)"
+                >
+                  <svg-icon
+                    :icon-class="item.icon"
+                    style="font-size: 16px; margin-right: 8px"
+                  />
+                  {{ item.typeName }}
+                </div>
+              </transition-group>
+            </draggable>
+          </div>
+          <div style="flex: 1; padding:8px 8px 8px 4px;">
+            <draggable
+              v-model="componentList2"
+              :options="{group: group.componentListGroup2}"
+              animation="300"
+              ghost-class="ghostClass"
+              chosen-class="chosenClass"
+              :move="onMoveInComponentList"
+            >
+              <transition-group>
+                <div
+                  v-for="(item, $index) in componentList2"
+                  :key="item.type"
+                  class="m-item base-component-item"
+                  @click="addComponentItem(item)"
+                >
+                  <svg-icon
+                    :icon-class="item.icon"
+                    style="font-size: 16px; margin-right: 8px"
+                  />
+                  {{ item.typeName }}
+                </div>
+              </transition-group>
+            </draggable>
+          </div>
+        </div>
+      </div>
+      <de-main-container class="center-main">
+        <div
+          style="flex: 1; background: white;display: flex;flex-direction: column; overflow-x: hidden;position: relative"
+          @click="lostFocus"
+        >
+
+          <div class="m-title">{{ formSettings.name }}</div>
+
+          <div
+            v-if="formSettings.forms.length === 0"
+            class="drag-placeholder"
+          >{{ $t('commons.component.add_component_hint') }}
+          </div>
+
+          <el-form
+            ref="mForm"
+            label-position="top"
+            hide-required-asterisk
+            class="form-drag-form"
+          >
+            <draggable
+              id="form-drag-place"
+              v-model="formSettings.forms"
+              group="mFormGroup"
+              animation="300"
+              class="form-drag-class"
+
+              ghost-class="ghostClass"
+              chosen-class="chosenClass"
+              @add="addComponent"
+            >
+              <transition-group>
+
+                <div
+                  v-for="(item, $index) in formSettings.forms"
+                  :key="item.id"
+                  class="m-item m-form-item"
+                  :class="{'selectedClass': item.id === selectedItemId}"
+                  @click.stop="selectItem(item.id)"
+                >
+
+                  <div class="m-label-container">
+                    <span style="width: unset">
+                      {{ item.settings.name }}
+                      <span
+                        v-if="item.settings.required"
+                        style="color: red"
+                      >*</span>
+                    </span>
+                    <span class="btn-container">
+                      <el-tooltip
+                        effect="dark"
+                        :content="$t('commons.copy')"
+                        placement="top"
+                      >
+                        <div
+                          class="btn-item"
+                          @click.prevent.stop="copyItem(item, $index)"
+                        >
+                          <svg-icon icon-class="icon_copy_outlined" />
+                        </div>
+                      </el-tooltip>
+                      <el-tooltip
+                        effect="dark"
+                        :content="$t('commons.delete')"
+                        placement="top"
+                      >
+                        <div
+                          class="btn-item"
+                          @click.prevent.stop="removeItem(item, $index)"
+                        >
+                          <svg-icon icon-class="icon_delete-trash_outlined" />
+                        </div>
+                      </el-tooltip>
+                    </span>
+                  </div>
+                  <el-form-item
+                    prop="value"
+                    class="form-item"
+                  >
+                    <el-input
+                      v-if="item.type === 'input' && item.settings.inputType !== 'number'"
+                      v-model="item.value"
+                      :type="item.settings.inputType"
+                      :required="item.settings.required"
+                      :placeholder="item.settings.placeholder"
+                      size="small"
+                    />
+                    <el-input-number
+                      v-if="item.type === 'input' && item.settings.inputType === 'number'"
+                      v-model="item.value"
+                      :required="item.settings.required"
+                      :placeholder="item.settings.placeholder"
+                      style="width: 100%"
+                      controls-position="right"
+                      size="small"
+                    />
+                    <el-input
+                      v-else-if="item.type === 'textarea'"
+                      v-model="item.value"
+                      type="textarea"
+                      :required="item.settings.required"
+                      :placeholder="item.settings.placeholder"
+                      size="small"
+                    />
+                    <el-select
+                      v-else-if="item.type === 'select'"
+                      v-model="item.value"
+                      :required="item.settings.required"
+                      :placeholder="item.settings.placeholder"
+                      style="width: 100%"
+                      size="small"
+                      :multiple="item.settings.multiple"
+                      clearable
+                    >
+                      <el-option
+                        v-for="(x, $index) in item.settings.options"
+                        :key="$index"
+                        :label="x.name"
+                        :value="x.value"
+                      />
+                    </el-select>
+                    <el-radio-group
+                      v-else-if="item.type === 'radio'"
+                      v-model="item.value"
+                      :required="item.settings.required"
+                      style="width: 100%"
+                      size="small"
+                    >
+                      <el-radio
+                        v-for="(x, $index) in item.settings.options"
+                        :key="$index"
+                        :label="x.value"
+                      >{{ x.name }}
+                      </el-radio>
+                    </el-radio-group>
+                    <el-checkbox-group
+                      v-else-if="item.type === 'checkbox'"
+                      v-model="item.value"
+                      :required="item.settings.required"
+                      size="small"
+                    >
+                      <el-checkbox
+                        v-for="(x, $index) in item.settings.options"
+                        :key="$index"
+                        :label="x.value"
+                      >{{ x.name }}
+                      </el-checkbox>
+                    </el-checkbox-group>
+                    <el-date-picker
+                      v-else-if="item.type === 'date' && !item.settings.enableTime"
+                      v-model="item.value"
+                      :required="item.settings.required"
+                      type="date"
+                      :placeholder="item.settings.placeholder"
+                      style="width: 100%"
+                      size="small"
+                    />
+                    <el-date-picker
+                      v-else-if="item.type === 'date' && item.settings.enableTime"
+                      v-model="item.value"
+                      :required="item.settings.required"
+                      type="datetime"
+                      :placeholder="item.settings.placeholder"
+                      style="width: 100%"
+                      size="small"
+                    />
+                    <el-date-picker
+                      v-else-if="item.type === 'dateRange' && !item.settings.enableTime"
+                      v-model="item.value"
+                      :required="item.settings.required"
+                      type="daterange"
+                      :range-separator="item.settings.rangeSeparator"
+                      :start-placeholder="item.settings.startPlaceholder"
+                      :end-placeholder="item.settings.endPlaceholder"
+                      style="width: 100%"
+                      size="small"
+                    />
+                    <el-date-picker
+                      v-else-if="item.type === 'dateRange' && item.settings.enableTime"
+                      v-model="item.value"
+                      :required="item.settings.required"
+                      type="datetimerange"
+                      :range-separator="item.settings.rangeSeparator"
+                      :start-placeholder="item.settings.startPlaceholder"
+                      :end-placeholder="item.settings.endPlaceholder"
+                      style="width: 100%"
+                      size="small"
+                    />
+
+                  </el-form-item>
+                </div>
+
+              </transition-group>
+            </draggable>
+          </el-form>
+        </div>
+      </de-main-container>
+      <el-cantainer class="tools-window-right">
+
+        <template v-if="selectedItemId !== undefined && selectedComponentItem !== undefined">
+          <el-header class="sub-title-header">组件设置</el-header>
+          <el-main style="height: calc(100vh - 60px - 56px);">
+            <el-form
+              ref="mRightForm"
+              :model="selectedComponentItem.settings"
+              label-position="top"
+              hide-required-asterisk
+            >
+
+              <el-form-item
+                prop="name"
+                class="form-item"
+                :rules="[requiredRule]"
+              >
+                <template #label>
+                  标题
+                  <span
+                    style="color: red"
+                  >*</span>
+                </template>
+                <el-input
+                  v-model.trim="selectedComponentItem.settings.name"
+                  required
+                  size="small"
+                  maxlength="50"
+                  show-word-limit
+                />
+              </el-form-item>
+
+              <el-form-item
+                v-if="selectedComponentItem.type === 'dateRange' "
+                prop="rangeSeparator"
+                class="form-item"
+                :rules="[requiredRule]"
+              >
+                <template #label>
+                  分割字符
+                  <span
+                    style="color: red"
+                  >*</span>
+                </template>
+                <el-input
+                  v-model.trim="selectedComponentItem.settings.rangeSeparator"
+                  required
+                  size="small"
+                  maxlength="10"
+                  show-word-limit
+                />
+              </el-form-item>
+
+              <el-form-item
+                v-if="
+                  selectedComponentItem.type === 'input' ||
+                    selectedComponentItem.type === 'textarea' ||
+                    selectedComponentItem.type === 'select' ||
+                    selectedComponentItem.type === 'date'
+                "
+                prop="placeholder"
+                class="form-item"
+                label="提示词"
+                :rules="[
+                  { maxlength: 50, message: '不超过50个字符', trigger: 'blur' }]"
+              >
+                <el-input
+                  v-model="selectedComponentItem.settings.placeholder"
+                  placeholder="不超过50个字符"
+                  size="small"
+                  maxlength="50"
+                  show-word-limit
+                />
+              </el-form-item>
+              <el-form-item
+                v-if="selectedComponentItem.type === 'dateRange' "
+                prop="startPlaceholder"
+                class="form-item"
+                label="开始提示词"
+                :rules="[
+                  { maxlength: 50, message: '不超过50个字符', trigger: 'blur' }]"
+              >
+                <el-input
+                  v-model="selectedComponentItem.settings.startPlaceholder"
+                  placeholder="不超过50个字符"
+                  size="small"
+                  maxlength="50"
+                  show-word-limit
+                />
+              </el-form-item>
+              <el-form-item
+                v-if="selectedComponentItem.type === 'dateRange' "
+                prop="endPlaceholder"
+                class="form-item"
+                label="结束提示词"
+                :rules="[
+                  { maxlength: 50, message: '不超过50个字符', trigger: 'blur' }]"
+              >
+                <el-input
+                  v-model="selectedComponentItem.settings.endPlaceholder"
+                  placeholder="不超过50个字符"
+                  size="small"
+                  maxlength="50"
+                  show-word-limit
+                />
+              </el-form-item>
+
+              <div class="m-splitter" />
+
+              <el-form-item
+                v-if="selectedComponentItem.type === 'input'"
+                prop="inputType"
+                class="form-item"
+                label="格式类型"
+                :rules="[requiredRule]"
+              >
+                <el-select
+                  v-model="selectedComponentItem.settings.inputType"
+                  style="width: 100%"
+                  required
+                  @change="selectedComponentItem.settings.mapping.type = undefined"
+                >
+                  <el-option
+                    v-for="(x) in inputTypes"
+                    :key="x.type"
+                    :label="x.name"
+                    :value="x.type"
+                  />
+                </el-select>
+              </el-form-item>
+
+              <div class="right-check-div">
+                <div class="m-label-container">
+                  <span style="width: unset">
+                    校验
+                  </span>
+                </div>
+                <el-form-item
+                  prop="required"
+                  class="form-item"
+                >
+                  <el-checkbox v-model="selectedComponentItem.settings.required">设置为必填项</el-checkbox>
+                </el-form-item>
+                <el-form-item
+                  v-if="selectedComponentItem.type === 'input'"
+                  prop="unique"
+                  class="form-item"
+                >
+                  <el-checkbox
+                    v-model="selectedComponentItem.settings.unique"
+                  >不允许重复值
+                  </el-checkbox>
+                </el-form-item>
+                <el-form-item
+                  v-if="selectedComponentItem.type === 'select'"
+                  prop="multiple"
+                  class="form-item"
+                >
+                  <el-checkbox
+                    v-model="selectedComponentItem.settings.multiple"
+                    @change="changeSelectMultiple(selectedComponentItem, selectedComponentItem.settings.multiple)"
+                  >允许多选
+                  </el-checkbox>
+                </el-form-item>
+                <el-form-item
+                  v-if="selectedComponentItem.type === 'date' || selectedComponentItem.type === 'dateRange'"
+                  prop="multiple"
+                  class="form-item"
+                >
+                  <el-checkbox
+                    v-model="selectedComponentItem.settings.enableTime"
+                  >使用日期时间
+                  </el-checkbox>
+                </el-form-item>
+
+              </div>
+
+              <div
+                v-if="selectedComponentItem.type === 'select' || selectedComponentItem.type === 'radio' || selectedComponentItem.type === 'checkbox'"
+              >
+
+                <div class="m-splitter" />
+
+                <el-form-item
+                  prop="optionSourceType"
+                  label="选项值"
+                  class="form-item no-margin-bottom"
+                >
+                  <el-radio-group
+                    v-model="selectedComponentItem.settings.optionSourceType"
+                    size="small"
+                  >
+                    <el-radio :label="1">自定义</el-radio>
+                  </el-radio-group>
+                </el-form-item>
+
+                <el-button
+                  type="text"
+                  @click="addOption(selectedComponentItem.settings.options)"
+                >+ 添加选项值
+                </el-button>
+
+                <div
+                  v-for="(x,$index) in selectedComponentItem.settings.options"
+                  :key="$index"
+                  class="option-list-div"
+                >
+                  <el-form-item
+                    :prop="'options['+$index+'].value'"
+                    class="form-item no-margin-bottom"
+                    style="width: 100%"
+                    :rules="[requiredRule, duplicateOptionRule]"
+                  >
+                    <el-input
+                      v-model="x.value"
+                      required
+                      size="small"
+                      minlength="1"
+                      maxlength="50"
+                      show-word-limit
+                      @change="onOptionValueChange(x, x.value)"
+                    />
+                  </el-form-item>
+                  <div
+                    class="btn-item"
+                    @click.prevent.stop="removeOption(selectedComponentItem.settings.options, $index)"
+                  >
+                    <svg-icon icon-class="icon_delete-trash_outlined" />
+                  </div>
+                </div>
+
+              </div>
+
+            </el-form>
+          </el-main>
+        </template>
+        <template v-else>
+          <el-header class="sub-title-header">表单设置</el-header>
+          <el-main style="height: calc(100vh - 60px - 56px);">
+            <el-form
+              ref="mRightFormBase"
+              :model="formSettings"
+              label-position="top"
+              hide-required-asterisk
+            >
+              <el-form-item
+                prop="name"
+                class="form-item"
+                :rules="[requiredRule]"
+              >
+                <template #label>
+                  表单名称
+                  <span
+                    style="color: red"
+                  >*</span>
+                </template>
+                <el-input
+                  v-model.trim="formSettings.name"
+                  required
+                  size="small"
+                  maxlength="50"
+                  show-word-limit
+                />
+              </el-form-item>
+
+            </el-form>
+          </el-main>
+        </template>
+
+      </el-cantainer>
+    </de-container>
+
+    <el-drawer
+      title="保存表单"
+      :visible.sync="showDrawer"
+      direction="btt"
+      size="100%"
+      append-to-body
+      :with-header="false"
+    >
+      <data-filling-form-save
+        v-if="showDrawer"
+        :form.sync="formSettings"
+        :show-drawer.sync="showDrawer"
+      />
+    </el-drawer>
+
+  </div>
+</template>
+
+<style  lang="scss" scoped>
+.data-filling-form {
+
+  .drag-placeholder {
+    height: 68px;
+    background: rgba(245, 246, 247, 1);
+    border: 1px dashed rgba(187, 191, 196, 1);
+    display: flex;
+    border-radius: 4px;
+    flex-direction: row;
+    align-items: center;
+    justify-content: center;
+    cursor: default;
+
+    font-weight: 400;
+    font-size: 14px;
+
+    position: absolute;
+    width: calc(100% - 120px);
+    top: 88px;
+    left: 50%;
+    transform: translate(-50%, 0);
+  }
+
+  .de-header {
+    height: 56px !important;
+    padding: 0px !important;
+    border-bottom: 1px solid #E6E6E6;
+    background-color: var(--SiderBG, white);
+
+    display: flex;
+    flex-direction: row;
+    align-items: center;
+    justify-content: space-between;
+  }
+
+  .panel-info-area {
+    padding-left: 20px;
+  }
+
+  .icon20 {
+    font-size: 20px;
+    color: var(--TextPrimary, #1F2329);
+  }
+
+  .margin-left12 {
+    margin-left: 12px;
+  }
+
+  .text16 {
+    font-size: 16px;
+    font-weight: 500;
+    line-height: 24px;
+    color: var(--TextPrimary, #1F2329);
+  }
+
+  .toolbar-icon-active {
+    cursor: pointer;
+    transition: 0.1s;
+    border-radius: 3px;
+  }
+
+  .toolbar-icon-active:hover {
+    background-color: rgba(31, 35, 41, 0.1);
+    color: #3a8ee6;
+  }
+
+  .form-main-container {
+    display: flex;
+  }
+
+  .center-main {
+    background-color: rgb(247, 248, 250);
+    height: calc(100vh - 56px);
+    flex: 1;
+    padding: 20px 20px 0 20px;
+
+    display: flex;
+  }
+
+  .tools-window-left {
+    width: 280px;
+    background-color: #FFFFFF;
+    border-right: 1px rgba(31, 35, 41, 0.15) solid;
+
+  }
+
+  .tools-window-right {
+    width: 320px;
+    background-color: #FFFFFF;
+    border-left: 1px rgba(31, 35, 41, 0.15) solid;
+
+    .m-label-container {
+      font-weight: 400;
+    }
+  }
+
+  .sub-title-header {
+    border-bottom: 1px solid #E6E6E6;
+    background-color: var(--SiderBG, white);
+
+    display: flex;
+    flex-direction: row;
+    align-items: center;
+
+  //styleName: Title 3 / 16px; font-family: PingFang SC; font-size: 16px; font-weight: 500; line-height: 24px; text-align: left;
+
+  }
+
+  .form-drag-form {
+    flex: 1;
+    display: flex;
+    min-height: 32px;
+    width: 100%;
+
+    z-index: 1;
+  }
+
+  .form-drag-class {
+    flex: 1;
+    display: flex;
+    min-height: 32px;
+    width: 100%;
+
+    padding: 0 60px;
+
+    span:only-child {
+      width: 100%;
+    }
+
+    .ghostClass {
+      min-height: 68px;
+      margin-top: 0 !important;
+    }
+  }
+
+  .ghostClass {
+    opacity: 1 !important;
+    background: rgba(51, 112, 255, 0.1) !important;
+    border: 1px dashed rgba(51, 112, 255, 1) !important;
+  }
+
+  .chosenClass {
+    background-color: #f1f1f1 !important;
+    opacity: 1;
+  }
+
+  .selectedClass {
+    background-color: #f1f1f1 !important;
+    opacity: 1;
+    border: 1px solid rgba(51, 112, 255, 1) !important;
+  }
+
+  .dragClass {
+
+    opacity: 1 !important;
+    box-shadow: none !important;
+    outline: none !important;
+    background-image: none !important;
+  }
+
+  .m-item {
+    width: 100%;
+    border: solid 1px #eee;
+    background-color: #f1f1f1;
+    border-radius: 4px;
+  }
+
+  .base-component-item {
+    margin: 8px 0;
+    cursor: pointer;
+    height: 32px;
+
+    padding-left: 8px;
+    padding-right: 8px;
+
+    font-weight: 400;
+    font-size: 12px;
+    line-height: 20px;
+
+    display: flex;
+    flex-direction: row;
+    align-items: center;
+  }
+
+  .base-component-item:hover {
+    background: rgba(31, 35, 41, 0.1);
+  }
+
+  .m-form-item {
+    margin-bottom: 10px;
+    border-radius: 4px;
+
+    border: solid 1px transparent;
+    background-color: unset;
+
+    padding: 8px 20px;
+  }
+
+  .m-form-item:hover {
+    background-color: #f1f1f1;
+    border: solid 1px #eee;
+    cursor: pointer;
+
+    .m-label-container {
+      .btn-container {
+        visibility: visible;
+      }
+    }
+
+  }
+
+  .m-title {
+    margin: 40px 80px 20px;
+
+    height: 28px;
+
+    font-weight: 500;
+    font-size: 20px;
+    line-height: 28px;
+
+    white-space: nowrap;
+    text-overflow: ellipsis;
+  }
+
+  .m-label-container {
+    width: 100%;
+    display: flex;
+    flex-direction: row;
+    align-items: center;
+    justify-content: space-between;
+
+    font-weight: 500;
+    font-size: 14px;
+    line-height: 22px;
+
+    margin-bottom: 8px;
+
+    .btn-container {
+      display: flex;
+      flex-direction: row;
+      align-items: center;
+
+      visibility: hidden;
+
+      .btn-item {
+        display: flex;
+        flex-direction: row;
+        align-items: center;
+        justify-content: center;
+
+        width: 24px;
+        height: 24px;
+
+        margin-left: 8px;
+
+        border-radius: 4px;
+
+        cursor: pointer;
+      }
+
+      .btn-item:first-child {
+        margin-left: unset;
+      }
+
+      .btn-item:hover {
+        background: rgba(31, 35, 41, 0.1);
+      }
+    }
+
+  }
+
+  .form-item {
+    margin-bottom: 0;
+
+    label {
+      width: 100%;
+    }
+
+    .el-radio-group {
+      label {
+        width: unset;
+        margin-bottom: 4px;
+      }
+    }
+
+    .el-checkbox-group {
+      label {
+        width: unset;
+        margin-bottom: 4px;
+      }
+    }
+  }
+
+  .m-splitter {
+    background: rgba(31, 35, 41, 0.15);
+    height: 1px;
+    width: 100%;
+    margin-bottom: 16px;
+  }
+
+  .tools-window-right {
+    .form-item {
+
+      margin-bottom: 16px;
+
+      .el-form-item__label {
+        line-height: 24px;
+        font-size: 14px;
+        font-weight: 400;
+        color: rgba(31, 35, 41, 1);
+
+      }
+    }
+
+    .no-margin-bottom {
+      margin-bottom: 0;
+    }
+
+    .right-check-div {
+      .form-item {
+        margin-bottom: 0
+      }
+
+      .form-item:last-child {
+        margin-bottom: 16px;
+      }
+    }
+
+    .option-list-div {
+      display: flex;
+      flex-direction: row;
+      align-items: center;
+
+      margin-bottom: 8px;
+
+      .btn-item {
+        display: flex;
+        flex-direction: row;
+        align-items: center;
+        justify-content: center;
+
+        width: 24px;
+        height: 24px;
+
+        margin-left: 8px;
+
+        border-radius: 4px;
+
+        cursor: pointer;
+      }
+
+      .btn-item:hover {
+        background: rgba(31, 35, 41, 0.1);
+      }
+
+    }
+
+  }
+
+}
+</style>
diff --git a/core/frontend/src/views/dataFilling/form/dataFilling.js b/core/frontend/src/views/dataFilling/form/dataFilling.js
new file mode 100644
index 0000000000..e08d63629f
--- /dev/null
+++ b/core/frontend/src/views/dataFilling/form/dataFilling.js
@@ -0,0 +1,146 @@
+import request from '@/utils/request'
+
+export function saveForm(data) {
+  return request({
+    url: 'dataFilling/form/save',
+    method: 'post',
+    loading: true,
+    data
+  })
+}
+export function updateForm(data) {
+  return request({
+    url: 'dataFilling/form/update',
+    method: 'post',
+    loading: true,
+    data
+  })
+}
+
+export function listForm(data) {
+  return request({
+    url: 'dataFilling/form/tree',
+    method: 'post',
+    loading: true,
+    data
+  })
+}
+
+export function deleteForm(id) {
+  return request({
+    url: 'dataFilling/form/delete/' + id,
+    method: 'post',
+    loading: true
+  })
+}
+export function getForm(id) {
+  return request({
+    url: 'dataFilling/form/get/' + id,
+    method: 'post',
+    loading: true
+  })
+}
+export function deleteData(formId, rowId) {
+  return request({
+    url: 'dataFilling/form/' + formId + '/delete/' + rowId,
+    method: 'post',
+    loading: true
+  })
+}
+export function getWithPrivileges(id) {
+  return request({
+    url: 'dataFilling/manage/form/' + id,
+    method: 'post',
+    loading: true
+  })
+}
+export function searchTable(id, data) {
+  return request({
+    url: 'dataFilling/form/' + id + '/tableData',
+    method: 'post',
+    loading: true,
+    data
+  })
+}
+export function searchCommitLogs(formId, data, goPage, pageSize) {
+  return request({
+    url: 'dataFilling/form/' + formId + '/commitLog/' + goPage + '/' + pageSize,
+    method: 'post',
+    loading: true,
+    data
+  })
+}
+
+export function searchFormTasks(formId, data, goPage, pageSize) {
+  return request({
+    url: 'dataFilling/form/' + formId + '/task/' + goPage + '/' + pageSize,
+    method: 'post',
+    loading: true,
+    data
+  })
+}
+
+export function searchFormMyTasks(data, goPage, pageSize, type) {
+  return request({
+    url: 'dataFilling/myTask/' + type + '/' + goPage + '/' + pageSize,
+    method: 'post',
+    loading: true,
+    data
+  })
+}
+export function saveFormTasks(formId, data) {
+  return request({
+    url: 'dataFilling/form/' + formId + '/task/save',
+    method: 'post',
+    loading: true,
+    data
+  })
+}
+export function deleteFormTasks(id) {
+  return request({
+    url: 'dataFilling/form/task/' + id + '/delete',
+    method: 'post',
+    loading: true
+  })
+}
+export function enableFormTasks(id) {
+  return request({
+    url: 'dataFilling/form/task/' + id + '/enable',
+    method: 'post',
+    loading: true
+  })
+}
+export function disableFormTasks(id) {
+  return request({
+    url: 'dataFilling/form/task/' + id + '/disable',
+    method: 'post',
+    loading: true
+  })
+}
+
+export function newFormRowData(formId, data) {
+  return request({
+    url: 'dataFilling/form/' + formId + '/rowData/save',
+    method: 'post',
+    loading: true,
+    data
+  })
+}
+
+export function saveFormRowData(formId, id, data) {
+  return request({
+    url: 'dataFilling/form/' + formId + '/rowData/save/' + id,
+    method: 'post',
+    loading: true,
+    data
+  })
+}
+
+export function userFillFormData(userTaskId, data) {
+  return request({
+    url: `dataFilling/myTask/fill/${userTaskId}`,
+    method: 'post',
+    loading: true,
+    data
+  })
+}
diff --git a/core/frontend/src/views/dataFilling/form/index.vue b/core/frontend/src/views/dataFilling/form/index.vue
new file mode 100644
index 0000000000..ef29f78195
--- /dev/null
+++ b/core/frontend/src/views/dataFilling/form/index.vue
@@ -0,0 +1,539 @@
+<script>
+import DeContainer from '@/components/dataease/DeContainer.vue'
+import DeMainContainer from '@/components/dataease/DeMainContainer.vue'
+import DeAsideContainer from '@/components/dataease/DeAsideContainer.vue'
+import NoSelect from './NoSelect.vue'
+import ViewTable from './ViewTable.vue'
+import { listForm, saveForm, updateForm, deleteForm, getWithPrivileges } from '@/views/dataFilling/form/dataFilling'
+import { cloneDeep } from 'lodash-es'
+
+export default {
+  name: 'DataFillingForm',
+  components: { DeAsideContainer, DeMainContainer, DeContainer, NoSelect, ViewTable },
+  data() {
+    return {
+      treeLoading: false,
+      requiredRule: { required: true, message: this.$t('commons.required'), trigger: ['blur', 'change'] },
+      activeName: 'forms',
+      showFolderCreateForm: false,
+      folderForm: {
+        name: undefined,
+        pid: '0',
+        level: 0,
+        nodeType: 'folder'
+      },
+      formList: [],
+      expandedArray: [],
+      updateFormData: {},
+      showUpdateName: false,
+      displayFormData: undefined
+    }
+  },
+  mounted() {
+    this.treeLoading = true
+    listForm({}).then(res => {
+      this.formList = res.data || []
+    }).finally(() => {
+      this.treeLoading = false
+    })
+  },
+  methods: {
+    createFolder(folder) {
+      this.folderForm.name = undefined
+      this.folderForm.pid = folder.id
+      if (folder.firstFolder) {
+        this.folderForm.level = folder.level
+      } else {
+        this.folderForm.level = folder.level + 1
+      }
+      this.showFolderCreateForm = true
+    },
+    closeSaveFolder() {
+      this.showFolderCreateForm = false
+    },
+    doSaveFolder() {
+      this.$refs['mFolderForm'].validate((valid) => {
+        if (valid) {
+          const data = {
+            name: this.folderForm.name,
+            pid: this.folderForm.pid,
+            level: this.folderForm.level,
+            nodeType: 'folder'
+          }
+          saveForm(data).then(res => {
+            this.closeSaveFolder()
+            listForm({}).then(res => {
+              this.formList = res.data || []
+            })
+          })
+        }
+      })
+    },
+    beforeData(type, data) {
+      return {
+        ...data,
+        createType: type
+      }
+    },
+    clickMore(param) {
+      switch (param.optType) {
+        case 'rename':
+          this.openUpdateForm(param)
+          break
+        case 'delete':
+          this.delete(param.data)
+          break
+      }
+    },
+    openUpdateForm(param) {
+      this.updateFormData = cloneDeep(param.data)
+      this.showUpdateName = true
+    },
+    closeUpdateForm() {
+      this.showUpdateName = false
+    },
+    doUpdateForm() {
+      this.$refs['mUpdateNameForm'].validate((valid) => {
+        if (valid) {
+          const data = {
+            id: this.updateFormData.id,
+            name: this.updateFormData.name
+          }
+          updateForm(data).then(res => {
+            this.closeUpdateForm()
+            listForm({}).then(res => {
+              this.formList = res.data || []
+            })
+            if (this.updateFormData.nodeType !== 'folder' && this.updateFormData.id === this.displayFormData.id) {
+              getWithPrivileges(data.id).then(res => {
+                this.displayFormData = res.data
+              })
+            }
+          })
+        }
+      })
+    },
+    delete(data) {
+      this.$confirm(
+        this.$t('data_fill.form.confirm_delete'),
+        this.$t('dataset.tips'),
+        {
+          confirmButtonText: this.$t('dataset.confirm'),
+          cancelButtonText: this.$t('dataset.cancel'),
+          type: 'warning'
+        }
+      ).then(() => {
+        deleteForm(data.id).then((response) => {
+          if (this.displayFormData.id === data.id) {
+            this.displayFormData = undefined
+          }
+          listForm({}).then(res => {
+            this.formList = res.data || []
+          })
+        })
+      }).catch(() => {
+      })
+    },
+    beforeClickMore(optType, data, node) {
+      return {
+        type: data.nodeType,
+        data: data,
+        node: node,
+        optType: optType
+      }
+    },
+    clickTreeAddBtn(data) {
+      if (data.createType === 'folder') {
+        this.createFolder(data)
+      } else {
+        this.createForm(data)
+      }
+    },
+    createForm(data) {
+      const _param = {
+        folder: data.id,
+        level: data.level + 1
+      }
+      this.$router.push({ name: 'data-filling-form-create', query: _param })
+    },
+    filterNode(value, data) {
+      if (!value) return true
+      if (this.searchType === 'folder') {
+        if (
+          data.label.indexOf(value) !== -1
+        ) {
+          this.searchPids.push(data.id)
+          return true
+        }
+        if (this.searchPids.indexOf(data.pid) !== -1) {
+          this.searchPids.push(data.id)
+          return true
+        }
+      } else {
+        return data.label.indexOf(value) !== -1
+      }
+      return false
+    },
+    nodeExpand(data) {
+      if (data.id) {
+        this.expandedArray.push(data.id)
+      }
+    },
+    nodeCollapse(data) {
+      if (data.id) {
+        this.expandedArray.splice(this.expandedArray.indexOf(data.id), 1)
+      }
+    },
+    nodeClick(data, node) {
+      // 展示对应的表数据
+      if (data.nodeType !== 'folder') {
+        getWithPrivileges(data.id).then(res => {
+          this.displayFormData = res.data
+        })
+      }
+    }
+  }
+}
+</script>
+
+<template>
+  <de-container
+    v-loading="$store.getters.loadingMap[$store.getters.currentPath]"
+    style="background-color: #f7f8fa"
+  >
+    <de-aside-container type="data-filling">
+      <el-tabs
+        v-model="activeName"
+        class="tab-panel"
+      >
+        <el-tab-pane name="my-tasks">
+          <span slot="label">
+            <router-link to="/data-filling/my-jobs">
+              我的填报
+            </router-link>
+          </span>
+        </el-tab-pane>
+
+        <el-tab-pane name="forms">
+          <span slot="label">
+            表单管理
+          </span>
+
+          <div style="padding-left: 20px;padding-right: 20px;">
+
+            <div style="display: flex;flex-direction: row;justify-content: space-between;align-items: center;">
+              填报表单
+              <el-button
+                icon="el-icon-plus"
+                type="text"
+                @click="createFolder({id: '0', level: 0, firstFolder: true})"
+              />
+            </div>
+
+            <div
+              v-if="!formList.length && !treeLoading"
+              class="no-tdata"
+            >
+              暂无表单，点击
+              <span
+                class="no-tdata-new"
+                @click="() => createFolder({id: '0', level: 0, firstFolder: true})"
+              >{{
+                $t('deDataset.create')
+              }}</span>
+            </div>
+            <el-tree
+              v-else
+              ref="datasetTreeRef"
+              :default-expanded-keys="expandedArray"
+              :data="formList"
+              node-key="id"
+              highlight-current
+              :expand-on-click-node="true"
+              :filter-node-method="filterNode"
+              @node-expand="nodeExpand"
+              @node-collapse="nodeCollapse"
+              @node-click="nodeClick"
+            >
+              <template slot-scope="{ node, data }">
+                <span
+                  class="custom-tree-node-list father"
+                >
+                  <span style="display: flex; flex: 1; width: 0">
+                    <span v-if="data.nodeType === 'folder'">
+                      <svg-icon icon-class="scene" />
+                    </span>
+                    <span
+                      style="
+                    margin-left: 6px;
+                    white-space: nowrap;
+                    overflow: hidden;
+                    text-overflow: ellipsis;
+                  "
+                      :title="data.name"
+                    >{{ data.name }}</span>
+                  </span>
+                  <span
+                    v-if="hasDataPermission('manage', data.privileges)"
+                    class="child"
+                    @click.stop
+                  >
+                    <template v-if="data.nodeType === 'folder'">
+                      <el-dropdown
+                        trigger="click"
+                        size="small"
+                        @command="clickTreeAddBtn"
+                      >
+                        <span class="el-dropdown-link">
+                          <el-button
+                            icon="el-icon-plus"
+                            type="text"
+                            size="small"
+                          />
+                        </span>
+                        <el-dropdown-menu slot="dropdown">
+                          <el-dropdown-item
+                            :command="beforeData('folder',data)"
+                          >
+                            <svg-icon icon-class="scene" />
+                            <span style="margin-left: 5px">新建文件夹</span>
+                          </el-dropdown-item>
+                          <el-dropdown-item
+                            :command="beforeData('form',data)"
+                          >
+                            <svg-icon
+                              icon-class="panel"
+                              class="ds-icon-scene"
+                            />
+                            <span>新建表单</span>
+                          </el-dropdown-item>
+                        </el-dropdown-menu>
+                      </el-dropdown>
+                    </template>
+
+                    <span
+                      style="margin-left: 12px"
+                      @click.stop
+                    >
+                      <el-dropdown
+                        trigger="click"
+                        size="small"
+                        @command="clickMore"
+                      >
+                        <span class="el-dropdown-link">
+                          <el-button
+                            icon="el-icon-more"
+                            type="text"
+                            size="small"
+                          />
+                        </span>
+                        <el-dropdown-menu slot="dropdown">
+                          <el-dropdown-item
+                            icon="el-icon-edit-outline"
+                            :command="beforeClickMore('rename', data, node)"
+                          >
+                            {{ $t('panel.rename') }}
+                          </el-dropdown-item>
+                          <el-dropdown-item
+                            icon="el-icon-delete"
+                            :command="beforeClickMore('delete', data, node)"
+                          >
+                            {{ $t('panel.delete') }}
+                          </el-dropdown-item>
+                        </el-dropdown-menu>
+                      </el-dropdown>
+                    </span>
+                  </span>
+
+                </span>
+              </template>
+            </el-tree>
+
+          </div>
+        </el-tab-pane>
+
+      </el-tabs>
+
+    </de-aside-container>
+
+    <el-main style="padding: 0">
+      <no-select v-if="!displayFormData" />
+      <view-table
+        v-else
+        :param="displayFormData"
+      />
+    </el-main>
+
+    <el-dialog
+      v-dialogDrag
+      append-to-body
+      title="新建文件夹"
+      :visible.sync="showFolderCreateForm"
+      :show-close="true"
+      width="600px"
+      class="m-dialog"
+    >
+      <el-container
+        style="width: 100%"
+        direction="vertical"
+      >
+        <el-form
+          ref="mFolderForm"
+          class="m-form"
+          :model="folderForm"
+          label-position="top"
+          hide-required-asterisk
+        >
+          <el-main>
+            <el-form-item
+              prop="name"
+              class="form-item"
+              :rules="[requiredRule]"
+            >
+              <template #label>
+                名称
+                <span
+                  style="color: red"
+                >*</span>
+              </template>
+              <el-input
+                v-model.trim="folderForm.name"
+                required
+                size="small"
+                maxlength="50"
+                show-word-limit
+              />
+            </el-form-item>
+          </el-main>
+        </el-form>
+        <el-footer class="de-footer">
+          <el-button @click="closeSaveFolder">取消</el-button>
+          <el-button
+            type="primary"
+            @click="doSaveFolder"
+          >保存
+          </el-button>
+        </el-footer>
+      </el-container>
+    </el-dialog>
+
+    <el-dialog
+      v-dialogDrag
+      append-to-body
+      title="重命名"
+      :visible.sync="showUpdateName"
+      :show-close="true"
+      width="600px"
+      class="m-dialog"
+    >
+      <el-container
+        style="width: 100%"
+        direction="vertical"
+      >
+        <el-form
+          ref="mUpdateNameForm"
+          class="m-form"
+          :model="updateFormData"
+          label-position="top"
+          hide-required-asterisk
+        >
+          <el-main>
+            <el-form-item
+              prop="name"
+              class="form-item"
+              :rules="[requiredRule]"
+            >
+              <template #label>
+                名称
+                <span
+                  style="color: red"
+                >*</span>
+              </template>
+              <el-input
+                v-model.trim="updateFormData.name"
+                required
+                size="small"
+                maxlength="50"
+                show-word-limit
+              />
+            </el-form-item>
+          </el-main>
+        </el-form>
+        <el-footer class="de-footer">
+          <el-button @click="closeUpdateForm">取消</el-button>
+          <el-button
+            type="primary"
+            @click="doUpdateForm"
+          >保存
+          </el-button>
+        </el-footer>
+      </el-container>
+    </el-dialog>
+
+  </de-container>
+</template>
+
+<style  lang="scss" scoped>
+.tab-panel {
+  height: 100%;
+  overflow-y: auto;
+}
+
+.tab-panel ::v-deep .el-tabs__nav-wrap {
+  padding: 0 10px;
+}
+
+.tab-panel ::v-deep .el-tabs__nav-wrap::after {
+  height: 1px;
+}
+
+.tab-panel ::v-deep .el-tabs__item {
+  /* width: 10px; */
+  padding: 0 10px;
+}
+
+::v-deep.ms-aside-container{
+  padding: 0
+}
+.m-dialog {
+  .el-dialog__body {
+    padding: 0
+  }
+}
+.de-footer {
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+  justify-content: flex-end
+}
+.custom-tree-node-list {
+  flex: 1;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  font-size: 14px;
+  padding: 0 8px;
+}
+.father .child {
+  /*display: none;*/
+  visibility: hidden;
+}
+
+.father:hover .child {
+  /*display: inline;*/
+  visibility: visible;
+}
+.no-tdata {
+  text-align: center;
+  margin-top: 80px;
+  font-family: AlibabaPuHuiTi;
+  font-size: 14px;
+  color: var(--deTextSecondary, #646a73);
+  font-weight: 400;
+
+  .no-tdata-new {
+    cursor: pointer;
+    color: var(--primary, #3370ff);
+  }
+}
+</style>
diff --git a/core/frontend/src/views/dataFilling/form/options.js b/core/frontend/src/views/dataFilling/form/options.js
new file mode 100644
index 0000000000..85d8f35d37
--- /dev/null
+++ b/core/frontend/src/views/dataFilling/form/options.js
@@ -0,0 +1,84 @@
+const filterDatasetRecord = {
+  name: 'dataset.task.last_exec_status',
+  type: 'dataset_table_task.last_exec_status',
+  activeType: 'execStatus',
+  list: [{
+    name: 'xpacktask.success',
+    value: '1'
+  }, {
+    name: 'dataset.task.exec',
+    value: '0'
+  },
+  {
+    name: 'xpacktask.error',
+    value: '-1'
+  }]
+}
+
+// 入参 fmt-格式 date-日期
+function dateFormat(fmt, date) {
+  let ret
+  const opt = {
+    'Y+': date.getFullYear().toString(), // 年
+    'm+': (date.getMonth() + 1).toString(), // 月
+    'd+': date.getDate().toString(), // 日
+    'H+': date.getHours().toString(), // 时
+    'M+': date.getMinutes().toString(), // 分
+    'S+': date.getSeconds().toString() // 秒
+    // 有其他格式化字符需求可以继续添加，必须转化成字符串
+  }
+  for (const k in opt) {
+    ret = new RegExp('(' + k + ')').exec(fmt)
+    if (ret) {
+      fmt = fmt.replace(ret[1], (ret[1].length === 1) ? (opt[k]) : (opt[k].padStart(ret[1].length, '0')))
+    }
+  }
+  return fmt
+}
+
+const timeType = [{
+  label: 'emailtask.once_a_day',
+  value: 0
+}, {
+  label: 'emailtask.once_a_week',
+  value: 1
+}, {
+  label: 'emailtask.once_a_month',
+  value: 2
+}]
+const simpleTimeType = [{
+  label: 'emailtask.hour',
+  value: -1
+}, {
+  label: 'emailtask.day',
+  value: 0
+}, {
+  label: 'emailtask.week',
+  value: 1
+}, {
+  label: 'emailtask.month',
+  value: 2
+}]
+
+const weekType = Array(7).fill(1).map((ele, index) => {
+  return {
+    label: `emailtask.week_${['mon', 'tue', 'wed', 'thu', 'fri', 'sat', 'sun'][index]}`,
+    value: index + 1
+  }
+})
+
+const monthType = Array(31).fill(1).map((ele, index) => {
+  return {
+    label: `${index + 1}`,
+    value: index + 1
+  }
+})
+
+export {
+  dateFormat,
+  filterDatasetRecord,
+  timeType,
+  weekType,
+  monthType,
+  simpleTimeType
+}
diff --git a/core/frontend/src/views/dataFilling/form/save.vue b/core/frontend/src/views/dataFilling/form/save.vue
new file mode 100644
index 0000000000..1d3625da81
--- /dev/null
+++ b/core/frontend/src/views/dataFilling/form/save.vue
@@ -0,0 +1,756 @@
+<script>
+import { filter, forEach, find, split, get } from 'lodash-es'
+import { listDatasource, listDatasourceType } from '@/api/system/datasource'
+import { listForm, saveForm } from '@/views/dataFilling/form/dataFilling'
+
+export default {
+  name: 'DataFillingFormSave',
+  props: {
+    form: {
+      type: Object,
+      required: true
+    },
+    showDrawer: {
+      type: Boolean,
+      required: true
+    }
+  },
+  data: function() {
+    const checkDuplicateNameValidator = (rule, value, callback) => {
+      if (!value) {
+        return callback(new Error('必填'))
+      }
+      let count = 0
+      forEach(this.formData.forms, f => {
+        if (f.type === 'dateRange') {
+          if (f.settings.mapping.columnName1 === value) {
+            count++
+          }
+          if (f.settings.mapping.columnName2 === value) {
+            count++
+          }
+        } else {
+          if (f.settings.mapping.columnName === value) {
+            count++
+          }
+        }
+      })
+      if (count > 1) {
+        callback(new Error('重复'))
+      }
+      callback()
+    }
+    const checkDuplicateIndexNameValidator = (rule, value, callback) => {
+      if (!value) {
+        return callback(new Error('必填'))
+      }
+      let count = 0
+      forEach(this.formData.tableIndexes, f => {
+        if (f.name === value) {
+          count++
+        }
+      })
+      if (count > 1) {
+        callback(new Error('重复'))
+      }
+      callback()
+    }
+    const checkInvalidColumnValidator = (rule, value, callback) => {
+      if (!value) {
+        return callback(new Error('必填'))
+      }
+      if (this.columnsList.length === 0) {
+        return callback(new Error('值不存在'))
+      }
+      if (find(this.columnsList, c => c === value) === undefined) {
+        callback(new Error('值不存在'))
+      }
+      callback()
+    }
+    const checkDuplicateIndexColumnValidator = (rule, value, callback, source) => {
+      if (!value) {
+        return callback(new Error('必填'))
+      }
+      const f = split(rule.field, '.')[0]
+      const _list = get(this.formData, f)
+
+      let count = 0
+      forEach(_list.columns, f => {
+        if (f.column === value) {
+          count++
+        }
+      })
+      if (count > 1) {
+        callback(new Error('重复'))
+      }
+      callback()
+    }
+    return {
+      requiredRule: { required: true, message: this.$t('commons.required'), trigger: ['blur', 'change'] },
+      duplicateRule: { validator: checkDuplicateNameValidator, trigger: 'blur' },
+      duplicateIndexRule: { validator: checkDuplicateIndexNameValidator, trigger: 'blur' },
+      duplicateIndexColumnRule: { validator: checkDuplicateIndexColumnValidator, trigger: ['blur', 'change'] },
+      invalidColumnRule: { validator: checkInvalidColumnValidator, trigger: ['blur', 'change'] },
+      formData: {},
+      folders: [],
+      allDatasourceTypes: [],
+      allDatasourceList: [],
+      folderTreeShow: false
+    }
+  },
+  computed: {
+    datasourceList() {
+      const _types = filter(this.allDatasourceTypes, t => t.type === 'mysql' || t.type === 'mariadb')
+      forEach(_types, t => {
+        t.options = filter(this.allDatasourceList, d => d.type === t.type)
+      })
+      return _types
+    },
+    selectDatasets() {
+      const result = []
+      this.flattenFolder(this.folders, result)
+      return result
+    },
+    columnsList() {
+      const _list = []
+      for (let i = 0; i < this.formData.forms.length; i++) {
+        const row = this.formData.forms[i]
+        if (row.type === 'dateRange') {
+          if (row.settings.mapping.columnName1 !== undefined && row.settings.mapping.columnName1 !== '') {
+            _list.push(row.settings.mapping.columnName1)
+          }
+          if (row.settings.mapping.columnName2 !== undefined && row.settings.mapping.columnName2 !== '') {
+            _list.push(row.settings.mapping.columnName2)
+          }
+        } else {
+          if (row.settings.mapping.columnName !== undefined && row.settings.mapping.columnName !== '' && row.settings.mapping.type !== 'text') {
+            _list.push(row.settings.mapping.columnName)
+          }
+        }
+      }
+
+      return _list
+    }
+  },
+  watch: {
+    formData: {
+      handler(newVal, oldVal) {
+        this.$emit('update:form', newVal)
+      },
+      deep: true
+    }
+  },
+  mounted() {
+    this.formData = this.form
+
+    forEach(this.formData.forms, f => {
+      f.settings.mapping.typeOptions = this.getTypeOptions(f)
+      if (!f.settings.mapping.type) {
+        f.settings.mapping.type = f.settings.mapping.typeOptions[0].value
+      }
+    })
+
+    listDatasourceType().then(res => {
+      this.allDatasourceTypes = res.data
+    })
+
+    listDatasource().then(res => {
+      this.allDatasourceList = res.data
+    })
+
+    listForm({ nodeType: 'folder' }).then(res => {
+      this.folders = res.data || []
+      if (this.formData.folder) {
+        this.$nextTick(() => {
+          this.$refs.tree.setCurrentKey(this.formData.folder)
+          this.$refs.tree.setCheckedKeys([this.formData.folder])
+        })
+      }
+    })
+  },
+  methods: {
+    getTypeOptions(formOption) {
+      const _options = []
+      if (formOption.type !== 'date' && formOption.type !== 'dateRange' && formOption.settings.inputType !== 'number' && formOption.type !== 'textarea') {
+        _options.push({ value: 'nvarchar', label: '字符串' })
+      }
+      if (formOption.type === 'textarea') {
+        _options.push({ value: 'text', label: '长文本' })
+      }
+      if (formOption.type === 'input' && formOption.settings.inputType === 'number') {
+        _options.push({ value: 'number', label: '整型数字' })
+        _options.push({ value: 'decimal', label: '小数数字' })
+      }
+      if (formOption.type === 'date' || formOption.type === 'dateRange') {
+        _options.push({ value: 'datetime', label: '日期' })
+      }
+      return _options
+    },
+    flattenFolder(list, result = []) {
+      forEach(list, item => {
+        result.push(item)
+        if (item.children && item.children.length > 0) {
+          this.flattenFolder(item.children, result)
+        }
+      })
+      return result
+    },
+    closeSave() {
+      this.$emit('update:showDrawer', false)
+    },
+    validateForm() {
+      this.$nextTick(() => {
+        this.$refs['mRightForm'].validate()
+      })
+    },
+    addIndex() {
+      this.formData.tableIndexes.push({
+        name: undefined,
+        columns: [{
+          column: undefined,
+          order: 'none'
+        }]
+      })
+    },
+    removeIndex(index) {
+      this.formData.tableIndexes.splice(index, 1)
+    },
+    removeIndexColumn(list, index) {
+      list.splice(index, 1)
+    },
+    addColumn(list) {
+      list.push({
+        column: undefined,
+        order: 'none'
+      })
+    },
+    nodeClick(data) {
+      this.$nextTick(() => {
+        this.formData.folder = data.id
+        this.formData.level = data.level + 1
+        this.folderTreeShow = false
+      })
+    },
+    filterMethod(val) {
+      if (!val) this.$refs.tree.filter(val)
+      this.$refs.tree.filter(val)
+    },
+    filterNode(value, data) {
+      if (!value) return true
+      return data.name.indexOf(value) !== -1
+    },
+    doSave() {
+      this.$refs['mRightForm'].validate((valid) => {
+        if (valid) {
+          const data = {
+            name: this.formData.name,
+            tableName: this.formData.table,
+            datasource: this.formData.datasource,
+            pid: this.formData.folder,
+            level: this.formData.level,
+            forms: JSON.stringify(this.formData.forms),
+            createIndex: this.formData.createIndex,
+            tableIndexes: JSON.stringify(this.formData.tableIndexes),
+            nodeType: 'form'
+          }
+          saveForm(data).then(res => {
+            this.closeSave()
+            this.$router.replace({ name: 'data-filling-form', query: { id: res.data }})
+          })
+        } else {
+          return false
+        }
+      })
+    }
+  }
+}
+</script>
+
+<template>
+  <el-container class="DataFillingFormSave">
+    <el-header class="de-header">
+      <div class="panel-info-area">
+        <span class="text16 margin-left12">
+          保存表单
+        </span>
+      </div>
+
+      <div style="padding-right: 20px">
+        <i
+          class="el-icon-close"
+          style="cursor: pointer"
+          @click="closeSave"
+        />
+      </div>
+    </el-header>
+    <el-main class="de-main">
+      <el-form
+        ref="mRightForm"
+        class="m-form"
+        :model="formData"
+        label-position="top"
+        hide-required-asterisk
+      >
+        <el-form-item
+          prop="name"
+          class="form-item"
+          :rules="[requiredRule]"
+        >
+          <template #label>
+            表单名称
+            <span
+              style="color: red"
+            >*</span>
+          </template>
+          <el-input
+            v-model.trim="formData.name"
+            required
+            size="small"
+            maxlength="50"
+            show-word-limit
+          />
+        </el-form-item>
+
+        <el-form-item
+          prop="folder"
+          class="form-item"
+          :rules="[requiredRule]"
+        >
+          <template #label>
+            所属文件夹
+            <span
+              style="color: red"
+            >*</span>
+          </template>
+          <el-popover
+            v-model="folderTreeShow"
+            placement="bottom-start"
+            popper-class="user-popper dataset-filed"
+            width="552"
+            trigger="click"
+          >
+            <el-tree
+              ref="tree"
+              :data="folders"
+              node-key="id"
+              class="de-tree"
+              :expand-on-click-node="false"
+              highlight-current
+              :filter-node-method="filterNode"
+              default-expand-all
+              @node-click="nodeClick"
+            >
+              <span
+                slot-scope="{ data }"
+                class="custom-tree-node-dataset"
+              >
+                <span>
+                  <svg-icon icon-class="scene" />
+                </span>
+                <span
+                  style="
+                  margin-left: 6px;
+                  white-space: nowrap;
+                  overflow: hidden;
+                  text-overflow: ellipsis;
+                "
+                  :title="data.name"
+                >{{ data.name }}</span>
+              </span>
+            </el-tree>
+            <el-select
+              slot="reference"
+              v-model="formData.folder"
+              filterable
+              popper-class="tree-select-dataset"
+              style="width: 100%"
+              :filter-method="filterMethod"
+              :placeholder="$t('commons.please_select')"
+              required
+            >
+              <el-option
+                v-for="item in selectDatasets"
+                :key="item.label"
+                :label="item.label"
+                :value="item.id"
+              />
+            </el-select>
+          </el-popover>
+
+        </el-form-item>
+
+        <el-form-item
+          prop="datasource"
+          class="form-item"
+          :rules="[requiredRule]"
+        >
+          <template #label>
+            数据源
+            <span
+              style="color: red"
+            >*</span>
+          </template>
+          <el-select
+            v-model="formData.datasource"
+            size="small"
+            style="width: 100%"
+          >
+            <el-option-group
+              v-for="(x, $index) in datasourceList"
+              :key="$index"
+              :label="x.name"
+            >
+              <el-option
+                v-for="d in x.options"
+                :key="d.id"
+                :value="d.id"
+                :label="d.name"
+              >{{ d.name }}
+              </el-option>
+            </el-option-group>
+          </el-select>
+        </el-form-item>
+
+        <el-form-item
+          prop="table"
+          class="form-item"
+          :rules="[requiredRule]"
+        >
+          <template #label>
+            数据库表名
+            <span
+              style="color: red"
+            >*</span>
+          </template>
+          <el-input
+            v-model.trim="formData.table"
+            required
+            size="small"
+            maxlength="50"
+            show-word-limit
+          />
+        </el-form-item>
+
+        <el-table
+          :data="formData.forms"
+          border
+          stripe
+          style="width: 100%"
+        >
+          <el-table-column
+            label="表单字段"
+          >
+            <template slot-scope="scope">
+              {{ scope.row.settings.name }}
+            </template>
+          </el-table-column>
+          <el-table-column>
+            <template
+              slot="header"
+              slot-scope="scope"
+            >
+              数据库表字段名称
+            </template>
+            <template slot-scope="scope">
+              <el-form-item
+                v-if="scope.row.type !== 'dateRange'"
+                :prop="'forms['+scope.$index+'].settings.mapping.columnName'"
+                class="form-item no-margin-bottom"
+                :rules="[requiredRule, duplicateRule]"
+              >
+                <el-input
+                  v-model.trim="scope.row.settings.mapping.columnName"
+                  placeholder="请输入"
+                  size="small"
+                  maxlength="50"
+                  show-word-limit
+                  required
+                />
+              </el-form-item>
+              <template v-else>
+                <el-form-item
+                  :prop="'forms['+scope.$index+'].settings.mapping.columnName1'"
+                  class="form-item no-margin-bottom"
+                  :rules="[requiredRule, duplicateRule]"
+                >
+                  <el-input
+                    v-model.trim="scope.row.settings.mapping.columnName1"
+                    placeholder="请输入开始时间"
+                    size="small"
+                    maxlength="50"
+                    show-word-limit
+                    required
+                  />
+                </el-form-item>
+                <el-form-item
+                  :prop="'forms['+scope.$index+'].settings.mapping.columnName2'"
+                  class="form-item no-margin-bottom"
+                  :rules="[requiredRule, duplicateRule]"
+                >
+                  <el-input
+                    v-model.trim="scope.row.settings.mapping.columnName2"
+                    placeholder="请输入结束时间"
+                    size="small"
+                    maxlength="50"
+                    show-word-limit
+                    required
+                  />
+                </el-form-item>
+              </template>
+            </template>
+          </el-table-column>
+          <el-table-column
+            label="数据库字段类型"
+          >
+            <template slot-scope="scope">
+              <el-form-item
+                :prop="'forms['+scope.$index+'].settings.mapping.type'"
+                class="form-item no-margin-bottom"
+                :rules="[requiredRule]"
+              >
+                <el-select
+                  v-model="scope.row.settings.mapping.type"
+                  placeholder="请选择"
+                  size="small"
+                  required
+                  style="width: 100%"
+                >
+                  <el-option
+                    v-for="o in scope.row.settings.mapping.typeOptions"
+                    :key="o.value"
+                    :value="o.value"
+                    :label="o.label"
+                  />
+
+                </el-select>
+              </el-form-item>
+            </template>
+          </el-table-column>
+        </el-table>
+
+        <div style="display: flex">
+          <el-form-item
+            prop="createIndex"
+            class="form-item no-margin-bottom"
+          >
+            <el-checkbox
+              v-model="formData.createIndex"
+              label="创建索引"
+              size="small"
+            />
+          </el-form-item>
+
+          <el-button
+            v-if="formData.createIndex"
+            type="text"
+            style="margin-left: 20px"
+            @click="addIndex"
+          >+ 新增索引
+          </el-button>
+        </div>
+
+        <el-table
+          v-if="formData.createIndex"
+          :data="formData.tableIndexes"
+          border
+          stripe
+          style="width: 100%"
+        >
+          <el-table-column
+            label="索引名称"
+            width="300"
+          >
+            <template slot-scope="scope">
+              <el-form-item
+                :prop="'tableIndexes['+scope.$index+'].name'"
+                class="form-item"
+                :rules="[requiredRule, duplicateIndexRule]"
+              >
+                <el-input
+                  v-model="scope.row.name"
+                  placeholder="请输入"
+                  size="small"
+                  maxlength="50"
+                  show-word-limit
+                  required
+                />
+              </el-form-item>
+            </template>
+          </el-table-column>
+
+          <el-table-column
+            label="索引字段"
+          >
+            <template slot-scope="scope">
+              <div
+                v-for="(indexRow, $index) in scope.row.columns"
+                :key="$index"
+                style="display: flex; flex-direction: row; align-items: center;"
+              >
+                <el-form-item
+                  :prop="'tableIndexes['+scope.$index+'].columns['+$index+'].column'"
+                  class="form-item no-margin-bottom"
+                  :rules="[requiredRule, invalidColumnRule, duplicateIndexColumnRule]"
+                  style="flex: 1"
+                >
+                  <el-select
+                    v-model="indexRow.column"
+                    placeholder="请选择"
+                    size="small"
+                    required
+                    style="width: 100%"
+                  >
+                    <el-option
+                      v-for="(x, $index) in columnsList"
+                      :key="$index"
+                      :value="x"
+                      :label="x"
+                    >{{ x }}
+                    </el-option>
+                  </el-select>
+                </el-form-item>
+
+                <el-form-item
+                  :prop="'tableIndexes['+scope.$index+'].columns['+$index+'].order'"
+                  class="form-item no-margin-bottom"
+                  :rules="[requiredRule]"
+                >
+                  <el-select
+                    v-model="indexRow.order"
+                    placeholder="请选择"
+                    size="small"
+                    required
+                    style="width: 100%"
+                  >
+                    <el-option
+                      value="asc"
+                      label="顺序"
+                    />
+                    <el-option
+                      value="none"
+                      label="默认排序"
+                    />
+                    <el-option
+                      value="desc"
+                      label="倒序"
+                    />
+                  </el-select>
+                </el-form-item>
+                <div
+                  v-if="scope.row.columns.length > 1"
+                  class="btn-item"
+                  @click="removeIndexColumn(scope.row.columns, $index)"
+                >
+                  <svg-icon icon-class="icon_delete-trash_outlined" />
+                </div>
+              </div>
+              <el-button
+                type="text"
+                @click="addColumn(scope.row.columns)"
+              >+ 新增字段
+              </el-button>
+            </template>
+          </el-table-column>
+
+          <el-table-column width="50">
+            <template slot-scope="scope">
+              <div
+                class="btn-item"
+                @click="removeIndex(scope.$index)"
+              >
+                <svg-icon icon-class="icon_delete-trash_outlined" />
+              </div>
+            </template>
+          </el-table-column>
+        </el-table>
+
+      </el-form>
+
+    </el-main>
+    <el-footer class="de-footer">
+      <el-button @click="closeSave">取消</el-button>
+      <el-button
+        type="primary"
+        @click="doSave"
+      >保存
+      </el-button>
+    </el-footer>
+  </el-container>
+</template>
+
+<style  lang="scss" scoped>
+.DataFillingFormSave {
+
+  height: 100%;
+
+  .de-header {
+    height: 56px !important;
+    padding: 0px !important;
+    border-bottom: 1px solid #E6E6E6;
+    background-color: var(--SiderBG, white);
+
+    display: flex;
+    flex-direction: row;
+    align-items: center;
+    justify-content: space-between
+  }
+
+  .de-footer {
+    display: flex;
+    flex-direction: row;
+    align-items: center;
+    justify-content: flex-end
+  }
+
+  .panel-info-area {
+    padding-left: 20px;
+  }
+
+  .de-main {
+    display: flex;
+    align-items: center;
+    flex-direction: column;
+
+    .m-form {
+      width: 80%;
+    }
+  }
+
+  .no-margin-bottom {
+    margin-bottom: 0;
+  }
+
+  .btn-item {
+    display: flex;
+    flex-direction: row;
+    align-items: center;
+    justify-content: center;
+
+    width: 24px;
+    height: 24px;
+
+    margin-left: 8px;
+
+    border-radius: 4px;
+
+    cursor: pointer;
+  }
+
+  .btn-item:first-child {
+    margin-left: unset;
+  }
+
+  .btn-item:hover {
+    background: rgba(31, 35, 41, 0.1);
+  }
+
+}
+.dataset-filed {
+  height: 400px;
+  overflow-y: auto;
+}
+
+.tree-select-dataset {
+  display: none;
+}
+</style>
diff --git a/core/frontend/src/views/dataFilling/index.vue b/core/frontend/src/views/dataFilling/index.vue
new file mode 100644
index 0000000000..03edec743a
--- /dev/null
+++ b/core/frontend/src/views/dataFilling/index.vue
@@ -0,0 +1,204 @@
+<template>
+  <div
+    element-loading-custom-class="pwd-tips-loading"
+    :class="classObj"
+    class="app-wrapper"
+  >
+    <de-container>
+      <de-main-container
+        class="la-main-container full-height"
+      >
+        <app-main />
+      </de-main-container>
+    </de-container>
+
+  </div>
+</template>
+
+<script>
+import { AppMain } from '../../layout/components'
+import ResizeMixin from '../../layout/mixin/ResizeHandler'
+import DeMainContainer from '@/components/dataease/DeMainContainer'
+import DeContainer from '@/components/dataease/DeContainer'
+import bus from '@/utils/bus'
+import { showMultiLoginMsg } from '@/utils/index'
+
+export default {
+  name: 'DataFilling',
+  components: {
+    AppMain,
+    DeMainContainer,
+    DeContainer
+  },
+  mixins: [ResizeMixin],
+  data() {
+    return {
+      componentName: 'PanelMain',
+      showTips: false,
+      buttonDisable: false,
+      sideWidth: ''
+    }
+  },
+  computed: {
+    sidebar() {
+      return this.$store.state.app.sidebar
+    },
+    device() {
+      return this.$store.state.app.device
+    },
+    fixedHeader() {
+      return this.$store.state.settings.fixedHeader
+    },
+    showSettings() {
+      return this.$store.state.settings.showSettings
+    },
+
+    classObj() {
+      return {
+        // hideSidebar: !this.sidebar.opened,
+        openSidebar: this.sidebar.opened,
+        withoutAnimation: this.sidebar.withoutAnimation,
+        mobile: this.device === 'mobile'
+      }
+    }
+  },
+  beforeCreate() {
+    this.showTips = false
+  },
+  mounted() {
+    document.addEventListener('click', this.bodyClick)
+    bus.$on('PanelSwitchComponent', this.panelSwitchComponent)
+    bus.$on('web-seize-topic-call', this.webMsgTopicCall)
+  },
+  beforeDestroy() {
+    this.showTips = false
+    document.removeEventListener('click', this.bodyClick)
+    bus.$off('PanelSwitchComponent', this.panelSwitchComponent)
+    bus.$off('web-seize-topic-call', this.webMsgTopicCall)
+  },
+  created() {
+    showMultiLoginMsg()
+  },
+  methods: {
+    bodyClick(e) {
+      const dom = document.querySelector('.pwd-tips')
+      if (dom && !dom.contains(e.target)) {
+        this.showTips = false
+      }
+    },
+    webMsgTopicCall(param) {
+      const msg = this.$t('multi_login_lang.forced_offline')
+      // eslint-disable-next-line
+      this.$error(eval(msg))
+      bus.$emit('sys-logout')
+    },
+    panelSwitchComponent(c) {
+      this.componentName = c.name
+    },
+    handleClickOutside() {
+      this.$store.dispatch('app/closeSideBar', { withoutAnimation: false })
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+  @import "~@/styles/mixin.scss";
+  @import "~@/styles/variables.scss";
+
+  .app-wrapper {
+    min-width: 1000px!important;
+    min-height: 600px!important;
+    @include clearfix;
+    position: relative;
+    height: 100%;
+    // height: $contentHeight;
+    background-color: var(--ContentBG);
+    width: 100%;
+    &.mobile.openSidebar{
+      position: fixed;
+      top: 0;
+    }
+
+  }
+  ::v-deep .pwd-tips-loading {
+    z-index: 2024;
+    background-color: rgba(255, 255, 255, 0.1);
+    .el-loading-spinner {
+      display: none !important;
+    }
+  }
+  .drawer-bg {
+    background: #000;
+    opacity: 0.3;
+    width: 100%;
+    top: 0;
+    height: 100%;
+    position: absolute;
+    z-index: 999;
+  }
+
+  .fixed-header {
+    position: fixed;
+    top: 0;
+    right: 0;
+    z-index: 9;
+    width: calc(100% - #{$sideBarWidth});
+    transition: width 0.28s;
+  }
+
+  .hideSidebar .fixed-header {
+    width: calc(100% - 56px)
+  }
+
+  .mobile .fixed-header {
+    width: 100%;
+  }
+
+  .la-main-container {
+      padding: 0px !important;
+  }
+  .le-aside-container {
+      .sidebar-container {
+        width: 100%;
+        position: relative !important;
+        height: 100%;
+        top: 0 !important;
+        background-color: var(--SiderBG) !important;
+      }
+      overflow: hidden;
+  }
+  .full-height {
+    height: 100vh !important;
+    ::-webkit-scrollbar {
+      width: 5px;
+      height: 5px;
+    }
+
+  }
+  .pwd-tips {
+    position: absolute;
+    box-shadow: 0 0 0 1000em rgb(0, 0, 0, 0.3);
+    height: 100px;
+    width: 225px;
+    top: 105px;
+    right: 115px;
+    z-index: 9999;
+    border-radius: 4px;
+    padding: 15px;
+    background: #fff;
+  }
+  .arrow{
+    border-bottom: 7px solid #fff;
+    border-right: 7px solid #b5b5b7;
+    border-left: 7px solid #b5b5b7;
+    border-top: 7px solid #b5b5b7;
+    width: 0px;
+    height: 0px;
+    position: relative;
+    top:-60px;
+    left:210px;
+    transform: rotate(90deg);
+}
+
+</style>
diff --git a/core/frontend/src/views/dataFilling/myTask/index.vue b/core/frontend/src/views/dataFilling/myTask/index.vue
new file mode 100644
index 0000000000..248719bbb4
--- /dev/null
+++ b/core/frontend/src/views/dataFilling/myTask/index.vue
@@ -0,0 +1,663 @@
+<script>
+import DeContainer from '@/components/dataease/DeContainer.vue'
+import DeMainContainer from '@/components/dataease/DeMainContainer.vue'
+import DeAsideContainer from '@/components/dataease/DeAsideContainer.vue'
+import GridTable from '@/components/gridTable/index.vue'
+import { getForm, searchFormMyTasks, searchTable } from '@/views/dataFilling/form/dataFilling'
+import EditFormData from '@/views/dataFilling/form/EditFormData.vue'
+import { forIn, includes, map, filter, forEach } from 'lodash-es'
+
+export default {
+  name: 'MyDataFillingJobs',
+  components: { EditFormData, GridTable, DeAsideContainer, DeMainContainer, DeContainer },
+  data() {
+    return {
+      activeName: 'my-tasks',
+      types: [
+        { key: 'todo', name: '代办项' },
+        { key: 'finished', name: '已完成' },
+        { key: 'expired', name: '已过期' }
+      ],
+      currentKey: 'todo',
+      showDrawer: false,
+      selectedDataId: undefined,
+      selectedData: undefined,
+      selectedTaskId: undefined,
+      selectedFormTitle: '',
+      selectedFormId: undefined,
+      forms: [],
+      createTitle: '',
+      drawerReadonly: false,
+      myTaskName: '',
+      finishedTaskName: '',
+      expiredTaskName: '',
+      myTasks: [],
+      finishedTasks: [],
+      expiredTasks: [],
+      myTaskPaginationConfig: {
+        currentPage: 1,
+        pageSize: 10,
+        total: 0
+      },
+      finishedTaskPaginationConfig: {
+        currentPage: 1,
+        pageSize: 10,
+        total: 0
+      },
+      expiredTaskPaginationConfig: {
+        currentPage: 1,
+        pageSize: 10,
+        total: 0
+      }
+    }
+  },
+  mounted() {
+    this.currentKey = 'todo'
+    this.searchTableMyTaskData()
+  },
+  methods: {
+    changeKey(key) {
+      this.currentKey = key
+      if (key === 'finished') {
+        this.searchTableFinishedTaskData()
+      } else if (key === 'expired') {
+        this.searchTableExpiredTaskData()
+      } else {
+        this.searchTableMyTaskData()
+      }
+    },
+    searchTableMyTaskData() {
+      searchFormMyTasks({ taskName: this.myTaskName }, this.myTaskPaginationConfig.currentPage, this.myTaskPaginationConfig.pageSize, 'todo').then(res => {
+        if (res.data) {
+          this.myTaskPaginationConfig.total = res.data.itemCount
+          this.myTasks = res.data.listObject
+        }
+      })
+    },
+    searchTableFinishedTaskData() {
+      searchFormMyTasks({ taskName: this.finishedTaskName }, this.finishedTaskPaginationConfig.currentPage, this.finishedTaskPaginationConfig.pageSize, 'finished').then(res => {
+        if (res.data) {
+          this.finishedTaskPaginationConfig.total = res.data.itemCount
+          this.finishedTasks = res.data.listObject
+        }
+      })
+    },
+    searchTableExpiredTaskData() {
+      searchFormMyTasks({ taskName: this.expiredTaskName }, this.expiredTaskPaginationConfig.currentPage, this.expiredTaskPaginationConfig.pageSize, 'expired').then(res => {
+        if (res.data) {
+          this.expiredTaskPaginationConfig.total = res.data.itemCount
+          this.expiredTasks = res.data.listObject
+        }
+      })
+    },
+    myTaskHandleSizeChange(pageSize) {
+      this.myTaskPaginationConfig.currentPage = 1
+      this.myTaskPaginationConfig.pageSize = pageSize
+      this.searchTableData()
+    },
+    myTaskHandleCurrentChange(currentPage) {
+      this.myTaskPaginationConfig.currentPage = currentPage
+      this.searchTableData()
+    },
+    finishedTaskHandleSizeChange(pageSize) {
+      this.finishedTaskPaginationConfig.currentPage = 1
+      this.finishedTaskPaginationConfig.pageSize = pageSize
+      this.searchTableData()
+    },
+    finishedTaskHandleCurrentChange(currentPage) {
+      this.finishedTaskPaginationConfig.currentPage = currentPage
+      this.searchTableData()
+    },
+    expiredTaskHandleSizeChange(pageSize) {
+      this.expiredTaskPaginationConfig.currentPage = 1
+      this.expiredTaskPaginationConfig.pageSize = pageSize
+      this.searchTableData()
+    },
+    expiredTaskHandleCurrentChange(currentPage) {
+      this.expiredTaskPaginationConfig.currentPage = currentPage
+      this.searchTableData()
+    },
+    getRestTime(time) {
+      if (!time) {
+        return '不限时'
+      }
+      const _time = new Date(time).getTime()
+      const current = new Date().getTime()
+
+      if (_time < current) {
+        return '已过期'
+      }
+      const dateDiff = _time - current
+
+      const dayDiff = Math.floor(dateDiff / (24 * 3600 * 1000))
+      const monthDiff = Math.floor(dayDiff / 30)
+      const yearDiff = Math.floor(monthDiff / 12)
+
+      const leave1 = dateDiff % (24 * 3600 * 1000) // 计算天数后剩余的毫秒数
+      const hours = Math.floor(leave1 / (3600 * 1000))// 计算出小时数
+      // 计算相差分钟数
+      const leave2 = leave1 % (3600 * 1000) // 计算小时数后剩余的毫秒数
+      const minutes = Math.floor(leave2 / (60 * 1000))// 计算相差分钟数
+      // 计算相差秒数
+      const leave3 = leave2 % (60 * 1000) // 计算分钟数后剩余的毫秒数
+      const seconds = Math.round(leave3 / 1000)
+
+      if (yearDiff > 0 || monthDiff > 0) {
+        const yearStr = yearDiff > 0 ? yearDiff + '年' : ''
+        const monthStr = monthDiff > 0 ? monthDiff + '月' : ''
+        return yearStr + monthStr
+      }
+
+      const dayStr = dayDiff > 0 ? dayDiff + '天' : ''
+      const hourStr = hours > 0 ? hours + '小时' : ''
+
+      if (dayDiff > 0) {
+        return dayStr + hourStr
+      }
+
+      const minuteStr = minutes > 0 ? minutes + '分钟' : ''
+
+      if (hours > 0) {
+        return hourStr + minuteStr
+      }
+
+      const secondsStr = seconds > 0 ? seconds + '秒' : ''
+
+      return minuteStr + secondsStr
+    },
+    editForm(row, readonly) {
+      if (readonly) {
+        this.drawerReadonly = true
+      } else {
+        this.drawerReadonly = false
+      }
+
+      this.createTitle = '数据填报'
+      this.forms = []
+
+      this.selectedFormId = row.formId
+      this.selectedTaskId = row.id
+
+      this.selectedDataId = row.valueId
+      this.selectedData = {}
+      if (row.valueId) {
+        getForm(row.formId).then(res => {
+          this.selectedFormTitle = res.data.name
+          this.forms = JSON.parse(res.data.forms)
+
+          const _list = []
+          forEach(this.forms, f => {
+            if (f.type === 'dateRange') {
+              _list.push({
+                props: f.settings?.mapping?.columnName1,
+                label: f.settings?.name,
+                date: true,
+                enableTime: f.settings?.enableTime,
+                type: f.type,
+                multiple: !!f.settings.multiple,
+                rangeIndex: 0
+              })
+              _list.push({
+                props: f.settings?.mapping?.columnName2,
+                label: f.settings?.name,
+                date: true,
+                enableTime: f.settings?.enableTime,
+                type: f.type,
+                multiple: !!f.settings.multiple,
+                rangeIndex: 1
+              })
+            } else {
+              _list.push({
+                props: f.settings?.mapping?.columnName,
+                label: f.settings?.name,
+                date: f.type === 'date',
+                enableTime: f.type === 'date' && f.settings?.enableTime,
+                type: f.type,
+                multiple: !!f.settings.multiple
+              })
+            }
+          })
+          const dateFormatColumns = map(filter(_list, c => c.date), 'props')
+
+          searchTable(row.formId, {
+            primaryKeyValue: row.valueId,
+            currentPage: 1,
+            pageSize: 10
+          }).then(res => {
+            if (res.data) {
+              const obj = {}
+              if (res.data.data.length === 0) {
+                this.$message({
+                  message: 'ID为[' + row.valueId + ']的数据不存在',
+                  type: 'warning',
+                  showClose: true
+                })
+                return
+              }
+              forIn(res.data.data[0].data, (value, key) => {
+                if (includes(dateFormatColumns, key)) {
+                  if (value) {
+                    obj[key] = new Date(value)
+                  } else {
+                    obj[key] = undefined
+                  }
+                } else {
+                  obj[key] = value
+                }
+              })
+
+              this.selectedData = obj
+
+              this.showDrawer = true
+            }
+          })
+        })
+      } else {
+        getForm(row.formId).then(res => {
+          this.selectedFormTitle = res.data.name
+          this.forms = JSON.parse(res.data.forms)
+
+          this.showDrawer = true
+        })
+      }
+    },
+
+    showForm(row) {
+      this.editForm(row, true)
+    },
+    closeForm() {
+      this.showDrawer = false
+    },
+    onSaveSuccess() {
+      this.closeForm()
+
+      if (this.currentKey === 'finished') {
+        this.searchTableFinishedTaskData()
+      } else if (this.currentKey === 'expired') {
+        this.searchTableExpiredTaskData()
+      } else {
+        this.searchTableMyTaskData()
+      }
+    }
+
+  }
+}
+</script>
+
+<template>
+  <de-container
+    v-loading="$store.getters.loadingMap[$store.getters.currentPath]"
+    style="background-color: #f7f8fa"
+  >
+
+    <de-aside-container type="data-filling">
+      <el-tabs
+        v-model="activeName"
+        class="tab-panel"
+      >
+        <el-tab-pane name="my-tasks">
+          <span slot="label">我的填报</span>
+
+          <div style="padding:0 24px 16px">
+            <div
+              v-for="t in types"
+              :key="t.key"
+              class="type-node"
+              :class="{'is-focus': t.key === currentKey}"
+              @click="changeKey(t.key)"
+            >
+              {{ t.name }}
+            </div>
+          </div>
+        </el-tab-pane>
+
+        <el-tab-pane name="forms">
+          <span slot="label">
+            <router-link to="/data-filling/forms">
+              表单管理
+            </router-link>
+          </span>
+        </el-tab-pane>
+      </el-tabs>
+
+    </de-aside-container>
+    <de-main-container
+      v-if="currentKey === 'todo'"
+      style="display: flex; flex-direction: column"
+    >
+      <div class="view-table">
+        <div style="margin-bottom: 12px; height: 32px;">
+          <el-row>
+            <el-col
+              :span="8"
+              :offset="16"
+            >
+              <el-input
+                ref="search"
+                v-model="myTaskName"
+                :placeholder="$t('commons.search_by_name')"
+                prefix-icon="el-icon-search"
+                class="name-email-search"
+                size="small"
+                clearable
+                @blur="searchTableMyTaskData"
+                @clear="searchTableMyTaskData"
+              />
+            </el-col>
+          </el-row>
+        </div>
+        <div style="flex: 1">
+          <grid-table
+            v-loading="$store.getters.loadingMap[$store.getters.currentPath]"
+            style="width: 100%; height: 100%"
+            stripe
+            :table-data="myTasks"
+            :columns="[]"
+            current-row-key="id"
+            :pagination="myTaskPaginationConfig"
+            @size-change="myTaskHandleSizeChange"
+            @current-change="myTaskHandleCurrentChange"
+          >
+            <el-table-column
+              key="taskName"
+              prop="taskName"
+              label="任务名称"
+            />
+            <el-table-column
+              key="restTime"
+              prop="restTime"
+              label="任务有效期"
+            >
+              <template slot-scope="scope">
+                {{ getRestTime(scope.row.endTime) }}
+              </template>
+            </el-table-column>
+            <el-table-column
+              key="endTime"
+              prop="endTime"
+              label="任务截止时间"
+            >
+              <template slot-scope="scope">
+                {{ scope.row.endTime ? new Date(scope.row.endTime).format("yyyy-MM-dd hh:mm:ss") : '-' }}
+              </template>
+            </el-table-column>
+            <el-table-column
+              key="creatorName"
+              prop="creatorName"
+              label="任务下发人"
+            />
+            <el-table-column
+              key="startTime"
+              prop="startTime"
+              label="任务下发时间"
+            >
+              <template slot-scope="scope">
+                {{ new Date(scope.row.startTime).format("yyyy-MM-dd hh:mm:ss") }}
+              </template>
+            </el-table-column>
+            <el-table-column
+              key="id"
+              label="操作"
+              prop="id"
+            >
+              <template slot-scope="scope">
+                <el-button
+                  type="text"
+                  @click="editForm(scope.row)"
+                >
+                  立即填报
+                </el-button>
+              </template>
+            </el-table-column>
+          </grid-table>
+        </div>
+      </div>
+    </de-main-container>
+    <de-main-container
+      v-if="currentKey === 'finished'"
+      style="display: flex; flex-direction: column"
+    >
+      <div class="view-table">
+        <div style="margin-bottom: 12px; height: 32px;">
+          <el-row>
+            <el-col
+              :span="8"
+              :offset="16"
+            >
+              <el-input
+                ref="search"
+                v-model="finishedTaskName"
+                :placeholder="$t('commons.search_by_name')"
+                prefix-icon="el-icon-search"
+                class="name-email-search"
+                size="small"
+                clearable
+                @blur="searchTableMyTaskData"
+                @clear="searchTableMyTaskData"
+              />
+            </el-col>
+          </el-row>
+        </div>
+        <div style="flex: 1">
+          <grid-table
+            v-loading="$store.getters.loadingMap[$store.getters.currentPath]"
+            style="width: 100%; height: 100%"
+            stripe
+            :table-data="finishedTasks"
+            :columns="[]"
+            current-row-key="id"
+            :pagination="finishedTaskPaginationConfig"
+            @size-change="finishedTaskHandleSizeChange"
+            @current-change="finishedTaskHandleCurrentChange"
+          >
+            <el-table-column
+              key="taskName"
+              prop="taskName"
+              label="任务名称"
+            />
+            <el-table-column
+              key="finishTime"
+              prop="finishTime"
+              label="任务完成时间"
+            >
+              <template slot-scope="scope">
+                {{ new Date(scope.row.finishTime).format("yyyy-MM-dd hh:mm:ss") }}
+              </template>
+            </el-table-column>
+            <el-table-column
+              key="creatorName"
+              prop="creatorName"
+              label="任务下发人"
+            />
+            <el-table-column
+              key="startTime"
+              prop="startTime"
+              label="任务下发时间"
+            >
+              <template slot-scope="scope">
+                {{ new Date(scope.row.startTime).format("yyyy-MM-dd hh:mm:ss") }}
+              </template>
+            </el-table-column>
+            <el-table-column
+              key="id"
+              label="操作"
+              prop="id"
+            >
+              <template slot-scope="scope">
+                <el-button
+                  type="text"
+                  @click="editForm(scope.row)"
+                >
+                  编辑数据
+                </el-button>
+                <el-button
+                  type="text"
+                  @click="showForm(scope.row)"
+                >
+                  查看数据
+                </el-button>
+              </template>
+            </el-table-column>
+          </grid-table>
+        </div>
+      </div>
+    </de-main-container>
+    <de-main-container
+      v-if="currentKey === 'expired'"
+      style="display: flex; flex-direction: column"
+    >
+      <div class="view-table">
+        <div style="margin-bottom: 12px; height: 32px;">
+          <el-row>
+            <el-col
+              :span="8"
+              :offset="16"
+            >
+              <el-input
+                ref="search"
+                v-model="expiredTaskName"
+                :placeholder="$t('commons.search_by_name')"
+                prefix-icon="el-icon-search"
+                class="name-email-search"
+                size="small"
+                clearable
+                @blur="searchTableMyTaskData"
+                @clear="searchTableMyTaskData"
+              />
+            </el-col>
+          </el-row>
+        </div>
+        <div style="flex: 1">
+          <grid-table
+            v-loading="$store.getters.loadingMap[$store.getters.currentPath]"
+            style="width: 100%; height: 100%"
+            stripe
+            :table-data="expiredTasks"
+            :columns="[]"
+            current-row-key="id"
+            :pagination="expiredTaskPaginationConfig"
+            @size-change="expiredTaskHandleSizeChange"
+            @current-change="expiredTaskHandleCurrentChange"
+          >
+            <el-table-column
+              key="taskName"
+              prop="taskName"
+              label="任务名称"
+            />
+            <el-table-column
+              key="endTime"
+              prop="endTime"
+              label="任务过期时间"
+            >
+              <template slot-scope="scope">
+                {{ scope.row.endTime ? new Date(scope.row.endTime).format("yyyy-MM-dd hh:mm:ss") : '-' }}
+              </template>
+            </el-table-column>
+            <el-table-column
+              key="creatorName"
+              prop="creatorName"
+              label="任务下发人"
+            />
+            <el-table-column
+              key="startTime"
+              prop="startTime"
+              label="任务下发时间"
+            >
+              <template slot-scope="scope">
+                {{ new Date(scope.row.startTime).format("yyyy-MM-dd hh:mm:ss") }}
+              </template>
+            </el-table-column>
+
+          </grid-table>
+        </div>
+      </div>
+    </de-main-container>
+
+    <el-drawer
+      :visible.sync="showDrawer"
+      direction="btt"
+      size="100%"
+      append-to-body
+      :with-header="false"
+    >
+      <edit-form-data
+        v-if="showDrawer"
+        :id="selectedDataId"
+        :data.sync="selectedData"
+        :user-task-id="selectedTaskId"
+        :form-title.sync="selectedFormTitle"
+        :form-id="selectedFormId"
+        :forms.sync="forms"
+        :title.sync="createTitle"
+        :show-drawer.sync="showDrawer"
+        :readonly.sync="drawerReadonly"
+        @save-success="onSaveSuccess"
+      />
+    </el-drawer>
+
+  </de-container>
+
+</template>
+
+<style  lang="scss" scoped>
+
+.view-table {
+  background: rgba(255, 255, 255, 1);
+  padding: 24px 24px 48px;
+  height: 100%;
+  overflow-y: hidden;
+  width: 100%;
+  box-sizing: border-box;
+  display: flex;
+  flex-direction: column;
+
+}
+
+.tab-panel {
+  height: 100%;
+  overflow-y: auto;
+}
+
+.tab-panel ::v-deep .el-tabs__nav-wrap {
+  padding: 0 10px;
+}
+
+.tab-panel ::v-deep .el-tabs__nav-wrap::after {
+  height: 1px;
+}
+
+.tab-panel ::v-deep .el-tabs__item {
+  /* width: 10px; */
+  padding: 0 10px;
+}
+
+::v-deep.ms-aside-container{
+  padding: 0
+}
+
+.type-node {
+  white-space: nowrap;
+  outline: none;
+
+  height: 40px;
+  border-radius: 4px;
+
+  display: flex;
+  align-items: center;
+  cursor: pointer;
+
+  font-size: 14px;
+  padding: 0 14px;
+
+}
+
+.type-node.is-focus {
+  background-color: var(--deWhiteHover, #e0eaff);
+  color: var(--primary, #3370ff);
+}
+
+.type-node:hover{
+  background: rgba(31, 35, 41, 0.1);
+}
+
+</style>
diff --git a/core/frontend/src/views/link/generate/index.vue b/core/frontend/src/views/link/generate/index.vue
index d7ded228d9..ebd344f9b6 100644
--- a/core/frontend/src/views/link/generate/index.vue
+++ b/core/frontend/src/views/link/generate/index.vue
@@ -10,7 +10,7 @@
       />
     </el-tabs>
     <div
-      v-if="activeName === 'link'"
+      v-if="!showIndex"
       class="link"
     >
       <el-form
@@ -97,7 +97,12 @@
           class="auth-root-class"
         >
           <span slot="footer">
-
+            <el-button
+              v-if="valid"
+              plain
+              size="mini"
+              @click="openTicket"
+            >Ticket 设置</el-button>
             <el-button
               v-if="!form.enablePwd"
               v-clipboard:copy="form.uri"
@@ -123,24 +128,47 @@
     </div>
 
     <div
-      v-if="activeName === 'ticket'"
+      v-else
       class="ticket"
     >
       <div class="ticket-model">
-        <el-checkbox v-model="requireTicket" />
-        <span>ticket必选</span>
+        <div class="ticket-model-start">
+          <el-tooltip
+            class="item"
+            effect="dark"
+            content="返回公共链接设置页面"
+            placement="top"
+          >
+            <span class="back-tips">
+              <svg-icon
+                icon-class="icon_left_outlined"
+                @click="closeTicket"
+              />
+            </span>
+          </el-tooltip>
+          <span class="ticket-title">Ticket 设置</span>
+        </div>
+        <div class="ticket-model-end">
+          <el-checkbox
+            v-model="requireTicket"
+            @change="requireTicketChange"
+          />
+          <span>必选</span>
+        </div>
+
       </div>
       <div
         class="ticket-table"
       >
-        <div class="add-ticket">
-          <span>
-            <i
-              class="el-icon-circle-plus-outline"
-              @click="addRow()"
-            />
-          </span>
+        <div class="text-add-ticket">
+          <el-button
+            class="de-text-btn mr2"
+            type="text"
+            icon="el-icon-plus"
+            @click="addRow"
+          >{{ $t("commons.create") }}</el-button>
         </div>
+
         <el-table
           :data="tableData"
           style="width: 100%"
@@ -154,28 +182,72 @@
             <template slot-scope="scope">
               <div class="ticket-row">
                 <span>{{ scope.row.ticket }}</span>
-                <span class="refresh-i">
-                  <i
-                    class="el-icon-refresh"
-                    @click="refreshTicket(scope.row)"
-                  />
-                </span>
+                <el-tooltip
+                  class="item"
+                  effect="dark"
+                  content="复制"
+                  placement="top"
+                >
+                  <span
+                    v-clipboard:copy="`${form.uri}?ticket=${scope.row.ticket}`"
+                    v-clipboard:success="onCopy"
+                    v-clipboard:error="onError"
+                    class="copy-i"
+                  >
+                    <svg-icon
+                      icon-class="de-icon-copy"
+                    />
+                  </span>
+                </el-tooltip>
+                <el-tooltip
+                  class="item"
+                  effect="dark"
+                  content="刷新ticket"
+                  placement="top"
+                >
+                  <span class="refresh-i">
+                    <i
+                      class="el-icon-refresh-right"
+                      @click="refreshTicket(scope.row)"
+                    />
+                  </span>
+                </el-tooltip>
               </div>
             </template>
           </el-table-column>
 
           <el-table-column
             prop="exp"
-            label="有效期(分钟)"
+            label="有效期"
             width="100"
           >
+            <template slot="header">
+              <span>有效期</span>
+              <el-tooltip
+                class="item"
+                effect="dark"
+                content="单位: 分钟，范围: [0-1440],0代表无期限，自首次使用ticket访问开始"
+                placement="top"
+              >
+                <span class="check-tips">
+                  <svg-icon
+                    icon-class="de-icon-info"
+                    @click="closeTicket"
+                  />
+                </span>
+              </el-tooltip>
+            </template>
             <template slot-scope="scope">
               <el-input
                 v-if="scope.row.isEdit"
+                :ref="setExpRef(scope.$index)"
                 v-model="scope.row.exp"
                 type="number"
                 placeholder="请输入内容"
+                min="0"
+                max="1440"
                 size="mini"
+                @change="val => validateExp(val, scope.$index)"
               />
               <span v-else>
                 {{ scope.row.exp }}
@@ -189,14 +261,16 @@
             <template slot-scope="scope">
               <el-input
                 v-if="scope.row.isEdit"
+                :ref="setArgRef(scope.$index)"
                 v-model="scope.row.args"
                 type="text"
                 placeholder="请输入内容"
-                maxlength="100"
+                maxlength="200"
                 size="mini"
+                @change="val => validateArgs(val, scope.$index)"
               />
               <span v-else>
-                {{ scope.row.args }}
+                {{ scope.row.args || '-' }}
               </span>
             </template>
           </el-table-column>
@@ -206,24 +280,38 @@
           >
             <template slot-scope="scope">
               <div class="ticket-op">
-                <span>
-                  <i
-                    class="el-icon-delete"
-                    @click="deleteTicket(scope.row, scope.$idnex)"
-                  />
-                </span>
-                <span>
-                  <i
-                    v-if="!scope.row.isEdit"
-                    class="el-icon-edit"
-                    @click="editRow(scope.row)"
-                  />
-                  <i
-                    v-else
-                    class="el-icon-circle-check"
-                    @click="saveRow(scope.row)"
-                  />
-                </span>
+                <el-tooltip
+                  class="item"
+                  effect="dark"
+                  content="删除"
+                  placement="top"
+                >
+                  <span>
+                    <i
+                      class="el-icon-delete"
+                      @click="deleteTicket(scope.row, scope.$idnex)"
+                    />
+                  </span>
+                </el-tooltip>
+                <el-tooltip
+                  class="item"
+                  effect="dark"
+                  :content="scope.row.isEdit ? '保存' : '编辑'"
+                  placement="top"
+                >
+                  <span>
+                    <i
+                      v-if="!scope.row.isEdit"
+                      class="el-icon-edit"
+                      @click="editRow(scope.row)"
+                    />
+                    <i
+                      v-else
+                      class="el-icon-circle-check"
+                      @click="saveRow(scope.row, scope.$index)"
+                    />
+                  </span>
+                </el-tooltip>
               </div>
             </template>
           </el-table-column>
@@ -241,6 +329,7 @@ import {
   setPwd,
   switchValid,
   switchEnablePwd,
+  switchEnableTicket,
   shortUrl,
   setOverTime
 } from '@/api/link'
@@ -256,6 +345,7 @@ export default {
   },
   data() {
     return {
+      showIndex: 0,
       requireTicket: false,
       uuid: '',
       tabList: [
@@ -311,28 +401,85 @@ export default {
       return window.location.origin
     }
   },
-  watch: {
-    valid(val) {
-      if (val) {
-        this.tabList.push({ name: 'ticket', 'label': 'Ticket设置' })
-      } else {
-        this.tabList.splice(1, 1)
-        this.activeName = 'link'
-      }
-    }
-  },
+
   created() {
     this.form = this.defaultForm
     this.currentGenerate()
   },
   methods: {
+    openTicket() {
+      this.showIndex = 1
+    },
+    closeTicket() {
+      this.showIndex = 0
+    },
+    setExpRef(index) {
+      return `expRef-${index}`
+    },
+    setArgRef(index) {
+      return `argRef-${index}`
+    },
+    validateExp(val, index) {
+      const refName = this.setExpRef(index)
+      const e = this.$refs[refName].$refs.input
+      if (val === null || val === '' || typeof val === 'undefined') {
+        this.tableData[index]['exp'] = 0
+        return true
+      }
+      if (val > 1440 || val < 0) {
+        e.style.color = 'red'
+        e.style.borderColor = 'red'
+        return false
+      } else {
+        e.style.color = null
+        e.style.borderColor = null
+        return true
+      }
+    },
+    validateArgs(val, index) {
+      const refName = this.setArgRef(index)
+      const e = this.$refs[refName].$refs.input
+      if (val === null || val === '' || typeof val === 'undefined') {
+        return true
+      }
+      try {
+        JSON.parse(val)
+        e.style.color = null
+        e.style.borderColor = null
+        const child = this.$refs[refName].$el.querySelector('.error-msg')
+        if (child) {
+          this.$refs[refName].$el.removeChild(child)
+        }
+        return true
+      } catch (error) {
+        e.style.color = 'red'
+        e.style.borderColor = 'red'
+        const child = this.$refs[refName].$el.querySelector('.error-msg')
+        if (!child) {
+          const errorDom = document.createElement('div')
+          errorDom.className = 'error-msg'
+          errorDom.innerText = '格式错误'
+          this.$refs[refName].$el.appendChild(errorDom)
+        }
+        return false
+      }
+    },
+    requireTicketChange(val) {
+      const param = {
+        resourceId: this.resourceId,
+        require: val
+      }
+      switchEnableTicket(param)
+    },
     refreshTicket(row) {
       const param = JSON.parse(JSON.stringify(row))
       param['generateNew'] = true
       saveTicketApi(param).then(res => {
         row.ticket = res.data
       })
-      console.log(row.ticket)
+    },
+    copyTicket(row) {
+      console.log(row)
     },
     deleteTicket(row, index) {
       const param = { ticket: row.ticket }
@@ -343,8 +490,8 @@ export default {
     editRow(row) {
       row.isEdit = true
     },
-    saveRow(row) {
-      saveTicketApi(row).then(res => {
+    saveRow(row, index) {
+      this.validateExp(row.exp, index) && this.validateArgs(row.args, index) && saveTicketApi(row).then(() => {
         row.isEdit = false
       })
     },
@@ -368,11 +515,13 @@ export default {
           enablePwd,
           pwd,
           uri,
-          overTime
+          overTime,
+          requireTicket
         } = res.data
         this.valid = valid
         this.form.enablePwd = enablePwd
         this.form.uri = uri ? (this.origin + uri) : uri
+        this.requireTicket = requireTicket
         // 返回的密码是共钥加密后的 所以展示需要私钥解密一波
         pwd && (this.form.pwd = pwd)
 
@@ -535,29 +684,24 @@ export default {
     .ticket {
       padding: 0 20px !important;
       .ticket-model {
-        padding: 8px 10px;
-        label {
-          margin-right: 8px;
-        }
-      }
-      .ticket-table {
-        padding: 10px 0 10px 8px;
-        height: 260px;
-        overflow-y: overlay;
-        position: relative;
-        .add-ticket {
-          position: absolute;
-          width: 20px;
-          height: 20px;
-          top: 18px;
-          right: 5px;
-          z-index: 9;
-          span {
-            width: 20px;
-            height: 20px;
-            line-height: 20px;
-            font-size: 16px;
-            padding: 2px;
+        display: flex;
+        justify-content: space-between;
+        padding: 0 10px;
+        .ticket-model-start {
+          display: flex;
+          color: #1F2329;
+          font-family: PingFang SC;
+          font-weight: 500;
+          font-size: 14px;
+          .ticket-title {
+            font-size: 14px;
+          }
+          .back-tips {
+            width: 22px;
+            margin-right: 4px;
+            display: flex;
+            align-items: center;
+            justify-content: center;
             &:hover {
               background-color: rgba(51, 112, 255, .1);
               color: var(--primary);
@@ -565,6 +709,32 @@ export default {
             }
           }
         }
+
+        label {
+          margin-right: 8px;
+        }
+
+      }
+      .ticket-table {
+        padding: 10px 0 10px 8px;
+        height: 260px;
+        overflow-y: overlay;
+        position: relative;
+        ::v-deep .error-msg {
+          color: red;
+          position: fixed;
+          z-index: 9;
+          font-size: 10px;
+          height: 10px;
+        }
+        ::v-deep .check-tips {
+          margin-left: 4px;
+        }
+        .text-add-ticket {
+          width: 48px;
+          height: 22px;
+          gap: 4px;
+        }
       }
 
     }
@@ -590,9 +760,9 @@ export default {
       height: 16px;
       line-height: 16px;
       padding: 2px;
+      color: var(--primary);
       &:hover {
         background-color: rgba(51, 112, 255, .1);
-        color: var(--primary);
         cursor: pointer;
       }
     }
@@ -601,15 +771,14 @@ export default {
     display: flex;
     justify-content: space-between;
     align-items: center;
-    .refresh-i {
-      margin-left: 5px;
-      height: 16px;
+    .refresh-i,.copy-i {
+      height: 18px;
       width: 16px;
-      line-height: 16px;
+      line-height: 13px;
       padding: 2px;
+      color: var(--primary);
       &:hover {
         background-color: rgba(51, 112, 255, .1);
-        color: var(--primary);
         cursor: pointer;
       }
     }
diff --git a/core/frontend/src/views/link/index.vue b/core/frontend/src/views/link/index.vue
index 88b55dff3d..7ca4f5c6d4 100644
--- a/core/frontend/src/views/link/index.vue
+++ b/core/frontend/src/views/link/index.vue
@@ -14,12 +14,17 @@
       v-if="showIndex===2"
       :resource-id="resourceId"
       :user="userId"
+      :ticket-args="ticketArgs"
     />
     <link-expire
       v-if="showIndex===3"
       :resource-id="resourceId"
       :user="userId"
     />
+    <ticket-error
+      v-if="showIndex === 4 || showIndex === 5"
+      :show-index="showIndex"
+    />
   </div>
 </template>
 <script>
@@ -29,9 +34,10 @@ import LinkView from './view'
 import LinkError from './error'
 import LinkPwd from './pwd'
 import LinkExpire from './overtime'
+import TicketError from './ticket'
 export default {
   components: {
-    LinkError, LinkPwd, LinkView, LinkExpire
+    LinkError, LinkPwd, LinkView, LinkExpire, TicketError
   },
 
   data() {
@@ -41,7 +47,9 @@ export default {
       PARAMKEY: 'link',
       link: null,
       user: null,
-      showIndex: -1
+      showIndex: -1,
+      ticket: null,
+      ticketArgs: null
     }
   },
   created() {
@@ -53,6 +61,7 @@ export default {
       this.$store.commit('setPublicLinkStatus', true)
       this.link = this.$route.query.link
       this.user = this.$route.query.user
+      this.ticket = this.$route.query.ticket
       if (!this.link) {
         this.link = getQueryVariable(this.PARAMKEY)
       }
@@ -64,10 +73,16 @@ export default {
         return
       }
       const params = this.user ? { link: encodeURIComponent(this.link), user: encodeURIComponent(this.user) } : { link: encodeURIComponent(this.link) }
+      if (this.ticket) {
+        params['ticket'] = this.ticket
+      }
+      this.ticketArgs = null
       validate(params).then(res => {
         const { resourceId, valid, enablePwd, passPwd, expire, userId } = res.data
+        const ticketDto = res.data.ticket
         this.resourceId = resourceId
         this.userId = userId
+        this.ticketArgs = ticketDto?.args
         // 如果链接无效 直接显示无效页面
         if (!valid || !resourceId) {
           this.showError()
@@ -84,6 +99,15 @@ export default {
           return
         }
 
+        if (!ticketDto?.ticketValid) {
+          this.showTicketError()
+          return
+        }
+        if (ticketDto?.ticketExp) {
+          this.showTicketExpire()
+          return
+        }
+
         this.showView()
       }).catch(() => {
         this.showError()
@@ -107,6 +131,12 @@ export default {
     },
     showExpire() {
       this.showIndex = 3
+    },
+    showTicketError() {
+      this.showIndex = 4
+    },
+    showTicketExpire() {
+      this.showIndex = 5
     }
   }
 }
diff --git a/core/frontend/src/views/link/ticket/index.vue b/core/frontend/src/views/link/ticket/index.vue
new file mode 100644
index 0000000000..c51b85ec9f
--- /dev/null
+++ b/core/frontend/src/views/link/ticket/index.vue
@@ -0,0 +1,21 @@
+<template>
+  <el-empty :description="showIndex === 4 ? errorTips : expTips" />
+</template>
+
+<script>
+export default {
+  name: 'TicketError',
+  props: {
+    showIndex: {
+      type: Number,
+      default: 4
+    }
+  },
+  data() {
+    return {
+      errorTips: 'ticket参数错误',
+      expTips: 'ticket已过期'
+    }
+  }
+}
+</script>
diff --git a/core/frontend/src/views/link/view/index.vue b/core/frontend/src/views/link/view/index.vue
index b4d954235f..b615e765e1 100644
--- a/core/frontend/src/views/link/view/index.vue
+++ b/core/frontend/src/views/link/view/index.vue
@@ -39,6 +39,10 @@ export default {
     user: {
       type: String,
       default: null
+    },
+    ticketArgs: {
+      type: String,
+      default: null
     }
   },
   data() {
@@ -121,21 +125,36 @@ export default {
         const tempParam = localStorage.getItem('jumpInfoParam')
         // 添加外部参数
         const attachParamsEncode = this.$route.query.attachParams
-
+        let argsObject = null
+        try {
+          argsObject = JSON.parse(this.ticketArgs)
+        } catch (error) {
+          console.error(error)
+        }
+        const hasArgs = argsObject && Object.keys(argsObject)
         tempParam && loadingCount++
-        attachParamsEncode && loadingCount++
+        (attachParamsEncode || hasArgs) && loadingCount++
 
-        if (attachParamsEncode) {
+        if (attachParamsEncode || hasArgs) {
           try {
-            const Base64 = require('js-base64').Base64
-            const attachParam = JSON.parse(decodeURIComponent(Base64.decode(attachParamsEncode)))
-            getOuterParamsInfo(this.resourceId).then(rsp => {
-              if (--loadingCount === 0) {
-                this.show = true
-              }
-              this.$store.commit('setNowPanelOuterParamsInfo', rsp.data)
-              this.$store.commit('addOuterParamsFilter', attachParam)
-            })
+            let attachParam = null
+            if (attachParamsEncode) {
+              const Base64 = require('js-base64').Base64
+              attachParam = JSON.parse(decodeURIComponent(Base64.decode(attachParamsEncode)))
+            }
+            if (hasArgs) {
+              attachParam = Object.assign({}, attachParam, argsObject)
+            }
+            const hasAttachParam = attachParam && Object.keys(attachParam)
+            if (hasAttachParam) {
+              getOuterParamsInfo(this.resourceId).then(rsp => {
+                if (--loadingCount === 0) {
+                  this.show = true
+                }
+                this.$store.commit('setNowPanelOuterParamsInfo', rsp.data)
+                this.$store.commit('addOuterParamsFilter', attachParam)
+              })
+            }
           } catch (e) {
             if (--loadingCount === 0) {
               this.show = true
diff --git a/core/frontend/src/views/panel/filter/filterMain/FilterControl.vue b/core/frontend/src/views/panel/filter/filterMain/FilterControl.vue
index 6bfd5c3f46..e776099dc7 100644
--- a/core/frontend/src/views/panel/filter/filterMain/FilterControl.vue
+++ b/core/frontend/src/views/panel/filter/filterMain/FilterControl.vue
@@ -116,7 +116,7 @@
           style="padding-left: 10px;"
         >
         <el-popover popper-class="popover-more-parent" :visible-arrow="false" placement="bottom-start" :width="182" trigger="click">
-            <template #reference>
+            <template v-if="showMore" #reference>
               <div class="more-select-btn icon iconfont icon-icon-more">
                 {{ $t('panel.more') }}
               </div>
@@ -344,6 +344,9 @@ export default {
 
       const views = this.childViews.viewInfos.filter(view => tableIdList.includes(view.tableId))
       return views
+    },
+    showMore() {
+      return (this.widget.name && ['textSelectWidget', 'textSelectGridWidget', 'timeDateRangeWidget'].includes(this.widget.name)) || (this.widget.isTimeWidget && this.widget.isTimeWidget()) || this.showParams
     }
   },
   watch: {
diff --git a/extensions/dataease-extensions-datasource/dm/dm-backend/src/main/java/io/dataease/plugins/datasource/dm/provider/DmDsProvider.java b/extensions/dataease-extensions-datasource/dm/dm-backend/src/main/java/io/dataease/plugins/datasource/dm/provider/DmDsProvider.java
index c5075788cd..c8b68495ed 100644
--- a/extensions/dataease-extensions-datasource/dm/dm-backend/src/main/java/io/dataease/plugins/datasource/dm/provider/DmDsProvider.java
+++ b/extensions/dataease-extensions-datasource/dm/dm-backend/src/main/java/io/dataease/plugins/datasource/dm/provider/DmDsProvider.java
@@ -191,6 +191,7 @@ public class DmDsProvider extends DefaultJdbcProvider {
         }
         tableField.setRemarks(remarks);
         String dbType = resultSet.getString("TYPE_NAME").toUpperCase();
+        tableField.setType(resultSet.getInt("DATA_TYPE"));
         tableField.setFieldType(dbType);
         if (dbType.equalsIgnoreCase("LONG")) {
             tableField.setFieldSize(65533);
diff --git a/extensions/dataease-extensions-datasource/dm/dm-backend/src/main/java/io/dataease/plugins/datasource/dm/query/DmQueryProvider.java b/extensions/dataease-extensions-datasource/dm/dm-backend/src/main/java/io/dataease/plugins/datasource/dm/query/DmQueryProvider.java
index 6da0bb4e58..fbb27a8493 100644
--- a/extensions/dataease-extensions-datasource/dm/dm-backend/src/main/java/io/dataease/plugins/datasource/dm/query/DmQueryProvider.java
+++ b/extensions/dataease-extensions-datasource/dm/dm-backend/src/main/java/io/dataease/plugins/datasource/dm/query/DmQueryProvider.java
@@ -1570,7 +1570,7 @@ public class DmQueryProvider extends QueryProvider {
                 }
             } else if (StringUtils.containsIgnoreCase(request.getOperator(), "like")) {
                 String keyword = value.get(0).toUpperCase();
-                whereValue = "'%" + keyword + "%'";
+                whereValue = formatLikeValue(keyword);
                 whereName = "upper(" + whereName + ")";
             } else if (StringUtils.containsIgnoreCase(request.getOperator(), "between")) {
                 if (request.getDatasetTableField().getDeType() == 1) {
diff --git a/extensions/dataease-extensions-datasource/kingbase/kingbase-backend/src/main/java/io/dataease/plugins/datasource/kingbase/provider/KingbaseDsProvider.java b/extensions/dataease-extensions-datasource/kingbase/kingbase-backend/src/main/java/io/dataease/plugins/datasource/kingbase/provider/KingbaseDsProvider.java
index 49d560063b..db5ddf1dd6 100644
--- a/extensions/dataease-extensions-datasource/kingbase/kingbase-backend/src/main/java/io/dataease/plugins/datasource/kingbase/provider/KingbaseDsProvider.java
+++ b/extensions/dataease-extensions-datasource/kingbase/kingbase-backend/src/main/java/io/dataease/plugins/datasource/kingbase/provider/KingbaseDsProvider.java
@@ -185,6 +185,7 @@ public class KingbaseDsProvider extends DefaultJdbcProvider {
         }
         tableField.setRemarks(remarks);
         String dbType = resultSet.getString("TYPE_NAME").toUpperCase();
+        tableField.setType(resultSet.getInt("DATA_TYPE"));
         tableField.setFieldType(dbType);
         if (dbType.equalsIgnoreCase("LONG")) {
             tableField.setFieldSize(65533);
diff --git a/extensions/dataease-extensions-datasource/kingbase/kingbase-backend/src/main/java/io/dataease/plugins/datasource/kingbase/query/KingbaseQueryProvider.java b/extensions/dataease-extensions-datasource/kingbase/kingbase-backend/src/main/java/io/dataease/plugins/datasource/kingbase/query/KingbaseQueryProvider.java
index c438ae2d54..9cf4b8d68a 100644
--- a/extensions/dataease-extensions-datasource/kingbase/kingbase-backend/src/main/java/io/dataease/plugins/datasource/kingbase/query/KingbaseQueryProvider.java
+++ b/extensions/dataease-extensions-datasource/kingbase/kingbase-backend/src/main/java/io/dataease/plugins/datasource/kingbase/query/KingbaseQueryProvider.java
@@ -1608,7 +1608,7 @@ public class KingbaseQueryProvider extends QueryProvider {
                 }
             } else if (StringUtils.containsIgnoreCase(request.getOperator(), "like")) {
                 String keyword = value.get(0).toUpperCase();
-                whereValue = "'%" + keyword + "%'";
+                whereValue = formatLikeValue(keyword);
                 whereName = "upper(" + whereName + ")";
             } else if (StringUtils.containsIgnoreCase(request.getOperator(), "between")) {
                 if (request.getDatasetTableField().getDeType() == 1) {
diff --git a/extensions/dataease-extensions-datasource/kylin/kylin-backend/src/main/java/io/dataease/plugins/datasource/kylin/provider/KylinDsProvider.java b/extensions/dataease-extensions-datasource/kylin/kylin-backend/src/main/java/io/dataease/plugins/datasource/kylin/provider/KylinDsProvider.java
index a65b4be9ac..37da460c2d 100644
--- a/extensions/dataease-extensions-datasource/kylin/kylin-backend/src/main/java/io/dataease/plugins/datasource/kylin/provider/KylinDsProvider.java
+++ b/extensions/dataease-extensions-datasource/kylin/kylin-backend/src/main/java/io/dataease/plugins/datasource/kylin/provider/KylinDsProvider.java
@@ -160,6 +160,7 @@ public class KylinDsProvider extends DefaultJdbcProvider {
         }
         tableField.setRemarks(remarks);
         String dbType = resultSet.getString("TYPE_NAME").toUpperCase();
+        tableField.setType(resultSet.getInt("DATA_TYPE"));
         tableField.setFieldType(dbType);
         if (dbType.equalsIgnoreCase("LONG")) {
             tableField.setFieldSize(65533);
diff --git a/extensions/dataease-extensions-datasource/kylin/kylin-backend/src/main/java/io/dataease/plugins/datasource/kylin/query/KylinQueryProvider.java b/extensions/dataease-extensions-datasource/kylin/kylin-backend/src/main/java/io/dataease/plugins/datasource/kylin/query/KylinQueryProvider.java
index 3aa5f18d71..5f83666c2f 100644
--- a/extensions/dataease-extensions-datasource/kylin/kylin-backend/src/main/java/io/dataease/plugins/datasource/kylin/query/KylinQueryProvider.java
+++ b/extensions/dataease-extensions-datasource/kylin/kylin-backend/src/main/java/io/dataease/plugins/datasource/kylin/query/KylinQueryProvider.java
@@ -1329,7 +1329,7 @@ public class KylinQueryProvider extends QueryProvider {
                 }
             } else if (StringUtils.containsIgnoreCase(request.getOperator(), "like")) {
                 String keyword = value.get(0).toUpperCase();
-                whereValue = "'%" + keyword + "%'";
+                whereValue = formatLikeValue(keyword);
                 whereName = "upper(" + whereName + ")";
             } else if (StringUtils.containsIgnoreCase(request.getOperator(), "between")) {
                 if (request.getDatasetTableField().getDeType() == 1) {
diff --git a/extensions/dataease-extensions-datasource/maxcompute/maxcompute-backend/src/main/java/io/dataease/plugins/datasource/dm/query/MaxcomputeQueryProvider.java b/extensions/dataease-extensions-datasource/maxcompute/maxcompute-backend/src/main/java/io/dataease/plugins/datasource/dm/query/MaxcomputeQueryProvider.java
index 382bf73eb5..4f4a44d23a 100644
--- a/extensions/dataease-extensions-datasource/maxcompute/maxcompute-backend/src/main/java/io/dataease/plugins/datasource/dm/query/MaxcomputeQueryProvider.java
+++ b/extensions/dataease-extensions-datasource/maxcompute/maxcompute-backend/src/main/java/io/dataease/plugins/datasource/dm/query/MaxcomputeQueryProvider.java
@@ -1349,7 +1349,7 @@ public class MaxcomputeQueryProvider extends QueryProvider {
                 }
             } else if (StringUtils.containsIgnoreCase(request.getOperator(), "like")) {
                 String keyword = value.get(0).toUpperCase();
-                whereValue = "'%" + keyword + "%'";
+                whereValue = formatLikeValue(keyword);
                 whereName = "upper(" + whereName + ")";
             } else if (StringUtils.containsIgnoreCase(request.getOperator(), "between")) {
                 if (request.getDatasetTableField().getDeType() == 1) {
diff --git a/extensions/dataease-extensions-datasource/mongo/mongo-backend/src/main/java/io/dataease/plugins/datasource/mongo/query/MongobiQueryProvider.java b/extensions/dataease-extensions-datasource/mongo/mongo-backend/src/main/java/io/dataease/plugins/datasource/mongo/query/MongobiQueryProvider.java
index 5e4660cdbf..3cb8df0f6f 100644
--- a/extensions/dataease-extensions-datasource/mongo/mongo-backend/src/main/java/io/dataease/plugins/datasource/mongo/query/MongobiQueryProvider.java
+++ b/extensions/dataease-extensions-datasource/mongo/mongo-backend/src/main/java/io/dataease/plugins/datasource/mongo/query/MongobiQueryProvider.java
@@ -1341,7 +1341,7 @@ public class MongobiQueryProvider extends QueryProvider {
                 }
             } else if (StringUtils.containsIgnoreCase(request.getOperator(), "like")) {
                 String keyword = value.get(0).toUpperCase();
-                whereValue = "'%" + keyword + "%'";
+                whereValue = formatLikeValue(keyword);
                 whereName = "upper(" + whereName + ")";
             } else if (StringUtils.containsIgnoreCase(request.getOperator(), "between")) {
                 if (request.getDatasetTableField().getDeType() == 1) {
diff --git a/extensions/dataease-extensions-datasource/presto/presto-backend/src/main/java/io/dataease/plugins/datasource/dm/query/PrestoQueryProvider.java b/extensions/dataease-extensions-datasource/presto/presto-backend/src/main/java/io/dataease/plugins/datasource/dm/query/PrestoQueryProvider.java
index 33900638b3..18ac229c19 100644
--- a/extensions/dataease-extensions-datasource/presto/presto-backend/src/main/java/io/dataease/plugins/datasource/dm/query/PrestoQueryProvider.java
+++ b/extensions/dataease-extensions-datasource/presto/presto-backend/src/main/java/io/dataease/plugins/datasource/dm/query/PrestoQueryProvider.java
@@ -1345,7 +1345,7 @@ public class PrestoQueryProvider extends QueryProvider {
                 }
             } else if (StringUtils.containsIgnoreCase(request.getOperator(), "like")) {
                 String keyword = value.get(0).toUpperCase();
-                whereValue = "'%" + keyword + "%'";
+                whereValue = formatLikeValue(keyword);
                 whereName = "upper(" + whereName + ")";
             } else if (StringUtils.containsIgnoreCase(request.getOperator(), "between")) {
                 if (request.getDatasetTableField().getDeType() == 1) {
diff --git a/sdk/dataease-plugin-common/src/main/java/io/dataease/plugins/common/base/domain/DataFillCommitLog.java b/sdk/dataease-plugin-common/src/main/java/io/dataease/plugins/common/base/domain/DataFillCommitLog.java
new file mode 100644
index 0000000000..9340a426bf
--- /dev/null
+++ b/sdk/dataease-plugin-common/src/main/java/io/dataease/plugins/common/base/domain/DataFillCommitLog.java
@@ -0,0 +1,22 @@
+package io.dataease.plugins.common.base.domain;
+
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Data;
+
+@Data
+public class DataFillCommitLog implements Serializable {
+    private String id;
+
+    private String formId;
+
+    private String dataId;
+
+    private String operate;
+
+    private String commitBy;
+
+    private Date commitTime;
+
+    private static final long serialVersionUID = 1L;
+}
\ No newline at end of file
diff --git a/sdk/dataease-plugin-common/src/main/java/io/dataease/plugins/common/base/domain/DataFillCommitLogExample.java b/sdk/dataease-plugin-common/src/main/java/io/dataease/plugins/common/base/domain/DataFillCommitLogExample.java
new file mode 100644
index 0000000000..85b0dd2f29
--- /dev/null
+++ b/sdk/dataease-plugin-common/src/main/java/io/dataease/plugins/common/base/domain/DataFillCommitLogExample.java
@@ -0,0 +1,611 @@
+package io.dataease.plugins.common.base.domain;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+public class DataFillCommitLogExample {
+    protected String orderByClause;
+
+    protected boolean distinct;
+
+    protected List<Criteria> oredCriteria;
+
+    public DataFillCommitLogExample() {
+        oredCriteria = new ArrayList<Criteria>();
+    }
+
+    public void setOrderByClause(String orderByClause) {
+        this.orderByClause = orderByClause;
+    }
+
+    public String getOrderByClause() {
+        return orderByClause;
+    }
+
+    public void setDistinct(boolean distinct) {
+        this.distinct = distinct;
+    }
+
+    public boolean isDistinct() {
+        return distinct;
+    }
+
+    public List<Criteria> getOredCriteria() {
+        return oredCriteria;
+    }
+
+    public void or(Criteria criteria) {
+        oredCriteria.add(criteria);
+    }
+
+    public Criteria or() {
+        Criteria criteria = createCriteriaInternal();
+        oredCriteria.add(criteria);
+        return criteria;
+    }
+
+    public Criteria createCriteria() {
+        Criteria criteria = createCriteriaInternal();
+        if (oredCriteria.size() == 0) {
+            oredCriteria.add(criteria);
+        }
+        return criteria;
+    }
+
+    protected Criteria createCriteriaInternal() {
+        Criteria criteria = new Criteria();
+        return criteria;
+    }
+
+    public void clear() {
+        oredCriteria.clear();
+        orderByClause = null;
+        distinct = false;
+    }
+
+    protected abstract static class GeneratedCriteria {
+        protected List<Criterion> criteria;
+
+        protected GeneratedCriteria() {
+            super();
+            criteria = new ArrayList<Criterion>();
+        }
+
+        public boolean isValid() {
+            return criteria.size() > 0;
+        }
+
+        public List<Criterion> getAllCriteria() {
+            return criteria;
+        }
+
+        public List<Criterion> getCriteria() {
+            return criteria;
+        }
+
+        protected void addCriterion(String condition) {
+            if (condition == null) {
+                throw new RuntimeException("Value for condition cannot be null");
+            }
+            criteria.add(new Criterion(condition));
+        }
+
+        protected void addCriterion(String condition, Object value, String property) {
+            if (value == null) {
+                throw new RuntimeException("Value for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value));
+        }
+
+        protected void addCriterion(String condition, Object value1, Object value2, String property) {
+            if (value1 == null || value2 == null) {
+                throw new RuntimeException("Between values for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value1, value2));
+        }
+
+        public Criteria andIdIsNull() {
+            addCriterion("id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIsNotNull() {
+            addCriterion("id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdEqualTo(String value) {
+            addCriterion("id =", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotEqualTo(String value) {
+            addCriterion("id <>", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThan(String value) {
+            addCriterion("id >", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThanOrEqualTo(String value) {
+            addCriterion("id >=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThan(String value) {
+            addCriterion("id <", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThanOrEqualTo(String value) {
+            addCriterion("id <=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLike(String value) {
+            addCriterion("id like", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotLike(String value) {
+            addCriterion("id not like", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIn(List<String> values) {
+            addCriterion("id in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotIn(List<String> values) {
+            addCriterion("id not in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdBetween(String value1, String value2) {
+            addCriterion("id between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotBetween(String value1, String value2) {
+            addCriterion("id not between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andFormIdIsNull() {
+            addCriterion("form_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andFormIdIsNotNull() {
+            addCriterion("form_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andFormIdEqualTo(String value) {
+            addCriterion("form_id =", value, "formId");
+            return (Criteria) this;
+        }
+
+        public Criteria andFormIdNotEqualTo(String value) {
+            addCriterion("form_id <>", value, "formId");
+            return (Criteria) this;
+        }
+
+        public Criteria andFormIdGreaterThan(String value) {
+            addCriterion("form_id >", value, "formId");
+            return (Criteria) this;
+        }
+
+        public Criteria andFormIdGreaterThanOrEqualTo(String value) {
+            addCriterion("form_id >=", value, "formId");
+            return (Criteria) this;
+        }
+
+        public Criteria andFormIdLessThan(String value) {
+            addCriterion("form_id <", value, "formId");
+            return (Criteria) this;
+        }
+
+        public Criteria andFormIdLessThanOrEqualTo(String value) {
+            addCriterion("form_id <=", value, "formId");
+            return (Criteria) this;
+        }
+
+        public Criteria andFormIdLike(String value) {
+            addCriterion("form_id like", value, "formId");
+            return (Criteria) this;
+        }
+
+        public Criteria andFormIdNotLike(String value) {
+            addCriterion("form_id not like", value, "formId");
+            return (Criteria) this;
+        }
+
+        public Criteria andFormIdIn(List<String> values) {
+            addCriterion("form_id in", values, "formId");
+            return (Criteria) this;
+        }
+
+        public Criteria andFormIdNotIn(List<String> values) {
+            addCriterion("form_id not in", values, "formId");
+            return (Criteria) this;
+        }
+
+        public Criteria andFormIdBetween(String value1, String value2) {
+            addCriterion("form_id between", value1, value2, "formId");
+            return (Criteria) this;
+        }
+
+        public Criteria andFormIdNotBetween(String value1, String value2) {
+            addCriterion("form_id not between", value1, value2, "formId");
+            return (Criteria) this;
+        }
+
+        public Criteria andDataIdIsNull() {
+            addCriterion("data_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andDataIdIsNotNull() {
+            addCriterion("data_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andDataIdEqualTo(String value) {
+            addCriterion("data_id =", value, "dataId");
+            return (Criteria) this;
+        }
+
+        public Criteria andDataIdNotEqualTo(String value) {
+            addCriterion("data_id <>", value, "dataId");
+            return (Criteria) this;
+        }
+
+        public Criteria andDataIdGreaterThan(String value) {
+            addCriterion("data_id >", value, "dataId");
+            return (Criteria) this;
+        }
+
+        public Criteria andDataIdGreaterThanOrEqualTo(String value) {
+            addCriterion("data_id >=", value, "dataId");
+            return (Criteria) this;
+        }
+
+        public Criteria andDataIdLessThan(String value) {
+            addCriterion("data_id <", value, "dataId");
+            return (Criteria) this;
+        }
+
+        public Criteria andDataIdLessThanOrEqualTo(String value) {
+            addCriterion("data_id <=", value, "dataId");
+            return (Criteria) this;
+        }
+
+        public Criteria andDataIdLike(String value) {
+            addCriterion("data_id like", value, "dataId");
+            return (Criteria) this;
+        }
+
+        public Criteria andDataIdNotLike(String value) {
+            addCriterion("data_id not like", value, "dataId");
+            return (Criteria) this;
+        }
+
+        public Criteria andDataIdIn(List<String> values) {
+            addCriterion("data_id in", values, "dataId");
+            return (Criteria) this;
+        }
+
+        public Criteria andDataIdNotIn(List<String> values) {
+            addCriterion("data_id not in", values, "dataId");
+            return (Criteria) this;
+        }
+
+        public Criteria andDataIdBetween(String value1, String value2) {
+            addCriterion("data_id between", value1, value2, "dataId");
+            return (Criteria) this;
+        }
+
+        public Criteria andDataIdNotBetween(String value1, String value2) {
+            addCriterion("data_id not between", value1, value2, "dataId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOperateIsNull() {
+            addCriterion("operate is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andOperateIsNotNull() {
+            addCriterion("operate is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andOperateEqualTo(String value) {
+            addCriterion("operate =", value, "operate");
+            return (Criteria) this;
+        }
+
+        public Criteria andOperateNotEqualTo(String value) {
+            addCriterion("operate <>", value, "operate");
+            return (Criteria) this;
+        }
+
+        public Criteria andOperateGreaterThan(String value) {
+            addCriterion("operate >", value, "operate");
+            return (Criteria) this;
+        }
+
+        public Criteria andOperateGreaterThanOrEqualTo(String value) {
+            addCriterion("operate >=", value, "operate");
+            return (Criteria) this;
+        }
+
+        public Criteria andOperateLessThan(String value) {
+            addCriterion("operate <", value, "operate");
+            return (Criteria) this;
+        }
+
+        public Criteria andOperateLessThanOrEqualTo(String value) {
+            addCriterion("operate <=", value, "operate");
+            return (Criteria) this;
+        }
+
+        public Criteria andOperateLike(String value) {
+            addCriterion("operate like", value, "operate");
+            return (Criteria) this;
+        }
+
+        public Criteria andOperateNotLike(String value) {
+            addCriterion("operate not like", value, "operate");
+            return (Criteria) this;
+        }
+
+        public Criteria andOperateIn(List<String> values) {
+            addCriterion("operate in", values, "operate");
+            return (Criteria) this;
+        }
+
+        public Criteria andOperateNotIn(List<String> values) {
+            addCriterion("operate not in", values, "operate");
+            return (Criteria) this;
+        }
+
+        public Criteria andOperateBetween(String value1, String value2) {
+            addCriterion("operate between", value1, value2, "operate");
+            return (Criteria) this;
+        }
+
+        public Criteria andOperateNotBetween(String value1, String value2) {
+            addCriterion("operate not between", value1, value2, "operate");
+            return (Criteria) this;
+        }
+
+        public Criteria andCommitByIsNull() {
+            addCriterion("commit_by is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCommitByIsNotNull() {
+            addCriterion("commit_by is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCommitByEqualTo(String value) {
+            addCriterion("commit_by =", value, "commitBy");
+            return (Criteria) this;
+        }
+
+        public Criteria andCommitByNotEqualTo(String value) {
+            addCriterion("commit_by <>", value, "commitBy");
+            return (Criteria) this;
+        }
+
+        public Criteria andCommitByGreaterThan(String value) {
+            addCriterion("commit_by >", value, "commitBy");
+            return (Criteria) this;
+        }
+
+        public Criteria andCommitByGreaterThanOrEqualTo(String value) {
+            addCriterion("commit_by >=", value, "commitBy");
+            return (Criteria) this;
+        }
+
+        public Criteria andCommitByLessThan(String value) {
+            addCriterion("commit_by <", value, "commitBy");
+            return (Criteria) this;
+        }
+
+        public Criteria andCommitByLessThanOrEqualTo(String value) {
+            addCriterion("commit_by <=", value, "commitBy");
+            return (Criteria) this;
+        }
+
+        public Criteria andCommitByLike(String value) {
+            addCriterion("commit_by like", value, "commitBy");
+            return (Criteria) this;
+        }
+
+        public Criteria andCommitByNotLike(String value) {
+            addCriterion("commit_by not like", value, "commitBy");
+            return (Criteria) this;
+        }
+
+        public Criteria andCommitByIn(List<String> values) {
+            addCriterion("commit_by in", values, "commitBy");
+            return (Criteria) this;
+        }
+
+        public Criteria andCommitByNotIn(List<String> values) {
+            addCriterion("commit_by not in", values, "commitBy");
+            return (Criteria) this;
+        }
+
+        public Criteria andCommitByBetween(String value1, String value2) {
+            addCriterion("commit_by between", value1, value2, "commitBy");
+            return (Criteria) this;
+        }
+
+        public Criteria andCommitByNotBetween(String value1, String value2) {
+            addCriterion("commit_by not between", value1, value2, "commitBy");
+            return (Criteria) this;
+        }
+
+        public Criteria andCommitTimeIsNull() {
+            addCriterion("commit_time is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCommitTimeIsNotNull() {
+            addCriterion("commit_time is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCommitTimeEqualTo(Date value) {
+            addCriterion("commit_time =", value, "commitTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCommitTimeNotEqualTo(Date value) {
+            addCriterion("commit_time <>", value, "commitTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCommitTimeGreaterThan(Date value) {
+            addCriterion("commit_time >", value, "commitTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCommitTimeGreaterThanOrEqualTo(Date value) {
+            addCriterion("commit_time >=", value, "commitTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCommitTimeLessThan(Date value) {
+            addCriterion("commit_time <", value, "commitTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCommitTimeLessThanOrEqualTo(Date value) {
+            addCriterion("commit_time <=", value, "commitTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCommitTimeIn(List<Date> values) {
+            addCriterion("commit_time in", values, "commitTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCommitTimeNotIn(List<Date> values) {
+            addCriterion("commit_time not in", values, "commitTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCommitTimeBetween(Date value1, Date value2) {
+            addCriterion("commit_time between", value1, value2, "commitTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCommitTimeNotBetween(Date value1, Date value2) {
+            addCriterion("commit_time not between", value1, value2, "commitTime");
+            return (Criteria) this;
+        }
+    }
+
+    public static class Criteria extends GeneratedCriteria {
+
+        protected Criteria() {
+            super();
+        }
+    }
+
+    public static class Criterion {
+        private String condition;
+
+        private Object value;
+
+        private Object secondValue;
+
+        private boolean noValue;
+
+        private boolean singleValue;
+
+        private boolean betweenValue;
+
+        private boolean listValue;
+
+        private String typeHandler;
+
+        public String getCondition() {
+            return condition;
+        }
+
+        public Object getValue() {
+            return value;
+        }
+
+        public Object getSecondValue() {
+            return secondValue;
+        }
+
+        public boolean isNoValue() {
+            return noValue;
+        }
+
+        public boolean isSingleValue() {
+            return singleValue;
+        }
+
+        public boolean isBetweenValue() {
+            return betweenValue;
+        }
+
+        public boolean isListValue() {
+            return listValue;
+        }
+
+        public String getTypeHandler() {
+            return typeHandler;
+        }
+
+        protected Criterion(String condition) {
+            super();
+            this.condition = condition;
+            this.typeHandler = null;
+            this.noValue = true;
+        }
+
+        protected Criterion(String condition, Object value, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.typeHandler = typeHandler;
+            if (value instanceof List<?>) {
+                this.listValue = true;
+            } else {
+                this.singleValue = true;
+            }
+        }
+
+        protected Criterion(String condition, Object value) {
+            this(condition, value, null);
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.secondValue = secondValue;
+            this.typeHandler = typeHandler;
+            this.betweenValue = true;
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue) {
+            this(condition, value, secondValue, null);
+        }
+    }
+}
\ No newline at end of file
diff --git a/sdk/dataease-plugin-common/src/main/java/io/dataease/plugins/common/base/domain/DataFillForm.java b/sdk/dataease-plugin-common/src/main/java/io/dataease/plugins/common/base/domain/DataFillForm.java
new file mode 100644
index 0000000000..5f8f6a7183
--- /dev/null
+++ b/sdk/dataease-plugin-common/src/main/java/io/dataease/plugins/common/base/domain/DataFillForm.java
@@ -0,0 +1,34 @@
+package io.dataease.plugins.common.base.domain;
+
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Data;
+
+@Data
+public class DataFillForm implements Serializable {
+    private String id;
+
+    private String name;
+
+    private String pid;
+
+    private Integer level;
+
+    private String nodeType;
+
+    private String tableName;
+
+    private String datasource;
+
+    private Boolean createIndex;
+
+    private String createBy;
+
+    private Date createTime;
+
+    private String updateBy;
+
+    private Date updateTime;
+
+    private static final long serialVersionUID = 1L;
+}
\ No newline at end of file
diff --git a/sdk/dataease-plugin-common/src/main/java/io/dataease/plugins/common/base/domain/DataFillFormExample.java b/sdk/dataease-plugin-common/src/main/java/io/dataease/plugins/common/base/domain/DataFillFormExample.java
new file mode 100644
index 0000000000..b1b298e7e0
--- /dev/null
+++ b/sdk/dataease-plugin-common/src/main/java/io/dataease/plugins/common/base/domain/DataFillFormExample.java
@@ -0,0 +1,1001 @@
+package io.dataease.plugins.common.base.domain;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+public class DataFillFormExample {
+    protected String orderByClause;
+
+    protected boolean distinct;
+
+    protected List<Criteria> oredCriteria;
+
+    public DataFillFormExample() {
+        oredCriteria = new ArrayList<Criteria>();
+    }
+
+    public void setOrderByClause(String orderByClause) {
+        this.orderByClause = orderByClause;
+    }
+
+    public String getOrderByClause() {
+        return orderByClause;
+    }
+
+    public void setDistinct(boolean distinct) {
+        this.distinct = distinct;
+    }
+
+    public boolean isDistinct() {
+        return distinct;
+    }
+
+    public List<Criteria> getOredCriteria() {
+        return oredCriteria;
+    }
+
+    public void or(Criteria criteria) {
+        oredCriteria.add(criteria);
+    }
+
+    public Criteria or() {
+        Criteria criteria = createCriteriaInternal();
+        oredCriteria.add(criteria);
+        return criteria;
+    }
+
+    public Criteria createCriteria() {
+        Criteria criteria = createCriteriaInternal();
+        if (oredCriteria.size() == 0) {
+            oredCriteria.add(criteria);
+        }
+        return criteria;
+    }
+
+    protected Criteria createCriteriaInternal() {
+        Criteria criteria = new Criteria();
+        return criteria;
+    }
+
+    public void clear() {
+        oredCriteria.clear();
+        orderByClause = null;
+        distinct = false;
+    }
+
+    protected abstract static class GeneratedCriteria {
+        protected List<Criterion> criteria;
+
+        protected GeneratedCriteria() {
+            super();
+            criteria = new ArrayList<Criterion>();
+        }
+
+        public boolean isValid() {
+            return criteria.size() > 0;
+        }
+
+        public List<Criterion> getAllCriteria() {
+            return criteria;
+        }
+
+        public List<Criterion> getCriteria() {
+            return criteria;
+        }
+
+        protected void addCriterion(String condition) {
+            if (condition == null) {
+                throw new RuntimeException("Value for condition cannot be null");
+            }
+            criteria.add(new Criterion(condition));
+        }
+
+        protected void addCriterion(String condition, Object value, String property) {
+            if (value == null) {
+                throw new RuntimeException("Value for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value));
+        }
+
+        protected void addCriterion(String condition, Object value1, Object value2, String property) {
+            if (value1 == null || value2 == null) {
+                throw new RuntimeException("Between values for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value1, value2));
+        }
+
+        public Criteria andIdIsNull() {
+            addCriterion("id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIsNotNull() {
+            addCriterion("id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdEqualTo(String value) {
+            addCriterion("id =", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotEqualTo(String value) {
+            addCriterion("id <>", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThan(String value) {
+            addCriterion("id >", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThanOrEqualTo(String value) {
+            addCriterion("id >=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThan(String value) {
+            addCriterion("id <", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThanOrEqualTo(String value) {
+            addCriterion("id <=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLike(String value) {
+            addCriterion("id like", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotLike(String value) {
+            addCriterion("id not like", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIn(List<String> values) {
+            addCriterion("id in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotIn(List<String> values) {
+            addCriterion("id not in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdBetween(String value1, String value2) {
+            addCriterion("id between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotBetween(String value1, String value2) {
+            addCriterion("id not between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameIsNull() {
+            addCriterion("`name` is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameIsNotNull() {
+            addCriterion("`name` is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameEqualTo(String value) {
+            addCriterion("`name` =", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameNotEqualTo(String value) {
+            addCriterion("`name` <>", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameGreaterThan(String value) {
+            addCriterion("`name` >", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameGreaterThanOrEqualTo(String value) {
+            addCriterion("`name` >=", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameLessThan(String value) {
+            addCriterion("`name` <", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameLessThanOrEqualTo(String value) {
+            addCriterion("`name` <=", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameLike(String value) {
+            addCriterion("`name` like", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameNotLike(String value) {
+            addCriterion("`name` not like", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameIn(List<String> values) {
+            addCriterion("`name` in", values, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameNotIn(List<String> values) {
+            addCriterion("`name` not in", values, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameBetween(String value1, String value2) {
+            addCriterion("`name` between", value1, value2, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameNotBetween(String value1, String value2) {
+            addCriterion("`name` not between", value1, value2, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andPidIsNull() {
+            addCriterion("pid is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPidIsNotNull() {
+            addCriterion("pid is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPidEqualTo(String value) {
+            addCriterion("pid =", value, "pid");
+            return (Criteria) this;
+        }
+
+        public Criteria andPidNotEqualTo(String value) {
+            addCriterion("pid <>", value, "pid");
+            return (Criteria) this;
+        }
+
+        public Criteria andPidGreaterThan(String value) {
+            addCriterion("pid >", value, "pid");
+            return (Criteria) this;
+        }
+
+        public Criteria andPidGreaterThanOrEqualTo(String value) {
+            addCriterion("pid >=", value, "pid");
+            return (Criteria) this;
+        }
+
+        public Criteria andPidLessThan(String value) {
+            addCriterion("pid <", value, "pid");
+            return (Criteria) this;
+        }
+
+        public Criteria andPidLessThanOrEqualTo(String value) {
+            addCriterion("pid <=", value, "pid");
+            return (Criteria) this;
+        }
+
+        public Criteria andPidLike(String value) {
+            addCriterion("pid like", value, "pid");
+            return (Criteria) this;
+        }
+
+        public Criteria andPidNotLike(String value) {
+            addCriterion("pid not like", value, "pid");
+            return (Criteria) this;
+        }
+
+        public Criteria andPidIn(List<String> values) {
+            addCriterion("pid in", values, "pid");
+            return (Criteria) this;
+        }
+
+        public Criteria andPidNotIn(List<String> values) {
+            addCriterion("pid not in", values, "pid");
+            return (Criteria) this;
+        }
+
+        public Criteria andPidBetween(String value1, String value2) {
+            addCriterion("pid between", value1, value2, "pid");
+            return (Criteria) this;
+        }
+
+        public Criteria andPidNotBetween(String value1, String value2) {
+            addCriterion("pid not between", value1, value2, "pid");
+            return (Criteria) this;
+        }
+
+        public Criteria andLevelIsNull() {
+            addCriterion("`level` is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andLevelIsNotNull() {
+            addCriterion("`level` is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andLevelEqualTo(Integer value) {
+            addCriterion("`level` =", value, "level");
+            return (Criteria) this;
+        }
+
+        public Criteria andLevelNotEqualTo(Integer value) {
+            addCriterion("`level` <>", value, "level");
+            return (Criteria) this;
+        }
+
+        public Criteria andLevelGreaterThan(Integer value) {
+            addCriterion("`level` >", value, "level");
+            return (Criteria) this;
+        }
+
+        public Criteria andLevelGreaterThanOrEqualTo(Integer value) {
+            addCriterion("`level` >=", value, "level");
+            return (Criteria) this;
+        }
+
+        public Criteria andLevelLessThan(Integer value) {
+            addCriterion("`level` <", value, "level");
+            return (Criteria) this;
+        }
+
+        public Criteria andLevelLessThanOrEqualTo(Integer value) {
+            addCriterion("`level` <=", value, "level");
+            return (Criteria) this;
+        }
+
+        public Criteria andLevelIn(List<Integer> values) {
+            addCriterion("`level` in", values, "level");
+            return (Criteria) this;
+        }
+
+        public Criteria andLevelNotIn(List<Integer> values) {
+            addCriterion("`level` not in", values, "level");
+            return (Criteria) this;
+        }
+
+        public Criteria andLevelBetween(Integer value1, Integer value2) {
+            addCriterion("`level` between", value1, value2, "level");
+            return (Criteria) this;
+        }
+
+        public Criteria andLevelNotBetween(Integer value1, Integer value2) {
+            addCriterion("`level` not between", value1, value2, "level");
+            return (Criteria) this;
+        }
+
+        public Criteria andNodeTypeIsNull() {
+            addCriterion("node_type is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andNodeTypeIsNotNull() {
+            addCriterion("node_type is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andNodeTypeEqualTo(String value) {
+            addCriterion("node_type =", value, "nodeType");
+            return (Criteria) this;
+        }
+
+        public Criteria andNodeTypeNotEqualTo(String value) {
+            addCriterion("node_type <>", value, "nodeType");
+            return (Criteria) this;
+        }
+
+        public Criteria andNodeTypeGreaterThan(String value) {
+            addCriterion("node_type >", value, "nodeType");
+            return (Criteria) this;
+        }
+
+        public Criteria andNodeTypeGreaterThanOrEqualTo(String value) {
+            addCriterion("node_type >=", value, "nodeType");
+            return (Criteria) this;
+        }
+
+        public Criteria andNodeTypeLessThan(String value) {
+            addCriterion("node_type <", value, "nodeType");
+            return (Criteria) this;
+        }
+
+        public Criteria andNodeTypeLessThanOrEqualTo(String value) {
+            addCriterion("node_type <=", value, "nodeType");
+            return (Criteria) this;
+        }
+
+        public Criteria andNodeTypeLike(String value) {
+            addCriterion("node_type like", value, "nodeType");
+            return (Criteria) this;
+        }
+
+        public Criteria andNodeTypeNotLike(String value) {
+            addCriterion("node_type not like", value, "nodeType");
+            return (Criteria) this;
+        }
+
+        public Criteria andNodeTypeIn(List<String> values) {
+            addCriterion("node_type in", values, "nodeType");
+            return (Criteria) this;
+        }
+
+        public Criteria andNodeTypeNotIn(List<String> values) {
+            addCriterion("node_type not in", values, "nodeType");
+            return (Criteria) this;
+        }
+
+        public Criteria andNodeTypeBetween(String value1, String value2) {
+            addCriterion("node_type between", value1, value2, "nodeType");
+            return (Criteria) this;
+        }
+
+        public Criteria andNodeTypeNotBetween(String value1, String value2) {
+            addCriterion("node_type not between", value1, value2, "nodeType");
+            return (Criteria) this;
+        }
+
+        public Criteria andTableNameIsNull() {
+            addCriterion("`table_name` is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andTableNameIsNotNull() {
+            addCriterion("`table_name` is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andTableNameEqualTo(String value) {
+            addCriterion("`table_name` =", value, "tableName");
+            return (Criteria) this;
+        }
+
+        public Criteria andTableNameNotEqualTo(String value) {
+            addCriterion("`table_name` <>", value, "tableName");
+            return (Criteria) this;
+        }
+
+        public Criteria andTableNameGreaterThan(String value) {
+            addCriterion("`table_name` >", value, "tableName");
+            return (Criteria) this;
+        }
+
+        public Criteria andTableNameGreaterThanOrEqualTo(String value) {
+            addCriterion("`table_name` >=", value, "tableName");
+            return (Criteria) this;
+        }
+
+        public Criteria andTableNameLessThan(String value) {
+            addCriterion("`table_name` <", value, "tableName");
+            return (Criteria) this;
+        }
+
+        public Criteria andTableNameLessThanOrEqualTo(String value) {
+            addCriterion("`table_name` <=", value, "tableName");
+            return (Criteria) this;
+        }
+
+        public Criteria andTableNameLike(String value) {
+            addCriterion("`table_name` like", value, "tableName");
+            return (Criteria) this;
+        }
+
+        public Criteria andTableNameNotLike(String value) {
+            addCriterion("`table_name` not like", value, "tableName");
+            return (Criteria) this;
+        }
+
+        public Criteria andTableNameIn(List<String> values) {
+            addCriterion("`table_name` in", values, "tableName");
+            return (Criteria) this;
+        }
+
+        public Criteria andTableNameNotIn(List<String> values) {
+            addCriterion("`table_name` not in", values, "tableName");
+            return (Criteria) this;
+        }
+
+        public Criteria andTableNameBetween(String value1, String value2) {
+            addCriterion("`table_name` between", value1, value2, "tableName");
+            return (Criteria) this;
+        }
+
+        public Criteria andTableNameNotBetween(String value1, String value2) {
+            addCriterion("`table_name` not between", value1, value2, "tableName");
+            return (Criteria) this;
+        }
+
+        public Criteria andDatasourceIsNull() {
+            addCriterion("datasource is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andDatasourceIsNotNull() {
+            addCriterion("datasource is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andDatasourceEqualTo(String value) {
+            addCriterion("datasource =", value, "datasource");
+            return (Criteria) this;
+        }
+
+        public Criteria andDatasourceNotEqualTo(String value) {
+            addCriterion("datasource <>", value, "datasource");
+            return (Criteria) this;
+        }
+
+        public Criteria andDatasourceGreaterThan(String value) {
+            addCriterion("datasource >", value, "datasource");
+            return (Criteria) this;
+        }
+
+        public Criteria andDatasourceGreaterThanOrEqualTo(String value) {
+            addCriterion("datasource >=", value, "datasource");
+            return (Criteria) this;
+        }
+
+        public Criteria andDatasourceLessThan(String value) {
+            addCriterion("datasource <", value, "datasource");
+            return (Criteria) this;
+        }
+
+        public Criteria andDatasourceLessThanOrEqualTo(String value) {
+            addCriterion("datasource <=", value, "datasource");
+            return (Criteria) this;
+        }
+
+        public Criteria andDatasourceLike(String value) {
+            addCriterion("datasource like", value, "datasource");
+            return (Criteria) this;
+        }
+
+        public Criteria andDatasourceNotLike(String value) {
+            addCriterion("datasource not like", value, "datasource");
+            return (Criteria) this;
+        }
+
+        public Criteria andDatasourceIn(List<String> values) {
+            addCriterion("datasource in", values, "datasource");
+            return (Criteria) this;
+        }
+
+        public Criteria andDatasourceNotIn(List<String> values) {
+            addCriterion("datasource not in", values, "datasource");
+            return (Criteria) this;
+        }
+
+        public Criteria andDatasourceBetween(String value1, String value2) {
+            addCriterion("datasource between", value1, value2, "datasource");
+            return (Criteria) this;
+        }
+
+        public Criteria andDatasourceNotBetween(String value1, String value2) {
+            addCriterion("datasource not between", value1, value2, "datasource");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateIndexIsNull() {
+            addCriterion("create_index is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateIndexIsNotNull() {
+            addCriterion("create_index is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateIndexEqualTo(Boolean value) {
+            addCriterion("create_index =", value, "createIndex");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateIndexNotEqualTo(Boolean value) {
+            addCriterion("create_index <>", value, "createIndex");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateIndexGreaterThan(Boolean value) {
+            addCriterion("create_index >", value, "createIndex");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateIndexGreaterThanOrEqualTo(Boolean value) {
+            addCriterion("create_index >=", value, "createIndex");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateIndexLessThan(Boolean value) {
+            addCriterion("create_index <", value, "createIndex");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateIndexLessThanOrEqualTo(Boolean value) {
+            addCriterion("create_index <=", value, "createIndex");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateIndexIn(List<Boolean> values) {
+            addCriterion("create_index in", values, "createIndex");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateIndexNotIn(List<Boolean> values) {
+            addCriterion("create_index not in", values, "createIndex");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateIndexBetween(Boolean value1, Boolean value2) {
+            addCriterion("create_index between", value1, value2, "createIndex");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateIndexNotBetween(Boolean value1, Boolean value2) {
+            addCriterion("create_index not between", value1, value2, "createIndex");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateByIsNull() {
+            addCriterion("create_by is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateByIsNotNull() {
+            addCriterion("create_by is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateByEqualTo(String value) {
+            addCriterion("create_by =", value, "createBy");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateByNotEqualTo(String value) {
+            addCriterion("create_by <>", value, "createBy");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateByGreaterThan(String value) {
+            addCriterion("create_by >", value, "createBy");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateByGreaterThanOrEqualTo(String value) {
+            addCriterion("create_by >=", value, "createBy");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateByLessThan(String value) {
+            addCriterion("create_by <", value, "createBy");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateByLessThanOrEqualTo(String value) {
+            addCriterion("create_by <=", value, "createBy");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateByLike(String value) {
+            addCriterion("create_by like", value, "createBy");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateByNotLike(String value) {
+            addCriterion("create_by not like", value, "createBy");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateByIn(List<String> values) {
+            addCriterion("create_by in", values, "createBy");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateByNotIn(List<String> values) {
+            addCriterion("create_by not in", values, "createBy");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateByBetween(String value1, String value2) {
+            addCriterion("create_by between", value1, value2, "createBy");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateByNotBetween(String value1, String value2) {
+            addCriterion("create_by not between", value1, value2, "createBy");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeIsNull() {
+            addCriterion("create_time is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeIsNotNull() {
+            addCriterion("create_time is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeEqualTo(Date value) {
+            addCriterion("create_time =", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotEqualTo(Date value) {
+            addCriterion("create_time <>", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeGreaterThan(Date value) {
+            addCriterion("create_time >", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeGreaterThanOrEqualTo(Date value) {
+            addCriterion("create_time >=", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeLessThan(Date value) {
+            addCriterion("create_time <", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeLessThanOrEqualTo(Date value) {
+            addCriterion("create_time <=", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeIn(List<Date> values) {
+            addCriterion("create_time in", values, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotIn(List<Date> values) {
+            addCriterion("create_time not in", values, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeBetween(Date value1, Date value2) {
+            addCriterion("create_time between", value1, value2, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotBetween(Date value1, Date value2) {
+            addCriterion("create_time not between", value1, value2, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateByIsNull() {
+            addCriterion("update_by is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateByIsNotNull() {
+            addCriterion("update_by is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateByEqualTo(String value) {
+            addCriterion("update_by =", value, "updateBy");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateByNotEqualTo(String value) {
+            addCriterion("update_by <>", value, "updateBy");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateByGreaterThan(String value) {
+            addCriterion("update_by >", value, "updateBy");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateByGreaterThanOrEqualTo(String value) {
+            addCriterion("update_by >=", value, "updateBy");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateByLessThan(String value) {
+            addCriterion("update_by <", value, "updateBy");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateByLessThanOrEqualTo(String value) {
+            addCriterion("update_by <=", value, "updateBy");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateByLike(String value) {
+            addCriterion("update_by like", value, "updateBy");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateByNotLike(String value) {
+            addCriterion("update_by not like", value, "updateBy");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateByIn(List<String> values) {
+            addCriterion("update_by in", values, "updateBy");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateByNotIn(List<String> values) {
+            addCriterion("update_by not in", values, "updateBy");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateByBetween(String value1, String value2) {
+            addCriterion("update_by between", value1, value2, "updateBy");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateByNotBetween(String value1, String value2) {
+            addCriterion("update_by not between", value1, value2, "updateBy");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeIsNull() {
+            addCriterion("update_time is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeIsNotNull() {
+            addCriterion("update_time is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeEqualTo(Date value) {
+            addCriterion("update_time =", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeNotEqualTo(Date value) {
+            addCriterion("update_time <>", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeGreaterThan(Date value) {
+            addCriterion("update_time >", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeGreaterThanOrEqualTo(Date value) {
+            addCriterion("update_time >=", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeLessThan(Date value) {
+            addCriterion("update_time <", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeLessThanOrEqualTo(Date value) {
+            addCriterion("update_time <=", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeIn(List<Date> values) {
+            addCriterion("update_time in", values, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeNotIn(List<Date> values) {
+            addCriterion("update_time not in", values, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeBetween(Date value1, Date value2) {
+            addCriterion("update_time between", value1, value2, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeNotBetween(Date value1, Date value2) {
+            addCriterion("update_time not between", value1, value2, "updateTime");
+            return (Criteria) this;
+        }
+    }
+
+    public static class Criteria extends GeneratedCriteria {
+
+        protected Criteria() {
+            super();
+        }
+    }
+
+    public static class Criterion {
+        private String condition;
+
+        private Object value;
+
+        private Object secondValue;
+
+        private boolean noValue;
+
+        private boolean singleValue;
+
+        private boolean betweenValue;
+
+        private boolean listValue;
+
+        private String typeHandler;
+
+        public String getCondition() {
+            return condition;
+        }
+
+        public Object getValue() {
+            return value;
+        }
+
+        public Object getSecondValue() {
+            return secondValue;
+        }
+
+        public boolean isNoValue() {
+            return noValue;
+        }
+
+        public boolean isSingleValue() {
+            return singleValue;
+        }
+
+        public boolean isBetweenValue() {
+            return betweenValue;
+        }
+
+        public boolean isListValue() {
+            return listValue;
+        }
+
+        public String getTypeHandler() {
+            return typeHandler;
+        }
+
+        protected Criterion(String condition) {
+            super();
+            this.condition = condition;
+            this.typeHandler = null;
+            this.noValue = true;
+        }
+
+        protected Criterion(String condition, Object value, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.typeHandler = typeHandler;
+            if (value instanceof List<?>) {
+                this.listValue = true;
+            } else {
+                this.singleValue = true;
+            }
+        }
+
+        protected Criterion(String condition, Object value) {
+            this(condition, value, null);
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.secondValue = secondValue;
+            this.typeHandler = typeHandler;
+            this.betweenValue = true;
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue) {
+            this(condition, value, secondValue, null);
+        }
+    }
+}
\ No newline at end of file
diff --git a/sdk/dataease-plugin-common/src/main/java/io/dataease/plugins/common/base/domain/DataFillFormWithBLOBs.java b/sdk/dataease-plugin-common/src/main/java/io/dataease/plugins/common/base/domain/DataFillFormWithBLOBs.java
new file mode 100644
index 0000000000..b00eb6baa8
--- /dev/null
+++ b/sdk/dataease-plugin-common/src/main/java/io/dataease/plugins/common/base/domain/DataFillFormWithBLOBs.java
@@ -0,0 +1,17 @@
+package io.dataease.plugins.common.base.domain;
+
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+public class DataFillFormWithBLOBs extends DataFillForm implements Serializable {
+    private String forms;
+
+    private String tableIndexes;
+
+    private static final long serialVersionUID = 1L;
+}
\ No newline at end of file
diff --git a/sdk/dataease-plugin-common/src/main/java/io/dataease/plugins/common/base/domain/DataFillTask.java b/sdk/dataease-plugin-common/src/main/java/io/dataease/plugins/common/base/domain/DataFillTask.java
new file mode 100644
index 0000000000..dde37d4873
--- /dev/null
+++ b/sdk/dataease-plugin-common/src/main/java/io/dataease/plugins/common/base/domain/DataFillTask.java
@@ -0,0 +1,38 @@
+package io.dataease.plugins.common.base.domain;
+
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Data;
+
+@Data
+public class DataFillTask implements Serializable {
+    private Long id;
+
+    private String name;
+
+    private String formId;
+
+    private Date startTime;
+
+    private Date endTime;
+
+    private Integer rateType;
+
+    private String rateVal;
+
+    private Date publishStartTime;
+
+    private Date publishEndTime;
+
+    private Integer publishRangeTimeType;
+
+    private Integer publishRangeTime;
+
+    private Long creator;
+
+    private Date createTime;
+
+    private Boolean status;
+
+    private static final long serialVersionUID = 1L;
+}
\ No newline at end of file
diff --git a/sdk/dataease-plugin-common/src/main/java/io/dataease/plugins/common/base/domain/DataFillTaskExample.java b/sdk/dataease-plugin-common/src/main/java/io/dataease/plugins/common/base/domain/DataFillTaskExample.java
new file mode 100644
index 0000000000..71789c82a7
--- /dev/null
+++ b/sdk/dataease-plugin-common/src/main/java/io/dataease/plugins/common/base/domain/DataFillTaskExample.java
@@ -0,0 +1,1071 @@
+package io.dataease.plugins.common.base.domain;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+public class DataFillTaskExample {
+    protected String orderByClause;
+
+    protected boolean distinct;
+
+    protected List<Criteria> oredCriteria;
+
+    public DataFillTaskExample() {
+        oredCriteria = new ArrayList<Criteria>();
+    }
+
+    public void setOrderByClause(String orderByClause) {
+        this.orderByClause = orderByClause;
+    }
+
+    public String getOrderByClause() {
+        return orderByClause;
+    }
+
+    public void setDistinct(boolean distinct) {
+        this.distinct = distinct;
+    }
+
+    public boolean isDistinct() {
+        return distinct;
+    }
+
+    public List<Criteria> getOredCriteria() {
+        return oredCriteria;
+    }
+
+    public void or(Criteria criteria) {
+        oredCriteria.add(criteria);
+    }
+
+    public Criteria or() {
+        Criteria criteria = createCriteriaInternal();
+        oredCriteria.add(criteria);
+        return criteria;
+    }
+
+    public Criteria createCriteria() {
+        Criteria criteria = createCriteriaInternal();
+        if (oredCriteria.size() == 0) {
+            oredCriteria.add(criteria);
+        }
+        return criteria;
+    }
+
+    protected Criteria createCriteriaInternal() {
+        Criteria criteria = new Criteria();
+        return criteria;
+    }
+
+    public void clear() {
+        oredCriteria.clear();
+        orderByClause = null;
+        distinct = false;
+    }
+
+    protected abstract static class GeneratedCriteria {
+        protected List<Criterion> criteria;
+
+        protected GeneratedCriteria() {
+            super();
+            criteria = new ArrayList<Criterion>();
+        }
+
+        public boolean isValid() {
+            return criteria.size() > 0;
+        }
+
+        public List<Criterion> getAllCriteria() {
+            return criteria;
+        }
+
+        public List<Criterion> getCriteria() {
+            return criteria;
+        }
+
+        protected void addCriterion(String condition) {
+            if (condition == null) {
+                throw new RuntimeException("Value for condition cannot be null");
+            }
+            criteria.add(new Criterion(condition));
+        }
+
+        protected void addCriterion(String condition, Object value, String property) {
+            if (value == null) {
+                throw new RuntimeException("Value for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value));
+        }
+
+        protected void addCriterion(String condition, Object value1, Object value2, String property) {
+            if (value1 == null || value2 == null) {
+                throw new RuntimeException("Between values for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value1, value2));
+        }
+
+        public Criteria andIdIsNull() {
+            addCriterion("id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIsNotNull() {
+            addCriterion("id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdEqualTo(Long value) {
+            addCriterion("id =", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotEqualTo(Long value) {
+            addCriterion("id <>", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThan(Long value) {
+            addCriterion("id >", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThanOrEqualTo(Long value) {
+            addCriterion("id >=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThan(Long value) {
+            addCriterion("id <", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThanOrEqualTo(Long value) {
+            addCriterion("id <=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIn(List<Long> values) {
+            addCriterion("id in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotIn(List<Long> values) {
+            addCriterion("id not in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdBetween(Long value1, Long value2) {
+            addCriterion("id between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotBetween(Long value1, Long value2) {
+            addCriterion("id not between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameIsNull() {
+            addCriterion("`name` is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameIsNotNull() {
+            addCriterion("`name` is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameEqualTo(String value) {
+            addCriterion("`name` =", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameNotEqualTo(String value) {
+            addCriterion("`name` <>", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameGreaterThan(String value) {
+            addCriterion("`name` >", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameGreaterThanOrEqualTo(String value) {
+            addCriterion("`name` >=", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameLessThan(String value) {
+            addCriterion("`name` <", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameLessThanOrEqualTo(String value) {
+            addCriterion("`name` <=", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameLike(String value) {
+            addCriterion("`name` like", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameNotLike(String value) {
+            addCriterion("`name` not like", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameIn(List<String> values) {
+            addCriterion("`name` in", values, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameNotIn(List<String> values) {
+            addCriterion("`name` not in", values, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameBetween(String value1, String value2) {
+            addCriterion("`name` between", value1, value2, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameNotBetween(String value1, String value2) {
+            addCriterion("`name` not between", value1, value2, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andFormIdIsNull() {
+            addCriterion("form_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andFormIdIsNotNull() {
+            addCriterion("form_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andFormIdEqualTo(String value) {
+            addCriterion("form_id =", value, "formId");
+            return (Criteria) this;
+        }
+
+        public Criteria andFormIdNotEqualTo(String value) {
+            addCriterion("form_id <>", value, "formId");
+            return (Criteria) this;
+        }
+
+        public Criteria andFormIdGreaterThan(String value) {
+            addCriterion("form_id >", value, "formId");
+            return (Criteria) this;
+        }
+
+        public Criteria andFormIdGreaterThanOrEqualTo(String value) {
+            addCriterion("form_id >=", value, "formId");
+            return (Criteria) this;
+        }
+
+        public Criteria andFormIdLessThan(String value) {
+            addCriterion("form_id <", value, "formId");
+            return (Criteria) this;
+        }
+
+        public Criteria andFormIdLessThanOrEqualTo(String value) {
+            addCriterion("form_id <=", value, "formId");
+            return (Criteria) this;
+        }
+
+        public Criteria andFormIdLike(String value) {
+            addCriterion("form_id like", value, "formId");
+            return (Criteria) this;
+        }
+
+        public Criteria andFormIdNotLike(String value) {
+            addCriterion("form_id not like", value, "formId");
+            return (Criteria) this;
+        }
+
+        public Criteria andFormIdIn(List<String> values) {
+            addCriterion("form_id in", values, "formId");
+            return (Criteria) this;
+        }
+
+        public Criteria andFormIdNotIn(List<String> values) {
+            addCriterion("form_id not in", values, "formId");
+            return (Criteria) this;
+        }
+
+        public Criteria andFormIdBetween(String value1, String value2) {
+            addCriterion("form_id between", value1, value2, "formId");
+            return (Criteria) this;
+        }
+
+        public Criteria andFormIdNotBetween(String value1, String value2) {
+            addCriterion("form_id not between", value1, value2, "formId");
+            return (Criteria) this;
+        }
+
+        public Criteria andStartTimeIsNull() {
+            addCriterion("start_time is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andStartTimeIsNotNull() {
+            addCriterion("start_time is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andStartTimeEqualTo(Date value) {
+            addCriterion("start_time =", value, "startTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andStartTimeNotEqualTo(Date value) {
+            addCriterion("start_time <>", value, "startTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andStartTimeGreaterThan(Date value) {
+            addCriterion("start_time >", value, "startTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andStartTimeGreaterThanOrEqualTo(Date value) {
+            addCriterion("start_time >=", value, "startTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andStartTimeLessThan(Date value) {
+            addCriterion("start_time <", value, "startTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andStartTimeLessThanOrEqualTo(Date value) {
+            addCriterion("start_time <=", value, "startTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andStartTimeIn(List<Date> values) {
+            addCriterion("start_time in", values, "startTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andStartTimeNotIn(List<Date> values) {
+            addCriterion("start_time not in", values, "startTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andStartTimeBetween(Date value1, Date value2) {
+            addCriterion("start_time between", value1, value2, "startTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andStartTimeNotBetween(Date value1, Date value2) {
+            addCriterion("start_time not between", value1, value2, "startTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andEndTimeIsNull() {
+            addCriterion("end_time is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andEndTimeIsNotNull() {
+            addCriterion("end_time is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andEndTimeEqualTo(Date value) {
+            addCriterion("end_time =", value, "endTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andEndTimeNotEqualTo(Date value) {
+            addCriterion("end_time <>", value, "endTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andEndTimeGreaterThan(Date value) {
+            addCriterion("end_time >", value, "endTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andEndTimeGreaterThanOrEqualTo(Date value) {
+            addCriterion("end_time >=", value, "endTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andEndTimeLessThan(Date value) {
+            addCriterion("end_time <", value, "endTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andEndTimeLessThanOrEqualTo(Date value) {
+            addCriterion("end_time <=", value, "endTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andEndTimeIn(List<Date> values) {
+            addCriterion("end_time in", values, "endTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andEndTimeNotIn(List<Date> values) {
+            addCriterion("end_time not in", values, "endTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andEndTimeBetween(Date value1, Date value2) {
+            addCriterion("end_time between", value1, value2, "endTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andEndTimeNotBetween(Date value1, Date value2) {
+            addCriterion("end_time not between", value1, value2, "endTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andRateTypeIsNull() {
+            addCriterion("rate_type is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andRateTypeIsNotNull() {
+            addCriterion("rate_type is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andRateTypeEqualTo(Integer value) {
+            addCriterion("rate_type =", value, "rateType");
+            return (Criteria) this;
+        }
+
+        public Criteria andRateTypeNotEqualTo(Integer value) {
+            addCriterion("rate_type <>", value, "rateType");
+            return (Criteria) this;
+        }
+
+        public Criteria andRateTypeGreaterThan(Integer value) {
+            addCriterion("rate_type >", value, "rateType");
+            return (Criteria) this;
+        }
+
+        public Criteria andRateTypeGreaterThanOrEqualTo(Integer value) {
+            addCriterion("rate_type >=", value, "rateType");
+            return (Criteria) this;
+        }
+
+        public Criteria andRateTypeLessThan(Integer value) {
+            addCriterion("rate_type <", value, "rateType");
+            return (Criteria) this;
+        }
+
+        public Criteria andRateTypeLessThanOrEqualTo(Integer value) {
+            addCriterion("rate_type <=", value, "rateType");
+            return (Criteria) this;
+        }
+
+        public Criteria andRateTypeIn(List<Integer> values) {
+            addCriterion("rate_type in", values, "rateType");
+            return (Criteria) this;
+        }
+
+        public Criteria andRateTypeNotIn(List<Integer> values) {
+            addCriterion("rate_type not in", values, "rateType");
+            return (Criteria) this;
+        }
+
+        public Criteria andRateTypeBetween(Integer value1, Integer value2) {
+            addCriterion("rate_type between", value1, value2, "rateType");
+            return (Criteria) this;
+        }
+
+        public Criteria andRateTypeNotBetween(Integer value1, Integer value2) {
+            addCriterion("rate_type not between", value1, value2, "rateType");
+            return (Criteria) this;
+        }
+
+        public Criteria andRateValIsNull() {
+            addCriterion("rate_val is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andRateValIsNotNull() {
+            addCriterion("rate_val is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andRateValEqualTo(String value) {
+            addCriterion("rate_val =", value, "rateVal");
+            return (Criteria) this;
+        }
+
+        public Criteria andRateValNotEqualTo(String value) {
+            addCriterion("rate_val <>", value, "rateVal");
+            return (Criteria) this;
+        }
+
+        public Criteria andRateValGreaterThan(String value) {
+            addCriterion("rate_val >", value, "rateVal");
+            return (Criteria) this;
+        }
+
+        public Criteria andRateValGreaterThanOrEqualTo(String value) {
+            addCriterion("rate_val >=", value, "rateVal");
+            return (Criteria) this;
+        }
+
+        public Criteria andRateValLessThan(String value) {
+            addCriterion("rate_val <", value, "rateVal");
+            return (Criteria) this;
+        }
+
+        public Criteria andRateValLessThanOrEqualTo(String value) {
+            addCriterion("rate_val <=", value, "rateVal");
+            return (Criteria) this;
+        }
+
+        public Criteria andRateValLike(String value) {
+            addCriterion("rate_val like", value, "rateVal");
+            return (Criteria) this;
+        }
+
+        public Criteria andRateValNotLike(String value) {
+            addCriterion("rate_val not like", value, "rateVal");
+            return (Criteria) this;
+        }
+
+        public Criteria andRateValIn(List<String> values) {
+            addCriterion("rate_val in", values, "rateVal");
+            return (Criteria) this;
+        }
+
+        public Criteria andRateValNotIn(List<String> values) {
+            addCriterion("rate_val not in", values, "rateVal");
+            return (Criteria) this;
+        }
+
+        public Criteria andRateValBetween(String value1, String value2) {
+            addCriterion("rate_val between", value1, value2, "rateVal");
+            return (Criteria) this;
+        }
+
+        public Criteria andRateValNotBetween(String value1, String value2) {
+            addCriterion("rate_val not between", value1, value2, "rateVal");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishStartTimeIsNull() {
+            addCriterion("publish_start_time is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishStartTimeIsNotNull() {
+            addCriterion("publish_start_time is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishStartTimeEqualTo(Date value) {
+            addCriterion("publish_start_time =", value, "publishStartTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishStartTimeNotEqualTo(Date value) {
+            addCriterion("publish_start_time <>", value, "publishStartTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishStartTimeGreaterThan(Date value) {
+            addCriterion("publish_start_time >", value, "publishStartTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishStartTimeGreaterThanOrEqualTo(Date value) {
+            addCriterion("publish_start_time >=", value, "publishStartTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishStartTimeLessThan(Date value) {
+            addCriterion("publish_start_time <", value, "publishStartTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishStartTimeLessThanOrEqualTo(Date value) {
+            addCriterion("publish_start_time <=", value, "publishStartTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishStartTimeIn(List<Date> values) {
+            addCriterion("publish_start_time in", values, "publishStartTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishStartTimeNotIn(List<Date> values) {
+            addCriterion("publish_start_time not in", values, "publishStartTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishStartTimeBetween(Date value1, Date value2) {
+            addCriterion("publish_start_time between", value1, value2, "publishStartTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishStartTimeNotBetween(Date value1, Date value2) {
+            addCriterion("publish_start_time not between", value1, value2, "publishStartTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishEndTimeIsNull() {
+            addCriterion("publish_end_time is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishEndTimeIsNotNull() {
+            addCriterion("publish_end_time is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishEndTimeEqualTo(Date value) {
+            addCriterion("publish_end_time =", value, "publishEndTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishEndTimeNotEqualTo(Date value) {
+            addCriterion("publish_end_time <>", value, "publishEndTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishEndTimeGreaterThan(Date value) {
+            addCriterion("publish_end_time >", value, "publishEndTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishEndTimeGreaterThanOrEqualTo(Date value) {
+            addCriterion("publish_end_time >=", value, "publishEndTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishEndTimeLessThan(Date value) {
+            addCriterion("publish_end_time <", value, "publishEndTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishEndTimeLessThanOrEqualTo(Date value) {
+            addCriterion("publish_end_time <=", value, "publishEndTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishEndTimeIn(List<Date> values) {
+            addCriterion("publish_end_time in", values, "publishEndTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishEndTimeNotIn(List<Date> values) {
+            addCriterion("publish_end_time not in", values, "publishEndTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishEndTimeBetween(Date value1, Date value2) {
+            addCriterion("publish_end_time between", value1, value2, "publishEndTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishEndTimeNotBetween(Date value1, Date value2) {
+            addCriterion("publish_end_time not between", value1, value2, "publishEndTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishRangeTimeTypeIsNull() {
+            addCriterion("publish_range_time_type is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishRangeTimeTypeIsNotNull() {
+            addCriterion("publish_range_time_type is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishRangeTimeTypeEqualTo(Integer value) {
+            addCriterion("publish_range_time_type =", value, "publishRangeTimeType");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishRangeTimeTypeNotEqualTo(Integer value) {
+            addCriterion("publish_range_time_type <>", value, "publishRangeTimeType");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishRangeTimeTypeGreaterThan(Integer value) {
+            addCriterion("publish_range_time_type >", value, "publishRangeTimeType");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishRangeTimeTypeGreaterThanOrEqualTo(Integer value) {
+            addCriterion("publish_range_time_type >=", value, "publishRangeTimeType");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishRangeTimeTypeLessThan(Integer value) {
+            addCriterion("publish_range_time_type <", value, "publishRangeTimeType");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishRangeTimeTypeLessThanOrEqualTo(Integer value) {
+            addCriterion("publish_range_time_type <=", value, "publishRangeTimeType");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishRangeTimeTypeIn(List<Integer> values) {
+            addCriterion("publish_range_time_type in", values, "publishRangeTimeType");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishRangeTimeTypeNotIn(List<Integer> values) {
+            addCriterion("publish_range_time_type not in", values, "publishRangeTimeType");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishRangeTimeTypeBetween(Integer value1, Integer value2) {
+            addCriterion("publish_range_time_type between", value1, value2, "publishRangeTimeType");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishRangeTimeTypeNotBetween(Integer value1, Integer value2) {
+            addCriterion("publish_range_time_type not between", value1, value2, "publishRangeTimeType");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishRangeTimeIsNull() {
+            addCriterion("publish_range_time is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishRangeTimeIsNotNull() {
+            addCriterion("publish_range_time is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishRangeTimeEqualTo(Integer value) {
+            addCriterion("publish_range_time =", value, "publishRangeTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishRangeTimeNotEqualTo(Integer value) {
+            addCriterion("publish_range_time <>", value, "publishRangeTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishRangeTimeGreaterThan(Integer value) {
+            addCriterion("publish_range_time >", value, "publishRangeTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishRangeTimeGreaterThanOrEqualTo(Integer value) {
+            addCriterion("publish_range_time >=", value, "publishRangeTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishRangeTimeLessThan(Integer value) {
+            addCriterion("publish_range_time <", value, "publishRangeTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishRangeTimeLessThanOrEqualTo(Integer value) {
+            addCriterion("publish_range_time <=", value, "publishRangeTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishRangeTimeIn(List<Integer> values) {
+            addCriterion("publish_range_time in", values, "publishRangeTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishRangeTimeNotIn(List<Integer> values) {
+            addCriterion("publish_range_time not in", values, "publishRangeTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishRangeTimeBetween(Integer value1, Integer value2) {
+            addCriterion("publish_range_time between", value1, value2, "publishRangeTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishRangeTimeNotBetween(Integer value1, Integer value2) {
+            addCriterion("publish_range_time not between", value1, value2, "publishRangeTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatorIsNull() {
+            addCriterion("creator is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatorIsNotNull() {
+            addCriterion("creator is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatorEqualTo(Long value) {
+            addCriterion("creator =", value, "creator");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatorNotEqualTo(Long value) {
+            addCriterion("creator <>", value, "creator");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatorGreaterThan(Long value) {
+            addCriterion("creator >", value, "creator");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatorGreaterThanOrEqualTo(Long value) {
+            addCriterion("creator >=", value, "creator");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatorLessThan(Long value) {
+            addCriterion("creator <", value, "creator");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatorLessThanOrEqualTo(Long value) {
+            addCriterion("creator <=", value, "creator");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatorIn(List<Long> values) {
+            addCriterion("creator in", values, "creator");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatorNotIn(List<Long> values) {
+            addCriterion("creator not in", values, "creator");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatorBetween(Long value1, Long value2) {
+            addCriterion("creator between", value1, value2, "creator");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatorNotBetween(Long value1, Long value2) {
+            addCriterion("creator not between", value1, value2, "creator");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeIsNull() {
+            addCriterion("create_time is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeIsNotNull() {
+            addCriterion("create_time is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeEqualTo(Date value) {
+            addCriterion("create_time =", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotEqualTo(Date value) {
+            addCriterion("create_time <>", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeGreaterThan(Date value) {
+            addCriterion("create_time >", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeGreaterThanOrEqualTo(Date value) {
+            addCriterion("create_time >=", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeLessThan(Date value) {
+            addCriterion("create_time <", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeLessThanOrEqualTo(Date value) {
+            addCriterion("create_time <=", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeIn(List<Date> values) {
+            addCriterion("create_time in", values, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotIn(List<Date> values) {
+            addCriterion("create_time not in", values, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeBetween(Date value1, Date value2) {
+            addCriterion("create_time between", value1, value2, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotBetween(Date value1, Date value2) {
+            addCriterion("create_time not between", value1, value2, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusIsNull() {
+            addCriterion("`status` is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusIsNotNull() {
+            addCriterion("`status` is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusEqualTo(Boolean value) {
+            addCriterion("`status` =", value, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusNotEqualTo(Boolean value) {
+            addCriterion("`status` <>", value, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusGreaterThan(Boolean value) {
+            addCriterion("`status` >", value, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusGreaterThanOrEqualTo(Boolean value) {
+            addCriterion("`status` >=", value, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusLessThan(Boolean value) {
+            addCriterion("`status` <", value, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusLessThanOrEqualTo(Boolean value) {
+            addCriterion("`status` <=", value, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusIn(List<Boolean> values) {
+            addCriterion("`status` in", values, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusNotIn(List<Boolean> values) {
+            addCriterion("`status` not in", values, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusBetween(Boolean value1, Boolean value2) {
+            addCriterion("`status` between", value1, value2, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusNotBetween(Boolean value1, Boolean value2) {
+            addCriterion("`status` not between", value1, value2, "status");
+            return (Criteria) this;
+        }
+    }
+
+    public static class Criteria extends GeneratedCriteria {
+
+        protected Criteria() {
+            super();
+        }
+    }
+
+    public static class Criterion {
+        private String condition;
+
+        private Object value;
+
+        private Object secondValue;
+
+        private boolean noValue;
+
+        private boolean singleValue;
+
+        private boolean betweenValue;
+
+        private boolean listValue;
+
+        private String typeHandler;
+
+        public String getCondition() {
+            return condition;
+        }
+
+        public Object getValue() {
+            return value;
+        }
+
+        public Object getSecondValue() {
+            return secondValue;
+        }
+
+        public boolean isNoValue() {
+            return noValue;
+        }
+
+        public boolean isSingleValue() {
+            return singleValue;
+        }
+
+        public boolean isBetweenValue() {
+            return betweenValue;
+        }
+
+        public boolean isListValue() {
+            return listValue;
+        }
+
+        public String getTypeHandler() {
+            return typeHandler;
+        }
+
+        protected Criterion(String condition) {
+            super();
+            this.condition = condition;
+            this.typeHandler = null;
+            this.noValue = true;
+        }
+
+        protected Criterion(String condition, Object value, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.typeHandler = typeHandler;
+            if (value instanceof List<?>) {
+                this.listValue = true;
+            } else {
+                this.singleValue = true;
+            }
+        }
+
+        protected Criterion(String condition, Object value) {
+            this(condition, value, null);
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.secondValue = secondValue;
+            this.typeHandler = typeHandler;
+            this.betweenValue = true;
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue) {
+            this(condition, value, secondValue, null);
+        }
+    }
+}
\ No newline at end of file
diff --git a/sdk/dataease-plugin-common/src/main/java/io/dataease/plugins/common/base/domain/DataFillTaskWithBLOBs.java b/sdk/dataease-plugin-common/src/main/java/io/dataease/plugins/common/base/domain/DataFillTaskWithBLOBs.java
new file mode 100644
index 0000000000..ac797f231d
--- /dev/null
+++ b/sdk/dataease-plugin-common/src/main/java/io/dataease/plugins/common/base/domain/DataFillTaskWithBLOBs.java
@@ -0,0 +1,19 @@
+package io.dataease.plugins.common.base.domain;
+
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+public class DataFillTaskWithBLOBs extends DataFillTask implements Serializable {
+    private String reciUsers;
+
+    private String roleList;
+
+    private String orgList;
+
+    private static final long serialVersionUID = 1L;
+}
\ No newline at end of file
diff --git a/sdk/dataease-plugin-common/src/main/java/io/dataease/plugins/common/base/domain/DataFillUserTask.java b/sdk/dataease-plugin-common/src/main/java/io/dataease/plugins/common/base/domain/DataFillUserTask.java
new file mode 100644
index 0000000000..d2a295b5ab
--- /dev/null
+++ b/sdk/dataease-plugin-common/src/main/java/io/dataease/plugins/common/base/domain/DataFillUserTask.java
@@ -0,0 +1,26 @@
+package io.dataease.plugins.common.base.domain;
+
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Data;
+
+@Data
+public class DataFillUserTask implements Serializable {
+    private String id;
+
+    private Long taskId;
+
+    private String formId;
+
+    private String valueId;
+
+    private Long user;
+
+    private Date startTime;
+
+    private Date endTime;
+
+    private Date finishTime;
+
+    private static final long serialVersionUID = 1L;
+}
\ No newline at end of file
diff --git a/sdk/dataease-plugin-common/src/main/java/io/dataease/plugins/common/base/domain/DataFillUserTaskExample.java b/sdk/dataease-plugin-common/src/main/java/io/dataease/plugins/common/base/domain/DataFillUserTaskExample.java
new file mode 100644
index 0000000000..f37a90c13a
--- /dev/null
+++ b/sdk/dataease-plugin-common/src/main/java/io/dataease/plugins/common/base/domain/DataFillUserTaskExample.java
@@ -0,0 +1,711 @@
+package io.dataease.plugins.common.base.domain;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+public class DataFillUserTaskExample {
+    protected String orderByClause;
+
+    protected boolean distinct;
+
+    protected List<Criteria> oredCriteria;
+
+    public DataFillUserTaskExample() {
+        oredCriteria = new ArrayList<Criteria>();
+    }
+
+    public void setOrderByClause(String orderByClause) {
+        this.orderByClause = orderByClause;
+    }
+
+    public String getOrderByClause() {
+        return orderByClause;
+    }
+
+    public void setDistinct(boolean distinct) {
+        this.distinct = distinct;
+    }
+
+    public boolean isDistinct() {
+        return distinct;
+    }
+
+    public List<Criteria> getOredCriteria() {
+        return oredCriteria;
+    }
+
+    public void or(Criteria criteria) {
+        oredCriteria.add(criteria);
+    }
+
+    public Criteria or() {
+        Criteria criteria = createCriteriaInternal();
+        oredCriteria.add(criteria);
+        return criteria;
+    }
+
+    public Criteria createCriteria() {
+        Criteria criteria = createCriteriaInternal();
+        if (oredCriteria.size() == 0) {
+            oredCriteria.add(criteria);
+        }
+        return criteria;
+    }
+
+    protected Criteria createCriteriaInternal() {
+        Criteria criteria = new Criteria();
+        return criteria;
+    }
+
+    public void clear() {
+        oredCriteria.clear();
+        orderByClause = null;
+        distinct = false;
+    }
+
+    protected abstract static class GeneratedCriteria {
+        protected List<Criterion> criteria;
+
+        protected GeneratedCriteria() {
+            super();
+            criteria = new ArrayList<Criterion>();
+        }
+
+        public boolean isValid() {
+            return criteria.size() > 0;
+        }
+
+        public List<Criterion> getAllCriteria() {
+            return criteria;
+        }
+
+        public List<Criterion> getCriteria() {
+            return criteria;
+        }
+
+        protected void addCriterion(String condition) {
+            if (condition == null) {
+                throw new RuntimeException("Value for condition cannot be null");
+            }
+            criteria.add(new Criterion(condition));
+        }
+
+        protected void addCriterion(String condition, Object value, String property) {
+            if (value == null) {
+                throw new RuntimeException("Value for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value));
+        }
+
+        protected void addCriterion(String condition, Object value1, Object value2, String property) {
+            if (value1 == null || value2 == null) {
+                throw new RuntimeException("Between values for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value1, value2));
+        }
+
+        public Criteria andIdIsNull() {
+            addCriterion("id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIsNotNull() {
+            addCriterion("id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdEqualTo(String value) {
+            addCriterion("id =", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotEqualTo(String value) {
+            addCriterion("id <>", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThan(String value) {
+            addCriterion("id >", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThanOrEqualTo(String value) {
+            addCriterion("id >=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThan(String value) {
+            addCriterion("id <", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThanOrEqualTo(String value) {
+            addCriterion("id <=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLike(String value) {
+            addCriterion("id like", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotLike(String value) {
+            addCriterion("id not like", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIn(List<String> values) {
+            addCriterion("id in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotIn(List<String> values) {
+            addCriterion("id not in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdBetween(String value1, String value2) {
+            addCriterion("id between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotBetween(String value1, String value2) {
+            addCriterion("id not between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andTaskIdIsNull() {
+            addCriterion("task_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andTaskIdIsNotNull() {
+            addCriterion("task_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andTaskIdEqualTo(Long value) {
+            addCriterion("task_id =", value, "taskId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTaskIdNotEqualTo(Long value) {
+            addCriterion("task_id <>", value, "taskId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTaskIdGreaterThan(Long value) {
+            addCriterion("task_id >", value, "taskId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTaskIdGreaterThanOrEqualTo(Long value) {
+            addCriterion("task_id >=", value, "taskId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTaskIdLessThan(Long value) {
+            addCriterion("task_id <", value, "taskId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTaskIdLessThanOrEqualTo(Long value) {
+            addCriterion("task_id <=", value, "taskId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTaskIdIn(List<Long> values) {
+            addCriterion("task_id in", values, "taskId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTaskIdNotIn(List<Long> values) {
+            addCriterion("task_id not in", values, "taskId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTaskIdBetween(Long value1, Long value2) {
+            addCriterion("task_id between", value1, value2, "taskId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTaskIdNotBetween(Long value1, Long value2) {
+            addCriterion("task_id not between", value1, value2, "taskId");
+            return (Criteria) this;
+        }
+
+        public Criteria andFormIdIsNull() {
+            addCriterion("form_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andFormIdIsNotNull() {
+            addCriterion("form_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andFormIdEqualTo(String value) {
+            addCriterion("form_id =", value, "formId");
+            return (Criteria) this;
+        }
+
+        public Criteria andFormIdNotEqualTo(String value) {
+            addCriterion("form_id <>", value, "formId");
+            return (Criteria) this;
+        }
+
+        public Criteria andFormIdGreaterThan(String value) {
+            addCriterion("form_id >", value, "formId");
+            return (Criteria) this;
+        }
+
+        public Criteria andFormIdGreaterThanOrEqualTo(String value) {
+            addCriterion("form_id >=", value, "formId");
+            return (Criteria) this;
+        }
+
+        public Criteria andFormIdLessThan(String value) {
+            addCriterion("form_id <", value, "formId");
+            return (Criteria) this;
+        }
+
+        public Criteria andFormIdLessThanOrEqualTo(String value) {
+            addCriterion("form_id <=", value, "formId");
+            return (Criteria) this;
+        }
+
+        public Criteria andFormIdLike(String value) {
+            addCriterion("form_id like", value, "formId");
+            return (Criteria) this;
+        }
+
+        public Criteria andFormIdNotLike(String value) {
+            addCriterion("form_id not like", value, "formId");
+            return (Criteria) this;
+        }
+
+        public Criteria andFormIdIn(List<String> values) {
+            addCriterion("form_id in", values, "formId");
+            return (Criteria) this;
+        }
+
+        public Criteria andFormIdNotIn(List<String> values) {
+            addCriterion("form_id not in", values, "formId");
+            return (Criteria) this;
+        }
+
+        public Criteria andFormIdBetween(String value1, String value2) {
+            addCriterion("form_id between", value1, value2, "formId");
+            return (Criteria) this;
+        }
+
+        public Criteria andFormIdNotBetween(String value1, String value2) {
+            addCriterion("form_id not between", value1, value2, "formId");
+            return (Criteria) this;
+        }
+
+        public Criteria andValueIdIsNull() {
+            addCriterion("value_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andValueIdIsNotNull() {
+            addCriterion("value_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andValueIdEqualTo(String value) {
+            addCriterion("value_id =", value, "valueId");
+            return (Criteria) this;
+        }
+
+        public Criteria andValueIdNotEqualTo(String value) {
+            addCriterion("value_id <>", value, "valueId");
+            return (Criteria) this;
+        }
+
+        public Criteria andValueIdGreaterThan(String value) {
+            addCriterion("value_id >", value, "valueId");
+            return (Criteria) this;
+        }
+
+        public Criteria andValueIdGreaterThanOrEqualTo(String value) {
+            addCriterion("value_id >=", value, "valueId");
+            return (Criteria) this;
+        }
+
+        public Criteria andValueIdLessThan(String value) {
+            addCriterion("value_id <", value, "valueId");
+            return (Criteria) this;
+        }
+
+        public Criteria andValueIdLessThanOrEqualTo(String value) {
+            addCriterion("value_id <=", value, "valueId");
+            return (Criteria) this;
+        }
+
+        public Criteria andValueIdLike(String value) {
+            addCriterion("value_id like", value, "valueId");
+            return (Criteria) this;
+        }
+
+        public Criteria andValueIdNotLike(String value) {
+            addCriterion("value_id not like", value, "valueId");
+            return (Criteria) this;
+        }
+
+        public Criteria andValueIdIn(List<String> values) {
+            addCriterion("value_id in", values, "valueId");
+            return (Criteria) this;
+        }
+
+        public Criteria andValueIdNotIn(List<String> values) {
+            addCriterion("value_id not in", values, "valueId");
+            return (Criteria) this;
+        }
+
+        public Criteria andValueIdBetween(String value1, String value2) {
+            addCriterion("value_id between", value1, value2, "valueId");
+            return (Criteria) this;
+        }
+
+        public Criteria andValueIdNotBetween(String value1, String value2) {
+            addCriterion("value_id not between", value1, value2, "valueId");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserIsNull() {
+            addCriterion("`user` is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserIsNotNull() {
+            addCriterion("`user` is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserEqualTo(Long value) {
+            addCriterion("`user` =", value, "user");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserNotEqualTo(Long value) {
+            addCriterion("`user` <>", value, "user");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserGreaterThan(Long value) {
+            addCriterion("`user` >", value, "user");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserGreaterThanOrEqualTo(Long value) {
+            addCriterion("`user` >=", value, "user");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserLessThan(Long value) {
+            addCriterion("`user` <", value, "user");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserLessThanOrEqualTo(Long value) {
+            addCriterion("`user` <=", value, "user");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserIn(List<Long> values) {
+            addCriterion("`user` in", values, "user");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserNotIn(List<Long> values) {
+            addCriterion("`user` not in", values, "user");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserBetween(Long value1, Long value2) {
+            addCriterion("`user` between", value1, value2, "user");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserNotBetween(Long value1, Long value2) {
+            addCriterion("`user` not between", value1, value2, "user");
+            return (Criteria) this;
+        }
+
+        public Criteria andStartTimeIsNull() {
+            addCriterion("start_time is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andStartTimeIsNotNull() {
+            addCriterion("start_time is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andStartTimeEqualTo(Date value) {
+            addCriterion("start_time =", value, "startTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andStartTimeNotEqualTo(Date value) {
+            addCriterion("start_time <>", value, "startTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andStartTimeGreaterThan(Date value) {
+            addCriterion("start_time >", value, "startTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andStartTimeGreaterThanOrEqualTo(Date value) {
+            addCriterion("start_time >=", value, "startTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andStartTimeLessThan(Date value) {
+            addCriterion("start_time <", value, "startTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andStartTimeLessThanOrEqualTo(Date value) {
+            addCriterion("start_time <=", value, "startTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andStartTimeIn(List<Date> values) {
+            addCriterion("start_time in", values, "startTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andStartTimeNotIn(List<Date> values) {
+            addCriterion("start_time not in", values, "startTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andStartTimeBetween(Date value1, Date value2) {
+            addCriterion("start_time between", value1, value2, "startTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andStartTimeNotBetween(Date value1, Date value2) {
+            addCriterion("start_time not between", value1, value2, "startTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andEndTimeIsNull() {
+            addCriterion("end_time is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andEndTimeIsNotNull() {
+            addCriterion("end_time is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andEndTimeEqualTo(Date value) {
+            addCriterion("end_time =", value, "endTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andEndTimeNotEqualTo(Date value) {
+            addCriterion("end_time <>", value, "endTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andEndTimeGreaterThan(Date value) {
+            addCriterion("end_time >", value, "endTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andEndTimeGreaterThanOrEqualTo(Date value) {
+            addCriterion("end_time >=", value, "endTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andEndTimeLessThan(Date value) {
+            addCriterion("end_time <", value, "endTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andEndTimeLessThanOrEqualTo(Date value) {
+            addCriterion("end_time <=", value, "endTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andEndTimeIn(List<Date> values) {
+            addCriterion("end_time in", values, "endTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andEndTimeNotIn(List<Date> values) {
+            addCriterion("end_time not in", values, "endTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andEndTimeBetween(Date value1, Date value2) {
+            addCriterion("end_time between", value1, value2, "endTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andEndTimeNotBetween(Date value1, Date value2) {
+            addCriterion("end_time not between", value1, value2, "endTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andFinishTimeIsNull() {
+            addCriterion("finish_time is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andFinishTimeIsNotNull() {
+            addCriterion("finish_time is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andFinishTimeEqualTo(Date value) {
+            addCriterion("finish_time =", value, "finishTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andFinishTimeNotEqualTo(Date value) {
+            addCriterion("finish_time <>", value, "finishTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andFinishTimeGreaterThan(Date value) {
+            addCriterion("finish_time >", value, "finishTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andFinishTimeGreaterThanOrEqualTo(Date value) {
+            addCriterion("finish_time >=", value, "finishTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andFinishTimeLessThan(Date value) {
+            addCriterion("finish_time <", value, "finishTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andFinishTimeLessThanOrEqualTo(Date value) {
+            addCriterion("finish_time <=", value, "finishTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andFinishTimeIn(List<Date> values) {
+            addCriterion("finish_time in", values, "finishTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andFinishTimeNotIn(List<Date> values) {
+            addCriterion("finish_time not in", values, "finishTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andFinishTimeBetween(Date value1, Date value2) {
+            addCriterion("finish_time between", value1, value2, "finishTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andFinishTimeNotBetween(Date value1, Date value2) {
+            addCriterion("finish_time not between", value1, value2, "finishTime");
+            return (Criteria) this;
+        }
+    }
+
+    public static class Criteria extends GeneratedCriteria {
+
+        protected Criteria() {
+            super();
+        }
+    }
+
+    public static class Criterion {
+        private String condition;
+
+        private Object value;
+
+        private Object secondValue;
+
+        private boolean noValue;
+
+        private boolean singleValue;
+
+        private boolean betweenValue;
+
+        private boolean listValue;
+
+        private String typeHandler;
+
+        public String getCondition() {
+            return condition;
+        }
+
+        public Object getValue() {
+            return value;
+        }
+
+        public Object getSecondValue() {
+            return secondValue;
+        }
+
+        public boolean isNoValue() {
+            return noValue;
+        }
+
+        public boolean isSingleValue() {
+            return singleValue;
+        }
+
+        public boolean isBetweenValue() {
+            return betweenValue;
+        }
+
+        public boolean isListValue() {
+            return listValue;
+        }
+
+        public String getTypeHandler() {
+            return typeHandler;
+        }
+
+        protected Criterion(String condition) {
+            super();
+            this.condition = condition;
+            this.typeHandler = null;
+            this.noValue = true;
+        }
+
+        protected Criterion(String condition, Object value, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.typeHandler = typeHandler;
+            if (value instanceof List<?>) {
+                this.listValue = true;
+            } else {
+                this.singleValue = true;
+            }
+        }
+
+        protected Criterion(String condition, Object value) {
+            this(condition, value, null);
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.secondValue = secondValue;
+            this.typeHandler = typeHandler;
+            this.betweenValue = true;
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue) {
+            this(condition, value, secondValue, null);
+        }
+    }
+}
\ No newline at end of file
diff --git a/sdk/dataease-plugin-common/src/main/java/io/dataease/plugins/common/base/domain/PanelLinkTicket.java b/sdk/dataease-plugin-common/src/main/java/io/dataease/plugins/common/base/domain/PanelLinkTicket.java
index 7c6b107faa..b9c5df65e5 100644
--- a/sdk/dataease-plugin-common/src/main/java/io/dataease/plugins/common/base/domain/PanelLinkTicket.java
+++ b/sdk/dataease-plugin-common/src/main/java/io/dataease/plugins/common/base/domain/PanelLinkTicket.java
@@ -15,5 +15,7 @@ public class PanelLinkTicket implements Serializable {
 
     private String args;
 
+    private Long accessTime;
+
     private static final long serialVersionUID = 1L;
 }
\ No newline at end of file
diff --git a/sdk/dataease-plugin-common/src/main/java/io/dataease/plugins/common/base/domain/PanelLinkTicketExample.java b/sdk/dataease-plugin-common/src/main/java/io/dataease/plugins/common/base/domain/PanelLinkTicketExample.java
index d3e3ca9f89..885c9ec082 100644
--- a/sdk/dataease-plugin-common/src/main/java/io/dataease/plugins/common/base/domain/PanelLinkTicketExample.java
+++ b/sdk/dataease-plugin-common/src/main/java/io/dataease/plugins/common/base/domain/PanelLinkTicketExample.java
@@ -433,6 +433,66 @@ public class PanelLinkTicketExample {
             addCriterion("args not between", value1, value2, "args");
             return (Criteria) this;
         }
+
+        public Criteria andAccessTimeIsNull() {
+            addCriterion("access_time is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andAccessTimeIsNotNull() {
+            addCriterion("access_time is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andAccessTimeEqualTo(Long value) {
+            addCriterion("access_time =", value, "accessTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andAccessTimeNotEqualTo(Long value) {
+            addCriterion("access_time <>", value, "accessTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andAccessTimeGreaterThan(Long value) {
+            addCriterion("access_time >", value, "accessTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andAccessTimeGreaterThanOrEqualTo(Long value) {
+            addCriterion("access_time >=", value, "accessTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andAccessTimeLessThan(Long value) {
+            addCriterion("access_time <", value, "accessTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andAccessTimeLessThanOrEqualTo(Long value) {
+            addCriterion("access_time <=", value, "accessTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andAccessTimeIn(List<Long> values) {
+            addCriterion("access_time in", values, "accessTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andAccessTimeNotIn(List<Long> values) {
+            addCriterion("access_time not in", values, "accessTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andAccessTimeBetween(Long value1, Long value2) {
+            addCriterion("access_time between", value1, value2, "accessTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andAccessTimeNotBetween(Long value1, Long value2) {
+            addCriterion("access_time not between", value1, value2, "accessTime");
+            return (Criteria) this;
+        }
     }
 
     public static class Criteria extends GeneratedCriteria {
diff --git a/sdk/dataease-plugin-common/src/main/java/io/dataease/plugins/common/base/mapper/DataFillCommitLogMapper.java b/sdk/dataease-plugin-common/src/main/java/io/dataease/plugins/common/base/mapper/DataFillCommitLogMapper.java
new file mode 100644
index 0000000000..cf0913b134
--- /dev/null
+++ b/sdk/dataease-plugin-common/src/main/java/io/dataease/plugins/common/base/mapper/DataFillCommitLogMapper.java
@@ -0,0 +1,30 @@
+package io.dataease.plugins.common.base.mapper;
+
+import io.dataease.plugins.common.base.domain.DataFillCommitLog;
+import io.dataease.plugins.common.base.domain.DataFillCommitLogExample;
+import java.util.List;
+import org.apache.ibatis.annotations.Param;
+
+public interface DataFillCommitLogMapper {
+    long countByExample(DataFillCommitLogExample example);
+
+    int deleteByExample(DataFillCommitLogExample example);
+
+    int deleteByPrimaryKey(String id);
+
+    int insert(DataFillCommitLog record);
+
+    int insertSelective(DataFillCommitLog record);
+
+    List<DataFillCommitLog> selectByExample(DataFillCommitLogExample example);
+
+    DataFillCommitLog selectByPrimaryKey(String id);
+
+    int updateByExampleSelective(@Param("record") DataFillCommitLog record, @Param("example") DataFillCommitLogExample example);
+
+    int updateByExample(@Param("record") DataFillCommitLog record, @Param("example") DataFillCommitLogExample example);
+
+    int updateByPrimaryKeySelective(DataFillCommitLog record);
+
+    int updateByPrimaryKey(DataFillCommitLog record);
+}
\ No newline at end of file
diff --git a/sdk/dataease-plugin-common/src/main/java/io/dataease/plugins/common/base/mapper/DataFillCommitLogMapper.xml b/sdk/dataease-plugin-common/src/main/java/io/dataease/plugins/common/base/mapper/DataFillCommitLogMapper.xml
new file mode 100644
index 0000000000..ebb4f0675c
--- /dev/null
+++ b/sdk/dataease-plugin-common/src/main/java/io/dataease/plugins/common/base/mapper/DataFillCommitLogMapper.xml
@@ -0,0 +1,228 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="io.dataease.plugins.common.base.mapper.DataFillCommitLogMapper">
+  <resultMap id="BaseResultMap" type="io.dataease.plugins.common.base.domain.DataFillCommitLog">
+    <id column="id" jdbcType="VARCHAR" property="id" />
+    <result column="form_id" jdbcType="VARCHAR" property="formId" />
+    <result column="data_id" jdbcType="VARCHAR" property="dataId" />
+    <result column="operate" jdbcType="VARCHAR" property="operate" />
+    <result column="commit_by" jdbcType="VARCHAR" property="commitBy" />
+    <result column="commit_time" jdbcType="TIMESTAMP" property="commitTime" />
+  </resultMap>
+  <sql id="Example_Where_Clause">
+    <where>
+      <foreach collection="oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Update_By_Example_Where_Clause">
+    <where>
+      <foreach collection="example.oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Base_Column_List">
+    id, form_id, data_id, operate, commit_by, commit_time
+  </sql>
+  <select id="selectByExample" parameterType="io.dataease.plugins.common.base.domain.DataFillCommitLogExample" resultMap="BaseResultMap">
+    select
+    <if test="distinct">
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from data_fill_commit_log
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null">
+      order by ${orderByClause}
+    </if>
+  </select>
+  <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="BaseResultMap">
+    select 
+    <include refid="Base_Column_List" />
+    from data_fill_commit_log
+    where id = #{id,jdbcType=VARCHAR}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
+    delete from data_fill_commit_log
+    where id = #{id,jdbcType=VARCHAR}
+  </delete>
+  <delete id="deleteByExample" parameterType="io.dataease.plugins.common.base.domain.DataFillCommitLogExample">
+    delete from data_fill_commit_log
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="io.dataease.plugins.common.base.domain.DataFillCommitLog">
+    insert into data_fill_commit_log (id, form_id, data_id, 
+      operate, commit_by, commit_time
+      )
+    values (#{id,jdbcType=VARCHAR}, #{formId,jdbcType=VARCHAR}, #{dataId,jdbcType=VARCHAR}, 
+      #{operate,jdbcType=VARCHAR}, #{commitBy,jdbcType=VARCHAR}, #{commitTime,jdbcType=TIMESTAMP}
+      )
+  </insert>
+  <insert id="insertSelective" parameterType="io.dataease.plugins.common.base.domain.DataFillCommitLog">
+    insert into data_fill_commit_log
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        id,
+      </if>
+      <if test="formId != null">
+        form_id,
+      </if>
+      <if test="dataId != null">
+        data_id,
+      </if>
+      <if test="operate != null">
+        operate,
+      </if>
+      <if test="commitBy != null">
+        commit_by,
+      </if>
+      <if test="commitTime != null">
+        commit_time,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        #{id,jdbcType=VARCHAR},
+      </if>
+      <if test="formId != null">
+        #{formId,jdbcType=VARCHAR},
+      </if>
+      <if test="dataId != null">
+        #{dataId,jdbcType=VARCHAR},
+      </if>
+      <if test="operate != null">
+        #{operate,jdbcType=VARCHAR},
+      </if>
+      <if test="commitBy != null">
+        #{commitBy,jdbcType=VARCHAR},
+      </if>
+      <if test="commitTime != null">
+        #{commitTime,jdbcType=TIMESTAMP},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="io.dataease.plugins.common.base.domain.DataFillCommitLogExample" resultType="java.lang.Long">
+    select count(*) from data_fill_commit_log
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <update id="updateByExampleSelective" parameterType="map">
+    update data_fill_commit_log
+    <set>
+      <if test="record.id != null">
+        id = #{record.id,jdbcType=VARCHAR},
+      </if>
+      <if test="record.formId != null">
+        form_id = #{record.formId,jdbcType=VARCHAR},
+      </if>
+      <if test="record.dataId != null">
+        data_id = #{record.dataId,jdbcType=VARCHAR},
+      </if>
+      <if test="record.operate != null">
+        operate = #{record.operate,jdbcType=VARCHAR},
+      </if>
+      <if test="record.commitBy != null">
+        commit_by = #{record.commitBy,jdbcType=VARCHAR},
+      </if>
+      <if test="record.commitTime != null">
+        commit_time = #{record.commitTime,jdbcType=TIMESTAMP},
+      </if>
+    </set>
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExample" parameterType="map">
+    update data_fill_commit_log
+    set id = #{record.id,jdbcType=VARCHAR},
+      form_id = #{record.formId,jdbcType=VARCHAR},
+      data_id = #{record.dataId,jdbcType=VARCHAR},
+      operate = #{record.operate,jdbcType=VARCHAR},
+      commit_by = #{record.commitBy,jdbcType=VARCHAR},
+      commit_time = #{record.commitTime,jdbcType=TIMESTAMP}
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="io.dataease.plugins.common.base.domain.DataFillCommitLog">
+    update data_fill_commit_log
+    <set>
+      <if test="formId != null">
+        form_id = #{formId,jdbcType=VARCHAR},
+      </if>
+      <if test="dataId != null">
+        data_id = #{dataId,jdbcType=VARCHAR},
+      </if>
+      <if test="operate != null">
+        operate = #{operate,jdbcType=VARCHAR},
+      </if>
+      <if test="commitBy != null">
+        commit_by = #{commitBy,jdbcType=VARCHAR},
+      </if>
+      <if test="commitTime != null">
+        commit_time = #{commitTime,jdbcType=TIMESTAMP},
+      </if>
+    </set>
+    where id = #{id,jdbcType=VARCHAR}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="io.dataease.plugins.common.base.domain.DataFillCommitLog">
+    update data_fill_commit_log
+    set form_id = #{formId,jdbcType=VARCHAR},
+      data_id = #{dataId,jdbcType=VARCHAR},
+      operate = #{operate,jdbcType=VARCHAR},
+      commit_by = #{commitBy,jdbcType=VARCHAR},
+      commit_time = #{commitTime,jdbcType=TIMESTAMP}
+    where id = #{id,jdbcType=VARCHAR}
+  </update>
+</mapper>
\ No newline at end of file
diff --git a/sdk/dataease-plugin-common/src/main/java/io/dataease/plugins/common/base/mapper/DataFillFormMapper.java b/sdk/dataease-plugin-common/src/main/java/io/dataease/plugins/common/base/mapper/DataFillFormMapper.java
new file mode 100644
index 0000000000..04055cbb0f
--- /dev/null
+++ b/sdk/dataease-plugin-common/src/main/java/io/dataease/plugins/common/base/mapper/DataFillFormMapper.java
@@ -0,0 +1,37 @@
+package io.dataease.plugins.common.base.mapper;
+
+import io.dataease.plugins.common.base.domain.DataFillForm;
+import io.dataease.plugins.common.base.domain.DataFillFormExample;
+import io.dataease.plugins.common.base.domain.DataFillFormWithBLOBs;
+import java.util.List;
+import org.apache.ibatis.annotations.Param;
+
+public interface DataFillFormMapper {
+    long countByExample(DataFillFormExample example);
+
+    int deleteByExample(DataFillFormExample example);
+
+    int deleteByPrimaryKey(String id);
+
+    int insert(DataFillFormWithBLOBs record);
+
+    int insertSelective(DataFillFormWithBLOBs record);
+
+    List<DataFillFormWithBLOBs> selectByExampleWithBLOBs(DataFillFormExample example);
+
+    List<DataFillForm> selectByExample(DataFillFormExample example);
+
+    DataFillFormWithBLOBs selectByPrimaryKey(String id);
+
+    int updateByExampleSelective(@Param("record") DataFillFormWithBLOBs record, @Param("example") DataFillFormExample example);
+
+    int updateByExampleWithBLOBs(@Param("record") DataFillFormWithBLOBs record, @Param("example") DataFillFormExample example);
+
+    int updateByExample(@Param("record") DataFillForm record, @Param("example") DataFillFormExample example);
+
+    int updateByPrimaryKeySelective(DataFillFormWithBLOBs record);
+
+    int updateByPrimaryKeyWithBLOBs(DataFillFormWithBLOBs record);
+
+    int updateByPrimaryKey(DataFillForm record);
+}
\ No newline at end of file
diff --git a/sdk/dataease-plugin-common/src/main/java/io/dataease/plugins/common/base/mapper/DataFillFormMapper.xml b/sdk/dataease-plugin-common/src/main/java/io/dataease/plugins/common/base/mapper/DataFillFormMapper.xml
new file mode 100644
index 0000000000..dedbd01f7c
--- /dev/null
+++ b/sdk/dataease-plugin-common/src/main/java/io/dataease/plugins/common/base/mapper/DataFillFormMapper.xml
@@ -0,0 +1,409 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="io.dataease.plugins.common.base.mapper.DataFillFormMapper">
+  <resultMap id="BaseResultMap" type="io.dataease.plugins.common.base.domain.DataFillForm">
+    <id column="id" jdbcType="VARCHAR" property="id" />
+    <result column="name" jdbcType="VARCHAR" property="name" />
+    <result column="pid" jdbcType="VARCHAR" property="pid" />
+    <result column="level" jdbcType="INTEGER" property="level" />
+    <result column="node_type" jdbcType="VARCHAR" property="nodeType" />
+    <result column="table_name" jdbcType="VARCHAR" property="tableName" />
+    <result column="datasource" jdbcType="VARCHAR" property="datasource" />
+    <result column="create_index" jdbcType="BIT" property="createIndex" />
+    <result column="create_by" jdbcType="VARCHAR" property="createBy" />
+    <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
+    <result column="update_by" jdbcType="VARCHAR" property="updateBy" />
+    <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
+  </resultMap>
+  <resultMap extends="BaseResultMap" id="ResultMapWithBLOBs" type="io.dataease.plugins.common.base.domain.DataFillFormWithBLOBs">
+    <result column="forms" jdbcType="LONGVARCHAR" property="forms" />
+    <result column="table_indexes" jdbcType="LONGVARCHAR" property="tableIndexes" />
+  </resultMap>
+  <sql id="Example_Where_Clause">
+    <where>
+      <foreach collection="oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Update_By_Example_Where_Clause">
+    <where>
+      <foreach collection="example.oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Base_Column_List">
+    id, `name`, pid, `level`, node_type, `table_name`, datasource, create_index, create_by, 
+    create_time, update_by, update_time
+  </sql>
+  <sql id="Blob_Column_List">
+    forms, table_indexes
+  </sql>
+  <select id="selectByExampleWithBLOBs" parameterType="io.dataease.plugins.common.base.domain.DataFillFormExample" resultMap="ResultMapWithBLOBs">
+    select
+    <if test="distinct">
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    ,
+    <include refid="Blob_Column_List" />
+    from data_fill_form
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null">
+      order by ${orderByClause}
+    </if>
+  </select>
+  <select id="selectByExample" parameterType="io.dataease.plugins.common.base.domain.DataFillFormExample" resultMap="BaseResultMap">
+    select
+    <if test="distinct">
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from data_fill_form
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null">
+      order by ${orderByClause}
+    </if>
+  </select>
+  <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="ResultMapWithBLOBs">
+    select 
+    <include refid="Base_Column_List" />
+    ,
+    <include refid="Blob_Column_List" />
+    from data_fill_form
+    where id = #{id,jdbcType=VARCHAR}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
+    delete from data_fill_form
+    where id = #{id,jdbcType=VARCHAR}
+  </delete>
+  <delete id="deleteByExample" parameterType="io.dataease.plugins.common.base.domain.DataFillFormExample">
+    delete from data_fill_form
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="io.dataease.plugins.common.base.domain.DataFillFormWithBLOBs">
+    insert into data_fill_form (id, `name`, pid, 
+      `level`, node_type, `table_name`, 
+      datasource, create_index, create_by, 
+      create_time, update_by, update_time, 
+      forms, table_indexes)
+    values (#{id,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR}, #{pid,jdbcType=VARCHAR}, 
+      #{level,jdbcType=INTEGER}, #{nodeType,jdbcType=VARCHAR}, #{tableName,jdbcType=VARCHAR}, 
+      #{datasource,jdbcType=VARCHAR}, #{createIndex,jdbcType=BIT}, #{createBy,jdbcType=VARCHAR}, 
+      #{createTime,jdbcType=TIMESTAMP}, #{updateBy,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP}, 
+      #{forms,jdbcType=LONGVARCHAR}, #{tableIndexes,jdbcType=LONGVARCHAR})
+  </insert>
+  <insert id="insertSelective" parameterType="io.dataease.plugins.common.base.domain.DataFillFormWithBLOBs">
+    insert into data_fill_form
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        id,
+      </if>
+      <if test="name != null">
+        `name`,
+      </if>
+      <if test="pid != null">
+        pid,
+      </if>
+      <if test="level != null">
+        `level`,
+      </if>
+      <if test="nodeType != null">
+        node_type,
+      </if>
+      <if test="tableName != null">
+        `table_name`,
+      </if>
+      <if test="datasource != null">
+        datasource,
+      </if>
+      <if test="createIndex != null">
+        create_index,
+      </if>
+      <if test="createBy != null">
+        create_by,
+      </if>
+      <if test="createTime != null">
+        create_time,
+      </if>
+      <if test="updateBy != null">
+        update_by,
+      </if>
+      <if test="updateTime != null">
+        update_time,
+      </if>
+      <if test="forms != null">
+        forms,
+      </if>
+      <if test="tableIndexes != null">
+        table_indexes,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        #{id,jdbcType=VARCHAR},
+      </if>
+      <if test="name != null">
+        #{name,jdbcType=VARCHAR},
+      </if>
+      <if test="pid != null">
+        #{pid,jdbcType=VARCHAR},
+      </if>
+      <if test="level != null">
+        #{level,jdbcType=INTEGER},
+      </if>
+      <if test="nodeType != null">
+        #{nodeType,jdbcType=VARCHAR},
+      </if>
+      <if test="tableName != null">
+        #{tableName,jdbcType=VARCHAR},
+      </if>
+      <if test="datasource != null">
+        #{datasource,jdbcType=VARCHAR},
+      </if>
+      <if test="createIndex != null">
+        #{createIndex,jdbcType=BIT},
+      </if>
+      <if test="createBy != null">
+        #{createBy,jdbcType=VARCHAR},
+      </if>
+      <if test="createTime != null">
+        #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updateBy != null">
+        #{updateBy,jdbcType=VARCHAR},
+      </if>
+      <if test="updateTime != null">
+        #{updateTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="forms != null">
+        #{forms,jdbcType=LONGVARCHAR},
+      </if>
+      <if test="tableIndexes != null">
+        #{tableIndexes,jdbcType=LONGVARCHAR},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="io.dataease.plugins.common.base.domain.DataFillFormExample" resultType="java.lang.Long">
+    select count(*) from data_fill_form
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <update id="updateByExampleSelective" parameterType="map">
+    update data_fill_form
+    <set>
+      <if test="record.id != null">
+        id = #{record.id,jdbcType=VARCHAR},
+      </if>
+      <if test="record.name != null">
+        `name` = #{record.name,jdbcType=VARCHAR},
+      </if>
+      <if test="record.pid != null">
+        pid = #{record.pid,jdbcType=VARCHAR},
+      </if>
+      <if test="record.level != null">
+        `level` = #{record.level,jdbcType=INTEGER},
+      </if>
+      <if test="record.nodeType != null">
+        node_type = #{record.nodeType,jdbcType=VARCHAR},
+      </if>
+      <if test="record.tableName != null">
+        `table_name` = #{record.tableName,jdbcType=VARCHAR},
+      </if>
+      <if test="record.datasource != null">
+        datasource = #{record.datasource,jdbcType=VARCHAR},
+      </if>
+      <if test="record.createIndex != null">
+        create_index = #{record.createIndex,jdbcType=BIT},
+      </if>
+      <if test="record.createBy != null">
+        create_by = #{record.createBy,jdbcType=VARCHAR},
+      </if>
+      <if test="record.createTime != null">
+        create_time = #{record.createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.updateBy != null">
+        update_by = #{record.updateBy,jdbcType=VARCHAR},
+      </if>
+      <if test="record.updateTime != null">
+        update_time = #{record.updateTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.forms != null">
+        forms = #{record.forms,jdbcType=LONGVARCHAR},
+      </if>
+      <if test="record.tableIndexes != null">
+        table_indexes = #{record.tableIndexes,jdbcType=LONGVARCHAR},
+      </if>
+    </set>
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExampleWithBLOBs" parameterType="map">
+    update data_fill_form
+    set id = #{record.id,jdbcType=VARCHAR},
+      `name` = #{record.name,jdbcType=VARCHAR},
+      pid = #{record.pid,jdbcType=VARCHAR},
+      `level` = #{record.level,jdbcType=INTEGER},
+      node_type = #{record.nodeType,jdbcType=VARCHAR},
+      `table_name` = #{record.tableName,jdbcType=VARCHAR},
+      datasource = #{record.datasource,jdbcType=VARCHAR},
+      create_index = #{record.createIndex,jdbcType=BIT},
+      create_by = #{record.createBy,jdbcType=VARCHAR},
+      create_time = #{record.createTime,jdbcType=TIMESTAMP},
+      update_by = #{record.updateBy,jdbcType=VARCHAR},
+      update_time = #{record.updateTime,jdbcType=TIMESTAMP},
+      forms = #{record.forms,jdbcType=LONGVARCHAR},
+      table_indexes = #{record.tableIndexes,jdbcType=LONGVARCHAR}
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExample" parameterType="map">
+    update data_fill_form
+    set id = #{record.id,jdbcType=VARCHAR},
+      `name` = #{record.name,jdbcType=VARCHAR},
+      pid = #{record.pid,jdbcType=VARCHAR},
+      `level` = #{record.level,jdbcType=INTEGER},
+      node_type = #{record.nodeType,jdbcType=VARCHAR},
+      `table_name` = #{record.tableName,jdbcType=VARCHAR},
+      datasource = #{record.datasource,jdbcType=VARCHAR},
+      create_index = #{record.createIndex,jdbcType=BIT},
+      create_by = #{record.createBy,jdbcType=VARCHAR},
+      create_time = #{record.createTime,jdbcType=TIMESTAMP},
+      update_by = #{record.updateBy,jdbcType=VARCHAR},
+      update_time = #{record.updateTime,jdbcType=TIMESTAMP}
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="io.dataease.plugins.common.base.domain.DataFillFormWithBLOBs">
+    update data_fill_form
+    <set>
+      <if test="name != null">
+        `name` = #{name,jdbcType=VARCHAR},
+      </if>
+      <if test="pid != null">
+        pid = #{pid,jdbcType=VARCHAR},
+      </if>
+      <if test="level != null">
+        `level` = #{level,jdbcType=INTEGER},
+      </if>
+      <if test="nodeType != null">
+        node_type = #{nodeType,jdbcType=VARCHAR},
+      </if>
+      <if test="tableName != null">
+        `table_name` = #{tableName,jdbcType=VARCHAR},
+      </if>
+      <if test="datasource != null">
+        datasource = #{datasource,jdbcType=VARCHAR},
+      </if>
+      <if test="createIndex != null">
+        create_index = #{createIndex,jdbcType=BIT},
+      </if>
+      <if test="createBy != null">
+        create_by = #{createBy,jdbcType=VARCHAR},
+      </if>
+      <if test="createTime != null">
+        create_time = #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updateBy != null">
+        update_by = #{updateBy,jdbcType=VARCHAR},
+      </if>
+      <if test="updateTime != null">
+        update_time = #{updateTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="forms != null">
+        forms = #{forms,jdbcType=LONGVARCHAR},
+      </if>
+      <if test="tableIndexes != null">
+        table_indexes = #{tableIndexes,jdbcType=LONGVARCHAR},
+      </if>
+    </set>
+    where id = #{id,jdbcType=VARCHAR}
+  </update>
+  <update id="updateByPrimaryKeyWithBLOBs" parameterType="io.dataease.plugins.common.base.domain.DataFillFormWithBLOBs">
+    update data_fill_form
+    set `name` = #{name,jdbcType=VARCHAR},
+      pid = #{pid,jdbcType=VARCHAR},
+      `level` = #{level,jdbcType=INTEGER},
+      node_type = #{nodeType,jdbcType=VARCHAR},
+      `table_name` = #{tableName,jdbcType=VARCHAR},
+      datasource = #{datasource,jdbcType=VARCHAR},
+      create_index = #{createIndex,jdbcType=BIT},
+      create_by = #{createBy,jdbcType=VARCHAR},
+      create_time = #{createTime,jdbcType=TIMESTAMP},
+      update_by = #{updateBy,jdbcType=VARCHAR},
+      update_time = #{updateTime,jdbcType=TIMESTAMP},
+      forms = #{forms,jdbcType=LONGVARCHAR},
+      table_indexes = #{tableIndexes,jdbcType=LONGVARCHAR}
+    where id = #{id,jdbcType=VARCHAR}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="io.dataease.plugins.common.base.domain.DataFillForm">
+    update data_fill_form
+    set `name` = #{name,jdbcType=VARCHAR},
+      pid = #{pid,jdbcType=VARCHAR},
+      `level` = #{level,jdbcType=INTEGER},
+      node_type = #{nodeType,jdbcType=VARCHAR},
+      `table_name` = #{tableName,jdbcType=VARCHAR},
+      datasource = #{datasource,jdbcType=VARCHAR},
+      create_index = #{createIndex,jdbcType=BIT},
+      create_by = #{createBy,jdbcType=VARCHAR},
+      create_time = #{createTime,jdbcType=TIMESTAMP},
+      update_by = #{updateBy,jdbcType=VARCHAR},
+      update_time = #{updateTime,jdbcType=TIMESTAMP}
+    where id = #{id,jdbcType=VARCHAR}
+  </update>
+</mapper>
\ No newline at end of file
diff --git a/sdk/dataease-plugin-common/src/main/java/io/dataease/plugins/common/base/mapper/DataFillTaskMapper.java b/sdk/dataease-plugin-common/src/main/java/io/dataease/plugins/common/base/mapper/DataFillTaskMapper.java
new file mode 100644
index 0000000000..e35ce10809
--- /dev/null
+++ b/sdk/dataease-plugin-common/src/main/java/io/dataease/plugins/common/base/mapper/DataFillTaskMapper.java
@@ -0,0 +1,37 @@
+package io.dataease.plugins.common.base.mapper;
+
+import io.dataease.plugins.common.base.domain.DataFillTask;
+import io.dataease.plugins.common.base.domain.DataFillTaskExample;
+import io.dataease.plugins.common.base.domain.DataFillTaskWithBLOBs;
+import java.util.List;
+import org.apache.ibatis.annotations.Param;
+
+public interface DataFillTaskMapper {
+    long countByExample(DataFillTaskExample example);
+
+    int deleteByExample(DataFillTaskExample example);
+
+    int deleteByPrimaryKey(Long id);
+
+    int insert(DataFillTaskWithBLOBs record);
+
+    int insertSelective(DataFillTaskWithBLOBs record);
+
+    List<DataFillTaskWithBLOBs> selectByExampleWithBLOBs(DataFillTaskExample example);
+
+    List<DataFillTask> selectByExample(DataFillTaskExample example);
+
+    DataFillTaskWithBLOBs selectByPrimaryKey(Long id);
+
+    int updateByExampleSelective(@Param("record") DataFillTaskWithBLOBs record, @Param("example") DataFillTaskExample example);
+
+    int updateByExampleWithBLOBs(@Param("record") DataFillTaskWithBLOBs record, @Param("example") DataFillTaskExample example);
+
+    int updateByExample(@Param("record") DataFillTask record, @Param("example") DataFillTaskExample example);
+
+    int updateByPrimaryKeySelective(DataFillTaskWithBLOBs record);
+
+    int updateByPrimaryKeyWithBLOBs(DataFillTaskWithBLOBs record);
+
+    int updateByPrimaryKey(DataFillTask record);
+}
\ No newline at end of file
diff --git a/sdk/dataease-plugin-common/src/main/java/io/dataease/plugins/common/base/mapper/DataFillTaskMapper.xml b/sdk/dataease-plugin-common/src/main/java/io/dataease/plugins/common/base/mapper/DataFillTaskMapper.xml
new file mode 100644
index 0000000000..7696cef042
--- /dev/null
+++ b/sdk/dataease-plugin-common/src/main/java/io/dataease/plugins/common/base/mapper/DataFillTaskMapper.xml
@@ -0,0 +1,455 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="io.dataease.plugins.common.base.mapper.DataFillTaskMapper">
+  <resultMap id="BaseResultMap" type="io.dataease.plugins.common.base.domain.DataFillTask">
+    <id column="id" jdbcType="BIGINT" property="id" />
+    <result column="name" jdbcType="VARCHAR" property="name" />
+    <result column="form_id" jdbcType="VARCHAR" property="formId" />
+    <result column="start_time" jdbcType="TIMESTAMP" property="startTime" />
+    <result column="end_time" jdbcType="TIMESTAMP" property="endTime" />
+    <result column="rate_type" jdbcType="INTEGER" property="rateType" />
+    <result column="rate_val" jdbcType="VARCHAR" property="rateVal" />
+    <result column="publish_start_time" jdbcType="TIMESTAMP" property="publishStartTime" />
+    <result column="publish_end_time" jdbcType="TIMESTAMP" property="publishEndTime" />
+    <result column="publish_range_time_type" jdbcType="INTEGER" property="publishRangeTimeType" />
+    <result column="publish_range_time" jdbcType="INTEGER" property="publishRangeTime" />
+    <result column="creator" jdbcType="BIGINT" property="creator" />
+    <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
+    <result column="status" jdbcType="BIT" property="status" />
+  </resultMap>
+  <resultMap extends="BaseResultMap" id="ResultMapWithBLOBs" type="io.dataease.plugins.common.base.domain.DataFillTaskWithBLOBs">
+    <result column="reci_users" jdbcType="LONGVARCHAR" property="reciUsers" />
+    <result column="role_list" jdbcType="LONGVARCHAR" property="roleList" />
+    <result column="org_list" jdbcType="LONGVARCHAR" property="orgList" />
+  </resultMap>
+  <sql id="Example_Where_Clause">
+    <where>
+      <foreach collection="oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Update_By_Example_Where_Clause">
+    <where>
+      <foreach collection="example.oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Base_Column_List">
+    id, `name`, form_id, start_time, end_time, rate_type, rate_val, publish_start_time, 
+    publish_end_time, publish_range_time_type, publish_range_time, creator, create_time, 
+    `status`
+  </sql>
+  <sql id="Blob_Column_List">
+    reci_users, role_list, org_list
+  </sql>
+  <select id="selectByExampleWithBLOBs" parameterType="io.dataease.plugins.common.base.domain.DataFillTaskExample" resultMap="ResultMapWithBLOBs">
+    select
+    <if test="distinct">
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    ,
+    <include refid="Blob_Column_List" />
+    from data_fill_task
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null">
+      order by ${orderByClause}
+    </if>
+  </select>
+  <select id="selectByExample" parameterType="io.dataease.plugins.common.base.domain.DataFillTaskExample" resultMap="BaseResultMap">
+    select
+    <if test="distinct">
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from data_fill_task
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null">
+      order by ${orderByClause}
+    </if>
+  </select>
+  <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="ResultMapWithBLOBs">
+    select 
+    <include refid="Base_Column_List" />
+    ,
+    <include refid="Blob_Column_List" />
+    from data_fill_task
+    where id = #{id,jdbcType=BIGINT}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
+    delete from data_fill_task
+    where id = #{id,jdbcType=BIGINT}
+  </delete>
+  <delete id="deleteByExample" parameterType="io.dataease.plugins.common.base.domain.DataFillTaskExample">
+    delete from data_fill_task
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" keyColumn="id" keyProperty="id" parameterType="io.dataease.plugins.common.base.domain.DataFillTaskWithBLOBs" useGeneratedKeys="true">
+    insert into data_fill_task (`name`, form_id, start_time, 
+      end_time, rate_type, rate_val, 
+      publish_start_time, publish_end_time, publish_range_time_type, 
+      publish_range_time, creator, create_time, 
+      `status`, reci_users, role_list, 
+      org_list)
+    values (#{name,jdbcType=VARCHAR}, #{formId,jdbcType=VARCHAR}, #{startTime,jdbcType=TIMESTAMP}, 
+      #{endTime,jdbcType=TIMESTAMP}, #{rateType,jdbcType=INTEGER}, #{rateVal,jdbcType=VARCHAR}, 
+      #{publishStartTime,jdbcType=TIMESTAMP}, #{publishEndTime,jdbcType=TIMESTAMP}, #{publishRangeTimeType,jdbcType=INTEGER}, 
+      #{publishRangeTime,jdbcType=INTEGER}, #{creator,jdbcType=BIGINT}, #{createTime,jdbcType=TIMESTAMP}, 
+      #{status,jdbcType=BIT}, #{reciUsers,jdbcType=LONGVARCHAR}, #{roleList,jdbcType=LONGVARCHAR}, 
+      #{orgList,jdbcType=LONGVARCHAR})
+  </insert>
+  <insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="io.dataease.plugins.common.base.domain.DataFillTaskWithBLOBs" useGeneratedKeys="true">
+    insert into data_fill_task
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="name != null">
+        `name`,
+      </if>
+      <if test="formId != null">
+        form_id,
+      </if>
+      <if test="startTime != null">
+        start_time,
+      </if>
+      <if test="endTime != null">
+        end_time,
+      </if>
+      <if test="rateType != null">
+        rate_type,
+      </if>
+      <if test="rateVal != null">
+        rate_val,
+      </if>
+      <if test="publishStartTime != null">
+        publish_start_time,
+      </if>
+      <if test="publishEndTime != null">
+        publish_end_time,
+      </if>
+      <if test="publishRangeTimeType != null">
+        publish_range_time_type,
+      </if>
+      <if test="publishRangeTime != null">
+        publish_range_time,
+      </if>
+      <if test="creator != null">
+        creator,
+      </if>
+      <if test="createTime != null">
+        create_time,
+      </if>
+      <if test="status != null">
+        `status`,
+      </if>
+      <if test="reciUsers != null">
+        reci_users,
+      </if>
+      <if test="roleList != null">
+        role_list,
+      </if>
+      <if test="orgList != null">
+        org_list,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="name != null">
+        #{name,jdbcType=VARCHAR},
+      </if>
+      <if test="formId != null">
+        #{formId,jdbcType=VARCHAR},
+      </if>
+      <if test="startTime != null">
+        #{startTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="endTime != null">
+        #{endTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="rateType != null">
+        #{rateType,jdbcType=INTEGER},
+      </if>
+      <if test="rateVal != null">
+        #{rateVal,jdbcType=VARCHAR},
+      </if>
+      <if test="publishStartTime != null">
+        #{publishStartTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="publishEndTime != null">
+        #{publishEndTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="publishRangeTimeType != null">
+        #{publishRangeTimeType,jdbcType=INTEGER},
+      </if>
+      <if test="publishRangeTime != null">
+        #{publishRangeTime,jdbcType=INTEGER},
+      </if>
+      <if test="creator != null">
+        #{creator,jdbcType=BIGINT},
+      </if>
+      <if test="createTime != null">
+        #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="status != null">
+        #{status,jdbcType=BIT},
+      </if>
+      <if test="reciUsers != null">
+        #{reciUsers,jdbcType=LONGVARCHAR},
+      </if>
+      <if test="roleList != null">
+        #{roleList,jdbcType=LONGVARCHAR},
+      </if>
+      <if test="orgList != null">
+        #{orgList,jdbcType=LONGVARCHAR},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="io.dataease.plugins.common.base.domain.DataFillTaskExample" resultType="java.lang.Long">
+    select count(*) from data_fill_task
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <update id="updateByExampleSelective" parameterType="map">
+    update data_fill_task
+    <set>
+      <if test="record.id != null">
+        id = #{record.id,jdbcType=BIGINT},
+      </if>
+      <if test="record.name != null">
+        `name` = #{record.name,jdbcType=VARCHAR},
+      </if>
+      <if test="record.formId != null">
+        form_id = #{record.formId,jdbcType=VARCHAR},
+      </if>
+      <if test="record.startTime != null">
+        start_time = #{record.startTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.endTime != null">
+        end_time = #{record.endTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.rateType != null">
+        rate_type = #{record.rateType,jdbcType=INTEGER},
+      </if>
+      <if test="record.rateVal != null">
+        rate_val = #{record.rateVal,jdbcType=VARCHAR},
+      </if>
+      <if test="record.publishStartTime != null">
+        publish_start_time = #{record.publishStartTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.publishEndTime != null">
+        publish_end_time = #{record.publishEndTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.publishRangeTimeType != null">
+        publish_range_time_type = #{record.publishRangeTimeType,jdbcType=INTEGER},
+      </if>
+      <if test="record.publishRangeTime != null">
+        publish_range_time = #{record.publishRangeTime,jdbcType=INTEGER},
+      </if>
+      <if test="record.creator != null">
+        creator = #{record.creator,jdbcType=BIGINT},
+      </if>
+      <if test="record.createTime != null">
+        create_time = #{record.createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.status != null">
+        `status` = #{record.status,jdbcType=BIT},
+      </if>
+      <if test="record.reciUsers != null">
+        reci_users = #{record.reciUsers,jdbcType=LONGVARCHAR},
+      </if>
+      <if test="record.roleList != null">
+        role_list = #{record.roleList,jdbcType=LONGVARCHAR},
+      </if>
+      <if test="record.orgList != null">
+        org_list = #{record.orgList,jdbcType=LONGVARCHAR},
+      </if>
+    </set>
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExampleWithBLOBs" parameterType="map">
+    update data_fill_task
+    set id = #{record.id,jdbcType=BIGINT},
+      `name` = #{record.name,jdbcType=VARCHAR},
+      form_id = #{record.formId,jdbcType=VARCHAR},
+      start_time = #{record.startTime,jdbcType=TIMESTAMP},
+      end_time = #{record.endTime,jdbcType=TIMESTAMP},
+      rate_type = #{record.rateType,jdbcType=INTEGER},
+      rate_val = #{record.rateVal,jdbcType=VARCHAR},
+      publish_start_time = #{record.publishStartTime,jdbcType=TIMESTAMP},
+      publish_end_time = #{record.publishEndTime,jdbcType=TIMESTAMP},
+      publish_range_time_type = #{record.publishRangeTimeType,jdbcType=INTEGER},
+      publish_range_time = #{record.publishRangeTime,jdbcType=INTEGER},
+      creator = #{record.creator,jdbcType=BIGINT},
+      create_time = #{record.createTime,jdbcType=TIMESTAMP},
+      `status` = #{record.status,jdbcType=BIT},
+      reci_users = #{record.reciUsers,jdbcType=LONGVARCHAR},
+      role_list = #{record.roleList,jdbcType=LONGVARCHAR},
+      org_list = #{record.orgList,jdbcType=LONGVARCHAR}
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExample" parameterType="map">
+    update data_fill_task
+    set id = #{record.id,jdbcType=BIGINT},
+      `name` = #{record.name,jdbcType=VARCHAR},
+      form_id = #{record.formId,jdbcType=VARCHAR},
+      start_time = #{record.startTime,jdbcType=TIMESTAMP},
+      end_time = #{record.endTime,jdbcType=TIMESTAMP},
+      rate_type = #{record.rateType,jdbcType=INTEGER},
+      rate_val = #{record.rateVal,jdbcType=VARCHAR},
+      publish_start_time = #{record.publishStartTime,jdbcType=TIMESTAMP},
+      publish_end_time = #{record.publishEndTime,jdbcType=TIMESTAMP},
+      publish_range_time_type = #{record.publishRangeTimeType,jdbcType=INTEGER},
+      publish_range_time = #{record.publishRangeTime,jdbcType=INTEGER},
+      creator = #{record.creator,jdbcType=BIGINT},
+      create_time = #{record.createTime,jdbcType=TIMESTAMP},
+      `status` = #{record.status,jdbcType=BIT}
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="io.dataease.plugins.common.base.domain.DataFillTaskWithBLOBs">
+    update data_fill_task
+    <set>
+      <if test="name != null">
+        `name` = #{name,jdbcType=VARCHAR},
+      </if>
+      <if test="formId != null">
+        form_id = #{formId,jdbcType=VARCHAR},
+      </if>
+      <if test="startTime != null">
+        start_time = #{startTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="endTime != null">
+        end_time = #{endTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="rateType != null">
+        rate_type = #{rateType,jdbcType=INTEGER},
+      </if>
+      <if test="rateVal != null">
+        rate_val = #{rateVal,jdbcType=VARCHAR},
+      </if>
+      <if test="publishStartTime != null">
+        publish_start_time = #{publishStartTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="publishEndTime != null">
+        publish_end_time = #{publishEndTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="publishRangeTimeType != null">
+        publish_range_time_type = #{publishRangeTimeType,jdbcType=INTEGER},
+      </if>
+      <if test="publishRangeTime != null">
+        publish_range_time = #{publishRangeTime,jdbcType=INTEGER},
+      </if>
+      <if test="creator != null">
+        creator = #{creator,jdbcType=BIGINT},
+      </if>
+      <if test="createTime != null">
+        create_time = #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="status != null">
+        `status` = #{status,jdbcType=BIT},
+      </if>
+      <if test="reciUsers != null">
+        reci_users = #{reciUsers,jdbcType=LONGVARCHAR},
+      </if>
+      <if test="roleList != null">
+        role_list = #{roleList,jdbcType=LONGVARCHAR},
+      </if>
+      <if test="orgList != null">
+        org_list = #{orgList,jdbcType=LONGVARCHAR},
+      </if>
+    </set>
+    where id = #{id,jdbcType=BIGINT}
+  </update>
+  <update id="updateByPrimaryKeyWithBLOBs" parameterType="io.dataease.plugins.common.base.domain.DataFillTaskWithBLOBs">
+    update data_fill_task
+    set `name` = #{name,jdbcType=VARCHAR},
+      form_id = #{formId,jdbcType=VARCHAR},
+      start_time = #{startTime,jdbcType=TIMESTAMP},
+      end_time = #{endTime,jdbcType=TIMESTAMP},
+      rate_type = #{rateType,jdbcType=INTEGER},
+      rate_val = #{rateVal,jdbcType=VARCHAR},
+      publish_start_time = #{publishStartTime,jdbcType=TIMESTAMP},
+      publish_end_time = #{publishEndTime,jdbcType=TIMESTAMP},
+      publish_range_time_type = #{publishRangeTimeType,jdbcType=INTEGER},
+      publish_range_time = #{publishRangeTime,jdbcType=INTEGER},
+      creator = #{creator,jdbcType=BIGINT},
+      create_time = #{createTime,jdbcType=TIMESTAMP},
+      `status` = #{status,jdbcType=BIT},
+      reci_users = #{reciUsers,jdbcType=LONGVARCHAR},
+      role_list = #{roleList,jdbcType=LONGVARCHAR},
+      org_list = #{orgList,jdbcType=LONGVARCHAR}
+    where id = #{id,jdbcType=BIGINT}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="io.dataease.plugins.common.base.domain.DataFillTask">
+    update data_fill_task
+    set `name` = #{name,jdbcType=VARCHAR},
+      form_id = #{formId,jdbcType=VARCHAR},
+      start_time = #{startTime,jdbcType=TIMESTAMP},
+      end_time = #{endTime,jdbcType=TIMESTAMP},
+      rate_type = #{rateType,jdbcType=INTEGER},
+      rate_val = #{rateVal,jdbcType=VARCHAR},
+      publish_start_time = #{publishStartTime,jdbcType=TIMESTAMP},
+      publish_end_time = #{publishEndTime,jdbcType=TIMESTAMP},
+      publish_range_time_type = #{publishRangeTimeType,jdbcType=INTEGER},
+      publish_range_time = #{publishRangeTime,jdbcType=INTEGER},
+      creator = #{creator,jdbcType=BIGINT},
+      create_time = #{createTime,jdbcType=TIMESTAMP},
+      `status` = #{status,jdbcType=BIT}
+    where id = #{id,jdbcType=BIGINT}
+  </update>
+</mapper>
\ No newline at end of file
diff --git a/sdk/dataease-plugin-common/src/main/java/io/dataease/plugins/common/base/mapper/DataFillUserTaskMapper.java b/sdk/dataease-plugin-common/src/main/java/io/dataease/plugins/common/base/mapper/DataFillUserTaskMapper.java
new file mode 100644
index 0000000000..aee33f63a9
--- /dev/null
+++ b/sdk/dataease-plugin-common/src/main/java/io/dataease/plugins/common/base/mapper/DataFillUserTaskMapper.java
@@ -0,0 +1,30 @@
+package io.dataease.plugins.common.base.mapper;
+
+import io.dataease.plugins.common.base.domain.DataFillUserTask;
+import io.dataease.plugins.common.base.domain.DataFillUserTaskExample;
+import java.util.List;
+import org.apache.ibatis.annotations.Param;
+
+public interface DataFillUserTaskMapper {
+    long countByExample(DataFillUserTaskExample example);
+
+    int deleteByExample(DataFillUserTaskExample example);
+
+    int deleteByPrimaryKey(String id);
+
+    int insert(DataFillUserTask record);
+
+    int insertSelective(DataFillUserTask record);
+
+    List<DataFillUserTask> selectByExample(DataFillUserTaskExample example);
+
+    DataFillUserTask selectByPrimaryKey(String id);
+
+    int updateByExampleSelective(@Param("record") DataFillUserTask record, @Param("example") DataFillUserTaskExample example);
+
+    int updateByExample(@Param("record") DataFillUserTask record, @Param("example") DataFillUserTaskExample example);
+
+    int updateByPrimaryKeySelective(DataFillUserTask record);
+
+    int updateByPrimaryKey(DataFillUserTask record);
+}
\ No newline at end of file
diff --git a/sdk/dataease-plugin-common/src/main/java/io/dataease/plugins/common/base/mapper/DataFillUserTaskMapper.xml b/sdk/dataease-plugin-common/src/main/java/io/dataease/plugins/common/base/mapper/DataFillUserTaskMapper.xml
new file mode 100644
index 0000000000..bbbe978a67
--- /dev/null
+++ b/sdk/dataease-plugin-common/src/main/java/io/dataease/plugins/common/base/mapper/DataFillUserTaskMapper.xml
@@ -0,0 +1,258 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="io.dataease.plugins.common.base.mapper.DataFillUserTaskMapper">
+  <resultMap id="BaseResultMap" type="io.dataease.plugins.common.base.domain.DataFillUserTask">
+    <id column="id" jdbcType="VARCHAR" property="id" />
+    <result column="task_id" jdbcType="BIGINT" property="taskId" />
+    <result column="form_id" jdbcType="VARCHAR" property="formId" />
+    <result column="value_id" jdbcType="VARCHAR" property="valueId" />
+    <result column="user" jdbcType="BIGINT" property="user" />
+    <result column="start_time" jdbcType="TIMESTAMP" property="startTime" />
+    <result column="end_time" jdbcType="TIMESTAMP" property="endTime" />
+    <result column="finish_time" jdbcType="TIMESTAMP" property="finishTime" />
+  </resultMap>
+  <sql id="Example_Where_Clause">
+    <where>
+      <foreach collection="oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Update_By_Example_Where_Clause">
+    <where>
+      <foreach collection="example.oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Base_Column_List">
+    id, task_id, form_id, value_id, `user`, start_time, end_time, finish_time
+  </sql>
+  <select id="selectByExample" parameterType="io.dataease.plugins.common.base.domain.DataFillUserTaskExample" resultMap="BaseResultMap">
+    select
+    <if test="distinct">
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from data_fill_user_task
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null">
+      order by ${orderByClause}
+    </if>
+  </select>
+  <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="BaseResultMap">
+    select 
+    <include refid="Base_Column_List" />
+    from data_fill_user_task
+    where id = #{id,jdbcType=VARCHAR}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
+    delete from data_fill_user_task
+    where id = #{id,jdbcType=VARCHAR}
+  </delete>
+  <delete id="deleteByExample" parameterType="io.dataease.plugins.common.base.domain.DataFillUserTaskExample">
+    delete from data_fill_user_task
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="io.dataease.plugins.common.base.domain.DataFillUserTask">
+    insert into data_fill_user_task (id, task_id, form_id, 
+      value_id, `user`, start_time, 
+      end_time, finish_time)
+    values (#{id,jdbcType=VARCHAR}, #{taskId,jdbcType=BIGINT}, #{formId,jdbcType=VARCHAR}, 
+      #{valueId,jdbcType=VARCHAR}, #{user,jdbcType=BIGINT}, #{startTime,jdbcType=TIMESTAMP}, 
+      #{endTime,jdbcType=TIMESTAMP}, #{finishTime,jdbcType=TIMESTAMP})
+  </insert>
+  <insert id="insertSelective" parameterType="io.dataease.plugins.common.base.domain.DataFillUserTask">
+    insert into data_fill_user_task
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        id,
+      </if>
+      <if test="taskId != null">
+        task_id,
+      </if>
+      <if test="formId != null">
+        form_id,
+      </if>
+      <if test="valueId != null">
+        value_id,
+      </if>
+      <if test="user != null">
+        `user`,
+      </if>
+      <if test="startTime != null">
+        start_time,
+      </if>
+      <if test="endTime != null">
+        end_time,
+      </if>
+      <if test="finishTime != null">
+        finish_time,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        #{id,jdbcType=VARCHAR},
+      </if>
+      <if test="taskId != null">
+        #{taskId,jdbcType=BIGINT},
+      </if>
+      <if test="formId != null">
+        #{formId,jdbcType=VARCHAR},
+      </if>
+      <if test="valueId != null">
+        #{valueId,jdbcType=VARCHAR},
+      </if>
+      <if test="user != null">
+        #{user,jdbcType=BIGINT},
+      </if>
+      <if test="startTime != null">
+        #{startTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="endTime != null">
+        #{endTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="finishTime != null">
+        #{finishTime,jdbcType=TIMESTAMP},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="io.dataease.plugins.common.base.domain.DataFillUserTaskExample" resultType="java.lang.Long">
+    select count(*) from data_fill_user_task
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <update id="updateByExampleSelective" parameterType="map">
+    update data_fill_user_task
+    <set>
+      <if test="record.id != null">
+        id = #{record.id,jdbcType=VARCHAR},
+      </if>
+      <if test="record.taskId != null">
+        task_id = #{record.taskId,jdbcType=BIGINT},
+      </if>
+      <if test="record.formId != null">
+        form_id = #{record.formId,jdbcType=VARCHAR},
+      </if>
+      <if test="record.valueId != null">
+        value_id = #{record.valueId,jdbcType=VARCHAR},
+      </if>
+      <if test="record.user != null">
+        `user` = #{record.user,jdbcType=BIGINT},
+      </if>
+      <if test="record.startTime != null">
+        start_time = #{record.startTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.endTime != null">
+        end_time = #{record.endTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.finishTime != null">
+        finish_time = #{record.finishTime,jdbcType=TIMESTAMP},
+      </if>
+    </set>
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExample" parameterType="map">
+    update data_fill_user_task
+    set id = #{record.id,jdbcType=VARCHAR},
+      task_id = #{record.taskId,jdbcType=BIGINT},
+      form_id = #{record.formId,jdbcType=VARCHAR},
+      value_id = #{record.valueId,jdbcType=VARCHAR},
+      `user` = #{record.user,jdbcType=BIGINT},
+      start_time = #{record.startTime,jdbcType=TIMESTAMP},
+      end_time = #{record.endTime,jdbcType=TIMESTAMP},
+      finish_time = #{record.finishTime,jdbcType=TIMESTAMP}
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="io.dataease.plugins.common.base.domain.DataFillUserTask">
+    update data_fill_user_task
+    <set>
+      <if test="taskId != null">
+        task_id = #{taskId,jdbcType=BIGINT},
+      </if>
+      <if test="formId != null">
+        form_id = #{formId,jdbcType=VARCHAR},
+      </if>
+      <if test="valueId != null">
+        value_id = #{valueId,jdbcType=VARCHAR},
+      </if>
+      <if test="user != null">
+        `user` = #{user,jdbcType=BIGINT},
+      </if>
+      <if test="startTime != null">
+        start_time = #{startTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="endTime != null">
+        end_time = #{endTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="finishTime != null">
+        finish_time = #{finishTime,jdbcType=TIMESTAMP},
+      </if>
+    </set>
+    where id = #{id,jdbcType=VARCHAR}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="io.dataease.plugins.common.base.domain.DataFillUserTask">
+    update data_fill_user_task
+    set task_id = #{taskId,jdbcType=BIGINT},
+      form_id = #{formId,jdbcType=VARCHAR},
+      value_id = #{valueId,jdbcType=VARCHAR},
+      `user` = #{user,jdbcType=BIGINT},
+      start_time = #{startTime,jdbcType=TIMESTAMP},
+      end_time = #{endTime,jdbcType=TIMESTAMP},
+      finish_time = #{finishTime,jdbcType=TIMESTAMP}
+    where id = #{id,jdbcType=VARCHAR}
+  </update>
+</mapper>
\ No newline at end of file
diff --git a/sdk/dataease-plugin-common/src/main/java/io/dataease/plugins/common/base/mapper/PanelLinkTicketMapper.xml b/sdk/dataease-plugin-common/src/main/java/io/dataease/plugins/common/base/mapper/PanelLinkTicketMapper.xml
index 2befbb5e8a..f4443d9c57 100644
--- a/sdk/dataease-plugin-common/src/main/java/io/dataease/plugins/common/base/mapper/PanelLinkTicketMapper.xml
+++ b/sdk/dataease-plugin-common/src/main/java/io/dataease/plugins/common/base/mapper/PanelLinkTicketMapper.xml
@@ -7,6 +7,7 @@
     <result column="ticket" jdbcType="VARCHAR" property="ticket" />
     <result column="exp" jdbcType="BIGINT" property="exp" />
     <result column="args" jdbcType="VARCHAR" property="args" />
+    <result column="access_time" jdbcType="BIGINT" property="accessTime" />
   </resultMap>
   <sql id="Example_Where_Clause">
     <where>
@@ -67,7 +68,7 @@
     </where>
   </sql>
   <sql id="Base_Column_List">
-    id, uuid, ticket, `exp`, args
+    id, uuid, ticket, `exp`, args, access_time
   </sql>
   <select id="selectByExample" parameterType="io.dataease.plugins.common.base.domain.PanelLinkTicketExample" resultMap="BaseResultMap">
     select
@@ -101,9 +102,11 @@
   </delete>
   <insert id="insert" parameterType="io.dataease.plugins.common.base.domain.PanelLinkTicket">
     insert into panel_link_ticket (id, uuid, ticket, 
-      `exp`, args)
+      `exp`, args, access_time
+      )
     values (#{id,jdbcType=BIGINT}, #{uuid,jdbcType=VARCHAR}, #{ticket,jdbcType=VARCHAR}, 
-      #{exp,jdbcType=BIGINT}, #{args,jdbcType=VARCHAR})
+      #{exp,jdbcType=BIGINT}, #{args,jdbcType=VARCHAR}, #{accessTime,jdbcType=BIGINT}
+      )
   </insert>
   <insert id="insertSelective" parameterType="io.dataease.plugins.common.base.domain.PanelLinkTicket">
     insert into panel_link_ticket
@@ -123,6 +126,9 @@
       <if test="args != null">
         args,
       </if>
+      <if test="accessTime != null">
+        access_time,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="id != null">
@@ -140,6 +146,9 @@
       <if test="args != null">
         #{args,jdbcType=VARCHAR},
       </if>
+      <if test="accessTime != null">
+        #{accessTime,jdbcType=BIGINT},
+      </if>
     </trim>
   </insert>
   <select id="countByExample" parameterType="io.dataease.plugins.common.base.domain.PanelLinkTicketExample" resultType="java.lang.Long">
@@ -166,6 +175,9 @@
       <if test="record.args != null">
         args = #{record.args,jdbcType=VARCHAR},
       </if>
+      <if test="record.accessTime != null">
+        access_time = #{record.accessTime,jdbcType=BIGINT},
+      </if>
     </set>
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -177,7 +189,8 @@
       uuid = #{record.uuid,jdbcType=VARCHAR},
       ticket = #{record.ticket,jdbcType=VARCHAR},
       `exp` = #{record.exp,jdbcType=BIGINT},
-      args = #{record.args,jdbcType=VARCHAR}
+      args = #{record.args,jdbcType=VARCHAR},
+      access_time = #{record.accessTime,jdbcType=BIGINT}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -197,6 +210,9 @@
       <if test="args != null">
         args = #{args,jdbcType=VARCHAR},
       </if>
+      <if test="accessTime != null">
+        access_time = #{accessTime,jdbcType=BIGINT},
+      </if>
     </set>
     where id = #{id,jdbcType=BIGINT}
   </update>
@@ -205,7 +221,8 @@
     set uuid = #{uuid,jdbcType=VARCHAR},
       ticket = #{ticket,jdbcType=VARCHAR},
       `exp` = #{exp,jdbcType=BIGINT},
-      args = #{args,jdbcType=VARCHAR}
+      args = #{args,jdbcType=VARCHAR},
+      access_time = #{accessTime,jdbcType=BIGINT}
     where id = #{id,jdbcType=BIGINT}
   </update>
 </mapper>
\ No newline at end of file
diff --git a/sdk/dataease-plugin-common/src/main/java/io/dataease/plugins/common/dto/PluginSysMenu.java b/sdk/dataease-plugin-common/src/main/java/io/dataease/plugins/common/dto/PluginSysMenu.java
index 25b58a4398..16dd2744ef 100644
--- a/sdk/dataease-plugin-common/src/main/java/io/dataease/plugins/common/dto/PluginSysMenu.java
+++ b/sdk/dataease-plugin-common/src/main/java/io/dataease/plugins/common/dto/PluginSysMenu.java
@@ -45,6 +45,8 @@ public class PluginSysMenu {
 
     private boolean noLayout;
 
+    private boolean useBasicResource;
+
     private static final long serialVersionUID = 1L;
 
     /**
diff --git a/sdk/dataease-plugin-common/src/main/java/io/dataease/plugins/common/dto/datafill/ExtIndexField.java b/sdk/dataease-plugin-common/src/main/java/io/dataease/plugins/common/dto/datafill/ExtIndexField.java
new file mode 100644
index 0000000000..12ae053f4d
--- /dev/null
+++ b/sdk/dataease-plugin-common/src/main/java/io/dataease/plugins/common/dto/datafill/ExtIndexField.java
@@ -0,0 +1,30 @@
+package io.dataease.plugins.common.dto.datafill;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.util.List;
+
+@Data
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+public class ExtIndexField implements Serializable {
+    private static final long serialVersionUID = -3169849285437114316L;
+
+    private String name;
+
+    private List<ColumnSetting> columns;
+
+    @Data
+    @Builder
+    @AllArgsConstructor
+    @NoArgsConstructor
+    public static class ColumnSetting {
+        private String column;
+        private String order;
+    }
+}
diff --git a/sdk/dataease-plugin-common/src/main/java/io/dataease/plugins/common/dto/datafill/ExtTableField.java b/sdk/dataease-plugin-common/src/main/java/io/dataease/plugins/common/dto/datafill/ExtTableField.java
new file mode 100644
index 0000000000..d4b836790f
--- /dev/null
+++ b/sdk/dataease-plugin-common/src/main/java/io/dataease/plugins/common/dto/datafill/ExtTableField.java
@@ -0,0 +1,123 @@
+package io.dataease.plugins.common.dto.datafill;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.util.List;
+
+@Data
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+public class ExtTableField implements Serializable {
+    private static final long serialVersionUID = 9021129395822053871L;
+
+    private String type;
+
+    private String typeName;
+
+    private String icon;
+
+    private String id;
+
+    private ExtTableFieldSetting settings;
+
+    @Data
+    @Builder
+    @AllArgsConstructor
+    @NoArgsConstructor
+    public static class ExtTableFieldSetting {
+
+        private String name;
+
+        private boolean required;
+
+        private ExtTableFieldMapping mapping;
+
+        private boolean enableTime;
+
+        private String rangeSeparator;
+
+        private boolean unique;
+
+        private String inputType;
+
+        private String placeholder;
+        private String startPlaceholder;
+        private String endPlaceholder;
+
+        private Integer optionSourceType;
+
+        private boolean multiple;
+
+        private List<Option> options;
+    }
+
+    @Data
+    @Builder
+    @AllArgsConstructor
+    @NoArgsConstructor
+    public static class Option {
+
+        private String name;
+
+        private Object value;
+    }
+
+    @Data
+    @Builder
+    @AllArgsConstructor
+    @NoArgsConstructor
+    public static class ExtTableFieldMapping {
+
+        private String columnName;
+
+        //dateRange下对应两个字段
+        private String columnName1;
+        private String columnName2;
+
+        private BaseType type;
+
+        //长度
+        private Integer size;
+        //精度
+        private Integer accuracy;
+
+    }
+
+    public enum BaseType {
+        nvarchar, //字符串
+        text, //长文本
+        number, //整型数字
+        decimal, //小数数字
+        datetime //日期
+    }
+
+
+    @Data
+    @Builder
+    @AllArgsConstructor
+    @NoArgsConstructor
+    public static class TableField {
+
+        private String columnName;
+
+        private BaseType type;
+
+        private boolean required;
+
+        private boolean primaryKey;
+
+        //长度
+        private Integer size;
+        //精度
+        private Integer accuracy;
+
+        private String comment;
+
+    }
+
+}
diff --git a/sdk/dataease-plugin-common/src/main/java/io/dataease/plugins/common/dto/datasource/TableField.java b/sdk/dataease-plugin-common/src/main/java/io/dataease/plugins/common/dto/datasource/TableField.java
index d680894d44..f1da42ef83 100644
--- a/sdk/dataease-plugin-common/src/main/java/io/dataease/plugins/common/dto/datasource/TableField.java
+++ b/sdk/dataease-plugin-common/src/main/java/io/dataease/plugins/common/dto/datasource/TableField.java
@@ -14,4 +14,7 @@ public class TableField {
     private boolean notNull;
     private boolean primaryKey;
 
+    //java.sql.Types
+    private Integer type;
+
 }
diff --git a/sdk/dataease-plugin-common/src/main/java/io/dataease/plugins/common/entity/GlobalTaskEntity.java b/sdk/dataease-plugin-common/src/main/java/io/dataease/plugins/common/entity/GlobalTaskEntity.java
index bae729a8db..d47dbaadbd 100644
--- a/sdk/dataease-plugin-common/src/main/java/io/dataease/plugins/common/entity/GlobalTaskEntity.java
+++ b/sdk/dataease-plugin-common/src/main/java/io/dataease/plugins/common/entity/GlobalTaskEntity.java
@@ -3,10 +3,14 @@ package io.dataease.plugins.common.entity;
 import java.io.Serializable;
 
 import lombok.Data;
+import lombok.experimental.Accessors;
 
 @Data
+@Accessors(chain = true)
 public class GlobalTaskEntity implements Serializable {
 
+    private static final long serialVersionUID = 4599805767414389668L;
+
     private Long taskId;
 
     private String taskName;
diff --git a/sdk/dataease-plugin-common/src/main/java/io/dataease/plugins/common/request/datasource/DatasourceRequest.java b/sdk/dataease-plugin-common/src/main/java/io/dataease/plugins/common/request/datasource/DatasourceRequest.java
index 43875842b8..9eef39abef 100644
--- a/sdk/dataease-plugin-common/src/main/java/io/dataease/plugins/common/request/datasource/DatasourceRequest.java
+++ b/sdk/dataease-plugin-common/src/main/java/io/dataease/plugins/common/request/datasource/DatasourceRequest.java
@@ -6,6 +6,7 @@ import io.dataease.plugins.common.base.domain.Datasource;
 import io.dataease.plugins.common.dto.chart.ChartViewFieldDTO;
 import lombok.Getter;
 import lombok.Setter;
+import lombok.experimental.Accessors;
 
 import java.util.List;
 import java.util.regex.Matcher;
@@ -41,6 +42,18 @@ public class DatasourceRequest {
     private List<DatasetTableField> permissionFields;
     private boolean totalPageFlag;
 
+    private List<TableFieldWithValue> tableFieldWithValues;
+
+    @Getter
+    @Setter
+    @Accessors(chain = true)
+    public static class TableFieldWithValue {
+        private Object value;
+        private String filedName;
+        private String typeName;
+        private Integer type;
+    }
+
     private String rebuildSqlWithFragment(String sql) {
         if (!sql.toLowerCase().startsWith("with")) {
             Matcher matcher = WITH_SQL_FRAGMENT.matcher(sql);
diff --git a/sdk/dataease-plugin-common/src/main/resources/generatorConfig.xml b/sdk/dataease-plugin-common/src/main/resources/generatorConfig.xml
index 930744a03e..a3d97c62b8 100644
--- a/sdk/dataease-plugin-common/src/main/resources/generatorConfig.xml
+++ b/sdk/dataease-plugin-common/src/main/resources/generatorConfig.xml
@@ -63,7 +63,7 @@
 
 
 
-        <table tableName="chart_view">
+        <table tableName="panel_link_ticket">
 
         </table>
 
diff --git a/sdk/dataease-plugin-datasource/src/main/java/io/dataease/plugins/datasource/provider/DefaultExtDDLProvider.java b/sdk/dataease-plugin-datasource/src/main/java/io/dataease/plugins/datasource/provider/DefaultExtDDLProvider.java
new file mode 100644
index 0000000000..23ce1d8aaa
--- /dev/null
+++ b/sdk/dataease-plugin-datasource/src/main/java/io/dataease/plugins/datasource/provider/DefaultExtDDLProvider.java
@@ -0,0 +1,69 @@
+package io.dataease.plugins.datasource.provider;
+
+import io.dataease.plugins.common.dto.datafill.ExtIndexField;
+import io.dataease.plugins.common.dto.datafill.ExtTableField;
+import io.dataease.plugins.common.dto.datasource.TableField;
+import io.dataease.plugins.common.request.datasource.DatasourceRequest;
+
+import java.util.List;
+import java.util.regex.Pattern;
+
+public class DefaultExtDDLProvider extends ExtDDLProvider {
+
+    private final Pattern CHECK_INJECT_PATTERN = Pattern.compile("(.*\\=.*\\-\\-.*)|(.*(\\+).*)|(.*\\w+(%|\\$|#|&)\\w+.*)|(.*\\|\\|.*)|(.*\\s+(and|or)\\s+.*)|(.*\\b(select|update|union|and|or|delete|insert|trancate|char|into|substr|ascii|declare|exec|count|master|into|drop|execute|sleep|extractvalue|updatexml|substring|database|concat|rand|gtid_subset)\\b.*)");
+
+    @Override
+    public boolean checkSqlInjection(String sql) {
+        return CHECK_INJECT_PATTERN.matcher(sql.toLowerCase()).find();
+    }
+
+    @Override
+    public String createTableSql(String table, List<ExtTableField> formFields) {
+        return null;
+    }
+
+    @Override
+    public List<String> createTableIndexSql(String table, List<ExtIndexField> indexFields) {
+        return null;
+    }
+
+    @Override
+    public String dropTableSql(String table) {
+        return null;
+    }
+
+    @Override
+    public String searchSql(String table, List<TableField> formFields, String whereSql, long limit, long offset) {
+        return null;
+    }
+
+    @Override
+    public String countSql(String table, List<TableField> formFields, String whereSql) {
+        return null;
+    }
+
+    @Override
+    public String deleteDataByIdSql(String table, DatasourceRequest.TableFieldWithValue pk) {
+        return null;
+    }
+
+    @Override
+    public String insertDataSql(String tableName, List<DatasourceRequest.TableFieldWithValue> fields) {
+        return null;
+    }
+
+    @Override
+    public String updateDataByIdSql(String tableName, List<DatasourceRequest.TableFieldWithValue> fields, DatasourceRequest.TableFieldWithValue pk) {
+        return null;
+    }
+
+    @Override
+    public String checkUniqueValueSql(String tableName, DatasourceRequest.TableFieldWithValue field, DatasourceRequest.TableFieldWithValue pk) {
+        return null;
+    }
+
+    @Override
+    public String whereSql(String tableName, List<TableField> searchFields) {
+        return null;
+    }
+}
diff --git a/sdk/dataease-plugin-datasource/src/main/java/io/dataease/plugins/datasource/provider/DefaultJdbcProvider.java b/sdk/dataease-plugin-datasource/src/main/java/io/dataease/plugins/datasource/provider/DefaultJdbcProvider.java
index 03066d3569..fe51f80059 100644
--- a/sdk/dataease-plugin-datasource/src/main/java/io/dataease/plugins/datasource/provider/DefaultJdbcProvider.java
+++ b/sdk/dataease-plugin-datasource/src/main/java/io/dataease/plugins/datasource/provider/DefaultJdbcProvider.java
@@ -106,6 +106,18 @@ public abstract class DefaultJdbcProvider extends Provider {
         return stat;
     }
 
+    public PreparedStatement getPreparedStatement(Connection connection, int queryTimeout, String sql) throws Exception {
+        if (connection == null) {
+            throw new Exception("Failed to get connection!");
+        }
+        PreparedStatement stat = connection.prepareStatement(sql);
+        try {
+            stat.setQueryTimeout(queryTimeout);
+        } catch (Exception e) {
+        }
+        return stat;
+    }
+
     public void exec(DatasourceRequest datasourceRequest) throws Exception {
         try (Connection connection = getConnectionFromPool(datasourceRequest); Statement stat = connection.createStatement()) {
             Boolean result = stat.execute(datasourceRequest.getQuery());
@@ -265,6 +277,7 @@ public abstract class DefaultJdbcProvider extends Provider {
 
     @Override
     public List<TableField> getTableFields(DatasourceRequest datasourceRequest) throws Exception {
+        System.out.println("``````````` 进入获取表字段 default");
         List<TableField> list = new LinkedList<>();
         try (Connection connection = getConnectionFromPool(datasourceRequest)) {
 
@@ -382,6 +395,7 @@ public abstract class DefaultJdbcProvider extends Provider {
         }
         tableField.setRemarks(remarks);
         String dbType = resultSet.getString("TYPE_NAME").toUpperCase();
+        tableField.setType(resultSet.getInt("DATA_TYPE"));
         tableField.setFieldType(dbType);
         if (dbType.equalsIgnoreCase("LONG")) {
             tableField.setFieldSize(65533);
@@ -414,6 +428,7 @@ public abstract class DefaultJdbcProvider extends Provider {
             field.setFieldName(l);
             field.setRemarks(l);
             field.setFieldType(t);
+            field.setType(metaData.getColumnType(j + 1));
             field.setFieldSize(metaData.getColumnDisplaySize(j + 1));
             if (t.equalsIgnoreCase("LONG")) {
                 field.setFieldSize(65533);
diff --git a/sdk/dataease-plugin-datasource/src/main/java/io/dataease/plugins/datasource/provider/ExtDDLProvider.java b/sdk/dataease-plugin-datasource/src/main/java/io/dataease/plugins/datasource/provider/ExtDDLProvider.java
new file mode 100644
index 0000000000..dff96f1fd4
--- /dev/null
+++ b/sdk/dataease-plugin-datasource/src/main/java/io/dataease/plugins/datasource/provider/ExtDDLProvider.java
@@ -0,0 +1,35 @@
+package io.dataease.plugins.datasource.provider;
+
+import io.dataease.plugins.common.dto.datafill.ExtIndexField;
+import io.dataease.plugins.common.dto.datafill.ExtTableField;
+import io.dataease.plugins.common.dto.datasource.TableField;
+import io.dataease.plugins.common.request.datasource.DatasourceRequest;
+
+import java.util.List;
+
+public abstract class ExtDDLProvider {
+
+    public final String DEFAULT_DATE_FORMAT_STR = "yyyy-MM-dd HH:mm:ss";
+
+    public abstract boolean checkSqlInjection(String sql);
+
+    public abstract String createTableSql(String table, List<ExtTableField> formFields);
+
+    public abstract String searchSql(String table, List<TableField> formFields, String whereSql, long limit, long offset);
+
+    public abstract String countSql(String table, List<TableField> formFields, String whereSql);
+
+    public abstract String dropTableSql(String table);
+
+    public abstract List<String> createTableIndexSql(String table, List<ExtIndexField> indexFields);
+
+    public abstract String deleteDataByIdSql(String table, DatasourceRequest.TableFieldWithValue pk);
+
+    public abstract String insertDataSql(String tableName, List<DatasourceRequest.TableFieldWithValue> fields);
+
+    public abstract String updateDataByIdSql(String tableName, List<DatasourceRequest.TableFieldWithValue> fields, DatasourceRequest.TableFieldWithValue pk);
+
+    public abstract String checkUniqueValueSql(String tableName, DatasourceRequest.TableFieldWithValue field, DatasourceRequest.TableFieldWithValue pk);
+
+    public abstract String whereSql(String tableName, List<TableField> searchFields);
+}
diff --git a/sdk/dataease-plugin-datasource/src/main/java/io/dataease/plugins/datasource/provider/Provider.java b/sdk/dataease-plugin-datasource/src/main/java/io/dataease/plugins/datasource/provider/Provider.java
index 687393cd8a..29b6b9644a 100644
--- a/sdk/dataease-plugin-datasource/src/main/java/io/dataease/plugins/datasource/provider/Provider.java
+++ b/sdk/dataease-plugin-datasource/src/main/java/io/dataease/plugins/datasource/provider/Provider.java
@@ -10,6 +10,7 @@ import io.dataease.plugins.datasource.entity.Status;
 
 import java.beans.PropertyVetoException;
 import java.sql.Connection;
+import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.util.List;
 import java.util.Map;
@@ -18,24 +19,24 @@ public abstract class Provider {
 
     abstract public List<String[]> getData(DatasourceRequest datasourceRequest) throws Exception;
 
-    abstract public List<TableDesc> getTables(DatasourceRequest datasourceRequest) throws Exception ;
+    abstract public List<TableDesc> getTables(DatasourceRequest datasourceRequest) throws Exception;
 
-    abstract public String checkStatus(DatasourceRequest datasourceRequest) throws Exception ;
+    abstract public String checkStatus(DatasourceRequest datasourceRequest) throws Exception;
 
-    abstract public Status checkDsStatus(DatasourceRequest datasourceRequest) throws Exception ;
+    abstract public Status checkDsStatus(DatasourceRequest datasourceRequest) throws Exception;
 
     public List<String[]> fetchResult(DatasourceRequest datasourceRequest) throws Exception {
         return null;
     }
 
-    abstract public List<TableField> fetchResultField(DatasourceRequest datasourceRequest) throws Exception ;
+    abstract public List<TableField> fetchResultField(DatasourceRequest datasourceRequest) throws Exception;
 
     abstract public Map<String, List> fetchResultAndField(DatasourceRequest datasourceRequest) throws Exception;
 
-    public void handleDatasource(DatasourceRequest datasourceRequest, String type) throws Exception{
+    public void handleDatasource(DatasourceRequest datasourceRequest, String type) throws Exception {
     }
 
-    public List<String> getSchema(DatasourceRequest datasourceRequest) throws Exception{
+    public List<String> getSchema(DatasourceRequest datasourceRequest) throws Exception {
         return null;
     }
 
@@ -43,7 +44,7 @@ public abstract class Provider {
         return null;
     }
 
-    public String getTablesSql(DatasourceRequest datasourceRequest) throws Exception{
+    public String getTablesSql(DatasourceRequest datasourceRequest) throws Exception {
         return null;
     }
 
@@ -51,15 +52,15 @@ public abstract class Provider {
         return null;
     }
 
-    public String getSchemaSql(DatasourceRequest datasourceRequest) throws Exception{
+    public String getSchemaSql(DatasourceRequest datasourceRequest) throws Exception {
         return null;
     }
 
-    public Connection getConnection(DatasourceRequest datasourceRequest) throws Exception{
+    public Connection getConnection(DatasourceRequest datasourceRequest) throws Exception {
         return null;
     }
 
-    public JdbcConfiguration setCredential(DatasourceRequest datasourceRequest, DruidDataSource dataSource) throws Exception{
+    public JdbcConfiguration setCredential(DatasourceRequest datasourceRequest, DruidDataSource dataSource) throws Exception {
         return null;
     }
 
@@ -70,7 +71,10 @@ public abstract class Provider {
     public void addToPool(DatasourceRequest datasourceRequest) throws PropertyVetoException, SQLException, Exception {
     }
 
-    public void checkConfiguration(Datasource datasource) throws Exception{}
+    public void checkConfiguration(Datasource datasource) throws Exception {
+    }
 
-    public String dsVersion(Datasource datasource) throws Exception{return "";}
+    public String dsVersion(Datasource datasource) throws Exception {
+        return "";
+    }
 }
diff --git a/sdk/dataease-plugin-datasource/src/main/java/io/dataease/plugins/datasource/provider/ProviderFactory.java b/sdk/dataease-plugin-datasource/src/main/java/io/dataease/plugins/datasource/provider/ProviderFactory.java
index ef6ed11264..d467b0cb54 100644
--- a/sdk/dataease-plugin-datasource/src/main/java/io/dataease/plugins/datasource/provider/ProviderFactory.java
+++ b/sdk/dataease-plugin-datasource/src/main/java/io/dataease/plugins/datasource/provider/ProviderFactory.java
@@ -87,4 +87,16 @@ public class ProviderFactory implements ApplicationContextAware {
         }
     }
 
+
+    public static ExtDDLProvider gerExtDDLProvider(String type) {
+        DatasourceTypes datasourceType = DatasourceTypes.valueOf(type);
+        switch (datasourceType) {
+            case mariadb:
+            case mysql:
+                return context.getBean("extMysqlDDLProvider", ExtDDLProvider.class);
+            default:
+                return context.getBean("defaultExtDDLProvider", ExtDDLProvider.class);
+        }
+    }
+
 }
diff --git a/sdk/dataease-plugin-datasource/src/main/java/io/dataease/plugins/datasource/query/QueryProvider.java b/sdk/dataease-plugin-datasource/src/main/java/io/dataease/plugins/datasource/query/QueryProvider.java
index 975a381c71..b9f863dc8b 100644
--- a/sdk/dataease-plugin-datasource/src/main/java/io/dataease/plugins/datasource/query/QueryProvider.java
+++ b/sdk/dataease-plugin-datasource/src/main/java/io/dataease/plugins/datasource/query/QueryProvider.java
@@ -255,4 +255,12 @@ public abstract class QueryProvider {
     public String getTotalCount(boolean isTable, String sql, Datasource ds) {
         return null;
     }
+
+    public String formatLikeValue(String value) {
+        if (StringUtils.isBlank(value)) return null;
+        if (StringUtils.equals("%", value)) {
+            return "'%\\\\" + value + "%'";
+        }
+        return "'%" + value + "%'";
+    }
 }
diff --git a/sdk/dataease-plugin-interface/src/main/java/io/dataease/plugins/xpack/datafill/DataFillXpackService.java b/sdk/dataease-plugin-interface/src/main/java/io/dataease/plugins/xpack/datafill/DataFillXpackService.java
new file mode 100644
index 0000000000..7eea0e37ed
--- /dev/null
+++ b/sdk/dataease-plugin-interface/src/main/java/io/dataease/plugins/xpack/datafill/DataFillXpackService.java
@@ -0,0 +1,6 @@
+package io.dataease.plugins.xpack.datafill;
+
+import io.dataease.plugins.common.service.PluginMenuService;
+
+public abstract class DataFillXpackService extends PluginMenuService {
+}