Skip to content

fix(reset-button): 修复样式配置中重置按钮的样式和设计稿不一致的问题； #435

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
chilingling merged 3 commits into from
May 6, 2024
Merged

fix(reset-button): 修复样式配置中重置按钮的样式和设计稿不一致的问题； #435

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e0cb62d
fix(setting-styles): "Reset Position" style bug when screen percentag…
betterdancing Apr 17, 2024
83c42e2
fix(setting-styles): "Reset Modal" styles not match the design draft;
betterdancing Apr 17, 2024
1302c25
fix(reset-button): 修复样式配置中重置按钮弹窗位置的问题；
betterdancing Apr 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions packages/design-core/src/App.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,6 +154,7 @@ export default {
}
}
.tiny-engine-right-wrap {
position: relative;
z-index: 4;
}
:deep(.monaco-editor .suggest-widget) {
Expand Down
28 changes: 12 additions & 16 deletions packages/settings/styles/src/components/inputs/ModalMask.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
<template>
<teleport to="body">
<div :style="{ top: modal.top + 'px', left: modal.left + 'px' }" class="modal-wrapper">
<teleport to=".tiny-engine-right-wrap">
<div class="modal-wrapper">
<div class="modal-mask" @click="$emit('close')"></div>
<div class="modal-content">

<div :style="{ top: modal.top - 30 + 'px' }" class="modal-content">
<slot></slot>
</div>
</div>
Expand Down Expand Up @@ -47,31 +48,26 @@ export default {

<style lang="less" scoped>
.modal-wrapper {
position: fixed;
top: 0;
left: 0;
margin-top: 10px;
width: calc(var(--base-right-panel-width) - 24px);
z-index: 9999;
box-shadow: 0px 0px 4px rgba(0, 0, 0, 0.5);
.modal-mask {
position: fixed;
position: absolute;
top: 0;
right: 0;
bottom: 0;
left: calc(100% - var(--base-right-panel-width));
background: rgba(33, 33, 33, 0.65);
left: 0;
background: rgba(0, 0, 0, 0.2);
z-index: 9999;
}

.modal-content {
position: relative;
width: 100%;
position: absolute;
top: 0;
left: 16px;
z-index: 10000;
padding: 8px;
color: var(--ti-lowcode-toolbar-breadcrumb-color);
border: 1px solid var(--ti-lowcode-tabs-border-color);
border-radius: 4px;
box-shadow: 0px 0px 4px rgba(0, 0, 0, 0.2);
border-radius: 8px;
background-color: var(--ti-lowcode-toolbar-bg);
overflow: auto;
max-height: 100%;
Expand Down
9 changes: 8 additions & 1 deletion packages/settings/styles/src/components/inputs/ResetButton.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
<template>
<TinyButton class="reset-btn" @click="reset">{{ text }}</TinyButton>
<span class="reset-desc">重置后将恢复到初始值。</span>
</template>

<script>
Expand All @@ -12,7 +13,7 @@ export default {
props: {
text: {
type: String,
default: 'Reset'
default: '重置'
}
},
emits: ['reset'],
Expand All @@ -36,4 +37,10 @@ export default {
border: 0;
border: 1px solid var(--ti-lowcode-toolbar-border-color);
}
.reset-desc {
display: block;
padding: 8px 4px;
text-align: center;
color: var(--ti-lowcode-common-third-text-color);
}
</style>