Merge branch 'dev_copy' into dev
# Conflicts: # src/components/rightBox/report/ReportBox.vue
This commit is contained in:
@@ -73,11 +73,9 @@ export default {
|
||||
const errorList = parser.validateStr(str)
|
||||
if (_.isEmpty(errorList)) {
|
||||
const metaList = parser.parseStr(str)
|
||||
console.info(metaList)
|
||||
this.$emit('changeMode', 'tag', metaList)
|
||||
} else {
|
||||
this.$emit('changeMode', 'tag', { metaList: [], str: '' })
|
||||
console.info(errorList)
|
||||
}
|
||||
} else {
|
||||
this.$emit('changeMode', 'tag', { str: '', metaList: [] })
|
||||
|
||||
@@ -550,6 +550,8 @@ export default {
|
||||
}
|
||||
if (this.editObject.categoryParams.length > 0) {
|
||||
copyObject.config.queryParam = this.editObject.categoryParams
|
||||
} else {
|
||||
copyObject.config.queryParam = []
|
||||
}
|
||||
|
||||
// 校验scheduleConfig
|
||||
|
||||
Reference in New Issue
Block a user