fix: <refactoring repeat item>

momoko8443 · Sep 28, 2018 · 94e7d6b · 94e7d6b
1 parent 8b18567
commit 94e7d6b
Show file tree

Hide file tree

Showing 5 changed files with 38 additions and 15 deletions.
diff --git a/demo/components/comp7.html b/demo/components/comp7.html
@@ -1,8 +1,9 @@
 <uku-component>
     <template>
        <ul>
-           <li uku-repeat="num in cc.totalNumber" uku-class=" num === cc.currentNumber?'normal red':'normal'">         
-               <a uku-onclick="cc.change(num)">{{num}}</a>
+           <li uku-repeat="num in cc.totalNumber" uku-class=" num === cc.currentNumber?'normal red':'normal'">   
+               <a uku-onclick="cc.change(num)">{{ num }}</a>
+               <label>{{ num }}</label>
            </li>
        </ul>
     </template>

diff --git a/dist/uku.js b/dist/uku.js
diff --git a/dist/uku.js.map b/dist/uku.js.map
diff --git a/src/model/BoundItemRepeat.ts b/src/model/BoundItemRepeat.ts
@@ -17,6 +17,30 @@ export class BoundItemRepeat extends BoundItemBase{
         this.endCommentString = undefined;
     }
 
+    replaceVarible(element:HTMLElement, varName, alias){
+        let pattern = new RegExp("\\b"+ varName + "(?!\\w)","gm");
+        let attributes = element.attributes;
+        for(let i=0; i<attributes.length; i++){
+            let attr = attributes[i];
+            if(UkuleleUtil.isUkuAttrTag(attr.nodeName)){
+                attr.nodeValue = attr.nodeValue.replace(pattern, alias);
+            }
+        }
+        let childTag = element.innerHTML.match(new RegExp("\\<\\w*.*\\>","gm"))
+        let innerText = element.innerHTML.match(new RegExp("\\{{[\\w\\W]*\\}\\}","gm"));
+        if(childTag === null
+            && innerText !== null
+            && innerText.length === 1){
+            element.textContent = element.textContent.replace(pattern, alias);
+        }
+        if(element.children && element.children.length > 0){
+            for(let j=0; j<element.children.length; j++){
+                let child:HTMLElement = element.children[j] as HTMLElement;
+                this.replaceVarible(child, varName, alias);
+            }    
+        }
+    }
+
     render(controllers) {
         let finalValue = UkuleleUtil.getFinalValue(controllers, this.attributeName);
         if (!finalValue) {
@@ -57,13 +81,6 @@ export class BoundItemRepeat extends BoundItemBase{
             NodeFilter.SHOW_COMMENT,
             safeFilter,
             false);
-
-        /*function filter(node:Node) :any{
-            if (node.nodeValue === self.beginCommentString) {
-                return (NodeFilter.FILTER_ACCEPT);
-            }
-            return (NodeFilter.FILTER_SKIP);
-        }*/
 
         function generateTempContainer():HTMLElement{
             let index = UkuleleUtil.searchHtmlTag(self.renderTemplate,"tr");
@@ -114,10 +131,8 @@ export class BoundItemRepeat extends BoundItemBase{
                         this.uku.registerController(alias, {'value':finalValue[j]});
                         alias = alias + ".value";
                     }
-                    let pattern = new RegExp("\\b"+ this.expression + "(?!\\-|\\s|\\w|\\=)","gm");
-                    //let pattern = new RegExp(this.expression+"(?!\\w)","gm");
-                    let newOuterHtml = child.outerHTML.replace(pattern,alias);
-                    child.insertAdjacentHTML('afterend',newOuterHtml);
+                    this.replaceVarible(child,this.expression,alias);
+                    child.insertAdjacentHTML('afterend',child.outerHTML);
                     let newItemDom:HTMLElement = child.nextSibling as HTMLElement;
                     child.parentNode.removeChild(child);
                     child = newItemDom;

diff --git a/src/util/UkuleleUtil.ts b/src/util/UkuleleUtil.ts
@@ -66,6 +66,13 @@ export class UkuleleUtil {
         return index;
     }
 
+    static isUkuAttrTag(tagName:string): boolean{
+        if(this.searchUkuAttrTag(tagName) > -1){
+            return true;
+        }
+        return false;
+    }
+
     static getAttrFromUkuTag(ukuTag: string, camelCase: boolean = false) {
         if (UkuleleUtil.searchUkuAttrTag(ukuTag) === 0) {
             ukuTag = ukuTag.replace('uku-', '');