shineout 3.0.0-alpha.13 → 3.0.0-alpha.14

package/cjs/index.js

@@ -433,6 +433,6 @@ exports.TYPE = _TYPE;
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 var _default = {
-  version: '3.0.0-alpha.13'
+  version: '3.0.0-alpha.14'
 };
 exports.default = _default;

package/dist/shineout.js

@@ -19054,7 +19054,7 @@ var handleStyle = function handleStyle(style) {
 };
 /* harmony default export */ var jss_style_handleStyle = (handleStyle);
 ;// CONCATENATED MODULE: ../shineout-style/src/version.ts
-/* harmony default export */ var version = ('3.0.0-alpha.13');
+/* harmony default export */ var version = ('3.0.0-alpha.14');
 ;// CONCATENATED MODULE: ../shineout-style/src/jss-style/index.tsx
 
 
@@ -52612,8 +52612,6 @@ var usePagination = function usePagination(props) {
 ;// CONCATENATED MODULE: ../base/src/pagination/pagination.tsx
 
 
-var pagination_excluded = ["className", "jssStyle", "size", "align", "total", "pageSize", "defaultCurrent", "current", "span", "onChange", "layout", "mode", "simple", "disabled", "text", "pageSizeList"];
-
 
 
 
@@ -52646,7 +52644,7 @@ var Pagination = function Pagination(props) {
     _props$text = props.text,
     text = _props$text === void 0 ? {} : _props$text,
     pageSizeList = props.pageSizeList,
-    rest = objectWithoutProperties_default()(props, pagination_excluded);
+    style = props.style;
   var _usePagination = use_pagination({
       total: total,
       span: span,
@@ -52661,7 +52659,9 @@ var Pagination = function Pagination(props) {
   var paginationStyle = jssStyle === null || jssStyle === void 0 ? void 0 : (_jssStyle$pagination = jssStyle.pagination) === null || _jssStyle$pagination === void 0 ? void 0 : _jssStyle$pagination.call(jssStyle);
   var rootClasses = classnames_default()(className, paginationStyle === null || paginationStyle === void 0 ? void 0 : paginationStyle.pagination, align === 'left' && (paginationStyle === null || paginationStyle === void 0 ? void 0 : paginationStyle.left), align === 'center' && (paginationStyle === null || paginationStyle === void 0 ? void 0 : paginationStyle.center), align === 'right' && (paginationStyle === null || paginationStyle === void 0 ? void 0 : paginationStyle.right), size === 'small' && (paginationStyle === null || paginationStyle === void 0 ? void 0 : paginationStyle.small), size === 'large' && (paginationStyle === null || paginationStyle === void 0 ? void 0 : paginationStyle.large));
   var getRootProps = function getRootProps() {
-    return objectSpread2_default()({}, rest);
+    return {
+      style: style
+    };
   };
   if (simple || layout.includes('simple')) {
     return /*#__PURE__*/(0,jsx_runtime.jsx)("div", objectSpread2_default()(objectSpread2_default()({}, getRootProps()), {}, {
@@ -56379,22 +56379,26 @@ var useTableLayout = function useTableLayout(props) {
     setFloatRight = _React$useState10[1];
   var _React$useState11 = external_root_React_commonjs2_react_commonjs_react_amd_react_default().useState(0),
     _React$useState12 = slicedToArray_default()(_React$useState11, 2),
-    scrollBarWidth = _React$useState12[0],
-    setScrollBarWidth = _React$useState12[1];
+    resizeFlag = _React$useState12[0],
+    setResizeFlag = _React$useState12[1];
   var _React$useState13 = external_root_React_commonjs2_react_commonjs_react_amd_react_default().useState(0),
     _React$useState14 = slicedToArray_default()(_React$useState13, 2),
-    scrollWidth = _React$useState14[0],
-    setScrollWidth = _React$useState14[1];
-  var _React$useState15 = external_root_React_commonjs2_react_commonjs_react_amd_react_default().useState(props.columns.map(function (v) {
+    scrollBarWidth = _React$useState14[0],
+    setScrollBarWidth = _React$useState14[1];
+  var _React$useState15 = external_root_React_commonjs2_react_commonjs_react_amd_react_default().useState(0),
+    _React$useState16 = slicedToArray_default()(_React$useState15, 2),
+    scrollWidth = _React$useState16[0],
+    setScrollWidth = _React$useState16[1];
+  var _React$useState17 = external_root_React_commonjs2_react_commonjs_react_amd_react_default().useState(props.columns.map(function (v) {
       return v.width;
     })),
-    _React$useState16 = slicedToArray_default()(_React$useState15, 2),
-    colgroup = _React$useState16[0],
-    setColgroup = _React$useState16[1];
-  var _React$useState17 = external_root_React_commonjs2_react_commonjs_react_amd_react_default().useState(true),
     _React$useState18 = slicedToArray_default()(_React$useState17, 2),
-    adjust = _React$useState18[0],
-    setAdjust = _React$useState18[1];
+    colgroup = _React$useState18[0],
+    setColgroup = _React$useState18[1];
+  var _React$useState19 = external_root_React_commonjs2_react_commonjs_react_amd_react_default().useState(true),
+    _React$useState20 = slicedToArray_default()(_React$useState19, 2),
+    adjust = _React$useState20[0],
+    setAdjust = _React$useState20[1];
 
   // 检查滚动状态
   var checkScroll = use_persist_fn(function () {
@@ -56442,9 +56446,17 @@ var useTableLayout = function useTableLayout(props) {
     colEl.style.width = "".concat(w, "px");
     context.dragWidth = w;
   });
+  var updateResizeFlag = function updateResizeFlag() {
+    setResizeFlag(function (v) {
+      return (v + 1) % 10;
+    });
+  };
   var changeColGroup = function changeColGroup(cols, adjust) {
     setColgroup(cols);
     setAdjust(adjust);
+    if (!adjust) {
+      updateResizeFlag();
+    }
   };
 
   // 完成拖拽
@@ -56601,7 +56613,8 @@ var useTableLayout = function useTableLayout(props) {
     width: typeof props.width === 'number' ? props.width + deltaXSum : props.width,
     shouldLastColAuto: props.columnResizable && !adjust,
     scrollWidth: scrollWidth,
-    maxScrollLeft: scrollWidth - context.clientWidth
+    maxScrollLeft: scrollWidth - context.clientWidth,
+    resizeFlag: resizeFlag
   };
 };
 /* harmony default export */ var use_table_layout = (useTableLayout);
@@ -57816,7 +57829,7 @@ var Tr = function Tr(props) {
       var expandHeight = expandRef.current ? expandRef.current.offsetHeight : 0;
       props.setRowHeight(props.rowIndex, trRef.current.offsetHeight + expandHeight);
     }
-  }, [props.expanded, props.rowIndex, props.bodyScrollWidth]);
+  }, [props.expanded, props.rowIndex, props.bodyScrollWidth, props.resizeFlag]);
   var renderTreeExpand = function renderTreeExpand(content) {
     var treeIndent = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 22;
     var level = props.treeExpandLevel.get(props.originKey) || 0;
@@ -58078,7 +58091,8 @@ var Tr = function Tr(props) {
       onRowClick: props.onRowClick,
       rowEvents: props.rowEvents,
       disabled: props.datum.disabledCheck(item),
-      bodyScrollWidth: props.bodyScrollWidth
+      bodyScrollWidth: props.bodyScrollWidth,
+      resizeFlag: props.resizeFlag
     }, originKey);
   };
   return /*#__PURE__*/(0,jsx_runtime.jsx)("tbody", {
@@ -58297,7 +58311,8 @@ var scrollWrapperStyle = {
     shouldLastColAuto = _useTableLayout.shouldLastColAuto,
     maxScrollLeft = _useTableLayout.maxScrollLeft,
     scrollBarWidth = _useTableLayout.scrollBarWidth,
-    scrollWidth = _useTableLayout.scrollWidth;
+    scrollWidth = _useTableLayout.scrollWidth,
+    resizeFlag = _useTableLayout.resizeFlag;
   var _useTableSort = use_table_sort({
       data: props.data,
       sorter: props.sorter,
@@ -58428,7 +58443,8 @@ var scrollWrapperStyle = {
       radio: props.radio,
       onRowClick: props.onRowClick,
       rowEvents: props.rowEvents,
-      bodyScrollWidth: scrollWidth
+      bodyScrollWidth: scrollWidth,
+      resizeFlag: resizeFlag
     };
     var headCommonProps = {
       disabled: props.disabled,
@@ -64550,7 +64566,7 @@ var upload_interface = __webpack_require__(7818);
 
 
 /* harmony default export */ var src_0 = ({
-  version: '3.0.0-alpha.13'
+  version: '3.0.0-alpha.14'
 });
 }();
 /******/ 	return __webpack_exports__;