naive-ui 2.21.2 → 2.22.0

package/lib/data-table/src/interface.d.ts

@@ -1,5 +1,5 @@
 import { TreeNode } from 'treemate';
-import { CSSProperties, InjectionKey, Ref, VNodeChild, HTMLAttributes } from 'vue';
+import { CSSProperties, InjectionKey, Ref, VNodeChild, HTMLAttributes, Slots } from 'vue';
 import { EllipsisProps } from '../../ellipsis/src/Ellipsis';
 import { NLocale } from '../../locales';
 import { MergedTheme } from '../../_mixins';
@@ -100,6 +100,7 @@ export declare type DataTableSelectionOptions = Array<DataTableSelectionOption |
     onSelect: () => void;
 }>;
 export interface DataTableInjection {
+    slots: Slots;
     indentRef: Ref<number>;
     hasChildrenRef: Ref<boolean>;
     firstContentfulColIndexRef: Ref<number>;
@@ -115,7 +116,9 @@ export interface DataTableInjection {
     leftFixedColumnsRef: Ref<TableColumns>;
     rightFixedColumnsRef: Ref<TableColumns>;
     leftActiveFixedColKeyRef: Ref<ColumnKey | null>;
+    leftActiveFixedChildrenColKeysRef: Ref<ColumnKey[]>;
     rightActiveFixedColKeyRef: Ref<ColumnKey | null>;
+    rightActiveFixedChildrenColKeysRef: Ref<ColumnKey[]>;
     fixedColumnLeftMapRef: Ref<Record<ColumnKey, {
         start: number;
         end: number;

package/lib/data-table/src/styles/index.cssr.js

@@ -67,11 +67,11 @@ exports.default = (0, cssr_1.c)([(0, cssr_1.cB)('data-table', `
  --merged-th-color-hover: var(--th-color-hover);
  --merged-td-color-hover: var(--td-color-hover);
  --merged-td-color-striped: var(--td-color-striped);
- `, [(0, cssr_1.cM)('flex-height', [(0, cssr_1.c)('>', [(0, cssr_1.cB)('data-table-wrapper', `
+ `, [(0, cssr_1.cB)('data-table-wrapper', `
  flex-grow: 1;
  display: flex;
  flex-direction: column;
- `, [(0, cssr_1.c)('>', [(0, cssr_1.cB)('data-table-base-table', `
+ `), (0, cssr_1.cM)('flex-height', [(0, cssr_1.c)('>', [(0, cssr_1.cB)('data-table-wrapper', [(0, cssr_1.c)('>', [(0, cssr_1.cB)('data-table-base-table', `
  display: flex;
  flex-direction: column;
  flex-grow: 1;
@@ -107,7 +107,7 @@ exports.default = (0, cssr_1.c)([(0, cssr_1.cB)('data-table', `
  box-sizing: border-box;
  background-clip: padding-box;
  transition: background-color .3s var(--bezier);
- `, [(0, cssr_1.cM)('striped', 'background-color: var(--merged-td-color-striped);', [(0, cssr_1.cB)('data-table-td', 'background-color: var(--merged-td-color-striped);')]), (0, cssr_1.c)('&:hover', 'background-color: var(--merged-td-color-hover);', [(0, cssr_1.cB)('data-table-td', 'background-color: var(--merged-td-color-hover);')])]), (0, cssr_1.cB)('data-table-th', `
+ `, [(0, cssr_1.cM)('striped', 'background-color: var(--merged-td-color-striped);', [(0, cssr_1.cB)('data-table-td', 'background-color: var(--merged-td-color-striped);')]), (0, cssr_1.cNotM)('summary', [(0, cssr_1.c)('&:hover', 'background-color: var(--merged-td-color-hover);', [(0, cssr_1.cB)('data-table-td', 'background-color: var(--merged-td-color-hover);')])])]), (0, cssr_1.cB)('data-table-th', `
  padding: var(--th-padding);
  position: relative;
  text-align: start;
@@ -217,6 +217,7 @@ exports.default = (0, cssr_1.c)([(0, cssr_1.cB)('data-table', `
  padding: 0;
  line-height: 0;
  `), fixedColumnStyle]), (0, cssr_1.cB)('data-table-empty', `
+ box-sizing: border-box;
  padding: var(--empty-padding);
  flex-grow: 1;
  flex-shrink: 0;
@@ -250,15 +251,11 @@ exports.default = (0, cssr_1.c)([(0, cssr_1.cB)('data-table', `
   borderRight: '1px solid var(--merged-border-color)'
 }, [(0, cssr_1.cM)('last-col', {
   borderRight: '0 solid var(--merged-border-color)'
-})])]), (0, cssr_1.cM)('bordered', [(0, cssr_1.cB)('data-table-wrapper', {
-  border: '1px solid var(--merged-border-color)',
-  borderBottomLeftRadius: 'var(--border-radius)',
-  borderBottomRightRadius: 'var(--border-radius)'
-}), (0, cssr_1.cB)('data-table-td', [(0, cssr_1.cM)('last-row', {
-  borderBottom: '0 solid var(--merged-border-color)'
-})]), (0, cssr_1.cB)('data-table-base-table-body', `
- border-bottom-left-radius: calc(var(--border-radius) - 1px);
- border-bottom-right-radius: calc(var(--border-radius) - 1px);
+})])]), (0, cssr_1.cM)('bordered', [(0, cssr_1.cB)('data-table-wrapper', `
+ border: 1px solid var(--merged-border-color);
+ border-bottom-left-radius: var(--border-radius);
+ border-bottom-right-radius: var(--border-radius);
+ overflow: hidden;
  `)]), (0, cssr_1.cB)('data-table-base-table', [(0, cssr_1.cM)('transition-disabled', [(0, cssr_1.cB)('data-table-th', [(0, cssr_1.c)('&::after, &::before', {
   transition: 'none'
 })]), (0, cssr_1.cB)('data-table-td', [(0, cssr_1.c)('&::after, &::before', {

package/lib/data-table/src/use-check.js

@@ -61,18 +61,22 @@ function useCheck(props, data) {
         uncontrolledCheckedRowKeysRef.value = keys;
     }
     function doCheck(rowKey) {
+        if (props.loading)
+            return;
         doUpdateCheckedRowKeys(treeMateRef.value.check(rowKey, mergedCheckedRowKeysRef.value, {
             cascade: props.cascade
         }).checkedKeys);
     }
     function doUncheck(rowKey) {
+        if (props.loading)
+            return;
         doUpdateCheckedRowKeys(treeMateRef.value.uncheck(rowKey, mergedCheckedRowKeysRef.value, {
             cascade: props.cascade
         }).checkedKeys);
     }
     function doCheckAll(checkWholeTable = false) {
         const { value: column } = selectionColumnRef;
-        if (!column)
+        if (!column || props.loading)
             return;
         const rowKeysToCheck = [];
         (checkWholeTable
@@ -89,7 +93,7 @@ function useCheck(props, data) {
     }
     function doUncheckAll(checkWholeTable = false) {
         const { value: column } = selectionColumnRef;
-        if (!column)
+        if (!column || props.loading)
             return;
         const rowKeysToUncheck = [];
         (checkWholeTable

package/lib/data-table/src/use-scroll.d.ts

@@ -19,7 +19,9 @@ export declare function useScroll(props: DataTableSetupProps, { mainTableInstRef
     leftFixedColumnsRef: ComputedRef<TableColumn<any>[]>;
     rightFixedColumnsRef: ComputedRef<TableColumn<any>[]>;
     leftActiveFixedColKeyRef: Ref<ColumnKey | null>;
+    leftActiveFixedChildrenColKeysRef: Ref<ColumnKey[]>;
     rightActiveFixedColKeyRef: Ref<ColumnKey | null>;
+    rightActiveFixedChildrenColKeysRef: Ref<ColumnKey[]>;
     syncScrollState: () => void;
     handleTableBodyScroll: () => void;
     handleTableHeaderScroll: () => void;

package/lib/data-table/src/use-scroll.js

@@ -9,7 +9,9 @@ const utils_1 = require("./utils");
 function useScroll(props, { mainTableInstRef, mergedCurrentPageRef, bodyWidthRef, scrollPartRef }) {
     let scrollLeft = 0;
     const leftActiveFixedColKeyRef = (0, vue_1.ref)(null);
+    const leftActiveFixedChildrenColKeysRef = (0, vue_1.ref)([]);
     const rightActiveFixedColKeyRef = (0, vue_1.ref)(null);
+    const rightActiveFixedChildrenColKeysRef = (0, vue_1.ref)([]);
     const styleScrollXRef = (0, vue_1.computed)(() => {
         return (0, _utils_1.formatLength)(props.scrollX);
     });
@@ -43,7 +45,8 @@ function useScroll(props, { mainTableInstRef, mergedCurrentPageRef, bodyWidthRef
         const columns = {};
         let right = 0;
         function traverse(cols) {
-            cols.forEach((col) => {
+            for (let i = cols.length - 1; i >= 0; --i) {
+                const col = cols[i];
                 const positionInfo = { start: right, end: 0 };
                 columns[(0, utils_1.getColKey)(col)] = positionInfo;
                 if ('children' in col) {
@@ -54,9 +57,9 @@ function useScroll(props, { mainTableInstRef, mergedCurrentPageRef, bodyWidthRef
                     right += (0, utils_1.getColWidth)(col) || 0;
                     positionInfo.end = right;
                 }
-            });
+            }
         }
-        traverse(rightFixedColumnsRef.value.reverse());
+        traverse(rightFixedColumnsRef.value);
         return columns;
     });
     function deriveActiveLeftFixedColumn() {
@@ -78,6 +81,18 @@ function useScroll(props, { mainTableInstRef, mergedCurrentPageRef, bodyWidthRef
         }
         leftActiveFixedColKeyRef.value = leftActiveFixedColKey;
     }
+    function deriveActiveLeftFixedChildrenColumns() {
+        leftActiveFixedChildrenColKeysRef.value = [];
+        let activeLeftFixedColumn = props.columns.find((col) => (0, utils_1.getColKey)(col) === leftActiveFixedColKeyRef.value);
+        while (activeLeftFixedColumn && 'children' in activeLeftFixedColumn) {
+            const length = activeLeftFixedColumn.children.length;
+            if (length === 0)
+                break;
+            const nextActiveLeftFixedColumn = activeLeftFixedColumn.children[length - 1];
+            leftActiveFixedChildrenColKeysRef.value.push((0, utils_1.getColKey)(nextActiveLeftFixedColumn));
+            activeLeftFixedColumn = nextActiveLeftFixedColumn;
+        }
+    }
     function deriveActiveRightFixedColumn() {
         var _a, _b;
         // target is header element
@@ -89,7 +104,7 @@ function useScroll(props, { mainTableInstRef, mergedCurrentPageRef, bodyWidthRef
         let rightWidth = 0;
         let rightActiveFixedColKey = null;
         const { value: fixedColumnRightMap } = fixedColumnRightMapRef;
-        for (let i = 0; i < rightFixedColumns.length; ++i) {
+        for (let i = rightFixedColumns.length - 1; i >= 0; --i) {
             const key = (0, utils_1.getColKey)(rightFixedColumns[i]);
             if (Math.round(scrollLeft +
                 (((_a = fixedColumnRightMap[key]) === null || _a === void 0 ? void 0 : _a.start) || 0) +
@@ -104,6 +119,17 @@ function useScroll(props, { mainTableInstRef, mergedCurrentPageRef, bodyWidthRef
         }
         rightActiveFixedColKeyRef.value = rightActiveFixedColKey;
     }
+    function deriveActiveRightFixedChildrenColumns() {
+        rightActiveFixedChildrenColKeysRef.value = [];
+        let activeRightFixedColumn = props.columns.find((col) => (0, utils_1.getColKey)(col) === rightActiveFixedColKeyRef.value);
+        while (activeRightFixedColumn &&
+            'children' in activeRightFixedColumn &&
+            activeRightFixedColumn.children.length) {
+            const nextActiveRightFixedColumn = activeRightFixedColumn.children[0];
+            rightActiveFixedChildrenColKeysRef.value.push((0, utils_1.getColKey)(nextActiveRightFixedColumn));
+            activeRightFixedColumn = nextActiveRightFixedColumn;
+        }
+    }
     function getScrollElements() {
         const header = mainTableInstRef.value
             ? mainTableInstRef.value.getHeaderElement()
@@ -160,7 +186,9 @@ function useScroll(props, { mainTableInstRef, mergedCurrentPageRef, bodyWidthRef
             scrollLeft = body.scrollLeft;
         }
         deriveActiveLeftFixedColumn();
+        deriveActiveLeftFixedChildrenColumns();
         deriveActiveRightFixedColumn();
+        deriveActiveRightFixedChildrenColumns();
     }
     function setHeaderScrollLeft(left) {
         const { header } = getScrollElements();
@@ -179,7 +207,9 @@ function useScroll(props, { mainTableInstRef, mergedCurrentPageRef, bodyWidthRef
         leftFixedColumnsRef,
         rightFixedColumnsRef,
         leftActiveFixedColKeyRef,
+        leftActiveFixedChildrenColKeysRef,
         rightActiveFixedColKeyRef,
+        rightActiveFixedChildrenColKeysRef,
         syncScrollState,
         handleTableBodyScroll,
         handleTableHeaderScroll,

package/lib/data-table/src/use-table-data.js

@@ -21,6 +21,7 @@ function useTableData(props, { dataRelatedColsRef }) {
     const treeMateRef = (0, vue_1.computed)(() => {
         const { childrenKey } = props;
         return (0, treemate_1.createTreeMate)(props.data, {
+            ignoreEmptyChildren: true,
             getKey: props.rowKey,
             getChildren: (rowData) => rowData[childrenKey],
             getDisabled: (rowData) => {
@@ -188,11 +189,13 @@ function useTableData(props, { dataRelatedColsRef }) {
     function mergedOnUpdatePageSize(pageSize) {
         const { pagination } = props;
         if (pagination) {
-            const { onPageSizeChange, 'onUpdate:pageSize': onUpdatePageSize } = pagination;
+            const { onPageSizeChange, 'onUpdate:pageSize': _onUpdatePageSize, onUpdatePageSize } = pagination;
             if (onPageSizeChange)
                 (0, _utils_1.call)(onPageSizeChange, pageSize);
             if (onUpdatePageSize)
                 (0, _utils_1.call)(onUpdatePageSize, pageSize);
+            if (_onUpdatePageSize)
+                (0, _utils_1.call)(_onUpdatePageSize, pageSize);
             doUpdatePageSize(pageSize);
         }
     }

package/lib/data-table/styles/_common.js

@@ -10,7 +10,7 @@ exports.default = {
     sorterSize: '15px',
     filterSize: '15px',
     paginationMargin: '12px 0 0 0',
-    emptyPadding: '16px 0',
+    emptyPadding: '48px 0',
     actionPadding: '8px 12px',
     actionButtonMargin: '0 8px 0 0'
 };

package/lib/data-table/styles/light.d.ts

@@ -112,9 +112,9 @@ declare const dataTableLight: import("../../_mixins").Theme<"DataTable", {
         fontSizeMedium: string;
         fontSizeLarge: string;
         opacityDisabled: string;
-        colorOpacitySecondary: number;
-        colorOpacitySecondaryHover: number;
-        colorOpacitySecondaryPressed: number;
+        colorOpacitySecondary: string;
+        colorOpacitySecondaryHover: string;
+        colorOpacitySecondaryPressed: string;
         colorSecondary: string;
         colorSecondaryHover: string;
         colorSecondaryPressed: string;