bkui-vue 2.0.1-beta.15.table.1 → 2.0.1-beta.15.table.10

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

@@ -72,6 +72,7 @@ declare const BkTableColumn: {
             showOverflowTooltip?: boolean | {
                 content: string | ((col: import("../../bkui-vue").TableIColumn, row: any) => string);
                 disabled?: boolean | ((col: import("../../bkui-vue").TableIColumn, row: any) => boolean);
+                allowHtml?: boolean;
                 watchCellResize?: boolean;
                 mode?: "auto" | "static";
                 popoverOption?: any;
@@ -208,6 +209,7 @@ declare const BkTableColumn: {
             showOverflowTooltip?: boolean | {
                 content: string | ((col: import("../../bkui-vue").TableIColumn, row: any) => string);
                 disabled?: boolean | ((col: import("../../bkui-vue").TableIColumn, row: any) => boolean);
+                allowHtml?: boolean;
                 watchCellResize?: boolean;
                 mode?: "auto" | "static";
                 popoverOption?: any;
@@ -302,6 +304,7 @@ declare const BkTableColumn: {
         showOverflowTooltip?: boolean | {
             content: string | ((col: import("../../bkui-vue").TableIColumn, row: any) => string);
             disabled?: boolean | ((col: import("../../bkui-vue").TableIColumn, row: any) => boolean);
+            allowHtml?: boolean;
             watchCellResize?: boolean;
             mode?: "auto" | "static";
             popoverOption?: any;

package/lib/table-column/index.js

@@ -38,7 +38,7 @@ const shared_namespaceObject = x({ ["PropTypes"]: () => __WEBPACK_EXTERNAL_MODUL
 ;// CONCATENATED MODULE: external "vue"
 var external_vue_x = y => { var x = {}; __webpack_require__.d(x, y); return x; }
 var external_vue_y = x => () => x
-const external_vue_namespaceObject = external_vue_x({ ["Fragment"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.Fragment, ["createVNode"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.createVNode, ["defineComponent"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.defineComponent, ["inject"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.inject, ["onMounted"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.onMounted, ["onUnmounted"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.onUnmounted, ["onUpdated"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.onUpdated, ["reactive"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.reactive });
+const external_vue_namespaceObject = external_vue_x({ ["Fragment"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.Fragment, ["createVNode"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.createVNode, ["defineComponent"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.defineComponent, ["inject"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.inject, ["onUnmounted"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.onUnmounted, ["reactive"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.reactive, ["watch"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.watch });
 ;// CONCATENATED MODULE: ../../node_modules/@babel/runtime/helpers/esm/typeof.js
 function _typeof(o) {
   "@babel/helpers - typeof";
@@ -399,16 +399,16 @@ var tableProps = {
    * 默认：auto 根据行数自动填充高度
    * 100%，依赖初始化时父级容器高度
    */
-  height: StringNumberType('100%'),
+  height: StringNumberType('auto'),
   /**
    * 是否为斑马纹 Table
    */
   stripe: shared_namespaceObject.PropTypes.bool.def(false),
   /**
    * 设置表格最小高度
-   * 默认：300
+   * 默认：LINE_HEIGHT * 4
    */
-  minHeight: StringNumberType(LINE_HEIGHT * 2),
+  minHeight: StringNumberType(LINE_HEIGHT * 4),
   /**
    * 设置表格最d大高度
    * 默认：auto，依赖外层高度
@@ -616,7 +616,16 @@ var tableProps = {
   /**
    * 启用Scrollbar
    */
-  scrollbar: shared_namespaceObject.PropTypes.bool.def(true)
+  scrollbar: shared_namespaceObject.PropTypes.bool.def(true),
+  /**
+   * 固定在底部的配置项
+   */
+  fixedBottom: (0,external_vue_types_namespaceObject.toType)('FixedBottomOption', {
+    "default": {
+      position: 'relative',
+      height: LINE_HEIGHT
+    }
+  }).def(null)
 };
 ;// CONCATENATED MODULE: ../../packages/table/src/components/table-column.tsx
 
@@ -677,11 +686,13 @@ var TableColumnProp = {
     var column = (0,external_vue_namespaceObject.reactive)(Object.assign({}, props, {
       field: props.prop || props.field
     }));
-    (0,external_vue_namespaceObject.onMounted)(function () {
-      initTableColumns();
-    });
-    (0,external_vue_namespaceObject.onUpdated)(function () {
+    (0,external_vue_namespaceObject.watch)(function () {
+      return [props];
+    }, function () {
       initTableColumns();
+    }, {
+      immediate: true,
+      deep: true
     });
     (0,external_vue_namespaceObject.onUnmounted)(function () {
       initTableColumns();

package/lib/virtual-render/index.d.ts

@@ -24,9 +24,7 @@ declare const BkVirtualRender: {
         } & {
             default: number;
         };
-        maxHeight: import("vue-types").VueTypeValidableDef<number> & {
-            default: number;
-        };
+        maxHeight: import("vue-types").VueTypeDef<string | number>;
         height: import("vue-types").VueTypeDef<string | number> & {
             default: string | number;
         };
@@ -167,9 +165,7 @@ declare const BkVirtualRender: {
         } & {
             default: number;
         };
-        maxHeight: import("vue-types").VueTypeValidableDef<number> & {
-            default: number;
-        };
+        maxHeight: import("vue-types").VueTypeDef<string | number>;
         height: import("vue-types").VueTypeDef<string | number> & {
             default: string | number;
         };
@@ -286,7 +282,6 @@ declare const BkVirtualRender: {
     }, {
         width: string | number;
         height: string | number;
-        maxHeight: number;
         contentClassName: string | {
             [key: string]: any;
         };
@@ -353,9 +348,7 @@ declare const BkVirtualRender: {
         } & {
             default: number;
         };
-        maxHeight: import("vue-types").VueTypeValidableDef<number> & {
-            default: number;
-        };
+        maxHeight: import("vue-types").VueTypeDef<string | number>;
         height: import("vue-types").VueTypeDef<string | number> & {
             default: string | number;
         };
@@ -474,7 +467,6 @@ declare const BkVirtualRender: {
     }>, {}, {}, {}, {
         width: string | number;
         height: string | number;
-        maxHeight: number;
         contentClassName: string | {
             [key: string]: any;
         };
@@ -533,9 +525,7 @@ declare const BkVirtualRender: {
     } & {
         default: number;
     };
-    maxHeight: import("vue-types").VueTypeValidableDef<number> & {
-        default: number;
-    };
+    maxHeight: import("vue-types").VueTypeDef<string | number>;
     height: import("vue-types").VueTypeDef<string | number> & {
         default: string | number;
     };
@@ -654,7 +644,6 @@ declare const BkVirtualRender: {
 }>, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, string[], string, {
     width: string | number;
     height: string | number;
-    maxHeight: number;
     contentClassName: string | {
         [key: string]: any;
     };

package/lib/virtual-render/index.js

@@ -195,7 +195,7 @@ var virtualRenderProps = _objectSpread({
   /** 整体最小高度 */
   minHeight: shared_namespaceObject.PropTypes.number.def(30),
   /** 整体最大高度 */
-  maxHeight: shared_namespaceObject.PropTypes.number,
+  maxHeight: shared_namespaceObject.PropTypes.oneOfType([shared_namespaceObject.PropTypes.number, shared_namespaceObject.PropTypes.string]),
   /**
    * 整体高度
    * 可设置具体值，如果设置为 100%，则组件会自动计算外层DOM元素offsetHeight，用于计算可渲染行数

package/lib/virtual-render/props.d.ts

@@ -49,9 +49,7 @@ export declare const virtualRenderProps: {
         default: number;
     };
     /** 整体最大高度 */
-    maxHeight: import("vue-types").VueTypeValidableDef<number> & {
-        default: number;
-    };
+    maxHeight: import("vue-types").VueTypeDef<string | number>;
     /**
      * 整体高度
      * 可设置具体值，如果设置为 100%，则组件会自动计算外层DOM元素offsetHeight，用于计算可渲染行数

package/lib/virtual-render/virtual-render.d.ts

@@ -29,9 +29,7 @@ declare const _default: import("vue").DefineComponent<{
     } & {
         default: number;
     };
-    maxHeight: import("vue-types").VueTypeValidableDef<number> & {
-        default: number;
-    };
+    maxHeight: import("vue-types").VueTypeDef<string | number>;
     height: import("vue-types").VueTypeDef<string | number> & {
         default: string | number;
     };
@@ -170,9 +168,7 @@ declare const _default: import("vue").DefineComponent<{
     } & {
         default: number;
     };
-    maxHeight: import("vue-types").VueTypeValidableDef<number> & {
-        default: number;
-    };
+    maxHeight: import("vue-types").VueTypeDef<string | number>;
     height: import("vue-types").VueTypeDef<string | number> & {
         default: string | number;
     };
@@ -289,7 +285,6 @@ declare const _default: import("vue").DefineComponent<{
 }, {
     width: string | number;
     height: string | number;
-    maxHeight: number;
     contentClassName: string | {
         [key: string]: any;
     };

package/package.json

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