提交 cdaba0eb authored 作者: junjie's avatar junjie

feat(feat):数据集,视图分组树优化,去除场景

上级 1758bf49
package io.dataease.base.mapper.ext; package io.dataease.base.mapper.ext;
import io.dataease.controller.request.BaseTreeRequest;
import io.dataease.controller.request.chart.ChartGroupRequest; import io.dataease.controller.request.chart.ChartGroupRequest;
import io.dataease.dto.chart.ChartGroupDTO; import io.dataease.dto.chart.ChartGroupDTO;
......
...@@ -26,6 +26,11 @@ public class ChartGroupController { ...@@ -26,6 +26,11 @@ public class ChartGroupController {
return chartGroupService.tree(ChartGroup); return chartGroupService.tree(ChartGroup);
} }
@PostMapping("/treeNode")
public List<ChartGroupDTO> treeNode(@RequestBody ChartGroupRequest ChartGroup) {
return chartGroupService.tree(ChartGroup);
}
@PostMapping("/delete/{id}") @PostMapping("/delete/{id}")
public void tree(@PathVariable String id) { public void tree(@PathVariable String id) {
chartGroupService.delete(id); chartGroupService.delete(id);
......
...@@ -32,6 +32,11 @@ public class ChartViewController { ...@@ -32,6 +32,11 @@ public class ChartViewController {
return chartViewService.list(chartViewRequest); return chartViewService.list(chartViewRequest);
} }
@PostMapping("/listAndGroup")
public List<ChartViewDTO> listAndGroup(@RequestBody ChartViewRequest chartViewRequest) {
return chartViewService.listAndGroup(chartViewRequest);
}
@PostMapping("/get/{id}") @PostMapping("/get/{id}")
public ChartViewWithBLOBs get(@PathVariable String id) { public ChartViewWithBLOBs get(@PathVariable String id) {
return chartViewService.get(id); return chartViewService.get(id);
......
...@@ -21,6 +21,7 @@ public class DataSetGroupController { ...@@ -21,6 +21,7 @@ public class DataSetGroupController {
private DataSetGroupService dataSetGroupService; private DataSetGroupService dataSetGroupService;
@Resource @Resource
private ExtractDataService extractDataService; private ExtractDataService extractDataService;
@PostMapping("/save") @PostMapping("/save")
public DataSetGroupDTO save(@RequestBody DatasetGroup datasetGroup) { public DataSetGroupDTO save(@RequestBody DatasetGroup datasetGroup) {
return dataSetGroupService.save(datasetGroup); return dataSetGroupService.save(datasetGroup);
...@@ -31,8 +32,13 @@ public class DataSetGroupController { ...@@ -31,8 +32,13 @@ public class DataSetGroupController {
return dataSetGroupService.tree(datasetGroup); return dataSetGroupService.tree(datasetGroup);
} }
@PostMapping("/treeNode")
public List<DataSetGroupDTO> treeNode(@RequestBody DataSetGroupRequest datasetGroup) {
return dataSetGroupService.treeNode(datasetGroup);
}
@PostMapping("/delete/{id}") @PostMapping("/delete/{id}")
public void tree(@PathVariable String id) throws Exception{ public void tree(@PathVariable String id) throws Exception {
dataSetGroupService.delete(id); dataSetGroupService.delete(id);
} }
...@@ -42,7 +48,7 @@ public class DataSetGroupController { ...@@ -42,7 +48,7 @@ public class DataSetGroupController {
} }
@PostMapping("/isKettleRunning") @PostMapping("/isKettleRunning")
public boolean isKettleRunning(){ public boolean isKettleRunning() {
return extractDataService.isKettleRunning(); return extractDataService.isKettleRunning();
} }
} }
...@@ -44,6 +44,11 @@ public class DataSetTableController { ...@@ -44,6 +44,11 @@ public class DataSetTableController {
return dataSetTableService.list(dataSetTableRequest); return dataSetTableService.list(dataSetTableRequest);
} }
@PostMapping("listAndGroup")
public List<DataSetTableDTO> listAndGroup(@RequestBody DataSetTableRequest dataSetTableRequest) {
return dataSetTableService.listAndGroup(dataSetTableRequest);
}
@PostMapping("get/{id}") @PostMapping("get/{id}")
public DatasetTable get(@PathVariable String id) { public DatasetTable get(@PathVariable String id) {
return dataSetTableService.get(id); return dataSetTableService.get(id);
......
...@@ -16,4 +16,7 @@ public class ChartViewDTO extends ChartViewWithBLOBs { ...@@ -16,4 +16,7 @@ public class ChartViewDTO extends ChartViewWithBLOBs {
private Map<String, Object> data; private Map<String, Object> data;
private String privileges; private String privileges;
private Boolean isLeaf;
private String pid;
} }
...@@ -15,4 +15,7 @@ import java.util.List; ...@@ -15,4 +15,7 @@ import java.util.List;
public class DataSetTableDTO extends DatasetTable { public class DataSetTableDTO extends DatasetTable {
private List<DataSetTableDTO> children; private List<DataSetTableDTO> children;
private String privileges; private String privileges;
private Boolean isLeaf;
private String pid;
} }
...@@ -81,6 +81,16 @@ public class ChartGroupService { ...@@ -81,6 +81,16 @@ public class ChartGroupService {
} }
public List<ChartGroupDTO> tree(ChartGroupRequest chartGroup) { public List<ChartGroupDTO> tree(ChartGroupRequest chartGroup) {
chartGroup.setLevel(null);
chartGroup.setPid("0");
chartGroup.setType("group");
chartGroup.setUserId(String.valueOf(AuthUtils.getUser().getUserId()));
List<ChartGroupDTO> treeInfo = extChartGroupMapper.search(chartGroup);
List<ChartGroupDTO> result = TreeUtils.mergeTree(treeInfo);
return result;
}
public List<ChartGroupDTO> treeNode(ChartGroupRequest chartGroup) {
chartGroup.setLevel(null); chartGroup.setLevel(null);
chartGroup.setPid(null); chartGroup.setPid(null);
chartGroup.setUserId(String.valueOf(AuthUtils.getUser().getUserId())); chartGroup.setUserId(String.valueOf(AuthUtils.getUser().getUserId()));
......
...@@ -4,21 +4,23 @@ import com.google.gson.Gson; ...@@ -4,21 +4,23 @@ import com.google.gson.Gson;
import com.google.gson.reflect.TypeToken; import com.google.gson.reflect.TypeToken;
import io.dataease.base.domain.*; import io.dataease.base.domain.*;
import io.dataease.base.mapper.ChartViewMapper; import io.dataease.base.mapper.ChartViewMapper;
import io.dataease.base.mapper.ext.ExtChartGroupMapper;
import io.dataease.base.mapper.ext.ExtChartViewMapper; import io.dataease.base.mapper.ext.ExtChartViewMapper;
import io.dataease.commons.utils.AuthUtils; import io.dataease.commons.utils.AuthUtils;
import io.dataease.commons.utils.BeanUtils; import io.dataease.commons.utils.BeanUtils;
import io.dataease.commons.utils.CommonBeanFactory; import io.dataease.commons.utils.CommonBeanFactory;
import io.dataease.controller.request.chart.ChartExtFilterRequest; import io.dataease.controller.request.chart.ChartExtFilterRequest;
import io.dataease.controller.request.chart.ChartExtRequest; import io.dataease.controller.request.chart.ChartExtRequest;
import io.dataease.controller.request.chart.ChartGroupRequest;
import io.dataease.controller.request.chart.ChartViewRequest; import io.dataease.controller.request.chart.ChartViewRequest;
import io.dataease.controller.request.dataset.DataSetGroupRequest;
import io.dataease.datasource.provider.DatasourceProvider; import io.dataease.datasource.provider.DatasourceProvider;
import io.dataease.datasource.provider.ProviderFactory; import io.dataease.datasource.provider.ProviderFactory;
import io.dataease.datasource.request.DatasourceRequest; import io.dataease.datasource.request.DatasourceRequest;
import io.dataease.datasource.service.DatasourceService; import io.dataease.datasource.service.DatasourceService;
import io.dataease.dto.chart.ChartCustomFilterDTO; import io.dataease.dto.chart.*;
import io.dataease.dto.chart.ChartViewDTO; import io.dataease.dto.dataset.DataSetGroupDTO;
import io.dataease.dto.chart.ChartViewFieldDTO; import io.dataease.dto.dataset.DataSetTableDTO;
import io.dataease.dto.chart.Series;
import io.dataease.dto.dataset.DataTableInfoDTO; import io.dataease.dto.dataset.DataTableInfoDTO;
import io.dataease.i18n.Translator; import io.dataease.i18n.Translator;
import io.dataease.provider.QueryProvider; import io.dataease.provider.QueryProvider;
...@@ -51,6 +53,8 @@ public class ChartViewService { ...@@ -51,6 +53,8 @@ public class ChartViewService {
private DatasourceService datasourceService; private DatasourceService datasourceService;
@Resource @Resource
private DataSetTableFieldsService dataSetTableFieldsService; private DataSetTableFieldsService dataSetTableFieldsService;
@Resource
private ExtChartGroupMapper extChartGroupMapper;
public ChartViewWithBLOBs save(ChartViewWithBLOBs chartView) { public ChartViewWithBLOBs save(ChartViewWithBLOBs chartView) {
checkName(chartView); checkName(chartView);
...@@ -72,6 +76,30 @@ public class ChartViewService { ...@@ -72,6 +76,30 @@ public class ChartViewService {
return extChartViewMapper.search(chartViewRequest); return extChartViewMapper.search(chartViewRequest);
} }
public List<ChartViewDTO> listAndGroup(ChartViewRequest chartViewRequest) {
chartViewRequest.setUserId(String.valueOf(AuthUtils.getUser().getUserId()));
List<ChartViewDTO> charts = extChartViewMapper.search(chartViewRequest);
charts.forEach(ele -> ele.setIsLeaf(true));
// 获取group下的子group
ChartGroupRequest chartGroupRequest = new ChartGroupRequest();
chartGroupRequest.setLevel(null);
chartGroupRequest.setType("group");
chartGroupRequest.setPid(chartViewRequest.getSceneId());
chartGroupRequest.setUserId(String.valueOf(AuthUtils.getUser().getUserId()));
List<ChartGroupDTO> groups = extChartGroupMapper.search(chartGroupRequest);
List<ChartViewDTO> group = groups.stream().map(ele -> {
ChartViewDTO dto = new ChartViewDTO();
dto.setId(ele.getId());
dto.setName(ele.getName());
dto.setIsLeaf(false);
dto.setType("group");
dto.setPid(ele.getPid());
return dto;
}).collect(Collectors.toList());
group.addAll(charts);
return group;
}
public ChartViewWithBLOBs get(String id) { public ChartViewWithBLOBs get(String id) {
return chartViewMapper.selectByPrimaryKey(id); return chartViewMapper.selectByPrimaryKey(id);
} }
......
...@@ -87,6 +87,16 @@ public class DataSetGroupService { ...@@ -87,6 +87,16 @@ public class DataSetGroupService {
} }
} }
public List<DataSetGroupDTO> treeNode(DataSetGroupRequest datasetGroup) {
datasetGroup.setLevel(null);
datasetGroup.setPid("0");
datasetGroup.setType("group");
datasetGroup.setUserId(String.valueOf(AuthUtils.getUser().getUserId()));
List<DataSetGroupDTO> treeInfo = extDataSetGroupMapper.search(datasetGroup);
List<DataSetGroupDTO> result = TreeUtils.mergeTree(treeInfo);
return result;
}
public List<DataSetGroupDTO> tree(DataSetGroupRequest datasetGroup) { public List<DataSetGroupDTO> tree(DataSetGroupRequest datasetGroup) {
datasetGroup.setLevel(null); datasetGroup.setLevel(null);
datasetGroup.setPid(null); datasetGroup.setPid(null);
......
...@@ -5,21 +5,19 @@ import com.fit2cloud.quartz.anno.QuartzScheduled; ...@@ -5,21 +5,19 @@ import com.fit2cloud.quartz.anno.QuartzScheduled;
import com.google.gson.Gson; import com.google.gson.Gson;
import io.dataease.base.domain.*; import io.dataease.base.domain.*;
import io.dataease.base.mapper.*; import io.dataease.base.mapper.*;
import io.dataease.base.mapper.ext.ExtDataSetGroupMapper;
import io.dataease.base.mapper.ext.ExtDataSetTableMapper; import io.dataease.base.mapper.ext.ExtDataSetTableMapper;
import io.dataease.base.mapper.ext.UtilMapper; import io.dataease.base.mapper.ext.UtilMapper;
import io.dataease.commons.constants.JobStatus; import io.dataease.commons.constants.JobStatus;
import io.dataease.commons.utils.*; import io.dataease.commons.utils.*;
import io.dataease.controller.request.dataset.DataSetGroupRequest;
import io.dataease.controller.request.dataset.DataSetTableRequest; import io.dataease.controller.request.dataset.DataSetTableRequest;
import io.dataease.datasource.dto.TableFiled; import io.dataease.datasource.dto.TableFiled;
import io.dataease.datasource.provider.DatasourceProvider; import io.dataease.datasource.provider.DatasourceProvider;
import io.dataease.datasource.provider.JdbcProvider; import io.dataease.datasource.provider.JdbcProvider;
import io.dataease.datasource.provider.ProviderFactory; import io.dataease.datasource.provider.ProviderFactory;
import io.dataease.datasource.request.DatasourceRequest; import io.dataease.datasource.request.DatasourceRequest;
import io.dataease.dto.dataset.DataSetPreviewPage; import io.dataease.dto.dataset.*;
import io.dataease.dto.dataset.DataSetTableDTO;
import io.dataease.dto.dataset.DataSetTableUnionDTO;
import io.dataease.dto.dataset.DataTableInfoCustomUnion;
import io.dataease.dto.dataset.DataTableInfoDTO;
import io.dataease.i18n.Translator; import io.dataease.i18n.Translator;
import io.dataease.provider.DDLProvider; import io.dataease.provider.DDLProvider;
import io.dataease.provider.QueryProvider; import io.dataease.provider.QueryProvider;
...@@ -81,6 +79,8 @@ public class DataSetTableService { ...@@ -81,6 +79,8 @@ public class DataSetTableService {
private QrtzSchedulerStateMapper qrtzSchedulerStateMapper; private QrtzSchedulerStateMapper qrtzSchedulerStateMapper;
@Resource @Resource
private DatasetTableTaskLogMapper datasetTableTaskLogMapper; private DatasetTableTaskLogMapper datasetTableTaskLogMapper;
@Resource
private ExtDataSetGroupMapper extDataSetGroupMapper;
private static String lastUpdateTime = "${__last_update_time__}"; private static String lastUpdateTime = "${__last_update_time__}";
private static String currentUpdateTime = "${__current_update_time__}"; private static String currentUpdateTime = "${__current_update_time__}";
...@@ -186,6 +186,31 @@ public class DataSetTableService { ...@@ -186,6 +186,31 @@ public class DataSetTableService {
return extDataSetTableMapper.search(dataSetTableRequest); return extDataSetTableMapper.search(dataSetTableRequest);
} }
public List<DataSetTableDTO> listAndGroup(DataSetTableRequest dataSetTableRequest) {
dataSetTableRequest.setUserId(String.valueOf(AuthUtils.getUser().getUserId()));
dataSetTableRequest.setTypeFilter(dataSetTableRequest.getTypeFilter());
List<DataSetTableDTO> ds = extDataSetTableMapper.search(dataSetTableRequest);
ds.forEach(ele -> ele.setIsLeaf(true));
// 获取group下的子group
DataSetGroupRequest datasetGroup = new DataSetGroupRequest();
datasetGroup.setLevel(null);
datasetGroup.setType("group");
datasetGroup.setPid(dataSetTableRequest.getSceneId());
datasetGroup.setUserId(String.valueOf(AuthUtils.getUser().getUserId()));
List<DataSetGroupDTO> groups = extDataSetGroupMapper.search(datasetGroup);
List<DataSetTableDTO> group = groups.stream().map(ele -> {
DataSetTableDTO dto = new DataSetTableDTO();
dto.setId(ele.getId());
dto.setName(ele.getName());
dto.setIsLeaf(false);
dto.setType("group");
dto.setPid(ele.getPid());
return dto;
}).collect(Collectors.toList());
group.addAll(ds);
return group;
}
public DatasetTable get(String id) { public DatasetTable get(String id) {
return datasetTableMapper.selectByPrimaryKey(id); return datasetTableMapper.selectByPrimaryKey(id);
} }
......
...@@ -2,12 +2,12 @@ ...@@ -2,12 +2,12 @@
<de-container v-loading="$store.getters.loadingMap[$store.getters.currentPath]" style="background-color: #f7f8fa"> <de-container v-loading="$store.getters.loadingMap[$store.getters.currentPath]" style="background-color: #f7f8fa">
<de-aside-container> <de-aside-container>
<group @switchComponent="switchComponent" /> <group :save-status="saveStatus" @switchComponent="switchComponent" />
</de-aside-container> </de-aside-container>
<de-main-container> <de-main-container>
<!-- <router-view />--> <!-- <router-view />-->
<component :is="component" :param="param" @switchComponent="switchComponent" /> <component :is="component" :param="param" @switchComponent="switchComponent" @saveSuccess="saveSuccess" />
</de-main-container> </de-main-container>
</de-container> </de-container>
</template> </template>
...@@ -28,7 +28,8 @@ export default { ...@@ -28,7 +28,8 @@ export default {
data() { data() {
return { return {
component: ChartHome, component: ChartHome,
param: {} param: {},
saveStatus: null
} }
}, },
mounted() { mounted() {
...@@ -45,6 +46,9 @@ export default { ...@@ -45,6 +46,9 @@ export default {
this.component = ChartHome this.component = ChartHome
break break
} }
},
saveSuccess(val) {
this.saveStatus = val
} }
} }
} }
......
...@@ -98,7 +98,7 @@ ...@@ -98,7 +98,7 @@
<el-radio-group <el-radio-group
v-model="view.type" v-model="view.type"
style="width: 100%" style="width: 100%"
@change="save(true,'chart')" @change="save(true,'chart',true)"
> >
<div style="width: 100%;display: flex;display: -webkit-flex;justify-content: space-between;flex-direction: row;flex-wrap: wrap;"> <div style="width: 100%;display: flex;display: -webkit-flex;justify-content: space-between;flex-direction: row;flex-wrap: wrap;">
<el-radio value="table-normal" label="table-normal"> <el-radio value="table-normal" label="table-normal">
...@@ -481,7 +481,7 @@ export default { ...@@ -481,7 +481,7 @@ export default {
return true return true
}) })
}, },
save(getData, trigger) { save(getData, trigger, needRefreshGroup = false) {
const view = JSON.parse(JSON.stringify(this.view)) const view = JSON.parse(JSON.stringify(this.view))
view.id = this.view.id view.id = this.view.id
view.sceneId = this.view.sceneId view.sceneId = this.view.sceneId
...@@ -549,8 +549,11 @@ export default { ...@@ -549,8 +549,11 @@ export default {
this.getChart(response.data.id) this.getChart(response.data.id)
} }
this.$store.dispatch('chart/setChartSceneData', null) // this.$store.dispatch('chart/setChartSceneData', null)
this.$store.dispatch('chart/setChartSceneData', response.data) // this.$store.dispatch('chart/setChartSceneData', response.data)
if (needRefreshGroup) {
this.refreshGroup(view)
}
}) })
}, },
...@@ -797,7 +800,7 @@ export default { ...@@ -797,7 +800,7 @@ export default {
onTextChange(val) { onTextChange(val) {
this.view.customStyle.text = val this.view.customStyle.text = val
this.view.title = val.title this.view.title = val.title
this.save() this.save(false, '', true)
}, },
onLegendChange(val) { onLegendChange(val) {
...@@ -921,6 +924,10 @@ export default { ...@@ -921,6 +924,10 @@ export default {
yAxis: [], yAxis: [],
type: '' type: ''
} }
},
refreshGroup(view) {
this.$emit('saveSuccess', view)
} }
} }
} }
......
<template> <template>
<de-container> <de-container>
<de-aside-container> <de-aside-container>
<dataset-group-selector @getTable="getTable" /> <dataset-group-selector-tree @getTable="getTable" />
</de-aside-container> </de-aside-container>
<de-main-container> <de-main-container>
...@@ -15,14 +15,15 @@ import DeMainContainer from '@/components/dataease/DeMainContainer' ...@@ -15,14 +15,15 @@ import DeMainContainer from '@/components/dataease/DeMainContainer'
import DeContainer from '@/components/dataease/DeContainer' import DeContainer from '@/components/dataease/DeContainer'
import DeAsideContainer from '@/components/dataease/DeAsideContainer' import DeAsideContainer from '@/components/dataease/DeAsideContainer'
import DatasetGroupSelector from '../../dataset/common/DatasetGroupSelector' // import DatasetGroupSelector from '../../dataset/common/DatasetGroupSelector'
import DatasetGroupSelectorTree from '../../dataset/common/DatasetGroupSelectorTree'
import DatasetTableData from '../../dataset/common/DatasetTableData' import DatasetTableData from '../../dataset/common/DatasetTableData'
export default { export default {
name: 'TableSelector', name: 'TableSelector',
components: { components: {
DatasetTableData, DatasetTableData,
DeMainContainer, DeContainer, DeAsideContainer, DatasetGroupSelector DeMainContainer, DeContainer, DeAsideContainer, DatasetGroupSelectorTree
}, },
data() { data() {
return { return {
......
...@@ -208,7 +208,8 @@ export default { ...@@ -208,7 +208,8 @@ export default {
info: '{"list":' + JSON.stringify(this.checkedList) + '}' info: '{"list":' + JSON.stringify(this.checkedList) + '}'
} }
post('/dataset/table/update', table).then(response => { post('/dataset/table/update', table).then(response => {
this.$store.dispatch('dataset/setSceneData', new Date().getTime()) // this.$store.dispatch('dataset/setSceneData', new Date().getTime())
this.$emit('saveSuccess', table)
this.cancel() this.cancel()
}) })
}, },
......
...@@ -141,7 +141,8 @@ export default { ...@@ -141,7 +141,8 @@ export default {
}) })
}) })
post('/dataset/table/batchAdd', tables).then(response => { post('/dataset/table/batchAdd', tables).then(response => {
this.$store.dispatch('dataset/setSceneData', new Date().getTime()) // this.$store.dispatch('dataset/setSceneData', new Date().getTime())
this.$emit('saveSuccess', tables[0])
this.cancel() this.cancel()
}) })
}, },
......
...@@ -202,7 +202,8 @@ export default { ...@@ -202,7 +202,8 @@ export default {
} }
} }
post('/dataset/table/update', table).then(response => { post('/dataset/table/update', table).then(response => {
this.$store.dispatch('dataset/setSceneData', new Date().getTime()) // this.$store.dispatch('dataset/setSceneData', new Date().getTime())
this.$emit('saveSuccess', table)
this.cancel() this.cancel()
}) })
}, },
......
...@@ -265,7 +265,8 @@ export default { ...@@ -265,7 +265,8 @@ export default {
info: JSON.stringify({ sql: this.sql }) info: JSON.stringify({ sql: this.sql })
} }
post('/dataset/table/update', table).then(response => { post('/dataset/table/update', table).then(response => {
this.$store.dispatch('dataset/setSceneData', new Date().getTime()) // this.$store.dispatch('dataset/setSceneData', new Date().getTime())
this.$emit('saveSuccess', table)
this.cancel() this.cancel()
}) })
}, },
......
...@@ -29,8 +29,10 @@ ...@@ -29,8 +29,10 @@
:default-expanded-keys="expandedArray" :default-expanded-keys="expandedArray"
:data="data" :data="data"
node-key="id" node-key="id"
:expand-on-click-node="true" :expand-on-click-node="false"
@node-click="nodeClick" @node-click="nodeClick"
@node-expand="nodeExpand"
@node-collapse="nodeCollapse"
> >
<span slot-scope="{ node, data }" class="custom-tree-node"> <span slot-scope="{ node, data }" class="custom-tree-node">
<span style="display: flex;flex: 1;width: 0;"> <span style="display: flex;flex: 1;width: 0;">
...@@ -234,7 +236,7 @@ export default { ...@@ -234,7 +236,7 @@ export default {
if (this.currGroup) { if (this.currGroup) {
this.dsLoading = true this.dsLoading = true
post('/dataset/table/list', { post('/dataset/table/list', {
sort: 'type asc,create_time desc,name asc', sort: 'type asc,name asc,create_time desc',
sceneId: this.currGroup.id, sceneId: this.currGroup.id,
mode: this.mode < 0 ? null : this.mode, mode: this.mode < 0 ? null : this.mode,
typeFilter: this.customType ? this.customType : null typeFilter: this.customType ? this.customType : null
...@@ -258,19 +260,19 @@ export default { ...@@ -258,19 +260,19 @@ export default {
}, },
nodeClick(data, node) { nodeClick(data, node) {
if (data.type === 'scene') { // if (data.type === 'scene') {
this.sceneMode = true this.sceneMode = true
this.currGroup = data this.currGroup = data
this.tableTree() this.tableTree()
} // }
if (node.expanded) { // if (node.expanded) {
this.expandedArray.push(data.id) // this.expandedArray.push(data.id)
} else { // } else {
const index = this.expandedArray.indexOf(data.id) // const index = this.expandedArray.indexOf(data.id)
if (index > -1) { // if (index > -1) {
this.expandedArray.splice(index, 1) // this.expandedArray.splice(index, 1)
} // }
} // }
// console.log(this.expandedArray); // console.log(this.expandedArray);
}, },
...@@ -339,6 +341,17 @@ export default { ...@@ -339,6 +341,17 @@ export default {
div1.style.setProperty('cursor', 'not-allowed') div1.style.setProperty('cursor', 'not-allowed')
div2.style.setProperty('pointer-events', 'none') div2.style.setProperty('pointer-events', 'none')
}) })
},
nodeExpand(data) {
if (data.id) {
this.expandedArray.push(data.id)
}
},
nodeCollapse(data) {
if (data.id) {
this.expandedArray.splice(this.expandedArray.indexOf(data.id), 1)
}
} }
} }
} }
......
...@@ -38,7 +38,7 @@ export default { ...@@ -38,7 +38,7 @@ export default {
name: '', name: '',
pid: '0', pid: '0',
level: 0, level: 0,
type: '', type: 'group',
children: [], children: [],
sort: 'type desc,name asc' sort: 'type desc,name asc'
}, },
......
...@@ -2,12 +2,12 @@ ...@@ -2,12 +2,12 @@
<de-container v-loading="$store.getters.loadingMap[$store.getters.currentPath]"> <de-container v-loading="$store.getters.loadingMap[$store.getters.currentPath]">
<de-aside-container> <de-aside-container>
<group @switchComponent="switchComponent" /> <group :save-status="saveStatus" @switchComponent="switchComponent" />
</de-aside-container> </de-aside-container>
<de-main-container> <de-main-container>
<!--<router-view/>--> <!--<router-view/>-->
<component :is="component" :param="param" @switchComponent="switchComponent" /> <component :is="component" :param="param" @switchComponent="switchComponent" @saveSuccess="saveSuccess" />
</de-main-container> </de-main-container>
</de-container> </de-container>
</template> </template>
...@@ -33,7 +33,8 @@ export default { ...@@ -33,7 +33,8 @@ export default {
data() { data() {
return { return {
component: DataHome, component: DataHome,
param: {} param: {},
saveStatus: null
} }
}, },
mounted() { mounted() {
...@@ -65,6 +66,10 @@ export default { ...@@ -65,6 +66,10 @@ export default {
this.component = DataHome this.component = DataHome
break break
} }
},
saveSuccess(val) {
this.saveStatus = val
} }
} }
} }
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论