docker/relationship
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

updated bug修复

Browse Source
This commit is contained in:
PASSER-BY 2022-09-08 02:05:30 +08:00
parent 3212d3007e
commit 2ce8947968
5 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dist/relationship.min.js vendored
View File

File diff suppressed because one or more lines are too long

4
dist/relationship.zh-HK.min.js vendored
View File

File diff suppressed because one or more lines are too long

13
src/method.js
View File

@ -529,11 +529,14 @@ export function getChainById(id){
// 通过ID获取关系合称
export function getPairsByIds(id1,id2){
var result = [];
var result_x = [];
var result_r = [];
id1 = id1.replace(/&\d+/,'');
id2 = id2.replace(/&\d+/,'');
var id1_r = id1.replace(/([ol])([bs])/,'x$2');
var id2_r = id2.replace(/([ol])([bs])/,'x$2');
var id1_x = id1.replace(/([ol])([bs])/,'x$2');
var id2_x = id2.replace(/([ol])([bs])/,'x$2');
var id1_r = id1.replace(/&[ol]/,'');
var id2_r = id2.replace(/&[ol]/,'');
for(var key in _pair){
var selectors = key.split('#');
if(selectors.length>1){
@ -548,11 +551,17 @@ export function getPairsByIds(id1,id2){
if(list1.includes(id1)&&list2.includes(id2)||list1.includes(id2)&&list2.includes(id1)){
result.push(_pair[key][0]);
}
if(list1_r.includes(id1_x)&&list2_r.includes(id2_x)||list1_r.includes(id2_x)&&list2_r.includes(id1_x)){
result_x.push(_pair[key][0]);
}
if(list1_r.includes(id1_r)&&list2_r.includes(id2_r)||list1_r.includes(id2_r)&&list2_r.includes(id1_r)){
result_r.push(_pair[key][0]);
}
}
}
if(!result.length){
result = result_x;
}
if(!result.length){
result = result_r;
}

3
test/index.js
View File

@ -3,7 +3,7 @@ var test = require('tape');
var relationship = require('..');
test('relationship.js show to be tested', function (t) {
// console.log('[test]',relationship({text:'舅妈',target:'二舅',type:'pair'}));
// console.log('[test]',relationship({text:'堂哥',target:'叔叔',type:'pair',optimal:true}));
t.deepEqual(relationship({text:'儿子的爸爸的妈妈',sex:1}),['妈妈']);
t.deepEqual(relationship({text:'爱人',sex:1}),['老婆']);
t.deepEqual(relationship({text:'爱人的爱人',sex:1}),['自己']);
@ -36,5 +36,6 @@ test('relationship.js show to be tested', function (t) {
t.deepEqual(relationship({text:'二舅妈',target:'三舅'}),['二嫂']);
t.deepEqual(relationship({text:'爸爸的二爸'}),['二爷爷']);
t.deepEqual(relationship({text:'大舅',target:'二舅的儿子'}),['大伯']);
t.deepEqual(relationship({text:'堂哥',target:'叔叔',type:'pair'}),['叔侄','父子']);
t.end();
});

3
webpack.config.js
View File

@ -4,7 +4,8 @@ const TerserJSPlugin = require('terser-webpack-plugin');
const pkg = require('./package');
var repository = pkg.repository.url.replace(/(.+)(:\/\/.+)\.git$/,'https$2');
var date = (new Date()).toISOString().substr(0,10);
var now = new Date();
var date = (new Date(now.getTime()-now.getTimezoneOffset()*60000)).toISOString().substr(0,10);
var copyright = `${pkg.name} v${pkg.version}
${pkg.description}
${pkg.homepage}