提交 2b18d64c authored 作者: taojinlong's avatar taojinlong

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

...@@ -78,4 +78,16 @@ public abstract class QueryProvider { ...@@ -78,4 +78,16 @@ public abstract class QueryProvider {
public String convertTableToSql(String tableName, Datasource ds) { public String convertTableToSql(String tableName, Datasource ds) {
return "select * from TABLE_NAME".replace("TABLE_NAME", tableName); 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";
}
} }
...@@ -1102,14 +1102,4 @@ public class CKQueryProvider extends QueryProvider { ...@@ -1102,14 +1102,4 @@ public class CKQueryProvider extends QueryProvider {
return sql; return sql;
} }
} }
private String getLogic(String logic) {
switch (logic) {
case "and":
return "AND";
case "or":
return "OR";
}
return "AND";
}
} }
...@@ -1034,14 +1034,4 @@ public class Db2QueryProvider extends QueryProvider { ...@@ -1034,14 +1034,4 @@ public class Db2QueryProvider extends QueryProvider {
return sql; return sql;
} }
} }
private String getLogic(String logic) {
switch (logic) {
case "and":
return "AND";
case "or":
return "OR";
}
return "AND";
}
} }
...@@ -1080,14 +1080,4 @@ public class DorisQueryProvider extends QueryProvider { ...@@ -1080,14 +1080,4 @@ public class DorisQueryProvider extends QueryProvider {
return sql; return sql;
} }
} }
private String getLogic(String logic) {
switch (logic) {
case "and":
return "AND";
case "or":
return "OR";
}
return "AND";
}
} }
...@@ -990,14 +990,4 @@ public class EsQueryProvider extends QueryProvider { ...@@ -990,14 +990,4 @@ public class EsQueryProvider extends QueryProvider {
return sql; return sql;
} }
} }
private String getLogic(String logic) {
switch (logic) {
case "and":
return "AND";
case "or":
return "OR";
}
return "AND";
}
} }
...@@ -1055,14 +1055,4 @@ public class HiveQueryProvider extends QueryProvider { ...@@ -1055,14 +1055,4 @@ public class HiveQueryProvider extends QueryProvider {
return sql; return sql;
} }
} }
private String getLogic(String logic) {
switch (logic) {
case "and":
return "AND";
case "or":
return "OR";
}
return "AND";
}
} }
...@@ -944,14 +944,4 @@ public class MongoQueryProvider extends QueryProvider { ...@@ -944,14 +944,4 @@ public class MongoQueryProvider extends QueryProvider {
return sql; return sql;
} }
} }
private String getLogic(String logic) {
switch (logic) {
case "and":
return "AND";
case "or":
return "OR";
}
return "AND";
}
} }
...@@ -1058,14 +1058,4 @@ public class MysqlQueryProvider extends QueryProvider { ...@@ -1058,14 +1058,4 @@ public class MysqlQueryProvider extends QueryProvider {
return sql; return sql;
} }
} }
private String getLogic(String logic) {
switch (logic) {
case "and":
return "AND";
case "or":
return "OR";
}
return "AND";
}
} }
...@@ -1131,14 +1131,4 @@ public class OracleQueryProvider extends QueryProvider { ...@@ -1131,14 +1131,4 @@ public class OracleQueryProvider extends QueryProvider {
return sql; return sql;
} }
} }
private String getLogic(String logic) {
switch (logic) {
case "and":
return "AND";
case "or":
return "OR";
}
return "AND";
}
} }
...@@ -1047,14 +1047,4 @@ public class PgQueryProvider extends QueryProvider { ...@@ -1047,14 +1047,4 @@ public class PgQueryProvider extends QueryProvider {
return sql; return sql;
} }
} }
private String getLogic(String logic) {
switch (logic) {
case "and":
return "AND";
case "or":
return "OR";
}
return "AND";
}
} }
...@@ -974,14 +974,4 @@ public class RedshiftQueryProvider extends QueryProvider { ...@@ -974,14 +974,4 @@ public class RedshiftQueryProvider extends QueryProvider {
return sql; return sql;
} }
} }
private String getLogic(String logic) {
switch (logic) {
case "and":
return "AND";
case "or":
return "OR";
}
return "AND";
}
} }
...@@ -1089,14 +1089,4 @@ public class SqlserverQueryProvider extends QueryProvider { ...@@ -1089,14 +1089,4 @@ public class SqlserverQueryProvider extends QueryProvider {
} }
return originField; return originField;
} }
private String getLogic(String logic) {
switch (logic) {
case "and":
return "AND";
case "or":
return "OR";
}
return "AND";
}
} }
...@@ -409,7 +409,7 @@ export default { ...@@ -409,7 +409,7 @@ export default {
} else { } else {
this.$message({ this.$message({
type: 'warn', type: 'warn',
message: '当前是公共链接模式,目标仪表板未设置公共链接,无法跳转', message: this.$t('panel.public_link_tips'),
showClose: true showClose: true
}) })
} }
......
...@@ -1460,7 +1460,8 @@ export default { ...@@ -1460,7 +1460,8 @@ export default {
panel_view_result_tips: 'Chose "Panel" Will Overwrite View`s Result,Range 1~10000', panel_view_result_tips: 'Chose "Panel" Will Overwrite View`s Result,Range 1~10000',
timeout_refresh: 'Timeout,Will Refresh...', timeout_refresh: 'Timeout,Will Refresh...',
mobile_layout: 'Mobile Layout', 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: { plugin: {
local_install: 'Local installation', local_install: 'Local installation',
......
...@@ -1462,7 +1462,8 @@ export default { ...@@ -1462,7 +1462,8 @@ export default {
panel_view_result_tips: '選擇儀表板會覆蓋視圖的結果展示數量,取值範圍1~10000', panel_view_result_tips: '選擇儀表板會覆蓋視圖的結果展示數量,取值範圍1~10000',
timeout_refresh: '请求超时,稍后刷新...', timeout_refresh: '请求超时,稍后刷新...',
mobile_layout: '移动端布局', mobile_layout: '移动端布局',
component_hidden: '隐藏的组件' component_hidden: '隐藏的组件',
public_link_tips: '当前是公共链接模式,目标仪表板未设置公共链接,无法跳转'
}, },
plugin: { plugin: {
local_install: '本地安裝', local_install: '本地安裝',
......
...@@ -1471,7 +1471,8 @@ export default { ...@@ -1471,7 +1471,8 @@ export default {
panel_view_result_tips: '选择仪表板会覆盖视图的结果展示数量,取值范围1~10000', panel_view_result_tips: '选择仪表板会覆盖视图的结果展示数量,取值范围1~10000',
timeout_refresh: '请求超时,稍后刷新...', timeout_refresh: '请求超时,稍后刷新...',
mobile_layout: '移动端布局', mobile_layout: '移动端布局',
component_hidden: '隐藏的组件' component_hidden: '隐藏的组件',
public_link_tips: '当前是公共链接模式,目标仪表板未设置公共链接,无法跳转'
}, },
plugin: { plugin: {
local_install: '本地安装', local_install: '本地安装',
......
...@@ -32,6 +32,10 @@ export default { ...@@ -32,6 +32,10 @@ export default {
methods: { methods: {
setPanelInfo() { setPanelInfo() {
loadResource(this.resourceId).then(res => { loadResource(this.resourceId).then(res => {
this.$store.dispatch('panel/setPanelInfo', {
id: res.data.id,
name: res.data.name
})
// 刷新联动信息 // 刷新联动信息
getPanelAllLinkageInfo(this.resourceId).then(rsp => { getPanelAllLinkageInfo(this.resourceId).then(rsp => {
this.$store.commit('setNowPanelTrackInfo', rsp.data) this.$store.commit('setNowPanelTrackInfo', rsp.data)
...@@ -52,7 +56,7 @@ export default { ...@@ -52,7 +56,7 @@ export default {
sourcePanelId: jumpParam.sourcePanelId, sourcePanelId: jumpParam.sourcePanelId,
sourceViewId: jumpParam.sourceViewId, sourceViewId: jumpParam.sourceViewId,
sourceFieldId: jumpParam.sourceFieldId, sourceFieldId: jumpParam.sourceFieldId,
targetPanelId: this.panelId targetPanelId: this.resourceId
} }
this.show = false this.show = false
// 刷新跳转目标仪表板联动信息 // 刷新跳转目标仪表板联动信息
......
...@@ -82,7 +82,7 @@ ...@@ -82,7 +82,7 @@
<el-row v-for="(targetViewInfo,index) in linkJumpInfo.targetViewInfoList" :key="index"> <el-row v-for="(targetViewInfo,index) in linkJumpInfo.targetViewInfoList" :key="index">
<el-col :span="11"> <el-col :span="11">
<div class="select-filed"> <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 <el-option
v-for="item in currentLinkPanelViewArray" v-for="item in currentLinkPanelViewArray"
:key="item.id" :key="item.id"
...@@ -99,7 +99,7 @@ ...@@ -99,7 +99,7 @@
</el-col> </el-col>
<el-col :span="11"> <el-col :span="11">
<div class="select-filed"> <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 <el-option
v-for="viewField in viewIdFieldArrayMap[targetViewInfo.targetViewId]" v-for="viewField in viewIdFieldArrayMap[targetViewInfo.targetViewId]"
:key="viewField.id" :key="viewField.id"
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论