From 05075396d392610dbfd3a3205ea6932255607574 Mon Sep 17 00:00:00 2001 From: yaoq Date: Wed, 10 Aug 2022 20:15:54 +0800 Subject: [PATCH] =?UTF-8?q?=E9=BB=98=E8=AE=A4=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../smtweb/system/bpm/web/sys/user/role/RoleHandler.java | 7 ++++--- .../resources/static/event/bpm/sys/user/menu/menuList.js | 5 +++++ .../java/cc/smtweb/framework/core/common/SwEnum.java | 16 ++++++++++++++++ .../cc/smtweb/framework/core/db/impl/DefaultEntity.java | 14 ++++++++++---- 4 files changed, 35 insertions(+), 7 deletions(-) diff --git a/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/sys/user/role/RoleHandler.java b/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/sys/user/role/RoleHandler.java index c9c8de8..4f1c469 100644 --- a/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/sys/user/role/RoleHandler.java +++ b/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/sys/user/role/RoleHandler.java @@ -132,6 +132,7 @@ public class RoleHandler { } MenuPlanItem item = MenuPlanCache.getInstance().getById(role.getSmpId(), mp_id); if (item == null) return bean; + bean.put("menu", rc.getMenuRight()); bean.put("func", rc.getFuncRight(item.getId())); bean.put("read", rc.getFieldRight(item.getId(), 1)); bean.put("write", rc.getFieldRight(item.getId(), 2)); @@ -240,9 +241,9 @@ public class RoleHandler { SwMap row = new SwMap(); row.put("key", f); row.put("key_text", DataRightDefineCache.getInstance().get(f).getName()); - if (data.get(f) != null && PubUtil.isNotEmpty(data.get(f).toString())) { - row.put("value", data.get(f)); - row.put("value_text", DataRightGroupCache.getInstance().get(data.get(f).toString()).getName()); + if (data.containsKey("value")) { + row.put("value", data.get("value")); + row.put("value_text", DataRightGroupCache.getInstance().get(data.get("value").toString()).getName()); } list.add(row); } diff --git a/smtweb-framework/bpm/src/main/resources/static/event/bpm/sys/user/menu/menuList.js b/smtweb-framework/bpm/src/main/resources/static/event/bpm/sys/user/menu/menuList.js index bc5e28a..5e8fc3a 100644 --- a/smtweb-framework/bpm/src/main/resources/static/event/bpm/sys/user/menu/menuList.js +++ b/smtweb-framework/bpm/src/main/resources/static/event/bpm/sys/user/menu/menuList.js @@ -17,6 +17,10 @@ window.$swEvent.setup("bpm.sys.user.menu.menuList", { /*$model.menuCard.setFormVal("sm_page_url", getPath(value));*/ }; + const onTypeChange = (value) => { + $refs.selectPage.refVars.disabled = (value !== 0); + } + const getPath = (url) => { //页面类型：0-设计器页面，1-自定义页面，2-外部链接 const sm_type = $$UtilPub._toNumberEx($model.menuCard.getFormVal("sm_type")); @@ -28,6 +32,7 @@ window.$swEvent.setup("bpm.sys.user.menu.menuList", { return { onSelectPage, + onTypeChange, onUrlChange, } } diff --git a/smtweb-framework/core/src/main/java/cc/smtweb/framework/core/common/SwEnum.java b/smtweb-framework/core/src/main/java/cc/smtweb/framework/core/common/SwEnum.java index 50c57a1..bd0cfc6 100644 --- a/smtweb-framework/core/src/main/java/cc/smtweb/framework/core/common/SwEnum.java +++ b/smtweb-framework/core/src/main/java/cc/smtweb/framework/core/common/SwEnum.java @@ -1,5 +1,6 @@ package cc.smtweb.framework.core.common; +import cc.smtweb.framework.core.util.PubUtil; import org.apache.commons.lang3.StringUtils; import java.sql.Types; @@ -162,6 +163,21 @@ public interface SwEnum { } return REMARK; } + + public static Object getDataValue(String value, String fieldValue) { + DataTypeBean dataType = instance.getByValue(value); + if (dataType == null) return fieldValue; + switch (dataType.javaType) { + case "long": + return PubUtil.getLongIgnoreErr(fieldValue); + case "int": + return PubUtil.getIntIgnoreErr(fieldValue); + case "boolean": + return PubUtil.getBool(fieldValue); + default: + return fieldValue; + } + } } /** diff --git a/smtweb-framework/core/src/main/java/cc/smtweb/framework/core/db/impl/DefaultEntity.java b/smtweb-framework/core/src/main/java/cc/smtweb/framework/core/db/impl/DefaultEntity.java index 7583b6b..72caea9 100644 --- a/smtweb-framework/core/src/main/java/cc/smtweb/framework/core/db/impl/DefaultEntity.java +++ b/smtweb-framework/core/src/main/java/cc/smtweb/framework/core/db/impl/DefaultEntity.java @@ -18,10 +18,11 @@ public class DefaultEntity extends BaseBean implements Serializable, Cloneable { private final static String tableNameKey = "_def_table_name"; private final static String statusKey = "_status"; - public DefaultEntity() {} + public DefaultEntity() { + } public DefaultEntity(String _def_table_name) { - this.put(tableNameKey,_def_table_name); + this.put(tableNameKey, _def_table_name); } public ModelTable getModelTable() { @@ -31,6 +32,7 @@ public class DefaultEntity extends BaseBean implements Serializable, Cloneable { public String getTableName() { return getStr(tableNameKey); } + public void setTableName(String tableName) { put(tableNameKey, tableName); } @@ -59,12 +61,16 @@ public class DefaultEntity extends BaseBean implements Serializable, Cloneable { put(field.getName(), DateUtil.nowDateTimeLong()); } else { String s = field.getDefaultValue(); - if (StringUtils.isNotEmpty(s)) put(field.getName(), s); + if (StringUtils.isNotEmpty(s)) { + put(field.getName(), SwEnum.DataType.getDataValue(field.getDataType(), s)); + } } } } - /** 主键字段 */ + /** + * 主键字段 + */ public String getPkFieldName() { return getModelTable().getIdField(); }