@ticatec/uniface-element 0.1.12 → 0.1.14

package/dist/app-layout/ClassicLayout.svelte

@@ -60,7 +60,7 @@
         </div>
         {#if $$slots['right-sidebar']}
             {#if sidebarResize}
-                <Split direction="vertical" bindingPanel={rightBar}/>
+                <Split direction="vertical" bindingPanel={rightBar} reverse/>
             {/if}
             <div bind:this={rightBar} style="width: 100%; flex: 0 0 auto; overflow: auto; width: {rightBarWidth}; {rightMinWidth} {rightMaxWidth}">
                 <slot name="right-sidebar"></slot>

package/dist/box/Box.svelte

@@ -5,6 +5,7 @@
     export let round: boolean = false;
 
     export let content$style: string = '';
+    export let fonter$style: string = '';
 
 </script>
 
@@ -21,4 +22,11 @@
     <div class="box-content" style={content$style}>
         <slot></slot>
     </div>
+    {#if $$slots['footer']}
+        <div class="box-footer" style={fonter$style}>
+            <slot name="footer">
+
+            </slot>
+        </div>
+    {/if}
 </div>

package/dist/box/Box.svelte.d.ts

@@ -21,14 +21,17 @@ declare const Box: $$__sveltets_2_IsomorphicComponent<$$__sveltets_2_PropsWithCh
     title?: string;
     round?: boolean;
     content$style?: string;
+    fonter$style?: string;
 }, {
     header: {};
     default: {};
+    footer: {};
 }>, {
     [evt: string]: CustomEvent<any>;
 }, {
     header: {};
     default: {};
+    footer: {};
 }, {}, string>;
 type Box = InstanceType<typeof Box>;
 export default Box;

package/dist/card/Card.svelte

@@ -1,6 +1,5 @@
 <script lang="ts">
 
-    import CardHeader from "./CardHeader.svelte";
     import type CardAction from "./CardAction";
     import CommonCardActionBar from "./CommonCardActionBar.svelte";
 
@@ -15,7 +14,9 @@
 <div class="uniface-card" class:shadowBox={variant=='3d'}>
     <div {style}>
         {#if title}
-            <CardHeader {title}/>
+            <div class="card-header simple">
+                <span>{title}</span>
+            </div>
         {:else if $$slots['header-bar']}
             <div class="card-header">
                 <slot name="header-bar"/>

package/dist/card/CardAction.d.ts

@@ -1,5 +1,6 @@
 export type ActionCallback = () => void;
 export default interface CardAction {
     icon?: string;
+    disabled?: boolean;
     callback: ActionCallback;
 }

package/dist/card/CommonCardActionBar.svelte

@@ -8,7 +8,7 @@
     let clickEnable = true;
 
     const handleActionClick = (action: CardAction) => async (e: MouseEvent) => {
-        if (clickEnable) {
+        if (clickEnable && !action.disabled) {
             clickEnable = false;
             action.callback?.();
             await utils.sleep(0.5);
@@ -20,8 +20,8 @@
 
 <div class="card-action-bar simple">
     {#each actions as action}
-        <div class="action-item">
-            <i class={action.icon} on:click={handleActionClick(action)}></i>
+        <div class:disabled={action.disabled} class="action-item">
+            <i class={action.icon} aria-hidden="true" on:click={handleActionClick(action)}></i>
         </div>
     {/each}
 </div>

package/dist/checkbox/CheckBox.svelte

@@ -41,7 +41,7 @@
 
 </script>
 <div class="uniface-checkbox" class:disabled class:compact {style}>
-    <label on:click={handleClickEvent} aria-hidden="true" >
+    <label on:click={handleClickEvent} >
         <input bind:this={checkbox} type="checkbox" bind:checked={value} {readonly} {disabled}/>
         <span>{label}</span>
     </label>

package/dist/data-table/DataTable.svelte

@@ -1,91 +1,120 @@
 <script lang="ts">
 
-
-    import TableHeaderPanel from "./parts/TableHeaderPanel.svelte";
     import ContentPanel from "./parts/ContentPanel.svelte";
     import type DataColumn from "./lib/DataColumn";
     import type ActionsColumn from "./lib/ActionsColumn";
     import type IndicatorColumn from "./lib/IndicatorColumn";
     import type TableRow from "./parts/TableRow";
+    import UniDataTable from "./UniDataTable";
+    import {onMount} from "svelte";
+    import FixedColumnsPanel from "./parts/FixedColumnsPanel.svelte";
+    import ActionPanel from "./parts/ActionsPanel.svelte";
+    import {OrderDirection} from "./lib/OrderDirection";
     import type {CompareFunction} from "./lib/CompareFunction";
-    import UniDataTable, {SelectionMode} from "./UniDataTable";
-    import {onMount, tick} from "svelte";
 
     export let columns: Array<DataColumn>;
-    export let actionsColumn: ActionsColumn | null;
-    export let indicatorColumn: IndicatorColumn;
-    export let rowHeight: number = null as unknown as number;  //{ rowHeight}
-    export let list;
+    export let actionsColumn: ActionsColumn | null = null;
+    export let indicatorColumn: IndicatorColumn | null = null;
+    export let rowHeight: number = 42;  //{ rowHeight}
+    export let list: Array<any>;
     export let selectedRows: Array<any> = [];
+    export let inlineRowHeight: number = 80;
+    export let rowBorder: boolean = false;
+    export let colBorder: boolean = false;
+
+    export let style: string = '';
 
-    let dataColumns: Array<DataColumn> = [];
+    let dataColumns: Array<DataColumn>;
 
-    let colStyle: string = '';
-    let scrollLeft: number = 0;
     let rows: Array<TableRow>;
     let table: UniDataTable = null as unknown as UniDataTable;
-    export let selectionMode: SelectionMode = SelectionMode.None;
+    let tabStyle: string = '';
 
-    let id: string = `${(new Date()).getTime().toString(16)}-${(Math.round(1000 * Math.random()) + 10000).toString(16)}`;
+    let id: string = (new Date()).getTime().toString(36);
 
     onMount(() => {
-        table = new UniDataTable(id, indicatorColumn.width);
+        table = new UniDataTable(id, indicatorColumn?.width);
+        selectedRows = selectedRows ?? [];
+        initializeTable();
     })
-    const sortRows = (compareFun: CompareFunction, descending: boolean) => {
-        let oList = list.sort(compareFun);
-        displayList = descending ? oList.reverse() : oList;
-        rows = table.rows;
-    }
 
-    const handleDataSelected = async (value: boolean) => {
-        rows.forEach(row => row.selected = value);
-        selectedRows = rows.filter(item => item.selected).map(item => item.data);
-        await tick();
-        selectionMode = value ? SelectionMode.All : SelectionMode.None;
-        rows = [...rows];
-    }
+    let expandRow: TableRow | null = null;
+    let fixedCols: Array<DataColumn>;
+    let scrollTop: number;
 
-    $: selectedRows = selectedRows ?? [];
+    const initializeTable = () => {
+        table.setColumns(columns);
+        rows = table.rows;
+        dataColumns = table.columns;
+        fixedCols = table.frozenColumns;
+        tabStyle = table.generateTemplateStyle();
+        tabWidth = table.width;
+        frozenWidth = table.frozenWidth;
+    }
 
-    $: displayList = [...list];
 
-    $: {
-        if (table && columns) {
-            table.setColumns(columns)
-            table.data = displayList;
-            rows = table.rows;
-            dataColumns = table.columns;
-            colStyle = table.generateTemplateStyle();
-            tabWidth = table.width;
-        }
+    $: if (table && columns) {
+        initializeTable();
     }
 
     let tabWidth: number;
-
+    let frozenWidth: number;
     const handleWidthChange = () => {
-        colStyle = table.generateTemplateStyle();
+        tabStyle = table.generateTemplateStyle();
         tabWidth = table.width;
+        frozenWidth = table.frozenWidth;
     }
 
+    let orderColumn: DataColumn = null as unknown as DataColumn;
+    let orderDirection: OrderDirection = OrderDirection.Ascending;
+    const sortRows = (compareFun: CompareFunction, descending: boolean) => {
+        expandRow = null;
+        let oList = list.sort(compareFun);
+        table.data = descending ? oList.reverse() : oList;
+        rows = table.rows;
+    }
+    const handleCellClick = (col: DataColumn) => (e: MouseEvent) => {
+        if (col.compareFunction != null) {
+            if (col == orderColumn) {
+                orderDirection = orderDirection == OrderDirection.Ascending ? OrderDirection.Descending : OrderDirection.Ascending;
+            } else {
+                orderColumn = col;
+                orderDirection = OrderDirection.Ascending;
+            }
+            sortRows(col.compareFunction, orderDirection == OrderDirection.Descending);
+        }
+    }
 
-    const handleRowSelectChange = async () => {
-        selectedRows = rows.filter(item => item.selected).map(item => item.data);
-        selectionMode = selectedRows.length == rows.length ? SelectionMode.All : selectedRows.length == 0 ? SelectionMode.None : SelectionMode.Partial;
+    let inlineComponent: any;
+    const handleRowExpand = async (row: TableRow) => {
+        if (row == expandRow) {
+            expandRow = null;
+            inlineComponent = null;
+        } else {
+            inlineComponent = await indicatorColumn?.buildInlineComponent?.(row.data);
+            expandRow = row;
+        }
     }
 
 </script>
 
-<div id="tab-{id}" class="uniface-data-table">
-    {@html colStyle}
-    {#if table}
-        <div>
-            <TableHeaderPanel sortData={sortRows} {selectionMode} frozenCols={[]} dataCols={dataColumns}
-                              {scrollLeft} width={tabWidth}
-                              {indicatorColumn} {actionsColumn} handleToggleSelectAll={handleDataSelected} {handleWidthChange}/>
-            {#if colStyle.length > 0 && list}
-                <ContentPanel columns={dataColumns} {rows} {indicatorColumn} {actionsColumn}
-                              bind:scrollLeft {rowHeight} width={tabWidth} {handleRowSelectChange}/>
-            {/if}
-        </div>
+<div id="tab-{id}" {style} class="uniface-data-table" class:cell-border={colBorder} class:row-border={rowBorder}>
+    {@html tabStyle}
+    {#if table && dataColumns && fixedCols}
+        {#if indicatorColumn || fixedCols.length > 0}
+            <FixedColumnsPanel {handleRowExpand} bind:selectedRows {orderDirection} {orderColumn} {handleCellClick} {indicatorColumn}
+                               bind:expandRow {table}
+                               {rowHeight} {fixedCols} {inlineRowHeight} {rows} {handleWidthChange} width={frozenWidth}
+                               bind:scrollTop/>
+        {/if}
+
+        <ContentPanel columns={dataColumns} {orderDirection} {orderColumn} {handleWidthChange} {handleCellClick} {tabWidth} bind:rows
+                      bind:scrollTop {expandRow} {rowHeight} {list} {table} {inlineComponent} bind:inlineRowHeight
+                      displayHorizontalScroll={actionsColumn!=null || indicatorColumn != null || fixedCols.length > 0}
+                      showVerticalScroll={actionsColumn == null}/>
+    {/if}
+
+    {#if actionsColumn}
+        <ActionPanel {expandRow} {rowHeight} {actionsColumn} {rows} {inlineRowHeight} bind:scrollTop/>
     {/if}
 </div>

package/dist/data-table/DataTable.svelte.d.ts

@@ -1,7 +1,6 @@
 import type DataColumn from "./lib/DataColumn";
 import type ActionsColumn from "./lib/ActionsColumn";
 import type IndicatorColumn from "./lib/IndicatorColumn";
-import { SelectionMode } from "./UniDataTable";
 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;
@@ -17,12 +16,15 @@ interface $$__sveltets_2_IsomorphicComponent<Props extends Record<string, any> =
 }
 declare const DataTable: $$__sveltets_2_IsomorphicComponent<{
     columns: Array<DataColumn>;
-    actionsColumn: ActionsColumn | null;
-    indicatorColumn: IndicatorColumn;
+    actionsColumn?: ActionsColumn | null;
+    indicatorColumn?: IndicatorColumn | null;
     rowHeight?: number;
-    list: any;
+    list: Array<any>;
     selectedRows?: Array<any>;
-    selectionMode?: SelectionMode;
+    inlineRowHeight?: number;
+    rowBorder?: boolean;
+    colBorder?: boolean;
+    style?: string;
 }, {
     [evt: string]: CustomEvent<any>;
 }, {}, {}, string>;

package/dist/data-table/UniDataTable.d.ts

@@ -1,6 +1,7 @@
 import type DataColumn from "./lib/DataColumn";
 import type TableRow from "./parts/TableRow";
 export type RowEventHandler = (row: TableRow) => void;
+export type RowSelectEventHandler = (row: TableRow, value: boolean) => void;
 export type TableEventHandler = () => void;
 export type SelectionEventHandler = (value: boolean) => void;
 export declare enum SelectionMode {
@@ -16,7 +17,7 @@ export default class UniDataTable {
     readonly id: string;
     private _width;
     private _frozenWidth;
-    constructor(id: string, indicatorWidth: number);
+    constructor(id: string, indicatorWidth?: number);
     set data(value: Array<any>);
     get data(): Array<any>;
     setColumns(columns: Array<DataColumn>): void;
@@ -24,5 +25,6 @@ export default class UniDataTable {
     get width(): number;
     get frozenWidth(): number;
     get rows(): Array<TableRow>;
-    get columns(): DataColumn[];
+    get columns(): Array<DataColumn>;
+    get frozenColumns(): Array<DataColumn>;
 }

package/dist/data-table/UniDataTable.js

@@ -15,7 +15,7 @@ export default class UniDataTable {
     _frozenWidth = 0;
     constructor(id, indicatorWidth) {
         this.id = id;
-        this.indicatorWidth = indicatorWidth;
+        this.indicatorWidth = indicatorWidth ?? 0;
         this.tableRows = new TableRows();
     }
     set data(value) {
@@ -25,12 +25,10 @@ export default class UniDataTable {
         return this.tableRows.data;
     }
     setColumns(columns) {
-        let frozen = true;
         this._frozenColumns = [];
         this._columns = [];
         (columns ?? []).forEach(col => {
-            frozen = frozen && col.frozen == true;
-            if (frozen) {
+            if (col.frozen) {
                 this._frozenColumns.push(col);
             }
             else {
@@ -40,12 +38,12 @@ export default class UniDataTable {
     }
     generateTemplateStyle() {
         this._width = 0;
-        this._frozenWidth = this.indicatorWidth;
+        this._frozenWidth = 0;
         let colStyle = '';
         let inv = 0;
         this._frozenColumns.forEach((col, idx) => {
             if (col.visible != false) {
-                this.indicatorWidth += col.width;
+                this._frozenWidth += col.width;
                 colStyle += `#tab-${this.id} .fz_col-${idx - inv} {width: ${col.width}px; ext-align: ${col.align ?? 'left'}}\n`;
             }
             else {
@@ -68,7 +66,7 @@ export default class UniDataTable {
         return this._width;
     }
     get frozenWidth() {
-        return this._frozenWidth;
+        return this._frozenWidth + this.indicatorWidth;
     }
     get rows() {
         return [...this.tableRows.rows];
@@ -76,4 +74,7 @@ export default class UniDataTable {
     get columns() {
         return this._columns;
     }
+    get frozenColumns() {
+        return this._frozenColumns;
+    }
 }

package/dist/data-table/lib/IndicatorColumn.d.ts

@@ -12,16 +12,7 @@ export default interface IndicatorColumn {
      */
     buildInlineComponent?: (data: any) => Promise<any>;
     /**
-     *
-     * @param ex
-     */
-    getInlineError?: (ex: Error) => string;
-    /**
-     * 读取数据的指示信息
-     */
-    loadingIndicator?: string;
-    /**
-     *  空数据指示信息
+     * 是否显示行号
      */
-    emptyIndicator?: string;
+    displayNo?: boolean;
 }

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

@@ -4,6 +4,7 @@
     import type ActionsColumn from "../lib/ActionsColumn";
     import type TableRow from "./TableRow";
     import {onDestroy, onMount} from "svelte";
+    import i18n from "../../i18nContext";
 
     export let actionsColumn: ActionsColumn;
     export let scrollTop: number = 0;
@@ -11,7 +12,7 @@
 
     export let inlineRowHeight: number = 0;
 
-    export let expandRow: TableRow;
+    export let expandRow: TableRow | null;
 
     export let rowHeight: number;
 
@@ -42,11 +43,17 @@
         resizeObserver.disconnect();
     });
 
+    let actionText = i18n.getText('uniface.element.tableActions', 'Actions');
 
 </script>
 
 <div class="action-panel" bind:this={panel} style="user-select: none; width: {actionsColumn.width}px;">
-    <div bind:this={scrollPanel} class="scroll-panel" on:scroll|passive={handleActionPanelScroll}>
+    <div class="header-row">
+        <div class="vertical-center">
+            <span>{actionText}</span>
+        </div>
+    </div>
+    <div bind:this={scrollPanel} class="rows-container" style="overflow-y: auto" on:scroll|passive={handleActionPanelScroll}>
         <div>
             {#each rows as row, idx}
                 <ActionsRow {row} {rowHeight} parentRect={rect} alternative={idx % 2 == 1} width={actionsColumn.width}

package/dist/data-table/parts/ActionsPanel.svelte.d.ts

@@ -18,7 +18,7 @@ declare const ActionsPanel: $$__sveltets_2_IsomorphicComponent<{
     scrollTop?: number;
     rows: Array<TableRow>;
     inlineRowHeight?: number;
-    expandRow: TableRow;
+    expandRow: TableRow | null;
     rowHeight: number;
 }, {
     [evt: string]: CustomEvent<any>;

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

@@ -84,9 +84,9 @@
     $: style = rowHeight== null ? '' : `height: ${rowHeight}px`
 
 </script>
-<div class="table-row" class:alternative style="position: relative; width: {width}px; display: block; {style}">
-    <div bind:this={cell}
-         style="width: max-content; overflow-x: auto; white-space: nowrap; top: 50%; position: relative; transform: translateY(-50%);">
+<div class="data-row" class:alternative style="position: relative; width: {width}px; display: block; {style}">
+    <div class="action-cell" bind:this={cell}
+         style="">
         {#each actionList as action}
             <TextButton style="flex-shrink: 0; top: 0" size="mini" type="primary" label={action.label} onClick={()=>action.callback(row.data)}/>
         {/each}