From 5b9d61a9fef1962d1996866b8d661b69f75a099d Mon Sep 17 00:00:00 2001
From: xuanlid <51027603+xuanlid@users.noreply.github.com>
Date: Thu, 23 Jan 2025 19:23:52 -0800
Subject: [PATCH] feat: Module variable rectification (#1065)
---
.../common/component/BlockHistoryTemplate.vue | 79 -------------------
packages/common/component/CloseIcon.vue | 10 +--
packages/common/component/ConfigItem.vue | 1 +
packages/common/component/PluginBlockList.vue | 16 ----
packages/common/component/PluginPanel.vue | 2 +-
packages/common/component/PluginSetting.vue | 2 +-
packages/common/component/SvgButton.vue | 7 +-
packages/common/component/index.js | 1 -
.../toolbar-built-in/ToolbarBaseButton.vue | 2 +-
packages/layout/src/DesignSettings.vue | 2 +
packages/plugins/block/src/BlockConfig.vue | 7 ++
packages/plugins/block/src/Main.vue | 12 ---
packages/plugins/help/src/HelpIcon.vue | 7 +-
.../src/meta/block/src/BlockGroup.vue | 12 ---
.../materials/src/meta/component/src/Main.vue | 2 +-
packages/plugins/page/src/Tree.vue | 6 +-
packages/plugins/robot/src/Main.vue | 4 +-
packages/plugins/script/src/Main.vue | 10 ---
packages/plugins/state/src/Main.vue | 4 +-
packages/plugins/tree/src/Main.vue | 14 +---
.../events/src/components/AdvanceConfig.vue | 1 +
.../events/src/components/BindEvents.vue | 22 +-----
.../components/BindEventsDialogContent.vue | 2 -
.../components/BindEventsDialogSidebar.vue | 10 +--
packages/theme/base/src/component-common.less | 26 +++++-
packages/theme/dark/block.less | 26 +-----
packages/theme/dark/bridge.less | 2 +-
packages/theme/dark/events.less | 27 +++----
packages/theme/dark/gpt-dialog.less | 2 +
packages/theme/dark/help.less | 3 +-
packages/theme/dark/i18n.less | 4 +-
packages/theme/dark/life-cycles.less | 4 +-
packages/theme/dark/materials.less | 26 +++---
packages/theme/dark/metaComponent.less | 24 +++++-
packages/theme/dark/pageManage.less | 2 +-
packages/theme/dark/plugin-js.less | 1 -
packages/theme/dark/settings.less | 4 +-
packages/theme/dark/toolbar.less | 15 ++--
packages/theme/dark/tree.less | 3 +-
packages/theme/dark/variable.less | 4 +-
packages/theme/light/block.less | 15 +---
packages/theme/light/bridge.less | 2 +-
packages/theme/light/events.less | 28 +++----
packages/theme/light/gpt-dialog.less | 2 +
packages/theme/light/help.less | 3 +-
packages/theme/light/i18n.less | 4 +-
packages/theme/light/life-cycles.less | 4 +-
packages/theme/light/materials.less | 26 +++---
packages/theme/light/metaComponent.less | 24 +++++-
packages/theme/light/pageManage.less | 2 +-
packages/theme/light/plugin-js.less | 1 -
packages/theme/light/settings.less | 4 +-
packages/theme/light/toolbar.less | 17 ++--
packages/theme/light/tree.less | 3 +-
packages/theme/light/variable.less | 8 +-
55 files changed, 204 insertions(+), 347 deletions(-)
delete mode 100644 packages/common/component/BlockHistoryTemplate.vue
diff --git a/packages/common/component/BlockHistoryTemplate.vue b/packages/common/component/BlockHistoryTemplate.vue
deleted file mode 100644
index 7e7cbbbd3..000000000
--- a/packages/common/component/BlockHistoryTemplate.vue
+++ /dev/null
@@ -1,79 +0,0 @@
-
-
-
- {{ blockHistory.version }}
- {{ format(blockHistory.updated_at, 'yyyy/MM/dd hh:mm:ss') }}
- (当前版本)
-
-
- {{ blockHistory.message }}
-
-
-
-
-
-
-
diff --git a/packages/common/component/CloseIcon.vue b/packages/common/component/CloseIcon.vue
index c105b7586..ee883ea00 100644
--- a/packages/common/component/CloseIcon.vue
+++ b/packages/common/component/CloseIcon.vue
@@ -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;
@@ -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);
}
}
diff --git a/packages/common/component/ConfigItem.vue b/packages/common/component/ConfigItem.vue
index 0f0fb3ea8..ad50df1e0 100644
--- a/packages/common/component/ConfigItem.vue
+++ b/packages/common/component/ConfigItem.vue
@@ -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;
diff --git a/packages/common/component/PluginBlockList.vue b/packages/common/component/PluginBlockList.vue
index 289cbe8b5..13d8f2964 100644
--- a/packages/common/component/PluginBlockList.vue
+++ b/packages/common/component/PluginBlockList.vue
@@ -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);
@@ -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;
diff --git a/packages/common/component/PluginPanel.vue b/packages/common/component/PluginPanel.vue
index 297ef4fd2..c0f444f6a 100644
--- a/packages/common/component/PluginPanel.vue
+++ b/packages/common/component/PluginPanel.vue
@@ -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;
diff --git a/packages/common/component/PluginSetting.vue b/packages/common/component/PluginSetting.vue
index 79a0be627..463c8ec12 100644
--- a/packages/common/component/PluginSetting.vue
+++ b/packages/common/component/PluginSetting.vue
@@ -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) {
diff --git a/packages/common/component/SvgButton.vue b/packages/common/component/SvgButton.vue
index 996f98ccb..9db5fc1ea 100644
--- a/packages/common/component/SvgButton.vue
+++ b/packages/common/component/SvgButton.vue
@@ -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 {
@@ -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);
+ }
}
diff --git a/packages/common/component/index.js b/packages/common/component/index.js
index 0d40e5553..7397fd280 100644
--- a/packages/common/component/index.js
+++ b/packages/common/component/index.js
@@ -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'
diff --git a/packages/common/component/toolbar-built-in/ToolbarBaseButton.vue b/packages/common/component/toolbar-built-in/ToolbarBaseButton.vue
index 57b6ad041..dc4359b8a 100644
--- a/packages/common/component/toolbar-built-in/ToolbarBaseButton.vue
+++ b/packages/common/component/toolbar-built-in/ToolbarBaseButton.vue
@@ -33,7 +33,7 @@ export default {
diff --git a/packages/settings/events/src/components/BindEventsDialogContent.vue b/packages/settings/events/src/components/BindEventsDialogContent.vue
index 8ae30bdb9..de214fbef 100644
--- a/packages/settings/events/src/components/BindEventsDialogContent.vue
+++ b/packages/settings/events/src/components/BindEventsDialogContent.vue
@@ -126,7 +126,6 @@ export default {
.monaco-editor {
width: 100%;
height: 216px;
- padding: 12px 8px;
color: var(--te-common-text-secondary);
}
.mark {
@@ -135,7 +134,6 @@ export default {
position: absolute;
z-index: 1;
top: 0;
- background-color: var(--ti-lowcode-bind-event-dialog-mark-bg-color);
}
}
diff --git a/packages/settings/events/src/components/BindEventsDialogSidebar.vue b/packages/settings/events/src/components/BindEventsDialogSidebar.vue
index ae8aa1a69..abeff175f 100644
--- a/packages/settings/events/src/components/BindEventsDialogSidebar.vue
+++ b/packages/settings/events/src/components/BindEventsDialogSidebar.vue
@@ -8,7 +8,6 @@
{{ item.title || item.name }}
-
@@ -20,14 +19,12 @@