@teamix/pro 1.2.23 → 1.2.28

package/lib/form/SchemaForm/index.js

@@ -150,8 +150,10 @@ var _default = /*#__PURE__*/(0, _react.memo)(function (_ref) {
   }, [scope]); // 格式化 schema
 
   var formatSchema = (0, _react.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 = (0, _warning.default)(item);
       var _newItem = newItem,
           originalComponent = _newItem.component; // 根据component的不同，初始化为内置的item
@@ -215,7 +217,7 @@ var _default = /*#__PURE__*/(0, _react.memo)(function (_ref) {
           component = _newItem2.component,
           type = _newItem2.type,
           _newItem2$name = _newItem2.name,
-          name = _newItem2$name === void 0 ? (0, _utils.getFieldName)(component === null || component === void 0 ? void 0 : component.replace(/\./g, ''), index) : _newItem2$name,
+          name = _newItem2$name === void 0 ? (0, _utils.getFieldName)(component === null || component === void 0 ? void 0 : component.replace(/\./g, ''), suffix) : _newItem2$name,
           decorator = _newItem2.decorator,
           decoratorProps = _newItem2.decoratorProps,
           dataSource = _newItem2.dataSource,
@@ -240,18 +242,18 @@ var _default = /*#__PURE__*/(0, _react.memo)(function (_ref) {
       var defaultDecoratorProps = _objectSpread(_objectSpread({}, tooltipProps), decoratorProps); // 初始化request
 
 
-      var _initializeRequest = (0, _initializeRequest2.default)(request, index),
+      var _initializeRequest = (0, _initializeRequest2.default)(request, suffix),
           requestReactions = _initializeRequest.reactions,
           requestScope = _initializeRequest.scope; // 初始化dataSource
 
 
-      var _initializeDataSource = (0, _initializeDataSource2.default)(dataSource, index),
+      var _initializeDataSource = (0, _initializeDataSource2.default)(dataSource, suffix),
           defaultDataSource = _initializeDataSource.dataSource,
           dataSourceReactions = _initializeDataSource.reactions,
           dataSourceScope = _initializeDataSource.scope; // 初始化rules
 
 
-      var _initializeRules = (0, _initializeRules2.default)(rules, index),
+      var _initializeRules = (0, _initializeRules2.default)(rules, suffix),
           defaultRules = _initializeRules.rules,
           rulesScope = _initializeRules.scope; // 合并reactions，初始化reactions
 
@@ -279,11 +281,11 @@ var _default = /*#__PURE__*/(0, _react.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/lib/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/lib/form/SchemaForm/initializeDataSource.js

@@ -9,10 +9,10 @@ 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, index) {
+var initializeDataSource = function initializeDataSource(dataSource, suffix) {
   if ((0, _utils.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/lib/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/lib/form/SchemaForm/initializeRequest.js

@@ -7,9 +7,9 @@ exports.default = void 0;
 
 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/lib/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/lib/form/SchemaForm/initializeRules.js

@@ -25,13 +25,13 @@ 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 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 ((0, _utils.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/lib/form/fieldTypeMap.js

@@ -43,7 +43,8 @@ var fieldTypeMap = {
   TagPicker: 'tagPicker',
   MultipleTagPicker: 'multipleTagPicker',
   Range: 'range',
-  Search: 'search'
+  Search: 'search',
+  SelectGroup: 'selectGroup'
 };
 var _default = fieldTypeMap;
 exports.default = _default;

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

@@ -22,9 +22,11 @@ var _exportNames = {
   formilyTeamix: true,
   FormConsumer: true,
   useForm: true,
+  customComponent: true,
   AdvancedFilter: true,
   SimpleFilter: true,
-  QueryFilter: true
+  QueryFilter: true,
+  QueryFilterLayout: true
 };
 Object.defineProperty(exports, "AdvancedFilter", {
   enumerable: true,
@@ -74,6 +76,12 @@ Object.defineProperty(exports, "QueryFilter", {
     return _index.QueryFilter;
   }
 });
+Object.defineProperty(exports, "QueryFilterLayout", {
+  enumerable: true,
+  get: function get() {
+    return _Layout.QueryFilterLayout;
+  }
+});
 Object.defineProperty(exports, "SimpleFilter", {
   enumerable: true,
   get: function get() {
@@ -86,6 +94,12 @@ Object.defineProperty(exports, "createForm", {
     return _formilyCore.createForm;
   }
 });
+Object.defineProperty(exports, "customComponent", {
+  enumerable: true,
+  get: function get() {
+    return _customComponent.customComponent;
+  }
+});
 exports.formilyTeamix = exports.formilyReactive = exports.formilyReact = exports.formilyCore = exports.default = void 0;
 Object.defineProperty(exports, "registerFormats", {
   enumerable: true,
@@ -150,10 +164,14 @@ var _useFormDisplayValues = require("./ProForm/useFormDisplayValues");
 
 var _useFieldRequest = _interopRequireDefault(require("./ProForm/useFieldRequest"));
 
+var _customComponent = require("./ProForm/customComponent");
+
 var _Filter = require("./Filter");
 
 var _index = require("./Filter/index2");
 
+var _Layout = require("./Filter/Layout");
+
 var _ProForm = _interopRequireDefault(require("./ProForm"));
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }

package/lib/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/lib/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/lib/form/utils.js

@@ -135,8 +135,8 @@ exports.mapMode = mapMode;
 
 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/lib/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.23";
-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.28";
+export { version, ProAction, ProCard, ProField, ProForm, ProInfo, ProPageContainer, ProPageHeader, ProSkeleton, ProTable, ProStep, hooks, nocode, templates, utils, };

package/lib/index.js

@@ -18,6 +18,7 @@ var _exportNames = {
   ProTable: true,
   ProSkeleton: true,
   utils: true,
+  ProStep: true,
   nocode: true,
   templates: true
 };
@@ -69,6 +70,12 @@ Object.defineProperty(exports, "ProSkeleton", {
     return _skeleton.default;
   }
 });
+Object.defineProperty(exports, "ProStep", {
+  enumerable: true,
+  get: function get() {
+    return _step.ProStep;
+  }
+});
 Object.defineProperty(exports, "ProTable", {
   enumerable: true,
   get: function get() {
@@ -218,7 +225,33 @@ Object.keys(_skeleton).forEach(function (key) {
   });
 });
 
-var _utils = _interopRequireDefault(require("./utils"));
+var _utils = _interopRequireWildcard(require("./utils"));
+
+Object.keys(_utils).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
+  if (key in exports && exports[key] === _utils[key]) return;
+  Object.defineProperty(exports, key, {
+    enumerable: true,
+    get: function get() {
+      return _utils[key];
+    }
+  });
+});
+
+var _step = require("./step");
+
+Object.keys(_step).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;
+  Object.defineProperty(exports, key, {
+    enumerable: true,
+    get: function get() {
+      return _step[key];
+    }
+  });
+});
 
 var nocode = _interopRequireWildcard(require("./nocode"));
 
@@ -252,6 +285,5 @@ function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj &&
 // 设置图标源
 _icon.default.setConfig(_utils.default.getTeamixIconConfig());
 
-// export * from './sidebar';
-var version = '1.2.23';
+var version = '1.2.28';
 exports.version = version;

package/lib/info/index.scss

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

package/lib/nocode/pages/renderer.js

@@ -37,7 +37,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/lib/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;