diff --git a/orion-ops-framework/orion-ops-framework-common/src/main/java/com/orion/ops/framework/common/constant/Const.java b/orion-ops-framework/orion-ops-framework-common/src/main/java/com/orion/ops/framework/common/constant/Const.java index f6b6450f..b8ce8fd9 100644 --- a/orion-ops-framework/orion-ops-framework-common/src/main/java/com/orion/ops/framework/common/constant/Const.java +++ b/orion-ops-framework/orion-ops-framework-common/src/main/java/com/orion/ops/framework/common/constant/Const.java @@ -7,29 +7,26 @@ package com.orion.ops.framework.common.constant; * @version 1.0.0 * @since 2023/6/23 18:49 */ -public class Const implements com.orion.lang.constant.Const { +public interface Const extends com.orion.lang.constant.Const, ConstField { - private Const() { - } + Integer NOT_DELETE = 0; - public static final Integer NOT_DELETE = 0; + Integer IS_DELETED = 1; - public static final Integer IS_DELETED = 1; + int BEARER_PREFIX_LEN = 7; - public static final int BEARER_PREFIX_LEN = 7; + int MD5_LEN = 32; - public static final int MD5_LEN = 32; + String UNKNOWN = "未知"; - public static final String UNKNOWN = "未知"; + String INTRANET_IP = "内网IP"; - public static final String INTRANET_IP = "内网IP"; + Long ROOT_MENU_ID = 0L; - public static final Long ROOT_MENU_ID = 0L; + Integer DEFAULT_SORT = 10; - public static final Integer DEFAULT_SORT = 10; + Long NONE_ID = -1L; - public static final Long NONE_ID = -1L; - - public static final Integer DEFAULT_VERSION = 1; + Integer DEFAULT_VERSION = 1; } diff --git a/orion-ops-framework/orion-ops-framework-common/src/main/java/com/orion/ops/framework/common/constant/ConstField.java b/orion-ops-framework/orion-ops-framework-common/src/main/java/com/orion/ops/framework/common/constant/ConstField.java new file mode 100644 index 00000000..4a940af3 --- /dev/null +++ b/orion-ops-framework/orion-ops-framework-common/src/main/java/com/orion/ops/framework/common/constant/ConstField.java @@ -0,0 +1,34 @@ +package com.orion.ops.framework.common.constant; + +/** + * 字段常量 + * + * @author Jiahang Li + * @version 1.0.0 + * @since 2023/10/17 12:44 + */ +public interface ConstField { + + String ID = "id"; + + String KEY = "key"; + + String CODE = "code"; + + String NAME = "name"; + + String TITLE = "title"; + + String VALUE = "value"; + + String LABEL = "label"; + + String TYPE = "type"; + + String COLOR = "color"; + + String STATUS = "status"; + + String REL_ID = "relId"; + +} diff --git a/orion-ops-framework/orion-ops-spring-boot-starter-biz-operator-log/src/main/java/com/orion/ops/framework/biz/operator/log/core/constant/OperatorLogKeys.java b/orion-ops-framework/orion-ops-spring-boot-starter-biz-operator-log/src/main/java/com/orion/ops/framework/biz/operator/log/core/constant/OperatorLogKeys.java index f157099e..34864e50 100644 --- a/orion-ops-framework/orion-ops-spring-boot-starter-biz-operator-log/src/main/java/com/orion/ops/framework/biz/operator/log/core/constant/OperatorLogKeys.java +++ b/orion-ops-framework/orion-ops-spring-boot-starter-biz-operator-log/src/main/java/com/orion/ops/framework/biz/operator/log/core/constant/OperatorLogKeys.java @@ -1,5 +1,7 @@ package com.orion.ops.framework.biz.operator.log.core.constant; +import com.orion.ops.framework.common.constant.ConstField; + /** * 操作日志常量 * @@ -7,32 +9,12 @@ package com.orion.ops.framework.biz.operator.log.core.constant; * @version 1.0.0 * @since 2023/10/10 19:00 */ -public interface OperatorLogKeys { - - String ID = "id"; +public interface OperatorLogKeys extends ConstField { String ID_LIST = "idList"; - String KEY = "key"; - - String CODE = "code"; - - String NAME = "name"; - String USERNAME = "username"; - String TITLE = "title"; - - String VALUE = "value"; - - String LABEL = "label"; - - String TYPE = "type"; - - String STATUS = "status"; - String STATUS_NAME = "statusName"; - String REL_ID = "relId"; - } diff --git a/orion-ops-launch/src/main/java/com/orion/ops/launch/generator/CodeGenerator.java b/orion-ops-launch/src/main/java/com/orion/ops/launch/generator/CodeGenerator.java index c56b3a7a..0fcc8a02 100644 --- a/orion-ops-launch/src/main/java/com/orion/ops/launch/generator/CodeGenerator.java +++ b/orion-ops-launch/src/main/java/com/orion/ops/launch/generator/CodeGenerator.java @@ -65,16 +65,17 @@ public class CodeGenerator { .build(), Template.create("dict_key", "字典配置项", "dict") .cache("dict:keys", "字典配置项") - .expire(1, TimeUnit.HOURS) + .expire(1, TimeUnit.DAYS) .vue("system", "dict-key") .enums("value_type") - .names("STRING", "NUMBER", "BOOLEAN", "COLOR") - .label("字符串", "数值", "布尔值", "颜色") + .names("STRING", "INTEGER", "DECIMAL", "BOOLEAN", "COLOR") + .label("字符串", "整数", "小数", "布尔值", "颜色") .build(), Template.create("dict_value", "字典配置值", "dict") .cache("dict:value:{}", "字典配置值 ${key}") - .expire(1, TimeUnit.HOURS) + .expire(1, TimeUnit.DAYS) .vue("system", "dict-value") + .enableRowSelection() .build(), }; // jdbc 配置 - 使用配置文件 diff --git a/orion-ops-launch/src/main/java/com/orion/ops/launch/generator/EnumGenerator.java b/orion-ops-launch/src/main/java/com/orion/ops/launch/generator/EnumGenerator.java index fcbe8ea5..6933a413 100644 --- a/orion-ops-launch/src/main/java/com/orion/ops/launch/generator/EnumGenerator.java +++ b/orion-ops-launch/src/main/java/com/orion/ops/launch/generator/EnumGenerator.java @@ -9,6 +9,7 @@ import com.orion.lang.utils.ansi.style.AnsiFont; import com.orion.lang.utils.ansi.style.color.AnsiForeground; import com.orion.lang.utils.awt.Clipboards; import com.orion.lang.utils.reflect.Fields; +import com.orion.ops.framework.common.constant.Const; import com.orion.ops.module.infra.enums.UserStatusEnum; import java.util.List; @@ -47,8 +48,8 @@ public class EnumGenerator { MultiLinkedHashMap result = MultiLinkedHashMap.create(); for (Enum e : constants) { String name = e.name(); - result.put(name, "value", valueFunction.apply((E) e)); - result.put(name, "label", labelFunction.apply((E) e)); + result.put(name, Const.VALUE, valueFunction.apply((E) e)); + result.put(name, Const.LABEL, labelFunction.apply((E) e)); for (String field : fields) { result.put(name, field, Fields.getFieldValue(e, field)); } diff --git a/orion-ops-launch/src/main/java/com/orion/ops/launch/generator/engine/VelocityTemplateEngine.java b/orion-ops-launch/src/main/java/com/orion/ops/launch/generator/engine/VelocityTemplateEngine.java index c7c5e38e..bc6b13a2 100644 --- a/orion-ops-launch/src/main/java/com/orion/ops/launch/generator/engine/VelocityTemplateEngine.java +++ b/orion-ops-launch/src/main/java/com/orion/ops/launch/generator/engine/VelocityTemplateEngine.java @@ -466,9 +466,9 @@ public class VelocityTemplateEngine extends AbstractTemplateEngine { enumInfo.put(name, field, value); } // 检查是否有 value - if (!meta.getFields().contains("value")) { + if (!meta.getFields().contains(Const.VALUE)) { // 没有 value 用 name - enumInfo.put(name, "value", name); + enumInfo.put(name, Const.VALUE, name); } } enumMap.put(tableField.getPropertyName(), new EnumMeta(meta.getClassName(), meta.getComment(), enumInfo)); diff --git a/orion-ops-launch/src/main/java/com/orion/ops/launch/generator/template/EnumsTemplate.java b/orion-ops-launch/src/main/java/com/orion/ops/launch/generator/template/EnumsTemplate.java index b7927484..babaad23 100644 --- a/orion-ops-launch/src/main/java/com/orion/ops/launch/generator/template/EnumsTemplate.java +++ b/orion-ops-launch/src/main/java/com/orion/ops/launch/generator/template/EnumsTemplate.java @@ -3,6 +3,7 @@ package com.orion.ops.launch.generator.template; import com.orion.lang.utils.Enums; import com.orion.lang.utils.collect.Lists; import com.orion.lang.utils.reflect.Fields; +import com.orion.ops.framework.common.constant.Const; import java.util.List; import java.util.stream.Collectors; @@ -113,7 +114,7 @@ public class EnumsTemplate extends VueTemplate { * @return this */ public EnumsTemplate label(Object... labels) { - return this.values("label", labels); + return this.values(Const.LABEL, labels); } /** @@ -124,7 +125,7 @@ public class EnumsTemplate extends VueTemplate { * @return this */ public EnumsTemplate value(Object... values) { - return this.values("value", values); + return this.values(Const.VALUE, values); } /** @@ -134,7 +135,7 @@ public class EnumsTemplate extends VueTemplate { * @return this */ public EnumsTemplate color(Object... colors) { - return this.values("color", colors); + return this.values(Const.COLOR, colors); } /** @@ -144,7 +145,7 @@ public class EnumsTemplate extends VueTemplate { * @return this */ public EnumsTemplate status(Object... status) { - return this.values("status", status); + return this.values(Const.STATUS, status); } } diff --git a/orion-ops-launch/src/main/resources/templates/orion-vue-views-components-card-list.vue.vm b/orion-ops-launch/src/main/resources/templates/orion-vue-views-components-card-list.vue.vm index 1b57f76f..ff8fd242 100644 --- a/orion-ops-launch/src/main/resources/templates/orion-vue-views-components-card-list.vue.vm +++ b/orion-ops-launch/src/main/resources/templates/orion-vue-views-components-card-list.vue.vm @@ -2,7 +2,6 @@ - - .arco-card-header { + padding: 16px 16px 8px 16px; + border: none; + + .arco-card-header-title { + font-size: 15px; + } + } + + & > .arco-card-body { + padding: 0 16px 16px 16px; + flex-grow: 1; + } } .card-list-item:hover { diff --git a/orion-ops-ui/src/components/card/list/index.vue b/orion-ops-ui/src/components/card/list/index.vue index 2fd7a5e6..3b0f48ae 100644 --- a/orion-ops-ui/src/components/card/list/index.vue +++ b/orion-ops-ui/src/components/card/list/index.vue @@ -98,7 +98,8 @@ + :gutter="cardLayoutGutter" + align="stretch"> + @click="emits('click', item, index)" + @dblclick="emits('dblclick', item, index)">