bhd-components 0.2.9 → 0.3.0

package/dist/table.esm.es5.development.js

@@ -74,6 +74,7 @@ var getParentWidth = function(node) {
 };
 // const defaultWidthRang: widthRangType = [180, 240, 320]; //默认自适应的值  [最小值,最佳值,最大值]
 //传入的参数为onCell==>需要进行函数合并
+/* 记录的滚动条宽度 */ var recordScrollBarWidth = 0;
 var Table = function(props) {
     var tableRef = useRef(null);
     var timerRef = useRef({
@@ -90,8 +91,8 @@ var Table = function(props) {
     var initColumns = function() {
         var scrollBarDom = tableRef.current.getElementsByClassName("bhd-table-cell-scrollbar")[0];
         var scrollBarWidth = scrollBarDom ? scrollBarDom.clientWidth : 0;
-        var tableWidth = bordered ? tableRef.current.offsetWidth - 2 - scrollBarWidth : tableRef.current.offsetWidth - scrollBarWidth;
-        console.log("gaodug", scrollBarWidth);
+        recordScrollBarWidth = scrollBarWidth || recordScrollBarWidth;
+        var tableWidth = bordered ? tableRef.current.offsetWidth - 2 - recordScrollBarWidth : tableRef.current.offsetWidth - recordScrollBarWidth;
         var _initColumnsWidth = initColumnsWidth(props.columns, tableWidth), selfColumns = _initColumnsWidth.columns;
         setColumns(selfColumns);
         var obj = scrollObject ? scrollObject : {};
@@ -240,6 +241,11 @@ var Table = function(props) {
     }, [
         props.columns
     ]);
+    useEffect(function() {
+        setScrollObject(props.scroll || undefined);
+    }, [
+        props.scroll
+    ]);
     var config = _object_spread_props(_object_spread({
         bordered: false
     }, props), {

package/dist/table.esm.es5.production.js

@@ -1 +1 @@
-import{_ as t,j as e,a as n,b as o,T as i,c as r}from"./ae211df8.esm.es5.production.js";import{useState as l,useRef as a,useEffect as d}from"react";import"react/jsx-runtime";import"react-dom";var u={Table:"index_module_Table__5278674b",SmallTable:"index_module_SmallTable__5278674b",columnTootipClassName:"index_module_columnTootipClassName__5278674b"},c=function(t){var e=arguments.length>1&&void 0!==arguments[1]?arguments[1]:14,n=0,o=document.createElement("div");return o.style.position="absolute",o.style.whiteSpace="nowrap",o.style.fontSize=e+"px",o.style.opacity="0",o.innerText=t,document.body.append(o),n=o.getBoundingClientRect().width,document.body.removeChild(o),n},s=function(r){var a=r.children,d=r.title,u=r.width,s=t(l(!1),2),m=s[0],h=s[1];return e(i,n(o({},r),{open:m,children:e("span",{onMouseEnter:function(t){var e=0;(e="function"==typeof u?u(t):u)?h(!(c(d)<e)):h(!0)},onMouseLeave:function(){h(!1)},children:a})}))},m=/^\d+%$/,h=/^\d+px$/,w=function(t){var e={};return parseFloat((e=window.getComputedStyle?getComputedStyle(t,null):t.currentStyle)["padding-left"])+parseFloat(e["padding-right"])},f=function(t){try{for(;t&&"TD"!==t.nodeName;)t=t.parentElement;var e=w(t);return t.clientWidth-e}catch(t){return null}},p=function(i){var c=a(null),w=a({timer:null}),p=i.defaultWidthRang,C=void 0===p?[180,240,320]:p,g=i.isFixedLeft,v=void 0===g||g,T=i.isFixedRight,E=void 0===T||T,N=i.bordered,_=void 0!==N&&N,y=i.kind,b=t(l(i.columns||[]),2),L=b[0],x=b[1],S=t(l(i.scroll||void 0),2),R=S[0],O=S[1],F=i.columnTootipClassName,I=i.columnTootipColor,W=function(){var t=c.current.getElementsByClassName("bhd-table-cell-scrollbar")[0],e=t?t.clientWidth:0,r=_?c.current.offsetWidth-2-e:c.current.offsetWidth-e;console.log("gaodug",e);var l=M(i.columns,r).columns;x(l);var a=R||{};a=n(o({},a),{x:r}),O(a)},M=function(t,i){var r=0,l=0,a=0;t=t.map(function(t){return t.width=t.width||"auto",m.test(t.width)?t.width=parseFloat(t.width)>=100?"auto":i*parseFloat(t.width)/100:"number"==typeof t.width?t.width=t.width:h.test(t.width)?t.width=parseFloat(t.width):t.width="auto","auto"===t.width?(r+=1,t.widthRang||(t.widthRang=C),l+=t.widthRang[0],a+=t.widthRang[1]):(l+=t.width,a+=t.width),t.onColumnCell||(t.onColumnCell=t.onCell||function(){return{}}),t.render||(t.ellipsis={showTitle:!1},t.render=function(t){return e(s,{width:function(t){return f(t.target)},title:t,trigger:"hover",overlayClassName:F||u.columnTootipClassName,color:I||"#FFF",children:e("span",{children:t})})}),t});var d=i-l;if(d>0){var c=0;t=(t=t.map(function(t){return"auto"===t.width&&(t.width=t.widthRang[0]+d/r,t.width>t.widthRang[2]&&(c+=t.width-t.widthRang[2],t.width=t.widthRang[2])),t})).map(function(e,n){return c>0&&n!==t.length-1&&(e.width+=c/t.length-1),e})}else t=d<0?t.map(function(e,n){return v&&0===n&&(e.fixed="left"),E&&n===t.length-1&&(e.fixed="right"),"auto"===e.width&&(e.width=e.widthRang[1]),e}):t.map(function(t){return"auto"===t.width&&(t.width=t.widthRang[0]),t});return t.map(function(t){return t.onCell=function(e,i){var r="function"==typeof t.onColumnCell?t.onColumnCell(e,i):{};return r.style=r.style?r.style:{},n(o({},r),{style:o({maxWidth:t.width+"px"},r.style)})},t}),{columns:t,scrollWidth:a}},A=function(){clearTimeout(w.current.timer),w.current.timer=setTimeout(function(){W()},1e3)};d(function(){return W(),window.addEventListener("resize",A),function(){clearTimeout(w.current.timer),window.removeEventListener("resize",A)}},[i.columns]);var U=n(o({bordered:!1},i),{columns:L,scroll:R||{x:"auto"}});return e("div",{className:"".concat(u.Table," ").concat("simple"===y?u.SmallTable:""),ref:c,children:e(r,o({},U))})};p.SELECTION_COLUMN=r.SELECTION_COLUMN,p.EXPAND_COLUMN=r.EXPAND_COLUMN,p.SELECTION_ALL=r.SELECTION_ALL,p.SELECTION_INVERT=r.SELECTION_INVERT,p.SELECTION_NONE=r.SELECTION_NONE,p.Column=r.Column,p.ColumnGroup=r.ColumnGroup;export{p as default};
+import{_ as t,j as e,a as n,b as i,T as o,c as r}from"./ae211df8.esm.es5.production.js";import{useState as l,useRef as a,useEffect as d}from"react";import"react/jsx-runtime";import"react-dom";var u={Table:"index_module_Table__5278674b",SmallTable:"index_module_SmallTable__5278674b",columnTootipClassName:"index_module_columnTootipClassName__5278674b"},c=function(t){var e=arguments.length>1&&void 0!==arguments[1]?arguments[1]:14,n=0,i=document.createElement("div");return i.style.position="absolute",i.style.whiteSpace="nowrap",i.style.fontSize=e+"px",i.style.opacity="0",i.innerText=t,document.body.append(i),n=i.getBoundingClientRect().width,document.body.removeChild(i),n},s=function(r){var a=r.children,d=r.title,u=r.width,s=t(l(!1),2),m=s[0],h=s[1];return e(o,n(i({},r),{open:m,children:e("span",{onMouseEnter:function(t){var e=0;(e="function"==typeof u?u(t):u)?h(!(c(d)<e)):h(!0)},onMouseLeave:function(){h(!1)},children:a})}))},m=/^\d+%$/,h=/^\d+px$/,w=function(t){var e={};return parseFloat((e=window.getComputedStyle?getComputedStyle(t,null):t.currentStyle)["padding-left"])+parseFloat(e["padding-right"])},f=function(t){try{for(;t&&"TD"!==t.nodeName;)t=t.parentElement;var e=w(t);return t.clientWidth-e}catch(t){return null}},p=0,C=function(o){var c=a(null),w=a({timer:null}),C=o.defaultWidthRang,v=void 0===C?[180,240,320]:C,T=o.isFixedLeft,g=void 0===T||T,E=o.isFixedRight,N=void 0===E||E,_=o.bordered,y=void 0!==_&&_,b=o.kind,L=t(l(o.columns||[]),2),x=L[0],S=L[1],R=t(l(o.scroll||void 0),2),O=R[0],F=R[1],I=o.columnTootipClassName,W=o.columnTootipColor,M=function(){var t=c.current.getElementsByClassName("bhd-table-cell-scrollbar")[0];p=(t?t.clientWidth:0)||p;var e=y?c.current.offsetWidth-2-p:c.current.offsetWidth-p,r=A(o.columns,e).columns;S(r);var l=O||{};l=n(i({},l),{x:e}),F(l)},A=function(t,o){var r=0,l=0,a=0;t=t.map(function(t){return t.width=t.width||"auto",m.test(t.width)?t.width=parseFloat(t.width)>=100?"auto":o*parseFloat(t.width)/100:"number"==typeof t.width?t.width=t.width:h.test(t.width)?t.width=parseFloat(t.width):t.width="auto","auto"===t.width?(r+=1,t.widthRang||(t.widthRang=v),l+=t.widthRang[0],a+=t.widthRang[1]):(l+=t.width,a+=t.width),t.onColumnCell||(t.onColumnCell=t.onCell||function(){return{}}),t.render||(t.ellipsis={showTitle:!1},t.render=function(t){return e(s,{width:function(t){return f(t.target)},title:t,trigger:"hover",overlayClassName:I||u.columnTootipClassName,color:W||"#FFF",children:e("span",{children:t})})}),t});var d=o-l;if(d>0){var c=0;t=(t=t.map(function(t){return"auto"===t.width&&(t.width=t.widthRang[0]+d/r,t.width>t.widthRang[2]&&(c+=t.width-t.widthRang[2],t.width=t.widthRang[2])),t})).map(function(e,n){return c>0&&n!==t.length-1&&(e.width+=c/t.length-1),e})}else t=d<0?t.map(function(e,n){return g&&0===n&&(e.fixed="left"),N&&n===t.length-1&&(e.fixed="right"),"auto"===e.width&&(e.width=e.widthRang[1]),e}):t.map(function(t){return"auto"===t.width&&(t.width=t.widthRang[0]),t});return t.map(function(t){return t.onCell=function(e,o){var r="function"==typeof t.onColumnCell?t.onColumnCell(e,o):{};return r.style=r.style?r.style:{},n(i({},r),{style:i({maxWidth:t.width+"px"},r.style)})},t}),{columns:t,scrollWidth:a}},U=function(){clearTimeout(w.current.timer),w.current.timer=setTimeout(function(){M()},1e3)};d(function(){return M(),window.addEventListener("resize",U),function(){clearTimeout(w.current.timer),window.removeEventListener("resize",U)}},[o.columns]),d(function(){F(o.scroll||void 0)},[o.scroll]);var j=n(i({bordered:!1},o),{columns:x,scroll:O||{x:"auto"}});return e("div",{className:"".concat(u.Table," ").concat("simple"===b?u.SmallTable:""),ref:c,children:e(r,i({},j))})};C.SELECTION_COLUMN=r.SELECTION_COLUMN,C.EXPAND_COLUMN=r.EXPAND_COLUMN,C.SELECTION_ALL=r.SELECTION_ALL,C.SELECTION_INVERT=r.SELECTION_INVERT,C.SELECTION_NONE=r.SELECTION_NONE,C.Column=r.Column,C.ColumnGroup=r.ColumnGroup;export{C as default};

package/es2017/table/index.js

@@ -31,6 +31,7 @@ const getParentWidth = (node)=>{
 };
 // const defaultWidthRang: widthRangType = [180, 240, 320]; //默认自适应的值  [最小值,最佳值,最大值]
 //传入的参数为onCell==>需要进行函数合并
+/* 记录的滚动条宽度 */ let recordScrollBarWidth = 0;
 const Table = (props)=>{
     const tableRef = useRef(null);
     const timerRef = useRef({
@@ -47,8 +48,8 @@ const Table = (props)=>{
     const initColumns = ()=>{
         let scrollBarDom = tableRef.current.getElementsByClassName("bhd-table-cell-scrollbar")[0];
         const scrollBarWidth = scrollBarDom ? scrollBarDom.clientWidth : 0;
-        const tableWidth = bordered ? tableRef.current.offsetWidth - 2 - scrollBarWidth : tableRef.current.offsetWidth - scrollBarWidth;
-        console.log("gaodug", scrollBarWidth);
+        recordScrollBarWidth = scrollBarWidth || recordScrollBarWidth;
+        const tableWidth = bordered ? tableRef.current.offsetWidth - 2 - recordScrollBarWidth : tableRef.current.offsetWidth - recordScrollBarWidth;
         let { columns: selfColumns  } = initColumnsWidth(props.columns, tableWidth);
         setColumns(selfColumns);
         let obj = scrollObject ? scrollObject : {};
@@ -193,6 +194,11 @@ const Table = (props)=>{
     }, [
         props.columns
     ]);
+    useEffect(()=>{
+        setScrollObject(props.scroll || undefined);
+    }, [
+        props.scroll
+    ]);
     let config = _object_spread_props(_object_spread({
         bordered: false
     }, props), {
@@ -202,7 +208,7 @@ const Table = (props)=>{
         }
     });
     return /*#__PURE__*/ _jsx("div", {
-        className: `${styles.Table} ${kind === "simple" ? styles.SmallTable : ''}`,
+        className: `${styles.Table} ${kind === "simple" ? styles.SmallTable : ""}`,
         ref: tableRef,
         children: /*#__PURE__*/ _jsx(AntdTable, _object_spread({}, config))
     });

package/esm/table/index.js

@@ -32,6 +32,7 @@ var getParentWidth = function(node) {
 };
 // const defaultWidthRang: widthRangType = [180, 240, 320]; //默认自适应的值  [最小值,最佳值,最大值]
 //传入的参数为onCell==>需要进行函数合并
+/* 记录的滚动条宽度 */ var recordScrollBarWidth = 0;
 var Table = function(props) {
     var tableRef = useRef(null);
     var timerRef = useRef({
@@ -48,8 +49,8 @@ var Table = function(props) {
     var initColumns = function() {
         var scrollBarDom = tableRef.current.getElementsByClassName("bhd-table-cell-scrollbar")[0];
         var scrollBarWidth = scrollBarDom ? scrollBarDom.clientWidth : 0;
-        var tableWidth = bordered ? tableRef.current.offsetWidth - 2 - scrollBarWidth : tableRef.current.offsetWidth - scrollBarWidth;
-        console.log("gaodug", scrollBarWidth);
+        recordScrollBarWidth = scrollBarWidth || recordScrollBarWidth;
+        var tableWidth = bordered ? tableRef.current.offsetWidth - 2 - recordScrollBarWidth : tableRef.current.offsetWidth - recordScrollBarWidth;
         var _initColumnsWidth = initColumnsWidth(props.columns, tableWidth), selfColumns = _initColumnsWidth.columns;
         setColumns(selfColumns);
         var obj = scrollObject ? scrollObject : {};
@@ -198,6 +199,11 @@ var Table = function(props) {
     }, [
         props.columns
     ]);
+    useEffect(function() {
+        setScrollObject(props.scroll || undefined);
+    }, [
+        props.scroll
+    ]);
     var config = _object_spread_props(_object_spread({
         bordered: false
     }, props), {

package/package.json

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