@teamix/pro 1.2.13 → 1.2.14

package/es/form/Filter/index2.js

@@ -1,4 +1,6 @@
-var _excluded = ["schema", "triggerType", "onFilter"];
+var _excluded = ["schema", "triggerType", "onFilter"],
+    _excluded2 = ["schema", "triggerType", "onFilter"],
+    _excluded3 = ["form", "addonAfter", "addonBefore", "onFilter"];
 
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
 
@@ -24,22 +26,24 @@ function _objectWithoutProperties(source, excluded) { if (source == null) return
 
 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 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 = 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 _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; }
 
-import React, { memo, useCallback, useMemo, useState } from 'react';
+import React, { memo, useCallback, useMemo, useState, useEffect } from 'react';
 import cls from 'classnames';
 import { Tag, Button, Badge } from '@alicloudfe/components';
 import TeamixIcon from '@teamix/icon';
 import { createForm } from '@formily/core';
-import { usePrefixCls, getMessage } from '@teamix/utils';
+import { usePrefixCls, getMessage, isSignificative } from '@teamix/utils';
+import ProField from '../../field/index';
 import ProForm from '../ProForm';
+import fieldTypeMap from '../fieldTypeMap';
 import { getFormDisplayValues } from '../ProForm/useFormDisplayValues';
 import { mergeArrayValue } from '../utils';
-import './index.scss';
+import './index2.scss';
 
 var getEventProps = function getEventProps(triggerType, onFilter) {
   var keydownEvent = {
@@ -79,7 +83,7 @@ var SimpleFilter = /*#__PURE__*/memo(function (props) {
       otherProps = _objectWithoutProperties(props, _excluded);
 
   var prefixCls = usePrefixCls('', {
-    prefix: 'teamix-pro-form-filter-simple'
+    prefix: 'teamix-pro-form-query-filter-simple'
   });
   var simpleSchema = useMemo(function () {
     return [{
@@ -130,7 +134,7 @@ var AdvancedFilter = /*#__PURE__*/memo(function (props) {
       labelCol = props.labelCol,
       wrapperCol = props.wrapperCol;
   var prefixCls = usePrefixCls('', {
-    prefix: 'teamix-pro-form-filter-advanced'
+    prefix: 'teamix-pro-form-query-filter-advanced'
   });
   var gridSchema = useMemo(function () {
     return [{
@@ -203,6 +207,38 @@ AdvancedFilter.defaultProps = {
   labelCol: 6,
   wrapperCol: 18
 };
+/**
+ * 聚合筛选
+ */
+
+var LightFilter = /*#__PURE__*/memo(function (props) {
+  var schema = props.schema,
+      triggerType = props.triggerType,
+      onFilter = props.onFilter,
+      otherProps = _objectWithoutProperties(props, _excluded2);
+
+  var prefixCls = usePrefixCls('', {
+    prefix: 'teamix-pro-form-query-filter-light'
+  });
+  var LightSchema = useMemo(function () {
+    return [{
+      component: 'LightFilter',
+      children: schema
+    }];
+  }, [schema]);
+  var eventProps = getEventProps(triggerType, onFilter);
+  return /*#__PURE__*/React.createElement(ProForm, _objectSpread(_objectSpread(_objectSpread({
+    feedbackLayout: "popover",
+    breakpoints: [],
+    bordered: false
+  }, otherProps), eventProps), {}, {
+    className: cls(prefixCls, props.className),
+    schema: LightSchema
+  }));
+});
+LightFilter.defaultProps = {
+  triggerType: 'change'
+};
 /**
  * 查询筛选
  */
@@ -216,17 +252,19 @@ var QueryFilter = /*#__PURE__*/memo(function (props) {
   var _useState3 = useState([]),
       _useState4 = _slicedToArray(_useState3, 2),
       tagDataSource = _useState4[0],
-      setTagDataSource = _useState4[1]; // const [values, setValues] = useState<any>();
+      setTagDataSource = _useState4[1];
 
+  var outerForm = props.form,
+      addonAfter = props.addonAfter,
+      addonBefore = props.addonBefore,
+      onFilter = props.onFilter,
+      otherProps = _objectWithoutProperties(props, _excluded3);
 
   var form = useMemo(function () {
-    return (props === null || props === void 0 ? void 0 : props.form) || createForm({
+    return outerForm || createForm({
       validateFirst: true
     });
   }, []);
-  var schema = props.schema,
-      addonAfter = props.addonAfter,
-      addonBefore = props.addonBefore;
   var prefixCls = usePrefixCls('', {
     prefix: 'teamix-pro-form-query-filter'
   }); // 展开收起高级筛选
@@ -248,19 +286,27 @@ var QueryFilter = /*#__PURE__*/memo(function (props) {
 
       return {
         key: key,
+        type: fieldTypeMap[data.component] || 'text',
         label: data.title,
         value: (_data$displayValue = data.displayValue) !== null && _data$displayValue !== void 0 ? _data$displayValue : data.value
       };
-    }); // .filter((item) => isValid(item.value));
+    }).filter(function (item) {
+      return isSignificative(item.value);
+    });
   }, []); // 表单值变化
 
   var onFormValueChange = useCallback(function (values) {
     setTagDataSource(getTagDataSource(form));
-  }, []);
-  console.log(tagDataSource); // useEffect(() => {
-  //   console.log(form.values);
-  // }, [form.values]);
+    onFilter && onFilter(values);
+  }, []); // 关闭标签清空表单字段值
+
+  var onTagClose = useCallback(function (key) {
+    form.setValuesIn(key, undefined);
+  }, [form]); // 设置默认值标签数据
 
+  useEffect(function () {
+    setTagDataSource(getTagDataSource(form));
+  }, []);
   return /*#__PURE__*/React.createElement("div", {
     className: cls(prefixCls, props.className)
   }, /*#__PURE__*/React.createElement("div", {
@@ -270,10 +316,11 @@ var QueryFilter = /*#__PURE__*/memo(function (props) {
   }, addonBefore ? /*#__PURE__*/React.createElement("div", {
     className: "".concat(prefixCls, "-addonBefore")
   }, addonBefore) : null, /*#__PURE__*/React.createElement("div", {
-    className: "".concat(prefixCls, "-simple")
-  }, /*#__PURE__*/React.createElement(SimpleFilter, {
-    schema: schemaTemp
-  })), /*#__PURE__*/React.createElement("div", {
+    className: "".concat(prefixCls, "-light-wrap")
+  }, /*#__PURE__*/React.createElement(LightFilter, _objectSpread(_objectSpread({}, otherProps), {}, {
+    form: form,
+    onFilter: onFormValueChange
+  }))), /*#__PURE__*/React.createElement("div", {
     className: "".concat(prefixCls, "-toggle")
   }, /*#__PURE__*/React.createElement(Badge, {
     count: tagDataSource.length,
@@ -294,24 +341,29 @@ var QueryFilter = /*#__PURE__*/memo(function (props) {
   }, addonAfter) : null), /*#__PURE__*/React.createElement("div", {
     className: "".concat(prefixCls, "-panel")
   }, /*#__PURE__*/React.createElement("div", {
-    className: cls("".concat(prefixCls, "-tag"), !advancedFilterVisible ? "".concat(prefixCls, "-tag-hidden") : '')
+    className: cls("".concat(prefixCls, "-tag"), advancedFilterVisible ? "".concat(prefixCls, "-tag-hidden") : '')
   }, /*#__PURE__*/React.createElement(Tag.Group, null, tagDataSource.map(function (_ref3) {
     var key = _ref3.key,
         label = _ref3.label,
-        value = _ref3.value;
+        value = _ref3.value,
+        type = _ref3.type;
     return /*#__PURE__*/React.createElement(Tag.Closeable, {
       key: key,
-      afterClose: console.log
+      afterClose: function afterClose() {
+        return onTagClose(key);
+      }
     }, /*#__PURE__*/React.createElement("span", {
       className: "".concat(prefixCls, "-tag-title")
     }, label), /*#__PURE__*/React.createElement("span", {
       className: "".concat(prefixCls, "-tag-content")
-    }, value));
+    }, /*#__PURE__*/React.createElement(ProField, {
+      type: type,
+      value: value
+    })));
   }))), /*#__PURE__*/React.createElement("div", {
-    className: cls("".concat(prefixCls, "-advanced"), !advancedFilterVisible ? "".concat(prefixCls, "-advanced-hidden") : '')
-  }, /*#__PURE__*/React.createElement(AdvancedFilter, _objectSpread(_objectSpread({
-    form: form
-  }, props), {}, {
+    className: cls("".concat(prefixCls, "-advanced-wrap"), !advancedFilterVisible ? "".concat(prefixCls, "-advanced-wrap-hidden") : '')
+  }, /*#__PURE__*/React.createElement(AdvancedFilter, _objectSpread(_objectSpread({}, otherProps), {}, {
+    form: form,
     onFilter: onFormValueChange
   })))));
 });

package/es/form/Filter/index2.scss

@@ -0,0 +1,73 @@
+@import '../global.scss';
+
+$query-filter: #{$teamix-pro-form}-query-filter;
+
+.#{$query-filter} {
+  .#{$query-filter}-inline {
+    display: flex;
+    justify-content: space-between;
+  }
+  .#{$query-filter}-left {
+    display: flex;
+  }
+  .#{$query-filter}-addonBefore {
+    flex: 0 1 auto;
+    margin-right: 8px;
+  }
+  .#{$query-filter}-light-wrap {
+    flex: 0 0 auto;
+    margin-right: 8px;
+    margin-bottom: 8px;
+  }
+  .#{$query-filter}-toggle {
+    margin-bottom: 8px;
+  }
+  .#{$query-filter}-addonAfter {
+    flex: 0 1 auto;
+    margin-left: 8px;
+  }
+  .#{$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}-tag-hidden {
+    display: none;
+  }
+  .#{$query-filter}-advanced-wrap {
+    padding: 16px;
+    background-color: var(--color-fill1-2, #f7f7f7);
+  }
+  .#{$query-filter}-advanced-wrap-hidden {
+    display: none;
+  }
+
+  .#{$query-filter}-advanced {
+    .#{$css-prefix}formily-button-group {
+      margin-top: 0;
+    }
+  }
+  .#{$query-filter}-advanced,
+  .#{$query-filter}-simple,
+  .#{$query-filter}-light {
+    .#{$form-item-cls}-feedback-layout-popover {
+      margin-bottom: 0;
+    }
+    .#{$css-prefix}date-picker2-input {
+      .#{$css-prefix}input {
+        width: inherit;
+        input {
+          width: inherit;
+        }
+      }
+    }
+  }
+}

package/es/form/ProForm/index.js

@@ -1,8 +1,8 @@
 var _excluded = ["form", "initialValues", "initialRequest", "schema", "scope", "context", "components", "children", "layout", "labelAlign", "wrapperAlign", "labelCol", "wrapperCol", "breakpoints", "onChange", "onSubmit", "onSubmitFailed", "className"];
 
-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 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 = 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 _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; }
 

package/es/form/ProForm/index.scss

@@ -32,11 +32,11 @@
     > .#{$form-item-cls}-control-content {
       > .#{$form-item-cls}-control-content-component {
         line-height: initial;
-        > .teamix-pro-field-checkbox,
-        .teamix-pro-field-radio,
-        .teamix-pro-field-switch,
-        .teamix-pro-field-colorradio,
-        .teamix-pro-field-range,
+        > .#{$teamix-pro-field}-checkbox,
+        .#{$teamix-pro-field}-radio,
+        .#{$teamix-pro-field}-switch,
+        .#{$teamix-pro-field}-colorradio,
+        .#{$teamix-pro-field}-range,
         .#{$css-prefix}btn-text {
           line-height: var(--form-element-medium-height, 32px);
         }
@@ -160,11 +160,11 @@
       margin-right: 4px;
     }
   }
-  .teamix-pro-field-money button,
-  .teamix-pro-field-icon button {
+  .#{$teamix-pro-field}-money button,
+  .#{$teamix-pro-field}-icon button {
     border: 0 !important;
   }
-  .teamix-pro-field-color-swatch {
+  .#{$teamix-pro-field}-color-swatch {
     box-shadow: none !important;
   }
   .#{$css-prefix}date-picker2-input,
@@ -273,7 +273,7 @@
 
 /* hack todo remove */
 .#{$form-item-cls}-control-content-component {
-  .teamix-pro-field-tooltip.teamix-pro-field-checkbox {
+  .#{$teamix-pro-field}-tooltip.#{$teamix-pro-field}-checkbox {
     .teamix-pro-lable-icon-tip-icon {
       transform: translate(0px, 4px);
     }

package/es/form/ProForm/useAutoSubmit.js

@@ -1,6 +1,6 @@
-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 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 = 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 _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; }
 

package/es/form/ProForm/useFieldRequest.js

@@ -1,6 +1,6 @@
-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 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 = 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 _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; }
 

package/es/form/ProForm/useFormDisplayValues.js

@@ -11,6 +11,7 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
 import { useForm } from '@formily/react';
+import { toJS } from '@formily/reactive';
 import { isArr, isPlainObj, getValueByValue } from '@teamix/utils';
 /**
  * 获取表单值的可显示值
@@ -26,33 +27,63 @@ import { isArr, isPlainObj, getValueByValue } from '@teamix/utils';
 
 var getDisplayValues = function getDisplayValues(form, values) {
   var prefix = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : '';
-  var displayValues; // 判断值的类型，递归获取每个值在该结构中的完整路径
+  var displayValues; // 拼接路径
 
-  if (isPlainObj(values)) {
+  var connectPath = function connectPath(path) {
+    return prefix ? "".concat(prefix, ".").concat(path) : "".concat(path);
+  }; // 根据值路径获取地址
+
+
+  var getAddress = function getAddress(path) {
+    return form.indexes[path];
+  }; // 判断布局、自增的值还是字段的值（字段值是对象、数组，内部的值特点为非数组、对象的叶子值，并且在form没有路径）
+
+
+  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);
+  }; // 判断值的类型，递归获取每个值在该结构中的完整路径
+
+
+  if (isPlainObj(values) && isLayoutValue(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);
+      displayValues[key] = getDisplayValues(form, value, connectPath(key));
     });
-  } else if (isArr(values)) {
-    displayValues = []; // todo 如果对象或数组的值不再是对象或数组，并且找不到路径，判断为非复合组件，直接返回原始值
-
+  } else if (isArr(values) && isArrayValue(values)) {
+    // 如果值是数组且是自增数组的值
+    displayValues = [];
     values.map(function (value, index) {
-      var path = prefix ? "".concat(prefix, ".").concat(index) : "".concat(index);
-      displayValues[index] = getDisplayValues(form, value, path);
+      displayValues[index] = getDisplayValues(form, value, connectPath(index));
     });
   } else {
+    var _values$value;
+
     // 通过值的完整路径获取字段address（从form实例的indexes中），然后获取该字段的value在该字段dataSource中对应的label
-    var address = form.indexes[prefix];
-    var field = form.query(address).take();
+    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; // 针对单个字段的值是对象
+
     displayValues = {
       title: field === null || field === void 0 ? void 0 : field.title,
-      value: values,
-      displayValue: getValueByValue(field === null || field === void 0 ? void 0 : field.dataSource, values)
+      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)
     };
   }
 
@@ -61,11 +92,11 @@ var getDisplayValues = function getDisplayValues(form, values) {
 
 var useFormDisplayValues = function useFormDisplayValues() {
   var form = useForm();
-  return getDisplayValues(form, form.values);
+  return getDisplayValues(form, toJS(form.values));
 };
 
 var getFormDisplayValues = function getFormDisplayValues(form) {
-  return getDisplayValues(form, form.values);
+  return getDisplayValues(form, toJS(form.values));
 };
 
 export { useFormDisplayValues, getFormDisplayValues };

package/es/form/ProForm/useInitialRequest.js

@@ -1,6 +1,6 @@
-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 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 = 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 _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; }
 

package/es/form/SchemaForm/adapterType.js

@@ -13,6 +13,7 @@ var typeMap = (_typeMap = {
   Percent: 'number',
   Money: 'number',
   Select: 'string',
+  MenuSelect: 'string',
   MultipleSelect: 'array',
   TreeSelect: 'string',
   Cascader: 'string',

package/es/form/SchemaForm/index.js

@@ -24,9 +24,9 @@ function _objectWithoutProperties(source, excluded) { if (source == null) return
 
 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 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 = 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 _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; }
 
@@ -37,7 +37,7 @@ import { Upload, FormLayout, FormItem, ArrayCollapse, ArrayCards, ArrayItems, Ar
 import ProFieldComponents from '../Components/ProField';
 import { EditableDialog, EditableDrawer, EditablePopover } from '../Components/Editable';
 import FormGroup from '../Components/FormGroup';
-import QueryFilter from '../Components/QueryFilter';
+import LightFilter from '../Components/LightFilter';
 import Text from '../Components/Text/index';
 import adapterType from './adapterType';
 import adapterComponent from './adapterComponent';
@@ -87,9 +87,9 @@ export default /*#__PURE__*/memo(function (_ref) {
         EditableDrawer: EditableDrawer,
         EditablePopover: EditablePopover,
         FormGroup: FormGroup,
-        QueryFilter: QueryFilter,
         Upload: Upload,
         Affix: Affix,
+        LightFilter: LightFilter,
         Text: Text
       })
     });

package/es/form/SchemaForm/initializeArrayCards.js

@@ -1,6 +1,6 @@
-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 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 = 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 _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; }
 

package/es/form/SchemaForm/initializeArrayCollapse.js

@@ -1,6 +1,6 @@
-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 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 = 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 _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; }
 

package/es/form/SchemaForm/initializeArrayItems.js

@@ -1,6 +1,6 @@
-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 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 = 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 _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; }
 

package/es/form/SchemaForm/initializeArrayTable.js

@@ -1,8 +1,8 @@
 var _excluded = ["title", "decoratorProps"];
 
-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 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 = 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 _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; }
 

package/es/form/SchemaForm/initializeFormButton.js

@@ -4,9 +4,9 @@ function _objectWithoutProperties(source, excluded) { if (source == null) return
 
 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 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 = 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 _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; }
 

package/es/form/SchemaForm/initializeFormCollapse.js

@@ -1,9 +1,9 @@
 var _excluded = ["children", "title", "props"],
     _excluded2 = ["children"];
 
-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 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 = 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 _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; }
 

package/es/form/SchemaForm/initializeFormGroup.js

@@ -1,9 +1,9 @@
 var _excluded = ["props", "children", "title"],
     _excluded2 = ["props", "children"];
 
-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 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 = 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 _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; }