@teamix/pro 1.2.24 → 1.2.26

package/lib/table/typing.d.ts

@@ -3,7 +3,7 @@
  */
 import { ColumnProps, TableProps } from '@alicloudfe/components/types/table';
 import { ProFieldType, ProFieldRenderProps, ProFieldDataSourceItem } from '../field';
-import { QueryFilterProps } from '../form';
+import { IFilterProps } from '../form';
 import { ProActionGroupProps, ProActionButtonProps } from '../actions';
 import { PaginationProps } from '@alicloudfe/components/types/pagination';
 import { HeaderProps as ProTableHeaderProps } from '@teamix/utils';
@@ -125,6 +125,10 @@ export declare type ProTableProps = {
         data: any[];
         total?: number;
     }>;
+    /** 默认漏斗过滤条件 */
+    defaultFilterParams?: {
+        [key: string]: any[] | any;
+    };
 } & Omit<TableProps, 'columns'> & ProTableTopAreaProps;
 export declare type rowSelectionType = {
     getProps?: (record: any, index: number) => any;
@@ -215,12 +219,17 @@ export declare type ProTableActionTypeState = {
     [key: string]: any;
 };
 export declare type ProTableDataFilterProps = {
+    /** 展示形式 */
+    mode?: 'inline' | 'panel';
+    /** mode='panel' 时是否默认展开 */
+    expand?: boolean;
+    /** 搜索时是否传入值为undefined的参数，默认不传 */
     searchUndefined?: boolean;
     /** 搜索时是否传入值为空字符串的参数，默认不传 */
     searchEmptyString?: boolean;
     /** 自定义内容 */
     content?: React.ReactNode;
-} & QueryFilterProps;
+} & IFilterProps;
 export declare type dataFilterProps = ProTableDataFilterProps;
 export declare type ProTableTopAreaProps = {
     /** 标题区 */

package/lib/table/utils/index.d.ts

@@ -1,5 +1,6 @@
 /// <reference types="react" />
 import { ProTableActionType } from '../typing';
+import { ProTableProps, ProTableColumnProps } from '..';
 export declare function initActionRef(): void;
 /** table 组件内监听 不对外暴露 */
 export declare function on(fun: any, key: string): void;
@@ -9,3 +10,9 @@ export declare function off(key: string): void;
 export declare function emit(key: string, ...args: any): void;
 export declare function useActionType<T>(ref: React.MutableRefObject<ProTableActionType | undefined>, action: ProTableActionType): void;
 export declare function cloneDeep<T>(obj: T): T;
+/**
+ * 处理默认过滤参数
+ * @param columns
+ * @param ref
+ */
+export declare function processDefaultFilter(columns: ProTableColumnProps[], ref: React.MutableRefObject<ProTableActionType | undefined>, defaultFilterParams: ProTableProps['defaultFilterParams']): void;

package/lib/table/utils/index.js

@@ -8,6 +8,7 @@ exports.emit = emit;
 exports.initActionRef = initActionRef;
 exports.off = off;
 exports.on = on;
+exports.processDefaultFilter = processDefaultFilter;
 exports.useActionType = useActionType;
 
 var _lodash = _interopRequireDefault(require("lodash.clonedeep"));
@@ -193,4 +194,41 @@ function useActionType(ref, action) {
 
 function cloneDeep(obj) {
   return (0, _lodash.default)(obj);
+}
+/**
+ * 处理默认过滤参数
+ * @param columns
+ * @param ref
+ */
+
+
+function processDefaultFilter(columns, ref, defaultFilterParams) {
+  columns.forEach(function (column) {
+    var _column$dataIndex$toS, _column$dataIndex;
+
+    var defaultRules = defaultFilterParams === null || defaultFilterParams === void 0 ? void 0 : defaultFilterParams[(_column$dataIndex$toS = column === null || column === void 0 ? void 0 : (_column$dataIndex = column.dataIndex) === null || _column$dataIndex === void 0 ? void 0 : _column$dataIndex.toString()) !== null && _column$dataIndex$toS !== void 0 ? _column$dataIndex$toS : ''];
+
+    if (defaultRules) {
+      var _ref$current$getState, _ref$current, _ref$current$getState2, _ref$current$getState3, _ref$current2, _ref$current2$setFilt;
+
+      var params = '';
+      var rules = [];
+
+      if (Array.isArray(defaultRules)) {
+        params = defaultRules.join(',');
+        rules = defaultRules;
+      } else {
+        params = defaultRules;
+        rules = [defaultRules];
+      } // 需要带上其他所有的信息
+
+
+      var otherRules = (_ref$current$getState = (_ref$current = ref.current) === null || _ref$current === void 0 ? void 0 : (_ref$current$getState2 = _ref$current.getState) === null || _ref$current$getState2 === void 0 ? void 0 : (_ref$current$getState3 = _ref$current$getState2.call(_ref$current)) === null || _ref$current$getState3 === void 0 ? void 0 : _ref$current$getState3.filterRules) !== null && _ref$current$getState !== void 0 ? _ref$current$getState : {}; // 再设置所有的列筛选状态
+
+      (_ref$current2 = ref.current) === null || _ref$current2 === void 0 ? void 0 : (_ref$current2$setFilt = _ref$current2.setFilterRules) === null || _ref$current2$setFilt === void 0 ? void 0 : _ref$current2$setFilt.call(_ref$current2, _objectSpread(_objectSpread({}, otherRules), {}, _defineProperty({}, column.dataIndex, {
+        rules: rules,
+        params: params
+      })));
+    }
+  });
 }

package/lib/utils/index.d.ts

@@ -1,2 +1,3 @@
 import * as utils from '@teamix/utils';
+export * from '@teamix/utils';
 export default utils;

package/lib/utils/index.js

@@ -5,10 +5,23 @@ function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" =
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
+var _exportNames = {};
 exports.default = void 0;
 
 var utils = _interopRequireWildcard(require("@teamix/utils"));
 
+Object.keys(utils).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
+  if (key in exports && exports[key] === utils[key]) return;
+  Object.defineProperty(exports, key, {
+    enumerable: true,
+    get: function get() {
+      return utils[key];
+    }
+  });
+});
+
 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; }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@teamix/pro",
-  "version": "1.2.24",
+  "version": "1.2.26",
   "description": "TeamixPro大包",
   "repository": "http://gitlab.alibaba-inc.com/teamix/pro",
   "author": "Velociraptor(迅猛龙)",