dongjunchuan/de
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev' of github.com:dataease/dataease into dev

Browse Source
This commit is contained in:
taojinlong 2021-12-14 16:27:50 +08:00
commit 2b18d64c7c
18 changed files with 26 additions and 117 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
backend/src/main/java/io/dataease/provider/query/QueryProvider.java
View File

@ -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";
}
}

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

@ -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";
}
}

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

@ -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";
}
}

10
backend/src/main/java/io/dataease/provider/query/doris/DorisQueryProvider.java
View File

@ -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";
}
}

10
backend/src/main/java/io/dataease/provider/query/es/EsQueryProvider.java
View File

@ -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";
}
}

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

@ -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";
}
}

10
backend/src/main/java/io/dataease/provider/query/mongodb/MongoQueryProvider.java
View File

@ -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";
}
}

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

@ -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";
}
}

10
backend/src/main/java/io/dataease/provider/query/oracle/OracleQueryProvider.java
View File

@ -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";
}
}

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

@ -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";
}
}

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

@ -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";
}
}

10
backend/src/main/java/io/dataease/provider/query/sqlserver/SqlserverQueryProvider.java
View File

@ -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";
}
}

2
frontend/src/components/canvas/custom-component/UserView.vue
View File

@ -409,7 +409,7 @@ export default {
} else {
this.$message({
type: 'warn',
message: '当前是公共链接模式，目标仪表板未设置公共链接，无法跳转',
message: this.$t('panel.public_link_tips'),
showClose: true
})
}

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

@ -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',

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

@ -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: '本地安裝',

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

@ -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: '本地安装',

6
frontend/src/views/link/view/index.vue
View File

@ -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
// 刷新跳转目标仪表板联动信息

4
frontend/src/views/panel/LinkJumpSet/index.vue
View File

@ -82,7 +82,7 @@
<el-row v-for="(targetViewInfo,index) in linkJumpInfo.targetViewInfoList" :key="index">
<el-col :span="11">
<div class="select-filed">
<el-select v-model="targetViewInfo.targetViewId" style="width: 100%" size="mini" :placeholder="$t('panel.please_select')" @change="viewInfoOnChange(targetViewInfo)">
<el-select v-model="targetViewInfo.targetViewId" style="width: 100%" size="mini" :placeholder="$t('fu.search_bar.please_select')" @change="viewInfoOnChange(targetViewInfo)">
<el-option
v-for="item in currentLinkPanelViewArray"
:key="item.id"
@ -99,7 +99,7 @@
</el-col>
<el-col :span="11">
<div class="select-filed">
<el-select v-model="targetViewInfo.targetFieldId" style="width: 100%" size="mini" :placeholder="$t('panel.please_select')">
<el-select v-model="targetViewInfo.targetFieldId" style="width: 100%" size="mini" :placeholder="$t('fu.search_bar.please_select')">
<el-option
v-for="viewField in viewIdFieldArrayMap[targetViewInfo.targetViewId]"
:key="viewField.id"