center/dataease-dm
center/dataease-dm
13
0
Fork 0
forked from github/dataease
Code Pull Requests Activity

Merge branch 'dev' into pr@dev_memory_component

Browse Source
This commit is contained in:
dataeaseShu 2022-12-30 16:02:00 +08:00
commit 842ad33853
19 changed files with 64 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
backend/src/main/java/io/dataease/ext/ExtChartViewMapper.xml
View File

@ -389,7 +389,8 @@
drill_fields,
SNAPSHOT,
senior,
data_from)
data_from,
view_fields)
SELECT pv_copy.chart_view_id AS id,
`name`,
title,
@ -417,7 +418,8 @@
drill_fields,
SNAPSHOT,
senior,
data_from
data_from,
view_fields
FROM (SELECT panel_id,
copy_from_view,
chart_view_id

2
backend/src/main/java/io/dataease/ext/ExtDataSetTableMapper.xml
View File

@ -159,7 +159,7 @@
<select id="queryDatasetRelation" resultType="io.dataease.dto.RelationDTO" resultMap="io.dataease.ext.ExtDataSourceMapper.RelationResultMap">
select
ds.id,
ifnull(ds.id,'') `id`,
ds.name,
ds_auth.auths,
'link' `type`,

2
backend/src/main/java/io/dataease/ext/ExtPanelGroupMapper.xml
View File

@ -228,7 +228,7 @@
<select id="queryPanelRelation" resultType="io.dataease.dto.RelationDTO" resultMap="io.dataease.ext.ExtDataSourceMapper.RelationResultMap">
select
ds.id,
ifnull(ds.id,'') `id`,
ds.name,
ds_auth.auths,
'link' `type`,

2
backend/src/main/java/io/dataease/provider/query/ck/CKQueryProvider.java
View File

@ -844,7 +844,7 @@ public class CKQueryProvider extends QueryProvider {
@Override
public String createRawQuerySQLAsTmp(String sql, List<DatasetTableField> fields) {
return createRawQuerySQL(" (" + sqlFix(sql) + ") AS DE_TEMP LIMIT DE_OFFSET, DE_PAGE_SIZE ", fields, null);
return createRawQuerySQL(" (" + sqlFix(sql) + ") AS DE_TEMP ", fields, null);
}
@Override

2
backend/src/main/java/io/dataease/provider/query/db2/Db2QueryProvider.java
View File

@ -836,7 +836,7 @@ public class Db2QueryProvider extends QueryProvider {
@Override
public String createRawQuerySQLAsTmp(String sql, List<DatasetTableField> fields) {
return createRawQuerySQL(" (" + sqlFix(sql) + ") AS de_tmp LIMIT DE_OFFSET, DE_PAGE_SIZE ", fields, null);
return createRawQuerySQL(" (" + sqlFix(sql) + ") AS de_tmp ", fields, null);
}
@Override

2
backend/src/main/java/io/dataease/provider/query/hive/HiveQueryProvider.java
View File

@ -794,7 +794,7 @@ public class HiveQueryProvider extends QueryProvider {
@Override
public String createRawQuerySQLAsTmp(String sql, List<DatasetTableField> fields) {
return createRawQuerySQL(" (" + sqlFix(sql) + ") AS DE_TEMP LIMIT DE_OFFSET, DE_PAGE_SIZE ", fields, null);
return createRawQuerySQL(" (" + sqlFix(sql) + ") AS DE_TEMP ", fields, null);
}
@Override

2
backend/src/main/java/io/dataease/provider/query/impala/ImpalaQueryProvider.java
View File

@ -792,7 +792,7 @@ public class ImpalaQueryProvider extends QueryProvider {
@Override
public String createRawQuerySQLAsTmp(String sql, List<DatasetTableField> fields) {
return createRawQuerySQL(" (" + sqlFix(sql) + ") AS DE_TEMP LIMIT DE_PAGE_SIZE OFFSET DE_OFFSET ", fields, null);
return createRawQuerySQL(" (" + sqlFix(sql) + ") AS DE_TEMP ", fields, null);
}
@Override

2
backend/src/main/java/io/dataease/provider/query/mysql/MysqlQueryProvider.java
View File

@ -821,7 +821,7 @@ public class MysqlQueryProvider extends QueryProvider {
@Override
public String createRawQuerySQLAsTmp(String sql, List<DatasetTableField> fields) {
return createRawQuerySQL(" (" + sqlFix(sql) + ") AS DE_TEMP LIMIT DE_OFFSET, DE_PAGE_SIZE ", fields, null);
return createRawQuerySQL(" (" + sqlFix(sql) + ") AS DE_TEMP", fields, null);
}
public String transTreeItem(SQLObj tableObj, DatasetRowPermissionsTreeItem item) {

2
backend/src/main/java/io/dataease/provider/query/pg/PgQueryProvider.java
View File

@ -828,7 +828,7 @@ public class PgQueryProvider extends QueryProvider {
@Override
public String createRawQuerySQLAsTmp(String sql, List<DatasetTableField> fields) {
return createRawQuerySQL(" (" + sqlFix(sql) + ") AS DE_TEMP LIMIT DE_PAGE_SIZE OFFSET DE_OFFSET ", fields, null);
return createRawQuerySQL(" (" + sqlFix(sql) + ") AS DE_TEMP ", fields, null);
}
@Override

2
backend/src/main/java/io/dataease/provider/query/redshift/RedshiftQueryProvider.java
View File

@ -835,7 +835,7 @@ public class RedshiftQueryProvider extends QueryProvider {
@Override
public String createRawQuerySQLAsTmp(String sql, List<DatasetTableField> fields) {
return createRawQuerySQL(" (" + sqlFix(sql) + ") AS DE_TEMP LIMIT DE_PAGE_SIZE OFFSET DE_OFFSET ", fields, null);
return createRawQuerySQL(" (" + sqlFix(sql) + ") AS DE_TEMP ", fields, null);
}
@Override

6
backend/src/main/resources/db/migration/V47__1.18-panel-subject-add.sql
View File

File diff suppressed because one or more lines are too long

BIN
frontend/public/board/subject-hight-tech-background.gif Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 6.6 MiB

17
frontend/src/components/canvas/customComponent/UserView.vue
View File

@ -966,7 +966,7 @@ export default {
// 判断是否有公共链接ID
if (jumpInfo.publicJumpId) {
const url = '/link/' + jumpInfo.publicJumpId
window.open(url, jumpInfo.jumpType)
this.windowsJump(url, jumpInfo.jumpType)
} else {
this.$message({
type: 'warn',
@ -976,7 +976,7 @@ export default {
}
} else {
const url = '#/preview/' + jumpInfo.targetPanelId
window.open(url, jumpInfo.jumpType)
this.windowsJump(url, jumpInfo.jumpType)
}
} else {
this.$message({
@ -989,7 +989,7 @@ export default {
const colList = [...param.dimensionList, ...param.quotaList]
let url = this.setIdValueTrans('id', 'value', jumpInfo.content, colList)
url = checkAddHttp(url)
window.open(url, jumpInfo.jumpType)
this.windowsJump(url, jumpInfo.jumpType)
}
} else {
if (this.chart.type.indexOf('table') === -1) {
@ -1019,6 +1019,17 @@ export default {
}
return name2Id
},
windowsJump(url, jumpType) {
try {
window.open(url, jumpType)
} catch (e) {
this.$message({
message: this.$t('panel.url_check_error') + ':' + url,
type: 'error',
showClose: true
})
}
},
resetDrill() {
const length = this.drillClickDimensionList.length

1
frontend/src/lang/en.js
View File

@ -1955,6 +1955,7 @@ export default {
back_parent: 'Back to previous'
},
panel: {
url_check_error: 'Jump error, Illegal URL',
view_style: 'View Style',
view_color_setting: 'View Color Setting',
border_color_setting: 'Border Color',

1
frontend/src/lang/tw.js
View File

@ -1949,6 +1949,7 @@ export default {
back_parent: '返回上一級'
},
panel: {
url_check_error: '跳轉錯誤，URL不合法',
view_style: '視圖樣式',
view_color_setting: '視圖配色',
border_color_setting: '邊框配色',

1
frontend/src/lang/zh.js
View File

@ -1949,6 +1949,7 @@ export default {
back_parent: '返回上一级'
},
panel: {
url_check_error: '跳转错误，URL不合法',
view_style: '视图样式',
view_color_setting: '视图配色',
border_color_setting: '边框配色',

31
frontend/src/views/dataset/group/Group.vue
View File

@ -924,22 +924,21 @@ export default {
}
}
const { queryType = 'dataset', name: label, id } = data
await this.getDatasetRelationship({ queryType, label, id })
if (this.treeData.length) {
options.title = this.$t('datasource.delete_this_dataset')
options.link = this.$t('datasource.click_to_check')
options.content = this.$t('datasource.cannot_be_deleted_dataset')
options.templateDel = msgContent
options.confirmButtonText = undefined
options.type = 'danger'
options.linkTo = this.linkTo.bind(this, { queryType, id })
this.withLink(options, this.$t('commons.delete'))
return
}
this.handlerConfirm(options)
const { queryType = 'dataset', id } = data
getDatasetRelationship(id).then((res) => {
if (res.data.subRelation?.length) {
options.title = this.$t('datasource.delete_this_dataset')
options.link = this.$t('datasource.click_to_check')
options.content = this.$t('datasource.cannot_be_deleted_dataset')
options.templateDel = msgContent
options.confirmButtonText = undefined
options.type = 'danger'
options.linkTo = this.linkTo.bind(this, { queryType, id })
this.withLink(options, this.$t('commons.delete'))
return
}
this.handlerConfirm(options)
})
},
linkTo(query) {
window.open(this.$router.resolve({

14
frontend/src/views/panel/list/PanelMain.vue
View File

@ -77,6 +77,11 @@ export default {
if (newVal === 'PanelMain' && this.lastActiveNodeData) {
this.activeNodeAndClickOnly(this.lastActiveNodeData)
}
},
activeName: function(newVal, oldVal) {
if (newVal !== 'PanelMain') {
this.clear()
}
}
},
mounted() {
@ -93,6 +98,15 @@ export default {
// this.clear()
},
methods: {
clear() {
// 清空
this.$store.dispatch('panel/setPanelInfo', {
id: null,
name: '',
preStyle: null
})
this.$store.dispatch('panel/setMainActiveName', 'PanelMain')
},
handleClick(tab, event) {
// 点击分析面板需要刷新分享内容
if (tab.name === 'panels_share') {

3
frontend/src/views/system/datasource/DsTree.vue
View File

@ -758,9 +758,8 @@ export default {
if (this.treeData.length) {
params.title = this.$t('datasource.this_data_source')
params.link = this.$t('datasource.click_to_check')
params.content = this.$t('datasource.cannot_be_deleted_dataset')
params.content = this.$t('datasource.cannot_be_deleted_datasource')
params.templateDel = msgContent
params.linkTo = this.linkTo.bind(this, { queryType, id })
this.withLink(params)
return