Merge remote-tracking branch 'origin/main' into main

backend/pom.xml

@@ -385,6 +385,42 @@
             <version>3.0.8</version>
         </dependency>
 
+        <dependency>
+            <groupId>pentaho-kettle</groupId>
+            <artifactId>kettle-core</artifactId>
+            <version>8.3.0.18-1084</version>
+        </dependency>
+        <dependency>
+            <groupId>pentaho-kettle</groupId>
+            <artifactId>kettle-engine</artifactId>
+            <version>8.3.0.18-1084</version>
+        </dependency>
+        <dependency>
+            <groupId>pentaho</groupId>
+            <artifactId>metastore</artifactId>
+            <version>8.3.0.18-1084</version>
+        </dependency>
+        <dependency>
+            <groupId>pentaho</groupId>
+            <artifactId>pentaho-big-data-kettle-plugins-hbase-meta</artifactId>
+            <version>8.3.0.18-1084</version>
+        </dependency>
+        <dependency>
+            <groupId>pentaho</groupId>
+            <artifactId>pentaho-big-data-kettle-plugins-hbase</artifactId>
+            <version>8.3.0.18-1084</version>
+        </dependency>
+        <dependency>
+            <groupId>pentaho</groupId>
+            <artifactId>pentaho-big-data-impl-cluster</artifactId>
+            <version>8.3.0.18-1084</version>
+        </dependency>
+        <dependency>
+            <groupId>org.pentaho.di.plugins</groupId>
+            <artifactId>pdi-engine-configuration-impl</artifactId>
+            <version>8.3.0.7-683</version>
+        </dependency>
+
     </dependencies>
 
     <build>
@@ -521,4 +557,20 @@
         </plugins>
     </build>
 
+    <repositories>
+    <repository>
+        <id>pentaho-public</id>
+        <name>Pentaho Public</name>
+        <url>http://nexus.pentaho.org/content/groups/omni</url>
+        <releases>
+            <enabled>true</enabled>
+            <updatePolicy>always</updatePolicy>
+        </releases>
+        <snapshots>
+            <enabled>true</enabled>
+            <updatePolicy>always</updatePolicy>
+        </snapshots>
+    </repository>
+    </repositories>
+
 </project>

backend/src/main/java/io/dataease/config/CommonConfig.java

@@ -4,6 +4,9 @@ import com.fit2cloud.autoconfigure.QuartzAutoConfiguration;
 import org.apache.spark.api.java.JavaSparkContext;
 import org.apache.spark.sql.SQLContext;
 import org.apache.spark.sql.SparkSession;
+import org.pentaho.di.core.KettleEnvironment;
+import org.pentaho.di.repository.filerep.KettleFileRepository;
+import org.pentaho.di.repository.filerep.KettleFileRepositoryMeta;
 import org.springframework.boot.autoconfigure.AutoConfigureBefore;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.context.annotation.Bean;
@@ -18,7 +21,7 @@ public class CommonConfig {
 
     @Resource
     private Environment env; // 保存了配置文件的信息
-
+    private static String root_path = "/opt/dataease/data/kettle/";
 
     @Bean
     @ConditionalOnMissingBean
@@ -51,4 +54,15 @@ public class CommonConfig {
         sqlContext.setConf("spark.default.parallelism", env.getProperty("spark.default.parallelism", "1"));
         return sqlContext;
     }
+
+    @Bean
+    @ConditionalOnMissingBean
+    public KettleFileRepository kettleFileRepository()throws Exception{
+        KettleEnvironment.init();
+        KettleFileRepository repository = new KettleFileRepository();
+        KettleFileRepositoryMeta kettleDatabaseMeta = new KettleFileRepositoryMeta("KettleFileRepository", "repo",
+                "dataease kettle repo", root_path);
+        repository.init(kettleDatabaseMeta);
+        return repository;
+    }
 }

frontend/package.json

@@ -17,6 +17,7 @@
   "dependencies": {
     "@riophae/vue-treeselect": "0.4.0",
     "axios": "^0.21.1",
+    "core-js": "^2.6.5",
     "echarts": "^5.0.2",
     "element-resize-detector": "^1.2.2",
     "element-ui": "2.13.0",
@@ -46,17 +47,18 @@
     "@babel/register": "7.0.0",
     "@vue/cli-plugin-babel": "3.6.0",
     "@vue/cli-plugin-eslint": "^3.9.1",
-    "@vue/cli-service": "3.6.0",
+    "@vue/cli-service": "^4.5.12",
     "babel-eslint": "10.0.1",
     "chalk": "2.4.2",
     "connect": "3.6.6",
+    "core-js": "^2.6.5",
     "eslint": "5.15.3",
     "eslint-plugin-vue": "5.2.2",
     "html-webpack-plugin": "3.2.0",
     "less": "^4.1.1",
     "less-loader": "^8.0.0",
     "mockjs": "1.0.1-beta3",
-    "runjs": "^4.3.2",
+    "runjs": "^4.1.3",
     "sass": "^1.32.5",
     "sass-loader": "^10.1.1",
     "script-ext-html-webpack-plugin": "2.1.3",

frontend/src/views/chart/view/ChartEdit.vue

@@ -598,6 +598,7 @@ export default {
   .view-panel {
     display: flex;
     height: calc(100% - 40px);
+    background-color: #f7f8fa;
   }
 
   .drag-list {

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

@@ -167,10 +167,6 @@ export default {
     box-sizing: border-box;
   }
 
-  span {
-    font-size: 12px;
-  }
-
   .custom-position {
     flex: 1;
     display: flex;