提交 ff6baf8a authored 作者: wangjiahao's avatar wangjiahao

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

This source diff could not be displayed because it is too large. You can view the blob instead.
......@@ -102,7 +102,7 @@ export default {
}
.component-custom {
outline: none;
width: 100%;
width: 100% !important;
height: 100%;
}
</style>
......@@ -39,6 +39,9 @@ export default {
if ((this.options.attrs.type === 'date' || this.options.attrs.type === 'daterange') && Array.isArray(this.options.value) && this.options.value.length === 0) {
this.options.value = null
}
if (!!this.options && !!this.options.value && Object.keys(this.options.value).length === 0) {
this.options.value = null
}
},
methods: {
search() {
......
......@@ -66,7 +66,8 @@
</el-col>
<el-col class="info-item">
<p class="info-title">{{ $t('datasource.type') }}</p>
<p class="info-content">{{ detail.datasource.type }}</p>
<p v-if="detail.datasource.type === 'mysql'" class="info-content">MySQL</p>
<p v-if="detail.datasource.type === 'sqlServer'" class="info-content">SQL Server</p>
</el-col>
<el-col class="info-item">
<p class="info-title">{{ $t('dataset.create_time') }}</p>
......
......@@ -24,7 +24,7 @@
<!-- </el-row>-->
<el-col class="custom-tree-container">
<div class="block">
<div class="block" :style="treeStyle">
<el-tree
:default-expanded-keys="expandedArray"
:data="data"
......@@ -110,6 +110,11 @@ import { isKettleRunning, post } from '@/api/dataset/dataset'
export default {
name: 'DatasetGroupSelector',
props: {
fixHeight: {
type: Boolean,
required: false,
default: false
},
customType: {
type: Array,
required: false,
......@@ -163,7 +168,11 @@ export default {
name: '',
sort: 'type asc,create_time desc,name asc'
},
dsLoading: false
dsLoading: false,
treeStyle: this.fixHeight ? {
height: '200px',
overflow: 'auto'
} : {}
}
},
computed: {},
......
......@@ -92,7 +92,7 @@
width="500"
trigger="click"
>
<dataset-group-selector show-mode="union" :custom-type="customType" :mode="1" @getTable="getTable" />
<dataset-group-selector :fix-height="true" show-mode="union" :custom-type="customType" :mode="1" @getTable="getTable" />
<el-button slot="reference" size="mini" style="width: 100%;">
<p class="table-name-css" :title="targetTable.name || $t('dataset.pls_slc_union_table')">{{ targetTable.name || $t('dataset.pls_slc_union_table') }}</p>
</el-button>
......
......@@ -239,7 +239,7 @@ export default {
.demo-tips {
margin-top: 20px;
font-size: 14px;
font-size: 18px;
color: $--color-danger;
letter-spacing: 0;
line-height: 18px;
......
......@@ -85,6 +85,7 @@ export default {
])
},
created() {
this.$store.dispatch('app/toggleSideBarHide', true)
this.initVersion()
this.getLicenseInfo()
},
......
......@@ -56,7 +56,7 @@ export default {
},
created() {
this.$store.dispatch('app/toggleSideBarHide', true)
},
methods: {
repeatValidator(rule, value, callback) {
......
......@@ -151,6 +151,7 @@ export default {
},
created() {
this.$store.dispatch('app/toggleSideBarHide', true)
this.queryPerson()
this.initRoles()
},
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论