zartui 2.0.87 → 2.0.89

package/lib/empty/images/ReportSuccess.js

@@ -2,9 +2,23 @@
 
 exports.__esModule = true;
 exports.default = void 0;
+
+var _context = require("../context");
+
 var _default = {
   render: function render() {
     var h = arguments[0];
+
+    var baseId = _context.context.baseId();
+
+    var getId = function getId(num) {
+      return baseId + "-" + num;
+    };
+
+    var getUrlById = function getUrlById(num) {
+      return "url(#" + getId(num) + ")";
+    };
+
     return h("svg", {
       "attrs": {
         "xmlns": "http://www.w3.org/2000/svg",
@@ -16,7 +30,7 @@ var _default = {
         "y1": "7.10247992%",
         "x2": "50%",
         "y2": "106.117243%",
-        "id": "wzndu5old__oxdoqjk06b"
+        "id": getId(1)
       }
     }, [h("stop", {
       "attrs": {
@@ -34,7 +48,7 @@ var _default = {
         "y1": "0%",
         "x2": "50%",
         "y2": "100%",
-        "id": "wzndu5old__c14euxc0ba"
+        "id": getId(2)
       }
     }, [h("stop", {
       "attrs": {
@@ -53,7 +67,7 @@ var _default = {
         "width": "164.3%",
         "height": "163.2%",
         "filterUnits": "objectBoundingBox",
-        "id": "wzndu5old__h6dsmrn7ic"
+        "id": getId(3)
       }
     }, [h("feOffset", {
       "attrs": {
@@ -79,7 +93,7 @@ var _default = {
         "width": "220%",
         "height": "220%",
         "filterUnits": "objectBoundingBox",
-        "id": "wzndu5old__eidtmi82we"
+        "id": getId(4)
       }
     }, [h("feOffset", {
       "attrs": {
@@ -128,14 +142,14 @@ var _default = {
     }), h("path", {
       "attrs": {
         "d": "M56,44 L96,44 C102.627417,44 108,49.372583 108,56 L108,86 C108,103.673112 93.673112,118 76,118 L56,118 C49.372583,118 44,112.627417 44,106 L44,56 C44,49.372583 49.372583,44 56,44 Z",
-        "stroke": "url(#wzndu5old__c14euxc0ba)",
+        "stroke": getUrlById(2),
         "stroke-width": "8",
-        "fill": "url(#wzndu5old__oxdoqjk06b)"
+        "fill": getUrlById(1)
       }
     }), h("use", {
       "attrs": {
         "fill": "#000",
-        "filter": "url(#wzndu5old__h6dsmrn7ic)",
+        "filter": getUrlById(3),
         "href": "#wzndu5old__5o6h16nqxd"
       }
     }), h("use", {
@@ -150,7 +164,7 @@ var _default = {
     }, [h("use", {
       "attrs": {
         "fill": "#000",
-        "filter": "url(#wzndu5old__eidtmi82we)",
+        "filter": getUrlById(4),
         "href": "#wzndu5old__x5no4qqv6f"
       }
     }), h("use", {

package/lib/empty/images/Restricted.js

@@ -2,9 +2,23 @@
 
 exports.__esModule = true;
 exports.default = void 0;
+
+var _context = require("../context");
+
 var _default = {
   render: function render() {
     var h = arguments[0];
+
+    var baseId = _context.context.baseId();
+
+    var getId = function getId(num) {
+      return baseId + "-" + num;
+    };
+
+    var getUrlById = function getUrlById(num) {
+      return "url(#" + getId(num) + ")";
+    };
+
     return h("svg", {
       "attrs": {
         "xmlns": "http://www.w3.org/2000/svg",
@@ -16,7 +30,7 @@ var _default = {
         "y1": "7.10247992%",
         "x2": "50%",
         "y2": "106.117243%",
-        "id": "b6br24f2e__7twq6ap7jb"
+        "id": getId(1)
       }
     }, [h("stop", {
       "attrs": {
@@ -34,7 +48,7 @@ var _default = {
         "y1": "0%",
         "x2": "50%",
         "y2": "100%",
-        "id": "b6br24f2e__yx4w9z757a"
+        "id": getId(2)
       }
     }, [h("stop", {
       "attrs": {
@@ -53,7 +67,7 @@ var _default = {
         "width": "153.1%",
         "height": "145.9%",
         "filterUnits": "objectBoundingBox",
-        "id": "b6br24f2e__449nw52c3c"
+        "id": getId(3)
       }
     }, [h("feOffset", {
       "attrs": {
@@ -97,9 +111,9 @@ var _default = {
     }), h("path", {
       "attrs": {
         "d": "M56,44 L96,44 C102.627417,44 108,49.372583 108,56 L108,86 C108,103.673112 93.673112,118 76,118 L56,118 C49.372583,118 44,112.627417 44,106 L44,56 C44,49.372583 49.372583,44 56,44 Z",
-        "stroke": "url(#b6br24f2e__yx4w9z757a)",
+        "stroke": getUrlById(2),
         "stroke-width": "8",
-        "fill": "url(#b6br24f2e__7twq6ap7jb)"
+        "fill": getUrlById(1)
       }
     }), h("rect", {
       "attrs": {
@@ -122,7 +136,7 @@ var _default = {
     }), h("use", {
       "attrs": {
         "fill": "#000",
-        "filter": "url(#b6br24f2e__449nw52c3c)",
+        "filter": getUrlById(3),
         "href": "#b6br24f2e__32x2s61owd"
       }
     }), h("use", {

package/lib/empty/images/ServerError.js

@@ -2,9 +2,23 @@
 
 exports.__esModule = true;
 exports.default = void 0;
+
+var _context = require("../context");
+
 var _default = {
   render: function render() {
     var h = arguments[0];
+
+    var baseId = _context.context.baseId();
+
+    var getId = function getId(num) {
+      return baseId + "-" + num;
+    };
+
+    var getUrlById = function getUrlById(num) {
+      return "url(#" + getId(num) + ")";
+    };
+
     return h("svg", {
       "attrs": {
         "xmlns": "http://www.w3.org/2000/svg",
@@ -16,7 +30,7 @@ var _default = {
         "y1": "7.10247992%",
         "x2": "50%",
         "y2": "106.117243%",
-        "id": "2rmfwsc5q__14emiclh8b"
+        "id": getId(1)
       }
     }, [h("stop", {
       "attrs": {
@@ -34,7 +48,7 @@ var _default = {
         "y1": "0%",
         "x2": "50%",
         "y2": "100%",
-        "id": "2rmfwsc5q__6oj76fxcba"
+        "id": getId(2)
       }
     }, [h("stop", {
       "attrs": {
@@ -53,7 +67,7 @@ var _default = {
         "width": "139.3%",
         "height": "175%",
         "filterUnits": "objectBoundingBox",
-        "id": "2rmfwsc5q__u7lzzoc7wc"
+        "id": getId(3)
       }
     }, [h("feMorphology", {
       "attrs": {
@@ -93,7 +107,7 @@ var _default = {
         "width": "170.8%",
         "height": "525%",
         "filterUnits": "objectBoundingBox",
-        "id": "2rmfwsc5q__2j24stggwe"
+        "id": getId(4)
       }
     }, [h("feOffset", {
       "attrs": {
@@ -147,9 +161,9 @@ var _default = {
     }), h("path", {
       "attrs": {
         "d": "M12,0 L52,0 C58.627417,-1.21743675e-15 64,5.372583 64,12 L64,76 C64,82.627417 58.627417,88 52,88 L12,88 C5.372583,88 8.11624501e-16,82.627417 0,76 L0,12 C-8.11624501e-16,5.372583 5.372583,1.21743675e-15 12,0 Z",
-        "stroke": "url(#2rmfwsc5q__6oj76fxcba)",
+        "stroke": getUrlById(2),
         "stroke-width": "8",
-        "fill": "url(#2rmfwsc5q__14emiclh8b)",
+        "fill": getUrlById(1),
         "transform": "translate(65 54)"
       }
     }), h("g", {
@@ -159,7 +173,7 @@ var _default = {
     }, [h("use", {
       "attrs": {
         "fill": "#000",
-        "filter": "url(#2rmfwsc5q__u7lzzoc7wc)",
+        "filter": getUrlById(3),
         "href": "#2rmfwsc5q__qij95mlwxd"
       }
     }), h("use", {
@@ -175,7 +189,7 @@ var _default = {
     }, [h("use", {
       "attrs": {
         "fill": "#000",
-        "filter": "url(#2rmfwsc5q__2j24stggwe)",
+        "filter": getUrlById(4),
         "href": "#2rmfwsc5q__pnuynj40wf"
       }
     }), h("use", {

package/lib/index.js

@@ -313,7 +313,7 @@ exports.Toast = _toast.default;
 var _uploader = _interopRequireDefault(require("./uploader"));
 
 exports.Uploader = _uploader.default;
-var version = '2.0.87';
+var version = '2.0.89';
 exports.version = version;
 
 function install(Vue) {

package/lib/popover/index.js

@@ -5,6 +5,12 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 exports.__esModule = true;
 exports.default = void 0;
 
+var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
+
+var _babelHelperVueJsxMergeProps = _interopRequireDefault(require("@vue/babel-helper-vue-jsx-merge-props"));
+
+var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
+
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 
 var _popperjs = require("@vant/popperjs");
@@ -19,6 +25,8 @@ var _icon = _interopRequireDefault(require("../icon"));
 
 var _popup = _interopRequireDefault(require("../popup"));
 
+var _dom = require("@floating-ui/dom");
+
 // Mixins
 // Components
 var _createNamespace = (0, _utils.createNamespace)('popover'),
@@ -61,10 +69,31 @@ var _default2 = createComponent({
     closeOnClickAction: {
       type: Boolean,
       default: true
+    },
+    customClass: {
+      type: String,
+      default: ''
+    },
+    autoAdjustOverflow: {
+      type: Boolean,
+      default: false
     }
   },
   watch: {
-    value: 'updateLocation',
+    value: {
+      handler: function handler(val) {
+        var _this = this;
+
+        if (val) {
+          this.$nextTick(function () {
+            _this.autoUpdatePopup();
+          });
+        }
+
+        this.updateLocation();
+      },
+      immediate: true
+    },
     placement: 'updateLocation'
   },
   mounted: function mounted() {
@@ -93,25 +122,111 @@ var _default2 = createComponent({
         })]
       });
     },
+    autoUpdatePopup: function autoUpdatePopup() {
+      if (this.$refs.wrapper && this.$refs.popover && this.autoAdjustOverflow) {
+        (0, _dom.autoUpdate)(this.$refs.wrapper, this.$refs.popover.$el, this.updatePopup, {
+          elementResize: typeof ResizeObserver !== 'undefined'
+        });
+      }
+    },
+    updatePopup: function updatePopup() {
+      var _this2 = this;
+
+      return (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee() {
+        var popoverEl, wrapperEl, _yield$computePositio, x, y, realPlacement, middlewareData, popupTop;
+
+        return _regenerator.default.wrap(function _callee$(_context) {
+          while (1) {
+            switch (_context.prev = _context.next) {
+              case 0:
+                if (!(_this2.$refs.wrapper && _this2.$refs.popover.$el && _this2.$refs.arrow)) {
+                  _context.next = 15;
+                  break;
+                }
+
+                popoverEl = _this2.$refs.popover.$el;
+                wrapperEl = _this2.$refs.wrapper;
+                _context.next = 5;
+                return (0, _dom.computePosition)(wrapperEl, popoverEl, {
+                  placement: _this2.placement,
+                  middleware: [(0, _dom.offset)(8), (0, _dom.shift)({
+                    padding: 4,
+                    crossAxis: false,
+                    limiter: (0, _dom.limitShift)()
+                  }), (0, _dom.flip)(), (0, _dom.hide)(), (0, _dom.arrow)({
+                    element: _this2.$refs.arrow,
+                    padding: 6
+                  })]
+                });
+
+              case 5:
+                _yield$computePositio = _context.sent;
+                x = _yield$computePositio.x;
+                y = _yield$computePositio.y;
+                realPlacement = _yield$computePositio.placement;
+                middlewareData = _yield$computePositio.middlewareData;
+                popupTop = y; // 当被包裹元素超出屏幕时，对坐标进行特殊处理，先处理顶部超出，不然再处理底部超出
+
+                if (y < 0) {
+                  popupTop = 0;
+                } else if (y > 0 && y + popoverEl.offsetHeight > document.body.clientHeight) {
+                  popupTop = document.body.clientHeight - popoverEl.offsetHeight;
+                }
+
+                _this2.$refs.popover.$el.setAttribute('data-popper-placement', realPlacement); // 这里手动指定popup placement位置，避免滚动时出现popup弹窗位置闪烁
+
+
+                _this2.popper.setOptions({
+                  placement: realPlacement
+                });
+
+                _this2.$nextTick(function () {
+                  var _middlewareData$arrow;
+
+                  (0, _extends2.default)(_this2.$refs.popover.$el.style, {
+                    left: x + "px",
+                    top: popupTop + "px"
+                  });
+
+                  var _ref = (_middlewareData$arrow = middlewareData.arrow) != null ? _middlewareData$arrow : {},
+                      arrowX = _ref.x,
+                      arrowY = _ref.y;
+
+                  (0, _extends2.default)(_this2.$refs.arrow.style, {
+                    left: arrowX != null ? arrowX + "px" : '',
+                    top: arrowY != null ? arrowY + "px" : '',
+                    margin: 0
+                  });
+                });
+
+              case 15:
+              case "end":
+                return _context.stop();
+            }
+          }
+        }, _callee);
+      }))();
+    },
     updateLocation: function updateLocation() {
-      var _this = this;
+      var _this3 = this;
 
       this.$nextTick(function () {
-        if (!_this.value) {
+        if (!_this3.value) {
           return;
         }
 
-        if (!_this.popper) {
-          _this.popper = _this.createPopper();
-        } else {
-          _this.popper.setOptions({
-            placement: _this.placement
+        if (!_this3.popper) {
+          _this3.popper = _this3.createPopper();
+        } else if (!_this3.autoAdjustOverflow) {
+          // 通过floating-ui调整popup位置时，这里需要规避，使用floating-ui来控制popup placement
+          _this3.popper.setOptions({
+            placement: _this3.placement
           });
         }
       });
     },
     renderAction: function renderAction(action, index) {
-      var _this2 = this;
+      var _this4 = this;
 
       var h = this.$createElement;
       var icon = action.icon,
@@ -128,7 +243,7 @@ var _default2 = createComponent({
         }), className],
         "on": {
           "click": function click() {
-            return _this2.onClickAction(action, index);
+            return _this4.onClickAction(action, index);
           }
         }
       }, [icon && h(_icon.default, {
@@ -191,7 +306,7 @@ var _default2 = createComponent({
       "on": {
         "click": this.onClickWrapper
       }
-    }, [h(_popup.default, {
+    }, [h(_popup.default, (0, _babelHelperVueJsxMergeProps.default)([{
       "ref": "popover",
       "attrs": {
         "value": this.value,
@@ -201,7 +316,7 @@ var _default2 = createComponent({
         "lockScroll": false,
         "getContainer": this.getContainer
       },
-      "class": bem([this.theme]),
+      "class": [bem([this.theme]), this.customClass],
       "on": {
         "open": this.onOpen,
         "close": this.onClose,
@@ -212,7 +327,10 @@ var _default2 = createComponent({
       "nativeOn": {
         "touchstart": this.onTouchstart
       }
-    }, [h("div", {
+    }, {
+      "attrs": this.$attrs
+    }]), [h("div", {
+      "ref": "arrow",
       "class": bem('arrow')
     }), h("div", {
       "class": bem('content'),