增加排序序号

hsweb-system/hsweb-system-dynamic-form/hsweb-system-dynamic-form-dao/hsweb-system-dynamic-form-dao-mybatis/src/main/resources/org/hswebframework/web/dao/mybatis/mappers/form/DynamicFormColumnMapper.xml

@@ -3,7 +3,7 @@
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://www.mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="org.hswebframework.web.dao.form.DynamicFormColumnDao">
-    <resultMap id="DynamicFormColumnResultMap" type="org.hswebframework.web.entity.form.SimpleDynamicFormColumnEntity">
+    <resultMap id="DynamicFormColumnResultMap" type="org.hswebframework.web.entity.form.DynamicFormColumnEntity">
         <id property="id" column="u_id" javaType="string" jdbcType="VARCHAR"/>
         <result property="formId" column="form_id" javaType="String" jdbcType="VARCHAR"/>
         <result property="name" column="name" javaType="String" jdbcType="VARCHAR"/>
@@ -17,6 +17,7 @@
         <result property="precision" column="precision" javaType="Integer" jdbcType="DECIMAL"/>
         <result property="scale" column="scale" javaType="Integer" jdbcType="DECIMAL"/>
         <result property="dictConfig" column="dict_config" javaType="String" jdbcType="CLOB"/>
+        <result property="sortIndex" column="sort_index" javaType="Long" jdbcType="DECIMAL"/>
         <result property="properties" column="properties" javaType="java.util.Map" jdbcType="CLOB"/>
     </resultMap>
 

hsweb-system/hsweb-system-dynamic-form/hsweb-system-dynamic-form-entity/src/main/java/org/hswebframework/web/entity/form/DynamicFormColumnEntity.java

@@ -78,6 +78,11 @@ public interface DynamicFormColumnEntity extends GenericEntity<String> {
      */
     String properties = "properties";
 
+    /**
+     * 排序序号
+     */
+    String sortIndex = "sortIndex";
+
     /**
      * @return 表单ID
      */
@@ -208,4 +213,8 @@ public interface DynamicFormColumnEntity extends GenericEntity<String> {
     void setDictConfig(String dictConfig);
 
     String getDictConfig();
+
+    Long getSortIndex();
+
+    void setSortIndex(Long sortIndex);
 }

hsweb-system/hsweb-system-dynamic-form/hsweb-system-dynamic-form-entity/src/main/java/org/hswebframework/web/entity/form/SimpleDynamicFormColumnEntity.java

@@ -38,6 +38,8 @@ public class SimpleDynamicFormColumnEntity extends SimpleGenericEntity<String> i
     //数据字典配置
     private String dictConfig;
 
+    private Long sortIndex;
+
     /**
      * @return 表单ID
      */
@@ -217,4 +219,15 @@ public class SimpleDynamicFormColumnEntity extends SimpleGenericEntity<String> i
     public void setDictConfig(String dictConfig) {
         this.dictConfig = dictConfig;
     }
+
+
+    @Override
+    public Long getSortIndex() {
+        return sortIndex;
+    }
+
+    @Override
+    public void setSortIndex(Long sortIndex) {
+        this.sortIndex = sortIndex;
+    }
 }

hsweb-system/hsweb-system-dynamic-form/hsweb-system-dynamic-form-starter/src/main/resources/hsweb-starter.js

@@ -53,6 +53,8 @@ function install(context) {
         .addColumn().name("scale").alias("scale").comment("小数点位数").jdbcType(java.sql.JDBCType.DECIMAL).length(4, 0).commit()
         .addColumn().name("properties").alias("properties").comment("其他配置").jdbcType(java.sql.JDBCType.CLOB).commit()
         .addColumn().name("dict_config").alias("dictConfig").comment("字典配置").jdbcType(java.sql.JDBCType.CLOB).commit()
+        .addColumn().name("sort_index").alias("sortIndex").comment("排序序号").jdbcType(java.sql.JDBCType.DECIMAL).length(32, 0).commit()
+
         .comment("动态表单列").commit();
 
     database.createOrAlter("s_dyn_form_log")