[core] bugfix dom module register error and '\xxxxxx' error (#1582)

apache · Sep 26, 2018 · 4652d7f · 4652d7f
1 parent 584374e
commit 4652d7f
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 6 deletions.
diff --git a/ios/sdk/WeexSDK/Sources/Bridge/WXCoreBridge.mm b/ios/sdk/WeexSDK/Sources/Bridge/WXCoreBridge.mm
@@ -221,10 +221,6 @@ static void MergeBorderWidthValues(NSMutableDictionary* dict,
     {
         // should not enter this function
         do {
-            RenderPage *page = RenderManager::GetInstance()->GetPage(page_id);
-            if (page == nullptr) {
-                break;
-            }
             NSString *instanceId = NSSTRING(page_id);
             WXSDKInstance *instance = [WXSDKManager instanceForID:instanceId];
             if (!instance) {

diff --git a/weex_core/Source/core/data_render/object.cc b/weex_core/Source/core/data_render/object.cc
@@ -205,6 +205,11 @@ bool ValueGT(const Value *a, const Value *b) {
     else if (ToNum(a, d1) && ToNum(b, d2)) {
         return NumGT(d1, d2);
     }
+    else if (IsInt(b) && IsString(a)) {
+        int64_t aval = 0;
+        ToInteger(a, 0, aval);
+        return aval > IntValue(b);
+    }
     else {
         return false;
     }

diff --git a/weex_core/Source/core/data_render/vm.cc b/weex_core/Source/core/data_render/vm.cc
@@ -150,6 +150,11 @@ void VM::RunFrame(ExecState *exec_state, Frame frame, Value *ret) {
               int64_t bval = 0;
               ToInteger(b, 0, bval);
               SetIValue(a, static_cast<int>(NUM_OP(/, bval, IntValue(c))));
+          } else if (IsString(c) && IsString(b)) {
+              int64_t bval = 0, cval = 0;
+              ToInteger(b, 0, bval);
+              ToInteger(c, 0, cval);
+              SetIValue(a, static_cast<int>(NUM_OP(/, bval, cval)));
           } else {
               LOGE("Unspport Type[%d,%d] with OP_CODE[OP_DIV]", b->type, c->type);
           }

diff --git a/weex_core/Source/core/data_render/vnode/vnode_exec_env.cc b/weex_core/Source/core/data_render/vnode/vnode_exec_env.cc
@@ -407,8 +407,12 @@ static Value AppendChild(ExecState *exec_state) {
             }
         }
         else if (IsString(childrens) && parent) {
-            LOGD("[VM][VNode][AppendChild]:string:%s\n", CStringValue(childrens));
-            parent->SetAttribute("value", CStringValue(childrens));
+            std::string value = CStringValue(childrens);
+            if (value == "\\ue7f4") {
+                value = "\ue7f4";
+            }
+            LOGD("[VM][VNode][AppendChild]:string:%s\n", value.c_str());
+            parent->SetAttribute("value", value);
         }
         else {
             VNode *children = reinterpret_cast<VNode *>(exec_state->GetArgument(1)->cptr);