Skip to content

Commit c0982d5

Browse files
openjavascriptopenjavascript
committed
up Bizs.DMultiDate, Bizs.MultiChangeLogic
1 parent 094ec40 commit c0982d5

File tree

6 files changed

+28
-60
lines changed

6 files changed

+28
-60
lines changed

‎bizs/DMultiDate/DMultiDate.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -621,7 +621,7 @@
621621
.removeAttr('fulldateformat');
622622
} else {
623623
_el.eq(0).attr('fulldateformat', '{0}');
624-
_el.eq(1).attr('fulldateformat', '{0}');
624+
_el.eq(1).attr('fulldateformat', '{1}');
625625

626626
_el.attr('dateformat', _p.dateformartType(_setter))
627627
.attr('dateparse', 'parsedate' + _setter);

‎bizs/MultiChangeLogic/MultiChangeLogic.js

Lines changed: 12 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -88,13 +88,12 @@
8888

8989
p.on('itemchange', function (evt, triggerElement) {
9090

91-
var $el = triggerElement,
91+
var $el = triggerElement,
9292
$target,
9393
$selfthidetarget,
9494
isDisable = p._model.isDisable($el),
9595
isDisplay = p._model.isDisplay($el);
96-
//if ((triggerElement.prop('nodeName').toLowerCase() === 'input') && (triggerElement.attr('type').toLowerCase() === 'checkbox')) console.log(isDisplay);
97-
96+
9897
p._model.bclHideTarget().each(function () {
9998
var $this = $(this);
10099

@@ -134,6 +133,9 @@
134133

135134
});
136135

136+
p.on('checkboxchange', function (evt, triggerElement) {
137+
138+
});
137139

138140
//这个逻辑是处理onload后选中的项
139141
if ( p._model.bclTriggerChangeOnInit() ) {
@@ -230,22 +232,12 @@
230232
$selectedItem = $el.find(':selected');
231233
if (!$selectedItem.length) return false;
232234

233-
if ( !($el.attr('bcldisplay') || $selectedItem.attr('bcldisplay')) ) {
234-
if ( $el.attr('bcldisabled') ) {
235-
r = p.bclDelimeterItem( $el.attr('bcldisabled'), $el ).indexOf( $el.val() ) > -1;
236-
}
237-
238-
if ( $selectedItem.attr('bcldisabled') ) {
239-
r = JC.f.parseBool( $selectedItem.attr('bcldisabled') );
240-
}
241-
} else {
242-
if ( $el.attr('bcldisplay') ) {
243-
r = p.bclDelimeterItem($el.attr('bcldisplay'), $el).indexOf($el.val()) > - 1;
244-
}
245-
246-
if ( $selectedItem.attr('bcldisplay') ) {
247-
r = JC.f.parseBool($selectedItem.attr('bcldisplay'));
248-
}
235+
if ( $el.attr('bcldisplay') ) {
236+
r = p.bclDelimeterItem($el.attr('bcldisplay'), $el).indexOf($el.val()) > - 1;
237+
}
238+
239+
if ( $selectedItem.attr('bcldisplay') ) {
240+
r = JC.f.parseBool($selectedItem.attr('bcldisplay'));
249241
}
250242

251243
} else {
@@ -255,13 +247,8 @@
255247
attr = $el.attr('bcldisplay');
256248
attr && (r = JC.f.parseBool(attr));
257249

258-
if ( /(checkbox)/i.test($el.attr('type').toLowerCase()) ) {
259-
r = $el.prop('checked');
260-
}
261250
}
262251

263-
264-
265252
return r;
266253
},
267254

@@ -273,7 +260,7 @@
273260

274261
if ( !$el.length ) return false;
275262

276-
if ( /(select)/i.test($el.prop('nodeName').toLowerCase()) ) {
263+
if (/(select)/i.test($el.prop('nodeName').toLowerCase())) {
277264
//处理没有option的select
278265
$selectedItem = $el.find(':selected');
279266
if (!$selectedItem.length) return false;
@@ -295,9 +282,6 @@
295282
r = JC.f.parseBool($el.attr('bcldisabled'));
296283
}
297284

298-
if ( /(checkbox)/i.test($el.attr('type').toLowerCase()) ) {
299-
r = !$el.prop('checked');
300-
}
301285
}
302286

303287
return r;

‎deploy/bizs/DMultiDate/DMultiDate.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎deploy/bizs/MultiChangeLogic/MultiChangeLogic.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎docs_api/files/.._bizs_DMultiDate_DMultiDate.js.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -875,7 +875,7 @@ <h1 class="file-heading">File: ../bizs/DMultiDate/DMultiDate.js</h1>
875875
.removeAttr(&#x27;fulldateformat&#x27;);
876876
} else {
877877
_el.eq(0).attr(&#x27;fulldateformat&#x27;, &#x27;{0}&#x27;);
878-
_el.eq(1).attr(&#x27;fulldateformat&#x27;, &#x27;{0}&#x27;);
878+
_el.eq(1).attr(&#x27;fulldateformat&#x27;, &#x27;{1}&#x27;);
879879

880880
_el.attr(&#x27;dateformat&#x27;, _p.dateformartType(_setter))
881881
.attr(&#x27;dateparse&#x27;, &#x27;parsedate&#x27; + _setter);

‎docs_api/files/.._bizs_MultiChangeLogic_MultiChangeLogic.js.html

Lines changed: 12 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -342,13 +342,12 @@ <h1 class="file-heading">File: ../bizs/MultiChangeLogic/MultiChangeLogic.js</h1>
342342

343343
p.on(&#x27;itemchange&#x27;, function (evt, triggerElement) {
344344

345-
var $el = triggerElement,
345+
var $el = triggerElement,
346346
$target,
347347
$selfthidetarget,
348348
isDisable = p._model.isDisable($el),
349349
isDisplay = p._model.isDisplay($el);
350-
//if ((triggerElement.prop(&#x27;nodeName&#x27;).toLowerCase() === &#x27;input&#x27;) &amp;&amp; (triggerElement.attr(&#x27;type&#x27;).toLowerCase() === &#x27;checkbox&#x27;)) console.log(isDisplay);
351-
350+
352351
p._model.bclHideTarget().each(function () {
353352
var $this = $(this);
354353

@@ -388,6 +387,9 @@ <h1 class="file-heading">File: ../bizs/MultiChangeLogic/MultiChangeLogic.js</h1>
388387

389388
});
390389

390+
p.on(&#x27;checkboxchange&#x27;, function (evt, triggerElement) {
391+
392+
});
391393

392394
//这个逻辑是处理onload后选中的项
393395
if ( p._model.bclTriggerChangeOnInit() ) {
@@ -484,22 +486,12 @@ <h1 class="file-heading">File: ../bizs/MultiChangeLogic/MultiChangeLogic.js</h1>
484486
$selectedItem = $el.find(&#x27;:selected&#x27;);
485487
if (!$selectedItem.length) return false;
486488

487-
if ( !($el.attr(&#x27;bcldisplay&#x27;) || $selectedItem.attr(&#x27;bcldisplay&#x27;)) ) {
488-
if ( $el.attr(&#x27;bcldisabled&#x27;) ) {
489-
r = p.bclDelimeterItem( $el.attr(&#x27;bcldisabled&#x27;), $el ).indexOf( $el.val() ) &gt; -1;
490-
}
491-
492-
if ( $selectedItem.attr(&#x27;bcldisabled&#x27;) ) {
493-
r = JC.f.parseBool( $selectedItem.attr(&#x27;bcldisabled&#x27;) );
494-
}
495-
} else {
496-
if ( $el.attr(&#x27;bcldisplay&#x27;) ) {
497-
r = p.bclDelimeterItem($el.attr(&#x27;bcldisplay&#x27;), $el).indexOf($el.val()) &gt; - 1;
498-
}
499-
500-
if ( $selectedItem.attr(&#x27;bcldisplay&#x27;) ) {
501-
r = JC.f.parseBool($selectedItem.attr(&#x27;bcldisplay&#x27;));
502-
}
489+
if ( $el.attr(&#x27;bcldisplay&#x27;) ) {
490+
r = p.bclDelimeterItem($el.attr(&#x27;bcldisplay&#x27;), $el).indexOf($el.val()) &gt; - 1;
491+
}
492+
493+
if ( $selectedItem.attr(&#x27;bcldisplay&#x27;) ) {
494+
r = JC.f.parseBool($selectedItem.attr(&#x27;bcldisplay&#x27;));
503495
}
504496

505497
} else {
@@ -509,13 +501,8 @@ <h1 class="file-heading">File: ../bizs/MultiChangeLogic/MultiChangeLogic.js</h1>
509501
attr = $el.attr(&#x27;bcldisplay&#x27;);
510502
attr &amp;&amp; (r = JC.f.parseBool(attr));
511503

512-
if ( /(checkbox)/i.test($el.attr(&#x27;type&#x27;).toLowerCase()) ) {
513-
r = $el.prop(&#x27;checked&#x27;);
514-
}
515504
}
516505

517-
518-
519506
return r;
520507
},
521508

@@ -527,7 +514,7 @@ <h1 class="file-heading">File: ../bizs/MultiChangeLogic/MultiChangeLogic.js</h1>
527514

528515
if ( !$el.length ) return false;
529516

530-
if ( /(select)/i.test($el.prop(&#x27;nodeName&#x27;).toLowerCase()) ) {
517+
if (/(select)/i.test($el.prop(&#x27;nodeName&#x27;).toLowerCase())) {
531518
//处理没有option的select
532519
$selectedItem = $el.find(&#x27;:selected&#x27;);
533520
if (!$selectedItem.length) return false;
@@ -549,9 +536,6 @@ <h1 class="file-heading">File: ../bizs/MultiChangeLogic/MultiChangeLogic.js</h1>
549536
r = JC.f.parseBool($el.attr(&#x27;bcldisabled&#x27;));
550537
}
551538

552-
if ( /(checkbox)/i.test($el.attr(&#x27;type&#x27;).toLowerCase()) ) {
553-
r = !$el.prop(&#x27;checked&#x27;);
554-
}
555539
}
556540

557541
return r;

0 commit comments

Comments
 (0)