dom-render 1.0.85 → 1.0.88

package/dist/bundle.js

@@ -1094,6 +1094,8 @@ var DrThis = /** @class */ (function (_super) {
         var _b, _c, _d, _e, _f;
         if (this.elementSource.attrs.drThis) {
             var r = ScriptUtils.evalReturn(this.elementSource.attrs.drThis, this.source.obj);
+            // const isStrip = ScriptUtils.eval(`if (${this.elementSource.attrs.drStripOption ?? 'false'}) { return true; } else { return false; }`, this.source.obj);
+            // console.log('isStrip', isStrip)
             if (r) {
                 if (r instanceof ComponentSet) {
                     if (this.rawSet.data) {
@@ -1101,7 +1103,8 @@ var DrThis = /** @class */ (function (_super) {
                         RawSet.destroy(this.rawSet.data.obj, [], this.source.config, destroyOptions);
                     }
                     this.rawSet.data = r;
-                    this.returnContainer.fag.append(RawSet.drThisCreate(this.rawSet, this.elementSource.element, "".concat(this.elementSource.attrs.drThis, ".obj"), (_d = this.elementSource.attrs.drVarOption) !== null && _d !== void 0 ? _d : '', this.elementSource.attrs.drStripOption, this.source.obj, this.source.config, r));
+                    var componentBody = RawSet.drThisCreate(this.rawSet, this.elementSource.element, "".concat(this.elementSource.attrs.drThis, ".obj"), (_d = this.elementSource.attrs.drVarOption) !== null && _d !== void 0 ? _d : '', this.elementSource.attrs.drStripOption, this.source.obj, this.source.config, r);
+                    this.returnContainer.fag.append(componentBody);
                     this.afterCallBack.onThisComponentSetCallBacks.push(r);
                 }
                 else {
@@ -1705,7 +1708,7 @@ var DrTargetElement = /** @class */ (function (_super) {
         var _b, _c, _d, _e;
         var targetElement = (_c = (_b = this.source.config) === null || _b === void 0 ? void 0 : _b.targetElements) === null || _c === void 0 ? void 0 : _c.find(function (it) { return it.name.toLowerCase() === _this.elementSource.element.tagName.toLowerCase(); });
         if (targetElement) {
-            var documentFragment = targetElement.callBack(this.elementSource.element, this.source.obj, this.rawSet, this.elementSource.attrs);
+            var documentFragment = targetElement.callBack(this.elementSource.element, this.source.obj, this.rawSet, this.elementSource.attrs, this.source.config);
             if (documentFragment) {
                 // const targetAttrMap = this.elementSource.element.getAttribute(EventManager.normalAttrMapAttrName);
                 var detectAction_1 = this.elementSource.element.getAttribute(RawSet.DR_DETECT_NAME);
@@ -1805,6 +1808,7 @@ exports.DestroyOptionType = void 0;
     DestroyOptionType["NO_DESTROY"] = "NO_DESTROY";
     DestroyOptionType["NO_MESSENGER_DESTROY"] = "NO_MESSENGER_DESTROY";
 })(exports.DestroyOptionType || (exports.DestroyOptionType = {}));
+
 exports.RawSetType = void 0;
 (function (RawSetType) {
     RawSetType["TEXT"] = "TEXT";
@@ -1813,6 +1817,7 @@ exports.RawSetType = void 0;
     RawSetType["TARGET_ATTR"] = "TARGET_ATTR";
     RawSetType["UNKOWN"] = "UNKOWN";
 })(exports.RawSetType || (exports.RawSetType = {}));
+
 var RawSet = /** @class */ (function () {
     function RawSet(uuid, type, point, fragment, detect, data) {
         this.uuid = uuid;
@@ -1985,28 +1990,18 @@ var RawSet = /** @class */ (function () {
         drAttrs.forEach(function (it) {
             if (it.drCompleteOption) {
                 // genNode.childNodes
-                ScriptUtils.eval("\n                const ".concat(EventManager.FAG_VARNAME, " = this.__render.fag;\n                const ").concat(EventManager.SCRIPTS_VARNAME, " = this.__render.scripts;\n                const ").concat(EventManager.RAWSET_VARNAME, " = this.__render.rawset;\n                ").concat(it.drCompleteOption, "\n                "), Object.assign(obj, {
-                    __render: Object.freeze({
-                        rawset: _this,
-                        fag: genNode,
-                        scripts: EventManager.setBindProperty(config === null || config === void 0 ? void 0 : config.scripts, obj)
-                    })
-                }));
-            }
-        });
-        // 중요 style isolation 나중에 :scope로 대체 가능할듯.
-        Array.from(window.document.styleSheets).filter(function (it) { return it.ownerNode && it.ownerNode instanceof Element && it.ownerNode.getAttribute('id') && !it.ownerNode.getAttribute('completed'); }).forEach(function (it) {
-            var _a;
-            var styleElement = it.ownerNode;
-            var id = (_a = styleElement.getAttribute('id')) === null || _a === void 0 ? void 0 : _a.split('-')[0];
-            if (id) {
-                // console.log('------->', id)
-                Array.from(it.cssRules).forEach(function (it) {
-                    _this.generateCSS(id, it);
+                var render = Object.freeze({
+                    rawset: _this,
+                    fag: genNode,
+                    scripts: EventManager.setBindProperty(config === null || config === void 0 ? void 0 : config.scripts, obj)
                 });
+                ScriptUtils.eval("\n                const ".concat(EventManager.FAG_VARNAME, " = this.__render.fag;\n                const ").concat(EventManager.SCRIPTS_VARNAME, " = this.__render.scripts;\n                const ").concat(EventManager.RAWSET_VARNAME, " = this.__render.rawset;\n                ").concat(it.drCompleteOption), Object.assign(obj, { __render: render }));
             }
-            it.ownerNode.setAttribute('completed', 'true');
         });
+        // 중요 style isolation 나중에 :scope로 대체 가능할듯.
+        RawSet.generateStyleSheetsLocal();
+        // console.log('-22222-')
+        // alert(1);
         for (var _p = 0, onThisComponentSetCallBacks_1 = onThisComponentSetCallBacks; _p < onThisComponentSetCallBacks_1.length; _p++) {
             var it_1 = onThisComponentSetCallBacks_1[_p];
             (_c = (_b = it_1.obj).onInitRender) === null || _c === void 0 ? void 0 : _c.call(_b);
@@ -2039,7 +2034,23 @@ var RawSet = /** @class */ (function () {
         }
         return raws;
     };
-    RawSet.prototype.generateCSS = function (id, cssRule) {
+    RawSet.generateStyleSheetsLocal = function () {
+        Array.from(window.document.styleSheets).filter(function (it) { return it.ownerNode && it.ownerNode instanceof Element && it.ownerNode.hasAttribute('domstyle') && it.ownerNode.getAttribute('id') && !it.ownerNode.getAttribute('completed'); }).forEach(function (it) {
+            var _a;
+            var styleElement = it.ownerNode;
+            var split = (_a = styleElement.getAttribute('id')) === null || _a === void 0 ? void 0 : _a.split('-');
+            split === null || split === void 0 ? void 0 : split.pop();
+            var id = split === null || split === void 0 ? void 0 : split.join('-');
+            if (id) {
+                // console.log('------->', id)
+                Array.from(it.cssRules).forEach(function (it) {
+                    RawSet.generateCSS(id, it);
+                });
+            }
+            it.ownerNode.setAttribute('completed', 'true');
+        });
+    };
+    RawSet.generateCSS = function (id, cssRule) {
         var _this = this;
         var start = "#".concat(id, "-start");
         var end = "#".concat(id, "-end");
@@ -2072,6 +2083,17 @@ var RawSet = /** @class */ (function () {
             });
         }
     };
+    // 중요 스타일 적용 부분
+    RawSet.generateStyleTransform = function (styleBody, id, styleTagWrap) {
+        if (styleTagWrap === void 0) { styleTagWrap = true; }
+        if (Array.isArray(styleBody)) {
+            styleBody = styleBody.join('\n');
+        }
+        if (styleTagWrap) {
+            styleBody = "<style id='".concat(id, "-style' domstyle>").concat(styleBody, "</style>");
+        }
+        return styleBody;
+    };
     RawSet.prototype.applyEvent = function (obj, fragment, config) {
         if (fragment === void 0) { fragment = this.fragment; }
         eventManager.applyEvent(obj, eventManager.findAttrElements(fragment, config), config);
@@ -2179,30 +2201,25 @@ var RawSet = /** @class */ (function () {
                     // start.setAttribute('id', `${it.uuid}-start`);
                     // const end = config.window.document.createElement('meta');
                     // end.setAttribute('id', `${it.uuid}-end`);
-                    var start = void 0;
-                    var end = void 0;
                     var type = void 0;
                     if (currentNode.parentNode && currentNode.parentNode.nodeName.toUpperCase() === 'STYLE') {
                         type = exports.RawSetType.STYLE_TEXT;
-                        start = config.window.document.createTextNode("/*start text ".concat(it_4.uuid, "*/"));
-                        end = config.window.document.createTextNode("/*end text ".concat(it_4.uuid, "*/"));
                     }
                     else {
                         type = exports.RawSetType.TEXT;
-                        start = config.window.document.createComment("start text ".concat(it_4.uuid));
-                        end = config.window.document.createComment("end text ".concat(it_4.uuid));
                     }
+                    var startEndPoint = RawSet.createStartEndPoint(it_4.uuid, type, config);
                     // layout setting
                     template.content.append(document.createTextNode(preparedText)); // 앞 부분 넣고
-                    template.content.append(start); // add start checkpoint
-                    template.content.append(end); // add end checkpoint
+                    template.content.append(startEndPoint.start); // add start checkpoint
+                    template.content.append(startEndPoint.end); // add end checkpoint
                     // content 안쪽 RawSet render 할때 start 와 end 사이에 fragment 연산해서 들어간다.
                     var fragment = config.window.document.createDocumentFragment();
                     fragment.append(config.window.document.createTextNode(it_4.content));
                     pars.push(new RawSet(it_4.uuid, type, {
-                        start: start,
+                        start: startEndPoint.start,
                         node: currentNode,
-                        end: end,
+                        end: startEndPoint.end,
                         parent: currentNode.parentNode,
                         thisVariableName: thisVariableName
                     }, fragment));
@@ -2215,21 +2232,18 @@ var RawSet = /** @class */ (function () {
                 var uuid = RandomUtils.getRandomString(40);
                 var element_3 = currentNode;
                 var fragment = config.window.document.createDocumentFragment();
-                var start = config.window.document.createElement('meta');
-                var end = config.window.document.createElement('meta');
-                start.setAttribute('id', "".concat(uuid, "-start"));
-                end.setAttribute('id', "".concat(uuid, "-end"));
                 var type = exports.RawSetType.TARGET_ELEMENT;
+                var startEndPoint = RawSet.createStartEndPoint(uuid, type, config);
                 var isElement = ((_d = (_c = config.targetElements) === null || _c === void 0 ? void 0 : _c.map(function (it) { return it.name.toLowerCase(); })) !== null && _d !== void 0 ? _d : []).includes(element_3.tagName.toLowerCase());
                 var targetAttrNames_2 = ((_f = (_e = config.targetAttrs) === null || _e === void 0 ? void 0 : _e.map(function (it) { return it.name; })) !== null && _f !== void 0 ? _f : []).concat(RawSet.DR_ATTRIBUTES);
                 var isAttr = element_3.getAttributeNames().filter(function (it) { return targetAttrNames_2.includes(it.toLowerCase()); }).length > 0;
-                (_g = currentNode === null || currentNode === void 0 ? void 0 : currentNode.parentNode) === null || _g === void 0 ? void 0 : _g.insertBefore(start, currentNode);
-                (_h = currentNode === null || currentNode === void 0 ? void 0 : currentNode.parentNode) === null || _h === void 0 ? void 0 : _h.insertBefore(end, currentNode.nextSibling);
+                (_g = currentNode === null || currentNode === void 0 ? void 0 : currentNode.parentNode) === null || _g === void 0 ? void 0 : _g.insertBefore(startEndPoint.start, currentNode);
+                (_h = currentNode === null || currentNode === void 0 ? void 0 : currentNode.parentNode) === null || _h === void 0 ? void 0 : _h.insertBefore(startEndPoint.end, currentNode.nextSibling);
                 fragment.append(currentNode);
                 pars.push(new RawSet(uuid, isElement ? type : (isAttr ? exports.RawSetType.TARGET_ATTR : exports.RawSetType.UNKOWN), {
-                    start: start,
+                    start: startEndPoint.start,
                     node: currentNode,
-                    end: end,
+                    end: startEndPoint.end,
                     parent: currentNode.parentNode,
                     thisVariableName: thisVariableName
                 }, fragment));
@@ -2242,6 +2256,30 @@ var RawSet = /** @class */ (function () {
         // console.log('check-->', pars)
         return pars;
     };
+    RawSet.createStartEndPoint = function (id, type, config) {
+        if (type === exports.RawSetType.TARGET_ELEMENT) {
+            var start = config.window.document.createElement('meta');
+            var end = config.window.document.createElement('meta');
+            start.setAttribute('id', "".concat(id, "-start"));
+            end.setAttribute('id', "".concat(id, "-end"));
+            return {
+                start: start,
+                end: end
+            };
+        }
+        else if (type === exports.RawSetType.STYLE_TEXT) {
+            return {
+                start: config.window.document.createTextNode("/*start text ".concat(id, "*/")),
+                end: config.window.document.createTextNode("/*end text ".concat(id, "*/"))
+            };
+        }
+        else { // text
+            return {
+                start: config.window.document.createComment("start text ".concat(id)),
+                end: config.window.document.createComment("end text ".concat(id))
+            };
+        }
+    };
     RawSet.prototype.childAllRemove = function () {
         var next = this.point.start.nextSibling;
         while (next) {
@@ -2364,7 +2402,7 @@ var RawSet = /** @class */ (function () {
         // console.log('--------',n, n.innerHTML)
         if (set) {
             // const id = RandomUtils.getRandomString(20);
-            var style = RawSet.styleTransformLocal((_a = set.styles) !== null && _a !== void 0 ? _a : [], rawSet.uuid, true);
+            var style = RawSet.generateStyleTransform((_a = set.styles) !== null && _a !== void 0 ? _a : [], rawSet.uuid, true);
             n.innerHTML = style + ((_b = set.template) !== null && _b !== void 0 ? _b : '');
             // const metaStart = RawSet.metaStart(id);
             // const metaEnd = RawSet.metaEnd(id);
@@ -2427,14 +2465,14 @@ var RawSet = /** @class */ (function () {
         };
         return targetAttribute;
     };
-    RawSet.createComponentTargetElement = function (name, objFactory, template, styles, config) {
+    RawSet.createComponentTargetElement = function (name, objFactory, template, styles) {
         if (template === void 0) { template = ''; }
         if (styles === void 0) { styles = []; }
         var targetElement = {
             name: name,
             styles: styles,
             template: template,
-            callBack: function (element, obj, rawSet, attrs) {
+            callBack: function (element, obj, rawSet, attrs, config) {
                 var _a, _b, _c, _d, _e, _f;
                 // console.log('callback------->', element)
                 if (!obj.__domrender_components) {
@@ -2476,6 +2514,8 @@ var RawSet = /** @class */ (function () {
                 i.componentKey = componentKey;
                 i.rawSet = rawSet;
                 i.attribute = attribute;
+                i.router = config.router;
+                i.scripts = render.scripts;
                 i.drAttrs = attrs;
                 i.innerHTML = element.innerHTML;
                 i.rootCreator = new Proxy(obj, new DomRenderFinalProxy());
@@ -2525,7 +2565,7 @@ var RawSet = /** @class */ (function () {
                         __render: render
                     }));
                 }
-                var style = RawSet.styleTransformLocal(styles, componentKey, true);
+                var style = RawSet.generateStyleTransform(styles, componentKey, true);
                 element.innerHTML = style + (applayTemplate !== null && applayTemplate !== void 0 ? applayTemplate : '');
                 // const metaStart = RawSet.metaStart(componentKey);
                 // const metaEnd = RawSet.metaEnd(componentKey);
@@ -2555,31 +2595,6 @@ var RawSet = /** @class */ (function () {
         var reg = /(?:[$#]\{(?:(([$#]\{)??[^$#]?[^{]*?)\}[$#]))/g;
         return StringUtils.regexExec(reg, data !== null && data !== void 0 ? data : '');
     };
-    // 중요 스타일 적용 부분
-    RawSet.styleTransformLocal = function (styleBody, id, styleTagWrap) {
-        if (styleTagWrap === void 0) { styleTagWrap = true; }
-        // <style id="first">
-        //     #first ~ *:not(#first ~ style[domstyle] ~ *) {
-        //     font-size: 30px;
-        //     color: blue;
-        // }
-        // </style>
-        if (Array.isArray(styleBody)) {
-            styleBody = styleBody.join('\n');
-        }
-        // if (locale) {
-        //     styleBody = styleBody.replace(/([^}]+){/gm, function (a, b) {
-        //         if (typeof b === 'string') {
-        //             b = b.trim();
-        //         }
-        //         return `#${id} ~ ${b}:not(#${id} ~ style[domstyle] ~ *), #${id} ~ * ${b} {`;
-        //     });
-        // }
-        if (styleTagWrap) {
-            styleBody = "<style id='".concat(id, "-style' domstyle>").concat(styleBody, "</style>");
-        }
-        return styleBody;
-    };
     // public static metaStart(id: string) {
     //     return `<meta id='${id}-start' />`;
     // }
@@ -3436,7 +3451,7 @@ var DefaultMessenger = /** @class */ (function (_super) {
 var DomRender = /** @class */ (function () {
     function DomRender() {
     }
-    DomRender.run = function (obj, target, config) {
+    DomRender.run = function (obj, target, oConfig) {
         var _a, _b, _c;
         var robj = obj;
         if ('_DomRender_isProxy' in obj) {
@@ -3446,9 +3461,13 @@ var DomRender = /** @class */ (function () {
             robj = obj;
             return robj;
         }
+        var config = oConfig;
         if (!config) {
             config = { window: window };
         }
+        if (config && !config.window) {
+            config.window = window;
+        }
         config.routerType = config.routerType || 'none';
         config.messenger = DomRenderFinalProxy.final((_a = config.messenger) !== null && _a !== void 0 ? _a : new DefaultMessenger(config));
         var domRender = new DomRenderProxy(obj, target, config);
@@ -3463,12 +3482,13 @@ var DomRender = /** @class */ (function () {
         domRender.run(robj);
         return robj;
     };
-    DomRender.createComponent = function (param, config) {
+    DomRender.createComponent = function (param) {
         var _a, _b;
-        var component = RawSet.createComponentTargetElement((_a = param.tagName) !== null && _a !== void 0 ? _a : param.type.name, function (e, o, r2, counstructorParam) {
+        // console.log('===>', typeof param.type, param.type.name, param.type.constructor.name)
+        var component = RawSet.createComponentTargetElement((_a = param.tagName) !== null && _a !== void 0 ? _a : (typeof param.type === 'function' ? param.type.name : param.type.constructor.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), config);
+            return typeof param.type === 'function' ? new ((_a = param.type).bind.apply(_a, __spreadArray([void 0], counstructorParam, false)))() : param.type;
+        }, (_b = param.template) !== null && _b !== void 0 ? _b : '', Array.isArray(param.styles) ? param.styles : (param.styles ? [param.styles] : undefined));
         return component;
     };
     DomRender.createAttribute = function (attrName, getThisObj, factory) {
@@ -3478,6 +3498,21 @@ var DomRender = /** @class */ (function () {
     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 () {
     function Appender(defaultDatas) {
         this.length = 0;
@@ -3531,34 +3566,6 @@ var Appender = /** @class */ (function () {
     return Appender;
 }());
 
-var AllCheckedValidatorArray = /** @class */ (function (_super) {
-    __extends(AllCheckedValidatorArray, _super);
-    function AllCheckedValidatorArray(value, target, event, autoValid) {
-        if (autoValid === void 0) { autoValid = true; }
-        return _super.call(this, value, target, event, autoValid) || this;
-    }
-    AllCheckedValidatorArray.prototype.valid = function () {
-        var _a;
-        return !(((_a = this.value) !== null && _a !== void 0 ? _a : []).filter(function (it) { return !it.checked; }).length > 0);
-    };
-    return AllCheckedValidatorArray;
-}(ValidatorArray));
-
-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 CheckedValidator = /** @class */ (function (_super) {
     __extends(CheckedValidator, _super);
     function CheckedValidator(value, target, event, autoValid) {
@@ -3572,17 +3579,19 @@ var CheckedValidator = /** @class */ (function (_super) {
     return CheckedValidator;
 }(Validator));
 
-var AllUnCheckedValidatorArray = /** @class */ (function (_super) {
-    __extends(AllUnCheckedValidatorArray, _super);
-    function AllUnCheckedValidatorArray(value, target, event, autoValid) {
+var CountEqualsUnCheckedValidatorArray = /** @class */ (function (_super) {
+    __extends(CountEqualsUnCheckedValidatorArray, _super);
+    function CountEqualsUnCheckedValidatorArray(count, 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.count = count;
+        return _this;
     }
-    AllUnCheckedValidatorArray.prototype.valid = function () {
+    CountEqualsUnCheckedValidatorArray.prototype.valid = function () {
         var _a;
-        return !(((_a = this.value) !== null && _a !== void 0 ? _a : []).filter(function (it) { return it.checked; }).length > 0);
+        return ((_a = this.value) !== null && _a !== void 0 ? _a : []).filter(function (it) { return !it.checked; }).length === this.count;
     };
-    return AllUnCheckedValidatorArray;
+    return CountEqualsUnCheckedValidatorArray;
 }(ValidatorArray));
 
 var CountGreaterThanCheckedValidatorArray = /** @class */ (function (_super) {
@@ -3600,94 +3609,90 @@ var CountGreaterThanCheckedValidatorArray = /** @class */ (function (_super) {
     return CountGreaterThanCheckedValidatorArray;
 }(ValidatorArray));
 
-var CountGreaterThanEqualsUnCheckedValidatorArray = /** @class */ (function (_super) {
-    __extends(CountGreaterThanEqualsUnCheckedValidatorArray, _super);
-    function CountGreaterThanEqualsUnCheckedValidatorArray(count, value, target, event, autoValid) {
+var AllUnCheckedValidatorArray = /** @class */ (function (_super) {
+    __extends(AllUnCheckedValidatorArray, _super);
+    function AllUnCheckedValidatorArray(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;
+        return _super.call(this, value, target, event, autoValid) || this;
     }
-    CountGreaterThanEqualsUnCheckedValidatorArray.prototype.valid = function () {
+    AllUnCheckedValidatorArray.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 > 0);
     };
-    return CountGreaterThanEqualsUnCheckedValidatorArray;
+    return AllUnCheckedValidatorArray;
 }(ValidatorArray));
 
-var CountEqualsUnCheckedValidatorArray = /** @class */ (function (_super) {
-    __extends(CountEqualsUnCheckedValidatorArray, _super);
-    function CountEqualsUnCheckedValidatorArray(count, value, target, event, autoValid) {
+var AllCheckedValidatorArray = /** @class */ (function (_super) {
+    __extends(AllCheckedValidatorArray, _super);
+    function AllCheckedValidatorArray(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;
+        return _super.call(this, value, target, event, autoValid) || this;
     }
-    CountEqualsUnCheckedValidatorArray.prototype.valid = function () {
+    AllCheckedValidatorArray.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 > 0);
     };
-    return CountEqualsUnCheckedValidatorArray;
+    return AllCheckedValidatorArray;
 }(ValidatorArray));
 
-var CountGreaterThanEqualsCheckedValidatorArray = /** @class */ (function (_super) {
-    __extends(CountGreaterThanEqualsCheckedValidatorArray, _super);
-    function CountGreaterThanEqualsCheckedValidatorArray(count, value, target, event, autoValid) {
+var CountEqualsCheckedValidatorArray = /** @class */ (function (_super) {
+    __extends(CountEqualsCheckedValidatorArray, _super);
+    function CountEqualsCheckedValidatorArray(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 () {
+    CountEqualsCheckedValidatorArray.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 CountEqualsCheckedValidatorArray;
 }(ValidatorArray));
 
-var CountGreaterThanUnCheckedValidatorArray = /** @class */ (function (_super) {
-    __extends(CountGreaterThanUnCheckedValidatorArray, _super);
-    function CountGreaterThanUnCheckedValidatorArray(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;
     }
-    CountGreaterThanUnCheckedValidatorArray.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 CountGreaterThanUnCheckedValidatorArray;
+    return CountGreaterThanEqualsCheckedValidatorArray;
 }(ValidatorArray));
 
-var CountEqualsCheckedValidatorArray = /** @class */ (function (_super) {
-    __extends(CountEqualsCheckedValidatorArray, _super);
-    function CountEqualsCheckedValidatorArray(count, value, target, event, autoValid) {
+var CountGreaterThanEqualsUnCheckedValidatorArray = /** @class */ (function (_super) {
+    __extends(CountGreaterThanEqualsUnCheckedValidatorArray, _super);
+    function CountGreaterThanEqualsUnCheckedValidatorArray(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;
     }
-    CountEqualsCheckedValidatorArray.prototype.valid = function () {
+    CountGreaterThanEqualsUnCheckedValidatorArray.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 CountEqualsCheckedValidatorArray;
+    return CountGreaterThanEqualsUnCheckedValidatorArray;
 }(ValidatorArray));
 
-var CountLessThanEqualsUnCheckedValidatorArray = /** @class */ (function (_super) {
-    __extends(CountLessThanEqualsUnCheckedValidatorArray, _super);
-    function CountLessThanEqualsUnCheckedValidatorArray(count, value, target, event, autoValid) {
+var CountGreaterThanUnCheckedValidatorArray = /** @class */ (function (_super) {
+    __extends(CountGreaterThanUnCheckedValidatorArray, _super);
+    function CountGreaterThanUnCheckedValidatorArray(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;
     }
-    CountLessThanEqualsUnCheckedValidatorArray.prototype.valid = function () {
+    CountGreaterThanUnCheckedValidatorArray.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 CountLessThanEqualsUnCheckedValidatorArray;
+    return CountGreaterThanUnCheckedValidatorArray;
 }(ValidatorArray));
 
 var CountLessThanEqualsCheckedValidatorArray = /** @class */ (function (_super) {
@@ -3720,6 +3725,35 @@ var CountLessThanCheckedValidatorArray = /** @class */ (function (_super) {
     return CountLessThanCheckedValidatorArray;
 }(ValidatorArray));
 
+var CountLessThanEqualsUnCheckedValidatorArray = /** @class */ (function (_super) {
+    __extends(CountLessThanEqualsUnCheckedValidatorArray, _super);
+    function CountLessThanEqualsUnCheckedValidatorArray(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;
+    }
+    CountLessThanEqualsUnCheckedValidatorArray.prototype.valid = function () {
+        var _a;
+        return ((_a = this.value) !== null && _a !== void 0 ? _a : []).filter(function (it) { return !it.checked; }).length <= this.count;
+    };
+    return CountLessThanEqualsUnCheckedValidatorArray;
+}(ValidatorArray));
+
+var EmptyValidator = /** @class */ (function (_super) {
+    __extends(EmptyValidator, _super);
+    function EmptyValidator(value, target, event, autoValid) {
+        if (autoValid === void 0) { autoValid = true; }
+        return _super.call(this, value, target, event, autoValid) || this;
+    }
+    EmptyValidator.prototype.valid = function () {
+        var _a, _b;
+        var value = this.value;
+        return value === undefined || value === null || ((_b = (_a = value) === null || _a === void 0 ? void 0 : _a.length) !== null && _b !== void 0 ? _b : 0) <= 0;
+    };
+    return EmptyValidator;
+}(Validator));
+
 var CountUnCheckedValidatorArray = /** @class */ (function (_super) {
     __extends(CountUnCheckedValidatorArray, _super);
     function CountUnCheckedValidatorArray(count, value, target, event, autoValid) {
@@ -3735,26 +3769,19 @@ var CountUnCheckedValidatorArray = /** @class */ (function (_super) {
     return CountUnCheckedValidatorArray;
 }(ValidatorArray));
 
-var ExcludeCheckedValidatorArray = /** @class */ (function (_super) {
-    __extends(ExcludeCheckedValidatorArray, _super);
-    function ExcludeCheckedValidatorArray(include, allRequired, value, target, event, autoValid) {
-        if (allRequired === void 0) { allRequired = false; }
+var CountLessThanUnCheckedValidatorArray = /** @class */ (function (_super) {
+    __extends(CountLessThanUnCheckedValidatorArray, _super);
+    function CountLessThanUnCheckedValidatorArray(count, value, target, event, autoValid) {
         if (autoValid === void 0) { autoValid = true; }
         var _this = _super.call(this, value, target, event, autoValid) || this;
-        _this.include = include;
-        _this.allRequired = allRequired;
+        _this.count = count;
         return _this;
     }
-    ExcludeCheckedValidatorArray.prototype.valid = function () {
-        var _this = this;
+    CountLessThanUnCheckedValidatorArray.prototype.valid = function () {
         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 ((_a = this.value) !== null && _a !== void 0 ? _a : []).filter(function (it) { return !it.checked; }).length < this.count;
     };
-    return ExcludeCheckedValidatorArray;
+    return CountLessThanUnCheckedValidatorArray;
 }(ValidatorArray));
 
 var FormValidator = /** @class */ (function (_super) {
@@ -3826,40 +3853,41 @@ var MultipleValidator = /** @class */ (function (_super) {
     return MultipleValidator;
 }(Validator));
 
-var EmptyValidator = /** @class */ (function (_super) {
-    __extends(EmptyValidator, _super);
-    function EmptyValidator(value, target, event, autoValid) {
+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; }
-        return _super.call(this, value, target, event, autoValid) || this;
+        var _this = _super.call(this, value, target, event, autoValid) || this;
+        _this.include = include;
+        _this.allRequired = allRequired;
+        return _this;
     }
-    EmptyValidator.prototype.valid = function () {
-        var _a, _b;
-        var value = this.value;
-        return value === undefined || value === null || ((_b = (_a = value) === null || _a === void 0 ? void 0 : _a.length) !== null && _b !== void 0 ? _b : 0) <= 0;
+    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 EmptyValidator;
-}(Validator));
+    return ExcludeCheckedValidatorArray;
+}(ValidatorArray));
 
-var NotRegExpTestValidator = /** @class */ (function (_super) {
-    __extends(NotRegExpTestValidator, _super);
-    function NotRegExpTestValidator(regexp, value, target, event, autoValid) {
+var NotEmptyValidator = /** @class */ (function (_super) {
+    __extends(NotEmptyValidator, _super);
+    function NotEmptyValidator(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);
-        return _this;
+        return _super.call(this, value, target, event, autoValid) || this;
     }
-    NotRegExpTestValidator.prototype.valid = function () {
-        var _a;
+    NotEmptyValidator.prototype.valid = function () {
+        var _a, _b;
         var value = this.value;
-        var regExp = (_a = this.regexp._DomRender_origin) !== null && _a !== void 0 ? _a : this.regexp;
-        if (value) {
-            return !regExp.test(value);
-        }
-        else {
-            return true;
-        }
+        // console.log('NotEmptyValidator', value, value !== undefined && value !== null && ((value as any)?.length ?? 0) > 0)
+        return value !== undefined && value !== null && ((_b = (_a = value) === null || _a === void 0 ? void 0 : _a.length) !== null && _b !== void 0 ? _b : 0) > 0;
     };
-    return NotRegExpTestValidator;
+    return NotEmptyValidator;
 }(Validator));
 
 var PassValidator = /** @class */ (function (_super) {
@@ -3897,34 +3925,6 @@ var RegExpTestValidator = /** @class */ (function (_super) {
     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);
-    };
-    return UnCheckedValidator;
-}(Validator));
-
-var NotEmptyValidator = /** @class */ (function (_super) {
-    __extends(NotEmptyValidator, _super);
-    function NotEmptyValidator(value, target, event, autoValid) {
-        if (autoValid === void 0) { autoValid = true; }
-        return _super.call(this, value, target, event, autoValid) || this;
-    }
-    NotEmptyValidator.prototype.valid = function () {
-        var _a, _b;
-        var value = this.value;
-        // console.log('NotEmptyValidator', value, value !== undefined && value !== null && ((value as any)?.length ?? 0) > 0)
-        return value !== undefined && value !== null && ((_b = (_a = value) === null || _a === void 0 ? void 0 : _a.length) !== null && _b !== void 0 ? _b : 0) > 0;
-    };
-    return NotEmptyValidator;
-}(Validator));
-
 var ValidMultipleValidator = /** @class */ (function (_super) {
     __extends(ValidMultipleValidator, _super);
     function ValidMultipleValidator(validMultipleCallback, validators, value, target, event, autoValid) {
@@ -3940,35 +3940,6 @@ var ValidMultipleValidator = /** @class */ (function (_super) {
     return ValidMultipleValidator;
 }(MultipleValidator));
 
-var CountLessThanUnCheckedValidatorArray = /** @class */ (function (_super) {
-    __extends(CountLessThanUnCheckedValidatorArray, _super);
-    function CountLessThanUnCheckedValidatorArray(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;
-    }
-    CountLessThanUnCheckedValidatorArray.prototype.valid = function () {
-        var _a;
-        return ((_a = this.value) !== null && _a !== void 0 ? _a : []).filter(function (it) { return !it.checked; }).length < this.count;
-    };
-    return CountLessThanUnCheckedValidatorArray;
-}(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 RequiredValidator = /** @class */ (function (_super) {
     __extends(RequiredValidator, _super);
     function RequiredValidator(value, target, event, autoValid) {
@@ -3983,6 +3954,19 @@ var RequiredValidator = /** @class */ (function (_super) {
     return RequiredValidator;
 }(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);
+    };
+    return UnCheckedValidator;
+}(Validator));
+
 var ValidValidatorArray = /** @class */ (function (_super) {
     __extends(ValidValidatorArray, _super);
     function ValidValidatorArray(validCallBack, value, target, event, autoValid) {
@@ -3997,18 +3981,40 @@ var ValidValidatorArray = /** @class */ (function (_super) {
     return ValidValidatorArray;
 }(ValidatorArray));
 
-var ValueNotEqualsValidator = /** @class */ (function (_super) {
-    __extends(ValueNotEqualsValidator, _super);
-    function ValueNotEqualsValidator(equalsValue, 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.equalsValue = equalsValue;
+        _this.validCallBack = validCallBack;
         return _this;
     }
-    ValueNotEqualsValidator.prototype.valid = function () {
-        return this.value !== this.equalsValue;
+    ValidValidator.prototype.valid = function (value, target, event) {
+        return this.validCallBack(value, target, event);
     };
-    return ValueNotEqualsValidator;
+    return ValidValidator;
+}(Validator));
+
+var NotRegExpTestValidator = /** @class */ (function (_super) {
+    __extends(NotRegExpTestValidator, _super);
+    function NotRegExpTestValidator(regexp, 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);
+        return _this;
+    }
+    NotRegExpTestValidator.prototype.valid = function () {
+        var _a;
+        var value = this.value;
+        var regExp = (_a = this.regexp._DomRender_origin) !== null && _a !== void 0 ? _a : this.regexp;
+        if (value) {
+            return !regExp.test(value);
+        }
+        else {
+            return true;
+        }
+    };
+    return NotRegExpTestValidator;
 }(Validator));
 
 var ValueEqualsValidator = /** @class */ (function (_super) {
@@ -4025,6 +4031,20 @@ var ValueEqualsValidator = /** @class */ (function (_super) {
     return ValueEqualsValidator;
 }(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 ClipBoardUtils = /** @class */ (function () {
     function ClipBoardUtils() {
     }