dom-render 1.0.70 → 1.0.71

package/README.MD

@@ -436,10 +436,10 @@ new DomRender.run(obj, target, {
 ```
 using component
 ```html
-<my-element dr-on-init="$component.say();"></my-element>
+<my-element dr-on-component-init="$component.say();"></my-element>
 ```
 - attribute
-  - dr-on-init: component created init call script
+  - dr-on-component-init: component created init call script
     - $component: component  instance
     - $element: element instance
     - $attribute: element attribute object

package/RawSet.js

@@ -72,7 +72,6 @@ var RawSet = /** @class */ (function () {
         var onAttrInitCallBack = [];
         var onElementInitCallBack = [];
         var drAttrs = [];
-        var keepgoing = true;
         var _loop_1 = function (cNode) {
             var __render = Object.freeze({
                 rawset: this_1,
@@ -145,12 +144,12 @@ var RawSet = /** @class */ (function () {
                     var vars = RawSet.drVarEncoding(element_2, (_d = drAttr_1.drVarOption) !== null && _d !== void 0 ? _d : '');
                     var newTemp = config.window.document.createElement('temp');
                     // Object.entries(this.__render.drAttr).filter(([k,v]) => k !== 'drIf' && v).forEach(([k, v]) => n.setAttribute(this.__render.drAttrsOriginName[k], v)); <-- 이부분은 다른 attr에도 적용을 할지말지 생각해야됨  엘리먼트 존재유무에 따라서 적용을 할지말지 결정해야됨
-                    keepgoing = ScriptUtils_1.ScriptUtils.eval("\n                    ".concat(__render.bindScript, "\n                    ").concat((_e = drAttr_1.drBeforeOption) !== null && _e !== void 0 ? _e : '', "\n                    if ($rawset.data === ").concat(drAttr_1.drIf, ") {\n                        return false;\n                    } \n                    $rawset.data = ").concat(drAttr_1.drIf, " \n                    if($rawset.data) {\n                        const n = $element.cloneNode(true);\n                        Object.entries(this.__render.drAttr).filter(([k,v]) => k !== 'drIf' && v).forEach(([k, v]) => n.setAttribute(this.__render.drAttrsOriginName[k], v));\n                        var destIt = ").concat(drAttr_1.drItOption, ";\n                        if (destIt !== undefined) {\n                            n.getAttributeNames().forEach(it => n.setAttribute(it, n.getAttribute(it).replace(/\\#it\\#/g, destIt)))\n                            n.innerHTML = n.innerHTML.replace(/\\#it\\#/g, destIt);\n                        }\n                        if (this.__render.drStripOption === 'true') {\n                            Array.from(n.childNodes).forEach(it => this.__render.fag.append(it));\n                        } else {\n                            this.__render.fag.append(n);\n                        }\n                    }\n                    ").concat((_f = drAttr_1.drAfterOption) !== null && _f !== void 0 ? _f : '', ";\n                    return true;\n                    "), Object.assign(obj, {
+                    var keepgoing = ScriptUtils_1.ScriptUtils.eval("\n                    ".concat(__render.bindScript, "\n                    ").concat((_e = drAttr_1.drBeforeOption) !== null && _e !== void 0 ? _e : '', "\n                    if ($rawset.data === (").concat(drAttr_1.drIf, ")) {\n                        return false;\n                    } \n                    $rawset.data = ").concat(drAttr_1.drIf, " \n                    if($rawset.data) {\n                        const n = $element.cloneNode(true);\n                        Object.entries(this.__render.drAttr).filter(([k,v]) => k !== 'drIf' && v).forEach(([k, v]) => n.setAttribute(this.__render.drAttrsOriginName[k], v));\n                        var destIt = ").concat(drAttr_1.drItOption, ";\n                        if (destIt !== undefined) {\n                            n.getAttributeNames().forEach(it => n.setAttribute(it, n.getAttribute(it).replace(/\\#it\\#/g, destIt)))\n                            n.innerHTML = n.innerHTML.replace(/\\#it\\#/g, destIt);\n                        }\n                        if (this.__render.drStripOption === 'true') {\n                            Array.from(n.childNodes).forEach(it => this.__render.fag.append(it));\n                        } else {\n                            this.__render.fag.append(n);\n                        }\n                    }\n                    ").concat((_f = drAttr_1.drAfterOption) !== null && _f !== void 0 ? _f : '', ";\n                    return true;\n                    "), Object.assign(obj, {
                         __render: Object.freeze(__assign({ fag: newTemp, drAttr: drAttr_1, drAttrsOriginName: RawSet.drAttrsOriginName, drStripOption: drAttr_1.drStripOption }, __render))
                     }));
                     // console.log('keepgoing', keepgoing);
                     if (keepgoing === false) {
-                        return "break";
+                        return { value: raws };
                     }
                     RawSet.drVarDecoding(newTemp, vars);
                     RawSet.drItOtherDecoding(newTemp, itRandom);
@@ -163,10 +162,9 @@ var RawSet = /** @class */ (function () {
                     (_h = element_2.parentNode) === null || _h === void 0 ? void 0 : _h.replaceChild(fag, element_2);
                     raws.push.apply(raws, rr);
                     if (bypass) {
-                        return "break";
+                        return "continue";
                     }
                 }
-                // console.log('-------------')
                 else if (drAttr_1.drThis) {
                     var r = ScriptUtils_1.ScriptUtils.evalReturn(drAttr_1.drThis, obj);
                     if (r) {
@@ -287,7 +285,7 @@ var RawSet = /** @class */ (function () {
                     fag.append(tempalte.content);
                     var rr = RawSet.checkPointCreates(fag, config);
                     (_0 = element_2.parentNode) === null || _0 === void 0 ? void 0 : _0.replaceChild(fag, element_2);
-                    //const rrr = rr.flatMap(it => it.render(obj, config));// .flat();
+                    // const rrr = rr.flatMap(it => it.render(obj, config));// .flat();
                     raws.push.apply(raws, rr);
                 }
                 else if (drAttr_1.drRepeat) {
@@ -317,12 +315,14 @@ var RawSet = /** @class */ (function () {
                         if (documentFragment_1) {
                             var detectAction_1 = element_2.getAttribute(RawSet.DR_DETECT_NAME);
                             if (detectAction_1 && documentFragment_1.render) {
-                                this_1.detect = { action: function () {
+                                this_1.detect = {
+                                    action: function () {
                                         var script = "var $component = this.__render.component; var $element = this.__render.element; var $innerHTML = this.__render.innerHTML; var $attribute = this.__render.attribute;  ".concat(detectAction_1, " ");
                                         ScriptUtils_1.ScriptUtils.eval(script, Object.assign(obj, {
                                             __render: documentFragment_1.render
                                         }));
-                                    } };
+                                    }
+                                };
                             }
                             // fag.append(documentFragment)
                             var rr = RawSet.checkPointCreates(documentFragment_1, config);
@@ -362,36 +362,36 @@ var RawSet = /** @class */ (function () {
             }
         };
         var this_1 = this;
-        nodeLoops: for (var _i = 0, _19 = Array.from(genNode.childNodes.values()); _i < _19.length; _i++) {
+        for (var _i = 0, _19 = Array.from(genNode.childNodes.values()); _i < _19.length; _i++) {
             var cNode = _19[_i];
             var state_1 = _loop_1(cNode);
+            if (typeof state_1 === "object")
+                return state_1.value;
             if (state_1 === "break")
                 break;
         }
-        if (keepgoing) {
-            this.applyEvent(obj, genNode, config);
-            this.replaceBody(genNode);
-            drAttrs.forEach(function (it) {
-                if (it.drCompleteOption) {
-                    // genNode.childNodes
-                    ScriptUtils_1.ScriptUtils.eval("\n                    const ".concat(EventManager_1.EventManager.FAG_VARNAME, " = this.__render.fag;\n                    const ").concat(EventManager_1.EventManager.SCRIPTS_VARNAME, " = this.__render.scripts;\n                    const ").concat(EventManager_1.EventManager.RAWSET_VARNAME, " = this.__render.rawset;\n                    ").concat(it.drCompleteOption, "\n                    "), Object.assign(obj, {
-                        __render: Object.freeze({
-                            rawset: _this,
-                            fag: genNode,
-                            scripts: EventManager_1.EventManager.setBindProperty(config === null || config === void 0 ? void 0 : config.scripts, obj)
-                        })
-                    }));
-                }
-            });
-            for (var _20 = 0, onElementInitCallBack_1 = onElementInitCallBack; _20 < onElementInitCallBack_1.length; _20++) {
-                var it_1 = onElementInitCallBack_1[_20];
-                (_14 = (_13 = (_12 = (_11 = it_1.targetElement) === null || _11 === void 0 ? void 0 : _11.__render) === null || _12 === void 0 ? void 0 : _12.component) === null || _13 === void 0 ? void 0 : _13.onInitRender) === null || _14 === void 0 ? void 0 : _14.call(_13, { render: (_15 = it_1.targetElement) === null || _15 === void 0 ? void 0 : _15.__render, creatorMetaData: (_16 = it_1.targetElement) === null || _16 === void 0 ? void 0 : _16.__creatorMetaData });
-                var r = (_17 = config === null || config === void 0 ? void 0 : config.onElementInit) === null || _17 === void 0 ? void 0 : _17.call(config, it_1.name, obj, this, it_1.targetElement);
-            }
-            for (var _21 = 0, onAttrInitCallBack_1 = onAttrInitCallBack; _21 < onAttrInitCallBack_1.length; _21++) {
-                var it_2 = onAttrInitCallBack_1[_21];
-                var r = (_18 = config === null || config === void 0 ? void 0 : config.onAttrInit) === null || _18 === void 0 ? void 0 : _18.call(config, it_2.attrName, it_2.attrValue, obj, this);
+        this.applyEvent(obj, genNode, config);
+        this.replaceBody(genNode);
+        drAttrs.forEach(function (it) {
+            if (it.drCompleteOption) {
+                // genNode.childNodes
+                ScriptUtils_1.ScriptUtils.eval("\n                const ".concat(EventManager_1.EventManager.FAG_VARNAME, " = this.__render.fag;\n                const ").concat(EventManager_1.EventManager.SCRIPTS_VARNAME, " = this.__render.scripts;\n                const ").concat(EventManager_1.EventManager.RAWSET_VARNAME, " = this.__render.rawset;\n                ").concat(it.drCompleteOption, "\n                "), Object.assign(obj, {
+                    __render: Object.freeze({
+                        rawset: _this,
+                        fag: genNode,
+                        scripts: EventManager_1.EventManager.setBindProperty(config === null || config === void 0 ? void 0 : config.scripts, obj)
+                    })
+                }));
             }
+        });
+        for (var _20 = 0, onElementInitCallBack_1 = onElementInitCallBack; _20 < onElementInitCallBack_1.length; _20++) {
+            var it_1 = onElementInitCallBack_1[_20];
+            (_14 = (_13 = (_12 = (_11 = it_1.targetElement) === null || _11 === void 0 ? void 0 : _11.__render) === null || _12 === void 0 ? void 0 : _12.component) === null || _13 === void 0 ? void 0 : _13.onInitRender) === null || _14 === void 0 ? void 0 : _14.call(_13, { render: (_15 = it_1.targetElement) === null || _15 === void 0 ? void 0 : _15.__render, creatorMetaData: (_16 = it_1.targetElement) === null || _16 === void 0 ? void 0 : _16.__creatorMetaData });
+            var r = (_17 = config === null || config === void 0 ? void 0 : config.onElementInit) === null || _17 === void 0 ? void 0 : _17.call(config, it_1.name, obj, this, it_1.targetElement);
+        }
+        for (var _21 = 0, onAttrInitCallBack_1 = onAttrInitCallBack; _21 < onAttrInitCallBack_1.length; _21++) {
+            var it_2 = onAttrInitCallBack_1[_21];
+            var r = (_18 = config === null || config === void 0 ? void 0 : config.onAttrInit) === null || _18 === void 0 ? void 0 : _18.call(config, it_2.attrName, it_2.attrValue, obj, this);
         }
         return raws;
     };
@@ -490,7 +490,7 @@ var RawSet = /** @class */ (function () {
                 var fragment = config.window.document.createDocumentFragment();
                 var start = config.window.document.createComment("start ".concat(uuid));
                 var end = config.window.document.createComment("end ".concat(uuid));
-                //console.log('start--', uuid)
+                // console.log('start--', uuid)
                 (_c = currentNode === null || currentNode === void 0 ? void 0 : currentNode.parentNode) === null || _c === void 0 ? void 0 : _c.insertBefore(start, currentNode);
                 (_d = currentNode === null || currentNode === void 0 ? void 0 : currentNode.parentNode) === null || _d === void 0 ? void 0 : _d.insertBefore(end, currentNode.nextSibling);
                 fragment.append(currentNode);
@@ -681,7 +681,7 @@ var RawSet = /** @class */ (function () {
                 var data = factory(element, attrValue, obj, rawSet);
                 rawSet.point.thisVariableName = data.__domrender_this_variable_name;
                 if (thisObj) {
-                    var i = thisObj['__domrender_component_new'] = ((_a = thisObj['__domrender_component_new']) !== null && _a !== void 0 ? _a : new Proxy({}, new Types_1.DomRenderFinalProxy()));
+                    var i = thisObj.__domrender_component_new = ((_a = thisObj.__domrender_component_new) !== null && _a !== void 0 ? _a : new Proxy({}, new Types_1.DomRenderFinalProxy()));
                     i.thisVariableName = rawSet.point.thisVariableName;
                     i.rawSet = rawSet;
                     i.innerHTML = element.innerHTML;
@@ -737,7 +737,7 @@ var RawSet = /** @class */ (function () {
                     // eslint-disable-next-line no-use-before-define
                 });
                 this.__render = render;
-                var i = instance['__domrender_component_new'] = ((_c = instance['__domrender_component_new']) !== null && _c !== void 0 ? _c : new Proxy({}, new Types_1.DomRenderFinalProxy()));
+                var i = instance.__domrender_component_new = ((_c = instance.__domrender_component_new) !== null && _c !== void 0 ? _c : new Proxy({}, new Types_1.DomRenderFinalProxy()));
                 i.thisVariableName = rawSet.point.thisVariableName;
                 i.thisFullVariableName = "this.__domrender_components.".concat(componentKey);
                 i.rawSet = rawSet;
@@ -756,7 +756,7 @@ var RawSet = /** @class */ (function () {
                     applayTemplate = applayTemplate.replace(/#component#/g, 'this');
                 }
                 applayTemplate = template.replace(/#innerHTML#/g, applayTemplate);
-                var oninit = element.getAttribute(EventManager_1.EventManager.onInitAttrName); // dr-on-init
+                var oninit = element.getAttribute("".concat(EventManager_1.EventManager.attrPrefix, "on-component-init")); // dr-on-component-init
                 if (oninit) {
                     var script = "var $component = this.__render.component; var $element = this.__render.element; var $innerHTML = this.__render.innerHTML; var $attribute = this.__render.attribute;  ".concat(oninit, " ");
                     ScriptUtils_1.ScriptUtils.eval(script, Object.assign(obj, {
@@ -820,7 +820,7 @@ var RawSet = /** @class */ (function () {
         drAfterOption: RawSet.DR_AFTER_OPTIONNAME,
         drBeforeOption: RawSet.DR_BEFORE_OPTIONNAME,
         drCompleteOption: RawSet.DR_COMPLETE_OPTIONNAME,
-        drStripOption: RawSet.DR_STRIP_OPTIONNAME,
+        drStripOption: RawSet.DR_STRIP_OPTIONNAME
     };
     RawSet.DR_TAGS = [];
     RawSet.DR_ATTRIBUTES = [RawSet.DR, RawSet.DR_IF_NAME, RawSet.DR_FOR_OF_NAME, RawSet.DR_FOR_NAME, RawSet.DR_THIS_NAME, RawSet.DR_FORM_NAME, RawSet.DR_PRE_NAME, RawSet.DR_INNERHTML_NAME, RawSet.DR_INNERTEXT_NAME, RawSet.DR_REPEAT_NAME, RawSet.DR_DETECT_NAME];

package/dist/bundle.js

@@ -1300,7 +1300,6 @@ var RawSet = /** @class */ (function () {
         var onAttrInitCallBack = [];
         var onElementInitCallBack = [];
         var drAttrs = [];
-        var keepgoing = true;
         var _loop_1 = function (cNode) {
             var __render = Object.freeze({
                 rawset: this_1,
@@ -1373,12 +1372,12 @@ var RawSet = /** @class */ (function () {
                     var vars = RawSet.drVarEncoding(element_2, (_d = drAttr_1.drVarOption) !== null && _d !== void 0 ? _d : '');
                     var newTemp = config.window.document.createElement('temp');
                     // Object.entries(this.__render.drAttr).filter(([k,v]) => k !== 'drIf' && v).forEach(([k, v]) => n.setAttribute(this.__render.drAttrsOriginName[k], v)); <-- 이부분은 다른 attr에도 적용을 할지말지 생각해야됨  엘리먼트 존재유무에 따라서 적용을 할지말지 결정해야됨
-                    keepgoing = ScriptUtils.eval("\n                    ".concat(__render.bindScript, "\n                    ").concat((_e = drAttr_1.drBeforeOption) !== null && _e !== void 0 ? _e : '', "\n                    if ($rawset.data === ").concat(drAttr_1.drIf, ") {\n                        return false;\n                    } \n                    $rawset.data = ").concat(drAttr_1.drIf, " \n                    if($rawset.data) {\n                        const n = $element.cloneNode(true);\n                        Object.entries(this.__render.drAttr).filter(([k,v]) => k !== 'drIf' && v).forEach(([k, v]) => n.setAttribute(this.__render.drAttrsOriginName[k], v));\n                        var destIt = ").concat(drAttr_1.drItOption, ";\n                        if (destIt !== undefined) {\n                            n.getAttributeNames().forEach(it => n.setAttribute(it, n.getAttribute(it).replace(/\\#it\\#/g, destIt)))\n                            n.innerHTML = n.innerHTML.replace(/\\#it\\#/g, destIt);\n                        }\n                        if (this.__render.drStripOption === 'true') {\n                            Array.from(n.childNodes).forEach(it => this.__render.fag.append(it));\n                        } else {\n                            this.__render.fag.append(n);\n                        }\n                    }\n                    ").concat((_f = drAttr_1.drAfterOption) !== null && _f !== void 0 ? _f : '', ";\n                    return true;\n                    "), Object.assign(obj, {
+                    var keepgoing = ScriptUtils.eval("\n                    ".concat(__render.bindScript, "\n                    ").concat((_e = drAttr_1.drBeforeOption) !== null && _e !== void 0 ? _e : '', "\n                    if ($rawset.data === (").concat(drAttr_1.drIf, ")) {\n                        return false;\n                    } \n                    $rawset.data = ").concat(drAttr_1.drIf, " \n                    if($rawset.data) {\n                        const n = $element.cloneNode(true);\n                        Object.entries(this.__render.drAttr).filter(([k,v]) => k !== 'drIf' && v).forEach(([k, v]) => n.setAttribute(this.__render.drAttrsOriginName[k], v));\n                        var destIt = ").concat(drAttr_1.drItOption, ";\n                        if (destIt !== undefined) {\n                            n.getAttributeNames().forEach(it => n.setAttribute(it, n.getAttribute(it).replace(/\\#it\\#/g, destIt)))\n                            n.innerHTML = n.innerHTML.replace(/\\#it\\#/g, destIt);\n                        }\n                        if (this.__render.drStripOption === 'true') {\n                            Array.from(n.childNodes).forEach(it => this.__render.fag.append(it));\n                        } else {\n                            this.__render.fag.append(n);\n                        }\n                    }\n                    ").concat((_f = drAttr_1.drAfterOption) !== null && _f !== void 0 ? _f : '', ";\n                    return true;\n                    "), Object.assign(obj, {
                         __render: Object.freeze(__assign({ fag: newTemp, drAttr: drAttr_1, drAttrsOriginName: RawSet.drAttrsOriginName, drStripOption: drAttr_1.drStripOption }, __render))
                     }));
                     // console.log('keepgoing', keepgoing);
                     if (keepgoing === false) {
-                        return "break";
+                        return { value: raws };
                     }
                     RawSet.drVarDecoding(newTemp, vars);
                     RawSet.drItOtherDecoding(newTemp, itRandom);
@@ -1391,10 +1390,9 @@ var RawSet = /** @class */ (function () {
                     (_h = element_2.parentNode) === null || _h === void 0 ? void 0 : _h.replaceChild(fag, element_2);
                     raws.push.apply(raws, rr);
                     if (bypass) {
-                        return "break";
+                        return "continue";
                     }
                 }
-                // console.log('-------------')
                 else if (drAttr_1.drThis) {
                     var r = ScriptUtils.evalReturn(drAttr_1.drThis, obj);
                     if (r) {
@@ -1515,7 +1513,7 @@ var RawSet = /** @class */ (function () {
                     fag.append(tempalte.content);
                     var rr = RawSet.checkPointCreates(fag, config);
                     (_0 = element_2.parentNode) === null || _0 === void 0 ? void 0 : _0.replaceChild(fag, element_2);
-                    //const rrr = rr.flatMap(it => it.render(obj, config));// .flat();
+                    // const rrr = rr.flatMap(it => it.render(obj, config));// .flat();
                     raws.push.apply(raws, rr);
                 }
                 else if (drAttr_1.drRepeat) {
@@ -1545,12 +1543,14 @@ var RawSet = /** @class */ (function () {
                         if (documentFragment_1) {
                             var detectAction_1 = element_2.getAttribute(RawSet.DR_DETECT_NAME);
                             if (detectAction_1 && documentFragment_1.render) {
-                                this_1.detect = { action: function () {
+                                this_1.detect = {
+                                    action: function () {
                                         var script = "var $component = this.__render.component; var $element = this.__render.element; var $innerHTML = this.__render.innerHTML; var $attribute = this.__render.attribute;  ".concat(detectAction_1, " ");
                                         ScriptUtils.eval(script, Object.assign(obj, {
                                             __render: documentFragment_1.render
                                         }));
-                                    } };
+                                    }
+                                };
                             }
                             // fag.append(documentFragment)
                             var rr = RawSet.checkPointCreates(documentFragment_1, config);
@@ -1593,33 +1593,33 @@ var RawSet = /** @class */ (function () {
         for (var _i = 0, _19 = Array.from(genNode.childNodes.values()); _i < _19.length; _i++) {
             var cNode = _19[_i];
             var state_1 = _loop_1(cNode);
+            if (typeof state_1 === "object")
+                return state_1.value;
             if (state_1 === "break")
                 break;
         }
-        if (keepgoing) {
-            this.applyEvent(obj, genNode, config);
-            this.replaceBody(genNode);
-            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)
-                        })
-                    }));
-                }
-            });
-            for (var _20 = 0, onElementInitCallBack_1 = onElementInitCallBack; _20 < onElementInitCallBack_1.length; _20++) {
-                var it_1 = onElementInitCallBack_1[_20];
-                (_14 = (_13 = (_12 = (_11 = it_1.targetElement) === null || _11 === void 0 ? void 0 : _11.__render) === null || _12 === void 0 ? void 0 : _12.component) === null || _13 === void 0 ? void 0 : _13.onInitRender) === null || _14 === void 0 ? void 0 : _14.call(_13, { render: (_15 = it_1.targetElement) === null || _15 === void 0 ? void 0 : _15.__render, creatorMetaData: (_16 = it_1.targetElement) === null || _16 === void 0 ? void 0 : _16.__creatorMetaData });
-                (_17 = config === null || config === void 0 ? void 0 : config.onElementInit) === null || _17 === void 0 ? void 0 : _17.call(config, it_1.name, obj, this, it_1.targetElement);
-            }
-            for (var _21 = 0, onAttrInitCallBack_1 = onAttrInitCallBack; _21 < onAttrInitCallBack_1.length; _21++) {
-                var it_2 = onAttrInitCallBack_1[_21];
-                (_18 = config === null || config === void 0 ? void 0 : config.onAttrInit) === null || _18 === void 0 ? void 0 : _18.call(config, it_2.attrName, it_2.attrValue, obj, this);
+        this.applyEvent(obj, genNode, config);
+        this.replaceBody(genNode);
+        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)
+                    })
+                }));
             }
+        });
+        for (var _20 = 0, onElementInitCallBack_1 = onElementInitCallBack; _20 < onElementInitCallBack_1.length; _20++) {
+            var it_1 = onElementInitCallBack_1[_20];
+            (_14 = (_13 = (_12 = (_11 = it_1.targetElement) === null || _11 === void 0 ? void 0 : _11.__render) === null || _12 === void 0 ? void 0 : _12.component) === null || _13 === void 0 ? void 0 : _13.onInitRender) === null || _14 === void 0 ? void 0 : _14.call(_13, { render: (_15 = it_1.targetElement) === null || _15 === void 0 ? void 0 : _15.__render, creatorMetaData: (_16 = it_1.targetElement) === null || _16 === void 0 ? void 0 : _16.__creatorMetaData });
+            (_17 = config === null || config === void 0 ? void 0 : config.onElementInit) === null || _17 === void 0 ? void 0 : _17.call(config, it_1.name, obj, this, it_1.targetElement);
+        }
+        for (var _21 = 0, onAttrInitCallBack_1 = onAttrInitCallBack; _21 < onAttrInitCallBack_1.length; _21++) {
+            var it_2 = onAttrInitCallBack_1[_21];
+            (_18 = config === null || config === void 0 ? void 0 : config.onAttrInit) === null || _18 === void 0 ? void 0 : _18.call(config, it_2.attrName, it_2.attrValue, obj, this);
         }
         return raws;
     };
@@ -1718,7 +1718,7 @@ var RawSet = /** @class */ (function () {
                 var fragment = config.window.document.createDocumentFragment();
                 var start = config.window.document.createComment("start ".concat(uuid));
                 var end = config.window.document.createComment("end ".concat(uuid));
-                //console.log('start--', uuid)
+                // console.log('start--', uuid)
                 (_c = currentNode === null || currentNode === void 0 ? void 0 : currentNode.parentNode) === null || _c === void 0 ? void 0 : _c.insertBefore(start, currentNode);
                 (_d = currentNode === null || currentNode === void 0 ? void 0 : currentNode.parentNode) === null || _d === void 0 ? void 0 : _d.insertBefore(end, currentNode.nextSibling);
                 fragment.append(currentNode);
@@ -1909,7 +1909,7 @@ var RawSet = /** @class */ (function () {
                 var data = factory(element, attrValue, obj, rawSet);
                 rawSet.point.thisVariableName = data.__domrender_this_variable_name;
                 if (thisObj) {
-                    var i = thisObj['__domrender_component_new'] = ((_a = thisObj['__domrender_component_new']) !== null && _a !== void 0 ? _a : new Proxy({}, new DomRenderFinalProxy()));
+                    var i = thisObj.__domrender_component_new = ((_a = thisObj.__domrender_component_new) !== null && _a !== void 0 ? _a : new Proxy({}, new DomRenderFinalProxy()));
                     i.thisVariableName = rawSet.point.thisVariableName;
                     i.rawSet = rawSet;
                     i.innerHTML = element.innerHTML;
@@ -1965,7 +1965,7 @@ var RawSet = /** @class */ (function () {
                     // eslint-disable-next-line no-use-before-define
                 });
                 this.__render = render;
-                var i = instance['__domrender_component_new'] = ((_c = instance['__domrender_component_new']) !== null && _c !== void 0 ? _c : new Proxy({}, new DomRenderFinalProxy()));
+                var i = instance.__domrender_component_new = ((_c = instance.__domrender_component_new) !== null && _c !== void 0 ? _c : new Proxy({}, new DomRenderFinalProxy()));
                 i.thisVariableName = rawSet.point.thisVariableName;
                 i.thisFullVariableName = "this.__domrender_components.".concat(componentKey);
                 i.rawSet = rawSet;
@@ -1984,7 +1984,7 @@ var RawSet = /** @class */ (function () {
                     applayTemplate = applayTemplate.replace(/#component#/g, 'this');
                 }
                 applayTemplate = template.replace(/#innerHTML#/g, applayTemplate);
-                var oninit = element.getAttribute(EventManager.onInitAttrName); // dr-on-init
+                var oninit = element.getAttribute("".concat(EventManager.attrPrefix, "on-component-init")); // dr-on-component-init
                 if (oninit) {
                     var script = "var $component = this.__render.component; var $element = this.__render.element; var $innerHTML = this.__render.innerHTML; var $attribute = this.__render.attribute;  ".concat(oninit, " ");
                     ScriptUtils.eval(script, Object.assign(obj, {
@@ -2048,7 +2048,7 @@ var RawSet = /** @class */ (function () {
         drAfterOption: RawSet.DR_AFTER_OPTIONNAME,
         drBeforeOption: RawSet.DR_BEFORE_OPTIONNAME,
         drCompleteOption: RawSet.DR_COMPLETE_OPTIONNAME,
-        drStripOption: RawSet.DR_STRIP_OPTIONNAME,
+        drStripOption: RawSet.DR_STRIP_OPTIONNAME
     };
     RawSet.DR_TAGS = [];
     RawSet.DR_ATTRIBUTES = [RawSet.DR, RawSet.DR_IF_NAME, RawSet.DR_FOR_OF_NAME, RawSet.DR_FOR_NAME, RawSet.DR_THIS_NAME, RawSet.DR_FORM_NAME, RawSet.DR_PRE_NAME, RawSet.DR_INNERHTML_NAME, RawSet.DR_INNERTEXT_NAME, RawSet.DR_REPEAT_NAME, RawSet.DR_DETECT_NAME];
@@ -2396,6 +2396,19 @@ var DomRender = /** @class */ (function () {
 }());
 // export default DomRender;
 
+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() {
     }
@@ -2411,32 +2424,6 @@ var RenderManager = /** @class */ (function () {
     return RenderManager;
 }());
 
-var AllUnCheckedValidatorArray = /** @class */ (function (_super) {
-    __extends(AllUnCheckedValidatorArray, _super);
-    function AllUnCheckedValidatorArray(value, target, event, autoValid) {
-        if (autoValid === void 0) { autoValid = true; }
-        return _super.call(this, value, target, event, autoValid) || this;
-    }
-    AllUnCheckedValidatorArray.prototype.valid = function () {
-        var _a;
-        return !(((_a = this.value) !== null && _a !== void 0 ? _a : []).filter(function (it) { return it.checked; }).length > 0);
-    };
-    return AllUnCheckedValidatorArray;
-}(ValidatorArray));
-
-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 CheckedValidator = /** @class */ (function (_super) {
     __extends(CheckedValidator, _super);
     function CheckedValidator(value, target, event, autoValid) {
@@ -2465,6 +2452,34 @@ var CountEqualsCheckedValidatorArray = /** @class */ (function (_super) {
     return CountEqualsCheckedValidatorArray;
 }(ValidatorArray));
 
+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 AllUnCheckedValidatorArray = /** @class */ (function (_super) {
+    __extends(AllUnCheckedValidatorArray, _super);
+    function AllUnCheckedValidatorArray(value, target, event, autoValid) {
+        if (autoValid === void 0) { autoValid = true; }
+        return _super.call(this, value, target, event, autoValid) || this;
+    }
+    AllUnCheckedValidatorArray.prototype.valid = function () {
+        var _a;
+        return !(((_a = this.value) !== null && _a !== void 0 ? _a : []).filter(function (it) { return it.checked; }).length > 0);
+    };
+    return AllUnCheckedValidatorArray;
+}(ValidatorArray));
+
 var CountEqualsUnCheckedValidatorArray = /** @class */ (function (_super) {
     __extends(CountEqualsUnCheckedValidatorArray, _super);
     function CountEqualsUnCheckedValidatorArray(count, value, target, event, autoValid) {
@@ -2480,34 +2495,34 @@ var CountEqualsUnCheckedValidatorArray = /** @class */ (function (_super) {
     return CountEqualsUnCheckedValidatorArray;
 }(ValidatorArray));
 
-var CountGreaterThanCheckedValidatorArray = /** @class */ (function (_super) {
-    __extends(CountGreaterThanCheckedValidatorArray, _super);
-    function CountGreaterThanCheckedValidatorArray(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;
     }
-    CountGreaterThanCheckedValidatorArray.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 CountGreaterThanCheckedValidatorArray;
+    return CountLessThanCheckedValidatorArray;
 }(ValidatorArray));
 
-var CountGreaterThanEqualsCheckedValidatorArray = /** @class */ (function (_super) {
-    __extends(CountGreaterThanEqualsCheckedValidatorArray, _super);
-    function CountGreaterThanEqualsCheckedValidatorArray(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;
     }
-    CountGreaterThanEqualsCheckedValidatorArray.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 CountGreaterThanEqualsCheckedValidatorArray;
+    return CountGreaterThanEqualsUnCheckedValidatorArray;
 }(ValidatorArray));
 
 var CountGreaterThanUnCheckedValidatorArray = /** @class */ (function (_super) {
@@ -2525,78 +2540,64 @@ var CountGreaterThanUnCheckedValidatorArray = /** @class */ (function (_super) {
     return CountGreaterThanUnCheckedValidatorArray;
 }(ValidatorArray));
 
-var CountLessThanCheckedValidatorArray = /** @class */ (function (_super) {
-    __extends(CountLessThanCheckedValidatorArray, _super);
-    function CountLessThanCheckedValidatorArray(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;
     }
-    CountLessThanCheckedValidatorArray.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 CountLessThanCheckedValidatorArray;
+    return CountLessThanEqualsCheckedValidatorArray;
 }(ValidatorArray));
 
-var CountLessThanEqualsUnCheckedValidatorArray = /** @class */ (function (_super) {
-    __extends(CountLessThanEqualsUnCheckedValidatorArray, _super);
-    function CountLessThanEqualsUnCheckedValidatorArray(count, value, target, event, autoValid) {
+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;
     }
-    CountLessThanEqualsUnCheckedValidatorArray.prototype.valid = function () {
+    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 ((_a = this.value) !== null && _a !== void 0 ? _a : []).filter(function (it) { return !it.checked; }).length < this.count;
     };
-    return CountLessThanEqualsUnCheckedValidatorArray;
+    return CountLessThanUnCheckedValidatorArray;
 }(ValidatorArray));
 
-var CountLessThanEqualsCheckedValidatorArray = /** @class */ (function (_super) {
-    __extends(CountLessThanEqualsCheckedValidatorArray, _super);
-    function CountLessThanEqualsCheckedValidatorArray(count, value, target, event, autoValid) {
+var CountUnCheckedValidatorArray = /** @class */ (function (_super) {
+    __extends(CountUnCheckedValidatorArray, _super);
+    function CountUnCheckedValidatorArray(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 () {
+    CountUnCheckedValidatorArray.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 CountUnCheckedValidatorArray;
 }(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 CountGreaterThanEqualsUnCheckedValidatorArray = /** @class */ (function (_super) {
-    __extends(CountGreaterThanEqualsUnCheckedValidatorArray, _super);
-    function CountGreaterThanEqualsUnCheckedValidatorArray(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;
     }
-    CountGreaterThanEqualsUnCheckedValidatorArray.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 CountGreaterThanEqualsUnCheckedValidatorArray;
+    return CountGreaterThanEqualsCheckedValidatorArray;
 }(ValidatorArray));
 
 var ExcludeCheckedValidatorArray = /** @class */ (function (_super) {
@@ -2639,6 +2640,42 @@ var FormValidator = /** @class */ (function (_super) {
     return FormValidator;
 }(Validator));
 
+var IncludeCheckedValidatorArray = /** @class */ (function (_super) {
+    __extends(IncludeCheckedValidatorArray, _super);
+    function IncludeCheckedValidatorArray(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;
+    }
+    IncludeCheckedValidatorArray.prototype.valid = function () {
+        var _this = this;
+        var _a;
+        var valus = (_a = this.value) !== null && _a !== void 0 ? _a : [];
+        var checkedValue = valus.filter(function (it) { return it.checked; }).map(function (it) { return it.value; });
+        return checkedValue.length > 0 &&
+            (!(checkedValue.filter(function (it) { return !_this.include.includes(it); }).length > 0)) &&
+            (this.allRequired ? checkedValue.filter(function (it) { return _this.include.includes(it); }).length === this.include.length : true);
+    };
+    return IncludeCheckedValidatorArray;
+}(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 MultipleValidator = /** @class */ (function (_super) {
     __extends(MultipleValidator, _super);
     function MultipleValidator(validators, value, target, event, autoValid) {
@@ -2668,43 +2705,6 @@ var MultipleValidator = /** @class */ (function (_super) {
     return MultipleValidator;
 }(Validator));
 
-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 IncludeCheckedValidatorArray = /** @class */ (function (_super) {
-    __extends(IncludeCheckedValidatorArray, _super);
-    function IncludeCheckedValidatorArray(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;
-    }
-    IncludeCheckedValidatorArray.prototype.valid = function () {
-        var _this = this;
-        var _a;
-        var valus = (_a = this.value) !== null && _a !== void 0 ? _a : [];
-        var checkedValue = valus.filter(function (it) { return it.checked; }).map(function (it) { return it.value; });
-        return checkedValue.length > 0 &&
-            (!(checkedValue.filter(function (it) { return !_this.include.includes(it); }).length > 0)) &&
-            (this.allRequired ? checkedValue.filter(function (it) { return _this.include.includes(it); }).length === this.include.length : true);
-    };
-    return IncludeCheckedValidatorArray;
-}(ValidatorArray));
-
 var NotEmptyValidator = /** @class */ (function (_super) {
     __extends(NotEmptyValidator, _super);
     function NotEmptyValidator(value, target, event, autoValid) {
@@ -2720,52 +2720,26 @@ var NotEmptyValidator = /** @class */ (function (_super) {
     return NotEmptyValidator;
 }(Validator));
 
-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 RegExpTestValidator = /** @class */ (function (_super) {
-    __extends(RegExpTestValidator, _super);
-    function RegExpTestValidator(regexp, value, target, event, autoValid) {
+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;
     }
-    RegExpTestValidator.prototype.valid = function () {
+    NotRegExpTestValidator.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);
+            return !regExp.test(value);
         }
         else {
-            return false;
+            return true;
         }
     };
-    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;
+    return NotRegExpTestValidator;
 }(Validator));
 
 var RequiredValidator = /** @class */ (function (_super) {
@@ -2782,42 +2756,6 @@ var RequiredValidator = /** @class */ (function (_super) {
     return RequiredValidator;
 }(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 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 ValidMultipleValidator = /** @class */ (function (_super) {
     __extends(ValidMultipleValidator, _super);
     function ValidMultipleValidator(validMultipleCallback, validators, value, target, event, autoValid) {
@@ -2833,20 +2771,19 @@ var ValidMultipleValidator = /** @class */ (function (_super) {
     return ValidMultipleValidator;
 }(MultipleValidator));
 
-var CountUnCheckedValidatorArray = /** @class */ (function (_super) {
-    __extends(CountUnCheckedValidatorArray, _super);
-    function CountUnCheckedValidatorArray(count, 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.count = count;
+        _this.validCallBack = validCallBack;
         return _this;
     }
-    CountUnCheckedValidatorArray.prototype.valid = function () {
-        var _a;
-        return ((_a = this.value) !== null && _a !== void 0 ? _a : []).filter(function (it) { return !it.checked; }).length >= this.count;
+    ValidValidator.prototype.valid = function (value, target, event) {
+        return this.validCallBack(value, target, event);
     };
-    return CountUnCheckedValidatorArray;
-}(ValidatorArray));
+    return ValidValidator;
+}(Validator));
 
 var ValidValidatorArray = /** @class */ (function (_super) {
     __extends(ValidValidatorArray, _super);
@@ -2862,6 +2799,54 @@ var ValidValidatorArray = /** @class */ (function (_super) {
     return ValidValidatorArray;
 }(ValidatorArray));
 
+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 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 RegExpTestValidator = /** @class */ (function (_super) {
+    __extends(RegExpTestValidator, _super);
+    function RegExpTestValidator(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;
+    }
+    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 ValueEqualsValidator = /** @class */ (function (_super) {
     __extends(ValueEqualsValidator, _super);
     function ValueEqualsValidator(equalsValue, value, target, event, autoValid) {
@@ -2890,6 +2875,21 @@ var ValueNotEqualsValidator = /** @class */ (function (_super) {
     return ValueNotEqualsValidator;
 }(Validator));
 
+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 ClipBoardUtils = /** @class */ (function () {
     function ClipBoardUtils() {
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dom-render",
-  "version": "1.0.70",
+  "version": "1.0.71",
   "main": "DomRender.js",
   "license": "MIT",
   "description": "dom-render",
@@ -57,10 +57,7 @@
     "npm-build": "npm run build && cp package.json dist && cp .npmignore dist && cp README.MD dist && rm -rf dist/dist/bundle.js.map",
     "npm-publish": "npm run npm-build && npm publish ./dist",
     "tsc": "tsc",
-    "setting:root-dist": "rm -rf ../dist-dom-render && mkdirp ../dist-dom-render && cp package-root-dist.json ../dist-dom-render/package.json",
-    "tsc:root-dist": "npm run setting:root-dist && tsc --outDir ../dist-dom-render --declarationDir ../dist-dom-render",
     "tsc:watch": "rm -rf ./dist && mkdir dist && cp package.json dist && tsc --watch --outDir dist --declarationDir dist --sourceMap true",
-    "tsc:watch:root-dist": "npm run setting:root-dist && tsc  --outDir ../dist-dom-render --declarationDir ../dist-dom-render --watch --sourceMap true",
     "test": "jest --detectOpenHandles --forceExit"
   },
   "devDependencies": {