diff --git a/arkui/ace_ets_component_attrlack/entry/src/main/ets/MainAbility/pages/checkBoxGroup.ets b/arkui/ace_ets_component_attrlack/entry/src/main/ets/MainAbility/pages/checkBoxGroup.ets index 59c3785e25d392190ae2ed36dabca17d61a69c7a..142c33f037b5dbc63794dae6c3faa8902fb01913 100644 --- a/arkui/ace_ets_component_attrlack/entry/src/main/ets/MainAbility/pages/checkBoxGroup.ets +++ b/arkui/ace_ets_component_attrlack/entry/src/main/ets/MainAbility/pages/checkBoxGroup.ets @@ -22,7 +22,7 @@ const TAG = 'ets_apiLack_add'; @Component export default struct CheckBoxGroupPart { - + @State SelectStatus: SelectStatus = SelectStatus.Part aboutToAppear() { Log.showInfo(TAG, `aboutToAppear CheckBoxGroupPart start`) } @@ -84,9 +84,11 @@ struct CheckBoxGroupPart { console.info("Part emit action state err: " + JSON.stringify(err.message)) } Utils.sleep(1000); + if(itemName.status === SelectStatus.Part){ console.info("CheckboxGroup SelectStatus.Part") - } + } + }) Text('select all').fontSize(20) Checkbox({name: 'checkbox1', group: 'checkboxGroup'}) diff --git a/arkui/ace_ets_component_attrlack/entry/src/main/ets/MainAbility/pages/common.ets b/arkui/ace_ets_component_attrlack/entry/src/main/ets/MainAbility/pages/common.ets index 2ff0e22f9baf1337acc26f62fe0d6a042b88fdf7..fb7bcb4992ddddc0ee628f9f26cf80ffa63c19a6 100644 --- a/arkui/ace_ets_component_attrlack/entry/src/main/ets/MainAbility/pages/common.ets +++ b/arkui/ace_ets_component_attrlack/entry/src/main/ets/MainAbility/pages/common.ets @@ -92,7 +92,7 @@ export default struct CommonColorMode { .bindPopup(true,{ message:"23", showInSubWindow:true - }). + }) Text("common-OnFinish") .width(320) @@ -134,7 +134,7 @@ export default struct CommonColorMode { path: '' } }) - +// Text("common-Middle") .width(320) .height(40) @@ -151,7 +151,7 @@ export default struct CommonColorMode { .alignRules({ middle: { anchor: 'string', align: HorizontalAlign.Center } }) - +// Text("common-Area") .width(320) .height(40) @@ -187,6 +187,7 @@ export default struct CommonColorMode { console.info("areaValue emit action state err: " + JSON.stringify(err.message)) } }) +// Text("common-Repeat") .width(320) .height(40) @@ -210,7 +211,7 @@ export default struct CommonColorMode { repeat: RepeatMode.Repeat, fill: false }); - +// Text("common-Space") .width(320) .height(40) @@ -234,7 +235,7 @@ export default struct CommonColorMode { repeat: RepeatMode.Space, fill: false }); - +// Text("common-Thin") .width(320) .height(40) @@ -249,7 +250,7 @@ export default struct CommonColorMode { .textOverflow({ overflow: TextOverflow.None }) .key("ThinText") .backgroundBlurStyle(BlurStyle.Thin) - +// Text("common-Thick") .width(320) .height(40) @@ -264,7 +265,7 @@ export default struct CommonColorMode { .textOverflow({ overflow: TextOverflow.None }) .key("ThickText") .backgroundBlurStyle(BlurStyle.Thick) - +// Text("common-Slice") .width(320) .height(40) @@ -288,7 +289,7 @@ export default struct CommonColorMode { repeat: RepeatMode.Stretch, fill: false }); - +// Text("common-Outset") .width(320) .height(40) @@ -314,7 +315,7 @@ export default struct CommonColorMode { outset: 2 }); - +// Text("common-Touches") .width(320) .height(40) @@ -350,7 +351,7 @@ export default struct CommonColorMode { console.info("touchesValue emit action state err: " + JSON.stringify(err.message)) } }) - +// Text("common-ChangedTouches") .width(320) .height(40) diff --git a/arkui/ace_ets_component_attrlack/entry/src/main/ets/MainAbility/pages/loadingProgress.ets b/arkui/ace_ets_component_attrlack/entry/src/main/ets/MainAbility/pages/loadingProgress.ets index 42ef021b4d12dfa4f27b140706986da419a0f4a2..1281a7ba169229dff088b4be865dec30d09fb686 100644 --- a/arkui/ace_ets_component_attrlack/entry/src/main/ets/MainAbility/pages/loadingProgress.ets +++ b/arkui/ace_ets_component_attrlack/entry/src/main/ets/MainAbility/pages/loadingProgress.ets @@ -37,6 +37,7 @@ struct LoadingProgressCircular { Text("loadingProgress-Circular") .width(100) .height(70) + .margin(5) .fontSize(20) .opacity(1) .align(Alignment.TopStart) @@ -51,6 +52,7 @@ struct LoadingProgressCircular { Text("loadingProgress-Orbital") .width(100) .height(70) + .margin(5) .fontSize(20) .opacity(1) .align(Alignment.TopStart) @@ -62,7 +64,7 @@ struct LoadingProgressCircular { .textOverflow({ overflow: TextOverflow.None }) .key("OrbitalText") - Text('Orbital LoadingProgress ').fontSize(9).fontColor(0xCCCCCC).width('100%') + Text('Orbital LoadingProgress ').fontSize(9).fontColor(0xCCCCCC).width('100%').margin(5) LoadingProgress() .color(Color.Blue) diff --git a/arkui/ace_ets_component_attrlack/entry/src/main/ets/MainAbility/pages/router.ets b/arkui/ace_ets_component_attrlack/entry/src/main/ets/MainAbility/pages/router.ets index eb1ee208787174f03a7fd6604461e9ed06daefbb..be3f1e34b75f16bcd21f28ac15df8174657cf7d1 100644 --- a/arkui/ace_ets_component_attrlack/entry/src/main/ets/MainAbility/pages/router.ets +++ b/arkui/ace_ets_component_attrlack/entry/src/main/ets/MainAbility/pages/router.ets @@ -13,6 +13,7 @@ * limitations under the License. */ + import router from '@ohos.router' import uiAppearance from '@ohos.uiAppearance'; @@ -26,7 +27,7 @@ export default struct RouterStandard { - async routePage() { + async routePage() { let options = { url: 'pages/page1', params: { @@ -37,7 +38,7 @@ struct RouterStandard { } } try { - await router.push(options,router.RouterMode.Standard) + await router.push(options) } catch (err) { console.info(`Standard Page fail callback, code: ${err.code}, msg: ${err.msg}`) } @@ -54,7 +55,7 @@ struct RouterStandard { } } try { - await router.push(options,router.RouterMode.Single) + await router.push(options) } catch (err) { console.info(`Single Page fail callback, code: ${err.code}, msg: ${err.msg}`) } @@ -105,7 +106,6 @@ struct RouterStandard { .onClick(() => { this.routeSinglePage() }) - Text('这是第一页') .fontSize(50) .fontWeight(FontWeight.Bold) @@ -123,4 +123,3 @@ struct RouterStandard { }.width("100%").height("100%") } } - diff --git a/arkui/ace_ets_component_attrlack/entry/src/main/ets/MainAbility/pages/web.ets b/arkui/ace_ets_component_attrlack/entry/src/main/ets/MainAbility/pages/web.ets index b48af9231b452ac0d80c24792acc7ad449993de5..d9182d4cf1fe8965deb5b63fb5d21cebf5510100 100644 --- a/arkui/ace_ets_component_attrlack/entry/src/main/ets/MainAbility/pages/web.ets +++ b/arkui/ace_ets_component_attrlack/entry/src/main/ets/MainAbility/pages/web.ets @@ -38,7 +38,8 @@ struct WebEditText { .height(500) .padding(20) .blur(2) - .fileFromUrlAccess(true) + //修改 + //.fileFromUrlAccess(true) .initialScale(2) .webDebuggingAccess(true) .onRenderExited((event) => { diff --git a/arkui/ace_ets_component_attrlack/entry/src/main/ets/test/color.test.ets b/arkui/ace_ets_component_attrlack/entry/src/main/ets/test/color.test.ets index 5b7426766b35ee5196a0da2c896b58163510f942..cdbe5eb083729b80a632264a20894d5a08dd0934 100644 --- a/arkui/ace_ets_component_attrlack/entry/src/main/ets/test/color.test.ets +++ b/arkui/ace_ets_component_attrlack/entry/src/main/ets/test/color.test.ets @@ -58,7 +58,7 @@ export default function colorEnumJsunit() { let obj = JSON.parse(strJson); expect(obj.$type).assertEqual('Text'); console.info("[testcolorTransparent0001] fontColor value :" + obj.$attrs.fontColor); - expect(obj.$attrs.fontColor).assertEqual("#FF000000"); + expect(obj.$attrs.fontColor).assertEqual("#00000000"); done(); }); }) diff --git a/arkui/ace_ets_component_attrlack/entry/src/main/ets/test/loadingProgress.test.ets b/arkui/ace_ets_component_attrlack/entry/src/main/ets/test/loadingProgress.test.ets index cea401c98a70c43152148d0689481df78ec69a16..2d8fd45371db67464db35ce3a3276b8ee7999d1f 100644 --- a/arkui/ace_ets_component_attrlack/entry/src/main/ets/test/loadingProgress.test.ets +++ b/arkui/ace_ets_component_attrlack/entry/src/main/ets/test/loadingProgress.test.ets @@ -59,10 +59,10 @@ export default function loadingProgressCircularJsunit() { expect(obj.$type).assertEqual('Text'); expect(obj.$attrs.color).assertEqual(undefined); expect(obj.$attrs.width).assertEqual('100.00vp'); - expect(obj.$attrs.margin).assertEqual('0.00px'); - console.info("[testloadingProgressCircular0011] color value :" + obj.$attrs.color); - console.info("[testloadingProgressCircular0011] width value :" + obj.$attrs.width); - console.info("[testloadingProgressCircular0011] margin value :" + obj.$attrs.margin); + expect(obj.$attrs.margin).assertEqual('5.00vp'); + console.info("[gwxtestloadingProgressCircular0011] color value :" + obj.$attrs.color); + console.info("[gwxtestloadingProgressCircular0011] width value :" + obj.$attrs.width); + console.info("[gwxtestloadingProgressCircular0011] margin value :" + obj.$attrs.margin); done(); }); @@ -80,7 +80,7 @@ export default function loadingProgressCircularJsunit() { expect(obj.$type).assertEqual('Text'); expect(obj.$attrs.color).assertEqual(undefined); expect(obj.$attrs.width).assertEqual('100.00vp'); - expect(obj.$attrs.margin).assertEqual('0.00px'); + expect(obj.$attrs.margin).assertEqual('5.00vp'); console.info("[testloadingProgressOrbital0001] color value :" + obj.$attrs.color); console.info("[testloadingProgressOrbital0001] width value :" + obj.$attrs.width); console.info("[testloadingProgressOrbital0001] margin value :" + obj.$attrs.margin); diff --git a/arkui/ace_ets_component_attrlack/entry/src/main/ets/test/router.test.ets b/arkui/ace_ets_component_attrlack/entry/src/main/ets/test/router.test.ets index 955c82893abf8a7072b068da078a61accbc309fa..e3b8504d198e76ba9205b41088c358c1078514e5 100644 --- a/arkui/ace_ets_component_attrlack/entry/src/main/ets/test/router.test.ets +++ b/arkui/ace_ets_component_attrlack/entry/src/main/ets/test/router.test.ets @@ -12,7 +12,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - import router from '@system.router'; import {describe, beforeAll, beforeEach, afterEach, afterAll, it, expect} from "hypium/index" import Utils from './Utils.ets' @@ -92,4 +91,4 @@ export default function routerStandardJsunit() { console.info('testrouterSingle_0001 END'); }); }) -} +} \ No newline at end of file