feat(fix):直连数据集限制预览数目;数据源文字替换

This commit is contained in:
junjie
2021-06-15 16:01:30 +08:00
parent 07f520698c
commit c084ac68cf
8 changed files with 39 additions and 22 deletions

View File

@@ -808,7 +808,7 @@ export default {
preview_show: 'Display',
preview_item: 'items data',
preview_total: 'Total',
pls_input_less_9: 'Please input integer less 9',
pls_input_less_5: 'Please input integer less 5',
field_edit: 'Edit Field',
table_already_add_to: 'This table is already add to',
uploading: 'Uploading...',

View File

@@ -808,7 +808,7 @@ export default {
preview_show: '顯示',
preview_item: '條數據',
preview_total: '共',
pls_input_less_9: '請輸入9位以內的正整數',
pls_input_less_5: '請輸入5位以內的正整數',
field_edit: '編輯字段',
table_already_add_to: '該表已添加至',
uploading: '上傳中...',

View File

@@ -808,7 +808,7 @@ export default {
preview_show: '显示',
preview_item: '条数据',
preview_total: '共',
pls_input_less_9: '请输入9位以内的正整数',
pls_input_less_5: '请输入5位以内的正整数',
field_edit: '编辑字段',
table_already_add_to: '该表已添加至',
uploading: '上传中...',

View File

@@ -6,7 +6,7 @@
<el-form-item>
<span style="width: 100px;">{{ $t('dataset.showRow') }}</span>
<el-input v-model="form.row">
<el-button size="mini" slot="append" icon="el-icon-search" @click="reSearch" />
<el-button slot="append" size="mini" icon="el-icon-search" @click="reSearch" />
</el-input>
</el-form-item>
</el-form>
@@ -36,7 +36,7 @@
</ux-table-column>
</ux-grid>
<el-row style="margin-top: 4px;">
<span class="table-count">
<span v-if="table.type === 'excel' || table.type === 'custom'" class="table-count">
<span v-if="page.total <= currentPage.show">
{{ $t('dataset.preview_total') }}
<span class="span-number">{{ page.total }}</span>
@@ -51,6 +51,11 @@
{{ $t('dataset.preview_item') }}
</span>
</span>
<span v-if="table.type === 'db' || table.type === 'sql'" class="table-count">
{{ $t('dataset.preview_show') }}
<span class="span-number">{{ page.total }}</span>
{{ $t('dataset.preview_item') }}
</span>
<el-pagination
:current-page="currentPage.page"
:page-sizes="[100]"
@@ -129,9 +134,9 @@ export default {
}, 10)
},
reSearch() {
if (!this.form.row || this.form.row === '' || this.form.row.length > 8 || isNaN(Number(this.form.row)) || String(this.form.row).includes('.')) {
if (!this.form.row || this.form.row === '' || this.form.row.length > 4 || isNaN(Number(this.form.row)) || String(this.form.row).includes('.')) {
this.$message({
message: this.$t('dataset.pls_input_less_9'),
message: this.$t('dataset.pls_input_less_5'),
type: 'error',
showClose: true
})

View File

@@ -13,7 +13,7 @@
<el-option
v-for="item in allTypes"
:key="item.name"
:label="item.name"
:label="item.label"
:value="item.name"
/>
</el-select>
@@ -65,7 +65,8 @@ export default {
'configuration.host': [{ required: true, message: this.$t('datasource.please_input_host'), trigger: 'change' }],
'configuration.port': [{ required: true, message: this.$t('datasource.please_input_port'), trigger: 'change' }]
},
allTypes: [{ name: 'mysql', type: 'jdbc' }, { name: 'sqlServer', type: 'jdbc' }]
allTypes: [{ name: 'mysql', label: 'MySQL', type: 'jdbc' },
{ name: 'sqlServer', label: 'SQL Server', type: 'jdbc' }]
}
},

View File

@@ -18,7 +18,12 @@
<!-- <el-table-column type="selection" fix /> -->
<el-table-column prop="name" :label="$t('commons.name')" />
<el-table-column prop="desc" :label="$t('commons.description')" />
<el-table-column prop="type" :label="$t('datasource.type')" />
<el-table-column prop="type" :label="$t('datasource.type')">
<template slot-scope="scope">
<span v-if="scope.row.type ==='mysql'">MySQL</span>
<span v-if="scope.row.type ==='sqlserver'">SQL Server</span>
</template>
</el-table-column>
<fu-table-operations :buttons="buttons" :label="$t('commons.operating')" fix />
</complex-table>