@hw-component/table 1.9.14 → 1.9.16

package/es/HTableBody/index.js

@@ -154,11 +154,14 @@ var Body = (function (bodyProps) {
           size: cuSize,
           search: false,
           onChange: function onChange(page, filters, sorter) {
-            if (localSorter) {
+            var field = sorter.field,
+              order = sorter.order,
+              column = sorter.column;
+            var colSorter = column.sorter;
+            if (localSorter || typeof colSorter === "function") {
               return;
             }
-            var field = sorter.field,
-              order = sorter.order;
+            console.log(sorter);
             var orderByField = typeof order === "undefined" ? undefined : field;
             var asc = typeof order === "undefined" ? undefined : order === "ascend";
             tableInstance.table.reloadWithParams({

package/es/Table.js

@@ -17,7 +17,6 @@ import Body from './HTableBody/index.js';
 import useCurrentTable from './hooks/useCurrentTable.js';
 import useRowObj from './hooks/useRowObj.js';
 import { HTableContext } from './context.js';
-import { Space } from 'antd';
 import useReq from './hooks/useReq.js';
 import useDispatch from './hooks/useDispatch.js';
 import { useState } from 'react';
@@ -119,12 +118,8 @@ var Table = (function (_ref) {
       hideLabel: hideLabel,
       labelWidth: labelWidth
     },
-    children: jsxs(Space, {
-      direction: "vertical",
-      size: 0,
-      style: _objectSpread({
-        width: "100%"
-      }, style),
+    children: jsxs("div", {
+      style: _objectSpread({}, style),
       className: _concatInstanceProperty(_context = "".concat(contentClassName, " ")).call(_context, className),
       children: [!hideHeader && jsx(Header, {
         searchSpan: searchSpan,

package/es/render/Text.d.ts

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

package/lib/HTableBody/index.js

@@ -157,11 +157,14 @@ var Body = (function (bodyProps) {
           size: cuSize,
           search: false,
           onChange: function onChange(page, filters, sorter) {
-            if (localSorter) {
+            var field = sorter.field,
+              order = sorter.order,
+              column = sorter.column;
+            var colSorter = column.sorter;
+            if (localSorter || typeof colSorter === "function") {
               return;
             }
-            var field = sorter.field,
-              order = sorter.order;
+            console.log(sorter);
             var orderByField = typeof order === "undefined" ? undefined : field;
             var asc = typeof order === "undefined" ? undefined : order === "ascend";
             tableInstance.table.reloadWithParams({

package/lib/Table.js

@@ -20,7 +20,6 @@ var index$2 = require('./HTableBody/index.js');
 var useCurrentTable = require('./hooks/useCurrentTable.js');
 var useRowObj = require('./hooks/useRowObj.js');
 var context = require('./context.js');
-var antd = require('antd');
 var useReq = require('./hooks/useReq.js');
 var useDispatch = require('./hooks/useDispatch.js');
 var React = require('react');
@@ -122,12 +121,8 @@ var Table = (function (_ref) {
       hideLabel: hideLabel,
       labelWidth: labelWidth
     },
-    children: jsxRuntime.jsxs(antd.Space, {
-      direction: "vertical",
-      size: 0,
-      style: _objectSpread({
-        width: "100%"
-      }, style),
+    children: jsxRuntime.jsxs("div", {
+      style: _objectSpread({}, style),
       className: _concatInstanceProperty(_context = "".concat(contentClassName, " ")).call(_context, className),
       children: [!hideHeader && jsxRuntime.jsx(index$1.default, {
         searchSpan: searchSpan,

package/lib/render/Text.d.ts

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

package/package.json

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

package/src/components/HTableBody/index.tsx

@@ -159,10 +159,13 @@ export default (bodyProps: HTableBodyProps) => {
             size={cuSize}
             search={false}
             onChange={(page, filters, sorter) => {
-              if (localSorter) {
+              const { field, order ,column} = sorter as any;
+              const {sorter:colSorter}=column;
+              if (localSorter||typeof colSorter==="function") {
                 return;
               }
-              const { field, order } = sorter as any;
+
+              console.log(sorter)
               const orderByField =
                 typeof order === "undefined" ? undefined : field;
               const asc =

package/src/components/Table.tsx

@@ -88,10 +88,8 @@ export default ({
         labelWidth,
       }}
     >
-      <Space
-        direction={"vertical"}
-        size={0}
-        style={{ width: "100%" ,...style}}
+      <div
+        style={{ ...style}}
         className={`${contentClassName} ${className}`}
       >
         {!hideHeader && (
@@ -111,7 +109,7 @@ export default ({
           rowKey={rowKey}
           {...props}
         />
-      </Space>
+      </div>
     </HTableContext.Provider>
   );
 };

package/src/pages/Table/index.tsx

@@ -56,10 +56,14 @@ export const configData = [
     },
   },
   {
-    title: "邮箱",
-    dataIndex: "mailList",
-    valueType: "tags",
+    title: "id",
+    dataIndex: "id",
     width: 120,
+    sorter:(a, b) => {
+      const { id: aNum } = a;
+      const { id: bNum } = b;
+      return aNum - bNum;
+    }
   },
   {
     title: "悠哉公众号openid",
@@ -115,12 +119,12 @@ export default () => {
   const hTable = useHTable();
   const { loading, data } = useRequest(() => {
     const arrayData: any[] = [];
-    for (let i = 0; i < 1; i = i + 1) {
+    for (let i = 0; i < 10; i = i + 1) {
       arrayData.push({
         id: i,
-        name: "仙人仙人仙人仙人仙人仙人仙人仙人仙人仙人仙人仙人仙人仙人仙人仙人仙人仙人仙人仙人仙人仙人仙人仙人",
+        name: "仙人仙人",
         mobileList: null,
-        mailList: null,
+        mailList: i,
         openidList: ["okSMy58P_PE9sQkAG03gkpiTk-hs"],
         dingdingList: [
           {