解决验证租户编码问题解决用户验证手机号问题解决sql获取收件人抄送人email (ceb45d9c) · Commits · SUMMER2020 / students / proj-2002251

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

+4 −1

Original line number	Diff line number	Diff line
		@@ -128,6 +128,7 @@
		v-if="taskType === 'SQL'"
		@on-params="_onParams"
		ref="SQL"
		:create-node-id="id"
		:backfill-item="backfillItem">
		</m-sql>
		<!-- spark node -->
		@@ -429,7 +430,9 @@
		}
		this.isContentBox = true
		},
		mounted () {},
		mounted () {

		},
		updated () {
		},
		beforeDestroy () {

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

+16 −8

Original line number	Diff line number	Diff line
		@@ -29,15 +29,15 @@
		</m-list-box>
		<template v-if="!sqlType && showType.length">
		<m-list-box>
		<div slot="text">收件人</div>
		<div slot="text">{{$t('Recipient')}}</div>
		<div slot="content">
		<m-email v-model="receivers" :repeat-data="receiversCc"></m-email>
		<m-email v-model="receivers" :disabled="isDetails" :repeat-data="receiversCc"></m-email>
		</div>
		</m-list-box>
		<m-list-box>
		<div slot="text">抄送人</div>
		<div slot="text">{{$t('Cc')}}</div>
		<div slot="content">
		<m-email v-model="receiversCc" :repeat-data="receivers"></m-email>
		<m-email v-model="receiversCc" :disabled="isDetails" :repeat-data="receivers"></m-email>
		</div>
		</m-list-box>
		</template>
		@@ -132,7 +132,8 @@
		},
		mixins: [disabledState],
		props: {
		backfillItem: Object
		backfillItem: Object,
		createNodeId: Number
		},
		methods: {
		/**
		@@ -238,7 +239,14 @@
		return editor
		},
		_getReceiver () {
		this.store.dispatch('dag/getReceiver', { processDefinitionId: this.item.id }).then(res => {
		let param = {}
		let current = this.router.history.current
		if (current.name === 'projects-definition-details') {
		param.processDefinitionId = current.params.id
		} else {
		param.processInstanceId = current.params.id
		}
		this.store.dispatch('dag/getReceiver', param).then(res => {
		this.receivers = res.receivers && res.receivers.split(',') \|\| []
		this.receiversCc = res.receiversCc && res.receiversCc.split(',') \|\| []
		})
		@@ -286,8 +294,8 @@
		this.receivers = o.params.receivers && o.params.receivers.split(',') \|\| []
		this.receiversCc = o.params.receiversCc && o.params.receiversCc.split(',') \|\| []
		}
		//
		if (this.router.history.current.name === 'definition-create') {
		if (!_.some(this.store.state.dag.tasks, { id: this.createNodeId }) &&
		this.router.history.current.name !== 'definition-create') {
		this._getReceiver()
		}
		},

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

+16 −4

Original line number	Diff line number	Diff line
		<template>
		<div class="ans-input email-model">
		<div class="clearfix input-element">
		<div class="clearfix input-element" :class="disabled ? 'disabled' : ''">
		<span class="tag-wrapper" v-for="(item,$index) in activeList" :class="activeIndex === $index ? 'active' : ''">
		<span class="tag-text">{{item}}</span>
		<i class="remove-tag ans-icon-close" @click.stop="_del($index)"></i>
		<i class="remove-tag ans-icon-close" @click.stop="_del($index)" v-if="!disabled"></i>
		</span>
		<x-poptip
		placement="bottom-start"
		@@ -30,6 +30,7 @@
		:style="{width:emailWidth + 'px'}"
		type="text"
		v-model="email"
		:disabled="disabled"
		:placeholder="$t('Please enter email')"
		@keydown.tab="_emailTab"
		@keyup.delete="_emailDelete"
		@@ -38,7 +39,6 @@
		@keyup.down="_emailKeyup('down')">
		</span>
		</x-poptip>

		</div>
		</div>
		</template>
		@@ -63,7 +63,11 @@
		},
		props: {
		activeList: Array,
		repeatData: Array
		repeatData: Array,
		disabled: {
		type: Boolean,
		default: false
		}
		},
		model: {
		prop: 'activeList',
		@@ -317,6 +321,14 @@
		padding-left: 4px;
		}
		}
		&.disabled {
		.tag-wrapper {
		background: #d9d9d9;
		}
		.email-input {
		background: none;
		}
		}
		}
		}
		.email-list-model {

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

+5 −3

Original line number	Diff line number	Diff line
		<template>
		<div>
		<template v-show="!isLoading">
		<div class="perject-home-content">
		<div class="perject-home-content" v-show="!msg">
		<div class="time-model">
		<x-datepicker
		:panel-num="2"
		@@ -123,6 +123,7 @@
		</div>
		</div>
		</div>
		<m-no-data :msg="msg" v-if="msg"></m-no-data>
		</template>
		<m-spin :is-spin="isLoading" :is-left="id ? true : false">
		</m-spin>
		@@ -154,7 +155,8 @@
		projectId: this.id,
		startDate: '',
		endDate: ''
		}
		},
		msg: ''
		}
		},
		props: {
		@@ -297,7 +299,7 @@
		this.isLoading = false
		}, 800)
		}).catch(e => {
		console.log(e)
		this.msg = e.msg \|\| 'error'
		this.isLoading = false
		})
		}

escheduler-ui/src/js/conf/home/pages/security/pages/tenement/_source/createTenement.vue

+2 −2

Original line number	Diff line number	Diff line
		@@ -114,12 +114,12 @@
		})
		},
		_verification () {
		let isEn = /^[A-Za-z]+$/
		let isEn = /^\w+$/
		if (!this.tenantCode) {
		this.$message.warning(`${i18n.$t('Please enter the tenant code in English')}`)
		return false
		}
		if (!isEn.test(this.tenantCode)) {
		if (!isEn.test(this.tenantCode) \|\| this.tenantCode.split('')[0] === '_') {
		this.$message.warning(`${i18n.$t('Please enter tenant code in English')}`)
		return false
		}