添加设备相关信息

fill-manager/src/main/java/com/mortals/xhx/common/formdesign/ListItem.java

@@ -377,4 +377,8 @@ public class ListItem{
 
 	@JSONField(name="rowCount")
 	private Integer rowCount;
+
+	@JSONField(name="mark")
+	private Mark mark;
+
 }
\ No newline at end of file

fill-manager/src/main/java/com/mortals/xhx/common/formdesign/Mark.java

+package com.mortals.xhx.common.formdesign;
+
+import com.alibaba.fastjson.annotation.JSONField;
+import lombok.Data;
+
+@Data
+public class Mark {
+
+    @JSONField(name = "axisX")
+    private Double axisX = 0.0;
+
+    @JSONField(name = "axisY")
+    private Double axisY = 0.0;
+
+    @JSONField(name = "width")
+    private Double width = 0.0;
+
+    @JSONField(name = "height")
+    private Double height = 0.0;
+
+    @JSONField(name = "color")
+    private String color = "#ff0000";
+
+    @JSONField(name = "bold")
+    private Integer bold = 1;
+
+}
\ No newline at end of file

fill-manager/src/main/java/com/mortals/xhx/common/formdesign/component/DesignButtonComponent.java

@@ -6,6 +6,7 @@ import com.mortals.xhx.common.code.ComponentEnum;
 import com.mortals.xhx.common.formdesign.ColumnsItem;
 import com.mortals.xhx.common.formdesign.DesignComponent;
 import com.mortals.xhx.common.formdesign.ListItem;
+import com.mortals.xhx.common.formdesign.Mark;
 import com.mortals.xhx.common.pdu.gen.*;
 import com.mortals.xhx.common.pdu.gen.component.ComponentCons;
 
@@ -43,6 +44,7 @@ public class DesignButtonComponent extends DesignComponent {
         columnsItem.setCircle(false);
         columnsItem.setLoading(false);
         columnsItem.setLayout("colItem");
+        columnsItem.setMark(new Mark());
         return columnsItem;
     }
 

fill-manager/src/main/java/com/mortals/xhx/common/formdesign/component/DesignCheckboxComponent.java

@@ -60,7 +60,7 @@ public class DesignCheckboxComponent extends DesignComponent {
         columnsItem.setLayout("colItem");
         columnsItem.setRuleError("该字段不能为空");
         columnsItem.setRulesType("default");
-
+        columnsItem.setMark(new Mark());
         initDefaultCheckBoxValue(cons, columnsItem);
         return columnsItem;
     }

fill-manager/src/main/java/com/mortals/xhx/common/formdesign/component/DesignDateComponent.java

@@ -5,6 +5,7 @@ import com.mortals.xhx.common.code.ComponentEnum;
 import com.mortals.xhx.common.formdesign.ColumnsItem;
 import com.mortals.xhx.common.formdesign.DesignComponent;
 import com.mortals.xhx.common.formdesign.ListItem;
+import com.mortals.xhx.common.formdesign.Mark;
 import com.mortals.xhx.common.pdu.gen.Component;
 import com.mortals.xhx.common.pdu.gen.Config;
 import com.mortals.xhx.common.pdu.gen.FieldsItem;
@@ -46,7 +47,7 @@ public class DesignDateComponent extends DesignComponent {
         columnsItem.setMaxLength(50);
         columnsItem.setGutter(15);
         columnsItem.setSpan(24);
-
+        columnsItem.setMark(new Mark());
         columnsItem.setFormat("yyyy 年 MM 月 dd 日");
         columnsItem.setValueFormat("yyyy 年 MM 月 dd 日");
         columnsItem.setLayout("colItem");

fill-manager/src/main/java/com/mortals/xhx/common/formdesign/component/DesignDynamicTableComponent.java

@@ -3,10 +3,7 @@ package com.mortals.xhx.common.formdesign.component;
 import cn.hutool.core.util.IdUtil;
 import com.google.common.collect.Lists;
 import com.mortals.xhx.common.code.ComponentEnum;
-import com.mortals.xhx.common.formdesign.ColumnsItem;
-import com.mortals.xhx.common.formdesign.DesignComponent;
-import com.mortals.xhx.common.formdesign.ListItem;
-import com.mortals.xhx.common.formdesign.OptionsItem;
+import com.mortals.xhx.common.formdesign.*;
 import com.mortals.xhx.common.pdu.gen.component.ComponentCons;
 import org.springframework.util.ObjectUtils;
 
@@ -48,7 +45,7 @@ public class DesignDynamicTableComponent extends DesignComponent {
         listItem.setShowSummary(false);
         listItem.setSumText("合计");
         listItem.setSummaryText("元");
-
+        listItem.setMark(new Mark());
         if (!ObjectUtils.isEmpty(cons.getColList())) {
             //动态生成列元素
             List<ColumnsItem> columnsItemList = cons.getColList().stream().map(item -> {

fill-manager/src/main/java/com/mortals/xhx/common/formdesign/component/DesignImageComponent.java

@@ -4,6 +4,7 @@ import cn.hutool.core.util.IdUtil;
 import com.mortals.xhx.common.code.ComponentEnum;
 import com.mortals.xhx.common.formdesign.DesignComponent;
 import com.mortals.xhx.common.formdesign.ListItem;
+import com.mortals.xhx.common.formdesign.Mark;
 import com.mortals.xhx.common.pdu.gen.Component;
 import com.mortals.xhx.common.pdu.gen.Config;
 import com.mortals.xhx.common.pdu.gen.FieldsItem;
@@ -49,49 +50,9 @@ public class DesignImageComponent extends DesignComponent {
         columnsItem.setTips("点击按钮上传附件");
         columnsItem.setAccept("jpg,png,jpeg,bmp");
         columnsItem.setFileSize(10);
-
+        columnsItem.setMark(new Mark());
         columnsItem.setLayout("colItem");
         return columnsItem;
-
-
-
-      /*  //图片选择
-        FieldsItem fieldsItem = new FieldsItem();
-        Config config = new Config();
-        config.setLabel("日期选择");
-        config.setTag("el-upload");
-        config.setTagIcon("upload");
-        config.setButtonText("点击上传");
-        config.setFileSize(2);
-        config.setSizeUnit("MB");
-        config.setLabelWidth("");
-        config.setShowLabel(true);
-        config.setChangeTag(true);
-        config.setTag("el-upload");
-        config.setRequired(false);
-        config.setLayout("colFormItem");
-        config.setDocument("https://element.eleme.cn/#/zh-CN/component/upload");
-        config.setRegList(new ArrayList<>());
-        config.setSpan(12);
-        fieldsItem.setConfig(config);
-
-        Slot slot = new Slot();
-        slot.setListType(true);
-
-        fieldsItem.setSlot(slot);
-        fieldsItem.setAction("/m/file/commonupload?prePath=preview");
-        fieldsItem.setAccept("image/*");
-        fieldsItem.setName("file");
-        fieldsItem.setAutoUpload(true);
-        fieldsItem.setListType("picture-card");
-        fieldsItem.setMultiple(false);
-        fieldsItem.setClearable(true);
-
-        fieldsItem.setReadonly(false);
-        fieldsItem.setDisabled(false);
-        fieldsItem.setVModel("imageupload");
-
-        return fieldsItem;*/
     }
 
     @Override

fill-manager/src/main/java/com/mortals/xhx/common/formdesign/component/DesignInputComponent.java

@@ -6,6 +6,7 @@ import com.mortals.xhx.common.code.ComponentEnum;
 import com.mortals.xhx.common.formdesign.ColumnsItem;
 import com.mortals.xhx.common.formdesign.DesignComponent;
 import com.mortals.xhx.common.formdesign.ListItem;
+import com.mortals.xhx.common.formdesign.Mark;
 import com.mortals.xhx.common.pdu.gen.*;
 import com.mortals.xhx.common.pdu.gen.component.ComponentCons;
 
@@ -54,6 +55,8 @@ public class DesignInputComponent extends DesignComponent {
         columnsItem.setAppend("");
         columnsItem.setPrepend("");
         columnsItem.setLayout("colItem");
+
+        columnsItem.setMark(new Mark());
         return columnsItem;
     }
 

fill-manager/src/main/java/com/mortals/xhx/common/formdesign/component/DesignListComponent.java

@@ -4,6 +4,7 @@ import com.google.common.collect.Lists;
 import com.mortals.xhx.common.code.ComponentEnum;
 import com.mortals.xhx.common.formdesign.DesignComponent;
 import com.mortals.xhx.common.formdesign.ListItem;
+import com.mortals.xhx.common.formdesign.Mark;
 import com.mortals.xhx.common.pdu.gen.component.ComponentCons;
 
 /**
@@ -49,6 +50,7 @@ public class DesignListComponent extends DesignComponent {
         columnsItem.setAppend("");
         columnsItem.setPrepend("");
         columnsItem.setLayout("colItem");
+        columnsItem.setMark(new Mark());
         return columnsItem;
     }
 

fill-manager/src/main/java/com/mortals/xhx/common/formdesign/component/DesignRadioComponent.java

@@ -4,10 +4,7 @@ import cn.hutool.core.util.IdUtil;
 import cn.hutool.core.util.StrUtil;
 import com.google.common.collect.Lists;
 import com.mortals.xhx.common.code.ComponentEnum;
-import com.mortals.xhx.common.formdesign.ColumnsItem;
-import com.mortals.xhx.common.formdesign.DesignComponent;
-import com.mortals.xhx.common.formdesign.ListItem;
-import com.mortals.xhx.common.formdesign.OptionsItem;
+import com.mortals.xhx.common.formdesign.*;
 import com.mortals.xhx.common.pdu.gen.component.ComponentCons;
 import com.mortals.xhx.common.utils.StringUtils;
 import org.springframework.util.ObjectUtils;
@@ -58,6 +55,7 @@ public class DesignRadioComponent extends DesignComponent {
         columnsItem.setLayout("colItem");
         columnsItem.setRuleError("该字段不能为空");
         columnsItem.setRulesType("default");
+        columnsItem.setMark(new Mark());
         initDefaultRadioValue(cons, columnsItem);
         return columnsItem;
     }

fill-manager/src/main/java/com/mortals/xhx/common/formdesign/component/DesignSelectComponent.java

@@ -4,10 +4,7 @@ import cn.hutool.core.util.IdUtil;
 import cn.hutool.core.util.StrUtil;
 import com.google.common.collect.Lists;
 import com.mortals.xhx.common.code.ComponentEnum;
-import com.mortals.xhx.common.formdesign.ColumnsItem;
-import com.mortals.xhx.common.formdesign.DesignComponent;
-import com.mortals.xhx.common.formdesign.ListItem;
-import com.mortals.xhx.common.formdesign.OptionsItem;
+import com.mortals.xhx.common.formdesign.*;
 import com.mortals.xhx.common.pdu.gen.component.ComponentCons;
 import com.mortals.xhx.common.utils.StringUtils;
 import org.springframework.util.ObjectUtils;
@@ -58,6 +55,7 @@ public class DesignSelectComponent extends DesignComponent {
         columnsItem.setLayout("colItem");
         columnsItem.setRuleError("该字段不能为空");
         columnsItem.setRulesType("default");
+        columnsItem.setMark(new Mark());
         initDefaultSelectValue(cons, columnsItem);
         return columnsItem;
     }

fill-manager/src/main/java/com/mortals/xhx/common/formdesign/component/DesignTextAreaComponent.java

@@ -6,6 +6,7 @@ import com.mortals.xhx.common.code.ComponentEnum;
 import com.mortals.xhx.common.formdesign.ColumnsItem;
 import com.mortals.xhx.common.formdesign.DesignComponent;
 import com.mortals.xhx.common.formdesign.ListItem;
+import com.mortals.xhx.common.formdesign.Mark;
 import com.mortals.xhx.common.pdu.gen.*;
 import com.mortals.xhx.common.pdu.gen.component.ComponentCons;
 
@@ -55,6 +56,7 @@ public class DesignTextAreaComponent extends DesignComponent {
         columnsItem.setRuleError("该字段不能为空");
         columnsItem.setRulesType("default");
         columnsItem.setLayout("colItem");
+        columnsItem.setMark(new Mark());
         return columnsItem;
     }