updated bug修复
This commit is contained in:
mumuy
parent
4924b1dd24
commit
f8fe8c9f56
12
dist/relationship.js
vendored
12
dist/relationship.js
vendored
@ -1785,10 +1785,14 @@
|
|||||||
var temp = item.replace(/[ol](?=s|b)/,'x').replace(/&[ol]/,''); //对特殊语法标识相互包含的行为去重
|
var temp = item.replace(/[ol](?=s|b)/,'x').replace(/&[ol]/,''); //对特殊语法标识相互包含的行为去重
|
||||||
if (temp!=item){
|
if (temp!=item){
|
||||||
if(!hash[temp]){
|
if(!hash[temp]){
|
||||||
result.push(item);
|
if(result.indexOf(item)==-1){
|
||||||
|
result.push(item);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}else{
|
}else{
|
||||||
result.push(item);
|
if(result.indexOf(item)==-1){
|
||||||
|
result.push(item);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return result;
|
return result;
|
||||||
@ -2009,8 +2013,6 @@
|
|||||||
if(i){
|
if(i){
|
||||||
var from_sub = from_arr.slice(i).join(',');
|
var from_sub = from_arr.slice(i).join(',');
|
||||||
var to_sub = to_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 {
|
return {
|
||||||
'selector':(to_sub?','+reverseId(to_sub,mid_sex):'')+(from_sub?','+from_sub:''),
|
'selector':(to_sub?','+reverseId(to_sub,mid_sex):'')+(from_sub?','+from_sub:''),
|
||||||
'sex':sex
|
'sex':sex
|
||||||
@ -2039,7 +2041,7 @@
|
|||||||
from_selectors.forEach(function(from){
|
from_selectors.forEach(function(from){
|
||||||
to_selectors.forEach(function(to){
|
to_selectors.forEach(function(to){
|
||||||
var data = mergeSelector(from,to);
|
var data = mergeSelector(from,to);
|
||||||
console.log('#data#',data);
|
// console.log('[data]',data);
|
||||||
sex = data['sex']>-1?data['sex']:options.sex;
|
sex = data['sex']>-1?data['sex']:options.sex;
|
||||||
var ids = selector2id(data['selector'],sex);
|
var ids = selector2id(data['selector'],sex);
|
||||||
// console.log('[ids]',ids);
|
// console.log('[ids]',ids);
|
||||||
|
|||||||
2
dist/relationship.min.js
vendored
2
dist/relationship.min.js
vendored
File diff suppressed because one or more lines are too long
@ -17,7 +17,7 @@
|
|||||||
<script type="text/javascript">
|
<script type="text/javascript">
|
||||||
setTimeout(function(){
|
setTimeout(function(){
|
||||||
if(location.hostname.indexOf('passer-by.com')<0){
|
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 ) {
|
}else if( window.top != window.self ) {
|
||||||
window.top.location = self.location.href;
|
window.top.location = self.location.href;
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1785,10 +1785,14 @@
|
|||||||
var temp = item.replace(/[ol](?=s|b)/,'x').replace(/&[ol]/,''); //对特殊语法标识相互包含的行为去重
|
var temp = item.replace(/[ol](?=s|b)/,'x').replace(/&[ol]/,''); //对特殊语法标识相互包含的行为去重
|
||||||
if (temp!=item){
|
if (temp!=item){
|
||||||
if(!hash[temp]){
|
if(!hash[temp]){
|
||||||
result.push(item);
|
if(result.indexOf(item)==-1){
|
||||||
|
result.push(item);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}else{
|
}else{
|
||||||
result.push(item);
|
if(result.indexOf(item)==-1){
|
||||||
|
result.push(item);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return result;
|
return result;
|
||||||
@ -2009,8 +2013,6 @@
|
|||||||
if(i){
|
if(i){
|
||||||
var from_sub = from_arr.slice(i).join(',');
|
var from_sub = from_arr.slice(i).join(',');
|
||||||
var to_sub = to_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 {
|
return {
|
||||||
'selector':(to_sub?','+reverseId(to_sub,mid_sex):'')+(from_sub?','+from_sub:''),
|
'selector':(to_sub?','+reverseId(to_sub,mid_sex):'')+(from_sub?','+from_sub:''),
|
||||||
'sex':sex
|
'sex':sex
|
||||||
@ -2039,7 +2041,7 @@
|
|||||||
from_selectors.forEach(function(from){
|
from_selectors.forEach(function(from){
|
||||||
to_selectors.forEach(function(to){
|
to_selectors.forEach(function(to){
|
||||||
var data = mergeSelector(from,to);
|
var data = mergeSelector(from,to);
|
||||||
console.log('#data#',data);
|
// console.log('[data]',data);
|
||||||
sex = data['sex']>-1?data['sex']:options.sex;
|
sex = data['sex']>-1?data['sex']:options.sex;
|
||||||
var ids = selector2id(data['selector'],sex);
|
var ids = selector2id(data['selector'],sex);
|
||||||
// console.log('[ids]',ids);
|
// console.log('[ids]',ids);
|
||||||
|
|||||||
@ -150,10 +150,12 @@ a:hover{
|
|||||||
display: inline-block;
|
display: inline-block;
|
||||||
width: 100%;
|
width: 100%;
|
||||||
height: 30px;
|
height: 30px;
|
||||||
|
background: #f8f8f8;
|
||||||
border: 1px solid #e8e8e8;
|
border: 1px solid #e8e8e8;
|
||||||
padding: 5px 10px;
|
padding: 5px 10px;
|
||||||
box-sizing: border-box;
|
box-sizing: border-box;
|
||||||
line-height: 20px;
|
line-height: 20px;
|
||||||
|
border-radius: 5px;
|
||||||
outline: none;
|
outline: none;
|
||||||
}
|
}
|
||||||
.mod-panel .bd .input-text-small{
|
.mod-panel .bd .input-text-small{
|
||||||
|
|||||||
@ -1,8 +1,8 @@
|
|||||||
<!DOCTYPE html><html lang=en><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><meta name=viewport content="width=device-width,initial-scale=1"><link rel=icon href=https://passer-by.com/relationship/vue/favicon.ico><title>亲戚关系计算器</title><link href=https://passer-by.com/relationship/vue/css/chunk-80f0de60.css rel=prefetch><link href=https://passer-by.com/relationship/vue/css/chunk-8fc02c0c.css rel=prefetch><link href=https://passer-by.com/relationship/vue/css/chunk-f5c56cf0.css rel=prefetch><link href=https://passer-by.com/relationship/vue/js/chunk-80f0de60.js rel=prefetch><link href=https://passer-by.com/relationship/vue/js/chunk-8fc02c0c.js rel=prefetch><link href=https://passer-by.com/relationship/vue/js/chunk-f5c56cf0.js rel=prefetch><link href=https://passer-by.com/relationship/vue/css/app.css rel=preload as=style><link href=https://passer-by.com/relationship/vue/js/app.js rel=preload as=script><link href=https://passer-by.com/relationship/vue/js/chunk-vendors.js rel=preload as=script><link href=https://passer-by.com/relationship/vue/css/app.css rel=stylesheet></head><body><noscript><strong>We're sorry but caipiao doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><script>setTimeout(function(){
|
<!DOCTYPE html><html lang=en><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><meta name=viewport content="width=device-width,initial-scale=1"><link rel=icon href=https://passer-by.com/relationship/vue/favicon.ico><title>亲戚关系计算器</title><meta name=keywords content=家庭称谓,亲戚称呼,亲戚称谓,亲戚叫法,亲戚关系计算器,亲戚计算器,称呼计算器,親戚關係稱呼,亲戚关系大全,叫什么,什么关系><meta name=description content=中国亲戚关系计算器手机版，走亲访友，逢年过节必备神器。它避免了叫错、不会叫亲戚的尴尬，人人必备家庭教育工具。><link href=https://passer-by.com/relationship/vue/css/chunk-80f0de60.css rel=prefetch><link href=https://passer-by.com/relationship/vue/css/chunk-9cf8e2c0.css rel=prefetch><link href=https://passer-by.com/relationship/vue/css/chunk-f5c56cf0.css rel=prefetch><link href=https://passer-by.com/relationship/vue/js/chunk-80f0de60.js rel=prefetch><link href=https://passer-by.com/relationship/vue/js/chunk-9cf8e2c0.js rel=prefetch><link href=https://passer-by.com/relationship/vue/js/chunk-f5c56cf0.js rel=prefetch><link href=https://passer-by.com/relationship/vue/css/app.css rel=preload as=style><link href=https://passer-by.com/relationship/vue/js/app.js rel=preload as=script><link href=https://passer-by.com/relationship/vue/js/chunk-vendors.js rel=preload as=script><link href=https://passer-by.com/relationship/vue/css/app.css rel=stylesheet></head><body><noscript><strong>We're sorry but caipiao doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><script>setTimeout(function(){
|
||||||
if(location.hostname.indexOf('passer-by.com')<0){
|
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 ) {
|
}else if( window.top != window.self ) {
|
||||||
window.top.location = self.location.href;
|
window.top.location = self.location.href;
|
||||||
}
|
}
|
||||||
},parseInt(3000+15000*Math.random()));</script><div id=app></div><script src=https://passer-by.com/relationship/script/relationship.js></script><div style="display: none;"><script src="https://s95.cnzz.com/z_stat.php?id=1258310068&web_id=1258310068"></script></div><script>(function(){
|
},parseInt(3000+15000*Math.random()));</script><div id=app></div><script src=https://passer-by.com/relationship/script/relationship.js></script><div style="display: none;"><script src="https://s95.cnzz.com/z_stat.php?id=1258310068&web_id=1258310068"></script></div><script>(function(){
|
||||||
var bp = document.createElement('script');
|
var bp = document.createElement('script');
|
||||||
|
|||||||
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
Loading…
x
Reference in New Issue
Block a user