dolphin-weex-ui 2.0.5 → 2.0.7

package/CHANGELOG.md

@@ -1,5 +1,15 @@
 # 升级日志
 
+## 2.0.7
+
+- [ ! ] 优化dof-popup、dof-overlay组件交互逻辑
+- [ ! ] date: 2024/02/03
+
+## 2.0.6
+
+- [ ! ] 优化UI走查包括dof-minibar组件垂直居中问题
+- [ ! ] date: 2024/01/22
+
 ## 2.0.5
 
 - [ ! ] 优化UI走查包括dof-popup，dof-button组件渲染抖动的问题

package/dist/index.native.js

@@ -28171,13 +28171,6 @@ var animation = weex.requireModule('animation'); //
 //
 //
 //
-//
-//
-//
-//
-//
-//
-//
 
 exports.default = {
   mixins: [_colmo2.default],
@@ -28209,6 +28202,33 @@ exports.default = {
       default: true
     }
   },
+  data: function data() {
+    return {
+      show_: false,
+      isIOS: weex.config.env.osName == 'iOS'
+    };
+  },
+
+  watch: {
+    show: {
+      handler: function handler(val) {
+        var _this = this;
+
+        if (val) {
+          this.show_ = true;
+          this.hasAnimation && setTimeout(function () {
+            _this.appearOverlay(true);
+          }, 50);
+        } else {
+          this.hasAnimation && this.appearOverlay(false, this.duration, function () {
+            _this.show_ = false;
+          });
+        }
+      },
+
+      immediate: true
+    }
+  },
   computed: {
     overlayStyle: function overlayStyle() {
       return {
@@ -28219,23 +28239,6 @@ exports.default = {
     _opacity: function _opacity() {
       if (this.opacity !== undefined) return this.opacity;
       return this._isColmo ? 0.75 : 0.3;
-    },
-    shouldShow: function shouldShow() {
-      var _this = this;
-
-      var show = this.show,
-          hasAnimation = this.hasAnimation;
-
-      try {
-        hasAnimation && setTimeout(function () {
-          _this.appearOverlay(show);
-        }, 50);
-      } catch (error) {
-        this.$nextTick(function () {
-          _this.appearOverlay(show);
-        });
-      }
-      return show;
     }
   },
   methods: {
@@ -28246,6 +28249,7 @@ exports.default = {
       var _this2 = this;
 
       var duration = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : this.duration;
+      var cb = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : function () {};
       var hasAnimation = this.hasAnimation,
           timingFunction = this.timingFunction,
           canAutoClose = this.canAutoClose;
@@ -28256,15 +28260,17 @@ exports.default = {
       if (hasAnimation && overlayEl) {
         animation.transition(overlayEl, {
           styles: {
-            opacity: bool ? 1 : 0
+            opacity: bool ? 1 : this.isIOS ? 0.05 : 0
           },
           duration: duration,
           timingFunction: timingFunction[bool ? 0 : 1],
           delay: 0
         }, function () {
+          cb();
           needEmit && _this2.$emit('dofOverlayBodyClicked', {});
         });
       } else {
+        cb();
         needEmit && this.$emit('dofOverlayBodyClicked', {});
       }
     }
@@ -30272,14 +30278,6 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 //
 //
 //
-//
-//
-//
-//
-//
-//
-//
-//
 
 var animation = weex.requireModule('animation');
 var platform = weex.config.env.platform;
@@ -30349,8 +30347,7 @@ exports.default = {
       haveOverlay: true,
       isOverShow: true,
       bottomArc: 0,
-      show_: false,
-      overlayShow: false
+      show_: false
     };
   },
   computed: {
@@ -30371,18 +30368,6 @@ exports.default = {
       weex.config.env.deviceModel === 'Iphone14,3') //iPhone 13 Pro Max
       ;
     },
-    // isNeedShow() {
-    //   try {
-    //     setTimeout(() => {
-    //       this.appearPopup(this.show_)
-    //     }, 50)
-    //   } catch (error) {
-    //     this.$nextTick(() => {
-    //       this.appearPopup(this.show_)
-    //     })
-    //   }
-    //   return this.show_
-    // },
     _height: function _height() {
       var height = this.height,
           isipx = this.isipx,
@@ -30450,16 +30435,14 @@ exports.default = {
       handler: function handler(val) {
         var _this2 = this;
 
-        this.overlayShow = val;
         if (val) {
           setTimeout(function () {
             _this2.show_ = true;
           }, 80);
         } else {
-          this.appearPopup(false);
-          setTimeout(function () {
+          this.appearPopup(false, 300, function () {
             _this2.show_ = false;
-          }, this.overlayCfg.duration || 300);
+          });
         }
       },
 
@@ -30469,7 +30452,6 @@ exports.default = {
   mounted: function mounted() {
     var _this3 = this;
 
-    this.appearPopup(this.show, 150);
     _dolphinNativeBridge.Bridge.getAllBarHeight().then(function (res) {
       _this3.bottomArc = res.bottomArc || 0;
     });
@@ -30498,6 +30480,7 @@ exports.default = {
       var _this4 = this;
 
       var duration = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 300;
+      var cb = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : function () {};
 
       this.isShow = bool;
       var popupEl = this.$refs['dof-popup'];
@@ -30511,6 +30494,7 @@ exports.default = {
         duration: duration,
         delay: 0
       }, this.animation), function () {
+        cb();
         if (!bool) {
           _this4.$emit('dofPopupOverlayClicked', { pos: _this4.pos });
         }
@@ -48547,7 +48531,9 @@ module.exports={render:function (){var _vm=this;var _h=_vm.$createElement;var _c
       "src": _vm.leftButton_
     }
   }) : _vm._e(), (!_vm.leftButton_ && !_vm.leftText && _vm._isColmo) ? _c('dof-iconfont', {
-    staticClass: ["left-button"],
+    staticStyle: {
+      width: "58px"
+    },
     attrs: {
       "code": '\u4717',
       "size": 64,
@@ -48966,7 +48952,7 @@ module.exports={render:function (){var _vm=this;var _h=_vm.$createElement;var _c
   }, [_c('dof-overlay', _vm._b({
     ref: "overlay",
     attrs: {
-      "show": _vm.overlayShow
+      "show": _vm.show
     },
     on: {
       "dofOverlayBodyClicked": _vm.dofOverlayBodyClicking
@@ -48976,8 +48962,7 @@ module.exports={render:function (){var _vm=this;var _h=_vm.$createElement;var _c
     class: ['dof-popup', _vm.pos],
     style: _vm.padStyle,
     attrs: {
-      "height": _vm._height,
-      "hack": _vm.isNeedShow
+      "height": _vm._height
     },
     on: {
       "click": function () {}
@@ -50586,13 +50571,10 @@ module.exports.render._withStripped = true
 /***/ (function(module, exports) {
 
 module.exports={render:function (){var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;
-  return _c('div', [(_vm.show) ? _c('div', {
+  return _c('div', [(_vm.show_) ? _c('div', {
     ref: "midea-overlay",
     staticClass: ["midea-overlay"],
     style: _vm.overlayStyle,
-    attrs: {
-      "hack": _vm.shouldShow
-    },
     on: {
       "click": _vm.overlayClicked
     }