@flatbiz/antd 5.0.55 → 5.0.57

package/dist/easy-table/index.js

@@ -162,7 +162,7 @@ var FoldOperateDropdown = function FoldOperateDropdown(props) {
     title: /*#__PURE__*/jsx(Checkbox, {
       checked: selectedRowKeys.length === props.dataList.length,
       onChange: onChangeAll,
-      children: "\u5168\u9009\uFF08\u5B57\u6BB5\u5217\u8868\uFF09"
+      children: "\u5168\u9009"
     }),
     placement: "bottomRight",
     overlayClassName: "fold-operate-popiver",
@@ -170,6 +170,18 @@ var FoldOperateDropdown = function FoldOperateDropdown(props) {
   });
 };
 
+var getFormFieldsValue = function getFormFieldsValue(form, filterFormItemKeys) {
+  var formValues = form.getFieldsValue() || {};
+  if (!(filterFormItemKeys !== null && filterFormItemKeys !== void 0 && filterFormItemKeys.length)) {
+    return formValues;
+  }
+  var values = {};
+  filterFormItemKeys.forEach(function (item) {
+    values[item] = formValues[item];
+  });
+  return values;
+};
+
 var EasyTable$1 = /*#__PURE__*/forwardRef(function (props, ref) {
   var _props$initialPaginat;
   var screenType = fbaHooks.useResponsivePoint() || '';
@@ -240,7 +252,8 @@ var EasyTable$1 = /*#__PURE__*/forwardRef(function (props, ref) {
     pageNo: 'pageNo',
     pageSize: 'pageSize'
   }, props.fieldNames);
-  var _Form$useForm = Form.useForm(props.form),
+  var outerForm = Form.useFormInstance();
+  var _Form$useForm = Form.useForm(props.form || outerForm),
     _Form$useForm2 = _slicedToArray(_Form$useForm, 1),
     form = _Form$useForm2[0];
   var onInnerRequest = hooks.useCallbackRef(function (params) {
@@ -296,8 +309,8 @@ var EasyTable$1 = /*#__PURE__*/forwardRef(function (props, ref) {
         }
         function $If_4() {
           firstQueryCache.set(cacheKey, false);
-          setLoading(true);
           paramsAll = filterCache.set(cacheKey, params);
+          setLoading(true);
           _props$serviceConfig = props.serviceConfig, requestParamsAdapter = _props$serviceConfig.requestParamsAdapter, onRequest = _props$serviceConfig.onRequest, requestResultAdapter = _props$serviceConfig.requestResultAdapter, dynamicColumsAdapter = _props$serviceConfig.dynamicColumsAdapter;
           paramsNew = requestParamsAdapter ? requestParamsAdapter(paramsAll) : paramsAll;
           return Promise.resolve(onRequest(fbaUtils.removeFormValuesInvalidField(paramsNew))).then(function ($await_6) {
@@ -373,7 +386,16 @@ var EasyTable$1 = /*#__PURE__*/forwardRef(function (props, ref) {
     void onInnerRequest(params);
   });
   var getRequestParams = hooks.useCallbackRef(function () {
-    return _objectSpread2(_objectSpread2({}, cacheParams), form.getFieldsValue());
+    var _props$filterFormItem;
+    var cacheParams = filterCache.get(cacheKey);
+    if (!((_props$filterFormItem = props.filterFormItemKeys) !== null && _props$filterFormItem !== void 0 && _props$filterFormItem.length)) {
+      return cacheParams;
+    }
+    var values = {};
+    props.filterFormItemKeys.forEach(function (item) {
+      values[item] = cacheParams[item];
+    });
+    return values;
   });
   var onOpenColumnFoldModal = hooks.useCallbackRef(function () {
     setColumnFoldOpen(true);
@@ -457,8 +479,11 @@ var EasyTable$1 = /*#__PURE__*/forwardRef(function (props, ref) {
     columnsRef.current = columns;
   };
   var onFormFinish = function onFormFinish() {
-    if (loading) return;
-    var values = form.getFieldsValue();
+    if (loading) {
+      console.log('loading...');
+      return;
+    }
+    var values = getFormFieldsValue(form, props.filterFormItemKeys);
     if (props.onFormFinish) {
       props.onFormFinish(_objectSpread2(_objectSpread2({}, values), getPaginationData(1, cacheParams[fieldNames.pageSize])));
     } else {
@@ -534,6 +559,7 @@ var EasyTable$1 = /*#__PURE__*/forwardRef(function (props, ref) {
       foldKeys: props.foldKeys || [],
       columns: dynamicColumns,
       initialValues: props.initialValues,
+      filterFormItemKeys: props.filterFormItemKeys,
       dynamicColumnsConfig: {
         showFoldKeyList: showFoldKeyList,
         onChangeShowFoldKeyList: onChangeFoldColumnList,
@@ -601,8 +627,10 @@ var EasyTable$1 = /*#__PURE__*/forwardRef(function (props, ref) {
  *```
  */
 var EasyTableFilter = function EasyTableFilter(props) {
+  var _ctx$filterFormItemKe2;
   var screenType = fbaHooks.useResponsivePoint() || 'md';
   var ctx = useContext(EasyTableContext);
+  var inheritForm = Form.useFormInstance();
   var queryButtonProps = props.queryButtonProps,
     resetButtonProps = props.resetButtonProps,
     filterOperate = props.filterOperate,
@@ -635,13 +663,26 @@ var EasyTableFilter = function EasyTableFilter(props) {
     _useState2 = _slicedToArray(_useState, 2),
     openFold = _useState2[0],
     setOpenFold = _useState2[1];
+
+  /** 是否支持回车事件 */
+  var supportEnterEvent = useMemo(function () {
+    var _ctx$filterFormItemKe;
+    if ((_ctx$filterFormItemKe = ctx.filterFormItemKeys) !== null && _ctx$filterFormItemKe !== void 0 && _ctx$filterFormItemKe.length || inheritForm) {
+      return false;
+    }
+    return true;
+  }, [(_ctx$filterFormItemKe2 = ctx.filterFormItemKeys) === null || _ctx$filterFormItemKe2 === void 0 ? void 0 : _ctx$filterFormItemKe2.length, inheritForm]);
   var onReset = hooks.useCallbackRef(function () {
     return new Promise(function ($return, $error) {
+      if (ctx.loading) {
+        console.log('loading...');
+        return $return();
+      }
       filterCache.remove(cacheKey);
       form.resetFields();
       form.setFieldsValue(initialValues);
       if (isUndefined(defaultResetButtonTriggerRequest) || defaultResetButtonTriggerRequest) {
-        return Promise.resolve(form.validateFields()).then(function ($await_2) {
+        return Promise.resolve(form.validateFields(ctx.filterFormItemKeys)).then(function ($await_2) {
           try {
             if (getPaginationStatus()) {
               onRequest(_objectSpread2(_defineProperty(_defineProperty({}, fieldNames.pageNo, 1), fieldNames.pageSize, pageSize), initialValues));
@@ -663,14 +704,32 @@ var EasyTableFilter = function EasyTableFilter(props) {
   var formRowChildren = useMemo(function () {
     var defaultRightList = [!(queryButtonProps !== null && queryButtonProps !== void 0 && queryButtonProps.hidden) ? /*#__PURE__*/jsx(ButtonWrapper, _objectSpread2(_objectSpread2({
       type: "primary",
-      htmlType: "submit",
+      htmlType: supportEnterEvent ? 'submit' : undefined,
       loadingPosition: "center",
-      loading: ctx.loading
+      loading: ctx.loading,
+      onClick: function onClick() {
+        return new Promise(function ($return, $error) {
+          var _ctx$filterFormItemKe3;
+          // 当前EasyTable嵌套在Form内部时，EasyForm 的 onFinish={onFormFinish}配置将失效
+          if (inheritForm || (_ctx$filterFormItemKe3 = ctx.filterFormItemKeys) !== null && _ctx$filterFormItemKe3 !== void 0 && _ctx$filterFormItemKe3.length) {
+            form.validateFields(ctx.filterFormItemKeys).then(function () {
+              onFormFinish === null || onFormFinish === void 0 || onFormFinish();
+            });
+          }
+          return $return();
+        });
+      }
     }, queryButtonProps), {}, {
+      style: _objectSpread2(_objectSpread2({}, queryButtonProps === null || queryButtonProps === void 0 ? void 0 : queryButtonProps.style), {}, {
+        cursor: ctx.loading ? 'not-allowed' : undefined
+      }),
       children: (queryButtonProps === null || queryButtonProps === void 0 ? void 0 : queryButtonProps.text) || '查询'
     }), "1") : null, !(resetButtonProps !== null && resetButtonProps !== void 0 && resetButtonProps.hidden) ? /*#__PURE__*/jsx(ButtonWrapper, _objectSpread2(_objectSpread2({
       onClick: onReset
     }, resetButtonProps), {}, {
+      style: _objectSpread2(_objectSpread2({}, resetButtonProps === null || resetButtonProps === void 0 ? void 0 : resetButtonProps.style), {}, {
+        cursor: ctx.loading ? 'not-allowed' : undefined
+      }),
       children: (resetButtonProps === null || resetButtonProps === void 0 ? void 0 : resetButtonProps.text) || '重置'
     }), "2") : null].filter(Boolean);
     var customFormOperateCol = filterOperate === null || filterOperate === void 0 ? void 0 : filterOperate(form);
@@ -730,7 +789,7 @@ var EasyTableFilter = function EasyTableFilter(props) {
       leftList: leftList,
       rightList: rightList
     }), 999));
-  }, [childrens, filterOperate, foldKeys, form, onReset, openFold, queryButtonProps, resetButtonProps, rightOperateAreaAppendTypeFt, ctx.loading]);
+  }, [queryButtonProps, supportEnterEvent, ctx.loading, ctx.filterFormItemKeys, resetButtonProps, onReset, filterOperate, form, foldKeys, childrens, inheritForm, onFormFinish, rightOperateAreaAppendTypeFt, openFold]);
   var labelAlign = screenType === 'xs' ? 'left' : (easyFormProps === null || easyFormProps === void 0 ? void 0 : easyFormProps.labelAlign) || 'right';
   return /*#__PURE__*/jsx(BlockLayout, {
     className: classNames('easy-table-filter', filterWrapperClassName),
@@ -738,7 +797,7 @@ var EasyTableFilter = function EasyTableFilter(props) {
     children: /*#__PURE__*/jsx(EasyForm, _objectSpread2(_objectSpread2({
       form: form,
       autoComplete: "off",
-      onFinish: onFormFinish
+      onFinish: supportEnterEvent ? onFormFinish : undefined
       // initialValues={initialValues}
       ,
       className: formClassName,