Browse Source

fix eslint: fatal syntax errors

pull/3/MERGE
chengshiwen 4 years ago
parent
commit
cfcae24958
  1. 2
      dolphinscheduler-ui/.eslintrc.yml
  2. 4
      dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/dag.vue
  3. 2
      dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/log.vue
  4. 1
      dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/datax.vue
  5. 4
      dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/dependent.vue
  6. 2
      dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/waterdrop.vue
  7. 1
      dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/startingParam/index.vue
  8. 5
      dolphinscheduler-ui/src/js/conf/home/pages/monitor/pages/servers/_source/zookeeperList.vue
  9. 1
      dolphinscheduler-ui/src/js/conf/home/pages/monitor/pages/servers/statistics.vue
  10. 14
      dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/_source/list.vue
  11. 4
      dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/_source/timing.vue
  12. 2
      dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/index/_source/queueCount.vue
  13. 2
      dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/kinship/index.vue
  14. 2
      dolphinscheduler-ui/src/js/conf/home/pages/security/pages/users/_source/createUser.vue
  15. 2
      dolphinscheduler-ui/src/js/conf/home/pages/user/pages/password/_source/info.vue
  16. 1
      dolphinscheduler-ui/src/js/module/components/fileUpdate/definitionUpdate.vue
  17. 6
      dolphinscheduler-ui/src/js/module/components/nav/nav.vue

2
dolphinscheduler-ui/.eslintrc.yml

@ -34,8 +34,8 @@ plugins:
- vue
rules:
vue/script-indent: ['error', 2, { 'baseIndent': 1, 'switchCase': 1 }]
vue/no-unused-components: 'off'
vue/no-mutating-props: 'off'
prefer-promise-reject-errors: 'off'
no-prototype-builtins: 'off'
no-mixed-operators: 'off'
no-extend-native: 'off'

4
dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/dag.vue

@ -203,8 +203,8 @@
import { findComponentDownward } from '@/module/util/'
import disabledState from '@/module/mixin/disabledState'
import { mapActions, mapState, mapMutations } from 'vuex'
import mVersions from '../../projects/pages/definition/pages/list/_source/versions'
import mStart from '../../projects/pages/definition/pages/list/_source/start'
import mVersions from '../../projects/pages/definition/pages/list/_source/versions'
let eventModel
@ -270,7 +270,7 @@
...mapMutations('dag', ['addTasks', 'cacheTasks', 'resetParams', 'setIsEditDag', 'setName', 'addConnects']),
startRunning (item, startNodeList, sourceType) {
this.startData = item
this.startNodeList.startNodeList
this.startNodeList = startNodeList
this.sourceType = sourceType
this.startDialog = true
},

2
dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/log.vue

@ -89,7 +89,7 @@
props: {
item: {
type: Object,
default: {}
default: Object
},
source: {
type: String,

1
dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/datax.vue

@ -335,7 +335,6 @@
return false
}
debugger
// storage
this.$emit('on-params', {
customConfig: this.customConfig,

4
dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/dependent.vue

@ -147,7 +147,9 @@
this.dependTaskList = _.cloneDeep(o.dependence.dependTaskList) || []
let defaultState = this.isDetails ? 'WAITING' : ''
// Process instance return status display matches by key
_.map(this.dependTaskList, v => _.map(v.dependItemList, v1 => v1.state = dependentResult[`${v1.definitionId}-${v1.depTasks}-${v1.cycle}-${v1.dateValue}`] || defaultState))
_.map(this.dependTaskList, v => _.map(v.dependItemList, v1 => {
v1.state = dependentResult[`${v1.definitionId}-${v1.depTasks}-${v1.cycle}-${v1.dateValue}`] || defaultState
}))
}
},
mounted () {

2
dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/waterdrop.vue

@ -112,7 +112,7 @@
// script
rawScript: '',
// waterdrop script
baseScript: 'sh ${WATERDROP_HOME}/bin/start-waterdrop.sh',
baseScript: 'sh ${WATERDROP_HOME}/bin/start-waterdrop.sh', // eslint-disable-line
// resourceNameVal
resourceNameVal: [],
// Custom parameter

1
dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/startingParam/index.vue

@ -35,6 +35,7 @@
</div>
</template>
<script>
import _ from 'lodash'
import store from '@/conf/home/store'
import { runningType } from '@/conf/home/pages/dag/_source/config'
import { warningTypeList } from '@/conf/home/pages/projects/pages/definition/pages/list/_source/util'

5
dolphinscheduler-ui/src/js/conf/home/pages/monitor/pages/servers/_source/zookeeperList.vue

@ -49,11 +49,6 @@
<script>
export default {
name: 'zookeeper-list',
data () {
return {
list: []
}
},
props: {
list: Array
}

1
dolphinscheduler-ui/src/js/conf/home/pages/monitor/pages/servers/statistics.vue

@ -67,6 +67,7 @@
</template>
<script>
import _ from 'lodash'
import { mapActions } from 'vuex'
import mSpin from '@/module/components/spin/spin'
import mNoData from '@/module/components/noData/noData'

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

@ -241,9 +241,9 @@
_timing (item) {
let self = this
this._getReceiver(item.id).then(res => {
this.timingData.item = item,
this.timingData.receiversD = res.receivers,
this.timingData.receiversCcD = res.receiversCc,
this.timingData.item = item
this.timingData.receiversD = res.receivers
this.timingData.receiversCcD = res.receiversCc
this.timingData.type = 'timing'
this.timingDialog = true
})
@ -421,10 +421,10 @@
let pageSize = res.data.pageSize
let pageNo = res.data.currentPage
this.versionData.processDefinition = item,
this.versionData.processDefinitionVersions = processDefinitionVersions,
this.versionData.total = total,
this.versionData.pageNo = pageNo,
this.versionData.processDefinition = item
this.versionData.processDefinitionVersions = processDefinitionVersions
this.versionData.total = total
this.versionData.pageNo = pageNo
this.versionData.pageSize = pageSize
this.drawer = true
}).catch(e => {

4
dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/_source/timing.vue

@ -355,13 +355,13 @@
// let list = _.filter(this.notifyGroupList, v => v.id === item.warningGroupId)
this.warningGroupId = item.warningGroupId
})
}).catch(() => this.warningGroupId = '')
}).catch(() => { this.warningGroupId = '' })
} else {
this._getNotifyGroupList().then(() => {
this.$nextTick(() => {
this.warningGroupId = ''
})
}).catch(() => this.warningGroupId = '')
}).catch(() => { this.warningGroupId = '' })
}
},
components: { vCrontab, mEmail, mPriority, mWorkerGroups }

2
dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/index/_source/queueCount.vue

@ -29,7 +29,7 @@
<th>{{$t('Number')}}</th>
<th>{{$t('State')}}</th>
</tr>
<tr v-for="(item,$index) in queueList">
<tr :key="$index" v-for="(item,$index) in queueList">
<td><span>{{$index+1}}</span></td>
<td><span><a href="javascript:" >{{item.value}}</a></span></td>
<td><span class="ellipsis" style="width: 98%;" :title="item.key">{{item.key}}</span></td>

2
dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/kinship/index.vue

@ -141,7 +141,7 @@
computed: {
...mapState('kinship', ['locations', 'workList']),
inputFocusStyle () {
return `width:280px`
return 'width:280px'
}
},
mounted () {

2
dolphinscheduler-ui/src/js/conf/home/pages/security/pages/users/_source/createUser.vue

@ -162,7 +162,7 @@
// Mobile phone number regular
let regPhone = /^1(3|4|5|6|7|8)\d{9}$/; // eslint-disable-line
let regPassword = /^(?![0-9]+$)(?![a-z]+$)(?![A-Z]+$)(?![`~!@#$%^&*()_\-+=<>?:"{}|,.\/;'\\[\]·~!@#¥%……&*()——\-+={}|《》?:“”【】、;‘’,。、]+$)[`~!@#$%^&*()_\-+=<>?:"{}|,.\/;'\\[\]·~!@#¥%……&*()——\-+={}|《》?:“”【】、;‘’,。、0-9A-Za-z]{6,22}$/
let regPassword = /^(?![0-9]+$)(?![a-z]+$)(?![A-Z]+$)(?![`~!@#$%^&*()_\-+=<>?:"{}|,./;'\\[\]·~!@#¥%……&*()——\-+={}|《》?:“”【】、;‘’,。、]+$)[`~!@#$%^&*()_\-+=<>?:"{}|,./;'\\[\]·~!@#¥%……&*()——\-+={}|《》?:“”【】、;‘’,。、0-9A-Za-z]{6,22}$/
let userNameLength = this.userName.length
// user name

2
dolphinscheduler-ui/src/js/conf/home/pages/user/pages/password/_source/info.vue

@ -107,7 +107,7 @@
* verification
*/
_verification () {
let regPassword = /^(?![0-9]+$)(?![a-z]+$)(?![A-Z]+$)(?![`~!@#$%^&*()_\-+=<>?:"{}|,.\/;'\\[\]·~!@#¥%……&*()——\-+={}|《》?:“”【】、;‘’,。、]+$)[`~!@#$%^&*()_\-+=<>?:"{}|,.\/;'\\[\]·~!@#¥%……&*()——\-+={}|《》?:“”【】、;‘’,。、0-9A-Za-z]{6,22}$/
let regPassword = /^(?![0-9]+$)(?![a-z]+$)(?![A-Z]+$)(?![`~!@#$%^&*()_\-+=<>?:"{}|,./;'\\[\]·~!@#¥%……&*()——\-+={}|《》?:“”【】、;‘’,。、]+$)[`~!@#$%^&*()_\-+=<>?:"{}|,./;'\\[\]·~!@#¥%……&*()——\-+={}|《》?:“”【】、;‘’,。、0-9A-Za-z]{6,22}$/
// password
if (!regPassword.test(this.userPassword)) {

1
dolphinscheduler-ui/src/js/module/components/fileUpdate/definitionUpdate.vue

@ -109,7 +109,6 @@
_ok () {
this.$refs.popup.spinnerLoading = true
if (this._validation()) {
name: this.name
this._formDataUpdate().then(res => {
setTimeout(() => {
this.$refs.popup.spinnerLoading = false

6
dolphinscheduler-ui/src/js/module/components/nav/nav.vue

@ -161,7 +161,7 @@
:visible.sync="resourceChildUpdateDialog"
append-to-body="true"
width="40%">
<m-resource-child-update :type="type" :id="id" @onProgressResourceChildUpdate="onProgressResourceChildUpdate" @onUpdateFileChildUpdate="onUpdateResourceChildUpdate" @onArchiveFileChildUpdate="onArchiveResourceChildUpdate" @closeFileChildUpdate="closeResourceChildUpdate"></m-resource-child-update>
<m-resource-child-update :type="type" :id="id" @onProgressResourceChildUpdate="onProgressResourceChildUpdate" @onUpdateResourceChildUpdate="onUpdateResourceChildUpdate" @onArchiveFileChildUpdate="onArchiveResourceChildUpdate" @closeResourceChildUpdate="closeResourceChildUpdate"></m-resource-child-update>
</el-dialog>
</div>
</template>
@ -293,7 +293,7 @@
},
onUpdateFileChildUpdate () {
let self = this
findComponentDownward(self.$root, `resource-list-index-${this.type}`)._updateList(data)
findComponentDownward(self.$root, `resource-list-index-${this.type}`)._updateList()
this.isUpdate = false
this.progress = 0
this.fileChildUpdateDialog = false
@ -322,7 +322,7 @@
},
onUpdateResourceChildUpdate () {
let self = this
findComponentDownward(self.$root, `resource-list-index-${this.type}`)._updateList(data)
findComponentDownward(self.$root, `resource-list-index-${this.type}`)._updateList()
this.isUpdate = false
this.progress = 0
this.resourceChildUpdateDialog = false

Loading…
Cancel
Save