@teamix/pro 1.2.17 → 1.2.21

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,
@@ -344,12 +349,20 @@ var FilterColumnIcon = function FilterColumnIcon(props) {
         },
         disabled: columnFiltersDisabled
       }, /*#__PURE__*/React.createElement(Ellipsis, {
-        tooltip: false
+        tooltip: title
       }, title)));
     }))));
   };
 
-  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';
@@ -59,10 +60,36 @@ var toJS = formilyReactive.toJS;
  * @returns
  */
 
-var processColumns = function processColumns(columns) {
-  return columns.filter(function (item) {
+var processColumns = function processColumns(columns, initialColumns) {
+  var filterColumns = columns.filter(function (item) {
     return item.columnFilters !== false;
-  });
+  }); // 处理只剩一列批量选择的情况下宽度错乱问题
+
+  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$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$2 = initialColumns[0]) === null || _initialColumns$2 === void 0 ? void 0 : _initialColumns$2.lock) {
+        filterColumns[0].lock = initialColumns[0].lock;
+      }
+    }
+  }
+
+  return filterColumns;
 };
 /** 默认请求翻页参数 */
 
@@ -132,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;
@@ -163,7 +192,7 @@ var ProTable = function ProTable(props) {
       sort = _useState10[0],
       setSort = _useState10[1];
 
-  var _useState11 = useState(requestWhenMount && propsShowSkeleton),
+  var _useState11 = useState(!propsDataSource && requestWhenMount && propsShowSkeleton),
       _useState12 = _slicedToArray(_useState11, 2),
       showSkeleton = _useState12[0],
       setShowSkeleton = _useState12[1]; // 首次加载，渲染骨架屏
@@ -180,7 +209,7 @@ var ProTable = function ProTable(props) {
   var tableRef = useRef(null);
   var actionRef = useRef(); // 传给 table 的过滤后的 columns
 
-  var _useState15 = useState(processColumns(propsColumns !== null && propsColumns !== void 0 ? propsColumns : [])),
+  var _useState15 = useState(processColumns(propsColumns !== null && propsColumns !== void 0 ? propsColumns : [], propsColumns)),
       _useState16 = _slicedToArray(_useState15, 2),
       filteredColumns = _useState16[0],
       setFilteredColumns = _useState16[1];
@@ -351,10 +380,16 @@ var ProTable = function ProTable(props) {
   useEffect(function () {
     var _actionRef$current, _actionRef$current$se;
 
-    var columns = processColumns(propsColumns !== null && propsColumns !== void 0 ? propsColumns : []);
+    var columns = processColumns(propsColumns !== null && propsColumns !== void 0 ? propsColumns : [], propsColumns);
     setFilteredColumns(columns);
     (_actionRef$current = actionRef.current) === null || _actionRef$current === void 0 ? void 0 : (_actionRef$current$se = _actionRef$current.setState) === null || _actionRef$current$se === void 0 ? void 0 : _actionRef$current$se.call(_actionRef$current, 'filterColumns', columns);
-  }, [propsColumns]); // 绑定 Actions
+  }, [propsColumns]); // dataSource 受控
+
+  useEffect(function () {
+    if (propsDataSource) {
+      setData(propsDataSource);
+    }
+  }, [propsDataSource]); // 绑定 Actions
 
   useActionType(actionRef, {
     fullScreen: function fullScreen() {
@@ -369,7 +404,7 @@ var ProTable = function ProTable(props) {
     setColumn: function setColumn(newColumns) {
       var _actionRef$current2, _actionRef$current2$s;
 
-      var columns = processColumns(newColumns);
+      var columns = processColumns(newColumns, propsColumns);
       setFilteredColumns(columns);
       (_actionRef$current2 = actionRef.current) === null || _actionRef$current2 === void 0 ? void 0 : (_actionRef$current2$s = _actionRef$current2.setState) === null || _actionRef$current2$s === void 0 ? void 0 : _actionRef$current2$s.call(_actionRef$current2, 'filterColumns', columns);
     },
@@ -381,6 +416,15 @@ var ProTable = function ProTable(props) {
     },
     request: function request(params) {
       if (dataFilterForm.validate()) {
+        // 如果请求中还有翻页相关信息，需要自动设置到指定页
+        if (params === null || params === void 0 ? void 0 : params[targetPageKey]) {
+          setCurrentPage(params[targetPageKey]);
+        }
+
+        if (params === null || params === void 0 ? void 0 : params[targetPageSizeKey]) {
+          setPageSize(params[targetPageSizeKey]);
+        }
+
         _request(params);
       }
     },
@@ -411,6 +455,7 @@ var ProTable = function ProTable(props) {
       targetPageSizeKey: targetPageSizeKey,
       pageSize: pageSize
     },
+    data: data,
     dataFilterForm: dataFilterForm,
     resetTableMaxBodyHeight: function resetTableMaxBodyHeight() {
       getHeaderHeight().then(function (height) {
@@ -609,10 +654,11 @@ var ProTable = function ProTable(props) {
       (propsDataFilter === null || propsDataFilter === void 0 ? void 0 : propsDataFilter.onFilter) && (propsDataFilter === null || propsDataFilter === void 0 ? void 0 : propsDataFilter.onFilter(_objectSpread({}, toJS(dataFilterForm.values))));
 
       if (dataFilterForm.validate()) {
-        setCurrentPage(1); // const { mode, schema } = propsDataFilter as ProTableDataFilterProps;
-        // TODO: 针对 inline 模式下的 search 组件做一下处理，如果空值切换下拉的时候不触发请求
-        // if (mode === 'inline') {
-        // }
+        var _actionRef$current6, _actionRef$current6$c;
+
+        // 搜索变化时，暂时先清空选择
+        (_actionRef$current6 = actionRef.current) === null || _actionRef$current6 === void 0 ? void 0 : (_actionRef$current6$c = _actionRef$current6.clearRowSelection) === null || _actionRef$current6$c === void 0 ? void 0 : _actionRef$current6$c.call(_actionRef$current6);
+        setCurrentPage(1);
 
         _request(_defineProperty({}, targetPageKey, 1));
       }
@@ -647,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,
@@ -705,15 +752,21 @@ var ProTable = function ProTable(props) {
 
   var renderFooter = function renderFooter() {
     function onChangePagination(currentPage) {
+      var _actionRef$current7, _actionRef$current7$c;
+
       var params = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+      // 翻页暂时先清空选择
+      (_actionRef$current7 = actionRef.current) === null || _actionRef$current7 === void 0 ? void 0 : (_actionRef$current7$c = _actionRef$current7.clearRowSelection) === null || _actionRef$current7$c === void 0 ? void 0 : _actionRef$current7$c.call(_actionRef$current7);
       setCurrentPage(currentPage);
 
       _request(_objectSpread(_defineProperty({}, targetPageKey, currentPage), params));
     }
 
     function onChangePaginationSize(currentPageSize) {
-      var _request5;
+      var _actionRef$current8, _actionRef$current8$c, _request5;
 
+      // 翻页暂时先清空选择
+      (_actionRef$current8 = actionRef.current) === null || _actionRef$current8 === void 0 ? void 0 : (_actionRef$current8$c = _actionRef$current8.clearRowSelection) === null || _actionRef$current8$c === void 0 ? void 0 : _actionRef$current8$c.call(_actionRef$current8);
       setPageSize(currentPageSize);
       setCurrentPage(1);
 
@@ -753,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
@@ -760,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

@@ -129,6 +129,7 @@ export declare type rowSelectionType = {
     onSelect?: (selected: boolean, record: any, records: Array<any>) => void;
     onSelectAll?: (selected: boolean, records: Array<any>) => void;
     selectedRowKeys?: Array<any>;
+    selectedRecords?: any[];
     mode?: 'single' | 'multiple';
     titleProps?: () => any;
     columnProps?: () => any;
@@ -177,6 +178,8 @@ export declare type ProTableActionType = {
     resetPage?: () => void;
     /** 获取数据过滤区表单实例 */
     dataFilterForm?: FormType;
+    /** 表格当前的数据 */
+    data?: any[];
 } & ProTableActionTypeMutations;
 /** action State 定义 */
 export declare type ProTableActionTypeMutations = {
@@ -232,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/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,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");
@@ -243,27 +250,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';

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"],
@@ -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) {

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;
 }