@chaoswise/ui 2.6.8 → 2.6.9

package/lib/QuickTransfer/index.js

@@ -36,7 +36,7 @@ function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" !=
 function _arrayWithHoles(r) { if (Array.isArray(r)) return r; }
 function _objectWithoutProperties(e, t) { if (null == e) return {}; var o, r, i = _objectWithoutPropertiesLoose(e, t); if (Object.getOwnPropertySymbols) { var s = Object.getOwnPropertySymbols(e); for (r = 0; r < s.length; r++) o = s[r], t.includes(o) || {}.propertyIsEnumerable.call(e, o) && (i[o] = e[o]); } return i; }
 function _objectWithoutPropertiesLoose(r, e) { if (null == r) return {}; var t = {}; for (var n in r) if ({}.hasOwnProperty.call(r, n)) { if (e.includes(n)) continue; t[n] = r[n]; } return t; }
-import React, { useState, useEffect, Fragment, forwardRef, useMemo } from "react";
+import React, { useState, useEffect, Fragment, forwardRef, useMemo, useCallback } from "react";
 import { filterTreeByName, filterTree, filterTreeByNameTable, filterObj, getNotSelectKeys, getKeysAndTitle, getBottomKey, renderLeafNodetree, renderRelationNode, createTitle } from "./utils";
 import classnames from "classnames";
 import Drag from "./Drag";
@@ -257,21 +257,6 @@ var QuickTransfer = /*#__PURE__*/forwardRef(function (props, ref) {
           return !i.disabled;
         }));
         setCheckValue(finalCheckValue);
-        var newData = [];
-        var listCheckedKeys_ = [];
-        dataSource.forEach(function (item, index) {
-          if (isMath(item.title, saveSearchValueLeft)) {
-            newData.push(dataSource[index]);
-          }
-        });
-        listCheckedKeys_ = newData.filter(function (item) {
-          return finalCheckValue.find(function (i) {
-            return i.key == item.key;
-          });
-        }).map(function (item) {
-          return item.key;
-        });
-        setListCheckedStyle(listCheckedKeys_, newData);
       }
       //回显table
       if (type === "table") {
@@ -287,19 +272,51 @@ var QuickTransfer = /*#__PURE__*/forwardRef(function (props, ref) {
         }
       }
     }
-  }, [targetKeys, dataSource, saveSearchValueLeft]);
-  //触发前端自定义搜索
+  }, [targetKeys, dataSource]);
   useEffect(function () {
-    if (searchValueLeft !== undefined) {
-      handleSearch(searchValueLeft);
+    // 左侧受控值绑定
+    if (searchValueLeft !== undefined && searchValueLeft !== saveSearchValueLeft) {
       // 初始化搜索结果
       setSaveSearchValueLeft(searchValueLeft);
     }
-    if (searchValueRight !== undefined) {
+  }, [searchValueLeft, saveSearchValueLeft]);
+  useEffect(function () {
+    // 右侧受控值绑定
+    if (searchValueRight !== undefined && searchValueRight !== saveSearchValueRight) {
       // 初始化搜索结果
       setSaveSearchValueRight(searchValueRight);
     }
-  }, [searchValueLeft, searchValueRight]);
+  }, [searchValueRight, saveSearchValueRight]);
+
+  // 左侧搜索框输入触发
+  var handleSearch = useCallback(function (searchValue) {
+    var newData = [];
+    var listCheckedKeys_ = [];
+    if (type === "list") {
+      dataSource.forEach(function (item, index) {
+        if (isMath(item.title, searchValue)) {
+          newData.push(dataSource[index]);
+        }
+      });
+      listCheckedKeys_ = newData.filter(function (item) {
+        return checkValue.find(function (i) {
+          return i.key == item.key;
+        });
+      }).map(function (item) {
+        return item.key;
+      });
+      setData(newData);
+      setListCheckedStyle(listCheckedKeys_, newData);
+    }
+    if (type === "table") {
+      newData = filterTreeByNameTable(dataSource, searchValue, searchColumns ? searchColumns : newSearchColumns);
+      setData(newData);
+    }
+  }, [dataSource, checkValue]);
+  useEffect(function () {
+    handleSearch(saveSearchValueLeft);
+  }, [handleSearch, saveSearchValueLeft]);
+
   //获取左侧列表选中的key
   useEffect(function () {
     if (getTargetKeys) {
@@ -347,35 +364,6 @@ var QuickTransfer = /*#__PURE__*/forwardRef(function (props, ref) {
     setIndeterminate(!!listCheckedKeys.length && listCheckedKeys.length < dataSource.length);
     setCheckAll(listCheckedKeys.length === dataSource.length);
   };
-  // 左侧搜索框输入触发
-  var handleSearch = function handleSearch(searchValue) {
-    var newData = [];
-    var listCheckedKeys_ = [];
-    if (type === "list") {
-      dataSource.forEach(function (item, index) {
-        if (isMath(item.title, searchValue)) {
-          newData.push(dataSource[index]);
-        }
-      });
-      listCheckedKeys_ = newData.filter(function (item) {
-        return checkValue.find(function (i) {
-          return i.key == item.key;
-        });
-      }).map(function (item) {
-        return item.key;
-      });
-      setData(newData);
-      setListCheckedStyle(listCheckedKeys_, newData);
-    }
-    // if (type === "tree") {
-    //     newData = filterTree(dataSource, searchValue);
-    //     setData(newData);
-    // }
-    if (type === "table") {
-      newData = filterTreeByNameTable(dataSource, searchValue, searchColumns ? searchColumns : newSearchColumns);
-      setData(newData);
-    }
-  };
 
   //type为list 左侧列表选中触发的事件
   var onChangeChecked = function onChangeChecked(e, value) {
@@ -595,17 +583,15 @@ var QuickTransfer = /*#__PURE__*/forwardRef(function (props, ref) {
   var showSearchChange = function showSearchChange(e) {
     onSearchChange && onSearchChange(e);
     onLeftSearchChange && onLeftSearchChange(e);
-    // 保存搜索结果
-    if (searchValueLeft === undefined) {
-      handleSearch(e.target.value);
-      setSaveSearchValueLeft(e.target.value);
-    }
+    // 保存搜索结果,实时保存不然受控模式中文会有问题
+    // if (searchValueLeft === undefined) {
+    setSaveSearchValueLeft(e.target.value);
+    //     handleSearch(e.target.value);
+    // }
   };
   var showSearchChangeRight = function showSearchChangeRight(e) {
     onRightSearchChange(e);
-    if (searchValueRight === undefined) {
-      setSaveSearchValueRight(e.target.value);
-    }
+    setSaveSearchValueRight(e.target.value);
   };
   // 全选状态改变触发
   var onCheckAllChange = function onCheckAllChange(e) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@chaoswise/ui",
-  "version": "2.6.8",
+  "version": "2.6.9",
   "description": "公共UI库",
   "keywords": [
     "ui",
@@ -149,5 +149,5 @@
     "access": "public"
   },
   "license": "MIT",
-  "gitHead": "9862a1d4a1f6556dd1fb953637e9bec805b4ea9a"
+  "gitHead": "b2d08aba1d82098b6b14d2086af3d1cc8262dcd8"
 }