@hw-component/table 1.10.27 → 1.10.29

package/es/DialogTable/DwEditTable.d.ts

@@ -1,5 +1,5 @@
 /// <reference types="react" />
 import type { DwTableProps } from "../modal";
 import { ProColumns } from "@ant-design/pro-table/lib/typing";
-declare const _default: ({ configData: configDataProps, request: requestProps, editTableProps, editDialogTable, visible, bodyStyle, onClose, afterVisibleChange, contentRender, width, footer, ...props }: DwTableProps<ProColumns[]>) => JSX.Element;
+declare const _default: ({ configData: configDataProps, request: requestProps, editTableProps, editDialogTable, visible, bodyStyle, onClose, afterVisibleChange, contentRender, width, footer, afterClose, ...props }: DwTableProps<ProColumns[]>) => JSX.Element;
 export default _default;

package/es/DialogTable/DwEditTable.js

@@ -16,7 +16,7 @@ import { EditTableContent } from './Content.js';
 import { CloseOutlined } from '@ant-design/icons';
 import { useClassName } from '../hooks/index.js';
 
-var _excluded = ["configData", "request", "editTableProps", "editDialogTable", "visible", "bodyStyle", "onClose", "afterVisibleChange", "contentRender", "width", "footer"];
+var _excluded = ["configData", "request", "editTableProps", "editDialogTable", "visible", "bodyStyle", "onClose", "afterVisibleChange", "contentRender", "width", "footer", "afterClose"];
 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; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var _context, _context2; var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? _forEachInstanceProperty(_context = ownKeys(Object(t), !0)).call(_context, function (r) { _defineProperty(e, r, t[r]); }) : _Object$getOwnPropertyDescriptors ? _Object$defineProperties(e, _Object$getOwnPropertyDescriptors(t)) : _forEachInstanceProperty(_context2 = ownKeys(Object(t))).call(_context2, function (r) { _Object$defineProperty(e, r, _Object$getOwnPropertyDescriptor(t, r)); }); } return e; }
 var DwEditTable = (function (_ref) {
@@ -29,13 +29,14 @@ var DwEditTable = (function (_ref) {
     visible = _ref$visible === void 0 ? false : _ref$visible,
     _ref$bodyStyle = _ref.bodyStyle,
     bodyStyle = _ref$bodyStyle === void 0 ? {} : _ref$bodyStyle,
-    _onClose = _ref.onClose,
-    afterVisibleChange = _ref.afterVisibleChange,
-    contentRender = _ref.contentRender,
+    _onClose = _ref.onClose;
+    _ref.afterVisibleChange;
+    var contentRender = _ref.contentRender,
     _ref$width = _ref.width,
     width = _ref$width === void 0 ? 888 : _ref$width,
     _ref$footer = _ref.footer,
     footer = _ref$footer === void 0 ? null : _ref$footer,
+    afterClose = _ref.afterClose,
     props = _objectWithoutProperties(_ref, _excluded);
   var _useVisible = useVisible(visible),
     modalVisible = _useVisible.modalVisible,
@@ -113,7 +114,11 @@ var DwEditTable = (function (_ref) {
       padding: 0,
       paddingBottom: 12
     }, bodyStyle),
-    afterVisibleChange: afterVisibleChange,
+    afterVisibleChange: function afterVisibleChange(visible) {
+      if (!visible) {
+        afterClose === null || afterClose === void 0 || afterClose();
+      }
+    },
     children: jsx(EditTableContent, {
       contentRender: contentRender,
       editTableProps: editTableProps,

package/es/modal.d.ts

@@ -139,6 +139,7 @@ export interface DwTableProps<T = HTableProps["configData"]> extends DrawerProps
     contentRender?: (node: React.ReactNode) => React.ReactNode;
     editTableProps?: Omit<HEditTableProps, "configData" | "request">;
     dataSource?: any[];
+    afterClose?: () => void;
 }
 export interface ModalTableProps<T = HTableProps["configData"]> extends Omit<ModalProps, "onOk"> {
     tableProps?: Omit<HTableProps, "configData" | "request">;

package/es/render/TagsComponent.d.ts

@@ -20,5 +20,6 @@ interface IProps {
     contentItemRender?: (item: any) => React.ReactNode;
     extra?: React.ReactNode;
 }
+export declare const Text: React.FC;
 declare const TagsComponent: (props: IProps) => JSX.Element;
 export default TagsComponent;

package/es/render/TagsComponent.js

@@ -14,7 +14,7 @@ import _defineProperty from '@babel/runtime-corejs3/helpers/defineProperty';
 import _sliceInstanceProperty from '@babel/runtime-corejs3/core-js-stable/instance/slice';
 import _mapInstanceProperty from '@babel/runtime-corejs3/core-js-stable/instance/map';
 import { jsxs, jsx } from 'react/jsx-runtime';
-import { Row, Tooltip, Tag, Popover } from 'antd';
+import { Row, Tooltip, Tag, Popover, Typography } from 'antd';
 import { useMemo } from 'react';
 
 var _excluded = ["contentItemRender"];
@@ -41,6 +41,15 @@ var getTooltipProps = function getTooltipProps(item, tooltip) {
     title: title
   });
 };
+var Text = function Text(_ref) {
+  var children = _ref.children;
+  return jsx(Typography.Text, {
+    ellipsis: {
+      tooltip: children
+    },
+    children: children
+  });
+};
 var TagsComponent = function TagsComponent(props) {
   var data = props.data,
     closable = props.closable,
@@ -91,13 +100,20 @@ var TagsComponent = function TagsComponent(props) {
         var _tooltipProps = getTooltipProps({
           title: tagItem
         }, tooltip);
+        var _tagNode = jsx(Text, {
+          children: tagItem
+        });
         return jsx(Tooltip, _objectSpread(_objectSpread({}, _tooltipProps), {}, {
-          children: jsx(Tag, _objectSpread(_objectSpread({}, tagProps), {}, {
+          children: jsx(Tag, _objectSpread(_objectSpread({
+            style: {
+              maxWidth: "100%"
+            }
+          }, tagProps), {}, {
             onClose: function onClose(e) {
               e.preventDefault();
               _onClose === null || _onClose === void 0 || _onClose(indexKey, tableInstance);
             },
-            children: contentItemRender ? contentItemRender(tagItem) : tagItem
+            children: contentItemRender ? contentItemRender(_tagNode) : _tagNode
           }), indexKey)
         }));
       }
@@ -110,13 +126,20 @@ var TagsComponent = function TagsComponent(props) {
       }, itemProps), tooltip);
       var cuTagProps = _objectSpread(_objectSpread({}, tagProps), itemProps);
       var cuKey = tagValue || indexKey;
+      var tagNode = jsx(Text, {
+        children: tagLabel
+      });
       return jsx(Tooltip, _objectSpread(_objectSpread({}, tooltipProps), {}, {
-        children: jsx(Tag, _objectSpread(_objectSpread({}, cuTagProps), {}, {
+        children: jsx(Tag, _objectSpread(_objectSpread({
+          style: {
+            maxWidth: "100%"
+          }
+        }, cuTagProps), {}, {
           onClose: function onClose(e) {
             e.preventDefault();
             cuTagProps === null || cuTagProps === void 0 || cuTagProps.onClose(cuKey, tableInstance);
           },
-          children: contentItemRender ? contentItemRender(tagLabel) : tagLabel
+          children: contentItemRender ? tagNode : tagNode
         }), cuKey)
       }));
     }), !moreLen ? null : jsx(Popover, {
@@ -134,5 +157,5 @@ var TagsComponent = function TagsComponent(props) {
   });
 };
 
-export { TagsComponent as default };
+export { Text, TagsComponent as default };
 // powered by hdj

package/lib/DialogTable/DwEditTable.d.ts

@@ -1,5 +1,5 @@
 /// <reference types="react" />
 import type { DwTableProps } from "../modal";
 import { ProColumns } from "@ant-design/pro-table/lib/typing";
-declare const _default: ({ configData: configDataProps, request: requestProps, editTableProps, editDialogTable, visible, bodyStyle, onClose, afterVisibleChange, contentRender, width, footer, ...props }: DwTableProps<ProColumns[]>) => JSX.Element;
+declare const _default: ({ configData: configDataProps, request: requestProps, editTableProps, editDialogTable, visible, bodyStyle, onClose, afterVisibleChange, contentRender, width, footer, afterClose, ...props }: DwTableProps<ProColumns[]>) => JSX.Element;
 export default _default;

package/lib/DialogTable/DwEditTable.js

@@ -19,7 +19,7 @@ var Content = require('./Content.js');
 var icons = require('@ant-design/icons');
 var index = require('../hooks/index.js');
 
-var _excluded = ["configData", "request", "editTableProps", "editDialogTable", "visible", "bodyStyle", "onClose", "afterVisibleChange", "contentRender", "width", "footer"];
+var _excluded = ["configData", "request", "editTableProps", "editDialogTable", "visible", "bodyStyle", "onClose", "afterVisibleChange", "contentRender", "width", "footer", "afterClose"];
 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; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var _context, _context2; var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? _forEachInstanceProperty(_context = ownKeys(Object(t), !0)).call(_context, function (r) { _defineProperty(e, r, t[r]); }) : _Object$getOwnPropertyDescriptors ? _Object$defineProperties(e, _Object$getOwnPropertyDescriptors(t)) : _forEachInstanceProperty(_context2 = ownKeys(Object(t))).call(_context2, function (r) { _Object$defineProperty(e, r, _Object$getOwnPropertyDescriptor(t, r)); }); } return e; }
 var DwEditTable = (function (_ref) {
@@ -32,13 +32,14 @@ var DwEditTable = (function (_ref) {
     visible = _ref$visible === void 0 ? false : _ref$visible,
     _ref$bodyStyle = _ref.bodyStyle,
     bodyStyle = _ref$bodyStyle === void 0 ? {} : _ref$bodyStyle,
-    _onClose = _ref.onClose,
-    afterVisibleChange = _ref.afterVisibleChange,
-    contentRender = _ref.contentRender,
+    _onClose = _ref.onClose;
+    _ref.afterVisibleChange;
+    var contentRender = _ref.contentRender,
     _ref$width = _ref.width,
     width = _ref$width === void 0 ? 888 : _ref$width,
     _ref$footer = _ref.footer,
     footer = _ref$footer === void 0 ? null : _ref$footer,
+    afterClose = _ref.afterClose,
     props = _objectWithoutProperties(_ref, _excluded);
   var _useVisible = hooks.useVisible(visible),
     modalVisible = _useVisible.modalVisible,
@@ -116,7 +117,11 @@ var DwEditTable = (function (_ref) {
       padding: 0,
       paddingBottom: 12
     }, bodyStyle),
-    afterVisibleChange: afterVisibleChange,
+    afterVisibleChange: function afterVisibleChange(visible) {
+      if (!visible) {
+        afterClose === null || afterClose === void 0 || afterClose();
+      }
+    },
     children: jsxRuntime.jsx(Content.EditTableContent, {
       contentRender: contentRender,
       editTableProps: editTableProps,

package/lib/modal.d.ts

@@ -139,6 +139,7 @@ export interface DwTableProps<T = HTableProps["configData"]> extends DrawerProps
     contentRender?: (node: React.ReactNode) => React.ReactNode;
     editTableProps?: Omit<HEditTableProps, "configData" | "request">;
     dataSource?: any[];
+    afterClose?: () => void;
 }
 export interface ModalTableProps<T = HTableProps["configData"]> extends Omit<ModalProps, "onOk"> {
     tableProps?: Omit<HTableProps, "configData" | "request">;

package/lib/render/TagsComponent.d.ts

@@ -20,5 +20,6 @@ interface IProps {
     contentItemRender?: (item: any) => React.ReactNode;
     extra?: React.ReactNode;
 }
+export declare const Text: React.FC;
 declare const TagsComponent: (props: IProps) => JSX.Element;
 export default TagsComponent;

package/lib/render/TagsComponent.js

@@ -44,6 +44,15 @@ var getTooltipProps = function getTooltipProps(item, tooltip) {
     title: title
   });
 };
+var Text = function Text(_ref) {
+  var children = _ref.children;
+  return jsxRuntime.jsx(antd.Typography.Text, {
+    ellipsis: {
+      tooltip: children
+    },
+    children: children
+  });
+};
 var TagsComponent = function TagsComponent(props) {
   var data = props.data,
     closable = props.closable,
@@ -94,13 +103,20 @@ var TagsComponent = function TagsComponent(props) {
         var _tooltipProps = getTooltipProps({
           title: tagItem
         }, tooltip);
+        var _tagNode = jsxRuntime.jsx(Text, {
+          children: tagItem
+        });
         return jsxRuntime.jsx(antd.Tooltip, _objectSpread(_objectSpread({}, _tooltipProps), {}, {
-          children: jsxRuntime.jsx(antd.Tag, _objectSpread(_objectSpread({}, tagProps), {}, {
+          children: jsxRuntime.jsx(antd.Tag, _objectSpread(_objectSpread({
+            style: {
+              maxWidth: "100%"
+            }
+          }, tagProps), {}, {
             onClose: function onClose(e) {
               e.preventDefault();
               _onClose === null || _onClose === void 0 || _onClose(indexKey, tableInstance);
             },
-            children: contentItemRender ? contentItemRender(tagItem) : tagItem
+            children: contentItemRender ? contentItemRender(_tagNode) : _tagNode
           }), indexKey)
         }));
       }
@@ -113,13 +129,20 @@ var TagsComponent = function TagsComponent(props) {
       }, itemProps), tooltip);
       var cuTagProps = _objectSpread(_objectSpread({}, tagProps), itemProps);
       var cuKey = tagValue || indexKey;
+      var tagNode = jsxRuntime.jsx(Text, {
+        children: tagLabel
+      });
       return jsxRuntime.jsx(antd.Tooltip, _objectSpread(_objectSpread({}, tooltipProps), {}, {
-        children: jsxRuntime.jsx(antd.Tag, _objectSpread(_objectSpread({}, cuTagProps), {}, {
+        children: jsxRuntime.jsx(antd.Tag, _objectSpread(_objectSpread({
+          style: {
+            maxWidth: "100%"
+          }
+        }, cuTagProps), {}, {
           onClose: function onClose(e) {
             e.preventDefault();
             cuTagProps === null || cuTagProps === void 0 || cuTagProps.onClose(cuKey, tableInstance);
           },
-          children: contentItemRender ? contentItemRender(tagLabel) : tagLabel
+          children: contentItemRender ? tagNode : tagNode
         }), cuKey)
       }));
     }), !moreLen ? null : jsxRuntime.jsx(antd.Popover, {
@@ -137,5 +160,6 @@ var TagsComponent = function TagsComponent(props) {
   });
 };
 
+exports.Text = Text;
 exports.default = TagsComponent;
 // powered by h

package/package.json

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

package/src/components/DialogTable/DwEditTable.tsx

@@ -23,6 +23,7 @@ export default ({
   contentRender,
   width = 888,
   footer = null,
+                  afterClose,
   ...props
 }: DwTableProps<ProColumns[]>) => {
   const { modalVisible, setModalVisible } = useVisible(visible);
@@ -96,7 +97,11 @@ export default ({
       }
       width={width}
       bodyStyle={{ padding: 0, paddingBottom: 12, ...bodyStyle }}
-      afterVisibleChange={afterVisibleChange}
+      afterVisibleChange={(visible) =>{
+         if (!visible){
+           afterClose?.()
+         }
+      }}
     >
       <EditTableContent
         contentRender={contentRender}

package/src/components/modal.ts

@@ -177,6 +177,7 @@ export interface DwTableProps<T = HTableProps["configData"]>
   contentRender?: (node: React.ReactNode) => React.ReactNode;
   editTableProps?: Omit<HEditTableProps, "configData" | "request">;
   dataSource?: any[];
+  afterClose?: () => void;
 }
 
 export interface ModalTableProps<T = HTableProps["configData"]>

package/src/components/render/TagsComponent.tsx

@@ -1,4 +1,4 @@
-import { Row, Tag, Tooltip, Popover } from "antd";
+import {Row, Tag, Tooltip, Popover, Typography} from "antd";
 import React, { useMemo } from "react";
 import type { TooltipProps } from "antd/lib/tooltip";
 import type { HTableInstance } from "../modal";
@@ -43,6 +43,9 @@ const getTooltipProps = (
     title,
   };
 };
+export const Text:React.FC=({children})=>{
+  return <Typography.Text ellipsis={{tooltip:children}}>{children}</Typography.Text>
+}
 const TagsComponent = (props: IProps) => {
   const {
     data,
@@ -85,17 +88,21 @@ const TagsComponent = (props: IProps) => {
         const indexKey = index.toString();
         if (typeof tagItem === "string") {
           const tooltipProps = getTooltipProps({ title: tagItem }, tooltip);
+          const tagNode=<Text>{tagItem}</Text>
           return (
             <Tooltip {...tooltipProps}>
               <Tag
                 key={indexKey}
+                style={{
+                  maxWidth: "100%",
+                }}
                 {...tagProps}
                 onClose={(e) => {
                   e.preventDefault();
                   onClose?.(indexKey, tableInstance);
                 }}
               >
-                {contentItemRender ? contentItemRender(tagItem) : tagItem}
+                {contentItemRender ? contentItemRender(tagNode) : tagNode}
               </Tag>
             </Tooltip>
           );
@@ -110,17 +117,21 @@ const TagsComponent = (props: IProps) => {
           ...itemProps,
         };
         const cuKey = tagValue || indexKey;
+        const tagNode=<Text>{tagLabel}</Text>
         return (
           <Tooltip {...tooltipProps}>
             <Tag
               key={cuKey}
+              style={{
+                maxWidth: "100%",
+              }}
               {...cuTagProps}
               onClose={(e) => {
                 e.preventDefault();
                 cuTagProps?.onClose(cuKey, tableInstance);
               }}
             >
-              {contentItemRender ? contentItemRender(tagLabel) : tagLabel}
+              {contentItemRender ? tagNode : tagNode}
             </Tag>
           </Tooltip>
         );

package/src/pages/ModalEditTable/index.tsx

@@ -41,6 +41,9 @@ export default () => {
       </div>
       <HDwEditTable
         title="编辑"
+        afterClose={()=>{
+            console.log("afterClose")
+        }}
         contentRender={(node) => {
           return (
             <>