bhd-components 0.7.31 → 0.7.33

package/es2017/bhdAppLayout/components/BhdTableSimple/index.js

@@ -16,7 +16,19 @@ import i18Conversion from "../../../i18n";
     className
     超长内容 出现滚动条  需在管理列定义好width   没有定义的max-width:300
  */ const BhdTableSimple = (props)=>{
-    let { className , locale , borderBottom =false , rowSelection , ajaxErr , dataSource , kind ="simple" , loading , notDataText =i18Conversion("noData")  } = props;
+    let { className ="" , locale , borderBottom =false , rowSelection , ajaxErr , dataSource , kind ="simple" , loading , notDataText =i18Conversion("noData") , components ={
+        table: null,
+        header: {
+            wrapper: null,
+            row: null,
+            cell: null
+        },
+        body: {
+            wrapper: null,
+            row: null,
+            cell: null
+        }
+    }  } = props;
     const renderTableText = ()=>{
         if (ajaxErr) {
             return /*#__PURE__*/ _jsxs("div", {
@@ -72,12 +84,30 @@ import i18Conversion from "../../../i18n";
             })
         ]
     });
+    if (kind === "simple") {
+        className += " app_BhdTableSimple_simple";
+    }
+    if (loading) {
+        if (!components.body) {
+            components.body = {
+                wrapper: null,
+                row: null,
+                cell: null
+            };
+        }
+        components = _object_spread_props(_object_spread({}, components.body), {
+            body: {
+                wrapper: ()=>loadingTable
+            }
+        });
+    }
     const tableProps = _object_spread_props(_object_spread({
         style: {
             width: "100%"
         }
     }, props), {
         loading: false,
+        components,
         dataSource: ajaxErr ? [] : dataSource,
         className: `app_BhdTableSimple ${className || " "} ${rowSelection ? "app_BhdTableSimple_rowSelection" : ""}`,
         locale: {
@@ -85,12 +115,6 @@ import i18Conversion from "../../../i18n";
         },
         scroll: props.scroll
     });
-    if (kind === "simple") {
-        className += " app_BhdTableSimple_simple";
-    }
-    if (loading) {
-        return loadingTable;
-    }
     return /*#__PURE__*/ _jsx(Table, _object_spread({}, tableProps));
 };
 export default BhdTableSimple;

package/es2017/bhdAppLayout/components/BhdTableSimple/index.less

@@ -43,9 +43,8 @@
   justify-content: center;
   flex-direction: column;
   position: absolute;
-  top: 50%;
   left: 50%;
-  transform: translate(-50%, -50%);
+  transform: translateX(-50%);
   img {
     margin-bottom: 24px;
   }

package/es2017/customerService/screenshotTool.js

@@ -5,7 +5,7 @@ import { CloseOutlined } from "@ant-design/icons";
 import { CustomDuihao } from "../icons/index";
 import "react-image-crop/dist/ReactCrop.css";
 import styles from "./index.module.less";
-const ScreenshotTool = /*#__PURE__*/ forwardRef((props)=>{
+const ScreenshotTool = /*#__PURE__*/ forwardRef((props, ref)=>{
     let { imgBese64 , saveScreenshotBese64 , cancelScreenshot  } = props;
     const [crop, setCrop] = useState();
     const [completedCrop, setCompletedCrop] = useState();

package/es2017/table/index.js

@@ -81,6 +81,8 @@ const Table = (props)=>{
         let minWidth = 0; //最小宽度
         let scrollWidth = 0; //出现滚动条时 滚动宽度
         columns = columns.map((item)=>{
+            // 克隆columns里的每项 保证每次拿到width都是唯一的
+            item = _object_spread({}, item);
             item.width = item.width || "auto";
             // item.width=parseFloat(item.width)
             if (widthPercentage.test(item.width)) {

package/esm/bhdAppLayout/components/BhdTableSimple/index.js

@@ -16,7 +16,19 @@ import i18Conversion from "../../../i18n";
     className
     超长内容 出现滚动条  需在管理列定义好width   没有定义的max-width:300
  */ var BhdTableSimple = function(props) {
-    var className = props.className, locale = props.locale, _props_borderBottom = props.borderBottom, borderBottom = _props_borderBottom === void 0 ? false : _props_borderBottom, rowSelection = props.rowSelection, ajaxErr = props.ajaxErr, dataSource = props.dataSource, _props_kind = props.kind, kind = _props_kind === void 0 ? "simple" : _props_kind, loading = props.loading, _props_notDataText = props.notDataText, notDataText = _props_notDataText === void 0 ? i18Conversion("noData") : _props_notDataText;
+    var _props_className = props.className, className = _props_className === void 0 ? "" : _props_className, locale = props.locale, _props_borderBottom = props.borderBottom, borderBottom = _props_borderBottom === void 0 ? false : _props_borderBottom, rowSelection = props.rowSelection, ajaxErr = props.ajaxErr, dataSource = props.dataSource, _props_kind = props.kind, kind = _props_kind === void 0 ? "simple" : _props_kind, loading = props.loading, _props_notDataText = props.notDataText, notDataText = _props_notDataText === void 0 ? i18Conversion("noData") : _props_notDataText, _props_components = props.components, components = _props_components === void 0 ? {
+        table: null,
+        header: {
+            wrapper: null,
+            row: null,
+            cell: null
+        },
+        body: {
+            wrapper: null,
+            row: null,
+            cell: null
+        }
+    } : _props_components;
     var renderTableText = function() {
         if (ajaxErr) {
             return /*#__PURE__*/ _jsxs("div", {
@@ -72,12 +84,32 @@ import i18Conversion from "../../../i18n";
             })
         ]
     });
+    if (kind === "simple") {
+        className += " app_BhdTableSimple_simple";
+    }
+    if (loading) {
+        if (!components.body) {
+            components.body = {
+                wrapper: null,
+                row: null,
+                cell: null
+            };
+        }
+        components = _object_spread_props(_object_spread({}, components.body), {
+            body: {
+                wrapper: function() {
+                    return loadingTable;
+                }
+            }
+        });
+    }
     var tableProps = _object_spread_props(_object_spread({
         style: {
             width: "100%"
         }
     }, props), {
         loading: false,
+        components: components,
         dataSource: ajaxErr ? [] : dataSource,
         className: "app_BhdTableSimple ".concat(className || " ", " ").concat(rowSelection ? "app_BhdTableSimple_rowSelection" : ""),
         locale: {
@@ -85,12 +117,6 @@ import i18Conversion from "../../../i18n";
         },
         scroll: props.scroll
     });
-    if (kind === "simple") {
-        className += " app_BhdTableSimple_simple";
-    }
-    if (loading) {
-        return loadingTable;
-    }
     return /*#__PURE__*/ _jsx(Table, _object_spread({}, tableProps));
 };
 export default BhdTableSimple;

package/esm/bhdAppLayout/components/BhdTableSimple/index.less

@@ -43,9 +43,8 @@
   justify-content: center;
   flex-direction: column;
   position: absolute;
-  top: 50%;
   left: 50%;
-  transform: translate(-50%, -50%);
+  transform: translateX(-50%);
   img {
     margin-bottom: 24px;
   }

package/esm/customerService/screenshotTool.js

@@ -6,7 +6,7 @@ import { CloseOutlined } from "@ant-design/icons";
 import { CustomDuihao } from "../icons/index";
 import "react-image-crop/dist/ReactCrop.css";
 import styles from "./index.module.less";
-var ScreenshotTool = /*#__PURE__*/ forwardRef(function(props) {
+var ScreenshotTool = /*#__PURE__*/ forwardRef(function(props, ref) {
     var centerAspectCrop = function centerAspectCrop(mediaWidth, mediaHeight, aspect) {
         return centerCrop(makeAspectCrop({
             unit: "%",

package/esm/table/index.js

@@ -82,6 +82,8 @@ var Table = function(props) {
         var minWidth = 0; //最小宽度
         var scrollWidth = 0; //出现滚动条时 滚动宽度
         columns = columns.map(function(item) {
+            // 克隆columns里的每项 保证每次拿到width都是唯一的
+            item = _object_spread({}, item);
             item.width = item.width || "auto";
             // item.width=parseFloat(item.width)
             if (widthPercentage.test(item.width)) {

package/package.json

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