forked from github/dataease
refactor: 单词拼写优化
This commit is contained in:
parent
dcb0316ff2
commit
4a0e4503ba
@ -405,7 +405,7 @@ public class OracleQueryProvider extends QueryProvider {
|
||||
}
|
||||
|
||||
@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<>();
|
||||
orgXAxis.forEach(chartViewFieldDTO -> {
|
||||
xAxis.add(chartViewFieldDTO);
|
||||
@ -416,7 +416,7 @@ public class OracleQueryProvider extends QueryProvider {
|
||||
|
||||
|
||||
List<ChartFieldCustomFilterDTO> fieldCustomFilter = new ArrayList<>();
|
||||
for (ChartFieldCustomFilterDTO chartFieldCustomFilterDTO : OrgFeldCustomFilter) {
|
||||
for (ChartFieldCustomFilterDTO chartFieldCustomFilterDTO : OrgFieldCustomFilter) {
|
||||
fieldCustomFilter.add(chartFieldCustomFilterDTO);
|
||||
}
|
||||
ChartFieldCustomFilterDTO chartFieldCustomFilterDTO = new ChartFieldCustomFilterDTO();
|
||||
|
@ -121,7 +121,7 @@
|
||||
:canvas-id="canvasId"
|
||||
/>
|
||||
<!-- 右击菜单 -->
|
||||
<ContextMenu />
|
||||
<ContextMenu/>
|
||||
|
||||
<!-- 对齐标线 -->
|
||||
<span
|
||||
@ -1567,8 +1567,8 @@ export default {
|
||||
infoBox.moveItem = item
|
||||
infoBox.moveItemIndex = index
|
||||
|
||||
infoBox.orignX = 0 // 克隆对象原始X位置
|
||||
infoBox.orignY = 0
|
||||
infoBox.originX = 0 // 克隆对象原始X位置
|
||||
infoBox.originY = 0
|
||||
infoBox.startX = 0
|
||||
infoBox.startY = 0
|
||||
|
||||
|
@ -64,10 +64,6 @@ export default {
|
||||
this.init()
|
||||
},
|
||||
beforeDestroy() {
|
||||
// const targetComponent = document.getElementById(this.componentCanvasId)
|
||||
// const domId = 'dragContent-' + this.curComponent.id
|
||||
// console.log('domId='+domId)
|
||||
// document.getElementById(domId).appendChild(targetComponent)
|
||||
},
|
||||
methods: {
|
||||
init() {
|
||||
|
@ -483,7 +483,6 @@ export default {
|
||||
canvasScroll(scrollInfo) {
|
||||
this.scrollLeft = scrollInfo.scrollLeft + 50
|
||||
this.scrollTop = scrollInfo.scrollTop + 10
|
||||
console.log('scrollInfo=' + JSON.stringify(scrollInfo))
|
||||
bus.$emit('onScroll')
|
||||
},
|
||||
tabCanvasComponentData(tabName) {
|
||||
|
@ -23,7 +23,7 @@ $--background-color-base: #171b22;
|
||||
|
||||
|
||||
/* 定义全局变量 */
|
||||
:root{
|
||||
:root {
|
||||
--BgSelectColor: #ffffff;
|
||||
--SelectColor: #fff;
|
||||
--BrSelectColor: #fff;
|
||||
@ -40,10 +40,6 @@ $--background-color-base: #171b22;
|
||||
--RangeColor: #fff;
|
||||
--BrRangeColor: #fff;
|
||||
|
||||
--BgSerachColor: #ffffff;
|
||||
--SerachColor: #fff;
|
||||
--BrSerachColor: #fff;
|
||||
|
||||
--BgSelectGridColor: #ffffff;
|
||||
--SelectGridColor: #fff;
|
||||
--BrSelectGridColor: #fff;
|
||||
@ -51,7 +47,7 @@ $--background-color-base: #171b22;
|
||||
|
||||
// 与CSS原生变量映射
|
||||
#app {
|
||||
--Main:#2681ff;
|
||||
--Main: #2681ff;
|
||||
--MainBG: #171b22;
|
||||
--ContentBG: #1b2a32;
|
||||
--TextActive: #FFFFFF;
|
||||
@ -72,13 +68,12 @@ $--background-color-base: #171b22;
|
||||
|
||||
--TableBG: #21333b;
|
||||
--TableColor: #acbac3;
|
||||
// --TableBorder: .05rem solid #495865;
|
||||
// --TableBorder: .05rem solid #495865;
|
||||
--TableBorderColor: #495865;
|
||||
|
||||
--background-color-base: #171b22;
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user