Skip to content

fix: 修复样式->间距->属性值设置时遮罩样式问题 #230

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
wenmine merged 1 commit into from
Jan 12, 2024
Merged

fix: 修复样式->间距->属性值设置时遮罩样式问题 #230

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion packages/common/component/PluginBlockList.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -344,7 +344,7 @@ export default {
position: fixed;
z-index: 9999;
top: 50px;
left: calc(var(--base-left-panel-width, 268px) + var(--base-nav-panel-width) + 10px);
left: calc(var(--base-left-panel-width) + var(--base-nav-panel-width) + 10px);
max-width: 500px;
max-height: 136px;
padding: 12px;
Expand Down
2 changes: 1 addition & 1 deletion packages/common/component/PluginSetting.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ export default {
<style lang="less" scoped>
.plugin-setting {
position: absolute;
left: calc(var(--base-left-panel-width, 268px) - 6px);
left: calc(var(--base-left-panel-width) - 6px);
top: 0;
width: var(--base-collection-panel-width);
height: 100%;
Expand Down
2 changes: 1 addition & 1 deletion packages/design-core/src/DesignPlugins.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -221,7 +221,7 @@ export default {

<style lang="less" scoped>
#tiny-engine-left-panel {
width: var(--base-left-panel-width, 268px);
width: var(--base-left-panel-width);
height: calc(100vh - var(--base-top-panel-height));
border-right: 1px solid var(--ti-lowcode-plugin-panel-border-right-color);
background: var(--ti-lowcode-common-component-bg);
Expand Down
1 change: 0 additions & 1 deletion packages/design-core/src/DesignSettings.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@ export default {
<style lang="less" scoped>
#tiny-right-panel {
width: var(--base-right-panel-width);
min-width: var(--lowcode-setting-panel-min-width);
height: 100%;
transition: 0.3s linear;
position: relative;
Expand Down
2 changes: 1 addition & 1 deletion packages/plugins/data/src/DataSourceRightPanel.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ export default {
border-right: 1px solid var(--ti-lowcode-toolbar-border-color);
background: var(--ti-lowcode-toolbar-bg);
position: absolute;
left: calc(var(--base-left-panel-width, 268px) - 6px);
left: calc(var(--base-left-panel-width) - 6px);
top: 0;

.right-head {
Expand Down
2 changes: 1 addition & 1 deletion packages/plugins/data/src/Main.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -410,7 +410,7 @@ export default {
border-right: 1px solid var(--ti-lowcode-toolbar-border-color);
background: var(--ti-lowcode-common-component-bg);
position: absolute;
left: calc(var(--base-left-panel-width, 268px) - 6px);
left: calc(var(--base-left-panel-width) - 6px);
top: 0;

.header {
Expand Down
4 changes: 2 additions & 2 deletions packages/settings/design/src/App.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,8 +135,8 @@ body::-webkit-scrollbar-thumb {
}

body {
--base-left-panel-width: 268px;
--base-right-panel-width: 240px;
--base-left-panel-width: 280px;
--base-right-panel-width: 280px;
--base-top-panel-height: 35px;
--base-bottom-panel-height: 30px;
--base-nav-panel-width: 40px;
Expand Down
46 changes: 2 additions & 44 deletions packages/theme/common/base.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ body {
}

body {
--base-left-panel-width: 268px;
--base-right-panel-width: 240px;
--base-left-panel-width: 280px;
--base-right-panel-width: 280px;
--base-top-panel-height: 48px;
--base-bottom-panel-height: 30px;
--base-nav-panel-width: 40px;
Expand Down Expand Up @@ -55,48 +55,6 @@ td {
padding: 0;
}

@media (min-width: 576px) {
body {
--base-left-panel-width: 25vw;
--base-right-panel-width: 25vw;
}
}

@media (min-width: 768px) {
body {
--base-left-panel-width: 25vw;
--base-right-panel-width: 25vw;
}
}

@media (min-width: 992px) {
body {
--base-left-panel-width: 202px;
--base-right-panel-width: 208px;
}
}

@media (min-width: 1200px) {
body {
--base-left-panel-width: 236px;
--base-right-panel-width: 240px;
}
}

@media (min-width: 1600px) {
body {
--base-left-panel-width: 268px;
--base-right-panel-width: 272px;
}
}

@media (min-width: 2000px) {
body {
--base-left-panel-width: 300px;
--base-right-panel-width: 308px;
}
}

#tiny-engine * {
box-sizing: border-box;
}
Expand Down
1 change: 0 additions & 1 deletion packages/theme/dark/settings.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
--ti-lowcode-setting-panel-tabs-item-title-hover-color: #fff;
// 插件设置面板左侧边框
--ti-lowcode-plugin-setting-panel-border-left-color: var(--ti-lowcode-common-component-bg);
--lowcode-setting-panel-min-width: 280px;
}

// 属性面板-属性-新建区块属性
Expand Down
1 change: 0 additions & 1 deletion packages/theme/light/settings.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
--ti-lowcode-setting-panel-tabs-item-title-hover-color: var(--ti-lowcode-base-text-color);
// 插件设置面板左侧边框
--ti-lowcode-plugin-setting-panel-border-left-color: var(--ti-lowcode-common-border-color-4);
--lowcode-setting-panel-min-width: 280px;
}

// 属性面板-属性-区块关联属性-新建区块属性popover
Expand Down