openharmony/ace_ace_engine
1
0
Fork 0
mirror of https://github.com/openharmony/ace_ace_engine.git synced 2026-07-20 15:14:04 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix pcPreview select popup crash bug

Browse Source 
Signed-off-by: lihao <lihao71@huawei.com>
Change-Id: I8213e2e475bf97e9529966dcebe0f3480c80aade
This commit is contained in:
lihao
2022-03-28 22:32:47 +08:00
parent 9bc4aa1324
commit 1b2e6ab9ca
3 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
frameworks/bridge/declarative_frontend/engine/quickjs/qjs_declarative_engine.cpp
+1
View File
@@ -280,6 +280,7 @@ void QJSDeclarativeEngine::ReplaceJSContent(const std::string& url, const std::s
#endif
RefPtr<Component> QJSDeclarativeEngine::GetNewComponentWithJsCode(const std::string& jsCode)
{
ViewStackProcessor::GetInstance()->ClearStack();
bool result = engineInstance_->InitAceModules(jsCode.c_str(), jsCode.length(), "AddComponent");
if (!result) {
LOGE("execute addComponent failed,script=[%{public}s]", jsCode.c_str());
frameworks/bridge/declarative_frontend/view_stack_processor.h
+6
View File
@@ -169,6 +169,12 @@ public:
visualState_ = VisualState::NOTSET;
}
void ClearStack()
{
auto emptyStack = std::stack<std::unordered_map<std::string, RefPtr<Component>>>();
componentsStack_.swap(emptyStack);
}
private:
ViewStackProcessor();
frameworks/core/components/select_popup/select_popup_component.cpp
+8 -6
View File
@@ -100,12 +100,14 @@ void SelectPopupComponent::InnerHideDialog(uint32_t index)
}
#if defined(WINDOWS_PLATFORM) || defined(MAC_PLATFORM)
auto parentNode = node_->GetParentNode();
if (parentNode) {
parentNode->SetLeft(0);
parentNode->SetTop(0);
parentNode->SetWidth(0);
parentNode->SetHeight(0);
if (node_) {
auto parentNode = node_->GetParentNode();
if (parentNode) {
parentNode->SetLeft(0);
parentNode->SetTop(0);
parentNode->SetWidth(0);
parentNode->SetHeight(0);
}
}
#endif
auto manager = manager_.Upgrade();