diff --git a/dbsql/update/update202308.sql b/dbsql/update/update202308.sql index bb4d6d2..3979e56 100644 --- a/dbsql/update/update202308.sql +++ b/dbsql/update/update202308.sql @@ -1,2 +1,5 @@ alter table BIANMU.B_DIRECTORY add SORT integer; -comment on column BIANMU.B_DIRECTORY.SORT is '加载顺序'; \ No newline at end of file +comment on column BIANMU.B_DIRECTORY.SORT is '加载顺序'; + +alter table BIANMU.B_DATA_LABELS add SORT integer; +comment on column BIANMU.B_DATA_LABELS.SORT is '加载顺序'; \ No newline at end of file diff --git a/shandan-system/src/main/java/com/keyware/shandan/bianmu/entity/DataLabelsVo.java b/shandan-system/src/main/java/com/keyware/shandan/bianmu/entity/DataLabelsVo.java index 6166c69..3fd300e 100644 --- a/shandan-system/src/main/java/com/keyware/shandan/bianmu/entity/DataLabelsVo.java +++ b/shandan-system/src/main/java/com/keyware/shandan/bianmu/entity/DataLabelsVo.java @@ -3,7 +3,6 @@ package com.keyware.shandan.bianmu.entity; import com.baomidou.mybatisplus.annotation.*; import com.keyware.shandan.common.entity.BaseEntity; import com.keyware.shandan.common.util.StringUtils; -import com.keyware.shandan.system.utils.StringUtil; import lombok.*; import java.util.Date; @@ -74,6 +73,13 @@ public class DataLabelsVo extends BaseEntity { @OrderBy(isDesc = false, sort = 1) private Boolean isLabel; + /** + * 渲染顺序 + */ + @TableField(value = "SORT") + @OrderBy(isDesc = false) + private Integer sort; + /** * 创建时间 */ @@ -91,7 +97,7 @@ public class DataLabelsVo extends BaseEntity { return ""; } - public String getTitlePathWithSelf(){ + public String getTitlePathWithSelf() { if (StringUtils.hasText(titlePath)) { return titlePath + title + "/"; } diff --git a/shandan-system/src/main/resources/static/js/business/datalabels/managerIndex.js b/shandan-system/src/main/resources/static/js/business/datalabels/managerIndex.js index a97fca5..4afcbe2 100644 --- a/shandan-system/src/main/resources/static/js/business/datalabels/managerIndex.js +++ b/shandan-system/src/main/resources/static/js/business/datalabels/managerIndex.js @@ -289,6 +289,12 @@ layui.use(['layer', 'form', 'gtable', 'globalTree'], function () { +
+
+ + +
+