@teamix/pro 1.3.2 → 1.3.5

package/es/sidebar/typing.d.ts

@@ -1,38 +1,66 @@
 /// <reference types="react" />
 import { MessageProps } from '@alifd/next/types/message';
 import { TreeProps } from '@alifd/next/types/tree';
-import { ProCardProps, ProFieldProps } from '..';
+import { CommonRequestConfig, ProTagItem } from '@teamix/utils';
+import { ProActionConfig, ProCardProps, ProFieldProps, ProFieldRenderProps, ProFieldType } from '..';
 /** ProSidebar 定义 */
 export declare type ProSidebarProps = {
     /** 数据源 */
     dataSource?: ProSidebarDataSource;
+    /** 点击的节点 */
+    selectedKeys?: TreeProps['selectedKeys'];
+    /** 选中的节点 */
+    checkedKeys?: TreeProps['checkedKeys'];
     /** 节点点击回调 */
     onSelect?: TreeProps['onSelect'];
+    /** 节点选中回调 */
+    onCheck?: TreeProps['onCheck'];
     /** 树配置 */
     treeProps?: TreeProps;
     /** 卡片配置 */
     cardProps?: ProCardProps;
-} & Omit<React.HTMLAttributes<HTMLElement>, 'onSelect'> & Omit<ProSidebarContainerProps, 'onSelect'>;
+    /** 显示数量 */
+    showExtraNumber?: boolean;
+    /** actionRef */
+    actionRef?: React.MutableRefObject<ProSidebarActionType | undefined>;
+    /** 渲染树节点之前的回调 dataSource 变动时调用 */
+    beforeRenderNode?: (item: ProSidebarDataSourceItem, level: number, dataSource: ProSidebarDataSource) => ProSidebarDataSourceItem;
+    /** 监听渲染树节点之前的事件 当节点状态改变、dataSource 变动时调用 */
+    onBeforeRenderNodeEvent?: (item: ProSidebarDataSourceItem, checkedKeys: TreeProps['checkedKeys'], selectedKeys: TreeProps['selectedKeys'], dataSource: ProSidebarDataSource) => ProSidebarDataSourceItem;
+} & Omit<React.HTMLAttributes<HTMLElement>, 'onSelect'> & Omit<ProSidebarContainerProps, 'onSelect'> & ProSidebarRequestProps;
 /** 数据源定义 */
 export declare type ProSidebarDataSource = ProSidebarDataSourceItem[];
 export declare type ProSidebarDataSourceItem = {
     /** 展示值 */
-    label?: React.ReactNode;
+    label?: string;
     /** 绑定值 */
     value?: any;
-    /** icon */
-    icon?: React.ReactNode;
     /** 标签 */
-    tag?: React.ReactNode;
+    tag?: ProTagItem;
     /** 右侧操作、状态区 */
-    extra?: React.ReactNode;
+    extra?: ProSidebarExtraProps;
     /** 子项 */
     children?: ProSidebarDataSourceItem[];
+    /** label 类型 对应 ProFieldType */
+    valueType?: ProFieldType;
+    /** 渲染 label 的 render 对应 ProFieldRenderProps */
+    render?: ProFieldRenderProps;
+    /** ProField 的其他配置项 */
+    fieldProps?: ProFieldProps;
 };
-/** tag 定义 */
-export declare type ProSidebarDataSourceTag = {
-    /** 显示值 */
-    value: string;
+/** 单项 extra 配置项 */
+export declare type ProSidebarExtraProps = React.ReactNode | (ProSidebarExtraPropsItem | React.ReactNode)[];
+export declare type ProSidebarExtraPropsItem = {
+    /** 相应功能项 */
+    type: 'action' | 'iconSwitch' | 'iconAction' | 'custom';
+    /** action 相应配置 */
+    action: ProActionConfig;
+    /** 相应配置 */
+    props: any;
+    /** 是否 hover 显示 */
+    hover?: boolean;
+    /** 自定义渲染 仅在 custom 有效 */
+    trigger?: any;
 };
 /** sidebar 容器定义 */
 export declare type ProSidebarContainerProps = {
@@ -53,12 +81,54 @@ export declare type ProSidebarContainerProps = {
     customMessage?: React.ReactNode;
     /** 消息通知区域的其他参数 */
     messageProps?: MessageProps;
+    /** 滚动区域 仅在使用 ProPageContainer 时有效 */
+    scrollArea?: 'all' | 'tree';
+    /** 是否显示展开全部 */
+    showExpandAll?: boolean;
+    /** 是否显示展开层级 */
+    showExpandLevel?: boolean;
+    /** 展开全部变化回调 */
+    onExpandAllChange?: (state: boolean) => void;
+    /** 展开层级变化回调 */
+    onExpandLevelChange?: (state: number) => void;
+    /** 展开层级 层级 */
+    expandLevel?: number;
+    /** 列表 or tree */
+    isTree?: boolean;
 } & ProCardProps;
 /** ProSidebarTree 内容定义 */
 export declare type ProSidebarTreeProps = {
     dataSource?: ProSidebarDataSource;
     /** 搜索过滤关键词 */
     searchKey?: string;
-    /** 节点点击回调 */
-    onChange?: ProSidebarProps['onChange'];
+    /** 显示数量 */
+    showExtraNumber?: ProSidebarProps['showExtraNumber'];
+    /** actionRef */
+    actionRef: React.MutableRefObject<ProSidebarActionType | undefined>;
+    /** 渲染树节点之前的回调 */
+    onBeforeRenderNodeEvent?: ProSidebarProps['onBeforeRenderNodeEvent'];
+    /** 渲染树节点之前的回调 dataSource 变动时调用 */
+    beforeRenderNode?: ProSidebarProps['beforeRenderNode'];
+    /** 展开全部 */
+    expandAll?: boolean;
+    /** 展开节点层级 */
+    expandLevel?: number;
+    /** dataSource 变化的回调 */
+    onDataSourceChange?: (dataSource: ProSidebarDataSource) => void;
 } & TreeProps;
+/** ProSidebarTreeNode 内容定义 */
+export declare type ProSidebarTreeNodeProps = {
+    dataSource?: ProSidebarDataSource;
+};
+/** ProSidebar ActionRef 定义 */
+export declare type ProSidebarActionType = {
+    /** 设置树节点 */
+    setTreeNode?: (treeNode: ProSidebarDataSourceItem) => void;
+    /** 刷新 */
+    refresh?: () => void;
+};
+/** ProSidebar 请求相关定义 */
+export declare type ProSidebarRequestProps = {
+    /** 请求地址 */
+    url?: string;
+} & Omit<CommonRequestConfig, 'url'>;

package/es/sidebar/utils/action-ref.d.ts

@@ -0,0 +1,3 @@
+import React from 'react';
+import { ProSidebarActionType } from '../typing';
+export declare function useActionType<T>(ref: React.MutableRefObject<ProSidebarActionType | undefined>, action: ProSidebarActionType): void;

package/es/sidebar/utils/action-ref.js

@@ -0,0 +1,15 @@
+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; }
+
+export function useActionType(ref, action) {
+  var _ref$current;
+
+  var oldActions = (_ref$current = ref.current) !== null && _ref$current !== void 0 ? _ref$current : {}; // 合并自定义事件
+
+  var userAction = _objectSpread(_objectSpread({}, oldActions), action);
+
+  ref.current = userAction;
+}

package/es/sidebar/utils/index.d.ts

@@ -0,0 +1,71 @@
+/**
+ * 深度遍历节点
+ * @param data 数据
+ * @param func 处理方法
+ * @param aliasMap 标识
+ * @param level 深度
+ */
+export declare function loop<T>(data: T[], func: any, aliasMap?: {
+    children: string;
+}, level?: number): void;
+/**
+ * 深度遍历并查找节点（只保留二级路径）
+ * @param data 数据
+ * @param predicate 条件
+ * @param aliasMap 标识
+ * @returns
+ */
+export declare function findNodeWithoutPath<T>(data: any[], predicate: (node: T) => boolean, aliasMap?: {
+    children: string;
+}): any;
+/**
+ * 深度遍历并查找节点（保留全部路径）
+ * @param data 数据
+ * @param predicate 条件
+ * @param aliasMap 标识
+ * @returns
+ */
+export declare function findNodeWithPath<T>(data: T[], predicate: (node: T) => boolean, aliasMap?: {
+    children: string;
+}): T[];
+/**
+ * 获取树所有节点 key
+ * @param data 数据
+ * @param aliasMap 标识
+ * @returns
+ */
+export declare function getAllNodeKey<T>(data: T[], aliasMap?: {
+    key: string;
+    children: string;
+}): any[];
+/**
+ * 获取当前节点的层级
+ * @param data 数据
+ * @param value 需要获取层级的 key
+ * @param aliasMap 标识
+ * @returns
+ */
+export declare function getTreeNodeLevel(data: any[], value: any, aliasMap?: {
+    key: string;
+    children: string;
+}): number;
+/**
+ * 获取树的层级
+ * @param data 数据
+ * @param aliasMap 标识
+ * @returns
+ */
+export declare function getTreeLevel(data: any[], aliasMap?: {
+    children: string;
+}): number;
+/**
+ * 获取树层级对应的所有 key
+ * @param data
+ * @param level
+ * @param aliasMap
+ * @returns
+ */
+export declare function getTreeLevelKey(data: any[], level: number, aliasMap?: {
+    key: string;
+    children: string;
+}): any[];

package/es/sidebar/utils/index.js

@@ -0,0 +1,228 @@
+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 _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 _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
+
+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 _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; }
+
+/**
+ * 深度遍历节点
+ * @param data 数据
+ * @param func 处理方法
+ * @param aliasMap 标识
+ * @param level 深度
+ */
+export function loop(data, func, aliasMap) {
+  var level = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : 0;
+
+  var _ref = aliasMap !== null && aliasMap !== void 0 ? aliasMap : {},
+      _ref$children = _ref.children,
+      children = _ref$children === void 0 ? 'children' : _ref$children;
+
+  if (data && data.length > 0) {
+    data.forEach(function (item) {
+      func(item, level, data);
+
+      if (Array.isArray(item[children])) {
+        loop(item[children], func, {
+          children: children
+        }, level + 1);
+      }
+    });
+  }
+}
+/**
+ * 深度遍历并查找节点（只保留二级路径）
+ * @param data 数据
+ * @param predicate 条件
+ * @param aliasMap 标识
+ * @returns
+ */
+
+export function findNodeWithoutPath(data, predicate, aliasMap) {
+  var _ref2 = aliasMap !== null && aliasMap !== void 0 ? aliasMap : {},
+      _ref2$children = _ref2.children,
+      children = _ref2$children === void 0 ? 'children' : _ref2$children; // 如果已经没有节点了，结束递归
+
+
+  if (!(data && data.length)) {
+    return [];
+  }
+
+  var newChildren = [];
+
+  var _iterator = _createForOfIteratorHelper(data),
+      _step;
+
+  try {
+    for (_iterator.s(); !(_step = _iterator.n()).done;) {
+      var node = _step.value;
+
+      if (predicate(node)) {
+        var _node$children;
+
+        // 如果节点符合条件，直接加入新的节点集
+        newChildren.push(node);
+        node.children = findNodeWithoutPath((_node$children = node[children]) !== null && _node$children !== void 0 ? _node$children : [], predicate);
+      } else {
+        var _node$children2;
+
+        // 如果当前节点不符合条件，递归过滤子节点，
+        // 把符合条件的子节点提升上来，并入新节点集
+        newChildren.push.apply(newChildren, _toConsumableArray(findNodeWithoutPath((_node$children2 = node[children]) !== null && _node$children2 !== void 0 ? _node$children2 : [], predicate)));
+      }
+    }
+  } catch (err) {
+    _iterator.e(err);
+  } finally {
+    _iterator.f();
+  }
+
+  return newChildren;
+}
+/**
+ * 深度遍历并查找节点（保留全部路径）
+ * @param data 数据
+ * @param predicate 条件
+ * @param aliasMap 标识
+ * @returns
+ */
+
+export function findNodeWithPath(data, predicate, aliasMap) {
+  var _ref3 = aliasMap !== null && aliasMap !== void 0 ? aliasMap : {},
+      _ref3$children = _ref3.children,
+      children = _ref3$children === void 0 ? 'children' : _ref3$children;
+
+  var getNodes = function getNodes(result, node) {
+    if (predicate(node)) {
+      result.push(node);
+      return result;
+    }
+
+    if (Array.isArray(node[children])) {
+      var nodes = node[children].reduce(getNodes, []);
+
+      if (nodes.length) {
+        result.push(_objectSpread(_objectSpread({}, node), {}, {
+          nodes: nodes
+        }));
+      }
+    }
+
+    return result;
+  };
+
+  return data.reduce(getNodes, []);
+}
+/**
+ * 获取树所有节点 key
+ * @param data 数据
+ * @param aliasMap 标识
+ * @returns
+ */
+
+export function getAllNodeKey(data, aliasMap) {
+  var _ref4 = aliasMap !== null && aliasMap !== void 0 ? aliasMap : {},
+      _ref4$key = _ref4.key,
+      key = _ref4$key === void 0 ? 'value' : _ref4$key,
+      _ref4$children = _ref4.children,
+      children = _ref4$children === void 0 ? 'children' : _ref4$children;
+
+  var keyList = [];
+  loop(data, function (node) {
+    keyList.push(node[key]);
+  }, {
+    children: children
+  });
+  return keyList;
+}
+/**
+ * 获取当前节点的层级
+ * @param data 数据
+ * @param value 需要获取层级的 key
+ * @param aliasMap 标识
+ * @returns
+ */
+
+export function getTreeNodeLevel(data, value, aliasMap) {
+  var _ref5 = aliasMap !== null && aliasMap !== void 0 ? aliasMap : {},
+      _ref5$key = _ref5.key,
+      key = _ref5$key === void 0 ? 'value' : _ref5$key,
+      _ref5$children = _ref5.children,
+      children = _ref5$children === void 0 ? 'children' : _ref5$children;
+
+  var result = 0;
+  loop(data, function (item, level) {
+    if (item[key] === value) {
+      result = level !== null && level !== void 0 ? level : 0;
+    }
+  }, {
+    children: children
+  });
+  return result;
+}
+/**
+ * 获取树的层级
+ * @param data 数据
+ * @param aliasMap 标识
+ * @returns
+ */
+
+export function getTreeLevel(data, aliasMap) {
+  var _ref6 = aliasMap !== null && aliasMap !== void 0 ? aliasMap : {},
+      _ref6$children = _ref6.children,
+      children = _ref6$children === void 0 ? 'children' : _ref6$children;
+
+  var result = 1;
+  loop(data, function (item, level) {
+    if (result < level) {
+      result = level;
+    }
+
+    if ('children' in item) {
+      result += 1;
+    }
+  }, {
+    children: children
+  });
+  return result;
+}
+/**
+ * 获取树层级对应的所有 key
+ * @param data
+ * @param level
+ * @param aliasMap
+ * @returns
+ */
+
+export function getTreeLevelKey(data, level, aliasMap) {
+  var _ref7 = aliasMap !== null && aliasMap !== void 0 ? aliasMap : {},
+      _ref7$key = _ref7.key,
+      key = _ref7$key === void 0 ? 'value' : _ref7$key,
+      _ref7$children = _ref7.children,
+      children = _ref7$children === void 0 ? 'children' : _ref7$children;
+
+  var result = []; // TODO 此处可做性能优化
+
+  loop(data, function (item, currentLevel) {
+    if (currentLevel + 1 <= level) {
+      result.push(item === null || item === void 0 ? void 0 : item[key]);
+    }
+  }, {
+    children: children
+  });
+  return result;
+}

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

@@ -27,7 +27,7 @@
       line-height: var(--checkbox-size,16px);
     }
   }
-  &-reset {
+  &-reset.next-btn {
     position: absolute;
     right: 0px;
     top: 6px;

package/es/table/index.scss

@@ -124,4 +124,14 @@ $fullscreenPadding: 24px;
   .next-form-preview.next-form-preview {
     line-height: unset;
   }
+  &-row {
+    .teamix-pro-field.teamix-pro-field-text .next-form-preview {
+      color: var(--table-row-color);
+    }
+  }
+  &-row.hovered {
+    .teamix-pro-field.teamix-pro-field-text .next-form-preview {
+      color: var(--table-row-hover-color);
+    }
+  }
 }

package/lib/actions/dialog-form.js

@@ -23,7 +23,7 @@ var _dialog = _interopRequireDefault(require("./dialog"));
 var _utils2 = require("./utils");
 
 var _excluded = ["schema"],
-    _excluded2 = ["schema", "useFieldValuesForRequest", "initialValues", "initialRequest", "formProps", "size", "onFinish", "beforeRequest", "formRef"];
+    _excluded2 = ["schema", "useFieldValuesForRequest", "initialValues", "initialRequest", "formProps", "size", "onFinish", "beforeRequest", "formRef", "extendParams"];
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
@@ -168,6 +168,7 @@ function useDialogFormAction(action, context) {
       _onFinish = action.onFinish,
       propsBeforeRequest = action.beforeRequest,
       propsFormRef = action.formRef,
+      propsExtendParams = action.extendParams,
       others = _objectWithoutProperties(action, _excluded2);
 
   var innerFormRef = /*#__PURE__*/(0, _react.createRef)();
@@ -188,10 +189,12 @@ function useDialogFormAction(action, context) {
         formRef: propsFormRef
       }, dialogFormProps));
     },
-    extendParams: useFieldValuesForRequest ? '{{fields}}' : undefined,
+    extendParams: useFieldValuesForRequest ? ['{{fields}}', propsExtendParams] : propsExtendParams,
     beforeRequest: function beforeRequest(context) {
       return new Promise(function (resolve, reject) {
         innerFormRef.current.validate().then( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee() {
+          var _innerFormRef$current;
+
           var beforeRequestContext, requestContext;
           return regeneratorRuntime.wrap(function _callee$(_context) {
             while (1) {
@@ -227,7 +230,7 @@ function useDialogFormAction(action, context) {
 
                 case 13:
                   requestContext = Object.assign({
-                    fields: innerFormRef.current.values
+                    fields: (_innerFormRef$current = innerFormRef.current) === null || _innerFormRef$current === void 0 ? void 0 : _innerFormRef$current.values
                   }, _typeof(beforeRequestContext) === 'object' ? beforeRequestContext : {});
                   resolve(requestContext);
 
@@ -243,9 +246,9 @@ function useDialogFormAction(action, context) {
       });
     },
     onFinish: function onFinish() {
-      var _innerFormRef$current;
+      var _innerFormRef$current2;
 
-      _onFinish && _onFinish((_innerFormRef$current = innerFormRef.current) === null || _innerFormRef$current === void 0 ? void 0 : _innerFormRef$current.values);
+      _onFinish && _onFinish((_innerFormRef$current2 = innerFormRef.current) === null || _innerFormRef$current2 === void 0 ? void 0 : _innerFormRef$current2.values);
     }
   }, others), context);
 }

package/lib/actions/dialog.js

@@ -236,9 +236,7 @@ function useDialogAction(action, actionContext) {
     var dialogContext = Object.assign({}, context, {
       hide: hide
     });
-    var dialogContent = Component ? /*#__PURE__*/_react.default.createElement(Component, _objectSpread({
-      key: (0, _utils.uuid)()
-    }, (0, _utils2.addContext)(componentProps, dialogContext))) : addContextForReactNode(content, dialogContext);
+    var dialogContent = Component ? /*#__PURE__*/_react.default.createElement(Component, _objectSpread({}, (0, _utils2.addContext)(componentProps, dialogContext))) : addContextForReactNode(content, dialogContext);
 
     var quickShowProps = _objectSpread(_objectSpread((_objectSpread2 = {}, _defineProperty(_objectSpread2, "".concat(isPop ? 'onConfirm' : 'onOk'), onOk), _defineProperty(_objectSpread2, "title", addContextForReactNode(title, dialogContext)), _defineProperty(_objectSpread2, "content", /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, beforeContent && /*#__PURE__*/_react.default.createElement("div", {
       className: "teamix-pro-dialog-before-content"

package/lib/form/Components/LightFilter/index.d.ts

@@ -8,6 +8,7 @@ import './index.scss';
 interface ILightFiter {
     size?: 'small' | 'medium' | 'large';
     defaultFilterValue?: string;
+    filterValues?: string[];
     onFilterChange?: (schema?: any) => any;
     filterProps?: SelectProps;
     buttonProps?: ButtonProps;

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

@@ -78,14 +78,16 @@ var useMain = function useMain(active) {
 }; // 筛选项数据
 
 
-var useFilterItems = function useFilterItems() {
+var useFilterItems = function useFilterItems(filterValues) {
   var schema = (0, _react2.useFieldSchema)();
   var filterItems = [];
   schema.mapProperties(function (schema, name) {
-    filterItems.push({
-      label: schema.title,
-      value: schema.name
-    });
+    if (!filterValues || filterValues && filterValues.includes(schema.name)) {
+      filterItems.push({
+        label: schema.title,
+        value: schema.name
+      });
+    }
   });
   return filterItems;
 }; // 是否输入框类型的组件
@@ -99,12 +101,13 @@ var isInputCategory = function isInputCategory(currentSchema) {
 var LightFilter = (0, _react2.observer)(function (props) {
   var _filterItems$, _main$;
 
-  var filterItems = useFilterItems();
   var size = props.size,
       defaultFilterValue = props.defaultFilterValue,
+      filterValues = props.filterValues,
       onFilterChange = props.onFilterChange,
       filterProps = props.filterProps,
       buttonProps = props.buttonProps;
+  var filterItems = useFilterItems(filterValues);
 
   var _useState = (0, _react.useState)(defaultFilterValue || ((_filterItems$ = filterItems[0]) === null || _filterItems$ === void 0 ? void 0 : _filterItems$.value)),
       _useState2 = _slicedToArray(_useState, 2),

package/lib/form/Filter/LightFilter.js

@@ -15,7 +15,7 @@ var _utils = require("@teamix/utils");
 
 var _ProForm = _interopRequireDefault(require("../ProForm"));
 
-var _excluded = ["form", "schema", "onSubmit", "onChange", "defaultFilterValue", "activeFilterValueRef"];
+var _excluded = ["form", "schema", "onSubmit", "onChange", "defaultFilterValue", "filterValues", "activeFilterValueRef"];
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
@@ -44,6 +44,7 @@ var LightFilter = /*#__PURE__*/(0, _react.memo)(function (props) {
       onSubmit = props.onSubmit,
       onChange = props.onChange,
       defaultFilterValue = props.defaultFilterValue,
+      filterValues = props.filterValues,
       activeFilterValueRef = props.activeFilterValueRef,
       otherProps = _objectWithoutProperties(props, _excluded);
 
@@ -66,15 +67,24 @@ var LightFilter = /*#__PURE__*/(0, _react.memo)(function (props) {
   }, [form]); // 实际输出onFilter
 
   var onFilter = (0, _react.useCallback)(function () {
+    var _Object$keys;
+
     var key = filterValue.current;
-    var value = form.values[key];
-    onChange === null || onChange === void 0 ? void 0 : onChange(_defineProperty({}, key, value));
+    var value = form.values[key]; // 删除旧值
+
+    (_Object$keys = Object.keys(form.values)) === null || _Object$keys === void 0 ? void 0 : _Object$keys.forEach(function (item) {
+      if (item !== key) {
+        form.setValuesIn(item, undefined);
+      }
+    });
+    onChange === null || onChange === void 0 ? void 0 : onChange(_defineProperty({}, key, value), value, key);
   }, [onChange]);
   var LightSchema = (0, _react.useMemo)(function () {
     return [{
       component: 'LightFilter',
       props: {
         defaultFilterValue: defaultFilterValue,
+        filterValues: filterValues,
         onFilterChange: onFilterChange,
         buttonProps: {
           onClick: onFilter

package/lib/form/Filter/SimpleFilter.js

@@ -103,7 +103,7 @@ var SimpleFilter = /*#__PURE__*/(0, _react.memo)(function (props) {
     } else {
       onChange === null || onChange === void 0 ? void 0 : onChange(values, name, value);
     }
-  }, [searchName, searchValue.current]);
+  }, [onChange, searchName, searchValue.current]);
   (0, _react.useEffect)(function () {
     var _props$form$initialVa, _props$form$initialVa2;