@ccs-ui/rc-pro 2.3.6-beta-14 → 2.3.6-beta-16

package/es/context/index.d.ts

@@ -55,8 +55,6 @@ type FnContextType<T = Store> = {
 type CcsFieldNamesType = {
     dataSource?: string[];
     total?: string[];
-    current?: string[];
-    pageSize?: string[];
 };
 type CcsDialogFieldNames = {
     /** 成功标识字段 */

package/es/ellipsis/useResizeEffect.js

@@ -1,5 +1,7 @@
 import { useIsomorphicLayoutEffect, useMemoizedFn } from 'ahooks';
+import { useRef } from 'react';
 export function useResizeEffect(effect, targetRef) {
+  var ref = useRef(0);
   var fn = useMemoizedFn(effect);
   useIsomorphicLayoutEffect(function () {
     var target = targetRef.current;
@@ -7,9 +9,12 @@ export function useResizeEffect(effect, targetRef) {
     if (window.ResizeObserver) {
       var animationFrame;
       var observer = new ResizeObserver(function () {
+        // 隐藏了，为0不处理
+        if (target.clientWidth === 0 || (target === null || target === void 0 ? void 0 : target.clientWidth) === ref.current) return;
         animationFrame = window.requestAnimationFrame(function () {
           return fn(target);
         });
+        ref.current = target === null || target === void 0 ? void 0 : target.clientWidth;
       });
       observer.observe(target);
       return function () {

package/es/hooks/use-app.d.ts

@@ -6,8 +6,6 @@ declare const useAppConfig: () => import("../context").CssAppConfigType;
 export declare const useProTableFields: () => {
     dataSource: string[];
     total: string[];
-    current: string[];
-    pageSize: string[];
 };
 export declare const useProTableTreeFields: () => {
     dataSource: string[];

package/es/hooks/use-app.js

@@ -23,8 +23,8 @@ export var useProTableFields = function useProTableFields() {
   var context = useContext(AppConfigContext) || {};
   return _objectSpread({
     dataSource: ['data', 'result'],
-    current: ['data', 'pageNo'],
-    pageSize: ['data', 'pageSize'],
+    // current: ['data', 'pageNo'],
+    // pageSize: ['data', 'pageSize'],
     total: ['data', 'totalNum']
   }, context === null || context === void 0 || (_context$fieldNames = context.fieldNames) === null || _context$fieldNames === void 0 ? void 0 : _context$fieldNames.proTable);
 };

package/es/layout-keep-alive/index.d.ts

@@ -1,17 +1,18 @@
 import { BreadcrumbProps } from 'antd';
 import { JSXElementConstructor, ReactElement } from 'react';
+import { Location } from 'react-router';
 import CCS from '..';
 import { MenuType } from '../ccs';
 import './index.less';
-export type CacheComponent = {
+export type CacheRouter = {
     key: string;
     label: string;
-    locationKey: string;
     urlAuthList: string[];
     timestamp: number;
     outlet: ReactElement<any, string | JSXElementConstructor<any>> | null;
     children?: ReactElement<any, string | JSXElementConstructor<any>> | null;
     breadcrumb: BreadcrumbProps['items'];
+    pageLocation: Location;
 };
 type PropsType = {
     maxLen?: number;

package/es/layout-keep-alive/index.js

@@ -19,6 +19,7 @@ import CcsUtils from '@ccs-ui/utils';
 import { useUpdate, useUpdateEffect } from 'ahooks';
 import { Button, Dropdown, Empty, Tabs } from 'antd';
 import classnames from 'classnames';
+import updateHelper from 'immutability-helper';
 import { useMemo, useRef } from 'react';
 import { useLocation } from 'react-router';
 import { useOutlet } from 'react-router-dom';
@@ -131,10 +132,9 @@ export default function KeepAliveTabs(_ref) {
     _ref$menuItems = _ref.menuItems,
     menuItems = _ref$menuItems === void 0 ? [] : _ref$menuItems,
     className = _ref.className;
-  var components = useRef([]);
+  var routers = useRef([]);
   var location = useLocation();
-  var pathname = location.pathname,
-    locationKey = location.key;
+  var pathname = location.pathname;
   var outlet = useOutlet();
   var update = useUpdate();
   var _useAppConfig = useAppConfig(),
@@ -143,19 +143,19 @@ export default function KeepAliveTabs(_ref) {
   var isColorful = theme === 'colorful';
 
   // 超过缓存数量，删除第一个
-  if (components.current.length >= maxLen) {
-    components.current = components.current.slice(1);
+  if (routers.current.length >= maxLen) {
+    routers.current = routers.current.slice(1);
   }
 
   // 菜单改变，更新用户权限信息
   useUpdateEffect(function () {
-    components.current.forEach(function (component) {
+    routers.current.forEach(function (router) {
       var _menu$btnAuth;
-      var menu = findMenuById(menuItems, component.key);
-      component.urlAuthList = (menu === null || menu === void 0 || (_menu$btnAuth = menu.btnAuth) === null || _menu$btnAuth === void 0 ? void 0 : _menu$btnAuth.map(function (b) {
+      var menu = findMenuById(menuItems, router.key);
+      router.urlAuthList = (menu === null || menu === void 0 || (_menu$btnAuth = menu.btnAuth) === null || _menu$btnAuth === void 0 ? void 0 : _menu$btnAuth.map(function (b) {
         return b.code;
       })) || [];
-      component.timestamp = new Date().getTime();
+      router.timestamp = new Date().getTime();
     });
     update();
   }, [menuItems]);
@@ -234,68 +234,110 @@ export default function KeepAliveTabs(_ref) {
       breadcrumb: breadcrumb
     });
   }, [pathname]);
-  var component = components.current.find(function (c) {
-    return c.key === pathname;
+  var activeKey = location.key;
+  // 路由数据
+  var routerIndex = routers.current.findIndex(function (c) {
+    return c.pageLocation.pathname === pathname;
   });
-  if (!component) {
+  if (routerIndex > -1) {
+    // 路由已存在、判断search，state是否改变，如改变则更新路由数据
+    var router = routers.current[routerIndex];
+    if (router.pageLocation.search !== location.search || CcsUtils.jsonStringify(router.pageLocation.state) !== CcsUtils.jsonStringify(location.state)) {
+      // 更新路由数据，变更key，路由将重新加载
+      routers.current = updateHelper(routers.current, _defineProperty({}, routerIndex, {
+        key: {
+          $set: location.key
+        },
+        pageLocation: {
+          $set: location
+        }
+      }));
+    } else {
+      activeKey = router.pageLocation.key;
+    }
+  } else {
+    // 路由不存在，保存路由数据
     var _ref3 = curMenu || {},
       _ref3$btnAuth = _ref3.btnAuth,
       btnAuth = _ref3$btnAuth === void 0 ? [] : _ref3$btnAuth,
       _ref3$breadcrumb = _ref3.breadcrumb,
       breadcrumb = _ref3$breadcrumb === void 0 ? [] : _ref3$breadcrumb;
-    components.current = [].concat(_toConsumableArray(components.current), [{
-      locationKey: locationKey,
-      key: pathname,
-      timestamp: new Date().getTime(),
-      label: (curMenu === null || curMenu === void 0 ? void 0 : curMenu.label) || '未知',
-      outlet: curMenu ? outlet : /*#__PURE__*/_jsx(Empty, {
-        description: "\u672A\u77E5\u9875\u9762"
-      }),
-      urlAuthList: btnAuth.map(function (b) {
-        return b.code;
-      }),
-      breadcrumb: breadcrumb
-    }]);
+    routers.current = updateHelper(routers.current, {
+      $push: [{
+        key: location.key,
+        timestamp: new Date().getTime(),
+        label: (curMenu === null || curMenu === void 0 ? void 0 : curMenu.label) || '未知',
+        outlet: curMenu ? outlet : /*#__PURE__*/_jsx(Empty, {
+          description: "\u672A\u77E5\u9875\u9762"
+        }),
+        urlAuthList: btnAuth.map(function (b) {
+          return b.code;
+        }),
+        breadcrumb: breadcrumb,
+        pageLocation: location
+      }]
+    });
   }
 
+  // tab路由切换,携带search，state参数
+  var onHistory = function onHistory(key) {
+    var tab = routers.current.find(function (c) {
+      return c.key === key;
+    });
+    if (tab) {
+      var _tab$pageLocation = tab.pageLocation,
+        _pathname = _tab$pageLocation.pathname,
+        state = _tab$pageLocation.state,
+        search = _tab$pageLocation.search;
+      history.push("".concat(_pathname).concat(search), state);
+    }
+  };
+
   // 页面主动销毁或关闭tab
-  var onDestroy = function onDestroy(path) {
-    var index = components.current.findIndex(function (c) {
-      return c.key === path;
+  var onDestroy = function onDestroy(key) {
+    var index = routers.current.findIndex(function (c) {
+      return c.key === key;
     });
+    // 删除的路由
+    var delRouter = routers.current[index];
     if (index >= 0) {
-      components.current.splice(index, 1);
-      components.current = _toConsumableArray(components.current);
-      if (path !== pathname) {
+      routers.current = updateHelper(routers.current, {
+        $splice: [[index, 1]]
+      });
+
+      // 不是删的自己
+      if (delRouter.key !== key) {
         update();
         return;
       }
 
       // 显示首页
-      if (components.current.length === 0) {
+      if (routers.current.length === 0) {
         history.push('/');
         return;
       }
 
       // 显示前一个
-      if (index === components.current.length) {
-        history.push(components.current[index - 1].key);
+      if (index === routers.current.length) {
+        onHistory(routers.current[index - 1].key);
         return;
       }
 
       // 显示后一个
-      history.push(components.current[index].key);
+      onHistory(routers.current[index].key);
     }
   };
+
+  // 扩展操作
   var onCloseTab = function onCloseTab(key) {
     // 关闭其他标签
     if (key === '1') {
-      components.current = components.current.filter(function (c) {
+      routers.current = routers.current.filter(function (c) {
         return c.key === pathname;
       });
       update();
     } else {
-      components.current = [];
+      routers.current = [];
       history.push('/');
     }
   };
@@ -318,26 +360,25 @@ export default function KeepAliveTabs(_ref) {
       id: "keep-alive-tabs",
       hideAdd: true,
       size: "small",
-      onChange: function onChange(e) {
-        history.push(e);
-      },
+      onChange: onHistory,
       className: classnames(_defineProperty(_defineProperty(_defineProperty({}, 'ccs-keep-alive-tabs', !isColorful), 'dark', isDark), 'ccs-keep-alive-tabs-colorful', isColorful)),
-      activeKey: pathname,
+      activeKey: activeKey,
       type: "editable-card",
       onEdit: function onEdit(e) {
         return onDestroy(e);
       },
-      items: components.current,
-      tabBarExtraContent: components.current.length > 2 ? tabBarExtraContent : null
-    }), components.current.map(function (_ref4) {
+      items: routers.current,
+      tabBarExtraContent: routers.current.length > 2 ? tabBarExtraContent : null
+    }), routers.current.map(function (_ref4) {
       var key = _ref4.key,
         urlAuthList = _ref4.urlAuthList,
         timestamp = _ref4.timestamp,
         outlet = _ref4.outlet,
-        breadcrumb = _ref4.breadcrumb;
+        breadcrumb = _ref4.breadcrumb,
+        pageLocation = _ref4.pageLocation;
       return /*#__PURE__*/_jsx(Page, {
-        active: key === pathname,
-        location: location,
+        active: pageLocation.pathname === pathname,
+        location: pageLocation,
         onDestroy: onDestroy,
         urlAuthList: urlAuthList,
         timestamp: timestamp,

package/es/layout-keep-alive/page.d.ts

@@ -1,7 +1,7 @@
 /// <reference types="react" />
 import { Location } from 'react-router';
-import { CacheComponent } from '.';
-export type CachePageProps = Pick<CacheComponent, 'breadcrumb' | 'urlAuthList' | 'children' | 'timestamp'> & {
+import { CacheRouter } from '.';
+export type CachePageProps = Pick<CacheRouter, 'breadcrumb' | 'urlAuthList' | 'children' | 'timestamp'> & {
     /** 选中状态 */
     active: boolean;
     /** router location */

package/es/layout-keep-alive/page.js

@@ -7,20 +7,20 @@ import { DialogElementsHolder } from "../dialog/hook";
 import { jsx as _jsx } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
 export default /*#__PURE__*/memo(function (props) {
-  var locationRef = useRef(props.location);
   var children = props.children,
     active = props.active,
     urlAuthList = props.urlAuthList,
     onDestroy = props.onDestroy,
-    breadcrumb = props.breadcrumb;
-  var id = "_tab_content_".concat(locationRef.current.key);
+    breadcrumb = props.breadcrumb,
+    location = props.location;
+  var id = "_tab_content_".concat(location.key);
   var dialogHolderRef = useRef(null);
   return /*#__PURE__*/_jsx(PageContext.Provider, {
     value: {
       id: id,
       dialogHolderRef: dialogHolderRef,
       isActive: active,
-      location: locationRef.current,
+      location: location,
       onDestroy: onDestroy,
       onAuth: function onAuth(e) {
         return urlAuthList.includes(e);

package/es/layout-single-page/page.d.ts

@@ -1,7 +1,7 @@
 import { JSXElementConstructor, ReactElement } from 'react';
 import { Location } from 'react-router';
-import { CacheComponent } from '../layout-keep-alive';
-export type SinglePageProps = Pick<CacheComponent, 'breadcrumb' | 'urlAuthList'> & {
+import { CacheRouter } from '../layout-keep-alive';
+export type SinglePageProps = Pick<CacheRouter, 'breadcrumb' | 'urlAuthList'> & {
     /** router location */
     location: Location;
     /** children */

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

@@ -24,6 +24,7 @@ type TableTitleType<T> = {
     data: T[];
     onClear: () => void;
 };
+/** 请求参数类型 */
 export type CcsRequestProps = {
     pageNo?: number;
     pageSize?: number;
@@ -39,7 +40,7 @@ export type CcsTableProps<T> = Omit<TableProps<T>, 'columns' | 'title'> & {
     data?: CCS.TableData<T>;
     /** request 方法 */
     request?: (params: CcsRequestProps) => Promise<any>;
-    /** request 额外参数 dataSource: ['data', 'result']; current: ['data', 'pageNo']; pageSize: ['data', 'pageSize']; total: ['data', 'totalNum'] */
+    /** request 额外参数  */
     requestParam?: ParamType;
     /** 接口字段指定,默认： */
     fieldNames?: CcsFieldNamesType;

package/es/pro-table/table.js

@@ -31,6 +31,8 @@ import HeadComponent from "./head";
 import "./index.less";
 import TableOperation from "./operation";
 import TableTree from "./tree";
+
+/** 请求参数类型 */
 import { jsx as _jsx } from "react/jsx-runtime";
 import { Fragment as _Fragment } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
@@ -176,11 +178,12 @@ var InternalProTable = function InternalProTable(props) {
               var formValues,
                 pageValue,
                 params,
+                _filtersRef$current,
+                filters,
+                orderProps,
                 _treeRef$current,
                 requestResult,
                 dataSource,
-                _pageSize,
-                current,
                 total,
                 _args = arguments;
               return _regeneratorRuntime().wrap(function _callee$(_context) {
@@ -198,75 +201,91 @@ var InternalProTable = function InternalProTable(props) {
                         }
                       });
                     }
+
+                    // 构建请求参数
                     pageValue = pagination === false ? {} : {
                       pageNo: pageNo,
                       pageSize: pageSize
                     };
-                    params = _objectSpread(_objectSpread(_objectSpread({
+                    params = _objectSpread(_objectSpread({
                       query: _objectSpread(_objectSpread({}, requestParam), formValues)
-                    }, pageValue), filtersRef.current), {}, {
+                    }, pageValue), {}, {
                       eventType: eventType
-                    }); // 异步树
+                    }); // 列过滤或排序参数
+                    _filtersRef$current = filtersRef.current, filters = _filtersRef$current.filters, orderProps = _filtersRef$current.orderProps;
+                    if (Object.keys(filters).length > 0) {
+                      params.filters = filters;
+                    }
+                    if (orderProps.length > 0) {
+                      params.orderProps = orderProps;
+                    }
+
+                    // 异步树
                     if (!parentFieldName) {
-                      _context.next = 7;
+                      _context.next = 10;
                       break;
                     }
                     (_treeRef$current = treeRef.current) === null || _treeRef$current === void 0 || _treeRef$current.onRequestTree(params.query, record);
                     return _context.abrupt("return");
-                  case 7:
+                  case 10:
                     // 发起请求
                     setData(function (d) {
                       return _objectSpread(_objectSpread({}, d), {}, {
                         loading: true
                       });
                     });
-                    _context.next = 10;
+                    _context.next = 13;
                     return httpRequest(params);
-                  case 10:
+                  case 13:
                     requestResult = _context.sent;
                     if (!requestResult) {
-                      _context.next = 22;
+                      _context.next = 23;
                       break;
                     }
                     // 获取table数据
-                    dataSource = getDataFromFields(requestResult, fieldNames.dataSource);
-                    _pageSize = getDataFromFields(requestResult, fieldNames.pageSize);
-                    current = getDataFromFields(requestResult, fieldNames.current);
+                    dataSource = getDataFromFields(requestResult, fieldNames.dataSource); // const pageSize = getDataFromFields(
+                    //   requestResult,
+                    //   fieldNames.pageSize,
+                    // );
+                    // const current = getDataFromFields(requestResult, fieldNames.current);
                     total = getDataFromFields(requestResult, fieldNames.total);
-                    if (!(total === undefined || _pageSize === undefined || current === undefined || dataSource === undefined)) {
-                      _context.next = 19;
+                    if (!(total === undefined ||
+                    // pageSize === undefined ||
+                    // current === undefined ||
+                    dataSource === undefined)) {
+                      _context.next = 20;
                       break;
                     }
                     setData({
                       dataSource: dataSource,
-                      pageSize: _pageSize,
-                      current: current,
+                      pageSize: pageSize,
+                      current: pageNo,
                       total: total,
                       loading: false
                     });
                     return _context.abrupt("return");
-                  case 19:
+                  case 20:
                     // 当前页无数据，返回上一页
-                    if (!dataSource.length && current !== 1 && current !== undefined) {
-                      onRequest('reload', current - 1);
+                    if (!dataSource.length && pageNo !== 1) {
+                      onRequest('reload', pageNo - 1);
                     } else {
                       setData({
-                        current: current,
-                        pageSize: _pageSize,
+                        current: pageNo,
+                        pageSize: pageSize,
                         loading: false,
                         dataSource: dataSource,
                         total: total || 0
                       });
                     }
-                    _context.next = 23;
+                    _context.next = 24;
                     break;
-                  case 22:
+                  case 23:
                     setData(function (d) {
                       return _objectSpread(_objectSpread({}, d), {}, {
                         loading: false
                       });
                     });
-                  case 23:
+                  case 24:
                   case "end":
                     return _context.stop();
                 }

package/package.json

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