zartui 2.1.26 → 2.1.28

package/es/index.js

@@ -76,7 +76,7 @@ import TextEllipsis from './text-ellipsis';
 import Timeline from './timeline';
 import Toast from './toast';
 import Uploader from './uploader';
-var version = '2.1.26';
+var version = '2.1.28';
 function install(Vue) {
   var components = [ActionSheet, Area, Avatar, BackTop, Badge, Button, Calendar, Cascader, Cell, CellGroup, Checkbox, CheckboxGroup, Col, Collapse, CollapseItem, CountDown, DatetimePicker, Dialog, Divider, DropdownItem, DropdownMenu, Empty, Field, FoldDialog, Form, Grid, GridItem, HierarchySelect, Icon, Image, ImagePreview, IndexAnchor, IndexBar, Info, Lazyload, List, Loading, Locale, MediaPicker, MediaPlayer, MultiplePicker, NavBar, NoticeBar, NumberKeyboard, Overlay, PasswordInput, Picker, Popover, Popup, PullRefresh, Radio, RadioGroup, Rate, Row, Search, Signature, Skeleton, Slider, SpeechRecognizer, Step, Stepper, Steps, Sticky, Swipe, SwipeCell, SwipeItem, Switch, SwitchCell, Tab, Tabbar, TabbarItem, Table, Tabs, Tag, TextEllipsis, Timeline, Toast, Uploader];
   components.forEach(function (item) {

package/es/multiple-picker/MultiplePickerOptions.js

@@ -54,10 +54,19 @@ export default createComponent({
   methods: {
     setOptions: function setOptions(options) {
       if (JSON.stringify(options) !== JSON.stringify(this.options)) {
+        // 保存当前的 confirmed 状态
+        var wasConfirmed = this.confirmed;
         this.options = deepClone(options);
-        // 当 options 变化时,需要重置 confirmed 状态,允许重新设置索引
-        this.confirmed = false;
-        this.setDefaultIndexs();
+
+        // 如果已经确认过选择,保持 confirmed 状态
+        if (wasConfirmed) {
+          // options 变化后,currentIndexs 会由父组件通过 setConfirmIndex 重新设置
+          // 这里不做任何操作,等待父组件更新
+        } else {
+          // 未确认时才重置状态
+          this.confirmed = false;
+          this.setDefaultIndexs();
+        }
       }
     },
     setDefaultIndexs: function setDefaultIndexs() {

package/es/multiple-picker/index.js

@@ -34,6 +34,10 @@ export default createComponent({
         return [];
       }
     },
+    filteredOptions: {
+      type: Array,
+      default: null
+    },
     toolbarPosition: {
       type: String,
       default: 'bottom'
@@ -57,6 +61,10 @@ export default createComponent({
   }),
   data: function data() {
     return {
+      selectedValues: [],
+      // 基于值的选中状态,用于支持 options 动态变化
+      confirmedSelectedValues: [],
+      // 上次确认时的 selectedValues，用于取消时恢复
       currentIndexs: [],
       confirmIndexs: null
     };
@@ -64,29 +72,68 @@ export default createComponent({
   watch: {
     options: {
       handler: function handler(newOptions) {
-        // 当 options 变化时,需要过滤掉无效的索引
-        if (this.confirmIndexs) {
-          var validIndexs = this.confirmIndexs.filter(function (index) {
-            return index < newOptions.length;
+        var _this = this;
+        // 当 options 变化时,基于 selectedValues 重新计算索引
+        if (this.selectedValues && this.selectedValues.length > 0) {
+          var newIndexs = [];
+          newOptions.forEach(function (option, index) {
+            var optionValue = _this.getOptionValue(option);
+            if (_this.selectedValues.includes(optionValue)) {
+              newIndexs.push(index);
+            }
           });
-          this.confirmIndexs = validIndexs.length > 0 ? validIndexs : null;
-          this.currentIndexs = validIndexs;
+          this.currentIndexs = newIndexs;
+          this.confirmIndexs = newIndexs.length > 0 ? newIndexs : null;
         }
       },
       immediate: false
     },
+    filteredOptions: {
+      handler: function handler() {
+        var _this2 = this;
+        // filteredOptions 变化时,需要基于 selectedValues 重新映射到 displayOptions 的索引
+        this.$nextTick(function () {
+          if (_this2.$refs.pickerOptions) {
+            var displayIndexs = [];
+            if (_this2.selectedValues && _this2.selectedValues.length > 0) {
+              _this2.displayOptions.forEach(function (option, index) {
+                var optionValue = _this2.getOptionValue(option);
+                if (_this2.selectedValues.includes(optionValue)) {
+                  displayIndexs.push(index);
+                }
+              });
+            }
+            // 强制更新子组件,即使是空数组也要设置
+            _this2.$refs.pickerOptions.confirmed = false;
+            _this2.$refs.pickerOptions.setConfirmIndex(displayIndexs);
+          }
+        });
+      },
+      immediate: false
+    },
     showPicker: {
       handler: function handler(val) {
-        var _this = this;
+        var _this3 = this;
         if (val) {
           this.$nextTick(function () {
-            if (_this.$refs.pickerOptions && _this.confirmIndexs) {
-              _this.$refs.pickerOptions.setConfirmIndex(_this.confirmIndexs);
-              // 同步 currentIndexs 以更新底部全选和已选状态
-              _this.currentIndexs = [].concat(_this.confirmIndexs);
-            } else if (!_this.confirmIndexs && _this.defaultIndexs && _this.defaultIndexs.length === 0) {
-              _this.$refs.pickerOptions.setConfirmIndex([]);
-              _this.currentIndexs = [];
+            if (_this3.$refs.pickerOptions) {
+              // 基于 selectedValues 计算在 displayOptions 中的索引
+              var displayIndexs = [];
+              if (_this3.selectedValues && _this3.selectedValues.length > 0) {
+                _this3.displayOptions.forEach(function (option, index) {
+                  var optionValue = _this3.getOptionValue(option);
+                  if (_this3.selectedValues.includes(optionValue)) {
+                    displayIndexs.push(index);
+                  }
+                });
+              }
+
+              // 弹出时直接设置 currentIndexs，不调用 setConfirmIndex，保持未确认状态
+              _this3.$refs.pickerOptions.confirmed = false;
+              _this3.$refs.pickerOptions.currentIndexs = displayIndexs;
+
+              // 同步 currentIndexs(基于原始 options)
+              _this3.currentIndexs = _this3.confirmIndexs || [];
             }
           });
         }
@@ -95,11 +142,32 @@ export default createComponent({
     }
   },
   computed: {
+    displayOptions: function displayOptions() {
+      return this.filteredOptions || this.options;
+    },
     isAllSelected: function isAllSelected() {
-      return this.currentIndexs.length > 0 && this.currentIndexs.length === this.options.length;
+      var _this4 = this;
+      // 判断是否全选应该基于当前显示的 displayOptions
+      if (this.displayOptions.length === 0) return false;
+      var displayValues = this.displayOptions.map(function (opt) {
+        return _this4.getOptionValue(opt);
+      });
+      var selectedDisplayValues = this.selectedValues.filter(function (val) {
+        return displayValues.includes(val);
+      });
+      return selectedDisplayValues.length > 0 && selectedDisplayValues.length === this.displayOptions.length;
     },
     isIndeterminate: function isIndeterminate() {
-      return this.currentIndexs.length > 0 && this.currentIndexs.length < this.options.length;
+      var _this5 = this;
+      // 判断半选状态也应该基于当前显示的 displayOptions
+      if (this.displayOptions.length === 0) return false;
+      var displayValues = this.displayOptions.map(function (opt) {
+        return _this5.getOptionValue(opt);
+      });
+      var selectedDisplayValues = this.selectedValues.filter(function (val) {
+        return displayValues.includes(val);
+      });
+      return selectedDisplayValues.length > 0 && selectedDisplayValues.length < this.displayOptions.length;
     },
     itemPxHeight: function itemPxHeight() {
       return this.itemHeight ? unitToPx(this.itemHeight) : DEFAULT_ITEM_HEIGHT;
@@ -114,55 +182,167 @@ export default createComponent({
     emit: function emit(event) {
       this.$emit(event, this.getOptions());
     },
+    getOptionValue: function getOptionValue(option) {
+      if (typeof option === 'string' || typeof option === 'number') {
+        return option;
+      }
+      return option[this.valueKey] || JSON.stringify(option);
+    },
     getOptions: function getOptions() {
-      var _this2 = this;
+      var _this6 = this;
       var indexs = this.$refs.pickerOptions.currentIndexs;
       var result = [];
+      // 从 displayOptions 中获取选中项
       indexs.forEach(function (index) {
-        result.push(_extends({}, _this2.options[index], {
-          initialIndex: index
-        }));
+        var displayOption = _this6.displayOptions[index];
+        if (displayOption) {
+          // 查找在原始 options 中的索引
+          var originalIndex = _this6.options.findIndex(function (opt) {
+            return _this6.getOptionValue(opt) === _this6.getOptionValue(displayOption);
+          });
+          result.push(_extends({}, displayOption, {
+            initialIndex: originalIndex >= 0 ? originalIndex : index
+          }));
+        }
       });
       return result;
     },
     onChange: function onChange() {
+      var _this7 = this;
       // 同步 currentIndexs 以触发计算属性更新
       if (this.$refs.pickerOptions) {
-        this.currentIndexs = [].concat(this.$refs.pickerOptions.currentIndexs);
+        // 实时更新 selectedValues,需要合并而不是覆盖
+        var displayOptions = this.getOptions();
+        var displayValues = displayOptions.map(function (v) {
+          return _this7.getOptionValue(v);
+        });
+        var displayAllValues = this.displayOptions.map(function (opt) {
+          return _this7.getOptionValue(opt);
+        });
+
+        // 移除当前显示列表中的所有值(无论是否选中),然后添加当前选中的值
+        this.selectedValues = [].concat(this.selectedValues.filter(function (val) {
+          return !displayAllValues.includes(val);
+        }), displayValues);
+
+        // 基于 selectedValues 更新 currentIndexs(用于显示已选数量)
+        this.currentIndexs = [];
+        this.options.forEach(function (option, index) {
+          if (_this7.selectedValues.includes(_this7.getOptionValue(option))) {
+            _this7.currentIndexs.push(index);
+          }
+        });
       }
       this.$emit('change', this.getOptions());
     },
     cancel: function cancel() {
+      var _this8 = this;
+      // 取消时恢复到上次确认的状态
+      this.selectedValues = [].concat(this.confirmedSelectedValues);
+
+      // 重新计算 currentIndexs
+      this.currentIndexs = [];
+      this.options.forEach(function (option, index) {
+        if (_this8.selectedValues.includes(_this8.getOptionValue(option))) {
+          _this8.currentIndexs.push(index);
+        }
+      });
       this.$emit('update:showPicker', false);
       this.emit('cancel');
     },
     confirm: function confirm() {
-      var options = this.getOptions();
-      this.confirmIndexs = options.map(function (v) {
+      var _this9 = this;
+      // 返回所有已选的数据,而不仅仅是当前显示的
+      var allSelectedOptions = [];
+      this.selectedValues.forEach(function (value) {
+        var option = _this9.options.find(function (opt) {
+          return _this9.getOptionValue(opt) === value;
+        });
+        if (option) {
+          var originalIndex = _this9.options.findIndex(function (opt) {
+            return _this9.getOptionValue(opt) === value;
+          });
+          allSelectedOptions.push(_extends({}, option, {
+            initialIndex: originalIndex
+          }));
+        }
+      });
+      this.confirmIndexs = allSelectedOptions.map(function (v) {
         return v.initialIndex;
       });
-      this.emit('confirm', options);
+      // 确认时保存当前的 selectedValues
+      this.confirmedSelectedValues = [].concat(this.selectedValues);
+      this.$emit('confirm', allSelectedOptions);
     },
     handleSelectAll: function handleSelectAll() {
-      var newIndexs = !this.isAllSelected ? this.options && this.options.map(function (_, index) {
-        return index;
-      }) : [];
-      this.currentIndexs = newIndexs;
-      if (this.$refs.pickerOptions) {
-        this.$refs.pickerOptions.setConfirmIndex(newIndexs);
+      var _this10 = this;
+      // 全选应该基于当前显示的 displayOptions,只选中当前搜索结果
+      var displayValues = this.displayOptions.map(function (opt) {
+        return _this10.getOptionValue(opt);
+      });
+      if (!this.isAllSelected) {
+        // 全选:只选中当前显示的值,清除其他值
+        this.selectedValues = displayValues;
+
+        // 更新 currentIndexs(基于原始 options)
+        this.currentIndexs = [];
+        this.options.forEach(function (option, index) {
+          if (displayValues.includes(_this10.getOptionValue(option))) {
+            _this10.currentIndexs.push(index);
+          }
+        });
+
+        // 设置子组件索引(基于 displayOptions,全选所有显示项)
+        var displayIndexs = this.displayOptions.map(function (_, index) {
+          return index;
+        });
+        if (this.$refs.pickerOptions) {
+          this.$refs.pickerOptions.setConfirmIndex(displayIndexs);
+        }
+      } else {
+        // 取消全选:清空所有选中
+        this.selectedValues = [];
+        this.currentIndexs = [];
+        if (this.$refs.pickerOptions) {
+          this.$refs.pickerOptions.setConfirmIndex([]);
+        }
       }
     },
     onSelectOther: function onSelectOther() {
-      var _this3 = this;
-      var newIndexs = [];
-      this.options && this.options.forEach(function (_, index) {
-        if (!_this3.currentIndexs.includes(index)) {
-          newIndexs.push(index);
+      var _this11 = this;
+      // 反选应该基于当前显示的 displayOptions,只操作当前搜索结果
+      var displayValues = this.displayOptions.map(function (opt) {
+        return _this11.getOptionValue(opt);
+      });
+
+      // 计算当前显示项中未选中的值
+      var displaySelectedValues = this.selectedValues.filter(function (val) {
+        return displayValues.includes(val);
+      });
+      var displayUnselectedValues = displayValues.filter(function (val) {
+        return !displaySelectedValues.includes(val);
+      });
+
+      // 只保留当前显示列表中未选中的项(反选逻辑)
+      this.selectedValues = displayUnselectedValues;
+
+      // 更新 currentIndexs(基于原始 options)
+      this.currentIndexs = [];
+      this.options.forEach(function (option, index) {
+        if (displayUnselectedValues.includes(_this11.getOptionValue(option))) {
+          _this11.currentIndexs.push(index);
+        }
+      });
+
+      // 映射到 displayOptions 的索引(反选后的状态)
+      var displayIndexs = [];
+      this.displayOptions.forEach(function (option, index) {
+        if (displayUnselectedValues.includes(_this11.getOptionValue(option))) {
+          displayIndexs.push(index);
         }
       });
-      this.currentIndexs = newIndexs;
       if (this.$refs.pickerOptions) {
-        this.$refs.pickerOptions.setConfirmIndex(newIndexs);
+        this.$refs.pickerOptions.setConfirmIndex(displayIndexs);
       }
     },
     genTitle: function genTitle() {
@@ -276,18 +456,19 @@ export default createComponent({
       }, [this.genOptionItems()]);
     },
     genOptionItems: function genOptionItems() {
-      var _this4 = this;
+      var _this12 = this;
       var h = this.$createElement;
       var formatOptions = [];
-      if (this.options && this.options[0] && typeof this.options[0] !== 'object') {
-        formatOptions = this.options.map(function (v) {
+      var sourceOptions = this.displayOptions;
+      if (sourceOptions && sourceOptions[0] && typeof sourceOptions[0] !== 'object') {
+        formatOptions = sourceOptions.map(function (v) {
           return {
             value: v,
             text: v
           };
         });
       } else {
-        formatOptions = this.options;
+        formatOptions = sourceOptions;
       }
       return h(MultiplePickerOptions, {
         "ref": "pickerOptions",
@@ -305,7 +486,7 @@ export default createComponent({
         },
         "on": {
           "change": function change() {
-            _this4.onChange();
+            _this12.onChange();
           }
         }
       });

package/lib/index.js

@@ -161,7 +161,7 @@ var _toast = _interopRequireDefault(require("./toast"));
 exports.Toast = _toast.default;
 var _uploader = _interopRequireDefault(require("./uploader"));
 exports.Uploader = _uploader.default;
-var version = exports.version = '2.1.26';
+var version = exports.version = '2.1.28';
 function install(Vue) {
   var components = [_actionSheet.default, _area.default, _avatar.default, _backTop.default, _badge.default, _button.default, _calendar.default, _cascader.default, _cell.default, _cellGroup.default, _checkbox.default, _checkboxGroup.default, _col.default, _collapse.default, _collapseItem.default, _countDown.default, _datetimePicker.default, _dialog.default, _divider.default, _dropdownItem.default, _dropdownMenu.default, _empty.default, _field.default, _foldDialog.default, _form.default, _grid.default, _gridItem.default, _hierarchySelect.default, _icon.default, _image.default, _imagePreview.default, _indexAnchor.default, _indexBar.default, _info.default, _lazyload.default, _list.default, _loading.default, _locale.default, _mediaPicker.default, _mediaPlayer.default, _multiplePicker.default, _navBar.default, _noticeBar.default, _numberKeyboard.default, _overlay.default, _passwordInput.default, _picker.default, _popover.default, _popup.default, _pullRefresh.default, _radio.default, _radioGroup.default, _rate.default, _row.default, _search.default, _signature.default, _skeleton.default, _slider.default, _speechRecognizer.default, _step.default, _stepper.default, _steps.default, _sticky.default, _swipe.default, _swipeCell.default, _swipeItem.default, _switch.default, _switchCell.default, _tab.default, _tabbar.default, _tabbarItem.default, _table.default, _tabs.default, _tag.default, _textEllipsis.default, _timeline.default, _toast.default, _uploader.default];
   components.forEach(function (item) {

package/lib/multiple-picker/MultiplePickerOptions.js

@@ -59,10 +59,19 @@ var _default2 = exports.default = createComponent({
   methods: {
     setOptions: function setOptions(options) {
       if (JSON.stringify(options) !== JSON.stringify(this.options)) {
+        // 保存当前的 confirmed 状态
+        var wasConfirmed = this.confirmed;
         this.options = (0, _deepClone.deepClone)(options);
-        // 当 options 变化时,需要重置 confirmed 状态,允许重新设置索引
-        this.confirmed = false;
-        this.setDefaultIndexs();
+
+        // 如果已经确认过选择,保持 confirmed 状态
+        if (wasConfirmed) {
+          // options 变化后,currentIndexs 会由父组件通过 setConfirmIndex 重新设置
+          // 这里不做任何操作,等待父组件更新
+        } else {
+          // 未确认时才重置状态
+          this.confirmed = false;
+          this.setDefaultIndexs();
+        }
       }
     },
     setDefaultIndexs: function setDefaultIndexs() {