Unverified Commit 4e82c77f authored by millionfor's avatar millionfor Committed by GitHub
Browse files

Merge pull request #62 from millionfor/dev-20190415 

Dev 20190415
parents caafb1f9 16be0d12

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

+1 −1
Original line number Diff line number Diff line 
<template>

  <x-select

          style="width: 170px;"

          style="width: 157px;"

          :disabled="isDetails"

          @on-change="_onChange"

          v-model="value">

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

+4 −4
Original line number Diff line number Diff line
@@ -528,10 +528,10 @@ 
      position: relative;

      margin-bottom: 10px;

      .text-box {

        width: 110px;

        width: 112px;

        float: left;

        text-align: right;

        margin-right: 10px;

        margin-right: 8px;

        >span {

          font-size: 14px;

          color: #777;

escheduler-ui/src/js/conf/home/pages/projects/pages/instance/pages/list/_source/common.js→escheduler-ui/src/js/conf/home/pages/projects/pages/_source/instanceConditions/common.js

+0 −0

File moved.

View file

escheduler-ui/src/js/conf/home/pages/projects/pages/instance/pages/list/_source/conditions.vue→escheduler-ui/src/js/conf/home/pages/projects/pages/_source/instanceConditions/index.vue

+26 −57
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ 
                type="daterange"

                format="YYYY-MM-DD HH:mm:ss"

                placement="bottom-end"

                v-model="datepicker"

                :value="[searchParams.startDate,searchParams.endDate]"

                :panelNum="2">

          <x-input slot="input" readonly slot-scope="{value}" :value="value" style="width: 310px;" size="small" :placeholder="$t('Select date range')">

            <i slot="suffix"
@@ -24,7 +24,7 @@ 
        </x-datepicker>

      </div>

      <div class="list">

        <x-select style="width: 160px;" @on-change="_onChangeState" :value="stateType" >

        <x-select style="width: 160px;" @on-change="_onChangeState" :value="searchParams.stateType" >

          <x-input slot="trigger" readonly :value="selectedModel ? selectedModel.label : ''" slot-scope="{ selectedModel }" style="width: 160px;" size="small" :placeholder="$t('State')" suffix-icon="ans-icon-arrow-down">

          </x-input>

          <x-option
@@ -36,10 +36,10 @@ 
        </x-select>

      </div>

      <div class="list">

        <x-input v-model="host" style="width: 140px;" size="small" :placeholder="$t('host')"></x-input>

        <x-input v-model="searchParams.host" style="width: 140px;" size="small" :placeholder="$t('host')"></x-input>

      </div>

      <div class="list">

        <x-input v-model="searchVal" style="width: 200px;" size="small" :placeholder="$t('name')"></x-input>

        <x-input v-model="searchParams.searchVal" style="width: 200px;" size="small" :placeholder="$t('name')"></x-input>

      </div>

    </template>

  </m-conditions>
@@ -47,14 +47,14 @@ 
<script>

  import _ from 'lodash'

  import { stateType } from './common'

  import { setUrlParams } from '@/module/util/routerUtil'

  import mConditions from '@/module/components/conditions/conditions'

  export default {

    name: 'conditions',

    name: 'instance-conditions',

    data () {

      return {

        // state(list)

        stateTypeList: stateType,

        searchParams: {

          // state

          stateType: '',

          // start date
@@ -64,74 +64,43 @@ 
          // search value

          searchVal: '',

          // host

        host: '',

        // datepicker plugin

        datepicker: []

          host: ''

        }

      }

    },

    props: {},

    methods: {

      _ckQuery () {

        setUrlParams({ pageNo: 1 })

        this.$emit('on-query', {

          startDate: this.startDate || '',

          endDate: this.endDate || '',

          stateType: this.stateType || '',

          host: _.trim(this.host) || '',

          searchVal: _.trim(this.searchVal) || ''

        })

        this.$emit('on-query', this.searchParams)

      },

      /**

       * change times

       */

      _onChangeStartStop (val) {

        this.startDate = val[0]

        this.endDate = val[1]

        // set url params

        setUrlParams({

          startDate: this.startDate,

          endDate: this.endDate

        })

        this.searchParams.startDate = val[0]

        this.searchParams.endDate = val[1]

      },

      /**

       * change state

       */

      _onChangeState (val) {

        this.stateType = val.value

        // set url params

        setUrlParams({

          stateType: this.stateType

        })

        this.searchParams.stateType = val.value

      },

      /**

       * empty date

       */

      _dateEmpty () {

        this.startDate = ''

        this.endDate = ''

        this.searchParams.startDate = ''

        this.searchParams.endDate = ''

        this.$refs.datepicker.empty()

        // set url params

        setUrlParams({

          startDate: '',

          endDate: ''

        })

      }

    },

    watch: {

      searchVal (val) {

        setUrlParams({

          searchVal: _.trim(val)

        })

      }

    },

    created () {

      let query = this.$route.query

      if (!_.isEmpty(query)) {

        this.searchVal = query.searchVal

        this.startDate = query.startDate

        this.endDate = query.endDate

        this.stateType = query.stateType

        this.datepicker = (!this.startDate && !this.endDate) ? [] : [this.startDate, this.endDate]

      // Routing parameter merging

      if (!_.isEmpty(this.$route.query)) {

        this.searchParams = _.assign(this.searchParams, this.$route.query)

      }

    },

    mounted () {

escheduler-ui/src/js/conf/home/pages/projects/pages/_source/taskRecordList/_source/conditions.vue

0 → 100644
+141 −0
Original line number Diff line number Diff line 
<template>

  <m-conditions>

    <template slot="search-group">

      <div class="list">

        <x-button type="ghost" size="small" @click="_ckQuery" icon="fa fa-search"></x-button>

      </div>

      <div class="list">

        <x-datepicker

                :value="[searchParams.startDate,searchParams.endDate]"

                ref="datepicker"

                @on-change="_onChangeStartStop"

                type="daterange"

                format="YYYY-MM-DD HH:mm:ss"

                placement="bottom-end"

                :panelNum="2">

          <x-input slot="input" readonly slot-scope="{value}" :value="value" style="width: 310px;" size="small" :placeholder="$t('Select date range')">

            <i slot="suffix"

               @click.stop="_dateEmpty()"

               class="ans-icon-fail-solid"

               v-show="value"

               style="font-size: 13px;cursor: pointer;margin-top: 1px;">

            </i>

          </x-input>

        </x-datepicker>

      </div>

      <div class="list">

        <x-input v-model="searchParams.destTable" style="width: 120px;" size="small" :placeholder="$t('Target Table')"></x-input>

      </div>

      <div class="list">

        <x-input v-model="searchParams.sourceTable" style="width: 120px;" size="small" :placeholder="$t('Source Table')"></x-input>

      </div>

      <div class="list">

        <x-select style="width: 90px;" @on-change="_onChangeState" :value="searchParams.state">

          <x-input slot="trigger" readonly :value="selectedModel ? selectedModel.label : ''" slot-scope="{ selectedModel }" style="width: 90px;" size="small" :placeholder="$t('State')" suffix-icon="ans-icon-arrow-down"></x-input>

          <x-option

                  v-for="city in stateList"

                  :key="city.label"

                  :value="city.code"

                  :label="city.label">

          </x-option>

        </x-select>

      </div>

      <div class="list">

        <x-datepicker

                v-model="searchParams.taskDate"

                @on-change="_onChangeDate"

                format="YYYY-MM-DD"

                :panelNum="1">

          <x-input slot="input" readonly slot-scope="{value}" style="width: 130px;" :value="value" size="small" :placeholder="$t('Date')"></x-input>

        </x-datepicker>

      </div>

      <div class="list">

        <x-input v-model="searchParams.taskName" style="width: 130px;" size="small" :placeholder="$t('Task Name')"></x-input>

      </div>

    </template>

  </m-conditions>

</template>

<script>

  import _ from 'lodash'

  import mConditions from '@/module/components/conditions/conditions'

  export default {

    name: 'conditions',

    data () {

      return {

        stateList: [

          {

            label: `${this.$t('none')}`,

            code: ``

          },

          {

            label: `${this.$t('success')}`,

            code: `成功`

          },

          {

            label: `${this.$t('waiting')}`,

            code: `等待`

          },

          {

            label: `${this.$t('execution')}`,

            code: `执行中`

          },

          {

            label: `${this.$t('finish')}`,

            code: `完成`

          }, {

            label: `${this.$t('failed')}`,

            code: `失败`

          }

        ],

        searchParams: {

          taskName: '',

          state: '',

          sourceTable: '',

          destTable: '',

          taskDate: '',

          startDate: '',

          endDate: ''

        }

      }

    },

    props: {},

    methods: {

      _ckQuery () {

        this.$emit('on-query', this.searchParams)

      },

      /**

       * change times

       */

      _onChangeStartStop (val) {

        this.searchParams.startDate = val[0]

        this.searchParams.endDate = val[1]

      },

      /**

       * change state

       */

      _onChangeState (val) {

        this.searchParams.state = val.value

      },

      /**

       * empty date

       */

      _dateEmpty () {

        this.searchParams.startDate = ''

        this.searchParams.endDate = ''

        this.$refs.datepicker.empty()

      },

      _onChangeDate (val) {

        this.searchParams.taskDate = val.replace(/-/g, '')

      }

    },

    created () {

      // Routing parameter merging

      if (!_.isEmpty(this.$route.query)) {

        this.searchParams = _.assign(this.searchParams, this.$route.query)

      }

    },

    mounted () {

    },

    components: { mConditions }

  }

</script>
 
 No newline at end of file