bkui-vue 1.0.3-beta.66.dialog.4 → 1.0.3-beta.67.dialog.1

package/lib/overflow-title/index.js

@@ -128,7 +128,7 @@ function placementType() {
         //   const { fontSize, fontFamily } = getComputedStyle(boxRef.value);
         //   textWidth = getActualWidthByCanvas(contentText.value as string, { fontSize, fontFamily });
         // }
-        if ((0,shared_namespaceObject.hasOverflowEllipsis)(boxRef.value)) {
+        if ((0,shared_namespaceObject.hasOverflowEllipsis)(textRef.value)) {
           isShowTips.value = true;
           if (props.type === 'title') {
             var _textRef$value$innerT, _textRef$value;

package/lib/table/components/table-cell.d.ts

@@ -1,5 +1,6 @@
+import { Column } from '../props';
 declare const _default: import("vue").DefineComponent<{
-    column: import("vue-types").VueTypeDef<import("../props").Column>;
+    column: import("vue-types").VueTypeDef<Column>;
     row: import("vue-types").VueTypeValidableDef<any> & {
         default: any;
     };
@@ -24,7 +25,7 @@ declare const _default: import("vue").DefineComponent<{
     };
     resizerWay: import("vue-types").VueTypeDef<"debounce" | "throttle">;
 }, () => JSX.Element, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
-    column: import("vue-types").VueTypeDef<import("../props").Column>;
+    column: import("vue-types").VueTypeDef<Column>;
     row: import("vue-types").VueTypeValidableDef<any> & {
         default: any;
     };

package/lib/table/components/table-column.d.ts

@@ -193,8 +193,8 @@ declare const _default: import("vue").DefineComponent<{
         className?: import("../props").RowClassFunctionString;
         align?: "" | "right" | "left" | "center";
         showOverflowTooltip?: boolean | {
-            content: string | Function;
-            disabled?: (col: Column, row: any) => boolean;
+            content: string | ((col: Column, row: any) => string);
+            disabled?: boolean | ((col: Column, row: any) => boolean);
             watchCellResize?: boolean;
             mode?: "auto" | "static";
             popoverOption?: any;

package/lib/table/index.d.ts

@@ -1429,8 +1429,8 @@ declare const BkTable: {
             className?: import("./props").RowClassFunctionString;
             align?: "" | "right" | "left" | "center";
             showOverflowTooltip?: boolean | {
-                content: string | Function;
-                disabled?: (col: import("./props").Column, row: any) => boolean;
+                content: string | ((col: import("./props").Column, row: any) => string);
+                disabled?: boolean | ((col: import("./props").Column, row: any) => boolean);
                 watchCellResize?: boolean;
                 mode?: "auto" | "static";
                 popoverOption?: any;

package/lib/table/index.js

@@ -3889,15 +3889,17 @@ var tableSchemaResponse = function tableSchemaResponse(props) {
    * @param row
    * @param isSelected
    */
-  var setRowSelection = function setRowSelection(row, isSelected) {
+  var setRowSelection = function setRowSelection(row, isSelected, index) {
     var value = isSelected;
     if (typeof props.isSelectedFn === 'function') {
       value = props.isSelectedFn({
-        row: row
+        row: row,
+        index: index !== null && index !== void 0 ? index : getRowAttribute(row, TABLE_ROW_ATTRIBUTE.ROW_INDEX)
       });
     }
     if (isRowSelectEnable(props, {
-      row: row
+      row: row,
+      index: index !== null && index !== void 0 ? index : getRowAttribute(row, TABLE_ROW_ATTRIBUTE.ROW_INDEX)
     })) {
       setRowAttribute(row, TABLE_ROW_ATTRIBUTE.ROW_SELECTION, value);
     }
@@ -3936,13 +3938,13 @@ var tableSchemaResponse = function tableSchemaResponse(props) {
   var toggleAllSelection = function toggleAllSelection(value) {
     var val = value !== null && value !== void 0 ? value : !isCheckedAll();
     if (props.acrossAll) {
-      formatData.data.forEach(function (row) {
-        return setRowSelection(row, val);
+      formatData.data.forEach(function (row, index) {
+        return setRowSelection(row, val, index);
       });
       return;
     }
-    pageData.forEach(function (row) {
-      return setRowSelection(row, val);
+    pageData.forEach(function (row, index) {
+      return setRowSelection(row, val, index);
     });
     formatData.dataSchema.set(CHECK_ALL_OBJ, defineProperty_defineProperty(defineProperty_defineProperty({}, TABLE_ROW_ATTRIBUTE.ROW_SELECTION, val), TABLE_ROW_ATTRIBUTE.ROW_SELECTION_INDETERMINATE, false));
   };
@@ -6013,7 +6015,6 @@ function use_head_cell_isSlot(s) {
      * @param type 排序类型
      */
     var handleSortClick = function handleSortClick(sortFn, type) {
-      console.log('handleSortClick', type);
       var fn = function fn(a, b) {
         return getSortFnByColumn(column, sortFn, a, b, type);
       };
@@ -6692,7 +6693,10 @@ function use_render_isSlot(s) {
   };
   var renderCheckboxColumn = function renderCheckboxColumn(row, index) {
     var isAll = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
-    var handleChecked = function handleChecked(value) {
+    var handleChecked = function handleChecked(value, event) {
+      event.stopImmediatePropagation();
+      event.preventDefault();
+      event.stopPropagation();
       if (isAll) {
         tableResp.setRowSelectionAll(value);
         context.emit(EMIT_EVENTS.ROW_SELECT_ALL, {
@@ -6726,7 +6730,12 @@ function use_render_isSlot(s) {
           var startIndex = start.index < end.index ? start.index : end.index;
           var endIndex = start.index < end.index ? end.index : start.index;
           ((_tableResp$pageData$s = tableResp.pageData.slice(startIndex, endIndex + 1)) !== null && _tableResp$pageData$s !== void 0 ? _tableResp$pageData$s : []).forEach(function (item) {
-            tableResp.setRowSelection(item, true);
+            var isRowEnabled = isRowSelectEnable(props, {
+              row: row,
+              index: index,
+              isCheckAll: false
+            });
+            isRowEnabled && tableResp.setRowSelection(item, true);
           });
         }
         context.emit(EMIT_EVENTS.ROW_SELECT, {

package/lib/table/props.d.ts

@@ -44,8 +44,8 @@ export declare enum FixedEnum {
 }
 export declare const fixedType: import("vue-types").VueTypeValidableDef<"right" | "left">;
 export type IOverflowTooltipOption = {
-    content: string | Function;
-    disabled?: (col: Column, row: any) => boolean | boolean;
+    content: ((col: Column, row: any) => string) | string;
+    disabled?: ((col: Column, row: any) => boolean) | boolean;
     watchCellResize?: boolean;
     mode?: `${OverflowModeEnum}`;
     popoverOption?: any;
@@ -165,7 +165,7 @@ export type Column = {
     width?: number | string;
     minWidth?: number | string;
     columnKey?: string;
-    showOverflowTooltip?: boolean | IOverflowTooltip;
+    showOverflowTooltip?: IOverflowTooltip;
     type?: string;
     fixed?: string | boolean;
     resizable?: boolean;

package/lib/table/use-attributes.d.ts

@@ -21,7 +21,7 @@ export type ITableFormatData = {
 declare const tableSchemaResponse: (props: TablePropTypes) => {
     formatColumns: (columns: Column[]) => void;
     formatDataSchema: (data: any[]) => void;
-    setRowSelection: (row: any, isSelected: boolean) => void;
+    setRowSelection: (row: any, isSelected: boolean, index?: number) => void;
     setRowExpand: (row: any, isExpand: boolean) => void;
     setRowIndex: (row: any, index: number) => void;
     setColumnAttribute: (col: Column, attrName: string, attrValue: string | number | boolean | ((...args: any[]) => boolean | number | void | string)) => void;

package/lib/table/use-column.d.ts

@@ -17,8 +17,8 @@ declare const _default: (props: TablePropTypes, targetColumns: ITableColumn[]) =
         minWidth?: string | number;
         columnKey?: string;
         showOverflowTooltip?: boolean | {
-            content: string | Function;
-            disabled?: (col: Column, row: any) => boolean;
+            content: string | ((col: Column, row: any) => string);
+            disabled?: boolean | ((col: Column, row: any) => boolean);
             watchCellResize?: boolean;
             mode?: "auto" | "static";
             popoverOption?: any;
@@ -105,8 +105,8 @@ declare const _default: (props: TablePropTypes, targetColumns: ITableColumn[]) =
         minWidth?: string | number;
         columnKey?: string;
         showOverflowTooltip?: boolean | {
-            content: string | Function;
-            disabled?: (col: Column, row: any) => boolean;
+            content: string | ((col: Column, row: any) => string);
+            disabled?: boolean | ((col: Column, row: any) => boolean);
             watchCellResize?: boolean;
             mode?: "auto" | "static";
             popoverOption?: any;
@@ -193,8 +193,8 @@ declare const _default: (props: TablePropTypes, targetColumns: ITableColumn[]) =
         minWidth?: string | number;
         columnKey?: string;
         showOverflowTooltip?: boolean | {
-            content: string | Function;
-            disabled?: (col: Column, row: any) => boolean;
+            content: string | ((col: Column, row: any) => string);
+            disabled?: boolean | ((col: Column, row: any) => boolean);
             watchCellResize?: boolean;
             mode?: "auto" | "static";
             popoverOption?: any;

package/lib/table-column/index.d.ts

@@ -130,8 +130,8 @@ declare const BkTableColumn: {
             className?: import("../table/props").RowClassFunctionString;
             align?: "" | "right" | "left" | "center";
             showOverflowTooltip?: boolean | {
-                content: string | Function;
-                disabled?: (col: import("../../bkui-vue").TableIColumn, row: any) => boolean;
+                content: string | ((col: import("../../bkui-vue").TableIColumn, row: any) => string);
+                disabled?: boolean | ((col: import("../../bkui-vue").TableIColumn, row: any) => boolean);
                 watchCellResize?: boolean;
                 mode?: "auto" | "static";
                 popoverOption?: any;
@@ -420,8 +420,8 @@ declare const BkTableColumn: {
             className?: import("../table/props").RowClassFunctionString;
             align?: "" | "right" | "left" | "center";
             showOverflowTooltip?: boolean | {
-                content: string | Function;
-                disabled?: (col: import("../../bkui-vue").TableIColumn, row: any) => boolean;
+                content: string | ((col: import("../../bkui-vue").TableIColumn, row: any) => string);
+                disabled?: boolean | ((col: import("../../bkui-vue").TableIColumn, row: any) => boolean);
                 watchCellResize?: boolean;
                 mode?: "auto" | "static";
                 popoverOption?: any;
@@ -647,8 +647,8 @@ declare const BkTableColumn: {
         className?: import("../table/props").RowClassFunctionString;
         align?: "" | "right" | "left" | "center";
         showOverflowTooltip?: boolean | {
-            content: string | Function;
-            disabled?: (col: import("../../bkui-vue").TableIColumn, row: any) => boolean;
+            content: string | ((col: import("../../bkui-vue").TableIColumn, row: any) => string);
+            disabled?: boolean | ((col: import("../../bkui-vue").TableIColumn, row: any) => boolean);
             watchCellResize?: boolean;
             mode?: "auto" | "static";
             popoverOption?: any;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bkui-vue",
-  "version": "1.0.3-beta.66.dialog.4",
+  "version": "1.0.3-beta.67.dialog.1",
   "workspaces": {
     "packages": [
       "packages/!(**.bak)*",