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

package/lib/table/index.js

@@ -17913,8 +17913,9 @@ var tableProps = {
     }
   }).def(null)
 };
+// EXTERNAL MODULE: ../../node_modules/lodash/lodash.js
+var lodash = __webpack_require__(6635);
 ;// CONCATENATED MODULE: ../../packages/table/src/components/table-column.tsx
-
 /*
  * Tencent is pleased to support the open source community by making
  * 蓝鲸智云PaaS平台社区版 (BlueKing PaaS Community Edition) available.
@@ -17944,6 +17945,7 @@ var tableProps = {
 
 
 
+
 var TableColumnProp = {
   label: LabelFunctionStringType,
   field: LabelFunctionStringType,
@@ -17967,15 +17969,16 @@ var TableColumnProp = {
 /* harmony default export */ const table_column = ((0,external_vue_namespaceObject.defineComponent)({
   name: 'TableColumn',
   props: TableColumnProp,
-  setup: function setup(props) {
+  setup: function setup(props, _ref) {
+    var slots = _ref.slots;
     var initTableColumns = (0,external_vue_namespaceObject.inject)(PROVIDE_KEY_INIT_COL, function () {});
-    var column = (0,external_vue_namespaceObject.reactive)(Object.assign({}, props, {
-      field: props.prop || props.field
-    }));
     (0,external_vue_namespaceObject.watch)(function () {
       return [props];
-    }, function () {
-      initTableColumns();
+    }, function (oldVal, newVal) {
+      var _newVal$;
+      if (!(0,lodash.isEqual)((0,external_vue_namespaceObject.toRaw)(oldVal === null || oldVal === void 0 ? void 0 : oldVal[0]), (0,external_vue_namespaceObject.toRaw)((_newVal$ = newVal === null || newVal === void 0 ? void 0 : newVal[0]) !== null && _newVal$ !== void 0 ? _newVal$ : {}))) {
+        initTableColumns();
+      }
     }, {
       immediate: true,
       deep: true
@@ -17983,19 +17986,14 @@ var TableColumnProp = {
     (0,external_vue_namespaceObject.onUnmounted)(function () {
       initTableColumns();
     });
-    return {
-      column: column
+    return function () {
+      var _slots$default;
+      return (_slots$default = slots["default"]) === null || _slots$default === void 0 ? void 0 : _slots$default.call(slots, {
+        row: {}
+      });
     };
-  },
-  render: function render() {
-    var _this$$slots$default, _this$$slots;
-    return (0,external_vue_namespaceObject.createVNode)(external_vue_namespaceObject.Fragment, null, [(_this$$slots$default = (_this$$slots = this.$slots)["default"]) === null || _this$$slots$default === void 0 ? void 0 : _this$$slots$default.call(_this$$slots, {
-      row: {}
-    })]);
   }
 }));
-// EXTERNAL MODULE: ../../node_modules/lodash/lodash.js
-var lodash = __webpack_require__(6635);
 ;// CONCATENATED MODULE: ../../packages/table/src/events.ts
 
 var _EMIT_EVENT_TYPES;
@@ -18409,12 +18407,18 @@ function v4(options, buf, offset) {
   var columns = [];
   var columnIndex = 0;
   var columnCache = new WeakMap();
+  var getPropRawData = function getPropRawData(prop) {
+    if ((0,external_vue_namespaceObject.isRef)(prop)) {
+      return (0,external_vue_namespaceObject.unref)(prop);
+    }
+    return (0,external_vue_namespaceObject.toRaw)(prop);
+  };
   var copyProps = function copyProps(props) {
     return Object.keys(props !== null && props !== void 0 ? props : {}).reduce(function (result, key) {
       var target = key.replace(/-(\w)/g, function (_, letter) {
         return letter.toUpperCase();
       });
-      return Object.assign(result, defineProperty_defineProperty({}, target, props[key]));
+      return Object.assign(result, defineProperty_defineProperty({}, target, getPropRawData(props[key])));
     }, {});
   };
   var getNodeCtxUid = function getNodeCtxUid(ctx) {
@@ -18445,6 +18449,9 @@ function v4(options, buf, offset) {
       }
       return;
     }
+    if (Array.isArray(node)) {
+      node.forEach(resolveChildNode);
+    }
     if (Array.isArray(node === null || node === void 0 ? void 0 : node.children)) {
       node.children.forEach(resolveChildNode);
     }
@@ -18458,26 +18465,24 @@ function v4(options, buf, offset) {
     }
     return;
   };
-  var setNodeInstanceId = function setNodeInstanceId(column, uniqueId) {
-    if (!columnCache.has(column)) {
-      columnCache.set(columnCache, {
-        uniqueId: uniqueId,
-        column: column
-      });
-    }
-  };
   var resolveColumns = function resolveColumns(children) {
     columns.length = 0;
     columnIndex = 0;
-    children.forEach(resolveChildNode);
+    var GhostBody = children.find(function (node) {
+      var _node$type3;
+      return ((_node$type3 = node.type) === null || _node$type3 === void 0 ? void 0 : _node$type3.name) === 'GhostBody';
+    });
+    if (GhostBody) {
+      var _GhostBody$children$d, _GhostBody$children, _GhostBody$children$d2;
+      ((_GhostBody$children$d = (_GhostBody$children = GhostBody.children) === null || _GhostBody$children === void 0 || (_GhostBody$children$d2 = _GhostBody$children["default"]) === null || _GhostBody$children$d2 === void 0 ? void 0 : _GhostBody$children$d2.call(_GhostBody$children)) !== null && _GhostBody$children$d !== void 0 ? _GhostBody$children$d : []).forEach(resolveChildNode);
+    }
     columns.sort(function (col1, col2) {
       return col1.index - col2.index;
     });
     return columns;
   };
   return {
-    resolveColumns: resolveColumns,
-    setNodeInstanceId: setNodeInstanceId
+    resolveColumns: resolveColumns
   };
 });
 ;// CONCATENATED MODULE: ../../node_modules/@babel/runtime/helpers/esm/arrayLikeToArray.js
@@ -20243,6 +20248,7 @@ var useColumns = function useColumns(props) {
    * @param columns
    */
   var formatColumns = function formatColumns() {
+    sortColumns.length = 0;
     resolveDraggableColumn();
     var skipColNum = 0;
     (tableColumnList || []).forEach(function (col, index) {
@@ -20866,6 +20872,51 @@ const loading_less_namespaceObject = loading_less_x({  });
     renderScrollLoading: renderScrollLoading
   };
 });
+;// CONCATENATED MODULE: ../../packages/table/src/components/ghost-body.tsx
+
+/*
+ * Tencent is pleased to support the open source community by making
+ * 蓝鲸智云PaaS平台社区版 (BlueKing PaaS Community Edition) available.
+ *
+ * Copyright (C) 2021 THL A29 Limited, a Tencent company.  All rights reserved.
+ *
+ * 蓝鲸智云PaaS平台社区版 (BlueKing PaaS Community Edition) is licensed under the MIT License.
+ *
+ * License for 蓝鲸智云PaaS平台社区版 (BlueKing PaaS Community Edition):
+ *
+ * ---------------------------------------------------
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated
+ * documentation files (the "Software"), to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and
+ * to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all copies or substantial portions of
+ * the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO
+ * THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
+ * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+ * IN THE SOFTWARE.
+ */
+
+/* harmony default export */ const ghost_body = ((0,external_vue_namespaceObject.defineComponent)({
+  name: 'GhostBody',
+  setup: function setup(_, ctx) {
+    var columnGhostStyle = {
+      zIndex: -1,
+      width: 0,
+      height: 0,
+      display: 'none'
+    };
+    return function () {
+      var _ctx$slots$default, _ctx$slots;
+      return (0,external_vue_namespaceObject.createVNode)("div", {
+        "style": columnGhostStyle
+      }, [(_ctx$slots$default = (_ctx$slots = ctx.slots)["default"]) === null || _ctx$slots$default === void 0 ? void 0 : _ctx$slots$default.call(_ctx$slots)]);
+    };
+  }
+}));
 ;// CONCATENATED MODULE: ../../packages/table/src/hooks/use-layout.tsx
 
 
@@ -20907,6 +20958,7 @@ function use_layout_objectSpread(e) { for (var r = 1; r < arguments.length; r++)
 
 
 
+
 /* harmony default export */ const use_layout = (function (props, ctx) {
   var _props$rowHeight;
   var refRoot = (0,external_vue_namespaceObject.ref)(null);
@@ -20991,23 +21043,19 @@ function use_layout_objectSpread(e) { for (var r = 1; r < arguments.length; r++)
   });
   var bodyClass = defineProperty_defineProperty({}, resolveClassName('table-body'), true);
   var footerClass = (0,external_vue_namespaceObject.computed)(function () {
-    return (0,shared_namespaceObject.classes)(defineProperty_defineProperty(defineProperty_defineProperty({}, resolveClassName('table-footer'), true), 'is-hidden', !props.pagination || !props.data.length));
+    return (0,shared_namespaceObject.classes)(defineProperty_defineProperty(defineProperty_defineProperty({}, resolveClassName('table-footer'), true), 'is-hidden', footHeight.value === 0));
   });
-  var columnGhostStyle = {
-    zIndex: -1,
-    width: 0,
-    height: 0,
-    display: 'none'
-  };
   var renderContainer = function renderContainer(childrend) {
     var _ctx$slots$default, _ctx$slots;
     return (0,external_vue_namespaceObject.createVNode)("div", {
       "ref": refRoot,
       "style": tableStyle.value,
       "class": tableClass.value
-    }, [childrend, (0,external_vue_namespaceObject.createVNode)("div", {
-      "style": columnGhostStyle
-    }, [(_ctx$slots$default = (_ctx$slots = ctx.slots)["default"]) === null || _ctx$slots$default === void 0 ? void 0 : _ctx$slots$default.call(_ctx$slots)])]);
+    }, [childrend, (0,external_vue_namespaceObject.createVNode)(ghost_body, null, {
+      "default": function _default() {
+        return [(_ctx$slots$default = (_ctx$slots = ctx.slots)["default"]) === null || _ctx$slots$default === void 0 ? void 0 : _ctx$slots$default.call(_ctx$slots)];
+      }
+    })]);
   };
   var renderHeader = function renderHeader(childrend, settings, fixedRows) {
     return (0,external_vue_namespaceObject.createVNode)("div", {
@@ -23144,7 +23192,7 @@ function use_render_isSlot(s) {
     ctx.emit(EMIT_EVENTS.PAGE_LIMIT_CHANGE, limit);
   };
   var handlePageChange = function handlePageChange(current) {
-    if (typeof_typeof(props.pagination) === 'object' && current !== props.pagination.current) {
+    if (typeof_typeof(props.pagination) === 'object' && current !== pagination.options.current) {
       pagination.setPagination({
         current: current,
         value: current

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

@@ -38,51 +38,9 @@ declare const BkTableColumn: {
         } & {
             default: number;
         };
-    }>>, {
-        column: {
-            fixed?: boolean | "left" | "right";
-            resizable?: boolean;
-            minWidth?: string | number;
-            index?: number;
-            columnKey?: string;
-            colspan?: import("../table/props").SpanFunctionString;
-            rowspan?: import("../table/props").SpanFunctionString;
-            render?: import("../table/props").RenderFunctionString;
-            sort?: string | boolean | {
-                sortFn?: Function;
-                sortScope?: import("../table/props").SortScope;
-                value?: import("../table/const").SORT_OPTION;
-            };
-            filter?: string | boolean | {
-                list: any[];
-                filterFn?: Function;
-                match?: import("../table/props").FullEnum;
-                checked?: any[];
-                filterScope?: import("../table/props").SortScope;
-                btnSave?: string | boolean;
-                btnReset?: string | boolean;
-                height?: number;
-                maxHeight?: number;
-            };
-            type?: "index" | "expand" | "__COL_TYPE_NONE" | "selection";
-            label?: import("../table/props").LabelFunctionString;
-            width?: string | number;
-            className?: import("../table/props").RowClassFunctionString;
-            align?: "" | "left" | "right" | "center";
-            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;
-                resizerWay?: import("../table/props").ResizerWay;
-                showHead?: boolean;
-            };
-            field: import("../table/props").LabelFunctionString;
-            prop?: import("../table/props").LabelFunctionString;
-        };
-    }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps & Readonly<import("vue").ExtractPropTypes<{
+    }>>, () => import("vue").VNode<import("vue").RendererNode, import("vue").RendererElement, {
+        [key: string]: any;
+    }>[], unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps & Readonly<import("vue").ExtractPropTypes<{
         label: import("vue-types").VueTypeDef<import("../table/props").LabelFunctionString>;
         field: import("vue-types").VueTypeDef<import("../table/props").LabelFunctionString>;
         render: import("vue-types").VueTypeDef<import("../table/props").RenderFunctionString>;
@@ -175,51 +133,9 @@ declare const BkTableColumn: {
         } & {
             default: number;
         };
-    }>>, {
-        column: {
-            fixed?: boolean | "left" | "right";
-            resizable?: boolean;
-            minWidth?: string | number;
-            index?: number;
-            columnKey?: string;
-            colspan?: import("../table/props").SpanFunctionString;
-            rowspan?: import("../table/props").SpanFunctionString;
-            render?: import("../table/props").RenderFunctionString;
-            sort?: string | boolean | {
-                sortFn?: Function;
-                sortScope?: import("../table/props").SortScope;
-                value?: import("../table/const").SORT_OPTION;
-            };
-            filter?: string | boolean | {
-                list: any[];
-                filterFn?: Function;
-                match?: import("../table/props").FullEnum;
-                checked?: any[];
-                filterScope?: import("../table/props").SortScope;
-                btnSave?: string | boolean;
-                btnReset?: string | boolean;
-                height?: number;
-                maxHeight?: number;
-            };
-            type?: "index" | "expand" | "__COL_TYPE_NONE" | "selection";
-            label?: import("../table/props").LabelFunctionString;
-            width?: string | number;
-            className?: import("../table/props").RowClassFunctionString;
-            align?: "" | "left" | "right" | "center";
-            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;
-                resizerWay?: import("../table/props").ResizerWay;
-                showHead?: boolean;
-            };
-            field: import("../table/props").LabelFunctionString;
-            prop?: import("../table/props").LabelFunctionString;
-        };
-    }, {}, {}, {}, {
+    }>>, () => import("vue").VNode<import("vue").RendererNode, import("vue").RendererElement, {
+        [key: string]: any;
+    }>[], {}, {}, {}, {
         fixed: boolean | "left" | "right";
         resizable: boolean;
         minWidth: string | number;
@@ -270,51 +186,9 @@ declare const BkTableColumn: {
     } & {
         default: number;
     };
-}>>, {
-    column: {
-        fixed?: boolean | "left" | "right";
-        resizable?: boolean;
-        minWidth?: string | number;
-        index?: number;
-        columnKey?: string;
-        colspan?: import("../table/props").SpanFunctionString;
-        rowspan?: import("../table/props").SpanFunctionString;
-        render?: import("../table/props").RenderFunctionString;
-        sort?: string | boolean | {
-            sortFn?: Function;
-            sortScope?: import("../table/props").SortScope;
-            value?: import("../table/const").SORT_OPTION;
-        };
-        filter?: string | boolean | {
-            list: any[];
-            filterFn?: Function;
-            match?: import("../table/props").FullEnum;
-            checked?: any[];
-            filterScope?: import("../table/props").SortScope;
-            btnSave?: string | boolean;
-            btnReset?: string | boolean;
-            height?: number;
-            maxHeight?: number;
-        };
-        type?: "index" | "expand" | "__COL_TYPE_NONE" | "selection";
-        label?: import("../table/props").LabelFunctionString;
-        width?: string | number;
-        className?: import("../table/props").RowClassFunctionString;
-        align?: "" | "left" | "right" | "center";
-        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;
-            resizerWay?: import("../table/props").ResizerWay;
-            showHead?: boolean;
-        };
-        field: import("../table/props").LabelFunctionString;
-        prop?: import("../table/props").LabelFunctionString;
-    };
-}, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, {
+}>>, () => import("vue").VNode<import("vue").RendererNode, import("vue").RendererElement, {
+    [key: string]: any;
+}>[], unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, {
     fixed: boolean | "left" | "right";
     resizable: boolean;
     minWidth: string | number;