@teamix/pro 1.2.19 → 1.2.20

package/es/table/components/Pagination/index.d.ts

@@ -0,0 +1,3 @@
+import { PaginationProps } from '@alicloudfe/components/types/pagination';
+declare const _default: (props: PaginationProps) => JSX.Element;
+export default _default;

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

@@ -0,0 +1,82 @@
+var _excluded = ["className", "onChange", "total", "totalRender", "pageSize", "current", "pageSizeList", "pageSizeSelector", "type", "onPageSizeChange"];
+
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+
+function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+
+function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
+
+function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
+
+// 自适应宽度的翻页器
+import React from 'react';
+import { Pagination } from '@alicloudfe/components';
+import { useResponsiveProps } from '@teamix/hooks';
+export default (function (props) {
+  var className = props.className,
+      onChange = props.onChange,
+      total = props.total,
+      totalRender = props.totalRender,
+      pageSize = props.pageSize,
+      current = props.current,
+      pageSizeList = props.pageSizeList,
+      pageSizeSelector = props.pageSizeSelector,
+      type = props.type,
+      onPageSizeChange = props.onPageSizeChange,
+      otherProps = _objectWithoutProperties(props, _excluded);
+
+  var _useResponsiveProps = useResponsiveProps([480, 580, 680], ['mini', 'small', 'simple', 'normal']),
+      responsiveProps = _useResponsiveProps.responsiveProps,
+      paginationWrapperRef = _useResponsiveProps.ref;
+
+  var commonPaginationProps = {
+    className: className,
+    onChange: onChange,
+    total: total,
+    pageSize: pageSize,
+    current: current,
+    shape: 'arrow-only',
+    pageSizeList: pageSizeList,
+    pageSizeSelector: pageSizeSelector,
+    pageSizePosition: 'end',
+    onPageSizeChange: onPageSizeChange
+  };
+
+  var renderPagination = function renderPagination() {
+    switch (responsiveProps) {
+      case 'normal':
+        return /*#__PURE__*/React.createElement(Pagination, _objectSpread(_objectSpread({}, commonPaginationProps), otherProps));
+
+      case 'simple':
+        return /*#__PURE__*/React.createElement(Pagination, _objectSpread(_objectSpread({}, commonPaginationProps), {}, {
+          pageShowCount: 3
+        }, otherProps));
+
+      case 'small':
+        return /*#__PURE__*/React.createElement(Pagination, _objectSpread(_objectSpread({}, commonPaginationProps), {}, {
+          pageSizeSelector: false,
+          type: "simple"
+        }, otherProps));
+
+      case 'mini':
+        return /*#__PURE__*/React.createElement(Pagination, _objectSpread(_objectSpread({}, commonPaginationProps), {}, {
+          pageSizeSelector: false,
+          type: "mini"
+        }, otherProps));
+
+      default:
+        return /*#__PURE__*/React.createElement(Pagination, _objectSpread(_objectSpread({}, commonPaginationProps), otherProps));
+    }
+  };
+
+  return (
+    /*#__PURE__*/
+    // 用于获取翻页器响应式 ref
+    React.createElement("div", {
+      ref: paginationWrapperRef,
+      className: "pagination-wrapper"
+    }, renderPagination())
+  );
+});

package/es/table/components/ToolBar/FilterColumnIcon.js

@@ -54,7 +54,8 @@ var processColumns = function processColumns(columns) {
 var FilterColumnIcon = function FilterColumnIcon(props) {
   var _props$columns = props.columns,
       columns = _props$columns === void 0 ? [] : _props$columns,
-      actionRef = props.actionRef;
+      actionRef = props.actionRef,
+      filterColumnType = props.filterColumnType;
 
   var _useState = useState(true),
       _useState2 = _slicedToArray(_useState, 2),
@@ -241,7 +242,9 @@ var FilterColumnIcon = function FilterColumnIcon(props) {
       align: "tr br"
     }, /*#__PURE__*/React.createElement("div", {
       className: cls()
-    }, /*#__PURE__*/React.createElement(Menu, null, /*#__PURE__*/React.createElement(CheckboxItem, {
+    }, /*#__PURE__*/React.createElement(Menu, {
+      className: cls('all-select')
+    }, /*#__PURE__*/React.createElement(CheckboxItem, {
       indeterminate: indeterminate,
       checked: allVisible,
       onChange: onChangeAllColumns
@@ -254,7 +257,9 @@ var FilterColumnIcon = function FilterColumnIcon(props) {
       type: "primary"
     }, getMessage('reset'))), /*#__PURE__*/React.createElement(Menu.Divider, {
       key: "divider"
-    }), newColumns.map(function (_ref9, index) {
+    })), /*#__PURE__*/React.createElement(Menu, {
+      className: cls('checkbox-group')
+    }, newColumns.map(function (_ref9, index) {
       var _newColumns$find;
 
       var dataIndex = _ref9.dataIndex,
@@ -349,7 +354,15 @@ var FilterColumnIcon = function FilterColumnIcon(props) {
     }))));
   };
 
-  if (newColumns.length > 10) {
+  if (filterColumnType === 'dialog') {
+    return renderDialog();
+  }
+
+  if (filterColumnType === 'dropdown') {
+    return renderDropdown();
+  }
+
+  if (newColumns.length >= 20) {
     return renderDialog();
   }
 

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

@@ -18,8 +18,6 @@
 // FilterColumn
 .teamix-pro-table-toolbar-filter-column {
   min-width: 180px;
-  max-height: 350px;
-  overflow: auto;
   box-shadow: var(--popup-local-shadow, 0px 6px 24px 0px rgba(0, 0, 0, 0.1));
   background: var(--menu-background);
   &-reset {
@@ -76,6 +74,14 @@
     align-items: center;
   }
 }
+.teamix-pro-table-toolbar-filter-column-all-select.teamix-pro-table-toolbar-filter-column-all-select {
+  padding-bottom: 0;
+}
+.teamix-pro-table-toolbar-filter-column-checkbox-group.teamix-pro-table-toolbar-filter-column-checkbox-group {
+  padding-top: 0;
+  max-height: 310px;
+  overflow: auto;
+}
 
 // fullscreen
 .teamix-pro-table-full-screen {

package/es/table/index.js

@@ -1,4 +1,4 @@
-var _excluded = ["header", "className", "tableClassName", "mainAction", "extra", "dataFilter", "toolBar", "columns", "useRowSelection", "rowSelection", "onChangeRowSelection", "getRowSelection", "primaryKey", "footerAction", "footer", "url", "pageKey", "pageSizeKey", "method", "params", "formatSort", "formatParams", "formatResult", "requestWhenMount", "showPagination", "pageSizeList", "showSkeleton", "skeletonSize", "actionRef", "dataSource", "filterDebounce", "footerSuction", "autoRefresh", "customRequest"];
+var _excluded = ["header", "className", "tableClassName", "mainAction", "extra", "dataFilter", "toolBar", "columns", "useRowSelection", "rowSelection", "onChangeRowSelection", "getRowSelection", "primaryKey", "footerAction", "footer", "url", "pageKey", "pageSizeKey", "method", "params", "formatSort", "formatParams", "formatResult", "requestWhenMount", "showPagination", "pageSizeList", "showSkeleton", "skeletonSize", "actionRef", "dataSource", "filterDebounce", "footerSuction", "autoRefresh", "customRequest", "filterColumnType"];
 
 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); }
 
@@ -33,7 +33,8 @@ function _objectWithoutProperties(source, excluded) { if (source == null) return
 function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
 
 import React, { useState, useEffect, useRef, useMemo } from 'react';
-import { Table, Pagination, Checkbox } from '@alicloudfe/components';
+import { Table, Checkbox, Pagination } from '@alicloudfe/components'; // import Pagination from './components/Pagination';
+
 import genProColumnToColumn from './utils/genProColumnToColumn';
 import { baseClass, useRequest, request as utilResquest, getDeepValue, getMessage, pickProps } from '@teamix/utils';
 import { ProSkeletonRaw as Skeleton } from '../skeleton';
@@ -64,25 +65,27 @@ var processColumns = function processColumns(columns, initialColumns) {
     return item.columnFilters !== false;
   }); // 处理只剩一列批量选择的情况下宽度错乱问题
 
-  if ((filterColumns === null || filterColumns === void 0 ? void 0 : filterColumns.length) && (filterColumns === null || filterColumns === void 0 ? void 0 : filterColumns.length) === 1) {
-    var _filterColumns$, _filterColumns$2;
+  if (filterColumns === null || filterColumns === void 0 ? void 0 : filterColumns.length) {
+    if ((filterColumns === null || filterColumns === void 0 ? void 0 : filterColumns.length) === 1) {
+      var _filterColumns$, _filterColumns$2;
 
-    if ((_filterColumns$ = filterColumns[0]) === null || _filterColumns$ === void 0 ? void 0 : _filterColumns$.width) {
-      delete filterColumns[0].width;
-    }
+      if ((_filterColumns$ = filterColumns[0]) === null || _filterColumns$ === void 0 ? void 0 : _filterColumns$.width) {
+        delete filterColumns[0].width;
+      }
 
-    if ((_filterColumns$2 = filterColumns[0]) === null || _filterColumns$2 === void 0 ? void 0 : _filterColumns$2.lock) {
-      filterColumns[0].lock = false;
-    }
-  } else {
-    var _initialColumns$, _initialColumns$2;
+      if ((_filterColumns$2 = filterColumns[0]) === null || _filterColumns$2 === void 0 ? void 0 : _filterColumns$2.lock) {
+        filterColumns[0].lock = false;
+      }
+    } else {
+      var _initialColumns$, _initialColumns$2;
 
-    if ((_initialColumns$ = initialColumns[0]) === null || _initialColumns$ === void 0 ? void 0 : _initialColumns$.width) {
-      filterColumns[0].width = initialColumns[0].width;
-    }
+      if ((_initialColumns$ = initialColumns[0]) === null || _initialColumns$ === void 0 ? void 0 : _initialColumns$.width) {
+        filterColumns[0].width = initialColumns[0].width;
+      }
 
-    if ((_initialColumns$2 = initialColumns[0]) === null || _initialColumns$2 === void 0 ? void 0 : _initialColumns$2.lock) {
-      filterColumns[0].lock = initialColumns[0].lock;
+      if ((_initialColumns$2 = initialColumns[0]) === null || _initialColumns$2 === void 0 ? void 0 : _initialColumns$2.lock) {
+        filterColumns[0].lock = initialColumns[0].lock;
+      }
     }
   }
 
@@ -156,6 +159,8 @@ var ProTable = function ProTable(props) {
     return false;
   } : _props$autoRefresh,
       customRequest = props.customRequest,
+      _props$filterColumnTy = props.filterColumnType,
+      filterColumnType = _props$filterColumnTy === void 0 ? 'auto' : _props$filterColumnTy,
       otherProps = _objectWithoutProperties(props, _excluded);
 
   var targetPageKey = pageKey || globalPageKey;
@@ -688,7 +693,8 @@ var ProTable = function ProTable(props) {
         columns: propsColumns,
         dataFilter: dataFilter,
         dataFilterForm: dataFilterForm,
-        rowSelection: rowSelection
+        rowSelection: rowSelection,
+        filterColumnType: filterColumnType
       }), /*#__PURE__*/React.createElement(Table.StickyLock, _objectSpread({
         hasBorder: false,
         dataSource: showSkeleton ? skeletonDataSource : data || props.dataSource,
@@ -800,6 +806,8 @@ var ProTable = function ProTable(props) {
           return onChangePagination(number);
         },
         total: total,
+        shape: "arrow-only",
+        pageSizePosition: "end",
         totalRender: function totalRender(total) {
           return getMessage('total', {
             total: total
@@ -807,10 +815,8 @@ var ProTable = function ProTable(props) {
         },
         pageSize: pageSize,
         current: currentPage,
-        shape: "arrow-only",
         pageSizeList: pageSizeList,
         pageSizeSelector: total > (props.pageSize || 10) * 2 ? 'dropdown' : false,
-        pageSizePosition: "end",
         type: total / pageSize <= 2 ? 'simple' : 'normal',
         onPageSizeChange: function onPageSizeChange(number) {
           return onChangePaginationSize(number);

package/es/table/index.scss

@@ -32,12 +32,18 @@ $fullscreenPadding: 24px;
   }
   &-footer-left-wrapper {
     display: flex;
-    flex: 1;
+    flex-shrink: 0;
     align-items: center;
   }
   &-footer-right-wrapper {
     display: flex;
     justify-content: flex-end;
+    width: 100%;
+  }
+  .pagination-wrapper {
+    display: flex;
+    justify-content: flex-end;
+    width: 100%;
   }
   &-footer-action {
     margin-left: 16px;

package/es/table/typing.d.ts

@@ -235,6 +235,8 @@ export declare type ProTableTopAreaProps = {
     dataFilter?: ProTableDataFilterProps;
     /** 数据过滤区 form 表单模型 */
     dataFilterForm?: FormType;
+    /** 排序、筛选列展示状态 */
+    filterColumnType?: 'dialog' | 'dropdown' | 'auto';
 };
 /** 单个工具栏 */
 export declare type ProTableToolBarItem = React.ReactNode | 'refresh' | 'density' | 'filterColumn' | 'fullscreen';

package/lib/actions/dialog.js

@@ -187,15 +187,12 @@ function useDialogAction(action, actionContext) {
             while (1) {
               switch (_context.prev = _context.next) {
                 case 0:
-                  if (url) {
+                  if (!link) {
                     _context.next = 5;
                     break;
                   }
 
-                  if (link) {
-                    (0, _utils.goToLink)(link, history);
-                  }
-
+                  (0, _utils.goToLink)(link, history);
                   onFinish && onFinish();
                   resolve(true);
                   return _context.abrupt("return");

package/lib/form/Components/LightFilter/index.js

@@ -117,7 +117,7 @@ var LightFilter = (0, _react2.observer)(function (props) {
   });
   var onSelectChange = (0, _react.useCallback)(function (value) {
     setActive(value);
-    onFilterChange && onFilterChange(currentSchema);
+    onFilterChange && onFilterChange(value);
   }, [onFilterChange]);
   return /*#__PURE__*/_react.default.createElement("span", {
     className: (0, _classnames.default)(prefixCls, "".concat(defaultCls).concat(size), isInputCategory(currentSchema) ? "".concat(prefixCls, "-input-category") : '')

package/lib/form/Components/LightFilter/index.scss

@@ -27,7 +27,7 @@ $light-filter: #{teamix-pro-form}-light-filter;
         border: 0;
         box-shadow: none;
         .#{$css-prefix}input-text-field {
-          padding-right: 0;
+          padding-right: 4px;
         }
       }
       .#{$css-prefix}input {

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

@@ -0,0 +1,7 @@
+import React from 'react';
+import type { FilterProps } from '../typing';
+/**
+ * 高级筛选
+ */
+declare const AdvancedFilter: React.FC<FilterProps>;
+export default AdvancedFilter;

package/lib/form/Filter/AdvancedFilter.js

@@ -0,0 +1,133 @@
+"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
+});
+exports.default = void 0;
+
+var _react = _interopRequireWildcard(require("react"));
+
+var _classnames = _interopRequireDefault(require("classnames"));
+
+var _utils = require("@teamix/utils");
+
+var _ProForm = _interopRequireDefault(require("../ProForm"));
+
+var _utils2 = require("../utils");
+
+var _excluded = ["schema", "onSubmit", "onReset", "onResetClick", "layout", "labelAlign", "wrapperAlign", "labelCol", "wrapperCol"];
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
+
+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 ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+
+function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+
+function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
+
+function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+
+function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
+
+function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
+
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
+
+function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
+
+function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
+
+/**
+ * 高级筛选
+ */
+var AdvancedFilter = /*#__PURE__*/(0, _react.memo)(function (props) {
+  var schema = props.schema,
+      onSubmit = props.onSubmit,
+      onReset = props.onReset,
+      onResetClick = props.onResetClick,
+      layout = props.layout,
+      labelAlign = props.labelAlign,
+      wrapperAlign = props.wrapperAlign,
+      labelCol = props.labelCol,
+      wrapperCol = props.wrapperCol,
+      otherProps = _objectWithoutProperties(props, _excluded);
+
+  var prefixCls = (0, _utils.usePrefixCls)('', {
+    prefix: 'teamix-pro-form-query-filter-advanced'
+  });
+  var gridSchema = (0, _react.useMemo)(function () {
+    return [{
+      name: 'FormGrid',
+      component: 'FormGrid',
+      props: {
+        breakpoints: [480, 720, 990, 1200, Infinity],
+        maxColumns: [1, 2, 3, 3, 4],
+        columnGap: 16,
+        rowGap: 12
+      },
+      children: [].concat(_toConsumableArray(schema), [{
+        component: 'FormGrid.GridColumn',
+        props: {
+          gridSpan: -1
+        },
+        children: [{
+          component: 'FormButtonGroup',
+          props: {
+            align: 'right'
+          },
+          children: [{
+            component: 'Reset',
+            props: {
+              onResetValidateSuccess: onReset,
+              onClick: onResetClick,
+              children: (0, _utils.getMessage)('reset')
+            }
+          }, {
+            component: 'Submit',
+            props: {
+              style: {
+                marginRight: -8
+              },
+              children: (0, _utils.getMessage)('search')
+            }
+          }]
+        }]
+      }])
+    }];
+  }, [schema, onReset, onResetClick]);
+  var getTeamixLayout = (0, _react.useMemo)(function () {
+    return {
+      breakpoints: [990],
+      layout: (0, _utils2.mergeArrayValue)(['vertical'], layout),
+      labelAlign: (0, _utils2.mergeArrayValue)(['left'], labelAlign),
+      wrapperAlign: (0, _utils2.mergeArrayValue)(['left'], wrapperAlign),
+      labelCol: (0, _utils2.mergeArrayValue)([24], labelCol),
+      wrapperCol: (0, _utils2.mergeArrayValue)([24], wrapperCol)
+    };
+  }, [layout, labelAlign, wrapperAlign, labelCol, wrapperCol]);
+  return /*#__PURE__*/_react.default.createElement(_ProForm.default, _objectSpread(_objectSpread(_objectSpread({
+    className: (0, _classnames.default)(prefixCls, props.className),
+    schema: gridSchema,
+    feedbackLayout: "popover"
+  }, otherProps), getTeamixLayout), {}, {
+    onSubmit: onSubmit
+  }));
+});
+AdvancedFilter.defaultProps = {
+  layout: 'horizontal',
+  labelAlign: 'right',
+  labelCol: 6,
+  wrapperCol: 18
+};
+var _default = AdvancedFilter;
+exports.default = _default;

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

@@ -0,0 +1,7 @@
+import React from 'react';
+import type { FilterProps } from '../typing';
+/**
+ * 轻量筛选
+ */
+declare const LightFilter: React.FC<FilterProps>;
+export default LightFilter;

package/lib/form/Filter/LightFilter.js

@@ -0,0 +1,99 @@
+"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
+});
+exports.default = void 0;
+
+var _react = _interopRequireWildcard(require("react"));
+
+var _classnames = _interopRequireDefault(require("classnames"));
+
+var _reactive = require("@formily/reactive");
+
+var _utils = require("@teamix/utils");
+
+var _ProForm = _interopRequireDefault(require("../ProForm"));
+
+var _excluded = ["form", "schema", "onSubmit", "onChange", "defaultFilterValue"];
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
+
+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 ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+
+function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+
+function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
+
+function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
+
+/**
+ * 轻量筛选
+ */
+var LightFilter = /*#__PURE__*/(0, _react.memo)(function (props) {
+  var _schema$;
+
+  var form = props.form,
+      schema = props.schema,
+      onSubmit = props.onSubmit,
+      onChange = props.onChange,
+      defaultFilterValue = props.defaultFilterValue,
+      otherProps = _objectWithoutProperties(props, _excluded);
+
+  var filterValue = (0, _react.useRef)(defaultFilterValue || ((_schema$ = schema[0]) === null || _schema$ === void 0 ? void 0 : _schema$.name));
+  var prefixCls = (0, _utils.usePrefixCls)('', {
+    prefix: 'teamix-pro-form-query-filter-light'
+  }); // input类组件的按钮
+
+  var onBtnClick = (0, _react.useCallback)(function () {
+    onChange && onChange((0, _reactive.toJS)(form.values));
+  }, [form]); // 筛选提交切换
+
+  var onFilterChange = (0, _react.useCallback)(function (value) {
+    filterValue.current = value;
+  }, [form]); // onChange
+
+  var onCurrentChange = (0, _react.useCallback)(function (values) {
+    onChange && onChange(_defineProperty({}, filterValue.current, values[filterValue.current]));
+  }, [onChange, filterValue.current]);
+  var LightSchema = (0, _react.useMemo)(function () {
+    return [{
+      component: 'LightFilter',
+      props: {
+        defaultFilterValue: defaultFilterValue,
+        onFilterChange: onFilterChange,
+        buttonProps: {
+          onClick: onBtnClick
+        }
+      },
+      children: schema
+    }, {
+      component: 'Submit',
+      props: {
+        style: {
+          display: 'none'
+        }
+      }
+    }];
+  }, [schema, onBtnClick, onFilterChange, defaultFilterValue]);
+  return /*#__PURE__*/_react.default.createElement(_ProForm.default, _objectSpread(_objectSpread({}, otherProps), {}, {
+    form: form,
+    className: (0, _classnames.default)(prefixCls, props.className),
+    schema: LightSchema,
+    feedbackLayout: "none",
+    breakpoints: [],
+    bordered: false,
+    onSubmit: onSubmit,
+    onChange: onCurrentChange
+  }));
+});
+var _default = LightFilter;
+exports.default = _default;

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

@@ -0,0 +1,7 @@
+import React from 'react';
+import type { FilterProps } from '../typing';
+/**
+ * 简单筛选
+ */
+declare const SimpleFilter: React.FC<FilterProps>;
+export default SimpleFilter;