Skip to content
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.

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

fix:adjust some styles #884

Merged
merged 69 commits into from
Nov 14, 2024
Merged
Show file tree
Hide file tree
Changes from 66 commits
Commits
Show all changes
69 commits
Select commit Hold shift + click to select a range
34cbf60
fix: panel组件间距调整
lichunn Aug 14, 2024
2ccf7e6
feat: page management ui redesign
lichunn Aug 15, 2024
28e61ba
feat: block ui redesign
lichunn Aug 16, 2024
d2768f8
fix: 去掉选择区块高亮
lichunn Aug 16, 2024
039dda6
feat: 数据源样式调整
lichunn Aug 29, 2024
3c98201
feat: 数据源交互调整
lichunn Aug 30, 2024
307fdd4
feat: 帮助样式整改
lichunn Aug 30, 2024
4a3c402
feat: AI功能样式调整
lichunn Aug 30, 2024
f1e1928
feat: 资源管理、状态管理样式整改
lichunn Aug 31, 2024
080d587
feat: 国际化样式调整
lichunn Aug 31, 2024
afa7d40
feat: 头部、按钮、图标细节调整
lichunn Aug 31, 2024
8d4235f
feat: 样式细节调整
lichunn Sep 2, 2024
9694fe7
feat: 样式细节调整
lichunn Sep 2, 2024
5c7eb42
Merge remote-tracking branch 'open-tiny-engine/refactor/develop' into…
lichunn Sep 2, 2024
d8e9f71
fix:面包屑区分区块和页面
lichunn Sep 13, 2024
648dac2
fix:调整帮助面板间距颜色
lichunn Sep 13, 2024
abde04d
fix: 页面管理间距调整
lichunn Sep 18, 2024
9bb682e
fix: 历史备份样式调整
lichunn Sep 18, 2024
8413bd6
fix: 数据源/状态管理下拉调整
lichunn Sep 18, 2024
c2fdbb0
fix: 全屏图标位置调整
lichunn Sep 20, 2024
6cb072d
fix:去掉工具栏左侧面包屑边框
lichunn Sep 20, 2024
059a386
Merge remote-tracking branch 'open-tiny-engine/refactor/develop' into…
lichunn Sep 23, 2024
cce9b73
fix: fix review
lichunn Sep 23, 2024
08cfd55
fix: fix pageInputOutput review
lichunn Sep 23, 2024
548e71e
fix: fix review
lichunn Sep 23, 2024
9b70812
fix: codeEditor添加插槽
lichunn Sep 23, 2024
8178352
fix: 物料样式调整
lichunn Sep 25, 2024
644d9de
fix: 部分bug修复
lichunn Sep 26, 2024
39ebf03
feat: 调整区块设置编辑交互
lichunn Sep 27, 2024
f094cc8
fix: 全屏后图标游离
lichunn Sep 27, 2024
e400de3
fix: 调整区块列表高度
lichunn Sep 27, 2024
ca7074a
fix: 调整AI输入框边框
lichunn Sep 27, 2024
8b746ec
feat: 调整添加区块搜索框
lichunn Sep 28, 2024
84d3764
Merge branch 'feat/page-ui' into fix/new-ui-lc
lichunn Sep 28, 2024
a0b380e
fix: 调整暂无数据样式
lichunn Sep 28, 2024
4bc5e02
feat: 调整添加区块样式
lichunn Sep 28, 2024
51922d9
Merge remote-tracking branch 'open-tiny-engine/refactor/develop' into…
lichunn Sep 28, 2024
22542fa
fix: 调整合并公共组件后的区块间距
lichunn Sep 29, 2024
6e4afee
fix: 调整合并组件后的页面区块间距
lichunn Sep 29, 2024
d383ddc
fix: 调整数据源间距
lichunn Sep 29, 2024
10fe362
fix: 调整数据源静态数据样式
lichunn Sep 29, 2024
81c76d5
fix: fix review
lichunn Sep 29, 2024
6b448a5
feat:图标更新
lichunn Oct 9, 2024
7fd57ba
fix:修复区块遮挡
lichunn Oct 9, 2024
8469dd4
fix: fix review
lichunn Oct 9, 2024
3421fd8
fix: 点击编辑区块
lichunn Oct 9, 2024
3dc2088
Merge remote-tracking branch 'open-tiny-engine/refactor/develop' into…
lichunn Oct 10, 2024
e9a03dd
Merge remote-tracking branch 'open-tiny-engine/refactor/develop' into…
lichunn Oct 16, 2024
f2a7037
fix: 修改tiny-tree空数据字体颜色
lichunn Oct 16, 2024
7b31719
fix: 调整notify图标文字上下居中
lichunn Oct 16, 2024
650f87c
fix: 点击更多面板,保存下拉面板收起
lichunn Oct 16, 2024
04d6982
fix:调整tooltip样式
lichunn Oct 17, 2024
1f4ecc2
fix:调整保存按钮气泡显示方式
lichunn Oct 17, 2024
cdb9c94
fix: 调整tooltips阴影
lichunn Oct 17, 2024
fe020d6
fix:调整色值变量
lichunn Oct 17, 2024
0eb4b51
fix:修改编辑器全屏层级
lichunn Oct 17, 2024
4bb2d24
fix;去掉svg多余注释
lichunn Oct 17, 2024
ec05fec
fix: fix review
lichunn Oct 22, 2024
fc14ce3
fix:fix review
lichunn Oct 22, 2024
1b359fb
fix: 调整帮助面板样式
lichunn Oct 24, 2024
eb1ccd0
Merge remote-tracking branch 'open-tiny-engine/refactor/develop' into…
lichunn Oct 28, 2024
9ecb1c5
fix:工具栏下拉框去掉箭头
lichunn Oct 28, 2024
f51da4a
fix: 状态管理编辑器间距对齐
lichunn Oct 28, 2024
14a9dd4
fix: 调整编辑器图标文本色
lichunn Oct 28, 2024
0d15eaa
fix: 调整保存工具间距
lichunn Oct 28, 2024
ebc7305
fix: 调整状态管理间距
lichunn Oct 28, 2024
80e50ff
fix: 调整工具栏保存及下拉框样式
lichunn Nov 4, 2024
5f81847
Merge remote-tracking branch 'open-tiny-engine/refactor/develop' into…
lichunn Nov 4, 2024
de057b5
fix: fix review
lichunn Nov 6, 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
8 changes: 5 additions & 3 deletions packages/common/component/MonacoEditor.vue
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<div class="toolbar-start">
<slot name="toolbarStart"></slot>
</div>
<div :class="['buttons', { fullscreen: fullscreen }]">
<div :class="['buttons', { fullscreen: fullscreen }]" id="buttons">
lichunn marked this conversation as resolved.
Show resolved Hide resolved
lichunn marked this conversation as resolved.
Show resolved Hide resolved
<slot name="buttons"></slot>
<tiny-tooltip v-if="showFormatBtn && options.language === 'json'" content="格式化" placement="top">
<public-icon name="json" @click="formatCode"></public-icon>
Expand Down Expand Up @@ -158,8 +158,10 @@ export default {
gap: 8px;
color: var(--ti-lowcode-component-svg-button-color);
cursor: pointer;
:hover {
color: var(--ti-lowcode-component-svg-button-hover-color);
}
#buttons {
:deep(.svg-icon) {
color: var(--te-common-icon-secondary);
lichunn marked this conversation as resolved.
Show resolved Hide resolved
}
}
.fullscreen {
Expand Down
25 changes: 14 additions & 11 deletions packages/design-core/assets/full-screen.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
15 changes: 0 additions & 15 deletions packages/design-core/assets/全屏.svg

This file was deleted.

2 changes: 1 addition & 1 deletion packages/layout/src/ToolbarCollapse.vue
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<template>
<tiny-popover width="140" trigger="hover">
<tiny-popover :visible-arrow="false" width="140" trigger="hover">
<template #reference>
<span class="toolbar-ellipsis">
<svg-icon name="ellipsis"></svg-icon>
Expand Down
101 changes: 52 additions & 49 deletions packages/plugins/help/src/HelpIcon.vue
Original file line number Diff line number Diff line change
@@ -1,40 +1,55 @@
<template>
<div id="help-plugin">
<div title="帮助">
<svg-icon name="plugin-icon-plugin-help" @click.stop="openHelpBox"></svg-icon>
</div>
<div v-if="state.helpBox" class="help-plugin-box">
<div class="help-plugin-box-top">
<svg-icon name="close" class="help-plugin-close" @click.stop="closeHelpBox"></svg-icon>
</div>
<div class="help-plugin-box-title">
{{ helpTitle }}
</div>
<div class="help-plugin-box-body">
<a :href="courseUrl" target="_blank" class="help-plugin-box-item">
<span><svg-icon class="svg-icon" name="user-guide"></svg-icon>使用手册</span
><icon-fillet-external-link class="icon-fillet-external-link" />
</a>
<tiny-tooltip v-model="state.showTooltip" :manual="true" effect="light" placement="right-end">
<template #content>
<div>
<span>{{ toolTipContent }}</span>
<svg-icon name="close" class="help-plugin-tooltip-close" @click="closeToolTip"></svg-icon>
<tiny-popover
:offset="50"
placement="right"
width="208"
trigger="click"
:visible-arrow="false"
id="help-icon-popover"
>
<template #reference>
<div title="帮助">
<svg-icon name="plugin-icon-plugin-help"></svg-icon>
</div>
</template>
<div class="help-plugin-box">
<div class="help-plugin-box-title">
{{ helpTitle }}
</div>
<div class="help-plugin-box-body">
<a :href="courseUrl" target="_blank" class="help-plugin-box-item">
<span><svg-icon class="svg-icon" name="user-guide"></svg-icon>使用手册</span
><icon-fillet-external-link class="icon-fillet-external-link" />
</a>
<tiny-tooltip v-model="state.showTooltip" :manual="true" effect="light" placement="right-end">
<template #content>
<div>
<span>{{ toolTipContent }}</span>
<svg-icon name="close" class="help-plugin-tooltip-close" @click="closeToolTip"></svg-icon>
</div>
</template>
<div class="help-plugin-box-item" @click="toShowStep">
<span><svg-icon class="svg-icon" name="beginner-guide"></svg-icon>新手引导</span>
</div>
</template>
<div class="help-plugin-box-item" @click="toShowStep">
<span><svg-icon class="svg-icon" name="beginner-guide"></svg-icon>新手引导</span>
</div>
</tiny-tooltip>
</div>
<div class="help-plugin-box-ques">
<div class="help-plugin-box-title help-plugin-box-ques-title">{{ questionTitle }}</div>
<a v-for="(item, idx) in questionList" :key="idx" :href="item.url" target="_blank" class="help-plugin-box-item">
<span> {{ idx + 1 }}.{{ item.label }} </span>
<icon-fillet-external-link class="icon-fillet-external-link" />
</a>
</tiny-tooltip>
</div>
<div class="help-plugin-box-ques">
<div class="help-plugin-box-title help-plugin-box-ques-title">{{ questionTitle }}</div>
<a
v-for="(item, idx) in questionList"
:key="idx"
:href="item.url"
target="_blank"
class="help-plugin-box-item"
>
<span> {{ idx + 1 }}.{{ item.label }} </span>
<icon-fillet-external-link class="icon-fillet-external-link" />
</a>
</div>
</div>
</div>
</tiny-popover>
lichunn marked this conversation as resolved.
Show resolved Hide resolved

<tiny-guide
ref="tinyGuideRef"
:show-step="state.showStep"
Expand All @@ -46,7 +61,7 @@

<script>
import { reactive, onMounted, ref } from 'vue'
import { Guide, Tooltip } from '@opentiny/vue'
import { Guide, Tooltip, Popover } from '@opentiny/vue'
import { IconFilletExternalLink } from '@opentiny/vue-icon'
import { useLayout, META_APP } from '@opentiny/tiny-engine-meta-register'

Expand All @@ -57,6 +72,7 @@ export default {
components: {
TinyTooltip: Tooltip,
TinyGuide: Guide,
TinyPopover: Popover,
IconFilletExternalLink: IconFilletExternalLink()
},
setup() {
Expand Down Expand Up @@ -87,7 +103,6 @@ export default {
showStep: false,
guideWidth: '360',
showTooltip: false,
showHelpDialog: false,
helpBox: false
})

Expand Down Expand Up @@ -249,13 +264,6 @@ export default {
margin-left: 20px;
cursor: pointer;
}
.help-plugin-close {
cursor: pointer;
position: absolute;
right: 16px;
top: 14px;
font-size: 12px;
}
</style>

<!-- tiny-guide在body元素上,所以不使用scoped -->
Expand Down Expand Up @@ -327,13 +335,8 @@ div.tiny-guide.shepherd-element {

.help-plugin-box {
cursor: auto;
position: absolute;
left: var(--base-nav-panel-width);
bottom: 68px;
width: 208px;
background-color: var(--ti-lowcode-help-box-bg-color);
border-radius: 6px;
box-shadow: var(--ti-lowcode-help-box-shadow);
padding: 16px 0;
&-top {
text-align: right;
Expand All @@ -343,13 +346,13 @@ div.tiny-guide.shepherd-element {
font-size: 12px;
font-weight: 600;
line-height: 18px;
margin: 0 16px 8px 16px;
margin: 0 8px 8px 8px;
}
&-body {
padding-bottom: 8px;
}
&-item {
padding: 0 16px;
padding: 0 8px;
display: flex;
justify-content: space-between;
align-items: center;
Expand Down
3 changes: 3 additions & 0 deletions packages/plugins/state/src/CreateStore.vue
Original file line number Diff line number Diff line change
Expand Up @@ -254,6 +254,9 @@ export default {
overflow-y: auto;
:deep(.tiny-collapse-item__wrap) {
padding: 0 12px;
.tiny-collapse-item__content {
padding: 0;
}
}
:deep(.toolbar) {
position: absolute;
Expand Down
11 changes: 7 additions & 4 deletions packages/plugins/state/src/CreateVariable.vue
Original file line number Diff line number Diff line change
Expand Up @@ -419,14 +419,11 @@ export default {
right: 4px;
}
.var {
padding: 12px;
padding: 12px 12px 0 12px;
}
.var-type-item {
padding: 0 12px;
}
.tiny-form-item:first-child {
padding-bottom: 12px;
}
.tiny-form-item:not(:last-child) {
margin-bottom: 12px;
}
Expand All @@ -441,6 +438,12 @@ export default {
}
:deep(.tiny-collapse-item__wrap) {
padding: 0 12px;
.tiny-collapse-item__content {
padding: 0;
.tiny-form-item:first-child {
padding-bottom: 12px;
}
}
}
}

Expand Down
7 changes: 6 additions & 1 deletion packages/plugins/state/src/StateFullscreenHead.vue
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<template>
<div class="fullscreen-head-content">
<span>{{ title }}</span>
<span class="title">{{ title }}</span>
<close-icon @close="close"></close-icon>
</div>
</template>
Expand Down Expand Up @@ -37,5 +37,10 @@ export default {
width: 100%;
display: flex;
justify-content: space-between;
.title {
font-size: var(--te-base-font-size-base);
color: var(--te-common-text-primary);
font-weight: var(--te-base-font-weight-7);
}
}
</style>
50 changes: 29 additions & 21 deletions packages/toolbars/save/src/Main.vue
Original file line number Diff line number Diff line change
Expand Up @@ -200,9 +200,37 @@ export default {
}

.save-style {
padding: 14px;
padding: 20px 12px;
font-size: 12px;

.save-setting {
font-size: 14px;
font-weight: 600;
line-height: 20px;
height: 20px;
margin-bottom: 16px;
}

.save-time {
line-height: 24px;
font-size: 12px;
margin: 12px 0 16px 0;
display: flex;
.save-time-label {
width: 60px;
}

.tiny-select {
width: 103px;
margin-left: 12px;

:deep(.tiny-input__suffix) {
width: 12px;
top: 12px;
}
}
}
lichunn marked this conversation as resolved.
Show resolved Hide resolved

.save-button-group {
text-align: right;

Expand All @@ -216,26 +244,6 @@ export default {
}
}

.save-time {
line-height: 24px;
font-size: 12px;
margin: 13px 0 14px 0;
display: flex;
.save-time-label {
width: 60px;
}

.tiny-select {
width: 103px;
margin-left: 12px;

:deep(.tiny-input__suffix) {
width: 12px;
top: 12px;
}
}
}

#saving {
cursor: not-allowed;
color: var(--ti-lowcode-disabled-color);
Expand Down