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

package/lib/table/table.css

@@ -755,11 +755,11 @@
   display: flex;
   align-items: center;
   font-size: 12px;
-  letter-spacing: normal;
   color: #63656e;
+  letter-spacing: normal;
   user-select: none;
 }
-.bk-pagination.is-disabled {
+.bk-pagination.is-disabled * {
   cursor: not-allowed;
 }
 .bk-pagination.is-align-left {
@@ -799,16 +799,16 @@
   display: flex;
   align-items: center;
   justify-content: center;
-  height: 32px;
   min-width: 32px;
+  height: 32px;
   padding: 0 4px;
   margin-right: 2px;
   margin-left: 2px;
   color: #63656e;
   cursor: pointer;
+  user-select: none;
   background: #fff;
   border-radius: 2px;
-  user-select: none;
 }
 .bk-pagination-list-pre-batch.is-active,
 .bk-pagination-list-next-batch.is-active,
@@ -883,13 +883,13 @@
 }
 .bk-pagination-small-list .bk-pagination-picker {
   display: flex;
+  align-items: center;
   height: 26px;
   margin: 0 4px;
   cursor: pointer;
   background-color: #f0f1f5;
   border: 1px solid #f0f1f5;
   border-radius: 2px;
-  align-items: center;
 }
 .bk-pagination-small-list .bk-pagination-picker:hover {
   background-color: #eaebf0;
@@ -901,8 +901,8 @@
   box-shadow: 0px 0px 4px rgba(58, 132, 255, 0.4);
 }
 .bk-pagination-editor {
-  height: 16px;
   min-width: 23px;
+  height: 16px;
   padding-right: 4px;
   padding-left: 8px;
   line-height: 16px;
@@ -920,13 +920,13 @@
 .bk-pagination-btn-pre,
 .bk-pagination-btn-next {
   display: flex;
+  align-items: center;
+  justify-content: center;
   width: 26px;
   height: 26px;
   font-size: 20px;
   color: #979ba5;
   cursor: pointer;
-  justify-content: center;
-  align-items: center;
 }
 .bk-pagination-btn-pre:hover,
 .bk-pagination-btn-next:hover {
@@ -1505,6 +1505,15 @@
   background-color: var(--background-color);
   height: var(--row-height);
 }
+.bk-table .bk-table-head.has-group .is-head-group {
+  border-bottom: 1px solid var(--table-border-color);
+}
+.bk-table .bk-table-head.has-group th {
+  border-right: 1px solid var(--table-border-color);
+}
+.bk-table .bk-table-head.has-group th.is-last-child {
+  border-right: none;
+}
 .bk-table .bk-table-head .col-resize-drag {
   position: absolute;
   top: 0;
@@ -1577,6 +1586,9 @@
 .bk-table.bordered-col .bk-table-head {
   border-right: 1px solid var(--table-border-color);
 }
+.bk-table.bordered-col .bk-table-head .is-head-group {
+  border-bottom: 1px solid var(--table-border-color);
+}
 .bk-table.bordered-col th {
   border-right: 1px solid var(--table-border-color);
 }

package/lib/table/table.less

@@ -309,6 +309,20 @@
     background-color: var(--background-color);
     height: var(--row-height);
 
+    &.has-group {
+      .is-head-group {
+        border-bottom: 1px solid @table-border-color;
+      }
+
+      th {
+        border-right: 1px solid @table-border-color;
+
+        &.is-last-child {
+          border-right: none;
+        }
+      }
+    }
+
     .col-resize-drag {
       position: absolute;
       top: 0;
@@ -407,6 +421,9 @@
   &.bordered-col {
     .@{bk-prefix}-table-head {
       border-right: 1px solid @table-border-color;
+      .is-head-group {
+        border-bottom: 1px solid @table-border-color;
+      }
     }
     th {
       border-right: 1px solid @table-border-color;

package/lib/table/table.variable.css

@@ -1145,11 +1145,11 @@
   display: flex;
   align-items: center;
   font-size: 12px;
-  letter-spacing: normal;
   color: #63656e;
+  letter-spacing: normal;
   user-select: none;
 }
-.bk-pagination.is-disabled {
+.bk-pagination.is-disabled * {
   cursor: not-allowed;
 }
 .bk-pagination.is-align-left {
@@ -1189,16 +1189,16 @@
   display: flex;
   align-items: center;
   justify-content: center;
-  height: 32px;
   min-width: 32px;
+  height: 32px;
   padding: 0 4px;
   margin-right: 2px;
   margin-left: 2px;
   color: #63656e;
   cursor: pointer;
+  user-select: none;
   background: #fff;
   border-radius: 2px;
-  user-select: none;
 }
 .bk-pagination-list-pre-batch.is-active,
 .bk-pagination-list-next-batch.is-active,
@@ -1273,13 +1273,13 @@
 }
 .bk-pagination-small-list .bk-pagination-picker {
   display: flex;
+  align-items: center;
   height: 26px;
   margin: 0 4px;
   cursor: pointer;
   background-color: #f0f1f5;
   border: 1px solid #f0f1f5;
   border-radius: 2px;
-  align-items: center;
 }
 .bk-pagination-small-list .bk-pagination-picker:hover {
   background-color: #eaebf0;
@@ -1291,8 +1291,8 @@
   box-shadow: 0px 0px 4px rgba(58, 132, 255, 0.4);
 }
 .bk-pagination-editor {
-  height: 16px;
   min-width: 23px;
+  height: 16px;
   padding-right: 4px;
   padding-left: 8px;
   line-height: 16px;
@@ -1310,13 +1310,13 @@
 .bk-pagination-btn-pre,
 .bk-pagination-btn-next {
   display: flex;
+  align-items: center;
+  justify-content: center;
   width: 26px;
   height: 26px;
   font-size: 20px;
   color: #979ba5;
   cursor: pointer;
-  justify-content: center;
-  align-items: center;
 }
 .bk-pagination-btn-pre:hover,
 .bk-pagination-btn-next:hover {
@@ -1895,6 +1895,15 @@
   background-color: var(--background-color);
   height: var(--row-height);
 }
+.bk-table .bk-table-head.has-group .is-head-group {
+  border-bottom: 1px solid var(--table-border-color);
+}
+.bk-table .bk-table-head.has-group th {
+  border-right: 1px solid var(--table-border-color);
+}
+.bk-table .bk-table-head.has-group th.is-last-child {
+  border-right: none;
+}
 .bk-table .bk-table-head .col-resize-drag {
   position: absolute;
   top: 0;
@@ -1967,6 +1976,9 @@
 .bk-table.bordered-col .bk-table-head {
   border-right: 1px solid var(--table-border-color);
 }
+.bk-table.bordered-col .bk-table-head .is-head-group {
+  border-bottom: 1px solid var(--table-border-color);
+}
 .bk-table.bordered-col th {
   border-right: 1px solid var(--table-border-color);
 }

package/lib/table/utils.d.ts

@@ -6,7 +6,7 @@ import { Column, GroupColumn, ISortPropShape, TablePropTypes } from './props';
  * @param args 如果是函数，传递参数
  * @returns
  */
-export declare const resolvePropVal: (prop: any, key: string | string[], args: any[]) => any;
+export declare const resolvePropVal: (prop: Record<string, unknown>, key: string | string[], args: unknown[]) => any;
 /**
  * 处理Props中的ActiveColumn，解析为统一的数组格式
  * @param props
@@ -159,4 +159,4 @@ export declare const getRawData: (data: any) => any;
  * @param parentVal
  * @returns
  */
-export declare const getNumberOrPercentValue: (val: string | number, parentVal?: number) => number;
+export declare const getNumberOrPercentValue: (val: number | string, parentVal?: number) => number;

package/lib/table-column/index.js

@@ -17668,9 +17668,9 @@ var tableProps = {
   stripe: shared_namespaceObject.PropTypes.bool.def(false),
   /**
    * 设置表格最小高度
-   * 默认：LINE_HEIGHT * 4
+   * 默认：LINE_HEIGHT * 2
    */
-  minHeight: StringNumberType(LINE_HEIGHT * 3),
+  minHeight: StringNumberType(LINE_HEIGHT),
   /**
    * 设置表格最d大高度
    * 默认：auto，依赖外层高度

package/lib/time-picker/index.d.ts

@@ -80,10 +80,6 @@ declare const BkTimePicker: {
             readonly default: "bottom-start";
             readonly validator: (value: any) => boolean;
         };
-        transfer: {
-            readonly type: BooleanConstructor;
-            readonly default: false;
-        };
         appendToBody: {
             readonly type: BooleanConstructor;
             readonly default: false;
@@ -288,10 +284,6 @@ declare const BkTimePicker: {
             readonly default: "bottom-start";
             readonly validator: (value: any) => boolean;
         };
-        transfer: {
-            readonly type: BooleanConstructor;
-            readonly default: false;
-        };
         appendToBody: {
             readonly type: BooleanConstructor;
             readonly default: false;
@@ -366,7 +358,6 @@ declare const BkTimePicker: {
         open: boolean;
         multiple: boolean;
         placeholder: string;
-        transfer: boolean;
         behavior: "normal" | "simplicity";
         clearable: boolean;
         readonly: boolean;
@@ -485,10 +476,6 @@ declare const BkTimePicker: {
             readonly default: "bottom-start";
             readonly validator: (value: any) => boolean;
         };
-        transfer: {
-            readonly type: BooleanConstructor;
-            readonly default: false;
-        };
         appendToBody: {
             readonly type: BooleanConstructor;
             readonly default: false;
@@ -622,7 +609,6 @@ declare const BkTimePicker: {
         open: boolean;
         multiple: boolean;
         placeholder: string;
-        transfer: boolean;
         behavior: "normal" | "simplicity";
         clearable: boolean;
         readonly: boolean;
@@ -730,10 +716,6 @@ declare const BkTimePicker: {
         readonly default: "bottom-start";
         readonly validator: (value: any) => boolean;
     };
-    transfer: {
-        readonly type: BooleanConstructor;
-        readonly default: false;
-    };
     appendToBody: {
         readonly type: BooleanConstructor;
         readonly default: false;
@@ -867,7 +849,6 @@ declare const BkTimePicker: {
     open: boolean;
     multiple: boolean;
     placeholder: string;
-    transfer: boolean;
     behavior: "normal" | "simplicity";
     clearable: boolean;
     readonly: boolean;

package/lib/tree/index.js

@@ -17647,6 +17647,9 @@ var treeProps = {
    * 是否支持多选
    */
   showCheckbox: shared_namespaceObject.PropTypes.oneOfType([shared_namespaceObject.PropTypes.bool, shared_namespaceObject.PropTypes.func]).def(false),
+  /**
+   * 默认选中的节点id，selectable为false时无效
+   */
   checked: shared_namespaceObject.PropTypes.arrayOf(shared_namespaceObject.PropTypes.any).def([]),
   /**
    * 是否显示节点类型Icon

package/lib/tree/props.d.ts

@@ -157,6 +157,9 @@ export declare const treeProps: {
     showCheckbox: import("vue-types").VueTypeDef<any> & {
         default: any;
     };
+    /**
+     * 默认选中的节点id，selectable为false时无效
+     */
     checked: import("vue-types").VueTypeDef<any[]> & {
         default: () => any[];
     };

package/package.json

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