Commit b9aab008 authored by baoliang's avatar baoliang
Browse files

Merge remote-tracking branch 'upstream/dev-20190415' into dev-20190415

parents 1ea36679 2abe8586

escheduler-api/src/main/java/cn/escheduler/api/service/DataAnalysisService.java

+1 −1
Original line number Diff line number Diff line
@@ -357,7 +357,7 @@ public class DataAnalysisService { 
        i = 0;

        for (String taskKillStr : tasksKillList){

            if (StringUtils.isNotEmpty(taskKillStr)){

                String[] splits = taskKillStr.split("_");

                String[] splits = taskKillStr.split("-");

                if (splits.length == 2){

                    tasksKillIds[i++]=Integer.parseInt(splits[1]);

                }

escheduler-api/src/main/java/cn/escheduler/api/service/DataSourceService.java

+3 −1
Original line number Diff line number Diff line
@@ -480,7 +480,9 @@ public class DataSourceService extends BaseService{ 


        }



        if(logger.isDebugEnabled()){

            logger.info("parameters map-----" + JSONObject.toJSONString(parameterMap));

        }

        return JSONObject.toJSONString(parameterMap);

escheduler-ui/src/js/conf/home/pages/dag/_source/formModel/_source/timeoutAlarm.vue

+1 −1
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ 
      </div>

      <div class="cont-box">

        <label class="label-box">

          <x-input v-model="interval" style="width: 128px;" :disabled="isDetails">

          <x-input v-model="interval" style="width: 128px;" :disabled="isDetails" maxlength="9">

            <span slot="append">{{$t('Minute')}}</span>

          </x-input>

        </label>

escheduler-ui/src/js/conf/home/pages/dag/_source/udp/udp.vue

+44 −1
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ 
      <div class="title">

        <span>{{$t('Set the DAG diagram name')}}</span>

      </div>



      <div>

        <x-input

                type="text"
@@ -12,6 +13,7 @@ 
                :placeholder="$t('Please enter name(required)')">

        </x-input>

      </div>



      <template v-if="router.history.current.name !== 'projects-instance-details'">

        <div style="padding-top: 12px;">

          <x-input
@@ -23,6 +25,21 @@ 
          </x-input>

        </div>

      </template>



      <div class="title" style="padding-top: 6px;">

        <span>超时告警</span>

        <span style="padding-left: 6px;">

          <x-switch v-model="checkedTimeout"></x-switch>

        </span>

      </div>

      <div class="content" style="padding-bottom: 10px;" v-if="checkedTimeout">

        <span>

          <x-input v-model="timeout" style="width: 128px;" maxlength="9">

            <span slot="append">{{$t('Minute')}}</span>

          </x-input>

        </span>

      </div>



      <div class="title" style="padding-top: 6px;">

        <span>{{$t('Set global')}}</span>

      </div>
@@ -68,7 +85,11 @@ 
        // Global custom parameters

        udpList: [],

        // Whether to update the process definition

        syncDefine: true

        syncDefine: true,

        // Timeout alarm

        timeout: 0,

        // checked Timeout alarm

        checkedTimeout: true

      }

    },

    mixins: [disabledState],
@@ -81,6 +102,14 @@ 
      _onLocalParams (a) {

        this.udpList = a

      },

      _verifTimeout () {

        const reg = /^[1-9]\d*$/

        if (!reg.test(this.timeout)) {

          alert(1)

          return false

        }

        return true

      },

      /**

       * submit

       */
@@ -95,9 +124,15 @@ 
          if (!this.$refs.refLocalParams._verifProp()) {

            return

          }

          // verification timeout

          if (!this._verifTimeout()) {

            return

          }



          // Storage global globalParams

          this.store.commit('dag/setGlobalParams', _.cloneDeep(this.udpList))

          this.store.commit('dag/setName', _.cloneDeep(this.name))

          this.store.commit('dag/setTimeout', _.cloneDeep(this.timeout))

          this.store.commit('dag/setDesc', _.cloneDeep(this.desc))

          this.store.commit('dag/setSyncDefine', this.syncDefine)

          Affirm.setIsPop(false)
@@ -124,12 +159,20 @@ 
      }

    },

    watch: {

      checkedTimeout (val) {

        if (!val) {

          this.timeout = 0

          this.store.commit('dag/setTimeout', _.cloneDeep(this.timeout))

        }

      }

    },

    created () {

      this.udpList = this.store.state.dag.globalParams

      this.name = this.store.state.dag.name

      this.desc = this.store.state.dag.desc

      this.syncDefine = this.store.state.dag.syncDefine

      this.timeout = this.store.state.dag.timeout || 0

      this.checkedTimeout = this.timeout !== 0

    },

    mounted () {},

    components: { mLocalParams }

escheduler-ui/src/js/conf/home/pages/home/index.vue

+3 −7
Original line number Diff line number Diff line 
<template>

  <m-list-construction :title="$t('Home')">

    <template slot="content">

      <m-project-chart :id="0"></m-project-chart>

    </template>

  </m-list-construction>

  <m-project-home :id="0"></m-project-home>

</template>



<script>

import mProjectChart from '@/conf/home/pages/projects/pages/index/_source/projectChart'

import mProjectHome from '@/conf/home/pages/projects/pages/index'

import mListConstruction from '@/module/components/listConstruction/listConstruction'

export default {

  name: 'home',

  components: { mProjectChart, mListConstruction }

  components: { mProjectHome, mListConstruction }

}

</script>