bkui-vue 0.0.3-beta.2-3 → 0.0.3-beta.2-5

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

@@ -172,6 +172,7 @@ declare const _default: import("vue").DefineComponent<{
             mode?: "auto" | "static";
             popoverOption?: any;
             resizerWay?: import("../props").ResizerWay;
+            showHead?: boolean;
         };
         field: import("../props").LabelFunctionString;
         prop?: import("../props").LabelFunctionString;

package/lib/table/index.d.ts

@@ -42,6 +42,9 @@ declare const BkTable: {
         } & {
             default: boolean;
         };
+        sortValFormat: import("vue-types").VueTypeDef<any[]> & {
+            default: () => any[];
+        };
         thead: import("vue-types").VueTypeDef<import("./props").Thead> & {
             default: () => import("./props").Thead;
         };
@@ -363,6 +366,9 @@ declare const BkTable: {
         } & {
             default: boolean;
         };
+        sortValFormat: import("vue-types").VueTypeDef<any[]> & {
+            default: () => any[];
+        };
         thead: import("vue-types").VueTypeDef<import("./props").Thead> & {
             default: () => import("./props").Thead;
         };
@@ -586,6 +592,7 @@ declare const BkTable: {
         stripe: boolean;
         rowHeight: import("./props").RowHeightFunctionNumber;
         showHead: boolean;
+        sortValFormat: any[];
         virtualEnabled: boolean;
         paginationHeight: number;
         remotePagination: boolean;
@@ -650,6 +657,9 @@ declare const BkTable: {
         } & {
             default: boolean;
         };
+        sortValFormat: import("vue-types").VueTypeDef<any[]> & {
+            default: () => any[];
+        };
         thead: import("vue-types").VueTypeDef<import("./props").Thead> & {
             default: () => import("./props").Thead;
         };
@@ -873,6 +883,7 @@ declare const BkTable: {
         stripe: boolean;
         rowHeight: import("./props").RowHeightFunctionNumber;
         showHead: boolean;
+        sortValFormat: any[];
         virtualEnabled: boolean;
         paginationHeight: number;
         remotePagination: boolean;
@@ -934,6 +945,9 @@ declare const BkTable: {
     } & {
         default: boolean;
     };
+    sortValFormat: import("vue-types").VueTypeDef<any[]> & {
+        default: () => any[];
+    };
     thead: import("vue-types").VueTypeDef<import("./props").Thead> & {
         default: () => import("./props").Thead;
     };
@@ -1240,6 +1254,7 @@ declare const BkTable: {
     stripe: boolean;
     rowHeight: import("./props").RowHeightFunctionNumber;
     showHead: boolean;
+    sortValFormat: any[];
     virtualEnabled: boolean;
     paginationHeight: number;
     remotePagination: boolean;
@@ -1381,6 +1396,7 @@ declare const BkTable: {
                 mode?: "auto" | "static";
                 popoverOption?: any;
                 resizerWay?: import("./props").ResizerWay;
+                showHead?: boolean;
             };
             field: import("./props").LabelFunctionString;
             prop?: import("./props").LabelFunctionString;

package/lib/table/index.js

@@ -443,6 +443,13 @@ var tableProps = {
    * 是否显示Head
    */
   showHead: external_shared_namespaceObject.PropTypes.bool.def(true),
+  /**
+   * 排序时对需要排序的字符串数值进行格式化
+   * 这里需要配置为正则或者回调函数，(str) => string | number | boolean
+   * 如果配置为正则，程序会提取匹配到的第一个结果尝试转换为数值
+   * 如果为多个，程序会顺序执行所有正则表达式，直到转换成功
+   */
+  sortValFormat: external_shared_namespaceObject.PropTypes.arrayOf(external_shared_namespaceObject.PropTypes.any).def(['']),
   /**
    * table header config
    */
@@ -2934,11 +2941,31 @@ var resolveHeadConfig = function resolveHeadConfig(props) {
  * @param index 当前行Index
  * @returns
  */
-var getRowText = function getRowText(row, key) {
+var getRowText = function getRowText(row, key, format) {
+  var result;
   if (typeof row === 'string' || typeof row === 'number' || typeof row === 'boolean') {
-    return row;
+    result = row;
   }
-  return (0,get_namespaceObject["default"])(row, key);
+  var getRegExp = function getRegExp(val) {
+    var flags = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 'ig';
+    return new RegExp("".concat(val).replace(/[-[\]{}()*+?.,\\^$|#\s]/g, '\\$&'), flags);
+  };
+  result = (0,get_namespaceObject["default"])(row, key);
+  if (format !== null && format !== void 0 && format.length) {
+    format.forEach(function (reg) {
+      if (typeof reg === 'function') {
+        result = reg(result, row, key);
+      } else if (typeof result === 'string') {
+        var _matches$;
+        var matches = result.match(typeof reg === 'string' ? getRegExp(reg) : reg);
+        result = (_matches$ = matches === null || matches === void 0 ? void 0 : matches[1]) !== null && _matches$ !== void 0 ? _matches$ : result;
+      }
+    });
+    if (/^-?\d+.?\d*$/.test(result)) {
+      result = Number(result);
+    }
+  }
+  return result;
 };
 /**
  * 获取当前行指定列的值
@@ -3087,9 +3114,10 @@ var skipThisColumn = function skipThisColumn(columns, colIndex, row, rowIndex) {
 };
 var getSortFn = function getSortFn(column, sortType) {
   var _column$sort, _column$sort2;
+  var format = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : [];
   var fieldName = column.field;
   var getVal = function getVal(row) {
-    return getRowText(row, fieldName);
+    return getRowText(row, fieldName, format);
   };
   var sortFn0 = function sortFn0(a, b) {
     var _getVal, _getVal2;
@@ -3115,6 +3143,7 @@ var getNextSortType = function getNextSortType(sortType) {
   return Object.keys(steps)[(steps[sortType] + 1) % 3];
 };
 var resolveSort = function resolveSort(sort, column) {
+  var format = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : [];
   if (typeof sort === 'string') {
     return {
       value: sort
@@ -3133,7 +3162,7 @@ var resolveSort = function resolveSort(sort, column) {
       }, sort);
     }
     return Object.assign({}, {
-      sortFn: getSortFn(column, (_sort$value = sort.value) !== null && _sort$value !== void 0 ? _sort$value : SORT_OPTION.NULL)
+      sortFn: getSortFn(column, (_sort$value = sort.value) !== null && _sort$value !== void 0 ? _sort$value : SORT_OPTION.NULL, format)
     }, sort);
   }
   return null;
@@ -5432,7 +5461,8 @@ function _slicedToArray(arr, i) {
   props: {
     column: IColumnType,
     defaultSort: external_shared_namespaceObject.PropTypes.oneOf(SORT_OPTIONS).def(SORT_OPTION.NULL),
-    active: external_shared_namespaceObject.PropTypes.bool
+    active: external_shared_namespaceObject.PropTypes.bool,
+    sortValFormat: external_shared_namespaceObject.PropTypes.arrayOf(external_shared_namespaceObject.PropTypes.any).def([''])
   },
   emits: ['change'],
   setup: function setup(props, _ref) {
@@ -5470,8 +5500,8 @@ function _slicedToArray(arr, i) {
       if (sortType.value === type) {
         currentSort = SORT_OPTION.NULL;
       }
-      var execFn = getSortFn(props.column, currentSort);
-      var sort = resolveSort(props.column.sort, props.column);
+      var execFn = getSortFn(props.column, currentSort, props.sortValFormat);
+      var sort = resolveSort(props.column.sort, props.column, props.sortValFormat);
       if ((sort === null || sort === void 0 ? void 0 : sort.value) === 'custom') {
         var _sort$sortFn;
         emit('change', (_sort$sortFn = sort === null || sort === void 0 ? void 0 : sort.sortFn) !== null && _sort$sortFn !== void 0 ? _sort$sortFn : execFn, currentSort);
@@ -5581,7 +5611,7 @@ function use_head_cell_isSlot(s) {
       var type = tableResp.getColumnAttribute(column, COLUMN_ATTRIBUTE.COL_SORT_TYPE);
       nextSort.value = getNextSortType(type);
       var sortFn = function sortFn(a, b) {
-        return getSortFnByColumn(column, getSortFn(column, nextSort.value), a, b);
+        return getSortFnByColumn(column, getSortFn(column, nextSort.value, props.sortValFormat), a, b);
       };
       tableResp.setColumnAttribute(column, COLUMN_ATTRIBUTE.COL_SORT_TYPE, nextSort.value);
       tableResp.setColumnAttribute(column, COLUMN_ATTRIBUTE.COL_SORT_FN, sortFn);

package/lib/table/plugins/head-sort.d.ts

@@ -8,6 +8,9 @@ declare const _default: import("vue").DefineComponent<{
     active: import("vue-types").VueTypeValidableDef<boolean> & {
         default: boolean;
     };
+    sortValFormat: import("vue-types").VueTypeDef<any[]> & {
+        default: () => any[];
+    };
 }, () => JSX.Element, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, "change"[], "change", import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
     column: import("vue-types").VueTypeDef<Column>;
     defaultSort: import("vue-types").VueTypeDef<SORT_OPTION> & {
@@ -16,10 +19,14 @@ declare const _default: import("vue").DefineComponent<{
     active: import("vue-types").VueTypeValidableDef<boolean> & {
         default: boolean;
     };
+    sortValFormat: import("vue-types").VueTypeDef<any[]> & {
+        default: () => any[];
+    };
 }>> & {
     onChange?: (...args: any[]) => any;
 }, {
     active: boolean;
+    sortValFormat: any[];
     defaultSort: SORT_OPTION;
 }, {}>;
 export default _default;

package/lib/table/props.d.ts

@@ -50,6 +50,7 @@ export type IOverflowTooltipProp = {
     mode?: `${OverflowModeEnum}`;
     popoverOption?: any;
     resizerWay?: ResizerWay;
+    showHead?: boolean;
 } | boolean;
 export type IOverflowTooltip = IOverflowTooltipProp;
 export declare const IOverflowTooltipPropType: import("vue-types").VueTypeDef<IOverflowTooltipProp>;
@@ -303,6 +304,15 @@ export declare const tableProps: {
     } & {
         default: boolean;
     };
+    /**
+     * 排序时对需要排序的字符串数值进行格式化
+     * 这里需要配置为正则或者回调函数，(str) => string | number | boolean
+     * 如果配置为正则，程序会提取匹配到的第一个结果尝试转换为数值
+     * 如果为多个，程序会顺序执行所有正则表达式，直到转换成功
+     */
+    sortValFormat: import("vue-types").VueTypeDef<any[]> & {
+        default: () => any[];
+    };
     /**
      * table header config
      */

package/lib/table/table.d.ts

@@ -37,6 +37,9 @@ declare const _default: import("vue").DefineComponent<{
     } & {
         default: boolean;
     };
+    sortValFormat: import("vue-types").VueTypeDef<any[]> & {
+        default: () => any[];
+    };
     thead: import("vue-types").VueTypeDef<import("./props").Thead> & {
         default: () => import("./props").Thead;
     };
@@ -275,6 +278,9 @@ declare const _default: import("vue").DefineComponent<{
     } & {
         default: boolean;
     };
+    sortValFormat: import("vue-types").VueTypeDef<any[]> & {
+        default: () => any[];
+    };
     thead: import("vue-types").VueTypeDef<import("./props").Thead> & {
         default: () => import("./props").Thead;
     };
@@ -498,6 +504,7 @@ declare const _default: import("vue").DefineComponent<{
     stripe: boolean;
     rowHeight: import("./props").RowHeightFunctionNumber;
     showHead: boolean;
+    sortValFormat: any[];
     virtualEnabled: boolean;
     paginationHeight: number;
     remotePagination: boolean;

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

@@ -23,6 +23,7 @@ declare const _default: (props: TablePropTypes, targetColumns: ITableColumn[]) =
             mode?: "auto" | "static";
             popoverOption?: any;
             resizerWay?: import("./props").ResizerWay;
+            showHead?: boolean;
         };
         type?: string;
         fixed?: string | boolean;
@@ -110,6 +111,7 @@ declare const _default: (props: TablePropTypes, targetColumns: ITableColumn[]) =
             mode?: "auto" | "static";
             popoverOption?: any;
             resizerWay?: import("./props").ResizerWay;
+            showHead?: boolean;
         };
         type?: string;
         fixed?: string | boolean;
@@ -197,6 +199,7 @@ declare const _default: (props: TablePropTypes, targetColumns: ITableColumn[]) =
             mode?: "auto" | "static";
             popoverOption?: any;
             resizerWay?: import("./props").ResizerWay;
+            showHead?: boolean;
         };
         type?: string;
         fixed?: string | boolean;

package/lib/table/utils.d.ts

@@ -80,7 +80,7 @@ export declare const resolveHeadConfig: (props: TablePropTypes) => {
  * @param index 当前行Index
  * @returns
  */
-export declare const getRowText: (row: any, key: string) => any;
+export declare const getRowText: (row: any, key: string, format?: string[] | (() => string | number | boolean)[]) => any;
 /**
  * 获取当前行指定列的值
  * @param row 当前行
@@ -112,9 +112,9 @@ export declare const resolveCellSpan: (column: Column, colIndex: number, row: an
     rowspan: any;
 };
 export declare const skipThisColumn: (columns: Column[], colIndex: number, row: any, rowIndex: number) => boolean;
-export declare const getSortFn: (column: any, sortType: any) => ((_a: any, _b: any) => boolean) | ((_a: any, _b: any) => number);
+export declare const getSortFn: (column: any, sortType: any, format?: any[]) => ((_a: any, _b: any) => boolean) | ((_a: any, _b: any) => number);
 export declare const getNextSortType: (sortType: string) => string;
-export declare const resolveSort: (sort: ISortPropShape, column: any) => ({
+export declare const resolveSort: (sort: ISortPropShape, column: any, format?: any[]) => ({
     sortFn: ((_a: any, _b: any) => boolean) | ((_a: any, _b: any) => number);
 } & import("./props").ISortShape) | {
     sortFn?: Function;

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

@@ -120,6 +120,7 @@ declare const BkTableColumn: {
                 mode?: "auto" | "static";
                 popoverOption?: any;
                 resizerWay?: import("../../table/src/props").ResizerWay;
+                showHead?: boolean;
             };
             field: import("../../table/src/props").LabelFunctionString;
             prop?: import("../../table/src/props").LabelFunctionString;
@@ -363,6 +364,7 @@ declare const BkTableColumn: {
                 mode?: "auto" | "static";
                 popoverOption?: any;
                 resizerWay?: import("../../table/src/props").ResizerWay;
+                showHead?: boolean;
             };
             field: import("../../table/src/props").LabelFunctionString;
             prop?: import("../../table/src/props").LabelFunctionString;
@@ -554,6 +556,7 @@ declare const BkTableColumn: {
             mode?: "auto" | "static";
             popoverOption?: any;
             resizerWay?: import("../../table/src/props").ResizerWay;
+            showHead?: boolean;
         };
         field: import("../../table/src/props").LabelFunctionString;
         prop?: import("../../table/src/props").LabelFunctionString;

package/lib/table-column/index.js

@@ -414,6 +414,13 @@ var tableProps = {
    * 是否显示Head
    */
   showHead: external_shared_namespaceObject.PropTypes.bool.def(true),
+  /**
+   * 排序时对需要排序的字符串数值进行格式化
+   * 这里需要配置为正则或者回调函数，(str) => string | number | boolean
+   * 如果配置为正则，程序会提取匹配到的第一个结果尝试转换为数值
+   * 如果为多个，程序会顺序执行所有正则表达式，直到转换成功
+   */
+  sortValFormat: external_shared_namespaceObject.PropTypes.arrayOf(external_shared_namespaceObject.PropTypes.any).def(['']),
   /**
    * table header config
    */

package/package.json

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