@teamix/pro 1.2.32 → 1.3.0

package/lib/form/Filter/index2.scss

@@ -1,38 +1,8 @@
 @import '../global.scss';
 
-$query-filter: #{$teamix-pro-form}-query-filter;
-
-.#{$query-filter} {
-  .#{$query-filter}-inline {
-    margin-right: 8px;
-    margin-bottom: 8px;
-  }
-  .#{$query-filter}-inline-hidden {
-    display: none;
-  }
-  .#{$query-filter}-tag-title {
-    margin-right: 12px;
-    color: var(--color-text1-8, #848484);
-  }
-  .#{$query-filter}-tag-content {
-    .#{$teamix-pro-field} {
-      display: inline-block;
-      .#{$css-prefix}form-preview {
-        color: var(--color-text1-2, #5a5a5a);
-        font-weight: bold;
-      }
-    }
-  }
-}
-
-.#{$query-filter}-advanced {
-  .#{$css-prefix}formily-button-group {
-    margin-top: 0;
-  }
-}
-.#{$query-filter}-advanced,
-.#{$query-filter}-simple,
-.#{$query-filter}-light {
+// 筛选
+.#{$teamix-pro-form}-filter-advanced,
+.#{$teamix-pro-form}-filter-simple {
   .#{$form-item-cls}-feedback-layout-popover {
     margin-bottom: 0;
   }
@@ -45,3 +15,11 @@ $query-filter: #{$teamix-pro-form}-query-filter;
     }
   }
 }
+
+// 筛选和抽屉按钮
+.#{$teamix-pro-form}-filter-advanced,
+.#{$css-prefix}drawer-footer {
+  .#{$css-prefix}formily-button-group {
+    margin-top: 0;
+  }
+}

package/lib/form/Filter/useSpecialProps.d.ts

@@ -1,6 +1,6 @@
 declare const useSpecialProps: (props: any) => {
     hasDefault: boolean;
-    hasAsyncDefault: boolean;
+    hasChangeDefault: boolean;
     hasRequired: boolean;
 };
 export default useSpecialProps;

package/lib/form/Filter/useSpecialProps.js

@@ -11,8 +11,9 @@ var _utils = require("@teamix/utils");
 var useSpecialProps = function useSpecialProps(props) {
   var initialValues = props.initialValues,
       initialRequest = props.initialRequest;
-  var hasDefault = !!initialValues;
-  var hasAsyncDefault = !!initialRequest;
+  var hasChangeDefault = !!initialValues || !!initialRequest; // 会触发onChange的默认值
+
+  var hasDefault = hasChangeDefault;
   var hasRequired = false;
 
   var hasDefaultOrRule = function hasDefaultOrRule(schema) {
@@ -20,13 +21,12 @@ var useSpecialProps = function useSpecialProps(props) {
       var value = item.default,
           required = item.required,
           rules = item.rules,
-          request = item.request,
           dataSource = item.dataSource,
-          children = item.children;
-      hasDefault = hasDefault || (0, _utils.isSignificative)(value);
+          children = item.children; // 字符串变量配置default值会触发onChange
+
+      hasChangeDefault = hasChangeDefault || !!((0, _utils.isPureObj)(dataSource) && (0, _utils.isStr)(value) && value.indexOf('.dataSource'));
+      hasDefault = hasDefault || (0, _utils.isUsable)(value);
       hasRequired = hasRequired || required || !!rules;
-      hasAsyncDefault = hasAsyncDefault || !!request || // 如果dataSource是异步且default取自dataSource
-      !!((0, _utils.isPlainObj)(dataSource) && (0, _utils.isStr)(value) && value.indexOf('.dataSource'));
 
       if (children === null || children === void 0 ? void 0 : children.length) {
         hasDefaultOrRule(children);
@@ -37,7 +37,7 @@ var useSpecialProps = function useSpecialProps(props) {
   hasDefaultOrRule(props.schema);
   return {
     hasDefault: hasDefault,
-    hasAsyncDefault: hasAsyncDefault,
+    hasChangeDefault: hasChangeDefault,
     hasRequired: hasRequired
   };
 };

package/lib/form/ProForm/index.js

@@ -31,7 +31,7 @@ var _validate = _interopRequireDefault(require("../locales/validate"));
 
 require("./index.scss");
 
-var _excluded = ["form", "initialValues", "initialRequest", "schema", "scope", "context", "components", "children", "layout", "labelAlign", "wrapperAlign", "labelCol", "wrapperCol", "breakpoints", "onChange", "onSubmit", "onSubmitFailed", "className"];
+var _excluded = ["form", "initialValues", "initialRequest", "schema", "scope", "context", "components", "children", "layout", "labelAlign", "wrapperAlign", "labelCol", "wrapperCol", "breakpoints", "onChange", "onSubmit", "onSubmitFailed", "onInitialComplete", "className"];
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
@@ -68,6 +68,7 @@ var ProForm = /*#__PURE__*/(0, _react.memo)(function (_ref) {
       onChange = _ref.onChange,
       onSubmit = _ref.onSubmit,
       onSubmitFailed = _ref.onSubmitFailed,
+      onInitialComplete = _ref.onInitialComplete,
       className = _ref.className,
       otherProps = _objectWithoutProperties(_ref, _excluded);
 
@@ -118,13 +119,12 @@ var ProForm = /*#__PURE__*/(0, _react.memo)(function (_ref) {
   (0, _react.useEffect)(function () {
     if (initialValues) {
       form.setInitialValues(initialValues);
+      onInitialComplete === null || onInitialComplete === void 0 ? void 0 : onInitialComplete(form);
     } else if (initialRequest) {
       (0, _useInitialRequest.default)(initialRequest).then(function (values) {
         form.setInitialValues(values);
       }).finally(function () {
-        initialRequest.onComplete && initialRequest.onComplete(undefined, undefined, {
-          form: form
-        });
+        onInitialComplete === null || onInitialComplete === void 0 ? void 0 : onInitialComplete(form);
       });
     }
   }, []); // 配置国际化

package/lib/form/ProForm/index.scss

@@ -143,6 +143,11 @@
           height: $inset-font-weight-medium;
           line-height: $inset-font-weight-medium;
         }
+        .#{$css-prefix}select-multiple {
+          .#{$css-prefix}input.#{$css-prefix}medium {
+            height: auto;
+          }
+        }
       }
     }
   }
@@ -192,14 +197,14 @@
     margin-right: 4px;
   }
 }
-// 数组类ArrayItem Icon 居中
-.#{$form-array}-items-item-inner {
-  .#{$css-prefix}space-item {
-    > .#{$css-prefix}formily-icon {
-      margin-top: 9px;
-    }
-  }
-}
+// 数组类ArrayItem Icon 居中（移除，通过align:center配置）
+// .#{$form-array}-items-item-inner {
+//   .#{$css-prefix}space-item {
+//     > .#{$css-prefix}formily-icon {
+//       margin-top: 9px;
+//     }
+//   }
+// }
 
 // Editable预览态行高
 .#{$css-prefix}formily-editable-content {

package/lib/form/SchemaForm/index.js

@@ -242,18 +242,18 @@ var _default = /*#__PURE__*/(0, _react.memo)(function (_ref) {
       var defaultDecoratorProps = _objectSpread(_objectSpread({}, tooltipProps), decoratorProps); // 初始化request
 
 
-      var _initializeRequest = (0, _initializeRequest2.default)(request, suffix),
+      var _initializeRequest = (0, _initializeRequest2.default)(request, "".concat(suffix, "r")),
           requestReactions = _initializeRequest.reactions,
-          requestScope = _initializeRequest.scope; // 初始化dataSource
+          requestScope = _initializeRequest.scope; // 初始化dataSource，如果readPretty为字符串表达式将失去loading等状态，仍可配置dataSource
 
 
-      var _initializeDataSource = (0, _initializeDataSource2.default)(dataSource, suffix),
+      var _initializeDataSource = (0, _initializeDataSource2.default)(dataSource, "".concat(suffix, "d"), newItem.readPretty),
           defaultDataSource = _initializeDataSource.dataSource,
           dataSourceReactions = _initializeDataSource.reactions,
-          dataSourceScope = _initializeDataSource.scope; // 初始化rules
+          dataSourceScope = _initializeDataSource.scope; // 初始化rules validator
 
 
-      var _initializeRules = (0, _initializeRules2.default)(rules, suffix),
+      var _initializeRules = (0, _initializeRules2.default)(rules, "".concat(suffix, "v")),
           defaultRules = _initializeRules.rules,
           rulesScope = _initializeRules.scope; // 合并reactions，初始化reactions
 

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

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

package/lib/form/SchemaForm/initializeDataSource.js

@@ -9,12 +9,12 @@ var _utils = require("@teamix/utils");
 
 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 initializeDataSource = function initializeDataSource(dataSource, suffix) {
+var initializeDataSource = function initializeDataSource(dataSource, suffix, readPretty) {
   if ((0, _utils.isPlainObj)(dataSource)) {
     var requestConfig = dataSource;
     var requestConfigName = "$requestConfig_".concat(suffix);
     return {
-      reactions: ["{{$dataSource($request,".concat(requestConfigName, ",context)}}")],
+      reactions: ["{{$dataSource($request,".concat(requestConfigName, ",context,").concat(readPretty, ")}}")],
       scope: _defineProperty({}, requestConfigName, requestConfig)
     };
   }

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

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

package/lib/form/SchemaForm/initializeRequest.js

@@ -5,15 +5,50 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 
+var _utils = require("@teamix/utils");
+
+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 _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
+
+function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+
+function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
+
+function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
+
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
+
 var initializeRequest = function initializeRequest(requestConfig, suffix) {
   if (requestConfig) {
-    var requestConfigName = "$requestConfig_".concat(suffix);
-    return {
-      reactions: ["{{$common($request,".concat(requestConfigName, ",context)}}")],
-      scope: _defineProperty({}, requestConfigName, requestConfig)
-    };
+    if ((0, _utils.isArr)(requestConfig)) {
+      var reactionsMap = [];
+      var scopeMap = {};
+      requestConfig.forEach(function (item, index) {
+        var _initializeRequest = initializeRequest(item, "".concat(suffix).concat(index)),
+            reactions = _initializeRequest.reactions,
+            scope = _initializeRequest.scope;
+
+        reactionsMap = [].concat(_toConsumableArray(reactionsMap), _toConsumableArray(reactions));
+        scopeMap = _objectSpread(_objectSpread({}, scopeMap), scope);
+      });
+      return {
+        reactions: reactionsMap,
+        scope: scopeMap
+      };
+    } else {
+      var requestConfigName = "$requestConfig_".concat(suffix);
+      return {
+        reactions: ["{{$common($request,".concat(requestConfigName, ",context)}}")],
+        scope: _defineProperty({}, requestConfigName, requestConfig)
+      };
+    }
   }
 
   return {

package/lib/form/SchemaForm/reactions.d.ts

@@ -1,6 +1,6 @@
 import type { ProFormRequestConfig } from '../typing';
-declare const $request: (field: any, requestConfig: ProFormRequestConfig, context: any) => Promise<unknown>;
+declare const $request: (field: any, requestConfig: ProFormRequestConfig, context: any, type: 'request' | 'validator' | 'dataSource') => Promise<unknown>;
 declare const $common: (services: any, requestConfig: ProFormRequestConfig, context: any) => (field: any) => any;
 declare const $validator: (services: any, requestConfig: ProFormRequestConfig, context: any) => (value: any, rules: any, { field }: any) => any;
-declare const $dataSource: (services: any, requestConfig: ProFormRequestConfig, context: any) => (field: any) => any;
+declare const $dataSource: (services: any, requestConfig: ProFormRequestConfig, context: any, readPretty: any) => (field: any) => any;
 export { $request, $common, $dataSource, $validator };

package/lib/form/SchemaForm/reactions.js

@@ -14,14 +14,19 @@ 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 $request = function $request(field, requestConfig, context) {
+var $request = function $request(field, requestConfig, context, type) {
   var _field$data;
 
-  var refresh = field === null || field === void 0 ? void 0 : (_field$data = field.data) === null || _field$data === void 0 ? void 0 : _field$data.refresh;
   var beforeRequest = requestConfig.beforeRequest,
       onSuccess = requestConfig.onSuccess;
-  var refreshResult = (0, _utils.isPlainObj)(refresh) ? refresh : {};
   var beforeRequestResult = (0, _utils.isFn)(beforeRequest) ? beforeRequest(field, context) : {};
+  /**
+   * // 主动触发的请求刷新
+   */
+  // 触发所有配置的请求
+
+  var refresh = (_field$data = field.data) === null || _field$data === void 0 ? void 0 : _field$data.refresh;
+  var refreshResult = (0, _utils.isPureObj)(refresh) ? refresh : {};
   return (0, _utils.doCommonRequest)(_objectSpread(_objectSpread({}, requestConfig), {}, {
     params: _objectSpread(_objectSpread(_objectSpread({}, requestConfig.params), beforeRequestResult), refreshResult),
     beforeRequest: function beforeRequest() {
@@ -38,7 +43,7 @@ exports.$request = $request;
 
 var $common = function $common(services, requestConfig, context) {
   return function (field) {
-    return services(field, requestConfig, context).then(function (res) {
+    return services(field, requestConfig, context, 'request').then(function (res) {
       return requestConfig.onComplete && requestConfig.onComplete(res, field, context);
     });
   };
@@ -50,7 +55,7 @@ exports.$common = $common;
 var $validator = function $validator(services, requestConfig, context) {
   return function (value, rules, _ref) {
     var field = _ref.field;
-    return services(field, requestConfig, context).then(function (res) {
+    return services(field, requestConfig, context, 'validator').then(function (res) {
       return requestConfig.onComplete && requestConfig.onComplete(res, field, context);
     });
   };
@@ -59,28 +64,41 @@ var $validator = function $validator(services, requestConfig, context) {
 
 exports.$validator = $validator;
 
-var $dataSource = function $dataSource(services, requestConfig, context) {
+var $dataSource = function $dataSource(services, requestConfig, context, readPretty) {
   return function (field) {
-    field.setState({
-      loading: true,
-      readOnly: true
-    });
-    return services(field, requestConfig, context).then(function (res) {
+    if (!readPretty) {
+      field.setState({
+        loading: true,
+        readOnly: true
+      });
+    }
+
+    return services(field, requestConfig, context, 'dataSource').then(function (res) {
       var isValueInDataSource = (0, _utils.getValueByValue)(res, field.value);
       var clearValue = isValueInDataSource ? {} : {
         value: undefined
       };
-      field.setState(_objectSpread({
-        dataSource: res,
-        loading: false,
-        readOnly: false
-      }, clearValue));
+
+      if (!readPretty) {
+        field.setState(_objectSpread({
+          dataSource: res,
+          loading: false,
+          readOnly: false
+        }, clearValue));
+      } else {
+        field.setState({
+          dataSource: res
+        });
+      }
+
       return requestConfig.onComplete && requestConfig.onComplete(res, field, context);
     }).catch(function () {
-      field.setState({
-        loading: false,
-        readOnly: false
-      });
+      if (!readPretty) {
+        field.setState({
+          loading: false,
+          readOnly: false
+        });
+      }
     });
   };
 };

package/lib/form/index.d.ts

@@ -109,10 +109,10 @@ export { createForm, FormConsumer, FormDialog, FormDrawer, FormStep, FormTab, Fo
 /**
  * 导出 Filter 组件
  */
-import { AdvancedFilter, SimpleFilter } from './Filter';
-import { QueryFilter } from './Filter/index2';
+import { QueryFilter } from './Filter';
 import { QueryFilterLayout } from './Filter/Layout';
-export { AdvancedFilter, SimpleFilter, QueryFilter, QueryFilterLayout };
+import { AdvancedFilter, SimpleFilter } from './Filter/index2';
+export { QueryFilter, QueryFilterLayout, AdvancedFilter, SimpleFilter };
 /**
  * 导出 ProForm 组件，支持快速搭建表单
  */

package/lib/form/index.js

@@ -23,15 +23,15 @@ var _exportNames = {
   FormConsumer: true,
   useForm: true,
   customComponent: true,
-  AdvancedFilter: true,
-  SimpleFilter: true,
   QueryFilter: true,
-  QueryFilterLayout: true
+  QueryFilterLayout: true,
+  AdvancedFilter: true,
+  SimpleFilter: true
 };
 Object.defineProperty(exports, "AdvancedFilter", {
   enumerable: true,
   get: function get() {
-    return _Filter.AdvancedFilter;
+    return _index.AdvancedFilter;
   }
 });
 Object.defineProperty(exports, "FormCollapse", {
@@ -73,7 +73,7 @@ Object.defineProperty(exports, "FormTab", {
 Object.defineProperty(exports, "QueryFilter", {
   enumerable: true,
   get: function get() {
-    return _index.QueryFilter;
+    return _Filter.QueryFilter;
   }
 });
 Object.defineProperty(exports, "QueryFilterLayout", {
@@ -85,7 +85,7 @@ Object.defineProperty(exports, "QueryFilterLayout", {
 Object.defineProperty(exports, "SimpleFilter", {
   enumerable: true,
   get: function get() {
-    return _Filter.SimpleFilter;
+    return _index.SimpleFilter;
   }
 });
 Object.defineProperty(exports, "createForm", {
@@ -168,10 +168,10 @@ var _customComponent = require("./ProForm/customComponent");
 
 var _Filter = require("./Filter");
 
-var _index = require("./Filter/index2");
-
 var _Layout = require("./Filter/Layout");
 
+var _index = require("./Filter/index2");
+
 var _ProForm = _interopRequireDefault(require("./ProForm"));
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }

package/lib/form/typing.d.ts

@@ -44,7 +44,7 @@ export interface ProFormSchemaItem {
     readPretty?: boolean | string;
     pattern?: FieldPatternTypes;
     default?: any;
-    request?: ProFormRequestConfig;
+    request?: ProFormRequestConfig | ProFormRequestConfig[];
     data?: AnyObject;
 }
 export declare type ProFormSchema = ProFormSchemaItem[];
@@ -63,12 +63,14 @@ export interface ProFormProps extends IFormLayoutProps {
     onChange?: (values: any, fieldValue?: any, fieldName?: any) => any;
     onSubmit?: ((values: any) => any) | CommonRequestConfig;
     onSubmitFailed?: (feedbacks: IFormFeedback[]) => void;
+    onInitialComplete?: (form: FormType) => void;
 }
 export interface FilterProps extends ProFormProps {
     form: FormType;
     defaultFilterValue?: string;
+    activeFilterValueRef?: React.MutableRefObject<any>;
+    forceClear?: boolean;
     onReset?: (payload?: any) => void;
-    onResetClick?: () => void;
 }
 export interface QueryFilterLayoutProps {
     prefixCls?: string;
@@ -88,8 +90,12 @@ export interface QueryFilterProps extends ProFormProps {
     triggerType?: 'keydown' | 'change' | 'submit';
     /** 表单展示形式 */
     mode?: 'inline' | 'panel';
+    /** 面板模式下是否仅展示面板 */
+    purePanel?: boolean;
     /** 面板是否默认展开，仅在 mode='panel' 时生效 */
     expand?: boolean;
+    /** 是否强制清除 */
+    forceClear?: boolean;
     /** 顶部筛选区前缀 */
     addonBefore?: ReactNode;
     /** 顶部筛选区后缀 */
@@ -112,6 +118,9 @@ export interface QueryFilterProps extends ProFormProps {
 /**
  * 兼容性导出
  */
+/**
+ * @deprecated 将在未来移除该组件，建议使用 QueryFilter 代替
+ */
 export interface IFilterProps extends ProFormProps {
     triggerType?: 'keydown' | 'change' | 'submit';
     onFilter?: (values: any) => void;

package/lib/index.d.ts

@@ -9,7 +9,7 @@ import ProPageHeader from './page-header';
 import ProTable from './table';
 import ProSkeleton from './skeleton';
 import utils from './utils';
-import { ProStep } from './step';
+import { ProTimeline } from './timeline';
 import * as nocode from './nocode';
 import * as templates from './templates';
 export * from './actions';
@@ -23,6 +23,6 @@ export * from './page-header';
 export * from './skeleton';
 export * from './table';
 export * from './utils';
-export * from './step';
-declare const version = "1.2.32";
-export { version, ProAction, ProCard, ProField, ProForm, ProInfo, ProPageContainer, ProPageHeader, ProSkeleton, ProTable, ProStep, hooks, nocode, templates, utils, };
+export * from './timeline';
+declare const version = "1.3.0";
+export { version, ProAction, ProCard, ProField, ProForm, ProInfo, ProPageContainer, ProPageHeader, ProSkeleton, ProTable, ProTimeline, hooks, nocode, templates, utils, };

package/lib/index.js

@@ -18,7 +18,7 @@ var _exportNames = {
   ProTable: true,
   ProSkeleton: true,
   utils: true,
-  ProStep: true,
+  ProTimeline: true,
   nocode: true,
   templates: true
 };
@@ -70,16 +70,16 @@ Object.defineProperty(exports, "ProSkeleton", {
     return _skeleton.default;
   }
 });
-Object.defineProperty(exports, "ProStep", {
+Object.defineProperty(exports, "ProTable", {
   enumerable: true,
   get: function get() {
-    return _step.ProStep;
+    return _table.default;
   }
 });
-Object.defineProperty(exports, "ProTable", {
+Object.defineProperty(exports, "ProTimeline", {
   enumerable: true,
   get: function get() {
-    return _table.default;
+    return _timeline.ProTimeline;
   }
 });
 Object.defineProperty(exports, "hooks", {
@@ -239,16 +239,16 @@ Object.keys(_utils).forEach(function (key) {
   });
 });
 
-var _step = require("./step");
+var _timeline = require("./timeline");
 
-Object.keys(_step).forEach(function (key) {
+Object.keys(_timeline).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
   if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
-  if (key in exports && exports[key] === _step[key]) return;
+  if (key in exports && exports[key] === _timeline[key]) return;
   Object.defineProperty(exports, key, {
     enumerable: true,
     get: function get() {
-      return _step[key];
+      return _timeline[key];
     }
   });
 });
@@ -285,5 +285,5 @@ function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj &&
 // 设置图标源
 _icon.default.setConfig(_utils.default.getTeamixIconConfig());
 
-var version = '1.2.32';
+var version = '1.3.0';
 exports.version = version;

package/lib/info/components/ProInfoItem/index.js

@@ -36,7 +36,8 @@ var ProInfoItem = function ProInfoItem(prop) {
     return /*#__PURE__*/_react.default.createElement("div", {
       className: cls()
     }, /*#__PURE__*/_react.default.createElement(Row, {
-      gutter: 10
+      gutter: 10,
+      className: cls('base-row')
     }, /*#__PURE__*/_react.default.createElement(Col, {
       span: labelCol === null || labelCol === void 0 ? void 0 : labelCol.span,
       className: cls('label')

package/lib/info/components/ProInfoItem/index.scss

@@ -22,6 +22,10 @@ $item-padding-bottom: 8px;
     display: flex;
     align-items: center;
   }
+  &-base-row {
+    display: flex;
+    align-items: center;
+  }
 }
 
 .teamix-pro-field-info-form-item-label {

package/lib/nocode/configurators/PageHeader.js

@@ -88,11 +88,11 @@ var schema = [{
         }, {
           name: 'iconColor',
           title: '图标颜色',
-          component: 'ColorSwatches'
+          component: 'ColorPicker'
         }, {
           name: 'iconBackgroundColor',
           title: '图标背景颜色',
-          component: 'ColorSwatches'
+          component: 'ColorPicker'
         }, {
           name: 'iconBackgroundType',
           title: '图标背景形状',

package/lib/page-header/index.js

@@ -88,8 +88,8 @@ var getColorAndStyle = function getColorAndStyle(color, backgroundColor, backgro
   var isColorPresetColor = (0, _utils.isPresetColor)(color);
   var isBgColorPresetColor = (0, _utils.isPresetColor)(backgroundColor);
   var className = (0, _classnames2.default)((_classnames = {}, _defineProperty(_classnames, "".concat((0, _utils.getColorClassName)(color)), isColorPresetColor), _defineProperty(_classnames, "".concat((0, _utils.getBackgroundColorClassName)(backgroundColor)), isBgColorPresetColor), _defineProperty(_classnames, "".concat(cls("bg-type-".concat(backgroundType))), !!backgroundType), _classnames));
-  var styleColor = isColorPresetColor ? undefined : color;
-  var styleBgColor = isBgColorPresetColor ? undefined : backgroundColor;
+  var styleColor = isColorPresetColor ? (0, _utils.getColor)(color) : color;
+  var styleBgColor = isBgColorPresetColor ? (0, _utils.getColor)(color) : backgroundColor;
   var style = {
     color: styleColor,
     backgroundColor: styleBgColor