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

Merge pull request #1428 from dataease/pr@dev@feat_union_ds

Browse Source 
feat(数据集): 关联数据集
This commit is contained in:
XiaJunjie2020 2021-12-10 11:25:42 +08:00 committed by GitHub
commit 675b58093c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
frontend/src/views/dataset/add/AddUnion.vue
View File

@ -16,7 +16,7 @@
<el-divider /> <el-divider />
<div> <div>
<el-form :inline="true" style="display: flex;align-items: center;justify-content: space-between;"> <el-form :inline="true" style="display: flex;align-items: center;justify-content: space-between;">
<el-form-item class="form-item"> <el-form-item class="form-item" :label="$t('commons.name')">
<el-input v-model="name" size="mini" :placeholder="$t('commons.name')" clearable /> <el-input v-model="name" size="mini" :placeholder="$t('commons.name')" clearable />
</el-form-item> </el-form-item>
<el-form-item class="form-item"> <el-form-item class="form-item">
@ -59,7 +59,7 @@
</div> </div>
<!--选择数据集--> <!--选择数据集-->
<el-dialog v-if="selectDsDialog" v-dialogDrag :title="$t('chart.select_dataset')" :visible="selectDsDialog" :show-close="false" width="360px" class="dialog-css"> <el-dialog v-if="selectDsDialog" v-dialogDrag :title="$t('chart.select_dataset')" :visible="selectDsDialog" :show-close="false" width="400px" class="dialog-css">
<dataset-group-selector-tree :fix-height="true" show-mode="union" :custom-type="customType" @getTable="firstDs" /> <dataset-group-selector-tree :fix-height="true" show-mode="union" :custom-type="customType" @getTable="firstDs" />
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button size="mini" @click="closeSelectDs()">{{ $t('dataset.cancel') }}</el-button> <el-button size="mini" @click="closeSelectDs()">{{ $t('dataset.cancel') }}</el-button>
@ -337,4 +337,8 @@ export default {
.preview-style >>> .el-drawer .el-drawer__body{ .preview-style >>> .el-drawer .el-drawer__body{
padding: 0 16px 10px!important; padding: 0 16px 10px!important;
} }
.form-item >>> .el-form-item__label{
font-size: 12px!important;
font-weight: 400!important;
}
</style> </style>

4
frontend/src/views/dataset/add/union/NodeItem.vue
View File

@ -28,7 +28,7 @@
</div> </div>
<!--选择数据集--> <!--选择数据集-->
<el-dialog v-if="selectDsDialog" v-dialogDrag :title="$t('chart.select_dataset')" :visible="selectDsDialog" :show-close="false" width="360px" class="dialog-css"> <el-dialog v-if="selectDsDialog" v-dialogDrag :title="$t('chart.select_dataset')" :visible="selectDsDialog" :show-close="false" width="400px" class="dialog-css">
<dataset-group-selector-tree :fix-height="true" show-mode="union" :custom-type="customType" :mode="currentNode.currentDs.mode" @getTable="firstDs" /> <dataset-group-selector-tree :fix-height="true" show-mode="union" :custom-type="customType" :mode="currentNode.currentDs.mode" @getTable="firstDs" />
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button size="mini" @click="closeSelectDs()">{{ $t('dataset.cancel') }}</el-button> <el-button size="mini" @click="closeSelectDs()">{{ $t('dataset.cancel') }}</el-button>
@ -37,7 +37,7 @@
</el-dialog> </el-dialog>
<!--编辑单个数据集字段--> <!--编辑单个数据集字段-->
<el-dialog v-if="editField" v-dialogDrag :title="$t('dataset.field_select')" :visible="editField" :show-close="false" width="360px" class="dialog-css"> <el-dialog v-if="editField" v-dialogDrag :title="$t('dataset.field_select')" :visible="editField" :show-close="false" width="400px" class="dialog-css">
<union-field-edit :node="currentNode" /> <union-field-edit :node="currentNode" />
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button size="mini" @click="closeEditField()">{{ $t('dataset.cancel') }}</el-button> <el-button size="mini" @click="closeEditField()">{{ $t('dataset.cancel') }}</el-button>

2
frontend/src/views/dataset/common/DatasetGroupSelectorTree.vue
View File

@ -173,7 +173,7 @@ export default {
}, },
isTreeSearch: false, isTreeSearch: false,
treeStyle: this.fixHeight ? { treeStyle: this.fixHeight ? {
height: '200px', height: '300px',
overflow: 'auto' overflow: 'auto'
} : {} } : {}
} }