center/dataease-dm
center/dataease-dm
13
0
Fork 0
forked from github/dataease
Code Pull Requests Activity

Merge pull request #4099 from dataease/pr@dev_memory_component

Browse Source 
Pr@dev memory component
This commit is contained in:
xuwei-fit2cloud 2022-12-15 17:05:01 +08:00 committed by GitHub
commit 8451ae8cbe
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 85 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
frontend/src/components/deDrag/index.vue
View File

@ -73,10 +73,22 @@
:style="mainSlotStyleInner"
class="main-background"
>
<div @mousedown="elementMouseDown" class="de-drag-area de-drag-top"></div>
<div @mousedown="elementMouseDown" class="de-drag-area de-drag-right"></div>
<div @mousedown="elementMouseDown" class="de-drag-area de-drag-bottom"></div>
<div @mousedown="elementMouseDown" class="de-drag-area de-drag-left"></div>
<div
class="de-drag-area de-drag-top"
@mousedown="elementMouseDown"
/>
<div
class="de-drag-area de-drag-right"
@mousedown="elementMouseDown"
/>
<div
class="de-drag-area de-drag-bottom"
@mousedown="elementMouseDown"
/>
<div
class="de-drag-area de-drag-left"
@mousedown="elementMouseDown"
/>
<svg-icon
v-if="svgInnerEnable"
:style="{'color':element.commonBackground.innerImageColor}"

1
frontend/src/views/dataset/add/AddDB.vue
View File

@ -129,6 +129,7 @@
<el-option
:label="$t('dataset.sync_data')"
value="1"
v-if="engineMode !== 'simple'"
:disabled="disabledSync"
/>
</el-select>

1
frontend/src/views/dataset/add/AddSQL.vue
View File

@ -50,6 +50,7 @@
>
<el-option
:label="$t('dataset.sync_now')"
v-if="engineMode !== 'simple'"
value="sync_now"
:disabled="engineMode === 'simple'"
/>

72
frontend/src/views/panel/list/PanelViewShow.vue
View File

@ -31,7 +31,7 @@
:span="12"
style="text-overflow:ellipsis;overflow: hidden;white-space: nowrap;font-size: 14px"
>
<span>{{ panelInfo.name || '测试仪表板' }}</span>
<span class="panel-name">{{ panelInfo.name || '测试仪表板' }}</span>
<span
v-if="panelInfo.isDefault"
style="color: green;font-size: 12px"
@ -40,6 +40,37 @@
v-if="panelInfo.sourcePanelName"
style="color: green;font-size: 12px"
>&nbsp;({{ $t('panel.source_panel_name') }}:{{ panelInfo.sourcePanelName }})</span>
<span
v-if="!hasStar && panelInfo && showType !== 1&&panelInfo.status==='publish'"
style="margin-left: 9px"
>
<el-tooltip :content="$t('panel.store')">
<i
class="el-icon-star-off"
@click="star"
/>
</el-tooltip>
</span>
<span
v-if="hasStar && panelInfo && showType !== 1&&panelInfo.status==='publish'"
style="margin-left: 9px"
>
<el-tooltip :content="$t('commons.cancel') + $t('panel.store')">
<i
class="el-icon-star-on"
@click="unstar"
/>
</el-tooltip>
</span>
<template v-if="panelInfo.creatorName">
<el-divider
style="margin: 0 16px;"
direction="vertical"
/>
<span class="panel-create">
{{ $t('panel.create_by') + ':' + panelInfo.creatorName }}
</span>
</template>
<el-popover
placement="right-start"
width="400"
@ -48,7 +79,7 @@
<panel-detail-info />
<i
slot="reference"
class="el-icon-warning icon-class"
class="el-icon-warning-outline icon-class"
style="margin-left: 4px;cursor: pointer;font-size: 14px;"
/>
</el-popover>
@ -119,22 +150,6 @@
{{ $t('panel.new_tab_preview') }}
</el-dropdown-item>
<el-dropdown-item
v-if="!hasStar && panelInfo && showType !== 1&&panelInfo.status==='publish'"
icon="el-icon-star-off"
@click.native="star"
>
{{ $t('panel.store') }}
</el-dropdown-item>
<el-dropdown-item
v-if="hasStar && panelInfo && showType !== 1&&panelInfo.status==='publish'"
icon="el-icon-star-on"
@click.native="unstar"
>
{{ $t('commons.cancel') + $t('panel.store') }}
</el-dropdown-item>
<el-dropdown-item
v-if="hasStar && panelInfo && showType !== 1&&panelInfo.status==='publish'"
icon="el-icon-refresh"
@ -374,9 +389,9 @@ import GrantAuth from '../grantAuth'
import msgCfm from '@/components/msgCfm/index'
export default {
mixins: [msgCfm],
name: 'PanelViewShow',
components: { AppExportForm, PanelDetailInfo, Preview, SaveToTemplate, PDFPreExport, ShareHead, GrantAuth },
mixins: [msgCfm],
props: {
activeTab: {
type: String,
@ -770,7 +785,7 @@ export default {
}
</script>
<style>
<style lang="less">
.view-list {
height: 100%;
width: 20%;
@ -804,6 +819,23 @@ export default {
background-color: var(--SiderBG, white);
padding: 0 10px;
line-height: 40px;
.panel-name {
font-family: PingFang SC;
font-size: 16px;
font-weight: 500;
line-height: 24px;
color: var(--deTextPrimary, #1F2329);
}
.panel-create {
font-family: PingFang SC;
font-size: 14px;
font-weight: 400;
line-height: 22px;
color: var(--deTextSecondary, #646A73);
}
}
.panel-share-head {