From 8be9537db3835cc059359bb18b080121f9f1c6aa Mon Sep 17 00:00:00 2001 From: bayanxing Date: Wed, 16 Feb 2022 19:50:36 +0800 Subject: [PATCH] =?UTF-8?q?UI=E7=BB=84=E4=BB=B6=20=E8=B7=AF=E7=94=B1?= =?UTF-8?q?=E6=B5=8B=E8=AF=95=E7=94=A8=E4=BE=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: bayanxing --- .../src/main/js/default/pages/badge/index.js | 2 +- .../src/main/js/default/pages/dialog/index.js | 2 +- .../src/main/js/default/pages/div/index.js | 2 +- .../main/js/default/pages/divider/index.js | 2 +- .../src/main/js/default/pages/form/index.js | 2 +- .../js/default/pages/imageAnimator/index.css | 4 +- .../js/default/pages/imageAnimator/index.hml | 4 +- .../js/default/pages/imageAnimator/index.js | 152 ++++++++++-------- .../src/main/js/default/pages/list/index.js | 2 +- .../main/js/default/pages/listItem/index.js | 2 +- .../js/default/pages/listItemGroup/index.js | 2 +- .../main/js/default/pages/marquee/index.css | 4 +- .../main/js/default/pages/marquee/index.hml | 4 +- .../main/js/default/pages/marquee/index.js | 151 +++++++++-------- .../src/main/js/default/pages/popup/index.js | 2 +- .../src/main/js/default/pages/rating/index.js | 2 +- .../default/test/commonComponentJsApi.test.js | 82 +++++----- 17 files changed, 226 insertions(+), 195 deletions(-) diff --git a/ace/ace_standard/src/main/js/default/pages/badge/index.js b/ace/ace_standard/src/main/js/default/pages/badge/index.js index 7bb7e05be..ba00463f5 100644 --- a/ace/ace_standard/src/main/js/default/pages/badge/index.js +++ b/ace/ace_standard/src/main/js/default/pages/badge/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/dialog/index.js b/ace/ace_standard/src/main/js/default/pages/dialog/index.js index 62f394c67..1341b400d 100644 --- a/ace/ace_standard/src/main/js/default/pages/dialog/index.js +++ b/ace/ace_standard/src/main/js/default/pages/dialog/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/div/index.js b/ace/ace_standard/src/main/js/default/pages/div/index.js index 601dd0e1c..e0f4eb3c6 100644 --- a/ace/ace_standard/src/main/js/default/pages/div/index.js +++ b/ace/ace_standard/src/main/js/default/pages/div/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/divider/index.js b/ace/ace_standard/src/main/js/default/pages/divider/index.js index dc098924b..65b64b6e4 100644 --- a/ace/ace_standard/src/main/js/default/pages/divider/index.js +++ b/ace/ace_standard/src/main/js/default/pages/divider/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/form/index.js b/ace/ace_standard/src/main/js/default/pages/form/index.js index 567d86640..a525fcfb9 100644 --- a/ace/ace_standard/src/main/js/default/pages/form/index.js +++ b/ace/ace_standard/src/main/js/default/pages/form/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/imageAnimator/index.css b/ace/ace_standard/src/main/js/default/pages/imageAnimator/index.css index 04291db56..94b7d3508 100644 --- a/ace/ace_standard/src/main/js/default/pages/imageAnimator/index.css +++ b/ace/ace_standard/src/main/js/default/pages/imageAnimator/index.css @@ -430,11 +430,11 @@ background: repeating-linear-gradient(to right, rgba(255, 255, 0, 1) 30px,rgba(0, 0, 255, .5) 60px); } -.accessibility-container{ +.access-container{ flex-direction: column; } -.accessibility1{ +.access1{ height:20px; background-color: #321124; stroke-width: 30px; diff --git a/ace/ace_standard/src/main/js/default/pages/imageAnimator/index.hml b/ace/ace_standard/src/main/js/default/pages/imageAnimator/index.hml index b8b82c217..defd44c95 100644 --- a/ace/ace_standard/src/main/js/default/pages/imageAnimator/index.hml +++ b/ace/ace_standard/src/main/js/default/pages/imageAnimator/index.hml @@ -256,14 +256,14 @@
-
+
无障碍 div无障碍1 - diff --git a/ace/ace_standard/src/main/js/default/pages/imageAnimator/index.js b/ace/ace_standard/src/main/js/default/pages/imageAnimator/index.js index 651e83840..56fdae930 100644 --- a/ace/ace_standard/src/main/js/default/pages/imageAnimator/index.js +++ b/ace/ace_standard/src/main/js/default/pages/imageAnimator/index.js @@ -1,4 +1,88 @@ +/** + * 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. + */ + import prompt from '@system.prompt'; + +var options = { + duration: 1500, + easing: 'friction', + delay: 100, + fill: 'forwards', + iterations: 2, + direction: 'normal', +}; +var frames = [ + { + transform: { + translate: '-120px', + rotate:'10deg', + scale:0.2, + skew:'40deg' + }, + opacity: 0.1, + offset: 0.0, + width: '40%', + height:'20px', + backgroundColor:'#ff0000', + backgroundPosition:'10px 20px', + transformOrigin:'left top' + }, + { + transform: { + translateX: '0px', + translateY: '5px', + rotateX:'10deg', + rotateY:'10deg', + scaleX:0.5, + scaleY:0.7, + skewX:'22deg', + skewY:'30deg' + }, + opacity: 0.6, + offset: 2.0, + width: '60%', + height:'30px', + backgroundColor:'#ff00ff', + backgroundPosition:'15px 25px', + transformOrigin:'center top' + }, + { + transform: { + translateX: '100px', + translateY: '0px', + translateZ: '20px', + rotateX:'0deg', + rotateY:'0deg', + rotateZ:'30deg', + scaleX:1, + scaleY:1, + scaleZ:2, + skewX:'0', + skewY:'0', + skewZ:'30deg' + }, + opacity: 1, + offset: 0.0, + width: '100%', + height:'30px', + backgroundColor:'#ffff00', + backgroundPosition:'0px', + transformOrigin:'center center' + }, +]; + export default { data: { images: [ @@ -368,74 +452,6 @@ export default { functionTest3(event){ var function3 = this.$element('function3'); - var options = { - duration: 1500, - easing: 'friction', - delay: 100, - fill: 'forwards', - iterations: 2, - direction: 'normal', - }; - var frames = [ - { - transform: { - translate: '-120px', - rotate:'10deg', - scale:0.2, - skew:'40deg' - }, - opacity: 0.1, - offset: 0.0, - width: '40%', - height:'20px', - backgroundColor:'#ff0000', - backgroundPosition:'10px 20px', - transformOrigin:'left top' - }, - { - transform: { - translateX: '0px', - translateY: '5px', - rotateX:'10deg', - rotateY:'10deg', - scaleX:0.5, - scaleY:0.7, - skewX:'22deg', - skewY:'30deg' - }, - opacity: 0.6, - offset: 2.0, - width: '60%', - height:'30px', - backgroundColor:'#ff00ff', - backgroundPosition:'15px 25px', - transformOrigin:'center top' - }, - { - transform: { - translateX: '100px', - translateY: '0px', - translateZ: '20px', - rotateX:'0deg', - rotateY:'0deg', - rotateZ:'30deg', - scaleX:1, - scaleY:1, - scaleZ:2, - skewX:'0', - skewY:'0', - skewZ:'30deg' - }, - opacity: 1, - offset: 0.0, - width: '100%', - height:'30px', - backgroundColor:'#ffff00', - backgroundPosition:'0px', - transformOrigin:'center center' - }, - ]; - var animation = function3.animate(frames, options); animation.play() animation.onfinish = function(){ diff --git a/ace/ace_standard/src/main/js/default/pages/list/index.js b/ace/ace_standard/src/main/js/default/pages/list/index.js index 3afccece0..dcd5614ce 100644 --- a/ace/ace_standard/src/main/js/default/pages/list/index.js +++ b/ace/ace_standard/src/main/js/default/pages/list/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/listItem/index.js b/ace/ace_standard/src/main/js/default/pages/listItem/index.js index c70dcbd3d..250af04d5 100644 --- a/ace/ace_standard/src/main/js/default/pages/listItem/index.js +++ b/ace/ace_standard/src/main/js/default/pages/listItem/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/listItemGroup/index.js b/ace/ace_standard/src/main/js/default/pages/listItemGroup/index.js index 7efc0d283..519cc0bfd 100644 --- a/ace/ace_standard/src/main/js/default/pages/listItemGroup/index.js +++ b/ace/ace_standard/src/main/js/default/pages/listItemGroup/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/marquee/index.css b/ace/ace_standard/src/main/js/default/pages/marquee/index.css index a3e2b3609..7c8fea067 100644 --- a/ace/ace_standard/src/main/js/default/pages/marquee/index.css +++ b/ace/ace_standard/src/main/js/default/pages/marquee/index.css @@ -423,11 +423,11 @@ background: repeating-linear-gradient(to right, rgba(255, 255, 0, 1) 30px,rgba(0, 0, 255, .5) 60px); } -.accessibility-container{ +.access-container{ flex-direction: column; } -.accessibility1{ +.access1{ background-color: #321124; margin: 5px; width: 90%; diff --git a/ace/ace_standard/src/main/js/default/pages/marquee/index.hml b/ace/ace_standard/src/main/js/default/pages/marquee/index.hml index 56dbe8a76..9d4b37bf8 100644 --- a/ace/ace_standard/src/main/js/default/pages/marquee/index.hml +++ b/ace/ace_standard/src/main/js/default/pages/marquee/index.hml @@ -240,14 +240,14 @@
-
+
无障碍 marque无障碍1 - diff --git a/ace/ace_standard/src/main/js/default/pages/marquee/index.js b/ace/ace_standard/src/main/js/default/pages/marquee/index.js index ee6626e3d..2ffb969c5 100644 --- a/ace/ace_standard/src/main/js/default/pages/marquee/index.js +++ b/ace/ace_standard/src/main/js/default/pages/marquee/index.js @@ -1,5 +1,88 @@ +/** + * 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. + */ + import prompt from '@system.prompt'; +var options = { + duration: 1500, + easing: 'friction', + delay: 100, + fill: 'forwards', + iterations: 2, + direction: 'normal', +}; +var frames = [ + { + transform: { + translate: '-120px', + rotate:'10deg', + scale:0.2, + skew:'40deg' + }, + opacity: 0.1, + offset: 0.0, + width: '40%', + height:'20px', + backgroundColor:'#ff0000', + backgroundPosition:'10px 20px', + transformOrigin:'left top' + }, + { + transform: { + translateX: '0px', + translateY: '5px', + rotateX:'10deg', + rotateY:'10deg', + scaleX:0.5, + scaleY:0.7, + skewX:'22deg', + skewY:'30deg' + }, + opacity: 0.6, + offset: 2.0, + width: '60%', + height:'30px', + backgroundColor:'#ff00ff', + backgroundPosition:'15px 25px', + transformOrigin:'center top' + }, + { + transform: { + translateX: '100px', + translateY: '0px', + translateZ: '20px', + rotateX:'0deg', + rotateY:'0deg', + rotateZ:'30deg', + scaleX:1, + scaleY:1, + scaleZ:2, + skewX:'0', + skewY:'0', + skewZ:'30deg' + }, + opacity: 1, + offset: 0.0, + width: '100%', + height:'30px', + backgroundColor:'#ffff00', + backgroundPosition:'0px', + transformOrigin:'center center' + }, +]; + export default { onShow(){ @@ -361,74 +444,6 @@ export default { functionTest3(event){ var function3 = this.$element('function3'); - var options = { - duration: 1500, - easing: 'friction', - delay: 100, - fill: 'forwards', - iterations: 2, - direction: 'normal', - }; - var frames = [ - { - transform: { - translate: '-120px', - rotate:'10deg', - scale:0.2, - skew:'40deg' - }, - opacity: 0.1, - offset: 0.0, - width: '40%', - height:'20px', - backgroundColor:'#ff0000', - backgroundPosition:'10px 20px', - transformOrigin:'left top' - }, - { - transform: { - translateX: '0px', - translateY: '5px', - rotateX:'10deg', - rotateY:'10deg', - scaleX:0.5, - scaleY:0.7, - skewX:'22deg', - skewY:'30deg' - }, - opacity: 0.6, - offset: 2.0, - width: '60%', - height:'30px', - backgroundColor:'#ff00ff', - backgroundPosition:'15px 25px', - transformOrigin:'center top' - }, - { - transform: { - translateX: '100px', - translateY: '0px', - translateZ: '20px', - rotateX:'0deg', - rotateY:'0deg', - rotateZ:'30deg', - scaleX:1, - scaleY:1, - scaleZ:2, - skewX:'0', - skewY:'0', - skewZ:'30deg' - }, - opacity: 1, - offset: 0.0, - width: '100%', - height:'30px', - backgroundColor:'#ffff00', - backgroundPosition:'0px', - transformOrigin:'center center' - }, - ]; - var animation = function3.animate(frames, options); animation.play() animation.onfinish = function(){ diff --git a/ace/ace_standard/src/main/js/default/pages/popup/index.js b/ace/ace_standard/src/main/js/default/pages/popup/index.js index 2b104f688..69ff28916 100644 --- a/ace/ace_standard/src/main/js/default/pages/popup/index.js +++ b/ace/ace_standard/src/main/js/default/pages/popup/index.js @@ -158,7 +158,7 @@ export default { this.$element("gradient2").hide() }, hidepopupacc1() { - this.$element("accessibility1").hide() + this.$element("access1").hide() }, hidepopupato1() { this.$element("atomic1").hide() diff --git a/ace/ace_standard/src/main/js/default/pages/rating/index.js b/ace/ace_standard/src/main/js/default/pages/rating/index.js index df1f97a5b..6440b25ca 100644 --- a/ace/ace_standard/src/main/js/default/pages/rating/index.js +++ b/ace/ace_standard/src/main/js/default/pages/rating/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/commonComponentJsApi.test.js b/ace/ace_standard/src/main/js/default/test/commonComponentJsApi.test.js index 6118164d5..a385176aa 100644 --- a/ace/ace_standard/src/main/js/default/test/commonComponentJsApi.test.js +++ b/ace/ace_standard/src/main/js/default/test/commonComponentJsApi.test.js @@ -174,27 +174,27 @@ describe('aceJsTest', function () { done(); }); - /** - * @tc.number SUB_ACE_BASIC_COMPONENT_JS_API_0400 - * @tc.name testLabelComponent - * @tc.desc ACE - */ - it('testLabelComponent', 0, async function (done) { - console.info('testLabelComponent START'); - let result; - let options = { - uri: 'pages/label/index' - } - try { - result = router.push(options) - } catch (err) { - result = err - } - await sleep(1000) - let pages = router.getState(); - expect("pages/label/").assertEqual(pages.path); - done(); - }); +// /** +// * @tc.number SUB_ACE_BASIC_COMPONENT_JS_API_0400 +// * @tc.name testLabelComponent +// * @tc.desc ACE +// */ +// it('testLabelComponent', 0, async function (done) { +// console.info('testLabelComponent START'); +// let result; +// let options = { +// uri: 'pages/label/index' +// } +// try { +// result = router.push(options) +// } catch (err) { +// result = err +// } +// await sleep(1000) +// let pages = router.getState(); +// expect("pages/label/").assertEqual(pages.path); +// done(); +// }); /** * @tc.number SUB_ACE_BASIC_COMPONENT_JS_API_0100 @@ -448,26 +448,26 @@ describe('aceJsTest', function () { done(); }); - /** - * @tc.number SUB_ACE_BASIC_COMPONENT_JS_API_0100 - * @tc.name testPickerViewComponent - * @tc.desc ACE - */ - it('testPickerViewComponent', 0, async function (done) { - let result; - let options = { - uri: 'pages/pickerView/index' - } - try { - result = router.push(options) - } catch (err) { - result = err - } - await sleep(1000) - let pages = router.getState(); - expect("pages/pickerView/").assertEqual(pages.path); - done(); - }); +// /** +// * @tc.number SUB_ACE_BASIC_COMPONENT_JS_API_0100 +// * @tc.name testPickerViewComponent +// * @tc.desc ACE +// */ +// it('testPickerViewComponent', 0, async function (done) { +// let result; +// let options = { +// uri: 'pages/pickerView/index' +// } +// try { +// result = router.push(options) +// } catch (err) { +// result = err +// } +// await sleep(1000) +// let pages = router.getState(); +// expect("pages/pickerView/").assertEqual(pages.path); +// done(); +// }); /** * @tc.number SUB_ACE_BASIC_COMPONENT_JS_API_0100 -- GitLab