zartui 1.0.12 → 1.0.14

package/es/cascader/index.js

@@ -146,7 +146,9 @@ export default createComponent({
         this.tabs = this.tabs.slice(0, tabIndex + 1);
       }
 
-      if (option[this.childrenKey]) {
+      var hasChildren = option[this.childrenKey] && option[this.childrenKey].length > 0;
+
+      if (hasChildren) {
         var nextTab = {
           options: option[this.childrenKey],
           selectedOption: null
@@ -176,7 +178,7 @@ export default createComponent({
       this.$emit('input', option[this.valueKey]);
       this.$emit('change', eventParams);
 
-      if (!option[this.childrenKey]) {
+      if (!hasChildren) {
         this.$emit('finish', eventParams);
       }
     },

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.12';
+var version = '1.0.14';
 
 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/pdf-viewer-v2/index.css

@@ -1 +1 @@
-.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}
+.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{-webkit-box-flex:1;-webkit-flex:1;flex:1;overflow:scroll}.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

@@ -6,15 +6,20 @@ var _createNamespace = createNamespace('pdf-viewer-v2'),
 
 import Toast from '../toast';
 import Loading from '../loading';
+import Picker from '../picker';
 import { resetObject } from "../utils/index";
 
+var _ = require('lodash');
+
 var defaultData = function defaultData() {
   return {
     pdfDocRef: null,
     totalPage: 0,
     currentPage: 1,
     loading: false,
-    PDFJS: null
+    PDFJS: null,
+    pageChangeByButton: false,
+    showPicker: false
   };
 };
 
@@ -123,6 +128,8 @@ export default createComponent({
     * @param pdfDoc pdf文档
     */
     renderPdfCanvas: function renderPdfCanvas(pdfViewerDom, pdfDoc) {
+      var _this2 = this;
+
       // 清除原来的pdf画布
       pdfViewerDom.innerHTML = ""; // 获取总页数
 
@@ -133,9 +140,63 @@ export default createComponent({
         // 循环处理pdf的每页
         this.renderPdfOnePage(pdfViewerDom, pdfDoc, i);
       }
+
+      this.$nextTick(function () {
+        _this2.bindScrollEvent();
+      });
+    },
+    bindScrollEvent: function bindScrollEvent() {
+      var _this3 = this;
+
+      var element = document.getElementById("pdfContainer");
+
+      var scrollEvent = _.throttle(function () {
+        if (_this3.pageChangeByButton) {
+          _this3.pageChangeByButton = false;
+          return;
+        }
+
+        if (element.scrollTop === 0) {
+          _this3.currentPage = 1;
+          return;
+        }
+
+        var i = 1,
+            count = _this3.totalPage;
+        var offsetHeight = element.offsetHeight;
+
+        do {
+          var start = _this3.findPos(document.getElementById("pdfCanvas" + i));
+
+          var end = start + document.getElementById("pdfCanvas" + i).offsetHeight;
+
+          if (element.scrollTop + offsetHeight >= start && element.scrollTop + offsetHeight <= end) {
+            _this3.currentPage = i;
+            break;
+          }
+
+          if (i === count && element.scrollTop + offsetHeight > end) {
+            _this3.currentPage = i;
+            break;
+          }
+
+          i++;
+        } while (i < count + 1);
+      }, 500);
+
+      element.addEventListener("scroll", function () {
+        scrollEvent();
+      });
+    },
+    findPos: function findPos(obj) {
+      if (obj) {
+        return obj.offsetTop;
+      } else {
+        return 0;
+      }
     },
     renderPdf: function renderPdf() {
-      var _this2 = this;
+      var _this4 = this;
 
       if (!this.PDFJS) {
         this.PDFJS = window['pdfjs-dist/build/pdf'] || window.pdfjsLib;
@@ -161,16 +222,14 @@ export default createComponent({
         pdfLoadingTask.promise.then(function (pdfDoc) {
           if (pdfDoc && pdfViewerDom) {
             // 缓存pdf内容
-            _this2.pdfDocRef = pdfDoc;
+            _this4.pdfDocRef = pdfDoc;
 
-            _this2.renderPdfCanvas(pdfViewerDom, pdfDoc);
+            _this4.renderPdfCanvas(pdfViewerDom, pdfDoc);
           }
         });
       }
     },
-    changePage: function changePage(count) {
-      var page = this.currentPage + count;
-
+    changePage: function changePage(page) {
       if (page < 1) {
         Toast("已经是首页");
         return;
@@ -181,17 +240,42 @@ export default createComponent({
         return;
       }
 
+      this.pageChangeByButton = true;
+
       if (document.getElementById("pdfCanvas" + page)) {
-        document.getElementById("pdfCanvas" + page).scrollIntoView(false);
+        document.getElementById("pdfCanvas" + page).scrollIntoView({
+          block: "end",
+          inline: "nearest"
+        });
       }
 
       this.currentPage = page;
     },
     clickPre: function clickPre() {
-      this.changePage(-1);
+      this.changePage(this.currentPage - 1);
     },
     clickNext: function clickNext() {
-      this.changePage(1);
+      this.changePage(this.currentPage + 1);
+    },
+    showPagePicker: function showPagePicker() {
+      this.showPicker = true;
+    },
+    setPage: function setPage(i) {
+      this.changePage(i);
+      this.showPicker = false;
+    },
+    cancel: function cancel() {
+      this.showPicker = false;
+    },
+    getPageList: function getPageList() {
+      var total = this.totalPage;
+      var arr = [];
+
+      for (var i = 1; i <= total; i++) {
+        arr.push(i);
+      }
+
+      return arr;
     }
   },
   render: function render(h) {
@@ -199,7 +283,10 @@ export default createComponent({
       "class": bem(),
       "ref": "pdfContainer"
     }, [h("div", {
-      "class": bem("inner-container")
+      "class": bem("inner-container"),
+      "attrs": {
+        "id": "pdfContainer"
+      }
     }, [h(Loading, {
       "directives": [{
         name: "show",
@@ -221,12 +308,26 @@ export default createComponent({
         "click": this.clickPre
       }
     }, ["<"]), h("span", {
-      "class": bem("page")
-    }, [this.currentPage, "/", this.totalPage]), h("span", {
+      "class": bem("page"),
+      "on": {
+        "click": this.showPagePicker
+      }
+    }, [this.currentPage, " / ", this.totalPage]), h("span", {
       "class": bem("next"),
       "on": {
         "click": this.clickNext
       }
-    }, [">"])]) : h()]);
+    }, [">"])]) : h(), h(Picker, {
+      "attrs": {
+        "show-picker": this.showPicker,
+        "default-index": this.currentPage - 1,
+        "title": "页码",
+        "columns": this.getPageList()
+      },
+      "on": {
+        "cancel": this.cancel,
+        "confirm": this.setPage
+      }
+    })]);
   }
 });

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

@@ -7,14 +7,10 @@
     flex-direction: column;
 
     &__inner-container {
-        height: calc(100% - 44px);
+        flex: 1;
         overflow: scroll;
     }
 
-    &__container {
-        height: 100%;
-    }
-
     &::-webkit-scrollbar {
         width: 0;
         height: 0;

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

@@ -5,4 +5,5 @@ import '../../icon/index.css';
 import '../../popup/index.css';
 import '../../loading/index.css';
 import '../../toast/index.css';
+import '../../picker/index.css';
 import '../index.css';

package/es/pdf-viewer-v2/style/less.js

@@ -5,4 +5,5 @@ import '../../icon/index.less';
 import '../../popup/index.less';
 import '../../loading/index.less';
 import '../../toast/index.less';
+import '../../picker/index.less';
 import '../index.less';

package/lib/cascader/index.js

@@ -157,7 +157,9 @@ var _default2 = createComponent({
         this.tabs = this.tabs.slice(0, tabIndex + 1);
       }
 
-      if (option[this.childrenKey]) {
+      var hasChildren = option[this.childrenKey] && option[this.childrenKey].length > 0;
+
+      if (hasChildren) {
         var nextTab = {
           options: option[this.childrenKey],
           selectedOption: null
@@ -187,7 +189,7 @@ var _default2 = createComponent({
       this.$emit('input', option[this.valueKey]);
       this.$emit('change', eventParams);
 
-      if (!option[this.childrenKey]) {
+      if (!hasChildren) {
         this.$emit('finish', eventParams);
       }
     },