- {{ state.currentTemplateLabel }} ({{ state.currentTemplateShowList.length }})
-
- {{ t('visualization.import') }}
-
-
-
+
+
模版管理
+
+ {{ t('visualization.import') }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ state.currentTemplateLabel }} ({{
+ state.currentTemplateShowList.length
+ }})
+
+ {{ state.currentTemplateLabel }}
+ 的搜索结果 {{ currentTemplateShowListComputed.length }} 个
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -118,6 +141,7 @@ const roleValidator = (rule, value, callback) => {
}
const state = reactive({
+ templateFilterText: '',
showShare: false,
currentTemplateShowList: [],
noneImg: '@/assets/None.png',
@@ -145,8 +169,8 @@ const state = reactive({
currentTemplateLabel: '',
currentTemplateId: '',
templateList: [],
- templateMiniWidth: 286,
- templateCurWidth: 286,
+ templateMiniWidth: 256,
+ templateCurWidth: 256,
formType: '',
originName: '',
templateDialog: {
@@ -156,6 +180,13 @@ const state = reactive({
}
})
+const currentTemplateShowListComputed = computed(() => {
+ if (!state.templateFilterText) return [...state.currentTemplateShowList]
+ return state.currentTemplateShowList.filter(ele =>
+ ele['name']?.includes(state.templateFilterText)
+ )
+})
+
const nameList = computed(() => {
const { nodeType } = state.templateEditForm || {}
if (nodeType === 'template') {
@@ -168,6 +199,18 @@ const nameList = computed(() => {
return []
})
+const initStyle = () => {
+ nextTick(() => {
+ const tree = document.querySelector('.ed-tree')
+ // 创建横线元素
+ const line = document.createElement('hr')
+ line.classList.add('custom-line')
+
+ // 将横线元素插入到第一个选项后面
+ tree.firstElementChild.appendChild(line)
+ })
+}
+
const nameRepeat = value => {
if (!nameList.value) {
return false
@@ -334,11 +377,12 @@ onMounted(() => {
// 监听div变动事件
erd.listenTo(templateMainDom, element => {
nextTick(() => {
- const curSeparator = Math.trunc(templateMainDom.offsetWidth / state.templateMiniWidth)
- state.templateCurWidth =
- Math.trunc(templateMainDom.offsetWidth / curSeparator) - 24 - curSeparator
+ const offsetWidth = templateMainDom.offsetWidth - 24
+ const curSeparator = Math.trunc(offsetWidth / state.templateMiniWidth)
+ state.templateCurWidth = Math.trunc(offsetWidth / curSeparator) - 24 - curSeparator
})
})
+ initStyle()
})
@@ -364,9 +408,8 @@ onMounted(() => {
.de-tabs-right {
flex: 1;
- background: #fff;
- padding: 24px 0 24px 24px;
overflow: hidden;
+ background: rgba(239, 240, 241, 1);
.template-box {
display: flex;
@@ -376,12 +419,12 @@ onMounted(() => {
align-content: flex-start;
height: calc(100% - 10px);
width: 100%;
- padding-bottom: 24px;
+ padding: 16px 0px 16px 24px;
}
.active-template {
- margin: 4px 0 20px 0;
- padding-right: 24px;
+ height: 56px;
+ padding: 0px 24px;
font-family: 'PingFang SC';
font-style: normal;
font-weight: 500;
@@ -389,8 +432,45 @@ onMounted(() => {
display: flex;
align-items: center;
justify-content: space-between;
- color: var(--deTextPrimary, #1f2329);
+ color: rgba(31, 35, 41, 1);
+ background: #fff;
+ border-bottom: 1px solid rgba(31, 35, 41, 0.15);
}
}
}
+
+.router-title {
+ color: #1f2329;
+ font-feature-settings: 'clig' off, 'liga' off;
+ font-family: PingFang SC;
+ font-size: 20px;
+ font-style: normal;
+ font-weight: 500;
+ line-height: 28px;
+ float: left;
+}
+.sys-setting-p {
+ width: 100%;
+ background: #ffffff;
+ height: calc(100vh - 136px);
+ box-sizing: border-box;
+ margin-top: 12px;
+}
+.setting-auto-h {
+ height: auto !important;
+}
+
+.container-sys-param {
+ height: 100%;
+ overflow-y: auto;
+}
+
+.template-head {
+ height: 32px;
+}
+.template-search-class {
+ float: right;
+ width: 320px;
+ margin-right: 12px;
+}
diff --git a/pom.xml b/pom.xml
index c856156989..90b930b54e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -25,7 +25,7 @@
3.5.3.1
1.4.199
4.1.0
-
1.36.0
+
1.35.1
2.6.0
3.5.2
3.12.1
diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/chart/dto/ChartCustomFilterItemDTO.java b/sdk/api/api-base/src/main/java/io/dataease/api/chart/dto/ChartCustomFilterItemDTO.java
index 27a6e049aa..cdf0fbeeb3 100644
--- a/sdk/api/api-base/src/main/java/io/dataease/api/chart/dto/ChartCustomFilterItemDTO.java
+++ b/sdk/api/api-base/src/main/java/io/dataease/api/chart/dto/ChartCustomFilterItemDTO.java
@@ -1,5 +1,7 @@
package io.dataease.api.chart.dto;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import lombok.Data;
import java.io.Serializable;
@@ -9,6 +11,7 @@ import java.io.Serializable;
*/
@Data
public class ChartCustomFilterItemDTO implements Serializable {
+ @JsonSerialize(using = ToStringSerializer.class)
private Long fieldId;
private String term;
private String value;
diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/chart/dto/ChartQuotaDTO.java b/sdk/api/api-base/src/main/java/io/dataease/api/chart/dto/ChartQuotaDTO.java
index ea3cd12391..fafe973ef9 100644
--- a/sdk/api/api-base/src/main/java/io/dataease/api/chart/dto/ChartQuotaDTO.java
+++ b/sdk/api/api-base/src/main/java/io/dataease/api/chart/dto/ChartQuotaDTO.java
@@ -1,5 +1,7 @@
package io.dataease.api.chart.dto;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import lombok.Data;
/**
@@ -7,5 +9,6 @@ import lombok.Data;
*/
@Data
public class ChartQuotaDTO {
+ @JsonSerialize(using = ToStringSerializer.class)
private Long id;
}