@hw-component/table 1.9.68 → 1.9.70

package/es/modal.d.ts

@@ -126,7 +126,7 @@ export interface DwTableProps extends DrawerProps {
     request?: HTableProps["request"];
     contentRender?: (node: React.ReactNode) => React.ReactNode;
 }
-export interface ModalTableProps extends ModalProps {
+export interface ModalTableProps extends Omit<ModalProps, "onOk"> {
     tableProps?: Omit<HTableProps, "configData" | "request">;
     dialogTable?: HDiaLogTableInstance;
     params?: Record<string, any>;
@@ -134,6 +134,7 @@ export interface ModalTableProps extends ModalProps {
     request?: HTableProps["request"];
     contentRender?: (node: React.ReactNode) => React.ReactNode;
     dataSource?: any[];
+    onOk?: (e?: React.MouseEvent<HTMLElement>) => void;
 }
 export type ValueTypeConfigRenderFn = (config: ConfigItemModal, itemData: any, index: number, tableInstance: HTableInstance) => React.ReactNode;
 export type ValueTypeConfigModal = Record<string, ValueTypeConfigRenderFn>;

package/es/render/TagsComponent.d.ts

@@ -16,6 +16,7 @@ interface IProps {
     tableInstance?: HTableInstance;
     maxLen?: number | null;
     popoverContentRender?: (node: React.ReactNode) => React.ReactNode;
+    contentItemRender?: (item: any) => React.ReactNode;
 }
 declare const TagsComponent: (props: IProps) => JSX.Element;
 export default TagsComponent;

package/es/render/TagsComponent.js

@@ -17,6 +17,7 @@ import { jsxs, jsx } from 'react/jsx-runtime';
 import { Row, Tooltip, Tag, Popover } from 'antd';
 import { useMemo } from 'react';
 
+var _excluded = ["contentItemRender"];
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[_Symbol$toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 function ownKeys(e, r) { var t = _Object$keys(e); if (_Object$getOwnPropertySymbols) { var o = _Object$getOwnPropertySymbols(e); r && (o = _filterInstanceProperty(o).call(o, function (r) { return _Object$getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
@@ -68,6 +69,8 @@ var TagsComponent = function TagsComponent(props) {
     tagData = _useMemo.tagData,
     moreTag = _useMemo.moreTag;
   var moreLen = moreTag === null || moreTag === void 0 ? void 0 : moreTag.length;
+  var contentItemRender = props.contentItemRender,
+    childProps = _objectWithoutProperties(props, _excluded);
   return jsxs(Row, {
     gutter: [0, 8],
     children: [tagData === null || tagData === void 0 ? void 0 : _mapInstanceProperty(tagData).call(tagData, function (tagItem, index) {
@@ -87,7 +90,7 @@ var TagsComponent = function TagsComponent(props) {
               e.preventDefault();
               _onClose === null || _onClose === void 0 || _onClose(indexKey, tableInstance);
             },
-            children: tagItem
+            children: contentItemRender ? contentItemRender(tagItem) : tagItem
           }), indexKey)
         }));
       }
@@ -103,13 +106,13 @@ var TagsComponent = function TagsComponent(props) {
             e.preventDefault();
             cuTagProps === null || cuTagProps === void 0 || cuTagProps.onClose(cuKey, tableInstance);
           },
-          children: tagLabel
+          children: contentItemRender ? contentItemRender(tagLabel) : tagLabel
         }), cuKey)
       }));
     }), !moreLen ? null : jsx(Popover, {
-      content: popoverContentRender ? popoverContentRender(jsx(TagsComponent, _objectSpread(_objectSpread({}, props), {}, {
+      content: popoverContentRender ? popoverContentRender(jsx(TagsComponent, _objectSpread(_objectSpread({}, childProps), {}, {
         maxLen: null
-      }))) : jsx(TagsComponent, _objectSpread(_objectSpread({}, props), {}, {
+      }))) : jsx(TagsComponent, _objectSpread(_objectSpread({}, childProps), {}, {
         maxLen: null
       })),
       children: jsxs(Tag, {

package/lib/modal.d.ts

@@ -126,7 +126,7 @@ export interface DwTableProps extends DrawerProps {
     request?: HTableProps["request"];
     contentRender?: (node: React.ReactNode) => React.ReactNode;
 }
-export interface ModalTableProps extends ModalProps {
+export interface ModalTableProps extends Omit<ModalProps, "onOk"> {
     tableProps?: Omit<HTableProps, "configData" | "request">;
     dialogTable?: HDiaLogTableInstance;
     params?: Record<string, any>;
@@ -134,6 +134,7 @@ export interface ModalTableProps extends ModalProps {
     request?: HTableProps["request"];
     contentRender?: (node: React.ReactNode) => React.ReactNode;
     dataSource?: any[];
+    onOk?: (e?: React.MouseEvent<HTMLElement>) => void;
 }
 export type ValueTypeConfigRenderFn = (config: ConfigItemModal, itemData: any, index: number, tableInstance: HTableInstance) => React.ReactNode;
 export type ValueTypeConfigModal = Record<string, ValueTypeConfigRenderFn>;

package/lib/render/TagsComponent.d.ts

@@ -16,6 +16,7 @@ interface IProps {
     tableInstance?: HTableInstance;
     maxLen?: number | null;
     popoverContentRender?: (node: React.ReactNode) => React.ReactNode;
+    contentItemRender?: (item: any) => React.ReactNode;
 }
 declare const TagsComponent: (props: IProps) => JSX.Element;
 export default TagsComponent;

package/lib/render/TagsComponent.js

@@ -20,6 +20,7 @@ var jsxRuntime = require('react/jsx-runtime');
 var antd = require('antd');
 var React = require('react');
 
+var _excluded = ["contentItemRender"];
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[_Symbol$toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 function ownKeys(e, r) { var t = _Object$keys(e); if (_Object$getOwnPropertySymbols) { var o = _Object$getOwnPropertySymbols(e); r && (o = _filterInstanceProperty(o).call(o, function (r) { return _Object$getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
@@ -71,6 +72,8 @@ var TagsComponent = function TagsComponent(props) {
     tagData = _useMemo.tagData,
     moreTag = _useMemo.moreTag;
   var moreLen = moreTag === null || moreTag === void 0 ? void 0 : moreTag.length;
+  var contentItemRender = props.contentItemRender,
+    childProps = _objectWithoutProperties(props, _excluded);
   return jsxRuntime.jsxs(antd.Row, {
     gutter: [0, 8],
     children: [tagData === null || tagData === void 0 ? void 0 : _mapInstanceProperty(tagData).call(tagData, function (tagItem, index) {
@@ -90,7 +93,7 @@ var TagsComponent = function TagsComponent(props) {
               e.preventDefault();
               _onClose === null || _onClose === void 0 || _onClose(indexKey, tableInstance);
             },
-            children: tagItem
+            children: contentItemRender ? contentItemRender(tagItem) : tagItem
           }), indexKey)
         }));
       }
@@ -106,13 +109,13 @@ var TagsComponent = function TagsComponent(props) {
             e.preventDefault();
             cuTagProps === null || cuTagProps === void 0 || cuTagProps.onClose(cuKey, tableInstance);
           },
-          children: tagLabel
+          children: contentItemRender ? contentItemRender(tagLabel) : tagLabel
         }), cuKey)
       }));
     }), !moreLen ? null : jsxRuntime.jsx(antd.Popover, {
-      content: popoverContentRender ? popoverContentRender(jsxRuntime.jsx(TagsComponent, _objectSpread(_objectSpread({}, props), {}, {
+      content: popoverContentRender ? popoverContentRender(jsxRuntime.jsx(TagsComponent, _objectSpread(_objectSpread({}, childProps), {}, {
         maxLen: null
-      }))) : jsxRuntime.jsx(TagsComponent, _objectSpread(_objectSpread({}, props), {}, {
+      }))) : jsxRuntime.jsx(TagsComponent, _objectSpread(_objectSpread({}, childProps), {}, {
         maxLen: null
       })),
       children: jsxRuntime.jsxs(antd.Tag, {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hw-component/table",
-  "version": "1.9.68",
+  "version": "1.9.70",
   "description": "基于antd二次开发table组件",
   "keywords": [
     "table"

package/src/components/modal.ts

@@ -159,7 +159,7 @@ export interface DwTableProps extends DrawerProps {
   contentRender?: (node: React.ReactNode) => React.ReactNode;
 }
 
-export interface ModalTableProps extends ModalProps {
+export interface ModalTableProps extends Omit<ModalProps,"onOk"> {
   tableProps?: Omit<HTableProps, "configData" | "request">;
   dialogTable?: HDiaLogTableInstance;
   params?: Record<string, any>;
@@ -167,6 +167,7 @@ export interface ModalTableProps extends ModalProps {
   request?: HTableProps["request"];
   contentRender?: (node: React.ReactNode) => React.ReactNode;
   dataSource?: any[];
+  onOk?:(e?: React.MouseEvent<HTMLElement>)=>void;
 }
 
 export type ValueTypeConfigRenderFn = (

package/src/components/render/TagsComponent.tsx

@@ -14,6 +14,7 @@ interface IProps {
   tableInstance?: HTableInstance;
   maxLen?: number | null;
   popoverContentRender?:(node:React.ReactNode)=>React.ReactNode;
+  contentItemRender?:(item:any)=>React.ReactNode;
 }
 const getTooltipProps = (
   title: string,
@@ -62,7 +63,7 @@ const TagsComponent = (props: IProps) => {
     };
   }, [data, maxLen]);
   const moreLen = moreTag?.length;
-
+  const {contentItemRender,...childProps}=props;
   return (
     <Row gutter={[0, 8]}>
       {tagData?.map((tagItem, index) => {
@@ -85,7 +86,7 @@ const TagsComponent = (props: IProps) => {
                   onClose?.(indexKey, tableInstance);
                 }}
               >
-                {tagItem}
+                {contentItemRender?contentItemRender(tagItem):tagItem}
               </Tag>
             </Tooltip>
           );
@@ -107,13 +108,13 @@ const TagsComponent = (props: IProps) => {
                 cuTagProps?.onClose(cuKey, tableInstance);
               }}
             >
-              {tagLabel}
+              {contentItemRender?contentItemRender(tagLabel):tagLabel}
             </Tag>
           </Tooltip>
         );
       })}
       {!moreLen ? null : (
-        <Popover content={popoverContentRender?popoverContentRender(<TagsComponent {...props} maxLen={null} />):<TagsComponent {...props} maxLen={null} />}>
+        <Popover content={popoverContentRender?popoverContentRender(<TagsComponent {...childProps} maxLen={null} />):<TagsComponent {...childProps} maxLen={null} />}>
           <Tag>...等{data.length}个</Tag>
         </Popover>
       )}