@ccs-ui/rc-pro 2.3.6-beta-29 → 2.3.6-beta-31

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

@@ -1,7 +1,7 @@
 import { FormInstance } from 'antd';
 import React, { ReactElement } from 'react';
 import { CcsProTableProps } from './table';
-type PropsType<T> = Pick<CcsProTableProps<T>, 'toolbar' | 'formItems' | 'formInitValues' | 'expandForm' | 'title' | 'formItemLabelWidth'> & {
+type PropsType<T> = Pick<CcsProTableProps<T>, 'toolbar' | 'formItems' | 'formInitValues' | 'expandForm' | 'formItemLabelWidth'> & {
     /** 更多查询条件 */
     hasMore?: boolean;
     /** table 操作栏 */
@@ -12,5 +12,5 @@ type PropsType<T> = Pick<CcsProTableProps<T>, 'toolbar' | 'formItems' | 'formIni
     formRef: React.RefObject<FormInstance<any>>;
 };
 /** 操作按钮、查询，重置、列筛选、 */
-declare function HeadComponent<T>({ title, toolbar, expandForm, formItems, formInitValues, formItemLabelWidth, tableOperation, formRef, onSearch, }: PropsType<T>): import("react/jsx-runtime").JSX.Element;
+declare function HeadComponent<T>({ toolbar, expandForm, formItems, formInitValues, formItemLabelWidth, tableOperation, formRef, onSearch, }: PropsType<T>): import("react/jsx-runtime").JSX.Element;
 export default HeadComponent;

package/es/pro-table/head.js

@@ -6,7 +6,7 @@ function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" !=
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import { DownOutlined, UpOutlined } from '@ant-design/icons';
 import { useUpdateEffect } from 'ahooks';
-import { Button, Card, Form, theme } from 'antd';
+import { Button, Form, theme } from 'antd';
 import _debounce from 'lodash.debounce';
 import React, { useEffect, useImperativeHandle, useMemo, useRef, useState } from 'react';
 import { CcsResizeObserver } from '..';
@@ -17,8 +17,7 @@ import { jsxs as _jsxs } from "react/jsx-runtime";
 import { Fragment as _Fragment } from "react/jsx-runtime";
 /** 操作按钮、查询，重置、列筛选、 */
 function HeadComponent(_ref) {
-  var title = _ref.title,
-    toolbar = _ref.toolbar,
+  var toolbar = _ref.toolbar,
     _ref$expandForm = _ref.expandForm,
     expandForm = _ref$expandForm === void 0 ? false : _ref$expandForm,
     _ref$formItems = _ref.formItems,
@@ -167,48 +166,33 @@ function HeadComponent(_ref) {
   // 获取Input的高度
   var token = theme.useToken().token;
   var controlHeight = token.rootValue ? "".concat((token.controlHeight / token.rootValue).toFixed(3), "rem") : token.controlHeight;
-  var adaptationRef = useRef(null);
   return /*#__PURE__*/_jsx(_Fragment, {
     children: allFormItems.length > 0 && /*#__PURE__*/_jsxs(_Fragment, {
       children: [/*#__PURE__*/_jsx(CcsResizeObserver.Target, {
         targetRef: formItemsRef,
         onResize: onResize
-      }), /*#__PURE__*/_jsx(Card, {
-        ref: adaptationRef,
-        className: "ccs-pl-adaptation",
-        style: {
-          boxShadow: 'none'
-        },
-        styles: {
-          body: {
-            padding: 16
-          }
-        },
-        bordered: false,
-        title: title,
-        children: /*#__PURE__*/_jsxs(Form, {
-          initialValues: formInitValues,
-          form: form,
-          onFinish: onSearch,
-          layout: "inline",
-          style: formStyles,
-          children: [/*#__PURE__*/_jsxs("div", {
-            style: {
-              justifyContent: isExpand && hasMore ? 'flex-start' : 'flex-end',
-              height: isExpand ? 'auto' : controlHeight
-            },
-            className: "ccs-pl-adaptation-form",
-            ref: formItemsRef,
-            children: [renderFormItems(), /*#__PURE__*/_jsx("div", {
-              ref: endItemRef
-            }), isExpand && renderSearchBtn]
-          }), !isExpand && /*#__PURE__*/_jsx("div", {
-            style: {
-              flex: '0 0 auto'
-            },
-            children: renderSearchBtn
-          })]
-        })
+      }), /*#__PURE__*/_jsxs(Form, {
+        initialValues: formInitValues,
+        form: form,
+        onFinish: onSearch,
+        layout: "inline",
+        style: formStyles,
+        children: [/*#__PURE__*/_jsxs("div", {
+          style: {
+            justifyContent: isExpand && hasMore ? 'flex-start' : 'flex-end',
+            height: isExpand ? 'auto' : controlHeight
+          },
+          className: "ccs-pl-adaptation-form",
+          ref: formItemsRef,
+          children: [renderFormItems(), /*#__PURE__*/_jsx("div", {
+            ref: endItemRef
+          }), isExpand && renderSearchBtn]
+        }), !isExpand && /*#__PURE__*/_jsx("div", {
+          style: {
+            flex: '0 0 auto'
+          },
+          children: renderSearchBtn
+        })]
       })]
     })
   });

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

@@ -3,7 +3,7 @@ import { ColumnGroupType, ColumnType } from 'antd/es/table';
 import { TableSticky } from 'rc-table/lib/interface';
 import React, { CSSProperties, ReactElement, ReactNode } from 'react';
 import CCS from '..';
-import { PropsWithCss, PropsWithNodeChildren, TableColumns } from '../ccs';
+import { PropsWithCss, PropsWithNodeChildren, RecordType, TableColumns } from '../ccs';
 import { CcsFieldNamesType } from '../context';
 import { EllipsisProps } from '../ellipsis';
 import './index.less';
@@ -26,21 +26,10 @@ type TableTitleType<T> = {
     onClear: () => void;
 };
 /** 请求参数类型 */
-export type CcsRequestProps = {
-    pageNo?: number;
-    pageSize?: number;
-    query?: Record<string, any>;
-    filters?: Record<string, any>;
-    orderProps?: {
-        prop: string;
-        ascending: boolean;
-    }[];
-    eventType?: SearchEventType;
-};
 export type CcsTableProps<T> = Omit<TableProps<T>, 'columns' | 'title'> & {
     data?: CCS.TableData<T>;
     /** request 方法 */
-    request?: (params: CcsRequestProps) => Promise<any>;
+    request?: (params: RecordType) => Promise<any>;
     /** request 额外参数  */
     requestParam?: ParamType;
     /** 接口字段指定,默认： */

package/es/pro-table/table.js

@@ -3,6 +3,10 @@ function _objectWithoutProperties(source, excluded) { if (source == null) return
 function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
 function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
 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 e; }; var t, e = {}, r = Object.prototype, n = r.hasOwnProperty, o = Object.defineProperty || function (t, e, r) { t[e] = r.value; }, i = "function" == typeof Symbol ? Symbol : {}, a = i.iterator || "@@iterator", c = i.asyncIterator || "@@asyncIterator", u = i.toStringTag || "@@toStringTag"; function define(t, e, r) { return Object.defineProperty(t, e, { value: r, enumerable: !0, configurable: !0, writable: !0 }), t[e]; } try { define({}, ""); } catch (t) { define = function define(t, e, r) { return t[e] = r; }; } function wrap(t, e, r, n) { var i = e && e.prototype instanceof Generator ? e : Generator, a = Object.create(i.prototype), c = new Context(n || []); return o(a, "_invoke", { value: makeInvokeMethod(t, r, c) }), a; } function tryCatch(t, e, r) { try { return { type: "normal", arg: t.call(e, r) }; } catch (t) { return { type: "throw", arg: t }; } } e.wrap = wrap; var h = "suspendedStart", l = "suspendedYield", f = "executing", s = "completed", y = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var p = {}; define(p, a, function () { return this; }); var d = Object.getPrototypeOf, v = d && d(d(values([]))); v && v !== r && n.call(v, a) && (p = v); var g = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(p); function defineIteratorMethods(t) { ["next", "throw", "return"].forEach(function (e) { define(t, e, function (t) { return this._invoke(e, t); }); }); } function AsyncIterator(t, e) { function invoke(r, o, i, a) { var c = tryCatch(t[r], t, o); if ("throw" !== c.type) { var u = c.arg, h = u.value; return h && "object" == _typeof(h) && n.call(h, "__await") ? e.resolve(h.__await).then(function (t) { invoke("next", t, i, a); }, function (t) { invoke("throw", t, i, a); }) : e.resolve(h).then(function (t) { u.value = t, i(u); }, function (t) { return invoke("throw", t, i, a); }); } a(c.arg); } var r; o(this, "_invoke", { value: function value(t, n) { function callInvokeWithMethodAndArg() { return new e(function (e, r) { invoke(t, n, e, r); }); } return r = r ? r.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); } }); } function makeInvokeMethod(e, r, n) { var o = h; return function (i, a) { if (o === f) throw new Error("Generator is already running"); if (o === s) { if ("throw" === i) throw a; return { value: t, done: !0 }; } for (n.method = i, n.arg = a;;) { var c = n.delegate; if (c) { var u = maybeInvokeDelegate(c, n); if (u) { if (u === y) continue; return u; } } if ("next" === n.method) n.sent = n._sent = n.arg;else if ("throw" === n.method) { if (o === h) throw o = s, n.arg; n.dispatchException(n.arg); } else "return" === n.method && n.abrupt("return", n.arg); o = f; var p = tryCatch(e, r, n); if ("normal" === p.type) { if (o = n.done ? s : l, p.arg === y) continue; return { value: p.arg, done: n.done }; } "throw" === p.type && (o = s, n.method = "throw", n.arg = p.arg); } }; } function maybeInvokeDelegate(e, r) { var n = r.method, o = e.iterator[n]; if (o === t) return r.delegate = null, "throw" === n && e.iterator.return && (r.method = "return", r.arg = t, maybeInvokeDelegate(e, r), "throw" === r.method) || "return" !== n && (r.method = "throw", r.arg = new TypeError("The iterator does not provide a '" + n + "' method")), y; var i = tryCatch(o, e.iterator, r.arg); if ("throw" === i.type) return r.method = "throw", r.arg = i.arg, r.delegate = null, y; var a = i.arg; return a ? a.done ? (r[e.resultName] = a.value, r.next = e.nextLoc, "return" !== r.method && (r.method = "next", r.arg = t), r.delegate = null, y) : a : (r.method = "throw", r.arg = new TypeError("iterator result is not an object"), r.delegate = null, y); } function pushTryEntry(t) { var e = { tryLoc: t[0] }; 1 in t && (e.catchLoc = t[1]), 2 in t && (e.finallyLoc = t[2], e.afterLoc = t[3]), this.tryEntries.push(e); } function resetTryEntry(t) { var e = t.completion || {}; e.type = "normal", delete e.arg, t.completion = e; } function Context(t) { this.tryEntries = [{ tryLoc: "root" }], t.forEach(pushTryEntry, this), this.reset(!0); } function values(e) { if (e || "" === e) { var r = e[a]; if (r) return r.call(e); if ("function" == typeof e.next) return e; if (!isNaN(e.length)) { var o = -1, i = function next() { for (; ++o < e.length;) if (n.call(e, o)) return next.value = e[o], next.done = !1, next; return next.value = t, next.done = !0, next; }; return i.next = i; } } throw new TypeError(_typeof(e) + " is not iterable"); } return GeneratorFunction.prototype = GeneratorFunctionPrototype, o(g, "constructor", { value: GeneratorFunctionPrototype, configurable: !0 }), o(GeneratorFunctionPrototype, "constructor", { value: GeneratorFunction, configurable: !0 }), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, u, "GeneratorFunction"), e.isGeneratorFunction = function (t) { var e = "function" == typeof t && t.constructor; return !!e && (e === GeneratorFunction || "GeneratorFunction" === (e.displayName || e.name)); }, e.mark = function (t) { return Object.setPrototypeOf ? Object.setPrototypeOf(t, GeneratorFunctionPrototype) : (t.__proto__ = GeneratorFunctionPrototype, define(t, u, "GeneratorFunction")), t.prototype = Object.create(g), t; }, e.awrap = function (t) { return { __await: t }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, c, function () { return this; }), e.AsyncIterator = AsyncIterator, e.async = function (t, r, n, o, i) { void 0 === i && (i = Promise); var a = new AsyncIterator(wrap(t, r, n, o), i); return e.isGeneratorFunction(r) ? a : a.next().then(function (t) { return t.done ? t.value : a.next(); }); }, defineIteratorMethods(g), define(g, u, "Generator"), define(g, a, function () { return this; }), define(g, "toString", function () { return "[object Generator]"; }), e.keys = function (t) { var e = Object(t), r = []; for (var n in e) r.push(n); return r.reverse(), function next() { for (; r.length;) { var t = r.pop(); if (t in e) return next.value = t, next.done = !1, next; } return next.done = !0, next; }; }, e.values = values, Context.prototype = { constructor: Context, reset: function reset(e) { if (this.prev = 0, this.next = 0, this.sent = this._sent = t, this.done = !1, this.delegate = null, this.method = "next", this.arg = t, this.tryEntries.forEach(resetTryEntry), !e) for (var r in this) "t" === r.charAt(0) && n.call(this, r) && !isNaN(+r.slice(1)) && (this[r] = t); }, stop: function stop() { this.done = !0; var t = this.tryEntries[0].completion; if ("throw" === t.type) throw t.arg; return this.rval; }, dispatchException: function dispatchException(e) { if (this.done) throw e; var r = this; function handle(n, o) { return a.type = "throw", a.arg = e, r.next = n, o && (r.method = "next", r.arg = t), !!o; } for (var o = this.tryEntries.length - 1; o >= 0; --o) { var i = this.tryEntries[o], a = i.completion; if ("root" === i.tryLoc) return handle("end"); if (i.tryLoc <= this.prev) { var c = n.call(i, "catchLoc"), u = n.call(i, "finallyLoc"); if (c && u) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } else if (c) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); } else { if (!u) throw new Error("try statement without catch or finally"); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } } } }, abrupt: function abrupt(t, e) { for (var r = this.tryEntries.length - 1; r >= 0; --r) { var o = this.tryEntries[r]; if (o.tryLoc <= this.prev && n.call(o, "finallyLoc") && this.prev < o.finallyLoc) { var i = o; break; } } i && ("break" === t || "continue" === t) && i.tryLoc <= e && e <= i.finallyLoc && (i = null); var a = i ? i.completion : {}; return a.type = t, a.arg = e, i ? (this.method = "next", this.next = i.finallyLoc, y) : this.complete(a); }, complete: function complete(t, e) { if ("throw" === t.type) throw t.arg; return "break" === t.type || "continue" === t.type ? this.next = t.arg : "return" === t.type ? (this.rval = this.arg = t.arg, this.method = "return", this.next = "end") : "normal" === t.type && e && (this.next = e), y; }, finish: function finish(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.finallyLoc === t) return this.complete(r.completion, r.afterLoc), resetTryEntry(r), y; } }, catch: function _catch(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.tryLoc === t) { var n = r.completion; if ("throw" === n.type) { var o = n.arg; resetTryEntry(r); } return o; } } throw new Error("illegal catch attempt"); }, delegateYield: function delegateYield(e, r, n) { return this.delegate = { iterator: values(e), resultName: r, nextLoc: n }, "next" === this.method && (this.arg = t), y; } }, e; }
+function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
+function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
+function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(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 t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 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; }
@@ -47,6 +51,14 @@ function onSetObj(target, paths, value) {
 }
 
 /** 请求参数类型 */
+// export type CcsRequestProps = {
+//   pageNo?: number;
+//   pageSize?: number;
+//   query?: Record<string, any>;
+//   filters?: Record<string, any>;
+//   orderProps?: { prop: string; ascending: boolean }[];
+//   eventType?: SearchEventType;
+// };
 
 export var classPrefix = 'ccs-pl';
 export var TableSelectionContext = /*#__PURE__*/React.createContext({
@@ -226,24 +238,23 @@ var InternalProTable = function InternalProTable(props) {
               eventType: eventType
             };
             if (fsQuery && fsQuery.length > 0) {
-              onSetObj(params, fsQuery, _objectSpread(_objectSpread(_objectSpread({}, requestParam), formInitValues), formValues));
+              onSetObj(params, _toConsumableArray(fsQuery), _objectSpread(_objectSpread(_objectSpread({}, requestParam), formInitValues), formValues));
             } else {
               params = _objectSpread(_objectSpread({}, requestParam), formValues);
             }
-
-            // 分页
             if (pagination !== false) {
-              onSetObj(params, fsPageNo, pageNo);
-              onSetObj(params, fsPageSize, pageSize);
+              // 分页
+              onSetObj(params, _toConsumableArray(fsPageNo), pageNo);
+              onSetObj(params, _toConsumableArray(fsPageSize), pageSize);
             }
 
             // 列过滤或排序参数
             _filtersRef$current = filtersRef.current, filters = _filtersRef$current.filters, orderProps = _filtersRef$current.orderProps;
             if (Object.keys(filters).length > 0) {
-              onSetObj(params, fsFilters, filters);
+              onSetObj(params, _toConsumableArray(fsFilters), filters);
             }
             if (orderProps.length > 0) {
-              onSetObj(params, fsOrderProps, orderProps);
+              onSetObj(params, _toConsumableArray(fsOrderProps), orderProps);
             }
 
             // 异步树
@@ -610,6 +621,7 @@ var InternalProTable = function InternalProTable(props) {
     tableRef: tableRef,
     onFullScreen: onFullScreen
   }) : undefined;
+  var hasFormItem = formItems.length > 0;
   return /*#__PURE__*/_jsxs(_Fragment, {
     children: [/*#__PURE__*/_jsx(CcsResizeObserver.Target, {
       targetRef: tableContentRef,
@@ -620,21 +632,33 @@ var InternalProTable = function InternalProTable(props) {
         overflow: (table === null || table === void 0 || (_table$scroll2 = table.scroll) === null || _table$scroll2 === void 0 ? void 0 : _table$scroll2.y) === 'auto' ? 'hidden' : 'unset'
       }),
       ref: containerRef,
-      children: [isAuth && /*#__PURE__*/_jsxs(TableSelectionContext.Provider, {
+      children: [/*#__PURE__*/_jsxs(TableSelectionContext.Provider, {
         value: {
           selectedRows: selectedRows
         },
-        children: [/*#__PURE__*/_jsx(HeadComponent, {
-          formRef: formRef,
-          toolbar: toolbar,
-          formItems: formItems,
-          expandForm: expandForm,
-          formInitValues: formInitValues,
-          formItemLabelWidth: props.formItemLabelWidth,
-          onSearch: _onSearch,
+        children: [/*#__PURE__*/_jsx(Card, {
+          className: "ccs-pl-adaptation",
+          style: {
+            boxShadow: 'none'
+          },
+          styles: {
+            body: {
+              padding: hasFormItem ? 16 : 0
+            }
+          },
+          bordered: false,
           title: props.title,
-          tableOperation: renderTableOperation
-        }), (toolbar || formItems.length === 0 && renderTableOperation) && /*#__PURE__*/_jsxs(Card, {
+          children: hasFormItem && /*#__PURE__*/_jsx(HeadComponent, {
+            formRef: formRef,
+            toolbar: toolbar,
+            formItems: formItems,
+            expandForm: expandForm,
+            formInitValues: formInitValues,
+            formItemLabelWidth: props.formItemLabelWidth,
+            onSearch: _onSearch,
+            tableOperation: renderTableOperation
+          })
+        }), (toolbar || !hasFormItem && renderTableOperation) && /*#__PURE__*/_jsxs(Card, {
           styles: {
             cover: {
               borderRadius: 0
@@ -652,7 +676,7 @@ var InternalProTable = function InternalProTable(props) {
             borderLeft: 0,
             borderBottom: 0,
             borderRight: 0,
-            borderTop: formItems.length === 0 ? 0 : undefined
+            borderTop: !hasFormItem ? 0 : undefined
           },
           children: [/*#__PURE__*/_jsx("div", {
             style: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ccs-ui/rc-pro",
-  "version": "2.3.6-beta-29",
+  "version": "2.3.6-beta-31",
   "description": "",
   "license": "MIT",
   "author": {