ThbTech/gis-bi
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改数据集新增，移动没有appIdbug

Browse Source
This commit is contained in:
limengnan 2025-05-29 08:56:30 +08:00
parent 4499acab93
commit 08e428f5c3
4 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
core/core-frontend/src/viewsnew/application/service/dataset/form/CreatDsGroup.vue
View File

@ -42,7 +42,7 @@ const state = reactive({
const placeholder = ref('') const placeholder = ref('')
const nodeType = ref() const nodeType = ref()
const pid = ref() const pid = ref()
const appId = ref() const appId:any = ref("")
const id = ref() const id = ref()
const cmd = ref('') const cmd = ref('')
const treeRef = ref() const treeRef = ref()
@ -154,7 +154,7 @@ const createInit = (type, data: Tree, exec, name: string) => {
datasetForm.name = '' datasetForm.name = ''
filterText.value = '' filterText.value = ''
nodeType.value = type nodeType.value = type
if(type === 'folder' && data !=null && data.appId !=null){ if(data !=null && data.appId !=null){
appId.value = data.appId appId.value = data.appId
} }
placeholder.value = placeholder.value =
@ -164,7 +164,7 @@ const createInit = (type, data: Tree, exec, name: string) => {
allfields = data.allfields allfields = data.allfields
} }
if (data.id) { if (data.id) {
const request = { leaf: false, weight: 7 } as BusiTreeRequest const request = { leaf: false, weight: 7,appId: data.appId } as BusiTreeRequest
getDatasetTree(request).then(res => { getDatasetTree(request).then(res => {
filterFreeFolder(res, 'dataset') filterFreeFolder(res, 'dataset')
dfs(res as unknown as Tree[]) dfs(res as unknown as Tree[])
@ -254,7 +254,6 @@ const saveDataset = () => {
name: datasetForm.name, name: datasetForm.name,
appId: appId.value appId: appId.value
} }
switch (cmd.value) { switch (cmd.value) {
case 'move': case 'move':
params.pid = activeAll.value ? '0' : (datasetForm.pid as string) params.pid = activeAll.value ? '0' : (datasetForm.pid as string)

2
core/core-frontend/src/viewsnew/application/service/dataset/form/index.vue
View File

@ -1409,7 +1409,7 @@ const datasetSave = () => {
creatDsFolder.value.createInit( creatDsFolder.value.createInit(
'dataset', 'dataset',
{ id: pid || '0', union, allfields: allfields.value }, { id: pid || '0', union,appId:appId.value, allfields: allfields.value },
'', '',
datasetName.value datasetName.value
) )

6
core/core-frontend/src/viewsnew/application/service/datasource/form/CreatDsGroup.vue
View File

@ -46,7 +46,7 @@ const cmd = ref('')
const treeRef = ref() const treeRef = ref()
const filterText = ref('') const filterText = ref('')
const datasetForm = reactive({ const datasetForm = reactive({
pid: '', pid: '0',
name: '' name: ''
}) })
const searchEmpty = ref(false) const searchEmpty = ref(false)
@ -371,7 +371,7 @@ const emits = defineEmits(['finish', 'handleShowFinishPage'])
<el-form-item v-if="showName" :label="labelName" prop="name"> <el-form-item v-if="showName" :label="labelName" prop="name">
<el-input :placeholder="placeholder" v-model="datasetForm.name" /> <el-input :placeholder="placeholder" v-model="datasetForm.name" />
</el-form-item> </el-form-item>
<el-form-item v-if="showPid" :label="t('deDataset.folder')" prop="pid"> <!-- <el-form-item v-if="showPid" :label="t('deDataset.folder')" prop="pid">
<el-tree-select <el-tree-select
v-model="datasetForm.pid" v-model="datasetForm.pid"
:data="state.tData" :data="state.tData"
@ -427,7 +427,7 @@ const emits = defineEmits(['finish', 'handleShowFinishPage'])
<span>{{ t('data_source.relevant_content_found') }}</span> <span>{{ t('data_source.relevant_content_found') }}</span>
</div> </div>
</div> </div>
</div> </div> -->
</el-form> </el-form>
<template #footer> <template #footer>
<el-button secondary @click="resetForm">{{ t('dataset.cancel') }} </el-button> <el-button secondary @click="resetForm">{{ t('dataset.cancel') }} </el-button>

2
sdk/common/src/main/java/io/gisbi/model/BusiNodeVO.java
View File

@ -20,6 +20,8 @@ public class BusiNodeVO implements TreeResultModel<BusiNodeVO>, Serializable {
@JsonSerialize(using = ToStringSerializer.class) @JsonSerialize(using = ToStringSerializer.class)
@Schema(description = "ID") @Schema(description = "ID")
private Long id; private Long id;
@Schema(description = "项目id")
private String appId;
@Schema(description = "名称") @Schema(description = "名称")
private String name; private String name;
@Schema(description = "是否叶子") @Schema(description = "是否叶子")