@teamix/pro 1.2.14 → 1.2.18

package/lib/actions/index.js

@@ -54,8 +54,8 @@ var _excluded = ["type"],
     _excluded3 = ["loading"],
     _excluded4 = ["icon", "iconSize", "label", "actions", "children", "context", "type"],
     _excluded5 = ["context", "text"],
-    _excluded6 = ["actions"],
-    _excluded7 = ["config"],
+    _excluded6 = ["key", "actions"],
+    _excluded7 = ["key", "config"],
     _excluded8 = ["type", "divider", "max", "moreText", "context", "actions", "className"];
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
@@ -242,8 +242,8 @@ function renderCommonActionButtonMenuItem(action, key, context) {
     return /*#__PURE__*/_react.default.createElement(_components.Menu.SubMenu, {
       key: key,
       label: menuBtn.label || menuBtn.children
-    }, menuBtn.actions.map(function (a, j) {
-      return renderCommonActionButtonMenuItem(a, String(j), context);
+    }, menuBtn.actions.map(function (a) {
+      return renderCommonActionButtonMenuItem(a, a.key, context);
     }));
   }
 
@@ -278,7 +278,7 @@ var ProActionMenuButton = function ProActionMenuButton(props) {
     type: type,
     label: buttonContent(label || children, icon, iconSize, context)
   }, others), actions.map(function (action, i) {
-    return renderCommonActionButtonMenuItem(action, String(i), context);
+    return renderCommonActionButtonMenuItem(action, action.key || i, context);
   }));
 }; // 如果 actions 数量超过了 max，则把第 max 个和剩余超出部分折叠起来成为一个 menu
 
@@ -292,7 +292,9 @@ function formatGroupActions(actions, max, moreConfig) {
     return actions;
   }
 
-  return [].concat(_toConsumableArray(actions.slice(0, MAX - 1)), [_objectSpread(_objectSpread({}, moreConfig), {}, {
+  return [].concat(_toConsumableArray(actions.slice(0, MAX - 1)), [_objectSpread(_objectSpread({
+    key: '__teamix_pro_action_group_more_btn'
+  }, moreConfig), {}, {
     actions: actions.slice(MAX - 1)
   })]);
 } // 渲染一个 button 或者 menu button
@@ -338,22 +340,34 @@ function getDefaultMoreButton(type, moreText) {
 
 var MAX_ACTTIONS = 4;
 
-function getActionConfig(action, context) {
+function getKey(index, key) {
+  if (key !== undefined) {
+    return key;
+  }
+
+  return "__teamix_pro_action_key_".concat(index);
+}
+
+function getActionConfig(action, index, context) {
   if (action.actions) {
-    var actions = action.actions,
+    var _key = action.key,
+        actions = action.actions,
         _others = _objectWithoutProperties(action, _excluded6);
 
     return _objectSpread({
-      actions: actions.map(function (a) {
-        return getActionConfig(a, context);
+      key: getKey(index, _key),
+      actions: actions.map(function (a, j) {
+        return getActionConfig(a, j, context);
       })
     }, (0, _utils.getTargetValue)(_others, context));
   }
 
-  var config = action.config,
+  var key = action.key,
+      config = action.config,
       others = _objectWithoutProperties(action, _excluded7);
 
   return _objectSpread({
+    key: getKey(index, key),
     config: config
   }, (0, _utils.getTargetValue)(others, context));
 }
@@ -373,8 +387,8 @@ function ProActionGroup(props) {
       containerProps = _objectWithoutProperties(props, _excluded8);
 
   var isTypeText = type === 'text';
-  var filteredActions = actions.map(function (action) {
-    return getActionConfig(action, context);
+  var filteredActions = actions.map(function (action, index) {
+    return getActionConfig(action, index, context);
   }).filter(function (action) {
     return action.visible !== false;
   });
@@ -386,7 +400,7 @@ function ProActionGroup(props) {
   }, containerProps), formatedActions.map(function (actionBtn, i) {
     var isLastOne = i === formatedActions.length - 1;
     return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, {
-      key: i
+      key: actionBtn.key
     }, renderCommonActionButton(actionBtn, context, isTypeText), isTypeText && divider && !isLastOne && /*#__PURE__*/_react.default.createElement(_components.Divider, {
       direction: "ver"
     }));

package/lib/card/index.d.ts

@@ -1,5 +1,6 @@
 import React from 'react';
 import { ProTagItem } from '@teamix/utils';
+import { ProMessageProps } from '../utils/message';
 import { ProActionGroupProps } from '../actions';
 import './index.scss';
 export * from './card-container';
@@ -24,6 +25,8 @@ export interface ProCardProps extends Omit<React.HTMLAttributes<HTMLElement>, 't
     actions?: React.ReactNode | ProActionGroupProps;
     /** 卡片背景图 */
     image?: string;
+    /** 位于弹窗内容上方的消息提示区 */
+    message?: ProMessageProps;
     /** 卡片标题下方是否有分割线 */
     divider?: boolean;
     /**
@@ -87,7 +90,7 @@ export declare const ProCard: {
     Selectable: {
         (props: import("./selectable").ProCardSelectableProps): JSX.Element;
         defaultProps: {
-            hoveredShadow: boolean;
+            hoveredShadow: boolean; /** 标签组 */
         };
         isProCard: boolean;
     };

package/lib/card/index.js

@@ -20,6 +20,8 @@ var _icon = _interopRequireDefault(require("@teamix/icon"));
 
 var _utils = require("@teamix/utils");
 
+var _message = require("../utils/message");
+
 var _skeleton = require("../skeleton");
 
 var _actions = require("../actions");
@@ -48,7 +50,7 @@ Object.keys(_cardContainer).forEach(function (key) {
   });
 });
 var _excluded = ["context"],
-    _excluded2 = ["children", "title", "subTitle", "tooltip", "tooltipIcon", "tags", "description", "extra", "actions", "style", "className", "image", "hoveredShadow", "divider", "bordered", "compacted", "centered", "loading", "empty", "borderColor", "backgroundColor", "contentClassName", "contentStyle", "direction", "wrap", "spacing", "split", "collapsible", "defaultCollapsed", "collapsed", "onCollapse", "context"];
+    _excluded2 = ["children", "title", "subTitle", "tooltip", "tooltipIcon", "tags", "description", "extra", "actions", "message", "style", "className", "image", "hoveredShadow", "divider", "bordered", "compacted", "centered", "loading", "empty", "borderColor", "backgroundColor", "contentClassName", "contentStyle", "direction", "wrap", "spacing", "split", "collapsible", "defaultCollapsed", "collapsed", "onCollapse", "context"];
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
@@ -117,6 +119,7 @@ var ProCard = function ProCard(props) {
       description = props.description,
       extra = props.extra,
       actions = props.actions,
+      message = props.message,
       style = props.style,
       className = props.className,
       image = props.image,
@@ -287,7 +290,11 @@ var ProCard = function ProCard(props) {
     style: {
       padding: '50px 0 60px'
     }
-  })), !empty && childrenModified)));
+  })), !empty && /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, message && /*#__PURE__*/_react.default.createElement("div", {
+    className: cls('content-message')
+  }, (0, _message.renderProMessage)(message, {
+    type: 'notice'
+  })), childrenModified))));
 };
 
 exports.ProCard = ProCard;

package/lib/card/index.scss

@@ -151,6 +151,10 @@
         }
       }
     }
+
+    &-message {
+      margin-bottom: var(--s-2);
+    }
   }
 
   &-tab {

package/lib/form/Components/LightFilter/index.js

@@ -53,8 +53,7 @@ var useMain = function useMain(active) {
   var main = [];
   schema.mapProperties(function (schema, name) {
     // console.log(schema.required); // 添加 *
-    console.log(schema);
-
+    // console.log(schema);
     if (schema.name === active) {
       main.push({
         name: name,

package/lib/form/Filter/index.js

@@ -96,7 +96,7 @@ var SimpleFilter = /*#__PURE__*/(0, _react.memo)(function (props) {
         }
       }])
     }];
-  }, []);
+  }, [schema, triggerType]);
   var eventProps = getEventProps(triggerType, onFilter);
   return /*#__PURE__*/_react.default.createElement(_ProForm.default, _objectSpread(_objectSpread(_objectSpread({
     feedbackLayout: "popover",
@@ -174,7 +174,7 @@ var AdvancedFilter = /*#__PURE__*/(0, _react.memo)(function (props) {
         }]
       }])
     }];
-  }, []);
+  }, [schema, onReset, triggerType]);
   var getTeamixLayout = (0, _react.useMemo)(function () {
     return {
       breakpoints: [990],

package/lib/form/Filter/index2.js

@@ -31,9 +31,10 @@ var _utils2 = require("../utils");
 
 require("./index2.scss");
 
-var _excluded = ["schema", "triggerType", "onFilter"],
-    _excluded2 = ["schema", "triggerType", "onFilter"],
-    _excluded3 = ["form", "addonAfter", "addonBefore", "onFilter"];
+var _excluded = ["schema", "onChange", "onSubmit"],
+    _excluded2 = ["form", "schema", "onSubmit", "onChange"],
+    _excluded3 = ["schema", "onSubmit", "onChange", "onReset", "layout", "labelAlign", "wrapperAlign", "labelCol", "wrapperCol"],
+    _excluded4 = ["addonAfter", "addonBefore", "onFilter", "mode", "expand"];
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
@@ -61,51 +62,23 @@ function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToAr
 
 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); 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 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];
-};
+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; }
 
-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,
+      onChange = props.onChange,
+      onSubmit = props.onSubmit,
       otherProps = _objectWithoutProperties(props, _excluded);
 
   var prefixCls = (0, _utils.usePrefixCls)('', {
@@ -117,48 +90,87 @@ var SimpleFilter = /*#__PURE__*/(0, _react.memo)(function (props) {
       props: {
         size: 8
       },
-      children: [].concat(_toConsumableArray(schema), [{
-        type: 'void',
-        decorator: null,
-        component: 'Submit',
-        props: {
-          style: _objectSpread({}, triggerType === 'submit' ? {} : {
-            display: 'none'
-          })
+      children: schema
+    }, {
+      component: 'Submit',
+      props: {
+        style: {
+          display: 'none'
         }
-      }])
+      }
     }];
-  }, []);
-  var eventProps = getEventProps(triggerType, onFilter);
-  return /*#__PURE__*/_react.default.createElement(_ProForm.default, _objectSpread(_objectSpread(_objectSpread({
+  }, [schema]);
+  return /*#__PURE__*/_react.default.createElement(_ProForm.default, _objectSpread(_objectSpread({}, otherProps), {}, {
+    className: (0, _classnames.default)(prefixCls, props.className),
+    schema: simpleSchema,
     feedbackLayout: "popover",
     breakpoints: [],
-    inset: true
-  }, otherProps), eventProps), {}, {
+    inset: true,
+    onSubmit: onSubmit,
+    onChange: onChange
+  }));
+});
+/**
+ * 轻量筛选
+ */
+
+var LightFilter = /*#__PURE__*/(0, _react.memo)(function (props) {
+  var form = props.form,
+      schema = props.schema,
+      onSubmit = props.onSubmit,
+      onChange = props.onChange,
+      otherProps = _objectWithoutProperties(props, _excluded2);
+
+  var prefixCls = (0, _utils.usePrefixCls)('', {
+    prefix: 'teamix-pro-form-query-filter-light'
+  });
+  var LightSchema = (0, _react.useMemo)(function () {
+    return [{
+      component: 'LightFilter',
+      children: schema
+    }, {
+      component: 'Submit',
+      props: {
+        style: {
+          display: 'none'
+        }
+      }
+    }];
+  }, [schema]); // useEffect(() => {
+  //   form.addEffects('onChange', () => {
+  //     onFieldValueChange('',(field:any) => {
+  //       console.log(field.value);
+  //     });
+  //   });
+  // }, [form, onChange]);
+
+  return /*#__PURE__*/_react.default.createElement(_ProForm.default, _objectSpread(_objectSpread({}, otherProps), {}, {
+    form: form,
     className: (0, _classnames.default)(prefixCls, props.className),
-    schema: simpleSchema
+    schema: LightSchema,
+    feedbackLayout: "popover",
+    breakpoints: [],
+    bordered: false,
+    onSubmit: onSubmit,
+    onChange: onChange
   }));
 });
-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,
+      onSubmit = props.onSubmit,
+      onChange = props.onChange,
       onReset = props.onReset,
       layout = props.layout,
       labelAlign = props.labelAlign,
       wrapperAlign = props.wrapperAlign,
       labelCol = props.labelCol,
-      wrapperCol = props.wrapperCol;
+      wrapperCol = props.wrapperCol,
+      otherProps = _objectWithoutProperties(props, _excluded3);
+
   var prefixCls = (0, _utils.usePrefixCls)('', {
     prefix: 'teamix-pro-form-query-filter-advanced'
   });
@@ -186,26 +198,21 @@ var AdvancedFilter = /*#__PURE__*/(0, _react.memo)(function (props) {
             component: 'Reset',
             props: {
               onResetValidateSuccess: onReset,
-              style: _objectSpread({}, triggerType === 'submit' ? {} : {
-                marginRight: -16
-              }),
               children: (0, _utils.getMessage)('reset')
             }
           }, {
             component: 'Submit',
             props: {
-              style: _objectSpread({}, triggerType === 'submit' ? {
+              style: {
                 marginRight: -8
-              } : {
-                display: 'none'
-              }),
+              },
               children: (0, _utils.getMessage)('search')
             }
           }]
         }]
       }])
     }];
-  }, []);
+  }, [schema, onReset]);
   var getTeamixLayout = (0, _react.useMemo)(function () {
     return {
       breakpoints: [990],
@@ -216,61 +223,39 @@ var AdvancedFilter = /*#__PURE__*/(0, _react.memo)(function (props) {
       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,
+  return /*#__PURE__*/_react.default.createElement(_ProForm.default, _objectSpread(_objectSpread(_objectSpread({
     className: (0, _classnames.default)(prefixCls, props.className),
     schema: gridSchema,
-    onSubmit: onFilter
+    feedbackLayout: "popover"
+  }, otherProps), getTeamixLayout), {}, {
+    onSubmit: onSubmit
   }));
 });
 AdvancedFilter.defaultProps = {
-  triggerType: 'change',
   layout: 'horizontal',
   labelAlign: 'right',
   labelCol: 6,
   wrapperCol: 18
 };
 /**
- * 聚合筛选
+ * 查询筛选
  */
 
-var LightFilter = /*#__PURE__*/(0, _react.memo)(function (props) {
-  var schema = props.schema,
-      triggerType = props.triggerType,
+var QueryFilter = /*#__PURE__*/(0, _react.memo)(function (props) {
+  var addonAfter = props.addonAfter,
+      addonBefore = props.addonBefore,
       onFilter = props.onFilter,
-      otherProps = _objectWithoutProperties(props, _excluded2);
+      mode = props.mode,
+      expand = props.expand,
+      otherProps = _objectWithoutProperties(props, _excluded4);
 
-  var prefixCls = (0, _utils.usePrefixCls)('', {
-    prefix: 'teamix-pro-form-query-filter-light'
-  });
-  var LightSchema = (0, _react.useMemo)(function () {
-    return [{
-      component: 'LightFilter',
-      children: schema
-    }];
-  }, [schema]);
-  var eventProps = getEventProps(triggerType, onFilter);
-  return /*#__PURE__*/_react.default.createElement(_ProForm.default, _objectSpread(_objectSpread(_objectSpread({
-    feedbackLayout: "popover",
-    breakpoints: [],
-    bordered: false
-  }, otherProps), eventProps), {}, {
-    className: (0, _classnames.default)(prefixCls, props.className),
-    schema: LightSchema
-  }));
-});
-LightFilter.defaultProps = {
-  triggerType: 'change'
-};
-/**
- * 查询筛选
- */
+  var form = (0, _react.useMemo)(function () {
+    return props.form || (0, _core.createForm)({
+      validateFirst: true
+    });
+  }, []);
 
-var QueryFilter = /*#__PURE__*/(0, _react.memo)(function (props) {
-  var _useState = (0, _react.useState)(true),
+  var _useState = (0, _react.useState)(expand),
       _useState2 = _slicedToArray(_useState, 2),
       advancedFilterVisible = _useState2[0],
       setAdvancedFilterVisible = _useState2[1];
@@ -280,17 +265,6 @@ var QueryFilter = /*#__PURE__*/(0, _react.memo)(function (props) {
       tagDataSource = _useState4[0],
       setTagDataSource = _useState4[1];
 
-  var outerForm = props.form,
-      addonAfter = props.addonAfter,
-      addonBefore = props.addonBefore,
-      onFilter = props.onFilter,
-      otherProps = _objectWithoutProperties(props, _excluded3);
-
-  var form = (0, _react.useMemo)(function () {
-    return outerForm || (0, _core.createForm)({
-      validateFirst: true
-    });
-  }, []);
   var prefixCls = (0, _utils.usePrefixCls)('', {
     prefix: 'teamix-pro-form-query-filter'
   }); // 展开收起高级筛选
@@ -319,9 +293,20 @@ var QueryFilter = /*#__PURE__*/(0, _react.memo)(function (props) {
     }).filter(function (item) {
       return (0, _utils.isSignificative)(item.value);
     });
-  }, []); // 表单值变化
+  }, []); // 表单值提交
+
+  var onFormSubmit = (0, _react.useCallback)(function (values) {
+    setTagDataSource(getTagDataSource(form));
+    onFilter && onFilter(values);
+  }, []); // 轻量表单onChange
+
+  var onLightValueChange = (0, _react.useCallback)(function (values) {
+    form.reset();
+    setTagDataSource(getTagDataSource(form));
+    onFilter && onFilter(values);
+  }, [form]); // 简单表单onChange
 
-  var onFormValueChange = (0, _react.useCallback)(function (values) {
+  var onSimpleValueChange = (0, _react.useCallback)(function (values) {
     setTagDataSource(getTagDataSource(form));
     onFilter && onFilter(values);
   }, []); // 关闭标签清空表单字段值
@@ -341,11 +326,12 @@ var QueryFilter = /*#__PURE__*/(0, _react.memo)(function (props) {
     className: "".concat(prefixCls, "-left")
   }, addonBefore ? /*#__PURE__*/_react.default.createElement("div", {
     className: "".concat(prefixCls, "-addonBefore")
-  }, addonBefore) : null, /*#__PURE__*/_react.default.createElement("div", {
-    className: "".concat(prefixCls, "-light-wrap")
+  }, addonBefore) : null, mode === 'panel' ? /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement("div", {
+    className: "".concat(prefixCls, "-inline-form")
   }, /*#__PURE__*/_react.default.createElement(LightFilter, _objectSpread(_objectSpread({}, otherProps), {}, {
     form: form,
-    onFilter: onFormValueChange
+    onFilter: onLightValueChange,
+    onSubmit: onFormSubmit
   }))), /*#__PURE__*/_react.default.createElement("div", {
     className: "".concat(prefixCls, "-toggle")
   }, /*#__PURE__*/_react.default.createElement(_components.Badge, {
@@ -362,9 +348,15 @@ var QueryFilter = /*#__PURE__*/(0, _react.memo)(function (props) {
     type: "up-line"
   }) : /*#__PURE__*/_react.default.createElement(_icon.default, {
     type: "filter-line"
-  }), (0, _utils.getMessage)('advancedFilter'))))), addonAfter ? /*#__PURE__*/_react.default.createElement("div", {
+  }), (0, _utils.getMessage)('advancedFilter'))))) : /*#__PURE__*/_react.default.createElement("div", {
+    className: "".concat(prefixCls, "-inline-form")
+  }, /*#__PURE__*/_react.default.createElement(SimpleFilter, _objectSpread(_objectSpread({}, otherProps), {}, {
+    form: form,
+    onFilter: onSimpleValueChange,
+    onSubmit: onFormSubmit
+  })))), addonAfter ? /*#__PURE__*/_react.default.createElement("div", {
     className: "".concat(prefixCls, "-addonAfter")
-  }, addonAfter) : null), /*#__PURE__*/_react.default.createElement("div", {
+  }, addonAfter) : null), mode === 'panel' ? /*#__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") : '')
@@ -390,7 +382,11 @@ var QueryFilter = /*#__PURE__*/(0, _react.memo)(function (props) {
     className: (0, _classnames.default)("".concat(prefixCls, "-advanced-wrap"), !advancedFilterVisible ? "".concat(prefixCls, "-advanced-wrap-hidden") : '')
   }, /*#__PURE__*/_react.default.createElement(AdvancedFilter, _objectSpread(_objectSpread({}, otherProps), {}, {
     form: form,
-    onFilter: onFormValueChange
-  })))));
+    onSubmit: onFormSubmit
+  })))) : null);
 });
-exports.QueryFilter = QueryFilter;
+exports.QueryFilter = QueryFilter;
+QueryFilter.defaultProps = {
+  mode: 'inline',
+  expand: false
+};

package/lib/form/Filter/index2.scss

@@ -14,7 +14,7 @@ $query-filter: #{$teamix-pro-form}-query-filter;
     flex: 0 1 auto;
     margin-right: 8px;
   }
-  .#{$query-filter}-light-wrap {
+  .#{$query-filter}-inline-form {
     flex: 0 0 auto;
     margin-right: 8px;
     margin-bottom: 8px;

package/lib/form/ProForm/index.js

@@ -105,6 +105,7 @@ var ProForm = /*#__PURE__*/(0, _react.memo)(function (_ref) {
   }, [breakpoints, layout, labelAlign, wrapperAlign, labelCol, wrapperCol]); // 添加onChange
 
   (0, _react.useEffect)(function () {
+    form.removeEffects('onChange');
     form.addEffects('onChange', function () {
       (0, _core.onFormValuesChange)(function (form) {
         if (onChange) {

package/lib/form/ProForm/useFieldRequest.js

@@ -7,8 +7,6 @@ exports.default = void 0;
 
 var _react = require("@formily/react");
 
-var _utils = require("@teamix/utils");
-
 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; }
@@ -19,13 +17,7 @@ var _default = function _default() {
   var field = (0, _react.useField)();
 
   var refresh = function refresh() {
-    if (!(0, _utils.isPlainObj)(field.data)) {
-      field.data = {
-        refresh: {}
-      };
-    } else {
-      field.data.refresh = _objectSpread({}, field.data.refresh);
-    }
+    field.data.refresh = _objectSpread({}, field.data.refresh);
   };
 
   return {

package/lib/form/SchemaForm/index.js

@@ -266,7 +266,9 @@ var _default = /*#__PURE__*/(0, _react.memo)(function (_ref) {
         rules: defaultRules,
         reactions: defaultReactions,
         dataSource: defaultDataSource,
-        data: data
+        data: data || {
+          placeholder: true
+        }
       })); // 递归子组件
 
       var recursiveProperties = (children === null || children === void 0 ? void 0 : children.length) ? {
@@ -285,7 +287,7 @@ var _default = /*#__PURE__*/(0, _react.memo)(function (_ref) {
       type: 'object',
       properties: formatSchema(schema)
     };
-  }, []); // console.log(proFormSchema);
+  }, [schema]); // console.log(proFormSchema);
 
   return /*#__PURE__*/_react.default.createElement(SchemaField, {
     schema: proFormSchema,

package/lib/form/SchemaForm/reactions.js

@@ -68,11 +68,7 @@ var $dataSource = function $dataSource(services, onComplete, context) {
       readOnly: true
     });
     return services(field, context).then(function (res) {
-      var _res$map;
-
-      var isValueInDataSource = res === null || res === void 0 ? void 0 : (_res$map = res.map(function (v) {
-        return v.value;
-      })) === null || _res$map === void 0 ? void 0 : _res$map.includes(field.value);
+      var isValueInDataSource = (0, _utils.getValueByValue)(res, field.value);
       var clearValue = isValueInDataSource ? {} : {
         value: undefined
       };