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

package/es/dialog/HookModal.d.ts

@@ -2,7 +2,7 @@
 import { FormProps } from 'antd';
 import { DialogFormRef } from './form';
 import { CcsDialogModal, CcsDialogModalProps } from './hook';
-export declare const DialogSelfButton: ({ auth, formRef, formInitialValues, request, onCancel, onRequestBefore, }: Pick<CcsDialogModalProps, "auth" | "request" | "onRequestBefore" | "onCancel"> & {
+export declare const DialogSelfButton: ({ auth, formRef, formInitialValues, request, onCancel, onRequestBefore, }: Pick<CcsDialogModalProps, "request" | "auth" | "onRequestBefore" | "onCancel"> & {
     formRef: React.RefObject<DialogFormRef>;
     formInitialValues: FormProps['initialValues'];
 }) => import("react/jsx-runtime").JSX.Element;

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

@@ -56,6 +56,8 @@ export type CcsProTableProps<T> = {
     watermark?: string;
     /** ref 回调方法 */
     proRef?: CCS.TableInstanceRef<T>;
+    /** 显示序号 */
+    showNumber?: boolean;
     /** class */
     className?: string;
     /** style */

package/es/pro-table/table.js

@@ -392,8 +392,26 @@ var InternalProTable = function InternalProTable(props) {
           c.sortOrder = sorter === null || sorter === void 0 ? void 0 : sorter.order;
         }
       });
+
+      // 设置orderProps 与后端保持一致
+      var orderProps = [];
+      if (Array.isArray(sorter)) {
+        sorter.forEach(function (s) {
+          orderProps.push({
+            prop: s.field,
+            ascending: s.order === 'ascend'
+          });
+        });
+      } else {
+        if (sorter.order) {
+          orderProps.push({
+            prop: sorter.field,
+            ascending: sorter.order === 'ascend'
+          });
+        }
+      }
       filtersRef.current = _objectSpread(_objectSpread({}, filtersRef.current), {}, {
-        sorter: sorter
+        orderProps: orderProps
       });
     }
     onRequest('changePage', paginationTable.current || 0, paginationTable.pageSize || 10);
@@ -448,7 +466,8 @@ var InternalProTable = function InternalProTable(props) {
     }, table), {}, {
       columns: columns,
       showSorterTooltip: true,
-      loading: table.loading || data.loading || false
+      loading: table.loading || data.loading || false,
+      showNumber: props.showNumber
     }));
   };
   var isDark = token._appTheme === 'dark';

package/es/table/index.d.ts

@@ -1,5 +1,5 @@
-import { CcsTableProps } from '../pro-table/table';
+import { CcsProTableProps, CcsTableProps } from '../pro-table/table';
 import './index.less';
-type TableProps<T> = Omit<CcsTableProps<T>, 'request' | 'requestParam'>;
+type TableProps<T> = Omit<CcsTableProps<T>, 'request' | 'requestParam'> & Pick<CcsProTableProps<T>, 'showNumber'>;
 declare const CustomTable: <T extends object = any>(props: TableProps<T>) => import("react/jsx-runtime").JSX.Element;
 export default CustomTable;

package/es/table/index.js

@@ -161,6 +161,16 @@ var CustomTable = function CustomTable(props) {
         };
       };
     });
+    if (restProps.showNumber) {
+      cls === null || cls === void 0 ? void 0 : cls.unshift({
+        title: '序号',
+        ellipsis: true,
+        width: 60,
+        render: function render(_value, _record, index) {
+          return (index + 1) * (pageNo || 1);
+        }
+      });
+    }
     return cls;
   };
   var _theme$useToken = theme.useToken(),

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@ccs-ui/rc-pro",
-  "version": "1.1.21-beta-3",
-  "description": "ProTable在抽屉中吸顶异常;",
+  "version": "1.1.21-beta-5",
+  "description": "ProTable在抽屉中吸顶异常;table排序参数修改保持与后端一致;table添加序号",
   "license": "MIT",
   "author": {
     "name": "Hong",
@@ -21,7 +21,6 @@
     "lint": "npm run lint:es && npm run lint:css",
     "lint:css": "stylelint \"{src,test}/**/*.{css,less}\"",
     "lint:es": "eslint \"{src,test}/**/*.{js,jsx,ts,tsx}\"",
-    "prepare": "husky install && dumi setup",
     "prepublishOnly": "father doctor && npm run build",
     "publish:beta": "father build && npm publish --tag=beta && cnpm sync @ccs-ui/rc-pro",
     "publish:prod": "father build && npm publish && cnpm sync @ccs-ui/rc-pro",