@ticatec/uniface-element 0.3.6 → 0.3.8

package/dist/data-table/parts/FixedRow.svelte

@@ -44,17 +44,17 @@
             {#if selectable}
                 <input type="checkbox" bind:checked={selected}/>
             {/if}
+            {#if indicatorColumn.displayNo}
+                <div style="margin-left: 4px; flex: 1 1 auto; text-align: center">
+                    <span>{rowNo}</span>
+                </div>
+            {/if}
 
             {#if expandable}
-                <div class="expand-icon" style="">
+                <div class="expand-icon" style="flex: 0 0 auto">
                     <i class={row == expandRow ? 'icon_google_folder' : "icon_google_folder_open"} aria-hidden="true" on:click={showInlineData}></i>
                 </div>
             {/if}
-            {#if indicatorColumn.displayNo}
-                <div style="margin-left: 4px; width: 20px; text-align: left">
-                    <span>{rowNo}</span>
-                </div>
-            {/if}
         </div>
     {/if}
     {#each cols as column, colIdx}

package/dist/input-options-select/InputOptionsSelect.svelte

@@ -1,11 +1,11 @@
 <script lang="ts">
 
-    import {DisplayMode} from "../common/DisplayMode";
-    import type {OnChangeHandler} from "../common/OnChangeHandler";
-    import {tick} from "svelte";
+    import {DisplayMode} from "../types";
+    import type {OnChangeHandler} from "../types";
     import CommonPicker from "../common/CommonPicker.svelte";
     import loadingGif from "../assets/loading.gif";
-    import type {LazyLoader} from "../list-box/types";
+    import type {LazyLoader} from "../types";
+    import type {RetrieveOptionText} from "../types";
 
     export let variant: '' | 'plain' | 'outlined' | 'filled' = '';
     export let disabled: boolean = false;
@@ -14,7 +14,8 @@
     export let text: string = '';
     export let value: any = null;
     export let keyField: string = "code";
-    export let textField: string = "text";
+    export let textField: string | undefined = undefined;
+    export let retrieveText: RetrieveOptionText | undefined = undefined;
     export let displayCode: boolean = false;
     export let menu$height: number = 0;
     export let style: string = '';
@@ -150,10 +151,14 @@
     const handleItemClick = (data: any) => () => {
         isUserTyping = false;
         value = data[keyField];
-        text = data[textField];
         if (value != oldValue) {
             onchange?.(data);
         }
+        if (retrieveText) {
+            text = retrieveText(data)
+        } else if (textField) {
+            text = data[textField]
+        }
         editor.focus();
         showPopup = false;
     }
@@ -192,15 +197,22 @@
     };
 
     const handleBlur = (event: FocusEvent) => {
-        if (!showPopup) {
-            hasFocus = false;
-            if (value == null) {
-                text = '';
+        setTimeout(() => {
+            const focused = scrollElement!=null && scrollElement.contains(document.activeElement);
+            if (!focused) {
+                hasFocus = false;
+                if (value == null) {
+                    inputText = '';
+                }
+                onblur?.();
             }
-            onblur?.();
-        }
+        }, 50)
     };
 
+    const getDisplayText = (item: any) => {
+        return retrieveText?.(item) ?? item[textField ?? keyField];
+    }
+
     const clean = () => {
         value = null;
         text = '';
@@ -226,7 +238,7 @@
                 // 如果已选择值，根据焦点状态显示keyField或textField
                 let selectedItem = options.find(op => op[keyField] == value);
                 if (selectedItem) {
-                    inputText = hasFocus && displayCode ? selectedItem[keyField] : selectedItem[textField];
+                    inputText = hasFocus && displayCode ? selectedItem[keyField] : getDisplayText(selectedItem);
                 } else {
                     inputText = hasFocus && displayCode ? value : text;
                 }
@@ -275,7 +287,7 @@
                     <svelte:component this={itemRender} item={op}/>
                 {:else}
                     <div style="padding: 6px 8px">
-                        <span>{op[textField]}</span>
+                        <span>{getDisplayText(op)}</span>
                     </div>
                 {/if}
             </div>

package/dist/input-options-select/InputOptionsSelect.svelte.d.ts

@@ -1,6 +1,7 @@
-import { DisplayMode } from "../common/DisplayMode";
-import type { OnChangeHandler } from "../common/OnChangeHandler";
-import type { LazyLoader } from "../list-box/types";
+import { DisplayMode } from "../types";
+import type { OnChangeHandler } from "../types";
+import type { LazyLoader } from "../types";
+import type { RetrieveOptionText } from "../types";
 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;
@@ -22,7 +23,8 @@ declare const InputOptionsSelect: $$__sveltets_2_IsomorphicComponent<{
     text?: string;
     value?: any;
     keyField?: string;
-    textField?: string;
+    textField?: string | undefined;
+    retrieveText?: RetrieveOptionText | undefined;
     displayCode?: boolean;
     menu$height?: number;
     style?: string;

package/dist/input-options-select/index.d.ts

@@ -1,2 +1,4 @@
 import InputOptionsSelect from "./InputOptionsSelect.svelte";
+import type { RetrieveOptionText } from "./types";
 export default InputOptionsSelect;
+export type { RetrieveOptionText };

package/dist/input-options-select/types.d.ts

@@ -0,0 +1 @@
+export type {};

package/dist/input-options-select/types.js

@@ -0,0 +1 @@
+export {};

package/dist/list-box/ListBox.svelte

@@ -28,12 +28,11 @@
     export let onSelectChange: OnSelectChange = null as unknown as OnSelectChange;
     export let onItemDblClick: OnItemDblClick = null as unknown as OnItemDblClick;
     export let onItemClick: OnItemClick = null as unknown as OnItemDblClick;
-
     export let title: string = null as unknown as string;
     export let round: boolean = false;
     export let footer$style: string | null = null;
+    export let filterText: string = '';
 
-    let filterText: string;
     let hasMore: boolean;
     let isBusy: boolean = false;
     let pageNo: number = 1;
@@ -146,8 +145,6 @@
 
     onMount(async () => {
         if (lazyLoader != null) {
-            console.log('加载数据...')
-            filterText = '';
             await lazyLoad();
         }
     })

package/dist/list-box/ListBox.svelte.d.ts

@@ -32,6 +32,7 @@ declare const ListBox: $$__sveltets_2_IsomorphicComponent<{
     title?: string;
     round?: boolean;
     footer$style?: string | null;
+    filterText?: string;
 }, {
     [evt: string]: CustomEvent<any>;
 }, {

package/dist/number-editor/NumberEditor.svelte

@@ -40,8 +40,9 @@
         editor.setFocus();
     }
 
-    let textValue: string = utils.formatNumber(value, precision);
+    //let textValue: string = utils.formatNumber(value, precision);
 
+    $: textValue = utils.formatNumber(value, precision);
 
 </script>
 <CommonEditor {displayMode} {style} value={textValue} {suffix} {prefix} {readonly} {variant} {compact} class={className}

package/dist/ticatec-uniface-web.css

@@ -3915,7 +3915,6 @@ root {
   color: var(--uniface-hover-item-color, #42A5F5);
   font-size: 14px;
   width: 16px;
-  position: absolute;
   right: 4px;
   cursor: pointer;
 }

package/dist/types.d.ts

@@ -3,5 +3,11 @@ import type { MouseClickHandler } from "./common/MouseClickHandler";
 import { DisplayMode } from "./common/DisplayMode.js";
 import { DateContext } from "./base-calendar";
 import { ModalResult } from "./message-box";
+import type { LazyLoader } from "./list-box";
+/**
+ * 从选中的Option中获取对于的文字值
+ */
+type RetrieveOptionText = (item: any) => string;
 export { DateContext, ModalResult, DisplayMode };
+export type { RetrieveOptionText, LazyLoader };
 export type { OnChangeHandler, MouseClickHandler };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ticatec/uniface-element",
-  "version": "0.3.6",
+  "version": "0.3.8",
   "description": "A comprehensive UI component library for Svelte applications with rich form controls, data tables, layouts and interactive elements",
   "keywords": [
     "svelte",