@chaoswise/ui 2.3.4 → 2.3.6

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";
@@ -251,6 +251,11 @@ var QuickTransfer = /*#__PURE__*/forwardRef(function (props, ref) {
           });
           findValue && finalCheckValue.push(findValue);
         });
+        finalCheckValue = finalCheckValue.filter(function (i) {
+          return i.disabled;
+        }).concat(finalCheckValue.filter(function (i) {
+          return !i.disabled;
+        }));
         setCheckValue(finalCheckValue);
       }
       //回显table
@@ -297,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);
@@ -336,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") {
@@ -684,7 +689,7 @@ var QuickTransfer = /*#__PURE__*/forwardRef(function (props, ref) {
       }, treeRest));
     }
   };
-  var list = searchCheckedValue.length === 0 ? /*#__PURE__*/React.createElement(_Empty, {
+  var renderRightList = searchCheckedValue.length === 0 ? /*#__PURE__*/React.createElement(_Empty, {
     description: localeObj["pleaseSelectFromLeft"]
   }) : useDndProvider ? /*#__PURE__*/React.createElement(CheckList, {
     checkValue: searchCheckedValue,
@@ -754,7 +759,7 @@ var QuickTransfer = /*#__PURE__*/forwardRef(function (props, ref) {
     className: "cw-transfer-right-header-clear"
   }, localeObj.clear)) : /*#__PURE__*/React.createElement(Fragment, null, rightHeader)), /*#__PURE__*/React.createElement("div", {
     className: "cw-transfer-right-main-wrapper"
-  }, list)), rightFooter && /*#__PURE__*/React.createElement("div", {
+  }, renderRightList)), rightFooter && /*#__PURE__*/React.createElement("div", {
     className: "cw-transfer-footer"
   }, rightFooter))));
 });

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() {
@@ -115,7 +164,9 @@ export var filterObj = function filterObj(arr) {
 export var getNotSelectKeys = function getNotSelectKeys(arr) {
   var keys = [];
   arr.map(function (item) {
-    keys.push(item.key);
+    var _ref = item.props || {},
+      disabled = _ref.disabled;
+    !disabled && keys.push(item.key);
     if (item.props.children && item.props.children.length > 0) {
       keys = keys.concat(getNotSelectKeys(item.props.children));
     }
@@ -125,10 +176,13 @@ export var getNotSelectKeys = function getNotSelectKeys(arr) {
 export var getKeysAndTitle = function getKeysAndTitle(arr) {
   var keys = [];
   arr.map(function (item) {
-    keys.push({
+    var _ref2 = item.props || {},
+      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));
     }
@@ -141,9 +195,12 @@ export var getBottomKey = function getBottomKey(arr) {
     if (item.props.children && item.props.children.length > 0) {
       keys = keys.concat(getBottomKey(item.props.children));
     } else {
-      keys.push({
+      var _ref3 = item.props || {},
+        disabled = _ref3.disabled;
+      !disabled && keys.push({
         key: item.key,
-        title: item.props.title,
+        title: item.props.originTitle,
+        // 不能用item.props.title（节点形式）
         children: item.props.children
       });
     }
@@ -159,7 +216,8 @@ export var renderLeafNodetree = function renderLeafNodetree(targetKeys, dataSour
     } else {
       newArr.push({
         key: item.key,
-        title: item.title
+        title: item.title,
+        disabled: item.disabled
       });
     }
   });
@@ -169,6 +227,11 @@ export var renderLeafNodetree = function renderLeafNodetree(targetKeys, dataSour
     });
     findValue && finalCheckValue.push(findValue);
   });
+  finalCheckValue = finalCheckValue.filter(function (i) {
+    return i.disabled;
+  }).concat(finalCheckValue.filter(function (i) {
+    return !i.disabled;
+  }));
   // return newArr.filter(item=>targetKeys.includes(item.key))
   return finalCheckValue;
 };
@@ -189,6 +252,11 @@ export var renderRelationNode = function renderRelationNode(targetKeys, dataSour
     });
     findValue && finalCheckValue.push(findValue);
   });
+  finalCheckValue = finalCheckValue.filter(function (i) {
+    return i.disabled;
+  }).concat(finalCheckValue.filter(function (i) {
+    return !i.disabled;
+  }));
   // return flatdata.filter(item=>targetKeys.includes(item.key));
   return finalCheckValue;
 };

package/lib/SearchBar/index.js

@@ -108,13 +108,13 @@ var SearchBar = function SearchBar(props) {
     showTooltipIcon = _tipTooltipOption$sho === void 0 ? false : _tipTooltipOption$sho,
     tipTooltipOptionRest = _objectWithoutProperties(tipTooltipOption, _excluded);
   useEffect(function () {
-    var _formItemContainer$cu, _formItemContainer$cu2, _formItemContainer$cu3;
+    var _formItemContainer$cu;
     if (!Number.isInteger(maxLine) || maxLine < 1) return;
     // 只设置一次容器的maxHeight
     if (maxHeight) return;
 
     // 获取最大行数的一个节点的高度。来设置外层容器的maxHeight
-    var children = (_formItemContainer$cu = formItemContainer.current) === null || _formItemContainer$cu === void 0 ? void 0 : (_formItemContainer$cu2 = _formItemContainer$cu.children) === null || _formItemContainer$cu2 === void 0 ? void 0 : (_formItemContainer$cu3 = _formItemContainer$cu2[0]) === null || _formItemContainer$cu3 === void 0 ? void 0 : _formItemContainer$cu3.children;
+    var children = (_formItemContainer$cu = formItemContainer.current) === null || _formItemContainer$cu === void 0 || (_formItemContainer$cu = _formItemContainer$cu.children) === null || _formItemContainer$cu === void 0 || (_formItemContainer$cu = _formItemContainer$cu[0]) === null || _formItemContainer$cu === void 0 ? void 0 : _formItemContainer$cu.children;
     if (!(children !== null && children !== void 0 && children.length)) return;
     var containerTop = formItemContainer.current.children[0].getBoundingClientRect().top;
     if (expandSearchArrange === "inline") {

package/lib/SingleSpa/index.js

@@ -80,9 +80,9 @@ var SingleSpa = function SingleSpa(_ref) {
               _context.prev = 9;
               _context.next = 12;
               return importScripts(script).then(function (result) {
-                var _result$default, _result$default$unmou;
+                var _result$default;
                 // 子应用umount周期卸载相关样式（防止样式冲突）
-                (_result$default = result["default"]) === null || _result$default === void 0 ? void 0 : (_result$default$unmou = _result$default.unmount) === null || _result$default$unmou === void 0 ? void 0 : _result$default$unmou.push(function () {
+                (_result$default = result["default"]) === null || _result$default === void 0 || (_result$default = _result$default.unmount) === null || _result$default === void 0 ? void 0 : _result$default.push(function () {
                   unloadApplication(project.id, {
                     waitForUnmount: true
                   }).then(function () {

package/lib/ThemeProvider/utils.js

@@ -10,7 +10,7 @@ export function findCommentNode(comment) {
   for (var i = 0; i < head.childNodes.length; i++) {
     var _node$nodeValue;
     var node = head.childNodes[i];
-    if (node.nodeType === 8 && (node === null || node === void 0 ? void 0 : (_node$nodeValue = node.nodeValue) === null || _node$nodeValue === void 0 ? void 0 : _node$nodeValue.trim()) === comment) {
+    if (node.nodeType === 8 && (node === null || node === void 0 || (_node$nodeValue = node.nodeValue) === null || _node$nodeValue === void 0 ? void 0 : _node$nodeValue.trim()) === comment) {
       return node;
     }
   }

package/lib/WangEditor/wangEditor.js

@@ -4340,8 +4340,8 @@ function _typeof2(obj) { "@babel/helpers - typeof"; return _typeof2 = "function"
           }
         });
         $(document).on('click focusin', function (e) {
-          var _e$target, _e$target$className;
-          if (tab$focus && e.type == 'focusin' && !(e !== null && e !== void 0 && (_e$target = e.target) !== null && _e$target !== void 0 && (_e$target$className = _e$target.className) !== null && _e$target$className !== void 0 && _e$target$className.includes('w-e-text'))) {
+          var _e$target;
+          if (tab$focus && e.type == 'focusin' && !(e !== null && e !== void 0 && (_e$target = e.target) !== null && _e$target !== void 0 && (_e$target = _e$target.className) !== null && _e$target !== void 0 && _e$target.includes('w-e-text'))) {
             tab$focus = false;
             return;
           }

package/package.json

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