Merge pull request #3853 from dataease/pr@dev@fix_new-tab

fix: 修复浏览器复制新的窗口可能出现仪表板列表无法显示的问题
This commit is contained in:
Junjun 2022-11-24 16:41:57 +08:00 committed by GitHub
commit 4f9f0fb12e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -174,7 +174,7 @@
/> />
</span> </span>
<span v-if="data.nodeType === 'folder'"> <span v-if="data.nodeType === 'folder'">
<svg-icon icon-class="scene" /> <svg-icon icon-class="scene"/>
</span> </span>
<span <span
:class="data.status" :class="data.status"
@ -211,7 +211,7 @@
<el-dropdown-item <el-dropdown-item
:command="beforeClickEdit('folder', 'new', data, node)" :command="beforeClickEdit('folder', 'new', data, node)"
> >
<svg-icon icon-class="scene" /> <svg-icon icon-class="scene"/>
<span style="margin-left: 5px">{{ $t('panel.groupAdd') }}</span> <span style="margin-left: 5px">{{ $t('panel.groupAdd') }}</span>
</el-dropdown-item> </el-dropdown-item>
<el-dropdown-item <el-dropdown-item
@ -334,7 +334,7 @@
:label="$t('commons.name')" :label="$t('commons.name')"
prop="name" prop="name"
> >
<el-input v-model="groupForm.name" /> <el-input v-model="groupForm.name"/>
</el-form-item> </el-form-item>
</el-form> </el-form>
<div <div
@ -345,8 +345,8 @@
size="mini" size="mini"
@click="close()" @click="close()"
>{{ >{{
$t('panel.cancel') $t('panel.cancel')
}} }}
</el-button> </el-button>
<el-button <el-button
type="primary" type="primary"
@ -422,8 +422,8 @@
size="mini" size="mini"
@click="closeMoveGroup()" @click="closeMoveGroup()"
>{{ >{{
$t('dataset.cancel') $t('dataset.cancel')
}} }}
</el-button> </el-button>
<el-button <el-button
:disabled="groupMoveConfirmDisabled" :disabled="groupMoveConfirmDisabled"
@ -926,7 +926,7 @@ export default {
if (userCache) { if (userCache) {
this.defaultData = JSON.parse(modelInfo) this.defaultData = JSON.parse(modelInfo)
if (showFirst && this.defaultData.length > 0) { if (showFirst && this.defaultData && this.defaultData.length > 0) {
this.activeDefaultNodeAndClickOnly(this.defaultData[0].id) this.activeDefaultNodeAndClickOnly(this.defaultData[0].id)
} }
} }
@ -935,7 +935,7 @@ export default {
localStorage.setItem('panel-default-tree', JSON.stringify(res.data)) localStorage.setItem('panel-default-tree', JSON.stringify(res.data))
if (!userCache) { if (!userCache) {
this.defaultData = res.data this.defaultData = res.data
if (showFirst && this.defaultData.length > 0) { if (showFirst && this.defaultData && this.defaultData.length > 0) {
this.activeDefaultNodeAndClickOnly(this.defaultData[0].id) this.activeDefaultNodeAndClickOnly(this.defaultData[0].id)
} }
} }