@hw-component/table 1.9.62 → 1.9.64

package/src/components/HTableBody/RowCheckBox/Title.tsx

@@ -0,0 +1,66 @@
+import {HRowSelection} from "@/components/modal";
+import {useHTableContext} from "@/components/context";
+import {useMemo} from "react";
+import {Checkbox, Dropdown, Menu} from "antd";
+import {useAllChecked, useCheckControl} from "./hooks";
+export default  ({
+                                              allPageCheck = true,
+                                              onChange,
+                                              getCheckboxProps,
+                                          }: HRowSelection) => {
+    const {
+        data,
+        selectedRowData,
+        rowKey = "id",
+    } = useHTableContext();
+    const { records = [] } = data || {};
+    const newData = records?.filter((item) => {
+        const { disabled = false } = getCheckboxProps?.(item) || {};
+        return !disabled;
+    });
+    const { keys, selectAll } = selectedRowData;
+    const {checkChange,menuClick}=useCheckControl(newData,onChange);
+    const dataLen = newData?.length || 0;
+    const checked = useAllChecked(keys,newData);
+    const configItems = useMemo(() => {
+        const fsArray = checked
+            ? {
+                label: "取消此页数据",
+                key: "cancel",
+            }
+            : {
+                label: "选择此页数据",
+                key: "check",
+            };
+        const enArray = selectAll
+            ? {
+                label: "取消全部数据",
+                key: "cancelAll",
+            }
+            : {
+                label: "选择全部数据",
+                key: "checkAll",
+            };
+        return [fsArray, enArray];
+    }, [checked, selectAll]);
+
+    const menu = () => {
+        const MenuEle = Menu as any;
+        return <MenuEle onClick={menuClick} items={configItems} />;
+    };
+    const disabled = dataLen === 0;
+    if (allPageCheck) {
+        return (
+            <Dropdown overlay={menu} arrow placement={"bottom"} disabled={disabled}>
+                <Checkbox
+                    checked={checked}
+                    onChange={checkChange}
+                    disabled={disabled}
+                />
+            </Dropdown>
+        );
+    }
+    return (
+        <Checkbox checked={checked} onChange={checkChange} disabled={disabled} />
+    );
+};

package/src/components/HTableBody/RowCheckBox/hooks.ts

@@ -0,0 +1,68 @@
+import {HTableProps} from "@/components/modal";
+import {Key} from "react";
+import {useHTableContext} from "@/components/context";
+import type { HRowSelection } from "../../modal";
+
+const getRowKey=(item:any,index:number,rowKey:HTableProps["rowKey"])=>{
+    return typeof rowKey === "function" ? rowKey(item, index) : item[rowKey as string];
+}
+export const useAllChecked=(keys:Key[]=[],data:any[]=[])=>{
+    const {rowKey = "id"} = useHTableContext();
+    const len=data?.length;
+    if (!len){
+        return false
+    }
+    return data.every((item,index)=>{
+        const itemKey=getRowKey(item,index,rowKey);
+        return keys.indexOf(itemKey)!==-1;
+    })
+}
+
+export const useCheckControl=(data:any[]=[],onChange:HRowSelection["onChange"])=>{
+    const {
+        rowOnChange,
+        rowKey = "id",
+        allSelectChange,
+    } = useHTableContext();
+    const allCheck = () => {
+        const setKeys = data.map((item, index) => {
+            return getRowKey(item,index,rowKey);
+        });
+        rowOnChange(setKeys, data);
+        onChange?.(setKeys, data);
+    };
+    const allCancel = () => {
+        rowOnChange([], []);
+        onChange?.([], []);
+    };
+
+    const checkChange = (e) => {
+        const checked = e.target.checked;
+        if (checked) {
+            allCheck();
+            return;
+        }
+        allCancel();
+    };
+    const menuClick = ({ key }) => {
+        if (key === "check") {
+            allCheck();
+            return;
+        }
+        if (key === "cancel") {
+            allCancel();
+            return;
+        }
+        if (key === "checkAll") {
+            allSelectChange?.(true);
+            onChange?.([], []);
+            return;
+        }
+        allSelectChange?.(false);
+        onChange?.([], []);
+    };
+    return {
+        checkChange,
+        menuClick
+    }
+}

package/src/components/HTableBody/hooks/colsMk.tsx

@@ -1,8 +1,8 @@
 import {HRowSelection} from "@/components/modal";
-import {RowCheckBoxSelection, RowCheckBoxSelectionTitle} from "@/components/HTableBody/RowCheckBoxSelection";
 import React from "react";
 import {RowRadioSelection} from "@/components/HTableBody/RowRadioBoxSelection";
-
+import RowCheckBoxSelectionTitle from '@/components/HTableBody/RowCheckBox/Title';
+import RowCheckBoxSelection from '@/components/HTableBody/RowCheckBox/RowItem';
 export const checkBoxSelectionCol = (rowSelection: HRowSelection) => {
     const { allPageCheck, onChange, getCheckboxProps } = rowSelection;
     return {

package/src/pages/DwTable/index.tsx

@@ -1,5 +1,5 @@
 import { Button } from "antd";
-import { HDwTable, HTable, useHDialogTable } from "@/components";
+import {HDwTable, HModalTable, HTable, useHDialogTable} from "@/components";
 const configData = [
   {
     title: "座位",
@@ -95,10 +95,15 @@ const Test = () => {
 
   return (
     <>
-      <HDwTable
+      <HModalTable
         dialogTable={dialogTable1}
         title="111"
         configData={configData}
+        tableProps={{
+          rowSelection:{
+            type:"radio"
+          }
+        }}
         request={req2}
         contentRender={(node) => {
           return (

package/src/pages/Table/index.tsx

@@ -207,9 +207,7 @@ export default () => {
           }}
           rowSelection={{
             allPageCheck: false,
-            type:"radio",
             preserveSelectedRowKeys:true,
-            alwaysShowAlert:false
           }}
           affixProps={{
             target: () => document.querySelector(".body"),

package/es/HTableBody/RowCheckBoxSelection.d.ts

@@ -1,11 +0,0 @@
-/// <reference types="react" />
-import type { HRowSelection } from "../modal";
-export declare const RowCheckBoxSelectionTitle: ({ allPageCheck, onChange, getCheckboxProps, }: HRowSelection) => JSX.Element;
-interface RowSelectionBoxProps {
-    data: any;
-    onChange?: HRowSelection["onChange"];
-    getCheckboxProps?: HRowSelection["getCheckboxProps"];
-    index: number;
-}
-export declare const RowCheckBoxSelection: ({ data, onChange, index, getCheckboxProps, }: RowSelectionBoxProps) => JSX.Element;
-export {};

package/es/HTableBody/RowCheckBoxSelection.js

@@ -1,172 +0,0 @@
-// welcome to hoo hoo hoo
-import _toConsumableArray from '@babel/runtime-corejs3/helpers/toConsumableArray';
-import _filterInstanceProperty from '@babel/runtime-corejs3/core-js-stable/instance/filter';
-import _keysInstanceProperty from '@babel/runtime-corejs3/core-js-stable/instance/keys';
-import _mapInstanceProperty from '@babel/runtime-corejs3/core-js-stable/instance/map';
-import _indexOfInstanceProperty from '@babel/runtime-corejs3/core-js-stable/instance/index-of';
-import _spliceInstanceProperty from '@babel/runtime-corejs3/core-js-stable/instance/splice';
-import { jsx } from 'react/jsx-runtime';
-import { useHTableContext } from '../context.js';
-import { Dropdown, Checkbox, Menu } from 'antd';
-import { useMemo } from 'react';
-
-var RowCheckBoxSelectionTitle = function RowCheckBoxSelectionTitle(_ref) {
-  var _ref$allPageCheck = _ref.allPageCheck,
-    allPageCheck = _ref$allPageCheck === void 0 ? true : _ref$allPageCheck,
-    onChange = _ref.onChange,
-    getCheckboxProps = _ref.getCheckboxProps;
-  var _useHTableContext = useHTableContext(),
-    data = _useHTableContext.data,
-    selectedRowData = _useHTableContext.selectedRowData,
-    rowOnChange = _useHTableContext.rowOnChange,
-    allSelectChange = _useHTableContext.allSelectChange,
-    _useHTableContext$row = _useHTableContext.rowKey,
-    rowKey = _useHTableContext$row === void 0 ? "id" : _useHTableContext$row;
-  var _ref2 = data || {},
-    _ref2$records = _ref2.records,
-    records = _ref2$records === void 0 ? [] : _ref2$records;
-  var newData = records === null || records === void 0 ? void 0 : _filterInstanceProperty(records).call(records, function (item) {
-    var _ref3 = (getCheckboxProps === null || getCheckboxProps === void 0 ? void 0 : getCheckboxProps(item)) || {},
-      _ref3$disabled = _ref3.disabled,
-      disabled = _ref3$disabled === void 0 ? false : _ref3$disabled;
-    return !disabled;
-  });
-  var keys = _keysInstanceProperty(selectedRowData),
-    selectAll = selectedRowData.selectAll;
-  var allCheck = function allCheck() {
-    var setKeys = _mapInstanceProperty(newData).call(newData, function (item, index) {
-      return typeof rowKey === "function" ? rowKey(item, index) : item[rowKey];
-    });
-    rowOnChange(setKeys, newData);
-    onChange === null || onChange === void 0 || onChange(setKeys, newData);
-  };
-  var allCancel = function allCancel() {
-    rowOnChange([], []);
-    onChange === null || onChange === void 0 || onChange([], []);
-  };
-  var checkChange = function checkChange(e) {
-    var checked = e.target.checked;
-    if (checked) {
-      allCheck();
-      return;
-    }
-    allCancel();
-  };
-  var change = function change(_ref4) {
-    var key = _ref4.key;
-    if (key === "check") {
-      allCheck();
-      return;
-    }
-    if (key === "cancel") {
-      allCancel();
-      return;
-    }
-    if (key === "checkAll") {
-      allSelectChange === null || allSelectChange === void 0 || allSelectChange(true);
-      onChange === null || onChange === void 0 || onChange([], []);
-      return;
-    }
-    allSelectChange === null || allSelectChange === void 0 || allSelectChange(false);
-    onChange === null || onChange === void 0 || onChange([], []);
-  };
-  var len = (keys === null || keys === void 0 ? void 0 : keys.length) || 0;
-  var dataLen = (newData === null || newData === void 0 ? void 0 : newData.length) || 0;
-  var checked = len === dataLen && len !== 0;
-  var configItems = useMemo(function () {
-    var fsArray = checked ? {
-      label: "取消此页数据",
-      key: "cancel"
-    } : {
-      label: "选择此页数据",
-      key: "check"
-    };
-    var enArray = selectAll ? {
-      label: "取消全部数据",
-      key: "cancelAll"
-    } : {
-      label: "选择全部数据",
-      key: "checkAll"
-    };
-    return [fsArray, enArray];
-  }, [checked, selectAll]);
-  var menu = function menu() {
-    var MenuEle = Menu;
-    return jsx(MenuEle, {
-      onClick: change,
-      items: configItems
-    });
-  };
-  var disabled = dataLen === 0;
-  if (allPageCheck) {
-    return jsx(Dropdown, {
-      overlay: menu,
-      arrow: true,
-      placement: "bottom",
-      disabled: disabled,
-      children: jsx(Checkbox, {
-        checked: checked,
-        onChange: checkChange,
-        disabled: disabled
-      })
-    });
-  }
-  return jsx(Checkbox, {
-    checked: checked,
-    onChange: checkChange,
-    disabled: disabled
-  });
-};
-var RowCheckBoxSelection = function RowCheckBoxSelection(_ref5) {
-  var data = _ref5.data,
-    onChange = _ref5.onChange,
-    index = _ref5.index,
-    getCheckboxProps = _ref5.getCheckboxProps;
-  var _useHTableContext2 = useHTableContext(),
-    selectedRowData = _useHTableContext2.selectedRowData,
-    rowOnChange = _useHTableContext2.rowOnChange,
-    _useHTableContext2$ro = _useHTableContext2.rowKey,
-    rowKey = _useHTableContext2$ro === void 0 ? "id" : _useHTableContext2$ro;
-  var _selectedRowData$rowD = selectedRowData.rowData,
-    rowData = _selectedRowData$rowD === void 0 ? [] : _selectedRowData$rowD,
-    _selectedRowData$keys = _keysInstanceProperty(selectedRowData),
-    keys = _selectedRowData$keys === void 0 ? [] : _selectedRowData$keys;
-  var key = typeof rowKey === "function" ? rowKey(data, index) : data[rowKey];
-  var add = function add() {
-    var newKeys = _toConsumableArray(keys);
-    var newRowData = _toConsumableArray(rowData);
-    newKeys.push(key);
-    newRowData.push(data);
-    rowOnChange(newKeys, newRowData);
-    onChange === null || onChange === void 0 || onChange(newKeys, newRowData);
-  };
-  var cancel = function cancel() {
-    var newKeys = _toConsumableArray(keys);
-    var newRowData = _toConsumableArray(rowData);
-    var keyIndex = _indexOfInstanceProperty(newKeys).call(newKeys, key);
-    _spliceInstanceProperty(newKeys).call(newKeys, keyIndex, 1);
-    _spliceInstanceProperty(newRowData).call(newRowData, keyIndex, 1);
-    rowOnChange(newKeys, newRowData);
-    onChange === null || onChange === void 0 || onChange(newKeys, newRowData);
-  };
-  var check = function check(e) {
-    var checked = e.target.checked;
-    if (checked) {
-      add();
-      return;
-    }
-    cancel();
-  };
-  var _ref6 = (getCheckboxProps === null || getCheckboxProps === void 0 ? void 0 : getCheckboxProps(data)) || {},
-    _ref6$disabled = _ref6.disabled,
-    disabled = _ref6$disabled === void 0 ? false : _ref6$disabled;
-  var checked = _indexOfInstanceProperty(keys).call(keys, key) !== -1;
-  return jsx(Checkbox, {
-    checked: checked,
-    onChange: check,
-    disabled: disabled
-  });
-};
-
-export { RowCheckBoxSelection, RowCheckBoxSelectionTitle };
-// powered by hdj

package/lib/HTableBody/RowCheckBoxSelection.d.ts

@@ -1,11 +0,0 @@
-/// <reference types="react" />
-import type { HRowSelection } from "../modal";
-export declare const RowCheckBoxSelectionTitle: ({ allPageCheck, onChange, getCheckboxProps, }: HRowSelection) => JSX.Element;
-interface RowSelectionBoxProps {
-    data: any;
-    onChange?: HRowSelection["onChange"];
-    getCheckboxProps?: HRowSelection["getCheckboxProps"];
-    index: number;
-}
-export declare const RowCheckBoxSelection: ({ data, onChange, index, getCheckboxProps, }: RowSelectionBoxProps) => JSX.Element;
-export {};

package/lib/HTableBody/RowCheckBoxSelection.js

@@ -1,174 +0,0 @@
-'use strict';
-
-var _toConsumableArray = require('@babel/runtime-corejs3/helpers/toConsumableArray');
-var _filterInstanceProperty = require('@babel/runtime-corejs3/core-js-stable/instance/filter');
-var _keysInstanceProperty = require('@babel/runtime-corejs3/core-js-stable/instance/keys');
-var _mapInstanceProperty = require('@babel/runtime-corejs3/core-js-stable/instance/map');
-var _indexOfInstanceProperty = require('@babel/runtime-corejs3/core-js-stable/instance/index-of');
-var _spliceInstanceProperty = require('@babel/runtime-corejs3/core-js-stable/instance/splice');
-var jsxRuntime = require('react/jsx-runtime');
-var context = require('../context.js');
-var antd = require('antd');
-var React = require('react');
-
-var RowCheckBoxSelectionTitle = function RowCheckBoxSelectionTitle(_ref) {
-  var _ref$allPageCheck = _ref.allPageCheck,
-    allPageCheck = _ref$allPageCheck === void 0 ? true : _ref$allPageCheck,
-    onChange = _ref.onChange,
-    getCheckboxProps = _ref.getCheckboxProps;
-  var _useHTableContext = context.useHTableContext(),
-    data = _useHTableContext.data,
-    selectedRowData = _useHTableContext.selectedRowData,
-    rowOnChange = _useHTableContext.rowOnChange,
-    allSelectChange = _useHTableContext.allSelectChange,
-    _useHTableContext$row = _useHTableContext.rowKey,
-    rowKey = _useHTableContext$row === void 0 ? "id" : _useHTableContext$row;
-  var _ref2 = data || {},
-    _ref2$records = _ref2.records,
-    records = _ref2$records === void 0 ? [] : _ref2$records;
-  var newData = records === null || records === void 0 ? void 0 : _filterInstanceProperty(records).call(records, function (item) {
-    var _ref3 = (getCheckboxProps === null || getCheckboxProps === void 0 ? void 0 : getCheckboxProps(item)) || {},
-      _ref3$disabled = _ref3.disabled,
-      disabled = _ref3$disabled === void 0 ? false : _ref3$disabled;
-    return !disabled;
-  });
-  var keys = _keysInstanceProperty(selectedRowData),
-    selectAll = selectedRowData.selectAll;
-  var allCheck = function allCheck() {
-    var setKeys = _mapInstanceProperty(newData).call(newData, function (item, index) {
-      return typeof rowKey === "function" ? rowKey(item, index) : item[rowKey];
-    });
-    rowOnChange(setKeys, newData);
-    onChange === null || onChange === void 0 || onChange(setKeys, newData);
-  };
-  var allCancel = function allCancel() {
-    rowOnChange([], []);
-    onChange === null || onChange === void 0 || onChange([], []);
-  };
-  var checkChange = function checkChange(e) {
-    var checked = e.target.checked;
-    if (checked) {
-      allCheck();
-      return;
-    }
-    allCancel();
-  };
-  var change = function change(_ref4) {
-    var key = _ref4.key;
-    if (key === "check") {
-      allCheck();
-      return;
-    }
-    if (key === "cancel") {
-      allCancel();
-      return;
-    }
-    if (key === "checkAll") {
-      allSelectChange === null || allSelectChange === void 0 || allSelectChange(true);
-      onChange === null || onChange === void 0 || onChange([], []);
-      return;
-    }
-    allSelectChange === null || allSelectChange === void 0 || allSelectChange(false);
-    onChange === null || onChange === void 0 || onChange([], []);
-  };
-  var len = (keys === null || keys === void 0 ? void 0 : keys.length) || 0;
-  var dataLen = (newData === null || newData === void 0 ? void 0 : newData.length) || 0;
-  var checked = len === dataLen && len !== 0;
-  var configItems = React.useMemo(function () {
-    var fsArray = checked ? {
-      label: "取消此页数据",
-      key: "cancel"
-    } : {
-      label: "选择此页数据",
-      key: "check"
-    };
-    var enArray = selectAll ? {
-      label: "取消全部数据",
-      key: "cancelAll"
-    } : {
-      label: "选择全部数据",
-      key: "checkAll"
-    };
-    return [fsArray, enArray];
-  }, [checked, selectAll]);
-  var menu = function menu() {
-    var MenuEle = antd.Menu;
-    return jsxRuntime.jsx(MenuEle, {
-      onClick: change,
-      items: configItems
-    });
-  };
-  var disabled = dataLen === 0;
-  if (allPageCheck) {
-    return jsxRuntime.jsx(antd.Dropdown, {
-      overlay: menu,
-      arrow: true,
-      placement: "bottom",
-      disabled: disabled,
-      children: jsxRuntime.jsx(antd.Checkbox, {
-        checked: checked,
-        onChange: checkChange,
-        disabled: disabled
-      })
-    });
-  }
-  return jsxRuntime.jsx(antd.Checkbox, {
-    checked: checked,
-    onChange: checkChange,
-    disabled: disabled
-  });
-};
-var RowCheckBoxSelection = function RowCheckBoxSelection(_ref5) {
-  var data = _ref5.data,
-    onChange = _ref5.onChange,
-    index = _ref5.index,
-    getCheckboxProps = _ref5.getCheckboxProps;
-  var _useHTableContext2 = context.useHTableContext(),
-    selectedRowData = _useHTableContext2.selectedRowData,
-    rowOnChange = _useHTableContext2.rowOnChange,
-    _useHTableContext2$ro = _useHTableContext2.rowKey,
-    rowKey = _useHTableContext2$ro === void 0 ? "id" : _useHTableContext2$ro;
-  var _selectedRowData$rowD = selectedRowData.rowData,
-    rowData = _selectedRowData$rowD === void 0 ? [] : _selectedRowData$rowD,
-    _selectedRowData$keys = _keysInstanceProperty(selectedRowData),
-    keys = _selectedRowData$keys === void 0 ? [] : _selectedRowData$keys;
-  var key = typeof rowKey === "function" ? rowKey(data, index) : data[rowKey];
-  var add = function add() {
-    var newKeys = _toConsumableArray(keys);
-    var newRowData = _toConsumableArray(rowData);
-    newKeys.push(key);
-    newRowData.push(data);
-    rowOnChange(newKeys, newRowData);
-    onChange === null || onChange === void 0 || onChange(newKeys, newRowData);
-  };
-  var cancel = function cancel() {
-    var newKeys = _toConsumableArray(keys);
-    var newRowData = _toConsumableArray(rowData);
-    var keyIndex = _indexOfInstanceProperty(newKeys).call(newKeys, key);
-    _spliceInstanceProperty(newKeys).call(newKeys, keyIndex, 1);
-    _spliceInstanceProperty(newRowData).call(newRowData, keyIndex, 1);
-    rowOnChange(newKeys, newRowData);
-    onChange === null || onChange === void 0 || onChange(newKeys, newRowData);
-  };
-  var check = function check(e) {
-    var checked = e.target.checked;
-    if (checked) {
-      add();
-      return;
-    }
-    cancel();
-  };
-  var _ref6 = (getCheckboxProps === null || getCheckboxProps === void 0 ? void 0 : getCheckboxProps(data)) || {},
-    _ref6$disabled = _ref6.disabled,
-    disabled = _ref6$disabled === void 0 ? false : _ref6$disabled;
-  var checked = _indexOfInstanceProperty(keys).call(keys, key) !== -1;
-  return jsxRuntime.jsx(antd.Checkbox, {
-    checked: checked,
-    onChange: check,
-    disabled: disabled
-  });
-};
-
-exports.RowCheckBoxSelection = RowCheckBoxSelection;
-exports.RowCheckBoxSelectionTitle = RowCheckBoxSelectionTitle;
-// powered by h