wuguolin
/
smartbi2
1
0
Fork 1
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
dev
zhenghuang 4 years ago
parent 409cd06063 ed25619f8f
commit 13df46f83b
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File

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

@ -29,7 +29,7 @@
<el-form-item class="form-item"> <el-form-item class="form-item">
<el-select v-model="mode" filterable :placeholder="$t('dataset.connect_mode')" size="mini"> <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.direct_connect')" value="0" />
<el-option :label="$t('dataset.sync_data')" value="1" :disabled="!kettleRunning || selectedDatasource.type==='es' || selectedDatasource.type==='ck'" /> <!-- <el-option :label="$t('dataset.sync_data')" value="1" :disabled="!kettleRunning || selectedDatasource.type==='es' || selectedDatasource.type==='ck'" /> -->
</el-select> </el-select>
</el-form-item> </el-form-item>

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

@ -33,7 +33,7 @@
<el-form-item v-if="!param.tableId" class="form-item"> <el-form-item v-if="!param.tableId" class="form-item">
<el-select v-model="mode" filterable :placeholder="$t('dataset.connect_mode')" size="mini"> <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.direct_connect')" value="0" />
<el-option :label="$t('dataset.sync_data')" value="1" :disabled="!kettleRunning || selectedDatasource.type==='es' || selectedDatasource.type==='ck'" /> <!-- <el-option :label="$t('dataset.sync_data')" value="1" :disabled="!kettleRunning || selectedDatasource.type==='es' || selectedDatasource.type==='ck'" /> -->
</el-select> </el-select>
</el-form-item> </el-form-item>

4
frontend/src/views/dataset/common/DatasetChartDetail.vue
Unescape Escape View File

@ -37,7 +37,7 @@
<p class="info-title">{{ $t('dataset.type') }}</p> <p class="info-title">{{ $t('dataset.type') }}</p>
<p v-if="detail.table.type === 'db'" class="info-content">{{ $t('dataset.db_data') }}</p> <p v-if="detail.table.type === 'db'" class="info-content">{{ $t('dataset.db_data') }}</p>
<p v-if="detail.table.type === 'sql'" class="info-content">{{ $t('dataset.sql_data') }}</p> <p v-if="detail.table.type === 'sql'" class="info-content">{{ $t('dataset.sql_data') }}</p>
<!-- <p v-if="detail.table.type === 'excel'" class="info-content">{{ $t('dataset.excel_data') }}</p>--> <p v-if="detail.table.type === 'excel'" class="info-content">{{ $t('dataset.excel_data') }}</p>
<p v-if="detail.table.type === 'custom'" class="info-content">{{ $t('dataset.custom_data') }}</p> <p v-if="detail.table.type === 'custom'" class="info-content">{{ $t('dataset.custom_data') }}</p>
</el-col> </el-col>
<el-col v-show="detail.table.type === 'db'" class="info-item"> <el-col v-show="detail.table.type === 'db'" class="info-item">
@ -47,7 +47,7 @@
<el-col v-if="detail.table.type === 'db' || detail.table.type === 'sql'" class="info-item"> <el-col v-if="detail.table.type === 'db' || detail.table.type === 'sql'" class="info-item">
<p class="info-title">{{ $t('dataset.mode') }}</p> <p class="info-title">{{ $t('dataset.mode') }}</p>
<p v-if="detail.table.mode === 0" class="info-content">{{ $t('dataset.direct_connect') }}</p> <p v-if="detail.table.mode === 0" class="info-content">{{ $t('dataset.direct_connect') }}</p>
<p v-if="detail.table.mode === 1" class="info-content">{{ $t('dataset.sync_data') }}</p> <!-- <p v-if="detail.table.mode === 1" class="info-content">{{ $t('dataset.sync_data') }}</p> -->
</el-col> </el-col>
<el-col class="info-item"> <el-col class="info-item">
<p class="info-title">{{ $t('dataset.create_by') }}</p> <p class="info-title">{{ $t('dataset.create_by') }}</p>

10
frontend/src/views/dataset/group/Group.vue
Unescape Escape View File

@ -101,10 +101,10 @@
<svg-icon icon-class="ds-sql" class="ds-icon-sql" /> <svg-icon icon-class="ds-sql" class="ds-icon-sql" />
{{ $t('dataset.sql_data') }} {{ $t('dataset.sql_data') }}
</el-dropdown-item> </el-dropdown-item>
<!-- <el-dropdown-item :command="beforeClickAddData('excel',data)" :disabled="!kettleRunning">--> <el-dropdown-item :command="beforeClickAddData('excel',data)" >
<!-- <svg-icon icon-class="ds-excel" class="ds-icon-excel" />--> <svg-icon icon-class="ds-excel" class="ds-icon-excel" />
<!-- {{ $t('dataset.excel_data') }}--> {{ $t('dataset.excel_data') }}
<!-- </el-dropdown-item>--> </el-dropdown-item>
<el-dropdown-item :command="beforeClickAddData('custom',data)"> <el-dropdown-item :command="beforeClickAddData('custom',data)">
<svg-icon icon-class="ds-custom" class="ds-icon-custom" /> <svg-icon icon-class="ds-custom" class="ds-icon-custom" />
{{ $t('dataset.custom_data') }} {{ $t('dataset.custom_data') }}
@ -416,7 +416,7 @@ export default {
parentId: 'pid' parentId: 'pid'
}, },
isTreeSearch: false, isTreeSearch: false,
kettleRunning: false kettleRunning: true
} }
}, },
computed: { computed: {

Write Preview
Loading…
Cancel
Save