@teamix/pro 1.2.26 → 1.2.30

package/lib/form/Filter/useSpecialProps.js

@@ -0,0 +1,46 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+
+var _utils = require("@teamix/utils");
+
+// 获取Schema是否包含默认值、异步默认值、必选校验等
+var useSpecialProps = function useSpecialProps(props) {
+  var initialValues = props.initialValues,
+      initialRequest = props.initialRequest;
+  var hasDefault = !!initialValues;
+  var hasAsyncDefault = !!initialRequest;
+  var hasRequired = false;
+
+  var hasDefaultOrRule = function hasDefaultOrRule(schema) {
+    schema.forEach(function (item) {
+      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);
+      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);
+      }
+    });
+  };
+
+  hasDefaultOrRule(props.schema);
+  return {
+    hasDefault: hasDefault,
+    hasAsyncDefault: hasAsyncDefault,
+    hasRequired: hasRequired
+  };
+};
+
+var _default = useSpecialProps;
+exports.default = _default;

package/lib/form/ProForm/customComponent.d.ts

@@ -0,0 +1,3 @@
+import React from 'react';
+declare const customComponent: (component: React.FC<any>) => React.ForwardRefExoticComponent<Pick<Partial<any>, string | number | symbol> & React.RefAttributes<unknown>>;
+export { customComponent };

package/lib/form/ProForm/customComponent.js

@@ -0,0 +1,28 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.customComponent = void 0;
+
+var _react = require("@formily/react");
+
+var _reactive = require("@formily/reactive");
+
+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; }
+
+var customComponent = function customComponent(component) {
+  return (0, _react.connect)(component, (0, _react.mapProps)(function (props, field) {
+    return _objectSpread(_objectSpread({}, props), {}, {
+      field: field,
+      form: field.form,
+      values: (0, _reactive.toJS)(field.form.values)
+    });
+  }));
+};
+
+exports.customComponent = customComponent;

package/lib/form/ProForm/index.scss

@@ -186,18 +186,17 @@
 }
 
 // 数组类组件添加按钮
-.#{$form-array}-base-addition {
+.#{$css-prefix}btn.#{$form-array}-base-addition {
+  border-style: dashed;
   .#{$css-prefix}formily-icon {
     margin-right: 4px;
   }
 }
 // 数组类ArrayItem Icon 居中
 .#{$form-array}-items-item-inner {
-  > .#{$css-prefix}box {
-    > .#{$css-prefix}space-item {
-      > .#{$css-prefix}formily-icon {
-        margin-top: 9px;
-      }
+  .#{$css-prefix}space-item {
+    > .#{$css-prefix}formily-icon {
+      margin-top: 9px;
     }
   }
 }

package/lib/form/ProForm/useFormDisplayValues.js

@@ -11,6 +11,10 @@ var _reactive = require("@formily/reactive");
 
 var _utils = require("@teamix/utils");
 
+var _fieldTypeMap = _interopRequireDefault(require("../fieldTypeMap"));
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
 
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
@@ -45,30 +49,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 !(0, _utils.isPlainObj)(value) && !(0, _utils.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.default).includes(field === null || field === void 0 ? void 0 : field.component[0]); // 判断值的类型，递归获取每个值在该结构中的完整路径
 
   if (!(0, _utils.isSignificative)(values)) {
     displayValues = {};
-  } else if ((0, _utils.isPlainObj)(values) && isLayoutValue(values)) {
-    // 如果值是对象且是布局对象的值
+  } else if ((0, _utils.isPlainObj)(values) && !isFieldValue) {
+    // 如果值是布局对象的值
     displayValues = {};
     Object.entries(values).forEach(function (_ref) {
       var _ref2 = _slicedToArray(_ref, 2),
@@ -77,8 +68,10 @@ var getDisplayValues = function getDisplayValues(form, values) {
 
       displayValues[key] = getDisplayValues(form, value, connectPath(key));
     });
-  } else if ((0, _utils.isArr)(values) && isArrayValue(values)) {
-    // 如果值是数组且是自增数组的值
+  } else if ((0, _utils.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));
@@ -87,14 +80,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 = (0, _utils.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: (0, _utils.getValueByValue)(field === null || field === void 0 ? void 0 : field.dataSource, realValue)
+      value: values,
+      displayValue: displayValue
     };
   }
 

package/lib/form/SchemaForm/adapterType.js

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

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/index.d.ts

@@ -24,5 +24,5 @@ export * from './skeleton';
 export * from './table';
 export * from './utils';
 export * from './step';
-declare const version = "1.2.26";
+declare const version = "1.2.30";
 export { version, ProAction, ProCard, ProField, ProForm, ProInfo, ProPageContainer, ProPageHeader, ProSkeleton, ProTable, ProStep, hooks, nocode, templates, utils, };

package/lib/index.js

@@ -285,5 +285,5 @@ function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj &&
 // 设置图标源
 _icon.default.setConfig(_utils.default.getTeamixIconConfig());
 
-var version = '1.2.26';
+var version = '1.2.30';
 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); }