@hw-component/table 1.9.52 → 1.9.55

package/es/HTableBody/hooks.js

@@ -55,26 +55,32 @@ var useCols = function useCols(_ref2) {
   var configData = _ref2.configData,
     rowSelection = _ref2.rowSelection,
     table = _ref2.table;
-  var trClassname = useClassName("");
+  var trClassname = useClassName("hw-table-col-hr");
   var _useState = useState([]),
     _useState2 = _slicedToArray(_useState, 2),
     cols = _useState2[0],
     setCols = _useState2[1];
   var _useHTableConfigConte = useHTableConfigContext({}),
     valueTypeConfig = _useHTableConfigConte.valueTypeConfig;
+  var itemClassNameMk = function itemClassNameMk(children, lastChildren) {
+    var lastChildLen = lastChildren.length;
+    var childLen = children.length;
+    return !childLen && !!lastChildLen ? trClassname : "";
+  };
   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 : "";
+      lastChildren = _ref3$children === void 0 ? [] : _ref3$children;
     var _item$valueType = item.valueType,
       valueType = _item$valueType === void 0 ? "" : _item$valueType,
       _item$valueTypeProps = item.valueTypeProps,
       valueTypeProps = _item$valueTypeProps === void 0 ? {} : _item$valueTypeProps,
       _item$className = item.className,
-      className = _item$className === void 0 ? "" : _item$className;
+      className = _item$className === void 0 ? "" : _item$className,
+      _item$children = item.children,
+      children = _item$children === void 0 ? [] : _item$children;
+    var trClassName = itemClassNameMk(children, lastChildren);
     var itemType = valueType;
     if (_indexOfInstanceProperty(textTypes).call(textTypes, itemType) !== -1) {
       var _context;

package/es/index.css

@@ -132,6 +132,20 @@
 .ant-hw-table-render-text-basic {
   width: 100%;
 }
-.ant-hw-table- {
+.ant-hw-table-col-hr {
   width: 100%;
 }
+.ant-hw-table-col-hr:after {
+  position: absolute;
+  top: 50%;
+  left: 0;
+  width: 1px;
+  height: 1.6em;
+  background-color: rgba(0, 0, 0, 0.06);
+  -webkit-transform: translateY(-50%);
+      -ms-transform: translateY(-50%);
+          transform: translateY(-50%);
+  -webkit-transition: background-color 0.3s;
+  transition: background-color 0.3s;
+  content: '';
+}

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,
@@ -46,7 +46,6 @@ var tagsRender = function tagsRender(config, itemData, index, tableInstance) {
   var _config$valueTypeProp2 = config.valueTypeProps,
     valueTypeProps = _config$valueTypeProp2 === void 0 ? {} : _config$valueTypeProp2;
   var tableVal = getTableVal(config, itemData);
-  console.log(tableVal, "tagsRender");
   if (!tableVal) {
     return "-";
   }

package/lib/HTableBody/hooks.js

@@ -56,26 +56,32 @@ var useCols = function useCols(_ref2) {
   var configData = _ref2.configData,
     rowSelection = _ref2.rowSelection,
     table = _ref2.table;
-  var trClassname = index.useClassName("");
+  var trClassname = index.useClassName("hw-table-col-hr");
   var _useState = React.useState([]),
     _useState2 = _slicedToArray(_useState, 2),
     cols = _useState2[0],
     setCols = _useState2[1];
   var _useHTableConfigConte = TableConfig.useHTableConfigContext({}),
     valueTypeConfig = _useHTableConfigConte.valueTypeConfig;
+  var itemClassNameMk = function itemClassNameMk(children, lastChildren) {
+    var lastChildLen = lastChildren.length;
+    var childLen = children.length;
+    return !childLen && !!lastChildLen ? trClassname : "";
+  };
   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 : "";
+      lastChildren = _ref3$children === void 0 ? [] : _ref3$children;
     var _item$valueType = item.valueType,
       valueType = _item$valueType === void 0 ? "" : _item$valueType,
       _item$valueTypeProps = item.valueTypeProps,
       valueTypeProps = _item$valueTypeProps === void 0 ? {} : _item$valueTypeProps,
       _item$className = item.className,
-      className = _item$className === void 0 ? "" : _item$className;
+      className = _item$className === void 0 ? "" : _item$className,
+      _item$children = item.children,
+      children = _item$children === void 0 ? [] : _item$children;
+    var trClassName = itemClassNameMk(children, lastChildren);
     var itemType = valueType;
     if (_indexOfInstanceProperty(config.textTypes).call(config.textTypes, itemType) !== -1) {
       var _context;

package/lib/index.css

@@ -132,6 +132,20 @@
 .ant-hw-table-render-text-basic {
   width: 100%;
 }
-.ant-hw-table- {
+.ant-hw-table-col-hr {
   width: 100%;
 }
+.ant-hw-table-col-hr:after {
+  position: absolute;
+  top: 50%;
+  left: 0;
+  width: 1px;
+  height: 1.6em;
+  background-color: rgba(0, 0, 0, 0.06);
+  -webkit-transform: translateY(-50%);
+      -ms-transform: translateY(-50%);
+          transform: translateY(-50%);
+  -webkit-transition: background-color 0.3s;
+  transition: background-color 0.3s;
+  content: '';
+}

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,
@@ -49,7 +49,6 @@ var tagsRender = function tagsRender(config, itemData, index, tableInstance) {
   var _config$valueTypeProp2 = config.valueTypeProps,
     valueTypeProps = _config$valueTypeProp2 === void 0 ? {} : _config$valueTypeProp2;
   var tableVal = getTableVal(config, itemData);
-  console.log(tableVal, "tagsRender");
   if (!tableVal) {
     return "-";
   }

package/package.json

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

package/src/components/HTableBody/hooks.tsx

@@ -45,14 +45,19 @@ const rowSelectionCol = (rowSelection?: HRowSelection) => {
 };
 
 export const useCols = ({ configData, rowSelection, table }: HTableProps) => {
-  const trClassname=useClassName("");
+  const trClassname=useClassName("hw-table-col-hr");
   const [cols, setCols] = useState<ConfigDataModal>([]);
   const { valueTypeConfig } = useHTableConfigContext({});
+  const itemClassNameMk=(children:any[],lastChildren:any[])=>{
+    const lastChildLen=(lastChildren as any[]).length;
+    const childLen=children.length;
+    return   !childLen&&!!lastChildLen?trClassname:"";
+
+  }
   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 {children:lastChildren=[]}=lastItem||{};
+    const { valueType = "", valueTypeProps = {} ,className="",children=[]} = item;
+    const trClassName=itemClassNameMk((children as any[]),(lastChildren as any[]));
     const itemType = valueType as string;
     if (textTypes.indexOf(itemType) !== -1) {
       const { ellipsis } = valueTypeProps;

package/src/components/index.less

@@ -130,8 +130,19 @@
   width: 100%;
 }
 
-.@{ant-prefix}-hw-table-{
+.@{ant-prefix}-hw-table-col-hr{
   width: 100%;
+  &:after{
+    position: absolute;
+    top: 50%;
+    left: 0;
+    width: 1px;
+    height: 1.6em;
+    background-color: rgba(0, 0, 0, 0.06);
+    transform: translateY(-50%);
+    transition: background-color 0.3s;
+    content: '';
+  }
 }
 
 

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;
@@ -34,7 +34,6 @@ const tagsRender = (
 ) => {
   const { valueTypeProps = {} } = config;
   const tableVal = getTableVal(config, itemData);
-  console.log(tableVal,"tagsRender")
   if (!tableVal) {
     return "-";
   }

package/src/pages/Table/index.tsx

@@ -96,29 +96,6 @@ export const configData = [
         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,
-      },
     ],
   },
   {