Compare commits
5 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
3831b21c2e | ||
|
|
1a9f5a804d | ||
|
|
662c781147 | ||
|
|
987dbf293f | ||
|
|
72b5b9e6f6 |
@ -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());
|
||||
|
||||
@ -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) => {
|
||||
|
||||
@ -30,7 +30,7 @@ const props = defineProps({
|
||||
}
|
||||
},
|
||||
timeGranularityMultiple: {
|
||||
type: Object as PropType<DatePickType>,
|
||||
type: String as PropType<DatePickType>,
|
||||
default: () => {
|
||||
return 'yearrange'
|
||||
}
|
||||
|
||||
@ -37,7 +37,7 @@ const props = defineProps({
|
||||
}
|
||||
},
|
||||
timeGranularityMultiple: {
|
||||
type: Object as PropType<DatePickType>,
|
||||
type: String as PropType<DatePickType>,
|
||||
default: () => {
|
||||
return 'yearrange'
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user