@dcloudio/vue-cli-plugin-uni 2.0.2-5000720260410001 → 2.0.2-5010520260709001

package/packages/h5-vue/dist/vue.esm.browser.js

@@ -1,6 +1,6 @@
 /*!
  * Vue.js v2.6.11
- * (c) 2014-2022 Evan You
+ * (c) 2014-2026 Evan You
  * Released under the MIT License.
  */
 /*  */
@@ -524,7 +524,7 @@ const hasProto = '__proto__' in {};
 const inBrowser = typeof window !== 'undefined';
 const inWeex = typeof WXEnvironment !== 'undefined' && !!WXEnvironment.platform;
 const weexPlatform = inWeex && WXEnvironment.platform.toLowerCase();
-const UA = inBrowser && window.navigator.userAgent.toLowerCase();
+const UA = inBrowser && window.navigator && window.navigator.userAgent && window.navigator.userAgent.toLowerCase();
 const isIE = UA && /msie|trident/.test(UA);
 const isIE9 = UA && UA.indexOf('msie 9.0') > 0;
 const isEdge = UA && UA.indexOf('edge/') > 0;
@@ -1038,7 +1038,8 @@ function observe (value, asRootData) {
     !isServerRendering() &&
     (Array.isArray(value) || isPlainObject(value)) &&
     Object.isExtensible(value) &&
-    !value._isVue
+    !value._isVue &&
+    !value.__v_isMPComponent
   ) {
     ob = new Observer(value);
   }
@@ -2748,7 +2749,8 @@ function renderSlot (
   name,
   fallback,
   props,
-  bindObject
+  bindObject,
+  slotVm
 ) {
   const scopedSlotFn = this.$scopedSlots[name];
   let nodes;
@@ -2764,7 +2766,7 @@ function renderSlot (
       props = extend(extend({}, bindObject), props);
     }
     // fixed by xxxxxx app-plus scopedSlot
-    nodes = scopedSlotFn(props, this, props._i) || fallback;
+    nodes = scopedSlotFn(props, slotVm || this, props._i) || fallback;
   } else {
     nodes = this.$slots[name] || fallback;
   }
@@ -7962,11 +7964,67 @@ function getStyle (vnode, checkChild) {
 const cssVarRE = /^--/;
 const importantRE = /\s*!important$/;
 
+// rpx2rem
+const defaultRpx2Unit = {
+  unit: 'rem',
+  unitRatio: 10 / 320,
+  unitPrecision: 5
+};
+
+const Rpx2Unit = Object.assign({}, defaultRpx2Unit);
+
+function getRpx2Unit () {
+  return Rpx2Unit
+}
+
+function toFixed (number, precision) {
+  const multiplier = Math.pow(10, precision + 1);
+  const wholeNumber = Math.floor(number * multiplier);
+  return (Math.round(wholeNumber / 10) * 10) / multiplier
+}
+
+function _rpx2Unit (rpx, unit, unitRatio, unitPrecision) {
+  if (unitRatio === 1) {
+    return `${rpx}${unit}`
+  }
+  const value = toFixed(rpx * unitRatio, unitPrecision);
+  return value === 0 ? '0' : `${value}${unit}`
+}
+
+function createRpx2Unit (unit, unitRatio, unitPrecision) {
+  // ignore: rpxCalcIncludeWidth
+  /**
+   * @param {string | number} val
+   * @returns {string}
+   */
+  return (val) => {
+    if (typeof val === 'string') {
+      return val.replace(unitRE, (m, $1) => {
+        if (!$1) {
+          return m
+        }
+
+        return _rpx2Unit(parseFloat($1), unit, unitRatio, unitPrecision)
+      })
+    } else if (typeof val === 'number') {
+      return _rpx2Unit(val, unit, unitRatio, unitPrecision)
+    }
+  }
+}
+
+const rpx2unit = createRpx2Unit(getRpx2Unit().unit, getRpx2Unit().unitRatio, getRpx2Unit().unitPrecision);
+
 // upx,rpx 正则匹配
 const unitRE = /\b([+-]?\d+(\.\d+)?)[r|u]px\b/g;
 
 const transformUnit = (val) => {
   if (typeof val === 'string') {
+    try {
+      const config = __uniConfig.globalStyle || __uniConfig.window || {};
+      if (config.dynamicRpx === true) {
+        return rpx2unit(val)
+      }
+    } catch (error) {}
     return val.replace(unitRE, (a, b) => {
       /* eslint-disable no-undef */
       return uni.upx2px(b) + 'px'
@@ -11205,7 +11263,7 @@ class CodegenState {
   
   
   
-
+  
   constructor (options) {
     this.options = options;
     this.warn = options.warn || baseWarn;
@@ -11617,12 +11675,17 @@ function genScopedSlot (
   el,
   state
 ) {
+  state.isInScopeSlot = true;
   const isLegacySyntax = el.attrsMap['slot-scope'];
   if (el.if && !el.ifProcessed && !isLegacySyntax) {
-    return genIf(el, state, genScopedSlot, `null`)
+    const res = genIf(el, state, genScopedSlot, `null`);
+    state.isInScopeSlot = false;
+    return res
   }
   if (el.for && !el.forProcessed) {
-    return genFor(el, state, genScopedSlot)
+    const res = genFor(el, state, genScopedSlot);
+    state.isInScopeSlot = false;
+    return res
   }
   const slotScope = el.slotScope === emptySlotScopeToken
     ? ``
@@ -11636,7 +11699,9 @@ function genScopedSlot (
     }}`;
   // reverse proxy v-slot without scope on this.$slots
   const reverseProxy = slotScope ? `` : `,proxy:true`;
-  return `{key:${el.slotTarget || `"default"`},fn:${fn}${reverseProxy}}`
+  const res = `{key:${el.slotTarget || `"default"`},fn:${fn}${reverseProxy}}`;
+  state.isInScopeSlot = false;
+  return res
 }
 
 function genChildren (
@@ -11725,7 +11790,6 @@ function genComment (comment) {
 function genSlot (el, state) {
   const slotName = el.slotName || '"default"';
   const children = genChildren(el, state);
-  let res = `_t(${slotName}${children ? `,${children}` : ''}`;
   const attrs = el.attrs || el.dynamicAttrs
     ? genProps((el.attrs || []).concat(el.dynamicAttrs || []).map(attr => ({
         // slot props are camelized
@@ -11735,16 +11799,16 @@ function genSlot (el, state) {
       })))
     : null;
   const bind$$1 = el.attrsMap['v-bind'];
-  if ((attrs || bind$$1) && !children) {
-    res += `,null`;
-  }
-  if (attrs) {
-    res += `,${attrs}`;
-  }
-  if (bind$$1) {
-    res += `${attrs ? '' : ',null'},${bind$$1}`;
-  }
-  return res + ')'
+ 
+  const args = [];
+  args.push(slotName);
+  args.push(children || 'null');
+  args.push(attrs || 'null');
+  args.push(bind$$1 || 'null');
+  if (state.isInScopeSlot) {
+    args.push('_svm');
+  }
+  return `_t(${args.join(',')})`
 }
 
 // componentName is el.component, take it as argument to shun flow's pessimistic refinement