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

fix: 创建目录去除空格

Browse Source
This commit is contained in:
taojinlong 2022-09-28 17:10:23 +08:00
parent 480ab0e36b
commit 575929f69a
1 changed files with 44 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

81
frontend/src/views/dataset/group/Group.vue
View File

@ -12,11 +12,11 @@
@command="(type) => clickAddData(type)" @command="(type) => clickAddData(type)"
> >
<span class="el-dropdown-link"> <span class="el-dropdown-link">
<i @click.stop class="el-icon-plus"></i> <i class="el-icon-plus" @click.stop />
</span> </span>
<el-dropdown-menu <el-dropdown-menu
class="de-dataset-dropdown de-card-dropdown"
slot="dropdown" slot="dropdown"
class="de-dataset-dropdown de-card-dropdown"
> >
<el-dropdown-item command="db"> <el-dropdown-item command="db">
<svg-icon icon-class="ds-db" class="ds-icon-db" /> <svg-icon icon-class="ds-db" class="ds-icon-db" />
@ -58,12 +58,12 @@
class="main-area-input" class="main-area-input"
> >
<el-select <el-select
v-model="searchType"
slot="append" slot="append"
v-model="searchType"
:placeholder="searchMap[searchType]" :placeholder="searchMap[searchType]"
> >
<el-option :label="$t('commons.all')" value="all"></el-option> <el-option :label="$t('commons.all')" value="all" />
<el-option :label="$t('commons.folder')" value="folder"></el-option> <el-option :label="$t('commons.folder')" value="folder" />
</el-select> </el-select>
</el-input> </el-input>
</el-row> </el-row>
@ -71,7 +71,7 @@
<div class="block"> <div class="block">
<div v-if="!tData.length && !treeLoading" class="no-tdata"> <div v-if="!tData.length && !treeLoading" class="no-tdata">
{{ $t('deDataset.no_dataset_click') }} {{ $t('deDataset.no_dataset_click') }}
<span @click="() => clickAdd()" class="no-tdata-new">{{ <span class="no-tdata-new" @click="() => clickAdd()">{{
$t('deDataset.create') $t('deDataset.create')
}}</span> }}</span>
</div> </div>
@ -105,8 +105,7 @@
text-overflow: ellipsis; text-overflow: ellipsis;
" "
:title="data.name" :title="data.name"
>{{ data.name }}</span >{{ data.name }}</span>
>
</span> </span>
<span <span
v-if="hasDataPermission('manage', data.privileges)" v-if="hasDataPermission('manage', data.privileges)"
@ -119,11 +118,11 @@
@command="(type) => clickAddData(type, data)" @command="(type) => clickAddData(type, data)"
> >
<span class="el-dropdown-link"> <span class="el-dropdown-link">
<i @click.stop class="el-icon-plus"></i> <i class="el-icon-plus" @click.stop />
</span> </span>
<el-dropdown-menu <el-dropdown-menu
class="de-dataset-dropdown de-card-dropdown"
slot="dropdown" slot="dropdown"
class="de-dataset-dropdown de-card-dropdown"
> >
<el-dropdown-item command="db"> <el-dropdown-item command="db">
<svg-icon icon-class="ds-db" class="ds-icon-db" /> <svg-icon icon-class="ds-db" class="ds-icon-db" />
@ -165,11 +164,11 @@
<span class="el-dropdown-link"> <span class="el-dropdown-link">
<el-button icon="el-icon-more" type="text" size="small" /> <el-button icon="el-icon-more" type="text" size="small" />
</span> </span>
<el-dropdown-menu class="de-card-dropdown" slot="dropdown"> <el-dropdown-menu slot="dropdown" class="de-card-dropdown">
<el-dropdown-item <el-dropdown-item
command="rename" command="rename"
> >
<svg-icon icon-class="de-ds-rename" /> <svg-icon icon-class="de-ds-rename" />
{{ $t('dataset.rename') }} {{ $t('dataset.rename') }}
</el-dropdown-item> </el-dropdown-item>
<el-dropdown-item command="move"> <el-dropdown-item command="move">
@ -224,11 +223,17 @@
/> />
</span> </span>
<span v-if="['db', 'sql'].includes(data.modelInnerType)"> <span v-if="['db', 'sql'].includes(data.modelInnerType)">
<span v-if="data.mode === 0" style="margin-left: 6px" <span
><i class="el-icon-s-operation" v-if="data.mode === 0"
style="margin-left: 6px"
><i
class="el-icon-s-operation"
/></span> /></span>
<span v-if="data.mode === 1" style="margin-left: 6px" <span
><i class="el-icon-alarm-clock" v-if="data.mode === 1"
style="margin-left: 6px"
><i
class="el-icon-alarm-clock"
/></span> /></span>
</span> </span>
<span <span
@ -246,8 +251,7 @@
} }
]" ]"
:title="data.name" :title="data.name"
>{{ data.name }}</span >{{ data.name }}</span>
>
</span> </span>
<span <span
v-if="hasDataPermission('manage', data.privileges)" v-if="hasDataPermission('manage', data.privileges)"
@ -263,21 +267,21 @@
<span class="el-dropdown-link"> <span class="el-dropdown-link">
<el-button icon="el-icon-more" type="text" size="small" /> <el-button icon="el-icon-more" type="text" size="small" />
</span> </span>
<el-dropdown-menu class="de-card-dropdown" slot="dropdown"> <el-dropdown-menu slot="dropdown" class="de-card-dropdown">
<el-dropdown-item <el-dropdown-item
command="editTable" command="editTable"
> >
<svg-icon icon-class="de-ds-rename" /> <svg-icon icon-class="de-ds-rename" />
{{ $t('dataset.rename') }} {{ $t('dataset.rename') }}
</el-dropdown-item> </el-dropdown-item>
<el-dropdown-item command="moveDs"> <el-dropdown-item command="moveDs">
<svg-icon icon-class="de-ds-move" /> <svg-icon icon-class="de-ds-move" />
{{ $t('dataset.move_to') }} {{ $t('dataset.move_to') }}
</el-dropdown-item> </el-dropdown-item>
<el-dropdown-item <el-dropdown-item
command="deleteTable" command="deleteTable"
> >
<svg-icon icon-class="de-ds-trash" /> <svg-icon icon-class="de-ds-trash" />
{{ $t('dataset.delete') }} {{ $t('dataset.delete') }}
</el-dropdown-item> </el-dropdown-item>
</el-dropdown-menu> </el-dropdown-menu>
@ -305,13 +309,15 @@
@keypress.enter.native="saveGroup(groupForm)" @keypress.enter.native="saveGroup(groupForm)"
> >
<el-form-item :label="$t('deDataset.folder_name')" prop="name"> <el-form-item :label="$t('deDataset.folder_name')" prop="name">
<el-input placeholder="请输入文件夹名称" v-model="groupForm.name" /> <el-input v-model.trim="groupForm.name" placeholder="请输入文件夹名称" />
</el-form-item> </el-form-item>
</el-form> </el-form>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<deBtn secondary @click="close()">{{ $t('dataset.cancel') }}</deBtn> <deBtn secondary @click="close()">{{ $t('dataset.cancel') }}</deBtn>
<deBtn type="primary" @click="saveGroup(groupForm)" <deBtn
>{{ $t('dataset.confirm') }} type="primary"
@click="saveGroup(groupForm)"
>{{ $t('dataset.confirm') }}
</deBtn> </deBtn>
</div> </div>
</el-dialog> </el-dialog>
@ -339,23 +345,25 @@
<deBtn secondary @click="closeTable()">{{ <deBtn secondary @click="closeTable()">{{
$t('dataset.cancel') $t('dataset.cancel')
}}</deBtn> }}</deBtn>
<deBtn type="primary" @click="saveTable(tableForm)" <deBtn
>{{ $t('dataset.confirm') }} type="primary"
@click="saveTable(tableForm)"
>{{ $t('dataset.confirm') }}
</deBtn> </deBtn>
</div> </div>
</el-dialog> </el-dialog>
<!--移动分组--> <!--移动分组-->
<el-drawer <el-drawer
v-closePress
:title="moveDialogTitle" :title="moveDialogTitle"
:visible.sync="moveGroup" :visible.sync="moveGroup"
custom-class="user-drawer sql-dataset-drawer" custom-class="user-drawer sql-dataset-drawer"
size="600px" size="600px"
v-closePress
direction="rtl" direction="rtl"
> >
<group-move-selector <group-move-selector
moveDir move-dir
:item="groupForm" :item="groupForm"
@targetGroup="targetGroup" @targetGroup="targetGroup"
/> />
@ -367,18 +375,18 @@
:disabled="groupMoveConfirmDisabled" :disabled="groupMoveConfirmDisabled"
type="primary" type="primary"
@click="saveMoveGroup(tGroup)" @click="saveMoveGroup(tGroup)"
>{{ $t('dataset.confirm') }} >{{ $t('dataset.confirm') }}
</deBtn> </deBtn>
</div> </div>
</el-drawer> </el-drawer>
<!--移动数据集--> <!--移动数据集-->
<el-drawer <el-drawer
v-closePress
:title="moveDialogTitle" :title="moveDialogTitle"
:visible.sync="moveDs" :visible.sync="moveDs"
custom-class="user-drawer sql-dataset-drawer" custom-class="user-drawer sql-dataset-drawer"
size="600px" size="600px"
v-closePress
direction="rtl" direction="rtl"
> >
<group-move-selector :item="groupForm" @targetGroup="targetDs" /> <group-move-selector :item="groupForm" @targetGroup="targetDs" />
@ -390,7 +398,7 @@
:disabled="dsMoveConfirmDisabled" :disabled="dsMoveConfirmDisabled"
type="primary" type="primary"
@click="saveMoveDs(tDs)" @click="saveMoveDs(tDs)"
>{{ $t('dataset.confirm') }} >{{ $t('dataset.confirm') }}
</deBtn> </deBtn>
</div> </div>
</el-drawer> </el-drawer>
@ -431,7 +439,7 @@ export default {
currentNodeId: { currentNodeId: {
type: String, type: String,
default: '' default: ''
}, }
}, },
data() { data() {
return { return {
@ -526,7 +534,7 @@ export default {
} }
}, },
computed: { computed: {
hideCustomDs: function () { hideCustomDs: function() {
return this.$store.getters.hideCustomDs return this.$store.getters.hideCustomDs
} }
}, },
@ -629,7 +637,7 @@ export default {
this.groupForm.pid = param.id this.groupForm.pid = param.id
this.groupForm.level = param.level + 1 this.groupForm.level = param.level + 1
}, },
loadTree: _.debounce(function () { loadTree: _.debounce(function() {
this.searchPids = [] this.searchPids = []
this.$refs.datasetTreeRef.filter(this.filterText) this.$refs.datasetTreeRef.filter(this.filterText)
}, 600), }, 600),
@ -876,7 +884,6 @@ export default {
sceneId: param.id sceneId: param.id
} }
}) })
}, },
addData(name) { addData(name) {
this.$emit('switchComponent', { name: name, param: this.currGroup }) this.$emit('switchComponent', { name: name, param: this.currGroup })
@ -1179,4 +1186,4 @@ export default {
border-top: 1px solid rgba(31, 35, 41, 0.15); border-top: 1px solid rgba(31, 35, 41, 0.15);
} }
} }
</style> </style>