zartui 1.0.2 → 1.0.4

package/es/datetime-picker/DatePicker.js

@@ -51,7 +51,7 @@ export default createComponent({
     value: function value(val) {
       val = this.formatValue(val);
 
-      if (val && val.valueOf() !== this.innerValue.valueOf()) {
+      if (val && this.innerValue && val.valueOf() !== this.innerValue.valueOf() || val && !this.innerValue) {
         this.innerValue = val;
       }
     }
@@ -123,6 +123,15 @@ export default createComponent({
     formatValue: function formatValue(value) {
       var _this2 = this;
 
+      if (typeof value === "string") {
+        try {
+          value = new Date(value);
+        } catch (err) {
+          console.error("formatValue fail", value);
+          return null;
+        }
+      }
+
       if (!isDate(value)) {
         return null;
       }
@@ -283,7 +292,13 @@ export default createComponent({
     updateColumnValue: function updateColumnValue() {
       var _this5 = this;
 
-      var value = this.innerValue ? this.innerValue : this.minDate;
+      var defaultValue = new Date();
+
+      if (defaultValue.getTime() < this.minDate.getTime() || defaultValue.getTime() > this.maxDate.getTime()) {
+        defaultValue = this.minDate;
+      }
+
+      var value = this.innerValue ? this.innerValue : defaultValue;
       var formatter = this.formatter;
       var values = this.originColumns.map(function (column) {
         switch (column.type) {

package/es/datetime-picker/shared.js

@@ -144,12 +144,13 @@ export var TimePickerMixin = {
       props[key] = _this5[key];
     });
     return h(Picker, {
-      "ref": "picker",
       "attrs": {
+        "show-picker": this.showPicker,
         "headers": this.headers,
         "columns": this.columns,
         "readonly": this.readonly
       },
+      "ref": "picker",
       "scopedSlots": this.$scopedSlots,
       "on": {
         "change": this.onChange,

package/es/divider/index.js

@@ -8,15 +8,8 @@ var _createNamespace = createNamespace('divider'),
     bem = _createNamespace[1];
 
 function Divider(h, props, slots, ctx) {
-  var _bem, _console$log, _bem2;
+  var _bem;
 
-  console.log(bem((_bem = {
-    dashed: props.dashed,
-    hairline: props.hairline
-  }, _bem["content-" + props.contentPosition] = slots.default, _bem)), (_console$log = {
-    dashed: props.dashed,
-    hairline: props.hairline
-  }, _console$log["content-" + props.contentPosition] = slots.default, _console$log));
   return h("div", _mergeJSXProps([{
     "attrs": {
       "role": "separator"
@@ -24,10 +17,10 @@ function Divider(h, props, slots, ctx) {
     "style": {
       borderColor: props.borderColor
     },
-    "class": bem((_bem2 = {
+    "class": bem((_bem = {
       dashed: props.dashed,
       hairline: props.hairline
-    }, _bem2["content-" + props.contentPosition] = slots.default, _bem2))
+    }, _bem["content-" + props.contentPosition] = slots.default, _bem))
   }, inherit(ctx, true)]), [slots.default && slots.default()]);
 }
 

package/es/hierarchy-select/breadcrumb.js

@@ -29,6 +29,10 @@ export default createComponent({
   },
   methods: {
     chooseSenior: function chooseSenior(index) {
+      if (this.data.length === index + 1) {
+        return;
+      }
+
       this.$emit("chooseSenior", index);
     }
   },

package/es/hierarchy-select/hierarchySelect.js

@@ -155,7 +155,8 @@ export default createComponent({
         "disableParent": this.disableParent,
         "valueKey": this.valueKey,
         "textKey": this.textKey,
-        "confirmedList": this.confirmedList
+        "confirmedList": this.confirmedList,
+        "asyncGetter": this.asyncGetter
       },
       "on": {
         "clickNext": this.clickNext,

package/es/hierarchy-select/markList.js

@@ -42,6 +42,10 @@ export default createComponent({
       default: function _default() {
         return [];
       }
+    },
+    asyncGetter: {
+      type: Function,
+      default: null
     }
   },
   data: function data() {
@@ -62,8 +66,17 @@ export default createComponent({
         index: index
       });
     },
+    isDisabled: function isDisabled(item) {
+      if (this.asyncGetter && this.disableParent && item.children) {
+        return true;
+      }
+
+      if (!this.asyncGetter && this.disableParent && item.children && item.children.length) {
+        return true;
+      }
+    },
     selected: function selected(item) {
-      if (this.disableParent && item.children) {
+      if (this.isDisabled(item)) {
         return;
       }
 
@@ -103,6 +116,10 @@ export default createComponent({
     multipleClicked: function multipleClicked(item) {
       var _this2 = this;
 
+      if (this.isDisabled(item)) {
+        return;
+      }
+
       item = deepClone(item);
 
       if (this.checkedList && this.checkedList.length) {
@@ -174,6 +191,10 @@ export default createComponent({
   render: function render(h) {
     var _this4 = this;
 
+    var showSub = function showSub(item) {
+      return _this4.asyncGetter && item && item.children || !_this4.asyncGetter && item && item.children && item.children.length;
+    };
+
     return h("div", {
       "class": bem()
     }, [this.dataList.map(function (item, index) {
@@ -201,7 +222,7 @@ export default createComponent({
             _this4.toNextLevel(item, index);
           }
         }
-      }, [item && item.children ? h("div", {
+      }, [showSub(item) ? h("div", {
         "class": bem("sub-level", _this4.getChecked(item) ? 'disable' : '')
       }, [h(SubIcon, {
         "class": bem("sub-icon")

package/es/index.js

@@ -76,7 +76,7 @@ import Tag from './tag';
 import Timeline from './timeline';
 import Toast from './toast';
 import Uploader from './uploader';
-var version = '1.0.2';
+var version = '1.0.4';
 
 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, PdfViewerV2, 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, Timeline, Toast, Uploader];

package/es/media-picker/index.js

@@ -91,10 +91,6 @@ export default createComponent({
       type: Number,
       default: Number.MAX_VALUE
     },
-    maxFileCount: {
-      type: Number,
-      default: Number.MAX_VALUE
-    },
     allowTakePhoto: {
       type: Boolean,
       default: true

package/es/pdf-viewer-v2/index.css

@@ -1 +1 @@
-.zt-pdf-viewer-v2{width:100%;height:100%;position:relative}.zt-pdf-viewer-v2::-webkit-scrollbar{width:0;height:0}.zt-pdf-viewer-v2__page-box{width:100%;height:44px;background-color:#fff;position:fixed;bottom:0;left:0;text-align:center;font-size:16px;line-height:44px}.zt-pdf-viewer-v2__page-box .zt-pdf-viewer-v2__next,.zt-pdf-viewer-v2__page-box .zt-pdf-viewer-v2__pre{cursor:pointer;color:#3a90f6}.zt-pdf-viewer-v2__page-box .zt-pdf-viewer-v2__page{margin:0 10px}.zt-pdf-viewer-v2 .zt-loading{position:absolute;top:50%;left:50%;margin-left:-18px;margin-top:-18px}
+.zt-pdf-viewer-v2{width:100%;height:100%;position:relative;display:-webkit-box;display:-webkit-flex;display:flex;-webkit-box-orient:vertical;-webkit-box-direction:normal;-webkit-flex-direction:column;flex-direction:column}.zt-pdf-viewer-v2__inner-container{height:calc(100% - 44px);overflow:scroll}.zt-pdf-viewer-v2__container{height:100%}.zt-pdf-viewer-v2::-webkit-scrollbar{width:0;height:0}.zt-pdf-viewer-v2__page-box{width:100%;height:44px;background-color:#fff;text-align:center;font-size:16px;line-height:44px}.zt-pdf-viewer-v2__page-box .zt-pdf-viewer-v2__next,.zt-pdf-viewer-v2__page-box .zt-pdf-viewer-v2__pre{cursor:pointer;color:#3a90f6}.zt-pdf-viewer-v2__page-box .zt-pdf-viewer-v2__page{margin:0 10px}.zt-pdf-viewer-v2 .zt-loading{position:absolute;top:50%;left:50%;margin-left:-18px;margin-top:-18px}

package/es/pdf-viewer-v2/index.js

@@ -138,8 +138,7 @@ export default createComponent({
       var _this2 = this;
 
       if (!this.PDFJS) {
-        this.PDFJS = window['pdfjs-dist/build/pdf'];
-        console.log("window['pdfjs-dist/build/pdf']", window['pdfjs-dist/build/pdf']);
+        this.PDFJS = window['pdfjs-dist/build/pdf'] || window.pdfjsLib;
 
         if (this.PDFJS && this.PDFJS.GlobalWorkerOptions) {
           this.PDFJS.GlobalWorkerOptions.workerSrc = require("pdfjs-dist/build/pdf.worker.entry");
@@ -199,6 +198,8 @@ export default createComponent({
     return h("div", {
       "class": bem(),
       "ref": "pdfContainer"
+    }, [h("div", {
+      "class": bem("inner-container")
     }, [h(Loading, {
       "directives": [{
         name: "show",
@@ -212,7 +213,7 @@ export default createComponent({
       }],
       "ref": "pdfViewerContainer",
       "class": bem("container")
-    }), this.totalPage ? h("div", {
+    })]), this.totalPage ? h("div", {
       "class": bem("page-box")
     }, [h("span", {
       "class": bem("pre"),

package/es/pdf-viewer-v2/index.less

@@ -3,6 +3,17 @@
     width: 100%;
     height: 100%;
     position: relative;
+    display: flex;
+    flex-direction: column;
+
+    &__inner-container {
+        height: calc(100% - 44px);
+        overflow: scroll;
+    }
+
+    &__container {
+        height: 100%;
+    }
 
     &::-webkit-scrollbar {
         width: 0;
@@ -13,9 +24,6 @@
         width: 100%;
         height: 44px;
         background-color: #fff;
-        position: fixed;
-        bottom: 0;
-        left: 0;
         text-align: center;
         font-size: 16px;
         line-height: 44px;

package/es/picker/PickerColumn.js

@@ -282,7 +282,11 @@ export default createComponent({
       this.confirmIndex = this.currentIndex;
     },
     setConfirmIndex: function setConfirmIndex() {
-      this.setIndex(this.confirmIndex, true);
+      if (this.confirmIndex || this.confirmIndex === 0) {
+        this.setIndex(this.confirmIndex, true);
+      } else {
+        this.setIndex(this.defaultIndex, true);
+      }
     }
   },
   render: function render() {

package/es/picker/index.js

@@ -83,9 +83,7 @@ export default createComponent({
         if (val) {
           this.$nextTick(function () {
             _this.children.forEach(function (child) {
-              if (child.confirmIndex !== "") {
-                child.setConfirmIndex();
-              }
+              child.setConfirmIndex();
             });
           });
         }

package/lib/datetime-picker/DatePicker.js

@@ -65,7 +65,7 @@ var _default2 = createComponent({
     value: function value(val) {
       val = this.formatValue(val);
 
-      if (val && val.valueOf() !== this.innerValue.valueOf()) {
+      if (val && this.innerValue && val.valueOf() !== this.innerValue.valueOf() || val && !this.innerValue) {
         this.innerValue = val;
       }
     }
@@ -137,6 +137,15 @@ var _default2 = createComponent({
     formatValue: function formatValue(value) {
       var _this2 = this;
 
+      if (typeof value === "string") {
+        try {
+          value = new Date(value);
+        } catch (err) {
+          console.error("formatValue fail", value);
+          return null;
+        }
+      }
+
       if (!(0, _date.isDate)(value)) {
         return null;
       }
@@ -297,7 +306,13 @@ var _default2 = createComponent({
     updateColumnValue: function updateColumnValue() {
       var _this5 = this;
 
-      var value = this.innerValue ? this.innerValue : this.minDate;
+      var defaultValue = new Date();
+
+      if (defaultValue.getTime() < this.minDate.getTime() || defaultValue.getTime() > this.maxDate.getTime()) {
+        defaultValue = this.minDate;
+      }
+
+      var value = this.innerValue ? this.innerValue : defaultValue;
       var formatter = this.formatter;
       var values = this.originColumns.map(function (column) {
         switch (column.type) {

package/lib/datetime-picker/shared.js

@@ -158,12 +158,13 @@ var TimePickerMixin = {
       props[key] = _this5[key];
     });
     return h(_picker.default, {
-      "ref": "picker",
       "attrs": {
+        "show-picker": this.showPicker,
         "headers": this.headers,
         "columns": this.columns,
         "readonly": this.readonly
       },
+      "ref": "picker",
       "scopedSlots": this.$scopedSlots,
       "on": {
         "change": this.onChange,

package/lib/divider/index.js

@@ -17,15 +17,8 @@ var _createNamespace = (0, _utils.createNamespace)('divider'),
     bem = _createNamespace[1];
 
 function Divider(h, props, slots, ctx) {
-  var _bem, _console$log, _bem2;
-
-  console.log(bem((_bem = {
-    dashed: props.dashed,
-    hairline: props.hairline
-  }, _bem["content-" + props.contentPosition] = slots.default, _bem)), (_console$log = {
-    dashed: props.dashed,
-    hairline: props.hairline
-  }, _console$log["content-" + props.contentPosition] = slots.default, _console$log));
+  var _bem;
+
   return h("div", (0, _babelHelperVueJsxMergeProps.default)([{
     "attrs": {
       "role": "separator"
@@ -33,10 +26,10 @@ function Divider(h, props, slots, ctx) {
     "style": {
       borderColor: props.borderColor
     },
-    "class": bem((_bem2 = {
+    "class": bem((_bem = {
       dashed: props.dashed,
       hairline: props.hairline
-    }, _bem2["content-" + props.contentPosition] = slots.default, _bem2))
+    }, _bem["content-" + props.contentPosition] = slots.default, _bem))
   }, (0, _functional.inherit)(ctx, true)]), [slots.default && slots.default()]);
 }
 

package/lib/hierarchy-select/breadcrumb.js

@@ -37,6 +37,10 @@ var _default2 = createComponent({
   },
   methods: {
     chooseSenior: function chooseSenior(index) {
+      if (this.data.length === index + 1) {
+        return;
+      }
+
       this.$emit("chooseSenior", index);
     }
   },

package/lib/hierarchy-select/hierarchySelect.js

@@ -168,7 +168,8 @@ var _default2 = createComponent({
         "disableParent": this.disableParent,
         "valueKey": this.valueKey,
         "textKey": this.textKey,
-        "confirmedList": this.confirmedList
+        "confirmedList": this.confirmedList,
+        "asyncGetter": this.asyncGetter
       },
       "on": {
         "clickNext": this.clickNext,

package/lib/hierarchy-select/markList.js

@@ -52,6 +52,10 @@ var _default2 = createComponent({
       default: function _default() {
         return [];
       }
+    },
+    asyncGetter: {
+      type: Function,
+      default: null
     }
   },
   data: function data() {
@@ -72,8 +76,17 @@ var _default2 = createComponent({
         index: index
       });
     },
+    isDisabled: function isDisabled(item) {
+      if (this.asyncGetter && this.disableParent && item.children) {
+        return true;
+      }
+
+      if (!this.asyncGetter && this.disableParent && item.children && item.children.length) {
+        return true;
+      }
+    },
     selected: function selected(item) {
-      if (this.disableParent && item.children) {
+      if (this.isDisabled(item)) {
         return;
       }
 
@@ -113,6 +126,10 @@ var _default2 = createComponent({
     multipleClicked: function multipleClicked(item) {
       var _this2 = this;
 
+      if (this.isDisabled(item)) {
+        return;
+      }
+
       item = (0, _deepClone.deepClone)(item);
 
       if (this.checkedList && this.checkedList.length) {
@@ -184,6 +201,10 @@ var _default2 = createComponent({
   render: function render(h) {
     var _this4 = this;
 
+    var showSub = function showSub(item) {
+      return _this4.asyncGetter && item && item.children || !_this4.asyncGetter && item && item.children && item.children.length;
+    };
+
     return h("div", {
       "class": bem()
     }, [this.dataList.map(function (item, index) {
@@ -211,7 +232,7 @@ var _default2 = createComponent({
             _this4.toNextLevel(item, index);
           }
         }
-      }, [item && item.children ? h("div", {
+      }, [showSub(item) ? h("div", {
         "class": bem("sub-level", _this4.getChecked(item) ? 'disable' : '')
       }, [h(_SubIcon.default, {
         "class": bem("sub-icon")