Dev 1.10.0 webank (#695)

* chore: 1.9.0 * feat: 1.10.0 * fix * upd: 新增loading展示 * fix: udf类型判断条件修复 * fix: 注册函数展示逻辑修复
WeDataSphere · Dec 27, 2024 · 183c656 · 183c656
1 parent ade3a1c
commit 183c656
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
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)