@guo514360255/antd-lib 1.8.0 → 1.9.0

package/dist/CustomDescriptions/descriptions.d.ts

@@ -0,0 +1,28 @@
+/*
+ * @Author: 郭郭
+ * @Date: 2026/4/8
+ * @Description:
+ */
+import { CustomColumnProps } from '@guo514360255/antd-lib/src';
+
+interface CustomDescriptionsProps {
+  /**
+   * 处理详情数据
+   */
+  handleDetailData: (data: any) => any;
+
+  /**
+   * 请求接口
+   */
+  request?: (data: any) => any;
+
+  /**
+   * 字段
+   */
+  columns: CustomColumnProps[];
+
+  /**
+   * 值
+   */
+  values?: { [key: string]: any };
+}

package/dist/CustomDescriptions/index.d.ts

@@ -0,0 +1,4 @@
+/// <reference types="react" />
+import type { CustomDescriptionsProps } from './descriptions';
+declare const CustomDescriptions: ({ request, handleDetailData, columns, values, ...descProps }: CustomDescriptionsProps) => JSX.Element;
+export default CustomDescriptions;

package/dist/CustomDescriptions/index.js

@@ -0,0 +1,198 @@
+import _extends from "@babel/runtime/helpers/esm/extends";
+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 = ["request", "handleDetailData", "columns", "values"];
+import { findTreeNodeByKey, isEmptyValue } from "../utils/util";
+import { Descriptions, Image, Spin } from 'antd';
+import isNumber from 'lodash/isNumber';
+import isObject from 'lodash/isObject';
+import isString from 'lodash/isString';
+import React, { useEffect, useState } from 'react';
+/*
+ * @Author: 郭郭
+ * @Date: 2026/4/8
+ * @Description:
+ */
+var CustomDescriptions = function CustomDescriptions(_ref) {
+  var request = _ref.request,
+    handleDetailData = _ref.handleDetailData,
+    columns = _ref.columns,
+    values = _ref.values,
+    descProps = _objectWithoutProperties(_ref, _excluded);
+  var _useState = useState(false),
+    _useState2 = _slicedToArray(_useState, 2),
+    loading = _useState2[0],
+    setLoading = _useState2[1];
+  var _useState3 = useState({}),
+    _useState4 = _slicedToArray(_useState3, 2),
+    detail = _useState4[0],
+    setDetail = _useState4[1];
+  var handleDetailValue = function handleDetailValue(column, value, index) {
+    if (isEmptyValue(value)) return value;
+    var fieldProps = column.fieldProps,
+      valueEnum = column.valueEnum;
+    var _ref2 = fieldProps || {},
+      options = _ref2.options;
+    if (column.render) {
+      return column.render(value, detail, index, {}, column);
+    } else if (['select', 'radio'].includes(column.type)) {
+      var valuesEnum = _objectSpread({}, valueEnum);
+      var _values = "".concat(value).split(',');
+      var result = [];
+      if (Object.keys(valuesEnum).length > 0 && isObject(valuesEnum)) {
+        _values.forEach(function (item) {
+          var _item;
+          result.push(((_item = valuesEnum[item]) === null || _item === void 0 ? void 0 : _item.text) || value);
+        });
+        return result.join(',');
+      } else if (Array.isArray(options) && options.length > 0) {
+        _values.forEach(function (item) {
+          var _ref3 = findTreeNodeByKey(options, item) || {},
+            label = _ref3.label;
+          console.log(label, '...label...');
+          result.push(label || value);
+        });
+        return result.join(',');
+      }
+      return value;
+    }
+    return value;
+  };
+  var DescImage = function DescImage(_ref4) {
+    var data = _ref4.data;
+    if (!data) return data;
+    var list = data;
+    if (typeof data === 'string') {
+      list = data.split(',');
+    }
+    return /*#__PURE__*/React.createElement(Image.PreviewGroup, null, /*#__PURE__*/React.createElement("div", {
+      style: {
+        display: 'flex',
+        flexWrap: 'wrap',
+        gap: 10
+      }
+    }, list.map(function (item, index) {
+      return /*#__PURE__*/React.createElement(Image, {
+        key: index,
+        width: 100,
+        src: item.url || item,
+        alt: item.name || item,
+        style: {
+          marginRight: 10
+        }
+      });
+    })));
+  };
+  var getDetail = /*#__PURE__*/function () {
+    var _ref5 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(id) {
+      var data;
+      return _regeneratorRuntime().wrap(function _callee$(_context) {
+        while (1) switch (_context.prev = _context.next) {
+          case 0:
+            if (!(!isString(id) && !isNumber(id))) {
+              _context.next = 3;
+              break;
+            }
+            console.warn('Invalid id parameter:', id);
+            return _context.abrupt("return");
+          case 3:
+            if (!loading) {
+              _context.next = 5;
+              break;
+            }
+            return _context.abrupt("return");
+          case 5:
+            setLoading(true);
+            _context.prev = 6;
+            if (!request) {
+              _context.next = 12;
+              break;
+            }
+            _context.next = 10;
+            return request(id);
+          case 10:
+            data = _context.sent;
+            setDetail(handleDetailData ? handleDetailData(data) : data);
+          case 12:
+            _context.next = 17;
+            break;
+          case 14:
+            _context.prev = 14;
+            _context.t0 = _context["catch"](6);
+            console.error('Failed to fetch detail:', _context.t0);
+          case 17:
+            _context.prev = 17;
+            setLoading(false);
+            return _context.finish(17);
+          case 20:
+          case "end":
+            return _context.stop();
+        }
+      }, _callee, null, [[6, 14, 17, 20]]);
+    }));
+    return function getDetail(_x) {
+      return _ref5.apply(this, arguments);
+    };
+  }();
+  useEffect(function () {
+    _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
+      return _regeneratorRuntime().wrap(function _callee2$(_context2) {
+        while (1) switch (_context2.prev = _context2.next) {
+          case 0:
+            if (!(values !== null && values !== void 0 && values.id && request)) {
+              _context2.next = 5;
+              break;
+            }
+            _context2.next = 3;
+            return getDetail(values.id);
+          case 3:
+            _context2.next = 15;
+            break;
+          case 5:
+            _context2.t0 = setDetail;
+            if (!handleDetailData) {
+              _context2.next = 12;
+              break;
+            }
+            _context2.next = 9;
+            return handleDetailData(values);
+          case 9:
+            _context2.t1 = _context2.sent;
+            _context2.next = 13;
+            break;
+          case 12:
+            _context2.t1 = values;
+          case 13:
+            _context2.t2 = _context2.t1;
+            (0, _context2.t0)(_context2.t2);
+          case 15:
+          case "end":
+            return _context2.stop();
+        }
+      }, _callee2);
+    }))();
+  }, [JSON.stringify(values)]);
+  return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Descriptions, _extends({
+    column: 1,
+    bordered: true
+  }, descProps || {}), columns === null || columns === void 0 ? void 0 : columns.filter(function (item) {
+    return !item.hideInDetail;
+  }).map(function (item, index) {
+    var _item$fieldProps, _item$fieldProps2;
+    return /*#__PURE__*/React.createElement(React.Fragment, {
+      key: item.dataIndex
+    }, /*#__PURE__*/React.createElement(Descriptions.Item, _extends({
+      key: item.dataIndex,
+      label: "".concat(item.title)
+    }, ((_item$fieldProps = item.fieldProps) === null || _item$fieldProps === void 0 ? void 0 : _item$fieldProps.descriptionsItemProps) || {}), item.type === 'upload' ? /*#__PURE__*/React.createElement(DescImage, {
+      data: detail[item.dataIndex]
+    }) : handleDetailValue(item, detail[item.dataIndex], index) || '-', /*#__PURE__*/React.createElement("span", null, ((_item$fieldProps2 = item.fieldProps) === null || _item$fieldProps2 === void 0 ? void 0 : _item$fieldProps2.suffix) || '')));
+  })), /*#__PURE__*/React.createElement(Spin, {
+    spinning: loading,
+    fullscreen: true
+  }));
+};
+export default CustomDescriptions;

package/dist/CustomDetailModal/index.js

@@ -1,5 +1,4 @@
 import _extends from "@babel/runtime/helpers/esm/extends";
-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 _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
@@ -11,11 +10,8 @@ var _excluded = ["type", "columns", "detailRequest", "handleDetailData", "title"
  * @Description:
  */
 
-import { findTreeNodeByKey, isEmptyValue } from "../utils/util";
-import { Descriptions, Drawer, Image, Modal, Spin } from 'antd';
-import isNumber from 'lodash/isNumber';
-import isObject from 'lodash/isObject';
-import isString from 'lodash/isString';
+import CustomDescriptions from "../CustomDescriptions";
+import { Drawer, Modal } from 'antd';
 import React, { forwardRef, useImperativeHandle, useState } from 'react';
 import "./index.less";
 var CustomModal = /*#__PURE__*/forwardRef(function (props, ref) {
@@ -30,168 +26,37 @@ var CustomModal = /*#__PURE__*/forwardRef(function (props, ref) {
     _useState2 = _slicedToArray(_useState, 2),
     open = _useState2[0],
     setOpen = _useState2[1];
-  var _useState3 = useState(false),
+  var _useState3 = useState(),
     _useState4 = _slicedToArray(_useState3, 2),
-    loading = _useState4[0],
-    setLoading = _useState4[1];
-  var _useState5 = useState({}),
-    _useState6 = _slicedToArray(_useState5, 2),
-    detail = _useState6[0],
-    setDetail = _useState6[1];
+    detail = _useState4[0],
+    setDetail = _useState4[1];
   var modalType = {
     modal: Modal,
     drawer: Drawer
   };
   var Component = modalType[type || 'drawer'];
-  var getDetail = /*#__PURE__*/function () {
-    var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(id) {
-      var data;
-      return _regeneratorRuntime().wrap(function _callee$(_context) {
-        while (1) switch (_context.prev = _context.next) {
-          case 0:
-            if (!(!isString(id) && !isNumber(id))) {
-              _context.next = 3;
-              break;
-            }
-            console.warn('Invalid id parameter:', id);
-            return _context.abrupt("return");
-          case 3:
-            if (!loading) {
-              _context.next = 5;
-              break;
-            }
-            return _context.abrupt("return");
-          case 5:
-            setLoading(true);
-            _context.prev = 6;
-            _context.next = 9;
-            return detailRequest(id);
-          case 9:
-            data = _context.sent;
-            setDetail(handleDetailData ? handleDetailData(data) : data);
-            _context.next = 16;
-            break;
-          case 13:
-            _context.prev = 13;
-            _context.t0 = _context["catch"](6);
-            console.error('Failed to fetch detail:', _context.t0);
-          case 16:
-            _context.prev = 16;
-            setLoading(false);
-            return _context.finish(16);
-          case 19:
-          case "end":
-            return _context.stop();
-        }
-      }, _callee, null, [[6, 13, 16, 19]]);
-    }));
-    return function getDetail(_x) {
-      return _ref.apply(this, arguments);
-    };
-  }();
   var close = function close() {
     setOpen(false);
   };
   useImperativeHandle(ref, function () {
     return {
       open: function open(values) {
-        return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
-          return _regeneratorRuntime().wrap(function _callee2$(_context2) {
-            while (1) switch (_context2.prev = _context2.next) {
+        return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+          return _regeneratorRuntime().wrap(function _callee$(_context) {
+            while (1) switch (_context.prev = _context.next) {
               case 0:
                 setOpen(true);
-                if (!(values.id && detailRequest)) {
-                  _context2.next = 6;
-                  break;
-                }
-                _context2.next = 4;
-                return getDetail(values.id);
-              case 4:
-                _context2.next = 16;
-                break;
-              case 6:
-                _context2.t0 = setDetail;
-                if (!handleDetailData) {
-                  _context2.next = 13;
-                  break;
-                }
-                _context2.next = 10;
-                return handleDetailData(values);
-              case 10:
-                _context2.t1 = _context2.sent;
-                _context2.next = 14;
-                break;
-              case 13:
-                _context2.t1 = values;
-              case 14:
-                _context2.t2 = _context2.t1;
-                (0, _context2.t0)(_context2.t2);
-              case 16:
+                setDetail(values);
+              case 2:
               case "end":
-                return _context2.stop();
+                return _context.stop();
             }
-          }, _callee2);
+          }, _callee);
         }))();
       },
       close: close
     };
   });
-  var handleDetailValue = function handleDetailValue(column, value, index) {
-    if (isEmptyValue(value)) return value;
-    var fieldProps = column.fieldProps,
-      valueEnum = column.valueEnum;
-    var _ref2 = fieldProps || {},
-      options = _ref2.options;
-    if (column.render) {
-      return column.render(value, detail, index, {}, column);
-    } else if (['select', 'radio'].includes(column.type)) {
-      var valuesEnum = _objectSpread({}, valueEnum);
-      var values = "".concat(value).split(',');
-      var result = [];
-      if (Object.keys(valuesEnum).length > 0 && isObject(valuesEnum)) {
-        values.forEach(function (item) {
-          var _item;
-          result.push(((_item = valuesEnum[item]) === null || _item === void 0 ? void 0 : _item.text) || value);
-        });
-        return result.join(',');
-      } else if (Array.isArray(options) && options.length > 0) {
-        values.forEach(function (item) {
-          var _ref3 = findTreeNodeByKey(options, item) || {},
-            label = _ref3.label;
-          console.log(label, '...label...');
-          result.push(label || value);
-        });
-        return result.join(',');
-      }
-      return value;
-    }
-    return value;
-  };
-  var DescImage = function DescImage(_ref4) {
-    var data = _ref4.data;
-    if (!data) return data;
-    var list = data;
-    if (typeof data === 'string') {
-      list = data.split(',');
-    }
-    return /*#__PURE__*/React.createElement(Image.PreviewGroup, null, /*#__PURE__*/React.createElement("div", {
-      style: {
-        display: 'flex',
-        flexWrap: 'wrap',
-        gap: 10
-      }
-    }, list.map(function (item, index) {
-      return /*#__PURE__*/React.createElement(Image, {
-        key: index,
-        width: 100,
-        src: item.url || item,
-        alt: item.name || item,
-        style: {
-          marginRight: 10
-        }
-      });
-    })));
-  };
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Component, _extends({
     width: other.width || 600,
     title: "".concat(title || '', "\u8BE6\u60C5")
@@ -199,24 +64,11 @@ var CustomModal = /*#__PURE__*/forwardRef(function (props, ref) {
     open: open,
     onClose: close,
     className: "detailContainer"
-  }), /*#__PURE__*/React.createElement(Descriptions, _extends({
-    column: 1,
-    bordered: true
-  }, descProps || {}), columns === null || columns === void 0 ? void 0 : columns.filter(function (item) {
-    return !item.hideInDetail;
-  }).map(function (item, index) {
-    var _item$fieldProps, _item$fieldProps2;
-    return /*#__PURE__*/React.createElement(React.Fragment, {
-      key: item.dataIndex
-    }, /*#__PURE__*/React.createElement(Descriptions.Item, _extends({
-      key: item.dataIndex,
-      label: "".concat(item.title)
-    }, ((_item$fieldProps = item.fieldProps) === null || _item$fieldProps === void 0 ? void 0 : _item$fieldProps.descriptionsItemProps) || {}), item.type === 'upload' ? /*#__PURE__*/React.createElement(DescImage, {
-      data: detail[item.dataIndex]
-    }) : handleDetailValue(item, detail[item.dataIndex], index) || '-', /*#__PURE__*/React.createElement("span", null, ((_item$fieldProps2 = item.fieldProps) === null || _item$fieldProps2 === void 0 ? void 0 : _item$fieldProps2.suffix) || '')));
-  }))), /*#__PURE__*/React.createElement(Spin, {
-    spinning: loading,
-    fullscreen: true
-  }));
+  }), /*#__PURE__*/React.createElement(CustomDescriptions, _extends({
+    request: detailRequest,
+    columns: columns,
+    handleDetailData: handleDetailData,
+    values: detail
+  }, descProps))));
 });
 export default CustomModal;

package/dist/index.d.ts

@@ -9,6 +9,8 @@ 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 CustomDescriptions } from './CustomDescriptions';
+export type { CustomDescriptionsProps } from './CustomDescriptions/descriptions';
 export { default as CustomTag } from './CustomTag';
 export { default as CustomUpload } from './CustomUpload';
 export { default as DynamicIcon } from './DynamicIcon';

package/dist/index.js

@@ -3,6 +3,7 @@ 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 CustomDescriptions } from "./CustomDescriptions";
 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.8.0",
+  "version": "1.9.0",
   "description": "react design 5 lib",
   "license": "MIT",
   "module": "dist/index.js",