Merge branch 'feature/form-permission-control' of http://124.222.6.97:3000/sunquan/apelet_tenant into feature/2026-07-ccc-dev

common/common-online/src/main/java/apelet/common/online/abstractplugin/ExecutePluginParent.java

@@ -1,25 +1,25 @@
 package apelet.common.online.abstractplugin;
 
-import apelet.common.core.object.Model;
 import apelet.common.core.object.ObjectValue;
 import apelet.common.core.util.ApplicationContextHolder;
-import apelet.common.generator.utils.OrmGenDataSourceUtil;
 import apelet.common.online.dto.OnlineEventPluginExecuteDto;
-import apelet.common.online.model.*;
+import apelet.common.online.model.FilterInfo;
+import apelet.common.online.model.ShowParameter;
 import apelet.common.online.model.constant.AttributeEnum;
 import apelet.common.online.service.OnlineDatasourceService;
 import apelet.common.online.service.OnlineFormService;
 import apelet.common.online.vo.OnlineEventPluginExecuteEntryVo;
 import apelet.common.online.vo.OnlineEventPluginExecuteVo;
 import apelet.common.orm.impl.OrmDataSourceUtil;
-import cn.hutool.core.collection.CollUtil;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import lombok.Getter;
 import lombok.Setter;
 
-import java.util.*;
-import java.util.stream.Collectors;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 /**
  * 插件执行抽象类父类
@@ -569,4 +569,10 @@ public abstract class ExecutePluginParent {
         return getDto().getModel().getCellField();
     }
 
+
+    public void childPageCallback(String widgetVariableName, ObjectValue objectValue) {
+
+    }
+
+
 }

common/common-online/src/main/java/apelet/common/online/abstractplugin/model/ListColumn.java

@@ -27,5 +27,6 @@ public class ListColumn {
     private boolean uploadFile;//是否是附件
     private boolean treeLine;//是否树形结构
     private Map<String, Object> column = null; //Html字段设置 "column："{ "fieldKind" : 34}
+    private boolean customize;//是否跳转自定义页面
     //
 }

common/common-online/src/main/java/apelet/common/online/model/constant/AttributeEnum.java

@@ -57,6 +57,7 @@ public enum AttributeEnum {
     BACK_PAGE("backPage", "返回上一页"),
     OPEN_URL_PAGE("openUrlPage", "打开前端页面"),
     LISTEN_TIMER_ELAPSED("listentimerElapsed", "前端定时发送请求，触发此界面事件。"),
+    RESETROWS("resetrows", "重置行数据"),
 
     ;
 

common/common-online/src/main/java/apelet/common/online/model/constant/ShowTypeEnum.java

@@ -13,6 +13,7 @@ import java.util.stream.Collectors;
 public enum ShowTypeEnum {
 
     OPEN_ONLINE_MODAL("openOnlineModal", "弹窗"),
+    RESET_ONLINE_PAGE("resetOnlinePage", "重置跳转页面"),
     OPEN_ONLINE_PAGE("openOnlinePage", "跳转页面");
 
     @Getter

common/common-online/src/main/java/apelet/common/online/service/OnlineDictService.java

@@ -4,6 +4,7 @@ import apelet.common.core.base.service.IBaseService;
 import apelet.common.online.model.OnlineDict;
 
 import java.util.List;
+import java.util.Map;
 import java.util.Set;
 
 /**
@@ -75,4 +76,6 @@ public interface OnlineDictService extends IBaseService<OnlineDict, Long> {
      * @return 在线字典对象集合。
      */
     List<OnlineDict> getOnlineDictListFromCache(Set<Long> dictIdSet);
+
+    Map<String, String> getDictMap(Long dictId);
 }

common/common-online/src/main/java/apelet/common/online/service/impl/OnlineDictServiceImpl.java

@@ -15,6 +15,9 @@ import apelet.common.online.service.OnlineDictService;
 import apelet.common.online.util.OnlineRedisKeyUtil;
 import apelet.common.redis.util.CommonRedisUtil;
 import apelet.common.sequence.wrapper.IdGeneratorWrapper;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.github.pagehelper.Page;
 import lombok.extern.slf4j.Slf4j;
@@ -184,4 +187,21 @@ public class OnlineDictServiceImpl extends BaseService<OnlineDict, Long> impleme
         }
         return CallResult.ok();
     }
+
+    @Override
+    public Map<String, String> getDictMap(Long dictId) {
+        Map<String, String> map = new HashMap<>();
+        OnlineDict onlineDict = this.getOnlineDictFromCache(dictId);
+        if (onlineDict == null) {
+            return map;
+        }
+        JSONObject dictJson = JSON.parseObject(onlineDict.getDictDataJson());
+        JSONArray jsonArray = dictJson.getJSONArray("dictData");
+        for (int i = 0; i < jsonArray.size(); i++) {
+            JSONObject jsonObject = jsonArray.getJSONObject(i);
+            map.put(jsonObject.getString("id"), jsonObject.getString("name"));
+        }
+        return map;
+    }
+
 }