diff --git a/designer-demo/public/mock/bundle.json b/designer-demo/public/mock/bundle.json index 358e84215b..57e5d416d6 100644 --- a/designer-demo/public/mock/bundle.json +++ b/designer-demo/public/mock/bundle.json @@ -9823,8 +9823,7 @@ }, "description": { "zh_CN": "单元格编辑渲染配置项,也可以是函数 Function(h, params)" - }, - "labelPosition": "left" + } }, { "property": "filter", diff --git a/packages/common/component/ConfigItem.vue b/packages/common/component/ConfigItem.vue index 39f81f8e31..d4d57bb652 100644 --- a/packages/common/component/ConfigItem.vue +++ b/packages/common/component/ConfigItem.vue @@ -527,7 +527,7 @@ export default { } .item-label { - color: var(--ti-lowcode-meta-config-item-label-color); + color: var(--te-common-text-secondary); font-size: 12px; display: flex; line-height: 18px; diff --git a/packages/common/component/MetaCodeEditor.vue b/packages/common/component/MetaCodeEditor.vue index d74b7c700d..d7f86934f3 100644 --- a/packages/common/component/MetaCodeEditor.vue +++ b/packages/common/component/MetaCodeEditor.vue @@ -302,8 +302,9 @@ export default { width: 100%; height: 24px; padding: 4px; + padding-left: 10px; border: 1px solid var(--ti-lowcode-meta-codeEditor-border-color); - border-radius: 6px; + border-radius: var(--te-base-border-radius-1); &:hover { border-color: var(--ti-lowcode-meta-codeEditor-border-hover-color); diff --git a/packages/common/component/MetaListItem.vue b/packages/common/component/MetaListItem.vue index 30b2344e75..332baf51c5 100644 --- a/packages/common/component/MetaListItem.vue +++ b/packages/common/component/MetaListItem.vue @@ -16,7 +16,8 @@ :popper-class="['option-popper', { 'fixed-left': expand }]" :visible-arrow="!expand" title="" - width="267" + width="295" + height="auto" trigger="manual" @hide="hide(item)" > @@ -295,14 +296,21 @@ export default { } } } + .tiny-popover { + position: relative; .icon-close { - float: right; + position: absolute; + top: 6px; + right: 6px; } } .add-options { overflow-y: scroll; - height: 100%; + padding: 20px 0 20px 2px; + &.top { + margin-bottom: 0; + } &::-webkit-scrollbar-track-piece { background: var(--ti-lowcode-toolbar-bg); } diff --git a/packages/configurator/src/js-slot-configurator/JsSlotConfigurator.vue b/packages/configurator/src/js-slot-configurator/JsSlotConfigurator.vue index 2582c7bc63..f7aed3c450 100644 --- a/packages/configurator/src/js-slot-configurator/JsSlotConfigurator.vue +++ b/packages/configurator/src/js-slot-configurator/JsSlotConfigurator.vue @@ -5,7 +5,7 @@
{{ slot.name }} - + @@ -74,7 +74,7 @@ export default { TinyGrid: { content: '暴露给插槽使用的变量,为解构的参数,可以使用多个用逗号分隔,如:row(行数据),column(列数据),$table(内部表格实例),seq(序号),cell(单元格),columnIndex(列索引),rowIndex(行索引)', - icon: SvgICons['IconUnknow']() + icon: SvgICons['IconHelpCircle']() } } @@ -202,6 +202,7 @@ export default { .use-slot-item-content { display: flex; + justify-content: space-between; } .use-slot-switch-wrap { @@ -227,6 +228,7 @@ export default { .slot-name-form-item { margin-bottom: 0; + margin-right: 6px; } .item-icon { @@ -240,6 +242,7 @@ export default { position: relative; font-size: 14px; line-height: 20px; + width: 40px; height: 20px; vertical-align: middle; cursor: pointer; @@ -262,7 +265,7 @@ export default { .e__switch-core::after { content: ''; position: absolute; - top: 1px; + top: 2px; left: 1px; border-radius: 100%; transition: all 0.3s; diff --git a/packages/configurator/src/tabs-group-configurator/TabsGroupConfigurator.vue b/packages/configurator/src/tabs-group-configurator/TabsGroupConfigurator.vue index 841beb01a1..952331936b 100644 --- a/packages/configurator/src/tabs-group-configurator/TabsGroupConfigurator.vue +++ b/packages/configurator/src/tabs-group-configurator/TabsGroupConfigurator.vue @@ -2,34 +2,19 @@
- - + - {{ item.label }} - - - - - + + {{ item.label }} + + + + +
- - {{ - selectedCollapsedOption.label - }} - - - + + {{ selectedCollapsedOption.label }} + @@ -91,7 +58,6 @@