Explorar el Código

页面设计

master
郑根木 hace 2 años
padre
commit
3e98431673
Se han modificado 8 ficheros con 150 adiciones y 6 borrados
  1. +8
    -0
      smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/db/vo/ModelProject.java
  2. +22
    -0
      smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/form/ModelFormHelper.java
  3. +7
    -0
      smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/form/ModelFormLoadHandler.java
  4. +8
    -0
      smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/form/ModelFormSaveHandler.java
  5. +52
    -0
      smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/table/ModelCatalogCache.java
  6. +43
    -0
      smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/table/ModelProjectCache.java
  7. +4
    -4
      smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/engine/dynPage/DynPageLoadHandler.java
  8. +6
    -2
      smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/engine/dynPage/DynPageSaveHandler.java

+ 8
- 0
smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/db/vo/ModelProject.java Ver fichero

@@ -30,6 +30,14 @@ public class ModelProject extends DefaultEntity {
put("prj_name", prjName);
}

public String getModule() {
return getStr("prj_module");
}

public void setModule(String prj_module) {
put("prj_module", prj_module);
}

public String getDepends() {
return getStr("prj_depends");
}


+ 22
- 0
smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/form/ModelFormHelper.java Ver fichero

@@ -13,6 +13,8 @@ import cc.smtweb.framework.core.util.CommUtil;
import cc.smtweb.framework.core.util.JsonUtil;
import cc.smtweb.framework.core.util.MapUtil;
import cc.smtweb.system.bpm.web.design.form.define.*;
import cc.smtweb.system.bpm.web.design.table.ModelCatalogCache;
import cc.smtweb.system.bpm.web.design.table.ModelProjectCache;
import com.fasterxml.jackson.core.JsonProcessingException;
import org.apache.commons.lang3.StringUtils;

@@ -23,6 +25,7 @@ import java.util.*;
* 辅助类
*/
public class ModelFormHelper {
public static final String KEY_EVENT_PATH = "eventPath";
/**
* 从缓存获取Form对象
*
@@ -235,6 +238,11 @@ public class ModelFormHelper {
SwMap ret = new SwMap();
PageModel pageInfo = parsePageInfo(form.getContent());
if (pageInfo == null) return "";
ret.put("pageId", form.getEntityId());
ret.put("label", form.getTitle());
ret.put("service", form.getService());
ret.put("module", ModelProjectCache.getInstance().getModule(form.getPrjId()));
buildOptsEx(form, ret);
//form不用管
if (pageInfo.form != null) ret.put("form", pageInfo.form);
List<SwMap> listModel = new ArrayList<>();
@@ -325,4 +333,18 @@ public class ModelFormHelper {
listRet.sort((o1, o2) -> CommUtil.chineseCompare(o1.readString("label"), o2.readString("label")));
return listRet;
}

/**
* 构建一些扩展属性,目前主要是eventPath
* @param opts
*/
public static void buildOptsEx(ModelForm bean, SwMap opts) {
String moduleName = ModelProjectCache.getInstance().getModule(bean.getPrjId());
if (StringUtils.isNotEmpty(moduleName)) {
String ep = moduleName;
String cn = ModelCatalogCache.getInstance().getFullName(bean.getMcId());
if (StringUtils.isNotEmpty(cn)) ep = ep + "." + cn;
opts.put(KEY_EVENT_PATH, ep + "." + bean.getName());
}
}
}

+ 7
- 0
smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/form/ModelFormLoadHandler.java Ver fichero

@@ -2,7 +2,9 @@ package cc.smtweb.system.bpm.web.design.form;

import cc.smtweb.framework.core.common.R;
import cc.smtweb.framework.core.common.SwException;
import cc.smtweb.framework.core.common.SwMap;
import cc.smtweb.framework.core.mvc.service.DefaultLoadHandler;
import cc.smtweb.framework.core.util.JsonUtil;

/**
* Created by Akmm at 2022/5/9 16:17
@@ -15,6 +17,11 @@ public class ModelFormLoadHandler extends DefaultLoadHandler<ModelForm> {
@Override
protected ModelForm loadComp(long id) {
ModelForm bean = super.loadComp(id);
SwMap opts = ModelFormHelper.parseFormOption(bean.getOption());
if (opts != null) {
ModelFormHelper.buildOptsEx(bean, opts);
bean.setOption(JsonUtil.encodeString(opts));
}
//去掉content和dataset
bean.getData().remove("mf_content");
bean.getData().remove("mf_dataset");


+ 8
- 0
smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/form/ModelFormSaveHandler.java Ver fichero

@@ -3,6 +3,7 @@ package cc.smtweb.system.bpm.web.design.form;
import cc.smtweb.framework.core.common.R;
import cc.smtweb.framework.core.common.SwException;
import cc.smtweb.framework.core.common.SwEnum;
import cc.smtweb.framework.core.common.SwMap;
import cc.smtweb.framework.core.db.DbEngine;
import cc.smtweb.framework.core.db.EntityDao;
import cc.smtweb.framework.core.db.cache.ModelTableCache;
@@ -10,6 +11,7 @@ import cc.smtweb.framework.core.db.jdbc.AbsDbWorker;
import cc.smtweb.framework.core.db.vo.ModelField;
import cc.smtweb.framework.core.db.vo.ModelTable;
import cc.smtweb.framework.core.mvc.service.DefaultSaveHandler;
import cc.smtweb.framework.core.util.JsonUtil;
import org.apache.commons.lang3.StringUtils;

/**
@@ -23,6 +25,12 @@ public class ModelFormSaveHandler extends DefaultSaveHandler<ModelForm> {

@Override
protected void updateBean(EntityDao<ModelForm> dao) {
SwMap opts = ModelFormHelper.parseFormOption(bean.getOption());
if (opts != null) {
opts.remove(ModelFormHelper.KEY_EVENT_PATH);
bean.setOption(JsonUtil.encodeString(opts));
}

dao.updateEntityEx(bean, "mf_content", "mf_dataset");
}



+ 52
- 0
smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/table/ModelCatalogCache.java Ver fichero

@@ -0,0 +1,52 @@
package cc.smtweb.system.bpm.web.design.table;

import cc.smtweb.framework.core.annotation.SwCache;
import cc.smtweb.framework.core.cache.AbstractCache;
import cc.smtweb.framework.core.cache.CacheManager;
import cc.smtweb.framework.core.db.DbEngine;
import cc.smtweb.framework.core.db.EntityDao;
import cc.smtweb.framework.core.db.vo.ModelCatalog;
import cc.smtweb.framework.core.db.vo.ModelCatalog;
import cc.smtweb.framework.core.db.vo.ModelProject;

import java.util.List;

/**
* Created by Akmm at 2022/1/12 18:34
*/
@SwCache(ident = "ASP_MODEL_CATALOG", title = "目录")
public class ModelCatalogCache extends AbstractCache<ModelCatalog> {
public static ModelCatalogCache getInstance() {
return CacheManager.getIntance().getCache(ModelCatalogCache.class);
}

public ModelCatalogCache() {
}

@Override
protected String getId(ModelCatalog bean) {
return String.valueOf(bean.getId());
}

@Override
protected List<ModelCatalog> loadAll() {
EntityDao<ModelCatalog> dao = DbEngine.getInstance().findDao(ModelCatalog.class);
return dao.query();
}

public String getName(long id) {
ModelCatalog bean = get(id);
return bean != null ? bean.getName() : "";
}

public String getFullName(long id) {
ModelCatalog bean = get(id);
if (bean == null) return null;
StringBuilder sret = new StringBuilder();
while (bean != null) {
sret.insert(0, "." + bean.getCode());
bean = get(bean.getParentId());
}
return sret.substring(1);
}
}

+ 43
- 0
smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/table/ModelProjectCache.java Ver fichero

@@ -0,0 +1,43 @@
package cc.smtweb.system.bpm.web.design.table;

import cc.smtweb.framework.core.annotation.SwCache;
import cc.smtweb.framework.core.cache.AbstractCache;
import cc.smtweb.framework.core.cache.CacheManager;
import cc.smtweb.framework.core.db.DbEngine;
import cc.smtweb.framework.core.db.EntityDao;
import cc.smtweb.framework.core.db.vo.ModelProject;

import java.util.ArrayList;
import java.util.Comparator;
import java.util.List;
import java.util.Set;

/**
* Created by Akmm at 2022/1/12 18:34
*/
@SwCache(ident = "ASP_MODEL_PROJECT", title = "项目定义")
public class ModelProjectCache extends AbstractCache<ModelProject> {
public static ModelProjectCache getInstance() {
return CacheManager.getIntance().getCache(ModelProjectCache.class);
}

public ModelProjectCache() {
}

@Override
protected String getId(ModelProject bean) {
return String.valueOf(bean.getId());
}

@Override
protected List<ModelProject> loadAll() {
EntityDao<ModelProject> dao = DbEngine.getInstance().findDao(ModelProject.class);
return dao.query();
}

public String getModule(long id) {
ModelProject bean = get(id);
return bean != null ? bean.getModule() : "";
}

}

+ 4
- 4
smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/engine/dynPage/DynPageLoadHandler.java Ver fichero

@@ -49,11 +49,11 @@ public class DynPageLoadHandler extends AbstractDynPageHandler {
mapRet.put(dataSet.name, new SwMap());
continue;
}
mapRet.put(dataSet.name, DynPageHelper.createBean(dataSet));
mapRet.put(dataSet.name, DynRetBean.createBean(DynPageHelper.createBean(dataSet)));
} else if (SwEnum.DatasetType.TREE.value.equals(dataSet.type)) {//树
mapRet.put(dataSet.name, new SwMap());
mapRet.put(dataSet.name, DynRetBean.createBean(new SwMap()));
} else if (!SwEnum.DatasetType.ENUM.value.equals(dataSet.type)) {//非枚举
mapRet.put(dataSet.name, SwListData.create(null, 0));
mapRet.put(dataSet.name, DynRetBean.createList(SwListData.create(null, 0)));
}
}
return R.success(mapRet);
@@ -68,7 +68,7 @@ public class DynPageLoadHandler extends AbstractDynPageHandler {
return R.error("指定数据集为只读数据集[" + pageDataSet.label + "]!");
}
//懒加载,给个空对象
return R.success(DynPageHelper.createBean(pageDataSet));
return R.success(DynRetBean.createBean(DynPageHelper.createBean(pageDataSet)));
}

public R loadOne() {


+ 6
- 2
smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/engine/dynPage/DynPageSaveHandler.java Ver fichero

@@ -66,7 +66,7 @@ public class DynPageSaveHandler extends AbstractDynPageHandler {
afterRollback(bean);
}
});
return R.success(bean);
return R.success(DynRetBean.createBean(bean.getData()));
}

/**
@@ -124,7 +124,11 @@ public class DynPageSaveHandler extends AbstractDynPageHandler {
}
}
});
return R.success(map);
Map<String, DynRetBean> mapRet = new HashMap<>(map.size());
for (Map.Entry<String, DefaultEntity> entry: map.entrySet()) {
mapRet.put(entry.getKey(), DynRetBean.createBean(entry.getValue().getData()));
}
return R.success(mapRet);
}

/**


Cargando…
Cancelar
Guardar