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

refactor: 单词拼写优化

Browse Source
This commit is contained in:
wangjiahao 2022-11-25 13:24:03 +08:00
parent dcb0316ff2
commit 4a0e4503ba
5 changed files with 8 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -405,7 +405,7 @@ public class OracleQueryProvider extends QueryProvider {
} }
@Override @Override
public String getSQLWithPage(boolean isTable, String table, List<ChartViewFieldDTO> orgXAxis, List<ChartFieldCustomFilterDTO> OrgFeldCustomFilter, List<DataSetRowPermissionsTreeDTO> rowPermissionsTree, List<ChartExtFilterRequest> extFilterRequestList, Datasource ds, ChartViewWithBLOBs view, PageInfo pageInfo) { public String getSQLWithPage(boolean isTable, String table, List<ChartViewFieldDTO> orgXAxis, List<ChartFieldCustomFilterDTO> OrgFieldCustomFilter, List<DataSetRowPermissionsTreeDTO> rowPermissionsTree, List<ChartExtFilterRequest> extFilterRequestList, Datasource ds, ChartViewWithBLOBs view, PageInfo pageInfo) {
List<ChartViewFieldDTO> xAxis = new ArrayList<>(); List<ChartViewFieldDTO> xAxis = new ArrayList<>();
orgXAxis.forEach(chartViewFieldDTO -> { orgXAxis.forEach(chartViewFieldDTO -> {
xAxis.add(chartViewFieldDTO); xAxis.add(chartViewFieldDTO);
@ -416,7 +416,7 @@ public class OracleQueryProvider extends QueryProvider {
List<ChartFieldCustomFilterDTO> fieldCustomFilter = new ArrayList<>(); List<ChartFieldCustomFilterDTO> fieldCustomFilter = new ArrayList<>();
for (ChartFieldCustomFilterDTO chartFieldCustomFilterDTO : OrgFeldCustomFilter) { for (ChartFieldCustomFilterDTO chartFieldCustomFilterDTO : OrgFieldCustomFilter) {
fieldCustomFilter.add(chartFieldCustomFilterDTO); fieldCustomFilter.add(chartFieldCustomFilterDTO);
} }
ChartFieldCustomFilterDTO chartFieldCustomFilterDTO = new ChartFieldCustomFilterDTO(); ChartFieldCustomFilterDTO chartFieldCustomFilterDTO = new ChartFieldCustomFilterDTO();

6
frontend/src/components/canvas/components/editor/DeEditor.vue
View File

@ -121,7 +121,7 @@
:canvas-id="canvasId" :canvas-id="canvasId"
/> />
<!-- 右击菜单 --> <!-- 右击菜单 -->
<ContextMenu /> <ContextMenu/>
<!-- 对齐标线 --> <!-- 对齐标线 -->
<span <span
@ -1567,8 +1567,8 @@ export default {
infoBox.moveItem = item infoBox.moveItem = item
infoBox.moveItemIndex = index infoBox.moveItemIndex = index
infoBox.orignX = 0 // 克隆对象原始X位置 infoBox.originX = 0 // 克隆对象原始X位置
infoBox.orignY = 0 infoBox.originY = 0
infoBox.startX = 0 infoBox.startX = 0
infoBox.startY = 0 infoBox.startY = 0

4
frontend/src/components/deDrag/PointShadow.vue
View File

@ -64,10 +64,6 @@ export default {
this.init() this.init()
}, },
beforeDestroy() { beforeDestroy() {
// const targetComponent = document.getElementById(this.componentCanvasId)
// const domId = 'dragContent-' + this.curComponent.id
// console.log('domId='+domId)
// document.getElementById(domId).appendChild(targetComponent)
}, },
methods: { methods: {
init() { init() {

1
frontend/src/components/widget/deWidget/DeTabs.vue
View File

@ -483,7 +483,6 @@ export default {
canvasScroll(scrollInfo) { canvasScroll(scrollInfo) {
this.scrollLeft = scrollInfo.scrollLeft + 50 this.scrollLeft = scrollInfo.scrollLeft + 50
this.scrollTop = scrollInfo.scrollTop + 10 this.scrollTop = scrollInfo.scrollTop + 10
console.log('scrollInfo=' + JSON.stringify(scrollInfo))
bus.$emit('onScroll') bus.$emit('onScroll')
}, },
tabCanvasComponentData(tabName) { tabCanvasComponentData(tabName) {

11
frontend/src/styles/theme/dark.scss
View File

@ -23,7 +23,7 @@ $--background-color-base: #171b22;
/* 定义全局变量 */ /* 定义全局变量 */
:root{ :root {
--BgSelectColor: #ffffff; --BgSelectColor: #ffffff;
--SelectColor: #fff; --SelectColor: #fff;
--BrSelectColor: #fff; --BrSelectColor: #fff;
@ -40,10 +40,6 @@ $--background-color-base: #171b22;
--RangeColor: #fff; --RangeColor: #fff;
--BrRangeColor: #fff; --BrRangeColor: #fff;
--BgSerachColor: #ffffff;
--SerachColor: #fff;
--BrSerachColor: #fff;
--BgSelectGridColor: #ffffff; --BgSelectGridColor: #ffffff;
--SelectGridColor: #fff; --SelectGridColor: #fff;
--BrSelectGridColor: #fff; --BrSelectGridColor: #fff;
@ -51,7 +47,7 @@ $--background-color-base: #171b22;
// 与CSS原生变量映射 // 与CSS原生变量映射
#app { #app {
--Main:#2681ff; --Main: #2681ff;
--MainBG: #171b22; --MainBG: #171b22;
--ContentBG: #1b2a32; --ContentBG: #1b2a32;
--TextActive: #FFFFFF; --TextActive: #FFFFFF;
@ -72,13 +68,12 @@ $--background-color-base: #171b22;
--TableBG: #21333b; --TableBG: #21333b;
--TableColor: #acbac3; --TableColor: #acbac3;
// --TableBorder: .05rem solid #495865; // --TableBorder: .05rem solid #495865;
--TableBorderColor: #495865; --TableBorderColor: #495865;
--background-color-base: #171b22; --background-color-base: #171b22;
} }