@ticatec/uniface-element 0.1.17 → 0.1.19

package/dist/action-bar/ButtonAction.d.ts

@@ -20,6 +20,6 @@ export default interface ButtonAction {
     /**
      * click处理函数
      */
-    handler: MouseClickHandler;
+    handler?: MouseClickHandler;
 }
 export type ButtonActions = Array<ButtonAction | null>;

package/dist/dialog/CommonDialog.svelte

@@ -0,0 +1,34 @@
+<script lang="ts">
+
+    import Dialog from "./Dialog.svelte";
+    import type {ButtonAction, ButtonActions} from "../action-bar";
+    import type {DialogCloseConfirm, MouseClickHandler} from "..";
+    import i18n from "@ticatec/i18n";
+
+    export let title: string;
+    export let closeConfirm: DialogCloseConfirm | null = null;
+    export let content$style: string = '';
+    export let closeHandler: () => void;
+    export let enableConfirm: boolean = true;
+    export let confirmHandler: MouseClickHandler;
+    export let confirmText: string | null = null;
+
+    let confirmAction: ButtonAction = {
+        label: confirmText??i18n.getText('uniface.btnConfirm', 'OK'),
+        type: "primary",
+        disabled: enableConfirm,
+        handler: confirmHandler
+    }
+
+    let actions: ButtonActions = [confirmAction];
+
+    $: {
+        confirmAction.disabled = !enableConfirm;
+        actions = [...actions];
+    }
+
+</script>
+
+<Dialog {title} {content$style} {closeHandler} {actions} {closeConfirm}>
+    <slot></slot>
+</Dialog>

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

@@ -0,0 +1,36 @@
+import type { DialogCloseConfirm, MouseClickHandler } from "..";
+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;
+}
+type $$__sveltets_2_PropsWithChildren<Props, Slots> = Props & (Slots extends {
+    default: any;
+} ? Props extends Record<string, never> ? any : {
+    children?: any;
+} : {});
+declare const CommonDialog: $$__sveltets_2_IsomorphicComponent<$$__sveltets_2_PropsWithChildren<{
+    title: string;
+    closeConfirm?: DialogCloseConfirm | null;
+    content$style?: string;
+    closeHandler: () => void;
+    enableConfirm?: boolean;
+    confirmHandler: MouseClickHandler;
+    confirmText?: string | null;
+}, {
+    default: {};
+}>, {
+    [evt: string]: CustomEvent<any>;
+}, {
+    default: {};
+}, {}, string>;
+type CommonDialog = InstanceType<typeof CommonDialog>;
+export default CommonDialog;

package/dist/dialog/Dialog.svelte

@@ -2,18 +2,16 @@
 
     import {fade} from "svelte/transition";
     import type {DialogCloseConfirm} from "./DialogCloseConfirm";
-    import ActionBar, {type ButtonActions} from "../action-bar";
+    import ActionBar, {type ButtonAction, type ButtonActions} from "../action-bar";
     import i18n from "@ticatec/i18n";
     import {onMount} from "svelte";
 
-    export let title: string = null as unknown as string;
-    export let actions: ButtonActions;
-    export let closeConfirm: DialogCloseConfirm;
+    export let title: string;
+    export let actions: ButtonActions | null = null;
+    export let closeConfirm: DialogCloseConfirm | null = null;
     export let content$style: string = '';
     export let closeHandler: () => void;
-
-
-    export let closeAction: any;
+    export let closeAction: ButtonAction | null = null;
 
     export const close = async () => {
         let confirm = closeConfirm ? await closeConfirm() : true;
@@ -50,10 +48,8 @@
             type: 'secondary'
         };
         closeAction.handler = close;
-        dialogActions = actions ? [...actions, closeAction] : [closeAction];
     })
 
-    $:console.log(closeAction)
     $:  dialogActions = actions ? [...actions, closeAction] : [closeAction];
 
 </script>

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

@@ -1,5 +1,5 @@
 import type { DialogCloseConfirm } from "./DialogCloseConfirm";
-import { type ButtonActions } from "../action-bar";
+import { type ButtonAction, type ButtonActions } from "../action-bar";
 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;
@@ -19,12 +19,12 @@ type $$__sveltets_2_PropsWithChildren<Props, Slots> = Props & (Slots extends {
     children?: any;
 } : {});
 declare const Dialog: $$__sveltets_2_IsomorphicComponent<$$__sveltets_2_PropsWithChildren<{
-    title?: string;
-    actions: ButtonActions;
-    closeConfirm: DialogCloseConfirm;
+    title: string;
+    actions?: ButtonActions | null;
+    closeConfirm?: DialogCloseConfirm | null;
     content$style?: string;
     closeHandler: () => void;
-    closeAction: any;
+    closeAction?: ButtonAction | null;
     close?: () => Promise<void>;
 }, {
     default: {};

package/dist/dialog/DialogBoard.svelte

@@ -3,16 +3,18 @@
 
     import {onDestroy, onMount} from "svelte";
     import {initialize} from "./IDialog";
-    import DialogBox from "./DialogBox.svelte";
+
+    import {dialogs} from "./Dialogs";
 
     export const open = (component: any, params: any) => {
-        let dialog = {component, params}
-        params.closeHandler = remove(dialog);
-        dialogs = [...dialogs, dialog];
+        let dialog = {id: (new Date().getTime()).toString(36) ,component, params};
+        params.closeHandler = () => {
+            dialogs.removeDialog(dialog.id);
+        }
+        dialogs.showDialog(dialog);
     }
 
-    let dialogs:Array<any> = [];
-    let board:any;
+    let board: any;
 
     onMount(() => {
         document.body.appendChild(board);
@@ -26,20 +28,11 @@
         board && board.remove();
     });
 
-    const remove = (dialog:any) => () => {
-        let pos = dialogs.indexOf(dialog);
-        if (pos > -1) {
-            dialogs.splice(pos, 1);
-            dialogs = [...dialogs];
-        }
-    }
-
 
 </script>
 
-<div bind:this={board} class="uniface-dialog-board" style="display: {dialogs.length > 0 ? 'block' : 'none'}">
-    {#each dialogs as dialog}
-        <DialogBox closeHandler={remove(dialog)} dialog={dialog.component} params={dialog.params} >
-        </DialogBox>
+<div bind:this={board} class="uniface-dialog-board" style="display: {$dialogs.length > 0 ? 'block' : 'none'}">
+    {#each $dialogs as dialog}
+        <svelte:component this={dialog.component} {...dialog.params}></svelte:component>
     {/each}
 </div>

package/dist/dialog/Dialogs.d.ts

@@ -0,0 +1,6 @@
+export declare const dialogs: {
+    subscribe: (this: void, run: import("svelte/store").Subscriber<any[]>, invalidate?: () => void) => import("svelte/store").Unsubscriber;
+    showDialog(dialog: any): void;
+    removeDialog(id: string): void;
+    clear(): void;
+};

package/dist/dialog/Dialogs.js

@@ -0,0 +1,21 @@
+import { writable } from "svelte/store";
+const initialDialogs = [];
+function createDialogStore() {
+    const { subscribe, set, update } = writable(initialDialogs);
+    return {
+        subscribe,
+        showDialog(dialog) {
+            update(dialogs => {
+                const newDialog = { ...dialog };
+                return [...dialogs, newDialog];
+            });
+        },
+        removeDialog(id) {
+            update(dialogs => dialogs.filter(dialog => dialog.id !== id));
+        },
+        clear() {
+            set([]);
+        },
+    };
+}
+export const dialogs = createDialogStore();

package/dist/dialog/index.d.ts

@@ -2,6 +2,7 @@ import Dialog from "./Dialog.svelte";
 import DialogBoard from "./DialogBoard.svelte";
 import type IDialog from "./IDialog";
 import type { DialogCloseConfirm } from "./DialogCloseConfirm";
+import CommonDialog from "./CommonDialog.svelte";
 declare global {
     interface Window {
         Dialog: IDialog;
@@ -11,3 +12,4 @@ export { type IDialog };
 export { type DialogCloseConfirm };
 export { DialogBoard };
 export default Dialog;
+export { CommonDialog };

package/dist/dialog/index.js

@@ -1,6 +1,8 @@
 import Dialog from "./Dialog.svelte";
 import DialogBoard from "./DialogBoard.svelte";
+import CommonDialog from "./CommonDialog.svelte";
 export {};
 export {};
 export { DialogBoard };
 export default Dialog;
+export { CommonDialog };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ticatec/uniface-element",
-  "version": "0.1.17",
+  "version": "0.1.19",
   "description": "uniface web elements",
   "scripts": {
     "dev": "vite dev",
@@ -132,6 +132,10 @@
       "types": "./dist/dialog/index.d.ts",
       "import": "./dist/dialog/index.js"
     },
+    "./CommonDialog": {
+      "types": "./dist/dialog/CommonDialog.svelte.d.ts",
+      "import": "./dist/dialog/CommonDialog.svelte"
+    },
     "./DialogBoard": {
       "types": "./dist/dialog/DialogBoard.svelte.d.ts",
       "import": "./dist/dialog/DialogBoard.svelte"

package/dist/dialog/DialogBox.svelte

@@ -1,25 +0,0 @@
-<script lang="ts">
-
-    import Dialog from "./Dialog.svelte";
-    import type {ButtonActions} from "../action-bar";
-    import type {DialogCloseConfirm} from "..";
-
-    export let dialog: any;
-    export let params: any;
-    export let closeHandler: () => void;
-    let actions: ButtonActions = null as unknown as ButtonActions;
-
-    let title: string;
-
-    let instance: any;
-
-    let closeConfirm: DialogCloseConfirm;
-    let closeAction: any;
-
-
-</script>
-
-<Dialog bind:this={instance} {title} {closeHandler} {closeConfirm} {actions} {closeAction}>
-    <svelte:component this={dialog} dialog={instance} bind:title bind:actions bind:closeConfirm bind:closeAction
-                      {...params}></svelte:component>
-</Dialog>

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

@@ -1,22 +0,0 @@
-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 DialogBox: $$__sveltets_2_IsomorphicComponent<{
-    dialog: any;
-    params: any;
-    closeHandler: () => void;
-}, {
-    [evt: string]: CustomEvent<any>;
-}, {}, {}, string>;
-type DialogBox = InstanceType<typeof DialogBox>;
-export default DialogBox;