forked from github/dataease
feat(仪表板): s2表格支持点击行头列头跳转并在跳转是带入其他相关字段匹配
This commit is contained in:
parent
9ad2faa99a
commit
4483b65b12
@ -9,11 +9,13 @@
|
||||
</collection>
|
||||
</resultMap>
|
||||
|
||||
<resultMap id="LinkJumpInfoMap" type="io.dataease.dto.panel.linkJump.PanelLinkJumpInfoDTO" extends="io.dataease.plugins.common.base.mapper.PanelLinkJumpInfoMapper.BaseResultMap">
|
||||
<resultMap id="LinkJumpInfoMap" type="io.dataease.dto.panel.linkJump.PanelLinkJumpInfoDTO"
|
||||
extends="io.dataease.plugins.common.base.mapper.PanelLinkJumpInfoMapper.BaseResultMap">
|
||||
<result column="source_field_id" jdbcType="VARCHAR" property="sourceFieldId"/>
|
||||
<result column="source_field_name" jdbcType="VARCHAR" property="sourceFieldName"/>
|
||||
<result column="publicJumpId" jdbcType="VARCHAR" property="publicJumpId"/>
|
||||
<collection property="targetViewInfoList" ofType="io.dataease.plugins.common.base.domain.PanelLinkJumpTargetViewInfo">
|
||||
<collection property="targetViewInfoList"
|
||||
ofType="io.dataease.plugins.common.base.domain.PanelLinkJumpTargetViewInfo">
|
||||
<result column="target_view_id" jdbcType="VARCHAR" property="targetViewId"/>
|
||||
<result column="target_field_id" jdbcType="VARCHAR" property="targetFieldId"/>
|
||||
</collection>
|
||||
@ -27,230 +29,244 @@
|
||||
</resultMap>
|
||||
|
||||
<select id="getLinkJumpInfo" resultMap="LinkJumpInfoMap">
|
||||
SELECT
|
||||
dataset_table_field.id AS 'source_field_id',
|
||||
dataset_table_field.NAME AS 'source_field_name',
|
||||
panel_link_jump_info.id,
|
||||
panel_link_jump_info.link_jump_id,
|
||||
panel_link_jump_info.link_type,
|
||||
panel_link_jump_info.jump_type,
|
||||
panel_link_jump_info.target_panel_id,
|
||||
panel_link_jump_info.content,
|
||||
ifnull( panel_link_mapping.uuid, panel_link_mapping.id ) AS publicJumpId,
|
||||
ifnull( panel_link_jump_info.checked, 0 ) AS checked,
|
||||
ifnull( panel_link_jump_info.attach_params, 0 ) AS attach_params,
|
||||
panel_link_jump_target_view_info.target_view_id,
|
||||
panel_link_jump_target_view_info.target_field_id
|
||||
FROM
|
||||
chart_view
|
||||
LEFT JOIN dataset_table_field ON chart_view.table_id = dataset_table_field.table_id
|
||||
LEFT JOIN panel_link_jump ON chart_view.id = panel_link_jump.source_view_id and panel_link_jump.id = #{id}
|
||||
LEFT JOIN panel_link_jump_info ON panel_link_jump.id = panel_link_jump_info.link_jump_id
|
||||
SELECT dataset_table_field.id AS 'source_field_id', dataset_table_field.NAME AS 'source_field_name', panel_link_jump_info.id,
|
||||
panel_link_jump_info.link_jump_id,
|
||||
panel_link_jump_info.link_type,
|
||||
panel_link_jump_info.jump_type,
|
||||
panel_link_jump_info.target_panel_id,
|
||||
panel_link_jump_info.content,
|
||||
ifnull(panel_link_mapping.uuid, panel_link_mapping.id) AS publicJumpId,
|
||||
ifnull(panel_link_jump_info.checked, 0) AS checked,
|
||||
ifnull(panel_link_jump_info.attach_params, 0) AS attach_params,
|
||||
panel_link_jump_target_view_info.target_view_id,
|
||||
panel_link_jump_target_view_info.target_field_id
|
||||
FROM chart_view
|
||||
LEFT JOIN dataset_table_field ON chart_view.table_id = dataset_table_field.table_id
|
||||
LEFT JOIN panel_link_jump
|
||||
ON chart_view.id = panel_link_jump.source_view_id and panel_link_jump.id = #{id}
|
||||
LEFT JOIN panel_link_jump_info ON panel_link_jump.id = panel_link_jump_info.link_jump_id
|
||||
AND dataset_table_field.id = panel_link_jump_info.source_field_id
|
||||
LEFT JOIN panel_link_jump_target_view_info ON panel_link_jump_info.id = panel_link_jump_target_view_info.link_jump_info_id
|
||||
LEFT JOIN panel_link_mapping on panel_link_jump_info.target_panel_id = panel_link_mapping.resource_id
|
||||
WHERE
|
||||
chart_view.id =#{source_view_id}
|
||||
LEFT JOIN panel_link_jump_target_view_info
|
||||
ON panel_link_jump_info.id = panel_link_jump_target_view_info.link_jump_info_id
|
||||
LEFT JOIN panel_link_mapping on panel_link_jump_info.target_panel_id = panel_link_mapping.resource_id
|
||||
WHERE chart_view.id = #{source_view_id}
|
||||
ORDER BY CONVERT(dataset_table_field.NAME using gbk)
|
||||
</select>
|
||||
|
||||
<select id="queryWithPanelId" resultMap="BaseResultMapDTO">
|
||||
SELECT
|
||||
chart_view.id AS source_view_id,
|
||||
panel_link_jump.id,
|
||||
#{panelId} as 'source_panel_id',
|
||||
panel_link_jump.link_jump_info,
|
||||
ifnull( panel_link_jump.checked, 0 ) AS checked
|
||||
FROM
|
||||
chart_view
|
||||
LEFT JOIN panel_link_jump ON chart_view.id = panel_link_jump.source_view_id
|
||||
WHERE
|
||||
panel_link_jump.source_panel_id = #{panelId}
|
||||
and panel_link_jump.checked = 1
|
||||
SELECT chart_view.id AS source_view_id,
|
||||
panel_link_jump.id,
|
||||
#{panelId} as 'source_panel_id', panel_link_jump.link_jump_info,
|
||||
ifnull(panel_link_jump.checked, 0) AS checked
|
||||
FROM chart_view
|
||||
LEFT JOIN panel_link_jump ON chart_view.id = panel_link_jump.source_view_id
|
||||
WHERE panel_link_jump.source_panel_id = #{panelId}
|
||||
and panel_link_jump.checked = 1
|
||||
</select>
|
||||
|
||||
<select id="queryWithViewId" resultMap="BaseResultMapDTO">
|
||||
SELECT
|
||||
chart_view.id AS source_view_id,
|
||||
panel_link_jump.id,
|
||||
#{panelId} as 'source_panel_id',
|
||||
panel_link_jump.link_jump_info,
|
||||
ifnull( panel_link_jump.checked, 0 ) AS checked
|
||||
FROM
|
||||
chart_view
|
||||
LEFT JOIN panel_link_jump ON chart_view.id = panel_link_jump.source_view_id
|
||||
SELECT chart_view.id AS source_view_id,
|
||||
panel_link_jump.id,
|
||||
#{panelId} as 'source_panel_id', panel_link_jump.link_jump_info,
|
||||
ifnull(panel_link_jump.checked, 0) AS checked
|
||||
FROM chart_view
|
||||
LEFT JOIN panel_link_jump ON chart_view.id = panel_link_jump.source_view_id
|
||||
AND panel_link_jump.source_panel_id = #{panelId}
|
||||
WHERE
|
||||
chart_view.id = #{viewId}
|
||||
</select>
|
||||
|
||||
<delete id="deleteJumpTargetViewInfo" >
|
||||
DELETE ljtv
|
||||
FROM
|
||||
panel_link_jump_target_view_info ljtv,
|
||||
panel_link_jump_info lji,
|
||||
panel_link_jump lj
|
||||
WHERE
|
||||
ljtv.link_jump_info_id = lji.id
|
||||
AND lji.link_jump_id = lj.id
|
||||
AND lj.source_panel_id = #{panelId}
|
||||
AND lj.source_view_id = #{viewId}
|
||||
</delete>
|
||||
|
||||
<delete id="deleteJumpInfo" >
|
||||
DELETE lji
|
||||
FROM
|
||||
panel_link_jump_info lji,
|
||||
panel_link_jump lj
|
||||
WHERE
|
||||
lji.link_jump_id = lj.id
|
||||
AND lj.source_panel_id = #{panelId}
|
||||
AND lj.source_view_id = #{viewId}
|
||||
</delete>
|
||||
|
||||
<delete id="deleteJump" >
|
||||
DELETE lj
|
||||
FROM
|
||||
panel_link_jump lj
|
||||
WHERE
|
||||
lj.source_panel_id = #{panelId}
|
||||
AND lj.source_view_id = #{viewId}
|
||||
</delete>
|
||||
|
||||
|
||||
|
||||
<delete id="deleteJumpTargetViewInfoWithPanel" >
|
||||
DELETE ljtv
|
||||
FROM
|
||||
panel_link_jump_target_view_info ljtv,
|
||||
panel_link_jump_info lji,
|
||||
panel_link_jump lj
|
||||
WHERE
|
||||
ljtv.link_jump_info_id = lji.id
|
||||
AND lji.link_jump_id = lj.id
|
||||
AND (lj.source_panel_id = #{panelId} or lji.target_panel_id = #{panelId})
|
||||
</delete>
|
||||
|
||||
<delete id="deleteJumpInfoWithPanel" >
|
||||
DELETE lji
|
||||
FROM
|
||||
panel_link_jump_info lji,
|
||||
panel_link_jump lj
|
||||
WHERE
|
||||
lji.link_jump_id = lj.id
|
||||
AND (lj.source_panel_id = #{panelId} or lji.target_panel_id = #{panelId})
|
||||
</delete>
|
||||
|
||||
<delete id="deleteJumpWithPanel" >
|
||||
DELETE lj
|
||||
FROM
|
||||
panel_link_jump lj
|
||||
WHERE
|
||||
lj.source_panel_id = #{panelId}
|
||||
</delete>
|
||||
|
||||
<select id="getTargetPanelJumpInfo" resultMap="AllJumpMap">
|
||||
SELECT DISTINCT
|
||||
concat( lj.source_view_id, '#', lji.source_field_id ) AS 'sourceInfo',
|
||||
concat( jtvi.target_view_id, '#', jtvi.target_field_id ) AS 'targetInfo'
|
||||
FROM
|
||||
panel_link_jump_target_view_info jtvi
|
||||
LEFT JOIN panel_link_jump_info lji ON jtvi.link_jump_info_id = lji.id
|
||||
LEFT JOIN panel_link_jump lj ON lji.link_jump_id = lj.id
|
||||
WHERE
|
||||
lj.source_panel_id = #{request.sourcePanelId}
|
||||
AND lj.source_view_id = #{request.sourceViewId}
|
||||
AND lji.target_panel_id = #{request.targetPanelId}
|
||||
AND lji.source_field_id = #{request.sourceFieldId}
|
||||
WHERE chart_view.id = #{viewId}
|
||||
</select>
|
||||
|
||||
<insert id="copyLinkJump" >
|
||||
insert into panel_link_jump (id, source_panel_id, source_view_id, link_jump_info, `checked`, copy_from, copy_id)
|
||||
select
|
||||
UUID() as id,
|
||||
panel_view_copy.t_panel_id as source_panel_id,
|
||||
panel_view_copy.t_chart_view_id as source_view_id,
|
||||
panel_link_jump.link_jump_info,
|
||||
panel_link_jump.checked,
|
||||
panel_link_jump.id as copy_from,
|
||||
#{copyId} as copy_id
|
||||
from panel_link_jump inner join
|
||||
(SELECT
|
||||
pvs.panel_id as s_panel_id,
|
||||
pvs.chart_view_id as s_chart_view_id,
|
||||
pvt.panel_id as t_panel_id,
|
||||
pvt.chart_view_id as t_chart_view_id
|
||||
<delete id="deleteJumpTargetViewInfo">
|
||||
DELETE
|
||||
ljtv
|
||||
FROM
|
||||
panel_view pvt
|
||||
inner JOIN panel_view pvs ON pvt.copy_from = pvs.id
|
||||
WHERE
|
||||
pvt.copy_id = #{copyId}) panel_view_copy on panel_link_jump.source_panel_id = panel_view_copy.s_panel_id
|
||||
and panel_link_jump.source_view_id = panel_view_copy.s_chart_view_id
|
||||
</insert>
|
||||
panel_link_jump_target_view_info ljtv,
|
||||
panel_link_jump_info lji,
|
||||
panel_link_jump lj
|
||||
WHERE
|
||||
ljtv.link_jump_info_id = lji.id
|
||||
AND lji.link_jump_id = lj.id
|
||||
AND lj.source_panel_id =
|
||||
#{panelId}
|
||||
AND
|
||||
lj
|
||||
.
|
||||
source_view_id
|
||||
=
|
||||
#{viewId}
|
||||
</delete>
|
||||
|
||||
<delete id="deleteJumpInfo">
|
||||
DELETE
|
||||
lji
|
||||
FROM
|
||||
panel_link_jump_info lji,
|
||||
panel_link_jump lj
|
||||
WHERE
|
||||
lji.link_jump_id = lj.id
|
||||
AND lj.source_panel_id =
|
||||
#{panelId}
|
||||
AND
|
||||
lj
|
||||
.
|
||||
source_view_id
|
||||
=
|
||||
#{viewId}
|
||||
</delete>
|
||||
|
||||
<delete id="deleteJump">
|
||||
DELETE
|
||||
lj
|
||||
FROM
|
||||
panel_link_jump lj
|
||||
WHERE
|
||||
lj.source_panel_id =
|
||||
#{panelId}
|
||||
AND
|
||||
lj
|
||||
.
|
||||
source_view_id
|
||||
=
|
||||
#{viewId}
|
||||
</delete>
|
||||
|
||||
|
||||
<delete id="deleteJumpTargetViewInfoWithPanel">
|
||||
DELETE
|
||||
ljtv
|
||||
FROM
|
||||
panel_link_jump_target_view_info ljtv,
|
||||
panel_link_jump_info lji,
|
||||
panel_link_jump lj
|
||||
WHERE
|
||||
ljtv.link_jump_info_id = lji.id
|
||||
AND lji.link_jump_id = lj.id
|
||||
AND (lj.source_panel_id =
|
||||
#{panelId}
|
||||
or
|
||||
lji
|
||||
.
|
||||
target_panel_id
|
||||
=
|
||||
#{panelId}
|
||||
)
|
||||
</delete>
|
||||
|
||||
<delete id="deleteJumpInfoWithPanel">
|
||||
DELETE
|
||||
lji
|
||||
FROM
|
||||
panel_link_jump_info lji,
|
||||
panel_link_jump lj
|
||||
WHERE
|
||||
lji.link_jump_id = lj.id
|
||||
AND (lj.source_panel_id =
|
||||
#{panelId}
|
||||
or
|
||||
lji
|
||||
.
|
||||
target_panel_id
|
||||
=
|
||||
#{panelId}
|
||||
)
|
||||
</delete>
|
||||
|
||||
<delete id="deleteJumpWithPanel">
|
||||
DELETE
|
||||
lj
|
||||
FROM
|
||||
panel_link_jump lj
|
||||
WHERE
|
||||
lj.source_panel_id =
|
||||
#{panelId}
|
||||
</delete>
|
||||
|
||||
<select id="getTargetPanelJumpInfo" resultMap="AllJumpMap">
|
||||
SELECT DISTINCT
|
||||
concat( lj.source_view_id, '#', lji.source_field_id ) AS 'sourceInfo',
|
||||
concat( jtvi.target_view_id, '#', jtvi.target_field_id ) AS 'targetInfo'
|
||||
FROM
|
||||
panel_link_jump_target_view_info jtvi
|
||||
LEFT JOIN panel_link_jump_info lji ON jtvi.link_jump_info_id = lji.id
|
||||
LEFT JOIN panel_link_jump lj ON lji.link_jump_id = lj.id
|
||||
WHERE
|
||||
lj.source_panel_id = #{request.sourcePanelId}
|
||||
AND lj.source_view_id = #{request.sourceViewId}
|
||||
AND lji.target_panel_id = #{request.targetPanelId}
|
||||
<if test="request.sourceFieldId != null">
|
||||
AND lji.source_field_id = #{request.sourceFieldId}
|
||||
</if>
|
||||
</select>
|
||||
|
||||
<insert id="copyLinkJump">
|
||||
insert into panel_link_jump (id, source_panel_id, source_view_id, link_jump_info, `checked`, copy_from, copy_id)
|
||||
select UUID() as id,
|
||||
panel_view_copy.t_panel_id as source_panel_id,
|
||||
panel_view_copy.t_chart_view_id as source_view_id,
|
||||
panel_link_jump.link_jump_info,
|
||||
panel_link_jump.checked,
|
||||
panel_link_jump.id as copy_from,
|
||||
#{copyId} as copy_id
|
||||
from panel_link_jump
|
||||
inner join
|
||||
(SELECT pvs.panel_id as s_panel_id,
|
||||
pvs.chart_view_id as s_chart_view_id,
|
||||
pvt.panel_id as t_panel_id,
|
||||
pvt.chart_view_id as t_chart_view_id
|
||||
FROM panel_view pvt
|
||||
inner JOIN panel_view pvs ON pvt.copy_from = pvs.id
|
||||
WHERE pvt.copy_id = #{copyId}) panel_view_copy
|
||||
on panel_link_jump.source_panel_id = panel_view_copy.s_panel_id
|
||||
and panel_link_jump.source_view_id = panel_view_copy.s_chart_view_id
|
||||
</insert>
|
||||
|
||||
<insert id="copyLinkJumpInfo">
|
||||
INSERT INTO panel_link_jump_info (
|
||||
id,
|
||||
link_jump_id,
|
||||
link_type,
|
||||
jump_type,
|
||||
target_panel_id,
|
||||
source_field_id,
|
||||
content,
|
||||
`checked`,
|
||||
`attach_params`,
|
||||
copy_from,
|
||||
copy_id
|
||||
) SELECT
|
||||
uuid() AS id,
|
||||
plj_copy.t_id,
|
||||
link_type,
|
||||
jump_type,
|
||||
target_panel_id,
|
||||
source_field_id,
|
||||
content,
|
||||
`checked`,
|
||||
`attach_params`,
|
||||
id AS copy_from,
|
||||
#{copyId}
|
||||
FROM
|
||||
panel_link_jump_info
|
||||
inner JOIN (
|
||||
SELECT
|
||||
id AS t_id,
|
||||
copy_from AS s_id
|
||||
FROM
|
||||
panel_link_jump
|
||||
WHERE
|
||||
copy_id = #{copyId}
|
||||
) plj_copy ON panel_link_jump_info.link_jump_id = plj_copy.s_id
|
||||
INSERT INTO panel_link_jump_info (id,
|
||||
link_jump_id,
|
||||
link_type,
|
||||
jump_type,
|
||||
target_panel_id,
|
||||
source_field_id,
|
||||
content,
|
||||
`checked`,
|
||||
`attach_params`,
|
||||
copy_from,
|
||||
copy_id)
|
||||
SELECT uuid() AS id,
|
||||
plj_copy.t_id,
|
||||
link_type,
|
||||
jump_type,
|
||||
target_panel_id,
|
||||
source_field_id,
|
||||
content,
|
||||
`checked`,
|
||||
`attach_params`,
|
||||
id AS copy_from,
|
||||
#{copyId}
|
||||
FROM panel_link_jump_info
|
||||
inner JOIN (SELECT id AS t_id,
|
||||
copy_from AS s_id
|
||||
FROM panel_link_jump
|
||||
WHERE copy_id = #{copyId}) plj_copy ON panel_link_jump_info.link_jump_id = plj_copy.s_id
|
||||
</insert>
|
||||
|
||||
<insert id ="copyLinkJumpTarget">
|
||||
INSERT INTO panel_link_jump_target_view_info (
|
||||
target_id,
|
||||
link_jump_info_id,
|
||||
target_view_id,
|
||||
target_field_id,
|
||||
copy_from,
|
||||
copy_id
|
||||
) SELECT
|
||||
uuid() AS id,
|
||||
plji_copy.t_id AS link_jump_info_id,
|
||||
target_view_id,
|
||||
target_field_id,
|
||||
copy_from,
|
||||
#{copyId} AS copy_id
|
||||
FROM
|
||||
panel_link_jump_target_view_info
|
||||
inner JOIN (
|
||||
SELECT
|
||||
id AS t_id,
|
||||
copy_from AS s_id
|
||||
FROM
|
||||
panel_link_jump_info
|
||||
WHERE
|
||||
copy_id = #{copyId}
|
||||
) plji_copy ON panel_link_jump_target_view_info.link_jump_info_id = plji_copy.s_id
|
||||
<insert id="copyLinkJumpTarget">
|
||||
INSERT INTO panel_link_jump_target_view_info (target_id,
|
||||
link_jump_info_id,
|
||||
target_view_id,
|
||||
target_field_id,
|
||||
copy_from,
|
||||
copy_id)
|
||||
SELECT uuid() AS id,
|
||||
plji_copy.t_id AS link_jump_info_id,
|
||||
target_view_id,
|
||||
target_field_id,
|
||||
copy_from,
|
||||
#{copyId} AS copy_id
|
||||
FROM panel_link_jump_target_view_info
|
||||
inner JOIN (SELECT id AS t_id,
|
||||
copy_from AS s_id
|
||||
FROM panel_link_jump_info
|
||||
WHERE copy_id = #{copyId}) plji_copy
|
||||
ON panel_link_jump_target_view_info.link_jump_info_id = plji_copy.s_id
|
||||
</insert>
|
||||
</mapper>
|
||||
|
@ -139,6 +139,10 @@ export default {
|
||||
sourceFieldId: jumpParam.sourceFieldId,
|
||||
targetPanelId: this.panelId
|
||||
}
|
||||
//透视表中的其他维度数据数据都进行匹配
|
||||
if (jumpParam.sourceType && jumpParam.sourceType === 'table-pivot') {
|
||||
jumpRequestParam.targetPanelId = null
|
||||
}
|
||||
try {
|
||||
// 刷新跳转目标仪表板联动信息
|
||||
queryTargetPanelJumpInfo(jumpRequestParam).then(rsp => {
|
||||
|
@ -936,7 +936,7 @@ export default {
|
||||
// 如果有名称name 获取和name匹配的dimension 否则倒序取最后一个能匹配的
|
||||
if (param.name) {
|
||||
param.dimensionList.forEach(dimensionItem => {
|
||||
if (dimensionItem.value === param.name) {
|
||||
if (dimensionItem.id === param.name) {
|
||||
dimension = dimensionItem
|
||||
sourceInfo = param.viewId + '#' + dimension.id
|
||||
jumpInfo = this.nowPanelJumpInfo[sourceInfo]
|
||||
|
@ -67,8 +67,8 @@
|
||||
>
|
||||
{{ $t('chart.total') }}
|
||||
<span>{{
|
||||
(chart.datasetMode === 0 && !not_support_page_dataset.includes(chart.datasourceType)) ? chart.totalItems : ((chart.data && chart.data.tableRow) ? chart.data.tableRow.length : 0)
|
||||
}}</span>
|
||||
(chart.datasetMode === 0 && !not_support_page_dataset.includes(chart.datasourceType)) ? chart.totalItems : ((chart.data && chart.data.tableRow) ? chart.data.tableRow.length : 0)
|
||||
}}</span>
|
||||
{{ $t('chart.items') }}
|
||||
</span>
|
||||
<de-pagination
|
||||
@ -347,16 +347,19 @@ export default {
|
||||
}
|
||||
const dimensionList = []
|
||||
for (const key in rowData) {
|
||||
if (meta.fieldValue === rowData[key]) {
|
||||
if (nameIdMap[key]) {
|
||||
dimensionList.push({ id: nameIdMap[key], value: rowData[key] })
|
||||
}
|
||||
}
|
||||
|
||||
this.antVActionPost(dimensionList, nameIdMap[meta.valueField] || 'null')
|
||||
},
|
||||
antVActionPost(dimensionList, name) {
|
||||
this.pointParam = {
|
||||
data: {
|
||||
dimensionList: dimensionList,
|
||||
quotaList: [],
|
||||
name: meta.fieldValue || 'null'
|
||||
name: name,
|
||||
sourceType: this.chart.type
|
||||
}
|
||||
}
|
||||
|
||||
@ -372,11 +375,17 @@ export default {
|
||||
const cell = this.myChart.getCell(param.target)
|
||||
const meta = cell.getMeta()
|
||||
const rowData = meta.query
|
||||
// rowData is a object,do something
|
||||
// {
|
||||
// city:"绍兴市",
|
||||
// province:"浙江省"
|
||||
// }
|
||||
const nameIdMap = this.chart.data.fields.reduce((pre, next) => {
|
||||
pre[next['dataeaseName']] = next['id']
|
||||
return pre
|
||||
}, {})
|
||||
const dimensionList = []
|
||||
for (const key in rowData) {
|
||||
if (nameIdMap[key]) {
|
||||
dimensionList.push({ id: nameIdMap[key], value: rowData[key] })
|
||||
}
|
||||
}
|
||||
this.antVActionPost(dimensionList, nameIdMap[meta.field] || 'null')
|
||||
},
|
||||
setBackGroundBorder() {
|
||||
if (this.chart.customStyle) {
|
||||
|
@ -222,7 +222,8 @@
|
||||
icon="el-icon-plus"
|
||||
round
|
||||
@click="addLinkJumpField"
|
||||
>{{ $t('panel.add_jump_field') }}</el-button>
|
||||
>{{ $t('panel.add_jump_field') }}
|
||||
</el-button>
|
||||
</el-row>
|
||||
<i
|
||||
slot="reference"
|
||||
@ -301,7 +302,7 @@
|
||||
clearable
|
||||
/>
|
||||
<div class="field-height">
|
||||
<el-divider />
|
||||
<el-divider/>
|
||||
<draggable
|
||||
v-model="linkJumpInfoArray"
|
||||
:options="{group:{name: 'drag',pull:'clone'},sort: true}"
|
||||
@ -361,12 +362,14 @@
|
||||
<el-button
|
||||
size="mini"
|
||||
@click="cancel()"
|
||||
>{{ $t('commons.cancel') }}</el-button>
|
||||
>{{ $t('commons.cancel') }}
|
||||
</el-button>
|
||||
<el-button
|
||||
type="primary"
|
||||
size="mini"
|
||||
@click="save()"
|
||||
>{{ $t('commons.confirm') }}</el-button>
|
||||
>{{ $t('commons.confirm') }}
|
||||
</el-button>
|
||||
</el-row>
|
||||
</el-row>
|
||||
</template>
|
||||
@ -487,9 +490,7 @@ export default {
|
||||
'panelViewDetailsInfo'
|
||||
])
|
||||
},
|
||||
watch: {
|
||||
|
||||
},
|
||||
watch: {},
|
||||
created() {
|
||||
},
|
||||
mounted() {
|
||||
@ -509,7 +510,7 @@ export default {
|
||||
checkAllAxisStr = chartDetails.xaxis + chartDetails.xaxisExt + yaxisNew + chartDetails.yaxisExt + chartDetails.drillFields
|
||||
checkJumpStr = checkAllAxisStr
|
||||
} else if (chartDetails.type === 'table-pivot') {
|
||||
checkJumpStr = chartDetails.yaxis + chartDetails.yaxisExt + chartDetails.drillFields
|
||||
checkJumpStr = checkAllAxisStr
|
||||
} else if (chartDetails.type === 'table-info') {
|
||||
checkJumpStr = chartDetails.xaxis + chartDetails.drillFields
|
||||
} else {
|
||||
@ -657,7 +658,10 @@ export default {
|
||||
pos2.line = pos1.line
|
||||
pos2.ch = pos1.ch
|
||||
this.$refs.myCm.codemirror.replaceRange(param, pos2)
|
||||
this.$refs.myCm.codemirror.markText(pos2, { line: pos2.line, ch: param.length + pos2.ch }, { atomic: true, selectRight: true })
|
||||
this.$refs.myCm.codemirror.markText(pos2, { line: pos2.line, ch: param.length + pos2.ch }, {
|
||||
atomic: true,
|
||||
selectRight: true
|
||||
})
|
||||
},
|
||||
matchToAuto() {
|
||||
if (!this.name2Auto.length) return
|
||||
@ -665,7 +669,10 @@ export default {
|
||||
const search = this.$refs.myCm.codemirror.getSearchCursor(ele, { line: 0, ch: 0 })
|
||||
if (search.find()) {
|
||||
const { from, to } = search.pos
|
||||
this.$refs.myCm.codemirror.markText({ line: from.line, ch: from.ch - 1 }, { line: to.line, ch: to.ch + 1 }, { atomic: true, selectRight: true })
|
||||
this.$refs.myCm.codemirror.markText({ line: from.line, ch: from.ch - 1 }, {
|
||||
line: to.line,
|
||||
ch: to.ch + 1
|
||||
}, { atomic: true, selectRight: true })
|
||||
}
|
||||
})
|
||||
},
|
||||
@ -696,41 +703,46 @@ export default {
|
||||
|
||||
<style scoped>
|
||||
|
||||
.my_table ::v-deep .el-table__row>td{
|
||||
.my_table ::v-deep .el-table__row > td {
|
||||
/* 去除表格线 */
|
||||
border: none;
|
||||
padding: 0 0;
|
||||
}
|
||||
|
||||
.my_table ::v-deep .el-table th.is-leaf {
|
||||
/* 去除上边框 */
|
||||
border: none;
|
||||
border: none;
|
||||
}
|
||||
.my_table ::v-deep .el-table::before{
|
||||
|
||||
.my_table ::v-deep .el-table::before {
|
||||
/* 去除下边框 */
|
||||
height: 0;
|
||||
}
|
||||
|
||||
.root-class {
|
||||
margin: 15px 0px 5px;
|
||||
text-align: center;
|
||||
}
|
||||
.preview {
|
||||
margin-top: 5px;
|
||||
border:1px solid #E6E6E6;
|
||||
height:350px !important;
|
||||
overflow:hidden;
|
||||
background-size: 100% 100% !important;
|
||||
}
|
||||
.preview-show {
|
||||
border-left:1px solid #E6E6E6;
|
||||
height:350px;
|
||||
background-size: 100% 100% !important;
|
||||
}
|
||||
.top_border {
|
||||
border-top:1px solid #E6E6E6;
|
||||
.root-class {
|
||||
margin: 15px 0px 5px;
|
||||
text-align: center;
|
||||
}
|
||||
|
||||
.slot-class{
|
||||
.preview {
|
||||
margin-top: 5px;
|
||||
border: 1px solid #E6E6E6;
|
||||
height: 350px !important;
|
||||
overflow: hidden;
|
||||
background-size: 100% 100% !important;
|
||||
}
|
||||
|
||||
.preview-show {
|
||||
border-left: 1px solid #E6E6E6;
|
||||
height: 350px;
|
||||
background-size: 100% 100% !important;
|
||||
}
|
||||
|
||||
.top_border {
|
||||
border-top: 1px solid #E6E6E6;
|
||||
}
|
||||
|
||||
.slot-class {
|
||||
color: white;
|
||||
}
|
||||
|
||||
@ -739,13 +751,14 @@ export default {
|
||||
text-align: center;
|
||||
|
||||
}
|
||||
.ellip{
|
||||
|
||||
.ellip {
|
||||
/*width: 100%;*/
|
||||
margin-left: 10px;
|
||||
margin-right: 10px;
|
||||
overflow: hidden;/*超出部分隐藏*/
|
||||
white-space: nowrap;/*不换行*/
|
||||
text-overflow:ellipsis;/*超出部分文字以...显示*/
|
||||
overflow: hidden; /*超出部分隐藏*/
|
||||
white-space: nowrap; /*不换行*/
|
||||
text-overflow: ellipsis; /*超出部分文字以...显示*/
|
||||
text-align: center;
|
||||
background-color: #f7f8fa;
|
||||
color: #3d4d66;
|
||||
@ -755,23 +768,25 @@ export default {
|
||||
border-radius: 3px;
|
||||
}
|
||||
|
||||
.select-filed{
|
||||
.select-filed {
|
||||
/*width: 100%;*/
|
||||
margin-left: 10px;
|
||||
margin-right: 10px;
|
||||
overflow: hidden;/*超出部分隐藏*/
|
||||
white-space: nowrap;/*不换行*/
|
||||
text-overflow:ellipsis;/*超出部分文字以...显示*/
|
||||
overflow: hidden; /*超出部分隐藏*/
|
||||
white-space: nowrap; /*不换行*/
|
||||
text-overflow: ellipsis; /*超出部分文字以...显示*/
|
||||
color: #3d4d66;
|
||||
font-size: 12px;
|
||||
line-height: 35px;
|
||||
height: 35px;
|
||||
border-radius: 3px;
|
||||
}
|
||||
::v-deep .el-popover{
|
||||
|
||||
::v-deep .el-popover {
|
||||
height: 200px;
|
||||
overflow: auto;
|
||||
}
|
||||
|
||||
.custom-position {
|
||||
flex: 1;
|
||||
display: flex;
|
||||
@ -781,17 +796,20 @@ export default {
|
||||
flex-flow: row nowrap;
|
||||
color: #9ea6b2;
|
||||
}
|
||||
|
||||
.tree-style {
|
||||
padding: 10px 15px;
|
||||
height: 100%;
|
||||
overflow-y: auto;
|
||||
}
|
||||
/deep/ .vue-treeselect__control{
|
||||
|
||||
/deep/ .vue-treeselect__control {
|
||||
height: 28px;
|
||||
}
|
||||
/deep/ .vue-treeselect__single-value{
|
||||
color:#606266;
|
||||
line-height: 28px!important;
|
||||
|
||||
/deep/ .vue-treeselect__single-value {
|
||||
color: #606266;
|
||||
line-height: 28px !important;
|
||||
}
|
||||
|
||||
.custom-tree-node {
|
||||
@ -801,26 +819,30 @@ export default {
|
||||
justify-content: space-between;
|
||||
font-size: 14px;
|
||||
}
|
||||
.auth-span{
|
||||
|
||||
.auth-span {
|
||||
float: right;
|
||||
width:30px;
|
||||
width: 30px;
|
||||
margin-right: 5px
|
||||
}
|
||||
.tree-head{
|
||||
|
||||
.tree-head {
|
||||
height: 30px;
|
||||
line-height: 30px;
|
||||
border-bottom: 1px solid var(--TableBorderColor, #e6e6e6);
|
||||
background-color: var(--SiderBG, #f7f8fa);
|
||||
font-size: 12px;
|
||||
color: var(--TableColor, #3d4d66) ;
|
||||
color: var(--TableColor, #3d4d66);
|
||||
}
|
||||
/deep/ .vue-treeselect__placeholder{
|
||||
line-height:28px
|
||||
}
|
||||
|
||||
/deep/ .el-tree--highlight-current .el-tree-node.is-current >.el-tree-node__content {
|
||||
/deep/ .vue-treeselect__placeholder {
|
||||
line-height: 28px
|
||||
}
|
||||
|
||||
/deep/ .el-tree--highlight-current .el-tree-node.is-current > .el-tree-node__content {
|
||||
background-color: #8dbbef !important;
|
||||
}
|
||||
|
||||
.codemirror {
|
||||
height: 190px;
|
||||
overflow-y: auto;
|
||||
@ -929,12 +951,12 @@ span {
|
||||
font-size: 12px;
|
||||
}
|
||||
|
||||
.field-height ::v-deep .el-divider--horizontal{
|
||||
margin: 2px 0!important;
|
||||
.field-height ::v-deep .el-divider--horizontal {
|
||||
margin: 2px 0 !important;
|
||||
}
|
||||
|
||||
::v-deep .CodeMirror {
|
||||
height: 190px!important;
|
||||
height: 190px !important;
|
||||
}
|
||||
|
||||
</style>
|
||||
|
Loading…
Reference in New Issue
Block a user