[Feature][Workflow] Main package. (#7177)

dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/flink.vue

@@ -23,7 +23,8 @@
           style="width: 130px;"
           size="small"
           v-model="programType"
-                :disabled="isDetails">
+          :disabled="isDetails"
+          @change="programTypeChange">
           <el-option
                   v-for="city in programTypeList"
                   :key="city.code"
@@ -46,9 +47,9 @@
       </div>
     </m-list-box>
     <m-list-box>
-      <div slot="text">{{$t('Main Jar Package')}}</div>
+      <div slot="text">{{$t('Main Package')}}</div>
       <div slot="content">
-        <treeselect v-model="mainJar" maxHeight="200" :options="mainJarLists" :disable-branch-nodes="true" :normalizer="normalizer" :disabled="isDetails" :placeholder="$t('Please enter main jar package')">
+        <treeselect v-model="mainJar" maxHeight="200" :options="mainJarLists" :disable-branch-nodes="true" :normalizer="normalizer" :disabled="isDetails" :placeholder="$t('Please enter main package')">
           <div slot="value-label" slot-scope="{ node }">{{ node.raw.fullName }}</div>
         </treeselect>
       </div>
@@ -205,6 +206,7 @@
   import disabledState from '@/module/mixin/disabledState'
   import Clipboard from 'clipboard'
   import { diGuiTree, searchTree } from './_source/resourceTree'
+  import { mapActions } from 'vuex'
 
   export default {
     name: 'flink',
@@ -265,6 +267,17 @@
     },
     mixins: [disabledState],
     methods: {
+      ...mapActions('dag', ['getResourcesListJar']),
+      programTypeChange () {
+        this.mainJar = null
+        this.mainClass = ''
+      },
+      getTargetResourcesListJar (programType) {
+        this.getResourcesListJar(programType).then(res => {
+          diGuiTree(res)
+          this.mainJarLists = res
+        })
+      },
       _copyPath (e, node) {
         e.stopPropagation()
         let clipboard = new Clipboard('.copy-path', {
@@ -325,7 +338,7 @@
         }
 
         if (!this.mainJar) {
-          this.$message.warning(`${i18n.$t('Please enter main jar package')}`)
+          this.$message.warning(`${i18n.$t('Please enter main package')}`)
           return false
         }
 
@@ -450,9 +463,7 @@
     watch: {
       // Listening type
       programType (type) {
-        if (type === 'PYTHON') {
-          this.mainClass = ''
-        }
+        this.getTargetResourcesListJar(type)
       },
       // Watch the cacheParams
       cacheParams (val) {
@@ -511,6 +522,7 @@
       }
     },
     created () {
+      this.getTargetResourcesListJar(this.programType)
       let item = this.store.state.dag.resourcesListS
       let items = this.store.state.dag.resourcesListJar
       diGuiTree(item)
@@ -518,6 +530,7 @@
       this.mainJarList = item
       this.mainJarLists = items
       let o = this.backfillItem
+
       // Non-null objects represent backfill
       if (!_.isEmpty(o)) {
         this.mainClass = o.params.mainClass || ''
@@ -570,9 +583,6 @@
           this.localParams = localParams
         }
       }
-    },
-    mounted () {
-
     },
     components: { mLocalParams, mListBox, mList4Box, Treeselect }
   }

dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/mr.vue

@@ -19,7 +19,12 @@
     <m-list-box>
       <div slot="text">{{$t('Program Type')}}</div>
       <div slot="content">
-        <el-select v-model="programType" :disabled="isDetails" style="width: 110px;" size="small">
+        <el-select
+          v-model="programType"
+          :disabled="isDetails"
+          style="width: 110px;"
+          size="small"
+          @change="programTypeChange">
           <el-option
                   v-for="city in programTypeList"
                   :key="city.code"
@@ -42,9 +47,9 @@
       </div>
     </m-list-box>
     <m-list-box>
-      <div slot="text">{{$t('Main Jar Package')}}</div>
+      <div slot="text">{{$t('Main Package')}}</div>
       <div slot="content">
-        <treeselect v-model="mainJar" maxHeight="200" :options="mainJarLists" :disable-branch-nodes="true" :normalizer="normalizer" :value-consists-of="valueConsistsOf" :disabled="isDetails"  :placeholder="$t('Please enter main jar package')">
+        <treeselect v-model="mainJar" maxHeight="200" :options="mainJarLists" :disable-branch-nodes="true" :normalizer="normalizer" :value-consists-of="valueConsistsOf" :disabled="isDetails"  :placeholder="$t('Please enter main package')">
           <div slot="value-label" slot-scope="{ node }">{{ node.raw.fullName }}</div>
         </treeselect>
       </div>
@@ -118,6 +123,7 @@
   import disabledState from '@/module/mixin/disabledState'
   import Clipboard from 'clipboard'
   import { diGuiTree, searchTree } from './_source/resourceTree'
+  import { mapActions } from 'vuex'
 
   export default {
     name: 'mr',
@@ -144,9 +150,9 @@
         // Option parameters
         others: '',
         // Program type
-        programType: 'JAVA',
+        programType: 'SCALA',
         // Program type(List)
-        programTypeList: [{ code: 'JAVA' }, { code: 'PYTHON' }],
+        programTypeList: [{ code: 'JAVA' }, { code: 'SCALA' }, { code: 'PYTHON' }],
         normalizer (node) {
           return {
             label: node.name
@@ -161,6 +167,17 @@
     },
     mixins: [disabledState],
     methods: {
+      ...mapActions('dag', ['getResourcesListJar']),
+      programTypeChange () {
+        this.mainJar = null
+        this.mainClass = ''
+      },
+      getTargetResourcesListJar (programType) {
+        this.getResourcesListJar(programType).then(res => {
+          diGuiTree(res)
+          this.mainJarLists = res
+        })
+      },
       _copyPath (e, node) {
         e.stopPropagation()
         let clipboard = new Clipboard('.copy-path', {
@@ -268,7 +285,7 @@
         }
 
         if (!this.mainJar) {
-          this.$message.warning(`${i18n.$t('Please enter main jar package')}`)
+          this.$message.warning(`${i18n.$t('Please enter main package')}`)
           return false
         }
 
@@ -306,9 +323,7 @@
        * monitor
        */
       programType (type) {
-        if (type === 'PYTHON') {
-          this.mainClass = ''
-        }
+        this.getTargetResourcesListJar(type)
       },
       // Watch the cacheParams
       cacheParams (val) {
@@ -361,6 +376,7 @@
       }
     },
     created () {
+      this.getTargetResourcesListJar(this.programType)
       let item = this.store.state.dag.resourcesListS
       let items = this.store.state.dag.resourcesListJar
       diGuiTree(item)
@@ -378,11 +394,12 @@
           this.mainJar = ''
         } else {
           this.mainJar = o.params.mainJar.id || ''
+          console.log(this.mainJar)
         }
         this.appName = o.params.appName || ''
         this.mainArgs = o.params.mainArgs || ''
         this.others = o.params.others
-        this.programType = o.params.programType || 'JAVA'
+        this.programType = o.params.programType || 'SCALA'
 
         // backfill resourceList
         let resourceList = o.params.resourceList || []
@@ -414,9 +431,6 @@
           this.localParams = localParams
         }
       }
-    },
-    mounted () {
-
     },
     components: { mLocalParams, mListBox, Treeselect }
   }

dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/spark.vue

@@ -23,7 +23,8 @@
           style="width: 130px;"
           size="small"
           v-model="programType"
-                :disabled="isDetails">
+          :disabled="isDetails"
+          @change="programTypeChange">
           <el-option
                   v-for="city in programTypeList"
                   :key="city.code"
@@ -63,9 +64,9 @@
       </div>
     </m-list-box>
     <m-list-box>
-      <div slot="text">{{$t('Main Jar Package')}}</div>
+      <div slot="text">{{$t('Main Package')}}</div>
       <div slot="content">
-        <treeselect v-model="mainJar" maxHeight="200" :options="mainJarLists" :disable-branch-nodes="true" :normalizer="normalizer" :disabled="isDetails" :placeholder="$t('Please enter main jar package')">
+        <treeselect v-model="mainJar" maxHeight="200" :options="mainJarLists" :disable-branch-nodes="true" :normalizer="normalizer" :disabled="isDetails" :placeholder="$t('Please enter main package')">
           <div slot="value-label" slot-scope="{ node }">{{ node.raw.fullName }}</div>
         </treeselect>
       </div>
@@ -206,6 +207,7 @@
   import disabledState from '@/module/mixin/disabledState'
   import Clipboard from 'clipboard'
   import { diGuiTree, searchTree } from './_source/resourceTree'
+  import { mapActions } from 'vuex'
 
   export default {
     name: 'spark',
@@ -265,6 +267,17 @@
     },
     mixins: [disabledState],
     methods: {
+      ...mapActions('dag', ['getResourcesListJar']),
+      programTypeChange () {
+        this.mainJar = null
+        this.mainClass = ''
+      },
+      getTargetResourcesListJar (programType) {
+        this.getResourcesListJar(programType).then(res => {
+          diGuiTree(res)
+          this.mainJarLists = res
+        })
+      },
       _copyPath (e, node) {
         e.stopPropagation()
         let clipboard = new Clipboard('.copy-path', {
@@ -372,7 +385,7 @@
         }
 
         if (!this.mainJar) {
-          this.$message.warning(`${i18n.$t('Please enter main jar package')}`)
+          this.$message.warning(`${i18n.$t('Please enter main package')}`)
           return false
         }
 
@@ -469,9 +482,7 @@
     watch: {
       // Listening type
       programType (type) {
-        if (type === 'PYTHON') {
-          this.mainClass = ''
-        }
+        this.getTargetResourcesListJar(type)
       },
       // Watch the cacheParams
       cacheParams (val) {
@@ -531,6 +542,7 @@
       }
     },
     created () {
+      this.getTargetResourcesListJar(this.programType)
       let item = this.store.state.dag.resourcesListS
       let items = this.store.state.dag.resourcesListJar
       diGuiTree(item)
@@ -591,9 +603,6 @@
           this.localParams = localParams
         }
       }
-    },
-    mounted () {
-
     },
     components: { mLocalParams, mListBox, mList4Box, Treeselect }
   }

dolphinscheduler-ui/src/js/conf/home/pages/dag/definitionDetails.vue

@@ -46,7 +46,7 @@
     props: {},
     methods: {
       ...mapMutations('dag', ['resetParams', 'setIsDetails']),
-      ...mapActions('dag', ['getProjectList', 'getResourcesList', 'getProcessDetails', 'getResourcesListJar']),
+      ...mapActions('dag', ['getProjectList', 'getResourcesList', 'getProcessDetails']),
       ...mapActions('security', ['getTenantList', 'getWorkerGroupsAll', 'getAlarmGroupsAll']),
       /**
        * init
@@ -63,8 +63,6 @@
           this.getProjectList(),
           // get resource
           this.getResourcesList(),
-          // get jar
-          this.getResourcesListJar(),
           // get worker group list
           this.getWorkerGroupsAll(),
           // get alarm group list

dolphinscheduler-ui/src/js/conf/home/pages/dag/index.vue

@@ -40,7 +40,7 @@
     props: {},
     methods: {
       ...mapMutations('dag', ['resetParams']),
-      ...mapActions('dag', ['getProjectList', 'getResourcesList', 'getResourcesListJar', 'getResourcesListJar']),
+      ...mapActions('dag', ['getProjectList', 'getResourcesList']),
       ...mapActions('security', ['getTenantList', 'getWorkerGroupsAll', 'getAlarmGroupsAll']),
       /**
        * init
@@ -53,12 +53,8 @@
         Promise.all([
           // get project
           this.getProjectList(),
-          // get jar
-          this.getResourcesListJar(),
           // get resource
           this.getResourcesList(),
-          // get jar
-          this.getResourcesListJar(),
           // get worker group list
           this.getWorkerGroupsAll(),
           // get alarm group list

dolphinscheduler-ui/src/js/conf/home/pages/dag/instanceDetails.vue

@@ -43,7 +43,7 @@
     props: {},
     methods: {
       ...mapMutations('dag', ['setIsDetails', 'resetParams']),
-      ...mapActions('dag', ['getProjectList', 'getResourcesList', 'getInstancedetail', 'getResourcesListJar']),
+      ...mapActions('dag', ['getProjectList', 'getResourcesList', 'getInstancedetail']),
       ...mapActions('security', ['getTenantList', 'getWorkerGroupsAll', 'getAlarmGroupsAll']),
       /**
        * init
@@ -60,8 +60,6 @@
           this.getProjectList(),
           // get resources
           this.getResourcesList(),
-          // get jar
-          this.getResourcesListJar(),
           // get worker group list
           this.getWorkerGroupsAll(),
           // get alarm group list

dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/taskDefinition/index.vue

@@ -133,9 +133,7 @@
       ...mapActions('dag', [
         'getProcessList',
         'getProjectList',
-        'getResourcesList',
-        'getResourcesListJar',
-        'getResourcesListJar'
+        'getResourcesList'
       ]),
       ...mapMutations('dag', ['resetParams', 'setIsDetails']),
       ...mapActions('security', [
@@ -268,12 +266,8 @@
         this.getProcessList(),
         // get project
         this.getProjectList(),
-        // get jar
-        this.getResourcesListJar(),
         // get resource
         this.getResourcesList(),
-        // get jar
-        this.getResourcesListJar(),
         // get worker group list
         this.getWorkerGroupsAll(),
         // get alarm group list

dolphinscheduler-ui/src/js/conf/home/store/dag/actions.js

@@ -449,16 +449,12 @@ export default {
   /**
    * get jar
    */
-  getResourcesListJar ({ state }) {
+  getResourcesListJar ({ state }, programType) {
     return new Promise((resolve, reject) => {
-      if (state.resourcesListJar.length) {
-        resolve()
-        return
-      }
       io.get('resources/query-by-type', {
-        type: 'FILE'
+        type: 'FILE',
+        programType
       }, res => {
-        state.resourcesListJar = res.data
         resolve(res.data)
       }).catch(res => {
         reject(res)

dolphinscheduler-ui/src/js/module/i18n/locale/en_US.js

@@ -87,8 +87,8 @@ export default {
   'Please enter a positive integer': 'Please enter a positive integer',
   'Program Type': 'Program Type',
   'Main Class': 'Main Class',
-  'Main Jar Package': 'Main Jar Package',
-  'Please enter main jar package': 'Please enter main jar package',
+  'Main Package': 'Main Package',
+  'Please enter main package': 'Please enter main package',
   'Please enter main class': 'Please enter main class',
   'Main Arguments': 'Main Arguments',
   'Please enter main arguments': 'Please enter main arguments',

dolphinscheduler-ui/src/js/module/i18n/locale/zh_CN.js

@@ -87,8 +87,8 @@ export default {
   'Please enter a positive integer': '请输入正整数',
   'Program Type': '程序类型',
   'Main Class': '主函数的Class',
-  'Main Jar Package': '主Jar包',
-  'Please enter main jar package': '请选择主Jar包',
+  'Main Package': '主程序包',
+  'Please enter main package': '请选择主程序包',
   'Please enter main class': '请填写主函数的Class',
   'Main Arguments': '主程序参数',
   'Please enter main arguments': '请输入主程序参数',