DataType
/
omi
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

omi-router - supports url with query parameters

This commit is contained in:
dntzhang 2018-11-11 16:48:32 +08:00
parent 43203f51f2
commit e0ea27a4e0
3 changed files with 45 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
packages/omi-router/examples/simple/bundler.js
View File

@ -1612,7 +1612,8 @@ function _inherits(subClass, superClass) { if (typeof superClass !== "function"
_this2.data.tag = 'my-home';
});
route('/about', function () {
route('/about', function (params, query) {
console.log(query);
_this2.data.tag = 'my-about';
});
@ -1680,6 +1681,15 @@ function _inherits(subClass, superClass) { if (typeof superClass !== "function"
{ href: '#/user-list' },
'UserList'
)
),
Omi.h(
'li',
null,
Omi.h(
'a',
{ href: '#/about?name=dntzhang&age=18' },
'About Dntzhang'
)
)
),
Omi.h(
@ -1720,7 +1730,7 @@ var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol
exports.default = route;
/*!
* omi-router v2.0.3 by dntzhang
* omi-router v2.0.4 by dntzhang
* Router for Omi.
* Github: https://github.com/Tencent/omi
* MIT Licensed.
@ -1752,11 +1762,11 @@ function change(evt) {
var path = window.location.hash.replace('#', '');
var notFound = true;
Object.keys(mapping).every(function (key) {
var toArr = path.match(mapping[key].reg);
var toArr = path.split('?')[0].match(mapping[key].reg);
if (toArr) {
var pathArr = key.match(mapping[key].reg);
root.route.params = getParams(toArr, pathArr);
mapping[key].callback(root.route.params);
mapping[key].callback(root.route.params, getUrlParams(path));
notFound = false;
return false;
}
@ -1799,6 +1809,20 @@ function getGlobal() {
}
return global;
}
function getUrlParams(url) {
url = url.replace(/#.*$/, '');
var queryArray = url.split(/[?&]/).slice(1);
var i,
args = {};
for (i = 0; i < queryArray.length; i++) {
var match = queryArray[i].match(/([^=]+)=([^=]+)/);
if (match !== null) {
args[match[1]] = decodeURIComponent(match[2]);
}
}
return args;
}
/* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(1)))
/***/ }),

4
packages/omi-router/examples/simple/main.js
View File

@ -15,7 +15,8 @@ define('my-app', class extends WeElement {
this.data.tag = 'my-home'
})
route('/about', () => {
route('/about', (params, query) => {
console.log(query)
this.data.tag = 'my-about'
})
@ -74,6 +75,7 @@ define('my-app', class extends WeElement {
<li><a href="#/" >Home</a></li>
<li><a href="#/about" >About</a></li>
<li><a href="#/user-list" >UserList</a></li>
<li><a href="#/about?name=dntzhang&age=18" >About Dntzhang</a></li>
</ul>
<div id="view">
<data.tag params={data.params} />

16
packages/omi-router/index.js
View File

@ -31,11 +31,11 @@ function change(evt) {
var path = window.location.hash.replace('#', '')
var notFound = true
Object.keys(mapping).every(function(key){
var toArr = path.match(mapping[key].reg)
var toArr = path.split('?')[0].match(mapping[key].reg)
if (toArr) {
var pathArr = key.match(mapping[key].reg)
root.route.params = getParams(toArr, pathArr)
mapping[key].callback(root.route.params)
mapping[key].callback(root.route.params, getUrlParams(path))
notFound = false
return false
}
@ -90,3 +90,15 @@ function getGlobal() {
return global
}
function getUrlParams(url) {
url = url.replace(/#.*$/, '')
var queryArray = url.split(/[?&]/).slice(1)
var i, args = {}
for (i = 0; i < queryArray.length; i++) {
var match = queryArray[i].match(/([^=]+)=([^=]+)/)
if (match !== null) {
args[match[1]] = decodeURIComponent(match[2])
}
}
return args
}