zartui 1.0.19 → 1.0.21

package/lib/index.js

@@ -54,6 +54,10 @@ var _checkboxGroup = _interopRequireDefault(require("./checkbox-group"));
 
 exports.CheckboxGroup = _checkboxGroup.default;
 
+var _circle = _interopRequireDefault(require("./circle"));
+
+exports.Circle = _circle.default;
+
 var _col = _interopRequireDefault(require("./col"));
 
 exports.Col = _col.default;
@@ -317,11 +321,11 @@ exports.Toast = _toast.default;
 var _uploader = _interopRequireDefault(require("./uploader"));
 
 exports.Uploader = _uploader.default;
-var version = '1.0.19';
+var version = '1.0.21';
 exports.version = version;
 
 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, _pdfViewer.default, _pdfViewerV.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, _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, _timeline.default, _toast.default, _uploader.default];
+  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, _circle.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, _pdfViewer.default, _pdfViewerV.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, _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, _timeline.default, _toast.default, _uploader.default];
   components.forEach(function (item) {
     if (item.install) {
       Vue.use(item);

package/lib/index.less

@@ -34,7 +34,6 @@
 @import "./dialog/index.less";
 @import "./calendar/index.less";
 @import "./picker/index.less";
-@import "./pdf-viewer-v2/index.less";
 @import "./pdf-viewer/index.less";
 @import "./action-sheet/index.less";
 @import "./avatar/index.less";
@@ -48,6 +47,8 @@
 @import "./cascader/index.less";
 @import "./cell-group/index.less";
 @import "./checkbox-group/index.less";
+@import "./circle/index.less";
+@import "./pdf-viewer-v2/index.less";
 @import "./col/index.less";
 @import "./count-down/index.less";
 @import "./empty/index.less";

package/lib/media-picker/index.js

@@ -508,6 +508,8 @@ var _default2 = createComponent({
               address: _this4.watermarkOptions.address || "",
               humanName: _this4.watermarkOptions.humanName || "",
               projectName: _this4.watermarkOptions.projectName || "",
+              logo: _this4.watermarkOptions.logo || "",
+              applicationName: _this4.watermarkOptions.applicationName || "",
               watermarkTime: new Date()
             }
           });

package/lib/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-body{height:calc(100% - 44px);overflow:hidden}.zt-pdf-viewer-v2__inner-container{height:100%;overflow:scroll}.zt-pdf-viewer-v2::-webkit-scrollbar{width:0;height:0}.zt-pdf-viewer-v2__page-box{position:absolute;left:0;right:0;bottom:0;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-body{height:calc(100% - 44px);overflow:hidden}.zt-pdf-viewer-v2__inner-container{height:100%;overflow:scroll}.zt-pdf-viewer-v2::-webkit-scrollbar{width:0;height:0}.zt-pdf-viewer-v2__page-box{position:absolute;left:0;right:0;bottom:0;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__loadding-circle{position:absolute;width:100%;height:100%;display:-webkit-box;display:-webkit-flex;display:flex;-webkit-box-align:center;-webkit-align-items:center;align-items:center;-webkit-box-pack:center;-webkit-justify-content:center;justify-content:center}

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

@@ -11,6 +11,8 @@ var _toast = _interopRequireDefault(require("../toast"));
 
 var _loading = _interopRequireDefault(require("../loading"));
 
+var _circle = _interopRequireDefault(require("../circle"));
+
 var _picker = _interopRequireDefault(require("../picker"));
 
 var _index = require("../utils/index");
@@ -29,7 +31,11 @@ var defaultData = function defaultData() {
     loading: false,
     PDFJS: null,
     pageChangeByButton: false,
-    showPicker: false
+    showPicker: false,
+    // 进度范围：0~100
+    progress: 0,
+    // circle绑定值
+    circleProgress: 0
   };
 };
 
@@ -59,7 +65,8 @@ var _default2 = createComponent({
       default: function _default() {
         return {};
       }
-    }
+    },
+    showProgress: Boolean
   },
   data: function data() {
     return defaultData();
@@ -235,6 +242,14 @@ var _default2 = createComponent({
           cMapUrl: this.cMapUrl,
           cMapPacked: true
         });
+
+        pdfLoadingTask.onProgress = function (progressData) {
+          // 返回的进度可能会超过100
+          _this4.progress = Math.min(100, Math.floor(progressData.loaded * 100 / progressData.total));
+
+          _this4.$emit('progress', _this4.progress);
+        };
+
         pdfLoadingTask.promise.then(function (pdfDoc) {
           if (pdfDoc && pdfViewerDom) {
             // 缓存pdf内容
@@ -295,6 +310,8 @@ var _default2 = createComponent({
     }
   },
   render: function render(h) {
+    var _this5 = this;
+
     return h("div", {
       "class": bem(),
       "ref": "pdfContainer"
@@ -308,7 +325,7 @@ var _default2 = createComponent({
     }, [h(_loading.default, {
       "directives": [{
         name: "show",
-        value: this.loading
+        value: !this.showProgress && this.loading
       }],
       "class": bem('loading-icon')
     }), h("div", {
@@ -318,7 +335,21 @@ var _default2 = createComponent({
       }],
       "ref": "pdfViewerContainer",
       "class": bem("container")
-    })])]), this.totalPage ? h("div", {
+    })])]), this.showProgress && this.progress < 100 ? h("div", {
+      "class": bem("loadding-circle")
+    }, [h(_circle.default, {
+      "attrs": {
+        "rate": this.progress,
+        "speed": "100",
+        "text": this.progress + '%'
+      },
+      "model": {
+        value: _this5.circleProgress,
+        callback: function callback($$v) {
+          _this5.circleProgress = $$v;
+        }
+      }
+    })]) : "", this.totalPage ? h("div", {
       "class": bem("page-box")
     }, [h("span", {
       "class": bem("pre"),

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

@@ -49,4 +49,13 @@
         margin-left: -18px;
         margin-top: -18px;
     }
+
+    &__loadding-circle {
+        position: absolute;
+        width: 100%;
+        height: 100%;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+    }
 }

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

@@ -6,4 +6,5 @@ require('../../popup/index.css');
 require('../../loading/index.css');
 require('../../toast/index.css');
 require('../../picker/index.css');
+require('../../circle/index.css');
 require('../index.css');

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

@@ -6,4 +6,5 @@ require('../../popup/index.less');
 require('../../loading/index.less');
 require('../../toast/index.less');
 require('../../picker/index.less');
+require('../../circle/index.less');
 require('../index.less');

package/lib/uploader/index.js

@@ -166,7 +166,9 @@ var _default2 = createComponent({
               address: _this.watermarkOptions.address || "",
               watermarkTime: new Date(),
               humanName: _this.watermarkOptions.humanName || "",
-              projectName: _this.watermarkOptions.projectName || ""
+              projectName: _this.watermarkOptions.projectName || "",
+              logo: _this.watermarkOptions.logo || "",
+              applicationName: _this.watermarkOptions.applicationName || ""
             });
             var watermarkOptions = new _media.WatermarkOptions({
               enabled: true,