From 4a0e4503bad79d7369fb58678e8895c2d59e917f Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Fri, 25 Nov 2022 13:24:03 +0800
Subject: [PATCH] =?UTF-8?q?refactor:=20=E5=8D=95=E8=AF=8D=E6=8B=BC?=
 =?UTF-8?q?=E5=86=99=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../provider/query/oracle/OracleQueryProvider.java    |  4 ++--
 .../components/canvas/components/editor/DeEditor.vue  |  6 +++---
 frontend/src/components/deDrag/PointShadow.vue        |  4 ----
 frontend/src/components/widget/deWidget/DeTabs.vue    |  1 -
 frontend/src/styles/theme/dark.scss                   | 11 +++--------
 5 files changed, 8 insertions(+), 18 deletions(-)

diff --git a/backend/src/main/java/io/dataease/provider/query/oracle/OracleQueryProvider.java b/backend/src/main/java/io/dataease/provider/query/oracle/OracleQueryProvider.java
index c3ce406b2d..6cdf6d874c 100644
--- a/backend/src/main/java/io/dataease/provider/query/oracle/OracleQueryProvider.java
+++ b/backend/src/main/java/io/dataease/provider/query/oracle/OracleQueryProvider.java
@@ -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();
diff --git a/frontend/src/components/canvas/components/editor/DeEditor.vue b/frontend/src/components/canvas/components/editor/DeEditor.vue
index 07d86d0b33..661432bfe1 100644
--- a/frontend/src/components/canvas/components/editor/DeEditor.vue
+++ b/frontend/src/components/canvas/components/editor/DeEditor.vue
@@ -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
 
diff --git a/frontend/src/components/deDrag/PointShadow.vue b/frontend/src/components/deDrag/PointShadow.vue
index 569c968315..234fe13b92 100644
--- a/frontend/src/components/deDrag/PointShadow.vue
+++ b/frontend/src/components/deDrag/PointShadow.vue
@@ -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() {
diff --git a/frontend/src/components/widget/deWidget/DeTabs.vue b/frontend/src/components/widget/deWidget/DeTabs.vue
index 60c25fda40..80d2a1e358 100644
--- a/frontend/src/components/widget/deWidget/DeTabs.vue
+++ b/frontend/src/components/widget/deWidget/DeTabs.vue
@@ -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) {
diff --git a/frontend/src/styles/theme/dark.scss b/frontend/src/styles/theme/dark.scss
index ba6728df40..998063ec47 100644
--- a/frontend/src/styles/theme/dark.scss
+++ b/frontend/src/styles/theme/dark.scss
@@ -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;
 
 
-  
 }