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

Merge remote-tracking branch 'origin/main' into main

Browse Source
This commit is contained in:
fit2cloud-chenyw 2021-03-16 16:35:33 +08:00
commit f775dc8c87
6 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -670,7 +670,8 @@ export default {
input_content: '请输入内容',
add_sql_table: '添加SQL',
preview: '预览',
pls_input_name: '请输入名称'
pls_input_name: '请输入名称',
connect_mode: '连接模式'
},
datasource: {
create: '新建数据连接',

2
frontend/src/views/chart/components/DimensionItem.vue
View File

@ -1,6 +1,6 @@
<template>
<span>
<el-dropdown trigger="click" size="small">
<el-dropdown trigger="click" size="mini">
<span class="el-dropdown-link">
<el-tag size="small" class="item-axis">
{{ item.name }}<i class="el-icon-arrow-down el-icon--right" />

8
frontend/src/views/chart/components/QuotaItem.vue
View File

@ -1,13 +1,13 @@
<template>
<span>
<el-dropdown trigger="click" size="small" @command="clickItem">
<el-dropdown trigger="click" size="mini" @command="clickItem">
<span class="el-dropdown-link">
<el-tag size="small" class="item-axis">
{{ item.name }}<span v-if="item.summary" class="summary-span">{{ $t('chart.'+item.summary) }}</span><i class="el-icon-arrow-down el-icon--right" />
</el-tag>
<el-dropdown-menu slot="dropdown">
<el-dropdown-item icon="el-icon-notebook-2">
<el-dropdown placement="right-start" size="small" @command="summary">
<el-dropdown placement="right-start" size="mini" @command="summary">
<span class="el-dropdown-link">
{{ $t('chart.summary') }}<span class="summary-span">({{ $t('chart.'+item.summary) }})</span><i class="el-icon-arrow-right el-icon--right" />
</span>
@ -22,7 +22,7 @@
</el-dropdown>
</el-dropdown-item>
<el-dropdown-item icon="el-icon-s-grid">
<el-dropdown placement="right-start" size="small" @command="quickCalc">
<el-dropdown placement="right-start" size="mini" @command="quickCalc">
<span class="el-dropdown-link">
{{ $t('chart.quick_calc') }}<span class="summary-span">(test)</span><i class="el-icon-arrow-right el-icon--right" />
</span>
@ -41,7 +41,7 @@
<el-dialog :title="$t('chart.show_name_set')" :visible="renameItem" :show-close="false" width="30%">
<el-form ref="itemForm" :model="itemForm" :rules="itemFormRules">
<el-form-item :label="$t('commons.name')" prop="name">
<el-input v-model="itemForm.name" />
<el-input v-model="itemForm.name" size="mini"/>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">

2
frontend/src/views/chart/view/ChartEdit.vue
View File

@ -79,8 +79,8 @@
<el-row>
<div class="chart-type">
<!--TODO 这里要替换好看点的图标-->
<el-radio v-model="view.type" label="bar"><i class="el-icon-platform-eleme" style="font-size: 20px"/></el-radio>
<el-radio v-model="view.type" label="line">折线图</el-radio>
<el-radio v-model="view.type" label="bar">柱状图</el-radio>
</div>
</el-row>
</div>

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

@ -28,8 +28,10 @@
</el-select>
</el-form-item>
<el-form-item class="form-item">
<el-radio v-model="mode" label="0">{{ $t('dataset.direct_connect') }}</el-radio>
<el-radio v-model="mode" label="1">{{ $t('dataset.sync_data') }}</el-radio>
<el-select v-model="mode" filterable :placeholder="$t('dataset.connect_mode')" size="mini">
<el-option :label="$t('dataset.direct_connect')" value="0" />
<el-option :label="$t('dataset.sync_data')" value="1" />
</el-select>
</el-form-item>
<el-form-item class="form-item" style="float: right;">
<el-input

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

@ -31,8 +31,10 @@
<el-input v-model="name" size="mini" :placeholder="$t('commons.name')" />
</el-form-item>
<el-form-item class="form-item">
<el-radio v-model="mode" label="0">{{ $t('dataset.direct_connect') }}</el-radio>
<el-radio v-model="mode" label="1">{{ $t('dataset.sync_data') }}</el-radio>
<el-select v-model="mode" filterable :placeholder="$t('dataset.connect_mode')" size="mini">
<el-option :label="$t('dataset.direct_connect')" value="0" />
<el-option :label="$t('dataset.sync_data')" value="1" />
</el-select>
</el-form-item>
</el-form>
</el-row>