@guo514360255/antd-lib 1.4.32 → 1.4.34

package/dist/CustomFormModal/index.js

@@ -90,51 +90,86 @@ var CustomFormModal = /*#__PURE__*/forwardRef(function (props, ref) {
   useImperativeHandle(ref, function () {
     return {
       open: function open(values) {
-        return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+        return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
           var _formRef$current, data, newData;
-          return _regeneratorRuntime().wrap(function _callee$(_context) {
-            while (1) switch (_context.prev = _context.next) {
+          return _regeneratorRuntime().wrap(function _callee2$(_context2) {
+            while (1) switch (_context2.prev = _context2.next) {
               case 0:
                 setOpen(true);
                 if (!(values !== null && values !== void 0 && values.id && detailRequest)) {
-                  _context.next = 20;
+                  _context2.next = 27;
                   break;
                 }
                 setDetailLoading(true);
-                _context.prev = 3;
-                _context.next = 6;
+                _context2.prev = 3;
+                _context2.next = 6;
                 return detailRequest(values.id);
               case 6:
-                data = _context.sent;
+                data = _context2.sent;
                 columns === null || columns === void 0 || columns.forEach(function (item) {
                   if (item.formKey) {
                     data["".concat(item.dataIndex).concat(formKey)] = data[item.dataIndex];
                   }
                 });
-                newData = handleModalData ? handleModalData(data || {}) : data || {};
+                if (!handleModalData) {
+                  _context2.next = 14;
+                  break;
+                }
+                _context2.next = 11;
+                return handleModalData(data || {});
+              case 11:
+                _context2.t0 = _context2.sent;
+                _context2.next = 15;
+                break;
+              case 14:
+                _context2.t0 = data || {};
+              case 15:
+                newData = _context2.t0;
                 setFieldValues(newData);
                 (_formRef$current = formRef.current) === null || _formRef$current === void 0 || _formRef$current.setFieldsValue(newData || {});
-                return _context.abrupt("return");
-              case 14:
-                _context.prev = 14;
-                _context.t0 = _context["catch"](3);
-                console.warn(_context.t0);
-              case 17:
-                _context.prev = 17;
+                return _context2.abrupt("return");
+              case 21:
+                _context2.prev = 21;
+                _context2.t1 = _context2["catch"](3);
+                console.warn(_context2.t1);
+              case 24:
+                _context2.prev = 24;
                 setDetailLoading(false);
-                return _context.finish(17);
-              case 20:
-                setTimeout(function () {
+                return _context2.finish(24);
+              case 27:
+                setTimeout( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
                   var _formRef$current2;
-                  var newData = handleModalData ? handleModalData(values || {}) : values || {};
-                  setFieldValues(newData);
-                  (_formRef$current2 = formRef.current) === null || _formRef$current2 === void 0 || _formRef$current2.setFieldsValue(newData || {});
-                }, 0);
-              case 21:
+                  var newData;
+                  return _regeneratorRuntime().wrap(function _callee$(_context) {
+                    while (1) switch (_context.prev = _context.next) {
+                      case 0:
+                        if (!handleModalData) {
+                          _context.next = 6;
+                          break;
+                        }
+                        _context.next = 3;
+                        return handleModalData(values || {});
+                      case 3:
+                        _context.t0 = _context.sent;
+                        _context.next = 7;
+                        break;
+                      case 6:
+                        _context.t0 = values || {};
+                      case 7:
+                        newData = _context.t0;
+                        setFieldValues(newData);
+                        (_formRef$current2 = formRef.current) === null || _formRef$current2 === void 0 || _formRef$current2.setFieldsValue(newData || {});
+                      case 10:
+                      case "end":
+                        return _context.stop();
+                    }
+                  }, _callee);
+                })), 0);
+              case 28:
               case "end":
-                return _context.stop();
+                return _context2.stop();
             }
-          }, _callee, null, [[3, 14, 17, 20]]);
+          }, _callee2, null, [[3, 21, 24, 27]]);
         }))();
       },
       getFormRef: function getFormRef() {
@@ -143,17 +178,17 @@ var CustomFormModal = /*#__PURE__*/forwardRef(function (props, ref) {
     };
   });
   var submitEvent = /*#__PURE__*/function () {
-    var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
+    var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3() {
       var _formRef$current3, _formRef$current4, _tableActionRef$curre, formData, data, result, _key2;
-      return _regeneratorRuntime().wrap(function _callee2$(_context2) {
-        while (1) switch (_context2.prev = _context2.next) {
+      return _regeneratorRuntime().wrap(function _callee3$(_context3) {
+        while (1) switch (_context3.prev = _context3.next) {
           case 0:
             setLoading(true);
-            _context2.prev = 1;
-            _context2.next = 4;
+            _context3.prev = 1;
+            _context3.next = 4;
             return (_formRef$current3 = formRef.current) === null || _formRef$current3 === void 0 ? void 0 : _formRef$current3.validateFields();
           case 4:
-            formData = _context2.sent;
+            formData = _context3.sent;
             data = _objectSpread(_objectSpread({}, formValues), formData);
             result = {};
             for (_key2 in data) {
@@ -167,24 +202,24 @@ var CustomFormModal = /*#__PURE__*/forwardRef(function (props, ref) {
               result = handleData(result);
             }
             if (!formValues.id) {
-              _context2.next = 15;
+              _context3.next = 15;
               break;
             }
             if (!updateRequest) {
-              _context2.next = 13;
+              _context3.next = 13;
               break;
             }
-            _context2.next = 13;
+            _context3.next = 13;
             return updateRequest(result);
           case 13:
-            _context2.next = 18;
+            _context3.next = 18;
             break;
           case 15:
             if (!saveRequest) {
-              _context2.next = 18;
+              _context3.next = 18;
               break;
             }
-            _context2.next = 18;
+            _context3.next = 18;
             return saveRequest(result);
           case 18:
             setOpen(false);
@@ -194,22 +229,22 @@ var CustomFormModal = /*#__PURE__*/forwardRef(function (props, ref) {
             }
             messageApi.success('提交成功');
             tableActionRef === null || tableActionRef === void 0 || (_tableActionRef$curre = tableActionRef.current) === null || _tableActionRef$curre === void 0 || _tableActionRef$curre.reload();
-            _context2.next = 28;
+            _context3.next = 28;
             break;
           case 25:
-            _context2.prev = 25;
-            _context2.t0 = _context2["catch"](1);
-            console.log(_context2.t0, 'submit request error');
+            _context3.prev = 25;
+            _context3.t0 = _context3["catch"](1);
+            console.log(_context3.t0, 'submit request error');
           case 28:
             setLoading(false);
           case 29:
           case "end":
-            return _context2.stop();
+            return _context3.stop();
         }
-      }, _callee2, null, [[1, 25]]);
+      }, _callee3, null, [[1, 25]]);
     }));
     return function submitEvent() {
-      return _ref.apply(this, arguments);
+      return _ref2.apply(this, arguments);
     };
   }();
   var close = function close() {
@@ -272,10 +307,10 @@ var CustomFormModal = /*#__PURE__*/forwardRef(function (props, ref) {
     return item.type === 'list' ? /*#__PURE__*/React.createElement(Form.List, {
       name: item.dataIndex,
       key: item.dataIndex
-    }, function (fields, _ref2, _ref3) {
-      var add = _ref2.add,
-        remove = _ref2.remove;
-      var errors = _ref3.errors;
+    }, function (fields, _ref3, _ref4) {
+      var add = _ref3.add,
+        remove = _ref3.remove;
+      var errors = _ref4.errors;
       return /*#__PURE__*/React.createElement(React.Fragment, null, fields.map(function (field, key) {
         return /*#__PURE__*/React.createElement(Form.Item, {
           label: key === 0 ? "".concat(item.title) : '',

package/dist/FormItem/index.js

@@ -7,7 +7,7 @@ var _excluded = ["value", "onChange"];
  * @Description:
  */
 import { valueEnumTransform } from "../utils/util";
-import { Checkbox, Input, InputNumber, Radio, Select, TreeSelect } from 'antd';
+import { Checkbox, ColorPicker, Input, InputNumber, Radio, Select, TreeSelect } from 'antd';
 import React from 'react';
 var FormItem = function FormItem(_ref) {
   var value = _ref.value,
@@ -20,14 +20,15 @@ var FormItem = function FormItem(_ref) {
     inputNumber: InputNumber,
     treeSelect: TreeSelect,
     textArea: Input.TextArea,
-    checkbox: Checkbox.Group
+    checkbox: Checkbox.Group,
+    color: ColorPicker
   };
   var placeholder = rest.defaultPlaceholder || ['input', 'inputNumber', 'textArea'].includes(rest.type) ? '请输入' : '请选择';
   var FieldComponent = comField[rest.type || 'input'];
   return /*#__PURE__*/React.createElement(FieldComponent, _extends({
     value: value,
     onChange: function onChange(e) {
-      return _onChange === null || _onChange === void 0 ? void 0 : _onChange(['treeSelect', 'select', 'checkbox'].includes(rest.type) ? e : !rest.type || ['input', 'inputNumber'].includes(rest.type) ? e : e.target.value);
+      return _onChange === null || _onChange === void 0 ? void 0 : _onChange(['treeSelect', 'select', 'checkbox', 'color'].includes(rest.type) ? e : !rest.type || ['input', 'inputNumber'].includes(rest.type) ? e : e.target.value);
     }
   }, ['radio', 'checkbox', 'inputNumber'].includes(rest.type) ? {} : {
     allowClear: true
@@ -36,7 +37,7 @@ var FormItem = function FormItem(_ref) {
     optionFilterProp: 'label'
   } : {}, {
     style: {
-      width: '100%'
+      width: ['color'].includes(rest.type) ? '' : '100%'
     }
   }, ['radio', 'select'].includes(rest.type) ? {
     options: valueEnumTransform(rest.valueEnum, value)

package/dist/compontent.d.ts

@@ -23,6 +23,7 @@ interface CustomColumnProps extends ProColumns {
     | 'textArea'
     | 'upload'
     | 'progress'
+    | 'color'
     | 'tag'
     | 'list';
 

package/package.json

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