@teamix/pro 1.3.11 → 1.3.14

package/es/timeline/typing.d.ts

@@ -60,8 +60,13 @@ export declare type ProTimeLineItemProps = {
     dotRender?: (index?: number, status?: string) => ReactNode;
     /**
      * 节点副标题
+     * @deprecated 弃用，请使用 `time`
      */
     subTitle?: ReactNode;
+    /**
+     * 右侧时间
+     */
+    time?: ReactNode;
     /**
      * 节点对应描述
      */

package/lib/actions/index.js

@@ -231,8 +231,18 @@ var ProActionButton = function ProActionButton(props) {
   }, tooltipProps);
 
   if (tooltip || disabledTooltip) {
-    var showToolTip = disabled ? disabledTooltip : tooltip;
-    content = /*#__PURE__*/_react.default.createElement(_components.Balloon.Tooltip, _objectSpread({}, baseToolTipProps), showToolTip);
+    if (tooltip && !disabledTooltip) {
+      if (!disabled) {
+        content = /*#__PURE__*/_react.default.createElement(_components.Balloon.Tooltip, _objectSpread({}, baseToolTipProps), tooltip);
+      }
+    } else if (!tooltip && disabledTooltip) {
+      if (disabled) {
+        content = /*#__PURE__*/_react.default.createElement(_components.Balloon.Tooltip, _objectSpread({}, baseToolTipProps), disabledTooltip);
+      }
+    } else if (tooltip && disabledTooltip) {
+      var showToolTip = disabled ? disabledTooltip : tooltip;
+      content = /*#__PURE__*/_react.default.createElement(_components.Balloon.Tooltip, _objectSpread({}, baseToolTipProps), showToolTip);
+    }
   }
 
   return content;
@@ -248,7 +258,10 @@ var ProActionMenuButtonItem = function ProActionMenuButtonItem(props) {
       _onClick2 = action.onClick,
       children = action.children,
       icon = action.icon,
-      disabled = action.disabled;
+      disabled = action.disabled,
+      tooltip = action.tooltip,
+      disabledTooltip = action.disabledTooltip,
+      tooltipProps = action.tooltipProps;
   var menuItemActionConfig = Object.assign({}, config, {
     trigger: 'onClick'
   });
@@ -262,9 +275,32 @@ var ProActionMenuButtonItem = function ProActionMenuButtonItem(props) {
       return _onClick2(e, context);
     }
   }) : _objectSpread({}, menuItemProps);
+  var content = buttonContent(children, icon, undefined, context);
+
+  var baseToolTipProps = _objectSpread({
+    triggerType: 'hover',
+    align: 't',
+    trigger: content
+  }, tooltipProps);
+
+  if (tooltip || disabledTooltip) {
+    if (tooltip && !disabledTooltip) {
+      if (!disabled) {
+        content = /*#__PURE__*/_react.default.createElement(_components.Balloon.Tooltip, _objectSpread({}, baseToolTipProps), tooltip);
+      }
+    } else if (!tooltip && disabledTooltip) {
+      if (disabled) {
+        content = /*#__PURE__*/_react.default.createElement(_components.Balloon.Tooltip, _objectSpread({}, baseToolTipProps), disabledTooltip);
+      }
+    } else if (tooltip && disabledTooltip) {
+      var showToolTip = disabled ? disabledTooltip : tooltip;
+      content = /*#__PURE__*/_react.default.createElement(_components.Balloon.Tooltip, _objectSpread({}, baseToolTipProps), showToolTip);
+    }
+  }
+
   return /*#__PURE__*/_react.default.createElement("div", _objectSpread({
     className: (0, _classnames.default)('teamix-pro-action-menu-item', "".concat((0, _utils.usePrefixCls)(), "menu-item"), _defineProperty({}, "".concat((0, _utils.usePrefixCls)(), "disabled"), disabled))
-  }, buttonProps), buttonContent(children, icon, undefined, context));
+  }, buttonProps), content);
 };
 
 function renderCommonActionButtonMenuItem(action, key, context) {

package/lib/form/Filter/LightFilter.js

@@ -35,13 +35,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; }
 
-var lightFilterObs = (0, _reactive.observable)({
-  onFilter: function onFilter() {}
-});
 /**
  * 轻量筛选
  */
-
 var LightFilter = /*#__PURE__*/(0, _react.memo)(function (props) {
   var _schema$;
 
@@ -54,10 +50,15 @@ var LightFilter = /*#__PURE__*/(0, _react.memo)(function (props) {
       activeFilterValueRef = props.activeFilterValueRef,
       otherProps = _objectWithoutProperties(props, _excluded);
 
-  var filterValue = (0, _react.useRef)(defaultFilterValue || ((_schema$ = schema[0]) === null || _schema$ === void 0 ? void 0 : _schema$.name));
+  var filterValue = (0, _react.useRef)(defaultFilterValue || (schema === null || schema === void 0 ? void 0 : (_schema$ = schema[0]) === null || _schema$ === void 0 ? void 0 : _schema$.name));
   var prefixCls = (0, _utils.usePrefixCls)('', {
     prefix: 'teamix-pro-form-query-filter-light'
   });
+  var lightFilterObs = (0, _react.useMemo)(function () {
+    return (0, _reactive.observable)({
+      onFilter: function onFilter() {}
+    });
+  }, []);
   (0, _react.useEffect)(function () {
     if (activeFilterValueRef) {
       activeFilterValueRef.current = filterValue.current;
@@ -108,7 +109,7 @@ var LightFilter = /*#__PURE__*/(0, _react.memo)(function (props) {
   }, [schema, onFilterChange, defaultFilterValue]);
   (0, _react.useEffect)(function () {
     lightFilterObs.onFilter = onFilter;
-  }, [onChange]);
+  }, [onFilter]);
   return /*#__PURE__*/_react.default.createElement(_ProForm.default, _objectSpread(_objectSpread({}, otherProps), {}, {
     scope: _objectSpread(_objectSpread({}, otherProps === null || otherProps === void 0 ? void 0 : otherProps.scope), {}, {
       lightFilterObs: lightFilterObs

package/lib/form/Filter/index.js

@@ -108,7 +108,6 @@ var QueryFilter = /*#__PURE__*/(0, _react.memo)(function (props) {
       otherProps = _objectWithoutProperties(props, _excluded);
 
   var _useSpecialProps = (0, _useSpecialProps2.default)(props),
-      hasChangeDefault = _useSpecialProps.hasChangeDefault,
       hasRequired = _useSpecialProps.hasRequired;
 
   var _useState = (0, _react.useState)(!!expand),
@@ -128,56 +127,66 @@ var QueryFilter = /*#__PURE__*/(0, _react.memo)(function (props) {
   var prefixCls = (0, _utils.usePrefixCls)('', {
     prefix: 'teamix-pro-form-query-filter'
   });
-  /**
-   * 处理onInit与onFilter事件的触发问题
-   */
+  var debounceFun = (0, _lodash.default)(function (fun, props) {
+    return fun(props);
+  }, filterDebounce); // onInit
 
+  var initialRequestRef = (0, _react.useRef)(!!(props === null || props === void 0 ? void 0 : props.initialRequest));
   var filterEnable = (0, _react.useRef)('waiting');
 
-  var _onFormInit = function onFormInit(form, _ref) {
-    var initialRequest = _ref.initialRequest,
-        initialValues = _ref.initialValues;
+  var onFormInit = /*#__PURE__*/function () {
+    var _ref = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee(form) {
+      var loadingField;
+      return regeneratorRuntime.wrap(function _callee$(_context) {
+        while (1) {
+          switch (_context.prev = _context.next) {
+            case 0:
+              form.setState({
+                loading: initialRequestRef.current
+              }); // 借用 form.loading 触发 onFormReact
 
-    if (!form.mounted) {
-      // 借用form的loading属性来判断initialValues和initialRequest是否完成
-      form.setState({
-        loading: !!initialRequest || !!initialValues
-      });
-    }
+              loadingField = Object.values(form.fields).filter(function (field) {
+                return !!field.loading;
+              }); // 等待mounted + 字段loading结束 + initialRequest结束 => 表单默认值初始化完成
 
-    var loadingField = Object.values(form.fields).filter(function (field) {
-      return !!field.loading;
-    }); // 等待表单mounted + 字段loading结束 + form默认值初始化 => 表单初始化完成
+              if (!(form.mounted && !loadingField.length && !form.loading)) {
+                _context.next = 10;
+                break;
+              }
+
+              onFormInit = function onFormInit() {}; // init后销毁 isFormInit 方法
 
-    if (form.mounted && !loadingField.length && !form.loading) {
-      _onFormInit = function onFormInit() {}; // init后销毁 isFormInit 方法
 
+              filterEnable.current = 'filter';
+
+              if (!onInit) {
+                _context.next = 10;
+                break;
+              }
 
-      var values = (0, _utils.getValidValues)(form.values);
+              _context.next = 8;
+              return form.validate();
 
-      if (!(0, _utils.isUsable)(values) || !hasChangeDefault) {
-        // 表单无默认值 或 无触发onChange的默认值配置，不会触发onFilter内的onInit，所以主动触发onInit
-        filterEnable.current = 'filter';
-        setTimeout(function () {
-          onInit === null || onInit === void 0 ? void 0 : onInit((0, _reactive.toJS)(form.values));
-        }, 0);
+            case 8:
+              onInit === null || onInit === void 0 ? void 0 : onInit((0, _reactive.toJS)(form.values)); // 设置Tag
 
-        if (mode === 'panel') {
-          // 移除lightForm的默认值
-          // 设置Tag
-          configFilterItem(advancedForm);
+              if (mode === 'panel') {
+                configFilterItem(advancedForm);
+                !panelVisible && configTag();
+              }
 
-          if (!panelVisible) {
-            setTimeout(function () {
-              configTag();
-            }, 0);
+            case 10:
+            case "end":
+              return _context.stop();
           }
         }
-      } else {
-        filterEnable.current = 'initialized';
-      }
-    }
-  }; // 配置当前激活的form实例
+      }, _callee);
+    }));
+
+    return function onFormInit(_x) {
+      return _ref.apply(this, arguments);
+    };
+  }(); // 配置当前激活的form实例
 
 
   var setCurrentForm = function setCurrentForm(formName) {
@@ -203,7 +212,7 @@ var QueryFilter = /*#__PURE__*/(0, _react.memo)(function (props) {
       effects: function effects() {
         (0, _core.onFormReact)(function (form) {
           if (mode === 'inline') {
-            _onFormInit(form, props);
+            onFormInit(form);
           }
         });
       }
@@ -227,7 +236,7 @@ var QueryFilter = /*#__PURE__*/(0, _react.memo)(function (props) {
       effects: function effects() {
         (0, _core.onFormReact)(function (form) {
           if (mode === 'panel') {
-            _onFormInit(form, props);
+            onFormInit(form);
           }
         });
         (0, _core.onFormInputChange)(function (form) {
@@ -308,95 +317,64 @@ var QueryFilter = /*#__PURE__*/(0, _react.memo)(function (props) {
   }, [panelVisible, configTag]); // 简单搜索Filter
 
   var onSimpleFilter = (0, _react.useCallback)( /*#__PURE__*/function () {
-    var _ref4 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee(values) {
-      return regeneratorRuntime.wrap(function _callee$(_context) {
+    var _ref4 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee2(values) {
+      return regeneratorRuntime.wrap(function _callee2$(_context2) {
         while (1) {
-          switch (_context.prev = _context.next) {
+          switch (_context2.prev = _context2.next) {
             case 0:
-              if (!(currentForm.current === 'simple')) {
-                _context.next = 14;
-                break;
-              }
-
-              if (!(filterEnable.current === 'initialized')) {
-                _context.next = 9;
-                break;
-              }
-
-              filterEnable.current = 'filter';
-
-              if (!hasRequired) {
-                _context.next = 6;
-                break;
-              }
-
-              _context.next = 6;
-              return simpleForm.validate();
-
-            case 6:
-              onInit === null || onInit === void 0 ? void 0 : onInit(values);
-              _context.next = 14;
-              break;
-
-            case 9:
-              if (!(filterEnable.current === 'filter')) {
-                _context.next = 14;
-                break;
-              }
-
-              if (!hasRequired) {
-                _context.next = 13;
-                break;
-              }
-
-              _context.next = 13;
+              _context2.next = 2;
               return simpleForm.validate();
 
-            case 13:
+            case 2:
               onFilter === null || onFilter === void 0 ? void 0 : onFilter(values);
 
-            case 14:
+            case 3:
             case "end":
-              return _context.stop();
+              return _context2.stop();
           }
         }
-      }, _callee);
+      }, _callee2);
     }));
 
-    return function (_x) {
+    return function (_x2) {
       return _ref4.apply(this, arguments);
     };
-  }(), [onFilter, hasRequired, onInit]); // 简单搜索Change
+  }(), [onFilter]); // 简单搜索Change
 
   var onSimpleChange = (0, _react.useCallback)(function (values, fieldValue, fieldName) {
     if (currentForm.current === 'simple') {
       onChange === null || onChange === void 0 ? void 0 : onChange(values, fieldValue, fieldName);
+
+      if (filterEnable.current === 'filter') {
+        debounceFun(onSimpleFilter, values);
+      }
     }
-  }, [onChange]); // 轻量搜索Filter
+  }, [onChange, onSimpleFilter]); // 轻量搜索Filter
 
   var onLightFilter = (0, _react.useCallback)(function (values) {
-    if (currentForm.current === 'light') {
-      if (filterEnable.current === 'filter') {
-        var _Object$keys;
+    var _Object$keys;
 
-        onFilter === null || onFilter === void 0 ? void 0 : onFilter(values); // 清空advancedForm的值，配置Tag
+    onFilter === null || onFilter === void 0 ? void 0 : onFilter(values); // 清空advancedForm的值
 
-        var clearKeys = {};
-        (_Object$keys = Object.keys(advancedForm.values)) === null || _Object$keys === void 0 ? void 0 : _Object$keys.forEach(function (key) {
-          clearKeys[key] = undefined;
-        });
-        advancedForm.setValues(clearKeys);
-        configFilterItem(advancedForm);
-        configTag();
-      }
-    }
+    var clearKeys = {};
+    (_Object$keys = Object.keys(advancedForm.values)) === null || _Object$keys === void 0 ? void 0 : _Object$keys.forEach(function (key) {
+      clearKeys[key] = undefined;
+    });
+    advancedForm.setValues(clearKeys); // 配置Tag
+
+    configFilterItem(advancedForm);
+    configTag();
   }, [onFilter]); // 轻量搜索Change
 
   var onLightChange = (0, _react.useCallback)(function (values, fieldValue, fieldName) {
     if (currentForm.current === 'light') {
       onChange === null || onChange === void 0 ? void 0 : onChange(values, fieldValue, fieldName);
+
+      if (filterEnable.current === 'filter') {
+        debounceFun(onLightFilter, values);
+      }
     }
-  }, [onChange]); // 高级搜索Filter
+  }, [onChange, onLightFilter]); // 高级搜索Filter
 
   var onAdvancedFilter = (0, _react.useCallback)(function (values) {
     setCurrentForm('advanced');
@@ -416,54 +394,7 @@ var QueryFilter = /*#__PURE__*/(0, _react.memo)(function (props) {
     lightForm.reset('*', {
       forceClear: true
     });
-  }, [onReset]); // 高级搜索Init
-
-  var onAdvancedInit = (0, _react.useCallback)( /*#__PURE__*/function () {
-    var _ref5 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee2(values) {
-      return regeneratorRuntime.wrap(function _callee2$(_context2) {
-        while (1) {
-          switch (_context2.prev = _context2.next) {
-            case 0:
-              if (!(currentForm.current === 'advanced')) {
-                _context2.next = 9;
-                break;
-              }
-
-              if (!(filterEnable.current === 'initialized')) {
-                _context2.next = 9;
-                break;
-              }
-
-              filterEnable.current = 'filter';
-
-              if (!hasRequired) {
-                _context2.next = 6;
-                break;
-              }
-
-              _context2.next = 6;
-              return advancedForm.validate();
-
-            case 6:
-              onInit === null || onInit === void 0 ? void 0 : onInit(values);
-              configFilterItem(advancedForm);
-
-              if (!panelVisible) {
-                configTag();
-              }
-
-            case 9:
-            case "end":
-              return _context2.stop();
-          }
-        }
-      }, _callee2);
-    }));
-
-    return function (_x2) {
-      return _ref5.apply(this, arguments);
-    };
-  }(), [hasRequired, onInit]); // 高级搜索Change
+  }, [onReset]); // 高级搜索Change
 
   var onAdvancedChange = (0, _react.useCallback)(function (values, fieldValue, fieldName) {
     if (currentForm.current === 'advanced') {
@@ -483,16 +414,14 @@ var QueryFilter = /*#__PURE__*/(0, _react.memo)(function (props) {
     configFilterItem(advancedForm);
     configTag();
     onFilter === null || onFilter === void 0 ? void 0 : onFilter((0, _reactive.toJS)(advancedForm.values));
-  }, [onFilter]); // initialValues和initialRequest的回调
+  }, [onFilter]); // initialRequest 的回调
 
   var onInitialComplete = (0, _react.useCallback)(function (form) {
+    initialRequestRef.current = false;
     form.setState({
-      loading: false
+      loading: initialRequestRef.current
     });
-  }, []);
-  var debounceFun = (0, _lodash.default)(function (fun, props) {
-    return fun(props);
-  }, filterDebounce); // 组件挂载
+  }, []); // 组件挂载
 
   (0, _react.useEffect)(function () {
     setCurrentForm(currentForm.current);
@@ -511,37 +440,28 @@ var QueryFilter = /*#__PURE__*/(0, _react.memo)(function (props) {
       filterValues: filterValues,
       activeFilterValueRef: activeFilterValueRef,
       form: lightForm,
-      onChange: function onChange(values, fieldValue, fieldName) {
-        debounceFun(onLightFilter, values);
-        onLightChange(values, fieldValue, fieldName);
-      }
+      onChange: onLightChange
     }))) : /*#__PURE__*/_react.default.createElement("div", {
       className: "".concat(prefixCls, "-inline")
     }, /*#__PURE__*/_react.default.createElement(_SimpleFilter.default, _objectSpread(_objectSpread({}, otherProps), {}, {
       form: simpleForm,
-      onChange: function onChange(values, fieldValue, fieldName) {
-        debounceFun(onSimpleFilter, values);
-        onSimpleChange(values, fieldValue, fieldName);
-      },
+      onChange: onSimpleChange,
       onSubmit: onSimpleFilter,
       onInitialComplete: onInitialComplete
     }))),
     panelContent: mode === 'panel' ? /*#__PURE__*/_react.default.createElement(_AdvancedFilter.default, _objectSpread(_objectSpread({}, otherProps), {}, {
       form: advancedForm,
-      onChange: function onChange(values, fieldValue, fieldName) {
-        debounceFun(onAdvancedInit, values);
-        onAdvancedChange(values, fieldValue, fieldName);
-      },
+      onChange: onAdvancedChange,
       onSubmit: onAdvancedFilter,
       onReset: onAdvancedReset,
       onInitialComplete: onInitialComplete
     })) : null
-  }, mode === 'panel' && !panelVisible ? /*#__PURE__*/_react.default.createElement(_components.Tag.Group, null, tagDataSource.map(function (_ref6) {
-    var key = _ref6.key,
-        label = _ref6.label,
-        value = _ref6.value,
-        type = _ref6.type,
-        index = _ref6.index;
+  }, mode === 'panel' && !panelVisible ? /*#__PURE__*/_react.default.createElement(_components.Tag.Group, null, tagDataSource.map(function (_ref5) {
+    var key = _ref5.key,
+        label = _ref5.label,
+        value = _ref5.value,
+        type = _ref5.type,
+        index = _ref5.index;
     return /*#__PURE__*/_react.default.createElement(_components.Tag.Closeable, {
       key: (0, _utils.isNum)(index) ? key + label : key,
       afterClose: function afterClose() {

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

@@ -1,5 +1,4 @@
-import React from 'react';
-import type { ProFormProps } from '../typing';
+import type { ComposedProForm } from '../typing';
 import './index.scss';
-declare const ProForm: React.FC<ProFormProps>;
+declare const ProForm: ComposedProForm;
 export default ProForm;