@ccs-ui/rc-pro 1.1.22-beta-3 → 1.1.22-beta-5

package/es/ccs.d.ts

@@ -1,7 +1,7 @@
 import { ButtonProps, MenuProps, ThemeConfig } from 'antd';
 import { Rule } from 'antd/es/form';
-import { ColumnGroupType, ColumnType } from 'antd/es/table';
 import { MutableRefObject, ReactElement, ReactNode } from 'react';
+import { TableColumn } from './pro-table/table';
 type MenuTreeNodeData = {
     buttonUrlId: number;
     createTime: string;
@@ -203,7 +203,5 @@ type GlobalConfig = {
 };
 type TableFormItems = TableFormItem[];
 type TableInstanceRef<T = any> = MutableRefObject<TableInstance<T> | undefined> | React.RefObject<TableInstance<T>>;
-type TableColumns<RecordType = any> = ((ColumnGroupType<RecordType> | ColumnType<RecordType>) & {
-    hidden?: boolean;
-})[];
+type TableColumns<RecordType = any> = TableColumn<RecordType>[];
 export type { PageType, RecordType, MenuTreeNode, PageQuery, ListQuery, HttpResult, GlobalConfig, HttpListResult, HttpPageResult, AuthButtonItem, MenuTreeNodeData, UserDetail, RouteHistory, TableData, TableFormItems, TableColumns, TableInstance, TableInstanceRef, TriggerChildrenProps, };

package/es/pro-table/search.js

@@ -83,11 +83,12 @@ function SearchComponent(_ref) {
     _useState4 = _slicedToArray(_useState3, 2),
     filterColumns = _useState4[0],
     setFilterColumns = _useState4[1];
-  var _useState5 = useState(expandForm),
+  var _useState5 = useState(false),
     _useState6 = _slicedToArray(_useState5, 2),
     isShowMore = _useState6[0],
     setIsShowMore = _useState6[1];
   var ref = useRef(null);
+  console.log('isShowMore', isShowMore);
   var onHasMore = function onHasMore() {
     var hasMain = formItems.filter(function (f) {
       return f.isMain;
@@ -224,7 +225,8 @@ function SearchComponent(_ref) {
     className: "".concat(classPrefix, "-header-buttons"),
     children: [onHasMore() && !expandForm && /*#__PURE__*/_jsx(Button, {
       onClick: function onClick() {
-        return setIsShowMore(!isShowMore);
+        console.log(123);
+        setIsShowMore(!isShowMore);
       },
       icon: isShowMore ? /*#__PURE__*/_jsx(UpOutlined, {
         className: "".concat(classPrefix, "-icon")
@@ -408,14 +410,19 @@ function SearchComponent(_ref) {
         children: itemContent
       }, item.name);
     });
+    var style = {
+      overflow: 'hidden'
+    };
+    if (isShowMore || expandForm) {
+      style.marginBottom = 10;
+    } else {
+      style.maxHeight = 0;
+      style.marginBottom = 0;
+    }
     return /*#__PURE__*/_jsx("div", {
       className: "".concat(classPrefix, "-high-form"),
       ref: ref,
-      style: {
-        maxHeight: isShowMore ? 500 : 0,
-        overflow: 'hidden',
-        marginBottom: isShowMore ? 10 : 0
-      },
+      style: style,
       children: /*#__PURE__*/_jsx(Form, {
         initialValues: formInitValues,
         form: form,

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

@@ -1,8 +1,9 @@
 import { ColProps, TableProps } from 'antd';
 import { FormLayout } from 'antd/es/form/Form';
+import { ColumnGroupType, ColumnType } from 'antd/es/table';
 import { CSSProperties, ReactElement, ReactNode } from 'react';
 import CCS from '..';
-import { HttpPageResult } from '../ccs';
+import { HttpPageResult, TableColumns } from '../ccs';
 import './index.less';
 type ParamType = Record<string, any>;
 export type ShowDependType = {
@@ -13,7 +14,13 @@ export type SearchEventType = 'search' | 'reset' | 'reload' | 'changePage' | 'in
 type SearchBeforeType = ParamType & {
     query: ParamType;
 };
-export type CcsTableProps<T> = TableProps<T> & {
+export type TableColumn<RecordType = any> = (Omit<ColumnGroupType<RecordType>, 'ellipsis'> | Omit<ColumnType<RecordType>, 'ellipsis'>) & {
+    /** 隐藏列 */
+    hidden?: boolean;
+    /** 省略显示行数,最大支持10行 */
+    ellipsis?: boolean | number;
+};
+export type CcsTableProps<T> = Omit<TableProps<T>, 'columns'> & {
     data?: CCS.TableData<T>;
     /** request 方法 */
     request?: (params: any) => void;
@@ -25,6 +32,8 @@ export type CcsTableProps<T> = TableProps<T> & {
     event$?: any;
     /** style */
     style?: CSSProperties;
+    /** 列配置 */
+    columns?: TableColumns<T>;
 };
 export type CcsProTableProps<T> = {
     /** api权限标识 */

package/es/table/index.js

@@ -139,16 +139,19 @@ var CustomTable = function CustomTable(props) {
     });
     cls === null || cls === void 0 ? void 0 : cls.forEach(function (c) {
       if (c.ellipsis && !c.render) {
-        var sc = c;
-        sc.ellipsis = {
-          showTitle: false
-        };
-        sc.render = function (e) {
+        var isMultiRow = typeof c.ellipsis === 'number' && c.ellipsis > 1;
+        var ellipsis = c.ellipsis;
+        c.ellipsis = !isMultiRow;
+        c.render = function (e) {
           return /*#__PURE__*/_jsx(Tooltip, {
             zIndex: 2020,
             title: e,
             placement: "bottomLeft",
             destroyTooltipOnHide: true,
+            className: classNames(_defineProperty({}, "ccs-table-cell-ellipsis-multi lineclamp".concat(ellipsis), isMultiRow)),
+            overlayInnerStyle: {
+              whiteSpace: 'normal'
+            },
             children: e
           });
         };

package/es/table/index.less

@@ -104,6 +104,48 @@
     }
   }
 
+  &-cell-ellipsis {
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+  }
+
+  &-cell-ellipsis-multi {
+    overflow: hidden;
+    text-overflow: ellipsis;
+    display: -webkit-box;
+    -webkit-box-orient: vertical;
+    white-space: normal;
+  }
+
+  &-cell-ellipsis-multi.lineclamp2 {
+    -webkit-line-clamp: 2;
+  }
+  &-cell-ellipsis-multi.lineclamp3 {
+    -webkit-line-clamp: 3;
+  }
+  &-cell-ellipsis-multi.lineclamp4 {
+    -webkit-line-clamp: 4;
+  }
+  &-cell-ellipsis-multi.lineclamp5 {
+    -webkit-line-clamp: 5;
+  }
+  &-cell-ellipsis-multi.lineclamp6 {
+    -webkit-line-clamp: 6;
+  }
+  &-cell-ellipsis-multi.lineclamp7 {
+    -webkit-line-clamp: 7;
+  }
+  &-cell-ellipsis-multi.lineclamp8 {
+    -webkit-line-clamp: 8;
+  }
+  &-cell-ellipsis-multi.lineclamp9 {
+    -webkit-line-clamp: 9;
+  }
+  &-cell-ellipsis-multi.lineclamp10 {
+    -webkit-line-clamp: 10;
+  }
+
   &-nodata {
     color: red;
 

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@ccs-ui/rc-pro",
-  "version": "1.1.22-beta-3",
-  "description": "CcsDatePicker.RangePicker参数bug;CcsProTable删除disableCollapseForm参数;CcsProTable添加formItemLayout，formItemCol参数适应自定义布局",
+  "version": "1.1.22-beta-5",
+  "description": "CcsDatePicker.RangePicker参数bug;CcsProTable删除disableCollapseForm参数;CcsProTable添加formItemLayout，formItemCol参数适应自定义布局;table column支持多行省略显示",
   "license": "MIT",
   "author": {
     "name": "Hong",