13
0
forked from github/dataease

Merge pull request from dataease/pr@dev-v2_st

fix(数据源): 删除数据源的时候,没有血缘查看提示,且报404错误
This commit is contained in:
dataeaseShu 2024-08-20 17:52:51 +08:00 committed by GitHub
commit e40555134d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
10 changed files with 12 additions and 12 deletions
core/core-frontend/src
api
components/visualization
custom-component/pop-area
locales
store/modules/data-visualization
views
chart/components
editor/drag-item/components
views/components
dashboard
data-visualization
visualized/data/dataset

@ -92,7 +92,7 @@ export const save = async (data = {}): Promise<Dataset> => {
} }
export const perDeleteDatasource = async (id): Promise<boolean> => { export const perDeleteDatasource = async (id): Promise<boolean> => {
return request.post({ url: `/datasource//perDelete/${id}`, data: {} }).then(res => { return request.post({ url: `/datasource/perDelete/${id}`, data: {} }).then(res => {
return res?.data return res?.data
}) })
} }

@ -331,7 +331,7 @@ const nodeClick = data => {
state.curNodeId = data.paramsInfoId state.curNodeId = data.paramsInfoId
} }
// //
const getPanelViewList = dvId => { const getPanelViewList = dvId => {
viewDetailList(dvId).then(rsp => { viewDetailList(dvId).then(rsp => {
state.viewIdFieldArrayMap = {} state.viewIdFieldArrayMap = {}

@ -1,5 +1,5 @@
<template> <template>
<!--此区域暂时放到类似图和分组平行的组件作为后续扩展使用但当前版本只作为类似MarkLine 和canvasCore平行组件 仅做区域显示使用--> <!--此区域暂时放到类似和分组平行的组件作为后续扩展使用但当前版本只作为类似MarkLine 和canvasCore平行组件 仅做区域显示使用-->
<div <div
class="pop-area" class="pop-area"
:style="popCanvasStyle" :style="popCanvasStyle"

@ -113,7 +113,7 @@ export default {
successful_go_to: '导出成功前往', successful_go_to: '导出成功前往',
failed_go_to: '导出失败前往', failed_go_to: '导出失败前往',
data_set: '数据集', data_set: '数据集',
view: '', view: '',
organization: '所属组织', organization: '所属组织',
download: '下载', download: '下载',
re_export: '重新导出', re_export: '重新导出',

@ -967,10 +967,10 @@ export const dvMainStore = defineStore('dataVisualization', {
targetInfoList.forEach(targetInfo => { targetInfoList.forEach(targetInfo => {
const targetInfoArray = targetInfo.split('#') const targetInfoArray = targetInfo.split('#')
const targetViewId = targetInfoArray[0] // 目标 const targetViewId = targetInfoArray[0] // 目标
if (element.component === 'UserView' && element.id === targetViewId) { if (element.component === 'UserView' && element.id === targetViewId) {
// 如果目标 当前循环组件id相等 则进行条件增减 // 如果目标 当前循环组件id相等 则进行条件增减
const targetFieldId = targetInfoArray[1] // 目标图列ID const targetFieldId = targetInfoArray[1] // 目标列ID
const condition = { const condition = {
fieldId: targetFieldId, fieldId: targetFieldId,
operator: operator, operator: operator,

@ -185,7 +185,7 @@ initCompareType()
<el-form-item :label="t('chart.tip')"> <el-form-item :label="t('chart.tip')">
<span class="exp-style" style="padding-top: 2px"> <span class="exp-style" style="padding-top: 2px">
当对比日期需要过滤时请使用过滤组件实现过滤使用图过滤器仪表板下钻和联动等功能会导致结果不一致 当对比日期需要过滤时请使用过滤组件实现过滤使用过滤器仪表板下钻和联动等功能会导致结果不一致
</span> </span>
</el-form-item> </el-form-item>
</el-form> </el-form>

@ -153,7 +153,7 @@ const calcData = (view: Chart, callback, resetPageInfo = true) => {
} }
// //
let myChart: SpreadSheet = null let myChart: SpreadSheet = null
// //
let actualChart: ChartObj let actualChart: ChartObj
const renderChartFromDialog = (viewInfo: Chart, chartDataInfo) => { const renderChartFromDialog = (viewInfo: Chart, chartDataInfo) => {
chartData.value = chartDataInfo chartData.value = chartDataInfo

@ -123,7 +123,7 @@ const downloadAsAppTemplate = downloadType => {
const downLoadToAppPre = () => { const downLoadToAppPre = () => {
const result = checkTemplate() const result = checkTemplate()
if (result && result.length > 0) { if (result && result.length > 0) {
ElMessage.warning(`当前仪表板中[${result}]属于模版图,无法导出,请先设置数据集!`) ElMessage.warning(`当前仪表板中[${result}]属于模版,无法导出,请先设置数据集!`)
} else { } else {
appExportFormRef.value.init({ appExportFormRef.value.init({
appName: state.dvInfo.name, appName: state.dvInfo.name,

@ -125,7 +125,7 @@ const downloadAsAppTemplate = downloadType => {
const downLoadToAppPre = () => { const downLoadToAppPre = () => {
const result = checkTemplate() const result = checkTemplate()
if (result && result.length > 0) { if (result && result.length > 0) {
ElMessage.warning(`当前仪表板中[${result}]属于模版图,无法导出,请先设置数据集!`) ElMessage.warning(`当前仪表板中[${result}]属于模版,无法导出,请先设置数据集!`)
} else { } else {
appExportFormRef.value.init({ appExportFormRef.value.init({
appName: state.dvInfo.name, appName: state.dvInfo.name,

@ -409,7 +409,7 @@ const operation = (cmd: string, data: BusiTreeNode, nodeType: string) => {
h( h(
'p', 'p',
{ class: 'tip' }, { class: 'tip' },
'该数据集存在如下血缘关系,删除会造成相关仪表板的图失效,确定删除?' '该数据集存在如下血缘关系,删除会造成相关仪表板的失效,确定删除?'
), ),
h( h(
ElButton, ElButton,