@ccs-ui/rc-pro 2.3.6-beta-34 → 2.3.6-beta-35

package/es/ccs.d.ts

@@ -43,8 +43,13 @@ type TableDataType<T> = {
     result?: T[];
 };
 type TableInstance<T = any> = {
-    /** 获取form表单数据,排序等条件数据 */
+    /**
+     * @deprecated
+     * 获取form表单数据,排序等条件数据
+     */
     formValues: Record<string, any>;
+    /** 接口请求参数 */
+    searchParam: Record<string, any>;
     /** 获取当前表单数据 */
     data: TableData<T>;
     /** 获取当前选中的数据 */

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>, "auth" | "request" | "onClose" | "onOk" | "extraBtn" | "requestFieldNames" | "preventRequestHandle"> & {
+export declare const DialogButtonHolder: <TParams, TData>({ auth, extraBtn, formRef, request, onOk, onClose, buttonRef, requestFieldNames, formInitialValues, preventRequestHandle, }: Pick<CcsDialogModalProps<TParams, TData>, "onClose" | "auth" | "request" | "onOk" | "extraBtn" | "requestFieldNames" | "preventRequestHandle"> & {
     formRef: React.RefObject<DialogFormRef<TParams>>;
     formInitialValues: FormProps['initialValues'];
     buttonRef: RefObject<DialogButtonRef>;

package/es/pro-table/table.js

@@ -116,9 +116,11 @@ var InternalProTable = function InternalProTable(props) {
   }, []);
 
   // column filter
-  var filtersRef = useRef(defaultColumnValues);
+  var filterOrderRef = useRef(defaultColumnValues);
   // table content
   var tableContentRef = useRef(null);
+  // 接口查询条件
+  var searchParamRef = useRef({});
   // container
   var containerRef = useRef(null);
   // table ref
@@ -184,7 +186,7 @@ var InternalProTable = function InternalProTable(props) {
         fsOrderProps,
         fsQuery,
         params,
-        _filtersRef$current,
+        _filterOrderRef$curre,
         filters,
         orderProps,
         _treeRef$current,
@@ -238,7 +240,7 @@ var InternalProTable = function InternalProTable(props) {
             }
 
             // 列过滤或排序参数
-            _filtersRef$current = filtersRef.current, filters = _filtersRef$current.filters, orderProps = _filtersRef$current.orderProps;
+            _filterOrderRef$curre = filterOrderRef.current, filters = _filterOrderRef$curre.filters, orderProps = _filterOrderRef$curre.orderProps;
             if (Object.keys(filters).length > 0) {
               onSetObj(params, _toConsumableArray(fsFilters), filters);
             }
@@ -254,28 +256,30 @@ var InternalProTable = function InternalProTable(props) {
             (_treeRef$current = treeRef.current) === null || _treeRef$current === void 0 || _treeRef$current.onRequestTree(params.query, record);
             return _context.abrupt("return");
           case 20:
+            // 记录查询条件
+            searchParamRef.current = params;
             // 发起请求
             setData(function (d) {
               return _objectSpread(_objectSpread({}, d), {}, {
                 loading: true
               });
             });
-            _context.next = 23;
+            _context.next = 24;
             return httpRequest(params);
-          case 23:
+          case 24:
             requestResult = _context.sent;
             if (!requestResult) {
-              _context.next = 34;
+              _context.next = 35;
               break;
             }
             // 获取table数据
             dataSource = getDataFromFields(requestResult, fieldNames.dataSource); // 默认添加一条数据
-            if (dataSource.length === 0 && table !== null && table !== void 0 && table.emptyDefaultOne) {
+            if (table !== null && table !== void 0 && table.emptyDefaultOne && dataSource && dataSource.length === 0) {
               dataSource.push(_defineProperty({}, rowKey || 'id', '0'));
             }
             total = getDataFromFields(requestResult, fieldNames.total);
             if (!(total === undefined || dataSource === undefined)) {
-              _context.next = 31;
+              _context.next = 32;
               break;
             }
             setData({
@@ -286,7 +290,7 @@ var InternalProTable = function InternalProTable(props) {
               loading: false
             });
             return _context.abrupt("return");
-          case 31:
+          case 32:
             // 当前页无数据，返回上一页
             if (!dataSource.length && pageNo !== 1) {
               onRequest('reload', pageNo - 1);
@@ -299,15 +303,15 @@ var InternalProTable = function InternalProTable(props) {
                 total: total || 0
               });
             }
-            _context.next = 35;
+            _context.next = 36;
             break;
-          case 34:
+          case 35:
             setData(function (d) {
               return _objectSpread(_objectSpread({}, d), {}, {
                 loading: false
               });
             });
-          case 35:
+          case 36:
           case "end":
             return _context.stop();
         }
@@ -384,7 +388,7 @@ var InternalProTable = function InternalProTable(props) {
       }
     });
     // 清空filter请求值
-    filtersRef.current = defaultColumnValues;
+    filterOrderRef.current = defaultColumnValues;
     onRequest('reset');
   };
 
@@ -396,11 +400,11 @@ var InternalProTable = function InternalProTable(props) {
 
   // form 数据 查询，重载，重置方法
   useImperativeHandle(proRef, function () {
-    var _formRef$current3;
     return {
       data: data,
       selectedRows: selectedRows,
-      formValues: _objectSpread(_objectSpread(_objectSpread({}, formInitValues), (_formRef$current3 = formRef.current) === null || _formRef$current3 === void 0 ? void 0 : _formRef$current3.getFieldsValue()), filtersRef.current),
+      formValues: searchParamRef.current,
+      searchParam: searchParamRef.current,
       onSearch: function onSearch() {
         _onSearch();
       },
@@ -430,7 +434,7 @@ var InternalProTable = function InternalProTable(props) {
           c.filteredValue = filters[c.dataIndex];
         }
       });
-      filtersRef.current = _objectSpread(_objectSpread({}, filtersRef.current), {}, {
+      filterOrderRef.current = _objectSpread(_objectSpread({}, filterOrderRef.current), {}, {
         filters: filters
       });
     }
@@ -472,7 +476,7 @@ var InternalProTable = function InternalProTable(props) {
           });
         }
       }
-      filtersRef.current = _objectSpread(_objectSpread({}, filtersRef.current), {}, {
+      filterOrderRef.current = _objectSpread(_objectSpread({}, filterOrderRef.current), {}, {
         orderProps: orderProps
       });
     }

package/package.json

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