@teamix/pro 1.2.21 → 1.2.26

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);
@@ -22,6 +22,7 @@ declare type TDataService = {
     /** 表格数据 */
     data?: any;
 };
+export declare type responsivePaginationType = 'mini' | 'small' | 'simple' | 'normal';
 export declare type ProTableColumnProps = {
     /**
      * 会在 title 之后展示一个 icon，hover 之后提示一些信息
@@ -92,6 +93,8 @@ export declare type ProTableProps = {
     paginationProps?: PaginationProps;
     /** 是否显示翻页器  */
     showPagination?: boolean;
+    /** 手动指定响应式翻页器的 type */
+    responsivePaginationType?: responsivePaginationType;
     /** 是否使用内置的 rowSelection */
     useRowSelection?: boolean;
     /** 内置 rowSelection 变化时的回调 */
@@ -122,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;
@@ -146,7 +153,7 @@ export declare type ProTableActionType = {
     /** 全屏展示 */
     fullScreen?: () => boolean;
     /** 设置显示列 */
-    setColumn?: (newColumns: ProColumnProps[]) => void;
+    setColumn?: (newColumns: ProColumnProps[], update?: boolean) => void;
     /** 设置表格大小 */
     setSize?: (mode: 'small' | 'medium') => void;
     /** 刷新表格 */
@@ -220,6 +227,8 @@ export declare type ProTableDataFilterProps = {
     searchUndefined?: boolean;
     /** 搜索时是否传入值为空字符串的参数，默认不传 */
     searchEmptyString?: boolean;
+    /** 自定义内容 */
+    content?: React.ReactNode;
 } & IFilterProps;
 export declare type dataFilterProps = ProTableDataFilterProps;
 export declare type ProTableTopAreaProps = {

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,18 @@
 /// <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;
+/** 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;
+/**
+ * 处理默认过滤参数
+ * @param columns
+ * @param ref
+ */
+export declare function processDefaultFilter(columns: ProTableColumnProps[], ref: React.MutableRefObject<ProTableActionType | undefined>, defaultFilterParams: ProTableProps['defaultFilterParams']): void;

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);
@@ -139,4 +173,40 @@ export function useActionType(ref, action) {
 }
 export function cloneDeep(obj) {
   return cloneDeepLodash(obj);
+}
+/**
+ * 处理默认过滤参数
+ * @param columns
+ * @param ref
+ */
+
+export 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/es/utils/index.d.ts

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

package/es/utils/index.js

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

package/lib/actions/dialog.js

@@ -30,7 +30,7 @@ var _request = require("./request");
 
 var _utils2 = require("./utils");
 
-var _excluded = ["url", "method", "params", "data", "extendParams", "successMsg", "errorMsg", "formatParams", "formatResult", "onSuccess", "onError"],
+var _excluded = ["trigger", "url", "method", "params", "data", "extendParams", "successMsg", "errorMsg", "formatParams", "formatResult", "onSuccess", "onError"],
     _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 }; }
@@ -107,7 +107,8 @@ function useDialogAction(action, actionContext) {
   var onActionStart = function onActionStart(context, e) {
     var _objectSpread2;
 
-    var url = action.url,
+    var trigger = action.trigger,
+        url = action.url,
         method = action.method,
         params = action.params,
         data = action.data,
@@ -187,45 +188,34 @@ function useDialogAction(action, actionContext) {
             while (1) {
               switch (_context.prev = _context.next) {
                 case 0:
-                  if (!link) {
-                    _context.next = 5;
-                    break;
-                  }
-
-                  (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) {
@@ -265,7 +255,7 @@ function useDialogAction(action, actionContext) {
     })), _objectSpread2), containerProps), containerOtherProps);
 
     var ret = container.show(quickShowProps);
-    store.hide = ret.hide;
+    store.hide = ret ? ret.hide || ret.close : function () {};
   };
 
   return _objectSpread({}, (0, _base.eventHandler)(action, actionContext, onActionStart));

package/lib/actions/index.d.ts

@@ -26,31 +26,45 @@ export declare type ProActionConfig = ({
 } & LinkAction);
 export declare function registerActionHandler(id: string, extendActionId: string, defaultConfig: any): void;
 export declare function useAction(config?: ProActionConfig, context?: any): any;
-export interface ProActionButtonProps extends ButtonProps {
-    key?: string | number;
+export interface ProActionButtonProps extends ProActionCommonProps, ButtonProps {
     config?: ProActionConfig;
-    visible?: any;
     disabled?: any;
     icon?: string;
-    context?: any;
     onClick?: (event: React.MouseEvent<Element, MouseEvent>, context?: any) => void;
 }
 export declare const ProActionButton: (props: ProActionButtonProps) => JSX.Element;
-export interface ProActionMenuButtonProps extends MenuButtonProps {
+export interface ProActionCommonProps {
     key?: string | number;
-    actions: ProActionProps[];
     visible?: any;
-    icon?: string;
     context?: any;
 }
+export interface ProActionMenuButtonProps extends ProActionCommonProps, Omit<MenuButtonProps, 'visible'> {
+    actions: ProActionProps[];
+    icon?: string;
+}
 export declare const ProActionMenuButton: (props: ProActionMenuButtonProps) => JSX.Element;
-export declare type ProActionProps = ProActionButtonProps | ProActionMenuButtonProps;
+export interface ProActionDividerProps extends ProActionCommonProps {
+    type: 'divider';
+}
+export declare type ProActionProps = ProActionButtonProps | ProActionMenuButtonProps | ProActionDividerProps;
 export declare type ProActionGroupProps = {
+    /** 操作组类型：按钮、文字按钮 */
     type?: 'button' | 'text';
+    /** 上下文 */
     context?: any;
+    /** 操作项配置 */
     actions: ProActionProps[];
+    /** 操作按钮最长数量，超出后折叠，默认为4 */
     max?: number;
+    /**
+     * @deprecated 建议使用 more 代替
+     */
     moreText?: string;
+    /** 更多按钮的配置，只有在actions数量超过max时才有效 */
+    more?: string | (ProActionButtonProps & {
+        noArrow?: boolean;
+    });
+    /** 是否有分割线，只有type="text"时生效，默认有分割线 */
     divider?: boolean;
 } & React.HTMLAttributes<HTMLElement>;
 export declare function ProActionGroup(props: ProActionGroupProps): JSX.Element;

package/lib/actions/index.js

@@ -58,9 +58,10 @@ var _excluded = ["type"],
     _excluded3 = ["loading"],
     _excluded4 = ["icon", "iconSize", "label", "actions", "children", "context", "type"],
     _excluded5 = ["context", "text"],
-    _excluded6 = ["key", "actions"],
-    _excluded7 = ["key", "config"],
-    _excluded8 = ["type", "divider", "max", "moreText", "context", "actions", "className"];
+    _excluded6 = ["noArrow", "className"],
+    _excluded7 = ["key", "actions"],
+    _excluded8 = ["key", "config"],
+    _excluded9 = ["type", "divider", "max", "moreText", "more", "context", "actions", "className"];
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
@@ -248,6 +249,12 @@ var ProActionMenuButtonItem = function ProActionMenuButtonItem(props) {
 };
 
 function renderCommonActionButtonMenuItem(action, key, context) {
+  if (action.type === 'divider') {
+    return /*#__PURE__*/_react.default.createElement(_components.Menu.Divider, {
+      key: key
+    });
+  }
+
   var menuBtn = action;
 
   if (menuBtn.actions && menuBtn.actions.length && menuBtn.disabled !== true) {
@@ -292,27 +299,48 @@ var ProActionMenuButton = function ProActionMenuButton(props) {
   }, others), actions.map(function (action, i) {
     return renderCommonActionButtonMenuItem(action, action.key || i, context);
   }));
-}; // 如果 actions 数量超过了 max，则把第 max 个和剩余超出部分折叠起来成为一个 menu
+}; // 超出 max，则折叠起来
 
 
 exports.ProActionMenuButton = ProActionMenuButton;
 
-function formatGroupActions(actions, max, moreConfig) {
-  var MAX = max < 1 ? MAX_ACTTIONS : max;
-
-  if (actions.length <= MAX) {
+function foldExtraActions(actions, max, moreConfig) {
+  if (actions.length <= max) {
     return actions;
   }
 
-  return [].concat(_toConsumableArray(actions.slice(0, MAX - 1)), [_objectSpread(_objectSpread({
+  return [].concat(_toConsumableArray(actions.slice(0, max - 1)), [_objectSpread(_objectSpread({
     key: '__teamix_pro_action_group_more_btn'
   }, moreConfig), {}, {
-    actions: actions.slice(MAX - 1)
+    actions: actions.slice(max - 1)
   })]);
+} // 如果 actions 数量超过了 max，则把第 max 个和剩余超出部分折叠起来成为一个 menu
+// divider 不计数
+
+
+function formatGroupActions(actions, max, moreConfig) {
+  var MAX = max < 1 ? MAX_ACTTIONS : max;
+  var count = 0;
+  var index = 0;
+
+  for (; index < actions.length && count < MAX; index++) {
+    if (actions[index].type !== 'divider') {
+      count += 1;
+    }
+  }
+
+  return foldExtraActions(actions, Math.max(index, MAX), moreConfig);
 } // 渲染一个 button 或者 menu button
 
 
 function renderCommonActionButton(button, context, isTypeText) {
+  if (button.type === 'divider') {
+    return /*#__PURE__*/_react.default.createElement(_components.Divider, {
+      key: button.key,
+      direction: "ver"
+    });
+  }
+
   var buttonContext = button.context,
       text = button.text,
       others = _objectWithoutProperties(button, _excluded5);
@@ -329,25 +357,36 @@ 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 noArrowClassName = 'teamix-pro-actions-text-menu-btn-no-arrow';
+  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'
+    className: noArrowClassName
   };
+
+  if (!more) {
+    return defaultConfig;
+  }
+
+  var moreConfig = typeof more === 'string' ? {
+    children: more
+  } : more;
+
+  if (type === 'button') {
+    return Object.assign(defaultConfig, moreConfig);
+  }
+
+  var noArrow = moreConfig.noArrow,
+      className = moreConfig.className,
+      others = _objectWithoutProperties(moreConfig, _excluded6);
+
+  return _objectSpread({
+    className: (0, _classnames.default)(className, _defineProperty({}, "".concat(noArrowClassName), noArrow))
+  }, others);
 }
 
 var MAX_ACTTIONS = 4;
@@ -364,7 +403,7 @@ function getActionConfig(action, index, context) {
   if (action.actions) {
     var _key = action.key,
         actions = action.actions,
-        _others = _objectWithoutProperties(action, _excluded6);
+        _others = _objectWithoutProperties(action, _excluded7);
 
     return _objectSpread({
       key: getKey(index, _key),
@@ -376,7 +415,7 @@ function getActionConfig(action, index, context) {
 
   var key = action.key,
       config = action.config,
-      others = _objectWithoutProperties(action, _excluded7);
+      others = _objectWithoutProperties(action, _excluded8);
 
   return _objectSpread({
     key: getKey(index, key),
@@ -392,11 +431,12 @@ 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,
       className = props.className,
-      containerProps = _objectWithoutProperties(props, _excluded8);
+      containerProps = _objectWithoutProperties(props, _excluded9);
 
   var isTypeText = type === 'text';
   var filteredActions = actions.map(function (action, index) {
@@ -404,7 +444,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/index.scss

@@ -2,12 +2,23 @@
   display: flex;
   align-items: center;
   flex-wrap: wrap;
+
+  & > .next-divider {
+    & + .next-divider {
+      display: none;
+    }
+  }
+
   &.teamix-pro-actions-type-button {
     & > button {
       &:not(:last-child) {
         margin-right: var(--s-2);
       }
     }
+    & > .next-divider {
+      margin-left: 0;
+      margin-right: var(--s-2);
+    }
   }
 
   &.teamix-pro-actions-type-text:not(.teamix-pro-actions-divider) {
@@ -109,4 +120,4 @@
       }
     }
   }
-}
+}

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

@@ -0,0 +1,24 @@
+import React from 'react';
+import { TableProps, ColumnProps } from '@alifd/next/types/table';
+import './index.scss';
+declare type ISelectTableFilterOption = boolean | ((optipn: any, kewword: string) => boolean);
+declare type ISelectTableFilterSort = (optionA: any, optionB: any) => number;
+export interface ISelectTableColumnProps extends ColumnProps {
+    key: React.ReactText;
+}
+export interface ISelectTableProps extends TableProps {
+    mode?: 'multiple' | 'single';
+    dataSource?: any[];
+    optionAsValue?: boolean;
+    showSearch?: boolean;
+    filterOption?: ISelectTableFilterOption;
+    filterSort?: ISelectTableFilterSort;
+    onSearch?: (kekword: string) => void;
+    onChange?: (value: any) => void;
+    value?: any;
+}
+declare type ComposedSelectTable = React.FC<ISelectTableProps> & {
+    TableColumn?: React.FC<ISelectTableColumnProps>;
+};
+declare const SelectTable: ComposedSelectTable;
+export default SelectTable;