zartui 2.1.27 → 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.27';
+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/index.js

@@ -63,6 +63,8 @@ export default createComponent({
     return {
       selectedValues: [],
       // 基于值的选中状态,用于支持 options 动态变化
+      confirmedSelectedValues: [],
+      // 上次确认时的 selectedValues，用于取消时恢复
       currentIndexs: [],
       confirmIndexs: null
     };
@@ -125,7 +127,11 @@ export default createComponent({
                   }
                 });
               }
-              _this3.$refs.pickerOptions.setConfirmIndex(displayIndexs);
+
+              // 弹出时直接设置 currentIndexs，不调用 setConfirmIndex，保持未确认状态
+              _this3.$refs.pickerOptions.confirmed = false;
+              _this3.$refs.pickerOptions.currentIndexs = displayIndexs;
+
               // 同步 currentIndexs(基于原始 options)
               _this3.currentIndexs = _this3.confirmIndexs || [];
             }
@@ -230,20 +236,31 @@ export default createComponent({
       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 _this8 = this;
+      var _this9 = this;
       // 返回所有已选的数据,而不仅仅是当前显示的
       var allSelectedOptions = [];
       this.selectedValues.forEach(function (value) {
-        var option = _this8.options.find(function (opt) {
-          return _this8.getOptionValue(opt) === value;
+        var option = _this9.options.find(function (opt) {
+          return _this9.getOptionValue(opt) === value;
         });
         if (option) {
-          var originalIndex = _this8.options.findIndex(function (opt) {
-            return _this8.getOptionValue(opt) === value;
+          var originalIndex = _this9.options.findIndex(function (opt) {
+            return _this9.getOptionValue(opt) === value;
           });
           allSelectedOptions.push(_extends({}, option, {
             initialIndex: originalIndex
@@ -253,13 +270,15 @@ export default createComponent({
       this.confirmIndexs = allSelectedOptions.map(function (v) {
         return v.initialIndex;
       });
+      // 确认时保存当前的 selectedValues
+      this.confirmedSelectedValues = [].concat(this.selectedValues);
       this.$emit('confirm', allSelectedOptions);
     },
     handleSelectAll: function handleSelectAll() {
-      var _this9 = this;
+      var _this10 = this;
       // 全选应该基于当前显示的 displayOptions,只选中当前搜索结果
       var displayValues = this.displayOptions.map(function (opt) {
-        return _this9.getOptionValue(opt);
+        return _this10.getOptionValue(opt);
       });
       if (!this.isAllSelected) {
         // 全选:只选中当前显示的值,清除其他值
@@ -268,8 +287,8 @@ export default createComponent({
         // 更新 currentIndexs(基于原始 options)
         this.currentIndexs = [];
         this.options.forEach(function (option, index) {
-          if (displayValues.includes(_this9.getOptionValue(option))) {
-            _this9.currentIndexs.push(index);
+          if (displayValues.includes(_this10.getOptionValue(option))) {
+            _this10.currentIndexs.push(index);
           }
         });
 
@@ -290,10 +309,10 @@ export default createComponent({
       }
     },
     onSelectOther: function onSelectOther() {
-      var _this10 = this;
+      var _this11 = this;
       // 反选应该基于当前显示的 displayOptions,只操作当前搜索结果
       var displayValues = this.displayOptions.map(function (opt) {
-        return _this10.getOptionValue(opt);
+        return _this11.getOptionValue(opt);
       });
 
       // 计算当前显示项中未选中的值
@@ -310,15 +329,15 @@ export default createComponent({
       // 更新 currentIndexs(基于原始 options)
       this.currentIndexs = [];
       this.options.forEach(function (option, index) {
-        if (displayUnselectedValues.includes(_this10.getOptionValue(option))) {
-          _this10.currentIndexs.push(index);
+        if (displayUnselectedValues.includes(_this11.getOptionValue(option))) {
+          _this11.currentIndexs.push(index);
         }
       });
 
       // 映射到 displayOptions 的索引(反选后的状态)
       var displayIndexs = [];
       this.displayOptions.forEach(function (option, index) {
-        if (displayUnselectedValues.includes(_this10.getOptionValue(option))) {
+        if (displayUnselectedValues.includes(_this11.getOptionValue(option))) {
           displayIndexs.push(index);
         }
       });
@@ -437,7 +456,7 @@ export default createComponent({
       }, [this.genOptionItems()]);
     },
     genOptionItems: function genOptionItems() {
-      var _this11 = this;
+      var _this12 = this;
       var h = this.$createElement;
       var formatOptions = [];
       var sourceOptions = this.displayOptions;
@@ -467,7 +486,7 @@ export default createComponent({
         },
         "on": {
           "change": function change() {
-            _this11.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.27';
+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/index.js

@@ -70,6 +70,8 @@ var _default2 = exports.default = createComponent({
     return {
       selectedValues: [],
       // 基于值的选中状态,用于支持 options 动态变化
+      confirmedSelectedValues: [],
+      // 上次确认时的 selectedValues，用于取消时恢复
       currentIndexs: [],
       confirmIndexs: null
     };
@@ -132,7 +134,11 @@ var _default2 = exports.default = createComponent({
                   }
                 });
               }
-              _this3.$refs.pickerOptions.setConfirmIndex(displayIndexs);
+
+              // 弹出时直接设置 currentIndexs，不调用 setConfirmIndex，保持未确认状态
+              _this3.$refs.pickerOptions.confirmed = false;
+              _this3.$refs.pickerOptions.currentIndexs = displayIndexs;
+
               // 同步 currentIndexs(基于原始 options)
               _this3.currentIndexs = _this3.confirmIndexs || [];
             }
@@ -237,20 +243,31 @@ var _default2 = exports.default = createComponent({
       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 _this8 = this;
+      var _this9 = this;
       // 返回所有已选的数据,而不仅仅是当前显示的
       var allSelectedOptions = [];
       this.selectedValues.forEach(function (value) {
-        var option = _this8.options.find(function (opt) {
-          return _this8.getOptionValue(opt) === value;
+        var option = _this9.options.find(function (opt) {
+          return _this9.getOptionValue(opt) === value;
         });
         if (option) {
-          var originalIndex = _this8.options.findIndex(function (opt) {
-            return _this8.getOptionValue(opt) === value;
+          var originalIndex = _this9.options.findIndex(function (opt) {
+            return _this9.getOptionValue(opt) === value;
           });
           allSelectedOptions.push((0, _extends2.default)({}, option, {
             initialIndex: originalIndex
@@ -260,13 +277,15 @@ var _default2 = exports.default = createComponent({
       this.confirmIndexs = allSelectedOptions.map(function (v) {
         return v.initialIndex;
       });
+      // 确认时保存当前的 selectedValues
+      this.confirmedSelectedValues = [].concat(this.selectedValues);
       this.$emit('confirm', allSelectedOptions);
     },
     handleSelectAll: function handleSelectAll() {
-      var _this9 = this;
+      var _this10 = this;
       // 全选应该基于当前显示的 displayOptions,只选中当前搜索结果
       var displayValues = this.displayOptions.map(function (opt) {
-        return _this9.getOptionValue(opt);
+        return _this10.getOptionValue(opt);
       });
       if (!this.isAllSelected) {
         // 全选:只选中当前显示的值,清除其他值
@@ -275,8 +294,8 @@ var _default2 = exports.default = createComponent({
         // 更新 currentIndexs(基于原始 options)
         this.currentIndexs = [];
         this.options.forEach(function (option, index) {
-          if (displayValues.includes(_this9.getOptionValue(option))) {
-            _this9.currentIndexs.push(index);
+          if (displayValues.includes(_this10.getOptionValue(option))) {
+            _this10.currentIndexs.push(index);
           }
         });
 
@@ -297,10 +316,10 @@ var _default2 = exports.default = createComponent({
       }
     },
     onSelectOther: function onSelectOther() {
-      var _this10 = this;
+      var _this11 = this;
       // 反选应该基于当前显示的 displayOptions,只操作当前搜索结果
       var displayValues = this.displayOptions.map(function (opt) {
-        return _this10.getOptionValue(opt);
+        return _this11.getOptionValue(opt);
       });
 
       // 计算当前显示项中未选中的值
@@ -317,15 +336,15 @@ var _default2 = exports.default = createComponent({
       // 更新 currentIndexs(基于原始 options)
       this.currentIndexs = [];
       this.options.forEach(function (option, index) {
-        if (displayUnselectedValues.includes(_this10.getOptionValue(option))) {
-          _this10.currentIndexs.push(index);
+        if (displayUnselectedValues.includes(_this11.getOptionValue(option))) {
+          _this11.currentIndexs.push(index);
         }
       });
 
       // 映射到 displayOptions 的索引(反选后的状态)
       var displayIndexs = [];
       this.displayOptions.forEach(function (option, index) {
-        if (displayUnselectedValues.includes(_this10.getOptionValue(option))) {
+        if (displayUnselectedValues.includes(_this11.getOptionValue(option))) {
           displayIndexs.push(index);
         }
       });
@@ -444,7 +463,7 @@ var _default2 = exports.default = createComponent({
       }, [this.genOptionItems()]);
     },
     genOptionItems: function genOptionItems() {
-      var _this11 = this;
+      var _this12 = this;
       var h = this.$createElement;
       var formatOptions = [];
       var sourceOptions = this.displayOptions;
@@ -474,7 +493,7 @@ var _default2 = exports.default = createComponent({
         },
         "on": {
           "change": function change() {
-            _this11.onChange();
+            _this12.onChange();
           }
         }
       });

package/lib/zart.js

@@ -26042,6 +26042,8 @@ var multiple_picker_createNamespace = Object(utils["b" /* createNamespace */])('
     return {
       selectedValues: [],
       // 基于值的选中状态,用于支持 options 动态变化
+      confirmedSelectedValues: [],
+      // 上次确认时的 selectedValues，用于取消时恢复
       currentIndexs: [],
       confirmIndexs: null
     };
@@ -26104,7 +26106,11 @@ var multiple_picker_createNamespace = Object(utils["b" /* createNamespace */])('
                   }
                 });
               }
-              _this3.$refs.pickerOptions.setConfirmIndex(displayIndexs);
+
+              // 弹出时直接设置 currentIndexs，不调用 setConfirmIndex，保持未确认状态
+              _this3.$refs.pickerOptions.confirmed = false;
+              _this3.$refs.pickerOptions.currentIndexs = displayIndexs;
+
               // 同步 currentIndexs(基于原始 options)
               _this3.currentIndexs = _this3.confirmIndexs || [];
             }
@@ -26209,20 +26215,31 @@ var multiple_picker_createNamespace = Object(utils["b" /* createNamespace */])('
       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 _this8 = this;
+      var _this9 = this;
       // 返回所有已选的数据,而不仅仅是当前显示的
       var allSelectedOptions = [];
       this.selectedValues.forEach(function (value) {
-        var option = _this8.options.find(function (opt) {
-          return _this8.getOptionValue(opt) === value;
+        var option = _this9.options.find(function (opt) {
+          return _this9.getOptionValue(opt) === value;
         });
         if (option) {
-          var originalIndex = _this8.options.findIndex(function (opt) {
-            return _this8.getOptionValue(opt) === value;
+          var originalIndex = _this9.options.findIndex(function (opt) {
+            return _this9.getOptionValue(opt) === value;
           });
           allSelectedOptions.push(_extends({}, option, {
             initialIndex: originalIndex
@@ -26232,13 +26249,15 @@ var multiple_picker_createNamespace = Object(utils["b" /* createNamespace */])('
       this.confirmIndexs = allSelectedOptions.map(function (v) {
         return v.initialIndex;
       });
+      // 确认时保存当前的 selectedValues
+      this.confirmedSelectedValues = [].concat(this.selectedValues);
       this.$emit('confirm', allSelectedOptions);
     },
     handleSelectAll: function handleSelectAll() {
-      var _this9 = this;
+      var _this10 = this;
       // 全选应该基于当前显示的 displayOptions,只选中当前搜索结果
       var displayValues = this.displayOptions.map(function (opt) {
-        return _this9.getOptionValue(opt);
+        return _this10.getOptionValue(opt);
       });
       if (!this.isAllSelected) {
         // 全选:只选中当前显示的值,清除其他值
@@ -26247,8 +26266,8 @@ var multiple_picker_createNamespace = Object(utils["b" /* createNamespace */])('
         // 更新 currentIndexs(基于原始 options)
         this.currentIndexs = [];
         this.options.forEach(function (option, index) {
-          if (displayValues.includes(_this9.getOptionValue(option))) {
-            _this9.currentIndexs.push(index);
+          if (displayValues.includes(_this10.getOptionValue(option))) {
+            _this10.currentIndexs.push(index);
           }
         });
 
@@ -26269,10 +26288,10 @@ var multiple_picker_createNamespace = Object(utils["b" /* createNamespace */])('
       }
     },
     onSelectOther: function onSelectOther() {
-      var _this10 = this;
+      var _this11 = this;
       // 反选应该基于当前显示的 displayOptions,只操作当前搜索结果
       var displayValues = this.displayOptions.map(function (opt) {
-        return _this10.getOptionValue(opt);
+        return _this11.getOptionValue(opt);
       });
 
       // 计算当前显示项中未选中的值
@@ -26289,15 +26308,15 @@ var multiple_picker_createNamespace = Object(utils["b" /* createNamespace */])('
       // 更新 currentIndexs(基于原始 options)
       this.currentIndexs = [];
       this.options.forEach(function (option, index) {
-        if (displayUnselectedValues.includes(_this10.getOptionValue(option))) {
-          _this10.currentIndexs.push(index);
+        if (displayUnselectedValues.includes(_this11.getOptionValue(option))) {
+          _this11.currentIndexs.push(index);
         }
       });
 
       // 映射到 displayOptions 的索引(反选后的状态)
       var displayIndexs = [];
       this.displayOptions.forEach(function (option, index) {
-        if (displayUnselectedValues.includes(_this10.getOptionValue(option))) {
+        if (displayUnselectedValues.includes(_this11.getOptionValue(option))) {
           displayIndexs.push(index);
         }
       });
@@ -26416,7 +26435,7 @@ var multiple_picker_createNamespace = Object(utils["b" /* createNamespace */])('
       }, [this.genOptionItems()]);
     },
     genOptionItems: function genOptionItems() {
-      var _this11 = this;
+      var _this12 = this;
       var h = this.$createElement;
       var formatOptions = [];
       var sourceOptions = this.displayOptions;
@@ -26446,7 +26465,7 @@ var multiple_picker_createNamespace = Object(utils["b" /* createNamespace */])('
         },
         "on": {
           "change": function change() {
-            _this11.onChange();
+            _this12.onChange();
           }
         }
       });
@@ -35383,7 +35402,7 @@ var uploader_createNamespace = Object(utils["b" /* createNamespace */])('uploade
 
 
 
-var es_version = '2.1.27';
+var es_version = '2.1.28';
 function install(Vue) {
   var components = [action_sheet, es_area, avatar, back_top, badge, es_button, calendar, cascader, cell, cell_group, es_checkbox, checkbox_group, col, collapse, collapse_item, count_down, datetime_picker, dialog, divider, dropdown_item, dropdown_menu, empty, es_field, fold_dialog, es_form, grid, grid_item, hierarchy_select, es_icon, es_image, image_preview, index_anchor, index_bar, es_info, lazyload, es_list, es_loading, locale["a" /* default */], media_picker, media_player, multiple_picker, nav_bar, notice_bar, number_keyboard, es_overlay, password_input, es_picker, popover, popup, pull_refresh, es_radio, radio_group, rate, row, search, signature, skeleton, slider, speech_recognizer, es_step, stepper, steps, es_sticky, swipe, swipe_cell, swipe_item, es_switch, switch_cell, tab, tabbar, tabbar_item, table, tabs, es_tag, text_ellipsis, timeline, es_toast, uploader];
   components.forEach(function (item) {