@ticatec/uniface-element 0.1.65 → 0.1.67

package/dist/common/utils.d.ts

@@ -5,7 +5,7 @@ declare const _default: {
     sleep: (n: number) => Promise<void>;
     getNumberRegex: (precision: number | null | undefined, allowNegative: boolean) => string;
     isValidNumber: (n: number, precision: number | null | undefined, allowNegative: boolean, max?: number | null, min?: number | null) => boolean;
-    formatNumber: (n: number | null, precision: number | null | undefined) => string;
+    formatNumber: (n: number | string | null, precision: number | null | undefined) => string;
     filterFiles: (files: Array<File>, accept: string) => File[];
     getNestedObject: (obj: any, keys: string[]) => any;
     getNestedValue: (data: any, key: string) => any;

package/dist/common/utils.js

@@ -65,7 +65,8 @@ const isValidNumber = (n, precision, allowNegative, max = null, min = null) => {
     return valid;
 };
 const formatNumber = (n, precision) => {
-    if (n == null) {
+    n = typeof n == "string" ? parseFloat(n) : n;
+    if (n == null || isNaN(n)) {
         return '';
     }
     else {

package/dist/common-editor/NumberInput.svelte

@@ -19,8 +19,6 @@
         editor.focus();
     }
 
-    const ctrlKeys: Array<string> = ['Backspace', 'Delete', 'Tab', 'ArrowLeft', 'ArrowRight', 'ArrowUp', 'ArrowDown'];
-
     let regex: RegExp;
 
     let editor: any;

package/dist/data-table/UniDataTable.js

@@ -28,7 +28,7 @@ export default class UniDataTable {
         this._frozenColumns = [];
         this._columns = [];
         (columns ?? []).forEach(col => {
-            if (col.visible) {
+            if (col.visible != false) {
                 if (col.frozen) {
                     this._frozenColumns.push(col);
                 }
@@ -46,7 +46,7 @@ export default class UniDataTable {
         this._frozenColumns.forEach((col, idx) => {
             if (col.visible != false) {
                 this._frozenWidth += col.width;
-                colStyle += `#tab-${this.id} .fz_col-${idx - inv} {width: ${col.width}px; ext-align: ${col.align ?? 'left'}}\n`;
+                colStyle += `#tab-${this.id} .fz_col-${idx - inv} {width: ${col.width}px; text-align: ${col.align ?? 'left'}}\n`;
             }
             else {
                 inv++;

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

@@ -63,16 +63,37 @@
         selectionMode = selectedRows.length == rows.length ? SelectionMode.All : selectedRows.length == 0 ? SelectionMode.None : SelectionMode.Partial;
     }
 
+    let viewPanel: any;
+
+    const handleWheelEvent = (e: WheelEvent) => {
+        let maxSh = viewPanel.scrollHeight - viewPanel.clientHeight;
+        if (maxSh > 0) {
+            if (e.deltaY != 0) {
+                scrollTop = scrollTop + e.deltaY;
+                if (scrollTop < 0) {
+                    scrollTop = 0;
+                }
+                if (scrollTop > maxSh) {
+                    scrollTop = maxSh;
+                }
+                setTimeout(() => {
+                    scrollTop = viewPanel.scrollTop;
+                }, 200);
+            }
+        }
+    }
 
-    $: console.log('选中行', selectionMode)
+    $: if (viewPanel && scrollTop > -1) {
+        viewPanel.scrollTop = scrollTop;
+    }
 
 </script>
 
 <div class="left-fixed-panel" style="width: {width}px">
     <FixedHeaderPanel {selectionMode} {orderColumn} {orderDirection} {handleCellClick} {handleWidthChange} columns={fixedCols} {indicatorColumn}
                       {handleToggleSelectAll} {rowHeight}/>
-    <div class="rows-container">
-        <div style="top: {-scrollTop}px">
+    <div class="rows-container" bind:this={viewPanel} on:wheel|passive={handleWheelEvent}>
+        <div>
             {#each rows ?? [] as row, idx}
                 <FixedRow rowNo={idx+1} {row} selected={selectedRows.indexOf(row.data) > -1} alternative={idx % 2 == 1} {selectable}
                           cols={fixedCols} {expandRow} {rowHeight} {expandable} {handleRowExpand} {handleRowSelectChange} {indicatorColumn}/>

package/dist/dialog/CommonDialog.svelte

@@ -6,6 +6,9 @@
     import type {DialogCloseConfirm} from "./DialogCloseConfirm";
 
     export let title: string;
+    export let width: string = 'unset';
+    export let height: string = 'unset';
+
     export let closeConfirm: DialogCloseConfirm | null = null;
     export let content$style: string = '';
     export let closeHandler: () => void;
@@ -35,6 +38,6 @@
 
 </script>
 
-<Dialog {title} {content$style} {closeHandler} {actions} {closeConfirm}>
+<Dialog {title} {content$style} {width} {height} {closeHandler} {actions} {closeConfirm}>
     <slot></slot>
 </Dialog>

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

@@ -19,6 +19,8 @@ type $$__sveltets_2_PropsWithChildren<Props, Slots> = Props & (Slots extends {
 } : {});
 declare const CommonDialog: $$__sveltets_2_IsomorphicComponent<$$__sveltets_2_PropsWithChildren<{
     title: string;
+    width?: string;
+    height?: string;
     closeConfirm?: DialogCloseConfirm | null;
     content$style?: string;
     closeHandler: () => void;

package/dist/dialog/Dialog.svelte

@@ -7,6 +7,9 @@
     import {onMount} from "svelte";
 
     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 = '';
@@ -52,9 +55,10 @@
 
     $:  dialogActions = actions ? [...actions, closeAction] : [closeAction];
 
+
 </script>
 
-<div class="uniface-dialog" style="{startMove ? 'cursor: move' : ''}" transition:fade={{duration: 500}} aria-hidden="true"
+<div class="uniface-dialog" style="width: {width}; height: {height}; {startMove ? 'cursor: move' : ''}" transition:fade={{duration: 500}} aria-hidden="true"
      on:mouseleave={handleMouseUp} on:mousemove={handleMouseMove}>
     <div>
         <div class="uniface-dialog-box" style="top: {top}px; left: {left}px">

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

@@ -20,6 +20,8 @@ type $$__sveltets_2_PropsWithChildren<Props, Slots> = Props & (Slots extends {
 } : {});
 declare const Dialog: $$__sveltets_2_IsomorphicComponent<$$__sveltets_2_PropsWithChildren<{
     title: string;
+    width?: string;
+    height?: string;
     actions?: ButtonActions | null;
     closeConfirm?: DialogCloseConfirm | null;
     content$style?: string;

package/dist/dialog/DialogBoard.svelte

@@ -7,7 +7,7 @@
     import {dialogs} from "./Dialogs";
 
     export const open = (component: any, params: any) => {
-        let dialog = {id: (new Date().getTime()).toString(36) ,component, params};
+        let dialog = {id: (new Date().getTime()).toString(36), component, params};
         params.closeHandler = () => {
             dialogs.removeDialog(dialog.id);
         }
@@ -32,7 +32,9 @@
 </script>
 
 <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 style="width: 100%; height: 100%; position: relative">
+        {#each $dialogs as dialog}
+            <svelte:component this={dialog.component} {...dialog.params}></svelte:component>
+        {/each}
+    </div>
 </div>

package/dist/number-editor/NumberEditor.svelte

@@ -1,4 +1,4 @@
-<script lang="ts">
+ <script lang="ts">
 
     import {DisplayMode} from "../common/DisplayMode";
     import CommonEditor from "../common-editor/CommonEditor.svelte";

package/dist/ticatec-uniface-web.css

@@ -3738,7 +3738,7 @@ root {
   --uniface-data-table-header-bg: #F8FAFC;
   --uniface-data-table-shadow-gap: 2px;
   --uniface-data-table-header-divid-color: #B3BCCA;
-  --uniface-data-table-cell-padding: 3px 4px;
+  --uniface-data-table-cell-padding: 3px 6px;
   --uniface-data-table-inline-row-panel-border: 1px solid #F8FAFC;
   --uniface-data-table-inline-row-panel-bg: #F1F5F9;
   --uniface-scroll-color: #e1e1e180;

package/package.json

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