Skip to content

Commit 81b4769

Browse files
CreaterOSCreaterOS
committed
debug day01...
1 parent ca8ce9b commit 81b4769

File tree

8 files changed

+76
-189
lines changed

8 files changed

+76
-189
lines changed

‎JQueryWeb.xcodeproj/project.xcworkspace/xcuserdata/bryantreyn.xcuserdatad/UserInterfaceState.xcuserstate

1003 Bytes
Binary file not shown.

‎JQueryWeb/JQueryWeb/JQueryWebClassMaker.m

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -202,12 +202,7 @@ - (NSString *)parseTextClassNameWithSelect:(JQueryWebMakerStyle)selectStr index:
202202
- (NSString *__nonnull)humpStr:(NSString *__nonnull)str{
203203
NSCParameterAssert(str != NULL);
204204

205-
/* 处理option字符串,防止用户没有使用驼峰使用 */
206-
NSString *firstStr = [str substringWithRange:NSMakeRange(0, 1)];
207-
NSString *upcaseStr = [firstStr uppercaseString];
208-
NSString *lastStr = [str substringWithRange:NSMakeRange(1, _option.length-1)];
209-
210-
return [upcaseStr stringByAppendingString:lastStr];
205+
return [[str substringWithRange:NSMakeRange(0, _option.length)] lowercaseString];
211206
}
212207

213208
- (NSString *__nonnull)removeFunctionSemicolon:(NSString *__nonnull)str{

‎JQueryWeb/JQueryWeb/JQueryWebIDMaker.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ NS_ASSUME_NONNULL_BEGIN
2121
+ (instancetype)IDMakerName:(NSString *)idName width:(NSUInteger)width;
2222

2323
/* 解析 */
24-
- (NSString * _Nonnull)parseTextTagNameWithSelect:(JQueryWebMakerStyle)selectStr;
24+
- (NSString * _Nonnull)parseTextIDNameWithSelect:(JQueryWebMakerStyle)selectStr;
2525
@end
2626

2727
NS_ASSUME_NONNULL_END

‎JQueryWeb/JQueryWeb/JQueryWebIDMaker.m

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -106,9 +106,10 @@ - (instancetype)initWithIDName:(NSString *)idName width:(NSUInteger)width{
106106
}
107107

108108
#pragma mark - 解析文本内容标签
109-
- (NSString * _Nonnull)parseTextTagNameWithSelect:(JQueryWebMakerStyle)selectStr{
109+
- (NSString * _Nonnull)parseTextIDNameWithSelect:(JQueryWebMakerStyle)selectStr{
110110
NSString *tempStr = [_idName substringFromIndex:1];
111111
_idName = tempStr;
112+
112113
if (selectStr == JQueryWebMakerTextORVal) {
113114
return JQUERY_JS_ID_TEXT_VAL(_idName,_context);
114115
}else if(selectStr == JQueryWebMakerHTML){
@@ -157,12 +158,7 @@ - (NSString * _Nonnull)parseTextTagNameWithSelect:(JQueryWebMakerStyle)selectStr
157158
- (NSString *__nonnull)humpStr:(NSString *__nonnull)str{
158159
NSCParameterAssert(str != NULL);
159160

160-
/* 处理option字符串,防止用户没有使用驼峰使用 */
161-
NSString *firstStr = [str substringWithRange:NSMakeRange(0, 1)];
162-
NSString *upcaseStr = [firstStr uppercaseString];
163-
NSString *lastStr = [str substringWithRange:NSMakeRange(1, _option.length-1)];
164-
165-
return [upcaseStr stringByAppendingString:lastStr];
161+
return [[str substringWithRange:NSMakeRange(0, _option.length)] lowercaseString];
166162
}
167163

168164
- (NSString *__nonnull)removeFunctionSemicolon:(NSString *__nonnull)str{

‎JQueryWeb/JQueryWeb/JQueryWebMacroJavaScript.h

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -42,53 +42,53 @@
4242
/* ----------------------------- IDNAME -----------------------------*/
4343

4444
/* JavaScript标签文本内容 */
45-
#define JQUERY_JS_ID_TEXT_VAL(TAGNAME,CONTEXT) [NSString stringWithFormat:@"document.getElementById('%@').innerText = '%@'",TAGNAME,CONTEXT];
45+
#define JQUERY_JS_ID_TEXT_VAL(IDNAME,CONTEXT) [NSString stringWithFormat:@"document.getElementById('%@').innerText = '%@'",IDNAME,CONTEXT];
4646
/* JavaScript标签文本HTML格式 */
47-
#define JQUERY_JS_ID_HTML(TAGNAME,CONTEXT) [NSString stringWithFormat:@"document.getElementById('%@').innerHTML = '%@'",TAGNAME,CONTEXT];
47+
#define JQUERY_JS_ID_HTML(IDNAME,CONTEXT) [NSString stringWithFormat:@"document.getElementById('%@').innerHTML = '%@'",IDNAME,CONTEXT];
4848
/* JavaScript标签ON操作 */
49-
#define JQUERY_JS_ID_ON(TAGNAME,OPTION,FUNCTION) [NSString stringWithFormat:@"document.getElementById('%@').on%@ = %@",TAGNAME,OPTION,FUNCTION];
49+
#define JQUERY_JS_ID_ON(IDNAME,OPTION,FUNCTION) [NSString stringWithFormat:@"document.getElementById('%@').on%@ = %@",IDNAME,OPTION,FUNCTION];
5050
/* JavaScript标签CSS操作 */
51-
#define JQUERY_JS_ID_CSS(TAGNAME,KEY,VALUE) [NSString stringWithFormat:@"document.getElementById('%@').style.%@ = '%@'",TAGNAME,KEY,VALUE];
51+
#define JQUERY_JS_ID_CSS(IDNAME,KEY,VALUE) [NSString stringWithFormat:@"document.getElementById('%@').style.%@ = '%@'",IDNAME,KEY,VALUE];
5252
/* JavaScript标签SHOW操作 */
53-
#define JQUERY_JS_ID_SHOW(TAGNAME) [NSString stringWithFormat:@"document.getElementById('%@').show = true;",TAGNAME];
54-
#define JQUERY_JS_ID_SHOWF(TAGNAME,ANIMATION,FUNCTION) [NSString stringWithFormat:@"document.getElementById('%@').show('%@') = %@",TAGNAME,ANIMATION,FUNCTION];
55-
#define JQUERY_JS_ID_SHOWA(TAGNAME,CONTEXT) [NSString stringWithFormat:@"document.getElementById('%@').show('%@')",TAGNAME,CONTEXT];
53+
#define JQUERY_JS_ID_SHOW(IDNAME) [NSString stringWithFormat:@"document.getElementById('%@').show = true;",IDNAME];
54+
#define JQUERY_JS_ID_SHOWF(IDNAME,ANIMATION,FUNCTION) [NSString stringWithFormat:@"document.getElementById('%@').show('%@') = %@",IDNAME,ANIMATION,FUNCTION];
55+
#define JQUERY_JS_ID_SHOWA(IDNAME,CONTEXT) [NSString stringWithFormat:@"document.getElementById('%@').show('%@')",IDNAME,CONTEXT];
5656
/* JavaScript标签Hidden操作 */
57-
#define JQUERY_JS_ID_HIDDEN(TAGNAME) [NSString stringWithFormat:@"document.getElementById('%@').hidden = true",TAGNAME];
57+
#define JQUERY_JS_ID_HIDDEN(IDNAME) [NSString stringWithFormat:@"document.getElementById('%@').hidden = true",IDNAME];
5858
/* JavaScript标签Height操作 */
59-
#define JQUERY_JS_ID_HEIGHT(TAGNAME,HEIGHT) [NSString stringWithFormat:@"document.getElementById('%@').style.height = '%zdpx'",TAGNAME,HEIGHT];
59+
#define JQUERY_JS_ID_HEIGHT(IDNAME,HEIGHT) [NSString stringWithFormat:@"document.getElementById('%@').style.height = '%zdpx'",IDNAME,HEIGHT];
6060
/* JavaScript标签Width操作 */
61-
#define JQUERY_JS_ID_WIDTH(TAGNAME,WIDTH) [NSString stringWithFormat:@"document.getElementById('%@').style.width = '%zdpx'",TAGNAME,WIDTH];
61+
#define JQUERY_JS_ID_WIDTH(IDNAME,WIDTH) [NSString stringWithFormat:@"document.getElementById('%@').style.width = '%zdpx'",IDNAME,WIDTH];
6262
/* JavaScript标签AddClass操作 */
63-
#define JQUERY_JS_ID_ADDCLASS(TAGNAME,CLASSNAME) [NSString stringWithFormat:@"document.getElementById('%@').classList.add('%@')",TAGNAME,CLASSNAME];
63+
#define JQUERY_JS_ID_ADDCLASS(IDNAME,CLASSNAME) [NSString stringWithFormat:@"document.getElementById('%@').classList.add('%@')",IDNAME,CLASSNAME];
6464
/* JavaScript标签RemoveClass操作 */
65-
#define JQUERY_JS_ID_REMOVECLASS(TAGNAME,CLASSNAME) [NSString stringWithFormat:@"document.getElementById('%@').classList.remove('%@')",TAGNAME,CLASSNAME];
65+
#define JQUERY_JS_ID_REMOVECLASS(IDNAME,CLASSNAME) [NSString stringWithFormat:@"document.getElementById('%@').classList.remove('%@')",IDNAME,CLASSNAME];
6666
/* JavaScript标签Attr操作 */
67-
#define JQUERY_JS_ID_ATTRVALUE_FUNCTION(TAGNAME,ATTRNAME,VALUE) [NSString stringWithFormat:@"document.getElementById('%@').setAttribute('%@','%@')",TAGNAME,ATTRNAME,VALUE];
67+
#define JQUERY_JS_ID_ATTRVALUE_FUNCTION(IDNAME,ATTRNAME,VALUE) [NSString stringWithFormat:@"document.getElementById('%@').setAttribute('%@','%@')",IDNAME,ATTRNAME,VALUE];
6868

6969
/* ----------------------------- CLASSNAME -----------------------------*/
7070
/* JavaScript标签文本内容 */
71-
#define JQUERY_JS_CLASS_TEXT_VAL(TAGNAME,COUNT,CONTEXT) [NSString stringWithFormat:@"document.getElementsByClassName('%@')[%@].innerText = '%@'",TAGNAME,COUNT,CONTEXT];
71+
#define JQUERY_JS_CLASS_TEXT_VAL(CLASSNAME,COUNT,CONTEXT) [NSString stringWithFormat:@"document.getElementsByClassName('%@')[%@].innerText = '%@'",CLASSNAME,COUNT,CONTEXT];
7272
/* JavaScript标签文本HTML格式 */
73-
#define JQUERY_JS_CLASS_HTML(TAGNAME,COUNT,CONTEXT) [NSString stringWithFormat:@"document.getElementsByClassName('%@')[%@].innerHTML = '%@'",TAGNAME,COUNT,CONTEXT];
73+
#define JQUERY_JS_CLASS_HTML(CLASSNAME,COUNT,CONTEXT) [NSString stringWithFormat:@"document.getElementsByClassName('%@')[%@].innerHTML = '%@'",CLASSNAME,COUNT,CONTEXT];
7474
/* JavaScript标签ON操作 */
75-
#define JQUERY_JS_CLASS_ON(TAGNAME,COUNT,OPTION,FUNCTION) [NSString stringWithFormat:@"document.getElementsByClassName('%@')[%@].on%@ = %@",TAGNAME,COUNT,OPTION,FUNCTION];
75+
#define JQUERY_JS_CLASS_ON(CLASSNAME,COUNT,OPTION,FUNCTION) [NSString stringWithFormat:@"document.getElementsByClassName('%@')[%@].on%@ = %@",CLASSNAME,COUNT,OPTION,FUNCTION];
7676
/* JavaScript标签CSS操作 */
77-
#define JQUERY_JS_CLASS_CSS(TAGNAME,COUNT,KEY,VALUE) [NSString stringWithFormat:@"document.getElementsByClassName('%@')[%@].style.%@ = '%@'",TAGNAME,COUNT,KEY,VALUE];
77+
#define JQUERY_JS_CLASS_CSS(CLASSNAME,COUNT,KEY,VALUE) [NSString stringWithFormat:@"document.getElementsByClassName('%@')[%@].style.%@ = '%@'",CLASSNAME,COUNT,KEY,VALUE];
7878
/* JavaScript标签SHOW操作 */
79-
#define JQUERY_JS_CLASS_SHOW(TAGNAME,COUNT) [NSString stringWithFormat:@"document.getElementsByClassName('%@')[%@].show = true",TAGNAME,COUNT];
80-
#define JQUERY_JS_CLASS_SHOWF(TAGNAME,COUNT,ANIMATION,FUNCTION) [NSString stringWithFormat:@"document.getElementsByClassName('%@')[%@].show('%@') = %@",TAGNAME,COUNT,ANIMATION,FUNCTION];
81-
#define JQUERY_JS_CLASS_SHOWA(TAGNAME,COUNT,CONTEXT) [NSString stringWithFormat:@"document.getElementsByClassName('%@')[%@].show('%@')",TAGNAME,COUNT,CONTEXT];
79+
#define JQUERY_JS_CLASS_SHOW(CLASSNAME,COUNT) [NSString stringWithFormat:@"document.getElementsByClassName('%@')[%@].show = true",CLASSNAME,COUNT];
80+
#define JQUERY_JS_CLASS_SHOWF(CLASSNAME,COUNT,ANIMATION,FUNCTION) [NSString stringWithFormat:@"document.getElementsByClassName('%@')[%@].show('%@') = %@",CLASSNAME,COUNT,ANIMATION,FUNCTION];
81+
#define JQUERY_JS_CLASS_SHOWA(CLASSNAME,COUNT,CONTEXT) [NSString stringWithFormat:@"document.getElementsByClassName('%@')[%@].show('%@')",CLASSNAME,COUNT,CONTEXT];
8282
/* JavaScript标签Hidden操作 */
83-
#define JQUERY_JS_CLASS_HIDDEN(TAGNAME,COUNT) [NSString stringWithFormat:@"document.getElementsByClassName('%@')[%@].hidden = true",TAGNAME,COUNT];
83+
#define JQUERY_JS_CLASS_HIDDEN(CLASSNAME,COUNT) [NSString stringWithFormat:@"document.getElementsByClassName('%@')[%@].hidden = true",CLASSNAME,COUNT];
8484
/* JavaScript标签Height操作 */
85-
#define JQUERY_JS_CLASS_HEIGHT(TAGNAME,COUNT,HEIGHT) [NSString stringWithFormat:@"document.getElementsByClassName('%@')[%@].style.height = '%zdpx'",TAGNAME,COUNT,HEIGHT];
85+
#define JQUERY_JS_CLASS_HEIGHT(CLASSNAME,COUNT,HEIGHT) [NSString stringWithFormat:@"document.getElementsByClassName('%@')[%@].style.height = '%zdpx'",CLASSNAME,COUNT,HEIGHT];
8686
/* JavaScript标签Width操作 */
87-
#define JQUERY_JS_CLASS_WIDTH(TAGNAME,COUNT,WIDTH) [NSString stringWithFormat:@"document.getElementsByClassName('%@')[%@].style.width = '%zdpx'",TAGNAME,COUNT,WIDTH];
87+
#define JQUERY_JS_CLASS_WIDTH(CLASSNAME,COUNT,WIDTH) [NSString stringWithFormat:@"document.getElementsByClassName('%@')[%@].style.width = '%zdpx'",CLASSNAME,COUNT,WIDTH];
8888
/* JavaScript标签AddClass操作 */
89-
#define JQUERY_JS_CLASS_ADDCLASS(TAGNAME,COUNT,CLASSNAME) [NSString stringWithFormat:@"document.getElementsByClassName('%@')[%@].classList.add('%@')",TAGNAME,COUNT,CLASSNAME];
89+
#define JQUERY_JS_CLASS_ADDCLASS(CLASSNAME,COUNT,CLASSNAMES) [NSString stringWithFormat:@"document.getElementsByClassName('%@')[%@].classList.add('%@')",CLASSNAME,COUNT,CLASSNAMES];
9090
/* JavaScript标签RemoveClass操作 */
91-
#define JQUERY_JS_CLASS_REMOVECLASS(TAGNAME,COUNT,CLASSNAME) [NSString stringWithFormat:@"document.getElementsByClassName('%@')[%@].classList.remove('%@')",TAGNAME,COUNT,CLASSNAME];
91+
#define JQUERY_JS_CLASS_REMOVECLASS(CLASSNAME,COUNT,CLASSNAMES) [NSString stringWithFormat:@"document.getElementsByClassName('%@')[%@].classList.remove('%@')",CLASSNAME,COUNT,CLASSNAMES];
9292
/* JavaScript标签Attr操作 */
93-
#define JQUERY_JS_CLASS_ATTRVALUE_FUNCTION(TAGNAME,COUNT,ATTRNAME,VALUE) [NSString stringWithFormat:@"document.getElementsByClassName('%@')[%@].setAttribute('%@','%@')",TAGNAME,COUNT,ATTRNAME,VALUE];
93+
#define JQUERY_JS_CLASS_ATTRVALUE_FUNCTION(CLASSNAME,COUNT,ATTRNAME,VALUE) [NSString stringWithFormat:@"document.getElementsByClassName('%@')[%@].setAttribute('%@','%@')",CLASSNAME,COUNT,ATTRNAME,VALUE];
9494
#endif /* JQueryWebMacroJavaScript_h */

‎JQueryWeb/JQueryWeb/JQueryWebMaker.m

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -938,7 +938,7 @@ - (NSString *__nonnull)saveText:(NSString *)context select:(JQueryWebMakerStyle)
938938
}];
939939
}else if (_idName != NULL){
940940
JQueryWebIDMaker *idMaker = [JQueryWebIDMaker IDMakerName:self.idName context:self.context];
941-
return [idMaker parseTextTagNameWithSelect:select];
941+
return [idMaker parseTextIDNameWithSelect:select];
942942
}else if (_className != NULL){
943943
JQueryWebClassMaker *classMaker = [JQueryWebClassMaker ClassMakerName:self.className context:self.context];
944944
return [classMaker parseTextClassNameWithSelect:select];
@@ -964,7 +964,7 @@ - (NSString *__nonnull)saveText:(NSString *)context index:(NSUInteger)index sele
964964
}];
965965
}else if (_idName != NULL){
966966
JQueryWebIDMaker *idMaker = [JQueryWebIDMaker IDMakerName:self.idName context:self.context];
967-
return [idMaker parseTextTagNameWithSelect:select];
967+
return [idMaker parseTextIDNameWithSelect:select];
968968
}else if (_className != NULL){
969969
JQueryWebClassMaker *classMaker = [JQueryWebClassMaker ClassMakerName:self.className context:self.context];
970970
return [classMaker parseTextClassNameWithSelect:select index:index];
@@ -997,7 +997,7 @@ - (NSString * __nonnull)saveOnWithOption:(NSString * __nonnull)option function:(
997997
}];
998998
}else if (_idName != NULL){
999999
JQueryWebIDMaker *idMaker = [JQueryWebIDMaker IDMakerName:self.idName option:self.option function:self.function];
1000-
return [idMaker parseTextTagNameWithSelect:JQueryWebMakerON];
1000+
return [idMaker parseTextIDNameWithSelect:JQueryWebMakerON];
10011001
}else if (_className != NULL){
10021002
JQueryWebClassMaker *classMaker = [JQueryWebClassMaker ClassMakerName:self.className option:self.option function:self.function];
10031003
return [classMaker parseTextClassNameWithSelect:JQueryWebMakerON];
@@ -1028,7 +1028,8 @@ - (NSString * __nonnull)saveOnWithIndex:(NSUInteger)index option:(NSString * __n
10281028
return [tagMaker parseTextTagNameWithSelect:JQueryWebMakerON index:index];
10291029
}];
10301030
}else if (_idName != NULL){
1031-
[self saveOnWithOption:option function:function];
1031+
JQueryWebIDMaker *idMaker = [JQueryWebIDMaker IDMakerName:self.idName option:self.option function:self.function];
1032+
return [idMaker parseTextIDNameWithSelect:JQueryWebMakerON];
10321033
}else if (_className != NULL){
10331034
JQueryWebClassMaker *classMaker = [JQueryWebClassMaker ClassMakerName:self.className option:self.option function:self.function];
10341035
return [classMaker parseTextClassNameWithSelect:JQueryWebMakerON index:index];
@@ -1065,7 +1066,7 @@ - (NSString *)saveCSSWithProperties:(NSString *)properties{
10651066
}];
10661067
}else if (_idName != NULL){
10671068
JQueryWebIDMaker *idM = [JQueryWebIDMaker IDMakerName:self.idName properties:proDict];
1068-
return [idM parseTextTagNameWithSelect:JQueryWebMakerCSS];
1069+
return [idM parseTextIDNameWithSelect:JQueryWebMakerCSS];
10691070
}else if (_className != NULL){
10701071
JQueryWebClassMaker *classM = [JQueryWebClassMaker ClassMakerName:self.className properties:proDict];
10711072
return [classM parseTextClassNameWithSelect:JQueryWebMakerCSS];
@@ -1116,7 +1117,7 @@ - (NSString *)saveHidden{
11161117
}];
11171118
}else if (_idName != NULL){
11181119
JQueryWebIDMaker *idM = [JQueryWebIDMaker IDMakerName:self.idName];
1119-
return [idM parseTextTagNameWithSelect:JQueryWebMakerHidden];
1120+
return [idM parseTextIDNameWithSelect:JQueryWebMakerHidden];
11201121
}else if (_className != NULL){
11211122
JQueryWebClassMaker *classM = [JQueryWebClassMaker ClassMakerName:self.className];
11221123
return [classM parseTextClassNameWithSelect:JQueryWebMakerHidden];
@@ -1150,7 +1151,7 @@ - (NSString *)saveShow{
11501151
}];
11511152
}else if(_idName != NULL){
11521153
JQueryWebIDMaker *idM = [JQueryWebIDMaker IDMakerName:self.idName];
1153-
return [idM parseTextTagNameWithSelect:JQueryWebMakerShow];
1154+
return [idM parseTextIDNameWithSelect:JQueryWebMakerShow];
11541155
}else if (_className != NULL){
11551156
JQueryWebClassMaker *classM = [JQueryWebClassMaker ClassMakerName:self.className];
11561157
return [classM parseTextClassNameWithSelect:JQueryWebMakerShow];
@@ -1199,7 +1200,7 @@ - (NSString * __nonnull)saveShowWithOption:(NSString * __nonnull)option function
11991200
}];
12001201
}else if(_idName != NULL){
12011202
JQueryWebIDMaker *idMaker = [JQueryWebIDMaker IDMakerName:self.idName option:self.option function:self.function];
1202-
return [idMaker parseTextTagNameWithSelect:JQueryWebMakerShowWithFunction];
1203+
return [idMaker parseTextIDNameWithSelect:JQueryWebMakerShowWithFunction];
12031204
}else if (_className != NULL){
12041205
JQueryWebClassMaker *classMaker = [JQueryWebClassMaker ClassMakerName:self.className option:self.option function:self.function];
12051206
return [classMaker parseTextClassNameWithSelect:JQueryWebMakerShowWithFunction];
@@ -1253,7 +1254,7 @@ - (NSString *)saveHeight:(NSUInteger)height width:(NSUInteger)width{
12531254
}];
12541255
}else if (_idName != NULL){
12551256
JQueryWebIDMaker *idM = [JQueryWebIDMaker IDMakerName:self.idName width:width];
1256-
return [idM parseTextTagNameWithSelect:JQueryWebMakerWidth];
1257+
return [idM parseTextIDNameWithSelect:JQueryWebMakerWidth];
12571258
}else if (_className != NULL){
12581259
JQueryWebClassMaker *classM = [JQueryWebClassMaker ClassMakerName:self.className width:width];
12591260
return [classM parseTextClassNameWithSelect:JQueryWebMakerWidth];
@@ -1267,7 +1268,7 @@ - (NSString *)saveHeight:(NSUInteger)height width:(NSUInteger)width{
12671268
}];
12681269
}else if (_idName != NULL){
12691270
JQueryWebIDMaker *idM = [JQueryWebIDMaker IDMakerName:self.idName height:height];
1270-
return [idM parseTextTagNameWithSelect:JQueryWebMakerHeight];
1271+
return [idM parseTextIDNameWithSelect:JQueryWebMakerHeight];
12711272
}else if (_className != NULL){
12721273
JQueryWebClassMaker *classM = [JQueryWebClassMaker ClassMakerName:self.className height:height];
12731274
return [classM parseTextClassNameWithSelect:JQueryWebMakerWidth];
@@ -1318,7 +1319,7 @@ - (NSString *__nonnull)saveClassName:(NSString *)className index:(NSUInteger)ind
13181319
}];
13191320
}else if (_idName != NULL){
13201321
JQueryWebIDMaker *idM = [JQueryWebIDMaker IDMakerName:self.idName context:className];
1321-
return [idM parseTextTagNameWithSelect:selectName];
1322+
return [idM parseTextIDNameWithSelect:selectName];
13221323
}else if (_className != NULL){
13231324
JQueryWebClassMaker *classM = [JQueryWebClassMaker ClassMakerName:self.className context:className];
13241325
return [classM parseTextClassNameWithSelect:selectName index:index];
@@ -1339,7 +1340,7 @@ - (NSString *)saveAttr:(NSString *)context index:(NSUInteger)index selectStr:(JQ
13391340
}];
13401341
}else if (_idName != NULL){
13411342
JQueryWebIDMaker *idM = [JQueryWebIDMaker IDMakerName:self.idName option:attrName function:context];
1342-
return [idM parseTextTagNameWithSelect:selectStr];
1343+
return [idM parseTextIDNameWithSelect:selectStr];
13431344
}else if (_className != NULL){
13441345
JQueryWebClassMaker *classM = [JQueryWebClassMaker ClassMakerName:self.className option:attrName function:context];
13451346
return [classM parseTextClassNameWithSelect:selectStr index:index];

‎JQueryWeb/JQueryWeb/JQueryWebTagMaker.m

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -120,6 +120,7 @@ - (NSString * _Nonnull)parseTextTagNameWithSelect:(JQueryWebMakerStyle)selectStr
120120
}else if (selectStr == JQueryWebMakerON){
121121
NSString *newOptionStr = [self humpStr:_option];
122122
NSString *newFunction = [self removeFunctionSemicolon:_function];
123+
NSLog(@"%@,%@",newOptionStr,newFunction);
123124
return JQUERY_JS_TAG_ON(_tagName, indexStr, newOptionStr, newFunction);
124125
}else if (selectStr == JQueryWebMakerCSS){
125126
/* 从保存的数组中获得key和value */
@@ -203,12 +204,7 @@ - (NSString *)parseTextTagNameWithSelect:(JQueryWebMakerStyle)selectStr index:(N
203204
- (NSString *__nonnull)humpStr:(NSString *__nonnull)str{
204205
NSCParameterAssert(str != NULL);
205206

206-
/* 处理option字符串,防止用户没有使用驼峰使用 */
207-
NSString *firstStr = [str substringWithRange:NSMakeRange(0, 1)];
208-
NSString *upcaseStr = [firstStr uppercaseString];
209-
NSString *lastStr = [str substringWithRange:NSMakeRange(1, _option.length-1)];
210-
211-
return [upcaseStr stringByAppendingString:lastStr];
207+
return [[str substringWithRange:NSMakeRange(0, _option.length)] lowercaseString];
212208
}
213209

214210
- (NSString *__nonnull)removeFunctionSemicolon:(NSString *__nonnull)str{

0 commit comments

Comments
 (0)