@hw-component/table 1.9.26 → 1.9.27

package/es/HTableHeader/defaultSubComponent.js

@@ -80,7 +80,6 @@ var DefaultSubComponent = function DefaultSubComponent(_ref) {
         onReset();
         return;
       }
-      console.log("resetBtn");
       form.resetFields();
     },
     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/HTableHeader/defaultSubComponent.js

@@ -81,7 +81,6 @@ var DefaultSubComponent = function DefaultSubComponent(_ref) {
         onReset();
         return;
       }
-      console.log("resetBtn");
       form.resetFields();
     },
     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.27",
   "description": "基于antd二次开发table组件",
   "keywords": [
     "table"

package/src/components/HTableHeader/defaultSubComponent.tsx

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

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

@@ -46,8 +46,8 @@ export const configData = [
   {
    showSearch: true,
     searchType: "submit",
-    searchRender:(item,node,form)=>{
-     console.log(form)
+    searchRender:(item,node,form,table)=>{
+     console.log(table)
      return <HTableHeaderSubBtn form={form} render={([sub,reset,more])=>{
        return <div>
          {sub}
@@ -192,6 +192,7 @@ export default () => {
             return index;
           }}
           table={hTable}
+          loading={true}
           onReset={() => {
             hTable.form.setFieldsValue({
               name1: "ffff",