Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitf3b5a05

Browse files
authored
Merge pull request#179 from priitliivak/master
Changes from#127 applied to latest version
2 parents979f3a9 +66daa4c commitf3b5a05

File tree

5 files changed

+78
-9
lines changed

5 files changed

+78
-9
lines changed

‎lib/doc/defined-names.js‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ var utils = require('../utils/utils');
2626
varcolCache=require('../utils/col-cache');
2727
varCellMatrix=require('../utils/cell-matrix');
2828
varRange=require('./range');
29+
varrangeRegexp=/\$(\w+)\$(\d+)(:\$(\w+)\$(\d+))?/;
2930

3031
varDefinedNames=module.exports=function(){
3132
this.matrixMap={};
@@ -173,7 +174,9 @@ DefinedNames.prototype = {
173174
_.each(value,function(definedName){
174175
varmatrix=matrixMap[definedName.name]=newCellMatrix();
175176
_.each(definedName.ranges,function(rangeStr){
176-
matrix.addCell(rangeStr);
177+
if(rangeRegexp.test(rangeStr.split('!').pop()||'')){
178+
matrix.addCell(rangeStr);
179+
}
177180
});
178181
});
179182
}

‎lib/utils/col-cache.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -170,8 +170,8 @@ var colCache = module.exports = {
170170

171171
varparts=value.split('!');
172172
if(parts.length>1){
173-
sheetName=parts[0];
174-
value=parts[1];
173+
value=parts.pop();
174+
sheetName=parts.join('!').replace(/^'|'$/g,'');
175175
}
176176

177177
parts=value.split(':');

‎lib/xlsx/xform/book/defined-name-xform.js‎

Lines changed: 36 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -58,15 +58,45 @@ utils.inherits(DefinedNamesXform, BaseXform, {
5858
parseClose:function(){
5959
this.model={
6060
name:this._parsedName,
61-
ranges:this._parsedText.join('')
62-
.split(',')
63-
.filter(function(range){
64-
returnrange;
65-
})
61+
ranges:extractRanges(this._parsedText.join(''))
6662
};
6763
if(this._parsedLocalSheetId!==undefined){
6864
this.model.localSheetId=parseInt(this._parsedLocalSheetId);
6965
}
7066
returnfalse;
7167
}
72-
});
68+
});
69+
70+
functionextractRanges(parsedText){
71+
varranges=[];
72+
varquotesOpened=false;
73+
varlast='';
74+
parsedText.split(',').forEach(function(item){
75+
if(!item){
76+
return;
77+
}
78+
varquotes=(item.match(/'/g)||[]).length;
79+
80+
if(!quotes){
81+
if(quotesOpened){
82+
last+=item+',';
83+
}else{
84+
ranges.push(item);
85+
}
86+
return;
87+
}
88+
varquotesEven=quotes%2===0;
89+
90+
if(!quotesOpened&&quotesEven){
91+
ranges.push(item);
92+
}elseif(quotesOpened&&!quotesEven){
93+
quotesOpened=false;
94+
ranges.push(last+item);
95+
last='';
96+
}else{
97+
quotesOpened=true;
98+
last+=item+',';
99+
}
100+
});
101+
returnranges;
102+
}

‎spec/unit/doc/defined-names.spec.js‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,11 @@ describe('DefinedNames', function() {
1717
dn.add('blort!$B$4','bar');
1818
expect(dn.getNames('blort!B4')).to.deep.equal(['bar']);
1919
expect(dn.getNames('blort!$B$4')).to.deep.equal(['bar']);
20+
21+
dn.add("'blo rt'!$B$4",'bar');
22+
expect(dn.getNames("'blo rt'!$B$4")).to.deep.equal(['bar']);
23+
dn.add("'blo ,!rt'!$B$4",'bar');
24+
expect(dn.getNames("'blo ,!rt'!$B$4")).to.deep.equal(['bar']);
2025
});
2126

2227
it('removes names for cells',function(){
@@ -54,4 +59,29 @@ describe('DefinedNames', function() {
5459
expect(dn.getRanges('single')).to.deep.equal({name:'single',ranges:['other!$A$1']});
5560
});
5661

62+
it('creates matrix from model',function(){
63+
vardn=newDefinedNames();
64+
65+
dn.model=[];
66+
dn.add('blort!A1','bar');
67+
dn.remove('blort!A1','foo');
68+
69+
expect(dn.getNames('blort!A1')).to.deep.equal(['bar']);
70+
});
71+
72+
it('skips values with invalid range',function(){
73+
vardn=newDefinedNames();
74+
dn.model=[
75+
{name:'eq',ranges:['"="']},
76+
{name:'ref',ranges:['#REF!']},
77+
{name:'single',ranges:['Sheet3!$A$1']},
78+
{name:'range',ranges:['Sheet3!$A$2:$F$2228']}
79+
];
80+
81+
expect(dn.model).to.deep.equal([
82+
{name:'single',ranges:['Sheet3!$A$1']},
83+
{name:'range',ranges:['Sheet3!$A$2:$F$2228']}
84+
]);
85+
});
86+
5787
});

‎spec/unit/utils/col-cache.spec.js‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,12 @@ describe('colCache', function() {
6868
it('decodes addresses',function(){
6969
expect(colCache.decodeAddress('A1')).to.deep.equal({address:'A1',col:1,row:1,$col$row:'$A$1'});
7070
expect(colCache.decodeAddress('AA11')).to.deep.equal({address:'AA11',col:27,row:11,$col$row:'$AA$11'});
71+
72+
it('convert [sheetName!][$]col[$]row[[$]col[$]row] into address or range structures',function(){
73+
expect(colCache.decodeEx('Sheet1!$H$1')).to.deep.equal({'$col$row':'$H$1',address:'H1',col:8,row:1,sheetName:'Sheet1'});
74+
expect(colCache.decodeEx("'Sheet 1'!$H$1")).to.deep.equal({'$col$row':'$H$1',address:'H1',col:8,row:1,sheetName:'Sheet 1'});
75+
expect(colCache.decodeEx("'Sheet !$:1'!$H$1")).to.deep.equal({'$col$row':'$H$1',address:'H1',col:8,row:1,sheetName:'Sheet !$:1'});
76+
});
7177
});
7278

7379
it('gets address structures (and caches them)',function(){

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp