bkui-vue 2.0.1-beta.30 → 2.0.1-beta.32

package/lib/table/hooks/use-settings.d.ts

@@ -1,10 +1,116 @@
 import { SetupContext } from 'vue';
-import { TablePropTypes } from '../props';
+import { Column, TablePropTypes } from '../props';
 import { UseColumns } from './use-columns';
 declare const useSettings: (props: TablePropTypes, ctx: SetupContext, columns: UseColumns, afterSetting: any) => {
     options: {
         enabled: boolean;
-        fields: any[];
+        fields: {
+            label?: import("../props").LabelFunctionString;
+            field: import("../props").LabelFunctionString & (string | number | true | ((_column: any, _index: any) => string | number | boolean | JSX.Element));
+            render?: import("../props").RenderFunctionString;
+            disabled?: boolean;
+            renderHead?: import("../props").RenderFunctionString;
+            width?: string | number;
+            minWidth?: string | number;
+            columnKey?: string;
+            showOverflowTooltip?: boolean | {
+                content: string | ((col: Column, row: Record<string, object>) => string);
+                disabled?: boolean | ((col: Column, row: Record<string, object>) => boolean);
+                allowHtml?: boolean;
+                watchCellResize?: boolean;
+                mode?: "auto" | "static";
+                popoverOption?: Record<string, object>;
+                resizerWay?: import("../props").ResizerWay;
+                showHead?: boolean;
+            };
+            type?: string;
+            fixed?: string | boolean;
+            resizable?: boolean;
+            sort?: string | boolean | {
+                sortFn?: (...args: any[]) => boolean;
+                sortScope?: import("../props").SortScope;
+                value?: import("../const").SORT_OPTION;
+            };
+            filter?: string | boolean | {
+                list: {
+                    label: string;
+                    value: string;
+                }[];
+                filterFn?: (...args: any[]) => boolean;
+                match?: import("../props").FullEnum;
+                checked?: string[];
+                filterScope?: import("../props").SortScope;
+                btnSave?: string | boolean;
+                btnReset?: string | boolean;
+                height?: number;
+                maxHeight?: number;
+            };
+            colspan?: import("../props").SpanFunctionString;
+            rowspan?: import("../props").SpanFunctionString;
+            textAlign?: string;
+            className?: import("../props").RowClassFunctionString;
+            align?: string;
+            prop?: import("../props").LabelFunctionString;
+            index?: number;
+            explain?: boolean | {
+                content: import("../props").LabelFunctionString;
+                head: import("../props").LabelFunctionString;
+            };
+            children?: {
+                label?: import("../props").LabelFunctionString;
+                field?: import("../props").LabelFunctionString;
+                render?: import("../props").RenderFunctionString;
+                disabled?: boolean;
+                renderHead?: import("../props").RenderFunctionString;
+                width?: string | number;
+                minWidth?: string | number;
+                columnKey?: string;
+                showOverflowTooltip?: boolean | {
+                    content: string | ((col: Column, row: Record<string, object>) => string);
+                    disabled?: boolean | ((col: Column, row: Record<string, object>) => boolean);
+                    allowHtml?: boolean;
+                    watchCellResize?: boolean;
+                    mode?: "auto" | "static";
+                    popoverOption?: Record<string, object>;
+                    resizerWay?: import("../props").ResizerWay;
+                    showHead?: boolean;
+                };
+                type?: string;
+                fixed?: string | boolean;
+                resizable?: boolean;
+                sort?: string | boolean | {
+                    sortFn?: (...args: any[]) => boolean;
+                    sortScope?: import("../props").SortScope;
+                    value?: import("../const").SORT_OPTION;
+                };
+                filter?: string | boolean | {
+                    list: {
+                        label: string;
+                        value: string;
+                    }[];
+                    filterFn?: (...args: any[]) => boolean;
+                    match?: import("../props").FullEnum;
+                    checked?: string[];
+                    filterScope?: import("../props").SortScope;
+                    btnSave?: string | boolean;
+                    btnReset?: string | boolean;
+                    height?: number;
+                    maxHeight?: number;
+                };
+                colspan?: import("../props").SpanFunctionString;
+                rowspan?: import("../props").SpanFunctionString;
+                textAlign?: string;
+                className?: import("../props").RowClassFunctionString;
+                align?: string;
+                prop?: import("../props").LabelFunctionString;
+                index?: number;
+                explain?: boolean | {
+                    content: import("../props").LabelFunctionString;
+                    head: import("../props").LabelFunctionString;
+                };
+                children?: any[];
+            }[];
+        }[];
         checked: any[];
         limit: number;
         size: string;

package/lib/table/index.js

@@ -20173,13 +20173,14 @@ var useColumns = function useColumns(props) {
   var resolveDraggableColumn = function resolveDraggableColumn() {
     if (props.rowDraggable) {
       var _props$rowDraggable$w, _props$rowDraggable, _props$rowDraggable$l, _props$rowDraggable2;
-      tableColumnList.unshift({
+      return {
         minWidth: 50,
         width: (_props$rowDraggable$w = (_props$rowDraggable = props.rowDraggable) === null || _props$rowDraggable === void 0 ? void 0 : _props$rowDraggable.width) !== null && _props$rowDraggable$w !== void 0 ? _props$rowDraggable$w : 60,
         label: (_props$rowDraggable$l = (_props$rowDraggable2 = props.rowDraggable) === null || _props$rowDraggable2 === void 0 ? void 0 : _props$rowDraggable2.label) !== null && _props$rowDraggable$l !== void 0 ? _props$rowDraggable$l : t.value.sort,
         type: 'drag'
-      });
+      };
     }
+    return null;
   };
   /**
    * 判定是否需要合并行或者列配置
@@ -20278,6 +20279,10 @@ var useColumns = function useColumns(props) {
     columnGroup.length = 0;
     var maxDepth = 0;
     var targetColumns = [];
+    var dragColumn = resolveDraggableColumn();
+    if (dragColumn) {
+      cols.unshift(dragColumn);
+    }
     var getMaxDepth = function getMaxDepth(root) {
       var depth = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 1;
       if (root.length && maxDepth < depth) {
@@ -20351,7 +20356,7 @@ var useColumns = function useColumns(props) {
    */
   var formatColumns = function formatColumns() {
     sortColumns.length = 0;
-    resolveDraggableColumn();
+    // resolveDraggableColumn();
     var skipColNum = 0;
     (tableColumnList || []).forEach(function (col, index) {
       var _ref = needColSpan.value ? getColumnSpanConfig(col, index, skipColNum) : {
@@ -22056,7 +22061,7 @@ const icon_namespaceObject = icon_x({ ["DownShape"]: () => __WEBPACK_EXTERNAL_MO
     var defaultFn = function defaultFn() {
       var type = resolvePropVal(column, 'type', [column, row]);
       if (type === 'index') {
-        return rows.getRowAttribute(row, TABLE_ROW_ATTRIBUTE.ROW_INDEX);
+        return rows.getRowAttribute((0,external_vue_namespaceObject.toRaw)(row), TABLE_ROW_ATTRIBUTE.ROW_INDEX);
       }
       var key = resolvePropVal(column, 'field', [column, row]);
       var cell = getRowText(row, key);
@@ -23064,6 +23069,9 @@ function use_render_isSlot(s) {
       "style": rowStyle
     }, [columns.columnGroup.map(function (cols, rowIndex) {
       return (0,external_vue_namespaceObject.createVNode)("tr", null, [cols.map(function (column, index) {
+        if (columns.isHiddenColumn(column)) {
+          return null;
+        }
         var _useHead = use_head({
             props: props,
             ctx: ctx,

package/lib/table/props.d.ts

@@ -174,6 +174,7 @@ export type Column = {
     label?: LabelFunctionString;
     field?: LabelFunctionString;
     render?: RenderFunctionString;
+    disabled?: boolean;
     renderHead?: RenderFunctionString;
     width?: number | string;
     minWidth?: number | string;

package/lib/tag/index.js

@@ -150,7 +150,6 @@ var TagStrokeType;
     size: shared_namespaceObject.PropTypes.size()
   },
   emits: ['change', 'close'],
-  // slots: ['icon'],
   slots: Object,
   setup: function setup(props, _ref) {
     var emit = _ref.emit;

package/lib/tag/tag.css

@@ -232,7 +232,7 @@
   background: var(--primary-color);
   opacity: 1;
 }
-.bk-tag--defaul {
+.bk-tag--default {
   padding: 0 8px;
 }
 .bk-tag--small {

package/lib/tag/tag.less

@@ -117,7 +117,7 @@
   }
 }
 
-.@{bk-prefix}-tag--defaul {
+.@{bk-prefix}-tag--default {
   padding: 0 8px;
 }
 

package/lib/tag/tag.variable.css

@@ -492,7 +492,7 @@
   background: var(--primary-color);
   opacity: 1;
 }
-.bk-tag--defaul {
+.bk-tag--default {
   padding: 0 8px;
 }
 .bk-tag--small {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bkui-vue",
-  "version": "2.0.1-beta.30",
+  "version": "2.0.1-beta.32",
   "workspaces": [
     "packages/**",
     "scripts/cli",