diff --git a/core/core-backend/src/main/java/io/dataease/share/dao/ext/mapper/XpackShareExtMapper.java b/core/core-backend/src/main/java/io/dataease/share/dao/ext/mapper/XpackShareExtMapper.java index 4b122e87b7..140f0b0a1a 100644 --- a/core/core-backend/src/main/java/io/dataease/share/dao/ext/mapper/XpackShareExtMapper.java +++ b/core/core-backend/src/main/java/io/dataease/share/dao/ext/mapper/XpackShareExtMapper.java @@ -14,6 +14,7 @@ public interface XpackShareExtMapper { select s.id as share_id, v.id as resource_id, + v.mobile_layout as ext_flag, v.type, s.creator, s.time, diff --git a/core/core-backend/src/main/java/io/dataease/share/dao/ext/po/XpackSharePO.java b/core/core-backend/src/main/java/io/dataease/share/dao/ext/po/XpackSharePO.java index 9b89fb7b03..26a3a3afe4 100644 --- a/core/core-backend/src/main/java/io/dataease/share/dao/ext/po/XpackSharePO.java +++ b/core/core-backend/src/main/java/io/dataease/share/dao/ext/po/XpackSharePO.java @@ -28,4 +28,6 @@ public class XpackSharePO implements Serializable { private Long exp; + private Integer extFlag; + } diff --git a/core/core-backend/src/main/java/io/dataease/share/manage/XpackShareManage.java b/core/core-backend/src/main/java/io/dataease/share/manage/XpackShareManage.java index c325161e67..ee5fababab 100644 --- a/core/core-backend/src/main/java/io/dataease/share/manage/XpackShareManage.java +++ b/core/core-backend/src/main/java/io/dataease/share/manage/XpackShareManage.java @@ -139,7 +139,7 @@ public class XpackShareManage { return pos.stream().map(po -> new XpackShareGridVO( po.getShareId(), po.getResourceId(), po.getName(), po.getCreator().toString(), - po.getTime(), po.getExp(), 9)).toList(); + po.getTime(), po.getExp(), 9,po.getExtFlag())).toList(); } private XpackShareManage proxy() { diff --git a/core/core-backend/src/main/java/io/dataease/visualization/dao/ext/mapper/CoreStoreExtMapper.java b/core/core-backend/src/main/java/io/dataease/visualization/dao/ext/mapper/CoreStoreExtMapper.java index b80422a81a..8401dfc450 100644 --- a/core/core-backend/src/main/java/io/dataease/visualization/dao/ext/mapper/CoreStoreExtMapper.java +++ b/core/core-backend/src/main/java/io/dataease/visualization/dao/ext/mapper/CoreStoreExtMapper.java @@ -18,7 +18,8 @@ public interface CoreStoreExtMapper { v.create_by as creator, v.update_by as editor, v.update_time as edit_time, - v.name + v.name, + v.mobile_layout as ext_flag from core_store s left join data_visualization_info v on s.resource_id = v.id ${ew.customSqlSegment} diff --git a/core/core-backend/src/main/java/io/dataease/visualization/dao/ext/po/StorePO.java b/core/core-backend/src/main/java/io/dataease/visualization/dao/ext/po/StorePO.java index 6e3d07f422..2127dd42c3 100644 --- a/core/core-backend/src/main/java/io/dataease/visualization/dao/ext/po/StorePO.java +++ b/core/core-backend/src/main/java/io/dataease/visualization/dao/ext/po/StorePO.java @@ -24,4 +24,6 @@ public class StorePO implements Serializable { private String name; + private Integer extFlag; + } diff --git a/core/core-backend/src/main/java/io/dataease/visualization/dao/ext/po/VisualizationResourcePO.java b/core/core-backend/src/main/java/io/dataease/visualization/dao/ext/po/VisualizationResourcePO.java index 8d2fee81f5..6101c7b27f 100644 --- a/core/core-backend/src/main/java/io/dataease/visualization/dao/ext/po/VisualizationResourcePO.java +++ b/core/core-backend/src/main/java/io/dataease/visualization/dao/ext/po/VisualizationResourcePO.java @@ -35,4 +35,6 @@ public class VisualizationResourcePO implements Serializable { private Boolean favorite; private int weight; + + private Integer extFlag; } diff --git a/core/core-backend/src/main/java/io/dataease/visualization/manage/CoreVisualizationManage.java b/core/core-backend/src/main/java/io/dataease/visualization/manage/CoreVisualizationManage.java index ee57ce584b..8ecd8f045a 100644 --- a/core/core-backend/src/main/java/io/dataease/visualization/manage/CoreVisualizationManage.java +++ b/core/core-backend/src/main/java/io/dataease/visualization/manage/CoreVisualizationManage.java @@ -176,7 +176,7 @@ public class CoreVisualizationManage { new VisualizationResourceVO( po.getId(), po.getResourceId(), po.getName(), po.getType(), String.valueOf(po.getCreator()), String.valueOf(po.getLastEditor()), po.getLastEditTime(), - po.getFavorite(), 9)).toList(); + po.getFavorite(), 9,po.getExtFlag())).toList(); } public IPage queryVisualizationPage(int goPage, int pageSize, VisualizationWorkbranchQueryRequest request) { diff --git a/core/core-backend/src/main/java/io/dataease/visualization/manage/VisualizationStoreManage.java b/core/core-backend/src/main/java/io/dataease/visualization/manage/VisualizationStoreManage.java index 31fd4340ba..23993efc0e 100644 --- a/core/core-backend/src/main/java/io/dataease/visualization/manage/VisualizationStoreManage.java +++ b/core/core-backend/src/main/java/io/dataease/visualization/manage/VisualizationStoreManage.java @@ -89,7 +89,7 @@ public class VisualizationStoreManage { new VisualizationStoreVO( po.getStoreId(), po.getResourceId(), po.getName(), po.getType(), String.valueOf(po.getCreator()), ObjectUtils.isEmpty(po.getEditor()) ? null : String.valueOf(po.getEditor()), - po.getEditTime(), 9)).toList(); + po.getEditTime(), 9,po.getExtFlag())).toList(); } public IPage queryStorePage(int goPage, int pageSize, VisualizationWorkbranchQueryRequest request) { diff --git a/core/core-backend/src/main/resources/db/desktop/V2.5__ddl.sql b/core/core-backend/src/main/resources/db/desktop/V2.5__ddl.sql index 6b832f81f1..13c00a3d73 100644 --- a/core/core-backend/src/main/resources/db/desktop/V2.5__ddl.sql +++ b/core/core-backend/src/main/resources/db/desktop/V2.5__ddl.sql @@ -36,5 +36,5 @@ CREATE TABLE `visualization_outer_params_target_view_info` ( ALTER TABLE `data_visualization_info` MODIFY COLUMN `mobile_layout` tinyint NULL DEFAULT 0 COMMENT '移动端布局0-关闭 1-开启'; - +update data_visualization_info set mobile_layout = 0; INSERT INTO `core_sys_setting` (`id`, `pkey`, `pval`, `type`, `sort`) VALUES (3, 'ai.baseUrl', 'https://maxkb.fit2cloud.com/ui/chat/2ddd8b594ce09dbb', 'text', 0); \ No newline at end of file diff --git a/core/core-backend/src/main/resources/db/migration/V2.5__ddl.sql b/core/core-backend/src/main/resources/db/migration/V2.5__ddl.sql index 3737bc09b8..6062e35f69 100644 --- a/core/core-backend/src/main/resources/db/migration/V2.5__ddl.sql +++ b/core/core-backend/src/main/resources/db/migration/V2.5__ddl.sql @@ -37,5 +37,5 @@ CREATE TABLE `visualization_outer_params_target_view_info` ( ALTER TABLE `data_visualization_info` MODIFY COLUMN `mobile_layout` tinyint NULL DEFAULT 0 COMMENT '移动端布局0-关闭 1-开启'; - +update data_visualization_info set mobile_layout = 0; INSERT INTO `core_sys_setting` (`id`, `pkey`, `pval`, `type`, `sort`) VALUES (3, 'ai.baseUrl', 'https://maxkb.fit2cloud.com/ui/chat/2ddd8b594ce09dbb', 'text', 0); diff --git a/core/core-backend/src/main/resources/mybatis/ExtDataVisualizationMapper.xml b/core/core-backend/src/main/resources/mybatis/ExtDataVisualizationMapper.xml index 299595e611..dffa15698b 100644 --- a/core/core-backend/src/main/resources/mybatis/ExtDataVisualizationMapper.xml +++ b/core/core-backend/src/main/resources/mybatis/ExtDataVisualizationMapper.xml @@ -143,6 +143,7 @@ `canvas_style_data`, `component_data`, `mobile_layout`, + `mobile_layout` as ext_flag, `status`, `self_watermark_status`, `sort`, @@ -165,6 +166,7 @@ SELECT dvResource.id, dvResource.resource_id, dvResource.name, + dvResource.ext_flag, dvResource.type, dvResource.creator, core_opt_recent.uid AS last_editor, @@ -180,6 +182,7 @@ FROM (SELECT core_dataset_group.id, core_dataset_group.id AS resource_id, core_dataset_group.NAME, + 0 as ext_flag, 'dataset' AS type, core_dataset_group.create_by AS creator FROM core_dataset_group @@ -188,6 +191,7 @@ SELECT core_datasource.id, core_datasource.id AS resource_id, core_datasource.NAME, + 0 as ext_flag, 'datasource' AS type, core_datasource.create_by AS creator FROM core_datasource @@ -197,6 +201,7 @@ data_visualization_info.id, data_visualization_info.id AS resource_id, data_visualization_info.NAME, + data_visualization_info.`mobile_layout` as ext_flag, ( CASE data_visualization_info.type diff --git a/core/core-frontend/src/custom-component/v-query/QueryConditionConfiguration.vue b/core/core-frontend/src/custom-component/v-query/QueryConditionConfiguration.vue index 6d69d15509..03cdbf268f 100644 --- a/core/core-frontend/src/custom-component/v-query/QueryConditionConfiguration.vue +++ b/core/core-frontend/src/custom-component/v-query/QueryConditionConfiguration.vue @@ -220,6 +220,7 @@ const setTypeChange = () => { } const cancelClick = () => { + visiblePopover.value = false dialogVisible.value = false } @@ -510,6 +511,7 @@ const handleBeforeClose = () => { const confirmClick = () => { if (validate()) return inputCom.value?.mult?.handleClickOutside?.() + visiblePopover.value = false dialogVisible.value = false conditions.value.forEach(ele => { curComponent.value = ele diff --git a/core/core-frontend/src/views/chart/components/editor/editor-style/components/table/TableHeaderSelector.vue b/core/core-frontend/src/views/chart/components/editor/editor-style/components/table/TableHeaderSelector.vue index 3e36bd1a51..a1ee4a3d4e 100644 --- a/core/core-frontend/src/views/chart/components/editor/editor-style/components/table/TableHeaderSelector.vue +++ b/core/core-frontend/src/views/chart/components/editor/editor-style/components/table/TableHeaderSelector.vue @@ -237,7 +237,6 @@ onMounted(() => { /> { // click newChart.on(S2Event.DATA_CELL_CLICK, ev => { const cell = newChart.getCell(ev.target) - const meta = cell.getMeta() + const meta = cell.getMeta() as ViewMeta const nameIdMap = fields.reduce((pre, next) => { pre[next['dataeaseName']] = next['id'] return pre }, {}) - const rowData = chart.data.tableRow[meta.rowIndex] as any + const rowData = newChart.dataSet.getRowData(meta) const dimensionList = [] for (const key in rowData) { if (nameIdMap[key]) { diff --git a/core/core-frontend/src/views/chart/components/js/panel/charts/table/table-normal.ts b/core/core-frontend/src/views/chart/components/js/panel/charts/table/table-normal.ts index deb547c9c9..cd93307715 100644 --- a/core/core-frontend/src/views/chart/components/js/panel/charts/table/table-normal.ts +++ b/core/core-frontend/src/views/chart/components/js/panel/charts/table/table-normal.ts @@ -1,5 +1,5 @@ import { S2ChartView, S2DrawOptions } from '@/views/chart/components/js/panel/types/impl/s2' -import { S2Event, S2Options, TableSheet, TableColCell } from '@antv/s2' +import { S2Event, S2Options, TableSheet, TableColCell, ViewMeta } from '@antv/s2' import { parseJson } from '@/views/chart/components/js/util' import { formatterItem, valueFormatter } from '@/views/chart/components/js/formatter' import { copyContent, getCurrentField } from '@/views/chart/components/js/panel/common/common_table' @@ -139,13 +139,13 @@ export class TableNormal extends S2ChartView { // click newChart.on(S2Event.DATA_CELL_CLICK, ev => { const cell = newChart.getCell(ev.target) - const meta = cell.getMeta() + const meta = cell.getMeta() as ViewMeta const nameIdMap = fields.reduce((pre, next) => { pre[next['dataeaseName']] = next['id'] return pre }, {}) - const rowData = chart.data.tableRow[meta.rowIndex] as any + const rowData = newChart.dataSet.getRowData(meta) const dimensionList = [] for (const key in rowData) { if (nameIdMap[key]) { diff --git a/core/core-frontend/src/views/chart/components/views/index.vue b/core/core-frontend/src/views/chart/components/views/index.vue index 79c8473331..25eeae0e30 100644 --- a/core/core-frontend/src/views/chart/components/views/index.vue +++ b/core/core-frontend/src/views/chart/components/views/index.vue @@ -316,6 +316,9 @@ const onDrillFilters = param => { const windowsJump = (url, jumpType) => { try { window.open(url, jumpType) + if (jumpType === '_self') { + location.reload() + } } catch (e) { ElMessage.error(t('visualization.url_check_error') + ':' + url) } diff --git a/core/core-frontend/src/views/share/share/ShareGrid.vue b/core/core-frontend/src/views/share/share/ShareGrid.vue index b01fd82c8f..f690c810c9 100644 --- a/core/core-frontend/src/views/share/share/ShareGrid.vue +++ b/core/core-frontend/src/views/share/share/ShareGrid.vue @@ -164,7 +164,12 @@ watch(