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: Modify UI review comments #916

Merged
merged 41 commits into from
Dec 17, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
41 commits
Select commit Hold shift + click to select a range
90c8f9e
fix:Modify Code Font in bridge/state
xuanlid Dec 3, 2024
2d74123
fix:modify the block list style in block
xuanlid Dec 3, 2024
54a1780
fix:Modify schema panel style
xuanlid Dec 3, 2024
dac9b3b
fix:Modify tabs in materials
xuanlid Dec 3, 2024
384fb41
fix:Modify global dialog, modal and search
xuanlid Dec 3, 2024
83093f8
fix:Modify the component list style in materials
xuanlid Dec 3, 2024
a7440a4
fix:Modify button style
xuanlid Dec 3, 2024
329e62f
fix: Modify UI review comments
xuanlid Dec 3, 2024
0d554c8
fix: Modify UI review comments
xuanlid Dec 3, 2024
2248952
fix: Modify UI review comments
xuanlid Dec 4, 2024
bed7f88
fix:Modify search in i18n
xuanlid Dec 4, 2024
9777743
fix: Modify UI in Schema Panel
xuanlid Dec 4, 2024
07f6f9f
Modify UI review comments
xuanlid Dec 4, 2024
39ca259
fix:Modify dialog style and i18n Panel shadow
xuanlid Dec 4, 2024
67814b8
fix:Modify the component list style in materials
xuanlid Dec 4, 2024
6b37a8f
fix:Modify the block list style in block
xuanlid Dec 4, 2024
85ece30
fix: Modify UI review comments
xuanlid Dec 4, 2024
34ac7fa
Merge branch 'opentiny:refactor/develop' into refactor/develop
xuanlid Dec 4, 2024
75fc641
fix: Modify UI review comments
xuanlid Dec 4, 2024
375e102
fix: Modify UI review comments in i18n
xuanlid Dec 5, 2024
8993fb1
fix: test
xuanlid Dec 5, 2024
f925d0c
fix: Modify modal style
xuanlid Dec 5, 2024
b9f59a6
fix: Modify modal style
xuanlid Dec 5, 2024
3999757
fix: Modify modal in clean
xuanlid Dec 5, 2024
b7acbc8
fix: Modify modal in block
xuanlid Dec 5, 2024
09f12c4
fix: Modify the block list and modal in block
xuanlid Dec 5, 2024
f60de31
fix: modify the block list in block
xuanlid Dec 5, 2024
5c0f453
fix: modify font size
xuanlid Dec 5, 2024
98f2b1b
fix: Modify global button
xuanlid Dec 6, 2024
45011ec
fix: delete comment code
xuanlid Dec 6, 2024
9ab3563
fix: change plugin-icon-js.svg
xuanlid Dec 6, 2024
e8bec88
Merge remote-tracking branch 'open/refactor/develop' into refactor/de…
xuanlid Dec 6, 2024
58ff52d
fix: Modify review comments
xuanlid Dec 9, 2024
76ed2d3
fix: Modify review comments
xuanlid Dec 9, 2024
8046a77
fix: Modify review comments
xuanlid Dec 9, 2024
b444477
fix: Modify review comments
xuanlid Dec 9, 2024
0024e77
fix: Modify review comments
xuanlid Dec 9, 2024
dcc5516
Merge remote-tracking branch 'open/refactor/develop' into refactor/de…
xuanlid Dec 11, 2024
5ace383
Merge remote-tracking branch 'open/refactor/develop' into refactor/de…
xuanlid Dec 16, 2024
30f3967
fix: Modify review comments
xuanlid Dec 17, 2024
b606c25
fix: Modify review comments
xuanlid Dec 17, 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: 0 additions & 1 deletion packages/canvas/DesignCanvas/src/DesignCanvas.vue
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,6 @@ export default {
useModal().confirm({
title: '提示',
message: renderMsg,
status: 'info',
exec: callback,
cancel: callback,
hide: () => {
Expand Down
16 changes: 11 additions & 5 deletions packages/common/component/BlockDeployDialog.vue
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<tiny-form
ref="deployBlockRef"
label-position="left"
label-width="100px"
label-width="84px"
label-align
:model="formState"
:rules="formRules"
Expand All @@ -24,7 +24,7 @@
<tiny-form-item label="保存设置" prop="needToSave" class="form-item-save">
<tiny-checkbox v-model="formState.needToSave">发布成功后保存最新数据</tiny-checkbox>
</tiny-form-item>
<tiny-form-item label="schema比对">
<tiny-form-item label="schema比对" class="schema-compare">
<tiny-button class="compare-button" type="text" @click="changeCompare"> 查看本次发布的改动点 </tiny-button>
<tiny-popover
placement="top"
Expand All @@ -34,7 +34,7 @@
content="区块本地schema和线上新版本schema进行比对"
>
<template #reference>
<icon-help-circle></icon-help-circle>
<svg-icon name="plugin-icon-plugin-help"></svg-icon>
</template>
</tiny-popover>
</tiny-form-item>
Expand Down Expand Up @@ -71,7 +71,6 @@

<script>
import { reactive, ref, watch } from 'vue'
import { iconHelpCircle } from '@opentiny/vue-icon'
import {
Checkbox as TinyCheckbox,
Input as TinyInput,
Expand All @@ -88,7 +87,6 @@ import VueMonaco from './VueMonaco.vue'
export default {
components: {
TinyCheckbox,
IconHelpCircle: iconHelpCircle(),
TinyButton,
TinyDialogBox,
TinyForm,
Expand Down Expand Up @@ -254,7 +252,15 @@ export default {
line-height: 0;
}
}
.schema-compare {
.tiny-button.tiny-button {
padding-left: 0;
padding-right: 4px;
font-size: 12px;
}
}
.compare-button {
font-size: 12px;
padding-left: 0;
padding-right: 8px;
line-height: 28px;
Expand Down
7 changes: 3 additions & 4 deletions packages/common/component/LifeCycles.vue
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<div class="life-cycle">
<tiny-popover v-model="state.showPopover" placement="bottom-end" trigger="hover" popperClass="option-popper">
<template #reference>
<tiny-button class="life-cycle-btn"><icon-plus class="icon-plus"></icon-plus>添加页面生命周期 </tiny-button>
<tiny-button class="life-cycle-btn"><svg-icon name="add"></svg-icon>添加页面生命周期 </tiny-button>
</template>
<div class="popover-list">
<ul>
Expand Down Expand Up @@ -72,7 +72,7 @@ import { Button, DialogBox, Popover, Search } from '@opentiny/vue'
import { useModal, usePage, useNotify, useCanvas } from '@opentiny/tiny-engine-meta-register'
import { getMergeMeta } from '@opentiny/tiny-engine-meta-register'
import MetaListItems from './MetaListItems.vue'
import { iconYes, iconPlus } from '@opentiny/vue-icon'
import { iconYes } from '@opentiny/vue-icon'
import VueMonaco from './VueMonaco.vue'
import { initCompletion } from '../js/completion'
import { initLinter, lint } from '../js/linter'
Expand All @@ -87,8 +87,7 @@ export default {
MonacoEditor: VueMonaco,
SvgButton,
MetaListItems,
IconYes: iconYes(),
IconPlus: iconPlus()
IconYes: iconYes()
},

props: {
Expand Down
59 changes: 25 additions & 34 deletions packages/common/component/PluginBlockList.vue
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<template>
<div v-if="blockStyle === BlockStyles.Mini" class="header">
<div class="col-checkbox" v-if="showCheckbox">
<div v-if="blockStyle === BlockStyles.Mini && showCheckbox" class="header">
<div class="col-checkbox">
<select-all :allItems="data" :selected="checked" :hidden-label="true" @select-all="handleSelectAll"></select-all>
</div>
<div class="col-name">区块名称</div>
Expand All @@ -18,7 +18,7 @@
@mouseleave="state.hover = false"
>
<li v-if="showAddButton" class="block-item block-plus" @click="$emit('add')">
<span class="block-plus-icon"><icon-plus></icon-plus></span>
<span class="block-plus-icon"><svg-icon name="add"></svg-icon></span>
<div class="item-text">添加区块</div>
</li>
<li
Expand Down Expand Up @@ -47,13 +47,6 @@
<div v-if="blockStyle === BlockStyles.List" class="item-description">{{ item.description }}</div>
</div>

<div v-if="blockStyle === BlockStyles.Mini" class="cell cell-time">
<span>{{ format(item.created_at, 'yyyy/MM/dd hh:mm:ss') }}</span>
</div>
<div v-if="blockStyle === BlockStyles.Mini" class="cell cell-created-by">
<span>{{ users.find((user) => user.id === item.createdBy)?.name || item.id }}</span>
</div>

<div v-if="item.isShowProgress" class="progress-bar">
<tiny-progress
:text-inside="true"
Expand All @@ -68,20 +61,16 @@
<div v-if="isBlockManage" class="block-detail">
<div class="setting-menu" @mouseover.stop="handleSettingMouseOver" @mouseleave="handleBlockItemLeave">
<ul class="list">
<tiny-tooltip content="编辑" placement="top">
<li class="list-item" @mousedown.stop.left="editBlock({ event: $event, item, index })">
<svg-button class="list-item-svg" name="to-edit"> </svg-button>
</li>
</tiny-tooltip>
<tiny-tooltip content="设置" placement="top">
<li
class="list-item"
@mouseover.stop="iconSettingMove"
@mousedown.stop.prevent="iconClick({ event: $event, item, index })"
>
<svg-button class="list-item-svg" name="text-source-setting"> </svg-button>
</li>
</tiny-tooltip>
<li class="list-item" @mousedown.stop.left="editBlock({ event: $event, item, index })">
<svg-button class="list-item-svg" name="to-edit"> </svg-button>
</li>
<li
class="list-item"
@mouseover.stop="iconSettingMove"
@mousedown.stop.prevent="iconClick({ event: $event, item, index })"
>
<svg-button class="list-item-svg" name="text-source-setting"> </svg-button>
</li>
xuanlid marked this conversation as resolved.
Show resolved Hide resolved
</ul>
</div>
</div>
Expand Down Expand Up @@ -140,7 +129,6 @@
<script>
import { computed, watch, inject, reactive } from 'vue'
import { format } from '@opentiny/vue-renderless/common/date'
import { iconPlus } from '@opentiny/vue-icon'
import { Progress, Tooltip } from '@opentiny/vue'
import PluginBlockItemImg from './PluginBlockItemImg.vue'
import SearchEmpty from './SearchEmpty.vue'
Expand All @@ -159,7 +147,6 @@ const defaultImg =
export default {
components: {
TinyProgress: Progress,
IconPlus: iconPlus(),
TinyTooltip: Tooltip,
PluginBlockItemImg,
SvgButton,
Expand Down Expand Up @@ -503,16 +490,17 @@ export default {

.publish-flag {
position: absolute;
left: 2px;
top: 2px;
left: 4px;
top: 4px;
text-align: center;
display: block;
color: var(--ti-lowcode-common-secondary-text-color);
color: var(--te-common-text-primary);
font-size: 12px;
background-color: var(--ti-lowcode-component-block-list-item-tag-bg);
padding: 2px;
border-radius: 4px 0 4px 0;
background-color: var(--te-common-bg-prompt);
padding: 2px 4px;
border-radius: 2px;
transform: scale(0.9);
min-width: 45px;
}

&.block-item-small-list {
Expand All @@ -525,7 +513,7 @@ export default {
margin-left: 8px;
}
.item-text {
width: calc(35% - 62px);
width: 50%;
}
.publish-flag {
position: static;
Expand All @@ -545,6 +533,9 @@ export default {
}
}
}
&:hover {
background-color: var(--te-common-bg-container);
}
}
&:nth-child(even) {
border-right: 0;
Expand Down Expand Up @@ -602,7 +593,7 @@ export default {
.item-text {
font-size: 12px;
}
.tiny-svg {
.svg-icon {
font-size: 24px;
color: var(--ti-lowcode-component-svg-button-color);
}
Expand Down
30 changes: 23 additions & 7 deletions packages/design-core/assets/plugin-icon-js.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
10 changes: 10 additions & 0 deletions packages/layout/src/DesignPlugins.vue
Original file line number Diff line number Diff line change
Expand Up @@ -227,6 +227,9 @@ export default {
:deep(.tiny-tabs__nav.is-show-active-bar) .tiny-tabs__item {
margin-right: 0;
}
:deep(.tiny-tabs.tiny-tabs .tiny-tabs__header .tiny-tabs__nav-wrap-not-separator::after) {
background-color: transparent;
}
}
}

Expand Down Expand Up @@ -303,6 +306,13 @@ export default {
svg {
font-size: 18px;
}
.public-icon {
display: flex;
justify-content: center;
align-items: center;
width: 26px;
height: 26px;
}
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion packages/layout/src/DesignSettings.vue
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ export default {
}

.tiny-tabs__item__title {
padding-bottom: 2px;
padding-bottom: 6px;
}
}

Expand Down
20 changes: 9 additions & 11 deletions packages/plugins/block/src/BlockGroupArrange.vue
Original file line number Diff line number Diff line change
Expand Up @@ -47,26 +47,24 @@ export default {

<style lang="less" scoped>
.footer-toolbar {
border-radius: 4px;
background-color: var(--te-common-bg-container);
.icon-wrap {
width: 20px;
height: 20px;
color: var(--ti-lowcode-text-color);
width: 24px;
height: 24px;
color: var(--te-common-text-weaken);
font-size: 16px;
border-radius: 2px;
cursor: pointer;
display: inline-flex;
justify-content: center;
align-items: center;
transition: 0.3s;
&:hover {
color: var(--ti-lowcode-common-primary-color);
}
&.active {
color: var(--ti-lowcode-common-primary-color);
border: 1px solid var(--te-common-border-active);
color: var(--te-common-text-primary);
border-radius: 4px;
background-color: var(--te-common-bg-default);
xuanlid marked this conversation as resolved.
Show resolved Hide resolved
}
}
.icon-wrap + .icon-wrap {
margin-left: 8px;
}
}
</style>
5 changes: 1 addition & 4 deletions packages/plugins/block/src/BlockSetting.vue
Original file line number Diff line number Diff line change
Expand Up @@ -186,10 +186,9 @@ export default {

const deleteBlock = () => {
const title = '删除区块'
const status = 'custom'
const message = '您确认删除该区块吗?'

confirm({ title, status, message, exec: removeBlock })
confirm({ title, message, exec: removeBlock })
}

const updateBlock = () => {
Expand All @@ -209,12 +208,10 @@ export default {
}
}
const title = '保存区块'
const status = 'custom'
xuanlid marked this conversation as resolved.
Show resolved Hide resolved
const message = '您确认修改并保存该区块吗?'

confirm({
title,
status,
message,
exec: async () => {
const currentId = useBlock().getCurrentBlock()?.id
Expand Down
2 changes: 1 addition & 1 deletion packages/plugins/block/src/CategoryEdit.vue
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
show-message
:model="formData"
:rules="rules"
label-width="80px"
label-width="64px"
:label-align="true"
label-position="left"
validate-type="text"
Expand Down
Loading
Loading