dolphin-weex-ui 2.1.3 → 2.1.5

package/CHANGELOG.md

@@ -1,5 +1,15 @@
 # 升级日志
 
+## 2.1.5
+
+- [ ! ] 修复dof-popover组件在scroller滑动后位置不准确问题
+- [ ! ] date: 2024/05/09
+
+## 2.1.4
+
+- [ ! ] 新增dof-popover组件按钮组功能
+- [ ! ] date: 2024/05/07
+
 ## 2.1.3
 
 - [ ! ] 新增dof-popover组件

package/dist/index.native.js

@@ -30233,6 +30233,8 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 
+var _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; };
+
 var _imgs = __webpack_require__(155);
 
 var _imgs2 = _interopRequireDefault(_imgs);
@@ -30307,6 +30309,15 @@ function _asyncToGenerator(fn) { return function () { var gen = fn.apply(this, a
 //
 //
 //
+//
+//
+//
+//
+//
+//
+//
+//
+//
 
 var env = weex.config.env;
 
@@ -30554,13 +30565,13 @@ exports.default = {
       var layoutDirection = this.layoutDirection;
 
       if (layoutDirection === 'row') {
-        return {
+        return _extends({}, this.innerContentStyle, {
           flexDirection: 'row'
-        };
+        });
       } else {
-        return {
+        return _extends({}, this.innerContentStyle, {
           flexDirection: 'column'
-        };
+        });
       }
     },
     btnInnerStyle: function btnInnerStyle() {
@@ -30595,6 +30606,7 @@ exports.default = {
       if (this.animationLock) {
         return;
       }
+      if (this.elPos.el) this.handleElPos(this.elPos);
       this.show = true;
       if (this.hasAnimation) {
         setTimeout(function () {
@@ -30738,10 +30750,18 @@ exports.default = {
           while (1) {
             switch (_context.prev = _context.next) {
               case 0:
-                _context.next = 2;
-                return _this5.getPosition(val.el);
+                if (val.el) {
+                  _context.next = 2;
+                  break;
+                }
+
+                return _context.abrupt('return');
 
               case 2:
+                _context.next = 4;
+                return _this5.getPosition(val.el);
+
+              case 4:
                 res = _context.sent;
 
                 if (_this5.arrowPosition.pos === 'top' || !_this5.arrowPosition.pos) {
@@ -30757,7 +30777,7 @@ exports.default = {
                   _this5.position_ = { x: res.left - 285 + _this5.elPos.offsetX, y: res.top - 15 + _this5.elPos.offsetY };
                 }
 
-              case 7:
+              case 9:
               case 'end':
                 return _context.stop();
             }
@@ -43332,9 +43352,7 @@ module.exports = {
   "i-btn": {
     "flexDirection": "row",
     "justifyContent": "space-between",
-    "alignItems": "center",
-    "paddingLeft": "20",
-    "paddingRight": "20"
+    "alignItems": "center"
   },
   "row-layout": {
     "paddingLeft": "36",
@@ -43362,10 +43380,11 @@ module.exports = {
   },
   "btn-text": {
     "flex": 1,
-    "height": "80",
+    "height": "96",
     "fontSize": "28",
-    "lineHeight": "80",
-    "color": "#232323"
+    "lineHeight": "96",
+    "color": "#232323",
+    "marginLeft": "8"
   },
   "btn-text-theme-dark": {
     "color": "#ffffff"
@@ -48866,15 +48885,26 @@ module.exports={render:function (){var _vm=this;var _h=_vm.$createElement;var _c
           _vm.dofButtonClicked(i, item.key)
         }
       }
-    }, [(item.icon) ? _c('image', {
+    }, [(item.icon && !_vm._isColmo) ? _c('image', {
       staticClass: ["btn-icon"],
       attrs: {
         "src": item.icon
       }
+    }) : _vm._e(), (item.icon && _vm._isColmo) ? _c('dof-iconfont', {
+      attrs: {
+        "code": item.icon,
+        "size": 56,
+        "color": _vm.textStyle.color ? _vm.textStyle.color : 'rgba(255,255,255,0.80)'
+      },
+      on: {
+        "dofIconFontClicked": function($event) {
+          _vm.dofButtonClicked(i, item.key)
+        }
+      }
     }) : _vm._e(), _c('text', {
       class: ['btn-text', _vm.theme !== 'white' && 'btn-text-theme-dark'],
       style: _vm.textStyle
-    }, [_vm._v(_vm._s(item.text))])])
+    }, [_vm._v(_vm._s(item.text))])], 1)
   }))]) : _vm._e(), (_vm.show && !_vm.buttons.length) ? _c('div', {
     ref: "dof-popover",
     staticClass: ["g-popover"],
@@ -48885,13 +48915,14 @@ module.exports={render:function (){var _vm=this;var _h=_vm.$createElement;var _c
   }, [_c('div', {
     class: ['u-popover-arrow', _vm.theme !== 'white' && 'u-popover-theme-dark'],
     style: _vm.arrowStyle
-  }), _vm._t("default", [_c('div', {
+  }), _c('div', {
     ref: "dof-inner-popover",
     staticClass: ["content-inner"],
     style: _vm.innerContentStyle
-  }, [_c('text', {
-    staticClass: ["textContent"]
-  }, [_vm._v(_vm._s(_vm.textContent))]), (_vm.isShowClose) ? _c('div', {
+  }, [_vm._t("default", [_c('text', {
+    staticClass: ["textContent"],
+    style: _vm.textStyle
+  }, [_vm._v(_vm._s(_vm.textContent))]), _vm._t("icon", [(_vm.isShowClose) ? _c('div', {
     staticClass: ["closeBox"],
     on: {
       "click": function($event) {
@@ -48914,7 +48945,7 @@ module.exports={render:function (){var _vm=this;var _h=_vm.$createElement;var _c
         _vm.$emit('clickedCloseBtn')
       }
     }
-  })], 1) : _vm._e()])])], 2) : _vm._e()])
+  })], 1) : _vm._e()])])], 2)]) : _vm._e()])
 },staticRenderFns: []}
 module.exports.render._withStripped = true