@teamix/pro 1.2.22 → 1.2.27

package/es/form/ProForm/useFormDisplayValues.js

@@ -13,6 +13,7 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import { useForm } from '@formily/react';
 import { toJS } from '@formily/reactive';
 import { isArr, isPlainObj, isSignificative, getValueByValue } from '@teamix/utils';
+import fieldTypeMap from '../fieldTypeMap';
 /**
  * 获取表单值的可显示值
  * @returns 如果某字段有dataSource，则返回value对应label
@@ -36,30 +37,17 @@ var getDisplayValues = function getDisplayValues(form, values) {
 
   var getAddress = function getAddress(path) {
     return form.indexes[path];
-  }; // 判断布局、自增的值还是字段的值（字段值是对象、数组，内部的值特点为非数组、对象的叶子值，并且在form没有路径）
+  }; // 当前field
 
 
-  var isFieldValue = function isFieldValue(value, path) {
-    return !isPlainObj(value) && !isArr(value) && !getAddress(connectPath(path));
-  };
-
-  var isLayoutValue = function isLayoutValue(object) {
-    var _Object$entries$ = _slicedToArray(Object.entries(object)[0], 2),
-        key = _Object$entries$[0],
-        value = _Object$entries$[1];
-
-    return !isFieldValue(value, key);
-  };
-
-  var isArrayValue = function isArrayValue(array) {
-    return !isFieldValue(array[0], 0);
-  }; // 判断值的类型，递归获取每个值在该结构中的完整路径
+  var field = form.query(getAddress(prefix)).take(); // 是否真实字段值（自定义组件、布局组件、自增数组组件为非真实字段）
 
+  var isFieldValue = Object.keys(fieldTypeMap).includes(field === null || field === void 0 ? void 0 : field.component[0]); // 判断值的类型，递归获取每个值在该结构中的完整路径
 
   if (!isSignificative(values)) {
     displayValues = {};
-  } else if (isPlainObj(values) && isLayoutValue(values)) {
-    // 如果值是对象且是布局对象的值
+  } else if (isPlainObj(values) && !isFieldValue) {
+    // 如果值是布局对象的值
     displayValues = {};
     Object.entries(values).forEach(function (_ref) {
       var _ref2 = _slicedToArray(_ref, 2),
@@ -68,8 +56,10 @@ var getDisplayValues = function getDisplayValues(form, values) {
 
       displayValues[key] = getDisplayValues(form, value, connectPath(key));
     });
-  } else if (isArr(values) && isArrayValue(values)) {
-    // 如果值是数组且是自增数组的值
+  } else if (isArr(values) && !isFieldValue) {
+    // 如果值是自增数组的值
+    // ArrayItems为字符串数组时，由于form.indexes中对应address为最后一个组件，无法正常获取displayName
+    // 例如：arrayItemsString.0: "arrayItemsString.0.ArrayItemsRemove"
     displayValues = [];
     values.map(function (value, index) {
       displayValues[index] = getDisplayValues(form, value, connectPath(index));
@@ -78,14 +68,14 @@ var getDisplayValues = function getDisplayValues(form, values) {
     var _values$value;
 
     // 通过值的完整路径获取字段address（从form实例的indexes中），然后获取该字段的value在该字段dataSource中对应的label
-    var field = form.query(getAddress(prefix)).take();
-    var realValue = (_values$value = values === null || values === void 0 ? void 0 : values.value) !== null && _values$value !== void 0 ? _values$value : values; // 针对单个字段的值是对象
+    var realValue = (_values$value = values === null || values === void 0 ? void 0 : values.value) !== null && _values$value !== void 0 ? _values$value : values; // 针对单个字段的值是对象，例如Select的useDetailValue
 
+    var displayValue = getValueByValue(field === null || field === void 0 ? void 0 : field.dataSource, realValue);
     displayValues = {
       title: field === null || field === void 0 ? void 0 : field.title,
       component: field === null || field === void 0 ? void 0 : field.component[0],
-      value: realValue,
-      displayValue: getValueByValue(field === null || field === void 0 ? void 0 : field.dataSource, realValue)
+      value: values,
+      displayValue: displayValue
     };
   }
 

package/es/form/SchemaForm/adapterType.js

@@ -46,6 +46,7 @@ var typeMap = (_typeMap = {
   MultipleTagPicker: 'array',
   Range: 'string',
   Search: 'array',
+  SelectGroup: 'array',
   ArrayCollapse: 'array',
   ArrayCards: 'array',
   ArrayTable: 'array',

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/fieldTypeMap.js

@@ -37,6 +37,7 @@ var fieldTypeMap = {
   TagPicker: 'tagPicker',
   MultipleTagPicker: 'multipleTagPicker',
   Range: 'range',
-  Search: 'search'
+  Search: 'search',
+  SelectGroup: 'selectGroup'
 };
 export default fieldTypeMap;

package/es/form/index.d.ts

@@ -97,7 +97,8 @@ declare const formilyReact: {
     useFieldSchema: () => originalFormilyReact.Schema<any, any, any, any, any, any, any, any, any>;
     useFormEffects: (effects?: ((form: import("@formily/core").Form<any>) => void) | undefined) => void;
 };
-export { formilyReact };
+import { customComponent } from './ProForm/customComponent';
+export { formilyReact, customComponent };
 /**
  * 导出常用formily内容
  */
@@ -110,7 +111,8 @@ export { createForm, FormConsumer, FormDialog, FormDrawer, FormStep, FormTab, Fo
  */
 import { AdvancedFilter, SimpleFilter } from './Filter';
 import { QueryFilter } from './Filter/index2';
-export { AdvancedFilter, SimpleFilter, QueryFilter };
+import { QueryFilterLayout } from './Filter/Layout';
+export { AdvancedFilter, SimpleFilter, QueryFilter, QueryFilterLayout };
 /**
  * 导出 ProForm 组件，支持快速搭建表单
  */

package/es/form/index.js

@@ -27,7 +27,8 @@ var formilyReact = _objectSpread(_objectSpread({}, originalFormilyReact), {}, {
   useFormDisplayValues: useFormDisplayValues
 });
 
-export { formilyReact };
+import { customComponent } from './ProForm/customComponent';
+export { formilyReact, customComponent };
 /**
  * 导出常用formily内容
  */
@@ -42,7 +43,8 @@ export { createForm, FormConsumer, FormDialog, FormDrawer, FormStep, FormTab, Fo
 
 import { AdvancedFilter, SimpleFilter } from './Filter';
 import { QueryFilter } from './Filter/index2';
-export { AdvancedFilter, SimpleFilter, QueryFilter };
+import { QueryFilterLayout } from './Filter/Layout';
+export { AdvancedFilter, SimpleFilter, QueryFilter, QueryFilterLayout };
 /**
  * 导出 ProForm 组件，支持快速搭建表单
  */

package/es/form/typing.d.ts

@@ -10,7 +10,7 @@ declare type FieldDisplayTypes = 'none' | 'hidden' | 'visible';
 export interface ProFormInitializeItem {
     (item: ProFormSchemaItem, props?: any): ProFormSchemaItem;
 }
-declare type IBaseComponent = 'Input' | 'Password' | 'TextArea' | 'NumberPicker' | 'Percent' | 'Money' | 'Select' | 'MultipleSelect' | 'TreeSelect' | 'Cascader' | 'MultipleCascader' | 'ArbitraryCascader' | 'Radio' | 'Checkbox' | 'Switch' | 'DatePicker' | 'TimePicker' | 'DateTimePicker' | 'WeekPicker' | 'MonthPicker' | 'YearPicker' | 'QuarterPicker' | 'DateRangePicker' | 'TimeRangePicker' | 'DateTimeRangePicker' | 'WeekRangePicker' | 'MonthRangePicker' | 'YearRangePicker' | 'QuarterRangePicker' | 'Transfer' | 'Upload' | 'ColorPicker' | 'ColorRadio' | 'IconPicker' | 'JsonInput' | 'TagPicker' | 'MultipleTagPicker' | 'Range' | 'Search';
+declare type IBaseComponent = 'Input' | 'Password' | 'TextArea' | 'NumberPicker' | 'Percent' | 'Money' | 'Select' | 'MultipleSelect' | 'TreeSelect' | 'Cascader' | 'MultipleCascader' | 'ArbitraryCascader' | 'Radio' | 'Checkbox' | 'Switch' | 'DatePicker' | 'TimePicker' | 'DateTimePicker' | 'WeekPicker' | 'MonthPicker' | 'YearPicker' | 'QuarterPicker' | 'DateRangePicker' | 'TimeRangePicker' | 'DateTimeRangePicker' | 'WeekRangePicker' | 'MonthRangePicker' | 'YearRangePicker' | 'QuarterRangePicker' | 'Transfer' | 'Upload' | 'ColorPicker' | 'ColorRadio' | 'IconPicker' | 'JsonInput' | 'TagPicker' | 'MultipleTagPicker' | 'Range' | 'Search' | 'SelectGroup';
 declare type IButtonComponent = 'Submit' | 'Reset';
 declare type IComboComponent = 'ArrayCards' | 'ArrayCards.Addition' | 'ArrayCards.Remove' | 'ArrayCards.MoveUp' | 'ArrayCards.MoveDown' | 'ArrayCards.Index' | 'ArrayCollapse' | 'ArrayCollapse.CollapsePanel' | 'ArrayCollapse.Addition' | 'ArrayCollapse.Remove' | 'ArrayCollapse.MoveUp' | 'ArrayCollapse.MoveDown' | 'ArrayCollapse.Index' | 'ArrayTable' | 'ArrayTable.Column' | 'ArrayTable.SortHandle' | 'ArrayTable.Addition' | 'ArrayTable.Remove' | 'ArrayTable.MoveDown' | 'ArrayTable.MoveUp' | 'ArrayTable.Index' | 'ArrayItems' | 'ArrayItems.Item' | 'ArrayItems.SortHandle' | 'ArrayItems.Addition' | 'ArrayItems.Remove' | 'ArrayItems.MoveDown' | 'ArrayItems.MoveUp' | 'ArrayItems.Index' | 'Editable' | 'Editable.Popover' | 'Editable.Dialog' | 'Editable.Drawer';
 declare type ILayoutComponent = 'FormFlex' | 'FormGrid' | 'FormGroup' | 'FormGroup.GroupPanel' | 'Search' | 'Search.SearchPanel' | 'FormTab' | 'FormTab.TabPane' | 'FormStep' | 'FormStep.StepPane' | 'FormCollapse' | 'FormCollapse.CollapsePanel' | 'FormButtonGroup' | 'FormDialog' | 'FormDrawer' | 'FormDialog.Footer' | 'FormDrawer.Footer';
@@ -70,20 +70,44 @@ export interface FilterProps extends ProFormProps {
     onReset?: (payload?: any) => void;
     onResetClick?: () => void;
 }
+export interface QueryFilterLayoutProps {
+    prefixCls?: string;
+    className?: string;
+    addonBefore?: ReactNode;
+    addonAfter?: ReactNode;
+    inlineContent?: ReactNode;
+    panelContent?: ReactNode;
+    count?: number;
+    expand?: boolean;
+    onExpand?: (expand: boolean) => void;
+}
 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>;
+    /** onChange事件的防抖时间 */
+    filterDebounce?: number;
+    /** 表单初始化（含异步默认值）后回调函数 */
     onInit?: (values: any) => boolean;
+    /** 表单筛选回调函数 */
     onFilter?: (values: any) => void;
+    /** 表单重置回调函数 */
     onReset?: (payload?: any) => void;
+    /** 高级筛选按钮切换 */
+    onExpand?: (expand: boolean) => 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.21";
-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.27";
+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.21';
+export * from './step';
+var version = '1.2.27';
 export { version, ProAction, ProCard, ProField, ProForm, ProInfo, // ProLayout,
 ProPageContainer, ProPageHeader, ProSkeleton, ProTable, // ProSidebar,
-hooks, nocode, templates, utils };
+ProStep, hooks, nocode, templates, utils };

package/es/info/index.scss

@@ -1,6 +1,6 @@
 .teamix-pro-info {
   color: var(--color-brand1-6);
-  
+
   .teamix-pro-info-content-row {
     width: 100%;
   }

package/es/nocode/pages/renderer.js

@@ -12,7 +12,7 @@ function _defineProperties(target, props) { for (var i = 0; i < props.length; i+
 
 function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); Object.defineProperty(Constructor, "prototype", { writable: false }); return Constructor; }
 
-function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function"); } Object.defineProperty(subClass, "prototype", { value: Object.create(superClass && superClass.prototype, { constructor: { value: subClass, writable: true, configurable: true } }), writable: false }); if (superClass) _setPrototypeOf(subClass, superClass); }
+function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function"); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, writable: true, configurable: true } }); Object.defineProperty(subClass, "prototype", { writable: false }); if (superClass) _setPrototypeOf(subClass, superClass); }
 
 function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); }
 

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;