Commit 02d5c53a authored by huyuanming's avatar huyuanming
Browse files

add taskInstance link, add email title input

parent a8697961

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

+17 −0
Original line number Diff line number Diff line
@@ -28,6 +28,17 @@ 
      </div>

    </m-list-box>

    <template v-if="!sqlType && showType.length">

      <m-list-box>

        <div slot="text">{{$t('Title')}}</div>

        <div slot="content">

          <x-input

            type="input"

            v-model="title"

            :placeholder="$t('Please enter the title of email')"

            autocomplete="off">

          </x-input>

        </div>

      </m-list-box>

      <m-list-box>

        <div slot="text">{{$t('Recipient')}}</div>

        <div slot="content">
@@ -141,6 +152,8 @@ 
        udfs: '',

        // Sql type

        sqlType: 0,

        // Email title

        title: '',

        // Form/attachment

        showType: ['TABLE'],

        // Sql parameter
@@ -241,6 +254,7 @@ 
          sql: editor.getValue(),

          udfs: this.udfs,

          sqlType: this.sqlType,

          title: this.title,

          receivers: this.receivers.join(','),

          receiversCc: this.receiversCc.join(','),

          showType: (() => {
@@ -308,6 +322,7 @@ 
          this.showType = []

        }

        if (val !== 0) {

          this.title = ''

          this.receivers = []

          this.receiversCc = []

        }
@@ -321,6 +336,7 @@ 
      //

      showType (val) {

        if (!val.length) {

          this.title = ''

          this.receivers = []

          this.receiversCc = []

        }
@@ -342,6 +358,7 @@ 
        this.showType = o.params.showType.split(',') || []

        this.preStatements = o.params.preStatements || []

        this.postStatements = o.params.postStatements || []

        this.title = o.params.title || ''

        this.receivers = o.params.receivers && o.params.receivers.split(',') || []

        this.receiversCc = o.params.receiversCc && o.params.receiversCc.split(',') || []

      }

escheduler-ui/src/js/conf/home/pages/projects/pages/taskInstance/_source/list.vue

+7 −5
Original line number Diff line number Diff line
@@ -45,10 +45,9 @@ 
            <span>{{parseInt(pageNo === 1 ? ($index + 1) : (($index + 1) + (pageSize * (pageNo - 1))))}}</span>

          </td>

          <td>

            <span v-if="isAuth" class="ellipsis"><a href="javascript:" class="links">{{item.name}}</a></span>

            <span v-if="!isAuth" class="ellipsis"><a href="javascript:" class="links">{{item.name}}</a></span>

            <span class="ellipsis"><a href="javascript:" class="links">{{item.name}}</a></span>

          </td>

          <td><span class="ellipsis">{{item.processInstanceName}}</span></td>

          <td><a href="javascript:" class="links" @click="_go(item)"><span class="ellipsis">{{item.processInstanceName}}</span></a></td>

          <td><span>{{item.taskType}}</span></td>

          <td><span v-html="_rtState(item.state)" style="cursor: pointer;"></span></td>

          <td><span>{{item.submitTime | formatDate}}</span></td>
@@ -125,7 +124,10 @@ 
            })

          }

        })

      }

      },

      _go (item) {

        this.$router.push({ path: `/projects/instance/list/${item.processInstanceId}` })

      },

    },

    watch: {

      taskInstanceList (a) {

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

+2 −0
Original line number Diff line number Diff line
@@ -111,6 +111,8 @@ export default { 
  'Please enter ExecutorPlease enter Executor core number': 'Please enter ExecutorPlease enter Executor core number',

  'Core number should be positive integer': 'Core number should be positive integer',

  'SQL Type': 'SQL Type',

  'Title': 'Title',

  'Please enter the title of email': 'Please enter the title of email',

  'Table': 'Table',

  'Attachment': 'Attachment',

  'SQL Parameter': 'SQL Parameter',

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

+2 −0
Original line number Diff line number Diff line
@@ -111,6 +111,8 @@ export default { 
  'Please enter ExecutorPlease enter Executor core number': '请填写Executor内核数',

  'Core number should be positive integer': '内核数为正整数',

  'SQL Type': 'sql类型',

  'Title': '主题',

  'Please enter the title of email': '请输入邮件主题',

  'Table': '表格',

  'Attachment': '附件',

  'SQL Parameter': 'sql参数',