@teamix/pro 1.2.21 → 1.2.26

package/es/form/ProForm/index.scss

@@ -186,13 +186,13 @@
 }
 
 // 数组类组件添加按钮
-.#{$css-prefix}formily-array-base-addition {
+.#{$form-array}-base-addition {
   .#{$css-prefix}formily-icon {
     margin-right: 4px;
   }
 }
 // 数组类ArrayItem Icon 居中
-.#{$css-prefix}formily-array-items-item-inner {
+.#{$form-array}-items-item-inner {
   > .#{$css-prefix}box {
     > .#{$css-prefix}space-item {
       > .#{$css-prefix}formily-icon {
@@ -209,7 +209,7 @@
 
 // 折叠面板
 .#{$css-prefix}formily-collapse,
-.#{$css-prefix}formily-array-collapse-item {
+.#{$form-array}-collapse-item {
   .#{$css-prefix}collapse-panel-hidden {
     .#{$css-prefix}collapse-panel-content {
       padding-top: 4px;
@@ -261,7 +261,7 @@
 }
 
 // ArrayItems
-.#{$css-prefix}formily-array-items {
+.#{$form-array}-items {
   .#{$css-prefix}formily-grid-layout {
     > div:last-child {
       display: flex;
@@ -269,8 +269,39 @@
       align-items: center;
     }
   }
-  .#{$css-prefix}formily-array-base-remove {
-    cursor: pointer;
+}
+.#{$form-array}-base-remove,
+.#{$form-array}-base-addition,
+.#{$form-array}-base-move-down,
+.#{$form-array}-base-move-up,
+.#{$form-array}-base-sort-handle,
+.form-array-base-icon {
+  color: var(--color-fill1-6, #848484);
+  &:hover {
+    color: var(--color-brand1-6, #0064c8);
+  }
+}
+.form-array-base-icon {
+  cursor: pointer;
+}
+
+// ArrayCard
+.#{$form-array}-cards-item {
+  .#{$css-prefix}card-head {
+    padding: 16px 20px;
+    background-color: var(--color-fill1-2, #f7f7f7);
+    .#{$css-prefix}card-head-main {
+      margin-top: 0;
+      border-bottom: 0;
+      height: 22px;
+      line-height: 22px;
+      .#{$css-prefix}card-title {
+        padding-left: 0;
+        &::before {
+          display: none;
+        }
+      }
+    }
   }
 }
 

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/global.scss

@@ -1,6 +1,7 @@
 @import '~@alicloudfe/components/lib/common-var.scss';
 
 $form-item-cls: #{$css-prefix}formily-item;
+$form-array: #{$css-prefix}formily-array;
 $teamix-pro-form: teamix-pro-form;
 $teamix-pro-field: teamix-pro-field;
 

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.20";
-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.20';
+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;

package/es/step/ProStepItem/components/HozStepItem/index.js

@@ -0,0 +1,235 @@
+var _excluded = ["_size", "_index", "_shape", "_current", "status", "icon", "title", "content", "percent", "disabled", "dotRender", "onClick"];
+
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+
+function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+
+function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
+
+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, { memo, useCallback, useMemo } from 'react';
+import { Icon, Step } from '@alicloudfe/components';
+import classnames from 'classnames';
+import TeamixIcon from '@teamix/icon';
+import { baseClass } from '@teamix/utils';
+import './index.scss';
+var StepItem = Step.Item;
+var cls = baseClass('teamix-pro-step');
+
+var HozStepItem = function HozStepItem(props) {
+  var _size = props._size,
+      _index = props._index,
+      _shape = props._shape,
+      _current = props._current,
+      status = props.status,
+      icon = props.icon,
+      title = props.title,
+      content = props.content,
+      percent = props.percent,
+      disabled = props.disabled,
+      dotRender = props.dotRender,
+      onClick = props.onClick,
+      others = _objectWithoutProperties(props, _excluded);
+  /** 对枚举类型进行处理 */
+
+
+  var formatShape = function formatShape() {
+    if (['dot', 'icon', 'arrow', 'number'].includes(_shape)) return _shape;
+    return 'dot';
+  };
+
+  var formatStatus = function formatStatus() {
+    if (['success', 'fail', 'process', 'warning', 'wait'].includes(status)) return status;
+    return 'wait';
+  };
+
+  var formatSize = function formatSize() {
+    if (['normal', 'small'].includes(_size)) return _size;
+    return 'normal';
+  };
+  /** 计算当前节点的状态 */
+
+
+  var getStatus = useMemo(function () {
+    // 默认 status 取传递进来的 status 参数
+    var process = formatStatus() === 'process' && !disabled;
+    var success = formatStatus() === 'success' && !disabled;
+    var error = formatStatus() === 'fail' && !disabled;
+    var warning = formatStatus() === 'warning' && !disabled;
+    var wait = formatStatus() === 'wait' && !disabled; // 如果传递了 current 参数，则重新计算当前节点的状态
+
+    if (_current) {
+      process = _index === _current && !disabled;
+      wait = _index > _current && wait;
+      success = _index < _current && !error && !warning;
+    }
+
+    return {
+      process: process,
+      success: success,
+      error: error,
+      warning: warning,
+      wait: wait
+    };
+  }, [_index, _current, status]); // 获取一些常量
+
+  var process = getStatus.process,
+      success = getStatus.success,
+      error = getStatus.error,
+      warning = getStatus.warning,
+      wait = getStatus.wait;
+  var dot = formatShape() === 'dot';
+  var arrow = formatShape() === 'arrow';
+  var circle_icon = formatShape() === 'icon';
+  var circle_number = formatShape() === 'number';
+  var normal_size = formatSize() === 'normal';
+  var small_size = formatSize() === 'small';
+  /** 重新渲染 node 节点 */
+
+  var renderNode = useCallback(function () {
+    // 渲染dot 节点
+    var renderDot = function renderDot() {
+      return !icon ? /*#__PURE__*/React.createElement("div", {
+        className: classnames(cls({
+          'hoz-step-item-render-wrapper-dot-normal': normal_size,
+          'hoz-step-item-render-wrapper-dot-small': small_size,
+          'hoz-step-item-render-wrapper-dot-disabled': disabled,
+          'hoz-step-item-render-wrapper-dot-process': process,
+          'hoz-step-item-render-wrapper-dot-success': success,
+          'hoz-step-item-render-wrapper-dot-error': error,
+          'hoz-step-item-render-wrapper-dot-warning': warning,
+          'hoz-step-item-render-wrapper-dot-wait': wait
+        }))
+      }) : /*#__PURE__*/React.createElement("div", {
+        className: classnames(cls({
+          'hoz-step-item-render-wrapper-icon-disabled': disabled,
+          'hoz-step-item-render-wrapper-icon-process': process,
+          'hoz-step-item-render-wrapper-icon-success': success,
+          'hoz-step-item-render-wrapper-icon-error': error,
+          'hoz-step-item-render-wrapper-icon-warning': warning,
+          'hoz-step-item-render-wrapper-icon-wait': wait
+        }))
+      }, /*#__PURE__*/React.createElement(Icon, {
+        type: icon,
+        size: "small"
+      }));
+    }; // 渲染 circle 节点
+
+
+    var renderCircle = function renderCircle() {
+      if (dotRender) return /*#__PURE__*/React.createElement("div", {
+        className: classnames(cls('hoz-step-item-render-wrapper'))
+      }, dotRender());
+
+      var renderIconOrNumber = function renderIconOrNumber() {
+        if (percent) return /*#__PURE__*/React.createElement("div", {
+          className: classnames(cls('ver-step-item-render-wrapper-circle-percent'))
+        }, percent, "%");
+        if (icon) return /*#__PURE__*/React.createElement(Icon, {
+          type: icon,
+          size: "medium"
+        });
+        if (success) return /*#__PURE__*/React.createElement(TeamixIcon, {
+          type: "check-line",
+          size: "small"
+        });
+        if (error) return /*#__PURE__*/React.createElement(TeamixIcon, {
+          type: "close-line",
+          size: "small"
+        });
+        if (warning) return /*#__PURE__*/React.createElement(TeamixIcon, {
+          type: "exclamation-line",
+          size: "small"
+        });
+        if (process && circle_icon) return /*#__PURE__*/React.createElement(TeamixIcon, {
+          type: "loading-line",
+          size: "small"
+        });
+        if (wait && circle_icon) return /*#__PURE__*/React.createElement(TeamixIcon, {
+          type: "more-line",
+          size: "small"
+        });
+        return _index + 1;
+      };
+
+      return /*#__PURE__*/React.createElement("div", {
+        className: classnames(cls({
+          'hoz-step-item-render-wrapper-circle': true,
+          'hoz-step-item-render-wrapper-circle-disabled': disabled,
+          'hoz-step-item-render-wrapper-circle-process': process,
+          'hoz-step-item-render-wrapper-circle-success': success,
+          'hoz-step-item-render-wrapper-circle-error': error,
+          'hoz-step-item-render-wrapper-circle-warning': warning,
+          'hoz-step-item-render-wrapper-circle-wait': wait,
+          'hoz-step-item-render-wrapper-percent-color': percent
+        }))
+      }, renderIconOrNumber());
+    };
+
+    var renderStateNode = function renderStateNode() {
+      if (circle_icon || circle_number) {
+        return renderCircle();
+      }
+
+      return renderDot();
+    };
+
+    return /*#__PURE__*/React.createElement("div", {
+      className: classnames(cls('hoz-step-item'))
+    }, /*#__PURE__*/React.createElement("div", {
+      className: classnames(cls({
+        'hoz-step-item-render-wrapper': true,
+        'hoz-step-item-render-wrapper-disabled': disabled,
+        'hoz-step-item-render-wrapper-tail-process': process,
+        'hoz-step-item-render-wrapper-tail-success': success,
+        'hoz-step-item-render-wrapper-tail-error': error,
+        'hoz-step-item-render-wrapper-tail-warning': warning,
+        'hoz-step-item-render-wrapper-tail-wait': wait
+      }))
+    }, renderStateNode()));
+  }, [_index, _shape, _size, disabled, icon, percent, status, dotRender]); // 轴连接线添加color
+
+  var renderColor = useMemo(function () {
+    if (_current) {
+      if (_current > _index) return true;
+    }
+
+    return false;
+  }, [_index, _current]); // 重新渲染 title
+
+  var renderTitle = useCallback(function () {
+    return /*#__PURE__*/React.createElement("div", {
+      className: classnames(cls({
+        'hoz-step-item-render-title-normal': normal_size && dot,
+        'hoz-step-item-render-title-small': small_size && dot
+      }))
+    }, title);
+  }, [_size, title]);
+  return /*#__PURE__*/React.createElement(StepItem, _objectSpread(_objectSpread({
+    className: classnames(cls({
+      'hoz-step-item-render-tail-process': process && renderColor,
+      'hoz-step-item-render-tail-success': success && renderColor,
+      'hoz-step-item-render-tail-error': error && renderColor,
+      'hoz-step-item-render-tail-warning': warning && renderColor,
+      'hoz-step-item-render-tail-wait': wait || !renderColor && !disabled,
+      'hoz-step-item-render-arrow-process': arrow && process,
+      'hoz-step-item-render-arrow-success': arrow && success,
+      'hoz-step-item-render-arrow-error': arrow && error,
+      'hoz-step-item-render-arrow-warning': arrow && warning,
+      'hoz-step-item-render-arrow-wait': arrow && wait
+    }))
+  }, others), {}, {
+    status: 'wait',
+    icon: icon,
+    title: renderTitle(),
+    content: content,
+    disabled: disabled,
+    itemRender: renderNode,
+    onClick: onClick
+  }));
+};
+
+export default /*#__PURE__*/memo(HozStepItem);