@teamix/pro 1.2.8 → 1.2.12

package/lib/form/Filter/index2.js

@@ -0,0 +1,342 @@
+"use strict";
+
+function _typeof(obj) { "@babel/helpers - typeof"; if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); }
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.QueryFilter = void 0;
+
+var _react = _interopRequireWildcard(require("react"));
+
+var _classnames = _interopRequireDefault(require("classnames"));
+
+var _components = require("@alicloudfe/components");
+
+var _icon = _interopRequireDefault(require("@teamix/icon"));
+
+var _core = require("@formily/core");
+
+var _utils = require("@teamix/utils");
+
+var _ProForm = _interopRequireDefault(require("../ProForm"));
+
+var _useFormDisplayValues = require("../ProForm/useFormDisplayValues");
+
+var _utils2 = require("../utils");
+
+require("./index.scss");
+
+var _excluded = ["schema", "triggerType", "onFilter"];
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
+
+function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
+
+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."); }
+
+function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Symbol !== "undefined" && arr[Symbol.iterator] || arr["@@iterator"]; if (_i == null) return; var _arr = []; var _n = true; var _d = false; var _s, _e; try { for (_i = _i.call(arr); !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"] != null) _i["return"](); } finally { if (_d) throw _e; } } return _arr; }
+
+function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
+
+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; }
+
+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; }
+
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (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 = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { 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 getEventProps = function getEventProps(triggerType, onFilter) {
+  var keydownEvent = {
+    onSubmit: onFilter
+  };
+  var changeEvent = {
+    onChange: onFilter
+  };
+  var eventMap = {
+    keydown: keydownEvent,
+    change: _objectSpread(_objectSpread({}, keydownEvent), changeEvent),
+    submit: keydownEvent
+  };
+  return eventMap[triggerType];
+};
+
+var schemaTemp = [{
+  name: 'taskName',
+  title: '实例名称',
+  component: 'Input',
+  required: true,
+  props: {
+    style: {
+      width: 180
+    },
+    placeholder: '请输入'
+  }
+}];
+/**
+ * 简单筛选
+ */
+
+var SimpleFilter = /*#__PURE__*/(0, _react.memo)(function (props) {
+  var schema = props.schema,
+      triggerType = props.triggerType,
+      onFilter = props.onFilter,
+      otherProps = _objectWithoutProperties(props, _excluded);
+
+  var prefixCls = (0, _utils.usePrefixCls)('', {
+    prefix: 'teamix-pro-form-filter-simple'
+  });
+  var simpleSchema = (0, _react.useMemo)(function () {
+    return [{
+      component: 'FormFlex',
+      props: {
+        size: 8
+      },
+      children: [].concat(_toConsumableArray(schema), [{
+        type: 'void',
+        decorator: null,
+        component: 'Submit',
+        props: {
+          style: _objectSpread({}, triggerType === 'submit' ? {} : {
+            display: 'none'
+          })
+        }
+      }])
+    }];
+  }, []);
+  var eventProps = getEventProps(triggerType, onFilter);
+  return /*#__PURE__*/_react.default.createElement(_ProForm.default, _objectSpread(_objectSpread(_objectSpread({
+    feedbackLayout: "popover",
+    breakpoints: [],
+    inset: true
+  }, otherProps), eventProps), {}, {
+    className: (0, _classnames.default)(prefixCls, props.className),
+    schema: simpleSchema
+  }));
+});
+SimpleFilter.defaultProps = {
+  triggerType: 'change'
+};
+/**
+ * 高级筛选
+ */
+
+var AdvancedFilter = /*#__PURE__*/(0, _react.memo)(function (props) {
+  var form = (0, _react.useMemo)(function () {
+    return (props === null || props === void 0 ? void 0 : props.form) || (0, _core.createForm)();
+  }, []);
+  var schema = props.schema,
+      triggerType = props.triggerType,
+      onFilter = props.onFilter,
+      onReset = props.onReset,
+      layout = props.layout,
+      labelAlign = props.labelAlign,
+      wrapperAlign = props.wrapperAlign,
+      labelCol = props.labelCol,
+      wrapperCol = props.wrapperCol;
+  var prefixCls = (0, _utils.usePrefixCls)('', {
+    prefix: 'teamix-pro-form-filter-advanced'
+  });
+  var gridSchema = (0, _react.useMemo)(function () {
+    return [{
+      name: 'FormGrid',
+      component: 'FormGrid',
+      props: {
+        breakpoints: [480, 720, 990, 1200, Infinity],
+        maxColumns: [1, 2, 3, 3, 4],
+        columnGap: 16,
+        rowGap: 12
+      },
+      children: [].concat(_toConsumableArray(schema), [{
+        component: 'FormGrid.GridColumn',
+        props: {
+          gridSpan: -1
+        },
+        children: [{
+          component: 'FormButtonGroup',
+          props: {
+            align: 'right'
+          },
+          children: [{
+            component: 'Reset',
+            props: {
+              onResetValidateSuccess: onReset,
+              style: _objectSpread({}, triggerType === 'submit' ? {} : {
+                marginRight: -16
+              }),
+              children: (0, _utils.getMessage)('reset')
+            }
+          }, {
+            component: 'Submit',
+            props: {
+              style: _objectSpread({}, triggerType === 'submit' ? {
+                marginRight: -8
+              } : {
+                display: 'none'
+              }),
+              children: (0, _utils.getMessage)('search')
+            }
+          }]
+        }]
+      }])
+    }];
+  }, []);
+  var getTeamixLayout = (0, _react.useMemo)(function () {
+    return {
+      breakpoints: [990],
+      layout: (0, _utils2.mergeArrayValue)(['vertical'], layout),
+      labelAlign: (0, _utils2.mergeArrayValue)(['left'], labelAlign),
+      wrapperAlign: (0, _utils2.mergeArrayValue)(['left'], wrapperAlign),
+      labelCol: (0, _utils2.mergeArrayValue)([24], labelCol),
+      wrapperCol: (0, _utils2.mergeArrayValue)([24], wrapperCol)
+    };
+  }, [layout, labelAlign, wrapperAlign, labelCol, wrapperCol]);
+  var eventProps = getEventProps(triggerType, onFilter);
+  return /*#__PURE__*/_react.default.createElement(_ProForm.default, _objectSpread(_objectSpread(_objectSpread(_objectSpread({
+    feedbackLayout: "popover"
+  }, props), eventProps), getTeamixLayout), {}, {
+    form: form,
+    className: (0, _classnames.default)(prefixCls, props.className),
+    schema: gridSchema,
+    onSubmit: onFilter
+  }));
+});
+AdvancedFilter.defaultProps = {
+  triggerType: 'change',
+  layout: 'horizontal',
+  labelAlign: 'right',
+  labelCol: 6,
+  wrapperCol: 18
+};
+/**
+ * 查询筛选
+ */
+
+var QueryFilter = /*#__PURE__*/(0, _react.memo)(function (props) {
+  var _useState = (0, _react.useState)(true),
+      _useState2 = _slicedToArray(_useState, 2),
+      advancedFilterVisible = _useState2[0],
+      setAdvancedFilterVisible = _useState2[1];
+
+  var _useState3 = (0, _react.useState)([]),
+      _useState4 = _slicedToArray(_useState3, 2),
+      tagDataSource = _useState4[0],
+      setTagDataSource = _useState4[1]; // const [values, setValues] = useState<any>();
+
+
+  var form = (0, _react.useMemo)(function () {
+    return (props === null || props === void 0 ? void 0 : props.form) || (0, _core.createForm)({
+      validateFirst: true
+    });
+  }, []);
+  var schema = props.schema,
+      addonAfter = props.addonAfter,
+      addonBefore = props.addonBefore;
+  var prefixCls = (0, _utils.usePrefixCls)('', {
+    prefix: 'teamix-pro-form-query-filter'
+  }); // 展开收起高级筛选
+
+  var toggleAdvancedFilter = (0, _react.useCallback)(function () {
+    setAdvancedFilterVisible(function (visible) {
+      return !visible;
+    });
+  }, []); // 获取标签数据
+
+  var getTagDataSource = (0, _react.useCallback)(function (form) {
+    var displayValues = (0, _useFormDisplayValues.getFormDisplayValues)(form);
+    return Object.entries(displayValues).map(function (_ref) {
+      var _data$displayValue;
+
+      var _ref2 = _slicedToArray(_ref, 2),
+          key = _ref2[0],
+          data = _ref2[1];
+
+      return {
+        key: key,
+        label: data.title,
+        value: (_data$displayValue = data.displayValue) !== null && _data$displayValue !== void 0 ? _data$displayValue : data.value
+      };
+    }); // .filter((item) => isValid(item.value));
+  }, []); // 表单值变化
+
+  var onFormValueChange = (0, _react.useCallback)(function (values) {
+    setTagDataSource(getTagDataSource(form));
+  }, []);
+  console.log(tagDataSource); // useEffect(() => {
+  //   console.log(form.values);
+  // }, [form.values]);
+
+  return /*#__PURE__*/_react.default.createElement("div", {
+    className: (0, _classnames.default)(prefixCls, props.className)
+  }, /*#__PURE__*/_react.default.createElement("div", {
+    className: "".concat(prefixCls, "-inline")
+  }, /*#__PURE__*/_react.default.createElement("div", {
+    className: "".concat(prefixCls, "-left")
+  }, addonBefore ? /*#__PURE__*/_react.default.createElement("div", {
+    className: "".concat(prefixCls, "-addonBefore")
+  }, addonBefore) : null, /*#__PURE__*/_react.default.createElement("div", {
+    className: "".concat(prefixCls, "-simple")
+  }, /*#__PURE__*/_react.default.createElement(SimpleFilter, {
+    schema: schemaTemp
+  })), /*#__PURE__*/_react.default.createElement("div", {
+    className: "".concat(prefixCls, "-toggle")
+  }, /*#__PURE__*/_react.default.createElement(_components.Badge, {
+    count: tagDataSource.length,
+    style: _objectSpread({
+      backgroundColor: 'var(--color-brand1-6, #0064c8)',
+      color: 'var(--color-white, #fff)'
+    }, advancedFilterVisible ? {
+      display: 'none'
+    } : {})
+  }, /*#__PURE__*/_react.default.createElement(_components.Button, {
+    onClick: toggleAdvancedFilter
+  }, advancedFilterVisible ? /*#__PURE__*/_react.default.createElement(_icon.default, {
+    type: "up-line"
+  }) : /*#__PURE__*/_react.default.createElement(_icon.default, {
+    type: "filter-line"
+  }), (0, _utils.getMessage)('advancedFilter'))))), addonAfter ? /*#__PURE__*/_react.default.createElement("div", {
+    className: "".concat(prefixCls, "-addonAfter")
+  }, addonAfter) : null), /*#__PURE__*/_react.default.createElement("div", {
+    className: "".concat(prefixCls, "-panel")
+  }, /*#__PURE__*/_react.default.createElement("div", {
+    className: (0, _classnames.default)("".concat(prefixCls, "-tag"), !advancedFilterVisible ? "".concat(prefixCls, "-tag-hidden") : '')
+  }, /*#__PURE__*/_react.default.createElement(_components.Tag.Group, null, tagDataSource.map(function (_ref3) {
+    var key = _ref3.key,
+        label = _ref3.label,
+        value = _ref3.value;
+    return /*#__PURE__*/_react.default.createElement(_components.Tag.Closeable, {
+      key: key,
+      afterClose: console.log
+    }, /*#__PURE__*/_react.default.createElement("span", {
+      className: "".concat(prefixCls, "-tag-title")
+    }, label), /*#__PURE__*/_react.default.createElement("span", {
+      className: "".concat(prefixCls, "-tag-content")
+    }, value));
+  }))), /*#__PURE__*/_react.default.createElement("div", {
+    className: (0, _classnames.default)("".concat(prefixCls, "-advanced"), !advancedFilterVisible ? "".concat(prefixCls, "-advanced-hidden") : '')
+  }, /*#__PURE__*/_react.default.createElement(AdvancedFilter, _objectSpread(_objectSpread({
+    form: form
+  }, props), {}, {
+    onFilter: onFormValueChange
+  })))));
+});
+exports.QueryFilter = QueryFilter;

package/lib/form/ProForm/index.js

@@ -84,7 +84,8 @@ var ProForm = /*#__PURE__*/(0, _react.memo)(function (_ref) {
       context: context
     });
   }, [scope, context]);
-  var onAutoSubmit = (0, _useAutoSubmit.default)(onSubmit);
+  var onAutoSubmit = (0, _useAutoSubmit.default)(onSubmit); // todo 需要formily支持断点下的属性更新
+
   var getTeamixLayout = (0, _react.useMemo)(function () {
     return breakpoints ? {
       breakpoints: breakpoints,
@@ -136,28 +137,7 @@ var ProForm = /*#__PURE__*/(0, _react.memo)(function (_ref) {
     schema: schema,
     scope: mergedScope,
     components: components
-  }), children); // return outerForm === false ? ( // 特殊表单，无需渲染form实例，例如FormDialog等
-  //   <FormLayout
-  //     className={cls(prefixCls, className)}
-  //     {...otherProps}
-  //     {...getTeamixLayout}
-  //   >
-  //     <SchemaForm schema={schema} scope={scope} components={components} />
-  //     {children}
-  //   </FormLayout>
-  // ) : (
-  //   <Form
-  //     className={cls(prefixCls, className)}
-  //     {...otherProps}
-  //     {...getTeamixLayout}
-  //     form={form}
-  //     onAutoSubmit={onAutoSubmit}
-  //     onAutoSubmitFailed={onSubmitFailed}
-  //   >
-  //     <SchemaForm schema={schema} scope={scope} components={components} />
-  //     {children}
-  //   </Form>
-  // );
+  }), children);
 });
 ProForm.defaultProps = {
   colon: false,

package/lib/form/ProForm/index.scss

@@ -230,14 +230,12 @@
   }
 }
 
-// 筛选和抽屉按钮
-.#{$teamix-pro-form}-filter-advanced,
+// 抽屉按钮
 .#{$css-prefix}drawer-footer {
   .#{$css-prefix}formily-button-group {
     margin-top: 0;
   }
 }
-
 .#{$teamix-pro-form}-button-affix-auto.#{$css-prefix}affix,
 .#{$teamix-pro-form}-button-affix-always.#{$css-prefix}affix {
   left: 0;
@@ -259,22 +257,6 @@
   }
 }
 
-// 高级筛选
-.#{$teamix-pro-form}-filter-advanced,
-.#{$teamix-pro-form}-filter-simple {
-  .#{$form-item-cls}-feedback-layout-popover {
-    margin-bottom: 0;
-  }
-  .#{$css-prefix}date-picker2-input {
-    .#{$css-prefix}input {
-      width: inherit;
-      input {
-        width: inherit;
-      }
-    }
-  }
-}
-
 // ArrayItems
 .#{$css-prefix}formily-array-items {
   .#{$css-prefix}formily-grid-layout {
@@ -288,3 +270,12 @@
     cursor: pointer;
   }
 }
+
+/* hack todo remove */
+.#{$form-item-cls}-control-content-component {
+  .teamix-pro-field-tooltip.teamix-pro-field-checkbox {
+    .teamix-pro-lable-icon-tip-icon {
+      transform: translate(0px, 4px);
+    }
+  }
+}

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

@@ -1,6 +1,4 @@
-/**
- * 获取表单值的可显示值
- * @returns 如果某字段有dataSource，则返回value对应label
- */
+import type { Form } from '@formily/core';
 declare const useFormDisplayValues: () => any;
-export default useFormDisplayValues;
+declare const getFormDisplayValues: (form: Form) => any;
+export { useFormDisplayValues, getFormDisplayValues };

package/lib/form/ProForm/useFormDisplayValues.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.default = void 0;
+exports.useFormDisplayValues = exports.getFormDisplayValues = void 0;
 
 var _react = require("@formily/react");
 
@@ -24,51 +24,58 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 /**
  * 获取表单值的可显示值
  * @returns 如果某字段有dataSource，则返回value对应label
+ * @example const example = {
+    a: [
+        [{ b: 'a.0.0.b', c: 'a.0.0.c' }, { d: 'a.0.1.d' }],
+        { e: [{ f: { g: [{ h: 'a.1.e.0.f.g.0.h' }] } }, 'a.1.e.1'] },
+      ],
+  };
+  console.log(getDisplayValues(example));
  */
+var getDisplayValues = function getDisplayValues(form, values) {
+  var prefix = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : '';
+  var displayValues; // 判断值的类型，递归获取每个值在该结构中的完整路径
+
+  if ((0, _utils.isPlainObj)(values)) {
+    displayValues = {};
+    Object.entries(values).forEach(function (_ref) {
+      var _ref2 = _slicedToArray(_ref, 2),
+          key = _ref2[0],
+          value = _ref2[1];
+
+      var path = prefix ? "".concat(prefix, ".").concat(key) : "".concat(key);
+      displayValues[key] = getDisplayValues(form, value, path);
+    });
+  } else if ((0, _utils.isArr)(values)) {
+    displayValues = []; // todo 如果对象或数组的值不再是对象或数组，并且找不到路径，判断为非复合组件，直接返回原始值
+
+    values.map(function (value, index) {
+      var path = prefix ? "".concat(prefix, ".").concat(index) : "".concat(index);
+      displayValues[index] = getDisplayValues(form, value, path);
+    });
+  } else {
+    // 通过值的完整路径获取字段address（从form实例的indexes中），然后获取该字段的value在该字段dataSource中对应的label
+    var address = form.indexes[prefix];
+    var field = form.query(address).take();
+    displayValues = {
+      title: field === null || field === void 0 ? void 0 : field.title,
+      value: values,
+      displayValue: (0, _utils.getValueByValue)(field === null || field === void 0 ? void 0 : field.dataSource, values)
+    };
+  }
+
+  return displayValues;
+};
+
 var useFormDisplayValues = function useFormDisplayValues() {
   var form = (0, _react.useForm)();
-  var values = form.values; // 判断值的类型，递归获取每个值在该结构中的完整路径
-
-  var getDisplayValues = function getDisplayValues(values) {
-    var prefix = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : '';
-    var displayValues;
-
-    if ((0, _utils.isPlainObj)(values)) {
-      displayValues = {};
-      Object.entries(values).forEach(function (_ref) {
-        var _ref2 = _slicedToArray(_ref, 2),
-            key = _ref2[0],
-            value = _ref2[1];
-
-        var path = prefix ? "".concat(prefix, ".").concat(key) : "".concat(key);
-        displayValues[key] = getDisplayValues(value, path);
-      });
-    } else if ((0, _utils.isArr)(values)) {
-      displayValues = [];
-      values.map(function (value, index) {
-        var path = prefix ? "".concat(prefix, ".").concat(index) : "".concat(index);
-        displayValues[index] = getDisplayValues(value, path);
-      });
-    } else {
-      // 通过值的完整路径获取字段address（从form实例的indexes中），然后获取该字段的value在该字段dataSource中对应的label
-      var address = form.indexes[prefix];
-      var field = form.query(address).take();
-      displayValues = (0, _utils.getValueByValue)(field === null || field === void 0 ? void 0 : field.dataSource, values) || values;
-    }
-
-    return displayValues;
-  }; // 测试样例
-  // const example = {
-  //   a: [
-  //     [{ b: 'a.0.0.b', c: 'a.0.0.c' }, { d: 'a.0.1.d' }],
-  //     { e: [{ f: { g: [{ h: 'a.1.e.0.f.g.0.h' }] } }, 'a.1.e.1'] },
-  //   ],
-  // };
-  // console.log(getDisplayValues(example));
-
-
-  return getDisplayValues(values);
+  return getDisplayValues(form, form.values);
+};
+
+exports.useFormDisplayValues = useFormDisplayValues;
+
+var getFormDisplayValues = function getFormDisplayValues(form) {
+  return getDisplayValues(form, form.values);
 };
 
-var _default = useFormDisplayValues;
-exports.default = _default;
+exports.getFormDisplayValues = getFormDisplayValues;

package/lib/form/SchemaForm/index.js

@@ -105,6 +105,7 @@ var _default = /*#__PURE__*/(0, _react.memo)(function (_ref) {
   var schema = _ref.schema,
       scope = _ref.scope,
       components = _ref.components;
+  // 创建 SchemaField
   var SchemaField = (0, _react.useMemo)(function () {
     return (0, _react2.createSchemaField)({
       components: _objectSpread(_objectSpread({}, _ProField.default), {}, {
@@ -135,15 +136,15 @@ var _default = /*#__PURE__*/(0, _react.memo)(function (_ref) {
         Text: _index.default
       })
     });
-  }, []); // 合并schema中request的scope
+  }, []); // 合并 schema 中 request 的 scope
 
   var mergedScope = (0, _react.useMemo)(function () {
     return _objectSpread({}, scope);
-  }, [scope]); // 格式化schema
+  }, [scope]); // 格式化 schema
 
   var formatSchema = (0, _react.useCallback)(function (schema) {
     var schemaProperties = {};
-    schema.forEach(function (item) {
+    schema === null || schema === void 0 ? void 0 : schema.forEach(function (item) {
       var newItem = (0, _warning.default)(item);
       var _newItem = newItem,
           originalComponent = _newItem.component; // 根据component的不同，初始化为内置的item
@@ -279,15 +280,15 @@ var _default = /*#__PURE__*/(0, _react.memo)(function (_ref) {
     });
     return schemaProperties;
   }, [mergedScope]);
-  var schemaPro = (0, _react.useMemo)(function () {
+  var proFormSchema = (0, _react.useMemo)(function () {
     return {
       type: 'object',
       properties: formatSchema(schema)
     };
-  }, []); // console.log(schemaPro);
+  }, []); // console.log(proFormSchema);
 
   return /*#__PURE__*/_react.default.createElement(SchemaField, {
-    schema: schemaPro,
+    schema: proFormSchema,
     components: components,
     scope: mergedScope
   });

package/lib/form/index.d.ts

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

package/lib/form/index.js

@@ -71,7 +71,7 @@ Object.defineProperty(exports, "FormTab", {
 Object.defineProperty(exports, "QueryFilter", {
   enumerable: true,
   get: function get() {
-    return _Filter.QueryFilter;
+    return _index.QueryFilter;
   }
 });
 Object.defineProperty(exports, "SimpleFilter", {
@@ -146,12 +146,14 @@ exports.formilyTeamix = _formilyTeamix;
 
 var originalFormilyReact = _interopRequireWildcard(require("@formily/react"));
 
-var _useFormDisplayValues = _interopRequireDefault(require("./ProForm/useFormDisplayValues"));
+var _useFormDisplayValues = require("./ProForm/useFormDisplayValues");
 
 var _useFieldRequest = _interopRequireDefault(require("./ProForm/useFieldRequest"));
 
 var _Filter = require("./Filter");
 
+var _index = require("./Filter/index2");
+
 var _ProForm = _interopRequireDefault(require("./ProForm"));
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
@@ -168,7 +170,7 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
 
 var formilyReact = _objectSpread(_objectSpread({}, originalFormilyReact), {}, {
   useFieldRequest: _useFieldRequest.default,
-  useFormDisplayValues: _useFormDisplayValues.default
+  useFormDisplayValues: _useFormDisplayValues.useFormDisplayValues
 });
 
 exports.formilyReact = formilyReact;

package/lib/form/typing.d.ts

@@ -2,6 +2,7 @@ import type { ReactNode } from 'react';
 import type { IFormFeedback, Form as FormType, FieldPatternTypes } from '@formily/core';
 import type { IFormLayoutProps } from '@teamix/formily';
 import { CommonRequestConfig } from '@teamix/utils';
+import React from 'react';
 interface AnyObject {
     [propName: string]: any;
 }
@@ -64,6 +65,8 @@ export interface ProFormProps extends IFormLayoutProps {
     onSubmitFailed?: (feedbacks: IFormFeedback[]) => void;
 }
 export interface QueryFilterProps extends ProFormProps {
+    addonBefore?: ReactNode;
+    addonAfter?: ReactNode;
     onFilter?: (values: any) => void;
     onReset?: (payload?: any) => void;
 }

package/lib/index.d.ts

@@ -21,5 +21,5 @@ export * from './page-container';
 export * from './page-header';
 export * from './skeleton';
 export * from './table';
-declare const version = "1.2.7";
+declare const version = "1.2.11";
 export { version, ProAction, ProCard, ProField, ProForm, ProInfo, ProPageContainer, ProPageHeader, ProSkeleton, ProTable, hooks, nocode, templates, utils, };