@hw-component/table 1.9.2 → 1.9.4

package/es/HTableBody/hooks.js

@@ -7,10 +7,10 @@ import _Object$defineProperties from '@babel/runtime-corejs3/core-js/object/defi
 import _Object$defineProperty from '@babel/runtime-corejs3/core-js/object/define-property';
 import _defineProperty from '@babel/runtime-corejs3/helpers/defineProperty';
 import _slicedToArray from '@babel/runtime-corejs3/helpers/slicedToArray';
+import _indexOfInstanceProperty from '@babel/runtime-corejs3/core-js/instance/index-of';
 import _filterInstanceProperty from '@babel/runtime-corejs3/core-js/instance/filter';
 import _spliceInstanceProperty from '@babel/runtime-corejs3/core-js/instance/splice';
 import _mapInstanceProperty from '@babel/runtime-corejs3/core-js/instance/map';
-import _indexOfInstanceProperty from '@babel/runtime-corejs3/core-js/instance/index-of';
 import _forEachInstanceProperty from '@babel/runtime-corejs3/core-js/instance/for-each';
 import { jsx } from 'react/jsx-runtime';
 import { useState, useEffect, useMemo } from 'react';
@@ -19,6 +19,7 @@ import { RowSelectionTitle, RowSelectionBox } from './RowSelection.js';
 import { outColSetting, mkChangeValue } from './utils.js';
 import configRender from '../render/index.js';
 import { useHTableConfigContext } from '../TableConfig.js';
+import { textTypes } from '../render/config.js';
 
 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; }
@@ -56,6 +57,23 @@ var useCols = function useCols(_ref2) {
     setCols = _useState2[1];
   var _useHTableConfigConte = useHTableConfigContext({}),
     valueTypeConfig = _useHTableConfigConte.valueTypeConfig;
+  var itemProvider = function itemProvider(item) {
+    var _item$valueType = item.valueType,
+      valueType = _item$valueType === void 0 ? "" : _item$valueType,
+      _item$valueTypeProps = item.valueTypeProps,
+      valueTypeProps = _item$valueTypeProps === void 0 ? {} : _item$valueTypeProps;
+    var itemType = valueType;
+    if (_indexOfInstanceProperty(textTypes).call(textTypes, itemType) !== -1) {
+      var ellipsis = valueTypeProps.ellipsis;
+      return _objectSpread(_objectSpread({}, item), {}, {
+        ellipsis: ellipsis,
+        render: configRender(item, table, valueTypeConfig)
+      });
+    }
+    return _objectSpread(_objectSpread({}, item), {}, {
+      render: configRender(item, table, valueTypeConfig)
+    });
+  };
   var changeConfigData = function changeConfigData(data) {
     var colsArray = _filterInstanceProperty(data).call(data, function (item) {
       return !item.hideInTable;
@@ -64,9 +82,7 @@ var useCols = function useCols(_ref2) {
       _spliceInstanceProperty(colsArray).call(colsArray, 0, 0, rowSelectionCol(rowSelection));
     }
     return _mapInstanceProperty(colsArray).call(colsArray, function (item) {
-      return _objectSpread(_objectSpread({}, item), {}, {
-        render: configRender(item, table, valueTypeConfig)
-      });
+      return itemProvider(item);
     });
   };
   useEffect(function () {

package/es/render/config.d.ts

@@ -1,4 +1,5 @@
 import type { ConfigItemModal, HTableInstance } from "@/components/modal";
+export declare const textTypes: string[];
 declare const _default: {
     date: (config: ConfigItemModal, itemData: any) => string;
     tags: (config: ConfigItemModal, itemData: any, index: number, tableInstance: HTableInstance) => "-" | JSX.Element;

package/es/render/config.js

@@ -79,7 +79,8 @@ var linkRender = function linkRender(config, itemData) {
     valueTypeProps = _config$valueTypeProp4 === void 0 ? {} : _config$valueTypeProp4;
   var href = valueTypeProps.href,
     _valueTypeProps$targe = valueTypeProps.target,
-    target = _valueTypeProps$targe === void 0 ? "_blank" : _valueTypeProps$targe;
+    target = _valueTypeProps$targe === void 0 ? "_blank" : _valueTypeProps$targe,
+    ellipsis = valueTypeProps.ellipsis;
   var tableVal = getTableVal(config, itemData);
   var hrefUrl = href;
   if (typeof href === "function") {
@@ -88,6 +89,7 @@ var linkRender = function linkRender(config, itemData) {
   return jsx(Link, {
     href: hrefUrl || tableVal,
     target: target,
+    ellipsis: ellipsis,
     style: {
       wordBreak: "break-all"
     },
@@ -106,7 +108,8 @@ var textRender = function textRender(config, itemData) {
     type: type,
     ellipsis: ellipsis,
     style: {
-      marginBottom: 0
+      marginBottom: 0,
+      maxWidth: "100%"
     },
     children: [addonBefore, tableVal, addonAfter]
   });
@@ -129,6 +132,7 @@ var avatarRender = function avatarRender(config, itemData) {
     size: 32
   }, valueTypeProps));
 };
+var textTypes = ["text", "copy", "link"];
 var config = {
   date: dateRender,
   tags: tagsRender,
@@ -139,5 +143,5 @@ var config = {
   avatar: avatarRender
 };
 
-export { config as default };
+export { config as default, textTypes };
 // powered by hdj

package/lib/HTableBody/hooks.js

@@ -8,10 +8,10 @@ var _Object$defineProperties = require('@babel/runtime-corejs3/core-js/object/de
 var _Object$defineProperty = require('@babel/runtime-corejs3/core-js/object/define-property');
 var _defineProperty = require('@babel/runtime-corejs3/helpers/defineProperty');
 var _slicedToArray = require('@babel/runtime-corejs3/helpers/slicedToArray');
+var _indexOfInstanceProperty = require('@babel/runtime-corejs3/core-js/instance/index-of');
 var _filterInstanceProperty = require('@babel/runtime-corejs3/core-js/instance/filter');
 var _spliceInstanceProperty = require('@babel/runtime-corejs3/core-js/instance/splice');
 var _mapInstanceProperty = require('@babel/runtime-corejs3/core-js/instance/map');
-var _indexOfInstanceProperty = require('@babel/runtime-corejs3/core-js/instance/index-of');
 var _forEachInstanceProperty = require('@babel/runtime-corejs3/core-js/instance/for-each');
 var jsxRuntime = require('react/jsx-runtime');
 var React = require('react');
@@ -20,6 +20,7 @@ var RowSelection = require('./RowSelection.js');
 var utils = require('./utils.js');
 var index = require('../render/index.js');
 var TableConfig = require('../TableConfig.js');
+var config = require('../render/config.js');
 
 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; }
@@ -57,6 +58,23 @@ var useCols = function useCols(_ref2) {
     setCols = _useState2[1];
   var _useHTableConfigConte = TableConfig.useHTableConfigContext({}),
     valueTypeConfig = _useHTableConfigConte.valueTypeConfig;
+  var itemProvider = function itemProvider(item) {
+    var _item$valueType = item.valueType,
+      valueType = _item$valueType === void 0 ? "" : _item$valueType,
+      _item$valueTypeProps = item.valueTypeProps,
+      valueTypeProps = _item$valueTypeProps === void 0 ? {} : _item$valueTypeProps;
+    var itemType = valueType;
+    if (_indexOfInstanceProperty(config.textTypes).call(config.textTypes, itemType) !== -1) {
+      var ellipsis = valueTypeProps.ellipsis;
+      return _objectSpread(_objectSpread({}, item), {}, {
+        ellipsis: ellipsis,
+        render: index.default(item, table, valueTypeConfig)
+      });
+    }
+    return _objectSpread(_objectSpread({}, item), {}, {
+      render: index.default(item, table, valueTypeConfig)
+    });
+  };
   var changeConfigData = function changeConfigData(data) {
     var colsArray = _filterInstanceProperty(data).call(data, function (item) {
       return !item.hideInTable;
@@ -65,9 +83,7 @@ var useCols = function useCols(_ref2) {
       _spliceInstanceProperty(colsArray).call(colsArray, 0, 0, rowSelectionCol(rowSelection));
     }
     return _mapInstanceProperty(colsArray).call(colsArray, function (item) {
-      return _objectSpread(_objectSpread({}, item), {}, {
-        render: index.default(item, table, valueTypeConfig)
-      });
+      return itemProvider(item);
     });
   };
   React.useEffect(function () {

package/lib/render/config.d.ts

@@ -1,4 +1,5 @@
 import type { ConfigItemModal, HTableInstance } from "@/components/modal";
+export declare const textTypes: string[];
 declare const _default: {
     date: (config: ConfigItemModal, itemData: any) => string;
     tags: (config: ConfigItemModal, itemData: any, index: number, tableInstance: HTableInstance) => "-" | JSX.Element;

package/lib/render/config.js

@@ -82,7 +82,8 @@ var linkRender = function linkRender(config, itemData) {
     valueTypeProps = _config$valueTypeProp4 === void 0 ? {} : _config$valueTypeProp4;
   var href = valueTypeProps.href,
     _valueTypeProps$targe = valueTypeProps.target,
-    target = _valueTypeProps$targe === void 0 ? "_blank" : _valueTypeProps$targe;
+    target = _valueTypeProps$targe === void 0 ? "_blank" : _valueTypeProps$targe,
+    ellipsis = valueTypeProps.ellipsis;
   var tableVal = getTableVal(config, itemData);
   var hrefUrl = href;
   if (typeof href === "function") {
@@ -91,6 +92,7 @@ var linkRender = function linkRender(config, itemData) {
   return jsxRuntime.jsx(Link, {
     href: hrefUrl || tableVal,
     target: target,
+    ellipsis: ellipsis,
     style: {
       wordBreak: "break-all"
     },
@@ -109,7 +111,8 @@ var textRender = function textRender(config, itemData) {
     type: type,
     ellipsis: ellipsis,
     style: {
-      marginBottom: 0
+      marginBottom: 0,
+      maxWidth: "100%"
     },
     children: [addonBefore, tableVal, addonAfter]
   });
@@ -132,6 +135,7 @@ var avatarRender = function avatarRender(config, itemData) {
     size: 32
   }, valueTypeProps));
 };
+var textTypes = ["text", "copy", "link"];
 var config = {
   date: dateRender,
   tags: tagsRender,
@@ -143,4 +147,5 @@ var config = {
 };
 
 exports.default = config;
+exports.textTypes = textTypes;
 // powered by h

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hw-component/table",
-  "version": "1.9.2",
+  "version": "1.9.4",
   "description": "基于antd二次开发table组件",
   "keywords": [
     "table"
@@ -31,7 +31,7 @@
   "dependencies": {
     "@ant-design/icons": "4.6.2",
     "@ant-design/pro-table": "2.70.0",
-    "@hw-component/form": "1.8.2",
+    "@hw-component/form": "^1.8.2",
     "ahooks": "2.10.9",
     "antd": "4.20.7",
     "copy-to-clipboard": "3.3.1",

package/src/components/HTableBody/hooks.tsx

@@ -2,7 +2,7 @@ import type {
   HTableInstance,
   HTableProps,
   HRowSelection,
-  ConfigDataModal,
+  ConfigDataModal, ConfigItemModal,
 } from "../modal";
 import React, { useEffect, useMemo, useState } from "react";
 import { useHTableContext } from "../context";
@@ -14,6 +14,7 @@ import type { ColumnsState } from "@ant-design/pro-table/es/container";
 import { mkChangeValue, outColSetting } from "./utils";
 import configRender from "../render";
 import { useHTableConfigContext } from "@/components/TableConfig";
+import {textTypes} from "@/components/render/config";
 const rowSelectionCol = (rowSelection?: HRowSelection) => {
   const { allPageCheck, onChange, getCheckboxProps } = rowSelection || {};
   return {
@@ -39,9 +40,26 @@ const rowSelectionCol = (rowSelection?: HRowSelection) => {
     },
   };
 };
+
 export const useCols = ({ configData, rowSelection, table }: HTableProps) => {
   const [cols, setCols] = useState<ConfigDataModal>([]);
   const { valueTypeConfig } = useHTableConfigContext({});
+  const itemProvider=(item:ConfigItemModal)=>{
+    const {valueType="",valueTypeProps={}}=item;
+    const itemType=(valueType as string);
+    if (textTypes.indexOf(itemType)!==-1){
+      const {ellipsis}=valueTypeProps;
+      return {
+        ...item,
+        ellipsis:ellipsis,
+        render: configRender(item, table as HTableInstance, valueTypeConfig),
+      }
+    }
+    return {
+      ...item,
+      render: configRender(item, table as HTableInstance, valueTypeConfig),
+    }
+  }
   const changeConfigData = (data: ConfigDataModal) => {
     const colsArray = data.filter((item) => {
       return !item.hideInTable;
@@ -50,10 +68,7 @@ export const useCols = ({ configData, rowSelection, table }: HTableProps) => {
       colsArray.splice(0, 0, rowSelectionCol(rowSelection) as any);
     }
     return colsArray.map((item) => {
-      return {
-        ...item,
-        render: configRender(item, table as HTableInstance, valueTypeConfig),
-      };
+      return itemProvider(item)
     });
   };
   useEffect(() => {

package/src/components/render/config.tsx

@@ -63,7 +63,7 @@ const copyRender = (config: ConfigItemModal, itemData: any) => {
 };
 const linkRender = (config: ConfigItemModal, itemData: any) => {
   const { valueTypeProps = {} } = config;
-  const { href, target = "_blank" } = valueTypeProps;
+  const { href, target = "_blank" ,ellipsis} = valueTypeProps;
   const tableVal = getTableVal(config, itemData);
   let hrefUrl = href;
   if (typeof href === "function") {
@@ -73,6 +73,7 @@ const linkRender = (config: ConfigItemModal, itemData: any) => {
     <Link
       href={hrefUrl || tableVal}
       target={target}
+      ellipsis={ellipsis}
       style={{ wordBreak: "break-all" }}
     >
       {tableVal}
@@ -84,7 +85,7 @@ const textRender = (config: ConfigItemModal, itemData: any) => {
   const { addonBefore, addonAfter, type, ellipsis } = valueTypeProps;
   const tableVal = getTableVal(config, itemData);
   return (
-    <Paragraph type={type} ellipsis={ellipsis} style={{ marginBottom: 0 }}>
+    <Paragraph type={type} ellipsis={ellipsis} style={{ marginBottom: 0 ,maxWidth:"100%"}}>
       {addonBefore}
       {tableVal}
       {addonAfter}
@@ -101,6 +102,8 @@ const avatarRender = (config: ConfigItemModal, itemData: any) => {
   const tableVal = getTableVal(config, itemData);
   return <Avatar src={tableVal} size={32} {...valueTypeProps} />;
 };
+
+export const textTypes=["text","copy","link"]
 export default {
   date: dateRender,
   tags: tagsRender,

package/src/pages/Table/index.tsx

@@ -10,7 +10,6 @@ const TagsComponent = ({ data, labelKey }) => {
   if (!len) {
     return <>-</>;
   }
-  console.log(data);
   return (
     <>
       {data?.map((item, index) => {
@@ -37,7 +36,6 @@ export const configData = [
     valueType: "copy",
     valueTypeProps: {
       ellipsis: {
-        rows: 1,
         tooltip: true,
       },
     },
@@ -196,7 +194,7 @@ export default () => {
             for (let i = 0; i < 1; i = i + 1) {
               arrayData.push({
                 id: i,
-                name: "仙人仙人仙人仙人仙人仙人仙人仙人仙人仙人仙人仙人仙人仙人仙人仙人仙人仙人仙人仙人仙人仙人仙人仙人仙人仙人",
+                name: "仙人仙人仙人仙人仙人仙人仙人仙人仙人仙人仙人仙人仙人仙人仙人仙人仙人仙人仙人仙人仙人仙人仙人仙人仙人仙人312321",
                 mobileList: [{ name: "1" }, { name: "2" }],
                 mailList: null,
                 openidList: ["okSMy58P_PE9sQkAG03gkpiTk-hs"],