public/dataease
1
0
Fork 0
mirror of https://github.com/dataease/dataease.git synced 2026-05-19 10:18:11 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat: 定时检测数据源状态信息

Browse Source
This commit is contained in:
taojinlong
2021-08-16 12:46:34 +08:00
parent 6b1abd07f8
commit 4c8e061e1d
12 changed files with 229 additions and 126 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
frontend/src/components/dataease/DeAsideContainer.vue
View File

@@ -4,10 +4,6 @@
class="ms-aside-container"
:style="{'margin-left': !asideHidden ? 0 : '-' + width}"
>
<!--<div v-if="enableAsideHidden" class="hiddenBottom" @click="asideHidden = !asideHidden">-->
<!--<i v-if="!asideHidden" class="el-icon-arrow-left"/>-->
<!--<i v-if="asideHidden" class="el-icon-arrow-right"/>-->
<!--</div>-->
<slot />
<de-horizontal-drag-bar v-if="showDragBar" />
</el-aside>

3
frontend/src/lang/en.js
View File

@@ -1043,7 +1043,8 @@ export default {
oracle_service_name: 'Service Name',
get_schema: 'Get Schema',
schema: 'Database Schema',
please_choose_schema: 'Please select Schema'
please_choose_schema: 'Please select Schema',
in_valid: 'Invalid datasource'
},
pblink: {
key_pwd: 'Please enter the password to open the link',

3
frontend/src/lang/tw.js
View File

@@ -1043,7 +1043,8 @@ export default {
oracle_service_name: '服務名',
get_schema: '獲取 Schema',
schema: '數據庫 Schema',
please_choose_schema: '請選擇數據庫 Schema'
please_choose_schema: '請選擇數據庫 Schema',
in_valid: '無效數據源'
},
pblink: {
key_pwd: '請輸入密碼打開鏈接',

3
frontend/src/lang/zh.js
View File

@@ -1045,7 +1045,8 @@ export default {
get_schema: '获取 Schema',
schema: '数据库 Schema',
please_choose_schema: '请选择数据库 Schema',
edit_datasource_msg: '修改数据源信息，可能会导致改数据源下的数据集不可用，确认修改？'
edit_datasource_msg: '修改数据源信息，可能会导致改数据源下的数据集不可用，确认修改？',
in_valid: '无效数据源'
},
pblink: {
key_pwd: '请输入密码打开链接',

31
frontend/src/views/system/datasource/DsTree.vue
View File

@@ -37,13 +37,22 @@
>
<span slot-scope="{ node, data }" class="custom-tree-node-list father">
<span style="display: flex;flex: 1;width: 0;">
<span v-if="data.type !== 'folder'">
<span v-if="data.type !== 'folder' && data.status !== 'Error'">
<svg-icon icon-class="datasource" class="ds-icon-scene" />
</span>
<span v-if="data.status === 'Error'">
<svg-icon icon-class="exclamationmark" class="ds-icon-scene" />
<el-tooltip v-if="data.status === 'Error'" style="margin-left: 6px;white-space:nowrap;overflow:hidden;text-overflow:ellipsis;" effect="dark" :content="$t('datasource.in_valid')" placement="right">
<el-button type="text" > {{ data.name }} </el-button>
</el-tooltip>
</span>
<span v-if="data.type === 'folder'">
<i class="el-icon-folder" />
</span>
<span style="margin-left: 6px;white-space:nowrap;overflow:hidden;text-overflow:ellipsis;">{{ data.name }}</span>
<span v-if=" data.status !== 'Error'" style="margin-left: 6px;white-space:nowrap;overflow:hidden;text-overflow:ellipsis;">
{{ data.name }}
</span>
</span>
<span class="child">
<span v-if="data.type ==='folder'" @click.stop>
@@ -67,24 +76,6 @@
@click="_handleDelete(data)"
/>
</span>
<!-- <el-dropdown trigger="click" size="small" @command="clickFileMore">
<span class="el-dropdown-link">
<el-button
icon="el-icon-more"
type="text"
size="small"
/>
</span>
<el-dropdown-menu slot="dropdown">
<el-dropdown-item icon="el-icon-edit" :command="beforeClickFile('edit',data,node)">
{{ $t('panel.edit') }}
</el-dropdown-item>
<el-dropdown-item icon="el-icon-delete" :command="beforeClickFile('delete',data,node)">
{{ $t('panel.delete') }}
</el-dropdown-item>
</el-dropdown-menu>
</el-dropdown> -->
</span>
</span>
</span>