@douyinfe/semi-foundation 2.55.4 → 2.55.5

package/lib/cjs/slider/foundation.js

@@ -458,7 +458,8 @@ class SliderFoundation extends _foundation.default {
     this.onHandleLeave = () => {
       // this._adapter.setEventDefault(e);
       const disabled = this._adapter.getState('disabled');
-      if (!disabled && this.getStates()['focusPos'] === "") {
+      const isDrag = this._adapter.getState('isDrag');
+      if (!disabled && !isDrag) {
         this._adapter.onHandleLeave();
       }
     };

package/lib/cjs/tree/foundation.d.ts

@@ -251,6 +251,11 @@ export default class TreeFoundation extends BaseFoundation<TreeAdapter, BasicTre
     _showFilteredOnly(): any;
     getTreeNodeProps(key: string): BasicTreeNodeProps;
     notifyJsonChange(key: string[] | string, e: any): void;
+    constructDataForValue(value: string): {
+        [x: number]: string;
+    };
+    findDataForValue(findValue: string): any;
+    getDataForKeyNotInKeyEntities(value: string): any;
     notifyMultipleChange(key: string[], e: any): void;
     notifyChange(key: string[] | string, e: any): void;
     handleInputChange(sugInput: string): void;

package/lib/cjs/tree/foundation.js

@@ -115,6 +115,45 @@ class TreeFoundation extends _foundation.default {
     const value = (0, _pick2.default)(data, selectedPath);
     this._adapter.notifyChange(value);
   }
+  constructDataForValue(value) {
+    const {
+      keyMaps
+    } = this.getProps();
+    const keyName = (0, _get2.default)(keyMaps, 'key', 'key');
+    const labelName = (0, _get2.default)(keyMaps, 'label', 'label');
+    return {
+      [keyName]: value,
+      [labelName]: value
+    };
+  }
+  findDataForValue(findValue) {
+    const {
+      value,
+      defaultValue,
+      keyMaps
+    } = this.getProps();
+    const realValueName = (0, _get2.default)(keyMaps, 'value', 'value');
+    const realKeyName = (0, _get2.default)(keyMaps, 'key', 'key');
+    let valueArr = [];
+    if (value) {
+      valueArr = Array.isArray(value) ? value : [value];
+    } else if (defaultValue) {
+      valueArr = Array.isArray(defaultValue) ? defaultValue : [defaultValue];
+    }
+    return valueArr.find(item => {
+      return item[realValueName] === findValue || item[realKeyName] === findValue;
+    });
+  }
+  getDataForKeyNotInKeyEntities(value) {
+    const {
+      onChangeWithObject
+    } = this.getProps();
+    if (onChangeWithObject) {
+      return this.findDataForValue(value);
+    } else {
+      return this.constructDataForValue(value);
+    }
+  }
   notifyMultipleChange(key, e) {
     const {
       keyEntities
@@ -127,14 +166,15 @@ class TreeFoundation extends _foundation.default {
     let value;
     let keyList = [];
     if (checkRelation === 'related') {
-      keyList = (0, _treeUtil.normalizeKeyList)(key, keyEntities, leafOnly);
+      keyList = (0, _treeUtil.normalizeKeyList)(key, keyEntities, leafOnly, true);
     } else if (checkRelation === 'unRelated') {
       keyList = key;
     }
+    const nodes = keyList.map(key => keyEntities[key] ? keyEntities[key].data : this.getDataForKeyNotInKeyEntities(key));
     if (this.getProp('onChangeWithObject')) {
-      value = keyList.map(itemKey => keyEntities[itemKey].data);
+      value = nodes;
     } else {
-      value = (0, _treeUtil.getValueOrKey)(keyList.map(itemKey => keyEntities[itemKey].data), keyMaps);
+      value = (0, _treeUtil.getValueOrKey)(nodes, keyMaps);
     }
     this._adapter.notifyChange(value);
   }
@@ -293,7 +333,7 @@ class TreeFoundation extends _foundation.default {
       return this.calcCheckedKeys(eventKey, targetStatus);
     }
     const nonDisabled = descendantKeys.filter(key => !disabledKeys.has(key));
-    const newCheckedKeys = targetStatus ? [...nonDisabled, ...checkedKeys] : (0, _difference2.default)((0, _treeUtil.normalizeKeyList)([...checkedKeys], keyEntities, true), nonDisabled);
+    const newCheckedKeys = targetStatus ? [...nonDisabled, ...checkedKeys] : (0, _difference2.default)((0, _treeUtil.normalizeKeyList)([...checkedKeys], keyEntities, true, true), nonDisabled);
     return (0, _treeUtil.calcCheckedKeys)(newCheckedKeys, keyEntities);
   }
   /*

package/lib/es/slider/foundation.js

@@ -451,7 +451,8 @@ export default class SliderFoundation extends BaseFoundation {
     this.onHandleLeave = () => {
       // this._adapter.setEventDefault(e);
       const disabled = this._adapter.getState('disabled');
-      if (!disabled && this.getStates()['focusPos'] === "") {
+      const isDrag = this._adapter.getState('isDrag');
+      if (!disabled && !isDrag) {
         this._adapter.onHandleLeave();
       }
     };

package/lib/es/tree/foundation.d.ts

@@ -251,6 +251,11 @@ export default class TreeFoundation extends BaseFoundation<TreeAdapter, BasicTre
     _showFilteredOnly(): any;
     getTreeNodeProps(key: string): BasicTreeNodeProps;
     notifyJsonChange(key: string[] | string, e: any): void;
+    constructDataForValue(value: string): {
+        [x: number]: string;
+    };
+    findDataForValue(findValue: string): any;
+    getDataForKeyNotInKeyEntities(value: string): any;
     notifyMultipleChange(key: string[], e: any): void;
     notifyChange(key: string[] | string, e: any): void;
     handleInputChange(sugInput: string): void;

package/lib/es/tree/foundation.js

@@ -107,6 +107,45 @@ export default class TreeFoundation extends BaseFoundation {
     const value = _pick(data, selectedPath);
     this._adapter.notifyChange(value);
   }
+  constructDataForValue(value) {
+    const {
+      keyMaps
+    } = this.getProps();
+    const keyName = _get(keyMaps, 'key', 'key');
+    const labelName = _get(keyMaps, 'label', 'label');
+    return {
+      [keyName]: value,
+      [labelName]: value
+    };
+  }
+  findDataForValue(findValue) {
+    const {
+      value,
+      defaultValue,
+      keyMaps
+    } = this.getProps();
+    const realValueName = _get(keyMaps, 'value', 'value');
+    const realKeyName = _get(keyMaps, 'key', 'key');
+    let valueArr = [];
+    if (value) {
+      valueArr = Array.isArray(value) ? value : [value];
+    } else if (defaultValue) {
+      valueArr = Array.isArray(defaultValue) ? defaultValue : [defaultValue];
+    }
+    return valueArr.find(item => {
+      return item[realValueName] === findValue || item[realKeyName] === findValue;
+    });
+  }
+  getDataForKeyNotInKeyEntities(value) {
+    const {
+      onChangeWithObject
+    } = this.getProps();
+    if (onChangeWithObject) {
+      return this.findDataForValue(value);
+    } else {
+      return this.constructDataForValue(value);
+    }
+  }
   notifyMultipleChange(key, e) {
     const {
       keyEntities
@@ -119,14 +158,15 @@ export default class TreeFoundation extends BaseFoundation {
     let value;
     let keyList = [];
     if (checkRelation === 'related') {
-      keyList = normalizeKeyList(key, keyEntities, leafOnly);
+      keyList = normalizeKeyList(key, keyEntities, leafOnly, true);
     } else if (checkRelation === 'unRelated') {
       keyList = key;
     }
+    const nodes = keyList.map(key => keyEntities[key] ? keyEntities[key].data : this.getDataForKeyNotInKeyEntities(key));
     if (this.getProp('onChangeWithObject')) {
-      value = keyList.map(itemKey => keyEntities[itemKey].data);
+      value = nodes;
     } else {
-      value = getValueOrKey(keyList.map(itemKey => keyEntities[itemKey].data), keyMaps);
+      value = getValueOrKey(nodes, keyMaps);
     }
     this._adapter.notifyChange(value);
   }
@@ -285,7 +325,7 @@ export default class TreeFoundation extends BaseFoundation {
       return this.calcCheckedKeys(eventKey, targetStatus);
     }
     const nonDisabled = descendantKeys.filter(key => !disabledKeys.has(key));
-    const newCheckedKeys = targetStatus ? [...nonDisabled, ...checkedKeys] : _difference(normalizeKeyList([...checkedKeys], keyEntities, true), nonDisabled);
+    const newCheckedKeys = targetStatus ? [...nonDisabled, ...checkedKeys] : _difference(normalizeKeyList([...checkedKeys], keyEntities, true, true), nonDisabled);
     return calcCheckedKeys(newCheckedKeys, keyEntities);
   }
   /*

package/package.json

@@ -1,13 +1,13 @@
 {
     "name": "@douyinfe/semi-foundation",
-    "version": "2.55.4",
+    "version": "2.55.5",
     "description": "",
     "scripts": {
         "build:lib": "node ./scripts/compileLib.js",
         "prepublishOnly": "npm run build:lib"
     },
     "dependencies": {
-        "@douyinfe/semi-animation": "2.55.4",
+        "@douyinfe/semi-animation": "2.55.5",
         "async-validator": "^3.5.0",
         "classnames": "^2.2.6",
         "date-fns": "^2.29.3",
@@ -24,7 +24,7 @@
         "*.scss",
         "*.css"
     ],
-    "gitHead": "b164af409e92b8165e4355e9d53e011224986f62",
+    "gitHead": "4b283dae2b36fe704607cd2a8c367a36950a759d",
     "devDependencies": {
         "@babel/plugin-transform-runtime": "^7.15.8",
         "@babel/preset-env": "^7.15.8",

package/slider/foundation.ts

@@ -550,7 +550,8 @@ export default class SliderFoundation extends BaseFoundation<SliderAdapter> {
     onHandleLeave = () => {
         // this._adapter.setEventDefault(e);
         const disabled = this._adapter.getState('disabled');
-        if (!disabled && this.getStates()['focusPos'] === "") {
+        const isDrag = this._adapter.getState('isDrag');
+        if (!disabled && !isDrag) {
             this._adapter.onHandleLeave();
         }
     };

package/tree/foundation.ts

@@ -420,20 +420,55 @@ export default class TreeFoundation extends BaseFoundation<TreeAdapter, BasicTre
         this._adapter.notifyChange(value as BasicValue);
     }
 
+    constructDataForValue(value: string) {
+        const { keyMaps } = this.getProps();
+        const keyName = get(keyMaps, 'key', 'key');
+        const labelName = get(keyMaps, 'label', 'label');
+        return {
+            [keyName]: value,
+            [labelName]: value
+        };    
+    }
+
+    findDataForValue(findValue: string) {
+        const { value, defaultValue, keyMaps } = this.getProps();
+        const realValueName = get(keyMaps, 'value', 'value');
+        const realKeyName = get(keyMaps, 'key', 'key');
+        let valueArr = [];
+        if (value) {
+            valueArr = Array.isArray(value) ? value : [value];
+        } else if (defaultValue) {
+            valueArr = Array.isArray(defaultValue) ? defaultValue : [defaultValue];
+        }
+        return valueArr.find(item => {
+            return item[realValueName] === findValue || item[realKeyName] === findValue;
+        });
+    }
+
+    getDataForKeyNotInKeyEntities(value: string) {
+        const { onChangeWithObject } = this.getProps();
+        if (onChangeWithObject) {
+            return this.findDataForValue(value);
+        } else {
+            return this.constructDataForValue(value);
+        }
+    }
+
     notifyMultipleChange(key: string[], e: any) {
         const { keyEntities } = this.getStates();
         const { leafOnly, checkRelation, keyMaps } = this.getProps();
         let value;
         let keyList = [];
         if (checkRelation === 'related') {
-            keyList = normalizeKeyList(key, keyEntities, leafOnly);
+            keyList = normalizeKeyList(key, keyEntities, leafOnly, true);
         } else if (checkRelation === 'unRelated') {
             keyList = key;
         }
+        const nodes = keyList.map(key => keyEntities[key] ? keyEntities[key].data : this.getDataForKeyNotInKeyEntities(key));
         if (this.getProp('onChangeWithObject')) {
-            value = keyList.map((itemKey: string) => keyEntities[itemKey].data);
+            value = nodes;
         } else {
-            value = getValueOrKey(keyList.map((itemKey: string) => keyEntities[itemKey].data), keyMaps);
+            value = getValueOrKey(nodes, keyMaps);
         }
         this._adapter.notifyChange(value);
     }
@@ -585,7 +620,7 @@ export default class TreeFoundation extends BaseFoundation<TreeAdapter, BasicTre
         const nonDisabled = descendantKeys.filter((key: string) => !disabledKeys.has(key));
         const newCheckedKeys = targetStatus ?
             [...nonDisabled, ...checkedKeys] :
-            difference(normalizeKeyList([...checkedKeys], keyEntities, true), nonDisabled);
+            difference(normalizeKeyList([...checkedKeys], keyEntities, true, true), nonDisabled);
         return calcCheckedKeys(newCheckedKeys, keyEntities);
     }