diff --git a/app/src/main/ets/pages/Index.ets b/app/src/main/ets/pages/Index.ets index 7c8051e..e381671 100644 --- a/app/src/main/ets/pages/Index.ets +++ b/app/src/main/ets/pages/Index.ets @@ -6,8 +6,6 @@ import { BusinessError } from '@ohos.base'; import { Log } from '@devwiki/base'; import { BaseLocalStorage, ScreenUtil } from '@devwiki/base'; import { HomeItem, HomeItemGroup } from '../model/Home'; -import { Context } from '@kit.AbilityKit'; -import { Calculator } from '@devwiki/hmcalculate'; import { MyApp } from '../MyApp'; import('./animation/LoadingPage') @@ -31,7 +29,8 @@ struct Index { name: 'Component', items: [ {name: 'InputPage', page: 'pages/component/InputPage'}, - {name: 'ToastPage', page: 'pages/component/ToastPage'} + {name: 'ToastPage', page: 'pages/component/ToastPage'}, + {name: 'TextPage', page: 'pages/component/TextPage'} ] }, // 布局 diff --git a/app/src/main/ets/pages/animation/LoadingPage.ets b/app/src/main/ets/pages/animation/LoadingPage.ets index efa1ef3..ef31b49 100644 --- a/app/src/main/ets/pages/animation/LoadingPage.ets +++ b/app/src/main/ets/pages/animation/LoadingPage.ets @@ -4,7 +4,7 @@ import { curves } from '@kit.ArkUI'; @Entry({ routeName: PageName.loadingPage }) @Component -export struct LoadingPage { +struct LoadingPage { @State animate: boolean = false; @State rotateValue: number = 0; diff --git a/app/src/main/ets/pages/component/SVGPage.ets b/app/src/main/ets/pages/component/SVGPage.ets index 1fd2c39..c9d0d5d 100644 --- a/app/src/main/ets/pages/component/SVGPage.ets +++ b/app/src/main/ets/pages/component/SVGPage.ets @@ -2,7 +2,7 @@ import { CommonRes } from '@devwiki/common_ui/Index' @Entry @Component -export struct SVGPage { +struct SVGPage { build() { Column() { Text().width(96).height(96).backgroundColor($r('app.media.ic_eye_off')) diff --git a/app/src/main/ets/pages/component/TextPage.ets b/app/src/main/ets/pages/component/TextPage.ets index 229c746..bbd5840 100644 --- a/app/src/main/ets/pages/component/TextPage.ets +++ b/app/src/main/ets/pages/component/TextPage.ets @@ -3,6 +3,27 @@ @Component struct TextPage { + @State states: string[] = ['1', '2', '3', '4']; + build() { + Column(){ + Button('Change').onClick(() => { + this.states[3] = '999' + }) + List(){ + ForEach(this.states, (state: string, index: number) => { + ListItem(){ + Column(){ + Text(state).width(this.getWidth(state, index)) + Divider().width('90%') + } + } + }) + }.height('100%').width('100') + }.width('100%') + } + + getWidth(title: string, index: number): Length { + return 0; } } \ No newline at end of file diff --git a/app/src/main/ets/pages/component/ToastPage.ets b/app/src/main/ets/pages/component/ToastPage.ets index ba22ebd..89fb2f6 100644 --- a/app/src/main/ets/pages/component/ToastPage.ets +++ b/app/src/main/ets/pages/component/ToastPage.ets @@ -12,7 +12,7 @@ class ToastViewMode { @Entry @Component -export struct ToastPage { +struct ToastPage { @Provide toastVM: ToastViewMode = new ToastViewMode(); diff --git a/app/src/main/ets/pages/layout/RelativeContainerPage.ets b/app/src/main/ets/pages/layout/RelativeContainerPage.ets index 4a88899..ed340de 100644 --- a/app/src/main/ets/pages/layout/RelativeContainerPage.ets +++ b/app/src/main/ets/pages/layout/RelativeContainerPage.ets @@ -3,7 +3,7 @@ import { ComponentConst } from '@devwiki/common_ui/Index' @Entry @Component -export struct RelativeContainerPage { +struct RelativeContainerPage { build() { RelativeContainer() { @@ -12,7 +12,7 @@ export struct RelativeContainerPage { top: { anchor: ComponentConst.ContainerId, align: VerticalAlign.Top }, left: { anchor: ComponentConst.ContainerId, align: HorizontalAlign.Start }, bottom: { anchor: ComponentConst.ContainerId, align: VerticalAlign.Bottom } - }).id('left_menu') + }).id('left_menu0') Button(){ Text("2222").height(64) @@ -21,7 +21,7 @@ export struct RelativeContainerPage { top: { anchor: ComponentConst.ContainerId, align: VerticalAlign.Top }, right: { anchor: ComponentConst.ContainerId, align: HorizontalAlign.End }, bottom: { anchor: ComponentConst.ContainerId, align: VerticalAlign.Bottom } - }).id('right_menu') + }).id('right_menu0') }.height(64).width('100%').backgroundColor(Color.Red) } } \ No newline at end of file diff --git a/app/src/main/ets/pages/media/AudioPlayerPage.ets b/app/src/main/ets/pages/media/AudioPlayerPage.ets index 70d64f4..5790e88 100644 --- a/app/src/main/ets/pages/media/AudioPlayerPage.ets +++ b/app/src/main/ets/pages/media/AudioPlayerPage.ets @@ -137,7 +137,7 @@ async function release() { @Entry @Component -export struct AudioPlayerPage { +struct AudioPlayerPage { build() { } diff --git a/app/src/main/ets/pages/mvvm/HomePage.ets b/app/src/main/ets/pages/mvvm/HomePage.ets index b8cc716..f68cd48 100644 --- a/app/src/main/ets/pages/mvvm/HomePage.ets +++ b/app/src/main/ets/pages/mvvm/HomePage.ets @@ -1,9 +1,9 @@ import { Emitter, EmitterItem } from '@devwiki/base'; -import { Toast } from '../../../../../../common_ui/src/main/ets/utils/Toast'; +import { Toast } from '@devwiki/common_ui'; @Entry @Component -export struct HomePage { +struct HomePage { @Provide tv1ViewModel: TabView1ViewModel = new TabView1ViewModel(); @Provide tv2ViewModel: TabView2ViewModel = new TabView2ViewModel(); diff --git a/app/src/main/ets/pages/net/RestAPIPage.ets b/app/src/main/ets/pages/net/RestAPIPage.ets index 4928257..af7da7a 100644 --- a/app/src/main/ets/pages/net/RestAPIPage.ets +++ b/app/src/main/ets/pages/net/RestAPIPage.ets @@ -6,7 +6,7 @@ const TAG = '[RestAPIPage]' @Entry({routeName: "RestAPIPage"}) @Component -export struct RestAPIPage { +struct RestAPIPage { @State viewModel: RestAPIViewModel = new RestAPIViewModel(); diff --git a/app/src/main/ets/pages/net/TcpSocketPage.ets b/app/src/main/ets/pages/net/TcpSocketPage.ets index 5732368..96cfb4d 100644 --- a/app/src/main/ets/pages/net/TcpSocketPage.ets +++ b/app/src/main/ets/pages/net/TcpSocketPage.ets @@ -60,7 +60,7 @@ class TcpSocket { @Component @Entry -export struct TcpSocketPage { +struct TcpSocketPage { tcpSocket: TcpSocket = new TcpSocket(); diff --git a/app/src/main/ets/pages/system/SchemePage.ets b/app/src/main/ets/pages/system/SchemePage.ets index 22d0f9c..a8fb2d3 100644 --- a/app/src/main/ets/pages/system/SchemePage.ets +++ b/app/src/main/ets/pages/system/SchemePage.ets @@ -3,7 +3,7 @@ import { common, Want } from '@kit.AbilityKit'; @Component @Entry -export struct SchemePage { +struct SchemePage { build() { Column() { TitleBar({ diff --git a/app/src/main/ets/pages/system/TimerPage.ets b/app/src/main/ets/pages/system/TimerPage.ets index 8010698..91fe7b9 100644 --- a/app/src/main/ets/pages/system/TimerPage.ets +++ b/app/src/main/ets/pages/system/TimerPage.ets @@ -1,7 +1,7 @@ @Entry({routeName: "TimerPage"}) @Component -export struct TimerPage { +struct TimerPage { build() { } } \ No newline at end of file diff --git a/app/src/main/ets/pages/web/WebDialogPage.ets b/app/src/main/ets/pages/web/WebDialogPage.ets index 673300c..71d3e7f 100644 --- a/app/src/main/ets/pages/web/WebDialogPage.ets +++ b/app/src/main/ets/pages/web/WebDialogPage.ets @@ -5,12 +5,12 @@ import { TitleBar } from '@devwiki/common_ui/src/main/ets/component/TitleBar'; @CustomDialog export struct WebPageDialog { @StorageLink(ScreenUtil.isPortraitKey) isPortrait: boolean = true; - dialogController: CustomDialogController; + dialogController?: CustomDialogController; build() { WebPage({ onTitleBarLeftClick: () => { - this.dialogController.close(); + this.dialogController?.close(); } }).height(this.isPortrait ? '95%' : '90%').width(this.isPortrait ? '100%' : '50%') } @@ -18,7 +18,7 @@ export struct WebPageDialog { @Entry @Component -export struct WebDialogPage { +struct WebDialogPage { dialogController: CustomDialogController = new CustomDialogController({ builder: WebPageDialog(), diff --git a/common_ui/src/main/ets/component/InputComponent.ets b/common_ui/src/main/ets/component/InputComponent.ets index 8a1593f..b277848 100644 --- a/common_ui/src/main/ets/component/InputComponent.ets +++ b/common_ui/src/main/ets/component/InputComponent.ets @@ -8,7 +8,6 @@ function textInputStyle() { .padding(5) } -@Preview @Component export struct PhoneInput { @Prop countryCode: string = "+86" diff --git a/common_ui/src/main/ets/component/TitleBar.ets b/common_ui/src/main/ets/component/TitleBar.ets index c384dae..d0f69b6 100644 --- a/common_ui/src/main/ets/component/TitleBar.ets +++ b/common_ui/src/main/ets/component/TitleBar.ets @@ -15,11 +15,10 @@ export enum TitleBarMenuType{ Text = 2 } -@Preview @Component export struct TitleBar { - @Prop title: ResourceStr; + @Prop title: ResourceStr = ''; @Prop barHeight: number = 48; @Prop menuPadding: number = 8; diff --git a/common_ui/src/test/List.test.ets b/common_ui/src/test/List.test.ets deleted file mode 100644 index bb5b5c3..0000000 --- a/common_ui/src/test/List.test.ets +++ /dev/null @@ -1,5 +0,0 @@ -import localUnitTest from './LocalUnit.test'; - -export default function testsuite() { - localUnitTest(); -} \ No newline at end of file diff --git a/common_ui/src/test/LocalUnit.test.ets b/common_ui/src/test/LocalUnit.test.ets deleted file mode 100644 index ed22d4d..0000000 --- a/common_ui/src/test/LocalUnit.test.ets +++ /dev/null @@ -1,33 +0,0 @@ -import { describe, beforeAll, beforeEach, afterEach, afterAll, it, expect } from '@ohos/hypium'; - -export default function localUnitTest() { - describe('localUnitTest',() => { - // Defines a test suite. Two parameters are supported: test suite name and test suite function. - beforeAll(() => { - // Presets an action, which is performed only once before all test cases of the test suite start. - // This API supports only one parameter: preset action function. - }); - beforeEach(() => { - // Presets an action, which is performed before each unit test case starts. - // The number of execution times is the same as the number of test cases defined by **it**. - // This API supports only one parameter: preset action function. - }); - afterEach(() => { - // Presets a clear action, which is performed after each unit test case ends. - // The number of execution times is the same as the number of test cases defined by **it**. - // This API supports only one parameter: clear action function. - }); - afterAll(() => { - // Presets a clear action, which is performed after all test cases of the test suite end. - // This API supports only one parameter: clear action function. - }); - it('assertContain', 0, () => { - // Defines a test case. This API supports three parameters: test case name, filter parameter, and test case function. - let a = 'abc'; - let b = 'b'; - // Defines a variety of assertion methods, which are used to declare expected boolean conditions. - expect(a).assertContain(b); - expect(a).assertEqual(a); - }); - }); -} \ No newline at end of file