dolphin-weex-ui 1.4.2 → 1.4.3

package/CHANGELOG.md

@@ -1,5 +1,10 @@
 # 升级日志
 
+## 1.4.3
+
+- [ ! ] 修复dof-badge样式问题
+- [ ! ] date: 2023/11/15
+
 ## 1.4.2
 
 - [ ! ] 修复dof-slider禁用后背景色显示问题

package/dist/index.native.js

@@ -1539,7 +1539,7 @@ var _dofCatalog = __webpack_require__(15);
 
 var _dofCatalog2 = _interopRequireDefault(_dofCatalog);
 
-var _dofCell = __webpack_require__(7);
+var _dofCell = __webpack_require__(8);
 
 var _dofCell2 = _interopRequireDefault(_dofCell);
 
@@ -1627,7 +1627,7 @@ var _dofIconButton = __webpack_require__(59);
 
 var _dofIconButton2 = _interopRequireDefault(_dofIconButton);
 
-var _dofImage = __webpack_require__(8);
+var _dofImage = __webpack_require__(9);
 
 var _dofImage2 = _interopRequireDefault(_dofImage);
 
@@ -1659,7 +1659,7 @@ var _dofMarquee = __webpack_require__(18);
 
 var _dofMarquee2 = _interopRequireDefault(_dofMarquee);
 
-var _dofMask = __webpack_require__(9);
+var _dofMask = __webpack_require__(10);
 
 var _dofMask2 = _interopRequireDefault(_dofMask);
 
@@ -1988,17 +1988,32 @@ exports.Utils = _utils2.default; /**
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
+exports.getBoundingClientRectBase = getBoundingClientRectBase;
+exports.getBoundingClientRect = getBoundingClientRect;
+exports.getBoundingClientRectAsync = getBoundingClientRectAsync;
+var dom = weex.requireModule('dom');
 
-var _index = __webpack_require__(174);
+function getBoundingClientRectBase(element, func) {
+  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.getComponentRect(element, func);
+  }, delay);
+}
+
+function getBoundingClientRectAsync(element) {
+  return new Promise(function (resolve) {
+    setTimeout(function () {
+      return dom.getComponentRect(element, function (res) {
+        return res.result && resolve(res.size);
+      });
+    }, 0);
+  });
+}
 
 /***/ }),
 /* 8 */
@@ -2011,7 +2026,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 
-var _index = __webpack_require__(198);
+var _index = __webpack_require__(174);
 
 Object.defineProperty(exports, 'default', {
   enumerable: true,
@@ -2033,7 +2048,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 
-var _index = __webpack_require__(207);
+var _index = __webpack_require__(198);
 
 Object.defineProperty(exports, 'default', {
   enumerable: true,
@@ -2054,32 +2069,17 @@ 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');
-
-function getBoundingClientRectBase(element, func) {
-  dom.getComponentRect(element, func);
-}
 
-function getBoundingClientRect(element, func) {
-  var delay = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 50;
+var _index = __webpack_require__(207);
 
-  setTimeout(function () {
-    return 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.getComponentRect(element, function (res) {
-        return res.result && resolve(res.size);
-      });
-    }, 0);
-  });
-}
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 /***/ }),
 /* 11 */
@@ -15545,6 +15545,16 @@ Object.defineProperty(exports, "__esModule", {
 //
 //
 //
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
 
 var dom = weex.requireModule('dom');
 var modal = weex.requireModule('modal');
@@ -16362,7 +16372,7 @@ var _mixSelectableChild = __webpack_require__(27);
 
 var _transition = __webpack_require__(30);
 
-var _dom = __webpack_require__(10);
+var _dom = __webpack_require__(7);
 
 var _arrow_up = __webpack_require__(123);
 
@@ -17740,7 +17750,7 @@ var _extends = Object.assign || function (target) { for (var i = 1; i < argument
 // import util from './setting/util';
 
 
-var _dofImage = __webpack_require__(8);
+var _dofImage = __webpack_require__(9);
 
 var _dofImage2 = _interopRequireDefault(_dofImage);
 
@@ -19110,7 +19120,7 @@ Object.defineProperty(exports, "__esModule", {
 
 var _transition = __webpack_require__(30);
 
-var _dom = __webpack_require__(10);
+var _dom = __webpack_require__(7);
 
 var _arrow_up = __webpack_require__(127);
 
@@ -19331,7 +19341,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 
-var _dofImage = __webpack_require__(8);
+var _dofImage = __webpack_require__(9);
 
 var _dofImage2 = _interopRequireDefault(_dofImage);
 
@@ -21206,7 +21216,7 @@ var _extends = Object.assign || function (target) { for (var i = 1; i < argument
 
 var _range = __webpack_require__(128);
 
-var _dom = __webpack_require__(10);
+var _dom = __webpack_require__(7);
 
 exports.default = {
   props: {
@@ -22848,7 +22858,7 @@ var _extends = Object.assign || function (target) { for (var i = 1; i < argument
 //
 //
 
-var _dofMask = __webpack_require__(9);
+var _dofMask = __webpack_require__(10);
 
 var _dofMask2 = _interopRequireDefault(_dofMask);
 
@@ -23637,7 +23647,7 @@ var _dofOverlay = __webpack_require__(3);
 
 var _dofOverlay2 = _interopRequireDefault(_dofOverlay);
 
-var _dofImage = __webpack_require__(8);
+var _dofImage = __webpack_require__(9);
 
 var _dofImage2 = _interopRequireDefault(_dofImage);
 
@@ -25178,7 +25188,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 
-var _dofMask = __webpack_require__(9);
+var _dofMask = __webpack_require__(10);
 
 var _dofMask2 = _interopRequireDefault(_dofMask);
 
@@ -27954,7 +27964,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 
-var _dofCell = __webpack_require__(7);
+var _dofCell = __webpack_require__(8);
 
 var _dofCell2 = _interopRequireDefault(_dofCell);
 
@@ -28203,7 +28213,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 
-var _dofCell = __webpack_require__(7);
+var _dofCell = __webpack_require__(8);
 
 var _dofCell2 = _interopRequireDefault(_dofCell);
 
@@ -30491,7 +30501,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 
-var _dofMask = __webpack_require__(9);
+var _dofMask = __webpack_require__(10);
 
 var _dofMask2 = _interopRequireDefault(_dofMask);
 
@@ -32167,20 +32177,8 @@ exports.default = {
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
+
+var _dom = __webpack_require__(7);
 
 exports.default = {
   props: {
@@ -32196,7 +32194,8 @@ exports.default = {
   },
   data: function data() {
     return {
-      isShow: false
+      isShow: false,
+      elWidth: 0
     };
   },
 
@@ -32217,22 +32216,60 @@ exports.default = {
         color: this.color,
         opacity: this.isShow ? 1 : 0
       };
-      var left = (this.value - this.$parent.min) / this.$parent.scope * this.$parent.width + this.$parent._trackHeight / 2;
+      var p = this.$parent;
+      var left = (this.value - p.min) / p.scope * p.width + p._trackHeight / 2;
       style.left = left + 'px';
 
+      // 防止超出的情况
       if (this.isFirst) {
         delete style.left;
-        style.left = this.$parent._trackHeight / 2 + 'px';
+        if (this.elWidth && p._trackHeight / 2 < this.elWidth / 2) {
+          style.left = this.elWidth / 2 + 'px';
+        } else {
+          style.left = p._trackHeight / 2 + 'px';
+        }
       }
       // 防止超出的情况
       if (this.isLast) {
         delete style.left;
-        style.right = this.$parent._trackHeight / 2 + 'px';
+        if (this.elWidth && p._trackHeight / 2 < this.elWidth / 2) {
+          style.right = this.elWidth / 2 + 'px';
+        } else {
+          style.right = p._trackHeight / 2 + 'px';
+        }
       }
       return style;
     }
+  },
+  mounted: function mounted() {
+    if (this.isFirst || this.isLast) this.initElWidth();
+  },
+
+  methods: {
+    initElWidth: function initElWidth() {
+      var _this = this;
+
+      var el = this.$refs['dof-slider-scale'];
+      (0, _dom.getBoundingClientRect)(el, function (res) {
+        res.result && (_this.elWidth = res.size.width);
+      });
+    }
   }
-};
+}; //
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
 
 /***/ }),
 /* 351 */
@@ -32303,7 +32340,7 @@ var _extends = Object.assign || function (target) { for (var i = 1; i < argument
 //
 //
 
-var _dom = __webpack_require__(10);
+var _dom = __webpack_require__(7);
 
 var _mathExtension = __webpack_require__(146);
 
@@ -32385,10 +32422,16 @@ exports.default = {
       dragTargetIndex: null, // 0 1
       startRight: null,
       prevScreenX: null,
-      isTouching: false
+      isTouching: false,
+      isShow: false
     };
   },
 
+  watch: {
+    barStyle: function barStyle() {
+      this.isShow = true;
+    }
+  },
   computed: {
     // 是否双侧
     isBoth: function isBoth() {
@@ -32519,6 +32562,7 @@ exports.default = {
       return this.width / 2;
     },
     disabledStyle: function disabledStyle() {
+      if (!this.isShow) return { opacity: 0 };
       return this.isGradientBar && this.disabled ? { opacity: 0.3 } : { opacity: 1 };
     }
   },
@@ -33657,7 +33701,7 @@ var _utils = __webpack_require__(0);
 
 var _utils2 = _interopRequireDefault(_utils);
 
-var _dofCell = __webpack_require__(7);
+var _dofCell = __webpack_require__(8);
 
 var _dofCell2 = _interopRequireDefault(_dofCell);
 
@@ -37814,7 +37858,11 @@ module.exports = {
     "paddingRight": "8",
     "paddingBottom": 0,
     "paddingLeft": "8",
-    "borderRadius": "15"
+    "borderRadius": "15",
+    "display": "flex",
+    "flexDirection": "row",
+    "justifyContent": "center",
+    "alignItems": "center"
   },
   "dof-badge-text-default": {
     "height": "36",
@@ -37822,7 +37870,11 @@ module.exports = {
     "paddingRight": "10",
     "paddingBottom": 0,
     "paddingLeft": "10",
-    "borderRadius": "18"
+    "borderRadius": "18",
+    "display": "flex",
+    "flexDirection": "row",
+    "justifyContent": "center",
+    "alignItems": "center"
   },
   "text-desc": {
     "textAlign": "center",
@@ -37830,11 +37882,13 @@ module.exports = {
   },
   "text-desc-default": {
     "fontSize": "24",
-    "lineHeight": "36"
+    "minWidth": "16",
+    "textAlign": "center"
   },
   "text-desc-small": {
     "fontSize": "20",
-    "lineHeight": "30"
+    "minWidth": "14",
+    "textAlign": "center"
   },
   "dof-badge-dot-default": {
     "width": "16",
@@ -39985,19 +40039,22 @@ module.exports = {
     "backgroundColor": "#7c879b"
   },
   "dof-slider-button": {
-    "position": "absolute",
-    "transitionProperty": "transform",
-    "transitionDuration": 300,
-    "transitionDelay": 0,
-    "transform": "scale(1)"
+    "position": "absolute"
   },
   "@TRANSITION": {
-    "dof-slider-button": {
+    "button-scale": {
       "property": "transform",
       "duration": 300,
       "delay": 0
     }
   },
+  "button-scale": {
+    "transitionProperty": "transform",
+    "transitionDuration": 300,
+    "transitionDelay": 0,
+    "transform": "scale(1)",
+    "transform:active": "scale(1.5)"
+  },
   "dof-slider-button-touching": {
     "transform": "scale(1.5)"
   },
@@ -44841,6 +44898,7 @@ module.exports.render._withStripped = true
 
 module.exports={render:function (){var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;
   return _c('text', {
+    ref: "dof-slider-scale",
     class: [
       'dof-slider-scale',
       !_vm.isFirst && !_vm.isLast && 'dof-slider-scale--mid',
@@ -45127,7 +45185,7 @@ module.exports={render:function (){var _vm=this;var _h=_vm.$createElement;var _c
   }) : _vm._e(), _vm._l((_vm.buttonStyle), function(itemStyle, i) {
     return _c('div', {
       key: i,
-      class: ['dof-slider-button', _vm.isTouching ? 'dof-slider-button-touching' : ''],
+      class: ['dof-slider-button', _vm.isGradientBar ? 'button-scale' : ''],
       style: itemStyle
     })
   })], 2)]), (_vm.$slots.default) ? _c('div', {