[v4.14.1] fix(Transfer): 修复Map对象引用拷贝导致的BUG (#688) 3c1b5e4

uiwjs · Mar 17, 2022 · 5e89a94 · 5e89a94
1 parent f5d45c7
commit 5e89a94
Show file tree

Hide file tree

Showing 8 changed files with 24 additions and 27 deletions.
diff --git a/asset-manifest.json b/asset-manifest.json
@@ -1,7 +1,7 @@
 {
   "files": {
     "main.css": "/static/css/main.4aded231.css",
-    "main.js": "/static/js/main.c62e9700.js",
+    "main.js": "/static/js/main.48482108.js",
     "static/css/9200.14abaeb3.chunk.css": "/static/css/9200.14abaeb3.chunk.css",
     "static/js/9200.0a1f7353.chunk.js": "/static/js/9200.0a1f7353.chunk.js",
     "static/css/6730.4d268428.chunk.css": "/static/css/6730.4d268428.chunk.css",
@@ -220,7 +220,7 @@
     "static/js/5183.ac2ca737.js": "/static/js/5183.ac2ca737.js",
     "index.html": "/index.html",
     "main.4aded231.css.map": "/static/css/main.4aded231.css.map",
-    "main.c62e9700.js.map": "/static/js/main.c62e9700.js.map",
+    "main.48482108.js.map": "/static/js/main.48482108.js.map",
     "9200.14abaeb3.chunk.css.map": "/static/css/9200.14abaeb3.chunk.css.map",
     "9200.0a1f7353.chunk.js.map": "/static/js/9200.0a1f7353.chunk.js.map",
     "6730.4d268428.chunk.css.map": "/static/css/6730.4d268428.chunk.css.map",
@@ -442,6 +442,6 @@
     "static/js/vendors-react.a09f50fb.js",
     "static/js/5183.ac2ca737.js",
     "static/css/main.4aded231.css",
-    "static/js/main.c62e9700.js"
+    "static/js/main.48482108.js"
   ]
 }
diff --git a/index.html b/index.html
@@ -1 +1 @@
-<!doctype html><html xmlns="http://www.w3.org/1999/xhtml"><head><title>uiw react, A high quality UI Toolkit, A Component Library for React 16+.</title><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><meta name="description" content="UIW React, A high quality UI Toolkit, A Component Library for React 16+. "><meta name="keywords" content="uiw, uiw-react, uiwjs, react.js, react, component, components, ui, framework, toolkit"><script defer="defer" src="./static/js/vendors-react.a09f50fb.js"></script><script defer="defer" src="./static/js/5183.ac2ca737.js"></script><script defer="defer" src="./static/js/main.c62e9700.js"></script><link href="./static/css/main.4aded231.css" rel="stylesheet"></head><body><div id="root"></div></body></html>
+<!doctype html><html xmlns="http://www.w3.org/1999/xhtml"><head><title>uiw react, A high quality UI Toolkit, A Component Library for React 16+.</title><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><meta name="description" content="UIW React, A high quality UI Toolkit, A Component Library for React 16+. "><meta name="keywords" content="uiw, uiw-react, uiwjs, react.js, react, component, components, ui, framework, toolkit"><script defer="defer" src="./static/js/vendors-react.a09f50fb.js"></script><script defer="defer" src="./static/js/5183.ac2ca737.js"></script><script defer="defer" src="./static/js/main.48482108.js"></script><link href="./static/css/main.4aded231.css" rel="stylesheet"></head><body><div id="root"></div></body></html>
diff --git a/static/js/main.48482108.js b/static/js/main.48482108.js
diff --git a/static/js/main.48482108.js.map b/static/js/main.48482108.js.map
diff --git a/static/js/main.c62e9700.js b/static/js/main.c62e9700.js
diff --git a/static/js/main.c62e9700.js.map b/static/js/main.c62e9700.js.map
diff --git a/uiw.js b/uiw.js
@@ -10533,7 +10533,7 @@ function Transfer(props) {
   var {
     placeholder,
     options,
-    value,
+    value = [],
     showSearch = false,
     selectedAll = false,
     bodyStyle,
@@ -10556,11 +10556,11 @@ function Transfer(props) {
     right: CheckedStatus.UnChecked
   });
   (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useEffect)(() => {
-    leftSelectedKeySet([]);
-    rightSelectedKeySet([]);
-    rightOpionSet(value || []);
-    value == null ? void 0 : value.forEach(selectd => selectOption.set(selectd.key, selectd.label));
-    hiddenNode(child => !!(value != null && value.find(selectd => child.key === selectd.key)));
+    if (value) {
+      rightOpionSet(value || []);
+      value == null ? void 0 : value.forEach(selectd => selectOption.set(selectd.key, selectd.label));
+      hiddenNode(child => !!(value != null && value.find(selectd => child.key === selectd.key)));
+    }
   }, [JSON.stringify(value)]);
 
   var hiddenNode = callBackfn => {
@@ -10631,22 +10631,22 @@ function Transfer(props) {
   };
 
   var transferClick = transferType => {
-    var selectOptionTemp = selectOption;
-
     if (transferType === 'left') {
       leftSelectOption.forEach((value, key) => {
-        selectOptionTemp.set(key, value);
+        selectOption.set(key, value);
       });
-      leftSelectOptionSet(selectOptionTemp);
+      leftSelectOptionSet(new Map());
+      leftSelectedKeySet([]);
     } else {
       rightSelectedKeys.forEach(key => {
         selectOption.delete(key);
       });
+      rightSelectedKeySet([]);
     }
 
-    selectOptionSet(selectOptionTemp);
+    selectOptionSet(selectOption);
     var option = [];
-    selectOptionTemp.forEach((label, key) => option.push({
+    selectOption.forEach((label, key) => option.push({
       key,
       label
     }));
@@ -10694,19 +10694,20 @@ function Transfer(props) {
           }
 
           if (!child.hideNode) {
-            selectOption.set(child.key, child.label);
+            leftSelectOption.set(child.key, child.label);
             keys.push(child.key);
           }
         });
       };
 
       selectedOptionsRecursion(selectedOptions);
+      leftSelectOptionSet(leftSelectOption);
       leftSelectedKeySet(keys);
     } else {
       leftSelectedKeySet([]);
+      leftSelectOptionSet(new Map());
     }
 
-    selectOptionSet(selectOption);
     selectAllCheckedSet(selectAllChecked);
   };
 
@@ -10715,16 +10716,12 @@ function Transfer(props) {
     selectAllChecked.right = isChecked ? 1 : 0;
 
     if (isChecked) {
-      var keys = rightOpions.map(child => {
-        selectOption.delete(child.key);
-        return child.key;
-      });
+      var keys = rightOpions.map(child => child.key);
       rightSelectedKeySet(keys);
     } else {
       rightSelectedKeySet([]);
     }
 
-    selectOptionSet(selectOption);
     selectAllCheckedSet(selectAllChecked);
   };
 

diff --git a/uiw.min.js b/uiw.min.js