wargerm 0.4.5 → 0.4.8

package/dist/index.js

@@ -675,24 +675,6 @@ function FrameBox(_ref) {
   }), children);
 }
 
-var usePreventUnmountEffect = function usePreventUnmountEffect(callback, deps) {
-  // const isUnmountRef = useRef(false);
-  var _useState = React.useState(false),
-      _useState2 = _slicedToArray(_useState, 2),
-      isUnmount = _useState2[0],
-      setIsUnmount = _useState2[1];
-
-  React.useEffect(function () {
-    // !isUnmountRef.current && callback()
-    !isUnmount && callback();
-    return function () {
-      // isUnmountRef.current = true;
-      setIsUnmount(true);
-    };
-  }, // [isUnmountRef, ...deps],
-  [isUnmount].concat(_toConsumableArray(deps)));
-};
-
 var _excluded$2 = ["request", "valueEnum", "onLoad", "children", "params"],
     _excluded2 = ["children"];
 
@@ -719,7 +701,9 @@ var WSelect = function WSelect(props) {
       resList = _useState6[0],
       setResList = _useState6[1];
 
-  usePreventUnmountEffect(function () {
+  React.useEffect(function () {
+    var isUnmount = false;
+
     _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee() {
       var res, node;
       return regeneratorRuntime.wrap(function _callee$(_context) {
@@ -727,7 +711,7 @@ var WSelect = function WSelect(props) {
           switch (_context.prev = _context.next) {
             case 0:
               if (!request) {
-                _context.next = 8;
+                _context.next = 10;
                 break;
               }
 
@@ -736,6 +720,15 @@ var WSelect = function WSelect(props) {
 
             case 3:
               res = _context.sent;
+
+              if (!isUnmount) {
+                _context.next = 6;
+                break;
+              }
+
+              return _context.abrupt("return");
+
+            case 6:
               setResList(res);
               onLoad && onLoad(res);
               node = res.map(function (item) {
@@ -746,7 +739,7 @@ var WSelect = function WSelect(props) {
               });
               setChildrenNode(node);
 
-            case 8:
+            case 10:
             case "end":
               return _context.stop();
           }
@@ -782,6 +775,9 @@ var WSelect = function WSelect(props) {
 
     onLoad && onLoad(options);
     setValueEnumList(valueEnumNode);
+    return function () {
+      isUnmount = true;
+    };
   }, [JSON.stringify(params || {})]);
   return /*#__PURE__*/React__default['default'].createElement(_Select__default['default'], _objectSpread2({
     showSearch: true,
@@ -802,7 +798,7 @@ var Option = function Option(props) {
 
 var Index$4 = WSelect;
 Index$4.Option = Option;
-var Select = /*#__PURE__*/React__default['default'].memo(Index$4);
+var Select = /*#__PURE__*/React.memo(Index$4);
 
 //! moment.js
 //! version : 2.29.1
@@ -6648,7 +6644,9 @@ var TreeSelect = function TreeSelect(_ref) {
       treeData = _useState2[0],
       setTreeData = _useState2[1];
 
-  usePreventUnmountEffect(function () {
+  React.useEffect(function () {
+    var isUnmount = false;
+
     _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee() {
       var res;
       return regeneratorRuntime.wrap(function _callee$(_context) {
@@ -6656,7 +6654,7 @@ var TreeSelect = function TreeSelect(_ref) {
           switch (_context.prev = _context.next) {
             case 0:
               if (!request) {
-                _context.next = 8;
+                _context.next = 10;
                 break;
               }
 
@@ -6665,21 +6663,34 @@ var TreeSelect = function TreeSelect(_ref) {
 
             case 3:
               res = _context.sent;
+
+              if (!isUnmount) {
+                _context.next = 6;
+                break;
+              }
+
+              return _context.abrupt("return");
+
+            case 6:
               onLoad && onLoad(res);
               setTreeData(res);
-              _context.next = 9;
+              _context.next = 11;
               break;
 
-            case 8:
+            case 10:
               setTreeData(treePropsData || []);
 
-            case 9:
+            case 11:
             case "end":
               return _context.stop();
           }
         }
       }, _callee);
     }))();
+
+    return function () {
+      isUnmount = true;
+    };
   }, [JSON.stringify(params)]);
   return /*#__PURE__*/React__default['default'].createElement(_TreeSelect__default['default'], _objectSpread2({
     showSearch: true,
@@ -6707,33 +6718,55 @@ var WCascader = function WCascader(props) {
       resList = _useState2[0],
       setResList = _useState2[1];
 
-  usePreventUnmountEffect(function () {
-    _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee() {
-      var res;
-      return regeneratorRuntime.wrap(function _callee$(_context) {
-        while (1) {
-          switch (_context.prev = _context.next) {
-            case 0:
-              if (!request) {
-                _context.next = 6;
-                break;
-              }
+  React.useEffect(function () {
+    var isUnmount = false;
 
-              _context.next = 3;
-              return request();
+    var fetch = /*#__PURE__*/function () {
+      var _ref = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee() {
+        var res;
+        return regeneratorRuntime.wrap(function _callee$(_context) {
+          while (1) {
+            switch (_context.prev = _context.next) {
+              case 0:
+                if (!request) {
+                  _context.next = 8;
+                  break;
+                }
 
-            case 3:
-              res = _context.sent;
-              setResList(res);
-              onLoad && onLoad(res);
+                _context.next = 3;
+                return request();
 
-            case 6:
-            case "end":
-              return _context.stop();
+              case 3:
+                res = _context.sent;
+
+                if (!isUnmount) {
+                  _context.next = 6;
+                  break;
+                }
+
+                return _context.abrupt("return");
+
+              case 6:
+                setResList(res);
+                onLoad && onLoad(res);
+
+              case 8:
+              case "end":
+                return _context.stop();
+            }
           }
-        }
-      }, _callee);
-    }))();
+        }, _callee);
+      }));
+
+      return function fetch() {
+        return _ref.apply(this, arguments);
+      };
+    }();
+
+    fetch();
+    return function () {
+      isUnmount = true;
+    };
   }, [JSON.stringify(params)]);
   return /*#__PURE__*/React__default['default'].createElement(_Cascader__default['default'], _objectSpread2({
     value: typeof value === 'string' ? [value] : value,
@@ -7968,7 +8001,7 @@ var WForm$1 = /*#__PURE__*/React__default['default'].forwardRef(WForm);
 
 var _excluded$7 = ["columns", "dataSource", "request", "onLoad", "params", "onSubmit", "rowKey", "onRow", "className", "rowClassName", "rowSelection", "style", "tbodyStyle", "thStyle", "border", "scroll", "pagination", "search", "frameBoxTable", "frameBoxDirection", "formRef", "none"];
 function Table(_ref) {
-  var _formSearchRef$curren4, _classnames2;
+  var _formSearchRef$curren4, _classnames2, _columns$, _columns$2;
 
   var columns = _ref.columns,
       tableList = _ref.dataSource,
@@ -8081,6 +8114,22 @@ function Table(_ref) {
       return !c.hideInTable;
     });
   }, [columns]);
+
+  var calcWidth = function calcWidth(columns) {
+    return columns.reduce(function (pre, cur) {
+      var width = cur.width;
+
+      if (width) {
+        return pre + width;
+      }
+
+      return pre;
+    }, 0);
+  };
+
+  var showColumns = columns.filter(function (c) {
+    return !c.hideInTable;
+  });
   var renderTh = React.useMemo(function () {
     var renderThFc = function renderThFc(columns, parentHeight, isChild) {
       var showColumns = columns.filter(function (c) {
@@ -8118,13 +8167,17 @@ function Table(_ref) {
         } else {
           return /*#__PURE__*/React__default['default'].createElement("div", {
             key: c.dataIndex,
-            style: {
+            style: _objectSpread2({
               width: c.width + 'px',
               flex: c.width ? '0 1 auto' : '1',
               height: !c.children ? '100%' : '32px',
               borderRight: index != showColumns.length - 1 && filterColumns.length !== showColumns.length ? '1px solid #3b5173' : 'none'
-            },
-            className: "td"
+            }, c.fixed == 'left' ? {
+              left: ((rowSelection === null || rowSelection === void 0 ? void 0 : rowSelection.type) ? 56 : 6) + calcWidth(showColumns.slice(0, index - 2 > 0 ? index - 1 : 0))
+            } : c.fixed == 'right' ? {
+              right: calcWidth(showColumns.slice(index + 1))
+            } : {}),
+            className: "td ".concat(c.fixed == 'left' ? 'fixedLeft' : c.fixed == 'right' ? 'fixedRight' : '')
           }, c.title);
         }
       });
@@ -8166,12 +8219,16 @@ function Table(_ref) {
               placement: "top",
               title: record[c.dataIndex]
             }, /*#__PURE__*/React__default['default'].createElement("div", {
-              className: 'td' + (c.ellipsis ? ' ellipsis' : ''),
-              style: {
+              className: "td ".concat(c.fixed == 'left' ? 'fixedLeft' : c.fixed == 'right' ? 'fixedRight' : '', " ").concat(c.ellipsis ? ' ellipsis' : ''),
+              style: _objectSpread2({
                 width: c.width + 'px',
                 flex: c.width ? '0 1 auto' : '1',
                 overflow: 'hidden'
-              }
+              }, c.fixed == 'left' ? {
+                left: ((rowSelection === null || rowSelection === void 0 ? void 0 : rowSelection.type) ? 56 : 6) + calcWidth(showColumns.slice(0, index - 2 > 0 ? index - 1 : 0))
+              } : c.fixed == 'right' ? {
+                right: calcWidth(showColumns.slice(index + 1))
+              } : {})
             }, /*#__PURE__*/React__default['default'].createElement("div", {
               style: {
                 width: '100%',
@@ -8187,12 +8244,16 @@ function Table(_ref) {
 
             return /*#__PURE__*/React__default['default'].createElement("div", {
               key: c.dataIndex,
-              className: 'td' + (c.ellipsis ? ' ellipsis' : ''),
-              style: {
+              className: "td ".concat(c.fixed == 'left' ? 'fixedLeft' : c.fixed == 'right' ? 'fixedRight' : '', " ").concat(c.ellipsis ? ' ellipsis' : ''),
+              style: _objectSpread2({
                 width: c.width + 'px',
                 flex: c.width ? '0 1 auto' : '1',
                 overflow: 'hidden'
-              },
+              }, c.fixed == 'left' ? {
+                left: ((rowSelection === null || rowSelection === void 0 ? void 0 : rowSelection.type) ? 56 : 6) + calcWidth(showColumns.slice(0, index - 2 > 0 ? index - 1 : 0))
+              } : c.fixed == 'right' ? {
+                right: calcWidth(showColumns.slice(index + 1))
+              } : {}),
               title: record[c.dataIndex]
             }, c.ellipsis ? /*#__PURE__*/React__default['default'].createElement("div", {
               style: {
@@ -8223,11 +8284,13 @@ function Table(_ref) {
         tr: true
       }, typeof rowClassName === 'function' ? rowClassName(record, index) : '', true))
     }, typeof onRow === 'function' ? onRow(record, index) : {}), (rowSelection === null || rowSelection === void 0 ? void 0 : rowSelection.type) === 'checkbox' && /*#__PURE__*/React__default['default'].createElement("div", {
-      style: {
+      style: _objectSpread2({
         width: '50px',
         flex: '0 1 auto'
-      },
-      className: "td"
+      }, showColumns[0].fixed == 'left' ? {
+        left: 6
+      } : {}),
+      className: "td ".concat(showColumns[0].fixed == 'left' ? 'fixedLeft' : '')
     }, /*#__PURE__*/React__default['default'].createElement(Index$3, {
       checked: (_ref2 = [].concat(_toConsumableArray((rowSelection === null || rowSelection === void 0 ? void 0 : rowSelection.selectedRowKeys) || []), _toConsumableArray(selectedRowKeys))) === null || _ref2 === void 0 ? void 0 : _ref2.includes(key),
       onClick: function onClick(e) {
@@ -8261,11 +8324,13 @@ function Table(_ref) {
         });
       }
     })), (rowSelection === null || rowSelection === void 0 ? void 0 : rowSelection.type) === 'radio' && /*#__PURE__*/React__default['default'].createElement("div", {
-      style: {
+      style: _objectSpread2({
         width: '50px',
         flex: '0 1 auto'
-      },
-      className: "td"
+      }, showColumns[0].fixed == 'left' ? {
+        left: 6
+      } : {}),
+      className: "td ".concat(showColumns[0].fixed == 'left' ? 'fixedLeft' : '')
     }, /*#__PURE__*/React__default['default'].createElement(Index$2, {
       checked: (_ref3 = [].concat(_toConsumableArray((rowSelection === null || rowSelection === void 0 ? void 0 : rowSelection.selectedRowKeys) || []), _toConsumableArray(selectedRowKeys))) === null || _ref3 === void 0 ? void 0 : _ref3.includes(key),
       onClick: function onClick(e) {
@@ -8421,20 +8486,27 @@ function Table(_ref) {
     className: classnames__default['default']((_classnames2 = {
       container: true
     }, _defineProperty(_classnames2, 'w-table', true), _defineProperty(_classnames2, 'w-frame-box-table', frameBoxTable), _defineProperty(_classnames2, className || 'defalut-table', true), _classnames2)),
-    style: style
+    style: _objectSpread2(_objectSpread2({}, (scroll === null || scroll === void 0 ? void 0 : scroll.y) ? {
+      height: scroll.y
+    } : {}), style)
   }, /*#__PURE__*/React__default['default'].createElement("div", {
     className: "theader"
   }, /*#__PURE__*/React__default['default'].createElement("div", {
     className: "th",
     style: _objectSpread2(_objectSpread2({}, thStyle), {}, {
       height: layerIndex * 32 + 'px'
-    })
+    }, (scroll === null || scroll === void 0 ? void 0 : scroll.x) ? {
+      width: scroll.x
+    } : {})
   }, (rowSelection === null || rowSelection === void 0 ? void 0 : rowSelection.type) === 'checkbox' && /*#__PURE__*/React__default['default'].createElement("div", {
-    style: {
+    style: _objectSpread2({
       width: '50px',
-      flex: '0 1 auto'
-    },
-    className: "td"
+      flex: '0 1 auto',
+      height: '100%'
+    }, showColumns[0].fixed == 'left' ? {
+      left: 6
+    } : {}),
+    className: "td ".concat(((_columns$ = columns[0]) === null || _columns$ === void 0 ? void 0 : _columns$.fixed) == 'left' ? 'fixedLeft' : '')
   }, /*#__PURE__*/React__default['default'].createElement(Index$3, {
     checked: dataSource.every(function (record) {
       return selectedRowKeys.includes(typeof rowKey === 'function' ? record[rowKey(record)] : record[rowKey]);
@@ -8446,15 +8518,23 @@ function Table(_ref) {
     }),
     onChange: onSelectAllChange
   })), (rowSelection === null || rowSelection === void 0 ? void 0 : rowSelection.type) === 'radio' && /*#__PURE__*/React__default['default'].createElement("div", {
-    style: {
+    style: _objectSpread2({
       width: '50px',
-      flex: '0 1 auto'
-    },
-    className: "td"
+      flex: '0 1 auto',
+      height: '100%'
+    }, showColumns[0].fixed == 'left' ? {
+      left: 6
+    } : {}),
+    className: "td ".concat(((_columns$2 = columns[0]) === null || _columns$2 === void 0 ? void 0 : _columns$2.fixed) == 'left' ? 'fixedLeft' : '')
   }), renderTh)), /*#__PURE__*/React__default['default'].createElement("div", {
+    className: "tbodyContainer",
+    style: _objectSpread2({}, (scroll === null || scroll === void 0 ? void 0 : scroll.x) ? {
+      width: scroll.x
+    } : {})
+  }, /*#__PURE__*/React__default['default'].createElement("div", {
     className: "tbody",
     style: _objectSpread2({
-      height: (style === null || style === void 0 ? void 0 : style.height) ? "calc(".concat(style.height, "  - ").concat(52 + (pagination === false ? 0 : 42), "px)") : '200px'
+      height: (style === null || style === void 0 ? void 0 : style.height) || (scroll === null || scroll === void 0 ? void 0 : scroll.y) ? "calc(".concat(style === null || style === void 0 ? void 0 : style.height, "  - ").concat(52 + (pagination === false ? 0 : 42), "px)") : '200px'
     }, tbodyStyle)
   }, dataSource.length > 0 ? dataSource.map(function (record, index) {
     var key = typeof rowKey === 'function' ? record[rowKey(record)] : record[rowKey];
@@ -8473,12 +8553,12 @@ function Table(_ref) {
       justifyContent: 'center',
       alignItems: 'center'
     }
-  }, none || '暂无数据')), _typeof(pagination) === 'object' && /*#__PURE__*/React__default['default'].createElement(_Pagination__default['default'], _objectSpread2({
+  }, none || '暂无数据')))), _typeof(pagination) === 'object' && /*#__PURE__*/React__default['default'].createElement(_Pagination__default['default'], _objectSpread2({
     style: {
       textAlign: 'right',
       marginTop: '10px'
     }
-  }, paginationParams))));
+  }, paginationParams)));
 }
 Table.defaultProps = {
   rowKey: 'key'
@@ -10202,7 +10282,7 @@ var ModalForm = function ModalForm(props, ref) {
       resetFields();
       setFieldsValue(record);
     }
-  }, [visible, record, formRef === null || formRef === void 0 ? void 0 : formRef.current]);
+  }, [visible, record]);
   return /*#__PURE__*/React__default['default'].createElement(_Modal__default['default'], _objectSpread2(_objectSpread2({
     title: title,
     visible: visible

package/package.json

@@ -1,7 +1,7 @@
 {
   "private": false,
   "name": "wargerm",
-  "version": "0.4.5",
+  "version": "0.4.8",
   "scripts": {
     "dev": "dumi dev",
     "docs:build": "dumi build",

package/dist/hooks/index.d.ts

@@ -1 +0,0 @@
-export declare const usePreventUnmountEffect: (callback: Function, deps: Array<any>) => void;