diff --git a/packages/configurator/src/model-api-configurator/ModelApiConfigurator.vue b/packages/configurator/src/model-api-configurator/ModelApiConfigurator.vue index b6b4a79a01..335a50c64c 100644 --- a/packages/configurator/src/model-api-configurator/ModelApiConfigurator.vue +++ b/packages/configurator/src/model-api-configurator/ModelApiConfigurator.vue @@ -4,7 +4,7 @@ trigger="manual" v-model="isShow" :visible-arrow="false" - :popper-class="['option-popper', 'fixed-left']" + :popper-class="['option-popper', 'fixed-left', 'model-function-popper']" :offset="isSecond ? 652 : 0" width="600" > @@ -230,7 +230,7 @@ onMounted(() => { display: flex; justify-content: space-between; align-items: center; - margin: 8px 0 20px 0; + margin: 8px 16px 20px 16px; .right { svg { margin-left: 10px; @@ -286,7 +286,10 @@ onMounted(() => { .model-param-wrap { .tiny-form { - padding: 12px; + padding: 12px 28px; + } + .tiny-collapse.tiny-collapse .tiny-collapse-item { + padding: 0 12px; } } } @@ -318,3 +321,10 @@ onMounted(() => { color: var(--te-common-text-secondary); } + diff --git a/packages/configurator/src/model-configurator/ModelConfigurator.vue b/packages/configurator/src/model-configurator/ModelConfigurator.vue index 04e313e2e1..9380ec97ed 100644 --- a/packages/configurator/src/model-configurator/ModelConfigurator.vue +++ b/packages/configurator/src/model-configurator/ModelConfigurator.vue @@ -6,7 +6,7 @@ trigger="manual" v-model="isShow" :visible-arrow="false" - :popper-class="['option-popper', 'fixed-left']" + :popper-class="['option-popper', 'fixed-left', 'model-popper']" >
绑定模型数据 @@ -424,19 +424,15 @@ onMounted(() => { .model-container { width: 100%; line-height: 28px; - background-color: var(--ti-lowcode-input-bg); &:hover { cursor: pointer; } - .model-name-warp { - border: 1px solid var(--ti-lowcode-component-input-border-color); - } .meta-model-title { - color: #808080; + color: var(--te-configurator-common-text-color-weaken); } .meta-array-wrap { font-size: 12px; - border: 1px solid #dbdbdb; + border: 1px solid var(--te-configurator-common-border-color); border-radius: 4px; display: block; :deep(.tiny-search) { @@ -444,7 +440,7 @@ onMounted(() => { .tiny-search__line { border: none; border-radius: 0; - border-bottom: 1px solid var(--ti-search-input-border-color); + border-bottom: 1px solid var(--te-configurator-common-border-color); } } .meta-array-header { @@ -567,3 +563,9 @@ onMounted(() => { } } + diff --git a/packages/configurator/src/source-select-configurator/SourceSelectConfigurator.vue b/packages/configurator/src/source-select-configurator/SourceSelectConfigurator.vue index 1c27755939..ce4f341974 100644 --- a/packages/configurator/src/source-select-configurator/SourceSelectConfigurator.vue +++ b/packages/configurator/src/source-select-configurator/SourceSelectConfigurator.vue @@ -204,12 +204,11 @@ export default { .source-container { width: 100%; line-height: 28px; - background-color: var(--ti-lowcode-input-bg); .source-img-wrap { position: relative; width: 150px; height: 96px; - background-color: var(--te-common-bg-container); + background-color: var(--te-configurator-container-bg-color); img { width: 100%; height: 100%; @@ -232,7 +231,7 @@ export default { width: 70px; height: 22px; line-height: 22px; - border: 1px solid var(--te-common-bg-popover); + border: 1px solid var(--te-configurator-common-border-color); border-radius: 4px; text-align: center; color: var(--te-common-text-inverse); diff --git a/packages/configurator/src/styles/vars.less b/packages/configurator/src/styles/vars.less index d628d7fe0e..b4b2526d1f 100644 --- a/packages/configurator/src/styles/vars.less +++ b/packages/configurator/src/styles/vars.less @@ -21,6 +21,8 @@ --te-configurator-common-border-color-divider: var(--te-common-border-divider); --te-configurator-common-border-color: var(--te-common-border-default); + --te-configurator-common-panel-shadow-color: var(--te-common-shadow-panel); + --te-configurator-button-group-bg-color-active: var(--te-common-bg-prompt); --te-configurator-button-group-bg-color: var(--te-common-bg-container); diff --git a/packages/design-core/assets/chat.svg b/packages/design-core/assets/chat.svg index 29d05ff782..0d086bbb7c 100644 --- a/packages/design-core/assets/chat.svg +++ b/packages/design-core/assets/chat.svg @@ -1,13 +1,16 @@ - - - Created with Pixso. - - - - - - - - - - + + + + \ No newline at end of file diff --git a/packages/design-core/assets/generate-code.svg b/packages/design-core/assets/generate-code.svg index 9ef86cf4b8..8450940c9c 100644 --- a/packages/design-core/assets/generate-code.svg +++ b/packages/design-core/assets/generate-code.svg @@ -1,12 +1,24 @@ - - - Created with Pixso. - - - - - - - - + + + diff --git a/packages/design-core/assets/intelligent-construction.svg b/packages/design-core/assets/intelligent-construction.svg index d4d2df3d39..76110b490c 100644 --- a/packages/design-core/assets/intelligent-construction.svg +++ b/packages/design-core/assets/intelligent-construction.svg @@ -1,4 +1,16 @@ - + - - + + \ No newline at end of file diff --git a/packages/design-core/assets/more.svg b/packages/design-core/assets/more.svg new file mode 100644 index 0000000000..7b9b2c5d2e --- /dev/null +++ b/packages/design-core/assets/more.svg @@ -0,0 +1,25 @@ + + + + \ No newline at end of file diff --git a/packages/design-core/assets/nest-attempt.svg b/packages/design-core/assets/nest-attempt.svg new file mode 100644 index 0000000000..4893570e88 --- /dev/null +++ b/packages/design-core/assets/nest-attempt.svg @@ -0,0 +1,24 @@ + + + + diff --git a/packages/design-core/assets/plugin.svg b/packages/design-core/assets/plugin.svg new file mode 100644 index 0000000000..fe8fb2edc8 --- /dev/null +++ b/packages/design-core/assets/plugin.svg @@ -0,0 +1,16 @@ + + + + diff --git a/packages/design-core/assets/think.svg b/packages/design-core/assets/think.svg new file mode 100644 index 0000000000..601f51124a --- /dev/null +++ b/packages/design-core/assets/think.svg @@ -0,0 +1,16 @@ + + + + diff --git a/packages/design-core/assets/upload.svg b/packages/design-core/assets/upload.svg index a92b43d4b6..593915a246 100644 --- a/packages/design-core/assets/upload.svg +++ b/packages/design-core/assets/upload.svg @@ -1,14 +1,17 @@ - - - - - - + + + + + \ No newline at end of file diff --git a/packages/design-core/assets/workspace-menu.svg b/packages/design-core/assets/workspace-menu.svg new file mode 100644 index 0000000000..b64502f20a --- /dev/null +++ b/packages/design-core/assets/workspace-menu.svg @@ -0,0 +1,17 @@ + + + + + diff --git a/packages/layout/src/DesignToolbars.vue b/packages/layout/src/DesignToolbars.vue index bb473ea953..362e0341fa 100644 --- a/packages/layout/src/DesignToolbars.vue +++ b/packages/layout/src/DesignToolbars.vue @@ -10,7 +10,7 @@ >
- +
diff --git a/packages/layout/src/DesignWorkspace.vue b/packages/layout/src/DesignWorkspace.vue index 1c39c537d7..10e67c0ffa 100644 --- a/packages/layout/src/DesignWorkspace.vue +++ b/packages/layout/src/DesignWorkspace.vue @@ -35,14 +35,15 @@
暂无相关数据
- +
- {{ userInfo.username }} + +
{{ userInfo.username }}
@@ -243,10 +244,21 @@ export default { } .user-name { color: var(--te-layout-common-text-color-weaken); + display: flex; + align-items: center; .user-icon { margin-right: 6px; font-size: 20px; } + .name { + display: -webkit-box; + -webkit-line-clamp: 2; /* 限制为2行 */ + -webkit-box-orient: vertical; + overflow: hidden; + text-overflow: ellipsis; + word-break: break-word; + width: calc(100% - 26px); + } } .divider { width: 100%; diff --git a/packages/layout/src/ToolbarCollapse.vue b/packages/layout/src/ToolbarCollapse.vue index b82e99fd56..1ab8444d0a 100644 --- a/packages/layout/src/ToolbarCollapse.vue +++ b/packages/layout/src/ToolbarCollapse.vue @@ -2,7 +2,7 @@
diff --git a/packages/plugins/bridge/src/Main.vue b/packages/plugins/bridge/src/Main.vue index 9c4204d426..3987abe9c8 100644 --- a/packages/plugins/bridge/src/Main.vue +++ b/packages/plugins/bridge/src/Main.vue @@ -1,6 +1,6 @@