@ticatec/uniface-element 0.1.19 → 0.1.21

package/dist/card/CardAction.d.ts

@@ -1,6 +1,19 @@
 export type ActionCallback = () => void;
 export default interface CardAction {
+    /**
+     * 使用icon字体
+     */
     icon?: string;
+    /**
+     * 直接嵌入图标
+     */
+    img?: string;
+    /**
+     *
+     */
     disabled?: boolean;
+    /**
+     *
+     */
     callback: ActionCallback;
 }

package/dist/card/CommonCardActionBar.svelte

@@ -21,7 +21,11 @@
 <div class="card-action-bar simple">
     {#each actions as action}
         <div class:disabled={action.disabled} class="action-item">
-            <i class={action.icon} aria-hidden="true" on:click={handleActionClick(action)}></i>
+            {#if action.icon}
+                <i class={action.icon} aria-hidden="true" on:click={handleActionClick(action)}></i>
+            {:else if action.img}
+                <img class="card-action-img" alt="" src={action.img} aria-hidden="true" on:click={handleActionClick(action)}/>
+            {/if}
         </div>
     {/each}
 </div>

package/dist/dialog/CommonDialog.svelte

@@ -10,20 +10,26 @@
     export let content$style: string = '';
     export let closeHandler: () => void;
     export let enableConfirm: boolean = true;
-    export let confirmHandler: MouseClickHandler;
+    export let confirmHandler: (()=>Promise<any>) | null = null;
     export let confirmText: string | null = null;
 
     let confirmAction: ButtonAction = {
         label: confirmText??i18n.getText('uniface.btnConfirm', 'OK'),
         type: "primary",
         disabled: enableConfirm,
-        handler: confirmHandler
+        handler: async ()=> {
+            let result = await confirmHandler?.();
+            if (result && result==true) { //返回true自动关闭
+                closeHandler?.();
+            }
+
+        }
     }
 
     let actions: ButtonActions = [confirmAction];
 
     $: {
-        confirmAction.disabled = !enableConfirm;
+        confirmAction.disabled = confirmHandler==null && !enableConfirm;
         actions = [...actions];
     }
 

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

@@ -1,4 +1,4 @@
-import type { DialogCloseConfirm, MouseClickHandler } from "..";
+import type { DialogCloseConfirm } 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;
@@ -23,7 +23,7 @@ declare const CommonDialog: $$__sveltets_2_IsomorphicComponent<$$__sveltets_2_Pr
     content$style?: string;
     closeHandler: () => void;
     enableConfirm?: boolean;
-    confirmHandler: MouseClickHandler;
+    confirmHandler?: (() => Promise<any>) | null;
     confirmText?: string | null;
 }, {
     default: {};

package/dist/message-box/IMessageBox.d.ts

@@ -10,12 +10,14 @@ declare enum ModalResult {
     MR_CLOSE = 3
 }
 declare const InfoButtons: {
-    label: string;
+    text: string;
+    key: string;
     type: string;
     result: ModalResult;
 }[];
 declare const ConfirmButtons: {
-    label: string;
+    text: string;
+    key: string;
     type: string;
     result: ModalResult;
 }[];

package/dist/message-box/IMessageBox.js

@@ -1,4 +1,5 @@
 import i18n from "@ticatec/i18n";
+import langRes from "../i18n_resources/uniface_en_resource";
 ;
 var ModalResult;
 (function (ModalResult) {
@@ -7,11 +8,11 @@ var ModalResult;
     ModalResult[ModalResult["MR_CLOSE"] = 3] = "MR_CLOSE";
 })(ModalResult || (ModalResult = {}));
 const InfoButtons = [
-    { label: i18n.getText('uniface.btnClose', 'Close'), type: 'primary', result: ModalResult.MR_OK }
+    { text: langRes.uniface.btnClose, key: 'uniface.btnClose', type: 'primary', result: ModalResult.MR_OK }
 ];
 const ConfirmButtons = [
-    { label: i18n.getText('uniface.btnCancel', 'Cancel'), type: 'default', result: ModalResult.MR_CANCEL },
-    { label: i18n.getText('uniface.btnConfirm', 'OK'), type: 'primary', result: ModalResult.MR_OK }
+    { text: langRes.uniface.btnConfirm, key: 'uniface.btnConfirm', type: 'primary', result: ModalResult.MR_OK },
+    { text: langRes.uniface.btnCancel, key: 'uniface.btnCancel', type: 'secondary', result: ModalResult.MR_CANCEL }
 ];
 const initialize = (showInfo, showConfirm) => {
     window.MessageBox = {

package/dist/message-box/MessageBoxBoard.svelte

@@ -5,6 +5,7 @@
     import Button from "../button";
     import {fade} from "svelte/transition";
     import utils from "../common/utils";
+    import i18n from "@ticatec/i18n";
 
     export let appTitle: string = null as unknown as string;
 
@@ -27,6 +28,7 @@
     }
 
     let showMessageBox = (_message: string, _buttons: Array<any> | null, _title: string, _type: string | null, _escapeHTML: boolean = true): Promise<any> => {
+        console.log('显示消息框')
         if (!visible) {
             top = 0;
             left = 0;
@@ -34,6 +36,12 @@
             message = _message;
             title = _title ?? appTitle;
             escapeHTML = _escapeHTML != false;
+            if (_buttons) {
+                _buttons.forEach(button => {
+                    console.log(button.key, i18n.getText(button.key, button.text));
+                    button.label = i18n.getText(button.key, button.text)
+                });
+            }
             buttons = _buttons;
             iconType = _type == null ? 'uniface-icon-alert-circle' : _type == 'info' ? 'uniface-icon-help-circle' : 'uniface-icon-alert-triangle';
             type = _type ?? "info";

package/dist/ticatec-uniface-web.css

@@ -1665,6 +1665,8 @@
   --uniface-card-icon-color: #374151;
   --uniface-card-icon-hover-color: #37415170;
   --uniface-card-shadow: rgba(0, 0, 0, 0.16) 0px 1px 4px;
+  --uniface-action-image-size: 15px;
+  --uniface-action-image-hover-size: 18px;
 }
 
 .uniface-card {
@@ -1719,6 +1721,20 @@
   flex: 1;
   position: relative;
   padding: 10px;
+  font-size: var(--uniface-action-image-size);
+}
+.uniface-card > div .card-action-bar.simple .action-item .card-action-img {
+  width: var(--uniface-action-image-size);
+  height: var(--uniface-action-image-size);
+  cursor: pointer;
+}
+.uniface-card > div .card-action-bar.simple .action-item .card-action-img:hover {
+  width: var(--uniface-action-image-hover-size);
+  height: var(--uniface-action-image-hover-size);
+}
+.uniface-card > div .card-action-bar.simple .action-item .card-action-img:active {
+  position: relative;
+  top: 1px;
 }
 .uniface-card > div .card-action-bar.simple .action-item:not(:first-child)::before {
   content: "";
@@ -1733,7 +1749,7 @@
   color: var(--uniface-card-primary-text-color, #374151);
 }
 .uniface-card > div .card-action-bar.simple .action-item i:hover {
-  color: var(--uniface-card-icon-hover-color, rgba(55, 65, 81, 0.4392156863));
+  font-size: var(--uniface-action-image-hover-size);
 }
 .uniface-card > div .card-action-bar.simple .action-item i:active {
   position: relative;
@@ -1741,6 +1757,7 @@
 }
 .uniface-card > div .card-action-bar.simple .action-item.disabled i {
   cursor: default;
+  font-size: var(--uniface-action-image-size);
   color: var(--uniface-disabled-button-text-color, #B3BCCA);
 }
 .uniface-card > div .card-action-bar.simple .action-item.disabled i:hover {
@@ -1750,6 +1767,18 @@
   position: relative;
   top: 0;
 }
+.uniface-card > div .card-action-bar.simple .action-item.disabled .card-action-img {
+  filter: grayscale(100%);
+  cursor: default;
+}
+.uniface-card > div .card-action-bar.simple .action-item.disabled .card-action-img:hover {
+  width: var(--uniface-action-image-size);
+  height: var(--uniface-action-image-size);
+}
+.uniface-card > div .card-action-bar.simple .action-item.disabled .card-action-img:active {
+  position: relative;
+  top: 0;
+}
 .uniface-card > div .card-content {
   overflow: hidden;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ticatec/uniface-element",
-  "version": "0.1.19",
+  "version": "0.1.21",
   "description": "uniface web elements",
   "scripts": {
     "dev": "vite dev",