diff --git a/backend/src/main/java/io/dataease/provider/query/QueryProvider.java b/backend/src/main/java/io/dataease/provider/query/QueryProvider.java index 894d317d9e..8716317f0b 100644 --- a/backend/src/main/java/io/dataease/provider/query/QueryProvider.java +++ b/backend/src/main/java/io/dataease/provider/query/QueryProvider.java @@ -78,4 +78,16 @@ public abstract class QueryProvider { public String convertTableToSql(String tableName, Datasource ds) { return "select * from TABLE_NAME".replace("TABLE_NAME", tableName); } + + public String getLogic(String logic) { + if (logic != null) { + switch (logic) { + case "and": + return "AND"; + case "or": + return "OR"; + } + } + return "AND"; + } } diff --git a/backend/src/main/java/io/dataease/provider/query/ck/CKQueryProvider.java b/backend/src/main/java/io/dataease/provider/query/ck/CKQueryProvider.java index 6c0200c5c3..9b73bd8fef 100644 --- a/backend/src/main/java/io/dataease/provider/query/ck/CKQueryProvider.java +++ b/backend/src/main/java/io/dataease/provider/query/ck/CKQueryProvider.java @@ -1102,14 +1102,4 @@ public class CKQueryProvider extends QueryProvider { return sql; } } - - private String getLogic(String logic) { - switch (logic) { - case "and": - return "AND"; - case "or": - return "OR"; - } - return "AND"; - } } diff --git a/backend/src/main/java/io/dataease/provider/query/db2/Db2QueryProvider.java b/backend/src/main/java/io/dataease/provider/query/db2/Db2QueryProvider.java index 2bf85cde47..eeaefb2ef2 100644 --- a/backend/src/main/java/io/dataease/provider/query/db2/Db2QueryProvider.java +++ b/backend/src/main/java/io/dataease/provider/query/db2/Db2QueryProvider.java @@ -1034,14 +1034,4 @@ public class Db2QueryProvider extends QueryProvider { return sql; } } - - private String getLogic(String logic) { - switch (logic) { - case "and": - return "AND"; - case "or": - return "OR"; - } - return "AND"; - } } diff --git a/backend/src/main/java/io/dataease/provider/query/doris/DorisQueryProvider.java b/backend/src/main/java/io/dataease/provider/query/doris/DorisQueryProvider.java index 3d14ad7fe9..5485ff430b 100644 --- a/backend/src/main/java/io/dataease/provider/query/doris/DorisQueryProvider.java +++ b/backend/src/main/java/io/dataease/provider/query/doris/DorisQueryProvider.java @@ -1080,14 +1080,4 @@ public class DorisQueryProvider extends QueryProvider { return sql; } } - - private String getLogic(String logic) { - switch (logic) { - case "and": - return "AND"; - case "or": - return "OR"; - } - return "AND"; - } } diff --git a/backend/src/main/java/io/dataease/provider/query/es/EsQueryProvider.java b/backend/src/main/java/io/dataease/provider/query/es/EsQueryProvider.java index 0eae4242d9..a8e42128de 100644 --- a/backend/src/main/java/io/dataease/provider/query/es/EsQueryProvider.java +++ b/backend/src/main/java/io/dataease/provider/query/es/EsQueryProvider.java @@ -990,14 +990,4 @@ public class EsQueryProvider extends QueryProvider { return sql; } } - - private String getLogic(String logic) { - switch (logic) { - case "and": - return "AND"; - case "or": - return "OR"; - } - return "AND"; - } } diff --git a/backend/src/main/java/io/dataease/provider/query/hive/HiveQueryProvider.java b/backend/src/main/java/io/dataease/provider/query/hive/HiveQueryProvider.java index 15cbcae957..8a8293e6a0 100644 --- a/backend/src/main/java/io/dataease/provider/query/hive/HiveQueryProvider.java +++ b/backend/src/main/java/io/dataease/provider/query/hive/HiveQueryProvider.java @@ -1055,14 +1055,4 @@ public class HiveQueryProvider extends QueryProvider { return sql; } } - - private String getLogic(String logic) { - switch (logic) { - case "and": - return "AND"; - case "or": - return "OR"; - } - return "AND"; - } } diff --git a/backend/src/main/java/io/dataease/provider/query/mongodb/MongoQueryProvider.java b/backend/src/main/java/io/dataease/provider/query/mongodb/MongoQueryProvider.java index 6cd5d84c02..ae50621c29 100644 --- a/backend/src/main/java/io/dataease/provider/query/mongodb/MongoQueryProvider.java +++ b/backend/src/main/java/io/dataease/provider/query/mongodb/MongoQueryProvider.java @@ -944,14 +944,4 @@ public class MongoQueryProvider extends QueryProvider { return sql; } } - - private String getLogic(String logic) { - switch (logic) { - case "and": - return "AND"; - case "or": - return "OR"; - } - return "AND"; - } } diff --git a/backend/src/main/java/io/dataease/provider/query/mysql/MysqlQueryProvider.java b/backend/src/main/java/io/dataease/provider/query/mysql/MysqlQueryProvider.java index 07cbbe6a64..e893451d5f 100644 --- a/backend/src/main/java/io/dataease/provider/query/mysql/MysqlQueryProvider.java +++ b/backend/src/main/java/io/dataease/provider/query/mysql/MysqlQueryProvider.java @@ -1058,14 +1058,4 @@ public class MysqlQueryProvider extends QueryProvider { return sql; } } - - private String getLogic(String logic) { - switch (logic) { - case "and": - return "AND"; - case "or": - return "OR"; - } - return "AND"; - } } diff --git a/backend/src/main/java/io/dataease/provider/query/oracle/OracleQueryProvider.java b/backend/src/main/java/io/dataease/provider/query/oracle/OracleQueryProvider.java index 76e3313ff4..6df28b1841 100644 --- a/backend/src/main/java/io/dataease/provider/query/oracle/OracleQueryProvider.java +++ b/backend/src/main/java/io/dataease/provider/query/oracle/OracleQueryProvider.java @@ -1131,14 +1131,4 @@ public class OracleQueryProvider extends QueryProvider { return sql; } } - - private String getLogic(String logic) { - switch (logic) { - case "and": - return "AND"; - case "or": - return "OR"; - } - return "AND"; - } } diff --git a/backend/src/main/java/io/dataease/provider/query/pg/PgQueryProvider.java b/backend/src/main/java/io/dataease/provider/query/pg/PgQueryProvider.java index 46982dd15c..67d19614e0 100644 --- a/backend/src/main/java/io/dataease/provider/query/pg/PgQueryProvider.java +++ b/backend/src/main/java/io/dataease/provider/query/pg/PgQueryProvider.java @@ -1047,14 +1047,4 @@ public class PgQueryProvider extends QueryProvider { return sql; } } - - private String getLogic(String logic) { - switch (logic) { - case "and": - return "AND"; - case "or": - return "OR"; - } - return "AND"; - } } diff --git a/backend/src/main/java/io/dataease/provider/query/redshift/RedshiftQueryProvider.java b/backend/src/main/java/io/dataease/provider/query/redshift/RedshiftQueryProvider.java index afeded3a65..7fdd3af2c7 100644 --- a/backend/src/main/java/io/dataease/provider/query/redshift/RedshiftQueryProvider.java +++ b/backend/src/main/java/io/dataease/provider/query/redshift/RedshiftQueryProvider.java @@ -974,14 +974,4 @@ public class RedshiftQueryProvider extends QueryProvider { return sql; } } - - private String getLogic(String logic) { - switch (logic) { - case "and": - return "AND"; - case "or": - return "OR"; - } - return "AND"; - } } diff --git a/backend/src/main/java/io/dataease/provider/query/sqlserver/SqlserverQueryProvider.java b/backend/src/main/java/io/dataease/provider/query/sqlserver/SqlserverQueryProvider.java index 8a534ffabb..da2e5cbed6 100644 --- a/backend/src/main/java/io/dataease/provider/query/sqlserver/SqlserverQueryProvider.java +++ b/backend/src/main/java/io/dataease/provider/query/sqlserver/SqlserverQueryProvider.java @@ -1089,14 +1089,4 @@ public class SqlserverQueryProvider extends QueryProvider { } return originField; } - - private String getLogic(String logic) { - switch (logic) { - case "and": - return "AND"; - case "or": - return "OR"; - } - return "AND"; - } } diff --git a/frontend/src/components/canvas/custom-component/UserView.vue b/frontend/src/components/canvas/custom-component/UserView.vue index a4775a72e3..cc8c702f86 100644 --- a/frontend/src/components/canvas/custom-component/UserView.vue +++ b/frontend/src/components/canvas/custom-component/UserView.vue @@ -409,7 +409,7 @@ export default { } else { this.$message({ type: 'warn', - message: '当前是公共链接模式,目标仪表板未设置公共链接,无法跳转', + message: this.$t('panel.public_link_tips'), showClose: true }) } diff --git a/frontend/src/lang/en.js b/frontend/src/lang/en.js index cebf8c5376..83b6f52052 100644 --- a/frontend/src/lang/en.js +++ b/frontend/src/lang/en.js @@ -1460,7 +1460,8 @@ export default { panel_view_result_tips: 'Chose "Panel" Will Overwrite View`s Result,Range 1~10000', timeout_refresh: 'Timeout,Will Refresh...', mobile_layout: 'Mobile Layout', - component_hidden: 'Component Hidden' + component_hidden: 'Component Hidden', + public_link_tips: 'New Is Public Link,The Target Panel Have Not Set Public Link,Can Not Jump' }, plugin: { local_install: 'Local installation', diff --git a/frontend/src/lang/tw.js b/frontend/src/lang/tw.js index 3f8d8291f2..067bec6119 100644 --- a/frontend/src/lang/tw.js +++ b/frontend/src/lang/tw.js @@ -1462,7 +1462,8 @@ export default { panel_view_result_tips: '選擇儀表板會覆蓋視圖的結果展示數量,取值範圍1~10000', timeout_refresh: '请求超时,稍后刷新...', mobile_layout: '移动端布局', - component_hidden: '隐藏的组件' + component_hidden: '隐藏的组件', + public_link_tips: '当前是公共链接模式,目标仪表板未设置公共链接,无法跳转' }, plugin: { local_install: '本地安裝', diff --git a/frontend/src/lang/zh.js b/frontend/src/lang/zh.js index 7ee3a045bb..8f7bb6ffd0 100644 --- a/frontend/src/lang/zh.js +++ b/frontend/src/lang/zh.js @@ -1471,7 +1471,8 @@ export default { panel_view_result_tips: '选择仪表板会覆盖视图的结果展示数量,取值范围1~10000', timeout_refresh: '请求超时,稍后刷新...', mobile_layout: '移动端布局', - component_hidden: '隐藏的组件' + component_hidden: '隐藏的组件', + public_link_tips: '当前是公共链接模式,目标仪表板未设置公共链接,无法跳转' }, plugin: { local_install: '本地安装', diff --git a/frontend/src/views/link/view/index.vue b/frontend/src/views/link/view/index.vue index 3a9c2b95f0..3bb41636bc 100644 --- a/frontend/src/views/link/view/index.vue +++ b/frontend/src/views/link/view/index.vue @@ -32,6 +32,10 @@ export default { methods: { setPanelInfo() { loadResource(this.resourceId).then(res => { + this.$store.dispatch('panel/setPanelInfo', { + id: res.data.id, + name: res.data.name + }) // 刷新联动信息 getPanelAllLinkageInfo(this.resourceId).then(rsp => { this.$store.commit('setNowPanelTrackInfo', rsp.data) @@ -52,7 +56,7 @@ export default { sourcePanelId: jumpParam.sourcePanelId, sourceViewId: jumpParam.sourceViewId, sourceFieldId: jumpParam.sourceFieldId, - targetPanelId: this.panelId + targetPanelId: this.resourceId } this.show = false // 刷新跳转目标仪表板联动信息 diff --git a/frontend/src/views/panel/LinkJumpSet/index.vue b/frontend/src/views/panel/LinkJumpSet/index.vue index ff12c25556..dbdb016174 100644 --- a/frontend/src/views/panel/LinkJumpSet/index.vue +++ b/frontend/src/views/panel/LinkJumpSet/index.vue @@ -82,7 +82,7 @@
- +
- +