Merge branch 'v1.6' into dev

This commit is contained in:
taojinlong 2022-01-06 15:18:32 +08:00
commit 7623a7dca5
4 changed files with 6 additions and 6 deletions

File diff suppressed because one or more lines are too long

View File

@ -0,0 +1 @@
ALTER TABLE `dataset_table_field` CHANGE COLUMN `name` `name` LONGTEXT NOT NULL COMMENT '字段名' ;

View File

@ -183,7 +183,6 @@ export default {
filter.drill = this.drillClickDimensionList
filter.resultCount = this.resultCount
filter.resultMode = this.resultMode
filter.user = this.element.user
filter.queryFrom = 'panel'
return filter
},

View File

@ -78,7 +78,7 @@ export default {
if (data) {
data.forEach(item => {
item.type !== 'custom' && (item.id = uuid.v1())
item.user = this.user
// item.user = this.user
item.fromSource = 'link'
})
}