diff --git a/UI/JsDialog/entry/src/main/js/default/pages/index/index.js b/UI/JsDialog/entry/src/main/js/default/pages/index/index.js
index 8cc68a2049f483bf50714646ac2a04df8efc2f91..a50135089f43b4968ddc3c8257848bfbb4e1f21f 100644
--- a/UI/JsDialog/entry/src/main/js/default/pages/index/index.js
+++ b/UI/JsDialog/entry/src/main/js/default/pages/index/index.js
@@ -23,7 +23,6 @@ export default {
deleteItem: null
},
onclick: function () {
- this.num += 1
this.name = this.$t('strings.contact') + this.num
this.$element('showDialog').show();
},
@@ -40,6 +39,7 @@ export default {
this.$element('showDialog').close();
},
onConfirm: function () {
+ this.num += 1
this.listItem.push({
'name': this.name, 'phone': this.phone
})
diff --git a/UI/JsRouter/entry/src/main/js/default/common/index.css b/UI/JsRouter/entry/src/main/js/default/common/index.css
index 93bfad3f30366ec76a01706a364e1081ae137b91..b3b4c7ef26bc83f61e4674ce754feee5fbe04eba 100644
--- a/UI/JsRouter/entry/src/main/js/default/common/index.css
+++ b/UI/JsRouter/entry/src/main/js/default/common/index.css
@@ -17,6 +17,7 @@
flex-direction: column;
justify-content: center;
align-items: center;
+ padding: 20px;
}
.title {
diff --git a/UI/JsTimer/entry/src/main/js/default/pages/index/index.css b/UI/JsTimer/entry/src/main/js/default/pages/index/index.css
index f1e4221778765cff445ebcb72ccbcb569266bdd6..e7d1300693726411b14ff2db187449f7c721ceb4 100644
--- a/UI/JsTimer/entry/src/main/js/default/pages/index/index.css
+++ b/UI/JsTimer/entry/src/main/js/default/pages/index/index.css
@@ -48,5 +48,5 @@
width: 60%;
height: 48px;
font-size: 16px;
- margin-top: 20px;
+ margin-top: 15px;
}
\ No newline at end of file
diff --git a/UI/Slider/entry/src/main/js/default/pages/index/index.css b/UI/Slider/entry/src/main/js/default/pages/index/index.css
index 3e0c52bedc24ef43c8db6f9f14a562f30c0925f5..b2310eda57023536278687d8b71ef4fd0850c713 100644
--- a/UI/Slider/entry/src/main/js/default/pages/index/index.css
+++ b/UI/Slider/entry/src/main/js/default/pages/index/index.css
@@ -16,6 +16,7 @@
.container {
flex-direction: column;
margin-top: 20%;
+ width: 100%;
}
.title {
@@ -29,7 +30,7 @@
.text-c {
color: #000000;
padding: 10px;
- max-width: 300px;
+ max-width: 100%;
border-radius: 10px;
background-color: lightgray;
}
@@ -57,7 +58,7 @@
.slider-div {
padding: 10px;
- margin-top: 100px;
+ margin-top: 50px;
flex-direction: row;
justify-content: space-around;
}
diff --git a/UI/Stack/entry/src/main/js/default/pages/index/index.css b/UI/Stack/entry/src/main/js/default/pages/index/index.css
index 48629a8b0f75a4bb182e2234ea3b3a4b96eb33f8..dbd1b1f3e8bc60ec579deb6c9efe0d277a902a21 100644
--- a/UI/Stack/entry/src/main/js/default/pages/index/index.css
+++ b/UI/Stack/entry/src/main/js/default/pages/index/index.css
@@ -21,7 +21,7 @@
.stack {
width: 100%;
- height: 60%;
+ height: 400px;
display: flex;
align-content: center;
justify-content: center;
@@ -29,27 +29,27 @@
.box-green {
width: 55%;
- height: 300px;
+ height: 250px;
margin-top: 75px;
background-color: #DAF7A6;
}
.box-yellow {
width: 70%;
- height: 350px;
+ height: 300px;
margin-top: 50px;
background-color: #FFC300;
}
.box-origin {
width: 85%;
- height: 400px;
+ height: 350px;
margin-top: 25px;
background-color: #FF5733;
}
.box-red {
width: 100%;
- height: 450px;
+ height: 400px;
background-color: #C70039;
}
diff --git a/UI/Swiper/entry/src/main/js/default/pages/index/index.css b/UI/Swiper/entry/src/main/js/default/pages/index/index.css
index a52586d11bd66460390ba435771553c1c06492c4..fbf19454936e1fa2cca604fe1c2408e14dfec822 100644
--- a/UI/Swiper/entry/src/main/js/default/pages/index/index.css
+++ b/UI/Swiper/entry/src/main/js/default/pages/index/index.css
@@ -17,27 +17,31 @@
flex-direction: column;
justify-content: center;
align-items: center;
+ width: 100%;
+ height: 100%;
}
.swiper {
- height: 250px;
+ height: 60%;
indicator-size: 8px;
indicator-color: lemonchiffon;
align-content: center;
}
.divbutton {
- height: 40px;
+ height: 90px;
justify-content: space-around;
}
.button {
- width: 100px;
- height: 40px;
- font-size: 16px;
+ width: 150px;
+ height: 90px;
+ font-size: 30px;
+ margin: 10px;
}
.image {
width: 100%;
- height: 200px;
+ height: 100%;
+ object-fit: cover;
}
diff --git a/UI/Swiper/entry/src/main/js/default/pages/index/index.hml b/UI/Swiper/entry/src/main/js/default/pages/index/index.hml
index 6fa44f1d095e0e6b96c657b2368fb4e99ba9ee49..df2a97c7c03c6384288333d0be867caf5858b644 100644
--- a/UI/Swiper/entry/src/main/js/default/pages/index/index.hml
+++ b/UI/Swiper/entry/src/main/js/default/pages/index/index.hml
@@ -15,15 +15,9 @@
-
-
-
-
-
-
{{ $t('strings.showPrevious') }}
diff --git a/UI/Tabs/entry/src/main/js/default/pages/index/index.css b/UI/Tabs/entry/src/main/js/default/pages/index/index.css
index ad06691cc1e60c0259bc073e66a8f0b630fa6be4..f29242e574d2f18a86a5c129dae16eb614af5232 100644
--- a/UI/Tabs/entry/src/main/js/default/pages/index/index.css
+++ b/UI/Tabs/entry/src/main/js/default/pages/index/index.css
@@ -17,6 +17,8 @@
flex-direction: column;
justify-content: flex-end;
align-items: center;
+ width: 100%;
+ height: 100%;
}
.tabs {
@@ -26,7 +28,7 @@
.tab-content{
width: 100%;
- height: 90%;
+ height: 100%;
}
.item-content {
@@ -88,6 +90,7 @@
.dynamic-item {
height: 56px;
+ width: 100%;
margin-right: 12px;
margin-left: 12px;
margin-bottom: 8px;
@@ -110,7 +113,7 @@
.tab-bar {
width: 100%;
- height: 56px;
+ height: 67px;
flex-direction: row;
background-color: white;
}
diff --git a/UI/chart/entry/src/main/js/default/common/common.css b/UI/chart/entry/src/main/js/default/common/common.css
index d7ebf4fc67eddf49e151b8f843d089be856bbb94..424291cdaa755a8d5bc83652b95af4d1103d0426 100644
--- a/UI/chart/entry/src/main/js/default/common/common.css
+++ b/UI/chart/entry/src/main/js/default/common/common.css
@@ -14,6 +14,8 @@
*/
.container {
+ width: 100%;
+ height: 100%;
flex-direction: column;
justify-content: center;
align-items: center;
diff --git a/UI/chart/entry/src/main/js/default/pages/bar/index.css b/UI/chart/entry/src/main/js/default/pages/bar/index.css
index db41b9c9ee5723ef6224dd21a319887b39c7bb21..00e94fc6c57c9cee569466a4e6a996175cbb6dcb 100644
--- a/UI/chart/entry/src/main/js/default/pages/bar/index.css
+++ b/UI/chart/entry/src/main/js/default/pages/bar/index.css
@@ -16,6 +16,6 @@
@import '../../common/common.css';
.data-bar {
- width: 700px;
- height: 400px;
+ width: 95%;
+ height: 90%;
}
\ No newline at end of file
diff --git a/UI/chart/entry/src/main/js/default/pages/guage/index.css b/UI/chart/entry/src/main/js/default/pages/guage/index.css
index 927ace6005b8bc6e156eedd4b7654d830a5fdef0..3bc11f6e4c35c604965f5557ce377512c2e3eb3b 100644
--- a/UI/chart/entry/src/main/js/default/pages/guage/index.css
+++ b/UI/chart/entry/src/main/js/default/pages/guage/index.css
@@ -18,6 +18,7 @@
.gauge-region {
height: 200px;
width: 200px;
+ align-items: center;
}
.data-gauge {
diff --git a/UI/chart/entry/src/main/js/default/pages/index/index.css b/UI/chart/entry/src/main/js/default/pages/index/index.css
index 26ec5fd5a17e4a8c2ffc6e69b72655f78a61ed3e..87c5bc290ecb23de40139e6de72df6221b2576a1 100644
--- a/UI/chart/entry/src/main/js/default/pages/index/index.css
+++ b/UI/chart/entry/src/main/js/default/pages/index/index.css
@@ -13,11 +13,12 @@
* limitations under the License.
*/
- @import '../../common/common.css';
+@import '../../common/common.css';
.btn {
width: 70%;
- height: 48px;
- font-size: 16px;
- margin-top: 20px;
+ height: 80px;
+ font-size: 18px;
+ margin-top: 10px;
+ margin-bottom: 10px;
}
\ No newline at end of file
diff --git a/UI/chart/entry/src/main/js/default/pages/line/index.css b/UI/chart/entry/src/main/js/default/pages/line/index.css
index a6fb1b30620069e3f913c849eb2751068fcb2c6c..33b306ad5cc3af1a6badf840226b17011a15582d 100644
--- a/UI/chart/entry/src/main/js/default/pages/line/index.css
+++ b/UI/chart/entry/src/main/js/default/pages/line/index.css
@@ -16,6 +16,6 @@
@import '../../common/common.css';
.chart-data {
- width: 700px;
- height: 600px;
+ width: 100%;
+ height: 90%;
}
\ No newline at end of file
diff --git a/UI/chart/entry/src/main/js/default/pages/line/index.js b/UI/chart/entry/src/main/js/default/pages/line/index.js
index 42147762e509d4d54c7542a8604f4ef8ca8ad484..79f26436fb3dd1b7e9b33bc4739f07452f0c3ae9 100644
--- a/UI/chart/entry/src/main/js/default/pages/line/index.js
+++ b/UI/chart/entry/src/main/js/default/pages/line/index.js
@@ -27,8 +27,8 @@ export default {
textColor: '#000000'
},
{
- value: 15,
- description: "15",
+ value: 20,
+ description: "20",
textLocation: "bottom",
textColor: '#000000'
},
@@ -51,8 +51,8 @@ export default {
textColor: '#000000'
},
{
- value: 83,
- description: "83",
+ value: 80,
+ description: "80",
textLocation: "top",
textColor: '#000000'
},
@@ -75,8 +75,8 @@ export default {
textColor: '#000000'
},
{
- value: 99,
- description: "99",
+ value: 81,
+ description: "81",
textLocation: "top",
textColor: '#000000'
},
@@ -99,7 +99,7 @@ export default {
},
series: {
lineStyle: {
- width: "5px",
+ width: "3px",
smooth: true,
},
headPoint: {
diff --git a/UI/chart/entry/src/main/js/default/pages/loading/index.css b/UI/chart/entry/src/main/js/default/pages/loading/index.css
index 5f0bdf713ce9e2cd65c6ccc978a299246f985afd..e0928b14fb9036b2b2a604fcaf58737ba4d6e798 100644
--- a/UI/chart/entry/src/main/js/default/pages/loading/index.css
+++ b/UI/chart/entry/src/main/js/default/pages/loading/index.css
@@ -15,11 +15,6 @@
@import '../../common/common.css';
-.chart-region {
- height: 400px;
- width: 700px;
-}
-
.chart-data {
width: 200px;
height: 200px;
diff --git a/UI/chart/entry/src/main/js/default/pages/progress/index.css b/UI/chart/entry/src/main/js/default/pages/progress/index.css
index 5f0bdf713ce9e2cd65c6ccc978a299246f985afd..e0928b14fb9036b2b2a604fcaf58737ba4d6e798 100644
--- a/UI/chart/entry/src/main/js/default/pages/progress/index.css
+++ b/UI/chart/entry/src/main/js/default/pages/progress/index.css
@@ -15,11 +15,6 @@
@import '../../common/common.css';
-.chart-region {
- height: 400px;
- width: 700px;
-}
-
.chart-data {
width: 200px;
height: 200px;
diff --git a/UI/chart/entry/src/main/js/default/pages/rainbow/index.css b/UI/chart/entry/src/main/js/default/pages/rainbow/index.css
index 8458dccd42c2914d9dc0d2caef8ca47d1227f645..38ddf4a81ab4af1ef8f68a6e024bf7831473bc43 100644
--- a/UI/chart/entry/src/main/js/default/pages/rainbow/index.css
+++ b/UI/chart/entry/src/main/js/default/pages/rainbow/index.css
@@ -16,16 +16,15 @@
@import '../../common/common.css';
.chart-data {
- width: 200px;
- height: 200px;
+ width: 170px;
+ height: 170px;
}
.box {
flex-direction: column;
- height: 200px;
+ height: 250px;
width: 100%;
- margin-top: 20px;
- align-content: center;
+ align-items: center;
justify-content: center;
}
diff --git a/common/DistributeCalc/entry/src/main/js/default/common/calculator.js b/common/DistributeCalc/entry/src/main/js/default/common/calculator.js
index 29a1dff5a101bf7f07adf1d6f7883bf632945568..fb1308d5051b3387d7a610ccefc6472f8abd02df 100644
--- a/common/DistributeCalc/entry/src/main/js/default/common/calculator.js
+++ b/common/DistributeCalc/entry/src/main/js/default/common/calculator.js
@@ -47,7 +47,7 @@ function getFloatNum(one, other, oprate) {
num = num1 + num2;
}
if (oprate === '/') {
- num = num1 + s2.length;
+ num = (num1 + s2.length) > 3 ? (num1 + s2.length) : 3;
}
return num;
}
diff --git a/common/DistributeCalc/entry/src/main/js/default/pages/index/index.js b/common/DistributeCalc/entry/src/main/js/default/pages/index/index.js
index ee9751eb6ec7f1047e32c40ea73876a135978b45..600aa4d9a76d983e933ef975ce051cb01d41b735 100644
--- a/common/DistributeCalc/entry/src/main/js/default/pages/index/index.js
+++ b/common/DistributeCalc/entry/src/main/js/default/pages/index/index.js
@@ -224,7 +224,7 @@ export default {
if (pressedEqual) {
pressedEqual = false;
}
- this.expression = value;
+ this.expression += value;
}
},