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

feat: Module variable rectification #1065

Merged
merged 7 commits into from
Jan 24, 2025
Merged

feat: Module variable rectification #1065

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
b77c797
feat: Module variable rectification
xuanlid Jan 23, 2025
8220aec
feat: Module variable rectification
xuanlid Jan 23, 2025
e473dfb
feat: Module variable rectification
xuanlid Jan 23, 2025
42fe679
feat: modify review comments
xuanlid Jan 23, 2025
0a7ed0f
feat: modify review comments
xuanlid Jan 23, 2025
6d833c0
feat: modify review comments
xuanlid Jan 24, 2025
a076457
feat: modify review comments
xuanlid Jan 24, 2025
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
79 changes: 0 additions & 79 deletions packages/common/component/BlockHistoryTemplate.vue
View file
Open in desktop

This file was deleted.

10 changes: 5 additions & 5 deletions packages/common/component/CloseIcon.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ export default {
.icon-wrap {
width: 24px;
height: 24px;
color: var(--ti-lowcode-component-svg-button-color);
color: var(--te-common-icon-primary);
font-size: 16px;
border-radius: 4px;
cursor: pointer;
Expand All @@ -39,12 +39,12 @@ export default {
transition: 0.3s;

&:hover {
color: var(--ti-lowcode-component-svg-button-hover-color);
background-color: var(--ti-lowcode-component-svg-button-hover-bg-color);
color: var(--te-common-icon-primary);
background-color: var(--te-common-bg-prompt);
}
&.active {
color: var(--ti-lowcode-component-svg-button-active-color);
background-color: var(--ti-lowcode-component-svg-button-active-bg-color);
color: var(--te-common-icon-primary);
background-color: var(--te-common-bg-prompt);
}
}
</style>
1 change: 1 addition & 0 deletions packages/common/component/ConfigItem.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -551,6 +551,7 @@ export default {
.binding-state {
color: var(--ti-lowcode-meta-config-item-bind-color);
background: var(--ti-lowcode-meta-config-item-bind-bg);
border: 1px solid var(--ti-lowcode-meta-config-item-bind-border);
padding: 4px 12px;
overflow: hidden;
text-overflow: ellipsis;
Expand Down
16 changes: 0 additions & 16 deletions packages/common/component/PluginBlockList.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -486,14 +486,6 @@ export default {
position: static;
margin-left: 4px;
z-index: 9;
.block-detail-icon {
color: var(--ti-lowcode-component-block-list-setting-btn-color);
display: block;
&:hover {
cursor: pointer;
color: var(--ti-lowcode-component-block-list-setting-btn-hover-color);
}
}
}
&:hover {
background-color: var(--te-common-bg-container);
Expand Down Expand Up @@ -599,14 +591,6 @@ export default {
&.is-current-visible-icon {
visibility: visible;
}

.block-detail-icon {
color: var(--te-common-icon-secondary);
&:hover {
cursor: pointer;
color: var(--ti-lowcode-component-block-list-setting-btn-hover-color);
}
}
}
.block-setting {
right: 0px;
Expand Down
2 changes: 1 addition & 1 deletion packages/common/component/PluginPanel.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ export default {
.plugin-panel {
width: 100%;
height: 100%;
background: var(--ti-lowcode-plugin-panel-bg, --ti-lowcode-toolbar-bg);
background: var(--te-common-bg-default);
display: flex;
flex-direction: column;
position: relative;
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 @@ -129,7 +129,7 @@ export default {
width: var(--base-collection-panel-width);
height: 100%;
border-right: 1px solid var(--te-common-border-default);
background: var(--ti-lowcode-plugin-setting-panel-bg, --ti-lowcode-toolbar-bg);
background: var(--te-common-bg-default);
overflow: hidden;
border-left: 1px solid var(--ti-lowcode-plugin-panel-header-border-bottom-color);
&:not(.second-panel) {
Expand Down
7 changes: 5 additions & 2 deletions packages/common/component/SvgButton.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,7 @@ export default {
color: var(--te-common-icon-hover);
}
&.active {
color: var(--ti-lowcode-component-svg-button-active-color);
background-color: var(--ti-lowcode-component-svg-button-active-bg-color);
color: var(--te-common-icon-hover);
}

.svg-icon {
Expand All @@ -74,5 +73,9 @@ export default {
color: var(--te-common-icon-primary);
background-color: var(--te-common-bg-prompt);
}
&.active {
color: var(--te-common-icon-primary);
background-color: var(--te-common-bg-prompt);
}
}
</style>
1 change: 0 additions & 1 deletion packages/common/component/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ export { default as MetaCodeEditor } from './MetaCodeEditor.vue'
export { default as VideoGuide } from './VideoGuide.vue'
export { default as MonacoEditor } from './MonacoEditor.vue'
export { default as BlockHistoryList } from './BlockHistoryList.vue'
export { default as BlockHistoryTemplate } from './BlockHistoryTemplate.vue'
export { default as BlockLinkField } from './BlockLinkField.vue'
export { default as BlockLinkEvent } from './BlockLinkEvent.vue'
export { default as BlockDescription } from './BlockDescription.vue'
Expand Down
2 changes: 1 addition & 1 deletion packages/common/component/toolbar-built-in/ToolbarBaseButton.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ export default {
</script>
<style lang="less" scoped>
.toolbar-button {
background-color: var(--ti-lowcode-toolbar-button-bg) !important;
background-color: var(--te-common-bg-prompt) !important;
border: none !important;
min-width: 70px;
height: 26px;
Expand Down
2 changes: 2 additions & 0 deletions packages/layout/src/DesignSettings.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,7 @@ export default {
flex-direction: column;
.tiny-tabs__header .tiny-tabs__nav {
width: 60%;
background-color: var(--te-common-bg-default);
}
.tiny-tabs__nav-scroll {
margin-left: 12px;
Expand Down Expand Up @@ -105,6 +106,7 @@ export default {
}
&.is-active {
color: var(--ti-lowcode-setting-panel-tabs-item-title-active-color);
border: none;
}

.tiny-tabs__item__title {
Expand Down
7 changes: 7 additions & 0 deletions packages/plugins/block/src/BlockConfig.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -309,10 +309,17 @@ export default {
.tag-button {
color: var(--ti-lowcode-block-config-tag-color);
background-color: var(--ti-lowcode-block-config-tag-bg);
border: none;
height: 28px;
:deep(.tiny-tag__close) {
fill: var(--ti-lowcode-block-config-tag-close-color);
}
&:hover {
color: var(--ti-lowcode-block-config-tag-hover-color);
background-color: var(--ti-lowcode-block-config-tag-hover-bg);
:deep(.tiny-tag__close) {
fill: var(--ti-lowcode-block-config-tag-close-hover-color);
}
}
}

Expand Down
12 changes: 0 additions & 12 deletions packages/plugins/block/src/Main.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -457,18 +457,6 @@ export default {
.search-select {
flex: 1;
}
.add-group-btn {
display: flex;
align-items: center;
text-align: center;
margin-left: 8px;
border-color: transparent;
background-color: var(--ti-lowcode-component-block-list-add-group-btn-bg);
width: 30px;
height: 30px;
border: var(--ti-lowcode-component-block-list-add-group-btn-border);
border-radius: var(--ti-lowcode-component-block-list-add-group-btn-border-radius);
}
}
.app-manage-search {
padding: 0 10px 12px 10px;
Expand Down
7 changes: 1 addition & 6 deletions packages/plugins/help/src/HelpIcon.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -331,14 +331,8 @@ div.tiny-guide.shepherd-element {
}
}

// 引导遮罩层
.shepherd-modal-overlay-container.shepherd-modal-is-visible {
fill: var(--ti-lowcode-help-guide-mask-bg-color);
}

.help-plugin-box {
cursor: auto;
background-color: var(--ti-lowcode-help-box-bg-color);
border-radius: 6px;
padding: 4px 0;
&-top {
Expand All @@ -365,6 +359,7 @@ div.tiny-guide.shepherd-element {
margin: 0 -16px;
padding: 0 16px;
color: var(--te-common-text-primary);
fill: var(--te-common-icon-primary);
span {
display: flex;
align-items: center;
Expand Down
12 changes: 0 additions & 12 deletions packages/plugins/materials/src/meta/block/src/BlockGroup.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -396,18 +396,6 @@ export default {
display: flex;
justify-content: space-between;
padding: 12px;

.add-group-btn {
font-size: 16px;
width: 32px;
height: 32px;
border-radius: 6px;
border-color: var(--ti-lowcode-materials-border-icon-border-color);
background-color: var(--ti-lowcode-materials-border-icon-bg-color);
&:hover {
border-color: var(--ti-lowcode-materials-border-icon-border-color-hover);
}
}
}

.blocks-header-option {
Expand Down
2 changes: 1 addition & 1 deletion packages/plugins/materials/src/meta/component/src/Main.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@ export default {
background: var(--te-common-bg-default);

&:hover {
background: var(--ti-lowcode-material-component-list-hover-bg);
background: var(--te-common-bg-container);
border-radius: 4px;
}

Expand Down
6 changes: 3 additions & 3 deletions packages/plugins/page/src/Tree.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -287,10 +287,10 @@ const handleContainerDragLeave = (event) => {
}
}
&.active {
background-color: var(--te-base-blue-20);
color: var(--te-common-bg-primary-checked);
background-color: var(--te-common-bg-container);
color: var(--te-common-text-primary);
svg {
color: var(--te-common-bg-primary-checked);
color: var(--te-common-icon-secondary);
}
}
}
Expand Down
4 changes: 2 additions & 2 deletions packages/plugins/robot/src/Main.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -432,7 +432,7 @@ export default {
float: right;
margin: 0 6px;
cursor: pointer;
color: var(--te-common-icon-primary);
color: var(--ti-lowcode-chat-model-icon);
&:hover {
opacity: 0.8;
}
Expand Down Expand Up @@ -605,7 +605,7 @@ export default {
padding: 0;
transition: all 0.1s linear;
.svg-icon {
color: var(--ti-lowcode-chat-model-button-text);
fill: var(--ti-lowcode-chat-model-button-text);
margin-right: 0;
}
span {
Expand Down
10 changes: 0 additions & 10 deletions packages/plugins/script/src/Main.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,16 +133,6 @@ export default {
color: var(--ti-lowcode-plugin-panel-title-color);
font-weight: var(--ti-lowcode-plugin-panel-title-font-weight);
}

.help-link {
display: inline-block;
margin-left: 20px;
cursor: pointer;
color: var(--ti-lowcode-plugin-js-help-link-color);
&:hover {
text-decoration: underline;
}
}
}

.head-right {
Expand Down
4 changes: 2 additions & 2 deletions packages/plugins/state/src/Main.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -400,7 +400,7 @@ export default {
flex-direction: column;
.add-btn {
margin: 12px 0;
padding: 0 10px;
padding: 0 8px;
width: 100%;
.tiny-button {
width: 100%;
Expand Down Expand Up @@ -435,7 +435,7 @@ export default {

.left-filter {
margin-top: 4px;
padding: 0 10px;
padding: 0 8px;
}

& > span {
Expand Down
14 changes: 1 addition & 13 deletions packages/plugins/tree/src/Main.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -313,7 +313,7 @@ export default {
.tree-handle {
font-size: var(--te-base-font-size-2);
svg {
color: var(--te-common-icon-secondary);
fill: var(--te-common-icon-secondary);
}
}
}
Expand All @@ -336,18 +336,6 @@ export default {
}
}

:deep(.tiny-grid .tiny-grid__body-wrapper .tiny-grid-body__row) {
background-color: var(--te-common-bg-default);
&:hover {
background-color: var(--te-common-bg-container);
}
}
:deep(.tiny-grid .tiny-grid__body-wrapper .tiny-grid-body__row:not(.row__hover):nth-child(2n)) {
background-color: var(--te-common-bg-default);
&:hover {
background-color: var(--te-common-bg-container);
}
}
:deep(.tiny-grid-body__row.nav-tree .tiny-grid-cell) {
line-height: inherit;
}
Expand Down
Loading
Loading