@guo514360255/antd-lib 1.4.2 → 1.4.3

package/dist/CustomDetailModal/index.js

@@ -163,7 +163,7 @@ var CustomModal = /*#__PURE__*/forwardRef(function (props, ref) {
     onClose: close,
     className: "detailContainer"
   }), /*#__PURE__*/React.createElement(Descriptions, _extends({
-    column: 2,
+    column: 1,
     bordered: true
   }, descProps || {}), columns === null || columns === void 0 ? void 0 : columns.filter(function (item) {
     return !item.hideInDetail;

package/dist/CustomFormModal/index.js

@@ -13,7 +13,7 @@ var _excluded = ["type", "onSubmit", "columns", "saveRequest", "updateRequest",
  */
 
 import { DeleteOutlined } from '@ant-design/icons';
-import { Button, Drawer, Form, message, Modal } from 'antd';
+import { Button, Drawer, Form, message, Modal, Spin } from 'antd';
 import cloneDeep from 'lodash/cloneDeep';
 import React, { forwardRef, useImperativeHandle, useRef, useState } from 'react';
 import CustomUpload from "../CustomUpload";
@@ -44,6 +44,10 @@ var CustomFormModal = /*#__PURE__*/forwardRef(function (props, ref) {
     _useState6 = _slicedToArray(_useState5, 2),
     loading = _useState6[0],
     setLoading = _useState6[1];
+  var _useState7 = useState(false),
+    _useState8 = _slicedToArray(_useState7, 2),
+    detailLoading = _useState8[0],
+    setDetailLoading = _useState8[1];
   var _message$useMessage = message.useMessage(),
     _message$useMessage2 = _slicedToArray(_message$useMessage, 2),
     messageApi = _message$useMessage2[0],
@@ -89,12 +93,14 @@ var CustomFormModal = /*#__PURE__*/forwardRef(function (props, ref) {
               case 0:
                 setOpen(true);
                 if (!(values !== null && values !== void 0 && values.id && detailRequest)) {
-                  _context.next = 9;
+                  _context.next = 19;
                   break;
                 }
-                _context.next = 4;
+                setDetailLoading(true);
+                _context.prev = 3;
+                _context.next = 6;
                 return detailRequest(values.id);
-              case 4:
+              case 6:
                 data = _context.sent;
                 columns === null || columns === void 0 || columns.forEach(function (item) {
                   if (item.formKey) {
@@ -104,17 +110,25 @@ var CustomFormModal = /*#__PURE__*/forwardRef(function (props, ref) {
                 formRef === null || formRef === void 0 || (_formRef$current = formRef.current) === null || _formRef$current === void 0 || _formRef$current.setFieldsValue(data || {});
                 setValues(data || {});
                 return _context.abrupt("return");
-              case 9:
+              case 13:
+                _context.prev = 13;
+                _context.t0 = _context["catch"](3);
+                console.warn(_context.t0);
+              case 16:
+                _context.prev = 16;
+                setDetailLoading(false);
+                return _context.finish(16);
+              case 19:
                 setTimeout(function () {
                   var _formRef$current2;
                   formRef === null || formRef === void 0 || (_formRef$current2 = formRef.current) === null || _formRef$current2 === void 0 || _formRef$current2.setFieldsValue(values || {});
                   setValues(values || {});
-                });
-              case 10:
+                }, 0);
+              case 20:
               case "end":
                 return _context.stop();
             }
-          }, _callee);
+          }, _callee, null, [[3, 13, 16, 19]]);
         }))();
       }
     };
@@ -210,7 +224,10 @@ var CustomFormModal = /*#__PURE__*/forwardRef(function (props, ref) {
   var getPlaceholder = function getPlaceholder(type, title) {
     return "\u8BF7".concat(placeholder[type || 'input'] || placeholder.default).concat(title ? title : '');
   };
-  return /*#__PURE__*/React.createElement(React.Fragment, null, messageHolder, /*#__PURE__*/React.createElement(Component, _extends({
+  return /*#__PURE__*/React.createElement(React.Fragment, null, messageHolder, /*#__PURE__*/React.createElement(Spin, {
+    fullscreen: true,
+    spinning: detailLoading
+  }), /*#__PURE__*/React.createElement(Component, _extends({
     width: other.width || 600,
     footer: footer,
     title: "".concat(!!values.id ? '编辑' : '新增').concat(title || '')

package/dist/CustomTable/index.js

@@ -173,38 +173,12 @@ var CustomTable = /*#__PURE__*/forwardRef(function (props, ref) {
   var totalWidth = columns === null || columns === void 0 ? void 0 : columns.reduce(function (sum, col) {
     return sum + (col.width || 100);
   }, 0);
-  var openModal = /*#__PURE__*/function () {
-    var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3() {
-      var _formModalRef$current;
-      var record,
-        data,
-        _args3 = arguments;
-      return _regeneratorRuntime().wrap(function _callee3$(_context3) {
-        while (1) switch (_context3.prev = _context3.next) {
-          case 0:
-            record = _args3.length > 0 && _args3[0] !== undefined ? _args3[0] : {};
-            data = record;
-            if (!(detailRequest && record.id)) {
-              _context3.next = 6;
-              break;
-            }
-            _context3.next = 5;
-            return detailRequest(record.id);
-          case 5:
-            data = _context3.sent;
-          case 6:
-            // @ts-ignore
-            (_formModalRef$current = formModalRef.current) === null || _formModalRef$current === void 0 || _formModalRef$current.open(handleModalData ? handleModalData(data) : data);
-          case 7:
-          case "end":
-            return _context3.stop();
-        }
-      }, _callee3);
-    }));
-    return function openModal() {
-      return _ref4.apply(this, arguments);
-    };
-  }();
+  var openModal = function openModal() {
+    var _formModalRef$current;
+    var record = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+    // @ts-ignore
+    (_formModalRef$current = formModalRef.current) === null || _formModalRef$current === void 0 || _formModalRef$current.open(handleModalData ? handleModalData(record) : record);
+  };
   var handleColumns = function handleColumns() {
     var _newColumns$;
     var newColumns = cloneDeep(columns);
@@ -354,52 +328,52 @@ var CustomTable = /*#__PURE__*/forwardRef(function (props, ref) {
     formRef: formRef,
     columns: handleColumns() || [],
     request: ( /*#__PURE__*/function () {
-      var _ref5 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(params, sort, filter) {
+      var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(params, sort, filter) {
         var pageNo, _yield$request, list, data;
-        return _regeneratorRuntime().wrap(function _callee4$(_context4) {
-          while (1) switch (_context4.prev = _context4.next) {
+        return _regeneratorRuntime().wrap(function _callee3$(_context3) {
+          while (1) switch (_context3.prev = _context3.next) {
             case 0:
               if (!(request && !dataSource)) {
-                _context4.next = 20;
+                _context3.next = 20;
                 break;
               }
               setLoading(true);
-              _context4.prev = 2;
+              _context3.prev = 2;
               pageNo = params.current;
               delete params.current;
-              _context4.next = 7;
+              _context3.next = 7;
               return request(_objectSpread(_objectSpread(_objectSpread(_objectSpread({}, params), {}, {
                 pageNo: pageNo
               }, sort), filter), defaultQueryParams));
             case 7:
-              _yield$request = _context4.sent;
+              _yield$request = _context3.sent;
               list = _yield$request.list;
               data = _objectWithoutProperties(_yield$request, _excluded2);
               getAntTableContainer();
-              return _context4.abrupt("return", _objectSpread({
+              return _context3.abrupt("return", _objectSpread({
                 data: list
               }, data));
             case 14:
-              _context4.prev = 14;
-              _context4.t0 = _context4["catch"](2);
-              console.log(_context4.t0);
+              _context3.prev = 14;
+              _context3.t0 = _context3["catch"](2);
+              console.log(_context3.t0);
             case 17:
-              _context4.prev = 17;
+              _context3.prev = 17;
               setLoading(false);
-              return _context4.finish(17);
+              return _context3.finish(17);
             case 20:
-              return _context4.abrupt("return", {
+              return _context3.abrupt("return", {
                 data: [],
                 total: 0
               });
             case 21:
             case "end":
-              return _context4.stop();
+              return _context3.stop();
           }
-        }, _callee4, null, [[2, 14, 17, 20]]);
+        }, _callee3, null, [[2, 14, 17, 20]]);
       }));
       return function (_x3, _x4, _x5) {
-        return _ref5.apply(this, arguments);
+        return _ref4.apply(this, arguments);
       };
     }()),
     rowKey: rowKey || 'id',
@@ -430,6 +404,7 @@ var CustomTable = /*#__PURE__*/forwardRef(function (props, ref) {
     ref: formModalRef,
     saveRequest: saveRequest,
     updateRequest: updateRequest,
+    detailRequest: detailRequest,
     columns: columns.filter(function (item) {
       return !item.hideInForm && item.dataIndex !== 'operation' && item.valueType !== 'option';
     })

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@guo514360255/antd-lib",
-  "version": "1.4.2",
+  "version": "1.4.3",
   "description": "react design 5 lib",
   "license": "MIT",
   "module": "dist/index.js",