forked from github/dataease
Merge remote-tracking branch 'origin/main' into main
This commit is contained in:
commit
74f2a515ea
@ -21,7 +21,7 @@
|
|||||||
<el-table-column prop="type" :label="$t('datasource.type')">
|
<el-table-column prop="type" :label="$t('datasource.type')">
|
||||||
<template slot-scope="scope">
|
<template slot-scope="scope">
|
||||||
<span v-if="scope.row.type ==='mysql'">MySQL</span>
|
<span v-if="scope.row.type ==='mysql'">MySQL</span>
|
||||||
<span v-if="scope.row.type ==='sqlserver'">SQL Server</span>
|
<span v-if="scope.row.type ==='sqlServer'">SQL Server</span>
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<fu-table-operations :buttons="buttons" :label="$t('commons.operating')" fix />
|
<fu-table-operations :buttons="buttons" :label="$t('commons.operating')" fix />
|
||||||
@ -151,7 +151,7 @@ export default {
|
|||||||
field: 'type',
|
field: 'type',
|
||||||
label: this.$t('datasource.type'),
|
label: this.$t('datasource.type'),
|
||||||
component: 'FuComplexSelect',
|
component: 'FuComplexSelect',
|
||||||
options: [{ label: 'mysql', value: 'mysql' }, { label: 'sqlServer', value: 'sqlServer' }],
|
options: [{ label: 'MySQL', value: 'mysql' }, { label: 'SQL Server', value: 'sqlServer' }],
|
||||||
multiple: false
|
multiple: false
|
||||||
}
|
}
|
||||||
// { field: 'deptId', label: '组织', component: conditionTable }
|
// { field: 'deptId', label: '组织', component: conditionTable }
|
||||||
|
Loading…
Reference in New Issue
Block a user