大屏和看板数据集接口添加appid
This commit is contained in:
parent
8abdad3470
commit
253396af78
@ -15,6 +15,8 @@ import { useCache } from '@/hooks/web/useCache'
|
||||
import { useUserStoreWithOut } from '@/store/modules/user'
|
||||
import { dvMainStoreWithOut } from '@/store/modules/data-visualization/dvMain'
|
||||
import treeSort from '@/utils/treeSortUtils'
|
||||
import router from '@/router'
|
||||
|
||||
|
||||
const dvMainStore = dvMainStoreWithOut()
|
||||
const { wsCache } = useCache('localStorage')
|
||||
@ -67,8 +69,9 @@ const sortTypeChange = arr => {
|
||||
|
||||
const initDataset = () => {
|
||||
loadingDatasetTree.value = true
|
||||
const appId:any = router.currentRoute.value.query.appId
|
||||
const method = props.sourceType === 'datasource' ? getDatasourceList : getDatasetTree
|
||||
const params = props.sourceType === 'datasource' ? null : {}
|
||||
const params:any = props.sourceType === 'datasource' ? null : {appId:appId}
|
||||
method(params)
|
||||
.then(res => {
|
||||
sortTypeChange((res as unknown as Tree[]) || [])
|
||||
@ -370,13 +373,13 @@ onMounted(() => {
|
||||
</el-tree>
|
||||
</el-scrollbar>
|
||||
</el-main>
|
||||
<el-footer v-if="!isDataEaseBi">
|
||||
<!-- <el-footer v-if="!isDataEaseBi">
|
||||
<div class="footer-container">
|
||||
<el-button type="primary" :icon="Plus" link class="add-btn" @click="addDataset">
|
||||
{{ newSource }}
|
||||
</el-button>
|
||||
</div>
|
||||
</el-footer>
|
||||
</el-footer> -->
|
||||
</el-container>
|
||||
</template>
|
||||
</el-popover>
|
||||
|
||||
@ -76,7 +76,11 @@ const state = reactive({
|
||||
})
|
||||
|
||||
const initDataset = () => {
|
||||
getDatasetTree({}).then(res => {
|
||||
if(router.currentRoute.value.query ==null){
|
||||
return
|
||||
}
|
||||
const appId:any = router.currentRoute.value.query.appId
|
||||
getDatasetTree({appId:appId}).then(res => {
|
||||
state.datasetTree = (res as unknown as Tree[]) || []
|
||||
})
|
||||
}
|
||||
|
||||
@ -125,9 +125,9 @@ function moreClic(event:any ,data:any){ // 更多操作
|
||||
function editClic(data:any){
|
||||
console.log(data)
|
||||
if(data.type == '03'){
|
||||
window.open('/#/dvsCanvas?dvId=' +data.id, '_blank');
|
||||
window.open('/#/dvsCanvas?dvId=' +data.id+'&appId='+projectInfo.value.id , '_blank');
|
||||
}else if(data.type == '0301'){
|
||||
window.open('/#/dashboard?resourceId=' + data.id, '_blank');
|
||||
window.open('/#/dashboard?resourceId=' + data.id+'&appId='+projectInfo.value.id, '_blank');
|
||||
}else if(data.type == '09'){
|
||||
window.open('/#/formcreatedesigner?moduleId=' +data.id, '_blank');
|
||||
}
|
||||
|
||||
@ -1,31 +1,3 @@
|
||||
<!-- <template>
|
||||
<form-create
|
||||
v-model="formData"
|
||||
v-model:api="fapi"
|
||||
:rule="rule"
|
||||
:option="option"
|
||||
|
||||
></form-create>
|
||||
</template>
|
||||
|
||||
<script lang="ts" setup>
|
||||
import {ref} from "vue";
|
||||
import formCreate from "@form-create/element-ui";
|
||||
const option:any = ref(formCreate.parseJson('{"form":{"inline":false,"hideRequiredAsterisk":false,"labelPosition":"right","size":"default","labelWidth":"125px"},"resetBtn":{"show":false,"innerText":"重置"}}'));
|
||||
const rule:any = ref(formCreate.parseJson('[{"type":"input","field":"F2ltmakoaiycabc","title":"输入框","info":"","$required":false,"_fc_id":"id_Fix0makoaiycacc","name":"ref_Fa1zmakoaiycadc","display":true,"hidden":false,"_fc_drag_tag":"input"},{"type":"input","field":"Fonpmakoajgpaec","title":"多行输入框","info":"","$required":false,"props":{"type":"textarea"},"_fc_id":"id_F0pdmakoajgpafc","name":"ref_Fiw6makoajgpagc","display":true,"hidden":false,"_fc_drag_tag":"textarea"},{"type":"input","field":"Ffgzmakoajsiahc","title":"密码输入框","info":"","$required":false,"props":{"type":"password"},"_fc_id":"id_Fjnnmakoajsiaic","name":"ref_Fvhsmakoajsiajc","display":true,"hidden":false,"_fc_drag_tag":"password"},{"type":"inputNumber","field":"Fl02makoak81akc","title":"计数器","info":"","$required":false,"_fc_id":"id_F37amakoak81alc","name":"ref_Fpnemakoak81amc","display":true,"hidden":false,"_fc_drag_tag":"inputNumber"},{"type":"radio","field":"Fgbrmakoakhdanc","title":"单选框","info":"","effect":{"fetch":""},"$required":false,"options":[{"label":"选项01","value":"1"},{"label":"选项02","value":"2"},{"label":"选项03","value":"3"}],"_fc_id":"id_Fldlmakoakheaoc","name":"ref_F7w6makoakheapc","display":true,"hidden":false,"_fc_drag_tag":"radio"},{"type":"checkbox","field":"Fkn9makoakx6aqc","title":"多选框","info":"","effect":{"fetch":""},"$required":false,"options":[{"label":"选项01","value":"1"},{"label":"选项02","value":"2"},{"label":"选项03","value":"3"}],"_fc_id":"id_F2zgmakoakx6arc","name":"ref_Fspwmakoakx6asc","display":true,"hidden":false,"_fc_drag_tag":"checkbox"},{"type":"select","field":"Fgpmmakoalchatc","title":"选择器","info":"","effect":{"fetch":""},"$required":false,"options":[{"label":"选项01","value":"1"},{"label":"选项02","value":"2"},{"label":"选项03","value":"3"}],"_fc_id":"id_Fsfimakoalchauc","name":"ref_F6pgmakoalchavc","display":true,"hidden":false,"_fc_drag_tag":"select"},{"type":"switch","field":"Fh6dmakoaln0awc","title":"开关","info":"","$required":false,"props":{"activeValue":true,"inactiveValue":false},"_fc_id":"id_Fszlmakoaln0axc","name":"ref_Fzbpmakoaln0ayc","display":true,"hidden":false,"_fc_drag_tag":"switch"},{"type":"rate","field":"Fzg8makoalw9azc","title":"评分","info":"","$required":false,"_fc_id":"id_Fv5imakoalw9b0c","name":"ref_Fir6makoalw9b1c","display":true,"hidden":false,"_fc_drag_tag":"rate","value":0}]'));
|
||||
const fapi = ref(null);
|
||||
const formData = ref({});
|
||||
|
||||
const onSubmit = (formData:any) => {
|
||||
//todo 提交表单
|
||||
console.log(formData);
|
||||
|
||||
|
||||
}
|
||||
</script> -->
|
||||
|
||||
|
||||
|
||||
<template>
|
||||
<form-create
|
||||
v-model="formData"
|
||||
@ -41,8 +13,8 @@ import {onMounted,ref,watch} from "vue";
|
||||
import formCreate from "@form-create/element-ui";
|
||||
import { moduleById } from '@/api/application/module'
|
||||
|
||||
// const option:any = ref(formCreate.parseJson('{"form":{"inline":false,"hideRequiredAsterisk":false,"labelPosition":"right","size":"default","labelWidth":"125px"},"resetBtn":{"show":false,"innerText":"重置"}}'));
|
||||
// const rule:any = ref(formCreate.parseJson('[{"type":"input","field":"F2ltmakoaiycabc","title":"输入框","info":"","$required":false,"_fc_id":"id_Fix0makoaiycacc","name":"ref_Fa1zmakoaiycadc","display":true,"hidden":false,"_fc_drag_tag":"input"},{"type":"input","field":"Fonpmakoajgpaec","title":"多行输入框","info":"","$required":false,"props":{"type":"textarea"},"_fc_id":"id_F0pdmakoajgpafc","name":"ref_Fiw6makoajgpagc","display":true,"hidden":false,"_fc_drag_tag":"textarea"},{"type":"input","field":"Ffgzmakoajsiahc","title":"密码输入框","info":"","$required":false,"props":{"type":"password"},"_fc_id":"id_Fjnnmakoajsiaic","name":"ref_Fvhsmakoajsiajc","display":true,"hidden":false,"_fc_drag_tag":"password"},{"type":"inputNumber","field":"Fl02makoak81akc","title":"计数器","info":"","$required":false,"_fc_id":"id_F37amakoak81alc","name":"ref_Fpnemakoak81amc","display":true,"hidden":false,"_fc_drag_tag":"inputNumber"},{"type":"radio","field":"Fgbrmakoakhdanc","title":"单选框","info":"","effect":{"fetch":""},"$required":false,"options":[{"label":"选项01","value":"1"},{"label":"选项02","value":"2"},{"label":"选项03","value":"3"}],"_fc_id":"id_Fldlmakoakheaoc","name":"ref_F7w6makoakheapc","display":true,"hidden":false,"_fc_drag_tag":"radio"},{"type":"checkbox","field":"Fkn9makoakx6aqc","title":"多选框","info":"","effect":{"fetch":""},"$required":false,"options":[{"label":"选项01","value":"1"},{"label":"选项02","value":"2"},{"label":"选项03","value":"3"}],"_fc_id":"id_F2zgmakoakx6arc","name":"ref_Fspwmakoakx6asc","display":true,"hidden":false,"_fc_drag_tag":"checkbox"},{"type":"select","field":"Fgpmmakoalchatc","title":"选择器","info":"","effect":{"fetch":""},"$required":false,"options":[{"label":"选项01","value":"1"},{"label":"选项02","value":"2"},{"label":"选项03","value":"3"}],"_fc_id":"id_Fsfimakoalchauc","name":"ref_F6pgmakoalchavc","display":true,"hidden":false,"_fc_drag_tag":"select"},{"type":"switch","field":"Fh6dmakoaln0awc","title":"开关","info":"","$required":false,"props":{"activeValue":true,"inactiveValue":false},"_fc_id":"id_Fszlmakoaln0axc","name":"ref_Fzbpmakoaln0ayc","display":true,"hidden":false,"_fc_drag_tag":"switch"},{"type":"rate","field":"Fzg8makoalw9azc","title":"评分","info":"","$required":false,"_fc_id":"id_Fv5imakoalw9b0c","name":"ref_Fir6makoalw9b1c","display":true,"hidden":false,"_fc_drag_tag":"rate","value":0}]'));
|
||||
|
||||
|
||||
const moduleInfo:any = ref({})
|
||||
const props:any = defineProps({
|
||||
moduleInfo: {
|
||||
@ -50,6 +22,10 @@ const props:any = defineProps({
|
||||
default: ''
|
||||
}
|
||||
})
|
||||
watch(() => props.moduleInfo, val => { // 初始化数据
|
||||
moduleInfo.value = val
|
||||
getInit()
|
||||
})
|
||||
const option :any = ref({});
|
||||
const rule :any = ref([]);
|
||||
const fapi = ref(null);
|
||||
|
||||
Loading…
Reference in New Issue
Block a user