!39 fix app.js import system.device and node's data attr is ignored.

Merge pull request !39 from lixingchi1/cherry-pick-1635403000
This commit is contained in:
openharmony_ci
2021-10-30 00:50:14 +00:00
committed by Gitee
3 changed files with 2 additions and 7 deletions
+1 -2
View File
@@ -58,8 +58,7 @@ export const defineFn = function(page: Page, packageName: string, name?: string,
const pageRequire = (name: string) : any => {
if (isModule(name)) {
const appFunction = (): Page => {
const appPage: Page = appMap[packageName].getAppInstance();
return appPage || page;
return page || appMap[packageName].getAppInstance();
};
return requireModule(appFunction, removePrefix(name));
}
+1 -1
View File
@@ -111,7 +111,7 @@ export function appCreate(page: Page, options: Options, data: object, services:
};
// require in top app(instance)
const appRequireModule = name => requireModule(appPage, removePrefix(name));
const appRequireModule = name => requireModule(page || appPage, removePrefix(name));
const parseOptions: ParseOptions = {
$app_define$: appDefine,
$app_bootstrap$: appBootstrap,
-4
View File
@@ -620,10 +620,6 @@ class Element extends Node {
if (this.attr[key] === value && silent !== false) {
return;
}
// Because the data has been addressed in SetData
if (key === 'data') {
return;
}
this.attr[key] = value;
const taskCenter = this.getTaskCenter(this.docId);
if (!silent && taskCenter) {