@teamix/pro 1.2.32 → 1.2.33

package/es/form/typing.d.ts

@@ -88,6 +88,8 @@ export interface QueryFilterProps extends ProFormProps {
     triggerType?: 'keydown' | 'change' | 'submit';
     /** 表单展示形式 */
     mode?: 'inline' | 'panel';
+    /** 面板模式下是否仅展示面板 */
+    purePanel?: boolean;
     /** 面板是否默认展开，仅在 mode='panel' 时生效 */
     expand?: boolean;
     /** 顶部筛选区前缀 */
@@ -112,6 +114,9 @@ export interface QueryFilterProps extends ProFormProps {
 /**
  * 兼容性导出
  */
+/**
+ * @deprecated 将在未来移除该组件，建议使用 QueryFilter 代替
+ */
 export interface IFilterProps extends ProFormProps {
     triggerType?: 'keydown' | 'change' | 'submit';
     onFilter?: (values: any) => void;

package/es/index.d.ts

@@ -24,5 +24,5 @@ export * from './skeleton';
 export * from './table';
 export * from './utils';
 export * from './step';
-declare const version = "1.2.32";
+declare const version = "1.2.33";
 export { version, ProAction, ProCard, ProField, ProForm, ProInfo, ProPageContainer, ProPageHeader, ProSkeleton, ProTable, ProStep, hooks, nocode, templates, utils, };

package/es/index.js

@@ -30,7 +30,7 @@ export * from './table';
 export * from './utils'; // export * from './sidebar';
 
 export * from './step';
-var version = '1.2.32';
+var version = '1.2.33';
 export { version, ProAction, ProCard, ProField, ProForm, ProInfo, // ProLayout,
 ProPageContainer, ProPageHeader, ProSkeleton, ProTable, // ProSidebar,
 ProStep, hooks, nocode, templates, utils };

package/es/info/components/ProInfoItem/index.js

@@ -22,7 +22,8 @@ var ProInfoItem = function ProInfoItem(prop) {
     return /*#__PURE__*/React.createElement("div", {
       className: cls()
     }, /*#__PURE__*/React.createElement(Row, {
-      gutter: 10
+      gutter: 10,
+      className: cls('base-row')
     }, /*#__PURE__*/React.createElement(Col, {
       span: labelCol === null || labelCol === void 0 ? void 0 : labelCol.span,
       className: cls('label')

package/es/info/components/ProInfoItem/index.scss

@@ -22,6 +22,10 @@ $item-padding-bottom: 8px;
     display: flex;
     align-items: center;
   }
+  &-base-row {
+    display: flex;
+    align-items: center;
+  }
 }
 
 .teamix-pro-field-info-form-item-label {

package/es/table/components/Layout/index.js

@@ -56,6 +56,19 @@ var Layout = function Layout(props) {
         context: _objectSpread(_objectSpread({}, defaultContext), mainAction.context)
       })));
     } else return mainAction;
+  }; // 渲染 addonAfter
+
+
+  var renderAddonAfter = function renderAddonAfter() {
+    return /*#__PURE__*/React.createElement("div", {
+      className: cls('addon-after-wrapper')
+    }, extra && !header && /*#__PURE__*/React.createElement(QuickAction, {
+      actionRef: actionRef,
+      quickAction: extra,
+      rowSelection: rowSelection
+    }), /*#__PURE__*/React.createElement(ToolBar, _objectSpread({
+      actionRef: actionRef
+    }, otherProps)));
   }; // 渲染新版 QueryFilter
 
 
@@ -83,13 +96,7 @@ var Layout = function Layout(props) {
           },
           panelContent: dataFilter.content,
           addonBefore: renderMainAction(),
-          addonAfter: /*#__PURE__*/React.createElement(React.Fragment, null, extra && !header && /*#__PURE__*/React.createElement(QuickAction, {
-            actionRef: actionRef,
-            quickAction: extra,
-            rowSelection: rowSelection
-          }), /*#__PURE__*/React.createElement(ToolBar, _objectSpread({
-            actionRef: actionRef
-          }, otherProps)))
+          addonAfter: renderAddonAfter()
         }, dataFilter));
       } else if ((dataFilter === null || dataFilter === void 0 ? void 0 : (_dataFilter$schema2 = dataFilter.schema) === null || _dataFilter$schema2 === void 0 ? void 0 : _dataFilter$schema2.length) >= 0) {
         return /*#__PURE__*/React.createElement(QueryFilter, _objectSpread({
@@ -108,27 +115,18 @@ var Layout = function Layout(props) {
             (dataFilter === null || dataFilter === void 0 ? void 0 : dataFilter.onExpand) && (dataFilter === null || dataFilter === void 0 ? void 0 : dataFilter.onExpand(expand));
           },
           addonBefore: renderMainAction(),
-          addonAfter: /*#__PURE__*/React.createElement(React.Fragment, null, extra && !header && /*#__PURE__*/React.createElement(QuickAction, {
-            actionRef: actionRef,
-            quickAction: extra,
-            rowSelection: rowSelection
-          }), /*#__PURE__*/React.createElement(ToolBar, _objectSpread({
-            actionRef: actionRef
-          }, otherProps)))
+          addonAfter: renderAddonAfter()
         }, dataFilter));
       }
     } else if (mainAction) {
       // 没传 dataFilter 但是传了 mainAction
       return /*#__PURE__*/React.createElement(QueryFilterLayout, {
-        className: "mb8",
         addonBefore: renderMainAction(),
-        addonAfter: /*#__PURE__*/React.createElement(React.Fragment, null, extra && !header && /*#__PURE__*/React.createElement(QuickAction, {
-          actionRef: actionRef,
-          quickAction: extra,
-          rowSelection: rowSelection
-        }), /*#__PURE__*/React.createElement(ToolBar, _objectSpread({
-          actionRef: actionRef
-        }, otherProps)))
+        addonAfter: renderAddonAfter()
+      });
+    } else {
+      return /*#__PURE__*/React.createElement(QueryFilterLayout, {
+        addonAfter: renderAddonAfter()
       });
     }
   }; // 区域组合渲染
@@ -148,11 +146,19 @@ var Layout = function Layout(props) {
         rowSelection: rowSelection
       }))), renderQueryFilter());
     } else if (header && !mainAction) {
+      var _dataFilter$schema3, _dataFilter$schema4;
+
       return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {
         className: cls('wrapper')
       }, /*#__PURE__*/React.createElement("div", {
         className: cls('left')
-      }, header && /*#__PURE__*/React.createElement(Header, _objectSpread({}, header)), renderQueryFilter())));
+      }, header && /*#__PURE__*/React.createElement(Header, _objectSpread({}, header)), (dataFilter === null || dataFilter === void 0 ? void 0 : (_dataFilter$schema3 = dataFilter.schema) === null || _dataFilter$schema3 === void 0 ? void 0 : _dataFilter$schema3.length) && renderQueryFilter()), /*#__PURE__*/React.createElement("div", {
+        className: cls('right')
+      }, extra && /*#__PURE__*/React.createElement(QuickAction, {
+        actionRef: actionRef,
+        quickAction: extra,
+        rowSelection: rowSelection
+      }), !(dataFilter === null || dataFilter === void 0 ? void 0 : (_dataFilter$schema4 = dataFilter.schema) === null || _dataFilter$schema4 === void 0 ? void 0 : _dataFilter$schema4.length) && renderQueryFilter())));
     } else if (!header && mainAction) {
       return /*#__PURE__*/React.createElement(React.Fragment, null, renderQueryFilter());
     } else if (!header && !mainAction) {

package/es/table/components/Layout/index.scss

@@ -37,4 +37,11 @@ $prefix: 'teamix-pro-table-layout';
     padding: 16px;
     background: var(--panel-filter-bg, var(--color-fill1-2));
   }
+  &-main-action {
+    margin-bottom: 8px;
+  }
+  &-addon-after-wrapper {
+    display: flex;
+    align-items: center;
+  }
 }

package/es/table/components/ToolBar/index.scss

@@ -1,6 +1,7 @@
 .teamix-pro-table-toolbar {
   width: 100%;
   text-align: right;
+  margin-bottom: 8px;
 }
 .teamix-pro-table-toolbar-custom {
   display: inline-block;

package/lib/actions/dialog-form.js

@@ -1,7 +1,5 @@
 "use strict";
 
-function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
-
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
@@ -25,7 +23,7 @@ var _dialog = _interopRequireDefault(require("./dialog"));
 var _utils2 = require("./utils");
 
 var _excluded = ["schema"],
-    _excluded2 = ["schema", "useFieldValuesForRequest", "initialValues", "initialRequest", "formProps", "size", "onFinish"];
+    _excluded2 = ["schema", "useFieldValuesForRequest", "initialValues", "initialRequest", "formProps", "size", "onFinish", "beforeRequest"];
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
@@ -33,6 +31,12 @@ function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "functio
 
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 
+function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
+
+function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
+
+function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
+
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
 
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
@@ -157,6 +161,7 @@ function useDialogFormAction(action, context) {
       _action$size = action.size,
       size = _action$size === void 0 ? 'small' : _action$size,
       _onFinish = action.onFinish,
+      propsBeforeRequest = action.beforeRequest,
       others = _objectWithoutProperties(action, _excluded2);
 
   var formRef = /*#__PURE__*/(0, _react.createRef)();
@@ -177,13 +182,55 @@ function useDialogFormAction(action, context) {
       }, dialogFormProps));
     },
     extendParams: useFieldValuesForRequest ? '{{fields}}' : undefined,
-    beforeRequest: function beforeRequest() {
-      return new Promise(function (resolve) {
-        formRef.current.validate().then(function () {
-          resolve({
-            fields: formRef.current.values
-          });
-        }).catch(function () {
+    beforeRequest: function beforeRequest(context) {
+      return new Promise(function (resolve, reject) {
+        formRef.current.validate().then( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee() {
+          var beforeRequestContext, requestContext;
+          return regeneratorRuntime.wrap(function _callee$(_context) {
+            while (1) {
+              switch (_context.prev = _context.next) {
+                case 0:
+                  if (!propsBeforeRequest) {
+                    _context.next = 13;
+                    break;
+                  }
+
+                  _context.prev = 1;
+                  _context.next = 4;
+                  return (0, _utils.resolveMaybePromiseMethod)(propsBeforeRequest, context);
+
+                case 4:
+                  beforeRequestContext = _context.sent;
+                  _context.next = 10;
+                  break;
+
+                case 7:
+                  _context.prev = 7;
+                  _context.t0 = _context["catch"](1);
+                  beforeRequestContext = false;
+
+                case 10:
+                  if (!(beforeRequestContext === false)) {
+                    _context.next = 13;
+                    break;
+                  }
+
+                  reject(false);
+                  return _context.abrupt("return");
+
+                case 13:
+                  requestContext = Object.assign({
+                    fields: formRef.current.values
+                  }, _typeof(beforeRequestContext) === 'object' ? beforeRequestContext : {});
+                  resolve(requestContext);
+
+                case 15:
+                case "end":
+                  return _context.stop();
+              }
+            }
+          }, _callee, null, [[1, 7]]);
+        }))).catch(function () {
           resolve(false);
         });
       });

package/lib/form/Filter/index.d.ts

@@ -1,13 +1,9 @@
 import React from 'react';
-import type { IFilterProps } from '../typing';
+import { QueryFilterLayout } from './Layout';
+import type { QueryFilterProps } from '../typing';
 import './index.scss';
 /**
- * 简单筛选
+ * 查询筛选
  */
-declare const SimpleFilter: React.FC<IFilterProps>;
-/**
- * 高级筛选
- */
-declare const AdvancedFilter: React.FC<IFilterProps>;
-export { AdvancedFilter, SimpleFilter };
-export default AdvancedFilter;
+declare const QueryFilter: React.FC<QueryFilterProps>;
+export { QueryFilter, QueryFilterLayout };