diff --git a/src/carousel-grid/carousel-grid.scss b/src/carousel-grid/carousel-grid.scss index 2d742d72361c8c9b689818dbd0a619f0ad1a89d7..5f1b0ef33363dd8239cbc67791cdcf81ecaa03d7 100644 --- a/src/carousel-grid/carousel-grid.scss +++ b/src/carousel-grid/carousel-grid.scss @@ -1,3 +1,4 @@ +/* stylelint-disable selector-class-pattern */ // 左右移动 @keyframes scroll-left-right { 0% { @@ -29,6 +30,10 @@ @include b(control-grid) { @include e('table'){ @include when('allow-roll'){ + .el-scrollbar__bar.is-vertical{ + display: none; + } + tbody{ flex: none; height: auto; diff --git a/src/screen-portlet/index.ts b/src/screen-portlet/index.ts index 6d2ca4ba4b7192f444c37039971cf2928434f012..9265fde6c1edad364df2f6513298af413ecda643 100644 --- a/src/screen-portlet/index.ts +++ b/src/screen-portlet/index.ts @@ -6,5 +6,8 @@ import { ScreenPortletProvider } from './screen-portlet.provider'; export const IBizScreenPortlet = withInstall(ScreenPortlet, function (v: App) { v.component(ScreenPortlet.name, ScreenPortlet); - registerPortletProvider('CUSTOM_SCREEN', () => new ScreenPortletProvider()); + registerPortletProvider( + 'PORTLET_CUSTOM_SCREEN', + () => new ScreenPortletProvider(), + ); }); diff --git a/src/screen-portlet/screen-portlet.controller.ts b/src/screen-portlet/screen-portlet.controller.ts index a49815220a91f7b505d35a9f306b4cdc376d6a68..c237242c68b358ac6c5608b390b8ccf3ffb4cd00 100644 --- a/src/screen-portlet/screen-portlet.controller.ts +++ b/src/screen-portlet/screen-portlet.controller.ts @@ -33,7 +33,7 @@ export class ScreenPortletController extends PortletPartController = ref({}); - - if (props.modelData.sysImage && props.modelData.sysImage.rawContent) { - Object.assign(style.value, { - 'background-image': `url(${props.modelData.sysImage.rawContent})`, - 'background-repeat': 'no-repeat', - 'background-size': '100% 100%', - }); + if (props.controller.model.portletType === 'CONTAINER') { + if ( + props.modelData.sysImage && + (props.modelData.sysImage.rawContent || + props.modelData.sysImage.imagePath) + ) { + Object.assign(style.value, { + 'background-image': `url(${props.modelData.sysImage.rawContent || props.modelData.sysImage.imagePath})`, + 'background-repeat': 'no-repeat', + 'background-size': '100% 100%', + }); + } } return { c, ns, style }; @@ -55,10 +60,14 @@ export const ScreenPortlet = defineComponent({ const componentName = portletComponent[this.controller.model.portletType!] || 'IBizViewPortlet'; const component = resolveComponent(componentName); - const content = h(component, { - modelData: this.modelData, - controller: this.controller, - }); + const content = h( + component, + { + modelData: this.modelData, + controller: this.controller, + }, + this.$slots.default?.(), + ); if (this.c.borderStyle) { const borderDiv = resolveComponent(this.c.borderStyle); let offsetY = 0; @@ -80,7 +89,6 @@ export const ScreenPortlet = defineComponent({ } return (