diff --git a/graphic/windowstandard/src/main/js/default/pages/two/two.css b/graphic/windowstandard/src/main/js/default/pages/two/two.css new file mode 100644 index 0000000000000000000000000000000000000000..72baaffcaa675bfe9f3d3d1974690ae7d05c1a4b --- /dev/null +++ b/graphic/windowstandard/src/main/js/default/pages/two/two.css @@ -0,0 +1,24 @@ +/* + * Copyright (C) 2022 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +.container { + flex-direction: column; + justify-content: center; + align-items: center; +} + +.title { + font-size: 100px; +} diff --git a/graphic/windowstandard/src/main/js/default/pages/two/two.hml b/graphic/windowstandard/src/main/js/default/pages/two/two.hml new file mode 100644 index 0000000000000000000000000000000000000000..0053057b5ff7362e00db48887ee1663cffa35988 --- /dev/null +++ b/graphic/windowstandard/src/main/js/default/pages/two/two.hml @@ -0,0 +1,21 @@ +/* + * Copyright (C) 2022 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + + +
+ + {{ $t('strings.hello') }} {{ title }} + +
diff --git a/graphic/windowstandard/src/main/js/default/pages/two/two.js b/graphic/windowstandard/src/main/js/default/pages/two/two.js new file mode 100644 index 0000000000000000000000000000000000000000..57875bfa9aef4037b9b2a6461b3787842e6842df --- /dev/null +++ b/graphic/windowstandard/src/main/js/default/pages/two/two.js @@ -0,0 +1,23 @@ +/* + * Copyright (C) 2022 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +export default { + data: { + title: "" + }, + onInit() { + this.title = this.$t('strings.world'); + } +} diff --git a/graphic/windowstandard/src/main/js/default/test/window.test.js b/graphic/windowstandard/src/main/js/default/test/window.test.js index cb81571ffd44392b49115c13519ff98d3450f15b..a49a7bd1ac3963db52c9df1cefcba9c0e4523bc7 100755 --- a/graphic/windowstandard/src/main/js/default/test/window.test.js +++ b/graphic/windowstandard/src/main/js/default/test/window.test.js @@ -2915,7 +2915,7 @@ describe('window_test', function () { if (!!data) { tempWnd = data expect(!!tempWnd).assertTrue(); - tempWnd.loadContent('pages/index', (err, data) => { + tempWnd.loadContent('pages/two', (err, data) => { console.log(msgStr + 'tempWnd.loadContent err' + JSON.stringify(err)); console.log(msgStr + 'tempWnd.loadContent data' + JSON.stringify(data)); console.log(msgStr + 'tempWnd.loadContent !!data' + !!data); @@ -2985,11 +2985,11 @@ describe('window_test', function () { console.log(msgStr + 'window.create ' + baseWndType + ' , wnd: ' + tempWnd); expect(!!tempWnd).assertTrue(); console.log(msgStr + 'tempWnd.loadContent start'); - let load = await tempWnd.loadContent('pages/index/index').catch((err) => { + let load = await tempWnd.loadContent('pages/two/two').catch((err) => { unexpectedError(err, caseName, 'tempWnd.loadContent', done); - console.log(msgStr+'tempWnd.loadContent(pages/index/index) err='+JSON.stringify(err)); + console.log(msgStr+'tempWnd.loadContent(pages/two/two) err='+JSON.stringify(err)); }); - console.log(msgStr+'tempWnd.loadContent(pages/index/index) load='+JSON.stringify(load)); + console.log(msgStr+'tempWnd.loadContent(pages/two/two) load='+JSON.stringify(load)); expect(!load).assertTrue(); done(); })