@hw-component/table 1.10.15 → 1.10.17

package/es/EditTable/hooks.d.ts

@@ -2,12 +2,21 @@ import { HEditTableProps } from "./modal";
 import { MutableRefObject } from "react";
 import type { ActionType } from "@ant-design/pro-table";
 import { EditableFormInstance } from "@ant-design/pro-table/lib/components/EditableTable";
-export declare const useListRequest: ({ request, dataSource, manual, }: HEditTableProps) => import("@ahooksjs/use-request/lib/types").BaseResult<any, [params?: any]>;
+import { ResultModal } from "../modal";
+export declare const useListRequest: ({ request, dataSource, manual, }: HEditTableProps) => {
+    loading: boolean;
+    error: Error | undefined;
+    run: (params?: any) => Promise<void>;
+    data: ResultModal;
+};
 export declare const useCuRef: ({ actionRef, editableFormRef }: HEditTableProps) => {
     cuActionRef: MutableRefObject<ActionType>;
     cuEditableFormRef: MutableRefObject<EditableFormInstance>;
 };
-export declare const useColsMk: ({ configData }: HEditTableProps) => (import("@ant-design/pro-table").ProColumnType<any, "text"> | {
+interface ColProps extends HEditTableProps {
+    reload: VoidFunction;
+}
+export declare const useColsMk: ({ configData, reload }: ColProps) => (import("@ant-design/pro-table").ProColumnType<any, "text"> | {
     render: (dom: any, entity: any, index: any, action: any, schema: any) => any;
     children: import("@ant-design/pro-table").ProColumns<any, "text">[];
     key?: import("react").Key | undefined;
@@ -1555,3 +1564,4 @@ export declare const useColsMk: ({ configData }: HEditTableProps) => (import("@a
     } | undefined) | undefined;
     fieldProps?: any;
 })[] | undefined;
+export {};

package/es/EditTable/hooks.js

@@ -9,11 +9,12 @@ import _Object$defineProperties from '@babel/runtime-corejs3/core-js-stable/obje
 import _Object$defineProperty from '@babel/runtime-corejs3/core-js-stable/object/define-property';
 import _defineProperty from '@babel/runtime-corejs3/helpers/defineProperty';
 import _asyncToGenerator from '@babel/runtime-corejs3/helpers/asyncToGenerator';
+import _slicedToArray from '@babel/runtime-corejs3/helpers/slicedToArray';
 import _regeneratorRuntime from '@babel/runtime-corejs3/regenerator';
 import _Array$isArray from '@babel/runtime-corejs3/core-js-stable/array/is-array';
 import _mapInstanceProperty from '@babel/runtime-corejs3/core-js-stable/instance/map';
 import { useRequest } from 'ahooks';
-import { useMemo, useRef } from 'react';
+import { useState, useMemo, useEffect, useRef } from 'react';
 import config from '../render/config.js';
 
 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; }
@@ -22,7 +23,15 @@ var useListRequest = function useListRequest(_ref) {
   var request = _ref.request,
     dataSource = _ref.dataSource,
     manual = _ref.manual;
-  var relManual = request ? manual : false;
+  var _useState = useState({
+      records: [],
+      total: "0",
+      size: "10",
+      current: "1"
+    }),
+    _useState2 = _slicedToArray(_useState, 2),
+    tableDataSource = _useState2[0],
+    setTableDataSource = _useState2[1];
   var saveParams = useMemo(function () {
     return {
       params: {
@@ -31,38 +40,60 @@ var useListRequest = function useListRequest(_ref) {
       }
     };
   }, []);
-  return useRequest( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
-    var params,
-      newParams,
-      _args = arguments;
-    return _regeneratorRuntime.wrap(function _callee$(_context) {
-      while (1) switch (_context.prev = _context.next) {
-        case 0:
-          params = _args.length > 0 && _args[0] !== undefined ? _args[0] : {};
-          newParams = _objectSpread(_objectSpread({}, saveParams.params), params);
-          saveParams.params = newParams;
-          if (!request) {
-            _context.next = 5;
-            break;
-          }
-          return _context.abrupt("return", request(newParams));
-        case 5:
-          if (!_Array$isArray(dataSource)) {
-            _context.next = 7;
-            break;
-          }
-          return _context.abrupt("return", dataSource);
-        case 7:
-          return _context.abrupt("return", dataSource);
-        case 8:
-        case "end":
-          return _context.stop();
-      }
-    }, _callee);
-  })), {
-    manual: relManual,
-    refreshDeps: [dataSource]
-  });
+  var _useRequest = useRequest( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
+      var params,
+        newParams,
+        result,
+        _args = arguments;
+      return _regeneratorRuntime.wrap(function _callee$(_context) {
+        while (1) switch (_context.prev = _context.next) {
+          case 0:
+            params = _args.length > 0 && _args[0] !== undefined ? _args[0] : {};
+            newParams = _objectSpread(_objectSpread({}, saveParams.params), params);
+            saveParams.params = newParams;
+            if (!request) {
+              _context.next = 9;
+              break;
+            }
+            _context.next = 6;
+            return request(newParams);
+          case 6:
+            result = _context.sent;
+            setTableDataSource(result);
+            return _context.abrupt("return");
+          case 9:
+            if (!_Array$isArray(dataSource)) {
+              _context.next = 12;
+              break;
+            }
+            setTableDataSource(_objectSpread(_objectSpread({}, tableDataSource), {}, {
+              records: dataSource
+            }));
+            return _context.abrupt("return");
+          case 12:
+            return _context.abrupt("return", setTableDataSource(dataSource || tableDataSource));
+          case 13:
+          case "end":
+            return _context.stop();
+        }
+      }, _callee);
+    })), {
+      manual: true
+    }),
+    loading = _useRequest.loading,
+    error = _useRequest.error,
+    run = _useRequest.run;
+  useEffect(function () {
+    if (!manual) {
+      run();
+    }
+  }, [dataSource]);
+  return {
+    loading: loading,
+    error: error,
+    run: run,
+    data: tableDataSource
+  };
 };
 var useCuRef = function useCuRef(_ref3) {
   var actionRef = _ref3.actionRef,
@@ -77,23 +108,35 @@ var useCuRef = function useCuRef(_ref3) {
   };
 };
 var useColsMk = function useColsMk(_ref4) {
-  var configData = _ref4.configData;
+  var configData = _ref4.configData,
+    reload = _ref4.reload;
   return configData === null || configData === void 0 ? void 0 : _mapInstanceProperty(configData).call(configData, function (item) {
     var valueType = item.valueType,
       _render = item.render;
     var configType = valueType;
-    if (!config[configType]) {
-      return item;
+    if (config[configType]) {
+      return _objectSpread(_objectSpread({}, item), {}, {
+        render: function render(dom, entity, index, action, schema) {
+          var node = config[configType](item, entity, index);
+          if (_render) {
+            return _render(node, entity, index, _objectSpread(_objectSpread({}, action), {}, {
+              reload: reload
+            }), schema);
+          }
+          return node;
+        }
+      });
     }
-    return _objectSpread(_objectSpread({}, item), {}, {
-      render: function render(dom, entity, index, action, schema) {
-        var node = config[configType](item, entity, index);
-        if (_render) {
-          return _render(node, entity, index, action, schema);
+    if (_render) {
+      return _objectSpread(_objectSpread({}, item), {}, {
+        render: function render(dom, entity, index, action, schema) {
+          return _render(dom, entity, index, _objectSpread(_objectSpread({}, action), {}, {
+            reload: reload
+          }), schema);
         }
-        return node;
-      }
-    });
+      });
+    }
+    return item;
   });
 };
 

package/es/EditTable/index.js

@@ -1,9 +1,4 @@
 // welcome to hoo hoo hoo
-import _asyncToGenerator from '@babel/runtime-corejs3/helpers/asyncToGenerator';
-import _defineProperty from '@babel/runtime-corejs3/helpers/defineProperty';
-import _objectWithoutProperties from '@babel/runtime-corejs3/helpers/objectWithoutProperties';
-import _regeneratorRuntime from '@babel/runtime-corejs3/regenerator';
-import _Array$isArray from '@babel/runtime-corejs3/core-js-stable/array/is-array';
 import _Object$keys from '@babel/runtime-corejs3/core-js-stable/object/keys';
 import _Object$getOwnPropertySymbols from '@babel/runtime-corejs3/core-js-stable/object/get-own-property-symbols';
 import _filterInstanceProperty from '@babel/runtime-corejs3/core-js-stable/instance/filter';
@@ -12,6 +7,10 @@ import _forEachInstanceProperty from '@babel/runtime-corejs3/core-js-stable/inst
 import _Object$getOwnPropertyDescriptors from '@babel/runtime-corejs3/core-js-stable/object/get-own-property-descriptors';
 import _Object$defineProperties from '@babel/runtime-corejs3/core-js-stable/object/define-properties';
 import _Object$defineProperty from '@babel/runtime-corejs3/core-js-stable/object/define-property';
+import _asyncToGenerator from '@babel/runtime-corejs3/helpers/asyncToGenerator';
+import _defineProperty from '@babel/runtime-corejs3/helpers/defineProperty';
+import _objectWithoutProperties from '@babel/runtime-corejs3/helpers/objectWithoutProperties';
+import _regeneratorRuntime from '@babel/runtime-corejs3/regenerator';
 import { jsxs, jsx } from 'react/jsx-runtime';
 import { EditableProTable } from '@ant-design/pro-table';
 import { useClassName } from '../hooks/index.js';
@@ -66,8 +65,6 @@ var EditTable = (function (_ref) {
     tableEmptyRender = _useHTableConfigConte2 === void 0 ? emptyDefaultRender : _useHTableConfigConte2,
     _useHTableConfigConte3 = _useHTableConfigConte.errorRender,
     tableErrorRender = _useHTableConfigConte3 === void 0 ? errorDefaultRender : _useHTableConfigConte3;
-  var isLocalData = _Array$isArray(data);
-  var values = isLocalData ? data : data === null || data === void 0 ? void 0 : data.records;
   var _useCuRef = useCuRef({
       actionRef: actionRef,
       editableFormRef: editableFormRef
@@ -75,7 +72,8 @@ var EditTable = (function (_ref) {
     cuActionRef = _useCuRef.cuActionRef,
     cuEditableFormRef = _useCuRef.cuEditableFormRef;
   var columns = useColsMk({
-    configData: configData
+    configData: configData,
+    reload: run
   });
   return jsxs("div", {
     className: tableBody,
@@ -94,10 +92,8 @@ var EditTable = (function (_ref) {
         loading: loading,
         rowKey: rowKey,
         editableFormRef: cuEditableFormRef,
-        manualRequest: true,
-        request: run,
         actionRef: cuActionRef,
-        value: values,
+        value: data === null || data === void 0 ? void 0 : data.records,
         recordCreatorProps: _objectSpread({
           position: "bottom",
           record: function record() {
@@ -169,8 +165,8 @@ var EditTable = (function (_ref) {
           }()
         }, editable)
       }, props))
-    }), jsx(HTablePagination, _objectSpread(_objectSpread({
-      data: isLocalData ? null : data
+    }), pagination === false ? null : jsx(HTablePagination, _objectSpread(_objectSpread({
+      data: data
     }, pagination), {}, {
       onChange: function onChange(page, pageSize) {
         run({

package/es/EditTable/modal.d.ts

@@ -9,7 +9,7 @@ export interface HEditTableProps<T = any> extends Omit<EditableProTableProps<T,
     recordCreatorProps?: Partial<EditableProTableProps<T, ParamsType>["recordCreatorProps"]>;
     dataSource?: any[];
     request?: (params: Record<string, any>) => Promise<T>;
-    pagination?: IPaginationProps;
+    pagination?: IPaginationProps | false;
     manual?: boolean;
     emptyRender?: EmptyPageRender;
     errorRender?: ErrorPageRender;

package/es/HTableBody/Options/hooks.d.ts

@@ -1,7 +1,10 @@
 import React from "react";
-import type { IProps } from "@/components/HTableBody/Options/modal";
-import type { ConfigDataModal } from "@/components/modal";
-export declare const useCheckKeys: ({ columns, colStatusValue, }: Pick<IProps, "colStatusValue" | "columns">) => string[];
+import type { IProps } from "../Options/modal";
+import type { ConfigDataModal } from "../../modal";
+export declare const useTreeValue: ({ columns, colStatusValue }: Pick<IProps, "colStatusValue" | "columns">) => {
+    checkKeys: string[];
+    cols: ConfigDataModal;
+};
 interface UseContentTreeModal {
     columns: ConfigDataModal;
     matchKey?: "right" | "left";

package/es/HTableBody/Options/hooks.js

@@ -1,45 +1,72 @@
 // 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 _forEachInstanceProperty from '@babel/runtime-corejs3/core-js-stable/instance/for-each';
+import _spliceInstanceProperty from '@babel/runtime-corejs3/core-js-stable/instance/splice';
+import _concatInstanceProperty from '@babel/runtime-corejs3/core-js-stable/instance/concat';
 import _indexOfInstanceProperty from '@babel/runtime-corejs3/core-js-stable/instance/index-of';
 import { jsx } from 'react/jsx-runtime';
 import { useMemo } from 'react';
 import { getItemValue } from './utils.js';
 import { useClassName } from '../../hooks/index.js';
 
-var useCheckKeys = function useCheckKeys(_ref) {
+var useTreeValue = function useTreeValue(_ref) {
   var columns = _ref.columns,
     colStatusValue = _ref.colStatusValue;
   return useMemo(function () {
-    var keys = [];
-    _forEachInstanceProperty(columns).call(columns, function (value) {
-      var dataIndex = value.dataIndex,
-        hideInTable = value.hideInTable;
-      if (hideInTable || !dataIndex) {
-        return;
-      }
+    var _context2;
+    var checkKeys = [];
+    var newCols = _filterInstanceProperty(columns).call(columns, function (_ref2) {
+      var dataIndex = _ref2.dataIndex,
+        hideInTable = _ref2.hideInTable;
+      return !hideInTable && dataIndex;
+    });
+    var sortCols = [];
+    var tmpCols = [];
+    var tmpLen = 0;
+    _forEachInstanceProperty(newCols).call(newCols, function (value) {
+      var dataIndex = value.dataIndex;
       var dataIndexStr = dataIndex.toString();
-      var _ref2 = colStatusValue[dataIndexStr] || {},
-        _ref2$show = _ref2.show,
-        show = _ref2$show === void 0 ? true : _ref2$show;
-      if (!show) {
-        return;
+      var _ref3 = colStatusValue[dataIndexStr] || {},
+        order = _ref3.order,
+        _ref3$show = _ref3.show,
+        show = _ref3$show === void 0 ? true : _ref3$show;
+      var orderStr = order === null || order === void 0 ? void 0 : order.toString();
+      if (!orderStr) {
+        tmpCols.push(value);
+      }
+      if (orderStr) {
+        var cuOrder = order + tmpLen;
+        sortCols[cuOrder] = value;
+      }
+      if (order === 0) {
+        var _context;
+        _spliceInstanceProperty(sortCols).apply(sortCols, _concatInstanceProperty(_context = [0, 0]).call(_context, _toConsumableArray(tmpCols)));
+        tmpLen = tmpCols.length;
+        tmpCols = [];
+      }
+      if (show) {
+        checkKeys.push(dataIndexStr);
       }
-      keys.push(dataIndexStr);
     });
-    return keys;
+    _spliceInstanceProperty(sortCols).apply(sortCols, _concatInstanceProperty(_context2 = [tmpLen + 1, 0]).call(_context2, _toConsumableArray(tmpCols)));
+    return {
+      checkKeys: checkKeys,
+      cols: sortCols
+    };
   }, [colStatusValue, columns]);
 };
-var useContentTree = function useContentTree(_ref3) {
-  var columns = _ref3.columns,
-    matchKey = _ref3.matchKey;
+var useContentTree = function useContentTree(_ref4) {
+  var columns = _ref4.columns,
+    matchKey = _ref4.matchKey;
   var titleClass = useClassName("hw-table-body-option-setting-content-title");
   return useMemo(function () {
     var treeData = [];
-    _forEachInstanceProperty(columns).call(columns, function (_ref4) {
-      var dataIndex = _ref4.dataIndex,
-        title = _ref4.title,
-        titleStr = _ref4.titleStr,
-        fixed = _ref4.fixed;
+    _forEachInstanceProperty(columns).call(columns, function (_ref5) {
+      var dataIndex = _ref5.dataIndex,
+        title = _ref5.title,
+        titleStr = _ref5.titleStr,
+        fixed = _ref5.fixed;
       if (!dataIndex) {
         return;
       }
@@ -62,13 +89,13 @@ var useContentTree = function useContentTree(_ref3) {
     return treeData;
   }, [columns]);
 };
-var useTreeKeys = function useTreeKeys(_ref5) {
-  var treeData = _ref5.treeData,
-    checkKeys = _ref5.checkKeys;
+var useTreeKeys = function useTreeKeys(_ref6) {
+  var treeData = _ref6.treeData,
+    checkKeys = _ref6.checkKeys;
   return useMemo(function () {
     var newKeys = [];
-    _forEachInstanceProperty(treeData).call(treeData, function (_ref6) {
-      var key = _ref6.key;
+    _forEachInstanceProperty(treeData).call(treeData, function (_ref7) {
+      var key = _ref7.key;
       var index = _indexOfInstanceProperty(checkKeys).call(checkKeys, key);
       if (index !== -1) {
         newKeys.push(key);
@@ -78,5 +105,5 @@ var useTreeKeys = function useTreeKeys(_ref5) {
   }, [treeData, checkKeys]);
 };
 
-export { useCheckKeys, useContentTree, useTreeKeys };
+export { useContentTree, useTreeKeys, useTreeValue };
 // powered by hdj

package/es/HTableBody/Options/index.js

@@ -6,7 +6,7 @@ import { ReloadOutlined, ColumnHeightOutlined, SettingOutlined } from '@ant-desi
 import { useRef } from 'react';
 import { ColsSettingContent } from './Content.js';
 import { Title } from './Title.js';
-import { useCheckKeys } from './hooks.js';
+import { useTreeValue } from './hooks.js';
 
 var Options = (function (_ref) {
   var reload = _ref.reload,
@@ -23,10 +23,12 @@ var Options = (function (_ref) {
     onDrop = _ref.onDrop;
   var pointer = useClassName(["hw-table-pointer", "hw-table-body-option-icon"]);
   var ref = useRef(null);
-  var checkKeys = useCheckKeys({
-    columns: columns,
-    colStatusValue: colStatusValue
-  });
+  var _useTreeValue = useTreeValue({
+      columns: columns,
+      colStatusValue: colStatusValue
+    }),
+    checkKeys = _useTreeValue.checkKeys,
+    cols = _useTreeValue.cols;
   var SizeItem = function SizeItem() {
     var MenuComponent = Menu;
     var MenuItem = Menu.Item;
@@ -83,7 +85,7 @@ var Options = (function (_ref) {
         })
       }), jsx(Popover, {
         content: jsx(ColsSettingContent, {
-          columns: columns,
+          columns: cols,
           checkKeys: checkKeys,
           onCheck: onChange,
           onDrop: onDrop

package/es/HTableBody/Options/utils.d.ts

@@ -5,7 +5,7 @@ export declare const getItemValue: (data: ConfigItemModal) => {
     labelAlign?: import("@hw-component/form/es/Form/modal").LabelAlignModal | undefined;
     label?: React.ReactNode | import("@hw-component/form/es/Form/modal").HelperModal;
     hidden?: boolean | import("@hw-component/form/es/Form/modal").HideModal | undefined;
-    children?: React.ReactNode | ((form: import("rc-field-form").FormInstance<any>) => React.ReactNode);
+    children?: ((string | number | boolean | {} | React.ReactElement<any, string | React.JSXElementConstructor<any>> | React.ReactNodeArray | React.ReactPortal | ((form: import("rc-field-form").FormInstance<any>) => React.ReactNode) | null) & ConfigItemModal[]) | undefined;
     dependencies?: import("rc-field-form/lib/interface").NamePath[] | undefined;
     getValueFromEvent?: ((...args: import("rc-field-form/lib/interface").EventArgs) => any) | undefined;
     normalize?: ((value: any, prevValue: any, allValues: import("rc-field-form/lib/interface").Store) => any) | undefined;
@@ -802,7 +802,7 @@ export declare const getItemValue: (data: ConfigItemModal) => {
         width?: number | undefined;
     } | undefined) | undefined;
     fieldProps?: any;
-    childrenDataIndex?: string[] | ConfigItemModal[] | undefined;
+    childrenDataIndex?: ConfigItemModal[] | string[] | undefined;
     title: any;
     dataIndex: ((string | number | (string | number)[]) & import("rc-table/lib/interface").DataIndex) | undefined;
 };

package/es/HTableBody/hooks/useColData.d.ts

@@ -1,12 +1,6 @@
-/// <reference types="react" />
-import type { ConfigDataModal, HTableProps } from "../../modal";
+import type { ConfigDataModal } from "../../modal";
 import type { ColumnsState } from "@ant-design/pro-table/es/container";
 import type { ColumnsStateType } from "@ant-design/pro-table/es/typing";
-export declare const useCols: ({ configData, rowSelection, table, bordered, configItemRender, }: HTableProps) => {
-    cols: ConfigDataModal;
-    setCols: import("react").Dispatch<import("react").SetStateAction<ConfigDataModal>>;
-    resetCols: () => void;
-};
 interface useColumnsStateTypeModal {
     columnsState?: ColumnsStateType;
     columns: ConfigDataModal;
@@ -16,6 +10,7 @@ export declare const useColumnsStateType: ({ columnsState, columns, }: useColumn
     persistenceKey: string | undefined;
     value: Record<string, ColumnsState> | undefined;
     onChange: (keys: string[], notCheck: string[]) => void;
-    resetCheckCol: () => void;
+    resetCol: () => void;
+    dropChange: (list: ConfigDataModal) => void;
 };
 export {};