diff --git a/ace/ace_standard/src/main/js/default/pages/progress/prop/index.hml b/ace/ace_standard/src/main/js/default/pages/progress/prop/index.hml index 4e7cd1f72e8829e6221fc5ad887221c349cacf03..ac52b9a09562eacc478b6bab73b97f61a79eedf3 100644 --- a/ace/ace_standard/src/main/js/default/pages/progress/prop/index.hml +++ b/ace/ace_standard/src/main/js/default/pages/progress/prop/index.hml @@ -140,6 +140,15 @@ + + + + + + 渲染属性 -- show @@ -170,6 +179,20 @@ - + + progress特有属性 -- progress + + + + + + progress特有属性 -- tid + + + diff --git a/ace/ace_standard/src/main/js/default/pages/progress/router/index.hml b/ace/ace_standard/src/main/js/default/pages/progress/router/index.hml index f369f120734e6cc7e1dd0bfb5c6233d4db28dec3..90403ff9b5719ad8ca2f25bf13cf24f04db976e4 100644 --- a/ace/ace_standard/src/main/js/default/pages/progress/router/index.hml +++ b/ace/ace_standard/src/main/js/default/pages/progress/router/index.hml @@ -155,6 +155,7 @@ diff --git a/ace/ace_standard/src/main/js/default/pages/progress/router/index.js b/ace/ace_standard/src/main/js/default/pages/progress/router/index.js index 967238a12e729213468b6dedd84a99c44420d944..3d716bdce0889723b0de367def8f7899b7fa67c0 100644 --- a/ace/ace_standard/src/main/js/default/pages/progress/router/index.js +++ b/ace/ace_standard/src/main/js/default/pages/progress/router/index.js @@ -256,7 +256,11 @@ export default { message: 'key:\n' + message }); }, - + onAccessibility (event) { + if (event.eventType === 1) { + console.log("onAccessibility" + JSON.stringify(event)); + } + }, swipe(event){ var direction = event.direction; var distance = event.distance; diff --git a/ace/ace_standard/src/main/js/default/pages/progress/style/index.css b/ace/ace_standard/src/main/js/default/pages/progress/style/index.css index cf2d362f9ab309048009a8408c2dee1fce25774c..750929786465b1252a05db6140ced24f98dc5910 100644 --- a/ace/ace_standard/src/main/js/default/pages/progress/style/index.css +++ b/ace/ace_standard/src/main/js/default/pages/progress/style/index.css @@ -306,18 +306,21 @@ #styleTwentySix{ width: 150px; height: 20px; + stroke-width: 20px; background-color: #999999; } #styleTwentySeven{ width: 150px; height: 20px; + stroke-width: 20px; background: linear-gradient(pink,#fff000); } #styleTwentyNine{ width: 150px; height: 20px; + stroke-width: 20px; background-image:url('common/images/image.png'); background-size:contain; background-repeat: repeat-x; @@ -327,6 +330,7 @@ #styleThirty{ width: 150px; height: 20px; + stroke-width: 20px; background-image:url('common/images/image.png'); background-size:50px 10px; background-repeat: no-repeat; @@ -336,6 +340,7 @@ #styleThirtyOne{ width: 150px; height: 20px; + stroke-width: 20px; background-image:url('common/images/image.png'); background-size:10% 20%; background-repeat: repeat; @@ -345,6 +350,7 @@ #styleThirtyTwo{ width: 150px; height: 20px; + stroke-width: 20px; background: linear-gradient(pink,#fff000); clip-path: margin-box; image-fill: #000fff; @@ -362,41 +368,50 @@ label { } #specificOne{ color: pink; - font-size: 16px; - letter-spacing: 2px; - font-weight: 700; - line-height: 20px; - font-family: HYQiHei-65S; + background-color: deeppink; + stroke-width: 10px; + secondary-color: greenyellow; } #specificTwo{ - font-size: 12px; - allow-scale: true; -} - -#specificThree{ - font-size: 12px; - allow-scale: false; - margin-bottom: 10px; + color: deeppink; + height: 20px; } #specificFour{ - font-style: normal; + height: 80px; + color: deeppink; + background-color: green; + secondary-color: blue; + stroke-width: 10px; } #specificFive{ - font-style: italic; - margin-bottom: 10px; + height: 80px; + color: deeppink; + background-color: green; + secondary-color: blue; + stroke-width: 10px; + scale-width: 1px; + scale-number: 100; } #specificSix{ - text-decoration: underline; - text-align: left; + color: blue; + background-color: deeppink; + stroke-width: 5px; + start-angle: 240; + total-angle: 240; + center-x: 40px; + center-y: 40px; + radius: 30; + height: 80px; } #specificSeven{ - text-decoration: line-through; - text-align: center; + color: #ddd; + height: 80px; + background-color: yellow; } #specificEight{ diff --git a/ace/ace_standard/src/main/js/default/pages/progress/style/index.hml b/ace/ace_standard/src/main/js/default/pages/progress/style/index.hml index 871858bb794ae274308acfa9a99821f10a63a332..04b6ee51e0f4b3cb913e7cfc2a63f7357308516f 100644 --- a/ace/ace_standard/src/main/js/default/pages/progress/style/index.hml +++ b/ace/ace_standard/src/main/js/default/pages/progress/style/index.hml @@ -16,133 +16,128 @@
- label通用样式 + progress通用样式 通用样式 1-8 \n width height padding margin border opacity align-self - - - - - - - - + + + + + + + + + + + + + + + + 通用样式9-20 \n display flex z-index position
- - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + +
通用样式21-23 box-shadow
- - - + + + + + +
通用样式23-25 visibility clip-path - - + + + + 通用样式26-31 background - - - - - + + + + + + + + + + 通用样式32 clip-path image-fill mask-image - + +
- label特有样式 + progress特有样式 - 特有样式 \n color,font-size,letter-spacing,font-weight,line-height,font-family + 特有样式 -- type=horizontal时 - + - 特有样式 -- allow-scale + 特有样式 -- type=circular时 - - + - 特有样式 -- font-style + 特有样式 -- type=ring - - + - 特有样式 -- text-decoration,text-align + 特有样式 -- scale-ring - - - + - 特有样式 \n max-lines,text-overflow + 特有样式 -- type=arc - - + left,underline - 特有样式 \n min-font-size,max-font-size,font-size-step,prefer-font-sizes + 特有样式 -- type=eclipse - + center,line-through