vxe-pc-ui 3.15.3 → 3.15.4

package/es/cascader/src/cascader.js

@@ -3,12 +3,10 @@ import { getConfig, getI18n, getIcon, globalEvents, createEvent, renderEmptyElem
 import { getEventTargetNode, updatePanelPlacement, toCssUnit } from '../../ui/src/dom';
 import { getLastZIndex, nextZIndex } from '../../ui/src/utils';
 import { enNodeValue, deNodeValue } from './util';
-import { createComponentLog } from '../../ui/src/log';
 import XEUtils from 'xe-utils';
 import VxeListComponent from '../../list/src/list';
 import VxeInputComponent from '../../input/src/input';
 import VxeButtonComponent from '../../button/src/button';
-const { errLog } = createComponentLog('cascader');
 /**
  * 生成节点的唯一主键
  */
@@ -666,7 +664,6 @@ export default {
             const $xeCascader = this;
             const reactData = $xeCascader.reactData;
             const internalData = $xeCascader.internalData;
-            const { nodeMaps } = internalData;
             let fullList = internalData.afterVisibleList;
             if (force) {
                 // 更新数据，处理筛选和排序
@@ -675,18 +672,59 @@ export default {
                 fullList = $xeCascader.handleTreeToList();
             }
             const treeList = fullList.slice(0);
-            treeList.forEach((item, $index) => {
-                const nodeid = $xeCascader.getNodeId(item);
-                const itemRest = nodeMaps[nodeid];
-                if (itemRest) {
-                    itemRest.$index = $index;
-                }
-            });
             reactData.treeList = treeList;
         },
+        /**
+         * 获取第一个拥有子节点的节点
+         */
+        handleHasChildNodeIds(treeList, type) {
+            const $xeCascader = this;
+            const childrenField = $xeCascader.computeChildrenField;
+            const mapChildrenField = $xeCascader.computeMapChildrenField;
+            const treeOpts = $xeCascader.computeTreeOpts;
+            const { transform } = treeOpts;
+            const childField = transform ? mapChildrenField : childrenField;
+            const nodeIds = [];
+            let currList = treeList;
+            while (currList.length) {
+                let targetNode = null;
+                for (const item of currList) {
+                    const kids = item[childField];
+                    if (XEUtils.isArray(kids) && kids.length > 0) {
+                        targetNode = item;
+                        break;
+                    }
+                }
+                if (targetNode) {
+                    nodeIds.push($xeCascader.getNodeId(targetNode));
+                    currList = targetNode[childField];
+                }
+                else {
+                    const endNode = XEUtils[type](currList);
+                    nodeIds.push($xeCascader.getNodeId(endNode));
+                    break;
+                }
+            }
+            return nodeIds;
+        },
         triggerSearchEvent: XEUtils.debounce(function () {
             const $xeCascader = this;
+            const reactData = $xeCascader.reactData;
+            const internalData = $xeCascader.internalData;
             $xeCascader.handleData(true);
+            $xeCascader.updateModelChecked();
+            const filterOpts = $xeCascader.computeFilterOpts;
+            const { autoExpandMode } = filterOpts;
+            const { afterTreeList } = internalData;
+            // 默认展开第
+            if (autoExpandMode === 'first' || autoExpandMode === 'last') {
+                const stItems = $xeCascader.handleHasChildNodeIds(afterTreeList, autoExpandMode);
+                reactData.currentItems = stItems;
+            }
+            else {
+                $xeCascader.handleCurrentItems();
+            }
+            $xeCascader.updateCurrentChunk();
         }, 350, { trailing: true }),
         loadData(list) {
             const $xeCascader = this;
@@ -719,17 +757,20 @@ export default {
             const reactData = $xeCascader.reactData;
             const internalData = $xeCascader.internalData;
             const { currentItems } = reactData;
-            const { treeFullData } = internalData;
+            const { afterTreeList } = internalData;
             const childrenField = $xeCascader.computeChildrenField;
-            const currentCunkList = [treeFullData];
+            const mapChildrenField = $xeCascader.computeMapChildrenField;
+            const treeOpts = $xeCascader.computeTreeOpts;
+            const { transform } = treeOpts;
+            const currentCunkList = [afterTreeList];
             if (currentItems.length) {
                 let chunkIndex = 0;
                 let stNodeid = currentItems[chunkIndex];
-                let optList = treeFullData;
+                let optList = afterTreeList;
                 while (stNodeid && optList && optList.length) {
                     stNodeid = currentItems[chunkIndex++];
                     const currOption = optList.find(item => stNodeid === $xeCascader.getNodeId(item));
-                    optList = currOption ? currOption[childrenField] : [];
+                    optList = currOption ? currOption[transform ? mapChildrenField : childrenField] : [];
                     if (!optList || !optList.length) {
                         break;
                     }
@@ -742,7 +783,7 @@ export default {
             const $xeCascader = this;
             const reactData = $xeCascader.reactData;
             const internalData = $xeCascader.internalData;
-            const { treeFullData } = internalData;
+            const { afterTreeList } = internalData;
             const selectVals = $xeCascader.computeSelectVals;
             const childrenField = $xeCascader.computeChildrenField;
             const mapChildrenField = $xeCascader.computeMapChildrenField;
@@ -752,7 +793,7 @@ export default {
             const expandedMaps = {};
             if (selectVals.length) {
                 const lastVal = enNodeValue(XEUtils.last(selectVals));
-                const stRest = XEUtils.findTree(treeFullData, (item) => lastVal === $xeCascader.getNodeId(item), { children: transform ? mapChildrenField : childrenField });
+                const stRest = XEUtils.findTree(afterTreeList, (item) => lastVal === $xeCascader.getNodeId(item), { children: transform ? mapChildrenField : childrenField });
                 if (stRest) {
                     const { nodes } = stRest;
                     nodes.forEach(item => {
@@ -881,13 +922,14 @@ export default {
                 return { checkNodeKeys: checkKeys, checkNodes };
             });
         },
-        clearCheckboxNode() {
+        clearSelectedNode() {
             const $xeCascader = this;
             const reactData = $xeCascader.reactData;
             const internalData = $xeCascader.internalData;
             internalData.indeterminateRowMaps = {};
             internalData.selectCheckboxMaps = {};
             reactData.updateCheckboxFlag++;
+            reactData.selectRadioKey = null;
             $xeCascader.updateCheckboxStatus();
             return $xeCascader.$nextTick().then(() => {
                 return { checkNodeKeys: [], checkNodes: [] };
@@ -939,7 +981,7 @@ export default {
             const { $event } = params;
             const { multiple, checkedClosable } = props;
             const value = multiple ? [] : null;
-            $xeCascader.clearCheckboxNode().then(() => {
+            $xeCascader.clearSelectedNode().then(() => {
                 if (checkedClosable) {
                     $xeCascader.hideOptionPanel($event);
                 }
@@ -1037,9 +1079,12 @@ export default {
             const { nodeMaps } = internalData;
             const radioOpts = $xeCascader.computeRadioOpts;
             const childrenField = $xeCascader.computeChildrenField;
+            const mapChildrenField = $xeCascader.computeMapChildrenField;
+            const treeOpts = $xeCascader.computeTreeOpts;
+            const { transform } = treeOpts;
             const { checkMode, checkMethod } = radioOpts;
             const nodeid = $xeCascader.getNodeId(node);
-            const childList = node[childrenField];
+            const childList = node[transform ? mapChildrenField : childrenField];
             const isExistChild = childList && childList.length > 0;
             const nodeItem = nodeMaps[nodeid] || {};
             const nLevel = nodeItem.level;
@@ -1211,7 +1256,7 @@ export default {
                 const childRowList = [];
                 XEUtils.eachTree(afterTreeList, (node) => {
                     const nodeid = $xeCascader.getNodeId(node);
-                    const childList = node[childrenField];
+                    const childList = node[transform ? mapChildrenField : childrenField];
                     if (childList && childList.length && !childRowMaps[nodeid]) {
                         childRowMaps[nodeid] = 1;
                         childRowList.unshift([node, nodeid, childList]);
@@ -1318,7 +1363,7 @@ export default {
             const treeOpts = $xeCascader.computeTreeOpts;
             const { transform } = treeOpts;
             const nodeid = $xeCascader.getNodeId(node);
-            const childList = node[childrenField];
+            const childList = node[transform ? mapChildrenField : childrenField];
             const isExistChild = childList && childList.length > 0;
             const nodeItem = nodeMaps[nodeid] || {};
             const nLevel = nodeItem.level;
@@ -1583,11 +1628,12 @@ export default {
             const { currentNode, selectRadioKey, updateCheckboxFlag, updateExpandedFlag } = reactData;
             const { nodeMaps, selectCheckboxMaps, indeterminateRowMaps, treeExpandedMaps, treeExpandLazyLoadedMaps } = internalData;
             const treeOpts = $xeCascader.computeTreeOpts;
-            const { lazy, iconLoaded, iconOpen, iconClose } = treeOpts;
+            const { lazy, transform, iconLoaded, iconOpen, iconClose } = treeOpts;
             const childrenField = $xeCascader.computeChildrenField;
+            const mapChildrenField = $xeCascader.computeMapChildrenField;
             const labelField = $xeCascader.computeLabelField;
             const hasChildField = $xeCascader.computeHasChildField;
-            const childList = node[childrenField];
+            const childList = node[transform ? mapChildrenField : childrenField];
             const isExistChild = childList && childList.length > 0;
             const iconSlot = slots.icon;
             const titleSlot = slots.title;
@@ -1787,7 +1833,7 @@ export default {
                                         h('div', {
                                             class: 'vxe-tree-select--header-button'
                                         }, [
-                                            showCheckedButton && showClearButton
+                                            (showCheckedButton && multiple) || showClearButton
                                                 ? h('div', {
                                                     class: 'vxe-tree-select--selected-btns'
                                                 }, [
@@ -1849,7 +1895,7 @@ export default {
                                     })
                                 ])
                             ]),
-                            footerSlot || showTotalButton || (showCloseButton && multiple)
+                            footerSlot || showTotalButton || showCloseButton
                                 ? h('div', {
                                     class: 'vxe-cascader--panel-footer'
                                 }, footerSlot
@@ -1863,7 +1909,7 @@ export default {
                                                     class: 'vxe-cascader--total-btns'
                                                 }, getI18n('vxe.treeSelect.total', [selectVals.length]))
                                                 : renderEmptyElement($xeCascader),
-                                            showCloseButton && multiple
+                                            showCloseButton
                                                 ? h('div', {
                                                     class: 'vxe-cascader--oper-btns'
                                                 }, [
@@ -1915,10 +1961,6 @@ export default {
     },
     mounted() {
         const $xeCascader = this;
-        const props = $xeCascader;
-        if (props.filterable) {
-            errLog('vxe.error.notProp', ['filterable']);
-        }
         globalEvents.on($xeCascader, 'mousewheel', $xeCascader.handleGlobalMousewheelEvent);
         globalEvents.on($xeCascader, 'mousedown', $xeCascader.handleGlobalMousedownEvent);
         globalEvents.on($xeCascader, 'blur', $xeCascader.handleGlobalBlurEvent);

package/es/tree-select/src/tree-select.js

@@ -956,7 +956,7 @@ export default {
                                         h('div', {
                                             class: 'vxe-tree-select--header-button'
                                         }, [
-                                            showCheckedButton && showClearButton
+                                            (showCheckedButton && multiple) || showClearButton
                                                 ? h('div', {
                                                     class: 'vxe-tree-select--selected-btns'
                                                 }, [
@@ -984,32 +984,28 @@ export default {
                                                         : renderEmptyElement($xeTreeSelect)
                                                 ])
                                                 : renderEmptyElement($xeTreeSelect),
-                                            showExpandButton && showExpandButton
+                                            showExpandButton
                                                 ? h('div', {
                                                     class: 'vxe-tree-select--expand-btns'
                                                 }, [
-                                                    showExpandButton
-                                                        ? h(VxeButtonComponent, {
-                                                            props: {
-                                                                content: getI18n('vxe.treeSelect.allExpand'),
-                                                                mode: 'text'
-                                                            },
-                                                            on: {
-                                                                click: $xeTreeSelect.allExpandPanelEvent
-                                                            }
-                                                        })
-                                                        : renderEmptyElement($xeTreeSelect),
-                                                    showExpandButton
-                                                        ? h(VxeButtonComponent, {
-                                                            props: {
-                                                                content: getI18n('vxe.treeSelect.clearExpand'),
-                                                                mode: 'text'
-                                                            },
-                                                            on: {
-                                                                click: $xeTreeSelect.clearExpandPanelEvent
-                                                            }
-                                                        })
-                                                        : renderEmptyElement($xeTreeSelect)
+                                                    h(VxeButtonComponent, {
+                                                        props: {
+                                                            content: getI18n('vxe.treeSelect.allExpand'),
+                                                            mode: 'text'
+                                                        },
+                                                        on: {
+                                                            click: $xeTreeSelect.allExpandPanelEvent
+                                                        }
+                                                    }),
+                                                    h(VxeButtonComponent, {
+                                                        props: {
+                                                            content: getI18n('vxe.treeSelect.clearExpand'),
+                                                            mode: 'text'
+                                                        },
+                                                        on: {
+                                                            click: $xeTreeSelect.clearExpandPanelEvent
+                                                        }
+                                                    })
                                                 ])
                                                 : renderEmptyElement($xeTreeSelect)
                                         ])
@@ -1077,7 +1073,7 @@ export default {
                                     })
                                 ])
                             ]),
-                            footerSlot || showTotalButton || (showCloseButton && multiple)
+                            footerSlot || showTotalButton || showCloseButton
                                 ? h('div', {
                                     class: 'vxe-tree-select--panel-footer'
                                 }, footerSlot
@@ -1091,7 +1087,7 @@ export default {
                                                     class: 'vxe-tree-select--total-btns'
                                                 }, getI18n('vxe.treeSelect.total', [selectVals.length]))
                                                 : renderEmptyElement($xeTreeSelect),
-                                            showCloseButton && multiple
+                                            showCloseButton
                                                 ? h('div', {
                                                     class: 'vxe-tree-select--oper-btns'
                                                 }, [

package/es/ui/index.js

@@ -1,7 +1,7 @@
 import { VxeUI, setConfig, setIcon } from '@vxe-ui/core';
 import { dynamicApp } from '../dynamics';
 import { warnLog } from './src/log';
-export const version = "3.15.3";
+export const version = "3.15.4";
 VxeUI.uiVersion = version;
 VxeUI.dynamicApp = dynamicApp;
 export function config(options) {
@@ -64,6 +64,9 @@ setConfig({
         showFullLabel: true,
         treeConfig: {
             showIcon: true
+        },
+        filterConfig: {
+            autoExpandMode: 'first'
         }
     },
     checkbox: {},

package/es/ui/src/log.js

@@ -1,10 +1,14 @@
-import { log } from '@vxe-ui/core';
-const version = `ui v${"3.15.3"}`;
+import { VxeUI } from '@vxe-ui/core';
+const { log } = VxeUI;
+const uiVersion = `ui v${"3.15.4"}`;
 export function createComponentLog(name) {
+    const tableVersion = VxeUI.tableVersion ? `table v${VxeUI.tableVersion}` : '';
+    const ganttVersion = VxeUI.ganttVersion ? `gantt v${VxeUI.ganttVersion}` : '';
+    const designVersion = VxeUI.designVersion ? `design v${VxeUI.designVersion}` : '';
     return {
-        warnLog: log.create('warn', `${version} ${name}`),
-        errLog: log.create('error', `${version} ${name}`)
+        warnLog: log.create('warn', uiVersion + tableVersion + ganttVersion + designVersion + '] [' + name),
+        errLog: log.create('error', uiVersion + tableVersion + ganttVersion + designVersion + '] [' + name)
     };
 }
-export const warnLog = log.create('warn', version);
-export const errLog = log.create('error', version);
+export const warnLog = log.create('warn', uiVersion);
+export const errLog = log.create('error', uiVersion);

package/lib/cascader/src/cascader.js

@@ -1,5 +1,6 @@
 "use strict";
 
+function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
@@ -9,18 +10,17 @@ var _ui = require("../../ui");
 var _dom = require("../../ui/src/dom");
 var _utils = require("../../ui/src/utils");
 var _util = require("./util");
-var _log = require("../../ui/src/log");
 var _xeUtils = _interopRequireDefault(require("xe-utils"));
 var _list = _interopRequireDefault(require("../../list/src/list"));
 var _input = _interopRequireDefault(require("../../input/src/input"));
 var _button = _interopRequireDefault(require("../../button/src/button"));
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
-function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
 function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: !0, configurable: !0, writable: !0 }) : e[r] = t, e; }
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : i + ""; }
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
-var _createComponentLog = (0, _log.createComponentLog)('cascader'),
-  errLog = _createComponentLog.errLog;
+function _createForOfIteratorHelper(r, e) { var t = "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (!t) { if (Array.isArray(r) || (t = _unsupportedIterableToArray(r)) || e && r && "number" == typeof r.length) { t && (r = t); var _n = 0, F = function F() {}; return { s: F, n: function n() { return _n >= r.length ? { done: !0 } : { done: !1, value: r[_n++] }; }, e: function e(r) { throw r; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var o, a = !0, u = !1; return { s: function s() { t = t.call(r); }, n: function n() { var r = t.next(); return a = r.done, r; }, e: function e(r) { u = !0, o = r; }, f: function f() { try { a || null == t.return || t.return(); } finally { if (u) throw o; } } }; }
+function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } }
+function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
 /**
  * 生成节点的唯一主键
  */
@@ -725,7 +725,6 @@ var _default2 = exports.default = /* define-vxe-component start */(0, _comp.defi
       var $xeCascader = this;
       var reactData = $xeCascader.reactData;
       var internalData = $xeCascader.internalData;
-      var nodeMaps = internalData.nodeMaps;
       var fullList = internalData.afterVisibleList;
       if (force) {
         // 更新数据，处理筛选和排序
@@ -734,18 +733,66 @@ var _default2 = exports.default = /* define-vxe-component start */(0, _comp.defi
         fullList = $xeCascader.handleTreeToList();
       }
       var treeList = fullList.slice(0);
-      treeList.forEach(function (item, $index) {
-        var nodeid = $xeCascader.getNodeId(item);
-        var itemRest = nodeMaps[nodeid];
-        if (itemRest) {
-          itemRest.$index = $index;
-        }
-      });
       reactData.treeList = treeList;
     },
+    /**
+     * 获取第一个拥有子节点的节点
+     */
+    handleHasChildNodeIds: function handleHasChildNodeIds(treeList, type) {
+      var $xeCascader = this;
+      var childrenField = $xeCascader.computeChildrenField;
+      var mapChildrenField = $xeCascader.computeMapChildrenField;
+      var treeOpts = $xeCascader.computeTreeOpts;
+      var transform = treeOpts.transform;
+      var childField = transform ? mapChildrenField : childrenField;
+      var nodeIds = [];
+      var currList = treeList;
+      while (currList.length) {
+        var targetNode = null;
+        var _iterator = _createForOfIteratorHelper(currList),
+          _step;
+        try {
+          for (_iterator.s(); !(_step = _iterator.n()).done;) {
+            var item = _step.value;
+            var kids = item[childField];
+            if (_xeUtils.default.isArray(kids) && kids.length > 0) {
+              targetNode = item;
+              break;
+            }
+          }
+        } catch (err) {
+          _iterator.e(err);
+        } finally {
+          _iterator.f();
+        }
+        if (targetNode) {
+          nodeIds.push($xeCascader.getNodeId(targetNode));
+          currList = targetNode[childField];
+        } else {
+          var endNode = _xeUtils.default[type](currList);
+          nodeIds.push($xeCascader.getNodeId(endNode));
+          break;
+        }
+      }
+      return nodeIds;
+    },
     triggerSearchEvent: _xeUtils.default.debounce(function () {
       var $xeCascader = this;
+      var reactData = $xeCascader.reactData;
+      var internalData = $xeCascader.internalData;
       $xeCascader.handleData(true);
+      $xeCascader.updateModelChecked();
+      var filterOpts = $xeCascader.computeFilterOpts;
+      var autoExpandMode = filterOpts.autoExpandMode;
+      var afterTreeList = internalData.afterTreeList;
+      // 默认展开第
+      if (autoExpandMode === 'first' || autoExpandMode === 'last') {
+        var stItems = $xeCascader.handleHasChildNodeIds(afterTreeList, autoExpandMode);
+        reactData.currentItems = stItems;
+      } else {
+        $xeCascader.handleCurrentItems();
+      }
+      $xeCascader.updateCurrentChunk();
     }, 350, {
       trailing: true
     }),
@@ -779,19 +826,22 @@ var _default2 = exports.default = /* define-vxe-component start */(0, _comp.defi
       var reactData = $xeCascader.reactData;
       var internalData = $xeCascader.internalData;
       var currentItems = reactData.currentItems;
-      var treeFullData = internalData.treeFullData;
+      var afterTreeList = internalData.afterTreeList;
       var childrenField = $xeCascader.computeChildrenField;
-      var currentCunkList = [treeFullData];
+      var mapChildrenField = $xeCascader.computeMapChildrenField;
+      var treeOpts = $xeCascader.computeTreeOpts;
+      var transform = treeOpts.transform;
+      var currentCunkList = [afterTreeList];
       if (currentItems.length) {
         var chunkIndex = 0;
         var stNodeid = currentItems[chunkIndex];
-        var optList = treeFullData;
+        var optList = afterTreeList;
         while (stNodeid && optList && optList.length) {
           stNodeid = currentItems[chunkIndex++];
           var currOption = optList.find(function (item) {
             return stNodeid === $xeCascader.getNodeId(item);
           });
-          optList = currOption ? currOption[childrenField] : [];
+          optList = currOption ? currOption[transform ? mapChildrenField : childrenField] : [];
           if (!optList || !optList.length) {
             break;
           }
@@ -804,7 +854,7 @@ var _default2 = exports.default = /* define-vxe-component start */(0, _comp.defi
       var $xeCascader = this;
       var reactData = $xeCascader.reactData;
       var internalData = $xeCascader.internalData;
-      var treeFullData = internalData.treeFullData;
+      var afterTreeList = internalData.afterTreeList;
       var selectVals = $xeCascader.computeSelectVals;
       var childrenField = $xeCascader.computeChildrenField;
       var mapChildrenField = $xeCascader.computeMapChildrenField;
@@ -814,7 +864,7 @@ var _default2 = exports.default = /* define-vxe-component start */(0, _comp.defi
       var expandedMaps = {};
       if (selectVals.length) {
         var lastVal = (0, _util.enNodeValue)(_xeUtils.default.last(selectVals));
-        var stRest = _xeUtils.default.findTree(treeFullData, function (item) {
+        var stRest = _xeUtils.default.findTree(afterTreeList, function (item) {
           return lastVal === $xeCascader.getNodeId(item);
         }, {
           children: transform ? mapChildrenField : childrenField
@@ -957,13 +1007,14 @@ var _default2 = exports.default = /* define-vxe-component start */(0, _comp.defi
         };
       });
     },
-    clearCheckboxNode: function clearCheckboxNode() {
+    clearSelectedNode: function clearSelectedNode() {
       var $xeCascader = this;
       var reactData = $xeCascader.reactData;
       var internalData = $xeCascader.internalData;
       internalData.indeterminateRowMaps = {};
       internalData.selectCheckboxMaps = {};
       reactData.updateCheckboxFlag++;
+      reactData.selectRadioKey = null;
       $xeCascader.updateCheckboxStatus();
       return $xeCascader.$nextTick().then(function () {
         return {
@@ -1030,7 +1081,7 @@ var _default2 = exports.default = /* define-vxe-component start */(0, _comp.defi
       var multiple = props.multiple,
         checkedClosable = props.checkedClosable;
       var value = multiple ? [] : null;
-      $xeCascader.clearCheckboxNode().then(function () {
+      $xeCascader.clearSelectedNode().then(function () {
         if (checkedClosable) {
           $xeCascader.hideOptionPanel($event);
         }
@@ -1133,10 +1184,13 @@ var _default2 = exports.default = /* define-vxe-component start */(0, _comp.defi
       var nodeMaps = internalData.nodeMaps;
       var radioOpts = $xeCascader.computeRadioOpts;
       var childrenField = $xeCascader.computeChildrenField;
+      var mapChildrenField = $xeCascader.computeMapChildrenField;
+      var treeOpts = $xeCascader.computeTreeOpts;
+      var transform = treeOpts.transform;
       var checkMode = radioOpts.checkMode,
         checkMethod = radioOpts.checkMethod;
       var nodeid = $xeCascader.getNodeId(node);
-      var childList = node[childrenField];
+      var childList = node[transform ? mapChildrenField : childrenField];
       var isExistChild = childList && childList.length > 0;
       var nodeItem = nodeMaps[nodeid] || {};
       var nLevel = nodeItem.level;
@@ -1333,7 +1387,7 @@ var _default2 = exports.default = /* define-vxe-component start */(0, _comp.defi
         var childRowList = [];
         _xeUtils.default.eachTree(afterTreeList, function (node) {
           var nodeid = $xeCascader.getNodeId(node);
-          var childList = node[childrenField];
+          var childList = node[transform ? mapChildrenField : childrenField];
           if (childList && childList.length && !childRowMaps[nodeid]) {
             childRowMaps[nodeid] = 1;
             childRowList.unshift([node, nodeid, childList]);
@@ -1436,7 +1490,7 @@ var _default2 = exports.default = /* define-vxe-component start */(0, _comp.defi
       var treeOpts = $xeCascader.computeTreeOpts;
       var transform = treeOpts.transform;
       var nodeid = $xeCascader.getNodeId(node);
-      var childList = node[childrenField];
+      var childList = node[transform ? mapChildrenField : childrenField];
       var isExistChild = childList && childList.length > 0;
       var nodeItem = nodeMaps[nodeid] || {};
       var nLevel = nodeItem.level;
@@ -1743,13 +1797,15 @@ var _default2 = exports.default = /* define-vxe-component start */(0, _comp.defi
         treeExpandLazyLoadedMaps = internalData.treeExpandLazyLoadedMaps;
       var treeOpts = $xeCascader.computeTreeOpts;
       var lazy = treeOpts.lazy,
+        transform = treeOpts.transform,
         iconLoaded = treeOpts.iconLoaded,
         iconOpen = treeOpts.iconOpen,
         iconClose = treeOpts.iconClose;
       var childrenField = $xeCascader.computeChildrenField;
+      var mapChildrenField = $xeCascader.computeMapChildrenField;
       var labelField = $xeCascader.computeLabelField;
       var hasChildField = $xeCascader.computeHasChildField;
-      var childList = node[childrenField];
+      var childList = node[transform ? mapChildrenField : childrenField];
       var isExistChild = childList && childList.length > 0;
       var iconSlot = slots.icon;
       var titleSlot = slots.title;
@@ -1923,7 +1979,7 @@ var _default2 = exports.default = /* define-vxe-component start */(0, _comp.defi
         class: 'vxe-tree-select--panel-header'
       }, headerSlot ? headerSlot({}) : [h('div', {
         class: 'vxe-tree-select--header-button'
-      }, [showCheckedButton && showClearButton ? h('div', {
+      }, [showCheckedButton && multiple || showClearButton ? h('div', {
         class: 'vxe-tree-select--selected-btns'
       }, [showCheckedButton && multiple ? h(_button.default, {
         props: {
@@ -1965,13 +2021,13 @@ var _default2 = exports.default = /* define-vxe-component start */(0, _comp.defi
             }
           }
         })]);
-      })])]), footerSlot || showTotalButton || showCloseButton && multiple ? h('div', {
+      })])]), footerSlot || showTotalButton || showCloseButton ? h('div', {
         class: 'vxe-cascader--panel-footer'
       }, footerSlot ? footerSlot({}) : [h('div', {
         class: 'vxe-cascader--footer-button'
       }, [showTotalButton ? h('div', {
         class: 'vxe-cascader--total-btns'
-      }, (0, _ui.getI18n)('vxe.treeSelect.total', [selectVals.length])) : (0, _ui.renderEmptyElement)($xeCascader), showCloseButton && multiple ? h('div', {
+      }, (0, _ui.getI18n)('vxe.treeSelect.total', [selectVals.length])) : (0, _ui.renderEmptyElement)($xeCascader), showCloseButton ? h('div', {
         class: 'vxe-cascader--oper-btns'
       }, [h(_button.default, {
         props: {
@@ -2012,10 +2068,6 @@ var _default2 = exports.default = /* define-vxe-component start */(0, _comp.defi
   },
   mounted: function mounted() {
     var $xeCascader = this;
-    var props = $xeCascader;
-    if (props.filterable) {
-      errLog('vxe.error.notProp', ['filterable']);
-    }
     _ui.globalEvents.on($xeCascader, 'mousewheel', $xeCascader.handleGlobalMousewheelEvent);
     _ui.globalEvents.on($xeCascader, 'mousedown', $xeCascader.handleGlobalMousedownEvent);
     _ui.globalEvents.on($xeCascader, 'blur', $xeCascader.handleGlobalBlurEvent);