修改代码规范问题

Signed-off-by: Nbayanxing <bayanxing@kaihongdigi.com>

ace/ace_standard/src/main/js/default/pages/button/prop/index.js

@@ -77,9 +77,12 @@ export default {
             disabledPropTrue : this.disabledPropTrue, disabledPropFalse : this.disabledPropFalse,
             disabledPropNone : this.disabledPropNone, focusablePropTrue : this.focusablePropTrue,
             focusablePropFalse : this.focusablePropFalse, focusablePropNone : this.focusablePropNone,
-            dataProp : this.dataProp, dataPropNone : this.dataPropNone, clickEffectPropSmall : this.clickEffectPropSmall,
-            clickEffectPropMedium : this.clickEffectPropMedium, clickEffectPropLarge : this.clickEffectPropLarge,
-            clickEffectPropNone : this.clickEffectPropNone, dirPropRtl : this.dirPropRtl, dirPropAuto : this.dirPropAuto,
+            dataProp : this.dataProp, dataPropNone : this.dataPropNone,
+            clickEffectPropSmall : this.clickEffectPropSmall,
+            clickEffectPropMedium : this.clickEffectPropMedium,
+            clickEffectPropLarge : this.clickEffectPropLarge,
+            clickEffectPropNone : this.clickEffectPropNone, dirPropRtl : this.dirPropRtl,
+            dirPropAuto : this.dirPropAuto,
             dirPropLtr : this.dirPropLtr, dirPropNone : this.dirPropNone, forPropNull : this.forPropNull,
             forPropOne : this.forPropOne, forPropThree : this.forPropThree, ifPropTrue : this.ifPropTrue,
             showPropTrue : this.showPropTrue, showPropFalse : this.showPropFalse, showPropNone : this.showPropNone,

ace/ace_standard/src/main/js/default/pages/chart/prop/index.js

@@ -137,9 +137,12 @@ export default {
             disabledPropTrue : this.disabledPropTrue, disabledPropFalse : this.disabledPropFalse,
             disabledPropNone : this.disabledPropNone, focusablePropTrue : this.focusablePropTrue,
             focusablePropFalse : this.focusablePropFalse, focusablePropNone : this.focusablePropNone,
-            dataProp : this.dataProp, dataPropNone : this.dataPropNone, clickEffectPropSmall : this.clickEffectPropSmall,
-            clickEffectPropMedium : this.clickEffectPropMedium, clickEffectPropLarge : this.clickEffectPropLarge,
-            clickEffectPropNone : this.clickEffectPropNone, dirPropRtl : this.dirPropRtl, dirPropAuto : this.dirPropAuto,
+            dataProp : this.dataProp, dataPropNone : this.dataPropNone,
+            clickEffectPropSmall : this.clickEffectPropSmall,
+            clickEffectPropMedium : this.clickEffectPropMedium,
+            clickEffectPropLarge : this.clickEffectPropLarge,
+            clickEffectPropNone : this.clickEffectPropNone, dirPropRtl : this.dirPropRtl,
+            dirPropAuto : this.dirPropAuto,
             dirPropLtr : this.dirPropLtr, dirPropNone : this.dirPropNone, forPropNull : this.forPropNull,
             forPropOne : this.forPropOne, forPropThree : this.forPropThree, ifPropTrue : this.ifPropTrue,
             showPropTrue : this.showPropTrue, showPropFalse : this.showPropFalse, showPropNone : this.showPropNone,

ace/ace_standard/src/main/js/default/pages/image/prop/index.js

@@ -63,9 +63,12 @@ export default {
             disabledPropTrue : this.disabledPropTrue, disabledPropFalse : this.disabledPropFalse,
             disabledPropNone : this.disabledPropNone, focusablePropTrue : this.focusablePropTrue,
             focusablePropFalse : this.focusablePropFalse, focusablePropNone : this.focusablePropNone,
-            dataProp : this.dataProp, dataPropNone : this.dataPropNone, clickEffectPropSmall : this.clickEffectPropSmall,
-            clickEffectPropMedium : this.clickEffectPropMedium, clickEffectPropLarge : this.clickEffectPropLarge,
-            clickEffectPropNone : this.clickEffectPropNone, dirPropRtl : this.dirPropRtl, dirPropAuto : this.dirPropAuto,
+            dataProp : this.dataProp, dataPropNone : this.dataPropNone,
+            clickEffectPropSmall : this.clickEffectPropSmall,
+            clickEffectPropMedium : this.clickEffectPropMedium,
+            clickEffectPropLarge : this.clickEffectPropLarge,
+            clickEffectPropNone : this.clickEffectPropNone, dirPropRtl : this.dirPropRtl,
+            dirPropAuto : this.dirPropAuto,
             dirPropLtr : this.dirPropLtr, dirPropNone : this.dirPropNone, forPropNull : this.forPropNull,
             forPropOne : this.forPropOne, forPropThree : this.forPropThree, ifPropTrue : this.ifPropTrue,
             showPropTrue : this.showPropTrue, showPropFalse : this.showPropFalse, showPropNone : this.showPropNone,

ace/ace_standard/src/main/js/default/pages/menu/prop/index.js

@@ -28,12 +28,6 @@ export default {
         styleProp : null,
         refProp : null,
         refPropNone : null,
-        disabledPropTrue : null,
-        disabledPropFalse : null,
-        disabledPropNone : null,
-        focusablePropTrue : null,
-        focusablePropFalse : null,
-        focusablePropNone : null,
         dataProp : null,
         dataPropNone : null,
         clickEffectPropSmall : null,
@@ -66,12 +60,12 @@ export default {
         globalThis.value = {
             idProp : this.idProp, classProp : this.classProp, classPropNone : this.classPropNone,
             styleProp : this.styleProp, refProp : this.refProp, refPropNone : this.refPropNone,
-            disabledPropTrue : this.disabledPropTrue, disabledPropFalse : this.disabledPropFalse,
-            disabledPropNone : this.disabledPropNone, focusablePropTrue : this.focusablePropTrue,
-            focusablePropFalse : this.focusablePropFalse, focusablePropNone : this.focusablePropNone,
-            dataProp : this.dataProp, dataPropNone : this.dataPropNone, clickEffectPropSmall : this.clickEffectPropSmall,
-            clickEffectPropMedium : this.clickEffectPropMedium, clickEffectPropLarge : this.clickEffectPropLarge,
-            clickEffectPropNone : this.clickEffectPropNone, dirPropRtl : this.dirPropRtl, dirPropAuto : this.dirPropAuto,
+            dataProp : this.dataProp, dataPropNone : this.dataPropNone,
+            clickEffectPropSmall : this.clickEffectPropSmall,
+            clickEffectPropMedium : this.clickEffectPropMedium,
+            clickEffectPropLarge : this.clickEffectPropLarge,
+            clickEffectPropNone : this.clickEffectPropNone, dirPropRtl : this.dirPropRtl,
+            dirPropAuto : this.dirPropAuto,
             dirPropLtr : this.dirPropLtr, dirPropNone : this.dirPropNone, forPropNull : this.forPropNull,
             forPropOne : this.forPropOne, forPropThree : this.forPropThree, ifPropTrue : this.ifPropTrue,
             showPropTrue : this.showPropTrue, showPropFalse : this.showPropFalse, showPropNone : this.showPropNone,
@@ -88,12 +82,6 @@ export default {
         this.styleProp = this.$element("styleProp").getInspector()
         this.refProp = this.$element("refProp").getInspector()
         this.refPropNone = this.$element("refPropNone").getInspector()
-        this.disabledPropTrue = this.$element("disabledPropTrue").getInspector()
-        this.disabledPropFalse = this.$element("disabledPropFalse").getInspector()
-        this.disabledPropNone = this.$element("disabledPropNone").getInspector()
-        this.focusablePropTrue = this.$element("focusablePropTrue").getInspector()
-        this.focusablePropFalse = this.$element("focusablePropFalse").getInspector()
-        this.focusablePropNone = this.$element("focusablePropNone").getInspector()
         this.dataProp = this.$element("dataProp").getInspector()
         this.dataPropNone = this.$element("dataPropNone").getInspector()
         this.clickEffectPropSmall = this.$element("clickEffectPropSmall").getInspector()

ace/ace_standard/src/main/js/default/pages/span/prop/index.css

@@ -41,7 +41,7 @@
   flex-weight: 1;
 }
 
-.idProp {
+.spanTextTitle {
   height: 15px;
   font-size: 10px;
   margin-bottom: 2px;

ace/ace_standard/src/main/js/default/pages/span/prop/index.hml

@@ -22,7 +22,7 @@
         <text class="sub-title">
             通用属性 -- id
         </text>
-        <text class="idProp">
+        <text class="spanTextTitle">
             <span id="idProp">
                 span
             </span>
@@ -32,13 +32,13 @@
         <text class="sub-title">
             通用属性 -- class
         </text>
-        <text class="idProp">
+        <text class="spanTextTitle">
             <span id="classProp"
                   class="classProp">
                 span
             </span>
         </text>
-        <text class="idProp">
+        <text class="spanTextTitle">
             <span id="classPropNone"
                   class="">
                 span
@@ -50,7 +50,7 @@
         <text class="sub-title">
             通用属性 -- style
         </text>
-        <text class="idProp">
+        <text class="spanTextTitle">
             <span id="styleProp"
                   style="width:80%;height:20px;background-color:red">
                 span
@@ -61,13 +61,13 @@
         <text class="sub-title">
             通用属性 -- ref
         </text>
-        <text class="idProp">
+        <text class="spanTextTitle">
             <span id="refProp"
                   ref="refProp">
                 span
             </span>
         </text>
-        <text class="idProp">
+        <text class="spanTextTitle">
             <span id="refPropNone"
                   ref="">
                 span
@@ -77,13 +77,13 @@
         <text class="sub-title">
             通用属性 -- data-*
         </text>
-        <text class="idProp">
+        <text class="spanTextTitle">
             <span id="dataProp"
                   data-Span="通用属性 -- data-Span">
                 span
             </span>
         </text>
-        <text class="idProp">
+        <text class="spanTextTitle">
             <span id="dataPropNone"
                   data-Span="">
                 span
@@ -93,25 +93,25 @@
         <text class="sub-title">
             通用属性 -- click-effect
         </text>
-        <text class="idProp">
+        <text class="spanTextTitle">
             <span id="clickEffectPropSmall"
                   click-effect="spring-small">
                 span
             </span>
         </text>
-        <text class="idProp">
+        <text class="spanTextTitle">
             <span id="clickEffectPropMedium"
                   click-effect="spring-medium">
                 span
             </span>
         </text>
-        <text class="idProp">
+        <text class="spanTextTitle">
             <span id="clickEffectPropLarge"
                   click-effect="spring-large">
                 span
             </span>
         </text>
-        <text class="idProp">
+        <text class="spanTextTitle">
             <span id="clickEffectPropNone"
                   click-effect="">
                 span
@@ -121,25 +121,25 @@
         <text class="sub-title">
             通用属性 -- dir
         </text>
-        <text class="idProp">
+        <text class="spanTextTitle">
             <span id="dirPropRtl"
                   dir="rtl">
                 span
             </span>
         </text>
-        <text class="idProp">
+        <text class="spanTextTitle">
             <span id="dirPropAuto"
                   dir="auto">
                 span
             </span>
         </text>
-        <text class="idProp">
+        <text class="spanTextTitle">
             <span id="dirPropLtr"
                   dir="ltr">
                 span
             </span>
         </text>
-        <text class="idProp">
+        <text class="spanTextTitle">
             <span id="dirPropNone"
                   dir="">
                 span
@@ -149,19 +149,19 @@
         <text class="sub-title">
             渲染属性 -- for
         </text>
-        <text class="idProp">
+        <text class="spanTextTitle">
             <span id="forPropNull"
                   for="">
                 span
             </span>
         </text>
-        <text class="idProp">
+        <text class="spanTextTitle">
             <span id="forPropOne"
                   for="{{listOne}}">
                 span
             </span>
         </text>
-        <text class="idProp">
+        <text class="spanTextTitle">
             <span id="forPropThree"
                   for="{{listThree}}">
                 span
@@ -171,7 +171,7 @@
         <text class="sub-title">
             渲染属性 -- if
         </text>
-        <text class="idProp">
+        <text class="spanTextTitle">
             <span id="ifPropTrue"
                   if="true">
                 span
@@ -182,21 +182,21 @@
         <text class="sub-title">
             渲染属性 -- show
         </text>
-        <text class="idProp">
+        <text class="spanTextTitle">
             <span id="showPropTrue"
                   show="true">
                 span
             </span>
         </text>
-        <text class="idProp">
+        <text class="spanTextTitle">
             <span id="showPropFalse"
                   show="false">
                 span
             </span>
         </text>
-        <text class="idProp">
+        <text class="spanTextTitle">
             <span id="showPropNone"
-                  show="false">
+                  show="">
                 span
             </span>
         </text>
@@ -204,6 +204,7 @@
 
     <div style="background-color: #000000; width: 2px; height: 100%;">
     </div>
+
     <div class="specific-container">
 
     </div>

ace/ace_standard/src/main/js/default/pages/span/prop/index.js

@@ -26,12 +26,6 @@ export default {
         styleProp : null,
         refProp : null,
         refPropNone : null,
-        disabledPropTrue : null,
-        disabledPropFalse : null,
-        disabledPropNone : null,
-        focusablePropTrue : null,
-        focusablePropFalse : null,
-        focusablePropNone : null,
         dataProp : null,
         dataPropNone : null,
         clickEffectPropSmall : null,
@@ -56,12 +50,12 @@ export default {
         globalThis.value = {
             idProp : this.idProp, classProp : this.classProp, classPropNone : this.classPropNone,
             styleProp : this.styleProp, refProp : this.refProp, refPropNone : this.refPropNone,
-            disabledPropTrue : this.disabledPropTrue, disabledPropFalse : this.disabledPropFalse,
-            disabledPropNone : this.disabledPropNone, focusablePropTrue : this.focusablePropTrue,
-            focusablePropFalse : this.focusablePropFalse, focusablePropNone : this.focusablePropNone,
-            dataProp : this.dataProp, dataPropNone : this.dataPropNone, clickEffectPropSmall : this.clickEffectPropSmall,
-            clickEffectPropMedium : this.clickEffectPropMedium, clickEffectPropLarge : this.clickEffectPropLarge,
-            clickEffectPropNone : this.clickEffectPropNone, dirPropRtl : this.dirPropRtl, dirPropAuto : this.dirPropAuto,
+            dataProp : this.dataProp, dataPropNone : this.dataPropNone,
+            clickEffectPropSmall : this.clickEffectPropSmall,
+            clickEffectPropMedium : this.clickEffectPropMedium,
+            clickEffectPropLarge : this.clickEffectPropLarge,
+            clickEffectPropNone : this.clickEffectPropNone, dirPropRtl : this.dirPropRtl,
+            dirPropAuto : this.dirPropAuto,
             dirPropLtr : this.dirPropLtr, dirPropNone : this.dirPropNone, forPropNull : this.forPropNull,
             forPropOne : this.forPropOne, forPropThree : this.forPropThree, ifPropTrue : this.ifPropTrue,
             showPropTrue : this.showPropTrue, showPropFalse : this.showPropFalse, showPropNone : this.showPropNone,
@@ -74,12 +68,6 @@ export default {
         this.styleProp = this.$element("styleProp").getInspector()
         this.refProp = this.$element("refProp").getInspector()
         this.refPropNone = this.$element("refPropNone").getInspector()
-        this.disabledPropTrue = this.$element("disabledPropTrue").getInspector()
-        this.disabledPropFalse = this.$element("disabledPropFalse").getInspector()
-        this.disabledPropNone = this.$element("disabledPropNone").getInspector()
-        this.focusablePropTrue = this.$element("focusablePropTrue").getInspector()
-        this.focusablePropFalse = this.$element("focusablePropFalse").getInspector()
-        this.focusablePropNone = this.$element("focusablePropNone").getInspector()
         this.dataProp = this.$element("dataProp").getInspector()
         this.dataPropNone = this.$element("dataPropNone").getInspector()
         this.clickEffectPropSmall = this.$element("clickEffectPropSmall").getInspector()

ace/ace_standard/src/main/js/default/pages/switch/prop/index.js

@@ -70,12 +70,16 @@ export default {
             disabledPropTrue : this.disabledPropTrue, disabledPropFalse : this.disabledPropFalse,
             disabledPropNone : this.disabledPropNone, focusablePropTrue : this.focusablePropTrue,
             focusablePropFalse : this.focusablePropFalse, focusablePropNone : this.focusablePropNone,
-            dataProp : this.dataProp, dataPropNone : this.dataPropNone, clickEffectPropSmall : this.clickEffectPropSmall,
-            clickEffectPropMedium : this.clickEffectPropMedium, clickEffectPropLarge : this.clickEffectPropLarge,
-            clickEffectPropNone : this.clickEffectPropNone, dirPropRtl : this.dirPropRtl, dirPropAuto : this.dirPropAuto,
+            dataProp : this.dataProp, dataPropNone : this.dataPropNone,
+            clickEffectPropSmall : this.clickEffectPropSmall,
+            clickEffectPropMedium : this.clickEffectPropMedium,
+            clickEffectPropLarge : this.clickEffectPropLarge,
+            clickEffectPropNone : this.clickEffectPropNone, dirPropRtl : this.dirPropRtl,
+            dirPropAuto : this.dirPropAuto,
             dirPropLtr : this.dirPropLtr, dirPropNone : this.dirPropNone, forPropNull : this.forPropNull,
             forPropOne : this.forPropOne, forPropThree : this.forPropThree, ifPropTrue : this.ifPropTrue,
-            showPropTrue : this.showPropTrue, showPropFalse : this.showPropFalse, showPropNone : this.showPropNone,
+            showPropTrue : this.showPropTrue, showPropFalse : this.showPropFalse,
+            showPropNone : this.showPropNone,
 
             checkedTrue : this.checkedTrue, checkedFalse : this.checkedFalse, checkedNone : this.checkedNone,
             showTextTrue : this.showTextTrue, showTextFalse : this.showTextFalse, showTextNone : this.showTextNone,

ace/ace_standard/src/main/js/default/test/menuProps.test.js

 /**
- * 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
@@ -168,120 +168,6 @@ describe('menuPropsJsTest', function () {
         done();
     });
 
-    /**
-     * @tc.number    SUB_ACE_BASIC_COMPONENT_JS_API_0100
-     * @tc.name      testMenuDisabledPropTrue
-     * @tc.desc      ACE
-     */
-    it('testMenuDisabledPropTrue', 0, async function (done) {
-        console.info('testMenuDisabledPropTrue START');
-        console.info("[menuProps] get globalThis.value is: " + JSON.stringify(globalThis.value));
-
-        let obj = JSON.parse(globalThis.value.disabledPropTrue);
-        console.info("[menuProps] get inspector value is: " + JSON.stringify(obj));
-        console.info("[menuProps] get inspector attrs value is: " + JSON.stringify(obj.$attrs));
-
-        expect(obj.$type).assertEqual('menu')
-        expect(obj.$attrs.id).assertEqual('disabledPropTrue')
-        expect(obj.$attrs.disabled).assertEqual('true')
-        done();
-    });
-
-    /**
-     * @tc.number    SUB_ACE_BASIC_COMPONENT_JS_API_0100
-     * @tc.name      testMenuDisabledPropFalse
-     * @tc.desc      ACE
-     */
-    it('testMenuDisabledPropFalse', 0, async function (done) {
-        console.info('testMenuDisabledPropFalse START');
-        console.info("[menuProps] get globalThis.value is: " + JSON.stringify(globalThis.value));
-
-        let obj = JSON.parse(globalThis.value.disabledPropFalse);
-        console.info("[menuProps] get inspector value is: " + JSON.stringify(obj));
-        console.info("[menuProps] get inspector attrs value is: " + JSON.stringify(obj.$attrs));
-
-        expect(obj.$type).assertEqual('menu')
-        expect(obj.$attrs.id).assertEqual('disabledPropFalse')
-        expect(obj.$attrs.disabled).assertEqual('false')
-        done();
-    });
-
-    /**
-     * @tc.number    SUB_ACE_BASIC_COMPONENT_JS_API_0100
-     * @tc.name      testMenuDisabledPropNone
-     * @tc.desc      ACE
-     */
-    it('testMenuDisabledPropNone', 0, async function (done) {
-        console.info('testMenuDisabledPropNone START');
-        console.info("[menuProps] get globalThis.value is: " + JSON.stringify(globalThis.value));
-
-        let obj = JSON.parse(globalThis.value.disabledPropNone);
-        console.info("[menuProps] get inspector value is: " + JSON.stringify(obj));
-        console.info("[menuProps] get inspector attrs value is: " + JSON.stringify(obj.$attrs));
-
-        expect(obj.$type).assertEqual('menu')
-        expect(obj.$attrs.id).assertEqual('disabledPropNone')
-        expect(obj.$attrs.disabled).assertEqual('false')
-        done();
-    });
-
-    /**
-     * @tc.number    SUB_ACE_BASIC_COMPONENT_JS_API_0100
-     * @tc.name      testMenuFocusablePropTrue
-     * @tc.desc      ACE
-     */
-    it('testMenuFocusablePropTrue', 0, async function (done) {
-        console.info('testMenuFocusablePropTrue START');
-        console.info("[menuProps] get globalThis.value is: " + JSON.stringify(globalThis.value));
-
-        let obj = JSON.parse(globalThis.value.focusablePropTrue);
-        console.info("[menuProps] get inspector value is: " + JSON.stringify(obj));
-        console.info("[menuProps] get inspector attrs value is: " + JSON.stringify(obj.$attrs));
-
-        expect(obj.$type).assertEqual('menu')
-        expect(obj.$attrs.id).assertEqual('focusablePropTrue')
-        expect(obj.$attrs.focusable).assertEqual('true')
-        done();
-    });
-
-    /**
-     * @tc.number    SUB_ACE_BASIC_COMPONENT_JS_API_0100
-     * @tc.name      testMenuFocusablePropFalse
-     * @tc.desc      ACE
-     */
-    it('testMenuFocusablePropFalse', 0, async function (done) {
-        console.info('testMenuFocusablePropFalse START');
-        console.info("[menuProps] get globalThis.value is: " + JSON.stringify(globalThis.value));
-
-        let obj = JSON.parse(globalThis.value.focusablePropFalse);
-        console.info("[menuProps] get inspector value is: " + JSON.stringify(obj));
-        console.info("[menuProps] get inspector attrs value is: " + JSON.stringify(obj.$attrs));
-
-        expect(obj.$type).assertEqual('menu')
-        expect(obj.$attrs.id).assertEqual('focusablePropFalse')
-        expect(obj.$attrs.focusable).assertEqual('false')
-        done();
-    });
-
-    /**
-     * @tc.number    SUB_ACE_BASIC_COMPONENT_JS_API_0100
-     * @tc.name      testMenuFocusablePropNone
-     * @tc.desc      ACE
-     */
-    it('testMenuFocusablePropNone', 0, async function (done) {
-        console.info('testMenuFocusablePropNone START');
-        console.info("[menuProps] get globalThis.value is: " + JSON.stringify(globalThis.value));
-
-        let obj = JSON.parse(globalThis.value.focusablePropNone);
-        console.info("[menuProps] get inspector value is: " + JSON.stringify(obj));
-        console.info("[menuProps] get inspector attrs value is: " + JSON.stringify(obj.$attrs));
-
-        expect(obj.$type).assertEqual('menu')
-        expect(obj.$attrs.id).assertEqual('focusablePropNone')
-        expect(obj.$attrs.focusable).assertEqual('false')
-        done();
-    });
-
     /**
      * @tc.number    SUB_ACE_BASIC_COMPONENT_JS_API_0100
      * @tc.name      testMenuDataProp
@@ -712,7 +598,7 @@ describe('menuPropsJsTest', function () {
 
         expect(obj.$type).assertEqual('menu')
         expect(obj.$attrs.id).assertEqual('typeNone')
-        expect(obj.$attrs.type).assertEqual(undefined)
+        expect(obj.$attrs.type).assertEqual('click')
         console.info("[menuProps] get type value is: " + JSON.stringify(obj.$attrs.type));
         done();
     });