@guo514360255/antd-lib 1.5.0 → 1.6.0

package/dist/CustomForm/form.d.ts

@@ -0,0 +1,28 @@
+/*
+ * @Author: 郭郭
+ * @Date: 2026/1/27
+ * @Description:
+ */
+
+import { CustomColumnProps } from '@guo514360255/antd-lib/src';
+
+interface CustomFormProps {
+  /**
+   * 表单字段
+   */
+  columns: CustomColumnProps[];
+  /**
+   * 表单字段
+   */
+  formColumns?: CustomColumnProps[];
+  /**
+   * 表单字段
+   */
+  formList?: {
+    [key: string]: CustomColumnProps[];
+  };
+  /**
+   * 字段key
+   */
+  formKey?: string;
+}

package/dist/CustomForm/index.d.ts

@@ -0,0 +1,5 @@
+import React from 'react';
+import type { CustomFormProps } from './form';
+import './index.less';
+declare const CustomForm: React.ForwardRefExoticComponent<CustomFormProps & React.RefAttributes<any>>;
+export default CustomForm;

package/dist/CustomForm/index.js

@@ -0,0 +1,157 @@
+import _extends from "@babel/runtime/helpers/esm/extends";
+import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
+import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
+/*
+ * @Author: 郭郭
+ * @Date: 2026/1/27
+ * @Description:
+ */
+
+import { DeleteOutlined } from '@ant-design/icons';
+import { useFormData } from "../store/useFormData";
+import { Button, Form } from 'antd';
+import cloneDeep from 'lodash/cloneDeep';
+import React, { forwardRef, useEffect, useImperativeHandle, useRef } from 'react';
+import useDeepCompareEffect from 'use-deep-compare-effect';
+import CustomUpload from "../CustomUpload";
+import FormItem from "../FormItem";
+import "./index.less";
+var CustomForm = /*#__PURE__*/forwardRef(function (props, ref) {
+  var columns = props.columns,
+    _props$formList = props.formList,
+    formList = _props$formList === void 0 ? {} : _props$formList,
+    formKey = props.formKey,
+    formColumns = props.formColumns;
+  var _useFormData = useFormData(),
+    formValues = _useFormData.formValues,
+    setFieldValues = _useFormData.setFieldValues;
+  var formRef = useRef();
+  var placeholder = {
+    input: '输入',
+    upload: '上传'
+  };
+  var handleColumns = function handleColumns(columns) {
+    var newColumns = (columns || []).filter(function (item) {
+      return !item.hideInForm;
+    });
+    newColumns === null || newColumns === void 0 || newColumns.forEach(function (item) {
+      // 所有select/treeSelect都附加搜索功能
+      if (['select', 'treeSelect'].includes(item.type)) {
+        item.fieldProps = _objectSpread({
+          showSearch: true
+        }, item.fieldProps || {});
+      }
+      return item;
+    });
+    return cloneDeep(newColumns).map(function (item) {
+      if (item.formKey) {
+        var key = /_form_key$/.test(item.formKey) ? '' : formKey;
+        item.dataIndex = item.formKey + key;
+      }
+      return item;
+    });
+  };
+  var getPlaceholder = function getPlaceholder(type, title) {
+    return "\u8BF7".concat(placeholder[type || 'input'] || '选择').concat(title ? title : '');
+  };
+  useImperativeHandle(ref, function () {
+    return {
+      setValues: function setValues(values) {
+        setFieldValues(values);
+      },
+      getFormRef: function getFormRef() {
+        return formRef.current;
+      }
+    };
+  });
+
+  // 深度监听form数据
+  useDeepCompareEffect(function () {
+    var _formRef$current;
+    (_formRef$current = formRef.current) === null || _formRef$current === void 0 || _formRef$current.setFieldsValue(formValues || {});
+  }, [formValues]);
+  useEffect(function () {
+    return function () {
+      setFieldValues({});
+    };
+  }, []);
+  return /*#__PURE__*/React.createElement("div", {
+    className: "formContainer"
+  }, /*#__PURE__*/React.createElement(Form, {
+    size: "large",
+    layout: "vertical",
+    autoComplete: "off",
+    ref: formRef,
+    clearOnDestroy: true
+  }, handleColumns(Array.isArray(formColumns) && formColumns.length ? formColumns.filter(function (item) {
+    return !item.hideInForm;
+  }) : columns || []).map(function (item) {
+    var defaultPlaceholder = getPlaceholder(item.type, item.title);
+    return item.type === 'list' ? /*#__PURE__*/React.createElement(Form.List, {
+      name: item.dataIndex,
+      key: item.dataIndex
+    }, function (fields, _ref, _ref2) {
+      var add = _ref.add,
+        remove = _ref.remove;
+      var errors = _ref2.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) : '',
+          key: field.key,
+          rules: item.required ? [{
+            required: true
+          }] : [],
+          className: "dynamicItemContainer"
+        }, /*#__PURE__*/React.createElement("div", {
+          className: "listGroupContainer"
+        }, /*#__PURE__*/React.createElement("div", {
+          className: "listGroupContent"
+        }, (formList[item.dataIndex] || []).filter(function (item) {
+          return !item.hideInForm;
+        }).map(function (list) {
+          var placeholder = getPlaceholder(list.type, list.title);
+          return /*#__PURE__*/React.createElement(Form.Item, {
+            name: [field.name, list.dataIndex],
+            label: list.title,
+            key: list.dataIndex,
+            labelAlign: "right",
+            rules: [{
+              required: list.required,
+              message: placeholder
+            }].concat(_toConsumableArray(list.rules || []))
+          }, list.type === 'upload' ? /*#__PURE__*/React.createElement(CustomUpload, list) : /*#__PURE__*/React.createElement(FormItem, _extends({}, list, {
+            defaultPlaceholder: placeholder
+          })));
+        })), /*#__PURE__*/React.createElement("span", {
+          className: "listDelIcon"
+        }, /*#__PURE__*/React.createElement(DeleteOutlined, {
+          onClick: function onClick() {
+            return remove(field.name);
+          }
+        }))));
+      }), /*#__PURE__*/React.createElement(Form.Item, null, /*#__PURE__*/React.createElement(Button, {
+        type: "dashed",
+        block: true,
+        onClick: function onClick() {
+          return add();
+        }
+      }, '新增' + item.title), /*#__PURE__*/React.createElement(Form.ErrorList, {
+        errors: errors
+      })));
+    }) : /*#__PURE__*/React.createElement(Form.Item, {
+      key: item.dataIndex,
+      label: item.title ? "".concat(item.title) : '',
+      name: item.dataIndex,
+      rules: [{
+        required: item.required,
+        message: defaultPlaceholder
+      }].concat(_toConsumableArray(item.rules || []))
+    }, item.type === 'upload' ?
+    /*#__PURE__*/
+    // @ts-ignore
+    React.createElement(CustomUpload, item) : /*#__PURE__*/React.createElement(FormItem, _extends({}, item, {
+      defaultPlaceholder: defaultPlaceholder
+    })));
+  })));
+});
+export default CustomForm;

package/dist/CustomForm/index.less

@@ -0,0 +1,25 @@
+.formContainer{
+  .dynamicItemContainer{
+    display: flex;
+    width: 100%;
+    > div {
+      width: 100%;
+      .listGroupContainer{
+        display: flex;
+        gap: 20px;
+        background-color: #f4f4f4;
+        border-radius: 4px;
+        padding: 10px 10px 0 10px;
+        .listGroupContent{
+          flex: 1;
+        }
+      }
+      > div:nth-child(2) {
+      }
+    }
+    .listDelIcon{
+      color: #F5222D;
+      cursor: pointer;
+    }
+  }
+}

package/dist/CustomFormModal/index.d.ts

@@ -1,5 +1,5 @@
-import { CustomFormModalProps } from "./formModal";
 import React from 'react';
+import type { CustomFormModalProps } from './formModal';
 import './index.less';
 declare const CustomFormModal: React.ForwardRefExoticComponent<Omit<CustomFormModalProps, "ref"> & React.RefAttributes<any>>;
 export default CustomFormModal;

package/dist/CustomFormModal/index.js

@@ -1,8 +1,7 @@
 import _extends from "@babel/runtime/helpers/esm/extends";
-import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
+import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _regeneratorRuntime from "@babel/runtime/helpers/esm/regeneratorRuntime";
 import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
-import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
 var _excluded = ["type", "onSubmit", "columns", "formColumns", "saveRequest", "updateRequest", "detailRequest", "handleData", "title", "tableActionRef", "formList", "handleModalData"];
@@ -12,14 +11,10 @@ var _excluded = ["type", "onSubmit", "columns", "formColumns", "saveRequest", "u
  * @Description:
  */
 
-import { DeleteOutlined } from '@ant-design/icons';
 import { useFormData } from "../store/useFormData";
-import { Button, Drawer, Form, message, Modal, Spin } from 'antd';
-import cloneDeep from 'lodash/cloneDeep';
-import React, { forwardRef, useEffect, useImperativeHandle, useRef, useState } from 'react';
-import useDeepCompareEffect from 'use-deep-compare-effect';
-import CustomUpload from "../CustomUpload";
-import FormItem from "../FormItem";
+import { Button, Drawer, message, Modal, Spin } from 'antd';
+import React, { forwardRef, useImperativeHandle, useRef, useState } from 'react';
+import CustomForm from "../CustomForm";
 import "./index.less";
 var CustomFormModal = /*#__PURE__*/forwardRef(function (props, ref) {
   var type = props.type,
@@ -62,49 +57,26 @@ var CustomFormModal = /*#__PURE__*/forwardRef(function (props, ref) {
     drawer: Drawer
   };
   var Component = modalType[type || 'drawer'];
-  var placeholder = {
-    input: '输入',
-    upload: '上传'
-  };
-  var handleColumns = function handleColumns(columns) {
-    var newColumns = (columns || []).filter(function (item) {
-      return !item.hideInForm;
-    });
-    newColumns === null || newColumns === void 0 || newColumns.forEach(function (item) {
-      // 所有select/treeSelect都附加搜索功能
-      if (['select', 'treeSelect'].includes(item.type)) {
-        item.fieldProps = _objectSpread({
-          showSearch: true
-        }, item.fieldProps || {});
-      }
-      return item;
-    });
-    return cloneDeep(newColumns).map(function (item) {
-      if (item.formKey) {
-        var _key = /_form_key$/.test(item.formKey) ? '' : formKey;
-        item.dataIndex = item.formKey + _key;
-      }
-      return item;
-    });
-  };
   useImperativeHandle(ref, function () {
     return {
       open: function open(values) {
         return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
-          var _formRef$current, data, newData;
+          var _formRef$current;
+          var ref, data, newData;
           return _regeneratorRuntime().wrap(function _callee2$(_context2) {
             while (1) switch (_context2.prev = _context2.next) {
               case 0:
+                ref = (_formRef$current = formRef.current) === null || _formRef$current === void 0 ? void 0 : _formRef$current.getFormRef();
                 setOpen(true);
                 if (!(values !== null && values !== void 0 && values.id && detailRequest)) {
-                  _context2.next = 27;
+                  _context2.next = 28;
                   break;
                 }
                 setDetailLoading(true);
-                _context2.prev = 3;
-                _context2.next = 6;
+                _context2.prev = 4;
+                _context2.next = 7;
                 return detailRequest(values.id);
-              case 6:
+              case 7:
                 data = _context2.sent;
                 columns === null || columns === void 0 || columns.forEach(function (item) {
                   if (item.formKey) {
@@ -112,33 +84,32 @@ var CustomFormModal = /*#__PURE__*/forwardRef(function (props, ref) {
                   }
                 });
                 if (!handleModalData) {
-                  _context2.next = 14;
+                  _context2.next = 15;
                   break;
                 }
-                _context2.next = 11;
+                _context2.next = 12;
                 return handleModalData(data || {});
-              case 11:
+              case 12:
                 _context2.t0 = _context2.sent;
-                _context2.next = 15;
+                _context2.next = 16;
                 break;
-              case 14:
-                _context2.t0 = data || {};
               case 15:
+                _context2.t0 = data || {};
+              case 16:
                 newData = _context2.t0;
                 setFieldValues(newData);
-                (_formRef$current = formRef.current) === null || _formRef$current === void 0 || _formRef$current.setFieldsValue(newData || {});
+                ref === null || ref === void 0 || ref.setFieldsValue(newData || {});
                 return _context2.abrupt("return");
-              case 21:
-                _context2.prev = 21;
-                _context2.t1 = _context2["catch"](3);
+              case 22:
+                _context2.prev = 22;
+                _context2.t1 = _context2["catch"](4);
                 console.warn(_context2.t1);
-              case 24:
-                _context2.prev = 24;
+              case 25:
+                _context2.prev = 25;
                 setDetailLoading(false);
-                return _context2.finish(24);
-              case 27:
+                return _context2.finish(25);
+              case 28:
                 setTimeout( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
-                  var _formRef$current2;
                   var newData;
                   return _regeneratorRuntime().wrap(function _callee$(_context) {
                     while (1) switch (_context.prev = _context.next) {
@@ -158,99 +129,111 @@ var CustomFormModal = /*#__PURE__*/forwardRef(function (props, ref) {
                       case 7:
                         newData = _context.t0;
                         setFieldValues(newData);
-                        (_formRef$current2 = formRef.current) === null || _formRef$current2 === void 0 || _formRef$current2.setFieldsValue(newData || {});
+                        ref === null || ref === void 0 || ref.setFieldsValue(newData || {});
                       case 10:
                       case "end":
                         return _context.stop();
                     }
                   }, _callee);
                 })), 0);
-              case 28:
+              case 29:
               case "end":
                 return _context2.stop();
             }
-          }, _callee2, null, [[3, 21, 24, 27]]);
+          }, _callee2, null, [[4, 22, 25, 28]]);
         }))();
       },
       getFormRef: function getFormRef() {
-        return formRef.current;
+        return ref;
       }
     };
   });
   var submitEvent = /*#__PURE__*/function () {
     var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3() {
-      var _formRef$current3, _formRef$current4, _tableActionRef$curre, formData, data, result, _key2;
+      var _formRef$current2;
+      var ref, _tableActionRef$curre, formData, data, result, _key;
       return _regeneratorRuntime().wrap(function _callee3$(_context3) {
         while (1) switch (_context3.prev = _context3.next) {
           case 0:
             setLoading(true);
-            _context3.prev = 1;
-            _context3.next = 4;
-            return (_formRef$current3 = formRef.current) === null || _formRef$current3 === void 0 ? void 0 : _formRef$current3.validateFields();
-          case 4:
+            ref = (_formRef$current2 = formRef.current) === null || _formRef$current2 === void 0 ? void 0 : _formRef$current2.getFormRef();
+            _context3.prev = 2;
+            if (!(!updateRequest && !saveRequest)) {
+              _context3.next = 6;
+              break;
+            }
+            messageApi.error('未提供保存或修改接口');
+            return _context3.abrupt("return");
+          case 6:
+            _context3.next = 8;
+            return ref === null || ref === void 0 ? void 0 : ref.validateFields();
+          case 8:
             formData = _context3.sent;
             data = _objectSpread(_objectSpread({}, formValues), formData);
             result = {};
-            for (_key2 in data) {
-              if (new RegExp(formKey).test(_key2)) {
-                result[_key2.replace(new RegExp(formKey), '')] = data[_key2];
+            for (_key in data) {
+              if (new RegExp(formKey).test(_key)) {
+                result[_key.replace(new RegExp(formKey), '')] = data[_key];
               } else {
-                result[_key2] = data[_key2];
+                result[_key] = data[_key];
               }
             }
             if (handleData) {
               result = handleData(result);
             }
             if (!formValues.id) {
-              _context3.next = 15;
+              _context3.next = 19;
               break;
             }
             if (!updateRequest) {
-              _context3.next = 13;
+              _context3.next = 17;
               break;
             }
-            _context3.next = 13;
+            _context3.next = 17;
             return updateRequest(result);
-          case 13:
-            _context3.next = 18;
+          case 17:
+            _context3.next = 22;
             break;
-          case 15:
+          case 19:
             if (!saveRequest) {
-              _context3.next = 18;
+              _context3.next = 22;
               break;
             }
-            _context3.next = 18;
+            _context3.next = 22;
             return saveRequest(result);
-          case 18:
+          case 22:
             setOpen(false);
-            (_formRef$current4 = formRef.current) === null || _formRef$current4 === void 0 || _formRef$current4.resetFields();
+            ref === null || ref === void 0 || ref.resetFields();
             if (onSubmit) {
               onSubmit();
             }
             messageApi.success('提交成功');
             tableActionRef === null || tableActionRef === void 0 || (_tableActionRef$curre = tableActionRef.current) === null || _tableActionRef$curre === void 0 || _tableActionRef$curre.reload();
-            _context3.next = 28;
+            _context3.next = 32;
             break;
-          case 25:
-            _context3.prev = 25;
-            _context3.t0 = _context3["catch"](1);
+          case 29:
+            _context3.prev = 29;
+            _context3.t0 = _context3["catch"](2);
             console.log(_context3.t0, 'submit request error');
-          case 28:
+          case 32:
+            _context3.prev = 32;
             setLoading(false);
-          case 29:
+            return _context3.finish(32);
+          case 35:
           case "end":
             return _context3.stop();
         }
-      }, _callee3, null, [[1, 25]]);
+      }, _callee3, null, [[2, 29, 32, 35]]);
     }));
     return function submitEvent() {
       return _ref2.apply(this, arguments);
     };
   }();
   var close = function close() {
-    var _formRef$current5;
+    var _formRef$current3;
     setOpen(false);
-    (_formRef$current5 = formRef.current) === null || _formRef$current5 === void 0 || _formRef$current5.resetFields();
+    var ref = (_formRef$current3 = formRef.current) === null || _formRef$current3 === void 0 ? void 0 : _formRef$current3.getFormRef();
+    ref === null || ref === void 0 || ref.resetFields();
     if (onSubmit) {
       onSubmit();
     }
@@ -264,22 +247,11 @@ var CustomFormModal = /*#__PURE__*/forwardRef(function (props, ref) {
     type: "primary",
     size: "large",
     loading: loading,
-    onClick: submitEvent
+    onClick: submitEvent,
+    style: {
+      marginLeft: 20
+    }
   }, "\u63D0\u4EA4")];
-  var getPlaceholder = function getPlaceholder(type, title) {
-    return "\u8BF7".concat(placeholder[type || 'input'] || '选择').concat(title ? title : '');
-  };
-
-  // 深度监听form数据
-  useDeepCompareEffect(function () {
-    var _formRef$current6;
-    (_formRef$current6 = formRef.current) === null || _formRef$current6 === void 0 || _formRef$current6.setFieldsValue(formValues || {});
-  }, [formValues]);
-  useEffect(function () {
-    return function () {
-      setFieldValues({});
-    };
-  }, []);
   return /*#__PURE__*/React.createElement("div", {
     className: "custom-modal-container"
   }, messageHolder, /*#__PURE__*/React.createElement(Spin, {
@@ -292,83 +264,13 @@ var CustomFormModal = /*#__PURE__*/forwardRef(function (props, ref) {
     title: "".concat(!!formValues.id ? '编辑' : '新增').concat(title || '')
   }, other, {
     open: open,
-    onClose: close,
-    className: "formContainer"
-  }), /*#__PURE__*/React.createElement(Form, {
-    size: "large",
-    layout: "vertical",
-    autoComplete: "off",
+    onClose: close
+  }), /*#__PURE__*/React.createElement(CustomForm, {
     ref: formRef,
-    clearOnDestroy: true
-  }, handleColumns(Array.isArray(formColumns) && formColumns.length ? formColumns.filter(function (item) {
-    return !item.hideInForm;
-  }) : columns || []).map(function (item) {
-    var defaultPlaceholder = getPlaceholder(item.type, item.title);
-    return item.type === 'list' ? /*#__PURE__*/React.createElement(Form.List, {
-      name: item.dataIndex,
-      key: item.dataIndex
-    }, 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) : '',
-          key: field.key,
-          rules: item.required ? [{
-            required: true
-          }] : [],
-          className: "dynamicItemContainer"
-        }, /*#__PURE__*/React.createElement("div", {
-          className: "listGroupContainer"
-        }, /*#__PURE__*/React.createElement("div", {
-          className: "listGroupContent"
-        }, (formList[item.dataIndex] || []).filter(function (item) {
-          return !item.hideInForm;
-        }).map(function (list) {
-          var placeholder = getPlaceholder(list.type, list.title);
-          return /*#__PURE__*/React.createElement(Form.Item, {
-            name: [field.name, list.dataIndex],
-            label: list.title,
-            key: list.dataIndex,
-            labelAlign: "right",
-            rules: [{
-              required: list.required,
-              message: placeholder
-            }].concat(_toConsumableArray(list.rules || []))
-          }, list.type === 'upload' ? /*#__PURE__*/React.createElement(CustomUpload, list) : /*#__PURE__*/React.createElement(FormItem, _extends({}, list, {
-            defaultPlaceholder: placeholder
-          })));
-        })), /*#__PURE__*/React.createElement("span", {
-          className: "listDelIcon"
-        }, /*#__PURE__*/React.createElement(DeleteOutlined, {
-          onClick: function onClick() {
-            return remove(field.name);
-          }
-        }))));
-      }), /*#__PURE__*/React.createElement(Form.Item, null, /*#__PURE__*/React.createElement(Button, {
-        type: "dashed",
-        block: true,
-        onClick: function onClick() {
-          return add();
-        }
-      }, '新增' + item.title), /*#__PURE__*/React.createElement(Form.ErrorList, {
-        errors: errors
-      })));
-    }) : /*#__PURE__*/React.createElement(Form.Item, {
-      key: item.dataIndex,
-      label: item.title ? "".concat(item.title) : '',
-      name: item.dataIndex,
-      rules: [{
-        required: item.required,
-        message: defaultPlaceholder
-      }].concat(_toConsumableArray(item.rules || []))
-    }, item.type === 'upload' ?
-    /*#__PURE__*/
-    // @ts-ignore
-    React.createElement(CustomUpload, item) : /*#__PURE__*/React.createElement(FormItem, _extends({}, item, {
-      defaultPlaceholder: defaultPlaceholder
-    })));
-  }))));
+    columns: columns,
+    formList: formList,
+    formKey: formKey,
+    formColumns: formColumns
+  })));
 });
 export default CustomFormModal;

package/dist/CustomFormModal/index.less

@@ -3,32 +3,3 @@
     z-index: 1001
   }
 }
-.formContainer{
-  .ant-drawer-footer{
-    display: flex;
-    gap: 16px;
-  }
-  .dynamicItemContainer{
-    display: flex;
-    width: 100%;
-    > div {
-      width: 100%;
-      .listGroupContainer{
-        display: flex;
-        gap: 20px;
-        background-color: #f4f4f4;
-        border-radius: 4px;
-        padding: 10px 10px 0 10px;
-        .listGroupContent{
-          flex: 1;
-        }
-      }
-      > div:nth-child(2) {
-      }
-    }
-    .listDelIcon{
-      color: #F5222D;
-      cursor: pointer;
-    }
-  }
-}

package/dist/FormItem/index.js

@@ -12,9 +12,9 @@ import { valueEnumTransform } from "../utils/util";
 import { Editor, Toolbar } from '@wangeditor/editor-for-react';
 import '@wangeditor/editor/dist/css/style.css';
 import { Checkbox, ColorPicker, DatePicker, Input, InputNumber, Radio, Select, TreeSelect } from 'antd';
-import React, { useState } from 'react';
+import React, { useEffect, useState } from 'react';
 var FormItem = function FormItem(_ref) {
-  var _rest$fieldProps, _rest$fieldProps2, _rest$fieldProps3;
+  var _rest$fieldProps, _rest$fieldProps2;
   var value = _ref.value,
     _onChange = _ref.onChange,
     rest = _objectWithoutProperties(_ref, _excluded);
@@ -44,6 +44,11 @@ var FormItem = function FormItem(_ref) {
     placeholder: '请输入内容...',
     MENU_CONF: _objectSpread({}, (rest === null || rest === void 0 || (_rest$fieldProps = rest.fieldProps) === null || _rest$fieldProps === void 0 ? void 0 : _rest$fieldProps.editorConfig) || {})
   };
+  useEffect(function () {
+    if (rest.type === 'editor') {
+      editor === null || editor === void 0 || editor.setHtml(value);
+    }
+  }, [value]);
   return rest.type === 'editor' ? /*#__PURE__*/React.createElement("div", {
     style: {
       border: '1px solid #cecece'
@@ -52,7 +57,7 @@ var FormItem = function FormItem(_ref) {
     defaultConfig: toolbarConfig,
     mode: "default",
     editor: editor
-  }, (rest === null || rest === void 0 || (_rest$fieldProps2 = rest.fieldProps) === null || _rest$fieldProps2 === void 0 ? void 0 : _rest$fieldProps2.toolbar) || {})), /*#__PURE__*/React.createElement(Editor, _extends({
+  }, (rest === null || rest === void 0 || (_rest$fieldProps2 = rest.fieldProps) === null || _rest$fieldProps2 === void 0 ? void 0 : _rest$fieldProps2.toolbar) || {})), /*#__PURE__*/React.createElement(Editor, {
     defaultConfig: editorConfig,
     onCreated: setEditor,
     mode: "default",
@@ -65,7 +70,7 @@ var FormItem = function FormItem(_ref) {
     style: {
       height: '300px'
     }
-  }, (rest === null || rest === void 0 || (_rest$fieldProps3 = rest.fieldProps) === null || _rest$fieldProps3 === void 0 ? void 0 : _rest$fieldProps3.editor) || {}))) : /*#__PURE__*/React.createElement(FieldComponent, _extends({
+  })) : /*#__PURE__*/React.createElement(FieldComponent, _extends({
     value: value,
     onChange: function onChange(e) {
       return _onChange === null || _onChange === void 0 ? void 0 : _onChange(['treeSelect', 'select', 'checkbox', 'color', 'date'].includes(rest.type) ? e : !rest.type || ['input', 'inputNumber'].includes(rest.type) ? e : e.target.value);

package/dist/index.d.ts

@@ -7,6 +7,8 @@ export { default as CustomTable } from './CustomTable';
 export type { CustomTableProps } from './CustomTable/table';
 export { default as CustomScroll } from './CustomScroll';
 export type { CustomScrollProps } from './CustomScroll/scroll';
+export { default as CustomForm } from './CustomForm';
+export type { CustomFormProps } from './CustomForm/form';
 export { default as CustomTag } from './CustomTag';
 export { default as CustomUpload } from './CustomUpload';
 export { default as DynamicIcon } from './DynamicIcon';

package/dist/index.js

@@ -2,6 +2,7 @@ export { default as CustomDetailModal } from "./CustomDetailModal";
 export { default as CustomModal } from "./CustomFormModal";
 export { default as CustomTable } from "./CustomTable";
 export { default as CustomScroll } from "./CustomScroll";
+export { default as CustomForm } from "./CustomForm";
 export { default as CustomTag } from "./CustomTag";
 export { default as CustomUpload } from "./CustomUpload";
 export { default as DynamicIcon } from "./DynamicIcon";

package/package.json

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