Merge branch 'zentao' into dev

easysoft · Jul 9, 2024 · 3365025 · 3365025
2 parents 31edf74 + e47371a
commit 3365025
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 14 deletions.
diff --git a/lib/modal/src/component/modal-dialog.tsx b/lib/modal/src/component/modal-dialog.tsx
@@ -1,4 +1,4 @@
-import {classes} from '@zui/core';
+import {classes, CustomContent} from '@zui/core';
 import {Toolbar} from '@zui/toolbar/src/component/toolbar';
 import {Component, isValidElement} from 'preact';
 import {ModalDialogOptions} from '../types';
@@ -30,6 +30,9 @@ export class ModalDialog extends Component<ModalDialogOptions> {
         if (header === false || !title) {
             return null;
         }
+        if (header) {
+            return <CustomContent className={classes('modal-header', headerClass)} content={header} />;
+        }
         return (
             <div className={classes('modal-header', headerClass)}>
                 <div className="modal-title">{title}</div>
@@ -69,11 +72,7 @@ export class ModalDialog extends Component<ModalDialogOptions> {
         if (isValidElement(body)) {
             return body;
         }
-        return (
-            <div className={classes('modal-body', bodyClass)}>
-                {body}
-            </div>
-        );
+        return <CustomContent className={classes('modal-body', bodyClass)} content={body} />;
     }
 
     renderFooter() {
@@ -88,6 +87,9 @@ export class ModalDialog extends Component<ModalDialogOptions> {
         if (footer === false || !footerActions) {
             return null;
         }
+        if (footer) {
+            return <CustomContent className={classes('modal-footer', footerClass)} content={footer} />;
+        }
         return (
             <div className={classes('modal-footer', footerClass)}>
                 {footerActions ? <Toolbar {...footerActions} /> : null}

diff --git a/lib/modal/src/types/modal-dialog-options.ts b/lib/modal/src/types/modal-dialog-options.ts
@@ -1,5 +1,5 @@
 import type {ComponentChildren, JSX} from 'preact';
-import type {ClassNameLike} from '@zui/core';
+import type {ClassNameLike, CustomContentType} from '@zui/core';
 import type {ToolbarOptions} from '@zui/toolbar';
 
 export type ModalDialogOptions = {
@@ -8,13 +8,13 @@ export type ModalDialogOptions = {
     bodyClass?: ClassNameLike;
     style?: JSX.CSSProperties;
     title?: ComponentChildren;
-    header?: ComponentChildren;
+    header?: CustomContentType;
     headerClass?: ClassNameLike;
-    body?: ComponentChildren;
+    body?: CustomContentType;
     actions?: ToolbarOptions;
     closeBtn?: boolean;
     children?: ComponentChildren;
-    footer?: ComponentChildren;
+    footer?: CustomContentType;
     footerClass?: ClassNameLike;
     footerActions?: ToolbarOptions;
     afterRender?: (info: {firstRender: boolean}) => void;

diff --git a/lib/modal/src/types/modal-options.ts b/lib/modal/src/types/modal-options.ts
@@ -1,5 +1,5 @@
-import type {ComponentChild} from 'preact';
-import type {ToolbarItemOptions} from '@zui/toolbar/src/types';
+import type {CustomContentType} from '@zui/core';
+import type {ToolbarItemOptions} from '@zui/toolbar';
 import type {ModalDialogOptions} from './modal-dialog-options';
 import type {ModalBaseOptions} from './modal-base-options';
 import type {Modal} from '../vanilla/modal';
@@ -21,7 +21,7 @@ export type ModalOptions = ModalBaseOptions & {
 
 export interface ModalCustomOptions extends ModalOptions {
     type: 'custom',
-    content?: ComponentChild;
+    content?: CustomContentType;
     custom: ModalDialogOptions | (() => ModalDialogOptions);
 }
 

diff --git a/lib/picker/src/style/picker-menu.css b/lib/picker/src/style/picker-menu.css
@@ -7,6 +7,9 @@
 .picker-menu-list.tree {
   @apply -p-2;
 }
+.picker-menu-list .tree-item > .selected .item-content {
+  @apply -font-normal;
+}
 .picker-menu .search-menu-footer {
   @apply -border-t -py-1;
 }
diff --git a/lib/tree/src/style/tree.css b/lib/tree/src/style/tree.css
@@ -43,5 +43,5 @@
   background: var(--menu-selected-bg);
 }
 .tree-item > .selected .item-content {
-  @apply -text-[--menu-selected-color];
+  @apply -text-[--menu-selected-color] -font-bold;
 }