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.

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

fix(canvas): change canvas menu item hiding to disabed #75

Merged
merged 1 commit into from
Nov 9, 2023
Merged

fix(canvas): change canvas menu item hiding to disabed #75

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
21 changes: 16 additions & 5 deletions packages/canvas/src/components/container/CanvasMenu.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,10 @@
</div>
<ul v-if="item.items && current === item" class="sub-menu menu-item">
<template v-for="(subItem, subIndex) in item.items" :key="subIndex">
<li v-if="subItem?.check?.() !== false" @click.stop="doOperation(subItem)">
<li
:class="[{ 'menu-item-disabled': subItem.check && !subItem.check?.() }]"
@click.stop="doOperation(subItem)"
>
{{ subItem.name }}
</li>
</template>
Expand Down Expand Up @@ -153,6 +156,10 @@ export default {
boxVisibility.value = false
}
const doOperation = (item) => {
if (item.check && !item.check?.()) {
return
}

if (item?.code) {
operations[item.code](item)
closeMenu()
Expand Down Expand Up @@ -196,13 +203,17 @@ export default {
justify-content: space-between;
}
font-size: 12px;
color: var(--ti-lowcode-toolbar-breadcrumb-color);
color: var(--ti-lowcode-canvas-menu-item-color);
padding: 6px 15px;
&:hover {
color: var(--ti-lowcode-toolbar-icon-color);
background: var(--ti-lowcode-canvas-menu-hover-color);
&:not(.menu-item-disabled):hover {
background: var(--ti-lowcode-canvas-menu-item-hover-bg-color);
}
position: relative;

&.menu-item-disabled {
cursor: not-allowed;
color: var(--ti-lowcode-canvas-menu-item-disabled-color);
}
}
&.sub-menu {
width: 100px;
Expand Down
5 changes: 3 additions & 2 deletions packages/theme/dark/canvas.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,8 @@
--ti-lowcode-common-secondary-text-color
); // canvas 宽度拖动手柄 两条竖线颜色
--ti-lowcode-canvas-menu-bg: var(--ti-lowcode-common-component-hover-bg); // canvas 右键菜单背景
--ti-lowcode-canvas-menu-color: #adb0b8; // 右键菜单文字颜色
--ti-lowcode-canvas-menu-hover-color: #5e5e5e;
--ti-lowcode-canvas-menu-item-color: #adb0b8; // 右键菜单文字颜色
--ti-lowcode-canvas-menu-item-hover-bg-color: #5e5e5e;
--ti-lowcode-canvas-menu-border-color: var(--ti-lowcode-common-border-color-2);
--ti-lowcode-canvas-menu-item-disabled-color: var(--ti-lowcode-base-text-color-3);
}
9 changes: 0 additions & 9 deletions packages/theme/dark/variable.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,18 +113,9 @@
--ti-lowcode-page-tree-hover-color: var(--ti-lowcode-common-primary-text-color);

// 画布 canvas
--ti-lowcode-canvas-footer-border-top-color: transparent; // canvas 底部面包屑 边框色
--ti-lowcode-canvas-iframe-scrollbar-track-color: var(--ti-lowcode-canvas-wrap-bg); // iframe 内部滚动条 track 颜色
// iframe 内部滚动条 滑块 颜色
--ti-lowcode-canvas-iframe-scrollbar-thumb-color: var(--ti-lowcode-common-component-bg);
--ti-lowcode-canvas-tab-handle-bg: var(--ti-lowcode-common-component-bg); // canvas 宽度拖动手柄 背景色
--ti-lowcode-canvas-tab-handle-hover-bg: var(--ti-lowcode-common-primary-color); // canvas 宽度拖动手柄 hover 背景色
--ti-lowcode-canvas-tab-handle-color: var(
--ti-lowcode-common-secondary-text-color
); // canvas 宽度拖动手柄 两条竖线颜色
--ti-lowcode-canvas-menu-bg: var(--ti-lowcode-common-component-hover-bg); // canvas 右键菜单背景
--ti-lowcode-canvas-menu-hover-color: #5e5e5e;
--ti-lowcode-canvas-menu-border-color: var(--ti-lowcode-common-border-color-2);

// 数据源
--ti-lowcode-datasource-list-color: var(--ti-lowcode-toolbar-more-hover-color);
Expand Down
5 changes: 3 additions & 2 deletions packages/theme/light/canvas.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,8 @@
--ti-lowcode-canvas-tab-handle-hover-bg: var(--ti-lowcode-common-primary-color); // canvas 宽度拖动手柄 hover 背景色
--ti-lowcode-canvas-tab-handle-color: var(--ti-lowcode-common-text-color-2); // canvas 宽度拖动手柄 两条竖线颜色
--ti-lowcode-canvas-menu-bg: var(--ti-lowcode-common-component-bg); // canvas 右键菜单背景
--ti-lowcode-canvas-menu-color: var(--ti-lowcode-base-gray-90); // 右键菜单文字颜色
--ti-lowcode-canvas-menu-hover-color: #f5f5f5;
--ti-lowcode-canvas-menu-item-color: var(--ti-lowcode-base-gray-90); // 右键菜单文字颜色
--ti-lowcode-canvas-menu-item-hover-bg-color: #f5f5f5;
--ti-lowcode-canvas-menu-border-color: #ddd;
--ti-lowcode-canvas-menu-item-disabled-color: var(--ti-lowcode-base-text-color-4);
}