Revert "fix: Cascader muiltple mode should display full path of selected value"

package.json

@@ -47,13 +47,11 @@
     "@types/react": "^16.8.19",
     "@types/react-dom": "^17.0.11",
     "@types/warning": "^3.0.0",
-    "@umijs/fabric": "^2.10.1",
     "cross-env": "^7.0.0",
     "dumi": "^1.1.12",
     "enzyme": "^3.3.0",
     "enzyme-adapter-react-16": "^1.0.2",
     "enzyme-to-json": "^3.2.1",
-    "eslint": "^7.1.0",
     "father": "^2.13.2",
     "gh-pages": "^3.1.0",
     "glob": "^7.1.6",

src/Cascader.tsx

@@ -305,6 +305,7 @@ const Cascader = React.forwardRef<CascaderRef, InternalCascaderProps>((props, re
     deDuplicatedValues,
     mergedOptions,
     mergedFieldNames,
+    multiple,
     displayRender,
   );
 

src/hooks/useDisplayValues.ts

@@ -12,21 +12,23 @@ export default (
   rawValues: SingleValueType[],
   options: DefaultOptionType[],
   fieldNames: InternalFieldNames,
+  multiple: boolean,
   displayRender: CascaderProps['displayRender'],
 ) => {
   return React.useMemo(() => {
     const mergedDisplayRender =
       displayRender ||
       // Default displayRender
       (labels => {
+        const mergedLabels = multiple ? labels.slice(-1) : labels;
         const SPLIT = ' / ';
 
-        if (labels.every(label => ['string', 'number'].includes(typeof label))) {
-          return labels.join(SPLIT);
+        if (mergedLabels.every(label => ['string', 'number'].includes(typeof label))) {
+          return mergedLabels.join(SPLIT);
         }
 
         // If exist non-string value, use ReactNode instead
-        return labels.reduce((list, label, index) => {
+        return mergedLabels.reduce((list, label, index) => {
           const keyedLabel = React.isValidElement(label)
             ? React.cloneElement(label, { key: index })
             : label;
@@ -53,5 +55,5 @@ export default (
         valueCells,
       };
     });
-  }, [rawValues, options, fieldNames, displayRender]);
+  }, [rawValues, options, fieldNames, displayRender, multiple]);
 };

tests/index.spec.tsx

@@ -764,7 +764,7 @@ describe('Cascader.Basic', () => {
       );
 
       expect(wrapper.find('.rc-cascader-selection-item-content').first().text()).toEqual('Parent');
-      expect(wrapper.find('.rc-cascader-selection-item-content').last().text()).toEqual('Normal / Child');
+      expect(wrapper.find('.rc-cascader-selection-item-content').last().text()).toEqual('Child');
     });
   });
 });