@ccs-ui/rc-pro 1.1.21-beta-2 → 1.1.21-beta-4
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/es/dialog/HookModal.d.ts +1 -1
- package/es/pro-table/search.js +2 -1
- package/es/pro-table/table.js +19 -1
- package/package.json +2 -3
package/es/dialog/HookModal.d.ts
CHANGED
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
import { FormProps } from 'antd';
|
|
3
3
|
import { DialogFormRef } from './form';
|
|
4
4
|
import { CcsDialogModal, CcsDialogModalProps } from './hook';
|
|
5
|
-
export declare const DialogSelfButton: ({ auth, formRef, formInitialValues, request, onCancel, onRequestBefore, }: Pick<CcsDialogModalProps, "auth" | "request" | "
|
|
5
|
+
export declare const DialogSelfButton: ({ auth, formRef, formInitialValues, request, onCancel, onRequestBefore, }: Pick<CcsDialogModalProps, "auth" | "request" | "onCancel" | "onRequestBefore"> & {
|
|
6
6
|
formRef: React.RefObject<DialogFormRef>;
|
|
7
7
|
formInitialValues: FormProps['initialValues'];
|
|
8
8
|
}) => import("react/jsx-runtime").JSX.Element;
|
package/es/pro-table/search.js
CHANGED
|
@@ -374,7 +374,8 @@ function SearchComponent(_ref) {
|
|
|
374
374
|
ref: ref,
|
|
375
375
|
style: {
|
|
376
376
|
maxHeight: isShowMore ? 500 : 0,
|
|
377
|
-
overflow: 'hidden'
|
|
377
|
+
overflow: 'hidden',
|
|
378
|
+
marginBottom: isShowMore ? 10 : 0
|
|
378
379
|
},
|
|
379
380
|
children: /*#__PURE__*/_jsx(Form, {
|
|
380
381
|
initialValues: formInitValues,
|
package/es/pro-table/table.js
CHANGED
|
@@ -392,8 +392,26 @@ var InternalProTable = function InternalProTable(props) {
|
|
|
392
392
|
c.sortOrder = sorter === null || sorter === void 0 ? void 0 : sorter.order;
|
|
393
393
|
}
|
|
394
394
|
});
|
|
395
|
+
|
|
396
|
+
// 设置orderProps 与后端保持一致
|
|
397
|
+
var orderProps = [];
|
|
398
|
+
if (Array.isArray(sorter)) {
|
|
399
|
+
sorter.forEach(function (s) {
|
|
400
|
+
orderProps.push({
|
|
401
|
+
prop: s.field,
|
|
402
|
+
ascending: s.order === 'ascend'
|
|
403
|
+
});
|
|
404
|
+
});
|
|
405
|
+
} else {
|
|
406
|
+
if (sorter.order) {
|
|
407
|
+
orderProps.push({
|
|
408
|
+
prop: sorter.field,
|
|
409
|
+
ascending: sorter.order === 'ascend'
|
|
410
|
+
});
|
|
411
|
+
}
|
|
412
|
+
}
|
|
395
413
|
filtersRef.current = _objectSpread(_objectSpread({}, filtersRef.current), {}, {
|
|
396
|
-
|
|
414
|
+
orderProps: orderProps
|
|
397
415
|
});
|
|
398
416
|
}
|
|
399
417
|
onRequest('changePage', paginationTable.current || 0, paginationTable.pageSize || 10);
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@ccs-ui/rc-pro",
|
|
3
|
-
"version": "1.1.21-beta-
|
|
4
|
-
"description": "ProTable
|
|
3
|
+
"version": "1.1.21-beta-4",
|
|
4
|
+
"description": "ProTable在抽屉中吸顶异常;table排序参数修改保持与后端一致",
|
|
5
5
|
"license": "MIT",
|
|
6
6
|
"author": {
|
|
7
7
|
"name": "Hong",
|
|
@@ -21,7 +21,6 @@
|
|
|
21
21
|
"lint": "npm run lint:es && npm run lint:css",
|
|
22
22
|
"lint:css": "stylelint \"{src,test}/**/*.{css,less}\"",
|
|
23
23
|
"lint:es": "eslint \"{src,test}/**/*.{js,jsx,ts,tsx}\"",
|
|
24
|
-
"prepare": "husky install && dumi setup",
|
|
25
24
|
"prepublishOnly": "father doctor && npm run build",
|
|
26
25
|
"publish:beta": "father build && npm publish --tag=beta && cnpm sync @ccs-ui/rc-pro",
|
|
27
26
|
"publish:prod": "father build && npm publish && cnpm sync @ccs-ui/rc-pro",
|