@teamix/pro 1.2.18 → 1.2.22

package/es/table/typing.d.ts

@@ -12,7 +12,7 @@ import React from 'react';
 import type { Form as FormType } from '@formily/core';
 declare type IFieldRenderProps = keyof ProFieldRenderProps;
 /** 列record函数 */
-declare type ProTableCellFunProp = (value: any, index: number, record: any) => any;
+declare type ProTableCellFunProp = (value: any, index: number, record: any, ...others: any) => any;
 declare type ITableCellRender = {
     [key in IFieldRenderProps]?: ProFieldRenderProps[key] | ProTableCellFunProp;
 } | ((...other: any) => React.ReactNode);
@@ -146,7 +146,7 @@ export declare type ProTableActionType = {
     /** 全屏展示 */
     fullScreen?: () => boolean;
     /** 设置显示列 */
-    setColumn?: (newColumns: ProColumnProps[]) => void;
+    setColumn?: (newColumns: ProColumnProps[], update?: boolean) => void;
     /** 设置表格大小 */
     setSize?: (mode: 'small' | 'medium') => void;
     /** 刷新表格 */
@@ -220,6 +220,8 @@ export declare type ProTableDataFilterProps = {
     searchUndefined?: boolean;
     /** 搜索时是否传入值为空字符串的参数，默认不传 */
     searchEmptyString?: boolean;
+    /** 自定义内容 */
+    content?: React.ReactNode;
 } & IFilterProps;
 export declare type dataFilterProps = ProTableDataFilterProps;
 export declare type ProTableTopAreaProps = {
@@ -235,6 +237,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/es/table/utils/columnRender.js

@@ -204,7 +204,8 @@ var processRenderFunction = function processRenderFunction() {
   var value = arguments.length > 1 ? arguments[1] : undefined;
   var index = arguments.length > 2 ? arguments[2] : undefined;
   var record = arguments.length > 3 ? arguments[3] : undefined;
-  var external = ['linkOnClick', 'link', 'value'];
+  // 当 ProField render 类型为 function 时。需要表格预先处理以塞入 record
+  var external = ['linkOnClick', 'link', 'value', 'renderEdit', 'descriptionRenderEdit', 'editPopConfirmProps', 'descriptionEditPopConfirmProps', 'editOnClick', 'descriptionEditOnClick'];
   return Object.fromEntries(Object.entries(render).map(function (_ref3) {
     var _ref4 = _slicedToArray(_ref3, 2),
         k = _ref4[0],

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

@@ -1,4 +1,11 @@
 /// <reference types="react" />
 import { ProTableActionType } from '../typing';
+export declare function initActionRef(): void;
+/** table 组件内监听 不对外暴露 */
+export declare function on(fun: any, key: string): void;
+/** table 组件内销毁监听 不对外暴露 */
+export declare function off(key: string): void;
+/** table 组件内触发事件 不对外暴露 */
+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;

package/es/table/utils/index.js

@@ -16,7 +16,7 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
 
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
-import cloneDeepLodash from 'lodash.clonedeep'; // 组件内全局状态
+import cloneDeepLodash from 'lodash.clonedeep'; // 组件内全局状态 每次初始化 ActionRef 会重新深拷贝对象
 
 var state = {
   fullScreenState: false,
@@ -24,12 +24,16 @@ var state = {
   filterColumns: []
 };
 
-var _initState = cloneDeepLodash(state); // 组件内全局监听事件
+var _initState = cloneDeepLodash(state); // state监听事件 每次初始化 ActionRef 会重新深拷贝对象
 
 
 var callback = {
   fullScreenState: {}
-}; // 组件内对全局状态的更改
+};
+var initCallback = cloneDeepLodash(callback); // 所有 ProTable 组件公用一套组件内事件转发机制
+
+var tableCallback = {}; // 组件内监听事件
+// 组件内对全局状态的更改
 
 var mutations = {
   getState: function getState() {
@@ -129,8 +133,38 @@ var useOn = function useOn(state) {
       }
     });
   }
-};
+}; // 初始化 actionRef
+
+
+export function initActionRef() {
+  state = cloneDeepLodash(_initState);
+  callback = cloneDeepLodash(initCallback);
+}
+/** table 组件内监听 不对外暴露 */
+
+export function on(fun, key) {
+  tableCallback[key] = fun;
+}
+/** table 组件内销毁监听 不对外暴露 */
 
+export function off(key) {
+  if (tableCallback[key]) {
+    delete tableCallback[key];
+  }
+}
+/** table 组件内触发事件 不对外暴露 */
+
+export function emit(key) {
+  var fun = tableCallback[key];
+
+  if (fun) {
+    for (var _len2 = arguments.length, args = new Array(_len2 > 1 ? _len2 - 1 : 0), _key2 = 1; _key2 < _len2; _key2++) {
+      args[_key2 - 1] = arguments[_key2];
+    }
+
+    fun.apply(void 0, args);
+  }
+}
 export function useActionType(ref, action) {
   // 合并自定义事件
   var userAction = _objectSpread(_objectSpread({}, action), mutations);

package/lib/actions/base.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { MaybePromise } from '@teamix/utils';
 export interface BaseAction {
     /** 事件触发方式，默认是 onClick */
@@ -17,7 +18,7 @@ export interface BaseAction {
     /** 事件开始执行完毕的回调函数 */
     onFinish?: (params?: any) => any;
 }
-export declare function eventHandler(action: BaseAction, actionContext: any, onTrigger: (context: any) => void): {
+export declare function eventHandler(action: BaseAction, actionContext: any, onTrigger: (context: any, e: React.MouseEvent<HTMLElement>) => void): {
     [x: string]: (e: React.MouseEvent<HTMLElement>) => Promise<void>;
 };
 export default eventHandler;

package/lib/actions/base.js

@@ -65,7 +65,7 @@ function eventHandler(action, actionContext, onTrigger) {
               return _context.abrupt("return");
 
             case 14:
-              onTrigger(Object.assign({}, beforeActionContext, actionContext));
+              onTrigger(Object.assign({}, beforeActionContext, actionContext), e);
               (_action$onTrigger = action.onTrigger) === null || _action$onTrigger === void 0 ? void 0 : _action$onTrigger.call(action);
 
             case 16:

package/lib/actions/danger-pop-confirm.d.ts

@@ -0,0 +1,5 @@
+import { PopConfirmAction } from './pop-confirm';
+export declare function useDangerPopConfirmAction(action: PopConfirmAction, context?: any): {
+    [x: string]: (e: import("react").MouseEvent<HTMLElement, MouseEvent>) => Promise<void>;
+};
+export default useDangerPopConfirmAction;

package/lib/actions/danger-pop-confirm.js

@@ -0,0 +1,22 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+exports.useDangerPopConfirmAction = useDangerPopConfirmAction;
+
+var _utils = require("@teamix/utils");
+
+var _dialog = require("./dialog");
+
+function useDangerPopConfirmAction(action, context) {
+  return (0, _dialog.useDialogAction)((0, _utils.deepMerge)({
+    dialogType: 'pop',
+    popType: 'danger',
+    align: 'br'
+  }, action), context);
+}
+
+var _default = useDangerPopConfirmAction;
+exports.default = _default;

package/lib/actions/dialog.d.ts

@@ -8,7 +8,7 @@ export interface DialogAction extends Omit<RequestAction, 'url'>, Omit<QuickShow
     /** 点击「确认按钮」后的数据请求地址，非必填，不填就不发请求 */
     url?: string;
     /** 弹窗类型，支持普通弹窗和抽屉两种模式，默认为普通弹窗 */
-    dialogType?: 'dialog' | 'drawer';
+    dialogType?: 'dialog' | 'drawer' | 'pop';
     /** 弹窗快捷调用类型 */
     dialogQuickShowType?: 'alert' | 'confirm';
     /** 弹窗消息类型 */

package/lib/actions/dialog.js

@@ -16,6 +16,8 @@ var _reactRouterDom = require("react-router-dom");
 
 var _components = require("@alicloudfe/components");
 
+var _popConfirm = _interopRequireDefault(require("@teamix/pop-confirm"));
+
 var _utils = require("@teamix/utils");
 
 var _form = _interopRequireWildcard(require("../form"));
@@ -29,7 +31,7 @@ var _request = require("./request");
 var _utils2 = require("./utils");
 
 var _excluded = ["url", "method", "params", "data", "extendParams", "successMsg", "errorMsg", "formatParams", "formatResult", "onSuccess", "onError"],
-    _excluded2 = ["title", "content", "component", "schema", "onFinish", "dialogType", "dialogQuickShowType", "messageType", "beforeRequest", "onTrigger", "link", "beforeContent", "afterContent", "message", "footerDescription", "footerAlign", "className"];
+    _excluded2 = ["title", "content", "component", "schema", "onFinish", "dialogType", "dialogQuickShowType", "messageType", "popType", "beforeRequest", "onTrigger", "link", "beforeContent", "afterContent", "message", "footerDescription", "footerAlign", "className"];
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
@@ -102,7 +104,9 @@ function useDialogAction(action, actionContext) {
   var footerDescriptionRef = (0, _react.useRef)();
   var history = (0, _reactRouterDom.useHistory)();
 
-  var onActionStart = function onActionStart(context) {
+  var onActionStart = function onActionStart(context, e) {
+    var _objectSpread2;
+
     var url = action.url,
         method = action.method,
         params = action.params,
@@ -126,6 +130,7 @@ function useDialogAction(action, actionContext) {
         dialogQuickShowType = _getTargetValue.dialogQuickShowType,
         _getTargetValue$messa = _getTargetValue.messageType,
         messageType = _getTargetValue$messa === void 0 ? 'notice' : _getTargetValue$messa,
+        popType = _getTargetValue.popType,
         beforeRequest = _getTargetValue.beforeRequest,
         onTrigger = _getTargetValue.onTrigger,
         link = _getTargetValue.link,
@@ -135,20 +140,25 @@ function useDialogAction(action, actionContext) {
         footerDescription = _getTargetValue.footerDescription,
         footerAlign = _getTargetValue.footerAlign,
         className = _getTargetValue.className,
-        containerProps = _objectWithoutProperties(_getTargetValue, _excluded2);
+        containerOtherProps = _objectWithoutProperties(_getTargetValue, _excluded2);
 
     var isDrawer = dialogType === 'drawer';
-    var container = isDrawer ? _components.Drawer : _components.Dialog;
-    var dialogOnlyProps = {
+    var isPop = dialogType === 'pop';
+    var container = isDrawer ? _components.Drawer : isPop ? _popConfirm.default : _components.Dialog;
+    var containerProps = isDrawer ? {
+      okText: (0, _utils.getMessage)('ok'),
+      cancelText: (0, _utils.getMessage)('cancel'),
+      closeable: !loading
+    } : isPop ? {
+      type: popType,
+      trigger: e.currentTarget
+    } : {
       type: dialogQuickShowType,
       messageProps: {
         type: messageType
-      }
+      },
+      closeable: !loading
     };
-    var containerOtherProps = isDrawer ? {
-      okText: (0, _utils.getMessage)('ok'),
-      cancelText: (0, _utils.getMessage)('cancel')
-    } : dialogOnlyProps;
 
     var renderDialogFooterDescription = function renderDialogFooterDescription(footer) {
       if (footer instanceof Array || footer.component) {
@@ -177,48 +187,34 @@ function useDialogAction(action, actionContext) {
             while (1) {
               switch (_context.prev = _context.next) {
                 case 0:
-                  if (url) {
-                    _context.next = 5;
-                    break;
-                  }
-
-                  if (link) {
-                    (0, _utils.goToLink)(link, history);
-                  }
-
-                  onFinish && onFinish();
-                  resolve(true);
-                  return _context.abrupt("return");
-
-                case 5:
                   setLoading(true);
                   footerDescriptionValues = Object.assign({}, footerDescriptionRef === null || footerDescriptionRef === void 0 ? void 0 : (_footerDescriptionRef = footerDescriptionRef.current) === null || _footerDescriptionRef === void 0 ? void 0 : _footerDescriptionRef.values);
-                  _context.prev = 7;
+                  _context.prev = 2;
                   requestContext = Object.assign({
                     footer: footerDescriptionValues
                   }, context);
-                  _context.next = 11;
+                  _context.next = 6;
                   return (0, _request.doRequest)(action, requestContext, history, footerDescriptionValues);
 
-                case 11:
+                case 6:
                   onFinish && onFinish();
                   resolve(true);
-                  _context.next = 20;
+                  _context.next = 15;
                   break;
 
-                case 15:
-                  _context.prev = 15;
-                  _context.t0 = _context["catch"](7);
+                case 10:
+                  _context.prev = 10;
+                  _context.t0 = _context["catch"](2);
                   setLoading(false);
                   resolve(false);
                   return _context.abrupt("return");
 
-                case 20:
+                case 15:
                 case "end":
                   return _context.stop();
               }
             }
-          }, _callee, null, [[7, 15]]);
+          }, _callee, null, [[2, 10]]);
         }));
 
         return function (_x) {
@@ -243,27 +239,19 @@ function useDialogAction(action, actionContext) {
       key: (0, _utils.uuid)()
     }, (0, _utils2.addContext)(componentProps, dialogContext))) : addContextForReactNode(content, dialogContext);
 
-    var quickShowProps = _objectSpread(_objectSpread({
-      // @ts-ignore
-      onOk: onOk,
-      title: addContextForReactNode(title, dialogContext),
-      content: /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, beforeContent && /*#__PURE__*/_react.default.createElement("div", {
-        className: "teamix-pro-dialog-before-content"
-      }, addContextForReactNode(beforeContent, dialogContext)), message && /*#__PURE__*/_react.default.createElement("div", {
-        className: "teamix-pro-dialog-message"
-      }, (0, _message.renderProMessage)(message, {
-        type: 'notice'
-      })), dialogContent, afterContent && /*#__PURE__*/_react.default.createElement("div", {
-        className: "teamix-pro-dialog-after-content"
-      }, addContextForReactNode(afterContent, dialogContext)), footerDescription && /*#__PURE__*/_react.default.createElement("div", {
-        className: (0, _classnames.default)('teamix-pro-dialog-footer-description', getFooterAlignClass(isDrawer, footerAlign))
-      }, renderDialogFooterDescription(footerDescription))),
-      closeable: !loading,
-      footerAlign: footerAlign,
-      className: (0, _classnames.default)('teamix-pro-action-dialog', {
-        'has-footer-description': !!footerDescription
-      })
-    }, containerOtherProps), containerProps);
+    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"
+    }, addContextForReactNode(beforeContent, dialogContext)), message && /*#__PURE__*/_react.default.createElement("div", {
+      className: "teamix-pro-dialog-message"
+    }, (0, _message.renderProMessage)(message, {
+      type: 'notice'
+    })), dialogContent, afterContent && /*#__PURE__*/_react.default.createElement("div", {
+      className: "teamix-pro-dialog-after-content"
+    }, addContextForReactNode(afterContent, dialogContext)), !isPop && footerDescription && /*#__PURE__*/_react.default.createElement("div", {
+      className: (0, _classnames.default)('teamix-pro-dialog-footer-description', getFooterAlignClass(isDrawer, footerAlign))
+    }, renderDialogFooterDescription(footerDescription)))), _defineProperty(_objectSpread2, "footerAlign", footerAlign), _defineProperty(_objectSpread2, "className", (0, _classnames.default)('teamix-pro-action-dialog', {
+      'has-footer-description': !!footerDescription
+    })), _objectSpread2), containerProps), containerOtherProps);
 
     var ret = container.show(quickShowProps);
     store.hide = ret.hide;

package/lib/actions/index.d.ts

@@ -7,6 +7,7 @@ import { DialogAction } from './dialog';
 import { DialogFormAction } from './dialog-form';
 import { DialogTableAction } from './dialog-table';
 import { DialogInfoAction } from './dialog-info';
+import { PopConfirmAction } from './pop-confirm';
 import './index.scss';
 export declare type ProActionConfig = ({
     type: 'dialog-form' | 'drawer-form';
@@ -15,6 +16,8 @@ export declare type ProActionConfig = ({
 } & DialogTableAction) | ({
     type: 'dialog-info' | 'drawer-info';
 } & DialogInfoAction) | ({
+    type: 'pop-confirm' | 'danger-pop-confirm';
+} & PopConfirmAction) | ({
     type: 'dialog' | 'drawer' | 'confirm' | 'danger-confirm' | 'notice' | 'error';
 } & DialogAction) | ({
     type: 'request';
@@ -43,11 +46,21 @@ export interface ProActionMenuButtonProps extends MenuButtonProps {
 export declare const ProActionMenuButton: (props: ProActionMenuButtonProps) => JSX.Element;
 export declare type ProActionProps = ProActionButtonProps | ProActionMenuButtonProps;
 export declare type ProActionGroupProps = {
+    /** 操作组类型：按钮、文字按钮 */
     type?: 'button' | 'text';
+    /** 上下文 */
     context?: any;
+    /** 操作项配置 */
     actions: ProActionProps[];
+    /** 操作按钮最长数量，超出后折叠，默认为4 */
     max?: number;
+    /**
+     * @deprecated 建议使用 more 代替
+     */
     moreText?: string;
+    /** 更多按钮的配置，只有在actions数量超过max时才有效 */
+    more?: string | ProActionButtonProps;
+    /** 是否有分割线，只有type="text"时生效，默认有分割线 */
     divider?: boolean;
 } & React.HTMLAttributes<HTMLElement>;
 export declare function ProActionGroup(props: ProActionGroupProps): JSX.Element;

package/lib/actions/index.js

@@ -47,6 +47,10 @@ var _drawerTable = require("./drawer-table");
 
 var _drawerInfo = require("./drawer-info");
 
+var _popConfirm = require("./pop-confirm");
+
+var _dangerPopConfirm = require("./danger-pop-confirm");
+
 require("./index.scss");
 
 var _excluded = ["type"],
@@ -56,7 +60,7 @@ var _excluded = ["type"],
     _excluded5 = ["context", "text"],
     _excluded6 = ["key", "actions"],
     _excluded7 = ["key", "config"],
-    _excluded8 = ["type", "divider", "max", "moreText", "context", "actions", "className"];
+    _excluded8 = ["type", "divider", "max", "moreText", "more", "context", "actions", "className"];
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
@@ -155,6 +159,14 @@ function useAction(config, context) {
     return (0, _drawerInfo.useDrawerInfoAction)(others, context);
   }
 
+  if (type === 'pop-confirm') {
+    return (0, _popConfirm.usePopConfirmAction)(others, context);
+  }
+
+  if (type === 'danger-pop-confirm') {
+    return (0, _dangerPopConfirm.useDangerPopConfirmAction)(others, context);
+  }
+
   var registedAction = RegistedActions.get(type);
 
   if (!registedAction) {
@@ -317,25 +329,19 @@ function renderCommonActionButton(button, context, isTypeText) {
   return /*#__PURE__*/_react.default.createElement(ProActionMenuButton, _objectSpread({}, buttonProps));
 }
 
-function getDefaultMoreButton(type, moreText) {
-  if (type === 'button') {
-    return {
-      label: moreText || (0, _utils.getMessage)('more')
-    };
-  }
-
-  if (moreText) {
-    return {
-      label: moreText
-    };
-  }
-
-  return {
+function getDefaultMoreButton(type, more) {
+  var moreConfig = typeof more === 'string' ? {
+    children: more
+  } : more;
+  var defaultConfig = type === 'button' ? {
+    children: (0, _utils.getMessage)('more')
+  } : {
     icon: 'more-line',
     // iconSize: 'small',
     autoWidth: false,
     className: 'teamix-pro-actions-text-menu-btn-no-arrow'
   };
+  return Object.assign(defaultConfig, moreConfig);
 }
 
 var MAX_ACTTIONS = 4;
@@ -380,6 +386,7 @@ function ProActionGroup(props) {
       _props$max = props.max,
       max = _props$max === void 0 ? MAX_ACTTIONS : _props$max,
       moreText = props.moreText,
+      more = props.more,
       context = props.context,
       _props$actions = props.actions,
       actions = _props$actions === void 0 ? [] : _props$actions,
@@ -392,7 +399,7 @@ function ProActionGroup(props) {
   }).filter(function (action) {
     return action.visible !== false;
   });
-  var formatedActions = formatGroupActions(filteredActions, max, getDefaultMoreButton(type, moreText));
+  var formatedActions = formatGroupActions(filteredActions, max, getDefaultMoreButton(type, more || moreText));
   return /*#__PURE__*/_react.default.createElement("div", _objectSpread({
     className: (0, _classnames.default)('teamix-pro-actions', "teamix-pro-actions-type-".concat(type), className, {
       'teamix-pro-actions-divider': type === 'button' ? false : divider

package/lib/actions/pop-confirm.d.ts

@@ -0,0 +1,9 @@
+import { IPopConfirmProps } from '@teamix/pop-confirm';
+import { DialogAction } from './dialog';
+export declare type PopConfirmAction = DialogAction & Omit<IPopConfirmProps, 'type' | 'trigger'> & {
+    popType?: IPopConfirmProps['type'];
+};
+export declare function usePopConfirmAction(action: PopConfirmAction, context?: any): {
+    [x: string]: (e: import("react").MouseEvent<HTMLElement, MouseEvent>) => Promise<void>;
+};
+export default usePopConfirmAction;

package/lib/actions/pop-confirm.js

@@ -0,0 +1,23 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+exports.usePopConfirmAction = usePopConfirmAction;
+
+var _utils = require("@teamix/utils");
+
+var _dialog = _interopRequireDefault(require("./dialog"));
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+function usePopConfirmAction(action, context) {
+  return (0, _dialog.default)((0, _utils.deepMerge)({
+    dialogType: 'pop',
+    align: 'br'
+  }, action), context);
+}
+
+var _default = usePopConfirmAction;
+exports.default = _default;

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

@@ -1,2 +1,3 @@
 declare const componentMap: any;
-export default componentMap;
+declare const inputCategory: any[];
+export { componentMap, inputCategory };

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

@@ -3,10 +3,12 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.default = void 0;
+exports.inputCategory = exports.componentMap = void 0;
 var componentMap = {
   Radio: 'Select',
-  Checkbox: 'Select'
+  Checkbox: 'Select',
+  CheckboxGroup: 'MultipleSelect'
 };
-var _default = componentMap;
-exports.default = _default;
+exports.componentMap = componentMap;
+var inputCategory = ['Input', 'Password', 'TextArea', 'NumberPicker', 'Percent', 'Money'];
+exports.inputCategory = inputCategory;

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

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

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

@@ -19,7 +19,7 @@ var _classnames = _interopRequireDefault(require("classnames"));
 
 var _utils = require("@teamix/utils");
 
-var _componentMap = _interopRequireDefault(require("./componentMap"));
+var _componentMap = require("./componentMap");
 
 require("./index.scss");
 
@@ -47,19 +47,29 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 
 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; }
 
-// 主激活区内容
+var formatComponent = function formatComponent(schema) {
+  var _schema$enum;
+
+  var component = schema['x-component'];
+
+  if (component === 'Checkbox' && ((_schema$enum = schema['enum']) === null || _schema$enum === void 0 ? void 0 : _schema$enum.length)) {
+    component = 'CheckboxGroup';
+  }
+
+  return _componentMap.componentMap[component] || component;
+}; // 主激活区内容
+
+
 var useMain = function useMain(active) {
   var schema = (0, _react2.useFieldSchema)();
   var main = [];
   schema.mapProperties(function (schema, name) {
-    // console.log(schema.required); // 添加 *
-    // console.log(schema);
     if (schema.name === active) {
       main.push({
         name: name,
         schema: _objectSpread(_objectSpread({}, schema), {}, {
           title: '',
-          'x-component': _componentMap.default[schema['x-component']] || schema['x-component']
+          'x-component': formatComponent(schema)
         })
       });
     }
@@ -78,16 +88,21 @@ var useFilterItems = function useFilterItems() {
     });
   });
   return filterItems;
+}; // 是否输入框类型的组件
+
+
+var isInputCategory = function isInputCategory(currentSchema) {
+  var component = currentSchema === null || currentSchema === void 0 ? void 0 : currentSchema['x-component'];
+  return _componentMap.inputCategory.includes(component);
 };
 
 var LightFilter = (0, _react2.observer)(function (props) {
-  var _filterItems$;
+  var _filterItems$, _main$;
 
-  var field = (0, _react2.useField)();
-  var schema = (0, _react2.useFieldSchema)();
   var filterItems = useFilterItems();
   var size = props.size,
       defaultFilterValue = props.defaultFilterValue,
+      onFilterChange = props.onFilterChange,
       filterProps = props.filterProps,
       buttonProps = props.buttonProps;
 
@@ -97,6 +112,7 @@ var LightFilter = (0, _react2.observer)(function (props) {
       setActive = _useState2[1];
 
   var main = useMain(active);
+  var currentSchema = (_main$ = main[0]) === null || _main$ === void 0 ? void 0 : _main$.schema;
   var defaultCls = (0, _utils.usePrefixCls)();
   var prefixCls = (0, _utils.usePrefixCls)('', {
     prefix: 'teamix-pro-form-light-filter'
@@ -107,20 +123,21 @@ var LightFilter = (0, _react2.observer)(function (props) {
     return /*#__PURE__*/_react.default.createElement(_react2.RecursionField, {
       key: key,
       name: name,
-      schema: schema,
-      filterProperties: function filterProperties(schema) {
-        return true;
-      }
+      schema: schema
     });
   });
+  var onSelectChange = (0, _react.useCallback)(function (value) {
+    setActive(value);
+    onFilterChange && onFilterChange(value);
+  }, [onFilterChange]);
   return /*#__PURE__*/_react.default.createElement("span", {
-    className: (0, _classnames.default)(prefixCls, "".concat(defaultCls).concat(size))
+    className: (0, _classnames.default)(prefixCls, "".concat(defaultCls).concat(size), isInputCategory(currentSchema) ? "".concat(prefixCls, "-input-category") : '')
   }, /*#__PURE__*/_react.default.createElement("span", {
     className: "".concat(prefixCls, "-main")
   }, /*#__PURE__*/_react.default.createElement(_components.Select, _objectSpread(_objectSpread({}, filterProps), {}, {
     className: (0, _classnames.default)("".concat(prefixCls, "-select"), filterProps === null || filterProps === void 0 ? void 0 : filterProps.className),
     dataSource: filterItems,
-    onChange: setActive,
+    onChange: onSelectChange,
     value: active
   })), content), /*#__PURE__*/_react.default.createElement("span", {
     className: "".concat(prefixCls, "-addonAfter")