bkui-vue 1.0.3-beta.1 → 1.0.3-beta.2

package/lib/table/index.js

@@ -1663,10 +1663,11 @@ var resolvePaginationOption = function resolvePaginationOption(propPagination, d
    * pagination 为Prop传入配置
    * 方便兼容内置分页功能，此处需要单独处理count
    */
-  var localPagination = (0,external_vue_namespaceObject.ref)(null);
-  var indexData = (0,external_vue_namespaceObject.computed)(function () {
+  var propsData = (0,external_vue_namespaceObject.computed)(function () {
     return props.data;
   });
+  var localPagination = (0,external_vue_namespaceObject.ref)(null);
+  var indexData = (0,external_vue_namespaceObject.reactive)([]);
   // 当前分页缓存，用于支持内置前端分页，用户无需接收change事件来自行处理数据分割
   var pagination = (0,external_vue_namespaceObject.reactive)({
     count: 0,
@@ -1680,7 +1681,7 @@ var resolvePaginationOption = function resolvePaginationOption(propPagination, d
       return;
     }
     localPagination.value = props.remotePagination ? pagination : use_pagination_objectSpread(use_pagination_objectSpread({}, pagination), {}, {
-      count: indexData.value.length
+      count: indexData.length
     });
   };
   /**
@@ -1691,7 +1692,7 @@ var resolvePaginationOption = function resolvePaginationOption(propPagination, d
   var resetStartEndIndex = function resetStartEndIndex() {
     if (!props.pagination || props.remotePagination) {
       startIndex.value = 0;
-      endIndex.value = indexData.value.length;
+      endIndex.value = indexData.length;
       return;
     }
     // 如果是前端分页
@@ -1722,15 +1723,25 @@ var resolvePaginationOption = function resolvePaginationOption(propPagination, d
   var filter = function filter(sourceData, filterFn) {
     if (typeof filterFn === 'function') {
       var filterVals = sourceData.filter(function (row, index) {
-        return filterFn(row, index, indexData.value);
+        return filterFn(row, index, indexData);
       });
       sourceData.length = 0;
       sourceData.push.apply(sourceData, _toConsumableArray(filterVals));
     }
     return sourceData;
   };
+  var resolveIndexData = function resolveIndexData() {
+    return new Promise(function (resolve) {
+      (0,external_vue_namespaceObject.nextTick)(function () {
+        var target = propsData.value.slice();
+        indexData.length = 0;
+        indexData.push.apply(indexData, _toConsumableArray(target));
+        resolve();
+      });
+    });
+  };
   var resolvePageData = function resolvePageData(filterFn, sortFn, column, type, sortScope, multiCol) {
-    var sourceData = indexData.value.slice();
+    var sourceData = indexData.slice();
     if (multiCol !== null && multiCol !== void 0 && multiCol.length) {
       multiSort(sourceData, multiCol);
     }
@@ -1744,7 +1755,7 @@ var resolvePaginationOption = function resolvePaginationOption(propPagination, d
     resolvePageData(null, null, null, null, null, multiCol);
   };
   var multiFilter = function multiFilter(filterFnList) {
-    var sourceData = indexData.value.slice();
+    var sourceData = indexData.slice();
     var target = filterFnList.reduce(function (result, fn) {
       return filter(result, fn);
     }, sourceData);
@@ -1770,6 +1781,7 @@ var resolvePaginationOption = function resolvePaginationOption(propPagination, d
     indexData: indexData,
     localPagination: localPagination,
     resolvePageData: resolvePageData,
+    resolveIndexData: resolveIndexData,
     resolvePageDataBySortList: resolvePageDataBySortList,
     resetStartEndIndex: resetStartEndIndex,
     multiFilter: multiFilter,
@@ -3250,12 +3262,14 @@ function use_attributes_objectSpread(e) { for (var r = 1; r < arguments.length;
   });
   var _usePagination = use_pagination(props),
     pageData = _usePagination.pageData,
+    indexData = _usePagination.indexData,
     localPagination = _usePagination.localPagination,
     resolvePageData = _usePagination.resolvePageData,
     resolvePageDataBySortList = _usePagination.resolvePageDataBySortList,
     multiFilter = _usePagination.multiFilter,
     sort = _usePagination.sort,
-    resetStartEndIndex = _usePagination.resetStartEndIndex;
+    resetStartEndIndex = _usePagination.resetStartEndIndex,
+    resolveIndexData = _usePagination.resolveIndexData;
   var updateSettings = function updateSettings(settings, rowHeight) {
     if (settings) {
       var _ref2, _ref3;
@@ -3391,6 +3405,13 @@ function use_attributes_objectSpread(e) { for (var r = 1; r < arguments.length;
     var type = getColumnAttribute(column, COLUMN_ATTRIBUTE.COL_SORT_TYPE);
     var scope = getColumnAttribute(column, COLUMN_ATTRIBUTE.COL_SORT_SCOPE);
     if (type === SORT_OPTION.NULL) {
+      resolveIndexData().then(function () {
+        resolvePageData();
+      });
+      return;
+    }
+    if (scope === 'all') {
+      sort(indexData, fn, column, type, scope);
       resolvePageData();
       return;
     }
@@ -3828,6 +3849,9 @@ function use_attributes_objectSpread(e) { for (var r = 1; r < arguments.length;
     var resolvedIndex = sourceIndex < targetIndex ? sourceIndex : sourceIndex + 1;
     pageData.splice(resolvedIndex, 1);
   };
+  var setIndexData = function setIndexData() {
+    return resolveIndexData();
+  };
   return {
     formatColumns: formatColumns,
     formatDataSchema: formatDataSchema,
@@ -3864,7 +3888,8 @@ function use_attributes_objectSpread(e) { for (var r = 1; r < arguments.length;
     changePageRowIndex: changePageRowIndex,
     pageData: pageData,
     localPagination: localPagination,
-    formatData: formatData
+    formatData: formatData,
+    setIndexData: setIndexData
   };
 });
 ;// CONCATENATED MODULE: ../../packages/table/src/use-column.ts
@@ -6513,27 +6538,30 @@ function table_objectSpread(e) { for (var r = 1; r < arguments.length; r++) { va
       }
     };
     var isFirstLoad = (0,external_vue_namespaceObject.ref)(true);
+    // const tableWidth = ref(null);
     (0,external_vue_namespaceObject.watch)(function () {
       return [props.data, columns];
     }, function () {
-      tableSchema.formatColumns(columns);
-      tableSchema.formatDataSchema(props.data);
-      tableSchema.resetStartEndIndex();
-      if (isFirstLoad.value) {
-        tableSchema.resolveByDefColumns();
-        isFirstLoad.value = false;
-      } else {
-        tableSchema.resolvePageData();
-      }
-      registerResizeEvent();
-      (0,external_vue_namespaceObject.nextTick)(function () {
-        updateOffsetRight();
-        resolveFixedColumns(tableOffsetRight.value);
-        /**
-         * 确保在所有数据渲染完毕再执行fix column计算
-         */
+      tableSchema.setIndexData().then(function () {
+        tableSchema.formatColumns(columns);
+        tableSchema.formatDataSchema(props.data);
+        tableSchema.resetStartEndIndex();
+        if (isFirstLoad.value) {
+          tableSchema.resolveByDefColumns();
+          isFirstLoad.value = false;
+        } else {
+          tableSchema.resolvePageData();
+        }
+        registerResizeEvent();
         (0,external_vue_namespaceObject.nextTick)(function () {
-          resetTableHeight(root.value);
+          updateOffsetRight();
+          resolveFixedColumns(tableOffsetRight.value);
+          /**
+           * 确保在所有数据渲染完毕再执行fix column计算
+           */
+          (0,external_vue_namespaceObject.nextTick)(function () {
+            resetTableHeight(root.value);
+          });
         });
       });
     }, {

package/lib/table/plugins/use-pagination.d.ts

@@ -9,9 +9,10 @@ import { Column, SortScope, TablePropTypes } from '../props';
 export declare const resolvePaginationOption: (propPagination: any, defVal: any) => any;
 declare const _default: (props: TablePropTypes) => {
     pageData: any[];
-    indexData: import("vue").ComputedRef<any[]>;
+    indexData: any[];
     localPagination: import("vue").Ref<any>;
     resolvePageData: (filterFn?: any, sortFn?: any, column?: Column, type?: string, sortScope?: any, multiCol?: any) => void;
+    resolveIndexData: () => Promise<void>;
     resolvePageDataBySortList: (multiCol?: any) => void;
     resetStartEndIndex: () => void;
     multiFilter: (filterFnList: ((row: any, index: any, data: any) => void)[]) => void;

package/lib/table/table.css

@@ -997,6 +997,7 @@
   position: relative;
   height: auto;
   overflow: hidden;
+  width: 100%;
 }
 .bk-table-flex {
   display: flex;

package/lib/table/table.less

@@ -14,6 +14,7 @@
   position: relative;
   height: auto;
   overflow: hidden;
+  width: 100%;
 
   &-flex {
     display: flex;

package/lib/table/table.variable.css

@@ -1123,6 +1123,7 @@
   position: relative;
   height: auto;
   overflow: hidden;
+  width: 100%;
 }
 .bk-table-flex {
   display: flex;

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

@@ -19,6 +19,7 @@ export type ITableFormatData = {
     };
 };
 export type ITableResponse = {
+    setIndexData: () => Promise<void>;
     formatColumns: (columns: Column[]) => void;
     formatDataSchema: (data: any[]) => void;
     setRowSelection: (row: any, isSelected: boolean) => void;
@@ -56,5 +57,43 @@ export type ITableResponse = {
     localPagination: any;
     formatData: ITableFormatData;
 };
-declare const _default: (props: TablePropTypes) => ITableResponse;
+declare const _default: (props: TablePropTypes) => {
+    formatColumns: (columns: Column[]) => void;
+    formatDataSchema: (data: any[]) => void;
+    setRowSelection: (row: any, isSelected: boolean) => 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;
+    setColumnAttributeBySettings: (settings: Settings, checkedVal?: string[]) => void;
+    setColumnSortActive: (column: Column, active: boolean) => void;
+    setRowSelectionAll: (val: boolean) => void;
+    setRowIndeterminate: () => void;
+    setAllColumnAttribute: (attributeName: string | string[], value: string | number | boolean | ((...args: any[]) => boolean | number | void | string)) => void;
+    getColumnAttribute: (col: Column | IEmptyObject, attributeName: string) => any;
+    getColumnId: (col: Column) => any;
+    getColumnOrderWidth: (col: Column, orders?: string[]) => number;
+    getRowSelection: () => any[];
+    resolveColumnWidth: (root: HTMLElement, autoWidth?: number, offsetWidth?: number) => void;
+    isActiveColumn: (col: Column) => any;
+    isHiddenColumn: (col: Column) => any;
+    resolvePageData: (filterFn?: any, sortFn?: any, column?: Column, type?: string, sortScope?: any, multiCol?: any) => void;
+    resolveByDefColumns: () => void;
+    resetStartEndIndex: () => void;
+    toggleAllSelection: (value?: boolean) => void;
+    setAllRowExpand: (value?: boolean) => void;
+    clearSelection: () => void;
+    clearColumnSort: (reset?: boolean) => void;
+    toggleRowSelection: (row: any) => void;
+    getRowAttribute: (row: any | IEmptyObject, attrName: string) => any;
+    filter: () => void;
+    sortData: (column: Column) => void;
+    isCheckedAll: () => boolean;
+    hasCheckedRow: () => boolean;
+    updateSettings: (settings?: Settings, rowHeight?: number) => void;
+    changePageRowIndex: (sourceIndex: any, targetIndex: any) => void;
+    pageData: any[];
+    localPagination: import("vue").Ref<any>;
+    formatData: ITableFormatData;
+    setIndexData: () => Promise<void>;
+};
 export default _default;

package/package.json

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