From a11296f932a01f8bb68d79a567f097df16f314c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=AC=91=E7=AC=91=E4=BD=A0=E7=9A=84=E7=89=99?= Date: Sat, 13 Sep 2025 09:35:55 +0000 Subject: [PATCH 1/2] =?UTF-8?q?=E5=91=8A=E8=AD=A6=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 笑笑你的牙 --- .../declarative_frontend/jsview/js_form.cpp | 20 ++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/frameworks/bridge/declarative_frontend/jsview/js_form.cpp b/frameworks/bridge/declarative_frontend/jsview/js_form.cpp index deaa3de2280..324ad942344 100644 --- a/frameworks/bridge/declarative_frontend/jsview/js_form.cpp +++ b/frameworks/bridge/declarative_frontend/jsview/js_form.cpp @@ -94,22 +94,24 @@ void JSForm::Create(const JSCallbackInfo& info) if (!ParseFormId(formInfo, id)) { return; } - formInfo.cardName = name->ToString(); - formInfo.bundleName = bundle->ToString(); - formInfo.abilityName = ability->ToString(); - formInfo.moduleName = module->ToString(); - formInfo.exemptAppLock = exemptAppLock->ToBoolean(); - if (!dimension->IsNull() && !dimension->IsEmpty()) { + formInfo.cardName = name->IsString() ? name->ToString() : ""; + formInfo.bundleName = bundle->IsString() ? bundle->ToString() : ""; + formInfo.abilityName = ability->IsString() ? ability->ToString() : ""; + formInfo.moduleName = module->IsString() ? module->ToString() : ""; + if (exemptAppLock->IsBoolean()) { + formInfo.exemptAppLock = exemptAppLock->ToBoolean(); + } + if (!dimension->IsNull() && !dimension->IsEmpty() && dimension->IsNumber()) { formInfo.dimension = dimension->ToNumber(); } - formInfo.temporary = temporary->ToBoolean(); + formInfo.temporary = temporary->IsBoolean() ? temporary->ToBoolean() : false; if (!wantValue->IsNull() && wantValue->IsObject()) { formInfo.wantWrap = CreateWantWrapFromNapiValue(wantValue); } - if (!renderingMode->IsNull() && !renderingMode->IsEmpty()) { + if (!renderingMode->IsNull() && !renderingMode->IsEmpty() && renderingMode->IsNumber()) { formInfo.renderingMode = renderingMode->ToNumber(); } - if (!shape->IsNull() && !shape->IsEmpty()) { + if (!shape->IsNull() && !shape->IsEmpty() && shape->IsNumber()) { formInfo.shape = shape->ToNumber(); } FormModel::GetInstance()->Create(formInfo); -- Gitee From 2cdfcc995f4b516ab185525e6fdaf29046d0aa51 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=AC=91=E7=AC=91=E4=BD=A0=E7=9A=84=E7=89=99?= Date: Sat, 13 Sep 2025 10:30:23 +0000 Subject: [PATCH 2/2] update frameworks/bridge/declarative_frontend/jsview/js_form.cpp. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 笑笑你的牙 --- frameworks/bridge/declarative_frontend/jsview/js_form.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/frameworks/bridge/declarative_frontend/jsview/js_form.cpp b/frameworks/bridge/declarative_frontend/jsview/js_form.cpp index 324ad942344..e6bdbc63bec 100644 --- a/frameworks/bridge/declarative_frontend/jsview/js_form.cpp +++ b/frameworks/bridge/declarative_frontend/jsview/js_form.cpp @@ -101,17 +101,17 @@ void JSForm::Create(const JSCallbackInfo& info) if (exemptAppLock->IsBoolean()) { formInfo.exemptAppLock = exemptAppLock->ToBoolean(); } - if (!dimension->IsNull() && !dimension->IsEmpty() && dimension->IsNumber()) { + if (!dimension->IsNull() && dimension->IsNumber()) { formInfo.dimension = dimension->ToNumber(); } formInfo.temporary = temporary->IsBoolean() ? temporary->ToBoolean() : false; if (!wantValue->IsNull() && wantValue->IsObject()) { formInfo.wantWrap = CreateWantWrapFromNapiValue(wantValue); } - if (!renderingMode->IsNull() && !renderingMode->IsEmpty() && renderingMode->IsNumber()) { + if (!renderingMode->IsNull() && renderingMode->IsNumber()) { formInfo.renderingMode = renderingMode->ToNumber(); } - if (!shape->IsNull() && !shape->IsEmpty() && shape->IsNumber()) { + if (!shape->IsNull() && shape->IsNumber()) { formInfo.shape = shape->ToNumber(); } FormModel::GetInstance()->Create(formInfo); -- Gitee