zartui 0.1.113 → 1.0.2

package/lib/hierarchy-select/hierarchySelect.js

@@ -71,6 +71,12 @@ var _default2 = createComponent({
     returnChainData: {
       type: Boolean,
       default: false
+    },
+    confirmedList: {
+      type: Array,
+      default: function _default() {
+        return [];
+      }
     }
   },
   data: function data() {
@@ -161,7 +167,8 @@ var _default2 = createComponent({
         "resetReplaceCancel": this.resetReplaceCancel,
         "disableParent": this.disableParent,
         "valueKey": this.valueKey,
-        "textKey": this.textKey
+        "textKey": this.textKey,
+        "confirmedList": this.confirmedList
       },
       "on": {
         "clickNext": this.clickNext,

package/lib/hierarchy-select/index.css

@@ -1 +1 @@
-.zt-hierarchy-select__popup{height:100%}.zt-hierarchy-select__popup .zt-hierarchy-select{background-color:#f5f5ff;height:100%}.zt-hierarchy-select__popup .zt-hierarchy-select__title{height:44px;position:relative;background-color:#fff;border-bottom:1px solid rgba(0,0,0,.1)}.zt-hierarchy-select__popup .zt-hierarchy-select__title i{font-size:14px;position:absolute;left:15px;top:16px}.zt-hierarchy-select__popup .zt-hierarchy-select__title div{line-height:44px;text-align:center;font-weight:700;font-size:18px;color:#142841}.zt-hierarchy-select__popup .zt-hierarchy-select .zt-hierarchy-select-core .zt-loading{position:absolute;top:50%;left:50%;margin-left:-18px;margin-right:-18px}.zt-hierarchy-select__popup .zt-hierarchy-select .zt-hierarchy-select-core__list span{height:24px;font-size:16px;font-family:PingFangSC,PingFangSC-Semibold;font-weight:600;color:#0091fa;line-height:24px}.zt-hierarchy-select__popup .zt-hierarchy-select .zt-hierarchy-select-core__list .flex{display:-webkit-box;display:-webkit-flex;display:flex;-webkit-box-align:center;-webkit-align-items:center;align-items:center}.zt-hierarchy-select__popup .zt-hierarchy-select .zt-hierarchy-select-breadcrumb{position:relative;display:-webkit-box;display:-webkit-flex;display:flex;padding:10px 0;background-color:#fff;margin-bottom:16px}.zt-hierarchy-select__popup .zt-hierarchy-select .zt-hierarchy-select-breadcrumb__indicator-crumb-list{-webkit-box-flex:1;-webkit-flex:1;flex:1;display:-webkit-box;display:-webkit-flex;display:flex;-webkit-box-align:center;-webkit-align-items:center;align-items:center;padding:0 16px;overflow-x:auto}.zt-hierarchy-select__popup .zt-hierarchy-select .zt-hierarchy-select-breadcrumb__indicator-crumb-list span{display:-webkit-box;display:-webkit-flex;display:flex;-webkit-box-align:center;-webkit-align-items:center;align-items:center;white-space:nowrap;height:24px;font-size:16px;font-family:PingFangSC,PingFangSC-Regular;text-align:left;color:#000;line-height:24px}.zt-hierarchy-select__popup .zt-hierarchy-select .zt-hierarchy-select-breadcrumb__indicator-crumb-list__icon-arrow{margin:0 4px;width:20px;height:20px}.zt-hierarchy-select__popup .zt-hierarchy-select .zt-hierarchy-select-breadcrumb__crumb-item{display:-webkit-box;display:-webkit-flex;display:flex;-webkit-box-align:center;-webkit-align-items:center;align-items:center}.zt-hierarchy-select__popup .zt-hierarchy-select .zt-hierarchy-select-breadcrumb__fill-blur{position:absolute;top:0;width:16px;height:44px;background:-webkit-gradient(linear,right top,left top,from(rgba(255,255,255,0)),to(#fff))}.zt-hierarchy-select__popup .zt-hierarchy-select .zt-hierarchy-select-breadcrumb__fill-blur:last-child{right:0;top:0;background:-webkit-gradient(linear,right top,left top,from(#fff),to(rgba(255,255,255,0)))}.zt-hierarchy-select__popup .zt-hierarchy-select .zt-hierarchy-mark-list{background-color:#fff}.zt-hierarchy-select__popup .zt-hierarchy-select .zt-hierarchy-mark-list__multiple-button{margin-right:8px}.zt-hierarchy-select__popup .zt-hierarchy-select .zt-hierarchy-mark-list__check-icon{color:#0091fa;font-size:24px}.zt-hierarchy-select__popup .zt-hierarchy-select .zt-hierarchy-mark-list__uncheck-icon{width:24px;height:24px;border:1px solid rgba(0,0,0,.1);border-radius:50%}.zt-hierarchy-select__popup .zt-hierarchy-select .zt-hierarchy-mark-list__score-item{position:relative;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;padding:10px 0;background-color:#fff;margin-left:16px}.zt-hierarchy-select__popup .zt-hierarchy-select .zt-hierarchy-mark-list__score-item:after{content:" ";position:absolute;bottom:0;height:1px;width:100%;background-color:rgba(0,0,0,.1);box-shadow:0 0 0 0 #000 inset}.zt-hierarchy-select__popup .zt-hierarchy-select .zt-hierarchy-mark-list__item-content{-webkit-box-flex:1;-webkit-flex:1;flex:1;margin-right:16px;width:278px;font-size:16px;font-family:PingFangSC,PingFangSC-Regular;font-weight:400;text-align:left;color:#000;line-height:24px;word-break:break-all}.zt-hierarchy-select__popup .zt-hierarchy-select .zt-hierarchy-mark-list__item-content span{color:#0091fa}.zt-hierarchy-select__popup .zt-hierarchy-select .zt-hierarchy-mark-list__item-nav{padding:0 16px;border-left:rgba(0,0,0,.1) 1px solid}.zt-hierarchy-select__popup .zt-hierarchy-select .zt-hierarchy-mark-list__sub-level{display:-webkit-box;display:-webkit-flex;display:flex;-webkit-box-align:center;-webkit-align-items:center;align-items:center}.zt-hierarchy-select__popup .zt-hierarchy-select .zt-hierarchy-mark-list__sub-level span{color:#0091fa}.zt-hierarchy-select__popup .zt-hierarchy-select .zt-hierarchy-mark-list__sub-level--disable{opacity:.2}.zt-hierarchy-select__popup .zt-hierarchy-select .zt-hierarchy-mark-list__sub-icon{margin-right:4px;font-size:0;width:20px;height:20px}.zt-hierarchy-select__popup .zt-hierarchy-select .zt-hierarchy-mark-list__result-box{position:fixed;left:0;bottom:0;background:#fff;width:100%}.zt-hierarchy-select__popup .zt-hierarchy-select .zt-hierarchy-mark-list__result-list{height:160px;box-shadow:0 -4px 8px 0 rgba(0,0,0,.1);border-radius:8px 8px 0 0;padding:12px 16px;font-size:14px;color:#000;line-height:24px}.zt-hierarchy-select__popup .zt-hierarchy-select .zt-hierarchy-mark-list__operate-box{display:-webkit-box;display:-webkit-flex;display:flex;height:44px;line-height:44px;-webkit-box-align:center;-webkit-align-items:center;align-items:center}.zt-hierarchy-select__popup .zt-hierarchy-select .zt-hierarchy-mark-list__selected{border-top:1px solid rgba(0,0,0,.1);display:-webkit-box;display:-webkit-flex;display:flex;-webkit-box-align:center;-webkit-align-items:center;align-items:center;padding:0 16px;-webkit-box-flex:1;-webkit-flex:1;flex:1;height:44px}.zt-hierarchy-select__popup .zt-hierarchy-select .zt-hierarchy-mark-list__selected i{color:#0091fa;font-size:20px;margin-right:4px}.zt-hierarchy-select__popup .zt-hierarchy-select .zt-hierarchy-mark-list__selected span{font-size:14px;color:rgba(0,0,0,.6)}.zt-hierarchy-select__popup .zt-hierarchy-select .zt-hierarchy-mark-list__selected span.zt-hierarchy-mark-list__blue{color:#0091fa;margin-left:8px}.zt-hierarchy-select__popup .zt-hierarchy-select .zt-hierarchy-mark-list__line{width:1px;height:24px;background:rgba(0,0,0,.1);-webkit-transform:scaleX(.5);transform:scaleX(.5);border-top:1px solid rgba(0,0,0,.1)}.zt-hierarchy-select__popup .zt-hierarchy-select .zt-hierarchy-mark-list__reset-button{width:110px;border-top:1px solid rgba(0,0,0,.1);font-size:16px;color:#000;text-align:center}.zt-hierarchy-select__popup .zt-hierarchy-select .zt-hierarchy-mark-list__cancel-button{width:110px;border-top:1px solid rgba(0,0,0,.1);font-size:16px;color:#000;text-align:center}.zt-hierarchy-select__popup .zt-hierarchy-select .zt-hierarchy-mark-list__confirm-button{width:110px;border-top:1px solid #0091fa;font-weight:700;font-size:16px;color:#fff;text-align:center;background:#0091fa}
+.zt-hierarchy-select__popup{height:100%}.zt-hierarchy-select__popup .zt-hierarchy-select{background-color:#f5f5ff;height:100%}.zt-hierarchy-select__popup .zt-hierarchy-select__title{height:44px;position:relative;background-color:#fff;border-bottom:1px solid rgba(0,0,0,.1)}.zt-hierarchy-select__popup .zt-hierarchy-select__title i{font-size:14px;position:absolute;left:15px;top:16px}.zt-hierarchy-select__popup .zt-hierarchy-select__title div{line-height:44px;text-align:center;font-weight:700;font-size:18px;color:#142841}.zt-hierarchy-select__popup .zt-hierarchy-select .zt-hierarchy-select-core .zt-loading{position:absolute;top:50%;left:50%;margin-left:-18px;margin-right:-18px}.zt-hierarchy-select__popup .zt-hierarchy-select .zt-hierarchy-select-core__list span{height:24px;font-size:16px;font-family:PingFangSC,PingFangSC-Semibold;font-weight:600;color:#0091fa;line-height:24px}.zt-hierarchy-select__popup .zt-hierarchy-select .zt-hierarchy-select-core__list .flex{display:-webkit-box;display:-webkit-flex;display:flex;-webkit-box-align:center;-webkit-align-items:center;align-items:center}.zt-hierarchy-select__popup .zt-hierarchy-select .zt-hierarchy-select-breadcrumb{position:relative;display:-webkit-box;display:-webkit-flex;display:flex;padding:10px 0;background-color:#fff;margin-bottom:16px}.zt-hierarchy-select__popup .zt-hierarchy-select .zt-hierarchy-select-breadcrumb__indicator-crumb-list{-webkit-box-flex:1;-webkit-flex:1;flex:1;display:-webkit-box;display:-webkit-flex;display:flex;-webkit-box-align:center;-webkit-align-items:center;align-items:center;padding:0 16px;overflow-x:auto}.zt-hierarchy-select__popup .zt-hierarchy-select .zt-hierarchy-select-breadcrumb__indicator-crumb-list span{display:-webkit-box;display:-webkit-flex;display:flex;-webkit-box-align:center;-webkit-align-items:center;align-items:center;white-space:nowrap;height:24px;font-size:16px;font-family:PingFangSC,PingFangSC-Regular;text-align:left;color:#000;line-height:24px}.zt-hierarchy-select__popup .zt-hierarchy-select .zt-hierarchy-select-breadcrumb__indicator-crumb-list__icon-arrow{margin:0 4px;width:20px;height:20px}.zt-hierarchy-select__popup .zt-hierarchy-select .zt-hierarchy-select-breadcrumb__crumb-item{display:-webkit-box;display:-webkit-flex;display:flex;-webkit-box-align:center;-webkit-align-items:center;align-items:center}.zt-hierarchy-select__popup .zt-hierarchy-select .zt-hierarchy-select-breadcrumb__fill-blur{position:absolute;top:0;width:16px;height:44px;background:-webkit-gradient(linear,right top,left top,from(rgba(255,255,255,0)),to(#fff))}.zt-hierarchy-select__popup .zt-hierarchy-select .zt-hierarchy-select-breadcrumb__fill-blur:last-child{right:0;top:0;background:-webkit-gradient(linear,right top,left top,from(#fff),to(rgba(255,255,255,0)))}.zt-hierarchy-select__popup .zt-hierarchy-select .zt-hierarchy-mark-list{background-color:#fff}.zt-hierarchy-select__popup .zt-hierarchy-select .zt-hierarchy-mark-list__multiple-button{margin-right:8px;display:-webkit-box;display:-webkit-flex;display:flex;-webkit-box-pack:center;-webkit-justify-content:center;justify-content:center;-webkit-box-align:center;-webkit-align-items:center;align-items:center}.zt-hierarchy-select__popup .zt-hierarchy-select .zt-hierarchy-mark-list__check-icon{color:#0091fa;font-size:24px}.zt-hierarchy-select__popup .zt-hierarchy-select .zt-hierarchy-mark-list__uncheck-icon{color:#e4e4e4;font-size:24px}.zt-hierarchy-select__popup .zt-hierarchy-select .zt-hierarchy-mark-list__score-item{position:relative;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;padding:10px 0;background-color:#fff;margin-left:16px}.zt-hierarchy-select__popup .zt-hierarchy-select .zt-hierarchy-mark-list__score-item:after{content:" ";position:absolute;bottom:0;height:1px;width:100%;background-color:rgba(0,0,0,.1);box-shadow:0 0 0 0 #000 inset}.zt-hierarchy-select__popup .zt-hierarchy-select .zt-hierarchy-mark-list__item-content{-webkit-box-flex:1;-webkit-flex:1;flex:1;margin-right:16px;width:278px;font-size:16px;font-family:PingFangSC,PingFangSC-Regular;font-weight:400;text-align:left;color:#000;line-height:24px;word-break:break-all}.zt-hierarchy-select__popup .zt-hierarchy-select .zt-hierarchy-mark-list__item-content span{color:#0091fa}.zt-hierarchy-select__popup .zt-hierarchy-select .zt-hierarchy-mark-list__item-nav{padding:0 16px;border-left:rgba(0,0,0,.1) 1px solid}.zt-hierarchy-select__popup .zt-hierarchy-select .zt-hierarchy-mark-list__sub-level{display:-webkit-box;display:-webkit-flex;display:flex;-webkit-box-align:center;-webkit-align-items:center;align-items:center}.zt-hierarchy-select__popup .zt-hierarchy-select .zt-hierarchy-mark-list__sub-level span{color:#0091fa}.zt-hierarchy-select__popup .zt-hierarchy-select .zt-hierarchy-mark-list__sub-level--disable{opacity:.2}.zt-hierarchy-select__popup .zt-hierarchy-select .zt-hierarchy-mark-list__sub-icon{margin-right:4px;font-size:0;width:20px;height:20px}.zt-hierarchy-select__popup .zt-hierarchy-select .zt-hierarchy-mark-list__result-box{position:fixed;left:0;bottom:0;background:#fff;width:100%}.zt-hierarchy-select__popup .zt-hierarchy-select .zt-hierarchy-mark-list__result-list{height:160px;box-shadow:0 -4px 8px 0 rgba(0,0,0,.1);border-radius:8px 8px 0 0;padding:12px 16px;font-size:14px;color:#000;line-height:24px}.zt-hierarchy-select__popup .zt-hierarchy-select .zt-hierarchy-mark-list__operate-box{display:-webkit-box;display:-webkit-flex;display:flex;height:44px;line-height:44px;-webkit-box-align:center;-webkit-align-items:center;align-items:center}.zt-hierarchy-select__popup .zt-hierarchy-select .zt-hierarchy-mark-list__selected{border-top:1px solid rgba(0,0,0,.1);display:-webkit-box;display:-webkit-flex;display:flex;-webkit-box-align:center;-webkit-align-items:center;align-items:center;padding:0 16px;-webkit-box-flex:1;-webkit-flex:1;flex:1;height:44px}.zt-hierarchy-select__popup .zt-hierarchy-select .zt-hierarchy-mark-list__selected i{color:#0091fa;font-size:20px;margin-right:4px}.zt-hierarchy-select__popup .zt-hierarchy-select .zt-hierarchy-mark-list__selected span{font-size:14px;color:rgba(0,0,0,.6)}.zt-hierarchy-select__popup .zt-hierarchy-select .zt-hierarchy-mark-list__selected span.zt-hierarchy-mark-list__blue{color:#0091fa;margin-left:8px}.zt-hierarchy-select__popup .zt-hierarchy-select .zt-hierarchy-mark-list__line{width:1px;height:24px;background:rgba(0,0,0,.1);-webkit-transform:scaleX(.5);transform:scaleX(.5);border-top:1px solid rgba(0,0,0,.1)}.zt-hierarchy-select__popup .zt-hierarchy-select .zt-hierarchy-mark-list__reset-button{width:110px;border-top:1px solid rgba(0,0,0,.1);font-size:16px;color:#000;text-align:center}.zt-hierarchy-select__popup .zt-hierarchy-select .zt-hierarchy-mark-list__cancel-button{width:110px;border-top:1px solid rgba(0,0,0,.1);font-size:16px;color:#000;text-align:center}.zt-hierarchy-select__popup .zt-hierarchy-select .zt-hierarchy-mark-list__confirm-button{width:110px;border-top:1px solid #0091fa;font-weight:700;font-size:16px;color:#fff;text-align:center;background:#0091fa}

package/lib/hierarchy-select/index.js

@@ -15,6 +15,8 @@ var _popup2 = require("../mixins/popup");
 
 var _icon = _interopRequireDefault(require("../icon"));
 
+var _deepClone = require("../utils/deep-clone");
+
 // Utils
 var _createNamespace = (0, _utils.createNamespace)('hierarchy-select'),
     createComponent = _createNamespace[0],
@@ -71,7 +73,8 @@ var _default = createComponent({
   },
   data: function data() {
     return {
-      showPicker: false
+      showPicker: false,
+      confirmedList: []
     };
   },
   methods: {
@@ -96,7 +99,13 @@ var _default = createComponent({
       }
     },
     confirm: function confirm(list) {
-      this.$emit("confirm", list);
+      this.confirmedList = (0, _deepClone.deepClone)(list);
+      this.$emit("confirm", this.confirmedList);
+    },
+    onBack: function onBack() {
+      if (this.$refs.hierarchySelect && this.$refs.hierarchySelect.$refs.markList) {
+        this.$refs.hierarchySelect.$refs.markList.cancel();
+      }
     }
   },
   render: function render(h) {
@@ -127,11 +136,10 @@ var _default = createComponent({
         "name": "arrow-left"
       },
       "on": {
-        "click": function click() {
-          _this.showPicker = false;
-        }
+        "click": this.onBack
       }
     }), h("div", [this.title])]), h(_hierarchySelect.default, {
+      "ref": "hierarchySelect",
       "attrs": {
         "treeData": this.treeData,
         "disableParent": this.disableParent,
@@ -140,7 +148,8 @@ var _default = createComponent({
         "multiple": this.multiple,
         "valueKey": this.valueKey,
         "textKey": this.textKey,
-        "returnChainData": this.returnChainData
+        "returnChainData": this.returnChainData,
+        "confirmedList": this.confirmedList
       },
       "on": {
         "selected": this.onSelected,

package/lib/hierarchy-select/index.less

@@ -97,16 +97,17 @@
       background-color: #fff;
       &__multiple-button {
         margin-right: 8px;
+        display: flex;
+        justify-content: center;
+        align-items: center;
       }
       &__check-icon {
         color: #0091fa;
         font-size: 24px;
       }
       &__uncheck-icon {
-        width: 24px;
-        height: 24px;
-        border: 1px solid rgba(0,0,0,.1);
-        border-radius: 50%;
+        color: #E4E4E4;
+        font-size: 24px;
       }
       &__score-item {
           position: relative;

package/lib/hierarchy-select/markList.js

@@ -46,6 +46,12 @@ var _default2 = createComponent({
     textKey: {
       type: String,
       default: "name"
+    },
+    confirmedList: {
+      type: Array,
+      default: function _default() {
+        return [];
+      }
     }
   },
   data: function data() {
@@ -71,6 +77,11 @@ var _default2 = createComponent({
         return;
       }
 
+      if (this.multiple) {
+        this.multipleClicked(item);
+        return;
+      }
+
       this.choosedValue = item[this.valueKey];
       this.$emit('selected', item);
     },
@@ -81,7 +92,10 @@ var _default2 = createComponent({
           "name": "checked"
         },
         "class": bem("check-icon")
-      }) : h("div", {
+      }) : h(_icon.default, {
+        "attrs": {
+          "name": "circle"
+        },
         "class": bem("uncheck-icon")
       });
     },
@@ -156,6 +170,7 @@ var _default2 = createComponent({
       unchecked(array);
     },
     cancel: function cancel() {
+      this.checkedList = (0, _deepClone.deepClone)(this.confirmedList);
       this.$emit("cancel");
     },
     confirm: function confirm() {