dolphin-weex-ui 2.1.8 → 2.2.0

package/CHANGELOG.md

@@ -1,9 +1,19 @@
 # 升级日志
 
+## 2.2.0
+
+- [ ! ] 修复dof-card、dof-modal、dof-popover2、dof-switch等 web端显示问题
+- [ ! ] date: 2024/08/14
+
+## 2.1.9
+
+- [ ! ] 修复dof-tab-page、dof-slider等 web端显示问题
+- [ ! ] date: 2024/08/14
+
 ## 2.1.8
 
 - [ ! ] 优化dof-cell、dof-iconfont组件，支持使用自定义字体图标
-- [ ! ] date: 2024/05/23
+- [ ! ] date: 2024/05/31
 
 ## 2.1.7
 

package/dist/index.native.js

@@ -1615,7 +1615,7 @@ var _dofCatalog = __webpack_require__(18);
 
 var _dofCatalog2 = _interopRequireDefault(_dofCatalog);
 
-var _dofCell = __webpack_require__(11);
+var _dofCell = __webpack_require__(10);
 
 var _dofCell2 = _interopRequireDefault(_dofCell);
 
@@ -1711,7 +1711,7 @@ var _dofIconfont = __webpack_require__(2);
 
 var _dofIconfont2 = _interopRequireDefault(_dofIconfont);
 
-var _dofImage = __webpack_require__(12);
+var _dofImage = __webpack_require__(11);
 
 var _dofImage2 = _interopRequireDefault(_dofImage);
 
@@ -1747,7 +1747,7 @@ var _dofMarquee = __webpack_require__(22);
 
 var _dofMarquee2 = _interopRequireDefault(_dofMarquee);
 
-var _dofMask = __webpack_require__(13);
+var _dofMask = __webpack_require__(12);
 
 var _dofMask2 = _interopRequireDefault(_dofMask);
 
@@ -2094,32 +2094,17 @@ exports.Utils = _utils2.default; /**
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.getBoundingClientRectBase = getBoundingClientRectBase;
-exports.getBoundingClientRect = getBoundingClientRect;
-exports.getBoundingClientRectAsync = getBoundingClientRectAsync;
-var dom = weex.requireModule('dom');
-
-function getBoundingClientRectBase(element, func) {
-  dom && dom.getComponentRect(element, func);
-}
 
-function getBoundingClientRect(element, func) {
-  var delay = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 50;
+var _index = __webpack_require__(200);
 
-  setTimeout(function () {
-    return dom && dom.getComponentRect(element, func);
-  }, delay);
-}
+Object.defineProperty(exports, 'default', {
+  enumerable: true,
+  get: function get() {
+    return _interopRequireDefault(_index).default;
+  }
+});
 
-function getBoundingClientRectAsync(element) {
-  return new Promise(function (resolve) {
-    setTimeout(function () {
-      return dom && dom.getComponentRect(element, function (res) {
-        return res.result && resolve(res.size);
-      });
-    }, 0);
-  });
-}
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 /***/ }),
 /* 11 */
@@ -2132,7 +2117,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 
-var _index = __webpack_require__(200);
+var _index = __webpack_require__(226);
 
 Object.defineProperty(exports, 'default', {
   enumerable: true,
@@ -2154,7 +2139,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 
-var _index = __webpack_require__(226);
+var _index = __webpack_require__(236);
 
 Object.defineProperty(exports, 'default', {
   enumerable: true,
@@ -2175,17 +2160,32 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
+exports.getBoundingClientRectBase = getBoundingClientRectBase;
+exports.getBoundingClientRect = getBoundingClientRect;
+exports.getBoundingClientRectAsync = getBoundingClientRectAsync;
+var dom = weex.requireModule('dom');
 
-var _index = __webpack_require__(236);
+function getBoundingClientRectBase(element, func) {
+  dom && dom.getComponentRect(element, func);
+}
 
-Object.defineProperty(exports, 'default', {
-  enumerable: true,
-  get: function get() {
-    return _interopRequireDefault(_index).default;
-  }
-});
+function getBoundingClientRect(element, func) {
+  var delay = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 50;
 
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+  setTimeout(function () {
+    return dom && dom.getComponentRect(element, func);
+  }, delay);
+}
+
+function getBoundingClientRectAsync(element) {
+  return new Promise(function (resolve) {
+    setTimeout(function () {
+      return dom && dom.getComponentRect(element, function (res) {
+        return res.result && resolve(res.size);
+      });
+    }, 0);
+  });
+}
 
 /***/ }),
 /* 14 */
@@ -18500,7 +18500,7 @@ var _mixSelectableChild = __webpack_require__(35);
 
 var _transition = __webpack_require__(38);
 
-var _dom = __webpack_require__(10);
+var _dom = __webpack_require__(13);
 
 var _arrow_up = __webpack_require__(134);
 
@@ -18646,6 +18646,8 @@ exports.default = {
           _this.bodyHeight = res.size.height;
           if (_this.collapsed_) {
             _this.collapseBody(0);
+          } else {
+            _this.expandeBody();
           }
         });
       });
@@ -20056,7 +20058,7 @@ var _extends = Object.assign || function (target) { for (var i = 1; i < argument
 // import util from './setting/util';
 
 
-var _dofImage = __webpack_require__(12);
+var _dofImage = __webpack_require__(11);
 
 var _dofImage2 = _interopRequireDefault(_dofImage);
 
@@ -21464,7 +21466,7 @@ var _dofIconfont2 = _interopRequireDefault(_dofIconfont);
 
 var _transition = __webpack_require__(38);
 
-var _dom = __webpack_require__(10);
+var _dom = __webpack_require__(13);
 
 var _arrow_up = __webpack_require__(140);
 
@@ -21705,7 +21707,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 
-var _dofImage = __webpack_require__(12);
+var _dofImage = __webpack_require__(11);
 
 var _dofImage2 = _interopRequireDefault(_dofImage);
 
@@ -22706,6 +22708,7 @@ Object.defineProperty(exports, "__esModule", {
 //
 //
 //
+//
 
 exports.default = {
   props: {
@@ -23638,7 +23641,7 @@ var _extends = Object.assign || function (target) { for (var i = 1; i < argument
 
 var _range = __webpack_require__(141);
 
-var _dom = __webpack_require__(10);
+var _dom = __webpack_require__(13);
 
 exports.default = {
   props: {
@@ -25772,7 +25775,7 @@ var _extends = Object.assign || function (target) { for (var i = 1; i < argument
 //
 //
 
-var _dofMask = __webpack_require__(13);
+var _dofMask = __webpack_require__(12);
 
 var _dofMask2 = _interopRequireDefault(_dofMask);
 
@@ -26575,7 +26578,7 @@ var _dofOverlay = __webpack_require__(5);
 
 var _dofOverlay2 = _interopRequireDefault(_dofOverlay);
 
-var _dofImage = __webpack_require__(12);
+var _dofImage = __webpack_require__(11);
 
 var _dofImage2 = _interopRequireDefault(_dofImage);
 
@@ -28535,7 +28538,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 
-var _dofMask = __webpack_require__(13);
+var _dofMask = __webpack_require__(12);
 
 var _dofMask2 = _interopRequireDefault(_dofMask);
 
@@ -30333,7 +30336,6 @@ function _asyncToGenerator(fn) { return function () { var gen = fn.apply(this, a
 //
 //
 //
-//
 
 var env = weex.config.env;
 
@@ -31564,7 +31566,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 
-var _dofCell = __webpack_require__(11);
+var _dofCell = __webpack_require__(10);
 
 var _dofCell2 = _interopRequireDefault(_dofCell);
 
@@ -31794,7 +31796,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 
-var _dofCell = __webpack_require__(11);
+var _dofCell = __webpack_require__(10);
 
 var _dofCell2 = _interopRequireDefault(_dofCell);
 
@@ -34218,7 +34220,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 
-var _dofMask = __webpack_require__(13);
+var _dofMask = __webpack_require__(12);
 
 var _dofMask2 = _interopRequireDefault(_dofMask);
 
@@ -35964,7 +35966,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 
-var _dom = __webpack_require__(10);
+var _dom = __webpack_require__(13);
 
 var _colmo = __webpack_require__(0);
 
@@ -36136,7 +36138,8 @@ var _extends = Object.assign || function (target) { for (var i = 1; i < argument
 //
 //
 
-var _dom = __webpack_require__(10);
+// import { getBoundingClientRect } from '../utils/dom.js'
+
 
 var _mathExtension = __webpack_require__(173);
 
@@ -36150,6 +36153,16 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 
 function _asyncToGenerator(fn) { return function () { var gen = fn.apply(this, arguments); return new Promise(function (resolve, reject) { function step(key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { return Promise.resolve(value).then(function (value) { step("next", value); }, function (err) { step("throw", err); }); } } return step("next"); }); }; }
 
+var dom = weex.requireModule('dom');
+
+var getBoundingClientRect = function getBoundingClientRect(element, func) {
+  var delay = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 50;
+
+  setTimeout(function () {
+    return dom && dom.getComponentRect(element, func);
+  }, delay);
+};
+
 exports.default = {
   mixins: [_colmo2.default],
   props: {
@@ -36226,7 +36239,8 @@ exports.default = {
       startRight: null,
       prevScreenX: null,
       isTouching: false,
-      isShow: false
+      isShow: false,
+      getWidthRectTime: 0
     };
   },
 
@@ -36321,7 +36335,7 @@ exports.default = {
         top: (this._trackHeight - this.trackHeight) / 2 + 'px',
         left: buttonPadding + 'px',
         right: buttonPadding + 'px',
-        height: this.trackHeight,
+        height: this.trackHeight + 'px',
         borderRadius: this.trackHeight / 2 + 'px'
       };
       if (this.barColor) {
@@ -36375,17 +36389,25 @@ exports.default = {
     }
   },
   mounted: function mounted() {
-    var _this = this;
-
-    (0, _dom.getBoundingClientRect)(this.$refs.track, function (res) {
-      if (res.result) {
-        // 实际可滑动长度（可变化范围）= bar宽度 - btn宽度
-        _this.width = res.size.width - _this._trackHeight;
-      }
-    }, this.delay);
+    this.getRect();
   },
 
   methods: {
+    getRect: function getRect() {
+      var _this = this;
+
+      getBoundingClientRect(this.$refs.track, function (res) {
+        if (res.result && res.size.width !== 0) {
+          // 实际可滑动长度（可变化范围）= bar宽度 - btn宽度
+          _this.width = res.size.width - _this._trackHeight;
+        } else {
+          _this.getWidthRectTime < 6 ? setTimeout(function () {
+            _this.getWidthRectTime++;
+            _this.getRect();
+          }, 50) : _this.width = res.size.width - _this._trackHeight;
+        }
+      }, this.delay);
+    },
     onTouchStart: function onTouchStart(e) {
       var _this2 = this;
 
@@ -36461,9 +36483,10 @@ exports.default = {
       var diff = delta / total * this.scope;
 
       this.current = this.startValue + diff;
+      this.prevScreenX = e.changedTouches[0].screenX;
 
+      if (delta === 0) return;
       this.update(this.current);
-      this.prevScreenX = e.changedTouches[0].screenX;
     },
     onTouchEnd: function onTouchEnd(e) {
       var _this3 = this;
@@ -36553,7 +36576,7 @@ exports.default = {
       var _this4 = this;
 
       return new Promise(function (resolve, reject) {
-        (0, _dom.getBoundingClientRect)(_this4.$refs.bar, function (res) {
+        getBoundingClientRect(_this4.$refs.bar, function (res) {
           if (res.result) {
             resolve({
               left: res.size.left,
@@ -36562,7 +36585,8 @@ exports.default = {
           }
         }, 0);
       });
-    }
+    },
+    maskTouchStart: function maskTouchStart() {}
   }
 };
 
@@ -37684,7 +37708,7 @@ var _utils = __webpack_require__(1);
 
 var _utils2 = _interopRequireDefault(_utils);
 
-var _dofCell = __webpack_require__(11);
+var _dofCell = __webpack_require__(10);
 
 var _dofCell2 = _interopRequireDefault(_dofCell);
 
@@ -37872,7 +37896,6 @@ var animation = weex.requireModule('animation'); //
 //
 //
 //
-//
 
 var modal = weex.requireModule('modal');
 var dom = weex.requireModule('dom');
@@ -37963,7 +37986,12 @@ exports.default = {
         this.movingDistance(webEndX - this.webStarX, node, this.$refs.skid[i]);
       }
     },
-
+    handleHorizontalpan: function handleHorizontalpan(e, item, index) {
+      !this.isAndroid && this.onPanStart(e, item, index, item.rightItem ? item.rightItem.length : 0);
+    },
+    handlePanEnd: function handlePanEnd(e, item, index) {
+      this.onPanEnd(e, item, index);
+    },
 
     // 使用官方的pan事件解决某些ios设备使用@swipe不能滑动的问题
     onPanStart: function onPanStart(e, node, i, len) {
@@ -37976,8 +38004,9 @@ exports.default = {
         this.mobileX = 0;
       }
       this.saveIdx = i;
-      !_utils2.default.env.isWeb() ? this.mobile(e, node, i, len) : this.web(e, node, i);
-      e.stopPropagation();
+      this.mobile(e, node, i, len);
+      // !Utils.env.isWeb() ? this.mobile(e, node, i, len) : this.web(e, node, i)
+      // e.stopPropagation()
     },
     web: function web(e, node, i) {
       this.webStarX = e.changedTouches[0].pageX;
@@ -38046,7 +38075,8 @@ exports.default = {
         _this2.cellCanClick = true;
       }, 100);
     },
-    slideMenu: function slideMenu(e, index, length) {
+    slideMenu: function slideMenu(e, index, item) {
+      var length = item.rightItem.length;
       this.cellCanClick = false;
       var listItems = this.$refs.menuItem;
       var ele = this.$refs.menuItem[index];
@@ -38955,6 +38985,10 @@ var _dofSpinner = __webpack_require__(8);
 
 var _dofSpinner2 = _interopRequireDefault(_dofSpinner);
 
+var _utils2 = __webpack_require__(1);
+
+var _utils3 = _interopRequireDefault(_utils2);
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 //
@@ -39166,6 +39200,7 @@ exports.default = {
     rightDotStyle: function rightDotStyle() {
       var offset = 46;
       if (this._isColmo && this.type === 'default' || this.type === 'colmo') offset = 50;
+      if (_utils3.default.env.isWeb()) offset = 46;
       return {
         backgroundColor: this._dotColor,
         transform: 'translateX(' + offset + 'px) scale(2.25)'
@@ -40187,7 +40222,7 @@ exports.default = {
         isActiveTitleBold: false,
         bgColor: '#151617',
         titleColor: 'rgba(255,255,255,0.4)',
-        activeTitleColor: 'rgba(255,255,255,0.8);',
+        activeTitleColor: 'rgba(255,255,255,0.8)',
         boxBgColor: '#151617',
         activeBoxBgColor: '#151617',
         activeBottomColor: '#B35336',
@@ -43063,7 +43098,6 @@ module.exports = {
   "footer-more-btn": {
     "alignItems": "center",
     "justifyContent": "center",
-    "flex": 1,
     "height": "90",
     "borderTopWidth": "1",
     "position": "relative"
@@ -45325,7 +45359,6 @@ module.exports = {
     "position": "absolute",
     "right": 0,
     "top": 0,
-    "borderTopWidth": "2",
     "transform": "rotateZ(-77deg)",
     "transformOrigin": "right top"
   },
@@ -45340,12 +45373,23 @@ module.exports = {
     "borderTopWidth": "4",
     "top": "-2",
     "left": "-3",
+    "right": "-3",
     "position": "absolute"
   },
   "border-bottom": {
     "height": "4",
     "bottom": "-2",
-    "position": "absolute"
+    "position": "absolute",
+    "left": "-3",
+    "right": "-3"
+  },
+  "slash": {
+    "width": "2",
+    "position": "absolute",
+    "top": "0",
+    "bottom": "0",
+    "transformOrigin": "center center",
+    "transform": "rotate(13deg)"
   },
   "flex-1": {
     "flex": 1
@@ -48887,7 +48931,6 @@ module.exports={render:function (){var _vm=this;var _h=_vm.$createElement;var _c
     class: ['u-popover-inner', _vm.theme !== 'white' && 'u-popover-theme-dark'],
     style: _vm.popoverInnerStyle,
     attrs: {
-      "scrollDirection": "horizontal",
       "showScrollbar": "false"
     }
   }, _vm._l((_vm.buttons), function(item, i) {
@@ -49999,7 +50042,7 @@ module.exports={render:function (){var _vm=this;var _h=_vm.$createElement;var _c
   }, [_vm._t("default")], 2) : _vm._e(), (_vm.isGradientBar && _vm.disabled) ? _c('div', {
     staticClass: ["dof-slider-disabled-mask"],
     on: {
-      "touchstart": function () {}
+      "touchstart": _vm.maskTouchStart
     }
   }) : _vm._e()])
 },staticRenderFns: []}
@@ -50113,7 +50156,7 @@ 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.isAndroid) ? _c('div', {
+  return _c('div', [(!_vm.isIOS) ? _c('div', {
     staticClass: ["container"],
     style: {
       width: _vm._cellWidth + 'px',
@@ -50130,7 +50173,7 @@ module.exports={render:function (){var _vm=this;var _h=_vm.$createElement;var _c
       },
       on: {
         "swipe": function($event) {
-          _vm.slideMenu($event, index, item.rightItem.length)
+          _vm.slideMenu($event, index, item)
         },
         "touchend": _vm.touchend
       }
@@ -50203,8 +50246,12 @@ module.exports={render:function (){var _vm=this;var _h=_vm.$createElement;var _c
         width: _vm._cellWidth + _vm.rightWidth(item) + 'px'
       },
       on: {
-        "horizontalpan": function (e) { return !_vm.isAndroid && _vm.onPanStart(e, item, index, item.rightItem ? item.rightItem.length : 0); },
-        "panend": function (e) { return _vm.onPanEnd(e, item, index); }
+        "horizontalpan": function($event) {
+          _vm.handleHorizontalpan(_vm.event, item, index)
+        },
+        "panend": function($event) {
+          _vm.handlePanEnd(_vm.event, item, index)
+        }
       }
     }, [(_vm.padding) ? _c('div', {
       style: {
@@ -50958,19 +51005,13 @@ module.exports={render:function (){var _vm=this;var _h=_vm.$createElement;var _c
     }, [_vm._v(_vm._s(tab.label.length > _vm.labelMaxLen ? tab.label.slice(0, _vm.labelMaxLen) + '...' : tab.label))])]), (i !== _vm.dataLen - 1) ? _c('div', {
       staticClass: ["tabLine"],
       style: Object.assign({
-          backgroundColor: _vm.bgColor,
-          // 'background-color': touchActive === i ? touchColor : bgColor,
-          'border-left-color': _vm.touchActive === i ? _vm.touchColor : 'transparent',
-          'border-right-color': _vm.touchActive - 1 === i ? _vm.touchColor : 'transparent',
-          'border-left-width': !(_vm.tabActive === i || _vm.tabActive - 1 === i) ? '0px' : '2px',
-          'border-right-width': !(_vm.tabActive === i || _vm.tabActive - 1 === i) ? '0px' : '3px'
+          backgroundColor: _vm.bgColor
         },
         _vm.tabLineStyle
       )
     }, [_c('div', {
       staticClass: ["tabLineMaskDown"],
       style: Object.assign({
-          'border-color': _vm.tabActive === i || _vm.tabActive - 1 === i ? _vm.activeBorderColor : 'transparent',
           'background-color': _vm.touchActive - 1 === i ? _vm.touchColor : _vm.bgColor
         },
         _vm.maskStyle
@@ -50985,17 +51026,23 @@ module.exports={render:function (){var _vm=this;var _h=_vm.$createElement;var _c
     }), _c('div', {
       staticClass: ["border-top"],
       style: {
-        'border-color': _vm.tabActive === i ? _vm.activeBorderColor : _vm.borderColor,
+        'border-color': _vm.tabActive === i ? _vm.activeBorderColor : _vm.borderColor
         // 优化边缘显示
-        width: _vm.tabActive - 1 === i ? _vm.itemHeight / 4 - 1 + 'px' : _vm.itemHeight / 4 + 3 + 'px'
+        // width: tabActive - 1 === i ? itemHeight / 4 - 1 + 'px' : itemHeight / 4 + 3 + 'px'
       }
     }), _c('div', {
       staticClass: ["border-bottom"],
       style: Object.assign({
           'background-color': _vm.tabActive - 1 === i ? _vm.activeBorderColor : _vm.borderColor
-        },
-        _vm.fakeBorderStyle
+        }
+        // fakeBorderStyle
       )
+    }), _c('div', {
+      staticClass: ["slash"],
+      style: {
+        left: _vm.itemHeight / 8 - 1 + 'px',
+        'background-color': _vm.tabActive === i || _vm.tabActive - 1 === i ? _vm.activeBorderColor : 'transparent'
+      }
     })]) : _vm._e()])
   }))])
 },staticRenderFns: []}