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

Merge branch 'master' of github.com:mumuy/relationship

Browse Source 
# Conflicts:
#	dist/relationship.min.js
#	dist/relationship.zh-HK.min.js
This commit is contained in:
mumuy
2022-07-25 09:11:05 +08:00
parent aadfb31602 3d78b65af4
commit f42f4176ba
5 changed files with 18 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
dist/relationship.min.js
Vendored
+5 -1
View File
File diff suppressed because one or more lines are too long
dist/relationship.zh-HK.min.js
Vendored
+5 -1
View File
File diff suppressed because one or more lines are too long
package-lock.json
Generated
+6 -6
View File
@@ -5154,9 +5154,9 @@
} }
}, },
"node_modules/terser": { "node_modules/terser": {
"version": "5.14.1", "version": "5.14.2",
"resolved": "https://registry.npmjs.org/terser/-/terser-5.14.1.tgz", "resolved": "https://registry.npmjs.org/terser/-/terser-5.14.2.tgz",
"integrity": "sha512-+ahUAE+iheqBTDxXhTisdA8hgvbEG1hHOQ9xmNjeUJSoi6DU/gMrKNcfZjHkyY6Alnuyc+ikYJaxxfHkT3+WuQ==", "integrity": "sha512-oL0rGeM/WFQCUd0y2QrWxYnq7tfSuKBiqTjRPWrRgB46WD/kiwHwF8T23z78H6Q6kGCuuHcPB+KULHRdxvVGQA==",
"dev": true, "dev": true,
"dependencies": { "dependencies": {
"@jridgewell/source-map": "^0.3.2", "@jridgewell/source-map": "^0.3.2",
@@ -10057,9 +10057,9 @@
} }
}, },
"terser": { "terser": {
"version": "5.14.1", "version": "5.14.2",
"resolved": "https://registry.npmjs.org/terser/-/terser-5.14.1.tgz", "resolved": "https://registry.npmjs.org/terser/-/terser-5.14.2.tgz",
"integrity": "sha512-+ahUAE+iheqBTDxXhTisdA8hgvbEG1hHOQ9xmNjeUJSoi6DU/gMrKNcfZjHkyY6Alnuyc+ikYJaxxfHkT3+WuQ==", "integrity": "sha512-oL0rGeM/WFQCUd0y2QrWxYnq7tfSuKBiqTjRPWrRgB46WD/kiwHwF8T23z78H6Q6kGCuuHcPB+KULHRdxvVGQA==",
"dev": true, "dev": true,
"requires": { "requires": {
"@jridgewell/source-map": "^0.3.2", "@jridgewell/source-map": "^0.3.2",
src/main.js
+1 -1
View File
@@ -441,7 +441,7 @@ export default {
'f,xb,d,d':['堂外甥女'], 'f,xb,d,d':['堂外甥女'],
'f,xb,d,d,h':['堂外甥女婿'], 'f,xb,d,d,h':['堂外甥女婿'],
// 子辈 // 子辈
's':['儿子','男儿','息男','闺男','囝囝','囝男','小子','娃子','男亲','长子','次子','幼子','儿','仔','子','阿仔','仔仔','后生','一世孙'], 's':['儿子','男儿','息男','闺男','囝囝','囝男','小子','公子','娃子','男亲','伢子','长子','次子','幼子','儿','仔','囝','子','阿仔','仔仔','后生','一世孙'],
's,w':['儿媳','儿媳妇','儿媳妇儿','新妇','新妇囝','心抱','息妇','儿妇','子妇','小妇','息妇儿'], 's,w':['儿媳','儿媳妇','儿媳妇儿','新妇','新妇囝','心抱','息妇','儿妇','子妇','小妇','息妇儿'],
's,w,f':['亲家公'], 's,w,f':['亲家公'],
's,w,f,f&o':['姻伯'], 's,w,f,f&o':['姻伯'],
src/method.js
+1 -1
View File
@@ -45,7 +45,7 @@ export function getSelectors(str){
var replaceFilter = { var replaceFilter = {
'^从表':['从父姑表','从父舅表','从父姨表','从母姑表','从母舅表','从母叔表'], '^从表':['从父姑表','从父舅表','从父姨表','从母姑表','从母舅表','从母叔表'],
'^表表':['姑表叔表','姑表姑表','姑表舅表','姑表姨表','舅表叔表','舅表姑表','舅表舅表','舅表姨表'], '^表表':['姑表叔表','姑表姑表','姑表舅表','姑表姨表','舅表叔表','舅表姑表','舅表舅表','舅表姨表'],
'^([夫妻]?)表':['$1姑表','$1舅表'], '^([夫妻内外]?)表':['$1姑表','$1舅表'],
'^([姑舅])表(?=[^伯叔])':['$1表伯','$1表叔'], '^([姑舅])表(?=[^伯叔])':['$1表伯','$1表叔'],
'^姻':['姑姻','姨姻','姊妹姻','女姻'], '^姻':['姑姻','姨姻','姊妹姻','女姻'],
'^眷':['叔眷','舅眷','兄弟眷','男眷'], '^眷':['叔眷','舅眷','兄弟眷','男眷'],