chore: merge

packages/uni-cli-shared/src/json/mp/pages.ts

@@ -40,6 +40,24 @@ export function mergeMiniProgramAppJson(
   })
 }
 
+function normalizeUsingComponentsPath(
+  usingComponents: PageWindowOptions['usingComponents'],
+  platform: UniApp.PLATFORM
+) {
+  if (platform === 'mp-baidu') {
+    const flag = './'
+    const _usingComponents: PageWindowOptions['usingComponents'] = {}
+    for (const key in usingComponents) {
+      const componentPath = usingComponents[key]
+      _usingComponents[key] = componentPath.startsWith(flag)
+        ? componentPath.replace(flag, '/')
+        : componentPath
+    }
+    return _usingComponents
+  }
+  return usingComponents
+}
+
 function parsePagesJson(
   jsonStr: string,
   platform: UniApp.PLATFORM,
@@ -135,7 +153,10 @@ function parsePagesJson(
     const { usingComponents } = windowOptions as PageWindowOptions
     if (usingComponents) {
       delete (windowOptions as PageWindowOptions).usingComponents
-      appJson.usingComponents = usingComponents
+      appJson.usingComponents = normalizeUsingComponentsPath(
+        usingComponents,
+        platform
+      )
     } else {
       delete appJson.usingComponents
     }

packages/uni-mp-vue/dist/vue.runtime.esm.js

@@ -1413,10 +1413,17 @@ function queueJob(job) {
         queueFlush();
     }
 }
+// fixed by xxxxxx
+function sleep(ms) {
+    return () => {
+        return new Promise(resolve => setTimeout(() => resolve(void 0), ms));
+    };
+}
 function queueFlush() {
     if (!isFlushing && !isFlushPending) {
         isFlushPending = true;
-        currentFlushPromise = resolvedPromise.then(flushJobs);
+        // fixed by xxxxxx 延迟执行，避免同一批次的事件执行时机不正确，对性能可能有略微影响 https://github.com/dcloudio/uni-app/issues/3228
+        currentFlushPromise = resolvedPromise.then(sleep(0)).then(flushJobs);
     }
 }
 function invalidateJob(job) {

packages/uni-mp-vue/lib/vue.runtime.esm.js

@@ -1413,10 +1413,17 @@ function queueJob(job) {
         queueFlush();
     }
 }
+// fixed by xxxxxx
+function sleep(ms) {
+    return () => {
+        return new Promise(resolve => setTimeout(() => resolve(void 0), ms));
+    };
+}
 function queueFlush() {
     if (!isFlushing && !isFlushPending) {
         isFlushPending = true;
-        currentFlushPromise = resolvedPromise.then(flushJobs);
+        // fixed by xxxxxx 延迟执行，避免同一批次的事件执行时机不正确，对性能可能有略微影响 https://github.com/dcloudio/uni-app/issues/3228
+        currentFlushPromise = resolvedPromise.then(sleep(0)).then(flushJobs);
     }
 }
 function invalidateJob(job) {