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

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

Browse Source 
# Conflicts:
#	dist/relationship.min.js
#	dist/relationship.zh-HK.min.js
This commit is contained in:
zhenghaole 2023-10-18 15:05:39 +08:00
commit e8208fd778
6 changed files with 13 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dist/relationship.min.js vendored
View File

File diff suppressed because one or more lines are too long

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

File diff suppressed because one or more lines are too long

8
gulpfile.js
View File

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

1
src/module/cache.js
View File

@ -2,7 +2,6 @@
* 缓存数据 * 缓存数据
*/ */
import _input from './data/input'; import _input from './data/input';
import {modeData} from './mode'; import {modeData} from './mode';
let _hash = Object.assign({},modeData,_input); let _hash = Object.assign({},modeData,_input);

3
src/module/id.js
View File

@ -151,8 +151,7 @@ let data = Object.assign({},modeData,{
'xs':['姐妹'] 'xs':['姐妹']
}); });
export function getChainById(id,sex){ export function getChainById(id,sex){
let arr = id.split(','); let item = id.split(',').map(function(sign){
let item = arr.map(function(sign){
let key = sign.replace(/&[ol\d]+/,''); let key = sign.replace(/&[ol\d]+/,'');
return data[key][0]; return data[key][0];
}).join('的'); }).join('的');

19
src/module/map.js
View File

@ -39,27 +39,20 @@ let getMap = function(prefixMap,branch){
return map; return map;
}; };
// 分支前缀处理 // 分支前缀处理
let prefixMap1 = {}; let prefixMap = {};
for(let key in _prefix){ for(let key in _prefix){
prefixMap1[key] = {}; prefixMap[key] = {};
for(let selector in _prefix[key]){ for(let selector in _prefix[key]){
if(selector.indexOf(']')==-1){ if(selector.indexOf(']')==-1){
prefixMap1[key][selector] = _prefix[key][selector]; prefixMap[key][selector] = _prefix[key][selector];
} }else{
}
}
let prefixMap2 = {};
for(let key in _prefix){
prefixMap2[key] = {};
for(let selector in _prefix[key]){
if(selector.indexOf(']')>-1){
expandSelector(selector).forEach(function(s){ expandSelector(selector).forEach(function(s){
prefixMap2[key][s] = _prefix[key][selector]; prefixMap[key][s] = _prefix[key][selector];
}); });
} }
} }
} }
_map = Object.assign({},_map,getMap(prefixMap1,_branch),getMap(prefixMap2,_branch)); _map = Object.assign({},_map,getMap(prefixMap,_branch));
// 主要关系 // 主要关系
for(let key in _main){ for(let key in _main){
_map[key] = [].concat(_main[key],_map[key]||[]); _map[key] = [].concat(_main[key],_map[key]||[]);