@teamix/pro 1.2.24 → 1.2.26

package/es/actions/dialog.js

@@ -229,7 +229,7 @@ export 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({}, eventHandler(action, actionContext, onActionStart));

package/es/actions/index.d.ts

@@ -26,25 +26,27 @@ 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';
@@ -59,7 +61,9 @@ export declare type ProActionGroupProps = {
      */
     moreText?: string;
     /** 更多按钮的配置，只有在actions数量超过max时才有效 */
-    more?: string | ProActionButtonProps;
+    more?: string | (ProActionButtonProps & {
+        noArrow?: boolean;
+    });
     /** 是否有分割线，只有type="text"时生效，默认有分割线 */
     divider?: boolean;
 } & React.HTMLAttributes<HTMLElement>;

package/es/actions/index.js

@@ -3,9 +3,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", "more", "context", "actions", "className"];
+    _excluded6 = ["noArrow", "className"],
+    _excluded7 = ["key", "actions"],
+    _excluded8 = ["key", "config"],
+    _excluded9 = ["type", "divider", "max", "moreText", "more", "context", "actions", "className"];
 
 function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
 
@@ -209,6 +210,12 @@ var ProActionMenuButtonItem = function ProActionMenuButtonItem(props) {
 };
 
 function renderCommonActionButtonMenuItem(action, key, context) {
+  if (action.type === 'divider') {
+    return /*#__PURE__*/React.createElement(Menu.Divider, {
+      key: key
+    });
+  }
+
   var menuBtn = action;
 
   if (menuBtn.actions && menuBtn.actions.length && menuBtn.disabled !== true) {
@@ -253,24 +260,45 @@ export var ProActionMenuButton = function ProActionMenuButton(props) {
   }, others), actions.map(function (action, i) {
     return renderCommonActionButtonMenuItem(action, action.key || i, context);
   }));
-}; // 如果 actions 数量超过了 max，则把第 max 个和剩余超出部分折叠起来成为一个 menu
-
-function formatGroupActions(actions, max, moreConfig) {
-  var MAX = max < 1 ? MAX_ACTTIONS : max;
+}; // 超出 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.createElement(Divider, {
+      key: button.key,
+      direction: "ver"
+    });
+  }
+
   var buttonContext = button.context,
       text = button.text,
       others = _objectWithoutProperties(button, _excluded5);
@@ -288,18 +316,35 @@ function renderCommonActionButton(button, context, isTypeText) {
 }
 
 function getDefaultMoreButton(type, more) {
-  var moreConfig = typeof more === 'string' ? {
-    children: more
-  } : more;
+  var noArrowClassName = 'teamix-pro-actions-text-menu-btn-no-arrow';
   var defaultConfig = type === 'button' ? {
     children: getMessage('more')
   } : {
     icon: 'more-line',
     // iconSize: 'small',
     autoWidth: false,
-    className: 'teamix-pro-actions-text-menu-btn-no-arrow'
+    className: noArrowClassName
   };
-  return Object.assign(defaultConfig, moreConfig);
+
+  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: cls(className, _defineProperty({}, "".concat(noArrowClassName), noArrow))
+  }, others);
 }
 
 var MAX_ACTTIONS = 4;
@@ -316,7 +361,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),
@@ -328,7 +373,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),
@@ -349,7 +394,7 @@ export function ProActionGroup(props) {
       _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) {

package/es/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/es/form/SchemaForm/index.js

@@ -106,8 +106,10 @@ export default /*#__PURE__*/memo(function (_ref) {
   }, [scope]); // 格式化 schema
 
   var formatSchema = useCallback(function (schema) {
+    var suffix = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : '';
     var schemaProperties = {};
     schema === null || schema === void 0 ? void 0 : schema.forEach(function (item, index) {
+      suffix = "".concat(suffix).concat(index);
       var newItem = warning(item);
       var _newItem = newItem,
           originalComponent = _newItem.component; // 根据component的不同，初始化为内置的item
@@ -171,7 +173,7 @@ export default /*#__PURE__*/memo(function (_ref) {
           component = _newItem2.component,
           type = _newItem2.type,
           _newItem2$name = _newItem2.name,
-          name = _newItem2$name === void 0 ? getFieldName(component === null || component === void 0 ? void 0 : component.replace(/\./g, ''), index) : _newItem2$name,
+          name = _newItem2$name === void 0 ? getFieldName(component === null || component === void 0 ? void 0 : component.replace(/\./g, ''), suffix) : _newItem2$name,
           decorator = _newItem2.decorator,
           decoratorProps = _newItem2.decoratorProps,
           dataSource = _newItem2.dataSource,
@@ -196,18 +198,18 @@ export default /*#__PURE__*/memo(function (_ref) {
       var defaultDecoratorProps = _objectSpread(_objectSpread({}, tooltipProps), decoratorProps); // 初始化request
 
 
-      var _initializeRequest = initializeRequest(request, index),
+      var _initializeRequest = initializeRequest(request, suffix),
           requestReactions = _initializeRequest.reactions,
           requestScope = _initializeRequest.scope; // 初始化dataSource
 
 
-      var _initializeDataSource = initializeDataSource(dataSource, index),
+      var _initializeDataSource = initializeDataSource(dataSource, suffix),
           defaultDataSource = _initializeDataSource.dataSource,
           dataSourceReactions = _initializeDataSource.reactions,
           dataSourceScope = _initializeDataSource.scope; // 初始化rules
 
 
-      var _initializeRules = initializeRules(rules, index),
+      var _initializeRules = initializeRules(rules, suffix),
           defaultRules = _initializeRules.rules,
           rulesScope = _initializeRules.scope; // 合并reactions，初始化reactions
 
@@ -235,11 +237,11 @@ export default /*#__PURE__*/memo(function (_ref) {
       })); // 递归子组件
 
       var recursiveProperties = (children === null || children === void 0 ? void 0 : children.length) ? {
-        properties: formatSchema(children)
+        properties: formatSchema(children, suffix)
       } : {}; // 递归items（类似子组件，会先由各initialize方法格式化为固定形式，type不同不统一处理）
       // 例如：[{ name: 'items', type: 'object', children: items }]
 
-      var recursiveItems = items ? formatSchema([items]) : {}; // 配置组件属性
+      var recursiveItems = items ? formatSchema([items], suffix) : {}; // 配置组件属性
 
       schemaProperties[name] = _objectSpread(_objectSpread(_objectSpread({}, formatParam), recursiveProperties), recursiveItems);
     });

package/es/form/SchemaForm/initializeDataSource.d.ts

@@ -1,6 +1,6 @@
 import type { ProFormRequestConfig } from '../typing';
 interface IInitializeDataSource {
-    (requestConfig?: ProFormRequestConfig | any, index?: number): {
+    (requestConfig?: ProFormRequestConfig | any, suffix?: string): {
         dataSource?: any[];
         reactions: any[];
         scope: {

package/es/form/SchemaForm/initializeDataSource.js

@@ -2,10 +2,10 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
 
 import { isPlainObj } from '@teamix/utils';
 
-var initializeDataSource = function initializeDataSource(dataSource, index) {
+var initializeDataSource = function initializeDataSource(dataSource, suffix) {
   if (isPlainObj(dataSource)) {
     var requestConfig = dataSource;
-    var requestConfigName = "$requestConfig_".concat(index);
+    var requestConfigName = "$requestConfig_".concat(suffix);
     return {
       reactions: ["{{$dataSource($request,".concat(requestConfigName, ",context)}}")],
       scope: _defineProperty({}, requestConfigName, requestConfig)

package/es/form/SchemaForm/initializeRequest.d.ts

@@ -1,6 +1,6 @@
 import type { ProFormRequestConfig } from '../typing';
 interface IInitializeRequest {
-    (requestConfig?: ProFormRequestConfig, index?: number): {
+    (requestConfig?: ProFormRequestConfig, suffix?: string): {
         reactions: any[];
         scope: {
             [x: string]: any;

package/es/form/SchemaForm/initializeRequest.js

@@ -1,8 +1,8 @@
 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 initializeRequest = function initializeRequest(requestConfig, index) {
+var initializeRequest = function initializeRequest(requestConfig, suffix) {
   if (requestConfig) {
-    var requestConfigName = "$requestConfig_".concat(index);
+    var requestConfigName = "$requestConfig_".concat(suffix);
     return {
       reactions: ["{{$common($request,".concat(requestConfigName, ",context)}}")],
       scope: _defineProperty({}, requestConfigName, requestConfig)

package/es/form/SchemaForm/initializeRules.d.ts

@@ -1,5 +1,5 @@
 interface IInitializeRules {
-    (rules?: any, index?: number): {
+    (rules?: any, suffix?: string): {
         rules?: any;
         reactions: any[];
         scope: {

package/es/form/SchemaForm/initializeRules.js

@@ -18,13 +18,13 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
 
 import { isArr, isPlainObj } from '@teamix/utils';
 
-var initializeRules = function initializeRules(rules, index) {
+var initializeRules = function initializeRules(rules, suffix) {
   var initializeValidator = function initializeValidator(rule) {
-    var subIndex = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 0;
+    var index = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 0;
 
     if (isPlainObj(rule === null || rule === void 0 ? void 0 : rule.validator)) {
       var requestConfig = rule.validator;
-      var requestConfigName = "$requestConfig_".concat(index, "_").concat(subIndex);
+      var requestConfigName = "$requestConfig_".concat(suffix).concat(index);
       return {
         rules: _objectSpread(_objectSpread({}, rule), {}, {
           validator: "{{$validator($request,".concat(requestConfigName, ",context)}}")

package/es/form/typing.d.ts

@@ -75,23 +75,14 @@ export interface QueryFilterProps extends ProFormProps {
      * @deprecated triggerType已弃用
      */
     triggerType?: 'keydown' | 'change' | 'submit';
-    /** 表单展示形式 */
     mode?: 'inline' | 'panel';
-    /** 面板是否默认展开，仅在 mode='panel' 时生效 */
     expand?: boolean;
-    /** 顶部筛选区前缀 */
     addonBefore?: ReactNode;
-    /** 顶部筛选区后缀 */
     addonAfter?: ReactNode;
-    /** 顶部筛选区默认筛选项 */
     defaultFilterValue?: string;
-    /** 透出内部表单实例 */
     formRef?: React.MutableRefObject<any>;
-    /** 表单初始化（含异步默认值）后回调函数 */
     onInit?: (values: any) => boolean;
-    /** 表单筛选回调函数 */
     onFilter?: (values: any) => void;
-    /** 表单重置回调函数 */
     onReset?: (payload?: any) => void;
 }
 /**

package/es/form/utils.d.ts

@@ -17,11 +17,11 @@ declare const mapMode: (props: any, field: any) => any;
 /**
  * 创建字段名称
  * @param prefix 字段名称前缀，接收字段component名称，默认为FieldName
- * @param index 字段索引
+ * @param suffix 字段后缀，唯一标识
  * @returns 字段唯一名称
  */
 interface IGetFieldName {
-    (prefix: string, index?: number): string;
+    (prefix: string, suffix?: string): string;
 }
 declare const getFieldName: IGetFieldName;
 /**

package/es/form/utils.js

@@ -115,8 +115,8 @@ var mapMode = function mapMode(props, field) {
 
 var getFieldName = function getFieldName() {
   var prefix = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 'FieldName';
-  var index = arguments.length > 1 ? arguments[1] : undefined;
-  return "".concat(prefix, "-").concat(index);
+  var suffix = arguments.length > 1 ? arguments[1] : undefined;
+  return "".concat(prefix, "-").concat(suffix);
 };
 /**
  * 将ProForm的key映射为formily的key，然后筛除掉无效的key/value

package/es/index.d.ts

@@ -9,6 +9,7 @@ import ProPageHeader from './page-header';
 import ProTable from './table';
 import ProSkeleton from './skeleton';
 import utils from './utils';
+import { ProStep } from './step';
 import * as nocode from './nocode';
 import * as templates from './templates';
 export * from './actions';
@@ -21,5 +22,7 @@ export * from './page-container';
 export * from './page-header';
 export * from './skeleton';
 export * from './table';
-declare const version = "1.2.24";
-export { version, ProAction, ProCard, ProField, ProForm, ProInfo, ProPageContainer, ProPageHeader, ProSkeleton, ProTable, hooks, nocode, templates, utils, };
+export * from './utils';
+export * from './step';
+declare const version = "1.2.26";
+export { version, ProAction, ProCard, ProField, ProForm, ProInfo, ProPageContainer, ProPageHeader, ProSkeleton, ProTable, ProStep, hooks, nocode, templates, utils, };

package/es/index.js

@@ -11,6 +11,7 @@ import ProTable from './table';
 import ProSkeleton from './skeleton';
 import utils from './utils'; // import ProSidebar from './sidebar'
 
+import { ProStep } from './step';
 import * as nocode from './nocode';
 import * as templates from './templates';
 import TeamixIcon from '@teamix/icon'; // 设置图标源
@@ -25,9 +26,11 @@ export * from './nocode';
 export * from './page-container';
 export * from './page-header';
 export * from './skeleton';
-export * from './table'; // export * from './sidebar';
+export * from './table';
+export * from './utils'; // export * from './sidebar';
 
-var version = '1.2.24';
+export * from './step';
+var version = '1.2.26';
 export { version, ProAction, ProCard, ProField, ProForm, ProInfo, // ProLayout,
 ProPageContainer, ProPageHeader, ProSkeleton, ProTable, // ProSidebar,
-hooks, nocode, templates, utils };
+ProStep, hooks, nocode, templates, utils };

package/es/step/ProStepItem/components/HozStepItem/index.d.ts

@@ -0,0 +1,5 @@
+import React from 'react';
+import { HozStepItemProps } from '../../../typing';
+import './index.scss';
+declare const _default: React.NamedExoticComponent<HozStepItemProps>;
+export default _default;