From 2f6cbf3ac6bef41e2a428b1ca361246e4d9cb36c Mon Sep 17 00:00:00 2001 From: fit2cloud-chenyw Date: Wed, 27 Jul 2022 18:58:11 +0800 Subject: [PATCH 1/8] =?UTF-8?q?fix(=E4=BB=AA=E8=A1=A8=E6=9D=BF):=20?= =?UTF-8?q?=E6=97=B6=E9=97=B4=E8=BF=87=E6=BB=A4=E7=BB=84=E4=BB=B6=E8=AE=BE?= =?UTF-8?q?=E7=BD=AE=E9=BB=98=E8=AE=A4GMT=E6=97=B6=E5=8C=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../io/dataease/provider/engine/doris/DorisQueryProvider.java | 1 + 1 file changed, 1 insertion(+) diff --git a/backend/src/main/java/io/dataease/provider/engine/doris/DorisQueryProvider.java b/backend/src/main/java/io/dataease/provider/engine/doris/DorisQueryProvider.java index ad15ab3251..b4be9342b8 100644 --- a/backend/src/main/java/io/dataease/provider/engine/doris/DorisQueryProvider.java +++ b/backend/src/main/java/io/dataease/provider/engine/doris/DorisQueryProvider.java @@ -1075,6 +1075,7 @@ public class DorisQueryProvider extends QueryProvider { } else if (StringUtils.containsIgnoreCase(request.getOperator(), "between")) { if (request.getDatasetTableField().getDeType() == 1) { SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + simpleDateFormat.setTimeZone(TimeZone.getTimeZone("GMT")); String startTime = simpleDateFormat.format(new Date(Long.parseLong(value.get(0)))); String endTime = simpleDateFormat.format(new Date(Long.parseLong(value.get(1)))); whereValue = String.format(DorisConstants.WHERE_BETWEEN, startTime, endTime); From 1d8f843d18254d5244971799af650fe4d06594d2 Mon Sep 17 00:00:00 2001 From: fit2cloud-chenyw Date: Wed, 27 Jul 2022 21:46:27 +0800 Subject: [PATCH 2/8] =?UTF-8?q?revert(=E4=BB=AA=E8=A1=A8=E6=9D=BF):=20?= =?UTF-8?q?=E6=97=B6=E9=97=B4=E8=BF=87=E6=BB=A4=E7=BB=84=E4=BB=B6=E8=AE=BE?= =?UTF-8?q?=E7=BD=AE=E9=BB=98=E8=AE=A4GMT=E6=97=B6=E5=8C=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../io/dataease/provider/engine/doris/DorisQueryProvider.java | 1 - 1 file changed, 1 deletion(-) diff --git a/backend/src/main/java/io/dataease/provider/engine/doris/DorisQueryProvider.java b/backend/src/main/java/io/dataease/provider/engine/doris/DorisQueryProvider.java index b4be9342b8..ad15ab3251 100644 --- a/backend/src/main/java/io/dataease/provider/engine/doris/DorisQueryProvider.java +++ b/backend/src/main/java/io/dataease/provider/engine/doris/DorisQueryProvider.java @@ -1075,7 +1075,6 @@ public class DorisQueryProvider extends QueryProvider { } else if (StringUtils.containsIgnoreCase(request.getOperator(), "between")) { if (request.getDatasetTableField().getDeType() == 1) { SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); - simpleDateFormat.setTimeZone(TimeZone.getTimeZone("GMT")); String startTime = simpleDateFormat.format(new Date(Long.parseLong(value.get(0)))); String endTime = simpleDateFormat.format(new Date(Long.parseLong(value.get(1)))); whereValue = String.format(DorisConstants.WHERE_BETWEEN, startTime, endTime); From c14c0a9cba8d45705b3814dd59c6344785abfdb7 Mon Sep 17 00:00:00 2001 From: wangjiahao <1522128093@qq.com> Date: Thu, 28 Jul 2022 11:09:05 +0800 Subject: [PATCH 3/8] =?UTF-8?q?refactor(xpack):=20=E6=9D=83=E9=99=90?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E4=BA=A4=E4=BA=92=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dataease/plugins/server/XAuthServer.java | 20 ++++++++++++++++++- frontend/src/lang/en.js | 3 ++- frontend/src/lang/tw.js | 3 ++- frontend/src/lang/zh.js | 3 ++- 4 files changed, 25 insertions(+), 4 deletions(-) diff --git a/backend/src/main/java/io/dataease/plugins/server/XAuthServer.java b/backend/src/main/java/io/dataease/plugins/server/XAuthServer.java index 9b1b32e2ef..331d6b1c58 100644 --- a/backend/src/main/java/io/dataease/plugins/server/XAuthServer.java +++ b/backend/src/main/java/io/dataease/plugins/server/XAuthServer.java @@ -9,19 +9,25 @@ import io.dataease.controller.handler.annotation.I18n; import io.dataease.dto.SysLogDTO; import io.dataease.listener.util.CacheUtils; import io.dataease.plugins.common.dto.DatasourceBaseType; +import io.dataease.plugins.common.dto.datasource.DataSourceType; import io.dataease.plugins.config.SpringContextUtil; import io.dataease.plugins.xpack.auth.dto.request.XpackBaseTreeRequest; import io.dataease.plugins.xpack.auth.dto.request.XpackSysAuthRequest; import io.dataease.plugins.xpack.auth.dto.response.XpackSysAuthDetail; import io.dataease.plugins.xpack.auth.dto.response.XpackSysAuthDetailDTO; import io.dataease.plugins.xpack.auth.dto.response.XpackVAuthModelDTO; +import io.dataease.service.datasource.DatasourceService; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.web.bind.annotation.*; import io.dataease.plugins.xpack.auth.service.AuthXpackService; import springfox.documentation.annotations.ApiIgnore; + +import javax.annotation.Resource; import java.util.*; +import java.util.stream.Collectors; + @ApiIgnore @RequestMapping("/plugin/auth") @RestController @@ -29,6 +35,9 @@ public class XAuthServer { private static final Set cacheTypes = new HashSet<>(); + @Resource + private DatasourceService datasourceService; + @RequiresPermissions("auth:read") @PostMapping("/authModels") @I18n @@ -149,7 +158,16 @@ public class XAuthServer { @GetMapping("/getDatasourceTypes") public List getDatasourceTypes(){ + Collection activeType = datasourceService.types(); + Map activeTypeMap = activeType.stream().collect(Collectors.toMap(DataSourceType::getType, DataSourceType::getName)); + activeTypeMap.put("all","所有数据源"); AuthXpackService sysAuthService = SpringContextUtil.getBean(AuthXpackService.class); - return sysAuthService.getDatasourceTypes(); + List presentTypes = sysAuthService.getDatasourceTypes(); + presentTypes.stream().forEach(datasourceBaseType -> { + if(activeTypeMap.get(datasourceBaseType.getType())!=null){ + datasourceBaseType.setName(activeTypeMap.get(datasourceBaseType.getType())); + } + }); + return presentTypes; } } diff --git a/frontend/src/lang/en.js b/frontend/src/lang/en.js index b4aaafe832..96bdeb3e6b 100644 --- a/frontend/src/lang/en.js +++ b/frontend/src/lang/en.js @@ -1880,7 +1880,8 @@ export default { }, auth: { - no_item_selected: 'Please select resources on the left', + no_item_selected: 'Please select organization、user or role on the left', + no_resource_selected: 'Please select resource on the left', search_pre: 'Search by ', search_suf: ' name', separate_auth: 'Separate Authorization', diff --git a/frontend/src/lang/tw.js b/frontend/src/lang/tw.js index 59e0f75302..73efb34234 100644 --- a/frontend/src/lang/tw.js +++ b/frontend/src/lang/tw.js @@ -1889,7 +1889,8 @@ export default { }, auth: { - no_item_selected: '请在左侧选择资源', + no_item_selected: '请在左侧选择组织、角色或用户', + no_resource_selected: '请在左侧选择资源', search_pre: '通过', search_suf: '名称来搜索', separate_auth: '单独授权', diff --git a/frontend/src/lang/zh.js b/frontend/src/lang/zh.js index 1ff2688228..ec097f9a7c 100644 --- a/frontend/src/lang/zh.js +++ b/frontend/src/lang/zh.js @@ -1898,7 +1898,8 @@ export default { }, auth: { - no_item_selected: '请在左侧选择资源', + no_item_selected: '请在左侧选择组织、角色或用户', + no_resource_selected: '请在左侧选择资源', search_pre: '通过', search_suf: '名称来搜索', separate_auth: '单独授权', From 45730d47fbdc368fb5260444f4f4a75310039974 Mon Sep 17 00:00:00 2001 From: wangjiahao <1522128093@qq.com> Date: Thu, 28 Jul 2022 14:33:38 +0800 Subject: [PATCH 4/8] =?UTF-8?q?style(=E6=A8=A1=E6=9D=BF=E5=B8=82=E5=9C=BA)?= =?UTF-8?q?:=20=E6=A8=A1=E6=9D=BF=E5=B8=82=E5=9C=BA=E4=BA=A4=E4=BA=92?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/resources/db/migration/V38__1.13.sql | 2 +- frontend/src/api/templateMarket/index.js | 2 +- frontend/src/icons/svg/no_result.svg | 5 ++ frontend/src/lang/en.js | 1 + frontend/src/lang/tw.js | 1 + frontend/src/lang/zh.js | 1 + .../component/MarketPreview.vue | 33 ++++++++--- .../component/TemplateMarketItem.vue | 2 +- .../component/TemplateMarketPreviewItem.vue | 4 +- .../src/views/panel/templateMarket/index.vue | 58 +++++++++++++++---- 10 files changed, 85 insertions(+), 24 deletions(-) create mode 100644 frontend/src/icons/svg/no_result.svg diff --git a/backend/src/main/resources/db/migration/V38__1.13.sql b/backend/src/main/resources/db/migration/V38__1.13.sql index 5d3e9f0ba5..82eb9a14dd 100644 --- a/backend/src/main/resources/db/migration/V38__1.13.sql +++ b/backend/src/main/resources/db/migration/V38__1.13.sql @@ -66,7 +66,7 @@ update area_mapping_global set county_code = concat('156', county_code); COMMIT; -INSERT INTO `sys_menu` (`menu_id`, `pid`, `sub_count`, `type`, `title`, `name`, `component`, `menu_sort`, `icon`, `path`, `i_frame`, `cache`, `hidden`, `permission`, `create_by`, `update_by`, `create_time`, `update_time`) VALUES (202, 0, 0, 1, '模板市场', 'template-market', 'panel/templateMarket/index', 7, 'dashboard', '/templateMarket', 0, 0, 0, null, NULL, NULL, NULL, 1620444227389); +INSERT INTO `sys_menu` (`menu_id`, `pid`, `sub_count`, `type`, `title`, `name`, `component`, `menu_sort`, `icon`, `path`, `i_frame`, `cache`, `hidden`, `permission`, `create_by`, `update_by`, `create_time`, `update_time`) VALUES (202, 0, 0, 1, '模板市场', 'template-market', 'panel/templateMarket/index', 5, 'dashboard', '/templateMarket', 0, 0, 0, null, NULL, NULL, NULL, 1620444227389); INSERT INTO `system_parameter` (`param_key`, `param_value`, `type`, `sort`) VALUES ('basic.templateAccessKey', 'dataease', 'text', NULL); INSERT INTO `system_parameter` (`param_key`, `param_value`, `type`, `sort`) VALUES ('basic.templateMarketUlr', 'https://dataease.io/templates', 'text', 4); diff --git a/frontend/src/api/templateMarket/index.js b/frontend/src/api/templateMarket/index.js index 74534221d3..56e34cce8d 100644 --- a/frontend/src/api/templateMarket/index.js +++ b/frontend/src/api/templateMarket/index.js @@ -15,6 +15,6 @@ export function getCategories() { url: '/template/market/categories', method: 'get', hideMsg: true, - loading: false + loading: true }) } diff --git a/frontend/src/icons/svg/no_result.svg b/frontend/src/icons/svg/no_result.svg new file mode 100644 index 0000000000..78a9df2c8f --- /dev/null +++ b/frontend/src/icons/svg/no_result.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/frontend/src/lang/en.js b/frontend/src/lang/en.js index 601ede8cb5..fd02cbac02 100644 --- a/frontend/src/lang/en.js +++ b/frontend/src/lang/en.js @@ -131,6 +131,7 @@ export default { default_login: 'Normal' }, commons: { + no_result: 'No Result', manage_member: 'Managing members', user_confirm_remove_cancel: 'Are you sure you want to remove the user from the role?', confirm_remove_cancel: 'Are you sure to delete the role?', diff --git a/frontend/src/lang/tw.js b/frontend/src/lang/tw.js index 80e5737eb0..8bc3716a97 100644 --- a/frontend/src/lang/tw.js +++ b/frontend/src/lang/tw.js @@ -131,6 +131,7 @@ export default { default_login: '普通登錄' }, commons: { + no_result: '没有找到相关内容', manage_member: '管理成員', user_confirm_remove_cancel: '確定將該用戶從角色中移除嗎?', confirm_remove_cancel: '確定刪除該角色嗎?', diff --git a/frontend/src/lang/zh.js b/frontend/src/lang/zh.js index 36c5806397..cb557a7e8e 100644 --- a/frontend/src/lang/zh.js +++ b/frontend/src/lang/zh.js @@ -131,6 +131,7 @@ export default { default_login: '普通登录' }, commons: { + no_result: '没有找到相关内容', manage_member: '管理成员', confirm_remove_cancel: '确定删除该角色吗?', user_confirm_remove_cancel: '确定将该用户从角色中移除吗?', diff --git a/frontend/src/views/panel/templateMarket/component/MarketPreview.vue b/frontend/src/views/panel/templateMarket/component/MarketPreview.vue index 546e06ace3..c27648e5b1 100644 --- a/frontend/src/views/panel/templateMarket/component/MarketPreview.vue +++ b/frontend/src/views/panel/templateMarket/component/MarketPreview.vue @@ -5,7 +5,7 @@ - {{$t('panel.template_preview')}} + {{ $t('panel.template_preview') }} @@ -41,12 +41,19 @@ :active="active(templateItem)" @previewTemplate="previewTemplate" /> + +
+ +
+ {{ $t('commons.no_result') }} +
+ {{ curTemplate.title }} - {{$t('panel.apply_this_template')}} + {{ $t('panel.apply_this_template') }} @@ -73,6 +80,7 @@ export default { }, data() { return { + hasResult: true, extFilterActive: false, asideActive: true, previewVisible: false, @@ -165,8 +173,12 @@ export default { }, initTemplateShow() { + this.hasResult = false this.currentMarketTemplateShowList.forEach(template => { template.showFlag = this.templateShow(template) + if (template.showFlag) { + this.hasResult = true + } }) }, templateShow(templateItem) { @@ -273,14 +285,15 @@ export default { } .custom-position { - height: 80vh; + height: 70vh; flex: 1; display: flex; align-items: center; justify-content: space-between; font-size: 14px; flex-flow: row nowrap; - color: #9ea6b2; + color: #646A73; + font-weight: 400; } .aside-active { @@ -288,7 +301,7 @@ export default { height: calc(100vh - 56px); overflow-x: hidden; overflow-y: auto; - border-right: 1px solid rgba(31,31,31,0.15); + background: #fff; } .aside-inActive{ @@ -366,8 +379,9 @@ export default { } .img-main{ border-radius: 4px; - box-shadow: 0 0 2px 0 rgba(31,31,31,0.15), 0 1px 2px 0 rgba(31,31,31,0.15); - border: solid 2px #fff; + background: #0F1114; + overflow-x: auto; + overflow-y: hidden; height: calc(100% - 50px)!important; } .open-button{ @@ -378,6 +392,11 @@ export default { top: 16px; z-index: 2; } + +//.open-button:hover{ +// transition: 0.5s; +// width: 50px; +//} .open-button:hover{ color: #3a8ee6; } diff --git a/frontend/src/views/panel/templateMarket/component/TemplateMarketItem.vue b/frontend/src/views/panel/templateMarket/component/TemplateMarketItem.vue index d9dbec95b0..79168ea8c2 100644 --- a/frontend/src/views/panel/templateMarket/component/TemplateMarketItem.vue +++ b/frontend/src/views/panel/templateMarket/component/TemplateMarketItem.vue @@ -66,7 +66,7 @@ export default { .testcase-template { position: relative; display: inline-block; - margin: 24px 0 0 24px; + margin: 24px 0 0 0; box-shadow: 0 0 2px 0 rgba(31,31,31,0.15), 0 1px 2px 0 rgba(31,31,31,0.15); border: solid 2px #fff; box-sizing: border-box; diff --git a/frontend/src/views/panel/templateMarket/component/TemplateMarketPreviewItem.vue b/frontend/src/views/panel/templateMarket/component/TemplateMarketPreviewItem.vue index 0e1588b8be..8ae016594f 100644 --- a/frontend/src/views/panel/templateMarket/component/TemplateMarketPreviewItem.vue +++ b/frontend/src/views/panel/templateMarket/component/TemplateMarketPreviewItem.vue @@ -78,7 +78,7 @@ export default { } .template-item-main-active{ - border: 2px solid #3370FF ; + border: 2px solid #3370FF!important; ; } .template-item-img{ @@ -106,7 +106,7 @@ export default { } .template-item-main:hover { - border: solid 2px gray; + border: solid 1px #3370FF; } diff --git a/frontend/src/views/panel/templateMarket/index.vue b/frontend/src/views/panel/templateMarket/index.vue index 09d7b88894..8f5dc9ba4f 100644 --- a/frontend/src/views/panel/templateMarket/index.vue +++ b/frontend/src/views/panel/templateMarket/index.vue @@ -17,20 +17,30 @@ - - + + - + - + +
+ +
+ {{ $t('commons.no_result') }} +
+ + {{ $t('panel.market_network_tips') }} @@ -72,15 +82,18 @@ import { searchMarket, getCategories } from '@/api/templateMarket' import TemplateMarketItem from '@/views/panel/templateMarket/component/TemplateMarketItem' import { groupTree, panelSave } from '@/api/panel/panel' -import bus from '@/utils/bus' import { DEFAULT_COMMON_CANVAS_STYLE_STRING } from '@/views/panel/panel' import MarketPreview from '@/views/panel/templateMarket/component/MarketPreview' +import elementResizeDetectorMaker from 'element-resize-detector' export default { name: 'TemplateMarket', components: { MarketPreview, TemplateMarketItem }, data() { return { + hasResult: true, + templateMiniWidth: 350, + templateSpan: '25%', previewModel: false, previewVisible: false, templatePreviewId: '', @@ -119,6 +132,16 @@ export default { mounted() { this.initMarketTemplate() this.getGroupTree() + const _this = this + const erd = elementResizeDetectorMaker() + const templateMainDom = document.getElementById('template-main') + // 监听div变动事件 + erd.listenTo(templateMainDom, element => { + _this.$nextTick(() => { + _this.templateSpan = (100 / Math.trunc(templateMainDom.offsetWidth / _this.templateMiniWidth)) + '%' + console.log('templateSpan=' + _this.templateSpan) + }) + }) }, methods: { initMarketTemplate() { @@ -181,9 +204,16 @@ export default { }, initTemplateShow() { + let tempHasResult = false this.currentMarketTemplateShowList.forEach(template => { template.showFlag = this.templateShow(template) + if (template.showFlag) { + tempHasResult = true + } }) + if (this.currentMarketTemplateShowList.length > 0) { + this.hasResult = tempHasResult + } }, templateShow(templateItem) { let categoryMarch = false @@ -211,11 +241,13 @@ export default { From 1a4a3f6898b504e591616be66386320d44261716 Mon Sep 17 00:00:00 2001 From: wangjiahao <1522128093@qq.com> Date: Thu, 28 Jul 2022 15:19:10 +0800 Subject: [PATCH 5/8] =?UTF-8?q?refactor(=E4=BB=AA=E8=A1=A8=E6=9D=BF):=20?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BB=AA=E8=A1=A8=E6=9D=BF=E8=B7=B3=E8=BD=AC?= =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E6=8B=BC=E6=8E=A5http=E9=80=BB=E8=BE=91?= =?UTF-8?q?=EF=BC=8C=E6=94=B9=E4=B8=BA=E8=B7=B3=E8=BD=AC=E6=97=B6=E5=88=BB?= =?UTF-8?q?=E5=86=8D=E8=BF=9B=E8=A1=8C=E6=A3=80=E6=9F=A5=E6=8B=BC=E6=8E=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/components/canvas/custom-component/UserView.vue | 5 ++++- frontend/src/views/panel/LinkJumpSet/index.vue | 2 -- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/frontend/src/components/canvas/custom-component/UserView.vue b/frontend/src/components/canvas/custom-component/UserView.vue index 56b45d5e42..ef5975f605 100644 --- a/frontend/src/components/canvas/custom-component/UserView.vue +++ b/frontend/src/components/canvas/custom-component/UserView.vue @@ -128,6 +128,8 @@ import ChartComponentS2 from '@/views/chart/components/ChartComponentS2' import PluginCom from '@/views/system/plugin/PluginCom' import LabelNormalText from '@/views/chart/components/normal/LabelNormalText' import { viewPropsSave } from '@/api/chart/chart' +import { checkAddHttp } from '@/utils/urlUtils' + export default { name: 'UserView', components: { LabelNormalText, PluginCom, ChartComponentS2, EditBarView, ChartComponent, TableNormal, LabelNormal, DrillPath, ChartComponentG2 }, @@ -678,7 +680,8 @@ export default { } } else { const colList = [...param.dimensionList, ...param.quotaList] - const url = this.setIdValueTrans('id', 'value', jumpInfo.content, colList) + let url = this.setIdValueTrans('id', 'value', jumpInfo.content, colList) + url = checkAddHttp(url) window.open(url, jumpInfo.jumpType) } } else { diff --git a/frontend/src/views/panel/LinkJumpSet/index.vue b/frontend/src/views/panel/LinkJumpSet/index.vue index b05ea27d76..e64f89b917 100644 --- a/frontend/src/views/panel/LinkJumpSet/index.vue +++ b/frontend/src/views/panel/LinkJumpSet/index.vue @@ -236,7 +236,6 @@ import { queryPanelJumpInfo, queryWithViewId, updateJumpSet } from '@/api/panel/ import { groupTree } from '@/api/panel/panel' import { detailList } from '@/api/panel/panelView' import { mapState } from 'vuex' -import { checkAddHttp } from '@/utils/urlUtils' import draggable from 'vuedraggable' import { codemirror } from 'vue-codemirror' @@ -397,7 +396,6 @@ export default { }, save() { this.codemirrorShow = false - this.linkJumpInfo.content = checkAddHttp(this.linkJumpInfo.content) this.linkJumpInfoArray.forEach(jumpInfo => { jumpInfo.content = this.setNameIdTrans('sourceFieldName', 'sourceFieldId', jumpInfo.content) }) From 449d56b31b48d1a7e942d01017a7558ccda90f46 Mon Sep 17 00:00:00 2001 From: taojinlong Date: Thu, 28 Jul 2022 15:51:12 +0800 Subject: [PATCH 6/8] =?UTF-8?q?fix(=E6=95=B0=E6=8D=AE=E9=9B=86):=20?= =?UTF-8?q?=E8=AF=86=E5=88=AB=20pg=20=E8=A1=A8=E7=9A=84=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../provider/datasource/JdbcProvider.java | 37 +++++++++++++------ 1 file changed, 25 insertions(+), 12 deletions(-) diff --git a/backend/src/main/java/io/dataease/provider/datasource/JdbcProvider.java b/backend/src/main/java/io/dataease/provider/datasource/JdbcProvider.java index 6f00e03989..df26854263 100644 --- a/backend/src/main/java/io/dataease/provider/datasource/JdbcProvider.java +++ b/backend/src/main/java/io/dataease/provider/datasource/JdbcProvider.java @@ -95,22 +95,30 @@ public class JdbcProvider extends DefaultJdbcProvider { while (resultSet.next()) { String tableName = resultSet.getString("TABLE_NAME"); String database; - if (datasourceRequest.getDatasource().getType().equalsIgnoreCase(DatasourceTypes.ck.name()) || datasourceRequest.getDatasource().getType().equalsIgnoreCase(DatasourceTypes.impala.name())) { + if (datasourceRequest.getDatasource().getType().equalsIgnoreCase(DatasourceTypes.pg.name()) ||datasourceRequest.getDatasource().getType().equalsIgnoreCase(DatasourceTypes.ck.name()) || datasourceRequest.getDatasource().getType().equalsIgnoreCase(DatasourceTypes.impala.name())) { database = resultSet.getString("TABLE_SCHEM"); } else { database = resultSet.getString("TABLE_CAT"); } - if (database != null) { - if (tableName.equals(datasourceRequest.getTable()) && database.equalsIgnoreCase(getDatabase(datasourceRequest))) { - TableField tableField = getTableFiled(resultSet, datasourceRequest); - list.add(tableField); - } - } else { - if (tableName.equals(datasourceRequest.getTable())) { - TableField tableField = getTableFiled(resultSet, datasourceRequest); - list.add(tableField); - } - } + if(datasourceRequest.getDatasource().getType().equalsIgnoreCase(DatasourceTypes.pg.name())){ + if (tableName.equals(datasourceRequest.getTable()) && database.equalsIgnoreCase(getDsSchema(datasourceRequest))) { + TableField tableField = getTableFiled(resultSet, datasourceRequest); + list.add(tableField); + } + }else { + if (database != null) { + if (tableName.equals(datasourceRequest.getTable()) && database.equalsIgnoreCase(getDatabase(datasourceRequest))) { + TableField tableField = getTableFiled(resultSet, datasourceRequest); + list.add(tableField); + } + } else { + if (tableName.equals(datasourceRequest.getTable())) { + TableField tableField = getTableFiled(resultSet, datasourceRequest); + list.add(tableField); + } + } + } + } resultSet.close(); } catch (SQLException e) { @@ -191,6 +199,11 @@ public class JdbcProvider extends DefaultJdbcProvider { } } + private String getDsSchema(DatasourceRequest datasourceRequest) { + JdbcConfiguration jdbcConfiguration = new Gson().fromJson(datasourceRequest.getDatasource().getConfiguration(), JdbcConfiguration.class); + return jdbcConfiguration.getSchema(); + } + @Override public List fetchResultField(DatasourceRequest datasourceRequest) throws Exception { JdbcConfiguration jdbcConfiguration = new Gson().fromJson(datasourceRequest.getDatasource().getConfiguration(), JdbcConfiguration.class); From bd956d4333fed94aed0d98e6a8ef1eff86533aba Mon Sep 17 00:00:00 2001 From: wangjiahao <1522128093@qq.com> Date: Thu, 28 Jul 2022 16:15:19 +0800 Subject: [PATCH 7/8] =?UTF-8?q?style:=20=E6=9B=B4=E6=8D=A2favicon.ico?= =?UTF-8?q?=E5=9B=BE=E6=A0=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/public/favicon.ico | Bin 5063 -> 6787 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/frontend/public/favicon.ico b/frontend/public/favicon.ico index 3bfb47b2304c7c3f23f27281e9979da227be2478..ffc2c831b5838c7cb3ec600d9d99a7686341b053 100644 GIT binary patch literal 6787 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 Wd@*qIN-47m2SAxzHm);tkNqEa_k@!G From ad93321cb0c610d6c8f9fd9f99d33cff33aa13c5 Mon Sep 17 00:00:00 2001 From: junjun Date: Thu, 28 Jul 2022 16:50:29 +0800 Subject: [PATCH 8/8] =?UTF-8?q?fix(=E8=A7=86=E5=9B=BE):=20=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D=E9=98=88=E5=80=BC=E5=B0=8F=E6=95=B0=E7=B1=BB=E5=9E=8B?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=E5=9B=BE=E6=A0=87=E4=B8=8D=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/views/chart/components/senior/Threshold.vue | 2 +- .../views/chart/components/senior/dialog/TableThresholdEdit.vue | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/frontend/src/views/chart/components/senior/Threshold.vue b/frontend/src/views/chart/components/senior/Threshold.vue index 6440f8069a..4f57464334 100644 --- a/frontend/src/views/chart/components/senior/Threshold.vue +++ b/frontend/src/views/chart/components/senior/Threshold.vue @@ -68,7 +68,7 @@ - + {{ fieldItem.field.name }} diff --git a/frontend/src/views/chart/components/senior/dialog/TableThresholdEdit.vue b/frontend/src/views/chart/components/senior/dialog/TableThresholdEdit.vue index 853e14e663..f168f45f92 100644 --- a/frontend/src/views/chart/components/senior/dialog/TableThresholdEdit.vue +++ b/frontend/src/views/chart/components/senior/dialog/TableThresholdEdit.vue @@ -16,7 +16,7 @@