@teamix/pro 1.4.24 → 1.4.25-bugfix.2

package/es/form/Filter/AdvancedFilter.js

@@ -1,53 +1,39 @@
 var _excluded = ["schema", "onSubmit", "onReset", "layout", "labelAlign", "wrapperAlign", "labelCol", "wrapperCol", "breakpoints", "gridProps", "forceClear"];
-
 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 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; }
-
 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; }
-
-import React, { memo, useMemo } from 'react';
+import React, { memo, useEffect, useMemo } from 'react';
 import { usePrefixCls, getMessage, cls, isBool } from '@teamix/utils';
 import ProForm from '../ProForm';
 import { mergeArrayValue } from '../utils';
 /**
  * 高级筛选
  */
-
 var AdvancedFilter = /*#__PURE__*/memo(function (props) {
   var schema = props.schema,
-      onSubmit = props.onSubmit,
-      onReset = props.onReset,
-      layout = props.layout,
-      labelAlign = props.labelAlign,
-      wrapperAlign = props.wrapperAlign,
-      labelCol = props.labelCol,
-      wrapperCol = props.wrapperCol,
-      breakpoints = props.breakpoints,
-      gridProps = props.gridProps,
-      forceClear = props.forceClear,
-      otherProps = _objectWithoutProperties(props, _excluded);
-
+    onSubmit = props.onSubmit,
+    onReset = props.onReset,
+    layout = props.layout,
+    labelAlign = props.labelAlign,
+    wrapperAlign = props.wrapperAlign,
+    labelCol = props.labelCol,
+    wrapperCol = props.wrapperCol,
+    breakpoints = props.breakpoints,
+    gridProps = props.gridProps,
+    forceClear = props.forceClear,
+    otherProps = _objectWithoutProperties(props, _excluded);
   var prefixCls = usePrefixCls('teamix-pro-form-query-filter-advanced');
   var gridSchema = useMemo(function () {
     return [{
-      name: 'FormGrid',
+      name: 'AdvancedFilterFormGrid',
       component: 'FormGrid',
       props: _objectSpread({
         breakpoints: [480, 720, 990, 1200, Infinity],
@@ -67,6 +53,7 @@ var AdvancedFilter = /*#__PURE__*/memo(function (props) {
             align: 'right'
           },
           children: [{
+            name: 'AdvancedFilterReset',
             component: 'Reset',
             props: {
               onResetValidateSuccess: onReset,
@@ -86,6 +73,10 @@ var AdvancedFilter = /*#__PURE__*/memo(function (props) {
       }])
     }];
   }, [schema, onReset]);
+  useEffect(function () {
+    var _otherProps$form;
+    otherProps === null || otherProps === void 0 ? void 0 : (_otherProps$form = otherProps.form) === null || _otherProps$form === void 0 ? void 0 : _otherProps$form.clearFormGraph('AdvancedFilterReset');
+  }, [onReset]);
   var getTeamixLayout = useMemo(function () {
     return breakpoints === true ? {
       breakpoints: [990],

package/es/form/Filter/Layout.js

@@ -1,44 +1,32 @@
 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; }
-
 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 _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 _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 _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; }
-
 import React, { useCallback, useState } from 'react';
 import { Button, Badge } from '@alicloudfe/components';
 import TeamixIcon from '@teamix/icon';
 import { usePrefixCls, getMessage, isValid, cls } from '@teamix/utils';
 import './layout.scss';
-
 var QueryFilterLayout = function QueryFilterLayout(_ref) {
   var className = _ref.className,
-      addonBefore = _ref.addonBefore,
-      addonAfter = _ref.addonAfter,
-      inlineContent = _ref.inlineContent,
-      panelContent = _ref.panelContent,
-      count = _ref.count,
-      expand = _ref.expand,
-      onExpand = _ref.onExpand,
-      children = _ref.children;
+    addonBefore = _ref.addonBefore,
+    addonAfter = _ref.addonAfter,
+    inlineContent = _ref.inlineContent,
+    panelContent = _ref.panelContent,
+    count = _ref.count,
+    expand = _ref.expand,
+    onExpand = _ref.onExpand,
+    children = _ref.children;
   var prefixCls = usePrefixCls('teamix-pro-form-query-filter-layout');
-
   var _useState = useState(!!expand),
-      _useState2 = _slicedToArray(_useState, 2),
-      visible = _useState2[0],
-      setVisible = _useState2[1];
-
+    _useState2 = _slicedToArray(_useState, 2),
+    visible = _useState2[0],
+    setVisible = _useState2[1];
   var onClick = useCallback(function () {
     setVisible(!visible);
     onExpand === null || onExpand === void 0 ? void 0 : onExpand(!visible);
@@ -77,5 +65,4 @@ var QueryFilterLayout = function QueryFilterLayout(_ref) {
     className: prefixCls('children')
   }, children));
 };
-
 export { QueryFilterLayout };

package/es/form/Filter/LightFilter.js

@@ -1,15 +1,9 @@
 var _excluded = ["form", "schema", "onSubmit", "onChange", "defaultFilterValue", "filterValues", "activeFilterValueRef"];
-
 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; }
-
 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; }
-
 import React, { memo, useMemo, useCallback, useRef, useEffect } from 'react';
 import { observable } from '@formily/reactive';
 import { usePrefixCls, cls } from '@teamix/utils';
@@ -17,19 +11,16 @@ import ProForm from '../ProForm';
 /**
  * 轻量筛选
  */
-
 var LightFilter = /*#__PURE__*/memo(function (props) {
   var _schema$;
-
   var form = props.form,
-      schema = props.schema,
-      onSubmit = props.onSubmit,
-      onChange = props.onChange,
-      defaultFilterValue = props.defaultFilterValue,
-      filterValues = props.filterValues,
-      activeFilterValueRef = props.activeFilterValueRef,
-      otherProps = _objectWithoutProperties(props, _excluded);
-
+    schema = props.schema,
+    onSubmit = props.onSubmit,
+    onChange = props.onChange,
+    defaultFilterValue = props.defaultFilterValue,
+    filterValues = props.filterValues,
+    activeFilterValueRef = props.activeFilterValueRef,
+    otherProps = _objectWithoutProperties(props, _excluded);
   var filterValue = useRef(defaultFilterValue || (schema === null || schema === void 0 ? void 0 : (_schema$ = schema[0]) === null || _schema$ === void 0 ? void 0 : _schema$.name));
   var prefixCls = usePrefixCls('teamix-pro-form-query-filter-light');
   var lightFilterObs = useMemo(function () {
@@ -41,22 +32,20 @@ var LightFilter = /*#__PURE__*/memo(function (props) {
     if (activeFilterValueRef) {
       activeFilterValueRef.current = filterValue.current;
     }
-  }, []); // 筛选提交切换
-
+  }, []);
+  // 筛选提交切换
   var onFilterChange = useCallback(function (value) {
     filterValue.current = value;
-
     if (activeFilterValueRef) {
       activeFilterValueRef.current = value;
     }
-  }, [form]); // 实际输出onFilter
-
+  }, [form]);
+  // 实际输出onFilter
   var onFilter = useCallback(function () {
     var _Object$keys;
-
     var key = filterValue.current;
-    var value = form.values[key]; // 删除旧值
-
+    var value = form.values[key];
+    // 删除旧值
     (_Object$keys = Object.keys(form.values)) === null || _Object$keys === void 0 ? void 0 : _Object$keys.forEach(function (item) {
       if (item !== key) {
         form.setValuesIn(item, undefined);

package/es/form/Filter/SimpleFilter.js

@@ -1,19 +1,13 @@
 var _excluded = ["schema", "onChange", "onSubmit"];
-
 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); 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; }
-
 import React, { memo, useCallback, useEffect, useMemo, useRef } from 'react';
 import { usePrefixCls, cls, isValid } from '@teamix/utils';
-import ProForm from '../ProForm'; // 初始化Search组件，内置部分属性
-
+import ProForm from '../ProForm';
+// 初始化Search组件，内置部分属性
 var initializeSearch = function initializeSearch(schema) {
   var searchName = '';
   var initializedSchema = schema.map(function (item) {
@@ -28,7 +22,6 @@ var initializeSearch = function initializeSearch(schema) {
         }, item.props)
       });
     }
-
     return item;
   });
   return {
@@ -39,22 +32,16 @@ var initializeSearch = function initializeSearch(schema) {
 /**
  * 简单筛选
  */
-
-
 var SimpleFilter = /*#__PURE__*/memo(function (props) {
   var searchValue = useRef(undefined);
-
   var schema = props.schema,
-      onChange = props.onChange,
-      onSubmit = props.onSubmit,
-      otherProps = _objectWithoutProperties(props, _excluded);
-
+    onChange = props.onChange,
+    onSubmit = props.onSubmit,
+    otherProps = _objectWithoutProperties(props, _excluded);
   var prefixCls = usePrefixCls('teamix-pro-form-query-filter-simple');
-
   var _initializeSearch = initializeSearch(schema),
-      searchName = _initializeSearch.searchName,
-      initializedSchema = _initializeSearch.initializedSchema;
-
+    searchName = _initializeSearch.searchName,
+    initializedSchema = _initializeSearch.initializedSchema;
   var simpleSchema = useMemo(function () {
     return [{
       component: 'FormFlex',
@@ -84,7 +71,6 @@ var SimpleFilter = /*#__PURE__*/memo(function (props) {
   }, [onChange, searchName, searchValue.current]);
   useEffect(function () {
     var _props$form$initialVa, _props$form$initialVa2;
-
     // 处理Search组件，缓存input的默认值
     var searchDefaultValue = (_props$form$initialVa = props.form.initialValues) === null || _props$form$initialVa === void 0 ? void 0 : (_props$form$initialVa2 = _props$form$initialVa[searchName]) === null || _props$form$initialVa2 === void 0 ? void 0 : _props$form$initialVa2[1];
     searchValue.current = isValid(searchDefaultValue) ? searchDefaultValue : '';