diff --git a/src/control/app-menu/app-menu.tsx b/src/control/app-menu/app-menu.tsx index f232f7fc6f9131077f6d48e5424eabbaddc6cf34..5d356f8c476f186f85ea9ff81b30dbeee01ffde6 100644 --- a/src/control/app-menu/app-menu.tsx +++ b/src/control/app-menu/app-menu.tsx @@ -396,28 +396,34 @@ export const AppMenuControl = defineComponent({ onSelect={this.onClick} theme='light' mode={this.menuMode} - ellipsis={false} + ellipsis={this.menuMode === 'horizontal'} > - {this.menus.map(item => { - if (item.children?.length > 0) { - return renderSubmenu( - true, - item, - this.collapse, - this.ns, - this.c, - this.counterData, - ); - } - return renderMenuItem( - true, - item, - this.collapse, - this.ns, - this.c, - this.counterData, - ); - })} + {{ + default: () => { + return this.menus.map(item => { + if (item.children?.length > 0) { + return renderSubmenu( + true, + item, + this.collapse, + this.ns, + this.c, + this.counterData, + this.saveConfigs, + ); + } + return renderMenuItem( + true, + item, + this.collapse, + this.ns, + this.c, + this.counterData, + this.saveConfigs, + ); + }); + }, + }} )} {this.isShowCollapse && ( diff --git a/src/control/form/form-detail/form-page/form-page.scss b/src/control/form/form-detail/form-page/form-page.scss index d0453d2c622598e500f1026aa0f6bba68d3d8621..2354428fdf4eefdeacba15a6afd5f9b18d5acf8c 100644 --- a/src/control/form/form-detail/form-page/form-page.scss +++ b/src/control/form/form-detail/form-page/form-page.scss @@ -13,6 +13,32 @@ $form-page: ( @include b(form-page) { @include set-component-css-var('form-page', $form-page); + @include e('left'){ + height: 100%; + + >.el-tabs__header{ + height: 100%; + } + + >.el-tabs__content{ + height: 100%; + overflow: auto; + } + } + + @include e('right'){ + height: 100%; + + >.el-tabs__header{ + height: 100%; + } + + >.el-tabs__content{ + height: 100%; + overflow: auto; + } + } + // 无分页时,分页内容区最上不需要间隔 @include m(no-tab-header) { @include b(form-page-item) { diff --git a/src/control/form/form-detail/form-page/form-page.tsx b/src/control/form/form-detail/form-page/form-page.tsx index 33905de3dd076f6fb087ae9f735bd6628daaf895..c117690f0203b564424f0e6bd99b2c23cf54036c 100644 --- a/src/control/form/form-detail/form-page/form-page.tsx +++ b/src/control/form/form-detail/form-page/form-page.tsx @@ -12,9 +12,13 @@ export const FormPage = defineComponent({ required: true, }, }, - setup() { + setup(props) { const ns = useNamespace('form-page'); - return { ns }; + let position = 'top'; + if (props.modelData.tabHeaderPos) { + position = props.modelData.tabHeaderPos.toLowerCase(); + } + return { ns, position }; }, render() { const { noTabHeader } = this.modelData; @@ -29,8 +33,9 @@ export const FormPage = defineComponent({ } return ( {defaultSlots.map(slot => { const props = slot.props; diff --git a/src/control/form/form/form.scss b/src/control/form/form/form.scss index d1839ab51b5b534e2a4425f699759c81740e7863..6c9d9b5eec5bb3439cf6ac6b53b1eab54c8d72a4 100644 --- a/src/control/form/form/form.scss +++ b/src/control/form/form/form.scss @@ -1,4 +1,5 @@ @include b(control-form) { width: 100%; + height: 100%; padding-bottom: getCssVar(spacing, tight); } diff --git a/src/editor/data-picker/ibiz-picker-select-view/ibiz-picker-select-view.scss b/src/editor/data-picker/ibiz-picker-select-view/ibiz-picker-select-view.scss index 2fa38b960a230685b36c4a1cd62575e71b3e7618..487c8d7f9c4f9ac773f335f76134cd07d6b96b07 100644 --- a/src/editor/data-picker/ibiz-picker-select-view/ibiz-picker-select-view.scss +++ b/src/editor/data-picker/ibiz-picker-select-view/ibiz-picker-select-view.scss @@ -9,6 +9,22 @@ width: 100%; } + @include e('arrow'){ + display: flex; + transition: transform 0.3s; + transform: rotateZ(0); + transform-origin: center center; + + >svg{ + width: 14px; + height: 14px; + } + + &.overturn{ + transform: rotateZ(-180deg); + } + } + @include m(readonly) { font-size: getCssVar(form-item, font-size); line-height: getCssVar(editor, default, line-height); diff --git a/src/editor/data-picker/ibiz-picker-select-view/ibiz-picker-select-view.tsx b/src/editor/data-picker/ibiz-picker-select-view/ibiz-picker-select-view.tsx index 9b702d81f99cda6c00d672472b6f47492a8ff09b..a52e642d0bad5dda831c46251686618fbc77f77c 100644 --- a/src/editor/data-picker/ibiz-picker-select-view/ibiz-picker-select-view.tsx +++ b/src/editor/data-picker/ibiz-picker-select-view/ibiz-picker-select-view.tsx @@ -465,6 +465,17 @@ export const IBizPickerSelectView = defineComponent({ } }; + const arrow = () => { + return ( + + + + ); + }; + return { ns, c, @@ -497,6 +508,7 @@ export const IBizPickerSelectView = defineComponent({ showView, selectedData, handleDropDownKeyDown, + arrow, }; }, render() { @@ -541,6 +553,16 @@ export const IBizPickerSelectView = defineComponent({ name='link-arrow' > ), + this.c.model.showTrigger && ( +
+ {this.arrow()} +
+ ), ]; }, }}