zartui 2.0.42 → 2.0.44

package/es/index.js

@@ -74,7 +74,7 @@ import Tag from './tag';
 import Timeline from './timeline';
 import Toast from './toast';
 import Uploader from './uploader';
-var version = '2.0.42';
+var version = '2.0.44';
 
 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, Step, Stepper, Steps, Sticky, Swipe, SwipeCell, SwipeItem, Switch, SwitchCell, Tab, Tabbar, TabbarItem, Table, Tabs, Tag, Timeline, Toast, Uploader];

package/es/media-picker/index.js

@@ -141,6 +141,10 @@ export default createComponent({
         return {};
       }
     },
+    showFileName: {
+      type: Boolean,
+      default: false
+    },
     // 预览函数（返回true时不再执行默认行为）
     // 参数：media,index
     preview: Function,
@@ -630,7 +634,8 @@ export default createComponent({
               url: image.showSrc
             };
           }),
-          startPosition: imageIndex
+          startPosition: imageIndex,
+          closeable: true
         });
       } else if (media.type === MediaType.AUDIO || media.type === MediaType.VIDEO) {
         if (!media.file && !media.url) {
@@ -965,6 +970,19 @@ export default createComponent({
         }, [message])]);
       }
     },
+    renderMediaBox: function renderMediaBox(media) {
+      var h = this.$createElement;
+
+      if (!this.showFileName) {
+        return this.renderMediaThumbnail(media);
+      } else {
+        return h("div", {
+          "class": bem('media-box')
+        }, [this.renderMediaThumbnail(media), h("div", {
+          "class": bem('media-name')
+        }, [media.name || media.fileName])]);
+      }
+    },
 
     /**
      * 多媒体对应展示的缩略图
@@ -1033,11 +1051,13 @@ export default createComponent({
         return h(ZtGridItem, {
           "key": media.uniqueCode,
           "on": {
-            "click": function click() {
-              return _this9.previewMedia(media, index);
+            "click": function click(event) {
+              event.stopPropagation();
+
+              _this9.previewMedia(media, index);
             }
           }
-        }, [_this9.renderMediaThumbnail(media), _this9.genThumbnailMask(media), deleteIcon]);
+        }, [_this9.renderMediaBox(media), _this9.genThumbnailMask(media), deleteIcon]);
       });
     },
     selectAction: function selectAction(action) {

package/es/timeline/index.css

@@ -1 +1 @@
-.zt2-timeline{background-color:#fff}.zt2-timeline .zt2-timeline__top-bar{height:44px;display:-webkit-box;display:-webkit-flex;display:flex;-webkit-box-pack:justify;-webkit-justify-content:space-between;justify-content:space-between;-webkit-box-align:center;-webkit-align-items:center;align-items:center}.zt2-timeline .zt2-timeline__top-left{display:-webkit-box;display:-webkit-flex;display:flex;-webkit-box-align:center;-webkit-align-items:center;align-items:center}.zt2-timeline .zt2-timeline__bar{width:4px;height:16px;background:#0091fa;margin-right:12px}.zt2-timeline .zt2-timeline__top-right{padding-right:16px;display:-webkit-box;display:-webkit-flex;display:flex;-webkit-box-align:center;-webkit-align-items:center;align-items:center}.zt2-timeline .zt2-timeline__fold-text{font-size:14px;color:rgba(45,75,115,.6);line-height:24px;margin-right:8px}.zt2-timeline .zt2-timeline__container{padding-top:16px}.zt2-timeline .zt2-timeline__item{padding:0 16px 16px 16px;display:-webkit-box;display:-webkit-flex;display:flex}.zt2-timeline .zt2-timeline__item.last-item .zt2-timeline__line{height:0}.zt2-timeline .zt2-timeline__left-container{margin-right:8px;display:-webkit-box;display:-webkit-flex;display:flex;-webkit-box-orient:vertical;-webkit-box-direction:normal;-webkit-flex-direction:column;flex-direction:column;-webkit-box-align:center;-webkit-align-items:center;align-items:center}.zt2-timeline .zt2-timeline__right-container{-webkit-box-flex:1;-webkit-flex:1;flex:1}.zt2-timeline .zt2-timeline__avatar-box{width:40px;height:40px;position:relative}.zt2-timeline .zt2-timeline__status{width:16px;height:16px;position:absolute;bottom:-4px;right:-4px}.zt2-timeline .zt2-timeline__avatar{width:40px;height:40px;background:rgba(0,145,250,.7);border-radius:4px;font-size:14px;font-weight:700;text-align:center;color:#fff;line-height:40px}.zt2-timeline .zt2-timeline__line{background-color:#f5f5f5;width:2px;height:100%;margin-top:4px;margin-bottom:-12px}.zt2-timeline .zt2-timeline__title-box{display:-webkit-box;display:-webkit-flex;display:flex;-webkit-box-pack:justify;-webkit-justify-content:space-between;justify-content:space-between;-webkit-box-align:center;-webkit-align-items:center;align-items:center;margin-bottom:8px}.zt2-timeline .zt2-timeline__main-title{font-size:16px;font-weight:700;color:#2d4b73;line-height:24px}.zt2-timeline .zt2-timeline__title{font-size:14px;font-weight:700;color:#2d4b73;line-height:24px}.zt2-timeline .zt2-timeline__time{font-size:12px;color:rgba(45,75,115,.8);line-height:16px}.zt2-timeline .zt2-timeline__content-box{font-size:14px;color:#2d4b73;line-height:20px;padding-bottom:8px;padding-top:4px}.zt2-timeline .zt2-timeline__human-box{padding-bottom:8px;display:-webkit-box;display:-webkit-flex;display:flex;-webkit-box-align:center;-webkit-align-items:center;align-items:center;-webkit-flex-wrap:wrap;flex-wrap:wrap;overflow:hidden}.zt2-timeline .zt2-timeline__human-box .zt2-timeline__depart{font-size:14px;color:#2d4b73;line-height:20px;margin-right:8px}.zt2-timeline .zt2-timeline__human-box .zt2-timeline__human{font-weight:700;font-size:14px;color:#2d4b73;line-height:20px}.zt2-timeline .zt2-timeline__main-container{background:rgba(45,75,115,.04);border-radius:4px;padding:8px 12px}.zt2-timeline .zt2-timeline__main-container::before{border-radius:4px}.zt2-timeline .zt2-timeline__main-container .zt2-timeline__text-bold{font-weight:700;color:#2d4b73}.zt2-timeline .zt2-timeline__opinion-box{padding-top:7px}.zt2-timeline .zt2-timeline__opinion-box .zt2-timeline__opinion--empty{font-size:14px;color:rgba(45,75,115,.2)}.zt2-timeline .zt2-timeline__content-label,.zt2-timeline .zt2-timeline__opinion-label{margin-bottom:4px;font-size:14px;color:rgba(45,75,115,.6);line-height:20px}.zt2-timeline .zt2-timeline__opinion{font-size:14px;color:#2d4b73;line-height:20px}
+.zt2-timeline{background-color:#fff}.zt2-timeline .zt2-timeline__top-bar{height:44px;display:-webkit-box;display:-webkit-flex;display:flex;-webkit-box-pack:justify;-webkit-justify-content:space-between;justify-content:space-between;-webkit-box-align:center;-webkit-align-items:center;align-items:center}.zt2-timeline .zt2-timeline__top-left{display:-webkit-box;display:-webkit-flex;display:flex;-webkit-box-align:center;-webkit-align-items:center;align-items:center}.zt2-timeline .zt2-timeline__bar{width:4px;height:16px;background:#0091fa;margin-right:12px}.zt2-timeline .zt2-timeline__top-right{padding-right:16px;display:-webkit-box;display:-webkit-flex;display:flex;-webkit-box-align:center;-webkit-align-items:center;align-items:center}.zt2-timeline .zt2-timeline__fold-text{font-size:14px;color:rgba(45,75,115,.6);line-height:24px;margin-right:8px}.zt2-timeline .zt2-timeline__container{padding-top:16px}.zt2-timeline .zt2-timeline__item{padding:0 16px 16px 16px;display:-webkit-box;display:-webkit-flex;display:flex}.zt2-timeline .zt2-timeline__item.last-item .zt2-timeline__line{height:0}.zt2-timeline .zt2-timeline__left-container{margin-right:8px;display:-webkit-box;display:-webkit-flex;display:flex;-webkit-box-orient:vertical;-webkit-box-direction:normal;-webkit-flex-direction:column;flex-direction:column;-webkit-box-align:center;-webkit-align-items:center;align-items:center}.zt2-timeline .zt2-timeline__right-container{-webkit-box-flex:1;-webkit-flex:1;flex:1}.zt2-timeline .zt2-timeline__avatar-box{width:40px;height:40px;position:relative}.zt2-timeline .zt2-timeline__status{width:16px;height:16px;position:absolute;bottom:-4px;right:-4px}.zt2-timeline .zt2-timeline__avatar{width:40px;height:40px;background:rgba(0,145,250,.7);border-radius:4px;font-size:14px;font-weight:700;text-align:center;color:#fff;line-height:40px}.zt2-timeline .zt2-timeline__line{background-color:#f5f5f5;width:2px;height:100%;margin-top:4px;margin-bottom:-12px}.zt2-timeline .zt2-timeline__title-box{display:-webkit-box;display:-webkit-flex;display:flex;-webkit-box-pack:justify;-webkit-justify-content:space-between;justify-content:space-between;-webkit-box-align:center;-webkit-align-items:center;align-items:center;margin-bottom:8px}.zt2-timeline .zt2-timeline__main-title{font-size:16px;font-weight:700;color:#2d4b73;line-height:24px}.zt2-timeline .zt2-timeline__title{font-size:14px;font-weight:700;color:#2d4b73;line-height:24px}.zt2-timeline .zt2-timeline__time{font-size:12px;color:rgba(45,75,115,.8);line-height:16px}.zt2-timeline .zt2-timeline__content-box{font-size:14px;color:#2d4b73;line-height:20px;padding-bottom:8px;padding-top:4px}.zt2-timeline .zt2-timeline__human-box{padding-bottom:8px;display:-webkit-box;display:-webkit-flex;display:flex;-webkit-box-align:center;-webkit-align-items:center;align-items:center;-webkit-flex-wrap:wrap;flex-wrap:wrap;overflow:hidden}.zt2-timeline .zt2-timeline__human-box .zt2-timeline__depart{font-size:14px;color:#2d4b73;line-height:20px;margin-right:8px}.zt2-timeline .zt2-timeline__human-box .zt2-timeline__human{font-weight:700;font-size:14px;color:#2d4b73;line-height:20px}.zt2-timeline .zt2-timeline__main-container{background:rgba(45,75,115,.04);border-radius:4px;padding:8px 12px}.zt2-timeline .zt2-timeline__main-container::before{border-radius:4px}.zt2-timeline .zt2-timeline__main-container .zt2-timeline__text-bold{font-weight:700;color:#2d4b73}.zt2-timeline .zt2-timeline__main-container .zt2-media-picker{margin-top:12px}.zt2-timeline .zt2-timeline__main-container .zt2-media-picker .zt2-media-picker__line{display:none}.zt2-timeline .zt2-timeline__main-container .zt2-media-picker .zt2-media-picker__grid{padding:0!important}.zt2-timeline .zt2-timeline__main-container .zt2-media-picker .zt2-media-picker__grid .zt2-media-picker__media-box{width:100%;height:100%;position:relative}.zt2-timeline .zt2-timeline__main-container .zt2-media-picker .zt2-media-picker__grid .zt2-media-picker__media-box .zt2-media-picker__media-name{width:100%;height:20px;padding:0 12px;position:absolute;bottom:0;left:0;border-radius:0 0 4px 4px;background-color:rgba(45,75,115,.5);font-size:12px;color:#fff;text-align:center;line-height:20px;white-space:nowrap;overflow:hidden;text-overflow:ellipsis}.zt2-timeline .zt2-timeline__opinion-box{padding-top:7px}.zt2-timeline .zt2-timeline__opinion-box .zt2-timeline__opinion--empty{font-size:14px;color:rgba(45,75,115,.2)}.zt2-timeline .zt2-timeline__content-label,.zt2-timeline .zt2-timeline__opinion-label{margin-bottom:4px;font-size:14px;color:rgba(45,75,115,.6);line-height:20px}.zt2-timeline .zt2-timeline__opinion{font-size:14px;color:#2d4b73;line-height:20px}

package/es/timeline/index.js

@@ -7,8 +7,7 @@ var _createNamespace = createNamespace('timeline'),
     bem = _createNamespace[1];
 
 import Switch from "../switch";
-import PassIcon from "./svg/pass";
-import CurrentIcon from "./svg/current";
+import MediaPicker from '../media-picker';
 
 var defaultData = function defaultData() {
   return {
@@ -21,7 +20,7 @@ export default createComponent({
   props: {
     title: {
       type: String,
-      default: "办理经过"
+      default: ""
     },
     // 默认折叠显示
     defaultFold: {
@@ -60,16 +59,24 @@ export default createComponent({
     return defaultData();
   },
   computed: {},
-  watch: {},
+  watch: {
+    processes: {
+      deep: true,
+      handler: "updateProcess"
+    }
+  },
   mounted: function mounted() {
     this.isFold = this.defaultFold;
-    this.computedProcesses = this.processes.map(function (v) {
-      return _extends({}, v, {
-        folded: false
-      });
-    });
+    this.updateProcess();
   },
   methods: {
+    updateProcess: function updateProcess() {
+      this.computedProcesses = this.processes.map(function (v) {
+        return _extends({}, v, {
+          folded: false
+        });
+      });
+    },
     genProcesses: function genProcesses() {
       var _this = this;
 
@@ -84,7 +91,7 @@ export default createComponent({
         });
       }
     },
-    genAvatar: function genAvatar(item, avatarSlot, isLast) {
+    genAvatar: function genAvatar(item, avatarSlot) {
       var h = this.$createElement;
 
       if (avatarSlot) {
@@ -103,11 +110,13 @@ export default createComponent({
         }
       }) : h("div", {
         "class": bem("avatar")
-      }, [item.human ? item.human.slice(-2) : ""]), isLast ? h(CurrentIcon, {
-        "class": bem("status")
-      }) : h(PassIcon, {
-        "class": bem("status")
-      })]);
+      }, [item.human ? item.human.slice(-2) : ""]), item.statusIcon ? h("img", {
+        "class": bem("status"),
+        "attrs": {
+          "src": item.statusIcon,
+          "alt": ""
+        }
+      }) : ""]);
     },
     genTitle: function genTitle(item, titleSlot) {
       var h = this.$createElement;
@@ -195,7 +204,23 @@ export default createComponent({
         "class": bem("opinion", item.opinion ? "" : "empty")
       }, [item.opinion || "无"])]);
     },
+    genFiles: function genFiles(fileList) {
+      var h = this.$createElement;
+      return h(MediaPicker, {
+        "attrs": {
+          "showFileName": true
+        },
+        "model": {
+          value: fileList,
+          callback: function callback($$v) {
+            fileList = $$v;
+          }
+        }
+      });
+    },
     genProcessItem: function genProcessItem(item, isLast) {
+      var _item$fileList;
+
       var h = this.$createElement;
       var avatarSlot = this.slots("avatar", item);
       var titleSlot = this.slots("title", item);
@@ -219,13 +244,13 @@ export default createComponent({
         }
       }, [h("div", {
         "class": bem("left-container")
-      }, [this.genAvatar(item, avatarSlot, isLast), h("div", {
+      }, [this.genAvatar(item, avatarSlot), h("div", {
         "class": bem("line")
       })]), h("div", {
         "class": bem("right-container")
       }, [this.genTitle(item, titleSlot), item.folded ? h() : h("div", {
         "class": bem("main-container")
-      }, [this.genHuman(item, humanSlot), this.genContent(item, contentSlot), this.genOpinion(item, opinionSlot)])])]);
+      }, [this.genHuman(item, humanSlot), this.genContent(item, contentSlot), this.genOpinion(item, opinionSlot), item != null && (_item$fileList = item.fileList) != null && _item$fileList.length ? this.genFiles(item.fileList) : ""])])]);
     }
   },
   render: function render(h) {
@@ -235,8 +260,16 @@ export default createComponent({
     return h("div", {
       "class": bem()
     }, [h("div", {
+      "directives": [{
+        name: "show",
+        value: this.title || this.showFold
+      }],
       "class": [bem("top-bar" + " half-border-bottom"), BORDER_BOTTOM]
     }, [h("div", {
+      "directives": [{
+        name: "show",
+        value: this.title
+      }],
       "class": bem("top-left")
     }, [h("div", {
       "class": bem("bar")

package/es/timeline/index.less

@@ -141,6 +141,40 @@
       font-weight: bold;
       color: rgba(45, 75, 115, 1);
     }
+
+    .zt2-media-picker {
+        margin-top: 12px;
+        .zt2-media-picker__line {
+            display: none;
+        }
+        .zt2-media-picker__grid {
+            padding: 0!important;
+
+            .zt2-media-picker__media-box {
+                width: 100%;
+                height: 100%;
+                position: relative;
+
+                .zt2-media-picker__media-name {
+                    width: 100%;
+                    height: 20px;
+                    padding: 0 12px;
+                    position: absolute;
+                    bottom: 0;
+                    left: 0;
+                    border-radius: 0 0 4px 4px;
+                    background-color: rgba(45, 75, 115, 0.5);
+                    font-size: 12px;
+                    color: #fff;
+                    text-align: center;
+                    line-height: 20px;
+                    white-space: nowrap;
+                    overflow: hidden;
+                    text-overflow: ellipsis;
+                }
+            }
+        }
+    }
   }
   .@{base-prefix}-timeline__opinion-box {
     padding-top: 7px;

package/es/timeline/style/index.js

@@ -1,4 +1,19 @@
 import '../../style/base.css';
+import '../../overlay/index.css';
+import '../../info/index.css';
+import '../../icon/index.css';
+import '../../image/index.css';
+import '../../grid-item/index.css';
+import '../../popup/index.css';
 import '../../loading/index.css';
 import '../../switch/index.css';
+import '../../toast/index.css';
+import '../../button/index.css';
+import '../../action-sheet/index.css';
+import '../../grid/index.css';
+import '../../swipe/index.css';
+import '../../swipe-item/index.css';
+import '../../image-preview/index.css';
+import '../../media-picker/index.css';
+import '../../media-player/index.css';
 import '../index.css';

package/es/timeline/style/less.js

@@ -1,4 +1,19 @@
 import '../../style/base.less';
+import '../../overlay/index.less';
+import '../../info/index.less';
+import '../../icon/index.less';
+import '../../image/index.less';
+import '../../grid-item/index.less';
+import '../../popup/index.less';
 import '../../loading/index.less';
 import '../../switch/index.less';
+import '../../toast/index.less';
+import '../../button/index.less';
+import '../../action-sheet/index.less';
+import '../../grid/index.less';
+import '../../swipe/index.less';
+import '../../swipe-item/index.less';
+import '../../image-preview/index.less';
+import '../../media-picker/index.less';
+import '../../media-player/index.less';
 import '../index.less';