bkui-vue 1.0.2 → 1.0.3-beta.10

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/plugins/use-draggable.d.ts

@@ -6,12 +6,12 @@ declare const _default: (props: TablePropTypes, resp: ITableResponse, ctx: Setup
     onDragleave?: undefined;
     onDragstart?: undefined;
     onDragover?: undefined;
-    onDrop?: undefined;
+    onDragend?: undefined;
 } | {
     onDragenter: (event: DragEvent) => void;
     onDragleave: (event: DragEvent) => void;
     onDragstart: (event: DragEvent) => void;
     onDragover: (event: DragEvent) => void;
-    onDrop: (event: DragEvent) => void;
+    onDragend: (event: DragEvent) => void;
 };
 export default _default;

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/props.d.ts

@@ -304,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.css

@@ -997,6 +997,7 @@
   position: relative;
   height: auto;
   overflow: hidden;
+  width: 100%;
 }
 .bk-table-flex {
   display: flex;
@@ -1014,6 +1015,7 @@
   position: relative;
   overflow: auto;
   scrollbar-gutter: stable;
+  border-bottom: 1px solid #dcdee5;
 }
 .bk-table .bk-table-body::-webkit-scrollbar {
   width: 5px;
@@ -1283,23 +1285,16 @@
 .bk-table .bk-table-body table tbody tr:hover.hover-highlight td:not(.empty-cell) {
   background: #f5f7fa;
 }
-.bk-table .bk-table-head table tbody tr.--drag-enter.--bottom,
-.bk-table .bk-table-body table tbody tr.--drag-enter.--bottom {
-  border-bottom: solid 1px #3785ff;
-}
-.bk-table .bk-table-head table tbody tr.--drag-enter.--top,
-.bk-table .bk-table-body table tbody tr.--drag-enter.--top {
-  border-top: solid 1px #3785ff;
-}
-.bk-table .bk-table-head table tbody tr.--drag-start,
-.bk-table .bk-table-body table tbody tr.--drag-start {
-  background: #fff;
+.bk-table .bk-table-head table tbody tr.--drag-start td,
+.bk-table .bk-table-body table tbody tr.--drag-start td {
+  background: #fff !important;
 }
 .bk-table .bk-table-head {
   position: relative;
   z-index: 2;
   scrollbar-gutter: stable;
   overflow: hidden;
+  background-color: var(--background-color);
 }
 .bk-table .bk-table-head .col-resize-drag {
   position: absolute;
@@ -1325,10 +1320,8 @@
   font-size: 14px;
   cursor: pointer;
   background: #fafbfd;
-  border-bottom: 1px solid #dcdee5;
   border-left: 1px solid #dcdee5;
   border-radius: 0 2px 0 0;
-  transform: translateX(var(--scroll-left));
   justify-content: center;
   align-items: center;
 }
@@ -1346,8 +1339,10 @@
 .bk-table .bk-table-footer.is-hidden {
   display: none;
 }
-.bk-table.bordered-row td,
-.bk-table.bordered-row th {
+.bk-table.bordered-row .bk-table-head {
+  border-bottom: 1px solid #dcdee5;
+}
+.bk-table.bordered-row td {
   border-bottom: 1px solid #dcdee5;
 }
 .bk-table.bordered-row tr:last-child td {
@@ -1379,10 +1374,14 @@
 .bk-table.bordered-col td:last-child {
   border-right: none;
 }
+.bk-table th,
+.bk-table td {
+  border-right: 1px solid transparent;
+}
 .bk-table.bordered-none th,
 .bk-table.bordered-none td {
   border-top: none;
-  border-right: none;
+  border-right: 1px solid transparent;
   border-bottom: none;
   border-left: none;
 }

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/table.less

@@ -14,6 +14,7 @@
   position: relative;
   height: auto;
   overflow: hidden;
+  width: 100%;
 
   &-flex {
     display: flex;
@@ -35,6 +36,7 @@
     position: relative;
     overflow: auto;
     scrollbar-gutter: stable;
+    border-bottom: 1px solid @table-border-color;
 
     &::-webkit-scrollbar {
       width: 5px;
@@ -311,18 +313,21 @@
             }
           }
 
-          &.--drag-enter {
-            &.--bottom {
-              border-bottom: solid 1px #3785ff;
-            }
+          // &.--drag-enter {
+          //   &.--bottom {
+          //     border-bottom: solid 1px #3785ff;
+          //   }
 
-            &.--top {
-              border-top: solid 1px #3785ff;
-            }
-          }
+          //   &.--top {
+          //     border-top: solid 1px #3785ff;
+          //   }
+          // }
 
           &.--drag-start {
-            background: #fff;
+
+            td {
+              background: #fff!important;
+            }
           }
         }
       }
@@ -334,6 +339,7 @@
     z-index: 2;
     scrollbar-gutter: stable;
     overflow: hidden;
+    background-color: var(--background-color);
 
     .col-resize-drag {
       position: absolute;
@@ -363,10 +369,10 @@
 
       background: @table-head-bg-color;
       //border-right: 1px solid @table-border-color;
-      border-bottom: 1px solid @table-border-color;
+      // border-bottom: 1px solid @table-border-color;
       border-left: 1px solid @table-border-color;
       border-radius: 0 2px 0 0;
-      transform: translateX(var(--scroll-left));
+      // transform: translateX(var(--scroll-left));
       justify-content: center;
       align-items: center;
 
@@ -390,8 +396,11 @@
   }
 
   &.bordered-row {
-    td,
-    th {
+    .@{bk-prefix}-table-head {
+      border-bottom: 1px solid @table-border-color;
+    }
+
+    td {
       border-bottom: 1px solid @table-border-color;
     }
 
@@ -444,11 +453,15 @@
 
   }
 
+  th, td {
+    border-right: 1px solid transparent;
+  }
+
   &.bordered-none {
     th,
     td {
       border-top: none;
-      border-right: none;
+      border-right: 1px solid transparent;
       border-bottom: none;
       border-left: none;
     }

package/lib/table/table.variable.css

@@ -1123,6 +1123,7 @@
   position: relative;
   height: auto;
   overflow: hidden;
+  width: 100%;
 }
 .bk-table-flex {
   display: flex;
@@ -1140,6 +1141,7 @@
   position: relative;
   overflow: auto;
   scrollbar-gutter: stable;
+  border-bottom: 1px solid #dcdee5;
 }
 .bk-table .bk-table-body::-webkit-scrollbar {
   width: 5px;
@@ -1409,23 +1411,16 @@
 .bk-table .bk-table-body table tbody tr:hover.hover-highlight td:not(.empty-cell) {
   background: #f5f7fa;
 }
-.bk-table .bk-table-head table tbody tr.--drag-enter.--bottom,
-.bk-table .bk-table-body table tbody tr.--drag-enter.--bottom {
-  border-bottom: solid 1px #3785ff;
-}
-.bk-table .bk-table-head table tbody tr.--drag-enter.--top,
-.bk-table .bk-table-body table tbody tr.--drag-enter.--top {
-  border-top: solid 1px #3785ff;
-}
-.bk-table .bk-table-head table tbody tr.--drag-start,
-.bk-table .bk-table-body table tbody tr.--drag-start {
-  background: #fff;
+.bk-table .bk-table-head table tbody tr.--drag-start td,
+.bk-table .bk-table-body table tbody tr.--drag-start td {
+  background: #fff !important;
 }
 .bk-table .bk-table-head {
   position: relative;
   z-index: 2;
   scrollbar-gutter: stable;
   overflow: hidden;
+  background-color: var(--background-color);
 }
 .bk-table .bk-table-head .col-resize-drag {
   position: absolute;
@@ -1451,10 +1446,8 @@
   font-size: 14px;
   cursor: pointer;
   background: #fafbfd;
-  border-bottom: 1px solid #dcdee5;
   border-left: 1px solid #dcdee5;
   border-radius: 0 2px 0 0;
-  transform: translateX(var(--scroll-left));
   justify-content: center;
   align-items: center;
 }
@@ -1472,8 +1465,10 @@
 .bk-table .bk-table-footer.is-hidden {
   display: none;
 }
-.bk-table.bordered-row td,
-.bk-table.bordered-row th {
+.bk-table.bordered-row .bk-table-head {
+  border-bottom: 1px solid #dcdee5;
+}
+.bk-table.bordered-row td {
   border-bottom: 1px solid #dcdee5;
 }
 .bk-table.bordered-row tr:last-child td {
@@ -1505,10 +1500,14 @@
 .bk-table.bordered-col td:last-child {
   border-right: none;
 }
+.bk-table th,
+.bk-table td {
+  border-right: 1px solid transparent;
+}
 .bk-table.bordered-none th,
 .bk-table.bordered-none td {
   border-top: none;
-  border-right: none;
+  border-right: 1px solid transparent;
   border-bottom: none;
   border-left: none;
 }

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: (item: 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/lib/table/use-common.d.ts

@@ -32,6 +32,7 @@ export declare const useClass: (props: TablePropTypes, targetColumns: ITableColu
         '--row-height': string;
         '--scroll-head-left': string;
         '--scroll-left': string;
+        '--background-color': any;
     }>;
     fixHeight: import("vue").Ref<number>;
     maxFixHeight: import("vue").Ref<number>;

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 当前行
@@ -111,10 +111,10 @@ export declare const resolveCellSpan: (column: Column, colIndex: number, row: an
     colspan: any;
     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 skipThisColumn: (columns: Column[], colIndex: number, row: any, rowIndex: number) => number | false;
+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;
@@ -133,3 +133,4 @@ export declare const resolveColumnSortProp: (col: Column, props: TablePropTypes)
     scope: import("./props").SortScope;
     active: boolean;
 };
+export declare const getRawData: (data: any) => any;

package/lib/table-column/index.js

@@ -1,3 +1,4 @@
+import "../styles/reset.css";
 import * as __WEBPACK_EXTERNAL_MODULE_bkui_vue_lib_shared_edbdfb03__ from "../shared";
 import * as __WEBPACK_EXTERNAL_MODULE_vue__ from "vue";
 import * as __WEBPACK_EXTERNAL_MODULE_vue_types_22de060a__ from "vue-types";
@@ -414,6 +415,13 @@ var tableProps = {
    * 是否显示Head
    */
   showHead: shared_namespaceObject.PropTypes.bool.def(true),
+  /**
+   * 排序时对需要排序的字符串数值进行格式化
+   * 这里需要配置为正则或者回调函数，(str) => string | number | boolean
+   * 如果配置为正则，程序会提取匹配到的第一个结果尝试转换为数值
+   * 如果为多个，程序会顺序执行所有正则表达式，直到转换成功
+   */
+  sortValFormat: shared_namespaceObject.PropTypes.arrayOf(shared_namespaceObject.PropTypes.any).def(['']),
   /**
    * table header config
    */
@@ -669,6 +677,9 @@ var TableColumnProp = {
   mounted: function mounted() {
     this.updateColumnDefine();
   },
+  updated: function updated() {
+    this.updateColumnDefineByParent();
+  },
   methods: {
     updateColumnDefine: function updateColumnDefine() {
       var unmounted = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : false;

package/lib/tag/index.js

@@ -1,3 +1,4 @@
+import "../styles/reset.css";
 import "./tag.less";
 import * as __WEBPACK_EXTERNAL_MODULE_bkui_vue_lib_shared_edbdfb03__ from "../shared";
 import * as __WEBPACK_EXTERNAL_MODULE_vue__ from "vue";

package/lib/tag-input/index.js

@@ -1,3 +1,4 @@
+import "../styles/reset.css";
 import "./tag-input.less";
 import * as __WEBPACK_EXTERNAL_MODULE_bkui_vue_lib_shared_edbdfb03__ from "../shared";
 import * as __WEBPACK_EXTERNAL_MODULE_vue__ from "vue";

package/lib/time-picker/index.js

@@ -1,3 +1,4 @@
+import "../styles/reset.css";
 import "./time-picker.less";
 import * as __WEBPACK_EXTERNAL_MODULE_bkui_vue_lib_date_picker_d04526d6__ from "../date-picker";
 import * as __WEBPACK_EXTERNAL_MODULE_bkui_vue_lib_shared_edbdfb03__ from "../shared";

package/lib/timeline/index.js

@@ -1,3 +1,4 @@
+import "../styles/reset.css";
 import * as __WEBPACK_EXTERNAL_MODULE_bkui_vue_lib_shared_edbdfb03__ from "../shared";
 import * as __WEBPACK_EXTERNAL_MODULE_vue__ from "vue";
 import * as __WEBPACK_EXTERNAL_MODULE_bkui_vue_lib_config_provider_fe8577a3__ from "../config-provider";

package/lib/transfer/index.js

@@ -1,3 +1,4 @@
+import "../styles/reset.css";
 import "./transfer.less";
 import * as __WEBPACK_EXTERNAL_MODULE_bkui_vue_lib_shared_edbdfb03__ from "../shared";
 import * as __WEBPACK_EXTERNAL_MODULE_vue__ from "vue";

package/lib/tree/index.js

@@ -1,3 +1,4 @@
+import "../styles/reset.css";
 import "./tree.less";
 import * as __WEBPACK_EXTERNAL_MODULE_bkui_vue_lib_shared_edbdfb03__ from "../shared";
 import * as __WEBPACK_EXTERNAL_MODULE_vue__ from "vue";

package/lib/upload/index.js

@@ -1,3 +1,4 @@
+import "../styles/reset.css";
 import "./upload.less";
 import * as __WEBPACK_EXTERNAL_MODULE_bkui_vue_lib_shared_edbdfb03__ from "../shared";
 import * as __WEBPACK_EXTERNAL_MODULE_vue__ from "vue";

package/lib/virtual-render/index.js

@@ -1,3 +1,4 @@
+import "../styles/reset.css";
 import "./virtual-render.less";
 import * as __WEBPACK_EXTERNAL_MODULE_bkui_vue_lib_shared_edbdfb03__ from "../shared";
 import * as __WEBPACK_EXTERNAL_MODULE_vue__ from "vue";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bkui-vue",
-  "version": "1.0.2",
+  "version": "1.0.3-beta.10",
   "workspaces": {
     "packages": [
       "packages/!(**.bak)*",
@@ -30,11 +30,12 @@
     "postpublish": "node scripts/post-publish.js",
     "prepare": "husky install",
     "dev": "lerna run --stream --scope site dev",
-    "debug": "TS_NODE_PROJECT=./scripts/cli/tsconfig.declaration.json node --inspect-brk -r ts-node/register ./scripts/cli/index.ts lib",
+    "debug": "TS_NODE_CWD=./scripts/cli node --inspect-brk -r ts-node/register ./scripts/cli/index.ts lib",
     "build": "run-s build:dist build:lib",
     "build:site": "lerna run --stream --scope site build && cp -r ./site/views/ ./site/dist/views",
     "build:dist": "rimraf dist && lerna run --stream --scope cli dist",
-    "build:lib": "rimraf lib && lerna run --stream --scope cli lib",
+    "build:lib": "npm run build:preset && rimraf lib && lerna run --stream --scope cli lib && rimraf preset",
+    "build:preset": "rimraf preset && lerna run --stream --scope cli preset",
     "help:release": "lerna run --stream --scope cli release",
     "release": "yarn build && yarn help:release",
     "analyze:lib": "rimraf lib && lerna run --stream --scope cli lib -- -a",