zartui 0.1.75 → 0.1.76

package/es/index.js

@@ -74,7 +74,7 @@ import Tabs from './tabs';
 import Tag from './tag';
 import Toast from './toast';
 import Uploader from './uploader';
-var version = '0.1.75';
+var version = '0.1.76';
 
 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, PdfViewer, Picker, Popover, Popup, PullRefresh, Radio, RadioGroup, Rate, Row, Search, Signature, Skeleton, Slider, Step, Stepper, Steps, Sticky, Swipe, SwipeCell, SwipeItem, Switch, SwitchCell, Tab, Tabbar, TabbarItem, Table, Tabs, Tag, Toast, Uploader];

package/es/multiple-picker/MultiplePickerOptions.js

@@ -34,7 +34,8 @@ export default createComponent({
   data: function data() {
     return {
       options: deepClone(this.initialOptions),
-      currentIndexs: []
+      currentIndexs: [],
+      confirmed: false
     };
   },
   watch: {
@@ -62,6 +63,10 @@ export default createComponent({
       }
     },
     setDefaultIndexs: function setDefaultIndexs() {
+      if (this.confirmed) {
+        return;
+      }
+
       this.currentIndexs = deepClone(this.defaultIndexs);
     },
     onClickItem: function onClickItem(index) {
@@ -144,6 +149,10 @@ export default createComponent({
         };
         return h("div", _mergeJSXProps2([{}, data]), [_this2.slots('option', option) || h("div", _mergeJSXProps([{}, childData]))]);
       });
+    },
+    setConfirmIndex: function setConfirmIndex(indexs) {
+      this.confirmed = true;
+      this.currentIndexs = deepClone(indexs);
     }
   },
   render: function render() {

package/es/multiple-picker/index.js

@@ -48,7 +48,25 @@ export default createComponent({
     }
   }),
   data: function data() {
-    return {};
+    return {
+      confirmIndexs: []
+    };
+  },
+  watch: {
+    showPicker: {
+      handler: function handler(val) {
+        var _this = this;
+
+        if (val) {
+          this.$nextTick(function () {
+            if (_this.$refs.pickerOptions && _this.confirmIndexs && _this.confirmIndexs.length) {
+              _this.$refs.pickerOptions.setConfirmIndex(_this.confirmIndexs);
+            }
+          });
+        }
+      },
+      immediate: true
+    }
   },
   computed: {
     itemPxHeight: function itemPxHeight() {
@@ -65,12 +83,14 @@ export default createComponent({
       this.$emit(event, this.getOptions());
     },
     getOptions: function getOptions() {
-      var _this = this;
+      var _this2 = this;
 
       var indexs = this.$refs.pickerOptions.currentIndexs;
       var result = [];
       indexs.forEach(function (index) {
-        result.push(_this.options[index]);
+        result.push(_extends({}, _this2.options[index], {
+          initialIndex: index
+        }));
       });
       return result;
     },
@@ -81,7 +101,11 @@ export default createComponent({
       this.emit('cancel');
     },
     confirm: function confirm() {
-      this.emit('confirm', this.getOptions());
+      var options = this.getOptions();
+      this.confirmIndexs = options.map(function (v) {
+        return v.initialIndex;
+      });
+      this.emit('confirm', options);
     },
     genTitle: function genTitle() {
       var h = this.$createElement;
@@ -148,7 +172,7 @@ export default createComponent({
       }, [this.genOptionItems()]);
     },
     genOptionItems: function genOptionItems() {
-      var _this2 = this;
+      var _this3 = this;
 
       var h = this.$createElement;
       var formatOptions = [];
@@ -180,7 +204,7 @@ export default createComponent({
         },
         "on": {
           "change": function change() {
-            _this2.onChange();
+            _this3.onChange();
           }
         }
       });

package/es/picker/PickerColumn.js

@@ -51,7 +51,8 @@ export default createComponent({
       offset: 0,
       duration: 0,
       options: deepClone(this.initialOptions),
-      currentIndex: this.defaultIndex
+      currentIndex: this.defaultIndex,
+      confirmIndex: ""
     };
   },
   created: function created() {
@@ -276,6 +277,12 @@ export default createComponent({
         };
         return h("li", _mergeJSXProps2([{}, data]), [_this3.slots('option', option) || h("div", _mergeJSXProps([{}, childData]))]);
       });
+    },
+    recordConfirmIndex: function recordConfirmIndex() {
+      this.confirmIndex = this.currentIndex;
+    },
+    setConfirmIndex: function setConfirmIndex() {
+      this.setIndex(this.confirmIndex, true);
     }
   },
   render: function render() {

package/es/picker/index.js

@@ -48,7 +48,8 @@ export default createComponent({
   data: function data() {
     return {
       children: [],
-      formattedColumns: []
+      formattedColumns: [],
+      confirmIndex: ""
     };
   },
   computed: {
@@ -74,6 +75,22 @@ export default createComponent({
     columns: {
       handler: 'format',
       immediate: true
+    },
+    showPicker: {
+      handler: function handler(val) {
+        var _this = this;
+
+        if (val) {
+          this.$nextTick(function () {
+            _this.children.forEach(function (child) {
+              if (child.confirmIndex !== "") {
+                child.setConfirmIndex();
+              }
+            });
+          });
+        }
+      },
+      immediate: true
     }
   },
   methods: {
@@ -129,7 +146,7 @@ export default createComponent({
       this.formattedColumns = formatted;
     },
     emit: function emit(event) {
-      var _this = this;
+      var _this2 = this;
 
       if (this.dataType === 'text') {
         this.$emit(event, this.getColumnValue(0), this.getColumnIndex(0));
@@ -140,7 +157,7 @@ export default createComponent({
 
         if (this.dataType === 'cascade') {
           values = values.map(function (item) {
-            return item[_this.valueKey];
+            return item[_this2.valueKey];
           });
         }
 
@@ -164,7 +181,7 @@ export default createComponent({
       }
     },
     onChange: function onChange(columnIndex) {
-      var _this2 = this;
+      var _this3 = this;
 
       if (this.dataType === 'cascade') {
         this.onCascadeChange(columnIndex);
@@ -179,7 +196,7 @@ export default createComponent({
 
         if (this.dataType === 'cascade') {
           values = values.map(function (item) {
-            return item[_this2.valueKey];
+            return item[_this3.valueKey];
           });
         }
 
@@ -254,10 +271,10 @@ export default createComponent({
     // @exposed-api
     // set values of all columns
     setValues: function setValues(values) {
-      var _this3 = this;
+      var _this4 = this;
 
       values.forEach(function (value, index) {
-        _this3.setColumnValue(index, value);
+        _this4.setColumnValue(index, value);
       });
     },
     // @exposed-api
@@ -270,10 +287,10 @@ export default createComponent({
     // @exposed-api
     // set indexes of all columns
     setIndexes: function setIndexes(indexes) {
-      var _this4 = this;
+      var _this5 = this;
 
       indexes.forEach(function (optionIndex, columnIndex) {
-        _this4.setColumnIndex(columnIndex, optionIndex);
+        _this5.setColumnIndex(columnIndex, optionIndex);
       });
     },
     // @exposed-api
@@ -281,6 +298,9 @@ export default createComponent({
       this.children.forEach(function (child) {
         return child.stopMomentum();
       });
+      this.children.forEach(function (child) {
+        return child.recordConfirmIndex();
+      });
       this.emit('confirm');
     },
     cancel: function cancel() {
@@ -375,7 +395,7 @@ export default createComponent({
       })]);
     },
     genColumnItems: function genColumnItems() {
-      var _this5 = this;
+      var _this6 = this;
 
       var h = this.$createElement;
       return this.formattedColumns.map(function (item, columnIndex) {
@@ -383,23 +403,23 @@ export default createComponent({
 
         return h(PickerColumn, {
           "attrs": {
-            "columnCollector": _this5.children,
-            "readonly": _this5.readonly,
-            "valueKey": _this5.valueKey,
-            "allowHtml": _this5.allowHtml,
+            "columnCollector": _this6.children,
+            "readonly": _this6.readonly,
+            "valueKey": _this6.valueKey,
+            "allowHtml": _this6.allowHtml,
             "className": item.className,
-            "itemHeight": _this5.itemPxHeight,
-            "defaultIndex": (_item$defaultIndex = item.defaultIndex) != null ? _item$defaultIndex : +_this5.defaultIndex,
-            "swipeDuration": _this5.swipeDuration,
-            "visibleItemCount": _this5.visibleItemCount,
+            "itemHeight": _this6.itemPxHeight,
+            "defaultIndex": (_item$defaultIndex = item.defaultIndex) != null ? _item$defaultIndex : +_this6.defaultIndex,
+            "swipeDuration": _this6.swipeDuration,
+            "visibleItemCount": _this6.visibleItemCount,
             "initialOptions": item.values
           },
           "scopedSlots": {
-            option: _this5.$scopedSlots.option
+            option: _this6.$scopedSlots.option
           },
           "on": {
             "change": function change() {
-              _this5.onChange(columnIndex);
+              _this6.onChange(columnIndex);
             }
           }
         });