@guo514360255/antd-lib 1.4.25 → 1.4.27

package/dist/CustomDetailModal/index.js

@@ -135,14 +135,15 @@ var CustomModal = /*#__PURE__*/forwardRef(function (props, ref) {
       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);
+          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;
-          result.push(label);
+          console.log(label, '...label...');
+          result.push(label || value);
         });
         return result.join(',');
       }

package/dist/CustomTable/index.js

@@ -6,7 +6,8 @@ import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
 var _excluded = ["isIndex", "isDelete", "isUpdateState", "isDetail", "isUpdate", "isCreate", "createText", "columns", "rowKey", "request", "title", "defaultQueryParams", "toolBarRender", "formColumns", "formList", "dataSource", "deleteRequest", "detailRequest", "saveRequest", "updateRequest", "updateStateRequest", "handleModalData", "handleDetailData", "formProps", "detailProps"],
-  _excluded2 = ["list"];
+  _excluded2 = ["text", "msg", "isConfirm", "onClick", "danger", "isShow", "order"],
+  _excluded3 = ["list"];
 /*
  * @Author: 郭郭
  * @Date: 2025/8/11
@@ -15,9 +16,11 @@ var _excluded = ["isIndex", "isDelete", "isUpdateState", "isDetail", "isUpdate",
 
 import { ProTable } from '@ant-design/pro-table';
 import CustomFormModal from "../CustomFormModal";
+import { isEmptyValue } from "../utils/util";
 import { Button, message, Popconfirm, Progress } from 'antd';
 import cloneDeep from 'lodash/cloneDeep';
 import debounce from 'lodash/debounce';
+import isFunction from 'lodash/isFunction';
 import React, { forwardRef, useEffect, useImperativeHandle, useRef, useState } from 'react';
 import CustomDetailModal from "../CustomDetailModal";
 import "./index.less";
@@ -78,57 +81,59 @@ var CustomTable = /*#__PURE__*/forwardRef(function (props, ref) {
     setScrollBar = _useState4[1];
   var tableContainerRef = useRef(null);
   var delEvent = /*#__PURE__*/function () {
-    var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(id) {
+    var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(_ref) {
+      var id;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
+            id = _ref.id;
             setLoading(true);
-            _context.prev = 1;
+            _context.prev = 2;
             if (!deleteRequest) {
-              _context.next = 9;
+              _context.next = 10;
               break;
             }
-            _context.next = 5;
+            _context.next = 6;
             return deleteRequest(id);
-          case 5:
+          case 6:
             messageApi.success('删除成功');
             setTimeout(function () {
               var _actionRef$current;
               (_actionRef$current = actionRef.current) === null || _actionRef$current === void 0 || _actionRef$current.reload();
             }, 0);
-            _context.next = 10;
+            _context.next = 11;
             break;
-          case 9:
-            messageApi.error('删除接口未传入');
           case 10:
-            _context.next = 16;
+            messageApi.error('删除接口未传入');
+          case 11:
+            _context.next = 17;
             break;
-          case 12:
-            _context.prev = 12;
-            _context.t0 = _context["catch"](1);
+          case 13:
+            _context.prev = 13;
+            _context.t0 = _context["catch"](2);
             messageApi.error('删除失败');
             console.log(_context.t0);
-          case 16:
-            _context.prev = 16;
+          case 17:
+            _context.prev = 17;
             setLoading(false);
-            return _context.finish(16);
-          case 19:
+            return _context.finish(17);
+          case 20:
           case "end":
             return _context.stop();
         }
-      }, _callee, null, [[1, 12, 16, 19]]);
+      }, _callee, null, [[2, 13, 17, 20]]);
     }));
     return function delEvent(_x) {
-      return _ref.apply(this, arguments);
+      return _ref2.apply(this, arguments);
     };
   }();
   var updateState = /*#__PURE__*/function () {
-    var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(_ref2) {
+    var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(_ref3) {
       var id, isActive, _formRef$current;
       return _regeneratorRuntime().wrap(function _callee2$(_context2) {
         while (1) switch (_context2.prev = _context2.next) {
           case 0:
-            id = _ref2.id, isActive = _ref2.isActive;
+            id = _ref3.id, isActive = _ref3.isActive;
             setLoading(true);
             _context2.prev = 2;
             if (!updateStateRequest) {
@@ -166,7 +171,7 @@ var CustomTable = /*#__PURE__*/forwardRef(function (props, ref) {
       }, _callee2, null, [[2, 13, 17, 20]]);
     }));
     return function updateState(_x2) {
-      return _ref3.apply(this, arguments);
+      return _ref4.apply(this, arguments);
     };
   }();
   var openModal = function openModal() {
@@ -233,8 +238,51 @@ var CustomTable = /*#__PURE__*/forwardRef(function (props, ref) {
         });
       };
     }
+    var getButtons = function getButtons(record) {
+      var _detailRef$current;
+      var buts = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : [];
+      return [{
+        text: '详情',
+        type: 'link',
+        // @ts-ignore
+        onClick: (_detailRef$current = detailRef.current) === null || _detailRef$current === void 0 ? void 0 : _detailRef$current.open,
+        isShow: isDetail,
+        order: 10
+      }, {
+        text: '编辑',
+        type: 'link',
+        onClick: openModal,
+        isShow: isUpdate,
+        order: 20
+      }, {
+        text: '删除',
+        type: 'link',
+        onClick: delEvent,
+        isShow: isDelete,
+        isConfirm: true,
+        danger: true,
+        msg: '确定删除当前数据？',
+        order: 30
+      }, {
+        text: record.isActive === 0 ? '禁用' : '启用',
+        type: 'link',
+        onClick: updateState,
+        isShow: isUpdateState,
+        danger: record.isActive === 0,
+        isConfirm: true,
+        msg: "\u786E\u5B9A\u8981".concat(record.isActive === 0 ? '启用' : '禁用', "\u8BE5\u6570\u636E\u5417\uFF1F"),
+        order: 40
+      }].concat(_toConsumableArray(buts));
+    };
 
-    // 操作列
+    /**
+     * 操作列
+     * 详情：默认显示
+     * 编辑：默认显示
+     * 删除：默认显示
+     * 启用/禁用：默认不显示
+     * buttons：为函数
+     */
     var operation = newColumns === null || newColumns === void 0 ? void 0 : newColumns.find(function (item) {
       return item.dataIndex === 'operation' || item.valueType === 'option';
     });
@@ -245,38 +293,47 @@ var CustomTable = /*#__PURE__*/forwardRef(function (props, ref) {
         operation.width = [isDetail, isDelete, isUpdateState, isUpdate].filter(Boolean).length * 65;
       }
       operation.render = function (_, record) {
+        var _getButtons;
+        var buts = Array.isArray(operation.buttons) ? operation.buttons : [];
+        var buttons = (_getButtons = getButtons(record, buts)) === null || _getButtons === void 0 || (_getButtons = _getButtons.filter(function (item) {
+          return item.isShow || isEmptyValue(item.isShow);
+        })) === null || _getButtons === void 0 ? void 0 : _getButtons.sort(function (prev, next) {
+          return (prev === null || prev === void 0 ? void 0 : prev.order) - (next === null || next === void 0 ? void 0 : next.order);
+        });
         return /*#__PURE__*/React.createElement("div", {
           style: {
             display: 'flex'
           }
-        }, isDetail && /*#__PURE__*/React.createElement(Button, {
-          type: "link"
-          // @ts-ignore
-          ,
-          onClick: function onClick() {
-            var _detailRef$current;
-            return (_detailRef$current = detailRef.current) === null || _detailRef$current === void 0 ? void 0 : _detailRef$current.open(record);
-          }
-        }, "\u8BE6\u60C5"), isUpdate && /*#__PURE__*/React.createElement(Button, {
-          type: "link",
-          onClick: function onClick() {
-            return openModal(record);
-          }
-        }, "\u7F16\u8F91"), isDelete && /*#__PURE__*/React.createElement(Popconfirm, {
-          title: "\u786E\u5B9A\u5220\u9664\u5F53\u524D\u6570\u636E\uFF1F",
-          onConfirm: function onConfirm() {
-            return delEvent(record.id);
-          }
-        }, /*#__PURE__*/React.createElement(Button, {
-          type: "link",
-          danger: true
-        }, "\u5220\u9664")), isUpdateState && /*#__PURE__*/React.createElement(Button, {
-          type: "link",
-          danger: record.isActive === 1,
-          onClick: function onClick() {
-            return updateState(record);
+        }, buttons === null || buttons === void 0 ? void 0 : buttons.map(function (_ref5, index) {
+          var text = _ref5.text,
+            msg = _ref5.msg,
+            isConfirm = _ref5.isConfirm,
+            _onClick = _ref5.onClick,
+            danger = _ref5.danger,
+            isShow = _ref5.isShow,
+            order = _ref5.order,
+            item = _objectWithoutProperties(_ref5, _excluded2);
+          if (isConfirm) {
+            return /*#__PURE__*/React.createElement(Popconfirm, _extends({
+              key: index,
+              title: msg,
+              onConfirm: function onConfirm() {
+                return _onClick && _onClick(record);
+              }
+            }, item || {}), /*#__PURE__*/React.createElement(Button, _extends({
+              type: "link",
+              danger: danger
+            }, item), text));
           }
-        }, record.isActive === 0 ? '启用' : '禁用'), operation.buttons && operation.buttons(record));
+          return /*#__PURE__*/React.createElement(Button, _extends({
+            key: index,
+            type: "link",
+            onClick: function onClick() {
+              return _onClick && _onClick(record);
+            },
+            danger: danger
+          }, item), text);
+        }), isFunction(operation.buttons) && operation.buttons(record));
       };
     }
     return newColumns === null || newColumns === void 0 ? void 0 : newColumns.map(function (item) {
@@ -285,6 +342,8 @@ var CustomTable = /*#__PURE__*/forwardRef(function (props, ref) {
       }) : item;
     });
   };
+
+  // 控制操作列宽度
   var getAntTableContainer = function getAntTableContainer() {
     var tableContainer = tableContainerRef.current;
     var tableBody = tableContainer === null || tableContainer === void 0 ? void 0 : tableContainer.querySelector('.ant-table-body');
@@ -343,7 +402,7 @@ var CustomTable = /*#__PURE__*/forwardRef(function (props, ref) {
     formRef: formRef,
     columns: handleColumns() || [],
     request: ( /*#__PURE__*/function () {
-      var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(params, sort, filter) {
+      var _ref6 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(params, sort, filter) {
         var pageNo, _yield$request, list, data;
         return _regeneratorRuntime().wrap(function _callee3$(_context3) {
           while (1) switch (_context3.prev = _context3.next) {
@@ -363,7 +422,7 @@ var CustomTable = /*#__PURE__*/forwardRef(function (props, ref) {
             case 7:
               _yield$request = _context3.sent;
               list = _yield$request.list;
-              data = _objectWithoutProperties(_yield$request, _excluded2);
+              data = _objectWithoutProperties(_yield$request, _excluded3);
               getAntTableContainer();
               return _context3.abrupt("return", _objectSpread({
                 data: list
@@ -388,7 +447,7 @@ var CustomTable = /*#__PURE__*/forwardRef(function (props, ref) {
         }, _callee3, null, [[2, 14, 17, 20]]);
       }));
       return function (_x3, _x4, _x5) {
-        return _ref4.apply(this, arguments);
+        return _ref6.apply(this, arguments);
       };
     }()),
     rowKey: rowKey || 'id',

package/dist/CustomTag/index.d.ts

@@ -1,3 +1,4 @@
 /// <reference types="react" />
-declare const CustomTag: ({ value, valueEnum }: CustomTagProps, record?: any, __?: any, ___?: any, column?: any) => JSX.Element;
+import type { CustomTagProps } from "./tag";
+declare const CustomTag: ({ value, valueEnum, options }: CustomTagProps) => JSX.Element | JSX.Element[];
 export default CustomTag;

package/dist/CustomTag/index.js

@@ -1,30 +1,65 @@
+import _extends from "@babel/runtime/helpers/esm/extends";
 /*
  * @Author: 郭郭
  * @Date: 2025/11/11
  * @Description:
  */
-import { isEmptyValue } from "../src";
+
+import { isEmptyValue } from "../utils/util";
 import { Tag } from 'antd';
+import isObject from 'lodash/isObject';
 import React from 'react';
-var CustomTag = function CustomTag(_ref, record, __, ___, column) {
+var CustomTag = function CustomTag(_ref) {
+  var _ref2;
   var value = _ref.value,
-    valueEnum = _ref.valueEnum;
-  if (column) {
-    var _ref2 = column.valueEnum[record.status] || {},
-      _color = _ref2.color,
-      _status = _ref2.status,
-      _text = _ref2.text;
-    return /*#__PURE__*/React.createElement(Tag, {
-      color: _color || _status
-    }, _text);
+    valueEnum = _ref.valueEnum,
+    options = _ref.options;
+  // 判空
+  if (isEmptyValue(value)) return /*#__PURE__*/React.createElement(React.Fragment, null, "-");
+
+  // 判断valueEnum 和 options是否为空
+  if (!valueEnum && !options || !isObject(valueEnum) && !options || !Array.isArray(options) && !valueEnum) {
+    return /*#__PURE__*/React.createElement(React.Fragment, null, value);
   }
-  if (isEmptyValue(value)) return /*#__PURE__*/React.createElement(React.Fragment, null, value);
-  var _ref3 = valueEnum[value] || {},
-    color = _ref3.color,
-    status = _ref3.status,
-    text = _ref3.text;
-  return /*#__PURE__*/React.createElement(Tag, {
-    color: color || status
-  }, text);
+
+  // 渲染标签
+  var render = function render(color, text, tagProps) {
+    return /*#__PURE__*/React.createElement(Tag, _extends({
+      color: color
+    }, tagProps || {}), text);
+  };
+  var newValues = (_ref2 = "".concat(value)) === null || _ref2 === void 0 ? void 0 : _ref2.split(',');
+  var result = [];
+
+  // 判断newValues长度
+  if (newValues.length === 1) {
+    newValues = [value];
+  }
+
+  // 循环value值获取text || label
+  newValues.forEach(function (val) {
+    if (Array.isArray(options)) {
+      var _ref3 = options.filter(function (item) {
+          return "".concat(item.value) === "".concat(val);
+        }) || {},
+        label = _ref3.label,
+        color = _ref3.color,
+        status = _ref3.status,
+        tagProps = _ref3.tagProps;
+      result.push(render(color || status, label || val, tagProps));
+    } else {
+      var _ref4 = valueEnum[val] || {},
+        _color = _ref4.color,
+        _status = _ref4.status,
+        text = _ref4.text,
+        _tagProps = _ref4.tagProps;
+      result.push(render(_color || _status, text || val, _tagProps));
+    }
+  });
+  return result.map(function (item, index) {
+    return /*#__PURE__*/React.createElement(React.Fragment, {
+      key: index
+    }, item);
+  });
 };
 export default CustomTag;

package/dist/CustomTag/tag.d.ts

@@ -4,16 +4,36 @@
  * @Description:
  */
 
+import type { TagProps } from 'antd';
+
 interface CustomTagProps {
   /**
    * 标签名称
    */
-  value: string | number;
+  value: string | number | boolean;
+
+  /**
+   * 配置数组
+   */
+  options?: Array<{
+    [key: string | number | boolean]: any;
+    tagProps?: TagProps;
+  }>;
+
+  /**
+   * 异步数据
+   */
+  // request?: (params: any) => Promise<any>;
 
   /**
    * 枚举
    */
-  valueEnum: {
-    [key: stirng]: { text: string; status?: string; color?: string };
+  valueEnum?: {
+    [key: stirng | number | boolean]: {
+      text: string;
+      status?: string;
+      color?: string;
+      tagProps?: TagProps;
+    };
   };
 }

package/dist/compontent.d.ts

@@ -4,10 +4,10 @@
  * @Description:
  */
 
-import { ProColumns } from '@ant-design/pro-table';
-import { Rules } from '@rc-component/async-validator';
-import { ImgCropProps } from 'antd-img-crop';
-import { ReactNode } from 'react';
+import type { ProColumns } from '@ant-design/pro-table';
+import type { Rules } from '@rc-component/async-validator';
+import type { ButtonProps } from 'antd';
+import type { ImgCropProps } from 'antd-img-crop';
 
 interface CustomColumnProps extends ProColumns {
   /**
@@ -82,5 +82,7 @@ interface CustomColumnProps extends ProColumns {
   /**
    * 操作按钮
    */
-  buttons?: (data: { [key: string]: any }) => ReactNode;
+  buttons?: (data: {
+    [key: string]: any;
+  }) => any | (ButtonProps & { text: string; order: number }[]);
 }

package/package.json

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