wargerm 0.3.4 → 0.3.8

package/dist/components/ModalTips/index.d.ts

@@ -10,6 +10,7 @@ declare type Props = {
     okText?: string;
     cancelText?: string;
     visible?: boolean;
+    isLoading?: boolean;
     width?: number;
     className?: string;
     style?: React.CSSProperties;

package/dist/index.css

@@ -269,6 +269,7 @@
   display: flex;
   align-items: center;
   justify-content: center;
+  text-align: center;
   position: relative;
   z-index: 2;
 }
@@ -318,9 +319,10 @@
   display: flex;
   align-items: center;
   justify-content: center;
+  text-align: center;
   position: relative;
   z-index: 2;
-  height: 32px;
+  min-height: 32px;
 }
 [data-prefers-color='dark'] .container .tbody {
   overflow: auto;
@@ -330,7 +332,7 @@
 [data-prefers-color='dark'] .container .tbody .tr {
   padding-left: 6px;
   width: 100%;
-  height: 32px;
+  min-height: 32px;
   display: flex;
   margin-bottom: 17px;
   position: relative;
@@ -369,6 +371,7 @@
   display: flex;
   align-items: center;
   justify-content: center;
+  text-align: center;
   position: relative;
   z-index: 2;
 }
@@ -377,6 +380,7 @@
   display: flex;
   align-items: center;
   justify-content: center;
+  text-align: center;
   position: relative;
   z-index: 2;
 }
@@ -426,6 +430,7 @@
   display: flex;
   align-items: center;
   justify-content: center;
+  text-align: center;
   position: relative;
   z-index: 2;
   min-height: 32px;
@@ -477,6 +482,7 @@
   display: flex;
   align-items: center;
   justify-content: center;
+  text-align: center;
   position: relative;
   z-index: 2;
 }
@@ -485,6 +491,7 @@
   display: flex;
   align-items: center;
   justify-content: center;
+  text-align: center;
   position: relative;
   z-index: 2;
 }
@@ -1839,6 +1846,9 @@ button.swiper-pagination-bullet {
 .model_container-tips .model_wrap-tips .model_bottom-tips .okbtn:hover {
   border: 1px solid #276588;
 }
+.model_container-tips .model_wrap-tips .model_bottom-tips .okbtn .ant-btn-loading-icon {
+  width: auto !important;
+}
 .model_container-tips .model_wrap-tips .model_bottom-tips .concellbtn {
   background: #1487c2;
   font-size: 14px;

package/dist/index.esm.css

@@ -269,6 +269,7 @@
   display: flex;
   align-items: center;
   justify-content: center;
+  text-align: center;
   position: relative;
   z-index: 2;
 }
@@ -318,9 +319,10 @@
   display: flex;
   align-items: center;
   justify-content: center;
+  text-align: center;
   position: relative;
   z-index: 2;
-  height: 32px;
+  min-height: 32px;
 }
 [data-prefers-color='dark'] .container .tbody {
   overflow: auto;
@@ -330,7 +332,7 @@
 [data-prefers-color='dark'] .container .tbody .tr {
   padding-left: 6px;
   width: 100%;
-  height: 32px;
+  min-height: 32px;
   display: flex;
   margin-bottom: 17px;
   position: relative;
@@ -369,6 +371,7 @@
   display: flex;
   align-items: center;
   justify-content: center;
+  text-align: center;
   position: relative;
   z-index: 2;
 }
@@ -377,6 +380,7 @@
   display: flex;
   align-items: center;
   justify-content: center;
+  text-align: center;
   position: relative;
   z-index: 2;
 }
@@ -426,6 +430,7 @@
   display: flex;
   align-items: center;
   justify-content: center;
+  text-align: center;
   position: relative;
   z-index: 2;
   min-height: 32px;
@@ -477,6 +482,7 @@
   display: flex;
   align-items: center;
   justify-content: center;
+  text-align: center;
   position: relative;
   z-index: 2;
 }
@@ -485,6 +491,7 @@
   display: flex;
   align-items: center;
   justify-content: center;
+  text-align: center;
   position: relative;
   z-index: 2;
 }
@@ -1839,6 +1846,9 @@ button.swiper-pagination-bullet {
 .model_container-tips .model_wrap-tips .model_bottom-tips .okbtn:hover {
   border: 1px solid #276588;
 }
+.model_container-tips .model_wrap-tips .model_bottom-tips .okbtn .ant-btn-loading-icon {
+  width: auto !important;
+}
 .model_container-tips .model_wrap-tips .model_bottom-tips .concellbtn {
   background: #1487c2;
   font-size: 14px;

package/dist/index.esm.js

@@ -737,7 +737,7 @@ var WSelect = function WSelect(props) {
 
     onLoad && onLoad(options);
     setValueEnumList(valueEnumNode);
-  }, [JSON.stringify(resList)]);
+  }, [JSON.stringify(resList), request]);
   return /*#__PURE__*/React.createElement(_Select, _objectSpread2({}, extraProps), request ? childrenNode : valueEnum ? valueEnumList : children);
 };
 
@@ -7891,7 +7891,7 @@ var WForm$1 = /*#__PURE__*/React.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$curren3, _classnames2;
+  var _formSearchRef$curren4, _classnames2;
 
   var columns = _ref.columns,
       tableList = _ref.dataSource,
@@ -7973,13 +7973,15 @@ function Table(_ref) {
     if (formSearchRef === null || formSearchRef === void 0 ? void 0 : (_formSearchRef$curren = formSearchRef.current) === null || _formSearchRef$curren === void 0 ? void 0 : _formSearchRef$curren.columnsFields) {
       var _formSearchRef$curren2;
 
-      if (formRef === null || formRef === void 0 ? void 0 : formRef.current) {
-        formRef.current = formSearchRef === null || formSearchRef === void 0 ? void 0 : formSearchRef.current;
-      }
-
       setColumnsFields(formSearchRef === null || formSearchRef === void 0 ? void 0 : (_formSearchRef$curren2 = formSearchRef.current) === null || _formSearchRef$curren2 === void 0 ? void 0 : _formSearchRef$curren2.columnsFields);
     }
-  }, [JSON.stringify(formSearchRef === null || formSearchRef === void 0 ? void 0 : (_formSearchRef$curren3 = formSearchRef.current) === null || _formSearchRef$curren3 === void 0 ? void 0 : _formSearchRef$curren3.columnsFields)]);
+
+    if ((formSearchRef === null || formSearchRef === void 0 ? void 0 : formSearchRef.current) && formRef) {
+      var _formSearchRef$curren3;
+
+      formRef.current = formSearchRef === null || formSearchRef === void 0 ? void 0 : (_formSearchRef$curren3 = formSearchRef.current) === null || _formSearchRef$curren3 === void 0 ? void 0 : _formSearchRef$curren3.form;
+    }
+  }, [JSON.stringify(formSearchRef === null || formSearchRef === void 0 ? void 0 : (_formSearchRef$curren4 = formSearchRef.current) === null || _formSearchRef$curren4 === void 0 ? void 0 : _formSearchRef$curren4.columnsFields), formRef, formSearchRef]);
 
   var flattenColumns = function flattenColumns(columns) {
     var arr = columns.reduce(function (pre, cur) {
@@ -8208,18 +8210,23 @@ function Table(_ref) {
       dataSource = _useState10[0],
       setDataSource = _useState10[1];
 
-  var _useState11 = useState({}),
+  var _useState11 = useState(0),
       _useState12 = _slicedToArray(_useState11, 2),
-      pageParams = _useState12[0],
-      setPageParams = _useState12[1];
+      total = _useState12[0],
+      setTotal = _useState12[1];
 
-  var _useState13 = useState(false),
+  var _useState13 = useState({}),
       _useState14 = _slicedToArray(_useState13, 2),
-      loading = _useState14[0],
-      setLoading = _useState14[1];
+      pageParams = _useState14[0],
+      setPageParams = _useState14[1];
 
-  var _useState15 = useState({
-    total: dataSource.length,
+  var _useState15 = useState(false),
+      _useState16 = _slicedToArray(_useState15, 2),
+      loading = _useState16[0],
+      setLoading = _useState16[1];
+
+  var _useState17 = useState({
+    total: total,
     pageSize: 20,
     size: 'small',
     current: 1,
@@ -8234,9 +8241,9 @@ function Table(_ref) {
       });
     }
   }),
-      _useState16 = _slicedToArray(_useState15, 2),
-      paginationParams = _useState16[0],
-      setpaginationParams = _useState16[1];
+      _useState18 = _slicedToArray(_useState17, 2),
+      paginationParams = _useState18[0],
+      setpaginationParams = _useState18[1];
 
   useEffect(function () {
     _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee() {
@@ -8246,7 +8253,7 @@ function Table(_ref) {
           switch (_context.prev = _context.next) {
             case 0:
               if (!request) {
-                _context.next = 14;
+                _context.next = 15;
                 break;
               }
 
@@ -8267,15 +8274,16 @@ function Table(_ref) {
               setLoading(false);
               onLoad && onLoad(res.data);
               setDataSource(res.data);
+              setTotal(res.total || 0);
               setpaginationParams(function (c) {
                 return _objectSpread2(_objectSpread2(_objectSpread2({}, c), {}, {
                   total: res.total || res.data.length
                 }, pagination), requestParams);
               });
-              _context.next = 15;
+              _context.next = 16;
               break;
 
-            case 14:
+            case 15:
               setpaginationParams(function (c) {
                 var obj = _objectSpread2(_objectSpread2(_objectSpread2({}, c), {}, {
                   total: tableList && tableList.length || 0
@@ -8287,7 +8295,7 @@ function Table(_ref) {
                 return obj;
               });
 
-            case 15:
+            case 16:
             case "end":
               return _context.stop();
           }
@@ -9829,7 +9837,8 @@ var Modal$1 = /*#__PURE__*/function (_React$PureComponent) {
           onCancel = _this$props.onCancel,
           cancelText = _this$props.cancelText,
           okText = _this$props.okText,
-          footer = _this$props.footer;
+          footer = _this$props.footer,
+          isLoading = _this$props.isLoading;
       if (footer && /*#__PURE__*/React.isValidElement(footer)) return footer;
       if (footer === false) return null;
       return /*#__PURE__*/React.createElement("div", {
@@ -9840,19 +9849,20 @@ var Modal$1 = /*#__PURE__*/function (_React$PureComponent) {
           display: 'flex'
         }
       }, /*#__PURE__*/React.createElement(WButton, {
-        className: "okbtn",
-        onClick: function onClick(e) {
-          onOk && onOk(e);
-        }
-      }, okText || '确定'), /*#__PURE__*/React.createElement(WButton, {
         className: "concellbtn",
         style: {
-          marginLeft: '10px'
+          marginRight: '10px'
         },
         onClick: function onClick(e) {
           onCancel && onCancel(e);
         }
-      }, cancelText || '取消')));
+      }, cancelText || '取消'), /*#__PURE__*/React.createElement(WButton, {
+        className: "okbtn",
+        loading: isLoading || false,
+        onClick: function onClick(e) {
+          onOk && onOk(e);
+        }
+      }, okText || '确定')));
     };
 
     _this.renderTop = function () {

package/dist/index.js

@@ -771,7 +771,7 @@ var WSelect = function WSelect(props) {
 
     onLoad && onLoad(options);
     setValueEnumList(valueEnumNode);
-  }, [JSON.stringify(resList)]);
+  }, [JSON.stringify(resList), request]);
   return /*#__PURE__*/React__default['default'].createElement(_Select__default['default'], _objectSpread2({}, extraProps), request ? childrenNode : valueEnum ? valueEnumList : children);
 };
 
@@ -7925,7 +7925,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$curren3, _classnames2;
+  var _formSearchRef$curren4, _classnames2;
 
   var columns = _ref.columns,
       tableList = _ref.dataSource,
@@ -8007,13 +8007,15 @@ function Table(_ref) {
     if (formSearchRef === null || formSearchRef === void 0 ? void 0 : (_formSearchRef$curren = formSearchRef.current) === null || _formSearchRef$curren === void 0 ? void 0 : _formSearchRef$curren.columnsFields) {
       var _formSearchRef$curren2;
 
-      if (formRef === null || formRef === void 0 ? void 0 : formRef.current) {
-        formRef.current = formSearchRef === null || formSearchRef === void 0 ? void 0 : formSearchRef.current;
-      }
-
       setColumnsFields(formSearchRef === null || formSearchRef === void 0 ? void 0 : (_formSearchRef$curren2 = formSearchRef.current) === null || _formSearchRef$curren2 === void 0 ? void 0 : _formSearchRef$curren2.columnsFields);
     }
-  }, [JSON.stringify(formSearchRef === null || formSearchRef === void 0 ? void 0 : (_formSearchRef$curren3 = formSearchRef.current) === null || _formSearchRef$curren3 === void 0 ? void 0 : _formSearchRef$curren3.columnsFields)]);
+
+    if ((formSearchRef === null || formSearchRef === void 0 ? void 0 : formSearchRef.current) && formRef) {
+      var _formSearchRef$curren3;
+
+      formRef.current = formSearchRef === null || formSearchRef === void 0 ? void 0 : (_formSearchRef$curren3 = formSearchRef.current) === null || _formSearchRef$curren3 === void 0 ? void 0 : _formSearchRef$curren3.form;
+    }
+  }, [JSON.stringify(formSearchRef === null || formSearchRef === void 0 ? void 0 : (_formSearchRef$curren4 = formSearchRef.current) === null || _formSearchRef$curren4 === void 0 ? void 0 : _formSearchRef$curren4.columnsFields), formRef, formSearchRef]);
 
   var flattenColumns = function flattenColumns(columns) {
     var arr = columns.reduce(function (pre, cur) {
@@ -8242,18 +8244,23 @@ function Table(_ref) {
       dataSource = _useState10[0],
       setDataSource = _useState10[1];
 
-  var _useState11 = React.useState({}),
+  var _useState11 = React.useState(0),
       _useState12 = _slicedToArray(_useState11, 2),
-      pageParams = _useState12[0],
-      setPageParams = _useState12[1];
+      total = _useState12[0],
+      setTotal = _useState12[1];
 
-  var _useState13 = React.useState(false),
+  var _useState13 = React.useState({}),
       _useState14 = _slicedToArray(_useState13, 2),
-      loading = _useState14[0],
-      setLoading = _useState14[1];
+      pageParams = _useState14[0],
+      setPageParams = _useState14[1];
 
-  var _useState15 = React.useState({
-    total: dataSource.length,
+  var _useState15 = React.useState(false),
+      _useState16 = _slicedToArray(_useState15, 2),
+      loading = _useState16[0],
+      setLoading = _useState16[1];
+
+  var _useState17 = React.useState({
+    total: total,
     pageSize: 20,
     size: 'small',
     current: 1,
@@ -8268,9 +8275,9 @@ function Table(_ref) {
       });
     }
   }),
-      _useState16 = _slicedToArray(_useState15, 2),
-      paginationParams = _useState16[0],
-      setpaginationParams = _useState16[1];
+      _useState18 = _slicedToArray(_useState17, 2),
+      paginationParams = _useState18[0],
+      setpaginationParams = _useState18[1];
 
   React.useEffect(function () {
     _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee() {
@@ -8280,7 +8287,7 @@ function Table(_ref) {
           switch (_context.prev = _context.next) {
             case 0:
               if (!request) {
-                _context.next = 14;
+                _context.next = 15;
                 break;
               }
 
@@ -8301,15 +8308,16 @@ function Table(_ref) {
               setLoading(false);
               onLoad && onLoad(res.data);
               setDataSource(res.data);
+              setTotal(res.total || 0);
               setpaginationParams(function (c) {
                 return _objectSpread2(_objectSpread2(_objectSpread2({}, c), {}, {
                   total: res.total || res.data.length
                 }, pagination), requestParams);
               });
-              _context.next = 15;
+              _context.next = 16;
               break;
 
-            case 14:
+            case 15:
               setpaginationParams(function (c) {
                 var obj = _objectSpread2(_objectSpread2(_objectSpread2({}, c), {}, {
                   total: tableList && tableList.length || 0
@@ -8321,7 +8329,7 @@ function Table(_ref) {
                 return obj;
               });
 
-            case 15:
+            case 16:
             case "end":
               return _context.stop();
           }
@@ -9863,7 +9871,8 @@ var Modal$1 = /*#__PURE__*/function (_React$PureComponent) {
           onCancel = _this$props.onCancel,
           cancelText = _this$props.cancelText,
           okText = _this$props.okText,
-          footer = _this$props.footer;
+          footer = _this$props.footer,
+          isLoading = _this$props.isLoading;
       if (footer && /*#__PURE__*/React__default['default'].isValidElement(footer)) return footer;
       if (footer === false) return null;
       return /*#__PURE__*/React__default['default'].createElement("div", {
@@ -9874,19 +9883,20 @@ var Modal$1 = /*#__PURE__*/function (_React$PureComponent) {
           display: 'flex'
         }
       }, /*#__PURE__*/React__default['default'].createElement(WButton, {
-        className: "okbtn",
-        onClick: function onClick(e) {
-          onOk && onOk(e);
-        }
-      }, okText || '确定'), /*#__PURE__*/React__default['default'].createElement(WButton, {
         className: "concellbtn",
         style: {
-          marginLeft: '10px'
+          marginRight: '10px'
         },
         onClick: function onClick(e) {
           onCancel && onCancel(e);
         }
-      }, cancelText || '取消')));
+      }, cancelText || '取消'), /*#__PURE__*/React__default['default'].createElement(WButton, {
+        className: "okbtn",
+        loading: isLoading || false,
+        onClick: function onClick(e) {
+          onOk && onOk(e);
+        }
+      }, okText || '确定')));
     };
 
     _this.renderTop = function () {

package/package.json

@@ -1,7 +1,7 @@
 {
   "private": false,
   "name": "wargerm",
-  "version": "0.3.4",
+  "version": "0.3.8",
   "scripts": {
     "dev": "dumi dev",
     "docs:build": "dumi build",
@@ -76,4 +76,4 @@
     "react": "^16.12.0",
     "yorkie": "^2.0.0"
   }
-}
+}