fix: <fixed issue: uku-repest=num in 100 doesn't work>

momoko8443 · Sep 23, 2018 · 2d72846 · 2d72846
1 parent 7cfbc7e
commit 2d72846
Show file tree

Hide file tree

Showing 7 changed files with 41 additions and 40 deletions.
diff --git a/demo/components/comp7.html b/demo/components/comp7.html
@@ -0,0 +1,12 @@
+<uku-component>
+    <template>
+       <ul>
+           <li uku-repeat="num in cc.totalNumber">
+               {{num}}
+           </li>
+       </ul>
+    </template>
+    <script>
+        this.totalNumber = 100;
+    </script>
+</uku-component>
diff --git a/demo/native.html b/demo/native.html
@@ -13,15 +13,17 @@
 
 <body uku-application>
     <!-- <my-comp5 uku-item-value="99 + myCtrl.number" uku-item-value2="myCtrl.show"></my-comp5> -->
-    <my-comp6 id="comp6" uku-current-state="myCtrl.loginState"></my-comp6>
+    <!-- <my-comp6 id="comp6" uku-current-state="myCtrl.loginState"></my-comp6> -->
+    <my-comp7></my-comp7>
     <button uku-onclick="myCtrl.switchState()">change state</button>
 </body>
 <script>
     var uku = new Ukulele();
     uku.registerController('myCtrl',new MyCtrl(uku));
 
     //uku.registerComponent('my-comp5','components/comp5.html');
-    uku.registerComponent('my-comp6','components/comp6.html');
+    //uku.registerComponent('my-comp6','components/comp6.html');
+    uku.registerComponent('my-comp7','components/comp7.html');
     uku.init();
 
     function MyCtrl(uku){

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/core/Analyzer.ts b/src/core/Analyzer.ts
@@ -160,24 +160,6 @@ export class Analyzer extends EventEmitter {
                 event['data'] = data;
                 cc._dom.dispatchEvent(event);
             };
-            /* if(!cc.setState){
-                cc.setState = function(state){
-                    cc._currentState = state;
-                    self.uku.refresh(cc._alias);
-                }
-                Object.defineProperty(cc, 'currentState', {
-                    set: function(value){
-                        if(value){
-                            cc._currentState = value;
-                            self.uku.refresh(cc._alias);
-                        }
-                    },
-
-                    get: function(){
-                        return cc._currentState;
-                    }
-                })
-            } */
             this.uku.registerController(randomAlias, cc);
             for (let i = 0; i < attrs.length; i++) {
                 let attr = attrs[i];

diff --git a/src/model/BoundItemRepeat.ts b/src/model/BoundItemRepeat.ts
@@ -22,6 +22,15 @@ export class BoundItemRepeat extends BoundItemBase{
         if (!finalValue) {
             return;
         }
+        if(typeof finalValue === "number" && Math.floor(finalValue) === finalValue){
+            //finalValue = 
+            let newFinalValue = [];
+            for(let num=1; num <= finalValue; num++){
+                //let item = {value: num};
+                newFinalValue.push(num);
+            }
+            finalValue = newFinalValue;
+        }
 
         let self = this;
         if (this.element && this.element.parentNode) {

diff --git a/src/util/UkuleleUtil.ts b/src/util/UkuleleUtil.ts
@@ -153,9 +153,9 @@ export class UkuleleUtil {
 
             });
             var result;
-            try{
+            try {
                 result = eval(attrName);
-            }catch(err){
+            } catch (err) {
                 result = '';
             }
             tempScope = null;
@@ -166,15 +166,15 @@ export class UkuleleUtil {
     static setFinalValue(object: Object, attrName: string, value: any) {
         return (function () {
             var tempScope = {};
-            attrName = attrName.replace('parent.','');
+            attrName = attrName.replace('parent.', '');
             tempScope[object['_alias']] = object;
-            
+
             let valueString;
-            if(typeof value === "string"){
+            if (typeof value === "string") {
                 valueString = '"' + value + '"';
-            }else if(typeof value === "object"){
+            } else if (typeof value === "object") {
                 valueString = "JSON.parse('" + JSON.stringify(value) + "')";
-            }else{
+            } else {
                 valueString = value;
             }
 
@@ -183,13 +183,12 @@ export class UkuleleUtil {
         })();
     }
 
-    static wrapScriptInComponent(originalScript):string{
-        if(originalScript){
-            let trimScript = originalScript.replace(new RegExp('\\s', 'gm'),'');
-            if(trimScript.search(new RegExp('\\(function\\(')) === 0){
-                return originalScript;
-            }else{
-                let selfExcutingFrame = 
+    static wrapScriptInComponent(originalScript): string {
+        let trimScript = originalScript.replace(new RegExp('\\s', 'gm'), '');
+        if (trimScript.search(new RegExp('\\(function\\(')) === 0) {
+            return originalScript;
+        } else {
+            let selfExcutingFrame =
                 `	(function(){
                         return function(uku){                
                             Object.defineProperty(this, 'currentState', {
@@ -210,10 +209,7 @@ export class UkuleleUtil {
                         };
                     })();
                 `;
-                return selfExcutingFrame;
-            }
-        }else{
-            return "";
+            return selfExcutingFrame;
         }
     }
 }