bhd-components 0.7.38 → 0.7.40

package/es2017/bhdAppLayout/index.js

@@ -5,7 +5,7 @@ import * as React from "react";
 import { useState, useLayoutEffect, useRef } from "react";
 import styles from "./index.module.less";
 import TitleBar from "../titleBar";
-import { Pagination } from "antd";
+import Pagination from "../pagination/index";
 import i18Conversion from "../i18n";
 import BhdTableSimple from "./components/BhdTableSimple/index";
 function BhdAppLayout(props) {

package/es2017/table/index.js

@@ -34,13 +34,13 @@ const getParentWidth = (node)=>{
 /* 记录的滚动条宽度 */ let recordScrollBarWidth = 0;
 function getScrollbarWidth() {
     // Creating invisible container
-    const outer = document.createElement('div');
-    outer.style.visibility = 'hidden';
-    outer.style.overflow = 'scroll'; // forcing scrollbar to appear
+    const outer = document.createElement("div");
+    outer.style.visibility = "hidden";
+    outer.style.overflow = "scroll"; // forcing scrollbar to appear
     // outer.style.msOverflowStyle = 'scrollbar'; // needed for WinJS apps
     document.body.appendChild(outer);
     // Creating inner element and placing it in the container
-    const inner = document.createElement('div');
+    const inner = document.createElement("div");
     outer.appendChild(inner);
     // Calculating difference between container's full width and the child width
     const scrollbarWidth = outer.offsetWidth - inner.offsetWidth;
@@ -67,7 +67,12 @@ const Table = (props)=>{
         // )[0];
         const scrollBarWidth = getScrollbarWidth();
         recordScrollBarWidth = scrollBarWidth || recordScrollBarWidth;
-        const tableWidth = bordered ? tableRef.current.offsetWidth - 2 - recordScrollBarWidth : tableRef.current.offsetWidth - recordScrollBarWidth;
+        let tableWidth = bordered ? tableRef.current.offsetWidth - 2 - recordScrollBarWidth : tableRef.current.offsetWidth - recordScrollBarWidth;
+        if (props.rowSelection) {
+            //多选框
+            let selectWidth = kind === "simple" ? 40 : 72;
+            tableWidth -= selectWidth;
+        }
         let { columns: selfColumns  } = initColumnsWidth(props.columns, tableWidth);
         setColumns(selfColumns);
         let obj = scrollObject ? scrollObject : {};

package/esm/bhdAppLayout/index.js

@@ -6,7 +6,7 @@ import * as React from "react";
 import { useState, useLayoutEffect, useRef } from "react";
 import styles from "./index.module.less";
 import TitleBar from "../titleBar";
-import { Pagination } from "antd";
+import Pagination from "../pagination/index";
 import i18Conversion from "../i18n";
 import BhdTableSimple from "./components/BhdTableSimple/index";
 function BhdAppLayout(props) {

package/esm/table/index.js

@@ -69,6 +69,11 @@ var Table = function(props) {
         var scrollBarWidth = getScrollbarWidth();
         recordScrollBarWidth = scrollBarWidth || recordScrollBarWidth;
         var tableWidth = bordered ? tableRef.current.offsetWidth - 2 - recordScrollBarWidth : tableRef.current.offsetWidth - recordScrollBarWidth;
+        if (props.rowSelection) {
+            //多选框
+            var selectWidth = kind === "simple" ? 40 : 72;
+            tableWidth -= selectWidth;
+        }
         var _initColumnsWidth = initColumnsWidth(props.columns, tableWidth), selfColumns = _initColumnsWidth.columns;
         setColumns(selfColumns);
         var obj = scrollObject ? scrollObject : {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bhd-components",
-  "version": "0.7.38",
+  "version": "0.7.40",
   "description": "组件功能描述",
   "files": [
     "esm",