提交 7623a7dc authored 作者: taojinlong's avatar taojinlong

Merge branch 'v1.6' into dev

This source diff could not be displayed because it is too large. You can view the blob instead.
ALTER TABLE `dataset_table_field` CHANGE COLUMN `name` `name` LONGTEXT NOT NULL COMMENT '字段名' ;
......@@ -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
},
......
......@@ -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'
})
}
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论