From 3ef487c7b0b98615df03ba5f2c8b45be53be961c Mon Sep 17 00:00:00 2001 From: mumuy Date: Tue, 16 Nov 2021 08:44:15 +0800 Subject: [PATCH] =?UTF-8?q?updated=20bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dist/relationship.js | 14 ++++++++---- dist/relationship.min.js | 3 +-- index.html | 46 +++++++++++++++++++++++++--------------- script/relationship.js | 14 ++++++++---- style/index.css | 4 ++-- 5 files changed, 52 insertions(+), 29 deletions(-) diff --git a/dist/relationship.js b/dist/relationship.js index 7d3246f..cfdfeea 100644 --- a/dist/relationship.js +++ b/dist/relationship.js @@ -1990,9 +1990,13 @@ break; } } - var mid_sex = 0; - if(to_arr[i-1].match(/([fhs1](&[ol])?|[olx]b)$/)){ - mid_sex=1; + var mid_sex = -1; + if(to_arr[i-1]){ + if(to_arr[i-1].match(/([fhs1](&[ol])?|[olx]b)$/)){ + mid_sex=1; + }else{ + mid_sex=0; + } } var sex = -1; if(to){ @@ -2005,6 +2009,8 @@ if(i){ var from_sub = from_arr.slice(i).join(','); var to_sub = to_arr.slice(i).join(','); + + console.log('#from_sub#',mid_sex,from_sub,to_sub,reverseId(to_sub,mid_sex)); return { 'selector':(to_sub?','+reverseId(to_sub,mid_sex):'')+(from_sub?','+from_sub:''), 'sex':sex @@ -2033,7 +2039,7 @@ from_selectors.forEach(function(from){ to_selectors.forEach(function(to){ var data = mergeSelector(from,to); - // console.log('#data#',data); + console.log('#data#',data); sex = data['sex']>-1?data['sex']:options.sex; var ids = selector2id(data['selector'],sex); // console.log('[ids]',ids); diff --git a/dist/relationship.min.js b/dist/relationship.min.js index dc89249..f7b18bc 100644 --- a/dist/relationship.min.js +++ b/dist/relationship.min.js @@ -1,2 +1 @@ -!function(s,f){"object"==typeof module&&module.exports?module.exports=f():s.relationship=f()}("undefined"!=typeof window?window:this,function(){function s(s){s=s.replace(/[二|三|四|五|六|七|八|九|十]{1,2}/g,"x");for(var f=s.replace(/我的?/,"").replace(/家的?/,"的").split("的"),x=[],d=!0;f.length;){var m=f.shift(),b=[],w=!1;for(var l in h){var o=h[l];o.indexOf(m)>-1&&(!l&&f.length||b.push(l),w=!0)}if(w||(d=!1),x.length){for(var e=[],l=0;l-1&&(s=","+f+s),s.match(/,[w0],w|,[h1],h/))return!1;var m=function(s){var f="";if(!d[s]){d[s]=!0;var b=!0;do{f=s;for(var h in w){var l=w[h];if(s=s.replace(l.exp,l.str),s.indexOf("#")>-1){for(var o=s.split("#"),e=0;e-1?d="&l":s.indexOf("&l")>-1&&(d="&o"),s){s=s.replace(/&[ol]/g,""),f=f?1:0;var m=(","+f+","+s).replace(/,[fhs]|,[olx]b/g,",1").replace(/,[mwd]|,[olx]s/g,",0");m=m.substring(0,m.lastIndexOf(","));for(var b=s.split(",").reverse(),w=m.split(",").reverse(),h=[],l=0;l-1?l.sex:h.sex;for(var e=f(l.selector,o),r=0;r setTimeout(function(){ if(location.hostname.indexOf('passer-by.com')<0){ - location.href = 'http://passer-by.com/'; + //location.href = 'http://passer-by.com/'; }else if( window.top != window.self ) { window.top.location = self.location.href; } @@ -117,6 +117,17 @@

计算结果:

+
+

使用案例

+

1. 使用别称查询:

+

姥姥的爸爸的老窦 / 娘子的爹地的母亲 / 岳丈的妈咪

+

2. 使用合称查询:

+

舅舅的孙辈 / 爸爸的祖父母 / 姑妈的兄弟姐妹

+

3. 大小数字混合查询:

+

儿子的大舅的二姑妈的七舅姥爷

+

4. 不限制方向祖辈孙辈跨度,反复查询:

+

舅妈的婆婆的外甥的姨妈的侄子的爷爷

+
@@ -135,12 +146,19 @@

计算结果:

+
+

应用场景

+

“七舅姥爷”和我是什么关系?

+

“姑表舅表哥”和我是什么关系?

+
- +
+
+
称呼方式:
+
+
- +
@@ -166,28 +186,20 @@

计算结果:

+
+

应用场景

+

外舅公是我妈的谁?

+

我爸应该叫舅老爷什么?

+

我岳父应该叫我弟弟什么?

+
-
- -

由于工作生活节奏不同,如今很多关系稍疏远的亲戚之间来往并不多。因此放假回家过年时,往往会搞不清楚哪位亲戚应该喊什么称呼,很是尴尬。然而搞不清亲戚关系和亲戚称谓的不仅是小孩,就连年轻一代的大人也都常常模糊混乱。

“中国亲戚关系计算器”为你避免了这种尴尬,只需简单的输入即可算出称谓。输入框兼容了不同的叫法,你可以称呼父亲为:“老爸”、“爹地”、“老爷子”等等,方面不同地域的习惯叫法。

-
-

使用案例

-

1. 使用别称查询:

-

姥姥的爸爸的老窦 / 娘子的爹地的母亲 / 岳丈的妈咪

-

2. 使用合称查询:

-

舅舅的孙辈 / 爸爸的祖父母 / 姑妈的兄弟姐妹

-

3. 大小数字混合查询:

-

儿子的大舅的二姑妈的七舅姥爷

-

4. 不限制方向祖辈孙辈跨度,反复查询:

-

舅妈的婆婆的外甥的姨妈的侄子的爷爷

-

Follow @mumuy Star

diff --git a/script/relationship.js b/script/relationship.js index 7d3246f..cfdfeea 100644 --- a/script/relationship.js +++ b/script/relationship.js @@ -1990,9 +1990,13 @@ break; } } - var mid_sex = 0; - if(to_arr[i-1].match(/([fhs1](&[ol])?|[olx]b)$/)){ - mid_sex=1; + var mid_sex = -1; + if(to_arr[i-1]){ + if(to_arr[i-1].match(/([fhs1](&[ol])?|[olx]b)$/)){ + mid_sex=1; + }else{ + mid_sex=0; + } } var sex = -1; if(to){ @@ -2005,6 +2009,8 @@ if(i){ var from_sub = from_arr.slice(i).join(','); var to_sub = to_arr.slice(i).join(','); + + console.log('#from_sub#',mid_sex,from_sub,to_sub,reverseId(to_sub,mid_sex)); return { 'selector':(to_sub?','+reverseId(to_sub,mid_sex):'')+(from_sub?','+from_sub:''), 'sex':sex @@ -2033,7 +2039,7 @@ from_selectors.forEach(function(from){ to_selectors.forEach(function(to){ var data = mergeSelector(from,to); - // console.log('#data#',data); + console.log('#data#',data); sex = data['sex']>-1?data['sex']:options.sex; var ids = selector2id(data['selector'],sex); // console.log('[ids]',ids); diff --git a/style/index.css b/style/index.css index 9ed9827..5ee7e4c 100644 --- a/style/index.css +++ b/style/index.css @@ -222,7 +222,7 @@ a:hover{ margin-right: 10px; } .mod-panel .ft{ - padding-top: 20px; + padding-top: 10px; border-top:1px dotted #e0e0e0; } .mod-panel .about{ @@ -243,7 +243,7 @@ a:hover{ } .mod-panel .intro{ padding: 15px 20px; - margin-bottom: 15px; + margin: 15px 0; background: #f5f5f6; border-radius: 6px; }