diff --git a/ace/ace_standard/src/main/config.json b/ace/ace_standard/src/main/config.json index 7dd506667af75c4c729036e5a33aa30b40b7db75..1f30482864cd073aa3700df24db9b6fcd6755104 100755 --- a/ace/ace_standard/src/main/config.json +++ b/ace/ace_standard/src/main/config.json @@ -156,6 +156,7 @@ "pages/div/style/index", "pages/divider/prop/index", "pages/button/prop/index", + "pages/button/style/index", "pages/chart/prop/index", "pages/image/prop/index", "pages/span/prop/index", diff --git a/ace/ace_standard/src/main/js/default/pages/button/prop/index.css b/ace/ace_standard/src/main/js/default/pages/button/prop/index.css index 43c222fb8a0a6e7c686a7a50c8e49b271fb6d4b1..a99777f68d8bcc81f12246efa06beba2074c7603 100644 --- a/ace/ace_standard/src/main/js/default/pages/button/prop/index.css +++ b/ace/ace_standard/src/main/js/default/pages/button/prop/index.css @@ -512,7 +512,16 @@ padding-start: 10px; padding-end: 10px; } - +.propNewAdd{ + height: 15px; + margin-bottom: 3px; + background-color:#c00000; + width: 100%; + margin-left: 10px; + margin-right: 10px; + padding-start: 10px; + padding-end: 10px; +} diff --git a/ace/ace_standard/src/main/js/default/pages/button/prop/index.hml b/ace/ace_standard/src/main/js/default/pages/button/prop/index.hml index 48343c8de1956769b71813a89260035cecc8bf21..6d77eeeada0fa5b47e95cd7124776ad620cba2fd 100644 --- a/ace/ace_standard/src/main/js/default/pages/button/prop/index.hml +++ b/ace/ace_standard/src/main/js/default/pages/button/prop/index.hml @@ -88,6 +88,16 @@ data-button=""> + + 通用属性 -- data + + + + 通用属性 -- click-effect @@ -234,5 +244,38 @@ + + + 特有属性 -- shareid + + + + + + 特有属性 -- tid + + + + + + 特有属性 -- elif + + + + diff --git a/ace/ace_standard/src/main/js/default/pages/button/prop/index.js b/ace/ace_standard/src/main/js/default/pages/button/prop/index.js index a9f6c506ff0c62f0634a8ffbbc34f053c21b4c98..75b2b26dd9fc8026b80b33a49a1d8f8d78659679 100644 --- a/ace/ace_standard/src/main/js/default/pages/button/prop/index.js +++ b/ace/ace_standard/src/main/js/default/pages/button/prop/index.js @@ -68,6 +68,7 @@ export default { waitingFalse : null, waitingNone : null }, + onShow(){ this.getCommonPropValues(); this.getSpecificPropValues(); diff --git a/ace/ace_standard/src/main/js/default/pages/button/router/index.css b/ace/ace_standard/src/main/js/default/pages/button/router/index.css index 9ddb2a97656b072b75aa2d8d787cb7896a46d0e8..6cfbe7e00c3eb21c1322a5fd7996ca233f614a53 100644 --- a/ace/ace_standard/src/main/js/default/pages/button/router/index.css +++ b/ace/ace_standard/src/main/js/default/pages/button/router/index.css @@ -108,6 +108,7 @@ button{ max-height: 20px; padding-left: 10px; padding-top: 1px; + font-size:10px; padding-right: 15px; padding-bottom: 1px; margin-left: 10px; @@ -152,7 +153,6 @@ button{ border-color:#000000; border-radius:5px; background-color:#ffaa00; - mask-image: url('common/images/icon.png'); mask-size: cover; mask-position: center; } diff --git a/ace/ace_standard/src/main/js/default/pages/button/router/index.hml b/ace/ace_standard/src/main/js/default/pages/button/router/index.hml index 25e2ec4635f26d42e86d7ecef2ecbc8cd1fcadc1..f248c10698c5818b3b1b7d968e0182366665cfb1 100644 --- a/ace/ace_standard/src/main/js/default/pages/button/router/index.hml +++ b/ace/ace_standard/src/main/js/default/pages/button/router/index.hml @@ -277,6 +277,7 @@ button无障碍1 + + + + + + + + + + 通用样式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 + + + + + 通用样式33 filter:blur() backdrop-filter:blur() window-filter:blur() + + + +
+
+
+ + button特有样式 + + + + 特有样式 + +
+ + + + + + + + + + + + +
+
+ + 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 4a45d3eb108b49649154e73122e0614943ed7f7e..8179ff70cbe9fa27c38c5386a6f497949bf60f3a 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 @@ -11,4 +11,9 @@ * 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 + */ + +export default { + + +}