提交 38838e31 authored 作者: junjie's avatar junjie

refactor: 去掉多余请求;数据集tree修复

上级 a48ee015
...@@ -257,13 +257,13 @@ ...@@ -257,13 +257,13 @@
<!--添加视图-选择数据集--> <!--添加视图-选择数据集-->
<el-dialog <el-dialog
v-if="selectTableFlag"
v-dialogDrag v-dialogDrag
:title="$t('chart.add_chart')" :title="$t('chart.add_chart')"
:visible="selectTableFlag" :visible="selectTableFlag"
:show-close="false" :show-close="false"
width="70%" width="70%"
class="dialog-css" class="dialog-css"
:destroy-on-close="true"
> >
<el-row style="width: 800px;"> <el-row style="width: 800px;">
<el-form ref="form" :model="table" label-width="80px" size="mini" class="form-item"> <el-form ref="form" :model="table" label-width="80px" size="mini" class="form-item">
......
...@@ -398,13 +398,13 @@ ...@@ -398,13 +398,13 @@
<!--视图更换数据集--> <!--视图更换数据集-->
<el-dialog <el-dialog
v-if="selectTableFlag"
v-dialogDrag v-dialogDrag
:title="changeDsTitle" :title="changeDsTitle"
:visible="selectTableFlag" :visible="selectTableFlag"
:show-close="false" :show-close="false"
width="70%" width="70%"
class="dialog-css" class="dialog-css"
:destroy-on-close="true"
> >
<table-selector @getTable="getTable" /> <table-selector @getTable="getTable" />
<p style="margin-top: 10px;color:#F56C6C;font-size: 12px;">{{ $t('chart.change_ds_tip') }}</p> <p style="margin-top: 10px;color:#F56C6C;font-size: 12px;">{{ $t('chart.change_ds_tip') }}</p>
...@@ -416,11 +416,11 @@ ...@@ -416,11 +416,11 @@
<!--编辑视图使用的数据集的字段--> <!--编辑视图使用的数据集的字段-->
<el-dialog <el-dialog
v-if="editDsField"
v-dialogDrag v-dialogDrag
:visible="editDsField" :visible="editDsField"
:show-close="false" :show-close="false"
class="dialog-css" class="dialog-css"
:destroy-on-close="true"
:fullscreen="true" :fullscreen="true"
> >
<field-edit :param="{table:table}" @switchComponent="closeEditDsField" /> <field-edit :param="{table:table}" @switchComponent="closeEditDsField" />
......
...@@ -68,7 +68,6 @@ ...@@ -68,7 +68,6 @@
<script> <script>
import { isKettleRunning, post } from '@/api/dataset/dataset' import { isKettleRunning, post } from '@/api/dataset/dataset'
import { authModel } from '@/api/system/sysAuth'
import { hasDataPermission } from '@/utils/permission' import { hasDataPermission } from '@/utils/permission'
export default { export default {
...@@ -403,11 +402,14 @@ export default { ...@@ -403,11 +402,14 @@ export default {
searchTree(val) { searchTree(val) {
const queryCondition = { const queryCondition = {
withExtend: 'parent', // withExtend: 'parent',
modelType: 'dataset', // modelType: 'dataset',
name: val name: val
} }
authModel(queryCondition).then(res => { // authModel(queryCondition).then(res => {
// this.data = this.buildTree(res.data)
// })
post('/dataset/table/search', queryCondition).then(res => {
this.data = this.buildTree(res.data) this.data = this.buildTree(res.data)
}) })
}, },
...@@ -420,8 +422,8 @@ export default { ...@@ -420,8 +422,8 @@ export default {
const roots = [] const roots = []
arrs.forEach(el => { arrs.forEach(el => {
// 判断根节点 ### // 判断根节点 ###
el.type = el.modelInnerType // el.type = el.modelInnerType
el.isLeaf = el.leaf // el.isLeaf = el.leaf
if (el[this.treeProps.parentId] === null || el[this.treeProps.parentId] === 0 || el[this.treeProps.parentId] === '0') { if (el[this.treeProps.parentId] === null || el[this.treeProps.parentId] === 0 || el[this.treeProps.parentId] === '0') {
roots.push(el) roots.push(el)
return return
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论