@teamix/pro 1.3.7 → 1.3.8

package/dist/pro.js

@@ -25263,7 +25263,7 @@ var useFilterOptions = function useFilterOptions(options, searchValue, filterOpt
 
     var doFilter = function doFilter(arr) {
       var filterArr = [];
-      arr.forEach(function (item) {
+      arr === null || arr === void 0 ? void 0 : arr.forEach(function (item) {
         var _a;
 
         if ((_a = item === null || item === void 0 ? void 0 : item.children) === null || _a === void 0 ? void 0 : _a.length) {
@@ -65791,12 +65791,19 @@ var QueryFilterLayout = function QueryFilterLayout(_ref) {
 /* harmony import */ var react__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(react__WEBPACK_IMPORTED_MODULE_0__);
 /* harmony import */ var classnames__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(28266);
 /* harmony import */ var classnames__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(classnames__WEBPACK_IMPORTED_MODULE_1__);
-/* harmony import */ var _teamix_utils__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(80653);
-/* harmony import */ var _ProForm__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(44344);
+/* harmony import */ var _formily_reactive__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(92650);
+/* harmony import */ var _teamix_utils__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(80653);
+/* harmony import */ var _ProForm__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(44344);
 var _excluded = ["form", "schema", "onSubmit", "onChange", "defaultFilterValue", "filterValues", "activeFilterValueRef"];
 
 function _extends() { _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
 
+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 _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; }
 
 
@@ -65804,9 +65811,13 @@ function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) r
 
 
 
+var lightFilterObs = (0,_formily_reactive__WEBPACK_IMPORTED_MODULE_2__.observable)({
+  onFilter: function onFilter() {}
+});
 /**
  * 轻量筛选
  */
+
 var LightFilter = /*#__PURE__*/(0,react__WEBPACK_IMPORTED_MODULE_0__.memo)(function (props) {
   var _schema$;
 
@@ -65820,7 +65831,7 @@ var LightFilter = /*#__PURE__*/(0,react__WEBPACK_IMPORTED_MODULE_0__.memo)(funct
       otherProps = _objectWithoutPropertiesLoose(props, _excluded);
 
   var filterValue = (0,react__WEBPACK_IMPORTED_MODULE_0__.useRef)(defaultFilterValue || ((_schema$ = schema[0]) == null ? void 0 : _schema$.name));
-  var prefixCls = (0,_teamix_utils__WEBPACK_IMPORTED_MODULE_2__.usePrefixCls)('', {
+  var prefixCls = (0,_teamix_utils__WEBPACK_IMPORTED_MODULE_3__.usePrefixCls)('', {
     prefix: 'teamix-pro-form-query-filter-light'
   });
   (0,react__WEBPACK_IMPORTED_MODULE_0__.useEffect)(function () {
@@ -65858,7 +65869,7 @@ var LightFilter = /*#__PURE__*/(0,react__WEBPACK_IMPORTED_MODULE_0__.memo)(funct
         filterValues: filterValues,
         onFilterChange: onFilterChange,
         buttonProps: {
-          onClick: onFilter
+          onClick: "{{lightFilterObs.onFilter}}"
         }
       },
       children: schema
@@ -65870,8 +65881,14 @@ var LightFilter = /*#__PURE__*/(0,react__WEBPACK_IMPORTED_MODULE_0__.memo)(funct
         }
       }
     }];
-  }, [schema, onFilter, onFilterChange, defaultFilterValue]);
-  return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement(_ProForm__WEBPACK_IMPORTED_MODULE_3__/* ["default"] */ .Z, _extends({}, otherProps, {
+  }, [schema, onFilterChange, defaultFilterValue]);
+  (0,react__WEBPACK_IMPORTED_MODULE_0__.useEffect)(function () {
+    lightFilterObs.onFilter = onFilter;
+  }, [onChange]);
+  return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement(_ProForm__WEBPACK_IMPORTED_MODULE_4__/* ["default"] */ .Z, _extends({}, otherProps, {
+    scope: _objectSpread(_objectSpread({}, otherProps == null ? void 0 : otherProps.scope), {}, {
+      lightFilterObs: lightFilterObs
+    }),
     form: form,
     className: classnames__WEBPACK_IMPORTED_MODULE_1___default()(prefixCls, props.className),
     schema: LightSchema,
@@ -69272,7 +69289,7 @@ _teamix_icon__WEBPACK_IMPORTED_MODULE_15__/* ["default"].setConfig */ .Z.setConf
  // export * from './sidebar';
 
 
-var version = '1.3.7';
+var version = '1.3.8';
 
 
 /***/ }),
@@ -73144,7 +73161,11 @@ var ProSidebarTree = function ProSidebarTree(props) {
 
   (0,react__WEBPACK_IMPORTED_MODULE_2__.useEffect)(function () {
     setDefaultExpandedKeys();
-  }, []); // 更新外部传入的 dataSource
+  }, []); // 监听 selectedKeys，用于受控
+
+  (0,react__WEBPACK_IMPORTED_MODULE_2__.useEffect)(function () {
+    setSelectedKeys(selectedKeysProp);
+  }, [selectedKeysProp]); // 更新外部传入的 dataSource
 
   (0,_teamix_hooks__WEBPACK_IMPORTED_MODULE_5__.useUpdateEffect)(function () {
     setDataSource(processDataSource(dataSourceProp != null ? dataSourceProp : []));