From beb0c1e728b96ce91cd619a0a7da96bb4ad1e891 Mon Sep 17 00:00:00 2001
From: jianglinjun <JLJ05024111@163.com>
Date: Thu, 15 Aug 2024 19:55:07 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=9B=B4=E6=96=B0=E5=A4=A7=E5=B1=8F?=
 =?UTF-8?q?=E9=97=A8=E6=88=B7=E7=BB=84=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/carousel-grid/carousel-grid.scss          |  5 +++
 src/screen-portlet/index.ts                   |  5 ++-
 .../screen-portlet.controller.ts              |  2 +-
 src/screen-portlet/screen-portlet.scss        | 14 ++------
 src/screen-portlet/screen-portlet.tsx         | 32 ++++++++++++-------
 5 files changed, 33 insertions(+), 25 deletions(-)

diff --git a/src/carousel-grid/carousel-grid.scss b/src/carousel-grid/carousel-grid.scss
index 2d742d7..5f1b0ef 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 6d2ca4b..9265fde 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 a498152..c237242 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<IDBPortletPar
    * @type {('full' | 'icon')}
    * @memberof ScreenPortletController
    */
-  iconType: 'full' | 'icon' = 'icon';
+  iconType: 'full' | 'icon' = 'full';
 
   // 所有应用门户
   public appPortlets: IAppPortlet[] = [];
diff --git a/src/screen-portlet/screen-portlet.scss b/src/screen-portlet/screen-portlet.scss
index 45b83cd..842ce57 100644
--- a/src/screen-portlet/screen-portlet.scss
+++ b/src/screen-portlet/screen-portlet.scss
@@ -21,20 +21,12 @@
       position: absolute;
       top: 0;
       left: 0;
-      z-index: -1;
+      z-index: 0;
       width: 100%;
       height: 100%;
     }
-  }
-  @include when('hide-caption-icon'){
-    .ibiz-portlet-layout-header{
-      background:transparent;
-    }
-
-    .ibiz-portlet-layout__caption{
-      img{
-        display: none;
-      }
+    .#{bem(portlet-layout, caption-text)} {
+      position: relative;
     }
   }
 }
diff --git a/src/screen-portlet/screen-portlet.tsx b/src/screen-portlet/screen-portlet.tsx
index 8e9da01..d4a8cba 100644
--- a/src/screen-portlet/screen-portlet.tsx
+++ b/src/screen-portlet/screen-portlet.tsx
@@ -39,13 +39,18 @@ export const ScreenPortlet = defineComponent({
     );
 
     const style: Ref<IData> = 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 (
       <div
-        is={this.c.borderStyle}
         class={[
           this.ns.b(),
           this.ns.is(
-- 
Gitee