@ticatec/uniface-element 0.1.71 → 0.2.1

package/dist/dialog/CommonDialog.svelte.d.ts

@@ -1,4 +1,5 @@
 import type { DialogCloseConfirm } from "./DialogCloseConfirm";
+import { type OnClose } from "./ModalResult";
 interface $$__sveltets_2_IsomorphicComponent<Props extends Record<string, any> = any, Events extends Record<string, any> = any, Slots extends Record<string, any> = any, Exports = {}, Bindings = string> {
     new (options: import('svelte').ComponentConstructorOptions<Props>): import('svelte').SvelteComponent<Props, Events, Slots> & {
         $$bindings?: Bindings;
@@ -23,10 +24,10 @@ declare const CommonDialog: $$__sveltets_2_IsomorphicComponent<$$__sveltets_2_Pr
     height?: string;
     closeConfirm?: DialogCloseConfirm | null;
     content$style?: string;
-    closeHandler: () => void;
     enableConfirm?: boolean;
     confirmHandler?: (() => Promise<any>) | null;
     confirmText?: string | null;
+    onClose?: OnClose | null;
 }, {
     default: {};
 }>, {

package/dist/dialog/Dialog.svelte

@@ -1,27 +1,31 @@
 <script lang="ts">
-
     import {fade} from "svelte/transition";
     import type {DialogCloseConfirm} from "./DialogCloseConfirm";
     import ActionBar, {type ButtonAction, type ButtonActions} from "../action-bar";
     import i18n from "@ticatec/i18n";
-    import {onMount} from "svelte";
+    import {getContext, onMount} from "svelte";
+    import {ModalResult, type OnClose} from "./ModalResult";
 
     export let title: string;
-
     export let width: string = 'unset';
     export let height: string = 'unset';
     export let actions: ButtonActions | null = null;
     export let closeConfirm: DialogCloseConfirm | null = null;
     export let content$style: string = '';
-    export let closeHandler: () => void;
+
     export let closeAction: ButtonAction | null = null;
+    export let onClose: OnClose | null = null;
 
     export let dialog$style: string = "";
 
-    export const close = async () => {
-        let confirm = closeConfirm ? await closeConfirm() : true;
+    const closeDialog = getContext<() => void>('closeDialog');
+
+    export const close = async (result: ModalResult) => {
+        let confirm = closeConfirm && result == ModalResult.Cancel ? await closeConfirm() : true;
         if (confirm) {
-            closeHandler?.();
+            console.log('关闭窗口')
+            closeDialog();
+            onClose?.(result);
         }
     }
 
@@ -52,10 +56,32 @@
             label: i18n.getText('uniface.btnClose', 'Close'),
             type: 'secondary'
         };
-        closeAction.handler = close;
+        closeAction.handler = () => close(ModalResult.Cancel);
     })
 
-    $:  dialogActions = actions ? [...actions, closeAction] : [closeAction];
+    const wrapActions = () => {
+        let wa: ButtonActions = [];
+        if (actions) {
+            actions.forEach(action => {
+                if (action == null) {
+                    wa.push(null)
+                } else {
+                    wa.push({
+                        ...action, handler: async (event: MouseEvent) => {
+                            let result = await action.handler?.(event);
+                            if (result) {
+                                await close(ModalResult.Ok)
+                            }
+                        }
+                    })
+                }
+            })
+        }
+        wa.push(closeAction);
+        return wa;
+    }
+
+    $:  dialogActions = actions ? wrapActions() : [closeAction];
 
 
 </script>
@@ -67,7 +93,7 @@
             <div class="title-bar" on:mousedown={handleMouseDown} on:mouseup={handleMouseUp} aria-hidden="true">
                 <div style="flex: 1 1 auto"><span>{title ?? 'New window'}</span></div>
                 <div style="flex: 0 0 auto; padding-left: 12px">
-                    <i class="icon_google_clear dialog-action-button" aria-hidden="true" on:click={close}></i>
+                    <i class="icon_google_clear dialog-action-button" aria-hidden="true" on:click={()=>close(ModalResult.Cancel)}></i>
                 </div>
             </div>
             <div class="dialog-content" style={content$style}>

package/dist/dialog/Dialog.svelte.d.ts

@@ -1,5 +1,6 @@
 import type { DialogCloseConfirm } from "./DialogCloseConfirm";
 import { type ButtonAction, type ButtonActions } from "../action-bar";
+import { ModalResult, type OnClose } from "./ModalResult";
 interface $$__sveltets_2_IsomorphicComponent<Props extends Record<string, any> = any, Events extends Record<string, any> = any, Slots extends Record<string, any> = any, Exports = {}, Bindings = string> {
     new (options: import('svelte').ComponentConstructorOptions<Props>): import('svelte').SvelteComponent<Props, Events, Slots> & {
         $$bindings?: Bindings;
@@ -25,10 +26,10 @@ declare const Dialog: $$__sveltets_2_IsomorphicComponent<$$__sveltets_2_PropsWit
     actions?: ButtonActions | null;
     closeConfirm?: DialogCloseConfirm | null;
     content$style?: string;
-    closeHandler: () => void;
     closeAction?: ButtonAction | null;
+    onClose?: OnClose | null;
     dialog$style?: string;
-    close?: () => Promise<void>;
+    close?: (result: ModalResult) => Promise<void>;
 }, {
     default: {};
 }>, {
@@ -36,7 +37,7 @@ declare const Dialog: $$__sveltets_2_IsomorphicComponent<$$__sveltets_2_PropsWit
 }, {
     default: {};
 }, {
-    close: () => Promise<void>;
+    close: (result: ModalResult) => Promise<void>;
 }, string>;
 type Dialog = InstanceType<typeof Dialog>;
 export default Dialog;

package/dist/dialog/DialogBoard.svelte

@@ -1,16 +1,13 @@
 <script lang="ts">
 
-
     import {onDestroy, onMount} from "svelte";
     import {initialize} from "./IDialog";
 
     import {dialogs} from "./Dialogs";
+    import DialogWrapper from "./DialogWrapper.svelte";
 
     export const open = (component: any, params: any) => {
-        let dialog = {id: (new Date().getTime()).toString(36), component, params};
-        params.closeHandler = () => {
-            dialogs.removeDialog(dialog.id);
-        }
+        let dialog = {component, params, id: crypto.randomUUID()};
         dialogs.showDialog(dialog);
     }
 
@@ -28,13 +25,19 @@
         board && board.remove();
     });
 
-
 </script>
 
 <div bind:this={board} class="uniface-dialog-board" style="display: {$dialogs.length > 0 ? 'block' : 'none'}">
     <div style="width: 100%; height: 100%; position: relative">
-        {#each $dialogs as dialog}
-            <svelte:component this={dialog.component} {...dialog.params}></svelte:component>
+        <!--{#each $dialogs as dialog (dialog)}-->
+        <!--    <svelte:component bind:this={dialog.instance} this={dialog.component} {...dialog.params}></svelte:component>-->
+        <!--{/each}-->
+        {#each $dialogs as dialog (dialog.id)}
+            <DialogWrapper
+                    component={dialog.component}
+                    params={dialog.params}
+                    closeDialog={() => dialogs.removeDialog(dialog.id)}
+            />
         {/each}
     </div>
 </div>

package/dist/dialog/DialogWrapper.svelte

@@ -0,0 +1,10 @@
+<script lang="ts">
+    import { setContext } from 'svelte';
+    export let component;
+    export let params;
+    export let closeDialog;
+
+    setContext('closeDialog', closeDialog);
+</script>
+
+<svelte:component this={component} {...params} />

package/dist/dialog/DialogWrapper.svelte.d.ts

@@ -0,0 +1,22 @@
+interface $$__sveltets_2_IsomorphicComponent<Props extends Record<string, any> = any, Events extends Record<string, any> = any, Slots extends Record<string, any> = any, Exports = {}, Bindings = string> {
+    new (options: import('svelte').ComponentConstructorOptions<Props>): import('svelte').SvelteComponent<Props, Events, Slots> & {
+        $$bindings?: Bindings;
+    } & Exports;
+    (internal: unknown, props: Props & {
+        $$events?: Events;
+        $$slots?: Slots;
+    }): Exports & {
+        $set?: any;
+        $on?: any;
+    };
+    z_$$bindings?: Bindings;
+}
+declare const DialogWrapper: $$__sveltets_2_IsomorphicComponent<{
+    component: any;
+    params: any;
+    closeDialog: any;
+}, {
+    [evt: string]: CustomEvent<any>;
+}, {}, {}, string>;
+type DialogWrapper = InstanceType<typeof DialogWrapper>;
+export default DialogWrapper;

package/dist/dialog/Dialogs.js

@@ -11,7 +11,7 @@ function createDialogStore() {
             });
         },
         removeDialog(id) {
-            update(dialogs => dialogs.filter(dialog => dialog.id !== id));
+            update(dialogs => dialogs.filter(d => d.id !== id));
         },
         clear() {
             set([]);

package/dist/dialog/ModalResult.d.ts

@@ -0,0 +1,5 @@
+export declare enum ModalResult {
+    Cancel = 0,//放弃操作，关闭窗口
+    Ok = 1
+}
+export type OnClose = (result: ModalResult) => void;

package/dist/dialog/ModalResult.js

@@ -0,0 +1,5 @@
+export var ModalResult;
+(function (ModalResult) {
+    ModalResult[ModalResult["Cancel"] = 0] = "Cancel";
+    ModalResult[ModalResult["Ok"] = 1] = "Ok"; //操作完成，正常关闭
+})(ModalResult || (ModalResult = {}));

package/dist/ticatec-uniface-web.css

@@ -3828,6 +3828,7 @@ root {
   border-right: 1px solid transparent;
   padding: var(--uniface-data-table-cell-padding, 3px 4px);
   position: relative;
+  overflow: hidden;
 }
 .uniface-data-table .data-cell .sortable {
   cursor: pointer;
@@ -3850,6 +3851,12 @@ root {
 .uniface-data-table .data-row.alternative {
   background-color: var(--uniface-data-table-alter-row-bg, #f7f7f7);
 }
+.uniface-data-table .data-row .data-cell > div {
+  width: 100%;
+  overflow: hidden;
+  white-space: nowrap;
+  text-overflow: ellipsis;
+}
 .uniface-data-table.row-border .header-row, .uniface-data-table.row-border .data-row {
   border-bottom: 1px solid var(--uniface-data-table-inline-border-color, #CBD5E1);
 }