From 6b445b4cf2a0183acd36d27f9057a311b8740f39 Mon Sep 17 00:00:00 2001 From: lixuan Date: Sat, 25 Jan 2025 23:31:42 -0800 Subject: [PATCH 01/16] feat: variable convergence in block/help/bridge --- .../common/component/PluginBlockItemImg.vue | 2 +- packages/common/component/PluginBlockList.vue | 25 +++-------- packages/plugins/block/index.js | 1 + packages/plugins/block/src/BlockConfig.vue | 14 +++---- packages/plugins/block/src/BlockEvent.vue | 2 +- packages/plugins/block/src/BlockEventForm.vue | 2 +- packages/plugins/block/src/BlockEventList.vue | 6 +-- .../plugins/block/src/BlockGroupArrange.vue | 10 ++--- packages/plugins/block/src/BlockProperty.vue | 2 +- .../plugins/block/src/BlockPropertyForm.vue | 6 +-- .../plugins/block/src/BlockPropertyList.vue | 19 --------- packages/plugins/block/src/BlockSetting.vue | 2 +- packages/plugins/block/src/Main.vue | 36 ++++++---------- packages/plugins/block/src/SaveNewBlock.vue | 2 +- packages/plugins/block/src/styles/vars.less | 41 +++++++++++++++++++ packages/plugins/bridge/index.js | 1 + packages/plugins/bridge/src/BridgeManage.vue | 8 ++-- packages/plugins/bridge/src/BridgeSetting.vue | 24 +++-------- packages/plugins/bridge/src/styles/vars.less | 13 ++++++ packages/plugins/help/index.js | 1 + packages/plugins/help/src/HelpIcon.vue | 16 ++++---- packages/plugins/help/src/styles/vars.less | 10 +++++ packages/theme/base/src/component-common.less | 3 ++ 23 files changed, 131 insertions(+), 115 deletions(-) create mode 100644 packages/plugins/block/src/styles/vars.less create mode 100644 packages/plugins/bridge/src/styles/vars.less create mode 100644 packages/plugins/help/src/styles/vars.less diff --git a/packages/common/component/PluginBlockItemImg.vue b/packages/common/component/PluginBlockItemImg.vue index dbd9d61ed..fdf1f2901 100644 --- a/packages/common/component/PluginBlockItemImg.vue +++ b/packages/common/component/PluginBlockItemImg.vue @@ -66,7 +66,7 @@ const handleCheck = (v) => { width: 100%; flex: 1; border-radius: 4px; - background-color: var(--ti-lowcode-component-block-list-item-active-bg); + background-color: var(--te-common-bg-container); .top-left { display: flex; diff --git a/packages/common/component/PluginBlockList.vue b/packages/common/component/PluginBlockList.vue index 13d8f2964..d259244f9 100644 --- a/packages/common/component/PluginBlockList.vue +++ b/packages/common/component/PluginBlockList.vue @@ -356,17 +356,17 @@ export default { max-width: 500px; max-height: 136px; padding: 12px; - background: var(--ti-lowcode-component-block-list-shortcut-bg); + background: var(--te-common-bg-default); border-radius: 5px; border: 1px solid var(--te-common-border-default); top: v-bind('state.top'); .block-shortcut-title { - color: var(--ti-lowcode-component-block-list-shortcut-title-color); + color: var(--te-common-text-primary); font-weight: 600; margin-bottom: 8px; } .block-shortcut-description { - color: var(--ti-lowcode-component-block-list-item-color); + color: var(--te-common-text-secondary); margin-bottom: 20px; font-size: 12px; } @@ -511,7 +511,7 @@ export default { } &.is-active { - background: var(--ti-lowcode-component-block-list-item-active-bg); + background: var(--te-common-bg-container); } &.is-disabled { @@ -698,7 +698,7 @@ export default { line-height: 16px; } .item-description { - color: var(--ti-lowcode-toolbar-title-color); + color: var(--te-common-text-primary); font-size: 12px; } } @@ -717,7 +717,7 @@ export default { } .setting-menu { font-size: 12px; - color: var(--ti-lowcode-component-block-setting-item-text-color); + color: var(--te-common-text-primary); .list { display: flex; } @@ -734,16 +734,3 @@ export default { } } - - diff --git a/packages/plugins/block/index.js b/packages/plugins/block/index.js index abea29813..b5fc6f52e 100644 --- a/packages/plugins/block/index.js +++ b/packages/plugins/block/index.js @@ -14,6 +14,7 @@ import entry, { api } from './src/Main.vue' import metaData from './meta.js' import { BlockService } from './src/composable' import SaveNewBlock from './src/SaveNewBlock.vue' +import './src/styles/vars.less' export default { ...metaData, diff --git a/packages/plugins/block/src/BlockConfig.vue b/packages/plugins/block/src/BlockConfig.vue index ccc19674b..4d1a9f9c6 100644 --- a/packages/plugins/block/src/BlockConfig.vue +++ b/packages/plugins/block/src/BlockConfig.vue @@ -307,18 +307,18 @@ export default { .block-tag-create { .tag-button { - color: var(--ti-lowcode-block-config-tag-color); - background-color: var(--ti-lowcode-block-config-tag-bg); + color: var(--te-block-config-tag-color); + background-color: var(--te-block-config-tag-bg); border: none; height: 28px; :deep(.tiny-tag__close) { - fill: var(--ti-lowcode-block-config-tag-close-color); + fill: var(--te-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); + color: var(--te-block-config-tag-hover-color); + background-color: var(--te-block-config-tag-hover-bg); :deep(.tiny-tag__close) { - fill: var(--ti-lowcode-block-config-tag-close-hover-color); + fill: var(--te-block-config-tag-close-hover-color); } } } @@ -328,7 +328,7 @@ export default { line-height: 20px; padding-top: 0; padding-bottom: 0; - border: 1px solid var(--te-common-border-default); + border: 1px solid var(--te-block-config-new-tag-border-color); } .tiny-input { diff --git a/packages/plugins/block/src/BlockEvent.vue b/packages/plugins/block/src/BlockEvent.vue index 248beceba..c366b4d98 100644 --- a/packages/plugins/block/src/BlockEvent.vue +++ b/packages/plugins/block/src/BlockEvent.vue @@ -58,7 +58,7 @@ export default { diff --git a/packages/plugins/block/src/BlockEventList.vue b/packages/plugins/block/src/BlockEventList.vue index af75d2ee7..4d35c03aa 100644 --- a/packages/plugins/block/src/BlockEventList.vue +++ b/packages/plugins/block/src/BlockEventList.vue @@ -66,7 +66,7 @@ export default { .item-text { flex: 1; - color: var(--te-common-text-primary); + color: var(--te-block-event-list-color); } .item-text.active { font-weight: 700; @@ -77,11 +77,11 @@ export default { } .add-button { :deep(.tiny-button) { - border: 1px solid var(--te-common-border-default); + border: 1px solid var(--te-block-event-list-btn-border-color); } .icon-plus { margin-right: 6px; - stroke: var(--te-common-text-weaken); + stroke: var(--te-block-event-list-btn-icon-color); } } diff --git a/packages/plugins/block/src/BlockGroupArrange.vue b/packages/plugins/block/src/BlockGroupArrange.vue index a4c38be01..21a5f0412 100644 --- a/packages/plugins/block/src/BlockGroupArrange.vue +++ b/packages/plugins/block/src/BlockGroupArrange.vue @@ -48,11 +48,11 @@ export default { diff --git a/packages/plugins/block/src/BlockSetting.vue b/packages/plugins/block/src/BlockSetting.vue index 639fc6d80..d106e8d76 100644 --- a/packages/plugins/block/src/BlockSetting.vue +++ b/packages/plugins/block/src/BlockSetting.vue @@ -361,7 +361,7 @@ export default { margin-right: 3px; } - color: var(--ti-lowcode-block-video-tip-color); + color: var(--te-block-video-tip-color); } } :deep(.tiny-collapse-item__content) { diff --git a/packages/plugins/block/src/Main.vue b/packages/plugins/block/src/Main.vue index f33d19f43..09d0583be 100644 --- a/packages/plugins/block/src/Main.vue +++ b/packages/plugins/block/src/Main.vue @@ -460,7 +460,7 @@ export default { } .app-manage-search { padding: 0 10px 12px 10px; - border-bottom: 1px solid var(--ti-lowcode-plugin-panel-header-border-bottom-color); + border-bottom: 1px solid var(--te-block-panel-header-border-bottom-color); } .block-popper { .block-group-option-item { @@ -495,18 +495,18 @@ export default { left: -6px; right: 0; padding: 8px 16px; - border-top: 1px solid var(--te-common-border-divider); - background-color: var(--te-common-bg-default); - color: var(--te-common-text-primary); + border-top: 1px solid var(--te-block-panel-footer-border-color); + background-color: var(--te-block-panel-footer-bg-color); + color: var(--te-block-panel-footer-color); display: flex; justify-content: space-between; :deep(.tiny-dropdown) { - color: var(--te-common-text-primary); + color: var(--te-block-panel-footer-text-color); .tiny-dropdown__trigger:not(.tiny-dropdown__caret-button):not(.is-disabled):hover { - color: var(--te-common-text-primary); + color: var(--te-block-panel-footer-text-color); } .tiny-dropdown__suffix-inner { - color: var(--te-common-icon-secondary); + color: var(--te-block-panel-footer-icon-color); height: 10px; } } @@ -515,12 +515,12 @@ export default { } .footer-layout { font-size: 12px; - color: var(--te-common-text-primary); + color: var(--te-block-panel-footer-text-color); .tiny-svg { cursor: pointer; margin-left: 8px; &.active { - color: var(--ti-lowcode-icon-bind-color); + color: var(--te-block-panel-footer-icon-bind-color); } } } @@ -537,8 +537,8 @@ export default { &:not(.is-disabled):active, &:not(.is-disabled):hover, &:focus { - background-color: var(--te-common-bg-container); - color: var(--te-common-text-primary); + background-color: var(--te-block-panel-footer-active-bg-color); + color: var(--te-block-panel-footer-text-color); } } :deep(.tiny-dropdown-menu.tiny-popper[x-placement^='top']) { @@ -551,27 +551,17 @@ export default { width: 220px; height: 108px; box-sizing: border-box; - background-color: var(--ti-lowcode-materials-block-group-delete-popover-bg-color); padding: 6px; - &[x-placement^='right'] { - .popper__arrow { - &, - &::after { - border-right-color: var(--te-common-bg-container); - } - } - } - .popper-confirm-header { font-size: var(--te-base-font-size-1); - color: var(--te-common-text-primary); + color: var(--te-block-popper-title-color); font-weight: var(--te-base-font-weight-7); margin-bottom: 12px; } .popper-confirm-content { font-size: 12px; - color: var(--te-common-text-secondary); + color: var(--te-block-popper-content-color); } .popper-confirm-footer { text-align: right; diff --git a/packages/plugins/block/src/SaveNewBlock.vue b/packages/plugins/block/src/SaveNewBlock.vue index 9f7d8e751..bd51cfdb3 100644 --- a/packages/plugins/block/src/SaveNewBlock.vue +++ b/packages/plugins/block/src/SaveNewBlock.vue @@ -136,6 +136,6 @@ export default { diff --git a/packages/plugins/block/src/styles/vars.less b/packages/plugins/block/src/styles/vars.less new file mode 100644 index 000000000..cbf698355 --- /dev/null +++ b/packages/plugins/block/src/styles/vars.less @@ -0,0 +1,41 @@ +:root { + --te-block-alert-color: var(--te-common-text-weaken); + --te-block-error-tip-color: var(--te-common-color-error); + // 区块列表 - 面板 + --te-block-panel-header-border-bottom-color: var(--te-common-border-divider); + --te-block-panel-footer-color: var(--te-common-text-primary); + --te-block-panel-footer-bg-color: var(--te-common-bg-default); + --te-block-panel-footer-border-color: var(--te-common-border-divider); + --te-block-panel-footer-text-color: var(--te-common-text-primary); + --te-block-panel-footer-icon-color: var(--te-common-icon-secondary); + // 绑定时icon图标颜色 + --te-block-panel-footer-icon-bind-color: var(--te-common-text-checked); + --te-block-panel-footer-active-bg-color: var(--te-common-bg-secondary); + // 区块 - 删除分组气泡框 + --te-block-popper-title-color: var(--te-common-text-primary); + --te-block-popper-content-color: var(--te-common-text-secondary); + // 区块列表 - 列表状态切换图标 + --te-block-panel-footer-btn-bg-color: var(--te-common-bg-container); + --te-block-panel-footer-btn-icon-color: var(--te-common-icon-secondary); + --te-block-panel-footer-btn-avtive-color: var(--te-common-icon-primary); + --te-block-panel-footer-btn-avtive-border-color: var(--te-common-border-active); + --te-block-panel-footer-btn-avtive-bg-color: var(--te-common-bg-default); + // 区块设置 - 标签 + --te-block-config-tag-color: var(--te-common-text-primary); + --te-block-config-tag-bg: var(--te-common-bg-disabled); + --te-block-config-tag-hover-color: var(--te-common-text-primary); + --te-block-config-tag-hover-bg: var(--te-common-bg-disabled); + --te-block-config-tag-close-color: var(--te-common-icon-secondary); + --te-block-config-tag-close-hover-color: var(--te-common-icon-primary); + --te-block-config-new-tag-border-color: var(--te-common-border-default); + --te-block-event-link-border-color: var(--te-common-border-default); + --te-block-event-list-color: var(--te-common-text-primary); + --te-block-event-list-btn-border-color: var(--te-common-border-default); + --te-block-event-list-btn-icon-color: var(--te-common-text-weaken); + // 区块设置 - 属性设置 + --te-block-property-add-item-color: var(--te-common-text-checked); + --te-block-property-config-item-bg-color: var(--te-common-bg-default); + --te-block-property-config-item-border-color: var(--te-common-border-default); + // 查看指引视频 + --te-block-video-tip-color: var(--te-common-text-link); +} diff --git a/packages/plugins/bridge/index.js b/packages/plugins/bridge/index.js index 45f2bf34e..9b16408a7 100644 --- a/packages/plugins/bridge/index.js +++ b/packages/plugins/bridge/index.js @@ -12,6 +12,7 @@ import entry from './src/Main.vue' import metaData from './meta.js' +import './src/styles/vars.less' export default { ...metaData, diff --git a/packages/plugins/bridge/src/BridgeManage.vue b/packages/plugins/bridge/src/BridgeManage.vue index 836f38c06..9c2cb6700 100644 --- a/packages/plugins/bridge/src/BridgeManage.vue +++ b/packages/plugins/bridge/src/BridgeManage.vue @@ -144,7 +144,7 @@ export default { .list { flex: 1; - border-top: 1px solid var(--ti-lowcode-tabs-border-color); + border-top: 1px solid var(--te-bridge-list-border-color); overflow: auto; padding: 12px 0; } @@ -158,13 +158,13 @@ export default { align-items: center; padding: 0 12px; position: relative; - color: var(--ti-lowcode-bridge-list-color); + color: var(--te-bridge-list-color); cursor: pointer; font-size: 12px; &:hover, &.active { - background: var(--ti-lowcode-bridge-list-bg); + background: var(--te-bridge-list-bg-color); .setting-icon { display: grid; } @@ -174,7 +174,7 @@ export default { display: none; } .list-item-icon { - color: var(--te-common-icon-secondary); + color: var(--te-bridge-list-icon-color); margin-right: 8px; } } diff --git a/packages/plugins/bridge/src/BridgeSetting.vue b/packages/plugins/bridge/src/BridgeSetting.vue index fe5e5a2fd..fcb9530d2 100644 --- a/packages/plugins/bridge/src/BridgeSetting.vue +++ b/packages/plugins/bridge/src/BridgeSetting.vue @@ -300,7 +300,7 @@ export default { font-size: 11px; line-height: 18px; margin-top: 8px; - color: var(--ti-lowcode-datasource-tip-color); + color: var(--te-bridge-setting-tip-color); } :deep(.tiny-form-item__label) { .cdn-tips-icon { @@ -312,10 +312,10 @@ export default { .title-wrap { font-size: 12px; font-weight: 700; - color: var(--te-common-text-primary); + color: var(--te-bridge-setting-title-color); .help-link { display: inline-block; - color: var(--te-common-text-link); + color: var(--te-bridge-setting-link-color); font-size: 12px; margin-left: 16px; &:hover { @@ -339,19 +339,7 @@ export default { .monaco-editor { height: 500px; margin-top: 8px; - border: 1px solid var(--ti-lowcode-birdge-editor-border-color); - } - - .resource-form-footer { - padding: 12px 0 12px 80px; - - .tiny-svg { - margin-right: 6px; - } - - .del:hover { - background-color: var(--te-common-color-error); - } + border: 1px solid var(--te-bridge-editor-border-color); } .cdn-label-wrap { display: flex; @@ -362,8 +350,8 @@ export default { .code-preview { font-size: 12px; line-height: 20px; - background: var(--te-common-bg-container); - color: var(--te-common-text-weaken); + background: var(--te-bridge-setting-code-bg-color); + color: var(--te-bridge-setting-code-color); border-radius: 4px; & .pre-title { diff --git a/packages/plugins/bridge/src/styles/vars.less b/packages/plugins/bridge/src/styles/vars.less new file mode 100644 index 000000000..63d76bd7f --- /dev/null +++ b/packages/plugins/bridge/src/styles/vars.less @@ -0,0 +1,13 @@ +:root { + // 资源管理 + --te-bridge-list-color: var(--te-common-text-primary); + --te-bridge-list-bg-color: var(--te-common-bg-container); + --te-bridge-list-icon-color: var(--te-common-icon-secondary); + --te-bridge-list-border-color: var(--te-common-border-default); + --te-bridge-editor-border-color: var(--te-common-border-divider); + --te-bridge-setting-tip-color: var(--te-common-text-weaken); + --te-bridge-setting-title-color: var(--te-common-text-primary); + --te-bridge-setting-link-color: var(--te-common-text-link); + --te-bridge-setting-code-color: var(--te-common-text-weaken); + --te-bridge-setting-code-bg-color: var(--te-common-bg-container); +} diff --git a/packages/plugins/help/index.js b/packages/plugins/help/index.js index 377d18c12..430c0bc35 100644 --- a/packages/plugins/help/index.js +++ b/packages/plugins/help/index.js @@ -12,6 +12,7 @@ import metaData from './meta.js' import { HelpService } from './src/composable' +import './src/styles/vars.less' export default { ...metaData, diff --git a/packages/plugins/help/src/HelpIcon.vue b/packages/plugins/help/src/HelpIcon.vue index 81fa646d1..c01d0a07e 100644 --- a/packages/plugins/help/src/HelpIcon.vue +++ b/packages/plugins/help/src/HelpIcon.vue @@ -301,7 +301,7 @@ div.tiny-guide.shepherd-element { .shepherd-title { font-size: 16px; line-height: 24px; - color: var(--ti-lowcode-help-guide-title-text-color); + color: var(--te-help-guide-title-text-color); } .shepherd-cancel-icon { @@ -316,12 +316,12 @@ div.tiny-guide.shepherd-element { line-height: 20px; padding-top: 0; padding-bottom: 20px; - color: var(--ti-lowcode-help-guide-content-text-color); + color: var(--te-help-guide-content-text-color); } .shepherd-footer { .progress-style { - color: var(--ti-lowcode-help-guide-progress-style-text-color); + color: var(--te-help-guide-progress-style-text-color); } .shepherd-button { @@ -339,7 +339,7 @@ div.tiny-guide.shepherd-element { text-align: right; } &-title { - color: var(--ti-lowcode-help-box-title-text-color); + color: var(--te-help-box-title-text-color); font-size: 12px; font-weight: 600; line-height: 18px; @@ -358,8 +358,8 @@ div.tiny-guide.shepherd-element { font-size: 12px; margin: 0 -16px; padding: 0 16px; - color: var(--te-common-text-primary); - fill: var(--te-common-icon-primary); + color: var(--te-help-box-item-text-color); + fill: var(--te-help-box-item-text-color); span { display: flex; align-items: center; @@ -369,13 +369,13 @@ div.tiny-guide.shepherd-element { } } &-item:hover { - background: var(--ti-lowcode-help-box-item-hover-bg-color); + background: var(--te-help-box-item-hover-bg-color); } &-ques { &-title { padding-top: 8px; - border-top: 1px solid var(--ti-lowcode-help-box-question-border-top); + border-top: 1px solid var(--te-help-box-question-border-top); } } diff --git a/packages/plugins/help/src/styles/vars.less b/packages/plugins/help/src/styles/vars.less new file mode 100644 index 000000000..c7f876d83 --- /dev/null +++ b/packages/plugins/help/src/styles/vars.less @@ -0,0 +1,10 @@ +:root { + --te-help-guide-content-text-color: var(--te-common-text-secondary); + --te-help-guide-title-text-color: var(--te-common-text-primary); + --te-help-guide-progress-style-text-color: var(--te-common-text-primary); + + --te-help-box-title-text-color: var(--te-common-text-primary); + --te-help-box-item-text-color: var(--te-common-text-primary); + --te-help-box-question-border-top: var(--te-common-border-divider); + --te-help-box-item-hover-bg-color: var(--te-common-bg-container); +} diff --git a/packages/theme/base/src/component-common.less b/packages/theme/base/src/component-common.less index 6cb5807b7..e0e0bcc7a 100644 --- a/packages/theme/base/src/component-common.less +++ b/packages/theme/base/src/component-common.less @@ -590,6 +590,9 @@ box-shadow: 0 -2px 12px 0 var(--te-base-box-shadow-rgba-2); height: auto; + .popper__arrow { + background: var(--te-common-bg-popover); + } } // 13、tag标签 From d3bf61df85efdebf81ea0a0ac2943cc4135f4d9b Mon Sep 17 00:00:00 2001 From: lixuan Date: Sun, 26 Jan 2025 01:29:12 -0800 Subject: [PATCH 02/16] feat: variable convergence in datasource/i18n --- packages/plugins/datasource/index.js | 1 + .../datasource/src/DataSourceField.vue | 12 ++--- .../datasource/src/DataSourceFieldCheck.vue | 2 +- .../src/DataSourceFieldCheckMultipleLine.vue | 2 +- .../src/DataSourceFieldCheckRanger.vue | 4 +- .../datasource/src/DataSourceFieldForm.vue | 12 ++--- .../datasource/src/DataSourceFieldList.vue | 8 +-- .../datasource/src/DataSourceFieldType.vue | 14 +++--- .../plugins/datasource/src/DataSourceForm.vue | 2 +- .../plugins/datasource/src/DataSourceList.vue | 12 ++--- .../datasource/src/DataSourceRecordForm.vue | 6 +-- .../datasource/src/DataSourceRecordList.vue | 22 ++++---- .../datasource/src/DataSourceRecordUpload.vue | 2 +- .../src/DataSourceRemoteAutoload.vue | 4 +- .../src/DataSourceRemoteDataAdapter.vue | 2 +- .../src/DataSourceRemoteDataResult.vue | 10 ++-- .../datasource/src/DataSourceRemoteForm.vue | 6 +-- .../src/DataSourceRemoteMapping.vue | 8 +-- .../datasource/src/DataSourceRemotePanel.vue | 18 +++---- .../src/DataSourceRemoteParameter.vue | 2 +- .../datasource/src/DataSourceTemplate.vue | 18 +++---- .../plugins/datasource/src/DataSourceType.vue | 12 ++--- .../datasource/src/RemoteDataAdapterForm.vue | 6 +-- .../plugins/datasource/src/styles/vars.less | 37 ++++++++++++++ packages/plugins/i18n/index.js | 1 + packages/plugins/i18n/src/Main.vue | 50 +++++-------------- packages/plugins/i18n/src/styles/vars.less | 17 +++++++ packages/theme/base/src/base.less | 1 + packages/theme/base/src/common.less | 8 +++ packages/theme/base/src/component-common.less | 2 +- 30 files changed, 170 insertions(+), 131 deletions(-) create mode 100644 packages/plugins/datasource/src/styles/vars.less create mode 100644 packages/plugins/i18n/src/styles/vars.less diff --git a/packages/plugins/datasource/index.js b/packages/plugins/datasource/index.js index 38557ebf4..2183f1bbc 100644 --- a/packages/plugins/datasource/index.js +++ b/packages/plugins/datasource/index.js @@ -14,6 +14,7 @@ import { fetchDataSourceList, fetchDataSourceDetail } from './src/js/http' import entry from './src/Main.vue' import metaData from './meta.js' import { DataSourceService } from './src/composable' +import './src/styles/vars.less' export default { ...metaData, diff --git a/packages/plugins/datasource/src/DataSourceField.vue b/packages/plugins/datasource/src/DataSourceField.vue index a2fc6a257..01f191a47 100644 --- a/packages/plugins/datasource/src/DataSourceField.vue +++ b/packages/plugins/datasource/src/DataSourceField.vue @@ -142,7 +142,7 @@ export default { diff --git a/packages/plugins/datasource/src/DataSourceFieldCheckMultipleLine.vue b/packages/plugins/datasource/src/DataSourceFieldCheckMultipleLine.vue index ded1b60d3..18e6a23fc 100644 --- a/packages/plugins/datasource/src/DataSourceFieldCheckMultipleLine.vue +++ b/packages/plugins/datasource/src/DataSourceFieldCheckMultipleLine.vue @@ -32,7 +32,7 @@ export default { diff --git a/packages/plugins/datasource/src/DataSourceFieldCheckRanger.vue b/packages/plugins/datasource/src/DataSourceFieldCheckRanger.vue index 6b3a58267..507d1783f 100644 --- a/packages/plugins/datasource/src/DataSourceFieldCheckRanger.vue +++ b/packages/plugins/datasource/src/DataSourceFieldCheckRanger.vue @@ -52,7 +52,7 @@ export default { width: 50%; .field-item-tip { padding-left: 5px; - color: var(--ti-lowcode-datasource-description-error-color); + color: var(--te-datasource-description-error-color); padding-right: 5px; padding-top: 5px; font-size: 12px; @@ -62,7 +62,7 @@ export default { margin-right: 12px; } .collection-field-item-label { - color: var(--ti-lowcode-datasource-dialog-font-color); + color: var(--te-datasource-dialog-font-color); } .collection-field-num { display: flex; diff --git a/packages/plugins/datasource/src/DataSourceFieldForm.vue b/packages/plugins/datasource/src/DataSourceFieldForm.vue index 464be12f8..d3ebb274e 100644 --- a/packages/plugins/datasource/src/DataSourceFieldForm.vue +++ b/packages/plugins/datasource/src/DataSourceFieldForm.vue @@ -176,7 +176,7 @@ export default { diff --git a/packages/plugins/datasource/src/DataSourceFieldList.vue b/packages/plugins/datasource/src/DataSourceFieldList.vue index b4c68a079..24e9e499d 100644 --- a/packages/plugins/datasource/src/DataSourceFieldList.vue +++ b/packages/plugins/datasource/src/DataSourceFieldList.vue @@ -138,15 +138,15 @@ export default { .field-cell-name { margin-left: 5px; .field-name { - color: var(--ti-lowcode-datasource-color); + color: var(--te-datasource-color); } .description { - color: var(--ti-lowcode-datasource-tip-color); + color: var(--te-datasource-tip-color); margin-left: 5px; } } svg { - color: var(--ti-lowcode-datasource-toolbar-icon-color); + color: var(--te-datasource-toolbar-icon-color); } } } @@ -159,7 +159,7 @@ export default { } } .form-item-border:hover { - background: var(--ti-lowcode-datasource-box-bg); + background: var(--te-datasource-box-bg); .field-operation { display: flex; justify-content: space-between; diff --git a/packages/plugins/datasource/src/DataSourceFieldType.vue b/packages/plugins/datasource/src/DataSourceFieldType.vue index 23c752884..1d3fff2b9 100644 --- a/packages/plugins/datasource/src/DataSourceFieldType.vue +++ b/packages/plugins/datasource/src/DataSourceFieldType.vue @@ -67,12 +67,12 @@ export default { diff --git a/packages/plugins/datasource/src/DataSourceList.vue b/packages/plugins/datasource/src/DataSourceList.vue index bed1f7f52..f0ac21fb9 100644 --- a/packages/plugins/datasource/src/DataSourceList.vue +++ b/packages/plugins/datasource/src/DataSourceList.vue @@ -132,21 +132,21 @@ export default { .datasource-list { flex-grow: 1; padding-top: 12px; - border-top: 1px solid var(--ti-lowcode-datasource-border-color); + border-top: 1px solid var(--te-datasource-border-color); } .datasource-list-item { - box-shadow: var(--ti-lowcode-datasource-tabs-border-color) 0, -1px; + box-shadow: var(--te-datasource-tabs-border-color) 0, -1px; height: 24px; line-height: 24px; align-items: center; display: grid; padding: 0 12px; position: relative; - color: var(--ti-lowcode-datasource-common-text-main-color); + color: var(--te-datasource-common-text-main-color); cursor: pointer; &:hover, &.active { - background: var(--ti-lowcode-datasource-list-hover-color); + background: var(--te-datasource-list-hover-color); .item-handler { display: inline-block; } @@ -157,13 +157,13 @@ export default { display: flex; align-items: center; justify-content: space-between; - color: var(--te-common-text-primary); + color: var(--te-datasource-list-item-text-color); .item-name { display: flex; align-items: center; } .plugin-icon-data { - color: var(--te-common-icon-secondary); + color: var(--te-datasource-list-item-icon-color); margin-right: 8px; } } diff --git a/packages/plugins/datasource/src/DataSourceRecordForm.vue b/packages/plugins/datasource/src/DataSourceRecordForm.vue index 73ad112ef..42fe23158 100644 --- a/packages/plugins/datasource/src/DataSourceRecordForm.vue +++ b/packages/plugins/datasource/src/DataSourceRecordForm.vue @@ -248,19 +248,19 @@ export default { .record-form-content { padding: 24px 10px 12px; .dot-tip { - color: var(--ti-lowcode-datasource-description-error-color); + color: var(--te-datasource-description-error-color); margin-right: 4px; vertical-align: middle; } .record-form-footer { padding: 12px 0; - border-top: 1px solid var(--ti-lowcode-datasource-tabs-border-color); + border-top: 1px solid var(--te-datasource-tabs-border-color); .tiny-svg { margin-right: 6px; } .del:hover { - background-color: var(--ti-lowcode-datasource-delete-button-hover-bg); + background-color: var(--te-datasource-delete-button-hover-bg); } } } diff --git a/packages/plugins/datasource/src/DataSourceRecordList.vue b/packages/plugins/datasource/src/DataSourceRecordList.vue index a00c1b1b0..18da8f49e 100644 --- a/packages/plugins/datasource/src/DataSourceRecordList.vue +++ b/packages/plugins/datasource/src/DataSourceRecordList.vue @@ -307,7 +307,7 @@ export default { const messageSaved = { render: () => ( - {'您确定要删除该条数据吗?'} + {'您确定要删除该条数据吗?'} ) } @@ -605,7 +605,7 @@ export default { &:hover { text-decoration: underline; } - color: var(--te-common-text-primary); + color: var(--te-datasource-common-primary-text-color); .icon-download { margin: 0 1px 4px 0; font-size: 16px; @@ -617,13 +617,13 @@ export default { display: flex; flex-direction: column; align-items: center; - color: var(--ti-lowcode-datasource-common-text-color-5); + color: var(--te-datasource-common-text-color-5); .empty-icon { width: 50px; height: 50px; } .add-column { - color: var(--ti-lowcode-datasource-json-border-color); + color: var(--te-datasource-json-border-color); cursor: pointer; } } @@ -635,7 +635,7 @@ export default { align-items: center; .svg-icon { margin-right: 10px; - color: var(--te-common-icon-secondary); + color: var(--te-datasource-list-item-icon-color); } } } @@ -648,25 +648,25 @@ export default { padding-right: 8px; .tiny-pager__pages { li.is-active { - background-color: var(--ti-lowcode-datasource-dialog-demo-border-color); + background-color: var(--te-datasource-dialog-demo-border-color); } li { &:not(.dot):not(.is-active):hover { - background-color: var(--ti-lowcode-datasource-common-hover-bg-1); - color: var(--ti-lowcode-datasource-common-primary-text-color); + background-color: var(--te-datasource-common-hover-bg-1); + color: var(--te-datasource-common-primary-text-color); } } } .tiny-pager__pull-left { - color: var(--ti-lowcode-datasource-toolbar-breadcrumb-color); + color: var(--te-datasource-toolbar-breadcrumb-color); } .tiny-pager__btn-next, .tiny-pager__btn-prev { &:not([disabled]):hover { - background-color: var(--ti-lowcode-datasource-icon-hover-bg); + background-color: var(--te-datasource-icon-hover-bg); svg { - color: var(--ti-lowcode-datasource-toolbar-icon-color); + color: var(--te-datasource-toolbar-icon-color); } } } diff --git a/packages/plugins/datasource/src/DataSourceRecordUpload.vue b/packages/plugins/datasource/src/DataSourceRecordUpload.vue index b73e8dd67..6e0209e07 100644 --- a/packages/plugins/datasource/src/DataSourceRecordUpload.vue +++ b/packages/plugins/datasource/src/DataSourceRecordUpload.vue @@ -186,6 +186,6 @@ export default { margin-left: 10px; } .confirm { - color: var(--ti-lowcode-datasource-common-error-color); + color: var(--te-datasource-common-error-color); } diff --git a/packages/plugins/datasource/src/DataSourceRemoteAutoload.vue b/packages/plugins/datasource/src/DataSourceRemoteAutoload.vue index e04c69d66..fb07b70e3 100644 --- a/packages/plugins/datasource/src/DataSourceRemoteAutoload.vue +++ b/packages/plugins/datasource/src/DataSourceRemoteAutoload.vue @@ -43,11 +43,11 @@ export default { margin-top: 12px; .use-service { - color: var(--ti-lowcode-datasource-color); + color: var(--te-datasource-color); font-size: 12px; span { - color: var(--ti-lowcode-datasource-description-warning-color); + color: var(--te-datasource-description-warning-color); } } } diff --git a/packages/plugins/datasource/src/DataSourceRemoteDataAdapter.vue b/packages/plugins/datasource/src/DataSourceRemoteDataAdapter.vue index 56b80c801..275bd05b1 100644 --- a/packages/plugins/datasource/src/DataSourceRemoteDataAdapter.vue +++ b/packages/plugins/datasource/src/DataSourceRemoteDataAdapter.vue @@ -110,7 +110,7 @@ export default { } .life-cycle-alert { font-size: var(--te-base-font-size-base); - color: var(--te-common-text-weaken); + color: var(--te-datasource-common-tip-color); } } diff --git a/packages/plugins/datasource/src/DataSourceRemoteDataResult.vue b/packages/plugins/datasource/src/DataSourceRemoteDataResult.vue index c510c6e94..b8df98e5e 100644 --- a/packages/plugins/datasource/src/DataSourceRemoteDataResult.vue +++ b/packages/plugins/datasource/src/DataSourceRemoteDataResult.vue @@ -93,12 +93,12 @@ export default { .life-cycle-alert { font-size: var(--te-base-font-size-base); - color: var(--te-common-text-weaken); + color: var(--te-datasource-common-tip-color); } .title { - color: var(--ti-lowcode-datasource-toolbar-breadcrumb-color); + color: var(--te-datasource-toolbar-breadcrumb-color); display: inline-block; - border-bottom: 1px solid var(--ti-lowcode-datasource-tabs-border-color); + border-bottom: 1px solid var(--te-datasource-tabs-border-color); width: 100%; padding-bottom: 8px; } @@ -115,7 +115,7 @@ export default { z-index: 9999; .tiny-button { border-radius: 4px; - border-color: var(--te-common-border-secondary); + border-color: var(--te-datasource-common-btn-border-color); & + .tiny-button { margin-left: 4px; } @@ -125,7 +125,7 @@ export default { .monaco-editor { height: 120px; margin-top: 8px; - border: 1px solid var(--te-common-border-divider); + border: 1px solid var(--te-datasource-common-border-color); border-radius: 4px; } } diff --git a/packages/plugins/datasource/src/DataSourceRemoteForm.vue b/packages/plugins/datasource/src/DataSourceRemoteForm.vue index 174d5fda5..5fcd57703 100644 --- a/packages/plugins/datasource/src/DataSourceRemoteForm.vue +++ b/packages/plugins/datasource/src/DataSourceRemoteForm.vue @@ -84,12 +84,12 @@ export default { diff --git a/packages/plugins/datasource/src/DataSourceTemplate.vue b/packages/plugins/datasource/src/DataSourceTemplate.vue index 8c9a998f1..0fcb03e55 100644 --- a/packages/plugins/datasource/src/DataSourceTemplate.vue +++ b/packages/plugins/datasource/src/DataSourceTemplate.vue @@ -57,13 +57,13 @@ export default { diff --git a/packages/plugins/datasource/src/styles/vars.less b/packages/plugins/datasource/src/styles/vars.less new file mode 100644 index 000000000..656ce347e --- /dev/null +++ b/packages/plugins/datasource/src/styles/vars.less @@ -0,0 +1,37 @@ +:root { + --te-datasource-toolbar-icon-color: var(--te-common-text-primary); + --te-datasource-tabs-border-color: var(--te-common-border-default); + --te-datasource-toolbar-breadcrumb-color: var(--te-common-text-primary); + --te-datasource-json-border-color: var(--te-common-border-checked); + --te-datasource-tree-border-color: var(--te-common-color-success); + --te-datasource-common-border-primary-color: var(--te-common-border-checked); + --te-datasource-success-border-color: var(--te-common-color-success); + --te-datasource-input-icon-color: var(--te-common-text-secondary); + --te-datasource-dialog-demo-border-color: var(--te-common-text-secondary); + --te-datasource-dialog-font-color: var(--te-common-text-secondary); + --te-datasource-toolbar-bg: var(--te-common-bg-container); + --te-datasource-description-error-color: var(--te-common-color-error); + --te-datasource-common-text-main-color: var(--te-common-text-secondary); + --te-datasource-toolbar-more-hover-color: var(--te-common-text-weaken); + --te-datasource-delete-button-hover-bg: var(--te-common-color-error); + --te-datasource-common-text-color-5: var(--te-common-text-weaken); + --te-datasource-common-hover-bg-1: var(--te-common-bg-container); + --te-datasource-common-primary-text-color: var(--te-common-text-primary); + --te-datasource-icon-hover-bg: var(--te-common-bg-container); + --te-datasource-common-error-color: var(--te-common-color-error); + --te-datasource-description-warning-color: var(--te-common-color-warning); + --te-datasource-error-tip-color: var(--te-common-color-error); + --te-datasource-label-color: var(--te-common-text-secondary); + --te-datasource-list-hover-color: var(--te-common-bg-container); + --te-datasource-modal-text-color: var(--te-common-text-primary); + --te-datasource-respones-color-bg: var(--te-common-bg-primary-checked); + --te-datasource-border-color: var(--te-common-border-default); + --te-datasource-color: var(--te-common-text-primary); + --te-datasource-box-bg: var(--te-common-bg-container); + --te-datasource-tip-color: var(--te-common-text-weaken); + --te-datasource-list-item-text-color: var(--te-common-text-primary); + --te-datasource-list-item-icon-color: var(--te-common-icon-secondary); + --te-datasource-common-tip-color: var(--te-common-text-weaken); + --te-datasource-common-btn-border-color: var(--te-common-border-secondary); + --te-datasource-common-border-color: var(--te-common-border-divider); +} diff --git a/packages/plugins/i18n/index.js b/packages/plugins/i18n/index.js index 81947e0ba..133b46f45 100644 --- a/packages/plugins/i18n/index.js +++ b/packages/plugins/i18n/index.js @@ -12,6 +12,7 @@ import entry from './src/Main.vue' import metaData from './meta.js' import { TranslateService } from './src/composable' +import './src/styles/vars.less' export default { ...metaData, diff --git a/packages/plugins/i18n/src/Main.vue b/packages/plugins/i18n/src/Main.vue index 6296f5933..4d8e31432 100644 --- a/packages/plugins/i18n/src/Main.vue +++ b/packages/plugins/i18n/src/Main.vue @@ -434,7 +434,7 @@ export default { diff --git a/packages/plugins/robot/src/styles/vars.less b/packages/plugins/robot/src/styles/vars.less index 4c5f4b58e..d0e88f749 100644 --- a/packages/plugins/robot/src/styles/vars.less +++ b/packages/plugins/robot/src/styles/vars.less @@ -1,6 +1,8 @@ :root { // chatGPT聊天窗问题模板文字颜色 --te-chat-model-text: #191919; + // chatGPT聊天窗问题模板下拉图标颜色 + --te-chat-model-dropdown-icon: #808080; // chatGPT聊天窗右上角图标颜色 --te-chat-model-icon: #191919; // chatGPT聊天窗问题模板文字边框颜色 @@ -61,6 +63,5 @@ // chatGPT model-popover --te-chat-model-popover-bg: #fff; --te-chat-model-popover-color: #191919; - --te-chat-model-popover-active-bg: #fff; - --te-chat-model-popover-active-color: #1476ff; + --te-chat-model-popover-active-bg: #f5f5f5; } From 2ecb65bf3ec0985323c31252e46fc68a90a21f99 Mon Sep 17 00:00:00 2001 From: lixuan Date: Tue, 4 Feb 2025 19:44:02 -0800 Subject: [PATCH 06/16] feat: variable convergence in plugins robot --- packages/plugins/robot/src/Main.vue | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/packages/plugins/robot/src/Main.vue b/packages/plugins/robot/src/Main.vue index 40731e59e..3f1b38171 100644 --- a/packages/plugins/robot/src/Main.vue +++ b/packages/plugins/robot/src/Main.vue @@ -454,9 +454,12 @@ export default { } .chat-title-label, .ml8 { - color: var(--te-chat-model-dropdown-icon); + color: var(--te-chat-model-text); font-weight: 700; font-size: 16px; + } + .ml8 { + color: var(--te-chat-model-dropdown-icon); margin-left: 10px; } } From 3f1448fe6a9c2ba8d6647025231941beddfdf907 Mon Sep 17 00:00:00 2001 From: lixuan Date: Tue, 4 Feb 2025 22:06:13 -0800 Subject: [PATCH 07/16] feat: variable convergence in plugins robot --- packages/plugins/robot/src/Main.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/plugins/robot/src/Main.vue b/packages/plugins/robot/src/Main.vue index 3f1b38171..c907d45a8 100644 --- a/packages/plugins/robot/src/Main.vue +++ b/packages/plugins/robot/src/Main.vue @@ -460,6 +460,7 @@ export default { } .ml8 { color: var(--te-chat-model-dropdown-icon); + fill: var(--te-chat-model-dropdown-icon); margin-left: 10px; } } From 9958ac2874dc8f2ed2e5f6b36e71655dc7971049 Mon Sep 17 00:00:00 2001 From: lixuan Date: Thu, 6 Feb 2025 23:00:30 -0800 Subject: [PATCH 08/16] feat: revoke common variable modify --- .../common/component/PluginBlockItemImg.vue | 2 +- packages/common/component/PluginBlockList.vue | 29 ++++++++++++++----- 2 files changed, 22 insertions(+), 9 deletions(-) diff --git a/packages/common/component/PluginBlockItemImg.vue b/packages/common/component/PluginBlockItemImg.vue index fdf1f2901..dbd9d61ed 100644 --- a/packages/common/component/PluginBlockItemImg.vue +++ b/packages/common/component/PluginBlockItemImg.vue @@ -66,7 +66,7 @@ const handleCheck = (v) => { width: 100%; flex: 1; border-radius: 4px; - background-color: var(--te-common-bg-container); + background-color: var(--ti-lowcode-component-block-list-item-active-bg); .top-left { display: flex; diff --git a/packages/common/component/PluginBlockList.vue b/packages/common/component/PluginBlockList.vue index d259244f9..a36abb10b 100644 --- a/packages/common/component/PluginBlockList.vue +++ b/packages/common/component/PluginBlockList.vue @@ -356,17 +356,17 @@ export default { max-width: 500px; max-height: 136px; padding: 12px; - background: var(--te-common-bg-default); + background: var(--ti-lowcode-component-block-list-shortcut-bg); border-radius: 5px; - border: 1px solid var(--te-common-border-default); + border: 1px solid var(--ti-lowcode-common-border-color-4); top: v-bind('state.top'); .block-shortcut-title { - color: var(--te-common-text-primary); + color: var(--ti-lowcode-component-block-list-shortcut-title-color); font-weight: 600; margin-bottom: 8px; } .block-shortcut-description { - color: var(--te-common-text-secondary); + color: var(--ti-lowcode-component-block-list-item-color); margin-bottom: 20px; font-size: 12px; } @@ -511,7 +511,7 @@ export default { } &.is-active { - background: var(--te-common-bg-container); + background: var(--ti-lowcode-component-block-list-item-active-bg); } &.is-disabled { @@ -698,7 +698,7 @@ export default { line-height: 16px; } .item-description { - color: var(--te-common-text-primary); + color: var(--ti-lowcode-toolbar-title-color); font-size: 12px; } } @@ -717,7 +717,7 @@ export default { } .setting-menu { font-size: 12px; - color: var(--te-common-text-primary); + color: var(--ti-lowcode-component-block-setting-item-text-color); .list { display: flex; } @@ -725,7 +725,7 @@ export default { box-sizing: border-box; cursor: pointer; &:hover { - color: var(--te-common-text-primary); + color: var(--ti-lowcode-common-primary-text-color); } .list-item-icon { font-size: 14px; @@ -734,3 +734,16 @@ export default { } } + + From 71df5e2d4877ad650bce6fc1694ccd03ff632e4a Mon Sep 17 00:00:00 2001 From: lixuan Date: Thu, 6 Feb 2025 23:02:48 -0800 Subject: [PATCH 09/16] feat: revoke common variable modify --- packages/common/component/PluginBlockList.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/common/component/PluginBlockList.vue b/packages/common/component/PluginBlockList.vue index a36abb10b..13d8f2964 100644 --- a/packages/common/component/PluginBlockList.vue +++ b/packages/common/component/PluginBlockList.vue @@ -358,7 +358,7 @@ export default { padding: 12px; background: var(--ti-lowcode-component-block-list-shortcut-bg); border-radius: 5px; - border: 1px solid var(--ti-lowcode-common-border-color-4); + border: 1px solid var(--te-common-border-default); top: v-bind('state.top'); .block-shortcut-title { color: var(--ti-lowcode-component-block-list-shortcut-title-color); @@ -725,7 +725,7 @@ export default { box-sizing: border-box; cursor: pointer; &:hover { - color: var(--ti-lowcode-common-primary-text-color); + color: var(--te-common-text-primary); } .list-item-icon { font-size: 14px; From 45ac98e97816f05f2cd8a243a3ff221930b88553 Mon Sep 17 00:00:00 2001 From: lixuan Date: Tue, 11 Feb 2025 01:01:08 -0800 Subject: [PATCH 10/16] feat: Modify review: scroll style in i18n --- packages/plugins/i18n/src/Main.vue | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/packages/plugins/i18n/src/Main.vue b/packages/plugins/i18n/src/Main.vue index 4d8e31432..8092a64c4 100644 --- a/packages/plugins/i18n/src/Main.vue +++ b/packages/plugins/i18n/src/Main.vue @@ -41,7 +41,7 @@ 正在导入，请稍后...

-
+
Date: Tue, 11 Feb 2025 01:06:39 -0800 Subject: [PATCH 11/16] feat: Modify review: scroll style in i18n --- packages/plugins/i18n/src/styles/vars.less | 2 -- 1 file changed, 2 deletions(-) diff --git a/packages/plugins/i18n/src/styles/vars.less b/packages/plugins/i18n/src/styles/vars.less index 55e0a6324..9fd433fdf 100644 --- a/packages/plugins/i18n/src/styles/vars.less +++ b/packages/plugins/i18n/src/styles/vars.less @@ -11,7 +11,5 @@ --te-i18n-common-tip-text-color: var(--te-common-text-secondary); --te-i18n-border-color: var(--te-common-border-divider); --te-i18n-grid-opt-icon-color: var(--te-common-icon-secondary); - --te-i18n-grid-scroll-bg-color: var(--te-common-bg-scroll); - --te-i18n-grid-scroll-bg-hover-color: var(--te-common-bg-scroll-hover); --te-i18n-panel-shadow-color: var(--te-common-shadow-panel); } From aae917f0db2f244478d8cfde2c7e246245822e1f Mon Sep 17 00:00:00 2001 From: lixuan Date: Tue, 11 Feb 2025 02:01:02 -0800 Subject: [PATCH 12/16] feat: Modify review --- packages/plugins/datasource/src/DataSourceRecordList.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/plugins/datasource/src/DataSourceRecordList.vue b/packages/plugins/datasource/src/DataSourceRecordList.vue index 18da8f49e..1e73fd2a4 100644 --- a/packages/plugins/datasource/src/DataSourceRecordList.vue +++ b/packages/plugins/datasource/src/DataSourceRecordList.vue @@ -307,7 +307,7 @@ export default { const messageSaved = { render: () => ( - {'您确定要删除该条数据吗?'} + 您确定要删除该条数据吗? ) } From 325960651c4f6f3503ebf50d296e8f6d2cd29425 Mon Sep 17 00:00:00 2001 From: lixuan Date: Tue, 11 Feb 2025 02:46:43 -0800 Subject: [PATCH 13/16] feat: Modify review --- packages/plugins/help/src/HelpIcon.vue | 2 +- packages/plugins/robot/src/Main.vue | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/plugins/help/src/HelpIcon.vue b/packages/plugins/help/src/HelpIcon.vue index c01d0a07e..83b9bbdb0 100644 --- a/packages/plugins/help/src/HelpIcon.vue +++ b/packages/plugins/help/src/HelpIcon.vue @@ -359,7 +359,7 @@ div.tiny-guide.shepherd-element { margin: 0 -16px; padding: 0 16px; color: var(--te-help-box-item-text-color); - fill: var(--te-help-box-item-text-color); + fill: currentColor; span { display: flex; align-items: center; diff --git a/packages/plugins/robot/src/Main.vue b/packages/plugins/robot/src/Main.vue index c907d45a8..633c206d7 100644 --- a/packages/plugins/robot/src/Main.vue +++ b/packages/plugins/robot/src/Main.vue @@ -460,7 +460,7 @@ export default { } .ml8 { color: var(--te-chat-model-dropdown-icon); - fill: var(--te-chat-model-dropdown-icon); + fill: currentColor; margin-left: 10px; } } From f33c1db857f1c5c1a3b35544f1de33aab2b3a5c6 Mon Sep 17 00:00:00 2001 From: lixuan Date: Tue, 11 Feb 2025 17:24:29 -0800 Subject: [PATCH 14/16] feat: Modify review --- packages/plugins/block/src/BlockPropertyForm.vue | 1 + packages/plugins/block/src/styles/vars.less | 2 +- packages/plugins/bridge/src/Main.vue | 2 +- packages/plugins/bridge/src/styles/vars.less | 2 +- packages/plugins/datasource/src/DataSourceRecordList.vue | 1 + packages/plugins/datasource/src/Main.vue | 2 +- packages/plugins/datasource/src/styles/vars.less | 2 +- packages/plugins/help/src/styles/vars.less | 2 +- packages/plugins/i18n/src/styles/vars.less | 2 +- packages/plugins/robot/src/Main.vue | 2 +- packages/plugins/robot/src/styles/vars.less | 2 +- packages/theme/base/src/component-common.less | 2 +- 12 files changed, 12 insertions(+), 10 deletions(-) diff --git a/packages/plugins/block/src/BlockPropertyForm.vue b/packages/plugins/block/src/BlockPropertyForm.vue index dd65a936c..ddd62c2b9 100644 --- a/packages/plugins/block/src/BlockPropertyForm.vue +++ b/packages/plugins/block/src/BlockPropertyForm.vue @@ -258,6 +258,7 @@ export default { .property-title { margin-bottom: 12px; cursor: pointer; + fill: currentColor; } .property-form { diff --git a/packages/plugins/block/src/styles/vars.less b/packages/plugins/block/src/styles/vars.less index cbf698355..41748afa8 100644 --- a/packages/plugins/block/src/styles/vars.less +++ b/packages/plugins/block/src/styles/vars.less @@ -1,4 +1,4 @@ -:root { +.block-manage { --te-block-alert-color: var(--te-common-text-weaken); --te-block-error-tip-color: var(--te-common-color-error); // 区块列表 - 面板 diff --git a/packages/plugins/bridge/src/Main.vue b/packages/plugins/bridge/src/Main.vue index eaf9e596f..638db3584 100644 --- a/packages/plugins/bridge/src/Main.vue +++ b/packages/plugins/bridge/src/Main.vue @@ -1,5 +1,5 @@