-
-
-
-
-
-
-
- {{
- curViewField.name
- }}
-
-
-
-
-
-
-
-
-
-
-
-
- {{
- item.title
- }}
-
-
-
-
-
-
-
-
-
- {{
- viewField.name
- }}
-
-
-
-
-
-
-
-
-
-
-
-
- {{ t('visualization.add_jump_field') }}
-
+
+
+
+
+
+
+
+ 源字段
+
+
+ {{ t('visualization.link_view_field') }}
+
+
+
+
+
+
+
+
+
+
+
+ {{ curViewField.name }}
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ item.title }}
+
+
+
+
+
+
+
+
+
+ {{ viewField.name }}
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ t('visualization.add_jump_field') }}
+
+
+
+
+ 源字段
+
+
+ {{ t('visualization.link_view_field') }}
+
+
+
+
+
+
+
+
+
+
+
+ {{ curViewField.name }}
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ item.title }}
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ t('visualization.add_jump_field') }}
+
+
@@ -470,6 +590,7 @@ const resourceType = computed(() =>
)
const state = reactive({
+ activeCollapse: 'view',
loading: false,
showSelected: false,
curJumpViewInfo: {},
@@ -526,7 +647,8 @@ const state = reactive({
quotaList: [],
quotaData: [],
dimension: [],
- quota: []
+ quota: [],
+ currentOutParams: []
})
const outerContentEditor = ref(null)
@@ -705,6 +827,17 @@ const getPanelViewList = dvId => {
state.viewIdFieldArrayMap[view.id] = view.tableFields
})
}
+ // 外部参数 currentLinkPanelViewArray 也加入
+ // 在图表侧进行隐藏 保存的时候直接保存currentLinkPanelViewArray 方便处理
+ state.currentOutParams = rsp.data.outParamsJumpInfo || []
+ if (state.currentOutParams && state.currentOutParams.length > 0) {
+ state.currentOutParams.forEach(outerParamsItem => {
+ state.currentLinkPanelViewArray.push(outerParamsItem)
+ state.viewIdFieldArrayMap[outerParamsItem.id] = [
+ { id: '1000001', name: t('visualization.out_params_no_select') }
+ ]
+ })
+ }
// 增加过滤组件匹配
JSON.parse(rsp.data.bashComponentData).forEach(componentItem => {
if (componentItem.component === 'VQuery') {
@@ -723,6 +856,7 @@ const getPanelViewList = dvId => {
})
})
}
+
const dvNodeClick = data => {
if (data.leaf) {
state.linkJumpInfo.targetViewInfoList = []
@@ -736,6 +870,11 @@ const addLinkJumpField = () => {
targetFieldId: ''
})
}
+
+const deleteLinkJumpFieldById = index => {
+ state.linkJumpInfo.targetViewInfoList.splice(index, 1)
+}
+
const deleteLinkJumpField = index => {
state.linkJumpInfo.targetViewInfoList.splice(index, 1)
}
@@ -1244,4 +1383,42 @@ span {
display: flex;
align-items: center;
}
+
+.jump-com-list {
+ width: 100%;
+ margin-top: -18px;
+ :deep(.ed-collapse) {
+ --ed-collapse-header-font-size: 14px;
+ --ed-collapse-content-font-size: 14px;
+ }
+ :deep(.ed-tabs__active-bar) {
+ height: 2px;
+ }
+
+ & > :deep(.ed-tabs) {
+ --ed-tabs-header-height: 36px;
+ margin-bottom: 12px;
+ position: sticky;
+ background: #fff;
+ .ed-tabs__header {
+ &::before {
+ content: '';
+ width: 8px;
+ height: 1px;
+ position: absolute;
+ bottom: 0;
+ left: 0;
+ background: #1f232926;
+ }
+ }
+ }
+
+ :deep(.ed-tabs__item) {
+ font-size: 14px;
+ }
+
+ :deep(.ed-tabs__item):not(.is-active) {
+ color: #646a73;
+ }
+}
diff --git a/core/core-frontend/src/locales/zh-CN.ts b/core/core-frontend/src/locales/zh-CN.ts
index 7c73207f84..a0a0f5761a 100644
--- a/core/core-frontend/src/locales/zh-CN.ts
+++ b/core/core-frontend/src/locales/zh-CN.ts
@@ -2671,6 +2671,7 @@ export default {
column_name: '字段名称'
},
visualization: {
+ out_params_no_select: '外部参数无需选择',
filter_no_select: '过滤组件无需选择',
forbidden_copy: '当前组件不允许复制',
url_check_error: '跳转错误，URL不合法',
diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/visualization/dto/VisualizationComponentDTO.java b/sdk/api/api-base/src/main/java/io/dataease/api/visualization/dto/VisualizationComponentDTO.java
index 41814fc877..14fcfd3757 100644
--- a/sdk/api/api-base/src/main/java/io/dataease/api/visualization/dto/VisualizationComponentDTO.java
+++ b/sdk/api/api-base/src/main/java/io/dataease/api/visualization/dto/VisualizationComponentDTO.java
@@ -1,5 +1,6 @@
package io.dataease.api.visualization.dto;
+import io.dataease.api.visualization.vo.VisualizationOutParamsJumpVO;
import io.dataease.api.visualization.vo.VisualizationViewTableVO;
import lombok.AllArgsConstructor;
import lombok.Data;
@@ -20,4 +21,6 @@ public class VisualizationComponentDTO {
List
visualizationViewTables;
+ List outParamsJumpInfo;
+
}
diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/visualization/vo/VisualizationLinkJumpTargetViewInfoVO.java b/sdk/api/api-base/src/main/java/io/dataease/api/visualization/vo/VisualizationLinkJumpTargetViewInfoVO.java
index f9c308bf43..bc78f82fc5 100644
--- a/sdk/api/api-base/src/main/java/io/dataease/api/visualization/vo/VisualizationLinkJumpTargetViewInfoVO.java
+++ b/sdk/api/api-base/src/main/java/io/dataease/api/visualization/vo/VisualizationLinkJumpTargetViewInfoVO.java
@@ -19,12 +19,15 @@ public class VisualizationLinkJumpTargetViewInfoVO {
*/
@JsonSerialize(using = ToStringSerializer.class)
private Long sourceFieldActiveId;
- @JsonSerialize(using = ToStringSerializer.class)
- private Long targetViewId;
- @JsonSerialize(using = ToStringSerializer.class)
- private Long targetFieldId;
+ private String targetViewId;
+ private String targetFieldId;
@JsonSerialize(using = ToStringSerializer.class)
private Long copyFrom;
@JsonSerialize(using = ToStringSerializer.class)
private Long copyId;
+
+ /**
+ * 联动目标类型 view 图表 filter 过滤组件 outParams 外部参数
+ */
+ private String targetType;
}
diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/visualization/vo/VisualizationOutParamsJumpVO.java b/sdk/api/api-base/src/main/java/io/dataease/api/visualization/vo/VisualizationOutParamsJumpVO.java
new file mode 100644
index 0000000000..f323b810fc
--- /dev/null
+++ b/sdk/api/api-base/src/main/java/io/dataease/api/visualization/vo/VisualizationOutParamsJumpVO.java
@@ -0,0 +1,15 @@
+package io.dataease.api.visualization.vo;
+
+import lombok.Data;
+
+@Data
+public class VisualizationOutParamsJumpVO {
+
+ private String id;
+
+ private String type;
+
+ private String name;
+
+ private String title;
+}