Merge pull request #481 from flowerField/master

optimalize cell format

src/controllers/dropCell.js

@@ -508,12 +508,19 @@ const luckysheetDropCell = {
                                             cell.m = cell.v.toExponential(len).toString();
                                         }
                                         else{
-                                            let mask = genarate(Math.round(cell.v * 1000000000) / 1000000000);
+                                            let mask;
-                                            cell.m = mask[0].toString();
+                                            if(cell.ct.fa === "##0.00"){
+                                               /* 如果是数字类型 */
+                                               mask = genarate(Math.round(cell.v * 1000000000) / 1000000000 + ".00") ;
+                                               cell.m = mask[0].toString();
+                                            }else {
+                                                mask = genarate(Math.round(cell.v * 1000000000) / 1000000000);
+                                                cell.m = mask[0].toString();
+                                            }
                                         }
                                     }
 
-                                    cell.ct = { "fa": "General", "t": "n" };
+                                    cell.ct = cell.ct || { "fa": "General", "t": "n" };
                                 }
                                 else{
                                     let mask = genarate(cell.v);

src/global/setdata.js

@@ -69,29 +69,39 @@ function setcellvalue(r, c, d, v) {
         cell = {};
     }
     
-    if(vupdate.toString().substr(0, 1) == "'"){
+    let vupdateStr = vupdate.toString();
-        cell.m = vupdate.toString().substr(1);
+
+    if(vupdateStr.substr(0, 1) == "'"){
+        cell.m = vupdateStr.substr(1);
         cell.ct = { "fa": "@", "t": "s" };
-        cell.v = vupdate.toString().substr(1);
+        cell.v = vupdateStr.substr(1);
         cell.qp = 1;
     }
     else if(cell.qp == 1){
-        cell.m = vupdate.toString();
+        cell.m = vupdateStr;
         cell.ct = { "fa": "@", "t": "s" };
-        cell.v = vupdate.toString();
+        cell.v = vupdateStr;
     }
-    else if(vupdate.toString().toUpperCase() === "TRUE"){
+    else if(vupdateStr.toUpperCase() === "TRUE"){
         cell.m = "TRUE";
         cell.ct = { "fa": "General", "t": "b" };
+        cell.ht = cell.ht || 0;
         cell.v = true;
     }
-    else if(vupdate.toString().toUpperCase() === "FALSE"){
+    else if(vupdateStr.toUpperCase() === "FALSE"){
         cell.m = "FALSE";
         cell.ct = { "fa": "General", "t": "b" };
+        cell.ht = cell.ht || 0;
         cell.v = false;
     }
+    else if(vupdateStr.substr(-1) === "%" && isRealNum(vupdateStr.substring(0, vupdateStr.length-1))){
+            cell.ht = cell.ht || 2;
+            cell.ct = {fa: "0%", t: "n"};
+            cell.v = vupdateStr.substring(0, vupdateStr.length-1) / 100;
+            cell.m = vupdate;
+    }
     else if(valueIsError(vupdate)){
-        cell.m = vupdate.toString();
+        cell.m = vupdateStr;
         // cell.ct = { "fa": "General", "t": "e" };
         if(cell.ct!=null){
             cell.ct.t = "e";
@@ -142,7 +152,7 @@ function setcellvalue(r, c, d, v) {
             }
         }
         else if(cell.ct != null && cell.ct.fa == "@"){
-            cell.m = vupdate.toString();
+            cell.m = vupdateStr;
             cell.v = vupdate;
         }
         else if(cell.ct != null && cell.ct.fa != null && cell.ct.fa != "General"){
@@ -170,7 +180,7 @@ function setcellvalue(r, c, d, v) {
 
                 cell.v = parseFloat(vupdate);
                 cell.ct = { "fa": "General", "t": "n" };
-
+                cell.ht = cell.ht || 2;
                 if(cell.v == Infinity || cell.v == -Infinity){
                     cell.m = cell.v.toString();
                 }