diff --git a/ace/ace_standard/src/main/js/default/pages/button/router/index.js b/ace/ace_standard/src/main/js/default/pages/button/router/index.js index 1deae6639f5a07a9b7e4cafa60ca44a6889e32cd..038ade7844e7cea21a954ea2e4f320b65493fdb5 100644 --- a/ace/ace_standard/src/main/js/default/pages/button/router/index.js +++ b/ace/ace_standard/src/main/js/default/pages/button/router/index.js @@ -1,5 +1,5 @@ /** - * Copyright (c) 2022 Shenzhen kaiHong Digital Industry Development Co., Ltd. + * Copyright (c) 2022 Shenzhen Kaihong Digital Industry Development 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 diff --git a/ace/ace_standard/src/main/js/default/pages/button/style/index.js b/ace/ace_standard/src/main/js/default/pages/button/style/index.js index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..4a45d3eb108b49649154e73122e0614943ed7f7e 100644 --- a/ace/ace_standard/src/main/js/default/pages/button/style/index.js +++ b/ace/ace_standard/src/main/js/default/pages/button/style/index.js @@ -0,0 +1,14 @@ +/** + * Copyright (c) 2022 Shenzhen Kaihong Digital Industry Development 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. + */ \ No newline at end of file diff --git a/ace/ace_standard/src/main/js/default/pages/divider/prop/index.hml b/ace/ace_standard/src/main/js/default/pages/divider/prop/index.hml index b49f099b1a260ae23ba583b9805ef4f868ce7878..76473a8fae3bb6f1fb595aa1db670cee821580ba 100644 --- a/ace/ace_standard/src/main/js/default/pages/divider/prop/index.hml +++ b/ace/ace_standard/src/main/js/default/pages/divider/prop/index.hml @@ -140,13 +140,6 @@ - - - - - 渲染属性 -- show diff --git a/ace/ace_standard/src/main/js/default/pages/divider/prop/index.js b/ace/ace_standard/src/main/js/default/pages/divider/prop/index.js index b270679293902bf3a2026152bc8364889d448914..e3d1971b98e6d11e37ad32760fd0646bef47a554 100644 --- a/ace/ace_standard/src/main/js/default/pages/divider/prop/index.js +++ b/ace/ace_standard/src/main/js/default/pages/divider/prop/index.js @@ -45,8 +45,6 @@ export default { forPropOne : null, forPropThree : null, ifPropTrue : null, - ifPropFalse : null, - ifPropNone : null, showPropTrue : null, showPropFalse : null, showPropNone : null, @@ -84,8 +82,6 @@ export default { forPropOne : this.forPropOne, forPropThree : this.forPropThree, ifPropTrue : this.ifPropTrue, - ifPropFalse : this.ifPropFalse, - ifPropNone : this.ifPropNone, showPropTrue : this.showPropTrue, showPropFalse : this.showPropFalse, showPropNone : this.showPropNone, @@ -121,16 +117,12 @@ export default { this.forPropOne = this.$element("forPropOne").getInspector() this.forPropThree = this.$element("forPropThree").getInspector() this.ifPropTrue = this.$element("ifPropTrue").getInspector() - this.ifPropFalse = this.$element("ifPropFalse").getInspector() - this.ifPropNone = this.$element("ifPropNone").getInspector() this.showPropTrue = this.$element("showPropTrue").getInspector() this.showPropFalse = this.$element("showPropFalse").getInspector() this.showPropNone = this.$element("showPropNone").getInspector() - return }, getSpecificPropValues () { - this.verticalTrue = this.$element("showPropNone").getInspector() - this.verticalTrue = this.$element("showPropNone").getInspector() - return + this.verticalTrue = this.$element("verticalTrue").getInspector() + this.verticalFalse = this.$element("verticalFalse").getInspector() } } diff --git a/ace/ace_standard/src/main/js/default/pages/divider/router/index.js b/ace/ace_standard/src/main/js/default/pages/divider/router/index.js index e778c4f80c3511b6e8afb82048d2e37dbf378034..4988a2eb69e2c8a36a209d0ac6fb600e3b0b3907 100644 --- a/ace/ace_standard/src/main/js/default/pages/divider/router/index.js +++ b/ace/ace_standard/src/main/js/default/pages/divider/router/index.js @@ -1,5 +1,5 @@ /** - * Copyright (c) 2022 Shenzhen kaiHong Digital Industry Development Co., Ltd. + * Copyright (c) 2022 Shenzhen Kaihong Digital Industry Development 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 diff --git a/ace/ace_standard/src/main/js/default/test/buttonProps.test.js b/ace/ace_standard/src/main/js/default/test/buttonProps.test.js index 408d3d119f93d2bafe91362f3eee2a4f86b0bedf..2af88600eac0946acafdf608240451da0a6efab2 100644 --- a/ace/ace_standard/src/main/js/default/test/buttonProps.test.js +++ b/ace/ace_standard/src/main/js/default/test/buttonProps.test.js @@ -1,10 +1,10 @@ -/* - * Copyright (C) 2021 Huawei Device Co., Ltd. +/** + * Copyright (c) 2022 Shenzhen Kaihong Digital Industry Development 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 + * 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, @@ -32,7 +32,7 @@ describe('buttonPropsJsTest', function () { let backToIndexPromise = new Promise((resolve, reject) => { setTimeout(() => { router.back({ - uri: 'pages/button/prop/index' + uri: 'pages/index/index' }); resolve(); }, 500); @@ -47,6 +47,7 @@ describe('buttonPropsJsTest', function () { return clearPromise; }); } + /** * run before testcase */ @@ -77,6 +78,7 @@ describe('buttonPropsJsTest', function () { }); // 通用属性 + /** * @tc.number SUB_ACE_BASIC_COMPONENT_JS_API_0100 * @tc.name testButtonIdProp @@ -95,6 +97,11 @@ describe('buttonPropsJsTest', function () { done(); }); + /** + * @tc.number SUB_ACE_BASIC_COMPONENT_JS_API_0100 + * @tc.name testButtonClassProp + * @tc.desc ACE + */ it('testButtonClassProp', 0, async function (done) { console.info('testButtonClassProp START'); console.info("[buttonProps] get globalThis.value is: " + JSON.stringify(globalThis.value)); @@ -610,7 +617,7 @@ describe('buttonPropsJsTest', function () { expect(obj.$type).assertEqual('button') expect(obj.$attrs.id).assertEqual('showPropNone') - expect(obj.$attrs.show).assertEqual('false') + expect(obj.$attrs.show).assertEqual('true') console.info("[buttonProps] get show value is: " + JSON.stringify(obj.$attrs.show)); done(); }); @@ -732,7 +739,7 @@ describe('buttonPropsJsTest', function () { expect(obj.$type).assertEqual('button') expect(obj.$attrs.id).assertEqual('typeNone') - expect(obj.$attrs.type).assertEqual(undefined) + expect(obj.$attrs.type).assertEqual('capsule') console.info("[buttonProps] get type value is: " + JSON.stringify(obj.$attrs.type)); done(); }); @@ -912,7 +919,7 @@ describe('buttonPropsJsTest', function () { expect(obj.$type).assertEqual('button') expect(obj.$attrs.id).assertEqual('placementNone') - expect(obj.$attrs.placement).assertEqual(undefined) + expect(obj.$attrs.placement).assertEqual('end') console.info("[buttonProps] get placement value is: " + JSON.stringify(obj.$attrs.placement)); done(); }); @@ -932,7 +939,7 @@ describe('buttonPropsJsTest', function () { expect(obj.$type).assertEqual('button') expect(obj.$attrs.id).assertEqual('waitingTrue') - expect(obj.$attrs.waiting).assertEqual(true) + expect(obj.$attrs.waiting).assertEqual('true') console.info("[buttonProps] get waiting value is: " + JSON.stringify(obj.$attrs.waiting)); done(); }); @@ -952,7 +959,7 @@ describe('buttonPropsJsTest', function () { expect(obj.$type).assertEqual('button') expect(obj.$attrs.id).assertEqual('waitingFalse') - expect(obj.$attrs.waiting).assertEqual(false) + expect(obj.$attrs.waiting).assertEqual('false') console.info("[buttonProps] get waiting value is: " + JSON.stringify(obj.$attrs.waiting)); done(); }); @@ -972,7 +979,7 @@ describe('buttonPropsJsTest', function () { expect(obj.$type).assertEqual('button') expect(obj.$attrs.id).assertEqual('waitingNone') - expect(obj.$attrs.waiting).assertEqual(undefined) + expect(obj.$attrs.waiting).assertEqual('false') console.info("[buttonProps] get waiting value is: " + JSON.stringify(obj.$attrs.waiting)); done(); });