Merge branch 'dev-1.10.0-webank' into dev-1.10.0-bug-fix

WeDataSphere · Dec 30, 2024 · 5439e74 · 5439e74
2 parents 423b48d + a732908
commit 5439e74
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 5 deletions.
diff --git a/linkis-engineconn-plugins/spark/pom.xml b/linkis-engineconn-plugins/spark/pom.xml
@@ -405,8 +405,26 @@
           <groupId>io.fabric8</groupId>
           <artifactId>kubernetes-model-core</artifactId>
         </exclusion>
+        <exclusion>
+          <groupId>org.yaml</groupId>
+          <artifactId>snakeyaml</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>com.squareup.okio</groupId>
+          <artifactId>okio</artifactId>
+        </exclusion>
       </exclusions>
     </dependency>
+    <dependency>
+      <groupId>org.yaml</groupId>
+      <artifactId>snakeyaml</artifactId>
+      <version>${snakeyaml.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>com.squareup.okio</groupId>
+      <artifactId>okio</artifactId>
+      <version>${okio.version}</version>
+    </dependency>
     <dependency>
       <groupId>io.fabric8</groupId>
       <artifactId>kubernetes-model-common</artifactId>

diff --git a/linkis-web/src/apps/URM/module/udfManagement/addFunctionModal.vue b/linkis-web/src/apps/URM/module/udfManagement/addFunctionModal.vue
@@ -97,7 +97,7 @@
           @set-node="setNodePath"/>
       </FormItem>
       <FormItem
-        v-if="fnType === 1 && fnCategory.isSpark"
+        v-if="fnType === 1 && fnCategory.isSpark && registerFunctions.length > 0"
         :label="$t('message.linkis.udf.registerFunc')"
         prop="pyPara">
         <Select
@@ -113,7 +113,7 @@
         </Select>
       </FormItem>
       <FormItem
-        v-if="fnType === 2 && fnCategory.isSpark"
+        v-if="fnType === 2 && fnCategory.isSpark && registerFunctions.length > 0"
         :label="$t('message.linkis.udf.registerFunc')"
         prop="scalapara">
         <Select
@@ -617,13 +617,14 @@ export default {
       });
       this.$nextTick(async () => {
         this.$set(this.setting, this.getTypes(), path);
-        this.registerFunctionEditable = false;
         if(this.getTypes() !== 'jarPath') {
           if (/^[\w\u4e00-\u9fa5:.\\/]*(py|scala)$/.test(path)) {
             try {
               this.registerFunctions = await this.getRegisterFunction(path);
               if(this.registerFunctions.length !== 0) {
                 this.registerFunctionEditable = false;
+              } else {
+                this.registerFunctionEditable = true;
               }
             } catch (err) {
               window.console.error(err);
@@ -771,6 +772,8 @@ export default {
             this.registerFunctions = await this.getRegisterFunction(node.path);
             if(this.registerFunctions.length !== 0) {
               this.registerFunctionEditable = false;
+            } else {
+              this.registerFunctionEditable = true;
             }
           } catch (err) {
             window.console.error(err);

diff --git a/linkis-web/src/apps/URM/module/udfManagement/index.vue b/linkis-web/src/apps/URM/module/udfManagement/index.vue
@@ -440,7 +440,7 @@ export default {
           try {
             api.fetch("/linkisManager/rm/killEngineByCreatorEngineType", {
               creator: '*',
-              engineType: data.udfType === 1 ? 'spark' : '*'
+              engineType: [1, 2].includes(data.udfType) ? 'spark' : '*'
             })
           } catch (err) {
             window.console.warn(err)

diff --git a/pom.xml b/pom.xml
@@ -161,7 +161,7 @@
     <slf4j.version>1.7.30</slf4j.version>
     <log4j2.version>2.17.2</log4j2.version>
     <poi.version>5.2.3</poi.version>
-    <snakeyaml.version>1.33</snakeyaml.version>
+    <snakeyaml.version>2.0</snakeyaml.version>
     <jettision.version>1.5.4</jettision.version>
     <woodstox.core.version>6.4.0</woodstox.core.version>
     <classgraph.version>4.8.112</classgraph.version>