@hw-component/table 1.9.26 → 1.9.28

package/es/HTableBody/RowSelection.js

@@ -8,7 +8,7 @@ import _spliceInstanceProperty from '@babel/runtime-corejs3/core-js-stable/insta
 import { jsx } from 'react/jsx-runtime';
 import { useHTableContext } from '../context.js';
 import { Dropdown, Checkbox, Menu } from 'antd';
-import { useMemo } from 'react';
+import { useMemo, useEffect } from 'react';
 
 var RowSelectionTitle = function RowSelectionTitle(_ref) {
   var _ref$allPageCheck = _ref.allPageCheck,
@@ -152,8 +152,12 @@ var RowSelectionBox = function RowSelectionBox(_ref5) {
   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;
+  useEffect(function () {
+    console.log("检测一次");
+  }, []);
   return jsx(Checkbox, {
-    checked: _indexOfInstanceProperty(keys).call(keys, key) !== -1,
+    checked: checked,
     onChange: check,
     disabled: disabled
   });

package/es/HTableHeader/defaultSubComponent.js

@@ -80,8 +80,7 @@ var DefaultSubComponent = function DefaultSubComponent(_ref) {
         onReset();
         return;
       }
-      console.log("resetBtn");
-      form.resetFields();
+      form.resetFieldsInitValue();
     },
     children: "\u91CD\u7F6E"
   });

package/es/Table.d.ts

@@ -1,4 +1,4 @@
 /// <reference types="react" />
 import type { HTableProps } from "./modal";
-declare const _default: ({ request, configData, searchSpan, table, hideHeader, headerStyle, tableStyle, action, spaceSize, className, paginationStyle, rowKey, onFinish, manual, formInitValues, hideLabel, labelWidth, onReset, style, dataSource, reload, ...props }: HTableProps) => JSX.Element;
+declare const _default: ({ request, configData, searchSpan, table, hideHeader, headerStyle, tableStyle, action, spaceSize, className, paginationStyle, rowKey, onFinish, manual, formInitValues, hideLabel, labelWidth, onReset, style, dataSource, reload, loading: propsLoading, error: propsError, ...props }: HTableProps) => JSX.Element;
 export default _default;

package/es/Table.js

@@ -22,7 +22,7 @@ import useDispatch from './hooks/useDispatch.js';
 import { useState } from 'react';
 import { useClassName } from './hooks/index.js';
 
-var _excluded = ["request", "configData", "searchSpan", "table", "hideHeader", "headerStyle", "tableStyle", "action", "spaceSize", "className", "paginationStyle", "rowKey", "onFinish", "manual", "formInitValues", "hideLabel", "labelWidth", "onReset", "style", "dataSource", "reload"];
+var _excluded = ["request", "configData", "searchSpan", "table", "hideHeader", "headerStyle", "tableStyle", "action", "spaceSize", "className", "paginationStyle", "rowKey", "onFinish", "manual", "formInitValues", "hideLabel", "labelWidth", "onReset", "style", "dataSource", "reload", "loading", "error"];
 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 _context2, _context3; var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? _forEachInstanceProperty(_context2 = ownKeys(Object(t), !0)).call(_context2, function (r) { _defineProperty(e, r, t[r]); }) : _Object$getOwnPropertyDescriptors ? _Object$defineProperties(e, _Object$getOwnPropertyDescriptors(t)) : _forEachInstanceProperty(_context3 = ownKeys(Object(t))).call(_context3, function (r) { _Object$defineProperty(e, r, _Object$getOwnPropertyDescriptor(t, r)); }); } return e; }
 var Table = (function (_ref) {
@@ -50,6 +50,8 @@ var Table = (function (_ref) {
     style = _ref.style,
     dataSource = _ref.dataSource,
     reload = _ref.reload,
+    propsLoading = _ref.loading,
+    propsError = _ref.error,
     props = _objectWithoutProperties(_ref, _excluded);
   var _useReq = useReq({
       request: request,
@@ -99,8 +101,8 @@ var Table = (function (_ref) {
       selectedRowData: selectedRowData,
       rowOnChange: rowOnChange,
       data: data,
-      error: error,
-      loading: loading,
+      error: propsError || error,
+      loading: propsLoading || loading,
       allSelectChange: allSelectChange,
       action: action,
       configData: configData,

package/lib/HTableBody/RowSelection.js

@@ -153,8 +153,12 @@ var RowSelectionBox = function RowSelectionBox(_ref5) {
   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;
+  React.useEffect(function () {
+    console.log("检测一次");
+  }, []);
   return jsxRuntime.jsx(antd.Checkbox, {
-    checked: _indexOfInstanceProperty(keys).call(keys, key) !== -1,
+    checked: checked,
     onChange: check,
     disabled: disabled
   });

package/lib/HTableHeader/defaultSubComponent.js

@@ -81,8 +81,7 @@ var DefaultSubComponent = function DefaultSubComponent(_ref) {
         onReset();
         return;
       }
-      console.log("resetBtn");
-      form.resetFields();
+      form.resetFieldsInitValue();
     },
     children: "\u91CD\u7F6E"
   });

package/lib/Table.d.ts

@@ -1,4 +1,4 @@
 /// <reference types="react" />
 import type { HTableProps } from "./modal";
-declare const _default: ({ request, configData, searchSpan, table, hideHeader, headerStyle, tableStyle, action, spaceSize, className, paginationStyle, rowKey, onFinish, manual, formInitValues, hideLabel, labelWidth, onReset, style, dataSource, reload, ...props }: HTableProps) => JSX.Element;
+declare const _default: ({ request, configData, searchSpan, table, hideHeader, headerStyle, tableStyle, action, spaceSize, className, paginationStyle, rowKey, onFinish, manual, formInitValues, hideLabel, labelWidth, onReset, style, dataSource, reload, loading: propsLoading, error: propsError, ...props }: HTableProps) => JSX.Element;
 export default _default;

package/lib/Table.js

@@ -25,7 +25,7 @@ var useDispatch = require('./hooks/useDispatch.js');
 var React = require('react');
 var index = require('./hooks/index.js');
 
-var _excluded = ["request", "configData", "searchSpan", "table", "hideHeader", "headerStyle", "tableStyle", "action", "spaceSize", "className", "paginationStyle", "rowKey", "onFinish", "manual", "formInitValues", "hideLabel", "labelWidth", "onReset", "style", "dataSource", "reload"];
+var _excluded = ["request", "configData", "searchSpan", "table", "hideHeader", "headerStyle", "tableStyle", "action", "spaceSize", "className", "paginationStyle", "rowKey", "onFinish", "manual", "formInitValues", "hideLabel", "labelWidth", "onReset", "style", "dataSource", "reload", "loading", "error"];
 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 _context2, _context3; var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? _forEachInstanceProperty(_context2 = ownKeys(Object(t), !0)).call(_context2, function (r) { _defineProperty(e, r, t[r]); }) : _Object$getOwnPropertyDescriptors ? _Object$defineProperties(e, _Object$getOwnPropertyDescriptors(t)) : _forEachInstanceProperty(_context3 = ownKeys(Object(t))).call(_context3, function (r) { _Object$defineProperty(e, r, _Object$getOwnPropertyDescriptor(t, r)); }); } return e; }
 var Table = (function (_ref) {
@@ -53,6 +53,8 @@ var Table = (function (_ref) {
     style = _ref.style,
     dataSource = _ref.dataSource,
     reload = _ref.reload,
+    propsLoading = _ref.loading,
+    propsError = _ref.error,
     props = _objectWithoutProperties(_ref, _excluded);
   var _useReq = useReq.default({
       request: request,
@@ -102,8 +104,8 @@ var Table = (function (_ref) {
       selectedRowData: selectedRowData,
       rowOnChange: rowOnChange,
       data: data,
-      error: error,
-      loading: loading,
+      error: propsError || error,
+      loading: propsLoading || loading,
       allSelectChange: allSelectChange,
       action: action,
       configData: configData,

package/package.json

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

package/src/components/HTableBody/RowSelection.tsx

@@ -1,6 +1,6 @@
 import { useHTableContext } from "../context";
 import { Checkbox, Dropdown, Menu } from "antd";
-import { useMemo } from "react";
+import {useEffect, useMemo} from "react";
 import type { HRowSelection } from "../modal";
 export const RowSelectionTitle = ({
   allPageCheck = true,
@@ -137,9 +137,16 @@ export const RowSelectionBox = ({
     onChange?.(newKeys, newRowData);
   };
   const { disabled = false } = getCheckboxProps?.(data) || {};
+  const checked=keys.indexOf(key) !== -1;
+  useEffect(() => {
+     if (checked){
+
+     }
+     console.log("检测一次")
+  }, []);
   return (
     <Checkbox
-      checked={keys.indexOf(key) !== -1}
+      checked={checked}
       onChange={check}
       disabled={disabled}
     />

package/src/components/HTableHeader/defaultSubComponent.tsx

@@ -70,8 +70,7 @@ export const DefaultSubComponent = ({ form ,render}: IProps) => {
           onReset();
           return;
         }
-        console.log("resetBtn")
-        form.resetFields();
+        form.resetFieldsInitValue();
       }}
   >
     重置

package/src/components/Table.tsx

@@ -31,6 +31,8 @@ export default ({
   style,
   dataSource,
   reload,
+   loading:propsLoading,
+   error:propsError,
   ...props
 }: HTableProps) => {
   const { run, loading, data, error, saveParams } = useReq({
@@ -70,8 +72,8 @@ export default ({
         selectedRowData,
         rowOnChange,
         data,
-        error,
-        loading,
+        error:propsError||error,
+        loading:(propsLoading as boolean)||loading,
         allSelectChange,
         action,
         configData,

package/src/pages/Table/index.tsx

@@ -43,20 +43,6 @@ export const configData = [
       },
     },
   },
-  {
-   showSearch: true,
-    searchType: "submit",
-    searchRender:(item,node,form)=>{
-     console.log(form)
-     return <HTableHeaderSubBtn form={form} render={([sub,reset,more])=>{
-       return <div>
-         {sub}
-         {reset}
-         {more}
-       </div>
-     }}/>
-    }
-  },
   {
     title: "短信接收手机号",
     dataIndex: "mobileList",
@@ -185,18 +171,10 @@ export default () => {
           searchSpan={{
             span:24
           }}
-          onFinish={() => {
-            console.log("fff");
-          }}
           rowKey={(rowData, index) => {
             return index;
           }}
           table={hTable}
-          onReset={() => {
-            hTable.form.setFieldsValue({
-              name1: "ffff",
-            });
-          }}
           labelWidth={88}
           action={{
             test: (params) => {