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

Merge pull request #4128 from dataease/pr@dev_memory_component

Browse Source 
Pr@dev memory component
This commit is contained in:
fit2cloudrd 2022-12-20 14:43:21 +08:00 committed by GitHub
commit 3626356bc2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
16 changed files with 82 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
frontend/src/components/canvas/components/editor/ComponentWrapper.vue
View File

@ -279,7 +279,7 @@ export default {
} else {
return {
...
getStyle(style, ['top', 'left', 'width', 'height', 'rotate']),
getStyle(style, ['top', 'left', 'width', 'height', 'rotate']),
position: 'relative'
}
}

3
frontend/src/components/canvas/customComponent/UserView.vue
View File

@ -350,7 +350,7 @@ export default {
},
computed: {
//首次加载且非编辑状态新复制的视图，使用外部filter
// 首次加载且非编辑状态新复制的视图，使用外部filter
initLoad() {
return !(this.isEdit && this.currentCanvasNewId.includes(this.element.id)) && this.isFirstLoad
},
@ -1269,7 +1269,6 @@ export default {
display: block !important;
}
.mobile-dialog-css ::v-deep .el-dialog__headerbtn {
top: 7px
}

5
frontend/src/components/deIconPicker/deIconGroupPicker/index.vue
View File

@ -217,7 +217,10 @@ export default {
return ''
}
},
options: {},
options: {
type: Object,
default: () => {}
},
width: {
type: Number,
default() {

5
frontend/src/components/deIconPicker/index.vue
View File

@ -180,7 +180,10 @@ export default {
return ''
}
},
options: {},
options: {
type: Object,
default: () => {}
},
width: {
type: Number,
default() {

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

@ -1924,6 +1924,7 @@ export default {
field_description: 'Field description',
table_description: 'Table description',
relational_database: 'Relational database',
data_warehouse_lake: 'Data Warehouse/Data Lake',
non_relational_database: 'Non relational database',
all: 'All',
other: 'other',

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

@ -1918,6 +1918,7 @@ export default {
field_description: '欄位描述',
table_description: '表描述',
relational_database: '關係型數據庫',
data_warehouse_lake: '數倉/數據湖',
non_relational_database: '非關係型數據庫',
all: '所有',
other: '其他',

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

@ -1917,6 +1917,7 @@ export default {
field_description: '字段描述',
table_description: '表描述',
relational_database: '关系型数据库',
data_warehouse_lake: '数仓/数据湖',
non_relational_database: '非关系型数据库',
all: '所有',
other: '其他',

17
frontend/src/views/background/BackgroundOverall.vue
View File

@ -36,7 +36,10 @@
:span="6"
style="padding-top: 5px"
>
<el-checkbox v-model="commonBackground.backgroundColorSelect" @change="themeChange('backgroundColorSelect')">
<el-checkbox
v-model="commonBackground.backgroundColorSelect"
@change="themeChange('backgroundColorSelect')"
>
{{
$t('chart.color')
}}
@ -75,9 +78,12 @@
:span="4"
style="padding-top: 5px"
>
<el-checkbox v-model="commonBackground.enable" @change="themeChange('enable')">{{
$t('panel.background')
}}
<el-checkbox
v-model="commonBackground.enable"
@change="themeChange('enable')"
>{{
$t('panel.background')
}}
</el-checkbox>
</el-col>
<el-col :span="20">
@ -113,7 +119,7 @@
:http-request="upload"
:file-list="fileList"
>
<i class="el-icon-plus"/>
<i class="el-icon-plus" />
</el-upload>
<el-dialog
top="25vh"
@ -189,6 +195,7 @@ import BackgroundItemOverall from '@/views/background/BackgroundItemOverall'
export default {
name: 'BackgroundOverall',
// eslint-disable-next-line
components: { BackgroundItemOverall, BackgroundItem },
props: {
position: {

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

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

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

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

2
frontend/src/views/panel/filter/filterMain/FilterControl.vue
View File

@ -279,7 +279,7 @@ export default {
},
datasetParams: {
type: Array,
default: []
default: () => []
}
},
data() {

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

@ -17,7 +17,7 @@
style="border-bottom: 1px solid;border-bottom-color:#E6E6E6;"
>
<div style="height: 100%;">
<share-head/>
<share-head />
</div>
</el-row>
<el-row
@ -76,7 +76,7 @@
width="400"
trigger="click"
>
<panel-detail-info/>
<panel-detail-info />
<i
slot="reference"
class="el-icon-warning-outline icon-class"
@ -489,7 +489,6 @@ export default {
} else {
return true
}
},
downLoadApp(appAttachInfo) {
this.downLoadToApp(appAttachInfo)

16
frontend/src/views/panel/subjectSetting/index.vue
View File

@ -3,7 +3,7 @@
<div class="theme-slider-main">
{{ $t('panel.dashboard_theme') }}
</div>
<div class="theme-slider-position"/>
<div class="theme-slider-position" />
<div>
<slider
v-if="sliderShow"
@ -25,38 +25,38 @@
name="panel"
>
<el-row class="selector-div">
<overall-setting/>
<overall-setting />
</el-row>
</el-collapse-item>
<el-collapse-item
:title="$t('panel.panel_background')"
name="panelBackground"
>
<background-selector/>
<background-selector />
</el-collapse-item>
<el-collapse-item
:title="$t('panel.view_style')"
name="componentStyle"
>
<background-overall></background-overall>
<background-overall />
</el-collapse-item>
<el-collapse-item
:title="$t('panel.view_color_setting')"
name="graphical"
>
<panel-color-selector @onColorChange="onColorChange"/>
<panel-color-selector @onColorChange="onColorChange" />
</el-collapse-item>
<el-collapse-item
:title="$t('panel.chart_title')"
name="table"
>
<view-title @onTextChange="onTextChange"/>
<view-title @onTextChange="onTextChange" />
</el-collapse-item>
<el-collapse-item
:title="$t('panel.filter_component')"
name="filterComponent"
>
<FilterStyleSelector/>
<FilterStyleSelector />
</el-collapse-item>
</el-collapse>
</div>
@ -81,8 +81,10 @@ import BackgroundOverall from '@/views/background/BackgroundOverall'
export default {
components: {
BackgroundOverall,
// eslint-disable-next-line
Background,
FilterStyleSelector,
// eslint-disable-next-line
ComponentStyle,
ViewTitle,
slider,

34
frontend/src/views/system/datasource/DsFormContent.vue
View File

@ -71,8 +71,8 @@
</el-form>
<div class="de-row-rules">
<span>{{
positionCheck('appMarket') ? $t('app_template.datasource_info') : $t('datasource.basic_info')
}}</span>
positionCheck('appMarket') ? $t('app_template.datasource_info') : $t('datasource.basic_info')
}}</span>
</div>
<el-form
ref="historyDsForm"
@ -805,16 +805,16 @@ export default {
},
saveAppMarketHistory() {
this.$refs.historyDsForm.validate(valid => {
if (!valid) {
return false
}
const appApplyForm = {
...this.attachForm,
...this.historyDsForm
}
const method = this.formType === 'add' ? appApply : appEdit
this.appApplyMethod(method, appApplyForm)
if (!valid) {
return false
}
const appApplyForm = {
...this.attachForm,
...this.historyDsForm
}
const method = this.formType === 'add' ? appApply : appEdit
this.appApplyMethod(method, appApplyForm)
}
)
},
save() {
@ -960,10 +960,10 @@ export default {
}
if (this.positionCheck('appMarket')) {
this.$refs.attachParamsForm.validate(valid => {
if (!valid) {
return false
}
if (!valid) {
return false
}
}
)
}
this.$refs.dsForm.validate((valid) => {
@ -1108,10 +1108,10 @@ export default {
}
if (this.positionCheck('appMarket')) {
this.$refs.attachParamsForm.validate(valid => {
if (!valid) {
return false
}
if (!valid) {
return false
}
}
)
}
this.$refs.dsForm.validate((valid) => {

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

@ -269,12 +269,16 @@
@tab-click="handleClick"
>
<el-tab-pane
:label="$t('datasource.relational_database')"
name="RDBMS"
label="OLTP"
name="OLTP"
/>
<el-tab-pane
:label="$t('datasource.non_relational_database')"
name="NORDBMS"
label="OLAP"
name="OLAP"
/>
<el-tab-pane
:label="$t('datasource.data_warehouse_lake')"
name="dataWarehouseLake"
/>
<el-tab-pane
:label="$t('datasource.other')"
@ -285,9 +289,9 @@
<template v-for="(list, idx) in databaseList">
<div
:key="nameMap[idx]"
:class="typeList[idx]"
:class="nameMap[idx]"
class="name"
>{{ $t(`datasource.${nameMap[idx]}`) }}</div>
>{{ nameClassMap[idx] }}</div>
<div
:key="nameMap[idx] + 'cont'"
class="item-container"
@ -346,14 +350,15 @@ export default {
},
data() {
return {
tabActive: 'RDBMS',
tabActive: 'OLTP',
databaseList: [],
currentNodeId: '',
dsTypeRelate: false,
expandedArray: [],
tData: [],
nameMap: ['relational_database', 'non_relational_database', 'other'],
typeList: ['RDBMS', 'NORDBMS', 'OTHER'],
nameMap: ['OLTP', 'OLAP', 'dataWarehouseLake', 'OTHER'],
nameClassMap: ['OLTP', 'OLAP', this.$t(`datasource.data_warehouse_lake`), this.$t(`datasource.other`)],
typeList: [['Db2', 'DM', 'KingBase', 'MariaDB', 'MongoDB', 'Mongodb-BI', 'MySQL', 'Oracle', 'PostgreSQL', 'SQL Server', 'TiDB'], ['Doris', 'Apache Impala', 'ClickHouse', 'Elasticsearch', 'Presto', 'StarRocks'], ['Apache Hive', 'Kylin', 'AWS Redshift', 'Maxcompute'], ['API']],
treeLoading: false,
dsTypes: [],
dsTypesForDriver: [],
@ -493,9 +498,9 @@ export default {
datasourceTypes() {
listDatasourceType().then((res) => {
this.dsTypes = res.data
const databaseList = [[], [], []]
const databaseList = [[], [], [], []]
this.dsTypes.forEach((item) => {
const index = this.typeList.findIndex(ele => ele === item.databaseClassification)
const index = this.typeList.findIndex(ele => ele.includes(item.name))
if (index !== -1) {
databaseList[index].push(item)
}

20
frontend/src/views/wizard/index.vue
View File

@ -30,12 +30,12 @@
/>
</el-row>
<el-row class="top_banner_card">
<wizard-card :details="cardList[0]"/>
<wizard-card :details="cardList[0]" />
<wizard-card
:details="cardList[1]"
style="margin:0 24px 0 24px"
/>
<wizard-card-enterprise :details="cardList[2]"/>
<wizard-card-enterprise :details="cardList[2]" />
</el-row>
<el-row class="content_middle">
<div class="content_middle_left">
@ -44,15 +44,15 @@
<div class="content_middle_more"><a
target="_blank"
href="https://space.bilibili.com/510493147/channel/collectiondetail?sid=262774"
>{{ $t('wizard.more') }}<i class="el-icon-arrow-right"/></a></div>
>{{ $t('wizard.more') }}<i class="el-icon-arrow-right" /></a></div>
</el-row>
<el-row style="margin-top: 12px">
<video-card :details="videoList[0]"/>
<video-card :details="videoList[0]" />
<video-card
style="margin:0 12px 0 12px"
:details="videoList[1]"
/>
<video-card :details="videoList[2]"/>
<video-card :details="videoList[2]" />
</el-row>
</div>
<div class="content_middle_right">
@ -61,7 +61,7 @@
<div class="content_middle_more"><a
target="_blank"
href="https://blog.fit2cloud.com/?cat=321"
>{{ $t('wizard.more') }}<i class="el-icon-arrow-right"/></a></div>
>{{ $t('wizard.more') }}<i class="el-icon-arrow-right" /></a></div>
</el-row>
<el-row>
<ul class="ul-custom">
@ -93,10 +93,10 @@
</el-row>
<el-row class="contact_content">
{{ $t('wizard.web') }}<a
style="text-decoration:underline;"
target="_blank"
href="https://www.dataease.io"
>www.dataease.io</a>
style="text-decoration:underline;"
target="_blank"
href="https://www.dataease.io"
>www.dataease.io</a>
</el-row>
</div>