@hw-component/table 1.9.51 → 1.9.53

package/es/HTableBody/hooks.js

@@ -8,6 +8,7 @@ import _Object$defineProperty from '@babel/runtime-corejs3/core-js-stable/object
 import _defineProperty from '@babel/runtime-corejs3/helpers/defineProperty';
 import _slicedToArray from '@babel/runtime-corejs3/helpers/slicedToArray';
 import _indexOfInstanceProperty from '@babel/runtime-corejs3/core-js-stable/instance/index-of';
+import _concatInstanceProperty from '@babel/runtime-corejs3/core-js-stable/instance/concat';
 import _filterInstanceProperty from '@babel/runtime-corejs3/core-js-stable/instance/filter';
 import _spliceInstanceProperty from '@babel/runtime-corejs3/core-js-stable/instance/splice';
 import _mapInstanceProperty from '@babel/runtime-corejs3/core-js-stable/instance/map';
@@ -21,9 +22,10 @@ import { outColSetting, mkChangeValue } from './utils.js';
 import configRender from '../render/index.js';
 import { useHTableConfigContext } from '../TableConfig.js';
 import { textTypes } from '../render/config.js';
+import { useClassName } from '../hooks/index.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; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var _context3, _context4; var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? _forEachInstanceProperty(_context3 = ownKeys(Object(t), !0)).call(_context3, function (r) { _defineProperty(e, r, t[r]); }) : _Object$getOwnPropertyDescriptors ? _Object$defineProperties(e, _Object$getOwnPropertyDescriptors(t)) : _forEachInstanceProperty(_context4 = ownKeys(Object(t))).call(_context4, function (r) { _Object$defineProperty(e, r, _Object$getOwnPropertyDescriptor(t, r)); }); } return e; }
 var rowSelectionCol = function rowSelectionCol(rowSelection) {
   var _ref = rowSelection || {},
     allPageCheck = _ref.allPageCheck,
@@ -53,26 +55,38 @@ var useCols = function useCols(_ref2) {
   var configData = _ref2.configData,
     rowSelection = _ref2.rowSelection,
     table = _ref2.table;
+  var trClassname = useClassName("");
   var _useState = useState([]),
     _useState2 = _slicedToArray(_useState, 2),
     cols = _useState2[0],
     setCols = _useState2[1];
   var _useHTableConfigConte = useHTableConfigContext({}),
     valueTypeConfig = _useHTableConfigConte.valueTypeConfig;
-  var itemProvider = function itemProvider(item) {
+  var itemProvider = function itemProvider(item, lastItem) {
+    var _context2;
+    var _ref3 = lastItem || {},
+      _ref3$children = _ref3.children,
+      children = _ref3$children === void 0 ? [] : _ref3$children;
+    var childLen = children === null || children === void 0 ? void 0 : children.length;
+    var trClassName = !!childLen ? trClassname : "";
     var _item$valueType = item.valueType,
       valueType = _item$valueType === void 0 ? "" : _item$valueType,
       _item$valueTypeProps = item.valueTypeProps,
-      valueTypeProps = _item$valueTypeProps === void 0 ? {} : _item$valueTypeProps;
+      valueTypeProps = _item$valueTypeProps === void 0 ? {} : _item$valueTypeProps,
+      _item$className = item.className,
+      className = _item$className === void 0 ? "" : _item$className;
     var itemType = valueType;
     if (_indexOfInstanceProperty(textTypes).call(textTypes, itemType) !== -1) {
+      var _context;
       var ellipsis = valueTypeProps.ellipsis;
       return _objectSpread(_objectSpread({}, item), {}, {
         ellipsis: ellipsis,
+        className: _concatInstanceProperty(_context = "".concat(className, " ")).call(_context, trClassName),
         render: configRender(item, table, valueTypeConfig)
       });
     }
     return _objectSpread(_objectSpread({}, item), {}, {
+      className: _concatInstanceProperty(_context2 = "".concat(className, " ")).call(_context2, trClassName),
       render: configRender(item, table, valueTypeConfig)
     });
   };
@@ -83,8 +97,9 @@ var useCols = function useCols(_ref2) {
     if (rowSelection !== false) {
       _spliceInstanceProperty(colsArray).call(colsArray, 0, 0, rowSelectionCol(rowSelection));
     }
-    return _mapInstanceProperty(colsArray).call(colsArray, function (item) {
-      return itemProvider(item);
+    return _mapInstanceProperty(colsArray).call(colsArray, function (item, index) {
+      var lastItem = colsArray[index - 1];
+      return itemProvider(item, lastItem);
     });
   };
   useEffect(function () {
@@ -94,10 +109,10 @@ var useCols = function useCols(_ref2) {
     cols: cols
   };
 };
-var useSynchronousKeys = function useSynchronousKeys(_ref3) {
-  var selectedRowKeys = _ref3.selectedRowKeys,
-    records = _ref3.records,
-    rowKey = _ref3.rowKey;
+var useSynchronousKeys = function useSynchronousKeys(_ref4) {
+  var selectedRowKeys = _ref4.selectedRowKeys,
+    records = _ref4.records,
+    rowKey = _ref4.rowKey;
   var _useHTableContext = useHTableContext(),
     rowOnChange = _useHTableContext.rowOnChange;
   var findId = function findId(key) {
@@ -130,17 +145,17 @@ var useSize = function useSize(size) {
     setCuSize: setCuSize
   };
 };
-var useColumnsStateType = function useColumnsStateType(_ref4) {
-  var columnsState = _ref4.columnsState,
-    columns = _ref4.columns;
+var useColumnsStateType = function useColumnsStateType(_ref5) {
+  var columnsState = _ref5.columnsState,
+    columns = _ref5.columns;
   var _useHTableContext2 = useHTableContext(),
     tableInstance = _useHTableContext2.tableInstance;
-  var _ref5 = columnsState || {},
-    persistenceType = _ref5.persistenceType,
-    persistenceKey = _ref5.persistenceKey,
-    value = _ref5.value,
-    defaultValue = _ref5.defaultValue,
-    onChange = _ref5.onChange;
+  var _ref6 = columnsState || {},
+    persistenceType = _ref6.persistenceType,
+    persistenceKey = _ref6.persistenceKey,
+    value = _ref6.value,
+    defaultValue = _ref6.defaultValue,
+    onChange = _ref6.onChange;
   var _useState5 = useState(defaultValue),
     _useState6 = _slicedToArray(_useState5, 2),
     selfValue = _useState6[0],

package/es/index.css

@@ -132,3 +132,6 @@
 .ant-hw-table-render-text-basic {
   width: 100%;
 }
+.ant-hw-table- {
+  width: 100%;
+}

package/es/render/Text.d.ts

@@ -1,2 +1,3 @@
+/// <reference types="react" />
 declare const _default: () => JSX.Element;
 export default _default;

package/es/render/config.js

@@ -26,7 +26,7 @@ var getTableVal = function getTableVal(config, itemData) {
     return val;
   }
   var relVal = val === null || val === void 0 ? void 0 : val.toString();
-  return !!relVal ? relVal : null;
+  return !!relVal ? val : null;
 };
 var dateRender = function dateRender(config, itemData) {
   var _config$valueTypeProp = config.valueTypeProps,

package/lib/HTableBody/hooks.js

@@ -9,6 +9,7 @@ var _Object$defineProperty = require('@babel/runtime-corejs3/core-js-stable/obje
 var _defineProperty = require('@babel/runtime-corejs3/helpers/defineProperty');
 var _slicedToArray = require('@babel/runtime-corejs3/helpers/slicedToArray');
 var _indexOfInstanceProperty = require('@babel/runtime-corejs3/core-js-stable/instance/index-of');
+var _concatInstanceProperty = require('@babel/runtime-corejs3/core-js-stable/instance/concat');
 var _filterInstanceProperty = require('@babel/runtime-corejs3/core-js-stable/instance/filter');
 var _spliceInstanceProperty = require('@babel/runtime-corejs3/core-js-stable/instance/splice');
 var _mapInstanceProperty = require('@babel/runtime-corejs3/core-js-stable/instance/map');
@@ -19,12 +20,13 @@ var React = require('react');
 var context = require('../context.js');
 var RowSelection = require('./RowSelection.js');
 var utils = require('./utils.js');
-var index = require('../render/index.js');
+var index$1 = require('../render/index.js');
 var TableConfig = require('../TableConfig.js');
 var config = require('../render/config.js');
+var index = require('../hooks/index.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; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var _context3, _context4; var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? _forEachInstanceProperty(_context3 = ownKeys(Object(t), !0)).call(_context3, function (r) { _defineProperty(e, r, t[r]); }) : _Object$getOwnPropertyDescriptors ? _Object$defineProperties(e, _Object$getOwnPropertyDescriptors(t)) : _forEachInstanceProperty(_context4 = ownKeys(Object(t))).call(_context4, function (r) { _Object$defineProperty(e, r, _Object$getOwnPropertyDescriptor(t, r)); }); } return e; }
 var rowSelectionCol = function rowSelectionCol(rowSelection) {
   var _ref = rowSelection || {},
     allPageCheck = _ref.allPageCheck,
@@ -54,27 +56,39 @@ var useCols = function useCols(_ref2) {
   var configData = _ref2.configData,
     rowSelection = _ref2.rowSelection,
     table = _ref2.table;
+  var trClassname = index.useClassName("");
   var _useState = React.useState([]),
     _useState2 = _slicedToArray(_useState, 2),
     cols = _useState2[0],
     setCols = _useState2[1];
   var _useHTableConfigConte = TableConfig.useHTableConfigContext({}),
     valueTypeConfig = _useHTableConfigConte.valueTypeConfig;
-  var itemProvider = function itemProvider(item) {
+  var itemProvider = function itemProvider(item, lastItem) {
+    var _context2;
+    var _ref3 = lastItem || {},
+      _ref3$children = _ref3.children,
+      children = _ref3$children === void 0 ? [] : _ref3$children;
+    var childLen = children === null || children === void 0 ? void 0 : children.length;
+    var trClassName = !!childLen ? trClassname : "";
     var _item$valueType = item.valueType,
       valueType = _item$valueType === void 0 ? "" : _item$valueType,
       _item$valueTypeProps = item.valueTypeProps,
-      valueTypeProps = _item$valueTypeProps === void 0 ? {} : _item$valueTypeProps;
+      valueTypeProps = _item$valueTypeProps === void 0 ? {} : _item$valueTypeProps,
+      _item$className = item.className,
+      className = _item$className === void 0 ? "" : _item$className;
     var itemType = valueType;
     if (_indexOfInstanceProperty(config.textTypes).call(config.textTypes, itemType) !== -1) {
+      var _context;
       var ellipsis = valueTypeProps.ellipsis;
       return _objectSpread(_objectSpread({}, item), {}, {
         ellipsis: ellipsis,
-        render: index.default(item, table, valueTypeConfig)
+        className: _concatInstanceProperty(_context = "".concat(className, " ")).call(_context, trClassName),
+        render: index$1.default(item, table, valueTypeConfig)
       });
     }
     return _objectSpread(_objectSpread({}, item), {}, {
-      render: index.default(item, table, valueTypeConfig)
+      className: _concatInstanceProperty(_context2 = "".concat(className, " ")).call(_context2, trClassName),
+      render: index$1.default(item, table, valueTypeConfig)
     });
   };
   var changeConfigData = function changeConfigData(data) {
@@ -84,8 +98,9 @@ var useCols = function useCols(_ref2) {
     if (rowSelection !== false) {
       _spliceInstanceProperty(colsArray).call(colsArray, 0, 0, rowSelectionCol(rowSelection));
     }
-    return _mapInstanceProperty(colsArray).call(colsArray, function (item) {
-      return itemProvider(item);
+    return _mapInstanceProperty(colsArray).call(colsArray, function (item, index) {
+      var lastItem = colsArray[index - 1];
+      return itemProvider(item, lastItem);
     });
   };
   React.useEffect(function () {
@@ -95,10 +110,10 @@ var useCols = function useCols(_ref2) {
     cols: cols
   };
 };
-var useSynchronousKeys = function useSynchronousKeys(_ref3) {
-  var selectedRowKeys = _ref3.selectedRowKeys,
-    records = _ref3.records,
-    rowKey = _ref3.rowKey;
+var useSynchronousKeys = function useSynchronousKeys(_ref4) {
+  var selectedRowKeys = _ref4.selectedRowKeys,
+    records = _ref4.records,
+    rowKey = _ref4.rowKey;
   var _useHTableContext = context.useHTableContext(),
     rowOnChange = _useHTableContext.rowOnChange;
   var findId = function findId(key) {
@@ -131,17 +146,17 @@ var useSize = function useSize(size) {
     setCuSize: setCuSize
   };
 };
-var useColumnsStateType = function useColumnsStateType(_ref4) {
-  var columnsState = _ref4.columnsState,
-    columns = _ref4.columns;
+var useColumnsStateType = function useColumnsStateType(_ref5) {
+  var columnsState = _ref5.columnsState,
+    columns = _ref5.columns;
   var _useHTableContext2 = context.useHTableContext(),
     tableInstance = _useHTableContext2.tableInstance;
-  var _ref5 = columnsState || {},
-    persistenceType = _ref5.persistenceType,
-    persistenceKey = _ref5.persistenceKey,
-    value = _ref5.value,
-    defaultValue = _ref5.defaultValue,
-    onChange = _ref5.onChange;
+  var _ref6 = columnsState || {},
+    persistenceType = _ref6.persistenceType,
+    persistenceKey = _ref6.persistenceKey,
+    value = _ref6.value,
+    defaultValue = _ref6.defaultValue,
+    onChange = _ref6.onChange;
   var _useState5 = React.useState(defaultValue),
     _useState6 = _slicedToArray(_useState5, 2),
     selfValue = _useState6[0],

package/lib/index.css

@@ -132,3 +132,6 @@
 .ant-hw-table-render-text-basic {
   width: 100%;
 }
+.ant-hw-table- {
+  width: 100%;
+}

package/lib/render/Text.d.ts

@@ -1,2 +1,3 @@
+/// <reference types="react" />
 declare const _default: () => JSX.Element;
 export default _default;

package/lib/render/config.js

@@ -29,7 +29,7 @@ var getTableVal = function getTableVal(config, itemData) {
     return val;
   }
   var relVal = val === null || val === void 0 ? void 0 : val.toString();
-  return !!relVal ? relVal : null;
+  return !!relVal ? val : null;
 };
 var dateRender = function dateRender(config, itemData) {
   var _config$valueTypeProp = config.valueTypeProps,

package/package.json

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

package/src/components/HTableBody/hooks.tsx

@@ -16,6 +16,7 @@ import { mkChangeValue, outColSetting } from "./utils";
 import configRender from "../render";
 import { useHTableConfigContext } from "@/components/TableConfig";
 import { textTypes } from "@/components/render/config";
+import {useClassName} from "@/components/hooks";
 const rowSelectionCol = (rowSelection?: HRowSelection) => {
   const { allPageCheck, onChange, getCheckboxProps } = rowSelection || {};
   return {
@@ -44,21 +45,27 @@ const rowSelectionCol = (rowSelection?: HRowSelection) => {
 };
 
 export const useCols = ({ configData, rowSelection, table }: HTableProps) => {
+  const trClassname=useClassName("");
   const [cols, setCols] = useState<ConfigDataModal>([]);
   const { valueTypeConfig } = useHTableConfigContext({});
-  const itemProvider = (item: ConfigItemModal) => {
-    const { valueType = "", valueTypeProps = {} } = item;
+  const itemProvider = (item: ConfigItemModal,lastItem?: ConfigItemModal) => {
+    const {children=[]}=lastItem||{};
+    const childLen=(children as any[])?.length;
+    const trClassName=!!childLen?trClassname:"";
+    const { valueType = "", valueTypeProps = {} ,className=""} = item;
     const itemType = valueType as string;
     if (textTypes.indexOf(itemType) !== -1) {
       const { ellipsis } = valueTypeProps;
       return {
         ...item,
         ellipsis: ellipsis,
+        className:`${className} ${trClassName}`,
         render: configRender(item, table as HTableInstance, valueTypeConfig),
       };
     }
     return {
       ...item,
+      className:`${className} ${trClassName}`,
       render: configRender(item, table as HTableInstance, valueTypeConfig),
     };
   };
@@ -69,8 +76,9 @@ export const useCols = ({ configData, rowSelection, table }: HTableProps) => {
     if (rowSelection !== false) {
       colsArray.splice(0, 0, rowSelectionCol(rowSelection) as any);
     }
-    return colsArray.map((item) => {
-      return itemProvider(item);
+    return colsArray.map((item,index) => {
+      const lastItem=colsArray[index-1];
+      return itemProvider(item,lastItem);
     });
   };
   useEffect(() => {

package/src/components/index.less

@@ -130,3 +130,8 @@
   width: 100%;
 }
 
+.@{ant-prefix}-hw-table-{
+  width: 100%;
+}
+
+

package/src/components/render/config.tsx

@@ -13,7 +13,7 @@ const getTableVal = (config: ConfigItemModal, itemData: any) => {
     return  val;
   }
   const relVal=val?.toString();
-  return  !!relVal?relVal:null;
+  return  !!relVal?val:null;
 };
 const dateRender = (config: ConfigItemModal, itemData: any) => {
   const { valueTypeProps = {} } = config;

package/src/pages/Table/index.tsx

@@ -80,6 +80,47 @@ export const configData = [
       return <TagsComponent data={openidList} />;
     },
   },
+  {
+    title: '升级规则',
+    dataIndex: 'rule',
+    children: [
+      {
+        title: '邀请总人数',
+        dataIndex: 'upInviteCount',
+        width: 100,
+        align: 'center',
+      },
+      {
+        title: '订单笔数',
+        dataIndex: 'upOrderCount',
+        width: 100,
+        align: 'center',
+      },
+      {
+        title: '返利总金额',
+        dataIndex: 'upTotalAmount',
+        width: 100,
+        align: 'center',
+      },
+      {
+        title: '奖励积分',
+        dataIndex: 'upReInte',
+        width: 100,
+        align: 'center',
+      },
+      {
+        title: '奖励金额',
+        dataIndex: 'upReBal',
+        width: 100,
+        align: 'center',
+      },
+      {
+        title: '升级提示语',
+        dataIndex: 'upRemsg',
+        width: 130,
+      },
+    ],
+  },
   {
     title: "钉钉机器人",
     dataIndex: "dingdingList",