Skip to content

Commit eb76a70

Browse files
authored
fix: Modify UI review comments (#916)
* fix:Modify Code Font in bridge/state * fix:modify the block list style in block * fix:Modify schema panel style * fix:Modify tabs in materials * fix:Modify global dialog, modal and search * fix:Modify the component list style in materials * fix:Modify button style * fix:Modify search in i18n * fix: Modify UI in Schema Panel * fix:Modify dialog style and i18n Panel shadow * fix:Modify the component list style in materials * fix:Modify the block list style in block * fix: Modify modal style * fix: Modify modal in clean * fix: Modify modal in block * fix: Modify the block list and modal in block * fix: modify the block list in block * fix: modify font size * fix: Modify global button * fix: delete comment code * fix: change plugin-icon-js.svg
1 parent 230b334 commit eb76a70

File tree

33 files changed

+367
-195
lines changed

33 files changed

+367
-195
lines changed

packages/canvas/DesignCanvas/src/DesignCanvas.vue

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,6 @@ export default {
121121
useModal().confirm({
122122
title: '提示',
123123
message: renderMsg,
124-
status: 'info',
125124
exec: callback,
126125
cancel: callback,
127126
hide: () => {

packages/common/component/BlockDeployDialog.vue

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<tiny-form
1111
ref="deployBlockRef"
1212
label-position="left"
13-
label-width="100px"
13+
label-width="84px"
1414
label-align
1515
:model="formState"
1616
:rules="formRules"
@@ -24,7 +24,7 @@
2424
<tiny-form-item label="保存设置" prop="needToSave" class="form-item-save">
2525
<tiny-checkbox v-model="formState.needToSave">发布成功后保存最新数据</tiny-checkbox>
2626
</tiny-form-item>
27-
<tiny-form-item label="schema比对">
27+
<tiny-form-item label="schema比对" class="schema-compare">
2828
<tiny-button class="compare-button" type="text" @click="changeCompare"> 查看本次发布的改动点 </tiny-button>
2929
<tiny-popover
3030
placement="top"
@@ -34,7 +34,7 @@
3434
content="区块本地schema和线上新版本schema进行比对"
3535
>
3636
<template #reference>
37-
<icon-help-circle></icon-help-circle>
37+
<svg-icon name="plugin-icon-plugin-help"></svg-icon>
3838
</template>
3939
</tiny-popover>
4040
</tiny-form-item>
@@ -71,7 +71,6 @@
7171

7272
<script>
7373
import { reactive, ref, watch } from 'vue'
74-
import { iconHelpCircle } from '@opentiny/vue-icon'
7574
import {
7675
Checkbox as TinyCheckbox,
7776
Input as TinyInput,
@@ -88,7 +87,6 @@ import VueMonaco from './VueMonaco.vue'
8887
export default {
8988
components: {
9089
TinyCheckbox,
91-
IconHelpCircle: iconHelpCircle(),
9290
TinyButton,
9391
TinyDialogBox,
9492
TinyForm,
@@ -254,7 +252,15 @@ export default {
254252
line-height: 0;
255253
}
256254
}
255+
.schema-compare {
256+
.tiny-button.tiny-button {
257+
padding-left: 0;
258+
padding-right: 4px;
259+
font-size: 12px;
260+
}
261+
}
257262
.compare-button {
263+
font-size: 12px;
258264
padding-left: 0;
259265
padding-right: 8px;
260266
line-height: 28px;

packages/common/component/LifeCycles.vue

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<div class="life-cycle">
33
<tiny-popover v-model="state.showPopover" placement="bottom-end" trigger="hover" popperClass="option-popper">
44
<template #reference>
5-
<tiny-button class="life-cycle-btn"><icon-plus class="icon-plus"></icon-plus>添加页面生命周期 </tiny-button>
5+
<tiny-button class="life-cycle-btn"><svg-icon name="add"></svg-icon>添加页面生命周期 </tiny-button>
66
</template>
77
<div class="popover-list">
88
<ul>
@@ -72,7 +72,7 @@ import { Button, DialogBox, Popover, Search } from '@opentiny/vue'
7272
import { useModal, usePage, useNotify, useCanvas } from '@opentiny/tiny-engine-meta-register'
7373
import { getMergeMeta } from '@opentiny/tiny-engine-meta-register'
7474
import MetaListItems from './MetaListItems.vue'
75-
import { iconYes, iconPlus } from '@opentiny/vue-icon'
75+
import { iconYes } from '@opentiny/vue-icon'
7676
import VueMonaco from './VueMonaco.vue'
7777
import { initCompletion } from '../js/completion'
7878
import { initLinter, lint } from '../js/linter'
@@ -87,8 +87,7 @@ export default {
8787
MonacoEditor: VueMonaco,
8888
SvgButton,
8989
MetaListItems,
90-
IconYes: iconYes(),
91-
IconPlus: iconPlus()
90+
IconYes: iconYes()
9291
},
9392
9493
props: {

packages/common/component/PluginBlockList.vue

Lines changed: 25 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<template>
2-
<div v-if="blockStyle === BlockStyles.Mini" class="header">
3-
<div class="col-checkbox" v-if="showCheckbox">
2+
<div v-if="blockStyle === BlockStyles.Mini && showCheckbox" class="header">
3+
<div class="col-checkbox">
44
<select-all :allItems="data" :selected="checked" :hidden-label="true" @select-all="handleSelectAll"></select-all>
55
</div>
66
<div class="col-name">区块名称</div>
@@ -18,7 +18,7 @@
1818
@mouseleave="state.hover = false"
1919
>
2020
<li v-if="showAddButton" class="block-item block-plus" @click="$emit('add')">
21-
<span class="block-plus-icon"><icon-plus></icon-plus></span>
21+
<span class="block-plus-icon"><svg-icon name="add"></svg-icon></span>
2222
<div class="item-text">添加区块</div>
2323
</li>
2424
<li
@@ -47,13 +47,6 @@
4747
<div v-if="blockStyle === BlockStyles.List" class="item-description">{{ item.description }}</div>
4848
</div>
4949

50-
<div v-if="blockStyle === BlockStyles.Mini" class="cell cell-time">
51-
<span>{{ format(item.created_at, 'yyyy/MM/dd hh:mm:ss') }}</span>
52-
</div>
53-
<div v-if="blockStyle === BlockStyles.Mini" class="cell cell-created-by">
54-
<span>{{ users.find((user) => user.id === item.createdBy)?.name || item.id }}</span>
55-
</div>
56-
5750
<div v-if="item.isShowProgress" class="progress-bar">
5851
<tiny-progress
5952
:text-inside="true"
@@ -68,20 +61,16 @@
6861
<div v-if="isBlockManage" class="block-detail">
6962
<div class="setting-menu" @mouseover.stop="handleSettingMouseOver" @mouseleave="handleBlockItemLeave">
7063
<ul class="list">
71-
<tiny-tooltip content="编辑" placement="top">
72-
<li class="list-item" @mousedown.stop.left="editBlock({ event: $event, item, index })">
73-
<svg-button class="list-item-svg" name="to-edit"> </svg-button>
74-
</li>
75-
</tiny-tooltip>
76-
<tiny-tooltip content="设置" placement="top">
77-
<li
78-
class="list-item"
79-
@mouseover.stop="iconSettingMove"
80-
@mousedown.stop.prevent="iconClick({ event: $event, item, index })"
81-
>
82-
<svg-button class="list-item-svg" name="text-source-setting"> </svg-button>
83-
</li>
84-
</tiny-tooltip>
64+
<li class="list-item" @mousedown.stop.left="editBlock({ event: $event, item, index })">
65+
<svg-button class="list-item-svg" name="to-edit"> </svg-button>
66+
</li>
67+
<li
68+
class="list-item"
69+
@mouseover.stop="iconSettingMove"
70+
@mousedown.stop.prevent="iconClick({ event: $event, item, index })"
71+
>
72+
<svg-button class="list-item-svg" name="text-source-setting"> </svg-button>
73+
</li>
8574
</ul>
8675
</div>
8776
</div>
@@ -140,7 +129,6 @@
140129
<script>
141130
import { computed, watch, inject, reactive } from 'vue'
142131
import { format } from '@opentiny/vue-renderless/common/date'
143-
import { iconPlus } from '@opentiny/vue-icon'
144132
import { Progress, Tooltip } from '@opentiny/vue'
145133
import PluginBlockItemImg from './PluginBlockItemImg.vue'
146134
import SearchEmpty from './SearchEmpty.vue'
@@ -159,7 +147,6 @@ const defaultImg =
159147
export default {
160148
components: {
161149
TinyProgress: Progress,
162-
IconPlus: iconPlus(),
163150
TinyTooltip: Tooltip,
164151
PluginBlockItemImg,
165152
SvgButton,
@@ -503,16 +490,17 @@ export default {
503490
504491
.publish-flag {
505492
position: absolute;
506-
left: 2px;
507-
top: 2px;
493+
left: 4px;
494+
top: 4px;
508495
text-align: center;
509496
display: block;
510-
color: var(--ti-lowcode-common-secondary-text-color);
497+
color: var(--te-common-text-primary);
511498
font-size: 12px;
512-
background-color: var(--ti-lowcode-component-block-list-item-tag-bg);
513-
padding: 2px;
514-
border-radius: 4px 0 4px 0;
499+
background-color: var(--te-common-bg-prompt);
500+
padding: 2px 4px;
501+
border-radius: 2px;
515502
transform: scale(0.9);
503+
min-width: 45px;
516504
}
517505
518506
&.block-item-small-list {
@@ -525,7 +513,7 @@ export default {
525513
margin-left: 8px;
526514
}
527515
.item-text {
528-
width: calc(35% - 62px);
516+
width: 50%;
529517
}
530518
.publish-flag {
531519
position: static;
@@ -545,6 +533,9 @@ export default {
545533
}
546534
}
547535
}
536+
&:hover {
537+
background-color: var(--te-common-bg-container);
538+
}
548539
}
549540
&:nth-child(even) {
550541
border-right: 0;
@@ -602,7 +593,7 @@ export default {
602593
.item-text {
603594
font-size: 12px;
604595
}
605-
.tiny-svg {
596+
.svg-icon {
606597
font-size: 24px;
607598
color: var(--ti-lowcode-component-svg-button-color);
608599
}
Lines changed: 23 additions & 7 deletions
Loading

packages/layout/src/DesignPlugins.vue

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -227,6 +227,9 @@ export default {
227227
:deep(.tiny-tabs__nav.is-show-active-bar) .tiny-tabs__item {
228228
margin-right: 0;
229229
}
230+
:deep(.tiny-tabs.tiny-tabs .tiny-tabs__header .tiny-tabs__nav-wrap-not-separator::after) {
231+
background-color: transparent;
232+
}
230233
}
231234
}
232235
@@ -303,6 +306,13 @@ export default {
303306
svg {
304307
font-size: 18px;
305308
}
309+
.public-icon {
310+
display: flex;
311+
justify-content: center;
312+
align-items: center;
313+
width: 26px;
314+
height: 26px;
315+
}
306316
}
307317
}
308318
}

packages/layout/src/DesignSettings.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ export default {
105105
}
106106
107107
.tiny-tabs__item__title {
108-
padding-bottom: 2px;
108+
padding-bottom: 6px;
109109
}
110110
}
111111

packages/plugins/block/src/BlockGroupArrange.vue

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -47,26 +47,24 @@ export default {
4747

4848
<style lang="less" scoped>
4949
.footer-toolbar {
50+
border-radius: 4px;
51+
background-color: var(--te-common-bg-container);
5052
.icon-wrap {
51-
width: 20px;
52-
height: 20px;
53-
color: var(--ti-lowcode-text-color);
53+
width: 24px;
54+
height: 24px;
55+
color: var(--te-common-text-weaken);
5456
font-size: 16px;
55-
border-radius: 2px;
5657
cursor: pointer;
5758
display: inline-flex;
5859
justify-content: center;
5960
align-items: center;
6061
transition: 0.3s;
61-
&:hover {
62-
color: var(--ti-lowcode-common-primary-color);
63-
}
6462
&.active {
65-
color: var(--ti-lowcode-common-primary-color);
63+
border: 1px solid var(--te-common-border-active);
64+
color: var(--te-common-text-primary);
65+
border-radius: 4px;
66+
background-color: var(--te-common-bg-default);
6667
}
6768
}
68-
.icon-wrap + .icon-wrap {
69-
margin-left: 8px;
70-
}
7169
}
7270
</style>

packages/plugins/block/src/BlockSetting.vue

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -186,10 +186,9 @@ export default {
186186
187187
const deleteBlock = () => {
188188
const title = '删除区块'
189-
const status = 'custom'
190189
const message = '您确认删除该区块吗?'
191190
192-
confirm({ title, status, message, exec: removeBlock })
191+
confirm({ title, message, exec: removeBlock })
193192
}
194193
195194
const updateBlock = () => {
@@ -209,12 +208,10 @@ export default {
209208
}
210209
}
211210
const title = '保存区块'
212-
const status = 'custom'
213211
const message = '您确认修改并保存该区块吗?'
214212
215213
confirm({
216214
title,
217-
status,
218215
message,
219216
exec: async () => {
220217
const currentId = useBlock().getCurrentBlock()?.id

packages/plugins/block/src/CategoryEdit.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
show-message
1313
:model="formData"
1414
:rules="rules"
15-
label-width="80px"
15+
label-width="64px"
1616
:label-align="true"
1717
label-position="left"
1818
validate-type="text"

0 commit comments

Comments
 (0)