amis-ui 2.3.0 → 2.3.2-beta.1

package/lib/components/Transfer.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v2.3.0
+ * amis-ui v2.3.2-beta.1
  * Copyright 2018-2022 fex
  */
 
@@ -106,22 +106,22 @@ var Transfer = /** @class */ (function (_super) {
     Transfer.prototype.toggleAll = function () {
         var _a = this.props, options = _a.options, option2value = _a.option2value, onChange = _a.onChange, value = _a.value, onSelectAll = _a.onSelectAll;
         var valueArray = Selection.BaseSelection.value2array(value, options, option2value);
-        var availableOptions = amisCore.flattenTree(options).filter(function (option, index, list) {
-            return !option.disabled &&
-                option.value !== void 0 &&
-                list.indexOf(option) === index;
-        });
-        if (valueArray.length < availableOptions.length) {
-            valueArray = availableOptions;
+        var availableOptions = this.availableOptions;
+        // availableOptions 中选项是否都被选中了
+        var isAvailableOptionsAllSelected = _.intersectionWith(availableOptions, valueArray, _.isEqual).length ===
+            availableOptions.length;
+        // 全不选
+        if (isAvailableOptionsAllSelected) {
+            valueArray = _.differenceWith(valueArray, availableOptions, _.isEqual);
         }
+        // 全选
         else {
-            valueArray = [];
+            valueArray = _.unionWith(valueArray, availableOptions, _.isEqual);
         }
         var newValue = option2value
             ? valueArray.map(function (item) { return option2value(item); })
             : valueArray;
-        // > 0 全选。TODO：由于未来可能有逻辑：禁用清空不了，这里判断全选，得完善下
-        newValue.length > 0 && (onSelectAll === null || onSelectAll === void 0 ? void 0 : onSelectAll(newValue));
+        isAvailableOptionsAllSelected || (onSelectAll === null || onSelectAll === void 0 ? void 0 : onSelectAll(newValue));
         onChange === null || onChange === void 0 ? void 0 : onChange(newValue);
     };
     // 全选，给予动作全选使用
@@ -203,6 +203,8 @@ var Transfer = /** @class */ (function (_super) {
         var checkedAll = false;
         checkedAll = this.availableOptions.every(function (option) { return _this.valueArray.indexOf(option) > -1; });
         checkedPartial = this.availableOptions.some(function (option) { return _this.valueArray.indexOf(option) > -1; });
+        // 不在当前 availableOptions 中的已选项 数量
+        var selectedNotInAvailableOptions = _.differenceWith(this.valueArray, this.availableOptions, _.isEqual).length;
         return (React__default["default"].createElement(React__default["default"].Fragment, null,
             React__default["default"].createElement("div", { className: cx('Transfer-title', selectMode === 'table' ? 'Transfer-title--light' : '') },
                 React__default["default"].createElement("span", null,
@@ -210,7 +212,9 @@ var Transfer = /** @class */ (function (_super) {
                     __(selectTitle || 'Transfer.available'),
                     statistics !== false ? (React__default["default"].createElement("span", null,
                         "\uFF08",
-                        this.availableOptions.length - this.valueArray.length,
+                        this.availableOptions.length -
+                            this.valueArray.length +
+                            selectedNotInAvailableOptions,
                         "/",
                         this.availableOptions.length,
                         "\uFF09")) : null),
@@ -252,8 +256,9 @@ var Transfer = /** @class */ (function (_super) {
     };
     Transfer.prototype.render = function () {
         var _a = this.props, inline = _a.inline, cx = _a.classnames, className = _a.className, value = _a.value, resultTitle = _a.resultTitle, options = _a.options, option2value = _a.option2value, disabled = _a.disabled, statistics = _a.statistics, showArrow = _a.showArrow, resultListModeFollowSelect = _a.resultListModeFollowSelect, _b = _a.selectMode, selectMode = _b === void 0 ? 'list' : _b, __ = _a.translate;
+        var searchResult = this.state.searchResult;
         this.valueArray = Selection.BaseSelection.value2array(value, options, option2value);
-        this.availableOptions = amisCore.flattenTree(options).filter(function (option, index, list) {
+        this.availableOptions = amisCore.flattenTree(searchResult !== null && searchResult !== void 0 ? searchResult : options).filter(function (option, index, list) {
             return !option.disabled &&
                 option.value !== void 0 &&
                 list.indexOf(option) === index;