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

feat: variable convergence(materials, page, schema, script, state, tree, tutorial) #1087

Merged
merged 11 commits into from
Feb 13, 2025
Prev Previous commit
Next Next commit
feat: variable convergence in plugins state
xuanlid committed Jan 27, 2025

Verified

This commit was signed with the committer’s verified signature.
Emojigit 1F616EMO~nya
commit 5548442dff7bbffb22ae0bdc3bd772b4cc060f32
1 change: 1 addition & 0 deletions packages/plugins/state/index.js
Original file line number Diff line number Diff line change
@@ -12,6 +12,7 @@

import entry from './src/Main.vue'
import metaData from './meta.js'
import './src/styles/vars.less'

export default {
...metaData,
6 changes: 3 additions & 3 deletions packages/plugins/state/src/CreateStore.vue
Original file line number Diff line number Diff line change
@@ -290,11 +290,11 @@ export default {
}

:deep(.tiny-form-item__label) {
color: var(--ti-lowcode-toolbar-icon-color);
color: var(--te-state-common-label-text-color);
}

.label-left-wrap {
color: var(--ti-lowcode-toolbar-icon-color);
color: var(--te-state-common-label-text-color);
display: flex;
}
:deep(.tiny-collapse-item__wrap) {
@@ -310,7 +310,7 @@ export default {

.create-content-description {
font-size: 12px;
color: var(--te-common-text-emphasize);
color: var(--te-state-common-emphasize-text-color);
margin-left: 8px;
cursor: pointer;
}
52 changes: 5 additions & 47 deletions packages/plugins/state/src/CreateVariable.vue
Original file line number Diff line number Diff line change
@@ -439,8 +439,8 @@ export default {
margin-top: 8px;
border-radius: 4px;
padding: 8px 14px;
background: var(--te-common-bg-container);
color: var(--te-common-text-weaken);
background: var(--te-state-tip-bg-color);
color: var(--te-state-tip-color);
& > pre {
font-family: Consolas, 'Courier New', monospace;
}
@@ -461,11 +461,11 @@ export default {
}

:deep(.tiny-form-item__label) {
color: var(--ti-lowcode-toolbar-icon-color);
color: var(--te-state-common-label-text-color);
}

.label-left-wrap {
color: var(--ti-lowcode-toolbar-icon-color);
color: var(--te-state-common-label-text-color);
display: flex;
}
:deep(.tiny-collapse-item__wrap) {
@@ -479,56 +479,14 @@ export default {
}
}

.tips-content {
padding: 12px;
.create-content-head {
display: flex;
flex: 1;
font-size: 12px;

.icon-info-circle {
font-size: 14px;
margin-right: 4px;
color: var(--ti-lowcode-toolbar-icon-color);
}
}
.create-content-tip {
font-size: 14px;
}

.create-content-demo {
font-size: 14px;
.ml20 {
margin-left: 20px;
}
li {
margin-top: 8px;
}
}
.create-content-foot {
margin-top: 4px;
font-size: 14px;
line-height: 22px;
}
}

.create-content-description {
font-size: 12px;
color: var(--te-common-text-emphasize);
color: var(--te-state-common-emphasize-text-color);
margin-left: 8px;
cursor: pointer;
}

.variable-editor {
height: 270px;
}

.show-advanced {
font-size: 12px;
color: var(--ti-lowcode-data-advanced-text-color);
&:hover {
color: var(--ti-lowcode-data-advanced-text-hover-color);
cursor: pointer;
}
}
</style>
14 changes: 7 additions & 7 deletions packages/plugins/state/src/DataSourceList.vue
Original file line number Diff line number Diff line change
@@ -117,12 +117,12 @@ export default {
<style lang="less" scoped>
.data-source-list {
padding-top: 12px;
border-top: 1px solid var(--te-common-border-divider);
border-top: 1px solid var(--te-state-common-border-color);
overflow-y: scroll;
.data-source-list-item {
&.selected,
&:hover {
background: var(--te-common-bg-container);
background: var(--te-state-common--hover-bg-color);
.item-head-right {
display: flex;
justify-content: flex-end;
@@ -134,7 +134,7 @@ export default {
.item-head {
height: 24px;
padding: 0 10px;
color: var(--ti-lowcode-data-list-color);
color: var(--te-state-data-list-color);
display: flex;
justify-content: space-between;
align-items: center;
@@ -148,7 +148,7 @@ export default {
margin-right: 4px;
cursor: pointer;
transition: 0.3s;
color: var(--ti-lowcode-toolbar-icon-color);
color: var(--te-state-data-list-left-icon-color);
flex-shrink: 0;

&.is-expand {
@@ -172,7 +172,7 @@ export default {
text-overflow: ellipsis;
}
.item-head-left-icon {
color: var(--te-common-icon-secondary);
color: var(--te-state-data-list-left-icon-color);
margin-right: 8px;
}
}
@@ -191,11 +191,11 @@ export default {
p span {
&:first-child {
font-size: 14;
color: var(--te-common-text-secondary);
color: var(--te-state-common-label-text-color);
}

&:last-child {
color: var(--te-common-text-primary);
color: var(--te-state-common-text-color);
}
}
}
2 changes: 1 addition & 1 deletion packages/plugins/state/src/EditorI18nTool.vue
Original file line number Diff line number Diff line change
@@ -150,7 +150,7 @@ export default {
}
.tiny-button.tiny-button.tiny-button.tiny-button--default {
margin-right: 4px;
border-color: var(--te-common-border-secondary);
border-color: var(--te-state-editor-btn-border-color);
}
}
.buttons {
25 changes: 12 additions & 13 deletions packages/plugins/state/src/Main.vue
Original file line number Diff line number Diff line change
@@ -404,16 +404,15 @@ export default {
width: 100%;
.tiny-button {
width: 100%;
border-color: var(--te-common-border-default);
border-color: var(--te-state-add-btn-border-color);
&:hover {
border-color: var(--te-common-border-hover);
border-color: var(--te-state-add-btn--hover-border-color);
}
}
.add-btn-icon {
margin-right: 4px;
font-size: 16px;
stroke: var(--ti-lowcode-chat-model-button-text);
color: var(--te-common-icon-secondary);
color: var(--te-state-add-btn--icon-color);
vertical-align: sub;
}
.add-btn-text {
@@ -425,9 +424,9 @@ export default {
padding: 10px;
font-family: Inter, -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen, Ubuntu, Cantarell, 'Open Sans',
'Helvetica Neue', sans-serif;
color: var(--ti-lowcode-plugin-panel-title-color);
font-weight: var(--ti-lowcode-plugin-panel-title-font-weight);
border-bottom: 1px solid var(--ti-lowcode-data-header-border-bottom-color);
color: var(--te-state-common-text-color);
font-weight: var(--te-base-font-weight-bold);
border-bottom: 1px solid var(--te-state-common-border-color);
display: flex;
justify-content: space-between;
align-items: center;
@@ -456,9 +455,9 @@ export default {
.data-source-right-panel {
width: 492px;
height: 100%;
box-shadow: 6px 0px 3px 0px var(--te-base-box-shadow-rgba-3);
border-right: 1px solid var(--te-common-border-divider);
background: var(--te-common-bg-default);
box-shadow: 6px 0px 3px 0px var(--te-state-panel-shadow-color);
border-right: 1px solid var(--te-state-common-border-color);
background: var(--te-state-common-bg-color);
position: absolute;
left: var(--base-left-panel-width);
top: 0;
@@ -471,9 +470,9 @@ export default {
padding: 0 12px;
font-size: 12px;
font-weight: 700;
color: var(--te-common-text-primary);
background: var(--te-common-bg-default);
border-bottom: 1px solid var(--ti-lowcode-data-header-border-bottom-color);
color: var(--te-state-common-text-color);
background: var(--te-state-common-bg-color);
border-bottom: 1px solid var(--te-state-common-border-color);
.options-wrap {
display: flex;
column-gap: 8px;
4 changes: 2 additions & 2 deletions packages/plugins/state/src/StateFullscreenHead.vue
Original file line number Diff line number Diff line change
@@ -31,15 +31,15 @@ export default {
<style lang="less" scoped>
.fullscreen-head-content {
font-size: 12px;
color: var(--te-common-text-primary);
color: var(--te-state-common-text-color);
height: 30px;
line-height: 20px;
width: 100%;
display: flex;
justify-content: space-between;
.title {
font-size: var(--te-base-font-size-base);
color: var(--te-common-text-primary);
color: var(--te-state-common-text-color);
font-weight: var(--te-base-font-weight-7);
}
}
4 changes: 2 additions & 2 deletions packages/plugins/state/src/StateTips.vue
Original file line number Diff line number Diff line change
@@ -18,7 +18,7 @@
margin-top: 8px;
border-radius: 4px;
padding: 8px 14px;
background: var(--te-common-bg-container);
color: var(--te-common-text-weaken);
background: var(--te-state-tip-bg-color);
color: var(--te-state-tip-color);
}
</style>
21 changes: 21 additions & 0 deletions packages/plugins/state/src/styles/vars.less
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
:root {
--te-state-add-btn-border-color: var(--te-common-border-default);
--te-state-add-btn--hover-border-color: var(--te-common-border-hover);
--te-state-add-btn--icon-color: var(--te-common-icon-secondary);

--te-state-common-text-color: var(--te-common-text-primary);
--te-state-common-border-color: var(--te-common-border-divider);
--te-state-common-bg-color: var(--te-common-bg-default);
--te-state-common--hover-bg-color: var(--te-common-bg-container);
--te-state-common-label-text-color: var(--te-common-text-secondary);
--te-state-common-emphasize-text-color: var(--te-common-text-emphasize);

--te-state-tip-bg-color: var(--te-common-bg-container);
--te-state-tip-color: var(--te-common-text-weaken);

--te-state-data-list-color: var(--te-common-text-secondary);
--te-state-data-list-left-icon-color: var(--te-common-icon-secondary);
--te-state-editor-btn-border-color: var(--te-common-border-secondary);

--te-state-panel-shadow-color: var(--te-common-shadow-panel);
}