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: variable convergence in setting #1096

Merged
merged 5 commits into from
Feb 13, 2025
Merged

feat: variable convergence in setting #1096

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
3c570f6
feat: variable convergence in setting
xuanlid Feb 6, 2025
b1987fb
feat: variable convergence in settings-styles
xuanlid Feb 11, 2025
5b04fcf
feat: variable convergence in settings-panel
xuanlid Feb 11, 2025
2d842dc
feat: variable convergence in settings-design
xuanlid Feb 11, 2025
13dd0b1
feat: Change variable name
xuanlid Feb 12, 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
2 changes: 1 addition & 1 deletion packages/design-core/assets/border-radius-bottomleft.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion packages/design-core/assets/border-radius-bottomright.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion packages/design-core/assets/border-radius-topleft.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion packages/design-core/assets/border-radius-topright.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions packages/settings/events/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ import metaData from './meta'
import { commonEvents } from './src/commonjs/events.js'
import BindEventsDialogContent from './src/components/BindEventsDialogContent.vue'
import BindEventsDialogSidebar from './src/components/BindEventsDialogSidebar.vue'
import './src/styles/vars.less'

export default {
...metaData,
Expand Down
10 changes: 5 additions & 5 deletions packages/settings/events/src/components/AdvanceConfig.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -268,12 +268,12 @@ export default {
align-items: center;
display: flex;
column-gap: 12px;
color: var(--ti-lowcode-events-advanced-config-color);
color: var(--te-events-advanced-config-color);

label {
width: 80px;
word-break: keep-all;
color: var(--ti-lowcode-events-advanced-label-color);
color: var(--te-events-advanced-label-color);
flex-shrink: 0;
}

Expand All @@ -284,9 +284,9 @@ export default {
}
.binding-state {
box-sizing: border-box;
background: var(--ti-lowcode-events-advanced-binding-state-bg-color);
color: var(--ti-lowcode-events-advanced-binding-state-color);
border: 1px solid var(--ti-lowcode-events-advanced-binding-state-border-color);
background: var(--te-events-advanced-binding-state-bg-color);
color: var(--te-events-advanced-binding-state-color);
border: 1px solid var(--te-events-advanced-binding-state-border-color);
font-size: 12px;
height: 30px;
line-height: 22px;
Expand Down
22 changes: 11 additions & 11 deletions packages/settings/events/src/components/BindEvents.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -282,24 +282,24 @@ export default {
}
}
.event-bind {
color: var(--ti-lowcode-events-event-bind-color);
color: var(--te-events-event-bind-color);
}
.bind-action-item {
display: flex;
justify-content: space-between;
padding: 8px 12px;
cursor: pointer;
color: var(--ti-lowcode-events-bind-action-item-color);
border-bottom: 1px solid var(--ti-lowcode-events-bind-action-item-border-color);
color: var(--te-events-bind-action-item-color);
border-bottom: 1px solid var(--te-events-bind-action-item-border-color);
&:first-child {
border-top: 1px solid var(--ti-lowcode-events-bind-action-item-border-color);
border-top: 1px solid var(--te-events-bind-action-item-border-color);
}
&:hover {
background: var(--ti-lowcode-events-bind-action-item-hover-bg-color);
background: var(--te-events-bind-action-item-hover-bg-color);
}

.linked {
color: var(--ti-lowcode-events-bind-action-item-linked-color);
color: var(--te-events-bind-action-item-linked-color);
}
}
}
Expand Down Expand Up @@ -329,8 +329,8 @@ export default {
display: flex;
flex-direction: column;
align-items: center;
background-color: var(--ti-lowcode-events-empty-action-bg-color);
color: var(--ti-lowcode-events-empty-action-color);
background-color: var(--te-events-empty-action-bg-color);
color: var(--te-events-empty-action-color);
padding: 24px 18px;
margin-top: var(--te-common-vertical-item-spacing-normal);
.empty-action-icon {
Expand All @@ -349,20 +349,20 @@ export default {
}
}
.bind-event-list {
color: var(--ti-lowcode-events-bind-event-list-color);
color: var(--te-events-bind-event-list-color);
}
.bind-event-list-item-notallow {
cursor: not-allowed;
pointer-events: none;
color: var(--ti-lowcode-events-bind-event-list-item-disabled-color);
color: var(--te-events-bind-event-list-item-disabled-color);
}
.bind-event-list-item {
padding: 0 16px;
margin: 0 -16px;
line-height: 24px;
&:hover {
cursor: pointer;
background: var(--lowcode-events-bind-event-list-item-hover-bg-color);
background: var(--te-events-bind-event-list-item-hover-bg-color);
}
}
</style>
4 changes: 2 additions & 2 deletions packages/settings/events/src/components/BindEventsDialog.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -249,8 +249,8 @@ export default {
.bind-event-dialog-tip {
padding: var(--te-common-vertical-item-spacing-normal) 14px;
margin-bottom: var(--te-common-vertical-item-spacing-normal);
background-color: var(--te-common-bg-container);
color: var(--te-common-text-weaken);
background-color: var(--te-bind-event-dialog-tip-bg-color);
color: var(--te-bind-event-dialog-tip-color);
}

.bind-event-dialog-content {
Expand Down
14 changes: 7 additions & 7 deletions packages/settings/events/src/components/BindEventsDialogContent.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,19 +114,19 @@ export default {
.content-right-top {
.new-action-tip {
margin: 8px 0;
color: var(--ti-lowcode-bind-event-dialog-new-action-tip-color);
color: var(--te-bind-event-dialog-tip-color);
}
}
.content-right-bottom {
.content-right-monaco {
border: 1px solid var(--ti-lowcode-bind-event-dialog-content-right-monaco-border-color);
border: 1px solid var(--te-bind-event-dialog-content-right-monaco-border-color);
overflow: hidden;
position: relative;

.monaco-editor {
width: 100%;
height: 216px;
color: var(--te-common-text-secondary);
color: var(--te-bind-event-dialog-content-right-monaco-color);
}
.mark {
width: 100%;
Expand All @@ -139,7 +139,7 @@ export default {

.params-tip {
margin: 8px 0;
color: var(--te-common-color-error);
color: var(--te-bind-event-dialog-danger-tip-color);
}
}
.content-right-top .content-right-title,
Expand All @@ -148,17 +148,17 @@ export default {
.set-params-tip {
margin-top: 6px;
font-weight: 400;
color: var(--te-common-text-weaken);
color: var(--te-bind-event-dialog-tip-color);
}
}

.tip-error {
.content-right-monaco {
border: 1px solid var(--te-common-color-error);
border: 1px solid var(--te-bind-event-dialog-danger-border-color);
}
.params-tip,
.new-action-tip {
color: var(--te-common-color-error);
color: var(--te-bind-event-dialog-danger-tip-color);
}
}
}
Expand Down
6 changes: 3 additions & 3 deletions packages/settings/events/src/components/BindEventsDialogSidebar.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ export default {
}

.left-list-wrap {
border: 1px solid var(--ti-lowcode-bind-event-dialog-content-left-border-color);
border: 1px solid var(--te-bind-event-dialog-content-left-border-color);
border-radius: 4px;
height: 300px;
margin-top: var(--te-common-vertical-item-spacing-normal);
Expand All @@ -128,9 +128,9 @@ export default {
justify-content: space-between;
padding: 8px 12px;
cursor: pointer;
color: var(--ti-lowcode-bind-event-dialog-color);
color: var(--te-bind-event-dialog-color);
&.active {
background: var(--ti-lowcode-bind-event-dialog-content-left-list-item-active-bg-color);
background: var(--te-bind-event-dialog-content-left-list-item-active-bg-color);
}
}
}
Expand Down
32 changes: 32 additions & 0 deletions packages/settings/events/src/styles/vars.less
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
:root {
// 高级配置
--te-events-advanced-config-color: var(--te-common-text-secondary);
--te-events-advanced-label-color: var(--te-common-text-secondary);
--te-events-advanced-binding-state-bg-color: var(--te-common-bg-info);
--te-events-advanced-binding-state-border-color: var(--te-common-border-info);
--te-events-advanced-binding-state-color: var(--te-common-text-emphasize);

// 事件绑定
--te-bind-event-dialog-color: var(--te-common-text-secondary);
--te-bind-event-dialog-content-left-border-color: var(--te-common-border-divider);
--te-bind-event-dialog-content-right-monaco-color: var(--te-common-text-secondary);
--te-bind-event-dialog-content-right-monaco-border-color: var(--te-common-border-divider);
--te-bind-event-dialog-content-left-list-item-active-bg-color: var(--te-common-bg-container);
--te-bind-event-dialog-tip-color: var(--te-common-text-weaken);
--te-bind-event-dialog-tip-bg-color: var(--te-common-bg-container);
--te-bind-event-dialog-danger-tip-color: var(--te-common-color-error);
--te-bind-event-dialog-danger-border-color: var(--te-common-color-error);

// 绑定事件
--te-events-bind-action-item-border-color: var(--te-common-border-divider);
--te-events-event-bind-color: var(--te-common-text-weaken);
--te-events-bind-action-item-color: var(--te-common-text-primary);
--te-events-bind-action-item-hover-bg-color: var(--te-common-bg-container);
--te-events-bind-action-item-linked-color: var(--te-common-text-emphasize);
--te-events-empty-action-bg-color: var(--te-common-bg-container);
--te-events-empty-action-color: var(--te-common-text-weaken);

--te-events-bind-event-list-color: var(--te-common-text-primary);
--te-events-bind-event-list-item-disabled-color: var(--te-common-text-disabled);
--te-events-bind-event-list-item-hover-bg-color: var(--te-common-bg-container);
}
xuanlid marked this conversation as resolved.
Show resolved Hide resolved
1 change: 1 addition & 0 deletions packages/settings/props/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ import entry from './src/Main.vue'
import Components from './src/components'
import metaData from './meta'
import { PropertyService, PropertiesService } from './src/composable'
import './src/styles/vars.less'

export { Components, PropertyService, PropertiesService }

Expand Down
2 changes: 1 addition & 1 deletion packages/settings/props/src/components/Empty.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ export default {

<style lang="less" scoped>
.empty-tips {
color: var(--te-common-text-weaken);
color: var(--te-props-common-text-weaken-color);
text-align: center;
margin-top: 50px;
font-size: 12px;
Expand Down
18 changes: 9 additions & 9 deletions packages/settings/props/src/components/groups/LifeCycle.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,7 +198,7 @@ export default {
justify-content: space-between;

svg {
color: var(--ti-lowcode-toolbar-icon-color);
color: var(--te-props-common-icon-primary-color);
outline: none;
}
}
Expand All @@ -211,7 +211,7 @@ export default {
li {
padding: 4px 12px;
&:hover {
background: var(--te-common-bg-container);
background: var(--te-props-common-hover-bg-color);
cursor: pointer;
}
}
Expand All @@ -225,10 +225,10 @@ export default {
justify-content: space-between;
padding: 8px 12px;
cursor: pointer;
color: var(--te-common-text-secondary);
color: var(--te-props-common-text-color);

svg {
color: var(--te-common-text-secondary);
color: var(--te-props-common-text-color);
}
.icon {
margin-right: 8px;
Expand All @@ -239,7 +239,7 @@ export default {
}

&:hover {
background: var(--te-common-bg-container);
background: var(--te-props-common-hover-bg-color);
}
}
}
Expand All @@ -252,7 +252,7 @@ export default {
margin-right: 12px;

.life-cycle-list {
border: 1px solid var(--te-common-border-default);
border: 1px solid var(--te-props-common-default-border-color);
box-shadow: 0 -1px 4px 0 rgba(0, 0, 0, 0.1);
border-radius: 4px;
height: 320px;
Expand All @@ -268,7 +268,7 @@ export default {

.life-cycle-selected {
font-size: 14px;
color: var(--ti-lowcode-toolbar-icon-color);
color: var(--te-props-common-color);
opacity: 0.8;
position: absolute;
top: 50%;
Expand All @@ -277,8 +277,8 @@ export default {
}

&:hover {
color: var(--ti-lowcode-toolbar-icon-color);
background: var(--te-common-bg-container);
color: var(--te-props-common-color);
background: var(--te-props-common-hover-bg-color);
.life-cycle-selected {
opacity: 1;
}
Expand Down
4 changes: 2 additions & 2 deletions packages/settings/props/src/components/groups/TableColumn.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,12 +194,12 @@ export default {
.colums {
width: 100%;
.top {
color: var(--te-common-text-secondary);
color: var(--te-props-common-text-color);
display: flex;
justify-content: space-between;
margin-bottom: 5px;
.tiny-svg {
color: var(--ti-lowcode-toolbar-icon-color);
color: var(--te-props-common-icon-primary-color);
margin-right: 5px;
font-size: 16px;
&:hover {
Expand Down
4 changes: 2 additions & 2 deletions packages/settings/props/src/components/groups/TablePager.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,12 +62,12 @@ export default {
.colums {
width: 100%;
.top {
color: var(--te-common-text-secondary);
color: var(--te-props-common-text-color);
display: flex;
justify-content: space-between;
margin-bottom: 5px;
.tiny-svg {
color: var(--ti-lowcode-toolbar-icon-color);
color: var(--te-props-common-icon-primary-color);
margin-right: 5px;
font-size: 16px;
&:hover {
Expand Down
2 changes: 1 addition & 1 deletion packages/settings/props/src/components/inputs/CodeEditor.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ export default {
align-items: center;

:deep(.tiny-button--default) {
background: var(--ti-lowcode-toolbar-bg);
background: var(--te-props-common-button-bg-color);
}
}
}
Expand Down
Loading