Browse Source

Resolve style conflict, recipient cannot tab and value verification (#1173)

* Dependency workflow add dependency correction value

* Download workflow instance map width adjustment and change "desc" field to "description"

* The third-party library that builds the dependency is recommended to be placed in 'devDependencies'

* Tree chart and Gantt chart style modification

* The workflow instance can be deleted only when its status is success, failure, stop and pause.

* change desc to description

* Maximum width of tooltip is set to 500px, note the copyright number of login page

* Delete copyright number

* No tenant in the list of selected tenants the default is default, and the status not shown in the repair page

* repair

* Repair security center module prompt

* Remove blank character during verification

* Remove blank character during verification

* Non admin users cannot create users, tenants, alarm groups, queues and worker groups

* Remove CI windows detection

* The value of loadaverage should be two decimal places

* Add license

* delete docs

* update package.json

* delete LICENSE

* Display icon when there is no data in process definition

* Worker group add IP format verification

* Modify MySQL page of monitoring center

* DB page rename and background color modification

* IO build replace with source code

* Replace ans charts with source code

* delete component-compiler-utils

* delete progress-webpack-plugin

* Release administrator delete function and select tenant not updated

* The default timing is hourly

* Resolve style conflict, recipient cannot tab and value verification
pull/2/head
break60 5 years ago committed by qiaozhanwei
parent
commit
f0d1b60d9b
  1. 13
      dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/sql.vue
  2. 4
      dolphinscheduler-ui/src/js/conf/home/pages/monitor/pages/servers/db.vue
  3. 10
      dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/_source/email.vue

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

@ -58,13 +58,13 @@
<m-list-box> <m-list-box>
<div slot="text">{{$t('Recipient')}}</div> <div slot="text">{{$t('Recipient')}}</div>
<div slot="content"> <div slot="content">
<m-email v-model="receivers" :disabled="isDetails" :repeat-data="receiversCc"></m-email> <m-email ref="refEmail" v-model="receivers" :disabled="isDetails" :repeat-data="receiversCc"></m-email>
</div> </div>
</m-list-box> </m-list-box>
<m-list-box> <m-list-box>
<div slot="text">{{$t('Cc')}}</div> <div slot="text">{{$t('Cc')}}</div>
<div slot="content"> <div slot="content">
<m-email v-model="receiversCc" :disabled="isDetails" :repeat-data="receivers"></m-email> <m-email ref="refCc" v-model="receiversCc" :disabled="isDetails" :repeat-data="receivers"></m-email>
</div> </div>
</m-list-box> </m-list-box>
</template> </template>
@ -240,7 +240,14 @@
if (!this.$refs.refDs._verifDatasource()) { if (!this.$refs.refDs._verifDatasource()) {
return false return false
} }
// receivers Subcomponent verification
if (!this.$refs.refEmail._manualEmail()) {
return false
}
// receiversCc Subcomponent verification
if (!this.$refs.refCc._manualEmail()) {
return false
}
// udfs Subcomponent verification Verification only if the data type is HIVE // udfs Subcomponent verification Verification only if the data type is HIVE
if (this.type === 'HIVE') { if (this.type === 'HIVE') {
if (!this.$refs.refUdfs._verifUdfs()) { if (!this.$refs.refUdfs._verifUdfs()) {

4
dolphinscheduler-ui/src/js/conf/home/pages/monitor/pages/servers/db.vue

@ -16,7 +16,7 @@
*/ */
<template> <template>
<div> <div>
<div class="servers-wrapper mysql-model content-box" v-show="mysqlList.length"> <div class="servers-wrapper mysql-model content-wrap" v-show="mysqlList.length">
<div class="row" v-for="(item,$index) in mysqlList"> <div class="row" v-for="(item,$index) in mysqlList">
<div class="col-md-12"> <div class="col-md-12">
<div class="db-title"> <div class="db-title">
@ -130,7 +130,7 @@ export default {
</script> </script>
<style lang="scss" rel="stylesheet/scss"> <style lang="scss" rel="stylesheet/scss">
@import "./servers"; @import "./servers";
.content-box { .content-wrap {
background: #fff; background: #fff;
min-height: calc(100vh - 100px); min-height: calc(100vh - 100px);
margin: 20px; margin: 20px;

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

@ -98,7 +98,7 @@
*/ */
_manualEmail () { _manualEmail () {
if (this.email === '') { if (this.email === '') {
return return true
} }
this.email = _.trim(this.email).replace(/(;$)|(;$)/g, "") this.email = _.trim(this.email).replace(/(;$)|(;$)/g, "")
@ -114,11 +114,14 @@
this.activeList.push(email) this.activeList.push(email)
this.email = '' this.email = ''
this._handlerEmailWitch() this._handlerEmailWitch()
return true
} else { } else {
this.$message.warning(`${i18n.$t('Mailbox already exists! Recipients and copyers cannot repeat')}`) this.$message.warning(`${i18n.$t('Mailbox already exists! Recipients and copyers cannot repeat')}`)
return false
} }
} else { } else {
this.$message.warning(`${i18n.$t('Mailbox input is illegal')}`) this.$message.warning(`${i18n.$t('Mailbox input is illegal')}`)
return false
} }
}, },
/** /**
@ -252,11 +255,6 @@
_emailTab () { _emailTab () {
// Data processing // Data processing
this._emailEnter() this._emailEnter()
// Focus acquisition
setTimeout(() => {
// Focus position
this.$refs.emailInput.focus()
}, 100)
} }
}, },
watch: { watch: {

Loading…
Cancel
Save