feat(runtime): add exists for redirectTo

fsinbad · Aug 19, 2020 · eb5c684 · eb5c684
1 parent cf87a14
commit eb5c684
Show file tree

Hide file tree

Showing 33 changed files with 1,019 additions and 339 deletions.
diff --git a/build/rollup.config.mp.js b/build/rollup.config.mp.js
@@ -56,6 +56,9 @@ module.exports = {
   plugins: [
     alias({
       entries: [{
+        find: 'uni-shared/query',
+        replacement: path.resolve(__dirname, '../src/shared/query.js')
+      }, {
         find: 'uni-shared',
         replacement: path.resolve(__dirname, '../src/shared/util.js')
       }, {
@@ -77,4 +80,4 @@ module.exports = {
     })
   ],
   external: ['vue']
-}
+}
diff --git a/packages/uni-app-plus/dist/index.js b/packages/uni-app-plus/dist/index.js
@@ -426,12 +426,17 @@ function wrapper (methodName, method) {
       }
 
       arg1 = processArgs(methodName, arg1, options.args, options.returnValue);
-
-      const args = [arg1];
-      if (typeof arg2 !== 'undefined') {
-        args.push(arg2);
+
+      const args = [arg1];
+      if (typeof arg2 !== 'undefined') {
+        args.push(arg2);
       }
-      const returnValue = wx[options.name || methodName].apply(wx, args);
+      if (isFn(options.name)) {
+        methodName = options.name(arg1);
+      } else if (isStr(options.name)) {
+        methodName = options.name;
+      }
+      const returnValue = wx[methodName].apply(wx, args);
       if (isSyncApi(methodName)) { // 同步 api
         return processReturnValue(methodName, returnValue, options.returnValue, isContextApi(methodName))
       }
@@ -1147,10 +1152,10 @@ function handleEvent (event) {
             eventArray[2],
             isCustom,
             methodName
-          ) || [];
+          );
           // 参数尾部增加原始事件对象用于复杂表达式内获取额外数据
           // eslint-disable-next-line no-sparse-arrays
-          ret.push(handler.apply(handlerCtx, params.concat([, , , , , , , , , , event])));
+          ret.push(handler.apply(handlerCtx, (Array.isArray(params) ? params : []).concat([, , , , , , , , , , event])));
         }
       });
     }
@@ -1346,6 +1351,49 @@ function createApp (vm) {
   return vm
 }
 
+const encodeReserveRE = /[!'()*]/g;
+const encodeReserveReplacer = c => '%' + c.charCodeAt(0).toString(16);
+const commaRE = /%2C/g;
+
+// fixed encodeURIComponent which is more conformant to RFC3986:
+// - escapes [!'()*]
+// - preserve commas
+const encode = str => encodeURIComponent(str)
+  .replace(encodeReserveRE, encodeReserveReplacer)
+  .replace(commaRE, ',');
+
+function stringifyQuery (obj, encodeStr = encode) {
+  const res = obj ? Object.keys(obj).map(key => {
+    const val = obj[key];
+
+    if (val === undefined) {
+      return ''
+    }
+
+    if (val === null) {
+      return encodeStr(key)
+    }
+
+    if (Array.isArray(val)) {
+      const result = [];
+      val.forEach(val2 => {
+        if (val2 === undefined) {
+          return
+        }
+        if (val2 === null) {
+          result.push(encodeStr(key));
+        } else {
+          result.push(encodeStr(key) + '=' + encodeStr(val2));
+        }
+      });
+      return result.join('&')
+    }
+
+    return encodeStr(key) + '=' + encodeStr(val)
+  }).filter(x => x.length > 0).join('&') : null;
+  return res ? `?${res}` : ''
+}
+
 function parseBaseComponent (vueComponentOptions, {
   isPage,
   initRelation
@@ -1470,9 +1518,13 @@ function parseBasePage (vuePageOptions, {
 
   initHooks(pageOptions.methods, hooks$2, vuePageOptions);
 
-  pageOptions.methods.onLoad = function (args) {
-    this.$vm.$mp.query = args; // 兼容 mpvue
-    this.$vm.__call_hook('onLoad', args);
+  pageOptions.methods.onLoad = function (query) {
+    this.options = query;
+    this.$page = {
+      fullPath: '/' + this.route + stringifyQuery(query)
+    };
+    this.$vm.$mp.query = query; // 兼容 mpvue
+    this.$vm.__call_hook('onLoad', query);
   };
 
   return pageOptions