bkui-vue 0.0.2-beta.81 → 0.0.2-beta.83

package/lib/search-select/search-select.css

@@ -182,15 +182,13 @@
 }
 .bk-search-select-container .search-container-input {
   position: relative;
-  display: flex;
+  display: block;
   height: 100%;
   min-width: 40px;
   padding: 0 10px;
   margin-top: -4px;
   color: #63656e;
   border: none;
-  flex: 1 1 auto;
-  align-items: center;
 }
 .bk-search-select-container .search-container-input .input-before:before {
   color: #c4c6cc;

package/lib/search-select/search-select.less

@@ -132,15 +132,13 @@
 
       &-input {
         position: relative;
-        display: flex;
+        display: block;
         height: 100%;
         min-width: 40px;
         padding: 0 10px;
         margin-top: -4px;
         color: @search-select-font-color;
         border: none;
-        flex: 1 1 auto;
-        align-items: center;
 
         .input-before {
           &:before {

package/lib/search-select/search-select.variable.css

@@ -304,15 +304,13 @@
 }
 .bk-search-select-container .search-container-input {
   position: relative;
-  display: flex;
+  display: block;
   height: 100%;
   min-width: 40px;
   padding: 0 10px;
   margin-top: -4px;
   color: #63656e;
   border: none;
-  flex: 1 1 auto;
-  align-items: center;
 }
 .bk-search-select-container .search-container-input .input-before:before {
   color: #c4c6cc;

package/lib/table/index.js

@@ -3789,6 +3789,12 @@ function use_attributes_objectSpread(target) { for (var i = 1; i < arguments.len
     resolvedColumns.length = 0;
     resolvedColumns.push.apply(resolvedColumns, _toConsumableArray(resolveColumns));
   };
+  (0,external_vue_namespaceObject.watch)(function () {
+    return [props.columns];
+  }, function () {
+    resolvedColumns.length = 0;
+    resolvedColumns.push.apply(resolvedColumns, _toConsumableArray(props.columns));
+  });
   var getColumns = function getColumns() {
     return resolvedColumns;
   };
@@ -3807,7 +3813,8 @@ function use_attributes_objectSpread(target) { for (var i = 1; i < arguments.len
   return {
     initColumns: initColumns,
     getColumns: getColumns,
-    getActiveColumn: getActiveColumn
+    getActiveColumn: getActiveColumn,
+    columns: resolvedColumns
   };
 });
 ;// CONCATENATED MODULE: ../../packages/table/src/use-common.ts
@@ -5637,6 +5644,7 @@ function use_render_isSlot(s) {
   var _useFixedColumn2 = use_fixed_column(props, tableResp, head),
     resolveFixedColumnStyle = _useFixedColumn2.resolveFixedColumnStyle;
   var getRowRender = function getRowRender(row, rowIndex, preRow, rows, rowSpanMap, needRowSpan) {
+    var isChild = arguments.length > 6 && arguments[6] !== undefined ? arguments[6] : false;
     var rowLength = rows.length;
     var rowStyle = [].concat(_toConsumableArray(formatPropAsArray(props.rowStyle, [row, rowIndex])), [{
       '--row-height': "".concat(getRowHeight(row, rowIndex), "px")
@@ -5667,7 +5675,7 @@ function use_render_isSlot(s) {
             rowspan = _resolveCellSpan.rowspan;
           var _tableResp$getColumnA = tableResp.getColumnAttribute(column, COLUMN_ATTRIBUTE.COL_SPAN),
             skipCol = _tableResp$getColumnA.skipCol;
-          var _ref2 = needRowSpan ? getRowSpanConfig(row, index, preRow, column, rowSpanMap) : {
+          var _ref2 = needRowSpan && !isChild ? getRowSpanConfig(row, index, preRow, column, rowSpanMap) : {
               skipRow: false
             },
             skipRow = _ref2.skipRow;
@@ -5687,7 +5695,7 @@ function use_render_isSlot(s) {
                 column: column,
                 cell: {
                   getValue: function getValue() {
-                    return renderCell(row, column, rowIndex, rows);
+                    return renderCell(row, column, rowIndex, rows, isChild);
                   }
                 },
                 rowIndex: rowIndex,
@@ -5712,7 +5720,7 @@ function use_render_isSlot(s) {
               "row": row,
               "parentSetting": props.showOverflowTooltip,
               "observerResize": props.observerResize
-            }, use_render_isSlot(_slot = renderCell(row, column, rowIndex, rows)) ? _slot : {
+            }, use_render_isSlot(_slot = renderCell(row, column, rowIndex, rows, isChild)) ? _slot : {
               "default": function _default() {
                 return [_slot];
               }
@@ -5732,6 +5740,11 @@ function use_render_isSlot(s) {
       }]);
       var rowId = tableResp.getRowAttribute(row, TABLE_ROW_ATTRIBUTE.ROW_UID);
       var rowKey = "".concat(rowId, "_expand");
+      if (Array.isArray(row.children)) {
+        return row.children.map(function (child, childIndex) {
+          return getRowRender(child, childIndex, {}, row, {}, false, true);
+        });
+      }
       return (0,external_vue_namespaceObject.createVNode)(table_row, {
         "key": rowKey
       }, {
@@ -5782,8 +5795,10 @@ function use_render_isSlot(s) {
     context.emit(EMIT_EVENTS.ROW_MOUSE_LEAVE, e, row, index, rows);
   };
   var getExpandCell = function getExpandCell(row) {
+    var _context$slots$expand3, _context$slots$expand4, _context$slots4;
     var isExpand = tableResp.getRowAttribute(row, TABLE_ROW_ATTRIBUTE.ROW_EXPAND);
-    return isExpand ? (0,external_vue_namespaceObject.createVNode)(external_icon_namespaceObject.DownShape, null, null) : (0,external_vue_namespaceObject.createVNode)(external_icon_namespaceObject.RightShape, null, null);
+    var icon = isExpand ? (0,external_vue_namespaceObject.createVNode)(external_icon_namespaceObject.DownShape, null, null) : (0,external_vue_namespaceObject.createVNode)(external_icon_namespaceObject.RightShape, null, null);
+    return (0,external_vue_namespaceObject.createVNode)("span", null, [[icon, (_context$slots$expand3 = (_context$slots$expand4 = (_context$slots4 = context.slots).expandContent) === null || _context$slots$expand4 === void 0 ? void 0 : _context$slots$expand4.call(_context$slots4, row)) !== null && _context$slots$expand3 !== void 0 ? _context$slots$expand3 : '']]);
   };
   var handleRowExpandClick = function handleRowExpandClick(row, column, index, rows, e) {
     tableResp.setRowExpand(row, !tableResp.getRowAttribute(row, TABLE_ROW_ATTRIBUTE.ROW_EXPAND));
@@ -5848,16 +5863,16 @@ function use_render_isSlot(s) {
   };
   var renderExpandColumn = function renderExpandColumn(row, column, index, rows) {
     var renderExpandSlot = function renderExpandSlot() {
-      var _context$slots$expand3, _context$slots$expand4, _context$slots4;
+      var _context$slots$expand5, _context$slots$expand6, _context$slots5;
       if (typeof column.render === 'function') {
         return renderCellCallbackFn(row, column, index, rows);
       }
-      return (_context$slots$expand3 = (_context$slots$expand4 = (_context$slots4 = context.slots).expandCell) === null || _context$slots$expand4 === void 0 ? void 0 : _context$slots$expand4.call(_context$slots4, {
+      return (_context$slots$expand5 = (_context$slots$expand6 = (_context$slots5 = context.slots).expandCell) === null || _context$slots$expand6 === void 0 ? void 0 : _context$slots$expand6.call(_context$slots5, {
         row: row,
         column: column,
         index: index,
         rows: rows
-      })) !== null && _context$slots$expand3 !== void 0 ? _context$slots$expand3 : getExpandCell(row);
+      })) !== null && _context$slots$expand5 !== void 0 ? _context$slots$expand5 : getExpandCell(row);
     };
     return (0,external_vue_namespaceObject.createVNode)("span", {
       "class": "expand-btn-action",
@@ -5876,6 +5891,7 @@ function use_render_isSlot(s) {
    */
   var renderCell = function renderCell(row, column, index, rows) {
     var _renderFn$column$type, _renderFn$column$type2;
+    var isChild = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : false;
     var defaultFn = function defaultFn() {
       var type = resolvePropVal(column, 'type', [column, row]);
       if (type === 'index') {
@@ -5905,7 +5921,7 @@ function use_render_isSlot(s) {
     };
     var renderFn = {
       expand: function expand(row, column, index, rows) {
-        return renderExpandColumn(row, column, index, rows);
+        return isChild ? '' : renderExpandColumn(row, column, index, rows);
       },
       selection: function selection(row, _column, index, _rows) {
         return renderCheckboxColumn(row, index);
@@ -6010,8 +6026,7 @@ function table_objectSpread(target) { for (var i = 1; i < arguments.length; i++)
     var targetColumns = (0,external_vue_namespaceObject.reactive)([]);
     var _useColumn = use_column(props, targetColumns),
       initColumns = _useColumn.initColumns,
-      getColumns = _useColumn.getColumns;
-    var columns = getColumns();
+      columns = _useColumn.columns;
     var tableSchema = use_attributes(props);
     var _useColumnResize = use_column_resize(tableSchema, false, head),
       resizeColumnStyle = _useColumnResize.resizeColumnStyle,

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

@@ -182,5 +182,92 @@ declare const _default: (props: TablePropTypes, targetColumns: ITableColumn[]) =
             head: import("./props").LabelFunctionString;
         };
     };
+    columns: {
+        label: import("./props").LabelFunctionString;
+        field?: import("./props").LabelFunctionString;
+        render?: import("./props").RenderFunctionString;
+        renderHead?: import("./props").RenderFunctionString;
+        width?: string | number;
+        minWidth?: string | number;
+        columnKey?: string;
+        showOverflowTooltip?: boolean | {
+            content: string | Function;
+            disabled?: (col: Column, row: any) => boolean;
+            watchCellResize?: boolean;
+            mode?: "auto" | "static";
+            popoverOption?: any;
+            resizerWay?: import("./props").ResizerWay;
+        };
+        type?: string;
+        fixed?: string | boolean;
+        resizable?: boolean;
+        sort?: string | boolean | {
+            sortFn?: Function;
+            sortScope?: import("./props").SortScope;
+            value?: SORT_OPTION;
+        };
+        filter?: string | boolean | {
+            list: any[];
+            filterFn?: Function;
+            match?: import("./props").FullEnum;
+            checked?: any[];
+            filterScope?: import("./props").SortScope;
+            btnSave?: string | boolean;
+            btnReset?: string | boolean;
+            height?: number;
+            maxHeight?: number;
+        };
+        colspan?: (({ column, colIndex, row, rowIndex }: {
+            column: any;
+            colIndex: any;
+            row: any;
+            rowIndex: any;
+        }) => number) | {
+            toString: (radix?: number) => string;
+            toFixed: (fractionDigits?: number) => string;
+            toExponential: (fractionDigits?: number) => string;
+            toPrecision: (precision?: number) => string;
+            valueOf: () => number;
+            toLocaleString: {
+                (locales?: string | string[], options?: Intl.NumberFormatOptions): string;
+                (locales?: Intl.LocalesArgument, options?: Intl.NumberFormatOptions): string;
+            };
+        };
+        rowspan?: (({ column, colIndex, row, rowIndex }: {
+            column: any;
+            colIndex: any;
+            row: any;
+            rowIndex: any;
+        }) => number) | {
+            toString: (radix?: number) => string;
+            toFixed: (fractionDigits?: number) => string;
+            toExponential: (fractionDigits?: number) => string;
+            toPrecision: (precision?: number) => string;
+            valueOf: () => number;
+            toLocaleString: {
+                (locales?: string | string[], options?: Intl.NumberFormatOptions): string;
+                (locales?: Intl.LocalesArgument, options?: Intl.NumberFormatOptions): string;
+            };
+        };
+        textAlign?: string;
+        className?: import("./props").RowClassFunctionString;
+        align?: string;
+        prop?: import("./props").LabelFunctionString;
+        index?: {
+            toString: (radix?: number) => string;
+            toFixed: (fractionDigits?: number) => string;
+            toExponential: (fractionDigits?: number) => string;
+            toPrecision: (precision?: number) => string;
+            valueOf: () => number;
+            toLocaleString: {
+                (locales?: string | string[], options?: Intl.NumberFormatOptions): string;
+                (locales?: Intl.LocalesArgument, options?: Intl.NumberFormatOptions): string;
+            };
+        };
+        explain?: boolean | {
+            content: import("./props").LabelFunctionString;
+            head: import("./props").LabelFunctionString;
+        };
+    }[];
 };
 export default _default;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bkui-vue",
-  "version": "0.0.2-beta.81",
+  "version": "0.0.2-beta.83",
   "workspaces": {
     "packages": [
       "packages/!(**.bak)*",