@ccs-ui/rc-pro 2.3.6-beta-1 → 2.3.6-beta-2

package/es/context/index.d.ts

@@ -20,6 +20,8 @@ export type CcsTabProps = Omit<TabPaneProps, 'tab'> & {
     label: React.ReactNode;
 };
 type CcsTabsContextType = {
+    /** dom id */
+    tabsId: string;
     /** 当前激活tab面板的key */
     activeKey: string;
     /** tab间传递的参数 */

package/es/dialog/button.d.ts

@@ -16,7 +16,7 @@ export type DialogButtonsProps<T> = Pick<CcsDialogModalProps, 'okText' | 'onClos
 export type DialogButtonRef = {
     onSetButtons: (e: React.ReactElement) => void;
 };
-export declare const DialogButtonHolder: <TParams, TData>({ auth, extraBtn, formRef, request, onOk, onClose, buttonRef, requestFieldNames, formInitialValues, preventRequestHandle, }: Pick<CcsDialogModalProps<TParams, TData>, "onOk" | "onClose" | "auth" | "request" | "extraBtn" | "requestFieldNames" | "preventRequestHandle"> & {
+export declare const DialogButtonHolder: <TParams, TData>({ auth, extraBtn, formRef, request, onOk, onClose, buttonRef, requestFieldNames, formInitialValues, preventRequestHandle, }: Pick<CcsDialogModalProps<TParams, TData>, "auth" | "request" | "onClose" | "onOk" | "extraBtn" | "requestFieldNames" | "preventRequestHandle"> & {
     formRef: React.RefObject<DialogFormRef<TParams>>;
     formInitialValues: FormProps['initialValues'];
     buttonRef: RefObject<DialogButtonRef>;

package/es/pro-table/table.js

@@ -416,14 +416,21 @@ var InternalProTable = function InternalProTable(props) {
     if (sorter) {
       columns === null || columns === void 0 || columns.forEach(function (c) {
         if (c.sorter) {
-          var curSorter = Array.isArray(sorter) ?
-          // @ts-ignore
-          sorter.find(function (sort) {
-            return sort.field === c.dataIndex;
-          }) : sorter;
+          if (Array.isArray(sorter)) {
+            // @ts-ignore
+            var curSorter = sorter.find(function (sort) {
+              return sort.field === c.dataIndex;
+            });
+            if (curSorter) c.sortOrder = curSorter === null || curSorter === void 0 ? void 0 : curSorter.order;
+            return;
+          }
 
           // @ts-ignore
-          c.sortOrder = curSorter === null || curSorter === void 0 ? void 0 : curSorter.order;
+          if (sorter.field === c.dataIndex) {
+            c.sortOrder = sorter.order;
+            return;
+          }
+          c.sortOrder = undefined;
         }
       });
 

package/es/pro-tabs/index.js

@@ -4,6 +4,7 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
 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(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
+import CcsUtils from '@ccs-ui/utils';
 import { useUpdateEffect } from 'ahooks';
 import { theme as antTheme } from 'antd';
 import update from 'immutability-helper';
@@ -19,16 +20,19 @@ export default (function (_ref) {
     activeKey = _ref2.activeKey,
     defaultActiveKey = _ref2.defaultActiveKey,
     onChange = _ref2.onChange;
-  var _useState = useState(function () {
+  var _useState = useState("ccs-tabs-".concat(CcsUtils.getUUID(5))),
+    _useState2 = _slicedToArray(_useState, 1),
+    tabsId = _useState2[0];
+  var _useState3 = useState(function () {
       return {
         activeKey: defaultActiveKey || (items[0] || {}).key,
         items: items || [],
         options: {}
       };
     }),
-    _useState2 = _slicedToArray(_useState, 2),
-    tabsProps = _useState2[0],
-    setTabsProps = _useState2[1];
+    _useState4 = _slicedToArray(_useState3, 2),
+    tabsProps = _useState4[0],
+    setTabsProps = _useState4[1];
 
   // items 发生改变
   useUpdateEffect(function () {
@@ -45,6 +49,7 @@ export default (function (_ref) {
   var addOptions = {
     items: tabsProps.items,
     className: 'ccs-tabs',
+    id: tabsId,
     tabBarStyle: {
       margin: 0,
       paddingLeft: 16,
@@ -153,6 +158,7 @@ export default (function (_ref) {
   };
   return children ? /*#__PURE__*/_jsx(TabsContext.Provider, {
     value: {
+      tabsId: tabsId,
       activeKey: tabsProps.activeKey,
       options: tabsProps.options,
       onTabChange: onHooksChange,

package/es/table/index.js

@@ -13,6 +13,7 @@ import { Table, Tooltip, theme } from 'antd';
 import classNames from 'classnames';
 import { useEffect, useImperativeHandle } from 'react';
 import { Resizable } from 'react-resizable';
+import useTabs from "../hooks/use-tabs";
 import "./index.less";
 import { jsx as _jsx } from "react/jsx-runtime";
 var ResizableTitle = function ResizableTitle(props) {
@@ -61,12 +62,21 @@ var CustomTable = function CustomTable(props) {
     current = _ref$current === void 0 ? 1 : _ref$current,
     _ref$total = _ref.total,
     total = _ref$total === void 0 ? 0 : _ref$total;
+  var inTabs = useTabs();
 
   // table 固定表头，内容滚动
   var _useDebounceFn = useDebounceFn(function () {
       if ((scroll === null || scroll === void 0 ? void 0 : scroll.y) === 'auto') {
         var _tableContentRef$curr;
         var tableTarget = tableContentRef === null || tableContentRef === void 0 ? void 0 : tableContentRef.current;
+
+        // 在ccs tabs组件内
+        if (inTabs !== null && inTabs !== void 0 && inTabs.tabsId) {
+          var tabsDom = document.getElementById(inTabs === null || inTabs === void 0 ? void 0 : inTabs.tabsId);
+          if (tabsDom) {
+            tabsDom.classList.add('ccs-tabs-auto-height');
+          }
+        }
         if (!tableTarget) return;
         var tableBody = tableTarget.getElementsByClassName('ant-table-body')[0];
         if (!tableBody) return;

package/es/table/index.less

@@ -171,3 +171,19 @@
     }
   }
 }
+
+.ccs-tabs-auto-height {
+  flex: 1 1 auto;
+  > .ant-tabs-content-holder {
+    height: 100%;
+    > .ant-tabs-content {
+      height: 100%;
+      > div {
+        height: 100%;
+        > .ccs-pl {
+          height: 100%;
+        }
+      }
+    }
+  }
+}

package/package.json

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