@chaoswise/ui 2.3.5 → 2.3.6

package/lib/CWMessage/index.js

@@ -240,11 +240,12 @@ function Message(props) {
               });
               socket.on("push", /*#__PURE__*/function () {
                 var _ref5 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(data) {
-                  var _JSON$parse, _JSON$parse$count$tot, total, message, noticeMessage, userMessageId, type, _ref6, enable, mode, _ref6$time, time;
+                  var _JSON$parse, count, message, _ref6, _ref6$total, total, noticeMessage, userMessageId, type, _ref7, enable, mode, _ref7$time, time;
                   return _regeneratorRuntime().wrap(function _callee3$(_context3) {
                     while (1) switch (_context3.prev = _context3.next) {
                       case 0:
-                        _JSON$parse = JSON.parse(data), _JSON$parse$count$tot = _JSON$parse.count.total, total = _JSON$parse$count$tot === void 0 ? 0 : _JSON$parse$count$tot, message = _JSON$parse.message;
+                        _JSON$parse = JSON.parse(data), count = _JSON$parse.count, message = _JSON$parse.message;
+                        _ref6 = count || {}, _ref6$total = _ref6.total, total = _ref6$total === void 0 ? 0 : _ref6$total;
                         setMessageTotal(total);
                         onSocketChange(JSON.parse(data));
                         if (message) {
@@ -252,14 +253,14 @@ function Message(props) {
                           if (noticeMessage) {
                             userMessageId = noticeMessage.id, type = noticeMessage.type;
                             if (userMessageId) {
-                              _ref6 = messageOptionRef.current[type] || {}, enable = _ref6.enable, mode = _ref6.mode, _ref6$time = _ref6.time, time = _ref6$time === void 0 ? 5 : _ref6$time;
+                              _ref7 = messageOptionRef.current[type] || {}, enable = _ref7.enable, mode = _ref7.mode, _ref7$time = _ref7.time, time = _ref7$time === void 0 ? 5 : _ref7$time;
                               if (enable) {
                                 openNotification(time, userMessageId);
                               }
                             }
                           }
                         }
-                      case 4:
+                      case 5:
                       case "end":
                         return _context3.stop();
                     }
@@ -303,7 +304,7 @@ function Message(props) {
     };
   }();
   var getMessageQuerySettings = /*#__PURE__*/function () {
-    var _ref8 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6() {
+    var _ref9 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6() {
       var resRequestApi, res, data;
       return _regeneratorRuntime().wrap(function _callee6$(_context6) {
         while (1) switch (_context6.prev = _context6.next) {
@@ -324,7 +325,7 @@ function Message(props) {
       }, _callee6);
     }));
     return function getMessageQuerySettings() {
-      return _ref8.apply(this, arguments);
+      return _ref9.apply(this, arguments);
     };
   }();
   return /*#__PURE__*/React.createElement("div", {

package/lib/CWRangePicker/index.js

@@ -264,9 +264,8 @@ var CWRangePicker = /*#__PURE__*/forwardRef(function (props, ref) {
         var _values = [];
         if (values) {
           _values = computedRecentlyValue(values);
-          if (!values) {
-            _values = getChangeUnitDate(captureUnit[0], captureUnit[1]);
-          }
+        } else {
+          _values = getChangeUnitDate(captureUnit[0], captureUnit[1]);
         }
         var newValue = _objectSpread(_objectSpread({}, recordDateValue), {}, {
           timeDomain: recordUnit,

package/lib/ErrorBoundary/index.js

@@ -44,6 +44,10 @@ var ErrorBoundary = /*#__PURE__*/function (_React$PureComponent) {
           localStorage.setItem('ChunkLoadError', '');
         }
       }
+      // 热更新导致mobx报错，reload页面
+      if (error.message.includes('The set of provided stores has changed')) {
+        window.location.reload();
+      }
     });
     _this.state = {
       hasError: false

package/lib/QuickTransfer/index.js

@@ -35,7 +35,7 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 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, { useState, useEffect, Fragment, forwardRef, useMemo } from "react";
-import { filterTreeByName, filterTreeByNameTable, filterObj, getNotSelectKeys, getKeysAndTitle, getBottomKey, renderLeafNodetree, renderRelationNode } from "./utils";
+import { filterTreeByName, filterTree, filterTreeByNameTable, filterObj, getNotSelectKeys, getKeysAndTitle, getBottomKey, renderLeafNodetree, renderRelationNode } from "./utils";
 import classnames from "classnames";
 import CheckList from "./CheckList";
 import PropTypes from "prop-types";
@@ -302,7 +302,7 @@ var QuickTransfer = /*#__PURE__*/forwardRef(function (props, ref) {
       });
     }
     if (type === "tree") {
-      newCheckedValue = filterTreeByName(checkValue, searchValue);
+      newCheckedValue = filterTree(checkValue, searchValue);
     }
     if (type === "table") {
       newCheckedValue = filterTreeByNameTable(checkValue, searchValue, renderColumns ? renderColumns : newRenderColumns);
@@ -341,7 +341,7 @@ var QuickTransfer = /*#__PURE__*/forwardRef(function (props, ref) {
       setListCheckedStyle(listCheckedKeys_, newData);
     }
     if (type === "tree") {
-      newData = filterTreeByName(dataSource, searchValue);
+      newData = filterTree(dataSource, searchValue);
       setData(newData);
     }
     if (type === "table") {

package/lib/QuickTransfer/utils.js

@@ -27,7 +27,7 @@ export var isShowByloopChidren = function isShowByloopChidren(list, searchInfo)
 };
 //搜索树
 export var filterTreeByName = function filterTreeByName(organizationList, searchValue) {
-  if (searchValue === '') {
+  if (!searchValue) {
     return organizationList;
   }
   //先过滤最顶层树
@@ -48,6 +48,55 @@ export var filterTreeByName = function filterTreeByName(organizationList, search
     return item;
   });
 };
+export var KMPMatch = function KMPMatch(str, pattern) {
+  var next = generateNextArr(pattern);
+  var i = 0; // str 指针
+  var j = 0; // pattern指针
+  while (i < str.length && j < pattern.length) {
+    if (str[i] === pattern[j] || j === -1) {
+      i++;
+      j++;
+    } else {
+      j = next[j]; // 右移
+    }
+  }
+
+  if (j === pattern.length) {
+    return i - j;
+  } else {
+    return -1;
+  }
+};
+function generateNextArr(pattern) {
+  var i = 0;
+  var j = -1;
+  var next = [];
+  next[0] = -1;
+  while (i < pattern.length) {
+    if (j === -1 || pattern[i] === pattern[j]) {
+      i++;
+      j++;
+      next[i] = j;
+    } else {
+      j = next[j];
+    }
+  }
+  return next;
+}
+export var filterTree = function filterTree(list, searchValue) {
+  return list.reduce(function (t, c) {
+    if (!searchValue) {
+      return t.concat(c);
+    } else {
+      var title = c.title,
+        children = c.children;
+      var res = children ? filterTree(children, searchValue) : undefined;
+      return KMPMatch(title.toLowerCase(), searchValue.toLowerCase()) > -1 || res && res.length > 0 ? t.concat(children ? _objectSpread(_objectSpread({}, c), {}, {
+        children: res
+      }) : c) : t;
+    }
+  }, []);
+};
 export var isShowByloopChidrenTable = function isShowByloopChidrenTable(list, searchInfo, searchColumns) {
   var isTrue = false;
   var _loop = function _loop() {
@@ -131,8 +180,9 @@ export var getKeysAndTitle = function getKeysAndTitle(arr) {
       disabled = _ref2.disabled;
     !disabled && keys.push({
       key: item.key,
-      title: item.props.title
+      title: item.props.originTitle // 不能用item.props.title（节点形式）
     });
+
     if (item.props.children && item.props.children.length > 0) {
       keys = keys.concat(getKeysAndTitle(item.props.children));
     }
@@ -149,7 +199,8 @@ export var getBottomKey = function getBottomKey(arr) {
         disabled = _ref3.disabled;
       !disabled && keys.push({
         key: item.key,
-        title: item.props.title,
+        title: item.props.originTitle,
+        // 不能用item.props.title（节点形式）
         children: item.props.children
       });
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@chaoswise/ui",
-  "version": "2.3.5",
+  "version": "2.3.6",
   "description": "公共UI库",
   "keywords": [
     "ui",
@@ -140,5 +140,5 @@
     "access": "public"
   },
   "license": "MIT",
-  "gitHead": "2674d3bab3ac2e373daafc58ff0048ba5338aaba"
+  "gitHead": "6c8d75666cf9208346704fc975f2aa9bbe148e11"
 }