dongjunchuan/de
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #4237 from dataease/dev

Browse Source 
merge
This commit is contained in:
王嘉豪 2022-12-29 15:08:25 +08:00 committed by GitHub
commit 0a2c161429
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 29 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
frontend/src/components/deDrag/index.vue
View File

@ -79,17 +79,17 @@
@mousedown="elementMouseDown" @mousedown="elementMouseDown"
/> />
<div <div
v-show="!this.element.editing" v-show="!this.element.editing && this.element.type !=='de-tabs'"
class="de-drag-area de-drag-right" class="de-drag-area de-drag-right"
@mousedown="elementMouseDown" @mousedown="elementMouseDown"
/> />
<div <div
v-show="!this.element.editing" v-show="!this.element.editing && this.element.type !=='de-tabs'"
class="de-drag-area de-drag-bottom" class="de-drag-area de-drag-bottom"
@mousedown="elementMouseDown" @mousedown="elementMouseDown"
/> />
<div <div
v-show="!this.element.editing" v-show="!this.element.editing && this.element.type !=='de-tabs'"
class="de-drag-area de-drag-left" class="de-drag-area de-drag-left"
@mousedown="elementMouseDown" @mousedown="elementMouseDown"
/> />

17
frontend/src/views/panel/appTemplate/component/TemplateList.vue
View File

@ -47,7 +47,7 @@
@command="(type) => clickMore(type, ele)" @command="(type) => clickMore(type, ele)"
> >
<span class="el-dropdown-link"> <span class="el-dropdown-link">
<i class="el-icon-more" /> <i class="el-icon-more"/>
</span> </span>
<el-dropdown-menu <el-dropdown-menu
slot="dropdown" slot="dropdown"
@ -63,13 +63,13 @@
icon="el-icon-edit" icon="el-icon-edit"
command="edit" command="edit"
> >
{{ $t("commons.edit") }} {{ $t('commons.edit') }}
</el-dropdown-item> </el-dropdown-item>
<el-dropdown-item <el-dropdown-item
icon="el-icon-delete" icon="el-icon-delete"
command="delete" command="delete"
> >
{{ $t("commons.delete") }} {{ $t('commons.delete') }}
</el-dropdown-item> </el-dropdown-item>
</el-dropdown-menu> </el-dropdown-menu>
</el-dropdown> </el-dropdown>
@ -83,7 +83,7 @@
secondary secondary
@click="add()" @click="add()"
> >
{{ $t("panel.add_app_category") }} {{ $t('panel.add_app_category') }}
</deBtn> </deBtn>
</div> </div>
</template> </template>
@ -179,12 +179,14 @@ export default {
.de-template-list { .de-template-list {
height: 100%; height: 100%;
position: relative; position: relative;
ul { ul {
margin: 16px 0 20px 0; margin: 16px 0 20px 0;
padding: 0; padding: 0;
overflow-y: auto; overflow-y: auto;
max-height: calc(100% - 90px); max-height: calc(100% - 90px);
} }
li { li {
list-style: none; list-style: none;
width: 100%; width: 100%;
@ -209,12 +211,14 @@ export default {
color: #8f959e; color: #8f959e;
margin-right: 9px; margin-right: 9px;
} }
.more { .more {
position: absolute; position: absolute;
top: 50%; top: 50%;
right: 10px; right: 10px;
transform: translateY(-50%); transform: translateY(-50%);
display: none; display: none;
.el-icon-more { .el-icon-more {
width: 24px; width: 24px;
height: 24px; height: 24px;
@ -247,16 +251,19 @@ export default {
li.select { li.select {
background: var(--deWhiteHover, #3370ff); background: var(--deWhiteHover, #3370ff);
color: var(--primary, #3370ff); color: var(--TextActive, #f4f4f5);
} }
.de-btn-fix { .de-btn-fix {
position: absolute; position: absolute;
bottom: 0; bottom: 0;
left: 0; left: 0;
} }
} }
.de-template-dropdown { .de-template-dropdown {
margin-top: 0 !important; margin-top: 0 !important;
.popper__arrow { .popper__arrow {
display: none !important; display: none !important;
} }

21
frontend/src/views/panel/template/component/TemplateList.vue
View File

@ -47,7 +47,7 @@
@command="(type) => clickMore(type, ele)" @command="(type) => clickMore(type, ele)"
> >
<span class="el-dropdown-link"> <span class="el-dropdown-link">
<i class="el-icon-more" /> <i class="el-icon-more"/>
</span> </span>
<el-dropdown-menu <el-dropdown-menu
slot="dropdown" slot="dropdown"
@ -57,19 +57,19 @@
icon="el-icon-upload2" icon="el-icon-upload2"
command="import" command="import"
> >
{{ $t("panel.import") }} {{ $t('panel.import') }}
</el-dropdown-item> </el-dropdown-item>
<el-dropdown-item <el-dropdown-item
icon="el-icon-edit" icon="el-icon-edit"
command="edit" command="edit"
> >
{{ $t("panel.rename") }} {{ $t('panel.rename') }}
</el-dropdown-item> </el-dropdown-item>
<el-dropdown-item <el-dropdown-item
icon="el-icon-delete" icon="el-icon-delete"
command="delete" command="delete"
> >
{{ $t("panel.delete") }} {{ $t('panel.delete') }}
</el-dropdown-item> </el-dropdown-item>
</el-dropdown-menu> </el-dropdown-menu>
</el-dropdown> </el-dropdown>
@ -83,7 +83,7 @@
secondary secondary
@click="add()" @click="add()"
> >
{{ $t("panel.add_category") }} {{ $t('panel.add_category') }}
</deBtn> </deBtn>
</div> </div>
</template> </template>
@ -174,12 +174,14 @@ export default {
.de-template-list { .de-template-list {
height: 100%; height: 100%;
position: relative; position: relative;
ul { ul {
margin: 16px 0 20px 0; margin: 16px 0 20px 0;
padding: 0; padding: 0;
overflow-y: auto; overflow-y: auto;
max-height: calc(100% - 90px); max-height: calc(100% - 90px);
} }
li { li {
list-style: none; list-style: none;
width: 100%; width: 100%;
@ -200,7 +202,7 @@ export default {
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;
.text-template-overflow{ .text-template-overflow {
display: inline-block; display: inline-block;
max-width: 87%; max-width: 87%;
overflow: hidden; overflow: hidden;
@ -212,12 +214,14 @@ export default {
color: #8f959e; color: #8f959e;
margin-right: 9px; margin-right: 9px;
} }
.more { .more {
position: absolute; position: absolute;
top: 50%; top: 50%;
right: 10px; right: 10px;
transform: translateY(-50%); transform: translateY(-50%);
display: none; display: none;
.el-icon-more { .el-icon-more {
width: 24px; width: 24px;
height: 24px; height: 24px;
@ -250,16 +254,19 @@ export default {
li.select { li.select {
background: var(--deWhiteHover, #3370ff); background: var(--deWhiteHover, #3370ff);
color: var(--primary, #3370ff); color: var(--TextActive, #f4f4f5);
} }
.de-btn-fix { .de-btn-fix {
position: absolute; position: absolute;
bottom: 0; bottom: 0;
left: 0; left: 0;
} }
} }
.de-template-dropdown { .de-template-dropdown {
margin-top: 0 !important; margin-top: 0 !important;
.popper__arrow { .popper__arrow {
display: none !important; display: none !important;
} }