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

Merge pull request #6420 from dataease/pr@dev-v2_dzz

Browse Source 
Pr@dev v2 dzz
This commit is contained in:
dataeaseShu 2023-10-30 14:33:32 +08:00 committed by GitHub
commit cb3b0314c4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
core/core-frontend/src/pages/panel/main.ts
View File

@ -57,7 +57,7 @@ import AppElement from './App.vue'
import { setupI18n } from '@/plugins/vue-i18n'
import { setupStore } from '@/store'
import { useUserStoreWithOut } from '@/store/modules/user'
import { setupElementPlus } from '@/plugins/element-plus'
import { setupElementPlus, setupElementPlusIcons } from '@/plugins/element-plus'
import { setupRouter } from '@/router'
const setupAll = async (dom: string, componentName: string): Promise<App<Element>> => {
@ -66,6 +66,7 @@ const setupAll = async (dom: string, componentName: string): Promise<App<Element
setupStore(app)
setupRouter(app)
setupElementPlus(app)
setupElementPlusIcons(app)
const userStore = useUserStoreWithOut()
await userStore.setUser()
app.mount(dom)

24
core/core-frontend/src/views/visualized/data/datasource/form/EditorDetail.vue
View File

@ -614,6 +614,18 @@ defineExpose({
autocomplete="off"
/>
</el-form-item>
<el-form-item :label="t('datasource.port')" prop="configuration.port">
<el-input-number
v-model="form.configuration.port"
autocomplete="off"
step-strictly
class="text-left"
:min="0"
:placeholder="t('common.inputText') + t('datasource.port')"
controls-position="right"
type="number"
/>
</el-form-item>
<el-form-item :label="t('datasource.data_base')" prop="configuration.dataBase">
<el-input
v-model="form.configuration.dataBase"
@ -687,18 +699,6 @@ defineExpose({
autocomplete="off"
/>
</el-form-item>
<el-form-item :label="t('datasource.port')" prop="configuration.port">
<el-input-number
v-model="form.configuration.port"
autocomplete="off"
step-strictly
class="text-left"
:min="0"
:placeholder="t('common.inputText') + t('datasource.port')"
controls-position="right"
type="number"
/>
</el-form-item>
<el-form-item
v-if="form.type == 'oracle'"
:label="t('datasource.connection_mode')"