@guo514360255/antd-lib 1.4.12 → 1.4.14

package/dist/CustomDetailModal/index.js

@@ -13,8 +13,9 @@ var _excluded = ["type", "columns", "detailRequest", "handleDetailData", "title"
 
 import { findTreeNodeByKey, isEmptyValue } from "../utils/util";
 import { Descriptions, Drawer, Image, Modal, Spin } from 'antd';
-import { isNumber, isString } from 'lodash';
+import isNumber from 'lodash/isNumber';
 import isObject from 'lodash/isObject';
+import isString from 'lodash/isString';
 import React, { forwardRef, useImperativeHandle, useState } from 'react';
 import "./index.less";
 var CustomModal = /*#__PURE__*/forwardRef(function (props, ref) {

package/dist/CustomFormModal/formModal.d.ts

@@ -76,6 +76,12 @@ interface CustomFormModalProps {
    */
   detailRequest?: (data: any) => any;
 
+  /**
+   * 处理modal数据
+   * @param data
+   */
+  handleModalData?: (data: any) => any;
+
   /**
    * table actionRef
    */

package/dist/CustomFormModal/index.js

@@ -5,7 +5,7 @@ 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"];
+var _excluded = ["type", "onSubmit", "columns", "formColumns", "saveRequest", "updateRequest", "detailRequest", "handleData", "title", "tableActionRef", "formList", "handleModalData"];
 /*
  * @Author: 郭郭
  * @Date: 2025/8/15
@@ -13,9 +13,11 @@ var _excluded = ["type", "onSubmit", "columns", "formColumns", "saveRequest", "u
  */
 
 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, useImperativeHandle, useRef, useState } from 'react';
+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 "./index.less";
@@ -32,24 +34,24 @@ var CustomFormModal = /*#__PURE__*/forwardRef(function (props, ref) {
     tableActionRef = props.tableActionRef,
     _props$formList = props.formList,
     formList = _props$formList === void 0 ? {} : _props$formList,
+    handleModalData = props.handleModalData,
     other = _objectWithoutProperties(props, _excluded);
+  var _useFormData = useFormData(),
+    formValues = _useFormData.formValues,
+    setFieldValues = _useFormData.setFieldValues;
   var formRef = useRef();
-  var _useState = useState({}),
+  var _useState = useState(false),
     _useState2 = _slicedToArray(_useState, 2),
-    values = _useState2[0],
-    setValues = _useState2[1];
+    open = _useState2[0],
+    setOpen = _useState2[1];
   var _useState3 = useState(false),
     _useState4 = _slicedToArray(_useState3, 2),
-    open = _useState4[0],
-    setOpen = _useState4[1];
+    loading = _useState4[0],
+    setLoading = _useState4[1];
   var _useState5 = useState(false),
     _useState6 = _slicedToArray(_useState5, 2),
-    loading = _useState6[0],
-    setLoading = _useState6[1];
-  var _useState7 = useState(false),
-    _useState8 = _slicedToArray(_useState7, 2),
-    detailLoading = _useState8[0],
-    setDetailLoading = _useState8[1];
+    detailLoading = _useState6[0],
+    setDetailLoading = _useState6[1];
   var _message$useMessage = message.useMessage(),
     _message$useMessage2 = _slicedToArray(_message$useMessage, 2),
     messageApi = _message$useMessage2[0],
@@ -89,13 +91,13 @@ var CustomFormModal = /*#__PURE__*/forwardRef(function (props, ref) {
     return {
       open: function open(values) {
         return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
-          var _formRef$current, data;
+          var data;
           return _regeneratorRuntime().wrap(function _callee$(_context) {
             while (1) switch (_context.prev = _context.next) {
               case 0:
                 setOpen(true);
                 if (!(values !== null && values !== void 0 && values.id && detailRequest)) {
-                  _context.next = 19;
+                  _context.next = 18;
                   break;
                 }
                 setDetailLoading(true);
@@ -109,45 +111,42 @@ var CustomFormModal = /*#__PURE__*/forwardRef(function (props, ref) {
                     data["".concat(item.dataIndex).concat(formKey)] = data[item.dataIndex];
                   }
                 });
-                formRef === null || formRef === void 0 || (_formRef$current = formRef.current) === null || _formRef$current === void 0 || _formRef$current.setFieldsValue(data || {});
-                setValues(data || {});
+                setFieldValues(handleModalData(data || {}));
                 return _context.abrupt("return");
-              case 13:
-                _context.prev = 13;
+              case 12:
+                _context.prev = 12;
                 _context.t0 = _context["catch"](3);
                 console.warn(_context.t0);
-              case 16:
-                _context.prev = 16;
+              case 15:
+                _context.prev = 15;
                 setDetailLoading(false);
-                return _context.finish(16);
-              case 19:
+                return _context.finish(15);
+              case 18:
                 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 || {});
+                  setFieldValues(handleModalData(values || {}));
                 }, 0);
-              case 20:
+              case 19:
               case "end":
                 return _context.stop();
             }
-          }, _callee, null, [[3, 13, 16, 19]]);
+          }, _callee, null, [[3, 12, 15, 18]]);
         }))();
       }
     };
   });
   var submitEvent = /*#__PURE__*/function () {
     var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
-      var _formRef$current3, _formRef$current4, _tableActionRef$curre, formData, data, result, _key2;
+      var _formRef$current, _formRef$current2, _tableActionRef$curre, formData, data, result, _key2;
       return _regeneratorRuntime().wrap(function _callee2$(_context2) {
         while (1) switch (_context2.prev = _context2.next) {
           case 0:
             setLoading(true);
             _context2.prev = 1;
             _context2.next = 4;
-            return (_formRef$current3 = formRef.current) === null || _formRef$current3 === void 0 ? void 0 : _formRef$current3.validateFields();
+            return (_formRef$current = formRef.current) === null || _formRef$current === void 0 ? void 0 : _formRef$current.validateFields();
           case 4:
             formData = _context2.sent;
-            data = _objectSpread(_objectSpread({}, values), formData);
+            data = _objectSpread(_objectSpread({}, formValues), formData);
             result = {};
             for (_key2 in data) {
               if (new RegExp(formKey).test(_key2)) {
@@ -159,7 +158,7 @@ var CustomFormModal = /*#__PURE__*/forwardRef(function (props, ref) {
             if (handleData) {
               result = handleData(result);
             }
-            if (!values.id) {
+            if (!formValues.id) {
               _context2.next = 15;
               break;
             }
@@ -181,7 +180,7 @@ var CustomFormModal = /*#__PURE__*/forwardRef(function (props, ref) {
             return saveRequest(result);
           case 18:
             setOpen(false);
-            (_formRef$current4 = formRef.current) === null || _formRef$current4 === void 0 || _formRef$current4.resetFields();
+            (_formRef$current2 = formRef.current) === null || _formRef$current2 === void 0 || _formRef$current2.resetFields();
             if (onSubmit) {
               onSubmit();
             }
@@ -206,9 +205,9 @@ var CustomFormModal = /*#__PURE__*/forwardRef(function (props, ref) {
     };
   }();
   var close = function close() {
-    var _formRef$current5;
+    var _formRef$current3;
     setOpen(false);
-    (_formRef$current5 = formRef.current) === null || _formRef$current5 === void 0 || _formRef$current5.resetFields();
+    (_formRef$current3 = formRef.current) === null || _formRef$current3 === void 0 || _formRef$current3.resetFields();
     if (onSubmit) {
       onSubmit();
     }
@@ -225,8 +224,19 @@ var CustomFormModal = /*#__PURE__*/forwardRef(function (props, ref) {
     onClick: submitEvent
   }, "\u63D0\u4EA4")];
   var getPlaceholder = function getPlaceholder(type, title) {
-    return "\u8BF7".concat(placeholder[type || 'input'] || placeholder.default).concat(title ? title : '');
+    return "\u8BF7".concat(placeholder[type || 'input'] || '选择').concat(title ? title : '');
   };
+
+  // 深度监听form数据
+  useDeepCompareEffect(function () {
+    var _formRef$current4;
+    (_formRef$current4 = formRef.current) === null || _formRef$current4 === void 0 || _formRef$current4.setFieldsValue(formValues || {});
+  }, [formValues]);
+  useEffect(function () {
+    return function () {
+      setFieldValues({});
+    };
+  }, []);
   return /*#__PURE__*/React.createElement("div", {
     className: "custom-modal-container"
   }, messageHolder, /*#__PURE__*/React.createElement(Spin, {
@@ -236,7 +246,7 @@ var CustomFormModal = /*#__PURE__*/forwardRef(function (props, ref) {
   }), /*#__PURE__*/React.createElement(Component, _extends({
     width: other.width || 600,
     footer: footer,
-    title: "".concat(!!values.id ? '编辑' : '新增').concat(title || '')
+    title: "".concat(!!formValues.id ? '编辑' : '新增').concat(title || '')
   }, other, {
     open: open,
     onClose: close,
@@ -245,7 +255,8 @@ var CustomFormModal = /*#__PURE__*/forwardRef(function (props, ref) {
     size: "large",
     layout: "vertical",
     autoComplete: "off",
-    ref: formRef
+    ref: formRef,
+    clearOnDestroy: true
   }, handleColumns(Array.isArray(formColumns) && formColumns.length ? formColumns : columns || []).map(function (item) {
     var defaultPlaceholder = getPlaceholder(item.type, item.title);
     return item.type === 'list' ? /*#__PURE__*/React.createElement(Form.List, {

package/dist/CustomTable/index.js

@@ -16,7 +16,8 @@ var _excluded = ["isIndex", "isDelete", "isUpdateState", "isDetail", "isUpdate",
 import { ProTable } from '@ant-design/pro-table';
 import CustomFormModal from "../CustomFormModal";
 import { Button, message, Popconfirm, Progress } from 'antd';
-import { cloneDeep, debounce } from 'lodash';
+import cloneDeep from 'lodash/cloneDeep';
+import debounce from 'lodash/debounce';
 import React, { forwardRef, useEffect, useImperativeHandle, useRef, useState } from 'react';
 import CustomDetailModal from "../CustomDetailModal";
 import "./index.less";
@@ -171,7 +172,7 @@ var CustomTable = /*#__PURE__*/forwardRef(function (props, ref) {
     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);
+    (_formModalRef$current = formModalRef.current) === null || _formModalRef$current === void 0 || _formModalRef$current.open(record);
   };
   useImperativeHandle(ref, function () {
     return {
@@ -416,6 +417,7 @@ var CustomTable = /*#__PURE__*/forwardRef(function (props, ref) {
     saveRequest: saveRequest,
     updateRequest: updateRequest,
     detailRequest: detailRequest,
+    handleModalData: handleModalData,
     columns: columns.filter(function (item) {
       return !item.hideInForm && item.dataIndex !== 'operation' && item.valueType !== 'option';
     })

package/dist/index.d.ts

@@ -10,4 +10,5 @@ export { default as CustomUpload } from './CustomUpload';
 export { default as DynamicIcon } from './DynamicIcon';
 export { default as FormItem } from './FormItem';
 export * from './hooks';
+export * from './store';
 export * from './utils';

package/dist/index.js

@@ -6,4 +6,5 @@ export { default as CustomUpload } from "./CustomUpload";
 export { default as DynamicIcon } from "./DynamicIcon";
 export { default as FormItem } from "./FormItem";
 export * from "./hooks";
+export * from "./store";
 export * from "./utils";

package/dist/store/index.d.ts

@@ -0,0 +1,2 @@
+import { useFormData } from './useFormData';
+export { useFormData };

package/dist/store/index.js

@@ -0,0 +1,8 @@
+/*
+ * @Author: 郭郭
+ * @Date: 2025/12/19
+ * @Description:
+ */
+
+import { useFormData } from "./useFormData";
+export { useFormData };

package/dist/store/useFormData.d.ts

@@ -0,0 +1,23 @@
+export interface FormValues {
+    /**
+     * 表单数据
+     */
+    formValues: {
+        [key: string]: any;
+    };
+    /**
+     * 设置表单数据
+     * @param data
+     */
+    setFieldValues: (data: {
+        [key: string]: any;
+    }) => void;
+    /**
+     * 设置表单单个数据
+     * @param data
+     */
+    setFieldValue: (data: {
+        [key: string]: any;
+    }) => void;
+}
+export declare const useFormData: import("zustand").UseBoundStore<import("zustand").StoreApi<FormValues>>;

package/dist/store/useFormData.js

@@ -0,0 +1,27 @@
+import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
+/*
+ * @Author: 郭郭
+ * @Date: 2025/12/19
+ * @Description:
+ */
+
+import { create } from 'zustand';
+export var useFormData = create(function (set) {
+  return {
+    formValues: {},
+    setFieldValues: function setFieldValues(values) {
+      return set(function () {
+        return {
+          formValues: values
+        };
+      });
+    },
+    setFieldValue: function setFieldValue(values) {
+      return set(function (state) {
+        return {
+          formValues: _objectSpread(_objectSpread({}, state.formValues), values)
+        };
+      });
+    }
+  };
+});

package/dist/utils/util.js

@@ -6,8 +6,10 @@ import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
  * @Description:
  */
 
-import { isEmpty, isNil, isString } from 'lodash';
+import isEmpty from 'lodash/isEmpty';
 import isFinite from 'lodash/isFinite';
+import isNil from 'lodash/isNil';
+import isString from 'lodash/isString';
 /**
  * 本地文件转为base64
  * @param file

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@guo514360255/antd-lib",
-  "version": "1.4.12",
+  "version": "1.4.14",
   "description": "react design 5 lib",
   "license": "MIT",
   "module": "dist/index.js",
@@ -49,11 +49,13 @@
     "@ant-design/pro-components": "^2.8.10",
     "@babel/runtime": "^7.28.4",
     "@types/lodash": "^4.17.20",
-    "antd": "^5.28.0",
+    "antd": "^5.x",
     "antd-img-crop": "^4.27.0",
     "crypto-js": "^4.2.0",
     "js-cookie": "^3.0.5",
-    "lodash": "^4.17.21"
+    "lodash": "^4.17.21",
+    "use-deep-compare-effect": "^1.8.1",
+    "zustand": "^5.0.9"
   },
   "devDependencies": {
     "@commitlint/cli": "^17.1.2",