Compare commits

...

5 Commits
dev-v2 ... v2.9

Author SHA1 Message Date
dataeaseShu
3831b21c2e fix: 编译报错 2024-11-04 10:42:49 +08:00
dataeaseShu
1a9f5a804d fix: 编译报错 2024-11-04 10:35:10 +08:00
fit2cloud-chenyw
662c781147 fix(数据源): 在不同组织根目录创建资源不允许重名 2024-08-14 10:31:59 +08:00
王嘉豪
987dbf293f
Merge pull request #11395 from dataease/pr@v2.9@fix_rich-text-filter2
fix(仪表板): 修复过滤组件设置默认值和富文本一起放在tab组件中,预览时不生效问题
2024-08-07 10:56:30 +08:00
wangjiahao
72b5b9e6f6 fix(仪表板): 修复过滤组件设置默认值和富文本一起放在tab组件中,预览时不生效问题 2024-08-07 10:55:43 +08:00
4 changed files with 8 additions and 9 deletions

View File

@ -87,7 +87,7 @@ public class DataSourceManage {
public void checkName(DatasourceDTO dto) {
QueryWrapper<CoreDatasource> wrapper = new QueryWrapper<>();
if (ObjectUtils.isNotEmpty(dto.getPid())) {
wrapper.eq("pid", dto.getPid());
wrapper.eq("pid", dto.getPid().equals(0L) ? AuthUtils.getUser().getDefaultOid() : dto.getPid());
}
if (StringUtils.isNotEmpty(dto.getName())) {
wrapper.eq("name", dto.getName());

View File

@ -107,7 +107,8 @@ const state = reactive({
data: null,
viewDataInfo: null,
totalItems: 0,
firstRender: true
firstRender: true,
previewFirstRender: true
})
const dataRowSelect = ref({})
const dataRowNameSelect = ref({})
@ -465,11 +466,9 @@ const initCurFields = chartDetails => {
//
const renderChart = viewInfo => {
if (!state.firstRender) {
calcData(viewInfo)
} else {
state.firstRender = false
}
//do renderView
initCurFieldsChange()
eventBus.emit('initCurFields-' + element.value.id)
}
const conditionAdaptor = (chart: Chart) => {

View File

@ -30,7 +30,7 @@ const props = defineProps({
}
},
timeGranularityMultiple: {
type: Object as PropType<DatePickType>,
type: String as PropType<DatePickType>,
default: () => {
return 'yearrange'
}

View File

@ -37,7 +37,7 @@ const props = defineProps({
}
},
timeGranularityMultiple: {
type: Object as PropType<DatePickType>,
type: String as PropType<DatePickType>,
default: () => {
return 'yearrange'
}