npm - dom-render - Versions diffs - 1.0.76 → 1.0.77 - Mend

dom-render 1.0.76 → 1.0.77

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (9) hide show

package/DomRenderProxy.js +5 -1
package/README.MD +1 -1
package/RawSet.js +21 -15
package/dist/bundle.js +295 -290
package/events/EventManager.d.ts +1 -0
package/events/EventManager.js +31 -0
package/operators/AttrExpresion.d.ts +0 -4
package/operators/AttrExpresion.js +43 -67
package/package.json +1 -1

package/DomRenderProxy.js CHANGED Viewed

@@ -56,7 +56,7 @@ var DomRenderProxy = /** @class */ (function () {
     DomRenderProxy.prototype.initRender = function (target) {
         var _this = this;
         var _a, _b, _c, _d, _e, _f, _g;
-        var onCreate = (_b = (_a = target).getAttribute) === null || _b === void 0 ? void 0 : _b.call(_a, 'dr-on-create');
+        var onCreate = (_b = (_a = target).getAttribute) === null || _b === void 0 ? void 0 : _b.call(_a, "".concat(EventManager_1.EventManager.attrPrefix, "on-create"));
         var createParam = undefined;
         if (onCreate) {
             createParam = ScriptUtils_1.ScriptUtils.evalReturn(onCreate, this._domRender_proxy);
@@ -66,6 +66,7 @@ var DomRenderProxy = /** @class */ (function () {
         this._targets.add(target);
         var rawSets = RawSet_1.RawSet.checkPointCreates(target, this.config);
         // console.log('-------rawSet', rawSets)
+        // 중요 초기에 한번 튕겨줘야함.
         EventManager_1.eventManager.applyEvent(this._domRender_proxy, EventManager_1.eventManager.findAttrElements(target, this.config), this.config);
         rawSets.forEach(function (it) {
             var variables = it.getUsingTriggerVariables(_this.config);
@@ -173,8 +174,11 @@ var DomRenderProxy = /** @class */ (function () {
                     this.render(Array.from(iterable));
                 }
                 this._targets.forEach(function (it) {
+                    // console.log('target------->,', it)
+                    // return;
                     if (it.nodeType === Node.DOCUMENT_FRAGMENT_NODE || it.nodeType === Node.ELEMENT_NODE) {
                         var targets = EventManager_1.eventManager.findAttrElements(it, _this.config);
+                        // console.log('------>', targets);
                         EventManager_1.eventManager.changeVar(_this._domRender_proxy, targets, "this.".concat(fullPathStr_1), _this.config);
                     }
                 });

package/README.MD CHANGED Viewed

@@ -7,7 +7,7 @@ DOM-RENDER
 # 🚀 Quick start
 ```html
-<script src="https://cdn.jsdelivr.net/npm/dom-render@1.0.75/dist/bundle.js"></script>
+<script src="https://cdn.jsdelivr.net/npm/dom-render@1.0.77/dist/bundle.js"></script>
 ```
 ```html
 <!DOCTYPE html>

package/RawSet.js CHANGED Viewed

@@ -42,7 +42,6 @@ var DrAppender_1 = require("./operators/DrAppender");
 var DrRepeat_1 = require("./operators/DrRepeat");
 var DrTargetElement_1 = require("./operators/DrTargetElement");
 var DrTargetAttr_1 = require("./operators/DrTargetAttr");
-var AttrExpresion_1 = require("./operators/AttrExpresion");
 var DestroyOptionType;
 (function (DestroyOptionType) {
     DestroyOptionType["NO_DESTROY"] = "NO_DESTROY";
@@ -76,19 +75,18 @@ var RawSet = /** @class */ (function () {
             }
             else if (cNode.nodeType === Node.ELEMENT_NODE) {
                 var element_1 = cNode;
-                var targetAttrNames_1 = ((_c = (_b = config === null || config === void 0 ? void 0 : config.targetAttrs) === null || _b === void 0 ? void 0 : _b.map(function (it) { return it.name; })) !== null && _c !== void 0 ? _c : []).concat(RawSet.DR_ATTRIBUTES);
-                script = targetAttrNames_1.map(function (it) {
+                var targetAttrNames = ((_c = (_b = config === null || config === void 0 ? void 0 : config.targetAttrs) === null || _b === void 0 ? void 0 : _b.map(function (it) { return it.name; })) !== null && _c !== void 0 ? _c : []).concat(RawSet.DR_ATTRIBUTES);
+                script = targetAttrNames.map(function (it) {
                     // console.log('-?', element.getAttribute(it))
                     return element_1.getAttribute(it);
                 }).filter(function (it) { return it; }).join(';');
                 // console.log('----!!!!!-->', targetAttrNames)
-                var otherAttrs = element_1.getAttributeNames()
-                    .filter(function (it) { return !targetAttrNames_1.includes(it.toLowerCase()) && RawSet.isExporesion(element_1.getAttribute(it)); })
-                    .map(function (it) {
-                    var _a;
-                    return "`".concat((_a = element_1.getAttribute(it)) !== null && _a !== void 0 ? _a : '', "`");
-                }).join(';');
-                script += ';' + otherAttrs;
+                // const otherAttrs = element.getAttributeNames()
+                //     .filter(it => !targetAttrNames.includes(it.toLowerCase()) && RawSet.isExporesion(element.getAttribute(it)))
+                //     .map(it => {
+                //         return `\`${element.getAttribute(it) ?? ''}\``;
+                //     }).join(';');
+                // script += ';' + otherAttrs
             }
             if (script) {
                 // script = script.replace('}$','}');
@@ -179,7 +177,6 @@ var RawSet = /** @class */ (function () {
                     new Dr_1.Dr(this, __render, { raws: raws, fag: fag }, { element: element, attrs: drAttr }, { config: config, obj: obj }, { onAttrInitCallBacks: onAttrInitCallBacks, onElementInitCallBacks: onElementInitCallBacks, onThisComponentSetCallBacks: onThisComponentSetCallBacks }),
                     new DrIf_1.DrIf(this, __render, { raws: raws, fag: fag }, { element: element, attrs: drAttr }, { config: config, obj: obj }, { onAttrInitCallBacks: onAttrInitCallBacks, onElementInitCallBacks: onElementInitCallBacks, onThisComponentSetCallBacks: onThisComponentSetCallBacks }),
                     new DrThis_1.DrThis(this, __render, { raws: raws, fag: fag }, { element: element, attrs: drAttr }, { config: config, obj: obj }, { onAttrInitCallBacks: onAttrInitCallBacks, onElementInitCallBacks: onElementInitCallBacks, onThisComponentSetCallBacks: onThisComponentSetCallBacks }),
-                    new AttrExpresion_1.AttrExpresion(this, __render, { raws: raws, fag: fag }, { element: element, attrs: drAttr }, { config: config, obj: obj }, { onAttrInitCallBacks: onAttrInitCallBacks, onElementInitCallBacks: onElementInitCallBacks, onThisComponentSetCallBacks: onThisComponentSetCallBacks }),
                     new DrForm_1.DrForm(this, __render, { raws: raws, fag: fag }, { element: element, attrs: drAttr }, { config: config, obj: obj }, { onAttrInitCallBacks: onAttrInitCallBacks, onElementInitCallBacks: onElementInitCallBacks, onThisComponentSetCallBacks: onThisComponentSetCallBacks }),
                     new DrInnerText_1.DrInnerText(this, __render, { raws: raws, fag: fag }, { element: element, attrs: drAttr }, { config: config, obj: obj }, { onAttrInitCallBacks: onAttrInitCallBacks, onElementInitCallBacks: onElementInitCallBacks, onThisComponentSetCallBacks: onThisComponentSetCallBacks }),
                     new DrInnerHTML_1.DrInnerHTML(this, __render, { raws: raws, fag: fag }, { element: element, attrs: drAttr }, { config: config, obj: obj }, { onAttrInitCallBacks: onAttrInitCallBacks, onElementInitCallBacks: onElementInitCallBacks, onThisComponentSetCallBacks: onThisComponentSetCallBacks }),
@@ -290,6 +287,7 @@ var RawSet = /** @class */ (function () {
         this.childAllRemove();
         (_a = this.point.start.parentNode) === null || _a === void 0 ? void 0 : _a.insertBefore(genNode, this.point.start.nextSibling);
     };
+    // 중요
     RawSet.checkPointCreates = function (element, config) {
         var _a, _b, _c, _d;
         var thisVariableName = element.__domrender_this_variable_name;
@@ -312,13 +310,21 @@ var RawSet = /** @class */ (function () {
                     var element_2 = node;
                     // console.log('------>', element);
                     var isElement = ((_c = (_b = config.targetElements) === null || _b === void 0 ? void 0 : _b.map(function (it) { return it.name.toLowerCase(); })) !== null && _c !== void 0 ? _c : []).includes(element_2.tagName.toLowerCase());
-                    var targetAttrNames_2 = ((_e = (_d = config.targetAttrs) === null || _d === void 0 ? void 0 : _d.map(function (it) { return it.name; })) !== null && _e !== void 0 ? _e : []).concat(RawSet.DR_ATTRIBUTES);
+                    var targetAttrNames_1 = ((_e = (_d = config.targetAttrs) === null || _d === void 0 ? void 0 : _d.map(function (it) { return it.name; })) !== null && _e !== void 0 ? _e : []).concat(RawSet.DR_ATTRIBUTES);
+                    var normalAttrs_1 = new Map();
                     var isAttr = element_2.getAttributeNames().filter(function (it) {
-                        var attrExpresion = RawSet.isExporesion(element_2.getAttribute(it));
+                        var value = element_2.getAttribute(it);
+                        if (value && RawSet.isExporesion(value)) {
+                            normalAttrs_1.set(it, RawSet.exporesionGrouops(value)[0][1]);
+                        }
                         // console.log(element.getAttribute(it), attrExpresion);
-                        var isTargetAttr = targetAttrNames_2.includes(it.toLowerCase());
-                        return isTargetAttr || attrExpresion;
+                        var isTargetAttr = targetAttrNames_1.includes(it.toLowerCase());
+                        return isTargetAttr;
                     }).length > 0;
+                    // 기본 attribute를 처리하기위해
+                    if (normalAttrs_1.size) {
+                        element_2.setAttribute(EventManager_1.EventManager.normalAttrMapAttrName, JSON.stringify(Array.from(normalAttrs_1.entries())));
+                    }
                     return (isAttr || isElement) ? NodeFilter.FILTER_ACCEPT : NodeFilter.FILTER_REJECT;
                 }
                 return NodeFilter.FILTER_REJECT;

package/dist/bundle.js CHANGED Viewed

@@ -454,6 +454,7 @@ var EventManager = /** @class */ (function () {
             EventManager.valueAttrName,
             EventManager.valueLinkAttrName,
             EventManager.attrAttrName,
+            EventManager.normalAttrMapAttrName,
             EventManager.styleAttrName,
             EventManager.classAttrName,
             EventManager.attrPrefix + 'window-event-' + EventManager.WINDOW_EVENT_POPSTATE,
@@ -532,6 +533,18 @@ var EventManager = /** @class */ (function () {
                 }
             }
         });
+        // normal-attr-map
+        this.procAttr(childNodes, EventManager.normalAttrMapAttrName, function (it, attribute) {
+            var map = new Map(JSON.parse(attribute));
+            map.forEach(function (v, k) {
+                var data = ScriptUtils.eval("const $element = this.element;  return ".concat(v, " "), Object.assign(obj, {
+                    __render: Object.freeze({
+                        element: it
+                    })
+                }));
+                it.setAttribute(k, data);
+            });
+        });
         // window event
         EventManager.WINDOW_EVENTS.forEach(function (it) {
             _this.procAttr(childNodes, EventManager.attrPrefix + 'window-event-' + it, function (it, attribute) {
@@ -771,6 +784,23 @@ var EventManager = /** @class */ (function () {
                 }
             }
         });
+        // normal-attr-map
+        this.procAttr(elements, EventManager.normalAttrMapAttrName, function (it, attribute) {
+            var map = new Map(JSON.parse(attribute));
+            map.forEach(function (v, k) {
+                // console.log('--->', v, k)
+                var isUsing = _this.isUsingThisVar(v, varName);
+                // console.log('---isUsing-->', varName, k, v, isUsing);
+                if (isUsing) {
+                    var data = ScriptUtils.eval("const $element = this.element;  return ".concat(v, " "), Object.assign(obj, {
+                        __render: Object.freeze({
+                            element: it
+                        })
+                    }));
+                    it.setAttribute(k, data);
+                }
+            });
+        });
     };
     // eslint-disable-next-line no-undef
     EventManager.prototype.addDrEvents = function (obj, eventName, elements, config) {
@@ -911,6 +941,7 @@ var EventManager = /** @class */ (function () {
     EventManager.valueAttrName = EventManager.attrPrefix + 'value';
     EventManager.valueLinkAttrName = EventManager.attrPrefix + 'value-link';
     EventManager.attrAttrName = EventManager.attrPrefix + 'attr';
+    EventManager.normalAttrMapAttrName = EventManager.attrPrefix + 'normal-attr-map';
     EventManager.styleAttrName = EventManager.attrPrefix + 'style';
     EventManager.classAttrName = EventManager.attrPrefix + 'class';
     EventManager.VALUE_VARNAME = '$value';
@@ -1732,42 +1763,6 @@ var DrTargetAttr = /** @class */ (function (_super) {
     return DrTargetAttr;
 }(OperatorRender));
-var AttrExpresion = /** @class */ (function (_super) {
-    __extends(AttrExpresion, _super);
-    function AttrExpresion() {
-        return _super !== null && _super.apply(this, arguments) || this;
-    }
-    AttrExpresion.prototype.execRender = function () {
-        var _a;
-        var _this = this;
-        var _b;
-        var targetAttrs = this.elementSource.element.getAttributeNames()
-            .filter(function (it) { return RawSet.isExporesion(_this.elementSource.element.getAttribute(it)); })
-            .map(function (it) { return ({ name: it, expresion: RawSet.exporesionGrouops(_this.elementSource.element.getAttribute(it))[0][1] }); })
-            .filter(function (it) { return it.name.length > 0 && it.expresion.length > 0; })
-            .map(function (it) {
-            return "n.setAttribute('".concat(it.name, "', ").concat(it.expresion, ")");
-        });
-        // console.log('-----', targetAttrs)
-        if ((targetAttrs === null || targetAttrs === void 0 ? void 0 : targetAttrs.length) > 0) {
-            var newTemp = this.source.config.window.document.createElement('temp');
-            // console.log('------>', targetAttrs, targetAttrs.join(';'))
-            ScriptUtils.eval("\n                        ".concat(this.render.bindScript, "\n                        const n = $element.cloneNode(true);\n                        ").concat(targetAttrs.join(';'), ";\n                        this.__render.fag.append(n);\n                    "), Object.assign(this.source.obj, {
-                __render: Object.freeze(__assign({ fag: newTemp, targetAttrs: targetAttrs }, this.render))
-            }));
-            var tempalte = this.source.config.window.document.createElement('template');
-            tempalte.innerHTML = newTemp.innerHTML;
-            this.returnContainer.fag.append(tempalte.content);
-            var rr = RawSet.checkPointCreates(this.returnContainer.fag, this.source.config);
-            (_b = this.elementSource.element.parentNode) === null || _b === void 0 ? void 0 : _b.replaceChild(this.returnContainer.fag, this.elementSource.element);
-            (_a = this.returnContainer.raws).push.apply(_a, rr);
-            return exports.ExecuteState.EXECUTE;
-        }
-        return exports.ExecuteState.NO_EXECUTE;
-    };
-    return AttrExpresion;
-}(OperatorRender));
 exports.DestroyOptionType = void 0;
 (function (DestroyOptionType) {
     DestroyOptionType["NO_DESTROY"] = "NO_DESTROY";
@@ -1801,19 +1796,18 @@ var RawSet = /** @class */ (function () {
             }
             else if (cNode.nodeType === Node.ELEMENT_NODE) {
                 var element_1 = cNode;
-                var targetAttrNames_1 = ((_c = (_b = config === null || config === void 0 ? void 0 : config.targetAttrs) === null || _b === void 0 ? void 0 : _b.map(function (it) { return it.name; })) !== null && _c !== void 0 ? _c : []).concat(RawSet.DR_ATTRIBUTES);
-                script = targetAttrNames_1.map(function (it) {
+                var targetAttrNames = ((_c = (_b = config === null || config === void 0 ? void 0 : config.targetAttrs) === null || _b === void 0 ? void 0 : _b.map(function (it) { return it.name; })) !== null && _c !== void 0 ? _c : []).concat(RawSet.DR_ATTRIBUTES);
+                script = targetAttrNames.map(function (it) {
                     // console.log('-?', element.getAttribute(it))
                     return element_1.getAttribute(it);
                 }).filter(function (it) { return it; }).join(';');
                 // console.log('----!!!!!-->', targetAttrNames)
-                var otherAttrs = element_1.getAttributeNames()
-                    .filter(function (it) { return !targetAttrNames_1.includes(it.toLowerCase()) && RawSet.isExporesion(element_1.getAttribute(it)); })
-                    .map(function (it) {
-                    var _a;
-                    return "`".concat((_a = element_1.getAttribute(it)) !== null && _a !== void 0 ? _a : '', "`");
-                }).join(';');
-                script += ';' + otherAttrs;
+                // const otherAttrs = element.getAttributeNames()
+                //     .filter(it => !targetAttrNames.includes(it.toLowerCase()) && RawSet.isExporesion(element.getAttribute(it)))
+                //     .map(it => {
+                //         return `\`${element.getAttribute(it) ?? ''}\``;
+                //     }).join(';');
+                // script += ';' + otherAttrs
             }
             if (script) {
                 // script = script.replace('}$','}');
@@ -1904,7 +1898,6 @@ var RawSet = /** @class */ (function () {
                     new Dr(this, __render, { raws: raws, fag: fag }, { element: element, attrs: drAttr }, { config: config, obj: obj }, { onAttrInitCallBacks: onAttrInitCallBacks, onElementInitCallBacks: onElementInitCallBacks, onThisComponentSetCallBacks: onThisComponentSetCallBacks }),
                     new DrIf(this, __render, { raws: raws, fag: fag }, { element: element, attrs: drAttr }, { config: config, obj: obj }, { onAttrInitCallBacks: onAttrInitCallBacks, onElementInitCallBacks: onElementInitCallBacks, onThisComponentSetCallBacks: onThisComponentSetCallBacks }),
                     new DrThis(this, __render, { raws: raws, fag: fag }, { element: element, attrs: drAttr }, { config: config, obj: obj }, { onAttrInitCallBacks: onAttrInitCallBacks, onElementInitCallBacks: onElementInitCallBacks, onThisComponentSetCallBacks: onThisComponentSetCallBacks }),
-                    new AttrExpresion(this, __render, { raws: raws, fag: fag }, { element: element, attrs: drAttr }, { config: config, obj: obj }, { onAttrInitCallBacks: onAttrInitCallBacks, onElementInitCallBacks: onElementInitCallBacks, onThisComponentSetCallBacks: onThisComponentSetCallBacks }),
                     new DrForm(this, __render, { raws: raws, fag: fag }, { element: element, attrs: drAttr }, { config: config, obj: obj }, { onAttrInitCallBacks: onAttrInitCallBacks, onElementInitCallBacks: onElementInitCallBacks, onThisComponentSetCallBacks: onThisComponentSetCallBacks }),
                     new DrInnerText(this, __render, { raws: raws, fag: fag }, { element: element, attrs: drAttr }, { config: config, obj: obj }, { onAttrInitCallBacks: onAttrInitCallBacks, onElementInitCallBacks: onElementInitCallBacks, onThisComponentSetCallBacks: onThisComponentSetCallBacks }),
                     new DrInnerHTML(this, __render, { raws: raws, fag: fag }, { element: element, attrs: drAttr }, { config: config, obj: obj }, { onAttrInitCallBacks: onAttrInitCallBacks, onElementInitCallBacks: onElementInitCallBacks, onThisComponentSetCallBacks: onThisComponentSetCallBacks }),
@@ -2015,6 +2008,7 @@ var RawSet = /** @class */ (function () {
         this.childAllRemove();
         (_a = this.point.start.parentNode) === null || _a === void 0 ? void 0 : _a.insertBefore(genNode, this.point.start.nextSibling);
     };
+    // 중요
     RawSet.checkPointCreates = function (element, config) {
         var _a, _b, _c, _d;
         var thisVariableName = element.__domrender_this_variable_name;
@@ -2037,13 +2031,21 @@ var RawSet = /** @class */ (function () {
                     var element_2 = node;
                     // console.log('------>', element);
                     var isElement = ((_c = (_b = config.targetElements) === null || _b === void 0 ? void 0 : _b.map(function (it) { return it.name.toLowerCase(); })) !== null && _c !== void 0 ? _c : []).includes(element_2.tagName.toLowerCase());
-                    var targetAttrNames_2 = ((_e = (_d = config.targetAttrs) === null || _d === void 0 ? void 0 : _d.map(function (it) { return it.name; })) !== null && _e !== void 0 ? _e : []).concat(RawSet.DR_ATTRIBUTES);
+                    var targetAttrNames_1 = ((_e = (_d = config.targetAttrs) === null || _d === void 0 ? void 0 : _d.map(function (it) { return it.name; })) !== null && _e !== void 0 ? _e : []).concat(RawSet.DR_ATTRIBUTES);
+                    var normalAttrs_1 = new Map();
                     var isAttr = element_2.getAttributeNames().filter(function (it) {
-                        var attrExpresion = RawSet.isExporesion(element_2.getAttribute(it));
+                        var value = element_2.getAttribute(it);
+                        if (value && RawSet.isExporesion(value)) {
+                            normalAttrs_1.set(it, RawSet.exporesionGrouops(value)[0][1]);
+                        }
                         // console.log(element.getAttribute(it), attrExpresion);
-                        var isTargetAttr = targetAttrNames_2.includes(it.toLowerCase());
-                        return isTargetAttr || attrExpresion;
+                        var isTargetAttr = targetAttrNames_1.includes(it.toLowerCase());
+                        return isTargetAttr;
                     }).length > 0;
+                    // 기본 attribute를 처리하기위해
+                    if (normalAttrs_1.size) {
+                        element_2.setAttribute(EventManager.normalAttrMapAttrName, JSON.stringify(Array.from(normalAttrs_1.entries())));
+                    }
                     return (isAttr || isElement) ? NodeFilter.FILTER_ACCEPT : NodeFilter.FILTER_REJECT;
                 }
                 return NodeFilter.FILTER_REJECT;
@@ -2539,7 +2541,7 @@ var DomRenderProxy = /** @class */ (function () {
     DomRenderProxy.prototype.initRender = function (target) {
         var _this = this;
         var _a, _b, _c, _d, _e, _f, _g;
-        var onCreate = (_b = (_a = target).getAttribute) === null || _b === void 0 ? void 0 : _b.call(_a, 'dr-on-create');
+        var onCreate = (_b = (_a = target).getAttribute) === null || _b === void 0 ? void 0 : _b.call(_a, "".concat(EventManager.attrPrefix, "on-create"));
         var createParam = undefined;
         if (onCreate) {
             createParam = ScriptUtils.evalReturn(onCreate, this._domRender_proxy);
@@ -2549,6 +2551,7 @@ var DomRenderProxy = /** @class */ (function () {
         this._targets.add(target);
         var rawSets = RawSet.checkPointCreates(target, this.config);
         // console.log('-------rawSet', rawSets)
+        // 중요 초기에 한번 튕겨줘야함.
         eventManager.applyEvent(this._domRender_proxy, eventManager.findAttrElements(target, this.config), this.config);
         rawSets.forEach(function (it) {
             var variables = it.getUsingTriggerVariables(_this.config);
@@ -2656,8 +2659,11 @@ var DomRenderProxy = /** @class */ (function () {
                     this.render(Array.from(iterable));
                 }
                 this._targets.forEach(function (it) {
+                    // console.log('target------->,', it)
+                    // return;
                     if (it.nodeType === Node.DOCUMENT_FRAGMENT_NODE || it.nodeType === Node.ELEMENT_NODE) {
                         var targets = eventManager.findAttrElements(it, _this.config);
+                        // console.log('------>', targets);
                         eventManager.changeVar(_this._domRender_proxy, targets, "this.".concat(fullPathStr_1), _this.config);
                     }
                 });
@@ -3327,46 +3333,17 @@ var RenderManager = /** @class */ (function () {
     return RenderManager;
 }());
-var Appender = /** @class */ (function () {
-    // [keys: string]: any;
-    function Appender() {
-        this.length = 0;
-        // (this.childs as any).isAppender = true;
-    }
-    Appender.prototype.push = function () {
-        var items = [];
-        for (var _i = 0; _i < arguments.length; _i++) {
-            items[_i] = arguments[_i];
-        }
-        // console.log('----2>', this.length)
-        items.index = this.length;
-        this[this.length++] = items;
-        // console.log('---22->', this.length)
-        // const appender = this.childs[this.lastIndex];
-        // appender.values = items;
-        // this.childs.push(new Appender(appender.index + 1));
-    };
-    Appender.prototype.clear = function () {
-        // console.log('length', this.length);
-        for (var i = 0; i < this.length; i++) {
-            delete this[i];
-        }
-        this.length = 0;
-    };
-    return Appender;
-}());
-var AllCheckedValidatorArray = /** @class */ (function (_super) {
-    __extends(AllCheckedValidatorArray, _super);
-    function AllCheckedValidatorArray(value, target, event, autoValid) {
+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;
     }
-    AllCheckedValidatorArray.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 > 0);
+        return !(((_a = this.value) !== null && _a !== void 0 ? _a : []).filter(function (it) { return it.checked; }).length > 0);
     };
-    return AllCheckedValidatorArray;
+    return AllUnCheckedValidatorArray;
 }(ValidatorArray));
 var CheckedValidator = /** @class */ (function (_super) {
@@ -3382,32 +3359,17 @@ var CheckedValidator = /** @class */ (function (_super) {
     return CheckedValidator;
 }(Validator));
-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;
-    }
-    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 CountEqualsCheckedValidatorArray;
-}(ValidatorArray));
-var AllUnCheckedValidatorArray = /** @class */ (function (_super) {
-    __extends(AllUnCheckedValidatorArray, _super);
-    function AllUnCheckedValidatorArray(value, target, event, autoValid) {
+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;
     }
-    AllUnCheckedValidatorArray.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 > 0);
+        return !(((_a = this.value) !== null && _a !== void 0 ? _a : []).filter(function (it) { return !it.checked; }).length > 0);
     };
-    return AllUnCheckedValidatorArray;
+    return AllCheckedValidatorArray;
 }(ValidatorArray));
 var CountGreaterThanEqualsCheckedValidatorArray = /** @class */ (function (_super) {
@@ -3425,34 +3387,34 @@ var CountGreaterThanEqualsCheckedValidatorArray = /** @class */ (function (_supe
     return CountGreaterThanEqualsCheckedValidatorArray;
 }(ValidatorArray));
-var CountEqualsUnCheckedValidatorArray = /** @class */ (function (_super) {
-    __extends(CountEqualsUnCheckedValidatorArray, _super);
-    function CountEqualsUnCheckedValidatorArray(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;
     }
-    CountEqualsUnCheckedValidatorArray.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 CountEqualsUnCheckedValidatorArray;
+    return CountEqualsCheckedValidatorArray;
 }(ValidatorArray));
-var CountLessThanEqualsCheckedValidatorArray = /** @class */ (function (_super) {
-    __extends(CountLessThanEqualsCheckedValidatorArray, _super);
-    function CountLessThanEqualsCheckedValidatorArray(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;
     }
-    CountLessThanEqualsCheckedValidatorArray.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 CountLessThanEqualsCheckedValidatorArray;
+    return CountGreaterThanEqualsUnCheckedValidatorArray;
 }(ValidatorArray));
 var CountGreaterThanUnCheckedValidatorArray = /** @class */ (function (_super) {
@@ -3470,19 +3432,19 @@ var CountGreaterThanUnCheckedValidatorArray = /** @class */ (function (_super) {
     return CountGreaterThanUnCheckedValidatorArray;
 }(ValidatorArray));
-var CountGreaterThanEqualsUnCheckedValidatorArray = /** @class */ (function (_super) {
-    __extends(CountGreaterThanEqualsUnCheckedValidatorArray, _super);
-    function CountGreaterThanEqualsUnCheckedValidatorArray(count, value, target, event, autoValid) {
+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;
     }
-    CountGreaterThanEqualsUnCheckedValidatorArray.prototype.valid = function () {
+    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 ((_a = this.value) !== null && _a !== void 0 ? _a : []).filter(function (it) { return !it.checked; }).length <= this.count;
     };
-    return CountGreaterThanEqualsUnCheckedValidatorArray;
+    return CountLessThanEqualsUnCheckedValidatorArray;
 }(ValidatorArray));
 var CountLessThanCheckedValidatorArray = /** @class */ (function (_super) {
@@ -3500,19 +3462,34 @@ var CountLessThanCheckedValidatorArray = /** @class */ (function (_super) {
     return CountLessThanCheckedValidatorArray;
 }(ValidatorArray));
-var CountLessThanEqualsUnCheckedValidatorArray = /** @class */ (function (_super) {
-    __extends(CountLessThanEqualsUnCheckedValidatorArray, _super);
-    function CountLessThanEqualsUnCheckedValidatorArray(count, 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; }
         var _this = _super.call(this, value, target, event, autoValid) || this;
         _this.count = count;
         return _this;
     }
-    CountLessThanEqualsUnCheckedValidatorArray.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 <= this.count;
+        return ((_a = this.value) !== null && _a !== void 0 ? _a : []).filter(function (it) { return !it.checked; }).length === this.count;
     };
-    return CountLessThanEqualsUnCheckedValidatorArray;
+    return CountEqualsUnCheckedValidatorArray;
+}(ValidatorArray));
+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;
+    }
+    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 CountLessThanEqualsCheckedValidatorArray;
 }(ValidatorArray));
 var CountLessThanUnCheckedValidatorArray = /** @class */ (function (_super) {
@@ -3530,6 +3507,21 @@ var CountLessThanUnCheckedValidatorArray = /** @class */ (function (_super) {
     return CountLessThanUnCheckedValidatorArray;
 }(ValidatorArray));
+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;
+    }
+    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 CountUnCheckedValidatorArray;
+}(ValidatorArray));
 var FormValidator = /** @class */ (function (_super) {
     __extends(FormValidator, _super);
     function FormValidator(target, event, autoValid) {
@@ -3548,6 +3540,57 @@ var FormValidator = /** @class */ (function (_super) {
     return FormValidator;
 }(Validator));
+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 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 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 ExcludeCheckedValidatorArray = /** @class */ (function (_super) {
     __extends(ExcludeCheckedValidatorArray, _super);
     function ExcludeCheckedValidatorArray(include, allRequired, value, target, event, autoValid) {
@@ -3570,35 +3613,6 @@ var ExcludeCheckedValidatorArray = /** @class */ (function (_super) {
     return ExcludeCheckedValidatorArray;
 }(ValidatorArray));
-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;
-    }
-    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 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 MultipleValidator = /** @class */ (function (_super) {
     __extends(MultipleValidator, _super);
     function MultipleValidator(validators, value, target, event, autoValid) {
@@ -3628,21 +3642,6 @@ var MultipleValidator = /** @class */ (function (_super) {
     return MultipleValidator;
 }(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 NotRegExpTestValidator = /** @class */ (function (_super) {
     __extends(NotRegExpTestValidator, _super);
     function NotRegExpTestValidator(regexp, value, target, event, autoValid) {
@@ -3665,54 +3664,54 @@ var NotRegExpTestValidator = /** @class */ (function (_super) {
     return NotRegExpTestValidator;
 }(Validator));
-var IncludeCheckedValidatorArray = /** @class */ (function (_super) {
-    __extends(IncludeCheckedValidatorArray, _super);
-    function IncludeCheckedValidatorArray(include, allRequired, value, target, event, autoValid) {
-        if (allRequired === void 0) { allRequired = false; }
+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.include = include;
-        _this.allRequired = allRequired;
-        return _this;
+        return _super.call(this, value, target, event, autoValid) || 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);
+    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 IncludeCheckedValidatorArray;
-}(ValidatorArray));
+    return NotEmptyValidator;
+}(Validator));
-var CountGreaterThanCheckedValidatorArray = /** @class */ (function (_super) {
-    __extends(CountGreaterThanCheckedValidatorArray, _super);
-    function CountGreaterThanCheckedValidatorArray(count, value, target, event, autoValid) {
+var RegExpTestValidator = /** @class */ (function (_super) {
+    __extends(RegExpTestValidator, _super);
+    function RegExpTestValidator(regexp, value, target, event, autoValid) {
         if (autoValid === void 0) { autoValid = true; }
         var _this = _super.call(this, value, target, event, autoValid) || this;
-        _this.count = count;
+        _this.regexp = DomRenderProxy.final(regexp);
         return _this;
     }
-    CountGreaterThanCheckedValidatorArray.prototype.valid = function () {
+    RegExpTestValidator.prototype.valid = function () {
         var _a;
-        return ((_a = this.value) !== null && _a !== void 0 ? _a : []).filter(function (it) { return it.checked; }).length > this.count;
+        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 CountGreaterThanCheckedValidatorArray;
-}(ValidatorArray));
+    return RegExpTestValidator;
+}(Validator));
-var UnCheckedValidator = /** @class */ (function (_super) {
-    __extends(UnCheckedValidator, _super);
-    function UnCheckedValidator(value, target, event, autoValid) {
+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;
     }
-    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);
+    PassValidator.prototype.valid = function () {
+        return true;
     };
-    return UnCheckedValidator;
+    return PassValidator;
 }(Validator));
 var RequiredValidator = /** @class */ (function (_super) {
@@ -3729,20 +3728,6 @@ var RequiredValidator = /** @class */ (function (_super) {
     return RequiredValidator;
 }(Validator));
-var ValidValidatorArray = /** @class */ (function (_super) {
-    __extends(ValidValidatorArray, _super);
-    function ValidValidatorArray(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;
-    }
-    ValidValidatorArray.prototype.valid = function () {
-        return this.validCallBack(this.value, this.getTarget(), this.getEvent());
-    };
-    return ValidValidatorArray;
-}(ValidatorArray));
 var ValidMultipleValidator = /** @class */ (function (_super) {
     __extends(ValidMultipleValidator, _super);
     function ValidMultipleValidator(validMultipleCallback, validators, value, target, event, autoValid) {
@@ -3758,44 +3743,45 @@ var ValidMultipleValidator = /** @class */ (function (_super) {
     return ValidMultipleValidator;
 }(MultipleValidator));
-var ValidValidator = /** @class */ (function (_super) {
-    __extends(ValidValidator, _super);
-    function ValidValidator(validCallBack, value, target, event, autoValid) {
+var ValidValidatorArray = /** @class */ (function (_super) {
+    __extends(ValidValidatorArray, _super);
+    function ValidValidatorArray(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);
+    ValidValidatorArray.prototype.valid = function () {
+        return this.validCallBack(this.value, this.getTarget(), this.getEvent());
     };
-    return ValidValidator;
-}(Validator));
+    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 PassValidator = /** @class */ (function (_super) {
-    __extends(PassValidator, _super);
-    function PassValidator(value, target, event, autoValid) {
+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;
     }
-    PassValidator.prototype.valid = function () {
-        return true;
+    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 PassValidator;
+    return UnCheckedValidator;
 }(Validator));
 var ValueEqualsValidator = /** @class */ (function (_super) {
@@ -3812,49 +3798,71 @@ var ValueEqualsValidator = /** @class */ (function (_super) {
     return ValueEqualsValidator;
 }(Validator));
-var RegExpTestValidator = /** @class */ (function (_super) {
-    __extends(RegExpTestValidator, _super);
-    function RegExpTestValidator(regexp, value, target, event, autoValid) {
+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.regexp = DomRenderProxy.final(regexp);
+        _this.equalsValue = equalsValue;
         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);
+    ValueNotEqualsValidator.prototype.valid = function () {
+        return this.value !== this.equalsValue;
+    };
+    return ValueNotEqualsValidator;
+}(Validator));
+var Appender = /** @class */ (function () {
+    // [keys: string]: any;
+    function Appender() {
+        this.length = 0;
+        // (this.childs as any).isAppender = true;
+    }
+    Appender.prototype.push = function () {
+        var items = [];
+        for (var _i = 0; _i < arguments.length; _i++) {
+            items[_i] = arguments[_i];
         }
-        else {
-            return false;
+        // console.log('----2>', this.length)
+        items.index = this.length;
+        this[this.length++] = items;
+        // console.log('---22->', this.length)
+        // const appender = this.childs[this.lastIndex];
+        // appender.values = items;
+        // this.childs.push(new Appender(appender.index + 1));
+    };
+    Appender.prototype.clear = function () {
+        // console.log('length', this.length);
+        for (var i = 0; i < this.length; i++) {
+            delete this[i];
         }
+        this.length = 0;
     };
-    return RegExpTestValidator;
-}(Validator));
+    return Appender;
+}());
-var ClipBoardUtils = /** @class */ (function () {
-    function ClipBoardUtils() {
+var NodeUtils = /** @class */ (function () {
+    function NodeUtils() {
     }
-    ClipBoardUtils.readText = function (clipboard) {
-        if (clipboard === void 0) { clipboard = navigator.clipboard; }
-        return clipboard.readText();
+    // https://stackoverflow.com/questions/3955229/remove-all-child-elements-of-a-dom-node-in-javascript
+    NodeUtils.removeAllChildNode = function (node) {
+        while (node === null || node === void 0 ? void 0 : node.firstChild) {
+            node.firstChild.remove();
+        }
     };
-    ClipBoardUtils.read = function (clipboard) {
-        if (clipboard === void 0) { clipboard = navigator.clipboard; }
-        return clipboard.read();
+    NodeUtils.appendChild = function (parentNode, childNode) {
+        return parentNode.appendChild(childNode);
     };
-    ClipBoardUtils.writeText = function (data, clipboard) {
-        if (clipboard === void 0) { clipboard = navigator.clipboard; }
-        return clipboard.writeText(data);
+    NodeUtils.replaceNode = function (targetNode, newNode) {
+        var _a;
+        // console.log('repalceNode', targetNode, newNode, targetNode.parentNode)
+        return (_a = targetNode.parentNode) === null || _a === void 0 ? void 0 : _a.replaceChild(newNode, targetNode);
     };
-    ClipBoardUtils.write = function (data, clipboard) {
-        if (clipboard === void 0) { clipboard = navigator.clipboard; }
-        return clipboard.write(data);
+    NodeUtils.addNode = function (targetNode, newNode) {
+        var _a;
+        return (_a = targetNode.parentNode) === null || _a === void 0 ? void 0 : _a.insertBefore(newNode, targetNode.nextSibling);
     };
-    return ClipBoardUtils;
+    return NodeUtils;
 }());
 var StorageUtils = /** @class */ (function () {
@@ -3902,34 +3910,31 @@ var StorageUtils = /** @class */ (function () {
     return StorageUtils;
 }());
-var NodeUtils = /** @class */ (function () {
-    function NodeUtils() {
+var ClipBoardUtils = /** @class */ (function () {
+    function ClipBoardUtils() {
     }
-    // https://stackoverflow.com/questions/3955229/remove-all-child-elements-of-a-dom-node-in-javascript
-    NodeUtils.removeAllChildNode = function (node) {
-        while (node === null || node === void 0 ? void 0 : node.firstChild) {
-            node.firstChild.remove();
-        }
+    ClipBoardUtils.readText = function (clipboard) {
+        if (clipboard === void 0) { clipboard = navigator.clipboard; }
+        return clipboard.readText();
     };
-    NodeUtils.appendChild = function (parentNode, childNode) {
-        return parentNode.appendChild(childNode);
+    ClipBoardUtils.read = function (clipboard) {
+        if (clipboard === void 0) { clipboard = navigator.clipboard; }
+        return clipboard.read();
     };
-    NodeUtils.replaceNode = function (targetNode, newNode) {
-        var _a;
-        // console.log('repalceNode', targetNode, newNode, targetNode.parentNode)
-        return (_a = targetNode.parentNode) === null || _a === void 0 ? void 0 : _a.replaceChild(newNode, targetNode);
+    ClipBoardUtils.writeText = function (data, clipboard) {
+        if (clipboard === void 0) { clipboard = navigator.clipboard; }
+        return clipboard.writeText(data);
     };
-    NodeUtils.addNode = function (targetNode, newNode) {
-        var _a;
-        return (_a = targetNode.parentNode) === null || _a === void 0 ? void 0 : _a.insertBefore(newNode, targetNode.nextSibling);
+    ClipBoardUtils.write = function (data, clipboard) {
+        if (clipboard === void 0) { clipboard = navigator.clipboard; }
+        return clipboard.write(data);
     };
-    return NodeUtils;
+    return ClipBoardUtils;
 }());
 exports.AllCheckedValidatorArray = AllCheckedValidatorArray;
 exports.AllUnCheckedValidatorArray = AllUnCheckedValidatorArray;
 exports.Appender = Appender;
-exports.AttrExpresion = AttrExpresion;
 exports.Channel = Channel;
 exports.ChannelSubscriber = ChannelSubscriber;
 exports.ChannelSubscription = ChannelSubscription;

package/events/EventManager.d.ts CHANGED Viewed

@@ -8,6 +8,7 @@ export declare class EventManager {
     static readonly valueAttrName: string;
     static readonly valueLinkAttrName: string;
     static readonly attrAttrName: string;
+    static readonly normalAttrMapAttrName: string;
     static readonly styleAttrName: string;
     static readonly classAttrName: string;
     readonly attrNames: string[];

package/events/EventManager.js CHANGED Viewed

@@ -18,6 +18,7 @@ var EventManager = /** @class */ (function () {
             EventManager.valueAttrName,
             EventManager.valueLinkAttrName,
             EventManager.attrAttrName,
+            EventManager.normalAttrMapAttrName,
             EventManager.styleAttrName,
             EventManager.classAttrName,
             EventManager.attrPrefix + 'window-event-' + EventManager.WINDOW_EVENT_POPSTATE,
@@ -96,6 +97,18 @@ var EventManager = /** @class */ (function () {
                 }
             }
         });
+        // normal-attr-map
+        this.procAttr(childNodes, EventManager.normalAttrMapAttrName, function (it, attribute) {
+            var map = new Map(JSON.parse(attribute));
+            map.forEach(function (v, k) {
+                var data = ScriptUtils_1.ScriptUtils.eval("const $element = this.element;  return ".concat(v, " "), Object.assign(obj, {
+                    __render: Object.freeze({
+                        element: it
+                    })
+                }));
+                it.setAttribute(k, data);
+            });
+        });
         // window event
         EventManager.WINDOW_EVENTS.forEach(function (it) {
             _this.procAttr(childNodes, EventManager.attrPrefix + 'window-event-' + it, function (it, attribute) {
@@ -335,6 +348,23 @@ var EventManager = /** @class */ (function () {
                 }
             }
         });
+        // normal-attr-map
+        this.procAttr(elements, EventManager.normalAttrMapAttrName, function (it, attribute) {
+            var map = new Map(JSON.parse(attribute));
+            map.forEach(function (v, k) {
+                // console.log('--->', v, k)
+                var isUsing = _this.isUsingThisVar(v, varName);
+                // console.log('---isUsing-->', varName, k, v, isUsing);
+                if (isUsing) {
+                    var data = ScriptUtils_1.ScriptUtils.eval("const $element = this.element;  return ".concat(v, " "), Object.assign(obj, {
+                        __render: Object.freeze({
+                            element: it
+                        })
+                    }));
+                    it.setAttribute(k, data);
+                }
+            });
+        });
     };
     // eslint-disable-next-line no-undef
     EventManager.prototype.addDrEvents = function (obj, eventName, elements, config) {
@@ -475,6 +505,7 @@ var EventManager = /** @class */ (function () {
     EventManager.valueAttrName = EventManager.attrPrefix + 'value';
     EventManager.valueLinkAttrName = EventManager.attrPrefix + 'value-link';
     EventManager.attrAttrName = EventManager.attrPrefix + 'attr';
+    EventManager.normalAttrMapAttrName = EventManager.attrPrefix + 'normal-attr-map';
     EventManager.styleAttrName = EventManager.attrPrefix + 'style';
     EventManager.classAttrName = EventManager.attrPrefix + 'class';
     EventManager.VALUE_VARNAME = '$value';

package/operators/AttrExpresion.d.ts CHANGED Viewed

@@ -1,4 +0,0 @@
-import { ExecuteState, OperatorRender } from './OperatorRender';
-export declare class AttrExpresion extends OperatorRender {
-    execRender(): ExecuteState;
-}

package/operators/AttrExpresion.js CHANGED Viewed

@@ -1,68 +1,44 @@
 "use strict";
-var __extends = (this && this.__extends) || (function () {
-    var extendStatics = function (d, b) {
-        extendStatics = Object.setPrototypeOf ||
-            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
-            function (d, b) { for (var p in b) if (Object.prototype.hasOwnProperty.call(b, p)) d[p] = b[p]; };
-        return extendStatics(d, b);
-    };
-    return function (d, b) {
-        if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
-        extendStatics(d, b);
-        function __() { this.constructor = d; }
-        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
-    };
-})();
-var __assign = (this && this.__assign) || function () {
-    __assign = Object.assign || function(t) {
-        for (var s, i = 1, n = arguments.length; i < n; i++) {
-            s = arguments[i];
-            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
-                t[p] = s[p];
-        }
-        return t;
-    };
-    return __assign.apply(this, arguments);
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.AttrExpresion = void 0;
-var OperatorRender_1 = require("./OperatorRender");
-var ScriptUtils_1 = require("../utils/script/ScriptUtils");
-var RawSet_1 = require("../RawSet");
-var AttrExpresion = /** @class */ (function (_super) {
-    __extends(AttrExpresion, _super);
-    function AttrExpresion() {
-        return _super !== null && _super.apply(this, arguments) || this;
-    }
-    AttrExpresion.prototype.execRender = function () {
-        var _a;
-        var _this = this;
-        var _b;
-        var targetAttrs = this.elementSource.element.getAttributeNames()
-            .filter(function (it) { return RawSet_1.RawSet.isExporesion(_this.elementSource.element.getAttribute(it)); })
-            .map(function (it) { return ({ name: it, expresion: RawSet_1.RawSet.exporesionGrouops(_this.elementSource.element.getAttribute(it))[0][1] }); })
-            .filter(function (it) { return it.name.length > 0 && it.expresion.length > 0; })
-            .map(function (it) {
-            return "n.setAttribute('".concat(it.name, "', ").concat(it.expresion, ")");
-        });
-        // console.log('-----', targetAttrs)
-        if ((targetAttrs === null || targetAttrs === void 0 ? void 0 : targetAttrs.length) > 0) {
-            var newTemp = this.source.config.window.document.createElement('temp');
-            // console.log('------>', targetAttrs, targetAttrs.join(';'))
-            ScriptUtils_1.ScriptUtils.eval("\n                        ".concat(this.render.bindScript, "\n                        const n = $element.cloneNode(true);\n                        ").concat(targetAttrs.join(';'), ";\n                        this.__render.fag.append(n);\n                    "), Object.assign(this.source.obj, {
-                __render: Object.freeze(__assign({ fag: newTemp, targetAttrs: targetAttrs }, this.render))
-            }));
-            var tempalte = this.source.config.window.document.createElement('template');
-            tempalte.innerHTML = newTemp.innerHTML;
-            this.returnContainer.fag.append(tempalte.content);
-            var rr = RawSet_1.RawSet.checkPointCreates(this.returnContainer.fag, this.source.config);
-            (_b = this.elementSource.element.parentNode) === null || _b === void 0 ? void 0 : _b.replaceChild(this.returnContainer.fag, this.elementSource.element);
-            (_a = this.returnContainer.raws).push.apply(_a, rr);
-            return OperatorRender_1.ExecuteState.EXECUTE;
-        }
-        return OperatorRender_1.ExecuteState.NO_EXECUTE;
-    };
-    return AttrExpresion;
-}(OperatorRender_1.OperatorRender));
-exports.AttrExpresion = AttrExpresion;
+// import {ExecuteState, OperatorRender} from './OperatorRender';
+// import {ScriptUtils} from '../utils/script/ScriptUtils';
+// import {RawSet, Render} from '../RawSet';
+//
+// export class AttrExpresion extends OperatorRender {
+//     execRender(): ExecuteState {
+//         const targetAttrs = this.elementSource.element.getAttributeNames()
+//             .filter(it => RawSet.isExporesion(this.elementSource.element.getAttribute(it)))
+//             .map(it => ({name: it, expresion: RawSet.exporesionGrouops(this.elementSource.element.getAttribute(it))[0][1]}))
+//             .filter(it => it.name.length > 0 && it.expresion.length > 0)
+//             .map(it => {
+//                 return `n.setAttribute('${it.name}', ${it.expresion})`;
+//             });
+//         // console.log('--!!!!!!!!!---', targetAttrs)
+//         if (targetAttrs?.length > 0) {
+//             const newTemp = this.source.config.window.document.createElement('temp');
+//             // console.log('------>', targetAttrs, targetAttrs.join(';'))
+//             ScriptUtils.eval(`
+//                         ${this.render.bindScript}
+//                         //const n = $element.cloneNode(true);
+//                         const n = $element;
+//                         ${targetAttrs.join(';')};
+//                         // this.__render.fag.append(n);
+//                     `, Object.assign(this.source.obj, {
+//                 __render: Object.freeze({
+//                     fag: newTemp,
+//                     targetAttrs,
+//                     ...this.render
+//                 } as Render)
+//             }));
+//             // const tempalte = this.source.config.window.document.createElement('template');
+//             // tempalte.innerHTML = newTemp.innerHTML;
+//             // this.returnContainer.fag.append(tempalte.content);
+//             const rr = RawSet.checkPointCreates(this.render.element, this.source.config);
+//             // const rr = RawSet.checkPointCreates(this.returnContainer.fag, this.source.config);
+//             // this.elementSource.element.parentNode?.replaceChild(this.returnContainer.fag, this.elementSource.element);
+//             this.returnContainer.raws.push(...rr);
+//             // return ExecuteState.EXECUTE;
+//             return ExecuteState.NO_EXECUTE;
+//         }
+//         return ExecuteState.NO_EXECUTE;
+//     }
+// }

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "dom-render",
-  "version": "1.0.76",
+  "version": "1.0.77",
   "main": "DomRender.js",
   "license": "MIT",
   "description": "dom-render",