@ccs-ui/rc-pro 1.1.9 → 1.1.10

package/es/ccs.d.ts

@@ -197,11 +197,13 @@ type GlobalConfig = {
     /** 路由上下文 */
     Context: string;
     /** 图片上传地址 */
-    UploadUrl: string;
+    UploadUrl?: string;
     /** 图片下载地址 */
-    DownloadUrl: string;
+    DownloadUrl?: string;
 };
 type TableFormItems = TableFormItem[];
 type TableInstanceRef<T = any> = MutableRefObject<TableInstance<T> | undefined> | React.RefObject<TableInstance<T>>;
-type TableColumns<T = any> = ColumnsType<T>;
+type TableColumns<T = any> = ColumnsType<T> & {
+    hidden?: boolean;
+};
 export type { PageType, RecordType, MenuTreeNode, PageQuery, ListQuery, HttpResult, GlobalConfig, HttpListResult, HttpPageResult, AuthButtonItem, MenuTreeNodeData, UserDetail, RouteHistory, TableData, TableFormItems, TableColumns, TableInstance, TableInstanceRef, TriggerChildrenProps, };

package/es/full-screen/index.js

@@ -7,7 +7,7 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import { FullscreenExitOutlined, FullscreenOutlined } from '@ant-design/icons';
 import { Button, Tooltip } from 'antd';
 import { useState } from 'react';
-import { classPrefix } from "../pro-table";
+import { classPrefix } from "../pro-table/table";
 import { jsx as _jsx } from "react/jsx-runtime";
 export default (function (_ref) {
   var onFullScreen = _ref.onFullScreen;

package/es/pro-table/index.d.ts

@@ -1,83 +1,26 @@
-import { TableProps } from 'antd';
-import { CSSProperties, ReactElement, ReactNode } from 'react';
-import CCS from '..';
+import { HttpPageResult, HttpResult } from '../ccs';
 import './index.less';
-type ParamType = Record<string, any>;
-export type ShowDependType = {
-    name: string;
-    value: any;
-};
-type SearchEventType = 'search' | 'reset' | 'reload' | 'changePage' | 'initSearch';
-type SearchBeforeType = ParamType & {
-    query: ParamType;
-};
-export type CcsTableProps<T> = TableProps<T> & {
-    data?: CCS.TableData<T>;
-    /** request 方法 */
-    request?: (params: any) => void;
-    /** request 额外参数 */
-    requestParam?: ParamType;
-    /** 自定义渲染内容 */
-    render?: (data: T[]) => ReactNode;
-    /** 异步树、父级参数名称,参数值：默认取rowkey的值 */
-    asyncTree?: {
-        parentName: string;
-    };
-    /** class name */
-    className?: string;
-    /** useEventEmitter事件 */
-    event$?: any;
-    /** style */
-    style?: CSSProperties;
+import { CcsProTableProps, SearchEventType } from './table';
+type TableProps<T> = Omit<CcsProTableProps<T>, 'onSearchAfter' | 'parentFieldName'> & {
+    /** 请求后格式化结果 */
+    onSearchAfter?: (data: HttpPageResult<T>, eventType?: SearchEventType) => any;
 };
-export type CcsProTableProps<T> = {
-    /** api权限标识 */
-    auth?: string | 'ignore';
-    /** 是否初始查询，默认true */
-    init?: boolean;
-    /** 标题 */
-    title?: string;
-    /** 查询条件集合 */
-    formItems?: CCS.TableFormItems;
-    /** form item label 宽度 */
-    formItemLabelWidth?: number | string;
-    /** 查询form 初始值 */
-    formInitValues?: ParamType;
-    /** 按钮 操作部分 */
-    toolbar?: ReactElement;
-    /** 操作按钮扩展 */
-    toolbarExtra?: ReactElement;
-    /** 展开查询条件，默认false */
-    expandForm?: boolean;
-    /** 禁止收起条件，默认false */
-    disableCollapseForm?: boolean;
-    /** table 数据区域 */
-    table?: CcsTableProps<T>;
-    /** table style */
-    tableStyle?: CSSProperties;
-    /** 水印文字 */
-    watermark?: string;
-    /** ref 回调方法 */
-    proRef?: CCS.TableInstanceRef<T>;
-    /** class */
-    className?: string;
-    /** style */
-    style?: CSSProperties;
-    /** children */
-    children?: ReactNode;
-    /** 执行search 后回调函数 */
-    searchEvent?: () => void;
-    /** 请求前格式化参数 */
-    onSearchBefore?: (params: SearchBeforeType, eventType?: SearchEventType) => SearchBeforeType;
+type TableTreeProps<T> = Omit<CcsProTableProps<T>, 'onSearchAfter'> & {
+    /** 父级值字段 */
+    parentFieldName: string;
     /** 请求后格式化结果 */
-    onSearchAfter?: (data: any, eventType?: SearchEventType) => any;
+    onSearchAfter?: (data: HttpResult<(T & {
+        children?: T[];
+    })[]>, eventType?: SearchEventType) => any;
 };
-export declare const classPrefix = "ccs-pl";
 /**
- * 布局组件 包括form、查询、toolbar、table 自动初始化数据
- * @param CcsProTableType
+ * 查询表格组件
+ * @param TableProps
  * @param ref
  * @returns
  */
-declare const ProTable: <T extends object = any>(props: CcsProTableProps<T>) => import("react/jsx-runtime").JSX.Element;
+declare const ProTable: {
+    <T extends object = any>(props: TableProps<T>): import("react/jsx-runtime").JSX.Element;
+    tree: <T_1 extends object = any>(props: TableTreeProps<T_1>) => import("react/jsx-runtime").JSX.Element;
+};
 export default ProTable;

package/es/pro-table/index.js

@@ -1,492 +1,32 @@
-function _regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */ _regeneratorRuntime = function _regeneratorRuntime() { return exports; }; var exports = {}, Op = Object.prototype, hasOwn = Op.hasOwnProperty, defineProperty = Object.defineProperty || function (obj, key, desc) { obj[key] = desc.value; }, $Symbol = "function" == typeof Symbol ? Symbol : {}, iteratorSymbol = $Symbol.iterator || "@@iterator", asyncIteratorSymbol = $Symbol.asyncIterator || "@@asyncIterator", toStringTagSymbol = $Symbol.toStringTag || "@@toStringTag"; function define(obj, key, value) { return Object.defineProperty(obj, key, { value: value, enumerable: !0, configurable: !0, writable: !0 }), obj[key]; } try { define({}, ""); } catch (err) { define = function define(obj, key, value) { return obj[key] = value; }; } function wrap(innerFn, outerFn, self, tryLocsList) { var protoGenerator = outerFn && outerFn.prototype instanceof Generator ? outerFn : Generator, generator = Object.create(protoGenerator.prototype), context = new Context(tryLocsList || []); return defineProperty(generator, "_invoke", { value: makeInvokeMethod(innerFn, self, context) }), generator; } function tryCatch(fn, obj, arg) { try { return { type: "normal", arg: fn.call(obj, arg) }; } catch (err) { return { type: "throw", arg: err }; } } exports.wrap = wrap; var ContinueSentinel = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var IteratorPrototype = {}; define(IteratorPrototype, iteratorSymbol, function () { return this; }); var getProto = Object.getPrototypeOf, NativeIteratorPrototype = getProto && getProto(getProto(values([]))); NativeIteratorPrototype && NativeIteratorPrototype !== Op && hasOwn.call(NativeIteratorPrototype, iteratorSymbol) && (IteratorPrototype = NativeIteratorPrototype); var Gp = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(IteratorPrototype); function defineIteratorMethods(prototype) { ["next", "throw", "return"].forEach(function (method) { define(prototype, method, function (arg) { return this._invoke(method, arg); }); }); } function AsyncIterator(generator, PromiseImpl) { function invoke(method, arg, resolve, reject) { var record = tryCatch(generator[method], generator, arg); if ("throw" !== record.type) { var result = record.arg, value = result.value; return value && "object" == _typeof(value) && hasOwn.call(value, "__await") ? PromiseImpl.resolve(value.__await).then(function (value) { invoke("next", value, resolve, reject); }, function (err) { invoke("throw", err, resolve, reject); }) : PromiseImpl.resolve(value).then(function (unwrapped) { result.value = unwrapped, resolve(result); }, function (error) { return invoke("throw", error, resolve, reject); }); } reject(record.arg); } var previousPromise; defineProperty(this, "_invoke", { value: function value(method, arg) { function callInvokeWithMethodAndArg() { return new PromiseImpl(function (resolve, reject) { invoke(method, arg, resolve, reject); }); } return previousPromise = previousPromise ? previousPromise.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); } }); } function makeInvokeMethod(innerFn, self, context) { var state = "suspendedStart"; return function (method, arg) { if ("executing" === state) throw new Error("Generator is already running"); if ("completed" === state) { if ("throw" === method) throw arg; return doneResult(); } for (context.method = method, context.arg = arg;;) { var delegate = context.delegate; if (delegate) { var delegateResult = maybeInvokeDelegate(delegate, context); if (delegateResult) { if (delegateResult === ContinueSentinel) continue; return delegateResult; } } if ("next" === context.method) context.sent = context._sent = context.arg;else if ("throw" === context.method) { if ("suspendedStart" === state) throw state = "completed", context.arg; context.dispatchException(context.arg); } else "return" === context.method && context.abrupt("return", context.arg); state = "executing"; var record = tryCatch(innerFn, self, context); if ("normal" === record.type) { if (state = context.done ? "completed" : "suspendedYield", record.arg === ContinueSentinel) continue; return { value: record.arg, done: context.done }; } "throw" === record.type && (state = "completed", context.method = "throw", context.arg = record.arg); } }; } function maybeInvokeDelegate(delegate, context) { var methodName = context.method, method = delegate.iterator[methodName]; if (undefined === method) return context.delegate = null, "throw" === methodName && delegate.iterator.return && (context.method = "return", context.arg = undefined, maybeInvokeDelegate(delegate, context), "throw" === context.method) || "return" !== methodName && (context.method = "throw", context.arg = new TypeError("The iterator does not provide a '" + methodName + "' method")), ContinueSentinel; var record = tryCatch(method, delegate.iterator, context.arg); if ("throw" === record.type) return context.method = "throw", context.arg = record.arg, context.delegate = null, ContinueSentinel; var info = record.arg; return info ? info.done ? (context[delegate.resultName] = info.value, context.next = delegate.nextLoc, "return" !== context.method && (context.method = "next", context.arg = undefined), context.delegate = null, ContinueSentinel) : info : (context.method = "throw", context.arg = new TypeError("iterator result is not an object"), context.delegate = null, ContinueSentinel); } function pushTryEntry(locs) { var entry = { tryLoc: locs[0] }; 1 in locs && (entry.catchLoc = locs[1]), 2 in locs && (entry.finallyLoc = locs[2], entry.afterLoc = locs[3]), this.tryEntries.push(entry); } function resetTryEntry(entry) { var record = entry.completion || {}; record.type = "normal", delete record.arg, entry.completion = record; } function Context(tryLocsList) { this.tryEntries = [{ tryLoc: "root" }], tryLocsList.forEach(pushTryEntry, this), this.reset(!0); } function values(iterable) { if (iterable) { var iteratorMethod = iterable[iteratorSymbol]; if (iteratorMethod) return iteratorMethod.call(iterable); if ("function" == typeof iterable.next) return iterable; if (!isNaN(iterable.length)) { var i = -1, next = function next() { for (; ++i < iterable.length;) if (hasOwn.call(iterable, i)) return next.value = iterable[i], next.done = !1, next; return next.value = undefined, next.done = !0, next; }; return next.next = next; } } return { next: doneResult }; } function doneResult() { return { value: undefined, done: !0 }; } return GeneratorFunction.prototype = GeneratorFunctionPrototype, defineProperty(Gp, "constructor", { value: GeneratorFunctionPrototype, configurable: !0 }), defineProperty(GeneratorFunctionPrototype, "constructor", { value: GeneratorFunction, configurable: !0 }), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, toStringTagSymbol, "GeneratorFunction"), exports.isGeneratorFunction = function (genFun) { var ctor = "function" == typeof genFun && genFun.constructor; return !!ctor && (ctor === GeneratorFunction || "GeneratorFunction" === (ctor.displayName || ctor.name)); }, exports.mark = function (genFun) { return Object.setPrototypeOf ? Object.setPrototypeOf(genFun, GeneratorFunctionPrototype) : (genFun.__proto__ = GeneratorFunctionPrototype, define(genFun, toStringTagSymbol, "GeneratorFunction")), genFun.prototype = Object.create(Gp), genFun; }, exports.awrap = function (arg) { return { __await: arg }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, asyncIteratorSymbol, function () { return this; }), exports.AsyncIterator = AsyncIterator, exports.async = function (innerFn, outerFn, self, tryLocsList, PromiseImpl) { void 0 === PromiseImpl && (PromiseImpl = Promise); var iter = new AsyncIterator(wrap(innerFn, outerFn, self, tryLocsList), PromiseImpl); return exports.isGeneratorFunction(outerFn) ? iter : iter.next().then(function (result) { return result.done ? result.value : iter.next(); }); }, defineIteratorMethods(Gp), define(Gp, toStringTagSymbol, "Generator"), define(Gp, iteratorSymbol, function () { return this; }), define(Gp, "toString", function () { return "[object Generator]"; }), exports.keys = function (val) { var object = Object(val), keys = []; for (var key in object) keys.push(key); return keys.reverse(), function next() { for (; keys.length;) { var key = keys.pop(); if (key in object) return next.value = key, next.done = !1, next; } return next.done = !0, next; }; }, exports.values = values, Context.prototype = { constructor: Context, reset: function reset(skipTempReset) { if (this.prev = 0, this.next = 0, this.sent = this._sent = undefined, this.done = !1, this.delegate = null, this.method = "next", this.arg = undefined, this.tryEntries.forEach(resetTryEntry), !skipTempReset) for (var name in this) "t" === name.charAt(0) && hasOwn.call(this, name) && !isNaN(+name.slice(1)) && (this[name] = undefined); }, stop: function stop() { this.done = !0; var rootRecord = this.tryEntries[0].completion; if ("throw" === rootRecord.type) throw rootRecord.arg; return this.rval; }, dispatchException: function dispatchException(exception) { if (this.done) throw exception; var context = this; function handle(loc, caught) { return record.type = "throw", record.arg = exception, context.next = loc, caught && (context.method = "next", context.arg = undefined), !!caught; } for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i], record = entry.completion; if ("root" === entry.tryLoc) return handle("end"); if (entry.tryLoc <= this.prev) { var hasCatch = hasOwn.call(entry, "catchLoc"), hasFinally = hasOwn.call(entry, "finallyLoc"); if (hasCatch && hasFinally) { if (this.prev < entry.catchLoc) return handle(entry.catchLoc, !0); if (this.prev < entry.finallyLoc) return handle(entry.finallyLoc); } else if (hasCatch) { if (this.prev < entry.catchLoc) return handle(entry.catchLoc, !0); } else { if (!hasFinally) throw new Error("try statement without catch or finally"); if (this.prev < entry.finallyLoc) return handle(entry.finallyLoc); } } } }, abrupt: function abrupt(type, arg) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.tryLoc <= this.prev && hasOwn.call(entry, "finallyLoc") && this.prev < entry.finallyLoc) { var finallyEntry = entry; break; } } finallyEntry && ("break" === type || "continue" === type) && finallyEntry.tryLoc <= arg && arg <= finallyEntry.finallyLoc && (finallyEntry = null); var record = finallyEntry ? finallyEntry.completion : {}; return record.type = type, record.arg = arg, finallyEntry ? (this.method = "next", this.next = finallyEntry.finallyLoc, ContinueSentinel) : this.complete(record); }, complete: function complete(record, afterLoc) { if ("throw" === record.type) throw record.arg; return "break" === record.type || "continue" === record.type ? this.next = record.arg : "return" === record.type ? (this.rval = this.arg = record.arg, this.method = "return", this.next = "end") : "normal" === record.type && afterLoc && (this.next = afterLoc), ContinueSentinel; }, finish: function finish(finallyLoc) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.finallyLoc === finallyLoc) return this.complete(entry.completion, entry.afterLoc), resetTryEntry(entry), ContinueSentinel; } }, catch: function _catch(tryLoc) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.tryLoc === tryLoc) { var record = entry.completion; if ("throw" === record.type) { var thrown = record.arg; resetTryEntry(entry); } return thrown; } } throw new Error("illegal catch attempt"); }, delegateYield: function delegateYield(iterable, resultName, nextLoc) { return this.delegate = { iterator: values(iterable), resultName: resultName, nextLoc: nextLoc }, "next" === this.method && (this.arg = undefined), ContinueSentinel; } }, exports; }
+function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
 function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
-function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
-function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
-function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
-function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
-function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
-function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
-function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefined" != typeof Symbol && arr[Symbol.iterator] || arr["@@iterator"]; if (null != _i) { var _s, _e, _x, _r, _arr = [], _n = !0, _d = !1; try { if (_x = (_i = _i.call(arr)).next, 0 === i) { if (Object(_i) !== _i) return; _n = !1; } else for (; !(_n = (_s = _x.call(_i)).done) && (_arr.push(_s.value), _arr.length !== i); _n = !0); } catch (err) { _d = !0, _e = err; } finally { try { if (!_n && null != _i.return && (_r = _i.return(), Object(_r) !== _r)) return; } finally { if (_d) throw _e; } } return _arr; } }
-function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
-function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
-import { useEventEmitter } from 'ahooks';
-import { Empty, Form, theme } from 'antd';
-import classNames from 'classnames';
-import _debounce from 'lodash/debounce';
-import _isArray from 'lodash/isArray';
-import React, { useEffect, useImperativeHandle, useMemo, useRef, useState } from 'react';
-import { CcsUtils, CcsWaterMark } from '..';
-import { useCcsPage } from "../";
-import useProGrid from "../pro-grid/useProGrid";
-import CcsTable from "../table";
 import "./index.less";
-import SearchComponent from "./search";
-import TableTree from "./tree";
+import InternalProTable from "./table";
 import { jsx as _jsx } from "react/jsx-runtime";
-import { jsxs as _jsxs } from "react/jsx-runtime";
-// 判断组件所处dom
-var onIsInModalOrDrawer = function onIsInModalOrDrawer(node) {
-  var _parent$classList, _parent$classList2, _parent$classList3, _parent$classList4;
-  var parent = node.parentNode;
-  if (!parent) return false;
-  if (
-  // 通过指定dom吸顶
-  (_parent$classList = parent.classList) !== null && _parent$classList !== void 0 && _parent$classList.contains('ccs-trigger-container') || (_parent$classList2 = parent.classList) !== null && _parent$classList2 !== void 0 && _parent$classList2.contains('ccs-drawer-content')) {
-    return {
-      getContainer: function getContainer() {
-        return parent;
-      }
-    };
-  }
-  // 在弹出框中吸顶top
-  if ((_parent$classList3 = parent.classList) !== null && _parent$classList3 !== void 0 && _parent$classList3.contains('ant-modal') || (_parent$classList4 = parent.classList) !== null && _parent$classList4 !== void 0 && _parent$classList4.contains('ant-drawer')) {
-    return {
-      offsetHeader: 0
-    };
-  }
-  return onIsInModalOrDrawer(parent);
-};
-
-// 根据ID查找树形节点
-var getDataById = function getDataById(data, rowKey, id) {
-  if (!_isArray(data)) return;
-  for (var i = 0; i < data.length; i += 1) {
-    if (data[i][rowKey] === id) {
-      return data[i];
-    }
-    if (data[i].children) {
-      var v = getDataById(data[i].children, rowKey, id);
-      if (v) return v;
-    }
-  }
-};
-var getAllChildrenId = function getAllChildrenId(data, rowKey) {
-  return data.reduce(function (keys, item) {
-    keys.push(item[rowKey]);
-    if (item.children && _isArray(item.children)) {
-      return keys.concat(getAllChildrenId(item.children, rowKey));
-    }
-    return keys;
-  }, []);
-};
-export var classPrefix = 'ccs-pl';
-
 /**
- * 布局组件 包括form、查询、toolbar、table 自动初始化数据
- * @param CcsProTableType
+ * 查询表格组件
+ * @param TableProps
  * @param ref
  * @returns
  */
 var ProTable = function ProTable(props) {
-  var init = props.init,
-    auth = props.auth,
-    table = props.table,
-    title = props.title,
-    style = props.style,
-    proRef = props.proRef,
-    toolbar = props.toolbar,
-    children = props.children,
-    watermark = props.watermark,
-    className = props.className,
-    expandForm = props.expandForm,
-    tableStyle = props.tableStyle,
-    searchEvent = props.searchEvent,
-    toolbarExtra = props.toolbarExtra,
-    _props$formItems = props.formItems,
-    formItems = _props$formItems === void 0 ? [] : _props$formItems,
-    _props$formInitValues = props.formInitValues,
-    formInitValues = _props$formInitValues === void 0 ? {} : _props$formInitValues,
-    onSearchBefore = props.onSearchBefore,
-    onSearchAfter = props.onSearchAfter;
-  var tableRef = useRef(null);
-  var _useCcsPage = useCcsPage(),
-    onAuth = _useCcsPage.onAuth;
-  var _useProGrid = useProGrid(),
-    inProGrid = _useProGrid.inProGrid;
-  var _ref = table || {},
-    pagination = _ref.pagination,
-    request = _ref.request,
-    _ref$requestParam = _ref.requestParam,
-    requestParam = _ref$requestParam === void 0 ? {} : _ref$requestParam,
-    columns = _ref.columns,
-    asyncTree = _ref.asyncTree,
-    rowKey = _ref.rowKey;
-  var stickyRef = useRef(false);
-  // 判断当前组件是否在弹出框中
-  var isInModalOrDrawer = _typeof(stickyRef.current) === 'object';
-  // column filter
-  var filtersRef = useRef({});
-  // 查询form
-  var _Form$useForm = Form.useForm(),
-    _Form$useForm2 = _slicedToArray(_Form$useForm, 1),
-    form = _Form$useForm2[0];
-  // table data
-  var _useState = useState({
-      totalNum: 0,
-      result: [],
-      pageSize: 10,
-      pageNo: 1
-    }),
-    _useState2 = _slicedToArray(_useState, 2),
-    data = _useState2[0],
-    setData = _useState2[1];
-  var event$ = useEventEmitter();
-  var treeRef = useRef(null);
-  var _theme$useToken = theme.useToken(),
-    token = _theme$useToken.token;
-
-  // 权限判断
-  var isAuth = useMemo(function () {
-    if (auth) return onAuth && onAuth(auth);
-    return true;
-  }, []);
-  var formatFormItems = useMemo(function () {
-    return formItems.flat(Infinity).filter(function (f) {
-      return f.onFormat;
-    });
-  }, []);
-
-  // 获取数据
-  var onRequest = /*#__PURE__*/function () {
-    var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(eventType) {
-      var pageNo,
-        pageSize,
-        record,
-        _args2 = arguments;
-      return _regeneratorRuntime().wrap(function _callee2$(_context2) {
-        while (1) switch (_context2.prev = _context2.next) {
-          case 0:
-            pageNo = _args2.length > 1 && _args2[1] !== undefined ? _args2[1] : 1;
-            pageSize = _args2.length > 2 && _args2[2] !== undefined ? _args2[2] : (pagination ? pagination.defaultPageSize : 10) || 10;
-            record = _args2.length > 3 ? _args2[3] : undefined;
-            if (!(!isAuth || !request)) {
-              _context2.next = 5;
-              break;
-            }
-            return _context2.abrupt("return");
-          case 5:
-            // 构建查询条件:表单数据、请求额外参数、分页参数、其他参数
-            form.validateFields().then( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
-              var formValues,
-                pageValue,
-                params,
-                _treeRef$current,
-                newParams,
-                requestResult,
-                newRequestResult,
-                _newRequestResult$dat,
-                totalNum,
-                size,
-                no,
-                result,
-                _args = arguments;
-              return _regeneratorRuntime().wrap(function _callee$(_context) {
-                while (1) switch (_context.prev = _context.next) {
-                  case 0:
-                    formValues = _args.length > 0 && _args[0] !== undefined ? _args[0] : {};
-                    // 格式化条件
-                    if (formatFormItems.length) {
-                      Object.keys(formValues).forEach(function (k) {
-                        if (formValues[k] !== undefined) {
-                          var s = formatFormItems.find(function (f) {
-                            return f.name === k;
-                          });
-                          if (s) formValues[k] = s.onFormat && s.onFormat(formValues[k]);
-                        }
-                      });
-                    }
-                    pageValue = pagination === false ? {} : {
-                      pageNo: pageNo,
-                      pageSize: pageSize
-                    };
-                    params = _objectSpread(_objectSpread({
-                      query: _objectSpread(_objectSpread({}, formValues), requestParam)
-                    }, pageValue), filtersRef.current); // 异步树
-                    if (!asyncTree) {
-                      _context.next = 7;
-                      break;
-                    }
-                    (_treeRef$current = treeRef.current) === null || _treeRef$current === void 0 ? void 0 : _treeRef$current.onRequestTree(params.query, record);
-                    return _context.abrupt("return");
-                  case 7:
-                    // onSearchBefore 请求前回传参数，可以在父组件进行修改
-                    newParams = onSearchBefore ? onSearchBefore(params, eventType) : params; // 发起请求
-                    setData(function (d) {
-                      return _objectSpread(_objectSpread({}, d), {}, {
-                        loading: true
-                      });
-                    });
-                    _context.next = 11;
-                    return request(_objectSpread({}, newParams));
-                  case 11:
-                    requestResult = _context.sent;
-                    if (!(requestResult && requestResult.success)) {
-                      _context.next = 22;
-                      break;
-                    }
-                    // onSearchAfter 处理请求结果
-                    newRequestResult = onSearchAfter ? onSearchAfter(requestResult, eventType) : requestResult;
-                    _newRequestResult$dat = newRequestResult.data, totalNum = _newRequestResult$dat.totalNum, size = _newRequestResult$dat.pageSize, no = _newRequestResult$dat.pageNo, result = _newRequestResult$dat.result;
-                    if (!(totalNum === undefined || pageSize === undefined || no === undefined || result === undefined)) {
-                      _context.next = 19;
-                      break;
-                    }
-                    CcsUtils.showLogWarning('分页返回对象，totalNum,pageSize,no,result不能为空');
-                    setData(_objectSpread(_objectSpread({}, data), {}, {
-                      loading: false
-                    }));
-                    return _context.abrupt("return");
-                  case 19:
-                    // 当前页无数据，返回上一页
-                    if (!result.length && no !== 1 && no !== undefined) {
-                      onRequest('reload', no - 1);
-                    } else {
-                      setData({
-                        pageNo: no,
-                        pageSize: size,
-                        loading: false,
-                        result: result,
-                        totalNum: totalNum || 0
-                      });
-                    }
-                    _context.next = 23;
-                    break;
-                  case 22:
-                    setData(function (d) {
-                      return _objectSpread(_objectSpread({}, d), {}, {
-                        loading: false
-                      });
-                    });
-                  case 23:
-                  case "end":
-                    return _context.stop();
-                }
-              }, _callee);
-            }))).catch(function () {});
-          case 6:
-          case "end":
-            return _context2.stop();
-        }
-      }, _callee2);
-    }));
-    return function onRequest(_x2) {
-      return _ref2.apply(this, arguments);
-    };
-  }();
-
-  // 异步树、局部刷新方法
-  var _onPartialReload = function onPartialReload(id) {
-    var _treeRef$current2, _treeRef$current3;
-    // 查找需要刷新的节点
-    var treeNode = getDataById(data.result || [], rowKey, id);
-    // 没有查找到、全部刷新
-    if (!treeNode) {
-      onRequest('search');
-      return;
-    }
-    // 获取所有下级ID
-    var ids = getAllChildrenId(treeNode.children || [], rowKey);
-    // 局部重载
-    (_treeRef$current2 = treeRef.current) === null || _treeRef$current2 === void 0 ? void 0 : _treeRef$current2.onExpandKeys(ids);
-    (_treeRef$current3 = treeRef.current) === null || _treeRef$current3 === void 0 ? void 0 : _treeRef$current3.onRequestTree({}, treeNode);
-  };
-
-  // 尺寸变化重设尺寸
-  var resizeFn = _debounce(function () {
-    // console.log('resizeFn...');
-  }, 200);
-  useEffect(function () {
-    // 判断当前dom所处的滚动区域
-    var inMd = onIsInModalOrDrawer(tableRef.current);
-    if (inMd) stickyRef.current = inMd;
-
-    // 监听resize
-    window.addEventListener('resize', resizeFn);
-    return function () {
-      window.removeEventListener('resize', resizeFn);
-    };
-  }, []);
-
-  // 初始查询
-  useEffect(function () {
-    if (init !== false && request) {
-      onRequest('initSearch');
-    }
-  }, [Object.keys(requestParam || {}).toString(), Object.values(requestParam || {}).toString()]);
-
-  // 查询按钮
-  var _onSearch = function onSearch() {
-    if (searchEvent) searchEvent();
-    onRequest('search');
-  };
-
-  // 重置
-  var _onReset = function onReset() {
-    form === null || form === void 0 ? void 0 : form.resetFields();
-    // 清空columns显示filter和sort值
-    columns === null || columns === void 0 ? void 0 : columns.forEach(function (c) {
-      if (c.filterDropdown || c.filters) {
-        c.filteredValue = null;
-      }
-      if (c.sorter) {
-        c.sortOrder = undefined;
-      }
-    });
-    // 清空filter请求值
-    filtersRef.current = {};
-    onRequest('reset');
-  };
-
-  // 刷新
-  var _onReload = function onReload() {
-    onRequest('reload', data.pageNo, data.pageSize);
-  };
-
-  // form 数据 查询，重载，重置方法
-  useImperativeHandle(proRef, function () {
-    return {
-      onSearch: function onSearch() {
-        _onSearch();
-      },
-      onReload: function onReload() {
-        _onReload();
-      },
-      onPartialReload: function onPartialReload(param) {
-        _onPartialReload(param);
-      },
-      onReset: function onReset() {
-        _onReset();
-      },
-      onChangeData: setData,
-      formValues: form.getFieldsValue(),
-      data: data
-    };
-  });
-
-  // 分页查询
-  var handlePageChange = function handlePageChange(paginationTable, filters, sorter) {
-    // 记录filter，sorter，以便重置的时候可以清除数据
-    if (filters) {
-      columns === null || columns === void 0 ? void 0 : columns.forEach(function (c) {
-        if (c.filterDropdown || c.filters) {
-          // @ts-ignore
-          c.filteredValue = filters[c.dataIndex];
-        }
-      });
-      filtersRef.current = _objectSpread(_objectSpread({}, filtersRef.current), {}, {
-        filters: filters
-      });
-    }
-
-    // @ts-ignore
-    if (sorter) {
-      columns === null || columns === void 0 ? void 0 : columns.forEach(function (c) {
-        if (c.sorter) {
-          // @ts-ignore
-          if (c.dataIndex !== sorter.field) {
-            c.sortOrder = undefined;
-            return;
-          }
-          // @ts-ignore
-          c.sortOrder = sorter === null || sorter === void 0 ? void 0 : sorter.order;
-        }
-      });
-      filtersRef.current = _objectSpread(_objectSpread({}, filtersRef.current), {}, {
-        sorter: sorter
-      });
-    }
-    onRequest('changePage', paginationTable.current || 0, paginationTable.pageSize || 10);
-  };
-  var renderTable = function renderTable() {
-    if (!table) return null;
-    if (!isAuth) {
-      return /*#__PURE__*/_jsx(Empty, {
-        style: {
-          margin: 0,
-          padding: '32px 0',
-          color: 'red'
-        },
-        image: Empty.PRESENTED_IMAGE_DEFAULT,
-        description: "\u6CA1\u6709\u6570\u636E\u8BF7\u6C42\u6743\u9650"
-      });
-    }
-    if (_typeof(stickyRef.current) === 'object' && 'getContainer' in stickyRef.current) {
-      // 判断吸顶dom是否有paddingTop，设置offsetHeader
-      var dom = stickyRef.current.getContainer();
-      var _window$getComputedSt = window.getComputedStyle(dom),
-        paddingTop = _window$getComputedSt.paddingTop;
-      if (paddingTop) {
-        stickyRef.current = _objectSpread(_objectSpread({}, stickyRef.current), {}, {
-          offsetHeader: -parseInt(paddingTop.replace('px', ''))
-        });
-      }
-    }
+  return /*#__PURE__*/_jsx(InternalProTable, _objectSpread({}, props));
+};
 
-    // 异步树
-    if (table !== null && table !== void 0 && table.asyncTree) {
-      return /*#__PURE__*/_jsx(TableTree, {
-        data: data,
-        table: table,
-        event$: event$,
-        treeRef: treeRef,
-        sticky: stickyRef.current || true,
-        setData: setData,
-        onSearchAfter: onSearchAfter,
-        onSearchBefore: onSearchBefore,
-        handlePageChange: handlePageChange,
-        isInModalOrDrawer: isInModalOrDrawer
-      });
-    }
-    return /*#__PURE__*/_jsx(CcsTable, _objectSpread(_objectSpread({
-      onChange: handlePageChange,
-      data: data,
-      event$: event$,
-      size: isInModalOrDrawer ? 'small' : 'middle',
-      sticky: stickyRef.current || true
-    }, table), {}, {
-      columns: columns,
-      showSorterTooltip: true,
-      loading: table.loading || data.loading || false
-    }));
-  };
-  var isDark = token._appTheme === 'dark';
-  var render = /*#__PURE__*/_jsxs("div", {
-    className: classNames(classPrefix, className, _defineProperty({}, 'dark-table', isDark)),
-    style: style,
-    children: [!(!formItems.length && !toolbar) && isAuth && /*#__PURE__*/_jsx(SearchComponent, {
-      form: form,
-      title: title,
-      titleBordered: table === null || table === void 0 ? void 0 : table.bordered,
-      toolbar: toolbar,
-      columns: columns,
-      formItems: formItems,
-      expandForm: expandForm,
-      formInitValues: formInitValues,
-      isInModalOrDrawer: isInModalOrDrawer,
-      formItemLabelWidth: props.formItemLabelWidth,
-      disableCollapseForm: props.disableCollapseForm,
-      event$: event$,
-      onSearch: _onSearch,
-      onReset: _onReset,
-      children: toolbarExtra
-    }), /*#__PURE__*/_jsxs("div", {
-      className: "".concat(classPrefix, "-table-content"),
-      style: _objectSpread({
-        padding: isInModalOrDrawer || inProGrid ? '0 16px 16px 16px' : 16
-      }, tableStyle),
-      ref: tableRef,
-      children: [renderTable(), children]
-    })]
-  });
-  return watermark ? /*#__PURE__*/_jsx(CcsWaterMark, {
-    content: watermark,
-    fontColor: "rgba(0,0,0,.15)",
-    zIndex: 105,
-    children: render
-  }) : render;
+/**
+ * 查询表格树组件
+ * @param TableTreeProps
+ * @param ref
+ * @returns
+ */
+var ProTableTree = function ProTableTree(props) {
+  return /*#__PURE__*/_jsx(InternalProTable, _objectSpread(_objectSpread({}, props), {}, {
+    onSearchAfter: props.onSearchAfter
+  }));
 };
+ProTable.tree = ProTableTree;
 export default ProTable;

package/es/pro-table/search.d.ts

@@ -1,7 +1,7 @@
 import { EventEmitter } from 'ahooks/lib/useEventEmitter';
 import { FormInstance } from 'antd/lib/form';
 import { ReactElement } from 'react';
-import { CcsProTableProps } from './';
+import { CcsProTableProps } from './table';
 type PropsType<T> = Pick<CcsProTableProps<T>, 'toolbar' | 'formItems' | 'formInitValues' | 'expandForm' | 'disableCollapseForm' | 'formItemLabelWidth' | 'title'> & {
     /** 显示列 */
     columns?: any;