dom-render 1.0.79 → 1.0.80

package/dist/bundle.js

@@ -541,7 +541,8 @@ var EventManager = /** @class */ (function () {
             map.forEach(function (v, k) {
                 var data = ScriptUtils.eval("const $element = this.element;  return ".concat(v, " "), Object.assign(obj, {
                     __render: Object.freeze({
-                        element: it
+                        element: it,
+                        attribute: DomUtils.getAttributeToObject(it)
                     })
                 }));
                 it.setAttribute(k, data);
@@ -553,26 +554,6 @@ var EventManager = /** @class */ (function () {
                 it.obj = obj;
             });
         });
-        // on-init event
-        this.procAttr(childNodes, EventManager.onInitAttrName, function (it, attribute) {
-            var script = attribute;
-            if (script) {
-                script = 'return ' + script;
-            }
-            if (script) {
-                ScriptUtils.eval("".concat(_this.bindScript, "; ").concat(script, " "), Object.assign(obj, {
-                    __render: Object.freeze({
-                        element: it
-                    })
-                }));
-                // console.log('onInit--->', obj, varName, it)
-                // if (typeof this.getValue(obj, varName) === 'function') {
-                //     this.getValue(obj, varName)(it);
-                // } else {
-                //     this.setValue(obj, varName, it);
-                // }
-            }
-        });
         // value-link event
         this.procAttr(childNodes, EventManager.valueLinkAttrName, function (it, varName) {
             if (varName) {
@@ -621,6 +602,7 @@ var EventManager = /** @class */ (function () {
                             __render: Object.freeze({
                                 event: event,
                                 element: it,
+                                attribute: DomUtils.getAttributeToObject(it),
                                 target: event.target,
                                 range: Range.range,
                                 scripts: EventManager.setBindProperty(config === null || config === void 0 ? void 0 : config.scripts, obj)
@@ -636,6 +618,27 @@ var EventManager = /** @class */ (function () {
                 });
             }
         });
+        // on-init event
+        this.procAttr(childNodes, EventManager.onInitAttrName, function (it, attribute) {
+            var script = attribute;
+            if (script) {
+                script = 'return ' + script;
+            }
+            if (script) {
+                ScriptUtils.eval("".concat(_this.bindScript, "; ").concat(script, " "), Object.assign(obj, {
+                    __render: Object.freeze({
+                        element: it,
+                        attribute: DomUtils.getAttributeToObject(it)
+                    })
+                }));
+                // console.log('onInit--->', obj, varName, it)
+                // if (typeof this.getValue(obj, varName) === 'function') {
+                //     this.getValue(obj, varName)(it);
+                // } else {
+                //     this.setValue(obj, varName, it);
+                // }
+            }
+        });
         this.changeVar(obj, childNodes, undefined, config);
         // console.log('eventManager-applyEvent-->', config?.applyEvents)
         var elements = Array.from(childNodes).filter(function (it) { return it.nodeType === 1; }).map(function (it) { return it; });
@@ -683,7 +686,8 @@ var EventManager = /** @class */ (function () {
             if (EventManager.isUsingThisVar(script, varName) || varName === undefined) {
                 var data = ScriptUtils.eval("const $element = this.__render.element; ".concat(script, " "), Object.assign(obj, {
                     __render: Object.freeze({
-                        element: it
+                        element: it,
+                        attribute: DomUtils.getAttributeToObject(it)
                     })
                 }));
                 if (typeof data === 'string') {
@@ -734,7 +738,8 @@ var EventManager = /** @class */ (function () {
             if (EventManager.isUsingThisVar(script, varName) || varName === undefined) {
                 var data = ScriptUtils.eval("const $element = this.__render.element;  ".concat(script, " "), Object.assign(obj, {
                     __render: Object.freeze({
-                        element: it
+                        element: it,
+                        attribute: DomUtils.getAttributeToObject(it)
                     })
                 }));
                 if (typeof data === 'string') {
@@ -762,7 +767,8 @@ var EventManager = /** @class */ (function () {
             if (EventManager.isUsingThisVar(script, varName) || varName === undefined) {
                 var data = ScriptUtils.eval("const $element = this.element;  ".concat(script, " "), Object.assign(obj, {
                     __render: Object.freeze({
-                        element: it
+                        element: it,
+                        attribute: DomUtils.getAttributeToObject(it)
                     })
                 }));
                 if (typeof data === 'string') {
@@ -796,7 +802,8 @@ var EventManager = /** @class */ (function () {
                 if (isUsing) {
                     var data = ScriptUtils.eval("const $element = this.element;  return ".concat(v, " "), Object.assign(obj, {
                         __render: Object.freeze({
-                            element: it
+                            element: it,
+                            attribute: DomUtils.getAttributeToObject(it)
                         })
                     }));
                     it.setAttribute(k, data);
@@ -813,14 +820,13 @@ var EventManager = /** @class */ (function () {
             it.addEventListener(eventName, function (event) {
                 var filter = true;
                 var filterScript = it.getAttribute("".concat(attr, ":filter"));
-                var attribute = DomUtils.getAttributeToObject(it);
                 var thisTarget = Object.assign(obj, {
                     __render: Object.freeze({
                         event: event,
                         element: it,
                         target: event.target,
                         range: Range.range,
-                        attribute: attribute,
+                        attribute: DomUtils.getAttributeToObject(it),
                         router: config === null || config === void 0 ? void 0 : config.router,
                         scripts: EventManager.setBindProperty(config === null || config === void 0 ? void 0 : config.scripts, obj)
                     })
@@ -856,6 +862,7 @@ var EventManager = /** @class */ (function () {
                             __render: Object.freeze({
                                 event: event,
                                 element: it,
+                                attribute: DomUtils.getAttributeToObject(it),
                                 target: event.target,
                                 range: Range.range,
                                 scripts: EventManager.setBindProperty(config === null || config === void 0 ? void 0 : config.scripts, obj),
@@ -1016,7 +1023,7 @@ var Dr = /** @class */ (function (_super) {
             var tempalte = this.source.config.window.document.createElement('template');
             tempalte.innerHTML = newTemp.innerHTML;
             this.returnContainer.fag.append(tempalte.content);
-            var rr = RawSet.checkPointCreates(this.returnContainer.fag, this.source.config);
+            var rr = RawSet.checkPointCreates(this.returnContainer.fag, this.source.obj, this.source.config);
             (_c = this.elementSource.element.parentNode) === null || _c === void 0 ? void 0 : _c.replaceChild(this.returnContainer.fag, this.elementSource.element);
             (_a = this.returnContainer.raws).push.apply(_a, rr);
             return exports.ExecuteState.EXECUTE;
@@ -1053,7 +1060,7 @@ var DrIf = /** @class */ (function (_super) {
             tempalte.innerHTML = newTemp.innerHTML;
             // console.log(tempalte.innerHTML)
             this.returnContainer.fag.append(tempalte.content);
-            var rr = RawSet.checkPointCreates(this.returnContainer.fag, this.source.config);
+            var rr = RawSet.checkPointCreates(this.returnContainer.fag, this.source.obj, this.source.config);
             (_e = this.elementSource.element.parentNode) === null || _e === void 0 ? void 0 : _e.replaceChild(this.returnContainer.fag, this.elementSource.element);
             (_a = this.returnContainer.raws).push.apply(_a, rr);
             // if (bypass) {
@@ -1100,7 +1107,7 @@ var DrThis = /** @class */ (function (_super) {
                 else {
                     this.returnContainer.fag.append(RawSet.drThisCreate(this.elementSource.element, this.elementSource.attrs.drThis, (_e = this.elementSource.attrs.drVarOption) !== null && _e !== void 0 ? _e : '', this.elementSource.attrs.drStripOption, this.source.obj, this.source.config));
                 }
-                var rr = RawSet.checkPointCreates(this.returnContainer.fag, this.source.config);
+                var rr = RawSet.checkPointCreates(this.returnContainer.fag, this.source.obj, this.source.config);
                 (_f = this.elementSource.element.parentNode) === null || _f === void 0 ? void 0 : _f.replaceChild(this.returnContainer.fag, this.elementSource.element);
                 (_a = this.returnContainer.raws).push.apply(_a, rr);
             }
@@ -1499,7 +1506,7 @@ var DrForm = /** @class */ (function (_super) {
                 }
             });
             RawSet.drFormOtherMoveAttr(this.elementSource.element, 'temp-name', 'name', this.source.config);
-            (_a = this.returnContainer.raws).push.apply(_a, RawSet.checkPointCreates(this.elementSource.element, this.source.config));
+            (_a = this.returnContainer.raws).push.apply(_a, RawSet.checkPointCreates(this.elementSource.element, this.source.obj, this.source.config));
             return exports.ExecuteState.EXECUTE;
         }
         return exports.ExecuteState.NO_EXECUTE;
@@ -1523,7 +1530,7 @@ var DrInnerText = /** @class */ (function (_super) {
             var tempalte = this.source.config.window.document.createElement('template');
             tempalte.innerHTML = newTemp.innerHTML;
             this.returnContainer.fag.append(tempalte.content);
-            var rr = RawSet.checkPointCreates(this.returnContainer.fag, this.source.config);
+            var rr = RawSet.checkPointCreates(this.returnContainer.fag, this.source.obj, this.source.config);
             (_d = this.elementSource.element.parentNode) === null || _d === void 0 ? void 0 : _d.replaceChild(this.returnContainer.fag, this.elementSource.element);
             (_a = this.returnContainer.raws).push.apply(_a, rr);
             return exports.ExecuteState.EXECUTE;
@@ -1551,7 +1558,7 @@ var DrInnerHTML = /** @class */ (function (_super) {
             var tempalte = this.source.config.window.document.createElement('template');
             tempalte.innerHTML = newTemp.innerHTML;
             this.returnContainer.fag.append(tempalte.content);
-            var rr = RawSet.checkPointCreates(this.returnContainer.fag, this.source.config);
+            var rr = RawSet.checkPointCreates(this.returnContainer.fag, this.source.obj, this.source.config);
             (_d = this.elementSource.element.parentNode) === null || _d === void 0 ? void 0 : _d.replaceChild(this.returnContainer.fag, this.elementSource.element);
             (_a = this.returnContainer.raws).push.apply(_a, rr);
             return exports.ExecuteState.EXECUTE;
@@ -1581,7 +1588,7 @@ var DrFor = /** @class */ (function (_super) {
             var tempalte = this.source.config.window.document.createElement('template');
             tempalte.innerHTML = newTemp.innerHTML;
             this.returnContainer.fag.append(tempalte.content);
-            var rr = RawSet.checkPointCreates(this.returnContainer.fag, this.source.config);
+            var rr = RawSet.checkPointCreates(this.returnContainer.fag, this.source.obj, this.source.config);
             (_e = this.elementSource.element.parentNode) === null || _e === void 0 ? void 0 : _e.replaceChild(this.returnContainer.fag, this.elementSource.element);
             (_a = this.returnContainer.raws).push.apply(_a, rr);
             return exports.ExecuteState.EXECUTE;
@@ -1613,7 +1620,7 @@ var DrForOf = /** @class */ (function (_super) {
             var tempalte = this.source.config.window.document.createElement('template');
             tempalte.innerHTML = newTemp.innerHTML;
             this.returnContainer.fag.append(tempalte.content);
-            var rr = RawSet.checkPointCreates(this.returnContainer.fag, this.source.config);
+            var rr = RawSet.checkPointCreates(this.returnContainer.fag, this.source.obj, this.source.config);
             (_e = this.elementSource.element.parentNode) === null || _e === void 0 ? void 0 : _e.replaceChild(this.returnContainer.fag, this.elementSource.element);
             // const rrr = rr.flatMap(it => it.render(obj, config));// .flat();
             (_a = this.returnContainer.raws).push.apply(_a, rr);
@@ -1646,7 +1653,7 @@ var DrAppender = /** @class */ (function (_super) {
             var tempalte = this.source.config.window.document.createElement('template');
             tempalte.innerHTML = newTemp.innerHTML;
             this.returnContainer.fag.append(tempalte.content);
-            var rr = RawSet.checkPointCreates(this.returnContainer.fag, this.source.config);
+            var rr = RawSet.checkPointCreates(this.returnContainer.fag, this.source.obj, this.source.config);
             (_e = this.elementSource.element.parentNode) === null || _e === void 0 ? void 0 : _e.replaceChild(this.returnContainer.fag, this.elementSource.element);
             // const rrr = rr.flatMap(it => it.render(obj, config));// .flat();
             (_a = this.returnContainer.raws).push.apply(_a, rr);
@@ -1677,7 +1684,7 @@ var DrRepeat = /** @class */ (function (_super) {
             var tempalte = this.source.config.window.document.createElement('template');
             tempalte.innerHTML = newTemp.innerHTML;
             this.returnContainer.fag.append(tempalte.content);
-            var rr = RawSet.checkPointCreates(this.returnContainer.fag, this.source.config);
+            var rr = RawSet.checkPointCreates(this.returnContainer.fag, this.source.obj, this.source.config);
             (_e = this.elementSource.element.parentNode) === null || _e === void 0 ? void 0 : _e.replaceChild(this.returnContainer.fag, this.elementSource.element);
             (_a = this.returnContainer.raws).push.apply(_a, rr);
             return exports.ExecuteState.EXECUTE;
@@ -1739,7 +1746,7 @@ var DrTargetElement = /** @class */ (function (_super) {
                     };
                 }
                 // fag.append(documentFragment)
-                var rr = RawSet.checkPointCreates(documentFragment, this.source.config);
+                var rr = RawSet.checkPointCreates(documentFragment, this.source.obj, this.source.config);
                 (_d = this.elementSource.element.parentNode) === null || _d === void 0 ? void 0 : _d.replaceChild(documentFragment, this.elementSource.element);
                 (_a = this.returnContainer.raws).push.apply(_a, rr);
                 this.afterCallBack.onElementInitCallBacks.push({
@@ -1774,7 +1781,7 @@ var DrTargetAttr = /** @class */ (function (_super) {
             if (attrValue && attrName && (!this.elementSource.attrs.drForOf && !this.elementSource.attrs.drFor && !this.elementSource.attrs.drRepeat)) {
                 var documentFragment = targetAttr.callBack(this.elementSource.element, attrValue, this.source.obj, this.rawSet);
                 if (documentFragment) {
-                    var rr = RawSet.checkPointCreates(documentFragment, this.source.config);
+                    var rr = RawSet.checkPointCreates(documentFragment, this.source.obj, this.source.config);
                     (_d = this.elementSource.element.parentNode) === null || _d === void 0 ? void 0 : _d.replaceChild(documentFragment, this.elementSource.element);
                     (_a = this.returnContainer.raws).push.apply(_a, rr);
                     this.afterCallBack.onAttrInitCallBacks.push({
@@ -2053,7 +2060,7 @@ var RawSet = /** @class */ (function () {
         (_a = this.point.start.parentNode) === null || _a === void 0 ? void 0 : _a.insertBefore(genNode, this.point.start.nextSibling);
     };
     // 중요 important
-    RawSet.checkPointCreates = function (element, config) {
+    RawSet.checkPointCreates = function (element, obj, config) {
         var _a, _b, _c, _d, _e, _f, _g, _h;
         var thisVariableName = element.__domrender_this_variable_name;
         // console.log('checkPointCreates thisVariableName', thisVariableName);
@@ -2607,7 +2614,7 @@ var DomRenderProxy = /** @class */ (function () {
         (_d = (_c = this._domRender_proxy) === null || _c === void 0 ? void 0 : _c.onCreateRender) === null || _d === void 0 ? void 0 : _d.call(_c, createParam);
         var innerHTML = (_e = target.innerHTML) !== null && _e !== void 0 ? _e : '';
         this._targets.add(target);
-        var rawSets = RawSet.checkPointCreates(target, this.config);
+        var rawSets = RawSet.checkPointCreates(target, this._domRender_proxy, this.config);
         // console.log('initRender -------rawSet', rawSets)
         // 중요 초기에 한번 튕겨줘야함.
         eventManager.applyEvent(this._domRender_proxy, eventManager.findAttrElements(target, this.config), this.config);
@@ -3360,48 +3367,36 @@ var DomRender = /** @class */ (function () {
         domRender.run(robj);
         return robj;
     };
-    DomRender.addComponent = function (config, _a, _b) {
-        var _c;
-        var type = _a.type, _d = _a.tagName, tagName = _d === void 0 ? type.name : _d;
-        var template = _b.template, _e = _b.styles, styles = _e === void 0 ? [] : _e, _f = _b.styleLocale, styleLocale = _f === void 0 ? false : _f;
-        var component = RawSet.createComponentTargetElement(tagName, function (e, o, r2, counstructorParam) {
-            return new (type.bind.apply(type, __spreadArray([void 0], counstructorParam, false)))();
-        }, template, styles, styleLocale, config);
-        config.targetElements = (_c = config.targetElements) !== null && _c !== void 0 ? _c : [];
-        config.targetElements.push(component);
-        return {
-            add: function (source, front) {
-                return DomRender.addComponent(config, source, front);
-            }
-        };
+    DomRender.createComponent = function (param, config) {
+        var _a, _b;
+        var component = RawSet.createComponentTargetElement((_a = param.tagName) !== null && _a !== void 0 ? _a : param.type.name, function (e, o, r2, counstructorParam) {
+            var _a;
+            return new ((_a = param.type).bind.apply(_a, __spreadArray([void 0], counstructorParam, false)))();
+        }, (_b = param.template) !== null && _b !== void 0 ? _b : '', Array.isArray(param.styles) ? param.styles : (param.styles ? [param.styles] : undefined), false, config);
+        return component;
     };
-    DomRender.addAttribute = function (config, attrName, getThisObj, factory) {
-        var _a;
+    DomRender.createAttribute = function (attrName, getThisObj, factory) {
         var targetAttribute = RawSet.createComponentTargetAttribute(attrName, getThisObj, factory);
-        config.targetAttrs = (_a = config.targetAttrs) !== null && _a !== void 0 ? _a : [];
-        config.targetAttrs.push(targetAttribute);
-        return {
-            add: function (attrName, getThisObj, factory) {
-                return DomRender.addAttribute(config, attrName, getThisObj, factory);
-            }
-        };
-    };
-    DomRender.addAttributeCallBack = function (config, attrName, callBack) {
-        var _a;
-        config.applyEvents = (_a = config.applyEvents) !== null && _a !== void 0 ? _a : [];
-        config.applyEvents.push({
-            attrName: attrName,
-            callBack: callBack
-        });
-        return {
-            add: function (attrName, callBack) {
-                return DomRender.addAttributeCallBack(config, attrName, callBack);
-            }
-        };
+        return targetAttribute;
     };
     return DomRender;
 }());
 
+var RenderManager = /** @class */ (function () {
+    function RenderManager() {
+    }
+    RenderManager.render = function (obj, target) {
+        if (target === void 0) { target = Object.keys(obj); }
+        var domRenderProxy = obj._DomRender_proxy;
+        if (domRenderProxy) {
+            target.forEach(function (it) {
+                domRenderProxy.root([it], obj[it]);
+            });
+        }
+    };
+    return RenderManager;
+}());
+
 var Appender = /** @class */ (function () {
     // [keys: string]: any;
     function Appender() {
@@ -3431,21 +3426,6 @@ var Appender = /** @class */ (function () {
     return Appender;
 }());
 
-var RenderManager = /** @class */ (function () {
-    function RenderManager() {
-    }
-    RenderManager.render = function (obj, target) {
-        if (target === void 0) { target = Object.keys(obj); }
-        var domRenderProxy = obj._DomRender_proxy;
-        if (domRenderProxy) {
-            target.forEach(function (it) {
-                domRenderProxy.root([it], obj[it]);
-            });
-        }
-    };
-    return RenderManager;
-}());
-
 var AllCheckedValidatorArray = /** @class */ (function (_super) {
     __extends(AllCheckedValidatorArray, _super);
     function AllCheckedValidatorArray(value, target, event, autoValid) {
@@ -3487,6 +3467,34 @@ var CountEqualsCheckedValidatorArray = /** @class */ (function (_super) {
     return CountEqualsCheckedValidatorArray;
 }(ValidatorArray));
 
+var CheckedValidator = /** @class */ (function (_super) {
+    __extends(CheckedValidator, _super);
+    function CheckedValidator(value, target, event, autoValid) {
+        if (autoValid === void 0) { autoValid = true; }
+        return _super.call(this, value, target, event, autoValid) || this;
+    }
+    CheckedValidator.prototype.valid = function () {
+        var _a, _b;
+        return (_b = (_a = this.getTarget()) === null || _a === void 0 ? void 0 : _a.checked) !== null && _b !== void 0 ? _b : false;
+    };
+    return CheckedValidator;
+}(Validator));
+
+var CountGreaterThanCheckedValidatorArray = /** @class */ (function (_super) {
+    __extends(CountGreaterThanCheckedValidatorArray, _super);
+    function CountGreaterThanCheckedValidatorArray(count, value, target, event, autoValid) {
+        if (autoValid === void 0) { autoValid = true; }
+        var _this = _super.call(this, value, target, event, autoValid) || this;
+        _this.count = count;
+        return _this;
+    }
+    CountGreaterThanCheckedValidatorArray.prototype.valid = function () {
+        var _a;
+        return ((_a = this.value) !== null && _a !== void 0 ? _a : []).filter(function (it) { return it.checked; }).length > this.count;
+    };
+    return CountGreaterThanCheckedValidatorArray;
+}(ValidatorArray));
+
 var CountEqualsUnCheckedValidatorArray = /** @class */ (function (_super) {
     __extends(CountEqualsUnCheckedValidatorArray, _super);
     function CountEqualsUnCheckedValidatorArray(count, value, target, event, autoValid) {
@@ -3502,34 +3510,21 @@ var CountEqualsUnCheckedValidatorArray = /** @class */ (function (_super) {
     return CountEqualsUnCheckedValidatorArray;
 }(ValidatorArray));
 
-var CountGreaterThanCheckedValidatorArray = /** @class */ (function (_super) {
-    __extends(CountGreaterThanCheckedValidatorArray, _super);
-    function CountGreaterThanCheckedValidatorArray(count, value, target, event, autoValid) {
+var CountLessThanEqualsCheckedValidatorArray = /** @class */ (function (_super) {
+    __extends(CountLessThanEqualsCheckedValidatorArray, _super);
+    function CountLessThanEqualsCheckedValidatorArray(count, value, target, event, autoValid) {
         if (autoValid === void 0) { autoValid = true; }
         var _this = _super.call(this, value, target, event, autoValid) || this;
         _this.count = count;
         return _this;
     }
-    CountGreaterThanCheckedValidatorArray.prototype.valid = function () {
+    CountLessThanEqualsCheckedValidatorArray.prototype.valid = function () {
         var _a;
-        return ((_a = this.value) !== null && _a !== void 0 ? _a : []).filter(function (it) { return it.checked; }).length > this.count;
+        return ((_a = this.value) !== null && _a !== void 0 ? _a : []).filter(function (it) { return it.checked; }).length <= this.count;
     };
-    return CountGreaterThanCheckedValidatorArray;
+    return CountLessThanEqualsCheckedValidatorArray;
 }(ValidatorArray));
 
-var CheckedValidator = /** @class */ (function (_super) {
-    __extends(CheckedValidator, _super);
-    function CheckedValidator(value, target, event, autoValid) {
-        if (autoValid === void 0) { autoValid = true; }
-        return _super.call(this, value, target, event, autoValid) || this;
-    }
-    CheckedValidator.prototype.valid = function () {
-        var _a, _b;
-        return (_b = (_a = this.getTarget()) === null || _a === void 0 ? void 0 : _a.checked) !== null && _b !== void 0 ? _b : false;
-    };
-    return CheckedValidator;
-}(Validator));
-
 var CountGreaterThanEqualsUnCheckedValidatorArray = /** @class */ (function (_super) {
     __extends(CountGreaterThanEqualsUnCheckedValidatorArray, _super);
     function CountGreaterThanEqualsUnCheckedValidatorArray(count, value, target, event, autoValid) {
@@ -3545,34 +3540,34 @@ var CountGreaterThanEqualsUnCheckedValidatorArray = /** @class */ (function (_su
     return CountGreaterThanEqualsUnCheckedValidatorArray;
 }(ValidatorArray));
 
-var CountGreaterThanEqualsCheckedValidatorArray = /** @class */ (function (_super) {
-    __extends(CountGreaterThanEqualsCheckedValidatorArray, _super);
-    function CountGreaterThanEqualsCheckedValidatorArray(count, value, target, event, autoValid) {
+var CountLessThanCheckedValidatorArray = /** @class */ (function (_super) {
+    __extends(CountLessThanCheckedValidatorArray, _super);
+    function CountLessThanCheckedValidatorArray(count, value, target, event, autoValid) {
         if (autoValid === void 0) { autoValid = true; }
         var _this = _super.call(this, value, target, event, autoValid) || this;
         _this.count = count;
         return _this;
     }
-    CountGreaterThanEqualsCheckedValidatorArray.prototype.valid = function () {
+    CountLessThanCheckedValidatorArray.prototype.valid = function () {
         var _a;
-        return ((_a = this.value) !== null && _a !== void 0 ? _a : []).filter(function (it) { return it.checked; }).length >= this.count;
+        return ((_a = this.value) !== null && _a !== void 0 ? _a : []).filter(function (it) { return it.checked; }).length < this.count;
     };
-    return CountGreaterThanEqualsCheckedValidatorArray;
+    return CountLessThanCheckedValidatorArray;
 }(ValidatorArray));
 
-var CountLessThanEqualsCheckedValidatorArray = /** @class */ (function (_super) {
-    __extends(CountLessThanEqualsCheckedValidatorArray, _super);
-    function CountLessThanEqualsCheckedValidatorArray(count, value, target, event, autoValid) {
+var CountGreaterThanEqualsCheckedValidatorArray = /** @class */ (function (_super) {
+    __extends(CountGreaterThanEqualsCheckedValidatorArray, _super);
+    function CountGreaterThanEqualsCheckedValidatorArray(count, value, target, event, autoValid) {
         if (autoValid === void 0) { autoValid = true; }
         var _this = _super.call(this, value, target, event, autoValid) || this;
         _this.count = count;
         return _this;
     }
-    CountLessThanEqualsCheckedValidatorArray.prototype.valid = function () {
+    CountGreaterThanEqualsCheckedValidatorArray.prototype.valid = function () {
         var _a;
-        return ((_a = this.value) !== null && _a !== void 0 ? _a : []).filter(function (it) { return it.checked; }).length <= this.count;
+        return ((_a = this.value) !== null && _a !== void 0 ? _a : []).filter(function (it) { return it.checked; }).length >= this.count;
     };
-    return CountLessThanEqualsCheckedValidatorArray;
+    return CountGreaterThanEqualsCheckedValidatorArray;
 }(ValidatorArray));
 
 var CountLessThanEqualsUnCheckedValidatorArray = /** @class */ (function (_super) {
@@ -3620,21 +3615,6 @@ var CountLessThanUnCheckedValidatorArray = /** @class */ (function (_super) {
     return CountLessThanUnCheckedValidatorArray;
 }(ValidatorArray));
 
-var CountLessThanCheckedValidatorArray = /** @class */ (function (_super) {
-    __extends(CountLessThanCheckedValidatorArray, _super);
-    function CountLessThanCheckedValidatorArray(count, value, target, event, autoValid) {
-        if (autoValid === void 0) { autoValid = true; }
-        var _this = _super.call(this, value, target, event, autoValid) || this;
-        _this.count = count;
-        return _this;
-    }
-    CountLessThanCheckedValidatorArray.prototype.valid = function () {
-        var _a;
-        return ((_a = this.value) !== null && _a !== void 0 ? _a : []).filter(function (it) { return it.checked; }).length < this.count;
-    };
-    return CountLessThanCheckedValidatorArray;
-}(ValidatorArray));
-
 var CountUnCheckedValidatorArray = /** @class */ (function (_super) {
     __extends(CountUnCheckedValidatorArray, _super);
     function CountUnCheckedValidatorArray(count, value, target, event, autoValid) {
@@ -3686,28 +3666,6 @@ var IncludeCheckedValidatorArray = /** @class */ (function (_super) {
     return IncludeCheckedValidatorArray;
 }(ValidatorArray));
 
-var ExcludeCheckedValidatorArray = /** @class */ (function (_super) {
-    __extends(ExcludeCheckedValidatorArray, _super);
-    function ExcludeCheckedValidatorArray(include, allRequired, value, target, event, autoValid) {
-        if (allRequired === void 0) { allRequired = false; }
-        if (autoValid === void 0) { autoValid = true; }
-        var _this = _super.call(this, value, target, event, autoValid) || this;
-        _this.include = include;
-        _this.allRequired = allRequired;
-        return _this;
-    }
-    ExcludeCheckedValidatorArray.prototype.valid = function () {
-        var _this = this;
-        var _a;
-        var valus = (_a = this.value) !== null && _a !== void 0 ? _a : [];
-        var unCheckedValue = valus.filter(function (it) { return !it.checked; }).map(function (it) { return it.value; });
-        return unCheckedValue.length > 0 &&
-            (!(unCheckedValue.filter(function (it) { return !_this.include.includes(it); }).length > 0)) &&
-            (this.allRequired ? unCheckedValue.filter(function (it) { return _this.include.includes(it); }).length === this.include.length : true);
-    };
-    return ExcludeCheckedValidatorArray;
-}(ValidatorArray));
-
 var NotEmptyValidator = /** @class */ (function (_super) {
     __extends(NotEmptyValidator, _super);
     function NotEmptyValidator(value, target, event, autoValid) {
@@ -3723,24 +3681,6 @@ var NotEmptyValidator = /** @class */ (function (_super) {
     return NotEmptyValidator;
 }(Validator));
 
-var FormValidator = /** @class */ (function (_super) {
-    __extends(FormValidator, _super);
-    function FormValidator(target, event, autoValid) {
-        if (autoValid === void 0) { autoValid = true; }
-        return _super.call(this, undefined, target, event, autoValid) || this;
-    }
-    FormValidator.prototype.validAction = function () {
-        return _super.prototype.childValidAction.call(this);
-    };
-    FormValidator.prototype.valid = function () {
-        return this.childValid();
-    };
-    FormValidator.prototype.reset = function () {
-        this.targetReset();
-    };
-    return FormValidator;
-}(Validator));
-
 var MultipleValidator = /** @class */ (function (_super) {
     __extends(MultipleValidator, _super);
     function MultipleValidator(validators, value, target, event, autoValid) {
@@ -3770,6 +3710,58 @@ var MultipleValidator = /** @class */ (function (_super) {
     return MultipleValidator;
 }(Validator));
 
+var FormValidator = /** @class */ (function (_super) {
+    __extends(FormValidator, _super);
+    function FormValidator(target, event, autoValid) {
+        if (autoValid === void 0) { autoValid = true; }
+        return _super.call(this, undefined, target, event, autoValid) || this;
+    }
+    FormValidator.prototype.validAction = function () {
+        return _super.prototype.childValidAction.call(this);
+    };
+    FormValidator.prototype.valid = function () {
+        return this.childValid();
+    };
+    FormValidator.prototype.reset = function () {
+        this.targetReset();
+    };
+    return FormValidator;
+}(Validator));
+
+var ExcludeCheckedValidatorArray = /** @class */ (function (_super) {
+    __extends(ExcludeCheckedValidatorArray, _super);
+    function ExcludeCheckedValidatorArray(include, allRequired, value, target, event, autoValid) {
+        if (allRequired === void 0) { allRequired = false; }
+        if (autoValid === void 0) { autoValid = true; }
+        var _this = _super.call(this, value, target, event, autoValid) || this;
+        _this.include = include;
+        _this.allRequired = allRequired;
+        return _this;
+    }
+    ExcludeCheckedValidatorArray.prototype.valid = function () {
+        var _this = this;
+        var _a;
+        var valus = (_a = this.value) !== null && _a !== void 0 ? _a : [];
+        var unCheckedValue = valus.filter(function (it) { return !it.checked; }).map(function (it) { return it.value; });
+        return unCheckedValue.length > 0 &&
+            (!(unCheckedValue.filter(function (it) { return !_this.include.includes(it); }).length > 0)) &&
+            (this.allRequired ? unCheckedValue.filter(function (it) { return _this.include.includes(it); }).length === this.include.length : true);
+    };
+    return ExcludeCheckedValidatorArray;
+}(ValidatorArray));
+
+var PassValidator = /** @class */ (function (_super) {
+    __extends(PassValidator, _super);
+    function PassValidator(value, target, event, autoValid) {
+        if (autoValid === void 0) { autoValid = true; }
+        return _super.call(this, value, target, event, autoValid) || this;
+    }
+    PassValidator.prototype.valid = function () {
+        return true;
+    };
+    return PassValidator;
+}(Validator));
+
 var NotRegExpTestValidator = /** @class */ (function (_super) {
     __extends(NotRegExpTestValidator, _super);
     function NotRegExpTestValidator(regexp, value, target, event, autoValid) {
@@ -3792,40 +3784,18 @@ var NotRegExpTestValidator = /** @class */ (function (_super) {
     return NotRegExpTestValidator;
 }(Validator));
 
-var RegExpTestValidator = /** @class */ (function (_super) {
-    __extends(RegExpTestValidator, _super);
-    function RegExpTestValidator(regexp, value, target, event, autoValid) {
+var ValidValidator = /** @class */ (function (_super) {
+    __extends(ValidValidator, _super);
+    function ValidValidator(validCallBack, value, target, event, autoValid) {
         if (autoValid === void 0) { autoValid = true; }
         var _this = _super.call(this, value, target, event, autoValid) || this;
-        _this.regexp = DomRenderProxy.final(regexp);
+        _this.validCallBack = validCallBack;
         return _this;
     }
-    RegExpTestValidator.prototype.valid = function () {
-        var _a;
-        var value = this.value;
-        var regExp = (_a = this.regexp._DomRender_origin) !== null && _a !== void 0 ? _a : this.regexp;
-        // console.log('regexp-->', value, this.regexp, regExp.test(value))
-        if (value) {
-            return regExp.test(value);
-        }
-        else {
-            return false;
-        }
-    };
-    return RegExpTestValidator;
-}(Validator));
-
-var UnCheckedValidator = /** @class */ (function (_super) {
-    __extends(UnCheckedValidator, _super);
-    function UnCheckedValidator(value, target, event, autoValid) {
-        if (autoValid === void 0) { autoValid = true; }
-        return _super.call(this, value, target, event, autoValid) || this;
-    }
-    UnCheckedValidator.prototype.valid = function () {
-        var _a, _b;
-        return !((_b = (_a = this.getTarget()) === null || _a === void 0 ? void 0 : _a.checked) !== null && _b !== void 0 ? _b : false);
+    ValidValidator.prototype.valid = function (value, target, event) {
+        return this.validCallBack(value, target, event);
     };
-    return UnCheckedValidator;
+    return ValidValidator;
 }(Validator));
 
 var ValidMultipleValidator = /** @class */ (function (_super) {
@@ -3843,16 +3813,27 @@ var ValidMultipleValidator = /** @class */ (function (_super) {
     return ValidMultipleValidator;
 }(MultipleValidator));
 
-var PassValidator = /** @class */ (function (_super) {
-    __extends(PassValidator, _super);
-    function PassValidator(value, target, event, autoValid) {
+var RegExpTestValidator = /** @class */ (function (_super) {
+    __extends(RegExpTestValidator, _super);
+    function RegExpTestValidator(regexp, value, target, event, autoValid) {
         if (autoValid === void 0) { autoValid = true; }
-        return _super.call(this, value, target, event, autoValid) || this;
+        var _this = _super.call(this, value, target, event, autoValid) || this;
+        _this.regexp = DomRenderProxy.final(regexp);
+        return _this;
     }
-    PassValidator.prototype.valid = function () {
-        return true;
+    RegExpTestValidator.prototype.valid = function () {
+        var _a;
+        var value = this.value;
+        var regExp = (_a = this.regexp._DomRender_origin) !== null && _a !== void 0 ? _a : this.regexp;
+        // console.log('regexp-->', value, this.regexp, regExp.test(value))
+        if (value) {
+            return regExp.test(value);
+        }
+        else {
+            return false;
+        }
     };
-    return PassValidator;
+    return RegExpTestValidator;
 }(Validator));
 
 var RequiredValidator = /** @class */ (function (_super) {
@@ -3869,6 +3850,20 @@ var RequiredValidator = /** @class */ (function (_super) {
     return RequiredValidator;
 }(Validator));
 
+var ValueNotEqualsValidator = /** @class */ (function (_super) {
+    __extends(ValueNotEqualsValidator, _super);
+    function ValueNotEqualsValidator(equalsValue, value, target, event, autoValid) {
+        if (autoValid === void 0) { autoValid = true; }
+        var _this = _super.call(this, value, target, event, autoValid) || this;
+        _this.equalsValue = equalsValue;
+        return _this;
+    }
+    ValueNotEqualsValidator.prototype.valid = function () {
+        return this.value !== this.equalsValue;
+    };
+    return ValueNotEqualsValidator;
+}(Validator));
+
 var ValidValidatorArray = /** @class */ (function (_super) {
     __extends(ValidValidatorArray, _super);
     function ValidValidatorArray(validCallBack, value, target, event, autoValid) {
@@ -3883,20 +3878,6 @@ var ValidValidatorArray = /** @class */ (function (_super) {
     return ValidValidatorArray;
 }(ValidatorArray));
 
-var ValidValidator = /** @class */ (function (_super) {
-    __extends(ValidValidator, _super);
-    function ValidValidator(validCallBack, value, target, event, autoValid) {
-        if (autoValid === void 0) { autoValid = true; }
-        var _this = _super.call(this, value, target, event, autoValid) || this;
-        _this.validCallBack = validCallBack;
-        return _this;
-    }
-    ValidValidator.prototype.valid = function (value, target, event) {
-        return this.validCallBack(value, target, event);
-    };
-    return ValidValidator;
-}(Validator));
-
 var ValueEqualsValidator = /** @class */ (function (_super) {
     __extends(ValueEqualsValidator, _super);
     function ValueEqualsValidator(equalsValue, value, target, event, autoValid) {
@@ -3911,42 +3892,39 @@ var ValueEqualsValidator = /** @class */ (function (_super) {
     return ValueEqualsValidator;
 }(Validator));
 
-var ValueNotEqualsValidator = /** @class */ (function (_super) {
-    __extends(ValueNotEqualsValidator, _super);
-    function ValueNotEqualsValidator(equalsValue, value, target, event, autoValid) {
+var UnCheckedValidator = /** @class */ (function (_super) {
+    __extends(UnCheckedValidator, _super);
+    function UnCheckedValidator(value, target, event, autoValid) {
         if (autoValid === void 0) { autoValid = true; }
-        var _this = _super.call(this, value, target, event, autoValid) || this;
-        _this.equalsValue = equalsValue;
-        return _this;
+        return _super.call(this, value, target, event, autoValid) || this;
     }
-    ValueNotEqualsValidator.prototype.valid = function () {
-        return this.value !== this.equalsValue;
+    UnCheckedValidator.prototype.valid = function () {
+        var _a, _b;
+        return !((_b = (_a = this.getTarget()) === null || _a === void 0 ? void 0 : _a.checked) !== null && _b !== void 0 ? _b : false);
     };
-    return ValueNotEqualsValidator;
+    return UnCheckedValidator;
 }(Validator));
 
-var NodeUtils = /** @class */ (function () {
-    function NodeUtils() {
+var ClipBoardUtils = /** @class */ (function () {
+    function ClipBoardUtils() {
     }
-    // https://stackoverflow.com/questions/3955229/remove-all-child-elements-of-a-dom-node-in-javascript
-    NodeUtils.removeAllChildNode = function (node) {
-        while (node === null || node === void 0 ? void 0 : node.firstChild) {
-            node.firstChild.remove();
-        }
+    ClipBoardUtils.readText = function (clipboard) {
+        if (clipboard === void 0) { clipboard = navigator.clipboard; }
+        return clipboard.readText();
     };
-    NodeUtils.appendChild = function (parentNode, childNode) {
-        return parentNode.appendChild(childNode);
+    ClipBoardUtils.read = function (clipboard) {
+        if (clipboard === void 0) { clipboard = navigator.clipboard; }
+        return clipboard.read();
     };
-    NodeUtils.replaceNode = function (targetNode, newNode) {
-        var _a;
-        // console.log('repalceNode', targetNode, newNode, targetNode.parentNode)
-        return (_a = targetNode.parentNode) === null || _a === void 0 ? void 0 : _a.replaceChild(newNode, targetNode);
+    ClipBoardUtils.writeText = function (data, clipboard) {
+        if (clipboard === void 0) { clipboard = navigator.clipboard; }
+        return clipboard.writeText(data);
     };
-    NodeUtils.addNode = function (targetNode, newNode) {
-        var _a;
-        return (_a = targetNode.parentNode) === null || _a === void 0 ? void 0 : _a.insertBefore(newNode, targetNode.nextSibling);
+    ClipBoardUtils.write = function (data, clipboard) {
+        if (clipboard === void 0) { clipboard = navigator.clipboard; }
+        return clipboard.write(data);
     };
-    return NodeUtils;
+    return ClipBoardUtils;
 }());
 
 var StorageUtils = /** @class */ (function () {
@@ -3994,26 +3972,28 @@ var StorageUtils = /** @class */ (function () {
     return StorageUtils;
 }());
 
-var ClipBoardUtils = /** @class */ (function () {
-    function ClipBoardUtils() {
+var NodeUtils = /** @class */ (function () {
+    function NodeUtils() {
     }
-    ClipBoardUtils.readText = function (clipboard) {
-        if (clipboard === void 0) { clipboard = navigator.clipboard; }
-        return clipboard.readText();
+    // https://stackoverflow.com/questions/3955229/remove-all-child-elements-of-a-dom-node-in-javascript
+    NodeUtils.removeAllChildNode = function (node) {
+        while (node === null || node === void 0 ? void 0 : node.firstChild) {
+            node.firstChild.remove();
+        }
     };
-    ClipBoardUtils.read = function (clipboard) {
-        if (clipboard === void 0) { clipboard = navigator.clipboard; }
-        return clipboard.read();
+    NodeUtils.appendChild = function (parentNode, childNode) {
+        return parentNode.appendChild(childNode);
     };
-    ClipBoardUtils.writeText = function (data, clipboard) {
-        if (clipboard === void 0) { clipboard = navigator.clipboard; }
-        return clipboard.writeText(data);
+    NodeUtils.replaceNode = function (targetNode, newNode) {
+        var _a;
+        // console.log('repalceNode', targetNode, newNode, targetNode.parentNode)
+        return (_a = targetNode.parentNode) === null || _a === void 0 ? void 0 : _a.replaceChild(newNode, targetNode);
     };
-    ClipBoardUtils.write = function (data, clipboard) {
-        if (clipboard === void 0) { clipboard = navigator.clipboard; }
-        return clipboard.write(data);
+    NodeUtils.addNode = function (targetNode, newNode) {
+        var _a;
+        return (_a = targetNode.parentNode) === null || _a === void 0 ? void 0 : _a.insertBefore(newNode, targetNode.nextSibling);
     };
-    return ClipBoardUtils;
+    return NodeUtils;
 }());
 
 exports.AllCheckedValidatorArray = AllCheckedValidatorArray;