Merge pull request #4128 from dataease/pr@dev_memory_component

Pr@dev memory component

frontend/src/components/canvas/customComponent/UserView.vue

@@ -1269,7 +1269,6 @@ export default {
   display: block !important;
 }
 
-
 .mobile-dialog-css ::v-deep .el-dialog__headerbtn {
   top: 7px
 }

frontend/src/components/deIconPicker/deIconGroupPicker/index.vue

@@ -217,7 +217,10 @@ export default {
         return ''
       }
     },
-    options: {},
+    options: {
+      type: Object,
+      default: () => {}
+    },
     width: {
       type: Number,
       default() {

frontend/src/components/deIconPicker/index.vue

@@ -180,7 +180,10 @@ export default {
         return ''
       }
     },
-    options: {},
+    options: {
+      type: Object,
+      default: () => {}
+    },
     width: {
       type: Number,
       default() {

frontend/src/lang/en.js

@@ -1924,6 +1924,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',

frontend/src/lang/tw.js

@@ -1918,6 +1918,7 @@ export default {
     field_description: '欄位描述',
     table_description: '表描述',
     relational_database: '關係型數據庫',
+    data_warehouse_lake: '數倉/數據湖',
     non_relational_database: '非關係型數據庫',
     all: '所有',
     other: '其他',

frontend/src/lang/zh.js

@@ -1917,6 +1917,7 @@ export default {
     field_description: '字段描述',
     table_description: '表描述',
     relational_database: '关系型数据库',
+    data_warehouse_lake: '数仓/数据湖',
     non_relational_database: '非关系型数据库',
     all: '所有',
     other: '其他',

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,7 +78,10 @@
           :span="4"
           style="padding-top: 5px"
         >
-          <el-checkbox v-model="commonBackground.enable" @change="themeChange('enable')">{{
+          <el-checkbox
+            v-model="commonBackground.enable"
+            @change="themeChange('enable')"
+          >{{
             $t('panel.background')
           }}
           </el-checkbox>
@@ -189,6 +195,7 @@ import BackgroundItemOverall from '@/views/background/BackgroundItemOverall'
 
 export default {
   name: 'BackgroundOverall',
+  // eslint-disable-next-line
   components: { BackgroundItemOverall, BackgroundItem },
   props: {
     position: {

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>

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'"
             />

frontend/src/views/panel/filter/filterMain/FilterControl.vue

@@ -279,7 +279,7 @@ export default {
     },
     datasetParams: {
       type: Array,
-      default: []
+      default: () => []
     }
   },
   data() {

frontend/src/views/panel/list/PanelViewShow.vue

@@ -489,7 +489,6 @@ export default {
       } else {
         return true
       }
-
     },
     downLoadApp(appAttachInfo) {
       this.downLoadToApp(appAttachInfo)

frontend/src/views/panel/subjectSetting/index.vue

@@ -38,7 +38,7 @@
             :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')"
@@ -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,

frontend/src/views/system/datasource/DsTree.vue

@@ -269,12 +269,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')"
@@ -285,9 +289,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"
@@ -346,14 +350,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: [],
@@ -493,9 +498,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)
           }