From 195fd7c21e9a4032ad5685dad97ac41ab74bb5d7 Mon Sep 17 00:00:00 2001
From: dataeaseShu <106045316+dataeaseShu@users.noreply.github.com>
Date: Mon, 19 Dec 2022 17:46:46 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=95=B0=E6=8D=AE=E6=BA=90=E5=88=86?=
 =?UTF-8?q?=E7=B1=BB=E7=9A=84=E6=94=B9=E8=BF=9B=20#3983?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/editor/ComponentWrapper.vue    |  2 +-
 .../canvas/customComponent/UserView.vue       |  3 +-
 .../deIconPicker/deIconGroupPicker/index.vue  |  5 ++-
 .../src/components/deIconPicker/index.vue     |  5 ++-
 frontend/src/lang/en.js                       |  1 +
 frontend/src/lang/tw.js                       |  1 +
 frontend/src/lang/zh.js                       |  1 +
 .../views/background/BackgroundOverall.vue    | 17 +++++++---
 frontend/src/views/dataset/add/AddDB.vue      |  2 +-
 frontend/src/views/dataset/add/AddSQL.vue     |  2 +-
 .../panel/filter/filterMain/FilterControl.vue |  2 +-
 .../src/views/panel/list/PanelViewShow.vue    |  5 ++-
 .../src/views/panel/subjectSetting/index.vue  | 16 +++++----
 .../views/system/datasource/DsFormContent.vue | 34 +++++++++----------
 .../src/views/system/datasource/DsTree.vue    | 27 +++++++++------
 frontend/src/views/wizard/index.vue           | 20 +++++------
 16 files changed, 82 insertions(+), 61 deletions(-)

diff --git a/frontend/src/components/canvas/components/editor/ComponentWrapper.vue b/frontend/src/components/canvas/components/editor/ComponentWrapper.vue
index b12a130c2e..bba9a44403 100644
--- a/frontend/src/components/canvas/components/editor/ComponentWrapper.vue
+++ b/frontend/src/components/canvas/components/editor/ComponentWrapper.vue
@@ -279,7 +279,7 @@ export default {
       } else {
         return {
           ...
-            getStyle(style, ['top', 'left', 'width', 'height', 'rotate']),
+          getStyle(style, ['top', 'left', 'width', 'height', 'rotate']),
           position: 'relative'
         }
       }
diff --git a/frontend/src/components/canvas/customComponent/UserView.vue b/frontend/src/components/canvas/customComponent/UserView.vue
index eab9fd0802..043b0d80fe 100644
--- a/frontend/src/components/canvas/customComponent/UserView.vue
+++ b/frontend/src/components/canvas/customComponent/UserView.vue
@@ -350,7 +350,7 @@ export default {
   },
 
   computed: {
-    //首次加载且非编辑状态新复制的视图，使用外部filter
+    // 首次加载且非编辑状态新复制的视图，使用外部filter
     initLoad() {
       return !(this.isEdit && this.currentCanvasNewId.includes(this.element.id)) && this.isFirstLoad
     },
@@ -1269,7 +1269,6 @@ export default {
   display: block !important;
 }
 
-
 .mobile-dialog-css ::v-deep .el-dialog__headerbtn {
   top: 7px
 }
diff --git a/frontend/src/components/deIconPicker/deIconGroupPicker/index.vue b/frontend/src/components/deIconPicker/deIconGroupPicker/index.vue
index 0de188ea20..bb80907527 100644
--- a/frontend/src/components/deIconPicker/deIconGroupPicker/index.vue
+++ b/frontend/src/components/deIconPicker/deIconGroupPicker/index.vue
@@ -217,7 +217,10 @@ export default {
         return ''
       }
     },
-    options: {},
+    options: {
+      type: Object,
+      default: () => {}
+    },
     width: {
       type: Number,
       default() {
diff --git a/frontend/src/components/deIconPicker/index.vue b/frontend/src/components/deIconPicker/index.vue
index f47284928e..f6ac0ce3a0 100644
--- a/frontend/src/components/deIconPicker/index.vue
+++ b/frontend/src/components/deIconPicker/index.vue
@@ -180,7 +180,10 @@ export default {
         return ''
       }
     },
-    options: {},
+    options: {
+      type: Object,
+      default: () => {}
+    },
     width: {
       type: Number,
       default() {
diff --git a/frontend/src/lang/en.js b/frontend/src/lang/en.js
index 6822dcbe3a..1a9c9056d3 100644
--- a/frontend/src/lang/en.js
+++ b/frontend/src/lang/en.js
@@ -1923,6 +1923,7 @@ export default {
     field_description: 'Field description',
     table_description: 'Table description',
     relational_database: 'Relational database',
+    data_warehouse_lake: 'Data Warehouse/Data Lake',
     non_relational_database: 'Non relational database',
     all: 'All',
     other: 'other',
diff --git a/frontend/src/lang/tw.js b/frontend/src/lang/tw.js
index e306347505..04ee75543b 100644
--- a/frontend/src/lang/tw.js
+++ b/frontend/src/lang/tw.js
@@ -1917,6 +1917,7 @@ export default {
     field_description: '欄位描述',
     table_description: '表描述',
     relational_database: '關係型數據庫',
+    data_warehouse_lake: '數倉/數據湖',
     non_relational_database: '非關係型數據庫',
     all: '所有',
     other: '其他',
diff --git a/frontend/src/lang/zh.js b/frontend/src/lang/zh.js
index 733d69d3af..aabd516a5f 100644
--- a/frontend/src/lang/zh.js
+++ b/frontend/src/lang/zh.js
@@ -1916,6 +1916,7 @@ export default {
     field_description: '字段描述',
     table_description: '表描述',
     relational_database: '关系型数据库',
+    data_warehouse_lake: '数仓/数据湖',
     non_relational_database: '非关系型数据库',
     all: '所有',
     other: '其他',
diff --git a/frontend/src/views/background/BackgroundOverall.vue b/frontend/src/views/background/BackgroundOverall.vue
index d3a9d706ec..0aa5fc5553 100644
--- a/frontend/src/views/background/BackgroundOverall.vue
+++ b/frontend/src/views/background/BackgroundOverall.vue
@@ -36,7 +36,10 @@
           :span="6"
           style="padding-top: 5px"
         >
-          <el-checkbox v-model="commonBackground.backgroundColorSelect" @change="themeChange('backgroundColorSelect')">
+          <el-checkbox
+            v-model="commonBackground.backgroundColorSelect"
+            @change="themeChange('backgroundColorSelect')"
+          >
             {{
               $t('chart.color')
             }}
@@ -75,9 +78,12 @@
           :span="4"
           style="padding-top: 5px"
         >
-          <el-checkbox v-model="commonBackground.enable" @change="themeChange('enable')">{{
-              $t('panel.background')
-            }}
+          <el-checkbox
+            v-model="commonBackground.enable"
+            @change="themeChange('enable')"
+          >{{
+            $t('panel.background')
+          }}
           </el-checkbox>
         </el-col>
         <el-col :span="20">
@@ -113,7 +119,7 @@
               :http-request="upload"
               :file-list="fileList"
             >
-              <i class="el-icon-plus"/>
+              <i class="el-icon-plus" />
             </el-upload>
             <el-dialog
               top="25vh"
@@ -189,6 +195,7 @@ import BackgroundItemOverall from '@/views/background/BackgroundItemOverall'
 
 export default {
   name: 'BackgroundOverall',
+  // eslint-disable-next-line
   components: { BackgroundItemOverall, BackgroundItem },
   props: {
     position: {
diff --git a/frontend/src/views/dataset/add/AddDB.vue b/frontend/src/views/dataset/add/AddDB.vue
index 92ca2c14a1..f852311969 100644
--- a/frontend/src/views/dataset/add/AddDB.vue
+++ b/frontend/src/views/dataset/add/AddDB.vue
@@ -127,9 +127,9 @@
             value="0"
           />
           <el-option
+            v-if="engineMode !== 'simple'"
             :label="$t('dataset.sync_data')"
             value="1"
-            v-if="engineMode !== 'simple'"
             :disabled="disabledSync"
           />
         </el-select>
diff --git a/frontend/src/views/dataset/add/AddSQL.vue b/frontend/src/views/dataset/add/AddSQL.vue
index 27146e2883..61dbe828fc 100644
--- a/frontend/src/views/dataset/add/AddSQL.vue
+++ b/frontend/src/views/dataset/add/AddSQL.vue
@@ -49,8 +49,8 @@
             size="small"
           >
             <el-option
-              :label="$t('dataset.sync_now')"
               v-if="engineMode !== 'simple'"
+              :label="$t('dataset.sync_now')"
               value="sync_now"
               :disabled="engineMode === 'simple'"
             />
diff --git a/frontend/src/views/panel/filter/filterMain/FilterControl.vue b/frontend/src/views/panel/filter/filterMain/FilterControl.vue
index 068c9ea7dd..32d4512603 100644
--- a/frontend/src/views/panel/filter/filterMain/FilterControl.vue
+++ b/frontend/src/views/panel/filter/filterMain/FilterControl.vue
@@ -279,7 +279,7 @@ export default {
     },
     datasetParams: {
       type: Array,
-      default: []
+      default: () => []
     }
   },
   data() {
diff --git a/frontend/src/views/panel/list/PanelViewShow.vue b/frontend/src/views/panel/list/PanelViewShow.vue
index a89a232b22..0d7f65fb38 100644
--- a/frontend/src/views/panel/list/PanelViewShow.vue
+++ b/frontend/src/views/panel/list/PanelViewShow.vue
@@ -17,7 +17,7 @@
         style="border-bottom: 1px solid;border-bottom-color:#E6E6E6;"
       >
         <div style="height: 100%;">
-          <share-head/>
+          <share-head />
         </div>
       </el-row>
       <el-row
@@ -76,7 +76,7 @@
               width="400"
               trigger="click"
             >
-              <panel-detail-info/>
+              <panel-detail-info />
               <i
                 slot="reference"
                 class="el-icon-warning-outline icon-class"
@@ -489,7 +489,6 @@ export default {
       } else {
         return true
       }
-
     },
     downLoadApp(appAttachInfo) {
       this.downLoadToApp(appAttachInfo)
diff --git a/frontend/src/views/panel/subjectSetting/index.vue b/frontend/src/views/panel/subjectSetting/index.vue
index fc3ca2e4ff..b99f9e8fd9 100644
--- a/frontend/src/views/panel/subjectSetting/index.vue
+++ b/frontend/src/views/panel/subjectSetting/index.vue
@@ -3,7 +3,7 @@
     <div class="theme-slider-main">
       {{ $t('panel.dashboard_theme') }}
     </div>
-    <div class="theme-slider-position"/>
+    <div class="theme-slider-position" />
     <div>
       <slider
         v-if="sliderShow"
@@ -25,38 +25,38 @@
             name="panel"
           >
             <el-row class="selector-div">
-              <overall-setting/>
+              <overall-setting />
             </el-row>
           </el-collapse-item>
           <el-collapse-item
             :title="$t('panel.panel_background')"
             name="panelBackground"
           >
-            <background-selector/>
+            <background-selector />
           </el-collapse-item>
           <el-collapse-item
             :title="$t('panel.view_style')"
             name="componentStyle"
           >
-            <background-overall></background-overall>
+            <background-overall />
           </el-collapse-item>
           <el-collapse-item
             :title="$t('panel.view_color_setting')"
             name="graphical"
           >
-            <panel-color-selector @onColorChange="onColorChange"/>
+            <panel-color-selector @onColorChange="onColorChange" />
           </el-collapse-item>
           <el-collapse-item
             :title="$t('panel.chart_title')"
             name="table"
           >
-            <view-title @onTextChange="onTextChange"/>
+            <view-title @onTextChange="onTextChange" />
           </el-collapse-item>
           <el-collapse-item
             :title="$t('panel.filter_component')"
             name="filterComponent"
           >
-            <FilterStyleSelector/>
+            <FilterStyleSelector />
           </el-collapse-item>
         </el-collapse>
       </div>
@@ -81,8 +81,10 @@ import BackgroundOverall from '@/views/background/BackgroundOverall'
 export default {
   components: {
     BackgroundOverall,
+    // eslint-disable-next-line
     Background,
     FilterStyleSelector,
+    // eslint-disable-next-line
     ComponentStyle,
     ViewTitle,
     slider,
diff --git a/frontend/src/views/system/datasource/DsFormContent.vue b/frontend/src/views/system/datasource/DsFormContent.vue
index cb4f2da004..aabaaae3bc 100644
--- a/frontend/src/views/system/datasource/DsFormContent.vue
+++ b/frontend/src/views/system/datasource/DsFormContent.vue
@@ -71,8 +71,8 @@
           </el-form>
           <div class="de-row-rules">
             <span>{{
-                positionCheck('appMarket') ? $t('app_template.datasource_info') : $t('datasource.basic_info')
-              }}</span>
+              positionCheck('appMarket') ? $t('app_template.datasource_info') : $t('datasource.basic_info')
+            }}</span>
           </div>
           <el-form
             ref="historyDsForm"
@@ -802,16 +802,16 @@ export default {
     },
     saveAppMarketHistory() {
       this.$refs.historyDsForm.validate(valid => {
-          if (!valid) {
-            return false
-          }
-          const appApplyForm = {
-            ...this.attachForm,
-            ...this.historyDsForm
-          }
-          const method = this.formType === 'add' ? appApply : appEdit
-          this.appApplyMethod(method, appApplyForm)
+        if (!valid) {
+          return false
         }
+        const appApplyForm = {
+          ...this.attachForm,
+          ...this.historyDsForm
+        }
+        const method = this.formType === 'add' ? appApply : appEdit
+        this.appApplyMethod(method, appApplyForm)
+      }
       )
     },
     save() {
@@ -957,10 +957,10 @@ export default {
       }
       if (this.positionCheck('appMarket')) {
         this.$refs.attachParamsForm.validate(valid => {
-            if (!valid) {
-              return false
-            }
+          if (!valid) {
+            return false
           }
+        }
         )
       }
       this.$refs.dsForm.validate((valid) => {
@@ -1105,10 +1105,10 @@ export default {
       }
       if (this.positionCheck('appMarket')) {
         this.$refs.attachParamsForm.validate(valid => {
-            if (!valid) {
-              return false
-            }
+          if (!valid) {
+            return false
           }
+        }
         )
       }
       this.$refs.dsForm.validate((valid) => {
diff --git a/frontend/src/views/system/datasource/DsTree.vue b/frontend/src/views/system/datasource/DsTree.vue
index a115725a0e..4196212809 100644
--- a/frontend/src/views/system/datasource/DsTree.vue
+++ b/frontend/src/views/system/datasource/DsTree.vue
@@ -265,12 +265,16 @@
           @tab-click="handleClick"
         >
           <el-tab-pane
-            :label="$t('datasource.relational_database')"
-            name="RDBMS"
+            label="OLTP"
+            name="OLTP"
           />
           <el-tab-pane
-            :label="$t('datasource.non_relational_database')"
-            name="NORDBMS"
+            label="OLAP"
+            name="OLAP"
+          />
+          <el-tab-pane
+            :label="$t('datasource.data_warehouse_lake')"
+            name="dataWarehouseLake"
           />
           <el-tab-pane
             :label="$t('datasource.other')"
@@ -281,9 +285,9 @@
           <template v-for="(list, idx) in databaseList">
             <div
               :key="nameMap[idx]"
-              :class="typeList[idx]"
+              :class="nameMap[idx]"
               class="name"
-            >{{ $t(`datasource.${nameMap[idx]}`) }}</div>
+            >{{ nameClassMap[idx] }}</div>
             <div
               :key="nameMap[idx] + 'cont'"
               class="item-container"
@@ -342,14 +346,15 @@ export default {
   },
   data() {
     return {
-      tabActive: 'RDBMS',
+      tabActive: 'OLTP',
       databaseList: [],
       currentNodeId: '',
       dsTypeRelate: false,
       expandedArray: [],
       tData: [],
-      nameMap: ['relational_database', 'non_relational_database', 'other'],
-      typeList: ['RDBMS', 'NORDBMS', 'OTHER'],
+      nameMap: ['OLTP', 'OLAP', 'dataWarehouseLake', 'OTHER'],
+      nameClassMap: ['OLTP', 'OLAP', this.$t(`datasource.data_warehouse_lake`), this.$t(`datasource.other`)],
+      typeList: [['Db2', 'DM', 'KingBase', 'MariaDB', 'MongoDB', 'Mongodb-BI', 'MySQL', 'Oracle', 'PostgreSQL', 'SQL Server', 'TiDB'], ['Doris', 'Apache Impala', 'ClickHouse', 'Elasticsearch', 'Presto', 'StarRocks'], ['Apache Hive', 'Kylin', 'AWS Redshift', 'Maxcompute'], ['API']],
       treeLoading: false,
       dsTypes: [],
       dsTypesForDriver: [],
@@ -489,9 +494,9 @@ export default {
     datasourceTypes() {
       listDatasourceType().then((res) => {
         this.dsTypes = res.data
-        const databaseList = [[], [], []]
+        const databaseList = [[], [], [], []]
         this.dsTypes.forEach((item) => {
-          const index = this.typeList.findIndex(ele => ele === item.databaseClassification)
+          const index = this.typeList.findIndex(ele => ele.includes(item.name))
           if (index !== -1) {
             databaseList[index].push(item)
           }
diff --git a/frontend/src/views/wizard/index.vue b/frontend/src/views/wizard/index.vue
index d8eb6eba83..2845be662c 100644
--- a/frontend/src/views/wizard/index.vue
+++ b/frontend/src/views/wizard/index.vue
@@ -30,12 +30,12 @@
           />
         </el-row>
         <el-row class="top_banner_card">
-          <wizard-card :details="cardList[0]"/>
+          <wizard-card :details="cardList[0]" />
           <wizard-card
             :details="cardList[1]"
             style="margin:0 24px 0 24px"
           />
-          <wizard-card-enterprise :details="cardList[2]"/>
+          <wizard-card-enterprise :details="cardList[2]" />
         </el-row>
         <el-row class="content_middle">
           <div class="content_middle_left">
@@ -44,15 +44,15 @@
               <div class="content_middle_more"><a
                 target="_blank"
                 href="https://space.bilibili.com/510493147/channel/collectiondetail?sid=262774"
-              >{{ $t('wizard.more') }}<i class="el-icon-arrow-right"/></a></div>
+              >{{ $t('wizard.more') }}<i class="el-icon-arrow-right" /></a></div>
             </el-row>
             <el-row style="margin-top: 12px">
-              <video-card :details="videoList[0]"/>
+              <video-card :details="videoList[0]" />
               <video-card
                 style="margin:0 12px 0 12px"
                 :details="videoList[1]"
               />
-              <video-card :details="videoList[2]"/>
+              <video-card :details="videoList[2]" />
             </el-row>
           </div>
           <div class="content_middle_right">
@@ -61,7 +61,7 @@
               <div class="content_middle_more"><a
                 target="_blank"
                 href="https://blog.fit2cloud.com/?cat=321"
-              >{{ $t('wizard.more') }}<i class="el-icon-arrow-right"/></a></div>
+              >{{ $t('wizard.more') }}<i class="el-icon-arrow-right" /></a></div>
             </el-row>
             <el-row>
               <ul class="ul-custom">
@@ -93,10 +93,10 @@
             </el-row>
             <el-row class="contact_content">
               {{ $t('wizard.web') }}<a
-              style="text-decoration:underline;"
-              target="_blank"
-              href="https://www.dataease.io"
-            >www.dataease.io</a>
+                style="text-decoration:underline;"
+                target="_blank"
+                href="https://www.dataease.io"
+              >www.dataease.io</a>
             </el-row>
           </div>